Version 2.8.0-dev.19.0
Merge commit 'e8c4aed700f5effdab0ac76497974e2289b589c9' into dev
diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json
index ebfd144..af00b66 100644
--- a/.dart_tool/package_config.json
+++ b/.dart_tool/package_config.json
@@ -478,12 +478,6 @@
"languageVersion": "2.7"
},
{
- "name": "package_resolver",
- "rootUri": "../third_party/pkg_tested/package_resolver",
- "packageUri": "lib/",
- "languageVersion": "2.1"
- },
- {
"name": "path",
"rootUri": "../third_party/pkg/path",
"packageUri": "lib/",
diff --git a/.packages b/.packages
index bb207f5..8835444 100644
--- a/.packages
+++ b/.packages
@@ -74,7 +74,6 @@
observatory:runtime/observatory/lib
observatory_test_package:runtime/observatory/tests/service/observatory_test_package
package_config:third_party/pkg_tested/package_config/lib
-package_resolver:third_party/pkg_tested/package_resolver/lib
path:third_party/pkg/path/lib
pedantic:third_party/pkg/pedantic/lib
pool:third_party/pkg/pool/lib
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f68bb1..4d936ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,17 +9,23 @@
### Language
-There are no language changes in this release.
+There are no new language features in this release. The only noteworthy change
+is a very minor breaking change in anticipation of the future support for null
+safety.
+
+* **Breaking change** [#40675][]: Fixed an implementation bug where local
+ variable inference would incorrectly use the promoted type of a type
+ variable.
+
+[#40675]: https://github.com/dart-lang/sdk/issues/40675
### Core libraries
#### `dart:async`
-* Make stack traces non-null. Where methods like `completer.completeError()`
- allow omitting a stack trace, the platform will now insert a default stack
- trace rather than propagate a `null` value.
-
- Error handling functions need no longer be prepared for `null` stack traces.
+* **Breaking change** [#40676][]: Changed the return type of
+ `StreamSubscription.cancel()` to `Future<void>`. Previously, it was
+ declared to return `Future` and was allowed to return `null` at runtime.
* **Breaking change** [#40681][]: The `runZoned()` function is split into two
functions: `runZoned()` and `runZonedGuarded()`, where the latter has a
@@ -27,14 +33,38 @@
functions for Null Safety where the two functions will differ in the
nullability of their return types.
+* **Breaking change** [#40683][]: Errors passed to
+ `Completer.completeError()`, `Stream.addError()`, `Future.error()`, etc. can
+ no longer be `null`. These operations now *synchronously* throw an exception
+ if passed a `null` error.
+
+* Make stack traces non-null [#40130][]. Where methods like
+ `completer.completeError()` allow omitting a stack trace, the platform will
+ now insert a default stack trace rather than propagate a `null` value.
+
+ Error handling functions need no longer be prepared for `null` stack traces.
+
+[#40676]: https://github.com/dart-lang/sdk/issues/40676
[#40681]: https://github.com/dart-lang/sdk/issues/40681
+[#40683]: https://github.com/dart-lang/sdk/issues/40683
+[#40130]: https://github.com/dart-lang/sdk/issues/40130
#### `dart:core`
-* The class `CastError` is deprecated, and all implementation specific
- classes implementing `TypeError` or `CastError` now implement both. In
- a future release, `CastError` will be removed. See issue [40763][] for
- details.
+* **Breaking change** [#40674][]: Three members on `RuneIterator` no longer
+ return `null` when accessed before the first call to `moveNext()`. Instead,
+ `current` and `rawIndex` return `-1` and `currentAsString` returns an empty
+ string.
+
+* **Breaking change** [#40678][]: The `String.fromEnvironment()` default value
+ for `defaultValue` is now an empty string instead of `null`. Likewise, the
+ default value for `int.fromEnvironment()`'s `defaultValue` parameter is
+ zero. Under null safety, a constructor cannot return `null`, so this
+ prepares these APIs for that.
+
+* The class `CastError` is deprecated, and all implementation specific classes
+ implementing `TypeError` or `CastError` now implement both. In a future
+ release, `CastError` will be removed. See issue [40763][] for details.
* Adds `StackTrace.empty` constant which is the stack trace used as default
stack trace when no better alternative is available.
@@ -51,6 +81,8 @@
convenient to use in-line in, for example, `=>` function bodies or
constructor initialization lists.
+[#40674]: https://github.com/dart-lang/sdk/issues/40674
+[#40678]: https://github.com/dart-lang/sdk/issues/40678
[40763]: https://github.com/dart-lang/sdk/issues/40763
#### `dart:developer`
@@ -171,11 +203,6 @@
`runZonedGuarded()` functions from `dart:async` directly if needing to
specify those.
-* **Breaking change** [#40681][]: The static method `runZoned()` and
- `runWithIOOverrides` on `IOOverrides` no longer accepts `zoneSpecification`
- and `onError` parameters. Use the `runZoned()` or `runZonedGuarded()`
- functions from `dart:async` directly if needing to specify those.
-
[#33501]: https://github.com/dart-lang/sdk/issues/33501
[#40702]: https://github.com/dart-lang/sdk/issues/40702
[#40483]: https://github.com/dart-lang/sdk/issues/40483
@@ -319,7 +346,7 @@
subtypes rather than structurally equal up to renaming of bound type
variables and equating all top types.
-* **Breaking Change**: Types are now normalized. See [normalization] for the
+* **Breaking Change**: Types are now normalized. See [normalization][] for the
full specification. Types will now be printed in their normal form, and
mutual subtypes with the same normal form will now be considered equal.
@@ -333,6 +360,13 @@
[normalization]: https://github.com/dart-lang/language/blob/master/resources/type-system/normalization.md
+
+Other dart2js changes:
+
+* **Breaking Change**: The `--package-root` flag, which was hidden and disabled
+ in Dart 2.0.0, has been completely removed. Passing this flag will now cause
+ `dart2js` to fail.
+
#### Linter
Updated the Linter to `0.1.114`, which includes:
diff --git a/DEPS b/DEPS
index bf0cb23..23f27fd 100644
--- a/DEPS
+++ b/DEPS
@@ -39,7 +39,7 @@
# co19 is a cipd package. Use update.sh in tests/co19[_2] to update these
# hashes. It requires access to the dart-build-access group, which EngProd
# has.
- "co19_rev": "b9efaddfe0553b6937bf625157f6a13498951346",
+ "co19_rev": "9934d8540d097366287267519413e888a7f6a482",
"co19_2_rev": "368bfa9e877a2df003547f64bb17e30596af10c7",
# As Flutter does, we use Fuchsia's GN and Clang toolchain. These revision
@@ -86,7 +86,7 @@
# For more details, see https://github.com/dart-lang/sdk/issues/30164
"dart_style_tag": "1.3.2", # Please see the note above before updating.
- "dartdoc_tag" : "v0.30.2",
+ "dartdoc_tag" : "v0.30.3",
"ffi_tag": "ea88d71b043ee14b268c3aedff14e9eb32e20959",
"fixnum_tag": "0.10.9",
"glob_tag": "1.1.7",
@@ -113,13 +113,12 @@
"oauth2_tag": "1.2.1",
"observatory_pub_packages_rev": "0894122173b0f98eb08863a7712e78407d4477bc",
"package_config_tag": "v1.9.2",
- "package_resolver_tag": "1.0.10",
"path_tag": "1.6.2",
"pedantic_tag": "v1.8.0",
"ply_rev": "604b32590ffad5cbb82e4afef1d305512d06ae93",
"pool_tag": "1.3.6",
"protobuf_rev": "3746c8fd3f2b0147623a8e3db89c3ff4330de760",
- "pub_rev": "ab109723d9eb782c2ea4cce68c044da40403a652",
+ "pub_rev": "5802dd3407cae29372060934249432077aff1ec6",
"pub_semver_tag": "v1.4.4",
"quiver-dart_tag": "2.0.0+1",
"resource_rev": "f8e37558a1c4f54550aa463b88a6a831e3e33cd6",
@@ -178,7 +177,7 @@
Var("dart_root") + "/tools/sdks": {
"packages": [{
"package": "dart/dart-sdk/${{platform}}",
- "version": "version:2.8.0-dev.0.0",
+ "version": "version:2.8.0-dev.18.0",
}],
"dep_type": "cipd",
},
@@ -339,9 +338,6 @@
Var("dart_root") + "/third_party/pkg_tested/package_config":
Var("dart_git") + "package_config.git" +
"@" + Var("package_config_tag"),
- Var("dart_root") + "/third_party/pkg_tested/package_resolver":
- Var("dart_git") + "package_resolver.git"
- + "@" + Var("package_resolver_tag"),
Var("dart_root") + "/third_party/pkg/path":
Var("dart_git") + "path.git" + "@" + Var("path_tag"),
Var("dart_root") + "/third_party/pkg/pedantic":
diff --git a/benchmarks/BigIntParsePrint/dart/native_version_dummy.dart b/benchmarks/BigIntParsePrint/dart/native_version_dummy.dart
index 42013f0..3858e92 100644
--- a/benchmarks/BigIntParsePrint/dart/native_version_dummy.dart
+++ b/benchmarks/BigIntParsePrint/dart/native_version_dummy.dart
@@ -11,23 +11,21 @@
bool get enabled => false;
- static Object bad(String message) {
- throw UnimplementedError(message);
- }
+ static Object bad(String message) => UnimplementedError(message);
- Object parse(String string) => bad('parse');
- String toStringMethod(Object value) => bad('toStringMethod');
+ Object parse(String string) => throw bad('parse');
+ String toStringMethod(Object value) => throw bad('toStringMethod');
- Object fromInt(int i) => bad('fromInt');
+ Object fromInt(int i) => throw bad('fromInt');
- Object get one => bad('one');
- Object get eight => bad('eight');
+ Object get one => throw bad('one');
+ Object get eight => throw bad('eight');
- int bitLength(Object value) => bad('bitLength');
- bool isEven(Object value) => bad('isEven');
+ int bitLength(Object value) => throw bad('bitLength');
+ bool isEven(Object value) => throw bad('isEven');
- Object add(Object left, Object right) => bad('add');
- Object shiftLeft(Object value, Object count) => bad('shiftLeft');
- Object shiftRight(Object value, Object count) => bad('shiftRight');
- Object subtract(Object left, Object right) => bad('subtract');
+ Object add(Object left, Object right) => throw bad('add');
+ Object shiftLeft(Object value, Object count) => throw bad('shiftLeft');
+ Object shiftRight(Object value, Object count) => throw bad('shiftRight');
+ Object subtract(Object left, Object right) => throw bad('subtract');
}
diff --git a/benchmarks/BigIntParsePrint/dart/native_version_javascript.dart b/benchmarks/BigIntParsePrint/dart/native_version_javascript.dart
index 89f3e9d..fb7e83a 100644
--- a/benchmarks/BigIntParsePrint/dart/native_version_javascript.dart
+++ b/benchmarks/BigIntParsePrint/dart/native_version_javascript.dart
@@ -106,5 +106,6 @@
_eval('self.bigint_isEven = function isEven(b) { return (b & 1n) == 0n; }');
}
-Object _one;
-Object _eight;
+// `dynamic` to allow null initialization pre- and post- NNBD.
+dynamic _one;
+dynamic _eight;
diff --git a/benchmarks/Utf8Decode/dart/Utf8Decode.dart b/benchmarks/Utf8Decode/dart/Utf8Decode.dart
new file mode 100644
index 0000000..23762d6
--- /dev/null
+++ b/benchmarks/Utf8Decode/dart/Utf8Decode.dart
@@ -0,0 +1,139 @@
+// Copyright (c) 2020, 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.
+//
+// Benchmark for UTF-8 decoding
+
+import 'dart:convert';
+import 'dart:typed_data';
+
+import 'package:benchmark_harness/benchmark_harness.dart';
+
+import 'datext_latin1_10k.dart';
+import 'entext_ascii_10k.dart';
+import 'netext_3_10k.dart';
+import 'rutext_2_10k.dart';
+import 'sktext_10k.dart';
+import 'zhtext_10k.dart';
+
+class Utf8Decode extends BenchmarkBase {
+ final String language;
+ final String text;
+ final int size;
+ final bool allowMalformed;
+ final Utf8Decoder decoder;
+ Uint8List data;
+ List<int> chunks;
+ int totalInputSize;
+ int totalOutputSize;
+
+ static String _makeName(String language, int size, bool allowMalformed) {
+ String name = "Utf8Decode.$language.";
+ name += size >= 1000000
+ ? "${size ~/ 1000000}M"
+ : size >= 1000 ? "${size ~/ 1000}k" : "$size";
+ if (allowMalformed) name += ".malformed";
+ return name;
+ }
+
+ Utf8Decode(this.language, this.text, this.size, this.allowMalformed)
+ : decoder = Utf8Decoder(allowMalformed: allowMalformed),
+ super(_makeName(language, size, allowMalformed));
+
+ @override
+ void setup() {
+ data = utf8.encode(text) as Uint8List;
+ if (data.length != 10000) {
+ throw "Expected input data of exactly 10000 bytes.";
+ }
+ if (size < data.length) {
+ // Split into chunks.
+ chunks = <int>[];
+ chunks.add(0);
+ for (int pos = size; pos < data.length; pos += size) {
+ int chunkPos = pos;
+ while ((data[chunkPos] & 0xc0) == 0x80) {
+ chunkPos--;
+ }
+ chunks.add(chunkPos);
+ }
+ chunks.add(data.length);
+ totalInputSize = data.length;
+ totalOutputSize = text.length;
+ } else if (size > data.length) {
+ // Repeat data to the desired length.
+ final Uint8List expanded = Uint8List(size);
+ for (int i = 0; i < size; i++) {
+ expanded[i] = data[i % data.length];
+ }
+ chunks = <int>[0, size];
+ totalInputSize = size;
+ totalOutputSize = text.length * size ~/ data.length;
+ data = expanded;
+ } else {
+ // Use data as is.
+ chunks = <int>[0, data.length];
+ totalInputSize = data.length;
+ totalOutputSize = text.length;
+ }
+ }
+
+ @override
+ void run() {
+ int lengthSum = 0;
+ final int numChunks = chunks.length - 1;
+ for (int i = 0; i < numChunks; i++) {
+ final String s = decoder.convert(data, chunks[i], chunks[i + 1]);
+ lengthSum += s.length;
+ }
+ if (lengthSum != totalOutputSize) {
+ throw "Output length doesn't match expected.";
+ }
+ }
+
+ @override
+ void exercise() {
+ // Only a single run per measurement.
+ run();
+ }
+
+ @override
+ void warmup() {
+ BenchmarkBase.measureFor(run, 1000);
+ }
+
+ @override
+ double measure() {
+ // Report time per input byte.
+ return super.measure() / totalInputSize;
+ }
+
+ @override
+ void report() {
+ // Report time in nanoseconds.
+ final double score = measure() * 1000.0;
+ print("$name(RunTime): $score ns.");
+ }
+}
+
+void main(List<String> args) {
+ const texts = {
+ "en": en,
+ "da": da,
+ "sk": sk,
+ "ru": ru,
+ "ne": ne,
+ "zh": zh,
+ };
+ final bool testMalformed =
+ args != null && args.isNotEmpty && args.first == "malformed";
+ final benchmarks = [
+ // Only benchmark with allowMalformed: false unless specified otherwise.
+ for (bool allowMalformed in [false, if (testMalformed) true])
+ for (int size in [10, 10000, 10000000])
+ for (String language in texts.keys)
+ () => Utf8Decode(language, texts[language], size, allowMalformed)
+ ];
+
+ benchmarks.forEach((bm) => bm().report());
+}
diff --git a/benchmarks/Utf8Decode/dart/datext_latin1_10k.dart b/benchmarks/Utf8Decode/dart/datext_latin1_10k.dart
new file mode 100644
index 0000000..866ff83
--- /dev/null
+++ b/benchmarks/Utf8Decode/dart/datext_latin1_10k.dart
@@ -0,0 +1,62 @@
+// This text is an extract from the Danish Wikipedia article about Donald Duck
+// (Anders And): https://da.wikipedia.org/wiki/Anders_And
+//
+// The extract is based on the Wikipedia database dump. All markup has been
+// removed using WikiExtractor: https://github.com/attardi/wikiextractor
+//
+// The material is licensed under the Creative Commons Attribution-Share-Alike
+// License 3.0: https://creativecommons.org/licenses/by-sa/3.0/
+
+const String da = """
+Anders And
+
+Anders Fauntleroy And er en berømt figur i Disneys tegnefilm og tegneserier. Selv om han ikke er særligt populær i USA, optræder han i mange ugeblade i Europa: I Norge, Tyskland, Sverige, Danmark, Holland, Italien med flere. Hans første optræden var i tegnefilmen "The Wise Little Hen" (Den kloge lille høne) fra 9. juni 1934. Hans karakteristiske stemme blev indtalt af radiokomikeren Clarence Nash, der siden fast lagde stemme til.
+Efter Nash' død i 1985 overtog tegnefilmsdubberen Tony Anselmo. Det var i øvrigt Nash selv, der trænede Anselmo til at lyde som Anders And. I Danmark har tre lagt stemme til Anders And: Bjarne H. Hansen, Dick Kaysø og Peter Zhelder. Dick Kaysø og Peter Zhelder lægger stadigvæk stemme til ham.
+
+Anders And var en bifigur til filmen Den lille kloge Høne, han havde et langt spidst næb og en utrolig kort lunte; der skulle ikke meget til for at udløse et raserianfald hos ham. Klassikerne er fra 1930'erne, hvor Mickey, Fedtmule og Anders er et trekløver, der er film som "Mickeys Campingvogn," "Tårnuret" og "Ensomme Spøgelser." Fred Spencer og Dick Lundy var animatorer. Efterhånden opnåede anden større popularitet, hvad der ikke rigtig huede Disney, der ikke brød sig om den krakilske and. Men Anders blev forfremmet til hovedfigur i en serie film, der begyndte med "Anders And og Strudsen" i 1938. Med den var det "ande-teamet" hos Disney født: instruktøren Jack King og assistenterne Carl Barks (den senere serieskaber), Chuck Couch, Harry Reeves og Jack Hannah. Han var stadigvæk en hidsigprop, men han blev gjort mere nuanceret, og nye figurer blev tilføjet som nevøerne Rip, Rap og Rup, kæresten Andersine And og i en enkelt film Fætter Guf.
+
+Under 2. verdenskrig blev der lavet film om anden i militærtjeneste, som han selvfølgelig gør meget klodset. Mest kendt er "Der Fuehrers Face" fra 1943, hvor anden drømmer, at han er i diktaturstaten Nutziland. Den film blev arkiveret af Disney efter krigen, men er senere vist meget uofficielt. Desuden medvirkede han i to mindre kendte spillefilm "Saludos Amigos" 1943 og "The Three Caballeros" 1945, der gav et lystigt billede af livet i Latinamerika.
+
+Efter krigen blev omgivelserne mere hjemlige, men næppe mere fredfyldte. I 1947 overtog Jack Hannah pladsen som instruktør. Filmene handlede ofte om klammeri med andre, det kunne være en bi, Chip og Chap eller bare ting han ikke kunne få til at makke ret. Anders var her ofte plageånden, hvis egne drillerier kom tilbage som en boomerang.
+
+Fjernsynets fremmarch i 1950'erne satte snart stopper for de korte tegnefilm, og Jack Hannah blev sat til at redigere Disneys tv-shows og kæde de korte tegnefilm sammen i et længere forløb. Her blev Anders gjort mere sympatisk, men det var eksperten i alt, Raptus von And, der gjorde mest for tv-showet. I et andet tv-show Disney Sjov medvirkede Anders i tv-serierne Rip, Rap og Rup på eventyr, Bonkers, og Rap Sjak. I Rip, Rap og Rup på eventyr, var han sjældent med, men fik et nyt tøj. I Rap Sjak var hans matrostøj skiftet ud med en hawaii-skjorte med røde og hvide blomster. I Bonkers var han også med kort tid.
+
+Anders And gik til tegneserien allerede tidligt efter sin debut i 1934, hvor han i avisstriber optrådte med sin makker fra "The Wise Little Hen," Peter Gris. Fra den 10. februar 1935 blev han en del af Mickeys avisstribe som musens kujonagtige og drillesyge ven, men fra 1936 kaprede han hovedrollen i Silly Symphony-striben. Forfatteren Ted Osborne og tegneren Al Taliaferro, der stod bag serieudgaven af The Wise Little Hen, pressede på, og da det blev en succes kunne forfatteren Bob Karp i samarbejde med Taliaferro lave andens egen avisstribe.
+
+Det blev en populær serie. I de allertidligste serier var Anders en hidsig, ondskabsfuld og pueril and med langt spidst næb og hænder, der knap kunne skelnes fra vinger. Senere blev han mere voksen, da han fik ansvaret for sine tre nevøer Rip, Rap og Rup, og kæresten Andersine kom til sammen med Bedstemor And.
+
+Tegneseriefiguren Anders And blev senere udviklet yderligere af Carl Barks. I de tidlige tegnefilm var han for det meste doven og hidsig; men for at gøre hans figur brugbar til en tegneserie besluttede Barks at udvide hans personlighed. Anders' mest gennemgående karaktertræk er hans notoriske uheld, som desuden har den narrative funktion at give adgang til spændende eventyr, uden at serien udvikler sig for meget. På denne måde kan Anders eksempelvis blive involveret i alverdens skattejagter, og da han altid ender med at miste den fundne gevinst, kan alle historierne starte fra samme udgangspunkt.
+
+For at give Anders en verden at bo i, skabte Barks byen Andeby i den amerikanske stat Calisota (som er en blanding af de to amerikanske stater Californien og Minnesota) med indbyggere som den rige onkel Joakim von And, den heldige Fætter Højben og den dygtige opfinder Georg Gearløs.
+
+Anders lægger med sit engelske navn Donald Duck i øvrigt navn til donaldismen, fankulturen omkring Disney-tegneserier og -tegnefilm, som den norske forfatter Jon Gisle udviklede med sin bog af samme navn.
+
+Anders bor i Andeby på Paradisæblevej 111 med sine tre nevøer Rip, Rap og Rup. De er stort set identiske, men de kan i nogle historier identificeres på, hvilken farve kasket de har på.
+
+Ifølge Disneytegneserieforfatteren Don Rosa var Anders født et eller andet sted omkring 1920 men dette er "ikke" officielt. Ifølge Carl Barks' stamtræ (senere udviklet og genbygget af Don Rosa for den danske udgiver Egmont Serieforlaget) er Anders' forældre Hortensia von And og Rapmus And. Anders har en søster ved navn Della And, men hverken hun eller Anders' forældre optræder i tegnefilmene eller tegneserierne bortset fra særlige steder som eksempelvis i Her er dit liv, Joakim. Ifølge Don Rosa er Anders og Della tvillinger.
+
+Fra tegnefilmen "Mr. Duck Steps Out" har Anders' kæreste været Andersine And, men han går i stadig fare for at miste hende til den heldige Fætter Højben. I nogle italienske historier er Anders også superhelt under dæknavnet "Stålanden".
+
+Anders' onkel, Joakim von And, er den rigeste and i verden.
+
+Sammen med onkelen og nevøerne Rip, Rap og Rup har Anders And rejst jorden rundt til mange forskellige lande og steder. Blandt disse er landet Langtbortistan, hvis navn blev opfundet af den danske oversætter Sonja Rindom og senere er gledet ind i almindeligt, dansk sprogbrug.
+
+I de tidlige historier af Carl Barks havde Anders en hale, der stak langt bagud. Han havde langt næb og lang hals, og hans matrostrøje havde fire knapper. Hans lange hals passede godt til egenskaben nysgerrighed og det lange næb til hans hidsighed, hvilket var to egenskaber, der prægede ham mest. Disse tidlige historier var også præget af en grov komik i stil med tegnefilmene.
+
+Siden fik han et mere strømlinet udseende og kortere næb (dog ikke så kort som visse tegnere i 1960'erne gjorde det!) og kun to knapper på trøjen, et udseende de øvrige andetegnere også tager til sig. Her blev hans natur også mere sammensat, og han ligner mest af alt en tragisk helt. Komikken kommer mere og mere til at ligge i replikkerne.
+
+Anders And optræder særligt i jumbobøgerne med en hemmelig identitet i form af superhelten Stålanden. Figuren er inspireret af Batman og er skabt af den italienske forfatter Guido Martina i samarbejde med kunstneren Giovan Battista Carpi i 1969 i hans italienske navn Paperinik. Ofte tegnet af Romano Scarpa.
+
+I lighed med inspirationskilden er han maskeret og har et hav af tekniske opfindelser, som han bruger i kamp mod forbryderne og overvejende! i kamp for at redde sit andet jeg, Anders And, ud af kniben. Den eneste, som kender hans hemmelige identitet, er opfinderen Georg Gearløs, som har udstyret gamle 313 med moderne udstyr og finurligheder. Det er ikke så tit at Stålanden optræder; næsten kun i Jumbobøger, men har dog også optrådt i Anders And-bladene med en gæstehistorie, hvor Stålanden kæmper mod en tidligere fjende, som nu havde kaldt sig Lord Hvalros.
+
+Efter at Stålanden i starten af 1990'erne ikke var benyttet så meget af historieskriverne, forsvandt han næsten ud af Disney-universet indtil 1996, hvor en ny serie, "Stålanden på nye eventyr", startede med Stålanden i hovedrollen (umiddelbart inspireret af Marvel universet). Denne relancering af Stålanden gav karakteren det ekstra, der skulle til for at få et godt comeback.
+
+I modsætning til størstedelen af Anders And-tegneserier har denne serie en sammenhængende forløb. I serien optræder kun sjældent de andre figurer fra de normale Anders And tegneserier; oftest er det kun en kort birolle eller en reference, men til gengæld er en mængde nye figurer kommet til.
+
+Serien starter med, at Anders And er ansat som vicevært i Ducklair Tower, et højhus bygget af mangemilliardæren Everett Ducklair, en fremragende videnskabsmand og opfinder, som forlod Andeby og drog til et tibetansk kloster, Dhasam-Bul. Anders finder Globus, en kunstig intelligens skabt af Ducklair, samt Ducklair's arsenal af våben og opfindelser. Dette bliver starten på Anders' liv som Stålanden.
+En mængde temaer var ofte i centrum for historierne, bl.a. tidsrejser og Tidspolitiets kamp med tidspiraterne fra Organisationen, invasion fra rummet af de magtsyge evronianere, Stålandens samarbejde med FBI og meget mere.
+
+Serien fik en fornyelse i 2001, hvilket ændrede markant på historierne. Everett Ducklair vender tilbage, slukker Globus, smider Stålanden ud af Ducklair Tower og genopretter sit gamle imperium. Undervejs bliver Ducklair's to døtre afsløret. De hader begge Everett af grunde, der ikke bliver afsløret til fulde, selvom det bliver antydet, at Everett skilte sig af med deres mor på en eller anden måde.
+Denne fornyelse holdt 18 numre, før serien blev afsluttet, dog uden at historierne fik en slutning.
+
+Barks-historien "Anders And og den gyldne hjelm" fra 1954 kom i 2006 med i """;
diff --git a/benchmarks/Utf8Decode/dart/entext_ascii_10k.dart b/benchmarks/Utf8Decode/dart/entext_ascii_10k.dart
new file mode 100644
index 0000000..9353d6d
--- /dev/null
+++ b/benchmarks/Utf8Decode/dart/entext_ascii_10k.dart
@@ -0,0 +1,35 @@
+// This text is an extract from the English Wikipedia article about Anarchism:
+// https://en.wikipedia.org/wiki/Anarchism
+//
+// The extract is based on the Wikipedia database dump. All markup has been
+// removed using WikiExtractor: https://github.com/attardi/wikiextractor
+//
+// The material is licensed under the Creative Commons Attribution-Share-Alike
+// License 3.0: https://creativecommons.org/licenses/by-sa/3.0/
+
+const String en = """
+Anarchism
+
+Anarchism is a radical political movement that is highly skeptical towards authority and rejects all forms of unjust hierarchy. It calls for the abolition of the state which it holds to be undesirable, unnecessary, and harmful. Anarchism advocates for the replacement of the state with stateless societies or other forms of free associations.
+
+Anarchism's timeline stretches back to prehistory when people lived in anarchistic societies long before the establishment of formal states, kingdoms or empires. With the rise of organised hierarchical bodies, skepticism towards authority also rose, but it was not until the 19th century a self-conscious political movement was formed. During the latest half of 19th and the first decades of 20th century, the anarchist movement flourished to most parts of the world, and had a significant role in worker's struggles for emancipation. Various branches of anarchism were espoused during those times. Anarchists took part in several revolutions, most notably in the Spanish Civil War, where they were crushed by the fascists forces in 1939, marking the end of the classical era of anarchism. In the latest decades of the 20th century, the anarchist movement nonetheless became relevant and vivid once more.
+
+Anarchism employ various tactics in order to meet their ideal ends; these can be broadly separated in revolutionary and evolutionary tactics. There is significant overlap between the two legs which are merely descriptive. Revolutionary tactics aim to bring down authority and state, and have taken a violent turn in the past. Evolutionary tactics aim to prefigure what an anarchist society would be like. Anarchism's thought, criticism and praxis has played a part in diverse fields of human society.
+
+The etymological origin of the word "anarchism" is from the ancient Greek word "anarkhia", meaning "without a ruler", composed of the prefix "an-" (i.e. "without") and the word "arkhos" (i.e. "leader" or "ruler"). The suffix -ism denotes the ideological current that favours anarchy. The word "anarchism" appears in English from 1642 as "anarchisme" and the word "anarchy" from 1539. Various factions within the French Revolution labelled their opponents as "anarchists", although few such accused shared many views with later anarchists. Many revolutionaries of the 19th century such as William Godwin (17561836) and Wilhelm Weitling (18081871) would contribute to the anarchist doctrines of the next generation, but they did not use the word "anarchist" or "anarchism" in describing themselves or their beliefs.
+
+The first political philosopher to call himself an "anarchist" () was Pierre-Joseph Proudhon (18091865), marking the formal birth of anarchism in the mid-19th century. Since the 1890s and beginning in France, the term "libertarianism" has often been used as a synonym for anarchism and its use as a synonym is still common outside the United States. On the other hand, some use "libertarianism" to refer to individualistic free-market philosophy only, referring to free-market anarchism as libertarian anarchism.
+
+While opposition to the state is central to anarchist thought, defining anarchism is not an easy task as there is a lot of talk among scholars and anarchists on the matter and various currents perceive anarchism slightly differently. Hence, it might be true to say that anarchism is a cluster of political philosophies opposing authority and hierarchical organization (including the state, capitalism, nationalism and all associated institutions) in the conduct of all human relations in favour of a society based on voluntary association, on freedom and on decentralisation, but this definition has the same shortcomings as the definition based on etymology (which is simply a negation of a ruler), or based on anti-statism (anarchism is much more than that) or even the anti-authoritarian (which is an "a posteriori" conclusion). Nonetheless, major elements of the definition of anarchism include the following:
+
+During the prehistoric era of mankind, an established authority did not exist. It was after the creation of towns and cities that institutions of authority were established and anarchistic ideas espoused as a reaction. Most notable precursors to anarchism in the ancient world were in China and Greece. In China, philosophical anarchism (i.e the discussion on the legitimacy of the state) was delineated by Taoist philosophers Zhuangzi and Lao Tzu. Likewise, anarchic attitudes were articulated by tragedians and philosophers in Greece. Aeschylus and Sophocles used the myth of Antigone to illustrate the conflict between rules set by the state and personal autonomy. Socrates questioned Athenian authorities constantly and insisted to the right of individual freedom of consciousness. Cynics dismissed human law ("nomos") and associated authorities while trying to live according to nature ("physis"). Stoics were supportive of a society based on unofficial and friendly relations among its citizens without the presence of a state.
+
+During the Middle Ages, there was no anarchistic activity except some ascetic religious movements in the Islamic world or in Christian Europe. This kind of tradition later gave birth to religious anarchism. In Persia, Mazdak called for an egalitarian society and the abolition of monarchy, only to be soon executed by the king. In Basra, religious sects preached against the state. In Europe, various sects developed anti-state and libertarian tendencies. Libertarian ideas further emerged during the Renaissance with the spread of reasoning and humanism through Europe. Novelists fictionalised ideal societies that were based not on coercion but voluntarism. The Enlightenment further pushed towards anarchism with the optimism for social progress.
+
+During the French Revolution, the partisan groups of Enrags and saw a turning point in the fermentation of anti-state and federalist sentiments. The first anarchist currents developed throughout the 18th centuryWilliam Godwin espoused philosophical anarchism in England, morally delegitimizing the state, Max Stirner's thinking paved the way to individualism, and Pierre-Joseph Proudhon's theory of mutualism found fertile soil in France. This era of classical anarchism lasted until the end of the Spanish Civil War of 1936 and is considered the golden age of anarchism.
+Drawing from mutualism, Mikhail Bakunin founded collectivist anarchism and entered the International Workingmen's Association, a class worker union later known as the First International that formed in 1864 to unite diverse revolutionary currents. The International became a significant political force, and Karl Marx a leading figure and a member of its General Council. Bakunin's faction, the Jura Federation and Proudhon's followers, the mutualists, opposed Marxist state socialism, advocating political abstentionism and small property holdings. After bitter disputes the Bakuninists were expelled from the International by the Marxists at the 1872 Hague Congress. Bakunin famously predicted that if revolutionaries gained power by Marxist's terms, they would end up the new tyrants of workers. After being expelled, anarchists formed the St. Imier International. Under the influence of Peter Kropotkin, a Russian philosopher and scientist, anarcho-communism overlapped with collectivism. Anarcho-communists, who drew inspiration from the 1871 Paris Commune, advocated for free federation and distribution of goods according to one's needs.
+
+At the turning of the century, anarchism had spread all over the world. In China, small groups of students imported the humanistic pro-science version of anarcho-communism. Tokyo was a hotspot for rebellious youth from countries of the far east, pouring into the Japanese capital to study. In Latin America, So Paulo was a stronghold for anarcho-syndicalism where it became the most prominent left-wing ideology. During this time, a minority of anarchists adopted tactics of revolutionary political violence. This strategy became known as propaganda of the deed. The dismemberment of the French socialist movement into many groups and the execution and exile of many Communards to penal colonies following the suppression of the Paris Commune favoured individualist political expression and acts. Even though many anarchists distanced themselves from these terrorist acts, infamy came upon the movement. Illegalism was another strategy which some anarchists adopted these same years.
+Anarchists enthusiastically participated in the Russian Revolutiondespite concernsin opposition to the Whites. However, they met harsh suppression after the Bolshevik government was stabilized. Several anarchists from Petrograd and Moscow fled to Ukraine, notably leading to the Kronstadt rebellion and Nestor Makhno's struggle in the Free Territory. With the anarchists being crushed in Russia, two new antithetical currents emerged, namely platformism and synthesis anarchism. The former sought to create a coherent group that would push for the revolution while the latter were against anything that would resemble a political party. Seeing the victories of the Bolsheviks in the October Revolution and the resulting Russian Civil War, many workers and activists turned to communist parties which grew at the expense of anarchism and other socialist movements. In France and the United States, members of major syndicalist movements, the General Confederation of Labour and Industrial Workers of the World, left their organisations and joined the Communist International.
+
+In the Spanish Civil War, anarchists and syndicalists (CNT and FAI) once again allied themselves with various currents of leftists. A long tradition of Spanish anarchism led to anarchists playing a pivotal role in the war. In response to the army rebellion, an anarchist-inspired movement of peasants and workers, supported by armed militias, took control of Barcelona and of large areas of rural Spain where they collectivised """;
diff --git a/benchmarks/Utf8Decode/dart/netext_3_10k.dart b/benchmarks/Utf8Decode/dart/netext_3_10k.dart
new file mode 100644
index 0000000..be53bc3
--- /dev/null
+++ b/benchmarks/Utf8Decode/dart/netext_3_10k.dart
@@ -0,0 +1,24 @@
+// This text is an extract from the Nepali Wikipedia article about Nepal
+// (नेपाल): https://ne.wikipedia.org/wiki/नेपाल
+//
+// The extract is based on the Wikipedia database dump. All markup has been
+// removed using WikiExtractor: https://github.com/attardi/wikiextractor
+//
+// The material is licensed under the Creative Commons Attribution-Share-Alike
+// License 3.0: https://creativecommons.org/licenses/by-sa/3.0/
+
+const String ne = """
+नेपाल
+
+नेपाल (आधिकारिक नाम: सङ्घीय लोकतान्त्रिक गणतन्त्र नेपाल) दक्षिण एसियाली भूपरिवेष्ठित हिमाली राष्ट्र हो । यसको भौगोलिक अक्षांश २६ डिग्री २२ मिनेटदेखि ३० डिग्री २७ मिनेट उत्तर र ८० डिग्री ४ मिनेटदेखि ८८ डिग्री १२ मिनेट पूर्वी देशान्तरसम्म फैलिएको छ । यसको कूल क्षेत्रफल १,४७,१८१ वर्ग कि.मि छ । यो क्षेत्रफल पृथ्वीको कूल क्षेत्रफलको ०.०३% र एसिया महादेशको ०.३% पर्दछ । लण्डन स्थित "ग्रीनवीच मिनटाइम" भन्दा पूर्वतर्फ रहेकोले गौरीशङ्कर हिमालको नजिक भएर जाने ८६ डिग्री १५ मिनेट पूर्वी देशान्तरलाई आधार मानी नेपालको प्रमाणिक समय ५ घण्टा ४५ मिनेट आगाडि मानिएको छ ।
+
+नेपालको पूर्वी सीमाना मेची नदीदेखि पश्चिमी सीमाना महाकाली नदीसम्मको औसत लम्वाई ८८५ कि.मि. छ । उत्तरदेखि दक्षिणको चौडाई भने एकनासको छैन । पूर्वी भागभन्दा पश्चिमी भाग केही चौडा छ । त्यस्तै मध्य भाग भने केही खुम्चिएको छ । यसमा अधिकतम चौडाई २४१ कि.मि. र न्यूनतम चौडाई १४५ कि.मि. रहेको छ । यसर्थ नेपालको औसत चौडाई १९३ कि.मि. रहेको छ । नेपालको उत्तरमा चीनको स्वशासित क्षेत्र तिब्बत पर्दछ भने दक्षिण, पूर्व र पश्चिममा भारत पर्दछ । नेपालका ८०% भन्दा बढी नागरिक हिन्दू धर्म मान्दछन् जुन विश्वकै सबैभन्दा बढी प्रतिशत हिन्दू धर्मावलम्बी हुने राष्ट्र पनि हो । यसबाहेक बौद्ध, इस्लाम, किराॅत आदि धर्म मान्ने मानिसहरू पनि यहाँ बसोबास गर्दछन् । एउटा सानो क्षेत्रको लागि नेपालको भौगोलिक विविधता निकै उल्लेखनीय छ । यहाँ तराईका उष्ण फाँटदेखि चिसा हिमालयका शृंखला अवस्थित छन् । संसारका सबैभन्दा उच्च १४ हिमश्रृंखलाहरु मध्ये ८ वटा नेपालमा पर्दछन्, जसमध्ये संसारको सर्वोच्च शिखर सगरमाथा (नेपाल र चीनको सीमानामा पर्ने) पनि एक हो । नेपालको प्रमुख सहर एवं राजधानी काठमाडौं हो । काठमाडौं, ललितपुर र भक्तपुर सहरहरूलाई काठमाडौं उपत्यका भनेर चिनिन्छ । अन्य प्रमुख सहरहरूमा भरतपुर, बिराटनगर, भैरहवा, वीरगञ्ज, जनकपुर, पोखरा, नेपालगञ्ज, धनगढी र महेन्द्रनगर पर्दछन् ।
+
+नेपाल शब्दको उत्त्पत्ति बारेमा ठोस प्रमाण त उपलब्ध छैन, तर एक प्रसिद्ध विश्वास अनुसार मरिची ॠषि पुत्र 'ने' मुनिले पालन गरेको ठाउँको रूपमा यहाँको नाम नेपाल रहन गएको हो । निरन्तर रूपमा राजा-रजौटाहरूको अधीनमा रहेर फुट्ने र जुट्ने लामो तथा सम्पन्न इतिहास बोकेको, अहिले नेपाल भनेर चिनिने यो खण्डले वि. सं. २०४६ सालको आन्दोलन पश्चात् संवैधानिक राजतन्त्रको नीति अवलम्बन गर्यो । तर यस पश्चात् पनि राजसंस्था एक महत्त्वपूर्ण तथा अस्पष्ट परिधि तथा शक्ति भएको संस्थाको रूपमा रहिरह्यो । यो व्यवस्थामा पहिले संसदीय अनिश्चितता तथा सन् १९९६ देखि ने.क.पा.(माओवादी)को जनयुद्धको कारणले राष्ट्रिय अनिश्चितता देखियो ।
+
+माओवादीहरूले राजनीतिको मूलाधारबाट अल्लगिएर भूमिगत रूपमा राजतन्त्र तथा मूलाधारका राजनीतिक दलहरूको विरुद्धमा गुरिल्ला युद्ध सञ्चालन गरे, जसको कारण १३,००० भन्दा बढी मानिसहरूको ज्यान जान पुग्यो । यही विद्रोहलाई दमन गर्ने पृष्ठभूमिमा राजाले सन् २००२ मा संसदको विघटन गरी निर्वाचित प्रधानमन्त्रीलाई अपदस्त गरेर प्रधानमन्त्री मनोनित गर्दै शासन चलाउन थाले । सन् २००५ मा उनले एकनासै संकटकालको घोषणा गरेर सबै कार्यकारी शक्ति ग्रहण गरे। सन् २००६को लोकतान्त्रिक आन्दोलन (जनाअन्दोलन-२) पश्चात् राजाले देशको सार्वभौमसत्ता जनतालाई हस्तान्तरण गरे तथा अप्रिल २४, २००६ मा भंग गरिएको संसद पूनर्स्थापित भयो । मे १८, २००६ मा आफूले पाएको सार्वभौमसत्ताको उपयोग गर्दै नयाँ प्रतिनिधि सभाले राजाको अधिकारमा कटौती गर्यो तथा नेपाललाई एक धर्मनिरपेक्ष राष्ट्र घोषणा गर्यो । अन्तरिम व्यवस्थापिका संसदले पहिले नै घोषणा गरिसकेको "सङ्घीय लोकतान्त्रिक गणराज्य, संविधानसभा" को पहिलो बैठकबाट मे २८, २००८ मा आधिकारिक रूपमा कार्यान्वयन भयो । नेपालको भूगोल सानो भए पनी नेपालीहरु को मन ठुलो छ ।
+
+हिमालय क्षेत्रमा मानिसहरू बस्न थालेको कम्तिमा पनि ९,००० वर्ष भएको कुरा काठमाडौं उपत्यकामा पाइएका प्राचीन औजारहरूबाट पुष्टि हुन्छ। सम्भवत: भोट-बर्मेली मूलका मानिसहरू नेपालमा २,५०० वर्ष अगाडि बसोबास गर्दथे।
+
+ईशापूर्व १५०० तिर इन्डो-आर्यन जातिहरू उपत्यका प्रवेश गरे। ईशापूर्वको १००० तिर स-साना राज्यहरू र राज्यसङ्गठनहरू बने। सिद्धार्थ गौतम (ईशापूर्व ५६३–४८३) त्यस्तै एक वंश, शाक्यवंशका राजकुमार थिए, जसले आफ्नो राजकाज त्यागी तपस्वीको जीवन अँगाले र उनी बुद्ध भनेर विश्व प्रसिद्ध भए।
+ईशापूर्वको २५० सम्ममा, यो क्षेत्र उत्तर""";
diff --git a/benchmarks/Utf8Decode/dart/rutext_2_10k.dart b/benchmarks/Utf8Decode/dart/rutext_2_10k.dart
new file mode 100644
index 0000000..50b0130
--- /dev/null
+++ b/benchmarks/Utf8Decode/dart/rutext_2_10k.dart
@@ -0,0 +1,44 @@
+// This text is an extract from the Russian Wikipedia article about Lithuania
+// (Литва): https://ru.wikipedia.org/wiki/Литва
+//
+// The extract is based on the Wikipedia database dump. All markup has been
+// removed using WikiExtractor: https://github.com/attardi/wikiextractor
+//
+// The material is licensed under the Creative Commons Attribution-Share-Alike
+// License 3.0: https://creativecommons.org/licenses/by-sa/3.0/
+
+const String ru = """
+Литва
+
+Литва́ (), официальное название Лито́вская Респу́блика () государство, расположенное в северной части Европы. Столица страны Вильнюс.
+
+Площадь км². Протяжённость с севера на юг 280 км, а с запада на восток 370 км. Население составляет человек (сентябрь, 2019). Занимает 140-е место место в мире по численности населения и 121-е по территории. Имеет выход к Балтийскому морю, расположена на его восточном побережье. Береговая линия составляет всего 99 км (наименьший показатель среди государств Балтии). На севере граничит с Латвией, на юго-востоке с Белоруссией, на юго-западе с Польшей и Калининградской областью России.
+
+Член ООН с 1991 года, ЕС и НАТО с 2004 года, ОЭСР с мая 2018 года. Входит в Шенгенскую зону и Еврозону.
+
+Независимость страны провозглашена 11 марта 1990 года, а юридически оформлена 6 сентября 1991 года. .
+
+Этимология слова «Литва» точно не известна, при этом существует множество версий, ни одна из которых не получила всеобщего признания. Корень «лит» и его варианты «лет»/«лют» допускают различные толкования как в балтских и славянских, так и в других индоевропейских языках. Так, например, существуют созвучные топонимы на территории Словакии «"Lytva"» и Румынии «"Litua"», известные с XIXII веков. По мнению Е. Поспелова, топоним образован от древнего названия реки Летава (Lietavà от «лить», русское «Летаука»). Феодальное княжество, по землям которого протекала эта река, со временем заняло ведущее положение и название было распространено на всё государство. В «Повести временных лет» (XII век) упоминается этноним «литва», полностью совпадающий с названием местности «Литва» и по смыслу (территория, где живёт литва), и по форме.
+
+Поверхность равнинная со следами древнего оледенения. Поля и луга занимают 57 % территории, леса и кустарники 30 %, болота 6 %, внутренние воды 1 %.
+
+Высшая точка 293,84 м над уровнем моря холм Аукштояс (или Аукштасис калнас) в юго-восточной части страны, в 23,5 км от Вильнюса.
+
+Крупнейшие реки Неман и Вилия.
+Более 3 тыс. озёр (1,5 % территории): крупнейшее из них Друкшяй на границе Латвии, Литвы и Белоруссии (площадь 44,8 км²), самое глубокое Таурагнас, 61 м), самое длинное Асвея длинной в 30 км у местечка Дубингяй.
+
+Климат переходный от морского к континентальному. Средняя температура зимой 5 °C, летом +17 °C. Выпадает 748 мм осадков в год.
+
+Полезные ископаемые: торф, минеральные материалы, строительные материалы.
+
+Территория современной Литвы была заселена людьми с конца XIX тысячелетия до н. э. Жители занимались охотой и рыболовством, использовали лук и стрелы с кремнёвыми наконечниками, скребки для обработки кожи, удочки и сети. В конце неолита (IIIII тысячелетия до н. э.) на территорию современной Литвы проникли индоевропейские племена. Они занимались земледелием и скотоводством, при этом охота и рыболовство оставались основными занятиями местных жителей вплоть до широкого распространения железных орудий труда. Индоевропейцы, заселившие земли между устьями Вислы и Западной Двины, выделились в отдельную группу, названную учёными балтами.
+
+Традиционно считается, что этническая основа Литвы сформирована носителями археологической культуры восточнолитовских курганов, сложившейся в V веке н. э. на территории современных Восточной Литвы и Северо-Западной Белоруссии. Около VII века литовский язык отделился от латышского.
+
+Становление государственности на территории современной Литвы относят к XIII веку, при этом само название «Литва» впервые упомянуто в Кведлинбургских анналах под 1009 годом в сообщении об убийстве язычниками миссионера Бруно на границе Руси и Литвы. По наиболее распространённой версии, топоним возник от названия небольшой реки Летаука, притока Няриса. Согласно более современной гипотезе, название страны могло произойти от этнонима «леты» или «лейти», которым жители окрестных земель называли дружинников литовских князей.
+
+В начале XIII века в земли балтов-язычников с запада началось вторжение немецких рыцарей-крестоносцев. Они покорили Пруссию и Ливонию. В это же время с юга началась экспансия Галицко-Волынского княжества. К середине XIII века многие литовские земли были объединены под властью князя Миндовга, принявшего в 1251 году католическое крещение и коронованного в 1253 году. Через несколько лет Миндовг отрёкся от христианства и до начала XIV века литовские земли оставались языческими. Несмотря на то, что уже в 1263 году Миндовг был свергнут, его правление положило начало более чем пятисотлетнему существованию Великого княжества Литовского.
+
+В XIV начале XV веках территория Великого княжества Литовского стремительно росла, в основном за счёт присоединения земель Западной Руси. Включение в состав государства славянских земель, многократно превышающих по площади и количеству населения собственно литовские земли, привело к перениманию литовскими князьями, получившими во владение русские земли, православной культуры и западнорусского языка. Со временем западнорусский язык стал официальным языком канцелярии великих князей. Собственно литовский язык до XVI века оставался бесписьменным, хотя и продолжал использоваться на этнически литовских землях.
+
+В 1385 году великий князь литовский Ягайло заключил Кревскую унию с Королевством Польским. По условиям унии, Ягайло обязался присоединить Великое княжество Литовское к Королевству Польскому и крестить литовские земли по католическому обряду, а сам становился королём Польши и сохранял титул великого князя литовского. Однако вскоре он вынужден был уступить власть в Великом княжестве Литовском своему двоюродному брату Витовту.""";
diff --git a/benchmarks/Utf8Decode/dart/sktext_10k.dart b/benchmarks/Utf8Decode/dart/sktext_10k.dart
new file mode 100644
index 0000000..b1ce251
--- /dev/null
+++ b/benchmarks/Utf8Decode/dart/sktext_10k.dart
@@ -0,0 +1,46 @@
+// This text is an extract from the Slovak Wikipedia article about Esperanto:
+// https://sk.wikipedia.org/wiki/Esperanto
+//
+// The extract is based on the Wikipedia database dump. All markup has been
+// removed using WikiExtractor: https://github.com/attardi/wikiextractor
+//
+// The material is licensed under the Creative Commons Attribution-Share-Alike
+// License 3.0: https://creativecommons.org/licenses/by-sa/3.0/
+
+const String sk = """
+Esperanto (pôvodne Lingvo Internacia – „medzinárodný jazyk“) je najrozšírenejší medzinárodný plánový jazyk. Názov je odvodený od pseudonymu, pod ktorým v roku 1887 zverejnil lekár L. L. Zamenhof základy tohto jazyka. Zámerom tvorcu bolo vytvoriť ľahko naučiteľný a použiteľný neutrálny jazyk, vhodný na použitie v medzinárodnej komunikácii. Cieľom nebolo nahradiť národné jazyky, čo bolo neskôr aj deklarované v Boulonskej deklarácii.
+
+Hoci žiaden štát neprijal esperanto ako úradný jazyk, používa ho komunita s odhadovaným počtom hovoriacich 100 000 až 2 000 000, z čoho približne 2 000 tvoria rodení hovoriaci. V Poľsku je na zozname nemateriálneho kultúrneho dedičstva. Získalo aj isté medzinárodné uznania, napríklad dve rezolúcie UNESCO či podporu známych osobností verejného života. V súčasnosti sa esperanto využíva pri cestovaní, korešpondencii, medzinárodných stretnutiach a kultúrnych výmenách, kongresoch, vedeckých diskusiách, v pôvodnej aj prekladovej literatúre, divadle a kine, hudbe, tlačenom aj internetovom spravodajstve, rozhlasovom a televíznom vysielaní.
+
+Slovná zásoba esperanta pochádza predovšetkým zo západoeurópskych jazykov, zatiaľ čo jeho skladba a tvaroslovie ukazujú na silný slovanský vplyv. Morfémy sú nemenné a je možné ich kombinovať takmer bez obmedzení do rozmanitých slov; esperanto má teda mnoho spoločného s analytickými jazykmi, ako je čínština, zatiaľ čo vnútorná stavba jeho slov pripomína jazyky aglutinačné, ako je japončina, swahilčina alebo turečtina.
+
+Pri zrode esperanta stál Ludwik Lejzer Zamenhof. Vyrastal v mnohojazyčnom, vtedy ruskom, teraz poľskom meste Białystok, kde bol svedkom častých sporov medzi jednotlivými národnosťami (Rusi, Poliaci, Nemci, Židia). Pretože za jednu z hlavných príčin týchto sporov považoval neexistenciu spoločného jazyka, začal už ako školák pracovať na projekte reči, ktorá by túto funkciu mohla plniť. Mala byť, na rozdiel od národných jazykov, neutrálna a ľahko naučiteľná, teda prijateľná ako druhý jazyk pre všetkých, jazyk vyučovaný spoločne s národnými jazykmi a používaný v situáciách vyžadujúcich dorozumenie medzi národmi.
+
+Zamenhof najskôr uvažoval o oživení latinčiny, ktorú sa učil v škole, ale usúdil, že je pre bežné dorozumievanie zbytočne zložitá. Keď študoval angličtinu, všimol si, že časovanie slovies podľa osoby a čísla nie je nutné; že gramatický systém jazyka môže byť oveľa jednoduchší, než sa dovtedy nazdával. Stále však zostávala prekážka v memorovaní sa veľkého množstva slov. Raz Zamenhofa zaujali dva ruské nápisy: "швейцарская" [švejcarskaja] (vrátnica, odvodené od "швейцар" [švejcar] – vrátnik) a "кондитерская" [konditerskaja] (cukráreň, odvodené od "кондитер" [konditér] – cukrár). Tieto slová rovnakého zakončenia mu vnukli myšlienku, že používanie pravidelných predpôn a prípon by mohlo významne znížiť množstvo slovných koreňov nutných na dorozumenie sa. Aby boli korene čo najmedzinárodnejšie, rozhodol sa prevziať slovnú zásobu predovšetkým z románskych a germánskych jazykov, teda tých, ktoré boli vtedy v školách po celom svete vyučované najčastejšie.
+Prvý Zamenhofov projekt, nazvaný "Lingwe uniwersala," bol viac-menej hotový už v roku 1878, ale autorov otec, učiteľ jazykov, považoval túto prácu za márnu a utopistickú, a zrejme preto rukopis, ktorý mu bol zverený, zničil. V rokoch 1879 – 1885 Zamenhof študoval medicínu v Moskve a vo Varšave. V tej dobe začal znova pracovať na medzinárodnom jazyku. Prvú obnovenú verziu vyučoval v roku 1879 pre svojich priateľov. Po niekoľkých rokoch už prekladal poéziu, aby jazyk čo najviac zdokonalil. V roku 1885 autor napísal:
+
+Zamenhofovi prichádzalo veľa nadšených listov, ktoré často prinášali najrôznejšie návrhy úprav jazyka. Všetky podnety zaznamenával a neskoršie ich začal uverejňovať v časopise "Esperantisto", vychádzajúcom v Norimbergu. V tom istom časopise aj dal o úpravách dvakrát hlasovať, väčšina čitateľov však so zmenami nesúhlasila. Po týchto hlasovaniach na určitý čas utíchli hlasy volajúce po reforme a jazyk sa začal rozširovať. Najviac odberateľov mal časopis vo vtedajšom Rusku. Veľkou ranou preň bolo, keď ruská cenzúra jeho šírenie zakázala kvôli článku Leva Nikolajeviča Tolstého. Časopis kvôli tomu musel byť zrušený, krátko na to bol však vystriedaný novým, nazvaným "Lingvo Internacia." Najskôr ho redigovali vo švédskej Uppsale, neskôr v Maďarsku a nakoniec v Paríži, kde jeho vydávanie zastavila až prvá svetová vojna.
+
+Nový medzinárodný jazyk začali jeho používatelia skoro používať aj na organizáciu odbornej a záujmovej činnosti na medzinárodnej úrovni. V prvých desaťročiach prebiehala komunikácia v esperante takmer výhradne písomnou formou. Ale po nečakane úspešnom prvom Svetovom kongrese esperanta, usporiadanom v roku 1905 vo francúzskom meste Boulogne-sur-Mer, na ktorom sa overili možnosti používania tejto reči v hovorenej forme, začali naberať na intenzite aj osobné kontakty.
+
+Esperanto začali pre svoju činnosť používať aj rôzne organizácie a hnutia. Už na svetovom kongrese v Barcelone roku 1909 sa uskutočnilo niekoľko stretnutí prítomných katolíkov, ktorí sa nakoniec rozhodli usporiadať v nadchádzajúcom roku, 1910, samostatný kongres katolíckych esperantistov. Počas neho bolo založené Medzinárodné združenie katolíckych esperantistov (IKUE – Internacia Katolika Unuiĝo Esperantista). Časopis "Espero Katolika" ("Katolícka nádej") vychádzal už od roku 1903 a s viac ako 100 rokmi svojej existencie je dnes najdlhšie vychádzajúcim esperantským periodikom.
+
+V roku 1912 sa Zamenhof pri slávnostnom prejave ôsmeho Svetového kongresu esperanta v Krakove vzdal svojej oficiálnej úlohy v hnutí. Desiaty kongres sa mal konať v roku 1914 v Paríži, prihlásilo sa naň takmer 4 000 ľudí, ale nakoniec ho zrušili pre začínajúcu vojnu, Zamenhof sa vtedy musel vrátiť domov cez škandinávske štáty.
+
+Po vojne túžba po harmónii a mieri vzbudila nové nádeje, vďaka čomu sa esperanto veľmi rýchlo šírilo. Prvý povojnový kongres sa konal v roku 1920 v Haagu, 13. svetový kongres v 1921 v Prahe. V roku 1927 bolo vo viedenskom Hofburgu otvorené Medzinárodné esperantské múzeum, v roku 1929 bolo pripojené k Rakúskej národnej knižnici a dnes sídli v samostatnej budove.
+
+Snahy o presadenie esperanta ako univerzálneho jazyka sa stretávali s pozitívnou odozvou: Petíciu v jeho prospech adresovanú Organizácii Spojených národov podpísalo vyše 80 miliónov ľudí, v Česko-Slovensku napríklad prof. Jaroslav Heyrovský, nositeľ Nobelovej ceny.
+
+Valné zhromaždenie UNESCO prijalo podobné rezolúcie v Montevideu 10. decembra 1954 a v Sofii 8. novembra 1985. Vzalo v nich na vedomie "výsledky dosiahnuté esperantom na poli medzinárodnej duchovnej výmeny aj zblíženia národov sveta" a vyzvalo členské štáty, "aby sa chopili iniciatívy pri zavádzaní študijných programov o jazykovom probléme a esperante na svojich školách a inštitúciách vyššieho vzdelávania".
+
+K esperantu sa hlásila aj rada predsedov Poľskej akadémie vied. Jubilejného 72. Svetového kongresu esperanta roku 1987 (100. výročie uverejnenia prvej učebnice jazyka) sa vo Varšave zúčastnilo takmer 6 000 ľudí zo 60 národov.
+
+Pokroky dosiahli aj katolícki esperantisti – roku 1990 bol vydaný dokument "Norme per la celebrazione della Messa in esperanto", ktorým Svätá stolica povoľuje vysluhovať sväté omše v tomto jazyku bez zvláštneho povolenia. Esperanto sa tak stalo jediným schváleným umelým liturgickým jazykom katolíckej cirkvi.
+
+Skutočnosť, že mnohé z cieľov esperantského hnutia sa doteraz nepodarilo naplniť, je často prisudzovaná okrem iného technologickej a kultúrnej dominancii Spojeného kráľovstva a Spojených štátov amerických, predovšetkým v období po druhej svetovej vojne, vďaka čomu je v súčasnosti dorozumievacím jazykom väčšiny medzinárodných činností angličtina.
+
+Už na začiatku 20. storočia bolo na území dnešného Slovenska (vtedy severná časť Uhorska) činné esperantské hnutie. Esperantistov a kluby zastrešovala „Uhorská esperantská spoločnosť” a „Verda Standardo”. V Prahe boli činné spolky "Bohema Unio Esperantista", ktorý prijímal len organizácie a kluby, a "Bohema Asocio Esperantista", ktorý prijímal jednotlivcov. Oba spolky vydávali svoje časopisy. V roku 1907, 20 rokov po zverejnení jazyka Zamenhofom, vydal tolstojovec Albert Škarvan spolu s Rusom N. P. Evstifejevom prvú učebnicu esperanta v slovenčine, „Základy medzinárodnej reči ESPERANTO“.
+
+Po prvej svetovej vojne sa oba pražské spolky zlúčili do "Československej Esperantskej Asociácie". Tá bola v roku 1936 premenovaná na "Esperantskú Asociáciu v Československej republike". V tomto období bolo hnutie veľmi aktívne, fungovalo mnoho klubov, konalo sa veľa prednášok a kurzov. Esperanto bolo vyučované na školách rôznych stupňov, rádio Bratislava od 1930 vysielalo kurzy a od 1932 aj kultúrny program v esperante. Bola vydaná "Československá antológia" predstavujúca diela 20 slovenských autorov. V rámci protifašistickej aktivity vychádzali aj preklady protifašistických článkov z esperantských časopisov z obdobia Španielskej občianskej vojny.
+
+Druhá svetová vojna utlmila esperantské hnutie. Bratislavský esperantský klub požiadal o zmenu štatútu a rozšírenie poľa pôsobnosti na celú vtedajšiu Slovenskú republiku a následne sa stal strediskom esperantského hnutia na Slovensku.""";
diff --git a/benchmarks/Utf8Decode/dart/zhtext_10k.dart b/benchmarks/Utf8Decode/dart/zhtext_10k.dart
new file mode 100644
index 0000000..dc81c6d6
--- /dev/null
+++ b/benchmarks/Utf8Decode/dart/zhtext_10k.dart
@@ -0,0 +1,73 @@
+// This text is an extract from the Chinese Wikipedia article about Kanji
+// (汉字): https://zh.wikipedia.org/wiki/汉字
+//
+// The extract is based on the Wikipedia database dump. All markup has been
+// removed using WikiExtractor: https://github.com/attardi/wikiextractor
+//
+// The material is licensed under the Creative Commons Attribution-Share-Alike
+// License 3.0: https://creativecommons.org/licenses/by-sa/3.0/
+
+const String zh = """
+最簡單的漢字只有一笔画，但卻不止一個字：除了「一」字以外，「乙」、「〇」、「丶」、「丨」、「亅」、「丿」、「乀」、「乁」、「𠄌」、「𠃋」、「𠃉」、「𠃊」、「乚」等都是漢字，而且都有各自的讀音。
+
+中文汉字中，笔画最多的汉字可能是“”，是一种面食的名称，此字至今习用，其不同写法的笔画数在54至71画之间不等。被传统辞典收录的笔画最多的汉字为《字汇补》、《汉语大字典》中由四个“-{龍}-”字组成的「」字，共64画；同樣屬於64劃的字由四個“-{興}-”字組成的“𠔻”字，收入自《中文大辭典》；之後的是由四個「雷」字組成的“䨻”字，有52劃，收錄於《說文解字》。
+
+另外，日本汉字「」收录于日本的TRON计划中，但此字无法提供有效证据表明其确有使用，因此状况存疑。该字由3個「-{龍}-」字和3個「-{雲}-」個組合而成，共有84劃。该字曾提交到当时的统一码扩展C区，编号为JMK66147，后因扩展C区的时间原因被安排到了扩展D区，之后因找不到合适证据被撤销。最后提交到扩展G区并被接受。
+
+現在，純漢字僅僅被用於記錄漢語。而漢字和假名一起被用於記錄日語。
+
+其他一些民族在早期會將漢字單純作為表音文字來記錄他們的語言。如蒙古語最早的文獻蒙古秘史即用純漢字當做表音文字進行記錄。日語最早的文獻也是把漢字當做表音文字來記錄日語，後來演變出萬葉假名。
+
+契丹文、女真文、西夏文的創製受到了漢字的影響，它們跟漢字一樣都是方塊型文字，筆畫形狀也極其類似，也採用類似六書的造字法。但這些文字除個別字與漢字外形相同外，絕大部分字形都跟漢字不同，因此在Unicode中它們都是獨立區塊編碼的。
+
+古壯字（方塊壯字）、古白字（方塊白字）、古布依字（方塊布依字）、字喃等文字可以說是漢字在其他語言中的擴充，因為它們很大一部分本身就是漢字（賦予新義），另一些則是用已有漢字偏旁組合構成新字，因此，這些文字的外觀上與漢字很相似，在Unicode中與漢字一道編入漢字區。
+
+女書是用於記錄漢語的另一種文字，它們的造字法與六書有部分相似之處，但字的外觀與漢字差異較大，Unicode中作為獨立區塊編碼。
+
+以上文字都因各種原因而消亡，如今除專家學者外無幾人能識。
+
+日語的假名（）是由漢字的草體、簡筆演變而成的。諺文和日語假名一樣可以和漢字一同混寫。
+
+此外如蒙古文、滿文、錫伯文等也是在漢字書寫方式和書寫工具的影響下，將從右向左書寫的源自察合台文的書寫方式改為從上到下書寫，文字的結構也隨之有所變化。
+
+漢字是承載文化的重要工具，目前留有大量用漢字書寫的典籍。不同的方言、甚至語言都使用漢字作為共同書寫體系。在古代日本、朝鮮半島、越南、琉球群島，以及位於婆羅洲的蘭芳共和國，漢字都曾是該國正式文書的唯一系統，因而漢字在歷史上對文明的傳播分享有著重要作用。
+
+由於漢字和發聲的聯繫不是非常密切，比較容易被其他民族所借用，如日本、朝鮮半島和越南都曾經有過不會說漢語，單純用漢字書寫的歷史階段。漢字的這個特點對於維繫一個文化圈—一個充滿各種互相不能交流的方言群體的民族——發揮了主要的作用。
+
+漢字對周邊國家的文化產生過巨大的影響，形成了一個共同使用漢字的漢字文化圈，在日本、越南和朝鮮半島、琉球群島，漢字被融合成它們語言的文字「」、「」、「」。直到現在，日語中仍然把漢字認為是書寫體系的一部分。在北韓和越南，已經完全不再使用漢字；在韓國，漢字的使用在近幾十年來越來越少；但是由於朝鮮語／韓語中使用了大量的漢字詞彙，並且重音現象嚴重，所以在需要嚴謹表達的場合時仍然會使用漢字。雖然在通常情況下人名、公司機構名稱等均使用韓文書寫，不過大多數的人名、公司機構均有其對應的漢字名稱。
+
+漢字於公元3世紀經朝鮮半島輾轉傳入日本。二戰後日本開始限制漢字的數量和使用，頒布了《當用漢字表》及《人名用字表》等，其中簡化了部分漢字（日本新字體），不過文學創作使用的漢字，並不在限制之列。日本除從中文中傳入的漢字外，還創造和簡化了一些漢字，如「-{辻}-」（十字路口）、「-{栃}-」、「-{峠}-」（山道）和「-{広}-」（廣）、「-{転}-」（轉）、「-{働}-」（勞動）等。
+
+公元3世紀左右，漢字傳入了朝鮮半島，朝鮮語／韓語曾經完全使用漢字來書寫。相傳薛聰在當時發明了吏讀，把朝鮮語用同音或同義的漢字來表示。例如：「乙」字被用來表示韓語中的後綴「-l（）」。由於有不少發音都沒有對應的漢字，所以朝鮮半島的人民又運用組字法，把兩個或多個漢字合組成為一個新的吏讀字。相傳後來的契丹文就是受到吏讀字的影響。此外尚有鄉札、口訣等以漢字表記朝鮮語的方法。
+
+1443年，朝鮮世宗大王頒布《訓民正音》，發明了諺文與漢字一起使用，但當中有不少部件仍然有昔日吏讀字的痕跡。現在的大韓民國雖禁止在正式場合下使用漢字，並停止了在中小學中教授漢字（但是從2011年開始，大韓民國的李明博政府已經決定將漢字重新納入中小學的課程裡），不過漢字在民間仍在繼續使用，且可以按照個人習慣書寫，但是現在能寫一筆漂亮漢字的韓國人越來越少。朝鮮民主主義人民共和國於1948年廢除了漢字，僅保留了十幾個漢字（參見廢除漢字）。
+
+公元1世紀漢字便傳入了越南，越南語也曾完全使用漢字做為書寫用文字，並在漢字的基礎上創造了喃字，但是由於書寫不便，漢字仍是主要的書寫方式。
+
+1945年越南民主共和國成立後廢除漢字，使用了稱為「國語字」的拼音文字。現在的越南文已經看不出漢字的痕跡了。
+
+中國許多民俗都與漢字有關，例如：
+
+漢字獨特優美的結構，書寫的主要工具——毛筆有多樣的表現力，因而產生了中文獨特的造型藝術——書法。而篆刻是和書法相關的藝術，用刀在石材上雕刻出篆字作為印章，尚有勒石、山壁題字等。
+同一个汉字，可以有不同的字体。當前漢字字體主要有篆書、隷書、草書、行書、楷書等。
+
+漢字歷史上是不斷在組新字的，目前的各種漢字並非同时定型于某一年代，而是應時代需要逐渐發展而来的。例如：“人”字在商朝就已出现，“凹”字和“凸”字則是在唐朝才出現的。
+
+此外不同的行業也会因用字需求而造字。例如：中国的傳統音乐在記譜上會使用減字譜、工尺譜。
+
+自十九世紀中葉後，亞洲和西方都發佈了很多漢字拉丁化方案，如：
+
+現在，漢語拼音方案是使用最廣且被聯合國接受的汉字拉丁化方案。而威妥瑪拼音歷史悠久，至今仍用於臺灣的人名、地名拼寫。
+汉字中存在许多异体字，它们的意义和读音完全相同，只是写法不同。异体字的产生部分是由于历史原因，有的则是人为造字，如「和、咊、-{龢}-」、「秋、-{秌}-、龝」等。
+
+臺灣也有使用所謂的異體字，例如“-{臺}-”與“-{台}-”、“-{體}-”與“-{体}-”以及“-{學}-”與“-{学}-”等等。
+
+中国大陆於1956年公布整理异体字表，废除了大量异体字，但後來因為各種原因恢復了部分異體字。如“-{於}-”曾被當作“-{于}-”的異體字廢除掉，但在1988年發表的《現代漢語通用字表》中又恢復成為規範字，因爲姓氏中「-{于}-」和「-{於}-」同時存在，不宜合併。另外，不同地區對異體字的取捨有所不同，例如：韓國就以漢字各種異體字中最早出現的樣式為標準寫法。所以，在韓語漢字的標準中，取“甛”而不取“甜”、取“-{幇}-”而不取“-{幫}-”、取“-{畵}-”而不取“-{畫}-”。
+
+由于英文文字是由26个字母排列组合而成的文字，因此可以简化输入步骤；相比较之下汉字则不能如此，从字形上汉字虽然可以拆解成不同的部分，但是被分成的部首或偏旁数量过多，这样不但不能达到简化输入的目的，反而显得更为繁琐。于是从汉字字音上去考虑，汉字输入被分成少量的语音元素组合排列，反而可以达到简化输入的步骤。因为是语音输入对汉字的读音必须清楚，某些生僻字或不知道汉字发音的则会很困难，这在一定程度上限制了汉字的输入。
+
+由于打字機鍵盤是為歐美文字設計的，在設計時本身沒有考慮汉字輸入的問題，輸入漢字往往比輸入拼音文字困難。汉字没有经过中文打字機的普及，直接进入了電腦中文信息处理阶段。在電腦發明初期曾引起漢字能否適應電腦時代的問題，支持漢字拉丁化的學者甚至以此為理據。
+
+随着各种中文输入法的出现，汉字的计算机输入、存储、输出技术得到了基本解决，大大提高了中文写作、出版、信息检索等的效率。目前中文输入法有上千种之多，主要包括表音输入和表形输入两类，也有两者兼之的。汉字的语音输入、手写识别和光学字符识别（OCR）技术也已得到广泛应用。
+
+如收录数千字的GB 2312（中國大陸）、B""";
diff --git a/pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart b/pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart
index 6d61428..94553cd 100644
--- a/pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart
+++ b/pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart
@@ -1479,7 +1479,7 @@
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const MessageCode messageConstructorWithWrongName = const MessageCode(
"ConstructorWithWrongName",
- analyzerCodes: <String>["INVALID_CONSTRUCTOR_NAME"],
+ index: 102,
message:
r"""The name of a constructor must match the name of the enclosing class.""");
@@ -3187,6 +3187,16 @@
r"""Try removing the field initializers, or removing the keyword 'external'.""");
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Code<Null> codeExternalConstructorWithInitializer =
+ messageExternalConstructorWithInitializer;
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const MessageCode messageExternalConstructorWithInitializer = const MessageCode(
+ "ExternalConstructorWithInitializer",
+ index: 106,
+ message: r"""An external constructor can't have any initializers.""");
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Code<Null> codeExternalEnum = messageExternalEnum;
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
@@ -3881,6 +3891,16 @@
tip: r"""Try using a non-generic function type.""");
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Code<Null> codeGetterConstructor = messageGetterConstructor;
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const MessageCode messageGetterConstructor = const MessageCode(
+ "GetterConstructor",
+ index: 103,
+ message: r"""Constructors can't be a getter.""",
+ tip: r"""Try removing 'get'.""");
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Template<Message Function(String name)> templateGetterNotFound =
const Template<Message Function(String name)>(
messageTemplate: r"""Getter not found: '#name'.""",
@@ -4484,32 +4504,6 @@
}
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
-const Template<
- Message Function(
- String
- name)> templateInitializerOutsideConstructor = const Template<
- Message Function(String name)>(
- messageTemplate:
- r"""Only constructors can have initializers, and '#name' is not a constructor.""",
- withArguments: _withArgumentsInitializerOutsideConstructor);
-
-// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
-const Code<Message Function(String name)> codeInitializerOutsideConstructor =
- const Code<Message Function(String name)>(
- "InitializerOutsideConstructor", templateInitializerOutsideConstructor,
- analyzerCodes: <String>["INITIALIZER_OUTSIDE_CONSTRUCTOR"]);
-
-// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
-Message _withArgumentsInitializerOutsideConstructor(String name) {
- if (name.isEmpty) throw 'No name provided';
- name = demangleMixinApplicationName(name);
- return new Message(codeInitializerOutsideConstructor,
- message:
- """Only constructors can have initializers, and '${name}' is not a constructor.""",
- arguments: {'name': name});
-}
-
-// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Code<Null> codeInitializingFormalTypeMismatchField =
messageInitializingFormalTypeMismatchField;
@@ -5640,8 +5634,10 @@
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const MessageCode messageMemberWithSameNameAsClass = const MessageCode(
"MemberWithSameNameAsClass",
+ index: 105,
message:
- r"""A class member can't have the same name as the enclosing class.""");
+ r"""A class member can't have the same name as the enclosing class.""",
+ tip: r"""Try renaming the member.""");
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Code<Null> codeMetadataTypeArguments = messageMetadataTypeArguments;
@@ -7604,6 +7600,16 @@
r"""A set or map literal requires exactly one or two type arguments, respectively.""");
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Code<Null> codeSetterConstructor = messageSetterConstructor;
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const MessageCode messageSetterConstructor = const MessageCode(
+ "SetterConstructor",
+ index: 104,
+ message: r"""Constructors can't be a setter.""",
+ tip: r"""Try removing 'set'.""");
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Template<Message Function(String name)> templateSetterNotFound =
const Template<Message Function(String name)>(
messageTemplate: r"""Setter not found: '#name'.""",
@@ -8453,6 +8459,26 @@
message: r"""Can't create typedef from nullable type.""");
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Code<Null> codeTypedefTypeVariableNotConstructor =
+ messageTypedefTypeVariableNotConstructor;
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const MessageCode messageTypedefTypeVariableNotConstructor = const MessageCode(
+ "TypedefTypeVariableNotConstructor",
+ message:
+ r"""Can't use a typedef denoting a type variable as a constructor, nor for a static member access.""");
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Code<Null> codeTypedefTypeVariableNotConstructorCause =
+ messageTypedefTypeVariableNotConstructorCause;
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const MessageCode messageTypedefTypeVariableNotConstructorCause =
+ const MessageCode("TypedefTypeVariableNotConstructorCause",
+ severity: Severity.context,
+ message: r"""This is the type variable ultimately denoted.""");
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Code<Null> codeUnexpectedDollarInString = messageUnexpectedDollarInString;
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
diff --git a/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart b/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart
index b18db89..3d9bf08 100644
--- a/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart
+++ b/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart
@@ -2397,7 +2397,8 @@
beforeType,
typeInfo,
token.next,
- DeclarationKind.TopLevel);
+ DeclarationKind.TopLevel,
+ null);
}
Token parseFields(
@@ -2410,7 +2411,8 @@
Token beforeType,
TypeInfo typeInfo,
Token name,
- DeclarationKind kind) {
+ DeclarationKind kind,
+ String enclosingDeclarationName) {
if (externalToken != null) {
reportRecoverableError(externalToken, codes.messageExternalField);
}
@@ -2455,12 +2457,12 @@
}
int fieldCount = 1;
- token =
- parseFieldInitializerOpt(name, name, lateToken, varFinalOrConst, kind);
+ token = parseFieldInitializerOpt(
+ name, name, lateToken, varFinalOrConst, kind, enclosingDeclarationName);
while (optional(',', token.next)) {
name = ensureIdentifier(token.next, context);
- token = parseFieldInitializerOpt(
- name, name, lateToken, varFinalOrConst, kind);
+ token = parseFieldInitializerOpt(name, name, lateToken, varFinalOrConst,
+ kind, enclosingDeclarationName);
++fieldCount;
}
Token semicolon = token.next;
@@ -2564,8 +2566,16 @@
return token;
}
- Token parseFieldInitializerOpt(Token token, Token name, Token lateToken,
- Token varFinalOrConst, DeclarationKind kind) {
+ Token parseFieldInitializerOpt(
+ Token token,
+ Token name,
+ Token lateToken,
+ Token varFinalOrConst,
+ DeclarationKind kind,
+ String enclosingDeclarationName) {
+ if (name.lexeme == enclosingDeclarationName) {
+ reportRecoverableError(name, codes.messageMemberWithSameNameAsClass);
+ }
Token next = token.next;
if (optional('=', next)) {
Token assignment = next;
@@ -3297,7 +3307,8 @@
beforeType,
typeInfo,
token.next,
- kind);
+ kind,
+ enclosingDeclarationName);
}
listener.endMember();
return token;
@@ -3369,29 +3380,48 @@
assert(token.next == (getOrSet ?? name));
token = getOrSet ?? token;
+ bool hasQualifiedName = false;
+
if (isOperator) {
token = parseOperatorName(token);
} else {
token = ensureIdentifier(token, IdentifierContext.methodDeclaration);
- if (getOrSet == null) {
- token = parseQualifiedRestOpt(
- token, IdentifierContext.methodDeclarationContinuation);
+ // Possible recovery: This call only does something if the next token is
+ // a '.' --- that's not legal for get or set, but an error is reported
+ // later, and it will recover better if we allow it.
+ Token qualified = parseQualifiedRestOpt(
+ token, IdentifierContext.methodDeclarationContinuation);
+ if (token != qualified) {
+ hasQualifiedName = true;
}
+ token = qualified;
}
- bool isGetter = false;
+ bool isConsideredGetter = false;
if (getOrSet == null) {
token = parseMethodTypeVar(token);
} else {
- isGetter = optional("get", getOrSet);
+ isConsideredGetter = optional("get", getOrSet);
listener.handleNoTypeVariables(token.next);
+
+ // If it becomes considered a constructor below, don't consider it a
+ // getter now (this also enforces parenthesis (and thus parameters)).
+ if (hasQualifiedName) {
+ isConsideredGetter = false;
+ } else if (isConsideredGetter && optional(':', token.next)) {
+ isConsideredGetter = false;
+ } else if (isConsideredGetter &&
+ name.lexeme == enclosingDeclarationName) {
+ // This is a simple case of an badly named getter so we don't consider
+ // that a constructor. We issue an error about the name below.
+ }
}
Token beforeParam = token;
Token beforeInitializers = parseGetterOrFormalParameters(
token,
name,
- isGetter,
+ isConsideredGetter,
kind == DeclarationKind.Extension
? staticToken != null
? MemberKind.ExtensionStaticMethod
@@ -3425,45 +3455,14 @@
bool isConstructor = false;
if (optional('.', name.next) || beforeInitializers != null) {
+ // This is only legal for constructors.
isConstructor = true;
- if (name.lexeme != enclosingDeclarationName) {
- // Recovery: The name does not match,
- // but the name is prefixed or the declaration contains initializers.
- // Report an error and continue with invalid name.
- // TODO(danrubel): report invalid constructor name
- // Currently multiple listeners report this error, but that logic should
- // be removed and the error reported here instead.
- if (isOperator) {
- isConstructor = false;
- }
- }
- if (getOrSet != null) {
- // Recovery
- if (optional('.', name.next)) {
- // Unexpected get/set before constructor.
- // Report an error and skip over the token.
- // TODO(danrubel): report an error on get/set token
- // This is currently reported by listeners other than AstBuilder.
- // It should be reported here rather than in the listeners.
- } else {
- isConstructor = false;
- if (beforeInitializers != null) {
- // Unexpected initializers after get/set declaration.
- // Report an error on the initializers
- // and continue with the get/set declaration.
- // TODO(danrubel): report invalid initializers error
- // Currently multiple listeners report this error, but that logic
- // should be removed and the error reported here instead.
- }
- }
- }
} else if (name.lexeme == enclosingDeclarationName) {
if (getOrSet != null) {
- // Recovery: The get/set member name is invalid.
- // Report an error and continue with invalid name.
- // TODO(danrubel): report invalid get/set member name
- // Currently multiple listeners report this error, but that logic should
- // be removed and the error reported here instead.
+ // Recovery: The (simple) get/set member name is invalid.
+ // Report an error and continue with invalid name
+ // (keeping it as a getter/setter).
+ reportRecoverableError(name, codes.messageMemberWithSameNameAsClass);
} else {
isConstructor = true;
}
@@ -3473,9 +3472,28 @@
//
// constructor
//
+ if (name.lexeme != enclosingDeclarationName) {
+ reportRecoverableError(name, codes.messageConstructorWithWrongName);
+ }
if (staticToken != null) {
reportRecoverableError(staticToken, codes.messageStaticConstructor);
}
+ if (getOrSet != null) {
+ if (optional("get", getOrSet)) {
+ reportRecoverableError(getOrSet, codes.messageGetterConstructor);
+ } else {
+ reportRecoverableError(getOrSet, codes.messageSetterConstructor);
+ }
+ }
+ if (typeInfo != noType) {
+ reportRecoverableError(
+ beforeType.next, codes.messageConstructorWithReturnType);
+ }
+ if (beforeInitializers != null && externalToken != null) {
+ reportRecoverableError(beforeInitializers.next,
+ codes.messageExternalConstructorWithInitializer);
+ }
+
switch (kind) {
case DeclarationKind.Class:
// TODO(danrubel): Remove getOrSet from constructor events
@@ -6813,7 +6831,8 @@
beforeType,
typeInfo,
token.next,
- kind);
+ kind,
+ enclosingDeclarationName);
}
listener.endMember();
diff --git a/pkg/_fe_analyzer_shared/lib/src/testing/id_testing.dart b/pkg/_fe_analyzer_shared/lib/src/testing/id_testing.dart
index 9fb0855..7b64c73 100644
--- a/pkg/_fe_analyzer_shared/lib/src/testing/id_testing.dart
+++ b/pkg/_fe_analyzer_shared/lib/src/testing/id_testing.dart
@@ -866,3 +866,22 @@
}
return false;
}
+
+/// Updates all id tests in [relativeTestPaths].
+///
+/// This assumes that the current working directory is the repository root.
+Future<void> updateAllTests(List<String> relativeTestPaths) async {
+ for (String testPath in relativeTestPaths) {
+ List<String> arguments = [
+ '--packages=${Platform.packageConfig}',
+ testPath,
+ '-g',
+ '--run-all'
+ ];
+ print('Running: ${Platform.resolvedExecutable} ${arguments.join(' ')}');
+ Process process = await Process.start(
+ Platform.resolvedExecutable, arguments,
+ mode: ProcessStartMode.inheritStdio);
+ await process.exitCode;
+ }
+}
diff --git a/pkg/_fe_analyzer_shared/test/inheritance/data/covariant_opt_in.dart b/pkg/_fe_analyzer_shared/test/inheritance/data/covariant_opt_in.dart
index a948b4f..7d529f1 100644
--- a/pkg/_fe_analyzer_shared/test/inheritance/data/covariant_opt_in.dart
+++ b/pkg/_fe_analyzer_shared/test/inheritance/data/covariant_opt_in.dart
@@ -24,20 +24,17 @@
/*class: D1:A,B,C,D1,Object*/
abstract class D1 implements A, B, C {
- /*cfe|cfe:builder.member: D1.method:void Function(dynamic)*/
- /*analyzer.member: D1.method:void Function(int)*/
+ /*member: D1.method:void Function(dynamic)*/
}
/*class: D2:A,B,D2,Object*/
abstract class D2 implements A, B {
- /*cfe|cfe:builder.member: D2.method:void Function(dynamic)*/
- /*analyzer.member: D2.method:void Function(num)*/
+ /*member: D2.method:void Function(dynamic)*/
}
/*class: D3:B,C,D3,Object*/
abstract class D3 implements B, C {
- /*cfe|cfe:builder.member: D3.method:void Function(num)*/
- /*analyzer.member: D3.method:void Function(int)*/
+ /*member: D3.method:void Function(num)*/
}
/*class: D4:B,C,D4,Object*/
@@ -47,8 +44,7 @@
/*class: D5:A,C,D5,Object*/
abstract class D5 implements A, C {
- /*cfe|cfe:builder.member: D5.method:void Function(dynamic)*/
- /*analyzer.member: D5.method:void Function(int)*/
+ /*member: D5.method:void Function(dynamic)*/
}
/*class: E:E,Object*/
@@ -65,8 +61,7 @@
/*class: G1:E,F,G1,Object*/
abstract class G1 implements E, F {
- /*cfe|cfe:builder.member: G1.method:void Function(num)*/
- /*analyzer.member: G1.method:void Function(int)*/
+ /*member: G1.method:void Function(num)*/
}
/*class: G2:E,F,G2,Object*/
diff --git a/pkg/_fe_analyzer_shared/test/inheritance/data/covariant_opt_out.dart b/pkg/_fe_analyzer_shared/test/inheritance/data/covariant_opt_out.dart
index 777ca96..dddf142 100644
--- a/pkg/_fe_analyzer_shared/test/inheritance/data/covariant_opt_out.dart
+++ b/pkg/_fe_analyzer_shared/test/inheritance/data/covariant_opt_out.dart
@@ -26,31 +26,31 @@
/*class: D1:A,B,C,D1,Object*/
abstract class D1 implements A, B, C {
- /*cfe|cfe:builder.member: D1.method:void Function(dynamic)**/
- /*analyzer.member: D1.method:void Function(int*)**/
+ /*member: D1.method:void Function(dynamic)**/
}
/*class: D2:A,B,D2,Object*/
abstract class D2 implements A, B {
- /*cfe|cfe:builder.member: D2.method:void Function(dynamic)**/
- /*analyzer.member: D2.method:void Function(num*)**/
+ /*member: D2.method:void Function(dynamic)**/
}
/*class: D3:B,C,D3,Object*/
abstract class D3 implements B, C {
- /*cfe|cfe:builder.member: D3.method:void Function(num*)**/
- /*analyzer.member: D3.method:void Function(int*)**/
+ /*member: D3.method:void Function(num*)**/
}
/*class: D4:B,C,D4,Object*/
abstract class D4 implements C, B {
- /*member: D4.method:void Function(num*)**/
+ /// TODO: Solve CFE / analyzer difference.
+ /// In opt-out library we can choose any valid override, so the analyzer
+ /// takes the first one.
+ /*cfe|cfe:builder.member: D4.method:void Function(num*)**/
+ /*analyzer.member: D4.method:void Function(int*)**/
}
/*class: D5:A,C,D5,Object*/
abstract class D5 implements A, C {
- /*cfe|cfe:builder.member: D5.method:void Function(dynamic)**/
- /*analyzer.member: D5.method:void Function(int*)**/
+ /*member: D5.method:void Function(dynamic)**/
}
/*class: E:E,Object*/
@@ -67,11 +67,14 @@
/*class: G1:E,F,G1,Object*/
abstract class G1 implements E, F {
- /*cfe|cfe:builder.member: G1.method:void Function(num*)**/
- /*analyzer.member: G1.method:void Function(int*)**/
+ /*member: G1.method:void Function(num*)**/
}
/*class: G2:E,F,G2,Object*/
abstract class G2 implements F, E {
- /*member: G2.method:void Function(num*)**/
+ /// TODO: Solve CFE / analyzer difference.
+ /// In opt-out library we can choose any valid override, so the analyzer
+ /// takes the first one.
+ /*cfe|cfe:builder.member: G2.method:void Function(num*)**/
+ /*analyzer.member: G2.method:void Function(int*)**/
}
diff --git a/pkg/_fe_analyzer_shared/test/inheritance/data/in_out_in/main.dart b/pkg/_fe_analyzer_shared/test/inheritance/data/in_out_in/main.dart
index 55ab8f7..aae2ae8 100644
--- a/pkg/_fe_analyzer_shared/test/inheritance/data/in_out_in/main.dart
+++ b/pkg/_fe_analyzer_shared/test/inheritance/data/in_out_in/main.dart
@@ -14,34 +14,35 @@
/*class: SubClass2:Class,Interface,LegacyClass2,Object,SubClass2*/
class SubClass2 extends LegacyClass2 implements Interface {
- /*cfe|cfe:builder.member: SubClass2.method:int? Function(int)*/
- /*analyzer.member: SubClass2.method:int* Function(int*)**/
+ /*member: SubClass2.method:int? Function(int)*/
}
+// TODO: Solve CFE / analyzer difference.
+// This an following examples end up with implementing `GenericInterface`
+// with `int` and `int?` type arguments, and their NNBD_TOP_MERGE does not
+// exist. it does not matter that some of these interfaces come through a
+// legacy library.
+
/*class: GenericSubClass1a:GenericClass1,GenericInterface<int?>,GenericLegacyClass1a,GenericSubClass1a,Object*/
/*analyzer.error: CompileTimeErrorCode.CONFLICTING_GENERIC_INTERFACES*/ abstract class GenericSubClass1a
extends GenericLegacyClass1a implements GenericInterface<int?> {
- /*cfe|cfe:builder.member: GenericSubClass1a.method:int? Function(int?)*/
- /*analyzer.member: GenericSubClass1a.method:int* Function(int*)**/
+ /*member: GenericSubClass1a.method:int? Function(int?)*/
}
/*class: GenericSubClass1b:GenericClass1,GenericInterface<int?>,GenericLegacyClass1b,GenericSubClass1b,Object*/
/*analyzer.error: CompileTimeErrorCode.CONFLICTING_GENERIC_INTERFACES*/ abstract class GenericSubClass1b
extends GenericLegacyClass1b implements GenericInterface<int?> {
- /*cfe|cfe:builder.member: GenericSubClass1b.method:int? Function(int?)*/
- /*analyzer.member: GenericSubClass1b.method:int* Function(int*)**/
+ /*member: GenericSubClass1b.method:int? Function(int?)*/
}
/*class: GenericSubClass2a:GenericClass2,GenericInterface<int>,GenericLegacyClass2a,GenericSubClass2a,Object*/
/*analyzer.error: CompileTimeErrorCode.CONFLICTING_GENERIC_INTERFACES*/ abstract class GenericSubClass2a
extends GenericLegacyClass2a implements GenericInterface<int> {
- /*cfe|cfe:builder.member: GenericSubClass2a.method:int Function(int)*/
- /*analyzer.member: GenericSubClass2a.method:int* Function(int*)**/
+ /*member: GenericSubClass2a.method:int Function(int)*/
}
/*class: GenericSubClass2b:GenericClass2,GenericInterface<int>,GenericLegacyClass2b,GenericSubClass2b,Object*/
/*analyzer.error: CompileTimeErrorCode.CONFLICTING_GENERIC_INTERFACES*/ abstract class GenericSubClass2b
extends GenericLegacyClass2b implements GenericInterface<int> {
- /*cfe|cfe:builder.member: GenericSubClass2b.method:int Function(int)*/
- /*analyzer.member: GenericSubClass2b.method:int* Function(int*)**/
+ /*member: GenericSubClass2b.method:int Function(int)*/
}
diff --git a/pkg/_fe_analyzer_shared/test/inheritance/data/in_out_in/opt_out.dart b/pkg/_fe_analyzer_shared/test/inheritance/data/in_out_in/opt_out.dart
index aa5fccf..1766444 100644
--- a/pkg/_fe_analyzer_shared/test/inheritance/data/in_out_in/opt_out.dart
+++ b/pkg/_fe_analyzer_shared/test/inheritance/data/in_out_in/opt_out.dart
@@ -18,6 +18,8 @@
/*member: LegacyClass2.method:int* Function(int*)**/
}
+/// TODO: Solve CFE / analyzer difference.
+/// Classes in legacy libraries can only have members with legacy signatures.
/*class: GenericLegacyClass1a:GenericClass1,GenericInterface<int*>,GenericLegacyClass1a,Object*/
abstract class GenericLegacyClass1a extends GenericClass1 {
/*cfe|cfe:builder.member: GenericLegacyClass1a.method:int* Function(int*)*/
diff --git a/pkg/_fe_analyzer_shared/test/inheritance/data/infer_opt_in_from_mixed/main.dart b/pkg/_fe_analyzer_shared/test/inheritance/data/infer_opt_in_from_mixed/main.dart
index 3bd4f32..b628daac 100644
--- a/pkg/_fe_analyzer_shared/test/inheritance/data/infer_opt_in_from_mixed/main.dart
+++ b/pkg/_fe_analyzer_shared/test/inheritance/data/infer_opt_in_from_mixed/main.dart
@@ -16,20 +16,16 @@
/*class: Both1:Both1,Legacy,Nnbd,Object*/
class Both1 implements Legacy, Nnbd {
- /*cfe|cfe:builder.member: Both1.mandatory:void Function(int)*/
- /*analyzer.member: Both1.mandatory:void Function(dynamic)*/
+ /*member: Both1.mandatory:void Function(int)*/
void mandatory(param) {}
- /*cfe|cfe:builder.member: Both1.optional:void Function(int?)*/
- /*analyzer.member: Both1.optional:void Function(dynamic)*/
+ /*member: Both1.optional:void Function(int?)*/
void optional(param) {}
}
/*class: Both2:Both2,Legacy,Nnbd,Object*/
class Both2 implements Nnbd, Legacy {
- /*cfe|cfe:builder.member: Both2.mandatory:void Function(int)*/
- /*analyzer.member: Both2.mandatory:void Function(dynamic)*/
+ /*member: Both2.mandatory:void Function(int)*/
void mandatory(param) {}
- /*cfe|cfe:builder.member: Both2.optional:void Function(int?)*/
- /*analyzer.member: Both2.optional:void Function(dynamic)*/
+ /*member: Both2.optional:void Function(int?)*/
void optional(param) {}
}
diff --git a/pkg/_fe_analyzer_shared/test/inheritance/data/infer_parameter_opt_in.dart b/pkg/_fe_analyzer_shared/test/inheritance/data/infer_parameter_opt_in.dart
index 463917b..8b854b8 100644
--- a/pkg/_fe_analyzer_shared/test/inheritance/data/infer_parameter_opt_in.dart
+++ b/pkg/_fe_analyzer_shared/test/inheritance/data/infer_parameter_opt_in.dart
@@ -32,112 +32,96 @@
/*class: E1:A,B,E1,Object*/
class E1 extends A implements B {
- /*analyzer.member: E1.method:dynamic Function(dynamic, {dynamic named})*/
- /*cfe|cfe:builder.member: E1.method:Object? Function(Object?, {Object? named})*/
+ /*member: E1.method:Object? Function(Object?, {Object? named})*/
method(o, {named}) {}
}
/*class: E2:A,B,E2,Object*/
class E2 extends B implements A {
- /*analyzer.member: E2.method:dynamic Function(dynamic, {dynamic named})*/
- /*cfe|cfe:builder.member: E2.method:Object? Function(Object?, {Object? named})*/
+ /*member: E2.method:Object? Function(Object?, {Object? named})*/
method(o, {named}) {}
}
/*class: E3:A,B,E3,Object*/
class E3 implements A, B {
- /*analyzer.member: E3.method:dynamic Function(dynamic, {dynamic named})*/
- /*cfe|cfe:builder.member: E3.method:Object? Function(Object?, {Object? named})*/
+ /*member: E3.method:Object? Function(Object?, {Object? named})*/
method(o, {named}) {}
}
/*class: E4:A,B,E4,Object*/
class E4 implements B, A {
- /*analyzer.member: E4.method:dynamic Function(dynamic, {dynamic named})*/
- /*cfe|cfe:builder.member: E4.method:Object? Function(Object?, {Object? named})*/
+ /*member: E4.method:Object? Function(Object?, {Object? named})*/
method(o, {named}) {}
}
/*class: F1:A,C,F1,Object*/
class F1 extends A implements C {
- /*analyzer.member: F1.method:dynamic Function(dynamic, {dynamic named})*/
- /*cfe|cfe:builder.member: F1.method:void Function(void, {void named})*/
+ /*member: F1.method:void Function(void, {void named})*/
method(o, {named}) {}
}
/*class: F2:A,C,F2,Object*/
class F2 extends C implements A {
- /*analyzer.member: F2.method:dynamic Function(dynamic, {dynamic named})*/
- /*cfe|cfe:builder.member: F2.method:void Function(void, {void named})*/
+ /*member: F2.method:void Function(void, {void named})*/
method(o, {named}) {}
}
/*class: F3:A,C,F3,Object*/
class F3 implements A, C {
- /*analyzer.member: F3.method:dynamic Function(dynamic, {dynamic named})*/
- /*cfe|cfe:builder.member: F3.method:void Function(void, {void named})*/
+ /*member: F3.method:void Function(void, {void named})*/
method(o, {named}) {}
}
/*class: F4:A,C,F4,Object*/
class F4 implements C, A {
- /*analyzer.member: F4.method:dynamic Function(dynamic, {dynamic named})*/
- /*cfe|cfe:builder.member: F4.method:void Function(void, {void named})*/
+ /*member: F4.method:void Function(void, {void named})*/
method(o, {named}) {}
}
/*class: G1:A,B,C,G1,Object*/
class G1 extends B implements C {
- /*analyzer.member: G1.method:dynamic Function(dynamic, {dynamic named})*/
- /*cfe|cfe:builder.member: G1.method:void Function(void, {void named})*/
+ /*member: G1.method:void Function(void, {void named})*/
method(o, {named}) {}
}
/*class: G2:A,B,C,G2,Object*/
class G2 extends C implements B {
- /*analyzer.member: G2.method:dynamic Function(dynamic, {dynamic named})*/
- /*cfe|cfe:builder.member: G2.method:void Function(void, {void named})*/
+ /*member: G2.method:void Function(void, {void named})*/
method(o, {named}) {}
}
/*class: G3:A,B,C,G3,Object*/
class G3 implements B, C {
- /*analyzer.member: G3.method:dynamic Function(dynamic, {dynamic named})*/
- /*cfe|cfe:builder.member: G3.method:void Function(void, {void named})*/
+ /*member: G3.method:void Function(void, {void named})*/
method(o, {named}) {}
}
/*class: G4:A,B,C,G4,Object*/
class G4 implements C, B {
- /*analyzer.member: G4.method:dynamic Function(dynamic, {dynamic named})*/
- /*cfe|cfe:builder.member: G4.method:void Function(void, {void named})*/
+ /*member: G4.method:void Function(void, {void named})*/
method(o, {named}) {}
}
/*class: H1:A,B,D,H1,Object*/
class H1 extends B implements D {
- /*analyzer.member: H1.method:dynamic Function(dynamic, {dynamic named})*/
- /*cfe|cfe:builder.member: H1.method:Object? Function(Object?, {Object? named})*/
+ /*member: H1.method:Object? Function(Object?, {Object? named})*/
method(o, {named}) {}
}
/*class: H2:A,B,D,H2,Object*/
class H2 extends D implements B {
- /*analyzer.member: H2.method:dynamic Function(dynamic, {dynamic named})*/
- /*cfe|cfe:builder.member: H2.method:Object? Function(Object?, {Object? named})*/
+ /*member: H2.method:Object? Function(Object?, {Object? named})*/
method(o, {named}) {}
}
/*class: H3:A,B,D,H3,Object*/
class H3 implements B, D {
- /*analyzer.member: H3.method:dynamic Function(dynamic, {dynamic named})*/
- /*cfe|cfe:builder.member: H3.method:Object? Function(Object?, {Object? named})*/
+ /*member: H3.method:Object? Function(Object?, {Object? named})*/
method(o, {named}) {}
}
/*class: H4:A,B,D,H4,Object*/
class H4 implements D, B {
- /*analyzer.member: H4.method:dynamic Function(dynamic, {dynamic named})*/
- /*cfe|cfe:builder.member: H4.method:Object? Function(Object?, {Object? named})*/
+ /*member: H4.method:Object? Function(Object?, {Object? named})*/
method(o, {named}) {}
}
diff --git a/pkg/_fe_analyzer_shared/test/inheritance/data/infer_parameter_opt_out.dart b/pkg/_fe_analyzer_shared/test/inheritance/data/infer_parameter_opt_out.dart
index 640db20..646feff 100644
--- a/pkg/_fe_analyzer_shared/test/inheritance/data/infer_parameter_opt_out.dart
+++ b/pkg/_fe_analyzer_shared/test/inheritance/data/infer_parameter_opt_out.dart
@@ -53,6 +53,11 @@
/*class: E:D,E,F,Object*/
class E implements D, F {
+ /// TODO: Solve CFE / analyzer difference.
+ /// Analyzer uses MockSdk that is migrated. So, `Object.==(Object)`.
+ /// So, `D.==(Object)` matches to the `Object`, and inference does not fail
+ /// and does not cause `dynamic`. I expect that the difference will be solved
+ /// after SDK unfork.
/*cfe|cfe:builder.member: E.==:bool* Function(dynamic)**/
/*analyzer.member: E.==:bool* Function(Object*)**/
bool operator ==(other) => true;
diff --git a/pkg/_fe_analyzer_shared/test/inheritance/data/issue40414/main.dart b/pkg/_fe_analyzer_shared/test/inheritance/data/issue40414/main.dart
index 0d2ea90..c416f58 100644
--- a/pkg/_fe_analyzer_shared/test/inheritance/data/issue40414/main.dart
+++ b/pkg/_fe_analyzer_shared/test/inheritance/data/issue40414/main.dart
@@ -12,6 +12,9 @@
/*member: B.i=:int**/
}
+/// TODO: Solve CFE / analyzer difference.
+/// I suspect that this is a bug in analyzer.
+/// We check `i` against separate signatures from `NULLABLE` and `NONNULLABLE`.
/*class: C:A,C,NONNULLABLE,NULLABLE,Object*/
class C extends A {
/*member: C.i:int?*/
diff --git a/pkg/_fe_analyzer_shared/test/inheritance/data/issue40553/main.dart b/pkg/_fe_analyzer_shared/test/inheritance/data/issue40553/main.dart
index 7917c9b..ff14c36 100644
--- a/pkg/_fe_analyzer_shared/test/inheritance/data/issue40553/main.dart
+++ b/pkg/_fe_analyzer_shared/test/inheritance/data/issue40553/main.dart
@@ -14,7 +14,7 @@
/*member: D.getType:Type* Function()**/
}
-/// TODO: Solve CFE / analyzer disagreement.
+/// TODO: Solve CFE / analyzer difference.
/// It looks to me that CFE type of `A` is incorrect.
/// As described in https://github.com/dart-lang/sdk/issues/40553,
/// NNBD_TOP_MERGE(FutureOr<int?>, FutureOr*<int*>) = FutureOr<int?>
diff --git a/pkg/_fe_analyzer_shared/test/inheritance/data/member_from_opt_out/main.dart b/pkg/_fe_analyzer_shared/test/inheritance/data/member_from_opt_out/main.dart
index 66fdf36..ebe48e3 100644
--- a/pkg/_fe_analyzer_shared/test/inheritance/data/member_from_opt_out/main.dart
+++ b/pkg/_fe_analyzer_shared/test/inheritance/data/member_from_opt_out/main.dart
@@ -14,6 +14,5 @@
/*class: Class:Class,Interface,LegacyClass,Object*/
abstract class Class extends LegacyClass implements Interface {
- /*cfe|cfe:builder.member: Class.method:int Function(int?)*/
- /*analyzer.member: Class.method:int* Function(int*)**/
+ /*member: Class.method:int Function(int?)*/
}
diff --git a/pkg/_fe_analyzer_shared/test/inheritance/data/members_from_opt_out/main.dart b/pkg/_fe_analyzer_shared/test/inheritance/data/members_from_opt_out/main.dart
index 8ae0381..3f043b7 100644
--- a/pkg/_fe_analyzer_shared/test/inheritance/data/members_from_opt_out/main.dart
+++ b/pkg/_fe_analyzer_shared/test/inheritance/data/members_from_opt_out/main.dart
@@ -148,101 +148,65 @@
/*class: Class2a:Class2a,Interface,LegacyClass,Object*/
class Class2a extends LegacyClass implements Interface {
- /*cfe|cfe:builder.member: Class2a.method1:int Function()*/
- /*analyzer.member: Class2a.method1:int* Function()**/
+ /*member: Class2a.method1:int Function()*/
- /*cfe|cfe:builder.member: Class2a.method2:int? Function()*/
- /*analyzer.member: Class2a.method2:int* Function()**/
+ /*member: Class2a.method2:int? Function()*/
- /*cfe|cfe:builder.member: Class2a.method3a:int Function(int, int)*/
- /*analyzer.member: Class2a.method3a:int* Function(int*, int*)**/
+ /*member: Class2a.method3a:int Function(int, int)*/
- /*cfe|cfe:builder.member: Class2a.method3b:int Function(int, [int])*/
- /*analyzer.member: Class2a.method3b:int* Function(int*, [int*])**/
+ /*member: Class2a.method3b:int Function(int, [int])*/
- /*cfe|cfe:builder.member: Class2a.method3c:int Function([int, int])*/
- /*analyzer.member: Class2a.method3c:int* Function([int*, int*])**/
+ /*member: Class2a.method3c:int Function([int, int])*/
- /*cfe|cfe:builder.member: Class2a.method4a:int? Function(int?, int?)*/
- /*analyzer.member: Class2a.method4a:int* Function(int*, int*)**/
+ /*member: Class2a.method4a:int? Function(int?, int?)*/
- /*cfe|cfe:builder.member: Class2a.method4b:int? Function(int?, [int?])*/
- /*analyzer.member: Class2a.method4b:int* Function(int*, [int*])**/
+ /*member: Class2a.method4b:int? Function(int?, [int?])*/
- /*cfe|cfe:builder.member: Class2a.method4c:int? Function([int?, int?])*/
- /*analyzer.member: Class2a.method4c:int* Function([int*, int*])**/
+ /*member: Class2a.method4c:int? Function([int?, int?])*/
- /*cfe|cfe:builder.member: Class2a.method5a:int Function(int, {int b})*/
- /*analyzer.member: Class2a.method5a:int* Function(int*, {int* b})**/
+ /*member: Class2a.method5a:int Function(int, {int b})*/
- /*cfe|cfe:builder.member: Class2a.method5b:int Function({int a, int b})*/
- /*analyzer.member: Class2a.method5b:int* Function({int* a, int* b})**/
+ /*member: Class2a.method5b:int Function({int a, int b})*/
- /*cfe|cfe:builder.member: Class2a.method6a:int? Function(int?, {int? b})*/
- /*analyzer.member: Class2a.method6a:int* Function(int*, {int* b})**/
+ /*member: Class2a.method6a:int? Function(int?, {int? b})*/
- /*cfe|cfe:builder.member: Class2a.method6b:int? Function({int? a, int? b})*/
- /*analyzer.member: Class2a.method6b:int* Function({int* a, int* b})**/
+ /*member: Class2a.method6b:int? Function({int? a, int? b})*/
- /*cfe|cfe:builder.member: Class2a.getter1:int*/
- /*analyzer.member: Class2a.getter1:int**/
- /*cfe|cfe:builder.member: Class2a.getter2:int?*/
- /*analyzer.member: Class2a.getter2:int**/
+ /*member: Class2a.getter1:int*/
+ /*member: Class2a.getter2:int?*/
- /*cfe|cfe:builder.member: Class2a.setter1=:int*/
- /*analyzer.member: Class2a.setter1=:int**/
- /*cfe|cfe:builder.member: Class2a.setter2=:int?*/
- /*analyzer.member: Class2a.setter2=:int**/
+ /*member: Class2a.setter1=:int*/
+ /*member: Class2a.setter2=:int?*/
- /*cfe|cfe:builder.member: Class2a.field1:int*/
- /*analyzer.member: Class2a.field1:int**/
- /*cfe|cfe:builder.member: Class2a.field1=:int*/
- /*analyzer.member: Class2a.field1=:int**/
+ /*member: Class2a.field1:int*/
+ /*member: Class2a.field1=:int*/
- /*cfe|cfe:builder.member: Class2a.field2:int?*/
- /*analyzer.member: Class2a.field2:int**/
- /*cfe|cfe:builder.member: Class2a.field2=:int?*/
- /*analyzer.member: Class2a.field2=:int**/
+ /*member: Class2a.field2:int?*/
+ /*member: Class2a.field2=:int?*/
- /*cfe|cfe:builder.member: Class2a.field3:int*/
- /*analyzer.member: Class2a.field3:int**/
- /*cfe|cfe:builder.member: Class2a.field3=:int*/
- /*analyzer.member: Class2a.field3=:int**/
+ /*member: Class2a.field3:int*/
+ /*member: Class2a.field3=:int*/
- /*cfe|cfe:builder.member: Class2a.field4:int?*/
- /*analyzer.member: Class2a.field4:int**/
- /*cfe|cfe:builder.member: Class2a.field4=:int?*/
- /*analyzer.member: Class2a.field4=:int**/
+ /*member: Class2a.field4:int?*/
+ /*member: Class2a.field4=:int?*/
- /*cfe|cfe:builder.member: Class2a.field5:int*/
- /*analyzer.member: Class2a.field5:int**/
- /*cfe|cfe:builder.member: Class2a.field5=:int*/
- /*analyzer.member: Class2a.field5=:int**/
+ /*member: Class2a.field5:int*/
+ /*member: Class2a.field5=:int*/
- /*cfe|cfe:builder.member: Class2a.field6:int?*/
- /*analyzer.member: Class2a.field6:int**/
- /*cfe|cfe:builder.member: Class2a.field6=:int?*/
- /*analyzer.member: Class2a.field6=:int**/
+ /*member: Class2a.field6:int?*/
+ /*member: Class2a.field6=:int?*/
- /*cfe|cfe:builder.member: Class2a.property1:int*/
- /*analyzer.member: Class2a.property1:int**/
- /*cfe|cfe:builder.member: Class2a.property1=:int*/
- /*analyzer.member: Class2a.property1=:int**/
+ /*member: Class2a.property1:int*/
+ /*member: Class2a.property1=:int*/
- /*cfe|cfe:builder.member: Class2a.property2:int?*/
- /*analyzer.member: Class2a.property2:int**/
- /*cfe|cfe:builder.member: Class2a.property2=:int?*/
- /*analyzer.member: Class2a.property2=:int**/
+ /*member: Class2a.property2:int?*/
+ /*member: Class2a.property2=:int?*/
- /*cfe|cfe:builder.member: Class2a.property3:int*/
- /*analyzer.member: Class2a.property3:int**/
- /*cfe|cfe:builder.member: Class2a.property3=:int*/
- /*analyzer.member: Class2a.property3=:int**/
+ /*member: Class2a.property3:int*/
+ /*member: Class2a.property3=:int*/
- /*cfe|cfe:builder.member: Class2a.property4:int?*/
- /*analyzer.member: Class2a.property4:int**/
- /*cfe|cfe:builder.member: Class2a.property4=:int?*/
- /*analyzer.member: Class2a.property4=:int**/
+ /*member: Class2a.property4:int?*/
+ /*member: Class2a.property4=:int?*/
}
/*class: Class2b:Class2b,Interface,LegacyClass,Object*/
diff --git a/pkg/_fe_analyzer_shared/test/inheritance/data/norm_supertypes.dart b/pkg/_fe_analyzer_shared/test/inheritance/data/norm_supertypes.dart
index 37dcca4..fb47fcd 100644
--- a/pkg/_fe_analyzer_shared/test/inheritance/data/norm_supertypes.dart
+++ b/pkg/_fe_analyzer_shared/test/inheritance/data/norm_supertypes.dart
@@ -12,7 +12,7 @@
/*class: Foo:A<FutureOr<T?>>,Foo<T, S>,Object*/
class Foo<T extends S, S extends Never> implements A<FutureOr<T?>> {}
-/// TODO: Solve CFE / analyzer disagreement.
+/// TODO: Solve CFE / analyzer difference.
/// It looks to me that is should be `A<FutureOr<Never?>>`, because this is
/// what is written in the code. We don't do normalization because there is
/// only one implementation of `A` in `Bar`.
diff --git a/pkg/_fe_analyzer_shared/test/inheritance/data/top_merge_opt_in.dart b/pkg/_fe_analyzer_shared/test/inheritance/data/top_merge_opt_in.dart
index f1c914c..d0865e2 100644
--- a/pkg/_fe_analyzer_shared/test/inheritance/data/top_merge_opt_in.dart
+++ b/pkg/_fe_analyzer_shared/test/inheritance/data/top_merge_opt_in.dart
@@ -32,14 +32,12 @@
/*class: E1:A,B,C,D,E1,Object*/
abstract class E1 implements A, B, C, D {
- /*cfe|cfe:builder.member: E1.method:void Function(void)*/
-/*analyzer.member: E1.method:FutureOr<dynamic> Function(FutureOr<dynamic>)*/
+ /*member: E1.method:void Function(void)*/
}
/*class: E2:A,B,E2,Object*/
abstract class E2 implements A, B {
- /*cfe|cfe:builder.member: E2.method:Object? Function(Object?)*/
- /*analyzer.member: E2.method:dynamic Function(dynamic)*/
+ /*member: E2.method:Object? Function(Object?)*/
}
/*class: E3:B,C,E3,Object*/
@@ -54,8 +52,7 @@
/*class: E5:A,D,E5,Object*/
abstract class E5 implements A, D {
- /*cfe|cfe:builder.member: E5.method:Object? Function(Object?)*/
- /*analyzer.member: E5.method:FutureOr<dynamic> Function(FutureOr<dynamic>)*/
+ /*member: E5.method:Object? Function(Object?)*/
}
/*class: E6:A,D,E6,Object*/
@@ -81,12 +78,10 @@
/*class: G3:A,C,F,G3,Object*/
abstract class G3 implements C, A, F {
- /*cfe|cfe:builder.member: G3.method:void Function(void)*/
- /*analyzer.member: G3.method:Object? Function(Object?)*/
+ /*member: G3.method:void Function(void)*/
}
/*class: G4:A,C,F,G4,Object*/
abstract class G4 implements C, F, A {
- /*cfe|cfe:builder.member: G4.method:void Function(void)*/
- /*analyzer.member: G4.method:Object? Function(Object?)*/
+ /*member: G4.method:void Function(void)*/
}
diff --git a/pkg/_fe_analyzer_shared/test/inheritance/data/top_merge_opt_out.dart b/pkg/_fe_analyzer_shared/test/inheritance/data/top_merge_opt_out.dart
index 2bd5fdc..3de2a8e 100644
--- a/pkg/_fe_analyzer_shared/test/inheritance/data/top_merge_opt_out.dart
+++ b/pkg/_fe_analyzer_shared/test/inheritance/data/top_merge_opt_out.dart
@@ -34,38 +34,32 @@
/*class: E1:A,B,C,E1,Object*/
abstract class E1 implements A, B, C {
- /*cfe|cfe:builder.member: E1.method:Object* Function(Object*)**/
- /*analyzer.member: E1.method:void Function(void)**/
+ /*member: E1.method:Object* Function(Object*)**/
}
/*class: E2:A,B,E2,Object*/
abstract class E2 implements A, B {
- /*cfe|cfe:builder.member: E2.method:Object* Function(Object*)**/
- /*analyzer.member: E2.method:dynamic Function(dynamic)**/
+ /*member: E2.method:Object* Function(Object*)**/
}
/*class: E3:B,C,E3,Object*/
abstract class E3 implements B, C {
- /*cfe|cfe:builder.member: E3.method:dynamic Function(dynamic)**/
- /*analyzer.member: E3.method:void Function(void)**/
+ /*member: E3.method:dynamic Function(dynamic)**/
}
/*class: E4:A,C,E4,Object*/
abstract class E4 implements A, C {
- /*cfe|cfe:builder.member: E4.method:Object* Function(Object*)**/
- /*analyzer.member: E4.method:void Function(void)**/
+ /*member: E4.method:Object* Function(Object*)**/
}
/*class: E5:A,D,E5,Object*/
abstract class E5 implements A, D {
- /*cfe|cfe:builder.member: E5.method:Object* Function(Object*)**/
- /*analyzer.member: E5.method:FutureOr<dynamic>* Function(FutureOr<dynamic>*)**/
+ /*member: E5.method:Object* Function(Object*)**/
}
/*class: E6:A,D,E6,Object*/
abstract class E6 implements D, A {
- /*cfe|cfe:builder.member: E6.method:FutureOr<dynamic>* Function(FutureOr<dynamic>*)**/
- /*analyzer.member: E6.method:Object* Function(Object*)**/
+ /*member: E6.method:FutureOr<dynamic>* Function(FutureOr<dynamic>*)**/
}
/*class: F:F,Object*/
@@ -76,24 +70,20 @@
/*class: G1:A,C,F,G1,Object*/
abstract class G1 implements A, C, F {
- /*cfe|cfe:builder.member: G1.method:Object* Function(Object*)**/
- /*analyzer.member: G1.method:void Function(void)**/
+ /*member: G1.method:Object* Function(Object*)**/
}
/*class: G2:A,C,F,G2,Object*/
abstract class G2 implements A, F, C {
- /*cfe|cfe:builder.member: G2.method:Object* Function(Object*)**/
- /*analyzer.member: G2.method:void Function(void)**/
+ /*member: G2.method:Object* Function(Object*)**/
}
/*class: G3:A,C,F,G3,Object*/
abstract class G3 implements C, A, F {
- /*cfe|cfe:builder.member: G3.method:void Function(void)**/
- /*analyzer.member: G3.method:Object* Function(Object*)**/
+ /*member: G3.method:void Function(void)**/
}
/*class: G4:A,C,F,G4,Object*/
abstract class G4 implements C, F, A {
- /*cfe|cfe:builder.member: G4.method:void Function(void)**/
- /*analyzer.member: G4.method:Object* Function(Object*)**/
+ /*member: G4.method:void Function(void)**/
}
diff --git a/pkg/analysis_server/analysis_options.yaml b/pkg/analysis_server/analysis_options.yaml
index a21d0e40..dd243d9 100644
--- a/pkg/analysis_server/analysis_options.yaml
+++ b/pkg/analysis_server/analysis_options.yaml
@@ -25,7 +25,7 @@
- annotate_overrides
- avoid_null_checks_in_equality_operators
- camel_case_extensions
- #- omit_local_variable_types # 8650
+ - omit_local_variable_types
- prefer_adjacent_string_concatenation
- prefer_collection_literals
- prefer_conditional_assignment
diff --git a/pkg/analysis_server/benchmark/benchmarks.dart b/pkg/analysis_server/benchmark/benchmarks.dart
index 2926da8..788ab0f 100644
--- a/pkg/analysis_server/benchmark/benchmarks.dart
+++ b/pkg/analysis_server/benchmark/benchmarks.dart
@@ -17,13 +17,13 @@
import 'perf/flutter_analyze_benchmark.dart';
Future main(List<String> args) async {
- final List<Benchmark> benchmarks = [
+ var benchmarks = <Benchmark>[
ColdAnalysisBenchmark(),
AnalysisBenchmark(),
FlutterAnalyzeBenchmark(),
];
- CommandRunner runner =
+ var runner =
CommandRunner('benchmark', 'A benchmark runner for the analysis server.');
runner.addCommand(ListCommand(benchmarks));
runner.addCommand(RunCommand(benchmarks));
@@ -31,15 +31,15 @@
}
String get analysisServerSrcPath {
- String script = Platform.script.toFilePath(windows: Platform.isWindows);
- String pkgPath = path.normalize(path.join(path.dirname(script), '..', '..'));
+ var script = Platform.script.toFilePath(windows: Platform.isWindows);
+ var pkgPath = path.normalize(path.join(path.dirname(script), '..', '..'));
return path.join(pkgPath, 'analysis_server');
}
void deleteServerCache() {
// ~/.dartServer/.analysis-driver/
ResourceProvider resourceProvider = PhysicalResourceProvider.INSTANCE;
- Folder stateLocation = resourceProvider.getStateLocation('.analysis-driver');
+ var stateLocation = resourceProvider.getStateLocation('.analysis-driver');
try {
if (stateLocation.exists) {
stateLocation.delete();
@@ -50,8 +50,8 @@
}
List<String> getProjectRoots({bool quick = false}) {
- String script = Platform.script.toFilePath(windows: Platform.isWindows);
- String pkgPath = path.normalize(path.join(path.dirname(script), '..', '..'));
+ var script = Platform.script.toFilePath(windows: Platform.isWindows);
+ var pkgPath = path.normalize(path.join(path.dirname(script), '..', '..'));
return <String>[path.join(pkgPath, quick ? 'meta' : 'analysis_server')];
}
@@ -125,13 +125,13 @@
return a.combine(b);
}
- CompoundBenchMarkResult o = other as CompoundBenchMarkResult;
+ var o = other as CompoundBenchMarkResult;
- CompoundBenchMarkResult combined = CompoundBenchMarkResult(name);
- List<String> keys =
+ var combined = CompoundBenchMarkResult(name);
+ var keys =
(<String>{}..addAll(results.keys)..addAll(o.results.keys)).toList();
- for (String key in keys) {
+ for (var key in keys) {
combined.add(key, _combine(results[key], o.results[key]));
}
@@ -140,8 +140,8 @@
@override
Map toJson() {
- Map m = {};
- for (String key in results.keys) {
+ var m = <String, dynamic>{};
+ for (var key in results.keys) {
m['$name-$key'] = results[key].toJson();
}
return m;
@@ -171,12 +171,12 @@
@override
void run() {
if (argResults['machine'] as bool) {
- final Map map = {
+ var map = <String, dynamic>{
'benchmarks': benchmarks.map((b) => b.toJson()).toList()
};
print(JsonEncoder.withIndent(' ').convert(map));
} else {
- for (Benchmark benchmark in benchmarks) {
+ for (var benchmark in benchmarks) {
print('${benchmark.id}: ${benchmark.description}');
}
}
@@ -215,12 +215,12 @@
exit(1);
}
- final String benchmarkId = argResults.rest.first;
- final int repeatCount = int.parse(argResults['repeat'] as String);
- final bool quick = argResults['quick'];
- final bool verbose = argResults['verbose'];
+ var benchmarkId = argResults.rest.first;
+ var repeatCount = int.parse(argResults['repeat'] as String);
+ var quick = argResults['quick'];
+ var verbose = argResults['verbose'];
- final Benchmark benchmark =
+ var benchmark =
benchmarks.firstWhere((b) => b.id == benchmarkId, orElse: () {
print("Benchmark '$benchmarkId' not found.");
exit(1);
@@ -228,7 +228,7 @@
return null;
});
- int actualIterations = repeatCount;
+ var actualIterations = repeatCount;
if (benchmark.maxIterations > 0) {
actualIterations = math.min(benchmark.maxIterations, repeatCount);
}
@@ -240,11 +240,11 @@
try {
BenchMarkResult result;
- Stopwatch time = Stopwatch()..start();
+ var time = Stopwatch()..start();
print('Running $benchmarkId $actualIterations times...');
- for (int iteration = 0; iteration < actualIterations; iteration++) {
- BenchMarkResult newResult = await benchmark.run(
+ for (var iteration = 0; iteration < actualIterations; iteration++) {
+ var newResult = await benchmark.run(
quick: quick,
verbose: verbose,
);
@@ -254,7 +254,10 @@
time.stop();
print('Finished in ${time.elapsed.inSeconds} seconds.\n');
- Map m = {'benchmark': benchmarkId, 'result': result.toJson()};
+ var m = <String, dynamic>{
+ 'benchmark': benchmarkId,
+ 'result': result.toJson()
+ };
print(json.encode(m));
await benchmark.oneTimeCleanup();
diff --git a/pkg/analysis_server/benchmark/integration/driver.dart b/pkg/analysis_server/benchmark/integration/driver.dart
index 2f9bfc4..0bb18c1 100644
--- a/pkg/analysis_server/benchmark/integration/driver.dart
+++ b/pkg/analysis_server/benchmark/integration/driver.dart
@@ -19,7 +19,7 @@
sb.write(text);
sb.write(',');
}
- for (int i = text.length; i < keyLen; ++i) {
+ for (var i = text.length; i < keyLen; ++i) {
sb.writeCharCode(SPACE);
}
if (rightJustified) {
@@ -84,7 +84,7 @@
logger.log(Level.FINE, 'starting server');
initializeInttestMixin();
server = Server();
- Completer serverConnected = Completer();
+ var serverConnected = Completer();
onServerConnected.listen((_) {
logger.log(Level.FINE, 'connected to server');
serverConnected.complete();
@@ -138,31 +138,31 @@
int get count => elapsedTimes.length;
void printSummary(int keyLen) {
- int count = 0;
- Duration maxTime = elapsedTimes[0];
- Duration minTime = elapsedTimes[0];
- int totalTimeMicros = 0;
- for (Duration elapsed in elapsedTimes) {
+ var count = 0;
+ var maxTime = elapsedTimes[0];
+ var minTime = elapsedTimes[0];
+ var totalTimeMicros = 0;
+ for (var elapsed in elapsedTimes) {
++count;
- int timeMicros = elapsed.inMicroseconds;
+ var timeMicros = elapsed.inMicroseconds;
maxTime = maxTime.compareTo(elapsed) > 0 ? maxTime : elapsed;
minTime = minTime.compareTo(elapsed) < 0 ? minTime : elapsed;
totalTimeMicros += timeMicros;
}
- int meanTime = (totalTimeMicros / count).round();
- List<Duration> sorted = elapsedTimes.toList()..sort();
- Duration time90th = sorted[(sorted.length * 0.90).round() - 1];
- Duration time99th = sorted[(sorted.length * 0.99).round() - 1];
- int differenceFromMeanSquared = 0;
- for (Duration elapsed in elapsedTimes) {
- int timeMicros = elapsed.inMicroseconds;
- int differenceFromMean = timeMicros - meanTime;
+ var meanTime = (totalTimeMicros / count).round();
+ var sorted = elapsedTimes.toList()..sort();
+ var time90th = sorted[(sorted.length * 0.90).round() - 1];
+ var time99th = sorted[(sorted.length * 0.99).round() - 1];
+ var differenceFromMeanSquared = 0;
+ for (var elapsed in elapsedTimes) {
+ var timeMicros = elapsed.inMicroseconds;
+ var differenceFromMean = timeMicros - meanTime;
differenceFromMeanSquared += differenceFromMean * differenceFromMean;
}
- double variance = differenceFromMeanSquared / count;
- int standardDeviation = sqrt(variance).round();
+ var variance = differenceFromMeanSquared / count;
+ var standardDeviation = sqrt(variance).round();
- StringBuffer sb = StringBuffer();
+ var sb = StringBuffer();
_printColumn(sb, tag, keyLen);
_printColumn(sb, count.toString(), 6, rightJustified: true);
_printColumn(sb, errorCount.toString(), 6, rightJustified: true);
@@ -204,14 +204,14 @@
print('');
print('==================================================================');
print('');
- List<String> keys = measurements.keys.toList()..sort();
- int keyLen = keys.fold(0, (int len, String key) => max(len, key.length));
+ var keys = measurements.keys.toList()..sort();
+ var keyLen = keys.fold(0, (int len, String key) => max(len, key.length));
_printGroupHeader('Request/Response', keyLen);
- int totalCount = 0;
- int totalErrorCount = 0;
- int totalUnexpectedResultCount = 0;
- for (String tag in keys) {
- Measurement m = measurements[tag];
+ var totalCount = 0;
+ var totalErrorCount = 0;
+ var totalUnexpectedResultCount = 0;
+ for (var tag in keys) {
+ var m = measurements[tag];
if (!m.notification) {
m.printSummary(keyLen);
totalCount += m.count;
@@ -223,8 +223,8 @@
keyLen, totalCount, totalErrorCount, totalUnexpectedResultCount);
print('');
_printGroupHeader('Notifications', keyLen);
- for (String tag in keys) {
- Measurement m = measurements[tag];
+ for (var tag in keys) {
+ var m = measurements[tag];
if (m.notification) {
m.printSummary(keyLen);
}
@@ -241,7 +241,7 @@
/// Record the elapsed time for the given operation.
void record(String tag, Duration elapsed,
{bool notification = false, bool success = true}) {
- Measurement measurement = measurements[tag];
+ var measurement = measurements[tag];
if (measurement == null) {
measurement = Measurement(tag, notification);
measurements[tag] = measurement;
@@ -254,7 +254,7 @@
}
void _printGroupHeader(String groupName, int keyLen) {
- StringBuffer sb = StringBuffer();
+ var sb = StringBuffer();
_printColumn(sb, groupName, keyLen);
_printColumn(sb, 'count', 6, rightJustified: true);
_printColumn(sb, 'error', 6, rightJustified: true);
@@ -272,7 +272,7 @@
void _printTotals(int keyLen, int totalCount, int totalErrorCount,
int totalUnexpectedResultCount) {
- StringBuffer sb = StringBuffer();
+ var sb = StringBuffer();
_printColumn(sb, 'Totals', keyLen);
_printColumn(sb, totalCount.toString(), 6, rightJustified: true);
_printColumn(sb, totalErrorCount.toString(), 6, rightJustified: true);
diff --git a/pkg/analysis_server/benchmark/integration/input_converter.dart b/pkg/analysis_server/benchmark/integration/input_converter.dart
index a0645ec..5c04dd7 100644
--- a/pkg/analysis_server/benchmark/integration/input_converter.dart
+++ b/pkg/analysis_server/benchmark/integration/input_converter.dart
@@ -63,9 +63,9 @@
String event = json['event'];
if (event == SERVER_NOTIFICATION_STATUS) {
// {"event":"server.status","params":{"analysis":{"isAnalyzing":false}}}
- Map<String, dynamic> params = asMap(json['params']);
+ var params = asMap(json['params']);
if (params != null) {
- Map<String, dynamic> analysis = asMap(params['analysis']);
+ var analysis = asMap(params['analysis']);
if (analysis != null && analysis['isAnalyzing'] == false) {
return WaitForAnalysisCompleteOperation();
}
@@ -83,7 +83,7 @@
/// Return an operation for the request or `null` if none.
Operation convertRequest(Map<String, dynamic> origJson) {
- Map<String, dynamic> json = asMap(translateSrcPaths(origJson));
+ var json = asMap(translateSrcPaths(origJson));
requestMap[json['id']] = json;
String method = json['method'];
// Sanity check operations that modify source
@@ -91,23 +91,23 @@
if (method == ANALYSIS_REQUEST_UPDATE_CONTENT) {
// Track overlays in parallel with the analysis server
// so that when an overlay is removed, the file can be updated on disk
- Request request = Request.fromJson(json);
+ var request = Request.fromJson(json);
var params = AnalysisUpdateContentParams.fromRequest(request);
params.files.forEach((String filePath, change) {
if (change is AddContentOverlay) {
- String content = change.content;
+ var content = change.content;
if (content == null) {
throw 'expected new overlay content\n$json';
}
overlays[filePath] = content;
} else if (change is ChangeContentOverlay) {
- String content = overlays[filePath];
+ var content = overlays[filePath];
if (content == null) {
throw 'expected cached overlay content\n$json';
}
overlays[filePath] = SourceEdit.applySequence(content, change.edits);
} else if (change is RemoveContentOverlay) {
- String content = overlays.remove(filePath);
+ var content = overlays.remove(filePath);
if (content == null) {
throw 'expected cached overlay content\n$json';
}
@@ -158,8 +158,8 @@
void logOverlayContent() {
logger.log(Level.WARNING, '${overlays.length} overlays');
- List<String> allPaths = overlays.keys.toList()..sort();
- for (String filePath in allPaths) {
+ var allPaths = overlays.keys.toList()..sort();
+ for (var filePath in allPaths) {
logger.log(Level.WARNING, 'overlay $filePath\n${overlays[filePath]}');
}
}
@@ -201,7 +201,7 @@
/// or stashing it in [responseMap] if no completer exists.
/// The response result may be `null`.
void processResponseResult(String id, result) {
- Completer completer = responseCompleters[id];
+ var completer = responseCompleters[id];
if (completer != null) {
logger.log(Level.INFO, 'processing response $id');
completer.complete(result);
@@ -219,14 +219,14 @@
return srcPathMap.translate(json);
}
if (json is List) {
- List result = [];
- for (int i = 0; i < json.length; ++i) {
+ var result = [];
+ for (var i = 0; i < json.length; ++i) {
result.add(translateSrcPaths(json[i]));
}
return result;
}
if (json is Map) {
- Map<String, dynamic> result = <String, dynamic>{};
+ var result = <String, dynamic>{};
json.forEach((origKey, value) {
result[translateSrcPaths(origKey)] = translateSrcPaths(value);
});
@@ -309,8 +309,8 @@
}
String translate(String original) {
- String result = original;
- for (PathMapEntry entry in entries) {
+ var result = original;
+ for (var entry in entries) {
result = entry.translate(result);
}
return result;
@@ -340,7 +340,7 @@
@override
void add(String line) {
- Operation op = converter.convert(line);
+ var op = converter.convert(line);
if (op != null) {
outSink.add(op);
}
diff --git a/pkg/analysis_server/benchmark/integration/instrumentation_input_converter.dart b/pkg/analysis_server/benchmark/integration/instrumentation_input_converter.dart
index f4715ed..e2f01d3 100644
--- a/pkg/analysis_server/benchmark/integration/instrumentation_input_converter.dart
+++ b/pkg/analysis_server/benchmark/integration/instrumentation_input_converter.dart
@@ -46,7 +46,7 @@
'Failed to parse line\n$line', CaughtException(e, s));
}
// int timeStamp = int.parse(fields[0], onError: (_) => -1);
- String opCode = fields[1];
+ var opCode = fields[1];
if (opCode == InstrumentationLogAdapter.TAG_NOTIFICATION) {
return convertNotification(decodeJson(line, fields[2]));
} else if (opCode == 'Read') {
@@ -89,23 +89,23 @@
/// For example:
/// `1433175833005:Ver:1421765742287333878467:org.dartlang.dartplugin:0.0.0:1.6.2:1.11.0-edge.131698`
static bool isFormat(String line) {
- List<String> fields = _parseFields(line);
+ var fields = _parseFields(line);
if (fields.length < 2) return false;
- int timeStamp = int.tryParse(fields[0]) ?? -1;
- String opCode = fields[1];
+ var timeStamp = int.tryParse(fields[0]) ?? -1;
+ var opCode = fields[1];
return timeStamp > 0 && opCode == 'Ver';
}
/// Extract fields from the given [line].
static List<String> _parseFields(String line) {
- List<String> fields = <String>[];
- int index = 0;
- StringBuffer sb = StringBuffer();
+ var fields = <String>[];
+ var index = 0;
+ var sb = StringBuffer();
while (index < line.length) {
- int code = line.codeUnitAt(index);
+ var code = line.codeUnitAt(index);
if (code == COLON) {
// Embedded colons are doubled
- int next = index + 1;
+ var next = index + 1;
if (next < line.length && line.codeUnitAt(next) == COLON) {
sb.write(':');
++index;
diff --git a/pkg/analysis_server/benchmark/integration/local_runner.dart b/pkg/analysis_server/benchmark/integration/local_runner.dart
index a3d8253..857d422 100644
--- a/pkg/analysis_server/benchmark/integration/local_runner.dart
+++ b/pkg/analysis_server/benchmark/integration/local_runner.dart
@@ -64,7 +64,7 @@
'-i${inputFile.path}',
'-t$tmpSrcDirPath',
];
- for (int index = 3; index < args.length; ++index) {
+ for (var index = 3; index < args.length; ++index) {
perfArgs.add(args[index].replaceAll('@tmpSrcDir@', tmpSrcDirPath));
}
perfArgs.add('-m${gitDir.path},$tmpSrcDirPath');
diff --git a/pkg/analysis_server/benchmark/integration/log_file_input_converter.dart b/pkg/analysis_server/benchmark/integration/log_file_input_converter.dart
index c64ccaa..6ec1a4f 100644
--- a/pkg/analysis_server/benchmark/integration/log_file_input_converter.dart
+++ b/pkg/analysis_server/benchmark/integration/log_file_input_converter.dart
@@ -25,17 +25,17 @@
@override
Operation convert(String line) {
try {
- String timeStampString = _parseTimeStamp(line);
- String data = line.substring(timeStampString.length);
+ var timeStampString = _parseTimeStamp(line);
+ var data = line.substring(timeStampString.length);
if (data.startsWith(RECEIVED_FRAGMENT)) {
- Map<String, dynamic> jsonData = asMap(json.decode(data.substring(4)));
+ var jsonData = asMap(json.decode(data.substring(4)));
if (jsonData.containsKey('event')) {
return convertNotification(jsonData);
} else {
return convertResponse(jsonData);
}
} else if (data.startsWith(SENT_FRAGMENT)) {
- Map<String, dynamic> jsonData = asMap(json.decode(data.substring(4)));
+ var jsonData = asMap(json.decode(data.substring(4)));
if (jsonData.containsKey('method')) {
return convertRequest(jsonData);
}
@@ -53,9 +53,9 @@
/// For example:
/// `1428347977499 <= {"event":"server.connected","params":{"version":"1.6.0"}}`
static bool isFormat(String line) {
- String timeStampString = _parseTimeStamp(line);
- int start = timeStampString.length;
- int end = start + CONNECTED_MSG_FRAGMENT.length;
+ var timeStampString = _parseTimeStamp(line);
+ var start = timeStampString.length;
+ var end = start + CONNECTED_MSG_FRAGMENT.length;
return (10 < start && end < line.length) &&
line.substring(start, end) == CONNECTED_MSG_FRAGMENT;
}
@@ -63,9 +63,9 @@
/// Parse the given line and return the millisecond timestamp or `null`
/// if it cannot be determined.
static String _parseTimeStamp(String line) {
- int index = 0;
+ var index = 0;
while (index < line.length) {
- int code = line.codeUnitAt(index);
+ var code = line.codeUnitAt(index);
if (code < ZERO || NINE < code) {
return line.substring(0, index);
}
diff --git a/pkg/analysis_server/benchmark/integration/main.dart b/pkg/analysis_server/benchmark/integration/main.dart
index f207811..8006da8 100644
--- a/pkg/analysis_server/benchmark/integration/main.dart
+++ b/pkg/analysis_server/benchmark/integration/main.dart
@@ -16,17 +16,17 @@
/// Launch and interact with the analysis server.
void main(List<String> rawArgs) {
- Logger logger = Logger('Performance Measurement Client');
+ var logger = Logger('Performance Measurement Client');
logger.onRecord.listen((LogRecord rec) {
print(rec.message);
});
- PerfArgs args = parseArgs(rawArgs);
+ var args = parseArgs(rawArgs);
- Driver driver = Driver(diagnosticPort: args.diagnosticPort);
- Stream<Operation> stream = openInput(args);
+ var driver = Driver(diagnosticPort: args.diagnosticPort);
+ var stream = openInput(args);
StreamSubscription<Operation> subscription;
subscription = stream.listen((Operation op) {
- Future future = driver.perform(op);
+ var future = driver.perform(op);
if (future != null) {
logger.log(Level.FINE, 'pausing operations for ${op.runtimeType}');
subscription.pause(future.then((_) {
@@ -107,7 +107,7 @@
} else {
inputRaw = File(args.inputPath).openRead();
}
- for (PathMapEntry entry in args.srcPathMap.entries) {
+ for (var entry in args.srcPathMap.entries) {
logger.log(
Level.INFO,
'mapping source path\n'
@@ -124,7 +124,7 @@
/// Parse the command line arguments.
PerfArgs parseArgs(List<String> rawArgs) {
ArgResults args;
- PerfArgs perfArgs = PerfArgs();
+ var perfArgs = PerfArgs();
try {
args = argParser.parse(rawArgs);
} on Exception catch (e) {
@@ -133,7 +133,7 @@
exit(1);
}
- bool showHelp = args[HELP_CMDLINE_OPTION] || args.rest.isNotEmpty;
+ var showHelp = args[HELP_CMDLINE_OPTION] || args.rest.isNotEmpty;
bool isMissing(key) => args[key] == null || args[key].isEmpty;
@@ -145,10 +145,10 @@
for (String pair in args[MAP_OPTION]) {
if (pair is String) {
- int index = pair.indexOf(',');
+ var index = pair.indexOf(',');
if (index != -1 && !pair.contains(',', index + 1)) {
- String oldSrcPrefix = _withTrailingSeparator(pair.substring(0, index));
- String newSrcPrefix = _withTrailingSeparator(pair.substring(index + 1));
+ var oldSrcPrefix = _withTrailingSeparator(pair.substring(0, index));
+ var newSrcPrefix = _withTrailingSeparator(pair.substring(index + 1));
if (Directory(newSrcPrefix).existsSync()) {
perfArgs.srcPathMap.add(oldSrcPrefix, newSrcPrefix);
continue;
diff --git a/pkg/analysis_server/benchmark/integration/operation.dart b/pkg/analysis_server/benchmark/integration/operation.dart
index 18e37cb..7532df2 100644
--- a/pkg/analysis_server/benchmark/integration/operation.dart
+++ b/pkg/analysis_server/benchmark/integration/operation.dart
@@ -32,7 +32,7 @@
void processNotification(CompletionResultsParams event) {
if (event.id == notificationId) {
- Duration elapsed = stopwatch.elapsed;
+ var elapsed = stopwatch.elapsed;
if (firstNotification) {
firstNotification = false;
driver.results.record('completion notification first', elapsed,
@@ -69,7 +69,7 @@
@override
Future perform(Driver driver) {
- Stopwatch stopwatch = Stopwatch();
+ var stopwatch = Stopwatch();
String originalId = json['id'];
String method = json['method'];
json['clientRequestTime'] = DateTime.now().millisecondsSinceEpoch;
@@ -77,7 +77,7 @@
stopwatch.start();
void recordResult(bool success, result) {
- Duration elapsed = stopwatch.elapsed;
+ var elapsed = stopwatch.elapsed;
driver.results.record(method, elapsed, success: success);
driver.logger
.log(Level.FINE, 'Response received: $method : $elapsed\n $result');
@@ -131,7 +131,7 @@
}
} else if (expectedResult is List && actualResult is List) {
if (expectedResult.length == actualResult.length) {
- for (int i = 0; i < expectedResult.length; ++i) {
+ for (var i = 0; i < expectedResult.length; ++i) {
if (!_equal(expectedResult[i], actualResult[i])) {
return false;
}
@@ -148,14 +148,14 @@
if (!_equal(expectedResult, actualResult)) {
var expectedError = responseJson['error'];
String format(value) {
- String text = '\n$value';
+ var text = '\n$value';
if (text.endsWith('\n')) {
text = text.substring(0, text.length - 1);
}
return text.replaceAll('\n', '\n ');
}
- String message = 'Request:${format(requestJson)}\n'
+ var message = 'Request:${format(requestJson)}\n'
'expected result:${format(expectedResult)}\n'
'expected error:${format(expectedError)}\n'
'but received:${format(actualResult)}';
@@ -180,12 +180,12 @@
class WaitForAnalysisCompleteOperation extends Operation {
@override
Future perform(Driver driver) {
- DateTime start = DateTime.now();
+ var start = DateTime.now();
driver.logger.log(Level.FINE, 'waiting for analysis to complete');
StreamSubscription<ServerStatusParams> subscription;
Timer timer;
- Completer completer = Completer();
- bool isAnalyzing = false;
+ var completer = Completer();
+ var isAnalyzing = false;
subscription = driver.onServerStatus.listen((ServerStatusParams params) {
if (params.analysis != null) {
if (params.analysis.isAnalyzing) {
@@ -193,8 +193,8 @@
} else {
subscription.cancel();
timer.cancel();
- DateTime end = DateTime.now();
- Duration delta = end.difference(start);
+ var end = DateTime.now();
+ var delta = end.difference(start);
driver.logger.log(Level.FINE, 'analysis complete after $delta');
completer.complete();
driver.results.record('analysis complete', delta, notification: true);
@@ -211,12 +211,12 @@
return;
}
// Timeout if no communication received within the last 60 seconds.
- double currentTime = driver.server.currentElapseTime;
- double lastTime = driver.server.lastCommunicationTime;
+ var currentTime = driver.server.currentElapseTime;
+ var lastTime = driver.server.lastCommunicationTime;
if (currentTime - lastTime > 60) {
subscription.cancel();
timer.cancel();
- String message = 'gave up waiting for analysis to complete';
+ var message = 'gave up waiting for analysis to complete';
driver.logger.log(Level.WARNING, message);
completer.completeError(message);
}
diff --git a/pkg/analysis_server/benchmark/perf/benchmarks_impl.dart b/pkg/analysis_server/benchmark/perf/benchmarks_impl.dart
index 0bdc7e1..0d0893f 100644
--- a/pkg/analysis_server/benchmark/perf/benchmarks_impl.dart
+++ b/pkg/analysis_server/benchmark/perf/benchmarks_impl.dart
@@ -30,9 +30,9 @@
bool quick = false,
bool verbose = false,
}) async {
- Stopwatch stopwatch = Stopwatch()..start();
+ var stopwatch = Stopwatch()..start();
- AnalysisServerMemoryUsageTest test = AnalysisServerMemoryUsageTest();
+ var test = AnalysisServerMemoryUsageTest();
if (verbose) {
test.debugStdio();
}
@@ -42,20 +42,20 @@
await test.analysisFinished;
stopwatch.stop();
- int usedBytes = await test.getMemoryUsage();
+ var usedBytes = await test.getMemoryUsage();
- CompoundBenchMarkResult result = CompoundBenchMarkResult(id);
+ var result = CompoundBenchMarkResult(id);
result.add('warm-analysis',
BenchMarkResult('micros', stopwatch.elapsedMicroseconds));
result.add('warm-memory', BenchMarkResult('bytes', usedBytes));
if (!quick) {
// change timing
- final int editMicros = await _calcEditTiming(test);
+ var editMicros = await _calcEditTiming(test);
result.add('edit', BenchMarkResult('micros', editMicros));
// code completion
- final int completionMicros = await _calcCompletionTiming(test);
+ var completionMicros = await _calcCompletionTiming(test);
result.add('completion', BenchMarkResult('micros', completionMicros));
}
@@ -66,17 +66,17 @@
Future<int> _calcCompletionTiming(
AbstractAnalysisServerIntegrationTest test) async {
- const int kGroupCount = 10;
+ const kGroupCount = 10;
- final String filePath =
+ var filePath =
path.join(analysisServerSrcPath, 'lib/src/analysis_server.dart');
- String contents = File(filePath).readAsStringSync();
+ var contents = File(filePath).readAsStringSync();
await test
.sendAnalysisUpdateContent({filePath: AddContentOverlay(contents)});
- int completionCount = 0;
- final Stopwatch stopwatch = Stopwatch()..start();
+ var completionCount = 0;
+ var stopwatch = Stopwatch()..start();
Future _complete(int offset) async {
// Create a new non-broadcast stream and subscribe to
@@ -87,10 +87,9 @@
final completionResults = StreamController<CompletionResultsParams>();
completionResults.sink.addStream(test.onCompletionResults);
- CompletionGetSuggestionsResult result =
- await test.sendCompletionGetSuggestions(filePath, offset);
+ var result = await test.sendCompletionGetSuggestions(filePath, offset);
- Future<CompletionResultsParams> future = completionResults.stream
+ var future = completionResults.stream
.where((CompletionResultsParams params) =>
params.id == result.id && params.isLast)
.first;
@@ -99,10 +98,10 @@
completionCount++;
}
- for (int i = 0; i < kGroupCount; i++) {
- int startIndex = i * (contents.length ~/ (kGroupCount + 2));
+ for (var i = 0; i < kGroupCount; i++) {
+ var startIndex = i * (contents.length ~/ (kGroupCount + 2));
// Look for a line with a period in it that ends with a semi-colon.
- int index =
+ var index =
contents.indexOf(RegExp(r'\..*;$', multiLine: true), startIndex);
await _complete(index - 10);
@@ -129,20 +128,20 @@
Future<int> _calcEditTiming(
AbstractAnalysisServerIntegrationTest test) async {
- const int kGroupCount = 5;
+ const kGroupCount = 5;
- final String filePath =
+ var filePath =
path.join(analysisServerSrcPath, 'lib/src/analysis_server.dart');
- String contents = File(filePath).readAsStringSync();
+ var contents = File(filePath).readAsStringSync();
await test
.sendAnalysisUpdateContent({filePath: AddContentOverlay(contents)});
- final Stopwatch stopwatch = Stopwatch()..start();
+ var stopwatch = Stopwatch()..start();
- for (int i = 0; i < kGroupCount; i++) {
- int startIndex = i * (contents.length ~/ (kGroupCount + 2));
- int index = contents.indexOf(';', startIndex);
+ for (var i = 0; i < kGroupCount; i++) {
+ var startIndex = i * (contents.length ~/ (kGroupCount + 2));
+ var index = contents.indexOf(';', startIndex);
contents = contents.substring(0, index + 1) +
' ' +
contents.substring(index + 1);
@@ -180,18 +179,18 @@
deleteServerCache();
}
- Stopwatch stopwatch = Stopwatch()..start();
+ var stopwatch = Stopwatch()..start();
- AnalysisServerMemoryUsageTest test = AnalysisServerMemoryUsageTest();
+ var test = AnalysisServerMemoryUsageTest();
await test.setUp();
await test.subscribeToStatusNotifications();
await test.sendAnalysisSetAnalysisRoots(getProjectRoots(quick: quick), []);
await test.analysisFinished;
stopwatch.stop();
- int usedBytes = await test.getMemoryUsage();
+ var usedBytes = await test.getMemoryUsage();
- CompoundBenchMarkResult result = CompoundBenchMarkResult(id);
+ var result = CompoundBenchMarkResult(id);
result.add(
'analysis', BenchMarkResult('micros', stopwatch.elapsedMicroseconds));
result.add('memory', BenchMarkResult('bytes', usedBytes));
diff --git a/pkg/analysis_server/benchmark/perf/flutter_analyze_benchmark.dart b/pkg/analysis_server/benchmark/perf/flutter_analyze_benchmark.dart
index d2827ca..ede7ff8 100644
--- a/pkg/analysis_server/benchmark/perf/flutter_analyze_benchmark.dart
+++ b/pkg/analysis_server/benchmark/perf/flutter_analyze_benchmark.dart
@@ -18,7 +18,7 @@
}) async {
print('\n$command ${args.join(' ')}');
- Process process = await Process.start(command, args, workingDirectory: cwd);
+ var process = await Process.start(command, args, workingDirectory: cwd);
process.stdout
.transform(utf8.decoder)
@@ -31,7 +31,7 @@
.transform(LineSplitter())
.listen((line) => print(' $line'));
- int exitCode = await process.exitCode;
+ var exitCode = await process.exitCode;
if (exitCode != 0 && failOnError) {
throw '$command exited with $exitCode';
}
@@ -81,7 +81,7 @@
path.canonicalize(flutterDir.path)
]);
- String flutterTool = path.join(flutterDir.path, 'bin', 'flutter');
+ var flutterTool = path.join(flutterDir.path, 'bin', 'flutter');
// flutter --version
await _runProcess(flutterTool, ['--version'], cwd: flutterDir.path);
@@ -102,10 +102,9 @@
deleteServerCache();
}
- final String dartSdkPath =
- path.dirname(path.dirname(Platform.resolvedExecutable));
+ var dartSdkPath = path.dirname(path.dirname(Platform.resolvedExecutable));
- final Stopwatch stopwatch = Stopwatch()..start();
+ var stopwatch = Stopwatch()..start();
await _runProcess(
Platform.resolvedExecutable,
diff --git a/pkg/analysis_server/benchmark/perf/memory_tests.dart b/pkg/analysis_server/benchmark/perf/memory_tests.dart
index 3d4c6d8..7d30cec 100644
--- a/pkg/analysis_server/benchmark/perf/memory_tests.dart
+++ b/pkg/analysis_server/benchmark/perf/memory_tests.dart
@@ -17,15 +17,15 @@
int _vmServicePort;
Future<int> getMemoryUsage() async {
- Uri uri = Uri.parse('ws://127.0.0.1:$_vmServicePort/ws');
- final ServiceProtocol service = await ServiceProtocol.connect(uri);
- final Map vm = await service.call('getVM');
+ var uri = Uri.parse('ws://127.0.0.1:$_vmServicePort/ws');
+ var service = await ServiceProtocol.connect(uri);
+ var vm = await service.call('getVM');
- int total = 0;
+ var total = 0;
List isolateRefs = vm['isolates'];
for (Map isolateRef in isolateRefs) {
- Map isolate =
+ var isolate =
await service.call('getIsolate', {'isolateId': isolateRef['id']});
Map _heaps = isolate['_heaps'];
@@ -55,7 +55,7 @@
// A server error should never happen during an integration test.
fail('${params.message}\n${params.stackTrace}');
});
- Completer serverConnected = Completer();
+ var serverConnected = Completer();
onServerConnected.listen((_) {
outOfTestExpect(serverConnected.isCompleted, isFalse);
serverConnected.complete();
@@ -99,12 +99,12 @@
}
Future<Map> call(String method, [Map args]) {
- String id = '${++_id}';
- Completer<Map> completer = Completer();
+ var id = '${++_id}';
+ var completer = Completer<Map>();
_completers[id] = completer;
- Map m = {'id': id, 'method': method};
+ var m = <String, dynamic>{'id': id, 'method': method};
if (args != null) m['params'] = args;
- String message = jsonEncode(m);
+ var message = jsonEncode(m);
socket.add(message);
return completer.future;
}
@@ -129,7 +129,7 @@
}
static Future<ServiceProtocol> connect(Uri uri) async {
- WebSocket socket = await WebSocket.connect(uri.toString());
+ var socket = await WebSocket.connect(uri.toString());
return ServiceProtocol._(socket);
}
}
diff --git a/pkg/analysis_server/bin/server.dart b/pkg/analysis_server/bin/server.dart
index 4bbf2463..7810101 100644
--- a/pkg/analysis_server/bin/server.dart
+++ b/pkg/analysis_server/bin/server.dart
@@ -6,6 +6,6 @@
/// Create and run an analysis server.
void main(List<String> args) async {
- ServerStarter starter = ServerStarter();
+ var starter = ServerStarter();
starter.start(args);
}
diff --git a/pkg/analysis_server/lib/lsp_protocol/protocol_custom_generated.dart b/pkg/analysis_server/lib/lsp_protocol/protocol_custom_generated.dart
index 7edf09c..6cddd5e 100644
--- a/pkg/analysis_server/lib/lsp_protocol/protocol_custom_generated.dart
+++ b/pkg/analysis_server/lib/lsp_protocol/protocol_custom_generated.dart
@@ -42,7 +42,7 @@
final bool isAnalyzing;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['isAnalyzing'] =
isAnalyzing ?? (throw 'isAnalyzing is required but was not set');
return __result;
@@ -84,7 +84,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, isAnalyzing.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -115,7 +115,7 @@
final Range range;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['range'] = range ?? (throw 'range is required but was not set');
__result['label'] = label ?? (throw 'label is required but was not set');
return __result;
@@ -174,7 +174,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, range.hashCode);
hash = JenkinsSmiHash.combine(hash, label.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -229,7 +229,7 @@
final num rOffset;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['file'] = file ?? (throw 'file is required but was not set');
__result['offset'] = offset ?? (throw 'offset is required but was not set');
__result['libId'] = libId ?? (throw 'libId is required but was not set');
@@ -369,7 +369,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, file.hashCode);
hash = JenkinsSmiHash.combine(hash, offset.hashCode);
hash = JenkinsSmiHash.combine(hash, libId.hashCode);
@@ -400,7 +400,7 @@
final num port;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['port'] = port ?? (throw 'port is required but was not set');
return __result;
}
@@ -441,7 +441,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, port.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -480,7 +480,7 @@
final String typeParameters;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (range != null) {
__result['range'] = range;
}
@@ -594,7 +594,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, range.hashCode);
hash = JenkinsSmiHash.combine(hash, name.hashCode);
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
@@ -667,7 +667,7 @@
final String variableName;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['kind'] = kind ?? (throw 'kind is required but was not set');
if (label != null) {
__result['label'] = label;
@@ -838,7 +838,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
hash = JenkinsSmiHash.combine(hash, label.hashCode);
hash = JenkinsSmiHash.combine(hash, className.hashCode);
@@ -880,7 +880,7 @@
final Range valueRange;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['name'] = name ?? (throw 'name is required but was not set');
__result['label'] = label ?? (throw 'label is required but was not set');
if (valueRange != null) {
@@ -955,7 +955,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, name.hashCode);
hash = JenkinsSmiHash.combine(hash, label.hashCode);
hash = JenkinsSmiHash.combine(hash, valueRange.hashCode);
@@ -999,7 +999,7 @@
final Range range;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['element'] =
element ?? (throw 'element is required but was not set');
__result['range'] = range ?? (throw 'range is required but was not set');
@@ -1098,7 +1098,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, element.hashCode);
hash = JenkinsSmiHash.combine(hash, range.hashCode);
hash = JenkinsSmiHash.combine(hash, codeRange.hashCode);
@@ -1135,7 +1135,7 @@
final String uri;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['uri'] = uri ?? (throw 'uri is required but was not set');
__result['labels'] = labels ?? (throw 'labels is required but was not set');
return __result;
@@ -1199,7 +1199,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, uri.hashCode);
hash = JenkinsSmiHash.combine(hash, labels.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -1234,7 +1234,7 @@
final String uri;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['uri'] = uri ?? (throw 'uri is required but was not set');
__result['outline'] =
outline ?? (throw 'outline is required but was not set');
@@ -1294,7 +1294,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, uri.hashCode);
hash = JenkinsSmiHash.combine(hash, outline.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -1327,7 +1327,7 @@
final String uri;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['uri'] = uri ?? (throw 'uri is required but was not set');
__result['outline'] =
outline ?? (throw 'outline is required but was not set');
@@ -1387,7 +1387,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, uri.hashCode);
hash = JenkinsSmiHash.combine(hash, outline.hashCode);
return JenkinsSmiHash.finish(hash);
diff --git a/pkg/analysis_server/lib/lsp_protocol/protocol_generated.dart b/pkg/analysis_server/lib/lsp_protocol/protocol_generated.dart
index ddad80b..e4c0e70 100644
--- a/pkg/analysis_server/lib/lsp_protocol/protocol_generated.dart
+++ b/pkg/analysis_server/lib/lsp_protocol/protocol_generated.dart
@@ -49,7 +49,7 @@
final String label;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (label != null) {
__result['label'] = label;
}
@@ -102,7 +102,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, label.hashCode);
hash = JenkinsSmiHash.combine(hash, edit.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -136,7 +136,7 @@
final String failureReason;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['applied'] =
applied ?? (throw 'applied is required but was not set');
if (failureReason != null) {
@@ -192,7 +192,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, applied.hashCode);
hash = JenkinsSmiHash.combine(hash, failureReason.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -224,7 +224,7 @@
final Either2<num, String> id;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['id'] = id ?? (throw 'id is required but was not set');
return __result;
}
@@ -265,7 +265,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, id.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -300,7 +300,7 @@
final WorkspaceClientCapabilities workspace;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (workspace != null) {
__result['workspace'] = workspace;
}
@@ -367,7 +367,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, workspace.hashCode);
hash = JenkinsSmiHash.combine(hash, textDocument.hashCode);
hash = JenkinsSmiHash.combine(hash, experimental.hashCode);
@@ -426,7 +426,7 @@
final String title;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['title'] = title ?? (throw 'title is required but was not set');
if (kind != null) {
__result['kind'] = kind;
@@ -527,7 +527,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, title.hashCode);
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
hash = JenkinsSmiHash.combine(hash, diagnostics.hashCode);
@@ -573,7 +573,7 @@
final List<CodeActionKind> only;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['diagnostics'] =
diagnostics ?? (throw 'diagnostics is required but was not set');
if (only != null) {
@@ -636,7 +636,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, diagnostics.hashCode);
hash = JenkinsSmiHash.combine(hash, only.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -742,7 +742,7 @@
final List<CodeActionKind> codeActionKinds;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (codeActionKinds != null) {
__result['codeActionKinds'] = codeActionKinds;
}
@@ -782,7 +782,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, codeActionKinds.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -828,7 +828,7 @@
final TextDocumentIdentifier textDocument;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['textDocument'] =
textDocument ?? (throw 'textDocument is required but was not set');
__result['range'] = range ?? (throw 'range is required but was not set');
@@ -910,7 +910,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, textDocument.hashCode);
hash = JenkinsSmiHash.combine(hash, range.hashCode);
hash = JenkinsSmiHash.combine(hash, context.hashCode);
@@ -951,7 +951,7 @@
final List<DocumentFilter> documentSelector;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['documentSelector'] = documentSelector;
if (codeActionKinds != null) {
__result['codeActionKinds'] = codeActionKinds;
@@ -1009,7 +1009,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, documentSelector.hashCode);
hash = JenkinsSmiHash.combine(hash, codeActionKinds.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -1054,7 +1054,7 @@
final Range range;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['range'] = range ?? (throw 'range is required but was not set');
if (command != null) {
__result['command'] = command;
@@ -1123,7 +1123,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, range.hashCode);
hash = JenkinsSmiHash.combine(hash, command.hashCode);
hash = JenkinsSmiHash.combine(hash, data.hashCode);
@@ -1149,7 +1149,7 @@
final bool resolveProvider;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (resolveProvider != null) {
__result['resolveProvider'] = resolveProvider;
}
@@ -1185,7 +1185,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, resolveProvider.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -1214,7 +1214,7 @@
final TextDocumentIdentifier textDocument;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['textDocument'] =
textDocument ?? (throw 'textDocument is required but was not set');
return __result;
@@ -1256,7 +1256,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, textDocument.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -1289,7 +1289,7 @@
final bool resolveProvider;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (resolveProvider != null) {
__result['resolveProvider'] = resolveProvider;
}
@@ -1344,7 +1344,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, resolveProvider.hashCode);
hash = JenkinsSmiHash.combine(hash, documentSelector.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -1393,7 +1393,7 @@
final num red;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['red'] = red ?? (throw 'red is required but was not set');
__result['green'] = green ?? (throw 'green is required but was not set');
__result['blue'] = blue ?? (throw 'blue is required but was not set');
@@ -1492,7 +1492,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, red.hashCode);
hash = JenkinsSmiHash.combine(hash, green.hashCode);
hash = JenkinsSmiHash.combine(hash, blue.hashCode);
@@ -1529,7 +1529,7 @@
final Range range;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['range'] = range ?? (throw 'range is required but was not set');
__result['color'] = color ?? (throw 'color is required but was not set');
return __result;
@@ -1588,7 +1588,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, range.hashCode);
hash = JenkinsSmiHash.combine(hash, color.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -1634,7 +1634,7 @@
final TextEdit textEdit;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['label'] = label ?? (throw 'label is required but was not set');
if (textEdit != null) {
__result['textEdit'] = textEdit;
@@ -1707,7 +1707,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, label.hashCode);
hash = JenkinsSmiHash.combine(hash, textEdit.hashCode);
hash = JenkinsSmiHash.combine(hash, additionalTextEdits.hashCode);
@@ -1752,7 +1752,7 @@
final TextDocumentIdentifier textDocument;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['textDocument'] =
textDocument ?? (throw 'textDocument is required but was not set');
__result['color'] = color ?? (throw 'color is required but was not set');
@@ -1833,7 +1833,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, textDocument.hashCode);
hash = JenkinsSmiHash.combine(hash, color.hashCode);
hash = JenkinsSmiHash.combine(hash, range.hashCode);
@@ -1854,7 +1854,7 @@
}
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
return __result;
}
@@ -1877,7 +1877,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
return JenkinsSmiHash.finish(hash);
}
@@ -1914,7 +1914,7 @@
final String title;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['title'] = title ?? (throw 'title is required but was not set');
__result['command'] =
command ?? (throw 'command is required but was not set');
@@ -1992,7 +1992,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, title.hashCode);
hash = JenkinsSmiHash.combine(hash, command.hashCode);
hash = JenkinsSmiHash.combine(hash, arguments.hashCode);
@@ -2030,7 +2030,7 @@
final CompletionTriggerKind triggerKind;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['triggerKind'] =
triggerKind ?? (throw 'triggerKind is required but was not set');
if (triggerCharacter != null) {
@@ -2087,7 +2087,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, triggerKind.hashCode);
hash = JenkinsSmiHash.combine(hash, triggerCharacter.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -2256,7 +2256,7 @@
final TextEdit textEdit;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['label'] = label ?? (throw 'label is required but was not set');
if (kind != null) {
__result['kind'] = kind;
@@ -2495,7 +2495,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, label.hashCode);
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
hash = JenkinsSmiHash.combine(hash, detail.hashCode);
@@ -2597,7 +2597,7 @@
final List<CompletionItem> items;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['isIncomplete'] =
isIncomplete ?? (throw 'isIncomplete is required but was not set');
__result['items'] = items ?? (throw 'items is required but was not set');
@@ -2662,7 +2662,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, isIncomplete.hashCode);
hash = JenkinsSmiHash.combine(hash, items.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -2695,7 +2695,7 @@
final List<String> triggerCharacters;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (resolveProvider != null) {
__result['resolveProvider'] = resolveProvider;
}
@@ -2748,7 +2748,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, resolveProvider.hashCode);
hash = JenkinsSmiHash.combine(hash, triggerCharacters.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -2794,7 +2794,7 @@
final TextDocumentIdentifier textDocument;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (context != null) {
__result['context'] = context;
}
@@ -2871,7 +2871,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, context.hashCode);
hash = JenkinsSmiHash.combine(hash, textDocument.hashCode);
hash = JenkinsSmiHash.combine(hash, position.hashCode);
@@ -2940,7 +2940,7 @@
final List<String> triggerCharacters;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (triggerCharacters != null) {
__result['triggerCharacters'] = triggerCharacters;
}
@@ -3028,7 +3028,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, triggerCharacters.hashCode);
hash = JenkinsSmiHash.combine(hash, allCommitCharacters.hashCode);
hash = JenkinsSmiHash.combine(hash, resolveProvider.hashCode);
@@ -3098,7 +3098,7 @@
final String section;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (scopeUri != null) {
__result['scopeUri'] = scopeUri;
}
@@ -3145,7 +3145,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, scopeUri.hashCode);
hash = JenkinsSmiHash.combine(hash, section.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -3175,7 +3175,7 @@
final List<ConfigurationItem> items;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['items'] = items ?? (throw 'items is required but was not set');
return __result;
}
@@ -3220,7 +3220,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, items.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -3261,7 +3261,7 @@
final String uri;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['kind'] = kind ?? (throw 'kind is required but was not set');
__result['uri'] = uri ?? (throw 'uri is required but was not set');
if (options != null) {
@@ -3336,7 +3336,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
hash = JenkinsSmiHash.combine(hash, uri.hashCode);
hash = JenkinsSmiHash.combine(hash, options.hashCode);
@@ -3366,7 +3366,7 @@
final bool overwrite;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (overwrite != null) {
__result['overwrite'] = overwrite;
}
@@ -3415,7 +3415,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, overwrite.hashCode);
hash = JenkinsSmiHash.combine(hash, ignoreIfExists.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -3457,7 +3457,7 @@
final String uri;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['kind'] = kind ?? (throw 'kind is required but was not set');
__result['uri'] = uri ?? (throw 'uri is required but was not set');
if (options != null) {
@@ -3532,7 +3532,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
hash = JenkinsSmiHash.combine(hash, uri.hashCode);
hash = JenkinsSmiHash.combine(hash, options.hashCode);
@@ -3562,7 +3562,7 @@
final bool recursive;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (recursive != null) {
__result['recursive'] = recursive;
}
@@ -3612,7 +3612,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, recursive.hashCode);
hash = JenkinsSmiHash.combine(hash, ignoreIfNotExists.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -3674,7 +3674,7 @@
final String source;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['range'] = range ?? (throw 'range is required but was not set');
if (severity != null) {
__result['severity'] = severity;
@@ -3798,7 +3798,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, range.hashCode);
hash = JenkinsSmiHash.combine(hash, severity.hashCode);
hash = JenkinsSmiHash.combine(hash, code.hashCode);
@@ -3842,7 +3842,7 @@
final String message;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['location'] =
location ?? (throw 'location is required but was not set');
__result['message'] =
@@ -3903,7 +3903,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, location.hashCode);
hash = JenkinsSmiHash.combine(hash, message.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -3961,7 +3961,7 @@
final dynamic settings;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['settings'] = settings;
return __result;
}
@@ -3998,7 +3998,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, settings.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -4042,7 +4042,7 @@
final VersionedTextDocumentIdentifier textDocument;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['textDocument'] =
textDocument ?? (throw 'textDocument is required but was not set');
__result['contentChanges'] =
@@ -4115,7 +4115,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, textDocument.hashCode);
hash = JenkinsSmiHash.combine(hash, contentChanges.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -4147,7 +4147,7 @@
final List<FileEvent> changes;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['changes'] =
changes ?? (throw 'changes is required but was not set');
return __result;
@@ -4193,7 +4193,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, changes.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -4226,7 +4226,7 @@
final List<FileSystemWatcher> watchers;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['watchers'] =
watchers ?? (throw 'watchers is required but was not set');
return __result;
@@ -4273,7 +4273,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, watchers.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -4303,7 +4303,7 @@
final WorkspaceFoldersChangeEvent event;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['event'] = event ?? (throw 'event is required but was not set');
return __result;
}
@@ -4344,7 +4344,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, event.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -4373,7 +4373,7 @@
final TextDocumentIdentifier textDocument;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['textDocument'] =
textDocument ?? (throw 'textDocument is required but was not set');
return __result;
@@ -4415,7 +4415,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, textDocument.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -4444,7 +4444,7 @@
final TextDocumentItem textDocument;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['textDocument'] =
textDocument ?? (throw 'textDocument is required but was not set');
return __result;
@@ -4486,7 +4486,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, textDocument.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -4520,7 +4520,7 @@
final TextDocumentIdentifier textDocument;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['textDocument'] =
textDocument ?? (throw 'textDocument is required but was not set');
if (text != null) {
@@ -4574,7 +4574,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, textDocument.hashCode);
hash = JenkinsSmiHash.combine(hash, text.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -4618,7 +4618,7 @@
final String scheme;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (language != null) {
__result['language'] = language;
}
@@ -4680,7 +4680,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, language.hashCode);
hash = JenkinsSmiHash.combine(hash, scheme.hashCode);
hash = JenkinsSmiHash.combine(hash, pattern.hashCode);
@@ -4720,7 +4720,7 @@
final TextDocumentIdentifier textDocument;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['textDocument'] =
textDocument ?? (throw 'textDocument is required but was not set');
__result['options'] =
@@ -4783,7 +4783,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, textDocument.hashCode);
hash = JenkinsSmiHash.combine(hash, options.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -4820,7 +4820,7 @@
final Range range;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['range'] = range ?? (throw 'range is required but was not set');
if (kind != null) {
__result['kind'] = kind;
@@ -4874,7 +4874,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, range.hashCode);
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -4945,7 +4945,7 @@
final String target;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['range'] = range ?? (throw 'range is required but was not set');
if (target != null) {
__result['target'] = target;
@@ -5013,7 +5013,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, range.hashCode);
hash = JenkinsSmiHash.combine(hash, target.hashCode);
hash = JenkinsSmiHash.combine(hash, data.hashCode);
@@ -5039,7 +5039,7 @@
final bool resolveProvider;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (resolveProvider != null) {
__result['resolveProvider'] = resolveProvider;
}
@@ -5075,7 +5075,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, resolveProvider.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -5104,7 +5104,7 @@
final TextDocumentIdentifier textDocument;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['textDocument'] =
textDocument ?? (throw 'textDocument is required but was not set');
return __result;
@@ -5146,7 +5146,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, textDocument.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -5179,7 +5179,7 @@
final bool resolveProvider;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (resolveProvider != null) {
__result['resolveProvider'] = resolveProvider;
}
@@ -5234,7 +5234,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, resolveProvider.hashCode);
hash = JenkinsSmiHash.combine(hash, documentSelector.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -5273,7 +5273,7 @@
final List<String> moreTriggerCharacter;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['firstTriggerCharacter'] = firstTriggerCharacter ??
(throw 'firstTriggerCharacter is required but was not set');
if (moreTriggerCharacter != null) {
@@ -5333,7 +5333,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, firstTriggerCharacter.hashCode);
hash = JenkinsSmiHash.combine(hash, moreTriggerCharacter.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -5389,7 +5389,7 @@
final TextDocumentIdentifier textDocument;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['textDocument'] =
textDocument ?? (throw 'textDocument is required but was not set');
__result['position'] =
@@ -5491,7 +5491,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, textDocument.hashCode);
hash = JenkinsSmiHash.combine(hash, position.hashCode);
hash = JenkinsSmiHash.combine(hash, ch.hashCode);
@@ -5541,7 +5541,7 @@
final List<String> moreTriggerCharacter;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['firstTriggerCharacter'] = firstTriggerCharacter ??
(throw 'firstTriggerCharacter is required but was not set');
if (moreTriggerCharacter != null) {
@@ -5620,7 +5620,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, firstTriggerCharacter.hashCode);
hash = JenkinsSmiHash.combine(hash, moreTriggerCharacter.hashCode);
hash = JenkinsSmiHash.combine(hash, documentSelector.hashCode);
@@ -5668,7 +5668,7 @@
final TextDocumentIdentifier textDocument;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['textDocument'] =
textDocument ?? (throw 'textDocument is required but was not set');
__result['range'] = range ?? (throw 'range is required but was not set');
@@ -5750,7 +5750,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, textDocument.hashCode);
hash = JenkinsSmiHash.combine(hash, range.hashCode);
hash = JenkinsSmiHash.combine(hash, options.hashCode);
@@ -5830,7 +5830,7 @@
final Range selectionRange;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['name'] = name ?? (throw 'name is required but was not set');
if (detail != null) {
__result['detail'] = detail;
@@ -5973,7 +5973,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, name.hashCode);
hash = JenkinsSmiHash.combine(hash, detail.hashCode);
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
@@ -6008,7 +6008,7 @@
final TextDocumentIdentifier textDocument;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['textDocument'] =
textDocument ?? (throw 'textDocument is required but was not set');
return __result;
@@ -6050,7 +6050,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, textDocument.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -6115,7 +6115,7 @@
final List<String> commands;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['commands'] =
commands ?? (throw 'commands is required but was not set');
return __result;
@@ -6160,7 +6160,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, commands.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -6192,7 +6192,7 @@
final String command;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['command'] =
command ?? (throw 'command is required but was not set');
if (arguments != null) {
@@ -6251,7 +6251,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, command.hashCode);
hash = JenkinsSmiHash.combine(hash, arguments.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -6282,7 +6282,7 @@
final List<String> commands;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['commands'] =
commands ?? (throw 'commands is required but was not set');
return __result;
@@ -6327,7 +6327,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, commands.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -6440,7 +6440,7 @@
final String uri;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['uri'] = uri ?? (throw 'uri is required but was not set');
__result['type'] = type ?? (throw 'type is required but was not set');
return __result;
@@ -6499,7 +6499,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, uri.hashCode);
hash = JenkinsSmiHash.combine(hash, type.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -6544,7 +6544,7 @@
final WatchKind kind;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['globPattern'] =
globPattern ?? (throw 'globPattern is required but was not set');
if (kind != null) {
@@ -6599,7 +6599,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, globPattern.hashCode);
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -6654,7 +6654,7 @@
final num startLine;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['startLine'] =
startLine ?? (throw 'startLine is required but was not set');
if (startCharacter != null) {
@@ -6757,7 +6757,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, startLine.hashCode);
hash = JenkinsSmiHash.combine(hash, startCharacter.hashCode);
hash = JenkinsSmiHash.combine(hash, endLine.hashCode);
@@ -6821,7 +6821,7 @@
final TextDocumentIdentifier textDocument;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['textDocument'] =
textDocument ?? (throw 'textDocument is required but was not set');
return __result;
@@ -6863,7 +6863,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, textDocument.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -6883,7 +6883,7 @@
}
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
return __result;
}
@@ -6906,7 +6906,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
return JenkinsSmiHash.finish(hash);
}
@@ -6940,7 +6940,7 @@
final num tabSize;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['tabSize'] =
tabSize ?? (throw 'tabSize is required but was not set');
__result['insertSpaces'] =
@@ -7003,7 +7003,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, tabSize.hashCode);
hash = JenkinsSmiHash.combine(hash, insertSpaces.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -7042,7 +7042,7 @@
final Range range;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['contents'] =
contents ?? (throw 'contents is required but was not set');
if (range != null) {
@@ -7098,7 +7098,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, contents.hashCode);
hash = JenkinsSmiHash.combine(hash, range.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -7174,7 +7174,7 @@
final List<WorkspaceFolder> workspaceFolders;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['processId'] = processId;
if (rootPath != null) {
__result['rootPath'] = rootPath;
@@ -7303,7 +7303,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, processId.hashCode);
hash = JenkinsSmiHash.combine(hash, rootPath.hashCode);
hash = JenkinsSmiHash.combine(hash, rootUri.hashCode);
@@ -7338,7 +7338,7 @@
final ServerCapabilities capabilities;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['capabilities'] =
capabilities ?? (throw 'capabilities is required but was not set');
return __result;
@@ -7380,7 +7380,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, capabilities.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -7398,7 +7398,7 @@
}
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
return __result;
}
@@ -7421,7 +7421,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
return JenkinsSmiHash.finish(hash);
}
@@ -7490,7 +7490,7 @@
final String uri;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['uri'] = uri ?? (throw 'uri is required but was not set');
__result['range'] = range ?? (throw 'range is required but was not set');
return __result;
@@ -7549,7 +7549,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, uri.hashCode);
hash = JenkinsSmiHash.combine(hash, range.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -7611,7 +7611,7 @@
final String targetUri;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (originSelectionRange != null) {
__result['originSelectionRange'] = originSelectionRange;
}
@@ -7708,7 +7708,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, originSelectionRange.hashCode);
hash = JenkinsSmiHash.combine(hash, targetUri.hashCode);
hash = JenkinsSmiHash.combine(hash, targetRange.hashCode);
@@ -7746,7 +7746,7 @@
final MessageType type;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['type'] = type ?? (throw 'type is required but was not set');
__result['message'] =
message ?? (throw 'message is required but was not set');
@@ -7806,7 +7806,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, type.hashCode);
hash = JenkinsSmiHash.combine(hash, message.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -7864,7 +7864,7 @@
final String value;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['kind'] = kind ?? (throw 'kind is required but was not set');
__result['value'] = value ?? (throw 'value is required but was not set');
return __result;
@@ -7923,7 +7923,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
hash = JenkinsSmiHash.combine(hash, value.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -7995,7 +7995,7 @@
final String jsonrpc;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['jsonrpc'] =
jsonrpc ?? (throw 'jsonrpc is required but was not set');
return __result;
@@ -8037,7 +8037,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, jsonrpc.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -8064,7 +8064,7 @@
final String title;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['title'] = title ?? (throw 'title is required but was not set');
return __result;
}
@@ -8105,7 +8105,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, title.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -8354,7 +8354,7 @@
final dynamic params;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['method'] = method ?? (throw 'method is required but was not set');
if (params != null) {
__result['params'] = params;
@@ -8429,7 +8429,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, method.hashCode);
hash = JenkinsSmiHash.combine(hash, params.hashCode);
hash = JenkinsSmiHash.combine(hash, jsonrpc.hashCode);
@@ -8482,7 +8482,7 @@
final String label;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['label'] = label ?? (throw 'label is required but was not set');
if (documentation != null) {
__result['documentation'] = documentation;
@@ -8540,7 +8540,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, label.hashCode);
hash = JenkinsSmiHash.combine(hash, documentation.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -8580,7 +8580,7 @@
final num line;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['line'] = line ?? (throw 'line is required but was not set');
__result['character'] =
character ?? (throw 'character is required but was not set');
@@ -8640,7 +8640,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, line.hashCode);
hash = JenkinsSmiHash.combine(hash, character.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -8678,7 +8678,7 @@
final String uri;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['uri'] = uri ?? (throw 'uri is required but was not set');
__result['diagnostics'] =
diagnostics ?? (throw 'diagnostics is required but was not set');
@@ -8743,7 +8743,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, uri.hashCode);
hash = JenkinsSmiHash.combine(hash, diagnostics.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -8778,7 +8778,7 @@
final Position start;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['start'] = start ?? (throw 'start is required but was not set');
__result['end'] = end ?? (throw 'end is required but was not set');
return __result;
@@ -8837,7 +8837,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, start.hashCode);
hash = JenkinsSmiHash.combine(hash, end.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -8869,7 +8869,7 @@
final Range range;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['range'] = range ?? (throw 'range is required but was not set');
__result['placeholder'] =
placeholder ?? (throw 'placeholder is required but was not set');
@@ -8929,7 +8929,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, range.hashCode);
hash = JenkinsSmiHash.combine(hash, placeholder.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -8957,7 +8957,7 @@
final bool includeDeclaration;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['includeDeclaration'] = includeDeclaration ??
(throw 'includeDeclaration is required but was not set');
return __result;
@@ -8999,7 +8999,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, includeDeclaration.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -9044,7 +9044,7 @@
final TextDocumentIdentifier textDocument;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['context'] =
context ?? (throw 'context is required but was not set');
__result['textDocument'] =
@@ -9127,7 +9127,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, context.hashCode);
hash = JenkinsSmiHash.combine(hash, textDocument.hashCode);
hash = JenkinsSmiHash.combine(hash, position.hashCode);
@@ -9169,7 +9169,7 @@
final dynamic registerOptions;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['id'] = id ?? (throw 'id is required but was not set');
__result['method'] = method ?? (throw 'method is required but was not set');
if (registerOptions != null) {
@@ -9243,7 +9243,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, id.hashCode);
hash = JenkinsSmiHash.combine(hash, method.hashCode);
hash = JenkinsSmiHash.combine(hash, registerOptions.hashCode);
@@ -9274,7 +9274,7 @@
final List<Registration> registrations;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['registrations'] =
registrations ?? (throw 'registrations is required but was not set');
return __result;
@@ -9320,7 +9320,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, registrations.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -9368,7 +9368,7 @@
final RenameFileOptions options;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['kind'] = kind ?? (throw 'kind is required but was not set');
__result['oldUri'] = oldUri ?? (throw 'oldUri is required but was not set');
__result['newUri'] = newUri ?? (throw 'newUri is required but was not set');
@@ -9462,7 +9462,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
hash = JenkinsSmiHash.combine(hash, oldUri.hashCode);
hash = JenkinsSmiHash.combine(hash, newUri.hashCode);
@@ -9493,7 +9493,7 @@
final bool overwrite;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (overwrite != null) {
__result['overwrite'] = overwrite;
}
@@ -9542,7 +9542,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, overwrite.hashCode);
hash = JenkinsSmiHash.combine(hash, ignoreIfExists.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -9567,7 +9567,7 @@
final bool prepareProvider;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (prepareProvider != null) {
__result['prepareProvider'] = prepareProvider;
}
@@ -9603,7 +9603,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, prepareProvider.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -9648,7 +9648,7 @@
final TextDocumentIdentifier textDocument;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['textDocument'] =
textDocument ?? (throw 'textDocument is required but was not set');
__result['position'] =
@@ -9731,7 +9731,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, textDocument.hashCode);
hash = JenkinsSmiHash.combine(hash, position.hashCode);
hash = JenkinsSmiHash.combine(hash, newName.hashCode);
@@ -9765,7 +9765,7 @@
final bool prepareProvider;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (prepareProvider != null) {
__result['prepareProvider'] = prepareProvider;
}
@@ -9820,7 +9820,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, prepareProvider.hashCode);
hash = JenkinsSmiHash.combine(hash, documentSelector.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -9869,7 +9869,7 @@
final dynamic params;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['id'] = id ?? (throw 'id is required but was not set');
__result['method'] = method ?? (throw 'method is required but was not set');
if (params != null) {
@@ -9963,7 +9963,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, id.hashCode);
hash = JenkinsSmiHash.combine(hash, method.hashCode);
hash = JenkinsSmiHash.combine(hash, params.hashCode);
@@ -10043,7 +10043,7 @@
final String message;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['code'] = code ?? (throw 'code is required but was not set');
__result['message'] =
message ?? (throw 'message is required but was not set');
@@ -10118,7 +10118,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, code.hashCode);
hash = JenkinsSmiHash.combine(hash, message.hashCode);
hash = JenkinsSmiHash.combine(hash, data.hashCode);
@@ -10166,7 +10166,7 @@
final dynamic result;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['id'] = id;
__result['jsonrpc'] =
jsonrpc ?? (throw 'jsonrpc is required but was not set');
@@ -10252,7 +10252,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, id.hashCode);
hash = JenkinsSmiHash.combine(hash, result.hashCode);
hash = JenkinsSmiHash.combine(hash, error.hashCode);
@@ -10279,7 +10279,7 @@
final bool includeText;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (includeText != null) {
__result['includeText'] = includeText;
}
@@ -10314,7 +10314,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, includeText.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -10539,7 +10539,7 @@
final bool workspaceSymbolProvider;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (textDocumentSync != null) {
__result['textDocumentSync'] = textDocumentSync;
}
@@ -10909,7 +10909,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, textDocumentSync.hashCode);
hash = JenkinsSmiHash.combine(hash, hoverProvider.hashCode);
hash = JenkinsSmiHash.combine(hash, completionProvider.hashCode);
@@ -10962,7 +10962,7 @@
final ServerCapabilitiesWorkspaceFolders workspaceFolders;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (workspaceFolders != null) {
__result['workspaceFolders'] = workspaceFolders;
}
@@ -11000,7 +11000,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, workspaceFolders.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -11034,7 +11034,7 @@
final bool supported;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (supported != null) {
__result['supported'] = supported;
}
@@ -11085,7 +11085,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, supported.hashCode);
hash = JenkinsSmiHash.combine(hash, changeNotifications.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -11121,7 +11121,7 @@
final MessageType type;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['type'] = type ?? (throw 'type is required but was not set');
__result['message'] =
message ?? (throw 'message is required but was not set');
@@ -11181,7 +11181,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, type.hashCode);
hash = JenkinsSmiHash.combine(hash, message.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -11224,7 +11224,7 @@
final MessageType type;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['type'] = type ?? (throw 'type is required but was not set');
__result['message'] =
message ?? (throw 'message is required but was not set');
@@ -11303,7 +11303,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, type.hashCode);
hash = JenkinsSmiHash.combine(hash, message.hashCode);
hash = JenkinsSmiHash.combine(hash, actions.hashCode);
@@ -11356,7 +11356,7 @@
final List<SignatureInformation> signatures;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['signatures'] =
signatures ?? (throw 'signatures is required but was not set');
if (activeSignature != null) {
@@ -11430,7 +11430,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, signatures.hashCode);
hash = JenkinsSmiHash.combine(hash, activeSignature.hashCode);
hash = JenkinsSmiHash.combine(hash, activeParameter.hashCode);
@@ -11459,7 +11459,7 @@
final List<String> triggerCharacters;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (triggerCharacters != null) {
__result['triggerCharacters'] = triggerCharacters;
}
@@ -11498,7 +11498,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, triggerCharacters.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -11536,7 +11536,7 @@
final List<String> triggerCharacters;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (triggerCharacters != null) {
__result['triggerCharacters'] = triggerCharacters;
}
@@ -11593,7 +11593,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, triggerCharacters.hashCode);
hash = JenkinsSmiHash.combine(hash, documentSelector.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -11644,7 +11644,7 @@
final List<ParameterInformation> parameters;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['label'] = label ?? (throw 'label is required but was not set');
if (documentation != null) {
__result['documentation'] = documentation;
@@ -11719,7 +11719,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, label.hashCode);
hash = JenkinsSmiHash.combine(hash, documentation.hashCode);
hash = JenkinsSmiHash.combine(hash, parameters.hashCode);
@@ -11746,7 +11746,7 @@
final String id;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (id != null) {
__result['id'] = id;
}
@@ -11781,7 +11781,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, id.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -11846,7 +11846,7 @@
final String name;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['name'] = name ?? (throw 'name is required but was not set');
__result['kind'] = kind ?? (throw 'kind is required but was not set');
if (deprecated != null) {
@@ -11953,7 +11953,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, name.hashCode);
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
hash = JenkinsSmiHash.combine(hash, deprecated.hashCode);
@@ -12049,7 +12049,7 @@
final TextDocumentSyncKind syncKind;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['syncKind'] =
syncKind ?? (throw 'syncKind is required but was not set');
__result['documentSelector'] = documentSelector;
@@ -12111,7 +12111,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, syncKind.hashCode);
hash = JenkinsSmiHash.combine(hash, documentSelector.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -12323,7 +12323,7 @@
final TextDocumentClientCapabilitiesTypeDefinition typeDefinition;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (synchronization != null) {
__result['synchronization'] = synchronization;
}
@@ -12682,7 +12682,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, synchronization.hashCode);
hash = JenkinsSmiHash.combine(hash, completion.hashCode);
hash = JenkinsSmiHash.combine(hash, hover.hashCode);
@@ -12740,7 +12740,7 @@
final bool dynamicRegistration;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (dynamicRegistration != null) {
__result['dynamicRegistration'] = dynamicRegistration;
}
@@ -12794,7 +12794,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, dynamicRegistration.hashCode);
hash = JenkinsSmiHash.combine(hash, codeActionLiteralSupport.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -12829,7 +12829,7 @@
final List<CodeActionKind> valueSet;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['valueSet'] =
valueSet ?? (throw 'valueSet is required but was not set');
return __result;
@@ -12876,7 +12876,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, valueSet.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -12910,7 +12910,7 @@
final TextDocumentClientCapabilitiesCodeActionKind codeActionKind;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['codeActionKind'] =
codeActionKind ?? (throw 'codeActionKind is required but was not set');
return __result;
@@ -12955,7 +12955,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, codeActionKind.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -12980,7 +12980,7 @@
final bool dynamicRegistration;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (dynamicRegistration != null) {
__result['dynamicRegistration'] = dynamicRegistration;
}
@@ -13017,7 +13017,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, dynamicRegistration.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -13045,7 +13045,7 @@
final bool dynamicRegistration;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (dynamicRegistration != null) {
__result['dynamicRegistration'] = dynamicRegistration;
}
@@ -13082,7 +13082,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, dynamicRegistration.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -13126,7 +13126,7 @@
final bool dynamicRegistration;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (dynamicRegistration != null) {
__result['dynamicRegistration'] = dynamicRegistration;
}
@@ -13209,7 +13209,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, dynamicRegistration.hashCode);
hash = JenkinsSmiHash.combine(hash, completionItem.hashCode);
hash = JenkinsSmiHash.combine(hash, completionItemKind.hashCode);
@@ -13272,7 +13272,7 @@
final bool snippetSupport;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (snippetSupport != null) {
__result['snippetSupport'] = snippetSupport;
}
@@ -13368,7 +13368,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, snippetSupport.hashCode);
hash = JenkinsSmiHash.combine(hash, commitCharactersSupport.hashCode);
hash = JenkinsSmiHash.combine(hash, documentationFormat.hashCode);
@@ -13406,7 +13406,7 @@
final List<CompletionItemKind> valueSet;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (valueSet != null) {
__result['valueSet'] = valueSet;
}
@@ -13447,7 +13447,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, valueSet.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -13483,7 +13483,7 @@
final bool linkSupport;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (dynamicRegistration != null) {
__result['dynamicRegistration'] = dynamicRegistration;
}
@@ -13534,7 +13534,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, dynamicRegistration.hashCode);
hash = JenkinsSmiHash.combine(hash, linkSupport.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -13566,7 +13566,7 @@
final bool linkSupport;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (dynamicRegistration != null) {
__result['dynamicRegistration'] = dynamicRegistration;
}
@@ -13617,7 +13617,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, dynamicRegistration.hashCode);
hash = JenkinsSmiHash.combine(hash, linkSupport.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -13643,7 +13643,7 @@
final bool dynamicRegistration;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (dynamicRegistration != null) {
__result['dynamicRegistration'] = dynamicRegistration;
}
@@ -13680,7 +13680,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, dynamicRegistration.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -13705,7 +13705,7 @@
final bool dynamicRegistration;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (dynamicRegistration != null) {
__result['dynamicRegistration'] = dynamicRegistration;
}
@@ -13742,7 +13742,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, dynamicRegistration.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -13780,7 +13780,7 @@
final TextDocumentClientCapabilitiesSymbolKind symbolKind;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (dynamicRegistration != null) {
__result['dynamicRegistration'] = dynamicRegistration;
}
@@ -13850,7 +13850,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, dynamicRegistration.hashCode);
hash = JenkinsSmiHash.combine(hash, symbolKind.hashCode);
hash = JenkinsSmiHash.combine(
@@ -13896,7 +13896,7 @@
final num rangeLimit;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (dynamicRegistration != null) {
__result['dynamicRegistration'] = dynamicRegistration;
}
@@ -13961,7 +13961,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, dynamicRegistration.hashCode);
hash = JenkinsSmiHash.combine(hash, rangeLimit.hashCode);
hash = JenkinsSmiHash.combine(hash, lineFoldingOnly.hashCode);
@@ -13988,7 +13988,7 @@
final bool dynamicRegistration;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (dynamicRegistration != null) {
__result['dynamicRegistration'] = dynamicRegistration;
}
@@ -14025,7 +14025,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, dynamicRegistration.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -14060,7 +14060,7 @@
final bool dynamicRegistration;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (dynamicRegistration != null) {
__result['dynamicRegistration'] = dynamicRegistration;
}
@@ -14115,7 +14115,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, dynamicRegistration.hashCode);
hash = JenkinsSmiHash.combine(hash, contentFormat.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -14152,7 +14152,7 @@
final bool linkSupport;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (dynamicRegistration != null) {
__result['dynamicRegistration'] = dynamicRegistration;
}
@@ -14203,7 +14203,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, dynamicRegistration.hashCode);
hash = JenkinsSmiHash.combine(hash, linkSupport.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -14229,7 +14229,7 @@
final bool dynamicRegistration;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (dynamicRegistration != null) {
__result['dynamicRegistration'] = dynamicRegistration;
}
@@ -14266,7 +14266,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, dynamicRegistration.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -14295,7 +14295,7 @@
final bool labelOffsetSupport;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (labelOffsetSupport != null) {
__result['labelOffsetSupport'] = labelOffsetSupport;
}
@@ -14332,7 +14332,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, labelOffsetSupport.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -14357,7 +14357,7 @@
final bool relatedInformation;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (relatedInformation != null) {
__result['relatedInformation'] = relatedInformation;
}
@@ -14394,7 +14394,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, relatedInformation.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -14419,7 +14419,7 @@
final bool dynamicRegistration;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (dynamicRegistration != null) {
__result['dynamicRegistration'] = dynamicRegistration;
}
@@ -14456,7 +14456,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, dynamicRegistration.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -14481,7 +14481,7 @@
final bool dynamicRegistration;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (dynamicRegistration != null) {
__result['dynamicRegistration'] = dynamicRegistration;
}
@@ -14518,7 +14518,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, dynamicRegistration.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -14550,7 +14550,7 @@
final bool prepareSupport;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (dynamicRegistration != null) {
__result['dynamicRegistration'] = dynamicRegistration;
}
@@ -14601,7 +14601,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, dynamicRegistration.hashCode);
hash = JenkinsSmiHash.combine(hash, prepareSupport.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -14637,7 +14637,7 @@
final TextDocumentClientCapabilitiesSignatureInformation signatureInformation;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (dynamicRegistration != null) {
__result['dynamicRegistration'] = dynamicRegistration;
}
@@ -14691,7 +14691,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, dynamicRegistration.hashCode);
hash = JenkinsSmiHash.combine(hash, signatureInformation.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -14730,7 +14730,7 @@
final TextDocumentClientCapabilitiesParameterInformation parameterInformation;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (documentationFormat != null) {
__result['documentationFormat'] = documentationFormat;
}
@@ -14787,7 +14787,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, documentationFormat.hashCode);
hash = JenkinsSmiHash.combine(hash, parameterInformation.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -14821,7 +14821,7 @@
final List<SymbolKind> valueSet;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (valueSet != null) {
__result['valueSet'] = valueSet;
}
@@ -14862,7 +14862,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, valueSet.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -14903,7 +14903,7 @@
final bool willSaveWaitUntil;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (dynamicRegistration != null) {
__result['dynamicRegistration'] = dynamicRegistration;
}
@@ -14981,7 +14981,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, dynamicRegistration.hashCode);
hash = JenkinsSmiHash.combine(hash, willSave.hashCode);
hash = JenkinsSmiHash.combine(hash, willSaveWaitUntil.hashCode);
@@ -15020,7 +15020,7 @@
final bool linkSupport;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (dynamicRegistration != null) {
__result['dynamicRegistration'] = dynamicRegistration;
}
@@ -15071,7 +15071,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, dynamicRegistration.hashCode);
hash = JenkinsSmiHash.combine(hash, linkSupport.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -15111,7 +15111,7 @@
final String text;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (range != null) {
__result['range'] = range;
}
@@ -15179,7 +15179,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, range.hashCode);
hash = JenkinsSmiHash.combine(hash, rangeLength.hashCode);
hash = JenkinsSmiHash.combine(hash, text.hashCode);
@@ -15220,7 +15220,7 @@
final VersionedTextDocumentIdentifier textDocument;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['textDocument'] =
textDocument ?? (throw 'textDocument is required but was not set');
__result['edits'] = edits ?? (throw 'edits is required but was not set');
@@ -15286,7 +15286,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, textDocument.hashCode);
hash = JenkinsSmiHash.combine(hash, edits.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -15317,7 +15317,7 @@
final String uri;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['uri'] = uri ?? (throw 'uri is required but was not set');
return __result;
}
@@ -15358,7 +15358,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, uri.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -15407,7 +15407,7 @@
final num version;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['uri'] = uri ?? (throw 'uri is required but was not set');
__result['languageId'] =
languageId ?? (throw 'languageId is required but was not set');
@@ -15508,7 +15508,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, uri.hashCode);
hash = JenkinsSmiHash.combine(hash, languageId.hashCode);
hash = JenkinsSmiHash.combine(hash, version.hashCode);
@@ -15554,7 +15554,7 @@
final TextDocumentIdentifier textDocument;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['textDocument'] =
textDocument ?? (throw 'textDocument is required but was not set');
__result['position'] =
@@ -15617,7 +15617,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, textDocument.hashCode);
hash = JenkinsSmiHash.combine(hash, position.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -15676,7 +15676,7 @@
final List<DocumentFilter> documentSelector;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['documentSelector'] = documentSelector;
return __result;
}
@@ -15716,7 +15716,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, documentSelector.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -15783,7 +15783,7 @@
final bool includeText;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (includeText != null) {
__result['includeText'] = includeText;
}
@@ -15838,7 +15838,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, includeText.hashCode);
hash = JenkinsSmiHash.combine(hash, documentSelector.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -15923,7 +15923,7 @@
final bool willSaveWaitUntil;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (openClose != null) {
__result['openClose'] = openClose;
}
@@ -16014,7 +16014,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, openClose.hashCode);
hash = JenkinsSmiHash.combine(hash, change.hashCode);
hash = JenkinsSmiHash.combine(hash, willSave.hashCode);
@@ -16053,7 +16053,7 @@
final Range range;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['range'] = range ?? (throw 'range is required but was not set');
__result['newText'] =
newText ?? (throw 'newText is required but was not set');
@@ -16113,7 +16113,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, range.hashCode);
hash = JenkinsSmiHash.combine(hash, newText.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -16150,7 +16150,7 @@
final String method;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['id'] = id ?? (throw 'id is required but was not set');
__result['method'] = method ?? (throw 'method is required but was not set');
return __result;
@@ -16209,7 +16209,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, id.hashCode);
hash = JenkinsSmiHash.combine(hash, method.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -16239,7 +16239,7 @@
final List<Unregistration> unregisterations;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['unregisterations'] = unregisterations ??
(throw 'unregisterations is required but was not set');
return __result;
@@ -16285,7 +16285,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, unregisterations.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -16325,7 +16325,7 @@
final num version;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['version'] = version;
__result['uri'] = uri ?? (throw 'uri is required but was not set');
return __result;
@@ -16380,7 +16380,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, version.hashCode);
hash = JenkinsSmiHash.combine(hash, uri.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -16448,7 +16448,7 @@
final TextDocumentIdentifier textDocument;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['textDocument'] =
textDocument ?? (throw 'textDocument is required but was not set');
__result['reason'] = reason ?? (throw 'reason is required but was not set');
@@ -16510,7 +16510,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, textDocument.hashCode);
hash = JenkinsSmiHash.combine(hash, reason.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -16602,7 +16602,7 @@
final bool workspaceFolders;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (applyEdit != null) {
__result['applyEdit'] = applyEdit;
}
@@ -16745,7 +16745,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, applyEdit.hashCode);
hash = JenkinsSmiHash.combine(hash, workspaceEdit.hashCode);
hash = JenkinsSmiHash.combine(hash, didChangeConfiguration.hashCode);
@@ -16778,7 +16778,7 @@
final bool dynamicRegistration;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (dynamicRegistration != null) {
__result['dynamicRegistration'] = dynamicRegistration;
}
@@ -16815,7 +16815,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, dynamicRegistration.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -16843,7 +16843,7 @@
final bool dynamicRegistration;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (dynamicRegistration != null) {
__result['dynamicRegistration'] = dynamicRegistration;
}
@@ -16880,7 +16880,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, dynamicRegistration.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -16905,7 +16905,7 @@
final bool dynamicRegistration;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (dynamicRegistration != null) {
__result['dynamicRegistration'] = dynamicRegistration;
}
@@ -16942,7 +16942,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, dynamicRegistration.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -16973,7 +16973,7 @@
final WorkspaceClientCapabilitiesSymbolKind symbolKind;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (dynamicRegistration != null) {
__result['dynamicRegistration'] = dynamicRegistration;
}
@@ -17026,7 +17026,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, dynamicRegistration.hashCode);
hash = JenkinsSmiHash.combine(hash, symbolKind.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -17060,7 +17060,7 @@
final List<SymbolKind> valueSet;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (valueSet != null) {
__result['valueSet'] = valueSet;
}
@@ -17101,7 +17101,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, valueSet.hashCode);
return JenkinsSmiHash.finish(hash);
}
@@ -17144,7 +17144,7 @@
final List<ResourceOperationKind> resourceOperations;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (documentChanges != null) {
__result['documentChanges'] = documentChanges;
}
@@ -17213,7 +17213,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, documentChanges.hashCode);
hash = JenkinsSmiHash.combine(hash, resourceOperations.hashCode);
hash = JenkinsSmiHash.combine(hash, failureHandling.hashCode);
@@ -17280,7 +17280,7 @@
documentChanges;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
if (changes != null) {
__result['changes'] = changes;
}
@@ -17346,7 +17346,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, changes.hashCode);
hash = JenkinsSmiHash.combine(hash, documentChanges.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -17382,7 +17382,7 @@
final String uri;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['uri'] = uri ?? (throw 'uri is required but was not set');
__result['name'] = name ?? (throw 'name is required but was not set');
return __result;
@@ -17441,7 +17441,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, uri.hashCode);
hash = JenkinsSmiHash.combine(hash, name.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -17484,7 +17484,7 @@
final List<WorkspaceFolder> removed;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['added'] = added ?? (throw 'added is required but was not set');
__result['removed'] =
removed ?? (throw 'removed is required but was not set');
@@ -17552,7 +17552,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, added.hashCode);
hash = JenkinsSmiHash.combine(hash, removed.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -17581,7 +17581,7 @@
final String query;
Map<String, dynamic> toJson() {
- Map<String, dynamic> __result = {};
+ var __result = <String, dynamic>{};
__result['query'] = query ?? (throw 'query is required but was not set');
return __result;
}
@@ -17622,7 +17622,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, query.hashCode);
return JenkinsSmiHash.finish(hash);
}
diff --git a/pkg/analysis_server/lib/plugin/protocol/protocol_dart.dart b/pkg/analysis_server/lib/plugin/protocol/protocol_dart.dart
index d410818..61ffb29 100644
--- a/pkg/analysis_server/lib/plugin/protocol/protocol_dart.dart
+++ b/pkg/analysis_server/lib/plugin/protocol/protocol_dart.dart
@@ -12,11 +12,11 @@
/// Return a protocol [Element] corresponding to the given [engine.Element].
Element convertElement(engine.Element element) {
- String name = getElementDisplayName(element);
- String elementTypeParameters = _getTypeParametersString(element);
- String elementParameters = _getParametersString(element);
- String elementReturnType = getReturnTypeString(element);
- ElementKind kind = convertElementToElementKind(element);
+ var name = getElementDisplayName(element);
+ var elementTypeParameters = _getTypeParametersString(element);
+ var elementParameters = _getParametersString(element);
+ var elementReturnType = getReturnTypeString(element);
+ var kind = convertElementToElementKind(element);
return Element(
kind,
name,
@@ -150,9 +150,9 @@
parameters.sort(_preferRequiredParams);
- StringBuffer sb = StringBuffer();
- String closeOptionalString = '';
- for (engine.ParameterElement parameter in parameters) {
+ var sb = StringBuffer();
+ var closeOptionalString = '';
+ for (var parameter in parameters) {
if (sb.isNotEmpty) {
sb.write(', ');
}
@@ -234,7 +234,7 @@
/// Sort required named parameters before optional ones.
int _preferRequiredParams(
engine.ParameterElement e1, engine.ParameterElement e2) {
- int rank1 = (e1.isRequiredNamed || e1.hasRequired) ? 0 : !e1.isNamed ? -1 : 1;
- int rank2 = (e2.isRequiredNamed || e2.hasRequired) ? 0 : !e2.isNamed ? -1 : 1;
+ var rank1 = (e1.isRequiredNamed || e1.hasRequired) ? 0 : !e1.isNamed ? -1 : 1;
+ var rank2 = (e2.isRequiredNamed || e2.hasRequired) ? 0 : !e2.isNamed ? -1 : 1;
return rank1 - rank2;
}
diff --git a/pkg/analysis_server/lib/protocol/protocol.dart b/pkg/analysis_server/lib/protocol/protocol.dart
index be64ead..d45f7d3 100644
--- a/pkg/analysis_server/lib/protocol/protocol.dart
+++ b/pkg/analysis_server/lib/protocol/protocol.dart
@@ -44,7 +44,7 @@
/// Return a table representing the structure of the Json object that will be
/// sent to the client to represent this response.
Map<String, Object> toJson() {
- Map<String, Object> jsonObject = {};
+ var jsonObject = <String, Object>{};
jsonObject[EVENT] = event;
if (params != null) {
jsonObject[PARAMS] = params;
@@ -173,7 +173,7 @@
/// Return a table representing the structure of the Json object that will be
/// sent to the client to represent this response.
Map<String, Object> toJson() {
- Map<String, Object> jsonObject = <String, Object>{};
+ var jsonObject = <String, Object>{};
jsonObject[ID] = id;
jsonObject[METHOD] = method;
if (params.isNotEmpty) {
@@ -192,11 +192,11 @@
if (second == null) {
return false;
}
- int length = first.length;
+ var length = first.length;
if (length != second.length) {
return false;
}
- for (int i = 0; i < length; i++) {
+ for (var i = 0; i < length; i++) {
if (!_equalObjects(first[i], second[i])) {
return false;
}
@@ -480,7 +480,7 @@
/// Initialize a newly created instance to represent the SERVER_ERROR error
/// condition.
factory Response.serverError(Request request, exception, stackTrace) {
- RequestError error =
+ var error =
RequestError(RequestErrorCode.SERVER_ERROR, exception.toString());
if (stackTrace != null) {
error.stackTrace = stackTrace.toString();
@@ -518,7 +518,7 @@
/// Return a table representing the structure of the Json object that will be
/// sent to the client to represent this response.
Map<String, Object> toJson() {
- Map<String, Object> jsonObject = <String, Object>{};
+ var jsonObject = <String, Object>{};
jsonObject[ID] = id;
if (error != null) {
jsonObject[ERROR] = error.toJson();
diff --git a/pkg/analysis_server/lib/src/analysis_server.dart b/pkg/analysis_server/lib/src/analysis_server.dart
index a2dd3bf..ffb863f7 100644
--- a/pkg/analysis_server/lib/src/analysis_server.dart
+++ b/pkg/analysis_server/lib/src/analysis_server.dart
@@ -184,8 +184,7 @@
sdkManager.defaultSdkDirectory,
notificationManager,
instrumentationService);
- PluginWatcher pluginWatcher =
- PluginWatcher(resourceProvider, pluginManager);
+ var pluginWatcher = PluginWatcher(resourceProvider, pluginManager);
defaultContextOptions.contextFeatures =
analyzer_features.FeatureSet.fromEnableFlags(
@@ -194,13 +193,13 @@
defaultContextOptions.useFastaParser = options.useFastaParser;
{
- String name = options.newAnalysisDriverLog;
+ var name = options.newAnalysisDriverLog;
StringSink sink = NullStringSink();
if (name != null) {
if (name == 'stdout') {
sink = io.stdout;
} else if (name.startsWith('file:')) {
- String path = name.substring('file:'.length);
+ var path = name.substring('file:'.length);
sink = FileStringSink(path);
}
}
@@ -227,7 +226,7 @@
contextManager = ContextManagerImpl(resourceProvider, sdkManager,
analyzedFilesGlobs, instrumentationService, defaultContextOptions);
- ServerContextManagerCallbacks contextManagerCallbacks =
+ var contextManagerCallbacks =
ServerContextManagerCallbacks(this, resourceProvider);
contextManager.callbacks = contextManagerCallbacks;
_onAnalysisStartedController = StreamController.broadcast();
@@ -238,7 +237,7 @@
});
});
searchEngine = SearchEngineImpl(driverMap.values);
- Notification notification =
+ var notification =
ServerConnectedParams(PROTOCOL_VERSION, io.pid).toNotification();
channel.sendNotification(notification);
channel.listen(handleRequest, onDone: done, onError: error);
@@ -290,7 +289,7 @@
/// Return one of the SDKs that has been created, or `null` if no SDKs have
/// been created yet.
DartSdk findSdk() {
- DartSdk sdk = sdkManager.anySdk;
+ var sdk = sdkManager.anySdk;
if (sdk != null) {
return sdk;
}
@@ -305,7 +304,7 @@
return null;
}
- nd.AnalysisDriver driver = getAnalysisDriver(path);
+ var driver = getAnalysisDriver(path);
return driver?.getCachedResult(path);
}
@@ -314,10 +313,10 @@
performance.logRequestTiming(request.clientRequestTime);
runZonedGuarded(() {
ServerPerformanceStatistics.serverRequests.makeCurrentWhile(() {
- int count = handlers.length;
- for (int i = 0; i < count; i++) {
+ var count = handlers.length;
+ for (var i = 0; i < count; i++) {
try {
- Response response = handlers[i].handleRequest(request);
+ var response = handlers[i].handleRequest(request);
if (response == Response.DELAYED_RESPONSE) {
return;
}
@@ -329,12 +328,12 @@
channel.sendResponse(exception.response);
return;
} catch (exception, stackTrace) {
- RequestError error = RequestError(
+ var error = RequestError(
RequestErrorCode.SERVER_ERROR, exception.toString());
if (stackTrace != null) {
error.stackTrace = stackTrace.toString();
}
- Response response = Response(request.id, error: error);
+ var response = Response(request.id, error: error);
channel.sendResponse(response);
return;
}
@@ -408,7 +407,7 @@
/*StackTrace*/ stackTrace, {
bool fatal = false,
}) {
- String msg = exception == null ? message : '$message: $exception';
+ var msg = exception == null ? message : '$message: $exception';
if (stackTrace != null && exception is! CaughtException) {
stackTrace = StackTrace.current;
}
@@ -457,7 +456,7 @@
return;
}
statusAnalyzing = status.isAnalyzing;
- AnalysisStatus analysis = AnalysisStatus(status.isAnalyzing);
+ var analysis = AnalysisStatus(status.isAnalyzing);
channel.sendNotification(
ServerStatusParams(analysis: analysis).toNotification());
}
@@ -494,9 +493,8 @@
notificationManager.setSubscriptions(subscriptions);
}
analysisServices = subscriptions;
- Set<String> allNewFiles =
- subscriptions.values.expand((files) => files).toSet();
- for (String file in allNewFiles) {
+ var allNewFiles = subscriptions.values.expand((files) => files).toSet();
+ for (var file in allNewFiles) {
// The result will be produced by the "results" stream with
// the fully resolved unit, and processed with sending analysis
// notifications as it happens after content changes.
@@ -509,9 +507,8 @@
/// Implementation for `flutter.setSubscriptions`.
void setFlutterSubscriptions(Map<FlutterService, Set<String>> subscriptions) {
flutterServices = subscriptions;
- Set<String> allNewFiles =
- subscriptions.values.expand((files) => files).toSet();
- for (String file in allNewFiles) {
+ var allNewFiles = subscriptions.values.expand((files) => files).toSet();
+ for (var file in allNewFiles) {
// The result will be produced by the "results" stream with
// the fully resolved unit, and processed with sending analysis
// notifications as it happens after content changes.
@@ -524,7 +521,7 @@
/// Implementation for `analysis.setGeneralSubscriptions`.
void setGeneralAnalysisSubscriptions(
List<GeneralAnalysisService> subscriptions) {
- Set<GeneralAnalysisService> newServices = subscriptions.toSet();
+ var newServices = subscriptions.toSet();
if (newServices.contains(GeneralAnalysisService.ANALYZED_FILES) &&
!generalAnalysisServices
.contains(GeneralAnalysisService.ANALYZED_FILES) &&
@@ -675,7 +672,7 @@
provider = (provider as OverlayResourceProvider).baseProvider;
}
if (provider is PhysicalResourceProvider) {
- Folder stateLocation = provider.getStateLocation('.analysis-driver');
+ var stateLocation = provider.getStateLocation('.analysis-driver');
if (stateLocation != null) {
return stateLocation.path;
}
@@ -696,7 +693,7 @@
Future<void> _scheduleAnalysisImplementedNotification() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- Set<String> files = analysisServices[AnalysisService.IMPLEMENTED];
+ var files = analysisServices[AnalysisService.IMPLEMENTED];
if (files != null) {
scheduleImplementedNotification(this, files);
}
@@ -768,12 +765,11 @@
@override
nd.AnalysisDriver addAnalysisDriver(
Folder folder, ContextRoot contextRoot, AnalysisOptions options) {
- ContextBuilder builder = createContextBuilder(folder, options);
- nd.AnalysisDriver analysisDriver = builder.buildDriver(contextRoot);
+ var builder = createContextBuilder(folder, options);
+ var analysisDriver = builder.buildDriver(contextRoot);
analysisDriver.results.listen((result) {
- NotificationManager notificationManager =
- analysisServer.notificationManager;
- String path = result.path;
+ var notificationManager = analysisServer.notificationManager;
+ var path = result.path;
if (analysisServer.shouldSendErrorsNotificationFor(path)) {
if (notificationManager != null) {
notificationManager.recordAnalysisErrors(NotificationManager.serverId,
@@ -782,7 +778,7 @@
new_sendErrorNotification(analysisServer, result);
}
}
- CompilationUnit unit = result.unit;
+ var unit = result.unit;
if (unit != null) {
if (notificationManager != null) {
if (analysisServer._hasAnalysisServiceSubscription(
@@ -893,7 +889,7 @@
@override
void applyChangesToContext(Folder contextFolder, ChangeSet changeSet) {
- nd.AnalysisDriver analysisDriver = analysisServer.driverMap[contextFolder];
+ var analysisDriver = analysisServer.driverMap[contextFolder];
if (analysisDriver != null) {
changeSet.addedFiles.forEach((path) {
analysisDriver.addFile(path);
@@ -924,10 +920,10 @@
ContextBuilder createContextBuilder(Folder folder, AnalysisOptions options) {
String defaultPackageFilePath;
String defaultPackagesDirectoryPath;
- String path = (analysisServer.contextManager as ContextManagerImpl)
+ var path = (analysisServer.contextManager as ContextManagerImpl)
.normalizedPackageRoots[folder.path];
if (path != null) {
- Resource resource = resourceProvider.getResource(path);
+ var resource = resourceProvider.getResource(path);
if (resource.exists) {
if (resource is File) {
defaultPackageFilePath = path;
@@ -937,11 +933,11 @@
}
}
- ContextBuilderOptions builderOptions = ContextBuilderOptions();
+ var builderOptions = ContextBuilderOptions();
builderOptions.defaultOptions = options;
builderOptions.defaultPackageFilePath = defaultPackageFilePath;
builderOptions.defaultPackagesDirectoryPath = defaultPackagesDirectoryPath;
- ContextBuilder builder = ContextBuilder(
+ var builder = ContextBuilder(
resourceProvider, analysisServer.sdkManager, null,
options: builderOptions);
builder.analysisDriverScheduler = analysisServer.analysisDriverScheduler;
@@ -954,7 +950,7 @@
@override
void removeContext(Folder folder, List<String> flushedFiles) {
sendAnalysisNotificationFlushResults(analysisServer, flushedFiles);
- nd.AnalysisDriver driver = analysisServer.driverMap.remove(folder);
+ var driver = analysisServer.driverMap.remove(folder);
driver.dispose();
}
@@ -968,7 +964,7 @@
server.AnalysisNavigationParams _computeNavigationParams(
String path, CompilationUnit unit) {
- NavigationCollectorImpl collector = NavigationCollectorImpl();
+ var collector = NavigationCollectorImpl();
computeDartNavigation(resourceProvider, collector, unit, null, null);
collector.createRegions();
return server.AnalysisNavigationParams(
@@ -976,7 +972,7 @@
}
List<Occurrences> _computeOccurrences(CompilationUnit unit) {
- OccurrencesCollectorImpl collector = OccurrencesCollectorImpl();
+ var collector = OccurrencesCollectorImpl();
addDartOccurrences(collector, unit);
return collector.allOccurrences;
}
@@ -1038,7 +1034,7 @@
void logRequestTiming(int clientRequestTime) {
++requestCount;
if (clientRequestTime != null) {
- int latency = DateTime.now().millisecondsSinceEpoch - clientRequestTime;
+ var latency = DateTime.now().millisecondsSinceEpoch - clientRequestTime;
++latencyCount;
requestLatency += latency;
maxLatency = max(maxLatency, latency);
diff --git a/pkg/analysis_server/lib/src/analysis_server_abstract.dart b/pkg/analysis_server/lib/src/analysis_server_abstract.dart
index f77f312..93975bf 100644
--- a/pkg/analysis_server/lib/src/analysis_server_abstract.dart
+++ b/pkg/analysis_server/lib/src/analysis_server_abstract.dart
@@ -111,7 +111,7 @@
List<Glob> get analyzedFilesGlobs {
if (_analyzedFilesGlobs == null) {
_analyzedFilesGlobs = <Glob>[];
- for (String pattern in analyzableFilePatterns) {
+ for (var pattern in analyzableFilePatterns) {
try {
_analyzedFilesGlobs
.add(Glob(resourceProvider.pathContext.separator, pattern));
@@ -135,7 +135,7 @@
/// Return the total time the server's been alive.
Duration get uptime {
- DateTime start =
+ var start =
DateTime.fromMillisecondsSinceEpoch(performanceDuringStartup.startTime);
return DateTime.now().difference(start);
}
@@ -150,18 +150,17 @@
/// If the state location can be accessed, return the file byte store,
/// otherwise return the memory byte store.
ByteStore createByteStore(ResourceProvider resourceProvider) {
- const int M = 1024 * 1024 /*1 MiB*/;
- const int G = 1024 * 1024 * 1024 /*1 GiB*/;
+ const M = 1024 * 1024 /*1 MiB*/;
+ const G = 1024 * 1024 * 1024 /*1 GiB*/;
- const int memoryCacheSize = 128 * M;
+ const memoryCacheSize = 128 * M;
if (resourceProvider is OverlayResourceProvider) {
OverlayResourceProvider overlay = resourceProvider;
resourceProvider = overlay.baseProvider;
}
if (resourceProvider is PhysicalResourceProvider) {
- Folder stateLocation =
- resourceProvider.getStateLocation('.analysis-driver');
+ var stateLocation = resourceProvider.getStateLocation('.analysis-driver');
if (stateLocation != null) {
return MemoryCachingByteStore(
EvictingFileByteStore(stateLocation.path, G), memoryCacheSize);
@@ -175,13 +174,13 @@
/// added if one exists, otherwise a driver in which the file was analyzed if
/// one exists, otherwise the first driver, otherwise `null`.
nd.AnalysisDriver getAnalysisDriver(String path) {
- List<nd.AnalysisDriver> drivers = driverMap.values.toList();
+ var drivers = driverMap.values.toList();
if (drivers.isNotEmpty) {
// Sort the drivers so that more deeply nested contexts will be checked
// before enclosing contexts.
drivers.sort((first, second) =>
second.contextRoot.root.length - first.contextRoot.root.length);
- nd.AnalysisDriver driver = drivers.firstWhere(
+ var driver = drivers.firstWhere(
(driver) => driver.contextRoot.containsFile(path),
orElse: () => null);
driver ??= drivers.firstWhere(
@@ -223,7 +222,7 @@
}
}
- AstNode node = await getNodeAtOffset(file, offset);
+ var node = await getNodeAtOffset(file, offset);
return getElementOfNode(node);
}
@@ -242,7 +241,7 @@
if (node is StringLiteral && node.parent is UriBasedDirective) {
return null;
}
- Element element = ElementLocator.locate(node);
+ var element = ElementLocator.locate(node);
if (node is SimpleIdentifier && element is PrefixElement) {
element = getImportElement(node);
}
@@ -255,8 +254,8 @@
Future<AstNode> getNodeAtOffset(String file, int offset) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- ResolvedUnitResult result = await getResolvedUnit(file);
- CompilationUnit unit = result?.unit;
+ var result = await getResolvedUnit(file);
+ var unit = result?.unit;
if (unit != null) {
return NodeLocator(offset).searchWithin(unit);
}
@@ -281,7 +280,7 @@
return null;
}
- nd.AnalysisDriver driver = getAnalysisDriver(path);
+ var driver = getAnalysisDriver(path);
if (driver == null) {
return Future.value();
}
@@ -295,7 +294,7 @@
}
void logExceptionResult(nd.ExceptionResult result) {
- String message = 'Analysis failed: ${result.filePath}';
+ var message = 'Analysis failed: ${result.filePath}';
if (result.contextKey != null) {
message += ' context: ${result.contextKey}';
}
diff --git a/pkg/analysis_server/lib/src/channel/byte_stream_channel.dart b/pkg/analysis_server/lib/src/channel/byte_stream_channel.dart
index 57bf820..1684533 100644
--- a/pkg/analysis_server/lib/src/channel/byte_stream_channel.dart
+++ b/pkg/analysis_server/lib/src/channel/byte_stream_channel.dart
@@ -51,7 +51,7 @@
Future<Response> sendRequest(Request request) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- String id = request.id;
+ var id = request.id;
output.write(json.encode(request.toJson()) + '\n');
return await responseStream
.firstWhere((Response response) => response.id == id);
@@ -118,7 +118,7 @@
return;
}
ServerPerformanceStatistics.serverChannel.makeCurrentWhile(() {
- String jsonEncoding = json.encode(notification.toJson());
+ var jsonEncoding = json.encode(notification.toJson());
_outputLine(jsonEncoding);
if (!identical(notification.event, 'server.log')) {
_instrumentationService.logNotification(jsonEncoding);
@@ -136,7 +136,7 @@
}
ServerPerformanceStatistics.serverChannel.makeCurrentWhile(() {
_requestStatistics?.addResponse(response);
- String jsonEncoding = json.encode(response.toJson());
+ var jsonEncoding = json.encode(response.toJson());
_outputLine(jsonEncoding);
_instrumentationService.logResponse(jsonEncoding);
});
@@ -162,7 +162,7 @@
_instrumentationService.logRequest(data);
// Parse the string as a JSON descriptor and process the resulting
// structure as a request.
- Request request = Request.fromString(data);
+ var request = Request.fromString(data);
if (request == null) {
sendResponse(Response.invalidRequestFormat());
return;
diff --git a/pkg/analysis_server/lib/src/channel/channel.dart b/pkg/analysis_server/lib/src/channel/channel.dart
index 1aa73e2..6ee5072 100644
--- a/pkg/analysis_server/lib/src/channel/channel.dart
+++ b/pkg/analysis_server/lib/src/channel/channel.dart
@@ -26,7 +26,7 @@
@override
void add(S chunk) {
if (!closed) {
- T convertedChunk = converter.convert(chunk);
+ var convertedChunk = converter.convert(chunk);
if (convertedChunk != null) {
sink.add(convertedChunk);
}
diff --git a/pkg/analysis_server/lib/src/computer/computer_closingLabels.dart b/pkg/analysis_server/lib/src/computer/computer_closingLabels.dart
index d459b67..d83aa7c 100644
--- a/pkg/analysis_server/lib/src/computer/computer_closingLabels.dart
+++ b/pkg/analysis_server/lib/src/computer/computer_closingLabels.dart
@@ -54,7 +54,7 @@
ClosingLabel label;
if (node.argumentList != null) {
- String labelText = node.constructorName.type.name.name;
+ var labelText = node.constructorName.type.name.name;
if (node.constructorName.name != null) {
labelText += '.${node.constructorName.name.name}';
}
@@ -76,8 +76,8 @@
@override
void visitListLiteral(ListLiteral node) {
- final NodeList<TypeAnnotation> args = node.typeArguments?.arguments;
- final String typeName = args != null ? args[0]?.toString() : null;
+ var args = node.typeArguments?.arguments;
+ var typeName = args != null ? args[0]?.toString() : null;
ClosingLabel label;
@@ -118,15 +118,14 @@
final CharacterLocation end =
computer._lineInfo.getLocation(checkLinesUsing.end - 1);
- final ClosingLabel closingLabel =
- ClosingLabel(node.offset, node.length, label);
+ var closingLabel = ClosingLabel(node.offset, node.length, label);
- int spannedLines = end.lineNumber - start.lineNumber;
+ var spannedLines = end.lineNumber - start.lineNumber;
if (spannedLines < 1) {
computer.setSingleLine(closingLabel);
}
- ClosingLabel parent = _currentLabel;
+ var parent = _currentLabel;
if (parent != null) {
computer.setHasNesting(parent);
computer.setHasNesting(closingLabel);
diff --git a/pkg/analysis_server/lib/src/computer/computer_folding.dart b/pkg/analysis_server/lib/src/computer/computer_folding.dart
index f70fd74..7f32a17 100644
--- a/pkg/analysis_server/lib/src/computer/computer_folding.dart
+++ b/pkg/analysis_server/lib/src/computer/computer_folding.dart
@@ -37,7 +37,7 @@
}
void _addFileHeaderRegion() {
- Token firstToken = _unit.beginToken;
+ var firstToken = _unit.beginToken;
while (firstToken?.type == TokenType.SCRIPT_TAG) {
firstToken = firstToken.next;
}
@@ -50,7 +50,7 @@
// Walk through the comments looking for a blank line to signal the end of
// the file header.
- Token lastComment = firstComment;
+ var lastComment = firstComment;
while (lastComment.next != null) {
lastComment = lastComment.next;
diff --git a/pkg/analysis_server/lib/src/computer/computer_highlights.dart b/pkg/analysis_server/lib/src/computer/computer_highlights.dart
index 6e39941..a0d7ff9 100644
--- a/pkg/analysis_server/lib/src/computer/computer_highlights.dart
+++ b/pkg/analysis_server/lib/src/computer/computer_highlights.dart
@@ -6,7 +6,6 @@
import 'package:analyzer/dart/ast/token.dart';
import 'package:analyzer/dart/ast/visitor.dart';
import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/dart/element/type.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart' hide Element;
/// A computer for [HighlightRegion]s in a Dart [CompilationUnit].
@@ -25,7 +24,7 @@
}
void _addCommentRanges() {
- Token token = _unit.beginToken;
+ var token = _unit.beginToken;
while (token != null && token.type != TokenType.EOF) {
Token commentToken = token.precedingComments;
while (commentToken != null) {
@@ -96,7 +95,7 @@
}
void _addIdentifierRegion_annotation(Annotation node) {
- ArgumentList arguments = node.arguments;
+ var arguments = node.arguments;
if (arguments == null) {
_addRegion_node(node, HighlightRegionType.ANNOTATION);
} else {
@@ -107,7 +106,7 @@
}
bool _addIdentifierRegion_class(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is! ClassElement) {
return false;
}
@@ -129,7 +128,7 @@
}
bool _addIdentifierRegion_constructor(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is! ConstructorElement) {
return false;
}
@@ -137,9 +136,9 @@
}
bool _addIdentifierRegion_dynamicType(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is VariableElement) {
- DartType staticType = element.type;
+ var staticType = element.type;
if (staticType == null || !staticType.isDynamic) {
return false;
}
@@ -149,7 +148,7 @@
}
bool _addIdentifierRegion_field(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is FieldFormalParameterElement) {
element = (element as FieldFormalParameterElement).field;
}
@@ -159,7 +158,7 @@
// prepare type
HighlightRegionType type;
if (element is FieldElement) {
- Element enclosingElement = element.enclosingElement;
+ var enclosingElement = element.enclosingElement;
if (enclosingElement is ClassElement && enclosingElement.isEnum) {
type = HighlightRegionType.ENUM_CONSTANT;
} else if (element.isStatic) {
@@ -178,7 +177,7 @@
}
bool _addIdentifierRegion_function(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is! FunctionElement) {
return false;
}
@@ -192,7 +191,7 @@
}
bool _addIdentifierRegion_functionTypeAlias(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is! FunctionTypeAliasElement) {
return false;
}
@@ -201,18 +200,17 @@
bool _addIdentifierRegion_getterSetterDeclaration(SimpleIdentifier node) {
// should be declaration
- AstNode parent = node.parent;
+ var parent = node.parent;
if (!(parent is MethodDeclaration || parent is FunctionDeclaration)) {
return false;
}
// should be property accessor
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is! PropertyAccessorElement) {
return false;
}
// getter or setter
- PropertyAccessorElement propertyAccessorElement =
- element as PropertyAccessorElement;
+ var propertyAccessorElement = element as PropertyAccessorElement;
if (propertyAccessorElement.isGetter) {
return _addRegion_node(node, HighlightRegionType.GETTER_DECLARATION);
} else {
@@ -221,7 +219,7 @@
}
bool _addIdentifierRegion_importPrefix(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is! PrefixElement) {
return false;
}
@@ -229,7 +227,7 @@
}
bool _addIdentifierRegion_keyword(SimpleIdentifier node) {
- String name = node.name;
+ var name = node.name;
if (name == 'void') {
return _addRegion_node(node, HighlightRegionType.KEYWORD);
}
@@ -237,7 +235,7 @@
}
bool _addIdentifierRegion_label(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is! LabelElement) {
return false;
}
@@ -245,7 +243,7 @@
}
bool _addIdentifierRegion_localVariable(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is! LocalVariableElement) {
return false;
}
@@ -260,12 +258,12 @@
}
bool _addIdentifierRegion_method(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is! MethodElement) {
return false;
}
- MethodElement methodElement = element as MethodElement;
- bool isStatic = methodElement.isStatic;
+ var methodElement = element as MethodElement;
+ var isStatic = methodElement.isStatic;
// OK
HighlightRegionType type;
if (node.inDeclarationContext()) {
@@ -285,7 +283,7 @@
}
bool _addIdentifierRegion_parameter(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is! ParameterElement) {
return false;
}
@@ -293,7 +291,7 @@
}
bool _addIdentifierRegion_typeParameter(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is! TypeParameterElement) {
return false;
}
@@ -305,31 +303,31 @@
}
bool _addRegion_node(AstNode node, HighlightRegionType type) {
- int offset = node.offset;
- int length = node.length;
+ var offset = node.offset;
+ var length = node.length;
_addRegion(offset, length, type);
return true;
}
void _addRegion_nodeStart_tokenEnd(
AstNode a, Token b, HighlightRegionType type) {
- int offset = a.offset;
- int end = b.end;
+ var offset = a.offset;
+ var end = b.end;
_addRegion(offset, end - offset, type);
}
void _addRegion_token(Token token, HighlightRegionType type) {
if (token != null) {
- int offset = token.offset;
- int length = token.length;
+ var offset = token.offset;
+ var length = token.length;
_addRegion(offset, length, type);
}
}
void _addRegion_tokenStart_tokenEnd(
Token a, Token b, HighlightRegionType type) {
- int offset = a.offset;
- int end = b.end;
+ var offset = a.offset;
+ var end = b.end;
_addRegion(offset, end - offset, type);
}
}
@@ -762,7 +760,7 @@
@override
void visitTypeName(TypeName node) {
- DartType type = node.type;
+ var type = node.type;
if (type != null) {
if (type.isDynamic && node.name.name == 'dynamic') {
computer._addRegion_node(node, HighlightRegionType.TYPE_NAME_DYNAMIC);
@@ -793,20 +791,20 @@
@override
void visitYieldStatement(YieldStatement node) {
- Token keyword = node.yieldKeyword;
- Token star = node.star;
- int offset = keyword.offset;
- int end = star != null ? star.end : keyword.end;
+ var keyword = node.yieldKeyword;
+ var star = node.star;
+ var offset = keyword.offset;
+ var end = star != null ? star.end : keyword.end;
computer._addRegion(offset, end - offset, HighlightRegionType.BUILT_IN);
super.visitYieldStatement(node);
}
void _addRegions_functionBody(FunctionBody node) {
- Token keyword = node.keyword;
+ var keyword = node.keyword;
if (keyword != null) {
- Token star = node.star;
- int offset = keyword.offset;
- int end = star != null ? star.end : keyword.end;
+ var star = node.star;
+ var offset = keyword.offset;
+ var end = star != null ? star.end : keyword.end;
computer._addRegion(offset, end - offset, HighlightRegionType.BUILT_IN);
}
}
diff --git a/pkg/analysis_server/lib/src/computer/computer_highlights2.dart b/pkg/analysis_server/lib/src/computer/computer_highlights2.dart
index 98a858f..4178ea1 100644
--- a/pkg/analysis_server/lib/src/computer/computer_highlights2.dart
+++ b/pkg/analysis_server/lib/src/computer/computer_highlights2.dart
@@ -6,7 +6,6 @@
import 'package:analyzer/dart/ast/token.dart';
import 'package:analyzer/dart/ast/visitor.dart';
import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/dart/element/type.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart' hide Element;
/// A computer for [HighlightRegion]s in a Dart [CompilationUnit].
@@ -25,7 +24,7 @@
}
void _addCommentRanges() {
- Token token = _unit.beginToken;
+ var token = _unit.beginToken;
while (token != null && token.type != TokenType.EOF) {
Token commentToken = token.precedingComments;
while (commentToken != null) {
@@ -99,7 +98,7 @@
}
void _addIdentifierRegion_annotation(Annotation node) {
- ArgumentList arguments = node.arguments;
+ var arguments = node.arguments;
if (arguments == null) {
_addRegion_node(node, HighlightRegionType.ANNOTATION);
} else {
@@ -110,7 +109,7 @@
}
bool _addIdentifierRegion_class(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is! ClassElement) {
return false;
}
@@ -132,7 +131,7 @@
}
bool _addIdentifierRegion_constructor(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is! ConstructorElement) {
return false;
}
@@ -140,11 +139,11 @@
}
bool _addIdentifierRegion_dynamicLocal(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is LocalVariableElement) {
var elementType = element.type;
if (elementType?.isDynamic == true) {
- HighlightRegionType type = node.inDeclarationContext()
+ var type = node.inDeclarationContext()
? HighlightRegionType.DYNAMIC_LOCAL_VARIABLE_DECLARATION
: HighlightRegionType.DYNAMIC_LOCAL_VARIABLE_REFERENCE;
return _addRegion_node(node, type);
@@ -153,7 +152,7 @@
if (element is ParameterElement) {
var elementType = element.type;
if (elementType?.isDynamic == true) {
- HighlightRegionType type = node.inDeclarationContext()
+ var type = node.inDeclarationContext()
? HighlightRegionType.DYNAMIC_PARAMETER_DECLARATION
: HighlightRegionType.DYNAMIC_PARAMETER_REFERENCE;
return _addRegion_node(node, type);
@@ -163,7 +162,7 @@
}
bool _addIdentifierRegion_field(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is FieldFormalParameterElement) {
if (node.parent is FieldFormalParameter) {
element = (element as FieldFormalParameterElement).field;
@@ -172,7 +171,7 @@
// prepare type
HighlightRegionType type;
if (element is FieldElement) {
- Element enclosingElement = element.enclosingElement;
+ var enclosingElement = element.enclosingElement;
if (enclosingElement is ClassElement && enclosingElement.isEnum) {
type = HighlightRegionType.ENUM_CONSTANT;
} else if (element.isStatic) {
@@ -186,8 +185,8 @@
type = HighlightRegionType.TOP_LEVEL_VARIABLE_DECLARATION;
}
if (element is PropertyAccessorElement) {
- PropertyAccessorElement accessor = element;
- Element enclosingElement = element.enclosingElement;
+ var accessor = element;
+ var enclosingElement = element.enclosingElement;
if (accessor.variable is TopLevelVariableElement) {
type = accessor.isGetter
? HighlightRegionType.TOP_LEVEL_GETTER_REFERENCE
@@ -212,12 +211,12 @@
}
bool _addIdentifierRegion_function(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is! FunctionElement) {
return false;
}
HighlightRegionType type;
- bool isTopLevel = element.enclosingElement is CompilationUnitElement;
+ var isTopLevel = element.enclosingElement is CompilationUnitElement;
if (node.inDeclarationContext()) {
type = isTopLevel
? HighlightRegionType.TOP_LEVEL_FUNCTION_DECLARATION
@@ -231,7 +230,7 @@
}
bool _addIdentifierRegion_functionTypeAlias(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is! FunctionTypeAliasElement) {
return false;
}
@@ -240,19 +239,18 @@
bool _addIdentifierRegion_getterSetterDeclaration(SimpleIdentifier node) {
// should be declaration
- AstNode parent = node.parent;
+ var parent = node.parent;
if (!(parent is MethodDeclaration || parent is FunctionDeclaration)) {
return false;
}
// should be property accessor
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is! PropertyAccessorElement) {
return false;
}
// getter or setter
- PropertyAccessorElement propertyAccessorElement =
- element as PropertyAccessorElement;
- bool isTopLevel = element.enclosingElement is CompilationUnitElement;
+ var propertyAccessorElement = element as PropertyAccessorElement;
+ var isTopLevel = element.enclosingElement is CompilationUnitElement;
HighlightRegionType type;
if (propertyAccessorElement.isGetter) {
if (isTopLevel) {
@@ -275,7 +273,7 @@
}
bool _addIdentifierRegion_importPrefix(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is! PrefixElement) {
return false;
}
@@ -283,7 +281,7 @@
}
bool _addIdentifierRegion_keyword(SimpleIdentifier node) {
- String name = node.name;
+ var name = node.name;
if (name == 'void') {
return _addRegion_node(node, HighlightRegionType.KEYWORD);
}
@@ -291,7 +289,7 @@
}
bool _addIdentifierRegion_label(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is! LabelElement) {
return false;
}
@@ -299,24 +297,24 @@
}
bool _addIdentifierRegion_localVariable(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is! LocalVariableElement) {
return false;
}
// OK
- HighlightRegionType type = node.inDeclarationContext()
+ var type = node.inDeclarationContext()
? HighlightRegionType.LOCAL_VARIABLE_DECLARATION
: HighlightRegionType.LOCAL_VARIABLE_REFERENCE;
return _addRegion_node(node, type);
}
bool _addIdentifierRegion_method(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is! MethodElement) {
return false;
}
- MethodElement methodElement = element as MethodElement;
- bool isStatic = methodElement.isStatic;
+ var methodElement = element as MethodElement;
+ var isStatic = methodElement.isStatic;
// OK
HighlightRegionType type;
if (node.inDeclarationContext()) {
@@ -336,18 +334,18 @@
}
bool _addIdentifierRegion_parameter(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is! ParameterElement) {
return false;
}
- HighlightRegionType type = node.inDeclarationContext()
+ var type = node.inDeclarationContext()
? HighlightRegionType.PARAMETER_DECLARATION
: HighlightRegionType.PARAMETER_REFERENCE;
return _addRegion_node(node, type);
}
bool _addIdentifierRegion_typeParameter(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is! TypeParameterElement) {
return false;
}
@@ -357,15 +355,15 @@
bool _addIdentifierRegion_unresolvedInstanceMemberReference(
SimpleIdentifier node) {
// unresolved
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element != null) {
return false;
}
// invoke / get / set
- bool decorate = false;
- AstNode parent = node.parent;
+ var decorate = false;
+ var parent = node.parent;
if (parent is MethodInvocation) {
- Expression target = parent.realTarget;
+ var target = parent.realTarget;
if (parent.methodName == node &&
target != null &&
_isDynamicExpression(target)) {
@@ -391,31 +389,31 @@
}
bool _addRegion_node(AstNode node, HighlightRegionType type) {
- int offset = node.offset;
- int length = node.length;
+ var offset = node.offset;
+ var length = node.length;
_addRegion(offset, length, type);
return true;
}
void _addRegion_nodeStart_tokenEnd(
AstNode a, Token b, HighlightRegionType type) {
- int offset = a.offset;
- int end = b.end;
+ var offset = a.offset;
+ var end = b.end;
_addRegion(offset, end - offset, type);
}
void _addRegion_token(Token token, HighlightRegionType type) {
if (token != null) {
- int offset = token.offset;
- int length = token.length;
+ var offset = token.offset;
+ var length = token.length;
_addRegion(offset, length, type);
}
}
void _addRegion_tokenStart_tokenEnd(
Token a, Token b, HighlightRegionType type) {
- int offset = a.offset;
- int end = b.end;
+ var offset = a.offset;
+ var end = b.end;
_addRegion(offset, end - offset, type);
}
@@ -871,7 +869,7 @@
@override
void visitTypeName(TypeName node) {
- DartType type = node.type;
+ var type = node.type;
if (type != null) {
if (type.isDynamic && node.name.name == 'dynamic') {
computer._addRegion_node(node, HighlightRegionType.TYPE_NAME_DYNAMIC);
@@ -902,20 +900,20 @@
@override
void visitYieldStatement(YieldStatement node) {
- Token keyword = node.yieldKeyword;
- Token star = node.star;
- int offset = keyword.offset;
- int end = star != null ? star.end : keyword.end;
+ var keyword = node.yieldKeyword;
+ var star = node.star;
+ var offset = keyword.offset;
+ var end = star != null ? star.end : keyword.end;
computer._addRegion(offset, end - offset, HighlightRegionType.BUILT_IN);
super.visitYieldStatement(node);
}
void _addRegions_functionBody(FunctionBody node) {
- Token keyword = node.keyword;
+ var keyword = node.keyword;
if (keyword != null) {
- Token star = node.star;
- int offset = keyword.offset;
- int end = star != null ? star.end : keyword.end;
+ var star = node.star;
+ var offset = keyword.offset;
+ var end = star != null ? star.end : keyword.end;
computer._addRegion(offset, end - offset, HighlightRegionType.BUILT_IN);
}
}
diff --git a/pkg/analysis_server/lib/src/computer/computer_hover.dart b/pkg/analysis_server/lib/src/computer/computer_hover.dart
index 45e9546..77e9970 100644
--- a/pkg/analysis_server/lib/src/computer/computer_hover.dart
+++ b/pkg/analysis_server/lib/src/computer/computer_hover.dart
@@ -5,7 +5,6 @@
import 'package:analysis_server/protocol/protocol_generated.dart'
show HoverInformation;
import 'package:analysis_server/src/computer/computer_overrides.dart';
-import 'package:analyzer/dart/analysis/session.dart';
import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/dart/element/type.dart';
@@ -29,7 +28,7 @@
/// Returns the computed hover, maybe `null`.
HoverInformation compute() {
- AstNode node = NodeLocator(_offset).searchWithin(_unit);
+ var node = NodeLocator(_offset).searchWithin(_unit);
if (node == null) {
return null;
}
@@ -43,18 +42,18 @@
node = node.parent.parent;
}
if (node is Expression) {
- Expression expression = node;
+ var expression = node;
// For constructor calls the whole expression is selected (above) but this
// results in the range covering the whole call so narrow it to just the
// ConstructorName.
- HoverInformation hover = expression is InstanceCreationExpression
+ var hover = expression is InstanceCreationExpression
? HoverInformation(
expression.constructorName.offset,
expression.constructorName.length,
)
: HoverInformation(expression.offset, expression.length);
// element
- Element element = ElementLocator.locate(expression);
+ var element = ElementLocator.locate(expression);
if (element != null) {
// variable, if synthetic accessor
if (element is PropertyAccessorElement) {
@@ -66,7 +65,7 @@
// description
hover.elementDescription = _elementDisplayString(element);
if (node is InstanceCreationExpression && node.keyword == null) {
- String prefix = node.isConst ? '(const) ' : '(new) ';
+ var prefix = node.isConst ? '(const) ' : '(new) ';
hover.elementDescription = prefix + hover.elementDescription;
}
hover.elementKind = element.kind.displayName;
@@ -74,25 +73,24 @@
// not local element
if (element.enclosingElement is! ExecutableElement) {
// containing class
- ClassElement containingClass = element.thisOrAncestorOfType();
+ var containingClass = element.thisOrAncestorOfType<ClassElement>();
if (containingClass != null) {
hover.containingClassDescription = containingClass.displayName;
}
// containing library
- LibraryElement library = element.library;
+ var library = element.library;
if (library != null) {
- Uri uri = library.source.uri;
+ var uri = library.source.uri;
if (uri.scheme != '' && uri.scheme == 'file') {
// for 'file:' URIs, use the path after the project root
- AnalysisSession analysisSession = _unit.declaredElement.session;
- path.Context context =
- analysisSession.resourceProvider.pathContext;
- String projectRootDir =
+ var analysisSession = _unit.declaredElement.session;
+ var context = analysisSession.resourceProvider.pathContext;
+ var projectRootDir =
analysisSession.analysisContext.contextRoot.root.path;
- String relativePath =
+ var relativePath =
context.relative(context.fromUri(uri), from: projectRootDir);
if (context.style == path.Style.windows) {
- List<String> pathList = context.split(relativePath);
+ var pathList = context.split(relativePath);
hover.containingLibraryName = pathList.join('/');
} else {
hover.containingLibraryName = relativePath;
@@ -112,7 +110,7 @@
);
// types
{
- AstNode parent = expression.parent;
+ var parent = expression.parent;
DartType staticType;
if (element == null || element is VariableElement) {
staticType = _getTypeOfDeclarationOrReference(node);
@@ -162,14 +160,14 @@
return dartdocInfo.processDartdoc(element.documentationComment);
}
// Look for documentation comments of overridden members.
- OverriddenElements overridden = findOverriddenElements(element);
- for (Element superElement in [
+ var overridden = findOverriddenElements(element);
+ for (var superElement in [
...overridden.superElements,
...overridden.interfaceElements
]) {
- String rawDoc = superElement.documentationComment;
+ var rawDoc = superElement.documentationComment;
if (rawDoc != null) {
- Element interfaceClass = superElement.enclosingElement;
+ var interfaceClass = superElement.enclosingElement;
return dartdocInfo.processDartdoc(rawDoc) +
'\n\nCopied from `${interfaceClass.displayName}`.';
}
diff --git a/pkg/analysis_server/lib/src/computer/computer_outline.dart b/pkg/analysis_server/lib/src/computer/computer_outline.dart
index d98e2fd..d2be4fc 100644
--- a/pkg/analysis_server/lib/src/computer/computer_outline.dart
+++ b/pkg/analysis_server/lib/src/computer/computer_outline.dart
@@ -23,8 +23,8 @@
/// Returns the computed outline, not `null`.
Outline compute() {
- List<Outline> unitContents = <Outline>[];
- for (CompilationUnitMember unitMember in resolvedUnit.unit.declarations) {
+ var unitContents = <Outline>[];
+ for (var unitMember in resolvedUnit.unit.declarations) {
if (unitMember is ClassDeclaration) {
unitContents.add(_newClassOutline(
unitMember, _outlinesForMembers(unitMember.members)));
@@ -32,9 +32,9 @@
unitContents.add(_newMixinOutline(
unitMember, _outlinesForMembers(unitMember.members)));
} else if (unitMember is EnumDeclaration) {
- EnumDeclaration enumDeclaration = unitMember;
- List<Outline> constantOutlines = <Outline>[];
- for (EnumConstantDeclaration constant in enumDeclaration.constants) {
+ var enumDeclaration = unitMember;
+ var constantOutlines = <Outline>[];
+ for (var constant in enumDeclaration.constants) {
constantOutlines.add(_newEnumConstant(constant));
}
unitContents.add(_newEnumOutline(enumDeclaration, constantOutlines));
@@ -42,57 +42,57 @@
unitContents.add(_newExtensionOutline(
unitMember, _outlinesForMembers(unitMember.members)));
} else if (unitMember is TopLevelVariableDeclaration) {
- TopLevelVariableDeclaration fieldDeclaration = unitMember;
- VariableDeclarationList fields = fieldDeclaration.variables;
+ var fieldDeclaration = unitMember;
+ var fields = fieldDeclaration.variables;
if (fields != null) {
- TypeAnnotation fieldType = fields.type;
- String fieldTypeName = _safeToSource(fieldType);
- for (VariableDeclaration field in fields.variables) {
+ var fieldType = fields.type;
+ var fieldTypeName = _safeToSource(fieldType);
+ for (var field in fields.variables) {
unitContents.add(_newVariableOutline(
fieldTypeName, ElementKind.TOP_LEVEL_VARIABLE, field, false));
}
}
} else if (unitMember is FunctionDeclaration) {
- FunctionDeclaration functionDeclaration = unitMember;
+ var functionDeclaration = unitMember;
unitContents.add(_newFunctionOutline(functionDeclaration, true));
} else if (unitMember is ClassTypeAlias) {
- ClassTypeAlias alias = unitMember;
+ var alias = unitMember;
unitContents.add(_newClassTypeAlias(alias));
} else if (unitMember is FunctionTypeAlias) {
- FunctionTypeAlias alias = unitMember;
+ var alias = unitMember;
unitContents.add(_newFunctionTypeAliasOutline(alias));
} else if (unitMember is GenericTypeAlias) {
- GenericTypeAlias alias = unitMember;
+ var alias = unitMember;
unitContents.add(_newGenericTypeAliasOutline(alias));
}
}
- Outline unitOutline = _newUnitOutline(unitContents);
+ var unitOutline = _newUnitOutline(unitContents);
return unitOutline;
}
List<Outline> _addFunctionBodyOutlines(FunctionBody body) {
- List<Outline> contents = <Outline>[];
+ var contents = <Outline>[];
body.accept(_FunctionBodyOutlinesVisitor(this, contents));
return contents;
}
Location _getLocationNode(AstNode node) {
- int offset = node.offset;
- int length = node.length;
+ var offset = node.offset;
+ var length = node.length;
return _getLocationOffsetLength(offset, length);
}
Location _getLocationOffsetLength(int offset, int length) {
CharacterLocation lineLocation = resolvedUnit.lineInfo.getLocation(offset);
- int startLine = lineLocation.lineNumber;
- int startColumn = lineLocation.columnNumber;
+ var startLine = lineLocation.lineNumber;
+ var startColumn = lineLocation.columnNumber;
return Location(resolvedUnit.path, offset, length, startLine, startColumn);
}
Outline _newClassOutline(ClassDeclaration node, List<Outline> classContents) {
- SimpleIdentifier nameNode = node.name;
- String name = nameNode.name;
- Element element = Element(
+ var nameNode = node.name;
+ var name = nameNode.name;
+ var element = Element(
ElementKind.CLASS,
name,
Element.makeFlags(
@@ -105,9 +105,9 @@
}
Outline _newClassTypeAlias(ClassTypeAlias node) {
- SimpleIdentifier nameNode = node.name;
- String name = nameNode.name;
- Element element = Element(
+ var nameNode = node.name;
+ var name = nameNode.name;
+ var element = Element(
ElementKind.CLASS_TYPE_ALIAS,
name,
Element.makeFlags(
@@ -120,36 +120,36 @@
}
Outline _newConstructorOutline(ConstructorDeclaration constructor) {
- Identifier returnType = constructor.returnType;
- String name = returnType.name;
- int offset = returnType.offset;
- int length = returnType.length;
- SimpleIdentifier constructorNameNode = constructor.name;
- bool isPrivate = false;
+ var returnType = constructor.returnType;
+ var name = returnType.name;
+ var offset = returnType.offset;
+ var length = returnType.length;
+ var constructorNameNode = constructor.name;
+ var isPrivate = false;
if (constructorNameNode != null) {
- String constructorName = constructorNameNode.name;
+ var constructorName = constructorNameNode.name;
isPrivate = Identifier.isPrivateName(constructorName);
name += '.$constructorName';
offset = constructorNameNode.offset;
length = constructorNameNode.length;
}
- FormalParameterList parameters = constructor.parameters;
- String parametersStr = _safeToSource(parameters);
- Element element = Element(
+ var parameters = constructor.parameters;
+ var parametersStr = _safeToSource(parameters);
+ var element = Element(
ElementKind.CONSTRUCTOR,
name,
Element.makeFlags(
isPrivate: isPrivate, isDeprecated: _isDeprecated(constructor)),
location: _getLocationOffsetLength(offset, length),
parameters: parametersStr);
- List<Outline> contents = _addFunctionBodyOutlines(constructor.body);
+ var contents = _addFunctionBodyOutlines(constructor.body);
return _nodeOutline(constructor, element, contents);
}
Outline _newEnumConstant(EnumConstantDeclaration node) {
- SimpleIdentifier nameNode = node.name;
- String name = nameNode.name;
- Element element = Element(
+ var nameNode = node.name;
+ var name = nameNode.name;
+ var element = Element(
ElementKind.ENUM_CONSTANT,
name,
Element.makeFlags(
@@ -160,9 +160,9 @@
}
Outline _newEnumOutline(EnumDeclaration node, List<Outline> children) {
- SimpleIdentifier nameNode = node.name;
- String name = nameNode.name;
- Element element = Element(
+ var nameNode = node.name;
+ var name = nameNode.name;
+ var element = Element(
ElementKind.ENUM,
name,
Element.makeFlags(
@@ -174,9 +174,9 @@
Outline _newExtensionOutline(
ExtensionDeclaration node, List<Outline> extensionContents) {
- SimpleIdentifier nameNode = node.name;
- String name = nameNode?.name ?? '';
- Element element = Element(
+ var nameNode = node.name;
+ var name = nameNode?.name ?? '';
+ var element = Element(
ElementKind.EXTENSION,
name,
Element.makeFlags(
@@ -188,11 +188,11 @@
}
Outline _newFunctionOutline(FunctionDeclaration function, bool isStatic) {
- TypeAnnotation returnType = function.returnType;
- SimpleIdentifier nameNode = function.name;
- String name = nameNode.name;
- FunctionExpression functionExpression = function.functionExpression;
- FormalParameterList parameters = functionExpression.parameters;
+ var returnType = function.returnType;
+ var nameNode = function.name;
+ var name = nameNode.name;
+ var functionExpression = function.functionExpression;
+ var parameters = functionExpression.parameters;
ElementKind kind;
if (function.isGetter) {
kind = ElementKind.GETTER;
@@ -201,9 +201,9 @@
} else {
kind = ElementKind.FUNCTION;
}
- String parametersStr = _safeToSource(parameters);
- String returnTypeStr = _safeToSource(returnType);
- Element element = Element(
+ var parametersStr = _safeToSource(parameters);
+ var returnTypeStr = _safeToSource(returnType);
+ var element = Element(
kind,
name,
Element.makeFlags(
@@ -215,18 +215,18 @@
returnType: returnTypeStr,
typeParameters:
_getTypeParametersStr(functionExpression.typeParameters));
- List<Outline> contents = _addFunctionBodyOutlines(functionExpression.body);
+ var contents = _addFunctionBodyOutlines(functionExpression.body);
return _nodeOutline(function, element, contents);
}
Outline _newFunctionTypeAliasOutline(FunctionTypeAlias node) {
- TypeAnnotation returnType = node.returnType;
- SimpleIdentifier nameNode = node.name;
- String name = nameNode.name;
- FormalParameterList parameters = node.parameters;
- String parametersStr = _safeToSource(parameters);
- String returnTypeStr = _safeToSource(returnType);
- Element element = Element(
+ var returnType = node.returnType;
+ var nameNode = node.name;
+ var name = nameNode.name;
+ var parameters = node.parameters;
+ var parametersStr = _safeToSource(parameters);
+ var returnTypeStr = _safeToSource(returnType);
+ var element = Element(
ElementKind.FUNCTION_TYPE_ALIAS,
name,
Element.makeFlags(
@@ -241,13 +241,13 @@
Outline _newGenericTypeAliasOutline(GenericTypeAlias node) {
var functionType = node.functionType;
- TypeAnnotation returnType = functionType?.returnType;
- SimpleIdentifier nameNode = node.name;
- String name = nameNode.name;
- FormalParameterList parameters = functionType?.parameters;
- String parametersStr = _safeToSource(parameters);
- String returnTypeStr = _safeToSource(returnType);
- Element element = Element(
+ var returnType = functionType?.returnType;
+ var nameNode = node.name;
+ var name = nameNode.name;
+ var parameters = functionType?.parameters;
+ var parametersStr = _safeToSource(parameters);
+ var returnTypeStr = _safeToSource(returnType);
+ var element = Element(
ElementKind.FUNCTION_TYPE_ALIAS,
name,
Element.makeFlags(
@@ -261,10 +261,10 @@
}
Outline _newMethodOutline(MethodDeclaration method) {
- TypeAnnotation returnType = method.returnType;
- SimpleIdentifier nameNode = method.name;
- String name = nameNode.name;
- FormalParameterList parameters = method.parameters;
+ var returnType = method.returnType;
+ var nameNode = method.name;
+ var name = nameNode.name;
+ var parameters = method.parameters;
ElementKind kind;
if (method.isGetter) {
kind = ElementKind.GETTER;
@@ -273,9 +273,9 @@
} else {
kind = ElementKind.METHOD;
}
- String parametersStr = parameters?.toSource();
- String returnTypeStr = _safeToSource(returnType);
- Element element = Element(
+ var parametersStr = parameters?.toSource();
+ var returnTypeStr = _safeToSource(returnType);
+ var element = Element(
kind,
name,
Element.makeFlags(
@@ -287,15 +287,15 @@
parameters: parametersStr,
returnType: returnTypeStr,
typeParameters: _getTypeParametersStr(method.typeParameters));
- List<Outline> contents = _addFunctionBodyOutlines(method.body);
+ var contents = _addFunctionBodyOutlines(method.body);
return _nodeOutline(method, element, contents);
}
Outline _newMixinOutline(MixinDeclaration node, List<Outline> mixinContents) {
node.firstTokenAfterCommentAndMetadata;
- SimpleIdentifier nameNode = node.name;
- String name = nameNode.name;
- Element element = Element(
+ var nameNode = node.name;
+ var name = nameNode.name;
+ var element = Element(
ElementKind.MIXIN,
name,
Element.makeFlags(
@@ -307,7 +307,7 @@
}
Outline _newUnitOutline(List<Outline> unitContents) {
- Element element = Element(
+ var element = Element(
ElementKind.COMPILATION_UNIT, '<unit>', Element.makeFlags(),
location: _getLocationNode(resolvedUnit.unit));
return _nodeOutline(resolvedUnit.unit, element, unitContents);
@@ -315,9 +315,9 @@
Outline _newVariableOutline(String typeName, ElementKind kind,
VariableDeclaration variable, bool isStatic) {
- SimpleIdentifier nameNode = variable.name;
- String name = nameNode.name;
- Element element = Element(
+ var nameNode = variable.name;
+ var name = nameNode.name;
+ var element = Element(
kind,
name,
Element.makeFlags(
@@ -333,10 +333,10 @@
Outline _nodeOutline(AstNode node, Element element,
[List<Outline> children]) {
- int offset = node.offset;
- int end = node.end;
+ var offset = node.offset;
+ var end = node.end;
if (node is VariableDeclaration) {
- AstNode parent = node.parent;
+ var parent = node.parent;
if (parent is VariableDeclarationList && parent.variables.isNotEmpty) {
if (parent.variables[0] == node) {
offset = parent.parent.offset;
@@ -347,38 +347,38 @@
}
}
- int codeOffset = node.offset;
+ var codeOffset = node.offset;
if (node is AnnotatedNode) {
codeOffset = node.firstTokenAfterCommentAndMetadata.offset;
}
- int length = end - offset;
- int codeLength = node.end - codeOffset;
+ var length = end - offset;
+ var codeLength = node.end - codeOffset;
return Outline(element, offset, length, codeOffset, codeLength,
children: nullIfEmpty(children));
}
List<Outline> _outlinesForMembers(List<ClassMember> members) {
- List<Outline> memberOutlines = <Outline>[];
- for (ClassMember classMember in members) {
+ var memberOutlines = <Outline>[];
+ for (var classMember in members) {
if (classMember is ConstructorDeclaration) {
- ConstructorDeclaration constructorDeclaration = classMember;
+ var constructorDeclaration = classMember;
memberOutlines.add(_newConstructorOutline(constructorDeclaration));
}
if (classMember is FieldDeclaration) {
- FieldDeclaration fieldDeclaration = classMember;
- VariableDeclarationList fields = fieldDeclaration.fields;
+ var fieldDeclaration = classMember;
+ var fields = fieldDeclaration.fields;
if (fields != null) {
- TypeAnnotation fieldType = fields.type;
- String fieldTypeName = _safeToSource(fieldType);
- for (VariableDeclaration field in fields.variables) {
+ var fieldType = fields.type;
+ var fieldTypeName = _safeToSource(fieldType);
+ for (var field in fields.variables) {
memberOutlines.add(_newVariableOutline(fieldTypeName,
ElementKind.FIELD, field, fieldDeclaration.isStatic));
}
}
}
if (classMember is MethodDeclaration) {
- MethodDeclaration methodDeclaration = classMember;
+ var methodDeclaration = classMember;
memberOutlines.add(_newMethodOutline(methodDeclaration));
}
}
@@ -394,7 +394,7 @@
/// Returns `true` if the given [element] is not `null` and deprecated.
static bool _isDeprecated(Declaration declaration) {
- engine.Element element = declaration.declaredElement;
+ var element = declaration.declaredElement;
return element != null && element.hasDeprecated;
}
@@ -440,12 +440,12 @@
void visitInstanceCreationExpression(InstanceCreationExpression node) {
if (outlineComputer.withBasicFlutter &&
outlineComputer.flutter.isWidgetCreation(node)) {
- List<Outline> children = <Outline>[];
+ var children = <Outline>[];
node.argumentList
.accept(_FunctionBodyOutlinesVisitor(outlineComputer, children));
- String text = outlineComputer.flutter.getWidgetPresentationText(node);
- Element element = Element(ElementKind.CONSTRUCTOR_INVOCATION, text, 0,
+ var text = outlineComputer.flutter.getWidgetPresentationText(node);
+ var element = Element(ElementKind.CONSTRUCTOR_INVOCATION, text, 0,
location: outlineComputer._getLocationOffsetLength(node.offset, 0));
contents.add(Outline(
@@ -458,9 +458,9 @@
@override
void visitMethodInvocation(MethodInvocation node) {
- SimpleIdentifier nameNode = node.methodName;
+ var nameNode = node.methodName;
- engine.Element nameElement = nameNode.staticElement;
+ var nameElement = nameNode.staticElement;
if (nameElement is! engine.ExecutableElement) {
return;
}
@@ -468,9 +468,9 @@
String extractString(NodeList<Expression> arguments) {
if (arguments != null && arguments.isNotEmpty) {
- Expression argument = arguments[0];
+ var argument = arguments[0];
if (argument is StringLiteral) {
- String value = argument.stringValue;
+ var value = argument.stringValue;
if (value != null) {
return value;
}
@@ -481,10 +481,10 @@
}
void addOutlineNode(ElementKind kind, [List<Outline> children]) {
- String executableName = nameNode.name;
- String description = extractString(node.argumentList?.arguments);
- String name = '$executableName("$description")';
- Element element = Element(kind, name, 0,
+ var executableName = nameNode.name;
+ var description = extractString(node.argumentList?.arguments);
+ var name = '$executableName("$description")';
+ var element = Element(kind, name, 0,
location: outlineComputer._getLocationNode(nameNode));
contents.add(Outline(
element, node.offset, node.length, node.offset, node.length,
@@ -492,7 +492,7 @@
}
if (isGroup(executableElement)) {
- List<Outline> groupContents = <Outline>[];
+ var groupContents = <Outline>[];
node.argumentList
.accept(_FunctionBodyOutlinesVisitor(outlineComputer, groupContents));
addOutlineNode(ElementKind.UNIT_TEST_GROUP, groupContents);
@@ -506,7 +506,7 @@
/// Return `true` if the given [element] is a top-level member of the test
/// package.
bool _isInsideTestPackage(engine.FunctionElement element) {
- engine.Element parent = element.enclosingElement;
+ var parent = element.enclosingElement;
return parent is engine.CompilationUnitElement &&
parent.source.fullName.endsWith('test.dart');
}
diff --git a/pkg/analysis_server/lib/src/computer/computer_overrides.dart b/pkg/analysis_server/lib/src/computer/computer_overrides.dart
index cfe14d1..9a27a6e 100644
--- a/pkg/analysis_server/lib/src/computer/computer_overrides.dart
+++ b/pkg/analysis_server/lib/src/computer/computer_overrides.dart
@@ -6,7 +6,6 @@
import 'package:analysis_server/src/protocol_server.dart' as proto;
import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/dart/element/type.dart';
/// Return the elements that the given [element] overrides.
OverriddenElements findOverriddenElements(Element element) {
@@ -25,9 +24,9 @@
/// Returns the computed occurrences, not `null`.
List<proto.Override> compute() {
- for (CompilationUnitMember unitMember in _unit.declarations) {
+ for (var unitMember in _unit.declarations) {
if (unitMember is ClassOrMixinDeclaration) {
- for (ClassMember classMember in unitMember.members) {
+ for (var classMember in unitMember.members) {
if (classMember is MethodDeclaration) {
if (classMember.isStatic) {
continue;
@@ -39,7 +38,7 @@
continue;
}
List<VariableDeclaration> fields = classMember.fields.variables;
- for (VariableDeclaration field in fields) {
+ for (var field in fields) {
_addOverride(field.name);
}
}
@@ -51,16 +50,15 @@
/// Add a new [Override] for the declaration with the given name [node].
void _addOverride(SimpleIdentifier node) {
- Element element = node.staticElement;
- OverriddenElements overridesResult =
- _OverriddenElementsFinder(element).find();
- List<Element> superElements = overridesResult.superElements;
- List<Element> interfaceElements = overridesResult.interfaceElements;
+ var element = node.staticElement;
+ var overridesResult = _OverriddenElementsFinder(element).find();
+ var superElements = overridesResult.superElements;
+ var interfaceElements = overridesResult.interfaceElements;
if (superElements.isNotEmpty || interfaceElements.isNotEmpty) {
- proto.OverriddenMember superMember = superElements.isNotEmpty
+ var superMember = superElements.isNotEmpty
? proto.newOverriddenMember_fromEngine(superElements.first)
: null;
- List<proto.OverriddenMember> interfaceMembers = interfaceElements
+ var interfaceMembers = interfaceElements
.map((member) => proto.newOverriddenMember_fromEngine(member))
.toList();
_overrides.add(proto.Override(node.offset, node.length,
@@ -150,13 +148,13 @@
}
// this type
if (checkType) {
- Element element = _lookupMember(class_);
+ var element = _lookupMember(class_);
if (element != null && !_interfaceElements.contains(element)) {
_interfaceElements.add(element);
}
}
// interfaces
- for (InterfaceType interfaceType in class_.interfaces) {
+ for (var interfaceType in class_.interfaces) {
_addInterfaceOverrides(interfaceType.element, true);
}
// super
@@ -172,7 +170,7 @@
}
if (withThisType) {
- Element element = _lookupMember(class_);
+ var element = _lookupMember(class_);
if (element != null && !_superElements.contains(element)) {
_superElements.add(element);
}
diff --git a/pkg/analysis_server/lib/src/computer/import_elements_computer.dart b/pkg/analysis_server/lib/src/computer/import_elements_computer.dart
index f1d60d3..0bab64a 100644
--- a/pkg/analysis_server/lib/src/computer/import_elements_computer.dart
+++ b/pkg/analysis_server/lib/src/computer/import_elements_computer.dart
@@ -4,10 +4,8 @@
import 'dart:async';
-import 'package:_fe_analyzer_shared/src/base/syntactic_entity.dart';
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analyzer/dart/analysis/results.dart';
-import 'package:analyzer/dart/analysis/uri_converter.dart';
import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/ast/ast_factory.dart';
import 'package:analyzer/dart/ast/token.dart';
@@ -20,7 +18,6 @@
import 'package:analyzer_plugin/protocol/protocol_common.dart' hide Element;
import 'package:analyzer_plugin/utilities/change_builder/change_builder_dart.dart';
import 'package:analyzer_plugin/utilities/range_factory.dart';
-import 'package:path/src/context.dart';
/// An object used to compute a set of edits to add imports to a given library
/// in order to make a given set of elements visible.
@@ -43,37 +40,35 @@
List<ImportedElements> importedElementsList) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- List<ImportedElements> filteredImportedElements =
+ var filteredImportedElements =
_filterImportedElements(importedElementsList);
- LibraryElement libraryElement = libraryResult.libraryElement;
- UriConverter uriConverter = libraryResult.session.uriConverter;
- List<ImportDirective> existingImports = <ImportDirective>[];
+ var libraryElement = libraryResult.libraryElement;
+ var uriConverter = libraryResult.session.uriConverter;
+ var existingImports = <ImportDirective>[];
for (var directive in libraryResult.unit.directives) {
if (directive is ImportDirective) {
existingImports.add(directive);
}
}
- DartChangeBuilder builder = DartChangeBuilder(libraryResult.session);
+ var builder = DartChangeBuilder(libraryResult.session);
await builder.addFileEdit(libraryResult.path,
(DartFileEditBuilder builder) {
- for (ImportedElements importedElements in filteredImportedElements) {
- List<ImportDirective> matchingImports =
+ for (var importedElements in filteredImportedElements) {
+ var matchingImports =
_findMatchingImports(existingImports, importedElements);
if (matchingImports.isEmpty) {
//
// The required library is not being imported with a matching prefix,
// so we need to add an import.
//
- File importedFile = resourceProvider.getFile(importedElements.path);
- Uri uri = uriConverter.pathToUri(importedFile.path);
- Source importedSource = importedFile.createSource(uri);
- String importUri =
- _getLibrarySourceUri(libraryElement, importedSource);
- _InsertionDescription description =
- _getInsertionDescription(importUri);
+ var importedFile = resourceProvider.getFile(importedElements.path);
+ var uri = uriConverter.pathToUri(importedFile.path);
+ var importedSource = importedFile.createSource(uri);
+ var importUri = _getLibrarySourceUri(libraryElement, importedSource);
+ var description = _getInsertionDescription(importUri);
builder.addInsertion(description.offset, (DartEditBuilder builder) {
- for (int i = 0; i < description.newLinesBefore; i++) {
+ for (var i = 0; i < description.newLinesBefore; i++) {
builder.writeln();
}
builder.write("import '");
@@ -84,7 +79,7 @@
builder.write(importedElements.prefix);
}
builder.write(';');
- for (int i = 0; i < description.newLinesAfter; i++) {
+ for (var i = 0; i < description.newLinesAfter; i++) {
builder.writeln();
}
});
@@ -96,30 +91,29 @@
//
// Compute the edits that need to be made.
//
- Map<ImportDirective, _ImportUpdate> updateMap =
- <ImportDirective, _ImportUpdate>{};
- for (String requiredName in importedElements.elements) {
+ var updateMap = <ImportDirective, _ImportUpdate>{};
+ for (var requiredName in importedElements.elements) {
_computeUpdate(updateMap, matchingImports, requiredName);
}
//
// Apply the edits.
//
- for (ImportDirective directive in updateMap.keys) {
- _ImportUpdate update = updateMap[directive];
- List<String> namesToUnhide = update.namesToUnhide;
- List<String> namesToShow = update.namesToShow;
+ for (var directive in updateMap.keys) {
+ var update = updateMap[directive];
+ var namesToUnhide = update.namesToUnhide;
+ var namesToShow = update.namesToShow;
namesToShow.sort();
- NodeList<Combinator> combinators = directive.combinators;
- int combinatorCount = combinators.length;
- for (int combinatorIndex = 0;
+ var combinators = directive.combinators;
+ var combinatorCount = combinators.length;
+ for (var combinatorIndex = 0;
combinatorIndex < combinatorCount;
combinatorIndex++) {
- Combinator combinator = combinators[combinatorIndex];
+ var combinator = combinators[combinatorIndex];
if (combinator is HideCombinator && namesToUnhide.isNotEmpty) {
- NodeList<SimpleIdentifier> hiddenNames = combinator.hiddenNames;
- int nameCount = hiddenNames.length;
- int first = -1;
- for (int nameIndex = 0; nameIndex < nameCount; nameIndex++) {
+ var hiddenNames = combinator.hiddenNames;
+ var nameCount = hiddenNames.length;
+ var first = -1;
+ for (var nameIndex = 0; nameIndex < nameCount; nameIndex++) {
if (namesToUnhide.contains(hiddenNames[nameIndex].name)) {
if (first < 0) {
first = nameIndex;
@@ -140,7 +134,7 @@
builder.addDeletion(range.startStart(
combinator, combinators[combinatorIndex + 1]));
} else {
- SyntacticEntity precedingNode = directive.prefix ??
+ var precedingNode = directive.prefix ??
directive.deferredKeyword ??
directive.uri;
if (precedingNode == null) {
@@ -164,7 +158,7 @@
// TODO(brianwilkerson) Add the names in alphabetic order.
builder.addInsertion(combinator.shownNames.last.end,
(DartEditBuilder builder) {
- for (String nameToShow in namesToShow) {
+ for (var nameToShow in namesToShow) {
builder.write(', ');
builder.write(nameToShow);
}
@@ -193,7 +187,7 @@
List<ImportDirective> matchingImports, String requiredName) {
/// Return `true` if the [requiredName] is in the given list of [names].
bool nameIn(NodeList<SimpleIdentifier> names) {
- for (SimpleIdentifier name in names) {
+ for (var name in names) {
if (name.name == requiredName) {
return true;
}
@@ -202,19 +196,19 @@
}
ImportDirective preferredDirective;
- int bestEditCount = -1;
- bool deleteHide = false;
- bool addShow = false;
+ var bestEditCount = -1;
+ var deleteHide = false;
+ var addShow = false;
- for (ImportDirective directive in matchingImports) {
- NodeList<Combinator> combinators = directive.combinators;
+ for (var directive in matchingImports) {
+ var combinators = directive.combinators;
if (combinators.isEmpty) {
return;
}
- bool hasHide = false;
- bool needsShow = false;
- int editCount = 0;
- for (Combinator combinator in combinators) {
+ var hasHide = false;
+ var needsShow = false;
+ var editCount = 0;
+ for (var combinator in combinators) {
if (combinator is HideCombinator) {
if (nameIn(combinator.hiddenNames)) {
hasHide = true;
@@ -237,7 +231,7 @@
}
}
- _ImportUpdate update = updateMap.putIfAbsent(
+ var update = updateMap.putIfAbsent(
preferredDirective, () => _ImportUpdate(preferredDirective));
if (deleteHide) {
update.unhide(requiredName);
@@ -253,23 +247,23 @@
/// name as in the original source.
List<ImportedElements> _filterImportedElements(
List<ImportedElements> originalList) {
- LibraryElement libraryElement = libraryResult.libraryElement;
- LibraryScope libraryScope = LibraryScope(libraryElement);
+ var libraryElement = libraryResult.libraryElement;
+ var libraryScope = LibraryScope(libraryElement);
AstFactory factory = AstFactoryImpl();
- List<ImportedElements> filteredList = <ImportedElements>[];
- for (ImportedElements elements in originalList) {
- List<String> originalElements = elements.elements;
- List<String> filteredElements = originalElements.toList();
- for (String name in originalElements) {
+ var filteredList = <ImportedElements>[];
+ for (var elements in originalList) {
+ var originalElements = elements.elements;
+ var filteredElements = originalElements.toList();
+ for (var name in originalElements) {
Identifier identifier = factory
.simpleIdentifier(StringToken(TokenType.IDENTIFIER, name, -1));
if (elements.prefix.isNotEmpty) {
- SimpleIdentifier prefix = factory.simpleIdentifier(
+ var prefix = factory.simpleIdentifier(
StringToken(TokenType.IDENTIFIER, elements.prefix, -1));
Token period = SimpleToken(TokenType.PERIOD, -1);
identifier = factory.prefixedIdentifier(prefix, period, identifier);
}
- Element element = libraryScope.lookup(identifier, libraryElement);
+ var element = libraryScope.lookup(identifier, libraryElement);
if (element != null) {
filteredElements.remove(name);
}
@@ -290,8 +284,8 @@
List<ImportDirective> _findMatchingImports(
List<ImportDirective> existingImports,
ImportedElements importedElements) {
- List<ImportDirective> matchingImports = <ImportDirective>[];
- for (ImportDirective existingImport in existingImports) {
+ var matchingImports = <ImportDirective>[];
+ for (var existingImport in existingImports) {
if (_matches(existingImport, importedElements)) {
matchingImports.add(existingImport);
}
@@ -304,11 +298,11 @@
///
/// Partially copied from DartFileEditBuilderImpl.
_InsertionDescription _getInsertionDescription(String importUri) {
- CompilationUnit unit = libraryResult.unit;
+ var unit = libraryResult.unit;
LibraryDirective libraryDirective;
- List<ImportDirective> importDirectives = <ImportDirective>[];
- List<Directive> otherDirectives = <Directive>[];
- for (Directive directive in unit.directives) {
+ var importDirectives = <ImportDirective>[];
+ var otherDirectives = <Directive>[];
+ for (var directive in unit.directives) {
if (directive is LibraryDirective) {
libraryDirective = directive;
} else if (directive is ImportDirective) {
@@ -336,17 +330,17 @@
///
/// Copied from DartFileEditBuilderImpl.
String _getLibrarySourceUri(LibraryElement from, Source what) {
- String whatPath = what.fullName;
+ var whatPath = what.fullName;
// check if an absolute URI (such as 'dart:' or 'package:')
- Uri whatUri = what.uri;
- String whatUriScheme = whatUri.scheme;
+ var whatUri = what.uri;
+ var whatUriScheme = whatUri.scheme;
if (whatUriScheme != '' && whatUriScheme != 'file') {
return whatUri.toString();
}
// compute a relative URI
- Context context = resourceProvider.pathContext;
- String fromFolder = context.dirname(from.source.fullName);
- String relativeFile = context.relative(whatPath, from: fromFolder);
+ var context = resourceProvider.pathContext;
+ var fromFolder = context.dirname(from.source.fullName);
+ var relativeFile = context.relative(whatPath, from: fromFolder);
return context.split(relativeFile).join('/');
}
@@ -354,7 +348,7 @@
/// [importedElements]. They will match if they import the same library using
/// the same prefix.
bool _matches(ImportDirective import, ImportedElements importedElements) {
- LibraryElement library = (import.element as ImportElement).importedLibrary;
+ var library = (import.element as ImportElement).importedLibrary;
return library != null &&
library.source.fullName == importedElements.path &&
(import.prefix?.name ?? '') == importedElements.prefix;
diff --git a/pkg/analysis_server/lib/src/computer/imported_elements_computer.dart b/pkg/analysis_server/lib/src/computer/imported_elements_computer.dart
index 265d349..8d9ac7b 100644
--- a/pkg/analysis_server/lib/src/computer/imported_elements_computer.dart
+++ b/pkg/analysis_server/lib/src/computer/imported_elements_computer.dart
@@ -30,7 +30,7 @@
if (_regionIncludesDirectives()) {
return const <ImportedElements>[];
}
- _Visitor visitor =
+ var visitor =
_Visitor(unit.declaredElement.library, offset, offset + length);
unit.accept(visitor);
return visitor.importedElements.values.toList();
@@ -40,7 +40,7 @@
/// really only needs to check for import and export directives, but excluding
/// other directives is unlikely to hurt the UX.
bool _regionIncludesDirectives() {
- NodeList<Directive> directives = unit.directives;
+ var directives = unit.directives;
if (directives.isEmpty) {
return false;
}
@@ -83,13 +83,13 @@
node.offset <= endOffset &&
node.end >= startOffset &&
!_isConstructorDeclarationReturnType(node)) {
- Element nodeElement = node.staticElement;
+ var nodeElement = node.staticElement;
if (nodeElement != null &&
nodeElement.enclosingElement is CompilationUnitElement) {
- LibraryElement nodeLibrary = nodeElement.library;
- String path = nodeLibrary.definingCompilationUnit.source.fullName;
- String prefix = '';
- AstNode parent = node.parent;
+ var nodeLibrary = nodeElement.library;
+ var path = nodeLibrary.definingCompilationUnit.source.fullName;
+ var prefix = '';
+ var parent = node.parent;
if (parent is PrefixedIdentifier && parent.identifier == node) {
prefix = _getPrefixFrom(parent.prefix);
} else if (parent is MethodInvocation &&
@@ -97,11 +97,11 @@
parent.target is SimpleIdentifier) {
prefix = _getPrefixFrom(parent.target);
}
- String key = '$prefix;$path';
- ImportedElements elements = importedElements.putIfAbsent(
+ var key = '$prefix;$path';
+ var elements = importedElements.putIfAbsent(
key, () => ImportedElements(path, prefix, <String>[]));
- List<String> elementNames = elements.elements;
- String elementName = nodeElement.name;
+ var elementNames = elements.elements;
+ var elementName = nodeElement.name;
if (!elementNames.contains(elementName)) {
elementNames.add(elementName);
}
@@ -111,7 +111,7 @@
String _getPrefixFrom(SimpleIdentifier identifier) {
if (identifier.offset <= endOffset && identifier.end >= startOffset) {
- Element prefixElement = identifier.staticElement;
+ var prefixElement = identifier.staticElement;
if (prefixElement is PrefixElement) {
return prefixElement.name;
}
@@ -120,7 +120,7 @@
}
static bool _isConstructorDeclarationReturnType(SimpleIdentifier node) {
- AstNode parent = node.parent;
+ var parent = node.parent;
return parent is ConstructorDeclaration && parent.returnType == node;
}
}
diff --git a/pkg/analysis_server/lib/src/computer/new_notifications.dart b/pkg/analysis_server/lib/src/computer/new_notifications.dart
index 6e74a42..31f80848 100644
--- a/pkg/analysis_server/lib/src/computer/new_notifications.dart
+++ b/pkg/analysis_server/lib/src/computer/new_notifications.dart
@@ -15,7 +15,7 @@
AnalysisServer analysisServer, ResolvedUnitResult result) {
var unit = result.unit;
if (unit != null) {
- NavigationCollectorImpl collector = NavigationCollectorImpl();
+ var collector = NavigationCollectorImpl();
computeDartNavigation(
analysisServer.resourceProvider, collector, unit, null, null);
collector.createRegions();
@@ -29,7 +29,7 @@
AnalysisServer analysisServer, ResolvedUnitResult result) {
var unit = result.unit;
if (unit != null) {
- OccurrencesCollectorImpl collector = OccurrencesCollectorImpl();
+ var collector = OccurrencesCollectorImpl();
addDartOccurrences(collector, unit);
var params = protocol.AnalysisOccurrencesParams(
result.path, collector.allOccurrences);
diff --git a/pkg/analysis_server/lib/src/context_manager.dart b/pkg/analysis_server/lib/src/context_manager.dart
index 31227d3..1a01fc1 100644
--- a/pkg/analysis_server/lib/src/context_manager.dart
+++ b/pkg/analysis_server/lib/src/context_manager.dart
@@ -7,7 +7,6 @@
import 'dart:core';
import 'package:analysis_server/src/plugin/notification_manager.dart';
-import 'package:analyzer/error/error.dart';
import 'package:analyzer/file_system/file_system.dart';
import 'package:analyzer/instrumentation/instrumentation.dart';
import 'package:analyzer/src/analysis_options/analysis_options_provider.dart';
@@ -128,7 +127,7 @@
/// Iterate through all [children] and their children, recursively.
Iterable<ContextInfo> get descendants sync* {
- for (ContextInfo child in children) {
+ for (var child in children) {
yield child;
yield* child.descendants;
}
@@ -152,7 +151,7 @@
/// Return the first [ContextInfo] in [children] whose associated folder is or
/// contains [path]. If there is no such [ContextInfo], return `null`.
ContextInfo findChildInfoFor(String path) {
- for (ContextInfo info in children) {
+ for (var info in children) {
if (info.folder.isOrContains(path)) {
return info;
}
@@ -181,7 +180,7 @@
/// any of its children.
bool _managesOrHasChildThatManages(String path) {
if (parent == null) {
- for (ContextInfo child in children) {
+ for (var child in children) {
if (child._managesOrHasChildThatManages(path)) {
return true;
}
@@ -191,7 +190,7 @@
if (!folder.isOrContains(path)) {
return false;
}
- for (ContextInfo child in children) {
+ for (var child in children) {
if (child._managesOrHasChildThatManages(path)) {
return true;
}
@@ -426,7 +425,7 @@
/// For testing: get the [ContextInfo] object for the given [folder], if any.
ContextInfo getContextInfoFor(Folder folder) {
- ContextInfo info = _getInnermostContextInfoFor(folder.path);
+ var info = _getInnermostContextInfoFor(folder.path);
if (info != null && folder == info.folder) {
return info;
}
@@ -440,19 +439,19 @@
@override
List<AnalysisDriver> getDriversInAnalysisRoot(Folder analysisRoot) {
- List<AnalysisDriver> drivers = <AnalysisDriver>[];
+ var drivers = <AnalysisDriver>[];
void addContextAndDescendants(ContextInfo info) {
drivers.add(info.analysisDriver);
info.children.forEach(addContextAndDescendants);
}
- ContextInfo innermostContainingInfo =
+ var innermostContainingInfo =
_getInnermostContextInfoFor(analysisRoot.path);
if (innermostContainingInfo != null) {
if (analysisRoot == innermostContainingInfo.folder) {
addContextAndDescendants(innermostContainingInfo);
} else {
- for (ContextInfo info in innermostContainingInfo.children) {
+ for (var info in innermostContainingInfo.children) {
if (analysisRoot.isOrContains(info.folder.path)) {
addContextAndDescendants(info);
}
@@ -466,13 +465,13 @@
/// context root, contains a folder whose name starts with '.'.
@override
bool isContainedInDotFolder(String path) {
- ContextInfo info = _getInnermostContextInfoFor(path);
+ var info = _getInnermostContextInfoFor(path);
return info != null && _isContainedInDotFolder(info.folder.path, path);
}
@override
bool isIgnored(String path) {
- ContextInfo info = rootInfo;
+ var info = rootInfo;
do {
info = info.findChildInfoFor(path);
if (info == null) {
@@ -491,7 +490,7 @@
return false;
}
// check if in one of the roots
- for (ContextInfo info in rootInfo.children) {
+ for (var info in rootInfo.children) {
if (info.folder.contains(path)) {
return true;
}
@@ -502,19 +501,19 @@
@override
int numberOfContextsInAnalysisRoot(Folder analysisRoot) {
- int count = 0;
+ var count = 0;
void addContextAndDescendants(ContextInfo info) {
count++;
info.children.forEach(addContextAndDescendants);
}
- ContextInfo innermostContainingInfo =
+ var innermostContainingInfo =
_getInnermostContextInfoFor(analysisRoot.path);
if (innermostContainingInfo != null) {
if (analysisRoot == innermostContainingInfo.folder) {
addContextAndDescendants(innermostContainingInfo);
} else {
- for (ContextInfo info in innermostContainingInfo.children) {
+ for (var info in innermostContainingInfo.children) {
if (analysisRoot.isOrContains(info.folder.path)) {
addContextAndDescendants(info);
}
@@ -532,7 +531,7 @@
}
// Check for embedded options.
- YamlMap embeddedOptions = _getEmbeddedOptions(info);
+ var embeddedOptions = _getEmbeddedOptions(info);
if (embeddedOptions != null) {
options = Merger().merge(embeddedOptions, options);
}
@@ -548,7 +547,7 @@
@override
void refresh(List<Resource> roots) {
// Destroy old contexts
- List<ContextInfo> contextInfos = rootInfo.descendants.toList();
+ var contextInfos = rootInfo.descendants.toList();
if (roots == null) {
contextInfos.forEach(_destroyContext);
} else {
@@ -581,26 +580,25 @@
// filesystem. Ignore any package root sources that aren't folders.
normalizedPackageRoots = <String, String>{};
packageRoots.forEach((String sourcePath, String targetPath) {
- Resource resource = resourceProvider.getResource(sourcePath);
+ var resource = resourceProvider.getResource(sourcePath);
if (resource is Folder) {
normalizedPackageRoots[resource.path] = targetPath;
}
});
- List<ContextInfo> contextInfos = rootInfo.descendants.toList();
+ var contextInfos = rootInfo.descendants.toList();
// included
- List<Folder> includedFolders = <Folder>[];
+ var includedFolders = <Folder>[];
{
// Sort paths to ensure that outer roots are handled before inner roots,
// so we can correctly ignore inner roots, which are already managed
// by outer roots.
- LinkedHashSet<String> uniqueIncludedPaths =
- LinkedHashSet<String>.from(includedPaths);
- List<String> sortedIncludedPaths = uniqueIncludedPaths.toList();
+ var uniqueIncludedPaths = LinkedHashSet<String>.from(includedPaths);
+ var sortedIncludedPaths = uniqueIncludedPaths.toList();
sortedIncludedPaths.sort((a, b) => a.length - b.length);
// Convert paths to folders.
- for (String path in sortedIncludedPaths) {
- Resource resource = resourceProvider.getResource(path);
+ for (var path in sortedIncludedPaths) {
+ var resource = resourceProvider.getResource(path);
if (resource is Folder) {
includedFolders.add(resource);
} else if (!resource.exists) {
@@ -616,11 +614,11 @@
}
this.includedPaths = includedPaths;
// excluded
- List<String> oldExcludedPaths = this.excludedPaths;
+ var oldExcludedPaths = this.excludedPaths;
this.excludedPaths = excludedPaths;
// destroy old contexts
- for (ContextInfo contextInfo in contextInfos) {
- bool isIncluded = includedFolders.any((folder) {
+ for (var contextInfo in contextInfos) {
+ var isIncluded = includedFolders.any((folder) {
return folder.isOrContains(contextInfo.folder.path);
});
if (!isIncluded) {
@@ -628,26 +626,26 @@
}
}
// Update package roots for existing contexts
- for (ContextInfo info in rootInfo.descendants) {
- String newPackageRoot = normalizedPackageRoots[info.folder.path];
+ for (var info in rootInfo.descendants) {
+ var newPackageRoot = normalizedPackageRoots[info.folder.path];
if (info.packageRoot != newPackageRoot) {
info.packageRoot = newPackageRoot;
_recomputeFolderDisposition(info);
}
}
// create new contexts
- for (Folder includedFolder in includedFolders) {
- String includedPath = includedFolder.path;
- bool isManaged = rootInfo._managesOrHasChildThatManages(includedPath);
+ for (var includedFolder in includedFolders) {
+ var includedPath = includedFolder.path;
+ var isManaged = rootInfo._managesOrHasChildThatManages(includedPath);
if (!isManaged) {
- ContextInfo parent = _getParentForNewContext(includedPath);
+ var parent = _getParentForNewContext(includedPath);
changeSubscriptions[includedFolder] = includedFolder.changes
.listen(_handleWatchEvent, onError: _handleWatchInterruption);
_createContexts(parent, includedFolder, excludedPaths, false);
}
}
// remove newly excluded sources
- for (ContextInfo info in rootInfo.descendants) {
+ for (var info in rootInfo.descendants) {
// prepare excluded sources
Map<String, Source> excludedSources = HashMap<String, Source>();
info.sources.forEach((String path, Source source) {
@@ -657,7 +655,7 @@
}
});
// apply exclusion
- ChangeSet changeSet = ChangeSet();
+ var changeSet = ChangeSet();
excludedSources.forEach((String path, Source source) {
info.sources.remove(path);
changeSet.removedSource(path);
@@ -665,8 +663,8 @@
callbacks.applyChangesToContext(info.folder, changeSet);
}
// add previously excluded sources
- for (ContextInfo info in rootInfo.descendants) {
- ChangeSet changeSet = ChangeSet();
+ for (var info in rootInfo.descendants) {
+ var changeSet = ChangeSet();
_addPreviouslyExcludedSources(
info, changeSet, info.folder, oldExcludedPaths);
callbacks.applyChangesToContext(info.folder, changeSet);
@@ -687,8 +685,8 @@
// do.
return;
}
- for (Resource child in children) {
- String path = child.path;
+ for (var child in children) {
+ var path = child.path;
// Path is being ignored.
if (info.ignored(path)) {
continue;
@@ -700,13 +698,13 @@
continue;
}
// ignore if was not excluded
- bool wasExcluded = _isExcludedBy(oldExcludedPaths, path) &&
+ var wasExcluded = _isExcludedBy(oldExcludedPaths, path) &&
!_isExcludedBy(excludedPaths, path);
if (!wasExcluded) {
continue;
}
// do add the file
- Source source = createSourceInContext(info.analysisDriver, child);
+ var source = createSourceInContext(info.analysisDriver, child);
changeSet.addedSource(child.path);
info.sources[path] = source;
} else if (child is Folder) {
@@ -730,8 +728,8 @@
// are no children that need to be added.
return;
}
- for (Resource child in children) {
- String path = child.path;
+ for (var child in children) {
+ var path = child.path;
// ignore excluded files or folders
if (_isExcluded(path) || info.excludes(path) || info.ignored(path)) {
continue;
@@ -739,7 +737,7 @@
// add files, recurse into folders
if (child is File) {
if (_shouldFileBeAnalyzed(child)) {
- Source source = createSourceInContext(info.analysisDriver, child);
+ var source = createSourceInContext(info.analysisDriver, child);
changeSet.addedSource(child.path);
info.sources[path] = source;
}
@@ -754,13 +752,13 @@
void _analyzeAnalysisOptionsFile(AnalysisDriver driver, String path) {
List<protocol.AnalysisError> convertedErrors;
try {
- String content = _readFile(path);
- LineInfo lineInfo = _computeLineInfo(content);
- List<AnalysisError> errors = analyzeAnalysisOptions(
+ var content = _readFile(path);
+ var lineInfo = _computeLineInfo(content);
+ var errors = analyzeAnalysisOptions(
resourceProvider.getFile(path).createSource(),
content,
driver.sourceFactory);
- AnalyzerConverter converter = AnalyzerConverter();
+ var converter = AnalyzerConverter();
convertedErrors = converter.convertAnalysisErrors(errors,
lineInfo: lineInfo, options: driver.analysisOptions);
} catch (exception) {
@@ -778,13 +776,13 @@
void _analyzeManifestFile(AnalysisDriver driver, String path) {
List<protocol.AnalysisError> convertedErrors;
try {
- String content = _readFile(path);
- ManifestValidator validator =
+ var content = _readFile(path);
+ var validator =
ManifestValidator(resourceProvider.getFile(path).createSource());
- LineInfo lineInfo = _computeLineInfo(content);
- List<AnalysisError> errors = validator.validate(
+ var lineInfo = _computeLineInfo(content);
+ var errors = validator.validate(
content, driver.analysisOptions.chromeOsManifestChecks);
- AnalyzerConverter converter = AnalyzerConverter();
+ var converter = AnalyzerConverter();
convertedErrors = converter.convertAnalysisErrors(errors,
lineInfo: lineInfo, options: driver.analysisOptions);
} catch (exception) {
@@ -802,14 +800,14 @@
void _analyzePubspecFile(AnalysisDriver driver, String path) {
List<protocol.AnalysisError> convertedErrors;
try {
- String content = _readFile(path);
- YamlNode node = loadYamlNode(content);
+ var content = _readFile(path);
+ var node = loadYamlNode(content);
if (node is YamlMap) {
- PubspecValidator validator = PubspecValidator(
+ var validator = PubspecValidator(
resourceProvider, resourceProvider.getFile(path).createSource());
- LineInfo lineInfo = _computeLineInfo(content);
- List<AnalysisError> errors = validator.validate(node.nodes);
- AnalyzerConverter converter = AnalyzerConverter();
+ var lineInfo = _computeLineInfo(content);
+ var errors = validator.validate(node.nodes);
+ var converter = AnalyzerConverter();
convertedErrors = converter.convertAnalysisErrors(errors,
lineInfo: lineInfo, options: driver.analysisOptions);
}
@@ -825,7 +823,7 @@
void _checkForAnalysisOptionsUpdate(String path, ContextInfo info) {
if (AnalysisEngine.isAnalysisOptionsFileName(path, pathContext)) {
- AnalysisDriver driver = info.analysisDriver;
+ var driver = info.analysisDriver;
if (driver == null) {
// I suspect that this happens as a result of a race condition: server
// has determined that the file (at [path]) is in a context, but hasn't
@@ -840,7 +838,7 @@
void _checkForManifestUpdate(String path, ContextInfo info) {
if (_isManifest(path)) {
- AnalysisDriver driver = info.analysisDriver;
+ var driver = info.analysisDriver;
if (driver == null) {
// I suspect that this happens as a result of a race condition: server
// has determined that the file (at [path]) is in a context, but hasn't
@@ -855,7 +853,7 @@
// Check to see if this is the .packages file for this context and if so,
// update the context's source factory.
if (pathContext.basename(path) == PACKAGE_SPEC_NAME) {
- AnalysisDriver driver = info.analysisDriver;
+ var driver = info.analysisDriver;
if (driver == null) {
// I suspect that this happens as a result of a race condition: server
// has determined that the file (at [path]) is in a context, but hasn't
@@ -869,7 +867,7 @@
void _checkForPubspecUpdate(String path, ContextInfo info) {
if (_isPubspec(path)) {
- AnalysisDriver driver = info.analysisDriver;
+ var driver = info.analysisDriver;
if (driver == null) {
// I suspect that this happens as a result of a race condition: server
// has determined that the file (at [path]) is in a context, but hasn't
@@ -886,9 +884,9 @@
/// orphaned by this context being removed (no other context includes this
/// file.)
List<String> _computeFlushedFiles(ContextInfo info) {
- Set<String> flushedFiles = info.analysisDriver.addedFiles.toSet();
- for (ContextInfo contextInfo in rootInfo.descendants) {
- AnalysisDriver other = contextInfo.analysisDriver;
+ var flushedFiles = info.analysisDriver.addedFiles.toSet();
+ for (var contextInfo in rootInfo.descendants) {
+ var other = contextInfo.analysisDriver;
if (other != info.analysisDriver) {
flushedFiles.removeAll(other.addedFiles);
}
@@ -905,14 +903,14 @@
/// dependencies (currently we only use it to track "pub list" dependencies).
FolderDisposition _computeFolderDisposition(Folder folder,
void Function(String path) addDependency, File packagespecFile) {
- String packageRoot = normalizedPackageRoots[folder.path];
+ var packageRoot = normalizedPackageRoots[folder.path];
if (packageRoot != null) {
// TODO(paulberry): We shouldn't be using JavaFile here because it
// makes the code untestable (see dartbug.com/23909).
- JavaFile packagesDirOrFile = JavaFile(packageRoot);
- Map<String, List<Folder>> packageMap = <String, List<Folder>>{};
+ var packagesDirOrFile = JavaFile(packageRoot);
+ var packageMap = <String, List<Folder>>{};
if (packagesDirOrFile.isDirectory()) {
- for (JavaFile file in packagesDirOrFile.listFiles()) {
+ for (var file in packagesDirOrFile.listFiles()) {
// Ensure symlinks in packages directory are canonicalized
// to prevent 'type X cannot be assigned to type X' warnings
String path;
@@ -923,15 +921,15 @@
_instrumentationService.logException(e, s);
continue;
}
- Resource res = resourceProvider.getResource(path);
+ var res = resourceProvider.getResource(path);
if (res is Folder) {
packageMap[file.getName()] = <Folder>[res];
}
}
return PackageMapDisposition(packageMap, packageRoot: packageRoot);
} else if (packagesDirOrFile.isFile()) {
- File packageSpecFile = resourceProvider.getFile(packageRoot);
- Packages packages = parsePackagesFile(
+ var packageSpecFile = resourceProvider.getFile(packageRoot);
+ var packages = parsePackagesFile(
resourceProvider,
packageSpecFile,
);
@@ -948,7 +946,7 @@
} else {
// Try .packages first.
if (pathContext.basename(packagespecFile.path) == PACKAGE_SPEC_NAME) {
- Packages packages = parsePackagesFile(
+ var packages = parsePackagesFile(
resourceProvider,
packagespecFile,
);
@@ -961,7 +959,7 @@
/// Compute line information for the given [content].
LineInfo _computeLineInfo(String content) {
- List<int> lineStarts = StringUtilities.computeLineStarts(content);
+ var lineStarts = StringUtilities.computeLineStarts(content);
return LineInfo(lineStarts);
}
@@ -975,11 +973,11 @@
}
}
- List<UriResolver> resolvers = <UriResolver>[
+ var resolvers = <UriResolver>[
ResourceUriResolver(resourceProvider),
PackageMapUriResolver(resourceProvider, packageMap),
];
- SourceFactory sourceFactory = SourceFactory(resolvers);
+ var sourceFactory = SourceFactory(resolvers);
return AnalysisOptionsProvider(sourceFactory);
}
@@ -987,17 +985,16 @@
/// [parent] and using [packagesFile] to resolve package URI's.
ContextInfo _createContext(ContextInfo parent, Folder folder,
List<String> excludedPaths, File packagesFile) {
- List<String> dependencies = <String>[];
- FolderDisposition disposition =
+ var dependencies = <String>[];
+ var disposition =
_computeFolderDisposition(folder, dependencies.add, packagesFile);
- ContextInfo info = ContextInfo(this, parent, folder, packagesFile,
+ var info = ContextInfo(this, parent, folder, packagesFile,
normalizedPackageRoots[folder.path], disposition);
File optionsFile;
YamlMap optionMap;
try {
- AnalysisOptionsProvider provider =
- _createAnalysisOptionsProvider(disposition.packages);
+ var provider = _createAnalysisOptionsProvider(disposition.packages);
optionsFile = provider.getOptionsFile(info.folder, crawlUp: true);
if (optionsFile != null) {
optionMap = provider.getOptionsFromFile(optionsFile);
@@ -1009,13 +1006,13 @@
applyToAnalysisOptions(options, optionMap);
info.setDependencies(dependencies);
- String includedPath = folder.path;
- List<String> containedExcludedPaths = excludedPaths
+ var includedPath = folder.path;
+ var containedExcludedPaths = excludedPaths
.where((String excludedPath) =>
pathContext.isWithin(includedPath, excludedPath))
.toList();
processOptionsForDriver(info, options, optionMap);
- ContextRoot contextRoot = ContextRoot(folder.path, containedExcludedPaths,
+ var contextRoot = ContextRoot(folder.path, containedExcludedPaths,
pathContext: pathContext);
if (optionsFile != null) {
contextRoot.optionsFilePath = optionsFile.path;
@@ -1025,7 +1022,7 @@
if (optionsFile != null) {
_analyzeAnalysisOptionsFile(info.analysisDriver, optionsFile.path);
}
- File pubspecFile = folder.getChildAssumingFile(PUBSPEC_NAME);
+ var pubspecFile = folder.getChildAssumingFile(PUBSPEC_NAME);
if (pubspecFile.exists) {
_analyzePubspecFile(info.analysisDriver, pubspecFile.path);
}
@@ -1071,8 +1068,8 @@
}
// Decide whether a context needs to be created for [folder] here, and if
// so, create it.
- File packageSpec = _findPackageSpecFile(folder);
- bool createContext = packageSpec.exists || !withPackageSpecOnly;
+ var packageSpec = _findPackageSpecFile(folder);
+ var createContext = packageSpec.exists || !withPackageSpecOnly;
if (withPackageSpecOnly &&
packageSpec.exists &&
parent != null &&
@@ -1086,7 +1083,7 @@
// Try to find subfolders with pubspecs or .packages files.
try {
- for (Resource child in folder.getChildren()) {
+ for (var child in folder.getChildren()) {
if (child is Folder) {
if (!parent.ignored(child.path)) {
_createContexts(parent, child, excludedPaths, true);
@@ -1101,7 +1098,7 @@
if (createContext) {
// Now that the child contexts have been created, add the sources that
// don't belong to the children.
- ChangeSet changeSet = ChangeSet();
+ var changeSet = ChangeSet();
_addSourceFiles(changeSet, folder, parent);
callbacks.applyChangesToContext(folder, changeSet);
}
@@ -1110,7 +1107,7 @@
/// Set up a [SourceFactory] that resolves packages as appropriate for the
/// given [folder].
SourceFactory _createSourceFactory(AnalysisOptions options, Folder folder) {
- ContextBuilder builder = callbacks.createContextBuilder(folder, options);
+ var builder = callbacks.createContextBuilder(folder, options);
return builder.createSourceFactory(folder.path, options);
}
@@ -1118,14 +1115,14 @@
void _destroyContext(ContextInfo info) {
changeSubscriptions.remove(info.folder)?.cancel();
callbacks.removeContext(info.folder, _computeFlushedFiles(info));
- bool wasRemoved = info.parent.children.remove(info);
+ var wasRemoved = info.parent.children.remove(info);
assert(wasRemoved);
}
/// Extract a new [packagespecFile]-based context from [oldInfo].
void _extractContext(ContextInfo oldInfo, File packagespecFile) {
- Folder newFolder = packagespecFile.parent;
- ContextInfo newInfo =
+ var newFolder = packagespecFile.parent;
+ var newInfo =
_createContext(oldInfo, newFolder, excludedPaths, packagespecFile);
// prepare sources to extract
Map<String, Source> extractedSources = HashMap<String, Source>();
@@ -1136,7 +1133,7 @@
});
// update new context
{
- ChangeSet changeSet = ChangeSet();
+ var changeSet = ChangeSet();
extractedSources.forEach((path, source) {
newInfo.sources[path] = source;
changeSet.addedSource(path);
@@ -1145,7 +1142,7 @@
}
// update old context
{
- ChangeSet changeSet = ChangeSet();
+ var changeSet = ChangeSet();
extractedSources.forEach((path, source) {
oldInfo.sources.remove(path);
changeSet.removedSource(path);
@@ -1183,9 +1180,8 @@
/// Returns null if there are no embedded/configured options.
YamlMap _getEmbeddedOptions(ContextInfo info) {
Map embeddedOptions;
- EmbedderYamlLocator locator =
- info.disposition.getEmbedderLocator(resourceProvider);
- Iterable<YamlMap> maps = locator.embedderYamls.values;
+ var locator = info.disposition.getEmbedderLocator(resourceProvider);
+ var maps = locator.embedderYamls.values;
if (maps.length == 1) {
embeddedOptions = maps.first;
}
@@ -1200,12 +1196,12 @@
///
/// If no context contains the given path, `null` is returned.
ContextInfo _getInnermostContextInfoFor(String path) {
- ContextInfo info = rootInfo.findChildInfoFor(path);
+ var info = rootInfo.findChildInfoFor(path);
if (info == null) {
return null;
}
while (true) {
- ContextInfo childInfo = info.findChildInfoFor(path);
+ var childInfo = info.findChildInfoFor(path);
if (childInfo == null) {
return info;
}
@@ -1215,7 +1211,7 @@
/// Return the parent for a new [ContextInfo] with the given [path] folder.
ContextInfo _getParentForNewContext(String path) {
- ContextInfo parent = _getInnermostContextInfoFor(path);
+ var parent = _getInnermostContextInfoFor(path);
if (parent != null) {
return parent;
}
@@ -1234,9 +1230,9 @@
// but implicitly referenced in another context, we will only send a
// changeSet to the context that explicitly includes the file (because
// that's the only context that's watching the file).
- String path = event.path;
- ChangeType type = event.type;
- ContextInfo info = _getInnermostContextInfoFor(path);
+ var path = event.path;
+ var type = event.type;
+ var info = _getInnermostContextInfoFor(path);
if (info == null) {
// This event doesn't apply to any context. This could happen due to a
// race condition (e.g. a context was removed while one of its events was
@@ -1267,9 +1263,9 @@
// handle the change
switch (type) {
case ChangeType.ADD:
- Resource resource = resourceProvider.getResource(path);
+ var resource = resourceProvider.getResource(path);
- String directoryPath = pathContext.dirname(path);
+ var directoryPath = pathContext.dirname(path);
// Check to see if we need to create a new context.
if (info.isTopLevel) {
@@ -1311,7 +1307,7 @@
// contexts. Note that it's important to verify that there is NEITHER a
// .packages nor a lingering pubspec.yaml before merging.
if (!info.isTopLevel) {
- String directoryPath = pathContext.dirname(path);
+ var directoryPath = pathContext.dirname(path);
// Only merge if this is the same directory described by our info
// object.
@@ -1337,17 +1333,17 @@
}
}
- Resource resource = resourceProvider.getResource(path);
+ var resource = resourceProvider.getResource(path);
if (resource is File &&
_shouldFileBeAnalyzed(resource, mustExist: false)) {
callbacks.applyFileRemoved(info.analysisDriver, path);
}
break;
case ChangeType.MODIFY:
- Resource resource = resourceProvider.getResource(path);
+ var resource = resourceProvider.getResource(path);
if (resource is File) {
if (_shouldFileBeAnalyzed(resource)) {
- for (AnalysisDriver driver in driverMap.values) {
+ for (var driver in driverMap.values) {
driver.changeFile(path);
}
break;
@@ -1372,11 +1368,11 @@
/// Determine whether the given [path], when interpreted relative to the
/// context root [root], contains a folder whose name starts with '.'.
bool _isContainedInDotFolder(String root, String path) {
- String pathDir = pathContext.dirname(path);
- String rootPrefix = root + pathContext.separator;
+ var pathDir = pathContext.dirname(path);
+ var rootPrefix = root + pathContext.separator;
if (pathDir.startsWith(rootPrefix)) {
- String suffixPath = pathDir.substring(rootPrefix.length);
- for (String pathComponent in pathContext.split(suffixPath)) {
+ var suffixPath = pathDir.substring(rootPrefix.length);
+ for (var pathComponent in pathContext.split(suffixPath)) {
if (pathComponent.startsWith('.')) {
return true;
}
@@ -1401,9 +1397,9 @@
/// Determine whether the given [path] is in the direct 'doc' folder of the
/// context root [root].
bool _isInTopLevelDocDir(String root, String path) {
- String rootPrefix = root + pathContext.separator;
+ var rootPrefix = root + pathContext.separator;
if (path.startsWith(rootPrefix)) {
- String suffix = path.substring(rootPrefix.length);
+ var suffix = path.substring(rootPrefix.length);
return suffix == DOC_DIR_NAME ||
suffix.startsWith(DOC_DIR_NAME + pathContext.separator);
}
@@ -1422,10 +1418,10 @@
// destroy the context
_destroyContext(info);
// add files to the parent context
- ContextInfo parentInfo = info.parent;
+ var parentInfo = info.parent;
if (parentInfo != null) {
parentInfo.children.remove(info);
- ChangeSet changeSet = ChangeSet();
+ var changeSet = ChangeSet();
info.sources.forEach((path, source) {
parentInfo.sources[path] = source;
changeSet.addedSource(path);
@@ -1447,14 +1443,14 @@
// asynchronous API call, we'll want to suspend analysis for this context
// while we're rerunning "pub list", since any analysis we complete while
// "pub list" is in progress is just going to get thrown away anyhow.
- List<String> dependencies = <String>[];
+ var dependencies = <String>[];
info.setDependencies(dependencies);
_updateContextPackageUriResolver(info.folder);
}
/// Return `true` if the given [file] should be analyzed.
bool _shouldFileBeAnalyzed(File file, {bool mustExist = true}) {
- for (Glob glob in analyzedFilesGlobs) {
+ for (var glob in analyzedFilesGlobs) {
if (glob.matches(file.path)) {
// Emacs creates dummy links to track the fact that a file is open for
// editing and has unsaved changes (e.g. having unsaved changes to
@@ -1469,21 +1465,21 @@
}
void _updateAnalysisOptions(ContextInfo info) {
- AnalysisDriver driver = info.analysisDriver;
- String contextRoot = info.folder.path;
- ContextBuilder builder =
+ var driver = info.analysisDriver;
+ var contextRoot = info.folder.path;
+ var builder =
callbacks.createContextBuilder(info.folder, defaultContextOptions);
- AnalysisOptions options = builder.getAnalysisOptions(contextRoot,
+ var options = builder.getAnalysisOptions(contextRoot,
contextRoot: driver.contextRoot);
- SourceFactory factory = builder.createSourceFactory(contextRoot, options);
+ var factory = builder.createSourceFactory(contextRoot, options);
driver.configure(analysisOptions: options, sourceFactory: factory);
callbacks.analysisOptionsUpdated(driver);
}
void _updateContextPackageUriResolver(Folder contextFolder) {
- ContextInfo info = getContextInfoFor(contextFolder);
- AnalysisDriver driver = info.analysisDriver;
- SourceFactory sourceFactory =
+ var info = getContextInfoFor(contextFolder);
+ var driver = info.analysisDriver;
+ var sourceFactory =
_createSourceFactory(driver.analysisOptions, contextFolder);
driver.configure(sourceFactory: sourceFactory);
}
@@ -1493,11 +1489,11 @@
static Source createSourceInContext(AnalysisDriver driver, File file) {
// TODO(brianwilkerson) Optimize this, by allowing support for source
// factories to restore URI's from a file path rather than a source.
- Source source = file.createSource();
+ var source = file.createSource();
if (driver == null) {
return source;
}
- Uri uri = driver.sourceFactory.restoreUri(source);
+ var uri = driver.sourceFactory.restoreUri(source);
return file.createSource(uri);
}
}
@@ -1621,7 +1617,7 @@
Iterable<UriResolver> createPackageUriResolvers(
ResourceProvider resourceProvider) {
if (packages != null) {
- Map<String, List<Folder>> packageMap = buildPackageMap(resourceProvider);
+ var packageMap = buildPackageMap(resourceProvider);
return <UriResolver>[
PackageMapUriResolver(resourceProvider, packageMap),
];
diff --git a/pkg/analysis_server/lib/src/domain_abstract.dart b/pkg/analysis_server/lib/src/domain_abstract.dart
index 002ef7a..1bf5c678 100644
--- a/pkg/analysis_server/lib/src/domain_abstract.dart
+++ b/pkg/analysis_server/lib/src/domain_abstract.dart
@@ -37,13 +37,13 @@
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// TODO(brianwilkerson) requestParameters might need to be required.
- int endTime = DateTime.now().millisecondsSinceEpoch + timeout;
- List<plugin.Response> responses = <plugin.Response>[];
- for (PluginInfo pluginInfo in futures.keys) {
- Future<plugin.Response> future = futures[pluginInfo];
+ var endTime = DateTime.now().millisecondsSinceEpoch + timeout;
+ var responses = <plugin.Response>[];
+ for (var pluginInfo in futures.keys) {
+ var future = futures[pluginInfo];
try {
- int startTime = DateTime.now().millisecondsSinceEpoch;
- plugin.Response response = await future
+ var startTime = DateTime.now().millisecondsSinceEpoch;
+ var response = await future
.timeout(Duration(milliseconds: math.max(endTime - startTime, 0)));
if (response.error != null) {
// TODO(brianwilkerson) Report the error to the plugin manager.
diff --git a/pkg/analysis_server/lib/src/domain_analysis.dart b/pkg/analysis_server/lib/src/domain_analysis.dart
index 28dd31c..6351adc 100644
--- a/pkg/analysis_server/lib/src/domain_analysis.dart
+++ b/pkg/analysis_server/lib/src/domain_analysis.dart
@@ -12,15 +12,12 @@
import 'package:analysis_server/src/computer/imported_elements_computer.dart';
import 'package:analysis_server/src/domain_abstract.dart';
import 'package:analysis_server/src/domains/analysis/navigation_dart.dart';
-import 'package:analysis_server/src/plugin/plugin_manager.dart';
import 'package:analysis_server/src/plugin/request_converter.dart';
import 'package:analysis_server/src/plugin/result_merger.dart';
import 'package:analysis_server/src/protocol/protocol_internal.dart';
import 'package:analysis_server/src/protocol_server.dart';
import 'package:analyzer/dart/analysis/results.dart';
-import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/error/error.dart' as engine;
-import 'package:analyzer/src/dart/analysis/driver.dart';
import 'package:analyzer/src/generated/engine.dart' as engine;
import 'package:analyzer_plugin/protocol/protocol.dart' as plugin;
import 'package:analyzer_plugin/protocol/protocol_common.dart';
@@ -40,20 +37,20 @@
/// Implement the `analysis.getErrors` request.
Future<void> getErrors(Request request) async {
- String file = AnalysisGetErrorsParams.fromRequest(request).file;
+ var file = AnalysisGetErrorsParams.fromRequest(request).file;
if (server.sendResponseErrorIfInvalidFilePath(request, file)) {
return;
}
- ResolvedUnitResult result = await server.getResolvedUnit(file);
+ var result = await server.getResolvedUnit(file);
if (result?.state != ResultState.VALID) {
server.sendResponse(Response.getErrorsInvalidFile(request));
return;
}
- List<AnalysisError> protocolErrors = doAnalysisError_listFromEngine(result);
+ var protocolErrors = doAnalysisError_listFromEngine(result);
server.sendResponse(
AnalysisGetErrorsResult(protocolErrors).toResponse(request.id));
}
@@ -70,13 +67,13 @@
}
// Prepare the resolved units.
- ResolvedUnitResult result = await server.getResolvedUnit(file);
- CompilationUnit unit = result?.unit;
+ var result = await server.getResolvedUnit(file);
+ var unit = result?.unit;
// Prepare the hovers.
- List<HoverInformation> hovers = <HoverInformation>[];
+ var hovers = <HoverInformation>[];
if (unit != null) {
- HoverInformation hoverInformation = DartUnitHoverComputer(
+ var hoverInformation = DartUnitHoverComputer(
server.getDartdocDirectiveInfoFor(result), unit, params.offset)
.compute();
if (hoverInformation != null) {
@@ -102,7 +99,7 @@
//
// Prepare the resolved unit.
//
- ResolvedUnitResult result = await server.getResolvedUnit(file);
+ var result = await server.getResolvedUnit(file);
if (result?.state != ResultState.VALID) {
server.sendResponse(Response.getImportedElementsInvalidFile(request));
return;
@@ -153,34 +150,33 @@
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
var params = AnalysisGetNavigationParams.fromRequest(request);
- String file = params.file;
- int offset = params.offset;
- int length = params.length;
+ var file = params.file;
+ var offset = params.offset;
+ var length = params.length;
if (server.sendResponseErrorIfInvalidFilePath(request, file)) {
return;
}
- AnalysisDriver driver = server.getAnalysisDriver(file);
+ var driver = server.getAnalysisDriver(file);
if (driver == null) {
server.sendResponse(Response.getNavigationInvalidFile(request));
} else {
//
// Allow plugins to start computing navigation data.
//
- plugin.AnalysisGetNavigationParams requestParams =
+ var requestParams =
plugin.AnalysisGetNavigationParams(file, offset, length);
- Map<PluginInfo, Future<plugin.Response>> pluginFutures = server
- .pluginManager
+ var pluginFutures = server.pluginManager
.broadcastRequest(requestParams, contextRoot: driver.contextRoot);
//
// Compute navigation data generated by server.
//
- List<AnalysisNavigationParams> allResults = <AnalysisNavigationParams>[];
- ResolvedUnitResult result = await server.getResolvedUnit(file);
+ var allResults = <AnalysisNavigationParams>[];
+ var result = await server.getResolvedUnit(file);
if (result?.state == ResultState.VALID) {
- CompilationUnit unit = result?.unit;
- NavigationCollectorImpl collector = NavigationCollectorImpl();
+ var unit = result?.unit;
+ var collector = NavigationCollectorImpl();
computeDartNavigation(
server.resourceProvider, collector, unit, offset, length);
collector.createRegions();
@@ -192,10 +188,10 @@
// navigation data.
//
if (pluginFutures != null) {
- List<plugin.Response> responses = await waitForResponses(pluginFutures,
+ var responses = await waitForResponses(pluginFutures,
requestParameters: requestParams);
- for (plugin.Response response in responses) {
- plugin.AnalysisGetNavigationResult result =
+ for (var response in responses) {
+ var result =
plugin.AnalysisGetNavigationResult.fromResponse(response);
allResults.add(AnalysisNavigationParams(
file, result.regions, result.targets, result.files));
@@ -204,9 +200,8 @@
//
// Return the result.
//
- ResultMerger merger = ResultMerger();
- AnalysisNavigationParams mergedResults =
- merger.mergeNavigation(allResults);
+ var merger = ResultMerger();
+ var mergedResults = merger.mergeNavigation(allResults);
if (mergedResults == null) {
server.sendResponse(AnalysisGetNavigationResult(
<String>[], <NavigationTarget>[], <NavigationRegion>[])
@@ -246,7 +241,7 @@
}
// Prepare the resolved units.
- ResolvedUnitResult result = await server.getResolvedUnit(file);
+ var result = await server.getResolvedUnit(file);
if (result?.state != ResultState.VALID) {
server.sendResponse(Response.getSignatureInvalidFile(request));
@@ -275,7 +270,7 @@
@override
Response handleRequest(Request request) {
try {
- String requestName = request.method;
+ var requestName = request.method;
if (requestName == ANALYSIS_REQUEST_GET_ERRORS) {
getErrors(request);
return Response.DELAYED_RESPONSE;
@@ -336,25 +331,24 @@
/// Implement the 'analysis.setAnalysisRoots' request.
Response setAnalysisRoots(Request request) {
var params = AnalysisSetAnalysisRootsParams.fromRequest(request);
- List<String> includedPathList = params.included;
- List<String> excludedPathList = params.excluded;
+ var includedPathList = params.included;
+ var excludedPathList = params.excluded;
server.options.analytics?.sendEvent('analysis', 'setAnalysisRoots',
value: includedPathList.length);
// validate
- for (String path in includedPathList) {
+ for (var path in includedPathList) {
if (!server.isValidFilePath(path)) {
return Response.invalidFilePathFormat(request, path);
}
}
- for (String path in excludedPathList) {
+ for (var path in excludedPathList) {
if (!server.isValidFilePath(path)) {
return Response.invalidFilePathFormat(request, path);
}
}
- Map<String, String> packageRoots =
- params.packageRoots ?? <String, String>{};
+ var packageRoots = params.packageRoots ?? <String, String>{};
if (server.detachableFileSystemManager != null) {
server.detachableFileSystemManager.setAnalysisRoots(
@@ -368,8 +362,7 @@
/// Implement the 'analysis.setGeneralSubscriptions' request.
Response setGeneralSubscriptions(Request request) {
- AnalysisSetGeneralSubscriptionsParams params =
- AnalysisSetGeneralSubscriptionsParams.fromRequest(request);
+ var params = AnalysisSetGeneralSubscriptionsParams.fromRequest(request);
server.setGeneralAnalysisSubscriptions(params.subscriptions);
return AnalysisSetGeneralSubscriptionsResult().toResponse(request.id);
}
@@ -388,7 +381,7 @@
//
// Forward the request to the plugins.
//
- RequestConverter converter = RequestConverter();
+ var converter = RequestConverter();
server.pluginManager.setAnalysisSetPriorityFilesParams(
converter.convertAnalysisSetPriorityFilesParams(params));
//
@@ -410,13 +403,16 @@
}
// parse subscriptions
- Map<AnalysisService, Set<String>> subMap = mapMap(params.subscriptions,
- valueCallback: (List<String> subscriptions) => subscriptions.toSet());
+ var subMap =
+ mapMap<AnalysisService, List<String>, AnalysisService, Set<String>>(
+ params.subscriptions,
+ valueCallback: (List<String> subscriptions) =>
+ subscriptions.toSet());
server.setAnalysisSubscriptions(subMap);
//
// Forward the request to the plugins.
//
- RequestConverter converter = RequestConverter();
+ var converter = RequestConverter();
server.pluginManager.setAnalysisSetSubscriptionsParams(
converter.convertAnalysisSetSubscriptionsParams(params));
//
@@ -439,7 +435,7 @@
//
// Forward the request to the plugins.
//
- RequestConverter converter = RequestConverter();
+ var converter = RequestConverter();
server.pluginManager.setAnalysisUpdateContentParams(
converter.convertAnalysisUpdateContentParams(params));
//
@@ -452,8 +448,8 @@
Response updateOptions(Request request) {
// options
var params = AnalysisUpdateOptionsParams.fromRequest(request);
- AnalysisOptions newOptions = params.options;
- List<OptionUpdater> updaters = <OptionUpdater>[];
+ var newOptions = params.options;
+ var updaters = <OptionUpdater>[];
if (newOptions.generateDart2jsHints != null) {
updaters.add((engine.AnalysisOptionsImpl options) {
options.dart2jsHint = newOptions.generateDart2jsHints;
diff --git a/pkg/analysis_server/lib/src/domain_analytics.dart b/pkg/analysis_server/lib/src/domain_analytics.dart
index c45ad7b..af31ca1 100644
--- a/pkg/analysis_server/lib/src/domain_analytics.dart
+++ b/pkg/analysis_server/lib/src/domain_analytics.dart
@@ -15,12 +15,14 @@
class AnalyticsDomainHandler implements RequestHandler {
final AnalysisServer server;
- Analytics get analytics => server.analytics;
-
AnalyticsDomainHandler(this.server);
+ Analytics get analytics => server.analytics;
+
+ String get _clientId => server.options.clientId ?? 'client';
+
Response handleEnable(Request request) {
- AnalyticsEnableParams params = AnalyticsEnableParams.fromRequest(request);
+ var params = AnalyticsEnableParams.fromRequest(request);
if (analytics != null) {
analytics.enabled = params.value;
}
@@ -34,7 +36,7 @@
@override
Response handleRequest(Request request) {
- String requestName = request.method;
+ var requestName = request.method;
if (requestName == ANALYTICS_REQUEST_IS_ENABLED) {
return handleIsEnabled(request);
@@ -54,8 +56,7 @@
return AnalyticsSendEventResult().toResponse(request.id);
}
- AnalyticsSendEventParams params =
- AnalyticsSendEventParams.fromRequest(request);
+ var params = AnalyticsSendEventParams.fromRequest(request);
analytics.sendEvent(_clientId, params.action);
return AnalyticsSendEventResult().toResponse(request.id);
}
@@ -65,11 +66,8 @@
return AnalyticsSendTimingResult().toResponse(request.id);
}
- AnalyticsSendTimingParams params =
- AnalyticsSendTimingParams.fromRequest(request);
+ var params = AnalyticsSendTimingParams.fromRequest(request);
analytics.sendTiming(params.event, params.millis, category: _clientId);
return AnalyticsSendTimingResult().toResponse(request.id);
}
-
- String get _clientId => server.options.clientId ?? 'client';
}
diff --git a/pkg/analysis_server/lib/src/domain_completion.dart b/pkg/analysis_server/lib/src/domain_completion.dart
index d4f6632..5eff309 100644
--- a/pkg/analysis_server/lib/src/domain_completion.dart
+++ b/pkg/analysis_server/lib/src/domain_completion.dart
@@ -20,7 +20,6 @@
import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/dart/analysis/session.dart';
import 'package:analyzer/exception/exception.dart';
-import 'package:analyzer/src/dart/analysis/driver.dart';
import 'package:analyzer/src/generated/engine.dart';
import 'package:analyzer_plugin/protocol/protocol.dart' as plugin;
import 'package:analyzer_plugin/protocol/protocol_common.dart';
@@ -77,9 +76,9 @@
//
Map<PluginInfo, Future<plugin.Response>> pluginFutures;
plugin.CompletionGetSuggestionsParams requestParams;
- String file = params.file;
- int offset = params.offset;
- AnalysisDriver driver = server.getAnalysisDriver(file);
+ var file = params.file;
+ var offset = params.offset;
+ var driver = server.getAnalysisDriver(file);
if (driver != null) {
requestParams = plugin.CompletionGetSuggestionsParams(file, offset);
pluginFutures = server.pluginManager
@@ -88,7 +87,7 @@
//
// Compute completions generated by server.
//
- List<CompletionSuggestion> suggestions = <CompletionSuggestion>[];
+ var suggestions = <CompletionSuggestion>[];
if (request.result != null) {
const COMPUTE_SUGGESTIONS_TAG = 'computeSuggestions';
performance.logStartTime(COMPUTE_SUGGESTIONS_TAG);
@@ -99,7 +98,7 @@
includedSuggestionRelevanceTags: includedSuggestionRelevanceTags,
);
- String contributorTag = 'computeSuggestions - ${manager.runtimeType}';
+ var contributorTag = 'computeSuggestions - ${manager.runtimeType}';
performance.logStartTime(contributorTag);
try {
suggestions.addAll(await manager.computeSuggestions(request));
@@ -116,10 +115,10 @@
// Add the fixes produced by plugins to the server-generated fixes.
//
if (pluginFutures != null) {
- List<plugin.Response> responses = await waitForResponses(pluginFutures,
+ var responses = await waitForResponses(pluginFutures,
requestParameters: requestParams);
- for (plugin.Response response in responses) {
- plugin.CompletionGetSuggestionsResult result =
+ for (var response in responses) {
+ var result =
plugin.CompletionGetSuggestionsResult.fromResponse(response);
if (result.results != null && result.results.isNotEmpty) {
if (suggestions.isEmpty) {
@@ -218,7 +217,7 @@
}
return runZonedGuarded(() {
- String requestName = request.method;
+ var requestName = request.method;
if (requestName == COMPLETION_REQUEST_GET_SUGGESTION_DETAILS) {
getSuggestionDetails(request);
@@ -250,15 +249,14 @@
/// Process a `completion.listTokenDetails` request.
Future<void> listTokenDetails(Request request) async {
- CompletionListTokenDetailsParams params =
- CompletionListTokenDetailsParams.fromRequest(request);
+ var params = CompletionListTokenDetailsParams.fromRequest(request);
- String file = params.file;
+ var file = params.file;
if (server.sendResponseErrorIfInvalidFilePath(request, file)) {
return;
}
- AnalysisDriver analysisDriver = server.getAnalysisDriver(file);
+ var analysisDriver = server.getAnalysisDriver(file);
if (analysisDriver == null) {
server.sendResponse(Response.invalidParameter(
request,
@@ -266,8 +264,8 @@
'File is not being analyzed: $file',
));
}
- AnalysisSession session = analysisDriver.currentSession;
- ResolvedUnitResult result = await session.getResolvedUnit(file);
+ var session = analysisDriver.currentSession;
+ var result = await session.getResolvedUnit(file);
if (result.state != ResultState.VALID) {
server.sendResponse(Response.invalidParameter(
request,
@@ -276,7 +274,7 @@
));
}
- TokenDetailBuilder builder = TokenDetailBuilder();
+ var builder = TokenDetailBuilder();
builder.visitNode(result.unit);
server.sendResponse(
CompletionListTokenDetailsResult(builder.details).toResponse(request.id),
@@ -288,16 +286,15 @@
performance = CompletionPerformance();
// extract and validate params
- CompletionGetSuggestionsParams params =
- CompletionGetSuggestionsParams.fromRequest(request);
- String file = params.file;
- int offset = params.offset;
+ var params = CompletionGetSuggestionsParams.fromRequest(request);
+ var file = params.file;
+ var offset = params.offset;
if (server.sendResponseErrorIfInvalidFilePath(request, file)) {
return;
}
- ResolvedUnitResult resolvedUnit = await server.getResolvedUnit(file);
+ var resolvedUnit = await server.getResolvedUnit(file);
server.requestStatistics?.addItemTimeNow(request, 'resolvedUnit');
if (resolvedUnit?.state == ResultState.VALID) {
if (offset < 0 || offset > resolvedUnit.content.length) {
@@ -311,10 +308,10 @@
recordRequest(performance, file, resolvedUnit.content, offset);
}
- CompletionRequestImpl completionRequest = CompletionRequestImpl(
+ var completionRequest = CompletionRequestImpl(
resolvedUnit, offset, server.options.useNewRelevance, performance);
- String completionId = (_nextCompletionId++).toString();
+ var completionId = (_nextCompletionId++).toString();
setNewRequest(completionRequest);
@@ -342,7 +339,7 @@
includedSuggestionRelevanceTags,
).then((CompletionResult result) {
String libraryFile;
- List<IncludedSuggestionSet> includedSuggestionSets = [];
+ var includedSuggestionSets = <IncludedSuggestionSet>[];
if (includedElementKinds != null && resolvedUnit != null) {
libraryFile = resolvedUnit.libraryElement.source.fullName;
server.sendNotification(
diff --git a/pkg/analysis_server/lib/src/domain_diagnostic.dart b/pkg/analysis_server/lib/src/domain_diagnostic.dart
index 4968b58..a7faff3 100644
--- a/pkg/analysis_server/lib/src/domain_diagnostic.dart
+++ b/pkg/analysis_server/lib/src/domain_diagnostic.dart
@@ -23,15 +23,14 @@
/// Answer the `diagnostic.getDiagnostics` request.
Response computeDiagnostics(Request request) {
- List<ContextData> contexts =
- server.driverMap.values.map(extractDataFromDriver).toList();
+ var contexts = server.driverMap.values.map(extractDataFromDriver).toList();
return DiagnosticGetDiagnosticsResult(contexts).toResponse(request.id);
}
/// Extract context data from the given [driver].
ContextData extractDataFromDriver(AnalysisDriver driver) {
- int explicitFileCount = driver.addedFiles.length;
- int knownFileCount = driver.knownFiles.length;
+ var explicitFileCount = driver.addedFiles.length;
+ var knownFileCount = driver.knownFiles.length;
return ContextData(driver.name, explicitFileCount,
knownFileCount - explicitFileCount, driver.numberOfFilesToAnalyze, []);
}
@@ -42,7 +41,7 @@
await null;
try {
// Open a port (or return the existing one).
- int port = await server.diagnosticServer.getServerPort();
+ var port = await server.diagnosticServer.getServerPort();
server.sendResponse(
DiagnosticGetServerPortResult(port).toResponse(request.id));
} catch (error) {
@@ -53,7 +52,7 @@
@override
Response handleRequest(Request request) {
try {
- String requestName = request.method;
+ var requestName = request.method;
if (requestName == DIAGNOSTIC_REQUEST_GET_DIAGNOSTICS) {
return computeDiagnostics(request);
} else if (requestName == DIAGNOSTIC_REQUEST_GET_SERVER_PORT) {
diff --git a/pkg/analysis_server/lib/src/domain_execution.dart b/pkg/analysis_server/lib/src/domain_execution.dart
index 3926562..c22eec5 100644
--- a/pkg/analysis_server/lib/src/domain_execution.dart
+++ b/pkg/analysis_server/lib/src/domain_execution.dart
@@ -11,7 +11,6 @@
import 'package:analysis_server/src/analysis_server.dart';
import 'package:analysis_server/src/protocol_server.dart';
import 'package:analyzer/file_system/file_system.dart';
-import 'package:analyzer/src/dart/analysis/driver.dart';
import 'package:analyzer/src/generated/source.dart';
/// Instances of the class [ExecutionDomainHandler] implement a [RequestHandler]
@@ -32,15 +31,15 @@
/// Implement the `execution.createContext` request.
Response createContext(Request request) {
- String file = ExecutionCreateContextParams.fromRequest(request).contextRoot;
- String contextId = (nextContextId++).toString();
+ var file = ExecutionCreateContextParams.fromRequest(request).contextRoot;
+ var contextId = (nextContextId++).toString();
contextMap[contextId] = file;
return ExecutionCreateContextResult(contextId).toResponse(request.id);
}
/// Implement the `execution.deleteContext` request.
Response deleteContext(Request request) {
- String contextId = ExecutionDeleteContextParams.fromRequest(request).id;
+ var contextId = ExecutionDeleteContextParams.fromRequest(request).id;
contextMap.remove(contextId);
return ExecutionDeleteContextResult().toResponse(request.id);
}
@@ -77,7 +76,7 @@
@override
Response handleRequest(Request request) {
try {
- String requestName = request.method;
+ var requestName = request.method;
if (requestName == EXECUTION_REQUEST_CREATE_CONTEXT) {
return createContext(request);
} else if (requestName == EXECUTION_REQUEST_DELETE_CONTEXT) {
@@ -98,28 +97,28 @@
/// Implement the 'execution.mapUri' request.
Response mapUri(Request request) {
- ExecutionMapUriParams params = ExecutionMapUriParams.fromRequest(request);
- String contextId = params.id;
- String path = contextMap[contextId];
+ var params = ExecutionMapUriParams.fromRequest(request);
+ var contextId = params.id;
+ var path = contextMap[contextId];
if (path == null) {
return Response.invalidParameter(request, 'id',
'There is no execution context with an id of $contextId');
}
- AnalysisDriver driver = server.getAnalysisDriver(path);
+ var driver = server.getAnalysisDriver(path);
if (driver == null) {
return Response.invalidExecutionContext(request, contextId);
}
- SourceFactory sourceFactory = driver.sourceFactory;
+ var sourceFactory = driver.sourceFactory;
- String file = params.file;
- String uri = params.uri;
+ var file = params.file;
+ var uri = params.uri;
if (file != null) {
if (uri != null) {
return Response.invalidParameter(request, 'file',
'Either file or uri must be provided, but not both');
}
- Resource resource = server.resourceProvider.getResource(file);
+ var resource = server.resourceProvider.getResource(file);
if (!resource.exists) {
return Response.invalidParameter(request, 'file', 'Must exist');
} else if (resource is! File) {
@@ -127,7 +126,7 @@
request, 'file', 'Must not refer to a directory');
}
- Source source = driver.fsState.getFileForPath(file).source;
+ var source = driver.fsState.getFileForPath(file).source;
if (source.uriKind != UriKind.FILE_URI) {
uri = source.uri.toString();
} else {
@@ -135,7 +134,7 @@
}
return ExecutionMapUriResult(uri: uri).toResponse(request.id);
} else if (uri != null) {
- Source source = sourceFactory.forUri(uri);
+ var source = sourceFactory.forUri(uri);
if (source == null) {
return Response.invalidParameter(request, 'uri', 'Invalid URI');
}
diff --git a/pkg/analysis_server/lib/src/domain_kythe.dart b/pkg/analysis_server/lib/src/domain_kythe.dart
index 071d153..357e1ae 100644
--- a/pkg/analysis_server/lib/src/domain_kythe.dart
+++ b/pkg/analysis_server/lib/src/domain_kythe.dart
@@ -10,11 +10,9 @@
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analysis_server/src/analysis_server.dart';
import 'package:analysis_server/src/domain_abstract.dart';
-import 'package:analysis_server/src/plugin/plugin_manager.dart';
import 'package:analysis_server/src/plugin/result_merger.dart';
import 'package:analysis_server/src/services/kythe/kythe_visitors.dart';
import 'package:analyzer/dart/analysis/results.dart';
-import 'package:analyzer/src/dart/analysis/driver.dart';
import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
import 'package:analyzer_plugin/protocol/protocol.dart' as plugin;
import 'package:analyzer_plugin/protocol/protocol_common.dart';
@@ -32,29 +30,26 @@
Future<void> getKytheEntries(Request request) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- String file = KytheGetKytheEntriesParams.fromRequest(request).file;
- AnalysisDriver driver = server.getAnalysisDriver(file);
+ var file = KytheGetKytheEntriesParams.fromRequest(request).file;
+ var driver = server.getAnalysisDriver(file);
if (driver == null) {
server.sendResponse(Response.getKytheEntriesInvalidFile(request));
} else {
//
// Allow plugins to start computing entries.
//
- plugin.KytheGetKytheEntriesParams requestParams =
- plugin.KytheGetKytheEntriesParams(file);
- Map<PluginInfo, Future<plugin.Response>> pluginFutures = server
- .pluginManager
+ var requestParams = plugin.KytheGetKytheEntriesParams(file);
+ var pluginFutures = server.pluginManager
.broadcastRequest(requestParams, contextRoot: driver.contextRoot);
//
// Compute entries generated by server.
//
- List<KytheGetKytheEntriesResult> allResults =
- <KytheGetKytheEntriesResult>[];
- ResolvedUnitResult result = await server.getResolvedUnit(file);
+ var allResults = <KytheGetKytheEntriesResult>[];
+ var result = await server.getResolvedUnit(file);
if (result?.state == ResultState.VALID) {
- List<KytheEntry> entries = <KytheEntry>[];
+ var entries = <KytheEntry>[];
// TODO(brianwilkerson) Figure out how to get the list of files.
- List<String> files = <String>[];
+ var files = <String>[];
result.unit.accept(KytheDartVisitor(server.resourceProvider, entries,
file, InheritanceManager3(), result.content));
allResults.add(KytheGetKytheEntriesResult(entries, files));
@@ -63,11 +58,10 @@
// Add the entries produced by plugins to the server-generated entries.
//
if (pluginFutures != null) {
- List<plugin.Response> responses = await waitForResponses(pluginFutures,
+ var responses = await waitForResponses(pluginFutures,
requestParameters: requestParams);
- for (plugin.Response response in responses) {
- plugin.KytheGetKytheEntriesResult result =
- plugin.KytheGetKytheEntriesResult.fromResponse(response);
+ for (var response in responses) {
+ var result = plugin.KytheGetKytheEntriesResult.fromResponse(response);
allResults
.add(KytheGetKytheEntriesResult(result.entries, result.files));
}
@@ -75,9 +69,8 @@
//
// Return the result.
//
- ResultMerger merger = ResultMerger();
- KytheGetKytheEntriesResult mergedResults =
- merger.mergeKytheEntries(allResults);
+ var merger = ResultMerger();
+ var mergedResults = merger.mergeKytheEntries(allResults);
if (mergedResults == null) {
server.sendResponse(
KytheGetKytheEntriesResult(<KytheEntry>[], <String>[])
@@ -93,7 +86,7 @@
@override
Response handleRequest(Request request) {
try {
- String requestName = request.method;
+ var requestName = request.method;
if (requestName == KYTHE_REQUEST_GET_KYTHE_ENTRIES) {
getKytheEntries(request);
return Response.DELAYED_RESPONSE;
diff --git a/pkg/analysis_server/lib/src/domain_server.dart b/pkg/analysis_server/lib/src/domain_server.dart
index dfbea9b..628b9c2 100644
--- a/pkg/analysis_server/lib/src/domain_server.dart
+++ b/pkg/analysis_server/lib/src/domain_server.dart
@@ -27,7 +27,7 @@
@override
Response handleRequest(Request request) {
try {
- String requestName = request.method;
+ var requestName = request.method;
if (requestName == SERVER_REQUEST_GET_VERSION) {
return getVersion(request);
} else if (requestName == SERVER_REQUEST_SET_SUBSCRIPTIONS) {
@@ -58,7 +58,7 @@
/// Cleanly shutdown the analysis server.
Future<void> shutdown(Request request) async {
await server.shutdown();
- Response response = ServerShutdownResult().toResponse(request.id);
+ var response = ServerShutdownResult().toResponse(request.id);
server.sendResponse(response);
}
}
diff --git a/pkg/analysis_server/lib/src/domains/analysis/implemented_dart.dart b/pkg/analysis_server/lib/src/domains/analysis/implemented_dart.dart
index ccf5aef..0939d94 100644
--- a/pkg/analysis_server/lib/src/domains/analysis/implemented_dart.dart
+++ b/pkg/analysis_server/lib/src/domains/analysis/implemented_dart.dart
@@ -27,14 +27,14 @@
}
void _addImplementedClass(ClassElement type) {
- int offset = type.nameOffset;
- int length = type.nameLength;
+ var offset = type.nameOffset;
+ var length = type.nameLength;
classes.add(protocol.ImplementedClass(offset, length));
}
void _addImplementedMember(Element member) {
- int offset = member.nameOffset;
- int length = member.nameLength;
+ var offset = member.nameOffset;
+ var length = member.nameLength;
members.add(protocol.ImplementedMember(offset, length));
}
@@ -68,7 +68,7 @@
}
bool _hasOverride(Element element) {
- String name = element.displayName;
+ var name = element.displayName;
return subtypeMembers.contains(name);
}
diff --git a/pkg/analysis_server/lib/src/domains/analysis/navigation_dart.dart b/pkg/analysis_server/lib/src/domains/analysis/navigation_dart.dart
index 5aa72e6..d9b9a3b 100644
--- a/pkg/analysis_server/lib/src/domains/analysis/navigation_dart.dart
+++ b/pkg/analysis_server/lib/src/domains/analysis/navigation_dart.dart
@@ -7,11 +7,9 @@
import 'package:analyzer/dart/ast/token.dart';
import 'package:analyzer/dart/ast/visitor.dart';
import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/dart/element/type.dart';
import 'package:analyzer/file_system/file_system.dart';
import 'package:analyzer/src/dart/ast/utilities.dart';
import 'package:analyzer/src/dart/element/element.dart';
-import 'package:analyzer/src/generated/source.dart';
import 'package:analyzer_plugin/utilities/navigation/navigation.dart';
NavigationCollector computeDartNavigation(
@@ -20,21 +18,20 @@
CompilationUnit unit,
int offset,
int length) {
- _DartNavigationCollector dartCollector = _DartNavigationCollector(collector);
- _DartNavigationComputerVisitor visitor =
- _DartNavigationComputerVisitor(resourceProvider, dartCollector);
+ var dartCollector = _DartNavigationCollector(collector);
+ var visitor = _DartNavigationComputerVisitor(resourceProvider, dartCollector);
if (offset == null || length == null) {
unit.accept(visitor);
} else {
- AstNode node = _getNodeForRange(unit, offset, length);
+ var node = _getNodeForRange(unit, offset, length);
node?.accept(visitor);
}
return collector;
}
AstNode _getNodeForRange(CompilationUnit unit, int offset, int length) {
- AstNode node = NodeLocator(offset, offset + length).searchWithin(unit);
- for (AstNode n = node; n != null; n = n.parent) {
+ var node = NodeLocator(offset, offset + length).searchWithin(unit);
+ for (var n = node; n != null; n = n.parent) {
if (n is Directive) {
return n;
}
@@ -58,8 +55,8 @@
if (element.location == null) {
return;
}
- protocol.ElementKind kind = protocol.convertElementKind(element.kind);
- protocol.Location location = protocol.newLocation_fromElement(element);
+ var kind = protocol.convertElementKind(element.kind);
+ var location = protocol.newLocation_fromElement(element);
if (location == null) {
return;
}
@@ -67,8 +64,8 @@
}
void _addRegion_nodeStart_nodeEnd(AstNode a, AstNode b, Element element) {
- int offset = a.offset;
- int length = b.end - offset;
+ var offset = a.offset;
+ var length = b.end - offset;
_addRegion(offset, length, element);
}
@@ -76,14 +73,14 @@
if (node == null) {
return;
}
- int offset = node.offset;
- int length = node.length;
+ var offset = node.offset;
+ var length = node.length;
_addRegion(offset, length, element);
}
void _addRegionForToken(Token token, Element element) {
- int offset = token.offset;
- int length = token.length;
+ var offset = token.offset;
+ var length = token.length;
_addRegion(offset, length, element);
}
}
@@ -96,14 +93,14 @@
@override
void visitAnnotation(Annotation node) {
- Element element = node.element;
+ var element = node.element;
if (element is ConstructorElement && element.isSynthetic) {
element = element.enclosingElement;
}
- Identifier name = node.name;
+ var name = node.name;
if (name is PrefixedIdentifier) {
// use constructor in: @PrefixClass.constructorName
- Element prefixElement = name.prefix.staticElement;
+ var prefixElement = name.prefix.staticElement;
if (prefixElement is ClassElement) {
prefixElement = element;
}
@@ -135,14 +132,14 @@
@override
void visitCompilationUnit(CompilationUnit unit) {
// prepare top-level nodes sorted by their offsets
- List<AstNode> nodes = <AstNode>[];
+ var nodes = <AstNode>[];
nodes.addAll(unit.directives);
nodes.addAll(unit.declarations);
nodes.sort((a, b) {
return a.offset - b.offset;
});
// visit sorted nodes
- for (AstNode node in nodes) {
+ for (var node in nodes) {
node.accept(this);
}
}
@@ -164,7 +161,7 @@
@override
void visitConstructorName(ConstructorName node) {
- AstNode parent = node.parent;
+ var parent = node.parent;
if (parent is InstanceCreationExpression &&
parent.constructorName == node) {
_addConstructorName(parent, node);
@@ -177,10 +174,10 @@
@override
void visitDeclaredIdentifier(DeclaredIdentifier node) {
if (node.type == null) {
- Token token = node.keyword;
+ var token = node.keyword;
if (token?.keyword == Keyword.VAR) {
- DartType inferredType = node.declaredElement?.type;
- Element element = inferredType?.element;
+ var inferredType = node.declaredElement?.type;
+ var element = inferredType?.element;
if (element != null) {
computer._addRegionForToken(token, element);
}
@@ -212,7 +209,7 @@
@override
void visitIndexExpression(IndexExpression node) {
super.visitIndexExpression(node);
- MethodElement element = node.staticElement;
+ var element = node.staticElement;
computer._addRegionForToken(node.leftBracket, element);
computer._addRegionForToken(node.rightBracket, element);
}
@@ -265,7 +262,7 @@
if (node.parent is ConstructorDeclaration) {
return;
}
- Element element = node.staticElement;
+ var element = node.staticElement;
computer._addRegionForNode(node, element);
}
@@ -288,12 +285,12 @@
/// the given list of [variables], or `null` if not all variable have the
/// same inferred type.
Element getCommonElement(List<VariableDeclaration> variables) {
- Element firstElement = variables[0].declaredElement.type?.element;
+ var firstElement = variables[0].declaredElement.type?.element;
if (firstElement == null) {
return null;
}
- for (int i = 1; i < variables.length; i++) {
- Element element = variables[1].declaredElement.type?.element;
+ for (var i = 1; i < variables.length; i++) {
+ var element = variables[1].declaredElement.type?.element;
if (element != firstElement) {
return null;
}
@@ -302,9 +299,9 @@
}
if (node.type == null) {
- Token token = node.keyword;
+ var token = node.keyword;
if (token?.keyword == Keyword.VAR) {
- Element element = getCommonElement(node.variables);
+ var element = getCommonElement(node.variables);
if (element != null) {
computer._addRegionForToken(token, element);
}
@@ -323,11 +320,11 @@
element = element.enclosingElement;
}
// add regions
- TypeName typeName = node.type;
+ var typeName = node.type;
// [prefix].ClassName
{
- Identifier name = typeName.name;
- Identifier className = name;
+ var name = typeName.name;
+ var className = name;
if (name is PrefixedIdentifier) {
name.prefix.accept(this);
className = name.identifier;
@@ -335,7 +332,7 @@
computer._addRegionForNode(className, element);
}
// <TypeA, TypeB>
- TypeArgumentList typeArguments = typeName.typeArguments;
+ var typeArguments = typeName.typeArguments;
if (typeArguments != null) {
typeArguments.accept(this);
}
@@ -348,7 +345,7 @@
/// If the source of the given [element] (referenced by the [node]) exists,
/// then add the navigation region from the [node] to the [element].
void _addUriDirectiveRegion(UriBasedDirective node, Element element) {
- Source source = element?.source;
+ var source = element?.source;
if (source != null) {
if (resourceProvider.getResource(source.fullName).exists) {
computer._addRegionForNode(node.uri, element);
diff --git a/pkg/analysis_server/lib/src/domains/analysis/occurrences.dart b/pkg/analysis_server/lib/src/domains/analysis/occurrences.dart
index 1d48522..295d92c 100644
--- a/pkg/analysis_server/lib/src/domains/analysis/occurrences.dart
+++ b/pkg/analysis_server/lib/src/domains/analysis/occurrences.dart
@@ -16,10 +16,10 @@
@override
void addOccurrences(protocol.Occurrences current) {
- protocol.Element element = current.element;
- protocol.Occurrences existing = elementOccurrences[element];
+ var element = current.element;
+ var existing = elementOccurrences[element];
if (existing != null) {
- List<int> offsets = _merge(existing.offsets, current.offsets);
+ var offsets = _merge(existing.offsets, current.offsets);
current = protocol.Occurrences(element, offsets, existing.length);
}
elementOccurrences[element] = current;
diff --git a/pkg/analysis_server/lib/src/domains/analysis/occurrences_dart.dart b/pkg/analysis_server/lib/src/domains/analysis/occurrences_dart.dart
index 5bed880..f09a65d 100644
--- a/pkg/analysis_server/lib/src/domains/analysis/occurrences_dart.dart
+++ b/pkg/analysis_server/lib/src/domains/analysis/occurrences_dart.dart
@@ -10,14 +10,12 @@
import 'package:analyzer/src/dart/element/element.dart';
void addDartOccurrences(OccurrencesCollector collector, CompilationUnit unit) {
- _DartUnitOccurrencesComputerVisitor visitor =
- _DartUnitOccurrencesComputerVisitor();
+ var visitor = _DartUnitOccurrencesComputerVisitor();
unit.accept(visitor);
visitor.elementsOffsets.forEach((engineElement, offsets) {
- int length = engineElement.nameLength;
- protocol.Element serverElement = protocol.convertElement(engineElement);
- protocol.Occurrences occurrences =
- protocol.Occurrences(serverElement, offsets, length);
+ var length = engineElement.nameLength;
+ var serverElement = protocol.convertElement(engineElement);
+ var occurrences = protocol.Occurrences(serverElement, offsets, length);
collector.addOccurrences(occurrences);
});
}
@@ -27,7 +25,7 @@
@override
void visitSimpleIdentifier(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element != null) {
_addOccurrence(element, node.offset);
}
@@ -39,7 +37,7 @@
if (element == null || element == DynamicElementImpl.instance) {
return;
}
- List<int> offsets = elementsOffsets[element];
+ var offsets = elementsOffsets[element];
if (offsets == null) {
offsets = <int>[];
elementsOffsets[element] = offsets;
diff --git a/pkg/analysis_server/lib/src/domains/execution/completion.dart b/pkg/analysis_server/lib/src/domains/execution/completion.dart
index 49927ca..5839530 100644
--- a/pkg/analysis_server/lib/src/domains/execution/completion.dart
+++ b/pkg/analysis_server/lib/src/domains/execution/completion.dart
@@ -53,7 +53,7 @@
// Insert the code being completed at the context offset.
var changeBuilder = DartChangeBuilder(session);
- int nextImportPrefixIndex = 0;
+ var nextImportPrefixIndex = 0;
await changeBuilder.addFileEdit(contextPath, (builder) {
builder.addInsertion(contextOffset, (builder) {
builder.writeln('{');
@@ -68,13 +68,13 @@
}, importPrefixGenerator: (uri) => '__prefix${nextImportPrefixIndex++}');
// Compute the patched context file content.
- String targetCode = SourceEdit.applySequence(
+ var targetCode = SourceEdit.applySequence(
contextResult.content,
changeBuilder.sourceChange.edits[0].edits,
);
// Insert the code being completed.
- int targetOffset = targetCode.indexOf(codeMarker) + offset;
+ var targetOffset = targetCode.indexOf(codeMarker) + offset;
targetCode = targetCode.replaceAll(codeMarker, code);
// Update the context file content to include the code being completed.
@@ -85,7 +85,7 @@
});
CompletionContributor contributor = DartCompletionManager();
- CompletionRequestImpl request = CompletionRequestImpl(
+ var request = CompletionRequestImpl(
targetResult,
targetOffset,
false,
diff --git a/pkg/analysis_server/lib/src/edit/edit_dartfix.dart b/pkg/analysis_server/lib/src/edit/edit_dartfix.dart
index 4d7cf75..d063871 100644
--- a/pkg/analysis_server/lib/src/edit/edit_dartfix.dart
+++ b/pkg/analysis_server/lib/src/edit/edit_dartfix.dart
@@ -14,6 +14,7 @@
import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/dart/analysis/session.dart';
import 'package:analyzer/file_system/file_system.dart';
+import 'package:analyzer/src/dart/analysis/driver.dart';
import 'package:analyzer/src/generated/engine.dart' show AnalysisOptionsImpl;
import 'package:analyzer/src/generated/source.dart' show SourceKind;
@@ -45,7 +46,7 @@
}
}
if (params.includedFixes != null) {
- for (String key in params.includedFixes) {
+ for (var key in params.includedFixes) {
var info = allFixes.firstWhere((i) => i.key == key, orElse: () => null);
if (info != null) {
fixInfo.add(info);
@@ -56,7 +57,7 @@
}
}
if (params.excludedFixes != null) {
- for (String key in params.excludedFixes) {
+ for (var key in params.excludedFixes) {
var info = allFixes.firstWhere((i) => i.key == key, orElse: () => null);
if (info != null) {
fixInfo.remove(info);
@@ -66,7 +67,7 @@
}
}
}
- for (DartFixInfo info in fixInfo) {
+ for (var info in fixInfo) {
info.setup(this, listener, params);
}
@@ -80,11 +81,11 @@
// will be used from within the IDE.
contextManager.refresh(null);
- for (String filePath in params.included) {
+ for (var filePath in params.included) {
if (!server.isValidFilePath(filePath)) {
return Response.invalidFilePathFormat(request, filePath);
}
- Resource res = resourceProvider.getResource(filePath);
+ var res = resourceProvider.getResource(filePath);
if (!res.exists ||
!(contextManager.includedPaths.contains(filePath) ||
contextManager.isInAnalysisRoot(filePath))) {
@@ -162,39 +163,19 @@
return null;
}
- /// Return `true` if the path in within the set of `included` files
- /// or is within an `included` directory.
- bool isIncluded(String filePath) {
- if (filePath != null) {
- for (File file in fixFiles) {
- if (file.path == filePath) {
- return true;
- }
- }
- for (Folder folder in fixFolders) {
- if (folder.contains(filePath)) {
- return true;
- }
- }
- }
- return false;
- }
-
- /// Call the supplied [process] function to process each compilation unit.
- Future processResources(
- Future<void> Function(ResolvedUnitResult result) process) async {
+ Set<String> getPathsToProcess() {
final contextManager = server.contextManager;
final resourceProvider = server.resourceProvider;
final resources = <Resource>[];
- for (String rootPath in contextManager.includedPaths) {
+ for (var rootPath in contextManager.includedPaths) {
resources.add(resourceProvider.getResource(rootPath));
}
var pathsToProcess = <String>{};
while (resources.isNotEmpty) {
- Resource res = resources.removeLast();
+ var res = resources.removeLast();
if (res is Folder) {
- for (Resource child in res.getChildren()) {
+ for (var child in res.getChildren()) {
if (!child.shortName.startsWith('.') &&
contextManager.isInAnalysisRoot(child.path) &&
!contextManager.isIgnored(child.path)) {
@@ -208,9 +189,33 @@
}
pathsToProcess.add(res.path);
}
+ return pathsToProcess;
+ }
+ /// Return `true` if the path in within the set of `included` files
+ /// or is within an `included` directory.
+ bool isIncluded(String filePath) {
+ if (filePath != null) {
+ for (var file in fixFiles) {
+ if (file.path == filePath) {
+ return true;
+ }
+ }
+ for (var folder in fixFolders) {
+ if (folder.contains(filePath)) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ /// Call the supplied [process] function to process each compilation unit.
+ Future processResources(
+ Future<void> Function(ResolvedUnitResult result) process) async {
+ final pathsToProcess = getPathsToProcess();
var pathsProcessed = <String>{};
- for (String path in pathsToProcess) {
+ for (var path in pathsToProcess) {
if (pathsProcessed.contains(path)) continue;
var driver = server.getAnalysisDriver(path);
switch (await driver.getSourceKind(path)) {
@@ -220,7 +225,7 @@
continue;
break;
case SourceKind.LIBRARY:
- ResolvedLibraryResult result = await driver.getResolvedLibrary(path);
+ var result = await driver.getResolvedLibrary(path);
if (result != null) {
for (var unit in result.units) {
if (pathsToProcess.contains(unit.path) &&
@@ -236,8 +241,8 @@
}
}
- for (String path in pathsToProcess.difference(pathsProcessed)) {
- ResolvedUnitResult result = await server.getResolvedUnit(path);
+ for (var path in pathsToProcess.difference(pathsProcessed)) {
+ var result = await server.getResolvedUnit(path);
if (result == null || result.unit == null) {
continue;
}
@@ -245,10 +250,20 @@
}
}
- Future<bool> rerunTasks(List<String> changedPaths) async {
- for (String path in changedPaths) {
- var driver = server.getAnalysisDriver(path);
- driver.changeFile(path);
+ Future<bool> rerunTasks([List<String> changedPaths]) async {
+ if (changedPaths == null) {
+ final drivers = <AnalysisDriver>{};
+ for (var path in getPathsToProcess()) {
+ drivers.add(server.getAnalysisDriver(path));
+ }
+ for (final driver in drivers) {
+ driver.knownFiles.forEach(driver.changeFile);
+ }
+ } else {
+ for (var path in changedPaths) {
+ var driver = server.getAnalysisDriver(path);
+ driver.changeFile(path);
+ }
}
return await runAllTasks();
@@ -256,11 +271,11 @@
Future<bool> runAllTasks() async {
// Process each package
- for (Folder pkgFolder in pkgFolders) {
+ for (var pkgFolder in pkgFolders) {
await processPackage(pkgFolder);
}
- bool hasErrors = false;
+ var hasErrors = false;
// Process each source file.
try {
@@ -272,7 +287,7 @@
await processCodeTasks(0, result);
}
});
- for (int phase = 1; phase < numPhases; phase++) {
+ for (var phase = 1; phase < numPhases; phase++) {
await processResources((ResolvedUnitResult result) async {
await processCodeTasks(phase, result);
});
diff --git a/pkg/analysis_server/lib/src/edit/edit_domain.dart b/pkg/analysis_server/lib/src/edit/edit_domain.dart
index fb240a1..316164d 100644
--- a/pkg/analysis_server/lib/src/edit/edit_domain.dart
+++ b/pkg/analysis_server/lib/src/edit/edit_domain.dart
@@ -34,7 +34,6 @@
import 'package:analysis_server/src/services/search/search_engine.dart';
import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/dart/analysis/session.dart';
-import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/error/error.dart' as engine;
import 'package:analyzer/exception/exception.dart';
@@ -42,7 +41,6 @@
// ignore: deprecated_member_use
import 'package:analyzer/source/analysis_options_provider.dart';
import 'package:analyzer/source/line_info.dart';
-import 'package:analyzer/src/dart/analysis/driver.dart';
import 'package:analyzer/src/dart/analysis/results.dart' as engine;
import 'package:analyzer/src/dart/ast/utilities.dart';
import 'package:analyzer/src/dart/scanner/scanner.dart' as engine;
@@ -59,9 +57,7 @@
import 'package:analyzer_plugin/protocol/protocol_constants.dart' as plugin;
import 'package:analyzer_plugin/protocol/protocol_generated.dart' as plugin;
import 'package:dart_style/dart_style.dart';
-import 'package:html/dom.dart';
import 'package:html/parser.dart';
-import 'package:path/src/context.dart';
import 'package:yaml/yaml.dart';
int test_resetCount = 0;
@@ -103,7 +99,7 @@
//
try {
var dartFix = EditDartFix(server, request);
- Response response = await dartFix.compute();
+ var response = await dartFix.compute();
server.sendResponse(response);
} catch (exception, stackTrace) {
@@ -115,8 +111,8 @@
Response format(Request request) {
server.options.analytics?.sendEvent('edit', 'format');
- EditFormatParams params = EditFormatParams.fromRequest(request);
- String file = params.file;
+ var params = EditFormatParams.fromRequest(request);
+ var file = params.file;
String unformattedCode;
try {
@@ -126,8 +122,8 @@
return Response.formatInvalidFile(request);
}
- int start = params.selectionOffset;
- int length = params.selectionLength;
+ var start = params.selectionOffset;
+ var length = params.selectionLength;
// No need to preserve 0,0 selection
if (start == 0 && length == 0) {
@@ -135,30 +131,30 @@
length = null;
}
- SourceCode code = SourceCode(unformattedCode,
+ var code = SourceCode(unformattedCode,
uri: null,
isCompilationUnit: true,
selectionStart: start,
selectionLength: length);
- DartFormatter formatter = DartFormatter(pageWidth: params.lineLength);
+ var formatter = DartFormatter(pageWidth: params.lineLength);
SourceCode formattedResult;
try {
formattedResult = formatter.formatSource(code);
} on FormatterException {
return Response.formatWithErrors(request);
}
- String formattedSource = formattedResult.text;
+ var formattedSource = formattedResult.text;
- List<SourceEdit> edits = <SourceEdit>[];
+ var edits = <SourceEdit>[];
if (formattedSource != unformattedCode) {
//TODO: replace full replacements with smaller, more targeted edits
- SourceEdit edit = SourceEdit(0, unformattedCode.length, formattedSource);
+ var edit = SourceEdit(0, unformattedCode.length, formattedSource);
edits.add(edit);
}
- int newStart = formattedResult.selectionStart;
- int newLength = formattedResult.selectionLength;
+ var newStart = formattedResult.selectionStart;
+ var newLength = formattedResult.selectionLength;
// Sending null start/length values would violate protocol, so convert back
// to 0.
@@ -171,22 +167,21 @@
Future getAssists(Request request) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- EditGetAssistsParams params = EditGetAssistsParams.fromRequest(request);
- String file = params.file;
- int offset = params.offset;
- int length = params.length;
+ var params = EditGetAssistsParams.fromRequest(request);
+ var file = params.file;
+ var offset = params.offset;
+ var length = params.length;
if (server.sendResponseErrorIfInvalidFilePath(request, file)) {
return;
}
- List<SourceChange> changes = <SourceChange>[];
+ var changes = <SourceChange>[];
//
// Allow plugins to start computing assists.
//
Map<PluginInfo, Future<plugin.Response>> pluginFutures;
- plugin.EditGetAssistsParams requestParams =
- plugin.EditGetAssistsParams(file, offset, length);
+ var requestParams = plugin.EditGetAssistsParams(file, offset, length);
var driver = server.getAnalysisDriver(file);
if (driver == null) {
pluginFutures = <PluginInfo, Future<plugin.Response>>{};
@@ -197,7 +192,7 @@
//
// Compute fixes associated with server-generated errors.
//
- ResolvedUnitResult result = await server.getResolvedUnit(file);
+ var result = await server.getResolvedUnit(file);
server.requestStatistics?.addItemTimeNow(request, 'resolvedUnit');
if (result != null) {
var context = DartAssistContextImpl(
@@ -207,10 +202,10 @@
length,
);
try {
- AssistProcessor processor = AssistProcessor(context);
- List<Assist> assists = await processor.compute();
+ var processor = AssistProcessor(context);
+ var assists = await processor.compute();
assists.sort(Assist.SORT_BY_RELEVANCE);
- for (Assist assist in assists) {
+ for (var assist in assists) {
changes.add(assist.change);
}
server.requestStatistics?.addItemTimeNow(request, 'computedAssists');
@@ -219,15 +214,13 @@
//
// Add the fixes produced by plugins to the server-generated fixes.
//
- List<plugin.Response> responses =
+ var responses =
await waitForResponses(pluginFutures, requestParameters: requestParams);
server.requestStatistics?.addItemTimeNow(request, 'pluginResponses');
- ResultConverter converter = ResultConverter();
- List<plugin.PrioritizedSourceChange> pluginChanges =
- <plugin.PrioritizedSourceChange>[];
- for (plugin.Response response in responses) {
- plugin.EditGetAssistsResult result =
- plugin.EditGetAssistsResult.fromResponse(response);
+ var converter = ResultConverter();
+ var pluginChanges = <plugin.PrioritizedSourceChange>[];
+ for (var response in responses) {
+ var result = plugin.EditGetAssistsResult.fromResponse(response);
pluginChanges.addAll(result.assists);
}
pluginChanges
@@ -244,9 +237,9 @@
.toResponse(request.id);
Future<void> getFixes(Request request) async {
- EditGetFixesParams params = EditGetFixesParams.fromRequest(request);
- String file = params.file;
- int offset = params.offset;
+ var params = EditGetFixesParams.fromRequest(request);
+ var file = params.file;
+ var offset = params.offset;
if (server.sendResponseErrorIfInvalidFilePath(request, file)) {
return;
@@ -255,8 +248,7 @@
// Allow plugins to start computing fixes.
//
Map<PluginInfo, Future<plugin.Response>> pluginFutures;
- plugin.EditGetFixesParams requestParams =
- plugin.EditGetFixesParams(file, offset);
+ var requestParams = plugin.EditGetFixesParams(file, offset);
var driver = server.getAnalysisDriver(file);
if (driver == null) {
pluginFutures = <PluginInfo, Future<plugin.Response>>{};
@@ -278,13 +270,12 @@
//
// Add the fixes produced by plugins to the server-generated fixes.
//
- List<plugin.Response> responses =
+ var responses =
await waitForResponses(pluginFutures, requestParameters: requestParams);
server.requestStatistics?.addItemTimeNow(request, 'pluginResponses');
- ResultConverter converter = ResultConverter();
- for (plugin.Response response in responses) {
- plugin.EditGetFixesResult result =
- plugin.EditGetFixesResult.fromResponse(response);
+ var converter = ResultConverter();
+ for (var response in responses) {
+ var result = plugin.EditGetFixesResult.fromResponse(response);
errorFixesList
.addAll(result.fixes.map(converter.convertAnalysisErrorFixes));
}
@@ -309,21 +300,20 @@
SourceChange change;
- ResolvedUnitResult result = await server.getResolvedUnit(file);
+ var result = await server.getResolvedUnit(file);
if (result != null) {
- PostfixCompletionContext context = PostfixCompletionContext(
+ var context = PostfixCompletionContext(
result,
params.offset,
params.key,
);
- PostfixCompletionProcessor processor =
- PostfixCompletionProcessor(context);
- PostfixCompletion completion = await processor.compute();
+ var processor = PostfixCompletionProcessor(context);
+ var completion = await processor.compute();
change = completion?.change;
}
change ??= SourceChange('', edits: []);
- Response response =
+ var response =
EditGetPostfixCompletionResult(change).toResponse(request.id);
server.sendResponse(response);
}
@@ -341,17 +331,16 @@
SourceChange change;
- ResolvedUnitResult result = await server.getResolvedUnit(file);
+ var result = await server.getResolvedUnit(file);
if (result != null) {
var context = StatementCompletionContext(result, params.offset);
- StatementCompletionProcessor processor =
- StatementCompletionProcessor(context);
- StatementCompletion completion = await processor.compute();
+ var processor = StatementCompletionProcessor(context);
+ var completion = await processor.compute();
change = completion.change;
}
change ??= SourceChange('', edits: []);
- Response response =
+ var response =
EditGetStatementCompletionResult(change, false).toResponse(request.id);
server.sendResponse(response);
}
@@ -359,7 +348,7 @@
@override
Response handleRequest(Request request) {
try {
- String requestName = request.method;
+ var requestName = request.method;
if (requestName == EDIT_REQUEST_FORMAT) {
return format(request);
} else if (requestName == EDIT_REQUEST_GET_ASSISTS) {
@@ -420,12 +409,11 @@
//
// Prepare the resolved unit.
//
- ResolvedUnitResult result = await server.getResolvedUnit(file);
+ var result = await server.getResolvedUnit(file);
if (result == null) {
server.sendResponse(Response.importElementsInvalidFile(request));
}
- CompilationUnitElement libraryUnit =
- result.libraryElement.definingCompilationUnit;
+ var libraryUnit = result.libraryElement.definingCompilationUnit;
if (libraryUnit != result.unit.declaredElement) {
// The file in the request is a part of a library. We need to pass the
// defining compilation unit to the computer, not the part.
@@ -437,11 +425,10 @@
//
// Compute the edits required to import the required elements.
//
- ImportElementsComputer computer =
- ImportElementsComputer(server.resourceProvider, result);
- SourceChange change = await computer.createEdits(params.elements);
- List<SourceFileEdit> edits = change.edits;
- SourceFileEdit edit = edits.isEmpty ? null : edits[0];
+ var computer = ImportElementsComputer(server.resourceProvider, result);
+ var change = await computer.createEdits(params.elements);
+ var edits = change.edits;
+ var edit = edits.isEmpty ? null : edits[0];
//
// Send the response.
//
@@ -459,9 +446,9 @@
return;
}
- bool value = false;
+ var value = false;
- ResolvedUnitResult result = await server.getResolvedUnit(file);
+ var result = await server.getResolvedUnit(file);
if (result != null) {
var context = PostfixCompletionContext(
result,
@@ -472,14 +459,13 @@
value = await processor.isApplicable();
}
- Response response =
+ var response =
EditIsPostfixCompletionApplicableResult(value).toResponse(request.id);
server.sendResponse(response);
}
Response listPostfixCompletionTemplates(Request request) {
- List<PostfixTemplateDescriptor> templates = DartPostfixCompletion
- .ALL_TEMPLATES
+ var templates = DartPostfixCompletion.ALL_TEMPLATES
.map((PostfixCompletionKind kind) =>
PostfixTemplateDescriptor(kind.name, kind.key, kind.example))
.toList();
@@ -505,26 +491,26 @@
}
// Prepare the file information.
- ResolvedUnitResult result = await server.getResolvedUnit(file);
+ var result = await server.getResolvedUnit(file);
if (result == null) {
server.sendResponse(Response.fileNotAnalyzed(request, file));
return;
}
- int fileStamp = -1;
- String code = result.content;
- CompilationUnit unit = result.unit;
- List<engine.AnalysisError> errors = result.errors;
+ var fileStamp = -1;
+ var code = result.content;
+ var unit = result.unit;
+ var errors = result.errors;
// check if there are scan/parse errors in the file
- int numScanParseErrors = _getNumberOfScanParseErrors(errors);
+ var numScanParseErrors = _getNumberOfScanParseErrors(errors);
if (numScanParseErrors != 0) {
server.sendResponse(Response.organizeDirectivesError(
request, 'File has $numScanParseErrors scan/parse errors.'));
return;
}
// do organize
- DirectiveOrganizer sorter = DirectiveOrganizer(code, unit, errors);
- List<SourceEdit> edits = sorter.organize();
- SourceFileEdit fileEdit = SourceFileEdit(file, fileStamp, edits: edits);
+ var sorter = DirectiveOrganizer(code, unit, errors);
+ var edits = sorter.organize();
+ var fileEdit = SourceFileEdit(file, fileStamp, edits: edits);
server.sendResponse(
EditOrganizeDirectivesResult(fileEdit).toResponse(request.id));
}
@@ -544,27 +530,27 @@
}
// Prepare the file information.
- ParsedUnitResult result = await server.getParsedUnit(file);
+ var result = await server.getParsedUnit(file);
if (result == null) {
server.sendResponse(Response.fileNotAnalyzed(request, file));
return;
}
- int fileStamp = -1;
- String code = result.content;
- CompilationUnit unit = result.unit;
- List<engine.AnalysisError> errors = result.errors;
+ var fileStamp = -1;
+ var code = result.content;
+ var unit = result.unit;
+ var errors = result.errors;
// Check if there are scan/parse errors in the file.
- int numScanParseErrors = _getNumberOfScanParseErrors(errors);
+ var numScanParseErrors = _getNumberOfScanParseErrors(errors);
if (numScanParseErrors != 0) {
server.sendResponse(
Response.sortMembersParseErrors(request, numScanParseErrors));
return;
}
// Do sort.
- MemberSorter sorter = MemberSorter(code, unit);
- List<SourceEdit> edits = sorter.sort();
- SourceFileEdit fileEdit = SourceFileEdit(file, fileStamp, edits: edits);
+ var sorter = MemberSorter(code, unit);
+ var edits = sorter.sort();
+ var fileEdit = SourceFileEdit(file, fileStamp, edits: edits);
server.sendResponse(EditSortMembersResult(fileEdit).toResponse(request.id));
}
@@ -572,32 +558,31 @@
/// analysis options files.
Future<List<AnalysisErrorFixes>> _computeAnalysisOptionsFixes(
String file, int offset) async {
- List<AnalysisErrorFixes> errorFixesList = <AnalysisErrorFixes>[];
- File optionsFile = server.resourceProvider.getFile(file);
- String content = _safelyRead(optionsFile);
+ var errorFixesList = <AnalysisErrorFixes>[];
+ var optionsFile = server.resourceProvider.getFile(file);
+ var content = _safelyRead(optionsFile);
if (content == null) {
return errorFixesList;
}
- AnalysisDriver driver = server.getAnalysisDriver(file);
+ var driver = server.getAnalysisDriver(file);
var session = driver.currentSession;
- SourceFactory sourceFactory = driver.sourceFactory;
- List<engine.AnalysisError> errors = analyzeAnalysisOptions(
+ var sourceFactory = driver.sourceFactory;
+ var errors = analyzeAnalysisOptions(
optionsFile.createSource(), content, sourceFactory);
- YamlMap options = _getOptions(sourceFactory, content);
+ var options = _getOptions(sourceFactory, content);
if (options == null) {
return errorFixesList;
}
- for (engine.AnalysisError error in errors) {
- AnalysisOptionsFixGenerator generator =
- AnalysisOptionsFixGenerator(error, content, options);
- List<Fix> fixes = await generator.computeFixes();
+ for (var error in errors) {
+ var generator = AnalysisOptionsFixGenerator(error, content, options);
+ var fixes = await generator.computeFixes();
if (fixes.isNotEmpty) {
fixes.sort(Fix.SORT_BY_RELEVANCE);
- LineInfo lineInfo = LineInfo.fromContent(content);
+ var lineInfo = LineInfo.fromContent(content);
ResolvedUnitResult result = engine.ResolvedUnitResultImpl(
session, file, null, true, content, lineInfo, false, null, errors);
- AnalysisError serverError = newAnalysisError_fromEngine(result, error);
- AnalysisErrorFixes errorFixes = AnalysisErrorFixes(serverError);
+ var serverError = newAnalysisError_fromEngine(result, error);
+ var errorFixes = AnalysisErrorFixes(serverError);
errorFixesList.add(errorFixes);
fixes.forEach((fix) {
errorFixes.fixes.add(fix.change);
@@ -611,14 +596,14 @@
/// Dart files.
Future<List<AnalysisErrorFixes>> _computeDartFixes(
Request request, String file, int offset) async {
- List<AnalysisErrorFixes> errorFixesList = <AnalysisErrorFixes>[];
+ var errorFixesList = <AnalysisErrorFixes>[];
var result = await server.getResolvedUnit(file);
server.requestStatistics?.addItemTimeNow(request, 'resolvedUnit');
if (result != null) {
- LineInfo lineInfo = result.lineInfo;
- int requestLine = lineInfo.getLocation(offset).lineNumber;
- for (engine.AnalysisError error in result.errors) {
- int errorLine = lineInfo.getLocation(error.offset).lineNumber;
+ var lineInfo = result.lineInfo;
+ var requestLine = lineInfo.getLocation(offset).lineNumber;
+ for (var error in result.errors) {
+ var errorLine = lineInfo.getLocation(error.offset).lineNumber;
if (errorLine == requestLine) {
var workspace = DartChangeWorkspace(server.currentSessions);
var context = DartFixContextImpl(workspace, result, error, (name) {
@@ -630,12 +615,11 @@
name,
);
});
- List<Fix> fixes = await DartFixContributor().computeFixes(context);
+ var fixes = await DartFixContributor().computeFixes(context);
if (fixes.isNotEmpty) {
fixes.sort(Fix.SORT_BY_RELEVANCE);
- AnalysisError serverError =
- newAnalysisError_fromEngine(result, error);
- AnalysisErrorFixes errorFixes = AnalysisErrorFixes(serverError);
+ var serverError = newAnalysisError_fromEngine(result, error);
+ var errorFixes = AnalysisErrorFixes(serverError);
errorFixesList.add(errorFixes);
fixes.forEach((fix) {
errorFixes.fixes.add(fix.change);
@@ -652,32 +636,30 @@
/// Android manifest files.
Future<List<AnalysisErrorFixes>> _computeManifestFixes(
String file, int offset) async {
- List<AnalysisErrorFixes> errorFixesList = <AnalysisErrorFixes>[];
- File manifestFile = server.resourceProvider.getFile(file);
- String content = _safelyRead(manifestFile);
+ var errorFixesList = <AnalysisErrorFixes>[];
+ var manifestFile = server.resourceProvider.getFile(file);
+ var content = _safelyRead(manifestFile);
if (content == null) {
return errorFixesList;
}
- DocumentFragment document =
+ var document =
parseFragment(content, container: MANIFEST_TAG, generateSpans: true);
if (document == null) {
return errorFixesList;
}
- ManifestValidator validator =
- ManifestValidator(manifestFile.createSource());
- AnalysisSession session = server.getAnalysisDriver(file).currentSession;
- List<engine.AnalysisError> errors = validator.validate(content, true);
- for (engine.AnalysisError error in errors) {
- ManifestFixGenerator generator =
- ManifestFixGenerator(error, content, document);
- List<Fix> fixes = await generator.computeFixes();
+ var validator = ManifestValidator(manifestFile.createSource());
+ var session = server.getAnalysisDriver(file).currentSession;
+ var errors = validator.validate(content, true);
+ for (var error in errors) {
+ var generator = ManifestFixGenerator(error, content, document);
+ var fixes = await generator.computeFixes();
if (fixes.isNotEmpty) {
fixes.sort(Fix.SORT_BY_RELEVANCE);
- LineInfo lineInfo = LineInfo.fromContent(content);
+ var lineInfo = LineInfo.fromContent(content);
ResolvedUnitResult result = engine.ResolvedUnitResultImpl(
session, file, null, true, content, lineInfo, false, null, errors);
- AnalysisError serverError = newAnalysisError_fromEngine(result, error);
- AnalysisErrorFixes errorFixes = AnalysisErrorFixes(serverError);
+ var serverError = newAnalysisError_fromEngine(result, error);
+ var errorFixes = AnalysisErrorFixes(serverError);
errorFixesList.add(errorFixes);
fixes.forEach((fix) {
errorFixes.fixes.add(fix.change);
@@ -691,32 +673,31 @@
/// pubspec.yaml files.
Future<List<AnalysisErrorFixes>> _computePubspecFixes(
String file, int offset) async {
- List<AnalysisErrorFixes> errorFixesList = <AnalysisErrorFixes>[];
- File pubspecFile = server.resourceProvider.getFile(file);
- String content = _safelyRead(pubspecFile);
+ var errorFixesList = <AnalysisErrorFixes>[];
+ var pubspecFile = server.resourceProvider.getFile(file);
+ var content = _safelyRead(pubspecFile);
if (content == null) {
return errorFixesList;
}
- SourceFactory sourceFactory = server.getAnalysisDriver(file).sourceFactory;
- YamlMap pubspec = _getOptions(sourceFactory, content);
+ var sourceFactory = server.getAnalysisDriver(file).sourceFactory;
+ var pubspec = _getOptions(sourceFactory, content);
if (pubspec == null) {
return errorFixesList;
}
- PubspecValidator validator =
+ var validator =
PubspecValidator(server.resourceProvider, pubspecFile.createSource());
- AnalysisSession session = server.getAnalysisDriver(file).currentSession;
- List<engine.AnalysisError> errors = validator.validate(pubspec.nodes);
- for (engine.AnalysisError error in errors) {
- PubspecFixGenerator generator =
- PubspecFixGenerator(error, content, pubspec);
- List<Fix> fixes = await generator.computeFixes();
+ var session = server.getAnalysisDriver(file).currentSession;
+ var errors = validator.validate(pubspec.nodes);
+ for (var error in errors) {
+ var generator = PubspecFixGenerator(error, content, pubspec);
+ var fixes = await generator.computeFixes();
if (fixes.isNotEmpty) {
fixes.sort(Fix.SORT_BY_RELEVANCE);
- LineInfo lineInfo = LineInfo.fromContent(content);
+ var lineInfo = LineInfo.fromContent(content);
ResolvedUnitResult result = engine.ResolvedUnitResultImpl(
session, file, null, true, content, lineInfo, false, null, errors);
- AnalysisError serverError = newAnalysisError_fromEngine(result, error);
- AnalysisErrorFixes errorFixes = AnalysisErrorFixes(serverError);
+ var serverError = newAnalysisError_fromEngine(result, error);
+ var errorFixes = AnalysisErrorFixes(serverError);
errorFixesList.add(errorFixes);
fixes.forEach((fix) {
errorFixes.fixes.add(fix.change);
@@ -729,7 +710,7 @@
/// Compute and return the fixes associated with server-generated errors.
Future<List<AnalysisErrorFixes>> _computeServerErrorFixes(
Request request, String file, int offset) async {
- Context context = server.resourceProvider.pathContext;
+ var context = server.resourceProvider.pathContext;
if (AnalysisEngine.isDartFileName(file)) {
return _computeDartFixes(request, file, offset);
} else if (AnalysisEngine.isAnalysisOptionsFileName(file, context)) {
@@ -750,16 +731,16 @@
Future _getAvailableRefactoringsImpl(Request request) async {
var params = EditGetAvailableRefactoringsParams.fromRequest(request);
- String file = params.file;
- int offset = params.offset;
- int length = params.length;
+ var file = params.file;
+ var offset = params.offset;
+ var length = params.length;
if (server.sendResponseErrorIfInvalidFilePath(request, file)) {
return;
}
// add refactoring kinds
- List<RefactoringKind> kinds = <RefactoringKind>[];
+ var kinds = <RefactoringKind>[];
// Check nodes.
{
var resolvedUnit = await server.getResolvedUnit(file);
@@ -792,15 +773,14 @@
if (element is ExecutableElement) {
Refactoring refactoring = ConvertMethodToGetterRefactoring(
searchEngine, resolvedUnit.session, element);
- RefactoringStatus status =
- await refactoring.checkInitialConditions();
+ var status = await refactoring.checkInitialConditions();
if (!status.hasFatalError) {
kinds.add(RefactoringKind.CONVERT_METHOD_TO_GETTER);
}
}
// try RENAME
{
- RenameRefactoring renameRefactoring =
+ var renameRefactoring =
RenameRefactoring(refactoringWorkspace, resolvedUnit, element);
if (renameRefactoring != null) {
kinds.add(RefactoringKind.RENAME);
@@ -815,8 +795,7 @@
}
YamlMap _getOptions(SourceFactory sourceFactory, String content) {
- AnalysisOptionsProvider optionsProvider =
- AnalysisOptionsProvider(sourceFactory);
+ var optionsProvider = AnalysisOptionsProvider(sourceFactory);
try {
return optionsProvider.getOptionsFromString(content);
} on OptionsFormatException {
@@ -849,8 +828,8 @@
}
static int _getNumberOfScanParseErrors(List<engine.AnalysisError> errors) {
- int numScanParseErrors = 0;
- for (engine.AnalysisError error in errors) {
+ var numScanParseErrors = 0;
+ for (var error in errors) {
if (error.errorCode is engine.ScannerErrorCode ||
error.errorCode is engine.ParserErrorCode) {
numScanParseErrors++;
diff --git a/pkg/analysis_server/lib/src/edit/fix/dartfix_listener.dart b/pkg/analysis_server/lib/src/edit/fix/dartfix_listener.dart
index 26c1b21..aad1d10 100644
--- a/pkg/analysis_server/lib/src/edit/fix/dartfix_listener.dart
+++ b/pkg/analysis_server/lib/src/edit/fix/dartfix_listener.dart
@@ -47,8 +47,8 @@
void addSourceChange(
String description, Location location, SourceChange change) {
suggestions.add(DartFixSuggestion(description, location: location));
- for (SourceFileEdit fileEdit in change.edits) {
- for (SourceEdit sourceEdit in fileEdit.edits) {
+ for (var fileEdit in change.edits) {
+ for (var sourceEdit in fileEdit.edits) {
sourceChange.addEdit(fileEdit.file, fileEdit.fileStamp, sourceEdit);
}
}
@@ -58,7 +58,7 @@
void addSourceEdits(String description, Location location, Source source,
Iterable<SourceEdit> edits) {
suggestions.add(DartFixSuggestion(description, location: location));
- for (SourceEdit edit in edits) {
+ for (var edit in edits) {
sourceChange.addEdit(source.fullName, -1, edit);
}
}
@@ -67,7 +67,7 @@
void addSourceFileEdit(
String description, Location location, SourceFileEdit fileEdit) {
suggestions.add(DartFixSuggestion(description, location: location));
- for (SourceEdit sourceEdit in fileEdit.edits) {
+ for (var sourceEdit in fileEdit.edits) {
sourceChange.addEdit(fileEdit.file, fileEdit.fileStamp, sourceEdit);
}
}
diff --git a/pkg/analysis_server/lib/src/edit/fix/fix_code_task.dart b/pkg/analysis_server/lib/src/edit/fix/fix_code_task.dart
index e377cb9..bdd3a48 100644
--- a/pkg/analysis_server/lib/src/edit/fix/fix_code_task.dart
+++ b/pkg/analysis_server/lib/src/edit/fix/fix_code_task.dart
@@ -17,7 +17,7 @@
/// Return the task used to migrate to NNBD.
NonNullableFix get nonNullableFixTask {
- for (FixCodeTask task in _codeTasks) {
+ for (var task in _codeTasks) {
if (task is NonNullableFix) {
return task;
}
@@ -28,19 +28,19 @@
int get numPhases => _numPhases;
Future<void> finishCodeTasks() async {
- for (FixCodeTask task in _codeTasks) {
+ for (var task in _codeTasks) {
await task.finish();
}
}
Future<void> processCodeTasks(int phase, ResolvedUnitResult result) async {
- for (FixCodeTask task in _codeTasks) {
+ for (var task in _codeTasks) {
await task.processUnit(phase, result);
}
}
void processPackage(Folder pkgFolder) async {
- for (FixCodeTask task in _codeTasks) {
+ for (var task in _codeTasks) {
await task.processPackage(pkgFolder);
}
}
diff --git a/pkg/analysis_server/lib/src/edit/fix/fix_error_task.dart b/pkg/analysis_server/lib/src/edit/fix/fix_error_task.dart
index 23b29b7..7fc3e1e 100644
--- a/pkg/analysis_server/lib/src/edit/fix/fix_error_task.dart
+++ b/pkg/analysis_server/lib/src/edit/fix/fix_error_task.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/plugin/edit/fix/fix_core.dart';
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analysis_server/src/edit/edit_dartfix.dart';
import 'package:analysis_server/src/edit/fix/dartfix_listener.dart';
@@ -20,8 +19,8 @@
final errorTaskMap = <ErrorCode, FixErrorTask>{};
Future<bool> processErrors(ResolvedUnitResult result) async {
- bool foundError = false;
- for (AnalysisError error in result.errors) {
+ var foundError = false;
+ for (var error in result.errors) {
final task = errorTaskMap[error.errorCode];
if (task != null) {
await task.fixError(result, error);
@@ -52,7 +51,7 @@
(name) => [],
);
final processor = FixProcessor(dartContext);
- Fix fix = await processor.computeFix();
+ var fix = await processor.computeFix();
final location = listener.locationFor(result, error.offset, error.length);
if (fix != null) {
listener.addSourceChange(fix.change.message, location, fix.change);
diff --git a/pkg/analysis_server/lib/src/edit/fix/non_nullable_fix.dart b/pkg/analysis_server/lib/src/edit/fix/non_nullable_fix.dart
index 7ea3adf..4d3b523 100644
--- a/pkg/analysis_server/lib/src/edit/fix/non_nullable_fix.dart
+++ b/pkg/analysis_server/lib/src/edit/fix/non_nullable_fix.dart
@@ -44,6 +44,8 @@
/// server should be started.
int port;
+ String authToken;
+
InstrumentationListener instrumentationListener;
NullabilityMigrationAdapter adapter;
@@ -55,7 +57,7 @@
/// If this occurs, then don't update any code.
bool _packageIsNNBD = true;
- Future<void> Function(List<String>) rerunFunction;
+ Future<void> Function([List<String>]) rerunFunction;
NonNullableFix(this.listener, {List<String> included = const []})
: includedRoot =
@@ -66,10 +68,14 @@
@override
int get numPhases => 3;
- /// Return a list of the Urls corresponding to the included roots.
+ /// Return a list of the URLs corresponding to the included roots.
List<String> get previewUrls => [
- Uri(scheme: 'http', host: 'localhost', port: port, path: includedRoot)
- .toString()
+ Uri(
+ scheme: 'http',
+ host: 'localhost',
+ port: port,
+ path: includedRoot,
+ queryParameters: {'authToken': authToken}).toString()
];
@override
@@ -82,6 +88,7 @@
server = HttpPreviewServer(state, rerun);
server.serveHttp();
port = await server.boundPort;
+ authToken = await server.authToken;
}
}
@@ -96,7 +103,7 @@
// TODO(danrubel): Update pubspec.yaml to enable NNBD
- File optionsFile = pkgFolder.getChildAssumingFile('analysis_options.yaml');
+ var optionsFile = pkgFolder.getChildAssumingFile('analysis_options.yaml');
String optionsContent;
YamlNode optionsMap;
if (optionsFile.exists) {
@@ -130,8 +137,7 @@
''';
} else if (analyzerOptions is YamlMap) {
- YamlNode experiments =
- analyzerOptions.nodes[AnalyzerOptions.enableExperiment];
+ var experiments = analyzerOptions.nodes[AnalyzerOptions.enableExperiment];
if (experiments == null) {
parentSpan = analyzerOptions.span;
content = '''
@@ -157,10 +163,10 @@
final cr = '\r'.codeUnitAt(0);
final lf = '\n'.codeUnitAt(0);
- int line = parentSpan.end.line;
- int offset = parentSpan.end.offset;
+ var line = parentSpan.end.line;
+ var offset = parentSpan.end.offset;
while (offset > 0) {
- int ch = optionsContent.codeUnitAt(offset - 1);
+ var ch = optionsContent.codeUnitAt(offset - 1);
if (ch == space || ch == cr) {
--offset;
} else if (ch == lf) {
@@ -218,7 +224,7 @@
_packageIsNNBD = false;
}
- Future<MigrationState> rerun(List<String> changedPaths) async {
+ Future<MigrationState> rerun([List<String> changedPaths]) async {
reset();
await rerunFunction(changedPaths);
final state = MigrationState(
@@ -250,14 +256,14 @@
// all of the paths, comparing parts, joining one path back together). In
// practice, this should be cheap because typically only one path is given
// to dartfix.
- List<String> rootParts = included
+ var rootParts = included
.map((p) => context.normalize(context.absolute(p)))
.map((p) => provider.getResource(p) is File ? context.dirname(p) : p)
.map((p) => context.split(p))
.reduce((value, parts) {
- List<String> shorterPath = value.length < parts.length ? value : parts;
- int length = shorterPath.length;
- for (int i = 0; i < length; i++) {
+ var shorterPath = value.length < parts.length ? value : parts;
+ var length = shorterPath.length;
+ for (var i = 0; i < length; i++) {
if (value[i] != parts[i]) {
// [value] and [parts] are the same, only up to part [i].
return value.sublist(0, i);
diff --git a/pkg/analysis_server/lib/src/edit/fix/prefer_mixin_fix.dart b/pkg/analysis_server/lib/src/edit/fix/prefer_mixin_fix.dart
index 014f4c5..6ab084c 100644
--- a/pkg/analysis_server/lib/src/edit/fix/prefer_mixin_fix.dart
+++ b/pkg/analysis_server/lib/src/edit/fix/prefer_mixin_fix.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/plugin/edit/assist/assist_core.dart';
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analysis_server/src/edit/fix/dartfix_listener.dart';
import 'package:analysis_server/src/edit/fix/dartfix_registrar.dart';
@@ -28,25 +27,24 @@
int get numPhases => 0;
Future<void> convertClassToMixin(Element elem) async {
- ResolvedUnitResult result =
- await listener.server.getResolvedUnit(elem.source?.fullName);
+ var result = await listener.server.getResolvedUnit(elem.source?.fullName);
- for (CompilationUnitMember declaration in result.unit.declarations) {
+ for (var declaration in result.unit.declarations) {
if (declaration is ClassOrMixinDeclaration &&
declaration.name.name == elem.name) {
- AssistProcessor processor = AssistProcessor(
+ var processor = AssistProcessor(
DartAssistContextImpl(
DartChangeWorkspace(listener.server.currentSessions),
result,
declaration.name.offset,
0),
);
- List<Assist> assists = await processor
+ var assists = await processor
.computeAssist(DartAssistKind.CONVERT_CLASS_TO_MIXIN);
final location =
listener.locationFor(result, elem.nameOffset, elem.nameLength);
if (assists.isNotEmpty) {
- for (Assist assist in assists) {
+ for (var assist in assists) {
listener.addSourceChange('Convert ${elem.displayName} to a mixin',
location, assist.change);
}
@@ -64,7 +62,7 @@
@override
Future<void> finish() async {
- for (Element elem in classesToConvert) {
+ for (var elem in classesToConvert) {
await convertClassToMixin(elem);
}
}
@@ -72,9 +70,9 @@
@override
Future<void> fixError(ResolvedUnitResult result, AnalysisError error) async {
var node = NodeLocator(error.offset).searchWithin(result.unit);
- TypeName type = node.thisOrAncestorOfType<TypeName>();
+ var type = node.thisOrAncestorOfType<TypeName>();
if (type != null) {
- Element element = type.name.staticElement;
+ var element = type.name.staticElement;
if (element.source?.fullName != null) {
classesToConvert.add(element);
}
diff --git a/pkg/analysis_server/lib/src/edit/nnbd_migration/info_builder.dart b/pkg/analysis_server/lib/src/edit/nnbd_migration/info_builder.dart
index bd289f3..f72a585 100644
--- a/pkg/analysis_server/lib/src/edit/nnbd_migration/info_builder.dart
+++ b/pkg/analysis_server/lib/src/edit/nnbd_migration/info_builder.dart
@@ -13,14 +13,11 @@
import 'package:analysis_server/src/edit/nnbd_migration/offset_mapper.dart';
import 'package:analysis_server/src/utilities/strings.dart';
import 'package:analyzer/dart/analysis/results.dart';
-import 'package:analyzer/dart/analysis/session.dart';
import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/ast/syntactic_entity.dart';
-import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/file_system/file_system.dart';
-import 'package:analyzer/src/generated/source.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart'
- show SourceEdit, SourceFileEdit;
+ show SourceFileEdit;
import 'package:analyzer_plugin/protocol/protocol_common.dart' as protocol;
import 'package:analyzer_plugin/src/utilities/navigation/navigation.dart';
import 'package:meta/meta.dart';
@@ -62,18 +59,16 @@
/// Return the migration information for all of the libraries that were
/// migrated.
Future<Set<UnitInfo>> explainMigration() async {
- Map<Source, SourceInformation> sourceInfoMap = info.sourceInformation;
+ var sourceInfoMap = info.sourceInformation;
Set<UnitInfo> units =
SplayTreeSet<UnitInfo>((u1, u2) => u1.path.compareTo(u2.path));
- for (Source source in sourceInfoMap.keys) {
- String filePath = source.fullName;
- AnalysisSession session =
- server.getAnalysisDriver(filePath).currentSession;
+ for (var source in sourceInfoMap.keys) {
+ var filePath = source.fullName;
+ var session = server.getAnalysisDriver(filePath).currentSession;
if (!session.getFile(filePath).isPart) {
- ResolvedLibraryResult result =
- await session.getResolvedLibrary(filePath);
- for (ResolvedUnitResult unitResult in result.units) {
- SourceInformation sourceInfo =
+ var result = await session.getResolvedLibrary(filePath);
+ for (var unitResult in result.units) {
+ var sourceInfo =
sourceInfoMap[unitResult.unit.declaredElement.source];
// Note: there might have been no information for this unit in
// sourceInfoMap. That can happen if there's an already-migrated
@@ -85,9 +80,8 @@
// referenced (we'll just skip the entire library because we'll only
// ever see its parts).
sourceInfo ??= SourceInformation();
- SourceFileEdit edit =
- listener.sourceChange.getFileEdit(unitResult.path);
- UnitInfo unit = _explainUnit(sourceInfo, unitResult, edit);
+ var edit = listener.sourceChange.getFileEdit(unitResult.path);
+ var unit = _explainUnit(sourceInfo, unitResult, edit);
if (provider.pathContext.isWithin(includedPath, unitResult.path)) {
units.add(unit);
}
@@ -100,7 +94,7 @@
Iterable<EdgeInfo> upstreamTriggeredEdges(NullabilityNodeInfo node,
{bool skipExactNullable = true}) {
var edges = <EdgeInfo>[];
- for (EdgeInfo edge in node.upstreamEdges) {
+ for (var edge in node.upstreamEdges) {
if (skipExactNullable &&
node.isExactNullable &&
edge.sourceNode.isExactNullable) {
@@ -133,11 +127,11 @@
/// present tense, beginning with a capital letter, not ending in a period.
String _baseDescriptionForOrigin(
EdgeOriginInfo origin, NullabilityFixKind fixKind) {
- AstNode node = origin.node;
- AstNode parent = node.parent;
+ var node = origin.node;
+ var parent = node.parent;
String aNullableDefault(DefaultFormalParameter node) {
- Expression defaultValue = node.defaultValue;
+ var defaultValue = node.defaultValue;
if (defaultValue == null) {
return "an implicit default value of 'null'";
} else if (defaultValue is NullLiteral) {
@@ -178,8 +172,8 @@
'type';
}
- CompilationUnit unit = node.thisOrAncestorOfType<CompilationUnit>();
- int lineNumber = unit.lineInfo.getLocation(node.offset).lineNumber;
+ var unit = node.thisOrAncestorOfType<CompilationUnit>();
+ var lineNumber = unit.lineInfo.getLocation(node.offset).lineNumber;
if (origin.kind == EdgeOriginKind.uninitializedRead) {
return 'Used on line $lineNumber, when it is possibly uninitialized';
@@ -204,10 +198,8 @@
if (parent is ExpressionFunctionBody) {
return parent;
} else {
- ReturnStatement returnNode =
- parent.thisOrAncestorOfType<ReturnStatement>();
- BlockFunctionBody bodyNode =
- returnNode?.thisOrAncestorOfType<BlockFunctionBody>();
+ var returnNode = parent.thisOrAncestorOfType<ReturnStatement>();
+ var bodyNode = returnNode?.thisOrAncestorOfType<BlockFunctionBody>();
return bodyNode;
}
}
@@ -215,7 +207,7 @@
/// If the [node] is inside a collection literal, return it. Otherwise
/// return `null`.
TypedLiteral findCollectionLiteral() {
- AstNode ancestor = parent;
+ var ancestor = parent;
// Walk up collection elements, except for collection literals.
while (ancestor is CollectionElement && ancestor is! TypedLiteral) {
ancestor = ancestor.parent;
@@ -223,9 +215,9 @@
return (ancestor is TypedLiteral) ? ancestor : null;
}
- FunctionBody functionBody = findFunctionBody();
+ var functionBody = findFunctionBody();
if (functionBody != null) {
- AstNode function = functionBody.parent;
+ var function = functionBody.parent;
if (function is MethodDeclaration) {
if (function.isGetter) {
return 'This getter returns $nullableValue on line $lineNumber';
@@ -235,7 +227,7 @@
return 'This function returns $nullableValue on line $lineNumber';
}
- TypedLiteral collectionLiteral = findCollectionLiteral();
+ var collectionLiteral = findCollectionLiteral();
if (collectionLiteral != null) {
if (collectionLiteral is ListLiteral) {
return 'This list is initialized with $nullableValue on line '
@@ -251,15 +243,14 @@
} else if (parent is ArgumentList) {
return capitalize('$nullableValue is passed as an argument');
} else if (parent is VariableDeclaration) {
- AstNode grandparent = parent.parent?.parent;
+ var grandparent = parent.parent?.parent;
if (grandparent is FieldDeclaration) {
return 'This field is initialized to $nullableValue';
}
return 'This variable is initialized to $nullableValue';
} else if (origin.kind == EdgeOriginKind.fieldNotInitialized) {
if (node is ConstructorDeclaration) {
- String constructorName =
- node.declaredElement.enclosingElement.displayName;
+ var constructorName = node.declaredElement.enclosingElement.displayName;
if (node.declaredElement.displayName.isNotEmpty) {
constructorName =
'$constructorName.${node.declaredElement.displayName}';
@@ -271,7 +262,7 @@
}
}
- String enclosingMemberDescription = buildEnclosingMemberDescription(node);
+ var enclosingMemberDescription = buildEnclosingMemberDescription(node);
if (enclosingMemberDescription != null) {
return capitalize(
'$nullableValue is assigned in $enclosingMemberDescription');
@@ -284,7 +275,7 @@
/// Return a description of the given [origin].
String _buildDescriptionForOrigin(
EdgeOriginInfo origin, NullabilityFixKind fixKind) {
- String description = _baseDescriptionForOrigin(origin, fixKind);
+ var description = _baseDescriptionForOrigin(origin, fixKind);
if (_inTestCode(origin.node)) {
// TODO(brianwilkerson) Don't add this if the graph node with which the
// origin is associated is also in test code.
@@ -296,10 +287,10 @@
/// Return a description of the given [origin] associated with the [edge].
RegionDetail _buildDetailForOrigin(
EdgeOriginInfo origin, EdgeInfo edge, NullabilityFixKind fixKind) {
- AstNode node = origin.node;
+ var node = origin.node;
NavigationTarget target;
- TypeAnnotation type = info.typeAnnotationForNode(edge.sourceNode);
- AstNode typeParent = type?.parent;
+ var type = info.typeAnnotationForNode(edge.sourceNode);
+ var typeParent = type?.parent;
if (typeParent is GenericFunctionType && type == typeParent.returnType) {
var description =
@@ -333,12 +324,11 @@
// the superclass, or the return type in the declaration in that
// subclass.
if (type != null) {
- CompilationUnit unit = type.thisOrAncestorOfType<CompilationUnit>();
+ var unit = type.thisOrAncestorOfType<CompilationUnit>();
target = _proximateTargetForNode(
unit.declaredElement.source.fullName, type);
}
- String description =
- _buildInheritanceDescriptionForOrigin(origin, type);
+ var description = _buildInheritanceDescriptionForOrigin(origin, type);
return RegionDetail(description, target);
} else {
target = _proximateTargetForNode(origin.source.fullName, node);
@@ -350,7 +340,7 @@
String _buildInheritanceDescriptionForOrigin(
EdgeOriginInfo origin, TypeAnnotation type) {
if (origin.kind == EdgeOriginKind.parameterInheritance) {
- String overriddenName = 'the overridden method';
+ var overriddenName = 'the overridden method';
if (type != null && type.parent is FormalParameter) {
FormalParameter parameter = type.parent;
if (parameter.parent is DefaultFormalParameter) {
@@ -359,9 +349,9 @@
if (parameter.parent is FormalParameterList &&
parameter.parent.parent is MethodDeclaration) {
MethodDeclaration method = parameter.parent.parent;
- String methodName = method.name.name;
+ var methodName = method.name.name;
ClassOrMixinDeclaration cls = method.parent;
- String className = cls.name.name;
+ var className = cls.name.name;
overriddenName += ', $className.$methodName,';
}
}
@@ -373,9 +363,9 @@
/// Compute the details for the fix with the given [edit].
List<RegionDetail> _computeDetails(AtomicEdit edit) {
- List<RegionDetail> details = [];
+ var details = <RegionDetail>[];
var fixInfo = edit.info;
- for (FixReasonInfo reason in fixInfo?.fixReasons ?? []) {
+ for (var reason in fixInfo?.fixReasons ?? []) {
if (reason == null) {
// Sometimes reasons are null, so just ignore them (see for example the
// test case InfoBuilderTest.test_discardCondition. If only we had
@@ -385,7 +375,7 @@
if (reason.isExactNullable) {
// When the node is exact nullable, that nullability propagated from
// downstream.
- for (EdgeInfo edge in reason.downstreamEdges) {
+ for (var edge in reason.downstreamEdges) {
final exactNullableDownstream = edge.destinationNode;
if (!exactNullableDownstream.isExactNullable) {
// This wasn't the source of the nullability.
@@ -408,8 +398,8 @@
}
}
- for (EdgeInfo edge in upstreamTriggeredEdges(reason)) {
- EdgeOriginInfo origin = info.edgeOrigin[edge];
+ for (var edge in upstreamTriggeredEdges(reason)) {
+ var origin = info.edgeOrigin[edge];
if (origin != null) {
details.add(
_buildDetailForOrigin(origin, edge, fixInfo.description.kind));
@@ -420,9 +410,9 @@
}
}
} else if (reason is EdgeInfo) {
- NullabilityNodeInfo destination = reason.destinationNode;
- NodeInformation nodeInfo = info.nodeInfoFor(destination);
- EdgeOriginInfo edge = info.edgeOrigin[reason];
+ var destination = reason.destinationNode;
+ var nodeInfo = info.nodeInfoFor(destination);
+ var edge = info.edgeOrigin[reason];
if (destination == info.never) {
details.add(RegionDetail(_describeNonNullEdge(edge), null));
} else if (nodeInfo != null && nodeInfo.astNode != null) {
@@ -448,7 +438,7 @@
/// Return an edit that can be applied.
List<EditDetail> _computeEdits(AtomicEditInfo fixInfo, int offset) {
- List<EditDetail> edits = [];
+ var edits = <EditDetail>[];
var fixKind = fixInfo.description.kind;
switch (fixKind) {
case NullabilityFixKind.addRequired:
@@ -483,23 +473,22 @@
/// Return the navigation sources for the unit associated with the [result].
List<NavigationSource> _computeNavigationSources(ResolvedUnitResult result) {
- NavigationCollectorImpl collector = NavigationCollectorImpl();
+ var collector = NavigationCollectorImpl();
computeDartNavigation(
result.session.resourceProvider, collector, result.unit, null, null);
collector.createRegions();
- List<String> files = collector.files;
- List<protocol.NavigationRegion> regions = collector.regions;
- List<protocol.NavigationTarget> rawTargets = collector.targets;
- List<NavigationTarget> convertedTargets =
- List<NavigationTarget>(rawTargets.length);
+ var files = collector.files;
+ var regions = collector.regions;
+ var rawTargets = collector.targets;
+ var convertedTargets = List<NavigationTarget>(rawTargets.length);
return regions.map((region) {
- List<int> targets = region.targets;
+ var targets = region.targets;
if (targets.isEmpty) {
throw StateError('Targets is empty');
}
- NavigationTarget target = convertedTargets[targets[0]];
+ var target = convertedTargets[targets[0]];
if (target == null) {
- protocol.NavigationTarget rawTarget = rawTargets[targets[0]];
+ var rawTarget = rawTargets[targets[0]];
target = _targetForRawTarget(files[rawTarget.fileIndex], rawTarget);
convertedTargets[targets[0]] = target;
}
@@ -510,7 +499,7 @@
void _computeTraceNonNullableInfo(
NullabilityNodeInfo node, List<TraceInfo> traces) {
- List<TraceEntryInfo> entries = [];
+ var entries = <TraceEntryInfo>[];
var step = node.whyNotNullable;
if (step == null) {
return;
@@ -529,7 +518,7 @@
void _computeTraceNullableInfo(
NullabilityNodeInfo node, List<TraceInfo> traces) {
- List<TraceEntryInfo> entries = [];
+ var entries = <TraceEntryInfo>[];
var step = node.whyNullable;
if (step == null) {
return;
@@ -547,7 +536,7 @@
}
List<TraceInfo> _computeTraces(List<FixReasonInfo> fixReasons) {
- List<TraceInfo> traces = [];
+ var traces = <TraceInfo>[];
for (var reason in fixReasons) {
if (reason is NullabilityNodeInfo) {
if (reason.isNullable) {
@@ -588,36 +577,35 @@
/// [result].
UnitInfo _explainUnit(SourceInformation sourceInfo, ResolvedUnitResult result,
SourceFileEdit fileEdit) {
- UnitInfo unitInfo = _unitForPath(result.path);
+ var unitInfo = _unitForPath(result.path);
unitInfo.sources ??= _computeNavigationSources(result);
- String content = result.content;
- List<RegionInfo> regions = unitInfo.regions;
+ var content = result.content;
+ var regions = unitInfo.regions;
var lineInfo = result.unit.lineInfo;
- Map<int, List<AtomicEdit>> insertions = {};
+ var insertions = <int, List<AtomicEdit>>{};
// Apply edits and build the regions.
var changes = sourceInfo.changes ?? {};
var sourceOffsets = changes.keys.toList();
sourceOffsets.sort();
- int offset = 0;
- int lastSourceOffset = 0;
+ var offset = 0;
+ var lastSourceOffset = 0;
for (var sourceOffset in sourceOffsets) {
offset += sourceOffset - lastSourceOffset;
lastSourceOffset = sourceOffset;
var changesForSourceOffset = changes[sourceOffset];
for (var edit in changesForSourceOffset) {
- int length = edit.length;
- String replacement = edit.replacement;
- int end = offset + length;
+ var length = edit.length;
+ var replacement = edit.replacement;
+ var end = offset + length;
// Insert the replacement text without deleting the replaced text.
if (replacement.isNotEmpty) {
content = content.replaceRange(end, end, replacement);
(insertions[sourceOffset] ??= []).add(AtomicEdit.insert(replacement));
}
var info = edit.info;
- String explanation = info?.description?.appliedMessage;
- List<EditDetail> edits =
- info != null ? _computeEdits(info, sourceOffset) : [];
+ var explanation = info?.description?.appliedMessage;
+ var edits = info != null ? _computeEdits(info, sourceOffset) : [];
List<RegionDetail> details;
try {
details = _computeDetails(edit);
@@ -656,9 +644,9 @@
// Build the map from source file offset to offset in the modified text.
// We only account for insertions because in the code above, we don't delete
// the modified text.
- List<SourceEdit> edits = insertions.toSourceEdits();
+ var edits = insertions.toSourceEdits();
edits.sort((first, second) => first.offset.compareTo(second.offset));
- OffsetMapper mapper = OffsetMapper.forEdits(edits);
+ var mapper = OffsetMapper.forEdits(edits);
regions.sort((first, second) => first.offset.compareTo(second.offset));
unitInfo.offsetMapper = mapper;
unitInfo.content = content;
@@ -669,12 +657,12 @@
/// 'test' directory of the package.
bool _inTestCode(AstNode node) {
// TODO(brianwilkerson) Generalize this.
- CompilationUnit unit = node.thisOrAncestorOfType<CompilationUnit>();
- CompilationUnitElement unitElement = unit?.declaredElement;
+ var unit = node.thisOrAncestorOfType<CompilationUnit>();
+ var unitElement = unit?.declaredElement;
if (unitElement == null) {
return false;
}
- String filePath = unitElement.source.fullName;
+ var filePath = unitElement.source.fullName;
var resourceProvider = unitElement.session.resourceProvider;
return resourceProvider.pathContext.split(filePath).contains('test');
}
@@ -706,8 +694,8 @@
if (node == null) {
return null;
}
- AstNode parent = node.parent;
- CompilationUnit unit = node.thisOrAncestorOfType<CompilationUnit>();
+ var parent = node.parent;
+ var unit = node.thisOrAncestorOfType<CompilationUnit>();
if (node is ConstructorDeclaration) {
if (node.name != null) {
return _targetForNode(filePath, node.name, unit);
@@ -733,7 +721,7 @@
}
TraceEntryInfo _stepToTraceEntry(PropagationStepInfo step) {
- String description = step.edge?.description;
+ var description = step.edge?.description;
description ??= step.toString(); // TODO(paulberry): improve this message.
return _makeTraceEntry(description, step.codeReference);
}
@@ -742,12 +730,12 @@
/// given [offset] ans with the given [length].
NavigationTarget _targetForNode(
String filePath, SyntacticEntity node, CompilationUnit unit) {
- UnitInfo unitInfo = _unitForPath(filePath);
- int offset = node.offset;
- int length = node.length;
+ var unitInfo = _unitForPath(filePath);
+ var offset = node.offset;
+ var length = node.length;
- int line = unit.lineInfo.getLocation(node.offset).lineNumber;
- NavigationTarget target = NavigationTarget(filePath, offset, line, length);
+ var line = unit.lineInfo.getLocation(node.offset).lineNumber;
+ var target = NavigationTarget(filePath, offset, line, length);
unitInfo.targets.add(target);
return target;
}
@@ -756,11 +744,10 @@
/// given [offset] ans with the given [length].
NavigationTarget _targetForRawTarget(
String filePath, protocol.NavigationTarget rawTarget) {
- UnitInfo unitInfo = _unitForPath(filePath);
- int offset = rawTarget.offset;
- int length = rawTarget.length;
- NavigationTarget target =
- NavigationTarget(filePath, offset, null /* line */, length);
+ var unitInfo = _unitForPath(filePath);
+ var offset = rawTarget.offset;
+ var length = rawTarget.length;
+ var target = NavigationTarget(filePath, offset, null /* line */, length);
unitInfo.targets.add(target);
return target;
}
@@ -831,7 +818,7 @@
static String _describeClassOrExtensionMember(CompilationUnitMember parent,
String baseDescription, String functionName) {
if (parent is NamedCompilationUnitMember) {
- String parentName = parent.name.name;
+ var parentName = parent.name.name;
if (functionName.isEmpty) {
return "$baseDescription '$parentName'";
} else {
diff --git a/pkg/analysis_server/lib/src/edit/nnbd_migration/instrumentation_information.dart b/pkg/analysis_server/lib/src/edit/nnbd_migration/instrumentation_information.dart
index fe1c5da..07398ba 100644
--- a/pkg/analysis_server/lib/src/edit/nnbd_migration/instrumentation_information.dart
+++ b/pkg/analysis_server/lib/src/edit/nnbd_migration/instrumentation_information.dart
@@ -37,10 +37,8 @@
/// Return the type annotation associated with the [node] or `null` if the
/// node represents an implicit type.
TypeAnnotation typeAnnotationForNode(NullabilityNodeInfo node) {
- for (MapEntry<Source, SourceInformation> sourceEntry
- in sourceInformation.entries) {
- for (MapEntry<TypeAnnotation, NullabilityNodeInfo> typeEntry
- in sourceEntry.value.explicitTypeNullability.entries) {
+ for (var sourceEntry in sourceInformation.entries) {
+ for (var typeEntry in sourceEntry.value.explicitTypeNullability.entries) {
if (typeEntry.value == node) {
return typeEntry.key;
}
diff --git a/pkg/analysis_server/lib/src/edit/nnbd_migration/instrumentation_listener.dart b/pkg/analysis_server/lib/src/edit/nnbd_migration/instrumentation_listener.dart
index 8bdc0b8..933b7b5 100644
--- a/pkg/analysis_server/lib/src/edit/nnbd_migration/instrumentation_listener.dart
+++ b/pkg/analysis_server/lib/src/edit/nnbd_migration/instrumentation_listener.dart
@@ -101,7 +101,7 @@
NodeInformation(_filePathForSource(source), astNode, element);
var dartType = decoratedType.type;
if (dartType is InterfaceType) {
- for (int i = 0; i < dartType.typeArguments.length; i++) {
+ for (var i = 0; i < dartType.typeArguments.length; i++) {
_storeNodeInformation(
decoratedType.typeArgument(i), source, astNode, element);
}
@@ -112,7 +112,7 @@
astNode,
element,
);
- int i = 0;
+ var i = 0;
for (var parameter in dartType.parameters) {
if (parameter.isNamed) {
var name = parameter.name;
diff --git a/pkg/analysis_server/lib/src/edit/nnbd_migration/instrumentation_renderer.dart b/pkg/analysis_server/lib/src/edit/nnbd_migration/instrumentation_renderer.dart
index af22d6b..272b98e 100644
--- a/pkg/analysis_server/lib/src/edit/nnbd_migration/instrumentation_renderer.dart
+++ b/pkg/analysis_server/lib/src/edit/nnbd_migration/instrumentation_renderer.dart
@@ -10,6 +10,35 @@
as resources;
import 'package:path/path.dart' as path;
+String get _dartSdkVersion {
+ var version = Platform.version;
+
+ // Remove the build date and OS.
+ if (version.contains(' ')) {
+ version = version.substring(0, version.indexOf(' '));
+ }
+
+ // Convert a git hash to 8 chars.
+ // '2.8.0-edge.fd992e423ef69ece9f44bd3ac58fa2355b563212'
+ var versionRegExp = RegExp(r'^.*\.([0123456789abcdef]+)$');
+ var match = versionRegExp.firstMatch(version);
+ if (match != null && match.group(1).length == 40) {
+ var commit = match.group(1);
+ version = version.replaceAll(commit, commit.substring(0, 10));
+ }
+
+ return version;
+}
+
+String substituteVariables(String content, Map<String, String> variables) {
+ for (var variable in variables.keys) {
+ var value = variables[variable];
+ content = content.replaceAll('{{ $variable }}', value);
+ }
+
+ return content;
+}
+
/// Instrumentation display output for a library that was migrated to use
/// non-nullable types.
class InstrumentationRenderer {
@@ -33,7 +62,7 @@
/// Builds an HTML view of the instrumentation information.
String render() {
- Map<String, String> variables = {
+ var variables = <String, String>{
'root': migrationInfo.includedRoot,
'dartPageScript': resources.migration_js,
'dartPageStyle': resources.migration_css,
@@ -46,32 +75,3 @@
return substituteVariables(resources.index_html, variables);
}
}
-
-String substituteVariables(String content, Map<String, String> variables) {
- for (String variable in variables.keys) {
- String value = variables[variable];
- content = content.replaceAll('{{ $variable }}', value);
- }
-
- return content;
-}
-
-String get _dartSdkVersion {
- String version = Platform.version;
-
- // Remove the build date and OS.
- if (version.contains(' ')) {
- version = version.substring(0, version.indexOf(' '));
- }
-
- // Convert a git hash to 8 chars.
- // '2.8.0-edge.fd992e423ef69ece9f44bd3ac58fa2355b563212'
- final RegExp versionRegExp = RegExp(r'^.*\.([0123456789abcdef]+)$');
- RegExpMatch match = versionRegExp.firstMatch(version);
- if (match != null && match.group(1).length == 40) {
- String commit = match.group(1);
- version = version.replaceAll(commit, commit.substring(0, 10));
- }
-
- return version;
-}
diff --git a/pkg/analysis_server/lib/src/edit/nnbd_migration/migration_info.dart b/pkg/analysis_server/lib/src/edit/nnbd_migration/migration_info.dart
index 7bd0a6d..f190d0d 100644
--- a/pkg/analysis_server/lib/src/edit/nnbd_migration/migration_info.dart
+++ b/pkg/analysis_server/lib/src/edit/nnbd_migration/migration_info.dart
@@ -61,9 +61,9 @@
pathContext.relative(unit.path, from: includedRoot);
List<UnitLink> unitLinks() {
- List<UnitLink> links = [];
- for (UnitInfo unit in units) {
- int count = unit.fixRegions.length;
+ var links = <UnitLink>[];
+ for (var unit in units) {
+ var count = unit.fixRegions.length;
links.add(UnitLink(
_pathTo(target: unit), pathContext.split(computeName(unit)), count));
}
diff --git a/pkg/analysis_server/lib/src/edit/nnbd_migration/migration_state.dart b/pkg/analysis_server/lib/src/edit/nnbd_migration/migration_state.dart
index e0e2a7f..41ab440 100644
--- a/pkg/analysis_server/lib/src/edit/nnbd_migration/migration_state.dart
+++ b/pkg/analysis_server/lib/src/edit/nnbd_migration/migration_state.dart
@@ -8,16 +8,12 @@
import 'package:analysis_server/src/edit/nnbd_migration/instrumentation_listener.dart';
import 'package:analysis_server/src/edit/nnbd_migration/migration_info.dart';
import 'package:analysis_server/src/edit/nnbd_migration/path_mapper.dart';
-import 'package:analyzer/file_system/overlay_file_system.dart';
import 'package:nnbd_migration/nnbd_migration.dart';
/// The state of an NNBD migration.
class MigrationState {
bool _hasBeenApplied = false;
- /// If the migration has been applied to disk.
- bool get hasBeenApplied => _hasBeenApplied;
-
/// The migration associated with the state.
final NullabilityMigration migration;
@@ -43,22 +39,25 @@
MigrationState(this.migration, this.includedRoot, this.listener,
this.instrumentationListener, this.adapter);
- /// Refresh the state of the migration after the migration has been updated.
- Future<void> refresh() async {
- assert(!hasBeenApplied);
- OverlayResourceProvider provider = listener.server.resourceProvider;
- InfoBuilder infoBuilder = InfoBuilder(provider, includedRoot,
- instrumentationListener.data, listener, adapter, migration);
- Set<UnitInfo> unitInfos = await infoBuilder.explainMigration();
- var pathContext = provider.pathContext;
- migrationInfo = MigrationInfo(
- unitInfos, infoBuilder.unitMap, pathContext, includedRoot);
- pathMapper = PathMapper(provider);
- }
+ /// If the migration has been applied to disk.
+ bool get hasBeenApplied => _hasBeenApplied;
/// Mark that the migration has been applied to disk.
void markApplied() {
assert(!hasBeenApplied);
_hasBeenApplied = true;
}
+
+ /// Refresh the state of the migration after the migration has been updated.
+ Future<void> refresh() async {
+ assert(!hasBeenApplied);
+ var provider = listener.server.resourceProvider;
+ var infoBuilder = InfoBuilder(provider, includedRoot,
+ instrumentationListener.data, listener, adapter, migration);
+ var unitInfos = await infoBuilder.explainMigration();
+ var pathContext = provider.pathContext;
+ migrationInfo = MigrationInfo(
+ unitInfos, infoBuilder.unitMap, pathContext, includedRoot);
+ pathMapper = PathMapper(provider);
+ }
}
diff --git a/pkg/analysis_server/lib/src/edit/nnbd_migration/offset_mapper.dart b/pkg/analysis_server/lib/src/edit/nnbd_migration/offset_mapper.dart
index 3fa0649..45218d8 100644
--- a/pkg/analysis_server/lib/src/edit/nnbd_migration/offset_mapper.dart
+++ b/pkg/analysis_server/lib/src/edit/nnbd_migration/offset_mapper.dart
@@ -40,8 +40,8 @@
/// Return the delta to be added to the pre-edit [offset] to produce the
/// post-edit offset.
int _deltaFor(int offset) {
- for (int i = 0; i < _offsets.length; i++) {
- int currentOffset = _offsets[i];
+ for (var i = 0; i < _offsets.length; i++) {
+ var currentOffset = _offsets[i];
if (currentOffset >= offset || currentOffset < 0) {
return _deltas[i];
}
@@ -53,10 +53,10 @@
/// Initialize the list of old offsets and deltas used by [_deltaFor].
void _initializeDeltas(List<SourceEdit> edits) {
- int previousDelta = 0;
- for (SourceEdit edit in edits) {
- int offset = edit.offset;
- int length = edit.length;
+ var previousDelta = 0;
+ for (var edit in edits) {
+ var offset = edit.offset;
+ var length = edit.length;
_offsets.add(offset);
_deltas.add(previousDelta);
previousDelta += (edit.replacement.length - length);
diff --git a/pkg/analysis_server/lib/src/edit/nnbd_migration/region_renderer.dart b/pkg/analysis_server/lib/src/edit/nnbd_migration/region_renderer.dart
index 30e228b..f1aea6c 100644
--- a/pkg/analysis_server/lib/src/edit/nnbd_migration/region_renderer.dart
+++ b/pkg/analysis_server/lib/src/edit/nnbd_migration/region_renderer.dart
@@ -36,8 +36,8 @@
var unitDir = pathContext.dirname(pathMapper.map(unitInfo.path));
TargetLink linkForTarget(NavigationTarget target) {
- String relativePath = _relativePathToTarget(target, unitDir);
- String targetUri = _uriForRelativePath(relativePath, target);
+ var relativePath = _relativePathToTarget(target, unitDir);
+ var targetUri = _uriForRelativePath(relativePath, target);
return TargetLink(
path: relativePath,
href: targetUri,
diff --git a/pkg/analysis_server/lib/src/edit/nnbd_migration/resources/index.html b/pkg/analysis_server/lib/src/edit/nnbd_migration/resources/index.html
index 6fa41e4..96f80c9 100644
--- a/pkg/analysis_server/lib/src/edit/nnbd_migration/resources/index.html
+++ b/pkg/analysis_server/lib/src/edit/nnbd_migration/resources/index.html
@@ -18,6 +18,7 @@
<h2 id="unit-name"> </h2>
<button class="apply-migration before-apply">✎ Apply Migration</button>
<button class="apply-migration after-apply" disabled>✎ Apply Migration</button>
+ <button class="rerun-migration before-apply">↻ Rerun From Sources</button>
</header>
<div class="panels horizontal">
<div class="nav-panel">
diff --git a/pkg/analysis_server/lib/src/edit/nnbd_migration/resources/migration.css b/pkg/analysis_server/lib/src/edit/nnbd_migration/resources/migration.css
index 27c3340..76ae137 100644
--- a/pkg/analysis_server/lib/src/edit/nnbd_migration/resources/migration.css
+++ b/pkg/analysis_server/lib/src/edit/nnbd_migration/resources/migration.css
@@ -51,7 +51,7 @@
font-size: 1.2em;
}
-header .apply-migration {
+header .apply-migration, .rerun-migration {
right: 0px;
float: right;
margin: 10px;
diff --git a/pkg/analysis_server/lib/src/edit/nnbd_migration/resources/resources.g.dart b/pkg/analysis_server/lib/src/edit/nnbd_migration/resources/resources.g.dart
index a974261..a1b30c5 100644
--- a/pkg/analysis_server/lib/src/edit/nnbd_migration/resources/resources.g.dart
+++ b/pkg/analysis_server/lib/src/edit/nnbd_migration/resources/resources.g.dart
@@ -270,7 +270,7 @@
''';
String _index_html;
-// index_html md5 is '54a9928481db293c8e6d1869622d95a2'
+// index_html md5 is '41fa7069b77fe104e2d78f9fd1d8d99b'
String _index_html_base64 = '''
PGh0bWw+CjxoZWFkPgogICAgPHRpdGxlPk51bGwgU2FmZXR5IFByZXZpZXc8L3RpdGxlPgogICAgPHNj
cmlwdCBzcmM9Int7IGhpZ2hsaWdodEpzUGF0aCB9fSI+PC9zY3JpcHQ+CiAgICA8c2NyaXB0Pnt7IGRh
@@ -286,37 +286,38 @@
IDxoMiBpZD0idW5pdC1uYW1lIj4mbmJzcDs8L2gyPgogICAgPGJ1dHRvbiBjbGFzcz0iYXBwbHktbWln
cmF0aW9uIGJlZm9yZS1hcHBseSI+JiM5OTk4OyBBcHBseSBNaWdyYXRpb248L2J1dHRvbj4KICAgIDxi
dXR0b24gY2xhc3M9ImFwcGx5LW1pZ3JhdGlvbiBhZnRlci1hcHBseSIgZGlzYWJsZWQ+JiM5OTk4OyBB
-cHBseSBNaWdyYXRpb248L2J1dHRvbj4KPC9oZWFkZXI+CjxkaXYgY2xhc3M9InBhbmVscyBob3Jpem9u
-dGFsIj4KICAgIDxkaXYgY2xhc3M9Im5hdi1wYW5lbCI+CiAgICAgICAgPGRpdiBjbGFzcz0ibmF2LWlu
-bmVyIj4KICAgICAgICAgICAgPGRpdiBjbGFzcz0icGFuZWwtaGVhZGluZyI+UHJvamVjdCBGaWxlczwv
-ZGl2PgogICAgICAgICAgICA8ZGl2IGNsYXNzPSJuYXYtdHJlZSI+PC9kaXY+CiAgICAgICAgPC9kaXY+
-PCEtLSAvbmF2LWlubmVyIC0tPgogICAgPC9kaXY+PCEtLSAvbmF2IC0tPgogICAgPGRpdiBjbGFzcz0i
-Y29udGVudCI+CiAgICAgICAgPGRpdiBjbGFzcz0icmVnaW9ucyI+CiAgICAgICAgICAgIDwhLS0gVGhl
-IHJlZ2lvbnMgb3ZlcmxheSBjb2RlIGNvcHkgb2YgdGhlIGNvbnRlbnQgdG8gcHJvdmlkZSAtLT4KICAg
-ICAgICAgICAgPCEtLSB0b29sdGlwcyBmb3IgbW9kaWZpZWQgcmVnaW9ucy4gLS0+CiAgICAgICAgPC9k
-aXY+PCEtLSAvcmVnaW9ucyAtLT4KICAgICAgICA8ZGl2IGNsYXNzPSJjb2RlIj4KICAgICAgICAgICAg
-PCEtLSBDb21waWxhdGlvbiB1bml0IGNvbnRlbnQgaXMgd3JpdHRlbiBoZXJlLiAtLT4KICAgICAgICAg
-ICAgPHAgY2xhc3M9IndlbGNvbWUiPgogICAgICAgICAgICAgICAgU2VsZWN0IGEgc291cmNlIGZpbGUg
-b24gdGhlIGxlZnQgdG8gcHJldmlldyB0aGUgcHJvcG9zZWQgZWRpdHMuCiAgICAgICAgICAgIDwvcD4K
-ICAgICAgICA8L2Rpdj4KICAgIDwvZGl2PjwhLS0gL2NvbnRlbnQgLS0+CiAgICA8ZGl2IGNsYXNzPSJp
-bmZvLXBhbmVsIj4KICAgICAgICA8ZGl2IGNsYXNzPSJlZGl0LWxpc3QiPgogICAgICAgICAgICA8ZGl2
-IGNsYXNzPSJwYW5lbC1oZWFkaW5nIj5Qcm9wb3NlZCBFZGl0czwvZGl2PgogICAgICAgICAgICA8ZGl2
-IGNsYXNzPSJwYW5lbC1jb250ZW50Ij48L2Rpdj4KICAgICAgICA8L2Rpdj48IS0tIC9lZGl0LWxpc3Qg
-LS0+CiAgICAgICAgPGRpdiBjbGFzcz0iZWRpdC1wYW5lbCI+CiAgICAgICAgICAgIDxkaXYgY2xhc3M9
-InBhbmVsLWhlYWRpbmciPkVkaXQgRGV0YWlsczwvZGl2PgogICAgICAgICAgICA8ZGl2IGNsYXNzPSJw
-YW5lbC1jb250ZW50Ij4KICAgICAgICAgICAgICAgIDxwIGNsYXNzPSJwbGFjZWhvbGRlciI+U2VlIGRl
-dGFpbHMgYWJvdXQgYSBwcm9wb3NlZCBlZGl0LjwvcD4KICAgICAgICAgICAgPC9kaXY+PCEtLSAvcGFu
-ZWwtY29udGVudCAtLT4KICAgICAgICA8L2Rpdj48IS0tIC9lZGl0LXBhbmVsIC0tPgogICAgPC9kaXY+
-PCEtLSAvaW5mby1wYW5lbCAtLT4KPC9kaXY+PCEtLSAvcGFuZWxzIC0tPgo8Zm9vdGVyPgogICAgPGEg
-dGFyZ2V0PSJfYmxhbmsiCiAgICAgICBocmVmPSJodHRwczovL2dpdGh1Yi5jb20vZGFydC1sYW5nL3Nk
-ay9ibG9iL21hc3Rlci9wa2cvbm5iZF9taWdyYXRpb24vUkVBRE1FLm1kIj5OdWxsCiAgICAgICAgc2Fm
-ZXR5IG1pZ3JhdGlvbiBoZWxwPC9hPgogICAgPHNwYW4gY2xhc3M9IndpZGUiPiA8L3NwYW4+CiAgICA8
-ZGl2PkJhc2VkIG9uIHt7IHNka1ZlcnNpb24gfX08L2Rpdj4KPC9mb290ZXI+CjwvYm9keT4KPC9odG1s
-Pgo=
+cHBseSBNaWdyYXRpb248L2J1dHRvbj4KICAgIDxidXR0b24gY2xhc3M9InJlcnVuLW1pZ3JhdGlvbiBi
+ZWZvcmUtYXBwbHkiPiYjODYzNTsgUmVydW4gRnJvbSBTb3VyY2VzPC9idXR0b24+CjwvaGVhZGVyPgo8
+ZGl2IGNsYXNzPSJwYW5lbHMgaG9yaXpvbnRhbCI+CiAgICA8ZGl2IGNsYXNzPSJuYXYtcGFuZWwiPgog
+ICAgICAgIDxkaXYgY2xhc3M9Im5hdi1pbm5lciI+CiAgICAgICAgICAgIDxkaXYgY2xhc3M9InBhbmVs
+LWhlYWRpbmciPlByb2plY3QgRmlsZXM8L2Rpdj4KICAgICAgICAgICAgPGRpdiBjbGFzcz0ibmF2LXRy
+ZWUiPjwvZGl2PgogICAgICAgIDwvZGl2PjwhLS0gL25hdi1pbm5lciAtLT4KICAgIDwvZGl2PjwhLS0g
+L25hdiAtLT4KICAgIDxkaXYgY2xhc3M9ImNvbnRlbnQiPgogICAgICAgIDxkaXYgY2xhc3M9InJlZ2lv
+bnMiPgogICAgICAgICAgICA8IS0tIFRoZSByZWdpb25zIG92ZXJsYXkgY29kZSBjb3B5IG9mIHRoZSBj
+b250ZW50IHRvIHByb3ZpZGUgLS0+CiAgICAgICAgICAgIDwhLS0gdG9vbHRpcHMgZm9yIG1vZGlmaWVk
+IHJlZ2lvbnMuIC0tPgogICAgICAgIDwvZGl2PjwhLS0gL3JlZ2lvbnMgLS0+CiAgICAgICAgPGRpdiBj
+bGFzcz0iY29kZSI+CiAgICAgICAgICAgIDwhLS0gQ29tcGlsYXRpb24gdW5pdCBjb250ZW50IGlzIHdy
+aXR0ZW4gaGVyZS4gLS0+CiAgICAgICAgICAgIDxwIGNsYXNzPSJ3ZWxjb21lIj4KICAgICAgICAgICAg
+ICAgIFNlbGVjdCBhIHNvdXJjZSBmaWxlIG9uIHRoZSBsZWZ0IHRvIHByZXZpZXcgdGhlIHByb3Bvc2Vk
+IGVkaXRzLgogICAgICAgICAgICA8L3A+CiAgICAgICAgPC9kaXY+CiAgICA8L2Rpdj48IS0tIC9jb250
+ZW50IC0tPgogICAgPGRpdiBjbGFzcz0iaW5mby1wYW5lbCI+CiAgICAgICAgPGRpdiBjbGFzcz0iZWRp
+dC1saXN0Ij4KICAgICAgICAgICAgPGRpdiBjbGFzcz0icGFuZWwtaGVhZGluZyI+UHJvcG9zZWQgRWRp
+dHM8L2Rpdj4KICAgICAgICAgICAgPGRpdiBjbGFzcz0icGFuZWwtY29udGVudCI+PC9kaXY+CiAgICAg
+ICAgPC9kaXY+PCEtLSAvZWRpdC1saXN0IC0tPgogICAgICAgIDxkaXYgY2xhc3M9ImVkaXQtcGFuZWwi
+PgogICAgICAgICAgICA8ZGl2IGNsYXNzPSJwYW5lbC1oZWFkaW5nIj5FZGl0IERldGFpbHM8L2Rpdj4K
+ICAgICAgICAgICAgPGRpdiBjbGFzcz0icGFuZWwtY29udGVudCI+CiAgICAgICAgICAgICAgICA8cCBj
+bGFzcz0icGxhY2Vob2xkZXIiPlNlZSBkZXRhaWxzIGFib3V0IGEgcHJvcG9zZWQgZWRpdC48L3A+CiAg
+ICAgICAgICAgIDwvZGl2PjwhLS0gL3BhbmVsLWNvbnRlbnQgLS0+CiAgICAgICAgPC9kaXY+PCEtLSAv
+ZWRpdC1wYW5lbCAtLT4KICAgIDwvZGl2PjwhLS0gL2luZm8tcGFuZWwgLS0+CjwvZGl2PjwhLS0gL3Bh
+bmVscyAtLT4KPGZvb3Rlcj4KICAgIDxhIHRhcmdldD0iX2JsYW5rIgogICAgICAgaHJlZj0iaHR0cHM6
+Ly9naXRodWIuY29tL2RhcnQtbGFuZy9zZGsvYmxvYi9tYXN0ZXIvcGtnL25uYmRfbWlncmF0aW9uL1JF
+QURNRS5tZCI+TnVsbAogICAgICAgIHNhZmV0eSBtaWdyYXRpb24gaGVscDwvYT4KICAgIDxzcGFuIGNs
+YXNzPSJ3aWRlIj4gPC9zcGFuPgogICAgPGRpdj5CYXNlZCBvbiB7eyBzZGtWZXJzaW9uIH19PC9kaXY+
+CjwvZm9vdGVyPgo8L2JvZHk+CjwvaHRtbD4K
''';
String _migration_css;
-// migration_css md5 is '2b325a70e847b11533218ca621f9763f'
+// migration_css md5 is 'eab70bd06e8c1bfe25644337e63495b9'
String _migration_css_base64 = '''
LyogQ29weXJpZ2h0IChjKSAyMDE5LCB0aGUgRGFydCBwcm9qZWN0IGF1dGhvcnMuIFBsZWFzZSBzZWUg
dGhlIEFVVEhPUlMgZmlsZSAgKi8KLyogZm9yIGRldGFpbHMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFVz
@@ -333,108 +334,109 @@
YWRlciBoMSwKaGVhZGVyIGgyIHsKICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7CiAgZm9udC1mYW1pbHk6
ICJHb29nbGUgU2FucyIsIlJvYm90byIsc2Fucy1zZXJpZjsKICBmb250LXdlaWdodDogNDAwOwogIG1h
cmdpbi1yaWdodDogMjRweDsKfQoKaDEgewogIGZvbnQtc2l6ZTogMS41ZW07Cn0KCmhlYWRlciBoMiB7
-CiAgZm9udC1zaXplOiAxLjJlbTsKfQoKaGVhZGVyIC5hcHBseS1taWdyYXRpb24gewogIHJpZ2h0OiAw
-cHg7CiAgZmxvYXQ6IHJpZ2h0OwogIG1hcmdpbjogMTBweDsKfQoKZm9vdGVyIHsKICBjb2xvcjogI2Nj
-YzsKICBiYWNrZ3JvdW5kLWNvbG9yOiAjMjczMjNhOwogIGRpc3BsYXk6IGZsZXg7CiAgZmxleC1kaXJl
-Y3Rpb246IHJvdzsKICBhbGlnbi1pdGVtczogY2VudGVyOwogIHBhZGRpbmc6IDhweCAyNHB4Owp9Cgpm
-b290ZXIgLndpZGUgewogIGZsZXg6IDE7Cn0KCi5ob3Jpem9udGFsIHsKICBkaXNwbGF5OiBmbGV4Owp9
-CgoucGFuZWxzIHsKICBiYWNrZ3JvdW5kLWNvbG9yOiAjMTIxYTI1OwogIGZsZXg6IDE7CiAgb3ZlcmZs
-b3c6IGhpZGRlbjsKfQoKLnBhbmVsLWhlYWRpbmcgewogIGNvbG9yOiBncmF5OwogIG1hcmdpbjogOHB4
-Owp9CgoubmF2LWxpbmssCi5yZWdpb24gewogIGN1cnNvcjogcG9pbnRlcjsKfQoKLm5hdi1wYW5lbCB7
-CiAgYmFja2dyb3VuZC1jb2xvcjogIzI4MmIyZTsKICBmbGV4OiAxIDIwMHB4OwogIG1hcmdpbjogMDsK
-ICBvdmVyZmxvdzogc2Nyb2xsOwp9CgoubmF2LWlubmVyIHsKICBwYWRkaW5nOiAwIDAgN3B4IDdweDsK
-fQoKLmZpeGVkIHsKICBwb3NpdGlvbjogZml4ZWQ7CiAgdG9wOiAwOwp9Cgoucm9vdCB7CiAgbWFyZ2lu
-OiAwOwogIGRpc3BsYXk6IG5vbmU7Cn0KCi5uYXYtdHJlZSA+IHVsIHsKICBwYWRkaW5nLWxlZnQ6IDZw
-eDsKfQoKLm5hdi1pbm5lciB1bCB7CiAgcGFkZGluZy1sZWZ0OiAxMnB4OwogIG1hcmdpbjogMDsKfQoK
-Lm5hdi1pbm5lciBsaSB7CiAgbGlzdC1zdHlsZS10eXBlOiBub25lOwp9CgoubmF2LWlubmVyIGxpOm5v
-dCguZGlyKSB7CiAgbWFyZ2luLWxlZnQ6IDIwcHg7CiAgbWFyZ2luLWJvdHRvbTogM3B4Owp9CgoubmF2
-LWlubmVyIGxpLmRpciAuYXJyb3cgewogIGN1cnNvcjogcG9pbnRlcjsKICBkaXNwbGF5OiBpbmxpbmUt
-YmxvY2s7CiAgZm9udC1zaXplOiAxMHB4OwogIG1hcmdpbi1yaWdodDogNHB4OwogIHRyYW5zaXRpb246
-IHRyYW5zZm9ybSAwLjVzIGVhc2Utb3V0Owp9CgoubmF2LWlubmVyIGxpLmRpciAuYXJyb3cuY29sbGFw
-c2VkIHsKICB0cmFuc2Zvcm06IHJvdGF0ZSgtOTBkZWcpOwp9CgoubmF2LWlubmVyIHVsIHsKICBtYXgt
-aGVpZ2h0OiAyMDAwcHg7CiAgdHJhbnNpdGlvbjogbWF4LWhlaWdodCAwLjVzIGVhc2Utb3V0Owp9Cgou
-bmF2LWlubmVyIHVsLmNvbGxhcHNlZCB7CiAgbWF4LWhlaWdodDogMCAhaW1wb3J0YW50OwogIG92ZXJm
-bG93OiBoaWRkZW47Cn0KCi5uYXYtaW5uZXIgLnNlbGVjdGVkLWZpbGUgewogIGNvbG9yOiB3aGl0ZTsK
-ICBjdXJzb3I6IGluaGVyaXQ7CiAgZm9udC13ZWlnaHQ6IDYwMDsKICB0ZXh0LWRlY29yYXRpb246IG5v
-bmU7Cn0KCi5lZGl0LWNvdW50IHsKICBiYWNrZ3JvdW5kLWNvbG9yOiAjMzdhZWRjOwogIGJvcmRlci1y
-YWRpdXM6IDEwcHg7CiAgY29sb3I6ICMwMDAwMDA7CiAgZGlzcGxheTogaW5saW5lLWJsb2NrOwogIGZv
-bnQtc2l6ZTogMTFweDsKICBmb250LXdlaWdodDogNjAwOwogIG1hcmdpbi1sZWZ0OiA1cHg7CiAgbWlu
-LXdpZHRoOiAyNXB4OwogIHBhZGRpbmc6IDRweCAwIDJweCAwOwogIHRleHQtYWxpZ246IGNlbnRlcjsK
-ICBsaW5lLWhlaWdodDogMWVtOwp9CgouY29udGVudCB7CiAgZmxleDogNCAzMDBweDsKICBiYWNrZ3Jv
-dW5kOiAjMjgyYjJlOwogIGZvbnQtZmFtaWx5OiBtb25vc3BhY2U7CiAgbWFyZ2luOiAwIDZweDsKICBw
-b3NpdGlvbjogcmVsYXRpdmU7CiAgd2hpdGUtc3BhY2U6IHByZTsKICBvdmVyZmxvdzogc2Nyb2xsOwp9
-CgouY29kZSB7CiAgcGFkZGluZzogMC41ZW07CiAgcG9zaXRpb246IGFic29sdXRlOwogIGxlZnQ6IDA7
-CiAgdG9wOiAwOwogIG1hcmdpbi1sZWZ0OiA1NnB4Owp9CgouaGxqcyB7CiAgYmFja2dyb3VuZC1jb2xv
-cjogIzI4MmIyZTsKICBkaXNwbGF5OiBibG9jazsKICBvdmVyZmxvdy14OiBhdXRvOwogIHBhZGRpbmc6
-IDAuNWVtOwp9CgouY29kZSAud2VsY29tZSB7CiAgZm9udC1mYW1pbHk6ICJHb29nbGUgU2FucyIsIlJv
-Ym90byIsc2Fucy1zZXJpZjsKICBmb250LXNpemU6IDE4cHg7CiAgbWFyZ2luLXJpZ2h0OiA2MnB4Owog
-IGNvbG9yOiAjNzc3Owp9CgouY29kZSAubmF2LWxpbmsgewogIGNvbG9yOiBpbmhlcml0OwogIHRleHQt
-ZGVjb3JhdGlvbi1saW5lOiBub25lOwp9CgouY29kZSAubmF2LWxpbms6dmlzaXRlZCB7CiAgY29sb3I6
-IGluaGVyaXQ7CiAgdGV4dC1kZWNvcmF0aW9uLWxpbmU6IG5vbmU7Cn0KCi5jb2RlIC5uYXYtbGluazpo
-b3ZlciB7CiAgdGV4dC1kZWNvcmF0aW9uLWxpbmU6IHVuZGVybGluZTsKICBmb250LXdlaWdodDogNjAw
-Owp9CgoucmVnaW9ucyB7CiAgcGFkZGluZzogMC41ZW07CiAgcG9zaXRpb246IGFic29sdXRlOwogIGxl
-ZnQ6IDA7CiAgdG9wOiAwOwp9CgoucmVnaW9ucyB0YWJsZSB7CiAgYm9yZGVyLXNwYWNpbmc6IDA7CiAg
-Zm9udC1zaXplOiBpbmhlcml0Owp9CgoucmVnaW9ucyB0ZCB7CiAgYm9yZGVyOiBub25lOwogIC8qIFRo
-ZSBjb250ZW50IG9mIHRoZSByZWdpb25zIGlzIG5vdCB2aXNpYmxlOyB0aGUgdXNlciBpbnN0ZWFkIHdp
-bGwgc2VlIHRoZQogICAqIGhpZ2hsaWdodGVkIGNvcHkgb2YgdGhlIGNvbnRlbnQuICovCiAgY29sb3I6
-IHJnYmEoMjU1LCAyNTUsIDI1NSwgMCk7CiAgcGFkZGluZzogMDsKICB3aGl0ZS1zcGFjZTogcHJlOwp9
-CgoucmVnaW9ucyB0ZDplbXB0eTphZnRlciB7CiAgY29udGVudDogIlwwMGEwIjsKfQoKLnJlZ2lvbnMg
-dHIuaGlnaGxpZ2h0IHRkOmxhc3QtY2hpbGQgewogIGJhY2tncm91bmQtY29sb3I6ICM0NDQ0NDQ7CiAg
-Y29sb3I6IHdoaXRlOwp9CgoucmVnaW9ucyB0ZC5saW5lLW5vIHsKICBib3JkZXItcmlnaHQ6IHNvbGlk
-ICMyODJiMmUgMnB4OwogIGNvbG9yOiAjOTk5OTk5OwogIHBhZGRpbmctcmlnaHQ6IDRweDsKICB0ZXh0
-LWFsaWduOiByaWdodDsKICB2aXNpYmlsaXR5OiB2aXNpYmxlOwogIHdpZHRoOiA1MHB4OwogIGRpc3Bs
-YXk6IGlubGluZS1ibG9jazsKfQoKLnJlZ2lvbnMgdHIuaGlnaGxpZ2h0IHRkLmxpbmUtbm8gewogIGJv
-cmRlci1yaWdodDogc29saWQgI2NjYyAycHg7Cn0KCi5yZWdpb24gewogIGRpc3BsYXk6IGlubGluZS1i
-bG9jazsKICBwb3NpdGlvbjogcmVsYXRpdmU7CiAgdmlzaWJpbGl0eTogdmlzaWJsZTsKICB6LWluZGV4
-OiAyMDA7Cn0KCi5yZWdpb24uYWRkZWQtcmVnaW9uIHsKICBiYWNrZ3JvdW5kLWNvbG9yOiAjY2NmZmNj
-OwogIGNvbG9yOiAjMDAzMzAwOwp9CgoucmVnaW9uLnJlbW92ZWQtcmVnaW9uIHsKICBiYWNrZ3JvdW5k
-LWNvbG9yOiAjZmY2NjY2OwogIGNvbG9yOiAjMDAxMTAwOwp9CgoucmVnaW9uLmluZm9ybWF0aXZlLXJl
-Z2lvbiB7CiAgYmFja2dyb3VuZC1jb2xvcjogIzg4ODg4ODsKICBjb2xvcjogIzAwMDAwMDsKfQoKLnRh
-cmdldCB7CiAgYmFja2dyb3VuZC1jb2xvcjogIzQ0NDsKICBwb3NpdGlvbjogcmVsYXRpdmU7CiAgdmlz
-aWJpbGl0eTogdmlzaWJsZTsKICBmb250LXdlaWdodDogNjAwOwp9CgouaW5mby1wYW5lbCB7CiAgZmxl
-eDogMSAyMDBweDsKICBtYXJnaW46IDA7CiAgaGVpZ2h0OiAxMDAlOwogIGRpc3BsYXk6IGZsZXg7CiAg
-ZmxleC1kaXJlY3Rpb246IGNvbHVtbjsKfQoKLmluZm8tcGFuZWwgLmVkaXQtcGFuZWwgewogIGJhY2tn
-cm91bmQtY29sb3I6ICMyODJiMmU7CiAgb3ZlcmZsb3c6IGF1dG87Cn0KCi5pbmZvLXBhbmVsIC5wYW5l
-bC1jb250ZW50IHsKICBwYWRkaW5nOiA3cHg7Cn0KCi5pbmZvLXBhbmVsIC5wYW5lbC1jb250ZW50PiA6
-Zmlyc3QtY2hpbGQgewogIG1hcmdpbi10b3A6IDA7Cn0KCi5pbmZvLXBhbmVsIC5ub3dyYXAgewogIHdo
-aXRlLXNwYWNlOiBub3dyYXA7Cn0KCi5pbmZvLXBhbmVsIHVsLAouaW5mby1wYW5lbCBvbCB7CiAgcGFk
-ZGluZy1sZWZ0OiAyMHB4Owp9CgouaW5mby1wYW5lbCBsaSB7CiAgbWFyZ2luOiAwIDAgNXB4IDA7Cn0K
-Ci5pbmZvLXBhbmVsIGEgewogIGNvbG9yOiAjMzNjY2ZmOwp9CgouaW5mby1wYW5lbCAuZWRpdC1saXN0
-IHsKICBiYWNrZ3JvdW5kLWNvbG9yOiAjMjgyYjJlOwogIG92ZXJmbG93OiBhdXRvOwp9CgouZWRpdC1w
-YW5lbCB7CiAgbWFyZ2luLXRvcDogNnB4OwogIGZsZXg6IDEgMTAwcHg7Cn0KCi5lZGl0LWxpc3Qgewog
-IGZsZXg6IDIgMTAwcHg7Cn0KCi5lZGl0LWxpc3QgLmVkaXQgewogIG1hcmdpbjogM3B4IDA7Cn0KCi5l
-ZGl0LWxpc3QgLmVkaXQtbGluayB7CiAgY3Vyc29yOiBwb2ludGVyOwp9CgoucmVydW5uaW5nLXBhbmUg
-ewogIGRpc3BsYXk6IG5vbmU7Cn0KCmJvZHkucmVydW5uaW5nIC5yZXJ1bm5pbmctcGFuZSB7CiAgZGlz
-cGxheTogYmxvY2s7CiAgcG9zaXRpb246IGZpeGVkOwogIHRvcDogMHB4OwogIGJvdHRvbTogMHB4Owog
-IGxlZnQ6IDBweDsKICByaWdodDogMHB4OwogIGJhY2tncm91bmQtY29sb3I6ICMwMDAwMDBBQTsgLyog
-dHJhbnNsdWNlbnQgYmxhY2sgKi8KICB6LWluZGV4OiA0MDA7Cn0KCi5yZXJ1bm5pbmctcGFuZSBoMSB7
-CiAgcG9zaXRpb246IGFic29sdXRlOwogIHRvcDogNTAlOwogIGxlZnQ6IDUwJTsKICB0cmFuc2Zvcm06
-IHRyYW5zbGF0ZSgtNTAlLCAtNTAlKTsKfQoKcC50cmFjZSAudHlwZS1kZXNjcmlwdGlvbiB7CiAgLyog
-RnJvbSBITEpTJ3MgLmhsanMta2V5d29yZCwgLmhsanMtc2VsZWN0b3ItdGFnLCAuaGxqcy1kZWxldGlv
-biAqLwogIGNvbG9yOiAjY2M3ODMyOwogIGZvbnQtZmFtaWx5OiBtb25vc3BhY2U7Cn0KCnVsLnRyYWNl
-IHsKICBmb250LXNpemU6IDEzcHg7CiAgbGlzdC1zdHlsZS10eXBlOiBub25lOwogIHBhZGRpbmctbGVm
-dDogMHB4Owp9Cgp1bC50cmFjZSBsaSB7CiAgY29sb3I6IHdoaXRlOwogIG1hcmdpbi1sZWZ0OiAxNHB4
-OwogIHRleHQtaW5kZW50OiAtMTRweDsKfQoKdWwudHJhY2UgbGkgLmZ1bmN0aW9uIHsKICAvKiBGcm9t
-IEhMSlMncyAuaGxqcy1zZWN0aW9uLCAuaGxqcy10aXRsZSwgLmhsanMtdHlwZSAqLwogIGNvbG9yOiAj
-ZmZjNjZkOwogIGZvbnQtZmFtaWx5OiBtb25vc3BhY2U7CiAgZm9udC13ZWlnaHQ6IDYwMDsKfQoKLmVs
-ZXZhdGlvbi16NCB7CiAgYm94LXNoYWRvdzogMHB4IDJweCA0cHggLTFweCByZ2JhKDAsIDAsIDAsIDAu
-MiksCiAgICAgIDBweCA0cHggNXB4IDBweCByZ2JhKDAsIDAsIDAsIDAuMTQpLAogICAgICAwcHggMXB4
-IDEwcHggMHB4IHJnYmEoMCwgMCwgMCwgLjEyKTsKfQoKYSB7CiAgY29sb3I6ICNjY2M7CiAgZmlsbDog
-I2NjYzsKICB0ZXh0LWRlY29yYXRpb246IG5vbmU7Cn0KCmE6aG92ZXIgewogIGNvbG9yOiAjZmZmOwog
-IGZpbGw6ICNmZmY7Cn0KCmJ1dHRvbiB7CiAgYmFja2dyb3VuZC1jb2xvcjogIzMzY2NmZjsKICBib3Jk
-ZXI6IDJweCBzb2xpZCAjMzdhZWRjOwogIGJvcmRlci1yYWRpdXM6IDNweDsKICBwYWRkaW5nOiA2cHgg
-MTBweDsKICBmb250LXdlaWdodDogYm9sZDsKICBjb2xvcjogIzI4MjgyODsKfQoKYnV0dG9uOmhvdmVy
-IHsKICBiYWNrZ3JvdW5kLWNvbG9yOiAjODBkZmZmOwogIGJvcmRlcjogMnB4IHNvbGlkICM1MmI4ZTA7
-CiAgY3Vyc29yOiBwb2ludGVyOwp9CgpidXR0b25bZGlzYWJsZWRdIHsKICBiYWNrZ3JvdW5kLWNvbG9y
-OiAjN2FhOGI4OwogIGNvbG9yOiAjNTA3MTc3OwogIGJvcmRlcjogMnB4IHNvbGlkICM1MDcxNzc7CiAg
-Y3Vyc29yOiBub3QtYWxsb3dlZDsKfQoKLnBsYWNlaG9sZGVyIHsKICBjb2xvcjogIzc3NzsKICB0ZXh0
-LWFsaWduOiBjZW50ZXI7CiAgbWFyZ2luLXRvcDogM2VtICFpbXBvcnRhbnQ7Cn0KCi8qKgogKiBITEpT
-IE92ZXJyaWRlcwogKi8KLmhsanMgewogIC8qKgogICAqIFRoaXMgYWxsb3dzIHRoZSBwZXItbGluZSBo
-aWdobGlnaHRzIHRvIHNob3cuCiAgICovCiAgYmFja2dyb3VuZDogbm9uZTsKfQo=
+CiAgZm9udC1zaXplOiAxLjJlbTsKfQoKaGVhZGVyIC5hcHBseS1taWdyYXRpb24sIC5yZXJ1bi1taWdy
+YXRpb24gewogIHJpZ2h0OiAwcHg7CiAgZmxvYXQ6IHJpZ2h0OwogIG1hcmdpbjogMTBweDsKfQoKZm9v
+dGVyIHsKICBjb2xvcjogI2NjYzsKICBiYWNrZ3JvdW5kLWNvbG9yOiAjMjczMjNhOwogIGRpc3BsYXk6
+IGZsZXg7CiAgZmxleC1kaXJlY3Rpb246IHJvdzsKICBhbGlnbi1pdGVtczogY2VudGVyOwogIHBhZGRp
+bmc6IDhweCAyNHB4Owp9Cgpmb290ZXIgLndpZGUgewogIGZsZXg6IDE7Cn0KCi5ob3Jpem9udGFsIHsK
+ICBkaXNwbGF5OiBmbGV4Owp9CgoucGFuZWxzIHsKICBiYWNrZ3JvdW5kLWNvbG9yOiAjMTIxYTI1Owog
+IGZsZXg6IDE7CiAgb3ZlcmZsb3c6IGhpZGRlbjsKfQoKLnBhbmVsLWhlYWRpbmcgewogIGNvbG9yOiBn
+cmF5OwogIG1hcmdpbjogOHB4Owp9CgoubmF2LWxpbmssCi5yZWdpb24gewogIGN1cnNvcjogcG9pbnRl
+cjsKfQoKLm5hdi1wYW5lbCB7CiAgYmFja2dyb3VuZC1jb2xvcjogIzI4MmIyZTsKICBmbGV4OiAxIDIw
+MHB4OwogIG1hcmdpbjogMDsKICBvdmVyZmxvdzogc2Nyb2xsOwp9CgoubmF2LWlubmVyIHsKICBwYWRk
+aW5nOiAwIDAgN3B4IDdweDsKfQoKLmZpeGVkIHsKICBwb3NpdGlvbjogZml4ZWQ7CiAgdG9wOiAwOwp9
+Cgoucm9vdCB7CiAgbWFyZ2luOiAwOwogIGRpc3BsYXk6IG5vbmU7Cn0KCi5uYXYtdHJlZSA+IHVsIHsK
+ICBwYWRkaW5nLWxlZnQ6IDZweDsKfQoKLm5hdi1pbm5lciB1bCB7CiAgcGFkZGluZy1sZWZ0OiAxMnB4
+OwogIG1hcmdpbjogMDsKfQoKLm5hdi1pbm5lciBsaSB7CiAgbGlzdC1zdHlsZS10eXBlOiBub25lOwp9
+CgoubmF2LWlubmVyIGxpOm5vdCguZGlyKSB7CiAgbWFyZ2luLWxlZnQ6IDIwcHg7CiAgbWFyZ2luLWJv
+dHRvbTogM3B4Owp9CgoubmF2LWlubmVyIGxpLmRpciAuYXJyb3cgewogIGN1cnNvcjogcG9pbnRlcjsK
+ICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7CiAgZm9udC1zaXplOiAxMHB4OwogIG1hcmdpbi1yaWdodDog
+NHB4OwogIHRyYW5zaXRpb246IHRyYW5zZm9ybSAwLjVzIGVhc2Utb3V0Owp9CgoubmF2LWlubmVyIGxp
+LmRpciAuYXJyb3cuY29sbGFwc2VkIHsKICB0cmFuc2Zvcm06IHJvdGF0ZSgtOTBkZWcpOwp9CgoubmF2
+LWlubmVyIHVsIHsKICBtYXgtaGVpZ2h0OiAyMDAwcHg7CiAgdHJhbnNpdGlvbjogbWF4LWhlaWdodCAw
+LjVzIGVhc2Utb3V0Owp9CgoubmF2LWlubmVyIHVsLmNvbGxhcHNlZCB7CiAgbWF4LWhlaWdodDogMCAh
+aW1wb3J0YW50OwogIG92ZXJmbG93OiBoaWRkZW47Cn0KCi5uYXYtaW5uZXIgLnNlbGVjdGVkLWZpbGUg
+ewogIGNvbG9yOiB3aGl0ZTsKICBjdXJzb3I6IGluaGVyaXQ7CiAgZm9udC13ZWlnaHQ6IDYwMDsKICB0
+ZXh0LWRlY29yYXRpb246IG5vbmU7Cn0KCi5lZGl0LWNvdW50IHsKICBiYWNrZ3JvdW5kLWNvbG9yOiAj
+MzdhZWRjOwogIGJvcmRlci1yYWRpdXM6IDEwcHg7CiAgY29sb3I6ICMwMDAwMDA7CiAgZGlzcGxheTog
+aW5saW5lLWJsb2NrOwogIGZvbnQtc2l6ZTogMTFweDsKICBmb250LXdlaWdodDogNjAwOwogIG1hcmdp
+bi1sZWZ0OiA1cHg7CiAgbWluLXdpZHRoOiAyNXB4OwogIHBhZGRpbmc6IDRweCAwIDJweCAwOwogIHRl
+eHQtYWxpZ246IGNlbnRlcjsKICBsaW5lLWhlaWdodDogMWVtOwp9CgouY29udGVudCB7CiAgZmxleDog
+NCAzMDBweDsKICBiYWNrZ3JvdW5kOiAjMjgyYjJlOwogIGZvbnQtZmFtaWx5OiBtb25vc3BhY2U7CiAg
+bWFyZ2luOiAwIDZweDsKICBwb3NpdGlvbjogcmVsYXRpdmU7CiAgd2hpdGUtc3BhY2U6IHByZTsKICBv
+dmVyZmxvdzogc2Nyb2xsOwp9CgouY29kZSB7CiAgcGFkZGluZzogMC41ZW07CiAgcG9zaXRpb246IGFi
+c29sdXRlOwogIGxlZnQ6IDA7CiAgdG9wOiAwOwogIG1hcmdpbi1sZWZ0OiA1NnB4Owp9CgouaGxqcyB7
+CiAgYmFja2dyb3VuZC1jb2xvcjogIzI4MmIyZTsKICBkaXNwbGF5OiBibG9jazsKICBvdmVyZmxvdy14
+OiBhdXRvOwogIHBhZGRpbmc6IDAuNWVtOwp9CgouY29kZSAud2VsY29tZSB7CiAgZm9udC1mYW1pbHk6
+ICJHb29nbGUgU2FucyIsIlJvYm90byIsc2Fucy1zZXJpZjsKICBmb250LXNpemU6IDE4cHg7CiAgbWFy
+Z2luLXJpZ2h0OiA2MnB4OwogIGNvbG9yOiAjNzc3Owp9CgouY29kZSAubmF2LWxpbmsgewogIGNvbG9y
+OiBpbmhlcml0OwogIHRleHQtZGVjb3JhdGlvbi1saW5lOiBub25lOwp9CgouY29kZSAubmF2LWxpbms6
+dmlzaXRlZCB7CiAgY29sb3I6IGluaGVyaXQ7CiAgdGV4dC1kZWNvcmF0aW9uLWxpbmU6IG5vbmU7Cn0K
+Ci5jb2RlIC5uYXYtbGluazpob3ZlciB7CiAgdGV4dC1kZWNvcmF0aW9uLWxpbmU6IHVuZGVybGluZTsK
+ICBmb250LXdlaWdodDogNjAwOwp9CgoucmVnaW9ucyB7CiAgcGFkZGluZzogMC41ZW07CiAgcG9zaXRp
+b246IGFic29sdXRlOwogIGxlZnQ6IDA7CiAgdG9wOiAwOwp9CgoucmVnaW9ucyB0YWJsZSB7CiAgYm9y
+ZGVyLXNwYWNpbmc6IDA7CiAgZm9udC1zaXplOiBpbmhlcml0Owp9CgoucmVnaW9ucyB0ZCB7CiAgYm9y
+ZGVyOiBub25lOwogIC8qIFRoZSBjb250ZW50IG9mIHRoZSByZWdpb25zIGlzIG5vdCB2aXNpYmxlOyB0
+aGUgdXNlciBpbnN0ZWFkIHdpbGwgc2VlIHRoZQogICAqIGhpZ2hsaWdodGVkIGNvcHkgb2YgdGhlIGNv
+bnRlbnQuICovCiAgY29sb3I6IHJnYmEoMjU1LCAyNTUsIDI1NSwgMCk7CiAgcGFkZGluZzogMDsKICB3
+aGl0ZS1zcGFjZTogcHJlOwp9CgoucmVnaW9ucyB0ZDplbXB0eTphZnRlciB7CiAgY29udGVudDogIlww
+MGEwIjsKfQoKLnJlZ2lvbnMgdHIuaGlnaGxpZ2h0IHRkOmxhc3QtY2hpbGQgewogIGJhY2tncm91bmQt
+Y29sb3I6ICM0NDQ0NDQ7CiAgY29sb3I6IHdoaXRlOwp9CgoucmVnaW9ucyB0ZC5saW5lLW5vIHsKICBi
+b3JkZXItcmlnaHQ6IHNvbGlkICMyODJiMmUgMnB4OwogIGNvbG9yOiAjOTk5OTk5OwogIHBhZGRpbmct
+cmlnaHQ6IDRweDsKICB0ZXh0LWFsaWduOiByaWdodDsKICB2aXNpYmlsaXR5OiB2aXNpYmxlOwogIHdp
+ZHRoOiA1MHB4OwogIGRpc3BsYXk6IGlubGluZS1ibG9jazsKfQoKLnJlZ2lvbnMgdHIuaGlnaGxpZ2h0
+IHRkLmxpbmUtbm8gewogIGJvcmRlci1yaWdodDogc29saWQgI2NjYyAycHg7Cn0KCi5yZWdpb24gewog
+IGRpc3BsYXk6IGlubGluZS1ibG9jazsKICBwb3NpdGlvbjogcmVsYXRpdmU7CiAgdmlzaWJpbGl0eTog
+dmlzaWJsZTsKICB6LWluZGV4OiAyMDA7Cn0KCi5yZWdpb24uYWRkZWQtcmVnaW9uIHsKICBiYWNrZ3Jv
+dW5kLWNvbG9yOiAjY2NmZmNjOwogIGNvbG9yOiAjMDAzMzAwOwp9CgoucmVnaW9uLnJlbW92ZWQtcmVn
+aW9uIHsKICBiYWNrZ3JvdW5kLWNvbG9yOiAjZmY2NjY2OwogIGNvbG9yOiAjMDAxMTAwOwp9CgoucmVn
+aW9uLmluZm9ybWF0aXZlLXJlZ2lvbiB7CiAgYmFja2dyb3VuZC1jb2xvcjogIzg4ODg4ODsKICBjb2xv
+cjogIzAwMDAwMDsKfQoKLnRhcmdldCB7CiAgYmFja2dyb3VuZC1jb2xvcjogIzQ0NDsKICBwb3NpdGlv
+bjogcmVsYXRpdmU7CiAgdmlzaWJpbGl0eTogdmlzaWJsZTsKICBmb250LXdlaWdodDogNjAwOwp9Cgou
+aW5mby1wYW5lbCB7CiAgZmxleDogMSAyMDBweDsKICBtYXJnaW46IDA7CiAgaGVpZ2h0OiAxMDAlOwog
+IGRpc3BsYXk6IGZsZXg7CiAgZmxleC1kaXJlY3Rpb246IGNvbHVtbjsKfQoKLmluZm8tcGFuZWwgLmVk
+aXQtcGFuZWwgewogIGJhY2tncm91bmQtY29sb3I6ICMyODJiMmU7CiAgb3ZlcmZsb3c6IGF1dG87Cn0K
+Ci5pbmZvLXBhbmVsIC5wYW5lbC1jb250ZW50IHsKICBwYWRkaW5nOiA3cHg7Cn0KCi5pbmZvLXBhbmVs
+IC5wYW5lbC1jb250ZW50PiA6Zmlyc3QtY2hpbGQgewogIG1hcmdpbi10b3A6IDA7Cn0KCi5pbmZvLXBh
+bmVsIC5ub3dyYXAgewogIHdoaXRlLXNwYWNlOiBub3dyYXA7Cn0KCi5pbmZvLXBhbmVsIHVsLAouaW5m
+by1wYW5lbCBvbCB7CiAgcGFkZGluZy1sZWZ0OiAyMHB4Owp9CgouaW5mby1wYW5lbCBsaSB7CiAgbWFy
+Z2luOiAwIDAgNXB4IDA7Cn0KCi5pbmZvLXBhbmVsIGEgewogIGNvbG9yOiAjMzNjY2ZmOwp9CgouaW5m
+by1wYW5lbCAuZWRpdC1saXN0IHsKICBiYWNrZ3JvdW5kLWNvbG9yOiAjMjgyYjJlOwogIG92ZXJmbG93
+OiBhdXRvOwp9CgouZWRpdC1wYW5lbCB7CiAgbWFyZ2luLXRvcDogNnB4OwogIGZsZXg6IDEgMTAwcHg7
+Cn0KCi5lZGl0LWxpc3QgewogIGZsZXg6IDIgMTAwcHg7Cn0KCi5lZGl0LWxpc3QgLmVkaXQgewogIG1h
+cmdpbjogM3B4IDA7Cn0KCi5lZGl0LWxpc3QgLmVkaXQtbGluayB7CiAgY3Vyc29yOiBwb2ludGVyOwp9
+CgoucmVydW5uaW5nLXBhbmUgewogIGRpc3BsYXk6IG5vbmU7Cn0KCmJvZHkucmVydW5uaW5nIC5yZXJ1
+bm5pbmctcGFuZSB7CiAgZGlzcGxheTogYmxvY2s7CiAgcG9zaXRpb246IGZpeGVkOwogIHRvcDogMHB4
+OwogIGJvdHRvbTogMHB4OwogIGxlZnQ6IDBweDsKICByaWdodDogMHB4OwogIGJhY2tncm91bmQtY29s
+b3I6ICMwMDAwMDBBQTsgLyogdHJhbnNsdWNlbnQgYmxhY2sgKi8KICB6LWluZGV4OiA0MDA7Cn0KCi5y
+ZXJ1bm5pbmctcGFuZSBoMSB7CiAgcG9zaXRpb246IGFic29sdXRlOwogIHRvcDogNTAlOwogIGxlZnQ6
+IDUwJTsKICB0cmFuc2Zvcm06IHRyYW5zbGF0ZSgtNTAlLCAtNTAlKTsKfQoKcC50cmFjZSAudHlwZS1k
+ZXNjcmlwdGlvbiB7CiAgLyogRnJvbSBITEpTJ3MgLmhsanMta2V5d29yZCwgLmhsanMtc2VsZWN0b3It
+dGFnLCAuaGxqcy1kZWxldGlvbiAqLwogIGNvbG9yOiAjY2M3ODMyOwogIGZvbnQtZmFtaWx5OiBtb25v
+c3BhY2U7Cn0KCnVsLnRyYWNlIHsKICBmb250LXNpemU6IDEzcHg7CiAgbGlzdC1zdHlsZS10eXBlOiBu
+b25lOwogIHBhZGRpbmctbGVmdDogMHB4Owp9Cgp1bC50cmFjZSBsaSB7CiAgY29sb3I6IHdoaXRlOwog
+IG1hcmdpbi1sZWZ0OiAxNHB4OwogIHRleHQtaW5kZW50OiAtMTRweDsKfQoKdWwudHJhY2UgbGkgLmZ1
+bmN0aW9uIHsKICAvKiBGcm9tIEhMSlMncyAuaGxqcy1zZWN0aW9uLCAuaGxqcy10aXRsZSwgLmhsanMt
+dHlwZSAqLwogIGNvbG9yOiAjZmZjNjZkOwogIGZvbnQtZmFtaWx5OiBtb25vc3BhY2U7CiAgZm9udC13
+ZWlnaHQ6IDYwMDsKfQoKLmVsZXZhdGlvbi16NCB7CiAgYm94LXNoYWRvdzogMHB4IDJweCA0cHggLTFw
+eCByZ2JhKDAsIDAsIDAsIDAuMiksCiAgICAgIDBweCA0cHggNXB4IDBweCByZ2JhKDAsIDAsIDAsIDAu
+MTQpLAogICAgICAwcHggMXB4IDEwcHggMHB4IHJnYmEoMCwgMCwgMCwgLjEyKTsKfQoKYSB7CiAgY29s
+b3I6ICNjY2M7CiAgZmlsbDogI2NjYzsKICB0ZXh0LWRlY29yYXRpb246IG5vbmU7Cn0KCmE6aG92ZXIg
+ewogIGNvbG9yOiAjZmZmOwogIGZpbGw6ICNmZmY7Cn0KCmJ1dHRvbiB7CiAgYmFja2dyb3VuZC1jb2xv
+cjogIzMzY2NmZjsKICBib3JkZXI6IDJweCBzb2xpZCAjMzdhZWRjOwogIGJvcmRlci1yYWRpdXM6IDNw
+eDsKICBwYWRkaW5nOiA2cHggMTBweDsKICBmb250LXdlaWdodDogYm9sZDsKICBjb2xvcjogIzI4Mjgy
+ODsKfQoKYnV0dG9uOmhvdmVyIHsKICBiYWNrZ3JvdW5kLWNvbG9yOiAjODBkZmZmOwogIGJvcmRlcjog
+MnB4IHNvbGlkICM1MmI4ZTA7CiAgY3Vyc29yOiBwb2ludGVyOwp9CgpidXR0b25bZGlzYWJsZWRdIHsK
+ICBiYWNrZ3JvdW5kLWNvbG9yOiAjN2FhOGI4OwogIGNvbG9yOiAjNTA3MTc3OwogIGJvcmRlcjogMnB4
+IHNvbGlkICM1MDcxNzc7CiAgY3Vyc29yOiBub3QtYWxsb3dlZDsKfQoKLnBsYWNlaG9sZGVyIHsKICBj
+b2xvcjogIzc3NzsKICB0ZXh0LWFsaWduOiBjZW50ZXI7CiAgbWFyZ2luLXRvcDogM2VtICFpbXBvcnRh
+bnQ7Cn0KCi8qKgogKiBITEpTIE92ZXJyaWRlcwogKi8KLmhsanMgewogIC8qKgogICAqIFRoaXMgYWxs
+b3dzIHRoZSBwZXItbGluZSBoaWdobGlnaHRzIHRvIHNob3cuCiAgICovCiAgYmFja2dyb3VuZDogbm9u
+ZTsKfQo=
''';
String _migration_js;
-// migration_dart md5 is '847799fe43f4af04fec9d5e63d69e6da'
+// migration_dart md5 is '46d77ad01f8c88bd4174b5dfbb872e82'
String _migration_js_base64 = '''
KGZ1bmN0aW9uIGRhcnRQcm9ncmFtKCl7ZnVuY3Rpb24gY29weVByb3BlcnRpZXMoYSxiKXt2YXIgdD1P
YmplY3Qua2V5cyhhKQpmb3IodmFyIHM9MDtzPHQubGVuZ3RoO3MrKyl7dmFyIHI9dFtzXQpiW3JdPWFb
@@ -508,3439 +510,3585 @@
czpzZXRPclVwZGF0ZUxlYWZUYWdzfX0oKQpmdW5jdGlvbiBpbml0aWFsaXplRGVmZXJyZWRIdW5rKGEp
e3g9di50eXBlcy5sZW5ndGgKYShodW5rSGVscGVycyx2LHcsJCl9ZnVuY3Rpb24gZ2V0R2xvYmFsRnJv
bU5hbWUoYSl7Zm9yKHZhciB0PTA7dDx3Lmxlbmd0aDt0Kyspe2lmKHdbdF09PUMpY29udGludWUKaWYo
-d1t0XVthXSlyZXR1cm4gd1t0XVthXX19dmFyIEM9e30sSD17ZW86ZnVuY3Rpb24gZW8oKXt9LApvbzpm
+d1t0XVthXSlyZXR1cm4gd1t0XVthXX19dmFyIEM9e30sSD17Rks6ZnVuY3Rpb24gRksoKXt9LApvbzpm
dW5jdGlvbihhKXt2YXIgdCxzPWFeNDgKaWYoczw9OSlyZXR1cm4gcwp0PWF8MzIKaWYoOTc8PXQmJnQ8
PTEwMilyZXR1cm4gdC04NwpyZXR1cm4tMX0sCnFDOmZ1bmN0aW9uKGEsYixjLGQpe1AuazEoYiwic3Rh
cnQiKQppZihjIT1udWxsKXtQLmsxKGMsImVuZCIpCmlmKGI+YylILnZoKFAuVEUoYiwwLGMsInN0YXJ0
-IixudWxsKSl9cmV0dXJuIG5ldyBILm5IKGEsYixjLGQuQygibkg8MD4iKSl9LApXcDpmdW5jdGlvbigp
-e3JldHVybiBuZXcgUC5saigiTm8gZWxlbWVudCIpfSwKZFU6ZnVuY3Rpb24oKXtyZXR1cm4gbmV3IFAu
-bGooIlRvbyBtYW55IGVsZW1lbnRzIil9LAphcjpmdW5jdGlvbigpe3JldHVybiBuZXcgUC5saigiVG9v
-IGZldyBlbGVtZW50cyIpfSwKcWo6ZnVuY3Rpb24gcWooYSl7dGhpcy5hPWF9LApiUTpmdW5jdGlvbiBi
-USgpe30sCmFMOmZ1bmN0aW9uIGFMKCl7fSwKbkg6ZnVuY3Rpb24gbkgoYSxiLGMsZCl7dmFyIF89dGhp
-cwpfLmE9YQpfLmI9YgpfLmM9YwpfLiR0aT1kfSwKYTc6ZnVuY3Rpb24gYTcoYSxiLGMpe3ZhciBfPXRo
-aXMKXy5hPWEKXy5iPWIKXy5jPTAKXy5kPW51bGwKXy4kdGk9Y30sCkE4OmZ1bmN0aW9uIEE4KGEsYixj
-KXt0aGlzLmE9YQp0aGlzLmI9Ygp0aGlzLiR0aT1jfSwKVTU6ZnVuY3Rpb24gVTUoYSxiLGMpe3RoaXMu
-YT1hCnRoaXMuYj1iCnRoaXMuJHRpPWN9LApTTzpmdW5jdGlvbiBTTyhhLGIsYyl7dGhpcy5hPWEKdGhp
-cy5iPWIKdGhpcy4kdGk9Y30sClNVOmZ1bmN0aW9uIFNVKCl7fSwKUmU6ZnVuY3Rpb24gUmUoKXt9LApY
-QzpmdW5jdGlvbiBYQygpe30sCnd2OmZ1bmN0aW9uIHd2KGEpe3RoaXMuYT1hfSwKZGM6ZnVuY3Rpb24o
-KXt0aHJvdyBILmIoUC5MNCgiQ2Fubm90IG1vZGlmeSB1bm1vZGlmaWFibGUgTWFwIikpfSwKTlE6ZnVu
-Y3Rpb24oYSl7dmFyIHQscz1ILkpnKGEpCmlmKHR5cGVvZiBzPT0ic3RyaW5nIilyZXR1cm4gcwp0PSJt
-aW5pZmllZDoiK2EKcmV0dXJuIHR9LAp3VjpmdW5jdGlvbihhLGIpe3ZhciB0CmlmKGIhPW51bGwpe3Q9
-Yi54CmlmKHQhPW51bGwpcmV0dXJuIHR9cmV0dXJuIHUuYVUuYyhhKX0sCmQ6ZnVuY3Rpb24oYSl7dmFy
-IHQKaWYodHlwZW9mIGE9PSJzdHJpbmciKXJldHVybiBhCmlmKHR5cGVvZiBhPT0ibnVtYmVyIil7aWYo
-YSE9PTApcmV0dXJuIiIrYX1lbHNlIGlmKCEwPT09YSlyZXR1cm4idHJ1ZSIKZWxzZSBpZighMT09PWEp
-cmV0dXJuImZhbHNlIgplbHNlIGlmKGE9PW51bGwpcmV0dXJuIm51bGwiCnQ9Si5qKGEpCmlmKHR5cGVv
-ZiB0IT0ic3RyaW5nIil0aHJvdyBILmIoSC50TChhKSkKcmV0dXJuIHR9LAplUTpmdW5jdGlvbihhKXt2
-YXIgdD1hLiRpZGVudGl0eUhhc2gKaWYodD09bnVsbCl7dD1NYXRoLnJhbmRvbSgpKjB4M2ZmZmZmZmZ8
-MAphLiRpZGVudGl0eUhhc2g9dH1yZXR1cm4gdH0sCkhwOmZ1bmN0aW9uKGEsYil7dmFyIHQscyxyLHEs
-cCxvLG49bnVsbAppZih0eXBlb2YgYSE9InN0cmluZyIpSC52aChILnRMKGEpKQp0PS9eXHMqWystXT8o
-KDB4W2EtZjAtOV0rKXwoXGQrKXwoW2EtejAtOV0rKSlccyokL2kuZXhlYyhhKQppZih0PT1udWxsKXJl
-dHVybiBuCmlmKDM+PXQubGVuZ3RoKXJldHVybiBILk9IKHQsMykKcz1ILnkodFszXSkKaWYoYj09bnVs
-bCl7aWYocyE9bnVsbClyZXR1cm4gcGFyc2VJbnQoYSwxMCkKaWYodFsyXSE9bnVsbClyZXR1cm4gcGFy
-c2VJbnQoYSwxNikKcmV0dXJuIG59aWYoYjwyfHxiPjM2KXRocm93IEguYihQLlRFKGIsMiwzNiwicmFk
-aXgiLG4pKQppZihiPT09MTAmJnMhPW51bGwpcmV0dXJuIHBhcnNlSW50KGEsMTApCmlmKGI8MTB8fHM9
-PW51bGwpe3I9Yjw9MTA/NDcrYjo4NitiCnE9dFsxXQpmb3IocD1xLmxlbmd0aCxvPTA7bzxwOysrbylp
-ZigoQy54Qi5XKHEsbyl8MzIpPnIpcmV0dXJuIG59cmV0dXJuIHBhcnNlSW50KGEsYil9LApNOmZ1bmN0
-aW9uKGEpe3ZhciB0PUguSDUoYSkKcmV0dXJuIHR9LApINTpmdW5jdGlvbihhKXt2YXIgdCxzLHIKaWYo
-YSBpbnN0YW5jZW9mIFAuaylyZXR1cm4gSC5kbShILnpLKGEpLG51bGwpCmlmKEouaWEoYSk9PT1DLk9r
-fHx1LmFrLmMoYSkpe3Q9Qy5PNChhKQppZihILmYodCkpcmV0dXJuIHQKcz1hLmNvbnN0cnVjdG9yCmlm
-KHR5cGVvZiBzPT0iZnVuY3Rpb24iKXtyPXMubmFtZQppZih0eXBlb2Ygcj09InN0cmluZyImJkguZihy
-KSlyZXR1cm4gcn19cmV0dXJuIEguZG0oSC56SyhhKSxudWxsKX0sCmY6ZnVuY3Rpb24oYSl7dmFyIHQ9
-YSE9PSJPYmplY3QiJiZhIT09IiIKcmV0dXJuIHR9LApNMDpmdW5jdGlvbigpe2lmKCEhc2VsZi5sb2Nh
-dGlvbilyZXR1cm4gc2VsZi5sb2NhdGlvbi5ocmVmCnJldHVybiBudWxsfSwKVks6ZnVuY3Rpb24oYSl7
-dmFyIHQscyxyLHEscD1hLmxlbmd0aAppZihwPD01MDApcmV0dXJuIFN0cmluZy5mcm9tQ2hhckNvZGUu
-YXBwbHkobnVsbCxhKQpmb3IodD0iIixzPTA7czxwO3M9cil7cj1zKzUwMApxPXI8cD9yOnAKdCs9U3Ry
-aW5nLmZyb21DaGFyQ29kZS5hcHBseShudWxsLGEuc2xpY2UocyxxKSl9cmV0dXJuIHR9LApQTDpmdW5j
-dGlvbihhKXt2YXIgdCxzLHIscT1ILlZNKFtdLHUudCkKZm9yKHQ9YS5sZW5ndGgscz0wO3M8YS5sZW5n
-dGg7YS5sZW5ndGg9PT10fHwoMCxILmxrKShhKSwrK3Mpe3I9YVtzXQppZighSC5vayhyKSl0aHJvdyBI
-LmIoSC50TChyKSkKaWYocjw9NjU1MzUpQy5ObS5pKHEscikKZWxzZSBpZihyPD0xMTE0MTExKXtDLk5t
-LmkocSw1NTI5NisoQy5qbi53RyhyLTY1NTM2LDEwKSYxMDIzKSkKQy5ObS5pKHEsNTYzMjArKHImMTAy
-MykpfWVsc2UgdGhyb3cgSC5iKEgudEwocikpfXJldHVybiBILlZLKHEpfSwKZVQ6ZnVuY3Rpb24oYSl7
-dmFyIHQscyxyCmZvcih0PWEubGVuZ3RoLHM9MDtzPHQ7KytzKXtyPWFbc10KaWYoIUgub2socikpdGhy
-b3cgSC5iKEgudEwocikpCmlmKHI8MCl0aHJvdyBILmIoSC50TChyKSkKaWYocj42NTUzNSlyZXR1cm4g
-SC5QTChhKX1yZXR1cm4gSC5WSyhhKX0sCmZ3OmZ1bmN0aW9uKGEsYixjKXt2YXIgdCxzLHIscQppZihj
-PD01MDAmJmI9PT0wJiZjPT09YS5sZW5ndGgpcmV0dXJuIFN0cmluZy5mcm9tQ2hhckNvZGUuYXBwbHko
-bnVsbCxhKQpmb3IodD1iLHM9IiI7dDxjO3Q9cil7cj10KzUwMApxPXI8Yz9yOmMKcys9U3RyaW5nLmZy
-b21DaGFyQ29kZS5hcHBseShudWxsLGEuc3ViYXJyYXkodCxxKSl9cmV0dXJuIHN9LApMdzpmdW5jdGlv
-bihhKXt2YXIgdAppZigwPD1hKXtpZihhPD02NTUzNSlyZXR1cm4gU3RyaW5nLmZyb21DaGFyQ29kZShh
-KQppZihhPD0xMTE0MTExKXt0PWEtNjU1MzYKcmV0dXJuIFN0cmluZy5mcm9tQ2hhckNvZGUoKDU1Mjk2
-fEMuam4ud0codCwxMCkpPj4+MCw1NjMyMHx0JjEwMjMpfX10aHJvdyBILmIoUC5URShhLDAsMTExNDEx
-MSxudWxsLG51bGwpKX0sCm8yOmZ1bmN0aW9uKGEpe2lmKGEuZGF0ZT09PXZvaWQgMClhLmRhdGU9bmV3
-IERhdGUoYS5hKQpyZXR1cm4gYS5kYXRlfSwKdEo6ZnVuY3Rpb24oYSl7dmFyIHQ9SC5vMihhKS5nZXRG
-dWxsWWVhcigpKzAKcmV0dXJuIHR9LApOUzpmdW5jdGlvbihhKXt2YXIgdD1ILm8yKGEpLmdldE1vbnRo
-KCkrMQpyZXR1cm4gdH0sCmpBOmZ1bmN0aW9uKGEpe3ZhciB0PUgubzIoYSkuZ2V0RGF0ZSgpKzAKcmV0
-dXJuIHR9LApLTDpmdW5jdGlvbihhKXt2YXIgdD1ILm8yKGEpLmdldEhvdXJzKCkrMApyZXR1cm4gdH0s
-CmNoOmZ1bmN0aW9uKGEpe3ZhciB0PUgubzIoYSkuZ2V0TWludXRlcygpKzAKcmV0dXJuIHR9LApKZDpm
-dW5jdGlvbihhKXt2YXIgdD1ILm8yKGEpLmdldFNlY29uZHMoKSswCnJldHVybiB0fSwKbzE6ZnVuY3Rp
-b24oYSl7dmFyIHQ9SC5vMihhKS5nZXRNaWxsaXNlY29uZHMoKSswCnJldHVybiB0fSwKem86ZnVuY3Rp
-b24oYSxiLGMpe3ZhciB0LHMscj17fQpyLmE9MAp0PVtdCnM9W10Kci5hPWIubGVuZ3RoCkMuTm0uRlYo
-dCxiKQpyLmI9IiIKaWYoYyE9bnVsbCYmYy5hIT09MCljLksoMCxuZXcgSC5DaihyLHMsdCkpCiIiK3Iu
-YQpyZXR1cm4gSi5KeShhLG5ldyBILkxJKEMuVGUsMCx0LHMsMCkpfSwKRWs6ZnVuY3Rpb24oYSxiLGMp
-e3ZhciB0LHMscixxCmlmKGIgaW5zdGFuY2VvZiBBcnJheSl0PWM9PW51bGx8fGMuYT09PTAKZWxzZSB0
-PSExCmlmKHQpe3M9YgpyPXMubGVuZ3RoCmlmKHI9PT0wKXtpZighIWEuJDApcmV0dXJuIGEuJDAoKX1l
-bHNlIGlmKHI9PT0xKXtpZighIWEuJDEpcmV0dXJuIGEuJDEoc1swXSl9ZWxzZSBpZihyPT09Mil7aWYo
-ISFhLiQyKXJldHVybiBhLiQyKHNbMF0sc1sxXSl9ZWxzZSBpZihyPT09Myl7aWYoISFhLiQzKXJldHVy
-biBhLiQzKHNbMF0sc1sxXSxzWzJdKX1lbHNlIGlmKHI9PT00KXtpZighIWEuJDQpcmV0dXJuIGEuJDQo
-c1swXSxzWzFdLHNbMl0sc1szXSl9ZWxzZSBpZihyPT09NSlpZighIWEuJDUpcmV0dXJuIGEuJDUoc1sw
-XSxzWzFdLHNbMl0sc1szXSxzWzRdKQpxPWFbIiIrIiQiK3JdCmlmKHEhPW51bGwpcmV0dXJuIHEuYXBw
-bHkoYSxzKX1yZXR1cm4gSC5FdyhhLGIsYyl9LApFdzpmdW5jdGlvbihhLGIsYyl7dmFyIHQscyxyLHEs
-cCxvLG4sbSxsLGs9YiBpbnN0YW5jZW9mIEFycmF5P2I6UC5DSChiLCEwLHUueiksaj1rLmxlbmd0aCxp
-PWEuJFIKaWYoajxpKXJldHVybiBILnpvKGEsayxjKQp0PWEuJEQKcz10PT1udWxsCnI9IXM/dCgpOm51
-bGwKcT1KLmlhKGEpCnA9cS4kQwppZih0eXBlb2YgcD09InN0cmluZyIpcD1xW3BdCmlmKHMpe2lmKGMh
-PW51bGwmJmMuYSE9PTApcmV0dXJuIEguem8oYSxrLGMpCmlmKGo9PT1pKXJldHVybiBwLmFwcGx5KGEs
-aykKcmV0dXJuIEguem8oYSxrLGMpfWlmKHIgaW5zdGFuY2VvZiBBcnJheSl7aWYoYyE9bnVsbCYmYy5h
-IT09MClyZXR1cm4gSC56byhhLGssYykKaWYoaj5pK3IubGVuZ3RoKXJldHVybiBILnpvKGEsayxudWxs
-KQpDLk5tLkZWKGssci5zbGljZShqLWkpKQpyZXR1cm4gcC5hcHBseShhLGspfWVsc2V7aWYoaj5pKXJl
-dHVybiBILnpvKGEsayxjKQpvPU9iamVjdC5rZXlzKHIpCmlmKGM9PW51bGwpZm9yKHM9by5sZW5ndGgs
-bj0wO248by5sZW5ndGg7by5sZW5ndGg9PT1zfHwoMCxILmxrKShvKSwrK24pQy5ObS5pKGsscltILnko
-b1tuXSldKQplbHNle2ZvcihzPW8ubGVuZ3RoLG09MCxuPTA7bjxvLmxlbmd0aDtvLmxlbmd0aD09PXN8
-fCgwLEgubGspKG8pLCsrbil7bD1ILnkob1tuXSkKaWYoYy54NChsKSl7KyttCkMuTm0uaShrLGMucSgw
-LGwpKX1lbHNlIEMuTm0uaShrLHJbbF0pfWlmKG0hPT1jLmEpcmV0dXJuIEguem8oYSxrLGMpfXJldHVy
-biBwLmFwcGx5KGEsayl9fSwKcFk6ZnVuY3Rpb24oYSl7dGhyb3cgSC5iKEgudEwoYSkpfSwKT0g6ZnVu
-Y3Rpb24oYSxiKXtpZihhPT1udWxsKUouSG0oYSkKdGhyb3cgSC5iKEguSFkoYSxiKSl9LApIWTpmdW5j
-dGlvbihhLGIpe3ZhciB0LHMscj0iaW5kZXgiCmlmKCFILm9rKGIpKXJldHVybiBuZXcgUC51KCEwLGIs
-cixudWxsKQp0PUguU2MoSi5IbShhKSkKaWYoIShiPDApKXtpZih0eXBlb2YgdCE9PSJudW1iZXIiKXJl
-dHVybiBILnBZKHQpCnM9Yj49dH1lbHNlIHM9ITAKaWYocylyZXR1cm4gUC5DZihiLGEscixudWxsLHQp
-CnJldHVybiBQLngoYixyKX0sCmF1OmZ1bmN0aW9uKGEsYixjKXt2YXIgdD0iSW52YWxpZCB2YWx1ZSIK
-aWYoYT5jKXJldHVybiBuZXcgUC5iSigwLGMsITAsYSwic3RhcnQiLHQpCmlmKGIhPW51bGwpe2lmKCFI
-Lm9rKGIpKXJldHVybiBuZXcgUC51KCEwLGIsImVuZCIsbnVsbCkKaWYoYjxhfHxiPmMpcmV0dXJuIG5l
-dyBQLmJKKGEsYywhMCxiLCJlbmQiLHQpfXJldHVybiBuZXcgUC51KCEwLGIsImVuZCIsbnVsbCl9LAp0
-TDpmdW5jdGlvbihhKXtyZXR1cm4gbmV3IFAudSghMCxhLG51bGwsbnVsbCl9LApiOmZ1bmN0aW9uKGEp
-e3ZhciB0CmlmKGE9PW51bGwpYT1uZXcgUC5uKCkKdD1uZXcgRXJyb3IoKQp0LmRhcnRFeGNlcHRpb249
-YQppZigiZGVmaW5lUHJvcGVydHkiIGluIE9iamVjdCl7T2JqZWN0LmRlZmluZVByb3BlcnR5KHQsIm1l
-c3NhZ2UiLHtnZXQ6SC5ofSkKdC5uYW1lPSIifWVsc2UgdC50b1N0cmluZz1ILmgKcmV0dXJuIHR9LApo
-OmZ1bmN0aW9uKCl7cmV0dXJuIEouaih0aGlzLmRhcnRFeGNlcHRpb24pfSwKdmg6ZnVuY3Rpb24oYSl7
-dGhyb3cgSC5iKGEpfSwKbGs6ZnVuY3Rpb24oYSl7dGhyb3cgSC5iKFAuYTQoYSkpfSwKY006ZnVuY3Rp
-b24oYSl7dmFyIHQscyxyLHEscCxvCmE9SC5lQShhLnJlcGxhY2UoU3RyaW5nKHt9KSwnJHJlY2VpdmVy
-JCcpKQp0PWEubWF0Y2goL1xcXCRbYS16QS1aXStcXFwkL2cpCmlmKHQ9PW51bGwpdD1ILlZNKFtdLHUu
-cykKcz10LmluZGV4T2YoIlxcJGFyZ3VtZW50c1xcJCIpCnI9dC5pbmRleE9mKCJcXCRhcmd1bWVudHNF
-eHByXFwkIikKcT10LmluZGV4T2YoIlxcJGV4cHJcXCQiKQpwPXQuaW5kZXhPZigiXFwkbWV0aG9kXFwk
-IikKbz10LmluZGV4T2YoIlxcJHJlY2VpdmVyXFwkIikKcmV0dXJuIG5ldyBILmY5KGEucmVwbGFjZShu
-ZXcgUmVnRXhwKCdcXFxcXFwkYXJndW1lbnRzXFxcXFxcJCcsJ2cnKSwnKCg/Onh8W154XSkqKScpLnJl
-cGxhY2UobmV3IFJlZ0V4cCgnXFxcXFxcJGFyZ3VtZW50c0V4cHJcXFxcXFwkJywnZycpLCcoKD86eHxb
-XnhdKSopJykucmVwbGFjZShuZXcgUmVnRXhwKCdcXFxcXFwkZXhwclxcXFxcXCQnLCdnJyksJygoPzp4
-fFteeF0pKiknKS5yZXBsYWNlKG5ldyBSZWdFeHAoJ1xcXFxcXCRtZXRob2RcXFxcXFwkJywnZycpLCco
-KD86eHxbXnhdKSopJykucmVwbGFjZShuZXcgUmVnRXhwKCdcXFxcXFwkcmVjZWl2ZXJcXFxcXFwkJywn
-ZycpLCcoKD86eHxbXnhdKSopJykscyxyLHEscCxvKX0sClM3OmZ1bmN0aW9uKGEpe3JldHVybiBmdW5j
-dGlvbigkZXhwciQpe3ZhciAkYXJndW1lbnRzRXhwciQ9JyRhcmd1bWVudHMkJwp0cnl7JGV4cHIkLiRt
-ZXRob2QkKCRhcmd1bWVudHNFeHByJCl9Y2F0Y2godCl7cmV0dXJuIHQubWVzc2FnZX19KGEpfSwKTWo6
-ZnVuY3Rpb24oYSl7cmV0dXJuIGZ1bmN0aW9uKCRleHByJCl7dHJ5eyRleHByJC4kbWV0aG9kJH1jYXRj
-aCh0KXtyZXR1cm4gdC5tZXNzYWdlfX0oYSl9LApJajpmdW5jdGlvbihhLGIpe3JldHVybiBuZXcgSC5X
-MChhLGI9PW51bGw/bnVsbDpiLm1ldGhvZCl9LApUMzpmdW5jdGlvbihhLGIpe3ZhciB0PWI9PW51bGws
-cz10P251bGw6Yi5tZXRob2QKcmV0dXJuIG5ldyBILmF6KGEscyx0P251bGw6Yi5yZWNlaXZlcil9LApS
-dTpmdW5jdGlvbihhKXt2YXIgdCxzLHIscSxwLG8sbixtLGwsayxqLGksaCxnLGY9bnVsbCxlPW5ldyBI
-LkFtKGEpCmlmKGE9PW51bGwpcmV0dXJuIGYKaWYoYSBpbnN0YW5jZW9mIEguYnEpcmV0dXJuIGUuJDEo
-YS5hKQppZih0eXBlb2YgYSE9PSJvYmplY3QiKXJldHVybiBhCmlmKCJkYXJ0RXhjZXB0aW9uIiBpbiBh
-KXJldHVybiBlLiQxKGEuZGFydEV4Y2VwdGlvbikKZWxzZSBpZighKCJtZXNzYWdlIiBpbiBhKSlyZXR1
-cm4gYQp0PWEubWVzc2FnZQppZigibnVtYmVyIiBpbiBhJiZ0eXBlb2YgYS5udW1iZXI9PSJudW1iZXIi
-KXtzPWEubnVtYmVyCnI9cyY2NTUzNQppZigoQy5qbi53RyhzLDE2KSY4MTkxKT09PTEwKXN3aXRjaChy
-KXtjYXNlIDQzODpyZXR1cm4gZS4kMShILlQzKEguZCh0KSsiIChFcnJvciAiK3IrIikiLGYpKQpjYXNl
-IDQ0NTpjYXNlIDUwMDc6cmV0dXJuIGUuJDEoSC5JaihILmQodCkrIiAoRXJyb3IgIityKyIpIixmKSl9
-fWlmKGEgaW5zdGFuY2VvZiBUeXBlRXJyb3Ipe3E9JC5TbigpCnA9JC5scSgpCm89JC5OOSgpCm49JC5p
-SSgpCm09JC5LZigpCmw9JC5aaCgpCms9JC5yTigpCiQuYzMoKQpqPSQuSEsoKQppPSQucjEoKQpoPXEu
-cVModCkKaWYoaCE9bnVsbClyZXR1cm4gZS4kMShILlQzKEgueSh0KSxoKSkKZWxzZXtoPXAucVModCkK
-aWYoaCE9bnVsbCl7aC5tZXRob2Q9ImNhbGwiCnJldHVybiBlLiQxKEguVDMoSC55KHQpLGgpKX1lbHNl
-e2g9by5xUyh0KQppZihoPT1udWxsKXtoPW4ucVModCkKaWYoaD09bnVsbCl7aD1tLnFTKHQpCmlmKGg9
-PW51bGwpe2g9bC5xUyh0KQppZihoPT1udWxsKXtoPWsucVModCkKaWYoaD09bnVsbCl7aD1uLnFTKHQp
-CmlmKGg9PW51bGwpe2g9ai5xUyh0KQppZihoPT1udWxsKXtoPWkucVModCkKZz1oIT1udWxsfWVsc2Ug
-Zz0hMH1lbHNlIGc9ITB9ZWxzZSBnPSEwfWVsc2UgZz0hMH1lbHNlIGc9ITB9ZWxzZSBnPSEwfWVsc2Ug
-Zz0hMAppZihnKXJldHVybiBlLiQxKEguSWooSC55KHQpLGgpKX19cmV0dXJuIGUuJDEobmV3IEgudlYo
-dHlwZW9mIHQ9PSJzdHJpbmciP3Q6IiIpKX1pZihhIGluc3RhbmNlb2YgUmFuZ2VFcnJvcil7aWYodHlw
-ZW9mIHQ9PSJzdHJpbmciJiZ0LmluZGV4T2YoImNhbGwgc3RhY2siKSE9PS0xKXJldHVybiBuZXcgUC5L
-WSgpCnQ9ZnVuY3Rpb24oYil7dHJ5e3JldHVybiBTdHJpbmcoYil9Y2F0Y2goZCl7fXJldHVybiBudWxs
-fShhKQpyZXR1cm4gZS4kMShuZXcgUC51KCExLGYsZix0eXBlb2YgdD09InN0cmluZyI/dC5yZXBsYWNl
-KC9eUmFuZ2VFcnJvcjpccyovLCIiKTp0KSl9aWYodHlwZW9mIEludGVybmFsRXJyb3I9PSJmdW5jdGlv
-biImJmEgaW5zdGFuY2VvZiBJbnRlcm5hbEVycm9yKWlmKHR5cGVvZiB0PT0ic3RyaW5nIiYmdD09PSJ0
-b28gbXVjaCByZWN1cnNpb24iKXJldHVybiBuZXcgUC5LWSgpCnJldHVybiBhfSwKdHM6ZnVuY3Rpb24o
-YSl7dmFyIHQKaWYoYSBpbnN0YW5jZW9mIEguYnEpcmV0dXJuIGEuYgppZihhPT1udWxsKXJldHVybiBu
-ZXcgSC5YTyhhKQp0PWEuJGNhY2hlZFRyYWNlCmlmKHQhPW51bGwpcmV0dXJuIHQKcmV0dXJuIGEuJGNh
-Y2hlZFRyYWNlPW5ldyBILlhPKGEpfSwKQjc6ZnVuY3Rpb24oYSxiKXt2YXIgdCxzLHIscT1hLmxlbmd0
-aApmb3IodD0wO3Q8cTt0PXIpe3M9dCsxCnI9cysxCmIuWSgwLGFbdF0sYVtzXSl9cmV0dXJuIGJ9LApm
-dDpmdW5jdGlvbihhLGIsYyxkLGUsZil7dS5aLmIoYSkKc3dpdGNoKEguU2MoYikpe2Nhc2UgMDpyZXR1
-cm4gYS4kMCgpCmNhc2UgMTpyZXR1cm4gYS4kMShjKQpjYXNlIDI6cmV0dXJuIGEuJDIoYyxkKQpjYXNl
-IDM6cmV0dXJuIGEuJDMoYyxkLGUpCmNhc2UgNDpyZXR1cm4gYS4kNChjLGQsZSxmKX10aHJvdyBILmIo
-bmV3IFAuQ0QoIlVuc3VwcG9ydGVkIG51bWJlciBvZiBhcmd1bWVudHMgZm9yIHdyYXBwZWQgY2xvc3Vy
-ZSIpKX0sCnRSOmZ1bmN0aW9uKGEsYil7dmFyIHQKaWYoYT09bnVsbClyZXR1cm4gbnVsbAp0PWEuJGlk
-ZW50aXR5CmlmKCEhdClyZXR1cm4gdAp0PWZ1bmN0aW9uKGMsZCxlKXtyZXR1cm4gZnVuY3Rpb24oZixn
-LGgsaSl7cmV0dXJuIGUoYyxkLGYsZyxoLGkpfX0oYSxiLEguZnQpCmEuJGlkZW50aXR5PXQKcmV0dXJu
-IHR9LAppQTpmdW5jdGlvbihhLGIsYyxkLGUsZixnKXt2YXIgdCxzLHIscSxwLG8sbixtLGw9bnVsbCxr
-PWJbMF0saj1rLiRjYWxsTmFtZSxpPWU/T2JqZWN0LmNyZWF0ZShuZXcgSC56eCgpLmNvbnN0cnVjdG9y
-LnByb3RvdHlwZSk6T2JqZWN0LmNyZWF0ZShuZXcgSC5yVChsLGwsbCxsKS5jb25zdHJ1Y3Rvci5wcm90
-b3R5cGUpCmkuJGluaXRpYWxpemU9aS5jb25zdHJ1Y3RvcgppZihlKXQ9ZnVuY3Rpb24gc3RhdGljX3Rl
-YXJfb2ZmKCl7dGhpcy4kaW5pdGlhbGl6ZSgpfQplbHNle3M9JC55agppZih0eXBlb2YgcyE9PSJudW1i
-ZXIiKXJldHVybiBzLmgoKQokLnlqPXMrMQpzPW5ldyBGdW5jdGlvbigiYSxiLGMsZCIrcywidGhpcy4k
-aW5pdGlhbGl6ZShhLGIsYyxkIitzKyIpIikKdD1zfWkuY29uc3RydWN0b3I9dAp0LnByb3RvdHlwZT1p
-CmlmKCFlKXtyPUguYngoYSxrLGYpCnIuJHJlZmxlY3Rpb25JbmZvPWR9ZWxzZXtpLiRzdGF0aWNfbmFt
-ZT1nCnI9a31xPUguaW0oZCxlLGYpCmkuJFM9cQppW2pdPXIKZm9yKHA9cixvPTE7bzxiLmxlbmd0aDsr
-K28pe249YltvXQptPW4uJGNhbGxOYW1lCmlmKG0hPW51bGwpe249ZT9uOkguYngoYSxuLGYpCmlbbV09
-bn1pZihvPT09Yyl7bi4kcmVmbGVjdGlvbkluZm89ZApwPW59fWkuJEM9cAppLiRSPWsuJFIKaS4kRD1r
-LiRECnJldHVybiB0fSwKaW06ZnVuY3Rpb24oYSxiLGMpe3ZhciB0CmlmKHR5cGVvZiBhPT0ibnVtYmVy
-IilyZXR1cm4gZnVuY3Rpb24oZCxlKXtyZXR1cm4gZnVuY3Rpb24oKXtyZXR1cm4gZChlKX19KEguQnAs
-YSkKaWYodHlwZW9mIGE9PSJzdHJpbmciKXtpZihiKXRocm93IEguYigiQ2Fubm90IGNvbXB1dGUgc2ln
-bmF0dXJlIGZvciBzdGF0aWMgdGVhcm9mZi4iKQp0PWM/SC5QVzpILlRuCnJldHVybiBmdW5jdGlvbihk
-LGUpe3JldHVybiBmdW5jdGlvbigpe3JldHVybiBlKHRoaXMsZCl9fShhLHQpfXRocm93IEguYigiRXJy
-b3IgaW4gZnVuY3Rpb25UeXBlIG9mIHRlYXJvZmYiKX0sCnZxOmZ1bmN0aW9uKGEsYixjLGQpe3ZhciB0
-PUguRFYKc3dpdGNoKGI/LTE6YSl7Y2FzZSAwOnJldHVybiBmdW5jdGlvbihlLGYpe3JldHVybiBmdW5j
-dGlvbigpe3JldHVybiBmKHRoaXMpW2VdKCl9fShjLHQpCmNhc2UgMTpyZXR1cm4gZnVuY3Rpb24oZSxm
-KXtyZXR1cm4gZnVuY3Rpb24oZyl7cmV0dXJuIGYodGhpcylbZV0oZyl9fShjLHQpCmNhc2UgMjpyZXR1
-cm4gZnVuY3Rpb24oZSxmKXtyZXR1cm4gZnVuY3Rpb24oZyxoKXtyZXR1cm4gZih0aGlzKVtlXShnLGgp
-fX0oYyx0KQpjYXNlIDM6cmV0dXJuIGZ1bmN0aW9uKGUsZil7cmV0dXJuIGZ1bmN0aW9uKGcsaCxpKXty
-ZXR1cm4gZih0aGlzKVtlXShnLGgsaSl9fShjLHQpCmNhc2UgNDpyZXR1cm4gZnVuY3Rpb24oZSxmKXty
-ZXR1cm4gZnVuY3Rpb24oZyxoLGksail7cmV0dXJuIGYodGhpcylbZV0oZyxoLGksail9fShjLHQpCmNh
-c2UgNTpyZXR1cm4gZnVuY3Rpb24oZSxmKXtyZXR1cm4gZnVuY3Rpb24oZyxoLGksaixrKXtyZXR1cm4g
-Zih0aGlzKVtlXShnLGgsaSxqLGspfX0oYyx0KQpkZWZhdWx0OnJldHVybiBmdW5jdGlvbihlLGYpe3Jl
-dHVybiBmdW5jdGlvbigpe3JldHVybiBlLmFwcGx5KGYodGhpcyksYXJndW1lbnRzKX19KGQsdCl9fSwK
-Yng6ZnVuY3Rpb24oYSxiLGMpe3ZhciB0LHMscixxLHAsbyxuCmlmKGMpcmV0dXJuIEguSGYoYSxiKQp0
-PWIuJHN0dWJOYW1lCnM9Yi5sZW5ndGgKcj1hW3RdCnE9Yj09bnVsbD9yPT1udWxsOmI9PT1yCnA9IXF8
-fHM+PTI3CmlmKHApcmV0dXJuIEgudnEocywhcSx0LGIpCmlmKHM9PT0wKXtxPSQueWoKaWYodHlwZW9m
-IHEhPT0ibnVtYmVyIilyZXR1cm4gcS5oKCkKJC55aj1xKzEKbz0ic2VsZiIrcQpxPSJyZXR1cm4gZnVu
-Y3Rpb24oKXt2YXIgIitvKyIgPSB0aGlzLiIKcD0kLm1KCnJldHVybiBuZXcgRnVuY3Rpb24ocStILmQo
-cD09bnVsbD8kLm1KPUguRTIoInNlbGYiKTpwKSsiO3JldHVybiAiK28rIi4iK0guZCh0KSsiKCk7fSIp
-KCl9bj0iYWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoiLnNwbGl0KCIiKS5zcGxpY2UoMCxzKS5qb2lu
-KCIsIikKcT0kLnlqCmlmKHR5cGVvZiBxIT09Im51bWJlciIpcmV0dXJuIHEuaCgpCiQueWo9cSsxCm4r
-PXEKcT0icmV0dXJuIGZ1bmN0aW9uKCIrbisiKXtyZXR1cm4gdGhpcy4iCnA9JC5tSgpyZXR1cm4gbmV3
-IEZ1bmN0aW9uKHErSC5kKHA9PW51bGw/JC5tSj1ILkUyKCJzZWxmIik6cCkrIi4iK0guZCh0KSsiKCIr
-bisiKTt9IikoKX0sClo0OmZ1bmN0aW9uKGEsYixjLGQpe3ZhciB0PUguRFYscz1ILnlTCnN3aXRjaChi
-Py0xOmEpe2Nhc2UgMDp0aHJvdyBILmIoSC5FZigiSW50ZXJjZXB0ZWQgZnVuY3Rpb24gd2l0aCBubyBh
-cmd1bWVudHMuIikpCmNhc2UgMTpyZXR1cm4gZnVuY3Rpb24oZSxmLGcpe3JldHVybiBmdW5jdGlvbigp
-e3JldHVybiBmKHRoaXMpW2VdKGcodGhpcykpfX0oYyx0LHMpCmNhc2UgMjpyZXR1cm4gZnVuY3Rpb24o
-ZSxmLGcpe3JldHVybiBmdW5jdGlvbihoKXtyZXR1cm4gZih0aGlzKVtlXShnKHRoaXMpLGgpfX0oYyx0
-LHMpCmNhc2UgMzpyZXR1cm4gZnVuY3Rpb24oZSxmLGcpe3JldHVybiBmdW5jdGlvbihoLGkpe3JldHVy
-biBmKHRoaXMpW2VdKGcodGhpcyksaCxpKX19KGMsdCxzKQpjYXNlIDQ6cmV0dXJuIGZ1bmN0aW9uKGUs
-ZixnKXtyZXR1cm4gZnVuY3Rpb24oaCxpLGope3JldHVybiBmKHRoaXMpW2VdKGcodGhpcyksaCxpLGop
-fX0oYyx0LHMpCmNhc2UgNTpyZXR1cm4gZnVuY3Rpb24oZSxmLGcpe3JldHVybiBmdW5jdGlvbihoLGks
-aixrKXtyZXR1cm4gZih0aGlzKVtlXShnKHRoaXMpLGgsaSxqLGspfX0oYyx0LHMpCmNhc2UgNjpyZXR1
-cm4gZnVuY3Rpb24oZSxmLGcpe3JldHVybiBmdW5jdGlvbihoLGksaixrLGwpe3JldHVybiBmKHRoaXMp
-W2VdKGcodGhpcyksaCxpLGosayxsKX19KGMsdCxzKQpkZWZhdWx0OnJldHVybiBmdW5jdGlvbihlLGYs
-ZyxoKXtyZXR1cm4gZnVuY3Rpb24oKXtoPVtnKHRoaXMpXQpBcnJheS5wcm90b3R5cGUucHVzaC5hcHBs
-eShoLGFyZ3VtZW50cykKcmV0dXJuIGUuYXBwbHkoZih0aGlzKSxoKX19KGQsdCxzKX19LApIZjpmdW5j
-dGlvbihhLGIpe3ZhciB0LHMscixxLHAsbyxuLG09JC5tSgppZihtPT1udWxsKW09JC5tSj1ILkUyKCJz
-ZWxmIikKdD0kLlA0CmlmKHQ9PW51bGwpdD0kLlA0PUguRTIoInJlY2VpdmVyIikKcz1iLiRzdHViTmFt
-ZQpyPWIubGVuZ3RoCnE9YVtzXQpwPWI9PW51bGw/cT09bnVsbDpiPT09cQpvPSFwfHxyPj0yOAppZihv
-KXJldHVybiBILlo0KHIsIXAscyxiKQppZihyPT09MSl7bT0icmV0dXJuIGZ1bmN0aW9uKCl7cmV0dXJu
-IHRoaXMuIitILmQobSkrIi4iK0guZChzKSsiKHRoaXMuIitILmQodCkrIik7Igp0PSQueWoKaWYodHlw
-ZW9mIHQhPT0ibnVtYmVyIilyZXR1cm4gdC5oKCkKJC55aj10KzEKcmV0dXJuIG5ldyBGdW5jdGlvbiht
-K3QrIn0iKSgpfW49ImFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6Ii5zcGxpdCgiIikuc3BsaWNlKDAs
-ci0xKS5qb2luKCIsIikKbT0icmV0dXJuIGZ1bmN0aW9uKCIrbisiKXtyZXR1cm4gdGhpcy4iK0guZCht
-KSsiLiIrSC5kKHMpKyIodGhpcy4iK0guZCh0KSsiLCAiK24rIik7Igp0PSQueWoKaWYodHlwZW9mIHQh
-PT0ibnVtYmVyIilyZXR1cm4gdC5oKCkKJC55aj10KzEKcmV0dXJuIG5ldyBGdW5jdGlvbihtK3QrIn0i
-KSgpfSwKS3E6ZnVuY3Rpb24oYSxiLGMsZCxlLGYsZyl7cmV0dXJuIEguaUEoYSxiLGMsZCwhIWUsISFm
-LGcpfSwKVG46ZnVuY3Rpb24oYSxiKXtyZXR1cm4gSC5jRSh2LnR5cGVVbml2ZXJzZSxILnpLKGEuYSks
-Yil9LApQVzpmdW5jdGlvbihhLGIpe3JldHVybiBILmNFKHYudHlwZVVuaXZlcnNlLEgueksoYS5jKSxi
-KX0sCkRWOmZ1bmN0aW9uKGEpe3JldHVybiBhLmF9LAp5UzpmdW5jdGlvbihhKXtyZXR1cm4gYS5jfSwK
-RTI6ZnVuY3Rpb24oYSl7dmFyIHQscyxyLHE9bmV3IEguclQoInNlbGYiLCJ0YXJnZXQiLCJyZWNlaXZl
-ciIsIm5hbWUiKSxwPUouRXAoT2JqZWN0LmdldE93blByb3BlcnR5TmFtZXMocSkpCmZvcih0PXAubGVu
-Z3RoLHM9MDtzPHQ7KytzKXtyPXBbc10KaWYocVtyXT09PWEpcmV0dXJuIHJ9fSwKb1Q6ZnVuY3Rpb24o
-YSl7aWYoYT09bnVsbClILmZPKCJib29sZWFuIGV4cHJlc3Npb24gbXVzdCBub3QgYmUgbnVsbCIpCnJl
-dHVybiBhfSwKZk86ZnVuY3Rpb24oYSl7dGhyb3cgSC5iKG5ldyBILmtZKGEpKX0sCmFnOmZ1bmN0aW9u
-KGEpe3Rocm93IEguYihuZXcgUC5jKGEpKX0sCkVmOmZ1bmN0aW9uKGEpe3JldHVybiBuZXcgSC5FcShh
-KX0sCllnOmZ1bmN0aW9uKGEpe3JldHVybiB2LmdldElzb2xhdGVUYWcoYSl9LApWTTpmdW5jdGlvbihh
-LGIpe2EuJHRpPWIKcmV0dXJuIGF9LApvWDpmdW5jdGlvbihhKXtpZihhPT1udWxsKXJldHVybiBudWxs
-CnJldHVybiBhLiR0aX0sCklNOmZ1bmN0aW9uKGEsYixjKXtyZXR1cm4gSC5ZOShhWyIkYSIrSC5kKGMp
-XSxILm9YKGIpKX0sClk5OmZ1bmN0aW9uKGEsYil7aWYoYT09bnVsbClyZXR1cm4gYgphPWEuYXBwbHko
-bnVsbCxiKQppZihhPT1udWxsKXJldHVybiBudWxsCmlmKEFycmF5LmlzQXJyYXkoYSkpcmV0dXJuIGEK
-aWYodHlwZW9mIGE9PSJmdW5jdGlvbiIpcmV0dXJuIGEuYXBwbHkobnVsbCxiKQpyZXR1cm4gYn0sCklH
-OmZ1bmN0aW9uKGEsYixjKXtyZXR1cm4gYS5hcHBseShiLEguWTkoSi5pYShiKVsiJGEiK0guZChjKV0s
-SC5vWChiKSkpfSwKaXc6ZnVuY3Rpb24oYSxiLGMpe09iamVjdC5kZWZpbmVQcm9wZXJ0eShhLGIse3Zh
-bHVlOmMsZW51bWVyYWJsZTpmYWxzZSx3cml0YWJsZTp0cnVlLGNvbmZpZ3VyYWJsZTp0cnVlfSl9LAp3
-MzpmdW5jdGlvbihhKXt2YXIgdCxzLHIscSxwPUgueSgkLk5GLiQxKGEpKSxvPSQubndbcF0KaWYobyE9
-bnVsbCl7T2JqZWN0LmRlZmluZVByb3BlcnR5KGEsdi5kaXNwYXRjaFByb3BlcnR5TmFtZSx7dmFsdWU6
-byxlbnVtZXJhYmxlOmZhbHNlLHdyaXRhYmxlOnRydWUsY29uZmlndXJhYmxlOnRydWV9KQpyZXR1cm4g
-by5pfXQ9JC52dltwXQppZih0IT1udWxsKXJldHVybiB0CnM9di5pbnRlcmNlcHRvcnNCeVRhZ1twXQpp
-ZihzPT1udWxsKXtwPUgueSgkLlRYLiQyKGEscCkpCmlmKHAhPW51bGwpe289JC5ud1twXQppZihvIT1u
-dWxsKXtPYmplY3QuZGVmaW5lUHJvcGVydHkoYSx2LmRpc3BhdGNoUHJvcGVydHlOYW1lLHt2YWx1ZTpv
-LGVudW1lcmFibGU6ZmFsc2Usd3JpdGFibGU6dHJ1ZSxjb25maWd1cmFibGU6dHJ1ZX0pCnJldHVybiBv
-Lml9dD0kLnZ2W3BdCmlmKHQhPW51bGwpcmV0dXJuIHQKcz12LmludGVyY2VwdG9yc0J5VGFnW3BdfX1p
-ZihzPT1udWxsKXJldHVybiBudWxsCnQ9cy5wcm90b3R5cGUKcj1wWzBdCmlmKHI9PT0iISIpe289SC5W
-YSh0KQokLm53W3BdPW8KT2JqZWN0LmRlZmluZVByb3BlcnR5KGEsdi5kaXNwYXRjaFByb3BlcnR5TmFt
-ZSx7dmFsdWU6byxlbnVtZXJhYmxlOmZhbHNlLHdyaXRhYmxlOnRydWUsY29uZmlndXJhYmxlOnRydWV9
-KQpyZXR1cm4gby5pfWlmKHI9PT0ifiIpeyQudnZbcF09dApyZXR1cm4gdH1pZihyPT09Ii0iKXtxPUgu
-VmEodCkKT2JqZWN0LmRlZmluZVByb3BlcnR5KE9iamVjdC5nZXRQcm90b3R5cGVPZihhKSx2LmRpc3Bh
-dGNoUHJvcGVydHlOYW1lLHt2YWx1ZTpxLGVudW1lcmFibGU6ZmFsc2Usd3JpdGFibGU6dHJ1ZSxjb25m
-aWd1cmFibGU6dHJ1ZX0pCnJldHVybiBxLml9aWYocj09PSIrIilyZXR1cm4gSC5MYyhhLHQpCmlmKHI9
-PT0iKiIpdGhyb3cgSC5iKFAuU1kocCkpCmlmKHYubGVhZlRhZ3NbcF09PT10cnVlKXtxPUguVmEodCkK
-T2JqZWN0LmRlZmluZVByb3BlcnR5KE9iamVjdC5nZXRQcm90b3R5cGVPZihhKSx2LmRpc3BhdGNoUHJv
-cGVydHlOYW1lLHt2YWx1ZTpxLGVudW1lcmFibGU6ZmFsc2Usd3JpdGFibGU6dHJ1ZSxjb25maWd1cmFi
-bGU6dHJ1ZX0pCnJldHVybiBxLml9ZWxzZSByZXR1cm4gSC5MYyhhLHQpfSwKTGM6ZnVuY3Rpb24oYSxi
-KXt2YXIgdD1PYmplY3QuZ2V0UHJvdG90eXBlT2YoYSkKT2JqZWN0LmRlZmluZVByb3BlcnR5KHQsdi5k
-aXNwYXRjaFByb3BlcnR5TmFtZSx7dmFsdWU6Si5RdShiLHQsbnVsbCxudWxsKSxlbnVtZXJhYmxlOmZh
-bHNlLHdyaXRhYmxlOnRydWUsY29uZmlndXJhYmxlOnRydWV9KQpyZXR1cm4gYn0sClZhOmZ1bmN0aW9u
-KGEpe3JldHVybiBKLlF1KGEsITEsbnVsbCwhIWEuJGlYail9LApWRjpmdW5jdGlvbihhLGIsYyl7dmFy
-IHQ9Yi5wcm90b3R5cGUKaWYodi5sZWFmVGFnc1thXT09PXRydWUpcmV0dXJuIEguVmEodCkKZWxzZSBy
-ZXR1cm4gSi5RdSh0LGMsbnVsbCxudWxsKX0sClhEOmZ1bmN0aW9uKCl7aWYoITA9PT0kLkJ2KXJldHVy
-bgokLkJ2PSEwCkguWjEoKX0sCloxOmZ1bmN0aW9uKCl7dmFyIHQscyxyLHEscCxvLG4sbQokLm53PU9i
-amVjdC5jcmVhdGUobnVsbCkKJC52dj1PYmplY3QuY3JlYXRlKG51bGwpCkgua08oKQp0PXYuaW50ZXJj
-ZXB0b3JzQnlUYWcKcz1PYmplY3QuZ2V0T3duUHJvcGVydHlOYW1lcyh0KQppZih0eXBlb2Ygd2luZG93
-IT0idW5kZWZpbmVkIil7d2luZG93CnI9ZnVuY3Rpb24oKXt9CmZvcihxPTA7cTxzLmxlbmd0aDsrK3Ep
-e3A9c1txXQpvPSQueDcuJDEocCkKaWYobyE9bnVsbCl7bj1ILlZGKHAsdFtwXSxvKQppZihuIT1udWxs
-KXtPYmplY3QuZGVmaW5lUHJvcGVydHkobyx2LmRpc3BhdGNoUHJvcGVydHlOYW1lLHt2YWx1ZTpuLGVu
-dW1lcmFibGU6ZmFsc2Usd3JpdGFibGU6dHJ1ZSxjb25maWd1cmFibGU6dHJ1ZX0pCnIucHJvdG90eXBl
-PW99fX19Zm9yKHE9MDtxPHMubGVuZ3RoOysrcSl7cD1zW3FdCmlmKC9eW0EtWmEtel9dLy50ZXN0KHAp
-KXttPXRbcF0KdFsiISIrcF09bQp0WyJ+IitwXT1tCnRbIi0iK3BdPW0KdFsiKyIrcF09bQp0WyIqIitw
-XT1tfX19LAprTzpmdW5jdGlvbigpe3ZhciB0LHMscixxLHAsbyxuPUMuWXEoKQpuPUgudWQoQy5LVSxI
-LnVkKEMuZlEsSC51ZChDLmk3LEgudWQoQy5pNyxILnVkKEMueGksSC51ZChDLmRrLEgudWQoQy53YihD
-Lk80KSxuKSkpKSkpKQppZih0eXBlb2YgZGFydE5hdGl2ZURpc3BhdGNoSG9va3NUcmFuc2Zvcm1lciE9
-InVuZGVmaW5lZCIpe3Q9ZGFydE5hdGl2ZURpc3BhdGNoSG9va3NUcmFuc2Zvcm1lcgppZih0eXBlb2Yg
-dD09ImZ1bmN0aW9uIil0PVt0XQppZih0LmNvbnN0cnVjdG9yPT1BcnJheSlmb3Iocz0wO3M8dC5sZW5n
-dGg7KytzKXtyPXRbc10KaWYodHlwZW9mIHI9PSJmdW5jdGlvbiIpbj1yKG4pfHxufX1xPW4uZ2V0VGFn
-CnA9bi5nZXRVbmtub3duVGFnCm89bi5wcm90b3R5cGVGb3JUYWcKJC5ORj1uZXcgSC5kQyhxKQokLlRY
-PW5ldyBILndOKHApCiQueDc9bmV3IEguVlgobyl9LAp1ZDpmdW5jdGlvbihhLGIpe3JldHVybiBhKGIp
-fHxifSwKdjQ6ZnVuY3Rpb24oYSxiLGMsZCxlLGYpe3ZhciB0PWI/Im0iOiIiLHM9Yz8iIjoiaSIscj1k
-PyJ1IjoiIixxPWU/InMiOiIiLHA9Zj8iZyI6IiIsbz1mdW5jdGlvbihnLGgpe3RyeXtyZXR1cm4gbmV3
-IFJlZ0V4cChnLGgpfWNhdGNoKG4pe3JldHVybiBufX0oYSx0K3MrcitxK3ApCmlmKG8gaW5zdGFuY2Vv
-ZiBSZWdFeHApcmV0dXJuIG8KdGhyb3cgSC5iKFAucnIoIklsbGVnYWwgUmVnRXhwIHBhdHRlcm4gKCIr
-U3RyaW5nKG8pKyIpIixhLG51bGwpKX0sCm0yOmZ1bmN0aW9uKGEsYixjKXt2YXIgdAppZih0eXBlb2Yg
-Yj09InN0cmluZyIpcmV0dXJuIGEuaW5kZXhPZihiLGMpPj0wCmVsc2UgaWYoYiBpbnN0YW5jZW9mIEgu
-VlIpe3Q9Qy54Qi5HKGEsYykKcmV0dXJuIGIuYi50ZXN0KHQpfWVsc2V7dD1KLkZMKGIsQy54Qi5HKGEs
-YykpCnJldHVybiF0LmdsMCh0KX19LApBNDpmdW5jdGlvbihhKXtpZihhLmluZGV4T2YoIiQiLDApPj0w
-KXJldHVybiBhLnJlcGxhY2UoL1wkL2csIiQkJCQiKQpyZXR1cm4gYX0sCmVBOmZ1bmN0aW9uKGEpe2lm
-KC9bW1xde30oKSorPy5cXF4kfF0vLnRlc3QoYSkpcmV0dXJuIGEucmVwbGFjZSgvW1tcXXt9KCkqKz8u
-XFxeJHxdL2csIlxcJCYiKQpyZXR1cm4gYX0sCnlzOmZ1bmN0aW9uKGEsYixjKXt2YXIgdD1ILm5NKGEs
-YixjKQpyZXR1cm4gdH0sCm5NOmZ1bmN0aW9uKGEsYixjKXt2YXIgdCxzLHIscQppZihiPT09IiIpe2lm
-KGE9PT0iIilyZXR1cm4gYwp0PWEubGVuZ3RoCmZvcihzPWMscj0wO3I8dDsrK3Ipcz1zK2Fbcl0rYwpy
-ZXR1cm4gcy5jaGFyQ29kZUF0KDApPT0wP3M6c31xPWEuaW5kZXhPZihiLDApCmlmKHE8MClyZXR1cm4g
-YQppZihhLmxlbmd0aDw1MDB8fGMuaW5kZXhPZigiJCIsMCk+PTApcmV0dXJuIGEuc3BsaXQoYikuam9p
-bihjKQpyZXR1cm4gYS5yZXBsYWNlKG5ldyBSZWdFeHAoSC5lQShiKSwnZycpLEguQTQoYykpfSwKUEQ6
-ZnVuY3Rpb24gUEQoYSxiKXt0aGlzLmE9YQp0aGlzLiR0aT1ifSwKV1U6ZnVuY3Rpb24gV1UoKXt9LApM
-UDpmdW5jdGlvbiBMUChhLGIsYyxkKXt2YXIgXz10aGlzCl8uYT1hCl8uYj1iCl8uYz1jCl8uJHRpPWR9
-LApMSTpmdW5jdGlvbiBMSShhLGIsYyxkLGUpe3ZhciBfPXRoaXMKXy5hPWEKXy5jPWIKXy5kPWMKXy5l
-PWQKXy5mPWV9LApDajpmdW5jdGlvbiBDaihhLGIsYyl7dGhpcy5hPWEKdGhpcy5iPWIKdGhpcy5jPWN9
-LApmOTpmdW5jdGlvbiBmOShhLGIsYyxkLGUsZil7dmFyIF89dGhpcwpfLmE9YQpfLmI9YgpfLmM9Ywpf
-LmQ9ZApfLmU9ZQpfLmY9Zn0sClcwOmZ1bmN0aW9uIFcwKGEsYil7dGhpcy5hPWEKdGhpcy5iPWJ9LAph
-ejpmdW5jdGlvbiBheihhLGIsYyl7dGhpcy5hPWEKdGhpcy5iPWIKdGhpcy5jPWN9LAp2VjpmdW5jdGlv
-biB2VihhKXt0aGlzLmE9YX0sCmJxOmZ1bmN0aW9uIGJxKGEsYil7dGhpcy5hPWEKdGhpcy5iPWJ9LApB
-bTpmdW5jdGlvbiBBbShhKXt0aGlzLmE9YX0sClhPOmZ1bmN0aW9uIFhPKGEpe3RoaXMuYT1hCnRoaXMu
-Yj1udWxsfSwKVHA6ZnVuY3Rpb24gVHAoKXt9LApsYzpmdW5jdGlvbiBsYygpe30sCnp4OmZ1bmN0aW9u
-IHp4KCl7fSwKclQ6ZnVuY3Rpb24gclQoYSxiLGMsZCl7dmFyIF89dGhpcwpfLmE9YQpfLmI9YgpfLmM9
-YwpfLmQ9ZH0sCkVxOmZ1bmN0aW9uIEVxKGEpe3RoaXMuYT1hfSwKa1k6ZnVuY3Rpb24ga1koYSl7dGhp
-cy5hPWF9LApONTpmdW5jdGlvbiBONShhKXt2YXIgXz10aGlzCl8uYT0wCl8uZj1fLmU9Xy5kPV8uYz1f
-LmI9bnVsbApfLnI9MApfLiR0aT1hfSwKZGI6ZnVuY3Rpb24gZGIoYSxiKXt2YXIgXz10aGlzCl8uYT1h
-Cl8uYj1iCl8uZD1fLmM9bnVsbH0sCmk1OmZ1bmN0aW9uIGk1KGEsYil7dGhpcy5hPWEKdGhpcy4kdGk9
-Yn0sCk42OmZ1bmN0aW9uIE42KGEsYixjKXt2YXIgXz10aGlzCl8uYT1hCl8uYj1iCl8uZD1fLmM9bnVs
-bApfLiR0aT1jfSwKZEM6ZnVuY3Rpb24gZEMoYSl7dGhpcy5hPWF9LAp3TjpmdW5jdGlvbiB3TihhKXt0
-aGlzLmE9YX0sClZYOmZ1bmN0aW9uIFZYKGEpe3RoaXMuYT1hfSwKVlI6ZnVuY3Rpb24gVlIoYSxiKXt2
-YXIgXz10aGlzCl8uYT1hCl8uYj1iCl8uZD1fLmM9bnVsbH0sCkVLOmZ1bmN0aW9uIEVLKGEpe3RoaXMu
-Yj1hfSwKS1c6ZnVuY3Rpb24gS1coYSxiLGMpe3RoaXMuYT1hCnRoaXMuYj1iCnRoaXMuYz1jfSwKUGI6
-ZnVuY3Rpb24gUGIoYSxiLGMpe3ZhciBfPXRoaXMKXy5hPWEKXy5iPWIKXy5jPWMKXy5kPW51bGx9LAp0
-UTpmdW5jdGlvbiB0UShhLGIpe3RoaXMuYT1hCnRoaXMuYz1ifSwKdW46ZnVuY3Rpb24gdW4oYSxiLGMp
-e3RoaXMuYT1hCnRoaXMuYj1iCnRoaXMuYz1jfSwKU2Q6ZnVuY3Rpb24gU2QoYSxiLGMpe3ZhciBfPXRo
-aXMKXy5hPWEKXy5iPWIKXy5jPWMKXy5kPW51bGx9LApYRjpmdW5jdGlvbihhKXtyZXR1cm4gYX0sCkRR
-OmZ1bmN0aW9uKGEpe3JldHVybiBuZXcgSW50OEFycmF5KGEpfSwKb2Q6ZnVuY3Rpb24oYSxiLGMpe2lm
-KGE+Pj4wIT09YXx8YT49Yyl0aHJvdyBILmIoSC5IWShiLGEpKX0sCnJNOmZ1bmN0aW9uKGEsYixjKXt2
-YXIgdAppZighKGE+Pj4wIT09YSkpdD1iPj4+MCE9PWJ8fGE+Ynx8Yj5jCmVsc2UgdD0hMAppZih0KXRo
-cm93IEguYihILmF1KGEsYixjKSkKcmV0dXJuIGJ9LApFVDpmdW5jdGlvbiBFVCgpe30sCmIwOmZ1bmN0
-aW9uIGIwKCl7fSwKRGc6ZnVuY3Rpb24gRGcoKXt9LApQZzpmdW5jdGlvbiBQZygpe30sCnhqOmZ1bmN0
-aW9uIHhqKCl7fSwKZEU6ZnVuY3Rpb24gZEUoKXt9LApaQTpmdW5jdGlvbiBaQSgpe30sCndmOmZ1bmN0
-aW9uIHdmKCl7fSwKUHE6ZnVuY3Rpb24gUHEoKXt9LAplRTpmdW5jdGlvbiBlRSgpe30sClY2OmZ1bmN0
-aW9uIFY2KCl7fSwKUkc6ZnVuY3Rpb24gUkcoKXt9LApWUDpmdW5jdGlvbiBWUCgpe30sCldCOmZ1bmN0
-aW9uIFdCKCl7fSwKWkc6ZnVuY3Rpb24gWkcoKXt9LAp4WjpmdW5jdGlvbihhLGIpe3ZhciB0PWIuZApy
-ZXR1cm4gdD09bnVsbD9iLmQ9SC5KKGEsImI4IixbYi5RXSk6dH0sClExOmZ1bmN0aW9uKGEpe3ZhciB0
-PWEuegppZih0PT09Nnx8dD09PTd8fHQ9PT04KXJldHVybiBILlExKGEuUSkKcmV0dXJuIHQ9PT0xMXx8
-dD09PTEyfSwKbUQ6ZnVuY3Rpb24oYSl7cmV0dXJuIGEuZGJ9LApOMDpmdW5jdGlvbihhKXtyZXR1cm4g
-SC5FKHYudHlwZVVuaXZlcnNlLGEpfSwKSlM6ZnVuY3Rpb24oYSl7dmFyIHQ9YS4kUwppZih0IT1udWxs
-KXtpZih0eXBlb2YgdD09Im51bWJlciIpcmV0dXJuIEguQnAodCkKcmV0dXJuIGEuJFMoKX1yZXR1cm4g
-bnVsbH0sClVlOmZ1bmN0aW9uKGEsYil7dmFyIHQKaWYoSC5RMShiKSlpZihhIGluc3RhbmNlb2YgSC5U
-cCl7dD1ILkpTKGEpCmlmKHQhPW51bGwpcmV0dXJuIHR9cmV0dXJuIEgueksoYSl9LAp6SzpmdW5jdGlv
-bihhKXt2YXIgdAppZihhIGluc3RhbmNlb2YgUC5rKXt0PWEuJHRpCnJldHVybiB0IT1udWxsP3Q6SC5W
-VShhKX1pZihBcnJheS5pc0FycmF5KGEpKXJldHVybiBILnQ2KGEpCnJldHVybiBILlZVKEouaWEoYSkp
-fSwKdDY6ZnVuY3Rpb24oYSl7dmFyIHQ9YS4kdGkscz11Lm0KaWYodD09bnVsbClyZXR1cm4gcwppZih0
-LmNvbnN0cnVjdG9yIT09cy5jb25zdHJ1Y3RvcilyZXR1cm4gcwpyZXR1cm4gdH0sCkxoOmZ1bmN0aW9u
-KGEpe3ZhciB0PWEuJHRpCnJldHVybiB0IT1udWxsP3Q6SC5WVShhKX0sClZVOmZ1bmN0aW9uKGEpe3Zh
-ciB0PWEuY29uc3RydWN0b3Iscz10LiRjY2FjaGUKaWYocyE9bnVsbClyZXR1cm4gcwpyZXR1cm4gSC5y
-OShhLHQpfSwKcjk6ZnVuY3Rpb24oYSxiKXt2YXIgdD1hIGluc3RhbmNlb2YgSC5UcD9hLl9fcHJvdG9f
-Xy5fX3Byb3RvX18uY29uc3RydWN0b3I6YixzPUguYWkodi50eXBlVW5pdmVyc2UsdC5uYW1lKQpiLiRj
-Y2FjaGU9cwpyZXR1cm4gc30sCkJwOmZ1bmN0aW9uKGEpe3ZhciB0LHM9YSxyPXYudHlwZXMscT1yW3Nd
-CmlmKHR5cGVvZiBxPT0ic3RyaW5nIil7dD1ILkUodi50eXBlVW5pdmVyc2UscSkKcltzXT10CnJldHVy
-biB0fXJldHVybiBxfSwKSko6ZnVuY3Rpb24oYSl7dmFyIHQscz10aGlzLHI9cy56LHE9SC5ZTwppZihI
-LmNjKHMpKXtxPUguSXcKcy5iPXMuYT1ILmhufWVsc2UgaWYocj09PTkpe3Q9cy5kYgppZigiS04iPT09
-dClxPUgub2sKZWxzZSBpZigiQ1AiPT09dClxPUguS0gKZWxzZSBpZigiRksiPT09dClxPUguS0gKZWxz
-ZSBpZigicVUiPT09dClxPUguTU0KZWxzZSBpZigiYTIiPT09dClxPUgubAplbHNle3I9cy5RCmlmKHMu
-Y2guZXZlcnkoSC5jYykpe3MueD0iJGkiK3IKcT1ILnQ0fX19cy5jPXEKcmV0dXJuIHMuYyhhKX0sCllP
-OmZ1bmN0aW9uKGEpe3ZhciB0PXRoaXMKcmV0dXJuIEguV2Uodi50eXBlVW5pdmVyc2UsSC5VZShhLHQp
-LG51bGwsdCxudWxsKX0sCnQ0OmZ1bmN0aW9uKGEpe3ZhciB0PXRoaXMueAppZihhIGluc3RhbmNlb2Yg
-UC5rKXJldHVybiEhYVt0XQpyZXR1cm4hIUouaWEoYSlbdF19LApPejpmdW5jdGlvbihhKXt2YXIgdApp
-ZihhPT1udWxsKXJldHVybiBhCnQ9dGhpcwppZih0LmMoYSkpcmV0dXJuIGEKdGhyb3cgSC5iKEguUTUo
-SC5XSyhhLEguVWUoYSx0KSxILmRtKHQsbnVsbCkpKSl9LApBdjpmdW5jdGlvbihhKXt2YXIgdAppZihh
-PT1udWxsKXJldHVybiBhCnQ9dGhpcwppZih0LmMoYSkpcmV0dXJuIGEKdGhyb3cgSC5iKEguWmMoSC5X
-SyhhLEguVWUoYSx0KSxILmRtKHQsbnVsbCkpKSl9LApEaDpmdW5jdGlvbihhLGIsYyxkKXt2YXIgdD1u
-dWxsCmlmKEguV2Uodi50eXBlVW5pdmVyc2UsYSx0LGIsdCkpcmV0dXJuIGEKdGhyb3cgSC5iKEguWmMo
-IlRoZSB0eXBlIGFyZ3VtZW50ICciK0guZChILmRtKGEsdCkpKyInIGlzIG5vdCBhIHN1YnR5cGUgb2Yg
-dGhlIHR5cGUgdmFyaWFibGUgYm91bmQgJyIrSC5kKEguZG0oYix0KSkrIicgb2YgdHlwZSB2YXJpYWJs
-ZSAnIitjKyInIGluICciK0guZChkKSsiJy4iKSl9LApXSzpmdW5jdGlvbihhLGIsYyl7dmFyIHQ9UC5w
-KGEpLHM9SC5kbShiPT1udWxsP0gueksoYSk6YixudWxsKQpyZXR1cm4gdCsiOiB0eXBlICciK0guZChz
-KSsiJyBpcyBub3QgYSBzdWJ0eXBlIG9mIHR5cGUgJyIrSC5kKGMpKyInIn0sClE1OmZ1bmN0aW9uKGEp
-e3JldHVybiBuZXcgSC5oeigiQ2FzdEVycm9yOiAiK2EpfSwKUHY6ZnVuY3Rpb24oYSxiKXtyZXR1cm4g
-bmV3IEguaHooIkNhc3RFcnJvcjogIitILldLKGEsbnVsbCxiKSl9LApaYzpmdW5jdGlvbihhKXtyZXR1
-cm4gbmV3IEguaU0oIlR5cGVFcnJvcjogIithKX0sCnE6ZnVuY3Rpb24oYSxiKXtyZXR1cm4gbmV3IEgu
-aU0oIlR5cGVFcnJvcjogIitILldLKGEsbnVsbCxiKSl9LApJdzpmdW5jdGlvbihhKXtyZXR1cm4hMH0s
-CmhuOmZ1bmN0aW9uKGEpe3JldHVybiBhfSwKbDpmdW5jdGlvbihhKXtyZXR1cm4hMD09PWF8fCExPT09
-YX0sCkU5OmZ1bmN0aW9uKGEpe2lmKCEwPT09YXx8ITE9PT1hKXJldHVybiBhCmlmKGE9PW51bGwpcmV0
-dXJuIGEKdGhyb3cgSC5iKEguUHYoYSwiYm9vbCIpKX0sCnhkOmZ1bmN0aW9uKGEpe2lmKCEwPT09YXx8
-ITE9PT1hKXJldHVybiBhCmlmKGE9PW51bGwpcmV0dXJuIGEKdGhyb3cgSC5iKEgucShhLCJib29sIikp
-fSwKZGo6ZnVuY3Rpb24oYSl7aWYodHlwZW9mIGE9PSJudW1iZXIiKXJldHVybiBhCmlmKGE9PW51bGwp
-cmV0dXJuIGEKdGhyb3cgSC5iKEguUHYoYSwiZG91YmxlIikpfSwKSWc6ZnVuY3Rpb24oYSl7aWYodHlw
-ZW9mIGE9PSJudW1iZXIiKXJldHVybiBhCmlmKGE9PW51bGwpcmV0dXJuIGEKdGhyb3cgSC5iKEgucShh
-LCJkb3VibGUiKSl9LApvazpmdW5jdGlvbihhKXtyZXR1cm4gdHlwZW9mIGE9PSJudW1iZXIiJiZNYXRo
-LmZsb29yKGEpPT09YX0sClNIOmZ1bmN0aW9uKGEpe2lmKHR5cGVvZiBhPT0ibnVtYmVyIiYmTWF0aC5m
-bG9vcihhKT09PWEpcmV0dXJuIGEKaWYoYT09bnVsbClyZXR1cm4gYQp0aHJvdyBILmIoSC5QdihhLCJp
-bnQiKSl9LApTYzpmdW5jdGlvbihhKXtpZih0eXBlb2YgYT09Im51bWJlciImJk1hdGguZmxvb3IoYSk9
-PT1hKXJldHVybiBhCmlmKGE9PW51bGwpcmV0dXJuIGEKdGhyb3cgSC5iKEgucShhLCJpbnQiKSl9LApL
-SDpmdW5jdGlvbihhKXtyZXR1cm4gdHlwZW9mIGE9PSJudW1iZXIifSwKdVU6ZnVuY3Rpb24oYSl7aWYo
-dHlwZW9mIGE9PSJudW1iZXIiKXJldHVybiBhCmlmKGE9PW51bGwpcmV0dXJuIGEKdGhyb3cgSC5iKEgu
-UHYoYSwibnVtIikpfSwKRE46ZnVuY3Rpb24oYSl7aWYodHlwZW9mIGE9PSJudW1iZXIiKXJldHVybiBh
-CmlmKGE9PW51bGwpcmV0dXJuIGEKdGhyb3cgSC5iKEgucShhLCJudW0iKSl9LApNTTpmdW5jdGlvbihh
-KXtyZXR1cm4gdHlwZW9mIGE9PSJzdHJpbmcifSwKYzA6ZnVuY3Rpb24oYSl7aWYodHlwZW9mIGE9PSJz
-dHJpbmciKXJldHVybiBhCmlmKGE9PW51bGwpcmV0dXJuIGEKdGhyb3cgSC5iKEguUHYoYSwiU3RyaW5n
-IikpfSwKeTpmdW5jdGlvbihhKXtpZih0eXBlb2YgYT09InN0cmluZyIpcmV0dXJuIGEKaWYoYT09bnVs
-bClyZXR1cm4gYQp0aHJvdyBILmIoSC5xKGEsIlN0cmluZyIpKX0sCmlvOmZ1bmN0aW9uKGEsYil7dmFy
-IHQscyxyCmZvcih0PSIiLHM9IiIscj0wO3I8YS5sZW5ndGg7KytyLHM9IiwgIil0Kz1DLnhCLmgocyxI
-LmRtKGFbcl0sYikpCnJldHVybiB0fSwKYkk6ZnVuY3Rpb24oYTAsYTEsYTIpe3ZhciB0LHMscixxLHAs
-byxuLG0sbCxrLGosaSxoLGcsZixlLGQsYyxiLGE9IiwgIgppZihhMiE9bnVsbCl7dD1hMi5sZW5ndGgK
-aWYoYTE9PW51bGwpe2ExPUguVk0oW10sdS5zKQpzPW51bGx9ZWxzZSBzPWExLmxlbmd0aApyPWExLmxl
-bmd0aApmb3IocT10O3E+MDstLXEpQy5ObS5pKGExLCJUIisocitxKSkKZm9yKHA9IjwiLG89IiIscT0w
-O3E8dDsrK3Esbz1hKXtwKz1vCm49YTEubGVuZ3RoCm09bi0xLXEKaWYobTwwKXJldHVybiBILk9IKGEx
-LG0pCnA9Qy54Qi5oKHAsYTFbbV0pCmw9YTJbcV0KaWYoIUguY2MobCkpcCs9Qy54Qi5oKCIgZXh0ZW5k
-cyAiLEguZG0obCxhMSkpfXArPSI+In1lbHNle3A9IiIKcz1udWxsfW49YTAuUQprPWEwLmNoCmo9ay5h
-Cmk9ai5sZW5ndGgKaD1rLmIKZz1oLmxlbmd0aApmPWsuYwplPWYubGVuZ3RoCmQ9SC5kbShuLGExKQpm
-b3IoYz0iIixiPSIiLHE9MDtxPGk7KytxLGI9YSljKz1DLnhCLmgoYixILmRtKGpbcV0sYTEpKQppZihn
-PjApe2MrPWIrIlsiCmZvcihiPSIiLHE9MDtxPGc7KytxLGI9YSljKz1DLnhCLmgoYixILmRtKGhbcV0s
-YTEpKQpjKz0iXSJ9aWYoZT4wKXtjKz1iKyJ7Igpmb3IoYj0iIixxPTA7cTxlO3ErPTIsYj1hKWMrPUMu
-eEIuaChiLEguZG0oZltxKzFdLGExKSkrIiAiK2ZbcV0KYys9In0ifWlmKHMhPW51bGwpYTEubGVuZ3Ro
-PXMKcmV0dXJuIHArIigiK2MrIikgPT4gIitILmQoZCl9LApkbTpmdW5jdGlvbihhLGIpe3ZhciB0LHMs
-cixxLHA9YS56CmlmKHA9PT01KXJldHVybiJlcmFzZWQiCmlmKHA9PT0yKXJldHVybiJkeW5hbWljIgpp
-ZihwPT09MylyZXR1cm4idm9pZCIKaWYocD09PTEpcmV0dXJuIk5ldmVyIgppZihwPT09NClyZXR1cm4i
-YW55IgppZihwPT09NilyZXR1cm4gSC5kKEguZG0oYS5RLGIpKSsiKiIKaWYocD09PTcpcmV0dXJuIEgu
-ZChILmRtKGEuUSxiKSkrIj8iCmlmKHA9PT04KXJldHVybiJGdXR1cmVPcjwiK0guZChILmRtKGEuUSxi
-KSkrIj4iCmlmKHA9PT05KXt0PUgubzMoYS5RKQpzPWEuY2gKcmV0dXJuIHMubGVuZ3RoIT09MD90Kygi
-PCIrSC5pbyhzLGIpKyI+Iik6dH1pZihwPT09MTEpcmV0dXJuIEguYkkoYSxiLG51bGwpCmlmKHA9PT0x
-MilyZXR1cm4gSC5iSShhLlEsYixhLmNoKQppZihwPT09MTMpe3I9YS5RCnE9Yi5sZW5ndGgKcj1xLTEt
-cgppZihyPDB8fHI+PXEpcmV0dXJuIEguT0goYixyKQpyZXR1cm4gYltyXX1yZXR1cm4iPyJ9LApvMzpm
-dW5jdGlvbihhKXt2YXIgdCxzPUguSmcoYSkKaWYocyE9bnVsbClyZXR1cm4gcwp0PSJtaW5pZmllZDoi
-K2EKcmV0dXJuIHR9LApRbzpmdW5jdGlvbihhLGIpe3ZhciB0PWEudFJbYl0KZm9yKDt0eXBlb2YgdD09
-InN0cmluZyI7KXQ9YS50Ult0XQpyZXR1cm4gdH0sCmFpOmZ1bmN0aW9uKGEsYil7dmFyIHQscyxyLHEs
-cCxvPWEuZVQsbj1vW2JdCmlmKG49PW51bGwpcmV0dXJuIEguRShhLGIpCmVsc2UgaWYodHlwZW9mIG49
-PSJudW1iZXIiKXt0PW4Kcz1ILm0oYSw1LCIjIikKcj1bXQpmb3IocT0wO3E8dDsrK3Epci5wdXNoKHMp
-CnA9SC5KKGEsYixyKQpvW2JdPXAKcmV0dXJuIHB9ZWxzZSByZXR1cm4gbn0sCnhiOmZ1bmN0aW9uKGEs
+IixudWxsKSl9cmV0dXJuIG5ldyBILm5IKGEsYixjLGQuQygibkg8MD4iKSl9LApLMTpmdW5jdGlvbihh
+LGIsYyxkKXtpZih1Lmd3LmIoYSkpcmV0dXJuIG5ldyBILnh5KGEsYixjLkMoIkA8MD4iKS5LcShkKS5D
+KCJ4eTwxLDI+IikpCnJldHVybiBuZXcgSC5pMShhLGIsYy5DKCJAPDA+IikuS3EoZCkuQygiaTE8MSwy
+PiIpKX0sCldwOmZ1bmN0aW9uKCl7cmV0dXJuIG5ldyBQLmxqKCJObyBlbGVtZW50Iil9LApkVTpmdW5j
+dGlvbigpe3JldHVybiBuZXcgUC5saigiVG9vIG1hbnkgZWxlbWVudHMiKX0sCmFyOmZ1bmN0aW9uKCl7
+cmV0dXJuIG5ldyBQLmxqKCJUb28gZmV3IGVsZW1lbnRzIil9LApxajpmdW5jdGlvbiBxaihhKXt0aGlz
+LmE9YX0sCmJROmZ1bmN0aW9uIGJRKCl7fSwKYUw6ZnVuY3Rpb24gYUwoKXt9LApuSDpmdW5jdGlvbiBu
+SChhLGIsYyxkKXt2YXIgXz10aGlzCl8uYT1hCl8uYj1iCl8uYz1jCl8uJHRpPWR9LAphNzpmdW5jdGlv
+biBhNyhhLGIsYyl7dmFyIF89dGhpcwpfLmE9YQpfLmI9YgpfLmM9MApfLmQ9bnVsbApfLiR0aT1jfSwK
+aTE6ZnVuY3Rpb24gaTEoYSxiLGMpe3RoaXMuYT1hCnRoaXMuYj1iCnRoaXMuJHRpPWN9LAp4eTpmdW5j
+dGlvbiB4eShhLGIsYyl7dGhpcy5hPWEKdGhpcy5iPWIKdGhpcy4kdGk9Y30sCk1IOmZ1bmN0aW9uIE1I
+KGEsYixjKXt2YXIgXz10aGlzCl8uYT1udWxsCl8uYj1hCl8uYz1iCl8uJHRpPWN9LApsSjpmdW5jdGlv
+biBsSihhLGIsYyl7dGhpcy5hPWEKdGhpcy5iPWIKdGhpcy4kdGk9Y30sClU1OmZ1bmN0aW9uIFU1KGEs
+YixjKXt0aGlzLmE9YQp0aGlzLmI9Ygp0aGlzLiR0aT1jfSwKdkc6ZnVuY3Rpb24gdkcoYSxiLGMpe3Ro
+aXMuYT1hCnRoaXMuYj1iCnRoaXMuJHRpPWN9LApTVTpmdW5jdGlvbiBTVSgpe30sClJlOmZ1bmN0aW9u
+IFJlKCl7fSwKdzI6ZnVuY3Rpb24gdzIoKXt9LAp3djpmdW5jdGlvbiB3dihhKXt0aGlzLmE9YX0sCmRj
+OmZ1bmN0aW9uKCl7dGhyb3cgSC5iKFAuTDQoIkNhbm5vdCBtb2RpZnkgdW5tb2RpZmlhYmxlIE1hcCIp
+KX0sCk5ROmZ1bmN0aW9uKGEpe3ZhciB0LHM9SC5KZyhhKQppZih0eXBlb2Ygcz09InN0cmluZyIpcmV0
+dXJuIHMKdD0ibWluaWZpZWQ6IithCnJldHVybiB0fSwKd1Y6ZnVuY3Rpb24oYSxiKXt2YXIgdAppZihi
+IT1udWxsKXt0PWIueAppZih0IT1udWxsKXJldHVybiB0fXJldHVybiB1LmFVLmIoYSl9LApkOmZ1bmN0
+aW9uKGEpe3ZhciB0CmlmKHR5cGVvZiBhPT0ic3RyaW5nIilyZXR1cm4gYQppZih0eXBlb2YgYT09Im51
+bWJlciIpe2lmKGEhPT0wKXJldHVybiIiK2F9ZWxzZSBpZighMD09PWEpcmV0dXJuInRydWUiCmVsc2Ug
+aWYoITE9PT1hKXJldHVybiJmYWxzZSIKZWxzZSBpZihhPT1udWxsKXJldHVybiJudWxsIgp0PUouQWMo
+YSkKaWYodHlwZW9mIHQhPSJzdHJpbmciKXRocm93IEguYihILkkoYSkpCnJldHVybiB0fSwKZVE6ZnVu
+Y3Rpb24oYSl7dmFyIHQ9YS4kaWRlbnRpdHlIYXNoCmlmKHQ9PW51bGwpe3Q9TWF0aC5yYW5kb20oKSow
+eDNmZmZmZmZmfDAKYS4kaWRlbnRpdHlIYXNoPXR9cmV0dXJuIHR9LApIcDpmdW5jdGlvbihhLGIpe3Zh
+ciB0LHMscixxLHAsbyxuPW51bGwKaWYodHlwZW9mIGEhPSJzdHJpbmciKUgudmgoSC5JKGEpKQp0PS9e
+XHMqWystXT8oKDB4W2EtZjAtOV0rKXwoXGQrKXwoW2EtejAtOV0rKSlccyokL2kuZXhlYyhhKQppZih0
+PT1udWxsKXJldHVybiBuCmlmKDM+PXQubGVuZ3RoKXJldHVybiBILmsodCwzKQpzPUguYyh0WzNdKQpp
+ZihiPT1udWxsKXtpZihzIT1udWxsKXJldHVybiBwYXJzZUludChhLDEwKQppZih0WzJdIT1udWxsKXJl
+dHVybiBwYXJzZUludChhLDE2KQpyZXR1cm4gbn1pZihiPDJ8fGI+MzYpdGhyb3cgSC5iKFAuVEUoYiwy
+LDM2LCJyYWRpeCIsbikpCmlmKGI9PT0xMCYmcyE9bnVsbClyZXR1cm4gcGFyc2VJbnQoYSwxMCkKaWYo
+YjwxMHx8cz09bnVsbCl7cj1iPD0xMD80NytiOjg2K2IKcT10WzFdCmZvcihwPXEubGVuZ3RoLG89MDtv
+PHA7KytvKWlmKChDLnhCLlcocSxvKXwzMik+cilyZXR1cm4gbn1yZXR1cm4gcGFyc2VJbnQoYSxiKX0s
+CmxoOmZ1bmN0aW9uKGEpe3ZhciB0PUguSDUoYSkKcmV0dXJuIHR9LApINTpmdW5jdGlvbihhKXt2YXIg
+dCxzLHIKaWYoYSBpbnN0YW5jZW9mIFAuTWgpcmV0dXJuIEguSihILnEoYSksbnVsbCkKaWYoSi5pYShh
+KT09PUMuT2t8fHUuYWsuYihhKSl7dD1DLndiKGEpCmlmKEguQmUodCkpcmV0dXJuIHQKcz1hLmNvbnN0
+cnVjdG9yCmlmKHR5cGVvZiBzPT0iZnVuY3Rpb24iKXtyPXMubmFtZQppZih0eXBlb2Ygcj09InN0cmlu
+ZyImJkguQmUocikpcmV0dXJuIHJ9fXJldHVybiBILkooSC5xKGEpLG51bGwpfSwKQmU6ZnVuY3Rpb24o
+YSl7dmFyIHQ9YSE9PSJPYmplY3QiJiZhIT09IiIKcmV0dXJuIHR9LApNMDpmdW5jdGlvbigpe2lmKCEh
+c2VsZi5sb2NhdGlvbilyZXR1cm4gc2VsZi5sb2NhdGlvbi5ocmVmCnJldHVybiBudWxsfSwKVks6ZnVu
+Y3Rpb24oYSl7dmFyIHQscyxyLHEscD1hLmxlbmd0aAppZihwPD01MDApcmV0dXJuIFN0cmluZy5mcm9t
+Q2hhckNvZGUuYXBwbHkobnVsbCxhKQpmb3IodD0iIixzPTA7czxwO3M9cil7cj1zKzUwMApxPXI8cD9y
+OnAKdCs9U3RyaW5nLmZyb21DaGFyQ29kZS5hcHBseShudWxsLGEuc2xpY2UocyxxKSl9cmV0dXJuIHR9
+LApDcTpmdW5jdGlvbihhKXt2YXIgdCxzLHIscT1ILlZNKFtdLHUudCkKZm9yKHQ9YS5sZW5ndGgscz0w
+O3M8YS5sZW5ndGg7YS5sZW5ndGg9PT10fHwoMCxILmxrKShhKSwrK3Mpe3I9YVtzXQppZighSC5vayhy
+KSl0aHJvdyBILmIoSC5JKHIpKQppZihyPD02NTUzNSlDLk5tLmkocSxyKQplbHNlIGlmKHI8PTExMTQx
+MTEpe0MuTm0uaShxLDU1Mjk2KyhDLmpuLndHKHItNjU1MzYsMTApJjEwMjMpKQpDLk5tLmkocSw1NjMy
+MCsociYxMDIzKSl9ZWxzZSB0aHJvdyBILmIoSC5JKHIpKX1yZXR1cm4gSC5WSyhxKX0sCmVUOmZ1bmN0
+aW9uKGEpe3ZhciB0LHMscgpmb3IodD1hLmxlbmd0aCxzPTA7czx0Oysrcyl7cj1hW3NdCmlmKCFILm9r
+KHIpKXRocm93IEguYihILkkocikpCmlmKHI8MCl0aHJvdyBILmIoSC5JKHIpKQppZihyPjY1NTM1KXJl
+dHVybiBILkNxKGEpfXJldHVybiBILlZLKGEpfSwKZnc6ZnVuY3Rpb24oYSxiLGMpe3ZhciB0LHMscixx
+CmlmKGM8PTUwMCYmYj09PTAmJmM9PT1hLmxlbmd0aClyZXR1cm4gU3RyaW5nLmZyb21DaGFyQ29kZS5h
+cHBseShudWxsLGEpCmZvcih0PWIscz0iIjt0PGM7dD1yKXtyPXQrNTAwCnE9cjxjP3I6YwpzKz1TdHJp
+bmcuZnJvbUNoYXJDb2RlLmFwcGx5KG51bGwsYS5zdWJhcnJheSh0LHEpKX1yZXR1cm4gc30sCkx3OmZ1
+bmN0aW9uKGEpe3ZhciB0CmlmKDA8PWEpe2lmKGE8PTY1NTM1KXJldHVybiBTdHJpbmcuZnJvbUNoYXJD
+b2RlKGEpCmlmKGE8PTExMTQxMTEpe3Q9YS02NTUzNgpyZXR1cm4gU3RyaW5nLmZyb21DaGFyQ29kZSgo
+NTUyOTZ8Qy5qbi53Ryh0LDEwKSk+Pj4wLDU2MzIwfHQmMTAyMyl9fXRocm93IEguYihQLlRFKGEsMCwx
+MTE0MTExLG51bGwsbnVsbCkpfSwKbzI6ZnVuY3Rpb24oYSl7aWYoYS5kYXRlPT09dm9pZCAwKWEuZGF0
+ZT1uZXcgRGF0ZShhLmEpCnJldHVybiBhLmRhdGV9LAp0SjpmdW5jdGlvbihhKXt2YXIgdD1ILm8yKGEp
+LmdldEZ1bGxZZWFyKCkrMApyZXR1cm4gdH0sCk5TOmZ1bmN0aW9uKGEpe3ZhciB0PUgubzIoYSkuZ2V0
+TW9udGgoKSsxCnJldHVybiB0fSwKakE6ZnVuY3Rpb24oYSl7dmFyIHQ9SC5vMihhKS5nZXREYXRlKCkr
+MApyZXR1cm4gdH0sCktMOmZ1bmN0aW9uKGEpe3ZhciB0PUgubzIoYSkuZ2V0SG91cnMoKSswCnJldHVy
+biB0fSwKY2g6ZnVuY3Rpb24oYSl7dmFyIHQ9SC5vMihhKS5nZXRNaW51dGVzKCkrMApyZXR1cm4gdH0s
+CkpkOmZ1bmN0aW9uKGEpe3ZhciB0PUgubzIoYSkuZ2V0U2Vjb25kcygpKzAKcmV0dXJuIHR9LApWYTpm
+dW5jdGlvbihhKXt2YXIgdD1ILm8yKGEpLmdldE1pbGxpc2Vjb25kcygpKzAKcmV0dXJuIHR9LAp6bzpm
+dW5jdGlvbihhLGIsYyl7dmFyIHQscyxyPXt9CnIuYT0wCnQ9W10Kcz1bXQpyLmE9Yi5sZW5ndGgKQy5O
+bS5GVih0LGIpCnIuYj0iIgppZihjIT1udWxsJiZjLmEhPT0wKWMuSygwLG5ldyBILkNqKHIscyx0KSkK
+IiIrci5hCnJldHVybiBKLkp5KGEsbmV3IEguTEkoQy5UZSwwLHQscywwKSl9LApFazpmdW5jdGlvbihh
+LGIsYyl7dmFyIHQscyxyLHEKaWYoYiBpbnN0YW5jZW9mIEFycmF5KXQ9Yz09bnVsbHx8Yy5hPT09MApl
+bHNlIHQ9ITEKaWYodCl7cz1iCnI9cy5sZW5ndGgKaWYocj09PTApe2lmKCEhYS4kMClyZXR1cm4gYS4k
+MCgpfWVsc2UgaWYocj09PTEpe2lmKCEhYS4kMSlyZXR1cm4gYS4kMShzWzBdKX1lbHNlIGlmKHI9PT0y
+KXtpZighIWEuJDIpcmV0dXJuIGEuJDIoc1swXSxzWzFdKX1lbHNlIGlmKHI9PT0zKXtpZighIWEuJDMp
+cmV0dXJuIGEuJDMoc1swXSxzWzFdLHNbMl0pfWVsc2UgaWYocj09PTQpe2lmKCEhYS4kNClyZXR1cm4g
+YS4kNChzWzBdLHNbMV0sc1syXSxzWzNdKX1lbHNlIGlmKHI9PT01KWlmKCEhYS4kNSlyZXR1cm4gYS4k
+NShzWzBdLHNbMV0sc1syXSxzWzNdLHNbNF0pCnE9YVsiIisiJCIrcl0KaWYocSE9bnVsbClyZXR1cm4g
+cS5hcHBseShhLHMpfXJldHVybiBILkV3KGEsYixjKX0sCkV3OmZ1bmN0aW9uKGEsYixjKXt2YXIgdCxz
+LHIscSxwLG8sbixtLGwsaz1iIGluc3RhbmNlb2YgQXJyYXk/YjpQLkNIKGIsITAsdS56KSxqPWsubGVu
+Z3RoLGk9YS4kUgppZihqPGkpcmV0dXJuIEguem8oYSxrLGMpCnQ9YS4kRApzPXQ9PW51bGwKcj0hcz90
+KCk6bnVsbApxPUouaWEoYSkKcD1xLiRDCmlmKHR5cGVvZiBwPT0ic3RyaW5nIilwPXFbcF0KaWYocyl7
+aWYoYyE9bnVsbCYmYy5hIT09MClyZXR1cm4gSC56byhhLGssYykKaWYoaj09PWkpcmV0dXJuIHAuYXBw
+bHkoYSxrKQpyZXR1cm4gSC56byhhLGssYyl9aWYociBpbnN0YW5jZW9mIEFycmF5KXtpZihjIT1udWxs
+JiZjLmEhPT0wKXJldHVybiBILnpvKGEsayxjKQppZihqPmkrci5sZW5ndGgpcmV0dXJuIEguem8oYSxr
+LG51bGwpCkMuTm0uRlYoayxyLnNsaWNlKGotaSkpCnJldHVybiBwLmFwcGx5KGEsayl9ZWxzZXtpZihq
+PmkpcmV0dXJuIEguem8oYSxrLGMpCm89T2JqZWN0LmtleXMocikKaWYoYz09bnVsbClmb3Iocz1vLmxl
+bmd0aCxuPTA7bjxvLmxlbmd0aDtvLmxlbmd0aD09PXN8fCgwLEgubGspKG8pLCsrbilDLk5tLmkoayxy
+W0guYyhvW25dKV0pCmVsc2V7Zm9yKHM9by5sZW5ndGgsbT0wLG49MDtuPG8ubGVuZ3RoO28ubGVuZ3Ro
+PT09c3x8KDAsSC5saykobyksKytuKXtsPUguYyhvW25dKQppZihjLng0KGwpKXsrK20KQy5ObS5pKGss
+Yy5xKDAsbCkpfWVsc2UgQy5ObS5pKGsscltsXSl9aWYobSE9PWMuYSlyZXR1cm4gSC56byhhLGssYyl9
+cmV0dXJuIHAuYXBwbHkoYSxrKX19LApwWTpmdW5jdGlvbihhKXt0aHJvdyBILmIoSC5JKGEpKX0sCms6
+ZnVuY3Rpb24oYSxiKXtpZihhPT1udWxsKUouSChhKQp0aHJvdyBILmIoSC5IWShhLGIpKX0sCkhZOmZ1
+bmN0aW9uKGEsYil7dmFyIHQscyxyPSJpbmRleCIKaWYoIUgub2soYikpcmV0dXJuIG5ldyBQLkFUKCEw
+LGIscixudWxsKQp0PUguV1koSi5IKGEpKQppZighKGI8MCkpe2lmKHR5cGVvZiB0IT09Im51bWJlciIp
+cmV0dXJuIEgucFkodCkKcz1iPj10fWVsc2Ugcz0hMAppZihzKXJldHVybiBQLnQoYixhLHIsbnVsbCx0
+KQpyZXR1cm4gUC5PNyhiLHIpfSwKYXU6ZnVuY3Rpb24oYSxiLGMpe3ZhciB0PSJJbnZhbGlkIHZhbHVl
+IgppZihhPmMpcmV0dXJuIG5ldyBQLmJKKDAsYywhMCxhLCJzdGFydCIsdCkKaWYoYiE9bnVsbCl7aWYo
+IUgub2soYikpcmV0dXJuIG5ldyBQLkFUKCEwLGIsImVuZCIsbnVsbCkKaWYoYjxhfHxiPmMpcmV0dXJu
+IG5ldyBQLmJKKGEsYywhMCxiLCJlbmQiLHQpfXJldHVybiBuZXcgUC5BVCghMCxiLCJlbmQiLG51bGwp
+fSwKSTpmdW5jdGlvbihhKXtyZXR1cm4gbmV3IFAuQVQoITAsYSxudWxsLG51bGwpfSwKYjpmdW5jdGlv
+bihhKXt2YXIgdAppZihhPT1udWxsKWE9bmV3IFAuTEsoKQp0PW5ldyBFcnJvcigpCnQuZGFydEV4Y2Vw
+dGlvbj1hCmlmKCJkZWZpbmVQcm9wZXJ0eSIgaW4gT2JqZWN0KXtPYmplY3QuZGVmaW5lUHJvcGVydHko
+dCwibWVzc2FnZSIse2dldDpILkp1fSkKdC5uYW1lPSIifWVsc2UgdC50b1N0cmluZz1ILkp1CnJldHVy
+biB0fSwKSnU6ZnVuY3Rpb24oKXtyZXR1cm4gSi5BYyh0aGlzLmRhcnRFeGNlcHRpb24pfSwKdmg6ZnVu
+Y3Rpb24oYSl7dGhyb3cgSC5iKGEpfSwKbGs6ZnVuY3Rpb24oYSl7dGhyb3cgSC5iKFAuYTQoYSkpfSwK
+Y006ZnVuY3Rpb24oYSl7dmFyIHQscyxyLHEscCxvCmE9SC5lQShhLnJlcGxhY2UoU3RyaW5nKHt9KSwn
+JHJlY2VpdmVyJCcpKQp0PWEubWF0Y2goL1xcXCRbYS16QS1aXStcXFwkL2cpCmlmKHQ9PW51bGwpdD1I
+LlZNKFtdLHUucykKcz10LmluZGV4T2YoIlxcJGFyZ3VtZW50c1xcJCIpCnI9dC5pbmRleE9mKCJcXCRh
+cmd1bWVudHNFeHByXFwkIikKcT10LmluZGV4T2YoIlxcJGV4cHJcXCQiKQpwPXQuaW5kZXhPZigiXFwk
+bWV0aG9kXFwkIikKbz10LmluZGV4T2YoIlxcJHJlY2VpdmVyXFwkIikKcmV0dXJuIG5ldyBILmY5KGEu
+cmVwbGFjZShuZXcgUmVnRXhwKCdcXFxcXFwkYXJndW1lbnRzXFxcXFxcJCcsJ2cnKSwnKCg/Onh8W154
+XSkqKScpLnJlcGxhY2UobmV3IFJlZ0V4cCgnXFxcXFxcJGFyZ3VtZW50c0V4cHJcXFxcXFwkJywnZycp
+LCcoKD86eHxbXnhdKSopJykucmVwbGFjZShuZXcgUmVnRXhwKCdcXFxcXFwkZXhwclxcXFxcXCQnLCdn
+JyksJygoPzp4fFteeF0pKiknKS5yZXBsYWNlKG5ldyBSZWdFeHAoJ1xcXFxcXCRtZXRob2RcXFxcXFwk
+JywnZycpLCcoKD86eHxbXnhdKSopJykucmVwbGFjZShuZXcgUmVnRXhwKCdcXFxcXFwkcmVjZWl2ZXJc
+XFxcXFwkJywnZycpLCcoKD86eHxbXnhdKSopJykscyxyLHEscCxvKX0sClM3OmZ1bmN0aW9uKGEpe3Jl
+dHVybiBmdW5jdGlvbigkZXhwciQpe3ZhciAkYXJndW1lbnRzRXhwciQ9JyRhcmd1bWVudHMkJwp0cnl7
+JGV4cHIkLiRtZXRob2QkKCRhcmd1bWVudHNFeHByJCl9Y2F0Y2godCl7cmV0dXJuIHQubWVzc2FnZX19
+KGEpfSwKTWo6ZnVuY3Rpb24oYSl7cmV0dXJuIGZ1bmN0aW9uKCRleHByJCl7dHJ5eyRleHByJC4kbWV0
+aG9kJH1jYXRjaCh0KXtyZXR1cm4gdC5tZXNzYWdlfX0oYSl9LApJajpmdW5jdGlvbihhLGIpe3JldHVy
+biBuZXcgSC5XMChhLGI9PW51bGw/bnVsbDpiLm1ldGhvZCl9LApUMzpmdW5jdGlvbihhLGIpe3ZhciB0
+PWI9PW51bGwscz10P251bGw6Yi5tZXRob2QKcmV0dXJuIG5ldyBILmF6KGEscyx0P251bGw6Yi5yZWNl
+aXZlcil9LApSdTpmdW5jdGlvbihhKXt2YXIgdCxzLHIscSxwLG8sbixtLGwsayxqLGksaCxnLGY9bnVs
+bCxlPW5ldyBILkFtKGEpCmlmKGE9PW51bGwpcmV0dXJuIGYKaWYoYSBpbnN0YW5jZW9mIEguYnEpcmV0
+dXJuIGUuJDEoYS5hKQppZih0eXBlb2YgYSE9PSJvYmplY3QiKXJldHVybiBhCmlmKCJkYXJ0RXhjZXB0
+aW9uIiBpbiBhKXJldHVybiBlLiQxKGEuZGFydEV4Y2VwdGlvbikKZWxzZSBpZighKCJtZXNzYWdlIiBp
+biBhKSlyZXR1cm4gYQp0PWEubWVzc2FnZQppZigibnVtYmVyIiBpbiBhJiZ0eXBlb2YgYS5udW1iZXI9
+PSJudW1iZXIiKXtzPWEubnVtYmVyCnI9cyY2NTUzNQppZigoQy5qbi53RyhzLDE2KSY4MTkxKT09PTEw
+KXN3aXRjaChyKXtjYXNlIDQzODpyZXR1cm4gZS4kMShILlQzKEguZCh0KSsiIChFcnJvciAiK3IrIiki
+LGYpKQpjYXNlIDQ0NTpjYXNlIDUwMDc6cmV0dXJuIGUuJDEoSC5JaihILmQodCkrIiAoRXJyb3IgIity
+KyIpIixmKSl9fWlmKGEgaW5zdGFuY2VvZiBUeXBlRXJyb3Ipe3E9JC5TbigpCnA9JC5scSgpCm89JC5O
+OSgpCm49JC5pSSgpCm09JC5VTigpCmw9JC5aaCgpCms9JC5yTigpCiQuYzMoKQpqPSQuSEsoKQppPSQu
+cjEoKQpoPXEucVModCkKaWYoaCE9bnVsbClyZXR1cm4gZS4kMShILlQzKEguYyh0KSxoKSkKZWxzZXto
+PXAucVModCkKaWYoaCE9bnVsbCl7aC5tZXRob2Q9ImNhbGwiCnJldHVybiBlLiQxKEguVDMoSC5jKHQp
+LGgpKX1lbHNle2g9by5xUyh0KQppZihoPT1udWxsKXtoPW4ucVModCkKaWYoaD09bnVsbCl7aD1tLnFT
+KHQpCmlmKGg9PW51bGwpe2g9bC5xUyh0KQppZihoPT1udWxsKXtoPWsucVModCkKaWYoaD09bnVsbCl7
+aD1uLnFTKHQpCmlmKGg9PW51bGwpe2g9ai5xUyh0KQppZihoPT1udWxsKXtoPWkucVModCkKZz1oIT1u
+dWxsfWVsc2UgZz0hMH1lbHNlIGc9ITB9ZWxzZSBnPSEwfWVsc2UgZz0hMH1lbHNlIGc9ITB9ZWxzZSBn
+PSEwfWVsc2UgZz0hMAppZihnKXJldHVybiBlLiQxKEguSWooSC5jKHQpLGgpKX19cmV0dXJuIGUuJDEo
+bmV3IEgudlYodHlwZW9mIHQ9PSJzdHJpbmciP3Q6IiIpKX1pZihhIGluc3RhbmNlb2YgUmFuZ2VFcnJv
+cil7aWYodHlwZW9mIHQ9PSJzdHJpbmciJiZ0LmluZGV4T2YoImNhbGwgc3RhY2siKSE9PS0xKXJldHVy
+biBuZXcgUC5LWSgpCnQ9ZnVuY3Rpb24oYil7dHJ5e3JldHVybiBTdHJpbmcoYil9Y2F0Y2goZCl7fXJl
+dHVybiBudWxsfShhKQpyZXR1cm4gZS4kMShuZXcgUC5BVCghMSxmLGYsdHlwZW9mIHQ9PSJzdHJpbmci
+P3QucmVwbGFjZSgvXlJhbmdlRXJyb3I6XHMqLywiIik6dCkpfWlmKHR5cGVvZiBJbnRlcm5hbEVycm9y
+PT0iZnVuY3Rpb24iJiZhIGluc3RhbmNlb2YgSW50ZXJuYWxFcnJvcilpZih0eXBlb2YgdD09InN0cmlu
+ZyImJnQ9PT0idG9vIG11Y2ggcmVjdXJzaW9uIilyZXR1cm4gbmV3IFAuS1koKQpyZXR1cm4gYX0sCnRz
+OmZ1bmN0aW9uKGEpe3ZhciB0CmlmKGEgaW5zdGFuY2VvZiBILmJxKXJldHVybiBhLmIKaWYoYT09bnVs
+bClyZXR1cm4gbmV3IEguWE8oYSkKdD1hLiRjYWNoZWRUcmFjZQppZih0IT1udWxsKXJldHVybiB0CnJl
+dHVybiBhLiRjYWNoZWRUcmFjZT1uZXcgSC5YTyhhKX0sCkI3OmZ1bmN0aW9uKGEsYil7dmFyIHQscyxy
+LHE9YS5sZW5ndGgKZm9yKHQ9MDt0PHE7dD1yKXtzPXQrMQpyPXMrMQpiLlkoMCxhW3RdLGFbc10pfXJl
+dHVybiBifSwKZnQ6ZnVuY3Rpb24oYSxiLGMsZCxlLGYpe3UuWi5hKGEpCnN3aXRjaChILldZKGIpKXtj
+YXNlIDA6cmV0dXJuIGEuJDAoKQpjYXNlIDE6cmV0dXJuIGEuJDEoYykKY2FzZSAyOnJldHVybiBhLiQy
+KGMsZCkKY2FzZSAzOnJldHVybiBhLiQzKGMsZCxlKQpjYXNlIDQ6cmV0dXJuIGEuJDQoYyxkLGUsZil9
+dGhyb3cgSC5iKG5ldyBQLkNEKCJVbnN1cHBvcnRlZCBudW1iZXIgb2YgYXJndW1lbnRzIGZvciB3cmFw
+cGVkIGNsb3N1cmUiKSl9LAp0UjpmdW5jdGlvbihhLGIpe3ZhciB0CmlmKGE9PW51bGwpcmV0dXJuIG51
+bGwKdD1hLiRpZGVudGl0eQppZighIXQpcmV0dXJuIHQKdD1mdW5jdGlvbihjLGQsZSl7cmV0dXJuIGZ1
+bmN0aW9uKGYsZyxoLGkpe3JldHVybiBlKGMsZCxmLGcsaCxpKX19KGEsYixILmZ0KQphLiRpZGVudGl0
+eT10CnJldHVybiB0fSwKaUE6ZnVuY3Rpb24oYSxiLGMsZCxlLGYsZyl7dmFyIHQscyxyLHEscCxvLG4s
+bSxsPW51bGwsaz1iWzBdLGo9ay4kY2FsbE5hbWUsaT1lP09iamVjdC5jcmVhdGUobmV3IEguengoKS5j
+b25zdHJ1Y3Rvci5wcm90b3R5cGUpOk9iamVjdC5jcmVhdGUobmV3IEguankobCxsLGwsbCkuY29uc3Ry
+dWN0b3IucHJvdG90eXBlKQppLiRpbml0aWFsaXplPWkuY29uc3RydWN0b3IKaWYoZSl0PWZ1bmN0aW9u
+IHN0YXRpY190ZWFyX29mZigpe3RoaXMuJGluaXRpYWxpemUoKX0KZWxzZXtzPSQueWoKaWYodHlwZW9m
+IHMhPT0ibnVtYmVyIilyZXR1cm4gcy5oKCkKJC55aj1zKzEKcz1uZXcgRnVuY3Rpb24oImEsYixjLGQi
+K3MsInRoaXMuJGluaXRpYWxpemUoYSxiLGMsZCIrcysiKSIpCnQ9c31pLmNvbnN0cnVjdG9yPXQKdC5w
+cm90b3R5cGU9aQppZighZSl7cj1ILmJ4KGEsayxmKQpyLiRyZWZsZWN0aW9uSW5mbz1kfWVsc2V7aS4k
+c3RhdGljX25hbWU9ZwpyPWt9cT1ILmltKGQsZSxmKQppLiRTPXEKaVtqXT1yCmZvcihwPXIsbz0xO288
+Yi5sZW5ndGg7KytvKXtuPWJbb10KbT1uLiRjYWxsTmFtZQppZihtIT1udWxsKXtuPWU/bjpILmJ4KGEs
+bixmKQppW21dPW59aWYobz09PWMpe24uJHJlZmxlY3Rpb25JbmZvPWQKcD1ufX1pLiRDPXAKaS4kUj1r
+LiRSCmkuJEQ9ay4kRApyZXR1cm4gdH0sCmltOmZ1bmN0aW9uKGEsYixjKXt2YXIgdAppZih0eXBlb2Yg
+YT09Im51bWJlciIpcmV0dXJuIGZ1bmN0aW9uKGQsZSl7cmV0dXJuIGZ1bmN0aW9uKCl7cmV0dXJuIGQo
+ZSl9fShILkJwLGEpCmlmKHR5cGVvZiBhPT0ic3RyaW5nIil7aWYoYil0aHJvdyBILmIoIkNhbm5vdCBj
+b21wdXRlIHNpZ25hdHVyZSBmb3Igc3RhdGljIHRlYXJvZmYuIikKdD1jP0guUFc6SC5UbgpyZXR1cm4g
+ZnVuY3Rpb24oZCxlKXtyZXR1cm4gZnVuY3Rpb24oKXtyZXR1cm4gZSh0aGlzLGQpfX0oYSx0KX10aHJv
+dyBILmIoIkVycm9yIGluIGZ1bmN0aW9uVHlwZSBvZiB0ZWFyb2ZmIil9LAp2cTpmdW5jdGlvbihhLGIs
+YyxkKXt2YXIgdD1ILkRWCnN3aXRjaChiPy0xOmEpe2Nhc2UgMDpyZXR1cm4gZnVuY3Rpb24oZSxmKXty
+ZXR1cm4gZnVuY3Rpb24oKXtyZXR1cm4gZih0aGlzKVtlXSgpfX0oYyx0KQpjYXNlIDE6cmV0dXJuIGZ1
+bmN0aW9uKGUsZil7cmV0dXJuIGZ1bmN0aW9uKGcpe3JldHVybiBmKHRoaXMpW2VdKGcpfX0oYyx0KQpj
+YXNlIDI6cmV0dXJuIGZ1bmN0aW9uKGUsZil7cmV0dXJuIGZ1bmN0aW9uKGcsaCl7cmV0dXJuIGYodGhp
+cylbZV0oZyxoKX19KGMsdCkKY2FzZSAzOnJldHVybiBmdW5jdGlvbihlLGYpe3JldHVybiBmdW5jdGlv
+bihnLGgsaSl7cmV0dXJuIGYodGhpcylbZV0oZyxoLGkpfX0oYyx0KQpjYXNlIDQ6cmV0dXJuIGZ1bmN0
+aW9uKGUsZil7cmV0dXJuIGZ1bmN0aW9uKGcsaCxpLGope3JldHVybiBmKHRoaXMpW2VdKGcsaCxpLGop
+fX0oYyx0KQpjYXNlIDU6cmV0dXJuIGZ1bmN0aW9uKGUsZil7cmV0dXJuIGZ1bmN0aW9uKGcsaCxpLGos
+ayl7cmV0dXJuIGYodGhpcylbZV0oZyxoLGksaixrKX19KGMsdCkKZGVmYXVsdDpyZXR1cm4gZnVuY3Rp
+b24oZSxmKXtyZXR1cm4gZnVuY3Rpb24oKXtyZXR1cm4gZS5hcHBseShmKHRoaXMpLGFyZ3VtZW50cyl9
+fShkLHQpfX0sCmJ4OmZ1bmN0aW9uKGEsYixjKXt2YXIgdCxzLHIscSxwLG8sbgppZihjKXJldHVybiBI
+LkhmKGEsYikKdD1iLiRzdHViTmFtZQpzPWIubGVuZ3RoCnI9YVt0XQpxPWI9PW51bGw/cj09bnVsbDpi
+PT09cgpwPSFxfHxzPj0yNwppZihwKXJldHVybiBILnZxKHMsIXEsdCxiKQppZihzPT09MCl7cT0kLnlq
+CmlmKHR5cGVvZiBxIT09Im51bWJlciIpcmV0dXJuIHEuaCgpCiQueWo9cSsxCm89InNlbGYiK3EKcT0i
+cmV0dXJuIGZ1bmN0aW9uKCl7dmFyICIrbysiID0gdGhpcy4iCnA9JC5tSgpyZXR1cm4gbmV3IEZ1bmN0
+aW9uKHErSC5kKHA9PW51bGw/JC5tSj1ILkUyKCJzZWxmIik6cCkrIjtyZXR1cm4gIitvKyIuIitILmQo
+dCkrIigpO30iKSgpfW49ImFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6Ii5zcGxpdCgiIikuc3BsaWNl
+KDAscykuam9pbigiLCIpCnE9JC55agppZih0eXBlb2YgcSE9PSJudW1iZXIiKXJldHVybiBxLmgoKQok
+LnlqPXErMQpuKz1xCnE9InJldHVybiBmdW5jdGlvbigiK24rIil7cmV0dXJuIHRoaXMuIgpwPSQubUoK
+cmV0dXJuIG5ldyBGdW5jdGlvbihxK0guZChwPT1udWxsPyQubUo9SC5FMigic2VsZiIpOnApKyIuIitI
+LmQodCkrIigiK24rIik7fSIpKCl9LApaNDpmdW5jdGlvbihhLGIsYyxkKXt2YXIgdD1ILkRWLHM9SC55
+Uwpzd2l0Y2goYj8tMTphKXtjYXNlIDA6dGhyb3cgSC5iKEguRWYoIkludGVyY2VwdGVkIGZ1bmN0aW9u
+IHdpdGggbm8gYXJndW1lbnRzLiIpKQpjYXNlIDE6cmV0dXJuIGZ1bmN0aW9uKGUsZixnKXtyZXR1cm4g
+ZnVuY3Rpb24oKXtyZXR1cm4gZih0aGlzKVtlXShnKHRoaXMpKX19KGMsdCxzKQpjYXNlIDI6cmV0dXJu
+IGZ1bmN0aW9uKGUsZixnKXtyZXR1cm4gZnVuY3Rpb24oaCl7cmV0dXJuIGYodGhpcylbZV0oZyh0aGlz
+KSxoKX19KGMsdCxzKQpjYXNlIDM6cmV0dXJuIGZ1bmN0aW9uKGUsZixnKXtyZXR1cm4gZnVuY3Rpb24o
+aCxpKXtyZXR1cm4gZih0aGlzKVtlXShnKHRoaXMpLGgsaSl9fShjLHQscykKY2FzZSA0OnJldHVybiBm
+dW5jdGlvbihlLGYsZyl7cmV0dXJuIGZ1bmN0aW9uKGgsaSxqKXtyZXR1cm4gZih0aGlzKVtlXShnKHRo
+aXMpLGgsaSxqKX19KGMsdCxzKQpjYXNlIDU6cmV0dXJuIGZ1bmN0aW9uKGUsZixnKXtyZXR1cm4gZnVu
+Y3Rpb24oaCxpLGosayl7cmV0dXJuIGYodGhpcylbZV0oZyh0aGlzKSxoLGksaixrKX19KGMsdCxzKQpj
+YXNlIDY6cmV0dXJuIGZ1bmN0aW9uKGUsZixnKXtyZXR1cm4gZnVuY3Rpb24oaCxpLGosayxsKXtyZXR1
+cm4gZih0aGlzKVtlXShnKHRoaXMpLGgsaSxqLGssbCl9fShjLHQscykKZGVmYXVsdDpyZXR1cm4gZnVu
+Y3Rpb24oZSxmLGcsaCl7cmV0dXJuIGZ1bmN0aW9uKCl7aD1bZyh0aGlzKV0KQXJyYXkucHJvdG90eXBl
+LnB1c2guYXBwbHkoaCxhcmd1bWVudHMpCnJldHVybiBlLmFwcGx5KGYodGhpcyksaCl9fShkLHQscyl9
+fSwKSGY6ZnVuY3Rpb24oYSxiKXt2YXIgdCxzLHIscSxwLG8sbixtPSQubUoKaWYobT09bnVsbCltPSQu
+bUo9SC5FMigic2VsZiIpCnQ9JC5QNAppZih0PT1udWxsKXQ9JC5QND1ILkUyKCJyZWNlaXZlciIpCnM9
+Yi4kc3R1Yk5hbWUKcj1iLmxlbmd0aApxPWFbc10KcD1iPT1udWxsP3E9PW51bGw6Yj09PXEKbz0hcHx8
+cj49MjgKaWYobylyZXR1cm4gSC5aNChyLCFwLHMsYikKaWYocj09PTEpe209InJldHVybiBmdW5jdGlv
+bigpe3JldHVybiB0aGlzLiIrSC5kKG0pKyIuIitILmQocykrIih0aGlzLiIrSC5kKHQpKyIpOyIKdD0k
+LnlqCmlmKHR5cGVvZiB0IT09Im51bWJlciIpcmV0dXJuIHQuaCgpCiQueWo9dCsxCnJldHVybiBuZXcg
+RnVuY3Rpb24obSt0KyJ9IikoKX1uPSJhYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5eiIuc3BsaXQoIiIp
+LnNwbGljZSgwLHItMSkuam9pbigiLCIpCm09InJldHVybiBmdW5jdGlvbigiK24rIil7cmV0dXJuIHRo
+aXMuIitILmQobSkrIi4iK0guZChzKSsiKHRoaXMuIitILmQodCkrIiwgIituKyIpOyIKdD0kLnlqCmlm
+KHR5cGVvZiB0IT09Im51bWJlciIpcmV0dXJuIHQuaCgpCiQueWo9dCsxCnJldHVybiBuZXcgRnVuY3Rp
+b24obSt0KyJ9IikoKX0sCktxOmZ1bmN0aW9uKGEsYixjLGQsZSxmLGcpe3JldHVybiBILmlBKGEsYixj
+LGQsISFlLCEhZixnKX0sClRuOmZ1bmN0aW9uKGEsYil7cmV0dXJuIEguY0Uodi50eXBlVW5pdmVyc2Us
+SC5xKGEuYSksYil9LApQVzpmdW5jdGlvbihhLGIpe3JldHVybiBILmNFKHYudHlwZVVuaXZlcnNlLEgu
+cShhLmMpLGIpfSwKRFY6ZnVuY3Rpb24oYSl7cmV0dXJuIGEuYX0sCnlTOmZ1bmN0aW9uKGEpe3JldHVy
+biBhLmN9LApFMjpmdW5jdGlvbihhKXt2YXIgdCxzLHIscT1uZXcgSC5qeSgic2VsZiIsInRhcmdldCIs
+InJlY2VpdmVyIiwibmFtZSIpLHA9Si5FcChPYmplY3QuZ2V0T3duUHJvcGVydHlOYW1lcyhxKSkKZm9y
+KHQ9cC5sZW5ndGgscz0wO3M8dDsrK3Mpe3I9cFtzXQppZihxW3JdPT09YSlyZXR1cm4gcn19LApvVDpm
+dW5jdGlvbihhKXtpZihhPT1udWxsKUguZk8oImJvb2xlYW4gZXhwcmVzc2lvbiBtdXN0IG5vdCBiZSBu
+dWxsIikKcmV0dXJuIGF9LApmTzpmdW5jdGlvbihhKXt0aHJvdyBILmIobmV3IEgua1koYSkpfSwKYWc6
+ZnVuY3Rpb24oYSl7dGhyb3cgSC5iKG5ldyBQLnQ3KGEpKX0sCkVmOmZ1bmN0aW9uKGEpe3JldHVybiBu
+ZXcgSC5FcShhKX0sCllnOmZ1bmN0aW9uKGEpe3JldHVybiB2LmdldElzb2xhdGVUYWcoYSl9LApWTTpm
+dW5jdGlvbihhLGIpe2Fbdi5hcnJheVJ0aV09YgpyZXR1cm4gYX0sCm9YOmZ1bmN0aW9uKGEpe2lmKGE9
+PW51bGwpcmV0dXJuIG51bGwKcmV0dXJuIGEuJHRpfSwKSU06ZnVuY3Rpb24oYSxiLGMpe3JldHVybiBI
+Llk5KGFbIiRhIitILmQoYyldLEgub1goYikpfSwKWTk6ZnVuY3Rpb24oYSxiKXtpZihhPT1udWxsKXJl
+dHVybiBiCmE9YS5hcHBseShudWxsLGIpCmlmKGE9PW51bGwpcmV0dXJuIG51bGwKaWYoQXJyYXkuaXNB
+cnJheShhKSlyZXR1cm4gYQppZih0eXBlb2YgYT09ImZ1bmN0aW9uIilyZXR1cm4gYS5hcHBseShudWxs
+LGIpCnJldHVybiBifSwKSUc6ZnVuY3Rpb24oYSxiLGMpe3JldHVybiBhLmFwcGx5KGIsSC5ZOShKLmlh
+KGIpWyIkYSIrSC5kKGMpXSxILm9YKGIpKSl9LAppdzpmdW5jdGlvbihhLGIsYyl7T2JqZWN0LmRlZmlu
+ZVByb3BlcnR5KGEsYix7dmFsdWU6YyxlbnVtZXJhYmxlOmZhbHNlLHdyaXRhYmxlOnRydWUsY29uZmln
+dXJhYmxlOnRydWV9KX0sCkc6ZnVuY3Rpb24oYSl7dmFyIHQscyxyLHEscD1ILmMoJC55LiQxKGEpKSxv
+PSQualtwXQppZihvIT1udWxsKXtPYmplY3QuZGVmaW5lUHJvcGVydHkoYSx2LmRpc3BhdGNoUHJvcGVy
+dHlOYW1lLHt2YWx1ZTpvLGVudW1lcmFibGU6ZmFsc2Usd3JpdGFibGU6dHJ1ZSxjb25maWd1cmFibGU6
+dHJ1ZX0pCnJldHVybiBvLml9dD0kLnZbcF0KaWYodCE9bnVsbClyZXR1cm4gdApzPXYuaW50ZXJjZXB0
+b3JzQnlUYWdbcF0KaWYocz09bnVsbCl7cD1ILmMoJC51LiQyKGEscCkpCmlmKHAhPW51bGwpe289JC5q
+W3BdCmlmKG8hPW51bGwpe09iamVjdC5kZWZpbmVQcm9wZXJ0eShhLHYuZGlzcGF0Y2hQcm9wZXJ0eU5h
+bWUse3ZhbHVlOm8sZW51bWVyYWJsZTpmYWxzZSx3cml0YWJsZTp0cnVlLGNvbmZpZ3VyYWJsZTp0cnVl
+fSkKcmV0dXJuIG8uaX10PSQudltwXQppZih0IT1udWxsKXJldHVybiB0CnM9di5pbnRlcmNlcHRvcnNC
+eVRhZ1twXX19aWYocz09bnVsbClyZXR1cm4gbnVsbAp0PXMucHJvdG90eXBlCnI9cFswXQppZihyPT09
+IiEiKXtvPUgubCh0KQokLmpbcF09bwpPYmplY3QuZGVmaW5lUHJvcGVydHkoYSx2LmRpc3BhdGNoUHJv
+cGVydHlOYW1lLHt2YWx1ZTpvLGVudW1lcmFibGU6ZmFsc2Usd3JpdGFibGU6dHJ1ZSxjb25maWd1cmFi
+bGU6dHJ1ZX0pCnJldHVybiBvLml9aWYocj09PSJ+Iil7JC52W3BdPXQKcmV0dXJuIHR9aWYocj09PSIt
+Iil7cT1ILmwodCkKT2JqZWN0LmRlZmluZVByb3BlcnR5KE9iamVjdC5nZXRQcm90b3R5cGVPZihhKSx2
+LmRpc3BhdGNoUHJvcGVydHlOYW1lLHt2YWx1ZTpxLGVudW1lcmFibGU6ZmFsc2Usd3JpdGFibGU6dHJ1
+ZSxjb25maWd1cmFibGU6dHJ1ZX0pCnJldHVybiBxLml9aWYocj09PSIrIilyZXR1cm4gSC5MYyhhLHQp
+CmlmKHI9PT0iKiIpdGhyb3cgSC5iKFAubihwKSkKaWYodi5sZWFmVGFnc1twXT09PXRydWUpe3E9SC5s
+KHQpCk9iamVjdC5kZWZpbmVQcm9wZXJ0eShPYmplY3QuZ2V0UHJvdG90eXBlT2YoYSksdi5kaXNwYXRj
+aFByb3BlcnR5TmFtZSx7dmFsdWU6cSxlbnVtZXJhYmxlOmZhbHNlLHdyaXRhYmxlOnRydWUsY29uZmln
+dXJhYmxlOnRydWV9KQpyZXR1cm4gcS5pfWVsc2UgcmV0dXJuIEguTGMoYSx0KX0sCkxjOmZ1bmN0aW9u
+KGEsYil7dmFyIHQ9T2JqZWN0LmdldFByb3RvdHlwZU9mKGEpCk9iamVjdC5kZWZpbmVQcm9wZXJ0eSh0
+LHYuZGlzcGF0Y2hQcm9wZXJ0eU5hbWUse3ZhbHVlOkouUXUoYix0LG51bGwsbnVsbCksZW51bWVyYWJs
+ZTpmYWxzZSx3cml0YWJsZTp0cnVlLGNvbmZpZ3VyYWJsZTp0cnVlfSkKcmV0dXJuIGJ9LApsOmZ1bmN0
+aW9uKGEpe3JldHVybiBKLlF1KGEsITEsbnVsbCwhIWEuJGlYail9LApWRjpmdW5jdGlvbihhLGIsYyl7
+dmFyIHQ9Yi5wcm90b3R5cGUKaWYodi5sZWFmVGFnc1thXT09PXRydWUpcmV0dXJuIEgubCh0KQplbHNl
+IHJldHVybiBKLlF1KHQsYyxudWxsLG51bGwpfSwKTTpmdW5jdGlvbigpe2lmKCEwPT09JC5LKXJldHVy
+bgokLks9ITAKSC5EKCl9LApEOmZ1bmN0aW9uKCl7dmFyIHQscyxyLHEscCxvLG4sbQokLmo9T2JqZWN0
+LmNyZWF0ZShudWxsKQokLnY9T2JqZWN0LmNyZWF0ZShudWxsKQpILmEoKQp0PXYuaW50ZXJjZXB0b3Jz
+QnlUYWcKcz1PYmplY3QuZ2V0T3duUHJvcGVydHlOYW1lcyh0KQppZih0eXBlb2Ygd2luZG93IT0idW5k
+ZWZpbmVkIil7d2luZG93CnI9ZnVuY3Rpb24oKXt9CmZvcihxPTA7cTxzLmxlbmd0aDsrK3Epe3A9c1tx
+XQpvPSQueDcuJDEocCkKaWYobyE9bnVsbCl7bj1ILlZGKHAsdFtwXSxvKQppZihuIT1udWxsKXtPYmpl
+Y3QuZGVmaW5lUHJvcGVydHkobyx2LmRpc3BhdGNoUHJvcGVydHlOYW1lLHt2YWx1ZTpuLGVudW1lcmFi
+bGU6ZmFsc2Usd3JpdGFibGU6dHJ1ZSxjb25maWd1cmFibGU6dHJ1ZX0pCnIucHJvdG90eXBlPW99fX19
+Zm9yKHE9MDtxPHMubGVuZ3RoOysrcSl7cD1zW3FdCmlmKC9eW0EtWmEtel9dLy50ZXN0KHApKXttPXRb
+cF0KdFsiISIrcF09bQp0WyJ+IitwXT1tCnRbIi0iK3BdPW0KdFsiKyIrcF09bQp0WyIqIitwXT1tfX19
+LAphOmZ1bmN0aW9uKCl7dmFyIHQscyxyLHEscCxvLG49Qy5PNCgpCm49SC5GKEMuWXEsSC5GKEMuS1Us
+SC5GKEMuZlEsSC5GKEMuZlEsSC5GKEMuaTcsSC5GKEMueGksSC5GKEMuZGsoQy53YiksbikpKSkpKSkK
+aWYodHlwZW9mIGRhcnROYXRpdmVEaXNwYXRjaEhvb2tzVHJhbnNmb3JtZXIhPSJ1bmRlZmluZWQiKXt0
+PWRhcnROYXRpdmVEaXNwYXRjaEhvb2tzVHJhbnNmb3JtZXIKaWYodHlwZW9mIHQ9PSJmdW5jdGlvbiIp
+dD1bdF0KaWYodC5jb25zdHJ1Y3Rvcj09QXJyYXkpZm9yKHM9MDtzPHQubGVuZ3RoOysrcyl7cj10W3Nd
+CmlmKHR5cGVvZiByPT0iZnVuY3Rpb24iKW49cihuKXx8bn19cT1uLmdldFRhZwpwPW4uZ2V0VW5rbm93
+blRhZwpvPW4ucHJvdG90eXBlRm9yVGFnCiQueT1uZXcgSC5yKHEpCiQudT1uZXcgSC5kQyhwKQokLng3
+PW5ldyBILndOKG8pfSwKRjpmdW5jdGlvbihhLGIpe3JldHVybiBhKGIpfHxifSwKdjQ6ZnVuY3Rpb24o
+YSxiLGMsZCxlLGYpe3ZhciB0PWI/Im0iOiIiLHM9Yz8iIjoiaSIscj1kPyJ1IjoiIixxPWU/InMiOiIi
+LHA9Zj8iZyI6IiIsbz1mdW5jdGlvbihnLGgpe3RyeXtyZXR1cm4gbmV3IFJlZ0V4cChnLGgpfWNhdGNo
+KG4pe3JldHVybiBufX0oYSx0K3MrcitxK3ApCmlmKG8gaW5zdGFuY2VvZiBSZWdFeHApcmV0dXJuIG8K
+dGhyb3cgSC5iKFAucnIoIklsbGVnYWwgUmVnRXhwIHBhdHRlcm4gKCIrU3RyaW5nKG8pKyIpIixhLG51
+bGwpKX0sCm0yOmZ1bmN0aW9uKGEsYixjKXt2YXIgdAppZih0eXBlb2YgYj09InN0cmluZyIpcmV0dXJu
+IGEuaW5kZXhPZihiLGMpPj0wCmVsc2UgaWYoYiBpbnN0YW5jZW9mIEguVlIpe3Q9Qy54Qi5HKGEsYykK
+cmV0dXJuIGIuYi50ZXN0KHQpfWVsc2V7dD1KLkZMKGIsQy54Qi5HKGEsYykpCnJldHVybiF0LmdsMCh0
+KX19LApBNDpmdW5jdGlvbihhKXtpZihhLmluZGV4T2YoIiQiLDApPj0wKXJldHVybiBhLnJlcGxhY2Uo
+L1wkL2csIiQkJCQiKQpyZXR1cm4gYX0sCmVBOmZ1bmN0aW9uKGEpe2lmKC9bW1xde30oKSorPy5cXF4k
+fF0vLnRlc3QoYSkpcmV0dXJuIGEucmVwbGFjZSgvW1tcXXt9KCkqKz8uXFxeJHxdL2csIlxcJCYiKQpy
+ZXR1cm4gYX0sCnlzOmZ1bmN0aW9uKGEsYixjKXt2YXIgdD1ILm5NKGEsYixjKQpyZXR1cm4gdH0sCm5N
+OmZ1bmN0aW9uKGEsYixjKXt2YXIgdCxzLHIscQppZihiPT09IiIpe2lmKGE9PT0iIilyZXR1cm4gYwp0
+PWEubGVuZ3RoCmZvcihzPWMscj0wO3I8dDsrK3Ipcz1zK2Fbcl0rYwpyZXR1cm4gcy5jaGFyQ29kZUF0
+KDApPT0wP3M6c31xPWEuaW5kZXhPZihiLDApCmlmKHE8MClyZXR1cm4gYQppZihhLmxlbmd0aDw1MDB8
+fGMuaW5kZXhPZigiJCIsMCk+PTApcmV0dXJuIGEuc3BsaXQoYikuam9pbihjKQpyZXR1cm4gYS5yZXBs
+YWNlKG5ldyBSZWdFeHAoSC5lQShiKSwnZycpLEguQTQoYykpfSwKUEQ6ZnVuY3Rpb24gUEQoYSxiKXt0
+aGlzLmE9YQp0aGlzLiR0aT1ifSwKV1U6ZnVuY3Rpb24gV1UoKXt9LApMUDpmdW5jdGlvbiBMUChhLGIs
+YyxkKXt2YXIgXz10aGlzCl8uYT1hCl8uYj1iCl8uYz1jCl8uJHRpPWR9LApYUjpmdW5jdGlvbiBYUihh
+LGIpe3RoaXMuYT1hCnRoaXMuJHRpPWJ9LApMSTpmdW5jdGlvbiBMSShhLGIsYyxkLGUpe3ZhciBfPXRo
+aXMKXy5hPWEKXy5jPWIKXy5kPWMKXy5lPWQKXy5mPWV9LApDajpmdW5jdGlvbiBDaihhLGIsYyl7dGhp
+cy5hPWEKdGhpcy5iPWIKdGhpcy5jPWN9LApmOTpmdW5jdGlvbiBmOShhLGIsYyxkLGUsZil7dmFyIF89
+dGhpcwpfLmE9YQpfLmI9YgpfLmM9YwpfLmQ9ZApfLmU9ZQpfLmY9Zn0sClcwOmZ1bmN0aW9uIFcwKGEs
+Yil7dGhpcy5hPWEKdGhpcy5iPWJ9LAphejpmdW5jdGlvbiBheihhLGIsYyl7dGhpcy5hPWEKdGhpcy5i
+PWIKdGhpcy5jPWN9LAp2VjpmdW5jdGlvbiB2VihhKXt0aGlzLmE9YX0sCmJxOmZ1bmN0aW9uIGJxKGEs
+Yil7dGhpcy5hPWEKdGhpcy5iPWJ9LApBbTpmdW5jdGlvbiBBbShhKXt0aGlzLmE9YX0sClhPOmZ1bmN0
+aW9uIFhPKGEpe3RoaXMuYT1hCnRoaXMuYj1udWxsfSwKVHA6ZnVuY3Rpb24gVHAoKXt9LApsYzpmdW5j
+dGlvbiBsYygpe30sCnp4OmZ1bmN0aW9uIHp4KCl7fSwKank6ZnVuY3Rpb24gankoYSxiLGMsZCl7dmFy
+IF89dGhpcwpfLmE9YQpfLmI9YgpfLmM9YwpfLmQ9ZH0sCkVxOmZ1bmN0aW9uIEVxKGEpe3RoaXMuYT1h
+fSwKa1k6ZnVuY3Rpb24ga1koYSl7dGhpcy5hPWF9LApONTpmdW5jdGlvbiBONShhKXt2YXIgXz10aGlz
+Cl8uYT0wCl8uZj1fLmU9Xy5kPV8uYz1fLmI9bnVsbApfLnI9MApfLiR0aT1hfSwKZGI6ZnVuY3Rpb24g
+ZGIoYSxiKXt2YXIgXz10aGlzCl8uYT1hCl8uYj1iCl8uZD1fLmM9bnVsbH0sCmk1OmZ1bmN0aW9uIGk1
+KGEsYil7dGhpcy5hPWEKdGhpcy4kdGk9Yn0sCk42OmZ1bmN0aW9uIE42KGEsYixjKXt2YXIgXz10aGlz
+Cl8uYT1hCl8uYj1iCl8uZD1fLmM9bnVsbApfLiR0aT1jfSwKcjpmdW5jdGlvbiByKGEpe3RoaXMuYT1h
+fSwKZEM6ZnVuY3Rpb24gZEMoYSl7dGhpcy5hPWF9LAp3TjpmdW5jdGlvbiB3TihhKXt0aGlzLmE9YX0s
+ClZSOmZ1bmN0aW9uIFZSKGEsYil7dmFyIF89dGhpcwpfLmE9YQpfLmI9YgpfLmQ9Xy5jPW51bGx9LApF
+SzpmdW5jdGlvbiBFSyhhKXt0aGlzLmI9YX0sCktXOmZ1bmN0aW9uIEtXKGEsYixjKXt0aGlzLmE9YQp0
+aGlzLmI9Ygp0aGlzLmM9Y30sClBiOmZ1bmN0aW9uIFBiKGEsYixjKXt2YXIgXz10aGlzCl8uYT1hCl8u
+Yj1iCl8uYz1jCl8uZD1udWxsfSwKdFE6ZnVuY3Rpb24gdFEoYSxiKXt0aGlzLmE9YQp0aGlzLmM9Yn0s
+Ck5GOmZ1bmN0aW9uIE5GKGEsYixjKXt0aGlzLmE9YQp0aGlzLmI9Ygp0aGlzLmM9Y30sClNkOmZ1bmN0
+aW9uIFNkKGEsYixjKXt2YXIgXz10aGlzCl8uYT1hCl8uYj1iCl8uYz1jCl8uZD1udWxsfSwKWEY6ZnVu
+Y3Rpb24oYSl7cmV0dXJuIGF9LApEUTpmdW5jdGlvbihhKXtyZXR1cm4gbmV3IEludDhBcnJheShhKX0s
+Cm9kOmZ1bmN0aW9uKGEsYixjKXtpZihhPj4+MCE9PWF8fGE+PWMpdGhyb3cgSC5iKEguSFkoYixhKSl9
+LApyTTpmdW5jdGlvbihhLGIsYyl7dmFyIHQKaWYoIShhPj4+MCE9PWEpKXQ9Yj4+PjAhPT1ifHxhPmJ8
+fGI+YwplbHNlIHQ9ITAKaWYodCl0aHJvdyBILmIoSC5hdShhLGIsYykpCnJldHVybiBifSwKcEY6ZnVu
+Y3Rpb24gcEYoKXt9LApiMDpmdW5jdGlvbiBiMCgpe30sCkRnOmZ1bmN0aW9uIERnKCl7fSwKUGc6ZnVu
+Y3Rpb24gUGcoKXt9LAp4ajpmdW5jdGlvbiB4aigpe30sCmRFOmZ1bmN0aW9uIGRFKCl7fSwKWkE6ZnVu
+Y3Rpb24gWkEoKXt9LAp3ZjpmdW5jdGlvbiB3Zigpe30sClBxOmZ1bmN0aW9uIFBxKCl7fSwKZUU6ZnVu
+Y3Rpb24gZUUoKXt9LApWNjpmdW5jdGlvbiBWNigpe30sClJHOmZ1bmN0aW9uIFJHKCl7fSwKVlA6ZnVu
+Y3Rpb24gVlAoKXt9LApXQjpmdW5jdGlvbiBXQigpe30sClpHOmZ1bmN0aW9uIFpHKCl7fSwKY3o6ZnVu
+Y3Rpb24oYSxiKXt2YXIgdD1iLmMKcmV0dXJuIHQ9PW51bGw/Yi5jPUguQmMoYSxiLnosITApOnR9LAp4
+WjpmdW5jdGlvbihhLGIpe3ZhciB0PWIuYwpyZXR1cm4gdD09bnVsbD9iLmM9SC5RMihhLCJiOCIsW2Iu
+el0pOnR9LApRMTpmdW5jdGlvbihhKXt2YXIgdD1hLnkKaWYodD09PTZ8fHQ9PT03fHx0PT09OClyZXR1
+cm4gSC5RMShhLnopCnJldHVybiB0PT09MTF8fHQ9PT0xMn0sCm1EOmZ1bmN0aW9uKGEpe3JldHVybiBh
+LmN5fSwKTjA6ZnVuY3Rpb24oYSl7cmV0dXJuIEguRSh2LnR5cGVVbml2ZXJzZSxhLCExKX0sClBMOmZ1
+bmN0aW9uKGEsYixjLGEwKXt2YXIgdCxzLHIscSxwLG8sbixtLGwsayxqLGksaCxnLGYsZSxkPWIueQpz
+d2l0Y2goZCl7Y2FzZSA1OmNhc2UgMTpjYXNlIDI6Y2FzZSAzOmNhc2UgNDpyZXR1cm4gYgpjYXNlIDY6
+dD1iLnoKcz1ILlBMKGEsdCxjLGEwKQppZihzPT09dClyZXR1cm4gYgpyZXR1cm4gSC5TTyhhLHMsITAp
+CmNhc2UgNzp0PWIuegpzPUguUEwoYSx0LGMsYTApCmlmKHM9PT10KXJldHVybiBiCnJldHVybiBILkJj
+KGEscywhMCkKY2FzZSA4OnQ9Yi56CnM9SC5QTChhLHQsYyxhMCkKaWYocz09PXQpcmV0dXJuIGIKcmV0
+dXJuIEguTE4oYSxzLCEwKQpjYXNlIDk6cj1iLlEKcT1ILmJaKGEscixjLGEwKQppZihxPT09cilyZXR1
+cm4gYgpyZXR1cm4gSC5RMihhLGIueixxKQpjYXNlIDEwOnA9Yi56Cm89SC5QTChhLHAsYyxhMCkKbj1i
+LlEKbT1ILmJaKGEsbixjLGEwKQppZihvPT09cCYmbT09PW4pcmV0dXJuIGIKcmV0dXJuIEguYXAoYSxv
+LG0pCmNhc2UgMTE6bD1iLnoKaz1ILlBMKGEsbCxjLGEwKQpqPWIuUQppPUgucVQoYSxqLGMsYTApCmlm
+KGs9PT1sJiZpPT09ailyZXR1cm4gYgpyZXR1cm4gSC5OZihhLGssaSkKY2FzZSAxMjpoPWIuUQphMCs9
+aC5sZW5ndGgKZz1ILmJaKGEsaCxjLGEwKQpwPWIuegpvPUguUEwoYSxwLGMsYTApCmlmKGc9PT1oJiZv
+PT09cClyZXR1cm4gYgpyZXR1cm4gSC5EUyhhLG8sZywhMCkKY2FzZSAxMzpmPWIuegppZihmPGEwKXJl
+dHVybiBiCmU9Y1tmLWEwXQppZihlPT1udWxsKXJldHVybiBiCnJldHVybiBlCmRlZmF1bHQ6dGhyb3cg
+SC5iKFAuaFYoIkF0dGVtcHRlZCB0byBzdWJzdGl0dXRlIHVuZXhwZWN0ZWQgUlRJIGtpbmQgIitkKSl9
+fSwKYlo6ZnVuY3Rpb24oYSxiLGMsZCl7dmFyIHQscyxyLHEscD1iLmxlbmd0aCxvPVtdCmZvcih0PSEx
+LHM9MDtzPHA7KytzKXtyPWJbc10KcT1ILlBMKGEscixjLGQpCmlmKHEhPT1yKXQ9ITAKby5wdXNoKHEp
+fXJldHVybiB0P286Yn0sCnZPOmZ1bmN0aW9uKGEsYixjLGQpe3ZhciB0LHMscixxLHAsbz1iLmxlbmd0
+aCxuPVtdCmZvcih0PSExLHM9MDtzPG87cys9Mil7cj1iW3NdCnE9YltzKzFdCnA9SC5QTChhLHEsYyxk
+KQppZihwIT09cSl0PSEwCm4ucHVzaChyKQpuLnB1c2gocCl9cmV0dXJuIHQ/bjpifSwKcVQ6ZnVuY3Rp
+b24oYSxiLGMsZCl7dmFyIHQscz1iLmEscj1ILmJaKGEscyxjLGQpLHE9Yi5iLHA9SC5iWihhLHEsYyxk
+KSxvPWIuYyxuPUgudk8oYSxvLGMsZCkKaWYocj09PXMmJnA9PT1xJiZuPT09bylyZXR1cm4gYgp0PW5l
+dyBILkVUKCkKdC5hPXIKdC5iPXAKdC5jPW4KcmV0dXJuIHR9LApKUzpmdW5jdGlvbihhKXt2YXIgdD1h
+LiRTCmlmKHQhPW51bGwpe2lmKHR5cGVvZiB0PT0ibnVtYmVyIilyZXR1cm4gSC5CcCh0KQpyZXR1cm4g
+YS4kUygpfXJldHVybiBudWxsfSwKVWU6ZnVuY3Rpb24oYSxiKXt2YXIgdAppZihILlExKGIpKWlmKGEg
+aW5zdGFuY2VvZiBILlRwKXt0PUguSlMoYSkKaWYodCE9bnVsbClyZXR1cm4gdH1yZXR1cm4gSC5xKGEp
+fSwKcTpmdW5jdGlvbihhKXt2YXIgdAppZihhIGluc3RhbmNlb2YgUC5NaCl7dD1hLiR0aQpyZXR1cm4g
+dCE9bnVsbD90OkguVlUoYSl9aWYoQXJyYXkuaXNBcnJheShhKSlyZXR1cm4gSC50NihhKQpyZXR1cm4g
+SC5WVShKLmlhKGEpKX0sCnQ2OmZ1bmN0aW9uKGEpe3ZhciB0PWFbdi5hcnJheVJ0aV0scz11Lm0KaWYo
+dD09bnVsbClyZXR1cm4gcwppZih0LmNvbnN0cnVjdG9yIT09cy5jb25zdHJ1Y3RvcilyZXR1cm4gcwpy
+ZXR1cm4gdH0sCkxoOmZ1bmN0aW9uKGEpe3ZhciB0PWEuJHRpCnJldHVybiB0IT1udWxsP3Q6SC5WVShh
+KX0sClZVOmZ1bmN0aW9uKGEpe3ZhciB0PWEuY29uc3RydWN0b3Iscz10LiRjY2FjaGUKaWYocyE9bnVs
+bClyZXR1cm4gcwpyZXR1cm4gSC5yOShhLHQpfSwKcjk6ZnVuY3Rpb24oYSxiKXt2YXIgdD1hIGluc3Rh
+bmNlb2YgSC5UcD9hLl9fcHJvdG9fXy5fX3Byb3RvX18uY29uc3RydWN0b3I6YixzPUguYWkodi50eXBl
+VW5pdmVyc2UsdC5uYW1lKQpiLiRjY2FjaGU9cwpyZXR1cm4gc30sCkJwOmZ1bmN0aW9uKGEpe3ZhciB0
+LHM9YSxyPXYudHlwZXMscT1yW3NdCmlmKHR5cGVvZiBxPT0ic3RyaW5nIil7dD1ILkUodi50eXBlVW5p
+dmVyc2UscSwhMSkKcltzXT10CnJldHVybiB0fXJldHVybiBxfSwKSko6ZnVuY3Rpb24oYSl7dmFyIHQ9
+dGhpcyxzPUguWU8scj11LksKaWYodD09PXIpe3M9SC5rZQp0LmE9SC5UaX1lbHNlIGlmKEguQTgodCl8
+fHQ9PT1yKXtzPUguSXcKdC5hPUguaG59ZWxzZSBpZih0PT09dS5TKXM9SC5vawplbHNlIGlmKHQ9PT11
+LmdSKXM9SC5LSAplbHNlIGlmKHQ9PT11LmRpKXM9SC5LSAplbHNlIGlmKHQ9PT11Lk4pcz1ILk1NCmVs
+c2UgaWYodD09PXUueSlzPUguclEKZWxzZSBpZih0Lnk9PT05KXtyPXQuegppZih0LlEuZXZlcnkoSC5j
+Yykpe3Qucj0iJGkiK3IKcz1ILnQ0fX10LmI9cwpyZXR1cm4gdC5iKGEpfSwKWU86ZnVuY3Rpb24oYSl7
+dmFyIHQ9dGhpcwpyZXR1cm4gSC5XZSh2LnR5cGVVbml2ZXJzZSxILlVlKGEsdCksbnVsbCx0LG51bGwp
+fSwKdDQ6ZnVuY3Rpb24oYSl7dmFyIHQ9dGhpcyxzPXQucgppZihhIGluc3RhbmNlb2YgUC5NaClyZXR1
+cm4hIWFbc10KcmV0dXJuISFKLmlhKGEpW3NdfSwKT3o6ZnVuY3Rpb24oYSl7dmFyIHQ9dGhpcwppZihh
+PT1udWxsKXJldHVybiBhCmVsc2UgaWYodC5iKGEpKXJldHVybiBhCnRocm93IEguYihILlpjKEgucChh
+LEguVWUoYSx0KSxILkoodCxudWxsKSkpKX0sCkRoOmZ1bmN0aW9uKGEsYixjLGQpe3ZhciB0PW51bGwK
+aWYoSC5XZSh2LnR5cGVVbml2ZXJzZSxhLHQsYix0KSlyZXR1cm4gYQp0aHJvdyBILmIoSC5aYygiVGhl
+IHR5cGUgYXJndW1lbnQgJyIrSC5kKEguSihhLHQpKSsiJyBpcyBub3QgYSBzdWJ0eXBlIG9mIHRoZSB0
+eXBlIHZhcmlhYmxlIGJvdW5kICciK0guZChILkooYix0KSkrIicgb2YgdHlwZSB2YXJpYWJsZSAnIitj
+KyInIGluICciK0guZChkKSsiJy4iKSl9LApwOmZ1bmN0aW9uKGEsYixjKXt2YXIgdD1QLmgoYSkscz1I
+LkooYj09bnVsbD9ILnEoYSk6YixudWxsKQpyZXR1cm4gdCsiOiB0eXBlICciK0guZChzKSsiJyBpcyBu
+b3QgYSBzdWJ0eXBlIG9mIHR5cGUgJyIrSC5kKGMpKyInIn0sClpjOmZ1bmN0aW9uKGEpe3JldHVybiBu
+ZXcgSC54KCJUeXBlRXJyb3I6ICIrYSl9LApCOmZ1bmN0aW9uKGEsYil7cmV0dXJuIG5ldyBILngoIlR5
+cGVFcnJvcjogIitILnAoYSxudWxsLGIpKX0sCmtlOmZ1bmN0aW9uKGEpe3JldHVybiEwfSwKVGk6ZnVu
+Y3Rpb24oYSl7cmV0dXJuIGF9LApJdzpmdW5jdGlvbihhKXtyZXR1cm4hMH0sCmhuOmZ1bmN0aW9uKGEp
+e3JldHVybiBhfSwKclE6ZnVuY3Rpb24oYSl7cmV0dXJuITA9PT1hfHwhMT09PWF9LApFOTpmdW5jdGlv
+bihhKXtpZighMD09PWF8fCExPT09YSlyZXR1cm4gYQppZihhPT1udWxsKXJldHVybiBhCnRocm93IEgu
+YihILkIoYSwiYm9vbCIpKX0sCmRqOmZ1bmN0aW9uKGEpe2lmKHR5cGVvZiBhPT0ibnVtYmVyIilyZXR1
+cm4gYQppZihhPT1udWxsKXJldHVybiBhCnRocm93IEguYihILkIoYSwiZG91YmxlIikpfSwKb2s6ZnVu
+Y3Rpb24oYSl7cmV0dXJuIHR5cGVvZiBhPT0ibnVtYmVyIiYmTWF0aC5mbG9vcihhKT09PWF9LApXWTpm
+dW5jdGlvbihhKXtpZih0eXBlb2YgYT09Im51bWJlciImJk1hdGguZmxvb3IoYSk9PT1hKXJldHVybiBh
+CmlmKGE9PW51bGwpcmV0dXJuIGEKdGhyb3cgSC5iKEguQihhLCJpbnQiKSl9LApLSDpmdW5jdGlvbihh
+KXtyZXR1cm4gdHlwZW9mIGE9PSJudW1iZXIifSwKdVU6ZnVuY3Rpb24oYSl7aWYodHlwZW9mIGE9PSJu
+dW1iZXIiKXJldHVybiBhCmlmKGE9PW51bGwpcmV0dXJuIGEKdGhyb3cgSC5iKEguQihhLCJudW0iKSl9
+LApNTTpmdW5jdGlvbihhKXtyZXR1cm4gdHlwZW9mIGE9PSJzdHJpbmcifSwKYzpmdW5jdGlvbihhKXtp
+Zih0eXBlb2YgYT09InN0cmluZyIpcmV0dXJuIGEKaWYoYT09bnVsbClyZXR1cm4gYQp0aHJvdyBILmIo
+SC5CKGEsIlN0cmluZyIpKX0sCnc6ZnVuY3Rpb24oYSxiKXt2YXIgdCxzLHIKZm9yKHQ9IiIscz0iIixy
+PTA7cjxhLmxlbmd0aDsrK3Iscz0iLCAiKXQrPUMueEIuaChzLEguSihhW3JdLGIpKQpyZXR1cm4gdH0s
+CmY6ZnVuY3Rpb24oYTEsYTIsYTMpe3ZhciB0LHMscixxLHAsbyxuLG0sbCxrLGosaSxoLGcsZixlLGQs
+YyxiLGEsYTA9IiwgIgppZihhMyE9bnVsbCl7dD1hMy5sZW5ndGgKaWYoYTI9PW51bGwpe2EyPUguVk0o
+W10sdS5zKQpzPW51bGx9ZWxzZSBzPWEyLmxlbmd0aApyPWEyLmxlbmd0aApmb3IocT10O3E+MDstLXEp
+Qy5ObS5pKGEyLCJUIisocitxKSkKZm9yKHA9dS5LLG89IjwiLG49IiIscT0wO3E8dDsrK3Esbj1hMCl7
+bys9bgptPWEyLmxlbmd0aApsPW0tMS1xCmlmKGw8MClyZXR1cm4gSC5rKGEyLGwpCm89Qy54Qi5oKG8s
+YTJbbF0pCms9YTNbcV0KaWYoIShILkE4KGspfHxrPT09cCkpbT0hKGs9PT1wKQplbHNlIG09ITEKaWYo
+bSlvKz1DLnhCLmgoIiBleHRlbmRzICIsSC5KKGssYTIpKX1vKz0iPiJ9ZWxzZXtvPSIiCnM9bnVsbH1w
+PWExLnoKaj1hMS5RCmk9ai5hCmg9aS5sZW5ndGgKZz1qLmIKZj1nLmxlbmd0aAplPWouYwpkPWUubGVu
+Z3RoCmM9SC5KKHAsYTIpCmZvcihiPSIiLGE9IiIscT0wO3E8aDsrK3EsYT1hMCliKz1DLnhCLmgoYSxI
+LkooaVtxXSxhMikpCmlmKGY+MCl7Yis9YSsiWyIKZm9yKGE9IiIscT0wO3E8ZjsrK3EsYT1hMCliKz1D
+LnhCLmgoYSxILkooZ1txXSxhMikpCmIrPSJdIn1pZihkPjApe2IrPWErInsiCmZvcihhPSIiLHE9MDtx
+PGQ7cSs9MixhPWEwKWIrPUMueEIuaChhLEguSihlW3ErMV0sYTIpKSsiICIrZVtxXQpiKz0ifSJ9aWYo
+cyE9bnVsbClhMi5sZW5ndGg9cwpyZXR1cm4gbysiKCIrYisiKSA9PiAiK0guZChjKX0sCko6ZnVuY3Rp
+b24oYSxiKXt2YXIgdCxzLHIscSxwLG8sbixtPWEueQppZihtPT09NSlyZXR1cm4iZXJhc2VkIgppZiht
+PT09MilyZXR1cm4iZHluYW1pYyIKaWYobT09PTMpcmV0dXJuInZvaWQiCmlmKG09PT0xKXJldHVybiJO
+ZXZlciIKaWYobT09PTQpcmV0dXJuImFueSIKaWYobT09PTYpe3Q9SC5KKGEueixiKQpyZXR1cm4gdH1p
+ZihtPT09Nyl7cz1hLnoKdD1ILkoocyxiKQpyPXMueQpyZXR1cm4gSi5tKHI9PT0xMXx8cj09PTEyP0Mu
+eEIuaCgiKCIsdCkrIikiOnQsIj8iKX1pZihtPT09OClyZXR1cm4iRnV0dXJlT3I8IitILmQoSC5KKGEu
+eixiKSkrIj4iCmlmKG09PT05KXtxPUguQyhhLnopCnA9YS5RCnJldHVybiBwLmxlbmd0aCE9PTA/cSso
+IjwiK0gudyhwLGIpKyI+Iik6cX1pZihtPT09MTEpcmV0dXJuIEguZihhLGIsbnVsbCkKaWYobT09PTEy
+KXJldHVybiBILmYoYS56LGIsYS5RKQppZihtPT09MTMpe289YS56Cm49Yi5sZW5ndGgKbz1uLTEtbwpp
+ZihvPDB8fG8+PW4pcmV0dXJuIEguayhiLG8pCnJldHVybiBiW29dfXJldHVybiI/In0sCkM6ZnVuY3Rp
+b24oYSl7dmFyIHQscz1ILkpnKGEpCmlmKHMhPW51bGwpcmV0dXJuIHMKdD0ibWluaWZpZWQ6IithCnJl
+dHVybiB0fSwKUW86ZnVuY3Rpb24oYSxiKXt2YXIgdD1hLnRSW2JdCmZvcig7dHlwZW9mIHQ9PSJzdHJp
+bmciOyl0PWEudFJbdF0KcmV0dXJuIHR9LAphaTpmdW5jdGlvbihhLGIpe3ZhciB0LHMscixxLHAsbz1h
+LmVULG49b1tiXQppZihuPT1udWxsKXJldHVybiBILkUoYSxiLCExKQplbHNlIGlmKHR5cGVvZiBuPT0i
+bnVtYmVyIil7dD1uCnM9SC5tWihhLDUsIiMiKQpyPVtdCmZvcihxPTA7cTx0OysrcSlyLnB1c2gocykK
+cD1ILlEyKGEsYixyKQpvW2JdPXAKcmV0dXJuIHB9ZWxzZSByZXR1cm4gbn0sCnhiOmZ1bmN0aW9uKGEs
Yil7cmV0dXJuIEguSXgoYS50UixiKX0sCkZGOmZ1bmN0aW9uKGEsYil7cmV0dXJuIEguSXgoYS5lVCxi
-KX0sCkU6ZnVuY3Rpb24oYSxiKXt2YXIgdCxzPWEuZUMscj1zLmdldChiKQppZihyIT1udWxsKXJldHVy
-biByCnQ9SC56KGEsbnVsbCxiKQpzLnNldChiLHQpCnJldHVybiB0fSwKY0U6ZnVuY3Rpb24oYSxiLGMp
-e3ZhciB0LHMscj1iLmN4CmlmKHI9PW51bGwpcj1iLmN4PW5ldyBNYXAoKQp0PXIuZ2V0KGMpCmlmKHQh
-PW51bGwpcmV0dXJuIHQKcz1ILnooYSxiLGMpCnIuc2V0KGMscykKcmV0dXJuIHN9LAp2NTpmdW5jdGlv
-bihhLGIsYyl7dmFyIHQscyxyLHE9Yi5jeQppZihxPT1udWxsKXE9Yi5jeT1uZXcgTWFwKCkKdD1jLmRi
-CnM9cS5nZXQodCkKaWYocyE9bnVsbClyZXR1cm4gcwpyPUguYShhLGIsYy56PT09MTA/Yy5jaDpbY10p
-CnEuc2V0KHQscikKcmV0dXJuIHJ9LAp6OmZ1bmN0aW9uKGEsYixjKXt2YXIgdD1ILmkoSC5vKGEsYixj
-KSkKcmV0dXJuIHR9LApXRzpmdW5jdGlvbihhLGIpe3ZhciB0PWIuZGIKYS5lQy5zZXQodCxiKQpiLmE9
-SC5PegpiLmI9SC5BdgpiLmM9SC5KSgpyZXR1cm4gYn0sCm06ZnVuY3Rpb24oYSxiLGMpe3ZhciB0LHM9
-YS5lQy5nZXQoYykKaWYocyE9bnVsbClyZXR1cm4gcwp0PW5ldyBILkpjKG51bGwsbnVsbCxudWxsKQp0
-Lno9Ygp0LmRiPWMKcmV0dXJuIEguV0coYSx0KX0sCnY6ZnVuY3Rpb24oYSxiLGMsZCl7dmFyIHQscz1h
-LmVDLmdldChkKQppZihzIT1udWxsKXJldHVybiBzCnQ9bmV3IEguSmMobnVsbCxudWxsLG51bGwpCnQu
-ej1iCnQuUT1jCnQuZGI9ZApyZXR1cm4gSC5XRyhhLHQpfSwKSDpmdW5jdGlvbihhLGIpe3ZhciB0LHM9
-IiIrYisiXiIscj1hLmVDLmdldChzKQppZihyIT1udWxsKXJldHVybiByCnQ9bmV3IEguSmMobnVsbCxu
-dWxsLG51bGwpCnQuej0xMwp0LlE9Ygp0LmRiPXMKcmV0dXJuIEguV0coYSx0KX0sClV4OmZ1bmN0aW9u
-KGEpe3ZhciB0LHMscixxPWEubGVuZ3RoCmZvcih0PSIiLHM9IiIscj0wO3I8cTsrK3Iscz0iLCIpdCs9
-cythW3JdLmRiCnJldHVybiB0fSwKUzQ6ZnVuY3Rpb24oYSl7dmFyIHQscyxyLHEscCxvPWEubGVuZ3Ro
-CmZvcih0PSIiLHM9IiIscj0wO3I8bztyKz0yLHM9IiwiKXtxPWFbcl0KcD1hW3IrMV0uZGIKdCs9cytx
-KyI6IitwfXJldHVybiB0fSwKSjpmdW5jdGlvbihhLGIsYyl7dmFyIHQscyxyPWIKaWYoYy5sZW5ndGgh
-PT0wKXIrPSI8IitILlV4KGMpKyI+Igp0PWEuZUMuZ2V0KHIpCmlmKHQhPW51bGwpcmV0dXJuIHQKcz1u
-ZXcgSC5KYyhudWxsLG51bGwsbnVsbCkKcy56PTkKcy5RPWIKcy5jaD1jCmlmKGMubGVuZ3RoPjApcy5k
-PWNbMF0Kcy5kYj1yCnJldHVybiBILldHKGEscyl9LAphOmZ1bmN0aW9uKGEsYixjKXt2YXIgdCxzLHIs
-cSxwCmlmKGIuej09PTEwKXt0PWIuUQpzPWIuY2guY29uY2F0KGMpfWVsc2V7cz1jCnQ9Yn1yPXQuZGIr
-IjsiKygiPCIrSC5VeChzKSsiPiIpCnE9YS5lQy5nZXQocikKaWYocSE9bnVsbClyZXR1cm4gcQpwPW5l
-dyBILkpjKG51bGwsbnVsbCxudWxsKQpwLno9MTAKcC5RPXQKcC5jaD1zCnAuZGI9cgpyZXR1cm4gSC5X
-RyhhLHApfSwKQzpmdW5jdGlvbihhLGIsYyl7dmFyIHQscyxyLHE9Yi5kYixwPWMuYSxvPXAubGVuZ3Ro
-LG49Yy5iLG09bi5sZW5ndGgsbD1jLmMsaz1sLmxlbmd0aCxqPSIoIitILlV4KHApCmlmKG0+MClqKz0o
-bz4wPyIsIjoiIikrIlsiK0guVXgobikrIl0iCmlmKGs+MClqKz0obz4wPyIsIjoiIikrInsiK0guUzQo
-bCkrIn0iCnQ9cSsoaisiKSIpCnM9YS5lQy5nZXQodCkKaWYocyE9bnVsbClyZXR1cm4gcwpyPW5ldyBI
-LkpjKG51bGwsbnVsbCxudWxsKQpyLno9MTEKci5RPWIKci5jaD1jCnIuZGI9dApyZXR1cm4gSC5XRyhh
-LHIpfSwKRDpmdW5jdGlvbihhLGIsYyl7dmFyIHQscz1iLmRiKyI8IitILlV4KGMpKyI+IixyPWEuZUMu
-Z2V0KHMpCmlmKHIhPW51bGwpcmV0dXJuIHIKdD1uZXcgSC5KYyhudWxsLG51bGwsbnVsbCkKdC56PTEy
-CnQuUT1iCnQuY2g9Ywp0LmRiPXMKcmV0dXJuIEguV0coYSx0KX0sCm86ZnVuY3Rpb24oYSxiLGMpe3Jl
-dHVybnt1OmEsZTpiLHI6YyxzOltdLHA6MH19LAppOmZ1bmN0aW9uKGEpe3ZhciB0LHMscixxLHAsbyxu
-LG0sbCxrLGosaSxoLGc9YS5yLGY9YS5zCmZvcih0PWcubGVuZ3RoLHM9MDtzPHQ7KXtyPWcuY2hhckNv
-ZGVBdChzKQppZihyPj00OCYmcjw9NTcpcz1ILkEocysxLHIsZyxmKQplbHNlIGlmKCgoKHJ8MzIpPj4+
-MCktOTcmNjU1MzUpPDI2fHxyPT09OTV8fHI9PT0zNilzPUgudChhLHMsZyxmLCExKQplbHNlIGlmKHI9
-PT00NilzPUgudChhLHMsZyxmLCEwKQplbHNleysrcwpzd2l0Y2gocil7Y2FzZSA0NDpicmVhawpjYXNl
-IDU4OmJyZWFrCmNhc2UgNTk6Zi5wdXNoKEguSyhhLnUsYS5lLGYucG9wKCkpKQpicmVhawpjYXNlIDk0
-OmYucHVzaChILkgoYS51LGYucG9wKCkpKQpicmVhawpjYXNlIDM1OmYucHVzaChILm0oYS51LDUsIiMi
-KSkKYnJlYWsKY2FzZSA2NDpmLnB1c2goSC5tKGEudSwyLCJAIikpCmJyZWFrCmNhc2UgMTI2OmYucHVz
-aChILm0oYS51LDMsIn4iKSkKYnJlYWsKY2FzZSA2MDpmLnB1c2goYS5wKQphLnA9Zi5sZW5ndGgKYnJl
-YWsKY2FzZSA2MjpxPWEudQpwPWYuc3BsaWNlKGEucCkKSC5yKGEudSxhLmUscCkKYS5wPWYucG9wKCkK
-bz1mLnBvcCgpCmlmKHR5cGVvZiBvPT0ic3RyaW5nIilmLnB1c2goSC5KKHEsbyxwKSkKZWxzZXtuPUgu
-SyhxLGEuZSxvKQpzd2l0Y2gobi56KXtjYXNlIDExOmYucHVzaChILkQocSxuLHApKQpicmVhawpkZWZh
-dWx0OmYucHVzaChILmEocSxuLHApKQpicmVha319YnJlYWsKY2FzZSAzODpILkkoYSxmKQpicmVhawpj
-YXNlIDQyOm09YS51Cmw9SC5LKG0sYS5lLGYucG9wKCkpCmYucHVzaChILnYobSw2LGwsbC5kYisiKiIp
-KQpicmVhawpjYXNlIDYzOm09YS51Cmw9SC5LKG0sYS5lLGYucG9wKCkpCmYucHVzaChILnYobSw3LGws
-bC5kYisiPyIpKQpicmVhawpjYXNlIDQ3Om09YS51Cmw9SC5LKG0sYS5lLGYucG9wKCkpCmYucHVzaChI
-LnYobSw4LGwsbC5kYisiLyIpKQpicmVhawpjYXNlIDQwOmYucHVzaChhLnApCmEucD1mLmxlbmd0aApi
-cmVhawpjYXNlIDQxOnE9YS51Cms9bmV3IEguRygpCmo9cS5zRUEKaT1xLnNFQQpvPWYucG9wKCkKaWYo
-dHlwZW9mIG89PSJudW1iZXIiKXN3aXRjaChvKXtjYXNlLTE6aj1mLnBvcCgpCmJyZWFrCmNhc2UtMjpp
-PWYucG9wKCkKYnJlYWsKZGVmYXVsdDpmLnB1c2gobykKYnJlYWt9ZWxzZSBmLnB1c2gobykKcD1mLnNw
-bGljZShhLnApCkgucihhLnUsYS5lLHApCmEucD1mLnBvcCgpCmsuYT1wCmsuYj1qCmsuYz1pCmYucHVz
-aChILkMocSxILksocSxhLmUsZi5wb3AoKSksaykpCmJyZWFrCmNhc2UgOTE6Zi5wdXNoKGEucCkKYS5w
-PWYubGVuZ3RoCmJyZWFrCmNhc2UgOTM6cD1mLnNwbGljZShhLnApCkgucihhLnUsYS5lLHApCmEucD1m
-LnBvcCgpCmYucHVzaChwKQpmLnB1c2goLTEpCmJyZWFrCmNhc2UgMTIzOmYucHVzaChhLnApCmEucD1m
-Lmxlbmd0aApicmVhawpjYXNlIDEyNTpwPWYuc3BsaWNlKGEucCkKSC5CKGEudSxhLmUscCkKYS5wPWYu
-cG9wKCkKZi5wdXNoKHApCmYucHVzaCgtMikKYnJlYWsKZGVmYXVsdDp0aHJvdyJCYWQgY2hhcmFjdGVy
-ICIrcn19fWg9Zi5wb3AoKQpyZXR1cm4gSC5LKGEudSxhLmUsaCl9LApBOmZ1bmN0aW9uKGEsYixjLGQp
-e3ZhciB0LHMscj1iLTQ4CmZvcih0PWMubGVuZ3RoO2E8dDsrK2Epe3M9Yy5jaGFyQ29kZUF0KGEpCmlm
-KCEocz49NDgmJnM8PTU3KSlicmVhawpyPXIqMTArKHMtNDgpfWQucHVzaChyKQpyZXR1cm4gYX0sCnQ6
-ZnVuY3Rpb24oYSxiLGMsZCxlKXt2YXIgdCxzLHIscSxwLG8sbj1iKzEKZm9yKHQ9Yy5sZW5ndGg7bjx0
-Oysrbil7cz1jLmNoYXJDb2RlQXQobikKaWYocz09PTQ2KXtpZihlKWJyZWFrCmU9ITB9ZWxzZXtpZigh
-KCgoKHN8MzIpPj4+MCktOTcmNjU1MzUpPDI2fHxzPT09OTV8fHM9PT0zNikpcj1zPj00OCYmczw9NTcK
-ZWxzZSByPSEwCmlmKCFyKWJyZWFrfX1xPWMuc3Vic3RyaW5nKGIsbikKaWYoZSl7dD1hLnUKcD1hLmUK
-aWYocC56PT09MTApcD1wLlEKbz1ILlFvKHQscC5RKVtxXQppZihvPT1udWxsKUgudmgoJ05vICInK3Er
-JyIgaW4gIicrSC5tRChwKSsnIicpCmQucHVzaChILmNFKHQscCxvKSl9ZWxzZSBkLnB1c2gocSkKcmV0
-dXJuIG59LApJOmZ1bmN0aW9uKGEsYil7dmFyIHQ9Yi5wb3AoKQppZigwPT09dCl7Yi5wdXNoKEgubShh
-LnUsMSwiMCYiKSkKcmV0dXJufWlmKDE9PT10KXtiLnB1c2goSC5tKGEudSw0LCIxJiIpKQpyZXR1cm59
-dGhyb3cgSC5iKFAuaFYoIlVuZXhwZWN0ZWQgZXh0ZW5kZWQgb3BlcmF0aW9uICIrSC5kKHQpKSl9LApL
-OmZ1bmN0aW9uKGEsYixjKXtpZih0eXBlb2YgYz09InN0cmluZyIpcmV0dXJuIEguSihhLGMsYS5zRUEp
-CmVsc2UgaWYodHlwZW9mIGM9PSJudW1iZXIiKXJldHVybiBILlRWKGEsYixjKQplbHNlIHJldHVybiBj
-fSwKcjpmdW5jdGlvbihhLGIsYyl7dmFyIHQscz1jLmxlbmd0aApmb3IodD0wO3Q8czsrK3QpY1t0XT1I
-LksoYSxiLGNbdF0pfSwKQjpmdW5jdGlvbihhLGIsYyl7dmFyIHQscz1jLmxlbmd0aApmb3IodD0xO3Q8
-czt0Kz0yKWNbdF09SC5LKGEsYixjW3RdKX0sClRWOmZ1bmN0aW9uKGEsYixjKXt2YXIgdCxzLHI9Yi56
-CmlmKHI9PT0xMCl7aWYoYz09PTApcmV0dXJuIGIuUQp0PWIuY2gKcz10Lmxlbmd0aAppZihjPD1zKXJl
-dHVybiB0W2MtMV0KYy09cwpiPWIuUQpyPWIuen1lbHNlIGlmKGM9PT0wKXJldHVybiBiCmlmKHIhPT05
-KXRocm93IEguYihQLmhWKCJJbmRleGVkIGJhc2UgbXVzdCBiZSBhbiBpbnRlcmZhY2UgdHlwZSIpKQp0
-PWIuY2gKaWYoYzw9dC5sZW5ndGgpcmV0dXJuIHRbYy0xXQp0aHJvdyBILmIoUC5oVigiQmFkIGluZGV4
-ICIrYysiIGZvciAiK2IudygwKSkpfSwKV2U6ZnVuY3Rpb24oYSxiLGMsZCxlKXt2YXIgdCxzLHIscSxw
-LG8sbixtLGwsawppZihiPT09ZClyZXR1cm4hMAppZihILmNjKGQpKXJldHVybiEwCnQ9Yi56CmlmKHQ9
-PT00KXJldHVybiEwCmlmKEguY2MoYikpcmV0dXJuITEKaWYoYj09PXUuUClyZXR1cm4hMApzPXQ9PT0x
-MwppZihzKWlmKEguV2UoYSxjW2IuUV0sYyxkLGUpKXJldHVybiEwCnI9ZC56CmlmKHQ9PT02KXJldHVy
-biBILldlKGEsYi5RLGMsZCxlKQppZihyPT09Nil7cT1kLlEKcmV0dXJuIEguV2UoYSxiLGMscSxlKX1p
-Zih0PT09OCl7aWYoIUguV2UoYSxiLlEsYyxkLGUpKXJldHVybiExCnJldHVybiBILldlKGEsSC54Wihh
-LGIpLGMsZCxlKX1pZih0PT09Nyl7cT1ILldlKGEsYi5RLGMsZCxlKQpyZXR1cm4gcX1pZihyPT09OCl7
-aWYoSC5XZShhLGIsYyxkLlEsZSkpcmV0dXJuITAKcmV0dXJuIEguV2UoYSxiLGMsSC54WihhLGQpLGUp
-fWlmKHI9PT03KXtxPUguV2UoYSxiLGMsZC5RLGUpCnJldHVybiBxfWlmKHMpcmV0dXJuITEKcT10IT09
-MTEKaWYoKCFxfHx0PT09MTIpJiZkPT09dS5aKXJldHVybiEwCmlmKHI9PT0xMil7aWYoYj09PXUuZyly
-ZXR1cm4hMAppZih0IT09MTIpcmV0dXJuITEKcD1iLmNoCm89ZC5jaApuPXAubGVuZ3RoCmlmKG4hPT1v
-Lmxlbmd0aClyZXR1cm4hMQpmb3IocT11LmF2LG09MDttPG47KyttKXtsPXBbbV0Kaz1vW21dCnEuYihs
-KQpxLmIoaykKaWYoIUguV2UoYSxsLGMsayxlKXx8IUguV2UoYSxrLGUsbCxjKSlyZXR1cm4hMX1jPWM9
-PW51bGw/cDpwLmNvbmNhdChjKQplPWU9PW51bGw/bzpvLmNvbmNhdChlKQpyZXR1cm4gSC5iTyhhLGIu
-USxjLGQuUSxlKX1pZihyPT09MTEpe2lmKGI9PT11LmcpcmV0dXJuITAKaWYocSlyZXR1cm4hMQpyZXR1
-cm4gSC5iTyhhLGIsYyxkLGUpfWlmKHQ9PT05KXtpZihyIT09OSlyZXR1cm4hMQpyZXR1cm4gSC5wRyhh
-LGIsYyxkLGUpfXJldHVybiExfSwKYk86ZnVuY3Rpb24oYTAsYTEsYTIsYTMsYTQpe3ZhciB0LHMscixx
-LHAsbyxuLG0sbCxrLGosaSxoLGcsZixlLGQsYyxiLGEKaWYoIUguV2UoYTAsYTEuUSxhMixhMy5RLGE0
-KSlyZXR1cm4hMQp0PWExLmNoCnM9YTMuY2gKcj10LmEKcT1zLmEKcD1yLmxlbmd0aApvPXEubGVuZ3Ro
-CmlmKHA+bylyZXR1cm4hMQpuPW8tcAptPXQuYgpsPXMuYgprPW0ubGVuZ3RoCmo9bC5sZW5ndGgKaWYo
-cCtrPG8railyZXR1cm4hMQpmb3IoaT0wO2k8cDsrK2kpe2g9cltpXQppZighSC5XZShhMCxxW2ldLGE0
-LGgsYTIpKXJldHVybiExfWZvcihpPTA7aTxuOysraSl7aD1tW2ldCmlmKCFILldlKGEwLHFbcCtpXSxh
-NCxoLGEyKSlyZXR1cm4hMX1mb3IoaT0wO2k8ajsrK2kpe2g9bVtuK2ldCmlmKCFILldlKGEwLGxbaV0s
-YTQsaCxhMikpcmV0dXJuITF9Zz10LmMKZj1zLmMKZT1nLmxlbmd0aApkPWYubGVuZ3RoCmZvcihpPTAs
-Yz0wO2M8ZDtjKz0yKXtiPWZbY10KZG97aWYoaT49ZSlyZXR1cm4hMQphPWdbaV0KaSs9Mn13aGlsZShh
-PGIpCmlmKGI8YSlyZXR1cm4hMQpoPWdbaS0xXQppZighSC5XZShhMCxmW2MrMV0sYTQsaCxhMikpcmV0
-dXJuITF9cmV0dXJuITB9LApwRzpmdW5jdGlvbihhLGIsYyxkLGUpe3ZhciB0LHMscixxLHAsbyxuLG0s
-bD1iLlEsaz1kLlEKaWYobD09PWspe3Q9Yi5jaApzPWQuY2gKcj10Lmxlbmd0aApmb3IocT0wO3E8cjsr
-K3Epe3A9dFtxXQpvPXNbcV0KaWYoIUguV2UoYSxwLGMsbyxlKSlyZXR1cm4hMX1yZXR1cm4hMH1uPUgu
-UW8oYSxsKQppZihuPT1udWxsKXJldHVybiExCm09bltrXQppZihtPT1udWxsKXJldHVybiExCnI9bS5s
-ZW5ndGgKcz1kLmNoCmZvcihxPTA7cTxyOysrcSlpZighSC5XZShhLEguY0UoYSxiLG1bcV0pLGMsc1tx
-XSxlKSlyZXR1cm4hMQpyZXR1cm4hMH0sCmNjOmZ1bmN0aW9uKGEpe3ZhciB0LHMKaWYoYT09PXUuSyly
-ZXR1cm4hMAp0PWEuegppZih0IT09MilpZih0IT09MylpZih0IT09NClpZih0IT09NSlzPXQ9PT04JiZI
-LmNjKGEuUSkKZWxzZSBzPSEwCmVsc2Ugcz0hMAplbHNlIHM9ITAKZWxzZSBzPSEwCnJldHVybiBzfSwK
-SXg6ZnVuY3Rpb24oYSxiKXt2YXIgdCxzLHI9T2JqZWN0LmtleXMoYikscT1yLmxlbmd0aApmb3IodD0w
-O3Q8cTsrK3Qpe3M9clt0XQphW3NdPWJbc119fSwKSmM6ZnVuY3Rpb24gSmMoYSxiLGMpe3ZhciBfPXRo
-aXMKXy5hPWEKXy5iPWIKXy5jPWMKXy55PV8ueD1fLmQ9bnVsbApfLno9MApfLmRiPV8uY3k9Xy5jeD1f
-LmNoPV8uUT1udWxsfSwKRzpmdW5jdGlvbiBHKCl7dGhpcy5jPXRoaXMuYj10aGlzLmE9bnVsbH0sCnU5
-OmZ1bmN0aW9uIHU5KCl7fSwKaHo6ZnVuY3Rpb24gaHooYSl7dGhpcy5hPWF9LAppTTpmdW5jdGlvbiBp
-TShhKXt0aGlzLmE9YX0sClI5OmZ1bmN0aW9uKGEpe3JldHVybiB1LmQuYyhhKXx8dS5CLmMoYSl8fHUu
-ZHouYyhhKXx8dS5JLmMoYSl8fHUuQS5jKGEpfHx1Lmc0LmMoYSl8fHUuZzIuYyhhKX0sCkpnOmZ1bmN0
-aW9uKGEpe3JldHVybiB2Lm1hbmdsZWRHbG9iYWxOYW1lc1thXX19LEo9ewpRdTpmdW5jdGlvbihhLGIs
-YyxkKXtyZXR1cm57aTphLHA6YixlOmMseDpkfX0sCmtzOmZ1bmN0aW9uKGEpe3ZhciB0LHMscixxLHA9
-YVt2LmRpc3BhdGNoUHJvcGVydHlOYW1lXQppZihwPT1udWxsKWlmKCQuQnY9PW51bGwpe0guWEQoKQpw
-PWFbdi5kaXNwYXRjaFByb3BlcnR5TmFtZV19aWYocCE9bnVsbCl7dD1wLnAKaWYoITE9PT10KXJldHVy
-biBwLmkKaWYoITA9PT10KXJldHVybiBhCnM9T2JqZWN0LmdldFByb3RvdHlwZU9mKGEpCmlmKHQ9PT1z
-KXJldHVybiBwLmkKaWYocC5lPT09cyl0aHJvdyBILmIoUC5TWSgiUmV0dXJuIGludGVyY2VwdG9yIGZv
-ciAiK0guZCh0KGEscCkpKSl9cj1hLmNvbnN0cnVjdG9yCnE9cj09bnVsbD9udWxsOnJbJC5VTigpXQpp
-ZihxIT1udWxsKXJldHVybiBxCnE9SC53MyhhKQppZihxIT1udWxsKXJldHVybiBxCmlmKHR5cGVvZiBh
-PT0iZnVuY3Rpb24iKXJldHVybiBDLkRHCnQ9T2JqZWN0LmdldFByb3RvdHlwZU9mKGEpCmlmKHQ9PW51
-bGwpcmV0dXJuIEMuWlEKaWYodD09PU9iamVjdC5wcm90b3R5cGUpcmV0dXJuIEMuWlEKaWYodHlwZW9m
-IHI9PSJmdW5jdGlvbiIpe09iamVjdC5kZWZpbmVQcm9wZXJ0eShyLCQuVU4oKSx7dmFsdWU6Qy52Qixl
-bnVtZXJhYmxlOmZhbHNlLHdyaXRhYmxlOnRydWUsY29uZmlndXJhYmxlOnRydWV9KQpyZXR1cm4gQy52
-Qn1yZXR1cm4gQy52Qn0sClFpOmZ1bmN0aW9uKGEsYil7aWYoYTwwfHxhPjQyOTQ5NjcyOTUpdGhyb3cg
-SC5iKFAuVEUoYSwwLDQyOTQ5NjcyOTUsImxlbmd0aCIsbnVsbCkpCnJldHVybiBKLnB5KG5ldyBBcnJh
-eShhKSxiKX0sCnB5OmZ1bmN0aW9uKGEsYil7cmV0dXJuIEouRXAoSC5WTShhLGIuQygiamQ8MD4iKSkp
-fSwKRXA6ZnVuY3Rpb24oYSl7YS5maXhlZCRsZW5ndGg9QXJyYXkKcmV0dXJuIGF9LAp6QzpmdW5jdGlv
-bihhKXthLmZpeGVkJGxlbmd0aD1BcnJheQphLmltbXV0YWJsZSRsaXN0PUFycmF5CnJldHVybiBhfSwK
-R2E6ZnVuY3Rpb24oYSl7aWYoYTwyNTYpc3dpdGNoKGEpe2Nhc2UgOTpjYXNlIDEwOmNhc2UgMTE6Y2Fz
-ZSAxMjpjYXNlIDEzOmNhc2UgMzI6Y2FzZSAxMzM6Y2FzZSAxNjA6cmV0dXJuITAKZGVmYXVsdDpyZXR1
-cm4hMX1zd2l0Y2goYSl7Y2FzZSA1NzYwOmNhc2UgODE5MjpjYXNlIDgxOTM6Y2FzZSA4MTk0OmNhc2Ug
-ODE5NTpjYXNlIDgxOTY6Y2FzZSA4MTk3OmNhc2UgODE5ODpjYXNlIDgxOTk6Y2FzZSA4MjAwOmNhc2Ug
-ODIwMTpjYXNlIDgyMDI6Y2FzZSA4MjMyOmNhc2UgODIzMzpjYXNlIDgyMzk6Y2FzZSA4Mjg3OmNhc2Ug
-MTIyODg6Y2FzZSA2NTI3OTpyZXR1cm4hMApkZWZhdWx0OnJldHVybiExfX0sCm1tOmZ1bmN0aW9uKGEs
-Yil7dmFyIHQscwpmb3IodD1hLmxlbmd0aDtiPHQ7KXtzPUMueEIuVyhhLGIpCmlmKHMhPT0zMiYmcyE9
-PTEzJiYhSi5HYShzKSlicmVhazsrK2J9cmV0dXJuIGJ9LApjMTpmdW5jdGlvbihhLGIpe3ZhciB0LHMK
-Zm9yKDtiPjA7Yj10KXt0PWItMQpzPUMueEIubShhLHQpCmlmKHMhPT0zMiYmcyE9PTEzJiYhSi5HYShz
-KSlicmVha31yZXR1cm4gYn0sClJFOmZ1bmN0aW9uKGEpe2lmKGE9PW51bGwpcmV0dXJuIGEKaWYodHlw
+KX0sCkU6ZnVuY3Rpb24oYSxiLGMpe3ZhciB0LHM9YS5lQyxyPXMuZ2V0KGIpCmlmKHIhPW51bGwpcmV0
+dXJuIHIKdD1ILnooYSxudWxsLGIsYykKcy5zZXQoYix0KQpyZXR1cm4gdH0sCmNFOmZ1bmN0aW9uKGEs
+YixjKXt2YXIgdCxzLHI9Yi5jaAppZihyPT1udWxsKXI9Yi5jaD1uZXcgTWFwKCkKdD1yLmdldChjKQpp
+Zih0IT1udWxsKXJldHVybiB0CnM9SC56KGEsYixjLCEwKQpyLnNldChjLHMpCnJldHVybiBzfSwKdjU6
+ZnVuY3Rpb24oYSxiLGMpe3ZhciB0LHMscixxPWIuY3gKaWYocT09bnVsbClxPWIuY3g9bmV3IE1hcCgp
+CnQ9Yy5jeQpzPXEuZ2V0KHQpCmlmKHMhPW51bGwpcmV0dXJuIHMKcj1ILmFwKGEsYixjLnk9PT0xMD9j
+LlE6W2NdKQpxLnNldCh0LHIpCnJldHVybiByfSwKejpmdW5jdGlvbihhLGIsYyxkKXt2YXIgdD1ILmko
+SC5vKGEsYixjLGQpKQppZih0IT1udWxsKXJldHVybiB0CnRocm93IEguYihQLm4oJ19Vbml2ZXJzZS5f
+cGFyc2VSZWNpcGUoIicrSC5kKGMpKyciKScpKX0sCkJEOmZ1bmN0aW9uKGEsYil7Yi5hPUguT3oKYi5i
+PUguSkoKcmV0dXJuIGJ9LAptWjpmdW5jdGlvbihhLGIsYyl7dmFyIHQscyxyPWEuZUMuZ2V0KGMpCmlm
+KHIhPW51bGwpcmV0dXJuIHIKdD1uZXcgSC5KYyhudWxsLG51bGwpCnQueT1iCnQuY3k9YwpzPUguQkQo
+YSx0KQphLmVDLnNldChjLHMpCnJldHVybiBzfSwKU086ZnVuY3Rpb24oYSxiLGMpe3ZhciB0LHM9Yi5j
+eSsiKiIscj1hLmVDLmdldChzKQppZihyIT1udWxsKXJldHVybiByCnQ9SC5aNyhhLGIscyxjKQphLmVD
+LnNldChzLHQpCnJldHVybiB0fSwKWjc6ZnVuY3Rpb24oYSxiLGMsZCl7dmFyIHQscwppZihkKXt0PWIu
+eQppZihILkE4KGIpfHxiPT09dS5LfHxiPT09dS5QfHx0PT09N3x8dD09PTYpcmV0dXJuIGJ9cz1uZXcg
+SC5KYyhudWxsLG51bGwpCnMueT02CnMuej1iCnMuY3k9YwpyZXR1cm4gSC5CRChhLHMpfSwKQmM6ZnVu
+Y3Rpb24oYSxiLGMpe3ZhciB0LHM9Yi5jeSsiPyIscj1hLmVDLmdldChzKQppZihyIT1udWxsKXJldHVy
+biByCnQ9SC5sbChhLGIscyxjKQphLmVDLnNldChzLHQpCnJldHVybiB0fSwKbGw6ZnVuY3Rpb24oYSxi
+LGMsZCl7dmFyIHQscyxyLHEscAppZihkKXt0PWIueQppZighSC5BOChiKSlpZighKGI9PT11LlApKWlm
+KHQhPT03KXM9dD09PTgmJkgubFIoYi56KQplbHNlIHM9ITAKZWxzZSBzPSEwCmVsc2Ugcz0hMAppZihz
+KXJldHVybiBiCmVsc2UgaWYodD09PTEpcmV0dXJuIHUuUAplbHNlIGlmKHQ9PT02KXtyPWIuegpxPXIu
+eQppZihxPT09MSlyZXR1cm4gdS5QCmVsc2UgaWYocT09PTgmJkgubFIoci56KSlyZXR1cm4gcgplbHNl
+IHJldHVybiBILmN6KGEsYil9fXA9bmV3IEguSmMobnVsbCxudWxsKQpwLnk9NwpwLno9YgpwLmN5PWMK
+cmV0dXJuIEguQkQoYSxwKX0sCkxOOmZ1bmN0aW9uKGEsYixjKXt2YXIgdCxzPWIuY3krIi8iLHI9YS5l
+Qy5nZXQocykKaWYociE9bnVsbClyZXR1cm4gcgp0PUguZVYoYSxiLHMsYykKYS5lQy5zZXQocyx0KQpy
+ZXR1cm4gdH0sCmVWOmZ1bmN0aW9uKGEsYixjLGQpe3ZhciB0LHMKaWYoZCl7dD1iLnkKaWYoSC5BOChi
+KXx8Yj09PXUuS3x8Yj09PXUuSylyZXR1cm4gYgplbHNlIGlmKHQ9PT0xKXJldHVybiBILlEyKGEsImI4
+IixbYl0pCmVsc2UgaWYoYj09PXUuUClyZXR1cm4gdS5hUX1zPW5ldyBILkpjKG51bGwsbnVsbCkKcy55
+PTgKcy56PWIKcy5jeT1jCnJldHVybiBILkJEKGEscyl9LApIYzpmdW5jdGlvbihhLGIpe3ZhciB0LHMs
+cj0iIitiKyJeIixxPWEuZUMuZ2V0KHIpCmlmKHEhPW51bGwpcmV0dXJuIHEKdD1uZXcgSC5KYyhudWxs
+LG51bGwpCnQueT0xMwp0Lno9Ygp0LmN5PXIKcz1ILkJEKGEsdCkKYS5lQy5zZXQocixzKQpyZXR1cm4g
+c30sClV4OmZ1bmN0aW9uKGEpe3ZhciB0LHMscixxPWEubGVuZ3RoCmZvcih0PSIiLHM9IiIscj0wO3I8
+cTsrK3Iscz0iLCIpdCs9cythW3JdLmN5CnJldHVybiB0fSwKUzQ6ZnVuY3Rpb24oYSl7dmFyIHQscyxy
+LHEscCxvPWEubGVuZ3RoCmZvcih0PSIiLHM9IiIscj0wO3I8bztyKz0yLHM9IiwiKXtxPWFbcl0KcD1h
+W3IrMV0uY3kKdCs9cytxKyI6IitwfXJldHVybiB0fSwKUTI6ZnVuY3Rpb24oYSxiLGMpe3ZhciB0LHMs
+cixxPWIKaWYoYy5sZW5ndGghPT0wKXErPSI8IitILlV4KGMpKyI+Igp0PWEuZUMuZ2V0KHEpCmlmKHQh
+PW51bGwpcmV0dXJuIHQKcz1uZXcgSC5KYyhudWxsLG51bGwpCnMueT05CnMuej1iCnMuUT1jCmlmKGMu
+bGVuZ3RoPjApcy5jPWNbMF0Kcy5jeT1xCnI9SC5CRChhLHMpCmEuZUMuc2V0KHEscikKcmV0dXJuIHJ9
+LAphcDpmdW5jdGlvbihhLGIsYyl7dmFyIHQscyxyLHEscCxvCmlmKGIueT09PTEwKXt0PWIuegpzPWIu
+US5jb25jYXQoYyl9ZWxzZXtzPWMKdD1ifXI9dC5jeSsiOyIrKCI8IitILlV4KHMpKyI+IikKcT1hLmVD
+LmdldChyKQppZihxIT1udWxsKXJldHVybiBxCnA9bmV3IEguSmMobnVsbCxudWxsKQpwLnk9MTAKcC56
+PXQKcC5RPXMKcC5jeT1yCm89SC5CRChhLHApCmEuZUMuc2V0KHIsbykKcmV0dXJuIG99LApOZjpmdW5j
+dGlvbihhLGIsYyl7dmFyIHQscyxyLHEscD1iLmN5LG89Yy5hLG49by5sZW5ndGgsbT1jLmIsbD1tLmxl
+bmd0aCxrPWMuYyxqPWsubGVuZ3RoLGk9IigiK0guVXgobykKaWYobD4wKWkrPShuPjA/IiwiOiIiKSsi
+WyIrSC5VeChtKSsiXSIKaWYoaj4wKWkrPShuPjA/IiwiOiIiKSsieyIrSC5TNChrKSsifSIKdD1wKyhp
+KyIpIikKcz1hLmVDLmdldCh0KQppZihzIT1udWxsKXJldHVybiBzCnI9bmV3IEguSmMobnVsbCxudWxs
+KQpyLnk9MTEKci56PWIKci5RPWMKci5jeT10CnE9SC5CRChhLHIpCmEuZUMuc2V0KHQscSkKcmV0dXJu
+IHF9LApEUzpmdW5jdGlvbihhLGIsYyxkKXt2YXIgdCxzPWIuY3krIjwiK0guVXgoYykrIj4iLHI9YS5l
+Qy5nZXQocykKaWYociE9bnVsbClyZXR1cm4gcgp0PUguaHcoYSxiLGMscyxkKQphLmVDLnNldChzLHQp
+CnJldHVybiB0fSwKaHc6ZnVuY3Rpb24oYSxiLGMsZCxlKXt2YXIgdCxzLHIscSxwLG8sbixtCmlmKGUp
+e3Q9Yy5sZW5ndGgKcz1uZXcgQXJyYXkodCkKZm9yKHI9MCxxPTA7cTx0OysrcSl7cD1jW3FdCmlmKHAu
+eT09PTEpe3NbcV09cDsrK3J9fWlmKHI+MCl7bz1ILlBMKGEsYixzLDApCm49SC5iWihhLGMscywwKQpy
+ZXR1cm4gSC5EUyhhLG8sbixjIT09bil9fW09bmV3IEguSmMobnVsbCxudWxsKQptLnk9MTIKbS56PWIK
+bS5RPWMKbS5jeT1kCnJldHVybiBILkJEKGEsbSl9LApvOmZ1bmN0aW9uKGEsYixjLGQpe3JldHVybnt1
+OmEsZTpiLHI6YyxzOltdLHA6MCxuOmR9fSwKaTpmdW5jdGlvbihhKXt2YXIgdCxzLHIscSxwLG8sbixt
+LGwsayxqLGksaD1hLnIsZz1hLnMKZm9yKHQ9aC5sZW5ndGgscz0wO3M8dDspe3I9aC5jaGFyQ29kZUF0
+KHMpCmlmKHI+PTQ4JiZyPD01NylzPUguQWwocysxLHIsaCxnKQplbHNlIGlmKCgoKHJ8MzIpPj4+MCkt
+OTcmNjU1MzUpPDI2fHxyPT09OTV8fHI9PT0zNilzPUguUjgoYSxzLGgsZywhMSkKZWxzZSBpZihyPT09
+NDYpcz1ILlI4KGEscyxoLGcsITApCmVsc2V7KytzCnN3aXRjaChyKXtjYXNlIDQ0OmJyZWFrCmNhc2Ug
+NTg6YnJlYWsKY2FzZSA1OTpnLnB1c2goSC5LUShhLnUsYS5lLGcucG9wKCkpKQpicmVhawpjYXNlIDk0
+OmcucHVzaChILkhjKGEudSxnLnBvcCgpKSkKYnJlYWsKY2FzZSAzNTpnLnB1c2goSC5tWihhLnUsNSwi
+IyIpKQpicmVhawpjYXNlIDY0OmcucHVzaChILm1aKGEudSwyLCJAIikpCmJyZWFrCmNhc2UgMTI2Omcu
+cHVzaChILm1aKGEudSwzLCJ+IikpCmJyZWFrCmNhc2UgNjA6Zy5wdXNoKGEucCkKYS5wPWcubGVuZ3Ro
+CmJyZWFrCmNhc2UgNjI6cT1hLnUKcD1nLnNwbGljZShhLnApCkguclQoYS51LGEuZSxwKQphLnA9Zy5w
+b3AoKQpvPWcucG9wKCkKaWYodHlwZW9mIG89PSJzdHJpbmciKWcucHVzaChILlEyKHEsbyxwKSkKZWxz
+ZXtuPUguS1EocSxhLmUsbykKc3dpdGNoKG4ueSl7Y2FzZSAxMTpnLnB1c2goSC5EUyhxLG4scCxhLm4p
+KQpicmVhawpkZWZhdWx0OmcucHVzaChILmFwKHEsbixwKSkKYnJlYWt9fWJyZWFrCmNhc2UgMzg6SC5J
+MyhhLGcpCmJyZWFrCmNhc2UgNDI6bT1hLnUKZy5wdXNoKEguU08obSxILktRKG0sYS5lLGcucG9wKCkp
+LGEubikpCmJyZWFrCmNhc2UgNjM6bT1hLnUKZy5wdXNoKEguQmMobSxILktRKG0sYS5lLGcucG9wKCkp
+LGEubikpCmJyZWFrCmNhc2UgNDc6bT1hLnUKZy5wdXNoKEguTE4obSxILktRKG0sYS5lLGcucG9wKCkp
+LGEubikpCmJyZWFrCmNhc2UgNDA6Zy5wdXNoKGEucCkKYS5wPWcubGVuZ3RoCmJyZWFrCmNhc2UgNDE6
+cT1hLnUKbD1uZXcgSC5FVCgpCms9cS5zRUEKaj1xLnNFQQpvPWcucG9wKCkKaWYodHlwZW9mIG89PSJu
+dW1iZXIiKXN3aXRjaChvKXtjYXNlLTE6az1nLnBvcCgpCmJyZWFrCmNhc2UtMjpqPWcucG9wKCkKYnJl
+YWsKZGVmYXVsdDpnLnB1c2gobykKYnJlYWt9ZWxzZSBnLnB1c2gobykKcD1nLnNwbGljZShhLnApCkgu
+clQoYS51LGEuZSxwKQphLnA9Zy5wb3AoKQpsLmE9cApsLmI9awpsLmM9agpnLnB1c2goSC5OZihxLEgu
+S1EocSxhLmUsZy5wb3AoKSksbCkpCmJyZWFrCmNhc2UgOTE6Zy5wdXNoKGEucCkKYS5wPWcubGVuZ3Ro
+CmJyZWFrCmNhc2UgOTM6cD1nLnNwbGljZShhLnApCkguclQoYS51LGEuZSxwKQphLnA9Zy5wb3AoKQpn
+LnB1c2gocCkKZy5wdXNoKC0xKQpicmVhawpjYXNlIDEyMzpnLnB1c2goYS5wKQphLnA9Zy5sZW5ndGgK
+YnJlYWsKY2FzZSAxMjU6cD1nLnNwbGljZShhLnApCkguV1MoYS51LGEuZSxwKQphLnA9Zy5wb3AoKQpn
+LnB1c2gocCkKZy5wdXNoKC0yKQpicmVhawpkZWZhdWx0OnRocm93IkJhZCBjaGFyYWN0ZXIgIityfX19
+aT1nLnBvcCgpCnJldHVybiBILktRKGEudSxhLmUsaSl9LApBbDpmdW5jdGlvbihhLGIsYyxkKXt2YXIg
+dCxzLHI9Yi00OApmb3IodD1jLmxlbmd0aDthPHQ7KythKXtzPWMuY2hhckNvZGVBdChhKQppZighKHM+
+PTQ4JiZzPD01NykpYnJlYWsKcj1yKjEwKyhzLTQ4KX1kLnB1c2gocikKcmV0dXJuIGF9LApSODpmdW5j
+dGlvbihhLGIsYyxkLGUpe3ZhciB0LHMscixxLHAsbyxuPWIrMQpmb3IodD1jLmxlbmd0aDtuPHQ7Kytu
+KXtzPWMuY2hhckNvZGVBdChuKQppZihzPT09NDYpe2lmKGUpYnJlYWsKZT0hMH1lbHNle2lmKCEoKCgo
+c3wzMik+Pj4wKS05NyY2NTUzNSk8MjZ8fHM9PT05NXx8cz09PTM2KSlyPXM+PTQ4JiZzPD01NwplbHNl
+IHI9ITAKaWYoIXIpYnJlYWt9fXE9Yy5zdWJzdHJpbmcoYixuKQppZihlKXt0PWEudQpwPWEuZQppZihw
+Lnk9PT0xMClwPXAuegpvPUguUW8odCxwLnopW3FdCmlmKG89PW51bGwpSC52aCgnTm8gIicrcSsnIiBp
+biAiJytILm1EKHApKyciJykKZC5wdXNoKEguY0UodCxwLG8pKX1lbHNlIGQucHVzaChxKQpyZXR1cm4g
+bn0sCkkzOmZ1bmN0aW9uKGEsYil7dmFyIHQ9Yi5wb3AoKQppZigwPT09dCl7Yi5wdXNoKEgubVooYS51
+LDEsIjAmIikpCnJldHVybn1pZigxPT09dCl7Yi5wdXNoKEgubVooYS51LDQsIjEmIikpCnJldHVybn10
+aHJvdyBILmIoUC5oVigiVW5leHBlY3RlZCBleHRlbmRlZCBvcGVyYXRpb24gIitILmQodCkpKX0sCktR
+OmZ1bmN0aW9uKGEsYixjKXtpZih0eXBlb2YgYz09InN0cmluZyIpcmV0dXJuIEguUTIoYSxjLGEuc0VB
+KQplbHNlIGlmKHR5cGVvZiBjPT0ibnVtYmVyIilyZXR1cm4gSC5UVihhLGIsYykKZWxzZSByZXR1cm4g
+Y30sCnJUOmZ1bmN0aW9uKGEsYixjKXt2YXIgdCxzPWMubGVuZ3RoCmZvcih0PTA7dDxzOysrdCljW3Rd
+PUguS1EoYSxiLGNbdF0pfSwKV1M6ZnVuY3Rpb24oYSxiLGMpe3ZhciB0LHM9Yy5sZW5ndGgKZm9yKHQ9
+MTt0PHM7dCs9MiljW3RdPUguS1EoYSxiLGNbdF0pfSwKVFY6ZnVuY3Rpb24oYSxiLGMpe3ZhciB0LHMs
+cj1iLnkKaWYocj09PTEwKXtpZihjPT09MClyZXR1cm4gYi56CnQ9Yi5RCnM9dC5sZW5ndGgKaWYoYzw9
+cylyZXR1cm4gdFtjLTFdCmMtPXMKYj1iLnoKcj1iLnl9ZWxzZSBpZihjPT09MClyZXR1cm4gYgppZihy
+IT09OSl0aHJvdyBILmIoUC5oVigiSW5kZXhlZCBiYXNlIG11c3QgYmUgYW4gaW50ZXJmYWNlIHR5cGUi
+KSkKdD1iLlEKaWYoYzw9dC5sZW5ndGgpcmV0dXJuIHRbYy0xXQp0aHJvdyBILmIoUC5oVigiQmFkIGlu
+ZGV4ICIrYysiIGZvciAiK2IuWigwKSkpfSwKV2U6ZnVuY3Rpb24oYSxiLGMsZCxlKXt2YXIgdCxzLHIs
+cSxwLG8sbixtLGwsawppZihiPT09ZClyZXR1cm4hMAppZihILkE4KGQpfHxkPT09dS5LKXJldHVybiEw
+CnQ9Yi55CmlmKHQ9PT00KXJldHVybiEwCmlmKEguQTgoYikpcmV0dXJuITEKaWYoYj09PXUuUClyZXR1
+cm4hMApzPXQ9PT0xMwppZihzKWlmKEguV2UoYSxjW2Iuel0sYyxkLGUpKXJldHVybiEwCnI9ZC55Cmlm
+KHQ9PT02KXJldHVybiBILldlKGEsYi56LGMsZCxlKQppZihyPT09Nil7cT1kLnoKcmV0dXJuIEguV2Uo
+YSxiLGMscSxlKX1pZih0PT09OCl7aWYoIUguV2UoYSxiLnosYyxkLGUpKXJldHVybiExCnJldHVybiBI
+LldlKGEsSC54WihhLGIpLGMsZCxlKX1pZih0PT09Nyl7cT1ILldlKGEsYi56LGMsZCxlKQpyZXR1cm4g
+cX1pZihyPT09OCl7aWYoSC5XZShhLGIsYyxkLnosZSkpcmV0dXJuITAKcmV0dXJuIEguV2UoYSxiLGMs
+SC54WihhLGQpLGUpfWlmKHI9PT03KXtxPUguV2UoYSxiLGMsZC56LGUpCnJldHVybiBxfWlmKHMpcmV0
+dXJuITEKcT10IT09MTEKaWYoKCFxfHx0PT09MTIpJiZkPT09dS5aKXJldHVybiEwCmlmKHI9PT0xMil7
+aWYoYj09PXUuZylyZXR1cm4hMAppZih0IT09MTIpcmV0dXJuITEKcD1iLlEKbz1kLlEKbj1wLmxlbmd0
+aAppZihuIT09by5sZW5ndGgpcmV0dXJuITEKYz1jPT1udWxsP3A6cC5jb25jYXQoYykKZT1lPT1udWxs
+P286by5jb25jYXQoZSkKZm9yKHE9dS5hdixtPTA7bTxuOysrbSl7bD1wW21dCms9b1ttXQpxLmEobCkK
+cS5hKGspCmlmKCFILldlKGEsbCxjLGssZSl8fCFILldlKGEsayxlLGwsYykpcmV0dXJuITF9cmV0dXJu
+IEguYk8oYSxiLnosYyxkLnosZSl9aWYocj09PTExKXtpZihiPT09dS5nKXJldHVybiEwCmlmKHEpcmV0
+dXJuITEKcmV0dXJuIEguYk8oYSxiLGMsZCxlKX1pZih0PT09OSl7aWYociE9PTkpcmV0dXJuITEKcmV0
+dXJuIEgucEcoYSxiLGMsZCxlKX1yZXR1cm4hMX0sCmJPOmZ1bmN0aW9uKGEwLGExLGEyLGEzLGE0KXt2
+YXIgdCxzLHIscSxwLG8sbixtLGwsayxqLGksaCxnLGYsZSxkLGMsYixhCmlmKCFILldlKGEwLGExLnos
+YTIsYTMueixhNCkpcmV0dXJuITEKdD1hMS5RCnM9YTMuUQpyPXQuYQpxPXMuYQpwPXIubGVuZ3RoCm89
+cS5sZW5ndGgKaWYocD5vKXJldHVybiExCm49by1wCm09dC5iCmw9cy5iCms9bS5sZW5ndGgKaj1sLmxl
+bmd0aAppZihwK2s8bytqKXJldHVybiExCmZvcihpPTA7aTxwOysraSl7aD1yW2ldCmlmKCFILldlKGEw
+LHFbaV0sYTQsaCxhMikpcmV0dXJuITF9Zm9yKGk9MDtpPG47KytpKXtoPW1baV0KaWYoIUguV2UoYTAs
+cVtwK2ldLGE0LGgsYTIpKXJldHVybiExfWZvcihpPTA7aTxqOysraSl7aD1tW24raV0KaWYoIUguV2Uo
+YTAsbFtpXSxhNCxoLGEyKSlyZXR1cm4hMX1nPXQuYwpmPXMuYwplPWcubGVuZ3RoCmQ9Zi5sZW5ndGgK
+Zm9yKGk9MCxjPTA7YzxkO2MrPTIpe2I9ZltjXQpkb3tpZihpPj1lKXJldHVybiExCmE9Z1tpXQppKz0y
+fXdoaWxlKGE8YikKaWYoYjxhKXJldHVybiExCmg9Z1tpLTFdCmlmKCFILldlKGEwLGZbYysxXSxhNCxo
+LGEyKSlyZXR1cm4hMX1yZXR1cm4hMH0sCnBHOmZ1bmN0aW9uKGEsYixjLGQsZSl7dmFyIHQscyxyLHEs
+cCxvLG4sbSxsPWIueixrPWQuegppZihsPT09ayl7dD1iLlEKcz1kLlEKcj10Lmxlbmd0aApmb3IocT0w
+O3E8cjsrK3Epe3A9dFtxXQpvPXNbcV0KaWYoIUguV2UoYSxwLGMsbyxlKSlyZXR1cm4hMX1yZXR1cm4h
+MH1pZihkPT09dS5LKXJldHVybiEwCm49SC5RbyhhLGwpCmlmKG49PW51bGwpcmV0dXJuITEKbT1uW2td
+CmlmKG09PW51bGwpcmV0dXJuITEKcj1tLmxlbmd0aApzPWQuUQpmb3IocT0wO3E8cjsrK3EpaWYoIUgu
+V2UoYSxILmNFKGEsYixtW3FdKSxjLHNbcV0sZSkpcmV0dXJuITEKcmV0dXJuITB9LApsUjpmdW5jdGlv
+bihhKXt2YXIgdCxzPWEueQppZighKGE9PT11LlApKWlmKCFILkE4KGEpKWlmKHMhPT03KWlmKCEocz09
+PTYmJkgubFIoYS56KSkpdD1zPT09OCYmSC5sUihhLnopCmVsc2UgdD0hMAplbHNlIHQ9ITAKZWxzZSB0
+PSEwCmVsc2UgdD0hMApyZXR1cm4gdH0sCmNjOmZ1bmN0aW9uKGEpe3JldHVybiBILkE4KGEpfHxhPT09
+dS5LfSwKQTg6ZnVuY3Rpb24oYSl7dmFyIHQscz1hLnkscj1zCmlmKHIhPT0yKWlmKHIhPT0zKWlmKHIh
+PT00KWlmKHIhPT01KXt0PXUuSwppZighKGE9PT10KSlzPXM9PT03JiZhLno9PT10CmVsc2Ugcz0hMH1l
+bHNlIHM9ITAKZWxzZSBzPSEwCmVsc2Ugcz0hMAplbHNlIHM9ITAKcmV0dXJuIHN9LApJeDpmdW5jdGlv
+bihhLGIpe3ZhciB0LHMscj1PYmplY3Qua2V5cyhiKSxxPXIubGVuZ3RoCmZvcih0PTA7dDxxOysrdCl7
+cz1yW3RdCmFbc109YltzXX19LApKYzpmdW5jdGlvbiBKYyhhLGIpe3ZhciBfPXRoaXMKXy5hPWEKXy5i
+PWIKXy54PV8ucj1fLmM9bnVsbApfLnk9MApfLmN5PV8uY3g9Xy5jaD1fLlE9Xy56PW51bGx9LApFVDpm
+dW5jdGlvbiBFVCgpe3RoaXMuYz10aGlzLmI9dGhpcy5hPW51bGx9LAp1OTpmdW5jdGlvbiB1OSgpe30s
+Cng6ZnVuY3Rpb24geChhKXt0aGlzLmE9YX0sClI5OmZ1bmN0aW9uKGEpe3JldHVybiB1LmQuYihhKXx8
+dS5CLmIoYSl8fHUuZHouYihhKXx8dS5JLmIoYSl8fHUuQS5iKGEpfHx1Lmc0LmIoYSl8fHUuZzIuYihh
+KX0sCkpnOmZ1bmN0aW9uKGEpe3JldHVybiB2Lm1hbmdsZWRHbG9iYWxOYW1lc1thXX19LEo9ewpRdTpm
+dW5jdGlvbihhLGIsYyxkKXtyZXR1cm57aTphLHA6YixlOmMseDpkfX0sCmtzOmZ1bmN0aW9uKGEpe3Zh
+ciB0LHMscixxLHA9YVt2LmRpc3BhdGNoUHJvcGVydHlOYW1lXQppZihwPT1udWxsKWlmKCQuSz09bnVs
+bCl7SC5NKCkKcD1hW3YuZGlzcGF0Y2hQcm9wZXJ0eU5hbWVdfWlmKHAhPW51bGwpe3Q9cC5wCmlmKCEx
+PT09dClyZXR1cm4gcC5pCmlmKCEwPT09dClyZXR1cm4gYQpzPU9iamVjdC5nZXRQcm90b3R5cGVPZihh
+KQppZih0PT09cylyZXR1cm4gcC5pCmlmKHAuZT09PXMpdGhyb3cgSC5iKFAubigiUmV0dXJuIGludGVy
+Y2VwdG9yIGZvciAiK0guZCh0KGEscCkpKSl9cj1hLmNvbnN0cnVjdG9yCnE9cj09bnVsbD9udWxsOnJb
+JC5BKCldCmlmKHEhPW51bGwpcmV0dXJuIHEKcT1ILkcoYSkKaWYocSE9bnVsbClyZXR1cm4gcQppZih0
+eXBlb2YgYT09ImZ1bmN0aW9uIilyZXR1cm4gQy5ERwp0PU9iamVjdC5nZXRQcm90b3R5cGVPZihhKQpp
+Zih0PT1udWxsKXJldHVybiBDLlpRCmlmKHQ9PT1PYmplY3QucHJvdG90eXBlKXJldHVybiBDLlpRCmlm
+KHR5cGVvZiByPT0iZnVuY3Rpb24iKXtPYmplY3QuZGVmaW5lUHJvcGVydHkociwkLkEoKSx7dmFsdWU6
+Qy52QixlbnVtZXJhYmxlOmZhbHNlLHdyaXRhYmxlOnRydWUsY29uZmlndXJhYmxlOnRydWV9KQpyZXR1
+cm4gQy52Qn1yZXR1cm4gQy52Qn0sClFpOmZ1bmN0aW9uKGEsYil7aWYoYTwwfHxhPjQyOTQ5NjcyOTUp
+dGhyb3cgSC5iKFAuVEUoYSwwLDQyOTQ5NjcyOTUsImxlbmd0aCIsbnVsbCkpCnJldHVybiBKLnB5KG5l
+dyBBcnJheShhKSxiKX0sCnB5OmZ1bmN0aW9uKGEsYil7cmV0dXJuIEouRXAoSC5WTShhLGIuQygiamQ8
+MD4iKSkpfSwKRXA6ZnVuY3Rpb24oYSl7YS5maXhlZCRsZW5ndGg9QXJyYXkKcmV0dXJuIGF9LAp1bjpm
+dW5jdGlvbihhKXthLmZpeGVkJGxlbmd0aD1BcnJheQphLmltbXV0YWJsZSRsaXN0PUFycmF5CnJldHVy
+biBhfSwKR2E6ZnVuY3Rpb24oYSl7aWYoYTwyNTYpc3dpdGNoKGEpe2Nhc2UgOTpjYXNlIDEwOmNhc2Ug
+MTE6Y2FzZSAxMjpjYXNlIDEzOmNhc2UgMzI6Y2FzZSAxMzM6Y2FzZSAxNjA6cmV0dXJuITAKZGVmYXVs
+dDpyZXR1cm4hMX1zd2l0Y2goYSl7Y2FzZSA1NzYwOmNhc2UgODE5MjpjYXNlIDgxOTM6Y2FzZSA4MTk0
+OmNhc2UgODE5NTpjYXNlIDgxOTY6Y2FzZSA4MTk3OmNhc2UgODE5ODpjYXNlIDgxOTk6Y2FzZSA4MjAw
+OmNhc2UgODIwMTpjYXNlIDgyMDI6Y2FzZSA4MjMyOmNhc2UgODIzMzpjYXNlIDgyMzk6Y2FzZSA4Mjg3
+OmNhc2UgMTIyODg6Y2FzZSA2NTI3OTpyZXR1cm4hMApkZWZhdWx0OnJldHVybiExfX0sCm1tOmZ1bmN0
+aW9uKGEsYil7dmFyIHQscwpmb3IodD1hLmxlbmd0aDtiPHQ7KXtzPUMueEIuVyhhLGIpCmlmKHMhPT0z
+MiYmcyE9PTEzJiYhSi5HYShzKSlicmVhazsrK2J9cmV0dXJuIGJ9LApjMTpmdW5jdGlvbihhLGIpe3Zh
+ciB0LHMKZm9yKDtiPjA7Yj10KXt0PWItMQpzPUMueEIubShhLHQpCmlmKHMhPT0zMiYmcyE9PTEzJiYh
+Si5HYShzKSlicmVha31yZXR1cm4gYn0sClJFOmZ1bmN0aW9uKGEpe2lmKGE9PW51bGwpcmV0dXJuIGEK
+aWYodHlwZW9mIGEhPSJvYmplY3QiKXtpZih0eXBlb2YgYT09ImZ1bmN0aW9uIilyZXR1cm4gSi5jNS5w
+cm90b3R5cGUKcmV0dXJuIGF9aWYoYSBpbnN0YW5jZW9mIFAuTWgpcmV0dXJuIGEKcmV0dXJuIEoua3Mo
+YSl9LApUSjpmdW5jdGlvbihhKXtpZih0eXBlb2YgYT09Im51bWJlciIpcmV0dXJuIEoucUkucHJvdG90
+eXBlCmlmKHR5cGVvZiBhPT0ic3RyaW5nIilyZXR1cm4gSi5Eci5wcm90b3R5cGUKaWYoYT09bnVsbCly
+ZXR1cm4gYQppZihhLmNvbnN0cnVjdG9yPT1BcnJheSlyZXR1cm4gSi5qZC5wcm90b3R5cGUKaWYodHlw
ZW9mIGEhPSJvYmplY3QiKXtpZih0eXBlb2YgYT09ImZ1bmN0aW9uIilyZXR1cm4gSi5jNS5wcm90b3R5
-cGUKcmV0dXJuIGF9aWYoYSBpbnN0YW5jZW9mIFAuaylyZXR1cm4gYQpyZXR1cm4gSi5rcyhhKX0sClRK
-OmZ1bmN0aW9uKGEpe2lmKHR5cGVvZiBhPT0ibnVtYmVyIilyZXR1cm4gSi5xSS5wcm90b3R5cGUKaWYo
-dHlwZW9mIGE9PSJzdHJpbmciKXJldHVybiBKLkRyLnByb3RvdHlwZQppZihhPT1udWxsKXJldHVybiBh
-CmlmKGEuY29uc3RydWN0b3I9PUFycmF5KXJldHVybiBKLmpkLnByb3RvdHlwZQppZih0eXBlb2YgYSE9
-Im9iamVjdCIpe2lmKHR5cGVvZiBhPT0iZnVuY3Rpb24iKXJldHVybiBKLmM1LnByb3RvdHlwZQpyZXR1
-cm4gYX1pZihhIGluc3RhbmNlb2YgUC5rKXJldHVybiBhCnJldHVybiBKLmtzKGEpfSwKVTY6ZnVuY3Rp
-b24oYSl7aWYodHlwZW9mIGE9PSJzdHJpbmciKXJldHVybiBKLkRyLnByb3RvdHlwZQppZihhPT1udWxs
-KXJldHVybiBhCmlmKGEuY29uc3RydWN0b3I9PUFycmF5KXJldHVybiBKLmpkLnByb3RvdHlwZQppZih0
-eXBlb2YgYSE9Im9iamVjdCIpe2lmKHR5cGVvZiBhPT0iZnVuY3Rpb24iKXJldHVybiBKLmM1LnByb3Rv
-dHlwZQpyZXR1cm4gYX1pZihhIGluc3RhbmNlb2YgUC5rKXJldHVybiBhCnJldHVybiBKLmtzKGEpfSwK
-aWE6ZnVuY3Rpb24oYSl7aWYodHlwZW9mIGE9PSJudW1iZXIiKXtpZihNYXRoLmZsb29yKGEpPT1hKXJl
-dHVybiBKLnVyLnByb3RvdHlwZQpyZXR1cm4gSi5WQS5wcm90b3R5cGV9aWYodHlwZW9mIGE9PSJzdHJp
-bmciKXJldHVybiBKLkRyLnByb3RvdHlwZQppZihhPT1udWxsKXJldHVybiBKLllFLnByb3RvdHlwZQpp
-Zih0eXBlb2YgYT09ImJvb2xlYW4iKXJldHVybiBKLnlFLnByb3RvdHlwZQppZihhLmNvbnN0cnVjdG9y
-PT1BcnJheSlyZXR1cm4gSi5qZC5wcm90b3R5cGUKaWYodHlwZW9mIGEhPSJvYmplY3QiKXtpZih0eXBl
-b2YgYT09ImZ1bmN0aW9uIilyZXR1cm4gSi5jNS5wcm90b3R5cGUKcmV0dXJuIGF9aWYoYSBpbnN0YW5j
-ZW9mIFAuaylyZXR1cm4gYQpyZXR1cm4gSi5rcyhhKX0sCnJZOmZ1bmN0aW9uKGEpe2lmKHR5cGVvZiBh
-PT0ic3RyaW5nIilyZXR1cm4gSi5Eci5wcm90b3R5cGUKaWYoYT09bnVsbClyZXR1cm4gYQppZighKGEg
-aW5zdGFuY2VvZiBQLmspKXJldHVybiBKLmtkLnByb3RvdHlwZQpyZXR1cm4gYX0sCncxOmZ1bmN0aW9u
-KGEpe2lmKGE9PW51bGwpcmV0dXJuIGEKaWYoYS5jb25zdHJ1Y3Rvcj09QXJyYXkpcmV0dXJuIEouamQu
-cHJvdG90eXBlCmlmKHR5cGVvZiBhIT0ib2JqZWN0Iil7aWYodHlwZW9mIGE9PSJmdW5jdGlvbiIpcmV0
-dXJuIEouYzUucHJvdG90eXBlCnJldHVybiBhfWlmKGEgaW5zdGFuY2VvZiBQLmspcmV0dXJuIGEKcmV0
-dXJuIEoua3MoYSl9LApDTTpmdW5jdGlvbihhLGIsYyxkKXtyZXR1cm4gSi5SRShhKS5kdShhLGIsYyxk
-KX0sCkZMOmZ1bmN0aW9uKGEsYil7cmV0dXJuIEouclkoYSkuZGQoYSxiKX0sCkdBOmZ1bmN0aW9uKGEs
-Yil7cmV0dXJuIEoudzEoYSkuRShhLGIpfSwKR3I6ZnVuY3Rpb24oYSl7cmV0dXJuIEouUkUoYSkuZ21X
-KGEpfSwKSG06ZnVuY3Rpb24oYSl7cmV0dXJuIEouVTYoYSkuZ0EoYSl9LApJVDpmdW5jdGlvbihhKXty
-ZXR1cm4gSi53MShhKS5na3ooYSl9LApKeTpmdW5jdGlvbihhLGIpe3JldHVybiBKLmlhKGEpLmU3KGEs
-Yil9LApLVjpmdW5jdGlvbihhLGIpe3JldHVybiBKLnJZKGEpLkcoYSxiKX0sCkx0OmZ1bmN0aW9uKGEp
-e3JldHVybiBKLlJFKGEpLndnKGEpfSwKTTE6ZnVuY3Rpb24oYSxiLGMpe3JldHVybiBKLncxKGEpLkUy
-KGEsYixjKX0sClF6OmZ1bmN0aW9uKGEsYil7cmV0dXJuIEouclkoYSkuVyhhLGIpfSwKUk06ZnVuY3Rp
-b24oYSxiKXtpZihhPT1udWxsKXJldHVybiBiPT1udWxsCmlmKHR5cGVvZiBhIT0ib2JqZWN0IilyZXR1
-cm4gYiE9bnVsbCYmYT09PWIKcmV0dXJuIEouaWEoYSkuRE4oYSxiKX0sClQwOmZ1bmN0aW9uKGEpe3Jl
-dHVybiBKLnJZKGEpLmJTKGEpfSwKYTY6ZnVuY3Rpb24oYSxiKXtyZXR1cm4gSi5yWShhKS5tKGEsYil9
-LApiVDpmdW5jdGlvbihhKXtyZXR1cm4gSi5SRShhKS5ENChhKX0sCmJiOmZ1bmN0aW9uKGEsYil7aWYo
-dHlwZW9mIGE9PSJudW1iZXIiJiZ0eXBlb2YgYj09Im51bWJlciIpcmV0dXJuIGErYgpyZXR1cm4gSi5U
-SihhKS5oKGEsYil9LApjSDpmdW5jdGlvbihhKXtyZXR1cm4gSi5yWShhKS5oYyhhKX0sCmRSOmZ1bmN0
-aW9uKGEpe3JldHVybiBKLlJFKGEpLmdEKGEpfSwKZFo6ZnVuY3Rpb24oYSxiLGMsZCl7cmV0dXJuIEou
-UkUoYSkuT24oYSxiLGMsZCl9LApkaDpmdW5jdGlvbihhKXtyZXR1cm4gSi5SRShhKS50bihhKX0sCmhm
-OmZ1bmN0aW9uKGEpe3JldHVybiBKLmlhKGEpLmdpTyhhKX0sCmlnOmZ1bmN0aW9uKGEpe3JldHVybiBK
-LlJFKGEpLmdRZyhhKX0sCmo6ZnVuY3Rpb24oYSl7cmV0dXJuIEouaWEoYSkudyhhKX0sCmw1OmZ1bmN0
-aW9uKGEsYil7cmV0dXJuIEouUkUoYSkuc2hmKGEsYil9LApsZDpmdW5jdGlvbihhLGIsYyl7cmV0dXJu
-IEouclkoYSkuTmooYSxiLGMpfSwKcTA6ZnVuY3Rpb24oYSxiLGMpe3JldHVybiBKLnJZKGEpLlFpKGEs
-YixjKX0sCnFGOmZ1bmN0aW9uKGEpe3JldHVybiBKLlJFKGEpLmdWbChhKX0sCnRIOmZ1bmN0aW9uKGEs
-YixjKXtyZXR1cm4gSi5SRShhKS5wayhhLGIsYyl9LAp3MjpmdW5jdGlvbihhLGIpe2lmKHR5cGVvZiBi
-PT09Im51bWJlciIpaWYoYS5jb25zdHJ1Y3Rvcj09QXJyYXl8fHR5cGVvZiBhPT0ic3RyaW5nInx8SC53
-VihhLGFbdi5kaXNwYXRjaFByb3BlcnR5TmFtZV0pKWlmKGI+Pj4wPT09YiYmYjxhLmxlbmd0aClyZXR1
-cm4gYVtiXQpyZXR1cm4gSi5VNihhKS5xKGEsYil9LAp5UTpmdW5jdGlvbihhLGIsYyxkKXtyZXR1cm4g
-Si5yWShhKS5pNyhhLGIsYyxkKX0sCnpsOmZ1bmN0aW9uKGEsYil7cmV0dXJuIEouVTYoYSkudGcoYSxi
-KX0sCnZCOmZ1bmN0aW9uIHZCKCl7fSwKeUU6ZnVuY3Rpb24geUUoKXt9LApZRTpmdW5jdGlvbiBZRSgp
-e30sCk1GOmZ1bmN0aW9uIE1GKCl7fSwKaUM6ZnVuY3Rpb24gaUMoKXt9LAprZDpmdW5jdGlvbiBrZCgp
-e30sCmM1OmZ1bmN0aW9uIGM1KCl7fSwKamQ6ZnVuY3Rpb24gamQoYSl7dGhpcy4kdGk9YX0sClBvOmZ1
-bmN0aW9uIFBvKGEpe3RoaXMuJHRpPWF9LAptMTpmdW5jdGlvbiBtMShhLGIsYyl7dmFyIF89dGhpcwpf
-LmE9YQpfLmI9YgpfLmM9MApfLmQ9bnVsbApfLiR0aT1jfSwKcUk6ZnVuY3Rpb24gcUkoKXt9LAp1cjpm
-dW5jdGlvbiB1cigpe30sClZBOmZ1bmN0aW9uIFZBKCl7fSwKRHI6ZnVuY3Rpb24gRHIoKXt9fSxQPXsK
-T2o6ZnVuY3Rpb24oKXt2YXIgdCxzLHI9e30KaWYoc2VsZi5zY2hlZHVsZUltbWVkaWF0ZSE9bnVsbCly
-ZXR1cm4gUC5FWCgpCmlmKHNlbGYuTXV0YXRpb25PYnNlcnZlciE9bnVsbCYmc2VsZi5kb2N1bWVudCE9
-bnVsbCl7dD1zZWxmLmRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpCnM9c2VsZi5kb2N1bWVudC5j
-cmVhdGVFbGVtZW50KCJzcGFuIikKci5hPW51bGwKbmV3IHNlbGYuTXV0YXRpb25PYnNlcnZlcihILnRS
-KG5ldyBQLnRoKHIpLDEpKS5vYnNlcnZlKHQse2NoaWxkTGlzdDp0cnVlfSkKcmV0dXJuIG5ldyBQLmhh
-KHIsdCxzKX1lbHNlIGlmKHNlbGYuc2V0SW1tZWRpYXRlIT1udWxsKXJldHVybiBQLnl0KCkKcmV0dXJu
-IFAucVcoKX0sClpWOmZ1bmN0aW9uKGEpe3NlbGYuc2NoZWR1bGVJbW1lZGlhdGUoSC50UihuZXcgUC5W
-cyh1Lk0uYihhKSksMCkpfSwKb0E6ZnVuY3Rpb24oYSl7c2VsZi5zZXRJbW1lZGlhdGUoSC50UihuZXcg
-UC5GdCh1Lk0uYihhKSksMCkpfSwKQno6ZnVuY3Rpb24oYSl7dS5NLmIoYSkKUC5RTigwLGEpfSwKUU46
-ZnVuY3Rpb24oYSxiKXt2YXIgdD1uZXcgUC5XMygpCnQuQ1koYSxiKQpyZXR1cm4gdH0sCkZYOmZ1bmN0
-aW9uKGEpe3JldHVybiBuZXcgUC5paChuZXcgUC52cygkLlgzLGEuQygidnM8MD4iKSksYS5DKCJpaDww
-PiIpKX0sCkRJOmZ1bmN0aW9uKGEsYil7YS4kMigwLG51bGwpCmIuYj0hMApyZXR1cm4gYi5hfSwKalE6
-ZnVuY3Rpb24oYSxiKXtQLkplKGEsYil9LAp5QzpmdW5jdGlvbihhLGIpe2IuYU0oMCxhKX0sCmYzOmZ1
-bmN0aW9uKGEsYil7Yi53MChILlJ1KGEpLEgudHMoYSkpfSwKSmU6ZnVuY3Rpb24oYSxiKXt2YXIgdCxz
-LHI9bmV3IFAuV00oYikscT1uZXcgUC5TWChiKQppZihhIGluc3RhbmNlb2YgUC52cylhLlFkKHIscSx1
-LnopCmVsc2V7dD11LnoKaWYodS5jLmMoYSkpYS5TcShyLHEsdCkKZWxzZXtzPW5ldyBQLnZzKCQuWDMs
-dS5fKQpzLmE9NApzLmM9YQpzLlFkKHIsbnVsbCx0KX19fSwKbHo6ZnVuY3Rpb24oYSl7dmFyIHQ9ZnVu
-Y3Rpb24oYixjKXtyZXR1cm4gZnVuY3Rpb24oZCxlKXt3aGlsZSh0cnVlKXRyeXtiKGQsZSkKYnJlYWt9
-Y2F0Y2gocyl7ZT1zCmQ9Y319fShhLDEpCnJldHVybiAkLlgzLkxqKG5ldyBQLkdzKHQpLHUuUCx1LmVn
-LHUueil9LAprMzpmdW5jdGlvbihhLGIpe3ZhciB0LHMscgpiLmE9MQp0cnl7YS5TcShuZXcgUC5wVihi
-KSxuZXcgUC5VNyhiKSx1LlApfWNhdGNoKHIpe3Q9SC5SdShyKQpzPUgudHMocikKUC5yYihuZXcgUC52
-cihiLHQscykpfX0sCkE5OmZ1bmN0aW9uKGEsYil7dmFyIHQscyxyCmZvcih0PXUuXztzPWEuYSxzPT09
-MjspYT10LmIoYS5jKQppZihzPj00KXtyPWIuYWgoKQpiLmE9YS5hCmIuYz1hLmMKUC5IWihiLHIpfWVs
-c2V7cj11LnguYihiLmMpCmIuYT0yCmIuYz1hCmEualEocil9fSwKSFo6ZnVuY3Rpb24oYSxiKXt2YXIg
-dCxzLHIscSxwLG8sbixtLGwsayxqLGksaCxnLGYsZT1udWxsLGQ9e30sYz1kLmE9YQpmb3IodD11Lm4s
-cz11Lngscj11LmM7ITA7KXtxPXt9CnA9Yy5hPT09OAppZihiPT1udWxsKXtpZihwKXtvPXQuYihjLmMp
-ClAuTDIoZSxlLGMuYixvLmEsby5iKX1yZXR1cm59Zm9yKDtuPWIuYSxuIT1udWxsO2I9bil7Yi5hPW51
-bGwKUC5IWihkLmEsYil9Yz1kLmEKbT1jLmMKcS5hPXAKcS5iPW0KbD0hcAppZihsKXtrPWIuYwprPShr
-JjEpIT09MHx8KGsmMTUpPT09OH1lbHNlIGs9ITAKaWYoayl7az1iLmIKaj1rLmIKaWYocCl7aT1jLmI9
-PT1qCmk9IShpfHxpKX1lbHNlIGk9ITEKaWYoaSl7dC5iKG0pClAuTDIoZSxlLGMuYixtLmEsbS5iKQpy
-ZXR1cm59aD0kLlgzCmlmKGghPT1qKSQuWDM9agplbHNlIGg9ZQpjPWIuYwppZigoYyYxNSk9PT04KW5l
-dyBQLlJUKGQscSxiLHApLiQwKCkKZWxzZSBpZihsKXtpZigoYyYxKSE9PTApbmV3IFAucnEocSxiLG0p
-LiQwKCl9ZWxzZSBpZigoYyYyKSE9PTApbmV3IFAuUlcoZCxxLGIpLiQwKCkKaWYoaCE9bnVsbCkkLlgz
-PWgKYz1xLmIKaWYoci5jKGMpKXtpZihjLmE+PTQpe2c9cy5iKGsuYykKay5jPW51bGwKYj1rLk44KGcp
-CmsuYT1jLmEKay5jPWMuYwpkLmE9Ywpjb250aW51ZX1lbHNlIFAuQTkoYyxrKQpyZXR1cm59fWY9Yi5i
-Cmc9cy5iKGYuYykKZi5jPW51bGwKYj1mLk44KGcpCmM9cS5hCmw9cS5iCmlmKCFjKXtmLiR0aS5kLmIo
-bCkKZi5hPTQKZi5jPWx9ZWxzZXt0LmIobCkKZi5hPTgKZi5jPWx9ZC5hPWYKYz1mfX0sClZIOmZ1bmN0
-aW9uKGEsYil7dmFyIHQKaWYodS5XLmMoYSkpcmV0dXJuIGIuTGooYSx1LnosdS5LLHUubCkKdD11LnkK
-aWYodC5jKGEpKXJldHVybiB0LmIoYSkKdGhyb3cgSC5iKFAuTDMoYSwib25FcnJvciIsIkVycm9yIGhh
-bmRsZXIgbXVzdCBhY2NlcHQgb25lIE9iamVjdCBvciBvbmUgT2JqZWN0IGFuZCBhIFN0YWNrVHJhY2Ug
-YXMgYXJndW1lbnRzLCBhbmQgcmV0dXJuIGEgYSB2YWxpZCByZXN1bHQiKSl9LApwdTpmdW5jdGlvbigp
-e3ZhciB0LHMKZm9yKDt0PSQuUzYsdCE9bnVsbDspeyQubWc9bnVsbApzPXQuYgokLlM2PXMKaWYocz09
-bnVsbCkkLms4PW51bGwKdC5hLiQwKCl9fSwKZU46ZnVuY3Rpb24oKXskLlVEPSEwCnRyeXtQLnB1KCl9
-ZmluYWxseXskLm1nPW51bGwKJC5VRD0hMQppZigkLlM2IT1udWxsKSQudXQoKS4kMShQLlVJKCkpfX0s
-CmVXOmZ1bmN0aW9uKGEpe3ZhciB0PW5ldyBQLk9NKGEpCmlmKCQuUzY9PW51bGwpeyQuUzY9JC5rOD10
-CmlmKCEkLlVEKSQudXQoKS4kMShQLlVJKCkpfWVsc2UgJC5rOD0kLms4LmI9dH0sCnJSOmZ1bmN0aW9u
-KGEpe3ZhciB0LHMscj0kLlM2CmlmKHI9PW51bGwpe1AuZVcoYSkKJC5tZz0kLms4CnJldHVybn10PW5l
-dyBQLk9NKGEpCnM9JC5tZwppZihzPT1udWxsKXt0LmI9cgokLlM2PSQubWc9dH1lbHNle3QuYj1zLmIK
-JC5tZz1zLmI9dAppZih0LmI9PW51bGwpJC5rOD10fX0sCnJiOmZ1bmN0aW9uKGEpe3ZhciB0PW51bGws
-cz0kLlgzCmlmKEMuTlU9PT1zKXtQLlRrKHQsdCxDLk5VLGEpCnJldHVybn1QLlRrKHQsdCxzLHUuTS5i
-KHMuR1koYSkpKX0sClF3OmZ1bmN0aW9uKGEsYil7aWYoYT09bnVsbClILnZoKFAuRWUoInN0cmVhbSIp
-KQpyZXR1cm4gbmV3IFAueEkoYi5DKCJ4STwwPiIpKX0sCkwyOmZ1bmN0aW9uKGEsYixjLGQsZSl7dmFy
-IHQ9e30KdC5hPWQKUC5yUihuZXcgUC5wSyh0LGUpKX0sClQ4OmZ1bmN0aW9uKGEsYixjLGQsZSl7dmFy
-IHQscz0kLlgzCmlmKHM9PT1jKXJldHVybiBkLiQwKCkKJC5YMz1jCnQ9cwp0cnl7cz1kLiQwKCkKcmV0
-dXJuIHN9ZmluYWxseXskLlgzPXR9fSwKeXY6ZnVuY3Rpb24oYSxiLGMsZCxlLGYsZyl7dmFyIHQscz0k
-LlgzCmlmKHM9PT1jKXJldHVybiBkLiQxKGUpCiQuWDM9Ywp0PXMKdHJ5e3M9ZC4kMShlKQpyZXR1cm4g
-c31maW5hbGx5eyQuWDM9dH19LApReDpmdW5jdGlvbihhLGIsYyxkLGUsZixnLGgsaSl7dmFyIHQscz0k
-LlgzCmlmKHM9PT1jKXJldHVybiBkLiQyKGUsZikKJC5YMz1jCnQ9cwp0cnl7cz1kLiQyKGUsZikKcmV0
-dXJuIHN9ZmluYWxseXskLlgzPXR9fSwKVGs6ZnVuY3Rpb24oYSxiLGMsZCl7dmFyIHQKdS5NLmIoZCkK
-dD1DLk5VIT09YwppZih0KWQ9ISghdHx8ITEpP2MuR1koZCk6Yy5SVChkLHUuSCkKUC5lVyhkKX0sCnRo
-OmZ1bmN0aW9uIHRoKGEpe3RoaXMuYT1hfSwKaGE6ZnVuY3Rpb24gaGEoYSxiLGMpe3RoaXMuYT1hCnRo
-aXMuYj1iCnRoaXMuYz1jfSwKVnM6ZnVuY3Rpb24gVnMoYSl7dGhpcy5hPWF9LApGdDpmdW5jdGlvbiBG
-dChhKXt0aGlzLmE9YX0sClczOmZ1bmN0aW9uIFczKCl7fSwKeUg6ZnVuY3Rpb24geUgoYSxiKXt0aGlz
-LmE9YQp0aGlzLmI9Yn0sCmloOmZ1bmN0aW9uIGloKGEsYil7dGhpcy5hPWEKdGhpcy5iPSExCnRoaXMu
-JHRpPWJ9LApXTTpmdW5jdGlvbiBXTShhKXt0aGlzLmE9YX0sClNYOmZ1bmN0aW9uIFNYKGEpe3RoaXMu
-YT1hfSwKR3M6ZnVuY3Rpb24gR3MoYSl7dGhpcy5hPWF9LApQZjpmdW5jdGlvbiBQZigpe30sClpmOmZ1
-bmN0aW9uIFpmKGEsYil7dGhpcy5hPWEKdGhpcy4kdGk9Yn0sCkZlOmZ1bmN0aW9uIEZlKGEsYixjLGQs
-ZSl7dmFyIF89dGhpcwpfLmE9bnVsbApfLmI9YQpfLmM9YgpfLmQ9YwpfLmU9ZApfLiR0aT1lfSwKdnM6
-ZnVuY3Rpb24gdnMoYSxiKXt2YXIgXz10aGlzCl8uYT0wCl8uYj1hCl8uYz1udWxsCl8uJHRpPWJ9LApk
-YTpmdW5jdGlvbiBkYShhLGIpe3RoaXMuYT1hCnRoaXMuYj1ifSwKb1E6ZnVuY3Rpb24gb1EoYSxiKXt0
-aGlzLmE9YQp0aGlzLmI9Yn0sCnBWOmZ1bmN0aW9uIHBWKGEpe3RoaXMuYT1hfSwKVTc6ZnVuY3Rpb24g
-VTcoYSl7dGhpcy5hPWF9LAp2cjpmdW5jdGlvbiB2cihhLGIsYyl7dGhpcy5hPWEKdGhpcy5iPWIKdGhp
-cy5jPWN9LApySDpmdW5jdGlvbiBySChhLGIpe3RoaXMuYT1hCnRoaXMuYj1ifSwKS0Y6ZnVuY3Rpb24g
-S0YoYSxiKXt0aGlzLmE9YQp0aGlzLmI9Yn0sClpMOmZ1bmN0aW9uIFpMKGEsYixjKXt0aGlzLmE9YQp0
-aGlzLmI9Ygp0aGlzLmM9Y30sClJUOmZ1bmN0aW9uIFJUKGEsYixjLGQpe3ZhciBfPXRoaXMKXy5hPWEK
-Xy5iPWIKXy5jPWMKXy5kPWR9LApqWjpmdW5jdGlvbiBqWihhKXt0aGlzLmE9YX0sCnJxOmZ1bmN0aW9u
-IHJxKGEsYixjKXt0aGlzLmE9YQp0aGlzLmI9Ygp0aGlzLmM9Y30sClJXOmZ1bmN0aW9uIFJXKGEsYixj
-KXt0aGlzLmE9YQp0aGlzLmI9Ygp0aGlzLmM9Y30sCk9NOmZ1bmN0aW9uIE9NKGEpe3RoaXMuYT1hCnRo
-aXMuYj1udWxsfSwKcWg6ZnVuY3Rpb24gcWgoKXt9LApCNTpmdW5jdGlvbiBCNShhLGIpe3RoaXMuYT1h
-CnRoaXMuYj1ifSwKUEk6ZnVuY3Rpb24gUEkoYSxiKXt0aGlzLmE9YQp0aGlzLmI9Yn0sCk1POmZ1bmN0
-aW9uIE1PKCl7fSwKa1Q6ZnVuY3Rpb24ga1QoKXt9LAp4STpmdW5jdGlvbiB4SShhKXt0aGlzLiR0aT1h
-fSwKQ3c6ZnVuY3Rpb24gQ3coYSxiKXt0aGlzLmE9YQp0aGlzLmI9Yn0sCm0wOmZ1bmN0aW9uIG0wKCl7
-fSwKcEs6ZnVuY3Rpb24gcEsoYSxiKXt0aGlzLmE9YQp0aGlzLmI9Yn0sCkppOmZ1bmN0aW9uIEppKCl7
-fSwKaGo6ZnVuY3Rpb24gaGooYSxiLGMpe3RoaXMuYT1hCnRoaXMuYj1iCnRoaXMuYz1jfSwKVnA6ZnVu
-Y3Rpb24gVnAoYSxiKXt0aGlzLmE9YQp0aGlzLmI9Yn0sCk9SOmZ1bmN0aW9uIE9SKGEsYixjKXt0aGlz
-LmE9YQp0aGlzLmI9Ygp0aGlzLmM9Y30sCkVGOmZ1bmN0aW9uKGEsYixjKXtyZXR1cm4gYi5DKCJAPDA+
-IikuS3EoYykuQygiRm88MSwyPiIpLmIoSC5CNyhhLG5ldyBILk41KGIuQygiQDwwPiIpLktxKGMpLkMo
-Ik41PDEsMj4iKSkpKX0sCkZsOmZ1bmN0aW9uKGEsYil7cmV0dXJuIG5ldyBILk41KGEuQygiQDwwPiIp
-LktxKGIpLkMoIk41PDEsMj4iKSl9LApMczpmdW5jdGlvbihhKXtyZXR1cm4gbmV3IFAuYjYoYS5DKCJi
-NjwwPiIpKX0sClQyOmZ1bmN0aW9uKCl7dmFyIHQ9T2JqZWN0LmNyZWF0ZShudWxsKQp0WyI8bm9uLWlk
-ZW50aWZpZXIta2V5PiJdPXQKZGVsZXRlIHRbIjxub24taWRlbnRpZmllci1rZXk+Il0KcmV0dXJuIHR9
-LApyajpmdW5jdGlvbihhLGIsYyl7dmFyIHQ9bmV3IFAubG0oYSxiLGMuQygibG08MD4iKSkKdC5jPWEu
-ZQpyZXR1cm4gdH0sCkVQOmZ1bmN0aW9uKGEsYixjKXt2YXIgdCxzCmlmKFAuaEIoYSkpe2lmKGI9PT0i
-KCImJmM9PT0iKSIpcmV0dXJuIiguLi4pIgpyZXR1cm4gYisiLi4uIitjfXQ9SC5WTShbXSx1LnMpCkMu
-Tm0uaSgkLnhnLGEpCnRyeXtQLlZyKGEsdCl9ZmluYWxseXtpZigwPj0kLnhnLmxlbmd0aClyZXR1cm4g
-SC5PSCgkLnhnLC0xKQokLnhnLnBvcCgpfXM9UC52ZyhiLHUuUi5iKHQpLCIsICIpK2MKcmV0dXJuIHMu
-Y2hhckNvZGVBdCgwKT09MD9zOnN9LApXRTpmdW5jdGlvbihhLGIsYyl7dmFyIHQscwppZihQLmhCKGEp
-KXJldHVybiBiKyIuLi4iK2MKdD1uZXcgUC5SbihiKQpDLk5tLmkoJC54ZyxhKQp0cnl7cz10CnMuYT1Q
-LnZnKHMuYSxhLCIsICIpfWZpbmFsbHl7aWYoMD49JC54Zy5sZW5ndGgpcmV0dXJuIEguT0goJC54Zywt
-MSkKJC54Zy5wb3AoKX10LmErPWMKcz10LmEKcmV0dXJuIHMuY2hhckNvZGVBdCgwKT09MD9zOnN9LApo
-QjpmdW5jdGlvbihhKXt2YXIgdCxzCmZvcih0PSQueGcubGVuZ3RoLHM9MDtzPHQ7KytzKWlmKGE9PT0k
-LnhnW3NdKXJldHVybiEwCnJldHVybiExfSwKVnI6ZnVuY3Rpb24oYSxiKXt2YXIgdCxzLHIscSxwLG8s
-bixtPWEuZ2t6KGEpLGw9MCxrPTAKd2hpbGUoITApe2lmKCEobDw4MHx8azwzKSlicmVhawppZighbS5G
-KCkpcmV0dXJuCnQ9SC5kKG0uZ2woKSkKQy5ObS5pKGIsdCkKbCs9dC5sZW5ndGgrMjsrK2t9aWYoIW0u
-RigpKXtpZihrPD01KXJldHVybgppZigwPj1iLmxlbmd0aClyZXR1cm4gSC5PSChiLC0xKQpzPWIucG9w
-KCkKaWYoMD49Yi5sZW5ndGgpcmV0dXJuIEguT0goYiwtMSkKcj1iLnBvcCgpfWVsc2V7cT1tLmdsKCk7
-KytrCmlmKCFtLkYoKSl7aWYoazw9NCl7Qy5ObS5pKGIsSC5kKHEpKQpyZXR1cm59cz1ILmQocSkKaWYo
-MD49Yi5sZW5ndGgpcmV0dXJuIEguT0goYiwtMSkKcj1iLnBvcCgpCmwrPXMubGVuZ3RoKzJ9ZWxzZXtw
-PW0uZ2woKTsrK2sKZm9yKDttLkYoKTtxPXAscD1vKXtvPW0uZ2woKTsrK2sKaWYoaz4xMDApe3doaWxl
-KCEwKXtpZighKGw+NzUmJms+MykpYnJlYWsKaWYoMD49Yi5sZW5ndGgpcmV0dXJuIEguT0goYiwtMSkK
-bC09Yi5wb3AoKS5sZW5ndGgrMjstLWt9Qy5ObS5pKGIsIi4uLiIpCnJldHVybn19cj1ILmQocSkKcz1I
-LmQocCkKbCs9cy5sZW5ndGgrci5sZW5ndGgrNH19aWYoaz5iLmxlbmd0aCsyKXtsKz01Cm49Ii4uLiJ9
-ZWxzZSBuPW51bGwKd2hpbGUoITApe2lmKCEobD44MCYmYi5sZW5ndGg+MykpYnJlYWsKaWYoMD49Yi5s
-ZW5ndGgpcmV0dXJuIEguT0goYiwtMSkKbC09Yi5wb3AoKS5sZW5ndGgrMgppZihuPT1udWxsKXtsKz01
-Cm49Ii4uLiJ9fWlmKG4hPW51bGwpQy5ObS5pKGIsbikKQy5ObS5pKGIscikKQy5ObS5pKGIscyl9LAp0
-TTpmdW5jdGlvbihhLGIpe3ZhciB0LHMscj1QLkxzKGIpCmZvcih0PWEubGVuZ3RoLHM9MDtzPGEubGVu
-Z3RoO2EubGVuZ3RoPT09dHx8KDAsSC5saykoYSksKytzKXIuaSgwLGIuYihhW3NdKSkKcmV0dXJuIHJ9
-LApuTzpmdW5jdGlvbihhKXt2YXIgdCxzPXt9CmlmKFAuaEIoYSkpcmV0dXJuInsuLi59Igp0PW5ldyBQ
-LlJuKCIiKQp0cnl7Qy5ObS5pKCQueGcsYSkKdC5hKz0ieyIKcy5hPSEwCmEuSygwLG5ldyBQLnJhKHMs
-dCkpCnQuYSs9In0ifWZpbmFsbHl7aWYoMD49JC54Zy5sZW5ndGgpcmV0dXJuIEguT0goJC54ZywtMSkK
-JC54Zy5wb3AoKX1zPXQuYQpyZXR1cm4gcy5jaGFyQ29kZUF0KDApPT0wP3M6c30sCmI2OmZ1bmN0aW9u
-IGI2KGEpe3ZhciBfPXRoaXMKXy5hPTAKXy5mPV8uZT1fLmQ9Xy5jPV8uYj1udWxsCl8ucj0wCl8uJHRp
-PWF9LApibjpmdW5jdGlvbiBibihhKXt0aGlzLmE9YQp0aGlzLmM9dGhpcy5iPW51bGx9LApsbTpmdW5j
-dGlvbiBsbShhLGIsYyl7dmFyIF89dGhpcwpfLmE9YQpfLmI9YgpfLmQ9Xy5jPW51bGwKXy4kdGk9Y30s
-Cm1XOmZ1bmN0aW9uIG1XKCl7fSwKTFU6ZnVuY3Rpb24gTFUoKXt9LApsRDpmdW5jdGlvbiBsRCgpe30s
-CmlsOmZ1bmN0aW9uIGlsKCl7fSwKcmE6ZnVuY3Rpb24gcmEoYSxiKXt0aGlzLmE9YQp0aGlzLmI9Yn0s
-CllrOmZ1bmN0aW9uIFlrKCl7fSwKS1A6ZnVuY3Rpb24gS1AoKXt9LApQbjpmdW5jdGlvbiBQbigpe30s
-CkdqOmZ1bmN0aW9uIEdqKGEsYil7dGhpcy5hPWEKdGhpcy4kdGk9Yn0sCmxmOmZ1bmN0aW9uIGxmKCl7
-fSwKVmo6ZnVuY3Rpb24gVmooKXt9LApYdjpmdW5jdGlvbiBYdigpe30sCm5ZOmZ1bmN0aW9uIG5ZKCl7
-fSwKV1k6ZnVuY3Rpb24gV1koKXt9LApSVTpmdW5jdGlvbiBSVSgpe30sCkJTOmZ1bmN0aW9uKGEsYil7
-dmFyIHQscyxyLHEKaWYodHlwZW9mIGEhPSJzdHJpbmciKXRocm93IEguYihILnRMKGEpKQp0PW51bGwK
-dHJ5e3Q9SlNPTi5wYXJzZShhKX1jYXRjaChyKXtzPUguUnUocikKcT1QLnJyKFN0cmluZyhzKSxudWxs
-LG51bGwpCnRocm93IEguYihxKX1xPVAuUWUodCkKcmV0dXJuIHF9LApRZTpmdW5jdGlvbihhKXt2YXIg
-dAppZihhPT1udWxsKXJldHVybiBudWxsCmlmKHR5cGVvZiBhIT0ib2JqZWN0IilyZXR1cm4gYQppZihP
-YmplY3QuZ2V0UHJvdG90eXBlT2YoYSkhPT1BcnJheS5wcm90b3R5cGUpcmV0dXJuIG5ldyBQLnV3KGEs
-T2JqZWN0LmNyZWF0ZShudWxsKSkKZm9yKHQ9MDt0PGEubGVuZ3RoOysrdClhW3RdPVAuUWUoYVt0XSkK
-cmV0dXJuIGF9LApreTpmdW5jdGlvbihhLGIsYyxkKXtpZihiIGluc3RhbmNlb2YgVWludDhBcnJheSly
-ZXR1cm4gUC5SUCghMSxiLGMsZCkKcmV0dXJuIG51bGx9LApSUDpmdW5jdGlvbihhLGIsYyxkKXt2YXIg
-dCxzLHI9JC5yZigpCmlmKHI9PW51bGwpcmV0dXJuIG51bGwKdD0wPT09YwppZih0JiYhMClyZXR1cm4g
-UC5PUShyLGIpCnM9Yi5sZW5ndGgKZD1QLmpCKGMsZCxzKQppZih0JiZkPT09cylyZXR1cm4gUC5PUShy
-LGIpCnJldHVybiBQLk9RKHIsYi5zdWJhcnJheShjLGQpKX0sCk9ROmZ1bmN0aW9uKGEsYil7aWYoUC5C
-ZShiKSlyZXR1cm4gbnVsbApyZXR1cm4gUC5KaChhLGIpfSwKSmg6ZnVuY3Rpb24oYSxiKXt2YXIgdCxz
-CnRyeXt0PWEuZGVjb2RlKGIpCnJldHVybiB0fWNhdGNoKHMpe0guUnUocyl9cmV0dXJuIG51bGx9LApC
-ZTpmdW5jdGlvbihhKXt2YXIgdCxzPWEubGVuZ3RoLTIKZm9yKHQ9MDt0PHM7Kyt0KWlmKGFbdF09PT0y
-MzcpaWYoKGFbdCsxXSYyMjQpPT09MTYwKXJldHVybiEwCnJldHVybiExfSwKV0k6ZnVuY3Rpb24oKXt2
-YXIgdCxzCnRyeXt0PW5ldyBUZXh0RGVjb2RlcigidXRmLTgiLHtmYXRhbDp0cnVlfSkKcmV0dXJuIHR9
-Y2F0Y2gocyl7SC5SdShzKX1yZXR1cm4gbnVsbH0sCmNQOmZ1bmN0aW9uKGEsYixjKXt2YXIgdCxzLHIK
-Zm9yKHQ9Si5VNihhKSxzPWI7czxjOysrcyl7cj10LnEoYSxzKQppZih0eXBlb2YgciE9PSJudW1iZXIi
-KXJldHVybiByLnpNKCkKaWYoKHImMTI3KSE9PXIpcmV0dXJuIHMtYn1yZXR1cm4gYy1ifSwKeE06ZnVu
-Y3Rpb24oYSxiLGMsZCxlLGYpe2lmKEMuam4uelkoZiw0KSE9PTApdGhyb3cgSC5iKFAucnIoIkludmFs
-aWQgYmFzZTY0IHBhZGRpbmcsIHBhZGRlZCBsZW5ndGggbXVzdCBiZSBtdWx0aXBsZSBvZiBmb3VyLCBp
-cyAiK2YsYSxjKSkKaWYoZCtlIT09Zil0aHJvdyBILmIoUC5ycigiSW52YWxpZCBiYXNlNjQgcGFkZGlu
-ZywgJz0nIG5vdCBhdCB0aGUgZW5kIixhLGIpKQppZihlPjIpdGhyb3cgSC5iKFAucnIoIkludmFsaWQg
-YmFzZTY0IHBhZGRpbmcsIG1vcmUgdGhhbiB0d28gJz0nIGNoYXJhY3RlcnMiLGEsYikpfSwKdXc6ZnVu
-Y3Rpb24gdXcoYSxiKXt0aGlzLmE9YQp0aGlzLmI9Ygp0aGlzLmM9bnVsbH0sCmk4OmZ1bmN0aW9uIGk4
-KGEpe3RoaXMuYT1hfSwKQ1Y6ZnVuY3Rpb24gQ1YoKXt9LApVODpmdW5jdGlvbiBVOCgpe30sClVrOmZ1
-bmN0aW9uIFVrKCl7fSwKd0k6ZnVuY3Rpb24gd0koKXt9LApaaTpmdW5jdGlvbiBaaSgpe30sCmJ5OmZ1
-bmN0aW9uIGJ5KCl7fSwKTXg6ZnVuY3Rpb24gTXgoYSl7dGhpcy5hPWF9LAp1NTpmdW5jdGlvbiB1NSgp
-e30sCkUzOmZ1bmN0aW9uIEUzKCl7fSwKUnc6ZnVuY3Rpb24gUncoYSl7dGhpcy5iPTAKdGhpcy5jPWF9
-LApHWTpmdW5jdGlvbiBHWShhKXt0aGlzLmE9YX0sCmJ6OmZ1bmN0aW9uIGJ6KGEsYil7dmFyIF89dGhp
-cwpfLmE9YQpfLmI9YgpfLmM9ITAKXy5mPV8uZT1fLmQ9MH0sClFBOmZ1bmN0aW9uKGEsYixjKXt2YXIg
-dD1ILkhwKGEsYykKaWYodCE9bnVsbClyZXR1cm4gdAppZihiIT1udWxsKXJldHVybiBiLiQxKGEpCnRo
-cm93IEguYihQLnJyKGEsbnVsbCxudWxsKSl9LApGOmZ1bmN0aW9uKGEpe2lmKGEgaW5zdGFuY2VvZiBI
-LlRwKXJldHVybiBhLncoMCkKcmV0dXJuIkluc3RhbmNlIG9mICciK0guZChILk0oYSkpKyInIn0sCk84
-OmZ1bmN0aW9uKGEsYixjKXt2YXIgdCxzPUouUWkoYSxjKQppZihhIT09MCYmITApZm9yKHQ9MDt0PHMu
-bGVuZ3RoOysrdClDLk5tLlkocyx0LGIpCnJldHVybiBzfSwKQ0g6ZnVuY3Rpb24oYSxiLGMpe3ZhciB0
-LHM9SC5WTShbXSxjLkMoImpkPDA+IikpCmZvcih0PUouSVQoYSk7dC5GKCk7KUMuTm0uaShzLGMuYih0
-LmdsKCkpKQppZihiKXJldHVybiBzCnJldHVybiBjLkMoInpNPDA+IikuYihKLkVwKHMpKX0sCkFGOmZ1
-bmN0aW9uKGEsYil7cmV0dXJuIGIuQygiek08MD4iKS5iKEouekMoUC5DSChhLCExLGIpKSl9LApITTpm
-dW5jdGlvbihhLGIsYyl7dmFyIHQKaWYoQXJyYXkuaXNBcnJheShhKSl7dS50LmIoYSkKdD1hLmxlbmd0
-aApjPVAuakIoYixjLHQpCnJldHVybiBILmVUKGI+MHx8Yzx0P0MuTm0uRDYoYSxiLGMpOmEpfWlmKHUu
-Ym0uYyhhKSlyZXR1cm4gSC5mdyhhLGIsUC5qQihiLGMsYS5sZW5ndGgpKQpyZXR1cm4gUC5idyhhLGIs
-Yyl9LApPbzpmdW5jdGlvbihhKXtyZXR1cm4gSC5MdyhhKX0sCmJ3OmZ1bmN0aW9uKGEsYixjKXt2YXIg
-dCxzLHIscSxwPW51bGwKaWYoYjwwKXRocm93IEguYihQLlRFKGIsMCxKLkhtKGEpLHAscCkpCnQ9Yz09
-bnVsbAppZighdCYmYzxiKXRocm93IEguYihQLlRFKGMsYixKLkhtKGEpLHAscCkpCnM9Si5JVChhKQpm
-b3Iocj0wO3I8YjsrK3IpaWYoIXMuRigpKXRocm93IEguYihQLlRFKGIsMCxyLHAscCkpCnE9W10KaWYo
-dClmb3IoO3MuRigpOylxLnB1c2gocy5nbCgpKQplbHNlIGZvcihyPWI7cjxjOysrcil7aWYoIXMuRigp
-KXRocm93IEguYihQLlRFKGMsYixyLHAscCkpCnEucHVzaChzLmdsKCkpfXJldHVybiBILmVUKHEpfSwK
-bnU6ZnVuY3Rpb24oYSl7cmV0dXJuIG5ldyBILlZSKGEsSC52NChhLCExLCEwLCExLCExLCExKSl9LAp2
-ZzpmdW5jdGlvbihhLGIsYyl7dmFyIHQ9Si5JVChiKQppZighdC5GKCkpcmV0dXJuIGEKaWYoYy5sZW5n
-dGg9PT0wKXtkbyBhKz1ILmQodC5nbCgpKQp3aGlsZSh0LkYoKSl9ZWxzZXthKz1ILmQodC5nbCgpKQpm
-b3IoO3QuRigpOylhPWErYytILmQodC5nbCgpKX1yZXR1cm4gYX0sCmxyOmZ1bmN0aW9uKGEsYixjLGQp
-e3JldHVybiBuZXcgUC5tcChhLGIsYyxkKX0sCnVvOmZ1bmN0aW9uKCl7dmFyIHQ9SC5NMCgpCmlmKHQh
-PW51bGwpcmV0dXJuIFAuaEsodCkKdGhyb3cgSC5iKFAuTDQoIidVcmkuYmFzZScgaXMgbm90IHN1cHBv
-cnRlZCIpKX0sCmVQOmZ1bmN0aW9uKGEsYixjLGQpe3ZhciB0LHMscixxLHAsbyxuPSIwMTIzNDU2Nzg5
-QUJDREVGIgppZihjPT09Qy54TSl7dD0kLno0KCkuYgppZih0eXBlb2YgYiE9InN0cmluZyIpSC52aChI
-LnRMKGIpKQp0PXQudGVzdChiKX1lbHNlIHQ9ITEKaWYodClyZXR1cm4gYgpILkxoKGMpLkMoIlVrLlMi
-KS5iKGIpCnM9Yy5nWkUoKS5XSihiKQpmb3IodD1zLmxlbmd0aCxyPTAscT0iIjtyPHQ7KytyKXtwPXNb
-cl0KaWYocDwxMjgpe289cD4+PjQKaWYobz49OClyZXR1cm4gSC5PSChhLG8pCm89KGFbb10mMTw8KHAm
-MTUpKSE9PTB9ZWxzZSBvPSExCmlmKG8pcSs9SC5MdyhwKQplbHNlIHE9ZCYmcD09PTMyP3ErIisiOnEr
-IiUiK25bcD4+PjQmMTVdK25bcCYxNV19cmV0dXJuIHEuY2hhckNvZGVBdCgwKT09MD9xOnF9LApHcTpm
-dW5jdGlvbihhKXt2YXIgdD1NYXRoLmFicyhhKSxzPWE8MD8iLSI6IiIKaWYodD49MTAwMClyZXR1cm4i
-IithCmlmKHQ+PTEwMClyZXR1cm4gcysiMCIrdAppZih0Pj0xMClyZXR1cm4gcysiMDAiK3QKcmV0dXJu
-IHMrIjAwMCIrdH0sClZ4OmZ1bmN0aW9uKGEpe2lmKGE+PTEwMClyZXR1cm4iIithCmlmKGE+PTEwKXJl
-dHVybiIwIithCnJldHVybiIwMCIrYX0sCmgwOmZ1bmN0aW9uKGEpe2lmKGE+PTEwKXJldHVybiIiK2EK
-cmV0dXJuIjAiK2F9LApwOmZ1bmN0aW9uKGEpe2lmKHR5cGVvZiBhPT0ibnVtYmVyInx8SC5sKGEpfHxu
-dWxsPT1hKXJldHVybiBKLmooYSkKaWYodHlwZW9mIGE9PSJzdHJpbmciKXJldHVybiBKU09OLnN0cmlu
-Z2lmeShhKQpyZXR1cm4gUC5GKGEpfSwKaFY6ZnVuY3Rpb24oYSl7cmV0dXJuIG5ldyBQLkM2KGEpfSwK
-eFk6ZnVuY3Rpb24oYSl7cmV0dXJuIG5ldyBQLnUoITEsbnVsbCxudWxsLGEpfSwKTDM6ZnVuY3Rpb24o
-YSxiLGMpe3JldHVybiBuZXcgUC51KCEwLGEsYixjKX0sCkVlOmZ1bmN0aW9uKGEpe3JldHVybiBuZXcg
-UC51KCExLG51bGwsYSwiTXVzdCBub3QgYmUgbnVsbCIpfSwKeDpmdW5jdGlvbihhLGIpe3JldHVybiBu
-ZXcgUC5iSihudWxsLG51bGwsITAsYSxiLCJWYWx1ZSBub3QgaW4gcmFuZ2UiKX0sClRFOmZ1bmN0aW9u
-KGEsYixjLGQsZSl7cmV0dXJuIG5ldyBQLmJKKGIsYywhMCxhLGQsIkludmFsaWQgdmFsdWUiKX0sCndB
-OmZ1bmN0aW9uKGEsYixjLGQpe2lmKGE8Ynx8YT5jKXRocm93IEguYihQLlRFKGEsYixjLGQsbnVsbCkp
-fSwKakI6ZnVuY3Rpb24oYSxiLGMpe2lmKDA+YXx8YT5jKXRocm93IEguYihQLlRFKGEsMCxjLCJzdGFy
-dCIsbnVsbCkpCmlmKGIhPW51bGwpe2lmKGE+Ynx8Yj5jKXRocm93IEguYihQLlRFKGIsYSxjLCJlbmQi
-LG51bGwpKQpyZXR1cm4gYn1yZXR1cm4gY30sCmsxOmZ1bmN0aW9uKGEsYil7aWYodHlwZW9mIGEhPT0i
-bnVtYmVyIilyZXR1cm4gYS5KKCkKaWYoYTwwKXRocm93IEguYihQLlRFKGEsMCxudWxsLGIsbnVsbCkp
-fSwKQ2Y6ZnVuY3Rpb24oYSxiLGMsZCxlKXt2YXIgdD1ILlNjKGU9PW51bGw/Si5IbShiKTplKQpyZXR1
-cm4gbmV3IFAuZVkodCwhMCxhLGMsIkluZGV4IG91dCBvZiByYW5nZSIpfSwKTDQ6ZnVuY3Rpb24oYSl7
-cmV0dXJuIG5ldyBQLnViKGEpfSwKU1k6ZnVuY3Rpb24oYSl7cmV0dXJuIG5ldyBQLmRzKGEpfSwKUFY6
-ZnVuY3Rpb24oYSl7cmV0dXJuIG5ldyBQLmxqKGEpfSwKYTQ6ZnVuY3Rpb24oYSl7cmV0dXJuIG5ldyBQ
-LlVWKGEpfSwKcnI6ZnVuY3Rpb24oYSxiLGMpe3JldHVybiBuZXcgUC5hRShhLGIsYyl9LApkSDpmdW5j
-dGlvbihhLGIsYyxkKXt2YXIgdCxzPUguVk0oW10sZC5DKCJqZDwwPiIpKQpDLk5tLnNBKHMsYSkKZm9y
-KHQ9MDt0PGE7Kyt0KUMuTm0uWShzLHQsYi4kMSh0KSkKcmV0dXJuIHN9LApoSzpmdW5jdGlvbihhKXt2
-YXIgdCxzLHIscSxwLG8sbixtLGwsayxqLGksaCxnLGYsZT1udWxsLGQ9YS5sZW5ndGgKaWYoZD49NSl7
-dD0oKEouUXooYSw0KV41OCkqM3xDLnhCLlcoYSwwKV4xMDB8Qy54Qi5XKGEsMSleOTd8Qy54Qi5XKGEs
-MileMTE2fEMueEIuVyhhLDMpXjk3KT4+PjAKaWYodD09PTApcmV0dXJuIFAuS0QoZDxkP0MueEIuTmoo
-YSwwLGQpOmEsNSxlKS5nbFIoKQplbHNlIGlmKHQ9PT0zMilyZXR1cm4gUC5LRChDLnhCLk5qKGEsNSxk
-KSwwLGUpLmdsUigpfXM9bmV3IEFycmF5KDgpCnMuZml4ZWQkbGVuZ3RoPUFycmF5CnI9SC5WTShzLHUu
-dCkKQy5ObS5ZKHIsMCwwKQpDLk5tLlkociwxLC0xKQpDLk5tLlkociwyLC0xKQpDLk5tLlkociw3LC0x
-KQpDLk5tLlkociwzLDApCkMuTm0uWShyLDQsMCkKQy5ObS5ZKHIsNSxkKQpDLk5tLlkociw2LGQpCmlm
-KFAuVUIoYSwwLGQsMCxyKT49MTQpQy5ObS5ZKHIsNyxkKQpxPXJbMV0KaWYodHlwZW9mIHEhPT0ibnVt
-YmVyIilyZXR1cm4gcS50QigpCmlmKHE+PTApaWYoUC5VQihhLDAscSwyMCxyKT09PTIwKXJbN109cQpz
-PXJbMl0KaWYodHlwZW9mIHMhPT0ibnVtYmVyIilyZXR1cm4gcy5oKCkKcD1zKzEKbz1yWzNdCm49cls0
-XQptPXJbNV0KbD1yWzZdCmlmKHR5cGVvZiBsIT09Im51bWJlciIpcmV0dXJuIGwuSigpCmlmKHR5cGVv
-ZiBtIT09Im51bWJlciIpcmV0dXJuIEgucFkobSkKaWYobDxtKW09bAppZih0eXBlb2YgbiE9PSJudW1i
-ZXIiKXJldHVybiBuLkooKQppZihuPHApbj1tCmVsc2UgaWYobjw9cSluPXErMQppZih0eXBlb2YgbyE9
-PSJudW1iZXIiKXJldHVybiBvLkooKQppZihvPHApbz1uCnM9cls3XQppZih0eXBlb2YgcyE9PSJudW1i
-ZXIiKXJldHVybiBzLkooKQprPXM8MAppZihrKWlmKHA+cSszKXtqPWUKaz0hMX1lbHNle3M9bz4wCmlm
-KHMmJm8rMT09PW4pe2o9ZQprPSExfWVsc2V7aWYoIShtPGQmJm09PT1uKzImJkoucTAoYSwiLi4iLG4p
-KSlpPW0+bisyJiZKLnEwKGEsIi8uLiIsbS0zKQplbHNlIGk9ITAKaWYoaSl7aj1lCms9ITF9ZWxzZXtp
-ZihxPT09NClpZihKLnEwKGEsImZpbGUiLDApKXtpZihwPD0wKXtpZighQy54Qi5RaShhLCIvIixuKSl7
-aD0iZmlsZTovLy8iCnQ9M31lbHNle2g9ImZpbGU6Ly8iCnQ9Mn1hPWgrQy54Qi5OaihhLG4sZCkKcS09
-MApzPXQtMAptKz1zCmwrPXMKZD1hLmxlbmd0aApwPTcKbz03Cm49N31lbHNlIGlmKG49PT1tKXtnPW0r
-MTsrK2wKYT1DLnhCLmk3KGEsbixtLCIvIik7KytkCm09Z31qPSJmaWxlIn1lbHNlIGlmKEMueEIuUWko
-YSwiaHR0cCIsMCkpe2lmKHMmJm8rMz09PW4mJkMueEIuUWkoYSwiODAiLG8rMSkpe2Y9bi0zCm0tPTMK
-bC09MwphPUMueEIuaTcoYSxvLG4sIiIpCmQtPTMKbj1mfWo9Imh0dHAifWVsc2Ugaj1lCmVsc2UgaWYo
-cT09PTUmJkoucTAoYSwiaHR0cHMiLDApKXtpZihzJiZvKzQ9PT1uJiZKLnEwKGEsIjQ0MyIsbysxKSl7
-Zj1uLTQKbS09NApsLT00CmE9Si55UShhLG8sbiwiIikKZC09MwpuPWZ9aj0iaHR0cHMifWVsc2Ugaj1l
-Cms9ITB9fX1lbHNlIGo9ZQppZihrKXtzPWEubGVuZ3RoCmlmKGQ8cyl7YT1KLmxkKGEsMCxkKQpxLT0w
-CnAtPTAKby09MApuLT0wCm0tPTAKbC09MH1yZXR1cm4gbmV3IFAuVWYoYSxxLHAsbyxuLG0sbCxqKX1y
-ZXR1cm4gUC5qdihhLDAsZCxxLHAsbyxuLG0sbCxqKX0sCk10OmZ1bmN0aW9uKGEpe0gueShhKQpyZXR1
-cm4gUC5rdShhLDAsYS5sZW5ndGgsQy54TSwhMSl9LApXWDpmdW5jdGlvbihhKXt2YXIgdD11Lk4KcmV0
-dXJuIEMuTm0uTjAoSC5WTShhLnNwbGl0KCImIiksdS5zKSxQLkZsKHQsdCksbmV3IFAubjEoQy54TSks
-dS5mKX0sCkhoOmZ1bmN0aW9uKGEsYixjKXt2YXIgdCxzLHIscSxwLG8sbixtPW51bGwsbD0iSVB2NCBh
-ZGRyZXNzIHNob3VsZCBjb250YWluIGV4YWN0bHkgNCBwYXJ0cyIsaz0iZWFjaCBwYXJ0IG11c3QgYmUg
-aW4gdGhlIHJhbmdlIDAuLjI1NSIsaj1uZXcgUC5jUyhhKSxpPW5ldyBVaW50OEFycmF5KDQpCmZvcih0
-PWkubGVuZ3RoLHM9YixyPXMscT0wO3M8YzsrK3Mpe3A9Qy54Qi5tKGEscykKaWYocCE9PTQ2KXtpZigo
-cF40OCk+OSlqLiQyKCJpbnZhbGlkIGNoYXJhY3RlciIscyl9ZWxzZXtpZihxPT09MylqLiQyKGwscykK
-bz1QLlFBKEMueEIuTmooYSxyLHMpLG0sbSkKaWYodHlwZW9mIG8hPT0ibnVtYmVyIilyZXR1cm4gby5v
-cygpCmlmKG8+MjU1KWouJDIoayxyKQpuPXErMQppZihxPj10KXJldHVybiBILk9IKGkscSkKaVtxXT1v
-CnI9cysxCnE9bn19aWYocSE9PTMpai4kMihsLGMpCm89UC5RQShDLnhCLk5qKGEscixjKSxtLG0pCmlm
-KHR5cGVvZiBvIT09Im51bWJlciIpcmV0dXJuIG8ub3MoKQppZihvPjI1NSlqLiQyKGsscikKaWYocT49
-dClyZXR1cm4gSC5PSChpLHEpCmlbcV09bwpyZXR1cm4gaX0sCmVnOmZ1bmN0aW9uKGEsYixhMCl7dmFy
-IHQscyxyLHEscCxvLG4sbSxsLGssaixpLGgsZyxmLGUsZD1uZXcgUC5WQyhhKSxjPW5ldyBQLnRwKGQs
-YSkKaWYoYS5sZW5ndGg8MilkLiQxKCJhZGRyZXNzIGlzIHRvbyBzaG9ydCIpCnQ9SC5WTShbXSx1LnQp
-CmZvcihzPWIscj1zLHE9ITEscD0hMTtzPGEwOysrcyl7bz1DLnhCLm0oYSxzKQppZihvPT09NTgpe2lm
-KHM9PT1iKXsrK3MKaWYoQy54Qi5tKGEscykhPT01OClkLiQyKCJpbnZhbGlkIHN0YXJ0IGNvbG9uLiIs
-cykKcj1zfWlmKHM9PT1yKXtpZihxKWQuJDIoIm9ubHkgb25lIHdpbGRjYXJkIGA6OmAgaXMgYWxsb3dl
-ZCIscykKQy5ObS5pKHQsLTEpCnE9ITB9ZWxzZSBDLk5tLmkodCxjLiQyKHIscykpCnI9cysxfWVsc2Ug
-aWYobz09PTQ2KXA9ITB9aWYodC5sZW5ndGg9PT0wKWQuJDEoInRvbyBmZXcgcGFydHMiKQpuPXI9PT1h
-MAptPUMuTm0uZ3JaKHQpCmlmKG4mJm0hPT0tMSlkLiQyKCJleHBlY3RlZCBhIHBhcnQgYWZ0ZXIgbGFz
-dCBgOmAiLGEwKQppZighbilpZighcClDLk5tLmkodCxjLiQyKHIsYTApKQplbHNle2w9UC5IaChhLHIs
-YTApCkMuTm0uaSh0LChsWzBdPDw4fGxbMV0pPj4+MCkKQy5ObS5pKHQsKGxbMl08PDh8bFszXSk+Pj4w
-KX1pZihxKXtpZih0Lmxlbmd0aD43KWQuJDEoImFuIGFkZHJlc3Mgd2l0aCBhIHdpbGRjYXJkIG11c3Qg
-aGF2ZSBsZXNzIHRoYW4gNyBwYXJ0cyIpfWVsc2UgaWYodC5sZW5ndGghPT04KWQuJDEoImFuIGFkZHJl
-c3Mgd2l0aG91dCBhIHdpbGRjYXJkIG11c3QgY29udGFpbiBleGFjdGx5IDggcGFydHMiKQprPW5ldyBV
-aW50OEFycmF5KDE2KQpmb3IobT10Lmxlbmd0aCxqPWsubGVuZ3RoLGk9OS1tLHM9MCxoPTA7czxtOysr
-cyl7Zz10W3NdCmlmKGc9PT0tMSlmb3IoZj0wO2Y8aTsrK2Ype2lmKGg8MHx8aD49ailyZXR1cm4gSC5P
-SChrLGgpCmtbaF09MAplPWgrMQppZihlPj1qKXJldHVybiBILk9IKGssZSkKa1tlXT0wCmgrPTJ9ZWxz
-ZXtlPUMuam4ud0coZyw4KQppZihoPDB8fGg+PWopcmV0dXJuIEguT0goayxoKQprW2hdPWUKZT1oKzEK
-aWYoZT49ailyZXR1cm4gSC5PSChrLGUpCmtbZV09ZyYyNTUKaCs9Mn19cmV0dXJuIGt9LApqdjpmdW5j
-dGlvbihhLGIsYyxkLGUsZixnLGgsaSxqKXt2YXIgdCxzLHIscSxwLG8sbixtPW51bGwKaWYoaj09bnVs
-bClpZihkPmIpaj1QLlBpKGEsYixkKQplbHNle2lmKGQ9PT1iKVAuUjMoYSxiLCJJbnZhbGlkIGVtcHR5
-IHNjaGVtZSIpCmo9IiJ9aWYoZT5iKXt0PWQrMwpzPXQ8ZT9QLnpSKGEsdCxlLTEpOiIiCnI9UC5PZShh
-LGUsZiwhMSkKaWYodHlwZW9mIGYhPT0ibnVtYmVyIilyZXR1cm4gZi5oKCkKcT1mKzEKaWYodHlwZW9m
-IGchPT0ibnVtYmVyIilyZXR1cm4gSC5wWShnKQpwPXE8Zz9QLndCKFAuUUEoSi5sZChhLHEsZyksbmV3
-IFAuZTEoYSxmKSxtKSxqKTptfWVsc2V7cD1tCnI9cApzPSIifW89UC5rYShhLGcsaCxtLGosciE9bnVs
-bCkKaWYodHlwZW9mIGghPT0ibnVtYmVyIilyZXR1cm4gaC5KKCkKbj1oPGk/UC5sZShhLGgrMSxpLG0p
-Om0KcmV0dXJuIG5ldyBQLkRuKGoscyxyLHAsbyxuLGk8Yz9QLnRHKGEsaSsxLGMpOm0pfSwKd0s6ZnVu
-Y3Rpb24oYSl7aWYoYT09PSJodHRwIilyZXR1cm4gODAKaWYoYT09PSJodHRwcyIpcmV0dXJuIDQ0Mwpy
-ZXR1cm4gMH0sClIzOmZ1bmN0aW9uKGEsYixjKXt0aHJvdyBILmIoUC5ycihjLGEsYikpfSwKa0U6ZnVu
-Y3Rpb24oYSxiKXtDLk5tLksoYSxuZXcgUC5OWSghMSkpfSwKSE46ZnVuY3Rpb24oYSxiLGMpe3ZhciB0
-LHMscgpmb3IodD1ILnFDKGEsYyxudWxsLEgudDYoYSkuZCksdD1uZXcgSC5hNyh0LHQuZ0EodCksdC4k
-dGkuQygiYTc8YUwuRT4iKSk7dC5GKCk7KXtzPXQuZApyPVAubnUoJ1siKi86PD4/XFxcXHxdJykKcy50
-b1N0cmluZwppZihILm0yKHMsciwwKSl7dD1QLkw0KCJJbGxlZ2FsIGNoYXJhY3RlciBpbiBwYXRoOiAi
-K3MpCnRocm93IEguYih0KX19fSwKcmc6ZnVuY3Rpb24oYSxiKXt2YXIgdAppZighKDY1PD1hJiZhPD05
-MCkpdD05Nzw9YSYmYTw9MTIyCmVsc2UgdD0hMAppZih0KXJldHVybgp0PVAuTDQoIklsbGVnYWwgZHJp
-dmUgbGV0dGVyICIrUC5PbyhhKSkKdGhyb3cgSC5iKHQpfSwKd0I6ZnVuY3Rpb24oYSxiKXtpZihhIT1u
-dWxsJiZhPT09UC53SyhiKSlyZXR1cm4gbnVsbApyZXR1cm4gYX0sCk9lOmZ1bmN0aW9uKGEsYixjLGQp
-e3ZhciB0LHMscixxLHAsbwppZihhPT1udWxsKXJldHVybiBudWxsCmlmKGI9PT1jKXJldHVybiIiCmlm
-KEMueEIubShhLGIpPT09OTEpe2lmKHR5cGVvZiBjIT09Im51bWJlciIpcmV0dXJuIGMuSE4oKQp0PWMt
-MQppZihDLnhCLm0oYSx0KSE9PTkzKVAuUjMoYSxiLCJNaXNzaW5nIGVuZCBgXWAgdG8gbWF0Y2ggYFtg
-IGluIGhvc3QiKQpzPWIrMQpyPVAudG8oYSxzLHQpCmlmKHR5cGVvZiByIT09Im51bWJlciIpcmV0dXJu
-IHIuSigpCmlmKHI8dCl7cT1yKzEKcD1QLk9BKGEsQy54Qi5RaShhLCIyNSIscSk/ciszOnEsdCwiJTI1
-Iil9ZWxzZSBwPSIiClAuZWcoYSxzLHIpCnJldHVybiBDLnhCLk5qKGEsYixyKS50b0xvd2VyQ2FzZSgp
-K3ArIl0ifWlmKHR5cGVvZiBjIT09Im51bWJlciIpcmV0dXJuIEgucFkoYykKbz1iCmZvcig7bzxjOysr
-bylpZihDLnhCLm0oYSxvKT09PTU4KXtyPUMueEIuWFUoYSwiJSIsYikKaWYoIShyPj1iJiZyPGMpKXI9
-YwppZihyPGMpe3E9cisxCnA9UC5PQShhLEMueEIuUWkoYSwiMjUiLHEpP3IrMzpxLGMsIiUyNSIpfWVs
-c2UgcD0iIgpQLmVnKGEsYixyKQpyZXR1cm4iWyIrQy54Qi5OaihhLGIscikrcCsiXSJ9cmV0dXJuIFAu
-T0woYSxiLGMpfSwKdG86ZnVuY3Rpb24oYSxiLGMpe3ZhciB0LHM9Qy54Qi5YVShhLCIlIixiKQppZihz
-Pj1iKXtpZih0eXBlb2YgYyE9PSJudW1iZXIiKXJldHVybiBILnBZKGMpCnQ9czxjfWVsc2UgdD0hMQpy
-ZXR1cm4gdD9zOmN9LApPQTpmdW5jdGlvbihhLGIsYyxkKXt2YXIgdCxzLHIscSxwLG8sbixtLGwsaz1k
-IT09IiI/bmV3IFAuUm4oZCk6bnVsbAppZih0eXBlb2YgYyE9PSJudW1iZXIiKXJldHVybiBILnBZKGMp
-CnQ9YgpzPXQKcj0hMApmb3IoO3Q8Yzspe3E9Qy54Qi5tKGEsdCkKaWYocT09PTM3KXtwPVAucnYoYSx0
-LCEwKQpvPXA9PW51bGwKaWYobyYmcil7dCs9Mwpjb250aW51ZX1pZihrPT1udWxsKWs9bmV3IFAuUm4o
-IiIpCm49ay5hKz1DLnhCLk5qKGEscyx0KQppZihvKXA9Qy54Qi5OaihhLHQsdCszKQplbHNlIGlmKHA9
-PT0iJSIpUC5SMyhhLHQsIlpvbmVJRCBzaG91bGQgbm90IGNvbnRhaW4gJSBhbnltb3JlIikKay5hPW4r
-cAp0Kz0zCnM9dApyPSEwfWVsc2V7aWYocTwxMjcpe289cT4+PjQKaWYobz49OClyZXR1cm4gSC5PSChD
-LkYzLG8pCm89KEMuRjNbb10mMTw8KHEmMTUpKSE9PTB9ZWxzZSBvPSExCmlmKG8pe2lmKHImJjY1PD1x
-JiY5MD49cSl7aWYoaz09bnVsbClrPW5ldyBQLlJuKCIiKQppZihzPHQpe2suYSs9Qy54Qi5OaihhLHMs
-dCkKcz10fXI9ITF9Kyt0fWVsc2V7aWYoKHEmNjQ1MTIpPT09NTUyOTYmJnQrMTxjKXttPUMueEIubShh
-LHQrMSkKaWYoKG0mNjQ1MTIpPT09NTYzMjApe3E9NjU1MzZ8KHEmMTAyMyk8PDEwfG0mMTAyMwpsPTJ9
-ZWxzZSBsPTF9ZWxzZSBsPTEKaWYoaz09bnVsbClrPW5ldyBQLlJuKCIiKQprLmErPUMueEIuTmooYSxz
-LHQpCmsuYSs9UC5ISChxKQp0Kz1sCnM9dH19fWlmKGs9PW51bGwpcmV0dXJuIEMueEIuTmooYSxiLGMp
-CmlmKHM8YylrLmErPUMueEIuTmooYSxzLGMpCm89ay5hCnJldHVybiBvLmNoYXJDb2RlQXQoMCk9PTA/
-bzpvfSwKT0w6ZnVuY3Rpb24oYSxiLGMpe3ZhciB0LHMscixxLHAsbyxuLG0sbCxrLGoKaWYodHlwZW9m
-IGMhPT0ibnVtYmVyIilyZXR1cm4gSC5wWShjKQp0PWIKcz10CnI9bnVsbApxPSEwCmZvcig7dDxjOyl7
-cD1DLnhCLm0oYSx0KQppZihwPT09Mzcpe289UC5ydihhLHQsITApCm49bz09bnVsbAppZihuJiZxKXt0
-Kz0zCmNvbnRpbnVlfWlmKHI9PW51bGwpcj1uZXcgUC5SbigiIikKbT1DLnhCLk5qKGEscyx0KQpsPXIu
-YSs9IXE/bS50b0xvd2VyQ2FzZSgpOm0KaWYobil7bz1DLnhCLk5qKGEsdCx0KzMpCms9M31lbHNlIGlm
-KG89PT0iJSIpe289IiUyNSIKaz0xfWVsc2Ugaz0zCnIuYT1sK28KdCs9awpzPXQKcT0hMH1lbHNle2lm
-KHA8MTI3KXtuPXA+Pj40CmlmKG4+PTgpcmV0dXJuIEguT0goQy5lYSxuKQpuPShDLmVhW25dJjE8PChw
-JjE1KSkhPT0wfWVsc2Ugbj0hMQppZihuKXtpZihxJiY2NTw9cCYmOTA+PXApe2lmKHI9PW51bGwpcj1u
-ZXcgUC5SbigiIikKaWYoczx0KXtyLmErPUMueEIuTmooYSxzLHQpCnM9dH1xPSExfSsrdH1lbHNle2lm
-KHA8PTkzKXtuPXA+Pj40CmlmKG4+PTgpcmV0dXJuIEguT0goQy5hayxuKQpuPShDLmFrW25dJjE8PChw
-JjE1KSkhPT0wfWVsc2Ugbj0hMQppZihuKVAuUjMoYSx0LCJJbnZhbGlkIGNoYXJhY3RlciIpCmVsc2V7
-aWYoKHAmNjQ1MTIpPT09NTUyOTYmJnQrMTxjKXtqPUMueEIubShhLHQrMSkKaWYoKGomNjQ1MTIpPT09
-NTYzMjApe3A9NjU1MzZ8KHAmMTAyMyk8PDEwfGomMTAyMwprPTJ9ZWxzZSBrPTF9ZWxzZSBrPTEKaWYo
-cj09bnVsbClyPW5ldyBQLlJuKCIiKQptPUMueEIuTmooYSxzLHQpCnIuYSs9IXE/bS50b0xvd2VyQ2Fz
-ZSgpOm0Kci5hKz1QLkhIKHApCnQrPWsKcz10fX19fWlmKHI9PW51bGwpcmV0dXJuIEMueEIuTmooYSxi
-LGMpCmlmKHM8Yyl7bT1DLnhCLk5qKGEscyxjKQpyLmErPSFxP20udG9Mb3dlckNhc2UoKTptfW49ci5h
-CnJldHVybiBuLmNoYXJDb2RlQXQoMCk9PTA/bjpufSwKUGk6ZnVuY3Rpb24oYSxiLGMpe3ZhciB0LHMs
-cixxCmlmKGI9PT1jKXJldHVybiIiCmlmKCFQLkV0KEouclkoYSkuVyhhLGIpKSlQLlIzKGEsYiwiU2No
-ZW1lIG5vdCBzdGFydGluZyB3aXRoIGFscGhhYmV0aWMgY2hhcmFjdGVyIikKZm9yKHQ9YixzPSExO3Q8
-YzsrK3Qpe3I9Qy54Qi5XKGEsdCkKaWYocjwxMjgpe3E9cj4+PjQKaWYocT49OClyZXR1cm4gSC5PSChD
-Lm1LLHEpCnE9KEMubUtbcV0mMTw8KHImMTUpKSE9PTB9ZWxzZSBxPSExCmlmKCFxKVAuUjMoYSx0LCJJ
-bGxlZ2FsIHNjaGVtZSBjaGFyYWN0ZXIiKQppZig2NTw9ciYmcjw9OTApcz0hMH1hPUMueEIuTmooYSxi
-LGMpCnJldHVybiBQLllhKHM/YS50b0xvd2VyQ2FzZSgpOmEpfSwKWWE6ZnVuY3Rpb24oYSl7aWYoYT09
-PSJodHRwIilyZXR1cm4iaHR0cCIKaWYoYT09PSJmaWxlIilyZXR1cm4iZmlsZSIKaWYoYT09PSJodHRw
-cyIpcmV0dXJuImh0dHBzIgppZihhPT09InBhY2thZ2UiKXJldHVybiJwYWNrYWdlIgpyZXR1cm4gYX0s
-CnpSOmZ1bmN0aW9uKGEsYixjKXtpZihhPT1udWxsKXJldHVybiIiCnJldHVybiBQLnVPKGEsYixjLEMu
-dG8sITEpfSwKa2E6ZnVuY3Rpb24oYSxiLGMsZCxlLGYpe3ZhciB0LHM9ZT09PSJmaWxlIixyPXN8fGYs
-cT1hPT1udWxsCmlmKHEmJiEwKXJldHVybiBzPyIvIjoiIgp0PSFxP1AudU8oYSxiLGMsQy5XZCwhMCk6
-Qy5qTi5FMihkLG5ldyBQLlJaKCksdS5OKS5IKDAsIi8iKQppZih0Lmxlbmd0aD09PTApe2lmKHMpcmV0
-dXJuIi8ifWVsc2UgaWYociYmIUMueEIubih0LCIvIikpdD0iLyIrdApyZXR1cm4gUC5Kcih0LGUsZil9
-LApKcjpmdW5jdGlvbihhLGIsYyl7dmFyIHQ9Yi5sZW5ndGg9PT0wCmlmKHQmJiFjJiYhQy54Qi5uKGEs
-Ii8iKSlyZXR1cm4gUC53RihhLCF0fHxjKQpyZXR1cm4gUC54ZShhKX0sCmxlOmZ1bmN0aW9uKGEsYixj
-LGQpe3ZhciB0LHM9e30KaWYoYSE9bnVsbCl7aWYoZCE9bnVsbCl0aHJvdyBILmIoUC54WSgiQm90aCBx
-dWVyeSBhbmQgcXVlcnlQYXJhbWV0ZXJzIHNwZWNpZmllZCIpKQpyZXR1cm4gUC51TyhhLGIsYyxDLlZD
-LCEwKX1pZihkPT1udWxsKXJldHVybiBudWxsCnQ9bmV3IFAuUm4oIiIpCnMuYT0iIgpkLksoMCxuZXcg
-UC55NShuZXcgUC5NRShzLHQpKSkKcz10LmEKcmV0dXJuIHMuY2hhckNvZGVBdCgwKT09MD9zOnN9LAp0
-RzpmdW5jdGlvbihhLGIsYyl7aWYoYT09bnVsbClyZXR1cm4gbnVsbApyZXR1cm4gUC51TyhhLGIsYyxD
-LlZDLCEwKX0sCnJ2OmZ1bmN0aW9uKGEsYixjKXt2YXIgdCxzLHIscSxwLG89YisyCmlmKG8+PWEubGVu
-Z3RoKXJldHVybiIlIgp0PUMueEIubShhLGIrMSkKcz1DLnhCLm0oYSxvKQpyPUgub28odCkKcT1ILm9v
-KHMpCmlmKHI8MHx8cTwwKXJldHVybiIlIgpwPXIqMTYrcQppZihwPDEyNyl7bz1DLmpuLndHKHAsNCkK
-aWYobz49OClyZXR1cm4gSC5PSChDLkYzLG8pCm89KEMuRjNbb10mMTw8KHAmMTUpKSE9PTB9ZWxzZSBv
-PSExCmlmKG8pcmV0dXJuIEguTHcoYyYmNjU8PXAmJjkwPj1wPyhwfDMyKT4+PjA6cCkKaWYodD49OTd8
-fHM+PTk3KXJldHVybiBDLnhCLk5qKGEsYixiKzMpLnRvVXBwZXJDYXNlKCkKcmV0dXJuIG51bGx9LApI
-SDpmdW5jdGlvbihhKXt2YXIgdCxzLHIscSxwLG8sbj0iMDEyMzQ1Njc4OUFCQ0RFRiIKaWYoYTwxMjgp
-e3Q9bmV3IEFycmF5KDMpCnQuZml4ZWQkbGVuZ3RoPUFycmF5CnM9SC5WTSh0LHUudCkKQy5ObS5ZKHMs
-MCwzNykKQy5ObS5ZKHMsMSxDLnhCLlcobixhPj4+NCkpCkMuTm0uWShzLDIsQy54Qi5XKG4sYSYxNSkp
-fWVsc2V7aWYoYT4yMDQ3KWlmKGE+NjU1MzUpe3I9MjQwCnE9NH1lbHNle3I9MjI0CnE9M31lbHNle3I9
-MTkyCnE9Mn10PW5ldyBBcnJheSgzKnEpCnQuZml4ZWQkbGVuZ3RoPUFycmF5CnM9SC5WTSh0LHUudCkK
-Zm9yKHA9MDstLXEscT49MDtyPTEyOCl7bz1DLmpuLmJmKGEsNipxKSY2M3xyCkMuTm0uWShzLHAsMzcp
-CkMuTm0uWShzLHArMSxDLnhCLlcobixvPj4+NCkpCkMuTm0uWShzLHArMixDLnhCLlcobixvJjE1KSkK
-cCs9M319cmV0dXJuIFAuSE0ocywwLG51bGwpfSwKdU86ZnVuY3Rpb24oYSxiLGMsZCxlKXt2YXIgdD1Q
-LlVsKGEsYixjLGQsZSkKcmV0dXJuIHQ9PW51bGw/Qy54Qi5OaihhLGIsYyk6dH0sClVsOmZ1bmN0aW9u
-KGEsYixjLGQsZSl7dmFyIHQscyxyLHEscCxvPW51bGwsbj0hZSxtPWIsbD1tLGs9bwp3aGlsZSghMCl7
-aWYodHlwZW9mIG0hPT0ibnVtYmVyIilyZXR1cm4gbS5KKCkKaWYodHlwZW9mIGMhPT0ibnVtYmVyIily
-ZXR1cm4gSC5wWShjKQppZighKG08YykpYnJlYWsKYyQwOnt0PUMueEIubShhLG0pCmlmKHQ8MTI3KXtz
-PXQ+Pj40CmlmKHM+PTgpcmV0dXJuIEguT0goZCxzKQpzPShkW3NdJjE8PCh0JjE1KSkhPT0wfWVsc2Ug
-cz0hMQppZihzKSsrbQplbHNle2lmKHQ9PT0zNyl7cj1QLnJ2KGEsbSwhMSkKaWYocj09bnVsbCl7bSs9
-MwpicmVhayBjJDB9aWYoIiUiPT09cil7cj0iJTI1IgpxPTF9ZWxzZSBxPTN9ZWxzZXtpZihuKWlmKHQ8
-PTkzKXtzPXQ+Pj40CmlmKHM+PTgpcmV0dXJuIEguT0goQy5hayxzKQpzPShDLmFrW3NdJjE8PCh0JjE1
-KSkhPT0wfWVsc2Ugcz0hMQplbHNlIHM9ITEKaWYocyl7UC5SMyhhLG0sIkludmFsaWQgY2hhcmFjdGVy
-IikKcT1vCnI9cX1lbHNle2lmKCh0JjY0NTEyKT09PTU1Mjk2KXtzPW0rMQppZihzPGMpe3A9Qy54Qi5t
-KGEscykKaWYoKHAmNjQ1MTIpPT09NTYzMjApe3Q9NjU1MzZ8KHQmMTAyMyk8PDEwfHAmMTAyMwpxPTJ9
-ZWxzZSBxPTF9ZWxzZSBxPTF9ZWxzZSBxPTEKcj1QLkhIKHQpfX1pZihrPT1udWxsKWs9bmV3IFAuUm4o
-IiIpCmsuYSs9Qy54Qi5OaihhLGwsbSkKay5hKz1ILmQocikKaWYodHlwZW9mIHEhPT0ibnVtYmVyIily
-ZXR1cm4gSC5wWShxKQptKz1xCmw9bX19fWlmKGs9PW51bGwpcmV0dXJuIG8KaWYodHlwZW9mIGwhPT0i
-bnVtYmVyIilyZXR1cm4gbC5KKCkKaWYobDxjKWsuYSs9Qy54Qi5OaihhLGwsYykKbj1rLmEKcmV0dXJu
-IG4uY2hhckNvZGVBdCgwKT09MD9uOm59LAp5QjpmdW5jdGlvbihhKXtpZihDLnhCLm4oYSwiLiIpKXJl
-dHVybiEwCnJldHVybiBDLnhCLk9ZKGEsIi8uIikhPT0tMX0sCnhlOmZ1bmN0aW9uKGEpe3ZhciB0LHMs
-cixxLHAsbyxuCmlmKCFQLnlCKGEpKXJldHVybiBhCnQ9SC5WTShbXSx1LnMpCmZvcihzPWEuc3BsaXQo
-Ii8iKSxyPXMubGVuZ3RoLHE9ITEscD0wO3A8cjsrK3Ape289c1twXQppZihKLlJNKG8sIi4uIikpe249
-dC5sZW5ndGgKaWYobiE9PTApe2lmKDA+PW4pcmV0dXJuIEguT0godCwtMSkKdC5wb3AoKQppZih0Lmxl
+cGUKcmV0dXJuIGF9aWYoYSBpbnN0YW5jZW9mIFAuTWgpcmV0dXJuIGEKcmV0dXJuIEoua3MoYSl9LApV
+NjpmdW5jdGlvbihhKXtpZih0eXBlb2YgYT09InN0cmluZyIpcmV0dXJuIEouRHIucHJvdG90eXBlCmlm
+KGE9PW51bGwpcmV0dXJuIGEKaWYoYS5jb25zdHJ1Y3Rvcj09QXJyYXkpcmV0dXJuIEouamQucHJvdG90
+eXBlCmlmKHR5cGVvZiBhIT0ib2JqZWN0Iil7aWYodHlwZW9mIGE9PSJmdW5jdGlvbiIpcmV0dXJuIEou
+YzUucHJvdG90eXBlCnJldHVybiBhfWlmKGEgaW5zdGFuY2VvZiBQLk1oKXJldHVybiBhCnJldHVybiBK
+LmtzKGEpfSwKaWE6ZnVuY3Rpb24oYSl7aWYodHlwZW9mIGE9PSJudW1iZXIiKXtpZihNYXRoLmZsb29y
+KGEpPT1hKXJldHVybiBKLnVyLnByb3RvdHlwZQpyZXR1cm4gSi5WQS5wcm90b3R5cGV9aWYodHlwZW9m
+IGE9PSJzdHJpbmciKXJldHVybiBKLkRyLnByb3RvdHlwZQppZihhPT1udWxsKXJldHVybiBKLllFLnBy
+b3RvdHlwZQppZih0eXBlb2YgYT09ImJvb2xlYW4iKXJldHVybiBKLnlFLnByb3RvdHlwZQppZihhLmNv
+bnN0cnVjdG9yPT1BcnJheSlyZXR1cm4gSi5qZC5wcm90b3R5cGUKaWYodHlwZW9mIGEhPSJvYmplY3Qi
+KXtpZih0eXBlb2YgYT09ImZ1bmN0aW9uIilyZXR1cm4gSi5jNS5wcm90b3R5cGUKcmV0dXJuIGF9aWYo
+YSBpbnN0YW5jZW9mIFAuTWgpcmV0dXJuIGEKcmV0dXJuIEoua3MoYSl9LApyWTpmdW5jdGlvbihhKXtp
+Zih0eXBlb2YgYT09InN0cmluZyIpcmV0dXJuIEouRHIucHJvdG90eXBlCmlmKGE9PW51bGwpcmV0dXJu
+IGEKaWYoIShhIGluc3RhbmNlb2YgUC5NaCkpcmV0dXJuIEoua2QucHJvdG90eXBlCnJldHVybiBhfSwK
+dzE6ZnVuY3Rpb24oYSl7aWYoYT09bnVsbClyZXR1cm4gYQppZihhLmNvbnN0cnVjdG9yPT1BcnJheSly
+ZXR1cm4gSi5qZC5wcm90b3R5cGUKaWYodHlwZW9mIGEhPSJvYmplY3QiKXtpZih0eXBlb2YgYT09ImZ1
+bmN0aW9uIilyZXR1cm4gSi5jNS5wcm90b3R5cGUKcmV0dXJuIGF9aWYoYSBpbnN0YW5jZW9mIFAuTWgp
+cmV0dXJuIGEKcmV0dXJuIEoua3MoYSl9LApBYzpmdW5jdGlvbihhKXtyZXR1cm4gSi5pYShhKS5aKGEp
+fSwKQ006ZnVuY3Rpb24oYSxiLGMsZCl7cmV0dXJuIEouUkUoYSkuZHUoYSxiLGMsZCl9LApGTDpmdW5j
+dGlvbihhLGIpe3JldHVybiBKLnJZKGEpLmRkKGEsYil9LApHQTpmdW5jdGlvbihhLGIpe3JldHVybiBK
+LncxKGEpLkUoYSxiKX0sCkdyOmZ1bmN0aW9uKGEpe3JldHVybiBKLlJFKGEpLmdtVyhhKX0sCkg6ZnVu
+Y3Rpb24oYSl7cmV0dXJuIEouVTYoYSkuZ0EoYSl9LApJVDpmdW5jdGlvbihhKXtyZXR1cm4gSi53MShh
+KS5na3ooYSl9LApKeTpmdW5jdGlvbihhLGIpe3JldHVybiBKLmlhKGEpLmU3KGEsYil9LApLVjpmdW5j
+dGlvbihhLGIpe3JldHVybiBKLnJZKGEpLkcoYSxiKX0sCkx0OmZ1bmN0aW9uKGEpe3JldHVybiBKLlJF
+KGEpLndnKGEpfSwKTTE6ZnVuY3Rpb24oYSxiLGMpe3JldHVybiBKLncxKGEpLkUyKGEsYixjKX0sClF6
+OmZ1bmN0aW9uKGEsYil7cmV0dXJuIEouclkoYSkuVyhhLGIpfSwKUk06ZnVuY3Rpb24oYSxiKXtpZihh
+PT1udWxsKXJldHVybiBiPT1udWxsCmlmKHR5cGVvZiBhIT0ib2JqZWN0IilyZXR1cm4gYiE9bnVsbCYm
+YT09PWIKcmV0dXJuIEouaWEoYSkuRE4oYSxiKX0sClQwOmZ1bmN0aW9uKGEpe3JldHVybiBKLnJZKGEp
+LmJTKGEpfSwKYTY6ZnVuY3Rpb24oYSxiKXtyZXR1cm4gSi5yWShhKS5tKGEsYil9LApiVDpmdW5jdGlv
+bihhKXtyZXR1cm4gSi5SRShhKS5ENChhKX0sCmNIOmZ1bmN0aW9uKGEpe3JldHVybiBKLnJZKGEpLmhj
+KGEpfSwKZFI6ZnVuY3Rpb24oYSl7cmV0dXJuIEouUkUoYSkuZ0QoYSl9LApkWjpmdW5jdGlvbihhLGIs
+YyxkKXtyZXR1cm4gSi5SRShhKS5PbihhLGIsYyxkKX0sCmRnOmZ1bmN0aW9uKGEsYixjLGQpe3JldHVy
+biBKLnJZKGEpLmk3KGEsYixjLGQpfSwKZGg6ZnVuY3Rpb24oYSl7cmV0dXJuIEouUkUoYSkudG4oYSl9
+LApoZjpmdW5jdGlvbihhKXtyZXR1cm4gSi5pYShhKS5naU8oYSl9LAppZzpmdW5jdGlvbihhKXtyZXR1
+cm4gSi5SRShhKS5nUWcoYSl9LApsNTpmdW5jdGlvbihhLGIpe3JldHVybiBKLlJFKGEpLnNoZihhLGIp
+fSwKbGQ6ZnVuY3Rpb24oYSxiLGMpe3JldHVybiBKLnJZKGEpLncoYSxiLGMpfSwKbTpmdW5jdGlvbihh
+LGIpe2lmKHR5cGVvZiBhPT0ibnVtYmVyIiYmdHlwZW9mIGI9PSJudW1iZXIiKXJldHVybiBhK2IKcmV0
+dXJuIEouVEooYSkuaChhLGIpfSwKcDQ6ZnVuY3Rpb24oYSxiKXtyZXR1cm4gSi5yWShhKS5UYyhhLGIp
+fSwKcTA6ZnVuY3Rpb24oYSxiLGMpe3JldHVybiBKLnJZKGEpLlFpKGEsYixjKX0sCnFGOmZ1bmN0aW9u
+KGEpe3JldHVybiBKLlJFKGEpLmdWbChhKX0sCnRIOmZ1bmN0aW9uKGEsYixjKXtyZXR1cm4gSi5SRShh
+KS5wayhhLGIsYyl9LAp4OTpmdW5jdGlvbihhLGIpe2lmKHR5cGVvZiBiPT09Im51bWJlciIpaWYoYS5j
+b25zdHJ1Y3Rvcj09QXJyYXl8fHR5cGVvZiBhPT0ic3RyaW5nInx8SC53VihhLGFbdi5kaXNwYXRjaFBy
+b3BlcnR5TmFtZV0pKWlmKGI+Pj4wPT09YiYmYjxhLmxlbmd0aClyZXR1cm4gYVtiXQpyZXR1cm4gSi5V
+NihhKS5xKGEsYil9LAp6bDpmdW5jdGlvbihhLGIpe3JldHVybiBKLlU2KGEpLnRnKGEsYil9LAp2Qjpm
+dW5jdGlvbiB2Qigpe30sCnlFOmZ1bmN0aW9uIHlFKCl7fSwKWUU6ZnVuY3Rpb24gWUUoKXt9LApNRjpm
+dW5jdGlvbiBNRigpe30sCmlDOmZ1bmN0aW9uIGlDKCl7fSwKa2Q6ZnVuY3Rpb24ga2QoKXt9LApjNTpm
+dW5jdGlvbiBjNSgpe30sCmpkOmZ1bmN0aW9uIGpkKGEpe3RoaXMuJHRpPWF9LApQbzpmdW5jdGlvbiBQ
+byhhKXt0aGlzLiR0aT1hfSwKbTE6ZnVuY3Rpb24gbTEoYSxiLGMpe3ZhciBfPXRoaXMKXy5hPWEKXy5i
+PWIKXy5jPTAKXy5kPW51bGwKXy4kdGk9Y30sCnFJOmZ1bmN0aW9uIHFJKCl7fSwKdXI6ZnVuY3Rpb24g
+dXIoKXt9LApWQTpmdW5jdGlvbiBWQSgpe30sCkRyOmZ1bmN0aW9uIERyKCl7fX0sUD17Ck9qOmZ1bmN0
+aW9uKCl7dmFyIHQscyxyPXt9CmlmKHNlbGYuc2NoZWR1bGVJbW1lZGlhdGUhPW51bGwpcmV0dXJuIFAu
+RVgoKQppZihzZWxmLk11dGF0aW9uT2JzZXJ2ZXIhPW51bGwmJnNlbGYuZG9jdW1lbnQhPW51bGwpe3Q9
+c2VsZi5kb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKQpzPXNlbGYuZG9jdW1lbnQuY3JlYXRlRWxl
+bWVudCgic3BhbiIpCnIuYT1udWxsCm5ldyBzZWxmLk11dGF0aW9uT2JzZXJ2ZXIoSC50UihuZXcgUC50
+aChyKSwxKSkub2JzZXJ2ZSh0LHtjaGlsZExpc3Q6dHJ1ZX0pCnJldHVybiBuZXcgUC5oYShyLHQscyl9
+ZWxzZSBpZihzZWxmLnNldEltbWVkaWF0ZSE9bnVsbClyZXR1cm4gUC55dCgpCnJldHVybiBQLnFXKCl9
+LApaVjpmdW5jdGlvbihhKXtzZWxmLnNjaGVkdWxlSW1tZWRpYXRlKEgudFIobmV3IFAuVnModS5NLmEo
+YSkpLDApKX0sCm9BOmZ1bmN0aW9uKGEpe3NlbGYuc2V0SW1tZWRpYXRlKEgudFIobmV3IFAuRnQodS5N
+LmEoYSkpLDApKX0sCkJ6OmZ1bmN0aW9uKGEpe3UuTS5hKGEpClAuUU4oMCxhKX0sClFOOmZ1bmN0aW9u
+KGEsYil7dmFyIHQ9bmV3IFAuVzMoKQp0LkNZKGEsYikKcmV0dXJuIHR9LApGWDpmdW5jdGlvbihhKXty
+ZXR1cm4gbmV3IFAuaWgobmV3IFAudnMoJC5YMyxhLkMoInZzPDA+IikpLGEuQygiaWg8MD4iKSl9LApE
+STpmdW5jdGlvbihhLGIpe2EuJDIoMCxudWxsKQpiLmI9ITAKcmV0dXJuIGIuYX0sCmpROmZ1bmN0aW9u
+KGEsYil7UC5KZShhLGIpfSwKeUM6ZnVuY3Rpb24oYSxiKXtiLmFNKDAsYSl9LApmMzpmdW5jdGlvbihh
+LGIpe2IudzAoSC5SdShhKSxILnRzKGEpKX0sCkplOmZ1bmN0aW9uKGEsYil7dmFyIHQscyxyPW5ldyBQ
+LldNKGIpLHE9bmV3IFAuU1goYikKaWYoYSBpbnN0YW5jZW9mIFAudnMpYS5RZChyLHEsdS56KQplbHNl
+e3Q9dS56CmlmKHUuYy5iKGEpKWEuU3EocixxLHQpCmVsc2V7cz1uZXcgUC52cygkLlgzLHUuXykKcy5h
+PTQKcy5jPWEKcy5RZChyLHEsdCl9fX0sCmx6OmZ1bmN0aW9uKGEpe3ZhciB0PWZ1bmN0aW9uKGIsYyl7
+cmV0dXJuIGZ1bmN0aW9uKGQsZSl7d2hpbGUodHJ1ZSl0cnl7YihkLGUpCmJyZWFrfWNhdGNoKHMpe2U9
+cwpkPWN9fX0oYSwxKQpyZXR1cm4gJC5YMy5MaihuZXcgUC5Hcyh0KSx1LlAsdS5TLHUueil9LApHUTpm
+dW5jdGlvbihhKXtyZXR1cm4gbmV3IFAuRnkoYSwxKX0sClRoOmZ1bmN0aW9uKCl7cmV0dXJuIEMud1F9
+LApZbTpmdW5jdGlvbihhKXtyZXR1cm4gbmV3IFAuRnkoYSwzKX0sCmwwOmZ1bmN0aW9uKGEsYil7cmV0
+dXJuIG5ldyBQLnE0KGEsYi5DKCJxNDwwPiIpKX0sCmszOmZ1bmN0aW9uKGEsYil7dmFyIHQscyxyCmIu
+YT0xCnRyeXthLlNxKG5ldyBQLnBWKGIpLG5ldyBQLlU3KGIpLHUuUCl9Y2F0Y2gocil7dD1ILlJ1KHIp
+CnM9SC50cyhyKQpQLnJiKG5ldyBQLnZyKGIsdCxzKSl9fSwKQTk6ZnVuY3Rpb24oYSxiKXt2YXIgdCxz
+LHIKZm9yKHQ9dS5fO3M9YS5hLHM9PT0yOylhPXQuYShhLmMpCmlmKHM+PTQpe3I9Yi5haCgpCmIuYT1h
+LmEKYi5jPWEuYwpQLkhaKGIscil9ZWxzZXtyPXUueC5hKGIuYykKYi5hPTIKYi5jPWEKYS5qUShyKX19
+LApIWjpmdW5jdGlvbihhLGIpe3ZhciB0LHMscixxLHAsbyxuLG0sbCxrLGosaSxoLGcsZixlPW51bGws
+ZD17fSxjPWQuYT1hCmZvcih0PXUubixzPXUueCxyPXUuYzshMDspe3E9e30KcD1jLmE9PT04CmlmKGI9
+PW51bGwpe2lmKHApe289dC5hKGMuYykKUC5MMihlLGUsYy5iLG8uYSxvLmIpfXJldHVybn1mb3IoO249
+Yi5hLG4hPW51bGw7Yj1uKXtiLmE9bnVsbApQLkhaKGQuYSxiKX1jPWQuYQptPWMuYwpxLmE9cApxLmI9
+bQpsPSFwCmlmKGwpe2s9Yi5jCms9KGsmMSkhPT0wfHwoayYxNSk9PT04fWVsc2Ugaz0hMAppZihrKXtr
+PWIuYgpqPWsuYgppZihwKXtpPWMuYj09PWoKaT0hKGl8fGkpfWVsc2UgaT0hMQppZihpKXt0LmEobSkK
+UC5MMihlLGUsYy5iLG0uYSxtLmIpCnJldHVybn1oPSQuWDMKaWYoaCE9PWopJC5YMz1qCmVsc2UgaD1l
+CmM9Yi5jCmlmKChjJjE1KT09PTgpbmV3IFAuUlQoZCxxLGIscCkuJDAoKQplbHNlIGlmKGwpe2lmKChj
+JjEpIT09MCluZXcgUC5ycShxLGIsbSkuJDAoKX1lbHNlIGlmKChjJjIpIT09MCluZXcgUC5SVyhkLHEs
+YikuJDAoKQppZihoIT1udWxsKSQuWDM9aApjPXEuYgppZihyLmIoYykpe2lmKGMuYT49NCl7Zz1zLmEo
+ay5jKQprLmM9bnVsbApiPWsuTjgoZykKay5hPWMuYQprLmM9Yy5jCmQuYT1jCmNvbnRpbnVlfWVsc2Ug
+UC5BOShjLGspCnJldHVybn19Zj1iLmIKZz1zLmEoZi5jKQpmLmM9bnVsbApiPWYuTjgoZykKYz1xLmEK
+bD1xLmIKaWYoIWMpe2YuJHRpLmMuYShsKQpmLmE9NApmLmM9bH1lbHNle3QuYShsKQpmLmE9OApmLmM9
+bH1kLmE9ZgpjPWZ9fSwKVkg6ZnVuY3Rpb24oYSxiKXt2YXIgdAppZih1LmFnLmIoYSkpcmV0dXJuIGIu
+TGooYSx1LnosdS5LLHUubCkKdD11LkYKaWYodC5iKGEpKXJldHVybiB0LmEoYSkKdGhyb3cgSC5iKFAu
+TDMoYSwib25FcnJvciIsIkVycm9yIGhhbmRsZXIgbXVzdCBhY2NlcHQgb25lIE9iamVjdCBvciBvbmUg
+T2JqZWN0IGFuZCBhIFN0YWNrVHJhY2UgYXMgYXJndW1lbnRzLCBhbmQgcmV0dXJuIGEgYSB2YWxpZCBy
+ZXN1bHQiKSl9LApwdTpmdW5jdGlvbigpe3ZhciB0LHMKZm9yKDt0PSQuUzYsdCE9bnVsbDspeyQubWc9
+bnVsbApzPXQuYgokLlM2PXMKaWYocz09bnVsbCkkLms4PW51bGwKdC5hLiQwKCl9fSwKZU46ZnVuY3Rp
+b24oKXskLlVEPSEwCnRyeXtQLnB1KCl9ZmluYWxseXskLm1nPW51bGwKJC5VRD0hMQppZigkLlM2IT1u
+dWxsKSQudXQoKS4kMShQLlY5KCkpfX0sCmVXOmZ1bmN0aW9uKGEpe3ZhciB0PW5ldyBQLk9NKGEpCmlm
+KCQuUzY9PW51bGwpeyQuUzY9JC5rOD10CmlmKCEkLlVEKSQudXQoKS4kMShQLlY5KCkpfWVsc2UgJC5r
+OD0kLms4LmI9dH0sCnJSOmZ1bmN0aW9uKGEpe3ZhciB0LHMscj0kLlM2CmlmKHI9PW51bGwpe1AuZVco
+YSkKJC5tZz0kLms4CnJldHVybn10PW5ldyBQLk9NKGEpCnM9JC5tZwppZihzPT1udWxsKXt0LmI9cgok
+LlM2PSQubWc9dH1lbHNle3QuYj1zLmIKJC5tZz1zLmI9dAppZih0LmI9PW51bGwpJC5rOD10fX0sCnJi
+OmZ1bmN0aW9uKGEpe3ZhciB0PW51bGwscz0kLlgzCmlmKEMuTlU9PT1zKXtQLlRrKHQsdCxDLk5VLGEp
+CnJldHVybn1QLlRrKHQsdCxzLHUuTS5hKHMuR1koYSkpKX0sClF3OmZ1bmN0aW9uKGEsYil7aWYoYT09
+bnVsbClILnZoKFAuRWUoInN0cmVhbSIpKQpyZXR1cm4gbmV3IFAueEkoYi5DKCJ4STwwPiIpKX0sClRs
+OmZ1bmN0aW9uKGEsYil7dmFyIHQ9Yj09bnVsbD9QLnYwKGEpOmIKUC5VSShhLCJlcnJvciIsdS5LKQpy
+ZXR1cm4gbmV3IFAuT0goYSx0KX0sCnYwOmZ1bmN0aW9uKGEpe3ZhciB0CmlmKHUuVy5iKGEpKXt0PWEu
+Z0lJKCkKaWYodCE9bnVsbClyZXR1cm4gdH1yZXR1cm4gQy5wZH0sCkwyOmZ1bmN0aW9uKGEsYixjLGQs
+ZSl7dmFyIHQ9e30KdC5hPWQKdC5iPWUKaWYoZD09bnVsbCl7dC5hPW5ldyBQLkFUKCExLG51bGwsImVy
+cm9yIiwiTXVzdCBub3QgYmUgbnVsbCIpCnQuYj1QLlpiKCl9UC5yUihuZXcgUC5wSyh0KSl9LApUODpm
+dW5jdGlvbihhLGIsYyxkLGUpe3ZhciB0LHM9JC5YMwppZihzPT09YylyZXR1cm4gZC4kMCgpCiQuWDM9
+Ywp0PXMKdHJ5e3M9ZC4kMCgpCnJldHVybiBzfWZpbmFsbHl7JC5YMz10fX0sCnl2OmZ1bmN0aW9uKGEs
+YixjLGQsZSxmLGcpe3ZhciB0LHM9JC5YMwppZihzPT09YylyZXR1cm4gZC4kMShlKQokLlgzPWMKdD1z
+CnRyeXtzPWQuJDEoZSkKcmV0dXJuIHN9ZmluYWxseXskLlgzPXR9fSwKUXg6ZnVuY3Rpb24oYSxiLGMs
+ZCxlLGYsZyxoLGkpe3ZhciB0LHM9JC5YMwppZihzPT09YylyZXR1cm4gZC4kMihlLGYpCiQuWDM9Ywp0
+PXMKdHJ5e3M9ZC4kMihlLGYpCnJldHVybiBzfWZpbmFsbHl7JC5YMz10fX0sClRrOmZ1bmN0aW9uKGEs
+YixjLGQpe3ZhciB0CnUuTS5hKGQpCnQ9Qy5OVSE9PWMKaWYodClkPSEoIXR8fCExKT9jLkdZKGQpOmMu
+UlQoZCx1LkgpClAuZVcoZCl9LAp0aDpmdW5jdGlvbiB0aChhKXt0aGlzLmE9YX0sCmhhOmZ1bmN0aW9u
+IGhhKGEsYixjKXt0aGlzLmE9YQp0aGlzLmI9Ygp0aGlzLmM9Y30sClZzOmZ1bmN0aW9uIFZzKGEpe3Ro
+aXMuYT1hfSwKRnQ6ZnVuY3Rpb24gRnQoYSl7dGhpcy5hPWF9LApXMzpmdW5jdGlvbiBXMygpe30sCnlI
+OmZ1bmN0aW9uIHlIKGEsYil7dGhpcy5hPWEKdGhpcy5iPWJ9LAppaDpmdW5jdGlvbiBpaChhLGIpe3Ro
+aXMuYT1hCnRoaXMuYj0hMQp0aGlzLiR0aT1ifSwKV006ZnVuY3Rpb24gV00oYSl7dGhpcy5hPWF9LApT
+WDpmdW5jdGlvbiBTWChhKXt0aGlzLmE9YX0sCkdzOmZ1bmN0aW9uIEdzKGEpe3RoaXMuYT1hfSwKRnk6
+ZnVuY3Rpb24gRnkoYSxiKXt0aGlzLmE9YQp0aGlzLmI9Yn0sCkdWOmZ1bmN0aW9uIEdWKGEsYil7dmFy
+IF89dGhpcwpfLmE9YQpfLmQ9Xy5jPV8uYj1udWxsCl8uJHRpPWJ9LApxNDpmdW5jdGlvbiBxNChhLGIp
+e3RoaXMuYT1hCnRoaXMuJHRpPWJ9LApiODpmdW5jdGlvbiBiOCgpe30sClBmOmZ1bmN0aW9uIFBmKCl7
+fSwKWmY6ZnVuY3Rpb24gWmYoYSxiKXt0aGlzLmE9YQp0aGlzLiR0aT1ifSwKRmU6ZnVuY3Rpb24gRmUo
+YSxiLGMsZCxlKXt2YXIgXz10aGlzCl8uYT1udWxsCl8uYj1hCl8uYz1iCl8uZD1jCl8uZT1kCl8uJHRp
+PWV9LAp2czpmdW5jdGlvbiB2cyhhLGIpe3ZhciBfPXRoaXMKXy5hPTAKXy5iPWEKXy5jPW51bGwKXy4k
+dGk9Yn0sCmRhOmZ1bmN0aW9uIGRhKGEsYil7dGhpcy5hPWEKdGhpcy5iPWJ9LApvUTpmdW5jdGlvbiBv
+UShhLGIpe3RoaXMuYT1hCnRoaXMuYj1ifSwKcFY6ZnVuY3Rpb24gcFYoYSl7dGhpcy5hPWF9LApVNzpm
+dW5jdGlvbiBVNyhhKXt0aGlzLmE9YX0sCnZyOmZ1bmN0aW9uIHZyKGEsYixjKXt0aGlzLmE9YQp0aGlz
+LmI9Ygp0aGlzLmM9Y30sCnJIOmZ1bmN0aW9uIHJIKGEsYil7dGhpcy5hPWEKdGhpcy5iPWJ9LApLRjpm
+dW5jdGlvbiBLRihhLGIpe3RoaXMuYT1hCnRoaXMuYj1ifSwKWkw6ZnVuY3Rpb24gWkwoYSxiLGMpe3Ro
+aXMuYT1hCnRoaXMuYj1iCnRoaXMuYz1jfSwKUlQ6ZnVuY3Rpb24gUlQoYSxiLGMsZCl7dmFyIF89dGhp
+cwpfLmE9YQpfLmI9YgpfLmM9YwpfLmQ9ZH0sCmpaOmZ1bmN0aW9uIGpaKGEpe3RoaXMuYT1hfSwKcnE6
+ZnVuY3Rpb24gcnEoYSxiLGMpe3RoaXMuYT1hCnRoaXMuYj1iCnRoaXMuYz1jfSwKUlc6ZnVuY3Rpb24g
+UlcoYSxiLGMpe3RoaXMuYT1hCnRoaXMuYj1iCnRoaXMuYz1jfSwKT006ZnVuY3Rpb24gT00oYSl7dGhp
+cy5hPWEKdGhpcy5iPW51bGx9LApxaDpmdW5jdGlvbiBxaCgpe30sCkI1OmZ1bmN0aW9uIEI1KGEsYil7
+dGhpcy5hPWEKdGhpcy5iPWJ9LApQSTpmdW5jdGlvbiBQSShhLGIpe3RoaXMuYT1hCnRoaXMuYj1ifSwK
+TU86ZnVuY3Rpb24gTU8oKXt9LAprVDpmdW5jdGlvbiBrVCgpe30sCnhJOmZ1bmN0aW9uIHhJKGEpe3Ro
+aXMuJHRpPWF9LApPSDpmdW5jdGlvbiBPSChhLGIpe3RoaXMuYT1hCnRoaXMuYj1ifSwKbTA6ZnVuY3Rp
+b24gbTAoKXt9LApwSzpmdW5jdGlvbiBwSyhhKXt0aGlzLmE9YX0sCkppOmZ1bmN0aW9uIEppKCl7fSwK
+aGo6ZnVuY3Rpb24gaGooYSxiLGMpe3RoaXMuYT1hCnRoaXMuYj1iCnRoaXMuYz1jfSwKVnA6ZnVuY3Rp
+b24gVnAoYSxiKXt0aGlzLmE9YQp0aGlzLmI9Yn0sCk9SOmZ1bmN0aW9uIE9SKGEsYixjKXt0aGlzLmE9
+YQp0aGlzLmI9Ygp0aGlzLmM9Y30sCkVGOmZ1bmN0aW9uKGEsYixjKXtyZXR1cm4gYi5DKCJAPDA+Iiku
+S3EoYykuQygiRm88MSwyPiIpLmEoSC5CNyhhLG5ldyBILk41KGIuQygiQDwwPiIpLktxKGMpLkMoIk41
+PDEsMj4iKSkpKX0sCkZsOmZ1bmN0aW9uKGEsYil7cmV0dXJuIG5ldyBILk41KGEuQygiQDwwPiIpLktx
+KGIpLkMoIk41PDEsMj4iKSl9LApMczpmdW5jdGlvbihhKXtyZXR1cm4gbmV3IFAuYjYoYS5DKCJiNjww
+PiIpKX0sClQyOmZ1bmN0aW9uKCl7dmFyIHQ9T2JqZWN0LmNyZWF0ZShudWxsKQp0WyI8bm9uLWlkZW50
+aWZpZXIta2V5PiJdPXQKZGVsZXRlIHRbIjxub24taWRlbnRpZmllci1rZXk+Il0KcmV0dXJuIHR9LApy
+ajpmdW5jdGlvbihhLGIsYyl7dmFyIHQ9bmV3IFAubG0oYSxiLGMuQygibG08MD4iKSkKdC5jPWEuZQpy
+ZXR1cm4gdH0sCkVQOmZ1bmN0aW9uKGEsYixjKXt2YXIgdCxzCmlmKFAuaEIoYSkpe2lmKGI9PT0iKCIm
+JmM9PT0iKSIpcmV0dXJuIiguLi4pIgpyZXR1cm4gYisiLi4uIitjfXQ9SC5WTShbXSx1LnMpCkMuTm0u
+aSgkLnhnLGEpCnRyeXtQLlZyKGEsdCl9ZmluYWxseXtpZigwPj0kLnhnLmxlbmd0aClyZXR1cm4gSC5r
+KCQueGcsLTEpCiQueGcucG9wKCl9cz1QLnZnKGIsdS5SLmEodCksIiwgIikrYwpyZXR1cm4gcy5jaGFy
+Q29kZUF0KDApPT0wP3M6c30sCldFOmZ1bmN0aW9uKGEsYixjKXt2YXIgdCxzCmlmKFAuaEIoYSkpcmV0
+dXJuIGIrIi4uLiIrYwp0PW5ldyBQLlJuKGIpCkMuTm0uaSgkLnhnLGEpCnRyeXtzPXQKcy5hPVAudmco
+cy5hLGEsIiwgIil9ZmluYWxseXtpZigwPj0kLnhnLmxlbmd0aClyZXR1cm4gSC5rKCQueGcsLTEpCiQu
+eGcucG9wKCl9dC5hKz1jCnM9dC5hCnJldHVybiBzLmNoYXJDb2RlQXQoMCk9PTA/czpzfSwKaEI6ZnVu
+Y3Rpb24oYSl7dmFyIHQscwpmb3IodD0kLnhnLmxlbmd0aCxzPTA7czx0OysrcylpZihhPT09JC54Z1tz
+XSlyZXR1cm4hMApyZXR1cm4hMX0sClZyOmZ1bmN0aW9uKGEsYil7dmFyIHQscyxyLHEscCxvLG4sbT1h
+LmdreihhKSxsPTAsaz0wCndoaWxlKCEwKXtpZighKGw8ODB8fGs8MykpYnJlYWsKaWYoIW0uRigpKXJl
+dHVybgp0PUguZChtLmdsKCkpCkMuTm0uaShiLHQpCmwrPXQubGVuZ3RoKzI7KytrfWlmKCFtLkYoKSl7
+aWYoazw9NSlyZXR1cm4KaWYoMD49Yi5sZW5ndGgpcmV0dXJuIEguayhiLC0xKQpzPWIucG9wKCkKaWYo
+MD49Yi5sZW5ndGgpcmV0dXJuIEguayhiLC0xKQpyPWIucG9wKCl9ZWxzZXtxPW0uZ2woKTsrK2sKaWYo
+IW0uRigpKXtpZihrPD00KXtDLk5tLmkoYixILmQocSkpCnJldHVybn1zPUguZChxKQppZigwPj1iLmxl
+bmd0aClyZXR1cm4gSC5rKGIsLTEpCnI9Yi5wb3AoKQpsKz1zLmxlbmd0aCsyfWVsc2V7cD1tLmdsKCk7
+KytrCmZvcig7bS5GKCk7cT1wLHA9byl7bz1tLmdsKCk7KytrCmlmKGs+MTAwKXt3aGlsZSghMCl7aWYo
+IShsPjc1JiZrPjMpKWJyZWFrCmlmKDA+PWIubGVuZ3RoKXJldHVybiBILmsoYiwtMSkKbC09Yi5wb3Ao
+KS5sZW5ndGgrMjstLWt9Qy5ObS5pKGIsIi4uLiIpCnJldHVybn19cj1ILmQocSkKcz1ILmQocCkKbCs9
+cy5sZW5ndGgrci5sZW5ndGgrNH19aWYoaz5iLmxlbmd0aCsyKXtsKz01Cm49Ii4uLiJ9ZWxzZSBuPW51
+bGwKd2hpbGUoITApe2lmKCEobD44MCYmYi5sZW5ndGg+MykpYnJlYWsKaWYoMD49Yi5sZW5ndGgpcmV0
+dXJuIEguayhiLC0xKQpsLT1iLnBvcCgpLmxlbmd0aCsyCmlmKG49PW51bGwpe2wrPTUKbj0iLi4uIn19
+aWYobiE9bnVsbClDLk5tLmkoYixuKQpDLk5tLmkoYixyKQpDLk5tLmkoYixzKX0sCnRNOmZ1bmN0aW9u
+KGEsYil7dmFyIHQscyxyPVAuTHMoYikKZm9yKHQ9YS5sZW5ndGgscz0wO3M8YS5sZW5ndGg7YS5sZW5n
+dGg9PT10fHwoMCxILmxrKShhKSwrK3Mpci5pKDAsYi5hKGFbc10pKQpyZXR1cm4gcn0sCm5POmZ1bmN0
+aW9uKGEpe3ZhciB0LHM9e30KaWYoUC5oQihhKSlyZXR1cm4iey4uLn0iCnQ9bmV3IFAuUm4oIiIpCnRy
+eXtDLk5tLmkoJC54ZyxhKQp0LmErPSJ7IgpzLmE9ITAKYS5LKDAsbmV3IFAucmEocyx0KSkKdC5hKz0i
+fSJ9ZmluYWxseXtpZigwPj0kLnhnLmxlbmd0aClyZXR1cm4gSC5rKCQueGcsLTEpCiQueGcucG9wKCl9
+cz10LmEKcmV0dXJuIHMuY2hhckNvZGVBdCgwKT09MD9zOnN9LApiNjpmdW5jdGlvbiBiNihhKXt2YXIg
+Xz10aGlzCl8uYT0wCl8uZj1fLmU9Xy5kPV8uYz1fLmI9bnVsbApfLnI9MApfLiR0aT1hfSwKYm46ZnVu
+Y3Rpb24gYm4oYSl7dGhpcy5hPWEKdGhpcy5jPXRoaXMuYj1udWxsfSwKbG06ZnVuY3Rpb24gbG0oYSxi
+LGMpe3ZhciBfPXRoaXMKXy5hPWEKXy5iPWIKXy5kPV8uYz1udWxsCl8uJHRpPWN9LAptVzpmdW5jdGlv
+biBtVygpe30sCkxVOmZ1bmN0aW9uIExVKCl7fSwKbEQ6ZnVuY3Rpb24gbEQoKXt9LAppbDpmdW5jdGlv
+biBpbCgpe30sCnJhOmZ1bmN0aW9uIHJhKGEsYil7dGhpcy5hPWEKdGhpcy5iPWJ9LApZazpmdW5jdGlv
+biBZaygpe30sCnlROmZ1bmN0aW9uIHlRKGEpe3RoaXMuYT1hfSwKS1A6ZnVuY3Rpb24gS1AoKXt9LApQ
+bjpmdW5jdGlvbiBQbigpe30sCkdqOmZ1bmN0aW9uIEdqKGEsYil7dGhpcy5hPWEKdGhpcy4kdGk9Yn0s
+Ck1hOmZ1bmN0aW9uIE1hKCl7fSwKVmo6ZnVuY3Rpb24gVmooKXt9LApYdjpmdW5jdGlvbiBYdigpe30s
+Cm5ZOmZ1bmN0aW9uIG5ZKCl7fSwKVEM6ZnVuY3Rpb24gVEMoKXt9LApSVTpmdW5jdGlvbiBSVSgpe30s
+CkJTOmZ1bmN0aW9uKGEsYil7dmFyIHQscyxyLHEKaWYodHlwZW9mIGEhPSJzdHJpbmciKXRocm93IEgu
+YihILkkoYSkpCnQ9bnVsbAp0cnl7dD1KU09OLnBhcnNlKGEpfWNhdGNoKHIpe3M9SC5SdShyKQpxPVAu
+cnIoU3RyaW5nKHMpLG51bGwsbnVsbCkKdGhyb3cgSC5iKHEpfXE9UC5RZSh0KQpyZXR1cm4gcX0sClFl
+OmZ1bmN0aW9uKGEpe3ZhciB0CmlmKGE9PW51bGwpcmV0dXJuIG51bGwKaWYodHlwZW9mIGEhPSJvYmpl
+Y3QiKXJldHVybiBhCmlmKE9iamVjdC5nZXRQcm90b3R5cGVPZihhKSE9PUFycmF5LnByb3RvdHlwZSly
+ZXR1cm4gbmV3IFAudXcoYSxPYmplY3QuY3JlYXRlKG51bGwpKQpmb3IodD0wO3Q8YS5sZW5ndGg7Kyt0
+KWFbdF09UC5RZShhW3RdKQpyZXR1cm4gYX0sCmt5OmZ1bmN0aW9uKGEsYixjLGQpe2lmKGIgaW5zdGFu
+Y2VvZiBVaW50OEFycmF5KXJldHVybiBQLlJQKCExLGIsYyxkKQpyZXR1cm4gbnVsbH0sClJQOmZ1bmN0
+aW9uKGEsYixjLGQpe3ZhciB0LHMscj0kLnRMKCkKaWYocj09bnVsbClyZXR1cm4gbnVsbAp0PTA9PT1j
+CmlmKHQmJiEwKXJldHVybiBQLk9RKHIsYikKcz1iLmxlbmd0aApkPVAuakIoYyxkLHMpCmlmKHQmJmQ9
+PT1zKXJldHVybiBQLk9RKHIsYikKcmV0dXJuIFAuT1EocixiLnN1YmFycmF5KGMsZCkpfSwKT1E6ZnVu
+Y3Rpb24oYSxiKXtpZihQLkFqKGIpKXJldHVybiBudWxsCnJldHVybiBQLkpoKGEsYil9LApKaDpmdW5j
+dGlvbihhLGIpe3ZhciB0LHMKdHJ5e3Q9YS5kZWNvZGUoYikKcmV0dXJuIHR9Y2F0Y2gocyl7SC5SdShz
+KX1yZXR1cm4gbnVsbH0sCkFqOmZ1bmN0aW9uKGEpe3ZhciB0LHM9YS5sZW5ndGgtMgpmb3IodD0wO3Q8
+czsrK3QpaWYoYVt0XT09PTIzNylpZigoYVt0KzFdJjIyNCk9PT0xNjApcmV0dXJuITAKcmV0dXJuITF9
+LApXSTpmdW5jdGlvbigpe3ZhciB0LHMKdHJ5e3Q9bmV3IFRleHREZWNvZGVyKCJ1dGYtOCIse2ZhdGFs
+OnRydWV9KQpyZXR1cm4gdH1jYXRjaChzKXtILlJ1KHMpfXJldHVybiBudWxsfSwKY1A6ZnVuY3Rpb24o
+YSxiLGMpe3ZhciB0LHMscgpmb3IodD1KLlU2KGEpLHM9YjtzPGM7KytzKXtyPXQucShhLHMpCmlmKHR5
+cGVvZiByIT09Im51bWJlciIpcmV0dXJuIHIuek0oKQppZigociYxMjcpIT09cilyZXR1cm4gcy1ifXJl
+dHVybiBjLWJ9LAp4TTpmdW5jdGlvbihhLGIsYyxkLGUsZil7aWYoQy5qbi56WShmLDQpIT09MCl0aHJv
+dyBILmIoUC5ycigiSW52YWxpZCBiYXNlNjQgcGFkZGluZywgcGFkZGVkIGxlbmd0aCBtdXN0IGJlIG11
+bHRpcGxlIG9mIGZvdXIsIGlzICIrZixhLGMpKQppZihkK2UhPT1mKXRocm93IEguYihQLnJyKCJJbnZh
+bGlkIGJhc2U2NCBwYWRkaW5nLCAnPScgbm90IGF0IHRoZSBlbmQiLGEsYikpCmlmKGU+Mil0aHJvdyBI
+LmIoUC5ycigiSW52YWxpZCBiYXNlNjQgcGFkZGluZywgbW9yZSB0aGFuIHR3byAnPScgY2hhcmFjdGVy
+cyIsYSxiKSl9LAp1dzpmdW5jdGlvbiB1dyhhLGIpe3RoaXMuYT1hCnRoaXMuYj1iCnRoaXMuYz1udWxs
+fSwKaTg6ZnVuY3Rpb24gaTgoYSl7dGhpcy5hPWF9LApDVjpmdW5jdGlvbiBDVigpe30sClU4OmZ1bmN0
+aW9uIFU4KCl7fSwKVWs6ZnVuY3Rpb24gVWsoKXt9LAp3STpmdW5jdGlvbiB3SSgpe30sClppOmZ1bmN0
+aW9uIFppKCl7fSwKYnk6ZnVuY3Rpb24gYnkoKXt9LApNeDpmdW5jdGlvbiBNeChhKXt0aGlzLmE9YX0s
+CnU1OmZ1bmN0aW9uIHU1KCl7fSwKRTM6ZnVuY3Rpb24gRTMoKXt9LApSdzpmdW5jdGlvbiBSdyhhKXt0
+aGlzLmI9MAp0aGlzLmM9YX0sCkdZOmZ1bmN0aW9uIEdZKGEpe3RoaXMuYT1hfSwKYno6ZnVuY3Rpb24g
+YnooYSxiKXt2YXIgXz10aGlzCl8uYT1hCl8uYj1iCl8uYz0hMApfLmY9Xy5lPV8uZD0wfSwKUUE6ZnVu
+Y3Rpb24oYSxiLGMpe3ZhciB0PUguSHAoYSxjKQppZih0IT1udWxsKXJldHVybiB0CmlmKGIhPW51bGwp
+cmV0dXJuIGIuJDEoYSkKdGhyb3cgSC5iKFAucnIoYSxudWxsLG51bGwpKX0sCm9zOmZ1bmN0aW9uKGEp
+e2lmKGEgaW5zdGFuY2VvZiBILlRwKXJldHVybiBhLlooMCkKcmV0dXJuIkluc3RhbmNlIG9mICciK0gu
+ZChILmxoKGEpKSsiJyJ9LApPODpmdW5jdGlvbihhLGIsYyl7dmFyIHQscz1KLlFpKGEsYykKaWYoYSE9
+PTAmJiEwKWZvcih0PTA7dDxzLmxlbmd0aDsrK3QpQy5ObS5ZKHMsdCxiKQpyZXR1cm4gc30sCkNIOmZ1
+bmN0aW9uKGEsYixjKXt2YXIgdCxzPUguVk0oW10sYy5DKCJqZDwwPiIpKQpmb3IodD1KLklUKGEpO3Qu
+RigpOylDLk5tLmkocyxjLmEodC5nbCgpKSkKaWYoYilyZXR1cm4gcwpyZXR1cm4gYy5DKCJ6TTwwPiIp
+LmEoSi5FcChzKSl9LApBRjpmdW5jdGlvbihhLGIpe3JldHVybiBiLkMoInpNPDA+IikuYShKLnVuKFAu
+Q0goYSwhMSxiKSkpfSwKSE06ZnVuY3Rpb24oYSxiLGMpe3ZhciB0CmlmKEFycmF5LmlzQXJyYXkoYSkp
+e3UudC5hKGEpCnQ9YS5sZW5ndGgKYz1QLmpCKGIsYyx0KQpyZXR1cm4gSC5lVChiPjB8fGM8dD9DLk5t
+LkQ2KGEsYixjKTphKX1pZih1LmJtLmIoYSkpcmV0dXJuIEguZncoYSxiLFAuakIoYixjLGEubGVuZ3Ro
+KSkKcmV0dXJuIFAuYncoYSxiLGMpfSwKT286ZnVuY3Rpb24oYSl7cmV0dXJuIEguTHcoYSl9LApidzpm
+dW5jdGlvbihhLGIsYyl7dmFyIHQscyxyLHEscD1udWxsCmlmKGI8MCl0aHJvdyBILmIoUC5URShiLDAs
+Si5IKGEpLHAscCkpCnQ9Yz09bnVsbAppZighdCYmYzxiKXRocm93IEguYihQLlRFKGMsYixKLkgoYSks
+cCxwKSkKcz1KLklUKGEpCmZvcihyPTA7cjxiOysrcilpZighcy5GKCkpdGhyb3cgSC5iKFAuVEUoYiww
+LHIscCxwKSkKcT1bXQppZih0KWZvcig7cy5GKCk7KXEucHVzaChzLmdsKCkpCmVsc2UgZm9yKHI9Yjty
+PGM7KytyKXtpZighcy5GKCkpdGhyb3cgSC5iKFAuVEUoYyxiLHIscCxwKSkKcS5wdXNoKHMuZ2woKSl9
+cmV0dXJuIEguZVQocSl9LApudTpmdW5jdGlvbihhKXtyZXR1cm4gbmV3IEguVlIoYSxILnY0KGEsITEs
+ITAsITEsITEsITEpKX0sCnZnOmZ1bmN0aW9uKGEsYixjKXt2YXIgdD1KLklUKGIpCmlmKCF0LkYoKSly
+ZXR1cm4gYQppZihjLmxlbmd0aD09PTApe2RvIGErPUguZCh0LmdsKCkpCndoaWxlKHQuRigpKX1lbHNl
+e2ErPUguZCh0LmdsKCkpCmZvcig7dC5GKCk7KWE9YStjK0guZCh0LmdsKCkpfXJldHVybiBhfSwKbHI6
+ZnVuY3Rpb24oYSxiLGMsZCl7cmV0dXJuIG5ldyBQLm1wKGEsYixjLGQpfSwKdW86ZnVuY3Rpb24oKXt2
+YXIgdD1ILk0wKCkKaWYodCE9bnVsbClyZXR1cm4gUC5oSyh0KQp0aHJvdyBILmIoUC5MNCgiJ1VyaS5i
+YXNlJyBpcyBub3Qgc3VwcG9ydGVkIikpfSwKZVA6ZnVuY3Rpb24oYSxiLGMsZCl7dmFyIHQscyxyLHEs
+cCxvLG49IjAxMjM0NTY3ODlBQkNERUYiCmlmKGM9PT1DLnhNKXt0PSQuejQoKS5iCmlmKHR5cGVvZiBi
+IT0ic3RyaW5nIilILnZoKEguSShiKSkKdD10LnRlc3QoYil9ZWxzZSB0PSExCmlmKHQpcmV0dXJuIGIK
+SC5MaChjKS5DKCJVay5TIikuYShiKQpzPWMuZ1pFKCkuV0ooYikKZm9yKHQ9cy5sZW5ndGgscj0wLHE9
+IiI7cjx0Oysrcil7cD1zW3JdCmlmKHA8MTI4KXtvPXA+Pj40CmlmKG8+PTgpcmV0dXJuIEguayhhLG8p
+Cm89KGFbb10mMTw8KHAmMTUpKSE9PTB9ZWxzZSBvPSExCmlmKG8pcSs9SC5MdyhwKQplbHNlIHE9ZCYm
+cD09PTMyP3ErIisiOnErIiUiK25bcD4+PjQmMTVdK25bcCYxNV19cmV0dXJuIHEuY2hhckNvZGVBdCgw
+KT09MD9xOnF9LApaYjpmdW5jdGlvbigpe3ZhciB0LHMKaWYoSC5vVCgkLnA2KCkpKXJldHVybiBILnRz
+KG5ldyBFcnJvcigpKQp0cnl7dGhyb3cgSC5iKCIiKX1jYXRjaChzKXtILlJ1KHMpCnQ9SC50cyhzKQpy
+ZXR1cm4gdH19LApHcTpmdW5jdGlvbihhKXt2YXIgdD1NYXRoLmFicyhhKSxzPWE8MD8iLSI6IiIKaWYo
+dD49MTAwMClyZXR1cm4iIithCmlmKHQ+PTEwMClyZXR1cm4gcysiMCIrdAppZih0Pj0xMClyZXR1cm4g
+cysiMDAiK3QKcmV0dXJuIHMrIjAwMCIrdH0sClZ4OmZ1bmN0aW9uKGEpe2lmKGE+PTEwMClyZXR1cm4i
+IithCmlmKGE+PTEwKXJldHVybiIwIithCnJldHVybiIwMCIrYX0sCmgwOmZ1bmN0aW9uKGEpe2lmKGE+
+PTEwKXJldHVybiIiK2EKcmV0dXJuIjAiK2F9LApoOmZ1bmN0aW9uKGEpe2lmKHR5cGVvZiBhPT0ibnVt
+YmVyInx8SC5yUShhKXx8bnVsbD09YSlyZXR1cm4gSi5BYyhhKQppZih0eXBlb2YgYT09InN0cmluZyIp
+cmV0dXJuIEpTT04uc3RyaW5naWZ5KGEpCnJldHVybiBQLm9zKGEpfSwKaFY6ZnVuY3Rpb24oYSl7cmV0
+dXJuIG5ldyBQLkM2KGEpfSwKeFk6ZnVuY3Rpb24oYSl7cmV0dXJuIG5ldyBQLkFUKCExLG51bGwsbnVs
+bCxhKX0sCkwzOmZ1bmN0aW9uKGEsYixjKXtyZXR1cm4gbmV3IFAuQVQoITAsYSxiLGMpfSwKRWU6ZnVu
+Y3Rpb24oYSl7cmV0dXJuIG5ldyBQLkFUKCExLG51bGwsYSwiTXVzdCBub3QgYmUgbnVsbCIpfSwKVUk6
+ZnVuY3Rpb24oYSxiLGMpe2lmKGE9PW51bGwpdGhyb3cgSC5iKFAuRWUoYikpCnJldHVybiBhfSwKTzc6
+ZnVuY3Rpb24oYSxiKXtyZXR1cm4gbmV3IFAuYkoobnVsbCxudWxsLCEwLGEsYiwiVmFsdWUgbm90IGlu
+IHJhbmdlIil9LApURTpmdW5jdGlvbihhLGIsYyxkLGUpe3JldHVybiBuZXcgUC5iSihiLGMsITAsYSxk
+LCJJbnZhbGlkIHZhbHVlIil9LAp3QTpmdW5jdGlvbihhLGIsYyxkKXtpZihhPGJ8fGE+Yyl0aHJvdyBI
+LmIoUC5URShhLGIsYyxkLG51bGwpKQpyZXR1cm4gYX0sCmpCOmZ1bmN0aW9uKGEsYixjKXtpZigwPmF8
+fGE+Yyl0aHJvdyBILmIoUC5URShhLDAsYywic3RhcnQiLG51bGwpKQppZihiIT1udWxsKXtpZihhPmJ8
+fGI+Yyl0aHJvdyBILmIoUC5URShiLGEsYywiZW5kIixudWxsKSkKcmV0dXJuIGJ9cmV0dXJuIGN9LApr
+MTpmdW5jdGlvbihhLGIpe2lmKHR5cGVvZiBhIT09Im51bWJlciIpcmV0dXJuIGEuSigpCmlmKGE8MCl0
+aHJvdyBILmIoUC5URShhLDAsbnVsbCxiLG51bGwpKQpyZXR1cm4gYX0sCnQ6ZnVuY3Rpb24oYSxiLGMs
+ZCxlKXt2YXIgdD1ILldZKGU9PW51bGw/Si5IKGIpOmUpCnJldHVybiBuZXcgUC5lWSh0LCEwLGEsYywi
+SW5kZXggb3V0IG9mIHJhbmdlIil9LApMNDpmdW5jdGlvbihhKXtyZXR1cm4gbmV3IFAudWIoYSl9LApu
+OmZ1bmN0aW9uKGEpe3JldHVybiBuZXcgUC5kcyhhKX0sClBWOmZ1bmN0aW9uKGEpe3JldHVybiBuZXcg
+UC5saihhKX0sCmE0OmZ1bmN0aW9uKGEpe3JldHVybiBuZXcgUC5VVihhKX0sCnJyOmZ1bmN0aW9uKGEs
+YixjKXtyZXR1cm4gbmV3IFAuYUUoYSxiLGMpfSwKZEg6ZnVuY3Rpb24oYSxiLGMsZCl7dmFyIHQscz1I
+LlZNKFtdLGQuQygiamQ8MD4iKSkKQy5ObS5zQShzLGEpCmZvcih0PTA7dDxhOysrdClDLk5tLlkocyx0
+LGIuJDEodCkpCnJldHVybiBzfSwKaEs6ZnVuY3Rpb24oYSl7dmFyIHQscyxyLHEscCxvLG4sbSxsLGss
+aixpLGgsZyxmLGU9bnVsbCxkPWEubGVuZ3RoCmlmKGQ+PTUpe3Q9KChKLlF6KGEsNCleNTgpKjN8Qy54
+Qi5XKGEsMCleMTAwfEMueEIuVyhhLDEpXjk3fEMueEIuVyhhLDIpXjExNnxDLnhCLlcoYSwzKV45Nyk+
+Pj4wCmlmKHQ9PT0wKXJldHVybiBQLktEKGQ8ZD9DLnhCLncoYSwwLGQpOmEsNSxlKS5nbFIoKQplbHNl
+IGlmKHQ9PT0zMilyZXR1cm4gUC5LRChDLnhCLncoYSw1LGQpLDAsZSkuZ2xSKCl9cz1uZXcgQXJyYXko
+OCkKcy5maXhlZCRsZW5ndGg9QXJyYXkKcj1ILlZNKHMsdS50KQpDLk5tLlkociwwLDApCkMuTm0uWShy
+LDEsLTEpCkMuTm0uWShyLDIsLTEpCkMuTm0uWShyLDcsLTEpCkMuTm0uWShyLDMsMCkKQy5ObS5ZKHIs
+NCwwKQpDLk5tLlkociw1LGQpCkMuTm0uWShyLDYsZCkKaWYoUC5VQihhLDAsZCwwLHIpPj0xNClDLk5t
+Llkociw3LGQpCnE9clsxXQppZih0eXBlb2YgcSE9PSJudW1iZXIiKXJldHVybiBxLnRCKCkKaWYocT49
+MClpZihQLlVCKGEsMCxxLDIwLHIpPT09MjApcls3XT1xCnM9clsyXQppZih0eXBlb2YgcyE9PSJudW1i
+ZXIiKXJldHVybiBzLmgoKQpwPXMrMQpvPXJbM10Kbj1yWzRdCm09cls1XQpsPXJbNl0KaWYodHlwZW9m
+IGwhPT0ibnVtYmVyIilyZXR1cm4gbC5KKCkKaWYodHlwZW9mIG0hPT0ibnVtYmVyIilyZXR1cm4gSC5w
+WShtKQppZihsPG0pbT1sCmlmKHR5cGVvZiBuIT09Im51bWJlciIpcmV0dXJuIG4uSigpCmlmKG48cClu
+PW0KZWxzZSBpZihuPD1xKW49cSsxCmlmKHR5cGVvZiBvIT09Im51bWJlciIpcmV0dXJuIG8uSigpCmlm
+KG88cClvPW4Kcz1yWzddCmlmKHR5cGVvZiBzIT09Im51bWJlciIpcmV0dXJuIHMuSigpCms9czwwCmlm
+KGspaWYocD5xKzMpe2o9ZQprPSExfWVsc2V7cz1vPjAKaWYocyYmbysxPT09bil7aj1lCms9ITF9ZWxz
+ZXtpZighKG08ZCYmbT09PW4rMiYmSi5xMChhLCIuLiIsbikpKWk9bT5uKzImJkoucTAoYSwiLy4uIixt
+LTMpCmVsc2UgaT0hMAppZihpKXtqPWUKaz0hMX1lbHNle2lmKHE9PT00KWlmKEoucTAoYSwiZmlsZSIs
+MCkpe2lmKHA8PTApe2lmKCFDLnhCLlFpKGEsIi8iLG4pKXtoPSJmaWxlOi8vLyIKdD0zfWVsc2V7aD0i
+ZmlsZTovLyIKdD0yfWE9aCtDLnhCLncoYSxuLGQpCnEtPTAKcz10LTAKbSs9cwpsKz1zCmQ9YS5sZW5n
+dGgKcD03Cm89NwpuPTd9ZWxzZSBpZihuPT09bSl7Zz1tKzE7KytsCmE9Qy54Qi5pNyhhLG4sbSwiLyIp
+OysrZAptPWd9aj0iZmlsZSJ9ZWxzZSBpZihDLnhCLlFpKGEsImh0dHAiLDApKXtpZihzJiZvKzM9PT1u
+JiZDLnhCLlFpKGEsIjgwIixvKzEpKXtmPW4tMwptLT0zCmwtPTMKYT1DLnhCLmk3KGEsbyxuLCIiKQpk
+LT0zCm49Zn1qPSJodHRwIn1lbHNlIGo9ZQplbHNlIGlmKHE9PT01JiZKLnEwKGEsImh0dHBzIiwwKSl7
+aWYocyYmbys0PT09biYmSi5xMChhLCI0NDMiLG8rMSkpe2Y9bi00Cm0tPTQKbC09NAphPUouZGcoYSxv
+LG4sIiIpCmQtPTMKbj1mfWo9Imh0dHBzIn1lbHNlIGo9ZQprPSEwfX19ZWxzZSBqPWUKaWYoayl7cz1h
+Lmxlbmd0aAppZihkPHMpe2E9Si5sZChhLDAsZCkKcS09MApwLT0wCm8tPTAKbi09MAptLT0wCmwtPTB9
+cmV0dXJuIG5ldyBQLlVmKGEscSxwLG8sbixtLGwsail9cmV0dXJuIFAuanYoYSwwLGQscSxwLG8sbixt
+LGwsail9LApNdDpmdW5jdGlvbihhKXtILmMoYSkKcmV0dXJuIFAua3UoYSwwLGEubGVuZ3RoLEMueE0s
+ITEpfSwKV1g6ZnVuY3Rpb24oYSl7dmFyIHQ9dS5OCnJldHVybiBDLk5tLk4wKEguVk0oYS5zcGxpdCgi
+JiIpLHUucyksUC5GbCh0LHQpLG5ldyBQLm4xKEMueE0pLHUuZil9LApIaDpmdW5jdGlvbihhLGIsYyl7
+dmFyIHQscyxyLHEscCxvLG4sbT1udWxsLGw9IklQdjQgYWRkcmVzcyBzaG91bGQgY29udGFpbiBleGFj
+dGx5IDQgcGFydHMiLGs9ImVhY2ggcGFydCBtdXN0IGJlIGluIHRoZSByYW5nZSAwLi4yNTUiLGo9bmV3
+IFAuY1MoYSksaT1uZXcgVWludDhBcnJheSg0KQpmb3IodD1pLmxlbmd0aCxzPWIscj1zLHE9MDtzPGM7
+KytzKXtwPUMueEIubShhLHMpCmlmKHAhPT00Nil7aWYoKHBeNDgpPjkpai4kMigiaW52YWxpZCBjaGFy
+YWN0ZXIiLHMpfWVsc2V7aWYocT09PTMpai4kMihsLHMpCm89UC5RQShDLnhCLncoYSxyLHMpLG0sbSkK
+aWYodHlwZW9mIG8hPT0ibnVtYmVyIilyZXR1cm4gby5vcygpCmlmKG8+MjU1KWouJDIoayxyKQpuPXEr
+MQppZihxPj10KXJldHVybiBILmsoaSxxKQppW3FdPW8Kcj1zKzEKcT1ufX1pZihxIT09MylqLiQyKGws
+YykKbz1QLlFBKEMueEIudyhhLHIsYyksbSxtKQppZih0eXBlb2YgbyE9PSJudW1iZXIiKXJldHVybiBv
+Lm9zKCkKaWYobz4yNTUpai4kMihrLHIpCmlmKHE+PXQpcmV0dXJuIEguayhpLHEpCmlbcV09bwpyZXR1
+cm4gaX0sCmVnOmZ1bmN0aW9uKGEsYixhMCl7dmFyIHQscyxyLHEscCxvLG4sbSxsLGssaixpLGgsZyxm
+LGUsZD1uZXcgUC5WQyhhKSxjPW5ldyBQLkpUKGQsYSkKaWYoYS5sZW5ndGg8MilkLiQxKCJhZGRyZXNz
+IGlzIHRvbyBzaG9ydCIpCnQ9SC5WTShbXSx1LnQpCmZvcihzPWIscj1zLHE9ITEscD0hMTtzPGEwOysr
+cyl7bz1DLnhCLm0oYSxzKQppZihvPT09NTgpe2lmKHM9PT1iKXsrK3MKaWYoQy54Qi5tKGEscykhPT01
+OClkLiQyKCJpbnZhbGlkIHN0YXJ0IGNvbG9uLiIscykKcj1zfWlmKHM9PT1yKXtpZihxKWQuJDIoIm9u
+bHkgb25lIHdpbGRjYXJkIGA6OmAgaXMgYWxsb3dlZCIscykKQy5ObS5pKHQsLTEpCnE9ITB9ZWxzZSBD
+Lk5tLmkodCxjLiQyKHIscykpCnI9cysxfWVsc2UgaWYobz09PTQ2KXA9ITB9aWYodC5sZW5ndGg9PT0w
+KWQuJDEoInRvbyBmZXcgcGFydHMiKQpuPXI9PT1hMAptPUMuTm0uZ3JaKHQpCmlmKG4mJm0hPT0tMSlk
+LiQyKCJleHBlY3RlZCBhIHBhcnQgYWZ0ZXIgbGFzdCBgOmAiLGEwKQppZighbilpZighcClDLk5tLmko
+dCxjLiQyKHIsYTApKQplbHNle2w9UC5IaChhLHIsYTApCkMuTm0uaSh0LChsWzBdPDw4fGxbMV0pPj4+
+MCkKQy5ObS5pKHQsKGxbMl08PDh8bFszXSk+Pj4wKX1pZihxKXtpZih0Lmxlbmd0aD43KWQuJDEoImFu
+IGFkZHJlc3Mgd2l0aCBhIHdpbGRjYXJkIG11c3QgaGF2ZSBsZXNzIHRoYW4gNyBwYXJ0cyIpfWVsc2Ug
+aWYodC5sZW5ndGghPT04KWQuJDEoImFuIGFkZHJlc3Mgd2l0aG91dCBhIHdpbGRjYXJkIG11c3QgY29u
+dGFpbiBleGFjdGx5IDggcGFydHMiKQprPW5ldyBVaW50OEFycmF5KDE2KQpmb3IobT10Lmxlbmd0aCxq
+PWsubGVuZ3RoLGk9OS1tLHM9MCxoPTA7czxtOysrcyl7Zz10W3NdCmlmKGc9PT0tMSlmb3IoZj0wO2Y8
+aTsrK2Ype2lmKGg8MHx8aD49ailyZXR1cm4gSC5rKGssaCkKa1toXT0wCmU9aCsxCmlmKGU+PWopcmV0
+dXJuIEguayhrLGUpCmtbZV09MApoKz0yfWVsc2V7ZT1DLmpuLndHKGcsOCkKaWYoaDwwfHxoPj1qKXJl
+dHVybiBILmsoayxoKQprW2hdPWUKZT1oKzEKaWYoZT49ailyZXR1cm4gSC5rKGssZSkKa1tlXT1nJjI1
+NQpoKz0yfX1yZXR1cm4ga30sCmp2OmZ1bmN0aW9uKGEsYixjLGQsZSxmLGcsaCxpLGope3ZhciB0LHMs
+cixxLHAsbyxuLG09bnVsbAppZihqPT1udWxsKWlmKGQ+YilqPVAuUGkoYSxiLGQpCmVsc2V7aWYoZD09
+PWIpUC5SMyhhLGIsIkludmFsaWQgZW1wdHkgc2NoZW1lIikKaj0iIn1pZihlPmIpe3Q9ZCszCnM9dDxl
+P1AuelIoYSx0LGUtMSk6IiIKcj1QLk9lKGEsZSxmLCExKQppZih0eXBlb2YgZiE9PSJudW1iZXIiKXJl
+dHVybiBmLmgoKQpxPWYrMQppZih0eXBlb2YgZyE9PSJudW1iZXIiKXJldHVybiBILnBZKGcpCnA9cTxn
+P1Aud0IoUC5RQShKLmxkKGEscSxnKSxuZXcgUC5lMShhLGYpLG0pLGopOm19ZWxzZXtwPW0Kcj1wCnM9
+IiJ9bz1QLmthKGEsZyxoLG0saixyIT1udWxsKQppZih0eXBlb2YgaCE9PSJudW1iZXIiKXJldHVybiBo
+LkooKQpuPWg8aT9QLmxlKGEsaCsxLGksbSk6bQpyZXR1cm4gbmV3IFAuRG4oaixzLHIscCxvLG4saTxj
+P1AudEcoYSxpKzEsYyk6bSl9LAp3SzpmdW5jdGlvbihhKXtpZihhPT09Imh0dHAiKXJldHVybiA4MApp
+ZihhPT09Imh0dHBzIilyZXR1cm4gNDQzCnJldHVybiAwfSwKUjM6ZnVuY3Rpb24oYSxiLGMpe3Rocm93
+IEguYihQLnJyKGMsYSxiKSl9LAprRTpmdW5jdGlvbihhLGIpe0MuTm0uSyhhLG5ldyBQLk5ZKCExKSl9
+LApITjpmdW5jdGlvbihhLGIsYyl7dmFyIHQscyxyCmZvcih0PUgucUMoYSxjLG51bGwsSC50NihhKS5j
+KSx0PW5ldyBILmE3KHQsdC5nQSh0KSx0LiR0aS5DKCJhNzxhTC5FPiIpKTt0LkYoKTspe3M9dC5kCnI9
+UC5udSgnWyIqLzo8Pj9cXFxcfF0nKQpzLnRvU3RyaW5nCmlmKEgubTIocyxyLDApKXt0PVAuTDQoIkls
+bGVnYWwgY2hhcmFjdGVyIGluIHBhdGg6ICIrcykKdGhyb3cgSC5iKHQpfX19LApyZzpmdW5jdGlvbihh
+LGIpe3ZhciB0CmlmKCEoNjU8PWEmJmE8PTkwKSl0PTk3PD1hJiZhPD0xMjIKZWxzZSB0PSEwCmlmKHQp
+cmV0dXJuCnQ9UC5MNCgiSWxsZWdhbCBkcml2ZSBsZXR0ZXIgIitQLk9vKGEpKQp0aHJvdyBILmIodCl9
+LAp3QjpmdW5jdGlvbihhLGIpe2lmKGEhPW51bGwmJmE9PT1QLndLKGIpKXJldHVybiBudWxsCnJldHVy
+biBhfSwKT2U6ZnVuY3Rpb24oYSxiLGMsZCl7dmFyIHQscyxyLHEscCxvCmlmKGE9PW51bGwpcmV0dXJu
+IG51bGwKaWYoYj09PWMpcmV0dXJuIiIKaWYoQy54Qi5tKGEsYik9PT05MSl7aWYodHlwZW9mIGMhPT0i
+bnVtYmVyIilyZXR1cm4gYy5ITigpCnQ9Yy0xCmlmKEMueEIubShhLHQpIT09OTMpUC5SMyhhLGIsIk1p
+c3NpbmcgZW5kIGBdYCB0byBtYXRjaCBgW2AgaW4gaG9zdCIpCnM9YisxCnI9UC50byhhLHMsdCkKaWYo
+dHlwZW9mIHIhPT0ibnVtYmVyIilyZXR1cm4gci5KKCkKaWYocjx0KXtxPXIrMQpwPVAuT0EoYSxDLnhC
+LlFpKGEsIjI1IixxKT9yKzM6cSx0LCIlMjUiKX1lbHNlIHA9IiIKUC5lZyhhLHMscikKcmV0dXJuIEMu
+eEIudyhhLGIscikudG9Mb3dlckNhc2UoKStwKyJdIn1pZih0eXBlb2YgYyE9PSJudW1iZXIiKXJldHVy
+biBILnBZKGMpCm89Ygpmb3IoO288YzsrK28paWYoQy54Qi5tKGEsbyk9PT01OCl7cj1DLnhCLlhVKGEs
+IiUiLGIpCmlmKCEocj49YiYmcjxjKSlyPWMKaWYocjxjKXtxPXIrMQpwPVAuT0EoYSxDLnhCLlFpKGEs
+IjI1IixxKT9yKzM6cSxjLCIlMjUiKX1lbHNlIHA9IiIKUC5lZyhhLGIscikKcmV0dXJuIlsiK0MueEIu
+dyhhLGIscikrcCsiXSJ9cmV0dXJuIFAuT0woYSxiLGMpfSwKdG86ZnVuY3Rpb24oYSxiLGMpe3ZhciB0
+LHM9Qy54Qi5YVShhLCIlIixiKQppZihzPj1iKXtpZih0eXBlb2YgYyE9PSJudW1iZXIiKXJldHVybiBI
+LnBZKGMpCnQ9czxjfWVsc2UgdD0hMQpyZXR1cm4gdD9zOmN9LApPQTpmdW5jdGlvbihhLGIsYyxkKXt2
+YXIgdCxzLHIscSxwLG8sbixtLGwsaz1kIT09IiI/bmV3IFAuUm4oZCk6bnVsbAppZih0eXBlb2YgYyE9
+PSJudW1iZXIiKXJldHVybiBILnBZKGMpCnQ9YgpzPXQKcj0hMApmb3IoO3Q8Yzspe3E9Qy54Qi5tKGEs
+dCkKaWYocT09PTM3KXtwPVAucnYoYSx0LCEwKQpvPXA9PW51bGwKaWYobyYmcil7dCs9Mwpjb250aW51
+ZX1pZihrPT1udWxsKWs9bmV3IFAuUm4oIiIpCm49ay5hKz1DLnhCLncoYSxzLHQpCmlmKG8pcD1DLnhC
+LncoYSx0LHQrMykKZWxzZSBpZihwPT09IiUiKVAuUjMoYSx0LCJab25lSUQgc2hvdWxkIG5vdCBjb250
+YWluICUgYW55bW9yZSIpCmsuYT1uK3AKdCs9MwpzPXQKcj0hMH1lbHNle2lmKHE8MTI3KXtvPXE+Pj40
+CmlmKG8+PTgpcmV0dXJuIEguayhDLkYzLG8pCm89KEMuRjNbb10mMTw8KHEmMTUpKSE9PTB9ZWxzZSBv
+PSExCmlmKG8pe2lmKHImJjY1PD1xJiY5MD49cSl7aWYoaz09bnVsbClrPW5ldyBQLlJuKCIiKQppZihz
+PHQpe2suYSs9Qy54Qi53KGEscyx0KQpzPXR9cj0hMX0rK3R9ZWxzZXtpZigocSY2NDUxMik9PT01NTI5
+NiYmdCsxPGMpe209Qy54Qi5tKGEsdCsxKQppZigobSY2NDUxMik9PT01NjMyMCl7cT02NTUzNnwocSYx
+MDIzKTw8MTB8bSYxMDIzCmw9Mn1lbHNlIGw9MX1lbHNlIGw9MQppZihrPT1udWxsKWs9bmV3IFAuUm4o
+IiIpCmsuYSs9Qy54Qi53KGEscyx0KQprLmErPVAuSEgocSkKdCs9bApzPXR9fX1pZihrPT1udWxsKXJl
+dHVybiBDLnhCLncoYSxiLGMpCmlmKHM8YylrLmErPUMueEIudyhhLHMsYykKbz1rLmEKcmV0dXJuIG8u
+Y2hhckNvZGVBdCgwKT09MD9vOm99LApPTDpmdW5jdGlvbihhLGIsYyl7dmFyIHQscyxyLHEscCxvLG4s
+bSxsLGssagppZih0eXBlb2YgYyE9PSJudW1iZXIiKXJldHVybiBILnBZKGMpCnQ9YgpzPXQKcj1udWxs
+CnE9ITAKZm9yKDt0PGM7KXtwPUMueEIubShhLHQpCmlmKHA9PT0zNyl7bz1QLnJ2KGEsdCwhMCkKbj1v
+PT1udWxsCmlmKG4mJnEpe3QrPTMKY29udGludWV9aWYocj09bnVsbClyPW5ldyBQLlJuKCIiKQptPUMu
+eEIudyhhLHMsdCkKbD1yLmErPSFxP20udG9Mb3dlckNhc2UoKTptCmlmKG4pe289Qy54Qi53KGEsdCx0
+KzMpCms9M31lbHNlIGlmKG89PT0iJSIpe289IiUyNSIKaz0xfWVsc2Ugaz0zCnIuYT1sK28KdCs9awpz
+PXQKcT0hMH1lbHNle2lmKHA8MTI3KXtuPXA+Pj40CmlmKG4+PTgpcmV0dXJuIEguayhDLmVhLG4pCm49
+KEMuZWFbbl0mMTw8KHAmMTUpKSE9PTB9ZWxzZSBuPSExCmlmKG4pe2lmKHEmJjY1PD1wJiY5MD49cCl7
+aWYocj09bnVsbClyPW5ldyBQLlJuKCIiKQppZihzPHQpe3IuYSs9Qy54Qi53KGEscyx0KQpzPXR9cT0h
+MX0rK3R9ZWxzZXtpZihwPD05Myl7bj1wPj4+NAppZihuPj04KXJldHVybiBILmsoQy5hayxuKQpuPShD
+LmFrW25dJjE8PChwJjE1KSkhPT0wfWVsc2Ugbj0hMQppZihuKVAuUjMoYSx0LCJJbnZhbGlkIGNoYXJh
+Y3RlciIpCmVsc2V7aWYoKHAmNjQ1MTIpPT09NTUyOTYmJnQrMTxjKXtqPUMueEIubShhLHQrMSkKaWYo
+KGomNjQ1MTIpPT09NTYzMjApe3A9NjU1MzZ8KHAmMTAyMyk8PDEwfGomMTAyMwprPTJ9ZWxzZSBrPTF9
+ZWxzZSBrPTEKaWYocj09bnVsbClyPW5ldyBQLlJuKCIiKQptPUMueEIudyhhLHMsdCkKci5hKz0hcT9t
+LnRvTG93ZXJDYXNlKCk6bQpyLmErPVAuSEgocCkKdCs9awpzPXR9fX19aWYocj09bnVsbClyZXR1cm4g
+Qy54Qi53KGEsYixjKQppZihzPGMpe209Qy54Qi53KGEscyxjKQpyLmErPSFxP20udG9Mb3dlckNhc2Uo
+KTptfW49ci5hCnJldHVybiBuLmNoYXJDb2RlQXQoMCk9PTA/bjpufSwKUGk6ZnVuY3Rpb24oYSxiLGMp
+e3ZhciB0LHMscixxCmlmKGI9PT1jKXJldHVybiIiCmlmKCFQLkV0KEouclkoYSkuVyhhLGIpKSlQLlIz
+KGEsYiwiU2NoZW1lIG5vdCBzdGFydGluZyB3aXRoIGFscGhhYmV0aWMgY2hhcmFjdGVyIikKZm9yKHQ9
+YixzPSExO3Q8YzsrK3Qpe3I9Qy54Qi5XKGEsdCkKaWYocjwxMjgpe3E9cj4+PjQKaWYocT49OClyZXR1
+cm4gSC5rKEMubUsscSkKcT0oQy5tS1txXSYxPDwociYxNSkpIT09MH1lbHNlIHE9ITEKaWYoIXEpUC5S
+MyhhLHQsIklsbGVnYWwgc2NoZW1lIGNoYXJhY3RlciIpCmlmKDY1PD1yJiZyPD05MClzPSEwfWE9Qy54
+Qi53KGEsYixjKQpyZXR1cm4gUC5ZYShzP2EudG9Mb3dlckNhc2UoKTphKX0sCllhOmZ1bmN0aW9uKGEp
+e2lmKGE9PT0iaHR0cCIpcmV0dXJuImh0dHAiCmlmKGE9PT0iZmlsZSIpcmV0dXJuImZpbGUiCmlmKGE9
+PT0iaHR0cHMiKXJldHVybiJodHRwcyIKaWYoYT09PSJwYWNrYWdlIilyZXR1cm4icGFja2FnZSIKcmV0
+dXJuIGF9LAp6UjpmdW5jdGlvbihhLGIsYyl7aWYoYT09bnVsbClyZXR1cm4iIgpyZXR1cm4gUC51Tyhh
+LGIsYyxDLnRvLCExKX0sCmthOmZ1bmN0aW9uKGEsYixjLGQsZSxmKXt2YXIgdCxzPWU9PT0iZmlsZSIs
+cj1zfHxmLHE9YT09bnVsbAppZihxJiYhMClyZXR1cm4gcz8iLyI6IiIKdD0hcT9QLnVPKGEsYixjLEMu
+V2QsITApOkMuak4uRTIoZCxuZXcgUC5SWigpLHUuTikuelYoMCwiLyIpCmlmKHQubGVuZ3RoPT09MCl7
+aWYocylyZXR1cm4iLyJ9ZWxzZSBpZihyJiYhQy54Qi5uKHQsIi8iKSl0PSIvIit0CnJldHVybiBQLkpy
+KHQsZSxmKX0sCkpyOmZ1bmN0aW9uKGEsYixjKXt2YXIgdD1iLmxlbmd0aD09PTAKaWYodCYmIWMmJiFD
+LnhCLm4oYSwiLyIpKXJldHVybiBQLndGKGEsIXR8fGMpCnJldHVybiBQLnhlKGEpfSwKbGU6ZnVuY3Rp
+b24oYSxiLGMsZCl7dmFyIHQscz17fQppZihhIT1udWxsKXtpZihkIT1udWxsKXRocm93IEguYihQLnhZ
+KCJCb3RoIHF1ZXJ5IGFuZCBxdWVyeVBhcmFtZXRlcnMgc3BlY2lmaWVkIikpCnJldHVybiBQLnVPKGEs
+YixjLEMuVkMsITApfWlmKGQ9PW51bGwpcmV0dXJuIG51bGwKdD1uZXcgUC5SbigiIikKcy5hPSIiCmQu
+SygwLG5ldyBQLnk1KG5ldyBQLk1FKHMsdCkpKQpzPXQuYQpyZXR1cm4gcy5jaGFyQ29kZUF0KDApPT0w
+P3M6c30sCnRHOmZ1bmN0aW9uKGEsYixjKXtpZihhPT1udWxsKXJldHVybiBudWxsCnJldHVybiBQLnVP
+KGEsYixjLEMuVkMsITApfSwKcnY6ZnVuY3Rpb24oYSxiLGMpe3ZhciB0LHMscixxLHAsbz1iKzIKaWYo
+bz49YS5sZW5ndGgpcmV0dXJuIiUiCnQ9Qy54Qi5tKGEsYisxKQpzPUMueEIubShhLG8pCnI9SC5vbyh0
+KQpxPUgub28ocykKaWYocjwwfHxxPDApcmV0dXJuIiUiCnA9cioxNitxCmlmKHA8MTI3KXtvPUMuam4u
+d0cocCw0KQppZihvPj04KXJldHVybiBILmsoQy5GMyxvKQpvPShDLkYzW29dJjE8PChwJjE1KSkhPT0w
+fWVsc2Ugbz0hMQppZihvKXJldHVybiBILkx3KGMmJjY1PD1wJiY5MD49cD8ocHwzMik+Pj4wOnApCmlm
+KHQ+PTk3fHxzPj05NylyZXR1cm4gQy54Qi53KGEsYixiKzMpLnRvVXBwZXJDYXNlKCkKcmV0dXJuIG51
+bGx9LApISDpmdW5jdGlvbihhKXt2YXIgdCxzLHIscSxwLG8sbj0iMDEyMzQ1Njc4OUFCQ0RFRiIKaWYo
+YTwxMjgpe3Q9bmV3IEFycmF5KDMpCnQuZml4ZWQkbGVuZ3RoPUFycmF5CnM9SC5WTSh0LHUudCkKQy5O
+bS5ZKHMsMCwzNykKQy5ObS5ZKHMsMSxDLnhCLlcobixhPj4+NCkpCkMuTm0uWShzLDIsQy54Qi5XKG4s
+YSYxNSkpfWVsc2V7aWYoYT4yMDQ3KWlmKGE+NjU1MzUpe3I9MjQwCnE9NH1lbHNle3I9MjI0CnE9M31l
+bHNle3I9MTkyCnE9Mn10PW5ldyBBcnJheSgzKnEpCnQuZml4ZWQkbGVuZ3RoPUFycmF5CnM9SC5WTSh0
+LHUudCkKZm9yKHA9MDstLXEscT49MDtyPTEyOCl7bz1DLmpuLmJmKGEsNipxKSY2M3xyCkMuTm0uWShz
+LHAsMzcpCkMuTm0uWShzLHArMSxDLnhCLlcobixvPj4+NCkpCkMuTm0uWShzLHArMixDLnhCLlcobixv
+JjE1KSkKcCs9M319cmV0dXJuIFAuSE0ocywwLG51bGwpfSwKdU86ZnVuY3Rpb24oYSxiLGMsZCxlKXt2
+YXIgdD1QLlVsKGEsYixjLGQsZSkKcmV0dXJuIHQ9PW51bGw/Qy54Qi53KGEsYixjKTp0fSwKVWw6ZnVu
+Y3Rpb24oYSxiLGMsZCxlKXt2YXIgdCxzLHIscSxwLG89bnVsbCxuPSFlLG09YixsPW0saz1vCndoaWxl
+KCEwKXtpZih0eXBlb2YgbSE9PSJudW1iZXIiKXJldHVybiBtLkooKQppZih0eXBlb2YgYyE9PSJudW1i
+ZXIiKXJldHVybiBILnBZKGMpCmlmKCEobTxjKSlicmVhawpjJDA6e3Q9Qy54Qi5tKGEsbSkKaWYodDwx
+Mjcpe3M9dD4+PjQKaWYocz49OClyZXR1cm4gSC5rKGQscykKcz0oZFtzXSYxPDwodCYxNSkpIT09MH1l
+bHNlIHM9ITEKaWYocykrK20KZWxzZXtpZih0PT09Mzcpe3I9UC5ydihhLG0sITEpCmlmKHI9PW51bGwp
+e20rPTMKYnJlYWsgYyQwfWlmKCIlIj09PXIpe3I9IiUyNSIKcT0xfWVsc2UgcT0zfWVsc2V7aWYobilp
+Zih0PD05Myl7cz10Pj4+NAppZihzPj04KXJldHVybiBILmsoQy5hayxzKQpzPShDLmFrW3NdJjE8PCh0
+JjE1KSkhPT0wfWVsc2Ugcz0hMQplbHNlIHM9ITEKaWYocyl7UC5SMyhhLG0sIkludmFsaWQgY2hhcmFj
+dGVyIikKcT1vCnI9cX1lbHNle2lmKCh0JjY0NTEyKT09PTU1Mjk2KXtzPW0rMQppZihzPGMpe3A9Qy54
+Qi5tKGEscykKaWYoKHAmNjQ1MTIpPT09NTYzMjApe3Q9NjU1MzZ8KHQmMTAyMyk8PDEwfHAmMTAyMwpx
+PTJ9ZWxzZSBxPTF9ZWxzZSBxPTF9ZWxzZSBxPTEKcj1QLkhIKHQpfX1pZihrPT1udWxsKWs9bmV3IFAu
+Um4oIiIpCmsuYSs9Qy54Qi53KGEsbCxtKQprLmErPUguZChyKQppZih0eXBlb2YgcSE9PSJudW1iZXIi
+KXJldHVybiBILnBZKHEpCm0rPXEKbD1tfX19aWYoaz09bnVsbClyZXR1cm4gbwppZih0eXBlb2YgbCE9
+PSJudW1iZXIiKXJldHVybiBsLkooKQppZihsPGMpay5hKz1DLnhCLncoYSxsLGMpCm49ay5hCnJldHVy
+biBuLmNoYXJDb2RlQXQoMCk9PTA/bjpufSwKeUI6ZnVuY3Rpb24oYSl7aWYoQy54Qi5uKGEsIi4iKSly
+ZXR1cm4hMApyZXR1cm4gQy54Qi5PWShhLCIvLiIpIT09LTF9LAp4ZTpmdW5jdGlvbihhKXt2YXIgdCxz
+LHIscSxwLG8sbgppZighUC55QihhKSlyZXR1cm4gYQp0PUguVk0oW10sdS5zKQpmb3Iocz1hLnNwbGl0
+KCIvIikscj1zLmxlbmd0aCxxPSExLHA9MDtwPHI7KytwKXtvPXNbcF0KaWYoSi5STShvLCIuLiIpKXtu
+PXQubGVuZ3RoCmlmKG4hPT0wKXtpZigwPj1uKXJldHVybiBILmsodCwtMSkKdC5wb3AoKQppZih0Lmxl
bmd0aD09PTApQy5ObS5pKHQsIiIpfXE9ITB9ZWxzZSBpZigiLiI9PT1vKXE9ITAKZWxzZXtDLk5tLmko
-dCxvKQpxPSExfX1pZihxKUMuTm0uaSh0LCIiKQpyZXR1cm4gQy5ObS5IKHQsIi8iKX0sCndGOmZ1bmN0
-aW9uKGEsYil7dmFyIHQscyxyLHEscCxvCmlmKCFQLnlCKGEpKXJldHVybiFiP1AuQzEoYSk6YQp0PUgu
-Vk0oW10sdS5zKQpmb3Iocz1hLnNwbGl0KCIvIikscj1zLmxlbmd0aCxxPSExLHA9MDtwPHI7KytwKXtv
-PXNbcF0KaWYoIi4uIj09PW8paWYodC5sZW5ndGghPT0wJiZDLk5tLmdyWih0KSE9PSIuLiIpe2lmKDA+
-PXQubGVuZ3RoKXJldHVybiBILk9IKHQsLTEpCnQucG9wKCkKcT0hMH1lbHNle0MuTm0uaSh0LCIuLiIp
+dCxvKQpxPSExfX1pZihxKUMuTm0uaSh0LCIiKQpyZXR1cm4gQy5ObS56Vih0LCIvIil9LAp3RjpmdW5j
+dGlvbihhLGIpe3ZhciB0LHMscixxLHAsbwppZighUC55QihhKSlyZXR1cm4hYj9QLkMxKGEpOmEKdD1I
+LlZNKFtdLHUucykKZm9yKHM9YS5zcGxpdCgiLyIpLHI9cy5sZW5ndGgscT0hMSxwPTA7cDxyOysrcCl7
+bz1zW3BdCmlmKCIuLiI9PT1vKWlmKHQubGVuZ3RoIT09MCYmQy5ObS5ncloodCkhPT0iLi4iKXtpZigw
+Pj10Lmxlbmd0aClyZXR1cm4gSC5rKHQsLTEpCnQucG9wKCkKcT0hMH1lbHNle0MuTm0uaSh0LCIuLiIp
CnE9ITF9ZWxzZSBpZigiLiI9PT1vKXE9ITAKZWxzZXtDLk5tLmkodCxvKQpxPSExfX1zPXQubGVuZ3Ro
-CmlmKHMhPT0wKWlmKHM9PT0xKXtpZigwPj1zKXJldHVybiBILk9IKHQsMCkKcz10WzBdLmxlbmd0aD09
-PTB9ZWxzZSBzPSExCmVsc2Ugcz0hMAppZihzKXJldHVybiIuLyIKaWYocXx8Qy5ObS5ncloodCk9PT0i
-Li4iKUMuTm0uaSh0LCIiKQppZighYil7aWYoMD49dC5sZW5ndGgpcmV0dXJuIEguT0godCwwKQpDLk5t
-LlkodCwwLFAuQzEodFswXSkpfXJldHVybiBDLk5tLkgodCwiLyIpfSwKQzE6ZnVuY3Rpb24oYSl7dmFy
-IHQscyxyLHE9YS5sZW5ndGgKaWYocT49MiYmUC5FdChKLlF6KGEsMCkpKWZvcih0PTE7dDxxOysrdCl7
-cz1DLnhCLlcoYSx0KQppZihzPT09NTgpcmV0dXJuIEMueEIuTmooYSwwLHQpKyIlM0EiK0MueEIuRyhh
-LHQrMSkKaWYoczw9MTI3KXtyPXM+Pj40CmlmKHI+PTgpcmV0dXJuIEguT0goQy5tSyxyKQpyPShDLm1L
-W3JdJjE8PChzJjE1KSk9PT0wfWVsc2Ugcj0hMAppZihyKWJyZWFrfXJldHVybiBhfSwKbW46ZnVuY3Rp
-b24oYSl7dmFyIHQscyxyLHE9YS5nRmooKSxwPXEubGVuZ3RoCmlmKHA+MCYmSi5IbShxWzBdKT09PTIm
-JkouYTYocVswXSwxKT09PTU4KXtpZigwPj1wKXJldHVybiBILk9IKHEsMCkKUC5yZyhKLmE2KHFbMF0s
-MCksITEpClAuSE4ocSwhMSwxKQp0PSEwfWVsc2V7UC5ITihxLCExLDApCnQ9ITF9cz1hLmd0VCgpJiYh
-dD8iXFwiOiIiCmlmKGEuZ2NqKCkpe3I9YS5nSmYoYSkKaWYoci5sZW5ndGghPT0wKXM9cysiXFwiK3Ir
-IlxcIn1zPVAudmcocyxxLCJcXCIpCnA9dCYmcD09PTE/cysiXFwiOnMKcmV0dXJuIHAuY2hhckNvZGVB
-dCgwKT09MD9wOnB9LApJaDpmdW5jdGlvbihhLGIpe3ZhciB0LHMscgpmb3IodD0wLHM9MDtzPDI7Kytz
-KXtyPUMueEIuVyhhLGIrcykKaWYoNDg8PXImJnI8PTU3KXQ9dCoxNityLTQ4CmVsc2V7cnw9MzIKaWYo
-OTc8PXImJnI8PTEwMil0PXQqMTYrci04NwplbHNlIHRocm93IEguYihQLnhZKCJJbnZhbGlkIFVSTCBl
-bmNvZGluZyIpKX19cmV0dXJuIHR9LAprdTpmdW5jdGlvbihhLGIsYyxkLGUpe3ZhciB0LHMscixxLHA9
-Si5yWShhKSxvPWIKd2hpbGUoITApe2lmKCEobzxjKSl7dD0hMApicmVha31zPXAuVyhhLG8pCmlmKHM8
-PTEyNylpZihzIT09Mzcpcj1lJiZzPT09NDMKZWxzZSByPSEwCmVsc2Ugcj0hMAppZihyKXt0PSExCmJy
-ZWFrfSsrb31pZih0KXtpZihDLnhNIT09ZClyPSExCmVsc2Ugcj0hMAppZihyKXJldHVybiBwLk5qKGEs
-YixjKQplbHNlIHE9bmV3IEgucWoocC5OaihhLGIsYykpfWVsc2V7cT1ILlZNKFtdLHUudCkKZm9yKG89
-YjtvPGM7KytvKXtzPXAuVyhhLG8pCmlmKHM+MTI3KXRocm93IEguYihQLnhZKCJJbGxlZ2FsIHBlcmNl
-bnQgZW5jb2RpbmcgaW4gVVJJIikpCmlmKHM9PT0zNyl7aWYobyszPmEubGVuZ3RoKXRocm93IEguYihQ
-LnhZKCJUcnVuY2F0ZWQgVVJJIikpCkMuTm0uaShxLFAuSWgoYSxvKzEpKQpvKz0yfWVsc2UgaWYoZSYm
-cz09PTQzKUMuTm0uaShxLDMyKQplbHNlIEMuTm0uaShxLHMpfX11LkwuYihxKQpyZXR1cm4gbmV3IFAu
-R1koITEpLldKKHEpfSwKRXQ6ZnVuY3Rpb24oYSl7dmFyIHQ9YXwzMgpyZXR1cm4gOTc8PXQmJnQ8PTEy
-Mn0sCktEOmZ1bmN0aW9uKGEsYixjKXt2YXIgdCxzLHIscSxwLG8sbixtLGw9IkludmFsaWQgTUlNRSB0
-eXBlIixrPUguVk0oW2ItMV0sdS50KQpmb3IodD1hLmxlbmd0aCxzPWIscj0tMSxxPW51bGw7czx0Oysr
-cyl7cT1DLnhCLlcoYSxzKQppZihxPT09NDR8fHE9PT01OSlicmVhawppZihxPT09NDcpe2lmKHI8MCl7
-cj1zCmNvbnRpbnVlfXRocm93IEguYihQLnJyKGwsYSxzKSl9fWlmKHI8MCYmcz5iKXRocm93IEguYihQ
-LnJyKGwsYSxzKSkKZm9yKDtxIT09NDQ7KXtDLk5tLmkoayxzKTsrK3MKZm9yKHA9LTE7czx0Oysrcyl7
-cT1DLnhCLlcoYSxzKQppZihxPT09NjEpe2lmKHA8MClwPXN9ZWxzZSBpZihxPT09NTl8fHE9PT00NCli
-cmVha31pZihwPj0wKUMuTm0uaShrLHApCmVsc2V7bz1DLk5tLmdyWihrKQppZihxIT09NDR8fHMhPT1v
-Kzd8fCFDLnhCLlFpKGEsImJhc2U2NCIsbysxKSl0aHJvdyBILmIoUC5ycigiRXhwZWN0aW5nICc9JyIs
-YSxzKSkKYnJlYWt9fUMuTm0uaShrLHMpCm49cysxCmlmKChrLmxlbmd0aCYxKT09PTEpYT1DLmg5Lnly
-KGEsbix0KQplbHNle209UC5VbChhLG4sdCxDLlZDLCEwKQppZihtIT1udWxsKWE9Qy54Qi5pNyhhLG4s
-dCxtKX1yZXR1cm4gbmV3IFAuUEUoYSxrLGMpfSwKdXg6ZnVuY3Rpb24oKXt2YXIgdD0iMDEyMzQ1Njc4
-OUFCQ0RFRkdISUpLTE1OT1BRUlNUVVZXWFlaYWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXotLl9+ISQm
-JygpKissOz0iLHM9Ii4iLHI9IjoiLHE9Ii8iLHA9Ij8iLG89IiMiLG49dS5nYyxtPVAuZEgoMjIsbmV3
-IFAucTMoKSwhMCxuKSxsPW5ldyBQLnlJKG0pLGs9bmV3IFAuYzYoKSxqPW5ldyBQLnFkKCksaT1uLmIo
-bC4kMigwLDIyNSkpCmsuJDMoaSx0LDEpCmsuJDMoaSxzLDE0KQprLiQzKGksciwzNCkKay4kMyhpLHEs
-MykKay4kMyhpLHAsMTcyKQprLiQzKGksbywyMDUpCmk9bi5iKGwuJDIoMTQsMjI1KSkKay4kMyhpLHQs
-MSkKay4kMyhpLHMsMTUpCmsuJDMoaSxyLDM0KQprLiQzKGkscSwyMzQpCmsuJDMoaSxwLDE3MikKay4k
-MyhpLG8sMjA1KQppPW4uYihsLiQyKDE1LDIyNSkpCmsuJDMoaSx0LDEpCmsuJDMoaSwiJSIsMjI1KQpr
-LiQzKGksciwzNCkKay4kMyhpLHEsOSkKay4kMyhpLHAsMTcyKQprLiQzKGksbywyMDUpCmk9bi5iKGwu
-JDIoMSwyMjUpKQprLiQzKGksdCwxKQprLiQzKGksciwzNCkKay4kMyhpLHEsMTApCmsuJDMoaSxwLDE3
-MikKay4kMyhpLG8sMjA1KQppPW4uYihsLiQyKDIsMjM1KSkKay4kMyhpLHQsMTM5KQprLiQzKGkscSwx
-MzEpCmsuJDMoaSxzLDE0NikKay4kMyhpLHAsMTcyKQprLiQzKGksbywyMDUpCmk9bi5iKGwuJDIoMywy
-MzUpKQprLiQzKGksdCwxMSkKay4kMyhpLHEsNjgpCmsuJDMoaSxzLDE4KQprLiQzKGkscCwxNzIpCmsu
-JDMoaSxvLDIwNSkKaT1uLmIobC4kMig0LDIyOSkpCmsuJDMoaSx0LDUpCmouJDMoaSwiQVoiLDIyOSkK
-ay4kMyhpLHIsMTAyKQprLiQzKGksIkAiLDY4KQprLiQzKGksIlsiLDIzMikKay4kMyhpLHEsMTM4KQpr
-LiQzKGkscCwxNzIpCmsuJDMoaSxvLDIwNSkKaT1uLmIobC4kMig1LDIyOSkpCmsuJDMoaSx0LDUpCmou
-JDMoaSwiQVoiLDIyOSkKay4kMyhpLHIsMTAyKQprLiQzKGksIkAiLDY4KQprLiQzKGkscSwxMzgpCmsu
-JDMoaSxwLDE3MikKay4kMyhpLG8sMjA1KQppPW4uYihsLiQyKDYsMjMxKSkKai4kMyhpLCIxOSIsNykK
-ay4kMyhpLCJAIiw2OCkKay4kMyhpLHEsMTM4KQprLiQzKGkscCwxNzIpCmsuJDMoaSxvLDIwNSkKaT1u
-LmIobC4kMig3LDIzMSkpCmouJDMoaSwiMDkiLDcpCmsuJDMoaSwiQCIsNjgpCmsuJDMoaSxxLDEzOCkK
-ay4kMyhpLHAsMTcyKQprLiQzKGksbywyMDUpCmsuJDMobi5iKGwuJDIoOCw4KSksIl0iLDUpCmk9bi5i
-KGwuJDIoOSwyMzUpKQprLiQzKGksdCwxMSkKay4kMyhpLHMsMTYpCmsuJDMoaSxxLDIzNCkKay4kMyhp
-LHAsMTcyKQprLiQzKGksbywyMDUpCmk9bi5iKGwuJDIoMTYsMjM1KSkKay4kMyhpLHQsMTEpCmsuJDMo
-aSxzLDE3KQprLiQzKGkscSwyMzQpCmsuJDMoaSxwLDE3MikKay4kMyhpLG8sMjA1KQppPW4uYihsLiQy
-KDE3LDIzNSkpCmsuJDMoaSx0LDExKQprLiQzKGkscSw5KQprLiQzKGkscCwxNzIpCmsuJDMoaSxvLDIw
-NSkKaT1uLmIobC4kMigxMCwyMzUpKQprLiQzKGksdCwxMSkKay4kMyhpLHMsMTgpCmsuJDMoaSxxLDIz
-NCkKay4kMyhpLHAsMTcyKQprLiQzKGksbywyMDUpCmk9bi5iKGwuJDIoMTgsMjM1KSkKay4kMyhpLHQs
-MTEpCmsuJDMoaSxzLDE5KQprLiQzKGkscSwyMzQpCmsuJDMoaSxwLDE3MikKay4kMyhpLG8sMjA1KQpp
-PW4uYihsLiQyKDE5LDIzNSkpCmsuJDMoaSx0LDExKQprLiQzKGkscSwyMzQpCmsuJDMoaSxwLDE3MikK
-ay4kMyhpLG8sMjA1KQppPW4uYihsLiQyKDExLDIzNSkpCmsuJDMoaSx0LDExKQprLiQzKGkscSwxMCkK
-ay4kMyhpLHAsMTcyKQprLiQzKGksbywyMDUpCmk9bi5iKGwuJDIoMTIsMjM2KSkKay4kMyhpLHQsMTIp
-CmsuJDMoaSxwLDEyKQprLiQzKGksbywyMDUpCmk9bi5iKGwuJDIoMTMsMjM3KSkKay4kMyhpLHQsMTMp
-CmsuJDMoaSxwLDEzKQpqLiQzKG4uYihsLiQyKDIwLDI0NSkpLCJheiIsMjEpCmw9bi5iKGwuJDIoMjEs
-MjQ1KSkKai4kMyhsLCJheiIsMjEpCmouJDMobCwiMDkiLDIxKQprLiQzKGwsIistLiIsMjEpCnJldHVy
-biBtfSwKVUI6ZnVuY3Rpb24oYSxiLGMsZCxlKXt2YXIgdCxzLHIscSxwLG89JC52WigpCmZvcih0PUou
-clkoYSkscz1iO3M8YzsrK3Mpe2lmKGQ8MHx8ZD49by5sZW5ndGgpcmV0dXJuIEguT0gobyxkKQpyPW9b
-ZF0KcT10LlcoYSxzKV45NgppZihxPjk1KXE9MzEKaWYocT49ci5sZW5ndGgpcmV0dXJuIEguT0gocixx
-KQpwPXJbcV0KZD1wJjMxCkMuTm0uWShlLHA+Pj41LHMpfXJldHVybiBkfSwKV0Y6ZnVuY3Rpb24gV0Yo
-YSxiKXt0aGlzLmE9YQp0aGlzLmI9Yn0sCmEyOmZ1bmN0aW9uIGEyKCl7fSwKaVA6ZnVuY3Rpb24gaVAo
-YSxiKXt0aGlzLmE9YQp0aGlzLmI9Yn0sCkNQOmZ1bmN0aW9uIENQKCl7fSwKWFM6ZnVuY3Rpb24gWFMo
-KXt9LApDNjpmdW5jdGlvbiBDNihhKXt0aGlzLmE9YX0sCm46ZnVuY3Rpb24gbigpe30sCnU6ZnVuY3Rp
-b24gdShhLGIsYyxkKXt2YXIgXz10aGlzCl8uYT1hCl8uYj1iCl8uYz1jCl8uZD1kfSwKYko6ZnVuY3Rp
-b24gYkooYSxiLGMsZCxlLGYpe3ZhciBfPXRoaXMKXy5lPWEKXy5mPWIKXy5hPWMKXy5iPWQKXy5jPWUK
-Xy5kPWZ9LAplWTpmdW5jdGlvbiBlWShhLGIsYyxkLGUpe3ZhciBfPXRoaXMKXy5mPWEKXy5hPWIKXy5i
-PWMKXy5jPWQKXy5kPWV9LAptcDpmdW5jdGlvbiBtcChhLGIsYyxkKXt2YXIgXz10aGlzCl8uYT1hCl8u
-Yj1iCl8uYz1jCl8uZD1kfSwKdWI6ZnVuY3Rpb24gdWIoYSl7dGhpcy5hPWF9LApkczpmdW5jdGlvbiBk
-cyhhKXt0aGlzLmE9YX0sCmxqOmZ1bmN0aW9uIGxqKGEpe3RoaXMuYT1hfSwKVVY6ZnVuY3Rpb24gVVYo
-YSl7dGhpcy5hPWF9LAprNTpmdW5jdGlvbiBrNSgpe30sCktZOmZ1bmN0aW9uIEtZKCl7fSwKYzpmdW5j
-dGlvbiBjKGEpe3RoaXMuYT1hfSwKQ0Q6ZnVuY3Rpb24gQ0QoYSl7dGhpcy5hPWF9LAphRTpmdW5jdGlv
-biBhRShhLGIsYyl7dGhpcy5hPWEKdGhpcy5iPWIKdGhpcy5jPWN9LApFSDpmdW5jdGlvbiBFSCgpe30s
-CktOOmZ1bmN0aW9uIEtOKCl7fSwKY1g6ZnVuY3Rpb24gY1goKXt9LApBbjpmdW5jdGlvbiBBbigpe30s
-CnpNOmZ1bmN0aW9uIHpNKCl7fSwKWjA6ZnVuY3Rpb24gWjAoKXt9LApjODpmdW5jdGlvbiBjOCgpe30s
-CkZLOmZ1bmN0aW9uIEZLKCl7fSwKazpmdW5jdGlvbiBrKCl7fSwKT2Q6ZnVuY3Rpb24gT2QoKXt9LApp
-YjpmdW5jdGlvbiBpYigpe30sCnh1OmZ1bmN0aW9uIHh1KCl7fSwKR3o6ZnVuY3Rpb24gR3ooKXt9LApx
-VTpmdW5jdGlvbiBxVSgpe30sClJuOmZ1bmN0aW9uIFJuKGEpe3RoaXMuYT1hfSwKR0Q6ZnVuY3Rpb24g
-R0QoKXt9LApuMTpmdW5jdGlvbiBuMShhKXt0aGlzLmE9YX0sCmNTOmZ1bmN0aW9uIGNTKGEpe3RoaXMu
-YT1hfSwKVkM6ZnVuY3Rpb24gVkMoYSl7dGhpcy5hPWF9LAp0cDpmdW5jdGlvbiB0cChhLGIpe3RoaXMu
-YT1hCnRoaXMuYj1ifSwKRG46ZnVuY3Rpb24gRG4oYSxiLGMsZCxlLGYsZyl7dmFyIF89dGhpcwpfLmE9
-YQpfLmI9YgpfLmM9YwpfLmQ9ZApfLmU9ZQpfLmY9ZgpfLnI9ZwpfLlE9Xy56PV8ueT1fLng9bnVsbH0s
-CmUxOmZ1bmN0aW9uIGUxKGEsYil7dGhpcy5hPWEKdGhpcy5iPWJ9LApOWTpmdW5jdGlvbiBOWShhKXt0
-aGlzLmE9YX0sClJaOmZ1bmN0aW9uIFJaKCl7fSwKTUU6ZnVuY3Rpb24gTUUoYSxiKXt0aGlzLmE9YQp0
-aGlzLmI9Yn0sCnk1OmZ1bmN0aW9uIHk1KGEpe3RoaXMuYT1hfSwKUEU6ZnVuY3Rpb24gUEUoYSxiLGMp
-e3RoaXMuYT1hCnRoaXMuYj1iCnRoaXMuYz1jfSwKcTM6ZnVuY3Rpb24gcTMoKXt9LAp5STpmdW5jdGlv
-biB5SShhKXt0aGlzLmE9YX0sCmM2OmZ1bmN0aW9uIGM2KCl7fSwKcWQ6ZnVuY3Rpb24gcWQoKXt9LApV
-ZjpmdW5jdGlvbiBVZihhLGIsYyxkLGUsZixnLGgpe3ZhciBfPXRoaXMKXy5hPWEKXy5iPWIKXy5jPWMK
-Xy5kPWQKXy5lPWUKXy5mPWYKXy5yPWcKXy54PWgKXy55PW51bGx9LApxZTpmdW5jdGlvbiBxZShhLGIs
-YyxkLGUsZixnKXt2YXIgXz10aGlzCl8uYT1hCl8uYj1iCl8uYz1jCl8uZD1kCl8uZT1lCl8uZj1mCl8u
-cj1nCl8uUT1fLno9Xy55PV8ueD1udWxsfSwKaUo6ZnVuY3Rpb24gaUooKXt9LApsUjpmdW5jdGlvbiBs
-UihhLGIpe3RoaXMuYT1hCnRoaXMuYj1ifSwKamc6ZnVuY3Rpb24gamcoYSxiKXt0aGlzLmE9YQp0aGlz
-LmI9Yn0sCkJmOmZ1bmN0aW9uIEJmKGEsYil7dGhpcy5hPWEKdGhpcy5iPWJ9LApBczpmdW5jdGlvbiBB
-cygpe30sCkdFOmZ1bmN0aW9uIEdFKGEpe3RoaXMuYT1hfSwKTjc6ZnVuY3Rpb24gTjcoYSxiKXt0aGlz
-LmE9YQp0aGlzLmI9Yn0sCnVROmZ1bmN0aW9uIHVRKCl7fSwKaEY6ZnVuY3Rpb24gaEYoKXt9LApSNDpm
-dW5jdGlvbihhLGIsYyxkKXt2YXIgdCxzLHIKSC54ZChiKQp1LmouYihkKQppZihILm9UKGIpKXt0PVtj
-XQpDLk5tLkZWKHQsZCkKZD10fXM9dS56CnI9UC5DSChKLk0xKGQsUC53MCgpLHMpLCEwLHMpCnUuWi5i
-KGEpCnJldHVybiBQLndZKEguRWsoYSxyLG51bGwpKX0sCkRtOmZ1bmN0aW9uKGEsYixjKXt2YXIgdAp0
-cnl7aWYoT2JqZWN0LmlzRXh0ZW5zaWJsZShhKSYmIU9iamVjdC5wcm90b3R5cGUuaGFzT3duUHJvcGVy
-dHkuY2FsbChhLGIpKXtPYmplY3QuZGVmaW5lUHJvcGVydHkoYSxiLHt2YWx1ZTpjfSkKcmV0dXJuITB9
-fWNhdGNoKHQpe0guUnUodCl9cmV0dXJuITF9LApPbTpmdW5jdGlvbihhLGIpe2lmKE9iamVjdC5wcm90
-b3R5cGUuaGFzT3duUHJvcGVydHkuY2FsbChhLGIpKXJldHVybiBhW2JdCnJldHVybiBudWxsfSwKd1k6
-ZnVuY3Rpb24oYSl7aWYoYT09bnVsbHx8dHlwZW9mIGE9PSJzdHJpbmcifHx0eXBlb2YgYT09Im51bWJl
-ciJ8fEgubChhKSlyZXR1cm4gYQppZihhIGluc3RhbmNlb2YgUC5FNClyZXR1cm4gYS5hCmlmKEguUjko
-YSkpcmV0dXJuIGEKaWYodS53LmMoYSkpcmV0dXJuIGEKaWYoYSBpbnN0YW5jZW9mIFAuaVApcmV0dXJu
-IEgubzIoYSkKaWYodS5aLmMoYSkpcmV0dXJuIFAuaEUoYSwiJGRhcnRfanNGdW5jdGlvbiIsbmV3IFAu
-UEMoKSkKcmV0dXJuIFAuaEUoYSwiXyRkYXJ0X2pzT2JqZWN0IixuZXcgUC5ZbSgkLmtJKCkpKX0sCmhF
-OmZ1bmN0aW9uKGEsYixjKXt2YXIgdD1QLk9tKGEsYikKaWYodD09bnVsbCl7dD1jLiQxKGEpClAuRG0o
-YSxiLHQpfXJldHVybiB0fSwKTDc6ZnVuY3Rpb24oYSl7dmFyIHQscwppZihhPT1udWxsfHx0eXBlb2Yg
-YT09InN0cmluZyJ8fHR5cGVvZiBhPT0ibnVtYmVyInx8dHlwZW9mIGE9PSJib29sZWFuIilyZXR1cm4g
-YQplbHNlIGlmKGEgaW5zdGFuY2VvZiBPYmplY3QmJkguUjkoYSkpcmV0dXJuIGEKZWxzZSBpZihhIGlu
-c3RhbmNlb2YgT2JqZWN0JiZ1LncuYyhhKSlyZXR1cm4gYQplbHNlIGlmKGEgaW5zdGFuY2VvZiBEYXRl
-KXt0PUguU2MoYS5nZXRUaW1lKCkpCmlmKE1hdGguYWJzKHQpPD04NjRlMTMpcz0hMQplbHNlIHM9ITAK
-aWYocylILnZoKFAueFkoIkRhdGVUaW1lIGlzIG91dHNpZGUgdmFsaWQgcmFuZ2U6ICIrdCkpCnJldHVy
-biBuZXcgUC5pUCh0LCExKX1lbHNlIGlmKGEuY29uc3RydWN0b3I9PT0kLmtJKCkpcmV0dXJuIGEubwpl
-bHNlIHJldHVybiBQLk5EKGEpfSwKTkQ6ZnVuY3Rpb24oYSl7aWYodHlwZW9mIGE9PSJmdW5jdGlvbiIp
-cmV0dXJuIFAuaVEoYSwkLncoKSxuZXcgUC5OeigpKQppZihhIGluc3RhbmNlb2YgQXJyYXkpcmV0dXJu
-IFAuaVEoYSwkLlI4KCksbmV3IFAubnAoKSkKcmV0dXJuIFAuaVEoYSwkLlI4KCksbmV3IFAuVXQoKSl9
-LAppUTpmdW5jdGlvbihhLGIsYyl7dmFyIHQ9UC5PbShhLGIpCmlmKHQ9PW51bGx8fCEoYSBpbnN0YW5j
-ZW9mIE9iamVjdCkpe3Q9Yy4kMShhKQpQLkRtKGEsYix0KX1yZXR1cm4gdH0sClBDOmZ1bmN0aW9uIFBD
-KCl7fSwKWW06ZnVuY3Rpb24gWW0oYSl7dGhpcy5hPWF9LApOejpmdW5jdGlvbiBOeigpe30sCm5wOmZ1
-bmN0aW9uIG5wKCl7fSwKVXQ6ZnVuY3Rpb24gVXQoKXt9LApFNDpmdW5jdGlvbiBFNChhKXt0aGlzLmE9
-YX0sCnI3OmZ1bmN0aW9uIHI3KGEpe3RoaXMuYT1hfSwKVHo6ZnVuY3Rpb24gVHooYSxiKXt0aGlzLmE9
-YQp0aGlzLiR0aT1ifSwKY286ZnVuY3Rpb24gY28oKXt9LApuZDpmdW5jdGlvbiBuZCgpe30sCktlOmZ1
-bmN0aW9uIEtlKGEpe3RoaXMuYT1hfSwKZDU6ZnVuY3Rpb24gZDUoKXt9LApuNjpmdW5jdGlvbiBuNigp
-e319LFc9ewpacjpmdW5jdGlvbigpe3JldHVybiBkb2N1bWVudH0sClU5OmZ1bmN0aW9uKGEsYixjKXt2
-YXIgdD1kb2N1bWVudC5ib2R5LHM9KHQmJkMuUlkpLnI2KHQsYSxiLGMpCnMudG9TdHJpbmcKdD11LmFj
-CnQ9bmV3IEguVTUobmV3IFcuZTcocyksdC5DKCJhMihsRC5FKSIpLmIobmV3IFcuQ3YoKSksdC5DKCJV
-NTxsRC5FPiIpKQpyZXR1cm4gdS5oLmIodC5ncjgodCkpfSwKclM6ZnVuY3Rpb24oYSl7dmFyIHQscyxy
-PSJlbGVtZW50IHRhZyB1bmF2YWlsYWJsZSIKdHJ5e3Q9Si5SRShhKQppZih0eXBlb2YgdC5nbnMoYSk9
-PSJzdHJpbmciKXI9dC5nbnMoYSl9Y2F0Y2gocyl7SC5SdShzKX1yZXR1cm4gcn0sCnFEOmZ1bmN0aW9u
-KGEsYixjKXt2YXIgdCxzLHIscT1uZXcgUC52cygkLlgzLHUuYW8pLHA9bmV3IFAuWmYocSx1LmJqKSxv
-PW5ldyBYTUxIdHRwUmVxdWVzdCgpCkMuRHQuZW8obyxiPT1udWxsPyJHRVQiOmIsYSwhMCkKYy5LKDAs
-bmV3IFcuYlUobykpCnQ9dS5hbgpzPXQuYihuZXcgVy5oSChvLHApKQp1Lk0uYihudWxsKQpyPXUucApX
-LkpFKG8sImxvYWQiLHMsITEscikKVy5KRShvLCJlcnJvciIsdC5iKHAuZ1lKKCkpLCExLHIpCm8uc2Vu
-ZCgpCnJldHVybiBxfSwKQzA6ZnVuY3Rpb24oYSxiKXthPTUzNjg3MDkxMSZhK2IKYT01MzY4NzA5MTEm
-YSsoKDUyNDI4NyZhKTw8MTApCnJldHVybiBhXmE+Pj42fSwKckU6ZnVuY3Rpb24oYSxiLGMsZCl7dmFy
-IHQ9Vy5DMChXLkMwKFcuQzAoVy5DMCgwLGEpLGIpLGMpLGQpLHM9NTM2ODcwOTExJnQrKCg2NzEwODg2
-MyZ0KTw8MykKc149cz4+PjExCnJldHVybiA1MzY4NzA5MTEmcysoKDE2MzgzJnMpPDwxNSl9LApUTjpm
-dW5jdGlvbihhLGIpe3ZhciB0LHMscj1hLmNsYXNzTGlzdApmb3IodD1iLmxlbmd0aCxzPTA7czxiLmxl
-bmd0aDtiLmxlbmd0aD09PXR8fCgwLEgubGspKGIpLCsrcylyLmFkZChiW3NdKX0sCkpFOmZ1bmN0aW9u
-KGEsYixjLGQsZSl7dmFyIHQ9Vy5hRihuZXcgVy52TihjKSx1LkIpCmlmKHQhPW51bGwmJiEwKUouZFoo
-YSxiLHQsITEpCnJldHVybiBuZXcgVy54QyhhLGIsdCwhMSxlLkMoInhDPDA+IikpfSwKVHc6ZnVuY3Rp
-b24oYSl7dmFyIHQ9ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYSIpLHM9bmV3IFcubWsodCx3aW5kb3cu
-bG9jYXRpb24pCnM9bmV3IFcuSlEocykKcy5DWShhKQpyZXR1cm4gc30sCnlXOmZ1bmN0aW9uKGEsYixj
-LGQpe3UuaC5iKGEpCkgueShiKQpILnkoYykKdS5PLmIoZCkKcmV0dXJuITB9LApRVzpmdW5jdGlvbihh
-LGIsYyxkKXt2YXIgdCxzLHIKdS5oLmIoYSkKSC55KGIpCkgueShjKQp0PXUuTy5iKGQpLmEKcz10LmEK
-cy5ocmVmPWMKcj1zLmhvc3RuYW1lCnQ9dC5iCmlmKCEocj09dC5ob3N0bmFtZSYmcy5wb3J0PT10LnBv
-cnQmJnMucHJvdG9jb2w9PXQucHJvdG9jb2wpKWlmKHI9PT0iIilpZihzLnBvcnQ9PT0iIil7dD1zLnBy
-b3RvY29sCnQ9dD09PSI6Inx8dD09PSIifWVsc2UgdD0hMQplbHNlIHQ9ITEKZWxzZSB0PSEwCnJldHVy
-biB0fSwKQmw6ZnVuY3Rpb24oKXt2YXIgdD11Lk4scz1QLnRNKEMuUXgsdCkscj11LmRHLmIobmV3IFcu
-SUEoKSkscT1ILlZNKFsiVEVNUExBVEUiXSx1LnMpCnQ9bmV3IFcuY3QocyxQLkxzKHQpLFAuTHModCks
-UC5Mcyh0KSxudWxsKQp0LkNZKG51bGwsbmV3IEguQTgoQy5ReCxyLHUuZHYpLHEsbnVsbCkKcmV0dXJu
-IHR9LAp1VjpmdW5jdGlvbihhKXtpZihhPT1udWxsKXJldHVybiBudWxsCnJldHVybiBXLlAxKGEpfSwK
-cWM6ZnVuY3Rpb24oYSl7dmFyIHQKaWYoYT09bnVsbClyZXR1cm4gbnVsbAppZigicG9zdE1lc3NhZ2Ui
-IGluIGEpe3Q9Vy5QMShhKQpyZXR1cm4gdH1lbHNlIHJldHVybiB1LmFTLmIoYSl9LApQMTpmdW5jdGlv
-bihhKXtpZihhPT09d2luZG93KXJldHVybiB1LmNpLmIoYSkKZWxzZSByZXR1cm4gbmV3IFcuZFcoYSl9
-LAp6WDpmdW5jdGlvbihhKXtpZihhPT09d2luZG93LmxvY2F0aW9uKXJldHVybiBhCmVsc2UgcmV0dXJu
-IG5ldyBXLkZiKCl9LAphRjpmdW5jdGlvbihhLGIpe3ZhciB0PSQuWDMKaWYodD09PUMuTlUpcmV0dXJu
-IGEKcmV0dXJuIHQuUHkoYSxiKX0sCnFFOmZ1bmN0aW9uIHFFKCl7fSwKR2g6ZnVuY3Rpb24gR2goKXt9
-LApmWTpmdW5jdGlvbiBmWSgpe30sCm5COmZ1bmN0aW9uIG5CKCl7fSwKQXo6ZnVuY3Rpb24gQXooKXt9
-LApRUDpmdW5jdGlvbiBRUCgpe30sCm54OmZ1bmN0aW9uIG54KCl7fSwKb0o6ZnVuY3Rpb24gb0ooKXt9
-LAppZDpmdW5jdGlvbiBpZCgpe30sClFGOmZ1bmN0aW9uIFFGKCl7fSwKTmg6ZnVuY3Rpb24gTmgoKXt9
-LApJQjpmdW5jdGlvbiBJQigpe30sCm43OmZ1bmN0aW9uIG43KCl7fSwKd3o6ZnVuY3Rpb24gd3ooYSxi
-KXt0aGlzLmE9YQp0aGlzLiR0aT1ifSwKY3Y6ZnVuY3Rpb24gY3YoKXt9LApDdjpmdW5jdGlvbiBDdigp
-e30sCmVhOmZ1bmN0aW9uIGVhKCl7fSwKRDA6ZnVuY3Rpb24gRDAoKXt9LApUNTpmdW5jdGlvbiBUNSgp
-e30sCmg0OmZ1bmN0aW9uIGg0KCl7fSwKYnI6ZnVuY3Rpb24gYnIoKXt9LApWYjpmdW5jdGlvbiBWYigp
-e30sCk83OmZ1bmN0aW9uIE83KCl7fSwKYlU6ZnVuY3Rpb24gYlUoYSl7dGhpcy5hPWF9LApoSDpmdW5j
-dGlvbiBoSChhLGIpe3RoaXMuYT1hCnRoaXMuYj1ifSwKd2E6ZnVuY3Rpb24gd2EoKXt9LApTZzpmdW5j
-dGlvbiBTZygpe30sCnU4OmZ1bmN0aW9uIHU4KCl7fSwKQWo6ZnVuY3Rpb24gQWooKXt9LAplNzpmdW5j
-dGlvbiBlNyhhKXt0aGlzLmE9YX0sCnVIOmZ1bmN0aW9uIHVIKCl7fSwKQkg6ZnVuY3Rpb24gQkgoKXt9
-LApTTjpmdW5jdGlvbiBTTigpe30sCmV3OmZ1bmN0aW9uIGV3KCl7fSwKbHA6ZnVuY3Rpb24gbHAoKXt9
-LApUYjpmdW5jdGlvbiBUYigpe30sCkl2OmZ1bmN0aW9uIEl2KCl7fSwKQlQ6ZnVuY3Rpb24gQlQoKXt9
-LAp5WTpmdW5jdGlvbiB5WSgpe30sCnc2OmZ1bmN0aW9uIHc2KCl7fSwKSzU6ZnVuY3Rpb24gSzUoKXt9
-LApDbTpmdW5jdGlvbiBDbSgpe30sCkNROmZ1bmN0aW9uIENRKCl7fSwKdzQ6ZnVuY3Rpb24gdzQoKXt9
-LApyaDpmdW5jdGlvbiByaCgpe30sCmNmOmZ1bmN0aW9uIGNmKCl7fSwKaTc6ZnVuY3Rpb24gaTcoYSl7
-dGhpcy5hPWF9LApTeTpmdW5jdGlvbiBTeShhKXt0aGlzLmE9YX0sCktTOmZ1bmN0aW9uIEtTKGEsYil7
-dGhpcy5hPWEKdGhpcy5iPWJ9LApBMzpmdW5jdGlvbiBBMyhhLGIpe3RoaXMuYT1hCnRoaXMuYj1ifSwK
-STQ6ZnVuY3Rpb24gSTQoYSl7dGhpcy5hPWF9LApGazpmdW5jdGlvbiBGayhhLGIpe3RoaXMuYT1hCnRo
-aXMuJHRpPWJ9LApSTzpmdW5jdGlvbiBSTyhhLGIsYyxkKXt2YXIgXz10aGlzCl8uYT1hCl8uYj1iCl8u
-Yz1jCl8uJHRpPWR9LApDcTpmdW5jdGlvbiBDcShhLGIsYyxkKXt2YXIgXz10aGlzCl8uYT1hCl8uYj1i
-Cl8uYz1jCl8uJHRpPWR9LAp4QzpmdW5jdGlvbiB4QyhhLGIsYyxkLGUpe3ZhciBfPXRoaXMKXy5iPWEK
-Xy5jPWIKXy5kPWMKXy5lPWQKXy4kdGk9ZX0sCnZOOmZ1bmN0aW9uIHZOKGEpe3RoaXMuYT1hfSwKSlE6
-ZnVuY3Rpb24gSlEoYSl7dGhpcy5hPWF9LApHbTpmdW5jdGlvbiBHbSgpe30sCnZEOmZ1bmN0aW9uIHZE
-KGEpe3RoaXMuYT1hfSwKVXY6ZnVuY3Rpb24gVXYoYSl7dGhpcy5hPWF9LApFZzpmdW5jdGlvbiBFZyhh
-LGIsYyl7dGhpcy5hPWEKdGhpcy5iPWIKdGhpcy5jPWN9LAptNjpmdW5jdGlvbiBtNigpe30sCkVvOmZ1
-bmN0aW9uIEVvKCl7fSwKV2s6ZnVuY3Rpb24gV2soKXt9LApjdDpmdW5jdGlvbiBjdChhLGIsYyxkLGUp
-e3ZhciBfPXRoaXMKXy5lPWEKXy5hPWIKXy5iPWMKXy5jPWQKXy5kPWV9LApJQTpmdW5jdGlvbiBJQSgp
-e30sCk93OmZ1bmN0aW9uIE93KCl7fSwKVzk6ZnVuY3Rpb24gVzkoYSxiLGMpe3ZhciBfPXRoaXMKXy5h
-PWEKXy5iPWIKXy5jPS0xCl8uZD1udWxsCl8uJHRpPWN9LApkVzpmdW5jdGlvbiBkVyhhKXt0aGlzLmE9
-YX0sCkZiOmZ1bmN0aW9uIEZiKCl7fSwKa0Y6ZnVuY3Rpb24ga0YoKXt9LAptazpmdW5jdGlvbiBtayhh
-LGIpe3RoaXMuYT1hCnRoaXMuYj1ifSwKS286ZnVuY3Rpb24gS28oYSl7dGhpcy5hPWF9LApmbTpmdW5j
-dGlvbiBmbShhKXt0aGlzLmE9YX0sCkxlOmZ1bmN0aW9uIExlKCl7fSwKSzc6ZnVuY3Rpb24gSzcoKXt9
-LApyQjpmdW5jdGlvbiByQigpe30sClhXOmZ1bmN0aW9uIFhXKCl7fSwKb2E6ZnVuY3Rpb24gb2EoKXt9
-fSxVPXsKeXU6ZnVuY3Rpb24oYSl7dmFyIHQscyxyLHEscCxvLG49SC5WTShbXSx1LmJQKQpmb3IodD1K
-LlU2KGEpLHM9Si5JVCh1LlIuYih0LnEoYSwiZGV0YWlscyIpKSk7cy5GKCk7KXtyPXMuZ2woKQpxPUou
-VTYocikKcD1ILnkocS5xKHIsImRlc2NyaXB0aW9uIikpCnE9cS5xKHIsImxpbmsiKQppZihxPT1udWxs
-KXE9bnVsbAplbHNle289Si5VNihxKQpxPW5ldyBVLk1sKEgueShvLnEocSwiaHJlZiIpKSxILlNjKG8u
-cShxLCJsaW5lIikpLEgueShvLnEocSwicGF0aCIpKSl9Qy5ObS5pKG4sbmV3IFUudUYocCxxKSl9cmV0
-dXJuIG5ldyBVLmQyKG4sVS5qZih0LnEoYSwiZWRpdHMiKSksSC55KHQucShhLCJleHBsYW5hdGlvbiIp
-KSxILlNjKHQucShhLCJsaW5lIikpLEgueSh0LnEoYSwicGF0aCIpKSxVLk5kKHQucShhLCJ0cmFjZXMi
-KSkpfSwKamY6ZnVuY3Rpb24oYSl7dmFyIHQscyxyLHEKaWYoYT09bnVsbCl0PW51bGwKZWxzZXt0PUgu
-Vk0oW10sdS5mQSkKZm9yKHM9Si5JVCh1LlIuYihhKSk7cy5GKCk7KXtyPXMuZ2woKQpxPUouVTYocikK
-Qy5ObS5pKHQsbmV3IFUuU2UoSC55KHEucShyLCJkZXNjcmlwdGlvbiIpKSxILnkocS5xKHIsImhyZWYi
-KSkpKX19cmV0dXJuIHR9LApOZDpmdW5jdGlvbihhKXt2YXIgdCxzCmlmKGE9PW51bGwpdD1udWxsCmVs
-c2V7dD1ILlZNKFtdLHUuaGgpCmZvcihzPUouSVQodS5SLmIoYSkpO3MuRigpOylDLk5tLmkodCxVLk5m
-KHMuZ2woKSkpfXJldHVybiB0fSwKTmY6ZnVuY3Rpb24oYSl7dmFyIHQscyxyLHEscCxvPSJkZXNjcmlw
-dGlvbiIsbj1KLlU2KGEpLG09SC55KG4ucShhLG8pKSxsPUguVk0oW10sdS5hSikKZm9yKG49Si5JVCh1
-LlIuYihuLnEoYSwiZW50cmllcyIpKSk7bi5GKCk7KXt0PW4uZ2woKQpzPUouVTYodCkKcj1ILnkocy5x
-KHQsbykpCnE9SC55KHMucSh0LCJmdW5jdGlvbiIpKQpzPXMucSh0LCJsaW5rIikKaWYocz09bnVsbClz
-PW51bGwKZWxzZXtwPUouVTYocykKcz1uZXcgVS5NbChILnkocC5xKHMsImhyZWYiKSksSC5TYyhwLnEo
-cywibGluZSIpKSxILnkocC5xKHMsInBhdGgiKSkpfUMuTm0uaShsLG5ldyBVLndiKHIscSxzKSl9cmV0
-dXJuIG5ldyBVLnlEKG0sbCl9LApkMjpmdW5jdGlvbiBkMihhLGIsYyxkLGUsZil7dmFyIF89dGhpcwpf
-LmE9YQpfLmI9YgpfLmM9YwpfLmQ9ZApfLmU9ZQpfLmY9Zn0sClNlOmZ1bmN0aW9uIFNlKGEsYil7dGhp
-cy5hPWEKdGhpcy5iPWJ9LAp1RjpmdW5jdGlvbiB1RihhLGIpe3RoaXMuYT1hCnRoaXMuYj1ifSwKTWw6
-ZnVuY3Rpb24gTWwoYSxiLGMpe3RoaXMuYT1hCnRoaXMuYj1iCnRoaXMuYz1jfSwKeUQ6ZnVuY3Rpb24g
-eUQoYSxiKXt0aGlzLmE9YQp0aGlzLmI9Yn0sCndiOmZ1bmN0aW9uIHdiKGEsYixjKXt0aGlzLmE9YQp0
-aGlzLmI9Ygp0aGlzLmM9Y319LEI9ewpZZjpmdW5jdGlvbihhKXt2YXIgdCxzLHIscT1ILnkoYS5xKDAs
-InJlZ2lvbnMiKSkscD1ILnkoYS5xKDAsIm5hdmlnYXRpb25Db250ZW50IikpLG89SC55KGEucSgwLCJz
-b3VyY2VDb2RlIikpLG49SC5WTShbXSx1LnUpCmZvcih0PUouSVQodS5SLmIoYS5xKDAsImVkaXRzIikp
-KTt0LkYoKTspe3M9dC5nbCgpCnI9Si5VNihzKQpDLk5tLmkobixuZXcgQi5qOChILlNjKHIucShzLCJs
-aW5lIikpLEgueShyLnEocywiZXhwbGFuYXRpb24iKSksSC5TYyhyLnEocywib2Zmc2V0IikpKSl9cmV0
-dXJuIG5ldyBCLnFwKHEscCxvLG4pfSwKajg6ZnVuY3Rpb24gajgoYSxiLGMpe3RoaXMuYT1hCnRoaXMu
-Yj1iCnRoaXMuYz1jfSwKcXA6ZnVuY3Rpb24gcXAoYSxiLGMsZCl7dmFyIF89dGhpcwpfLmE9YQpfLmI9
-YgpfLmM9YwpfLmQ9ZH0sCkx1OmZ1bmN0aW9uIEx1KCl7fSwKT1M6ZnVuY3Rpb24oYSl7dmFyIHQKaWYo
-IShhPj02NSYmYTw9OTApKXQ9YT49OTcmJmE8PTEyMgplbHNlIHQ9ITAKcmV0dXJuIHR9LApZdTpmdW5j
-dGlvbihhLGIpe3ZhciB0PWEubGVuZ3RoLHM9YisyCmlmKHQ8cylyZXR1cm4hMQppZighQi5PUyhDLnhC
-Lm0oYSxiKSkpcmV0dXJuITEKaWYoQy54Qi5tKGEsYisxKSE9PTU4KXJldHVybiExCmlmKHQ9PT1zKXJl
-dHVybiEwCnJldHVybiBDLnhCLm0oYSxzKT09PTQ3fX0sVD17R1Y6ZnVuY3Rpb24gR1YoKXt9fSxMPXsK
-SXE6ZnVuY3Rpb24oKXtDLkJaLkIoZG9jdW1lbnQsIkRPTUNvbnRlbnRMb2FkZWQiLG5ldyBMLmUoKSkK
-Qy5vbC5CKHdpbmRvdywicG9wc3RhdGUiLG5ldyBMLkwoKSl9LAprejpmdW5jdGlvbihhKXt2YXIgdCxz
-PXUuaC5hKGEucGFyZW50Tm9kZSkucXVlcnlTZWxlY3RvcigiOnNjb3BlID4gdWwiKSxyPXMuc3R5bGUs
-cT0iIitDLkNELnpRKHMub2Zmc2V0SGVpZ2h0KSoyKyJweCIKci5tYXhIZWlnaHQ9cQpyPUoucUYoYSkK
-cT1yLiR0aQp0PXEuQygifigxKSIpLmIobmV3IEwuV3gocyxhKSkKdS5NLmIobnVsbCkKVy5KRShyLmEs
-ci5iLHQsITEscS5kKX0sCnlYOmZ1bmN0aW9uKGEsYil7dmFyIHQscyxyLHEscCxvPSJxdWVyeVNlbGVj
-dG9yQWxsIixuPWRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoYSksbT11LmgKbi50b1N0cmluZwpILkRoKG0s
-bSwiVCIsbykKdD11LlMKcz1uZXcgVy53eihuLnF1ZXJ5U2VsZWN0b3JBbGwoIi5uYXYtbGluayIpLHQp
-CnMuSyhzLG5ldyBMLkFPKGIpKQpILkRoKG0sbSwiVCIsbykKcj1uZXcgVy53eihuLnF1ZXJ5U2VsZWN0
-b3JBbGwoIi5yZWdpb24iKSx0KQppZihyLmdBKHIpIT09MCl7cT1uLnF1ZXJ5U2VsZWN0b3IoInRhYmxl
-W2RhdGEtcGF0aF0iKQpxLnRvU3RyaW5nCnIuSyhyLG5ldyBMLkhvKHEuZ2V0QXR0cmlidXRlKCJkYXRh
-LSIrbmV3IFcuU3kobmV3IFcuaTcocSkpLk8oInBhdGgiKSkpKX1ILkRoKG0sbSwiVCIsbykKcD1uZXcg
-Vy53eihuLnF1ZXJ5U2VsZWN0b3JBbGwoIi5wb3N0LWxpbmsiKSx0KQpwLksocCxuZXcgTC5JQygpKX0s
-CnR5OmZ1bmN0aW9uKGEpe3ZhciB0PXUuTgpyZXR1cm4gVy5xRChhLCJQT1NUIixQLkVGKFsiQ29udGVu
-dC1UeXBlIiwiYXBwbGljYXRpb24vanNvbjsgY2hhcnNldD1VVEYtOCJdLHQsdCkpLlc3KG5ldyBMLkwx
-KCksdS5yKX0sCmFLOmZ1bmN0aW9uKGEpe3ZhciB0PVAuaEsoYSkuZ2hZKCkucSgwLCJsaW5lIikKcmV0
-dXJuIHQ9PW51bGw/bnVsbDpILkhwKHQsbnVsbCl9LApHNjpmdW5jdGlvbihhKXt2YXIgdD1QLmhLKGEp
-LmdoWSgpLnEoMCwib2Zmc2V0IikKcmV0dXJuIHQ9PW51bGw/bnVsbDpILkhwKHQsbnVsbCl9LAp0Mjpm
-dW5jdGlvbihhLGIsYyl7dmFyIHQscyxyLHEscCxvPXt9LG49by5hPXUuaC5iKFcucWMoYS5jdXJyZW50
-VGFyZ2V0KSkuZ2V0QXR0cmlidXRlKCJocmVmIikKaWYoSi56bChuLCI/Iikpe3Q9Qy54Qi5OaihuLDAs
-Qy54Qi5PWShuLCI/IikpCm8uYT10CnM9dH1lbHNlIHM9bgppZihjIT1udWxsKXtyPSQublUoKQpzPW8u
-YT1yLm81KEQubnIoci50TShjKSxzKSl9cT1MLkc2KG4pCnA9TC5hSyhuKQppZihxIT1udWxsKUwuYWYo
-cyxxLHAsYixuZXcgTC5uVChvLHEscCkpCmVsc2UgTC5hZihzLG51bGwsbnVsbCxiLG5ldyBMLkJaKG8p
-KQphLnByZXZlbnREZWZhdWx0KCl9LAp1bTpmdW5jdGlvbihhKXtyZXR1cm4gTC5RUyh1LlYuYihhKSl9
-LApRUzpmdW5jdGlvbihhKXt2YXIgdD0wLHM9UC5GWCh1LnopLHI9MSxxLHA9W10sbyxuLG0sbCxrLGoK
-dmFyICRhc3luYyR1bT1QLmx6KGZ1bmN0aW9uKGIsYyl7aWYoYj09PTEpe3E9Ywp0PXJ9d2hpbGUodHJ1
-ZSlzd2l0Y2godCl7Y2FzZSAwOms9dS5oLmEoVy5xYyhhLmN1cnJlbnRUYXJnZXQpKS5nZXRBdHRyaWJ1
-dGUoImhyZWYiKQphLnByZXZlbnREZWZhdWx0KCkKbT1kb2N1bWVudAptLmJvZHkuY2xhc3NMaXN0LmFk
-ZCgicmVydW5uaW5nIikKcj0zCnQ9NgpyZXR1cm4gUC5qUShMLnR5KGspLCRhc3luYyR1bSkKY2FzZSA2
-OnUuRi5hKEouR3IoVy51VihtLmRlZmF1bHRWaWV3KSkpLnJlbG9hZCgpCnAucHVzaCg1KQp0PTQKYnJl
-YWsKY2FzZSAzOnI9MgpqPXEKbz1ILlJ1KGopCm49SC50cyhqKQpMLnFKKCJoYW5kbGVQb3N0TGlua0Ns
-aWNrOiAiK0guZChvKSxuKQp3aW5kb3cuYWxlcnQoIkNvdWxkIG5vdCBsb2FkICIrSC5kKGspKyIgKCIr
-SC5kKG8pKyIpLiIpCnAucHVzaCg1KQp0PTQKYnJlYWsKY2FzZSAyOnA9WzFdCmNhc2UgNDpyPTEKbS5i
-b2R5LmNsYXNzTGlzdC5yZW1vdmUoInJlcnVubmluZyIpCnQ9cC5wb3AoKQpicmVhawpjYXNlIDU6cmV0
-dXJuIFAueUMobnVsbCxzKQpjYXNlIDE6cmV0dXJuIFAuZjMocSxzKX19KQpyZXR1cm4gUC5ESSgkYXN5
-bmMkdW0scyl9LAp2VTpmdW5jdGlvbigpe3ZhciB0PWRvY3VtZW50LHM9dS5oCkguRGgocyxzLCJUIiwi
-cXVlcnlTZWxlY3RvckFsbCIpCnQ9bmV3IFcud3oodC5xdWVyeVNlbGVjdG9yQWxsKCIuY29kZSIpLHUu
-UykKdC5LKHQsbmV3IEwuR0goKSl9LApoWDpmdW5jdGlvbihhLGIpe3ZhciB0PXUuTgpXLnFEKEguZChh
-KSsiP3JlZ2lvbj1yZWdpb24mb2Zmc2V0PSIrSC5kKGIpLG51bGwsUC5FRihbIkNvbnRlbnQtVHlwZSIs
-ImFwcGxpY2F0aW9uL2pzb247IGNoYXJzZXQ9VVRGLTgiXSx0LHQpKS5XNyhuZXcgTC5EVCgpLHUuUCku
-T0EobmV3IEwuZUgoYSkpfSwKRzc6ZnVuY3Rpb24oYSxiLGMsZCxlKXt2YXIgdCxzCmlmKCFKLnJZKGEp
-LlRjKGEsIi5kYXJ0Iikpe0wuQkUoYSxuZXcgQi5xcCgiIiwiIiwiIixDLnhEKSxkKQpMLkJYKGEsbnVs
-bCkKaWYoZSE9bnVsbCllLiQwKCkKcmV0dXJufXQ9Qy54Qi50ZyhhLCI/Iik/YSsiJmlubGluZT10cnVl
-IjphKyI/aW5saW5lPXRydWUiCnM9dS5OClcucUQodCxudWxsLFAuRUYoWyJDb250ZW50LVR5cGUiLCJh
-cHBsaWNhdGlvbi9qc29uOyBjaGFyc2V0PVVURi04Il0scyxzKSkuVzcobmV3IEwuekQoYSxkLGIsYyxl
-KSx1LlApLk9BKG5ldyBMLk9FKGEpKX0sCkdlOmZ1bmN0aW9uKCl7dmFyIHQ9Ii9fcHJldmlldy9uYXZp
-Z2F0aW9uVHJlZS5qc29uIixzPXUuTgpXLnFEKHQsbnVsbCxQLkVGKFsiQ29udGVudC1UeXBlIiwiYXBw
-bGljYXRpb24vanNvbjsgY2hhcnNldD1VVEYtOCJdLHMscykpLlc3KG5ldyBMLlRXKCksdS5QKS5PQShu
-ZXcgTC54cih0KSl9LApxSjpmdW5jdGlvbihhLGIpe3ZhciB0CndpbmRvdwppZih0eXBlb2YgY29uc29s
-ZSE9InVuZGVmaW5lZCIpd2luZG93LmNvbnNvbGUuZXJyb3IoYSkKd2luZG93CnQ9SC5kKGIpCmlmKHR5
-cGVvZiBjb25zb2xlIT0idW5kZWZpbmVkIil3aW5kb3cuY29uc29sZS5lcnJvcih0KX0sCnFPOmZ1bmN0
-aW9uKGEpe3ZhciB0PWEuZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCkscz1DLkNELnpRKCQuZmkoKS5vZmZz
-ZXRIZWlnaHQpLHI9d2luZG93LmlubmVySGVpZ2h0LHE9Qy5DRC56USgkLkRXKCkub2Zmc2V0SGVpZ2h0
-KQppZih0eXBlb2YgciE9PSJudW1iZXIiKXJldHVybiByLkhOKCkKaWYodC5ib3R0b20+ci0ocSsxNCkp
-Si5kaChhKQplbHNlIGlmKHQudG9wPHMrMTQpSi5kaChhKX0sCmZHOmZ1bmN0aW9uKGEsYil7dmFyIHQs
-cyxyCmlmKGEhPW51bGwpe3Q9ZG9jdW1lbnQKcz10LmdldEVsZW1lbnRCeUlkKCJvIitILmQoYSkpCnI9
-dC5xdWVyeVNlbGVjdG9yKCIubGluZS0iK0guZChiKSkKaWYocyE9bnVsbCl7TC5xTyhzKQpKLmRSKHMp
-LmkoMCwidGFyZ2V0Iil9ZWxzZSBpZihyIT1udWxsKUwucU8oci5wYXJlbnRFbGVtZW50KQppZihyIT1u
-dWxsKUouZFIodS5oLmEoci5wYXJlbnROb2RlKSkuaSgwLCJoaWdobGlnaHQiKX1lbHNlIEwucU8oJC5E
-OSgpKX0sCmFmOmZ1bmN0aW9uKGEsYixjLGQsZSl7dmFyIHQscyxyPUwuRzYod2luZG93LmxvY2F0aW9u
-LmhyZWYpLHE9TC5hSyh3aW5kb3cubG9jYXRpb24uaHJlZikKaWYociE9bnVsbCl7dD1kb2N1bWVudC5n
-ZXRFbGVtZW50QnlJZCgibyIrSC5kKHIpKQppZih0IT1udWxsKUouZFIodCkuUigwLCJ0YXJnZXQiKX1p
-ZihxIT1udWxsKXtzPWRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoIi5saW5lLSIrSC5kKHEpKQppZihzIT1u
-dWxsKUouZFIocy5wYXJlbnRFbGVtZW50KS5SKDAsImhpZ2hsaWdodCIpfWlmKGE9PXdpbmRvdy5sb2Nh
-dGlvbi5wYXRobmFtZSl7TC5mRyhiLGMpCmUuJDAoKX1lbHNlIEwuRzcoYSxiLGMsZCxlKX0sCkx4OmZ1
-bmN0aW9uKGEsYil7dmFyIHQKaWYoYT09PTEpdD1iCmVsc2UgdD1iKyJzIgpyZXR1cm4gdH0sClQxOmZ1
-bmN0aW9uKGEpe3ZhciB0LHMscixxLHAsbyxuLG0sbD0kLmhMKCkKSi5sNShsLCIiKQppZihhPT1udWxs
-KXt0PWRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInAiKQp0LnRleHRDb250ZW50PSJTZWUgZGV0YWlscyBh
-Ym91dCBhIHByb3Bvc2VkIGVkaXQuIgpDLkx0LnNEKHQsSC5WTShbInBsYWNlaG9sZGVyIl0sdS5zKSkK
-Si5kaCh1LmguYihsLmFwcGVuZENoaWxkKHQpKSkKcmV0dXJufXM9YS5lCnQ9JC5uVSgpCnI9dC50TShz
-KQpxPWEuYwpwPWRvY3VtZW50Cm89dC5IUChzLEouVDAocC5xdWVyeVNlbGVjdG9yKCIucm9vdCIpLnRl
-eHRDb250ZW50KSkKbj1hLmQKdD1wLmNyZWF0ZUVsZW1lbnQoInAiKQptPXUuaC5iKGwuYXBwZW5kQ2hp
-bGQodCkpCm0uYXBwZW5kQ2hpbGQocC5jcmVhdGVUZXh0Tm9kZShILmQocSkrIiBhdCAiK0guZChvKSsi
-OiIrSC5kKG4pKyIuIikpCkouZGgobSkKTC5DQyhhLGwscikKTC5GeihhLGwpCkwuTkcoYSxsLHIpfSwK
-TEg6ZnVuY3Rpb24oYSxiLGMpe3ZhciB0LHMscixxLHAsbyxuLG0sbCxrLGosaSxoLGcsZixlLGQ9JC5t
-USgpCkoubDUoZCwiIikKdD1kb2N1bWVudApzPXQuY3JlYXRlRWxlbWVudCgicCIpCnI9dS5oCnE9ci5i
-KGQuYXBwZW5kQ2hpbGQocykpCnA9Yi5sZW5ndGgKaWYocD09PTApcS5hcHBlbmRDaGlsZCh0LmNyZWF0
-ZVRleHROb2RlKCJObyBwcm9wb3NlZCBlZGl0cyIpKQplbHNlIHEuYXBwZW5kQ2hpbGQodC5jcmVhdGVU
-ZXh0Tm9kZSgiIitwKyIgcHJvcG9zZWQgIitMLkx4KHAsImVkaXQiKSsiOiIpKQpzPXQuY3JlYXRlRWxl
-bWVudCgidWwiKQpvPXIuYihkLmFwcGVuZENoaWxkKHMpKQpmb3IoZD1iLmxlbmd0aCxzPXUuaSxuPXUu
-USxtPW4uQygifigxKSIpLGw9dS5NLG49bi5kLGs9MDtrPGIubGVuZ3RoO2IubGVuZ3RoPT09ZHx8KDAs
-SC5saykoYiksKytrKXtqPWJba10KaT10LmNyZWF0ZUVsZW1lbnQoImxpIikKaD1yLmIoby5hcHBlbmRD
-aGlsZChpKSkKSi5kUihoKS5pKDAsImVkaXQiKQppPXQuY3JlYXRlRWxlbWVudCgiYSIpCmc9cy5iKGgu
-YXBwZW5kQ2hpbGQoaSkpCmcuY2xhc3NMaXN0LmFkZCgiZWRpdC1saW5rIikKZj1qLmMKaT1ILmQoZikK
-Zy5zZXRBdHRyaWJ1dGUoImRhdGEtIituZXcgVy5TeShuZXcgVy5pNyhnKSkuTygib2Zmc2V0IiksaSkK
-ZT1qLmEKaT1ILmQoZSkKZy5zZXRBdHRyaWJ1dGUoImRhdGEtIituZXcgVy5TeShuZXcgVy5pNyhnKSku
-TygibGluZSIpLGkpCmcuYXBwZW5kQ2hpbGQodC5jcmVhdGVUZXh0Tm9kZSgibGluZSAiK0guZChlKSkp
-Cmk9bS5iKG5ldyBMLkVFKGYsZSxhKSkKbC5iKG51bGwpClcuSkUoZywiY2xpY2siLGksITEsbikKaC5h
-cHBlbmRDaGlsZCh0LmNyZWF0ZVRleHROb2RlKCI6ICIrSC5kKGouYikpKX1pZihjKUwuVDEobnVsbCl9
-LApGcjpmdW5jdGlvbihhLGIsYyl7dmFyIHQscyxyLHE9d2luZG93LmxvY2F0aW9uLHA9UC5oSygocSYm
-Qy5FeCkuZ0RyKHEpK0guZChhKSkKcT11LnoKdD1QLkZsKHUuTixxKQppZihiIT1udWxsKXQuWSgwLCJv
-ZmZzZXQiLEguZChiKSkKaWYoYyE9bnVsbCl0LlkoMCwibGluZSIsSC5kKGMpKQpwPXAubm0oMCx0LmE9
-PT0wP251bGw6dCkKcz13aW5kb3cuaGlzdG9yeQpyPXAudygwKQpzLnRvU3RyaW5nCnMucHVzaFN0YXRl
-KG5ldyBQLkJmKFtdLFtdKS5QdihQLkZsKHEscSkpLCIiLHIpfSwKRW46ZnVuY3Rpb24oYSl7dmFyIHQ9
-Si5iYihkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCIucm9vdCIpLnRleHRDb250ZW50LCIvIikKaWYoQy54
-Qi5uKGEsdCkpcmV0dXJuIEMueEIuRyhhLHQubGVuZ3RoKQplbHNlIHJldHVybiBhfSwKQlg6ZnVuY3Rp
-b24oYSxiKXt2YXIgdCxzLHI9e30Kci5hPWEKYT1MLkVuKGEpCnIuYT1hCiQuRDkoKS50ZXh0Q29udGVu
-dD1hCnQ9ZG9jdW1lbnQKcz11LmgKSC5EaChzLHMsIlQiLCJxdWVyeVNlbGVjdG9yQWxsIikKdD1uZXcg
-Vy53eih0LnF1ZXJ5U2VsZWN0b3JBbGwoIi5uYXYtcGFuZWwgLm5hdi1saW5rIiksdS5TKQp0LksodCxu
-ZXcgTC5WUyhyKSl9LApCRTpmdW5jdGlvbihhLGIsYyl7dmFyIHQ9Ii5yZWdpb25zIixzPWRvY3VtZW50
-LHI9cy5xdWVyeVNlbGVjdG9yKHQpLHE9cy5xdWVyeVNlbGVjdG9yKCIuY29kZSIpCkoudEgocixiLmEs
-JC5LRygpKQpKLnRIKHEsYi5iLCQuS0coKSkKTC5MSChhLGIuZCxjKQpMLnZVKCkKTC55WCgiLmNvZGUi
-LCEwKQpMLnlYKHQsITApfSwKdFg6ZnVuY3Rpb24oYSxiKXt2YXIgdCxzLHIscSxwLG8sbixtLGwsayxq
-LGk9ZG9jdW1lbnQsaD1pLmNyZWF0ZUVsZW1lbnQoInVsIiksZz11LmgsZj1nLmIoYS5hcHBlbmRDaGls
-ZChoKSkKZm9yKGg9Yi5sZW5ndGgsdD11Lk0scz0wO3M8Yi5sZW5ndGg7Yi5sZW5ndGg9PT1ofHwoMCxI
-LmxrKShiKSwrK3Mpe3I9YltzXQpxPWkuY3JlYXRlRWxlbWVudCgibGkiKQpwPWcuYihmLmFwcGVuZENo
-aWxkKHEpKQpxPUouUkUocCkKaWYoci5hPT09Qy5ZMil7cS5nRChwKS5pKDAsImRpciIpCnE9aS5jcmVh
-dGVFbGVtZW50KCJzcGFuIikKbz1nLmIocC5hcHBlbmRDaGlsZChxKSkKcT1KLlJFKG8pCnEuZ0Qobyku
-aSgwLCJhcnJvdyIpCnEuc2hmKG8sIiYjeDI1QkM7IikKcT1pLmNyZWF0ZUVsZW1lbnQoInNwYW4iKQpK
-Lmw1KGcuYihwLmFwcGVuZENoaWxkKHEpKSwiJiN4MUY0QzE7IikKcC5hcHBlbmRDaGlsZChpLmNyZWF0
-ZVRleHROb2RlKHIuYikpCkwudFgocCxyLmMpCkwua3oobyl9ZWxzZXtxLnNoZihwLCImI3gxRjRDNDsi
-KQpxPWkuY3JlYXRlRWxlbWVudCgiYSIpCm49Zy5iKHAuYXBwZW5kQ2hpbGQocSkpCnE9Si5SRShuKQpx
-LmdEKG4pLmkoMCwibmF2LWxpbmsiKQpuLnNldEF0dHJpYnV0ZSgiZGF0YS0iK25ldyBXLlN5KG5ldyBX
-Lmk3KG4pKS5PKCJuYW1lIiksci5kKQpuLnNldEF0dHJpYnV0ZSgiaHJlZiIsci5lKQpuLmFwcGVuZENo
-aWxkKGkuY3JlYXRlVGV4dE5vZGUoci5iKSkKcT1xLmdWbChuKQptPXEuJHRpCmw9bS5DKCJ+KDEpIiku
-YihuZXcgTC5URCgpKQp0LmIobnVsbCkKVy5KRShxLmEscS5iLGwsITEsbS5kKQprPXIuZgppZih0eXBl
-b2YgayE9PSJudW1iZXIiKXJldHVybiBrLm9zKCkKaWYoaz4wKXtxPWkuY3JlYXRlRWxlbWVudCgic3Bh
-biIpCmo9Zy5iKHAuYXBwZW5kQ2hpbGQocSkpCkouZFIoaikuaSgwLCJlZGl0LWNvdW50IikKcT0iIitr
-KyIgIgppZihrPT09MSltPSJlZGl0IgplbHNlIG09ImVkaXRzIgpqLnNldEF0dHJpYnV0ZSgidGl0bGUi
-LHErbSkKai5hcHBlbmRDaGlsZChpLmNyZWF0ZVRleHROb2RlKEMuam4udyhrKSkpfX19fSwKYzQ6ZnVu
-Y3Rpb24oYSxiKXt2YXIgdD1kb2N1bWVudCxzPXQuY3JlYXRlRWxlbWVudCgiYSIpCnUuaS5iKHMpCnMu
-YXBwZW5kQ2hpbGQodC5jcmVhdGVUZXh0Tm9kZShILmQoYS5jKSsiOiIrSC5kKGEuYikpKQp0PUQubnIo
-YixhLmEpCnMuc2V0QXR0cmlidXRlKCJocmVmIiwkLm5VKCkubzUodCkpCnMuY2xhc3NMaXN0LmFkZCgi
-bmF2LWxpbmsiKQpyZXR1cm4gc30sCkZ6OmZ1bmN0aW9uKGEsYil7dmFyIHQscyxyLHEscCxvLG4sbSxs
-LGssaixpPWEuYgppZihpIT1udWxsKWZvcih0PWkubGVuZ3RoLHM9dS5oLHI9dS5zLHE9dS5YLHA9MDtw
-PGkubGVuZ3RoO2kubGVuZ3RoPT09dHx8KDAsSC5saykoaSksKytwKXtvPWlbcF0Kbj1kb2N1bWVudApt
-PW4uY3JlYXRlRWxlbWVudCgicCIpCmw9cy5iKGIuYXBwZW5kQ2hpbGQobSkpCm09bi5jcmVhdGVFbGVt
-ZW50KCJhIikKaz1zLmIobC5hcHBlbmRDaGlsZChtKSkKay5hcHBlbmRDaGlsZChuLmNyZWF0ZVRleHRO
-b2RlKG8uYSkpCmsuc2V0QXR0cmlidXRlKCJocmVmIixvLmIpCm49cS5iKEguVk0oWyJwb3N0LWxpbmsi
-LCJiZWZvcmUtYXBwbHkiXSxyKSkKaj1KLmRSKGspCmouVjEoMCkKai5GVigwLG4pfX0sCk5HOmZ1bmN0
-aW9uKGEsYixjKXt2YXIgdCxzLHIscSxwLG8sbixtLGw9YS5hCmlmKGwubGVuZ3RoIT09MCl7dD1kb2N1
-bWVudApzPXQuY3JlYXRlRWxlbWVudCgicCIpCnMudGV4dENvbnRlbnQ9IkVkaXQgcmF0aW9uYWxlIChl
-eHBlcmltZW50YWwpOiIKYi5hcHBlbmRDaGlsZChzKQpzPXQuY3JlYXRlRWxlbWVudCgidWwiKQpyPXUu
-aC5iKGIuYXBwZW5kQ2hpbGQocykpCmZvcihzPWwubGVuZ3RoLHE9MDtxPGwubGVuZ3RoO2wubGVuZ3Ro
-PT09c3x8KDAsSC5saykobCksKytxKXtwPWxbcV0Kbz10LmNyZWF0ZUVsZW1lbnQoImxpIikKbj1yLmFw
-cGVuZENoaWxkKG8pCm4uYXBwZW5kQ2hpbGQodC5jcmVhdGVUZXh0Tm9kZShwLmEpKQptPXAuYgppZiht
-IT1udWxsKXtuLmFwcGVuZENoaWxkKHQuY3JlYXRlVGV4dE5vZGUoIiAoIikpCm4uYXBwZW5kQ2hpbGQo
-TC5jNChtLGMpKQpuLmFwcGVuZENoaWxkKHQuY3JlYXRlVGV4dE5vZGUoIikiKSl9fX19LApDQzpmdW5j
-dGlvbihhLGIsYTApe3ZhciB0LHMscixxLHAsbyxuLG0sbCxrLGosaSxoLGcsZixlLGQsYwpmb3IodD1h
-LmYscz10Lmxlbmd0aCxyPXUucyxxPXUuWCxwPTA7cDx0Lmxlbmd0aDt0Lmxlbmd0aD09PXN8fCgwLEgu
-bGspKHQpLCsrcCl7bz10W3BdCm49ZG9jdW1lbnQKbT1uLmNyZWF0ZUVsZW1lbnQoInAiKQpsPXEuYihI
-LlZNKFsidHJhY2UiXSxyKSkKaz1KLmRSKG0pCmsuVjEoMCkKay5GVigwLGwpCmo9Yi5hcHBlbmRDaGls
-ZChtKQptPW4uY3JlYXRlRWxlbWVudCgic3BhbiIpCmw9cS5iKEguVk0oWyJ0eXBlLWRlc2NyaXB0aW9u
-Il0scikpCms9Si5kUihtKQprLlYxKDApCmsuRlYoMCxsKQptLmFwcGVuZENoaWxkKG4uY3JlYXRlVGV4
-dE5vZGUoby5hKSkKai5hcHBlbmRDaGlsZChtKQpqLmFwcGVuZENoaWxkKG4uY3JlYXRlVGV4dE5vZGUo
-IjoiKSkKbT1uLmNyZWF0ZUVsZW1lbnQoInVsIikKbD1xLmIoSC5WTShbInRyYWNlIl0scikpCms9Si5k
-UihtKQprLlYxKDApCmsuRlYoMCxsKQppPWouYXBwZW5kQ2hpbGQobSkKZm9yKG09by5iLGw9bS5sZW5n
-dGgsaD0wO2g8bS5sZW5ndGg7bS5sZW5ndGg9PT1sfHwoMCxILmxrKShtKSwrK2gpe2c9bVtoXQpmPW4u
-Y3JlYXRlRWxlbWVudCgibGkiKQpKLmw1KGYsIiYjeDI3NEY7ICIpCmU9aS5hcHBlbmRDaGlsZChmKQpm
-PW4uY3JlYXRlRWxlbWVudCgic3BhbiIpCmQ9cS5iKEguVk0oWyJmdW5jdGlvbiJdLHIpKQprPUouZFIo
-ZikKay5WMSgwKQprLkZWKDAsZCkKZD1nLmIKaWYoZD09bnVsbClkPSJ1bmtub3duIgpmLmFwcGVuZENo
-aWxkKG4uY3JlYXRlVGV4dE5vZGUoZCkpCmUuYXBwZW5kQ2hpbGQoZikKYz1nLmMKaWYoYyE9bnVsbCl7
-ZS5hcHBlbmRDaGlsZChuLmNyZWF0ZVRleHROb2RlKCIgKCIpKQplLmFwcGVuZENoaWxkKEwuYzQoYyxh
-MCkpCmUuYXBwZW5kQ2hpbGQobi5jcmVhdGVUZXh0Tm9kZSgiKSIpKX1lLmFwcGVuZENoaWxkKG4uY3Jl
-YXRlVGV4dE5vZGUoIjogIikpCmUuYXBwZW5kQ2hpbGQobi5jcmVhdGVUZXh0Tm9kZShnLmEpKX19fSwK
-ZTpmdW5jdGlvbiBlKCl7fSwKVlc6ZnVuY3Rpb24gVlcoYSxiLGMpe3RoaXMuYT1hCnRoaXMuYj1iCnRo
-aXMuYz1jfSwKb1o6ZnVuY3Rpb24gb1ooKXt9LApqcjpmdW5jdGlvbiBqcigpe30sCnFsOmZ1bmN0aW9u
-IHFsKCl7fSwKTDpmdW5jdGlvbiBMKCl7fSwKV3g6ZnVuY3Rpb24gV3goYSxiKXt0aGlzLmE9YQp0aGlz
-LmI9Yn0sCkFPOmZ1bmN0aW9uIEFPKGEpe3RoaXMuYT1hfSwKZE46ZnVuY3Rpb24gZE4oYSl7dGhpcy5h
-PWF9LApIbzpmdW5jdGlvbiBIbyhhKXt0aGlzLmE9YX0sCnh6OmZ1bmN0aW9uIHh6KGEsYil7dGhpcy5h
-PWEKdGhpcy5iPWJ9LApJQzpmdW5jdGlvbiBJQygpe30sCkwxOmZ1bmN0aW9uIEwxKCl7fSwKblQ6ZnVu
-Y3Rpb24gblQoYSxiLGMpe3RoaXMuYT1hCnRoaXMuYj1iCnRoaXMuYz1jfSwKQlo6ZnVuY3Rpb24gQloo
-YSl7dGhpcy5hPWF9LApHSDpmdW5jdGlvbiBHSCgpe30sCkRUOmZ1bmN0aW9uIERUKCl7fSwKZUg6ZnVu
-Y3Rpb24gZUgoYSl7dGhpcy5hPWF9LAp6RDpmdW5jdGlvbiB6RChhLGIsYyxkLGUpe3ZhciBfPXRoaXMK
-Xy5hPWEKXy5iPWIKXy5jPWMKXy5kPWQKXy5lPWV9LApPRTpmdW5jdGlvbiBPRShhKXt0aGlzLmE9YX0s
-ClRXOmZ1bmN0aW9uIFRXKCl7fSwKeHI6ZnVuY3Rpb24geHIoYSl7dGhpcy5hPWF9LApFRTpmdW5jdGlv
-biBFRShhLGIsYyl7dGhpcy5hPWEKdGhpcy5iPWIKdGhpcy5jPWN9LApRTDpmdW5jdGlvbiBRTChhLGIp
-e3RoaXMuYT1hCnRoaXMuYj1ifSwKVlM6ZnVuY3Rpb24gVlMoYSl7dGhpcy5hPWF9LApURDpmdW5jdGlv
-biBURCgpe30sClhBOmZ1bmN0aW9uIFhBKCl7fSwKbUs6ZnVuY3Rpb24oYSl7dmFyIHQscyxyLHEscCxv
-LG49SC5WTShbXSx1LmZoKQpmb3IodD1KLklUKHUuUi5iKGEpKTt0LkYoKTspe3M9dC5nbCgpCnI9Si5V
-NihzKQpxPUwucDIoSC55KHIucShzLCJ0eXBlIikpKQpwPUgueShyLnEocywibmFtZSIpKQpvPXIucShz
-LCJzdWJ0cmVlIikKbz1vPT1udWxsP251bGw6TC5tSyhvKQpDLk5tLmkobixuZXcgTC5aWihxLHAsbyxI
-Lnkoci5xKHMsInBhdGgiKSksSC55KHIucShzLCJocmVmIikpLEguU2Moci5xKHMsImVkaXRDb3VudCIp
-KSkpfXJldHVybiBufSwKcDI6ZnVuY3Rpb24oYSl7c3dpdGNoKGEpe2Nhc2UiZGlyZWN0b3J5IjpyZXR1
-cm4gQy5ZMgpjYXNlImZpbGUiOnJldHVybiBDLnJmCmRlZmF1bHQ6dGhyb3cgSC5iKFAuUFYoIlVucmVj
-b2duaXplZCBuYXZpZ2F0aW9uIHRyZWUgbm9kZSB0eXBlOiAiK0guZChhKSkpfX0sClpaOmZ1bmN0aW9u
-IFpaKGEsYixjLGQsZSxmKXt2YXIgXz10aGlzCl8uYT1hCl8uYj1iCl8uYz1jCl8uZD1kCl8uZT1lCl8u
-Zj1mfSwKeTg6ZnVuY3Rpb24geTgoYSl7dGhpcy5iPWF9LApJVjpmdW5jdGlvbiBJVihhLGIsYyxkKXt2
-YXIgXz10aGlzCl8uZD1hCl8uZT1iCl8uZj1jCl8ucj1kfX0sTT17CllGOmZ1bmN0aW9uKGEsYil7dmFy
-IHQscyxyLHEscCxvLG4KZm9yKHQ9Yi5sZW5ndGgscz0xO3M8dDsrK3Mpe2lmKGJbc109PW51bGx8fGJb
-cy0xXSE9bnVsbCljb250aW51ZQpmb3IoO3Q+PTE7dD1yKXtyPXQtMQppZihiW3JdIT1udWxsKWJyZWFr
-fXE9bmV3IFAuUm4oIiIpCnA9YSsiKCIKcS5hPXAKbz1ILnFDKGIsMCx0LEgudDYoYikuZCkKbj1vLiR0
-aQpuPXArbmV3IEguQTgobyxuLkMoInFVKGFMLkUpIikuYihuZXcgTS5ObygpKSxuLkMoIkE4PGFMLkUs
-cVU+IikpLkgoMCwiLCAiKQpxLmE9bgpxLmE9bisoIik6IHBhcnQgIisocy0xKSsiIHdhcyBudWxsLCBi
-dXQgcGFydCAiK3MrIiB3YXMgbm90LiIpCnRocm93IEguYihQLnhZKHEudygwKSkpfX0sCmxJOmZ1bmN0
-aW9uIGxJKGEpe3RoaXMuYT1hfSwKTWk6ZnVuY3Rpb24gTWkoKXt9LApxNzpmdW5jdGlvbiBxNygpe30s
-Ck5vOmZ1bmN0aW9uIE5vKCl7fX0sWD17CkNMOmZ1bmN0aW9uKGEsYil7dmFyIHQscyxyLHEscCxvPWIu
-eFooYSkKYi5oSyhhKQppZihvIT1udWxsKWE9Si5LVihhLG8ubGVuZ3RoKQp0PXUucwpzPUguVk0oW10s
-dCkKcj1ILlZNKFtdLHQpCnQ9YS5sZW5ndGgKaWYodCE9PTAmJmIucjQoQy54Qi5XKGEsMCkpKXtpZigw
-Pj10KXJldHVybiBILk9IKGEsMCkKQy5ObS5pKHIsYVswXSkKcT0xfWVsc2V7Qy5ObS5pKHIsIiIpCnE9
-MH1mb3IocD1xO3A8dDsrK3ApaWYoYi5yNChDLnhCLlcoYSxwKSkpe0MuTm0uaShzLEMueEIuTmooYSxx
-LHApKQpDLk5tLmkocixhW3BdKQpxPXArMX1pZihxPHQpe0MuTm0uaShzLEMueEIuRyhhLHEpKQpDLk5t
-LmkociwiIil9cmV0dXJuIG5ldyBYLldEKGIsbyxzLHIpfSwKV0Q6ZnVuY3Rpb24gV0QoYSxiLGMsZCl7
-dmFyIF89dGhpcwpfLmE9YQpfLmI9YgpfLmQ9YwpfLmU9ZH0sCnFSOmZ1bmN0aW9uIHFSKGEpe3RoaXMu
-YT1hfSwKSlQ6ZnVuY3Rpb24oYSl7cmV0dXJuIG5ldyBYLmR2KGEpfSwKZHY6ZnVuY3Rpb24gZHYoYSl7
-dGhpcy5hPWF9fSxPPXsKUmg6ZnVuY3Rpb24oKXt2YXIgdCxzLHIscSxwLG8sbixtLGwsayxqLGk9bnVs
-bAppZihQLnVvKCkuZ0ZpKCkhPT0iZmlsZSIpcmV0dXJuICQuRWIoKQp0PVAudW8oKQppZighQy54Qi5U
-Yyh0LmdJaSh0KSwiLyIpKXJldHVybiAkLkViKCkKcz1QLlBpKGksMCwwKQpyPVAuelIoaSwwLDApCnE9
-UC5PZShpLDAsMCwhMSkKcD1QLmxlKGksMCwwLGkpCm89UC50RyhpLDAsMCkKbj1QLndCKGkscykKbT1z
-PT09ImZpbGUiCmlmKHE9PW51bGwpdD1yLmxlbmd0aCE9PTB8fG4hPW51bGx8fG0KZWxzZSB0PSExCmlm
-KHQpcT0iIgp0PXE9PW51bGwKbD0hdAprPVAua2EoImEvYiIsMCwzLGkscyxsKQpqPXMubGVuZ3RoPT09
-MAppZihqJiZ0JiYhQy54Qi5uKGssIi8iKSlrPVAud0Yoaywhanx8bCkKZWxzZSBrPVAueGUoaykKaWYo
-bmV3IFAuRG4ocyxyLHQmJkMueEIubihrLCIvLyIpPyIiOnEsbixrLHAsbykudDQoKT09PSJhXFxiIily
-ZXR1cm4gJC5LaygpCnJldHVybiAkLmJEKCl9LAp6TDpmdW5jdGlvbiB6TCgpe319LEU9e09GOmZ1bmN0
-aW9uIE9GKGEsYixjKXt0aGlzLmQ9YQp0aGlzLmU9Ygp0aGlzLmY9Y319LEY9e3J1OmZ1bmN0aW9uIHJ1
-KGEsYixjLGQpe3ZhciBfPXRoaXMKXy5kPWEKXy5lPWIKXy5mPWMKXy5yPWR9fSxEPXsKUlg6ZnVuY3Rp
-b24oKXt2YXIgdCxzLHI9UC51bygpCmlmKEouUk0ociwkLkk2KSlyZXR1cm4gJC5GZgokLkk2PXIKaWYo
-JC5IaygpPT0kLkViKCkpcmV0dXJuICQuRmY9ci5aSSgiLiIpLncoMCkKZWxzZXt0PXIudDQoKQpzPXQu
-bGVuZ3RoLTEKcmV0dXJuICQuRmY9cz09PTA/dDpDLnhCLk5qKHQsMCxzKX19LApucjpmdW5jdGlvbihh
-LGIpe3ZhciB0PW51bGwKcmV0dXJuICQublUoKS5xNygwLGEsYix0LHQsdCx0LHQsdCl9fQp2YXIgdz1b
-QyxILEosUCxXLFUsQixULEwsTSxYLE8sRSxGLERdCmh1bmtIZWxwZXJzLnNldEZ1bmN0aW9uTmFtZXNJ
-Zk5lY2Vzc2FyeSh3KQp2YXIgJD17fQpILmVvLnByb3RvdHlwZT17fQpKLnZCLnByb3RvdHlwZT17CkRO
-OmZ1bmN0aW9uKGEsYil7cmV0dXJuIGE9PT1ifSwKZ2lPOmZ1bmN0aW9uKGEpe3JldHVybiBILmVRKGEp
-fSwKdzpmdW5jdGlvbihhKXtyZXR1cm4iSW5zdGFuY2Ugb2YgJyIrSC5kKEguTShhKSkrIicifSwKZTc6
-ZnVuY3Rpb24oYSxiKXt1Lm8uYihiKQp0aHJvdyBILmIoUC5scihhLGIuZ1dhKCksYi5nbmQoKSxiLmdW
-bSgpKSl9fQpKLnlFLnByb3RvdHlwZT17Cnc6ZnVuY3Rpb24oYSl7cmV0dXJuIFN0cmluZyhhKX0sCmdp
-TzpmdW5jdGlvbihhKXtyZXR1cm4gYT81MTkwMTg6MjE4MTU5fSwKJGlhMjoxfQpKLllFLnByb3RvdHlw
-ZT17CkROOmZ1bmN0aW9uKGEsYil7cmV0dXJuIG51bGw9PWJ9LAp3OmZ1bmN0aW9uKGEpe3JldHVybiJu
-dWxsIn0sCmdpTzpmdW5jdGlvbihhKXtyZXR1cm4gMH0sCmU3OmZ1bmN0aW9uKGEsYil7cmV0dXJuIHRo
-aXMuU2ooYSx1Lm8uYihiKSl9LAokaWM4OjF9CkouTUYucHJvdG90eXBlPXsKZ2lPOmZ1bmN0aW9uKGEp
-e3JldHVybiAwfSwKdzpmdW5jdGlvbihhKXtyZXR1cm4gU3RyaW5nKGEpfSwKJGl2bToxfQpKLmlDLnBy
-b3RvdHlwZT17fQpKLmtkLnByb3RvdHlwZT17fQpKLmM1LnByb3RvdHlwZT17Cnc6ZnVuY3Rpb24oYSl7
-dmFyIHQ9YVskLncoKV0KaWYodD09bnVsbClyZXR1cm4gdGhpcy50KGEpCnJldHVybiJKYXZhU2NyaXB0
-IGZ1bmN0aW9uIGZvciAiK0guZChKLmoodCkpfSwKJFM6ZnVuY3Rpb24oKXtyZXR1cm57ZnVuYzoxLG9w
-dDpbLCwsLCwsLCwsLCwsLCwsLF19fSwKJGlFSDoxfQpKLmpkLnByb3RvdHlwZT17Cmk6ZnVuY3Rpb24o
-YSxiKXtILnQ2KGEpLmQuYihiKQppZighIWEuZml4ZWQkbGVuZ3RoKUgudmgoUC5MNCgiYWRkIikpCmEu
-cHVzaChiKX0sClc0OmZ1bmN0aW9uKGEsYil7dmFyIHQKaWYoISFhLmZpeGVkJGxlbmd0aClILnZoKFAu
-TDQoInJlbW92ZUF0IikpCnQ9YS5sZW5ndGgKaWYoYj49dCl0aHJvdyBILmIoUC54KGIsbnVsbCkpCnJl
-dHVybiBhLnNwbGljZShiLDEpWzBdfSwKVUc6ZnVuY3Rpb24oYSxiLGMpe3ZhciB0LHMscgpILnQ2KGEp
-LkMoImNYPDE+IikuYihjKQppZighIWEuZml4ZWQkbGVuZ3RoKUgudmgoUC5MNCgiaW5zZXJ0QWxsIikp
-CnQ9YS5sZW5ndGgKUC53QShiLDAsdCwiaW5kZXgiKQpzPWMubGVuZ3RoCnRoaXMuc0EoYSx0K3MpCnI9
-YitzCnRoaXMuWVcoYSxyLGEubGVuZ3RoLGEsYikKdGhpcy52ZyhhLGIscixjKX0sCm12OmZ1bmN0aW9u
-KGEpe2lmKCEhYS5maXhlZCRsZW5ndGgpSC52aChQLkw0KCJyZW1vdmVMYXN0IikpCmlmKGEubGVuZ3Ro
-PT09MCl0aHJvdyBILmIoSC5IWShhLC0xKSkKcmV0dXJuIGEucG9wKCl9LApGVjpmdW5jdGlvbihhLGIp
-e3ZhciB0CkgudDYoYSkuQygiY1g8MT4iKS5iKGIpCmlmKCEhYS5maXhlZCRsZW5ndGgpSC52aChQLkw0
-KCJhZGRBbGwiKSkKZm9yKHQ9Si5JVChiKTt0LkYoKTspYS5wdXNoKHQuZ2woKSl9LApLOmZ1bmN0aW9u
-KGEsYil7dmFyIHQscwpILnQ2KGEpLkMoIn4oMSkiKS5iKGIpCnQ9YS5sZW5ndGgKZm9yKHM9MDtzPHQ7
-KytzKXtiLiQxKGFbc10pCmlmKGEubGVuZ3RoIT09dCl0aHJvdyBILmIoUC5hNChhKSl9fSwKRTI6ZnVu
-Y3Rpb24oYSxiLGMpe3ZhciB0PUgudDYoYSkKcmV0dXJuIG5ldyBILkE4KGEsdC5LcShjKS5DKCIxKDIp
-IikuYihiKSx0LkMoIkA8MT4iKS5LcShjKS5DKCJBODwxLDI+IikpfSwKSDpmdW5jdGlvbihhLGIpe3Zh
-ciB0LHM9bmV3IEFycmF5KGEubGVuZ3RoKQpzLmZpeGVkJGxlbmd0aD1BcnJheQpmb3IodD0wO3Q8YS5s
-ZW5ndGg7Kyt0KXRoaXMuWShzLHQsSC5kKGFbdF0pKQpyZXR1cm4gcy5qb2luKGIpfSwKTjA6ZnVuY3Rp
-b24oYSxiLGMsZCl7dmFyIHQscyxyCmQuYihiKQpILnQ2KGEpLktxKGQpLkMoIjEoMSwyKSIpLmIoYykK
-dD1hLmxlbmd0aApmb3Iocz1iLHI9MDtyPHQ7KytyKXtzPWMuJDIocyxhW3JdKQppZihhLmxlbmd0aCE9
-PXQpdGhyb3cgSC5iKFAuYTQoYSkpfXJldHVybiBzfSwKRTpmdW5jdGlvbihhLGIpe2lmKGI8MHx8Yj49
-YS5sZW5ndGgpcmV0dXJuIEguT0goYSxiKQpyZXR1cm4gYVtiXX0sCkQ2OmZ1bmN0aW9uKGEsYixjKXtp
-ZihiPDB8fGI+YS5sZW5ndGgpdGhyb3cgSC5iKFAuVEUoYiwwLGEubGVuZ3RoLCJzdGFydCIsbnVsbCkp
-CmlmKGM8Ynx8Yz5hLmxlbmd0aCl0aHJvdyBILmIoUC5URShjLGIsYS5sZW5ndGgsImVuZCIsbnVsbCkp
-CmlmKGI9PT1jKXJldHVybiBILlZNKFtdLEgudDYoYSkpCnJldHVybiBILlZNKGEuc2xpY2UoYixjKSxI
-LnQ2KGEpKX0sCmdyWjpmdW5jdGlvbihhKXt2YXIgdD1hLmxlbmd0aAppZih0PjApcmV0dXJuIGFbdC0x
-XQp0aHJvdyBILmIoSC5XcCgpKX0sCllXOmZ1bmN0aW9uKGEsYixjLGQsZSl7dmFyIHQscyxyPUgudDYo
-YSkKci5DKCJjWDwxPiIpLmIoZCkKaWYoISFhLmltbXV0YWJsZSRsaXN0KUgudmgoUC5MNCgic2V0UmFu
-Z2UiKSkKUC5qQihiLGMsYS5sZW5ndGgpCnQ9Yy1iCmlmKHQ9PT0wKXJldHVybgpQLmsxKGUsInNraXBD
-b3VudCIpCnIuQygiek08MT4iKS5iKGQpCnI9Si5VNihkKQppZihlK3Q+ci5nQShkKSl0aHJvdyBILmIo
-SC5hcigpKQppZihlPGIpZm9yKHM9dC0xO3M+PTA7LS1zKWFbYitzXT1yLnEoZCxlK3MpCmVsc2UgZm9y
-KHM9MDtzPHQ7KytzKWFbYitzXT1yLnEoZCxlK3MpfSwKdmc6ZnVuY3Rpb24oYSxiLGMsZCl7cmV0dXJu
-IHRoaXMuWVcoYSxiLGMsZCwwKX0sClZyOmZ1bmN0aW9uKGEsYil7dmFyIHQscwpILnQ2KGEpLkMoImEy
-KDEpIikuYihiKQp0PWEubGVuZ3RoCmZvcihzPTA7czx0Oysrcyl7aWYoSC5vVChiLiQxKGFbc10pKSly
-ZXR1cm4hMAppZihhLmxlbmd0aCE9PXQpdGhyb3cgSC5iKFAuYTQoYSkpfXJldHVybiExfSwKdGc6ZnVu
-Y3Rpb24oYSxiKXt2YXIgdApmb3IodD0wO3Q8YS5sZW5ndGg7Kyt0KWlmKEouUk0oYVt0XSxiKSlyZXR1
-cm4hMApyZXR1cm4hMX0sCnc6ZnVuY3Rpb24oYSl7cmV0dXJuIFAuV0UoYSwiWyIsIl0iKX0sCmdrejpm
-dW5jdGlvbihhKXtyZXR1cm4gbmV3IEoubTEoYSxhLmxlbmd0aCxILnQ2KGEpLkMoIm0xPDE+IikpfSwK
-Z2lPOmZ1bmN0aW9uKGEpe3JldHVybiBILmVRKGEpfSwKZ0E6ZnVuY3Rpb24oYSl7cmV0dXJuIGEubGVu
-Z3RofSwKc0E6ZnVuY3Rpb24oYSxiKXtpZighIWEuZml4ZWQkbGVuZ3RoKUgudmgoUC5MNCgic2V0IGxl
-bmd0aCIpKQppZihiPDApdGhyb3cgSC5iKFAuVEUoYiwwLG51bGwsIm5ld0xlbmd0aCIsbnVsbCkpCmEu
-bGVuZ3RoPWJ9LApxOmZ1bmN0aW9uKGEsYil7SC5TYyhiKQppZihiPj1hLmxlbmd0aHx8YjwwKXRocm93
-IEguYihILkhZKGEsYikpCnJldHVybiBhW2JdfSwKWTpmdW5jdGlvbihhLGIsYyl7SC50NihhKS5kLmIo
-YykKaWYoISFhLmltbXV0YWJsZSRsaXN0KUgudmgoUC5MNCgiaW5kZXhlZCBzZXQiKSkKaWYoYj49YS5s
-ZW5ndGh8fGI8MCl0aHJvdyBILmIoSC5IWShhLGIpKQphW2JdPWN9LAokaWNYOjEsCiRpek06MX0KSi5Q
-by5wcm90b3R5cGU9e30KSi5tMS5wcm90b3R5cGU9ewpnbDpmdW5jdGlvbigpe3JldHVybiB0aGlzLmR9
-LApGOmZ1bmN0aW9uKCl7dmFyIHQscz10aGlzLHI9cy5hLHE9ci5sZW5ndGgKaWYocy5iIT09cSl0aHJv
-dyBILmIoSC5sayhyKSkKdD1zLmMKaWYodD49cSl7cy5zTShudWxsKQpyZXR1cm4hMX1zLnNNKHJbdF0p
-Oysrcy5jCnJldHVybiEwfSwKc006ZnVuY3Rpb24oYSl7dGhpcy5kPXRoaXMuJHRpLmQuYihhKX0sCiRp
-QW46MX0KSi5xSS5wcm90b3R5cGU9ewp5dTpmdW5jdGlvbihhKXt2YXIgdAppZihhPj0tMjE0NzQ4MzY0
-OCYmYTw9MjE0NzQ4MzY0NylyZXR1cm4gYXwwCmlmKGlzRmluaXRlKGEpKXt0PWE8MD9NYXRoLmNlaWwo
-YSk6TWF0aC5mbG9vcihhKQpyZXR1cm4gdCswfXRocm93IEguYihQLkw0KCIiK2ErIi50b0ludCgpIikp
-fSwKelE6ZnVuY3Rpb24oYSl7aWYoYT4wKXtpZihhIT09MS8wKXJldHVybiBNYXRoLnJvdW5kKGEpfWVs
-c2UgaWYoYT4tMS8wKXJldHVybiAwLU1hdGgucm91bmQoMC1hKQp0aHJvdyBILmIoUC5MNCgiIithKyIu
-cm91bmQoKSIpKX0sCldaOmZ1bmN0aW9uKGEsYil7dmFyIHQscyxyLHEKaWYoYjwyfHxiPjM2KXRocm93
-IEguYihQLlRFKGIsMiwzNiwicmFkaXgiLG51bGwpKQp0PWEudG9TdHJpbmcoYikKaWYoQy54Qi5tKHQs
-dC5sZW5ndGgtMSkhPT00MSlyZXR1cm4gdApzPS9eKFtcZGEtel0rKSg/OlwuKFtcZGEtel0rKSk/XChl
-XCsoXGQrKVwpJC8uZXhlYyh0KQppZihzPT1udWxsKUgudmgoUC5MNCgiVW5leHBlY3RlZCB0b1N0cmlu
-ZyByZXN1bHQ6ICIrdCkpCnI9cy5sZW5ndGgKaWYoMT49cilyZXR1cm4gSC5PSChzLDEpCnQ9c1sxXQpp
-ZigzPj1yKXJldHVybiBILk9IKHMsMykKcT0rc1szXQpyPXNbMl0KaWYociE9bnVsbCl7dCs9cgpxLT1y
-Lmxlbmd0aH1yZXR1cm4gdCtDLnhCLkl4KCIwIixxKX0sCnc6ZnVuY3Rpb24oYSl7aWYoYT09PTAmJjEv
-YTwwKXJldHVybiItMC4wIgplbHNlIHJldHVybiIiK2F9LApnaU86ZnVuY3Rpb24oYSl7dmFyIHQscyxy
-LHEscD1hfDAKaWYoYT09PXApcmV0dXJuIDUzNjg3MDkxMSZwCnQ9TWF0aC5hYnMoYSkKcz1NYXRoLmxv
-Zyh0KS8wLjY5MzE0NzE4MDU1OTk0NTN8MApyPU1hdGgucG93KDIscykKcT10PDE/dC9yOnIvdApyZXR1
-cm4gNTM2ODcwOTExJigocSo5MDA3MTk5MjU0NzQwOTkyfDApKyhxKjM1NDIyNDMxODExNzY1MjF8MCkp
-KjU5OTE5NytzKjEyNTl9LAp6WTpmdW5jdGlvbihhLGIpe3ZhciB0PWElYgppZih0PT09MClyZXR1cm4g
-MAppZih0PjApcmV0dXJuIHQKaWYoYjwwKXJldHVybiB0LWIKZWxzZSByZXR1cm4gdCtifSwKd0c6ZnVu
-Y3Rpb24oYSxiKXt2YXIgdAppZihhPjApdD10aGlzLnAzKGEsYikKZWxzZXt0PWI+MzE/MzE6Ygp0PWE+
-PnQ+Pj4wfXJldHVybiB0fSwKYmY6ZnVuY3Rpb24oYSxiKXtpZihiPDApdGhyb3cgSC5iKEgudEwoYikp
-CnJldHVybiB0aGlzLnAzKGEsYil9LApwMzpmdW5jdGlvbihhLGIpe3JldHVybiBiPjMxPzA6YT4+PmJ9
-LAokaUNQOjEsCiRpRks6MX0KSi51ci5wcm90b3R5cGU9eyRpS046MX0KSi5WQS5wcm90b3R5cGU9e30K
-Si5Eci5wcm90b3R5cGU9ewptOmZ1bmN0aW9uKGEsYil7aWYoYjwwKXRocm93IEguYihILkhZKGEsYikp
-CmlmKGI+PWEubGVuZ3RoKUgudmgoSC5IWShhLGIpKQpyZXR1cm4gYS5jaGFyQ29kZUF0KGIpfSwKVzpm
-dW5jdGlvbihhLGIpe2lmKGI+PWEubGVuZ3RoKXRocm93IEguYihILkhZKGEsYikpCnJldHVybiBhLmNo
-YXJDb2RlQXQoYil9LApkZDpmdW5jdGlvbihhLGIpe3JldHVybiBuZXcgSC51bihiLGEsMCl9LApoOmZ1
-bmN0aW9uKGEsYil7aWYodHlwZW9mIGIhPSJzdHJpbmciKXRocm93IEguYihQLkwzKGIsbnVsbCxudWxs
-KSkKcmV0dXJuIGErYn0sClRjOmZ1bmN0aW9uKGEsYil7dmFyIHQ9Yi5sZW5ndGgscz1hLmxlbmd0aApp
-Zih0PnMpcmV0dXJuITEKcmV0dXJuIGI9PT10aGlzLkcoYSxzLXQpfSwKaTc6ZnVuY3Rpb24oYSxiLGMs
-ZCl7dmFyIHQscwpjPVAuakIoYixjLGEubGVuZ3RoKQp0PWEuc3Vic3RyaW5nKDAsYikKcz1hLnN1YnN0
-cmluZyhjKQpyZXR1cm4gdCtkK3N9LApRaTpmdW5jdGlvbihhLGIsYyl7dmFyIHQKaWYoIUgub2soYykp
-SC52aChILnRMKGMpKQppZih0eXBlb2YgYyE9PSJudW1iZXIiKXJldHVybiBjLkooKQppZihjPDB8fGM+
-YS5sZW5ndGgpdGhyb3cgSC5iKFAuVEUoYywwLGEubGVuZ3RoLG51bGwsbnVsbCkpCnQ9YytiLmxlbmd0
-aAppZih0PmEubGVuZ3RoKXJldHVybiExCnJldHVybiBiPT09YS5zdWJzdHJpbmcoYyx0KX0sCm46ZnVu
-Y3Rpb24oYSxiKXtyZXR1cm4gdGhpcy5RaShhLGIsMCl9LApOajpmdW5jdGlvbihhLGIsYyl7aWYoIUgu
-b2soYikpSC52aChILnRMKGIpKQppZihjPT1udWxsKWM9YS5sZW5ndGgKaWYodHlwZW9mIGIhPT0ibnVt
-YmVyIilyZXR1cm4gYi5KKCkKaWYoYjwwKXRocm93IEguYihQLngoYixudWxsKSkKaWYoYj5jKXRocm93
-IEguYihQLngoYixudWxsKSkKaWYoYz5hLmxlbmd0aCl0aHJvdyBILmIoUC54KGMsbnVsbCkpCnJldHVy
-biBhLnN1YnN0cmluZyhiLGMpfSwKRzpmdW5jdGlvbihhLGIpe3JldHVybiB0aGlzLk5qKGEsYixudWxs
-KX0sCmhjOmZ1bmN0aW9uKGEpe3JldHVybiBhLnRvTG93ZXJDYXNlKCl9LApiUzpmdW5jdGlvbihhKXt2
-YXIgdCxzLHIscT1hLnRyaW0oKSxwPXEubGVuZ3RoCmlmKHA9PT0wKXJldHVybiBxCmlmKHRoaXMuVyhx
-LDApPT09MTMzKXt0PUoubW0ocSwxKQppZih0PT09cClyZXR1cm4iIn1lbHNlIHQ9MApzPXAtMQpyPXRo
-aXMubShxLHMpPT09MTMzP0ouYzEocSxzKTpwCmlmKHQ9PT0wJiZyPT09cClyZXR1cm4gcQpyZXR1cm4g
-cS5zdWJzdHJpbmcodCxyKX0sCkl4OmZ1bmN0aW9uKGEsYil7dmFyIHQscwppZigwPj1iKXJldHVybiIi
-CmlmKGI9PT0xfHxhLmxlbmd0aD09PTApcmV0dXJuIGEKaWYoYiE9PWI+Pj4wKXRocm93IEguYihDLkVx
-KQpmb3IodD1hLHM9IiI7ITA7KXtpZigoYiYxKT09PTEpcz10K3MKYj1iPj4+MQppZihiPT09MClicmVh
-awp0Kz10fXJldHVybiBzfSwKWFU6ZnVuY3Rpb24oYSxiLGMpe3ZhciB0CmlmKGM8MHx8Yz5hLmxlbmd0
-aCl0aHJvdyBILmIoUC5URShjLDAsYS5sZW5ndGgsbnVsbCxudWxsKSkKdD1hLmluZGV4T2YoYixjKQpy
-ZXR1cm4gdH0sCk9ZOmZ1bmN0aW9uKGEsYil7cmV0dXJuIHRoaXMuWFUoYSxiLDApfSwKUGs6ZnVuY3Rp
-b24oYSxiLGMpe3ZhciB0LHMKaWYoYz09bnVsbCljPWEubGVuZ3RoCmVsc2UgaWYoYzwwfHxjPmEubGVu
-Z3RoKXRocm93IEguYihQLlRFKGMsMCxhLmxlbmd0aCxudWxsLG51bGwpKQp0PWIubGVuZ3RoCnM9YS5s
-ZW5ndGgKaWYoYyt0PnMpYz1zLXQKcmV0dXJuIGEubGFzdEluZGV4T2YoYixjKX0sCmNuOmZ1bmN0aW9u
-KGEsYil7cmV0dXJuIHRoaXMuUGsoYSxiLG51bGwpfSwKSXM6ZnVuY3Rpb24oYSxiLGMpe3ZhciB0PWEu
-bGVuZ3RoCmlmKGM+dCl0aHJvdyBILmIoUC5URShjLDAsdCxudWxsLG51bGwpKQpyZXR1cm4gSC5tMihh
-LGIsYyl9LAp0ZzpmdW5jdGlvbihhLGIpe3JldHVybiB0aGlzLklzKGEsYiwwKX0sCnc6ZnVuY3Rpb24o
-YSl7cmV0dXJuIGF9LApnaU86ZnVuY3Rpb24oYSl7dmFyIHQscyxyCmZvcih0PWEubGVuZ3RoLHM9MCxy
-PTA7cjx0Oysrcil7cz01MzY4NzA5MTEmcythLmNoYXJDb2RlQXQocikKcz01MzY4NzA5MTEmcysoKDUy
-NDI4NyZzKTw8MTApCnNePXM+PjZ9cz01MzY4NzA5MTEmcysoKDY3MTA4ODYzJnMpPDwzKQpzXj1zPj4x
-MQpyZXR1cm4gNTM2ODcwOTExJnMrKCgxNjM4MyZzKTw8MTUpfSwKZ0E6ZnVuY3Rpb24oYSl7cmV0dXJu
-IGEubGVuZ3RofSwKcTpmdW5jdGlvbihhLGIpe0guU2MoYikKaWYoYj49YS5sZW5ndGh8fCExKXRocm93
-IEguYihILkhZKGEsYikpCnJldHVybiBhW2JdfSwKJGl2WDoxLAokaXFVOjF9CkgucWoucHJvdG90eXBl
-PXsKZ0E6ZnVuY3Rpb24oYSl7cmV0dXJuIHRoaXMuYS5sZW5ndGh9LApxOmZ1bmN0aW9uKGEsYil7cmV0
-dXJuIEMueEIubSh0aGlzLmEsSC5TYyhiKSl9fQpILmJRLnByb3RvdHlwZT17fQpILmFMLnByb3RvdHlw
-ZT17CmdrejpmdW5jdGlvbihhKXt2YXIgdD10aGlzCnJldHVybiBuZXcgSC5hNyh0LHQuZ0EodCksSC5M
-aCh0KS5DKCJhNzxhTC5FPiIpKX0sCkg6ZnVuY3Rpb24oYSxiKXt2YXIgdCxzLHIscT10aGlzLHA9cS5n
-QShxKQppZihiLmxlbmd0aCE9PTApe2lmKHA9PT0wKXJldHVybiIiCnQ9SC5kKHEuRSgwLDApKQppZihw
-IT09cS5nQShxKSl0aHJvdyBILmIoUC5hNChxKSkKZm9yKHM9dCxyPTE7cjxwOysrcil7cz1zK2IrSC5k
-KHEuRSgwLHIpKQppZihwIT09cS5nQShxKSl0aHJvdyBILmIoUC5hNChxKSl9cmV0dXJuIHMuY2hhckNv
-ZGVBdCgwKT09MD9zOnN9ZWxzZXtmb3Iocj0wLHM9IiI7cjxwOysrcil7cys9SC5kKHEuRSgwLHIpKQpp
-ZihwIT09cS5nQShxKSl0aHJvdyBILmIoUC5hNChxKSl9cmV0dXJuIHMuY2hhckNvZGVBdCgwKT09MD9z
-OnN9fSwKZXY6ZnVuY3Rpb24oYSxiKXtyZXR1cm4gdGhpcy5HRygwLEguTGgodGhpcykuQygiYTIoYUwu
-RSkiKS5iKGIpKX19CkgubkgucHJvdG90eXBlPXsKZ1VEOmZ1bmN0aW9uKCl7dmFyIHQ9Si5IbSh0aGlz
-LmEpLHM9dGhpcy5jCmlmKHM9PW51bGx8fHM+dClyZXR1cm4gdApyZXR1cm4gc30sCmdBczpmdW5jdGlv
-bigpe3ZhciB0PUouSG0odGhpcy5hKSxzPXRoaXMuYgppZihzPnQpcmV0dXJuIHQKcmV0dXJuIHN9LApn
-QTpmdW5jdGlvbihhKXt2YXIgdCxzPUouSG0odGhpcy5hKSxyPXRoaXMuYgppZihyPj1zKXJldHVybiAw
-CnQ9dGhpcy5jCmlmKHQ9PW51bGx8fHQ+PXMpcmV0dXJuIHMtcgppZih0eXBlb2YgdCE9PSJudW1iZXIi
-KXJldHVybiB0LkhOKCkKcmV0dXJuIHQtcn0sCkU6ZnVuY3Rpb24oYSxiKXt2YXIgdCxzPXRoaXMscj1z
-LmdBcygpK2IKaWYoYj49MCl7dD1zLmdVRCgpCmlmKHR5cGVvZiB0IT09Im51bWJlciIpcmV0dXJuIEgu
-cFkodCkKdD1yPj10fWVsc2UgdD0hMAppZih0KXRocm93IEguYihQLkNmKGIscywiaW5kZXgiLG51bGws
-bnVsbCkpCnJldHVybiBKLkdBKHMuYSxyKX19CkguYTcucHJvdG90eXBlPXsKZ2w6ZnVuY3Rpb24oKXty
-ZXR1cm4gdGhpcy5kfSwKRjpmdW5jdGlvbigpe3ZhciB0LHM9dGhpcyxyPXMuYSxxPUouVTYocikscD1x
-LmdBKHIpCmlmKHMuYiE9PXApdGhyb3cgSC5iKFAuYTQocikpCnQ9cy5jCmlmKHQ+PXApe3Muc0kobnVs
-bCkKcmV0dXJuITF9cy5zSShxLkUocix0KSk7KytzLmMKcmV0dXJuITB9LApzSTpmdW5jdGlvbihhKXt0
-aGlzLmQ9dGhpcy4kdGkuZC5iKGEpfSwKJGlBbjoxfQpILkE4LnByb3RvdHlwZT17CmdBOmZ1bmN0aW9u
-KGEpe3JldHVybiBKLkhtKHRoaXMuYSl9LApFOmZ1bmN0aW9uKGEsYil7cmV0dXJuIHRoaXMuYi4kMShK
-LkdBKHRoaXMuYSxiKSl9fQpILlU1LnByb3RvdHlwZT17CmdrejpmdW5jdGlvbihhKXtyZXR1cm4gbmV3
-IEguU08oSi5JVCh0aGlzLmEpLHRoaXMuYix0aGlzLiR0aS5DKCJTTzwxPiIpKX19CkguU08ucHJvdG90
-eXBlPXsKRjpmdW5jdGlvbigpe3ZhciB0LHMKZm9yKHQ9dGhpcy5hLHM9dGhpcy5iO3QuRigpOylpZihI
-Lm9UKHMuJDEodC5nbCgpKSkpcmV0dXJuITAKcmV0dXJuITF9LApnbDpmdW5jdGlvbigpe3JldHVybiB0
-aGlzLmEuZ2woKX19CkguU1UucHJvdG90eXBlPXt9CkguUmUucHJvdG90eXBlPXsKWTpmdW5jdGlvbihh
-LGIsYyl7SC5MaCh0aGlzKS5DKCJSZS5FIikuYihjKQp0aHJvdyBILmIoUC5MNCgiQ2Fubm90IG1vZGlm
-eSBhbiB1bm1vZGlmaWFibGUgbGlzdCIpKX19CkguWEMucHJvdG90eXBlPXt9Ckgud3YucHJvdG90eXBl
-PXsKZ2lPOmZ1bmN0aW9uKGEpe3ZhciB0PXRoaXMuX2hhc2hDb2RlCmlmKHQhPW51bGwpcmV0dXJuIHQK
-dD01MzY4NzA5MTEmNjY0NTk3KkouaGYodGhpcy5hKQp0aGlzLl9oYXNoQ29kZT10CnJldHVybiB0fSwK
-dzpmdW5jdGlvbihhKXtyZXR1cm4nU3ltYm9sKCInK0guZCh0aGlzLmEpKyciKSd9LApETjpmdW5jdGlv
-bihhLGIpe2lmKGI9PW51bGwpcmV0dXJuITEKcmV0dXJuIGIgaW5zdGFuY2VvZiBILnd2JiZ0aGlzLmE9
-PWIuYX0sCiRpR0Q6MX0KSC5QRC5wcm90b3R5cGU9e30KSC5XVS5wcm90b3R5cGU9ewp3OmZ1bmN0aW9u
-KGEpe3JldHVybiBQLm5PKHRoaXMpfSwKWTpmdW5jdGlvbihhLGIsYyl7dmFyIHQ9SC5MaCh0aGlzKQp0
-LmQuYihiKQp0LmNoWzFdLmIoYykKcmV0dXJuIEguZGMoKX0sCiRpWjA6MX0KSC5MUC5wcm90b3R5cGU9
-ewpnQTpmdW5jdGlvbihhKXtyZXR1cm4gdGhpcy5hfSwKeDQ6ZnVuY3Rpb24oYSl7aWYodHlwZW9mIGEh
-PSJzdHJpbmciKXJldHVybiExCmlmKCJfX3Byb3RvX18iPT09YSlyZXR1cm4hMQpyZXR1cm4gdGhpcy5i
-Lmhhc093blByb3BlcnR5KGEpfSwKcTpmdW5jdGlvbihhLGIpe2lmKCF0aGlzLng0KGIpKXJldHVybiBu
-dWxsCnJldHVybiB0aGlzLnFQKGIpfSwKcVA6ZnVuY3Rpb24oYSl7cmV0dXJuIHRoaXMuYltILnkoYSld
-fSwKSzpmdW5jdGlvbihhLGIpe3ZhciB0LHMscixxLHA9SC5MaCh0aGlzKQpwLkMoIn4oMSwyKSIpLmIo
-YikKdD10aGlzLmMKZm9yKHM9dC5sZW5ndGgscD1wLmNoWzFdLHI9MDtyPHM7KytyKXtxPXRbcl0KYi4k
-MihxLHAuYih0aGlzLnFQKHEpKSl9fX0KSC5MSS5wcm90b3R5cGU9ewpnV2E6ZnVuY3Rpb24oKXt2YXIg
-dD10aGlzLmEKcmV0dXJuIHR9LApnbmQ6ZnVuY3Rpb24oKXt2YXIgdCxzLHIscSxwPXRoaXMKaWYocC5j
-PT09MSlyZXR1cm4gQy5oVQp0PXAuZApzPXQubGVuZ3RoLXAuZS5sZW5ndGgtcC5mCmlmKHM9PT0wKXJl
-dHVybiBDLmhVCnI9W10KZm9yKHE9MDtxPHM7KytxKXtpZihxPj10Lmxlbmd0aClyZXR1cm4gSC5PSCh0
-LHEpCnIucHVzaCh0W3FdKX1yZXR1cm4gSi56QyhyKX0sCmdWbTpmdW5jdGlvbigpe3ZhciB0LHMscixx
-LHAsbyxuLG0sbD10aGlzCmlmKGwuYyE9PTApcmV0dXJuIEMuQ00KdD1sLmUKcz10Lmxlbmd0aApyPWwu
-ZApxPXIubGVuZ3RoLXMtbC5mCmlmKHM9PT0wKXJldHVybiBDLkNNCnA9bmV3IEguTjUodS5lbykKZm9y
-KG89MDtvPHM7KytvKXtpZihvPj10Lmxlbmd0aClyZXR1cm4gSC5PSCh0LG8pCm49dFtvXQptPXErbwpp
-ZihtPDB8fG0+PXIubGVuZ3RoKXJldHVybiBILk9IKHIsbSkKcC5ZKDAsbmV3IEgud3YobiksclttXSl9
-cmV0dXJuIG5ldyBILlBEKHAsdS5nRil9LAokaXZROjF9CkguQ2oucHJvdG90eXBlPXsKJDI6ZnVuY3Rp
-b24oYSxiKXt2YXIgdApILnkoYSkKdD10aGlzLmEKdC5iPXQuYisiJCIrSC5kKGEpCkMuTm0uaSh0aGlz
-LmIsYSkKQy5ObS5pKHRoaXMuYyxiKTsrK3QuYX0sCiRTOjEyfQpILmY5LnByb3RvdHlwZT17CnFTOmZ1
-bmN0aW9uKGEpe3ZhciB0LHMscj10aGlzLHE9bmV3IFJlZ0V4cChyLmEpLmV4ZWMoYSkKaWYocT09bnVs
-bClyZXR1cm4gbnVsbAp0PU9iamVjdC5jcmVhdGUobnVsbCkKcz1yLmIKaWYocyE9PS0xKXQuYXJndW1l
-bnRzPXFbcysxXQpzPXIuYwppZihzIT09LTEpdC5hcmd1bWVudHNFeHByPXFbcysxXQpzPXIuZAppZihz
-IT09LTEpdC5leHByPXFbcysxXQpzPXIuZQppZihzIT09LTEpdC5tZXRob2Q9cVtzKzFdCnM9ci5mCmlm
-KHMhPT0tMSl0LnJlY2VpdmVyPXFbcysxXQpyZXR1cm4gdH19CkguVzAucHJvdG90eXBlPXsKdzpmdW5j
-dGlvbihhKXt2YXIgdD10aGlzLmIKaWYodD09bnVsbClyZXR1cm4iTm9TdWNoTWV0aG9kRXJyb3I6ICIr
-SC5kKHRoaXMuYSkKcmV0dXJuIk5vU3VjaE1ldGhvZEVycm9yOiBtZXRob2Qgbm90IGZvdW5kOiAnIit0
-KyInIG9uIG51bGwifX0KSC5hei5wcm90b3R5cGU9ewp3OmZ1bmN0aW9uKGEpe3ZhciB0LHM9dGhpcyxy
-PSJOb1N1Y2hNZXRob2RFcnJvcjogbWV0aG9kIG5vdCBmb3VuZDogJyIscT1zLmIKaWYocT09bnVsbCly
-ZXR1cm4iTm9TdWNoTWV0aG9kRXJyb3I6ICIrSC5kKHMuYSkKdD1zLmMKaWYodD09bnVsbClyZXR1cm4g
-citxKyInICgiK0guZChzLmEpKyIpIgpyZXR1cm4gcitxKyInIG9uICciK3QrIicgKCIrSC5kKHMuYSkr
-IikifX0KSC52Vi5wcm90b3R5cGU9ewp3OmZ1bmN0aW9uKGEpe3ZhciB0PXRoaXMuYQpyZXR1cm4gdC5s
-ZW5ndGg9PT0wPyJFcnJvciI6IkVycm9yOiAiK3R9fQpILmJxLnByb3RvdHlwZT17fQpILkFtLnByb3Rv
-dHlwZT17CiQxOmZ1bmN0aW9uKGEpe2lmKHUuYlUuYyhhKSlpZihhLiR0aHJvd25Kc0Vycm9yPT1udWxs
-KWEuJHRocm93bkpzRXJyb3I9dGhpcy5hCnJldHVybiBhfSwKJFM6NH0KSC5YTy5wcm90b3R5cGU9ewp3
-OmZ1bmN0aW9uKGEpe3ZhciB0LHM9dGhpcy5iCmlmKHMhPW51bGwpcmV0dXJuIHMKcz10aGlzLmEKdD1z
-IT09bnVsbCYmdHlwZW9mIHM9PT0ib2JqZWN0Ij9zLnN0YWNrOm51bGwKcmV0dXJuIHRoaXMuYj10PT1u
-dWxsPyIiOnR9LAokaUd6OjF9CkguVHAucHJvdG90eXBlPXsKdzpmdW5jdGlvbihhKXt2YXIgdD10aGlz
-LmNvbnN0cnVjdG9yLHM9dD09bnVsbD9udWxsOnQubmFtZQpyZXR1cm4iQ2xvc3VyZSAnIitILk5RKHM9
-PW51bGw/InVua25vd24iOnMpKyInIn0sCiRpRUg6MSwKZ1FsOmZ1bmN0aW9uKCl7cmV0dXJuIHRoaXN9
-LAokQzoiJDEiLAokUjoxLAokRDpudWxsfQpILmxjLnByb3RvdHlwZT17fQpILnp4LnByb3RvdHlwZT17
-Cnc6ZnVuY3Rpb24oYSl7dmFyIHQ9dGhpcy4kc3RhdGljX25hbWUKaWYodD09bnVsbClyZXR1cm4iQ2xv
-c3VyZSBvZiB1bmtub3duIHN0YXRpYyBtZXRob2QiCnJldHVybiJDbG9zdXJlICciK0guTlEodCkrIici
-fX0KSC5yVC5wcm90b3R5cGU9ewpETjpmdW5jdGlvbihhLGIpe3ZhciB0PXRoaXMKaWYoYj09bnVsbCly
-ZXR1cm4hMQppZih0PT09YilyZXR1cm4hMAppZighKGIgaW5zdGFuY2VvZiBILnJUKSlyZXR1cm4hMQpy
-ZXR1cm4gdC5hPT09Yi5hJiZ0LmI9PT1iLmImJnQuYz09PWIuY30sCmdpTzpmdW5jdGlvbihhKXt2YXIg
-dCxzPXRoaXMuYwppZihzPT1udWxsKXQ9SC5lUSh0aGlzLmEpCmVsc2UgdD10eXBlb2YgcyE9PSJvYmpl
-Y3QiP0ouaGYocyk6SC5lUShzKQpyZXR1cm4odF5ILmVRKHRoaXMuYikpPj4+MH0sCnc6ZnVuY3Rpb24o
-YSl7dmFyIHQ9dGhpcy5jCmlmKHQ9PW51bGwpdD10aGlzLmEKcmV0dXJuIkNsb3N1cmUgJyIrSC5kKHRo
-aXMuZCkrIicgb2YgIisoIkluc3RhbmNlIG9mICciK0guZChILk0odCkpKyInIil9fQpILkVxLnByb3Rv
-dHlwZT17Cnc6ZnVuY3Rpb24oYSl7cmV0dXJuIlJ1bnRpbWVFcnJvcjogIitILmQodGhpcy5hKX19Ckgu
-a1kucHJvdG90eXBlPXsKdzpmdW5jdGlvbihhKXtyZXR1cm4iQXNzZXJ0aW9uIGZhaWxlZDogIitQLnAo
-dGhpcy5hKX19CkguTjUucHJvdG90eXBlPXsKZ0E6ZnVuY3Rpb24oYSl7cmV0dXJuIHRoaXMuYX0sCmdW
-OmZ1bmN0aW9uKCl7cmV0dXJuIG5ldyBILmk1KHRoaXMsSC5MaCh0aGlzKS5DKCJpNTwxPiIpKX0sCng0
-OmZ1bmN0aW9uKGEpe3ZhciB0LHMKaWYodHlwZW9mIGE9PSJzdHJpbmciKXt0PXRoaXMuYgppZih0PT1u
-dWxsKXJldHVybiExCnJldHVybiB0aGlzLlh1KHQsYSl9ZWxzZXtzPXRoaXMuQ1goYSkKcmV0dXJuIHN9
-fSwKQ1g6ZnVuY3Rpb24oYSl7dmFyIHQ9dGhpcy5kCmlmKHQ9PW51bGwpcmV0dXJuITEKcmV0dXJuIHRo
-aXMuRmgodGhpcy5CdCh0LEouaGYoYSkmMHgzZmZmZmZmKSxhKT49MH0sCnE6ZnVuY3Rpb24oYSxiKXt2
-YXIgdCxzLHIscSxwPXRoaXMsbz1udWxsCmlmKHR5cGVvZiBiPT0ic3RyaW5nIil7dD1wLmIKaWYodD09
-bnVsbClyZXR1cm4gbwpzPXAuajIodCxiKQpyPXM9PW51bGw/bzpzLmIKcmV0dXJuIHJ9ZWxzZSBpZih0
-eXBlb2YgYj09Im51bWJlciImJihiJjB4M2ZmZmZmZik9PT1iKXtxPXAuYwppZihxPT1udWxsKXJldHVy
-biBvCnM9cC5qMihxLGIpCnI9cz09bnVsbD9vOnMuYgpyZXR1cm4gcn1lbHNlIHJldHVybiBwLmFhKGIp
-fSwKYWE6ZnVuY3Rpb24oYSl7dmFyIHQscyxyPXRoaXMuZAppZihyPT1udWxsKXJldHVybiBudWxsCnQ9
-dGhpcy5CdChyLEouaGYoYSkmMHgzZmZmZmZmKQpzPXRoaXMuRmgodCxhKQppZihzPDApcmV0dXJuIG51
-bGwKcmV0dXJuIHRbc10uYn0sClk6ZnVuY3Rpb24oYSxiLGMpe3ZhciB0LHMscixxLHAsbyxuPXRoaXMs
-bT1ILkxoKG4pCm0uZC5iKGIpCm0uY2hbMV0uYihjKQppZih0eXBlb2YgYj09InN0cmluZyIpe3Q9bi5i
-Cm4uRUgodD09bnVsbD9uLmI9bi56SygpOnQsYixjKX1lbHNlIGlmKHR5cGVvZiBiPT0ibnVtYmVyIiYm
-KGImMHgzZmZmZmZmKT09PWIpe3M9bi5jCm4uRUgocz09bnVsbD9uLmM9bi56SygpOnMsYixjKX1lbHNl
-e3I9bi5kCmlmKHI9PW51bGwpcj1uLmQ9bi56SygpCnE9Si5oZihiKSYweDNmZmZmZmYKcD1uLkJ0KHIs
-cSkKaWYocD09bnVsbCluLkVJKHIscSxbbi5IbihiLGMpXSkKZWxzZXtvPW4uRmgocCxiKQppZihvPj0w
-KXBbb10uYj1jCmVsc2UgcC5wdXNoKG4uSG4oYixjKSl9fX0sCks6ZnVuY3Rpb24oYSxiKXt2YXIgdCxz
-LHI9dGhpcwpILkxoKHIpLkMoIn4oMSwyKSIpLmIoYikKdD1yLmUKcz1yLnIKZm9yKDt0IT1udWxsOyl7
-Yi4kMih0LmEsdC5iKQppZihzIT09ci5yKXRocm93IEguYihQLmE0KHIpKQp0PXQuY319LApFSDpmdW5j
-dGlvbihhLGIsYyl7dmFyIHQscz10aGlzLHI9SC5MaChzKQpyLmQuYihiKQpyLmNoWzFdLmIoYykKdD1z
-LmoyKGEsYikKaWYodD09bnVsbClzLkVJKGEsYixzLkhuKGIsYykpCmVsc2UgdC5iPWN9LAprczpmdW5j
-dGlvbigpe3RoaXMucj10aGlzLnIrMSY2NzEwODg2M30sCkhuOmZ1bmN0aW9uKGEsYil7dmFyIHQscz10
-aGlzLHI9SC5MaChzKSxxPW5ldyBILmRiKHIuZC5iKGEpLHIuY2hbMV0uYihiKSkKaWYocy5lPT1udWxs
-KXMuZT1zLmY9cQplbHNle3Q9cy5mCnEuZD10CnMuZj10LmM9cX0rK3MuYQpzLmtzKCkKcmV0dXJuIHF9
-LApGaDpmdW5jdGlvbihhLGIpe3ZhciB0LHMKaWYoYT09bnVsbClyZXR1cm4tMQp0PWEubGVuZ3RoCmZv
-cihzPTA7czx0OysrcylpZihKLlJNKGFbc10uYSxiKSlyZXR1cm4gcwpyZXR1cm4tMX0sCnc6ZnVuY3Rp
-b24oYSl7cmV0dXJuIFAubk8odGhpcyl9LApqMjpmdW5jdGlvbihhLGIpe3JldHVybiBhW2JdfSwKQnQ6
-ZnVuY3Rpb24oYSxiKXtyZXR1cm4gYVtiXX0sCkVJOmZ1bmN0aW9uKGEsYixjKXthW2JdPWN9LApybjpm
-dW5jdGlvbihhLGIpe2RlbGV0ZSBhW2JdfSwKWHU6ZnVuY3Rpb24oYSxiKXtyZXR1cm4gdGhpcy5qMihh
-LGIpIT1udWxsfSwKeks6ZnVuY3Rpb24oKXt2YXIgdD0iPG5vbi1pZGVudGlmaWVyLWtleT4iLHM9T2Jq
-ZWN0LmNyZWF0ZShudWxsKQp0aGlzLkVJKHMsdCxzKQp0aGlzLnJuKHMsdCkKcmV0dXJuIHN9LAokaUZv
-OjF9CkguZGIucHJvdG90eXBlPXt9CkguaTUucHJvdG90eXBlPXsKZ0E6ZnVuY3Rpb24oYSl7cmV0dXJu
-IHRoaXMuYS5hfSwKZ2t6OmZ1bmN0aW9uKGEpe3ZhciB0PXRoaXMuYSxzPW5ldyBILk42KHQsdC5yLHRo
-aXMuJHRpLkMoIk42PDE+IikpCnMuYz10LmUKcmV0dXJuIHN9fQpILk42LnByb3RvdHlwZT17CmdsOmZ1
-bmN0aW9uKCl7cmV0dXJuIHRoaXMuZH0sCkY6ZnVuY3Rpb24oKXt2YXIgdD10aGlzLHM9dC5hCmlmKHQu
-YiE9PXMucil0aHJvdyBILmIoUC5hNChzKSkKZWxzZXtzPXQuYwppZihzPT1udWxsKXt0LnNxWShudWxs
-KQpyZXR1cm4hMX1lbHNle3Quc3FZKHMuYSkKdC5jPXQuYy5jCnJldHVybiEwfX19LApzcVk6ZnVuY3Rp
-b24oYSl7dGhpcy5kPXRoaXMuJHRpLmQuYihhKX0sCiRpQW46MX0KSC5kQy5wcm90b3R5cGU9ewokMTpm
-dW5jdGlvbihhKXtyZXR1cm4gdGhpcy5hKGEpfSwKJFM6NH0KSC53Ti5wcm90b3R5cGU9ewokMjpmdW5j
-dGlvbihhLGIpe3JldHVybiB0aGlzLmEoYSxiKX0sCiRTOjM4fQpILlZYLnByb3RvdHlwZT17CiQxOmZ1
-bmN0aW9uKGEpe3JldHVybiB0aGlzLmEoSC55KGEpKX0sCiRTOjQwfQpILlZSLnByb3RvdHlwZT17Cnc6
-ZnVuY3Rpb24oYSl7cmV0dXJuIlJlZ0V4cC8iK3RoaXMuYSsiLyIrdGhpcy5iLmZsYWdzfSwKZ0hjOmZ1
-bmN0aW9uKCl7dmFyIHQ9dGhpcyxzPXQuYwppZihzIT1udWxsKXJldHVybiBzCnM9dC5iCnJldHVybiB0
-LmM9SC52NCh0LmEscy5tdWx0aWxpbmUsIXMuaWdub3JlQ2FzZSxzLnVuaWNvZGUscy5kb3RBbGwsITAp
-fSwKZGQ6ZnVuY3Rpb24oYSxiKXtyZXR1cm4gbmV3IEguS1codGhpcyxiLDApfSwKVVo6ZnVuY3Rpb24o
-YSxiKXt2YXIgdCxzPXRoaXMuZ0hjKCkKcy5sYXN0SW5kZXg9Ygp0PXMuZXhlYyhhKQppZih0PT1udWxs
-KXJldHVybiBudWxsCnJldHVybiBuZXcgSC5FSyh0KX0sCiRpdlg6MSwKJGl3TDoxfQpILkVLLnByb3Rv
-dHlwZT17CnE6ZnVuY3Rpb24oYSxiKXt2YXIgdApILlNjKGIpCnQ9dGhpcy5iCmlmKGI+PXQubGVuZ3Ro
-KXJldHVybiBILk9IKHQsYikKcmV0dXJuIHRbYl19LAokaU9kOjEsCiRpaWI6MX0KSC5LVy5wcm90b3R5
-cGU9ewpna3o6ZnVuY3Rpb24oYSl7cmV0dXJuIG5ldyBILlBiKHRoaXMuYSx0aGlzLmIsdGhpcy5jKX19
-CkguUGIucHJvdG90eXBlPXsKZ2w6ZnVuY3Rpb24oKXtyZXR1cm4gdGhpcy5kfSwKRjpmdW5jdGlvbigp
-e3ZhciB0LHMscixxLHA9dGhpcyxvPXAuYgppZihvPT1udWxsKXJldHVybiExCnQ9cC5jCmlmKHQ8PW8u
-bGVuZ3RoKXtzPXAuYQpyPXMuVVoobyx0KQppZihyIT1udWxsKXtwLmQ9cgpvPXIuYgp0PW8uaW5kZXgK
-cT10K29bMF0ubGVuZ3RoCmlmKHQ9PT1xKXtpZihzLmIudW5pY29kZSl7bz1wLmMKdD1vKzEKcz1wLmIK
-aWYodDxzLmxlbmd0aCl7bz1KLnJZKHMpLm0ocyxvKQppZihvPj01NTI5NiYmbzw9NTYzMTkpe289Qy54
-Qi5tKHMsdCkKbz1vPj01NjMyMCYmbzw9NTczNDN9ZWxzZSBvPSExfWVsc2Ugbz0hMX1lbHNlIG89ITEK
-cT0obz9xKzE6cSkrMX1wLmM9cQpyZXR1cm4hMH19cC5iPXAuZD1udWxsCnJldHVybiExfSwKJGlBbjox
-fQpILnRRLnByb3RvdHlwZT17CnE6ZnVuY3Rpb24oYSxiKXtILlNjKGIpCmlmKGIhPT0wKUgudmgoUC54
-KGIsbnVsbCkpCnJldHVybiB0aGlzLmN9LAokaU9kOjF9CkgudW4ucHJvdG90eXBlPXsKZ2t6OmZ1bmN0
-aW9uKGEpe3JldHVybiBuZXcgSC5TZCh0aGlzLmEsdGhpcy5iLHRoaXMuYyl9fQpILlNkLnByb3RvdHlw
-ZT17CkY6ZnVuY3Rpb24oKXt2YXIgdCxzLHI9dGhpcyxxPXIuYyxwPXIuYixvPXAubGVuZ3RoLG49ci5h
-LG09bi5sZW5ndGgKaWYocStvPm0pe3IuZD1udWxsCnJldHVybiExfXQ9bi5pbmRleE9mKHAscSkKaWYo
-dDwwKXtyLmM9bSsxCnIuZD1udWxsCnJldHVybiExfXM9dCtvCnIuZD1uZXcgSC50USh0LHApCnIuYz1z
-PT09ci5jP3MrMTpzCnJldHVybiEwfSwKZ2w6ZnVuY3Rpb24oKXtyZXR1cm4gdGhpcy5kfSwKJGlBbjox
-fQpILkVULnByb3RvdHlwZT17JGlFVDoxLCRpQVM6MX0KSC5iMC5wcm90b3R5cGU9ewpnQTpmdW5jdGlv
-bihhKXtyZXR1cm4gYS5sZW5ndGh9LAokaVhqOjF9CkguRGcucHJvdG90eXBlPXsKcTpmdW5jdGlvbihh
-LGIpe0guU2MoYikKSC5vZChiLGEsYS5sZW5ndGgpCnJldHVybiBhW2JdfSwKWTpmdW5jdGlvbihhLGIs
-Yyl7SC5JZyhjKQpILm9kKGIsYSxhLmxlbmd0aCkKYVtiXT1jfSwKJGljWDoxLAokaXpNOjF9CkguUGcu
-cHJvdG90eXBlPXsKWTpmdW5jdGlvbihhLGIsYyl7SC5TYyhjKQpILm9kKGIsYSxhLmxlbmd0aCkKYVti
-XT1jfSwKJGljWDoxLAokaXpNOjF9CkgueGoucHJvdG90eXBlPXsKcTpmdW5jdGlvbihhLGIpe0guU2Mo
-YikKSC5vZChiLGEsYS5sZW5ndGgpCnJldHVybiBhW2JdfX0KSC5kRS5wcm90b3R5cGU9ewpxOmZ1bmN0
-aW9uKGEsYil7SC5TYyhiKQpILm9kKGIsYSxhLmxlbmd0aCkKcmV0dXJuIGFbYl19fQpILlpBLnByb3Rv
-dHlwZT17CnE6ZnVuY3Rpb24oYSxiKXtILlNjKGIpCkgub2QoYixhLGEubGVuZ3RoKQpyZXR1cm4gYVti
-XX19Ckgud2YucHJvdG90eXBlPXsKcTpmdW5jdGlvbihhLGIpe0guU2MoYikKSC5vZChiLGEsYS5sZW5n
-dGgpCnJldHVybiBhW2JdfX0KSC5QcS5wcm90b3R5cGU9ewpxOmZ1bmN0aW9uKGEsYil7SC5TYyhiKQpI
-Lm9kKGIsYSxhLmxlbmd0aCkKcmV0dXJuIGFbYl19fQpILmVFLnByb3RvdHlwZT17CmdBOmZ1bmN0aW9u
-KGEpe3JldHVybiBhLmxlbmd0aH0sCnE6ZnVuY3Rpb24oYSxiKXtILlNjKGIpCkgub2QoYixhLGEubGVu
-Z3RoKQpyZXR1cm4gYVtiXX19CkguVjYucHJvdG90eXBlPXsKZ0E6ZnVuY3Rpb24oYSl7cmV0dXJuIGEu
-bGVuZ3RofSwKcTpmdW5jdGlvbihhLGIpe0guU2MoYikKSC5vZChiLGEsYS5sZW5ndGgpCnJldHVybiBh
-W2JdfSwKJGlWNjoxLAokaW42OjF9CkguUkcucHJvdG90eXBlPXt9CkguVlAucHJvdG90eXBlPXt9Ckgu
-V0IucHJvdG90eXBlPXt9CkguWkcucHJvdG90eXBlPXt9CkguSmMucHJvdG90eXBlPXsKQzpmdW5jdGlv
-bihhKXtyZXR1cm4gSC5jRSh2LnR5cGVVbml2ZXJzZSx0aGlzLGEpfSwKS3E6ZnVuY3Rpb24oYSl7cmV0
-dXJuIEgudjUodi50eXBlVW5pdmVyc2UsdGhpcyxhKX19CkguRy5wcm90b3R5cGU9e30KSC51OS5wcm90
-b3R5cGU9ewp3OmZ1bmN0aW9uKGEpe3JldHVybiB0aGlzLmF9fQpILmh6LnByb3RvdHlwZT17fQpILmlN
-LnByb3RvdHlwZT17fQpQLnRoLnByb3RvdHlwZT17CiQxOmZ1bmN0aW9uKGEpe3ZhciB0PXRoaXMuYSxz
-PXQuYQp0LmE9bnVsbApzLiQwKCl9LAokUzoxOH0KUC5oYS5wcm90b3R5cGU9ewokMTpmdW5jdGlvbihh
-KXt2YXIgdCxzCnRoaXMuYS5hPXUuTS5iKGEpCnQ9dGhpcy5iCnM9dGhpcy5jCnQuZmlyc3RDaGlsZD90
-LnJlbW92ZUNoaWxkKHMpOnQuYXBwZW5kQ2hpbGQocyl9LAokUzoyMX0KUC5Wcy5wcm90b3R5cGU9ewok
-MDpmdW5jdGlvbigpe3RoaXMuYS4kMCgpfSwKJEM6IiQwIiwKJFI6MCwKJFM6MH0KUC5GdC5wcm90b3R5
-cGU9ewokMDpmdW5jdGlvbigpe3RoaXMuYS4kMCgpfSwKJEM6IiQwIiwKJFI6MCwKJFM6MH0KUC5XMy5w
-cm90b3R5cGU9ewpDWTpmdW5jdGlvbihhLGIpe2lmKHNlbGYuc2V0VGltZW91dCE9bnVsbClzZWxmLnNl
-dFRpbWVvdXQoSC50UihuZXcgUC55SCh0aGlzLGIpLDApLGEpCmVsc2UgdGhyb3cgSC5iKFAuTDQoImBz
-ZXRUaW1lb3V0KClgIG5vdCBmb3VuZC4iKSl9fQpQLnlILnByb3RvdHlwZT17CiQwOmZ1bmN0aW9uKCl7
-dGhpcy5iLiQwKCl9LAokQzoiJDAiLAokUjowLAokUzoyfQpQLmloLnByb3RvdHlwZT17CmFNOmZ1bmN0
-aW9uKGEsYil7dmFyIHQscyxyPXRoaXMuJHRpCnIuQygiMS8iKS5iKGIpCnQ9IXRoaXMuYnx8ci5DKCJi
-ODwxPiIpLmMoYikKcz10aGlzLmEKaWYodClzLlhmKGIpCmVsc2Ugcy5YMihyLmQuYihiKSl9LAp3MDpm
-dW5jdGlvbihhLGIpe3ZhciB0PXRoaXMuYQppZih0aGlzLmIpdC5aTChhLGIpCmVsc2UgdC5OayhhLGIp
-fX0KUC5XTS5wcm90b3R5cGU9ewokMTpmdW5jdGlvbihhKXtyZXR1cm4gdGhpcy5hLiQyKDAsYSl9LAok
-UzoyMH0KUC5TWC5wcm90b3R5cGU9ewokMjpmdW5jdGlvbihhLGIpe3RoaXMuYS4kMigxLG5ldyBILmJx
-KGEsdS5sLmIoYikpKX0sCiRDOiIkMiIsCiRSOjIsCiRTOjMzfQpQLkdzLnByb3RvdHlwZT17CiQyOmZ1
-bmN0aW9uKGEsYil7dGhpcy5hKEguU2MoYSksYil9LAokUzoyM30KUC5QZi5wcm90b3R5cGU9ewp3MDpm
-dW5jdGlvbihhLGIpe3ZhciB0CmlmKGE9PW51bGwpYT1uZXcgUC5uKCkKdD10aGlzLmEKaWYodC5hIT09
-MCl0aHJvdyBILmIoUC5QVigiRnV0dXJlIGFscmVhZHkgY29tcGxldGVkIikpCnQuTmsoYSxiKX0sCnBt
-OmZ1bmN0aW9uKGEpe3JldHVybiB0aGlzLncwKGEsbnVsbCl9fQpQLlpmLnByb3RvdHlwZT17CmFNOmZ1
-bmN0aW9uKGEsYil7dmFyIHQKdGhpcy4kdGkuQygiMS8iKS5iKGIpCnQ9dGhpcy5hCmlmKHQuYSE9PTAp
-dGhyb3cgSC5iKFAuUFYoIkZ1dHVyZSBhbHJlYWR5IGNvbXBsZXRlZCIpKQp0LlhmKGIpfX0KUC5GZS5w
-cm90b3R5cGU9ewpIUjpmdW5jdGlvbihhKXtpZigodGhpcy5jJjE1KSE9PTYpcmV0dXJuITAKcmV0dXJu
-IHRoaXMuYi5iLmJ2KHUuYWwuYih0aGlzLmQpLGEuYSx1LmNKLHUuSyl9LApLdzpmdW5jdGlvbihhKXt2
-YXIgdD10aGlzLmUscz11Lnoscj11LksscT10aGlzLiR0aS5DKCIyLyIpLHA9dGhpcy5iLmIKaWYodS5X
-LmModCkpcmV0dXJuIHEuYihwLnJwKHQsYS5hLGEuYixzLHIsdS5sKSkKZWxzZSByZXR1cm4gcS5iKHAu
-YnYodS55LmIodCksYS5hLHMscikpfX0KUC52cy5wcm90b3R5cGU9ewpTcTpmdW5jdGlvbihhLGIsYyl7
-dmFyIHQscyxyLHE9dGhpcy4kdGkKcS5LcShjKS5DKCIxLygyKSIpLmIoYSkKdD0kLlgzCmlmKHQhPT1D
-Lk5VKXtjLkMoIkA8MC8+IikuS3EocS5kKS5DKCIxKDIpIikuYihhKQppZihiIT1udWxsKWI9UC5WSChi
-LHQpfXM9bmV3IFAudnMoJC5YMyxjLkMoInZzPDA+IikpCnI9Yj09bnVsbD8xOjMKdGhpcy54ZihuZXcg
-UC5GZShzLHIsYSxiLHEuQygiQDwxPiIpLktxKGMpLkMoIkZlPDEsMj4iKSkpCnJldHVybiBzfSwKVzc6
-ZnVuY3Rpb24oYSxiKXtyZXR1cm4gdGhpcy5TcShhLG51bGwsYil9LApRZDpmdW5jdGlvbihhLGIsYyl7
-dmFyIHQscz10aGlzLiR0aQpzLktxKGMpLkMoIjEvKDIpIikuYihhKQp0PW5ldyBQLnZzKCQuWDMsYy5D
-KCJ2czwwPiIpKQp0aGlzLnhmKG5ldyBQLkZlKHQsKGI9PW51bGw/MTozKXwxNixhLGIscy5DKCJAPDE+
-IikuS3EoYykuQygiRmU8MSwyPiIpKSkKcmV0dXJuIHR9LApPQTpmdW5jdGlvbihhKXt2YXIgdCxzLHIK
-dS5iZi5iKG51bGwpCnQ9dGhpcy4kdGkKcz0kLlgzCnI9bmV3IFAudnMocyx0KQppZihzIT09Qy5OVSlh
-PVAuVkgoYSxzKQp0aGlzLnhmKG5ldyBQLkZlKHIsMixudWxsLGEsdC5DKCJAPDE+IikuS3EodC5kKS5D
-KCJGZTwxLDI+IikpKQpyZXR1cm4gcn0sCnhmOmZ1bmN0aW9uKGEpe3ZhciB0LHM9dGhpcyxyPXMuYQpp
-ZihyPD0xKXthLmE9dS54LmIocy5jKQpzLmM9YX1lbHNle2lmKHI9PT0yKXt0PXUuXy5iKHMuYykKcj10
-LmEKaWYocjw0KXt0LnhmKGEpCnJldHVybn1zLmE9cgpzLmM9dC5jfVAuVGsobnVsbCxudWxsLHMuYix1
-Lk0uYihuZXcgUC5kYShzLGEpKSl9fSwKalE6ZnVuY3Rpb24oYSl7dmFyIHQscyxyLHEscCxvPXRoaXMs
-bj17fQpuLmE9YQppZihhPT1udWxsKXJldHVybgp0PW8uYQppZih0PD0xKXtzPXUueC5iKG8uYykKcj1v
-LmM9YQppZihzIT1udWxsKXtmb3IoO3E9ci5hLHEhPW51bGw7cj1xKTtyLmE9c319ZWxzZXtpZih0PT09
-Mil7cD11Ll8uYihvLmMpCnQ9cC5hCmlmKHQ8NCl7cC5qUShhKQpyZXR1cm59by5hPXQKby5jPXAuY31u
-LmE9by5OOChhKQpQLlRrKG51bGwsbnVsbCxvLmIsdS5NLmIobmV3IFAub1EobixvKSkpfX0sCmFoOmZ1
-bmN0aW9uKCl7dmFyIHQ9dS54LmIodGhpcy5jKQp0aGlzLmM9bnVsbApyZXR1cm4gdGhpcy5OOCh0KX0s
-Ck44OmZ1bmN0aW9uKGEpe3ZhciB0LHMscgpmb3IodD1hLHM9bnVsbDt0IT1udWxsO3M9dCx0PXIpe3I9
-dC5hCnQuYT1zfXJldHVybiBzfSwKSEg6ZnVuY3Rpb24oYSl7dmFyIHQscz10aGlzLHI9cy4kdGkKci5D
-KCIxLyIpLmIoYSkKaWYoci5DKCJiODwxPiIpLmMoYSkpaWYoci5jKGEpKVAuQTkoYSxzKQplbHNlIFAu
-azMoYSxzKQplbHNle3Q9cy5haCgpCnIuZC5iKGEpCnMuYT00CnMuYz1hClAuSFoocyx0KX19LApYMjpm
-dW5jdGlvbihhKXt2YXIgdCxzPXRoaXMKcy4kdGkuZC5iKGEpCnQ9cy5haCgpCnMuYT00CnMuYz1hClAu
-SFoocyx0KX0sClpMOmZ1bmN0aW9uKGEsYil7dmFyIHQscz10aGlzCnUubC5iKGIpCnQ9cy5haCgpCnMu
-YT04CnMuYz1uZXcgUC5DdyhhLGIpClAuSFoocyx0KX0sClhmOmZ1bmN0aW9uKGEpe3ZhciB0PXRoaXMs
-cz10LiR0aQpzLkMoIjEvIikuYihhKQppZihzLkMoImI4PDE+IikuYyhhKSl7dC5jVShhKQpyZXR1cm59
-dC5hPTEKUC5UayhudWxsLG51bGwsdC5iLHUuTS5iKG5ldyBQLnJIKHQsYSkpKX0sCmNVOmZ1bmN0aW9u
-KGEpe3ZhciB0PXRoaXMscz10LiR0aQpzLkMoImI4PDE+IikuYihhKQppZihzLmMoYSkpe2lmKGEuYT09
-PTgpe3QuYT0xClAuVGsobnVsbCxudWxsLHQuYix1Lk0uYihuZXcgUC5LRih0LGEpKSl9ZWxzZSBQLkE5
-KGEsdCkKcmV0dXJufVAuazMoYSx0KX0sCk5rOmZ1bmN0aW9uKGEsYil7dGhpcy5hPTEKUC5UayhudWxs
-LG51bGwsdGhpcy5iLHUuTS5iKG5ldyBQLlpMKHRoaXMsYSxiKSkpfSwKJGliODoxfQpQLmRhLnByb3Rv
-dHlwZT17CiQwOmZ1bmN0aW9uKCl7UC5IWih0aGlzLmEsdGhpcy5iKX0sCiRTOjB9ClAub1EucHJvdG90
-eXBlPXsKJDA6ZnVuY3Rpb24oKXtQLkhaKHRoaXMuYix0aGlzLmEuYSl9LAokUzowfQpQLnBWLnByb3Rv
-dHlwZT17CiQxOmZ1bmN0aW9uKGEpe3ZhciB0PXRoaXMuYQp0LmE9MAp0LkhIKGEpfSwKJFM6MTh9ClAu
-VTcucHJvdG90eXBlPXsKJDI6ZnVuY3Rpb24oYSxiKXt1LmwuYihiKQp0aGlzLmEuWkwoYSxiKX0sCiQx
-OmZ1bmN0aW9uKGEpe3JldHVybiB0aGlzLiQyKGEsbnVsbCl9LAokQzoiJDIiLAokRDpmdW5jdGlvbigp
-e3JldHVybltudWxsXX0sCiRTOjQyfQpQLnZyLnByb3RvdHlwZT17CiQwOmZ1bmN0aW9uKCl7dGhpcy5h
-LlpMKHRoaXMuYix0aGlzLmMpfSwKJFM6MH0KUC5ySC5wcm90b3R5cGU9ewokMDpmdW5jdGlvbigpe3Zh
-ciB0PXRoaXMuYQp0LlgyKHQuJHRpLmQuYih0aGlzLmIpKX0sCiRTOjB9ClAuS0YucHJvdG90eXBlPXsK
-JDA6ZnVuY3Rpb24oKXtQLkE5KHRoaXMuYix0aGlzLmEpfSwKJFM6MH0KUC5aTC5wcm90b3R5cGU9ewok
-MDpmdW5jdGlvbigpe3RoaXMuYS5aTCh0aGlzLmIsdGhpcy5jKX0sCiRTOjB9ClAuUlQucHJvdG90eXBl
-PXsKJDA6ZnVuY3Rpb24oKXt2YXIgdCxzLHIscSxwLG8sbj10aGlzLG09bnVsbAp0cnl7cj1uLmMKbT1y
-LmIuYi56eih1LmZPLmIoci5kKSx1LnopfWNhdGNoKHEpe3Q9SC5SdShxKQpzPUgudHMocSkKaWYobi5k
-KXtyPXUubi5iKG4uYS5hLmMpLmEKcD10CnA9cj09bnVsbD9wPT1udWxsOnI9PT1wCnI9cH1lbHNlIHI9
-ITEKcD1uLmIKaWYocilwLmI9dS5uLmIobi5hLmEuYykKZWxzZSBwLmI9bmV3IFAuQ3codCxzKQpwLmE9
-ITAKcmV0dXJufWlmKHUuYy5jKG0pKXtpZihtIGluc3RhbmNlb2YgUC52cyYmbS5hPj00KXtpZihtLmE9
-PT04KXtyPW4uYgpyLmI9dS5uLmIobS5jKQpyLmE9ITB9cmV0dXJufW89bi5hLmEKcj1uLmIKci5iPW0u
-VzcobmV3IFAualoobyksdS56KQpyLmE9ITF9fSwKJFM6Mn0KUC5qWi5wcm90b3R5cGU9ewokMTpmdW5j
-dGlvbihhKXtyZXR1cm4gdGhpcy5hfSwKJFM6Mzd9ClAucnEucHJvdG90eXBlPXsKJDA6ZnVuY3Rpb24o
-KXt2YXIgdCxzLHIscSxwLG8sbixtPXRoaXMKdHJ5e3I9bS5iCnE9ci4kdGkKcD1xLmQKbz1wLmIobS5j
-KQptLmEuYj1yLmIuYi5idihxLkMoIjIvKDEpIikuYihyLmQpLG8scS5DKCIyLyIpLHApfWNhdGNoKG4p
-e3Q9SC5SdShuKQpzPUgudHMobikKcj1tLmEKci5iPW5ldyBQLkN3KHQscykKci5hPSEwfX0sCiRTOjJ9
-ClAuUlcucHJvdG90eXBlPXsKJDA6ZnVuY3Rpb24oKXt2YXIgdCxzLHIscSxwLG8sbixtLGw9dGhpcwp0
-cnl7dD11Lm4uYihsLmEuYS5jKQpxPWwuYwppZihILm9UKHEuSFIodCkpJiZxLmUhPW51bGwpe3A9bC5i
-CnAuYj1xLkt3KHQpCnAuYT0hMX19Y2F0Y2gobyl7cz1ILlJ1KG8pCnI9SC50cyhvKQpxPXUubi5iKGwu
-YS5hLmMpCnA9cS5hCm49cwptPWwuYgppZihwPT1udWxsP249PW51bGw6cD09PW4pbS5iPXEKZWxzZSBt
-LmI9bmV3IFAuQ3cocyxyKQptLmE9ITB9fSwKJFM6Mn0KUC5PTS5wcm90b3R5cGU9e30KUC5xaC5wcm90
-b3R5cGU9ewpnQTpmdW5jdGlvbihhKXt2YXIgdCxzLHI9dGhpcyxxPXt9LHA9bmV3IFAudnMoJC5YMyx1
-LmZKKQpxLmE9MAp0PUguTGgocikKcz10LkMoIn4oMSkiKS5iKG5ldyBQLkI1KHEscikpCnUuTS5iKG5l
-dyBQLlBJKHEscCkpClcuSkUoci5hLHIuYixzLCExLHQuZCkKcmV0dXJuIHB9fQpQLkI1LnByb3RvdHlw
-ZT17CiQxOmZ1bmN0aW9uKGEpe0guTGgodGhpcy5iKS5kLmIoYSk7Kyt0aGlzLmEuYX0sCiRTOmZ1bmN0
-aW9uKCl7cmV0dXJuIEguTGgodGhpcy5iKS5DKCJjOCgxKSIpfX0KUC5QSS5wcm90b3R5cGU9ewokMDpm
-dW5jdGlvbigpe3RoaXMuYi5ISCh0aGlzLmEuYSl9LAokUzowfQpQLk1PLnByb3RvdHlwZT17fQpQLmtU
-LnByb3RvdHlwZT17fQpQLnhJLnByb3RvdHlwZT17fQpQLkN3LnByb3RvdHlwZT17Cnc6ZnVuY3Rpb24o
-YSl7cmV0dXJuIEguZCh0aGlzLmEpfSwKJGlYUzoxfQpQLm0wLnByb3RvdHlwZT17JGlKQjoxfQpQLnBL
-LnByb3RvdHlwZT17CiQwOmZ1bmN0aW9uKCl7dmFyIHQscz10aGlzLmEscj1zLmEKcz1yPT1udWxsP3Mu
-YT1uZXcgUC5uKCk6cgpyPXRoaXMuYgppZihyPT1udWxsKXRocm93IEguYihzKQp0PUguYihzKQp0LnN0
-YWNrPXIudygwKQp0aHJvdyB0fSwKJFM6MH0KUC5KaS5wcm90b3R5cGU9ewpiSDpmdW5jdGlvbihhKXt2
-YXIgdCxzLHIscT1udWxsCnUuTS5iKGEpCnRyeXtpZihDLk5VPT09JC5YMyl7YS4kMCgpCnJldHVybn1Q
-LlQ4KHEscSx0aGlzLGEsdS5IKX1jYXRjaChyKXt0PUguUnUocikKcz1ILnRzKHIpClAuTDIocSxxLHRo
-aXMsdCx1LmwuYihzKSl9fSwKRGw6ZnVuY3Rpb24oYSxiLGMpe3ZhciB0LHMscixxPW51bGwKYy5DKCJ+
-KDApIikuYihhKQpjLmIoYikKdHJ5e2lmKEMuTlU9PT0kLlgzKXthLiQxKGIpCnJldHVybn1QLnl2KHEs
-cSx0aGlzLGEsYix1LkgsYyl9Y2F0Y2gocil7dD1ILlJ1KHIpCnM9SC50cyhyKQpQLkwyKHEscSx0aGlz
-LHQsdS5sLmIocykpfX0sClJUOmZ1bmN0aW9uKGEsYil7cmV0dXJuIG5ldyBQLmhqKHRoaXMsYi5DKCIw
-KCkiKS5iKGEpLGIpfSwKR1k6ZnVuY3Rpb24oYSl7cmV0dXJuIG5ldyBQLlZwKHRoaXMsdS5NLmIoYSkp
-fSwKUHk6ZnVuY3Rpb24oYSxiKXtyZXR1cm4gbmV3IFAuT1IodGhpcyxiLkMoIn4oMCkiKS5iKGEpLGIp
-fSwKcTpmdW5jdGlvbihhLGIpe3JldHVybiBudWxsfSwKeno6ZnVuY3Rpb24oYSxiKXtiLkMoIjAoKSIp
-LmIoYSkKaWYoJC5YMz09PUMuTlUpcmV0dXJuIGEuJDAoKQpyZXR1cm4gUC5UOChudWxsLG51bGwsdGhp
-cyxhLGIpfSwKYnY6ZnVuY3Rpb24oYSxiLGMsZCl7Yy5DKCJAPDA+IikuS3EoZCkuQygiMSgyKSIpLmIo
-YSkKZC5iKGIpCmlmKCQuWDM9PT1DLk5VKXJldHVybiBhLiQxKGIpCnJldHVybiBQLnl2KG51bGwsbnVs
-bCx0aGlzLGEsYixjLGQpfSwKcnA6ZnVuY3Rpb24oYSxiLGMsZCxlLGYpe2QuQygiQDwwPiIpLktxKGUp
-LktxKGYpLkMoIjEoMiwzKSIpLmIoYSkKZS5iKGIpCmYuYihjKQppZigkLlgzPT09Qy5OVSlyZXR1cm4g
-YS4kMihiLGMpCnJldHVybiBQLlF4KG51bGwsbnVsbCx0aGlzLGEsYixjLGQsZSxmKX0sCkxqOmZ1bmN0
-aW9uKGEsYixjLGQpe3JldHVybiBiLkMoIkA8MD4iKS5LcShjKS5LcShkKS5DKCIxKDIsMykiKS5iKGEp
-fX0KUC5oai5wcm90b3R5cGU9ewokMDpmdW5jdGlvbigpe3JldHVybiB0aGlzLmEuenoodGhpcy5iLHRo
-aXMuYyl9LAokUzpmdW5jdGlvbigpe3JldHVybiB0aGlzLmMuQygiMCgpIil9fQpQLlZwLnByb3RvdHlw
-ZT17CiQwOmZ1bmN0aW9uKCl7cmV0dXJuIHRoaXMuYS5iSCh0aGlzLmIpfSwKJFM6Mn0KUC5PUi5wcm90
-b3R5cGU9ewokMTpmdW5jdGlvbihhKXt2YXIgdD10aGlzLmMKcmV0dXJuIHRoaXMuYS5EbCh0aGlzLmIs
-dC5iKGEpLHQpfSwKJFM6ZnVuY3Rpb24oKXtyZXR1cm4gdGhpcy5jLkMoIn4oMCkiKX19ClAuYjYucHJv
-dG90eXBlPXsKZ2t6OmZ1bmN0aW9uKGEpe3ZhciB0PXRoaXMscz1uZXcgUC5sbSh0LHQucixILkxoKHQp
-LkMoImxtPDE+IikpCnMuYz10LmUKcmV0dXJuIHN9LApnQTpmdW5jdGlvbihhKXtyZXR1cm4gdGhpcy5h
-fSwKdGc6ZnVuY3Rpb24oYSxiKXt2YXIgdCxzCmlmKHR5cGVvZiBiPT0ic3RyaW5nIiYmYiE9PSJfX3By
-b3RvX18iKXt0PXRoaXMuYgppZih0PT1udWxsKXJldHVybiExCnJldHVybiB1LkouYih0W2JdKSE9bnVs
-bH1lbHNle3M9dGhpcy5QUihiKQpyZXR1cm4gc319LApQUjpmdW5jdGlvbihhKXt2YXIgdD10aGlzLmQK
-aWYodD09bnVsbClyZXR1cm4hMQpyZXR1cm4gdGhpcy5ERih0W3RoaXMuTihhKV0sYSk+PTB9LAppOmZ1
-bmN0aW9uKGEsYil7dmFyIHQscyxyPXRoaXMKSC5MaChyKS5kLmIoYikKaWYodHlwZW9mIGI9PSJzdHJp
-bmciJiZiIT09Il9fcHJvdG9fXyIpe3Q9ci5iCnJldHVybiByLmJRKHQ9PW51bGw/ci5iPVAuVDIoKTp0
-LGIpfWVsc2UgaWYodHlwZW9mIGI9PSJudW1iZXIiJiYoYiYxMDczNzQxODIzKT09PWIpe3M9ci5jCnJl
-dHVybiByLmJRKHM9PW51bGw/ci5jPVAuVDIoKTpzLGIpfWVsc2UgcmV0dXJuIHIuQjcoYil9LApCNzpm
-dW5jdGlvbihhKXt2YXIgdCxzLHIscT10aGlzCkguTGgocSkuZC5iKGEpCnQ9cS5kCmlmKHQ9PW51bGwp
-dD1xLmQ9UC5UMigpCnM9cS5OKGEpCnI9dFtzXQppZihyPT1udWxsKXRbc109W3EueW8oYSldCmVsc2V7
-aWYocS5ERihyLGEpPj0wKXJldHVybiExCnIucHVzaChxLnlvKGEpKX1yZXR1cm4hMH0sClI6ZnVuY3Rp
-b24oYSxiKXt2YXIgdD10aGlzCmlmKHR5cGVvZiBiPT0ic3RyaW5nIiYmYiE9PSJfX3Byb3RvX18iKXJl
-dHVybiB0LkwodC5iLGIpCmVsc2UgaWYodHlwZW9mIGI9PSJudW1iZXIiJiYoYiYxMDczNzQxODIzKT09
-PWIpcmV0dXJuIHQuTCh0LmMsYikKZWxzZSByZXR1cm4gdC5xZyhiKX0sCnFnOmZ1bmN0aW9uKGEpe3Zh
-ciB0LHMscixxLHA9dGhpcyxvPXAuZAppZihvPT1udWxsKXJldHVybiExCnQ9cC5OKGEpCnM9b1t0XQpy
-PXAuREYocyxhKQppZihyPDApcmV0dXJuITEKcT1zLnNwbGljZShyLDEpWzBdCmlmKDA9PT1zLmxlbmd0
-aClkZWxldGUgb1t0XQpwLkdTKHEpCnJldHVybiEwfSwKYlE6ZnVuY3Rpb24oYSxiKXtILkxoKHRoaXMp
-LmQuYihiKQppZih1LkouYihhW2JdKSE9bnVsbClyZXR1cm4hMQphW2JdPXRoaXMueW8oYikKcmV0dXJu
-ITB9LApMOmZ1bmN0aW9uKGEsYil7dmFyIHQKaWYoYT09bnVsbClyZXR1cm4hMQp0PXUuSi5iKGFbYl0p
-CmlmKHQ9PW51bGwpcmV0dXJuITEKdGhpcy5HUyh0KQpkZWxldGUgYVtiXQpyZXR1cm4hMH0sClM6ZnVu
-Y3Rpb24oKXt0aGlzLnI9MTA3Mzc0MTgyMyZ0aGlzLnIrMX0sCnlvOmZ1bmN0aW9uKGEpe3ZhciB0LHM9
-dGhpcyxyPW5ldyBQLmJuKEguTGgocykuZC5iKGEpKQppZihzLmU9PW51bGwpcy5lPXMuZj1yCmVsc2V7
-dD1zLmYKci5jPXQKcy5mPXQuYj1yfSsrcy5hCnMuUygpCnJldHVybiByfSwKR1M6ZnVuY3Rpb24oYSl7
-dmFyIHQ9dGhpcyxzPWEuYyxyPWEuYgppZihzPT1udWxsKXQuZT1yCmVsc2Ugcy5iPXIKaWYocj09bnVs
-bCl0LmY9cwplbHNlIHIuYz1zOy0tdC5hCnQuUygpfSwKTjpmdW5jdGlvbihhKXtyZXR1cm4gSi5oZihh
-KSYxMDczNzQxODIzfSwKREY6ZnVuY3Rpb24oYSxiKXt2YXIgdCxzCmlmKGE9PW51bGwpcmV0dXJuLTEK
-dD1hLmxlbmd0aApmb3Iocz0wO3M8dDsrK3MpaWYoSi5STShhW3NdLmEsYikpcmV0dXJuIHMKcmV0dXJu
-LTF9fQpQLmJuLnByb3RvdHlwZT17fQpQLmxtLnByb3RvdHlwZT17CmdsOmZ1bmN0aW9uKCl7cmV0dXJu
-IHRoaXMuZH0sCkY6ZnVuY3Rpb24oKXt2YXIgdD10aGlzLHM9dC5hCmlmKHQuYiE9PXMucil0aHJvdyBI
-LmIoUC5hNChzKSkKZWxzZXtzPXQuYwppZihzPT1udWxsKXt0LnNqKG51bGwpCnJldHVybiExfWVsc2V7
-dC5zaih0LiR0aS5kLmIocy5hKSkKdC5jPXQuYy5iCnJldHVybiEwfX19LApzajpmdW5jdGlvbihhKXt0
-aGlzLmQ9dGhpcy4kdGkuZC5iKGEpfSwKJGlBbjoxfQpQLm1XLnByb3RvdHlwZT17fQpQLkxVLnByb3Rv
-dHlwZT17JGljWDoxLCRpek06MX0KUC5sRC5wcm90b3R5cGU9ewpna3o6ZnVuY3Rpb24oYSl7cmV0dXJu
-IG5ldyBILmE3KGEsdGhpcy5nQShhKSxILnpLKGEpLkMoImE3PGxELkU+IikpfSwKRTpmdW5jdGlvbihh
-LGIpe3JldHVybiB0aGlzLnEoYSxiKX0sCks6ZnVuY3Rpb24oYSxiKXt2YXIgdCxzCkgueksoYSkuQygi
-fihsRC5FKSIpLmIoYikKdD10aGlzLmdBKGEpCmZvcihzPTA7czx0Oysrcyl7Yi4kMSh0aGlzLnEoYSxz
-KSkKaWYodCE9PXRoaXMuZ0EoYSkpdGhyb3cgSC5iKFAuYTQoYSkpfX0sCkUyOmZ1bmN0aW9uKGEsYixj
-KXt2YXIgdD1ILnpLKGEpCnJldHVybiBuZXcgSC5BOChhLHQuS3EoYykuQygiMShsRC5FKSIpLmIoYiks
-dC5DKCJAPGxELkU+IikuS3EoYykuQygiQTg8MSwyPiIpKX0sCmR1OmZ1bmN0aW9uKGEsYixjLGQpe3Zh
-ciB0CkgueksoYSkuQygibEQuRSIpLmIoZCkKUC5qQihiLGMsdGhpcy5nQShhKSkKZm9yKHQ9Yjt0PGM7
-Kyt0KXRoaXMuWShhLHQsZCl9LAp3OmZ1bmN0aW9uKGEpe3JldHVybiBQLldFKGEsIlsiLCJdIil9fQpQ
-LmlsLnByb3RvdHlwZT17fQpQLnJhLnByb3RvdHlwZT17CiQyOmZ1bmN0aW9uKGEsYil7dmFyIHQscz10
-aGlzLmEKaWYoIXMuYSl0aGlzLmIuYSs9IiwgIgpzLmE9ITEKcz10aGlzLmIKdD1zLmErPUguZChhKQpz
-LmE9dCsiOiAiCnMuYSs9SC5kKGIpfSwKJFM6MX0KUC5Zay5wcm90b3R5cGU9ewpLOmZ1bmN0aW9uKGEs
-Yil7dmFyIHQscwpILkxoKHRoaXMpLkMoIn4oWWsuSyxZay5WKSIpLmIoYikKZm9yKHQ9Si5JVCh0aGlz
-LmdWKCkpO3QuRigpOyl7cz10LmdsKCkKYi4kMihzLHRoaXMucSgwLHMpKX19LApnQTpmdW5jdGlvbihh
-KXtyZXR1cm4gSi5IbSh0aGlzLmdWKCkpfSwKdzpmdW5jdGlvbihhKXtyZXR1cm4gUC5uTyh0aGlzKX0s
-CiRpWjA6MX0KUC5LUC5wcm90b3R5cGU9ewpZOmZ1bmN0aW9uKGEsYixjKXt2YXIgdD1ILkxoKHRoaXMp
-CnQuZC5iKGIpCnQuY2hbMV0uYihjKQp0aHJvdyBILmIoUC5MNCgiQ2Fubm90IG1vZGlmeSB1bm1vZGlm
-aWFibGUgbWFwIikpfX0KUC5Qbi5wcm90b3R5cGU9ewpxOmZ1bmN0aW9uKGEsYil7cmV0dXJuIHRoaXMu
-YS5xKDAsYil9LApZOmZ1bmN0aW9uKGEsYixjKXt2YXIgdD1ILkxoKHRoaXMpCnRoaXMuYS5ZKDAsdC5k
-LmIoYiksdC5jaFsxXS5iKGMpKX0sCks6ZnVuY3Rpb24oYSxiKXt0aGlzLmEuSygwLEguTGgodGhpcyku
-QygifigxLDIpIikuYihiKSl9LApnQTpmdW5jdGlvbihhKXt2YXIgdD10aGlzLmEKcmV0dXJuIHQuZ0Eo
-dCl9LAp3OmZ1bmN0aW9uKGEpe3JldHVybiBKLmoodGhpcy5hKX0sCiRpWjA6MX0KUC5Hai5wcm90b3R5
-cGU9e30KUC5sZi5wcm90b3R5cGU9ewp3OmZ1bmN0aW9uKGEpe3JldHVybiBQLldFKHRoaXMsInsiLCJ9
-Iil9fQpQLlZqLnByb3RvdHlwZT17JGljWDoxLCRpeHU6MX0KUC5Ydi5wcm90b3R5cGU9ewpGVjpmdW5j
-dGlvbihhLGIpe3ZhciB0CmZvcih0PUouSVQoSC5MaCh0aGlzKS5DKCJjWDwxPiIpLmIoYikpO3QuRigp
-Oyl0aGlzLmkoMCx0LmdsKCkpfSwKdzpmdW5jdGlvbihhKXtyZXR1cm4gUC5XRSh0aGlzLCJ7IiwifSIp
-fSwKSDpmdW5jdGlvbihhLGIpe3ZhciB0LHM9UC5yaih0aGlzLHRoaXMucixILkxoKHRoaXMpLmQpCmlm
-KCFzLkYoKSlyZXR1cm4iIgppZihiPT09IiIpe3Q9IiIKZG8gdCs9SC5kKHMuZCkKd2hpbGUocy5GKCkp
-fWVsc2V7dD1ILmQocy5kKQpmb3IoO3MuRigpOyl0PXQrYitILmQocy5kKX1yZXR1cm4gdC5jaGFyQ29k
-ZUF0KDApPT0wP3Q6dH0sCiRpY1g6MSwKJGl4dToxfQpQLm5ZLnByb3RvdHlwZT17fQpQLldZLnByb3Rv
-dHlwZT17fQpQLlJVLnByb3RvdHlwZT17fQpQLnV3LnByb3RvdHlwZT17CnE6ZnVuY3Rpb24oYSxiKXt2
-YXIgdCxzPXRoaXMuYgppZihzPT1udWxsKXJldHVybiB0aGlzLmMucSgwLGIpCmVsc2UgaWYodHlwZW9m
-IGIhPSJzdHJpbmciKXJldHVybiBudWxsCmVsc2V7dD1zW2JdCnJldHVybiB0eXBlb2YgdD09InVuZGVm
-aW5lZCI/dGhpcy5mYihiKTp0fX0sCmdBOmZ1bmN0aW9uKGEpe3JldHVybiB0aGlzLmI9PW51bGw/dGhp
-cy5jLmE6dGhpcy5DZigpLmxlbmd0aH0sCmdWOmZ1bmN0aW9uKCl7aWYodGhpcy5iPT1udWxsKXt2YXIg
-dD10aGlzLmMKcmV0dXJuIG5ldyBILmk1KHQsSC5MaCh0KS5DKCJpNTwxPiIpKX1yZXR1cm4gbmV3IFAu
-aTgodGhpcyl9LApZOmZ1bmN0aW9uKGEsYixjKXt2YXIgdCxzLHI9dGhpcwppZihyLmI9PW51bGwpci5j
-LlkoMCxiLGMpCmVsc2UgaWYoci54NChiKSl7dD1yLmIKdFtiXT1jCnM9ci5hCmlmKHM9PW51bGw/dCE9
-bnVsbDpzIT09dClzW2JdPW51bGx9ZWxzZSByLlhLKCkuWSgwLGIsYyl9LAp4NDpmdW5jdGlvbihhKXtp
-Zih0aGlzLmI9PW51bGwpcmV0dXJuIHRoaXMuYy54NChhKQpyZXR1cm4gT2JqZWN0LnByb3RvdHlwZS5o
-YXNPd25Qcm9wZXJ0eS5jYWxsKHRoaXMuYSxhKX0sCks6ZnVuY3Rpb24oYSxiKXt2YXIgdCxzLHIscSxw
-PXRoaXMKdS5jQS5iKGIpCmlmKHAuYj09bnVsbClyZXR1cm4gcC5jLksoMCxiKQp0PXAuQ2YoKQpmb3Io
-cz0wO3M8dC5sZW5ndGg7KytzKXtyPXRbc10KcT1wLmJbcl0KaWYodHlwZW9mIHE9PSJ1bmRlZmluZWQi
-KXtxPVAuUWUocC5hW3JdKQpwLmJbcl09cX1iLiQyKHIscSkKaWYodCE9PXAuYyl0aHJvdyBILmIoUC5h
-NChwKSl9fSwKQ2Y6ZnVuY3Rpb24oKXt2YXIgdD11LmouYih0aGlzLmMpCmlmKHQ9PW51bGwpdD10aGlz
-LmM9SC5WTShPYmplY3Qua2V5cyh0aGlzLmEpLHUucykKcmV0dXJuIHR9LApYSzpmdW5jdGlvbigpe3Zh
-ciB0LHMscixxLHAsbz10aGlzCmlmKG8uYj09bnVsbClyZXR1cm4gby5jCnQ9UC5GbCh1Lk4sdS56KQpz
-PW8uQ2YoKQpmb3Iocj0wO3E9cy5sZW5ndGgscjxxOysrcil7cD1zW3JdCnQuWSgwLHAsby5xKDAscCkp
-fWlmKHE9PT0wKUMuTm0uaShzLG51bGwpCmVsc2UgQy5ObS5zQShzLDApCm8uYT1vLmI9bnVsbApyZXR1
-cm4gby5jPXR9LApmYjpmdW5jdGlvbihhKXt2YXIgdAppZighT2JqZWN0LnByb3RvdHlwZS5oYXNPd25Q
-cm9wZXJ0eS5jYWxsKHRoaXMuYSxhKSlyZXR1cm4gbnVsbAp0PVAuUWUodGhpcy5hW2FdKQpyZXR1cm4g
-dGhpcy5iW2FdPXR9fQpQLmk4LnByb3RvdHlwZT17CmdBOmZ1bmN0aW9uKGEpe3ZhciB0PXRoaXMuYQpy
-ZXR1cm4gdC5nQSh0KX0sCkU6ZnVuY3Rpb24oYSxiKXt2YXIgdD10aGlzLmEKaWYodC5iPT1udWxsKXQ9
-dC5nVigpLkUoMCxiKQplbHNle3Q9dC5DZigpCmlmKGI8MHx8Yj49dC5sZW5ndGgpcmV0dXJuIEguT0go
-dCxiKQp0PXRbYl19cmV0dXJuIHR9LApna3o6ZnVuY3Rpb24oYSl7dmFyIHQ9dGhpcy5hCmlmKHQuYj09
-bnVsbCl7dD10LmdWKCkKdD10Lmdreih0KX1lbHNle3Q9dC5DZigpCnQ9bmV3IEoubTEodCx0Lmxlbmd0
-aCxILnQ2KHQpLkMoIm0xPDE+IikpfXJldHVybiB0fX0KUC5DVi5wcm90b3R5cGU9ewp5cjpmdW5jdGlv
-bihhLGEwLGExKXt2YXIgdCxzLHIscSxwLG8sbixtLGwsayxqLGksaCxnLGYsZSxkLGMsYj0iSW52YWxp
-ZCBiYXNlNjQgZW5jb2RpbmcgbGVuZ3RoICIKYTE9UC5qQihhMCxhMSxhLmxlbmd0aCkKdD0kLlY3KCkK
-Zm9yKHM9YTAscj1zLHE9bnVsbCxwPS0xLG89LTEsbj0wO3M8YTE7cz1tKXttPXMrMQpsPUMueEIuVyhh
-LHMpCmlmKGw9PT0zNyl7az1tKzIKaWYoazw9YTEpe2o9SC5vbyhDLnhCLlcoYSxtKSkKaT1ILm9vKEMu
-eEIuVyhhLG0rMSkpCmg9aioxNitpLShpJjI1NikKaWYoaD09PTM3KWg9LTEKbT1rfWVsc2UgaD0tMX1l
-bHNlIGg9bAppZigwPD1oJiZoPD0xMjcpe2lmKGg8MHx8aD49dC5sZW5ndGgpcmV0dXJuIEguT0godCxo
-KQpnPXRbaF0KaWYoZz49MCl7aD1DLnhCLm0oIkFCQ0RFRkdISUpLTE1OT1BRUlNUVVZXWFlaYWJjZGVm
-Z2hpamtsbW5vcHFyc3R1dnd4eXowMTIzNDU2Nzg5Ky8iLGcpCmlmKGg9PT1sKWNvbnRpbnVlCmw9aH1l
-bHNle2lmKGc9PT0tMSl7aWYocDwwKXtmPXE9PW51bGw/bnVsbDpxLmEubGVuZ3RoCmlmKGY9PW51bGwp
-Zj0wCnA9Zisocy1yKQpvPXN9KytuCmlmKGw9PT02MSljb250aW51ZX1sPWh9aWYoZyE9PS0yKXtpZihx
-PT1udWxsKXE9bmV3IFAuUm4oIiIpCnEuYSs9Qy54Qi5OaihhLHIscykKcS5hKz1ILkx3KGwpCnI9bQpj
-b250aW51ZX19dGhyb3cgSC5iKFAucnIoIkludmFsaWQgYmFzZTY0IGRhdGEiLGEscykpfWlmKHEhPW51
-bGwpe2Y9cS5hKz1DLnhCLk5qKGEscixhMSkKZT1mLmxlbmd0aAppZihwPj0wKVAueE0oYSxvLGExLHAs
-bixlKQplbHNle2Q9Qy5qbi56WShlLTEsNCkrMQppZihkPT09MSl0aHJvdyBILmIoUC5ycihiLGEsYTEp
-KQpmb3IoO2Q8NDspe2YrPSI9IgpxLmE9ZjsrK2R9fWY9cS5hCnJldHVybiBDLnhCLmk3KGEsYTAsYTEs
-Zi5jaGFyQ29kZUF0KDApPT0wP2Y6Zil9Yz1hMS1hMAppZihwPj0wKVAueE0oYSxvLGExLHAsbixjKQpl
-bHNle2Q9Qy5qbi56WShjLDQpCmlmKGQ9PT0xKXRocm93IEguYihQLnJyKGIsYSxhMSkpCmlmKGQ+MSlh
-PUMueEIuaTcoYSxhMSxhMSxkPT09Mj8iPT0iOiI9Iil9cmV0dXJuIGF9fQpQLlU4LnByb3RvdHlwZT17
-fQpQLlVrLnByb3RvdHlwZT17fQpQLndJLnByb3RvdHlwZT17fQpQLlppLnByb3RvdHlwZT17fQpQLmJ5
-LnByb3RvdHlwZT17CnBXOmZ1bmN0aW9uKGEsYixjKXt2YXIgdAp1LmVwLmIoYykKdD1QLkJTKGIsdGhp
-cy5nSGUoKS5hKQpyZXR1cm4gdH0sCmdIZTpmdW5jdGlvbigpe3JldHVybiBDLkEzfX0KUC5NeC5wcm90
-b3R5cGU9e30KUC51NS5wcm90b3R5cGU9ewpnWkU6ZnVuY3Rpb24oKXtyZXR1cm4gQy5Ra319ClAuRTMu
-cHJvdG90eXBlPXsKV0o6ZnVuY3Rpb24oYSl7dmFyIHQscyxyPVAuakIoMCxudWxsLGEubGVuZ3RoKSxx
-PXItMAppZihxPT09MClyZXR1cm4gbmV3IFVpbnQ4QXJyYXkoMCkKdD1uZXcgVWludDhBcnJheShxKjMp
-CnM9bmV3IFAuUncodCkKaWYocy5HeChhLDAscikhPT1yKXMuTzYoSi5hNihhLHItMSksMCkKcmV0dXJu
-IG5ldyBVaW50OEFycmF5KHQuc3ViYXJyYXkoMCxILnJNKDAscy5iLHQubGVuZ3RoKSkpfX0KUC5Sdy5w
-cm90b3R5cGU9ewpPNjpmdW5jdGlvbihhLGIpe3ZhciB0LHM9dGhpcyxyPXMuYyxxPXMuYixwPXErMSxv
-PXIubGVuZ3RoCmlmKChiJjY0NTEyKT09PTU2MzIwKXt0PTY1NTM2KygoYSYxMDIzKTw8MTApfGImMTAy
-MwpzLmI9cAppZihxPj1vKXJldHVybiBILk9IKHIscSkKcltxXT0yNDB8dD4+PjE4CnE9cy5iPXArMQpp
-ZihwPj1vKXJldHVybiBILk9IKHIscCkKcltwXT0xMjh8dD4+PjEyJjYzCnA9cy5iPXErMQppZihxPj1v
-KXJldHVybiBILk9IKHIscSkKcltxXT0xMjh8dD4+PjYmNjMKcy5iPXArMQppZihwPj1vKXJldHVybiBI
-Lk9IKHIscCkKcltwXT0xMjh8dCY2MwpyZXR1cm4hMH1lbHNle3MuYj1wCmlmKHE+PW8pcmV0dXJuIEgu
-T0gocixxKQpyW3FdPTIyNHxhPj4+MTIKcT1zLmI9cCsxCmlmKHA+PW8pcmV0dXJuIEguT0gocixwKQpy
-W3BdPTEyOHxhPj4+NiY2MwpzLmI9cSsxCmlmKHE+PW8pcmV0dXJuIEguT0gocixxKQpyW3FdPTEyOHxh
-JjYzCnJldHVybiExfX0sCkd4OmZ1bmN0aW9uKGEsYixjKXt2YXIgdCxzLHIscSxwLG8sbixtPXRoaXMK
-aWYoYiE9PWMmJihDLnhCLm0oYSxjLTEpJjY0NTEyKT09PTU1Mjk2KS0tYwpmb3IodD1tLmMscz10Lmxl
-bmd0aCxyPWI7cjxjOysrcil7cT1DLnhCLlcoYSxyKQppZihxPD0xMjcpe3A9bS5iCmlmKHA+PXMpYnJl
-YWsKbS5iPXArMQp0W3BdPXF9ZWxzZSBpZigocSY2NDUxMik9PT01NTI5Nil7aWYobS5iKzM+PXMpYnJl
-YWsKbz1yKzEKaWYobS5PNihxLEMueEIuVyhhLG8pKSlyPW99ZWxzZSBpZihxPD0yMDQ3KXtwPW0uYgpu
-PXArMQppZihuPj1zKWJyZWFrCm0uYj1uCmlmKHA+PXMpcmV0dXJuIEguT0godCxwKQp0W3BdPTE5Mnxx
-Pj4+NgptLmI9bisxCnRbbl09MTI4fHEmNjN9ZWxzZXtwPW0uYgppZihwKzI+PXMpYnJlYWsKbj1tLmI9
-cCsxCmlmKHA+PXMpcmV0dXJuIEguT0godCxwKQp0W3BdPTIyNHxxPj4+MTIKcD1tLmI9bisxCmlmKG4+
-PXMpcmV0dXJuIEguT0godCxuKQp0W25dPTEyOHxxPj4+NiY2MwptLmI9cCsxCmlmKHA+PXMpcmV0dXJu
-IEguT0godCxwKQp0W3BdPTEyOHxxJjYzfX1yZXR1cm4gcn19ClAuR1kucHJvdG90eXBlPXsKV0o6ZnVu
-Y3Rpb24oYSl7dmFyIHQscyxyLHEscCxvLG4sbSxsCnUuTC5iKGEpCnQ9UC5reSghMSxhLDAsbnVsbCkK
-aWYodCE9bnVsbClyZXR1cm4gdApzPVAuakIoMCxudWxsLEouSG0oYSkpCnI9UC5jUChhLDAscykKaWYo
-cj4wKXtxPVAuSE0oYSwwLHIpCmlmKHI9PT1zKXJldHVybiBxCnA9bmV3IFAuUm4ocSkKbz1yCm49ITF9
-ZWxzZXtvPTAKcD1udWxsCm49ITB9aWYocD09bnVsbClwPW5ldyBQLlJuKCIiKQptPW5ldyBQLmJ6KCEx
-LHApCm0uYz1uCm0uTUUoYSxvLHMpCmlmKG0uZT4wKXtILnZoKFAucnIoIlVuZmluaXNoZWQgVVRGLTgg
-b2N0ZXQgc2VxdWVuY2UiLGEscykpCnAuYSs9SC5Mdyg2NTUzMykKbS5mPW0uZT1tLmQ9MH1sPXAuYQpy
-ZXR1cm4gbC5jaGFyQ29kZUF0KDApPT0wP2w6bH19ClAuYnoucHJvdG90eXBlPXsKTUU6ZnVuY3Rpb24o
-YSxiLGMpe3ZhciB0LHMscixxLHAsbyxuLG0sbCxrLGosaSxoPXRoaXMsZz0iQmFkIFVURi04IGVuY29k
-aW5nIDB4Igp1LkwuYihhKQp0PWguZApzPWguZQpyPWguZgpoLmY9aC5lPWguZD0wCiRsYWJlbDAkMDpm
-b3IocT1KLlU2KGEpLHA9aC5iLG89YjshMDtvPWopeyRsYWJlbDEkMTppZihzPjApe2Rve2lmKG89PT1j
-KWJyZWFrICRsYWJlbDAkMApuPXEucShhLG8pCmlmKHR5cGVvZiBuIT09Im51bWJlciIpcmV0dXJuIG4u
-ek0oKQppZigobiYxOTIpIT09MTI4KXttPVAucnIoZytDLmpuLldaKG4sMTYpLGEsbykKdGhyb3cgSC5i
-KG0pfWVsc2V7dD0odDw8NnxuJjYzKT4+PjA7LS1zOysrb319d2hpbGUocz4wKQptPXItMQppZihtPDB8
-fG0+PTQpcmV0dXJuIEguT0goQy5HYixtKQppZih0PD1DLkdiW21dKXttPVAucnIoIk92ZXJsb25nIGVu
-Y29kaW5nIG9mIDB4IitDLmpuLldaKHQsMTYpLGEsby1yLTEpCnRocm93IEguYihtKX1pZih0PjExMTQx
-MTEpe209UC5ycigiQ2hhcmFjdGVyIG91dHNpZGUgdmFsaWQgVW5pY29kZSByYW5nZTogMHgiK0Muam4u
-V1oodCwxNiksYSxvLXItMSkKdGhyb3cgSC5iKG0pfWlmKCFoLmN8fHQhPT02NTI3OSlwLmErPUguTHco
-dCkKaC5jPSExfWZvcihtPW88YzttOyl7bD1QLmNQKGEsbyxjKQppZihsPjApe2guYz0hMQprPW8rbApw
-LmErPVAuSE0oYSxvLGspCmlmKGs9PT1jKWJyZWFrfWVsc2Ugaz1vCmo9aysxCm49cS5xKGEsaykKaWYo
-dHlwZW9mIG4hPT0ibnVtYmVyIilyZXR1cm4gbi5KKCkKaWYobjwwKXtpPVAucnIoIk5lZ2F0aXZlIFVU
-Ri04IGNvZGUgdW5pdDogLTB4IitDLmpuLldaKC1uLDE2KSxhLGotMSkKdGhyb3cgSC5iKGkpfWVsc2V7
-aWYoKG4mMjI0KT09PTE5Mil7dD1uJjMxCnM9MQpyPTEKY29udGludWUgJGxhYmVsMCQwfWlmKChuJjI0
-MCk9PT0yMjQpe3Q9biYxNQpzPTIKcj0yCmNvbnRpbnVlICRsYWJlbDAkMH1pZigobiYyNDgpPT09MjQw
-JiZuPDI0NSl7dD1uJjcKcz0zCnI9Mwpjb250aW51ZSAkbGFiZWwwJDB9aT1QLnJyKGcrQy5qbi5XWihu
-LDE2KSxhLGotMSkKdGhyb3cgSC5iKGkpfX1icmVhayAkbGFiZWwwJDB9aWYocz4wKXtoLmQ9dApoLmU9
-cwpoLmY9cn19fQpQLldGLnByb3RvdHlwZT17CiQyOmZ1bmN0aW9uKGEsYil7dmFyIHQscyxyCnUuZm8u
-YihhKQp0PXRoaXMuYgpzPXRoaXMuYQp0LmErPXMuYQpyPXQuYSs9SC5kKGEuYSkKdC5hPXIrIjogIgp0
-LmErPVAucChiKQpzLmE9IiwgIn0sCiRTOjMyfQpQLmEyLnByb3RvdHlwZT17fQpQLmlQLnByb3RvdHlw
-ZT17CkROOmZ1bmN0aW9uKGEsYil7aWYoYj09bnVsbClyZXR1cm4hMQpyZXR1cm4gYiBpbnN0YW5jZW9m
-IFAuaVAmJnRoaXMuYT09PWIuYSYmITB9LApnaU86ZnVuY3Rpb24oYSl7dmFyIHQ9dGhpcy5hCnJldHVy
-bih0XkMuam4ud0codCwzMCkpJjEwNzM3NDE4MjN9LAp3OmZ1bmN0aW9uKGEpe3ZhciB0PXRoaXMscz1Q
-LkdxKEgudEoodCkpLHI9UC5oMChILk5TKHQpKSxxPVAuaDAoSC5qQSh0KSkscD1QLmgwKEguS0wodCkp
-LG89UC5oMChILmNoKHQpKSxuPVAuaDAoSC5KZCh0KSksbT1QLlZ4KEgubzEodCkpLGw9cysiLSIrcisi
-LSIrcSsiICIrcCsiOiIrbysiOiIrbisiLiIrbQpyZXR1cm4gbH19ClAuQ1AucHJvdG90eXBlPXt9ClAu
-WFMucHJvdG90eXBlPXt9ClAuQzYucHJvdG90eXBlPXsKdzpmdW5jdGlvbihhKXt2YXIgdD10aGlzLmEK
-aWYodCE9bnVsbClyZXR1cm4iQXNzZXJ0aW9uIGZhaWxlZDogIitQLnAodCkKcmV0dXJuIkFzc2VydGlv
-biBmYWlsZWQifX0KUC5uLnByb3RvdHlwZT17Cnc6ZnVuY3Rpb24oYSl7cmV0dXJuIlRocm93IG9mIG51
-bGwuIn19ClAudS5wcm90b3R5cGU9ewpnWjpmdW5jdGlvbigpe3JldHVybiJJbnZhbGlkIGFyZ3VtZW50
-IisoIXRoaXMuYT8iKHMpIjoiIil9LApndTpmdW5jdGlvbigpe3JldHVybiIifSwKdzpmdW5jdGlvbihh
-KXt2YXIgdCxzLHIscSxwPXRoaXMsbz1wLmMsbj1vIT1udWxsPyIgKCIrbysiKSI6IiIKbz1wLmQKdD1v
-PT1udWxsPyIiOiI6ICIrSC5kKG8pCnM9cC5nWigpK24rdAppZighcC5hKXJldHVybiBzCnI9cC5ndSgp
-CnE9UC5wKHAuYikKcmV0dXJuIHMrcisiOiAiK3F9fQpQLmJKLnByb3RvdHlwZT17CmdaOmZ1bmN0aW9u
-KCl7cmV0dXJuIlJhbmdlRXJyb3IifSwKZ3U6ZnVuY3Rpb24oKXt2YXIgdCxzLHI9dGhpcy5lCmlmKHI9
-PW51bGwpe3I9dGhpcy5mCnQ9ciE9bnVsbD8iOiBOb3QgbGVzcyB0aGFuIG9yIGVxdWFsIHRvICIrSC5k
-KHIpOiIifWVsc2V7cz10aGlzLmYKaWYocz09bnVsbCl0PSI6IE5vdCBncmVhdGVyIHRoYW4gb3IgZXF1
-YWwgdG8gIitILmQocikKZWxzZSBpZihzPnIpdD0iOiBOb3QgaW4gcmFuZ2UgIitILmQocikrIi4uIitI
-LmQocykrIiwgaW5jbHVzaXZlIgplbHNlIHQ9czxyPyI6IFZhbGlkIHZhbHVlIHJhbmdlIGlzIGVtcHR5
-IjoiOiBPbmx5IHZhbGlkIHZhbHVlIGlzICIrSC5kKHIpfXJldHVybiB0fX0KUC5lWS5wcm90b3R5cGU9
-ewpnWjpmdW5jdGlvbigpe3JldHVybiJSYW5nZUVycm9yIn0sCmd1OmZ1bmN0aW9uKCl7dmFyIHQscz1I
-LlNjKHRoaXMuYikKaWYodHlwZW9mIHMhPT0ibnVtYmVyIilyZXR1cm4gcy5KKCkKaWYoczwwKXJldHVy
-biI6IGluZGV4IG11c3Qgbm90IGJlIG5lZ2F0aXZlIgp0PXRoaXMuZgppZih0PT09MClyZXR1cm4iOiBu
-byBpbmRpY2VzIGFyZSB2YWxpZCIKcmV0dXJuIjogaW5kZXggc2hvdWxkIGJlIGxlc3MgdGhhbiAiK0gu
-ZCh0KX0sCmdBOmZ1bmN0aW9uKGEpe3JldHVybiB0aGlzLmZ9fQpQLm1wLnByb3RvdHlwZT17Cnc6ZnVu
-Y3Rpb24oYSl7dmFyIHQscyxyLHEscCxvLG4sbSxsPXRoaXMsaz17fSxqPW5ldyBQLlJuKCIiKQprLmE9
-IiIKZm9yKHQ9bC5jLHM9dC5sZW5ndGgscj0wLHE9IiIscD0iIjtyPHM7KytyLHA9IiwgIil7bz10W3Jd
-CmouYT1xK3AKcT1qLmErPVAucChvKQprLmE9IiwgIn1sLmQuSygwLG5ldyBQLldGKGssaikpCm49UC5w
-KGwuYSkKbT1qLncoMCkKdD0iTm9TdWNoTWV0aG9kRXJyb3I6IG1ldGhvZCBub3QgZm91bmQ6ICciK0gu
-ZChsLmIuYSkrIidcblJlY2VpdmVyOiAiK24rIlxuQXJndW1lbnRzOiBbIittKyJdIgpyZXR1cm4gdH19
-ClAudWIucHJvdG90eXBlPXsKdzpmdW5jdGlvbihhKXtyZXR1cm4iVW5zdXBwb3J0ZWQgb3BlcmF0aW9u
-OiAiK3RoaXMuYX19ClAuZHMucHJvdG90eXBlPXsKdzpmdW5jdGlvbihhKXt2YXIgdD10aGlzLmEKcmV0
-dXJuIHQhPW51bGw/IlVuaW1wbGVtZW50ZWRFcnJvcjogIit0OiJVbmltcGxlbWVudGVkRXJyb3IifX0K
-UC5sai5wcm90b3R5cGU9ewp3OmZ1bmN0aW9uKGEpe3JldHVybiJCYWQgc3RhdGU6ICIrdGhpcy5hfX0K
-UC5VVi5wcm90b3R5cGU9ewp3OmZ1bmN0aW9uKGEpe3ZhciB0PXRoaXMuYQppZih0PT1udWxsKXJldHVy
-biJDb25jdXJyZW50IG1vZGlmaWNhdGlvbiBkdXJpbmcgaXRlcmF0aW9uLiIKcmV0dXJuIkNvbmN1cnJl
-bnQgbW9kaWZpY2F0aW9uIGR1cmluZyBpdGVyYXRpb246ICIrUC5wKHQpKyIuIn19ClAuazUucHJvdG90
-eXBlPXsKdzpmdW5jdGlvbihhKXtyZXR1cm4iT3V0IG9mIE1lbW9yeSJ9LAokaVhTOjF9ClAuS1kucHJv
-dG90eXBlPXsKdzpmdW5jdGlvbihhKXtyZXR1cm4iU3RhY2sgT3ZlcmZsb3cifSwKJGlYUzoxfQpQLmMu
-cHJvdG90eXBlPXsKdzpmdW5jdGlvbihhKXt2YXIgdD10aGlzLmEKcmV0dXJuIHQ9PW51bGw/IlJlYWRp
-bmcgc3RhdGljIHZhcmlhYmxlIGR1cmluZyBpdHMgaW5pdGlhbGl6YXRpb24iOiJSZWFkaW5nIHN0YXRp
-YyB2YXJpYWJsZSAnIit0KyInIGR1cmluZyBpdHMgaW5pdGlhbGl6YXRpb24ifX0KUC5DRC5wcm90b3R5
-cGU9ewp3OmZ1bmN0aW9uKGEpe3JldHVybiJFeGNlcHRpb246ICIrdGhpcy5hfX0KUC5hRS5wcm90b3R5
-cGU9ewp3OmZ1bmN0aW9uKGEpe3ZhciB0LHMscixxLHAsbyxuLG0sbCxrLGosaSxoPXRoaXMuYSxnPWgh
-PW51bGwmJiIiIT09aD8iRm9ybWF0RXhjZXB0aW9uOiAiK0guZChoKToiRm9ybWF0RXhjZXB0aW9uIixm
-PXRoaXMuYyxlPXRoaXMuYgppZih0eXBlb2YgZT09InN0cmluZyIpe2lmKGYhPW51bGwpaD1mPDB8fGY+
-ZS5sZW5ndGgKZWxzZSBoPSExCmlmKGgpZj1udWxsCmlmKGY9PW51bGwpe3Q9ZS5sZW5ndGg+Nzg/Qy54
-Qi5OaihlLDAsNzUpKyIuLi4iOmUKcmV0dXJuIGcrIlxuIit0fWZvcihzPTEscj0wLHE9ITEscD0wO3A8
-ZjsrK3Ape289Qy54Qi5XKGUscCkKaWYobz09PTEwKXtpZihyIT09cHx8IXEpKytzCnI9cCsxCnE9ITF9
-ZWxzZSBpZihvPT09MTMpeysrcwpyPXArMQpxPSEwfX1nPXM+MT9nKygiIChhdCBsaW5lICIrcysiLCBj
-aGFyYWN0ZXIgIisoZi1yKzEpKyIpXG4iKTpnKygiIChhdCBjaGFyYWN0ZXIgIisoZisxKSsiKVxuIikK
-bj1lLmxlbmd0aApmb3IocD1mO3A8bjsrK3Ape289Qy54Qi5tKGUscCkKaWYobz09PTEwfHxvPT09MTMp
-e249cApicmVha319aWYobi1yPjc4KWlmKGYtcjw3NSl7bT1yKzc1Cmw9cgprPSIiCmo9Ii4uLiJ9ZWxz
-ZXtpZihuLWY8NzUpe2w9bi03NQptPW4Kaj0iIn1lbHNle2w9Zi0zNgptPWYrMzYKaj0iLi4uIn1rPSIu
-Li4ifWVsc2V7bT1uCmw9cgprPSIiCmo9IiJ9aT1DLnhCLk5qKGUsbCxtKQpyZXR1cm4gZytrK2kraisi
-XG4iK0MueEIuSXgoIiAiLGYtbCtrLmxlbmd0aCkrIl5cbiJ9ZWxzZSByZXR1cm4gZiE9bnVsbD9nKygi
-IChhdCBvZmZzZXQgIitILmQoZikrIikiKTpnfX0KUC5FSC5wcm90b3R5cGU9e30KUC5LTi5wcm90b3R5
-cGU9e30KUC5jWC5wcm90b3R5cGU9ewpldjpmdW5jdGlvbihhLGIpe3ZhciB0PUguTGgodGhpcykKcmV0
-dXJuIG5ldyBILlU1KHRoaXMsdC5DKCJhMihjWC5FKSIpLmIoYiksdC5DKCJVNTxjWC5FPiIpKX0sCmdB
-OmZ1bmN0aW9uKGEpe3ZhciB0LHM9dGhpcy5na3oodGhpcykKZm9yKHQ9MDtzLkYoKTspKyt0CnJldHVy
-biB0fSwKZ2wwOmZ1bmN0aW9uKGEpe3JldHVybiF0aGlzLmdreih0aGlzKS5GKCl9LApncjg6ZnVuY3Rp
-b24oYSl7dmFyIHQscz10aGlzLmdreih0aGlzKQppZighcy5GKCkpdGhyb3cgSC5iKEguV3AoKSkKdD1z
-LmdsKCkKaWYocy5GKCkpdGhyb3cgSC5iKEguZFUoKSkKcmV0dXJuIHR9LApFOmZ1bmN0aW9uKGEsYil7
-dmFyIHQscyxyClAuazEoYiwiaW5kZXgiKQpmb3IodD10aGlzLmdreih0aGlzKSxzPTA7dC5GKCk7KXty
-PXQuZ2woKQppZihiPT09cylyZXR1cm4gcjsrK3N9dGhyb3cgSC5iKFAuQ2YoYix0aGlzLCJpbmRleCIs
-bnVsbCxzKSl9LAp3OmZ1bmN0aW9uKGEpe3JldHVybiBQLkVQKHRoaXMsIigiLCIpIil9fQpQLkFuLnBy
-b3RvdHlwZT17fQpQLnpNLnByb3RvdHlwZT17JGljWDoxfQpQLlowLnByb3RvdHlwZT17fQpQLmM4LnBy
-b3RvdHlwZT17CmdpTzpmdW5jdGlvbihhKXtyZXR1cm4gUC5rLnByb3RvdHlwZS5naU8uY2FsbCh0aGlz
-LHRoaXMpfSwKdzpmdW5jdGlvbihhKXtyZXR1cm4ibnVsbCJ9fQpQLkZLLnByb3RvdHlwZT17fQpQLmsu
-cHJvdG90eXBlPXtjb25zdHJ1Y3RvcjpQLmssJGlrOjEsCkROOmZ1bmN0aW9uKGEsYil7cmV0dXJuIHRo
-aXM9PT1ifSwKZ2lPOmZ1bmN0aW9uKGEpe3JldHVybiBILmVRKHRoaXMpfSwKdzpmdW5jdGlvbihhKXty
-ZXR1cm4iSW5zdGFuY2Ugb2YgJyIrSC5kKEguTSh0aGlzKSkrIicifSwKZTc6ZnVuY3Rpb24oYSxiKXt1
-Lm8uYihiKQp0aHJvdyBILmIoUC5scih0aGlzLGIuZ1dhKCksYi5nbmQoKSxiLmdWbSgpKSl9LAp0b1N0
-cmluZzpmdW5jdGlvbigpe3JldHVybiB0aGlzLncodGhpcyl9fQpQLk9kLnByb3RvdHlwZT17fQpQLmli
-LnByb3RvdHlwZT17JGlPZDoxfQpQLnh1LnByb3RvdHlwZT17fQpQLkd6LnByb3RvdHlwZT17fQpQLnFV
-LnByb3RvdHlwZT17JGl2WDoxfQpQLlJuLnByb3RvdHlwZT17CmdBOmZ1bmN0aW9uKGEpe3JldHVybiB0
-aGlzLmEubGVuZ3RofSwKdzpmdW5jdGlvbihhKXt2YXIgdD10aGlzLmEKcmV0dXJuIHQuY2hhckNvZGVB
-dCgwKT09MD90OnR9LAokaUJMOjF9ClAuR0QucHJvdG90eXBlPXt9ClAubjEucHJvdG90eXBlPXsKJDI6
-ZnVuY3Rpb24oYSxiKXt2YXIgdCxzLHIscQp1LmYuYihhKQpILnkoYikKdD1KLnJZKGIpLk9ZKGIsIj0i
-KQppZih0PT09LTEpe2lmKGIhPT0iIilhLlkoMCxQLmt1KGIsMCxiLmxlbmd0aCx0aGlzLmEsITApLCIi
-KX1lbHNlIGlmKHQhPT0wKXtzPUMueEIuTmooYiwwLHQpCnI9Qy54Qi5HKGIsdCsxKQpxPXRoaXMuYQph
-LlkoMCxQLmt1KHMsMCxzLmxlbmd0aCxxLCEwKSxQLmt1KHIsMCxyLmxlbmd0aCxxLCEwKSl9cmV0dXJu
-IGF9LAokUzozOX0KUC5jUy5wcm90b3R5cGU9ewokMjpmdW5jdGlvbihhLGIpe3Rocm93IEguYihQLnJy
-KCJJbGxlZ2FsIElQdjQgYWRkcmVzcywgIithLHRoaXMuYSxiKSl9LAokUzoyOX0KUC5WQy5wcm90b3R5
-cGU9ewokMjpmdW5jdGlvbihhLGIpe3Rocm93IEguYihQLnJyKCJJbGxlZ2FsIElQdjYgYWRkcmVzcywg
-IithLHRoaXMuYSxiKSl9LAokMTpmdW5jdGlvbihhKXtyZXR1cm4gdGhpcy4kMihhLG51bGwpfSwKJFM6
-MjZ9ClAudHAucHJvdG90eXBlPXsKJDI6ZnVuY3Rpb24oYSxiKXt2YXIgdAppZihiLWE+NCl0aGlzLmEu
-JDIoImFuIElQdjYgcGFydCBjYW4gb25seSBjb250YWluIGEgbWF4aW11bSBvZiA0IGhleCBkaWdpdHMi
-LGEpCnQ9UC5RQShDLnhCLk5qKHRoaXMuYixhLGIpLG51bGwsMTYpCmlmKHR5cGVvZiB0IT09Im51bWJl
-ciIpcmV0dXJuIHQuSigpCmlmKHQ8MHx8dD42NTUzNSl0aGlzLmEuJDIoImVhY2ggcGFydCBtdXN0IGJl
-IGluIHRoZSByYW5nZSBvZiBgMHgwLi4weEZGRkZgIixhKQpyZXR1cm4gdH0sCiRTOjE5fQpQLkRuLnBy
-b3RvdHlwZT17CmdrdTpmdW5jdGlvbigpe3JldHVybiB0aGlzLmJ9LApnSmY6ZnVuY3Rpb24oYSl7dmFy
-IHQ9dGhpcy5jCmlmKHQ9PW51bGwpcmV0dXJuIiIKaWYoQy54Qi5uKHQsIlsiKSlyZXR1cm4gQy54Qi5O
-aih0LDEsdC5sZW5ndGgtMSkKcmV0dXJuIHR9LApndHA6ZnVuY3Rpb24oYSl7dmFyIHQ9dGhpcy5kCmlm
-KHQ9PW51bGwpcmV0dXJuIFAud0sodGhpcy5hKQpyZXR1cm4gdH0sCmd0UDpmdW5jdGlvbigpe3ZhciB0
-PXRoaXMuZgpyZXR1cm4gdD09bnVsbD8iIjp0fSwKZ0thOmZ1bmN0aW9uKCl7dmFyIHQ9dGhpcy5yCnJl
-dHVybiB0PT1udWxsPyIiOnR9LApubTpmdW5jdGlvbihhLGIpe3ZhciB0LHMscixxLHAsbyxuLG0sbD10
-aGlzCnUuWC5iKG51bGwpCnUuYi5iKGIpCnQ9bC5hCnM9dD09PSJmaWxlIgpyPWwuYgpxPWwuZApwPWwu
-YwppZighKHAhPW51bGwpKXA9ci5sZW5ndGghPT0wfHxxIT1udWxsfHxzPyIiOm51bGwKbz1sLmUKaWYo
-IXMpbj1wIT1udWxsJiZvLmxlbmd0aCE9PTAKZWxzZSBuPSEwCmlmKG4mJiFDLnhCLm4obywiLyIpKW89
-Ii8iK28KaWYoYiE9bnVsbCltPVAubGUobnVsbCwwLDAsYikKZWxzZSBtPWwuZgpyZXR1cm4gbmV3IFAu
-RG4odCxyLHAscSxvLG0sbC5yKX0sCmdGajpmdW5jdGlvbigpe3ZhciB0LHM9dGhpcy54CmlmKHMhPW51
-bGwpcmV0dXJuIHMKdD10aGlzLmUKaWYodC5sZW5ndGghPT0wJiZDLnhCLlcodCwwKT09PTQ3KXQ9Qy54
-Qi5HKHQsMSkKcz10PT09IiI/Qy5kbjpQLkFGKG5ldyBILkE4KEguVk0odC5zcGxpdCgiLyIpLHUucyks
-dS5kTy5iKFAuUEgoKSksdS5kbyksdS5OKQp0aGlzLnNvNihzKQpyZXR1cm4gc30sCmdoWTpmdW5jdGlv
-bigpe3ZhciB0LHM9dGhpcwppZihzLlE9PW51bGwpe3Q9cy5mCnMuc1JIKG5ldyBQLkdqKFAuV1godD09
-bnVsbD8iIjp0KSx1LlQpKX1yZXR1cm4gcy5RfSwKSmg6ZnVuY3Rpb24oYSxiKXt2YXIgdCxzLHIscSxw
-LG8KZm9yKHQ9MCxzPTA7Qy54Qi5RaShiLCIuLi8iLHMpOyl7cys9MzsrK3R9cj1DLnhCLmNuKGEsIi8i
-KQp3aGlsZSghMCl7aWYoIShyPjAmJnQ+MCkpYnJlYWsKcT1DLnhCLlBrKGEsIi8iLHItMSkKaWYocTww
-KWJyZWFrCnA9ci1xCm89cCE9PTIKaWYoIW98fHA9PT0zKWlmKEMueEIubShhLHErMSk9PT00NilvPSFv
-fHxDLnhCLm0oYSxxKzIpPT09NDYKZWxzZSBvPSExCmVsc2Ugbz0hMQppZihvKWJyZWFrOy0tdApyPXF9
-cmV0dXJuIEMueEIuaTcoYSxyKzEsbnVsbCxDLnhCLkcoYixzLTMqdCkpfSwKWkk6ZnVuY3Rpb24oYSl7
-cmV0dXJuIHRoaXMubVMoUC5oSyhhKSl9LAptUzpmdW5jdGlvbihhKXt2YXIgdCxzLHIscSxwLG8sbixt
-LGwsaz10aGlzLGo9bnVsbAppZihhLmdGaSgpLmxlbmd0aCE9PTApe3Q9YS5nRmkoKQppZihhLmdjaigp
-KXtzPWEuZ2t1KCkKcj1hLmdKZihhKQpxPWEuZ3hBKCk/YS5ndHAoYSk6an1lbHNle3E9agpyPXEKcz0i
-In1wPVAueGUoYS5nSWkoYSkpCm89YS5nUUQoKT9hLmd0UCgpOmp9ZWxzZXt0PWsuYQppZihhLmdjaigp
-KXtzPWEuZ2t1KCkKcj1hLmdKZihhKQpxPVAud0IoYS5neEEoKT9hLmd0cChhKTpqLHQpCnA9UC54ZShh
-LmdJaShhKSkKbz1hLmdRRCgpP2EuZ3RQKCk6an1lbHNle3M9ay5iCnI9ay5jCnE9ay5kCmlmKGEuZ0lp
-KGEpPT09IiIpe3A9ay5lCm89YS5nUUQoKT9hLmd0UCgpOmsuZn1lbHNle2lmKGEuZ3RUKCkpcD1QLnhl
-KGEuZ0lpKGEpKQplbHNle249ay5lCmlmKG4ubGVuZ3RoPT09MClpZihyPT1udWxsKXA9dC5sZW5ndGg9
-PT0wP2EuZ0lpKGEpOlAueGUoYS5nSWkoYSkpCmVsc2UgcD1QLnhlKCIvIithLmdJaShhKSkKZWxzZXtt
-PWsuSmgobixhLmdJaShhKSkKbD10Lmxlbmd0aD09PTAKaWYoIWx8fHIhPW51bGx8fEMueEIubihuLCIv
-IikpcD1QLnhlKG0pCmVsc2UgcD1QLndGKG0sIWx8fHIhPW51bGwpfX1vPWEuZ1FEKCk/YS5ndFAoKTpq
-fX19cmV0dXJuIG5ldyBQLkRuKHQscyxyLHEscCxvLGEuZ1o4KCk/YS5nS2EoKTpqKX0sCmdjajpmdW5j
-dGlvbigpe3JldHVybiB0aGlzLmMhPW51bGx9LApneEE6ZnVuY3Rpb24oKXtyZXR1cm4gdGhpcy5kIT1u
-dWxsfSwKZ1FEOmZ1bmN0aW9uKCl7cmV0dXJuIHRoaXMuZiE9bnVsbH0sCmdaODpmdW5jdGlvbigpe3Jl
-dHVybiB0aGlzLnIhPW51bGx9LApndFQ6ZnVuY3Rpb24oKXtyZXR1cm4gQy54Qi5uKHRoaXMuZSwiLyIp
-fSwKdDQ6ZnVuY3Rpb24oKXt2YXIgdCxzLHI9dGhpcyxxPXIuYQppZihxIT09IiImJnEhPT0iZmlsZSIp
-dGhyb3cgSC5iKFAuTDQoIkNhbm5vdCBleHRyYWN0IGEgZmlsZSBwYXRoIGZyb20gYSAiK0guZChxKSsi
-IFVSSSIpKQpxPXIuZgppZigocT09bnVsbD8iIjpxKSE9PSIiKXRocm93IEguYihQLkw0KCJDYW5ub3Qg
-ZXh0cmFjdCBhIGZpbGUgcGF0aCBmcm9tIGEgVVJJIHdpdGggYSBxdWVyeSBjb21wb25lbnQiKSkKcT1y
-LnIKaWYoKHE9PW51bGw/IiI6cSkhPT0iIil0aHJvdyBILmIoUC5MNCgiQ2Fubm90IGV4dHJhY3QgYSBm
-aWxlIHBhdGggZnJvbSBhIFVSSSB3aXRoIGEgZnJhZ21lbnQgY29tcG9uZW50IikpCnQ9JC53USgpCmlm
-KEgub1QodCkpcT1QLm1uKHIpCmVsc2V7aWYoci5jIT1udWxsJiZyLmdKZihyKSE9PSIiKUgudmgoUC5M
-NCgiQ2Fubm90IGV4dHJhY3QgYSBub24tV2luZG93cyBmaWxlIHBhdGggZnJvbSBhIGZpbGUgVVJJIHdp
-dGggYW4gYXV0aG9yaXR5IikpCnM9ci5nRmooKQpQLmtFKHMsITEpCnE9UC52ZyhDLnhCLm4oci5lLCIv
-Iik/Ii8iOiIiLHMsIi8iKQpxPXEuY2hhckNvZGVBdCgwKT09MD9xOnF9cmV0dXJuIHF9LAp3OmZ1bmN0
-aW9uKGEpe3ZhciB0LHMscixxPXRoaXMscD1xLnkKaWYocD09bnVsbCl7cD1xLmEKdD1wLmxlbmd0aCE9
-PTA/cCsiOiI6IiIKcz1xLmMKcj1zPT1udWxsCmlmKCFyfHxwPT09ImZpbGUiKXtwPXQrIi8vIgp0PXEu
-YgppZih0Lmxlbmd0aCE9PTApcD1wK3QrIkAiCmlmKCFyKXArPXMKdD1xLmQKaWYodCE9bnVsbClwPXAr
-IjoiK0guZCh0KX1lbHNlIHA9dApwKz1xLmUKdD1xLmYKaWYodCE9bnVsbClwPXArIj8iK3QKdD1xLnIK
-aWYodCE9bnVsbClwPXArIiMiK3QKcD1xLnk9cC5jaGFyQ29kZUF0KDApPT0wP3A6cH1yZXR1cm4gcH0s
-CkROOmZ1bmN0aW9uKGEsYil7dmFyIHQscyxyPXRoaXMKaWYoYj09bnVsbClyZXR1cm4hMQppZihyPT09
-YilyZXR1cm4hMAppZih1LkQuYyhiKSlpZihyLmE9PWIuZ0ZpKCkpaWYoci5jIT1udWxsPT09Yi5nY2oo
-KSlpZihyLmI9PWIuZ2t1KCkpaWYoci5nSmYocik9PWIuZ0pmKGIpKWlmKHIuZ3RwKHIpPT1iLmd0cChi
-KSlpZihyLmU9PT1iLmdJaShiKSl7dD1yLmYKcz10PT1udWxsCmlmKCFzPT09Yi5nUUQoKSl7aWYocyl0
-PSIiCmlmKHQ9PT1iLmd0UCgpKXt0PXIucgpzPXQ9PW51bGwKaWYoIXM9PT1iLmdaOCgpKXtpZihzKXQ9
-IiIKdD10PT09Yi5nS2EoKX1lbHNlIHQ9ITF9ZWxzZSB0PSExfWVsc2UgdD0hMX1lbHNlIHQ9ITEKZWxz
-ZSB0PSExCmVsc2UgdD0hMQplbHNlIHQ9ITEKZWxzZSB0PSExCmVsc2UgdD0hMQplbHNlIHQ9ITEKcmV0
-dXJuIHR9LApnaU86ZnVuY3Rpb24oYSl7dmFyIHQ9dGhpcy56CnJldHVybiB0PT1udWxsP3RoaXMuej1D
-LnhCLmdpTyh0aGlzLncoMCkpOnR9LApzbzY6ZnVuY3Rpb24oYSl7dGhpcy54PXUuYS5iKGEpfSwKc1JI
-OmZ1bmN0aW9uKGEpe3RoaXMuUT11LmYuYihhKX0sCiRpaUQ6MSwKZ0ZpOmZ1bmN0aW9uKCl7cmV0dXJu
-IHRoaXMuYX0sCmdJaTpmdW5jdGlvbihhKXtyZXR1cm4gdGhpcy5lfX0KUC5lMS5wcm90b3R5cGU9ewok
-MTpmdW5jdGlvbihhKXt0aHJvdyBILmIoUC5ycigiSW52YWxpZCBwb3J0Iix0aGlzLmEsdGhpcy5iKzEp
-KX0sCiRTOjExfQpQLk5ZLnByb3RvdHlwZT17CiQxOmZ1bmN0aW9uKGEpe3ZhciB0PSJJbGxlZ2FsIHBh
-dGggY2hhcmFjdGVyICIKSC55KGEpCmlmKEouemwoYSwiLyIpKWlmKHRoaXMuYSl0aHJvdyBILmIoUC54
-WSh0K2EpKQplbHNlIHRocm93IEguYihQLkw0KHQrYSkpfSwKJFM6MTF9ClAuUloucHJvdG90eXBlPXsK
-JDE6ZnVuY3Rpb24oYSl7cmV0dXJuIFAuZVAoQy5aSixhLEMueE0sITEpfSwKJFM6NX0KUC5NRS5wcm90
-b3R5cGU9ewokMjpmdW5jdGlvbihhLGIpe3ZhciB0PXRoaXMuYixzPXRoaXMuYQp0LmErPXMuYQpzLmE9
-IiYiCnM9dC5hKz1ILmQoUC5lUChDLkYzLGEsQy54TSwhMCkpCmlmKGIhPW51bGwmJmIubGVuZ3RoIT09
-MCl7dC5hPXMrIj0iCnQuYSs9SC5kKFAuZVAoQy5GMyxiLEMueE0sITApKX19LAokUzoyMn0KUC55NS5w
-cm90b3R5cGU9ewokMjpmdW5jdGlvbihhLGIpe3ZhciB0LHMKSC55KGEpCmlmKGI9PW51bGx8fHR5cGVv
-ZiBiPT0ic3RyaW5nIil0aGlzLmEuJDIoYSxILnkoYikpCmVsc2UgZm9yKHQ9Si5JVCh1LlIuYihiKSks
-cz10aGlzLmE7dC5GKCk7KXMuJDIoYSxILnkodC5nbCgpKSl9LAokUzoxMn0KUC5QRS5wcm90b3R5cGU9
-ewpnbFI6ZnVuY3Rpb24oKXt2YXIgdCxzLHIscSxwPXRoaXMsbz1udWxsLG49cC5jCmlmKG4hPW51bGwp
-cmV0dXJuIG4Kbj1wLmIKaWYoMD49bi5sZW5ndGgpcmV0dXJuIEguT0gobiwwKQp0PXAuYQpuPW5bMF0r
-MQpzPUMueEIuWFUodCwiPyIsbikKcj10Lmxlbmd0aAppZihzPj0wKXtxPVAudU8odCxzKzEscixDLlZD
-LCExKQpyPXN9ZWxzZSBxPW8KcmV0dXJuIHAuYz1uZXcgUC5xZSgiZGF0YSIsbyxvLG8sUC51Tyh0LG4s
-cixDLldkLCExKSxxLG8pfSwKdzpmdW5jdGlvbihhKXt2YXIgdCxzPXRoaXMuYgppZigwPj1zLmxlbmd0
-aClyZXR1cm4gSC5PSChzLDApCnQ9dGhpcy5hCnJldHVybiBzWzBdPT09LTE/ImRhdGE6Iit0OnR9fQpQ
-LnEzLnByb3RvdHlwZT17CiQxOmZ1bmN0aW9uKGEpe3JldHVybiBuZXcgVWludDhBcnJheSg5Nil9LAok
-Uzo0Nn0KUC55SS5wcm90b3R5cGU9ewokMjpmdW5jdGlvbihhLGIpe3ZhciB0PXRoaXMuYQppZihhPj10
-Lmxlbmd0aClyZXR1cm4gSC5PSCh0LGEpCnQ9dFthXQpKLkNNKHQsMCw5NixiKQpyZXR1cm4gdH0sCiRT
-OjI0fQpQLmM2LnByb3RvdHlwZT17CiQzOmZ1bmN0aW9uKGEsYixjKXt2YXIgdCxzLHIscQpmb3IodD1i
-Lmxlbmd0aCxzPWEubGVuZ3RoLHI9MDtyPHQ7KytyKXtxPUMueEIuVyhiLHIpXjk2CmlmKHE+PXMpcmV0
-dXJuIEguT0goYSxxKQphW3FdPWN9fX0KUC5xZC5wcm90b3R5cGU9ewokMzpmdW5jdGlvbihhLGIsYyl7
-dmFyIHQscyxyLHEKZm9yKHQ9Qy54Qi5XKGIsMCkscz1DLnhCLlcoYiwxKSxyPWEubGVuZ3RoO3Q8PXM7
-Kyt0KXtxPSh0Xjk2KT4+PjAKaWYocT49cilyZXR1cm4gSC5PSChhLHEpCmFbcV09Y319fQpQLlVmLnBy
-b3RvdHlwZT17CmdjajpmdW5jdGlvbigpe3JldHVybiB0aGlzLmM+MH0sCmd4QTpmdW5jdGlvbigpe3Zh
-ciB0LHMKaWYodGhpcy5jPjApe3Q9dGhpcy5kCmlmKHR5cGVvZiB0IT09Im51bWJlciIpcmV0dXJuIHQu
-aCgpCnM9dGhpcy5lCmlmKHR5cGVvZiBzIT09Im51bWJlciIpcmV0dXJuIEgucFkocykKcz10KzE8cwp0
-PXN9ZWxzZSB0PSExCnJldHVybiB0fSwKZ1FEOmZ1bmN0aW9uKCl7dmFyIHQ9dGhpcy5mCmlmKHR5cGVv
-ZiB0IT09Im51bWJlciIpcmV0dXJuIHQuSigpCnJldHVybiB0PHRoaXMucn0sCmdaODpmdW5jdGlvbigp
-e3JldHVybiB0aGlzLnI8dGhpcy5hLmxlbmd0aH0sCmdOdzpmdW5jdGlvbigpe3JldHVybiB0aGlzLmI9
-PT00JiZDLnhCLm4odGhpcy5hLCJmaWxlIil9LApndmg6ZnVuY3Rpb24oKXtyZXR1cm4gdGhpcy5iPT09
-NCYmQy54Qi5uKHRoaXMuYSwiaHR0cCIpfSwKZ3FCOmZ1bmN0aW9uKCl7cmV0dXJuIHRoaXMuYj09PTUm
-JkMueEIubih0aGlzLmEsImh0dHBzIil9LApndFQ6ZnVuY3Rpb24oKXtyZXR1cm4gQy54Qi5RaSh0aGlz
-LmEsIi8iLHRoaXMuZSl9LApnRmk6ZnVuY3Rpb24oKXt2YXIgdCxzPXRoaXMscj0icGFja2FnZSIscT1z
-LmIKaWYocTw9MClyZXR1cm4iIgp0PXMueAppZih0IT1udWxsKXJldHVybiB0CmlmKHMuZ3ZoKCkpcT1z
-Lng9Imh0dHAiCmVsc2UgaWYocy5ncUIoKSl7cy54PSJodHRwcyIKcT0iaHR0cHMifWVsc2UgaWYocy5n
-TncoKSl7cy54PSJmaWxlIgpxPSJmaWxlIn1lbHNlIGlmKHE9PT03JiZDLnhCLm4ocy5hLHIpKXtzLng9
-cgpxPXJ9ZWxzZXtxPUMueEIuTmoocy5hLDAscSkKcy54PXF9cmV0dXJuIHF9LApna3U6ZnVuY3Rpb24o
-KXt2YXIgdD10aGlzLmMscz10aGlzLmIrMwpyZXR1cm4gdD5zP0MueEIuTmoodGhpcy5hLHMsdC0xKToi
-In0sCmdKZjpmdW5jdGlvbihhKXt2YXIgdD10aGlzLmMKcmV0dXJuIHQ+MD9DLnhCLk5qKHRoaXMuYSx0
-LHRoaXMuZCk6IiJ9LApndHA6ZnVuY3Rpb24oYSl7dmFyIHQscz10aGlzCmlmKHMuZ3hBKCkpe3Q9cy5k
-CmlmKHR5cGVvZiB0IT09Im51bWJlciIpcmV0dXJuIHQuaCgpCnJldHVybiBQLlFBKEMueEIuTmoocy5h
-LHQrMSxzLmUpLG51bGwsbnVsbCl9aWYocy5ndmgoKSlyZXR1cm4gODAKaWYocy5ncUIoKSlyZXR1cm4g
-NDQzCnJldHVybiAwfSwKZ0lpOmZ1bmN0aW9uKGEpe3JldHVybiBDLnhCLk5qKHRoaXMuYSx0aGlzLmUs
-dGhpcy5mKX0sCmd0UDpmdW5jdGlvbigpe3ZhciB0PXRoaXMuZixzPXRoaXMucgppZih0eXBlb2YgdCE9
-PSJudW1iZXIiKXJldHVybiB0LkooKQpyZXR1cm4gdDxzP0MueEIuTmoodGhpcy5hLHQrMSxzKToiIn0s
-CmdLYTpmdW5jdGlvbigpe3ZhciB0PXRoaXMucixzPXRoaXMuYQpyZXR1cm4gdDxzLmxlbmd0aD9DLnhC
-Lkcocyx0KzEpOiIifSwKZ0ZqOmZ1bmN0aW9uKCl7dmFyIHQscyxyPXRoaXMuZSxxPXRoaXMuZixwPXRo
-aXMuYQppZihDLnhCLlFpKHAsIi8iLHIpKXtpZih0eXBlb2YgciE9PSJudW1iZXIiKXJldHVybiByLmgo
-KTsrK3J9aWYocj09cSlyZXR1cm4gQy5kbgp0PUguVk0oW10sdS5zKQpzPXIKd2hpbGUoITApe2lmKHR5
-cGVvZiBzIT09Im51bWJlciIpcmV0dXJuIHMuSigpCmlmKHR5cGVvZiBxIT09Im51bWJlciIpcmV0dXJu
-IEgucFkocSkKaWYoIShzPHEpKWJyZWFrCmlmKEMueEIubShwLHMpPT09NDcpe0MuTm0uaSh0LEMueEIu
-TmoocCxyLHMpKQpyPXMrMX0rK3N9Qy5ObS5pKHQsQy54Qi5OaihwLHIscSkpCnJldHVybiBQLkFGKHQs
-dS5OKX0sCmdoWTpmdW5jdGlvbigpe3ZhciB0PXRoaXMuZgppZih0eXBlb2YgdCE9PSJudW1iZXIiKXJl
-dHVybiB0LkooKQppZih0Pj10aGlzLnIpcmV0dXJuIEMuV08KcmV0dXJuIG5ldyBQLkdqKFAuV1godGhp
-cy5ndFAoKSksdS5UKX0sCmtYOmZ1bmN0aW9uKGEpe3ZhciB0LHM9dGhpcy5kCmlmKHR5cGVvZiBzIT09
-Im51bWJlciIpcmV0dXJuIHMuaCgpCnQ9cysxCnJldHVybiB0K2EubGVuZ3RoPT09dGhpcy5lJiZDLnhC
-LlFpKHRoaXMuYSxhLHQpfSwKTjk6ZnVuY3Rpb24oKXt2YXIgdD10aGlzLHM9dC5yLHI9dC5hCmlmKHM+
-PXIubGVuZ3RoKXJldHVybiB0CnJldHVybiBuZXcgUC5VZihDLnhCLk5qKHIsMCxzKSx0LmIsdC5jLHQu
-ZCx0LmUsdC5mLHMsdC54KX0sCm5tOmZ1bmN0aW9uKGEsYil7dmFyIHQscyxyLHEscCxvLG4sbSxsLGss
-aixpPXRoaXMsaD1udWxsCnUuWC5iKG51bGwpCnUuYi5iKGIpCnQ9aS5nRmkoKQpzPXQ9PT0iZmlsZSIK
-cj1pLmMKcT1yPjA/Qy54Qi5OaihpLmEsaS5iKzMscik6IiIKcD1pLmd4QSgpP2kuZ3RwKGkpOmgKcj1p
-LmMKaWYocj4wKW89Qy54Qi5OaihpLmEscixpLmQpCmVsc2Ugbz1xLmxlbmd0aCE9PTB8fHAhPW51bGx8
-fHM/IiI6aApyPWkuYQpuPWkuZgptPUMueEIuTmoocixpLmUsbikKaWYoIXMpbD1vIT1udWxsJiZtLmxl
-bmd0aCE9PTAKZWxzZSBsPSEwCmlmKGwmJiFDLnhCLm4obSwiLyIpKW09Ii8iK20KaWYoYiE9bnVsbClr
-PVAubGUoaCwwLDAsYikKZWxzZXtsPWkucgppZih0eXBlb2YgbiE9PSJudW1iZXIiKXJldHVybiBuLkoo
-KQprPW48bD9DLnhCLk5qKHIsbisxLGwpOmh9bj1pLnIKaj1uPHIubGVuZ3RoP0MueEIuRyhyLG4rMSk6
-aApyZXR1cm4gbmV3IFAuRG4odCxxLG8scCxtLGssail9LApaSTpmdW5jdGlvbihhKXtyZXR1cm4gdGhp
-cy5tUyhQLmhLKGEpKX0sCm1TOmZ1bmN0aW9uKGEpe2lmKGEgaW5zdGFuY2VvZiBQLlVmKXJldHVybiB0
-aGlzLnUxKHRoaXMsYSkKcmV0dXJuIHRoaXMuUmUoKS5tUyhhKX0sCnUxOmZ1bmN0aW9uKGEsYil7dmFy
-IHQscyxyLHEscCxvLG4sbSxsLGssaixpLGgsZyxmLGU9Yi5iCmlmKGU+MClyZXR1cm4gYgp0PWIuYwpp
-Zih0PjApe3M9YS5iCmlmKHM8PTApcmV0dXJuIGIKaWYoYS5nTncoKSlyPWIuZSE9Yi5mCmVsc2UgaWYo
-YS5ndmgoKSlyPSFiLmtYKCI4MCIpCmVsc2Ugcj0hYS5ncUIoKXx8IWIua1goIjQ0MyIpCmlmKHIpe3E9
-cysxCnA9Qy54Qi5OaihhLmEsMCxxKStDLnhCLkcoYi5hLGUrMSkKZT1iLmQKaWYodHlwZW9mIGUhPT0i
-bnVtYmVyIilyZXR1cm4gZS5oKCkKbz1iLmUKaWYodHlwZW9mIG8hPT0ibnVtYmVyIilyZXR1cm4gby5o
-KCkKbj1iLmYKaWYodHlwZW9mIG4hPT0ibnVtYmVyIilyZXR1cm4gbi5oKCkKcmV0dXJuIG5ldyBQLlVm
-KHAscyx0K3EsZStxLG8rcSxuK3EsYi5yK3EsYS54KX1lbHNlIHJldHVybiB0aGlzLlJlKCkubVMoYil9
-bT1iLmUKZT1iLmYKaWYobT09ZSl7dD1iLnIKaWYodHlwZW9mIGUhPT0ibnVtYmVyIilyZXR1cm4gZS5K
-KCkKaWYoZTx0KXtzPWEuZgppZih0eXBlb2YgcyE9PSJudW1iZXIiKXJldHVybiBzLkhOKCkKcT1zLWUK
-cmV0dXJuIG5ldyBQLlVmKEMueEIuTmooYS5hLDAscykrQy54Qi5HKGIuYSxlKSxhLmIsYS5jLGEuZCxh
-LmUsZStxLHQrcSxhLngpfWU9Yi5hCmlmKHQ8ZS5sZW5ndGgpe3M9YS5yCnJldHVybiBuZXcgUC5VZihD
-LnhCLk5qKGEuYSwwLHMpK0MueEIuRyhlLHQpLGEuYixhLmMsYS5kLGEuZSxhLmYsdCsocy10KSxhLngp
-fXJldHVybiBhLk45KCl9dD1iLmEKaWYoQy54Qi5RaSh0LCIvIixtKSl7cz1hLmUKaWYodHlwZW9mIHMh
-PT0ibnVtYmVyIilyZXR1cm4gcy5ITigpCmlmKHR5cGVvZiBtIT09Im51bWJlciIpcmV0dXJuIEgucFko
-bSkKcT1zLW0KcD1DLnhCLk5qKGEuYSwwLHMpK0MueEIuRyh0LG0pCmlmKHR5cGVvZiBlIT09Im51bWJl
-ciIpcmV0dXJuIGUuaCgpCnJldHVybiBuZXcgUC5VZihwLGEuYixhLmMsYS5kLHMsZStxLGIucitxLGEu
-eCl9bD1hLmUKaz1hLmYKaWYobD09ayYmYS5jPjApe2Zvcig7Qy54Qi5RaSh0LCIuLi8iLG0pOyl7aWYo
-dHlwZW9mIG0hPT0ibnVtYmVyIilyZXR1cm4gbS5oKCkKbSs9M31pZih0eXBlb2YgbCE9PSJudW1iZXIi
-KXJldHVybiBsLkhOKCkKaWYodHlwZW9mIG0hPT0ibnVtYmVyIilyZXR1cm4gSC5wWShtKQpxPWwtbSsx
-CnA9Qy54Qi5OaihhLmEsMCxsKSsiLyIrQy54Qi5HKHQsbSkKaWYodHlwZW9mIGUhPT0ibnVtYmVyIily
-ZXR1cm4gZS5oKCkKcmV0dXJuIG5ldyBQLlVmKHAsYS5iLGEuYyxhLmQsbCxlK3EsYi5yK3EsYS54KX1q
-PWEuYQpmb3IoaT1sO0MueEIuUWkoaiwiLi4vIixpKTspe2lmKHR5cGVvZiBpIT09Im51bWJlciIpcmV0
-dXJuIGkuaCgpCmkrPTN9aD0wCndoaWxlKCEwKXtpZih0eXBlb2YgbSE9PSJudW1iZXIiKXJldHVybiBt
-LmgoKQpnPW0rMwppZih0eXBlb2YgZSE9PSJudW1iZXIiKXJldHVybiBILnBZKGUpCmlmKCEoZzw9ZSYm
-Qy54Qi5RaSh0LCIuLi8iLG0pKSlicmVhazsrK2gKbT1nfWY9IiIKd2hpbGUoITApe2lmKHR5cGVvZiBr
-IT09Im51bWJlciIpcmV0dXJuIGsub3MoKQppZih0eXBlb2YgaSE9PSJudW1iZXIiKXJldHVybiBILnBZ
-KGkpCmlmKCEoaz5pKSlicmVhazstLWsKaWYoQy54Qi5tKGosayk9PT00Nyl7aWYoaD09PTApe2Y9Ii8i
-CmJyZWFrfS0taApmPSIvIn19aWYoaz09PWkmJmEuYjw9MCYmIUMueEIuUWkoaiwiLyIsbCkpe20tPWgq
-MwpmPSIifXE9ay1tK2YubGVuZ3RoCnJldHVybiBuZXcgUC5VZihDLnhCLk5qKGosMCxrKStmK0MueEIu
-Ryh0LG0pLGEuYixhLmMsYS5kLGwsZStxLGIucitxLGEueCl9LAp0NDpmdW5jdGlvbigpe3ZhciB0LHMs
-cixxLHA9dGhpcwppZihwLmI+PTAmJiFwLmdOdygpKXRocm93IEguYihQLkw0KCJDYW5ub3QgZXh0cmFj
-dCBhIGZpbGUgcGF0aCBmcm9tIGEgIitILmQocC5nRmkoKSkrIiBVUkkiKSkKdD1wLmYKcz1wLmEKaWYo
-dHlwZW9mIHQhPT0ibnVtYmVyIilyZXR1cm4gdC5KKCkKaWYodDxzLmxlbmd0aCl7aWYodDxwLnIpdGhy
-b3cgSC5iKFAuTDQoIkNhbm5vdCBleHRyYWN0IGEgZmlsZSBwYXRoIGZyb20gYSBVUkkgd2l0aCBhIHF1
-ZXJ5IGNvbXBvbmVudCIpKQp0aHJvdyBILmIoUC5MNCgiQ2Fubm90IGV4dHJhY3QgYSBmaWxlIHBhdGgg
-ZnJvbSBhIFVSSSB3aXRoIGEgZnJhZ21lbnQgY29tcG9uZW50IikpfXI9JC53USgpCmlmKEgub1Qocikp
-dD1QLm1uKHApCmVsc2V7cT1wLmQKaWYodHlwZW9mIHEhPT0ibnVtYmVyIilyZXR1cm4gSC5wWShxKQpp
-ZihwLmM8cSlILnZoKFAuTDQoIkNhbm5vdCBleHRyYWN0IGEgbm9uLVdpbmRvd3MgZmlsZSBwYXRoIGZy
-b20gYSBmaWxlIFVSSSB3aXRoIGFuIGF1dGhvcml0eSIpKQp0PUMueEIuTmoocyxwLmUsdCl9cmV0dXJu
-IHR9LApnaU86ZnVuY3Rpb24oYSl7dmFyIHQ9dGhpcy55CnJldHVybiB0PT1udWxsP3RoaXMueT1DLnhC
-LmdpTyh0aGlzLmEpOnR9LApETjpmdW5jdGlvbihhLGIpe2lmKGI9PW51bGwpcmV0dXJuITEKaWYodGhp
-cz09PWIpcmV0dXJuITAKcmV0dXJuIHUuRC5jKGIpJiZ0aGlzLmE9PT1iLncoMCl9LApSZTpmdW5jdGlv
-bigpe3ZhciB0PXRoaXMscz1udWxsLHI9dC5nRmkoKSxxPXQuZ2t1KCkscD10LmM+MD90LmdKZih0KTpz
-LG89dC5neEEoKT90Lmd0cCh0KTpzLG49dC5hLG09dC5mLGw9Qy54Qi5OaihuLHQuZSxtKSxrPXQucgpp
-Zih0eXBlb2YgbSE9PSJudW1iZXIiKXJldHVybiBtLkooKQptPW08az90Lmd0UCgpOnMKcmV0dXJuIG5l
-dyBQLkRuKHIscSxwLG8sbCxtLGs8bi5sZW5ndGg/dC5nS2EoKTpzKX0sCnc6ZnVuY3Rpb24oYSl7cmV0
-dXJuIHRoaXMuYX0sCiRpaUQ6MX0KUC5xZS5wcm90b3R5cGU9e30KVy5xRS5wcm90b3R5cGU9e30KVy5H
-aC5wcm90b3R5cGU9ewp3OmZ1bmN0aW9uKGEpe3JldHVybiBTdHJpbmcoYSl9LAokaUdoOjF9ClcuZlku
-cHJvdG90eXBlPXsKdzpmdW5jdGlvbihhKXtyZXR1cm4gU3RyaW5nKGEpfX0KVy5uQi5wcm90b3R5cGU9
-eyRpbkI6MX0KVy5Bei5wcm90b3R5cGU9eyRpQXo6MX0KVy5RUC5wcm90b3R5cGU9eyRpUVA6MX0KVy5u
-eC5wcm90b3R5cGU9ewpnQTpmdW5jdGlvbihhKXtyZXR1cm4gYS5sZW5ndGh9fQpXLm9KLnByb3RvdHlw
-ZT17CmdBOmZ1bmN0aW9uKGEpe3JldHVybiBhLmxlbmd0aH19ClcuaWQucHJvdG90eXBlPXt9ClcuUUYu
-cHJvdG90eXBlPXt9ClcuTmgucHJvdG90eXBlPXsKdzpmdW5jdGlvbihhKXtyZXR1cm4gU3RyaW5nKGEp
-fX0KVy5JQi5wcm90b3R5cGU9ewp3OmZ1bmN0aW9uKGEpe3JldHVybiJSZWN0YW5nbGUgKCIrSC5kKGEu
-bGVmdCkrIiwgIitILmQoYS50b3ApKyIpICIrSC5kKGEud2lkdGgpKyIgeCAiK0guZChhLmhlaWdodCl9
-LApETjpmdW5jdGlvbihhLGIpe2lmKGI9PW51bGwpcmV0dXJuITEKcmV0dXJuIHUucS5jKGIpJiZhLmxl
-ZnQ9PT1iLmxlZnQmJmEudG9wPT09Yi50b3AmJmEud2lkdGg9PT1iLndpZHRoJiZhLmhlaWdodD09PWIu
-aGVpZ2h0fSwKZ2lPOmZ1bmN0aW9uKGEpe3JldHVybiBXLnJFKEMuQ0QuZ2lPKGEubGVmdCksQy5DRC5n
-aU8oYS50b3ApLEMuQ0QuZ2lPKGEud2lkdGgpLEMuQ0QuZ2lPKGEuaGVpZ2h0KSl9LAokaXRuOjF9Clcu
-bjcucHJvdG90eXBlPXsKZ0E6ZnVuY3Rpb24oYSl7cmV0dXJuIGEubGVuZ3RofX0KVy53ei5wcm90b3R5
-cGU9ewpnQTpmdW5jdGlvbihhKXtyZXR1cm4gdGhpcy5hLmxlbmd0aH0sCnE6ZnVuY3Rpb24oYSxiKXt2
-YXIgdApILlNjKGIpCnQ9dGhpcy5hCmlmKGI8MHx8Yj49dC5sZW5ndGgpcmV0dXJuIEguT0godCxiKQpy
-ZXR1cm4gdGhpcy4kdGkuZC5iKHRbYl0pfSwKWTpmdW5jdGlvbihhLGIsYyl7dGhpcy4kdGkuZC5iKGMp
-CnRocm93IEguYihQLkw0KCJDYW5ub3QgbW9kaWZ5IGxpc3QiKSl9fQpXLmN2LnByb3RvdHlwZT17CmdR
-ZzpmdW5jdGlvbihhKXtyZXR1cm4gbmV3IFcuaTcoYSl9LApnRDpmdW5jdGlvbihhKXtyZXR1cm4gbmV3
-IFcuSTQoYSl9LApzRDpmdW5jdGlvbihhLGIpe3ZhciB0CnUuWC5iKGIpCnQ9dGhpcy5nRChhKQp0LlYx
-KDApCnQuRlYoMCxiKX0sCnc6ZnVuY3Rpb24oYSl7cmV0dXJuIGEubG9jYWxOYW1lfSwKdG46ZnVuY3Rp
-b24oYSl7dmFyIHQ9ISFhLnNjcm9sbEludG9WaWV3SWZOZWVkZWQKaWYodClhLnNjcm9sbEludG9WaWV3
-SWZOZWVkZWQoKQplbHNlIGEuc2Nyb2xsSW50b1ZpZXcoKX0sCnI2OmZ1bmN0aW9uKGEsYixjLGQpe3Zh
-ciB0LHMscixxCmlmKGM9PW51bGwpe2lmKGQ9PW51bGwpe3Q9JC5sdAppZih0PT1udWxsKXt0PUguVk0o
-W10sdS5rKQpzPW5ldyBXLnZEKHQpCkMuTm0uaSh0LFcuVHcobnVsbCkpCkMuTm0uaSh0LFcuQmwoKSkK
-JC5sdD1zCmQ9c31lbHNlIGQ9dH10PSQuRVUKaWYodD09bnVsbCl7dD1uZXcgVy5LbyhkKQokLkVVPXQK
-Yz10fWVsc2V7dC5hPWQKYz10fX1lbHNlIGlmKGQhPW51bGwpdGhyb3cgSC5iKFAueFkoInZhbGlkYXRv
-ciBjYW4gb25seSBiZSBwYXNzZWQgaWYgdHJlZVNhbml0aXplciBpcyBudWxsIikpCmlmKCQueG89PW51
-bGwpe3Q9ZG9jdW1lbnQKcz10LmltcGxlbWVudGF0aW9uLmNyZWF0ZUhUTUxEb2N1bWVudCgiIikKJC54
-bz1zCiQuQk89cy5jcmVhdGVSYW5nZSgpCnM9JC54by5jcmVhdGVFbGVtZW50KCJiYXNlIikKdS5jUi5i
-KHMpCnMuaHJlZj10LmJhc2VVUkkKJC54by5oZWFkLmFwcGVuZENoaWxkKHMpfXQ9JC54bwppZih0LmJv
-ZHk9PW51bGwpe3M9dC5jcmVhdGVFbGVtZW50KCJib2R5IikKdC5ib2R5PXUuWS5iKHMpfXQ9JC54bwpp
-Zih1LlkuYyhhKSlyPXQuYm9keQplbHNle3I9dC5jcmVhdGVFbGVtZW50KGEudGFnTmFtZSkKJC54by5i
-b2R5LmFwcGVuZENoaWxkKHIpfWlmKCJjcmVhdGVDb250ZXh0dWFsRnJhZ21lbnQiIGluIHdpbmRvdy5S
-YW5nZS5wcm90b3R5cGUmJiFDLk5tLnRnKEMuU3EsYS50YWdOYW1lKSl7JC5CTy5zZWxlY3ROb2RlQ29u
-dGVudHMocikKcT0kLkJPLmNyZWF0ZUNvbnRleHR1YWxGcmFnbWVudChiKX1lbHNle3IuaW5uZXJIVE1M
-PWIKcT0kLnhvLmNyZWF0ZURvY3VtZW50RnJhZ21lbnQoKQpmb3IoO3Q9ci5maXJzdENoaWxkLHQhPW51
-bGw7KXEuYXBwZW5kQ2hpbGQodCl9dD0kLnhvLmJvZHkKaWYocj09bnVsbD90IT1udWxsOnIhPT10KUou
-THQocikKYy5QbihxKQpkb2N1bWVudC5hZG9wdE5vZGUocSkKcmV0dXJuIHF9LApBSDpmdW5jdGlvbihh
-LGIsYyl7cmV0dXJuIHRoaXMucjYoYSxiLGMsbnVsbCl9LApzaGY6ZnVuY3Rpb24oYSxiKXt0aGlzLllD
-KGEsYil9LApwazpmdW5jdGlvbihhLGIsYyl7YS50ZXh0Q29udGVudD1udWxsCmEuYXBwZW5kQ2hpbGQo
-dGhpcy5yNihhLGIsbnVsbCxjKSl9LApZQzpmdW5jdGlvbihhLGIpe3JldHVybiB0aGlzLnBrKGEsYixu
-dWxsKX0sCmdWbDpmdW5jdGlvbihhKXtyZXR1cm4gbmV3IFcuQ3EoYSwiY2xpY2siLCExLHUuUSl9LAok
-aWN2OjEsCmduczpmdW5jdGlvbihhKXtyZXR1cm4gYS50YWdOYW1lfX0KVy5Ddi5wcm90b3R5cGU9ewok
-MTpmdW5jdGlvbihhKXtyZXR1cm4gdS5oLmModS5BLmIoYSkpfSwKJFM6MjV9ClcuZWEucHJvdG90eXBl
-PXskaWVhOjF9ClcuRDAucHJvdG90eXBlPXsKT246ZnVuY3Rpb24oYSxiLGMsZCl7dS5VLmIoYykKaWYo
-YyE9bnVsbCl0aGlzLnYoYSxiLGMsZCl9LApCOmZ1bmN0aW9uKGEsYixjKXtyZXR1cm4gdGhpcy5Pbihh
-LGIsYyxudWxsKX0sCnY6ZnVuY3Rpb24oYSxiLGMsZCl7cmV0dXJuIGEuYWRkRXZlbnRMaXN0ZW5lcihi
-LEgudFIodS5VLmIoYyksMSksZCl9LAokaUQwOjF9ClcuVDUucHJvdG90eXBlPXskaVQ1OjF9ClcuaDQu
-cHJvdG90eXBlPXsKZ0E6ZnVuY3Rpb24oYSl7cmV0dXJuIGEubGVuZ3RofX0KVy5ici5wcm90b3R5cGU9
-ewpnQTpmdW5jdGlvbihhKXtyZXR1cm4gYS5sZW5ndGh9fQpXLlZiLnByb3RvdHlwZT17fQpXLk83LnBy
-b3RvdHlwZT17CmVvOmZ1bmN0aW9uKGEsYixjLGQpe3JldHVybiBhLm9wZW4oYixjLCEwKX0sCiRpTzc6
-MX0KVy5iVS5wcm90b3R5cGU9ewokMjpmdW5jdGlvbihhLGIpe3RoaXMuYS5zZXRSZXF1ZXN0SGVhZGVy
-KEgueShhKSxILnkoYikpfSwKJFM6MTB9ClcuaEgucHJvdG90eXBlPXsKJDE6ZnVuY3Rpb24oYSl7dmFy
-IHQscyxyLHEscAp1LnAuYihhKQp0PXRoaXMuYQpzPXQuc3RhdHVzCmlmKHR5cGVvZiBzIT09Im51bWJl
-ciIpcmV0dXJuIHMudEIoKQpyPXM+PTIwMCYmczwzMDAKcT1zPjMwNyYmczw0MDAKcz1yfHxzPT09MHx8
-cz09PTMwNHx8cQpwPXRoaXMuYgppZihzKXAuYU0oMCx0KQplbHNlIHAucG0oYSl9LAokUzoyN30KVy53
-YS5wcm90b3R5cGU9e30KVy5TZy5wcm90b3R5cGU9eyRpU2c6MX0KVy51OC5wcm90b3R5cGU9ewpnRHI6
-ZnVuY3Rpb24oYSl7aWYoIm9yaWdpbiIgaW4gYSlyZXR1cm4gYS5vcmlnaW4KcmV0dXJuIEguZChhLnBy
-b3RvY29sKSsiLy8iK0guZChhLmhvc3QpfSwKdzpmdW5jdGlvbihhKXtyZXR1cm4gU3RyaW5nKGEpfSwK
-JGl1ODoxfQpXLkFqLnByb3RvdHlwZT17JGlBajoxfQpXLmU3LnByb3RvdHlwZT17CmdyODpmdW5jdGlv
-bihhKXt2YXIgdD10aGlzLmEscz10LmNoaWxkTm9kZXMubGVuZ3RoCmlmKHM9PT0wKXRocm93IEguYihQ
-LlBWKCJObyBlbGVtZW50cyIpKQppZihzPjEpdGhyb3cgSC5iKFAuUFYoIk1vcmUgdGhhbiBvbmUgZWxl
-bWVudCIpKQpyZXR1cm4gdC5maXJzdENoaWxkfSwKRlY6ZnVuY3Rpb24oYSxiKXt2YXIgdCxzLHIscQp1
-LmVoLmIoYikKdD1iLmEKcz10aGlzLmEKaWYodCE9PXMpZm9yKHI9dC5jaGlsZE5vZGVzLmxlbmd0aCxx
-PTA7cTxyOysrcSlzLmFwcGVuZENoaWxkKHQuZmlyc3RDaGlsZCkKcmV0dXJufSwKWTpmdW5jdGlvbihh
-LGIsYyl7dmFyIHQscwp1LkEuYihjKQp0PXRoaXMuYQpzPXQuY2hpbGROb2RlcwppZihiPDB8fGI+PXMu
-bGVuZ3RoKXJldHVybiBILk9IKHMsYikKdC5yZXBsYWNlQ2hpbGQoYyxzW2JdKX0sCmdrejpmdW5jdGlv
-bihhKXt2YXIgdD10aGlzLmEuY2hpbGROb2RlcwpyZXR1cm4gbmV3IFcuVzkodCx0Lmxlbmd0aCxILnpL
-KHQpLkMoIlc5PEdtLkU+IikpfSwKZ0E6ZnVuY3Rpb24oYSl7cmV0dXJuIHRoaXMuYS5jaGlsZE5vZGVz
-Lmxlbmd0aH0sCnE6ZnVuY3Rpb24oYSxiKXt2YXIgdApILlNjKGIpCnQ9dGhpcy5hLmNoaWxkTm9kZXMK
-aWYoYjwwfHxiPj10Lmxlbmd0aClyZXR1cm4gSC5PSCh0LGIpCnJldHVybiB0W2JdfX0KVy51SC5wcm90
-b3R5cGU9ewp3ZzpmdW5jdGlvbihhKXt2YXIgdD1hLnBhcmVudE5vZGUKaWYodCE9bnVsbCl0LnJlbW92
-ZUNoaWxkKGEpfSwKRDQ6ZnVuY3Rpb24oYSl7dmFyIHQKZm9yKDt0PWEuZmlyc3RDaGlsZCx0IT1udWxs
-OylhLnJlbW92ZUNoaWxkKHQpfSwKdzpmdW5jdGlvbihhKXt2YXIgdD1hLm5vZGVWYWx1ZQpyZXR1cm4g
-dD09bnVsbD90aGlzLlUoYSk6dH0sCiRpdUg6MX0KVy5CSC5wcm90b3R5cGU9ewpnQTpmdW5jdGlvbihh
-KXtyZXR1cm4gYS5sZW5ndGh9LApxOmZ1bmN0aW9uKGEsYil7SC5TYyhiKQppZihiPj4+MCE9PWJ8fGI+
-PWEubGVuZ3RoKXRocm93IEguYihQLkNmKGIsYSxudWxsLG51bGwsbnVsbCkpCnJldHVybiBhW2JdfSwK
-WTpmdW5jdGlvbihhLGIsYyl7dS5BLmIoYykKdGhyb3cgSC5iKFAuTDQoIkNhbm5vdCBhc3NpZ24gZWxl
-bWVudCBvZiBpbW11dGFibGUgTGlzdC4iKSl9LApFOmZ1bmN0aW9uKGEsYil7aWYoYjwwfHxiPj1hLmxl
-bmd0aClyZXR1cm4gSC5PSChhLGIpCnJldHVybiBhW2JdfSwKJGlYajoxLAokaWNYOjEsCiRpek06MX0K
-Vy5TTi5wcm90b3R5cGU9e30KVy5ldy5wcm90b3R5cGU9eyRpZXc6MX0KVy5scC5wcm90b3R5cGU9ewpn
-QTpmdW5jdGlvbihhKXtyZXR1cm4gYS5sZW5ndGh9fQpXLlRiLnByb3RvdHlwZT17CnI2OmZ1bmN0aW9u
-KGEsYixjLGQpe3ZhciB0LHMKaWYoImNyZWF0ZUNvbnRleHR1YWxGcmFnbWVudCIgaW4gd2luZG93LlJh
-bmdlLnByb3RvdHlwZSlyZXR1cm4gdGhpcy5EVyhhLGIsYyxkKQp0PVcuVTkoIjx0YWJsZT4iK0guZChi
-KSsiPC90YWJsZT4iLGMsZCkKcz1kb2N1bWVudC5jcmVhdGVEb2N1bWVudEZyYWdtZW50KCkKcy50b1N0
-cmluZwp0LnRvU3RyaW5nCm5ldyBXLmU3KHMpLkZWKDAsbmV3IFcuZTcodCkpCnJldHVybiBzfX0KVy5J
-di5wcm90b3R5cGU9ewpyNjpmdW5jdGlvbihhLGIsYyxkKXt2YXIgdCxzLHIscQppZigiY3JlYXRlQ29u
-dGV4dHVhbEZyYWdtZW50IiBpbiB3aW5kb3cuUmFuZ2UucHJvdG90eXBlKXJldHVybiB0aGlzLkRXKGEs
-YixjLGQpCnQ9ZG9jdW1lbnQKcz10LmNyZWF0ZURvY3VtZW50RnJhZ21lbnQoKQp0PUMuSWUucjYodC5j
-cmVhdGVFbGVtZW50KCJ0YWJsZSIpLGIsYyxkKQp0LnRvU3RyaW5nCnQ9bmV3IFcuZTcodCkKcj10Lmdy
-OCh0KQpyLnRvU3RyaW5nCnQ9bmV3IFcuZTcocikKcT10LmdyOCh0KQpzLnRvU3RyaW5nCnEudG9TdHJp
-bmcKbmV3IFcuZTcocykuRlYoMCxuZXcgVy5lNyhxKSkKcmV0dXJuIHN9fQpXLkJULnByb3RvdHlwZT17
-CnI2OmZ1bmN0aW9uKGEsYixjLGQpe3ZhciB0LHMscgppZigiY3JlYXRlQ29udGV4dHVhbEZyYWdtZW50
-IiBpbiB3aW5kb3cuUmFuZ2UucHJvdG90eXBlKXJldHVybiB0aGlzLkRXKGEsYixjLGQpCnQ9ZG9jdW1l
-bnQKcz10LmNyZWF0ZURvY3VtZW50RnJhZ21lbnQoKQp0PUMuSWUucjYodC5jcmVhdGVFbGVtZW50KCJ0
-YWJsZSIpLGIsYyxkKQp0LnRvU3RyaW5nCnQ9bmV3IFcuZTcodCkKcj10LmdyOCh0KQpzLnRvU3RyaW5n
-CnIudG9TdHJpbmcKbmV3IFcuZTcocykuRlYoMCxuZXcgVy5lNyhyKSkKcmV0dXJuIHN9fQpXLnlZLnBy
-b3RvdHlwZT17CnBrOmZ1bmN0aW9uKGEsYixjKXt2YXIgdCxzCmEudGV4dENvbnRlbnQ9bnVsbAp0PWEu
-Y29udGVudAp0LnRvU3RyaW5nCkouYlQodCkKcz10aGlzLnI2KGEsYixudWxsLGMpCmEuY29udGVudC5h
-cHBlbmRDaGlsZChzKX0sCllDOmZ1bmN0aW9uKGEsYil7cmV0dXJuIHRoaXMucGsoYSxiLG51bGwpfSwK
-JGl5WToxfQpXLnc2LnByb3RvdHlwZT17fQpXLks1LnByb3RvdHlwZT17CmdtVzpmdW5jdGlvbihhKXty
-ZXR1cm4gYS5sb2NhdGlvbn0sCiRpSzU6MSwKJGl2NjoxfQpXLkNtLnByb3RvdHlwZT17JGlDbToxfQpX
-LkNRLnByb3RvdHlwZT17JGlDUToxfQpXLnc0LnByb3RvdHlwZT17Cnc6ZnVuY3Rpb24oYSl7cmV0dXJu
-IlJlY3RhbmdsZSAoIitILmQoYS5sZWZ0KSsiLCAiK0guZChhLnRvcCkrIikgIitILmQoYS53aWR0aCkr
-IiB4ICIrSC5kKGEuaGVpZ2h0KX0sCkROOmZ1bmN0aW9uKGEsYil7aWYoYj09bnVsbClyZXR1cm4hMQpy
-ZXR1cm4gdS5xLmMoYikmJmEubGVmdD09PWIubGVmdCYmYS50b3A9PT1iLnRvcCYmYS53aWR0aD09PWIu
-d2lkdGgmJmEuaGVpZ2h0PT09Yi5oZWlnaHR9LApnaU86ZnVuY3Rpb24oYSl7cmV0dXJuIFcuckUoQy5D
-RC5naU8oYS5sZWZ0KSxDLkNELmdpTyhhLnRvcCksQy5DRC5naU8oYS53aWR0aCksQy5DRC5naU8oYS5o
-ZWlnaHQpKX19ClcucmgucHJvdG90eXBlPXsKZ0E6ZnVuY3Rpb24oYSl7cmV0dXJuIGEubGVuZ3RofSwK
-cTpmdW5jdGlvbihhLGIpe0guU2MoYikKaWYoYj4+PjAhPT1ifHxiPj1hLmxlbmd0aCl0aHJvdyBILmIo
-UC5DZihiLGEsbnVsbCxudWxsLG51bGwpKQpyZXR1cm4gYVtiXX0sClk6ZnVuY3Rpb24oYSxiLGMpe3Uu
-QS5iKGMpCnRocm93IEguYihQLkw0KCJDYW5ub3QgYXNzaWduIGVsZW1lbnQgb2YgaW1tdXRhYmxlIExp
-c3QuIikpfSwKRTpmdW5jdGlvbihhLGIpe2lmKGI8MHx8Yj49YS5sZW5ndGgpcmV0dXJuIEguT0goYSxi
-KQpyZXR1cm4gYVtiXX0sCiRpWGo6MSwKJGljWDoxLAokaXpNOjF9ClcuY2YucHJvdG90eXBlPXsKSzpm
-dW5jdGlvbihhLGIpe3ZhciB0LHMscixxLHAKdS5FLmIoYikKZm9yKHQ9dGhpcy5nVigpLHM9dC5sZW5n
-dGgscj10aGlzLmEscT0wO3E8dC5sZW5ndGg7dC5sZW5ndGg9PT1zfHwoMCxILmxrKSh0KSwrK3Epe3A9
-dFtxXQpiLiQyKHAsci5nZXRBdHRyaWJ1dGUocCkpfX0sCmdWOmZ1bmN0aW9uKCl7dmFyIHQscyxyLHEs
-cD10aGlzLmEuYXR0cmlidXRlcyxvPUguVk0oW10sdS5zKQpmb3IodD1wLmxlbmd0aCxzPXUuaDkscj0w
-O3I8dDsrK3Ipe2lmKHI+PXAubGVuZ3RoKXJldHVybiBILk9IKHAscikKcT1zLmIocFtyXSkKaWYocS5u
-YW1lc3BhY2VVUkk9PW51bGwpQy5ObS5pKG8scS5uYW1lKX1yZXR1cm4gb319ClcuaTcucHJvdG90eXBl
-PXsKcTpmdW5jdGlvbihhLGIpe3JldHVybiB0aGlzLmEuZ2V0QXR0cmlidXRlKEgueShiKSl9LApZOmZ1
-bmN0aW9uKGEsYixjKXt0aGlzLmEuc2V0QXR0cmlidXRlKGIsYyl9LApnQTpmdW5jdGlvbihhKXtyZXR1
-cm4gdGhpcy5nVigpLmxlbmd0aH19ClcuU3kucHJvdG90eXBlPXsKcTpmdW5jdGlvbihhLGIpe3JldHVy
-biB0aGlzLmEuYS5nZXRBdHRyaWJ1dGUoImRhdGEtIit0aGlzLk8oSC55KGIpKSl9LApZOmZ1bmN0aW9u
-KGEsYixjKXt0aGlzLmEuYS5zZXRBdHRyaWJ1dGUoImRhdGEtIit0aGlzLk8oYiksYyl9LApLOmZ1bmN0
-aW9uKGEsYil7dGhpcy5hLksoMCxuZXcgVy5LUyh0aGlzLHUuRS5iKGIpKSl9LApnVjpmdW5jdGlvbigp
-e3ZhciB0PUguVk0oW10sdS5zKQp0aGlzLmEuSygwLG5ldyBXLkEzKHRoaXMsdCkpCnJldHVybiB0fSwK
-Z0E6ZnVuY3Rpb24oYSl7cmV0dXJuIHRoaXMuZ1YoKS5sZW5ndGh9LAprOmZ1bmN0aW9uKGEpe3ZhciB0
-LHMscj1ILlZNKGEuc3BsaXQoIi0iKSx1LnMpCmZvcih0PTE7dDxyLmxlbmd0aDsrK3Qpe3M9clt0XQpp
-ZihzLmxlbmd0aD4wKUMuTm0uWShyLHQsc1swXS50b1VwcGVyQ2FzZSgpK0ouS1YocywxKSl9cmV0dXJu
-IEMuTm0uSChyLCIiKX0sCk86ZnVuY3Rpb24oYSl7dmFyIHQscyxyLHEscApmb3IodD1hLmxlbmd0aCxz
-PTAscj0iIjtzPHQ7KytzKXtxPWFbc10KcD1xLnRvTG93ZXJDYXNlKCkKcj0ocSE9PXAmJnM+MD9yKyIt
-IjpyKStwfXJldHVybiByLmNoYXJDb2RlQXQoMCk9PTA/cjpyfX0KVy5LUy5wcm90b3R5cGU9ewokMjpm
-dW5jdGlvbihhLGIpe2lmKEouclkoYSkubihhLCJkYXRhLSIpKXRoaXMuYi4kMih0aGlzLmEuayhDLnhC
-LkcoYSw1KSksYil9LAokUzoxMH0KVy5BMy5wcm90b3R5cGU9ewokMjpmdW5jdGlvbihhLGIpe2lmKEou
-clkoYSkubihhLCJkYXRhLSIpKUMuTm0uaSh0aGlzLmIsdGhpcy5hLmsoQy54Qi5HKGEsNSkpKX0sCiRT
-OjEwfQpXLkk0LnByb3RvdHlwZT17ClA6ZnVuY3Rpb24oKXt2YXIgdCxzLHIscSxwPVAuTHModS5OKQpm
-b3IodD10aGlzLmEuY2xhc3NOYW1lLnNwbGl0KCIgIikscz10Lmxlbmd0aCxyPTA7cjxzOysrcil7cT1K
-LlQwKHRbcl0pCmlmKHEubGVuZ3RoIT09MClwLmkoMCxxKX1yZXR1cm4gcH0sClg6ZnVuY3Rpb24oYSl7
-dGhpcy5hLmNsYXNzTmFtZT11LkMuYihhKS5IKDAsIiAiKX0sCmdBOmZ1bmN0aW9uKGEpe3JldHVybiB0
-aGlzLmEuY2xhc3NMaXN0Lmxlbmd0aH0sClYxOmZ1bmN0aW9uKGEpe3RoaXMuYS5jbGFzc05hbWU9IiJ9
-LAp0ZzpmdW5jdGlvbihhLGIpe3ZhciB0PXRoaXMuYS5jbGFzc0xpc3QuY29udGFpbnMoYikKcmV0dXJu
-IHR9LAppOmZ1bmN0aW9uKGEsYil7dmFyIHQ9dGhpcy5hLmNsYXNzTGlzdCxzPXQuY29udGFpbnMoYikK
-dC5hZGQoYikKcmV0dXJuIXN9LApSOmZ1bmN0aW9uKGEsYil7dmFyIHQ9dGhpcy5hLmNsYXNzTGlzdCxz
-PXQuY29udGFpbnMoYikKdC5yZW1vdmUoYikKcmV0dXJuIHN9LApGVjpmdW5jdGlvbihhLGIpe1cuVE4o
-dGhpcy5hLHUuWC5iKGIpKX19ClcuRmsucHJvdG90eXBlPXt9ClcuUk8ucHJvdG90eXBlPXt9ClcuQ3Eu
-cHJvdG90eXBlPXt9ClcueEMucHJvdG90eXBlPXt9Clcudk4ucHJvdG90eXBlPXsKJDE6ZnVuY3Rpb24o
-YSl7cmV0dXJuIHRoaXMuYS4kMSh1LkIuYihhKSl9LAokUzoyOH0KVy5KUS5wcm90b3R5cGU9ewpDWTpm
-dW5jdGlvbihhKXt2YXIgdAppZigkLm9yLmE9PT0wKXtmb3IodD0wO3Q8MjYyOysrdCkkLm9yLlkoMCxD
-LmNtW3RdLFcucFMoKSkKZm9yKHQ9MDt0PDEyOysrdCkkLm9yLlkoMCxDLkJJW3RdLFcuVjQoKSl9fSwK
-aTA6ZnVuY3Rpb24oYSl7cmV0dXJuICQuQU4oKS50ZygwLFcuclMoYSkpfSwKRWI6ZnVuY3Rpb24oYSxi
-LGMpe3ZhciB0PSQub3IucSgwLEguZChXLnJTKGEpKSsiOjoiK2IpCmlmKHQ9PW51bGwpdD0kLm9yLnEo
-MCwiKjo6IitiKQppZih0PT1udWxsKXJldHVybiExCnJldHVybiBILnhkKHQuJDQoYSxiLGMsdGhpcykp
-fSwKJGlrRjoxfQpXLkdtLnByb3RvdHlwZT17CmdrejpmdW5jdGlvbihhKXtyZXR1cm4gbmV3IFcuVzko
-YSx0aGlzLmdBKGEpLEgueksoYSkuQygiVzk8R20uRT4iKSl9fQpXLnZELnByb3RvdHlwZT17CmkwOmZ1
-bmN0aW9uKGEpe3JldHVybiBDLk5tLlZyKHRoaXMuYSxuZXcgVy5VdihhKSl9LApFYjpmdW5jdGlvbihh
-LGIsYyl7cmV0dXJuIEMuTm0uVnIodGhpcy5hLG5ldyBXLkVnKGEsYixjKSl9LAokaWtGOjF9ClcuVXYu
-cHJvdG90eXBlPXsKJDE6ZnVuY3Rpb24oYSl7cmV0dXJuIHUuZS5iKGEpLmkwKHRoaXMuYSl9LAokUzox
-N30KVy5FZy5wcm90b3R5cGU9ewokMTpmdW5jdGlvbihhKXtyZXR1cm4gdS5lLmIoYSkuRWIodGhpcy5h
-LHRoaXMuYix0aGlzLmMpfSwKJFM6MTd9ClcubTYucHJvdG90eXBlPXsKQ1k6ZnVuY3Rpb24oYSxiLGMs
-ZCl7dmFyIHQscyxyCnRoaXMuYS5GVigwLGMpCnQ9Yi5ldigwLG5ldyBXLkVvKCkpCnM9Yi5ldigwLG5l
-dyBXLldrKCkpCnRoaXMuYi5GVigwLHQpCnI9dGhpcy5jCnIuRlYoMCxDLmRuKQpyLkZWKDAscyl9LApp
-MDpmdW5jdGlvbihhKXtyZXR1cm4gdGhpcy5hLnRnKDAsVy5yUyhhKSl9LApFYjpmdW5jdGlvbihhLGIs
-Yyl7dmFyIHQ9dGhpcyxzPVcuclMoYSkscj10LmMKaWYoci50ZygwLEguZChzKSsiOjoiK2IpKXJldHVy
-biB0LmQuRHQoYykKZWxzZSBpZihyLnRnKDAsIio6OiIrYikpcmV0dXJuIHQuZC5EdChjKQplbHNle3I9
-dC5iCmlmKHIudGcoMCxILmQocykrIjo6IitiKSlyZXR1cm4hMAplbHNlIGlmKHIudGcoMCwiKjo6Iiti
-KSlyZXR1cm4hMAplbHNlIGlmKHIudGcoMCxILmQocykrIjo6KiIpKXJldHVybiEwCmVsc2UgaWYoci50
-ZygwLCIqOjoqIikpcmV0dXJuITB9cmV0dXJuITF9LAokaWtGOjF9ClcuRW8ucHJvdG90eXBlPXsKJDE6
-ZnVuY3Rpb24oYSl7cmV0dXJuIUMuTm0udGcoQy5CSSxILnkoYSkpfSwKJFM6OH0KVy5Xay5wcm90b3R5
-cGU9ewokMTpmdW5jdGlvbihhKXtyZXR1cm4gQy5ObS50ZyhDLkJJLEgueShhKSl9LAokUzo4fQpXLmN0
-LnByb3RvdHlwZT17CkViOmZ1bmN0aW9uKGEsYixjKXtpZih0aGlzLmpGKGEsYixjKSlyZXR1cm4hMApp
-ZihiPT09InRlbXBsYXRlIiYmYz09PSIiKXJldHVybiEwCmlmKGEuZ2V0QXR0cmlidXRlKCJ0ZW1wbGF0
-ZSIpPT09IiIpcmV0dXJuIHRoaXMuZS50ZygwLGIpCnJldHVybiExfX0KVy5JQS5wcm90b3R5cGU9ewok
-MTpmdW5jdGlvbihhKXtyZXR1cm4iVEVNUExBVEU6OiIrSC5kKEgueShhKSl9LAokUzo1fQpXLk93LnBy
-b3RvdHlwZT17CmkwOmZ1bmN0aW9uKGEpe3ZhciB0CmlmKHUuZXcuYyhhKSlyZXR1cm4hMQp0PXUuZzcu
-YyhhKQppZih0JiZXLnJTKGEpPT09ImZvcmVpZ25PYmplY3QiKXJldHVybiExCmlmKHQpcmV0dXJuITAK
-cmV0dXJuITF9LApFYjpmdW5jdGlvbihhLGIsYyl7aWYoYj09PSJpcyJ8fEMueEIubihiLCJvbiIpKXJl
-dHVybiExCnJldHVybiB0aGlzLmkwKGEpfSwKJGlrRjoxfQpXLlc5LnByb3RvdHlwZT17CkY6ZnVuY3Rp
-b24oKXt2YXIgdD10aGlzLHM9dC5jKzEscj10LmIKaWYoczxyKXt0LnNwKEoudzIodC5hLHMpKQp0LmM9
-cwpyZXR1cm4hMH10LnNwKG51bGwpCnQuYz1yCnJldHVybiExfSwKZ2w6ZnVuY3Rpb24oKXtyZXR1cm4g
-dGhpcy5kfSwKc3A6ZnVuY3Rpb24oYSl7dGhpcy5kPXRoaXMuJHRpLmQuYihhKX0sCiRpQW46MX0KVy5k
-Vy5wcm90b3R5cGU9ewpnbVc6ZnVuY3Rpb24oYSl7cmV0dXJuIFcuelgodGhpcy5hLmxvY2F0aW9uKX0s
-CiRpRDA6MSwKJGl2NjoxfQpXLkZiLnByb3RvdHlwZT17fQpXLmtGLnByb3RvdHlwZT17fQpXLm1rLnBy
-b3RvdHlwZT17JGl5MDoxfQpXLktvLnByb3RvdHlwZT17ClBuOmZ1bmN0aW9uKGEpe25ldyBXLmZtKHRo
-aXMpLiQyKGEsbnVsbCl9LApFUDpmdW5jdGlvbihhLGIpe2lmKGI9PW51bGwpSi5MdChhKQplbHNlIGIu
-cmVtb3ZlQ2hpbGQoYSl9LApJNDpmdW5jdGlvbihhLGIpe3ZhciB0LHMscixxLHAsbz0hMCxuPW51bGws
-bT1udWxsCnRyeXtuPUouaWcoYSkKbT1uLmEuZ2V0QXR0cmlidXRlKCJpcyIpCnUuaC5iKGEpCnQ9ZnVu
-Y3Rpb24oYyl7aWYoIShjLmF0dHJpYnV0ZXMgaW5zdGFuY2VvZiBOYW1lZE5vZGVNYXApKXJldHVybiB0
-cnVlCnZhciBsPWMuY2hpbGROb2RlcwppZihjLmxhc3RDaGlsZCYmYy5sYXN0Q2hpbGQhPT1sW2wubGVu
-Z3RoLTFdKXJldHVybiB0cnVlCmlmKGMuY2hpbGRyZW4paWYoIShjLmNoaWxkcmVuIGluc3RhbmNlb2Yg
-SFRNTENvbGxlY3Rpb258fGMuY2hpbGRyZW4gaW5zdGFuY2VvZiBOb2RlTGlzdCkpcmV0dXJuIHRydWUK
-dmFyIGs9MAppZihjLmNoaWxkcmVuKWs9Yy5jaGlsZHJlbi5sZW5ndGgKZm9yKHZhciBqPTA7ajxrO2or
-Kyl7dmFyIGk9Yy5jaGlsZHJlbltqXQppZihpLmlkPT0nYXR0cmlidXRlcyd8fGkubmFtZT09J2F0dHJp
-YnV0ZXMnfHxpLmlkPT0nbGFzdENoaWxkJ3x8aS5uYW1lPT0nbGFzdENoaWxkJ3x8aS5pZD09J2NoaWxk
-cmVuJ3x8aS5uYW1lPT0nY2hpbGRyZW4nKXJldHVybiB0cnVlfXJldHVybiBmYWxzZX0oYSkKbz1ILm9U
-KHQpPyEwOiEoYS5hdHRyaWJ1dGVzIGluc3RhbmNlb2YgTmFtZWROb2RlTWFwKX1jYXRjaChxKXtILlJ1
-KHEpfXM9ImVsZW1lbnQgdW5wcmludGFibGUiCnRyeXtzPUouaihhKX1jYXRjaChxKXtILlJ1KHEpfXRy
-eXtyPVcuclMoYSkKdGhpcy5rUih1LmguYihhKSxiLG8scyxyLHUuRy5iKG4pLEgueShtKSl9Y2F0Y2go
-cSl7aWYoSC5SdShxKSBpbnN0YW5jZW9mIFAudSl0aHJvdyBxCmVsc2V7dGhpcy5FUChhLGIpCndpbmRv
-dwpwPSJSZW1vdmluZyBjb3JydXB0ZWQgZWxlbWVudCAiK0guZChzKQppZih0eXBlb2YgY29uc29sZSE9
-InVuZGVmaW5lZCIpd2luZG93LmNvbnNvbGUud2FybihwKX19fSwKa1I6ZnVuY3Rpb24oYSxiLGMsZCxl
-LGYsZyl7dmFyIHQscyxyLHEscCxvLG49dGhpcwppZihjKXtuLkVQKGEsYikKd2luZG93CnQ9IlJlbW92
-aW5nIGVsZW1lbnQgZHVlIHRvIGNvcnJ1cHRlZCBhdHRyaWJ1dGVzIG9uIDwiK2QrIj4iCmlmKHR5cGVv
-ZiBjb25zb2xlIT0idW5kZWZpbmVkIil3aW5kb3cuY29uc29sZS53YXJuKHQpCnJldHVybn1pZighbi5h
-LmkwKGEpKXtuLkVQKGEsYikKd2luZG93CnQ9IlJlbW92aW5nIGRpc2FsbG93ZWQgZWxlbWVudCA8IitI
-LmQoZSkrIj4gZnJvbSAiK0guZChiKQppZih0eXBlb2YgY29uc29sZSE9InVuZGVmaW5lZCIpd2luZG93
-LmNvbnNvbGUud2Fybih0KQpyZXR1cm59aWYoZyE9bnVsbClpZighbi5hLkViKGEsImlzIixnKSl7bi5F
-UChhLGIpCndpbmRvdwp0PSJSZW1vdmluZyBkaXNhbGxvd2VkIHR5cGUgZXh0ZW5zaW9uIDwiK0guZChl
-KSsnIGlzPSInK2crJyI+JwppZih0eXBlb2YgY29uc29sZSE9InVuZGVmaW5lZCIpd2luZG93LmNvbnNv
-bGUud2Fybih0KQpyZXR1cm59dD1mLmdWKCkKcz1ILlZNKHQuc2xpY2UoMCksSC50Nih0KS5DKCJqZDwx
-PiIpKQpmb3Iocj1mLmdWKCkubGVuZ3RoLTEsdD1mLmE7cj49MDstLXIpe2lmKHI+PXMubGVuZ3RoKXJl
-dHVybiBILk9IKHMscikKcT1zW3JdCnA9bi5hCm89Si5jSChxKQpILnkocSkKaWYoIXAuRWIoYSxvLHQu
-Z2V0QXR0cmlidXRlKHEpKSl7d2luZG93CnA9IlJlbW92aW5nIGRpc2FsbG93ZWQgYXR0cmlidXRlIDwi
-K0guZChlKSsiICIrcSsnPSInK0guZCh0LmdldEF0dHJpYnV0ZShxKSkrJyI+JwppZih0eXBlb2YgY29u
-c29sZSE9InVuZGVmaW5lZCIpd2luZG93LmNvbnNvbGUud2FybihwKQp0LnJlbW92ZUF0dHJpYnV0ZShx
-KX19aWYodS5hVy5jKGEpKW4uUG4oYS5jb250ZW50KX0sCiRpb246MX0KVy5mbS5wcm90b3R5cGU9ewok
-MjpmdW5jdGlvbihhLGIpe3ZhciB0LHMscixxLHA9dGhpcy5hCnN3aXRjaChhLm5vZGVUeXBlKXtjYXNl
-IDE6cC5JNChhLGIpCmJyZWFrCmNhc2UgODpjYXNlIDExOmNhc2UgMzpjYXNlIDQ6YnJlYWsKZGVmYXVs
-dDpwLkVQKGEsYil9dD1hLmxhc3RDaGlsZApmb3IocD11LkE7bnVsbCE9dDspe3M9bnVsbAp0cnl7cz10
-LnByZXZpb3VzU2libGluZ31jYXRjaChyKXtILlJ1KHIpCnE9cC5iKHQpCmEucmVtb3ZlQ2hpbGQocSkK
-dD1udWxsCnM9YS5sYXN0Q2hpbGR9aWYodCE9bnVsbCl0aGlzLiQyKHQsYSkKdD1wLmIocyl9fSwKJFM6
-MzF9ClcuTGUucHJvdG90eXBlPXt9ClcuSzcucHJvdG90eXBlPXt9ClcuckIucHJvdG90eXBlPXt9Clcu
-WFcucHJvdG90eXBlPXt9Clcub2EucHJvdG90eXBlPXt9ClAuaUoucHJvdG90eXBlPXsKVkg6ZnVuY3Rp
-b24oYSl7dmFyIHQscz10aGlzLmEscj1zLmxlbmd0aApmb3IodD0wO3Q8cjsrK3QpaWYoc1t0XT09PWEp
-cmV0dXJuIHQKQy5ObS5pKHMsYSkKQy5ObS5pKHRoaXMuYixudWxsKQpyZXR1cm4gcn0sClB2OmZ1bmN0
-aW9uKGEpe3ZhciB0LHMscixxPXRoaXMscD17fQppZihhPT1udWxsKXJldHVybiBhCmlmKEgubChhKSly
-ZXR1cm4gYQppZih0eXBlb2YgYT09Im51bWJlciIpcmV0dXJuIGEKaWYodHlwZW9mIGE9PSJzdHJpbmci
-KXJldHVybiBhCmlmKGEgaW5zdGFuY2VvZiBQLmlQKXJldHVybiBuZXcgRGF0ZShhLmEpCmlmKHUuZnYu
-YyhhKSl0aHJvdyBILmIoUC5TWSgic3RydWN0dXJlZCBjbG9uZSBvZiBSZWdFeHAiKSkKaWYodS5jOC5j
-KGEpKXJldHVybiBhCmlmKHUuZC5jKGEpKXJldHVybiBhCmlmKHUuSS5jKGEpKXJldHVybiBhCnQ9dS5k
-RC5jKGEpfHwhMQppZih0KXJldHVybiBhCmlmKHUuRy5jKGEpKXtzPXEuVkgoYSkKdD1xLmIKaWYocz49
-dC5sZW5ndGgpcmV0dXJuIEguT0godCxzKQpyPXAuYT10W3NdCmlmKHIhPW51bGwpcmV0dXJuIHIKcj17
-fQpwLmE9cgpDLk5tLlkodCxzLHIpCmEuSygwLG5ldyBQLmxSKHAscSkpCnJldHVybiBwLmF9aWYodS5q
-LmMoYSkpe3M9cS5WSChhKQpwPXEuYgppZihzPj1wLmxlbmd0aClyZXR1cm4gSC5PSChwLHMpCnI9cFtz
-XQppZihyIT1udWxsKXJldHVybiByCnJldHVybiBxLmVrKGEscyl9aWYodS5lSC5jKGEpKXtzPXEuVkgo
-YSkKdD1xLmIKaWYocz49dC5sZW5ndGgpcmV0dXJuIEguT0godCxzKQpyPXAuYj10W3NdCmlmKHIhPW51
-bGwpcmV0dXJuIHIKcj17fQpwLmI9cgpDLk5tLlkodCxzLHIpCnEuaW0oYSxuZXcgUC5qZyhwLHEpKQpy
-ZXR1cm4gcC5ifXRocm93IEguYihQLlNZKCJzdHJ1Y3R1cmVkIGNsb25lIG9mIG90aGVyIHR5cGUiKSl9
-LAplazpmdW5jdGlvbihhLGIpe3ZhciB0LHM9Si5VNihhKSxyPXMuZ0EoYSkscT1uZXcgQXJyYXkocikK
-Qy5ObS5ZKHRoaXMuYixiLHEpCmZvcih0PTA7dDxyOysrdClDLk5tLlkocSx0LHRoaXMuUHYocy5xKGEs
-dCkpKQpyZXR1cm4gcX19ClAubFIucHJvdG90eXBlPXsKJDI6ZnVuY3Rpb24oYSxiKXt0aGlzLmEuYVth
-XT10aGlzLmIuUHYoYil9LAokUzoxfQpQLmpnLnByb3RvdHlwZT17CiQyOmZ1bmN0aW9uKGEsYil7dGhp
-cy5hLmJbYV09dGhpcy5iLlB2KGIpfSwKJFM6MX0KUC5CZi5wcm90b3R5cGU9ewppbTpmdW5jdGlvbihh
-LGIpe3ZhciB0LHMscixxCnUuYjguYihiKQpmb3IodD1PYmplY3Qua2V5cyhhKSxzPXQubGVuZ3RoLHI9
-MDtyPHM7KytyKXtxPXRbcl0KYi4kMihxLGFbcV0pfX19ClAuQXMucHJvdG90eXBlPXsKVDpmdW5jdGlv
-bihhKXt2YXIgdApILnkoYSkKdD0kLmhHKCkuYgppZih0eXBlb2YgYSE9InN0cmluZyIpSC52aChILnRM
-KGEpKQppZih0LnRlc3QoYSkpcmV0dXJuIGEKdGhyb3cgSC5iKFAuTDMoYSwidmFsdWUiLCJOb3QgYSB2
-YWxpZCBjbGFzcyB0b2tlbiIpKX0sCnc6ZnVuY3Rpb24oYSl7cmV0dXJuIHRoaXMuUCgpLkgoMCwiICIp
-fSwKZ2t6OmZ1bmN0aW9uKGEpe3ZhciB0PXRoaXMuUCgpCnJldHVybiBQLnJqKHQsdC5yLEguTGgodCku
-ZCl9LApnQTpmdW5jdGlvbihhKXtyZXR1cm4gdGhpcy5QKCkuYX0sCnRnOmZ1bmN0aW9uKGEsYil7dGhp
-cy5UKGIpCnJldHVybiB0aGlzLlAoKS50ZygwLGIpfSwKaTpmdW5jdGlvbihhLGIpe3RoaXMuVChiKQpy
-ZXR1cm4gSC54ZCh0aGlzLk9TKG5ldyBQLkdFKGIpKSl9LApSOmZ1bmN0aW9uKGEsYil7dmFyIHQscwp0
-aGlzLlQoYikKdD10aGlzLlAoKQpzPXQuUigwLGIpCnRoaXMuWCh0KQpyZXR1cm4gc30sCkZWOmZ1bmN0
-aW9uKGEsYil7dGhpcy5PUyhuZXcgUC5ONyh0aGlzLHUuWC5iKGIpKSl9LApWMTpmdW5jdGlvbihhKXt0
-aGlzLk9TKG5ldyBQLnVRKCkpfSwKT1M6ZnVuY3Rpb24oYSl7dmFyIHQscwp1LmNoLmIoYSkKdD10aGlz
-LlAoKQpzPWEuJDEodCkKdGhpcy5YKHQpCnJldHVybiBzfX0KUC5HRS5wcm90b3R5cGU9ewokMTpmdW5j
-dGlvbihhKXtyZXR1cm4gdS5DLmIoYSkuaSgwLHRoaXMuYSl9LAokUzo0NX0KUC5ONy5wcm90b3R5cGU9
-ewokMTpmdW5jdGlvbihhKXt2YXIgdD10aGlzLmIscz1ILnQ2KHQpCnJldHVybiB1LkMuYihhKS5GVigw
-LG5ldyBILkE4KHQscy5DKCJxVSgxKSIpLmIodGhpcy5hLmd1TSgpKSxzLkMoIkE4PDEscVU+IikpKX0s
-CiRTOjE0fQpQLnVRLnByb3RvdHlwZT17CiQxOmZ1bmN0aW9uKGEpe3UuQy5iKGEpCmlmKGEuYT4wKXth
-LmI9YS5jPWEuZD1hLmU9YS5mPW51bGwKYS5hPTAKYS5TKCl9cmV0dXJuIG51bGx9LAokUzoxNH0KUC5o
-Ri5wcm90b3R5cGU9eyRpaEY6MX0KUC5QQy5wcm90b3R5cGU9ewokMTpmdW5jdGlvbihhKXt2YXIgdAp1
-LlouYihhKQp0PWZ1bmN0aW9uKGIsYyxkKXtyZXR1cm4gZnVuY3Rpb24oKXtyZXR1cm4gYihjLGQsdGhp
-cyxBcnJheS5wcm90b3R5cGUuc2xpY2UuYXBwbHkoYXJndW1lbnRzKSl9fShQLlI0LGEsITEpClAuRG0o
-dCwkLncoKSxhKQpyZXR1cm4gdH0sCiRTOjR9ClAuWW0ucHJvdG90eXBlPXsKJDE6ZnVuY3Rpb24oYSl7
-cmV0dXJuIG5ldyB0aGlzLmEoYSl9LAokUzo0fQpQLk56LnByb3RvdHlwZT17CiQxOmZ1bmN0aW9uKGEp
-e3JldHVybiBuZXcgUC5yNyhhKX0sCiRTOjM0fQpQLm5wLnByb3RvdHlwZT17CiQxOmZ1bmN0aW9uKGEp
-e3JldHVybiBuZXcgUC5UeihhLHUuYW0pfSwKJFM6MzV9ClAuVXQucHJvdG90eXBlPXsKJDE6ZnVuY3Rp
-b24oYSl7cmV0dXJuIG5ldyBQLkU0KGEpfSwKJFM6MzZ9ClAuRTQucHJvdG90eXBlPXsKcTpmdW5jdGlv
-bihhLGIpe2lmKHR5cGVvZiBiIT0ic3RyaW5nIiYmdHlwZW9mIGIhPSJudW1iZXIiKXRocm93IEguYihQ
-LnhZKCJwcm9wZXJ0eSBpcyBub3QgYSBTdHJpbmcgb3IgbnVtIikpCnJldHVybiBQLkw3KHRoaXMuYVti
-XSl9LApZOmZ1bmN0aW9uKGEsYixjKXtpZih0eXBlb2YgYiE9InN0cmluZyImJnR5cGVvZiBiIT0ibnVt
-YmVyIil0aHJvdyBILmIoUC54WSgicHJvcGVydHkgaXMgbm90IGEgU3RyaW5nIG9yIG51bSIpKQp0aGlz
-LmFbYl09UC53WShjKX0sCkROOmZ1bmN0aW9uKGEsYil7aWYoYj09bnVsbClyZXR1cm4hMQpyZXR1cm4g
-YiBpbnN0YW5jZW9mIFAuRTQmJnRoaXMuYT09PWIuYX0sCnc6ZnVuY3Rpb24oYSl7dmFyIHQscwp0cnl7
-dD1TdHJpbmcodGhpcy5hKQpyZXR1cm4gdH1jYXRjaChzKXtILlJ1KHMpCnQ9dGhpcy54YigwKQpyZXR1
-cm4gdH19LApWNzpmdW5jdGlvbihhLGIpe3ZhciB0LHM9dGhpcy5hCmlmKGI9PW51bGwpdD1udWxsCmVs
-c2V7dD1ILnQ2KGIpCnQ9UC5DSChuZXcgSC5BOChiLHQuQygiQCgxKSIpLmIoUC5pRygpKSx0LkMoIkE4
-PDEsQD4iKSksITAsdS56KX1yZXR1cm4gUC5MNyhzW2FdLmFwcGx5KHMsdCkpfSwKZ2lPOmZ1bmN0aW9u
-KGEpe3JldHVybiAwfX0KUC5yNy5wcm90b3R5cGU9e30KUC5Uei5wcm90b3R5cGU9ewpjUDpmdW5jdGlv
-bihhKXt2YXIgdD10aGlzLHM9YTwwfHxhPj10LmdBKHQpCmlmKHMpdGhyb3cgSC5iKFAuVEUoYSwwLHQu
-Z0EodCksbnVsbCxudWxsKSl9LApxOmZ1bmN0aW9uKGEsYil7aWYodHlwZW9mIGI9PSJudW1iZXIiJiZi
-PT09Qy5qbi55dShiKSl0aGlzLmNQKEguU2MoYikpCnJldHVybiB0aGlzLiR0aS5kLmIodGhpcy5Vcigw
-LGIpKX0sClk6ZnVuY3Rpb24oYSxiLGMpe3ZhciB0CnRoaXMuJHRpLmQuYihjKQp0PUMuam4ueXUoYikK
-aWYoYj09PXQpdGhpcy5jUChiKQp0aGlzLmU0KDAsYixjKX0sCmdBOmZ1bmN0aW9uKGEpe3ZhciB0PXRo
-aXMuYS5sZW5ndGgKaWYodHlwZW9mIHQ9PT0ibnVtYmVyIiYmdD4+PjA9PT10KXJldHVybiB0CnRocm93
-IEguYihQLlBWKCJCYWQgSnNBcnJheSBsZW5ndGgiKSl9LAokaWNYOjEsCiRpek06MX0KUC5jby5wcm90
-b3R5cGU9e30KUC5uZC5wcm90b3R5cGU9eyRpbmQ6MX0KUC5LZS5wcm90b3R5cGU9ewpQOmZ1bmN0aW9u
-KCl7dmFyIHQscyxyLHEscD10aGlzLmEuZ2V0QXR0cmlidXRlKCJjbGFzcyIpLG89UC5Mcyh1Lk4pCmlm
-KHA9PW51bGwpcmV0dXJuIG8KZm9yKHQ9cC5zcGxpdCgiICIpLHM9dC5sZW5ndGgscj0wO3I8czsrK3Ip
-e3E9Si5UMCh0W3JdKQppZihxLmxlbmd0aCE9PTApby5pKDAscSl9cmV0dXJuIG99LApYOmZ1bmN0aW9u
-KGEpe3RoaXMuYS5zZXRBdHRyaWJ1dGUoImNsYXNzIixhLkgoMCwiICIpKX19ClAuZDUucHJvdG90eXBl
-PXsKZ0Q6ZnVuY3Rpb24oYSl7cmV0dXJuIG5ldyBQLktlKGEpfSwKc2hmOmZ1bmN0aW9uKGEsYil7dGhp
-cy5ZQyhhLGIpfSwKcjY6ZnVuY3Rpb24oYSxiLGMsZCl7dmFyIHQscyxyLHEscCxvCmlmKGQ9PW51bGwp
-e3Q9SC5WTShbXSx1LmspCmQ9bmV3IFcudkQodCkKQy5ObS5pKHQsVy5UdyhudWxsKSkKQy5ObS5pKHQs
-Vy5CbCgpKQpDLk5tLmkodCxuZXcgVy5PdygpKX1jPW5ldyBXLktvKGQpCnM9JzxzdmcgdmVyc2lvbj0i
-MS4xIj4nK0guZChiKSsiPC9zdmc+Igp0PWRvY3VtZW50CnI9dC5ib2R5CnE9KHImJkMuUlkpLkFIKHIs
-cyxjKQpwPXQuY3JlYXRlRG9jdW1lbnRGcmFnbWVudCgpCnEudG9TdHJpbmcKdD1uZXcgVy5lNyhxKQpv
-PXQuZ3I4KHQpCmZvcig7dD1vLmZpcnN0Q2hpbGQsdCE9bnVsbDspcC5hcHBlbmRDaGlsZCh0KQpyZXR1
-cm4gcH0sCmdWbDpmdW5jdGlvbihhKXtyZXR1cm4gbmV3IFcuQ3EoYSwiY2xpY2siLCExLHUuUSl9LAok
-aWQ1OjF9ClAubjYucHJvdG90eXBlPXskaWNYOjEsJGl6TToxLCRpQVM6MX0KVS5kMi5wcm90b3R5cGU9
+CmlmKHMhPT0wKWlmKHM9PT0xKXtpZigwPj1zKXJldHVybiBILmsodCwwKQpzPXRbMF0ubGVuZ3RoPT09
+MH1lbHNlIHM9ITEKZWxzZSBzPSEwCmlmKHMpcmV0dXJuIi4vIgppZihxfHxDLk5tLmdyWih0KT09PSIu
+LiIpQy5ObS5pKHQsIiIpCmlmKCFiKXtpZigwPj10Lmxlbmd0aClyZXR1cm4gSC5rKHQsMCkKQy5ObS5Z
+KHQsMCxQLkMxKHRbMF0pKX1yZXR1cm4gQy5ObS56Vih0LCIvIil9LApDMTpmdW5jdGlvbihhKXt2YXIg
+dCxzLHIscT1hLmxlbmd0aAppZihxPj0yJiZQLkV0KEouUXooYSwwKSkpZm9yKHQ9MTt0PHE7Kyt0KXtz
+PUMueEIuVyhhLHQpCmlmKHM9PT01OClyZXR1cm4gQy54Qi53KGEsMCx0KSsiJTNBIitDLnhCLkcoYSx0
+KzEpCmlmKHM8PTEyNyl7cj1zPj4+NAppZihyPj04KXJldHVybiBILmsoQy5tSyxyKQpyPShDLm1LW3Jd
+JjE8PChzJjE1KSk9PT0wfWVsc2Ugcj0hMAppZihyKWJyZWFrfXJldHVybiBhfSwKbW46ZnVuY3Rpb24o
+YSl7dmFyIHQscyxyLHE9YS5nRmooKSxwPXEubGVuZ3RoCmlmKHA+MCYmSi5IKHFbMF0pPT09MiYmSi5h
+NihxWzBdLDEpPT09NTgpe2lmKDA+PXApcmV0dXJuIEguayhxLDApClAucmcoSi5hNihxWzBdLDApLCEx
+KQpQLkhOKHEsITEsMSkKdD0hMH1lbHNle1AuSE4ocSwhMSwwKQp0PSExfXM9YS5ndFQoKSYmIXQ/Ilxc
+IjoiIgppZihhLmdjaigpKXtyPWEuZ0pmKGEpCmlmKHIubGVuZ3RoIT09MClzPXMrIlxcIityKyJcXCJ9
+cz1QLnZnKHMscSwiXFwiKQpwPXQmJnA9PT0xP3MrIlxcIjpzCnJldHVybiBwLmNoYXJDb2RlQXQoMCk9
+PTA/cDpwfSwKSWg6ZnVuY3Rpb24oYSxiKXt2YXIgdCxzLHIKZm9yKHQ9MCxzPTA7czwyOysrcyl7cj1D
+LnhCLlcoYSxiK3MpCmlmKDQ4PD1yJiZyPD01Nyl0PXQqMTYrci00OAplbHNle3J8PTMyCmlmKDk3PD1y
+JiZyPD0xMDIpdD10KjE2K3ItODcKZWxzZSB0aHJvdyBILmIoUC54WSgiSW52YWxpZCBVUkwgZW5jb2Rp
+bmciKSl9fXJldHVybiB0fSwKa3U6ZnVuY3Rpb24oYSxiLGMsZCxlKXt2YXIgdCxzLHIscSxwPUouclko
+YSksbz1iCndoaWxlKCEwKXtpZighKG88Yykpe3Q9ITAKYnJlYWt9cz1wLlcoYSxvKQppZihzPD0xMjcp
+aWYocyE9PTM3KXI9ZSYmcz09PTQzCmVsc2Ugcj0hMAplbHNlIHI9ITAKaWYocil7dD0hMQpicmVha30r
+K299aWYodCl7aWYoQy54TSE9PWQpcj0hMQplbHNlIHI9ITAKaWYocilyZXR1cm4gcC53KGEsYixjKQpl
+bHNlIHE9bmV3IEgucWoocC53KGEsYixjKSl9ZWxzZXtxPUguVk0oW10sdS50KQpmb3Iobz1iO288Yzsr
+K28pe3M9cC5XKGEsbykKaWYocz4xMjcpdGhyb3cgSC5iKFAueFkoIklsbGVnYWwgcGVyY2VudCBlbmNv
+ZGluZyBpbiBVUkkiKSkKaWYocz09PTM3KXtpZihvKzM+YS5sZW5ndGgpdGhyb3cgSC5iKFAueFkoIlRy
+dW5jYXRlZCBVUkkiKSkKQy5ObS5pKHEsUC5JaChhLG8rMSkpCm8rPTJ9ZWxzZSBpZihlJiZzPT09NDMp
+Qy5ObS5pKHEsMzIpCmVsc2UgQy5ObS5pKHEscyl9fXUuTC5hKHEpCnJldHVybiBuZXcgUC5HWSghMSku
+V0oocSl9LApFdDpmdW5jdGlvbihhKXt2YXIgdD1hfDMyCnJldHVybiA5Nzw9dCYmdDw9MTIyfSwKS0Q6
+ZnVuY3Rpb24oYSxiLGMpe3ZhciB0LHMscixxLHAsbyxuLG0sbD0iSW52YWxpZCBNSU1FIHR5cGUiLGs9
+SC5WTShbYi0xXSx1LnQpCmZvcih0PWEubGVuZ3RoLHM9YixyPS0xLHE9bnVsbDtzPHQ7KytzKXtxPUMu
+eEIuVyhhLHMpCmlmKHE9PT00NHx8cT09PTU5KWJyZWFrCmlmKHE9PT00Nyl7aWYocjwwKXtyPXMKY29u
+dGludWV9dGhyb3cgSC5iKFAucnIobCxhLHMpKX19aWYocjwwJiZzPmIpdGhyb3cgSC5iKFAucnIobCxh
+LHMpKQpmb3IoO3EhPT00NDspe0MuTm0uaShrLHMpOysrcwpmb3IocD0tMTtzPHQ7KytzKXtxPUMueEIu
+VyhhLHMpCmlmKHE9PT02MSl7aWYocDwwKXA9c31lbHNlIGlmKHE9PT01OXx8cT09PTQ0KWJyZWFrfWlm
+KHA+PTApQy5ObS5pKGsscCkKZWxzZXtvPUMuTm0uZ3JaKGspCmlmKHEhPT00NHx8cyE9PW8rN3x8IUMu
+eEIuUWkoYSwiYmFzZTY0IixvKzEpKXRocm93IEguYihQLnJyKCJFeHBlY3RpbmcgJz0nIixhLHMpKQpi
+cmVha319Qy5ObS5pKGsscykKbj1zKzEKaWYoKGsubGVuZ3RoJjEpPT09MSlhPUMuaDkueXIoYSxuLHQp
+CmVsc2V7bT1QLlVsKGEsbix0LEMuVkMsITApCmlmKG0hPW51bGwpYT1DLnhCLmk3KGEsbix0LG0pfXJl
+dHVybiBuZXcgUC5QRShhLGssYyl9LApLTjpmdW5jdGlvbigpe3ZhciB0PSIwMTIzNDU2Nzg5QUJDREVG
+R0hJSktMTU5PUFFSU1RVVldYWVphYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ei0uX34hJCYnKCkqKyw7
+PSIscz0iLiIscj0iOiIscT0iLyIscD0iPyIsbz0iIyIsbj11LmdjLG09UC5kSCgyMixuZXcgUC5xMygp
+LCEwLG4pLGw9bmV3IFAueUkobSksaz1uZXcgUC5jNigpLGo9bmV3IFAucWQoKSxpPW4uYShsLiQyKDAs
+MjI1KSkKay4kMyhpLHQsMSkKay4kMyhpLHMsMTQpCmsuJDMoaSxyLDM0KQprLiQzKGkscSwzKQprLiQz
+KGkscCwxNzIpCmsuJDMoaSxvLDIwNSkKaT1uLmEobC4kMigxNCwyMjUpKQprLiQzKGksdCwxKQprLiQz
+KGkscywxNSkKay4kMyhpLHIsMzQpCmsuJDMoaSxxLDIzNCkKay4kMyhpLHAsMTcyKQprLiQzKGksbywy
+MDUpCmk9bi5hKGwuJDIoMTUsMjI1KSkKay4kMyhpLHQsMSkKay4kMyhpLCIlIiwyMjUpCmsuJDMoaSxy
+LDM0KQprLiQzKGkscSw5KQprLiQzKGkscCwxNzIpCmsuJDMoaSxvLDIwNSkKaT1uLmEobC4kMigxLDIy
+NSkpCmsuJDMoaSx0LDEpCmsuJDMoaSxyLDM0KQprLiQzKGkscSwxMCkKay4kMyhpLHAsMTcyKQprLiQz
+KGksbywyMDUpCmk9bi5hKGwuJDIoMiwyMzUpKQprLiQzKGksdCwxMzkpCmsuJDMoaSxxLDEzMSkKay4k
+MyhpLHMsMTQ2KQprLiQzKGkscCwxNzIpCmsuJDMoaSxvLDIwNSkKaT1uLmEobC4kMigzLDIzNSkpCmsu
+JDMoaSx0LDExKQprLiQzKGkscSw2OCkKay4kMyhpLHMsMTgpCmsuJDMoaSxwLDE3MikKay4kMyhpLG8s
+MjA1KQppPW4uYShsLiQyKDQsMjI5KSkKay4kMyhpLHQsNSkKai4kMyhpLCJBWiIsMjI5KQprLiQzKGks
+ciwxMDIpCmsuJDMoaSwiQCIsNjgpCmsuJDMoaSwiWyIsMjMyKQprLiQzKGkscSwxMzgpCmsuJDMoaSxw
+LDE3MikKay4kMyhpLG8sMjA1KQppPW4uYShsLiQyKDUsMjI5KSkKay4kMyhpLHQsNSkKai4kMyhpLCJB
+WiIsMjI5KQprLiQzKGksciwxMDIpCmsuJDMoaSwiQCIsNjgpCmsuJDMoaSxxLDEzOCkKay4kMyhpLHAs
+MTcyKQprLiQzKGksbywyMDUpCmk9bi5hKGwuJDIoNiwyMzEpKQpqLiQzKGksIjE5Iiw3KQprLiQzKGks
+IkAiLDY4KQprLiQzKGkscSwxMzgpCmsuJDMoaSxwLDE3MikKay4kMyhpLG8sMjA1KQppPW4uYShsLiQy
+KDcsMjMxKSkKai4kMyhpLCIwOSIsNykKay4kMyhpLCJAIiw2OCkKay4kMyhpLHEsMTM4KQprLiQzKGks
+cCwxNzIpCmsuJDMoaSxvLDIwNSkKay4kMyhuLmEobC4kMig4LDgpKSwiXSIsNSkKaT1uLmEobC4kMig5
+LDIzNSkpCmsuJDMoaSx0LDExKQprLiQzKGkscywxNikKay4kMyhpLHEsMjM0KQprLiQzKGkscCwxNzIp
+CmsuJDMoaSxvLDIwNSkKaT1uLmEobC4kMigxNiwyMzUpKQprLiQzKGksdCwxMSkKay4kMyhpLHMsMTcp
+CmsuJDMoaSxxLDIzNCkKay4kMyhpLHAsMTcyKQprLiQzKGksbywyMDUpCmk9bi5hKGwuJDIoMTcsMjM1
+KSkKay4kMyhpLHQsMTEpCmsuJDMoaSxxLDkpCmsuJDMoaSxwLDE3MikKay4kMyhpLG8sMjA1KQppPW4u
+YShsLiQyKDEwLDIzNSkpCmsuJDMoaSx0LDExKQprLiQzKGkscywxOCkKay4kMyhpLHEsMjM0KQprLiQz
+KGkscCwxNzIpCmsuJDMoaSxvLDIwNSkKaT1uLmEobC4kMigxOCwyMzUpKQprLiQzKGksdCwxMSkKay4k
+MyhpLHMsMTkpCmsuJDMoaSxxLDIzNCkKay4kMyhpLHAsMTcyKQprLiQzKGksbywyMDUpCmk9bi5hKGwu
+JDIoMTksMjM1KSkKay4kMyhpLHQsMTEpCmsuJDMoaSxxLDIzNCkKay4kMyhpLHAsMTcyKQprLiQzKGks
+bywyMDUpCmk9bi5hKGwuJDIoMTEsMjM1KSkKay4kMyhpLHQsMTEpCmsuJDMoaSxxLDEwKQprLiQzKGks
+cCwxNzIpCmsuJDMoaSxvLDIwNSkKaT1uLmEobC4kMigxMiwyMzYpKQprLiQzKGksdCwxMikKay4kMyhp
+LHAsMTIpCmsuJDMoaSxvLDIwNSkKaT1uLmEobC4kMigxMywyMzcpKQprLiQzKGksdCwxMykKay4kMyhp
+LHAsMTMpCmouJDMobi5hKGwuJDIoMjAsMjQ1KSksImF6IiwyMSkKbD1uLmEobC4kMigyMSwyNDUpKQpq
+LiQzKGwsImF6IiwyMSkKai4kMyhsLCIwOSIsMjEpCmsuJDMobCwiKy0uIiwyMSkKcmV0dXJuIG19LApV
+QjpmdW5jdGlvbihhLGIsYyxkLGUpe3ZhciB0LHMscixxLHAsbz0kLnZaKCkKZm9yKHQ9Si5yWShhKSxz
+PWI7czxjOysrcyl7aWYoZDwwfHxkPj1vLmxlbmd0aClyZXR1cm4gSC5rKG8sZCkKcj1vW2RdCnE9dC5X
+KGEscyleOTYKaWYocT45NSlxPTMxCmlmKHE+PXIubGVuZ3RoKXJldHVybiBILmsocixxKQpwPXJbcV0K
+ZD1wJjMxCkMuTm0uWShlLHA+Pj41LHMpfXJldHVybiBkfSwKV0Y6ZnVuY3Rpb24gV0YoYSxiKXt0aGlz
+LmE9YQp0aGlzLmI9Yn0sCmEyOmZ1bmN0aW9uIGEyKCl7fSwKaVA6ZnVuY3Rpb24gaVAoYSxiKXt0aGlz
+LmE9YQp0aGlzLmI9Yn0sCkNQOmZ1bmN0aW9uIENQKCl7fSwKWFM6ZnVuY3Rpb24gWFMoKXt9LApDNjpm
+dW5jdGlvbiBDNihhKXt0aGlzLmE9YX0sCkxLOmZ1bmN0aW9uIExLKCl7fSwKQVQ6ZnVuY3Rpb24gQVQo
+YSxiLGMsZCl7dmFyIF89dGhpcwpfLmE9YQpfLmI9YgpfLmM9YwpfLmQ9ZH0sCmJKOmZ1bmN0aW9uIGJK
+KGEsYixjLGQsZSxmKXt2YXIgXz10aGlzCl8uZT1hCl8uZj1iCl8uYT1jCl8uYj1kCl8uYz1lCl8uZD1m
+fSwKZVk6ZnVuY3Rpb24gZVkoYSxiLGMsZCxlKXt2YXIgXz10aGlzCl8uZj1hCl8uYT1iCl8uYj1jCl8u
+Yz1kCl8uZD1lfSwKbXA6ZnVuY3Rpb24gbXAoYSxiLGMsZCl7dmFyIF89dGhpcwpfLmE9YQpfLmI9Ygpf
+LmM9YwpfLmQ9ZH0sCnViOmZ1bmN0aW9uIHViKGEpe3RoaXMuYT1hfSwKZHM6ZnVuY3Rpb24gZHMoYSl7
+dGhpcy5hPWF9LApsajpmdW5jdGlvbiBsaihhKXt0aGlzLmE9YX0sClVWOmZ1bmN0aW9uIFVWKGEpe3Ro
+aXMuYT1hfSwKazU6ZnVuY3Rpb24gazUoKXt9LApLWTpmdW5jdGlvbiBLWSgpe30sCnQ3OmZ1bmN0aW9u
+IHQ3KGEpe3RoaXMuYT1hfSwKQ0Q6ZnVuY3Rpb24gQ0QoYSl7dGhpcy5hPWF9LAphRTpmdW5jdGlvbiBh
+RShhLGIsYyl7dGhpcy5hPWEKdGhpcy5iPWIKdGhpcy5jPWN9LApFSDpmdW5jdGlvbiBFSCgpe30sCklm
+OmZ1bmN0aW9uIElmKCl7fSwKY1g6ZnVuY3Rpb24gY1goKXt9LApBbjpmdW5jdGlvbiBBbigpe30sCnpN
+OmZ1bmN0aW9uIHpNKCl7fSwKWjA6ZnVuY3Rpb24gWjAoKXt9LApOMzpmdW5jdGlvbiBOMyhhLGIsYyl7
+dGhpcy5hPWEKdGhpcy5iPWIKdGhpcy4kdGk9Y30sCmM4OmZ1bmN0aW9uIGM4KCl7fSwKbGY6ZnVuY3Rp
+b24gbGYoKXt9LApNaDpmdW5jdGlvbiBNaCgpe30sCk9kOmZ1bmN0aW9uIE9kKCl7fSwKaWI6ZnVuY3Rp
+b24gaWIoKXt9LAp4dTpmdW5jdGlvbiB4dSgpe30sCkd6OmZ1bmN0aW9uIEd6KCl7fSwKWmQ6ZnVuY3Rp
+b24gWmQoKXt9LApxVTpmdW5jdGlvbiBxVSgpe30sClJuOmZ1bmN0aW9uIFJuKGEpe3RoaXMuYT1hfSwK
+R0Q6ZnVuY3Rpb24gR0QoKXt9LApuMTpmdW5jdGlvbiBuMShhKXt0aGlzLmE9YX0sCmNTOmZ1bmN0aW9u
+IGNTKGEpe3RoaXMuYT1hfSwKVkM6ZnVuY3Rpb24gVkMoYSl7dGhpcy5hPWF9LApKVDpmdW5jdGlvbiBK
+VChhLGIpe3RoaXMuYT1hCnRoaXMuYj1ifSwKRG46ZnVuY3Rpb24gRG4oYSxiLGMsZCxlLGYsZyl7dmFy
+IF89dGhpcwpfLmE9YQpfLmI9YgpfLmM9YwpfLmQ9ZApfLmU9ZQpfLmY9ZgpfLnI9ZwpfLlE9Xy56PV8u
+eT1fLng9bnVsbH0sCmUxOmZ1bmN0aW9uIGUxKGEsYil7dGhpcy5hPWEKdGhpcy5iPWJ9LApOWTpmdW5j
+dGlvbiBOWShhKXt0aGlzLmE9YX0sClJaOmZ1bmN0aW9uIFJaKCl7fSwKTUU6ZnVuY3Rpb24gTUUoYSxi
+KXt0aGlzLmE9YQp0aGlzLmI9Yn0sCnk1OmZ1bmN0aW9uIHk1KGEpe3RoaXMuYT1hfSwKUEU6ZnVuY3Rp
+b24gUEUoYSxiLGMpe3RoaXMuYT1hCnRoaXMuYj1iCnRoaXMuYz1jfSwKcTM6ZnVuY3Rpb24gcTMoKXt9
+LAp5STpmdW5jdGlvbiB5SShhKXt0aGlzLmE9YX0sCmM2OmZ1bmN0aW9uIGM2KCl7fSwKcWQ6ZnVuY3Rp
+b24gcWQoKXt9LApVZjpmdW5jdGlvbiBVZihhLGIsYyxkLGUsZixnLGgpe3ZhciBfPXRoaXMKXy5hPWEK
+Xy5iPWIKXy5jPWMKXy5kPWQKXy5lPWUKXy5mPWYKXy5yPWcKXy54PWgKXy55PW51bGx9LApxZTpmdW5j
+dGlvbiBxZShhLGIsYyxkLGUsZixnKXt2YXIgXz10aGlzCl8uYT1hCl8uYj1iCl8uYz1jCl8uZD1kCl8u
+ZT1lCl8uZj1mCl8ucj1nCl8uUT1fLno9Xy55PV8ueD1udWxsfSwKaUo6ZnVuY3Rpb24gaUooKXt9LApq
+ZzpmdW5jdGlvbiBqZyhhLGIpe3RoaXMuYT1hCnRoaXMuYj1ifSwKVGE6ZnVuY3Rpb24gVGEoYSxiKXt0
+aGlzLmE9YQp0aGlzLmI9Yn0sCkJmOmZ1bmN0aW9uIEJmKGEsYil7dGhpcy5hPWEKdGhpcy5iPWJ9LApB
+czpmdW5jdGlvbiBBcygpe30sCkdFOmZ1bmN0aW9uIEdFKGEpe3RoaXMuYT1hfSwKTjc6ZnVuY3Rpb24g
+TjcoYSxiKXt0aGlzLmE9YQp0aGlzLmI9Yn0sCnVROmZ1bmN0aW9uIHVRKCl7fSwKaEY6ZnVuY3Rpb24g
+aEYoKXt9LApSNDpmdW5jdGlvbihhLGIsYyxkKXt2YXIgdCxzLHIKSC5FOShiKQp1LmouYShkKQppZihI
+Lm9UKGIpKXt0PVtjXQpDLk5tLkZWKHQsZCkKZD10fXM9dS56CnI9UC5DSChKLk0xKGQsUC53MCgpLHMp
+LCEwLHMpCnUuWi5hKGEpCnJldHVybiBQLndZKEguRWsoYSxyLG51bGwpKX0sCkRtOmZ1bmN0aW9uKGEs
+YixjKXt2YXIgdAp0cnl7aWYoT2JqZWN0LmlzRXh0ZW5zaWJsZShhKSYmIU9iamVjdC5wcm90b3R5cGUu
+aGFzT3duUHJvcGVydHkuY2FsbChhLGIpKXtPYmplY3QuZGVmaW5lUHJvcGVydHkoYSxiLHt2YWx1ZTpj
+fSkKcmV0dXJuITB9fWNhdGNoKHQpe0guUnUodCl9cmV0dXJuITF9LApPbTpmdW5jdGlvbihhLGIpe2lm
+KE9iamVjdC5wcm90b3R5cGUuaGFzT3duUHJvcGVydHkuY2FsbChhLGIpKXJldHVybiBhW2JdCnJldHVy
+biBudWxsfSwKd1k6ZnVuY3Rpb24oYSl7aWYoYT09bnVsbHx8dHlwZW9mIGE9PSJzdHJpbmcifHx0eXBl
+b2YgYT09Im51bWJlciJ8fEguclEoYSkpcmV0dXJuIGEKaWYoYSBpbnN0YW5jZW9mIFAuRTQpcmV0dXJu
+IGEuYQppZihILlI5KGEpKXJldHVybiBhCmlmKHUudy5iKGEpKXJldHVybiBhCmlmKGEgaW5zdGFuY2Vv
+ZiBQLmlQKXJldHVybiBILm8yKGEpCmlmKHUuWi5iKGEpKXJldHVybiBQLmhFKGEsIiRkYXJ0X2pzRnVu
+Y3Rpb24iLG5ldyBQLlBDKCkpCnJldHVybiBQLmhFKGEsIl8kZGFydF9qc09iamVjdCIsbmV3IFAubXQo
+JC5rSSgpKSl9LApoRTpmdW5jdGlvbihhLGIsYyl7dmFyIHQ9UC5PbShhLGIpCmlmKHQ9PW51bGwpe3Q9
+Yy4kMShhKQpQLkRtKGEsYix0KX1yZXR1cm4gdH0sCkw3OmZ1bmN0aW9uKGEpe3ZhciB0LHMKaWYoYT09
+bnVsbHx8dHlwZW9mIGE9PSJzdHJpbmcifHx0eXBlb2YgYT09Im51bWJlciJ8fHR5cGVvZiBhPT0iYm9v
+bGVhbiIpcmV0dXJuIGEKZWxzZSBpZihhIGluc3RhbmNlb2YgT2JqZWN0JiZILlI5KGEpKXJldHVybiBh
+CmVsc2UgaWYoYSBpbnN0YW5jZW9mIE9iamVjdCYmdS53LmIoYSkpcmV0dXJuIGEKZWxzZSBpZihhIGlu
+c3RhbmNlb2YgRGF0ZSl7dD1ILldZKGEuZ2V0VGltZSgpKQppZihNYXRoLmFicyh0KTw9ODY0ZTEzKXM9
+ITEKZWxzZSBzPSEwCmlmKHMpSC52aChQLnhZKCJEYXRlVGltZSBpcyBvdXRzaWRlIHZhbGlkIHJhbmdl
+OiAiK3QpKQpQLlVJKCExLCJpc1V0YyIsdS55KQpyZXR1cm4gbmV3IFAuaVAodCwhMSl9ZWxzZSBpZihh
+LmNvbnN0cnVjdG9yPT09JC5rSSgpKXJldHVybiBhLm8KZWxzZSByZXR1cm4gUC5ORChhKX0sCk5EOmZ1
+bmN0aW9uKGEpe2lmKHR5cGVvZiBhPT0iZnVuY3Rpb24iKXJldHVybiBQLmlRKGEsJC53USgpLG5ldyBQ
+Lk56KCkpCmlmKGEgaW5zdGFuY2VvZiBBcnJheSlyZXR1cm4gUC5pUShhLCQuQ3IoKSxuZXcgUC5ucCgp
+KQpyZXR1cm4gUC5pUShhLCQuQ3IoKSxuZXcgUC5VdCgpKX0sCmlROmZ1bmN0aW9uKGEsYixjKXt2YXIg
+dD1QLk9tKGEsYikKaWYodD09bnVsbHx8IShhIGluc3RhbmNlb2YgT2JqZWN0KSl7dD1jLiQxKGEpClAu
+RG0oYSxiLHQpfXJldHVybiB0fSwKUEM6ZnVuY3Rpb24gUEMoKXt9LAptdDpmdW5jdGlvbiBtdChhKXt0
+aGlzLmE9YX0sCk56OmZ1bmN0aW9uIE56KCl7fSwKbnA6ZnVuY3Rpb24gbnAoKXt9LApVdDpmdW5jdGlv
+biBVdCgpe30sCkU0OmZ1bmN0aW9uIEU0KGEpe3RoaXMuYT1hfSwKcjc6ZnVuY3Rpb24gcjcoYSl7dGhp
+cy5hPWF9LApUejpmdW5jdGlvbiBUeihhLGIpe3RoaXMuYT1hCnRoaXMuJHRpPWJ9LApjbzpmdW5jdGlv
+biBjbygpe30sCm5kOmZ1bmN0aW9uIG5kKCl7fSwKS2U6ZnVuY3Rpb24gS2UoYSl7dGhpcy5hPWF9LApk
+NTpmdW5jdGlvbiBkNSgpe30sCm42OmZ1bmN0aW9uIG42KCl7fX0sVz17CngzOmZ1bmN0aW9uKCl7cmV0
+dXJuIHdpbmRvd30sClpyOmZ1bmN0aW9uKCl7cmV0dXJuIGRvY3VtZW50fSwKVTk6ZnVuY3Rpb24oYSxi
+LGMpe3ZhciB0PWRvY3VtZW50LmJvZHkscz0odCYmQy5SWSkucjYodCxhLGIsYykKcy50b1N0cmluZwp0
+PXUuYWMKdD1uZXcgSC5VNShuZXcgVy5lNyhzKSx0LkMoImEyKGxELkUpIikuYShuZXcgVy5DdigpKSx0
+LkMoIlU1PGxELkU+IikpCnJldHVybiB1LmguYSh0LmdyOCh0KSl9LApyUzpmdW5jdGlvbihhKXt2YXIg
+dCxzLHI9ImVsZW1lbnQgdGFnIHVuYXZhaWxhYmxlIgp0cnl7dD1KLlJFKGEpCmlmKHR5cGVvZiB0Lmdu
+cyhhKT09InN0cmluZyIpcj10LmducyhhKX1jYXRjaChzKXtILlJ1KHMpfXJldHVybiByfSwKcUQ6ZnVu
+Y3Rpb24oYSxiLGMpe3ZhciB0LHMscixxPW5ldyBQLnZzKCQuWDMsdS5hbykscD1uZXcgUC5aZihxLHUu
+YmopLG89bmV3IFhNTEh0dHBSZXF1ZXN0KCkKQy5EdC5lbyhvLGI9PW51bGw/IkdFVCI6YixhLCEwKQpj
+LksoMCxuZXcgVy5iVShvKSkKdD11LmFuCnM9dC5hKG5ldyBXLmhIKG8scCkpCnUuTS5hKG51bGwpCnI9
+dS5wClcuSkUobywibG9hZCIscywhMSxyKQpXLkpFKG8sImVycm9yIix0LmEocC5nWUooKSksITEscikK
+by5zZW5kKCkKcmV0dXJuIHF9LApDMDpmdW5jdGlvbihhLGIpe2E9NTM2ODcwOTExJmErYgphPTUzNjg3
+MDkxMSZhKygoNTI0Mjg3JmEpPDwxMCkKcmV0dXJuIGFeYT4+PjZ9LApyRTpmdW5jdGlvbihhLGIsYyxk
+KXt2YXIgdD1XLkMwKFcuQzAoVy5DMChXLkMwKDAsYSksYiksYyksZCkscz01MzY4NzA5MTEmdCsoKDY3
+MTA4ODYzJnQpPDwzKQpzXj1zPj4+MTEKcmV0dXJuIDUzNjg3MDkxMSZzKygoMTYzODMmcyk8PDE1KX0s
+ClROOmZ1bmN0aW9uKGEsYil7dmFyIHQscyxyPWEuY2xhc3NMaXN0CmZvcih0PWIubGVuZ3RoLHM9MDtz
+PGIubGVuZ3RoO2IubGVuZ3RoPT09dHx8KDAsSC5saykoYiksKytzKXIuYWRkKGJbc10pfSwKSkU6ZnVu
+Y3Rpb24oYSxiLGMsZCxlKXt2YXIgdD1XLmFGKG5ldyBXLnZOKGMpLHUuQikKaWYodCE9bnVsbCYmITAp
+Si5kWihhLGIsdCwhMSkKcmV0dXJuIG5ldyBXLnhDKGEsYix0LCExLGUuQygieEM8MD4iKSl9LApUdzpm
+dW5jdGlvbihhKXt2YXIgdD1kb2N1bWVudC5jcmVhdGVFbGVtZW50KCJhIikscz1uZXcgVy5tayh0LHdp
+bmRvdy5sb2NhdGlvbikKcz1uZXcgVy5KUShzKQpzLkNZKGEpCnJldHVybiBzfSwKeVc6ZnVuY3Rpb24o
+YSxiLGMsZCl7dS5oLmEoYSkKSC5jKGIpCkguYyhjKQp1Lk8uYShkKQpyZXR1cm4hMH0sClFXOmZ1bmN0
+aW9uKGEsYixjLGQpe3ZhciB0LHMscgp1LmguYShhKQpILmMoYikKSC5jKGMpCnQ9dS5PLmEoZCkuYQpz
+PXQuYQpzLmhyZWY9YwpyPXMuaG9zdG5hbWUKdD10LmIKaWYoIShyPT10Lmhvc3RuYW1lJiZzLnBvcnQ9
+PXQucG9ydCYmcy5wcm90b2NvbD09dC5wcm90b2NvbCkpaWYocj09PSIiKWlmKHMucG9ydD09PSIiKXt0
+PXMucHJvdG9jb2wKdD10PT09IjoifHx0PT09IiJ9ZWxzZSB0PSExCmVsc2UgdD0hMQplbHNlIHQ9ITAK
+cmV0dXJuIHR9LApCbDpmdW5jdGlvbigpe3ZhciB0PXUuTixzPVAudE0oQy5ReCx0KSxyPXUuZEcuYShu
+ZXcgVy5JQSgpKSxxPUguVk0oWyJURU1QTEFURSJdLHUucykKdD1uZXcgVy5jdChzLFAuTHModCksUC5M
+cyh0KSxQLkxzKHQpLG51bGwpCnQuQ1kobnVsbCxuZXcgSC5sSihDLlF4LHIsdS5kdikscSxudWxsKQpy
+ZXR1cm4gdH0sClB2OmZ1bmN0aW9uKGEpe2lmKGE9PW51bGwpcmV0dXJuIG51bGwKcmV0dXJuIFcuUDEo
+YSl9LApxYzpmdW5jdGlvbihhKXt2YXIgdAppZihhPT1udWxsKXJldHVybiBudWxsCmlmKCJwb3N0TWVz
+c2FnZSIgaW4gYSl7dD1XLlAxKGEpCnJldHVybiB0fWVsc2UgcmV0dXJuIHUuYVMuYShhKX0sClAxOmZ1
+bmN0aW9uKGEpe2lmKGE9PT13aW5kb3cpcmV0dXJuIHUuY2kuYShhKQplbHNlIHJldHVybiBuZXcgVy5k
+VyhhKX0sCnpYOmZ1bmN0aW9uKGEpe2lmKGE9PT13aW5kb3cubG9jYXRpb24pcmV0dXJuIGEKZWxzZSBy
+ZXR1cm4gbmV3IFcuRmIoKX0sCmFGOmZ1bmN0aW9uKGEsYil7dmFyIHQ9JC5YMwppZih0PT09Qy5OVSly
+ZXR1cm4gYQpyZXR1cm4gdC5QeShhLGIpfSwKcUU6ZnVuY3Rpb24gcUUoKXt9LApHaDpmdW5jdGlvbiBH
+aCgpe30sCmZZOmZ1bmN0aW9uIGZZKCl7fSwKbkI6ZnVuY3Rpb24gbkIoKXt9LApBejpmdW5jdGlvbiBB
+eigpe30sClFQOmZ1bmN0aW9uIFFQKCl7fSwKbng6ZnVuY3Rpb24gbngoKXt9LApvSjpmdW5jdGlvbiBv
+Sigpe30sCmlkOmZ1bmN0aW9uIGlkKCl7fSwKUUY6ZnVuY3Rpb24gUUYoKXt9LApOaDpmdW5jdGlvbiBO
+aCgpe30sCklCOmZ1bmN0aW9uIElCKCl7fSwKbjc6ZnVuY3Rpb24gbjcoKXt9LAp3ejpmdW5jdGlvbiB3
+eihhLGIpe3RoaXMuYT1hCnRoaXMuJHRpPWJ9LApjdjpmdW5jdGlvbiBjdigpe30sCkN2OmZ1bmN0aW9u
+IEN2KCl7fSwKZWE6ZnVuY3Rpb24gZWEoKXt9LApEMDpmdW5jdGlvbiBEMCgpe30sClQ1OmZ1bmN0aW9u
+IFQ1KCl7fSwKaDQ6ZnVuY3Rpb24gaDQoKXt9LApicjpmdW5jdGlvbiBicigpe30sClZiOmZ1bmN0aW9u
+IFZiKCl7fSwKZko6ZnVuY3Rpb24gZkooKXt9LApiVTpmdW5jdGlvbiBiVShhKXt0aGlzLmE9YX0sCmhI
+OmZ1bmN0aW9uIGhIKGEsYil7dGhpcy5hPWEKdGhpcy5iPWJ9LAp3YTpmdW5jdGlvbiB3YSgpe30sClNn
+OmZ1bmN0aW9uIFNnKCl7fSwKdTg6ZnVuY3Rpb24gdTgoKXt9LApPSzpmdW5jdGlvbiBPSygpe30sCmU3
+OmZ1bmN0aW9uIGU3KGEpe3RoaXMuYT1hfSwKdUg6ZnVuY3Rpb24gdUgoKXt9LApCSDpmdW5jdGlvbiBC
+SCgpe30sClNOOmZ1bmN0aW9uIFNOKCl7fSwKZXc6ZnVuY3Rpb24gZXcoKXt9LApscDpmdW5jdGlvbiBs
+cCgpe30sClRiOmZ1bmN0aW9uIFRiKCl7fSwKSXY6ZnVuY3Rpb24gSXYoKXt9LApCVDpmdW5jdGlvbiBC
+VCgpe30sCnlZOmZ1bmN0aW9uIHlZKCl7fSwKdzY6ZnVuY3Rpb24gdzYoKXt9LApLNTpmdW5jdGlvbiBL
+NSgpe30sCkNtOmZ1bmN0aW9uIENtKCl7fSwKQ1E6ZnVuY3Rpb24gQ1EoKXt9LAp3NDpmdW5jdGlvbiB3
+NCgpe30sCnJoOmZ1bmN0aW9uIHJoKCl7fSwKY2Y6ZnVuY3Rpb24gY2YoKXt9LAppNzpmdW5jdGlvbiBp
+NyhhKXt0aGlzLmE9YX0sClN5OmZ1bmN0aW9uIFN5KGEpe3RoaXMuYT1hfSwKS1M6ZnVuY3Rpb24gS1Mo
+YSxiKXt0aGlzLmE9YQp0aGlzLmI9Yn0sCkEzOmZ1bmN0aW9uIEEzKGEsYil7dGhpcy5hPWEKdGhpcy5i
+PWJ9LApJNDpmdW5jdGlvbiBJNChhKXt0aGlzLmE9YX0sCkZrOmZ1bmN0aW9uIEZrKGEsYil7dGhpcy5h
+PWEKdGhpcy4kdGk9Yn0sClJPOmZ1bmN0aW9uIFJPKGEsYixjLGQpe3ZhciBfPXRoaXMKXy5hPWEKXy5i
+PWIKXy5jPWMKXy4kdGk9ZH0sCmV1OmZ1bmN0aW9uIGV1KGEsYixjLGQpe3ZhciBfPXRoaXMKXy5hPWEK
+Xy5iPWIKXy5jPWMKXy4kdGk9ZH0sCnhDOmZ1bmN0aW9uIHhDKGEsYixjLGQsZSl7dmFyIF89dGhpcwpf
+LmI9YQpfLmM9YgpfLmQ9YwpfLmU9ZApfLiR0aT1lfSwKdk46ZnVuY3Rpb24gdk4oYSl7dGhpcy5hPWF9
+LApKUTpmdW5jdGlvbiBKUShhKXt0aGlzLmE9YX0sCkdtOmZ1bmN0aW9uIEdtKCl7fSwKdkQ6ZnVuY3Rp
+b24gdkQoYSl7dGhpcy5hPWF9LApVdjpmdW5jdGlvbiBVdihhKXt0aGlzLmE9YX0sCkVnOmZ1bmN0aW9u
+IEVnKGEsYixjKXt0aGlzLmE9YQp0aGlzLmI9Ygp0aGlzLmM9Y30sCm02OmZ1bmN0aW9uIG02KCl7fSwK
+RW86ZnVuY3Rpb24gRW8oKXt9LApXazpmdW5jdGlvbiBXaygpe30sCmN0OmZ1bmN0aW9uIGN0KGEsYixj
+LGQsZSl7dmFyIF89dGhpcwpfLmU9YQpfLmE9YgpfLmI9YwpfLmM9ZApfLmQ9ZX0sCklBOmZ1bmN0aW9u
+IElBKCl7fSwKT3c6ZnVuY3Rpb24gT3coKXt9LApXOTpmdW5jdGlvbiBXOShhLGIsYyl7dmFyIF89dGhp
+cwpfLmE9YQpfLmI9YgpfLmM9LTEKXy5kPW51bGwKXy4kdGk9Y30sCmRXOmZ1bmN0aW9uIGRXKGEpe3Ro
+aXMuYT1hfSwKRmI6ZnVuY3Rpb24gRmIoKXt9LAprRjpmdW5jdGlvbiBrRigpe30sCm1rOmZ1bmN0aW9u
+IG1rKGEsYil7dGhpcy5hPWEKdGhpcy5iPWJ9LApLbzpmdW5jdGlvbiBLbyhhKXt0aGlzLmE9YQp0aGlz
+LmI9ITF9LApmbTpmdW5jdGlvbiBmbShhKXt0aGlzLmE9YX0sCkxlOmZ1bmN0aW9uIExlKCl7fSwKSzc6
+ZnVuY3Rpb24gSzcoKXt9LApyQjpmdW5jdGlvbiByQigpe30sClhXOmZ1bmN0aW9uIFhXKCl7fSwKb2E6
+ZnVuY3Rpb24gb2EoKXt9fSxVPXsKeXU6ZnVuY3Rpb24oYSl7dmFyIHQscyxyLHEscCxvLG49SC5WTShb
+XSx1LmJQKQpmb3IodD1KLlU2KGEpLHM9Si5JVCh1LlIuYSh0LnEoYSwiZGV0YWlscyIpKSk7cy5GKCk7
+KXtyPXMuZ2woKQpxPUouVTYocikKcD1ILmMocS5xKHIsImRlc2NyaXB0aW9uIikpCnE9cS5xKHIsImxp
+bmsiKQppZihxPT1udWxsKXE9bnVsbAplbHNle289Si5VNihxKQpxPW5ldyBVLk1sKEguYyhvLnEocSwi
+aHJlZiIpKSxILldZKG8ucShxLCJsaW5lIikpLEguYyhvLnEocSwicGF0aCIpKSl9Qy5ObS5pKG4sbmV3
+IFUudUYocCxxKSl9cmV0dXJuIG5ldyBVLmQyKG4sVS5qZih0LnEoYSwiZWRpdHMiKSksSC5jKHQucShh
+LCJleHBsYW5hdGlvbiIpKSxILldZKHQucShhLCJsaW5lIikpLEguYyh0LnEoYSwicGF0aCIpKSxVLk5k
+KHQucShhLCJ0cmFjZXMiKSkpfSwKamY6ZnVuY3Rpb24oYSl7dmFyIHQscyxyLHEKaWYoYT09bnVsbCl0
+PW51bGwKZWxzZXt0PUguVk0oW10sdS5mQSkKZm9yKHM9Si5JVCh1LlIuYShhKSk7cy5GKCk7KXtyPXMu
+Z2woKQpxPUouVTYocikKQy5ObS5pKHQsbmV3IFUuU2UoSC5jKHEucShyLCJkZXNjcmlwdGlvbiIpKSxI
+LmMocS5xKHIsImhyZWYiKSkpKX19cmV0dXJuIHR9LApOZDpmdW5jdGlvbihhKXt2YXIgdCxzCmlmKGE9
+PW51bGwpdD1udWxsCmVsc2V7dD1ILlZNKFtdLHUuaGgpCmZvcihzPUouSVQodS5SLmEoYSkpO3MuRigp
+OylDLk5tLmkodCxVLkpqKHMuZ2woKSkpfXJldHVybiB0fSwKSmo6ZnVuY3Rpb24oYSl7dmFyIHQscyxy
+LHEscCxvPSJkZXNjcmlwdGlvbiIsbj1KLlU2KGEpLG09SC5jKG4ucShhLG8pKSxsPUguVk0oW10sdS5h
+SikKZm9yKG49Si5JVCh1LlIuYShuLnEoYSwiZW50cmllcyIpKSk7bi5GKCk7KXt0PW4uZ2woKQpzPUou
+VTYodCkKcj1ILmMocy5xKHQsbykpCnE9SC5jKHMucSh0LCJmdW5jdGlvbiIpKQpzPXMucSh0LCJsaW5r
+IikKaWYocz09bnVsbClzPW51bGwKZWxzZXtwPUouVTYocykKcz1uZXcgVS5NbChILmMocC5xKHMsImhy
+ZWYiKSksSC5XWShwLnEocywibGluZSIpKSxILmMocC5xKHMsInBhdGgiKSkpfUMuTm0uaShsLG5ldyBV
+LndiKHIscSxzKSl9cmV0dXJuIG5ldyBVLnlEKG0sbCl9LApkMjpmdW5jdGlvbiBkMihhLGIsYyxkLGUs
+Zil7dmFyIF89dGhpcwpfLmE9YQpfLmI9YgpfLmM9YwpfLmQ9ZApfLmU9ZQpfLmY9Zn0sClNlOmZ1bmN0
+aW9uIFNlKGEsYil7dGhpcy5hPWEKdGhpcy5iPWJ9LAp1RjpmdW5jdGlvbiB1RihhLGIpe3RoaXMuYT1h
+CnRoaXMuYj1ifSwKTWw6ZnVuY3Rpb24gTWwoYSxiLGMpe3RoaXMuYT1hCnRoaXMuYj1iCnRoaXMuYz1j
+fSwKeUQ6ZnVuY3Rpb24geUQoYSxiKXt0aGlzLmE9YQp0aGlzLmI9Yn0sCndiOmZ1bmN0aW9uIHdiKGEs
+YixjKXt0aGlzLmE9YQp0aGlzLmI9Ygp0aGlzLmM9Y319LEI9ewpZZjpmdW5jdGlvbihhKXt2YXIgdCxz
+LHIscT1ILmMoYS5xKDAsInJlZ2lvbnMiKSkscD1ILmMoYS5xKDAsIm5hdmlnYXRpb25Db250ZW50Iikp
+LG89SC5jKGEucSgwLCJzb3VyY2VDb2RlIikpLG49SC5WTShbXSx1LnUpCmZvcih0PUouSVQodS5SLmEo
+YS5xKDAsImVkaXRzIikpKTt0LkYoKTspe3M9dC5nbCgpCnI9Si5VNihzKQpDLk5tLmkobixuZXcgQi5q
+OChILldZKHIucShzLCJsaW5lIikpLEguYyhyLnEocywiZXhwbGFuYXRpb24iKSksSC5XWShyLnEocywi
+b2Zmc2V0IikpKSl9cmV0dXJuIG5ldyBCLnFwKHEscCxvLG4pfSwKajg6ZnVuY3Rpb24gajgoYSxiLGMp
+e3RoaXMuYT1hCnRoaXMuYj1iCnRoaXMuYz1jfSwKcXA6ZnVuY3Rpb24gcXAoYSxiLGMsZCl7dmFyIF89
+dGhpcwpfLmE9YQpfLmI9YgpfLmM9YwpfLmQ9ZH0sCkx1OmZ1bmN0aW9uIEx1KCl7fSwKT1M6ZnVuY3Rp
+b24oYSl7dmFyIHQKaWYoIShhPj02NSYmYTw9OTApKXQ9YT49OTcmJmE8PTEyMgplbHNlIHQ9ITAKcmV0
+dXJuIHR9LApZdTpmdW5jdGlvbihhLGIpe3ZhciB0PWEubGVuZ3RoLHM9YisyCmlmKHQ8cylyZXR1cm4h
+MQppZighQi5PUyhDLnhCLm0oYSxiKSkpcmV0dXJuITEKaWYoQy54Qi5tKGEsYisxKSE9PTU4KXJldHVy
+biExCmlmKHQ9PT1zKXJldHVybiEwCnJldHVybiBDLnhCLm0oYSxzKT09PTQ3fX0sVD17bVE6ZnVuY3Rp
+b24gbVEoKXt9fSxMPXsKSXE6ZnVuY3Rpb24oKXtDLkJaLkIoZG9jdW1lbnQsIkRPTUNvbnRlbnRMb2Fk
+ZWQiLG5ldyBMLmUoKSkKQy5vbC5CKHdpbmRvdywicG9wc3RhdGUiLG5ldyBMLkwoKSl9LAprejpmdW5j
+dGlvbihhKXt2YXIgdCxzPXUuaC5hKGEucGFyZW50Tm9kZSkucXVlcnlTZWxlY3RvcigiOnNjb3BlID4g
+dWwiKSxyPXMuc3R5bGUscT0iIitDLkNELnpRKHMub2Zmc2V0SGVpZ2h0KSoyKyJweCIKci5tYXhIZWln
+aHQ9cQpyPUoucUYoYSkKcT1yLiR0aQp0PXEuQygifigxKSIpLmEobmV3IEwuV3gocyxhKSkKdS5NLmEo
+bnVsbCkKVy5KRShyLmEsci5iLHQsITEscS5jKX0sCnlYOmZ1bmN0aW9uKGEsYil7dmFyIHQscyxyLHEs
+cCxvPSJxdWVyeVNlbGVjdG9yQWxsIixuPWRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoYSksbT11LmgKbi50
+b1N0cmluZwpILkRoKG0sbSwiVCIsbykKdD11LlQKcz1uZXcgVy53eihuLnF1ZXJ5U2VsZWN0b3JBbGwo
+Ii5uYXYtbGluayIpLHQpCnMuSyhzLG5ldyBMLkFPKGIpKQpILkRoKG0sbSwiVCIsbykKcj1uZXcgVy53
+eihuLnF1ZXJ5U2VsZWN0b3JBbGwoIi5yZWdpb24iKSx0KQppZihyLmdBKHIpIT09MCl7cT1uLnF1ZXJ5
+U2VsZWN0b3IoInRhYmxlW2RhdGEtcGF0aF0iKQpxLnRvU3RyaW5nCnIuSyhyLG5ldyBMLkhvKHEuZ2V0
+QXR0cmlidXRlKCJkYXRhLSIrbmV3IFcuU3kobmV3IFcuaTcocSkpLk8oInBhdGgiKSkpKX1ILkRoKG0s
+bSwiVCIsbykKcD1uZXcgVy53eihuLnF1ZXJ5U2VsZWN0b3JBbGwoIi5wb3N0LWxpbmsiKSx0KQpwLkso
+cCxuZXcgTC5JQygpKX0sClE2OmZ1bmN0aW9uKGEsYil7dmFyIHQ9dS5OCnJldHVybiBXLnFEKEwuUTQo
+YSxiKSxudWxsLFAuRUYoWyJDb250ZW50LVR5cGUiLCJhcHBsaWNhdGlvbi9qc29uOyBjaGFyc2V0PVVU
+Ri04Il0sdCx0KSl9LAp0eTpmdW5jdGlvbihhKXt2YXIgdD11Lk4KcmV0dXJuIFcucUQoTC5RNChhLFAu
+RmwodCx0KSksIlBPU1QiLFAuRUYoWyJDb250ZW50LVR5cGUiLCJhcHBsaWNhdGlvbi9qc29uOyBjaGFy
+c2V0PVVURi04Il0sdCx0KSkuVzcobmV3IEwuTDEoKSx1LnIpfSwKYUs6ZnVuY3Rpb24oYSl7dmFyIHQ9
+UC5oSyhhKS5naFkoKS5xKDAsImxpbmUiKQpyZXR1cm4gdD09bnVsbD9udWxsOkguSHAodCxudWxsKX0s
+Ckc2OmZ1bmN0aW9uKGEpe3ZhciB0PVAuaEsoYSkuZ2hZKCkucSgwLCJvZmZzZXQiKQpyZXR1cm4gdD09
+bnVsbD9udWxsOkguSHAodCxudWxsKX0sCnQyOmZ1bmN0aW9uKGEsYixjKXt2YXIgdCxzLHIscSxwLG8s
+bj17fSxtPXUuaC5hKFcucWMoYS5jdXJyZW50VGFyZ2V0KSkKYS5wcmV2ZW50RGVmYXVsdCgpCnQ9bi5h
+PW0uZ2V0QXR0cmlidXRlKCJocmVmIikKaWYoSi56bCh0LCI/Iikpe3M9Qy54Qi53KHQsMCxDLnhCLk9Z
+KHQsIj8iKSkKbi5hPXMKcj1zfWVsc2Ugcj10CmlmKGMhPW51bGwpe3E9JC5uVSgpCnI9bi5hPXEubzUo
+RC5ucihxLnRNKGMpLHIpKX1wPUwuRzYodCkKbz1MLmFLKHQpCmlmKHAhPW51bGwpTC5hZihyLHAsbyxi
+LG5ldyBMLm5UKG4scCxvKSkKZWxzZSBMLmFmKHIsbnVsbCxudWxsLGIsbmV3IEwuQloobikpfSwKdW06
+ZnVuY3Rpb24oYSl7cmV0dXJuIEwuUVModS5WLmEoYSkpfSwKUVM6ZnVuY3Rpb24oYSl7dmFyIHQ9MCxz
+PVAuRlgodS56KSxyPTEscSxwPVtdLG8sbixtLGwsayxqCnZhciAkYXN5bmMkdW09UC5seihmdW5jdGlv
+bihiLGMpe2lmKGI9PT0xKXtxPWMKdD1yfXdoaWxlKHRydWUpc3dpdGNoKHQpe2Nhc2UgMDprPXUuaC5h
+KFcucWMoYS5jdXJyZW50VGFyZ2V0KSkuZ2V0QXR0cmlidXRlKCJocmVmIikKYS5wcmV2ZW50RGVmYXVs
+dCgpCm09ZG9jdW1lbnQKbS5ib2R5LmNsYXNzTGlzdC5hZGQoInJlcnVubmluZyIpCnI9Mwp0PTYKcmV0
+dXJuIFAualEoTC50eShrKSwkYXN5bmMkdW0pCmNhc2UgNjp1LmFfLmEoSi5HcihXLlB2KG0uZGVmYXVs
+dFZpZXcpKSkucmVsb2FkKCkKcC5wdXNoKDUpCnQ9NApicmVhawpjYXNlIDM6cj0yCmo9cQpvPUguUnUo
+aikKbj1ILnRzKGopCkwucUooImhhbmRsZVBvc3RMaW5rQ2xpY2s6ICIrSC5kKG8pLG4pCndpbmRvdy5h
+bGVydCgiQ291bGQgbm90IGxvYWQgIitILmQoaykrIiAoIitILmQobykrIikuIikKcC5wdXNoKDUpCnQ9
+NApicmVhawpjYXNlIDI6cD1bMV0KY2FzZSA0OnI9MQptLmJvZHkuY2xhc3NMaXN0LnJlbW92ZSgicmVy
+dW5uaW5nIikKdD1wLnBvcCgpCmJyZWFrCmNhc2UgNTpyZXR1cm4gUC55QyhudWxsLHMpCmNhc2UgMTpy
+ZXR1cm4gUC5mMyhxLHMpfX0pCnJldHVybiBQLkRJKCRhc3luYyR1bSxzKX0sCnZVOmZ1bmN0aW9uKCl7
+dmFyIHQ9ZG9jdW1lbnQscz11LmgKSC5EaChzLHMsIlQiLCJxdWVyeVNlbGVjdG9yQWxsIikKdD1uZXcg
+Vy53eih0LnF1ZXJ5U2VsZWN0b3JBbGwoIi5jb2RlIiksdS5UKQp0LksodCxuZXcgTC5HSCgpKX0sCmhY
+OmZ1bmN0aW9uKGEsYixjKXt2YXIgdD11Lk4KTC5RNihhLFAuRUYoWyJyZWdpb24iLCJyZWdpb24iLCJv
+ZmZzZXQiLEguZChiKV0sdCx0KSkuVzcobmV3IEwuRFQoYSxiLGMpLHUuUCkuT0EobmV3IEwuZUgoYSkp
+fSwKRzc6ZnVuY3Rpb24oYSxiLGMsZCxlKXt2YXIgdAppZighSi5wNChhLCIuZGFydCIpKXtMLkJFKGEs
+bmV3IEIucXAoIiIsIiIsIiIsQy54RCksZCkKTC5CWChhLG51bGwpCmlmKGUhPW51bGwpZS4kMCgpCnJl
+dHVybn10PXUuTgpMLlE2KGEsUC5FRihbImlubGluZSIsInRydWUiXSx0LHQpKS5XNyhuZXcgTC56RChh
+LGQsYixjLGUpLHUuUCkuT0EobmV3IEwuT0UoYSkpfSwKR2U6ZnVuY3Rpb24oKXt2YXIgdD0iL19wcmV2
+aWV3L25hdmlnYXRpb25UcmVlLmpzb24iCkwuUTYodCxDLkNNKS5XNyhuZXcgTC5UVygpLHUuUCkuT0Eo
+bmV3IEwueHIodCkpfSwKcUo6ZnVuY3Rpb24oYSxiKXt2YXIgdAp3aW5kb3cKaWYodHlwZW9mIGNvbnNv
+bGUhPSJ1bmRlZmluZWQiKXdpbmRvdy5jb25zb2xlLmVycm9yKGEpCndpbmRvdwp0PUguZChiKQppZih0
+eXBlb2YgY29uc29sZSE9InVuZGVmaW5lZCIpd2luZG93LmNvbnNvbGUuZXJyb3IodCl9LApxTzpmdW5j
+dGlvbihhKXt2YXIgdCxzPWEuZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCkscj1DLkNELnpRKCQuZmkoKS5v
+ZmZzZXRIZWlnaHQpLHE9d2luZG93LmlubmVySGVpZ2h0LHA9Qy5DRC56USgkLkRXKCkub2Zmc2V0SGVp
+Z2h0KQppZih0eXBlb2YgcSE9PSJudW1iZXIiKXJldHVybiBxLkhOKCkKdD1zLmJvdHRvbQppZih0eXBl
+b2YgdCE9PSJudW1iZXIiKXJldHVybiB0Lm9zKCkKaWYodD5xLShwKzE0KSlKLmRoKGEpCmVsc2V7cT1z
+LnRvcAppZih0eXBlb2YgcSE9PSJudW1iZXIiKXJldHVybiBxLkooKQppZihxPHIrMTQpSi5kaChhKX19
+LApmRzpmdW5jdGlvbihhLGIpe3ZhciB0LHMscgppZihhIT1udWxsKXt0PWRvY3VtZW50CnM9dC5nZXRF
+bGVtZW50QnlJZCgibyIrSC5kKGEpKQpyPXQucXVlcnlTZWxlY3RvcigiLmxpbmUtIitILmQoYikpCmlm
+KHMhPW51bGwpe0wucU8ocykKSi5kUihzKS5pKDAsInRhcmdldCIpfWVsc2UgaWYociE9bnVsbClMLnFP
+KHIucGFyZW50RWxlbWVudCkKaWYociE9bnVsbClKLmRSKHUuaC5hKHIucGFyZW50Tm9kZSkpLmkoMCwi
+aGlnaGxpZ2h0Iil9ZWxzZSBMLnFPKCQuRDkoKSl9LAphZjpmdW5jdGlvbihhLGIsYyxkLGUpe3ZhciB0
+LHMscj1MLkc2KHdpbmRvdy5sb2NhdGlvbi5ocmVmKSxxPUwuYUsod2luZG93LmxvY2F0aW9uLmhyZWYp
+CmlmKHIhPW51bGwpe3Q9ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIm8iK0guZChyKSkKaWYodCE9bnVs
+bClKLmRSKHQpLlIoMCwidGFyZ2V0Iil9aWYocSE9bnVsbCl7cz1kb2N1bWVudC5xdWVyeVNlbGVjdG9y
+KCIubGluZS0iK0guZChxKSkKaWYocyE9bnVsbClKLmRSKHMucGFyZW50RWxlbWVudCkuUigwLCJoaWdo
+bGlnaHQiKX1pZihhPT13aW5kb3cubG9jYXRpb24ucGF0aG5hbWUpe0wuZkcoYixjKQplLiQwKCl9ZWxz
+ZSBMLkc3KGEsYixjLGQsZSl9LApRNDpmdW5jdGlvbihhLGIpe3ZhciB0LHMscj1QLmhLKGEpLHE9dS5O
+CnE9UC5GbChxLHEpCmZvcih0PXIuZ2hZKCksdD10LmdQdSh0KSx0PXQuZ2t6KHQpO3QuRigpOyl7cz10
+LmdsKCkKcS5ZKDAscy5hLHMuYil9Zm9yKHQ9Yi5nUHUoYiksdD10Lmdreih0KTt0LkYoKTspe3M9dC5n
+bCgpCnEuWSgwLHMuYSxzLmIpfXEuWSgwLCJhdXRoVG9rZW4iLCQuVUUoKSkKcmV0dXJuIHIubm0oMCxx
+KS5aKDApfSwKTHg6ZnVuY3Rpb24oYSxiKXt2YXIgdAppZihhPT09MSl0PWIKZWxzZSB0PWIrInMiCnJl
+dHVybiB0fSwKVDE6ZnVuY3Rpb24oYSl7dmFyIHQscyxyLHEscCxvLG4sbSxsPSQuaEwoKQpKLmw1KGws
+IiIpCmlmKGE9PW51bGwpe3Q9ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgicCIpCnQudGV4dENvbnRlbnQ9
+IlNlZSBkZXRhaWxzIGFib3V0IGEgcHJvcG9zZWQgZWRpdC4iCkMuTHQuc0QodCxILlZNKFsicGxhY2Vo
+b2xkZXIiXSx1LnMpKQpKLmRoKHUuaC5hKGwuYXBwZW5kQ2hpbGQodCkpKQpyZXR1cm59cz1hLmUKdD0k
+Lm5VKCkKcj10LnRNKHMpCnE9YS5jCnA9ZG9jdW1lbnQKbz10LkhQKHMsSi5UMChwLnF1ZXJ5U2VsZWN0
+b3IoIi5yb290IikudGV4dENvbnRlbnQpKQpuPWEuZAp0PXAuY3JlYXRlRWxlbWVudCgicCIpCm09dS5o
+LmEobC5hcHBlbmRDaGlsZCh0KSkKbS5hcHBlbmRDaGlsZChwLmNyZWF0ZVRleHROb2RlKEguZChxKSsi
+IGF0ICIrSC5kKG8pKyI6IitILmQobikrIi4iKSkKSi5kaChtKQpMLkNDKGEsbCxyKQpMLkZ6KGEsbCkK
+TC5ORyhhLGwscil9LApMSDpmdW5jdGlvbihhLGIsYyl7dmFyIHQscyxyLHEscCxvLG4sbSxsLGssaixp
+LGgsZyxmLGUsZD0kLnlQKCkKSi5sNShkLCIiKQp0PWRvY3VtZW50CnM9dC5jcmVhdGVFbGVtZW50KCJw
+IikKcj11LmgKcT1yLmEoZC5hcHBlbmRDaGlsZChzKSkKcD1iLmxlbmd0aAppZihwPT09MClxLmFwcGVu
+ZENoaWxkKHQuY3JlYXRlVGV4dE5vZGUoIk5vIHByb3Bvc2VkIGVkaXRzIikpCmVsc2UgcS5hcHBlbmRD
+aGlsZCh0LmNyZWF0ZVRleHROb2RlKCIiK3ArIiBwcm9wb3NlZCAiK0wuTHgocCwiZWRpdCIpKyI6Iikp
+CnM9dC5jcmVhdGVFbGVtZW50KCJ1bCIpCm89ci5hKGQuYXBwZW5kQ2hpbGQocykpCmZvcihkPWIubGVu
+Z3RoLHM9dS5pLG49dS5RLG09bi5DKCJ+KDEpIiksbD11Lk0sbj1uLmMsaz0wO2s8Yi5sZW5ndGg7Yi5s
+ZW5ndGg9PT1kfHwoMCxILmxrKShiKSwrK2spe2o9YltrXQppPXQuY3JlYXRlRWxlbWVudCgibGkiKQpo
+PXIuYShvLmFwcGVuZENoaWxkKGkpKQpKLmRSKGgpLmkoMCwiZWRpdCIpCmk9dC5jcmVhdGVFbGVtZW50
+KCJhIikKZz1zLmEoaC5hcHBlbmRDaGlsZChpKSkKZy5jbGFzc0xpc3QuYWRkKCJlZGl0LWxpbmsiKQpm
+PWouYwppPUguZChmKQpnLnNldEF0dHJpYnV0ZSgiZGF0YS0iK25ldyBXLlN5KG5ldyBXLmk3KGcpKS5P
+KCJvZmZzZXQiKSxpKQplPWouYQppPUguZChlKQpnLnNldEF0dHJpYnV0ZSgiZGF0YS0iK25ldyBXLlN5
+KG5ldyBXLmk3KGcpKS5PKCJsaW5lIiksaSkKZy5hcHBlbmRDaGlsZCh0LmNyZWF0ZVRleHROb2RlKCJs
+aW5lICIrSC5kKGUpKSkKaT1tLmEobmV3IEwuRUUoZixlLGEpKQpsLmEobnVsbCkKVy5KRShnLCJjbGlj
+ayIsaSwhMSxuKQpoLmFwcGVuZENoaWxkKHQuY3JlYXRlVGV4dE5vZGUoIjogIitILmQoai5iKSkpfWlm
+KGMpTC5UMShudWxsKX0sCkZyOmZ1bmN0aW9uKGEsYixjKXt2YXIgdCxzLHI9d2luZG93LmxvY2F0aW9u
+LHE9UC5oSygociYmQy5FeCkuZ0RyKHIpK0guZChhKSkKcj11Lk4Kcj1QLkZsKHIscikKaWYoYiE9bnVs
+bClyLlkoMCwib2Zmc2V0IixILmQoYikpCmlmKGMhPW51bGwpci5ZKDAsImxpbmUiLEguZChjKSkKci5Z
+KDAsImF1dGhUb2tlbiIsJC5VRSgpKQpxPXEubm0oMCxyKQpyPXdpbmRvdy5oaXN0b3J5CnQ9dS56CnM9
+cS5aKDApCnIudG9TdHJpbmcKci5wdXNoU3RhdGUobmV3IFAuQmYoW10sW10pLlB2KFAuRmwodCx0KSks
+IiIscyl9LApFbjpmdW5jdGlvbihhKXt2YXIgdD1KLm0oZG9jdW1lbnQucXVlcnlTZWxlY3RvcigiLnJv
+b3QiKS50ZXh0Q29udGVudCwiLyIpCmlmKEMueEIubihhLHQpKXJldHVybiBDLnhCLkcoYSx0Lmxlbmd0
+aCkKZWxzZSByZXR1cm4gYX0sCkJYOmZ1bmN0aW9uKGEsYil7dmFyIHQscyxyPXt9CnIuYT1hCmE9TC5F
+bihhKQpyLmE9YQokLkQ5KCkudGV4dENvbnRlbnQ9YQp0PWRvY3VtZW50CnM9dS5oCkguRGgocyxzLCJU
+IiwicXVlcnlTZWxlY3RvckFsbCIpCnQ9bmV3IFcud3oodC5xdWVyeVNlbGVjdG9yQWxsKCIubmF2LXBh
+bmVsIC5uYXYtbGluayIpLHUuVCkKdC5LKHQsbmV3IEwuVlMocikpfSwKQkU6ZnVuY3Rpb24oYSxiLGMp
+e3ZhciB0PSIucmVnaW9ucyIscz1kb2N1bWVudCxyPXMucXVlcnlTZWxlY3Rvcih0KSxxPXMucXVlcnlT
+ZWxlY3RvcigiLmNvZGUiKQpKLnRIKHIsYi5hLCQuS0coKSkKSi50SChxLGIuYiwkLktHKCkpCkwuTEgo
+YSxiLmQsYykKTC52VSgpCkwueVgoIi5jb2RlIiwhMCkKTC55WCh0LCEwKX0sCnRYOmZ1bmN0aW9uKGEs
+Yil7dmFyIHQscyxyLHEscCxvLG4sbSxsLGssaixpPWRvY3VtZW50LGg9aS5jcmVhdGVFbGVtZW50KCJ1
+bCIpLGc9dS5oLGY9Zy5hKGEuYXBwZW5kQ2hpbGQoaCkpCmZvcihoPWIubGVuZ3RoLHQ9dS5NLHM9MDtz
+PGIubGVuZ3RoO2IubGVuZ3RoPT09aHx8KDAsSC5saykoYiksKytzKXtyPWJbc10KcT1pLmNyZWF0ZUVs
+ZW1lbnQoImxpIikKcD1nLmEoZi5hcHBlbmRDaGlsZChxKSkKcT1KLlJFKHApCmlmKHIuYT09PUMuWTIp
+e3EuZ0QocCkuaSgwLCJkaXIiKQpxPWkuY3JlYXRlRWxlbWVudCgic3BhbiIpCm89Zy5hKHAuYXBwZW5k
+Q2hpbGQocSkpCnE9Si5SRShvKQpxLmdEKG8pLmkoMCwiYXJyb3ciKQpxLnNoZihvLCImI3gyNUJDOyIp
+CnE9aS5jcmVhdGVFbGVtZW50KCJzcGFuIikKSi5sNShnLmEocC5hcHBlbmRDaGlsZChxKSksIiYjeDFG
+NEMxOyIpCnAuYXBwZW5kQ2hpbGQoaS5jcmVhdGVUZXh0Tm9kZShyLmIpKQpMLnRYKHAsci5jKQpMLmt6
+KG8pfWVsc2V7cS5zaGYocCwiJiN4MUY0QzQ7IikKcT1pLmNyZWF0ZUVsZW1lbnQoImEiKQpuPWcuYShw
+LmFwcGVuZENoaWxkKHEpKQpxPUouUkUobikKcS5nRChuKS5pKDAsIm5hdi1saW5rIikKbi5zZXRBdHRy
+aWJ1dGUoImRhdGEtIituZXcgVy5TeShuZXcgVy5pNyhuKSkuTygibmFtZSIpLHIuZCkKbi5zZXRBdHRy
+aWJ1dGUoImhyZWYiLHIuZSkKbi5hcHBlbmRDaGlsZChpLmNyZWF0ZVRleHROb2RlKHIuYikpCnE9cS5n
+VmwobikKbT1xLiR0aQpsPW0uQygifigxKSIpLmEobmV3IEwuVEQoKSkKdC5hKG51bGwpClcuSkUocS5h
+LHEuYixsLCExLG0uYykKaz1yLmYKaWYodHlwZW9mIGshPT0ibnVtYmVyIilyZXR1cm4gay5vcygpCmlm
+KGs+MCl7cT1pLmNyZWF0ZUVsZW1lbnQoInNwYW4iKQpqPWcuYShwLmFwcGVuZENoaWxkKHEpKQpKLmRS
+KGopLmkoMCwiZWRpdC1jb3VudCIpCnE9IiIraysiICIKaWYoaz09PTEpbT0iZWRpdCIKZWxzZSBtPSJl
+ZGl0cyIKai5zZXRBdHRyaWJ1dGUoInRpdGxlIixxK20pCmouYXBwZW5kQ2hpbGQoaS5jcmVhdGVUZXh0
+Tm9kZShDLmpuLlooaykpKX19fX0sCmM0OmZ1bmN0aW9uKGEsYil7dmFyIHQ9ZG9jdW1lbnQscz10LmNy
+ZWF0ZUVsZW1lbnQoImEiKQp1LmkuYShzKQpzLmFwcGVuZENoaWxkKHQuY3JlYXRlVGV4dE5vZGUoSC5k
+KGEuYykrIjoiK0guZChhLmIpKSkKdD1ELm5yKGIsYS5hKQpzLnNldEF0dHJpYnV0ZSgiaHJlZiIsJC5u
+VSgpLm81KHQpKQpzLmNsYXNzTGlzdC5hZGQoIm5hdi1saW5rIikKcmV0dXJuIHN9LApGejpmdW5jdGlv
+bihhLGIpe3ZhciB0LHMscixxLHAsbyxuLG0sbCxrLGosaT1hLmIKaWYoaSE9bnVsbClmb3IodD1pLmxl
+bmd0aCxzPXUuaCxyPXUucyxxPXUuWCxwPTA7cDxpLmxlbmd0aDtpLmxlbmd0aD09PXR8fCgwLEgubGsp
+KGkpLCsrcCl7bz1pW3BdCm49ZG9jdW1lbnQKbT1uLmNyZWF0ZUVsZW1lbnQoInAiKQpsPXMuYShiLmFw
+cGVuZENoaWxkKG0pKQptPW4uY3JlYXRlRWxlbWVudCgiYSIpCms9cy5hKGwuYXBwZW5kQ2hpbGQobSkp
+CmsuYXBwZW5kQ2hpbGQobi5jcmVhdGVUZXh0Tm9kZShvLmEpKQprLnNldEF0dHJpYnV0ZSgiaHJlZiIs
+by5iKQpuPXEuYShILlZNKFsicG9zdC1saW5rIiwiYmVmb3JlLWFwcGx5Il0scikpCmo9Si5kUihrKQpq
+LlYxKDApCmouRlYoMCxuKX19LApORzpmdW5jdGlvbihhLGIsYyl7dmFyIHQscyxyLHEscCxvLG4sbSxs
+PWEuYQppZihsLmxlbmd0aCE9PTApe3Q9ZG9jdW1lbnQKcz10LmNyZWF0ZUVsZW1lbnQoInAiKQpzLnRl
+eHRDb250ZW50PSJFZGl0IHJhdGlvbmFsZSAoZXhwZXJpbWVudGFsKToiCmIuYXBwZW5kQ2hpbGQocykK
+cz10LmNyZWF0ZUVsZW1lbnQoInVsIikKcj11LmguYShiLmFwcGVuZENoaWxkKHMpKQpmb3Iocz1sLmxl
+bmd0aCxxPTA7cTxsLmxlbmd0aDtsLmxlbmd0aD09PXN8fCgwLEgubGspKGwpLCsrcSl7cD1sW3FdCm89
+dC5jcmVhdGVFbGVtZW50KCJsaSIpCm49ci5hcHBlbmRDaGlsZChvKQpuLmFwcGVuZENoaWxkKHQuY3Jl
+YXRlVGV4dE5vZGUocC5hKSkKbT1wLmIKaWYobSE9bnVsbCl7bi5hcHBlbmRDaGlsZCh0LmNyZWF0ZVRl
+eHROb2RlKCIgKCIpKQpuLmFwcGVuZENoaWxkKEwuYzQobSxjKSkKbi5hcHBlbmRDaGlsZCh0LmNyZWF0
+ZVRleHROb2RlKCIpIikpfX19fSwKQ0M6ZnVuY3Rpb24oYSxiLGEwKXt2YXIgdCxzLHIscSxwLG8sbixt
+LGwsayxqLGksaCxnLGYsZSxkLGMKZm9yKHQ9YS5mLHM9dC5sZW5ndGgscj11LnMscT11LlgscD0wO3A8
+dC5sZW5ndGg7dC5sZW5ndGg9PT1zfHwoMCxILmxrKSh0KSwrK3Ape289dFtwXQpuPWRvY3VtZW50Cm09
+bi5jcmVhdGVFbGVtZW50KCJwIikKbD1xLmEoSC5WTShbInRyYWNlIl0scikpCms9Si5kUihtKQprLlYx
+KDApCmsuRlYoMCxsKQpqPWIuYXBwZW5kQ2hpbGQobSkKbT1uLmNyZWF0ZUVsZW1lbnQoInNwYW4iKQps
+PXEuYShILlZNKFsidHlwZS1kZXNjcmlwdGlvbiJdLHIpKQprPUouZFIobSkKay5WMSgwKQprLkZWKDAs
+bCkKbS5hcHBlbmRDaGlsZChuLmNyZWF0ZVRleHROb2RlKG8uYSkpCmouYXBwZW5kQ2hpbGQobSkKai5h
+cHBlbmRDaGlsZChuLmNyZWF0ZVRleHROb2RlKCI6IikpCm09bi5jcmVhdGVFbGVtZW50KCJ1bCIpCmw9
+cS5hKEguVk0oWyJ0cmFjZSJdLHIpKQprPUouZFIobSkKay5WMSgwKQprLkZWKDAsbCkKaT1qLmFwcGVu
+ZENoaWxkKG0pCmZvcihtPW8uYixsPW0ubGVuZ3RoLGg9MDtoPG0ubGVuZ3RoO20ubGVuZ3RoPT09bHx8
+KDAsSC5saykobSksKytoKXtnPW1baF0KZj1uLmNyZWF0ZUVsZW1lbnQoImxpIikKSi5sNShmLCImI3gy
+NzRGOyAiKQplPWkuYXBwZW5kQ2hpbGQoZikKZj1uLmNyZWF0ZUVsZW1lbnQoInNwYW4iKQpkPXEuYShI
+LlZNKFsiZnVuY3Rpb24iXSxyKSkKaz1KLmRSKGYpCmsuVjEoMCkKay5GVigwLGQpCmQ9Zy5iCmlmKGQ9
+PW51bGwpZD0idW5rbm93biIKZi5hcHBlbmRDaGlsZChuLmNyZWF0ZVRleHROb2RlKGQpKQplLmFwcGVu
+ZENoaWxkKGYpCmM9Zy5jCmlmKGMhPW51bGwpe2UuYXBwZW5kQ2hpbGQobi5jcmVhdGVUZXh0Tm9kZSgi
+ICgiKSkKZS5hcHBlbmRDaGlsZChMLmM0KGMsYTApKQplLmFwcGVuZENoaWxkKG4uY3JlYXRlVGV4dE5v
+ZGUoIikiKSl9ZS5hcHBlbmRDaGlsZChuLmNyZWF0ZVRleHROb2RlKCI6ICIpKQplLmFwcGVuZENoaWxk
+KG4uY3JlYXRlVGV4dE5vZGUoZy5hKSl9fX0sCmU6ZnVuY3Rpb24gZSgpe30sClZXOmZ1bmN0aW9uIFZX
+KGEsYixjKXt0aGlzLmE9YQp0aGlzLmI9Ygp0aGlzLmM9Y30sCm9aOmZ1bmN0aW9uIG9aKCl7fSwKanI6
+ZnVuY3Rpb24ganIoKXt9LApxbDpmdW5jdGlvbiBxbCgpe30sCnk4OmZ1bmN0aW9uIHk4KCl7fSwKTDpm
+dW5jdGlvbiBMKCl7fSwKV3g6ZnVuY3Rpb24gV3goYSxiKXt0aGlzLmE9YQp0aGlzLmI9Yn0sCkFPOmZ1
+bmN0aW9uIEFPKGEpe3RoaXMuYT1hfSwKZE46ZnVuY3Rpb24gZE4oYSl7dGhpcy5hPWF9LApIbzpmdW5j
+dGlvbiBIbyhhKXt0aGlzLmE9YX0sCnh6OmZ1bmN0aW9uIHh6KGEsYil7dGhpcy5hPWEKdGhpcy5iPWJ9
+LApJQzpmdW5jdGlvbiBJQygpe30sCkwxOmZ1bmN0aW9uIEwxKCl7fSwKblQ6ZnVuY3Rpb24gblQoYSxi
+LGMpe3RoaXMuYT1hCnRoaXMuYj1iCnRoaXMuYz1jfSwKQlo6ZnVuY3Rpb24gQlooYSl7dGhpcy5hPWF9
+LApHSDpmdW5jdGlvbiBHSCgpe30sCkRUOmZ1bmN0aW9uIERUKGEsYixjKXt0aGlzLmE9YQp0aGlzLmI9
+Ygp0aGlzLmM9Y30sCmVIOmZ1bmN0aW9uIGVIKGEpe3RoaXMuYT1hfSwKekQ6ZnVuY3Rpb24gekQoYSxi
+LGMsZCxlKXt2YXIgXz10aGlzCl8uYT1hCl8uYj1iCl8uYz1jCl8uZD1kCl8uZT1lfSwKT0U6ZnVuY3Rp
+b24gT0UoYSl7dGhpcy5hPWF9LApUVzpmdW5jdGlvbiBUVygpe30sCnhyOmZ1bmN0aW9uIHhyKGEpe3Ro
+aXMuYT1hfSwKRUU6ZnVuY3Rpb24gRUUoYSxiLGMpe3RoaXMuYT1hCnRoaXMuYj1iCnRoaXMuYz1jfSwK
+UUw6ZnVuY3Rpb24gUUwoYSxiKXt0aGlzLmE9YQp0aGlzLmI9Yn0sClZTOmZ1bmN0aW9uIFZTKGEpe3Ro
+aXMuYT1hfSwKVEQ6ZnVuY3Rpb24gVEQoKXt9LApYQTpmdW5jdGlvbiBYQSgpe30sCm1LOmZ1bmN0aW9u
+KGEpe3ZhciB0LHMscixxLHAsbyxuPUguVk0oW10sdS5maCkKZm9yKHQ9Si5JVCh1LlIuYShhKSk7dC5G
+KCk7KXtzPXQuZ2woKQpyPUouVTYocykKcT1MLnAyKEguYyhyLnEocywidHlwZSIpKSkKcD1ILmMoci5x
+KHMsIm5hbWUiKSkKbz1yLnEocywic3VidHJlZSIpCm89bz09bnVsbD9udWxsOkwubUsobykKQy5ObS5p
+KG4sbmV3IEwuWloocSxwLG8sSC5jKHIucShzLCJwYXRoIikpLEguYyhyLnEocywiaHJlZiIpKSxILldZ
+KHIucShzLCJlZGl0Q291bnQiKSkpKX1yZXR1cm4gbn0sCnAyOmZ1bmN0aW9uKGEpe3N3aXRjaChhKXtj
+YXNlImRpcmVjdG9yeSI6cmV0dXJuIEMuWTIKY2FzZSJmaWxlIjpyZXR1cm4gQy5yZgpkZWZhdWx0OnRo
+cm93IEguYihQLlBWKCJVbnJlY29nbml6ZWQgbmF2aWdhdGlvbiB0cmVlIG5vZGUgdHlwZTogIitILmQo
+YSkpKX19LApaWjpmdW5jdGlvbiBaWihhLGIsYyxkLGUsZil7dmFyIF89dGhpcwpfLmE9YQpfLmI9Ygpf
+LmM9YwpfLmQ9ZApfLmU9ZQpfLmY9Zn0sCk85OmZ1bmN0aW9uIE85KGEpe3RoaXMuYj1hfSwKSVY6ZnVu
+Y3Rpb24gSVYoYSxiLGMsZCl7dmFyIF89dGhpcwpfLmQ9YQpfLmU9YgpfLmY9YwpfLnI9ZH19LE09ewpZ
+RjpmdW5jdGlvbihhLGIpe3ZhciB0LHMscixxLHAsbyxuCmZvcih0PWIubGVuZ3RoLHM9MTtzPHQ7Kytz
+KXtpZihiW3NdPT1udWxsfHxiW3MtMV0hPW51bGwpY29udGludWUKZm9yKDt0Pj0xO3Q9cil7cj10LTEK
+aWYoYltyXSE9bnVsbClicmVha31xPW5ldyBQLlJuKCIiKQpwPWErIigiCnEuYT1wCm89SC5xQyhiLDAs
+dCxILnQ2KGIpLmMpCm49by4kdGkKbj1wK25ldyBILmxKKG8sbi5DKCJxVShhTC5FKSIpLmEobmV3IE0u
+Tm8oKSksbi5DKCJsSjxhTC5FLHFVPiIpKS56VigwLCIsICIpCnEuYT1uCnEuYT1uKygiKTogcGFydCAi
+KyhzLTEpKyIgd2FzIG51bGwsIGJ1dCBwYXJ0ICIrcysiIHdhcyBub3QuIikKdGhyb3cgSC5iKFAueFko
+cS5aKDApKSl9fSwKbEk6ZnVuY3Rpb24gbEkoYSl7dGhpcy5hPWF9LApNaTpmdW5jdGlvbiBNaSgpe30s
+CnE3OmZ1bmN0aW9uIHE3KCl7fSwKTm86ZnVuY3Rpb24gTm8oKXt9fSxYPXsKQ0w6ZnVuY3Rpb24oYSxi
+KXt2YXIgdCxzLHIscSxwLG89Yi54WihhKQpiLmhLKGEpCmlmKG8hPW51bGwpYT1KLktWKGEsby5sZW5n
+dGgpCnQ9dS5zCnM9SC5WTShbXSx0KQpyPUguVk0oW10sdCkKdD1hLmxlbmd0aAppZih0IT09MCYmYi5y
+NChDLnhCLlcoYSwwKSkpe2lmKDA+PXQpcmV0dXJuIEguayhhLDApCkMuTm0uaShyLGFbMF0pCnE9MX1l
+bHNle0MuTm0uaShyLCIiKQpxPTB9Zm9yKHA9cTtwPHQ7KytwKWlmKGIucjQoQy54Qi5XKGEscCkpKXtD
+Lk5tLmkocyxDLnhCLncoYSxxLHApKQpDLk5tLmkocixhW3BdKQpxPXArMX1pZihxPHQpe0MuTm0uaShz
+LEMueEIuRyhhLHEpKQpDLk5tLmkociwiIil9cmV0dXJuIG5ldyBYLldEKGIsbyxzLHIpfSwKV0Q6ZnVu
+Y3Rpb24gV0QoYSxiLGMsZCl7dmFyIF89dGhpcwpfLmE9YQpfLmI9YgpfLmQ9YwpfLmU9ZH0sCnFSOmZ1
+bmN0aW9uIHFSKGEpe3RoaXMuYT1hfSwKSTc6ZnVuY3Rpb24oYSl7cmV0dXJuIG5ldyBYLmR2KGEpfSwK
+ZHY6ZnVuY3Rpb24gZHYoYSl7dGhpcy5hPWF9fSxPPXsKUmg6ZnVuY3Rpb24oKXt2YXIgdCxzLHIscSxw
+LG8sbixtLGwsayxqLGk9bnVsbAppZihQLnVvKCkuZ0ZpKCkhPT0iZmlsZSIpcmV0dXJuICQuRWIoKQp0
+PVAudW8oKQppZighQy54Qi5UYyh0LmdJaSh0KSwiLyIpKXJldHVybiAkLkViKCkKcz1QLlBpKGksMCww
+KQpyPVAuelIoaSwwLDApCnE9UC5PZShpLDAsMCwhMSkKcD1QLmxlKGksMCwwLGkpCm89UC50RyhpLDAs
+MCkKbj1QLndCKGkscykKbT1zPT09ImZpbGUiCmlmKHE9PW51bGwpdD1yLmxlbmd0aCE9PTB8fG4hPW51
+bGx8fG0KZWxzZSB0PSExCmlmKHQpcT0iIgp0PXE9PW51bGwKbD0hdAprPVAua2EoImEvYiIsMCwzLGks
+cyxsKQpqPXMubGVuZ3RoPT09MAppZihqJiZ0JiYhQy54Qi5uKGssIi8iKSlrPVAud0Yoaywhanx8bCkK
+ZWxzZSBrPVAueGUoaykKaWYobmV3IFAuRG4ocyxyLHQmJkMueEIubihrLCIvLyIpPyIiOnEsbixrLHAs
+bykudDQoKT09PSJhXFxiIilyZXR1cm4gJC5LaygpCnJldHVybiAkLmJEKCl9LAp6TDpmdW5jdGlvbiB6
+TCgpe319LEU9e09GOmZ1bmN0aW9uIE9GKGEsYixjKXt0aGlzLmQ9YQp0aGlzLmU9Ygp0aGlzLmY9Y319
+LEY9e3J1OmZ1bmN0aW9uIHJ1KGEsYixjLGQpe3ZhciBfPXRoaXMKXy5kPWEKXy5lPWIKXy5mPWMKXy5y
+PWR9fSxEPXsKUlg6ZnVuY3Rpb24oKXt2YXIgdCxzLHI9UC51bygpCmlmKEouUk0ociwkLkk2KSlyZXR1
+cm4gJC5GZgokLkk2PXIKaWYoJC5IaygpPT0kLkViKCkpcmV0dXJuICQuRmY9ci5aSSgiLiIpLlooMCkK
+ZWxzZXt0PXIudDQoKQpzPXQubGVuZ3RoLTEKcmV0dXJuICQuRmY9cz09PTA/dDpDLnhCLncodCwwLHMp
+fX0sCm5yOmZ1bmN0aW9uKGEsYil7dmFyIHQ9bnVsbApyZXR1cm4gJC5uVSgpLnE3KDAsYSxiLHQsdCx0
+LHQsdCx0KX19CnZhciB3PVtDLEgsSixQLFcsVSxCLFQsTCxNLFgsTyxFLEYsRF0KaHVua0hlbHBlcnMu
+c2V0RnVuY3Rpb25OYW1lc0lmTmVjZXNzYXJ5KHcpCnZhciAkPXt9CkguRksucHJvdG90eXBlPXt9Ckou
+dkIucHJvdG90eXBlPXsKRE46ZnVuY3Rpb24oYSxiKXtyZXR1cm4gYT09PWJ9LApnaU86ZnVuY3Rpb24o
+YSl7cmV0dXJuIEguZVEoYSl9LApaOmZ1bmN0aW9uKGEpe3JldHVybiJJbnN0YW5jZSBvZiAnIitILmQo
+SC5saChhKSkrIicifSwKZTc6ZnVuY3Rpb24oYSxiKXt1Lm8uYShiKQp0aHJvdyBILmIoUC5scihhLGIu
+Z1dhKCksYi5nbmQoKSxiLmdWbSgpKSl9fQpKLnlFLnByb3RvdHlwZT17Clo6ZnVuY3Rpb24oYSl7cmV0
+dXJuIFN0cmluZyhhKX0sCmdpTzpmdW5jdGlvbihhKXtyZXR1cm4gYT81MTkwMTg6MjE4MTU5fSwKJGlh
+MjoxfQpKLllFLnByb3RvdHlwZT17CkROOmZ1bmN0aW9uKGEsYil7cmV0dXJuIG51bGw9PWJ9LApaOmZ1
+bmN0aW9uKGEpe3JldHVybiJudWxsIn0sCmdpTzpmdW5jdGlvbihhKXtyZXR1cm4gMH0sCmU3OmZ1bmN0
+aW9uKGEsYil7cmV0dXJuIHRoaXMuU2ooYSx1Lm8uYShiKSl9LAokaWM4OjF9CkouTUYucHJvdG90eXBl
+PXsKZ2lPOmZ1bmN0aW9uKGEpe3JldHVybiAwfSwKWjpmdW5jdGlvbihhKXtyZXR1cm4gU3RyaW5nKGEp
+fSwKJGl2bToxfQpKLmlDLnByb3RvdHlwZT17fQpKLmtkLnByb3RvdHlwZT17fQpKLmM1LnByb3RvdHlw
+ZT17Clo6ZnVuY3Rpb24oYSl7dmFyIHQ9YVskLndRKCldCmlmKHQ9PW51bGwpcmV0dXJuIHRoaXMudChh
+KQpyZXR1cm4iSmF2YVNjcmlwdCBmdW5jdGlvbiBmb3IgIitILmQoSi5BYyh0KSl9LAokUzpmdW5jdGlv
+bigpe3JldHVybntmdW5jOjEsb3B0OlssLCwsLCwsLCwsLCwsLCwsXX19LAokaUVIOjF9CkouamQucHJv
+dG90eXBlPXsKaTpmdW5jdGlvbihhLGIpe0gudDYoYSkuYy5hKGIpCmlmKCEhYS5maXhlZCRsZW5ndGgp
+SC52aChQLkw0KCJhZGQiKSkKYS5wdXNoKGIpfSwKVzQ6ZnVuY3Rpb24oYSxiKXt2YXIgdAppZighIWEu
+Zml4ZWQkbGVuZ3RoKUgudmgoUC5MNCgicmVtb3ZlQXQiKSkKdD1hLmxlbmd0aAppZihiPj10KXRocm93
+IEguYihQLk83KGIsbnVsbCkpCnJldHVybiBhLnNwbGljZShiLDEpWzBdfSwKVUc6ZnVuY3Rpb24oYSxi
+LGMpe3ZhciB0LHMscgpILnQ2KGEpLkMoImNYPDE+IikuYShjKQppZighIWEuZml4ZWQkbGVuZ3RoKUgu
+dmgoUC5MNCgiaW5zZXJ0QWxsIikpCnQ9YS5sZW5ndGgKUC53QShiLDAsdCwiaW5kZXgiKQpzPWMubGVu
+Z3RoCnRoaXMuc0EoYSx0K3MpCnI9YitzCnRoaXMuWVcoYSxyLGEubGVuZ3RoLGEsYikKdGhpcy52Zyhh
+LGIscixjKX0sCm12OmZ1bmN0aW9uKGEpe2lmKCEhYS5maXhlZCRsZW5ndGgpSC52aChQLkw0KCJyZW1v
+dmVMYXN0IikpCmlmKGEubGVuZ3RoPT09MCl0aHJvdyBILmIoSC5IWShhLC0xKSkKcmV0dXJuIGEucG9w
+KCl9LApGVjpmdW5jdGlvbihhLGIpe3ZhciB0CkgudDYoYSkuQygiY1g8MT4iKS5hKGIpCmlmKCEhYS5m
+aXhlZCRsZW5ndGgpSC52aChQLkw0KCJhZGRBbGwiKSkKZm9yKHQ9Si5JVChiKTt0LkYoKTspYS5wdXNo
+KHQuZ2woKSl9LApLOmZ1bmN0aW9uKGEsYil7dmFyIHQscwpILnQ2KGEpLkMoIn4oMSkiKS5hKGIpCnQ9
+YS5sZW5ndGgKZm9yKHM9MDtzPHQ7KytzKXtiLiQxKGFbc10pCmlmKGEubGVuZ3RoIT09dCl0aHJvdyBI
+LmIoUC5hNChhKSl9fSwKRTI6ZnVuY3Rpb24oYSxiLGMpe3ZhciB0PUgudDYoYSkKcmV0dXJuIG5ldyBI
+LmxKKGEsdC5LcShjKS5DKCIxKDIpIikuYShiKSx0LkMoIkA8MT4iKS5LcShjKS5DKCJsSjwxLDI+Iikp
+fSwKelY6ZnVuY3Rpb24oYSxiKXt2YXIgdCxzPW5ldyBBcnJheShhLmxlbmd0aCkKcy5maXhlZCRsZW5n
+dGg9QXJyYXkKZm9yKHQ9MDt0PGEubGVuZ3RoOysrdCl0aGlzLlkocyx0LEguZChhW3RdKSkKcmV0dXJu
+IHMuam9pbihiKX0sCk4wOmZ1bmN0aW9uKGEsYixjLGQpe3ZhciB0LHMscgpkLmEoYikKSC50NihhKS5L
+cShkKS5DKCIxKDEsMikiKS5hKGMpCnQ9YS5sZW5ndGgKZm9yKHM9YixyPTA7cjx0Oysrcil7cz1jLiQy
+KHMsYVtyXSkKaWYoYS5sZW5ndGghPT10KXRocm93IEguYihQLmE0KGEpKX1yZXR1cm4gc30sCkU6ZnVu
+Y3Rpb24oYSxiKXtpZihiPDB8fGI+PWEubGVuZ3RoKXJldHVybiBILmsoYSxiKQpyZXR1cm4gYVtiXX0s
+CkQ2OmZ1bmN0aW9uKGEsYixjKXtpZihiPDB8fGI+YS5sZW5ndGgpdGhyb3cgSC5iKFAuVEUoYiwwLGEu
+bGVuZ3RoLCJzdGFydCIsbnVsbCkpCmlmKGM8Ynx8Yz5hLmxlbmd0aCl0aHJvdyBILmIoUC5URShjLGIs
+YS5sZW5ndGgsImVuZCIsbnVsbCkpCmlmKGI9PT1jKXJldHVybiBILlZNKFtdLEgudDYoYSkpCnJldHVy
+biBILlZNKGEuc2xpY2UoYixjKSxILnQ2KGEpKX0sCmdyWjpmdW5jdGlvbihhKXt2YXIgdD1hLmxlbmd0
+aAppZih0PjApcmV0dXJuIGFbdC0xXQp0aHJvdyBILmIoSC5XcCgpKX0sCllXOmZ1bmN0aW9uKGEsYixj
+LGQsZSl7dmFyIHQscyxyPUgudDYoYSkKci5DKCJjWDwxPiIpLmEoZCkKaWYoISFhLmltbXV0YWJsZSRs
+aXN0KUgudmgoUC5MNCgic2V0UmFuZ2UiKSkKUC5qQihiLGMsYS5sZW5ndGgpCnQ9Yy1iCmlmKHQ9PT0w
+KXJldHVybgpQLmsxKGUsInNraXBDb3VudCIpCnIuQygiek08MT4iKS5hKGQpCnI9Si5VNihkKQppZihl
+K3Q+ci5nQShkKSl0aHJvdyBILmIoSC5hcigpKQppZihlPGIpZm9yKHM9dC0xO3M+PTA7LS1zKWFbYitz
+XT1yLnEoZCxlK3MpCmVsc2UgZm9yKHM9MDtzPHQ7KytzKWFbYitzXT1yLnEoZCxlK3MpfSwKdmc6ZnVu
+Y3Rpb24oYSxiLGMsZCl7cmV0dXJuIHRoaXMuWVcoYSxiLGMsZCwwKX0sClZyOmZ1bmN0aW9uKGEsYil7
+dmFyIHQscwpILnQ2KGEpLkMoImEyKDEpIikuYShiKQp0PWEubGVuZ3RoCmZvcihzPTA7czx0Oysrcyl7
+aWYoSC5vVChiLiQxKGFbc10pKSlyZXR1cm4hMAppZihhLmxlbmd0aCE9PXQpdGhyb3cgSC5iKFAuYTQo
+YSkpfXJldHVybiExfSwKdGc6ZnVuY3Rpb24oYSxiKXt2YXIgdApmb3IodD0wO3Q8YS5sZW5ndGg7Kyt0
+KWlmKEouUk0oYVt0XSxiKSlyZXR1cm4hMApyZXR1cm4hMX0sClo6ZnVuY3Rpb24oYSl7cmV0dXJuIFAu
+V0UoYSwiWyIsIl0iKX0sCmdrejpmdW5jdGlvbihhKXtyZXR1cm4gbmV3IEoubTEoYSxhLmxlbmd0aCxI
+LnQ2KGEpLkMoIm0xPDE+IikpfSwKZ2lPOmZ1bmN0aW9uKGEpe3JldHVybiBILmVRKGEpfSwKZ0E6ZnVu
+Y3Rpb24oYSl7cmV0dXJuIGEubGVuZ3RofSwKc0E6ZnVuY3Rpb24oYSxiKXtpZighIWEuZml4ZWQkbGVu
+Z3RoKUgudmgoUC5MNCgic2V0IGxlbmd0aCIpKQppZihiPDApdGhyb3cgSC5iKFAuVEUoYiwwLG51bGws
+Im5ld0xlbmd0aCIsbnVsbCkpCmEubGVuZ3RoPWJ9LApxOmZ1bmN0aW9uKGEsYil7SC5XWShiKQppZihi
+Pj1hLmxlbmd0aHx8YjwwKXRocm93IEguYihILkhZKGEsYikpCnJldHVybiBhW2JdfSwKWTpmdW5jdGlv
+bihhLGIsYyl7SC50NihhKS5jLmEoYykKaWYoISFhLmltbXV0YWJsZSRsaXN0KUgudmgoUC5MNCgiaW5k
+ZXhlZCBzZXQiKSkKaWYoYj49YS5sZW5ndGh8fGI8MCl0aHJvdyBILmIoSC5IWShhLGIpKQphW2JdPWN9
+LAokaWJROjEsCiRpY1g6MSwKJGl6TToxfQpKLlBvLnByb3RvdHlwZT17fQpKLm0xLnByb3RvdHlwZT17
+CmdsOmZ1bmN0aW9uKCl7cmV0dXJuIHRoaXMuZH0sCkY6ZnVuY3Rpb24oKXt2YXIgdCxzPXRoaXMscj1z
+LmEscT1yLmxlbmd0aAppZihzLmIhPT1xKXRocm93IEguYihILmxrKHIpKQp0PXMuYwppZih0Pj1xKXtz
+LnNIKG51bGwpCnJldHVybiExfXMuc0goclt0XSk7KytzLmMKcmV0dXJuITB9LApzSDpmdW5jdGlvbihh
+KXt0aGlzLmQ9dGhpcy4kdGkuYy5hKGEpfSwKJGlBbjoxfQpKLnFJLnByb3RvdHlwZT17Cnl1OmZ1bmN0
+aW9uKGEpe3ZhciB0CmlmKGE+PS0yMTQ3NDgzNjQ4JiZhPD0yMTQ3NDgzNjQ3KXJldHVybiBhfDAKaWYo
+aXNGaW5pdGUoYSkpe3Q9YTwwP01hdGguY2VpbChhKTpNYXRoLmZsb29yKGEpCnJldHVybiB0KzB9dGhy
+b3cgSC5iKFAuTDQoIiIrYSsiLnRvSW50KCkiKSl9LAp6UTpmdW5jdGlvbihhKXtpZihhPjApe2lmKGEh
+PT0xLzApcmV0dXJuIE1hdGgucm91bmQoYSl9ZWxzZSBpZihhPi0xLzApcmV0dXJuIDAtTWF0aC5yb3Vu
+ZCgwLWEpCnRocm93IEguYihQLkw0KCIiK2ErIi5yb3VuZCgpIikpfSwKRDg6ZnVuY3Rpb24oYSxiKXt2
+YXIgdCxzLHIscQppZihiPDJ8fGI+MzYpdGhyb3cgSC5iKFAuVEUoYiwyLDM2LCJyYWRpeCIsbnVsbCkp
+CnQ9YS50b1N0cmluZyhiKQppZihDLnhCLm0odCx0Lmxlbmd0aC0xKSE9PTQxKXJldHVybiB0CnM9L14o
+W1xkYS16XSspKD86XC4oW1xkYS16XSspKT9cKGVcKyhcZCspXCkkLy5leGVjKHQpCmlmKHM9PW51bGwp
+SC52aChQLkw0KCJVbmV4cGVjdGVkIHRvU3RyaW5nIHJlc3VsdDogIit0KSkKcj1zLmxlbmd0aAppZigx
+Pj1yKXJldHVybiBILmsocywxKQp0PXNbMV0KaWYoMz49cilyZXR1cm4gSC5rKHMsMykKcT0rc1szXQpy
+PXNbMl0KaWYociE9bnVsbCl7dCs9cgpxLT1yLmxlbmd0aH1yZXR1cm4gdCtDLnhCLkl4KCIwIixxKX0s
+Clo6ZnVuY3Rpb24oYSl7aWYoYT09PTAmJjEvYTwwKXJldHVybiItMC4wIgplbHNlIHJldHVybiIiK2F9
+LApnaU86ZnVuY3Rpb24oYSl7dmFyIHQscyxyLHEscD1hfDAKaWYoYT09PXApcmV0dXJuIDUzNjg3MDkx
+MSZwCnQ9TWF0aC5hYnMoYSkKcz1NYXRoLmxvZyh0KS8wLjY5MzE0NzE4MDU1OTk0NTN8MApyPU1hdGgu
+cG93KDIscykKcT10PDE/dC9yOnIvdApyZXR1cm4gNTM2ODcwOTExJigocSo5MDA3MTk5MjU0NzQwOTky
+fDApKyhxKjM1NDIyNDMxODExNzY1MjF8MCkpKjU5OTE5NytzKjEyNTl9LAp6WTpmdW5jdGlvbihhLGIp
+e3ZhciB0PWElYgppZih0PT09MClyZXR1cm4gMAppZih0PjApcmV0dXJuIHQKaWYoYjwwKXJldHVybiB0
+LWIKZWxzZSByZXR1cm4gdCtifSwKd0c6ZnVuY3Rpb24oYSxiKXt2YXIgdAppZihhPjApdD10aGlzLnAz
+KGEsYikKZWxzZXt0PWI+MzE/MzE6Ygp0PWE+PnQ+Pj4wfXJldHVybiB0fSwKYmY6ZnVuY3Rpb24oYSxi
+KXtpZihiPDApdGhyb3cgSC5iKEguSShiKSkKcmV0dXJuIHRoaXMucDMoYSxiKX0sCnAzOmZ1bmN0aW9u
+KGEsYil7cmV0dXJuIGI+MzE/MDphPj4+Yn0sCiRpQ1A6MSwKJGlsZjoxfQpKLnVyLnByb3RvdHlwZT17
+JGlJZjoxfQpKLlZBLnByb3RvdHlwZT17fQpKLkRyLnByb3RvdHlwZT17Cm06ZnVuY3Rpb24oYSxiKXtp
+ZihiPDApdGhyb3cgSC5iKEguSFkoYSxiKSkKaWYoYj49YS5sZW5ndGgpSC52aChILkhZKGEsYikpCnJl
+dHVybiBhLmNoYXJDb2RlQXQoYil9LApXOmZ1bmN0aW9uKGEsYil7aWYoYj49YS5sZW5ndGgpdGhyb3cg
+SC5iKEguSFkoYSxiKSkKcmV0dXJuIGEuY2hhckNvZGVBdChiKX0sCmRkOmZ1bmN0aW9uKGEsYil7cmV0
+dXJuIG5ldyBILk5GKGIsYSwwKX0sCmg6ZnVuY3Rpb24oYSxiKXtpZih0eXBlb2YgYiE9InN0cmluZyIp
+dGhyb3cgSC5iKFAuTDMoYixudWxsLG51bGwpKQpyZXR1cm4gYStifSwKVGM6ZnVuY3Rpb24oYSxiKXt2
+YXIgdD1iLmxlbmd0aCxzPWEubGVuZ3RoCmlmKHQ+cylyZXR1cm4hMQpyZXR1cm4gYj09PXRoaXMuRyhh
+LHMtdCl9LAppNzpmdW5jdGlvbihhLGIsYyxkKXt2YXIgdCxzCmM9UC5qQihiLGMsYS5sZW5ndGgpCnQ9
+YS5zdWJzdHJpbmcoMCxiKQpzPWEuc3Vic3RyaW5nKGMpCnJldHVybiB0K2Qrc30sClFpOmZ1bmN0aW9u
+KGEsYixjKXt2YXIgdAppZighSC5vayhjKSlILnZoKEguSShjKSkKaWYodHlwZW9mIGMhPT0ibnVtYmVy
+IilyZXR1cm4gYy5KKCkKaWYoYzwwfHxjPmEubGVuZ3RoKXRocm93IEguYihQLlRFKGMsMCxhLmxlbmd0
+aCxudWxsLG51bGwpKQp0PWMrYi5sZW5ndGgKaWYodD5hLmxlbmd0aClyZXR1cm4hMQpyZXR1cm4gYj09
+PWEuc3Vic3RyaW5nKGMsdCl9LApuOmZ1bmN0aW9uKGEsYil7cmV0dXJuIHRoaXMuUWkoYSxiLDApfSwK
+dzpmdW5jdGlvbihhLGIsYyl7aWYoIUgub2soYikpSC52aChILkkoYikpCmlmKGM9PW51bGwpYz1hLmxl
+bmd0aAppZih0eXBlb2YgYiE9PSJudW1iZXIiKXJldHVybiBiLkooKQppZihiPDApdGhyb3cgSC5iKFAu
+TzcoYixudWxsKSkKaWYoYj5jKXRocm93IEguYihQLk83KGIsbnVsbCkpCmlmKGM+YS5sZW5ndGgpdGhy
+b3cgSC5iKFAuTzcoYyxudWxsKSkKcmV0dXJuIGEuc3Vic3RyaW5nKGIsYyl9LApHOmZ1bmN0aW9uKGEs
+Yil7cmV0dXJuIHRoaXMudyhhLGIsbnVsbCl9LApoYzpmdW5jdGlvbihhKXtyZXR1cm4gYS50b0xvd2Vy
+Q2FzZSgpfSwKYlM6ZnVuY3Rpb24oYSl7dmFyIHQscyxyLHE9YS50cmltKCkscD1xLmxlbmd0aAppZihw
+PT09MClyZXR1cm4gcQppZih0aGlzLlcocSwwKT09PTEzMyl7dD1KLm1tKHEsMSkKaWYodD09PXApcmV0
+dXJuIiJ9ZWxzZSB0PTAKcz1wLTEKcj10aGlzLm0ocSxzKT09PTEzMz9KLmMxKHEscyk6cAppZih0PT09
+MCYmcj09PXApcmV0dXJuIHEKcmV0dXJuIHEuc3Vic3RyaW5nKHQscil9LApJeDpmdW5jdGlvbihhLGIp
+e3ZhciB0LHMKaWYoMD49YilyZXR1cm4iIgppZihiPT09MXx8YS5sZW5ndGg9PT0wKXJldHVybiBhCmlm
+KGIhPT1iPj4+MCl0aHJvdyBILmIoQy5FcSkKZm9yKHQ9YSxzPSIiOyEwOyl7aWYoKGImMSk9PT0xKXM9
+dCtzCmI9Yj4+PjEKaWYoYj09PTApYnJlYWsKdCs9dH1yZXR1cm4gc30sClhVOmZ1bmN0aW9uKGEsYixj
+KXt2YXIgdAppZihjPDB8fGM+YS5sZW5ndGgpdGhyb3cgSC5iKFAuVEUoYywwLGEubGVuZ3RoLG51bGws
+bnVsbCkpCnQ9YS5pbmRleE9mKGIsYykKcmV0dXJuIHR9LApPWTpmdW5jdGlvbihhLGIpe3JldHVybiB0
+aGlzLlhVKGEsYiwwKX0sClBrOmZ1bmN0aW9uKGEsYixjKXt2YXIgdCxzCmlmKGM9PW51bGwpYz1hLmxl
+bmd0aAplbHNlIGlmKGM8MHx8Yz5hLmxlbmd0aCl0aHJvdyBILmIoUC5URShjLDAsYS5sZW5ndGgsbnVs
+bCxudWxsKSkKdD1iLmxlbmd0aApzPWEubGVuZ3RoCmlmKGMrdD5zKWM9cy10CnJldHVybiBhLmxhc3RJ
+bmRleE9mKGIsYyl9LApjbjpmdW5jdGlvbihhLGIpe3JldHVybiB0aGlzLlBrKGEsYixudWxsKX0sCklz
+OmZ1bmN0aW9uKGEsYixjKXt2YXIgdD1hLmxlbmd0aAppZihjPnQpdGhyb3cgSC5iKFAuVEUoYywwLHQs
+bnVsbCxudWxsKSkKcmV0dXJuIEgubTIoYSxiLGMpfSwKdGc6ZnVuY3Rpb24oYSxiKXtyZXR1cm4gdGhp
+cy5JcyhhLGIsMCl9LApaOmZ1bmN0aW9uKGEpe3JldHVybiBhfSwKZ2lPOmZ1bmN0aW9uKGEpe3ZhciB0
+LHMscgpmb3IodD1hLmxlbmd0aCxzPTAscj0wO3I8dDsrK3Ipe3M9NTM2ODcwOTExJnMrYS5jaGFyQ29k
+ZUF0KHIpCnM9NTM2ODcwOTExJnMrKCg1MjQyODcmcyk8PDEwKQpzXj1zPj42fXM9NTM2ODcwOTExJnMr
+KCg2NzEwODg2MyZzKTw8MykKc149cz4+MTEKcmV0dXJuIDUzNjg3MDkxMSZzKygoMTYzODMmcyk8PDE1
+KX0sCmdBOmZ1bmN0aW9uKGEpe3JldHVybiBhLmxlbmd0aH0sCnE6ZnVuY3Rpb24oYSxiKXtILldZKGIp
+CmlmKGI+PWEubGVuZ3RofHwhMSl0aHJvdyBILmIoSC5IWShhLGIpKQpyZXR1cm4gYVtiXX0sCiRpdlg6
+MSwKJGlxVToxfQpILnFqLnByb3RvdHlwZT17CmdBOmZ1bmN0aW9uKGEpe3JldHVybiB0aGlzLmEubGVu
+Z3RofSwKcTpmdW5jdGlvbihhLGIpe3JldHVybiBDLnhCLm0odGhpcy5hLEguV1koYikpfX0KSC5iUS5w
+cm90b3R5cGU9e30KSC5hTC5wcm90b3R5cGU9ewpna3o6ZnVuY3Rpb24oYSl7dmFyIHQ9dGhpcwpyZXR1
+cm4gbmV3IEguYTcodCx0LmdBKHQpLEguTGgodCkuQygiYTc8YUwuRT4iKSl9LAp6VjpmdW5jdGlvbihh
+LGIpe3ZhciB0LHMscixxPXRoaXMscD1xLmdBKHEpCmlmKGIubGVuZ3RoIT09MCl7aWYocD09PTApcmV0
+dXJuIiIKdD1ILmQocS5FKDAsMCkpCmlmKHAhPT1xLmdBKHEpKXRocm93IEguYihQLmE0KHEpKQpmb3Io
+cz10LHI9MTtyPHA7KytyKXtzPXMrYitILmQocS5FKDAscikpCmlmKHAhPT1xLmdBKHEpKXRocm93IEgu
+YihQLmE0KHEpKX1yZXR1cm4gcy5jaGFyQ29kZUF0KDApPT0wP3M6c31lbHNle2ZvcihyPTAscz0iIjty
+PHA7KytyKXtzKz1ILmQocS5FKDAscikpCmlmKHAhPT1xLmdBKHEpKXRocm93IEguYihQLmE0KHEpKX1y
+ZXR1cm4gcy5jaGFyQ29kZUF0KDApPT0wP3M6c319LApldjpmdW5jdGlvbihhLGIpe3JldHVybiB0aGlz
+LkdHKDAsSC5MaCh0aGlzKS5DKCJhMihhTC5FKSIpLmEoYikpfSwKRTI6ZnVuY3Rpb24oYSxiLGMpe3Zh
+ciB0PUguTGgodGhpcykKcmV0dXJuIG5ldyBILmxKKHRoaXMsdC5LcShjKS5DKCIxKGFMLkUpIikuYShi
+KSx0LkMoIkA8YUwuRT4iKS5LcShjKS5DKCJsSjwxLDI+IikpfX0KSC5uSC5wcm90b3R5cGU9ewpnVUQ6
+ZnVuY3Rpb24oKXt2YXIgdD1KLkgodGhpcy5hKSxzPXRoaXMuYwppZihzPT1udWxsfHxzPnQpcmV0dXJu
+IHQKcmV0dXJuIHN9LApnQXM6ZnVuY3Rpb24oKXt2YXIgdD1KLkgodGhpcy5hKSxzPXRoaXMuYgppZihz
+PnQpcmV0dXJuIHQKcmV0dXJuIHN9LApnQTpmdW5jdGlvbihhKXt2YXIgdCxzPUouSCh0aGlzLmEpLHI9
+dGhpcy5iCmlmKHI+PXMpcmV0dXJuIDAKdD10aGlzLmMKaWYodD09bnVsbHx8dD49cylyZXR1cm4gcy1y
+CmlmKHR5cGVvZiB0IT09Im51bWJlciIpcmV0dXJuIHQuSE4oKQpyZXR1cm4gdC1yfSwKRTpmdW5jdGlv
+bihhLGIpe3ZhciB0LHM9dGhpcyxyPXMuZ0FzKCkrYgppZihiPj0wKXt0PXMuZ1VEKCkKaWYodHlwZW9m
+IHQhPT0ibnVtYmVyIilyZXR1cm4gSC5wWSh0KQp0PXI+PXR9ZWxzZSB0PSEwCmlmKHQpdGhyb3cgSC5i
+KFAudChiLHMsImluZGV4IixudWxsLG51bGwpKQpyZXR1cm4gSi5HQShzLmEscil9fQpILmE3LnByb3Rv
+dHlwZT17CmdsOmZ1bmN0aW9uKCl7cmV0dXJuIHRoaXMuZH0sCkY6ZnVuY3Rpb24oKXt2YXIgdCxzPXRo
+aXMscj1zLmEscT1KLlU2KHIpLHA9cS5nQShyKQppZihzLmIhPT1wKXRocm93IEguYihQLmE0KHIpKQp0
+PXMuYwppZih0Pj1wKXtzLnNJKG51bGwpCnJldHVybiExfXMuc0kocS5FKHIsdCkpOysrcy5jCnJldHVy
+biEwfSwKc0k6ZnVuY3Rpb24oYSl7dGhpcy5kPXRoaXMuJHRpLmMuYShhKX0sCiRpQW46MX0KSC5pMS5w
+cm90b3R5cGU9ewpna3o6ZnVuY3Rpb24oYSl7dmFyIHQ9SC5MaCh0aGlzKQpyZXR1cm4gbmV3IEguTUgo
+Si5JVCh0aGlzLmEpLHRoaXMuYix0LkMoIkA8MT4iKS5LcSh0LlFbMV0pLkMoIk1IPDEsMj4iKSl9LApn
+QTpmdW5jdGlvbihhKXtyZXR1cm4gSi5IKHRoaXMuYSl9fQpILnh5LnByb3RvdHlwZT17JGliUToxfQpI
+Lk1ILnByb3RvdHlwZT17CkY6ZnVuY3Rpb24oKXt2YXIgdD10aGlzLHM9dC5iCmlmKHMuRigpKXt0LnNJ
+KHQuYy4kMShzLmdsKCkpKQpyZXR1cm4hMH10LnNJKG51bGwpCnJldHVybiExfSwKZ2w6ZnVuY3Rpb24o
+KXtyZXR1cm4gdGhpcy5hfSwKc0k6ZnVuY3Rpb24oYSl7dGhpcy5hPXRoaXMuJHRpLlFbMV0uYShhKX19
+CkgubEoucHJvdG90eXBlPXsKZ0E6ZnVuY3Rpb24oYSl7cmV0dXJuIEouSCh0aGlzLmEpfSwKRTpmdW5j
+dGlvbihhLGIpe3JldHVybiB0aGlzLmIuJDEoSi5HQSh0aGlzLmEsYikpfX0KSC5VNS5wcm90b3R5cGU9
+ewpna3o6ZnVuY3Rpb24oYSl7cmV0dXJuIG5ldyBILnZHKEouSVQodGhpcy5hKSx0aGlzLmIsdGhpcy4k
+dGkuQygidkc8MT4iKSl9fQpILnZHLnByb3RvdHlwZT17CkY6ZnVuY3Rpb24oKXt2YXIgdCxzCmZvcih0
+PXRoaXMuYSxzPXRoaXMuYjt0LkYoKTspaWYoSC5vVChzLiQxKHQuZ2woKSkpKXJldHVybiEwCnJldHVy
+biExfSwKZ2w6ZnVuY3Rpb24oKXtyZXR1cm4gdGhpcy5hLmdsKCl9fQpILlNVLnByb3RvdHlwZT17fQpI
+LlJlLnByb3RvdHlwZT17Clk6ZnVuY3Rpb24oYSxiLGMpe0guTGgodGhpcykuQygiUmUuRSIpLmEoYykK
+dGhyb3cgSC5iKFAuTDQoIkNhbm5vdCBtb2RpZnkgYW4gdW5tb2RpZmlhYmxlIGxpc3QiKSl9fQpILncy
+LnByb3RvdHlwZT17fQpILnd2LnByb3RvdHlwZT17CmdpTzpmdW5jdGlvbihhKXt2YXIgdD10aGlzLl9o
+YXNoQ29kZQppZih0IT1udWxsKXJldHVybiB0CnQ9NTM2ODcwOTExJjY2NDU5NypKLmhmKHRoaXMuYSkK
+dGhpcy5faGFzaENvZGU9dApyZXR1cm4gdH0sClo6ZnVuY3Rpb24oYSl7cmV0dXJuJ1N5bWJvbCgiJytI
+LmQodGhpcy5hKSsnIiknfSwKRE46ZnVuY3Rpb24oYSxiKXtpZihiPT1udWxsKXJldHVybiExCnJldHVy
+biBiIGluc3RhbmNlb2YgSC53diYmdGhpcy5hPT1iLmF9LAokaUdEOjF9CkguUEQucHJvdG90eXBlPXt9
+CkguV1UucHJvdG90eXBlPXsKWjpmdW5jdGlvbihhKXtyZXR1cm4gUC5uTyh0aGlzKX0sClk6ZnVuY3Rp
+b24oYSxiLGMpe3ZhciB0PUguTGgodGhpcykKdC5jLmEoYikKdC5RWzFdLmEoYykKcmV0dXJuIEguZGMo
+KX0sCmdQdTpmdW5jdGlvbihhKXtyZXR1cm4gdGhpcy5xNChhLEguTGgodGhpcykuQygiTjM8MSwyPiIp
+KX0sCnE0OmZ1bmN0aW9uKGEsYil7dmFyIHQ9dGhpcwpyZXR1cm4gUC5sMChmdW5jdGlvbigpe3ZhciBz
+PWEKdmFyIHI9MCxxPTEscCxvLG4sbQpyZXR1cm4gZnVuY3Rpb24gJGFzeW5jJGdQdShjLGQpe2lmKGM9
+PT0xKXtwPWQKcj1xfXdoaWxlKHRydWUpc3dpdGNoKHIpe2Nhc2UgMDpvPXQuZ1YoKSxvPW8uZ2t6KG8p
+LG49SC5MaCh0KSxuPW4uQygiQDwxPiIpLktxKG4uUVsxXSkuQygiTjM8MSwyPiIpCmNhc2UgMjppZigh
+by5GKCkpe3I9MwpicmVha31tPW8uZ2woKQpyPTQKcmV0dXJuIG5ldyBQLk4zKG0sdC5xKDAsbSksbikK
+Y2FzZSA0OnI9MgpicmVhawpjYXNlIDM6cmV0dXJuIFAuVGgoKQpjYXNlIDE6cmV0dXJuIFAuWW0ocCl9
+fX0sYil9LAokaVowOjF9CkguTFAucHJvdG90eXBlPXsKZ0E6ZnVuY3Rpb24oYSl7cmV0dXJuIHRoaXMu
+YX0sCng0OmZ1bmN0aW9uKGEpe2lmKHR5cGVvZiBhIT0ic3RyaW5nIilyZXR1cm4hMQppZigiX19wcm90
+b19fIj09PWEpcmV0dXJuITEKcmV0dXJuIHRoaXMuYi5oYXNPd25Qcm9wZXJ0eShhKX0sCnE6ZnVuY3Rp
+b24oYSxiKXtpZighdGhpcy54NChiKSlyZXR1cm4gbnVsbApyZXR1cm4gdGhpcy5xUChiKX0sCnFQOmZ1
+bmN0aW9uKGEpe3JldHVybiB0aGlzLmJbSC5jKGEpXX0sCks6ZnVuY3Rpb24oYSxiKXt2YXIgdCxzLHIs
+cSxwPUguTGgodGhpcykKcC5DKCJ+KDEsMikiKS5hKGIpCnQ9dGhpcy5jCmZvcihzPXQubGVuZ3RoLHA9
+cC5RWzFdLHI9MDtyPHM7KytyKXtxPXRbcl0KYi4kMihxLHAuYSh0aGlzLnFQKHEpKSl9fSwKZ1Y6ZnVu
+Y3Rpb24oKXtyZXR1cm4gbmV3IEguWFIodGhpcyxILkxoKHRoaXMpLkMoIlhSPDE+IikpfX0KSC5YUi5w
+cm90b3R5cGU9ewpna3o6ZnVuY3Rpb24oYSl7dmFyIHQ9dGhpcy5hLmMKcmV0dXJuIG5ldyBKLm0xKHQs
+dC5sZW5ndGgsSC50Nih0KS5DKCJtMTwxPiIpKX0sCmdBOmZ1bmN0aW9uKGEpe3JldHVybiB0aGlzLmEu
+Yy5sZW5ndGh9fQpILkxJLnByb3RvdHlwZT17CmdXYTpmdW5jdGlvbigpe3ZhciB0PXRoaXMuYQpyZXR1
+cm4gdH0sCmduZDpmdW5jdGlvbigpe3ZhciB0LHMscixxLHA9dGhpcwppZihwLmM9PT0xKXJldHVybiBD
+LmhVCnQ9cC5kCnM9dC5sZW5ndGgtcC5lLmxlbmd0aC1wLmYKaWYocz09PTApcmV0dXJuIEMuaFUKcj1b
+XQpmb3IocT0wO3E8czsrK3Epe2lmKHE+PXQubGVuZ3RoKXJldHVybiBILmsodCxxKQpyLnB1c2godFtx
+XSl9cmV0dXJuIEoudW4ocil9LApnVm06ZnVuY3Rpb24oKXt2YXIgdCxzLHIscSxwLG8sbixtLGw9dGhp
+cwppZihsLmMhPT0wKXJldHVybiBDLldPCnQ9bC5lCnM9dC5sZW5ndGgKcj1sLmQKcT1yLmxlbmd0aC1z
+LWwuZgppZihzPT09MClyZXR1cm4gQy5XTwpwPW5ldyBILk41KHUuZW8pCmZvcihvPTA7bzxzOysrbyl7
+aWYobz49dC5sZW5ndGgpcmV0dXJuIEguayh0LG8pCm49dFtvXQptPXErbwppZihtPDB8fG0+PXIubGVu
+Z3RoKXJldHVybiBILmsocixtKQpwLlkoMCxuZXcgSC53dihuKSxyW21dKX1yZXR1cm4gbmV3IEguUEQo
+cCx1LmdGKX0sCiRpdlE6MX0KSC5Dai5wcm90b3R5cGU9ewokMjpmdW5jdGlvbihhLGIpe3ZhciB0Ckgu
+YyhhKQp0PXRoaXMuYQp0LmI9dC5iKyIkIitILmQoYSkKQy5ObS5pKHRoaXMuYixhKQpDLk5tLmkodGhp
+cy5jLGIpOysrdC5hfSwKJFM6MTN9CkguZjkucHJvdG90eXBlPXsKcVM6ZnVuY3Rpb24oYSl7dmFyIHQs
+cyxyPXRoaXMscT1uZXcgUmVnRXhwKHIuYSkuZXhlYyhhKQppZihxPT1udWxsKXJldHVybiBudWxsCnQ9
+T2JqZWN0LmNyZWF0ZShudWxsKQpzPXIuYgppZihzIT09LTEpdC5hcmd1bWVudHM9cVtzKzFdCnM9ci5j
+CmlmKHMhPT0tMSl0LmFyZ3VtZW50c0V4cHI9cVtzKzFdCnM9ci5kCmlmKHMhPT0tMSl0LmV4cHI9cVtz
+KzFdCnM9ci5lCmlmKHMhPT0tMSl0Lm1ldGhvZD1xW3MrMV0Kcz1yLmYKaWYocyE9PS0xKXQucmVjZWl2
+ZXI9cVtzKzFdCnJldHVybiB0fX0KSC5XMC5wcm90b3R5cGU9ewpaOmZ1bmN0aW9uKGEpe3ZhciB0PXRo
+aXMuYgppZih0PT1udWxsKXJldHVybiJOb1N1Y2hNZXRob2RFcnJvcjogIitILmQodGhpcy5hKQpyZXR1
+cm4iTm9TdWNoTWV0aG9kRXJyb3I6IG1ldGhvZCBub3QgZm91bmQ6ICciK3QrIicgb24gbnVsbCJ9fQpI
+LmF6LnByb3RvdHlwZT17Clo6ZnVuY3Rpb24oYSl7dmFyIHQscz10aGlzLHI9Ik5vU3VjaE1ldGhvZEVy
+cm9yOiBtZXRob2Qgbm90IGZvdW5kOiAnIixxPXMuYgppZihxPT1udWxsKXJldHVybiJOb1N1Y2hNZXRo
+b2RFcnJvcjogIitILmQocy5hKQp0PXMuYwppZih0PT1udWxsKXJldHVybiByK3ErIicgKCIrSC5kKHMu
+YSkrIikiCnJldHVybiByK3ErIicgb24gJyIrdCsiJyAoIitILmQocy5hKSsiKSJ9fQpILnZWLnByb3Rv
+dHlwZT17Clo6ZnVuY3Rpb24oYSl7dmFyIHQ9dGhpcy5hCnJldHVybiB0Lmxlbmd0aD09PTA/IkVycm9y
+IjoiRXJyb3I6ICIrdH19CkguYnEucHJvdG90eXBlPXt9CkguQW0ucHJvdG90eXBlPXsKJDE6ZnVuY3Rp
+b24oYSl7aWYodS5XLmIoYSkpaWYoYS4kdGhyb3duSnNFcnJvcj09bnVsbClhLiR0aHJvd25Kc0Vycm9y
+PXRoaXMuYQpyZXR1cm4gYX0sCiRTOjN9CkguWE8ucHJvdG90eXBlPXsKWjpmdW5jdGlvbihhKXt2YXIg
+dCxzPXRoaXMuYgppZihzIT1udWxsKXJldHVybiBzCnM9dGhpcy5hCnQ9cyE9PW51bGwmJnR5cGVvZiBz
+PT09Im9iamVjdCI/cy5zdGFjazpudWxsCnJldHVybiB0aGlzLmI9dD09bnVsbD8iIjp0fSwKJGlHejox
+fQpILlRwLnByb3RvdHlwZT17Clo6ZnVuY3Rpb24oYSl7dmFyIHQ9dGhpcy5jb25zdHJ1Y3RvcixzPXQ9
+PW51bGw/bnVsbDp0Lm5hbWUKcmV0dXJuIkNsb3N1cmUgJyIrSC5OUShzPT1udWxsPyJ1bmtub3duIjpz
+KSsiJyJ9LAokaUVIOjEsCmdRbDpmdW5jdGlvbigpe3JldHVybiB0aGlzfSwKJEM6IiQxIiwKJFI6MSwK
+JEQ6bnVsbH0KSC5sYy5wcm90b3R5cGU9e30KSC56eC5wcm90b3R5cGU9ewpaOmZ1bmN0aW9uKGEpe3Zh
+ciB0PXRoaXMuJHN0YXRpY19uYW1lCmlmKHQ9PW51bGwpcmV0dXJuIkNsb3N1cmUgb2YgdW5rbm93biBz
+dGF0aWMgbWV0aG9kIgpyZXR1cm4iQ2xvc3VyZSAnIitILk5RKHQpKyInIn19CkguankucHJvdG90eXBl
+PXsKRE46ZnVuY3Rpb24oYSxiKXt2YXIgdD10aGlzCmlmKGI9PW51bGwpcmV0dXJuITEKaWYodD09PWIp
+cmV0dXJuITAKaWYoIShiIGluc3RhbmNlb2YgSC5qeSkpcmV0dXJuITEKcmV0dXJuIHQuYT09PWIuYSYm
+dC5iPT09Yi5iJiZ0LmM9PT1iLmN9LApnaU86ZnVuY3Rpb24oYSl7dmFyIHQscz10aGlzLmMKaWYocz09
+bnVsbCl0PUguZVEodGhpcy5hKQplbHNlIHQ9dHlwZW9mIHMhPT0ib2JqZWN0Ij9KLmhmKHMpOkguZVEo
+cykKcmV0dXJuKHReSC5lUSh0aGlzLmIpKT4+PjB9LApaOmZ1bmN0aW9uKGEpe3ZhciB0PXRoaXMuYwpp
+Zih0PT1udWxsKXQ9dGhpcy5hCnJldHVybiJDbG9zdXJlICciK0guZCh0aGlzLmQpKyInIG9mICIrKCJJ
+bnN0YW5jZSBvZiAnIitILmQoSC5saCh0KSkrIiciKX19CkguRXEucHJvdG90eXBlPXsKWjpmdW5jdGlv
+bihhKXtyZXR1cm4iUnVudGltZUVycm9yOiAiK0guZCh0aGlzLmEpfX0KSC5rWS5wcm90b3R5cGU9ewpa
+OmZ1bmN0aW9uKGEpe3JldHVybiJBc3NlcnRpb24gZmFpbGVkOiAiK1AuaCh0aGlzLmEpfX0KSC5ONS5w
+cm90b3R5cGU9ewpnQTpmdW5jdGlvbihhKXtyZXR1cm4gdGhpcy5hfSwKZ1Y6ZnVuY3Rpb24oKXtyZXR1
+cm4gbmV3IEguaTUodGhpcyxILkxoKHRoaXMpLkMoImk1PDE+IikpfSwKeDQ6ZnVuY3Rpb24oYSl7dmFy
+IHQscwppZih0eXBlb2YgYT09InN0cmluZyIpe3Q9dGhpcy5iCmlmKHQ9PW51bGwpcmV0dXJuITEKcmV0
+dXJuIHRoaXMuWHUodCxhKX1lbHNle3M9dGhpcy5DWChhKQpyZXR1cm4gc319LApDWDpmdW5jdGlvbihh
+KXt2YXIgdD10aGlzLmQKaWYodD09bnVsbClyZXR1cm4hMQpyZXR1cm4gdGhpcy5GaCh0aGlzLkJ0KHQs
+Si5oZihhKSYweDNmZmZmZmYpLGEpPj0wfSwKcTpmdW5jdGlvbihhLGIpe3ZhciB0LHMscixxLHA9dGhp
+cyxvPW51bGwKaWYodHlwZW9mIGI9PSJzdHJpbmciKXt0PXAuYgppZih0PT1udWxsKXJldHVybiBvCnM9
+cC5qMih0LGIpCnI9cz09bnVsbD9vOnMuYgpyZXR1cm4gcn1lbHNlIGlmKHR5cGVvZiBiPT0ibnVtYmVy
+IiYmKGImMHgzZmZmZmZmKT09PWIpe3E9cC5jCmlmKHE9PW51bGwpcmV0dXJuIG8Kcz1wLmoyKHEsYikK
+cj1zPT1udWxsP286cy5iCnJldHVybiByfWVsc2UgcmV0dXJuIHAuYWEoYil9LAphYTpmdW5jdGlvbihh
+KXt2YXIgdCxzLHI9dGhpcy5kCmlmKHI9PW51bGwpcmV0dXJuIG51bGwKdD10aGlzLkJ0KHIsSi5oZihh
+KSYweDNmZmZmZmYpCnM9dGhpcy5GaCh0LGEpCmlmKHM8MClyZXR1cm4gbnVsbApyZXR1cm4gdFtzXS5i
+fSwKWTpmdW5jdGlvbihhLGIsYyl7dmFyIHQscyxyLHEscCxvLG49dGhpcyxtPUguTGgobikKbS5jLmEo
+YikKbS5RWzFdLmEoYykKaWYodHlwZW9mIGI9PSJzdHJpbmciKXt0PW4uYgpuLkVIKHQ9PW51bGw/bi5i
+PW4ueksoKTp0LGIsYyl9ZWxzZSBpZih0eXBlb2YgYj09Im51bWJlciImJihiJjB4M2ZmZmZmZik9PT1i
+KXtzPW4uYwpuLkVIKHM9PW51bGw/bi5jPW4ueksoKTpzLGIsYyl9ZWxzZXtyPW4uZAppZihyPT1udWxs
+KXI9bi5kPW4ueksoKQpxPUouaGYoYikmMHgzZmZmZmZmCnA9bi5CdChyLHEpCmlmKHA9PW51bGwpbi5F
+SShyLHEsW24uSG4oYixjKV0pCmVsc2V7bz1uLkZoKHAsYikKaWYobz49MClwW29dLmI9YwplbHNlIHAu
+cHVzaChuLkhuKGIsYykpfX19LApLOmZ1bmN0aW9uKGEsYil7dmFyIHQscyxyPXRoaXMKSC5MaChyKS5D
+KCJ+KDEsMikiKS5hKGIpCnQ9ci5lCnM9ci5yCmZvcig7dCE9bnVsbDspe2IuJDIodC5hLHQuYikKaWYo
+cyE9PXIucil0aHJvdyBILmIoUC5hNChyKSkKdD10LmN9fSwKRUg6ZnVuY3Rpb24oYSxiLGMpe3ZhciB0
+LHM9dGhpcyxyPUguTGgocykKci5jLmEoYikKci5RWzFdLmEoYykKdD1zLmoyKGEsYikKaWYodD09bnVs
+bClzLkVJKGEsYixzLkhuKGIsYykpCmVsc2UgdC5iPWN9LAprczpmdW5jdGlvbigpe3RoaXMucj10aGlz
+LnIrMSY2NzEwODg2M30sCkhuOmZ1bmN0aW9uKGEsYil7dmFyIHQscz10aGlzLHI9SC5MaChzKSxxPW5l
+dyBILmRiKHIuYy5hKGEpLHIuUVsxXS5hKGIpKQppZihzLmU9PW51bGwpcy5lPXMuZj1xCmVsc2V7dD1z
+LmYKcS5kPXQKcy5mPXQuYz1xfSsrcy5hCnMua3MoKQpyZXR1cm4gcX0sCkZoOmZ1bmN0aW9uKGEsYil7
+dmFyIHQscwppZihhPT1udWxsKXJldHVybi0xCnQ9YS5sZW5ndGgKZm9yKHM9MDtzPHQ7KytzKWlmKEou
+Uk0oYVtzXS5hLGIpKXJldHVybiBzCnJldHVybi0xfSwKWjpmdW5jdGlvbihhKXtyZXR1cm4gUC5uTyh0
+aGlzKX0sCmoyOmZ1bmN0aW9uKGEsYil7cmV0dXJuIGFbYl19LApCdDpmdW5jdGlvbihhLGIpe3JldHVy
+biBhW2JdfSwKRUk6ZnVuY3Rpb24oYSxiLGMpe2FbYl09Y30sCnJuOmZ1bmN0aW9uKGEsYil7ZGVsZXRl
+IGFbYl19LApYdTpmdW5jdGlvbihhLGIpe3JldHVybiB0aGlzLmoyKGEsYikhPW51bGx9LAp6SzpmdW5j
+dGlvbigpe3ZhciB0PSI8bm9uLWlkZW50aWZpZXIta2V5PiIscz1PYmplY3QuY3JlYXRlKG51bGwpCnRo
+aXMuRUkocyx0LHMpCnRoaXMucm4ocyx0KQpyZXR1cm4gc30sCiRpRm86MX0KSC5kYi5wcm90b3R5cGU9
+e30KSC5pNS5wcm90b3R5cGU9ewpnQTpmdW5jdGlvbihhKXtyZXR1cm4gdGhpcy5hLmF9LApna3o6ZnVu
+Y3Rpb24oYSl7dmFyIHQ9dGhpcy5hLHM9bmV3IEguTjYodCx0LnIsdGhpcy4kdGkuQygiTjY8MT4iKSkK
+cy5jPXQuZQpyZXR1cm4gc319CkguTjYucHJvdG90eXBlPXsKZ2w6ZnVuY3Rpb24oKXtyZXR1cm4gdGhp
+cy5kfSwKRjpmdW5jdGlvbigpe3ZhciB0PXRoaXMscz10LmEKaWYodC5iIT09cy5yKXRocm93IEguYihQ
+LmE0KHMpKQplbHNle3M9dC5jCmlmKHM9PW51bGwpe3Quc3FZKG51bGwpCnJldHVybiExfWVsc2V7dC5z
+cVkocy5hKQp0LmM9dC5jLmMKcmV0dXJuITB9fX0sCnNxWTpmdW5jdGlvbihhKXt0aGlzLmQ9dGhpcy4k
+dGkuYy5hKGEpfSwKJGlBbjoxfQpILnIucHJvdG90eXBlPXsKJDE6ZnVuY3Rpb24oYSl7cmV0dXJuIHRo
+aXMuYShhKX0sCiRTOjN9CkguZEMucHJvdG90eXBlPXsKJDI6ZnVuY3Rpb24oYSxiKXtyZXR1cm4gdGhp
+cy5hKGEsYil9LAokUzozOH0KSC53Ti5wcm90b3R5cGU9ewokMTpmdW5jdGlvbihhKXtyZXR1cm4gdGhp
+cy5hKEguYyhhKSl9LAokUzozN30KSC5WUi5wcm90b3R5cGU9ewpaOmZ1bmN0aW9uKGEpe3JldHVybiJS
+ZWdFeHAvIit0aGlzLmErIi8iK3RoaXMuYi5mbGFnc30sCmdIYzpmdW5jdGlvbigpe3ZhciB0PXRoaXMs
+cz10LmMKaWYocyE9bnVsbClyZXR1cm4gcwpzPXQuYgpyZXR1cm4gdC5jPUgudjQodC5hLHMubXVsdGls
+aW5lLCFzLmlnbm9yZUNhc2Uscy51bmljb2RlLHMuZG90QWxsLCEwKX0sCmRkOmZ1bmN0aW9uKGEsYil7
+cmV0dXJuIG5ldyBILktXKHRoaXMsYiwwKX0sClVaOmZ1bmN0aW9uKGEsYil7dmFyIHQscz10aGlzLmdI
+YygpCnMubGFzdEluZGV4PWIKdD1zLmV4ZWMoYSkKaWYodD09bnVsbClyZXR1cm4gbnVsbApyZXR1cm4g
+bmV3IEguRUsodCl9LAokaXZYOjEsCiRpd0w6MX0KSC5FSy5wcm90b3R5cGU9ewpxOmZ1bmN0aW9uKGEs
+Yil7dmFyIHQKSC5XWShiKQp0PXRoaXMuYgppZihiPj10Lmxlbmd0aClyZXR1cm4gSC5rKHQsYikKcmV0
+dXJuIHRbYl19LAokaU9kOjEsCiRpaWI6MX0KSC5LVy5wcm90b3R5cGU9ewpna3o6ZnVuY3Rpb24oYSl7
+cmV0dXJuIG5ldyBILlBiKHRoaXMuYSx0aGlzLmIsdGhpcy5jKX19CkguUGIucHJvdG90eXBlPXsKZ2w6
+ZnVuY3Rpb24oKXtyZXR1cm4gdGhpcy5kfSwKRjpmdW5jdGlvbigpe3ZhciB0LHMscixxLHA9dGhpcyxv
+PXAuYgppZihvPT1udWxsKXJldHVybiExCnQ9cC5jCmlmKHQ8PW8ubGVuZ3RoKXtzPXAuYQpyPXMuVVoo
+byx0KQppZihyIT1udWxsKXtwLmQ9cgpvPXIuYgp0PW8uaW5kZXgKcT10K29bMF0ubGVuZ3RoCmlmKHQ9
+PT1xKXtpZihzLmIudW5pY29kZSl7bz1wLmMKdD1vKzEKcz1wLmIKaWYodDxzLmxlbmd0aCl7bz1KLnJZ
+KHMpLm0ocyxvKQppZihvPj01NTI5NiYmbzw9NTYzMTkpe289Qy54Qi5tKHMsdCkKbz1vPj01NjMyMCYm
+bzw9NTczNDN9ZWxzZSBvPSExfWVsc2Ugbz0hMX1lbHNlIG89ITEKcT0obz9xKzE6cSkrMX1wLmM9cQpy
+ZXR1cm4hMH19cC5iPXAuZD1udWxsCnJldHVybiExfSwKJGlBbjoxfQpILnRRLnByb3RvdHlwZT17CnE6
+ZnVuY3Rpb24oYSxiKXtILldZKGIpCmlmKGIhPT0wKUgudmgoUC5PNyhiLG51bGwpKQpyZXR1cm4gdGhp
+cy5jfSwKJGlPZDoxfQpILk5GLnByb3RvdHlwZT17CmdrejpmdW5jdGlvbihhKXtyZXR1cm4gbmV3IEgu
+U2QodGhpcy5hLHRoaXMuYix0aGlzLmMpfX0KSC5TZC5wcm90b3R5cGU9ewpGOmZ1bmN0aW9uKCl7dmFy
+IHQscyxyPXRoaXMscT1yLmMscD1yLmIsbz1wLmxlbmd0aCxuPXIuYSxtPW4ubGVuZ3RoCmlmKHErbz5t
+KXtyLmQ9bnVsbApyZXR1cm4hMX10PW4uaW5kZXhPZihwLHEpCmlmKHQ8MCl7ci5jPW0rMQpyLmQ9bnVs
+bApyZXR1cm4hMX1zPXQrbwpyLmQ9bmV3IEgudFEodCxwKQpyLmM9cz09PXIuYz9zKzE6cwpyZXR1cm4h
+MH0sCmdsOmZ1bmN0aW9uKCl7cmV0dXJuIHRoaXMuZH0sCiRpQW46MX0KSC5wRi5wcm90b3R5cGU9eyRp
+cEY6MSwkaUFTOjF9CkguYjAucHJvdG90eXBlPXsKZ0E6ZnVuY3Rpb24oYSl7cmV0dXJuIGEubGVuZ3Ro
+fSwKJGlYajoxfQpILkRnLnByb3RvdHlwZT17CnE6ZnVuY3Rpb24oYSxiKXtILldZKGIpCkgub2QoYixh
+LGEubGVuZ3RoKQpyZXR1cm4gYVtiXX0sClk6ZnVuY3Rpb24oYSxiLGMpe0guZGooYykKSC5vZChiLGEs
+YS5sZW5ndGgpCmFbYl09Y30sCiRpYlE6MSwKJGljWDoxLAokaXpNOjF9CkguUGcucHJvdG90eXBlPXsK
+WTpmdW5jdGlvbihhLGIsYyl7SC5XWShjKQpILm9kKGIsYSxhLmxlbmd0aCkKYVtiXT1jfSwKJGliUTox
+LAokaWNYOjEsCiRpek06MX0KSC54ai5wcm90b3R5cGU9ewpxOmZ1bmN0aW9uKGEsYil7SC5XWShiKQpI
+Lm9kKGIsYSxhLmxlbmd0aCkKcmV0dXJuIGFbYl19fQpILmRFLnByb3RvdHlwZT17CnE6ZnVuY3Rpb24o
+YSxiKXtILldZKGIpCkgub2QoYixhLGEubGVuZ3RoKQpyZXR1cm4gYVtiXX19CkguWkEucHJvdG90eXBl
+PXsKcTpmdW5jdGlvbihhLGIpe0guV1koYikKSC5vZChiLGEsYS5sZW5ndGgpCnJldHVybiBhW2JdfX0K
+SC53Zi5wcm90b3R5cGU9ewpxOmZ1bmN0aW9uKGEsYil7SC5XWShiKQpILm9kKGIsYSxhLmxlbmd0aCkK
+cmV0dXJuIGFbYl19fQpILlBxLnByb3RvdHlwZT17CnE6ZnVuY3Rpb24oYSxiKXtILldZKGIpCkgub2Qo
+YixhLGEubGVuZ3RoKQpyZXR1cm4gYVtiXX19CkguZUUucHJvdG90eXBlPXsKZ0E6ZnVuY3Rpb24oYSl7
+cmV0dXJuIGEubGVuZ3RofSwKcTpmdW5jdGlvbihhLGIpe0guV1koYikKSC5vZChiLGEsYS5sZW5ndGgp
+CnJldHVybiBhW2JdfX0KSC5WNi5wcm90b3R5cGU9ewpnQTpmdW5jdGlvbihhKXtyZXR1cm4gYS5sZW5n
+dGh9LApxOmZ1bmN0aW9uKGEsYil7SC5XWShiKQpILm9kKGIsYSxhLmxlbmd0aCkKcmV0dXJuIGFbYl19
+LAokaVY2OjEsCiRpbjY6MX0KSC5SRy5wcm90b3R5cGU9e30KSC5WUC5wcm90b3R5cGU9e30KSC5XQi5w
+cm90b3R5cGU9e30KSC5aRy5wcm90b3R5cGU9e30KSC5KYy5wcm90b3R5cGU9ewpDOmZ1bmN0aW9uKGEp
+e3JldHVybiBILmNFKHYudHlwZVVuaXZlcnNlLHRoaXMsYSl9LApLcTpmdW5jdGlvbihhKXtyZXR1cm4g
+SC52NSh2LnR5cGVVbml2ZXJzZSx0aGlzLGEpfX0KSC5FVC5wcm90b3R5cGU9e30KSC51OS5wcm90b3R5
+cGU9ewpaOmZ1bmN0aW9uKGEpe3JldHVybiB0aGlzLmF9fQpILngucHJvdG90eXBlPXt9ClAudGgucHJv
+dG90eXBlPXsKJDE6ZnVuY3Rpb24oYSl7dmFyIHQ9dGhpcy5hLHM9dC5hCnQuYT1udWxsCnMuJDAoKX0s
+CiRTOjEyfQpQLmhhLnByb3RvdHlwZT17CiQxOmZ1bmN0aW9uKGEpe3ZhciB0LHMKdGhpcy5hLmE9dS5N
+LmEoYSkKdD10aGlzLmIKcz10aGlzLmMKdC5maXJzdENoaWxkP3QucmVtb3ZlQ2hpbGQocyk6dC5hcHBl
+bmRDaGlsZChzKX0sCiRTOjIwfQpQLlZzLnByb3RvdHlwZT17CiQwOmZ1bmN0aW9uKCl7dGhpcy5hLiQw
+KCl9LAokQzoiJDAiLAokUjowLAokUzowfQpQLkZ0LnByb3RvdHlwZT17CiQwOmZ1bmN0aW9uKCl7dGhp
+cy5hLiQwKCl9LAokQzoiJDAiLAokUjowLAokUzowfQpQLlczLnByb3RvdHlwZT17CkNZOmZ1bmN0aW9u
+KGEsYil7aWYoc2VsZi5zZXRUaW1lb3V0IT1udWxsKXNlbGYuc2V0VGltZW91dChILnRSKG5ldyBQLnlI
+KHRoaXMsYiksMCksYSkKZWxzZSB0aHJvdyBILmIoUC5MNCgiYHNldFRpbWVvdXQoKWAgbm90IGZvdW5k
+LiIpKX19ClAueUgucHJvdG90eXBlPXsKJDA6ZnVuY3Rpb24oKXt0aGlzLmIuJDAoKX0sCiRDOiIkMCIs
+CiRSOjAsCiRTOjJ9ClAuaWgucHJvdG90eXBlPXsKYU06ZnVuY3Rpb24oYSxiKXt2YXIgdCxzLHI9dGhp
+cy4kdGkKci5DKCIxLyIpLmEoYikKdD0hdGhpcy5ifHxyLkMoImI4PDE+IikuYihiKQpzPXRoaXMuYQpp
+Zih0KXMuWGYoYikKZWxzZSBzLlgyKHIuYy5hKGIpKX0sCncwOmZ1bmN0aW9uKGEsYil7dmFyIHQKaWYo
+Yj09bnVsbCliPVAudjAoYSkKdD10aGlzLmEKaWYodGhpcy5iKXQuWkwoYSxiKQplbHNlIHQuTmsoYSxi
+KX19ClAuV00ucHJvdG90eXBlPXsKJDE6ZnVuY3Rpb24oYSl7cmV0dXJuIHRoaXMuYS4kMigwLGEpfSwK
+JFM6NDd9ClAuU1gucHJvdG90eXBlPXsKJDI6ZnVuY3Rpb24oYSxiKXt0aGlzLmEuJDIoMSxuZXcgSC5i
+cShhLHUubC5hKGIpKSl9LAokQzoiJDIiLAokUjoyLAokUzoyMX0KUC5Hcy5wcm90b3R5cGU9ewokMjpm
+dW5jdGlvbihhLGIpe3RoaXMuYShILldZKGEpLGIpfSwKJFM6MjZ9ClAuRnkucHJvdG90eXBlPXsKWjpm
+dW5jdGlvbihhKXtyZXR1cm4iSXRlcmF0aW9uTWFya2VyKCIrdGhpcy5iKyIsICIrSC5kKHRoaXMuYSkr
+IikifX0KUC5HVi5wcm90b3R5cGU9ewpnbDpmdW5jdGlvbigpe3ZhciB0PXRoaXMuYwppZih0PT1udWxs
+KXJldHVybiB0aGlzLmIKcmV0dXJuIHRoaXMuJHRpLmMuYSh0LmdsKCkpfSwKRjpmdW5jdGlvbigpe3Zh
+ciB0LHMscixxLHA9dGhpcwpmb3IoOyEwOyl7dD1wLmMKaWYodCE9bnVsbClpZih0LkYoKSlyZXR1cm4h
+MAplbHNlIHAuYz1udWxsCnM9ZnVuY3Rpb24oYSxiLGMpe3ZhciBvLG49Ygp3aGlsZSh0cnVlKXRyeXty
+ZXR1cm4gYShuLG8pfWNhdGNoKG0pe289bQpuPWN9fShwLmEsMCwxKQppZihzIGluc3RhbmNlb2YgUC5G
+eSl7cj1zLmIKaWYocj09PTIpe3Q9cC5kCmlmKHQ9PW51bGx8fHQubGVuZ3RoPT09MCl7cC5zRUMobnVs
+bCkKcmV0dXJuITF9aWYoMD49dC5sZW5ndGgpcmV0dXJuIEguayh0LC0xKQpwLmE9dC5wb3AoKQpjb250
+aW51ZX1lbHNle3Q9cy5hCmlmKHI9PT0zKXRocm93IHQKZWxzZXtxPUouSVQodCkKaWYocSBpbnN0YW5j
+ZW9mIFAuR1Ype3Q9cC5kCmlmKHQ9PW51bGwpdD1wLmQ9W10KQy5ObS5pKHQscC5hKQpwLmE9cS5hCmNv
+bnRpbnVlfWVsc2V7cC5jPXEKY29udGludWV9fX19ZWxzZXtwLnNFQyhzKQpyZXR1cm4hMH19cmV0dXJu
+ITF9LApzRUM6ZnVuY3Rpb24oYSl7dGhpcy5iPXRoaXMuJHRpLmMuYShhKX0sCiRpQW46MX0KUC5xNC5w
+cm90b3R5cGU9ewpna3o6ZnVuY3Rpb24oYSl7cmV0dXJuIG5ldyBQLkdWKHRoaXMuYSgpLHRoaXMuJHRp
+LkMoIkdWPDE+IikpfX0KUC5iOC5wcm90b3R5cGU9e30KUC5QZi5wcm90b3R5cGU9ewp3MDpmdW5jdGlv
+bihhLGIpe3ZhciB0ClAuVUkoYSwiZXJyb3IiLHUuSykKdD10aGlzLmEKaWYodC5hIT09MCl0aHJvdyBI
+LmIoUC5QVigiRnV0dXJlIGFscmVhZHkgY29tcGxldGVkIikpCnQuTmsoYSxiPT1udWxsP1AudjAoYSk6
+Yil9LApwbTpmdW5jdGlvbihhKXtyZXR1cm4gdGhpcy53MChhLG51bGwpfX0KUC5aZi5wcm90b3R5cGU9
+ewphTTpmdW5jdGlvbihhLGIpe3ZhciB0CnRoaXMuJHRpLkMoIjEvIikuYShiKQp0PXRoaXMuYQppZih0
+LmEhPT0wKXRocm93IEguYihQLlBWKCJGdXR1cmUgYWxyZWFkeSBjb21wbGV0ZWQiKSkKdC5YZihiKX19
+ClAuRmUucHJvdG90eXBlPXsKSFI6ZnVuY3Rpb24oYSl7aWYoKHRoaXMuYyYxNSkhPT02KXJldHVybiEw
+CnJldHVybiB0aGlzLmIuYi5idih1LmFsLmEodGhpcy5kKSxhLmEsdS55LHUuSyl9LApLdzpmdW5jdGlv
+bihhKXt2YXIgdD10aGlzLmUscz11Lnoscj11LksscT10aGlzLiR0aS5DKCIyLyIpLHA9dGhpcy5iLmIK
+aWYodS5hZy5iKHQpKXJldHVybiBxLmEocC5ycCh0LGEuYSxhLmIscyxyLHUubCkpCmVsc2UgcmV0dXJu
+IHEuYShwLmJ2KHUuRi5hKHQpLGEuYSxzLHIpKX19ClAudnMucHJvdG90eXBlPXsKU3E6ZnVuY3Rpb24o
+YSxiLGMpe3ZhciB0LHMscixxPXRoaXMuJHRpCnEuS3EoYykuQygiMS8oMikiKS5hKGEpCnQ9JC5YMwpp
+Zih0IT09Qy5OVSl7Yy5DKCJAPDAvPiIpLktxKHEuYykuQygiMSgyKSIpLmEoYSkKaWYoYiE9bnVsbCli
+PVAuVkgoYix0KX1zPW5ldyBQLnZzKCQuWDMsYy5DKCJ2czwwPiIpKQpyPWI9PW51bGw/MTozCnRoaXMu
+eGYobmV3IFAuRmUocyxyLGEsYixxLkMoIkA8MT4iKS5LcShjKS5DKCJGZTwxLDI+IikpKQpyZXR1cm4g
+c30sClc3OmZ1bmN0aW9uKGEsYil7cmV0dXJuIHRoaXMuU3EoYSxudWxsLGIpfSwKUWQ6ZnVuY3Rpb24o
+YSxiLGMpe3ZhciB0LHM9dGhpcy4kdGkKcy5LcShjKS5DKCIxLygyKSIpLmEoYSkKdD1uZXcgUC52cygk
+LlgzLGMuQygidnM8MD4iKSkKdGhpcy54ZihuZXcgUC5GZSh0LDE5LGEsYixzLkMoIkA8MT4iKS5LcShj
+KS5DKCJGZTwxLDI+IikpKQpyZXR1cm4gdH0sCk9BOmZ1bmN0aW9uKGEpe3ZhciB0LHMscgp1LmJmLmEo
+bnVsbCkKdD10aGlzLiR0aQpzPSQuWDMKcj1uZXcgUC52cyhzLHQpCmlmKHMhPT1DLk5VKWE9UC5WSChh
+LHMpCnRoaXMueGYobmV3IFAuRmUociwyLG51bGwsYSx0LkMoIkA8MT4iKS5LcSh0LmMpLkMoIkZlPDEs
+Mj4iKSkpCnJldHVybiByfSwKeGY6ZnVuY3Rpb24oYSl7dmFyIHQscz10aGlzLHI9cy5hCmlmKHI8PTEp
+e2EuYT11LnguYShzLmMpCnMuYz1hfWVsc2V7aWYocj09PTIpe3Q9dS5fLmEocy5jKQpyPXQuYQppZihy
+PDQpe3QueGYoYSkKcmV0dXJufXMuYT1yCnMuYz10LmN9UC5UayhudWxsLG51bGwscy5iLHUuTS5hKG5l
+dyBQLmRhKHMsYSkpKX19LApqUTpmdW5jdGlvbihhKXt2YXIgdCxzLHIscSxwLG89dGhpcyxuPXt9Cm4u
+YT1hCmlmKGE9PW51bGwpcmV0dXJuCnQ9by5hCmlmKHQ8PTEpe3M9dS54LmEoby5jKQpyPW8uYz1hCmlm
+KHMhPW51bGwpe2Zvcig7cT1yLmEscSE9bnVsbDtyPXEpO3IuYT1zfX1lbHNle2lmKHQ9PT0yKXtwPXUu
+Xy5hKG8uYykKdD1wLmEKaWYodDw0KXtwLmpRKGEpCnJldHVybn1vLmE9dApvLmM9cC5jfW4uYT1vLk44
+KGEpClAuVGsobnVsbCxudWxsLG8uYix1Lk0uYShuZXcgUC5vUShuLG8pKSl9fSwKYWg6ZnVuY3Rpb24o
+KXt2YXIgdD11LnguYSh0aGlzLmMpCnRoaXMuYz1udWxsCnJldHVybiB0aGlzLk44KHQpfSwKTjg6ZnVu
+Y3Rpb24oYSl7dmFyIHQscyxyCmZvcih0PWEscz1udWxsO3QhPW51bGw7cz10LHQ9cil7cj10LmEKdC5h
+PXN9cmV0dXJuIHN9LApISDpmdW5jdGlvbihhKXt2YXIgdCxzPXRoaXMscj1zLiR0aQpyLkMoIjEvIiku
+YShhKQppZihyLkMoImI4PDE+IikuYihhKSlpZihyLmIoYSkpUC5BOShhLHMpCmVsc2UgUC5rMyhhLHMp
+CmVsc2V7dD1zLmFoKCkKci5jLmEoYSkKcy5hPTQKcy5jPWEKUC5IWihzLHQpfX0sClgyOmZ1bmN0aW9u
+KGEpe3ZhciB0LHM9dGhpcwpzLiR0aS5jLmEoYSkKdD1zLmFoKCkKcy5hPTQKcy5jPWEKUC5IWihzLHQp
+fSwKWkw6ZnVuY3Rpb24oYSxiKXt2YXIgdCxzLHI9dGhpcwp1LmwuYShiKQp0PXIuYWgoKQpzPVAuVGwo
+YSxiKQpyLmE9OApyLmM9cwpQLkhaKHIsdCl9LApYZjpmdW5jdGlvbihhKXt2YXIgdD10aGlzLHM9dC4k
+dGkKcy5DKCIxLyIpLmEoYSkKaWYocy5DKCJiODwxPiIpLmIoYSkpe3QuY1UoYSkKcmV0dXJufXQuYT0x
+ClAuVGsobnVsbCxudWxsLHQuYix1Lk0uYShuZXcgUC5ySCh0LGEpKSl9LApjVTpmdW5jdGlvbihhKXt2
+YXIgdD10aGlzLHM9dC4kdGkKcy5DKCJiODwxPiIpLmEoYSkKaWYocy5iKGEpKXtpZihhLmE9PT04KXt0
+LmE9MQpQLlRrKG51bGwsbnVsbCx0LmIsdS5NLmEobmV3IFAuS0YodCxhKSkpfWVsc2UgUC5BOShhLHQp
+CnJldHVybn1QLmszKGEsdCl9LApOazpmdW5jdGlvbihhLGIpe3RoaXMuYT0xClAuVGsobnVsbCxudWxs
+LHRoaXMuYix1Lk0uYShuZXcgUC5aTCh0aGlzLGEsYikpKX0sCiRpYjg6MX0KUC5kYS5wcm90b3R5cGU9
+ewokMDpmdW5jdGlvbigpe1AuSFoodGhpcy5hLHRoaXMuYil9LAokUzowfQpQLm9RLnByb3RvdHlwZT17
+CiQwOmZ1bmN0aW9uKCl7UC5IWih0aGlzLmIsdGhpcy5hLmEpfSwKJFM6MH0KUC5wVi5wcm90b3R5cGU9
+ewokMTpmdW5jdGlvbihhKXt2YXIgdD10aGlzLmEKdC5hPTAKdC5ISChhKX0sCiRTOjEyfQpQLlU3LnBy
+b3RvdHlwZT17CiQyOmZ1bmN0aW9uKGEsYil7dS5sLmEoYikKdGhpcy5hLlpMKGEsYil9LAokMTpmdW5j
+dGlvbihhKXtyZXR1cm4gdGhpcy4kMihhLG51bGwpfSwKJEM6IiQyIiwKJEQ6ZnVuY3Rpb24oKXtyZXR1
+cm5bbnVsbF19LAokUzozMH0KUC52ci5wcm90b3R5cGU9ewokMDpmdW5jdGlvbigpe3RoaXMuYS5aTCh0
+aGlzLmIsdGhpcy5jKX0sCiRTOjB9ClAuckgucHJvdG90eXBlPXsKJDA6ZnVuY3Rpb24oKXt2YXIgdD10
+aGlzLmEKdC5YMih0LiR0aS5jLmEodGhpcy5iKSl9LAokUzowfQpQLktGLnByb3RvdHlwZT17CiQwOmZ1
+bmN0aW9uKCl7UC5BOSh0aGlzLmIsdGhpcy5hKX0sCiRTOjB9ClAuWkwucHJvdG90eXBlPXsKJDA6ZnVu
+Y3Rpb24oKXt0aGlzLmEuWkwodGhpcy5iLHRoaXMuYyl9LAokUzowfQpQLlJULnByb3RvdHlwZT17CiQw
+OmZ1bmN0aW9uKCl7dmFyIHQscyxyLHEscCxvLG49dGhpcyxtPW51bGwKdHJ5e3I9bi5jCm09ci5iLmIu
+enoodS5mTy5hKHIuZCksdS56KX1jYXRjaChxKXt0PUguUnUocSkKcz1ILnRzKHEpCmlmKG4uZCl7cj11
+Lm4uYShuLmEuYS5jKS5hCnA9dApwPXI9PW51bGw/cD09bnVsbDpyPT09cApyPXB9ZWxzZSByPSExCnA9
+bi5iCmlmKHIpcC5iPXUubi5hKG4uYS5hLmMpCmVsc2UgcC5iPVAuVGwodCxzKQpwLmE9ITAKcmV0dXJu
+fWlmKHUuYy5iKG0pKXtpZihtIGluc3RhbmNlb2YgUC52cyYmbS5hPj00KXtpZihtLmE9PT04KXtyPW4u
+YgpyLmI9dS5uLmEobS5jKQpyLmE9ITB9cmV0dXJufW89bi5hLmEKcj1uLmIKci5iPW0uVzcobmV3IFAu
+aloobyksdS56KQpyLmE9ITF9fSwKJFM6Mn0KUC5qWi5wcm90b3R5cGU9ewokMTpmdW5jdGlvbihhKXty
+ZXR1cm4gdGhpcy5hfSwKJFM6MzN9ClAucnEucHJvdG90eXBlPXsKJDA6ZnVuY3Rpb24oKXt2YXIgdCxz
+LHIscSxwLG8sbixtPXRoaXMKdHJ5e3I9bS5iCnE9ci4kdGkKcD1xLmMKbz1wLmEobS5jKQptLmEuYj1y
+LmIuYi5idihxLkMoIjIvKDEpIikuYShyLmQpLG8scS5DKCIyLyIpLHApfWNhdGNoKG4pe3Q9SC5SdShu
+KQpzPUgudHMobikKcj1tLmEKci5iPVAuVGwodCxzKQpyLmE9ITB9fSwKJFM6Mn0KUC5SVy5wcm90b3R5
+cGU9ewokMDpmdW5jdGlvbigpe3ZhciB0LHMscixxLHAsbyxuLG0sbD10aGlzCnRyeXt0PXUubi5hKGwu
+YS5hLmMpCnE9bC5jCmlmKEgub1QocS5IUih0KSkmJnEuZSE9bnVsbCl7cD1sLmIKcC5iPXEuS3codCkK
+cC5hPSExfX1jYXRjaChvKXtzPUguUnUobykKcj1ILnRzKG8pCnE9dS5uLmEobC5hLmEuYykKcD1xLmEK
+bj1zCm09bC5iCmlmKHA9PW51bGw/bj09bnVsbDpwPT09biltLmI9cQplbHNlIG0uYj1QLlRsKHMscikK
+bS5hPSEwfX0sCiRTOjJ9ClAuT00ucHJvdG90eXBlPXt9ClAucWgucHJvdG90eXBlPXsKZ0E6ZnVuY3Rp
+b24oYSl7dmFyIHQscyxyPXRoaXMscT17fSxwPW5ldyBQLnZzKCQuWDMsdS5mSikKcS5hPTAKdD1ILkxo
+KHIpCnM9dC5DKCJ+KDEpIikuYShuZXcgUC5CNShxLHIpKQp1Lk0uYShuZXcgUC5QSShxLHApKQpXLkpF
+KHIuYSxyLmIscywhMSx0LmMpCnJldHVybiBwfX0KUC5CNS5wcm90b3R5cGU9ewokMTpmdW5jdGlvbihh
+KXtILkxoKHRoaXMuYikuYy5hKGEpOysrdGhpcy5hLmF9LAokUzpmdW5jdGlvbigpe3JldHVybiBILkxo
+KHRoaXMuYikuQygiYzgoMSkiKX19ClAuUEkucHJvdG90eXBlPXsKJDA6ZnVuY3Rpb24oKXt0aGlzLmIu
+SEgodGhpcy5hLmEpfSwKJFM6MH0KUC5NTy5wcm90b3R5cGU9e30KUC5rVC5wcm90b3R5cGU9e30KUC54
+SS5wcm90b3R5cGU9e30KUC5PSC5wcm90b3R5cGU9ewpaOmZ1bmN0aW9uKGEpe3JldHVybiBILmQodGhp
+cy5hKX0sCiRpWFM6MSwKZ0lJOmZ1bmN0aW9uKCl7cmV0dXJuIHRoaXMuYn19ClAubTAucHJvdG90eXBl
+PXskaUpCOjF9ClAucEsucHJvdG90eXBlPXsKJDA6ZnVuY3Rpb24oKXt2YXIgdCxzPXRoaXMuYSxyPXMu
+YgppZihyPT1udWxsKXRocm93IEguYihzLmEpCnQ9SC5iKHMuYSkKdC5zdGFjaz1yLlooMCkKdGhyb3cg
+dH0sCiRTOjB9ClAuSmkucHJvdG90eXBlPXsKYkg6ZnVuY3Rpb24oYSl7dmFyIHQscyxyLHE9bnVsbAp1
+Lk0uYShhKQp0cnl7aWYoQy5OVT09PSQuWDMpe2EuJDAoKQpyZXR1cm59UC5UOChxLHEsdGhpcyxhLHUu
+SCl9Y2F0Y2gocil7dD1ILlJ1KHIpCnM9SC50cyhyKQpQLkwyKHEscSx0aGlzLHQsdS5sLmEocykpfX0s
+CkRsOmZ1bmN0aW9uKGEsYixjKXt2YXIgdCxzLHIscT1udWxsCmMuQygifigwKSIpLmEoYSkKYy5hKGIp
+CnRyeXtpZihDLk5VPT09JC5YMyl7YS4kMShiKQpyZXR1cm59UC55dihxLHEsdGhpcyxhLGIsdS5ILGMp
+fWNhdGNoKHIpe3Q9SC5SdShyKQpzPUgudHMocikKUC5MMihxLHEsdGhpcyx0LHUubC5hKHMpKX19LApS
+VDpmdW5jdGlvbihhLGIpe3JldHVybiBuZXcgUC5oaih0aGlzLGIuQygiMCgpIikuYShhKSxiKX0sCkdZ
+OmZ1bmN0aW9uKGEpe3JldHVybiBuZXcgUC5WcCh0aGlzLHUuTS5hKGEpKX0sClB5OmZ1bmN0aW9uKGEs
+Yil7cmV0dXJuIG5ldyBQLk9SKHRoaXMsYi5DKCJ+KDApIikuYShhKSxiKX0sCnE6ZnVuY3Rpb24oYSxi
+KXtyZXR1cm4gbnVsbH0sCnp6OmZ1bmN0aW9uKGEsYil7Yi5DKCIwKCkiKS5hKGEpCmlmKCQuWDM9PT1D
+Lk5VKXJldHVybiBhLiQwKCkKcmV0dXJuIFAuVDgobnVsbCxudWxsLHRoaXMsYSxiKX0sCmJ2OmZ1bmN0
+aW9uKGEsYixjLGQpe2MuQygiQDwwPiIpLktxKGQpLkMoIjEoMikiKS5hKGEpCmQuYShiKQppZigkLlgz
+PT09Qy5OVSlyZXR1cm4gYS4kMShiKQpyZXR1cm4gUC55dihudWxsLG51bGwsdGhpcyxhLGIsYyxkKX0s
+CnJwOmZ1bmN0aW9uKGEsYixjLGQsZSxmKXtkLkMoIkA8MD4iKS5LcShlKS5LcShmKS5DKCIxKDIsMyki
+KS5hKGEpCmUuYShiKQpmLmEoYykKaWYoJC5YMz09PUMuTlUpcmV0dXJuIGEuJDIoYixjKQpyZXR1cm4g
+UC5ReChudWxsLG51bGwsdGhpcyxhLGIsYyxkLGUsZil9LApMajpmdW5jdGlvbihhLGIsYyxkKXtyZXR1
+cm4gYi5DKCJAPDA+IikuS3EoYykuS3EoZCkuQygiMSgyLDMpIikuYShhKX19ClAuaGoucHJvdG90eXBl
+PXsKJDA6ZnVuY3Rpb24oKXtyZXR1cm4gdGhpcy5hLnp6KHRoaXMuYix0aGlzLmMpfSwKJFM6ZnVuY3Rp
+b24oKXtyZXR1cm4gdGhpcy5jLkMoIjAoKSIpfX0KUC5WcC5wcm90b3R5cGU9ewokMDpmdW5jdGlvbigp
+e3JldHVybiB0aGlzLmEuYkgodGhpcy5iKX0sCiRTOjJ9ClAuT1IucHJvdG90eXBlPXsKJDE6ZnVuY3Rp
+b24oYSl7dmFyIHQ9dGhpcy5jCnJldHVybiB0aGlzLmEuRGwodGhpcy5iLHQuYShhKSx0KX0sCiRTOmZ1
+bmN0aW9uKCl7cmV0dXJuIHRoaXMuYy5DKCJ+KDApIil9fQpQLmI2LnByb3RvdHlwZT17CmdrejpmdW5j
+dGlvbihhKXt2YXIgdD10aGlzLHM9bmV3IFAubG0odCx0LnIsSC5MaCh0KS5DKCJsbTwxPiIpKQpzLmM9
+dC5lCnJldHVybiBzfSwKZ0E6ZnVuY3Rpb24oYSl7cmV0dXJuIHRoaXMuYX0sCnRnOmZ1bmN0aW9uKGEs
+Yil7dmFyIHQscwppZih0eXBlb2YgYj09InN0cmluZyImJmIhPT0iX19wcm90b19fIil7dD10aGlzLmIK
+aWYodD09bnVsbClyZXR1cm4hMQpyZXR1cm4gdS5KLmEodFtiXSkhPW51bGx9ZWxzZXtzPXRoaXMuUFIo
+YikKcmV0dXJuIHN9fSwKUFI6ZnVuY3Rpb24oYSl7dmFyIHQ9dGhpcy5kCmlmKHQ9PW51bGwpcmV0dXJu
+ITEKcmV0dXJuIHRoaXMuREYodFt0aGlzLk4oYSldLGEpPj0wfSwKaTpmdW5jdGlvbihhLGIpe3ZhciB0
+LHMscj10aGlzCkguTGgocikuYy5hKGIpCmlmKHR5cGVvZiBiPT0ic3RyaW5nIiYmYiE9PSJfX3Byb3Rv
+X18iKXt0PXIuYgpyZXR1cm4gci5TKHQ9PW51bGw/ci5iPVAuVDIoKTp0LGIpfWVsc2UgaWYodHlwZW9m
+IGI9PSJudW1iZXIiJiYoYiYxMDczNzQxODIzKT09PWIpe3M9ci5jCnJldHVybiByLlMocz09bnVsbD9y
+LmM9UC5UMigpOnMsYil9ZWxzZSByZXR1cm4gci5CNyhiKX0sCkI3OmZ1bmN0aW9uKGEpe3ZhciB0LHMs
+cixxPXRoaXMKSC5MaChxKS5jLmEoYSkKdD1xLmQKaWYodD09bnVsbCl0PXEuZD1QLlQyKCkKcz1xLk4o
+YSkKcj10W3NdCmlmKHI9PW51bGwpdFtzXT1bcS55byhhKV0KZWxzZXtpZihxLkRGKHIsYSk+PTApcmV0
+dXJuITEKci5wdXNoKHEueW8oYSkpfXJldHVybiEwfSwKUjpmdW5jdGlvbihhLGIpe3ZhciB0PXRoaXMK
+aWYodHlwZW9mIGI9PSJzdHJpbmciJiZiIT09Il9fcHJvdG9fXyIpcmV0dXJuIHQuSDQodC5iLGIpCmVs
+c2UgaWYodHlwZW9mIGI9PSJudW1iZXIiJiYoYiYxMDczNzQxODIzKT09PWIpcmV0dXJuIHQuSDQodC5j
+LGIpCmVsc2UgcmV0dXJuIHQucWcoYil9LApxZzpmdW5jdGlvbihhKXt2YXIgdCxzLHIscSxwPXRoaXMs
+bz1wLmQKaWYobz09bnVsbClyZXR1cm4hMQp0PXAuTihhKQpzPW9bdF0Kcj1wLkRGKHMsYSkKaWYocjww
+KXJldHVybiExCnE9cy5zcGxpY2UociwxKVswXQppZigwPT09cy5sZW5ndGgpZGVsZXRlIG9bdF0KcC5H
+UyhxKQpyZXR1cm4hMH0sClM6ZnVuY3Rpb24oYSxiKXtILkxoKHRoaXMpLmMuYShiKQppZih1LkouYShh
+W2JdKSE9bnVsbClyZXR1cm4hMQphW2JdPXRoaXMueW8oYikKcmV0dXJuITB9LApINDpmdW5jdGlvbihh
+LGIpe3ZhciB0CmlmKGE9PW51bGwpcmV0dXJuITEKdD11LkouYShhW2JdKQppZih0PT1udWxsKXJldHVy
+biExCnRoaXMuR1ModCkKZGVsZXRlIGFbYl0KcmV0dXJuITB9LApYOmZ1bmN0aW9uKCl7dGhpcy5yPTEw
+NzM3NDE4MjMmdGhpcy5yKzF9LAp5bzpmdW5jdGlvbihhKXt2YXIgdCxzPXRoaXMscj1uZXcgUC5ibihI
+LkxoKHMpLmMuYShhKSkKaWYocy5lPT1udWxsKXMuZT1zLmY9cgplbHNle3Q9cy5mCnIuYz10CnMuZj10
+LmI9cn0rK3MuYQpzLlgoKQpyZXR1cm4gcn0sCkdTOmZ1bmN0aW9uKGEpe3ZhciB0PXRoaXMscz1hLmMs
+cj1hLmIKaWYocz09bnVsbCl0LmU9cgplbHNlIHMuYj1yCmlmKHI9PW51bGwpdC5mPXMKZWxzZSByLmM9
+czstLXQuYQp0LlgoKX0sCk46ZnVuY3Rpb24oYSl7cmV0dXJuIEouaGYoYSkmMTA3Mzc0MTgyM30sCkRG
+OmZ1bmN0aW9uKGEsYil7dmFyIHQscwppZihhPT1udWxsKXJldHVybi0xCnQ9YS5sZW5ndGgKZm9yKHM9
+MDtzPHQ7KytzKWlmKEouUk0oYVtzXS5hLGIpKXJldHVybiBzCnJldHVybi0xfX0KUC5ibi5wcm90b3R5
+cGU9e30KUC5sbS5wcm90b3R5cGU9ewpnbDpmdW5jdGlvbigpe3JldHVybiB0aGlzLmR9LApGOmZ1bmN0
+aW9uKCl7dmFyIHQ9dGhpcyxzPXQuYQppZih0LmIhPT1zLnIpdGhyb3cgSC5iKFAuYTQocykpCmVsc2V7
+cz10LmMKaWYocz09bnVsbCl7dC5zaihudWxsKQpyZXR1cm4hMX1lbHNle3Quc2oodC4kdGkuYy5hKHMu
+YSkpCnQuYz10LmMuYgpyZXR1cm4hMH19fSwKc2o6ZnVuY3Rpb24oYSl7dGhpcy5kPXRoaXMuJHRpLmMu
+YShhKX0sCiRpQW46MX0KUC5tVy5wcm90b3R5cGU9e30KUC5MVS5wcm90b3R5cGU9eyRpYlE6MSwkaWNY
+OjEsJGl6TToxfQpQLmxELnByb3RvdHlwZT17CmdrejpmdW5jdGlvbihhKXtyZXR1cm4gbmV3IEguYTco
+YSx0aGlzLmdBKGEpLEgucShhKS5DKCJhNzxsRC5FPiIpKX0sCkU6ZnVuY3Rpb24oYSxiKXtyZXR1cm4g
+dGhpcy5xKGEsYil9LApLOmZ1bmN0aW9uKGEsYil7dmFyIHQscwpILnEoYSkuQygifihsRC5FKSIpLmEo
+YikKdD10aGlzLmdBKGEpCmZvcihzPTA7czx0Oysrcyl7Yi4kMSh0aGlzLnEoYSxzKSkKaWYodCE9PXRo
+aXMuZ0EoYSkpdGhyb3cgSC5iKFAuYTQoYSkpfX0sCkUyOmZ1bmN0aW9uKGEsYixjKXt2YXIgdD1ILnEo
+YSkKcmV0dXJuIG5ldyBILmxKKGEsdC5LcShjKS5DKCIxKGxELkUpIikuYShiKSx0LkMoIkA8bEQuRT4i
+KS5LcShjKS5DKCJsSjwxLDI+IikpfSwKZHU6ZnVuY3Rpb24oYSxiLGMsZCl7dmFyIHQKSC5xKGEpLkMo
+ImxELkUiKS5hKGQpClAuakIoYixjLHRoaXMuZ0EoYSkpCmZvcih0PWI7dDxjOysrdCl0aGlzLlkoYSx0
+LGQpfSwKWjpmdW5jdGlvbihhKXtyZXR1cm4gUC5XRShhLCJbIiwiXSIpfX0KUC5pbC5wcm90b3R5cGU9
+e30KUC5yYS5wcm90b3R5cGU9ewokMjpmdW5jdGlvbihhLGIpe3ZhciB0LHM9dGhpcy5hCmlmKCFzLmEp
+dGhpcy5iLmErPSIsICIKcy5hPSExCnM9dGhpcy5iCnQ9cy5hKz1ILmQoYSkKcy5hPXQrIjogIgpzLmEr
+PUguZChiKX0sCiRTOjF9ClAuWWsucHJvdG90eXBlPXsKSzpmdW5jdGlvbihhLGIpe3ZhciB0LHMKSC5M
+aCh0aGlzKS5DKCJ+KFlrLkssWWsuVikiKS5hKGIpCmZvcih0PUouSVQodGhpcy5nVigpKTt0LkYoKTsp
+e3M9dC5nbCgpCmIuJDIocyx0aGlzLnEoMCxzKSl9fSwKZ1B1OmZ1bmN0aW9uKGEpe3JldHVybiBKLk0x
+KHRoaXMuZ1YoKSxuZXcgUC55USh0aGlzKSxILkxoKHRoaXMpLkMoIk4zPFlrLkssWWsuVj4iKSl9LApn
+QTpmdW5jdGlvbihhKXtyZXR1cm4gSi5IKHRoaXMuZ1YoKSl9LApaOmZ1bmN0aW9uKGEpe3JldHVybiBQ
+Lm5PKHRoaXMpfSwKJGlaMDoxfQpQLnlRLnByb3RvdHlwZT17CiQxOmZ1bmN0aW9uKGEpe3ZhciB0PXRo
+aXMuYSxzPUguTGgodCkKcy5DKCJZay5LIikuYShhKQpyZXR1cm4gbmV3IFAuTjMoYSx0LnEoMCxhKSxz
+LkMoIkA8WWsuSz4iKS5LcShzLkMoIllrLlYiKSkuQygiTjM8MSwyPiIpKX0sCiRTOmZ1bmN0aW9uKCl7
+cmV0dXJuIEguTGgodGhpcy5hKS5DKCJOMzxZay5LLFlrLlY+KFlrLkspIil9fQpQLktQLnByb3RvdHlw
+ZT17Clk6ZnVuY3Rpb24oYSxiLGMpe3ZhciB0PUguTGgodGhpcykKdC5jLmEoYikKdC5RWzFdLmEoYykK
+dGhyb3cgSC5iKFAuTDQoIkNhbm5vdCBtb2RpZnkgdW5tb2RpZmlhYmxlIG1hcCIpKX19ClAuUG4ucHJv
+dG90eXBlPXsKcTpmdW5jdGlvbihhLGIpe3JldHVybiB0aGlzLmEucSgwLGIpfSwKWTpmdW5jdGlvbihh
+LGIsYyl7dmFyIHQ9SC5MaCh0aGlzKQp0aGlzLmEuWSgwLHQuYy5hKGIpLHQuUVsxXS5hKGMpKX0sCks6
+ZnVuY3Rpb24oYSxiKXt0aGlzLmEuSygwLEguTGgodGhpcykuQygifigxLDIpIikuYShiKSl9LApnQTpm
+dW5jdGlvbihhKXt2YXIgdD10aGlzLmEKcmV0dXJuIHQuZ0EodCl9LApaOmZ1bmN0aW9uKGEpe3JldHVy
+biBKLkFjKHRoaXMuYSl9LApnUHU6ZnVuY3Rpb24oYSl7dmFyIHQ9dGhpcy5hCnJldHVybiB0LmdQdSh0
+KX0sCiRpWjA6MX0KUC5Hai5wcm90b3R5cGU9e30KUC5NYS5wcm90b3R5cGU9ewpaOmZ1bmN0aW9uKGEp
+e3JldHVybiBQLldFKHRoaXMsInsiLCJ9Iil9fQpQLlZqLnByb3RvdHlwZT17JGliUToxLCRpY1g6MSwk
+aXh1OjF9ClAuWHYucHJvdG90eXBlPXsKRlY6ZnVuY3Rpb24oYSxiKXt2YXIgdApmb3IodD1KLklUKEgu
+TGgodGhpcykuQygiY1g8MT4iKS5hKGIpKTt0LkYoKTspdGhpcy5pKDAsdC5nbCgpKX0sClo6ZnVuY3Rp
+b24oYSl7cmV0dXJuIFAuV0UodGhpcywieyIsIn0iKX0sCnpWOmZ1bmN0aW9uKGEsYil7dmFyIHQscz1Q
+LnJqKHRoaXMsdGhpcy5yLEguTGgodGhpcykuYykKaWYoIXMuRigpKXJldHVybiIiCmlmKGI9PT0iIil7
+dD0iIgpkbyB0Kz1ILmQocy5kKQp3aGlsZShzLkYoKSl9ZWxzZXt0PUguZChzLmQpCmZvcig7cy5GKCk7
+KXQ9dCtiK0guZChzLmQpfXJldHVybiB0LmNoYXJDb2RlQXQoMCk9PTA/dDp0fSwKJGliUToxLAokaWNY
+OjEsCiRpeHU6MX0KUC5uWS5wcm90b3R5cGU9e30KUC5UQy5wcm90b3R5cGU9e30KUC5SVS5wcm90b3R5
+cGU9e30KUC51dy5wcm90b3R5cGU9ewpxOmZ1bmN0aW9uKGEsYil7dmFyIHQscz10aGlzLmIKaWYocz09
+bnVsbClyZXR1cm4gdGhpcy5jLnEoMCxiKQplbHNlIGlmKHR5cGVvZiBiIT0ic3RyaW5nIilyZXR1cm4g
+bnVsbAplbHNle3Q9c1tiXQpyZXR1cm4gdHlwZW9mIHQ9PSJ1bmRlZmluZWQiP3RoaXMuZmIoYik6dH19
+LApnQTpmdW5jdGlvbihhKXtyZXR1cm4gdGhpcy5iPT1udWxsP3RoaXMuYy5hOnRoaXMuQ2YoKS5sZW5n
+dGh9LApnVjpmdW5jdGlvbigpe2lmKHRoaXMuYj09bnVsbCl7dmFyIHQ9dGhpcy5jCnJldHVybiBuZXcg
+SC5pNSh0LEguTGgodCkuQygiaTU8MT4iKSl9cmV0dXJuIG5ldyBQLmk4KHRoaXMpfSwKWTpmdW5jdGlv
+bihhLGIsYyl7dmFyIHQscyxyPXRoaXMKaWYoci5iPT1udWxsKXIuYy5ZKDAsYixjKQplbHNlIGlmKHIu
+eDQoYikpe3Q9ci5iCnRbYl09YwpzPXIuYQppZihzPT1udWxsP3QhPW51bGw6cyE9PXQpc1tiXT1udWxs
+fWVsc2Ugci5YSygpLlkoMCxiLGMpfSwKeDQ6ZnVuY3Rpb24oYSl7aWYodGhpcy5iPT1udWxsKXJldHVy
+biB0aGlzLmMueDQoYSkKcmV0dXJuIE9iamVjdC5wcm90b3R5cGUuaGFzT3duUHJvcGVydHkuY2FsbCh0
+aGlzLmEsYSl9LApLOmZ1bmN0aW9uKGEsYil7dmFyIHQscyxyLHEscD10aGlzCnUuY0EuYShiKQppZihw
+LmI9PW51bGwpcmV0dXJuIHAuYy5LKDAsYikKdD1wLkNmKCkKZm9yKHM9MDtzPHQubGVuZ3RoOysrcyl7
+cj10W3NdCnE9cC5iW3JdCmlmKHR5cGVvZiBxPT0idW5kZWZpbmVkIil7cT1QLlFlKHAuYVtyXSkKcC5i
+W3JdPXF9Yi4kMihyLHEpCmlmKHQhPT1wLmMpdGhyb3cgSC5iKFAuYTQocCkpfX0sCkNmOmZ1bmN0aW9u
+KCl7dmFyIHQ9dS5qLmEodGhpcy5jKQppZih0PT1udWxsKXQ9dGhpcy5jPUguVk0oT2JqZWN0LmtleXMo
+dGhpcy5hKSx1LnMpCnJldHVybiB0fSwKWEs6ZnVuY3Rpb24oKXt2YXIgdCxzLHIscSxwLG89dGhpcwpp
+ZihvLmI9PW51bGwpcmV0dXJuIG8uYwp0PVAuRmwodS5OLHUueikKcz1vLkNmKCkKZm9yKHI9MDtxPXMu
+bGVuZ3RoLHI8cTsrK3Ipe3A9c1tyXQp0LlkoMCxwLG8ucSgwLHApKX1pZihxPT09MClDLk5tLmkocyxu
+dWxsKQplbHNlIEMuTm0uc0EocywwKQpvLmE9by5iPW51bGwKcmV0dXJuIG8uYz10fSwKZmI6ZnVuY3Rp
+b24oYSl7dmFyIHQKaWYoIU9iamVjdC5wcm90b3R5cGUuaGFzT3duUHJvcGVydHkuY2FsbCh0aGlzLmEs
+YSkpcmV0dXJuIG51bGwKdD1QLlFlKHRoaXMuYVthXSkKcmV0dXJuIHRoaXMuYlthXT10fX0KUC5pOC5w
+cm90b3R5cGU9ewpnQTpmdW5jdGlvbihhKXt2YXIgdD10aGlzLmEKcmV0dXJuIHQuZ0EodCl9LApFOmZ1
+bmN0aW9uKGEsYil7dmFyIHQ9dGhpcy5hCmlmKHQuYj09bnVsbCl0PXQuZ1YoKS5FKDAsYikKZWxzZXt0
+PXQuQ2YoKQppZihiPDB8fGI+PXQubGVuZ3RoKXJldHVybiBILmsodCxiKQp0PXRbYl19cmV0dXJuIHR9
+LApna3o6ZnVuY3Rpb24oYSl7dmFyIHQ9dGhpcy5hCmlmKHQuYj09bnVsbCl7dD10LmdWKCkKdD10Lmdr
+eih0KX1lbHNle3Q9dC5DZigpCnQ9bmV3IEoubTEodCx0Lmxlbmd0aCxILnQ2KHQpLkMoIm0xPDE+Iikp
+fXJldHVybiB0fX0KUC5DVi5wcm90b3R5cGU9ewp5cjpmdW5jdGlvbihhLGEwLGExKXt2YXIgdCxzLHIs
+cSxwLG8sbixtLGwsayxqLGksaCxnLGYsZSxkLGMsYj0iSW52YWxpZCBiYXNlNjQgZW5jb2RpbmcgbGVu
+Z3RoICIKYTE9UC5qQihhMCxhMSxhLmxlbmd0aCkKdD0kLlY3KCkKZm9yKHM9YTAscj1zLHE9bnVsbCxw
+PS0xLG89LTEsbj0wO3M8YTE7cz1tKXttPXMrMQpsPUMueEIuVyhhLHMpCmlmKGw9PT0zNyl7az1tKzIK
+aWYoazw9YTEpe2o9SC5vbyhDLnhCLlcoYSxtKSkKaT1ILm9vKEMueEIuVyhhLG0rMSkpCmg9aioxNitp
+LShpJjI1NikKaWYoaD09PTM3KWg9LTEKbT1rfWVsc2UgaD0tMX1lbHNlIGg9bAppZigwPD1oJiZoPD0x
+Mjcpe2lmKGg8MHx8aD49dC5sZW5ndGgpcmV0dXJuIEguayh0LGgpCmc9dFtoXQppZihnPj0wKXtoPUMu
+eEIubSgiQUJDREVGR0hJSktMTU5PUFFSU1RVVldYWVphYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ejAx
+MjM0NTY3ODkrLyIsZykKaWYoaD09PWwpY29udGludWUKbD1ofWVsc2V7aWYoZz09PS0xKXtpZihwPDAp
+e2Y9cT09bnVsbD9udWxsOnEuYS5sZW5ndGgKaWYoZj09bnVsbClmPTAKcD1mKyhzLXIpCm89c30rK24K
+aWYobD09PTYxKWNvbnRpbnVlfWw9aH1pZihnIT09LTIpe2lmKHE9PW51bGwpcT1uZXcgUC5SbigiIikK
+cS5hKz1DLnhCLncoYSxyLHMpCnEuYSs9SC5MdyhsKQpyPW0KY29udGludWV9fXRocm93IEguYihQLnJy
+KCJJbnZhbGlkIGJhc2U2NCBkYXRhIixhLHMpKX1pZihxIT1udWxsKXtmPXEuYSs9Qy54Qi53KGEscixh
+MSkKZT1mLmxlbmd0aAppZihwPj0wKVAueE0oYSxvLGExLHAsbixlKQplbHNle2Q9Qy5qbi56WShlLTEs
+NCkrMQppZihkPT09MSl0aHJvdyBILmIoUC5ycihiLGEsYTEpKQpmb3IoO2Q8NDspe2YrPSI9IgpxLmE9
+ZjsrK2R9fWY9cS5hCnJldHVybiBDLnhCLmk3KGEsYTAsYTEsZi5jaGFyQ29kZUF0KDApPT0wP2Y6Zil9
+Yz1hMS1hMAppZihwPj0wKVAueE0oYSxvLGExLHAsbixjKQplbHNle2Q9Qy5qbi56WShjLDQpCmlmKGQ9
+PT0xKXRocm93IEguYihQLnJyKGIsYSxhMSkpCmlmKGQ+MSlhPUMueEIuaTcoYSxhMSxhMSxkPT09Mj8i
+PT0iOiI9Iil9cmV0dXJuIGF9fQpQLlU4LnByb3RvdHlwZT17fQpQLlVrLnByb3RvdHlwZT17fQpQLndJ
+LnByb3RvdHlwZT17fQpQLlppLnByb3RvdHlwZT17fQpQLmJ5LnByb3RvdHlwZT17CnBXOmZ1bmN0aW9u
+KGEsYixjKXt2YXIgdAp1LmVwLmEoYykKdD1QLkJTKGIsdGhpcy5nSGUoKS5hKQpyZXR1cm4gdH0sCmdI
+ZTpmdW5jdGlvbigpe3JldHVybiBDLkEzfX0KUC5NeC5wcm90b3R5cGU9e30KUC51NS5wcm90b3R5cGU9
+ewpnWkU6ZnVuY3Rpb24oKXtyZXR1cm4gQy5Ra319ClAuRTMucHJvdG90eXBlPXsKV0o6ZnVuY3Rpb24o
+YSl7dmFyIHQscyxyPVAuakIoMCxudWxsLGEubGVuZ3RoKSxxPXItMAppZihxPT09MClyZXR1cm4gbmV3
+IFVpbnQ4QXJyYXkoMCkKdD1uZXcgVWludDhBcnJheShxKjMpCnM9bmV3IFAuUncodCkKaWYocy5HeChh
+LDAscikhPT1yKXMuTzYoSi5hNihhLHItMSksMCkKcmV0dXJuIG5ldyBVaW50OEFycmF5KHQuc3ViYXJy
+YXkoMCxILnJNKDAscy5iLHQubGVuZ3RoKSkpfX0KUC5Sdy5wcm90b3R5cGU9ewpPNjpmdW5jdGlvbihh
+LGIpe3ZhciB0LHM9dGhpcyxyPXMuYyxxPXMuYixwPXErMSxvPXIubGVuZ3RoCmlmKChiJjY0NTEyKT09
+PTU2MzIwKXt0PTY1NTM2KygoYSYxMDIzKTw8MTApfGImMTAyMwpzLmI9cAppZihxPj1vKXJldHVybiBI
+LmsocixxKQpyW3FdPTI0MHx0Pj4+MTgKcT1zLmI9cCsxCmlmKHA+PW8pcmV0dXJuIEguayhyLHApCnJb
+cF09MTI4fHQ+Pj4xMiY2MwpwPXMuYj1xKzEKaWYocT49bylyZXR1cm4gSC5rKHIscSkKcltxXT0xMjh8
+dD4+PjYmNjMKcy5iPXArMQppZihwPj1vKXJldHVybiBILmsocixwKQpyW3BdPTEyOHx0JjYzCnJldHVy
+biEwfWVsc2V7cy5iPXAKaWYocT49bylyZXR1cm4gSC5rKHIscSkKcltxXT0yMjR8YT4+PjEyCnE9cy5i
+PXArMQppZihwPj1vKXJldHVybiBILmsocixwKQpyW3BdPTEyOHxhPj4+NiY2MwpzLmI9cSsxCmlmKHE+
+PW8pcmV0dXJuIEguayhyLHEpCnJbcV09MTI4fGEmNjMKcmV0dXJuITF9fSwKR3g6ZnVuY3Rpb24oYSxi
+LGMpe3ZhciB0LHMscixxLHAsbyxuLG09dGhpcwppZihiIT09YyYmKEMueEIubShhLGMtMSkmNjQ1MTIp
+PT09NTUyOTYpLS1jCmZvcih0PW0uYyxzPXQubGVuZ3RoLHI9YjtyPGM7KytyKXtxPUMueEIuVyhhLHIp
+CmlmKHE8PTEyNyl7cD1tLmIKaWYocD49cylicmVhawptLmI9cCsxCnRbcF09cX1lbHNlIGlmKChxJjY0
+NTEyKT09PTU1Mjk2KXtpZihtLmIrMz49cylicmVhawpvPXIrMQppZihtLk82KHEsQy54Qi5XKGEsbykp
+KXI9b31lbHNlIGlmKHE8PTIwNDcpe3A9bS5iCm49cCsxCmlmKG4+PXMpYnJlYWsKbS5iPW4KaWYocD49
+cylyZXR1cm4gSC5rKHQscCkKdFtwXT0xOTJ8cT4+PjYKbS5iPW4rMQp0W25dPTEyOHxxJjYzfWVsc2V7
+cD1tLmIKaWYocCsyPj1zKWJyZWFrCm49bS5iPXArMQppZihwPj1zKXJldHVybiBILmsodCxwKQp0W3Bd
+PTIyNHxxPj4+MTIKcD1tLmI9bisxCmlmKG4+PXMpcmV0dXJuIEguayh0LG4pCnRbbl09MTI4fHE+Pj42
+JjYzCm0uYj1wKzEKaWYocD49cylyZXR1cm4gSC5rKHQscCkKdFtwXT0xMjh8cSY2M319cmV0dXJuIHJ9
+fQpQLkdZLnByb3RvdHlwZT17CldKOmZ1bmN0aW9uKGEpe3ZhciB0LHMscixxLHAsbyxuLG0sbAp1Lkwu
+YShhKQp0PVAua3koITEsYSwwLG51bGwpCmlmKHQhPW51bGwpcmV0dXJuIHQKcz1QLmpCKDAsbnVsbCxK
+LkgoYSkpCnI9UC5jUChhLDAscykKaWYocj4wKXtxPVAuSE0oYSwwLHIpCmlmKHI9PT1zKXJldHVybiBx
+CnA9bmV3IFAuUm4ocSkKbz1yCm49ITF9ZWxzZXtvPTAKcD1udWxsCm49ITB9aWYocD09bnVsbClwPW5l
+dyBQLlJuKCIiKQptPW5ldyBQLmJ6KCExLHApCm0uYz1uCm0uTUUoYSxvLHMpCmlmKG0uZT4wKXtILnZo
+KFAucnIoIlVuZmluaXNoZWQgVVRGLTggb2N0ZXQgc2VxdWVuY2UiLGEscykpCnAuYSs9SC5Mdyg2NTUz
+MykKbS5mPW0uZT1tLmQ9MH1sPXAuYQpyZXR1cm4gbC5jaGFyQ29kZUF0KDApPT0wP2w6bH19ClAuYnou
+cHJvdG90eXBlPXsKTUU6ZnVuY3Rpb24oYSxiLGMpe3ZhciB0LHMscixxLHAsbyxuLG0sbCxrLGosaSxo
+PXRoaXMsZz0iQmFkIFVURi04IGVuY29kaW5nIDB4Igp1LkwuYShhKQp0PWguZApzPWguZQpyPWguZgpo
+LmY9aC5lPWguZD0wCiRsYWJlbDAkMDpmb3IocT1KLlU2KGEpLHA9aC5iLG89YjshMDtvPWopeyRsYWJl
+bDEkMTppZihzPjApe2Rve2lmKG89PT1jKWJyZWFrICRsYWJlbDAkMApuPXEucShhLG8pCmlmKHR5cGVv
+ZiBuIT09Im51bWJlciIpcmV0dXJuIG4uek0oKQppZigobiYxOTIpIT09MTI4KXttPVAucnIoZytDLmpu
+LkQ4KG4sMTYpLGEsbykKdGhyb3cgSC5iKG0pfWVsc2V7dD0odDw8NnxuJjYzKT4+PjA7LS1zOysrb319
+d2hpbGUocz4wKQptPXItMQppZihtPDB8fG0+PTQpcmV0dXJuIEguayhDLkdiLG0pCmlmKHQ8PUMuR2Jb
+bV0pe209UC5ycigiT3ZlcmxvbmcgZW5jb2Rpbmcgb2YgMHgiK0Muam4uRDgodCwxNiksYSxvLXItMSkK
+dGhyb3cgSC5iKG0pfWlmKHQ+MTExNDExMSl7bT1QLnJyKCJDaGFyYWN0ZXIgb3V0c2lkZSB2YWxpZCBV
+bmljb2RlIHJhbmdlOiAweCIrQy5qbi5EOCh0LDE2KSxhLG8tci0xKQp0aHJvdyBILmIobSl9aWYoIWgu
+Y3x8dCE9PTY1Mjc5KXAuYSs9SC5Mdyh0KQpoLmM9ITF9Zm9yKG09bzxjO207KXtsPVAuY1AoYSxvLGMp
+CmlmKGw+MCl7aC5jPSExCms9bytsCnAuYSs9UC5ITShhLG8saykKaWYoaz09PWMpYnJlYWt9ZWxzZSBr
+PW8Kaj1rKzEKbj1xLnEoYSxrKQppZih0eXBlb2YgbiE9PSJudW1iZXIiKXJldHVybiBuLkooKQppZihu
+PDApe2k9UC5ycigiTmVnYXRpdmUgVVRGLTggY29kZSB1bml0OiAtMHgiK0Muam4uRDgoLW4sMTYpLGEs
+ai0xKQp0aHJvdyBILmIoaSl9ZWxzZXtpZigobiYyMjQpPT09MTkyKXt0PW4mMzEKcz0xCnI9MQpjb250
+aW51ZSAkbGFiZWwwJDB9aWYoKG4mMjQwKT09PTIyNCl7dD1uJjE1CnM9MgpyPTIKY29udGludWUgJGxh
+YmVsMCQwfWlmKChuJjI0OCk9PT0yNDAmJm48MjQ1KXt0PW4mNwpzPTMKcj0zCmNvbnRpbnVlICRsYWJl
+bDAkMH1pPVAucnIoZytDLmpuLkQ4KG4sMTYpLGEsai0xKQp0aHJvdyBILmIoaSl9fWJyZWFrICRsYWJl
+bDAkMH1pZihzPjApe2guZD10CmguZT1zCmguZj1yfX19ClAuV0YucHJvdG90eXBlPXsKJDI6ZnVuY3Rp
+b24oYSxiKXt2YXIgdCxzLHIKdS5mby5hKGEpCnQ9dGhpcy5iCnM9dGhpcy5hCnQuYSs9cy5hCnI9dC5h
+Kz1ILmQoYS5hKQp0LmE9cisiOiAiCnQuYSs9UC5oKGIpCnMuYT0iLCAifSwKJFM6MTl9ClAuYTIucHJv
+dG90eXBlPXt9ClAuaVAucHJvdG90eXBlPXsKRE46ZnVuY3Rpb24oYSxiKXtpZihiPT1udWxsKXJldHVy
+biExCnJldHVybiBiIGluc3RhbmNlb2YgUC5pUCYmdGhpcy5hPT09Yi5hJiYhMH0sCmdpTzpmdW5jdGlv
+bihhKXt2YXIgdD10aGlzLmEKcmV0dXJuKHReQy5qbi53Ryh0LDMwKSkmMTA3Mzc0MTgyM30sClo6ZnVu
+Y3Rpb24oYSl7dmFyIHQ9dGhpcyxzPVAuR3EoSC50Sih0KSkscj1QLmgwKEguTlModCkpLHE9UC5oMChI
+LmpBKHQpKSxwPVAuaDAoSC5LTCh0KSksbz1QLmgwKEguY2godCkpLG49UC5oMChILkpkKHQpKSxtPVAu
+VngoSC5WYSh0KSksbD1zKyItIityKyItIitxKyIgIitwKyI6IitvKyI6IituKyIuIittCnJldHVybiBs
+fX0KUC5DUC5wcm90b3R5cGU9e30KUC5YUy5wcm90b3R5cGU9ewpnSUk6ZnVuY3Rpb24oKXtyZXR1cm4g
+SC50cyh0aGlzLiR0aHJvd25Kc0Vycm9yKX19ClAuQzYucHJvdG90eXBlPXsKWjpmdW5jdGlvbihhKXt2
+YXIgdD10aGlzLmEKaWYodCE9bnVsbClyZXR1cm4iQXNzZXJ0aW9uIGZhaWxlZDogIitQLmgodCkKcmV0
+dXJuIkFzc2VydGlvbiBmYWlsZWQifX0KUC5MSy5wcm90b3R5cGU9ewpaOmZ1bmN0aW9uKGEpe3JldHVy
+biJUaHJvdyBvZiBudWxsLiJ9fQpQLkFULnByb3RvdHlwZT17CmdMOmZ1bmN0aW9uKCl7cmV0dXJuIklu
+dmFsaWQgYXJndW1lbnQiKyghdGhpcy5hPyIocykiOiIiKX0sCmd1OmZ1bmN0aW9uKCl7cmV0dXJuIiJ9
+LApaOmZ1bmN0aW9uKGEpe3ZhciB0LHMscixxLHA9dGhpcyxvPXAuYyxuPW8hPW51bGw/IiAoIitvKyIp
+IjoiIgpvPXAuZAp0PW89PW51bGw/IiI6IjogIitILmQobykKcz1wLmdMKCkrbit0CmlmKCFwLmEpcmV0
+dXJuIHMKcj1wLmd1KCkKcT1QLmgocC5iKQpyZXR1cm4gcytyKyI6ICIrcX19ClAuYkoucHJvdG90eXBl
+PXsKZ0w6ZnVuY3Rpb24oKXtyZXR1cm4iUmFuZ2VFcnJvciJ9LApndTpmdW5jdGlvbigpe3ZhciB0LHMs
+cj10aGlzLmUKaWYocj09bnVsbCl7cj10aGlzLmYKdD1yIT1udWxsPyI6IE5vdCBsZXNzIHRoYW4gb3Ig
+ZXF1YWwgdG8gIitILmQocik6IiJ9ZWxzZXtzPXRoaXMuZgppZihzPT1udWxsKXQ9IjogTm90IGdyZWF0
+ZXIgdGhhbiBvciBlcXVhbCB0byAiK0guZChyKQplbHNlIGlmKHM+cil0PSI6IE5vdCBpbiByYW5nZSAi
+K0guZChyKSsiLi4iK0guZChzKSsiLCBpbmNsdXNpdmUiCmVsc2UgdD1zPHI/IjogVmFsaWQgdmFsdWUg
+cmFuZ2UgaXMgZW1wdHkiOiI6IE9ubHkgdmFsaWQgdmFsdWUgaXMgIitILmQocil9cmV0dXJuIHR9fQpQ
+LmVZLnByb3RvdHlwZT17CmdMOmZ1bmN0aW9uKCl7cmV0dXJuIlJhbmdlRXJyb3IifSwKZ3U6ZnVuY3Rp
+b24oKXt2YXIgdCxzPUguV1kodGhpcy5iKQppZih0eXBlb2YgcyE9PSJudW1iZXIiKXJldHVybiBzLkoo
+KQppZihzPDApcmV0dXJuIjogaW5kZXggbXVzdCBub3QgYmUgbmVnYXRpdmUiCnQ9dGhpcy5mCmlmKHQ9
+PT0wKXJldHVybiI6IG5vIGluZGljZXMgYXJlIHZhbGlkIgpyZXR1cm4iOiBpbmRleCBzaG91bGQgYmUg
+bGVzcyB0aGFuICIrSC5kKHQpfSwKZ0E6ZnVuY3Rpb24oYSl7cmV0dXJuIHRoaXMuZn19ClAubXAucHJv
+dG90eXBlPXsKWjpmdW5jdGlvbihhKXt2YXIgdCxzLHIscSxwLG8sbixtLGw9dGhpcyxrPXt9LGo9bmV3
+IFAuUm4oIiIpCmsuYT0iIgpmb3IodD1sLmMscz10Lmxlbmd0aCxyPTAscT0iIixwPSIiO3I8czsrK3Is
+cD0iLCAiKXtvPXRbcl0Kai5hPXErcApxPWouYSs9UC5oKG8pCmsuYT0iLCAifWwuZC5LKDAsbmV3IFAu
+V0YoayxqKSkKbj1QLmgobC5hKQptPWouWigwKQp0PSJOb1N1Y2hNZXRob2RFcnJvcjogbWV0aG9kIG5v
+dCBmb3VuZDogJyIrSC5kKGwuYi5hKSsiJ1xuUmVjZWl2ZXI6ICIrbisiXG5Bcmd1bWVudHM6IFsiK20r
+Il0iCnJldHVybiB0fX0KUC51Yi5wcm90b3R5cGU9ewpaOmZ1bmN0aW9uKGEpe3JldHVybiJVbnN1cHBv
+cnRlZCBvcGVyYXRpb246ICIrdGhpcy5hfX0KUC5kcy5wcm90b3R5cGU9ewpaOmZ1bmN0aW9uKGEpe3Zh
+ciB0PXRoaXMuYQpyZXR1cm4gdCE9bnVsbD8iVW5pbXBsZW1lbnRlZEVycm9yOiAiK3Q6IlVuaW1wbGVt
+ZW50ZWRFcnJvciJ9fQpQLmxqLnByb3RvdHlwZT17Clo6ZnVuY3Rpb24oYSl7cmV0dXJuIkJhZCBzdGF0
+ZTogIit0aGlzLmF9fQpQLlVWLnByb3RvdHlwZT17Clo6ZnVuY3Rpb24oYSl7dmFyIHQ9dGhpcy5hCmlm
+KHQ9PW51bGwpcmV0dXJuIkNvbmN1cnJlbnQgbW9kaWZpY2F0aW9uIGR1cmluZyBpdGVyYXRpb24uIgpy
+ZXR1cm4iQ29uY3VycmVudCBtb2RpZmljYXRpb24gZHVyaW5nIGl0ZXJhdGlvbjogIitQLmgodCkrIi4i
+fX0KUC5rNS5wcm90b3R5cGU9ewpaOmZ1bmN0aW9uKGEpe3JldHVybiJPdXQgb2YgTWVtb3J5In0sCmdJ
+STpmdW5jdGlvbigpe3JldHVybiBudWxsfSwKJGlYUzoxfQpQLktZLnByb3RvdHlwZT17Clo6ZnVuY3Rp
+b24oYSl7cmV0dXJuIlN0YWNrIE92ZXJmbG93In0sCmdJSTpmdW5jdGlvbigpe3JldHVybiBudWxsfSwK
+JGlYUzoxfQpQLnQ3LnByb3RvdHlwZT17Clo6ZnVuY3Rpb24oYSl7dmFyIHQ9dGhpcy5hCnJldHVybiB0
+PT1udWxsPyJSZWFkaW5nIHN0YXRpYyB2YXJpYWJsZSBkdXJpbmcgaXRzIGluaXRpYWxpemF0aW9uIjoi
+UmVhZGluZyBzdGF0aWMgdmFyaWFibGUgJyIrdCsiJyBkdXJpbmcgaXRzIGluaXRpYWxpemF0aW9uIn19
+ClAuQ0QucHJvdG90eXBlPXsKWjpmdW5jdGlvbihhKXtyZXR1cm4iRXhjZXB0aW9uOiAiK3RoaXMuYX19
+ClAuYUUucHJvdG90eXBlPXsKWjpmdW5jdGlvbihhKXt2YXIgdCxzLHIscSxwLG8sbixtLGwsayxqLGks
+aD10aGlzLmEsZz1oIT1udWxsJiYiIiE9PWg/IkZvcm1hdEV4Y2VwdGlvbjogIitILmQoaCk6IkZvcm1h
+dEV4Y2VwdGlvbiIsZj10aGlzLmMsZT10aGlzLmIKaWYodHlwZW9mIGU9PSJzdHJpbmciKXtpZihmIT1u
+dWxsKWg9ZjwwfHxmPmUubGVuZ3RoCmVsc2UgaD0hMQppZihoKWY9bnVsbAppZihmPT1udWxsKXt0PWUu
+bGVuZ3RoPjc4P0MueEIudyhlLDAsNzUpKyIuLi4iOmUKcmV0dXJuIGcrIlxuIit0fWZvcihzPTEscj0w
+LHE9ITEscD0wO3A8ZjsrK3Ape289Qy54Qi5XKGUscCkKaWYobz09PTEwKXtpZihyIT09cHx8IXEpKytz
+CnI9cCsxCnE9ITF9ZWxzZSBpZihvPT09MTMpeysrcwpyPXArMQpxPSEwfX1nPXM+MT9nKygiIChhdCBs
+aW5lICIrcysiLCBjaGFyYWN0ZXIgIisoZi1yKzEpKyIpXG4iKTpnKygiIChhdCBjaGFyYWN0ZXIgIiso
+ZisxKSsiKVxuIikKbj1lLmxlbmd0aApmb3IocD1mO3A8bjsrK3Ape289Qy54Qi5tKGUscCkKaWYobz09
+PTEwfHxvPT09MTMpe249cApicmVha319aWYobi1yPjc4KWlmKGYtcjw3NSl7bT1yKzc1Cmw9cgprPSIi
+Cmo9Ii4uLiJ9ZWxzZXtpZihuLWY8NzUpe2w9bi03NQptPW4Kaj0iIn1lbHNle2w9Zi0zNgptPWYrMzYK
+aj0iLi4uIn1rPSIuLi4ifWVsc2V7bT1uCmw9cgprPSIiCmo9IiJ9aT1DLnhCLncoZSxsLG0pCnJldHVy
+biBnK2sraStqKyJcbiIrQy54Qi5JeCgiICIsZi1sK2subGVuZ3RoKSsiXlxuIn1lbHNlIHJldHVybiBm
+IT1udWxsP2crKCIgKGF0IG9mZnNldCAiK0guZChmKSsiKSIpOmd9fQpQLkVILnByb3RvdHlwZT17fQpQ
+LklmLnByb3RvdHlwZT17fQpQLmNYLnByb3RvdHlwZT17CkUyOmZ1bmN0aW9uKGEsYixjKXt2YXIgdD1I
+LkxoKHRoaXMpCnJldHVybiBILksxKHRoaXMsdC5LcShjKS5DKCIxKGNYLkUpIikuYShiKSx0LkMoImNY
+LkUiKSxjKX0sCmV2OmZ1bmN0aW9uKGEsYil7dmFyIHQ9SC5MaCh0aGlzKQpyZXR1cm4gbmV3IEguVTUo
+dGhpcyx0LkMoImEyKGNYLkUpIikuYShiKSx0LkMoIlU1PGNYLkU+IikpfSwKZ0E6ZnVuY3Rpb24oYSl7
+dmFyIHQscz10aGlzLmdreih0aGlzKQpmb3IodD0wO3MuRigpOykrK3QKcmV0dXJuIHR9LApnbDA6ZnVu
+Y3Rpb24oYSl7cmV0dXJuIXRoaXMuZ2t6KHRoaXMpLkYoKX0sCmdyODpmdW5jdGlvbihhKXt2YXIgdCxz
+PXRoaXMuZ2t6KHRoaXMpCmlmKCFzLkYoKSl0aHJvdyBILmIoSC5XcCgpKQp0PXMuZ2woKQppZihzLkYo
+KSl0aHJvdyBILmIoSC5kVSgpKQpyZXR1cm4gdH0sCkU6ZnVuY3Rpb24oYSxiKXt2YXIgdCxzLHIscT0i
+aW5kZXgiClAuVUkoYixxLHUuUykKUC5rMShiLHEpCmZvcih0PXRoaXMuZ2t6KHRoaXMpLHM9MDt0LkYo
+KTspe3I9dC5nbCgpCmlmKGI9PT1zKXJldHVybiByOysrc310aHJvdyBILmIoUC50KGIsdGhpcyxxLG51
+bGwscykpfSwKWjpmdW5jdGlvbihhKXtyZXR1cm4gUC5FUCh0aGlzLCIoIiwiKSIpfX0KUC5Bbi5wcm90
+b3R5cGU9e30KUC56TS5wcm90b3R5cGU9eyRpYlE6MSwkaWNYOjF9ClAuWjAucHJvdG90eXBlPXt9ClAu
+TjMucHJvdG90eXBlPXsKWjpmdW5jdGlvbihhKXtyZXR1cm4iTWFwRW50cnkoIitILmQodGhpcy5hKSsi
+OiAiK0guZCh0aGlzLmIpKyIpIn19ClAuYzgucHJvdG90eXBlPXsKZ2lPOmZ1bmN0aW9uKGEpe3JldHVy
+biBQLk1oLnByb3RvdHlwZS5naU8uY2FsbCh0aGlzLHRoaXMpfSwKWjpmdW5jdGlvbihhKXtyZXR1cm4i
+bnVsbCJ9fQpQLmxmLnByb3RvdHlwZT17fQpQLk1oLnByb3RvdHlwZT17Y29uc3RydWN0b3I6UC5NaCwk
+aU1oOjEsCkROOmZ1bmN0aW9uKGEsYil7cmV0dXJuIHRoaXM9PT1ifSwKZ2lPOmZ1bmN0aW9uKGEpe3Jl
+dHVybiBILmVRKHRoaXMpfSwKWjpmdW5jdGlvbihhKXtyZXR1cm4iSW5zdGFuY2Ugb2YgJyIrSC5kKEgu
+bGgodGhpcykpKyInIn0sCmU3OmZ1bmN0aW9uKGEsYil7dS5vLmEoYikKdGhyb3cgSC5iKFAubHIodGhp
+cyxiLmdXYSgpLGIuZ25kKCksYi5nVm0oKSkpfSwKdG9TdHJpbmc6ZnVuY3Rpb24oKXtyZXR1cm4gdGhp
+cy5aKHRoaXMpfX0KUC5PZC5wcm90b3R5cGU9e30KUC5pYi5wcm90b3R5cGU9eyRpT2Q6MX0KUC54dS5w
+cm90b3R5cGU9e30KUC5Hei5wcm90b3R5cGU9e30KUC5aZC5wcm90b3R5cGU9ewpaOmZ1bmN0aW9uKGEp
+e3JldHVybiIifSwKJGlHejoxfQpQLnFVLnByb3RvdHlwZT17JGl2WDoxfQpQLlJuLnByb3RvdHlwZT17
+CmdBOmZ1bmN0aW9uKGEpe3JldHVybiB0aGlzLmEubGVuZ3RofSwKWjpmdW5jdGlvbihhKXt2YXIgdD10
+aGlzLmEKcmV0dXJuIHQuY2hhckNvZGVBdCgwKT09MD90OnR9LAokaUJMOjF9ClAuR0QucHJvdG90eXBl
+PXt9ClAubjEucHJvdG90eXBlPXsKJDI6ZnVuY3Rpb24oYSxiKXt2YXIgdCxzLHIscQp1LmYuYShhKQpI
+LmMoYikKdD1KLnJZKGIpLk9ZKGIsIj0iKQppZih0PT09LTEpe2lmKGIhPT0iIilhLlkoMCxQLmt1KGIs
+MCxiLmxlbmd0aCx0aGlzLmEsITApLCIiKX1lbHNlIGlmKHQhPT0wKXtzPUMueEIudyhiLDAsdCkKcj1D
+LnhCLkcoYix0KzEpCnE9dGhpcy5hCmEuWSgwLFAua3UocywwLHMubGVuZ3RoLHEsITApLFAua3Uociww
+LHIubGVuZ3RoLHEsITApKX1yZXR1cm4gYX0sCiRTOjQxfQpQLmNTLnByb3RvdHlwZT17CiQyOmZ1bmN0
+aW9uKGEsYil7dGhyb3cgSC5iKFAucnIoIklsbGVnYWwgSVB2NCBhZGRyZXNzLCAiK2EsdGhpcy5hLGIp
+KX0sCiRTOjQzfQpQLlZDLnByb3RvdHlwZT17CiQyOmZ1bmN0aW9uKGEsYil7dGhyb3cgSC5iKFAucnIo
+IklsbGVnYWwgSVB2NiBhZGRyZXNzLCAiK2EsdGhpcy5hLGIpKX0sCiQxOmZ1bmN0aW9uKGEpe3JldHVy
+biB0aGlzLiQyKGEsbnVsbCl9LAokUzo0NX0KUC5KVC5wcm90b3R5cGU9ewokMjpmdW5jdGlvbihhLGIp
+e3ZhciB0CmlmKGItYT40KXRoaXMuYS4kMigiYW4gSVB2NiBwYXJ0IGNhbiBvbmx5IGNvbnRhaW4gYSBt
+YXhpbXVtIG9mIDQgaGV4IGRpZ2l0cyIsYSkKdD1QLlFBKEMueEIudyh0aGlzLmIsYSxiKSxudWxsLDE2
+KQppZih0eXBlb2YgdCE9PSJudW1iZXIiKXJldHVybiB0LkooKQppZih0PDB8fHQ+NjU1MzUpdGhpcy5h
+LiQyKCJlYWNoIHBhcnQgbXVzdCBiZSBpbiB0aGUgcmFuZ2Ugb2YgYDB4MC4uMHhGRkZGYCIsYSkKcmV0
+dXJuIHR9LAokUzo0Nn0KUC5Ebi5wcm90b3R5cGU9ewpna3U6ZnVuY3Rpb24oKXtyZXR1cm4gdGhpcy5i
+fSwKZ0pmOmZ1bmN0aW9uKGEpe3ZhciB0PXRoaXMuYwppZih0PT1udWxsKXJldHVybiIiCmlmKEMueEIu
+bih0LCJbIikpcmV0dXJuIEMueEIudyh0LDEsdC5sZW5ndGgtMSkKcmV0dXJuIHR9LApndHA6ZnVuY3Rp
+b24oYSl7dmFyIHQ9dGhpcy5kCmlmKHQ9PW51bGwpcmV0dXJuIFAud0sodGhpcy5hKQpyZXR1cm4gdH0s
+Cmd0UDpmdW5jdGlvbigpe3ZhciB0PXRoaXMuZgpyZXR1cm4gdD09bnVsbD8iIjp0fSwKZ0thOmZ1bmN0
+aW9uKCl7dmFyIHQ9dGhpcy5yCnJldHVybiB0PT1udWxsPyIiOnR9LApubTpmdW5jdGlvbihhLGIpe3Zh
+ciB0LHMscixxLHAsbyxuLG0sbD10aGlzCnUuWC5hKG51bGwpCnUuYi5hKGIpCnQ9bC5hCnM9dD09PSJm
+aWxlIgpyPWwuYgpxPWwuZApwPWwuYwppZighKHAhPW51bGwpKXA9ci5sZW5ndGghPT0wfHxxIT1udWxs
+fHxzPyIiOm51bGwKbz1sLmUKaWYoIXMpbj1wIT1udWxsJiZvLmxlbmd0aCE9PTAKZWxzZSBuPSEwCmlm
+KG4mJiFDLnhCLm4obywiLyIpKW89Ii8iK28KbT1QLmxlKG51bGwsMCwwLGIpCnJldHVybiBuZXcgUC5E
+bih0LHIscCxxLG8sbSxsLnIpfSwKZ0ZqOmZ1bmN0aW9uKCl7dmFyIHQscz10aGlzLngKaWYocyE9bnVs
+bClyZXR1cm4gcwp0PXRoaXMuZQppZih0Lmxlbmd0aCE9PTAmJkMueEIuVyh0LDApPT09NDcpdD1DLnhC
+LkcodCwxKQpzPXQ9PT0iIj9DLmRuOlAuQUYobmV3IEgubEooSC5WTSh0LnNwbGl0KCIvIiksdS5zKSx1
+LmRPLmEoUC5QSCgpKSx1LmRvKSx1Lk4pCnRoaXMuc282KHMpCnJldHVybiBzfSwKZ2hZOmZ1bmN0aW9u
+KCl7dmFyIHQscz10aGlzCmlmKHMuUT09bnVsbCl7dD1zLmYKcy5zUkgobmV3IFAuR2ooUC5XWCh0PT1u
+dWxsPyIiOnQpLHUuRCkpfXJldHVybiBzLlF9LApKaDpmdW5jdGlvbihhLGIpe3ZhciB0LHMscixxLHAs
+bwpmb3IodD0wLHM9MDtDLnhCLlFpKGIsIi4uLyIscyk7KXtzKz0zOysrdH1yPUMueEIuY24oYSwiLyIp
+CndoaWxlKCEwKXtpZighKHI+MCYmdD4wKSlicmVhawpxPUMueEIuUGsoYSwiLyIsci0xKQppZihxPDAp
+YnJlYWsKcD1yLXEKbz1wIT09MgppZighb3x8cD09PTMpaWYoQy54Qi5tKGEscSsxKT09PTQ2KW89IW98
+fEMueEIubShhLHErMik9PT00NgplbHNlIG89ITEKZWxzZSBvPSExCmlmKG8pYnJlYWs7LS10CnI9cX1y
+ZXR1cm4gQy54Qi5pNyhhLHIrMSxudWxsLEMueEIuRyhiLHMtMyp0KSl9LApaSTpmdW5jdGlvbihhKXty
+ZXR1cm4gdGhpcy5tUyhQLmhLKGEpKX0sCm1TOmZ1bmN0aW9uKGEpe3ZhciB0LHMscixxLHAsbyxuLG0s
+bCxrPXRoaXMsaj1udWxsCmlmKGEuZ0ZpKCkubGVuZ3RoIT09MCl7dD1hLmdGaSgpCmlmKGEuZ2NqKCkp
+e3M9YS5na3UoKQpyPWEuZ0pmKGEpCnE9YS5neEEoKT9hLmd0cChhKTpqfWVsc2V7cT1qCnI9cQpzPSIi
+fXA9UC54ZShhLmdJaShhKSkKbz1hLmdRRCgpP2EuZ3RQKCk6an1lbHNle3Q9ay5hCmlmKGEuZ2NqKCkp
+e3M9YS5na3UoKQpyPWEuZ0pmKGEpCnE9UC53QihhLmd4QSgpP2EuZ3RwKGEpOmosdCkKcD1QLnhlKGEu
+Z0lpKGEpKQpvPWEuZ1FEKCk/YS5ndFAoKTpqfWVsc2V7cz1rLmIKcj1rLmMKcT1rLmQKaWYoYS5nSWko
+YSk9PT0iIil7cD1rLmUKbz1hLmdRRCgpP2EuZ3RQKCk6ay5mfWVsc2V7aWYoYS5ndFQoKSlwPVAueGUo
+YS5nSWkoYSkpCmVsc2V7bj1rLmUKaWYobi5sZW5ndGg9PT0wKWlmKHI9PW51bGwpcD10Lmxlbmd0aD09
+PTA/YS5nSWkoYSk6UC54ZShhLmdJaShhKSkKZWxzZSBwPVAueGUoIi8iK2EuZ0lpKGEpKQplbHNle209
+ay5KaChuLGEuZ0lpKGEpKQpsPXQubGVuZ3RoPT09MAppZighbHx8ciE9bnVsbHx8Qy54Qi5uKG4sIi8i
+KSlwPVAueGUobSkKZWxzZSBwPVAud0YobSwhbHx8ciE9bnVsbCl9fW89YS5nUUQoKT9hLmd0UCgpOmp9
+fX1yZXR1cm4gbmV3IFAuRG4odCxzLHIscSxwLG8sYS5nWjgoKT9hLmdLYSgpOmopfSwKZ2NqOmZ1bmN0
+aW9uKCl7cmV0dXJuIHRoaXMuYyE9bnVsbH0sCmd4QTpmdW5jdGlvbigpe3JldHVybiB0aGlzLmQhPW51
+bGx9LApnUUQ6ZnVuY3Rpb24oKXtyZXR1cm4gdGhpcy5mIT1udWxsfSwKZ1o4OmZ1bmN0aW9uKCl7cmV0
+dXJuIHRoaXMuciE9bnVsbH0sCmd0VDpmdW5jdGlvbigpe3JldHVybiBDLnhCLm4odGhpcy5lLCIvIil9
+LAp0NDpmdW5jdGlvbigpe3ZhciB0LHMscj10aGlzLHE9ci5hCmlmKHEhPT0iIiYmcSE9PSJmaWxlIil0
+aHJvdyBILmIoUC5MNCgiQ2Fubm90IGV4dHJhY3QgYSBmaWxlIHBhdGggZnJvbSBhICIrSC5kKHEpKyIg
+VVJJIikpCnE9ci5mCmlmKChxPT1udWxsPyIiOnEpIT09IiIpdGhyb3cgSC5iKFAuTDQoIkNhbm5vdCBl
+eHRyYWN0IGEgZmlsZSBwYXRoIGZyb20gYSBVUkkgd2l0aCBhIHF1ZXJ5IGNvbXBvbmVudCIpKQpxPXIu
+cgppZigocT09bnVsbD8iIjpxKSE9PSIiKXRocm93IEguYihQLkw0KCJDYW5ub3QgZXh0cmFjdCBhIGZp
+bGUgcGF0aCBmcm9tIGEgVVJJIHdpdGggYSBmcmFnbWVudCBjb21wb25lbnQiKSkKdD0kLk94KCkKaWYo
+SC5vVCh0KSlxPVAubW4ocikKZWxzZXtpZihyLmMhPW51bGwmJnIuZ0pmKHIpIT09IiIpSC52aChQLkw0
+KCJDYW5ub3QgZXh0cmFjdCBhIG5vbi1XaW5kb3dzIGZpbGUgcGF0aCBmcm9tIGEgZmlsZSBVUkkgd2l0
+aCBhbiBhdXRob3JpdHkiKSkKcz1yLmdGaigpClAua0UocywhMSkKcT1QLnZnKEMueEIubihyLmUsIi8i
+KT8iLyI6IiIscywiLyIpCnE9cS5jaGFyQ29kZUF0KDApPT0wP3E6cX1yZXR1cm4gcX0sClo6ZnVuY3Rp
+b24oYSl7dmFyIHQscyxyLHE9dGhpcyxwPXEueQppZihwPT1udWxsKXtwPXEuYQp0PXAubGVuZ3RoIT09
+MD9wKyI6IjoiIgpzPXEuYwpyPXM9PW51bGwKaWYoIXJ8fHA9PT0iZmlsZSIpe3A9dCsiLy8iCnQ9cS5i
+CmlmKHQubGVuZ3RoIT09MClwPXArdCsiQCIKaWYoIXIpcCs9cwp0PXEuZAppZih0IT1udWxsKXA9cCsi
+OiIrSC5kKHQpfWVsc2UgcD10CnArPXEuZQp0PXEuZgppZih0IT1udWxsKXA9cCsiPyIrdAp0PXEucgpp
+Zih0IT1udWxsKXA9cCsiIyIrdApwPXEueT1wLmNoYXJDb2RlQXQoMCk9PTA/cDpwfXJldHVybiBwfSwK
+RE46ZnVuY3Rpb24oYSxiKXt2YXIgdCxzLHI9dGhpcwppZihiPT1udWxsKXJldHVybiExCmlmKHI9PT1i
+KXJldHVybiEwCmlmKHUuRS5iKGIpKWlmKHIuYT09Yi5nRmkoKSlpZihyLmMhPW51bGw9PT1iLmdjaigp
+KWlmKHIuYj09Yi5na3UoKSlpZihyLmdKZihyKT09Yi5nSmYoYikpaWYoci5ndHAocik9PWIuZ3RwKGIp
+KWlmKHIuZT09PWIuZ0lpKGIpKXt0PXIuZgpzPXQ9PW51bGwKaWYoIXM9PT1iLmdRRCgpKXtpZihzKXQ9
+IiIKaWYodD09PWIuZ3RQKCkpe3Q9ci5yCnM9dD09bnVsbAppZighcz09PWIuZ1o4KCkpe2lmKHMpdD0i
+Igp0PXQ9PT1iLmdLYSgpfWVsc2UgdD0hMX1lbHNlIHQ9ITF9ZWxzZSB0PSExfWVsc2UgdD0hMQplbHNl
+IHQ9ITEKZWxzZSB0PSExCmVsc2UgdD0hMQplbHNlIHQ9ITEKZWxzZSB0PSExCmVsc2UgdD0hMQpyZXR1
+cm4gdH0sCmdpTzpmdW5jdGlvbihhKXt2YXIgdD10aGlzLnoKcmV0dXJuIHQ9PW51bGw/dGhpcy56PUMu
+eEIuZ2lPKHRoaXMuWigwKSk6dH0sCnNvNjpmdW5jdGlvbihhKXt0aGlzLng9dS5hLmEoYSl9LApzUkg6
+ZnVuY3Rpb24oYSl7dGhpcy5RPXUuZi5hKGEpfSwKJGlpRDoxLApnRmk6ZnVuY3Rpb24oKXtyZXR1cm4g
+dGhpcy5hfSwKZ0lpOmZ1bmN0aW9uKGEpe3JldHVybiB0aGlzLmV9fQpQLmUxLnByb3RvdHlwZT17CiQx
+OmZ1bmN0aW9uKGEpe3Rocm93IEguYihQLnJyKCJJbnZhbGlkIHBvcnQiLHRoaXMuYSx0aGlzLmIrMSkp
+fSwKJFM6MTR9ClAuTlkucHJvdG90eXBlPXsKJDE6ZnVuY3Rpb24oYSl7dmFyIHQ9IklsbGVnYWwgcGF0
+aCBjaGFyYWN0ZXIgIgpILmMoYSkKaWYoSi56bChhLCIvIikpaWYodGhpcy5hKXRocm93IEguYihQLnhZ
+KHQrYSkpCmVsc2UgdGhyb3cgSC5iKFAuTDQodCthKSl9LAokUzoxNH0KUC5SWi5wcm90b3R5cGU9ewok
+MTpmdW5jdGlvbihhKXtyZXR1cm4gUC5lUChDLlpKLGEsQy54TSwhMSl9LAokUzo0fQpQLk1FLnByb3Rv
+dHlwZT17CiQyOmZ1bmN0aW9uKGEsYil7dmFyIHQ9dGhpcy5iLHM9dGhpcy5hCnQuYSs9cy5hCnMuYT0i
+JiIKcz10LmErPUguZChQLmVQKEMuRjMsYSxDLnhNLCEwKSkKaWYoYiE9bnVsbCYmYi5sZW5ndGghPT0w
+KXt0LmE9cysiPSIKdC5hKz1ILmQoUC5lUChDLkYzLGIsQy54TSwhMCkpfX0sCiRTOjIyfQpQLnk1LnBy
+b3RvdHlwZT17CiQyOmZ1bmN0aW9uKGEsYil7dmFyIHQscwpILmMoYSkKaWYoYj09bnVsbHx8dHlwZW9m
+IGI9PSJzdHJpbmciKXRoaXMuYS4kMihhLEguYyhiKSkKZWxzZSBmb3IodD1KLklUKHUuUi5hKGIpKSxz
+PXRoaXMuYTt0LkYoKTspcy4kMihhLEguYyh0LmdsKCkpKX0sCiRTOjEzfQpQLlBFLnByb3RvdHlwZT17
+CmdsUjpmdW5jdGlvbigpe3ZhciB0LHMscixxLHA9dGhpcyxvPW51bGwsbj1wLmMKaWYobiE9bnVsbCly
+ZXR1cm4gbgpuPXAuYgppZigwPj1uLmxlbmd0aClyZXR1cm4gSC5rKG4sMCkKdD1wLmEKbj1uWzBdKzEK
+cz1DLnhCLlhVKHQsIj8iLG4pCnI9dC5sZW5ndGgKaWYocz49MCl7cT1QLnVPKHQscysxLHIsQy5WQywh
+MSkKcj1zfWVsc2UgcT1vCnJldHVybiBwLmM9bmV3IFAucWUoImRhdGEiLG8sbyxvLFAudU8odCxuLHIs
+Qy5XZCwhMSkscSxvKX0sClo6ZnVuY3Rpb24oYSl7dmFyIHQscz10aGlzLmIKaWYoMD49cy5sZW5ndGgp
+cmV0dXJuIEguayhzLDApCnQ9dGhpcy5hCnJldHVybiBzWzBdPT09LTE/ImRhdGE6Iit0OnR9fQpQLnEz
+LnByb3RvdHlwZT17CiQxOmZ1bmN0aW9uKGEpe3JldHVybiBuZXcgVWludDhBcnJheSg5Nil9LAokUzoy
+M30KUC55SS5wcm90b3R5cGU9ewokMjpmdW5jdGlvbihhLGIpe3ZhciB0PXRoaXMuYQppZihhPj10Lmxl
+bmd0aClyZXR1cm4gSC5rKHQsYSkKdD10W2FdCkouQ00odCwwLDk2LGIpCnJldHVybiB0fSwKJFM6MjR9
+ClAuYzYucHJvdG90eXBlPXsKJDM6ZnVuY3Rpb24oYSxiLGMpe3ZhciB0LHMscixxCmZvcih0PWIubGVu
+Z3RoLHM9YS5sZW5ndGgscj0wO3I8dDsrK3Ipe3E9Qy54Qi5XKGIscileOTYKaWYocT49cylyZXR1cm4g
+SC5rKGEscSkKYVtxXT1jfX19ClAucWQucHJvdG90eXBlPXsKJDM6ZnVuY3Rpb24oYSxiLGMpe3ZhciB0
+LHMscixxCmZvcih0PUMueEIuVyhiLDApLHM9Qy54Qi5XKGIsMSkscj1hLmxlbmd0aDt0PD1zOysrdCl7
+cT0odF45Nik+Pj4wCmlmKHE+PXIpcmV0dXJuIEguayhhLHEpCmFbcV09Y319fQpQLlVmLnByb3RvdHlw
+ZT17CmdjajpmdW5jdGlvbigpe3JldHVybiB0aGlzLmM+MH0sCmd4QTpmdW5jdGlvbigpe3ZhciB0LHMK
+aWYodGhpcy5jPjApe3Q9dGhpcy5kCmlmKHR5cGVvZiB0IT09Im51bWJlciIpcmV0dXJuIHQuaCgpCnM9
+dGhpcy5lCmlmKHR5cGVvZiBzIT09Im51bWJlciIpcmV0dXJuIEgucFkocykKcz10KzE8cwp0PXN9ZWxz
+ZSB0PSExCnJldHVybiB0fSwKZ1FEOmZ1bmN0aW9uKCl7dmFyIHQ9dGhpcy5mCmlmKHR5cGVvZiB0IT09
+Im51bWJlciIpcmV0dXJuIHQuSigpCnJldHVybiB0PHRoaXMucn0sCmdaODpmdW5jdGlvbigpe3JldHVy
+biB0aGlzLnI8dGhpcy5hLmxlbmd0aH0sCmdOdzpmdW5jdGlvbigpe3JldHVybiB0aGlzLmI9PT00JiZD
+LnhCLm4odGhpcy5hLCJmaWxlIil9LApnV1o6ZnVuY3Rpb24oKXtyZXR1cm4gdGhpcy5iPT09NCYmQy54
+Qi5uKHRoaXMuYSwiaHR0cCIpfSwKZ1JlOmZ1bmN0aW9uKCl7cmV0dXJuIHRoaXMuYj09PTUmJkMueEIu
+bih0aGlzLmEsImh0dHBzIil9LApndFQ6ZnVuY3Rpb24oKXtyZXR1cm4gQy54Qi5RaSh0aGlzLmEsIi8i
+LHRoaXMuZSl9LApnRmk6ZnVuY3Rpb24oKXt2YXIgdCxzPXRoaXMscj0icGFja2FnZSIscT1zLmIKaWYo
+cTw9MClyZXR1cm4iIgp0PXMueAppZih0IT1udWxsKXJldHVybiB0CmlmKHMuZ1daKCkpcT1zLng9Imh0
+dHAiCmVsc2UgaWYocy5nUmUoKSl7cy54PSJodHRwcyIKcT0iaHR0cHMifWVsc2UgaWYocy5nTncoKSl7
+cy54PSJmaWxlIgpxPSJmaWxlIn1lbHNlIGlmKHE9PT03JiZDLnhCLm4ocy5hLHIpKXtzLng9cgpxPXJ9
+ZWxzZXtxPUMueEIudyhzLmEsMCxxKQpzLng9cX1yZXR1cm4gcX0sCmdrdTpmdW5jdGlvbigpe3ZhciB0
+PXRoaXMuYyxzPXRoaXMuYiszCnJldHVybiB0PnM/Qy54Qi53KHRoaXMuYSxzLHQtMSk6IiJ9LApnSmY6
+ZnVuY3Rpb24oYSl7dmFyIHQ9dGhpcy5jCnJldHVybiB0PjA/Qy54Qi53KHRoaXMuYSx0LHRoaXMuZCk6
+IiJ9LApndHA6ZnVuY3Rpb24oYSl7dmFyIHQscz10aGlzCmlmKHMuZ3hBKCkpe3Q9cy5kCmlmKHR5cGVv
+ZiB0IT09Im51bWJlciIpcmV0dXJuIHQuaCgpCnJldHVybiBQLlFBKEMueEIudyhzLmEsdCsxLHMuZSks
+bnVsbCxudWxsKX1pZihzLmdXWigpKXJldHVybiA4MAppZihzLmdSZSgpKXJldHVybiA0NDMKcmV0dXJu
+IDB9LApnSWk6ZnVuY3Rpb24oYSl7cmV0dXJuIEMueEIudyh0aGlzLmEsdGhpcy5lLHRoaXMuZil9LApn
+dFA6ZnVuY3Rpb24oKXt2YXIgdD10aGlzLmYscz10aGlzLnIKaWYodHlwZW9mIHQhPT0ibnVtYmVyIily
+ZXR1cm4gdC5KKCkKcmV0dXJuIHQ8cz9DLnhCLncodGhpcy5hLHQrMSxzKToiIn0sCmdLYTpmdW5jdGlv
+bigpe3ZhciB0PXRoaXMucixzPXRoaXMuYQpyZXR1cm4gdDxzLmxlbmd0aD9DLnhCLkcocyx0KzEpOiIi
+fSwKZ0ZqOmZ1bmN0aW9uKCl7dmFyIHQscyxyPXRoaXMuZSxxPXRoaXMuZixwPXRoaXMuYQppZihDLnhC
+LlFpKHAsIi8iLHIpKXtpZih0eXBlb2YgciE9PSJudW1iZXIiKXJldHVybiByLmgoKTsrK3J9aWYocj09
+cSlyZXR1cm4gQy5kbgp0PUguVk0oW10sdS5zKQpzPXIKd2hpbGUoITApe2lmKHR5cGVvZiBzIT09Im51
+bWJlciIpcmV0dXJuIHMuSigpCmlmKHR5cGVvZiBxIT09Im51bWJlciIpcmV0dXJuIEgucFkocSkKaWYo
+IShzPHEpKWJyZWFrCmlmKEMueEIubShwLHMpPT09NDcpe0MuTm0uaSh0LEMueEIudyhwLHIscykpCnI9
+cysxfSsrc31DLk5tLmkodCxDLnhCLncocCxyLHEpKQpyZXR1cm4gUC5BRih0LHUuTil9LApnaFk6ZnVu
+Y3Rpb24oKXt2YXIgdD10aGlzLmYKaWYodHlwZW9mIHQhPT0ibnVtYmVyIilyZXR1cm4gdC5KKCkKaWYo
+dD49dGhpcy5yKXJldHVybiBDLkNNCnJldHVybiBuZXcgUC5HaihQLldYKHRoaXMuZ3RQKCkpLHUuRCl9
+LAprWDpmdW5jdGlvbihhKXt2YXIgdCxzPXRoaXMuZAppZih0eXBlb2YgcyE9PSJudW1iZXIiKXJldHVy
+biBzLmgoKQp0PXMrMQpyZXR1cm4gdCthLmxlbmd0aD09PXRoaXMuZSYmQy54Qi5RaSh0aGlzLmEsYSx0
+KX0sCk45OmZ1bmN0aW9uKCl7dmFyIHQ9dGhpcyxzPXQucixyPXQuYQppZihzPj1yLmxlbmd0aClyZXR1
+cm4gdApyZXR1cm4gbmV3IFAuVWYoQy54Qi53KHIsMCxzKSx0LmIsdC5jLHQuZCx0LmUsdC5mLHMsdC54
+KX0sCm5tOmZ1bmN0aW9uKGEsYil7dmFyIHQscyxyLHEscCxvLG4sbSxsLGssaj10aGlzLGk9bnVsbAp1
+LlguYShudWxsKQp1LmIuYShiKQp0PWouZ0ZpKCkKcz10PT09ImZpbGUiCnI9ai5jCnE9cj4wP0MueEIu
+dyhqLmEsai5iKzMscik6IiIKcD1qLmd4QSgpP2ouZ3RwKGopOmkKcj1qLmMKaWYocj4wKW89Qy54Qi53
+KGouYSxyLGouZCkKZWxzZSBvPXEubGVuZ3RoIT09MHx8cCE9bnVsbHx8cz8iIjppCnI9ai5hCm49Qy54
+Qi53KHIsai5lLGouZikKaWYoIXMpbT1vIT1udWxsJiZuLmxlbmd0aCE9PTAKZWxzZSBtPSEwCmlmKG0m
+JiFDLnhCLm4obiwiLyIpKW49Ii8iK24KbD1QLmxlKGksMCwwLGIpCm09ai5yCms9bTxyLmxlbmd0aD9D
+LnhCLkcocixtKzEpOmkKcmV0dXJuIG5ldyBQLkRuKHQscSxvLHAsbixsLGspfSwKWkk6ZnVuY3Rpb24o
+YSl7cmV0dXJuIHRoaXMubVMoUC5oSyhhKSl9LAptUzpmdW5jdGlvbihhKXtpZihhIGluc3RhbmNlb2Yg
+UC5VZilyZXR1cm4gdGhpcy51MSh0aGlzLGEpCnJldHVybiB0aGlzLnZzKCkubVMoYSl9LAp1MTpmdW5j
+dGlvbihhLGIpe3ZhciB0LHMscixxLHAsbyxuLG0sbCxrLGosaSxoLGcsZixlPWIuYgppZihlPjApcmV0
+dXJuIGIKdD1iLmMKaWYodD4wKXtzPWEuYgppZihzPD0wKXJldHVybiBiCmlmKGEuZ053KCkpcj1iLmUh
+PWIuZgplbHNlIGlmKGEuZ1daKCkpcj0hYi5rWCgiODAiKQplbHNlIHI9IWEuZ1JlKCl8fCFiLmtYKCI0
+NDMiKQppZihyKXtxPXMrMQpwPUMueEIudyhhLmEsMCxxKStDLnhCLkcoYi5hLGUrMSkKZT1iLmQKaWYo
+dHlwZW9mIGUhPT0ibnVtYmVyIilyZXR1cm4gZS5oKCkKbz1iLmUKaWYodHlwZW9mIG8hPT0ibnVtYmVy
+IilyZXR1cm4gby5oKCkKbj1iLmYKaWYodHlwZW9mIG4hPT0ibnVtYmVyIilyZXR1cm4gbi5oKCkKcmV0
+dXJuIG5ldyBQLlVmKHAscyx0K3EsZStxLG8rcSxuK3EsYi5yK3EsYS54KX1lbHNlIHJldHVybiB0aGlz
+LnZzKCkubVMoYil9bT1iLmUKZT1iLmYKaWYobT09ZSl7dD1iLnIKaWYodHlwZW9mIGUhPT0ibnVtYmVy
+IilyZXR1cm4gZS5KKCkKaWYoZTx0KXtzPWEuZgppZih0eXBlb2YgcyE9PSJudW1iZXIiKXJldHVybiBz
+LkhOKCkKcT1zLWUKcmV0dXJuIG5ldyBQLlVmKEMueEIudyhhLmEsMCxzKStDLnhCLkcoYi5hLGUpLGEu
+YixhLmMsYS5kLGEuZSxlK3EsdCtxLGEueCl9ZT1iLmEKaWYodDxlLmxlbmd0aCl7cz1hLnIKcmV0dXJu
+IG5ldyBQLlVmKEMueEIudyhhLmEsMCxzKStDLnhCLkcoZSx0KSxhLmIsYS5jLGEuZCxhLmUsYS5mLHQr
+KHMtdCksYS54KX1yZXR1cm4gYS5OOSgpfXQ9Yi5hCmlmKEMueEIuUWkodCwiLyIsbSkpe3M9YS5lCmlm
+KHR5cGVvZiBzIT09Im51bWJlciIpcmV0dXJuIHMuSE4oKQppZih0eXBlb2YgbSE9PSJudW1iZXIiKXJl
+dHVybiBILnBZKG0pCnE9cy1tCnA9Qy54Qi53KGEuYSwwLHMpK0MueEIuRyh0LG0pCmlmKHR5cGVvZiBl
+IT09Im51bWJlciIpcmV0dXJuIGUuaCgpCnJldHVybiBuZXcgUC5VZihwLGEuYixhLmMsYS5kLHMsZStx
+LGIucitxLGEueCl9bD1hLmUKaz1hLmYKaWYobD09ayYmYS5jPjApe2Zvcig7Qy54Qi5RaSh0LCIuLi8i
+LG0pOyl7aWYodHlwZW9mIG0hPT0ibnVtYmVyIilyZXR1cm4gbS5oKCkKbSs9M31pZih0eXBlb2YgbCE9
+PSJudW1iZXIiKXJldHVybiBsLkhOKCkKaWYodHlwZW9mIG0hPT0ibnVtYmVyIilyZXR1cm4gSC5wWSht
+KQpxPWwtbSsxCnA9Qy54Qi53KGEuYSwwLGwpKyIvIitDLnhCLkcodCxtKQppZih0eXBlb2YgZSE9PSJu
+dW1iZXIiKXJldHVybiBlLmgoKQpyZXR1cm4gbmV3IFAuVWYocCxhLmIsYS5jLGEuZCxsLGUrcSxiLnIr
+cSxhLngpfWo9YS5hCmZvcihpPWw7Qy54Qi5RaShqLCIuLi8iLGkpOyl7aWYodHlwZW9mIGkhPT0ibnVt
+YmVyIilyZXR1cm4gaS5oKCkKaSs9M31oPTAKd2hpbGUoITApe2lmKHR5cGVvZiBtIT09Im51bWJlciIp
+cmV0dXJuIG0uaCgpCmc9bSszCmlmKHR5cGVvZiBlIT09Im51bWJlciIpcmV0dXJuIEgucFkoZSkKaWYo
+IShnPD1lJiZDLnhCLlFpKHQsIi4uLyIsbSkpKWJyZWFrOysraAptPWd9Zj0iIgp3aGlsZSghMCl7aWYo
+dHlwZW9mIGshPT0ibnVtYmVyIilyZXR1cm4gay5vcygpCmlmKHR5cGVvZiBpIT09Im51bWJlciIpcmV0
+dXJuIEgucFkoaSkKaWYoIShrPmkpKWJyZWFrOy0tawppZihDLnhCLm0oaixrKT09PTQ3KXtpZihoPT09
+MCl7Zj0iLyIKYnJlYWt9LS1oCmY9Ii8ifX1pZihrPT09aSYmYS5iPD0wJiYhQy54Qi5RaShqLCIvIixs
+KSl7bS09aCozCmY9IiJ9cT1rLW0rZi5sZW5ndGgKcmV0dXJuIG5ldyBQLlVmKEMueEIudyhqLDAsaykr
+ZitDLnhCLkcodCxtKSxhLmIsYS5jLGEuZCxsLGUrcSxiLnIrcSxhLngpfSwKdDQ6ZnVuY3Rpb24oKXt2
+YXIgdCxzLHIscSxwPXRoaXMKaWYocC5iPj0wJiYhcC5nTncoKSl0aHJvdyBILmIoUC5MNCgiQ2Fubm90
+IGV4dHJhY3QgYSBmaWxlIHBhdGggZnJvbSBhICIrSC5kKHAuZ0ZpKCkpKyIgVVJJIikpCnQ9cC5mCnM9
+cC5hCmlmKHR5cGVvZiB0IT09Im51bWJlciIpcmV0dXJuIHQuSigpCmlmKHQ8cy5sZW5ndGgpe2lmKHQ8
+cC5yKXRocm93IEguYihQLkw0KCJDYW5ub3QgZXh0cmFjdCBhIGZpbGUgcGF0aCBmcm9tIGEgVVJJIHdp
+dGggYSBxdWVyeSBjb21wb25lbnQiKSkKdGhyb3cgSC5iKFAuTDQoIkNhbm5vdCBleHRyYWN0IGEgZmls
+ZSBwYXRoIGZyb20gYSBVUkkgd2l0aCBhIGZyYWdtZW50IGNvbXBvbmVudCIpKX1yPSQuT3goKQppZihI
+Lm9UKHIpKXQ9UC5tbihwKQplbHNle3E9cC5kCmlmKHR5cGVvZiBxIT09Im51bWJlciIpcmV0dXJuIEgu
+cFkocSkKaWYocC5jPHEpSC52aChQLkw0KCJDYW5ub3QgZXh0cmFjdCBhIG5vbi1XaW5kb3dzIGZpbGUg
+cGF0aCBmcm9tIGEgZmlsZSBVUkkgd2l0aCBhbiBhdXRob3JpdHkiKSkKdD1DLnhCLncocyxwLmUsdCl9
+cmV0dXJuIHR9LApnaU86ZnVuY3Rpb24oYSl7dmFyIHQ9dGhpcy55CnJldHVybiB0PT1udWxsP3RoaXMu
+eT1DLnhCLmdpTyh0aGlzLmEpOnR9LApETjpmdW5jdGlvbihhLGIpe2lmKGI9PW51bGwpcmV0dXJuITEK
+aWYodGhpcz09PWIpcmV0dXJuITAKcmV0dXJuIHUuRS5iKGIpJiZ0aGlzLmE9PT1iLlooMCl9LAp2czpm
+dW5jdGlvbigpe3ZhciB0PXRoaXMscz1udWxsLHI9dC5nRmkoKSxxPXQuZ2t1KCkscD10LmM+MD90LmdK
+Zih0KTpzLG89dC5neEEoKT90Lmd0cCh0KTpzLG49dC5hLG09dC5mLGw9Qy54Qi53KG4sdC5lLG0pLGs9
+dC5yCmlmKHR5cGVvZiBtIT09Im51bWJlciIpcmV0dXJuIG0uSigpCm09bTxrP3QuZ3RQKCk6cwpyZXR1
+cm4gbmV3IFAuRG4ocixxLHAsbyxsLG0sazxuLmxlbmd0aD90LmdLYSgpOnMpfSwKWjpmdW5jdGlvbihh
+KXtyZXR1cm4gdGhpcy5hfSwKJGlpRDoxfQpQLnFlLnByb3RvdHlwZT17fQpXLnFFLnByb3RvdHlwZT17
+fQpXLkdoLnByb3RvdHlwZT17Clo6ZnVuY3Rpb24oYSl7cmV0dXJuIFN0cmluZyhhKX0sCiRpR2g6MX0K
+Vy5mWS5wcm90b3R5cGU9ewpaOmZ1bmN0aW9uKGEpe3JldHVybiBTdHJpbmcoYSl9fQpXLm5CLnByb3Rv
+dHlwZT17JGluQjoxfQpXLkF6LnByb3RvdHlwZT17JGlBejoxfQpXLlFQLnByb3RvdHlwZT17JGlRUDox
+fQpXLm54LnByb3RvdHlwZT17CmdBOmZ1bmN0aW9uKGEpe3JldHVybiBhLmxlbmd0aH19Clcub0oucHJv
+dG90eXBlPXsKZ0E6ZnVuY3Rpb24oYSl7cmV0dXJuIGEubGVuZ3RofX0KVy5pZC5wcm90b3R5cGU9e30K
+Vy5RRi5wcm90b3R5cGU9e30KVy5OaC5wcm90b3R5cGU9ewpaOmZ1bmN0aW9uKGEpe3JldHVybiBTdHJp
+bmcoYSl9fQpXLklCLnByb3RvdHlwZT17Clo6ZnVuY3Rpb24oYSl7cmV0dXJuIlJlY3RhbmdsZSAoIitI
+LmQoYS5sZWZ0KSsiLCAiK0guZChhLnRvcCkrIikgIitILmQoYS53aWR0aCkrIiB4ICIrSC5kKGEuaGVp
+Z2h0KX0sCkROOmZ1bmN0aW9uKGEsYil7aWYoYj09bnVsbClyZXR1cm4hMQpyZXR1cm4gdS5xLmIoYikm
+JmEubGVmdD09Yi5sZWZ0JiZhLnRvcD09Yi50b3AmJmEud2lkdGg9PWIud2lkdGgmJmEuaGVpZ2h0PT1i
+LmhlaWdodH0sCmdpTzpmdW5jdGlvbihhKXtyZXR1cm4gVy5yRShKLmhmKGEubGVmdCksSi5oZihhLnRv
+cCksSi5oZihhLndpZHRoKSxKLmhmKGEuaGVpZ2h0KSl9LAokaXRuOjF9ClcubjcucHJvdG90eXBlPXsK
+Z0E6ZnVuY3Rpb24oYSl7cmV0dXJuIGEubGVuZ3RofX0KVy53ei5wcm90b3R5cGU9ewpnQTpmdW5jdGlv
+bihhKXtyZXR1cm4gdGhpcy5hLmxlbmd0aH0sCnE6ZnVuY3Rpb24oYSxiKXt2YXIgdApILldZKGIpCnQ9
+dGhpcy5hCmlmKGI8MHx8Yj49dC5sZW5ndGgpcmV0dXJuIEguayh0LGIpCnJldHVybiB0aGlzLiR0aS5j
+LmEodFtiXSl9LApZOmZ1bmN0aW9uKGEsYixjKXt0aGlzLiR0aS5jLmEoYykKdGhyb3cgSC5iKFAuTDQo
+IkNhbm5vdCBtb2RpZnkgbGlzdCIpKX19ClcuY3YucHJvdG90eXBlPXsKZ1FnOmZ1bmN0aW9uKGEpe3Jl
+dHVybiBuZXcgVy5pNyhhKX0sCmdEOmZ1bmN0aW9uKGEpe3JldHVybiBuZXcgVy5JNChhKX0sCnNEOmZ1
+bmN0aW9uKGEsYil7dmFyIHQKdS5YLmEoYikKdD10aGlzLmdEKGEpCnQuVjEoMCkKdC5GVigwLGIpfSwK
+WjpmdW5jdGlvbihhKXtyZXR1cm4gYS5sb2NhbE5hbWV9LAp0bjpmdW5jdGlvbihhKXt2YXIgdD0hIWEu
+c2Nyb2xsSW50b1ZpZXdJZk5lZWRlZAppZih0KWEuc2Nyb2xsSW50b1ZpZXdJZk5lZWRlZCgpCmVsc2Ug
+YS5zY3JvbGxJbnRvVmlldygpfSwKcjY6ZnVuY3Rpb24oYSxiLGMsZCl7dmFyIHQscyxyLHEKaWYoYz09
+bnVsbCl7aWYoZD09bnVsbCl7dD0kLmx0CmlmKHQ9PW51bGwpe3Q9SC5WTShbXSx1LmspCnM9bmV3IFcu
+dkQodCkKQy5ObS5pKHQsVy5UdyhudWxsKSkKQy5ObS5pKHQsVy5CbCgpKQokLmx0PXMKZD1zfWVsc2Ug
+ZD10fXQ9JC5FVQppZih0PT1udWxsKXt0PW5ldyBXLktvKGQpCiQuRVU9dApjPXR9ZWxzZXt0LmE9ZApj
+PXR9fWVsc2UgaWYoZCE9bnVsbCl0aHJvdyBILmIoUC54WSgidmFsaWRhdG9yIGNhbiBvbmx5IGJlIHBh
+c3NlZCBpZiB0cmVlU2FuaXRpemVyIGlzIG51bGwiKSkKaWYoJC54bz09bnVsbCl7dD1kb2N1bWVudApz
+PXQuaW1wbGVtZW50YXRpb24uY3JlYXRlSFRNTERvY3VtZW50KCIiKQokLnhvPXMKJC5CTz1zLmNyZWF0
+ZVJhbmdlKCkKcz0kLnhvLmNyZWF0ZUVsZW1lbnQoImJhc2UiKQp1LmNSLmEocykKcy5ocmVmPXQuYmFz
+ZVVSSQokLnhvLmhlYWQuYXBwZW5kQ2hpbGQocyl9dD0kLnhvCmlmKHQuYm9keT09bnVsbCl7cz10LmNy
+ZWF0ZUVsZW1lbnQoImJvZHkiKQp0LmJvZHk9dS5ZLmEocyl9dD0kLnhvCmlmKHUuWS5iKGEpKXI9dC5i
+b2R5CmVsc2V7cj10LmNyZWF0ZUVsZW1lbnQoYS50YWdOYW1lKQokLnhvLmJvZHkuYXBwZW5kQ2hpbGQo
+cil9aWYoImNyZWF0ZUNvbnRleHR1YWxGcmFnbWVudCIgaW4gd2luZG93LlJhbmdlLnByb3RvdHlwZSYm
+IUMuTm0udGcoQy5TcSxhLnRhZ05hbWUpKXskLkJPLnNlbGVjdE5vZGVDb250ZW50cyhyKQpxPSQuQk8u
+Y3JlYXRlQ29udGV4dHVhbEZyYWdtZW50KGIpfWVsc2V7ci5pbm5lckhUTUw9YgpxPSQueG8uY3JlYXRl
+RG9jdW1lbnRGcmFnbWVudCgpCmZvcig7dD1yLmZpcnN0Q2hpbGQsdCE9bnVsbDspcS5hcHBlbmRDaGls
+ZCh0KX10PSQueG8uYm9keQppZihyPT1udWxsP3QhPW51bGw6ciE9PXQpSi5MdChyKQpjLlBuKHEpCmRv
+Y3VtZW50LmFkb3B0Tm9kZShxKQpyZXR1cm4gcX0sCkFIOmZ1bmN0aW9uKGEsYixjKXtyZXR1cm4gdGhp
+cy5yNihhLGIsYyxudWxsKX0sCnNoZjpmdW5jdGlvbihhLGIpe3RoaXMuWUMoYSxiKX0sCnBrOmZ1bmN0
+aW9uKGEsYixjKXthLnRleHRDb250ZW50PW51bGwKYS5hcHBlbmRDaGlsZCh0aGlzLnI2KGEsYixudWxs
+LGMpKX0sCllDOmZ1bmN0aW9uKGEsYil7cmV0dXJuIHRoaXMucGsoYSxiLG51bGwpfSwKZ25zOmZ1bmN0
+aW9uKGEpe3JldHVybiBhLnRhZ05hbWV9LApnVmw6ZnVuY3Rpb24oYSl7cmV0dXJuIG5ldyBXLmV1KGEs
+ImNsaWNrIiwhMSx1LlEpfSwKJGljdjoxfQpXLkN2LnByb3RvdHlwZT17CiQxOmZ1bmN0aW9uKGEpe3Jl
+dHVybiB1LmguYih1LkEuYShhKSl9LAokUzoyNX0KVy5lYS5wcm90b3R5cGU9eyRpZWE6MX0KVy5EMC5w
+cm90b3R5cGU9ewpPbjpmdW5jdGlvbihhLGIsYyxkKXt1LlUuYShjKQppZihjIT1udWxsKXRoaXMudihh
+LGIsYyxkKX0sCkI6ZnVuY3Rpb24oYSxiLGMpe3JldHVybiB0aGlzLk9uKGEsYixjLG51bGwpfSwKdjpm
+dW5jdGlvbihhLGIsYyxkKXtyZXR1cm4gYS5hZGRFdmVudExpc3RlbmVyKGIsSC50Uih1LlUuYShjKSwx
+KSxkKX0sCiRpRDA6MX0KVy5UNS5wcm90b3R5cGU9eyRpVDU6MX0KVy5oNC5wcm90b3R5cGU9ewpnQTpm
+dW5jdGlvbihhKXtyZXR1cm4gYS5sZW5ndGh9fQpXLmJyLnByb3RvdHlwZT17CmdBOmZ1bmN0aW9uKGEp
+e3JldHVybiBhLmxlbmd0aH19ClcuVmIucHJvdG90eXBlPXt9ClcuZkoucHJvdG90eXBlPXsKZW86ZnVu
+Y3Rpb24oYSxiLGMsZCl7cmV0dXJuIGEub3BlbihiLGMsITApfSwKJGlmSjoxfQpXLmJVLnByb3RvdHlw
+ZT17CiQyOmZ1bmN0aW9uKGEsYil7dGhpcy5hLnNldFJlcXVlc3RIZWFkZXIoSC5jKGEpLEguYyhiKSl9
+LAokUzo5fQpXLmhILnByb3RvdHlwZT17CiQxOmZ1bmN0aW9uKGEpe3ZhciB0LHMscixxLHAKdS5wLmEo
+YSkKdD10aGlzLmEKcz10LnN0YXR1cwppZih0eXBlb2YgcyE9PSJudW1iZXIiKXJldHVybiBzLnRCKCkK
+cj1zPj0yMDAmJnM8MzAwCnE9cz4zMDcmJnM8NDAwCnM9cnx8cz09PTB8fHM9PT0zMDR8fHEKcD10aGlz
+LmIKaWYocylwLmFNKDAsdCkKZWxzZSBwLnBtKGEpfSwKJFM6Mjd9Clcud2EucHJvdG90eXBlPXt9Clcu
+U2cucHJvdG90eXBlPXskaVNnOjF9ClcudTgucHJvdG90eXBlPXsKZ0RyOmZ1bmN0aW9uKGEpe2lmKCJv
+cmlnaW4iIGluIGEpcmV0dXJuIGEub3JpZ2luCnJldHVybiBILmQoYS5wcm90b2NvbCkrIi8vIitILmQo
+YS5ob3N0KX0sClo6ZnVuY3Rpb24oYSl7cmV0dXJuIFN0cmluZyhhKX0sCiRpdTg6MX0KVy5PSy5wcm90
+b3R5cGU9eyRpT0s6MX0KVy5lNy5wcm90b3R5cGU9ewpncjg6ZnVuY3Rpb24oYSl7dmFyIHQ9dGhpcy5h
+LHM9dC5jaGlsZE5vZGVzLmxlbmd0aAppZihzPT09MCl0aHJvdyBILmIoUC5QVigiTm8gZWxlbWVudHMi
+KSkKaWYocz4xKXRocm93IEguYihQLlBWKCJNb3JlIHRoYW4gb25lIGVsZW1lbnQiKSkKcmV0dXJuIHQu
+Zmlyc3RDaGlsZH0sCkZWOmZ1bmN0aW9uKGEsYil7dmFyIHQscyxyLHEKdS5laC5hKGIpCnQ9Yi5hCnM9
+dGhpcy5hCmlmKHQhPT1zKWZvcihyPXQuY2hpbGROb2Rlcy5sZW5ndGgscT0wO3E8cjsrK3Epcy5hcHBl
+bmRDaGlsZCh0LmZpcnN0Q2hpbGQpCnJldHVybn0sClk6ZnVuY3Rpb24oYSxiLGMpe3ZhciB0LHMKdS5B
+LmEoYykKdD10aGlzLmEKcz10LmNoaWxkTm9kZXMKaWYoYjwwfHxiPj1zLmxlbmd0aClyZXR1cm4gSC5r
+KHMsYikKdC5yZXBsYWNlQ2hpbGQoYyxzW2JdKX0sCmdrejpmdW5jdGlvbihhKXt2YXIgdD10aGlzLmEu
+Y2hpbGROb2RlcwpyZXR1cm4gbmV3IFcuVzkodCx0Lmxlbmd0aCxILnEodCkuQygiVzk8R20uRT4iKSl9
+LApnQTpmdW5jdGlvbihhKXtyZXR1cm4gdGhpcy5hLmNoaWxkTm9kZXMubGVuZ3RofSwKcTpmdW5jdGlv
+bihhLGIpe3ZhciB0CkguV1koYikKdD10aGlzLmEuY2hpbGROb2RlcwppZihiPDB8fGI+PXQubGVuZ3Ro
+KXJldHVybiBILmsodCxiKQpyZXR1cm4gdFtiXX19ClcudUgucHJvdG90eXBlPXsKd2c6ZnVuY3Rpb24o
+YSl7dmFyIHQ9YS5wYXJlbnROb2RlCmlmKHQhPW51bGwpdC5yZW1vdmVDaGlsZChhKX0sCkQ0OmZ1bmN0
+aW9uKGEpe3ZhciB0CmZvcig7dD1hLmZpcnN0Q2hpbGQsdCE9bnVsbDspYS5yZW1vdmVDaGlsZCh0KX0s
+Clo6ZnVuY3Rpb24oYSl7dmFyIHQ9YS5ub2RlVmFsdWUKcmV0dXJuIHQ9PW51bGw/dGhpcy5VKGEpOnR9
+LAokaXVIOjF9ClcuQkgucHJvdG90eXBlPXsKZ0E6ZnVuY3Rpb24oYSl7cmV0dXJuIGEubGVuZ3RofSwK
+cTpmdW5jdGlvbihhLGIpe0guV1koYikKaWYoYj4+PjAhPT1ifHxiPj1hLmxlbmd0aCl0aHJvdyBILmIo
+UC50KGIsYSxudWxsLG51bGwsbnVsbCkpCnJldHVybiBhW2JdfSwKWTpmdW5jdGlvbihhLGIsYyl7dS5B
+LmEoYykKdGhyb3cgSC5iKFAuTDQoIkNhbm5vdCBhc3NpZ24gZWxlbWVudCBvZiBpbW11dGFibGUgTGlz
+dC4iKSl9LApFOmZ1bmN0aW9uKGEsYil7aWYoYjwwfHxiPj1hLmxlbmd0aClyZXR1cm4gSC5rKGEsYikK
+cmV0dXJuIGFbYl19LAokaWJROjEsCiRpWGo6MSwKJGljWDoxLAokaXpNOjF9ClcuU04ucHJvdG90eXBl
+PXt9ClcuZXcucHJvdG90eXBlPXskaWV3OjF9ClcubHAucHJvdG90eXBlPXsKZ0E6ZnVuY3Rpb24oYSl7
+cmV0dXJuIGEubGVuZ3RofX0KVy5UYi5wcm90b3R5cGU9ewpyNjpmdW5jdGlvbihhLGIsYyxkKXt2YXIg
+dCxzCmlmKCJjcmVhdGVDb250ZXh0dWFsRnJhZ21lbnQiIGluIHdpbmRvdy5SYW5nZS5wcm90b3R5cGUp
+cmV0dXJuIHRoaXMuRFcoYSxiLGMsZCkKdD1XLlU5KCI8dGFibGU+IitILmQoYikrIjwvdGFibGU+Iixj
+LGQpCnM9ZG9jdW1lbnQuY3JlYXRlRG9jdW1lbnRGcmFnbWVudCgpCnMudG9TdHJpbmcKdC50b1N0cmlu
+ZwpuZXcgVy5lNyhzKS5GVigwLG5ldyBXLmU3KHQpKQpyZXR1cm4gc319ClcuSXYucHJvdG90eXBlPXsK
+cjY6ZnVuY3Rpb24oYSxiLGMsZCl7dmFyIHQscyxyLHEKaWYoImNyZWF0ZUNvbnRleHR1YWxGcmFnbWVu
+dCIgaW4gd2luZG93LlJhbmdlLnByb3RvdHlwZSlyZXR1cm4gdGhpcy5EVyhhLGIsYyxkKQp0PWRvY3Vt
+ZW50CnM9dC5jcmVhdGVEb2N1bWVudEZyYWdtZW50KCkKdD1DLkllLnI2KHQuY3JlYXRlRWxlbWVudCgi
+dGFibGUiKSxiLGMsZCkKdC50b1N0cmluZwp0PW5ldyBXLmU3KHQpCnI9dC5ncjgodCkKci50b1N0cmlu
+Zwp0PW5ldyBXLmU3KHIpCnE9dC5ncjgodCkKcy50b1N0cmluZwpxLnRvU3RyaW5nCm5ldyBXLmU3KHMp
+LkZWKDAsbmV3IFcuZTcocSkpCnJldHVybiBzfX0KVy5CVC5wcm90b3R5cGU9ewpyNjpmdW5jdGlvbihh
+LGIsYyxkKXt2YXIgdCxzLHIKaWYoImNyZWF0ZUNvbnRleHR1YWxGcmFnbWVudCIgaW4gd2luZG93LlJh
+bmdlLnByb3RvdHlwZSlyZXR1cm4gdGhpcy5EVyhhLGIsYyxkKQp0PWRvY3VtZW50CnM9dC5jcmVhdGVE
+b2N1bWVudEZyYWdtZW50KCkKdD1DLkllLnI2KHQuY3JlYXRlRWxlbWVudCgidGFibGUiKSxiLGMsZCkK
+dC50b1N0cmluZwp0PW5ldyBXLmU3KHQpCnI9dC5ncjgodCkKcy50b1N0cmluZwpyLnRvU3RyaW5nCm5l
+dyBXLmU3KHMpLkZWKDAsbmV3IFcuZTcocikpCnJldHVybiBzfX0KVy55WS5wcm90b3R5cGU9ewpwazpm
+dW5jdGlvbihhLGIsYyl7dmFyIHQscwphLnRleHRDb250ZW50PW51bGwKdD1hLmNvbnRlbnQKdC50b1N0
+cmluZwpKLmJUKHQpCnM9dGhpcy5yNihhLGIsbnVsbCxjKQphLmNvbnRlbnQuYXBwZW5kQ2hpbGQocyl9
+LApZQzpmdW5jdGlvbihhLGIpe3JldHVybiB0aGlzLnBrKGEsYixudWxsKX0sCiRpeVk6MX0KVy53Ni5w
+cm90b3R5cGU9e30KVy5LNS5wcm90b3R5cGU9ewpnbVc6ZnVuY3Rpb24oYSl7cmV0dXJuIGEubG9jYXRp
+b259LAokaUs1OjEsCiRpdjY6MX0KVy5DbS5wcm90b3R5cGU9eyRpQ206MX0KVy5DUS5wcm90b3R5cGU9
+eyRpQ1E6MX0KVy53NC5wcm90b3R5cGU9ewpaOmZ1bmN0aW9uKGEpe3JldHVybiJSZWN0YW5nbGUgKCIr
+SC5kKGEubGVmdCkrIiwgIitILmQoYS50b3ApKyIpICIrSC5kKGEud2lkdGgpKyIgeCAiK0guZChhLmhl
+aWdodCl9LApETjpmdW5jdGlvbihhLGIpe2lmKGI9PW51bGwpcmV0dXJuITEKcmV0dXJuIHUucS5iKGIp
+JiZhLmxlZnQ9PWIubGVmdCYmYS50b3A9PWIudG9wJiZhLndpZHRoPT1iLndpZHRoJiZhLmhlaWdodD09
+Yi5oZWlnaHR9LApnaU86ZnVuY3Rpb24oYSl7cmV0dXJuIFcuckUoSi5oZihhLmxlZnQpLEouaGYoYS50
+b3ApLEouaGYoYS53aWR0aCksSi5oZihhLmhlaWdodCkpfX0KVy5yaC5wcm90b3R5cGU9ewpnQTpmdW5j
+dGlvbihhKXtyZXR1cm4gYS5sZW5ndGh9LApxOmZ1bmN0aW9uKGEsYil7SC5XWShiKQppZihiPj4+MCE9
+PWJ8fGI+PWEubGVuZ3RoKXRocm93IEguYihQLnQoYixhLG51bGwsbnVsbCxudWxsKSkKcmV0dXJuIGFb
+Yl19LApZOmZ1bmN0aW9uKGEsYixjKXt1LkEuYShjKQp0aHJvdyBILmIoUC5MNCgiQ2Fubm90IGFzc2ln
+biBlbGVtZW50IG9mIGltbXV0YWJsZSBMaXN0LiIpKX0sCkU6ZnVuY3Rpb24oYSxiKXtpZihiPDB8fGI+
+PWEubGVuZ3RoKXJldHVybiBILmsoYSxiKQpyZXR1cm4gYVtiXX0sCiRpYlE6MSwKJGlYajoxLAokaWNY
+OjEsCiRpek06MX0KVy5jZi5wcm90b3R5cGU9ewpLOmZ1bmN0aW9uKGEsYil7dmFyIHQscyxyLHEscAp1
+LmVBLmEoYikKZm9yKHQ9dGhpcy5nVigpLHM9dC5sZW5ndGgscj10aGlzLmEscT0wO3E8dC5sZW5ndGg7
+dC5sZW5ndGg9PT1zfHwoMCxILmxrKSh0KSwrK3Epe3A9dFtxXQpiLiQyKHAsci5nZXRBdHRyaWJ1dGUo
+cCkpfX0sCmdWOmZ1bmN0aW9uKCl7dmFyIHQscyxyLHEscD10aGlzLmEuYXR0cmlidXRlcyxvPUguVk0o
+W10sdS5zKQpmb3IodD1wLmxlbmd0aCxzPXUuaDkscj0wO3I8dDsrK3Ipe2lmKHI+PXAubGVuZ3RoKXJl
+dHVybiBILmsocCxyKQpxPXMuYShwW3JdKQppZihxLm5hbWVzcGFjZVVSST09bnVsbClDLk5tLmkobyxx
+Lm5hbWUpfXJldHVybiBvfX0KVy5pNy5wcm90b3R5cGU9ewpxOmZ1bmN0aW9uKGEsYil7cmV0dXJuIHRo
+aXMuYS5nZXRBdHRyaWJ1dGUoSC5jKGIpKX0sClk6ZnVuY3Rpb24oYSxiLGMpe3RoaXMuYS5zZXRBdHRy
+aWJ1dGUoYixjKX0sCmdBOmZ1bmN0aW9uKGEpe3JldHVybiB0aGlzLmdWKCkubGVuZ3RofX0KVy5TeS5w
+cm90b3R5cGU9ewpxOmZ1bmN0aW9uKGEsYil7cmV0dXJuIHRoaXMuYS5hLmdldEF0dHJpYnV0ZSgiZGF0
+YS0iK3RoaXMuTyhILmMoYikpKX0sClk6ZnVuY3Rpb24oYSxiLGMpe3RoaXMuYS5hLnNldEF0dHJpYnV0
+ZSgiZGF0YS0iK3RoaXMuTyhiKSxjKX0sCks6ZnVuY3Rpb24oYSxiKXt0aGlzLmEuSygwLG5ldyBXLktT
+KHRoaXMsdS5lQS5hKGIpKSl9LApnVjpmdW5jdGlvbigpe3ZhciB0PUguVk0oW10sdS5zKQp0aGlzLmEu
+SygwLG5ldyBXLkEzKHRoaXMsdCkpCnJldHVybiB0fSwKZ0E6ZnVuY3Rpb24oYSl7cmV0dXJuIHRoaXMu
+Z1YoKS5sZW5ndGh9LAprOmZ1bmN0aW9uKGEpe3ZhciB0LHMscj1ILlZNKGEuc3BsaXQoIi0iKSx1LnMp
+CmZvcih0PTE7dDxyLmxlbmd0aDsrK3Qpe3M9clt0XQppZihzLmxlbmd0aD4wKUMuTm0uWShyLHQsc1sw
+XS50b1VwcGVyQ2FzZSgpK0ouS1YocywxKSl9cmV0dXJuIEMuTm0uelYociwiIil9LApPOmZ1bmN0aW9u
+KGEpe3ZhciB0LHMscixxLHAKZm9yKHQ9YS5sZW5ndGgscz0wLHI9IiI7czx0Oysrcyl7cT1hW3NdCnA9
+cS50b0xvd2VyQ2FzZSgpCnI9KHEhPT1wJiZzPjA/cisiLSI6cikrcH1yZXR1cm4gci5jaGFyQ29kZUF0
+KDApPT0wP3I6cn19ClcuS1MucHJvdG90eXBlPXsKJDI6ZnVuY3Rpb24oYSxiKXtpZihKLnJZKGEpLm4o
+YSwiZGF0YS0iKSl0aGlzLmIuJDIodGhpcy5hLmsoQy54Qi5HKGEsNSkpLGIpfSwKJFM6OX0KVy5BMy5w
+cm90b3R5cGU9ewokMjpmdW5jdGlvbihhLGIpe2lmKEouclkoYSkubihhLCJkYXRhLSIpKUMuTm0uaSh0
+aGlzLmIsdGhpcy5hLmsoQy54Qi5HKGEsNSkpKX0sCiRTOjl9ClcuSTQucHJvdG90eXBlPXsKUDpmdW5j
+dGlvbigpe3ZhciB0LHMscixxLHA9UC5Mcyh1Lk4pCmZvcih0PXRoaXMuYS5jbGFzc05hbWUuc3BsaXQo
+IiAiKSxzPXQubGVuZ3RoLHI9MDtyPHM7KytyKXtxPUouVDAodFtyXSkKaWYocS5sZW5ndGghPT0wKXAu
+aSgwLHEpfXJldHVybiBwfSwKcDpmdW5jdGlvbihhKXt0aGlzLmEuY2xhc3NOYW1lPXUuQy5hKGEpLnpW
+KDAsIiAiKX0sCmdBOmZ1bmN0aW9uKGEpe3JldHVybiB0aGlzLmEuY2xhc3NMaXN0Lmxlbmd0aH0sClYx
+OmZ1bmN0aW9uKGEpe3RoaXMuYS5jbGFzc05hbWU9IiJ9LAp0ZzpmdW5jdGlvbihhLGIpe3ZhciB0PXRo
+aXMuYS5jbGFzc0xpc3QuY29udGFpbnMoYikKcmV0dXJuIHR9LAppOmZ1bmN0aW9uKGEsYil7dmFyIHQ9
+dGhpcy5hLmNsYXNzTGlzdCxzPXQuY29udGFpbnMoYikKdC5hZGQoYikKcmV0dXJuIXN9LApSOmZ1bmN0
+aW9uKGEsYil7dmFyIHQ9dGhpcy5hLmNsYXNzTGlzdCxzPXQuY29udGFpbnMoYikKdC5yZW1vdmUoYikK
+cmV0dXJuIHN9LApGVjpmdW5jdGlvbihhLGIpe1cuVE4odGhpcy5hLHUuWC5hKGIpKX19ClcuRmsucHJv
+dG90eXBlPXt9ClcuUk8ucHJvdG90eXBlPXt9ClcuZXUucHJvdG90eXBlPXt9ClcueEMucHJvdG90eXBl
+PXt9Clcudk4ucHJvdG90eXBlPXsKJDE6ZnVuY3Rpb24oYSl7cmV0dXJuIHRoaXMuYS4kMSh1LkIuYShh
+KSl9LAokUzoyOH0KVy5KUS5wcm90b3R5cGU9ewpDWTpmdW5jdGlvbihhKXt2YXIgdAppZigkLm9yLmE9
+PT0wKXtmb3IodD0wO3Q8MjYyOysrdCkkLm9yLlkoMCxDLmNtW3RdLFcucFMoKSkKZm9yKHQ9MDt0PDEy
+OysrdCkkLm9yLlkoMCxDLkJJW3RdLFcuVjQoKSl9fSwKaTA6ZnVuY3Rpb24oYSl7cmV0dXJuICQuQU4o
+KS50ZygwLFcuclMoYSkpfSwKRWI6ZnVuY3Rpb24oYSxiLGMpe3ZhciB0PSQub3IucSgwLEguZChXLnJT
+KGEpKSsiOjoiK2IpCmlmKHQ9PW51bGwpdD0kLm9yLnEoMCwiKjo6IitiKQppZih0PT1udWxsKXJldHVy
+biExCnJldHVybiBILkU5KHQuJDQoYSxiLGMsdGhpcykpfSwKJGlrRjoxfQpXLkdtLnByb3RvdHlwZT17
+CmdrejpmdW5jdGlvbihhKXtyZXR1cm4gbmV3IFcuVzkoYSx0aGlzLmdBKGEpLEgucShhKS5DKCJXOTxH
+bS5FPiIpKX19ClcudkQucHJvdG90eXBlPXsKaTA6ZnVuY3Rpb24oYSl7cmV0dXJuIEMuTm0uVnIodGhp
+cy5hLG5ldyBXLlV2KGEpKX0sCkViOmZ1bmN0aW9uKGEsYixjKXtyZXR1cm4gQy5ObS5Wcih0aGlzLmEs
+bmV3IFcuRWcoYSxiLGMpKX0sCiRpa0Y6MX0KVy5Vdi5wcm90b3R5cGU9ewokMTpmdW5jdGlvbihhKXty
+ZXR1cm4gdS5lLmEoYSkuaTAodGhpcy5hKX0sCiRTOjE1fQpXLkVnLnByb3RvdHlwZT17CiQxOmZ1bmN0
+aW9uKGEpe3JldHVybiB1LmUuYShhKS5FYih0aGlzLmEsdGhpcy5iLHRoaXMuYyl9LAokUzoxNX0KVy5t
+Ni5wcm90b3R5cGU9ewpDWTpmdW5jdGlvbihhLGIsYyxkKXt2YXIgdCxzLHIKdGhpcy5hLkZWKDAsYykK
+dD1iLmV2KDAsbmV3IFcuRW8oKSkKcz1iLmV2KDAsbmV3IFcuV2soKSkKdGhpcy5iLkZWKDAsdCkKcj10
+aGlzLmMKci5GVigwLEMuZG4pCnIuRlYoMCxzKX0sCmkwOmZ1bmN0aW9uKGEpe3JldHVybiB0aGlzLmEu
+dGcoMCxXLnJTKGEpKX0sCkViOmZ1bmN0aW9uKGEsYixjKXt2YXIgdD10aGlzLHM9Vy5yUyhhKSxyPXQu
+YwppZihyLnRnKDAsSC5kKHMpKyI6OiIrYikpcmV0dXJuIHQuZC5EdChjKQplbHNlIGlmKHIudGcoMCwi
+Kjo6IitiKSlyZXR1cm4gdC5kLkR0KGMpCmVsc2V7cj10LmIKaWYoci50ZygwLEguZChzKSsiOjoiK2Ip
+KXJldHVybiEwCmVsc2UgaWYoci50ZygwLCIqOjoiK2IpKXJldHVybiEwCmVsc2UgaWYoci50ZygwLEgu
+ZChzKSsiOjoqIikpcmV0dXJuITAKZWxzZSBpZihyLnRnKDAsIio6OioiKSlyZXR1cm4hMH1yZXR1cm4h
+MX0sCiRpa0Y6MX0KVy5Fby5wcm90b3R5cGU9ewokMTpmdW5jdGlvbihhKXtyZXR1cm4hQy5ObS50ZyhD
+LkJJLEguYyhhKSl9LAokUzo4fQpXLldrLnByb3RvdHlwZT17CiQxOmZ1bmN0aW9uKGEpe3JldHVybiBD
+Lk5tLnRnKEMuQkksSC5jKGEpKX0sCiRTOjh9ClcuY3QucHJvdG90eXBlPXsKRWI6ZnVuY3Rpb24oYSxi
+LGMpe2lmKHRoaXMuakYoYSxiLGMpKXJldHVybiEwCmlmKGI9PT0idGVtcGxhdGUiJiZjPT09IiIpcmV0
+dXJuITAKaWYoYS5nZXRBdHRyaWJ1dGUoInRlbXBsYXRlIik9PT0iIilyZXR1cm4gdGhpcy5lLnRnKDAs
+YikKcmV0dXJuITF9fQpXLklBLnByb3RvdHlwZT17CiQxOmZ1bmN0aW9uKGEpe3JldHVybiJURU1QTEFU
+RTo6IitILmQoSC5jKGEpKX0sCiRTOjR9ClcuT3cucHJvdG90eXBlPXsKaTA6ZnVuY3Rpb24oYSl7dmFy
+IHQKaWYodS5ldy5iKGEpKXJldHVybiExCnQ9dS5nNy5iKGEpCmlmKHQmJlcuclMoYSk9PT0iZm9yZWln
+bk9iamVjdCIpcmV0dXJuITEKaWYodClyZXR1cm4hMApyZXR1cm4hMX0sCkViOmZ1bmN0aW9uKGEsYixj
+KXtpZihiPT09ImlzInx8Qy54Qi5uKGIsIm9uIikpcmV0dXJuITEKcmV0dXJuIHRoaXMuaTAoYSl9LAok
+aWtGOjF9ClcuVzkucHJvdG90eXBlPXsKRjpmdW5jdGlvbigpe3ZhciB0PXRoaXMscz10LmMrMSxyPXQu
+YgppZihzPHIpe3Quc00oSi54OSh0LmEscykpCnQuYz1zCnJldHVybiEwfXQuc00obnVsbCkKdC5jPXIK
+cmV0dXJuITF9LApnbDpmdW5jdGlvbigpe3JldHVybiB0aGlzLmR9LApzTTpmdW5jdGlvbihhKXt0aGlz
+LmQ9dGhpcy4kdGkuYy5hKGEpfSwKJGlBbjoxfQpXLmRXLnByb3RvdHlwZT17CmdtVzpmdW5jdGlvbihh
+KXtyZXR1cm4gVy56WCh0aGlzLmEubG9jYXRpb24pfSwKJGlEMDoxLAokaXY2OjF9ClcuRmIucHJvdG90
+eXBlPXt9Clcua0YucHJvdG90eXBlPXt9ClcubWsucHJvdG90eXBlPXskaXkwOjF9ClcuS28ucHJvdG90
+eXBlPXsKUG46ZnVuY3Rpb24oYSl7dmFyIHQ9dGhpcyxzPW5ldyBXLmZtKHQpCnQuYj0hMQpzLiQyKGEs
+bnVsbCkKZm9yKDt0LmI7KXt0LmI9ITEKcy4kMihhLG51bGwpfX0sCkVQOmZ1bmN0aW9uKGEsYil7dmFy
+IHQ9dGhpcy5iPSEwCmlmKGIhPW51bGw/YiE9PWEucGFyZW50Tm9kZTp0KUouTHQoYSkKZWxzZSBiLnJl
+bW92ZUNoaWxkKGEpfSwKSTQ6ZnVuY3Rpb24oYSxiKXt2YXIgdCxzLHIscSxwLG89ITAsbj1udWxsLG09
+bnVsbAp0cnl7bj1KLmlnKGEpCm09bi5hLmdldEF0dHJpYnV0ZSgiaXMiKQp1LmguYShhKQp0PWZ1bmN0
+aW9uKGMpe2lmKCEoYy5hdHRyaWJ1dGVzIGluc3RhbmNlb2YgTmFtZWROb2RlTWFwKSlyZXR1cm4gdHJ1
+ZQppZihjLmlkPT0nbGFzdENoaWxkJ3x8Yy5uYW1lPT0nbGFzdENoaWxkJ3x8Yy5pZD09J3ByZXZpb3Vz
+U2libGluZyd8fGMubmFtZT09J3ByZXZpb3VzU2libGluZyd8fGMuaWQ9PSdjaGlsZHJlbid8fGMubmFt
+ZT09J2NoaWxkcmVuJylyZXR1cm4gdHJ1ZQp2YXIgbD1jLmNoaWxkTm9kZXMKaWYoYy5sYXN0Q2hpbGQm
+JmMubGFzdENoaWxkIT09bFtsLmxlbmd0aC0xXSlyZXR1cm4gdHJ1ZQppZihjLmNoaWxkcmVuKWlmKCEo
+Yy5jaGlsZHJlbiBpbnN0YW5jZW9mIEhUTUxDb2xsZWN0aW9ufHxjLmNoaWxkcmVuIGluc3RhbmNlb2Yg
+Tm9kZUxpc3QpKXJldHVybiB0cnVlCnZhciBrPTAKaWYoYy5jaGlsZHJlbilrPWMuY2hpbGRyZW4ubGVu
+Z3RoCmZvcih2YXIgaj0wO2o8aztqKyspe3ZhciBpPWMuY2hpbGRyZW5bal0KaWYoaS5pZD09J2F0dHJp
+YnV0ZXMnfHxpLm5hbWU9PSdhdHRyaWJ1dGVzJ3x8aS5pZD09J2xhc3RDaGlsZCd8fGkubmFtZT09J2xh
+c3RDaGlsZCd8fGkuaWQ9PSdwcmV2aW91c1NpYmxpbmcnfHxpLm5hbWU9PSdwcmV2aW91c1NpYmxpbmcn
+fHxpLmlkPT0nY2hpbGRyZW4nfHxpLm5hbWU9PSdjaGlsZHJlbicpcmV0dXJuIHRydWV9cmV0dXJuIGZh
+bHNlfShhKQpvPUgub1QodCk/ITA6IShhLmF0dHJpYnV0ZXMgaW5zdGFuY2VvZiBOYW1lZE5vZGVNYXAp
+fWNhdGNoKHEpe0guUnUocSl9cz0iZWxlbWVudCB1bnByaW50YWJsZSIKdHJ5e3M9Si5BYyhhKX1jYXRj
+aChxKXtILlJ1KHEpfXRyeXtyPVcuclMoYSkKdGhpcy5rUih1LmguYShhKSxiLG8scyxyLHUuRy5hKG4p
+LEguYyhtKSl9Y2F0Y2gocSl7aWYoSC5SdShxKSBpbnN0YW5jZW9mIFAuQVQpdGhyb3cgcQplbHNle3Ro
+aXMuRVAoYSxiKQp3aW5kb3cKcD0iUmVtb3ZpbmcgY29ycnVwdGVkIGVsZW1lbnQgIitILmQocykKaWYo
+dHlwZW9mIGNvbnNvbGUhPSJ1bmRlZmluZWQiKXdpbmRvdy5jb25zb2xlLndhcm4ocCl9fX0sCmtSOmZ1
+bmN0aW9uKGEsYixjLGQsZSxmLGcpe3ZhciB0LHMscixxLHAsbyxuPXRoaXMKaWYoYyl7bi5FUChhLGIp
+CndpbmRvdwp0PSJSZW1vdmluZyBlbGVtZW50IGR1ZSB0byBjb3JydXB0ZWQgYXR0cmlidXRlcyBvbiA8
+IitkKyI+IgppZih0eXBlb2YgY29uc29sZSE9InVuZGVmaW5lZCIpd2luZG93LmNvbnNvbGUud2Fybih0
+KQpyZXR1cm59aWYoIW4uYS5pMChhKSl7bi5FUChhLGIpCndpbmRvdwp0PSJSZW1vdmluZyBkaXNhbGxv
+d2VkIGVsZW1lbnQgPCIrSC5kKGUpKyI+IGZyb20gIitILmQoYikKaWYodHlwZW9mIGNvbnNvbGUhPSJ1
+bmRlZmluZWQiKXdpbmRvdy5jb25zb2xlLndhcm4odCkKcmV0dXJufWlmKGchPW51bGwpaWYoIW4uYS5F
+YihhLCJpcyIsZykpe24uRVAoYSxiKQp3aW5kb3cKdD0iUmVtb3ZpbmcgZGlzYWxsb3dlZCB0eXBlIGV4
+dGVuc2lvbiA8IitILmQoZSkrJyBpcz0iJytnKyciPicKaWYodHlwZW9mIGNvbnNvbGUhPSJ1bmRlZmlu
+ZWQiKXdpbmRvdy5jb25zb2xlLndhcm4odCkKcmV0dXJufXQ9Zi5nVigpCnM9SC5WTSh0LnNsaWNlKDAp
+LEgudDYodCkuQygiamQ8MT4iKSkKZm9yKHI9Zi5nVigpLmxlbmd0aC0xLHQ9Zi5hO3I+PTA7LS1yKXtp
+ZihyPj1zLmxlbmd0aClyZXR1cm4gSC5rKHMscikKcT1zW3JdCnA9bi5hCm89Si5jSChxKQpILmMocSkK
+aWYoIXAuRWIoYSxvLHQuZ2V0QXR0cmlidXRlKHEpKSl7d2luZG93CnA9IlJlbW92aW5nIGRpc2FsbG93
+ZWQgYXR0cmlidXRlIDwiK0guZChlKSsiICIrcSsnPSInK0guZCh0LmdldEF0dHJpYnV0ZShxKSkrJyI+
+JwppZih0eXBlb2YgY29uc29sZSE9InVuZGVmaW5lZCIpd2luZG93LmNvbnNvbGUud2FybihwKQp0LnJl
+bW92ZUF0dHJpYnV0ZShxKX19aWYodS5hVy5iKGEpKW4uUG4oYS5jb250ZW50KX0sCiRpb246MX0KVy5m
+bS5wcm90b3R5cGU9ewokMjpmdW5jdGlvbihhLGIpe3ZhciB0LHMscixxLHAsbyxuPXRoaXMuYQpzd2l0
+Y2goYS5ub2RlVHlwZSl7Y2FzZSAxOm4uSTQoYSxiKQpicmVhawpjYXNlIDg6Y2FzZSAxMTpjYXNlIDM6
+Y2FzZSA0OmJyZWFrCmRlZmF1bHQ6bi5FUChhLGIpfXQ9YS5sYXN0Q2hpbGQKZm9yKHI9dS5BO251bGwh
+PXQ7KXtzPW51bGwKdHJ5e3M9dC5wcmV2aW91c1NpYmxpbmcKaWYocyE9bnVsbCl7cT1zLm5leHRTaWJs
+aW5nCnA9dApwPXE9PW51bGw/cCE9bnVsbDpxIT09cApxPXB9ZWxzZSBxPSExCmlmKHEpe3E9UC5QVigi
+Q29ycnVwdCBIVE1MIikKdGhyb3cgSC5iKHEpfX1jYXRjaChvKXtILlJ1KG8pCnE9ci5hKHQpCm4uYj0h
+MApwPXEucGFyZW50Tm9kZQpwPWE9PW51bGw/cCE9bnVsbDphIT09cAppZihwKXtwPXEucGFyZW50Tm9k
+ZQppZihwIT1udWxsKXAucmVtb3ZlQ2hpbGQocSl9ZWxzZSBhLnJlbW92ZUNoaWxkKHEpCnQ9bnVsbApz
+PWEubGFzdENoaWxkfWlmKHQhPW51bGwpdGhpcy4kMih0LGEpCnQ9c319LAokUzozOX0KVy5MZS5wcm90
+b3R5cGU9e30KVy5LNy5wcm90b3R5cGU9e30KVy5yQi5wcm90b3R5cGU9e30KVy5YVy5wcm90b3R5cGU9
+e30KVy5vYS5wcm90b3R5cGU9e30KUC5pSi5wcm90b3R5cGU9ewpWSDpmdW5jdGlvbihhKXt2YXIgdCxz
+PXRoaXMuYSxyPXMubGVuZ3RoCmZvcih0PTA7dDxyOysrdClpZihzW3RdPT09YSlyZXR1cm4gdApDLk5t
+LmkocyxhKQpDLk5tLmkodGhpcy5iLG51bGwpCnJldHVybiByfSwKUHY6ZnVuY3Rpb24oYSl7dmFyIHQs
+cyxyLHE9dGhpcyxwPXt9CmlmKGE9PW51bGwpcmV0dXJuIGEKaWYoSC5yUShhKSlyZXR1cm4gYQppZih0
+eXBlb2YgYT09Im51bWJlciIpcmV0dXJuIGEKaWYodHlwZW9mIGE9PSJzdHJpbmciKXJldHVybiBhCmlm
+KGEgaW5zdGFuY2VvZiBQLmlQKXJldHVybiBuZXcgRGF0ZShhLmEpCmlmKHUuZnYuYihhKSl0aHJvdyBI
+LmIoUC5uKCJzdHJ1Y3R1cmVkIGNsb25lIG9mIFJlZ0V4cCIpKQppZih1LmM4LmIoYSkpcmV0dXJuIGEK
+aWYodS5kLmIoYSkpcmV0dXJuIGEKaWYodS5JLmIoYSkpcmV0dXJuIGEKdD11LmRELmIoYSl8fCExCmlm
+KHQpcmV0dXJuIGEKaWYodS5HLmIoYSkpe3M9cS5WSChhKQp0PXEuYgppZihzPj10Lmxlbmd0aClyZXR1
+cm4gSC5rKHQscykKcj1wLmE9dFtzXQppZihyIT1udWxsKXJldHVybiByCnI9e30KcC5hPXIKQy5ObS5Z
+KHQscyxyKQphLksoMCxuZXcgUC5qZyhwLHEpKQpyZXR1cm4gcC5hfWlmKHUuai5iKGEpKXtzPXEuVkgo
+YSkKcD1xLmIKaWYocz49cC5sZW5ndGgpcmV0dXJuIEguayhwLHMpCnI9cFtzXQppZihyIT1udWxsKXJl
+dHVybiByCnJldHVybiBxLmVrKGEscyl9aWYodS5lSC5iKGEpKXtzPXEuVkgoYSkKdD1xLmIKaWYocz49
+dC5sZW5ndGgpcmV0dXJuIEguayh0LHMpCnI9cC5iPXRbc10KaWYociE9bnVsbClyZXR1cm4gcgpyPXt9
+CnAuYj1yCkMuTm0uWSh0LHMscikKcS5pbShhLG5ldyBQLlRhKHAscSkpCnJldHVybiBwLmJ9dGhyb3cg
+SC5iKFAubigic3RydWN0dXJlZCBjbG9uZSBvZiBvdGhlciB0eXBlIikpfSwKZWs6ZnVuY3Rpb24oYSxi
+KXt2YXIgdCxzPUouVTYoYSkscj1zLmdBKGEpLHE9bmV3IEFycmF5KHIpCkMuTm0uWSh0aGlzLmIsYixx
+KQpmb3IodD0wO3Q8cjsrK3QpQy5ObS5ZKHEsdCx0aGlzLlB2KHMucShhLHQpKSkKcmV0dXJuIHF9fQpQ
+LmpnLnByb3RvdHlwZT17CiQyOmZ1bmN0aW9uKGEsYil7dGhpcy5hLmFbYV09dGhpcy5iLlB2KGIpfSwK
+JFM6MX0KUC5UYS5wcm90b3R5cGU9ewokMjpmdW5jdGlvbihhLGIpe3RoaXMuYS5iW2FdPXRoaXMuYi5Q
+dihiKX0sCiRTOjF9ClAuQmYucHJvdG90eXBlPXsKaW06ZnVuY3Rpb24oYSxiKXt2YXIgdCxzLHIscQp1
+LmI4LmEoYikKZm9yKHQ9T2JqZWN0LmtleXMoYSkscz10Lmxlbmd0aCxyPTA7cjxzOysrcil7cT10W3Jd
+CmIuJDIocSxhW3FdKX19fQpQLkFzLnByb3RvdHlwZT17ClQ6ZnVuY3Rpb24oYSl7dmFyIHQKSC5jKGEp
+CnQ9JC5oRygpLmIKaWYodHlwZW9mIGEhPSJzdHJpbmciKUgudmgoSC5JKGEpKQppZih0LnRlc3QoYSkp
+cmV0dXJuIGEKdGhyb3cgSC5iKFAuTDMoYSwidmFsdWUiLCJOb3QgYSB2YWxpZCBjbGFzcyB0b2tlbiIp
+KX0sClo6ZnVuY3Rpb24oYSl7cmV0dXJuIHRoaXMuUCgpLnpWKDAsIiAiKX0sCmdrejpmdW5jdGlvbihh
+KXt2YXIgdD10aGlzLlAoKQpyZXR1cm4gUC5yaih0LHQucixILkxoKHQpLmMpfSwKZ0E6ZnVuY3Rpb24o
+YSl7cmV0dXJuIHRoaXMuUCgpLmF9LAp0ZzpmdW5jdGlvbihhLGIpe3RoaXMuVChiKQpyZXR1cm4gdGhp
+cy5QKCkudGcoMCxiKX0sCmk6ZnVuY3Rpb24oYSxiKXt0aGlzLlQoYikKcmV0dXJuIEguRTkodGhpcy5P
+UyhuZXcgUC5HRShiKSkpfSwKUjpmdW5jdGlvbihhLGIpe3ZhciB0LHMKdGhpcy5UKGIpCnQ9dGhpcy5Q
+KCkKcz10LlIoMCxiKQp0aGlzLnAodCkKcmV0dXJuIHN9LApGVjpmdW5jdGlvbihhLGIpe3RoaXMuT1Mo
+bmV3IFAuTjcodGhpcyx1LlguYShiKSkpfSwKVjE6ZnVuY3Rpb24oYSl7dGhpcy5PUyhuZXcgUC51USgp
+KX0sCk9TOmZ1bmN0aW9uKGEpe3ZhciB0LHMKdS5iVS5hKGEpCnQ9dGhpcy5QKCkKcz1hLiQxKHQpCnRo
+aXMucCh0KQpyZXR1cm4gc319ClAuR0UucHJvdG90eXBlPXsKJDE6ZnVuY3Rpb24oYSl7cmV0dXJuIHUu
+Qy5hKGEpLmkoMCx0aGlzLmEpfSwKJFM6MzJ9ClAuTjcucHJvdG90eXBlPXsKJDE6ZnVuY3Rpb24oYSl7
+dmFyIHQ9dGhpcy5iLHM9SC50Nih0KQpyZXR1cm4gdS5DLmEoYSkuRlYoMCxuZXcgSC5sSih0LHMuQygi
+cVUoMSkiKS5hKHRoaXMuYS5ndU0oKSkscy5DKCJsSjwxLHFVPiIpKSl9LAokUzoxNn0KUC51US5wcm90
+b3R5cGU9ewokMTpmdW5jdGlvbihhKXt1LkMuYShhKQppZihhLmE+MCl7YS5iPWEuYz1hLmQ9YS5lPWEu
+Zj1udWxsCmEuYT0wCmEuWCgpfXJldHVybiBudWxsfSwKJFM6MTZ9ClAuaEYucHJvdG90eXBlPXskaWhG
+OjF9ClAuUEMucHJvdG90eXBlPXsKJDE6ZnVuY3Rpb24oYSl7dmFyIHQKdS5aLmEoYSkKdD1mdW5jdGlv
+bihiLGMsZCl7cmV0dXJuIGZ1bmN0aW9uKCl7cmV0dXJuIGIoYyxkLHRoaXMsQXJyYXkucHJvdG90eXBl
+LnNsaWNlLmFwcGx5KGFyZ3VtZW50cykpfX0oUC5SNCxhLCExKQpQLkRtKHQsJC53USgpLGEpCnJldHVy
+biB0fSwKJFM6M30KUC5tdC5wcm90b3R5cGU9ewokMTpmdW5jdGlvbihhKXtyZXR1cm4gbmV3IHRoaXMu
+YShhKX0sCiRTOjN9ClAuTnoucHJvdG90eXBlPXsKJDE6ZnVuY3Rpb24oYSl7cmV0dXJuIG5ldyBQLnI3
+KGEpfSwKJFM6MzR9ClAubnAucHJvdG90eXBlPXsKJDE6ZnVuY3Rpb24oYSl7cmV0dXJuIG5ldyBQLlR6
+KGEsdS5hbSl9LAokUzozNX0KUC5VdC5wcm90b3R5cGU9ewokMTpmdW5jdGlvbihhKXtyZXR1cm4gbmV3
+IFAuRTQoYSl9LAokUzozNn0KUC5FNC5wcm90b3R5cGU9ewpxOmZ1bmN0aW9uKGEsYil7aWYodHlwZW9m
+IGIhPSJzdHJpbmciJiZ0eXBlb2YgYiE9Im51bWJlciIpdGhyb3cgSC5iKFAueFkoInByb3BlcnR5IGlz
+IG5vdCBhIFN0cmluZyBvciBudW0iKSkKcmV0dXJuIFAuTDcodGhpcy5hW2JdKX0sClk6ZnVuY3Rpb24o
+YSxiLGMpe2lmKHR5cGVvZiBiIT0ic3RyaW5nIiYmdHlwZW9mIGIhPSJudW1iZXIiKXRocm93IEguYihQ
+LnhZKCJwcm9wZXJ0eSBpcyBub3QgYSBTdHJpbmcgb3IgbnVtIikpCnRoaXMuYVtiXT1QLndZKGMpfSwK
+RE46ZnVuY3Rpb24oYSxiKXtpZihiPT1udWxsKXJldHVybiExCnJldHVybiBiIGluc3RhbmNlb2YgUC5F
+NCYmdGhpcy5hPT09Yi5hfSwKWjpmdW5jdGlvbihhKXt2YXIgdCxzCnRyeXt0PVN0cmluZyh0aGlzLmEp
+CnJldHVybiB0fWNhdGNoKHMpe0guUnUocykKdD10aGlzLnhiKDApCnJldHVybiB0fX0sClY3OmZ1bmN0
+aW9uKGEsYil7dmFyIHQscz10aGlzLmEKaWYoYj09bnVsbCl0PW51bGwKZWxzZXt0PUgudDYoYikKdD1Q
+LkNIKG5ldyBILmxKKGIsdC5DKCJAKDEpIikuYShQLmlHKCkpLHQuQygibEo8MSxAPiIpKSwhMCx1Lnop
+fXJldHVybiBQLkw3KHNbYV0uYXBwbHkocyx0KSl9LApnaU86ZnVuY3Rpb24oYSl7cmV0dXJuIDB9fQpQ
+LnI3LnByb3RvdHlwZT17fQpQLlR6LnByb3RvdHlwZT17CmNQOmZ1bmN0aW9uKGEpe3ZhciB0PXRoaXMs
+cz1hPDB8fGE+PXQuZ0EodCkKaWYocyl0aHJvdyBILmIoUC5URShhLDAsdC5nQSh0KSxudWxsLG51bGwp
+KX0sCnE6ZnVuY3Rpb24oYSxiKXtpZih0eXBlb2YgYj09Im51bWJlciImJmI9PT1DLmpuLnl1KGIpKXRo
+aXMuY1AoSC5XWShiKSkKcmV0dXJuIHRoaXMuJHRpLmMuYSh0aGlzLlVyKDAsYikpfSwKWTpmdW5jdGlv
+bihhLGIsYyl7dmFyIHQKdGhpcy4kdGkuYy5hKGMpCnQ9Qy5qbi55dShiKQppZihiPT09dCl0aGlzLmNQ
+KGIpCnRoaXMuZTQoMCxiLGMpfSwKZ0E6ZnVuY3Rpb24oYSl7dmFyIHQ9dGhpcy5hLmxlbmd0aAppZih0
+eXBlb2YgdD09PSJudW1iZXIiJiZ0Pj4+MD09PXQpcmV0dXJuIHQKdGhyb3cgSC5iKFAuUFYoIkJhZCBK
+c0FycmF5IGxlbmd0aCIpKX0sCiRpYlE6MSwKJGljWDoxLAokaXpNOjF9ClAuY28ucHJvdG90eXBlPXt9
+ClAubmQucHJvdG90eXBlPXskaW5kOjF9ClAuS2UucHJvdG90eXBlPXsKUDpmdW5jdGlvbigpe3ZhciB0
+LHMscixxLHA9dGhpcy5hLmdldEF0dHJpYnV0ZSgiY2xhc3MiKSxvPVAuTHModS5OKQppZihwPT1udWxs
+KXJldHVybiBvCmZvcih0PXAuc3BsaXQoIiAiKSxzPXQubGVuZ3RoLHI9MDtyPHM7KytyKXtxPUouVDAo
+dFtyXSkKaWYocS5sZW5ndGghPT0wKW8uaSgwLHEpfXJldHVybiBvfSwKcDpmdW5jdGlvbihhKXt0aGlz
+LmEuc2V0QXR0cmlidXRlKCJjbGFzcyIsYS56VigwLCIgIikpfX0KUC5kNS5wcm90b3R5cGU9ewpnRDpm
+dW5jdGlvbihhKXtyZXR1cm4gbmV3IFAuS2UoYSl9LApzaGY6ZnVuY3Rpb24oYSxiKXt0aGlzLllDKGEs
+Yil9LApyNjpmdW5jdGlvbihhLGIsYyxkKXt2YXIgdCxzLHIscSxwLG8KaWYoZD09bnVsbCl7dD1ILlZN
+KFtdLHUuaykKZD1uZXcgVy52RCh0KQpDLk5tLmkodCxXLlR3KG51bGwpKQpDLk5tLmkodCxXLkJsKCkp
+CkMuTm0uaSh0LG5ldyBXLk93KCkpfWM9bmV3IFcuS28oZCkKcz0nPHN2ZyB2ZXJzaW9uPSIxLjEiPicr
+SC5kKGIpKyI8L3N2Zz4iCnQ9ZG9jdW1lbnQKcj10LmJvZHkKcT0ociYmQy5SWSkuQUgocixzLGMpCnA9
+dC5jcmVhdGVEb2N1bWVudEZyYWdtZW50KCkKcS50b1N0cmluZwp0PW5ldyBXLmU3KHEpCm89dC5ncjgo
+dCkKZm9yKDt0PW8uZmlyc3RDaGlsZCx0IT1udWxsOylwLmFwcGVuZENoaWxkKHQpCnJldHVybiBwfSwK
+Z1ZsOmZ1bmN0aW9uKGEpe3JldHVybiBuZXcgVy5ldShhLCJjbGljayIsITEsdS5RKX0sCiRpZDU6MX0K
+UC5uNi5wcm90b3R5cGU9eyRpYlE6MSwkaWNYOjEsJGl6TToxLCRpQVM6MX0KVS5kMi5wcm90b3R5cGU9
e30KVS5TZS5wcm90b3R5cGU9e30KVS51Ri5wcm90b3R5cGU9e30KVS5NbC5wcm90b3R5cGU9e30KVS55
RC5wcm90b3R5cGU9e30KVS53Yi5wcm90b3R5cGU9e30KQi5qOC5wcm90b3R5cGU9e30KQi5xcC5wcm90
-b3R5cGU9e30KVC5HVi5wcm90b3R5cGU9e30KTC5lLnByb3RvdHlwZT17CiQxOmZ1bmN0aW9uKGEpe3Zh
-ciB0LHMscixxLHAsbwp1LkIuYihhKQp0PXdpbmRvdy5sb2NhdGlvbi5wYXRobmFtZQpzPUwuRzYod2lu
-ZG93LmxvY2F0aW9uLmhyZWYpCnI9TC5hSyh3aW5kb3cubG9jYXRpb24uaHJlZikKTC5HZSgpCmlmKHQh
-PT0iLyImJnQhPT1KLlQwKGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoIi5yb290IikudGV4dENvbnRlbnQp
-KUwuRzcodCxzLHIsITAsbmV3IEwuVlcodCxzLHIpKQpxPUoucUYoZG9jdW1lbnQucXVlcnlTZWxlY3Rv
-cigiLmFwcGx5LW1pZ3JhdGlvbiIpKQpwPXEuJHRpCm89cC5DKCJ+KDEpIikuYihuZXcgTC5vWigpKQp1
-Lk0uYihudWxsKQpXLkpFKHEuYSxxLmIsbywhMSxwLmQpfSwKJFM6MTN9CkwuVlcucHJvdG90eXBlPXsK
-JDA6ZnVuY3Rpb24oKXtMLkZyKHRoaXMuYSx0aGlzLmIsdGhpcy5jKX0sCiRTOjB9Ckwub1oucHJvdG90
-eXBlPXsKJDE6ZnVuY3Rpb24oYSl7dS5WLmIoYSkKTC50eSgiL2FwcGx5LW1pZ3JhdGlvbiIpLlc3KG5l
-dyBMLmpyKCksdS5QKS5PQShuZXcgTC5xbCgpKX0sCiRTOjZ9CkwuanIucHJvdG90eXBlPXsKJDE6ZnVu
-Y3Rpb24oYSl7dmFyIHQKdS5yLmIoYSkKdD1kb2N1bWVudC5ib2R5CnQuY2xhc3NMaXN0LnJlbW92ZSgi
-cHJvcG9zZWQiKQp0LmNsYXNzTGlzdC5hZGQoImFwcGxpZWQiKX0sCiRTOjd9CkwucWwucHJvdG90eXBl
-PXsKJDI6ZnVuY3Rpb24oYSxiKXtMLnFKKCJhcHBseSBtaWdyYXRpb24gZXJyb3I6ICIrSC5kKGEpLGIp
-CndpbmRvdy5hbGVydCgiQ291bGQgbm90IGFwcGx5IG1pZ3JhdGlvbiAoIitILmQoYSkrIikuIil9LAok
-QzoiJDIiLAokUjoyLAokUzoxfQpMLkwucHJvdG90eXBlPXsKJDE6ZnVuY3Rpb24oYSl7dmFyIHQscyxy
-CnUuQi5iKGEpCnQ9d2luZG93LmxvY2F0aW9uLnBhdGhuYW1lCnM9TC5HNih3aW5kb3cubG9jYXRpb24u
-aHJlZikKcj1MLmFLKHdpbmRvdy5sb2NhdGlvbi5ocmVmKQppZih0Lmxlbmd0aD4xKUwuRzcodCxzLHIs
-ITEsbnVsbCkKZWxzZXtMLkJFKHQsbmV3IEIucXAoIiIsIiIsIiIsQy54RCksITApCkwuQlgoIiZuYnNw
-OyIsbnVsbCl9fSwKJFM6MTN9CkwuV3gucHJvdG90eXBlPXsKJDE6ZnVuY3Rpb24oYSl7dmFyIHQscyxy
-LHE9ImNvbGxhcHNlZCIKdS5WLmIoYSkKdD10aGlzLmEKcz1KLlJFKHQpCnI9dGhpcy5iCmlmKCFzLmdE
-KHQpLnRnKDAscSkpe3MuZ0QodCkuaSgwLHEpCkouZFIocikuaSgwLHEpfWVsc2V7cy5nRCh0KS5SKDAs
-cSkKSi5kUihyKS5SKDAscSl9fSwKJFM6Nn0KTC5BTy5wcm90b3R5cGU9ewokMTpmdW5jdGlvbihhKXt2
-YXIgdD1KLnFGKHUuaC5iKGEpKSxzPXQuJHRpLHI9cy5DKCJ+KDEpIikuYihuZXcgTC5kTih0aGlzLmEp
-KQp1Lk0uYihudWxsKQpXLkpFKHQuYSx0LmIsciwhMSxzLmQpfSwKJFM6M30KTC5kTi5wcm90b3R5cGU9
-ewokMTpmdW5jdGlvbihhKXt2YXIgdAp1LlYuYihhKQp0PWRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoInRh
-YmxlW2RhdGEtcGF0aF0iKQp0LnRvU3RyaW5nCkwudDIoYSx0aGlzLmEsdC5nZXRBdHRyaWJ1dGUoImRh
-dGEtIituZXcgVy5TeShuZXcgVy5pNyh0KSkuTygicGF0aCIpKSl9LAokUzo2fQpMLkhvLnByb3RvdHlw
-ZT17CiQxOmZ1bmN0aW9uKGEpe3ZhciB0LHMscgp1LmguYihhKQp0PUoucUYoYSkKcz10LiR0aQpyPXMu
-QygifigxKSIpLmIobmV3IEwueHooYSx0aGlzLmEpKQp1Lk0uYihudWxsKQpXLkpFKHQuYSx0LmIsciwh
-MSxzLmQpfSwKJFM6M30KTC54ei5wcm90b3R5cGU9ewokMTpmdW5jdGlvbihhKXt2YXIgdAp1LlYuYihh
-KQp0PXRoaXMuYQpMLmhYKHRoaXMuYixQLlFBKHQuZ2V0QXR0cmlidXRlKCJkYXRhLSIrbmV3IFcuU3ko
-bmV3IFcuaTcodCkpLk8oIm9mZnNldCIpKSxudWxsLG51bGwpKX0sCiRTOjZ9CkwuSUMucHJvdG90eXBl
-PXsKJDE6ZnVuY3Rpb24oYSl7dmFyIHQ9Si5xRih1LmguYihhKSkscz10LiR0aQpzLkMoIn4oMSkiKS5i
-KEwuSDAoKSkKdS5NLmIobnVsbCkKVy5KRSh0LmEsdC5iLEwuSDAoKSwhMSxzLmQpfSwKJFM6M30KTC5M
-MS5wcm90b3R5cGU9ewokMTpmdW5jdGlvbihhKXt2YXIgdAp1LnIuYihhKQp0PWEuc3RhdHVzCmlmKHQ9
-PT0yMDApcmV0dXJuIGEKZWxzZSB0aHJvdyBILmIoIlJlcXVlc3QgZmFpbGVkOyBzdGF0dXMgb2YgIitI
-LmQodCkpfSwKJFM6NDF9CkwublQucHJvdG90eXBlPXsKJDA6ZnVuY3Rpb24oKXtMLkZyKHRoaXMuYS5h
-LHRoaXMuYix0aGlzLmMpfSwKJFM6MH0KTC5CWi5wcm90b3R5cGU9ewokMDpmdW5jdGlvbigpe0wuRnIo
-dGhpcy5hLmEsbnVsbCxudWxsKX0sCiRTOjB9CkwuR0gucHJvdG90eXBlPXsKJDE6ZnVuY3Rpb24oYSl7
-dS5oLmIoYSkKJC56QigpLnRvU3RyaW5nCnUudi5iKCQub3coKS5xKDAsImhsanMiKSkuVjcoImhpZ2hs
-aWdodEJsb2NrIixbYV0pfSwKJFM6M30KTC5EVC5wcm90b3R5cGU9ewokMTpmdW5jdGlvbihhKXt2YXIg
-dAp1LnIuYihhKQp0PWEuc3RhdHVzCmlmKHQ9PT0yMDApe0wuVDEoVS55dShDLkN0LnBXKDAsYS5yZXNw
-b25zZVRleHQsbnVsbCkpKQpMLnlYKCIuZWRpdC1wYW5lbCAucGFuZWwtY29udGVudCIsITEpfWVsc2Ug
-d2luZG93LmFsZXJ0KCJSZXF1ZXN0IGZhaWxlZDsgc3RhdHVzIG9mICIrSC5kKHQpKX0sCiRTOjd9Ckwu
-ZUgucHJvdG90eXBlPXsKJDI6ZnVuY3Rpb24oYSxiKXtMLnFKKCJsb2FkUmVnaW9uRXhwbGFuYXRpb246
-ICIrSC5kKGEpLGIpCndpbmRvdy5hbGVydCgiQ291bGQgbm90IGxvYWQgIitILmQodGhpcy5hKSsiICgi
-K0guZChhKSsiKS4iKX0sCiRDOiIkMiIsCiRSOjIsCiRTOjF9CkwuekQucHJvdG90eXBlPXsKJDE6ZnVu
-Y3Rpb24oYSl7dmFyIHQscyxyPXRoaXMKdS5yLmIoYSkKdD1hLnN0YXR1cwppZih0PT09MjAwKXtzPXIu
-YQpMLkJFKHMsQi5ZZih1LmIuYihDLkN0LnBXKDAsYS5yZXNwb25zZVRleHQsbnVsbCkpKSxyLmIpCnQ9
-ci5jCkwuZkcodCxyLmQpCkwuQlgoQy54Qi50ZyhzLCI/Iik/Qy54Qi5OaihzLDAsQy54Qi5PWShzLCI/
-IikpOnMsdCkKdD1yLmUKaWYodCE9bnVsbCl0LiQwKCl9ZWxzZSB3aW5kb3cuYWxlcnQoIlJlcXVlc3Qg
-ZmFpbGVkOyBzdGF0dXMgb2YgIitILmQodCkpfSwKJFM6N30KTC5PRS5wcm90b3R5cGU9ewokMjpmdW5j
-dGlvbihhLGIpe0wucUooImxvYWRGaWxlOiAiK0guZChhKSxiKQp3aW5kb3cuYWxlcnQoIkNvdWxkIG5v
-dCBsb2FkICIrdGhpcy5hKyIgKCIrSC5kKGEpKyIpLiIpfSwKJEM6IiQyIiwKJFI6MiwKJFM6MX0KTC5U
-Vy5wcm90b3R5cGU9ewokMTpmdW5jdGlvbihhKXt2YXIgdCxzLHIKdS5yLmIoYSkKdD1hLnN0YXR1cwpp
-Zih0PT09MjAwKXtzPUMuQ3QucFcoMCxhLnJlc3BvbnNlVGV4dCxudWxsKQpyPWRvY3VtZW50LnF1ZXJ5
-U2VsZWN0b3IoIi5uYXYtdHJlZSIpCkoubDUociwiIikKTC50WChyLEwubUsocykpfWVsc2Ugd2luZG93
-LmFsZXJ0KCJSZXF1ZXN0IGZhaWxlZDsgc3RhdHVzIG9mICIrSC5kKHQpKX0sCiRTOjd9CkwueHIucHJv
-dG90eXBlPXsKJDI6ZnVuY3Rpb24oYSxiKXtMLnFKKCJsb2FkTmF2aWdhdGlvblRyZWU6ICIrSC5kKGEp
-LGIpCndpbmRvdy5hbGVydCgiQ291bGQgbm90IGxvYWQgIit0aGlzLmErIiAoIitILmQoYSkrIikuIil9
-LAokQzoiJDIiLAokUjoyLAokUzoxfQpMLkVFLnByb3RvdHlwZT17CiQxOmZ1bmN0aW9uKGEpe3ZhciB0
-LHMKdS5WLmIoYSkKdD10aGlzLmEKcz10aGlzLmIKTC5hZih3aW5kb3cubG9jYXRpb24ucGF0aG5hbWUs
-dCxzLCEwLG5ldyBMLlFMKHQscykpCkwuaFgodGhpcy5jLHQpfSwKJFM6Nn0KTC5RTC5wcm90b3R5cGU9
-ewokMDpmdW5jdGlvbigpe0wuRnIod2luZG93LmxvY2F0aW9uLnBhdGhuYW1lLHRoaXMuYSx0aGlzLmIp
-fSwKJFM6MH0KTC5WUy5wcm90b3R5cGU9ewokMTpmdW5jdGlvbihhKXt2YXIgdCxzPSJzZWxlY3RlZC1m
-aWxlIgp1LmguYihhKQphLnRvU3RyaW5nCnQ9Si5SRShhKQppZihhLmdldEF0dHJpYnV0ZSgiZGF0YS0i
-K25ldyBXLlN5KG5ldyBXLmk3KGEpKS5PKCJuYW1lIikpPT09dGhpcy5hLmEpdC5nRChhKS5pKDAscykK
-ZWxzZSB0LmdEKGEpLlIoMCxzKX0sCiRTOjN9CkwuVEQucHJvdG90eXBlPXsKJDE6ZnVuY3Rpb24oYSl7
-cmV0dXJuIEwudDIodS5WLmIoYSksITAsbnVsbCl9LAokUzoxNn0KTC5YQS5wcm90b3R5cGU9ewpFYjpm
-dW5jdGlvbihhLGIsYyl7cmV0dXJuITB9LAppMDpmdW5jdGlvbihhKXtyZXR1cm4hMH0sCiRpa0Y6MX0K
-TC5aWi5wcm90b3R5cGU9e30KTC55OC5wcm90b3R5cGU9ewp3OmZ1bmN0aW9uKGEpe3JldHVybiB0aGlz
-LmJ9fQpNLmxJLnByb3RvdHlwZT17CldPOmZ1bmN0aW9uKGEsYil7dmFyIHQscz1udWxsCk0uWUYoImFi
-c29sdXRlIixILlZNKFtiLG51bGwsbnVsbCxudWxsLG51bGwsbnVsbCxudWxsXSx1LnMpKQp0PXRoaXMu
-YQp0PXQuWXIoYik+MCYmIXQuaEsoYikKaWYodClyZXR1cm4gYgp0PUQuUlgoKQpyZXR1cm4gdGhpcy5x
-NygwLHQsYixzLHMscyxzLHMscyl9LAp0TTpmdW5jdGlvbihhKXt2YXIgdCxzLHI9WC5DTChhLHRoaXMu
-YSkKci5JVigpCnQ9ci5kCnM9dC5sZW5ndGgKaWYocz09PTApe3Q9ci5iCnJldHVybiB0PT1udWxsPyIu
-Ijp0fWlmKHM9PT0xKXt0PXIuYgpyZXR1cm4gdD09bnVsbD8iLiI6dH1pZigwPj1zKXJldHVybiBILk9I
-KHQsLTEpCnQucG9wKCkKQy5ObS5tdihyLmUpCnIuSVYoKQpyZXR1cm4gci53KDApfSwKcTc6ZnVuY3Rp
-b24oYSxiLGMsZCxlLGYsZyxoLGkpe3ZhciB0PUguVk0oW2IsYyxkLGUsZixnLGgsaV0sdS5zKQpNLllG
-KCJqb2luIix0KQpyZXR1cm4gdGhpcy5JUChuZXcgSC5VNSh0LHUuYkIuYihuZXcgTS5NaSgpKSx1LmNj
-KSl9LApJUDpmdW5jdGlvbihhKXt2YXIgdCxzLHIscSxwLG8sbixtLGwKdS5YLmIoYSkKZm9yKHQ9YS4k
-dGkscz10LkMoImEyKGNYLkUpIikuYihuZXcgTS5xNygpKSxyPWEuZ2t6KGEpLHQ9bmV3IEguU08ocixz
-LHQuQygiU088Y1guRT4iKSkscz10aGlzLmEscT0hMSxwPSExLG89IiI7dC5GKCk7KXtuPXIuZ2woKQpp
-ZihzLmhLKG4pJiZwKXttPVguQ0wobixzKQpsPW8uY2hhckNvZGVBdCgwKT09MD9vOm8Kbz1DLnhCLk5q
-KGwsMCxzLlNwKGwsITApKQptLmI9bwppZihzLmRzKG8pKUMuTm0uWShtLmUsMCxzLmdtSSgpKQpvPW0u
-dygwKX1lbHNlIGlmKHMuWXIobik+MCl7cD0hcy5oSyhuKQpvPUguZChuKX1lbHNle2lmKCEobi5sZW5n
-dGg+MCYmcy5VZChuWzBdKSkpaWYocSlvKz1zLmdtSSgpCm8rPUguZChuKX1xPXMuZHMobil9cmV0dXJu
-IG8uY2hhckNvZGVBdCgwKT09MD9vOm99LApvNTpmdW5jdGlvbihhKXt2YXIgdAppZighdGhpcy55Myhh
-KSlyZXR1cm4gYQp0PVguQ0woYSx0aGlzLmEpCnQuclIoKQpyZXR1cm4gdC53KDApfSwKeTM6ZnVuY3Rp
-b24oYSl7dmFyIHQscyxyLHEscCxvLG4sbSxsLGsKYS50b1N0cmluZwp0PXRoaXMuYQpzPXQuWXIoYSkK
-aWYocyE9PTApe2lmKHQ9PT0kLktrKCkpZm9yKHI9MDtyPHM7KytyKWlmKEMueEIuVyhhLHIpPT09NDcp
-cmV0dXJuITAKcT1zCnA9NDd9ZWxzZXtxPTAKcD1udWxsfWZvcihvPW5ldyBILnFqKGEpLmEsbj1vLmxl
-bmd0aCxyPXEsbT1udWxsO3I8bjsrK3IsbT1wLHA9bCl7bD1DLnhCLm0obyxyKQppZih0LnI0KGwpKXtp
-Zih0PT09JC5LaygpJiZsPT09NDcpcmV0dXJuITAKaWYocCE9bnVsbCYmdC5yNChwKSlyZXR1cm4hMApp
-ZihwPT09NDYpaz1tPT1udWxsfHxtPT09NDZ8fHQucjQobSkKZWxzZSBrPSExCmlmKGspcmV0dXJuITB9
-fWlmKHA9PW51bGwpcmV0dXJuITAKaWYodC5yNChwKSlyZXR1cm4hMAppZihwPT09NDYpdD1tPT1udWxs
-fHx0LnI0KG0pfHxtPT09NDYKZWxzZSB0PSExCmlmKHQpcmV0dXJuITAKcmV0dXJuITF9LApIUDpmdW5j
-dGlvbihhLGIpe3ZhciB0LHMscixxLHAsbz10aGlzLG49J1VuYWJsZSB0byBmaW5kIGEgcGF0aCB0byAi
-JwpiPW8uV08oMCxiKQp0PW8uYQppZih0LllyKGIpPD0wJiZ0LllyKGEpPjApcmV0dXJuIG8ubzUoYSkK
-aWYodC5ZcihhKTw9MHx8dC5oSyhhKSlhPW8uV08oMCxhKQppZih0LllyKGEpPD0wJiZ0LllyKGIpPjAp
-dGhyb3cgSC5iKFguSlQobitILmQoYSkrJyIgZnJvbSAiJytILmQoYikrJyIuJykpCnM9WC5DTChiLHQp
-CnMuclIoKQpyPVguQ0woYSx0KQpyLnJSKCkKcT1zLmQKaWYocS5sZW5ndGg+MCYmSi5STShxWzBdLCIu
-IikpcmV0dXJuIHIudygwKQpxPXMuYgpwPXIuYgppZihxIT1wKXE9cT09bnVsbHx8cD09bnVsbHx8IXQu
-TmMocSxwKQplbHNlIHE9ITEKaWYocSlyZXR1cm4gci53KDApCndoaWxlKCEwKXtxPXMuZAppZihxLmxl
-bmd0aD4wKXtwPXIuZApxPXAubGVuZ3RoPjAmJnQuTmMocVswXSxwWzBdKX1lbHNlIHE9ITEKaWYoIXEp
-YnJlYWsKQy5ObS5XNChzLmQsMCkKQy5ObS5XNChzLmUsMSkKQy5ObS5XNChyLmQsMCkKQy5ObS5XNChy
-LmUsMSl9cT1zLmQKaWYocS5sZW5ndGg+MCYmSi5STShxWzBdLCIuLiIpKXRocm93IEguYihYLkpUKG4r
-SC5kKGEpKyciIGZyb20gIicrSC5kKGIpKyciLicpKQpxPXUuTgpDLk5tLlVHKHIuZCwwLFAuTzgocy5k
-Lmxlbmd0aCwiLi4iLHEpKQpDLk5tLlkoci5lLDAsIiIpCkMuTm0uVUcoci5lLDEsUC5POChzLmQubGVu
-Z3RoLHQuZ21JKCkscSkpCnQ9ci5kCnE9dC5sZW5ndGgKaWYocT09PTApcmV0dXJuIi4iCmlmKHE+MSYm
-Si5STShDLk5tLmdyWih0KSwiLiIpKXt0PXIuZAppZigwPj10Lmxlbmd0aClyZXR1cm4gSC5PSCh0LC0x
-KQp0LnBvcCgpCnQ9ci5lCkMuTm0ubXYodCkKQy5ObS5tdih0KQpDLk5tLmkodCwiIil9ci5iPSIiCnIu
-SVYoKQpyZXR1cm4gci53KDApfX0KTS5NaS5wcm90b3R5cGU9ewokMTpmdW5jdGlvbihhKXtyZXR1cm4g
-SC55KGEpIT1udWxsfSwKJFM6OH0KTS5xNy5wcm90b3R5cGU9ewokMTpmdW5jdGlvbihhKXtyZXR1cm4g
-SC55KGEpIT09IiJ9LAokUzo4fQpNLk5vLnByb3RvdHlwZT17CiQxOmZ1bmN0aW9uKGEpe0gueShhKQpy
-ZXR1cm4gYT09bnVsbD8ibnVsbCI6JyInK2ErJyInfSwKJFM6NX0KQi5MdS5wcm90b3R5cGU9ewp4Wjpm
-dW5jdGlvbihhKXt2YXIgdCxzPXRoaXMuWXIoYSkKaWYocz4wKXJldHVybiBKLmxkKGEsMCxzKQppZih0
-aGlzLmhLKGEpKXtpZigwPj1hLmxlbmd0aClyZXR1cm4gSC5PSChhLDApCnQ9YVswXX1lbHNlIHQ9bnVs
-bApyZXR1cm4gdH0sCk5jOmZ1bmN0aW9uKGEsYil7cmV0dXJuIGE9PWJ9fQpYLldELnByb3RvdHlwZT17
-CklWOmZ1bmN0aW9uKCl7dmFyIHQscyxyPXRoaXMKd2hpbGUoITApe3Q9ci5kCmlmKCEodC5sZW5ndGgh
-PT0wJiZKLlJNKEMuTm0uZ3JaKHQpLCIiKSkpYnJlYWsKdD1yLmQKaWYoMD49dC5sZW5ndGgpcmV0dXJu
-IEguT0godCwtMSkKdC5wb3AoKQpDLk5tLm12KHIuZSl9dD1yLmUKcz10Lmxlbmd0aAppZihzPjApQy5O
-bS5ZKHQscy0xLCIiKX0sCnJSOmZ1bmN0aW9uKCl7dmFyIHQscyxyLHEscCxvLG4sbT10aGlzLGw9SC5W
-TShbXSx1LnMpCmZvcih0PW0uZCxzPXQubGVuZ3RoLHI9MCxxPTA7cTx0Lmxlbmd0aDt0Lmxlbmd0aD09
-PXN8fCgwLEgubGspKHQpLCsrcSl7cD10W3FdCm89Si5pYShwKQppZighKG8uRE4ocCwiLiIpfHxvLkRO
-KHAsIiIpKSlpZihvLkROKHAsIi4uIikpaWYobC5sZW5ndGg+MClsLnBvcCgpCmVsc2UgKytyCmVsc2Ug
-Qy5ObS5pKGwscCl9aWYobS5iPT1udWxsKUMuTm0uVUcobCwwLFAuTzgociwiLi4iLHUuTikpCmlmKGwu
-bGVuZ3RoPT09MCYmbS5iPT1udWxsKUMuTm0uaShsLCIuIikKbj1QLmRIKGwubGVuZ3RoLG5ldyBYLnFS
-KG0pLCEwLHUuTikKdD1tLmIKdD10IT1udWxsJiZsLmxlbmd0aD4wJiZtLmEuZHModCk/bS5hLmdtSSgp
-OiIiCkgudDYobikuZC5iKHQpCmlmKCEhbi5maXhlZCRsZW5ndGgpSC52aChQLkw0KCJpbnNlcnQiKSkK
-bi5zcGxpY2UoMCwwLHQpCm0uc25KKGwpCm0uc1BoKG4pCnQ9bS5iCmlmKHQhPW51bGwmJm0uYT09PSQu
-S2soKSl7dC50b1N0cmluZwptLmI9SC55cyh0LCIvIiwiXFwiKX1tLklWKCl9LAp3OmZ1bmN0aW9uKGEp
-e3ZhciB0LHMscj10aGlzLHE9ci5iCnE9cSE9bnVsbD9xOiIiCmZvcih0PTA7dDxyLmQubGVuZ3RoOysr
-dCl7cz1yLmUKaWYodD49cy5sZW5ndGgpcmV0dXJuIEguT0gocyx0KQpzPXErSC5kKHNbdF0pCnE9ci5k
-CmlmKHQ+PXEubGVuZ3RoKXJldHVybiBILk9IKHEsdCkKcT1zK0guZChxW3RdKX1xKz1ILmQoQy5ObS5n
-clooci5lKSkKcmV0dXJuIHEuY2hhckNvZGVBdCgwKT09MD9xOnF9LApzbko6ZnVuY3Rpb24oYSl7dGhp
-cy5kPXUuYS5iKGEpfSwKc1BoOmZ1bmN0aW9uKGEpe3RoaXMuZT11LmEuYihhKX19ClgucVIucHJvdG90
-eXBlPXsKJDE6ZnVuY3Rpb24oYSl7cmV0dXJuIHRoaXMuYS5hLmdtSSgpfSwKJFM6NDN9ClguZHYucHJv
-dG90eXBlPXsKdzpmdW5jdGlvbihhKXtyZXR1cm4iUGF0aEV4Y2VwdGlvbjogIit0aGlzLmF9fQpPLnpM
-LnByb3RvdHlwZT17Cnc6ZnVuY3Rpb24oYSl7cmV0dXJuIHRoaXMuZ29jKHRoaXMpfX0KRS5PRi5wcm90
-b3R5cGU9ewpVZDpmdW5jdGlvbihhKXtyZXR1cm4gQy54Qi50ZyhhLCIvIil9LApyNDpmdW5jdGlvbihh
-KXtyZXR1cm4gYT09PTQ3fSwKZHM6ZnVuY3Rpb24oYSl7dmFyIHQ9YS5sZW5ndGgKcmV0dXJuIHQhPT0w
-JiZDLnhCLm0oYSx0LTEpIT09NDd9LApTcDpmdW5jdGlvbihhLGIpe2lmKGEubGVuZ3RoIT09MCYmQy54
-Qi5XKGEsMCk9PT00NylyZXR1cm4gMQpyZXR1cm4gMH0sCllyOmZ1bmN0aW9uKGEpe3JldHVybiB0aGlz
-LlNwKGEsITEpfSwKaEs6ZnVuY3Rpb24oYSl7cmV0dXJuITF9LApnb2M6ZnVuY3Rpb24oKXtyZXR1cm4i
-cG9zaXgifSwKZ21JOmZ1bmN0aW9uKCl7cmV0dXJuIi8ifX0KRi5ydS5wcm90b3R5cGU9ewpVZDpmdW5j
-dGlvbihhKXtyZXR1cm4gQy54Qi50ZyhhLCIvIil9LApyNDpmdW5jdGlvbihhKXtyZXR1cm4gYT09PTQ3
-fSwKZHM6ZnVuY3Rpb24oYSl7dmFyIHQ9YS5sZW5ndGgKaWYodD09PTApcmV0dXJuITEKaWYoQy54Qi5t
-KGEsdC0xKSE9PTQ3KXJldHVybiEwCnJldHVybiBDLnhCLlRjKGEsIjovLyIpJiZ0aGlzLllyKGEpPT09
-dH0sClNwOmZ1bmN0aW9uKGEsYil7dmFyIHQscyxyLHEscD1hLmxlbmd0aAppZihwPT09MClyZXR1cm4g
-MAppZihDLnhCLlcoYSwwKT09PTQ3KXJldHVybiAxCmZvcih0PTA7dDxwOysrdCl7cz1DLnhCLlcoYSx0
-KQppZihzPT09NDcpcmV0dXJuIDAKaWYocz09PTU4KXtpZih0PT09MClyZXR1cm4gMApyPUMueEIuWFUo
-YSwiLyIsQy54Qi5RaShhLCIvLyIsdCsxKT90KzM6dCkKaWYocjw9MClyZXR1cm4gcAppZighYnx8cDxy
-KzMpcmV0dXJuIHIKaWYoIUMueEIubihhLCJmaWxlOi8vIikpcmV0dXJuIHIKaWYoIUIuWXUoYSxyKzEp
-KXJldHVybiByCnE9ciszCnJldHVybiBwPT09cT9xOnIrNH19cmV0dXJuIDB9LApZcjpmdW5jdGlvbihh
-KXtyZXR1cm4gdGhpcy5TcChhLCExKX0sCmhLOmZ1bmN0aW9uKGEpe3JldHVybiBhLmxlbmd0aCE9PTAm
-JkMueEIuVyhhLDApPT09NDd9LApnb2M6ZnVuY3Rpb24oKXtyZXR1cm4idXJsIn0sCmdtSTpmdW5jdGlv
-bigpe3JldHVybiIvIn19CkwuSVYucHJvdG90eXBlPXsKVWQ6ZnVuY3Rpb24oYSl7cmV0dXJuIEMueEIu
-dGcoYSwiLyIpfSwKcjQ6ZnVuY3Rpb24oYSl7cmV0dXJuIGE9PT00N3x8YT09PTkyfSwKZHM6ZnVuY3Rp
-b24oYSl7dmFyIHQ9YS5sZW5ndGgKaWYodD09PTApcmV0dXJuITEKdD1DLnhCLm0oYSx0LTEpCnJldHVy
-biEodD09PTQ3fHx0PT09OTIpfSwKU3A6ZnVuY3Rpb24oYSxiKXt2YXIgdCxzLHI9YS5sZW5ndGgKaWYo
-cj09PTApcmV0dXJuIDAKdD1DLnhCLlcoYSwwKQppZih0PT09NDcpcmV0dXJuIDEKaWYodD09PTkyKXtp
-ZihyPDJ8fEMueEIuVyhhLDEpIT09OTIpcmV0dXJuIDEKcz1DLnhCLlhVKGEsIlxcIiwyKQppZihzPjAp
-e3M9Qy54Qi5YVShhLCJcXCIscysxKQppZihzPjApcmV0dXJuIHN9cmV0dXJuIHJ9aWYocjwzKXJldHVy
-biAwCmlmKCFCLk9TKHQpKXJldHVybiAwCmlmKEMueEIuVyhhLDEpIT09NTgpcmV0dXJuIDAKcj1DLnhC
-LlcoYSwyKQppZighKHI9PT00N3x8cj09PTkyKSlyZXR1cm4gMApyZXR1cm4gM30sCllyOmZ1bmN0aW9u
-KGEpe3JldHVybiB0aGlzLlNwKGEsITEpfSwKaEs6ZnVuY3Rpb24oYSl7cmV0dXJuIHRoaXMuWXIoYSk9
-PT0xfSwKT3Q6ZnVuY3Rpb24oYSxiKXt2YXIgdAppZihhPT09YilyZXR1cm4hMAppZihhPT09NDcpcmV0
-dXJuIGI9PT05MgppZihhPT09OTIpcmV0dXJuIGI9PT00NwppZigoYV5iKSE9PTMyKXJldHVybiExCnQ9
-YXwzMgpyZXR1cm4gdD49OTcmJnQ8PTEyMn0sCk5jOmZ1bmN0aW9uKGEsYil7dmFyIHQscyxyCmlmKGE9
-PWIpcmV0dXJuITAKdD1hLmxlbmd0aAppZih0IT09Yi5sZW5ndGgpcmV0dXJuITEKZm9yKHM9Si5yWShi
-KSxyPTA7cjx0OysrcilpZighdGhpcy5PdChDLnhCLlcoYSxyKSxzLlcoYixyKSkpcmV0dXJuITEKcmV0
-dXJuITB9LApnb2M6ZnVuY3Rpb24oKXtyZXR1cm4id2luZG93cyJ9LApnbUk6ZnVuY3Rpb24oKXtyZXR1
-cm4iXFwifX07KGZ1bmN0aW9uIGFsaWFzZXMoKXt2YXIgdD1KLnZCLnByb3RvdHlwZQp0LlU9dC53CnQu
-U2o9dC5lNwp0PUouTUYucHJvdG90eXBlCnQudD10LncKdD1QLmNYLnByb3RvdHlwZQp0LkdHPXQuZXYK
-dD1QLmsucHJvdG90eXBlCnQueGI9dC53CnQ9Vy5jdi5wcm90b3R5cGUKdC5EVz10LnI2CnQ9Vy5tNi5w
+b3R5cGU9e30KVC5tUS5wcm90b3R5cGU9e30KTC5lLnByb3RvdHlwZT17CiQxOmZ1bmN0aW9uKGEpe3Zh
+ciB0LHMscixxLHAsbyxuCnUuQi5hKGEpCnQ9d2luZG93LmxvY2F0aW9uLnBhdGhuYW1lCnM9TC5HNih3
+aW5kb3cubG9jYXRpb24uaHJlZikKcj1MLmFLKHdpbmRvdy5sb2NhdGlvbi5ocmVmKQpMLkdlKCkKaWYo
+dCE9PSIvIiYmdCE9PUouVDAoZG9jdW1lbnQucXVlcnlTZWxlY3RvcigiLnJvb3QiKS50ZXh0Q29udGVu
+dCkpTC5HNyh0LHMsciwhMCxuZXcgTC5WVyh0LHMscikpCnE9ZG9jdW1lbnQKcD1KLnFGKHEucXVlcnlT
+ZWxlY3RvcigiLmFwcGx5LW1pZ3JhdGlvbiIpKQpvPXAuJHRpCm49by5DKCJ+KDEpIikuYShuZXcgTC5v
+WigpKQp1Lk0uYShudWxsKQpXLkpFKHAuYSxwLmIsbiwhMSxvLmMpCnE9Si5xRihxLnF1ZXJ5U2VsZWN0
+b3IoIi5yZXJ1bi1taWdyYXRpb24iKSkKbz1xLiR0aQpXLkpFKHEuYSxxLmIsby5DKCJ+KDEpIikuYShu
+ZXcgTC55OCgpKSwhMSxvLmMpfSwKJFM6MTd9CkwuVlcucHJvdG90eXBlPXsKJDA6ZnVuY3Rpb24oKXtM
+LkZyKHRoaXMuYSx0aGlzLmIsdGhpcy5jKX0sCiRTOjB9Ckwub1oucHJvdG90eXBlPXsKJDE6ZnVuY3Rp
+b24oYSl7dS5WLmEoYSkKaWYoSC5vVCh3aW5kb3cuY29uZmlybSgiVGhpcyB3aWxsIGFwcGx5IHRoZSBj
+aGFuZ2VzIHlvdSd2ZSBwcmV2aWV3ZWQgdG8geW91ciB3b3JraW5nIGRpcmVjdG9yeS4gSXQgaXMgcmVj
+b21tZW5kZWQgeW91IGNvbW1pdCBhbnkgY2hhbmdlcyB5b3UgbWFkZSBiZWZvcmUgZG9pbmcgdGhpcy4i
+KSkpTC50eSgiL2FwcGx5LW1pZ3JhdGlvbiIpLlc3KG5ldyBMLmpyKCksdS5QKS5PQShuZXcgTC5xbCgp
+KX0sCiRTOjV9CkwuanIucHJvdG90eXBlPXsKJDE6ZnVuY3Rpb24oYSl7dmFyIHQKdS5yLmEoYSkKdD1k
+b2N1bWVudC5ib2R5CnQuY2xhc3NMaXN0LnJlbW92ZSgicHJvcG9zZWQiKQp0LmNsYXNzTGlzdC5hZGQo
+ImFwcGxpZWQiKX0sCiRTOjd9CkwucWwucHJvdG90eXBlPXsKJDI6ZnVuY3Rpb24oYSxiKXtMLnFKKCJh
+cHBseSBtaWdyYXRpb24gZXJyb3I6ICIrSC5kKGEpLGIpCndpbmRvdy5hbGVydCgiQ291bGQgbm90IGFw
+cGx5IG1pZ3JhdGlvbiAoIitILmQoYSkrIikuIil9LAokQzoiJDIiLAokUjoyLAokUzoxfQpMLnk4LnBy
+b3RvdHlwZT17CiQxOmZ1bmN0aW9uKGEpe3JldHVybiB0aGlzLnhuKHUuVi5hKGEpKX0sCnhuOmZ1bmN0
+aW9uKGEpe3ZhciB0PTAscz1QLkZYKHUuUCkscj0xLHEscD1bXSxvLG4sbSxsCnZhciAkYXN5bmMkJDE9
+UC5seihmdW5jdGlvbihiLGMpe2lmKGI9PT0xKXtxPWMKdD1yfXdoaWxlKHRydWUpc3dpdGNoKHQpe2Nh
+c2UgMDpyPTMKZG9jdW1lbnQuYm9keS5jbGFzc0xpc3QuYWRkKCJyZXJ1bm5pbmciKQp0PTYKcmV0dXJu
+IFAualEoTC50eSgiL3JlcnVuLW1pZ3JhdGlvbiIpLCRhc3luYyQkMSkKY2FzZSA2OndpbmRvdy5sb2Nh
+dGlvbi5yZWxvYWQoKQpwLnB1c2goNSkKdD00CmJyZWFrCmNhc2UgMzpyPTIKbD1xCm89SC5SdShsKQpu
+PUgudHMobCkKTC5xSigicmVydW4gbWlncmF0aW9uOiAiK0guZChvKSxuKQp3aW5kb3cuYWxlcnQoIkZh
+aWxlZCB0byByZXJ1biBtaWdyYXRpb246ICIrSC5kKG8pKyIuIikKcC5wdXNoKDUpCnQ9NApicmVhawpj
+YXNlIDI6cD1bMV0KY2FzZSA0OnI9MQpkb2N1bWVudC5ib2R5LmNsYXNzTGlzdC5yZW1vdmUoInJlcnVu
+bmluZyIpCnQ9cC5wb3AoKQpicmVhawpjYXNlIDU6cmV0dXJuIFAueUMobnVsbCxzKQpjYXNlIDE6cmV0
+dXJuIFAuZjMocSxzKX19KQpyZXR1cm4gUC5ESSgkYXN5bmMkJDEscyl9LAokUzo0MH0KTC5MLnByb3Rv
+dHlwZT17CiQxOmZ1bmN0aW9uKGEpe3ZhciB0LHMscgp1LkIuYShhKQp0PXdpbmRvdy5sb2NhdGlvbi5w
+YXRobmFtZQpzPUwuRzYod2luZG93LmxvY2F0aW9uLmhyZWYpCnI9TC5hSyh3aW5kb3cubG9jYXRpb24u
+aHJlZikKaWYodC5sZW5ndGg+MSlMLkc3KHQscyxyLCExLG51bGwpCmVsc2V7TC5CRSh0LG5ldyBCLnFw
+KCIiLCIiLCIiLEMueEQpLCEwKQpMLkJYKCImbmJzcDsiLG51bGwpfX0sCiRTOjE3fQpMLld4LnByb3Rv
+dHlwZT17CiQxOmZ1bmN0aW9uKGEpe3ZhciB0LHMscixxPSJjb2xsYXBzZWQiCnUuVi5hKGEpCnQ9dGhp
+cy5hCnM9Si5SRSh0KQpyPXRoaXMuYgppZighcy5nRCh0KS50ZygwLHEpKXtzLmdEKHQpLmkoMCxxKQpK
+LmRSKHIpLmkoMCxxKX1lbHNle3MuZ0QodCkuUigwLHEpCkouZFIocikuUigwLHEpfX0sCiRTOjV9Ckwu
+QU8ucHJvdG90eXBlPXsKJDE6ZnVuY3Rpb24oYSl7dmFyIHQ9Si5xRih1LmguYShhKSkscz10LiR0aSxy
+PXMuQygifigxKSIpLmEobmV3IEwuZE4odGhpcy5hKSkKdS5NLmEobnVsbCkKVy5KRSh0LmEsdC5iLHIs
+ITEscy5jKX0sCiRTOjZ9CkwuZE4ucHJvdG90eXBlPXsKJDE6ZnVuY3Rpb24oYSl7dmFyIHQKdS5WLmEo
+YSkKdD1kb2N1bWVudC5xdWVyeVNlbGVjdG9yKCJ0YWJsZVtkYXRhLXBhdGhdIikKdC50b1N0cmluZwpM
+LnQyKGEsdGhpcy5hLHQuZ2V0QXR0cmlidXRlKCJkYXRhLSIrbmV3IFcuU3kobmV3IFcuaTcodCkpLk8o
+InBhdGgiKSkpfSwKJFM6NX0KTC5Iby5wcm90b3R5cGU9ewokMTpmdW5jdGlvbihhKXt2YXIgdCxzLHIK
+dS5oLmEoYSkKdD1KLnFGKGEpCnM9dC4kdGkKcj1zLkMoIn4oMSkiKS5hKG5ldyBMLnh6KGEsdGhpcy5h
+KSkKdS5NLmEobnVsbCkKVy5KRSh0LmEsdC5iLHIsITEscy5jKX0sCiRTOjZ9CkwueHoucHJvdG90eXBl
+PXsKJDE6ZnVuY3Rpb24oYSl7dmFyIHQscz1udWxsCnUuVi5hKGEpCnQ9dGhpcy5hCkwuaFgodGhpcy5i
+LFAuUUEodC5nZXRBdHRyaWJ1dGUoImRhdGEtIituZXcgVy5TeShuZXcgVy5pNyh0KSkuTygib2Zmc2V0
+IikpLHMscyksUC5RQSh0LmdldEF0dHJpYnV0ZSgiZGF0YS0iK25ldyBXLlN5KG5ldyBXLmk3KHQpKS5P
+KCJsaW5lIikpLHMscykpfSwKJFM6NX0KTC5JQy5wcm90b3R5cGU9ewokMTpmdW5jdGlvbihhKXt2YXIg
+dD1KLnFGKHUuaC5hKGEpKSxzPXQuJHRpCnMuQygifigxKSIpLmEoTC5IMCgpKQp1Lk0uYShudWxsKQpX
+LkpFKHQuYSx0LmIsTC5IMCgpLCExLHMuYyl9LAokUzo2fQpMLkwxLnByb3RvdHlwZT17CiQxOmZ1bmN0
+aW9uKGEpe3ZhciB0CnUuci5hKGEpCnQ9YS5zdGF0dXMKaWYodD09PTIwMClyZXR1cm4gYQplbHNlIHRo
+cm93IEguYigiUmVxdWVzdCBmYWlsZWQ7IHN0YXR1cyBvZiAiK0guZCh0KSl9LAokUzo0Mn0KTC5uVC5w
+cm90b3R5cGU9ewokMDpmdW5jdGlvbigpe0wuRnIodGhpcy5hLmEsdGhpcy5iLHRoaXMuYyl9LAokUzow
+fQpMLkJaLnByb3RvdHlwZT17CiQwOmZ1bmN0aW9uKCl7TC5Gcih0aGlzLmEuYSxudWxsLG51bGwpfSwK
+JFM6MH0KTC5HSC5wcm90b3R5cGU9ewokMTpmdW5jdGlvbihhKXt1LmguYShhKQokLnpCKCkudG9TdHJp
+bmcKdS52LmEoJC5vdygpLnEoMCwiaGxqcyIpKS5WNygiaGlnaGxpZ2h0QmxvY2siLFthXSl9LAokUzo2
+fQpMLkRULnByb3RvdHlwZT17CiQxOmZ1bmN0aW9uKGEpe3ZhciB0CnUuci5hKGEpCnQ9YS5zdGF0dXMK
+aWYodD09PTIwMCl7TC5UMShVLnl1KEMuQ3QucFcoMCxhLnJlc3BvbnNlVGV4dCxudWxsKSkpCkwuRnIo
+dGhpcy5hLHRoaXMuYix0aGlzLmMpCkwueVgoIi5lZGl0LXBhbmVsIC5wYW5lbC1jb250ZW50IiwhMSl9
+ZWxzZSB3aW5kb3cuYWxlcnQoIlJlcXVlc3QgZmFpbGVkOyBzdGF0dXMgb2YgIitILmQodCkpfSwKJFM6
+N30KTC5lSC5wcm90b3R5cGU9ewokMjpmdW5jdGlvbihhLGIpe0wucUooImxvYWRSZWdpb25FeHBsYW5h
+dGlvbjogIitILmQoYSksYikKd2luZG93LmFsZXJ0KCJDb3VsZCBub3QgbG9hZCAiK0guZCh0aGlzLmEp
+KyIgKCIrSC5kKGEpKyIpLiIpfSwKJEM6IiQyIiwKJFI6MiwKJFM6MX0KTC56RC5wcm90b3R5cGU9ewok
+MTpmdW5jdGlvbihhKXt2YXIgdCxzLHI9dGhpcwp1LnIuYShhKQp0PWEuc3RhdHVzCmlmKHQ9PT0yMDAp
+e3M9ci5hCkwuQkUocyxCLllmKHUuYi5hKEMuQ3QucFcoMCxhLnJlc3BvbnNlVGV4dCxudWxsKSkpLHIu
+YikKdD1yLmMKTC5mRyh0LHIuZCkKTC5CWChDLnhCLnRnKHMsIj8iKT9DLnhCLncocywwLEMueEIuT1ko
+cywiPyIpKTpzLHQpCnQ9ci5lCmlmKHQhPW51bGwpdC4kMCgpfWVsc2Ugd2luZG93LmFsZXJ0KCJSZXF1
+ZXN0IGZhaWxlZDsgc3RhdHVzIG9mICIrSC5kKHQpKX0sCiRTOjd9CkwuT0UucHJvdG90eXBlPXsKJDI6
+ZnVuY3Rpb24oYSxiKXtMLnFKKCJsb2FkRmlsZTogIitILmQoYSksYikKd2luZG93LmFsZXJ0KCJDb3Vs
+ZCBub3QgbG9hZCAiK3RoaXMuYSsiICgiK0guZChhKSsiKS4iKX0sCiRDOiIkMiIsCiRSOjIsCiRTOjF9
+CkwuVFcucHJvdG90eXBlPXsKJDE6ZnVuY3Rpb24oYSl7dmFyIHQscyxyCnUuci5hKGEpCnQ9YS5zdGF0
+dXMKaWYodD09PTIwMCl7cz1DLkN0LnBXKDAsYS5yZXNwb25zZVRleHQsbnVsbCkKcj1kb2N1bWVudC5x
+dWVyeVNlbGVjdG9yKCIubmF2LXRyZWUiKQpKLmw1KHIsIiIpCkwudFgocixMLm1LKHMpKX1lbHNlIHdp
+bmRvdy5hbGVydCgiUmVxdWVzdCBmYWlsZWQ7IHN0YXR1cyBvZiAiK0guZCh0KSl9LAokUzo3fQpMLnhy
+LnByb3RvdHlwZT17CiQyOmZ1bmN0aW9uKGEsYil7TC5xSigibG9hZE5hdmlnYXRpb25UcmVlOiAiK0gu
+ZChhKSxiKQp3aW5kb3cuYWxlcnQoIkNvdWxkIG5vdCBsb2FkICIrdGhpcy5hKyIgKCIrSC5kKGEpKyIp
+LiIpfSwKJEM6IiQyIiwKJFI6MiwKJFM6MX0KTC5FRS5wcm90b3R5cGU9ewokMTpmdW5jdGlvbihhKXt2
+YXIgdCxzCnUuVi5hKGEpCnQ9dGhpcy5hCnM9dGhpcy5iCkwuYWYod2luZG93LmxvY2F0aW9uLnBhdGhu
+YW1lLHQscywhMCxuZXcgTC5RTCh0LHMpKQpMLmhYKHRoaXMuYyx0LHMpfSwKJFM6NX0KTC5RTC5wcm90
+b3R5cGU9ewokMDpmdW5jdGlvbigpe0wuRnIod2luZG93LmxvY2F0aW9uLnBhdGhuYW1lLHRoaXMuYSx0
+aGlzLmIpfSwKJFM6MH0KTC5WUy5wcm90b3R5cGU9ewokMTpmdW5jdGlvbihhKXt2YXIgdCxzPSJzZWxl
+Y3RlZC1maWxlIgp1LmguYShhKQphLnRvU3RyaW5nCnQ9Si5SRShhKQppZihhLmdldEF0dHJpYnV0ZSgi
+ZGF0YS0iK25ldyBXLlN5KG5ldyBXLmk3KGEpKS5PKCJuYW1lIikpPT09dGhpcy5hLmEpdC5nRChhKS5p
+KDAscykKZWxzZSB0LmdEKGEpLlIoMCxzKX0sCiRTOjZ9CkwuVEQucHJvdG90eXBlPXsKJDE6ZnVuY3Rp
+b24oYSl7cmV0dXJuIEwudDIodS5WLmEoYSksITAsbnVsbCl9LAokUzoxOH0KTC5YQS5wcm90b3R5cGU9
+ewpFYjpmdW5jdGlvbihhLGIsYyl7cmV0dXJuITB9LAppMDpmdW5jdGlvbihhKXtyZXR1cm4hMH0sCiRp
+a0Y6MX0KTC5aWi5wcm90b3R5cGU9e30KTC5POS5wcm90b3R5cGU9ewpaOmZ1bmN0aW9uKGEpe3JldHVy
+biB0aGlzLmJ9fQpNLmxJLnByb3RvdHlwZT17CldPOmZ1bmN0aW9uKGEsYil7dmFyIHQscz1udWxsCk0u
+WUYoImFic29sdXRlIixILlZNKFtiLG51bGwsbnVsbCxudWxsLG51bGwsbnVsbCxudWxsXSx1LnMpKQp0
+PXRoaXMuYQp0PXQuWXIoYik+MCYmIXQuaEsoYikKaWYodClyZXR1cm4gYgp0PUQuUlgoKQpyZXR1cm4g
+dGhpcy5xNygwLHQsYixzLHMscyxzLHMscyl9LAp0TTpmdW5jdGlvbihhKXt2YXIgdCxzLHI9WC5DTChh
+LHRoaXMuYSkKci5JVigpCnQ9ci5kCnM9dC5sZW5ndGgKaWYocz09PTApe3Q9ci5iCnJldHVybiB0PT1u
+dWxsPyIuIjp0fWlmKHM9PT0xKXt0PXIuYgpyZXR1cm4gdD09bnVsbD8iLiI6dH1pZigwPj1zKXJldHVy
+biBILmsodCwtMSkKdC5wb3AoKQpDLk5tLm12KHIuZSkKci5JVigpCnJldHVybiByLlooMCl9LApxNzpm
+dW5jdGlvbihhLGIsYyxkLGUsZixnLGgsaSl7dmFyIHQ9SC5WTShbYixjLGQsZSxmLGcsaCxpXSx1LnMp
+Ck0uWUYoImpvaW4iLHQpCnJldHVybiB0aGlzLklQKG5ldyBILlU1KHQsdS5iQi5hKG5ldyBNLk1pKCkp
+LHUuY2MpKX0sCklQOmZ1bmN0aW9uKGEpe3ZhciB0LHMscixxLHAsbyxuLG0sbAp1LlguYShhKQpmb3Io
+dD1hLiR0aSxzPXQuQygiYTIoY1guRSkiKS5hKG5ldyBNLnE3KCkpLHI9YS5na3ooYSksdD1uZXcgSC52
+RyhyLHMsdC5DKCJ2RzxjWC5FPiIpKSxzPXRoaXMuYSxxPSExLHA9ITEsbz0iIjt0LkYoKTspe249ci5n
+bCgpCmlmKHMuaEsobikmJnApe209WC5DTChuLHMpCmw9by5jaGFyQ29kZUF0KDApPT0wP286bwpvPUMu
+eEIudyhsLDAscy5TcChsLCEwKSkKbS5iPW8KaWYocy5kcyhvKSlDLk5tLlkobS5lLDAscy5nbUkoKSkK
+bz1tLlooMCl9ZWxzZSBpZihzLllyKG4pPjApe3A9IXMuaEsobikKbz1ILmQobil9ZWxzZXtpZighKG4u
+bGVuZ3RoPjAmJnMuVWQoblswXSkpKWlmKHEpbys9cy5nbUkoKQpvKz1ILmQobil9cT1zLmRzKG4pfXJl
+dHVybiBvLmNoYXJDb2RlQXQoMCk9PTA/bzpvfSwKbzU6ZnVuY3Rpb24oYSl7dmFyIHQKaWYoIXRoaXMu
+eTMoYSkpcmV0dXJuIGEKdD1YLkNMKGEsdGhpcy5hKQp0LnJSKCkKcmV0dXJuIHQuWigwKX0sCnkzOmZ1
+bmN0aW9uKGEpe3ZhciB0LHMscixxLHAsbyxuLG0sbCxrCmEudG9TdHJpbmcKdD10aGlzLmEKcz10Llly
+KGEpCmlmKHMhPT0wKXtpZih0PT09JC5LaygpKWZvcihyPTA7cjxzOysrcilpZihDLnhCLlcoYSxyKT09
+PTQ3KXJldHVybiEwCnE9cwpwPTQ3fWVsc2V7cT0wCnA9bnVsbH1mb3Iobz1uZXcgSC5xaihhKS5hLG49
+by5sZW5ndGgscj1xLG09bnVsbDtyPG47KytyLG09cCxwPWwpe2w9Qy54Qi5tKG8scikKaWYodC5yNChs
+KSl7aWYodD09PSQuS2soKSYmbD09PTQ3KXJldHVybiEwCmlmKHAhPW51bGwmJnQucjQocCkpcmV0dXJu
+ITAKaWYocD09PTQ2KWs9bT09bnVsbHx8bT09PTQ2fHx0LnI0KG0pCmVsc2Ugaz0hMQppZihrKXJldHVy
+biEwfX1pZihwPT1udWxsKXJldHVybiEwCmlmKHQucjQocCkpcmV0dXJuITAKaWYocD09PTQ2KXQ9bT09
+bnVsbHx8dC5yNChtKXx8bT09PTQ2CmVsc2UgdD0hMQppZih0KXJldHVybiEwCnJldHVybiExfSwKSFA6
+ZnVuY3Rpb24oYSxiKXt2YXIgdCxzLHIscSxwLG89dGhpcyxuPSdVbmFibGUgdG8gZmluZCBhIHBhdGgg
+dG8gIicKYj1vLldPKDAsYikKdD1vLmEKaWYodC5ZcihiKTw9MCYmdC5ZcihhKT4wKXJldHVybiBvLm81
+KGEpCmlmKHQuWXIoYSk8PTB8fHQuaEsoYSkpYT1vLldPKDAsYSkKaWYodC5ZcihhKTw9MCYmdC5Zcihi
+KT4wKXRocm93IEguYihYLkk3KG4rSC5kKGEpKyciIGZyb20gIicrSC5kKGIpKyciLicpKQpzPVguQ0wo
+Yix0KQpzLnJSKCkKcj1YLkNMKGEsdCkKci5yUigpCnE9cy5kCmlmKHEubGVuZ3RoPjAmJkouUk0ocVsw
+XSwiLiIpKXJldHVybiByLlooMCkKcT1zLmIKcD1yLmIKaWYocSE9cClxPXE9PW51bGx8fHA9PW51bGx8
+fCF0Lk5jKHEscCkKZWxzZSBxPSExCmlmKHEpcmV0dXJuIHIuWigwKQp3aGlsZSghMCl7cT1zLmQKaWYo
+cS5sZW5ndGg+MCl7cD1yLmQKcT1wLmxlbmd0aD4wJiZ0Lk5jKHFbMF0scFswXSl9ZWxzZSBxPSExCmlm
+KCFxKWJyZWFrCkMuTm0uVzQocy5kLDApCkMuTm0uVzQocy5lLDEpCkMuTm0uVzQoci5kLDApCkMuTm0u
+VzQoci5lLDEpfXE9cy5kCmlmKHEubGVuZ3RoPjAmJkouUk0ocVswXSwiLi4iKSl0aHJvdyBILmIoWC5J
+NyhuK0guZChhKSsnIiBmcm9tICInK0guZChiKSsnIi4nKSkKcT11Lk4KQy5ObS5VRyhyLmQsMCxQLk84
+KHMuZC5sZW5ndGgsIi4uIixxKSkKQy5ObS5ZKHIuZSwwLCIiKQpDLk5tLlVHKHIuZSwxLFAuTzgocy5k
+Lmxlbmd0aCx0LmdtSSgpLHEpKQp0PXIuZApxPXQubGVuZ3RoCmlmKHE9PT0wKXJldHVybiIuIgppZihx
+PjEmJkouUk0oQy5ObS5ncloodCksIi4iKSl7dD1yLmQKaWYoMD49dC5sZW5ndGgpcmV0dXJuIEguayh0
+LC0xKQp0LnBvcCgpCnQ9ci5lCkMuTm0ubXYodCkKQy5ObS5tdih0KQpDLk5tLmkodCwiIil9ci5iPSIi
+CnIuSVYoKQpyZXR1cm4gci5aKDApfX0KTS5NaS5wcm90b3R5cGU9ewokMTpmdW5jdGlvbihhKXtyZXR1
+cm4gSC5jKGEpIT1udWxsfSwKJFM6OH0KTS5xNy5wcm90b3R5cGU9ewokMTpmdW5jdGlvbihhKXtyZXR1
+cm4gSC5jKGEpIT09IiJ9LAokUzo4fQpNLk5vLnByb3RvdHlwZT17CiQxOmZ1bmN0aW9uKGEpe0guYyhh
+KQpyZXR1cm4gYT09bnVsbD8ibnVsbCI6JyInK2ErJyInfSwKJFM6NH0KQi5MdS5wcm90b3R5cGU9ewp4
+WjpmdW5jdGlvbihhKXt2YXIgdCxzPXRoaXMuWXIoYSkKaWYocz4wKXJldHVybiBKLmxkKGEsMCxzKQpp
+Zih0aGlzLmhLKGEpKXtpZigwPj1hLmxlbmd0aClyZXR1cm4gSC5rKGEsMCkKdD1hWzBdfWVsc2UgdD1u
+dWxsCnJldHVybiB0fSwKTmM6ZnVuY3Rpb24oYSxiKXtyZXR1cm4gYT09Yn19ClguV0QucHJvdG90eXBl
+PXsKSVY6ZnVuY3Rpb24oKXt2YXIgdCxzLHI9dGhpcwp3aGlsZSghMCl7dD1yLmQKaWYoISh0Lmxlbmd0
+aCE9PTAmJkouUk0oQy5ObS5ncloodCksIiIpKSlicmVhawp0PXIuZAppZigwPj10Lmxlbmd0aClyZXR1
+cm4gSC5rKHQsLTEpCnQucG9wKCkKQy5ObS5tdihyLmUpfXQ9ci5lCnM9dC5sZW5ndGgKaWYocz4wKUMu
+Tm0uWSh0LHMtMSwiIil9LApyUjpmdW5jdGlvbigpe3ZhciB0LHMscixxLHAsbyxuLG09dGhpcyxsPUgu
+Vk0oW10sdS5zKQpmb3IodD1tLmQscz10Lmxlbmd0aCxyPTAscT0wO3E8dC5sZW5ndGg7dC5sZW5ndGg9
+PT1zfHwoMCxILmxrKSh0KSwrK3Epe3A9dFtxXQpvPUouaWEocCkKaWYoIShvLkROKHAsIi4iKXx8by5E
+TihwLCIiKSkpaWYoby5ETihwLCIuLiIpKWlmKGwubGVuZ3RoPjApbC5wb3AoKQplbHNlICsrcgplbHNl
+IEMuTm0uaShsLHApfWlmKG0uYj09bnVsbClDLk5tLlVHKGwsMCxQLk84KHIsIi4uIix1Lk4pKQppZihs
+Lmxlbmd0aD09PTAmJm0uYj09bnVsbClDLk5tLmkobCwiLiIpCm49UC5kSChsLmxlbmd0aCxuZXcgWC5x
+UihtKSwhMCx1Lk4pCnQ9bS5iCnQ9dCE9bnVsbCYmbC5sZW5ndGg+MCYmbS5hLmRzKHQpP20uYS5nbUko
+KToiIgpILnQ2KG4pLmMuYSh0KQppZighIW4uZml4ZWQkbGVuZ3RoKUgudmgoUC5MNCgiaW5zZXJ0Iikp
+Cm4uc3BsaWNlKDAsMCx0KQptLnNuSihsKQptLnNQaChuKQp0PW0uYgppZih0IT1udWxsJiZtLmE9PT0k
+LktrKCkpe3QudG9TdHJpbmcKbS5iPUgueXModCwiLyIsIlxcIil9bS5JVigpfSwKWjpmdW5jdGlvbihh
+KXt2YXIgdCxzLHI9dGhpcyxxPXIuYgpxPXEhPW51bGw/cToiIgpmb3IodD0wO3Q8ci5kLmxlbmd0aDsr
+K3Qpe3M9ci5lCmlmKHQ+PXMubGVuZ3RoKXJldHVybiBILmsocyx0KQpzPXErSC5kKHNbdF0pCnE9ci5k
+CmlmKHQ+PXEubGVuZ3RoKXJldHVybiBILmsocSx0KQpxPXMrSC5kKHFbdF0pfXErPUguZChDLk5tLmdy
+WihyLmUpKQpyZXR1cm4gcS5jaGFyQ29kZUF0KDApPT0wP3E6cX0sCnNuSjpmdW5jdGlvbihhKXt0aGlz
+LmQ9dS5hLmEoYSl9LApzUGg6ZnVuY3Rpb24oYSl7dGhpcy5lPXUuYS5hKGEpfX0KWC5xUi5wcm90b3R5
+cGU9ewokMTpmdW5jdGlvbihhKXtyZXR1cm4gdGhpcy5hLmEuZ21JKCl9LAokUzo0NH0KWC5kdi5wcm90
+b3R5cGU9ewpaOmZ1bmN0aW9uKGEpe3JldHVybiJQYXRoRXhjZXB0aW9uOiAiK3RoaXMuYX19Ck8uekwu
+cHJvdG90eXBlPXsKWjpmdW5jdGlvbihhKXtyZXR1cm4gdGhpcy5nb2ModGhpcyl9fQpFLk9GLnByb3Rv
+dHlwZT17ClVkOmZ1bmN0aW9uKGEpe3JldHVybiBDLnhCLnRnKGEsIi8iKX0sCnI0OmZ1bmN0aW9uKGEp
+e3JldHVybiBhPT09NDd9LApkczpmdW5jdGlvbihhKXt2YXIgdD1hLmxlbmd0aApyZXR1cm4gdCE9PTAm
+JkMueEIubShhLHQtMSkhPT00N30sClNwOmZ1bmN0aW9uKGEsYil7aWYoYS5sZW5ndGghPT0wJiZDLnhC
+LlcoYSwwKT09PTQ3KXJldHVybiAxCnJldHVybiAwfSwKWXI6ZnVuY3Rpb24oYSl7cmV0dXJuIHRoaXMu
+U3AoYSwhMSl9LApoSzpmdW5jdGlvbihhKXtyZXR1cm4hMX0sCmdvYzpmdW5jdGlvbigpe3JldHVybiJw
+b3NpeCJ9LApnbUk6ZnVuY3Rpb24oKXtyZXR1cm4iLyJ9fQpGLnJ1LnByb3RvdHlwZT17ClVkOmZ1bmN0
+aW9uKGEpe3JldHVybiBDLnhCLnRnKGEsIi8iKX0sCnI0OmZ1bmN0aW9uKGEpe3JldHVybiBhPT09NDd9
+LApkczpmdW5jdGlvbihhKXt2YXIgdD1hLmxlbmd0aAppZih0PT09MClyZXR1cm4hMQppZihDLnhCLm0o
+YSx0LTEpIT09NDcpcmV0dXJuITAKcmV0dXJuIEMueEIuVGMoYSwiOi8vIikmJnRoaXMuWXIoYSk9PT10
+fSwKU3A6ZnVuY3Rpb24oYSxiKXt2YXIgdCxzLHIscSxwPWEubGVuZ3RoCmlmKHA9PT0wKXJldHVybiAw
+CmlmKEMueEIuVyhhLDApPT09NDcpcmV0dXJuIDEKZm9yKHQ9MDt0PHA7Kyt0KXtzPUMueEIuVyhhLHQp
+CmlmKHM9PT00NylyZXR1cm4gMAppZihzPT09NTgpe2lmKHQ9PT0wKXJldHVybiAwCnI9Qy54Qi5YVShh
+LCIvIixDLnhCLlFpKGEsIi8vIix0KzEpP3QrMzp0KQppZihyPD0wKXJldHVybiBwCmlmKCFifHxwPHIr
+MylyZXR1cm4gcgppZighQy54Qi5uKGEsImZpbGU6Ly8iKSlyZXR1cm4gcgppZighQi5ZdShhLHIrMSkp
+cmV0dXJuIHIKcT1yKzMKcmV0dXJuIHA9PT1xP3E6cis0fX1yZXR1cm4gMH0sCllyOmZ1bmN0aW9uKGEp
+e3JldHVybiB0aGlzLlNwKGEsITEpfSwKaEs6ZnVuY3Rpb24oYSl7cmV0dXJuIGEubGVuZ3RoIT09MCYm
+Qy54Qi5XKGEsMCk9PT00N30sCmdvYzpmdW5jdGlvbigpe3JldHVybiJ1cmwifSwKZ21JOmZ1bmN0aW9u
+KCl7cmV0dXJuIi8ifX0KTC5JVi5wcm90b3R5cGU9ewpVZDpmdW5jdGlvbihhKXtyZXR1cm4gQy54Qi50
+ZyhhLCIvIil9LApyNDpmdW5jdGlvbihhKXtyZXR1cm4gYT09PTQ3fHxhPT09OTJ9LApkczpmdW5jdGlv
+bihhKXt2YXIgdD1hLmxlbmd0aAppZih0PT09MClyZXR1cm4hMQp0PUMueEIubShhLHQtMSkKcmV0dXJu
+ISh0PT09NDd8fHQ9PT05Mil9LApTcDpmdW5jdGlvbihhLGIpe3ZhciB0LHMscj1hLmxlbmd0aAppZihy
+PT09MClyZXR1cm4gMAp0PUMueEIuVyhhLDApCmlmKHQ9PT00NylyZXR1cm4gMQppZih0PT09OTIpe2lm
+KHI8Mnx8Qy54Qi5XKGEsMSkhPT05MilyZXR1cm4gMQpzPUMueEIuWFUoYSwiXFwiLDIpCmlmKHM+MCl7
+cz1DLnhCLlhVKGEsIlxcIixzKzEpCmlmKHM+MClyZXR1cm4gc31yZXR1cm4gcn1pZihyPDMpcmV0dXJu
+IDAKaWYoIUIuT1ModCkpcmV0dXJuIDAKaWYoQy54Qi5XKGEsMSkhPT01OClyZXR1cm4gMApyPUMueEIu
+VyhhLDIpCmlmKCEocj09PTQ3fHxyPT09OTIpKXJldHVybiAwCnJldHVybiAzfSwKWXI6ZnVuY3Rpb24o
+YSl7cmV0dXJuIHRoaXMuU3AoYSwhMSl9LApoSzpmdW5jdGlvbihhKXtyZXR1cm4gdGhpcy5ZcihhKT09
+PTF9LApPdDpmdW5jdGlvbihhLGIpe3ZhciB0CmlmKGE9PT1iKXJldHVybiEwCmlmKGE9PT00NylyZXR1
+cm4gYj09PTkyCmlmKGE9PT05MilyZXR1cm4gYj09PTQ3CmlmKChhXmIpIT09MzIpcmV0dXJuITEKdD1h
+fDMyCnJldHVybiB0Pj05NyYmdDw9MTIyfSwKTmM6ZnVuY3Rpb24oYSxiKXt2YXIgdCxzLHIKaWYoYT09
+YilyZXR1cm4hMAp0PWEubGVuZ3RoCmlmKHQhPT1iLmxlbmd0aClyZXR1cm4hMQpmb3Iocz1KLnJZKGIp
+LHI9MDtyPHQ7KytyKWlmKCF0aGlzLk90KEMueEIuVyhhLHIpLHMuVyhiLHIpKSlyZXR1cm4hMQpyZXR1
+cm4hMH0sCmdvYzpmdW5jdGlvbigpe3JldHVybiJ3aW5kb3dzIn0sCmdtSTpmdW5jdGlvbigpe3JldHVy
+biJcXCJ9fTsoZnVuY3Rpb24gYWxpYXNlcygpe3ZhciB0PUoudkIucHJvdG90eXBlCnQuVT10LloKdC5T
+aj10LmU3CnQ9Si5NRi5wcm90b3R5cGUKdC50PXQuWgp0PVAuY1gucHJvdG90eXBlCnQuR0c9dC5ldgp0
+PVAuTWgucHJvdG90eXBlCnQueGI9dC5aCnQ9Vy5jdi5wcm90b3R5cGUKdC5EVz10LnI2CnQ9Vy5tNi5w
cm90b3R5cGUKdC5qRj10LkViCnQ9UC5FNC5wcm90b3R5cGUKdC5Vcj10LnEKdC5lND10Lll9KSgpOyhm
dW5jdGlvbiBpbnN0YWxsVGVhck9mZnMoKXt2YXIgdD1odW5rSGVscGVycy5fc3RhdGljXzEscz1odW5r
SGVscGVycy5fc3RhdGljXzAscj1odW5rSGVscGVycy5pbnN0YWxsSW5zdGFuY2VUZWFyT2ZmLHE9aHVu
a0hlbHBlcnMuaW5zdGFsbFN0YXRpY1RlYXJPZmYscD1odW5rSGVscGVycy5faW5zdGFuY2VfMXUKdChQ
-LCJFWCIsIlpWIiw5KQp0KFAsInl0Iiwib0EiLDkpCnQoUCwicVciLCJCeiIsOSkKcyhQLCJVSSIsImVO
-IiwyKQpyKFAuUGYucHJvdG90eXBlLCJnWUoiLDAsMSxudWxsLFsiJDIiLCIkMSJdLFsidzAiLCJwbSJd
-LDQ0LDApCnQoUCwiUEgiLCJNdCIsNSkKcShXLCJwUyIsNCxudWxsLFsiJDQiXSxbInlXIl0sMTUsMCkK
-cShXLCJWNCIsNCxudWxsLFsiJDQiXSxbIlFXIl0sMTUsMCkKcChQLkFzLnByb3RvdHlwZSwiZ3VNIiwi
-VCIsNSkKdChQLCJpRyIsIndZIiw0KQp0KFAsIncwIiwiTDciLDMwKQp0KEwsIkgwIiwidW0iLDE2KX0p
-KCk7KGZ1bmN0aW9uIGluaGVyaXRhbmNlKCl7dmFyIHQ9aHVua0hlbHBlcnMubWl4aW4scz1odW5rSGVs
-cGVycy5pbmhlcml0LHI9aHVua0hlbHBlcnMuaW5oZXJpdE1hbnkKcyhQLmssbnVsbCkKcihQLmssW0gu
-ZW8sSi52QixKLm0xLFAublksUC5jWCxILmE3LFAuQW4sSC5TVSxILlJlLEgud3YsUC5QbixILldVLEgu
-TEksSC5UcCxILmY5LFAuWFMsSC5icSxILlhPLFAuWWssSC5kYixILk42LEguVlIsSC5FSyxILlBiLEgu
-dFEsSC5TZCxILkpjLEguRyxQLlczLFAuaWgsUC5QZixQLkZlLFAudnMsUC5PTSxQLnFoLFAuTU8sUC5r
-VCxQLnhJLFAuQ3csUC5tMCxQLlh2LFAuYm4sUC5sbSxQLmxELFAuS1AsUC5sZixQLldZLFAuVWssUC5S
-dyxQLmJ6LFAuYTIsUC5pUCxQLkZLLFAuazUsUC5LWSxQLkNELFAuYUUsUC5FSCxQLnpNLFAuWjAsUC5j
-OCxQLk9kLFAuaWIsUC5HeixQLnFVLFAuUm4sUC5HRCxQLkRuLFAuUEUsUC5VZixXLmlkLFcuRmssVy5K
-USxXLkdtLFcudkQsVy5tNixXLk93LFcuVzksVy5kVyxXLkZiLFcua0YsVy5tayxXLktvLFAuaUosUC5F
-NCxQLm42LFUuZDIsVS5TZSxVLnVGLFUuTWwsVS55RCxVLndiLEIuajgsQi5xcCxULkdWLEwuWEEsTC5a
-WixMLnk4LE0ubEksTy56TCxYLldELFguZHZdKQpyKEoudkIsW0oueUUsSi5ZRSxKLk1GLEouamQsSi5x
-SSxKLkRyLEguRVQsVy5EMCxXLkF6LFcuTGUsVy5OaCxXLklCLFcubjcsVy5lYSxXLmJyLFcuU2csVy51
-OCxXLks3LFcuWFcsUC5oRl0pCnIoSi5NRixbSi5pQyxKLmtkLEouYzVdKQpzKEouUG8sSi5qZCkKcihK
-LnFJLFtKLnVyLEouVkFdKQpzKFAuTFUsUC5uWSkKcihQLkxVLFtILlhDLFcud3osVy5lN10pCnMoSC5x
-aixILlhDKQpyKFAuY1gsW0guYlEsSC5VNSxQLm1XLEgudW5dKQpyKEguYlEsW0guYUwsSC5pNSxQLnh1
-XSkKcihILmFMLFtILm5ILEguQTgsUC5pOF0pCnMoSC5TTyxQLkFuKQpzKFAuUlUsUC5QbikKcyhQLkdq
-LFAuUlUpCnMoSC5QRCxQLkdqKQpzKEguTFAsSC5XVSkKcihILlRwLFtILkNqLEguQW0sSC5sYyxILmRD
-LEgud04sSC5WWCxQLnRoLFAuaGEsUC5WcyxQLkZ0LFAueUgsUC5XTSxQLlNYLFAuR3MsUC5kYSxQLm9R
+LCJFWCIsIlpWIiwxMCkKdChQLCJ5dCIsIm9BIiwxMCkKdChQLCJxVyIsIkJ6IiwxMCkKcyhQLCJWOSIs
+ImVOIiwyKQpyKFAuUGYucHJvdG90eXBlLCJnWUoiLDAsMSxudWxsLFsiJDIiLCIkMSJdLFsidzAiLCJw
+bSJdLDI5LDApCnQoUCwiUEgiLCJNdCIsNCkKcShXLCJwUyIsNCxudWxsLFsiJDQiXSxbInlXIl0sMTEs
+MCkKcShXLCJWNCIsNCxudWxsLFsiJDQiXSxbIlFXIl0sMTEsMCkKcChQLkFzLnByb3RvdHlwZSwiZ3VN
+IiwiVCIsNCkKdChQLCJpRyIsIndZIiwzKQp0KFAsIncwIiwiTDciLDMxKQp0KEwsIkgwIiwidW0iLDE4
+KX0pKCk7KGZ1bmN0aW9uIGluaGVyaXRhbmNlKCl7dmFyIHQ9aHVua0hlbHBlcnMubWl4aW4scz1odW5r
+SGVscGVycy5pbmhlcml0LHI9aHVua0hlbHBlcnMuaW5oZXJpdE1hbnkKcyhQLk1oLG51bGwpCnIoUC5N
+aCxbSC5GSyxKLnZCLEoubTEsUC5uWSxQLmNYLEguYTcsUC5BbixILlNVLEguUmUsSC53dixQLlBuLEgu
+V1UsSC5MSSxILlRwLEguZjksUC5YUyxILmJxLEguWE8sUC5ZayxILmRiLEguTjYsSC5WUixILkVLLEgu
+UGIsSC50USxILlNkLEguSmMsSC5FVCxQLlczLFAuaWgsUC5GeSxQLkdWLFAuYjgsUC5QZixQLkZlLFAu
+dnMsUC5PTSxQLnFoLFAuTU8sUC5rVCxQLnhJLFAuT0gsUC5tMCxQLlh2LFAuYm4sUC5sbSxQLmxELFAu
+S1AsUC5NYSxQLlRDLFAuVWssUC5SdyxQLmJ6LFAuYTIsUC5pUCxQLmxmLFAuazUsUC5LWSxQLkNELFAu
+YUUsUC5FSCxQLnpNLFAuWjAsUC5OMyxQLmM4LFAuT2QsUC5pYixQLkd6LFAuWmQsUC5xVSxQLlJuLFAu
+R0QsUC5EbixQLlBFLFAuVWYsVy5pZCxXLkZrLFcuSlEsVy5HbSxXLnZELFcubTYsVy5PdyxXLlc5LFcu
+ZFcsVy5GYixXLmtGLFcubWssVy5LbyxQLmlKLFAuRTQsUC5uNixVLmQyLFUuU2UsVS51RixVLk1sLFUu
+eUQsVS53YixCLmo4LEIucXAsVC5tUSxMLlhBLEwuWlosTC5POSxNLmxJLE8uekwsWC5XRCxYLmR2XSkK
+cihKLnZCLFtKLnlFLEouWUUsSi5NRixKLmpkLEoucUksSi5EcixILnBGLFcuRDAsVy5BeixXLkxlLFcu
+TmgsVy5JQixXLm43LFcuZWEsVy5icixXLlNnLFcudTgsVy5LNyxXLlhXLFAuaEZdKQpyKEouTUYsW0ou
+aUMsSi5rZCxKLmM1XSkKcyhKLlBvLEouamQpCnIoSi5xSSxbSi51cixKLlZBXSkKcyhQLkxVLFAublkp
+CnIoUC5MVSxbSC53MixXLnd6LFcuZTddKQpzKEgucWosSC53MikKcihQLmNYLFtILmJRLEguaTEsSC5V
+NSxILlhSLFAubVcsSC5ORl0pCnIoSC5iUSxbSC5hTCxILmk1LFAueHVdKQpyKEguYUwsW0gubkgsSC5s
+SixQLmk4XSkKcyhILnh5LEguaTEpCnIoUC5BbixbSC5NSCxILnZHXSkKcyhQLlJVLFAuUG4pCnMoUC5H
+aixQLlJVKQpzKEguUEQsUC5HaikKcyhILkxQLEguV1UpCnIoSC5UcCxbSC5DaixILkFtLEgubGMsSC5y
+LEguZEMsSC53TixQLnRoLFAuaGEsUC5WcyxQLkZ0LFAueUgsUC5XTSxQLlNYLFAuR3MsUC5kYSxQLm9R
LFAucFYsUC5VNyxQLnZyLFAuckgsUC5LRixQLlpMLFAuUlQsUC5qWixQLnJxLFAuUlcsUC5CNSxQLlBJ
-LFAucEssUC5oaixQLlZwLFAuT1IsUC5yYSxQLldGLFAubjEsUC5jUyxQLlZDLFAudHAsUC5lMSxQLk5Z
-LFAuUlosUC5NRSxQLnk1LFAucTMsUC55SSxQLmM2LFAucWQsVy5DdixXLmJVLFcuaEgsVy5LUyxXLkEz
-LFcudk4sVy5VdixXLkVnLFcuRW8sVy5XayxXLklBLFcuZm0sUC5sUixQLmpnLFAuR0UsUC5ONyxQLnVR
-LFAuUEMsUC5ZbSxQLk56LFAubnAsUC5VdCxMLmUsTC5WVyxMLm9aLEwuanIsTC5xbCxMLkwsTC5XeCxM
-LkFPLEwuZE4sTC5IbyxMLnh6LEwuSUMsTC5MMSxMLm5ULEwuQlosTC5HSCxMLkRULEwuZUgsTC56RCxM
-Lk9FLEwuVFcsTC54cixMLkVFLEwuUUwsTC5WUyxMLlRELE0uTWksTS5xNyxNLk5vLFgucVJdKQpyKFAu
-WFMsW0guVzAsSC5heixILnZWLEguRXEsUC5DNixILnU5LFAubixQLnUsUC5tcCxQLnViLFAuZHMsUC5s
-aixQLlVWLFAuY10pCnIoSC5sYyxbSC56eCxILnJUXSkKcyhILmtZLFAuQzYpCnMoUC5pbCxQLllrKQpy
-KFAuaWwsW0guTjUsUC51dyxXLmNmLFcuU3ldKQpzKEguS1csUC5tVykKcyhILmIwLEguRVQpCnIoSC5i
-MCxbSC5SRyxILldCXSkKcyhILlZQLEguUkcpCnMoSC5EZyxILlZQKQpzKEguWkcsSC5XQikKcyhILlBn
-LEguWkcpCnIoSC5QZyxbSC54aixILmRFLEguWkEsSC53ZixILlBxLEguZUUsSC5WNl0pCnIoSC51OSxb
-SC5oeixILmlNXSkKcyhQLlpmLFAuUGYpCnMoUC5KaSxQLm0wKQpzKFAuYjYsUC5YdikKcyhQLlZqLFAu
-V1kpCnIoUC5VayxbUC5DVixQLlppLFAuYnldKQpzKFAud0ksUC5rVCkKcihQLndJLFtQLlU4LFAuTXgs
-UC5FMyxQLkdZXSkKcyhQLnU1LFAuWmkpCnIoUC5GSyxbUC5DUCxQLktOXSkKcihQLnUsW1AuYkosUC5l
-WV0pCnMoUC5xZSxQLkRuKQpyKFcuRDAsW1cudUgsVy53YSxXLks1LFcuQ21dKQpyKFcudUgsW1cuY3Ys
-Vy5ueCxXLlFGLFcuQ1FdKQpyKFcuY3YsW1cucUUsUC5kNV0pCnIoVy5xRSxbVy5HaCxXLmZZLFcubkIs
-Vy5RUCxXLmg0LFcuU04sVy5scCxXLlRiLFcuSXYsVy5CVCxXLnlZXSkKcyhXLm9KLFcuTGUpCnMoVy5U
-NSxXLkF6KQpzKFcuVmIsVy5RRikKcyhXLk83LFcud2EpCnIoVy5lYSxbVy53NixXLmV3XSkKcyhXLkFq
-LFcudzYpCnMoVy5yQixXLks3KQpzKFcuQkgsVy5yQikKcyhXLnc0LFcuSUIpCnMoVy5vYSxXLlhXKQpz
-KFcucmgsVy5vYSkKcyhXLmk3LFcuY2YpCnMoUC5BcyxQLlZqKQpyKFAuQXMsW1cuSTQsUC5LZV0pCnMo
-Vy5STyxQLnFoKQpzKFcuQ3EsVy5STykKcyhXLnhDLFAuTU8pCnMoVy5jdCxXLm02KQpzKFAuQmYsUC5p
-SikKcihQLkU0LFtQLnI3LFAuY29dKQpzKFAuVHosUC5jbykKcyhQLm5kLFAuZDUpCnMoQi5MdSxPLnpM
-KQpyKEIuTHUsW0UuT0YsRi5ydSxMLklWXSkKdChILlhDLEguUmUpCnQoSC5SRyxQLmxEKQp0KEguVlAs
-SC5TVSkKdChILldCLFAubEQpCnQoSC5aRyxILlNVKQp0KFAublksUC5sRCkKdChQLldZLFAubGYpCnQo
-UC5SVSxQLktQKQp0KFcuTGUsVy5pZCkKdChXLks3LFAubEQpCnQoVy5yQixXLkdtKQp0KFcuWFcsUC5s
-RCkKdChXLm9hLFcuR20pCnQoUC5jbyxQLmxEKX0pKCkKdmFyIHY9e3R5cGVVbml2ZXJzZTp7ZUM6bmV3
-IE1hcCgpLHRSOnt9LGVUOnt9LHRQVjp7fSxzRUE6W119LG1hbmdsZWRHbG9iYWxOYW1lczp7S046Imlu
-dCIsQ1A6ImRvdWJsZSIsRks6Im51bSIscVU6IlN0cmluZyIsYTI6ImJvb2wiLGM4OiJOdWxsIix6TToi
-TGlzdCJ9LG1hbmdsZWROYW1lczp7fSxnZXRUeXBlRnJvbU5hbWU6Z2V0R2xvYmFsRnJvbU5hbWUsbWV0
-YWRhdGE6W10sdHlwZXM6WyJjOCgpIiwiYzgoQCxAKSIsIn4oKSIsImM4KGN2KSIsIkAoQCkiLCJxVShx
-VSkiLCJjOChBaikiLCJjOChPNykiLCJhMihxVSkiLCJ+KH4oKSkiLCJjOChxVSxxVSkiLCJjOChxVSki
-LCJjOChxVSxAKSIsImM4KGVhKSIsIn4oeHU8cVU+KSIsImEyKGN2LHFVLHFVLEpRKSIsIn4oQWopIiwi
-YTIoa0YpIiwiYzgoQCkiLCJLTihLTixLTikiLCJ+KEApIiwiYzgofigpKSIsIn4ocVUscVUpIiwiYzgo
-S04sQCkiLCJuNihALEApIiwiYTIodUgpIiwifihxVVtAXSkiLCJjOChldykiLCJAKGVhKSIsIn4ocVUs
-S04pIiwiayhAKSIsIn4odUgsdUgpIiwiYzgoR0QsQCkiLCJjOChALEd6KSIsInI3KEApIiwiVHo8QD4o
-QCkiLCJFNChAKSIsInZzPEA+KEApIiwiQChALHFVKSIsIlowPHFVLHFVPihaMDxxVSxxVT4scVUpIiwi
-QChxVSkiLCJPNyhPNykiLCJjOChAW0d6XSkiLCJxVShLTikiLCJ+KGtbR3pdKSIsImEyKHh1PHFVPiki
-LCJuNihLTikiXSxpbnRlcmNlcHRvcnNCeVRhZzpudWxsLGxlYWZUYWdzOm51bGx9CkgueGIodi50eXBl
-VW5pdmVyc2UsSlNPTi5wYXJzZSgneyJjNSI6Ik1GIiwiaUMiOiJNRiIsImtkIjoiTUYiLCJyeCI6ImVh
-IiwiZTUiOiJlYSIsIlkwIjoiZDUiLCJXdCI6ImQ1IiwidjAiOiJldyIsIk1yIjoicUUiLCJlTCI6InFF
-IiwiSTAiOiJ1SCIsImhzIjoidUgiLCJYZyI6IlFGIiwieWMiOiJBaiIsInk0IjoidzYiLCJhUCI6IkNt
-IiwieGMiOiJueCIsImtKIjoibngiLCJ6VSI6IkRnIiwiZGYiOiJFVCIsInlFIjp7ImEyIjpbXX0sIllF
-Ijp7ImM4IjpbXX0sIk1GIjp7InZtIjpbXSwiRUgiOltdfSwiamQiOnsiek0iOlsiMSJdLCJjWCI6WyIx
-Il19LCJQbyI6eyJqZCI6WyIxIl0sInpNIjpbIjEiXSwiY1giOlsiMSJdfSwibTEiOnsiQW4iOlsiMSJd
-fSwicUkiOnsiQ1AiOltdLCJGSyI6W119LCJ1ciI6eyJLTiI6W10sIkNQIjpbXSwiRksiOltdfSwiVkEi
-OnsiQ1AiOltdLCJGSyI6W119LCJEciI6eyJxVSI6W10sInZYIjpbXX0sInFqIjp7IlJlIjpbIktOIl0s
-ImxEIjpbIktOIl0sInpNIjpbIktOIl0sImNYIjpbIktOIl0sImxELkUiOiJLTiIsIlJlLkUiOiJLTiJ9
-LCJiUSI6eyJjWCI6WyIxIl19LCJhTCI6eyJjWCI6WyIxIl19LCJuSCI6eyJhTCI6WyIxIl0sImNYIjpb
-IjEiXSwiYUwuRSI6IjEiLCJjWC5FIjoiMSJ9LCJhNyI6eyJBbiI6WyIxIl19LCJBOCI6eyJhTCI6WyIy
-Il0sImNYIjpbIjIiXSwiYUwuRSI6IjIiLCJjWC5FIjoiMiJ9LCJVNSI6eyJjWCI6WyIxIl0sImNYLkUi
-OiIxIn0sIlNPIjp7IkFuIjpbIjEiXX0sIlhDIjp7IlJlIjpbIjEiXSwibEQiOlsiMSJdLCJ6TSI6WyIx
-Il0sImNYIjpbIjEiXX0sInd2Ijp7IkdEIjpbXX0sIlBEIjp7IkdqIjpbIjEiLCIyIl0sIlJVIjpbIjEi
-LCIyIl0sIlBuIjpbIjEiLCIyIl0sIktQIjpbIjEiLCIyIl0sIlowIjpbIjEiLCIyIl19LCJXVSI6eyJa
-MCI6WyIxIiwiMiJdfSwiTFAiOnsiV1UiOlsiMSIsIjIiXSwiWjAiOlsiMSIsIjIiXX0sIkxJIjp7InZR
-IjpbXX0sIlcwIjp7IlhTIjpbXX0sImF6Ijp7IlhTIjpbXX0sInZWIjp7IlhTIjpbXX0sIlhPIjp7Ikd6
-IjpbXX0sIlRwIjp7IkVIIjpbXX0sImxjIjp7IkVIIjpbXX0sInp4Ijp7IkVIIjpbXX0sInJUIjp7IkVI
-IjpbXX0sIkVxIjp7IlhTIjpbXX0sImtZIjp7IlhTIjpbXX0sIk41Ijp7IkZvIjpbIjEiLCIyIl0sIllr
-IjpbIjEiLCIyIl0sIlowIjpbIjEiLCIyIl0sIllrLksiOiIxIiwiWWsuViI6IjIifSwiaTUiOnsiY1gi
-OlsiMSJdLCJjWC5FIjoiMSJ9LCJONiI6eyJBbiI6WyIxIl19LCJWUiI6eyJ3TCI6W10sInZYIjpbXX0s
-IkVLIjp7ImliIjpbXSwiT2QiOltdfSwiS1ciOnsiY1giOlsiaWIiXSwiY1guRSI6ImliIn0sIlBiIjp7
-IkFuIjpbImliIl19LCJ0USI6eyJPZCI6W119LCJ1biI6eyJjWCI6WyJPZCJdLCJjWC5FIjoiT2QifSwi
-U2QiOnsiQW4iOlsiT2QiXX0sIkVUIjp7IkFTIjpbXX0sImIwIjp7IlhqIjpbIkAiXSwiRVQiOltdLCJB
-UyI6W119LCJEZyI6eyJsRCI6WyJDUCJdLCJYaiI6WyJAIl0sInpNIjpbIkNQIl0sIkVUIjpbXSwiU1Ui
-OlsiQ1AiXSwiQVMiOltdLCJjWCI6WyJDUCJdLCJsRC5FIjoiQ1AifSwiUGciOnsibEQiOlsiS04iXSwi
-ek0iOlsiS04iXSwiWGoiOlsiQCJdLCJFVCI6W10sIlNVIjpbIktOIl0sIkFTIjpbXSwiY1giOlsiS04i
-XX0sInhqIjp7ImxEIjpbIktOIl0sInpNIjpbIktOIl0sIlhqIjpbIkAiXSwiRVQiOltdLCJTVSI6WyJL
-TiJdLCJBUyI6W10sImNYIjpbIktOIl0sImxELkUiOiJLTiJ9LCJkRSI6eyJsRCI6WyJLTiJdLCJ6TSI6
-WyJLTiJdLCJYaiI6WyJAIl0sIkVUIjpbXSwiU1UiOlsiS04iXSwiQVMiOltdLCJjWCI6WyJLTiJdLCJs
-RC5FIjoiS04ifSwiWkEiOnsibEQiOlsiS04iXSwiek0iOlsiS04iXSwiWGoiOlsiQCJdLCJFVCI6W10s
-IlNVIjpbIktOIl0sIkFTIjpbXSwiY1giOlsiS04iXSwibEQuRSI6IktOIn0sIndmIjp7ImxEIjpbIktO
-Il0sInpNIjpbIktOIl0sIlhqIjpbIkAiXSwiRVQiOltdLCJTVSI6WyJLTiJdLCJBUyI6W10sImNYIjpb
-IktOIl0sImxELkUiOiJLTiJ9LCJQcSI6eyJsRCI6WyJLTiJdLCJ6TSI6WyJLTiJdLCJYaiI6WyJAIl0s
-IkVUIjpbXSwiU1UiOlsiS04iXSwiQVMiOltdLCJjWCI6WyJLTiJdLCJsRC5FIjoiS04ifSwiZUUiOnsi
-bEQiOlsiS04iXSwiek0iOlsiS04iXSwiWGoiOlsiQCJdLCJFVCI6W10sIlNVIjpbIktOIl0sIkFTIjpb
-XSwiY1giOlsiS04iXSwibEQuRSI6IktOIn0sIlY2Ijp7Im42IjpbXSwibEQiOlsiS04iXSwiek0iOlsi
-S04iXSwiWGoiOlsiQCJdLCJFVCI6W10sIlNVIjpbIktOIl0sIkFTIjpbXSwiY1giOlsiS04iXSwibEQu
-RSI6IktOIn0sInU5Ijp7IlhTIjpbXX0sImh6Ijp7IlhTIjpbXX0sImlNIjp7IlhTIjpbXX0sIlpmIjp7
-IlBmIjpbIjEiXX0sInZzIjp7ImI4IjpbIjEiXX0sIkN3Ijp7IlhTIjpbXX0sIm0wIjp7IkpCIjpbXX0s
-IkppIjp7IkpCIjpbXX0sImI2Ijp7Ilh2IjpbIjEiXSwieHUiOlsiMSJdLCJjWCI6WyIxIl19LCJsbSI6
+LFAucEssUC5oaixQLlZwLFAuT1IsUC5yYSxQLnlRLFAuV0YsUC5uMSxQLmNTLFAuVkMsUC5KVCxQLmUx
+LFAuTlksUC5SWixQLk1FLFAueTUsUC5xMyxQLnlJLFAuYzYsUC5xZCxXLkN2LFcuYlUsVy5oSCxXLktT
+LFcuQTMsVy52TixXLlV2LFcuRWcsVy5FbyxXLldrLFcuSUEsVy5mbSxQLmpnLFAuVGEsUC5HRSxQLk43
+LFAudVEsUC5QQyxQLm10LFAuTnosUC5ucCxQLlV0LEwuZSxMLlZXLEwub1osTC5qcixMLnFsLEwueTgs
+TC5MLEwuV3gsTC5BTyxMLmROLEwuSG8sTC54eixMLklDLEwuTDEsTC5uVCxMLkJaLEwuR0gsTC5EVCxM
+LmVILEwuekQsTC5PRSxMLlRXLEwueHIsTC5FRSxMLlFMLEwuVlMsTC5URCxNLk1pLE0ucTcsTS5ObyxY
+LnFSXSkKcihQLlhTLFtILlcwLEguYXosSC52VixILkVxLFAuQzYsSC51OSxQLkxLLFAuQVQsUC5tcCxQ
+LnViLFAuZHMsUC5saixQLlVWLFAudDddKQpyKEgubGMsW0guengsSC5qeV0pCnMoSC5rWSxQLkM2KQpz
+KFAuaWwsUC5ZaykKcihQLmlsLFtILk41LFAudXcsVy5jZixXLlN5XSkKcihQLm1XLFtILktXLFAucTRd
+KQpzKEguYjAsSC5wRikKcihILmIwLFtILlJHLEguV0JdKQpzKEguVlAsSC5SRykKcyhILkRnLEguVlAp
+CnMoSC5aRyxILldCKQpzKEguUGcsSC5aRykKcihILlBnLFtILnhqLEguZEUsSC5aQSxILndmLEguUHEs
+SC5lRSxILlY2XSkKcyhILngsSC51OSkKcyhQLlpmLFAuUGYpCnMoUC5KaSxQLm0wKQpzKFAuYjYsUC5Y
+dikKcyhQLlZqLFAuVEMpCnIoUC5VayxbUC5DVixQLlppLFAuYnldKQpzKFAud0ksUC5rVCkKcihQLndJ
+LFtQLlU4LFAuTXgsUC5FMyxQLkdZXSkKcyhQLnU1LFAuWmkpCnIoUC5sZixbUC5DUCxQLklmXSkKcihQ
+LkFULFtQLmJKLFAuZVldKQpzKFAucWUsUC5EbikKcihXLkQwLFtXLnVILFcud2EsVy5LNSxXLkNtXSkK
+cihXLnVILFtXLmN2LFcubngsVy5RRixXLkNRXSkKcihXLmN2LFtXLnFFLFAuZDVdKQpyKFcucUUsW1cu
+R2gsVy5mWSxXLm5CLFcuUVAsVy5oNCxXLlNOLFcubHAsVy5UYixXLkl2LFcuQlQsVy55WV0pCnMoVy5v
+SixXLkxlKQpzKFcuVDUsVy5BeikKcyhXLlZiLFcuUUYpCnMoVy5mSixXLndhKQpyKFcuZWEsW1cudzYs
+Vy5ld10pCnMoVy5PSyxXLnc2KQpzKFcuckIsVy5LNykKcyhXLkJILFcuckIpCnMoVy53NCxXLklCKQpz
+KFcub2EsVy5YVykKcyhXLnJoLFcub2EpCnMoVy5pNyxXLmNmKQpzKFAuQXMsUC5WaikKcihQLkFzLFtX
+Lkk0LFAuS2VdKQpzKFcuUk8sUC5xaCkKcyhXLmV1LFcuUk8pCnMoVy54QyxQLk1PKQpzKFcuY3QsVy5t
+NikKcyhQLkJmLFAuaUopCnIoUC5FNCxbUC5yNyxQLmNvXSkKcyhQLlR6LFAuY28pCnMoUC5uZCxQLmQ1
+KQpzKEIuTHUsTy56TCkKcihCLkx1LFtFLk9GLEYucnUsTC5JVl0pCnQoSC53MixILlJlKQp0KEguUkcs
+UC5sRCkKdChILlZQLEguU1UpCnQoSC5XQixQLmxEKQp0KEguWkcsSC5TVSkKdChQLm5ZLFAubEQpCnQo
+UC5UQyxQLk1hKQp0KFAuUlUsUC5LUCkKdChXLkxlLFcuaWQpCnQoVy5LNyxQLmxEKQp0KFcuckIsVy5H
+bSkKdChXLlhXLFAubEQpCnQoVy5vYSxXLkdtKQp0KFAuY28sUC5sRCl9KSgpCnZhciB2PXt0eXBlVW5p
+dmVyc2U6e2VDOm5ldyBNYXAoKSx0Ujp7fSxlVDp7fSx0UFY6e30sc0VBOltdfSxtYW5nbGVkR2xvYmFs
+TmFtZXM6e0lmOiJpbnQiLENQOiJkb3VibGUiLGxmOiJudW0iLHFVOiJTdHJpbmciLGEyOiJib29sIixj
+ODoiTnVsbCIsek06Ikxpc3QifSxtYW5nbGVkTmFtZXM6e30sZ2V0VHlwZUZyb21OYW1lOmdldEdsb2Jh
+bEZyb21OYW1lLG1ldGFkYXRhOltdLHR5cGVzOlsiYzgoKSIsImM4KEAsQCkiLCJ+KCkiLCJAKEApIiwi
+cVUocVUpIiwiYzgoT0spIiwiYzgoY3YpIiwiYzgoZkopIiwiYTIocVUpIiwiYzgocVUscVUpIiwifih+
+KCkpIiwiYTIoY3YscVUscVUsSlEpIiwiYzgoQCkiLCJjOChxVSxAKSIsImM4KHFVKSIsImEyKGtGKSIs
+In4oeHU8cVU+KSIsImM4KGVhKSIsIn4oT0spIiwiYzgoR0QsQCkiLCJjOCh+KCkpIiwiYzgoQCxHeiki
+LCJ+KHFVLHFVKSIsIm42KElmKSIsIm42KEAsQCkiLCJhMih1SCkiLCJjOChJZixAKSIsImM4KGV3KSIs
+IkAoZWEpIiwifihNaFtHel0pIiwiYzgoQFtHel0pIiwiTWgoQCkiLCJhMih4dTxxVT4pIiwidnM8QD4o
+QCkiLCJyNyhAKSIsIlR6PEA+KEApIiwiRTQoQCkiLCJAKHFVKSIsIkAoQCxxVSkiLCJ+KHVILHVIKSIs
+ImI4PGM4PihPSykiLCJaMDxxVSxxVT4oWjA8cVUscVU+LHFVKSIsImZKKGZKKSIsIn4ocVUsSWYpIiwi
+cVUoSWYpIiwifihxVVtAXSkiLCJJZihJZixJZikiLCJ+KEApIl0saW50ZXJjZXB0b3JzQnlUYWc6bnVs
+bCxsZWFmVGFnczpudWxsLGFycmF5UnRpOnR5cGVvZiBTeW1ib2w9PSJmdW5jdGlvbiImJnR5cGVvZiBT
+eW1ib2woKT09InN5bWJvbCI/U3ltYm9sKCIkdGkiKToiJHRpIn0KSC54Yih2LnR5cGVVbml2ZXJzZSxK
+U09OLnBhcnNlKCd7ImM1IjoiTUYiLCJpQyI6Ik1GIiwia2QiOiJNRiIsInJ4IjoiZWEiLCJlNSI6ImVh
+IiwiWTAiOiJkNSIsInRwIjoiZDUiLCJHOCI6ImV3IiwiTXIiOiJxRSIsImVMIjoicUUiLCJJMCI6InVI
+IiwiaHMiOiJ1SCIsIlhnIjoiUUYiLCJ5YyI6Ik9LIiwieTQiOiJ3NiIsImFQIjoiQ20iLCJ4YyI6Im54
+Iiwia0oiOiJueCIsInpVIjoiRGciLCJkZiI6InBGIiwieUUiOnsiYTIiOltdfSwiWUUiOnsiYzgiOltd
+fSwiTUYiOnsidm0iOltdLCJFSCI6W119LCJqZCI6eyJ6TSI6WyIxIl0sImJRIjpbIjEiXSwiY1giOlsi
+MSJdfSwiUG8iOnsiamQiOlsiMSJdLCJ6TSI6WyIxIl0sImJRIjpbIjEiXSwiY1giOlsiMSJdfSwibTEi
+OnsiQW4iOlsiMSJdfSwicUkiOnsiQ1AiOltdLCJsZiI6W119LCJ1ciI6eyJJZiI6W10sIkNQIjpbXSwi
+bGYiOltdfSwiVkEiOnsiQ1AiOltdLCJsZiI6W119LCJEciI6eyJxVSI6W10sInZYIjpbXX0sInFqIjp7
+IlJlIjpbIklmIl0sImxEIjpbIklmIl0sInpNIjpbIklmIl0sImJRIjpbIklmIl0sImNYIjpbIklmIl0s
+ImxELkUiOiJJZiIsIlJlLkUiOiJJZiJ9LCJiUSI6eyJjWCI6WyIxIl19LCJhTCI6eyJiUSI6WyIxIl0s
+ImNYIjpbIjEiXX0sIm5IIjp7ImFMIjpbIjEiXSwiYlEiOlsiMSJdLCJjWCI6WyIxIl0sImFMLkUiOiIx
+IiwiY1guRSI6IjEifSwiYTciOnsiQW4iOlsiMSJdfSwiaTEiOnsiY1giOlsiMiJdLCJjWC5FIjoiMiJ9
+LCJ4eSI6eyJpMSI6WyIxIiwiMiJdLCJiUSI6WyIyIl0sImNYIjpbIjIiXSwiY1guRSI6IjIifSwiTUgi
+OnsiQW4iOlsiMiJdfSwibEoiOnsiYUwiOlsiMiJdLCJiUSI6WyIyIl0sImNYIjpbIjIiXSwiYUwuRSI6
+IjIiLCJjWC5FIjoiMiJ9LCJVNSI6eyJjWCI6WyIxIl0sImNYLkUiOiIxIn0sInZHIjp7IkFuIjpbIjEi
+XX0sIncyIjp7IlJlIjpbIjEiXSwibEQiOlsiMSJdLCJ6TSI6WyIxIl0sImJRIjpbIjEiXSwiY1giOlsi
+MSJdfSwid3YiOnsiR0QiOltdfSwiUEQiOnsiR2oiOlsiMSIsIjIiXSwiUlUiOlsiMSIsIjIiXSwiUG4i
+OlsiMSIsIjIiXSwiS1AiOlsiMSIsIjIiXSwiWjAiOlsiMSIsIjIiXX0sIldVIjp7IlowIjpbIjEiLCIy
+Il19LCJMUCI6eyJXVSI6WyIxIiwiMiJdLCJaMCI6WyIxIiwiMiJdfSwiWFIiOnsiY1giOlsiMSJdLCJj
+WC5FIjoiMSJ9LCJMSSI6eyJ2USI6W119LCJXMCI6eyJYUyI6W119LCJheiI6eyJYUyI6W119LCJ2ViI6
+eyJYUyI6W119LCJYTyI6eyJHeiI6W119LCJUcCI6eyJFSCI6W119LCJsYyI6eyJFSCI6W119LCJ6eCI6
+eyJFSCI6W119LCJqeSI6eyJFSCI6W119LCJFcSI6eyJYUyI6W119LCJrWSI6eyJYUyI6W119LCJONSI6
+eyJGbyI6WyIxIiwiMiJdLCJZayI6WyIxIiwiMiJdLCJaMCI6WyIxIiwiMiJdLCJZay5LIjoiMSIsIllr
+LlYiOiIyIn0sImk1Ijp7ImJRIjpbIjEiXSwiY1giOlsiMSJdLCJjWC5FIjoiMSJ9LCJONiI6eyJBbiI6
+WyIxIl19LCJWUiI6eyJ3TCI6W10sInZYIjpbXX0sIkVLIjp7ImliIjpbXSwiT2QiOltdfSwiS1ciOnsi
+Y1giOlsiaWIiXSwiY1guRSI6ImliIn0sIlBiIjp7IkFuIjpbImliIl19LCJ0USI6eyJPZCI6W119LCJO
+RiI6eyJjWCI6WyJPZCJdLCJjWC5FIjoiT2QifSwiU2QiOnsiQW4iOlsiT2QiXX0sInBGIjp7IkFTIjpb
+XX0sImIwIjp7IlhqIjpbIkAiXSwicEYiOltdLCJBUyI6W119LCJEZyI6eyJsRCI6WyJDUCJdLCJYaiI6
+WyJAIl0sInpNIjpbIkNQIl0sInBGIjpbXSwiYlEiOlsiQ1AiXSwiU1UiOlsiQ1AiXSwiQVMiOltdLCJj
+WCI6WyJDUCJdLCJsRC5FIjoiQ1AifSwiUGciOnsibEQiOlsiSWYiXSwiek0iOlsiSWYiXSwiWGoiOlsi
+QCJdLCJwRiI6W10sImJRIjpbIklmIl0sIlNVIjpbIklmIl0sIkFTIjpbXSwiY1giOlsiSWYiXX0sInhq
+Ijp7ImxEIjpbIklmIl0sInpNIjpbIklmIl0sIlhqIjpbIkAiXSwicEYiOltdLCJiUSI6WyJJZiJdLCJT
+VSI6WyJJZiJdLCJBUyI6W10sImNYIjpbIklmIl0sImxELkUiOiJJZiJ9LCJkRSI6eyJsRCI6WyJJZiJd
+LCJ6TSI6WyJJZiJdLCJYaiI6WyJAIl0sInBGIjpbXSwiYlEiOlsiSWYiXSwiU1UiOlsiSWYiXSwiQVMi
+OltdLCJjWCI6WyJJZiJdLCJsRC5FIjoiSWYifSwiWkEiOnsibEQiOlsiSWYiXSwiek0iOlsiSWYiXSwi
+WGoiOlsiQCJdLCJwRiI6W10sImJRIjpbIklmIl0sIlNVIjpbIklmIl0sIkFTIjpbXSwiY1giOlsiSWYi
+XSwibEQuRSI6IklmIn0sIndmIjp7ImxEIjpbIklmIl0sInpNIjpbIklmIl0sIlhqIjpbIkAiXSwicEYi
+OltdLCJiUSI6WyJJZiJdLCJTVSI6WyJJZiJdLCJBUyI6W10sImNYIjpbIklmIl0sImxELkUiOiJJZiJ9
+LCJQcSI6eyJsRCI6WyJJZiJdLCJ6TSI6WyJJZiJdLCJYaiI6WyJAIl0sInBGIjpbXSwiYlEiOlsiSWYi
+XSwiU1UiOlsiSWYiXSwiQVMiOltdLCJjWCI6WyJJZiJdLCJsRC5FIjoiSWYifSwiZUUiOnsibEQiOlsi
+SWYiXSwiek0iOlsiSWYiXSwiWGoiOlsiQCJdLCJwRiI6W10sImJRIjpbIklmIl0sIlNVIjpbIklmIl0s
+IkFTIjpbXSwiY1giOlsiSWYiXSwibEQuRSI6IklmIn0sIlY2Ijp7Im42IjpbXSwibEQiOlsiSWYiXSwi
+ek0iOlsiSWYiXSwiWGoiOlsiQCJdLCJwRiI6W10sImJRIjpbIklmIl0sIlNVIjpbIklmIl0sIkFTIjpb
+XSwiY1giOlsiSWYiXSwibEQuRSI6IklmIn0sInU5Ijp7IlhTIjpbXX0sIngiOnsiWFMiOltdfSwiR1Yi
+OnsiQW4iOlsiMSJdfSwicTQiOnsiY1giOlsiMSJdLCJjWC5FIjoiMSJ9LCJaZiI6eyJQZiI6WyIxIl19
+LCJ2cyI6eyJiOCI6WyIxIl19LCJPSCI6eyJYUyI6W119LCJtMCI6eyJKQiI6W119LCJKaSI6eyJKQiI6
+W119LCJiNiI6eyJYdiI6WyIxIl0sInh1IjpbIjEiXSwiYlEiOlsiMSJdLCJjWCI6WyIxIl19LCJsbSI6
eyJBbiI6WyIxIl19LCJtVyI6eyJjWCI6WyIxIl19LCJMVSI6eyJsRCI6WyIxIl0sInpNIjpbIjEiXSwi
-Y1giOlsiMSJdfSwiaWwiOnsiWWsiOlsiMSIsIjIiXSwiWjAiOlsiMSIsIjIiXX0sIllrIjp7IlowIjpb
-IjEiLCIyIl19LCJQbiI6eyJaMCI6WyIxIiwiMiJdfSwiR2oiOnsiUlUiOlsiMSIsIjIiXSwiUG4iOlsi
-MSIsIjIiXSwiS1AiOlsiMSIsIjIiXSwiWjAiOlsiMSIsIjIiXX0sIlZqIjp7ImxmIjpbIjEiXSwieHUi
-OlsiMSJdLCJjWCI6WyIxIl19LCJYdiI6eyJ4dSI6WyIxIl0sImNYIjpbIjEiXX0sInV3Ijp7IllrIjpb
-InFVIiwiQCJdLCJaMCI6WyJxVSIsIkAiXSwiWWsuSyI6InFVIiwiWWsuViI6IkAifSwiaTgiOnsiYUwi
-OlsicVUiXSwiY1giOlsicVUiXSwiYUwuRSI6InFVIiwiY1guRSI6InFVIn0sIkNWIjp7IlVrIjpbInpN
-PEtOPiIsInFVIl0sIlVrLlMiOiJ6TTxLTj4ifSwiVTgiOnsid0kiOlsiek08S04+IiwicVUiXX0sIlpp
-Ijp7IlVrIjpbInFVIiwiek08S04+Il19LCJieSI6eyJVayI6WyJrIiwicVUiXSwiVWsuUyI6ImsifSwi
-TXgiOnsid0kiOlsicVUiLCJrIl19LCJ1NSI6eyJVayI6WyJxVSIsInpNPEtOPiJdLCJVay5TIjoicVUi
-fSwiRTMiOnsid0kiOlsicVUiLCJ6TTxLTj4iXX0sIkdZIjp7IndJIjpbInpNPEtOPiIsInFVIl19LCJD
-UCI6eyJGSyI6W119LCJDNiI6eyJYUyI6W119LCJuIjp7IlhTIjpbXX0sInUiOnsiWFMiOltdfSwiYkoi
-OnsiWFMiOltdfSwiZVkiOnsiWFMiOltdfSwibXAiOnsiWFMiOltdfSwidWIiOnsiWFMiOltdfSwiZHMi
-OnsiWFMiOltdfSwibGoiOnsiWFMiOltdfSwiVVYiOnsiWFMiOltdfSwiazUiOnsiWFMiOltdfSwiS1ki
-OnsiWFMiOltdfSwiYyI6eyJYUyI6W119LCJLTiI6eyJGSyI6W119LCJ6TSI6eyJjWCI6WyIxIl19LCJp
-YiI6eyJPZCI6W119LCJ4dSI6eyJjWCI6WyIxIl19LCJxVSI6eyJ2WCI6W119LCJSbiI6eyJCTCI6W119
-LCJEbiI6eyJpRCI6W119LCJVZiI6eyJpRCI6W119LCJxZSI6eyJpRCI6W119LCJxRSI6eyJjdiI6W10s
-InVIIjpbXSwiRDAiOltdfSwiR2giOnsiY3YiOltdLCJ1SCI6W10sIkQwIjpbXX0sImZZIjp7ImN2Ijpb
-XSwidUgiOltdLCJEMCI6W119LCJuQiI6eyJjdiI6W10sInVIIjpbXSwiRDAiOltdfSwiUVAiOnsiY3Yi
-OltdLCJ1SCI6W10sIkQwIjpbXX0sIm54Ijp7InVIIjpbXSwiRDAiOltdfSwiUUYiOnsidUgiOltdLCJE
-MCI6W119LCJJQiI6eyJ0biI6WyJGSyJdfSwid3oiOnsibEQiOlsiMSJdLCJ6TSI6WyIxIl0sImNYIjpb
-IjEiXSwibEQuRSI6IjEifSwiY3YiOnsidUgiOltdLCJEMCI6W119LCJUNSI6eyJBeiI6W119LCJoNCI6
-eyJjdiI6W10sInVIIjpbXSwiRDAiOltdfSwiVmIiOnsidUgiOltdLCJEMCI6W119LCJPNyI6eyJEMCI6
-W119LCJ3YSI6eyJEMCI6W119LCJBaiI6eyJlYSI6W119LCJlNyI6eyJsRCI6WyJ1SCJdLCJ6TSI6WyJ1
-SCJdLCJjWCI6WyJ1SCJdLCJsRC5FIjoidUgifSwidUgiOnsiRDAiOltdfSwiQkgiOnsiR20iOlsidUgi
-XSwibEQiOlsidUgiXSwiek0iOlsidUgiXSwiWGoiOlsidUgiXSwiY1giOlsidUgiXSwibEQuRSI6InVI
-IiwiR20uRSI6InVIIn0sIlNOIjp7ImN2IjpbXSwidUgiOltdLCJEMCI6W119LCJldyI6eyJlYSI6W119
-LCJscCI6eyJjdiI6W10sInVIIjpbXSwiRDAiOltdfSwiVGIiOnsiY3YiOltdLCJ1SCI6W10sIkQwIjpb
-XX0sIkl2Ijp7ImN2IjpbXSwidUgiOltdLCJEMCI6W119LCJCVCI6eyJjdiI6W10sInVIIjpbXSwiRDAi
-OltdfSwieVkiOnsiY3YiOltdLCJ1SCI6W10sIkQwIjpbXX0sInc2Ijp7ImVhIjpbXX0sIks1Ijp7InY2
-IjpbXSwiRDAiOltdfSwiQ20iOnsiRDAiOltdfSwiQ1EiOnsidUgiOltdLCJEMCI6W119LCJ3NCI6eyJ0
-biI6WyJGSyJdfSwicmgiOnsiR20iOlsidUgiXSwibEQiOlsidUgiXSwiek0iOlsidUgiXSwiWGoiOlsi
-dUgiXSwiY1giOlsidUgiXSwibEQuRSI6InVIIiwiR20uRSI6InVIIn0sImNmIjp7IllrIjpbInFVIiwi
-cVUiXSwiWjAiOlsicVUiLCJxVSJdfSwiaTciOnsiWWsiOlsicVUiLCJxVSJdLCJaMCI6WyJxVSIsInFV
-Il0sIllrLksiOiJxVSIsIllrLlYiOiJxVSJ9LCJTeSI6eyJZayI6WyJxVSIsInFVIl0sIlowIjpbInFV
-IiwicVUiXSwiWWsuSyI6InFVIiwiWWsuViI6InFVIn0sIkk0Ijp7ImxmIjpbInFVIl0sInh1IjpbInFV
-Il0sImNYIjpbInFVIl19LCJSTyI6eyJxaCI6WyIxIl19LCJDcSI6eyJSTyI6WyIxIl0sInFoIjpbIjEi
-XX0sInhDIjp7Ik1PIjpbIjEiXX0sIkpRIjp7ImtGIjpbXX0sInZEIjp7ImtGIjpbXX0sIm02Ijp7ImtG
-IjpbXX0sImN0Ijp7ImtGIjpbXX0sIk93Ijp7ImtGIjpbXX0sIlc5Ijp7IkFuIjpbIjEiXX0sImRXIjp7
-InY2IjpbXSwiRDAiOltdfSwibWsiOnsieTAiOltdfSwiS28iOnsib24iOltdfSwiQXMiOnsibGYiOlsi
-cVUiXSwieHUiOlsicVUiXSwiY1giOlsicVUiXX0sInI3Ijp7IkU0IjpbXX0sIlR6Ijp7ImxEIjpbIjEi
-XSwiek0iOlsiMSJdLCJFNCI6W10sImNYIjpbIjEiXSwibEQuRSI6IjEifSwibmQiOnsiZDUiOltdLCJj
-diI6W10sInVIIjpbXSwiRDAiOltdfSwiS2UiOnsibGYiOlsicVUiXSwieHUiOlsicVUiXSwiY1giOlsi
-cVUiXX0sImQ1Ijp7ImN2IjpbXSwidUgiOltdLCJEMCI6W119LCJuNiI6eyJ6TSI6WyJLTiJdLCJBUyI6
-W10sImNYIjpbIktOIl19LCJYQSI6eyJrRiI6W119LCJPRiI6eyJMdSI6W119LCJydSI6eyJMdSI6W119
-LCJJViI6eyJMdSI6W119fScpKQpILkZGKHYudHlwZVVuaXZlcnNlLEpTT04ucGFyc2UoJ3siYlEiOjEs
-IlhDIjoxLCJNTyI6MSwia1QiOjIsIm1XIjoxLCJMVSI6MSwiaWwiOjIsIlZqIjoxLCJuWSI6MSwiV1ki
-OjEsImNvIjoxfScpKQp2YXIgdT0oZnVuY3Rpb24gcnRpaSgpe3ZhciB0PUguTjAKcmV0dXJue2k6dCgi
-R2giKSxuOnQoIkN3IiksY1I6dCgibkIiKSxkOnQoIkF6IiksWTp0KCJRUCIpLGdGOnQoIlBEPEdELEA+
-IiksaDp0KCJjdiIpLGJVOnQoIlhTIiksQjp0KCJlYSIpLGFTOnQoIkQwIiksYzg6dCgiVDUiKSxaOnQo
-IkVIIiksYzp0KCJiODxAPiIpLHI6dCgiTzciKSxJOnQoIlNnIiksbzp0KCJ2USIpLGVoOnQoImNYPHVI
-PiIpLFg6dCgiY1g8cVU+IiksUjp0KCJjWDxAPiIpLGZBOnQoImpkPFNlPiIpLHU6dCgiamQ8ajg+Iiks
-YlA6dCgiamQ8dUY+IiksZmg6dCgiamQ8Wlo+Iiksazp0KCJqZDxrRj4iKSxzOnQoImpkPHFVPiIpLGho
-OnQoImpkPHlEPiIpLGFKOnQoImpkPHdiPiIpLG06dCgiamQ8QD4iKSx0OnQoImpkPEtOPiIpLGVIOnQo
-InZtIiksZzp0KCJjNSIpLGFVOnQoIlhqPEA+IiksYW06dCgiVHo8QD4iKSxlbzp0KCJONTxHRCxAPiIp
-LHY6dCgiRTQiKSxkejp0KCJoRiIpLGE6dCgiek08cVU+Iiksajp0KCJ6TTxAPiIpLEw6dCgiek08S04+
-IiksRjp0KCJ1OCIpLGY6dCgiWjA8cVUscVU+IiksYjp0KCJaMDxxVSxAPiIpLEc6dCgiWjA8QCxAPiIp
-LGR2OnQoIkE4PHFVLHFVPiIpLGRvOnQoIkE4PHFVLEA+IiksVjp0KCJBaiIpLGREOnQoIkVUIiksYm06
-dCgiVjYiKSxBOnQoInVIIiksZTp0KCJrRiIpLFA6dCgiYzgiKSxLOnQoImsiKSxwOnQoImV3IikscTp0
-KCJ0bjxGSz4iKSxmdjp0KCJ3TCIpLGF2OnQoIkpjIiksZXc6dCgibmQiKSxDOnQoInh1PHFVPiIpLGw6
-dCgiR3oiKSxOOnQoInFVIiksZEc6dCgicVUocVUpIiksZzc6dCgiZDUiKSxmbzp0KCJHRCIpLGFXOnQo
-InlZIiksdzp0KCJBUyIpLGdjOnQoIm42IiksYWs6dCgia2QiKSxUOnQoIkdqPHFVLHFVPiIpLEQ6dCgi
-aUQiKSxjYzp0KCJVNTxxVT4iKSxnNDp0KCJLNSIpLGNpOnQoInY2IiksZzI6dCgiQ20iKSxiajp0KCJa
-ZjxPNz4iKSxoOTp0KCJDUSIpLGFjOnQoImU3IiksUTp0KCJDcTxBaj4iKSxTOnQoInd6PGN2PiIpLHg6
-dCgiRmU8QCxAPiIpLGFvOnQoInZzPE83PiIpLF86dCgidnM8QD4iKSxmSjp0KCJ2czxLTj4iKSxPOnQo
-IkpRIiksSjp0KCJibiIpLGNKOnQoImEyIiksYWw6dCgiYTIoaykiKSxiQjp0KCJhMihxVSkiKSxiZjp0
-KCJhMihAKSIpLHo6dCgiQCIpLGZPOnQoIkAoKSIpLFU6dCgiQChlYSkiKSx5OnQoIkAoaykiKSxlcDp0
-KCJAKGssaykiKSxXOnQoIkAoayxHeikiKSxjaDp0KCJAKHh1PHFVPikiKSxkTzp0KCJAKHFVKSIpLGI4
-OnQoIkAoQCxAKSIpLGVnOnQoIktOIiksSDp0KCJ+IiksTTp0KCJ+KCkiKSxhbjp0KCJ+KGV3KSIpLEU6
-dCgifihxVSxxVSkiKSxjQTp0KCJ+KHFVLEApIil9fSkoKTsoZnVuY3Rpb24gY29uc3RhbnRzKCl7dmFy
-IHQ9aHVua0hlbHBlcnMubWFrZUNvbnN0TGlzdApDLlJZPVcuUVAucHJvdG90eXBlCkMuQlo9Vy5WYi5w
-cm90b3R5cGUKQy5EdD1XLk83LnByb3RvdHlwZQpDLk9rPUoudkIucHJvdG90eXBlCkMuTm09Si5qZC5w
-cm90b3R5cGUKQy5qbj1KLnVyLnByb3RvdHlwZQpDLmpOPUouWUUucHJvdG90eXBlCkMuQ0Q9Si5xSS5w
-cm90b3R5cGUKQy54Qj1KLkRyLnByb3RvdHlwZQpDLkRHPUouYzUucHJvdG90eXBlCkMuRXg9Vy51OC5w
-cm90b3R5cGUKQy5MdD1XLlNOLnByb3RvdHlwZQpDLlpRPUouaUMucHJvdG90eXBlCkMuSWU9Vy5UYi5w
-cm90b3R5cGUKQy52Qj1KLmtkLnByb3RvdHlwZQpDLm9sPVcuSzUucHJvdG90eXBlCkMueTg9bmV3IFAu
-VTgoKQpDLmg5PW5ldyBQLkNWKCkKQy5PND1mdW5jdGlvbiBnZXRUYWdGYWxsYmFjayhvKSB7CiAgdmFy
-IHMgPSBPYmplY3QucHJvdG90eXBlLnRvU3RyaW5nLmNhbGwobyk7CiAgcmV0dXJuIHMuc3Vic3RyaW5n
-KDgsIHMubGVuZ3RoIC0gMSk7Cn0KQy5ZcT1mdW5jdGlvbigpIHsKICB2YXIgdG9TdHJpbmdGdW5jdGlv
-biA9IE9iamVjdC5wcm90b3R5cGUudG9TdHJpbmc7CiAgZnVuY3Rpb24gZ2V0VGFnKG8pIHsKICAgIHZh
-ciBzID0gdG9TdHJpbmdGdW5jdGlvbi5jYWxsKG8pOwogICAgcmV0dXJuIHMuc3Vic3RyaW5nKDgsIHMu
-bGVuZ3RoIC0gMSk7CiAgfQogIGZ1bmN0aW9uIGdldFVua25vd25UYWcob2JqZWN0LCB0YWcpIHsKICAg
-IGlmICgvXkhUTUxbQS1aXS4qRWxlbWVudCQvLnRlc3QodGFnKSkgewogICAgICB2YXIgbmFtZSA9IHRv
-U3RyaW5nRnVuY3Rpb24uY2FsbChvYmplY3QpOwogICAgICBpZiAobmFtZSA9PSAiW29iamVjdCBPYmpl
-Y3RdIikgcmV0dXJuIG51bGw7CiAgICAgIHJldHVybiAiSFRNTEVsZW1lbnQiOwogICAgfQogIH0KICBm
-dW5jdGlvbiBnZXRVbmtub3duVGFnR2VuZXJpY0Jyb3dzZXIob2JqZWN0LCB0YWcpIHsKICAgIGlmIChz
-ZWxmLkhUTUxFbGVtZW50ICYmIG9iamVjdCBpbnN0YW5jZW9mIEhUTUxFbGVtZW50KSByZXR1cm4gIkhU
-TUxFbGVtZW50IjsKICAgIHJldHVybiBnZXRVbmtub3duVGFnKG9iamVjdCwgdGFnKTsKICB9CiAgZnVu
-Y3Rpb24gcHJvdG90eXBlRm9yVGFnKHRhZykgewogICAgaWYgKHR5cGVvZiB3aW5kb3cgPT0gInVuZGVm
-aW5lZCIpIHJldHVybiBudWxsOwogICAgaWYgKHR5cGVvZiB3aW5kb3dbdGFnXSA9PSAidW5kZWZpbmVk
-IikgcmV0dXJuIG51bGw7CiAgICB2YXIgY29uc3RydWN0b3IgPSB3aW5kb3dbdGFnXTsKICAgIGlmICh0
-eXBlb2YgY29uc3RydWN0b3IgIT0gImZ1bmN0aW9uIikgcmV0dXJuIG51bGw7CiAgICByZXR1cm4gY29u
-c3RydWN0b3IucHJvdG90eXBlOwogIH0KICBmdW5jdGlvbiBkaXNjcmltaW5hdG9yKHRhZykgeyByZXR1
-cm4gbnVsbDsgfQogIHZhciBpc0Jyb3dzZXIgPSB0eXBlb2YgbmF2aWdhdG9yID09ICJvYmplY3QiOwog
-IHJldHVybiB7CiAgICBnZXRUYWc6IGdldFRhZywKICAgIGdldFVua25vd25UYWc6IGlzQnJvd3NlciA/
-IGdldFVua25vd25UYWdHZW5lcmljQnJvd3NlciA6IGdldFVua25vd25UYWcsCiAgICBwcm90b3R5cGVG
-b3JUYWc6IHByb3RvdHlwZUZvclRhZywKICAgIGRpc2NyaW1pbmF0b3I6IGRpc2NyaW1pbmF0b3IgfTsK
-fQpDLndiPWZ1bmN0aW9uKGdldFRhZ0ZhbGxiYWNrKSB7CiAgcmV0dXJuIGZ1bmN0aW9uKGhvb2tzKSB7
-CiAgICBpZiAodHlwZW9mIG5hdmlnYXRvciAhPSAib2JqZWN0IikgcmV0dXJuIGhvb2tzOwogICAgdmFy
-IHVhID0gbmF2aWdhdG9yLnVzZXJBZ2VudDsKICAgIGlmICh1YS5pbmRleE9mKCJEdW1wUmVuZGVyVHJl
-ZSIpID49IDApIHJldHVybiBob29rczsKICAgIGlmICh1YS5pbmRleE9mKCJDaHJvbWUiKSA+PSAwKSB7
-CiAgICAgIGZ1bmN0aW9uIGNvbmZpcm0ocCkgewogICAgICAgIHJldHVybiB0eXBlb2Ygd2luZG93ID09
-ICJvYmplY3QiICYmIHdpbmRvd1twXSAmJiB3aW5kb3dbcF0ubmFtZSA9PSBwOwogICAgICB9CiAgICAg
-IGlmIChjb25maXJtKCJXaW5kb3ciKSAmJiBjb25maXJtKCJIVE1MRWxlbWVudCIpKSByZXR1cm4gaG9v
-a3M7CiAgICB9CiAgICBob29rcy5nZXRUYWcgPSBnZXRUYWdGYWxsYmFjazsKICB9Owp9CkMuS1U9ZnVu
-Y3Rpb24oaG9va3MpIHsKICBpZiAodHlwZW9mIGRhcnRFeHBlcmltZW50YWxGaXh1cEdldFRhZyAhPSAi
-ZnVuY3Rpb24iKSByZXR1cm4gaG9va3M7CiAgaG9va3MuZ2V0VGFnID0gZGFydEV4cGVyaW1lbnRhbEZp
-eHVwR2V0VGFnKGhvb2tzLmdldFRhZyk7Cn0KQy5mUT1mdW5jdGlvbihob29rcykgewogIHZhciBnZXRU
-YWcgPSBob29rcy5nZXRUYWc7CiAgdmFyIHByb3RvdHlwZUZvclRhZyA9IGhvb2tzLnByb3RvdHlwZUZv
-clRhZzsKICBmdW5jdGlvbiBnZXRUYWdGaXhlZChvKSB7CiAgICB2YXIgdGFnID0gZ2V0VGFnKG8pOwog
-ICAgaWYgKHRhZyA9PSAiRG9jdW1lbnQiKSB7CiAgICAgIGlmICghIW8ueG1sVmVyc2lvbikgcmV0dXJu
-ICIhRG9jdW1lbnQiOwogICAgICByZXR1cm4gIiFIVE1MRG9jdW1lbnQiOwogICAgfQogICAgcmV0dXJu
-IHRhZzsKICB9CiAgZnVuY3Rpb24gcHJvdG90eXBlRm9yVGFnRml4ZWQodGFnKSB7CiAgICBpZiAodGFn
-ID09ICJEb2N1bWVudCIpIHJldHVybiBudWxsOwogICAgcmV0dXJuIHByb3RvdHlwZUZvclRhZyh0YWcp
-OwogIH0KICBob29rcy5nZXRUYWcgPSBnZXRUYWdGaXhlZDsKICBob29rcy5wcm90b3R5cGVGb3JUYWcg
-PSBwcm90b3R5cGVGb3JUYWdGaXhlZDsKfQpDLmRrPWZ1bmN0aW9uKGhvb2tzKSB7CiAgdmFyIHVzZXJB
-Z2VudCA9IHR5cGVvZiBuYXZpZ2F0b3IgPT0gIm9iamVjdCIgPyBuYXZpZ2F0b3IudXNlckFnZW50IDog
-IiI7CiAgaWYgKHVzZXJBZ2VudC5pbmRleE9mKCJGaXJlZm94IikgPT0gLTEpIHJldHVybiBob29rczsK
-ICB2YXIgZ2V0VGFnID0gaG9va3MuZ2V0VGFnOwogIHZhciBxdWlja01hcCA9IHsKICAgICJCZWZvcmVV
-bmxvYWRFdmVudCI6ICJFdmVudCIsCiAgICAiRGF0YVRyYW5zZmVyIjogIkNsaXBib2FyZCIsCiAgICAi
-R2VvR2VvbG9jYXRpb24iOiAiR2VvbG9jYXRpb24iLAogICAgIkxvY2F0aW9uIjogIiFMb2NhdGlvbiIs
-CiAgICAiV29ya2VyTWVzc2FnZUV2ZW50IjogIk1lc3NhZ2VFdmVudCIsCiAgICAiWE1MRG9jdW1lbnQi
-OiAiIURvY3VtZW50In07CiAgZnVuY3Rpb24gZ2V0VGFnRmlyZWZveChvKSB7CiAgICB2YXIgdGFnID0g
-Z2V0VGFnKG8pOwogICAgcmV0dXJuIHF1aWNrTWFwW3RhZ10gfHwgdGFnOwogIH0KICBob29rcy5nZXRU
-YWcgPSBnZXRUYWdGaXJlZm94Owp9CkMueGk9ZnVuY3Rpb24oaG9va3MpIHsKICB2YXIgdXNlckFnZW50
-ID0gdHlwZW9mIG5hdmlnYXRvciA9PSAib2JqZWN0IiA/IG5hdmlnYXRvci51c2VyQWdlbnQgOiAiIjsK
-ICBpZiAodXNlckFnZW50LmluZGV4T2YoIlRyaWRlbnQvIikgPT0gLTEpIHJldHVybiBob29rczsKICB2
-YXIgZ2V0VGFnID0gaG9va3MuZ2V0VGFnOwogIHZhciBxdWlja01hcCA9IHsKICAgICJCZWZvcmVVbmxv
-YWRFdmVudCI6ICJFdmVudCIsCiAgICAiRGF0YVRyYW5zZmVyIjogIkNsaXBib2FyZCIsCiAgICAiSFRN
-TERERWxlbWVudCI6ICJIVE1MRWxlbWVudCIsCiAgICAiSFRNTERURWxlbWVudCI6ICJIVE1MRWxlbWVu
-dCIsCiAgICAiSFRNTFBocmFzZUVsZW1lbnQiOiAiSFRNTEVsZW1lbnQiLAogICAgIlBvc2l0aW9uIjog
-Ikdlb3Bvc2l0aW9uIgogIH07CiAgZnVuY3Rpb24gZ2V0VGFnSUUobykgewogICAgdmFyIHRhZyA9IGdl
-dFRhZyhvKTsKICAgIHZhciBuZXdUYWcgPSBxdWlja01hcFt0YWddOwogICAgaWYgKG5ld1RhZykgcmV0
-dXJuIG5ld1RhZzsKICAgIGlmICh0YWcgPT0gIk9iamVjdCIpIHsKICAgICAgaWYgKHdpbmRvdy5EYXRh
-VmlldyAmJiAobyBpbnN0YW5jZW9mIHdpbmRvdy5EYXRhVmlldykpIHJldHVybiAiRGF0YVZpZXciOwog
-ICAgfQogICAgcmV0dXJuIHRhZzsKICB9CiAgZnVuY3Rpb24gcHJvdG90eXBlRm9yVGFnSUUodGFnKSB7
-CiAgICB2YXIgY29uc3RydWN0b3IgPSB3aW5kb3dbdGFnXTsKICAgIGlmIChjb25zdHJ1Y3RvciA9PSBu
-dWxsKSByZXR1cm4gbnVsbDsKICAgIHJldHVybiBjb25zdHJ1Y3Rvci5wcm90b3R5cGU7CiAgfQogIGhv
-b2tzLmdldFRhZyA9IGdldFRhZ0lFOwogIGhvb2tzLnByb3RvdHlwZUZvclRhZyA9IHByb3RvdHlwZUZv
-clRhZ0lFOwp9CkMuaTc9ZnVuY3Rpb24oaG9va3MpIHsgcmV0dXJuIGhvb2tzOyB9CgpDLkN0PW5ldyBQ
-LmJ5KCkKQy5FcT1uZXcgUC5rNSgpCkMueE09bmV3IFAudTUoKQpDLlFrPW5ldyBQLkUzKCkKQy5OVT1u
-ZXcgUC5KaSgpCkMuQTM9bmV3IFAuTXgobnVsbCkKQy5HYj1ILlZNKHQoWzEyNywyMDQ3LDY1NTM1LDEx
-MTQxMTFdKSx1LnQpCkMuYWs9SC5WTSh0KFswLDAsMzI3NzYsMzM3OTIsMSwxMDI0MCwwLDBdKSx1LnQp
-CkMuY209SC5WTSh0KFsiKjo6Y2xhc3MiLCIqOjpkaXIiLCIqOjpkcmFnZ2FibGUiLCIqOjpoaWRkZW4i
-LCIqOjppZCIsIio6OmluZXJ0IiwiKjo6aXRlbXByb3AiLCIqOjppdGVtcmVmIiwiKjo6aXRlbXNjb3Bl
-IiwiKjo6bGFuZyIsIio6OnNwZWxsY2hlY2siLCIqOjp0aXRsZSIsIio6OnRyYW5zbGF0ZSIsIkE6OmFj
-Y2Vzc2tleSIsIkE6OmNvb3JkcyIsIkE6OmhyZWZsYW5nIiwiQTo6bmFtZSIsIkE6OnNoYXBlIiwiQTo6
-dGFiaW5kZXgiLCJBOjp0YXJnZXQiLCJBOjp0eXBlIiwiQVJFQTo6YWNjZXNza2V5IiwiQVJFQTo6YWx0
-IiwiQVJFQTo6Y29vcmRzIiwiQVJFQTo6bm9ocmVmIiwiQVJFQTo6c2hhcGUiLCJBUkVBOjp0YWJpbmRl
-eCIsIkFSRUE6OnRhcmdldCIsIkFVRElPOjpjb250cm9scyIsIkFVRElPOjpsb29wIiwiQVVESU86Om1l
-ZGlhZ3JvdXAiLCJBVURJTzo6bXV0ZWQiLCJBVURJTzo6cHJlbG9hZCIsIkJETzo6ZGlyIiwiQk9EWTo6
-YWxpbmsiLCJCT0RZOjpiZ2NvbG9yIiwiQk9EWTo6bGluayIsIkJPRFk6OnRleHQiLCJCT0RZOjp2bGlu
-ayIsIkJSOjpjbGVhciIsIkJVVFRPTjo6YWNjZXNza2V5IiwiQlVUVE9OOjpkaXNhYmxlZCIsIkJVVFRP
-Tjo6bmFtZSIsIkJVVFRPTjo6dGFiaW5kZXgiLCJCVVRUT046OnR5cGUiLCJCVVRUT046OnZhbHVlIiwi
-Q0FOVkFTOjpoZWlnaHQiLCJDQU5WQVM6OndpZHRoIiwiQ0FQVElPTjo6YWxpZ24iLCJDT0w6OmFsaWdu
-IiwiQ09MOjpjaGFyIiwiQ09MOjpjaGFyb2ZmIiwiQ09MOjpzcGFuIiwiQ09MOjp2YWxpZ24iLCJDT0w6
-OndpZHRoIiwiQ09MR1JPVVA6OmFsaWduIiwiQ09MR1JPVVA6OmNoYXIiLCJDT0xHUk9VUDo6Y2hhcm9m
-ZiIsIkNPTEdST1VQOjpzcGFuIiwiQ09MR1JPVVA6OnZhbGlnbiIsIkNPTEdST1VQOjp3aWR0aCIsIkNP
-TU1BTkQ6OmNoZWNrZWQiLCJDT01NQU5EOjpjb21tYW5kIiwiQ09NTUFORDo6ZGlzYWJsZWQiLCJDT01N
-QU5EOjpsYWJlbCIsIkNPTU1BTkQ6OnJhZGlvZ3JvdXAiLCJDT01NQU5EOjp0eXBlIiwiREFUQTo6dmFs
-dWUiLCJERUw6OmRhdGV0aW1lIiwiREVUQUlMUzo6b3BlbiIsIkRJUjo6Y29tcGFjdCIsIkRJVjo6YWxp
-Z24iLCJETDo6Y29tcGFjdCIsIkZJRUxEU0VUOjpkaXNhYmxlZCIsIkZPTlQ6OmNvbG9yIiwiRk9OVDo6
-ZmFjZSIsIkZPTlQ6OnNpemUiLCJGT1JNOjphY2NlcHQiLCJGT1JNOjphdXRvY29tcGxldGUiLCJGT1JN
-OjplbmN0eXBlIiwiRk9STTo6bWV0aG9kIiwiRk9STTo6bmFtZSIsIkZPUk06Om5vdmFsaWRhdGUiLCJG
-T1JNOjp0YXJnZXQiLCJGUkFNRTo6bmFtZSIsIkgxOjphbGlnbiIsIkgyOjphbGlnbiIsIkgzOjphbGln
-biIsIkg0OjphbGlnbiIsIkg1OjphbGlnbiIsIkg2OjphbGlnbiIsIkhSOjphbGlnbiIsIkhSOjpub3No
-YWRlIiwiSFI6OnNpemUiLCJIUjo6d2lkdGgiLCJIVE1MOjp2ZXJzaW9uIiwiSUZSQU1FOjphbGlnbiIs
-IklGUkFNRTo6ZnJhbWVib3JkZXIiLCJJRlJBTUU6OmhlaWdodCIsIklGUkFNRTo6bWFyZ2luaGVpZ2h0
-IiwiSUZSQU1FOjptYXJnaW53aWR0aCIsIklGUkFNRTo6d2lkdGgiLCJJTUc6OmFsaWduIiwiSU1HOjph
-bHQiLCJJTUc6OmJvcmRlciIsIklNRzo6aGVpZ2h0IiwiSU1HOjpoc3BhY2UiLCJJTUc6OmlzbWFwIiwi
-SU1HOjpuYW1lIiwiSU1HOjp1c2VtYXAiLCJJTUc6OnZzcGFjZSIsIklNRzo6d2lkdGgiLCJJTlBVVDo6
-YWNjZXB0IiwiSU5QVVQ6OmFjY2Vzc2tleSIsIklOUFVUOjphbGlnbiIsIklOUFVUOjphbHQiLCJJTlBV
-VDo6YXV0b2NvbXBsZXRlIiwiSU5QVVQ6OmF1dG9mb2N1cyIsIklOUFVUOjpjaGVja2VkIiwiSU5QVVQ6
-OmRpc2FibGVkIiwiSU5QVVQ6OmlucHV0bW9kZSIsIklOUFVUOjppc21hcCIsIklOUFVUOjpsaXN0Iiwi
-SU5QVVQ6Om1heCIsIklOUFVUOjptYXhsZW5ndGgiLCJJTlBVVDo6bWluIiwiSU5QVVQ6Om11bHRpcGxl
-IiwiSU5QVVQ6Om5hbWUiLCJJTlBVVDo6cGxhY2Vob2xkZXIiLCJJTlBVVDo6cmVhZG9ubHkiLCJJTlBV
-VDo6cmVxdWlyZWQiLCJJTlBVVDo6c2l6ZSIsIklOUFVUOjpzdGVwIiwiSU5QVVQ6OnRhYmluZGV4Iiwi
-SU5QVVQ6OnR5cGUiLCJJTlBVVDo6dXNlbWFwIiwiSU5QVVQ6OnZhbHVlIiwiSU5TOjpkYXRldGltZSIs
-IktFWUdFTjo6ZGlzYWJsZWQiLCJLRVlHRU46OmtleXR5cGUiLCJLRVlHRU46Om5hbWUiLCJMQUJFTDo6
-YWNjZXNza2V5IiwiTEFCRUw6OmZvciIsIkxFR0VORDo6YWNjZXNza2V5IiwiTEVHRU5EOjphbGlnbiIs
-IkxJOjp0eXBlIiwiTEk6OnZhbHVlIiwiTElOSzo6c2l6ZXMiLCJNQVA6Om5hbWUiLCJNRU5VOjpjb21w
-YWN0IiwiTUVOVTo6bGFiZWwiLCJNRU5VOjp0eXBlIiwiTUVURVI6OmhpZ2giLCJNRVRFUjo6bG93Iiwi
-TUVURVI6Om1heCIsIk1FVEVSOjptaW4iLCJNRVRFUjo6dmFsdWUiLCJPQkpFQ1Q6OnR5cGVtdXN0bWF0
-Y2giLCJPTDo6Y29tcGFjdCIsIk9MOjpyZXZlcnNlZCIsIk9MOjpzdGFydCIsIk9MOjp0eXBlIiwiT1BU
-R1JPVVA6OmRpc2FibGVkIiwiT1BUR1JPVVA6OmxhYmVsIiwiT1BUSU9OOjpkaXNhYmxlZCIsIk9QVElP
-Tjo6bGFiZWwiLCJPUFRJT046OnNlbGVjdGVkIiwiT1BUSU9OOjp2YWx1ZSIsIk9VVFBVVDo6Zm9yIiwi
-T1VUUFVUOjpuYW1lIiwiUDo6YWxpZ24iLCJQUkU6OndpZHRoIiwiUFJPR1JFU1M6Om1heCIsIlBST0dS
-RVNTOjptaW4iLCJQUk9HUkVTUzo6dmFsdWUiLCJTRUxFQ1Q6OmF1dG9jb21wbGV0ZSIsIlNFTEVDVDo6
-ZGlzYWJsZWQiLCJTRUxFQ1Q6Om11bHRpcGxlIiwiU0VMRUNUOjpuYW1lIiwiU0VMRUNUOjpyZXF1aXJl
-ZCIsIlNFTEVDVDo6c2l6ZSIsIlNFTEVDVDo6dGFiaW5kZXgiLCJTT1VSQ0U6OnR5cGUiLCJUQUJMRTo6
-YWxpZ24iLCJUQUJMRTo6Ymdjb2xvciIsIlRBQkxFOjpib3JkZXIiLCJUQUJMRTo6Y2VsbHBhZGRpbmci
-LCJUQUJMRTo6Y2VsbHNwYWNpbmciLCJUQUJMRTo6ZnJhbWUiLCJUQUJMRTo6cnVsZXMiLCJUQUJMRTo6
-c3VtbWFyeSIsIlRBQkxFOjp3aWR0aCIsIlRCT0RZOjphbGlnbiIsIlRCT0RZOjpjaGFyIiwiVEJPRFk6
-OmNoYXJvZmYiLCJUQk9EWTo6dmFsaWduIiwiVEQ6OmFiYnIiLCJURDo6YWxpZ24iLCJURDo6YXhpcyIs
-IlREOjpiZ2NvbG9yIiwiVEQ6OmNoYXIiLCJURDo6Y2hhcm9mZiIsIlREOjpjb2xzcGFuIiwiVEQ6Omhl
-YWRlcnMiLCJURDo6aGVpZ2h0IiwiVEQ6Om5vd3JhcCIsIlREOjpyb3dzcGFuIiwiVEQ6OnNjb3BlIiwi
-VEQ6OnZhbGlnbiIsIlREOjp3aWR0aCIsIlRFWFRBUkVBOjphY2Nlc3NrZXkiLCJURVhUQVJFQTo6YXV0
-b2NvbXBsZXRlIiwiVEVYVEFSRUE6OmNvbHMiLCJURVhUQVJFQTo6ZGlzYWJsZWQiLCJURVhUQVJFQTo6
-aW5wdXRtb2RlIiwiVEVYVEFSRUE6Om5hbWUiLCJURVhUQVJFQTo6cGxhY2Vob2xkZXIiLCJURVhUQVJF
-QTo6cmVhZG9ubHkiLCJURVhUQVJFQTo6cmVxdWlyZWQiLCJURVhUQVJFQTo6cm93cyIsIlRFWFRBUkVB
-Ojp0YWJpbmRleCIsIlRFWFRBUkVBOjp3cmFwIiwiVEZPT1Q6OmFsaWduIiwiVEZPT1Q6OmNoYXIiLCJU
-Rk9PVDo6Y2hhcm9mZiIsIlRGT09UOjp2YWxpZ24iLCJUSDo6YWJiciIsIlRIOjphbGlnbiIsIlRIOjph
-eGlzIiwiVEg6OmJnY29sb3IiLCJUSDo6Y2hhciIsIlRIOjpjaGFyb2ZmIiwiVEg6OmNvbHNwYW4iLCJU
-SDo6aGVhZGVycyIsIlRIOjpoZWlnaHQiLCJUSDo6bm93cmFwIiwiVEg6OnJvd3NwYW4iLCJUSDo6c2Nv
-cGUiLCJUSDo6dmFsaWduIiwiVEg6OndpZHRoIiwiVEhFQUQ6OmFsaWduIiwiVEhFQUQ6OmNoYXIiLCJU
-SEVBRDo6Y2hhcm9mZiIsIlRIRUFEOjp2YWxpZ24iLCJUUjo6YWxpZ24iLCJUUjo6Ymdjb2xvciIsIlRS
-OjpjaGFyIiwiVFI6OmNoYXJvZmYiLCJUUjo6dmFsaWduIiwiVFJBQ0s6OmRlZmF1bHQiLCJUUkFDSzo6
-a2luZCIsIlRSQUNLOjpsYWJlbCIsIlRSQUNLOjpzcmNsYW5nIiwiVUw6OmNvbXBhY3QiLCJVTDo6dHlw
-ZSIsIlZJREVPOjpjb250cm9scyIsIlZJREVPOjpoZWlnaHQiLCJWSURFTzo6bG9vcCIsIlZJREVPOjpt
-ZWRpYWdyb3VwIiwiVklERU86Om11dGVkIiwiVklERU86OnByZWxvYWQiLCJWSURFTzo6d2lkdGgiXSks
-dS5zKQpDLlZDPUguVk0odChbMCwwLDY1NDkwLDQ1MDU1LDY1NTM1LDM0ODE1LDY1NTM0LDE4NDMxXSks
-dS50KQpDLm1LPUguVk0odChbMCwwLDI2NjI0LDEwMjMsNjU1MzQsMjA0Nyw2NTUzNCwyMDQ3XSksdS50
-KQpDLlNxPUguVk0odChbIkhFQUQiLCJBUkVBIiwiQkFTRSIsIkJBU0VGT05UIiwiQlIiLCJDT0wiLCJD
-T0xHUk9VUCIsIkVNQkVEIiwiRlJBTUUiLCJGUkFNRVNFVCIsIkhSIiwiSU1BR0UiLCJJTUciLCJJTlBV
-VCIsIklTSU5ERVgiLCJMSU5LIiwiTUVUQSIsIlBBUkFNIiwiU09VUkNFIiwiU1RZTEUiLCJUSVRMRSIs
-IldCUiJdKSx1LnMpCkMueEQ9SC5WTSh0KFtdKSx1LnUpCkMuZG49SC5WTSh0KFtdKSx1LnMpCkMuaFU9
-SC5WTSh0KFtdKSx1Lm0pCkMudG89SC5WTSh0KFswLDAsMzI3MjIsMTIyODcsNjU1MzQsMzQ4MTUsNjU1
-MzQsMTg0MzFdKSx1LnQpCkMuRjM9SC5WTSh0KFswLDAsMjQ1NzYsMTAyMyw2NTUzNCwzNDgxNSw2NTUz
-NCwxODQzMV0pLHUudCkKQy5lYT1ILlZNKHQoWzAsMCwzMjc1NCwxMTI2Myw2NTUzNCwzNDgxNSw2NTUz
-NCwxODQzMV0pLHUudCkKQy5aSj1ILlZNKHQoWzAsMCwzMjcyMiwxMjI4Nyw2NTUzNSwzNDgxNSw2NTUz
-NCwxODQzMV0pLHUudCkKQy5XZD1ILlZNKHQoWzAsMCw2NTQ5MCwxMjI4Nyw2NTUzNSwzNDgxNSw2NTUz
-NCwxODQzMV0pLHUudCkKQy5ReD1ILlZNKHQoWyJiaW5kIiwiaWYiLCJyZWYiLCJyZXBlYXQiLCJzeW50
-YXgiXSksdS5zKQpDLkJJPUguVk0odChbIkE6OmhyZWYiLCJBUkVBOjpocmVmIiwiQkxPQ0tRVU9URTo6
-Y2l0ZSIsIkJPRFk6OmJhY2tncm91bmQiLCJDT01NQU5EOjppY29uIiwiREVMOjpjaXRlIiwiRk9STTo6
-YWN0aW9uIiwiSU1HOjpzcmMiLCJJTlBVVDo6c3JjIiwiSU5TOjpjaXRlIiwiUTo6Y2l0ZSIsIlZJREVP
-Ojpwb3N0ZXIiXSksdS5zKQpDLldPPW5ldyBILkxQKDAse30sQy5kbixILk4wKCJMUDxxVSxxVT4iKSkK
-Qy5pSD1ILlZNKHQoW10pLEguTjAoImpkPEdEPiIpKQpDLkNNPW5ldyBILkxQKDAse30sQy5pSCxILk4w
-KCJMUDxHRCxAPiIpKQpDLlkyPW5ldyBMLnk4KCJOYXZpZ2F0aW9uVHJlZU5vZGVUeXBlLmRpcmVjdG9y
-eSIpCkMucmY9bmV3IEwueTgoIk5hdmlnYXRpb25UcmVlTm9kZVR5cGUuZmlsZSIpCkMuVGU9bmV3IEgu
-d3YoImNhbGwiKX0pKCk7KGZ1bmN0aW9uIHN0YXRpY0ZpZWxkcygpeyQueWo9MAokLm1KPW51bGwKJC5Q
-ND1udWxsCiQuTkY9bnVsbAokLlRYPW51bGwKJC54Nz1udWxsCiQubnc9bnVsbAokLnZ2PW51bGwKJC5C
-dj1udWxsCiQuUzY9bnVsbAokLms4PW51bGwKJC5tZz1udWxsCiQuVUQ9ITEKJC5YMz1DLk5VCiQueGc9
-W10KJC54bz1udWxsCiQuQk89bnVsbAokLmx0PW51bGwKJC5FVT1udWxsCiQub3I9UC5GbCh1Lk4sdS5a
-KQokLkk2PW51bGwKJC5GZj1udWxsfSkoKTsoZnVuY3Rpb24gbGF6eUluaXRpYWxpemVycygpe3ZhciB0
-PWh1bmtIZWxwZXJzLmxhenkKdCgkLCJmYSIsInciLGZ1bmN0aW9uKCl7cmV0dXJuIEguWWcoIl8kZGFy
-dF9kYXJ0Q2xvc3VyZSIpfSkKdCgkLCJZMiIsIlVOIixmdW5jdGlvbigpe3JldHVybiBILllnKCJfJGRh
-cnRfanMiKX0pCnQoJCwiVTIiLCJTbiIsZnVuY3Rpb24oKXtyZXR1cm4gSC5jTShILlM3KHsKdG9TdHJp
-bmc6ZnVuY3Rpb24oKXtyZXR1cm4iJHJlY2VpdmVyJCJ9fSkpfSkKdCgkLCJ4cSIsImxxIixmdW5jdGlv
-bigpe3JldHVybiBILmNNKEguUzcoeyRtZXRob2QkOm51bGwsCnRvU3RyaW5nOmZ1bmN0aW9uKCl7cmV0
-dXJuIiRyZWNlaXZlciQifX0pKX0pCnQoJCwiUjEiLCJOOSIsZnVuY3Rpb24oKXtyZXR1cm4gSC5jTShI
-LlM3KG51bGwpKX0pCnQoJCwiZk4iLCJpSSIsZnVuY3Rpb24oKXtyZXR1cm4gSC5jTShmdW5jdGlvbigp
-e3ZhciAkYXJndW1lbnRzRXhwciQ9JyRhcmd1bWVudHMkJwp0cnl7bnVsbC4kbWV0aG9kJCgkYXJndW1l
-bnRzRXhwciQpfWNhdGNoKHMpe3JldHVybiBzLm1lc3NhZ2V9fSgpKX0pCnQoJCwicWkiLCJLZiIsZnVu
-Y3Rpb24oKXtyZXR1cm4gSC5jTShILlM3KHZvaWQgMCkpfSkKdCgkLCJyWiIsIlpoIixmdW5jdGlvbigp
-e3JldHVybiBILmNNKGZ1bmN0aW9uKCl7dmFyICRhcmd1bWVudHNFeHByJD0nJGFyZ3VtZW50cyQnCnRy
-eXsodm9pZCAwKS4kbWV0aG9kJCgkYXJndW1lbnRzRXhwciQpfWNhdGNoKHMpe3JldHVybiBzLm1lc3Nh
-Z2V9fSgpKX0pCnQoJCwia3EiLCJyTiIsZnVuY3Rpb24oKXtyZXR1cm4gSC5jTShILk1qKG51bGwpKX0p
-CnQoJCwidHQiLCJjMyIsZnVuY3Rpb24oKXtyZXR1cm4gSC5jTShmdW5jdGlvbigpe3RyeXtudWxsLiRt
-ZXRob2QkfWNhdGNoKHMpe3JldHVybiBzLm1lc3NhZ2V9fSgpKX0pCnQoJCwiZHQiLCJISyIsZnVuY3Rp
-b24oKXtyZXR1cm4gSC5jTShILk1qKHZvaWQgMCkpfSkKdCgkLCJBNyIsInIxIixmdW5jdGlvbigpe3Jl
-dHVybiBILmNNKGZ1bmN0aW9uKCl7dHJ5eyh2b2lkIDApLiRtZXRob2QkfWNhdGNoKHMpe3JldHVybiBz
-Lm1lc3NhZ2V9fSgpKX0pCnQoJCwiV2MiLCJ1dCIsZnVuY3Rpb24oKXtyZXR1cm4gUC5PaigpfSkKdCgk
-LCJraCIsInJmIixmdW5jdGlvbigpe3JldHVybiBQLldJKCl9KQp0KCQsImJ0IiwiVjciLGZ1bmN0aW9u
-KCl7cmV0dXJuIEguRFEoSC5YRihILlZNKFstMiwtMiwtMiwtMiwtMiwtMiwtMiwtMiwtMiwtMiwtMiwt
-MiwtMiwtMiwtMiwtMiwtMiwtMiwtMiwtMiwtMiwtMiwtMiwtMiwtMiwtMiwtMiwtMiwtMiwtMiwtMiwt
-MiwtMiwtMiwtMiwtMiwtMiwtMSwtMiwtMiwtMiwtMiwtMiw2MiwtMiw2MiwtMiw2Myw1Miw1Myw1NCw1
-NSw1Niw1Nyw1OCw1OSw2MCw2MSwtMiwtMiwtMiwtMSwtMiwtMiwtMiwwLDEsMiwzLDQsNSw2LDcsOCw5
-LDEwLDExLDEyLDEzLDE0LDE1LDE2LDE3LDE4LDE5LDIwLDIxLDIyLDIzLDI0LDI1LC0yLC0yLC0yLC0y
-LDYzLC0yLDI2LDI3LDI4LDI5LDMwLDMxLDMyLDMzLDM0LDM1LDM2LDM3LDM4LDM5LDQwLDQxLDQyLDQz
-LDQ0LDQ1LDQ2LDQ3LDQ4LDQ5LDUwLDUxLC0yLC0yLC0yLC0yLC0yXSx1LnQpKSl9KQp0KCQsIk01Iiwi
-d1EiLGZ1bmN0aW9uKCl7cmV0dXJuIHR5cGVvZiBwcm9jZXNzIT0idW5kZWZpbmVkIiYmT2JqZWN0LnBy
-b3RvdHlwZS50b1N0cmluZy5jYWxsKHByb2Nlc3MpPT0iW29iamVjdCBwcm9jZXNzXSImJnByb2Nlc3Mu
-cGxhdGZvcm09PSJ3aW4zMiJ9KQp0KCQsIm1mIiwiejQiLGZ1bmN0aW9uKCl7cmV0dXJuIFAubnUoIl5b
-XFwtXFwuMC05QS1aX2Eten5dKiQiKX0pCnQoJCwiSkciLCJ2WiIsZnVuY3Rpb24oKXtyZXR1cm4gUC51
-eCgpfSkKdCgkLCJTQyIsIkFOIixmdW5jdGlvbigpe3JldHVybiBQLnRNKFsiQSIsIkFCQlIiLCJBQ1JP
-TllNIiwiQUREUkVTUyIsIkFSRUEiLCJBUlRJQ0xFIiwiQVNJREUiLCJBVURJTyIsIkIiLCJCREkiLCJC
-RE8iLCJCSUciLCJCTE9DS1FVT1RFIiwiQlIiLCJCVVRUT04iLCJDQU5WQVMiLCJDQVBUSU9OIiwiQ0VO
-VEVSIiwiQ0lURSIsIkNPREUiLCJDT0wiLCJDT0xHUk9VUCIsIkNPTU1BTkQiLCJEQVRBIiwiREFUQUxJ
-U1QiLCJERCIsIkRFTCIsIkRFVEFJTFMiLCJERk4iLCJESVIiLCJESVYiLCJETCIsIkRUIiwiRU0iLCJG
-SUVMRFNFVCIsIkZJR0NBUFRJT04iLCJGSUdVUkUiLCJGT05UIiwiRk9PVEVSIiwiRk9STSIsIkgxIiwi
-SDIiLCJIMyIsIkg0IiwiSDUiLCJINiIsIkhFQURFUiIsIkhHUk9VUCIsIkhSIiwiSSIsIklGUkFNRSIs
-IklNRyIsIklOUFVUIiwiSU5TIiwiS0JEIiwiTEFCRUwiLCJMRUdFTkQiLCJMSSIsIk1BUCIsIk1BUksi
-LCJNRU5VIiwiTUVURVIiLCJOQVYiLCJOT0JSIiwiT0wiLCJPUFRHUk9VUCIsIk9QVElPTiIsIk9VVFBV
-VCIsIlAiLCJQUkUiLCJQUk9HUkVTUyIsIlEiLCJTIiwiU0FNUCIsIlNFQ1RJT04iLCJTRUxFQ1QiLCJT
-TUFMTCIsIlNPVVJDRSIsIlNQQU4iLCJTVFJJS0UiLCJTVFJPTkciLCJTVUIiLCJTVU1NQVJZIiwiU1VQ
-IiwiVEFCTEUiLCJUQk9EWSIsIlREIiwiVEVYVEFSRUEiLCJURk9PVCIsIlRIIiwiVEhFQUQiLCJUSU1F
-IiwiVFIiLCJUUkFDSyIsIlRUIiwiVSIsIlVMIiwiVkFSIiwiVklERU8iLCJXQlIiXSx1Lk4pfSkKdCgk
-LCJYNCIsImhHIixmdW5jdGlvbigpe3JldHVybiBQLm51KCJeXFxTKyQiKX0pCnQoJCwid08iLCJvdyIs
-ZnVuY3Rpb24oKXtyZXR1cm4gdS52LmIoUC5ORChzZWxmKSl9KQp0KCQsImt0IiwiUjgiLGZ1bmN0aW9u
-KCl7cmV0dXJuIEguWWcoIl8kZGFydF9kYXJ0T2JqZWN0Iil9KQp0KCQsImZLIiwia0kiLGZ1bmN0aW9u
-KCl7cmV0dXJuIGZ1bmN0aW9uIERhcnRPYmplY3QoYSl7dGhpcy5vPWF9fSkKdCgkLCJxdCIsInpCIixm
-dW5jdGlvbigpe3JldHVybiBuZXcgVC5HVigpfSkKdCgkLCJFWSIsImZpIixmdW5jdGlvbigpe3JldHVy
-biBXLlpyKCkucXVlcnlTZWxlY3RvcigiaGVhZGVyIil9KQp0KCQsIlRSIiwiRFciLGZ1bmN0aW9uKCl7
-cmV0dXJuIFcuWnIoKS5xdWVyeVNlbGVjdG9yKCJmb290ZXIiKX0pCnQoJCwiVzYiLCJoTCIsZnVuY3Rp
-b24oKXtyZXR1cm4gVy5acigpLnF1ZXJ5U2VsZWN0b3IoIi5lZGl0LXBhbmVsIC5wYW5lbC1jb250ZW50
-Iil9KQp0KCQsImhUIiwibVEiLGZ1bmN0aW9uKCl7cmV0dXJuIFcuWnIoKS5xdWVyeVNlbGVjdG9yKCIu
-ZWRpdC1saXN0IC5wYW5lbC1jb250ZW50Iil9KQp0KCQsImF2IiwiRDkiLGZ1bmN0aW9uKCl7cmV0dXJu
-IFcuWnIoKS5xdWVyeVNlbGVjdG9yKCIjdW5pdC1uYW1lIil9KQp0KCQsImZlIiwiS0ciLGZ1bmN0aW9u
-KCl7cmV0dXJuIG5ldyBMLlhBKCl9KQp0KCQsIm1NIiwiblUiLGZ1bmN0aW9uKCl7cmV0dXJuIG5ldyBN
-LmxJKCQuSGsoKSl9KQp0KCQsInlyIiwiYkQiLGZ1bmN0aW9uKCl7cmV0dXJuIG5ldyBFLk9GKFAubnUo
-Ii8iKSxQLm51KCJbXi9dJCIpLFAubnUoIl4vIikpfSkKdCgkLCJNayIsIktrIixmdW5jdGlvbigpe3Jl
-dHVybiBuZXcgTC5JVihQLm51KCJbL1xcXFxdIiksUC5udSgiW14vXFxcXF0kIiksUC5udSgiXihcXFxc
-XFxcXFteXFxcXF0rXFxcXFteXFxcXC9dK3xbYS16QS1aXTpbL1xcXFxdKSIpLFAubnUoIl5bL1xcXFxd
-KD8hWy9cXFxcXSkiKSl9KQp0KCQsImFrIiwiRWIiLGZ1bmN0aW9uKCl7cmV0dXJuIG5ldyBGLnJ1KFAu
-bnUoIi8iKSxQLm51KCIoXlthLXpBLVpdWy0rLmEtekEtWlxcZF0qOi8vfFteL10pJCIpLFAubnUoIlth
-LXpBLVpdWy0rLmEtekEtWlxcZF0qOi8vW14vXSoiKSxQLm51KCJeLyIpKX0pCnQoJCwibHMiLCJIayIs
-ZnVuY3Rpb24oKXtyZXR1cm4gTy5SaCgpfSl9KSgpOyhmdW5jdGlvbiBuYXRpdmVTdXBwb3J0KCl7IWZ1
-bmN0aW9uKCl7dmFyIHQ9ZnVuY3Rpb24oYSl7dmFyIG49e30KblthXT0xCnJldHVybiBPYmplY3Qua2V5
-cyhodW5rSGVscGVycy5jb252ZXJ0VG9GYXN0T2JqZWN0KG4pKVswXX0Kdi5nZXRJc29sYXRlVGFnPWZ1
-bmN0aW9uKGEpe3JldHVybiB0KCJfX19kYXJ0XyIrYSt2Lmlzb2xhdGVUYWcpfQp2YXIgcz0iX19fZGFy
-dF9pc29sYXRlX3RhZ3NfIgp2YXIgcj1PYmplY3Rbc118fChPYmplY3Rbc109T2JqZWN0LmNyZWF0ZShu
-dWxsKSkKdmFyIHE9Il9aeFl4WCIKZm9yKHZhciBwPTA7O3ArKyl7dmFyIG89dChxKyJfIitwKyJfIikK
-aWYoIShvIGluIHIpKXtyW29dPTEKdi5pc29sYXRlVGFnPW8KYnJlYWt9fXYuZGlzcGF0Y2hQcm9wZXJ0
-eU5hbWU9di5nZXRJc29sYXRlVGFnKCJkaXNwYXRjaF9yZWNvcmQiKX0oKQpodW5rSGVscGVycy5zZXRP
-clVwZGF0ZUludGVyY2VwdG9yc0J5VGFnKHtET01FcnJvcjpKLnZCLERPTUltcGxlbWVudGF0aW9uOkou
-dkIsTWVkaWFFcnJvcjpKLnZCLE5hdmlnYXRvcjpKLnZCLE5hdmlnYXRvckNvbmN1cnJlbnRIYXJkd2Fy
-ZTpKLnZCLE5hdmlnYXRvclVzZXJNZWRpYUVycm9yOkoudkIsT3ZlcmNvbnN0cmFpbmVkRXJyb3I6Si52
-QixQb3NpdGlvbkVycm9yOkoudkIsUmFuZ2U6Si52QixTUUxFcnJvcjpKLnZCLERhdGFWaWV3OkguRVQs
-QXJyYXlCdWZmZXJWaWV3OkguRVQsRmxvYXQzMkFycmF5OkguRGcsRmxvYXQ2NEFycmF5OkguRGcsSW50
-MTZBcnJheTpILnhqLEludDMyQXJyYXk6SC5kRSxJbnQ4QXJyYXk6SC5aQSxVaW50MTZBcnJheTpILndm
-LFVpbnQzMkFycmF5OkguUHEsVWludDhDbGFtcGVkQXJyYXk6SC5lRSxDYW52YXNQaXhlbEFycmF5Okgu
-ZUUsVWludDhBcnJheTpILlY2LEhUTUxBdWRpb0VsZW1lbnQ6Vy5xRSxIVE1MQlJFbGVtZW50OlcucUUs
-SFRNTEJ1dHRvbkVsZW1lbnQ6Vy5xRSxIVE1MQ2FudmFzRWxlbWVudDpXLnFFLEhUTUxDb250ZW50RWxl
-bWVudDpXLnFFLEhUTUxETGlzdEVsZW1lbnQ6Vy5xRSxIVE1MRGF0YUVsZW1lbnQ6Vy5xRSxIVE1MRGF0
-YUxpc3RFbGVtZW50OlcucUUsSFRNTERldGFpbHNFbGVtZW50OlcucUUsSFRNTERpYWxvZ0VsZW1lbnQ6
-Vy5xRSxIVE1MRGl2RWxlbWVudDpXLnFFLEhUTUxFbWJlZEVsZW1lbnQ6Vy5xRSxIVE1MRmllbGRTZXRF
-bGVtZW50OlcucUUsSFRNTEhSRWxlbWVudDpXLnFFLEhUTUxIZWFkRWxlbWVudDpXLnFFLEhUTUxIZWFk
-aW5nRWxlbWVudDpXLnFFLEhUTUxIdG1sRWxlbWVudDpXLnFFLEhUTUxJRnJhbWVFbGVtZW50OlcucUUs
-SFRNTEltYWdlRWxlbWVudDpXLnFFLEhUTUxJbnB1dEVsZW1lbnQ6Vy5xRSxIVE1MTElFbGVtZW50Olcu
-cUUsSFRNTExhYmVsRWxlbWVudDpXLnFFLEhUTUxMZWdlbmRFbGVtZW50OlcucUUsSFRNTExpbmtFbGVt
-ZW50OlcucUUsSFRNTE1hcEVsZW1lbnQ6Vy5xRSxIVE1MTWVkaWFFbGVtZW50OlcucUUsSFRNTE1lbnVF
-bGVtZW50OlcucUUsSFRNTE1ldGFFbGVtZW50OlcucUUsSFRNTE1ldGVyRWxlbWVudDpXLnFFLEhUTUxN
-b2RFbGVtZW50OlcucUUsSFRNTE9MaXN0RWxlbWVudDpXLnFFLEhUTUxPYmplY3RFbGVtZW50OlcucUUs
-SFRNTE9wdEdyb3VwRWxlbWVudDpXLnFFLEhUTUxPcHRpb25FbGVtZW50OlcucUUsSFRNTE91dHB1dEVs
-ZW1lbnQ6Vy5xRSxIVE1MUGFyYW1FbGVtZW50OlcucUUsSFRNTFBpY3R1cmVFbGVtZW50OlcucUUsSFRN
-TFByZUVsZW1lbnQ6Vy5xRSxIVE1MUHJvZ3Jlc3NFbGVtZW50OlcucUUsSFRNTFF1b3RlRWxlbWVudDpX
-LnFFLEhUTUxTY3JpcHRFbGVtZW50OlcucUUsSFRNTFNoYWRvd0VsZW1lbnQ6Vy5xRSxIVE1MU2xvdEVs
-ZW1lbnQ6Vy5xRSxIVE1MU291cmNlRWxlbWVudDpXLnFFLEhUTUxTcGFuRWxlbWVudDpXLnFFLEhUTUxT
-dHlsZUVsZW1lbnQ6Vy5xRSxIVE1MVGFibGVDYXB0aW9uRWxlbWVudDpXLnFFLEhUTUxUYWJsZUNlbGxF
-bGVtZW50OlcucUUsSFRNTFRhYmxlRGF0YUNlbGxFbGVtZW50OlcucUUsSFRNTFRhYmxlSGVhZGVyQ2Vs
-bEVsZW1lbnQ6Vy5xRSxIVE1MVGFibGVDb2xFbGVtZW50OlcucUUsSFRNTFRleHRBcmVhRWxlbWVudDpX
-LnFFLEhUTUxUaW1lRWxlbWVudDpXLnFFLEhUTUxUaXRsZUVsZW1lbnQ6Vy5xRSxIVE1MVHJhY2tFbGVt
-ZW50OlcucUUsSFRNTFVMaXN0RWxlbWVudDpXLnFFLEhUTUxVbmtub3duRWxlbWVudDpXLnFFLEhUTUxW
-aWRlb0VsZW1lbnQ6Vy5xRSxIVE1MRGlyZWN0b3J5RWxlbWVudDpXLnFFLEhUTUxGb250RWxlbWVudDpX
-LnFFLEhUTUxGcmFtZUVsZW1lbnQ6Vy5xRSxIVE1MRnJhbWVTZXRFbGVtZW50OlcucUUsSFRNTE1hcnF1
-ZWVFbGVtZW50OlcucUUsSFRNTEVsZW1lbnQ6Vy5xRSxIVE1MQW5jaG9yRWxlbWVudDpXLkdoLEhUTUxB
-cmVhRWxlbWVudDpXLmZZLEhUTUxCYXNlRWxlbWVudDpXLm5CLEJsb2I6Vy5BeixIVE1MQm9keUVsZW1l
-bnQ6Vy5RUCxDREFUQVNlY3Rpb246Vy5ueCxDaGFyYWN0ZXJEYXRhOlcubngsQ29tbWVudDpXLm54LFBy
-b2Nlc3NpbmdJbnN0cnVjdGlvbjpXLm54LFRleHQ6Vy5ueCxDU1NTdHlsZURlY2xhcmF0aW9uOlcub0os
-TVNTdHlsZUNTU1Byb3BlcnRpZXM6Vy5vSixDU1MyUHJvcGVydGllczpXLm9KLFhNTERvY3VtZW50Olcu
-UUYsRG9jdW1lbnQ6Vy5RRixET01FeGNlcHRpb246Vy5OaCxET01SZWN0UmVhZE9ubHk6Vy5JQixET01U
-b2tlbkxpc3Q6Vy5uNyxFbGVtZW50OlcuY3YsQWJvcnRQYXltZW50RXZlbnQ6Vy5lYSxBbmltYXRpb25F
-dmVudDpXLmVhLEFuaW1hdGlvblBsYXliYWNrRXZlbnQ6Vy5lYSxBcHBsaWNhdGlvbkNhY2hlRXJyb3JF
-dmVudDpXLmVhLEJhY2tncm91bmRGZXRjaENsaWNrRXZlbnQ6Vy5lYSxCYWNrZ3JvdW5kRmV0Y2hFdmVu
-dDpXLmVhLEJhY2tncm91bmRGZXRjaEZhaWxFdmVudDpXLmVhLEJhY2tncm91bmRGZXRjaGVkRXZlbnQ6
-Vy5lYSxCZWZvcmVJbnN0YWxsUHJvbXB0RXZlbnQ6Vy5lYSxCZWZvcmVVbmxvYWRFdmVudDpXLmVhLEJs
-b2JFdmVudDpXLmVhLENhbk1ha2VQYXltZW50RXZlbnQ6Vy5lYSxDbGlwYm9hcmRFdmVudDpXLmVhLENs
-b3NlRXZlbnQ6Vy5lYSxDdXN0b21FdmVudDpXLmVhLERldmljZU1vdGlvbkV2ZW50OlcuZWEsRGV2aWNl
-T3JpZW50YXRpb25FdmVudDpXLmVhLEVycm9yRXZlbnQ6Vy5lYSxFeHRlbmRhYmxlRXZlbnQ6Vy5lYSxF
-eHRlbmRhYmxlTWVzc2FnZUV2ZW50OlcuZWEsRmV0Y2hFdmVudDpXLmVhLEZvbnRGYWNlU2V0TG9hZEV2
-ZW50OlcuZWEsRm9yZWlnbkZldGNoRXZlbnQ6Vy5lYSxHYW1lcGFkRXZlbnQ6Vy5lYSxIYXNoQ2hhbmdl
-RXZlbnQ6Vy5lYSxJbnN0YWxsRXZlbnQ6Vy5lYSxNZWRpYUVuY3J5cHRlZEV2ZW50OlcuZWEsTWVkaWFL
-ZXlNZXNzYWdlRXZlbnQ6Vy5lYSxNZWRpYVF1ZXJ5TGlzdEV2ZW50OlcuZWEsTWVkaWFTdHJlYW1FdmVu
-dDpXLmVhLE1lZGlhU3RyZWFtVHJhY2tFdmVudDpXLmVhLE1lc3NhZ2VFdmVudDpXLmVhLE1JRElDb25u
-ZWN0aW9uRXZlbnQ6Vy5lYSxNSURJTWVzc2FnZUV2ZW50OlcuZWEsTXV0YXRpb25FdmVudDpXLmVhLE5v
-dGlmaWNhdGlvbkV2ZW50OlcuZWEsUGFnZVRyYW5zaXRpb25FdmVudDpXLmVhLFBheW1lbnRSZXF1ZXN0
-RXZlbnQ6Vy5lYSxQYXltZW50UmVxdWVzdFVwZGF0ZUV2ZW50OlcuZWEsUG9wU3RhdGVFdmVudDpXLmVh
-LFByZXNlbnRhdGlvbkNvbm5lY3Rpb25BdmFpbGFibGVFdmVudDpXLmVhLFByZXNlbnRhdGlvbkNvbm5l
-Y3Rpb25DbG9zZUV2ZW50OlcuZWEsUHJvbWlzZVJlamVjdGlvbkV2ZW50OlcuZWEsUHVzaEV2ZW50Olcu
-ZWEsUlRDRGF0YUNoYW5uZWxFdmVudDpXLmVhLFJUQ0RUTUZUb25lQ2hhbmdlRXZlbnQ6Vy5lYSxSVENQ
-ZWVyQ29ubmVjdGlvbkljZUV2ZW50OlcuZWEsUlRDVHJhY2tFdmVudDpXLmVhLFNlY3VyaXR5UG9saWN5
-VmlvbGF0aW9uRXZlbnQ6Vy5lYSxTZW5zb3JFcnJvckV2ZW50OlcuZWEsU3BlZWNoUmVjb2duaXRpb25F
-cnJvcjpXLmVhLFNwZWVjaFJlY29nbml0aW9uRXZlbnQ6Vy5lYSxTcGVlY2hTeW50aGVzaXNFdmVudDpX
-LmVhLFN0b3JhZ2VFdmVudDpXLmVhLFN5bmNFdmVudDpXLmVhLFRyYWNrRXZlbnQ6Vy5lYSxUcmFuc2l0
-aW9uRXZlbnQ6Vy5lYSxXZWJLaXRUcmFuc2l0aW9uRXZlbnQ6Vy5lYSxWUkRldmljZUV2ZW50OlcuZWEs
-VlJEaXNwbGF5RXZlbnQ6Vy5lYSxWUlNlc3Npb25FdmVudDpXLmVhLE1vam9JbnRlcmZhY2VSZXF1ZXN0
-RXZlbnQ6Vy5lYSxVU0JDb25uZWN0aW9uRXZlbnQ6Vy5lYSxJREJWZXJzaW9uQ2hhbmdlRXZlbnQ6Vy5l
-YSxBdWRpb1Byb2Nlc3NpbmdFdmVudDpXLmVhLE9mZmxpbmVBdWRpb0NvbXBsZXRpb25FdmVudDpXLmVh
-LFdlYkdMQ29udGV4dEV2ZW50OlcuZWEsRXZlbnQ6Vy5lYSxJbnB1dEV2ZW50OlcuZWEsRXZlbnRUYXJn
-ZXQ6Vy5EMCxGaWxlOlcuVDUsSFRNTEZvcm1FbGVtZW50OlcuaDQsSGlzdG9yeTpXLmJyLEhUTUxEb2N1
-bWVudDpXLlZiLFhNTEh0dHBSZXF1ZXN0OlcuTzcsWE1MSHR0cFJlcXVlc3RFdmVudFRhcmdldDpXLndh
-LEltYWdlRGF0YTpXLlNnLExvY2F0aW9uOlcudTgsTW91c2VFdmVudDpXLkFqLERyYWdFdmVudDpXLkFq
-LFBvaW50ZXJFdmVudDpXLkFqLFdoZWVsRXZlbnQ6Vy5BaixEb2N1bWVudEZyYWdtZW50OlcudUgsU2hh
-ZG93Um9vdDpXLnVILERvY3VtZW50VHlwZTpXLnVILE5vZGU6Vy51SCxOb2RlTGlzdDpXLkJILFJhZGlv
-Tm9kZUxpc3Q6Vy5CSCxIVE1MUGFyYWdyYXBoRWxlbWVudDpXLlNOLFByb2dyZXNzRXZlbnQ6Vy5ldyxS
-ZXNvdXJjZVByb2dyZXNzRXZlbnQ6Vy5ldyxIVE1MU2VsZWN0RWxlbWVudDpXLmxwLEhUTUxUYWJsZUVs
-ZW1lbnQ6Vy5UYixIVE1MVGFibGVSb3dFbGVtZW50OlcuSXYsSFRNTFRhYmxlU2VjdGlvbkVsZW1lbnQ6
-Vy5CVCxIVE1MVGVtcGxhdGVFbGVtZW50OlcueVksQ29tcG9zaXRpb25FdmVudDpXLnc2LEZvY3VzRXZl
-bnQ6Vy53NixLZXlib2FyZEV2ZW50OlcudzYsVGV4dEV2ZW50OlcudzYsVG91Y2hFdmVudDpXLnc2LFVJ
-RXZlbnQ6Vy53NixXaW5kb3c6Vy5LNSxET01XaW5kb3c6Vy5LNSxEZWRpY2F0ZWRXb3JrZXJHbG9iYWxT
-Y29wZTpXLkNtLFNlcnZpY2VXb3JrZXJHbG9iYWxTY29wZTpXLkNtLFNoYXJlZFdvcmtlckdsb2JhbFNj
-b3BlOlcuQ20sV29ya2VyR2xvYmFsU2NvcGU6Vy5DbSxBdHRyOlcuQ1EsQ2xpZW50UmVjdDpXLnc0LERP
-TVJlY3Q6Vy53NCxOYW1lZE5vZGVNYXA6Vy5yaCxNb3pOYW1lZEF0dHJNYXA6Vy5yaCxJREJLZXlSYW5n
-ZTpQLmhGLFNWR1NjcmlwdEVsZW1lbnQ6UC5uZCxTVkdBRWxlbWVudDpQLmQ1LFNWR0FuaW1hdGVFbGVt
-ZW50OlAuZDUsU1ZHQW5pbWF0ZU1vdGlvbkVsZW1lbnQ6UC5kNSxTVkdBbmltYXRlVHJhbnNmb3JtRWxl
-bWVudDpQLmQ1LFNWR0FuaW1hdGlvbkVsZW1lbnQ6UC5kNSxTVkdDaXJjbGVFbGVtZW50OlAuZDUsU1ZH
-Q2xpcFBhdGhFbGVtZW50OlAuZDUsU1ZHRGVmc0VsZW1lbnQ6UC5kNSxTVkdEZXNjRWxlbWVudDpQLmQ1
-LFNWR0Rpc2NhcmRFbGVtZW50OlAuZDUsU1ZHRWxsaXBzZUVsZW1lbnQ6UC5kNSxTVkdGRUJsZW5kRWxl
-bWVudDpQLmQ1LFNWR0ZFQ29sb3JNYXRyaXhFbGVtZW50OlAuZDUsU1ZHRkVDb21wb25lbnRUcmFuc2Zl
-ckVsZW1lbnQ6UC5kNSxTVkdGRUNvbXBvc2l0ZUVsZW1lbnQ6UC5kNSxTVkdGRUNvbnZvbHZlTWF0cml4
-RWxlbWVudDpQLmQ1LFNWR0ZFRGlmZnVzZUxpZ2h0aW5nRWxlbWVudDpQLmQ1LFNWR0ZFRGlzcGxhY2Vt
-ZW50TWFwRWxlbWVudDpQLmQ1LFNWR0ZFRGlzdGFudExpZ2h0RWxlbWVudDpQLmQ1LFNWR0ZFRmxvb2RF
-bGVtZW50OlAuZDUsU1ZHRkVGdW5jQUVsZW1lbnQ6UC5kNSxTVkdGRUZ1bmNCRWxlbWVudDpQLmQ1LFNW
-R0ZFRnVuY0dFbGVtZW50OlAuZDUsU1ZHRkVGdW5jUkVsZW1lbnQ6UC5kNSxTVkdGRUdhdXNzaWFuQmx1
-ckVsZW1lbnQ6UC5kNSxTVkdGRUltYWdlRWxlbWVudDpQLmQ1LFNWR0ZFTWVyZ2VFbGVtZW50OlAuZDUs
-U1ZHRkVNZXJnZU5vZGVFbGVtZW50OlAuZDUsU1ZHRkVNb3JwaG9sb2d5RWxlbWVudDpQLmQ1LFNWR0ZF
-T2Zmc2V0RWxlbWVudDpQLmQ1LFNWR0ZFUG9pbnRMaWdodEVsZW1lbnQ6UC5kNSxTVkdGRVNwZWN1bGFy
-TGlnaHRpbmdFbGVtZW50OlAuZDUsU1ZHRkVTcG90TGlnaHRFbGVtZW50OlAuZDUsU1ZHRkVUaWxlRWxl
-bWVudDpQLmQ1LFNWR0ZFVHVyYnVsZW5jZUVsZW1lbnQ6UC5kNSxTVkdGaWx0ZXJFbGVtZW50OlAuZDUs
-U1ZHRm9yZWlnbk9iamVjdEVsZW1lbnQ6UC5kNSxTVkdHRWxlbWVudDpQLmQ1LFNWR0dlb21ldHJ5RWxl
-bWVudDpQLmQ1LFNWR0dyYXBoaWNzRWxlbWVudDpQLmQ1LFNWR0ltYWdlRWxlbWVudDpQLmQ1LFNWR0xp
-bmVFbGVtZW50OlAuZDUsU1ZHTGluZWFyR3JhZGllbnRFbGVtZW50OlAuZDUsU1ZHTWFya2VyRWxlbWVu
-dDpQLmQ1LFNWR01hc2tFbGVtZW50OlAuZDUsU1ZHTWV0YWRhdGFFbGVtZW50OlAuZDUsU1ZHUGF0aEVs
-ZW1lbnQ6UC5kNSxTVkdQYXR0ZXJuRWxlbWVudDpQLmQ1LFNWR1BvbHlnb25FbGVtZW50OlAuZDUsU1ZH
-UG9seWxpbmVFbGVtZW50OlAuZDUsU1ZHUmFkaWFsR3JhZGllbnRFbGVtZW50OlAuZDUsU1ZHUmVjdEVs
-ZW1lbnQ6UC5kNSxTVkdTZXRFbGVtZW50OlAuZDUsU1ZHU3RvcEVsZW1lbnQ6UC5kNSxTVkdTdHlsZUVs
-ZW1lbnQ6UC5kNSxTVkdTVkdFbGVtZW50OlAuZDUsU1ZHU3dpdGNoRWxlbWVudDpQLmQ1LFNWR1N5bWJv
-bEVsZW1lbnQ6UC5kNSxTVkdUU3BhbkVsZW1lbnQ6UC5kNSxTVkdUZXh0Q29udGVudEVsZW1lbnQ6UC5k
-NSxTVkdUZXh0RWxlbWVudDpQLmQ1LFNWR1RleHRQYXRoRWxlbWVudDpQLmQ1LFNWR1RleHRQb3NpdGlv
-bmluZ0VsZW1lbnQ6UC5kNSxTVkdUaXRsZUVsZW1lbnQ6UC5kNSxTVkdVc2VFbGVtZW50OlAuZDUsU1ZH
-Vmlld0VsZW1lbnQ6UC5kNSxTVkdHcmFkaWVudEVsZW1lbnQ6UC5kNSxTVkdDb21wb25lbnRUcmFuc2Zl
-ckZ1bmN0aW9uRWxlbWVudDpQLmQ1LFNWR0ZFRHJvcFNoYWRvd0VsZW1lbnQ6UC5kNSxTVkdNUGF0aEVs
-ZW1lbnQ6UC5kNSxTVkdFbGVtZW50OlAuZDV9KQpodW5rSGVscGVycy5zZXRPclVwZGF0ZUxlYWZUYWdz
-KHtET01FcnJvcjp0cnVlLERPTUltcGxlbWVudGF0aW9uOnRydWUsTWVkaWFFcnJvcjp0cnVlLE5hdmln
-YXRvcjp0cnVlLE5hdmlnYXRvckNvbmN1cnJlbnRIYXJkd2FyZTp0cnVlLE5hdmlnYXRvclVzZXJNZWRp
-YUVycm9yOnRydWUsT3ZlcmNvbnN0cmFpbmVkRXJyb3I6dHJ1ZSxQb3NpdGlvbkVycm9yOnRydWUsUmFu
-Z2U6dHJ1ZSxTUUxFcnJvcjp0cnVlLERhdGFWaWV3OnRydWUsQXJyYXlCdWZmZXJWaWV3OmZhbHNlLEZs
-b2F0MzJBcnJheTp0cnVlLEZsb2F0NjRBcnJheTp0cnVlLEludDE2QXJyYXk6dHJ1ZSxJbnQzMkFycmF5
-OnRydWUsSW50OEFycmF5OnRydWUsVWludDE2QXJyYXk6dHJ1ZSxVaW50MzJBcnJheTp0cnVlLFVpbnQ4
-Q2xhbXBlZEFycmF5OnRydWUsQ2FudmFzUGl4ZWxBcnJheTp0cnVlLFVpbnQ4QXJyYXk6ZmFsc2UsSFRN
-TEF1ZGlvRWxlbWVudDp0cnVlLEhUTUxCUkVsZW1lbnQ6dHJ1ZSxIVE1MQnV0dG9uRWxlbWVudDp0cnVl
-LEhUTUxDYW52YXNFbGVtZW50OnRydWUsSFRNTENvbnRlbnRFbGVtZW50OnRydWUsSFRNTERMaXN0RWxl
-bWVudDp0cnVlLEhUTUxEYXRhRWxlbWVudDp0cnVlLEhUTUxEYXRhTGlzdEVsZW1lbnQ6dHJ1ZSxIVE1M
-RGV0YWlsc0VsZW1lbnQ6dHJ1ZSxIVE1MRGlhbG9nRWxlbWVudDp0cnVlLEhUTUxEaXZFbGVtZW50OnRy
-dWUsSFRNTEVtYmVkRWxlbWVudDp0cnVlLEhUTUxGaWVsZFNldEVsZW1lbnQ6dHJ1ZSxIVE1MSFJFbGVt
-ZW50OnRydWUsSFRNTEhlYWRFbGVtZW50OnRydWUsSFRNTEhlYWRpbmdFbGVtZW50OnRydWUsSFRNTEh0
-bWxFbGVtZW50OnRydWUsSFRNTElGcmFtZUVsZW1lbnQ6dHJ1ZSxIVE1MSW1hZ2VFbGVtZW50OnRydWUs
-SFRNTElucHV0RWxlbWVudDp0cnVlLEhUTUxMSUVsZW1lbnQ6dHJ1ZSxIVE1MTGFiZWxFbGVtZW50OnRy
-dWUsSFRNTExlZ2VuZEVsZW1lbnQ6dHJ1ZSxIVE1MTGlua0VsZW1lbnQ6dHJ1ZSxIVE1MTWFwRWxlbWVu
-dDp0cnVlLEhUTUxNZWRpYUVsZW1lbnQ6dHJ1ZSxIVE1MTWVudUVsZW1lbnQ6dHJ1ZSxIVE1MTWV0YUVs
-ZW1lbnQ6dHJ1ZSxIVE1MTWV0ZXJFbGVtZW50OnRydWUsSFRNTE1vZEVsZW1lbnQ6dHJ1ZSxIVE1MT0xp
-c3RFbGVtZW50OnRydWUsSFRNTE9iamVjdEVsZW1lbnQ6dHJ1ZSxIVE1MT3B0R3JvdXBFbGVtZW50OnRy
-dWUsSFRNTE9wdGlvbkVsZW1lbnQ6dHJ1ZSxIVE1MT3V0cHV0RWxlbWVudDp0cnVlLEhUTUxQYXJhbUVs
-ZW1lbnQ6dHJ1ZSxIVE1MUGljdHVyZUVsZW1lbnQ6dHJ1ZSxIVE1MUHJlRWxlbWVudDp0cnVlLEhUTUxQ
-cm9ncmVzc0VsZW1lbnQ6dHJ1ZSxIVE1MUXVvdGVFbGVtZW50OnRydWUsSFRNTFNjcmlwdEVsZW1lbnQ6
-dHJ1ZSxIVE1MU2hhZG93RWxlbWVudDp0cnVlLEhUTUxTbG90RWxlbWVudDp0cnVlLEhUTUxTb3VyY2VF
-bGVtZW50OnRydWUsSFRNTFNwYW5FbGVtZW50OnRydWUsSFRNTFN0eWxlRWxlbWVudDp0cnVlLEhUTUxU
-YWJsZUNhcHRpb25FbGVtZW50OnRydWUsSFRNTFRhYmxlQ2VsbEVsZW1lbnQ6dHJ1ZSxIVE1MVGFibGVE
-YXRhQ2VsbEVsZW1lbnQ6dHJ1ZSxIVE1MVGFibGVIZWFkZXJDZWxsRWxlbWVudDp0cnVlLEhUTUxUYWJs
-ZUNvbEVsZW1lbnQ6dHJ1ZSxIVE1MVGV4dEFyZWFFbGVtZW50OnRydWUsSFRNTFRpbWVFbGVtZW50OnRy
-dWUsSFRNTFRpdGxlRWxlbWVudDp0cnVlLEhUTUxUcmFja0VsZW1lbnQ6dHJ1ZSxIVE1MVUxpc3RFbGVt
-ZW50OnRydWUsSFRNTFVua25vd25FbGVtZW50OnRydWUsSFRNTFZpZGVvRWxlbWVudDp0cnVlLEhUTUxE
-aXJlY3RvcnlFbGVtZW50OnRydWUsSFRNTEZvbnRFbGVtZW50OnRydWUsSFRNTEZyYW1lRWxlbWVudDp0
-cnVlLEhUTUxGcmFtZVNldEVsZW1lbnQ6dHJ1ZSxIVE1MTWFycXVlZUVsZW1lbnQ6dHJ1ZSxIVE1MRWxl
-bWVudDpmYWxzZSxIVE1MQW5jaG9yRWxlbWVudDp0cnVlLEhUTUxBcmVhRWxlbWVudDp0cnVlLEhUTUxC
-YXNlRWxlbWVudDp0cnVlLEJsb2I6ZmFsc2UsSFRNTEJvZHlFbGVtZW50OnRydWUsQ0RBVEFTZWN0aW9u
-OnRydWUsQ2hhcmFjdGVyRGF0YTp0cnVlLENvbW1lbnQ6dHJ1ZSxQcm9jZXNzaW5nSW5zdHJ1Y3Rpb246
-dHJ1ZSxUZXh0OnRydWUsQ1NTU3R5bGVEZWNsYXJhdGlvbjp0cnVlLE1TU3R5bGVDU1NQcm9wZXJ0aWVz
-OnRydWUsQ1NTMlByb3BlcnRpZXM6dHJ1ZSxYTUxEb2N1bWVudDp0cnVlLERvY3VtZW50OmZhbHNlLERP
-TUV4Y2VwdGlvbjp0cnVlLERPTVJlY3RSZWFkT25seTpmYWxzZSxET01Ub2tlbkxpc3Q6dHJ1ZSxFbGVt
-ZW50OmZhbHNlLEFib3J0UGF5bWVudEV2ZW50OnRydWUsQW5pbWF0aW9uRXZlbnQ6dHJ1ZSxBbmltYXRp
-b25QbGF5YmFja0V2ZW50OnRydWUsQXBwbGljYXRpb25DYWNoZUVycm9yRXZlbnQ6dHJ1ZSxCYWNrZ3Jv
-dW5kRmV0Y2hDbGlja0V2ZW50OnRydWUsQmFja2dyb3VuZEZldGNoRXZlbnQ6dHJ1ZSxCYWNrZ3JvdW5k
-RmV0Y2hGYWlsRXZlbnQ6dHJ1ZSxCYWNrZ3JvdW5kRmV0Y2hlZEV2ZW50OnRydWUsQmVmb3JlSW5zdGFs
-bFByb21wdEV2ZW50OnRydWUsQmVmb3JlVW5sb2FkRXZlbnQ6dHJ1ZSxCbG9iRXZlbnQ6dHJ1ZSxDYW5N
-YWtlUGF5bWVudEV2ZW50OnRydWUsQ2xpcGJvYXJkRXZlbnQ6dHJ1ZSxDbG9zZUV2ZW50OnRydWUsQ3Vz
-dG9tRXZlbnQ6dHJ1ZSxEZXZpY2VNb3Rpb25FdmVudDp0cnVlLERldmljZU9yaWVudGF0aW9uRXZlbnQ6
-dHJ1ZSxFcnJvckV2ZW50OnRydWUsRXh0ZW5kYWJsZUV2ZW50OnRydWUsRXh0ZW5kYWJsZU1lc3NhZ2VF
-dmVudDp0cnVlLEZldGNoRXZlbnQ6dHJ1ZSxGb250RmFjZVNldExvYWRFdmVudDp0cnVlLEZvcmVpZ25G
-ZXRjaEV2ZW50OnRydWUsR2FtZXBhZEV2ZW50OnRydWUsSGFzaENoYW5nZUV2ZW50OnRydWUsSW5zdGFs
-bEV2ZW50OnRydWUsTWVkaWFFbmNyeXB0ZWRFdmVudDp0cnVlLE1lZGlhS2V5TWVzc2FnZUV2ZW50OnRy
-dWUsTWVkaWFRdWVyeUxpc3RFdmVudDp0cnVlLE1lZGlhU3RyZWFtRXZlbnQ6dHJ1ZSxNZWRpYVN0cmVh
-bVRyYWNrRXZlbnQ6dHJ1ZSxNZXNzYWdlRXZlbnQ6dHJ1ZSxNSURJQ29ubmVjdGlvbkV2ZW50OnRydWUs
-TUlESU1lc3NhZ2VFdmVudDp0cnVlLE11dGF0aW9uRXZlbnQ6dHJ1ZSxOb3RpZmljYXRpb25FdmVudDp0
-cnVlLFBhZ2VUcmFuc2l0aW9uRXZlbnQ6dHJ1ZSxQYXltZW50UmVxdWVzdEV2ZW50OnRydWUsUGF5bWVu
-dFJlcXVlc3RVcGRhdGVFdmVudDp0cnVlLFBvcFN0YXRlRXZlbnQ6dHJ1ZSxQcmVzZW50YXRpb25Db25u
-ZWN0aW9uQXZhaWxhYmxlRXZlbnQ6dHJ1ZSxQcmVzZW50YXRpb25Db25uZWN0aW9uQ2xvc2VFdmVudDp0
-cnVlLFByb21pc2VSZWplY3Rpb25FdmVudDp0cnVlLFB1c2hFdmVudDp0cnVlLFJUQ0RhdGFDaGFubmVs
-RXZlbnQ6dHJ1ZSxSVENEVE1GVG9uZUNoYW5nZUV2ZW50OnRydWUsUlRDUGVlckNvbm5lY3Rpb25JY2VF
-dmVudDp0cnVlLFJUQ1RyYWNrRXZlbnQ6dHJ1ZSxTZWN1cml0eVBvbGljeVZpb2xhdGlvbkV2ZW50OnRy
-dWUsU2Vuc29yRXJyb3JFdmVudDp0cnVlLFNwZWVjaFJlY29nbml0aW9uRXJyb3I6dHJ1ZSxTcGVlY2hS
-ZWNvZ25pdGlvbkV2ZW50OnRydWUsU3BlZWNoU3ludGhlc2lzRXZlbnQ6dHJ1ZSxTdG9yYWdlRXZlbnQ6
-dHJ1ZSxTeW5jRXZlbnQ6dHJ1ZSxUcmFja0V2ZW50OnRydWUsVHJhbnNpdGlvbkV2ZW50OnRydWUsV2Vi
-S2l0VHJhbnNpdGlvbkV2ZW50OnRydWUsVlJEZXZpY2VFdmVudDp0cnVlLFZSRGlzcGxheUV2ZW50OnRy
-dWUsVlJTZXNzaW9uRXZlbnQ6dHJ1ZSxNb2pvSW50ZXJmYWNlUmVxdWVzdEV2ZW50OnRydWUsVVNCQ29u
-bmVjdGlvbkV2ZW50OnRydWUsSURCVmVyc2lvbkNoYW5nZUV2ZW50OnRydWUsQXVkaW9Qcm9jZXNzaW5n
-RXZlbnQ6dHJ1ZSxPZmZsaW5lQXVkaW9Db21wbGV0aW9uRXZlbnQ6dHJ1ZSxXZWJHTENvbnRleHRFdmVu
-dDp0cnVlLEV2ZW50OmZhbHNlLElucHV0RXZlbnQ6ZmFsc2UsRXZlbnRUYXJnZXQ6ZmFsc2UsRmlsZTp0
-cnVlLEhUTUxGb3JtRWxlbWVudDp0cnVlLEhpc3Rvcnk6dHJ1ZSxIVE1MRG9jdW1lbnQ6dHJ1ZSxYTUxI
-dHRwUmVxdWVzdDp0cnVlLFhNTEh0dHBSZXF1ZXN0RXZlbnRUYXJnZXQ6ZmFsc2UsSW1hZ2VEYXRhOnRy
-dWUsTG9jYXRpb246dHJ1ZSxNb3VzZUV2ZW50OnRydWUsRHJhZ0V2ZW50OnRydWUsUG9pbnRlckV2ZW50
-OnRydWUsV2hlZWxFdmVudDp0cnVlLERvY3VtZW50RnJhZ21lbnQ6dHJ1ZSxTaGFkb3dSb290OnRydWUs
-RG9jdW1lbnRUeXBlOnRydWUsTm9kZTpmYWxzZSxOb2RlTGlzdDp0cnVlLFJhZGlvTm9kZUxpc3Q6dHJ1
-ZSxIVE1MUGFyYWdyYXBoRWxlbWVudDp0cnVlLFByb2dyZXNzRXZlbnQ6dHJ1ZSxSZXNvdXJjZVByb2dy
-ZXNzRXZlbnQ6dHJ1ZSxIVE1MU2VsZWN0RWxlbWVudDp0cnVlLEhUTUxUYWJsZUVsZW1lbnQ6dHJ1ZSxI
-VE1MVGFibGVSb3dFbGVtZW50OnRydWUsSFRNTFRhYmxlU2VjdGlvbkVsZW1lbnQ6dHJ1ZSxIVE1MVGVt
-cGxhdGVFbGVtZW50OnRydWUsQ29tcG9zaXRpb25FdmVudDp0cnVlLEZvY3VzRXZlbnQ6dHJ1ZSxLZXli
-b2FyZEV2ZW50OnRydWUsVGV4dEV2ZW50OnRydWUsVG91Y2hFdmVudDp0cnVlLFVJRXZlbnQ6ZmFsc2Us
-V2luZG93OnRydWUsRE9NV2luZG93OnRydWUsRGVkaWNhdGVkV29ya2VyR2xvYmFsU2NvcGU6dHJ1ZSxT
-ZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGU6dHJ1ZSxTaGFyZWRXb3JrZXJHbG9iYWxTY29wZTp0cnVlLFdv
-cmtlckdsb2JhbFNjb3BlOnRydWUsQXR0cjp0cnVlLENsaWVudFJlY3Q6dHJ1ZSxET01SZWN0OnRydWUs
-TmFtZWROb2RlTWFwOnRydWUsTW96TmFtZWRBdHRyTWFwOnRydWUsSURCS2V5UmFuZ2U6dHJ1ZSxTVkdT
-Y3JpcHRFbGVtZW50OnRydWUsU1ZHQUVsZW1lbnQ6dHJ1ZSxTVkdBbmltYXRlRWxlbWVudDp0cnVlLFNW
-R0FuaW1hdGVNb3Rpb25FbGVtZW50OnRydWUsU1ZHQW5pbWF0ZVRyYW5zZm9ybUVsZW1lbnQ6dHJ1ZSxT
-VkdBbmltYXRpb25FbGVtZW50OnRydWUsU1ZHQ2lyY2xlRWxlbWVudDp0cnVlLFNWR0NsaXBQYXRoRWxl
-bWVudDp0cnVlLFNWR0RlZnNFbGVtZW50OnRydWUsU1ZHRGVzY0VsZW1lbnQ6dHJ1ZSxTVkdEaXNjYXJk
-RWxlbWVudDp0cnVlLFNWR0VsbGlwc2VFbGVtZW50OnRydWUsU1ZHRkVCbGVuZEVsZW1lbnQ6dHJ1ZSxT
-VkdGRUNvbG9yTWF0cml4RWxlbWVudDp0cnVlLFNWR0ZFQ29tcG9uZW50VHJhbnNmZXJFbGVtZW50OnRy
-dWUsU1ZHRkVDb21wb3NpdGVFbGVtZW50OnRydWUsU1ZHRkVDb252b2x2ZU1hdHJpeEVsZW1lbnQ6dHJ1
-ZSxTVkdGRURpZmZ1c2VMaWdodGluZ0VsZW1lbnQ6dHJ1ZSxTVkdGRURpc3BsYWNlbWVudE1hcEVsZW1l
-bnQ6dHJ1ZSxTVkdGRURpc3RhbnRMaWdodEVsZW1lbnQ6dHJ1ZSxTVkdGRUZsb29kRWxlbWVudDp0cnVl
-LFNWR0ZFRnVuY0FFbGVtZW50OnRydWUsU1ZHRkVGdW5jQkVsZW1lbnQ6dHJ1ZSxTVkdGRUZ1bmNHRWxl
-bWVudDp0cnVlLFNWR0ZFRnVuY1JFbGVtZW50OnRydWUsU1ZHRkVHYXVzc2lhbkJsdXJFbGVtZW50OnRy
-dWUsU1ZHRkVJbWFnZUVsZW1lbnQ6dHJ1ZSxTVkdGRU1lcmdlRWxlbWVudDp0cnVlLFNWR0ZFTWVyZ2VO
-b2RlRWxlbWVudDp0cnVlLFNWR0ZFTW9ycGhvbG9neUVsZW1lbnQ6dHJ1ZSxTVkdGRU9mZnNldEVsZW1l
-bnQ6dHJ1ZSxTVkdGRVBvaW50TGlnaHRFbGVtZW50OnRydWUsU1ZHRkVTcGVjdWxhckxpZ2h0aW5nRWxl
-bWVudDp0cnVlLFNWR0ZFU3BvdExpZ2h0RWxlbWVudDp0cnVlLFNWR0ZFVGlsZUVsZW1lbnQ6dHJ1ZSxT
-VkdGRVR1cmJ1bGVuY2VFbGVtZW50OnRydWUsU1ZHRmlsdGVyRWxlbWVudDp0cnVlLFNWR0ZvcmVpZ25P
-YmplY3RFbGVtZW50OnRydWUsU1ZHR0VsZW1lbnQ6dHJ1ZSxTVkdHZW9tZXRyeUVsZW1lbnQ6dHJ1ZSxT
-VkdHcmFwaGljc0VsZW1lbnQ6dHJ1ZSxTVkdJbWFnZUVsZW1lbnQ6dHJ1ZSxTVkdMaW5lRWxlbWVudDp0
-cnVlLFNWR0xpbmVhckdyYWRpZW50RWxlbWVudDp0cnVlLFNWR01hcmtlckVsZW1lbnQ6dHJ1ZSxTVkdN
-YXNrRWxlbWVudDp0cnVlLFNWR01ldGFkYXRhRWxlbWVudDp0cnVlLFNWR1BhdGhFbGVtZW50OnRydWUs
-U1ZHUGF0dGVybkVsZW1lbnQ6dHJ1ZSxTVkdQb2x5Z29uRWxlbWVudDp0cnVlLFNWR1BvbHlsaW5lRWxl
-bWVudDp0cnVlLFNWR1JhZGlhbEdyYWRpZW50RWxlbWVudDp0cnVlLFNWR1JlY3RFbGVtZW50OnRydWUs
-U1ZHU2V0RWxlbWVudDp0cnVlLFNWR1N0b3BFbGVtZW50OnRydWUsU1ZHU3R5bGVFbGVtZW50OnRydWUs
-U1ZHU1ZHRWxlbWVudDp0cnVlLFNWR1N3aXRjaEVsZW1lbnQ6dHJ1ZSxTVkdTeW1ib2xFbGVtZW50OnRy
-dWUsU1ZHVFNwYW5FbGVtZW50OnRydWUsU1ZHVGV4dENvbnRlbnRFbGVtZW50OnRydWUsU1ZHVGV4dEVs
-ZW1lbnQ6dHJ1ZSxTVkdUZXh0UGF0aEVsZW1lbnQ6dHJ1ZSxTVkdUZXh0UG9zaXRpb25pbmdFbGVtZW50
-OnRydWUsU1ZHVGl0bGVFbGVtZW50OnRydWUsU1ZHVXNlRWxlbWVudDp0cnVlLFNWR1ZpZXdFbGVtZW50
-OnRydWUsU1ZHR3JhZGllbnRFbGVtZW50OnRydWUsU1ZHQ29tcG9uZW50VHJhbnNmZXJGdW5jdGlvbkVs
-ZW1lbnQ6dHJ1ZSxTVkdGRURyb3BTaGFkb3dFbGVtZW50OnRydWUsU1ZHTVBhdGhFbGVtZW50OnRydWUs
-U1ZHRWxlbWVudDpmYWxzZX0pCkguYjAuJG5hdGl2ZVN1cGVyY2xhc3NUYWc9IkFycmF5QnVmZmVyVmll
-dyIKSC5SRy4kbmF0aXZlU3VwZXJjbGFzc1RhZz0iQXJyYXlCdWZmZXJWaWV3IgpILlZQLiRuYXRpdmVT
-dXBlcmNsYXNzVGFnPSJBcnJheUJ1ZmZlclZpZXciCkguRGcuJG5hdGl2ZVN1cGVyY2xhc3NUYWc9IkFy
-cmF5QnVmZmVyVmlldyIKSC5XQi4kbmF0aXZlU3VwZXJjbGFzc1RhZz0iQXJyYXlCdWZmZXJWaWV3IgpI
-LlpHLiRuYXRpdmVTdXBlcmNsYXNzVGFnPSJBcnJheUJ1ZmZlclZpZXciCkguUGcuJG5hdGl2ZVN1cGVy
-Y2xhc3NUYWc9IkFycmF5QnVmZmVyVmlldyJ9KSgpCmNvbnZlcnRBbGxUb0Zhc3RPYmplY3QodykKY29u
-dmVydFRvRmFzdE9iamVjdCgkKTsoZnVuY3Rpb24oYSl7aWYodHlwZW9mIGRvY3VtZW50PT09InVuZGVm
-aW5lZCIpe2EobnVsbCkKcmV0dXJufWlmKHR5cGVvZiBkb2N1bWVudC5jdXJyZW50U2NyaXB0IT0ndW5k
-ZWZpbmVkJyl7YShkb2N1bWVudC5jdXJyZW50U2NyaXB0KQpyZXR1cm59dmFyIHQ9ZG9jdW1lbnQuc2Ny
-aXB0cwpmdW5jdGlvbiBvbkxvYWQoYil7Zm9yKHZhciByPTA7cjx0Lmxlbmd0aDsrK3IpdFtyXS5yZW1v
-dmVFdmVudExpc3RlbmVyKCJsb2FkIixvbkxvYWQsZmFsc2UpCmEoYi50YXJnZXQpfWZvcih2YXIgcz0w
-O3M8dC5sZW5ndGg7KytzKXRbc10uYWRkRXZlbnRMaXN0ZW5lcigibG9hZCIsb25Mb2FkLGZhbHNlKX0p
-KGZ1bmN0aW9uKGEpe3YuY3VycmVudFNjcmlwdD1hCmlmKHR5cGVvZiBkYXJ0TWFpblJ1bm5lcj09PSJm
-dW5jdGlvbiIpZGFydE1haW5SdW5uZXIoTC5JcSxbXSkKZWxzZSBMLklxKFtdKX0pfSkoKQovLyMgc291
-cmNlTWFwcGluZ1VSTD1taWdyYXRpb24uanMubWFwCg==
+YlEiOlsiMSJdLCJjWCI6WyIxIl19LCJpbCI6eyJZayI6WyIxIiwiMiJdLCJaMCI6WyIxIiwiMiJdfSwi
+WWsiOnsiWjAiOlsiMSIsIjIiXX0sIlBuIjp7IlowIjpbIjEiLCIyIl19LCJHaiI6eyJSVSI6WyIxIiwi
+MiJdLCJQbiI6WyIxIiwiMiJdLCJLUCI6WyIxIiwiMiJdLCJaMCI6WyIxIiwiMiJdfSwiVmoiOnsiTWEi
+OlsiMSJdLCJ4dSI6WyIxIl0sImJRIjpbIjEiXSwiY1giOlsiMSJdfSwiWHYiOnsieHUiOlsiMSJdLCJi
+USI6WyIxIl0sImNYIjpbIjEiXX0sInV3Ijp7IllrIjpbInFVIiwiQCJdLCJaMCI6WyJxVSIsIkAiXSwi
+WWsuSyI6InFVIiwiWWsuViI6IkAifSwiaTgiOnsiYUwiOlsicVUiXSwiYlEiOlsicVUiXSwiY1giOlsi
+cVUiXSwiYUwuRSI6InFVIiwiY1guRSI6InFVIn0sIkNWIjp7IlVrIjpbInpNPElmPiIsInFVIl0sIlVr
+LlMiOiJ6TTxJZj4ifSwiVTgiOnsid0kiOlsiek08SWY+IiwicVUiXX0sIlppIjp7IlVrIjpbInFVIiwi
+ek08SWY+Il19LCJieSI6eyJVayI6WyJNaCIsInFVIl0sIlVrLlMiOiJNaCJ9LCJNeCI6eyJ3SSI6WyJx
+VSIsIk1oIl19LCJ1NSI6eyJVayI6WyJxVSIsInpNPElmPiJdLCJVay5TIjoicVUifSwiRTMiOnsid0ki
+OlsicVUiLCJ6TTxJZj4iXX0sIkdZIjp7IndJIjpbInpNPElmPiIsInFVIl19LCJDUCI6eyJsZiI6W119
+LCJDNiI6eyJYUyI6W119LCJMSyI6eyJYUyI6W119LCJBVCI6eyJYUyI6W119LCJiSiI6eyJYUyI6W119
+LCJlWSI6eyJYUyI6W119LCJtcCI6eyJYUyI6W119LCJ1YiI6eyJYUyI6W119LCJkcyI6eyJYUyI6W119
+LCJsaiI6eyJYUyI6W119LCJVViI6eyJYUyI6W119LCJrNSI6eyJYUyI6W119LCJLWSI6eyJYUyI6W119
+LCJ0NyI6eyJYUyI6W119LCJJZiI6eyJsZiI6W119LCJ6TSI6eyJiUSI6WyIxIl0sImNYIjpbIjEiXX0s
+ImliIjp7Ik9kIjpbXX0sInh1Ijp7ImJRIjpbIjEiXSwiY1giOlsiMSJdfSwiWmQiOnsiR3oiOltdfSwi
+cVUiOnsidlgiOltdfSwiUm4iOnsiQkwiOltdfSwiRG4iOnsiaUQiOltdfSwiVWYiOnsiaUQiOltdfSwi
+cWUiOnsiaUQiOltdfSwicUUiOnsiY3YiOltdLCJ1SCI6W10sIkQwIjpbXX0sIkdoIjp7ImN2IjpbXSwi
+dUgiOltdLCJEMCI6W119LCJmWSI6eyJjdiI6W10sInVIIjpbXSwiRDAiOltdfSwibkIiOnsiY3YiOltd
+LCJ1SCI6W10sIkQwIjpbXX0sIlFQIjp7ImN2IjpbXSwidUgiOltdLCJEMCI6W119LCJueCI6eyJ1SCI6
+W10sIkQwIjpbXX0sIlFGIjp7InVIIjpbXSwiRDAiOltdfSwiSUIiOnsidG4iOlsibGYiXX0sInd6Ijp7
+ImxEIjpbIjEiXSwiek0iOlsiMSJdLCJiUSI6WyIxIl0sImNYIjpbIjEiXSwibEQuRSI6IjEifSwiY3Yi
+OnsidUgiOltdLCJEMCI6W119LCJUNSI6eyJBeiI6W119LCJoNCI6eyJjdiI6W10sInVIIjpbXSwiRDAi
+OltdfSwiVmIiOnsidUgiOltdLCJEMCI6W119LCJmSiI6eyJEMCI6W119LCJ3YSI6eyJEMCI6W119LCJP
+SyI6eyJlYSI6W119LCJlNyI6eyJsRCI6WyJ1SCJdLCJ6TSI6WyJ1SCJdLCJiUSI6WyJ1SCJdLCJjWCI6
+WyJ1SCJdLCJsRC5FIjoidUgifSwidUgiOnsiRDAiOltdfSwiQkgiOnsiR20iOlsidUgiXSwibEQiOlsi
+dUgiXSwiek0iOlsidUgiXSwiWGoiOlsidUgiXSwiYlEiOlsidUgiXSwiY1giOlsidUgiXSwiR20uRSI6
+InVIIiwibEQuRSI6InVIIn0sIlNOIjp7ImN2IjpbXSwidUgiOltdLCJEMCI6W119LCJldyI6eyJlYSI6
+W119LCJscCI6eyJjdiI6W10sInVIIjpbXSwiRDAiOltdfSwiVGIiOnsiY3YiOltdLCJ1SCI6W10sIkQw
+IjpbXX0sIkl2Ijp7ImN2IjpbXSwidUgiOltdLCJEMCI6W119LCJCVCI6eyJjdiI6W10sInVIIjpbXSwi
+RDAiOltdfSwieVkiOnsiY3YiOltdLCJ1SCI6W10sIkQwIjpbXX0sInc2Ijp7ImVhIjpbXX0sIks1Ijp7
+InY2IjpbXSwiRDAiOltdfSwiQ20iOnsiRDAiOltdfSwiQ1EiOnsidUgiOltdLCJEMCI6W119LCJ3NCI6
+eyJ0biI6WyJsZiJdfSwicmgiOnsiR20iOlsidUgiXSwibEQiOlsidUgiXSwiek0iOlsidUgiXSwiWGoi
+OlsidUgiXSwiYlEiOlsidUgiXSwiY1giOlsidUgiXSwiR20uRSI6InVIIiwibEQuRSI6InVIIn0sImNm
+Ijp7IllrIjpbInFVIiwicVUiXSwiWjAiOlsicVUiLCJxVSJdfSwiaTciOnsiWWsiOlsicVUiLCJxVSJd
+LCJaMCI6WyJxVSIsInFVIl0sIllrLksiOiJxVSIsIllrLlYiOiJxVSJ9LCJTeSI6eyJZayI6WyJxVSIs
+InFVIl0sIlowIjpbInFVIiwicVUiXSwiWWsuSyI6InFVIiwiWWsuViI6InFVIn0sIkk0Ijp7Ik1hIjpb
+InFVIl0sInh1IjpbInFVIl0sImJRIjpbInFVIl0sImNYIjpbInFVIl19LCJSTyI6eyJxaCI6WyIxIl19
+LCJldSI6eyJSTyI6WyIxIl0sInFoIjpbIjEiXX0sInhDIjp7Ik1PIjpbIjEiXX0sIkpRIjp7ImtGIjpb
+XX0sInZEIjp7ImtGIjpbXX0sIm02Ijp7ImtGIjpbXX0sImN0Ijp7ImtGIjpbXX0sIk93Ijp7ImtGIjpb
+XX0sIlc5Ijp7IkFuIjpbIjEiXX0sImRXIjp7InY2IjpbXSwiRDAiOltdfSwibWsiOnsieTAiOltdfSwi
+S28iOnsib24iOltdfSwiQXMiOnsiTWEiOlsicVUiXSwieHUiOlsicVUiXSwiYlEiOlsicVUiXSwiY1gi
+OlsicVUiXX0sInI3Ijp7IkU0IjpbXX0sIlR6Ijp7ImxEIjpbIjEiXSwiek0iOlsiMSJdLCJiUSI6WyIx
+Il0sIkU0IjpbXSwiY1giOlsiMSJdLCJsRC5FIjoiMSJ9LCJuZCI6eyJkNSI6W10sImN2IjpbXSwidUgi
+OltdLCJEMCI6W119LCJLZSI6eyJNYSI6WyJxVSJdLCJ4dSI6WyJxVSJdLCJiUSI6WyJxVSJdLCJjWCI6
+WyJxVSJdfSwiZDUiOnsiY3YiOltdLCJ1SCI6W10sIkQwIjpbXX0sIm42Ijp7InpNIjpbIklmIl0sImJR
+IjpbIklmIl0sIkFTIjpbXSwiY1giOlsiSWYiXX0sIlhBIjp7ImtGIjpbXX0sIk9GIjp7Ikx1IjpbXX0s
+InJ1Ijp7Ikx1IjpbXX0sIklWIjp7Ikx1IjpbXX19JykpCkguRkYodi50eXBlVW5pdmVyc2UsSlNPTi5w
+YXJzZSgneyJiUSI6MSwidzIiOjEsIk1PIjoxLCJrVCI6MiwibVciOjEsIkxVIjoxLCJpbCI6MiwiVmoi
+OjEsIm5ZIjoxLCJUQyI6MSwiY28iOjF9JykpCnZhciB1PShmdW5jdGlvbiBydGlpKCl7dmFyIHQ9SC5O
+MApyZXR1cm57aTp0KCJHaCIpLG46dCgiT0giKSxjUjp0KCJuQiIpLGQ6dCgiQXoiKSxZOnQoIlFQIiks
+Z0Y6dCgiUEQ8R0QsQD4iKSxndzp0KCJiUTxAPiIpLGg6dCgiY3YiKSxXOnQoIlhTIiksQjp0KCJlYSIp
+LGFTOnQoIkQwIiksYzg6dCgiVDUiKSxaOnQoIkVIIiksYVE6dCgiYjg8Yzg+IiksYzp0KCJiODxAPiIp
+LHI6dCgiZkoiKSxJOnQoIlNnIiksbzp0KCJ2USIpLGVoOnQoImNYPHVIPiIpLFg6dCgiY1g8cVU+Iiks
+Ujp0KCJjWDxAPiIpLGZBOnQoImpkPFNlPiIpLHU6dCgiamQ8ajg+IiksYlA6dCgiamQ8dUY+IiksZmg6
+dCgiamQ8Wlo+Iiksazp0KCJqZDxrRj4iKSxzOnQoImpkPHFVPiIpLGhoOnQoImpkPHlEPiIpLGFKOnQo
+ImpkPHdiPiIpLG06dCgiamQ8QD4iKSx0OnQoImpkPElmPiIpLGVIOnQoInZtIiksZzp0KCJjNSIpLGFV
+OnQoIlhqPEA+IiksYW06dCgiVHo8QD4iKSxlbzp0KCJONTxHRCxAPiIpLHY6dCgiRTQiKSxkejp0KCJo
+RiIpLGE6dCgiek08cVU+Iiksajp0KCJ6TTxAPiIpLEw6dCgiek08SWY+IiksYV86dCgidTgiKSxmOnQo
+IlowPHFVLHFVPiIpLGI6dCgiWjA8cVUsQD4iKSxHOnQoIlowPEAsQD4iKSxkdjp0KCJsSjxxVSxxVT4i
+KSxkbzp0KCJsSjxxVSxAPiIpLFY6dCgiT0siKSxkRDp0KCJwRiIpLGJtOnQoIlY2IiksQTp0KCJ1SCIp
+LGU6dCgia0YiKSxQOnQoImM4IiksSzp0KCJNaCIpLHA6dCgiZXciKSxxOnQoInRuPGxmPiIpLGZ2OnQo
+IndMIiksYXY6dCgiSmMiKSxldzp0KCJuZCIpLEM6dCgieHU8cVU+IiksbDp0KCJHeiIpLE46dCgicVUi
+KSxkRzp0KCJxVShxVSkiKSxnNzp0KCJkNSIpLGZvOnQoIkdEIiksYVc6dCgieVkiKSx3OnQoIkFTIiks
+Z2M6dCgibjYiKSxhazp0KCJrZCIpLEQ6dCgiR2o8cVUscVU+IiksRTp0KCJpRCIpLGNjOnQoIlU1PHFV
+PiIpLGc0OnQoIks1IiksY2k6dCgidjYiKSxnMjp0KCJDbSIpLGJqOnQoIlpmPGZKPiIpLGg5OnQoIkNR
+IiksYWM6dCgiZTciKSxROnQoImV1PE9LPiIpLFQ6dCgid3o8Y3Y+IikseDp0KCJGZTxALEA+IiksYW86
+dCgidnM8Zko+IiksXzp0KCJ2czxAPiIpLGZKOnQoInZzPElmPiIpLE86dCgiSlEiKSxKOnQoImJuIiks
+eTp0KCJhMiIpLGFsOnQoImEyKE1oKSIpLGJCOnQoImEyKHFVKSIpLGJmOnQoImEyKEApIiksZ1I6dCgi
+Q1AiKSx6OnQoIkAiKSxmTzp0KCJAKCkiKSxVOnQoIkAoZWEpIiksRjp0KCJAKE1oKSIpLGVwOnQoIkAo
+TWgsTWgpIiksYWc6dCgiQChNaCxHeikiKSxiVTp0KCJAKHh1PHFVPikiKSxkTzp0KCJAKHFVKSIpLGI4
+OnQoIkAoQCxAKSIpLFM6dCgiSWYiKSxkaTp0KCJsZiIpLEg6dCgifiIpLE06dCgifigpIiksYW46dCgi
+fihldykiKSxlQTp0KCJ+KHFVLHFVKSIpLGNBOnQoIn4ocVUsQCkiKX19KSgpOyhmdW5jdGlvbiBjb25z
+dGFudHMoKXt2YXIgdD1odW5rSGVscGVycy5tYWtlQ29uc3RMaXN0CkMuUlk9Vy5RUC5wcm90b3R5cGUK
+Qy5CWj1XLlZiLnByb3RvdHlwZQpDLkR0PVcuZkoucHJvdG90eXBlCkMuT2s9Si52Qi5wcm90b3R5cGUK
+Qy5ObT1KLmpkLnByb3RvdHlwZQpDLmpuPUoudXIucHJvdG90eXBlCkMuak49Si5ZRS5wcm90b3R5cGUK
+Qy5DRD1KLnFJLnByb3RvdHlwZQpDLnhCPUouRHIucHJvdG90eXBlCkMuREc9Si5jNS5wcm90b3R5cGUK
+Qy5FeD1XLnU4LnByb3RvdHlwZQpDLkx0PVcuU04ucHJvdG90eXBlCkMuWlE9Si5pQy5wcm90b3R5cGUK
+Qy5JZT1XLlRiLnByb3RvdHlwZQpDLnZCPUoua2QucHJvdG90eXBlCkMub2w9Vy5LNS5wcm90b3R5cGUK
+Qy55OD1uZXcgUC5VOCgpCkMuaDk9bmV3IFAuQ1YoKQpDLndiPWZ1bmN0aW9uIGdldFRhZ0ZhbGxiYWNr
+KG8pIHsKICB2YXIgcyA9IE9iamVjdC5wcm90b3R5cGUudG9TdHJpbmcuY2FsbChvKTsKICByZXR1cm4g
+cy5zdWJzdHJpbmcoOCwgcy5sZW5ndGggLSAxKTsKfQpDLk80PWZ1bmN0aW9uKCkgewogIHZhciB0b1N0
+cmluZ0Z1bmN0aW9uID0gT2JqZWN0LnByb3RvdHlwZS50b1N0cmluZzsKICBmdW5jdGlvbiBnZXRUYWco
+bykgewogICAgdmFyIHMgPSB0b1N0cmluZ0Z1bmN0aW9uLmNhbGwobyk7CiAgICByZXR1cm4gcy5zdWJz
+dHJpbmcoOCwgcy5sZW5ndGggLSAxKTsKICB9CiAgZnVuY3Rpb24gZ2V0VW5rbm93blRhZyhvYmplY3Qs
+IHRhZykgewogICAgaWYgKC9eSFRNTFtBLVpdLipFbGVtZW50JC8udGVzdCh0YWcpKSB7CiAgICAgIHZh
+ciBuYW1lID0gdG9TdHJpbmdGdW5jdGlvbi5jYWxsKG9iamVjdCk7CiAgICAgIGlmIChuYW1lID09ICJb
+b2JqZWN0IE9iamVjdF0iKSByZXR1cm4gbnVsbDsKICAgICAgcmV0dXJuICJIVE1MRWxlbWVudCI7CiAg
+ICB9CiAgfQogIGZ1bmN0aW9uIGdldFVua25vd25UYWdHZW5lcmljQnJvd3NlcihvYmplY3QsIHRhZykg
+ewogICAgaWYgKHNlbGYuSFRNTEVsZW1lbnQgJiYgb2JqZWN0IGluc3RhbmNlb2YgSFRNTEVsZW1lbnQp
+IHJldHVybiAiSFRNTEVsZW1lbnQiOwogICAgcmV0dXJuIGdldFVua25vd25UYWcob2JqZWN0LCB0YWcp
+OwogIH0KICBmdW5jdGlvbiBwcm90b3R5cGVGb3JUYWcodGFnKSB7CiAgICBpZiAodHlwZW9mIHdpbmRv
+dyA9PSAidW5kZWZpbmVkIikgcmV0dXJuIG51bGw7CiAgICBpZiAodHlwZW9mIHdpbmRvd1t0YWddID09
+ICJ1bmRlZmluZWQiKSByZXR1cm4gbnVsbDsKICAgIHZhciBjb25zdHJ1Y3RvciA9IHdpbmRvd1t0YWdd
+OwogICAgaWYgKHR5cGVvZiBjb25zdHJ1Y3RvciAhPSAiZnVuY3Rpb24iKSByZXR1cm4gbnVsbDsKICAg
+IHJldHVybiBjb25zdHJ1Y3Rvci5wcm90b3R5cGU7CiAgfQogIGZ1bmN0aW9uIGRpc2NyaW1pbmF0b3Io
+dGFnKSB7IHJldHVybiBudWxsOyB9CiAgdmFyIGlzQnJvd3NlciA9IHR5cGVvZiBuYXZpZ2F0b3IgPT0g
+Im9iamVjdCI7CiAgcmV0dXJuIHsKICAgIGdldFRhZzogZ2V0VGFnLAogICAgZ2V0VW5rbm93blRhZzog
+aXNCcm93c2VyID8gZ2V0VW5rbm93blRhZ0dlbmVyaWNCcm93c2VyIDogZ2V0VW5rbm93blRhZywKICAg
+IHByb3RvdHlwZUZvclRhZzogcHJvdG90eXBlRm9yVGFnLAogICAgZGlzY3JpbWluYXRvcjogZGlzY3Jp
+bWluYXRvciB9Owp9CkMuZGs9ZnVuY3Rpb24oZ2V0VGFnRmFsbGJhY2spIHsKICByZXR1cm4gZnVuY3Rp
+b24oaG9va3MpIHsKICAgIGlmICh0eXBlb2YgbmF2aWdhdG9yICE9ICJvYmplY3QiKSByZXR1cm4gaG9v
+a3M7CiAgICB2YXIgdWEgPSBuYXZpZ2F0b3IudXNlckFnZW50OwogICAgaWYgKHVhLmluZGV4T2YoIkR1
+bXBSZW5kZXJUcmVlIikgPj0gMCkgcmV0dXJuIGhvb2tzOwogICAgaWYgKHVhLmluZGV4T2YoIkNocm9t
+ZSIpID49IDApIHsKICAgICAgZnVuY3Rpb24gY29uZmlybShwKSB7CiAgICAgICAgcmV0dXJuIHR5cGVv
+ZiB3aW5kb3cgPT0gIm9iamVjdCIgJiYgd2luZG93W3BdICYmIHdpbmRvd1twXS5uYW1lID09IHA7CiAg
+ICAgIH0KICAgICAgaWYgKGNvbmZpcm0oIldpbmRvdyIpICYmIGNvbmZpcm0oIkhUTUxFbGVtZW50Iikp
+IHJldHVybiBob29rczsKICAgIH0KICAgIGhvb2tzLmdldFRhZyA9IGdldFRhZ0ZhbGxiYWNrOwogIH07
+Cn0KQy5ZcT1mdW5jdGlvbihob29rcykgewogIGlmICh0eXBlb2YgZGFydEV4cGVyaW1lbnRhbEZpeHVw
+R2V0VGFnICE9ICJmdW5jdGlvbiIpIHJldHVybiBob29rczsKICBob29rcy5nZXRUYWcgPSBkYXJ0RXhw
+ZXJpbWVudGFsRml4dXBHZXRUYWcoaG9va3MuZ2V0VGFnKTsKfQpDLktVPWZ1bmN0aW9uKGhvb2tzKSB7
+CiAgdmFyIGdldFRhZyA9IGhvb2tzLmdldFRhZzsKICB2YXIgcHJvdG90eXBlRm9yVGFnID0gaG9va3Mu
+cHJvdG90eXBlRm9yVGFnOwogIGZ1bmN0aW9uIGdldFRhZ0ZpeGVkKG8pIHsKICAgIHZhciB0YWcgPSBn
+ZXRUYWcobyk7CiAgICBpZiAodGFnID09ICJEb2N1bWVudCIpIHsKICAgICAgaWYgKCEhby54bWxWZXJz
+aW9uKSByZXR1cm4gIiFEb2N1bWVudCI7CiAgICAgIHJldHVybiAiIUhUTUxEb2N1bWVudCI7CiAgICB9
+CiAgICByZXR1cm4gdGFnOwogIH0KICBmdW5jdGlvbiBwcm90b3R5cGVGb3JUYWdGaXhlZCh0YWcpIHsK
+ICAgIGlmICh0YWcgPT0gIkRvY3VtZW50IikgcmV0dXJuIG51bGw7CiAgICByZXR1cm4gcHJvdG90eXBl
+Rm9yVGFnKHRhZyk7CiAgfQogIGhvb2tzLmdldFRhZyA9IGdldFRhZ0ZpeGVkOwogIGhvb2tzLnByb3Rv
+dHlwZUZvclRhZyA9IHByb3RvdHlwZUZvclRhZ0ZpeGVkOwp9CkMueGk9ZnVuY3Rpb24oaG9va3MpIHsK
+ICB2YXIgdXNlckFnZW50ID0gdHlwZW9mIG5hdmlnYXRvciA9PSAib2JqZWN0IiA/IG5hdmlnYXRvci51
+c2VyQWdlbnQgOiAiIjsKICBpZiAodXNlckFnZW50LmluZGV4T2YoIkZpcmVmb3giKSA9PSAtMSkgcmV0
+dXJuIGhvb2tzOwogIHZhciBnZXRUYWcgPSBob29rcy5nZXRUYWc7CiAgdmFyIHF1aWNrTWFwID0gewog
+ICAgIkJlZm9yZVVubG9hZEV2ZW50IjogIkV2ZW50IiwKICAgICJEYXRhVHJhbnNmZXIiOiAiQ2xpcGJv
+YXJkIiwKICAgICJHZW9HZW9sb2NhdGlvbiI6ICJHZW9sb2NhdGlvbiIsCiAgICAiTG9jYXRpb24iOiAi
+IUxvY2F0aW9uIiwKICAgICJXb3JrZXJNZXNzYWdlRXZlbnQiOiAiTWVzc2FnZUV2ZW50IiwKICAgICJY
+TUxEb2N1bWVudCI6ICIhRG9jdW1lbnQifTsKICBmdW5jdGlvbiBnZXRUYWdGaXJlZm94KG8pIHsKICAg
+IHZhciB0YWcgPSBnZXRUYWcobyk7CiAgICByZXR1cm4gcXVpY2tNYXBbdGFnXSB8fCB0YWc7CiAgfQog
+IGhvb2tzLmdldFRhZyA9IGdldFRhZ0ZpcmVmb3g7Cn0KQy5pNz1mdW5jdGlvbihob29rcykgewogIHZh
+ciB1c2VyQWdlbnQgPSB0eXBlb2YgbmF2aWdhdG9yID09ICJvYmplY3QiID8gbmF2aWdhdG9yLnVzZXJB
+Z2VudCA6ICIiOwogIGlmICh1c2VyQWdlbnQuaW5kZXhPZigiVHJpZGVudC8iKSA9PSAtMSkgcmV0dXJu
+IGhvb2tzOwogIHZhciBnZXRUYWcgPSBob29rcy5nZXRUYWc7CiAgdmFyIHF1aWNrTWFwID0gewogICAg
+IkJlZm9yZVVubG9hZEV2ZW50IjogIkV2ZW50IiwKICAgICJEYXRhVHJhbnNmZXIiOiAiQ2xpcGJvYXJk
+IiwKICAgICJIVE1MRERFbGVtZW50IjogIkhUTUxFbGVtZW50IiwKICAgICJIVE1MRFRFbGVtZW50Ijog
+IkhUTUxFbGVtZW50IiwKICAgICJIVE1MUGhyYXNlRWxlbWVudCI6ICJIVE1MRWxlbWVudCIsCiAgICAi
+UG9zaXRpb24iOiAiR2VvcG9zaXRpb24iCiAgfTsKICBmdW5jdGlvbiBnZXRUYWdJRShvKSB7CiAgICB2
+YXIgdGFnID0gZ2V0VGFnKG8pOwogICAgdmFyIG5ld1RhZyA9IHF1aWNrTWFwW3RhZ107CiAgICBpZiAo
+bmV3VGFnKSByZXR1cm4gbmV3VGFnOwogICAgaWYgKHRhZyA9PSAiT2JqZWN0IikgewogICAgICBpZiAo
+d2luZG93LkRhdGFWaWV3ICYmIChvIGluc3RhbmNlb2Ygd2luZG93LkRhdGFWaWV3KSkgcmV0dXJuICJE
+YXRhVmlldyI7CiAgICB9CiAgICByZXR1cm4gdGFnOwogIH0KICBmdW5jdGlvbiBwcm90b3R5cGVGb3JU
+YWdJRSh0YWcpIHsKICAgIHZhciBjb25zdHJ1Y3RvciA9IHdpbmRvd1t0YWddOwogICAgaWYgKGNvbnN0
+cnVjdG9yID09IG51bGwpIHJldHVybiBudWxsOwogICAgcmV0dXJuIGNvbnN0cnVjdG9yLnByb3RvdHlw
+ZTsKICB9CiAgaG9va3MuZ2V0VGFnID0gZ2V0VGFnSUU7CiAgaG9va3MucHJvdG90eXBlRm9yVGFnID0g
+cHJvdG90eXBlRm9yVGFnSUU7Cn0KQy5mUT1mdW5jdGlvbihob29rcykgeyByZXR1cm4gaG9va3M7IH0K
+CkMuQ3Q9bmV3IFAuYnkoKQpDLkVxPW5ldyBQLms1KCkKQy54TT1uZXcgUC51NSgpCkMuUWs9bmV3IFAu
+RTMoKQpDLk5VPW5ldyBQLkppKCkKQy5wZD1uZXcgUC5aZCgpCkMuQTM9bmV3IFAuTXgobnVsbCkKQy5H
+Yj1ILlZNKHQoWzEyNywyMDQ3LDY1NTM1LDExMTQxMTFdKSx1LnQpCkMuYWs9SC5WTSh0KFswLDAsMzI3
+NzYsMzM3OTIsMSwxMDI0MCwwLDBdKSx1LnQpCkMuY209SC5WTSh0KFsiKjo6Y2xhc3MiLCIqOjpkaXIi
+LCIqOjpkcmFnZ2FibGUiLCIqOjpoaWRkZW4iLCIqOjppZCIsIio6OmluZXJ0IiwiKjo6aXRlbXByb3Ai
+LCIqOjppdGVtcmVmIiwiKjo6aXRlbXNjb3BlIiwiKjo6bGFuZyIsIio6OnNwZWxsY2hlY2siLCIqOjp0
+aXRsZSIsIio6OnRyYW5zbGF0ZSIsIkE6OmFjY2Vzc2tleSIsIkE6OmNvb3JkcyIsIkE6OmhyZWZsYW5n
+IiwiQTo6bmFtZSIsIkE6OnNoYXBlIiwiQTo6dGFiaW5kZXgiLCJBOjp0YXJnZXQiLCJBOjp0eXBlIiwi
+QVJFQTo6YWNjZXNza2V5IiwiQVJFQTo6YWx0IiwiQVJFQTo6Y29vcmRzIiwiQVJFQTo6bm9ocmVmIiwi
+QVJFQTo6c2hhcGUiLCJBUkVBOjp0YWJpbmRleCIsIkFSRUE6OnRhcmdldCIsIkFVRElPOjpjb250cm9s
+cyIsIkFVRElPOjpsb29wIiwiQVVESU86Om1lZGlhZ3JvdXAiLCJBVURJTzo6bXV0ZWQiLCJBVURJTzo6
+cHJlbG9hZCIsIkJETzo6ZGlyIiwiQk9EWTo6YWxpbmsiLCJCT0RZOjpiZ2NvbG9yIiwiQk9EWTo6bGlu
+ayIsIkJPRFk6OnRleHQiLCJCT0RZOjp2bGluayIsIkJSOjpjbGVhciIsIkJVVFRPTjo6YWNjZXNza2V5
+IiwiQlVUVE9OOjpkaXNhYmxlZCIsIkJVVFRPTjo6bmFtZSIsIkJVVFRPTjo6dGFiaW5kZXgiLCJCVVRU
+T046OnR5cGUiLCJCVVRUT046OnZhbHVlIiwiQ0FOVkFTOjpoZWlnaHQiLCJDQU5WQVM6OndpZHRoIiwi
+Q0FQVElPTjo6YWxpZ24iLCJDT0w6OmFsaWduIiwiQ09MOjpjaGFyIiwiQ09MOjpjaGFyb2ZmIiwiQ09M
+OjpzcGFuIiwiQ09MOjp2YWxpZ24iLCJDT0w6OndpZHRoIiwiQ09MR1JPVVA6OmFsaWduIiwiQ09MR1JP
+VVA6OmNoYXIiLCJDT0xHUk9VUDo6Y2hhcm9mZiIsIkNPTEdST1VQOjpzcGFuIiwiQ09MR1JPVVA6OnZh
+bGlnbiIsIkNPTEdST1VQOjp3aWR0aCIsIkNPTU1BTkQ6OmNoZWNrZWQiLCJDT01NQU5EOjpjb21tYW5k
+IiwiQ09NTUFORDo6ZGlzYWJsZWQiLCJDT01NQU5EOjpsYWJlbCIsIkNPTU1BTkQ6OnJhZGlvZ3JvdXAi
+LCJDT01NQU5EOjp0eXBlIiwiREFUQTo6dmFsdWUiLCJERUw6OmRhdGV0aW1lIiwiREVUQUlMUzo6b3Bl
+biIsIkRJUjo6Y29tcGFjdCIsIkRJVjo6YWxpZ24iLCJETDo6Y29tcGFjdCIsIkZJRUxEU0VUOjpkaXNh
+YmxlZCIsIkZPTlQ6OmNvbG9yIiwiRk9OVDo6ZmFjZSIsIkZPTlQ6OnNpemUiLCJGT1JNOjphY2NlcHQi
+LCJGT1JNOjphdXRvY29tcGxldGUiLCJGT1JNOjplbmN0eXBlIiwiRk9STTo6bWV0aG9kIiwiRk9STTo6
+bmFtZSIsIkZPUk06Om5vdmFsaWRhdGUiLCJGT1JNOjp0YXJnZXQiLCJGUkFNRTo6bmFtZSIsIkgxOjph
+bGlnbiIsIkgyOjphbGlnbiIsIkgzOjphbGlnbiIsIkg0OjphbGlnbiIsIkg1OjphbGlnbiIsIkg2Ojph
+bGlnbiIsIkhSOjphbGlnbiIsIkhSOjpub3NoYWRlIiwiSFI6OnNpemUiLCJIUjo6d2lkdGgiLCJIVE1M
+Ojp2ZXJzaW9uIiwiSUZSQU1FOjphbGlnbiIsIklGUkFNRTo6ZnJhbWVib3JkZXIiLCJJRlJBTUU6Omhl
+aWdodCIsIklGUkFNRTo6bWFyZ2luaGVpZ2h0IiwiSUZSQU1FOjptYXJnaW53aWR0aCIsIklGUkFNRTo6
+d2lkdGgiLCJJTUc6OmFsaWduIiwiSU1HOjphbHQiLCJJTUc6OmJvcmRlciIsIklNRzo6aGVpZ2h0Iiwi
+SU1HOjpoc3BhY2UiLCJJTUc6OmlzbWFwIiwiSU1HOjpuYW1lIiwiSU1HOjp1c2VtYXAiLCJJTUc6OnZz
+cGFjZSIsIklNRzo6d2lkdGgiLCJJTlBVVDo6YWNjZXB0IiwiSU5QVVQ6OmFjY2Vzc2tleSIsIklOUFVU
+OjphbGlnbiIsIklOUFVUOjphbHQiLCJJTlBVVDo6YXV0b2NvbXBsZXRlIiwiSU5QVVQ6OmF1dG9mb2N1
+cyIsIklOUFVUOjpjaGVja2VkIiwiSU5QVVQ6OmRpc2FibGVkIiwiSU5QVVQ6OmlucHV0bW9kZSIsIklO
+UFVUOjppc21hcCIsIklOUFVUOjpsaXN0IiwiSU5QVVQ6Om1heCIsIklOUFVUOjptYXhsZW5ndGgiLCJJ
+TlBVVDo6bWluIiwiSU5QVVQ6Om11bHRpcGxlIiwiSU5QVVQ6Om5hbWUiLCJJTlBVVDo6cGxhY2Vob2xk
+ZXIiLCJJTlBVVDo6cmVhZG9ubHkiLCJJTlBVVDo6cmVxdWlyZWQiLCJJTlBVVDo6c2l6ZSIsIklOUFVU
+OjpzdGVwIiwiSU5QVVQ6OnRhYmluZGV4IiwiSU5QVVQ6OnR5cGUiLCJJTlBVVDo6dXNlbWFwIiwiSU5Q
+VVQ6OnZhbHVlIiwiSU5TOjpkYXRldGltZSIsIktFWUdFTjo6ZGlzYWJsZWQiLCJLRVlHRU46OmtleXR5
+cGUiLCJLRVlHRU46Om5hbWUiLCJMQUJFTDo6YWNjZXNza2V5IiwiTEFCRUw6OmZvciIsIkxFR0VORDo6
+YWNjZXNza2V5IiwiTEVHRU5EOjphbGlnbiIsIkxJOjp0eXBlIiwiTEk6OnZhbHVlIiwiTElOSzo6c2l6
+ZXMiLCJNQVA6Om5hbWUiLCJNRU5VOjpjb21wYWN0IiwiTUVOVTo6bGFiZWwiLCJNRU5VOjp0eXBlIiwi
+TUVURVI6OmhpZ2giLCJNRVRFUjo6bG93IiwiTUVURVI6Om1heCIsIk1FVEVSOjptaW4iLCJNRVRFUjo6
+dmFsdWUiLCJPQkpFQ1Q6OnR5cGVtdXN0bWF0Y2giLCJPTDo6Y29tcGFjdCIsIk9MOjpyZXZlcnNlZCIs
+Ik9MOjpzdGFydCIsIk9MOjp0eXBlIiwiT1BUR1JPVVA6OmRpc2FibGVkIiwiT1BUR1JPVVA6OmxhYmVs
+IiwiT1BUSU9OOjpkaXNhYmxlZCIsIk9QVElPTjo6bGFiZWwiLCJPUFRJT046OnNlbGVjdGVkIiwiT1BU
+SU9OOjp2YWx1ZSIsIk9VVFBVVDo6Zm9yIiwiT1VUUFVUOjpuYW1lIiwiUDo6YWxpZ24iLCJQUkU6Ondp
+ZHRoIiwiUFJPR1JFU1M6Om1heCIsIlBST0dSRVNTOjptaW4iLCJQUk9HUkVTUzo6dmFsdWUiLCJTRUxF
+Q1Q6OmF1dG9jb21wbGV0ZSIsIlNFTEVDVDo6ZGlzYWJsZWQiLCJTRUxFQ1Q6Om11bHRpcGxlIiwiU0VM
+RUNUOjpuYW1lIiwiU0VMRUNUOjpyZXF1aXJlZCIsIlNFTEVDVDo6c2l6ZSIsIlNFTEVDVDo6dGFiaW5k
+ZXgiLCJTT1VSQ0U6OnR5cGUiLCJUQUJMRTo6YWxpZ24iLCJUQUJMRTo6Ymdjb2xvciIsIlRBQkxFOjpi
+b3JkZXIiLCJUQUJMRTo6Y2VsbHBhZGRpbmciLCJUQUJMRTo6Y2VsbHNwYWNpbmciLCJUQUJMRTo6ZnJh
+bWUiLCJUQUJMRTo6cnVsZXMiLCJUQUJMRTo6c3VtbWFyeSIsIlRBQkxFOjp3aWR0aCIsIlRCT0RZOjph
+bGlnbiIsIlRCT0RZOjpjaGFyIiwiVEJPRFk6OmNoYXJvZmYiLCJUQk9EWTo6dmFsaWduIiwiVEQ6OmFi
+YnIiLCJURDo6YWxpZ24iLCJURDo6YXhpcyIsIlREOjpiZ2NvbG9yIiwiVEQ6OmNoYXIiLCJURDo6Y2hh
+cm9mZiIsIlREOjpjb2xzcGFuIiwiVEQ6OmhlYWRlcnMiLCJURDo6aGVpZ2h0IiwiVEQ6Om5vd3JhcCIs
+IlREOjpyb3dzcGFuIiwiVEQ6OnNjb3BlIiwiVEQ6OnZhbGlnbiIsIlREOjp3aWR0aCIsIlRFWFRBUkVB
+OjphY2Nlc3NrZXkiLCJURVhUQVJFQTo6YXV0b2NvbXBsZXRlIiwiVEVYVEFSRUE6OmNvbHMiLCJURVhU
+QVJFQTo6ZGlzYWJsZWQiLCJURVhUQVJFQTo6aW5wdXRtb2RlIiwiVEVYVEFSRUE6Om5hbWUiLCJURVhU
+QVJFQTo6cGxhY2Vob2xkZXIiLCJURVhUQVJFQTo6cmVhZG9ubHkiLCJURVhUQVJFQTo6cmVxdWlyZWQi
+LCJURVhUQVJFQTo6cm93cyIsIlRFWFRBUkVBOjp0YWJpbmRleCIsIlRFWFRBUkVBOjp3cmFwIiwiVEZP
+T1Q6OmFsaWduIiwiVEZPT1Q6OmNoYXIiLCJURk9PVDo6Y2hhcm9mZiIsIlRGT09UOjp2YWxpZ24iLCJU
+SDo6YWJiciIsIlRIOjphbGlnbiIsIlRIOjpheGlzIiwiVEg6OmJnY29sb3IiLCJUSDo6Y2hhciIsIlRI
+OjpjaGFyb2ZmIiwiVEg6OmNvbHNwYW4iLCJUSDo6aGVhZGVycyIsIlRIOjpoZWlnaHQiLCJUSDo6bm93
+cmFwIiwiVEg6OnJvd3NwYW4iLCJUSDo6c2NvcGUiLCJUSDo6dmFsaWduIiwiVEg6OndpZHRoIiwiVEhF
+QUQ6OmFsaWduIiwiVEhFQUQ6OmNoYXIiLCJUSEVBRDo6Y2hhcm9mZiIsIlRIRUFEOjp2YWxpZ24iLCJU
+Ujo6YWxpZ24iLCJUUjo6Ymdjb2xvciIsIlRSOjpjaGFyIiwiVFI6OmNoYXJvZmYiLCJUUjo6dmFsaWdu
+IiwiVFJBQ0s6OmRlZmF1bHQiLCJUUkFDSzo6a2luZCIsIlRSQUNLOjpsYWJlbCIsIlRSQUNLOjpzcmNs
+YW5nIiwiVUw6OmNvbXBhY3QiLCJVTDo6dHlwZSIsIlZJREVPOjpjb250cm9scyIsIlZJREVPOjpoZWln
+aHQiLCJWSURFTzo6bG9vcCIsIlZJREVPOjptZWRpYWdyb3VwIiwiVklERU86Om11dGVkIiwiVklERU86
+OnByZWxvYWQiLCJWSURFTzo6d2lkdGgiXSksdS5zKQpDLlZDPUguVk0odChbMCwwLDY1NDkwLDQ1MDU1
+LDY1NTM1LDM0ODE1LDY1NTM0LDE4NDMxXSksdS50KQpDLm1LPUguVk0odChbMCwwLDI2NjI0LDEwMjMs
+NjU1MzQsMjA0Nyw2NTUzNCwyMDQ3XSksdS50KQpDLlNxPUguVk0odChbIkhFQUQiLCJBUkVBIiwiQkFT
+RSIsIkJBU0VGT05UIiwiQlIiLCJDT0wiLCJDT0xHUk9VUCIsIkVNQkVEIiwiRlJBTUUiLCJGUkFNRVNF
+VCIsIkhSIiwiSU1BR0UiLCJJTUciLCJJTlBVVCIsIklTSU5ERVgiLCJMSU5LIiwiTUVUQSIsIlBBUkFN
+IiwiU09VUkNFIiwiU1RZTEUiLCJUSVRMRSIsIldCUiJdKSx1LnMpCkMueEQ9SC5WTSh0KFtdKSx1LnUp
+CkMuZG49SC5WTSh0KFtdKSx1LnMpCkMuaFU9SC5WTSh0KFtdKSx1Lm0pCkMudG89SC5WTSh0KFswLDAs
+MzI3MjIsMTIyODcsNjU1MzQsMzQ4MTUsNjU1MzQsMTg0MzFdKSx1LnQpCkMuRjM9SC5WTSh0KFswLDAs
+MjQ1NzYsMTAyMyw2NTUzNCwzNDgxNSw2NTUzNCwxODQzMV0pLHUudCkKQy5lYT1ILlZNKHQoWzAsMCwz
+Mjc1NCwxMTI2Myw2NTUzNCwzNDgxNSw2NTUzNCwxODQzMV0pLHUudCkKQy5aSj1ILlZNKHQoWzAsMCwz
+MjcyMiwxMjI4Nyw2NTUzNSwzNDgxNSw2NTUzNCwxODQzMV0pLHUudCkKQy5XZD1ILlZNKHQoWzAsMCw2
+NTQ5MCwxMjI4Nyw2NTUzNSwzNDgxNSw2NTUzNCwxODQzMV0pLHUudCkKQy5ReD1ILlZNKHQoWyJiaW5k
+IiwiaWYiLCJyZWYiLCJyZXBlYXQiLCJzeW50YXgiXSksdS5zKQpDLkJJPUguVk0odChbIkE6OmhyZWYi
+LCJBUkVBOjpocmVmIiwiQkxPQ0tRVU9URTo6Y2l0ZSIsIkJPRFk6OmJhY2tncm91bmQiLCJDT01NQU5E
+OjppY29uIiwiREVMOjpjaXRlIiwiRk9STTo6YWN0aW9uIiwiSU1HOjpzcmMiLCJJTlBVVDo6c3JjIiwi
+SU5TOjpjaXRlIiwiUTo6Y2l0ZSIsIlZJREVPOjpwb3N0ZXIiXSksdS5zKQpDLkNNPW5ldyBILkxQKDAs
+e30sQy5kbixILk4wKCJMUDxxVSxxVT4iKSkKQy5pSD1ILlZNKHQoW10pLEguTjAoImpkPEdEPiIpKQpD
+LldPPW5ldyBILkxQKDAse30sQy5pSCxILk4wKCJMUDxHRCxAPiIpKQpDLlkyPW5ldyBMLk85KCJOYXZp
+Z2F0aW9uVHJlZU5vZGVUeXBlLmRpcmVjdG9yeSIpCkMucmY9bmV3IEwuTzkoIk5hdmlnYXRpb25UcmVl
+Tm9kZVR5cGUuZmlsZSIpCkMuVGU9bmV3IEgud3YoImNhbGwiKQpDLndRPW5ldyBQLkZ5KG51bGwsMil9
+KSgpOyhmdW5jdGlvbiBzdGF0aWNGaWVsZHMoKXskLnlqPTAKJC5tSj1udWxsCiQuUDQ9bnVsbAokLnk9
+bnVsbAokLnU9bnVsbAokLng3PW51bGwKJC5qPW51bGwKJC52PW51bGwKJC5LPW51bGwKJC5TNj1udWxs
+CiQuazg9bnVsbAokLm1nPW51bGwKJC5VRD0hMQokLlgzPUMuTlUKJC54Zz1bXQokLnhvPW51bGwKJC5C
+Tz1udWxsCiQubHQ9bnVsbAokLkVVPW51bGwKJC5vcj1QLkZsKHUuTix1LlopCiQuSTY9bnVsbAokLkZm
+PW51bGx9KSgpOyhmdW5jdGlvbiBsYXp5SW5pdGlhbGl6ZXJzKCl7dmFyIHQ9aHVua0hlbHBlcnMubGF6
+eQp0KCQsImZhIiwid1EiLGZ1bmN0aW9uKCl7cmV0dXJuIEguWWcoIl8kZGFydF9kYXJ0Q2xvc3VyZSIp
+fSkKdCgkLCJZMiIsIkEiLGZ1bmN0aW9uKCl7cmV0dXJuIEguWWcoIl8kZGFydF9qcyIpfSkKdCgkLCJV
+MiIsIlNuIixmdW5jdGlvbigpe3JldHVybiBILmNNKEguUzcoewp0b1N0cmluZzpmdW5jdGlvbigpe3Jl
+dHVybiIkcmVjZWl2ZXIkIn19KSl9KQp0KCQsInhxIiwibHEiLGZ1bmN0aW9uKCl7cmV0dXJuIEguY00o
+SC5TNyh7JG1ldGhvZCQ6bnVsbCwKdG9TdHJpbmc6ZnVuY3Rpb24oKXtyZXR1cm4iJHJlY2VpdmVyJCJ9
+fSkpfSkKdCgkLCJSMSIsIk45IixmdW5jdGlvbigpe3JldHVybiBILmNNKEguUzcobnVsbCkpfSkKdCgk
+LCJmTiIsImlJIixmdW5jdGlvbigpe3JldHVybiBILmNNKGZ1bmN0aW9uKCl7dmFyICRhcmd1bWVudHNF
+eHByJD0nJGFyZ3VtZW50cyQnCnRyeXtudWxsLiRtZXRob2QkKCRhcmd1bWVudHNFeHByJCl9Y2F0Y2go
+cyl7cmV0dXJuIHMubWVzc2FnZX19KCkpfSkKdCgkLCJxaSIsIlVOIixmdW5jdGlvbigpe3JldHVybiBI
+LmNNKEguUzcodm9pZCAwKSl9KQp0KCQsInJaIiwiWmgiLGZ1bmN0aW9uKCl7cmV0dXJuIEguY00oZnVu
+Y3Rpb24oKXt2YXIgJGFyZ3VtZW50c0V4cHIkPSckYXJndW1lbnRzJCcKdHJ5eyh2b2lkIDApLiRtZXRo
+b2QkKCRhcmd1bWVudHNFeHByJCl9Y2F0Y2gocyl7cmV0dXJuIHMubWVzc2FnZX19KCkpfSkKdCgkLCJr
+cSIsInJOIixmdW5jdGlvbigpe3JldHVybiBILmNNKEguTWoobnVsbCkpfSkKdCgkLCJ0dCIsImMzIixm
+dW5jdGlvbigpe3JldHVybiBILmNNKGZ1bmN0aW9uKCl7dHJ5e251bGwuJG1ldGhvZCR9Y2F0Y2gocyl7
+cmV0dXJuIHMubWVzc2FnZX19KCkpfSkKdCgkLCJkdCIsIkhLIixmdW5jdGlvbigpe3JldHVybiBILmNN
+KEguTWoodm9pZCAwKSl9KQp0KCQsIkE3IiwicjEiLGZ1bmN0aW9uKCl7cmV0dXJuIEguY00oZnVuY3Rp
+b24oKXt0cnl7KHZvaWQgMCkuJG1ldGhvZCR9Y2F0Y2gocyl7cmV0dXJuIHMubWVzc2FnZX19KCkpfSkK
+dCgkLCJXYyIsInV0IixmdW5jdGlvbigpe3JldHVybiBQLk9qKCl9KQp0KCQsImtoIiwidEwiLGZ1bmN0
+aW9uKCl7cmV0dXJuIFAuV0koKX0pCnQoJCwiYnQiLCJWNyIsZnVuY3Rpb24oKXtyZXR1cm4gSC5EUShI
+LlhGKEguVk0oWy0yLC0yLC0yLC0yLC0yLC0yLC0yLC0yLC0yLC0yLC0yLC0yLC0yLC0yLC0yLC0yLC0y
+LC0yLC0yLC0yLC0yLC0yLC0yLC0yLC0yLC0yLC0yLC0yLC0yLC0yLC0yLC0yLC0yLC0yLC0yLC0yLC0y
+LC0xLC0yLC0yLC0yLC0yLC0yLDYyLC0yLDYyLC0yLDYzLDUyLDUzLDU0LDU1LDU2LDU3LDU4LDU5LDYw
+LDYxLC0yLC0yLC0yLC0xLC0yLC0yLC0yLDAsMSwyLDMsNCw1LDYsNyw4LDksMTAsMTEsMTIsMTMsMTQs
+MTUsMTYsMTcsMTgsMTksMjAsMjEsMjIsMjMsMjQsMjUsLTIsLTIsLTIsLTIsNjMsLTIsMjYsMjcsMjgs
+MjksMzAsMzEsMzIsMzMsMzQsMzUsMzYsMzcsMzgsMzksNDAsNDEsNDIsNDMsNDQsNDUsNDYsNDcsNDgs
+NDksNTAsNTEsLTIsLTIsLTIsLTIsLTJdLHUudCkpKX0pCnQoJCwiTTUiLCJPeCIsZnVuY3Rpb24oKXty
+ZXR1cm4gdHlwZW9mIHByb2Nlc3MhPSJ1bmRlZmluZWQiJiZPYmplY3QucHJvdG90eXBlLnRvU3RyaW5n
+LmNhbGwocHJvY2Vzcyk9PSJbb2JqZWN0IHByb2Nlc3NdIiYmcHJvY2Vzcy5wbGF0Zm9ybT09IndpbjMy
+In0pCnQoJCwibWYiLCJ6NCIsZnVuY3Rpb24oKXtyZXR1cm4gUC5udSgiXltcXC1cXC4wLTlBLVpfYS16
+fl0qJCIpfSkKdCgkLCJBdiIsInA2IixmdW5jdGlvbigpe3JldHVybiBuZXcgRXJyb3IoKS5zdGFjayE9
+dm9pZCAwfSkKdCgkLCJKRyIsInZaIixmdW5jdGlvbigpe3JldHVybiBQLktOKCl9KQp0KCQsIlNDIiwi
+QU4iLGZ1bmN0aW9uKCl7cmV0dXJuIFAudE0oWyJBIiwiQUJCUiIsIkFDUk9OWU0iLCJBRERSRVNTIiwi
+QVJFQSIsIkFSVElDTEUiLCJBU0lERSIsIkFVRElPIiwiQiIsIkJESSIsIkJETyIsIkJJRyIsIkJMT0NL
+UVVPVEUiLCJCUiIsIkJVVFRPTiIsIkNBTlZBUyIsIkNBUFRJT04iLCJDRU5URVIiLCJDSVRFIiwiQ09E
+RSIsIkNPTCIsIkNPTEdST1VQIiwiQ09NTUFORCIsIkRBVEEiLCJEQVRBTElTVCIsIkREIiwiREVMIiwi
+REVUQUlMUyIsIkRGTiIsIkRJUiIsIkRJViIsIkRMIiwiRFQiLCJFTSIsIkZJRUxEU0VUIiwiRklHQ0FQ
+VElPTiIsIkZJR1VSRSIsIkZPTlQiLCJGT09URVIiLCJGT1JNIiwiSDEiLCJIMiIsIkgzIiwiSDQiLCJI
+NSIsIkg2IiwiSEVBREVSIiwiSEdST1VQIiwiSFIiLCJJIiwiSUZSQU1FIiwiSU1HIiwiSU5QVVQiLCJJ
+TlMiLCJLQkQiLCJMQUJFTCIsIkxFR0VORCIsIkxJIiwiTUFQIiwiTUFSSyIsIk1FTlUiLCJNRVRFUiIs
+Ik5BViIsIk5PQlIiLCJPTCIsIk9QVEdST1VQIiwiT1BUSU9OIiwiT1VUUFVUIiwiUCIsIlBSRSIsIlBS
+T0dSRVNTIiwiUSIsIlMiLCJTQU1QIiwiU0VDVElPTiIsIlNFTEVDVCIsIlNNQUxMIiwiU09VUkNFIiwi
+U1BBTiIsIlNUUklLRSIsIlNUUk9ORyIsIlNVQiIsIlNVTU1BUlkiLCJTVVAiLCJUQUJMRSIsIlRCT0RZ
+IiwiVEQiLCJURVhUQVJFQSIsIlRGT09UIiwiVEgiLCJUSEVBRCIsIlRJTUUiLCJUUiIsIlRSQUNLIiwi
+VFQiLCJVIiwiVUwiLCJWQVIiLCJWSURFTyIsIldCUiJdLHUuTil9KQp0KCQsIlg0IiwiaEciLGZ1bmN0
+aW9uKCl7cmV0dXJuIFAubnUoIl5cXFMrJCIpfSkKdCgkLCJ3TyIsIm93IixmdW5jdGlvbigpe3JldHVy
+biB1LnYuYShQLk5EKHNlbGYpKX0pCnQoJCwia3QiLCJDciIsZnVuY3Rpb24oKXtyZXR1cm4gSC5ZZygi
+XyRkYXJ0X2RhcnRPYmplY3QiKX0pCnQoJCwiZksiLCJrSSIsZnVuY3Rpb24oKXtyZXR1cm4gZnVuY3Rp
+b24gRGFydE9iamVjdChhKXt0aGlzLm89YX19KQp0KCQsInF0IiwiekIiLGZ1bmN0aW9uKCl7cmV0dXJu
+IG5ldyBULm1RKCl9KQp0KCQsIk9sIiwiVUUiLGZ1bmN0aW9uKCl7cmV0dXJuIFAuaEsoQy5vbC5nbVco
+Vy54MygpKS5ocmVmKS5naFkoKS5xKDAsImF1dGhUb2tlbiIpfSkKdCgkLCJoVCIsInlQIixmdW5jdGlv
+bigpe3JldHVybiBXLlpyKCkucXVlcnlTZWxlY3RvcigiLmVkaXQtbGlzdCAucGFuZWwtY29udGVudCIp
+fSkKdCgkLCJXNiIsImhMIixmdW5jdGlvbigpe3JldHVybiBXLlpyKCkucXVlcnlTZWxlY3RvcigiLmVk
+aXQtcGFuZWwgLnBhbmVsLWNvbnRlbnQiKX0pCnQoJCwiVFIiLCJEVyIsZnVuY3Rpb24oKXtyZXR1cm4g
+Vy5acigpLnF1ZXJ5U2VsZWN0b3IoImZvb3RlciIpfSkKdCgkLCJFWSIsImZpIixmdW5jdGlvbigpe3Jl
+dHVybiBXLlpyKCkucXVlcnlTZWxlY3RvcigiaGVhZGVyIil9KQp0KCQsImF2IiwiRDkiLGZ1bmN0aW9u
+KCl7cmV0dXJuIFcuWnIoKS5xdWVyeVNlbGVjdG9yKCIjdW5pdC1uYW1lIil9KQp0KCQsImZlIiwiS0ci
+LGZ1bmN0aW9uKCl7cmV0dXJuIG5ldyBMLlhBKCl9KQp0KCQsImVvIiwiblUiLGZ1bmN0aW9uKCl7cmV0
+dXJuIG5ldyBNLmxJKCQuSGsoKSl9KQp0KCQsInlyIiwiYkQiLGZ1bmN0aW9uKCl7cmV0dXJuIG5ldyBF
+Lk9GKFAubnUoIi8iKSxQLm51KCJbXi9dJCIpLFAubnUoIl4vIikpfSkKdCgkLCJNayIsIktrIixmdW5j
+dGlvbigpe3JldHVybiBuZXcgTC5JVihQLm51KCJbL1xcXFxdIiksUC5udSgiW14vXFxcXF0kIiksUC5u
+dSgiXihcXFxcXFxcXFteXFxcXF0rXFxcXFteXFxcXC9dK3xbYS16QS1aXTpbL1xcXFxdKSIpLFAubnUo
+Il5bL1xcXFxdKD8hWy9cXFxcXSkiKSl9KQp0KCQsImFrIiwiRWIiLGZ1bmN0aW9uKCl7cmV0dXJuIG5l
+dyBGLnJ1KFAubnUoIi8iKSxQLm51KCIoXlthLXpBLVpdWy0rLmEtekEtWlxcZF0qOi8vfFteL10pJCIp
+LFAubnUoIlthLXpBLVpdWy0rLmEtekEtWlxcZF0qOi8vW14vXSoiKSxQLm51KCJeLyIpKX0pCnQoJCwi
+bHMiLCJIayIsZnVuY3Rpb24oKXtyZXR1cm4gTy5SaCgpfSl9KSgpOyhmdW5jdGlvbiBuYXRpdmVTdXBw
+b3J0KCl7IWZ1bmN0aW9uKCl7dmFyIHQ9ZnVuY3Rpb24oYSl7dmFyIG49e30KblthXT0xCnJldHVybiBP
+YmplY3Qua2V5cyhodW5rSGVscGVycy5jb252ZXJ0VG9GYXN0T2JqZWN0KG4pKVswXX0Kdi5nZXRJc29s
+YXRlVGFnPWZ1bmN0aW9uKGEpe3JldHVybiB0KCJfX19kYXJ0XyIrYSt2Lmlzb2xhdGVUYWcpfQp2YXIg
+cz0iX19fZGFydF9pc29sYXRlX3RhZ3NfIgp2YXIgcj1PYmplY3Rbc118fChPYmplY3Rbc109T2JqZWN0
+LmNyZWF0ZShudWxsKSkKdmFyIHE9Il9aeFl4WCIKZm9yKHZhciBwPTA7O3ArKyl7dmFyIG89dChxKyJf
+IitwKyJfIikKaWYoIShvIGluIHIpKXtyW29dPTEKdi5pc29sYXRlVGFnPW8KYnJlYWt9fXYuZGlzcGF0
+Y2hQcm9wZXJ0eU5hbWU9di5nZXRJc29sYXRlVGFnKCJkaXNwYXRjaF9yZWNvcmQiKX0oKQpodW5rSGVs
+cGVycy5zZXRPclVwZGF0ZUludGVyY2VwdG9yc0J5VGFnKHtET01FcnJvcjpKLnZCLERPTUltcGxlbWVu
+dGF0aW9uOkoudkIsTWVkaWFFcnJvcjpKLnZCLE5hdmlnYXRvcjpKLnZCLE5hdmlnYXRvckNvbmN1cnJl
+bnRIYXJkd2FyZTpKLnZCLE5hdmlnYXRvclVzZXJNZWRpYUVycm9yOkoudkIsT3ZlcmNvbnN0cmFpbmVk
+RXJyb3I6Si52QixQb3NpdGlvbkVycm9yOkoudkIsUmFuZ2U6Si52QixTUUxFcnJvcjpKLnZCLERhdGFW
+aWV3OkgucEYsQXJyYXlCdWZmZXJWaWV3OkgucEYsRmxvYXQzMkFycmF5OkguRGcsRmxvYXQ2NEFycmF5
+OkguRGcsSW50MTZBcnJheTpILnhqLEludDMyQXJyYXk6SC5kRSxJbnQ4QXJyYXk6SC5aQSxVaW50MTZB
+cnJheTpILndmLFVpbnQzMkFycmF5OkguUHEsVWludDhDbGFtcGVkQXJyYXk6SC5lRSxDYW52YXNQaXhl
+bEFycmF5OkguZUUsVWludDhBcnJheTpILlY2LEhUTUxBdWRpb0VsZW1lbnQ6Vy5xRSxIVE1MQlJFbGVt
+ZW50OlcucUUsSFRNTEJ1dHRvbkVsZW1lbnQ6Vy5xRSxIVE1MQ2FudmFzRWxlbWVudDpXLnFFLEhUTUxD
+b250ZW50RWxlbWVudDpXLnFFLEhUTUxETGlzdEVsZW1lbnQ6Vy5xRSxIVE1MRGF0YUVsZW1lbnQ6Vy5x
+RSxIVE1MRGF0YUxpc3RFbGVtZW50OlcucUUsSFRNTERldGFpbHNFbGVtZW50OlcucUUsSFRNTERpYWxv
+Z0VsZW1lbnQ6Vy5xRSxIVE1MRGl2RWxlbWVudDpXLnFFLEhUTUxFbWJlZEVsZW1lbnQ6Vy5xRSxIVE1M
+RmllbGRTZXRFbGVtZW50OlcucUUsSFRNTEhSRWxlbWVudDpXLnFFLEhUTUxIZWFkRWxlbWVudDpXLnFF
+LEhUTUxIZWFkaW5nRWxlbWVudDpXLnFFLEhUTUxIdG1sRWxlbWVudDpXLnFFLEhUTUxJRnJhbWVFbGVt
+ZW50OlcucUUsSFRNTEltYWdlRWxlbWVudDpXLnFFLEhUTUxJbnB1dEVsZW1lbnQ6Vy5xRSxIVE1MTElF
+bGVtZW50OlcucUUsSFRNTExhYmVsRWxlbWVudDpXLnFFLEhUTUxMZWdlbmRFbGVtZW50OlcucUUsSFRN
+TExpbmtFbGVtZW50OlcucUUsSFRNTE1hcEVsZW1lbnQ6Vy5xRSxIVE1MTWVkaWFFbGVtZW50OlcucUUs
+SFRNTE1lbnVFbGVtZW50OlcucUUsSFRNTE1ldGFFbGVtZW50OlcucUUsSFRNTE1ldGVyRWxlbWVudDpX
+LnFFLEhUTUxNb2RFbGVtZW50OlcucUUsSFRNTE9MaXN0RWxlbWVudDpXLnFFLEhUTUxPYmplY3RFbGVt
+ZW50OlcucUUsSFRNTE9wdEdyb3VwRWxlbWVudDpXLnFFLEhUTUxPcHRpb25FbGVtZW50OlcucUUsSFRN
+TE91dHB1dEVsZW1lbnQ6Vy5xRSxIVE1MUGFyYW1FbGVtZW50OlcucUUsSFRNTFBpY3R1cmVFbGVtZW50
+OlcucUUsSFRNTFByZUVsZW1lbnQ6Vy5xRSxIVE1MUHJvZ3Jlc3NFbGVtZW50OlcucUUsSFRNTFF1b3Rl
+RWxlbWVudDpXLnFFLEhUTUxTY3JpcHRFbGVtZW50OlcucUUsSFRNTFNoYWRvd0VsZW1lbnQ6Vy5xRSxI
+VE1MU2xvdEVsZW1lbnQ6Vy5xRSxIVE1MU291cmNlRWxlbWVudDpXLnFFLEhUTUxTcGFuRWxlbWVudDpX
+LnFFLEhUTUxTdHlsZUVsZW1lbnQ6Vy5xRSxIVE1MVGFibGVDYXB0aW9uRWxlbWVudDpXLnFFLEhUTUxU
+YWJsZUNlbGxFbGVtZW50OlcucUUsSFRNTFRhYmxlRGF0YUNlbGxFbGVtZW50OlcucUUsSFRNTFRhYmxl
+SGVhZGVyQ2VsbEVsZW1lbnQ6Vy5xRSxIVE1MVGFibGVDb2xFbGVtZW50OlcucUUsSFRNTFRleHRBcmVh
+RWxlbWVudDpXLnFFLEhUTUxUaW1lRWxlbWVudDpXLnFFLEhUTUxUaXRsZUVsZW1lbnQ6Vy5xRSxIVE1M
+VHJhY2tFbGVtZW50OlcucUUsSFRNTFVMaXN0RWxlbWVudDpXLnFFLEhUTUxVbmtub3duRWxlbWVudDpX
+LnFFLEhUTUxWaWRlb0VsZW1lbnQ6Vy5xRSxIVE1MRGlyZWN0b3J5RWxlbWVudDpXLnFFLEhUTUxGb250
+RWxlbWVudDpXLnFFLEhUTUxGcmFtZUVsZW1lbnQ6Vy5xRSxIVE1MRnJhbWVTZXRFbGVtZW50OlcucUUs
+SFRNTE1hcnF1ZWVFbGVtZW50OlcucUUsSFRNTEVsZW1lbnQ6Vy5xRSxIVE1MQW5jaG9yRWxlbWVudDpX
+LkdoLEhUTUxBcmVhRWxlbWVudDpXLmZZLEhUTUxCYXNlRWxlbWVudDpXLm5CLEJsb2I6Vy5BeixIVE1M
+Qm9keUVsZW1lbnQ6Vy5RUCxDREFUQVNlY3Rpb246Vy5ueCxDaGFyYWN0ZXJEYXRhOlcubngsQ29tbWVu
+dDpXLm54LFByb2Nlc3NpbmdJbnN0cnVjdGlvbjpXLm54LFRleHQ6Vy5ueCxDU1NTdHlsZURlY2xhcmF0
+aW9uOlcub0osTVNTdHlsZUNTU1Byb3BlcnRpZXM6Vy5vSixDU1MyUHJvcGVydGllczpXLm9KLFhNTERv
+Y3VtZW50OlcuUUYsRG9jdW1lbnQ6Vy5RRixET01FeGNlcHRpb246Vy5OaCxET01SZWN0UmVhZE9ubHk6
+Vy5JQixET01Ub2tlbkxpc3Q6Vy5uNyxFbGVtZW50OlcuY3YsQWJvcnRQYXltZW50RXZlbnQ6Vy5lYSxB
+bmltYXRpb25FdmVudDpXLmVhLEFuaW1hdGlvblBsYXliYWNrRXZlbnQ6Vy5lYSxBcHBsaWNhdGlvbkNh
+Y2hlRXJyb3JFdmVudDpXLmVhLEJhY2tncm91bmRGZXRjaENsaWNrRXZlbnQ6Vy5lYSxCYWNrZ3JvdW5k
+RmV0Y2hFdmVudDpXLmVhLEJhY2tncm91bmRGZXRjaEZhaWxFdmVudDpXLmVhLEJhY2tncm91bmRGZXRj
+aGVkRXZlbnQ6Vy5lYSxCZWZvcmVJbnN0YWxsUHJvbXB0RXZlbnQ6Vy5lYSxCZWZvcmVVbmxvYWRFdmVu
+dDpXLmVhLEJsb2JFdmVudDpXLmVhLENhbk1ha2VQYXltZW50RXZlbnQ6Vy5lYSxDbGlwYm9hcmRFdmVu
+dDpXLmVhLENsb3NlRXZlbnQ6Vy5lYSxDdXN0b21FdmVudDpXLmVhLERldmljZU1vdGlvbkV2ZW50Olcu
+ZWEsRGV2aWNlT3JpZW50YXRpb25FdmVudDpXLmVhLEVycm9yRXZlbnQ6Vy5lYSxFeHRlbmRhYmxlRXZl
+bnQ6Vy5lYSxFeHRlbmRhYmxlTWVzc2FnZUV2ZW50OlcuZWEsRmV0Y2hFdmVudDpXLmVhLEZvbnRGYWNl
+U2V0TG9hZEV2ZW50OlcuZWEsRm9yZWlnbkZldGNoRXZlbnQ6Vy5lYSxHYW1lcGFkRXZlbnQ6Vy5lYSxI
+YXNoQ2hhbmdlRXZlbnQ6Vy5lYSxJbnN0YWxsRXZlbnQ6Vy5lYSxNZWRpYUVuY3J5cHRlZEV2ZW50Olcu
+ZWEsTWVkaWFLZXlNZXNzYWdlRXZlbnQ6Vy5lYSxNZWRpYVF1ZXJ5TGlzdEV2ZW50OlcuZWEsTWVkaWFT
+dHJlYW1FdmVudDpXLmVhLE1lZGlhU3RyZWFtVHJhY2tFdmVudDpXLmVhLE1lc3NhZ2VFdmVudDpXLmVh
+LE1JRElDb25uZWN0aW9uRXZlbnQ6Vy5lYSxNSURJTWVzc2FnZUV2ZW50OlcuZWEsTXV0YXRpb25FdmVu
+dDpXLmVhLE5vdGlmaWNhdGlvbkV2ZW50OlcuZWEsUGFnZVRyYW5zaXRpb25FdmVudDpXLmVhLFBheW1l
+bnRSZXF1ZXN0RXZlbnQ6Vy5lYSxQYXltZW50UmVxdWVzdFVwZGF0ZUV2ZW50OlcuZWEsUG9wU3RhdGVF
+dmVudDpXLmVhLFByZXNlbnRhdGlvbkNvbm5lY3Rpb25BdmFpbGFibGVFdmVudDpXLmVhLFByZXNlbnRh
+dGlvbkNvbm5lY3Rpb25DbG9zZUV2ZW50OlcuZWEsUHJvbWlzZVJlamVjdGlvbkV2ZW50OlcuZWEsUHVz
+aEV2ZW50OlcuZWEsUlRDRGF0YUNoYW5uZWxFdmVudDpXLmVhLFJUQ0RUTUZUb25lQ2hhbmdlRXZlbnQ6
+Vy5lYSxSVENQZWVyQ29ubmVjdGlvbkljZUV2ZW50OlcuZWEsUlRDVHJhY2tFdmVudDpXLmVhLFNlY3Vy
+aXR5UG9saWN5VmlvbGF0aW9uRXZlbnQ6Vy5lYSxTZW5zb3JFcnJvckV2ZW50OlcuZWEsU3BlZWNoUmVj
+b2duaXRpb25FcnJvcjpXLmVhLFNwZWVjaFJlY29nbml0aW9uRXZlbnQ6Vy5lYSxTcGVlY2hTeW50aGVz
+aXNFdmVudDpXLmVhLFN0b3JhZ2VFdmVudDpXLmVhLFN5bmNFdmVudDpXLmVhLFRyYWNrRXZlbnQ6Vy5l
+YSxUcmFuc2l0aW9uRXZlbnQ6Vy5lYSxXZWJLaXRUcmFuc2l0aW9uRXZlbnQ6Vy5lYSxWUkRldmljZUV2
+ZW50OlcuZWEsVlJEaXNwbGF5RXZlbnQ6Vy5lYSxWUlNlc3Npb25FdmVudDpXLmVhLE1vam9JbnRlcmZh
+Y2VSZXF1ZXN0RXZlbnQ6Vy5lYSxVU0JDb25uZWN0aW9uRXZlbnQ6Vy5lYSxJREJWZXJzaW9uQ2hhbmdl
+RXZlbnQ6Vy5lYSxBdWRpb1Byb2Nlc3NpbmdFdmVudDpXLmVhLE9mZmxpbmVBdWRpb0NvbXBsZXRpb25F
+dmVudDpXLmVhLFdlYkdMQ29udGV4dEV2ZW50OlcuZWEsRXZlbnQ6Vy5lYSxJbnB1dEV2ZW50OlcuZWEs
+RXZlbnRUYXJnZXQ6Vy5EMCxGaWxlOlcuVDUsSFRNTEZvcm1FbGVtZW50OlcuaDQsSGlzdG9yeTpXLmJy
+LEhUTUxEb2N1bWVudDpXLlZiLFhNTEh0dHBSZXF1ZXN0OlcuZkosWE1MSHR0cFJlcXVlc3RFdmVudFRh
+cmdldDpXLndhLEltYWdlRGF0YTpXLlNnLExvY2F0aW9uOlcudTgsTW91c2VFdmVudDpXLk9LLERyYWdF
+dmVudDpXLk9LLFBvaW50ZXJFdmVudDpXLk9LLFdoZWVsRXZlbnQ6Vy5PSyxEb2N1bWVudEZyYWdtZW50
+OlcudUgsU2hhZG93Um9vdDpXLnVILERvY3VtZW50VHlwZTpXLnVILE5vZGU6Vy51SCxOb2RlTGlzdDpX
+LkJILFJhZGlvTm9kZUxpc3Q6Vy5CSCxIVE1MUGFyYWdyYXBoRWxlbWVudDpXLlNOLFByb2dyZXNzRXZl
+bnQ6Vy5ldyxSZXNvdXJjZVByb2dyZXNzRXZlbnQ6Vy5ldyxIVE1MU2VsZWN0RWxlbWVudDpXLmxwLEhU
+TUxUYWJsZUVsZW1lbnQ6Vy5UYixIVE1MVGFibGVSb3dFbGVtZW50OlcuSXYsSFRNTFRhYmxlU2VjdGlv
+bkVsZW1lbnQ6Vy5CVCxIVE1MVGVtcGxhdGVFbGVtZW50OlcueVksQ29tcG9zaXRpb25FdmVudDpXLnc2
+LEZvY3VzRXZlbnQ6Vy53NixLZXlib2FyZEV2ZW50OlcudzYsVGV4dEV2ZW50OlcudzYsVG91Y2hFdmVu
+dDpXLnc2LFVJRXZlbnQ6Vy53NixXaW5kb3c6Vy5LNSxET01XaW5kb3c6Vy5LNSxEZWRpY2F0ZWRXb3Jr
+ZXJHbG9iYWxTY29wZTpXLkNtLFNlcnZpY2VXb3JrZXJHbG9iYWxTY29wZTpXLkNtLFNoYXJlZFdvcmtl
+ckdsb2JhbFNjb3BlOlcuQ20sV29ya2VyR2xvYmFsU2NvcGU6Vy5DbSxBdHRyOlcuQ1EsQ2xpZW50UmVj
+dDpXLnc0LERPTVJlY3Q6Vy53NCxOYW1lZE5vZGVNYXA6Vy5yaCxNb3pOYW1lZEF0dHJNYXA6Vy5yaCxJ
+REJLZXlSYW5nZTpQLmhGLFNWR1NjcmlwdEVsZW1lbnQ6UC5uZCxTVkdBRWxlbWVudDpQLmQ1LFNWR0Fu
+aW1hdGVFbGVtZW50OlAuZDUsU1ZHQW5pbWF0ZU1vdGlvbkVsZW1lbnQ6UC5kNSxTVkdBbmltYXRlVHJh
+bnNmb3JtRWxlbWVudDpQLmQ1LFNWR0FuaW1hdGlvbkVsZW1lbnQ6UC5kNSxTVkdDaXJjbGVFbGVtZW50
+OlAuZDUsU1ZHQ2xpcFBhdGhFbGVtZW50OlAuZDUsU1ZHRGVmc0VsZW1lbnQ6UC5kNSxTVkdEZXNjRWxl
+bWVudDpQLmQ1LFNWR0Rpc2NhcmRFbGVtZW50OlAuZDUsU1ZHRWxsaXBzZUVsZW1lbnQ6UC5kNSxTVkdG
+RUJsZW5kRWxlbWVudDpQLmQ1LFNWR0ZFQ29sb3JNYXRyaXhFbGVtZW50OlAuZDUsU1ZHRkVDb21wb25l
+bnRUcmFuc2ZlckVsZW1lbnQ6UC5kNSxTVkdGRUNvbXBvc2l0ZUVsZW1lbnQ6UC5kNSxTVkdGRUNvbnZv
+bHZlTWF0cml4RWxlbWVudDpQLmQ1LFNWR0ZFRGlmZnVzZUxpZ2h0aW5nRWxlbWVudDpQLmQ1LFNWR0ZF
+RGlzcGxhY2VtZW50TWFwRWxlbWVudDpQLmQ1LFNWR0ZFRGlzdGFudExpZ2h0RWxlbWVudDpQLmQ1LFNW
+R0ZFRmxvb2RFbGVtZW50OlAuZDUsU1ZHRkVGdW5jQUVsZW1lbnQ6UC5kNSxTVkdGRUZ1bmNCRWxlbWVu
+dDpQLmQ1LFNWR0ZFRnVuY0dFbGVtZW50OlAuZDUsU1ZHRkVGdW5jUkVsZW1lbnQ6UC5kNSxTVkdGRUdh
+dXNzaWFuQmx1ckVsZW1lbnQ6UC5kNSxTVkdGRUltYWdlRWxlbWVudDpQLmQ1LFNWR0ZFTWVyZ2VFbGVt
+ZW50OlAuZDUsU1ZHRkVNZXJnZU5vZGVFbGVtZW50OlAuZDUsU1ZHRkVNb3JwaG9sb2d5RWxlbWVudDpQ
+LmQ1LFNWR0ZFT2Zmc2V0RWxlbWVudDpQLmQ1LFNWR0ZFUG9pbnRMaWdodEVsZW1lbnQ6UC5kNSxTVkdG
+RVNwZWN1bGFyTGlnaHRpbmdFbGVtZW50OlAuZDUsU1ZHRkVTcG90TGlnaHRFbGVtZW50OlAuZDUsU1ZH
+RkVUaWxlRWxlbWVudDpQLmQ1LFNWR0ZFVHVyYnVsZW5jZUVsZW1lbnQ6UC5kNSxTVkdGaWx0ZXJFbGVt
+ZW50OlAuZDUsU1ZHRm9yZWlnbk9iamVjdEVsZW1lbnQ6UC5kNSxTVkdHRWxlbWVudDpQLmQ1LFNWR0dl
+b21ldHJ5RWxlbWVudDpQLmQ1LFNWR0dyYXBoaWNzRWxlbWVudDpQLmQ1LFNWR0ltYWdlRWxlbWVudDpQ
+LmQ1LFNWR0xpbmVFbGVtZW50OlAuZDUsU1ZHTGluZWFyR3JhZGllbnRFbGVtZW50OlAuZDUsU1ZHTWFy
+a2VyRWxlbWVudDpQLmQ1LFNWR01hc2tFbGVtZW50OlAuZDUsU1ZHTWV0YWRhdGFFbGVtZW50OlAuZDUs
+U1ZHUGF0aEVsZW1lbnQ6UC5kNSxTVkdQYXR0ZXJuRWxlbWVudDpQLmQ1LFNWR1BvbHlnb25FbGVtZW50
+OlAuZDUsU1ZHUG9seWxpbmVFbGVtZW50OlAuZDUsU1ZHUmFkaWFsR3JhZGllbnRFbGVtZW50OlAuZDUs
+U1ZHUmVjdEVsZW1lbnQ6UC5kNSxTVkdTZXRFbGVtZW50OlAuZDUsU1ZHU3RvcEVsZW1lbnQ6UC5kNSxT
+VkdTdHlsZUVsZW1lbnQ6UC5kNSxTVkdTVkdFbGVtZW50OlAuZDUsU1ZHU3dpdGNoRWxlbWVudDpQLmQ1
+LFNWR1N5bWJvbEVsZW1lbnQ6UC5kNSxTVkdUU3BhbkVsZW1lbnQ6UC5kNSxTVkdUZXh0Q29udGVudEVs
+ZW1lbnQ6UC5kNSxTVkdUZXh0RWxlbWVudDpQLmQ1LFNWR1RleHRQYXRoRWxlbWVudDpQLmQ1LFNWR1Rl
+eHRQb3NpdGlvbmluZ0VsZW1lbnQ6UC5kNSxTVkdUaXRsZUVsZW1lbnQ6UC5kNSxTVkdVc2VFbGVtZW50
+OlAuZDUsU1ZHVmlld0VsZW1lbnQ6UC5kNSxTVkdHcmFkaWVudEVsZW1lbnQ6UC5kNSxTVkdDb21wb25l
+bnRUcmFuc2ZlckZ1bmN0aW9uRWxlbWVudDpQLmQ1LFNWR0ZFRHJvcFNoYWRvd0VsZW1lbnQ6UC5kNSxT
+VkdNUGF0aEVsZW1lbnQ6UC5kNSxTVkdFbGVtZW50OlAuZDV9KQpodW5rSGVscGVycy5zZXRPclVwZGF0
+ZUxlYWZUYWdzKHtET01FcnJvcjp0cnVlLERPTUltcGxlbWVudGF0aW9uOnRydWUsTWVkaWFFcnJvcjp0
+cnVlLE5hdmlnYXRvcjp0cnVlLE5hdmlnYXRvckNvbmN1cnJlbnRIYXJkd2FyZTp0cnVlLE5hdmlnYXRv
+clVzZXJNZWRpYUVycm9yOnRydWUsT3ZlcmNvbnN0cmFpbmVkRXJyb3I6dHJ1ZSxQb3NpdGlvbkVycm9y
+OnRydWUsUmFuZ2U6dHJ1ZSxTUUxFcnJvcjp0cnVlLERhdGFWaWV3OnRydWUsQXJyYXlCdWZmZXJWaWV3
+OmZhbHNlLEZsb2F0MzJBcnJheTp0cnVlLEZsb2F0NjRBcnJheTp0cnVlLEludDE2QXJyYXk6dHJ1ZSxJ
+bnQzMkFycmF5OnRydWUsSW50OEFycmF5OnRydWUsVWludDE2QXJyYXk6dHJ1ZSxVaW50MzJBcnJheTp0
+cnVlLFVpbnQ4Q2xhbXBlZEFycmF5OnRydWUsQ2FudmFzUGl4ZWxBcnJheTp0cnVlLFVpbnQ4QXJyYXk6
+ZmFsc2UsSFRNTEF1ZGlvRWxlbWVudDp0cnVlLEhUTUxCUkVsZW1lbnQ6dHJ1ZSxIVE1MQnV0dG9uRWxl
+bWVudDp0cnVlLEhUTUxDYW52YXNFbGVtZW50OnRydWUsSFRNTENvbnRlbnRFbGVtZW50OnRydWUsSFRN
+TERMaXN0RWxlbWVudDp0cnVlLEhUTUxEYXRhRWxlbWVudDp0cnVlLEhUTUxEYXRhTGlzdEVsZW1lbnQ6
+dHJ1ZSxIVE1MRGV0YWlsc0VsZW1lbnQ6dHJ1ZSxIVE1MRGlhbG9nRWxlbWVudDp0cnVlLEhUTUxEaXZF
+bGVtZW50OnRydWUsSFRNTEVtYmVkRWxlbWVudDp0cnVlLEhUTUxGaWVsZFNldEVsZW1lbnQ6dHJ1ZSxI
+VE1MSFJFbGVtZW50OnRydWUsSFRNTEhlYWRFbGVtZW50OnRydWUsSFRNTEhlYWRpbmdFbGVtZW50OnRy
+dWUsSFRNTEh0bWxFbGVtZW50OnRydWUsSFRNTElGcmFtZUVsZW1lbnQ6dHJ1ZSxIVE1MSW1hZ2VFbGVt
+ZW50OnRydWUsSFRNTElucHV0RWxlbWVudDp0cnVlLEhUTUxMSUVsZW1lbnQ6dHJ1ZSxIVE1MTGFiZWxF
+bGVtZW50OnRydWUsSFRNTExlZ2VuZEVsZW1lbnQ6dHJ1ZSxIVE1MTGlua0VsZW1lbnQ6dHJ1ZSxIVE1M
+TWFwRWxlbWVudDp0cnVlLEhUTUxNZWRpYUVsZW1lbnQ6dHJ1ZSxIVE1MTWVudUVsZW1lbnQ6dHJ1ZSxI
+VE1MTWV0YUVsZW1lbnQ6dHJ1ZSxIVE1MTWV0ZXJFbGVtZW50OnRydWUsSFRNTE1vZEVsZW1lbnQ6dHJ1
+ZSxIVE1MT0xpc3RFbGVtZW50OnRydWUsSFRNTE9iamVjdEVsZW1lbnQ6dHJ1ZSxIVE1MT3B0R3JvdXBF
+bGVtZW50OnRydWUsSFRNTE9wdGlvbkVsZW1lbnQ6dHJ1ZSxIVE1MT3V0cHV0RWxlbWVudDp0cnVlLEhU
+TUxQYXJhbUVsZW1lbnQ6dHJ1ZSxIVE1MUGljdHVyZUVsZW1lbnQ6dHJ1ZSxIVE1MUHJlRWxlbWVudDp0
+cnVlLEhUTUxQcm9ncmVzc0VsZW1lbnQ6dHJ1ZSxIVE1MUXVvdGVFbGVtZW50OnRydWUsSFRNTFNjcmlw
+dEVsZW1lbnQ6dHJ1ZSxIVE1MU2hhZG93RWxlbWVudDp0cnVlLEhUTUxTbG90RWxlbWVudDp0cnVlLEhU
+TUxTb3VyY2VFbGVtZW50OnRydWUsSFRNTFNwYW5FbGVtZW50OnRydWUsSFRNTFN0eWxlRWxlbWVudDp0
+cnVlLEhUTUxUYWJsZUNhcHRpb25FbGVtZW50OnRydWUsSFRNTFRhYmxlQ2VsbEVsZW1lbnQ6dHJ1ZSxI
+VE1MVGFibGVEYXRhQ2VsbEVsZW1lbnQ6dHJ1ZSxIVE1MVGFibGVIZWFkZXJDZWxsRWxlbWVudDp0cnVl
+LEhUTUxUYWJsZUNvbEVsZW1lbnQ6dHJ1ZSxIVE1MVGV4dEFyZWFFbGVtZW50OnRydWUsSFRNTFRpbWVF
+bGVtZW50OnRydWUsSFRNTFRpdGxlRWxlbWVudDp0cnVlLEhUTUxUcmFja0VsZW1lbnQ6dHJ1ZSxIVE1M
+VUxpc3RFbGVtZW50OnRydWUsSFRNTFVua25vd25FbGVtZW50OnRydWUsSFRNTFZpZGVvRWxlbWVudDp0
+cnVlLEhUTUxEaXJlY3RvcnlFbGVtZW50OnRydWUsSFRNTEZvbnRFbGVtZW50OnRydWUsSFRNTEZyYW1l
+RWxlbWVudDp0cnVlLEhUTUxGcmFtZVNldEVsZW1lbnQ6dHJ1ZSxIVE1MTWFycXVlZUVsZW1lbnQ6dHJ1
+ZSxIVE1MRWxlbWVudDpmYWxzZSxIVE1MQW5jaG9yRWxlbWVudDp0cnVlLEhUTUxBcmVhRWxlbWVudDp0
+cnVlLEhUTUxCYXNlRWxlbWVudDp0cnVlLEJsb2I6ZmFsc2UsSFRNTEJvZHlFbGVtZW50OnRydWUsQ0RB
+VEFTZWN0aW9uOnRydWUsQ2hhcmFjdGVyRGF0YTp0cnVlLENvbW1lbnQ6dHJ1ZSxQcm9jZXNzaW5nSW5z
+dHJ1Y3Rpb246dHJ1ZSxUZXh0OnRydWUsQ1NTU3R5bGVEZWNsYXJhdGlvbjp0cnVlLE1TU3R5bGVDU1NQ
+cm9wZXJ0aWVzOnRydWUsQ1NTMlByb3BlcnRpZXM6dHJ1ZSxYTUxEb2N1bWVudDp0cnVlLERvY3VtZW50
+OmZhbHNlLERPTUV4Y2VwdGlvbjp0cnVlLERPTVJlY3RSZWFkT25seTpmYWxzZSxET01Ub2tlbkxpc3Q6
+dHJ1ZSxFbGVtZW50OmZhbHNlLEFib3J0UGF5bWVudEV2ZW50OnRydWUsQW5pbWF0aW9uRXZlbnQ6dHJ1
+ZSxBbmltYXRpb25QbGF5YmFja0V2ZW50OnRydWUsQXBwbGljYXRpb25DYWNoZUVycm9yRXZlbnQ6dHJ1
+ZSxCYWNrZ3JvdW5kRmV0Y2hDbGlja0V2ZW50OnRydWUsQmFja2dyb3VuZEZldGNoRXZlbnQ6dHJ1ZSxC
+YWNrZ3JvdW5kRmV0Y2hGYWlsRXZlbnQ6dHJ1ZSxCYWNrZ3JvdW5kRmV0Y2hlZEV2ZW50OnRydWUsQmVm
+b3JlSW5zdGFsbFByb21wdEV2ZW50OnRydWUsQmVmb3JlVW5sb2FkRXZlbnQ6dHJ1ZSxCbG9iRXZlbnQ6
+dHJ1ZSxDYW5NYWtlUGF5bWVudEV2ZW50OnRydWUsQ2xpcGJvYXJkRXZlbnQ6dHJ1ZSxDbG9zZUV2ZW50
+OnRydWUsQ3VzdG9tRXZlbnQ6dHJ1ZSxEZXZpY2VNb3Rpb25FdmVudDp0cnVlLERldmljZU9yaWVudGF0
+aW9uRXZlbnQ6dHJ1ZSxFcnJvckV2ZW50OnRydWUsRXh0ZW5kYWJsZUV2ZW50OnRydWUsRXh0ZW5kYWJs
+ZU1lc3NhZ2VFdmVudDp0cnVlLEZldGNoRXZlbnQ6dHJ1ZSxGb250RmFjZVNldExvYWRFdmVudDp0cnVl
+LEZvcmVpZ25GZXRjaEV2ZW50OnRydWUsR2FtZXBhZEV2ZW50OnRydWUsSGFzaENoYW5nZUV2ZW50OnRy
+dWUsSW5zdGFsbEV2ZW50OnRydWUsTWVkaWFFbmNyeXB0ZWRFdmVudDp0cnVlLE1lZGlhS2V5TWVzc2Fn
+ZUV2ZW50OnRydWUsTWVkaWFRdWVyeUxpc3RFdmVudDp0cnVlLE1lZGlhU3RyZWFtRXZlbnQ6dHJ1ZSxN
+ZWRpYVN0cmVhbVRyYWNrRXZlbnQ6dHJ1ZSxNZXNzYWdlRXZlbnQ6dHJ1ZSxNSURJQ29ubmVjdGlvbkV2
+ZW50OnRydWUsTUlESU1lc3NhZ2VFdmVudDp0cnVlLE11dGF0aW9uRXZlbnQ6dHJ1ZSxOb3RpZmljYXRp
+b25FdmVudDp0cnVlLFBhZ2VUcmFuc2l0aW9uRXZlbnQ6dHJ1ZSxQYXltZW50UmVxdWVzdEV2ZW50OnRy
+dWUsUGF5bWVudFJlcXVlc3RVcGRhdGVFdmVudDp0cnVlLFBvcFN0YXRlRXZlbnQ6dHJ1ZSxQcmVzZW50
+YXRpb25Db25uZWN0aW9uQXZhaWxhYmxlRXZlbnQ6dHJ1ZSxQcmVzZW50YXRpb25Db25uZWN0aW9uQ2xv
+c2VFdmVudDp0cnVlLFByb21pc2VSZWplY3Rpb25FdmVudDp0cnVlLFB1c2hFdmVudDp0cnVlLFJUQ0Rh
+dGFDaGFubmVsRXZlbnQ6dHJ1ZSxSVENEVE1GVG9uZUNoYW5nZUV2ZW50OnRydWUsUlRDUGVlckNvbm5l
+Y3Rpb25JY2VFdmVudDp0cnVlLFJUQ1RyYWNrRXZlbnQ6dHJ1ZSxTZWN1cml0eVBvbGljeVZpb2xhdGlv
+bkV2ZW50OnRydWUsU2Vuc29yRXJyb3JFdmVudDp0cnVlLFNwZWVjaFJlY29nbml0aW9uRXJyb3I6dHJ1
+ZSxTcGVlY2hSZWNvZ25pdGlvbkV2ZW50OnRydWUsU3BlZWNoU3ludGhlc2lzRXZlbnQ6dHJ1ZSxTdG9y
+YWdlRXZlbnQ6dHJ1ZSxTeW5jRXZlbnQ6dHJ1ZSxUcmFja0V2ZW50OnRydWUsVHJhbnNpdGlvbkV2ZW50
+OnRydWUsV2ViS2l0VHJhbnNpdGlvbkV2ZW50OnRydWUsVlJEZXZpY2VFdmVudDp0cnVlLFZSRGlzcGxh
+eUV2ZW50OnRydWUsVlJTZXNzaW9uRXZlbnQ6dHJ1ZSxNb2pvSW50ZXJmYWNlUmVxdWVzdEV2ZW50OnRy
+dWUsVVNCQ29ubmVjdGlvbkV2ZW50OnRydWUsSURCVmVyc2lvbkNoYW5nZUV2ZW50OnRydWUsQXVkaW9Q
+cm9jZXNzaW5nRXZlbnQ6dHJ1ZSxPZmZsaW5lQXVkaW9Db21wbGV0aW9uRXZlbnQ6dHJ1ZSxXZWJHTENv
+bnRleHRFdmVudDp0cnVlLEV2ZW50OmZhbHNlLElucHV0RXZlbnQ6ZmFsc2UsRXZlbnRUYXJnZXQ6ZmFs
+c2UsRmlsZTp0cnVlLEhUTUxGb3JtRWxlbWVudDp0cnVlLEhpc3Rvcnk6dHJ1ZSxIVE1MRG9jdW1lbnQ6
+dHJ1ZSxYTUxIdHRwUmVxdWVzdDp0cnVlLFhNTEh0dHBSZXF1ZXN0RXZlbnRUYXJnZXQ6ZmFsc2UsSW1h
+Z2VEYXRhOnRydWUsTG9jYXRpb246dHJ1ZSxNb3VzZUV2ZW50OnRydWUsRHJhZ0V2ZW50OnRydWUsUG9p
+bnRlckV2ZW50OnRydWUsV2hlZWxFdmVudDp0cnVlLERvY3VtZW50RnJhZ21lbnQ6dHJ1ZSxTaGFkb3dS
+b290OnRydWUsRG9jdW1lbnRUeXBlOnRydWUsTm9kZTpmYWxzZSxOb2RlTGlzdDp0cnVlLFJhZGlvTm9k
+ZUxpc3Q6dHJ1ZSxIVE1MUGFyYWdyYXBoRWxlbWVudDp0cnVlLFByb2dyZXNzRXZlbnQ6dHJ1ZSxSZXNv
+dXJjZVByb2dyZXNzRXZlbnQ6dHJ1ZSxIVE1MU2VsZWN0RWxlbWVudDp0cnVlLEhUTUxUYWJsZUVsZW1l
+bnQ6dHJ1ZSxIVE1MVGFibGVSb3dFbGVtZW50OnRydWUsSFRNTFRhYmxlU2VjdGlvbkVsZW1lbnQ6dHJ1
+ZSxIVE1MVGVtcGxhdGVFbGVtZW50OnRydWUsQ29tcG9zaXRpb25FdmVudDp0cnVlLEZvY3VzRXZlbnQ6
+dHJ1ZSxLZXlib2FyZEV2ZW50OnRydWUsVGV4dEV2ZW50OnRydWUsVG91Y2hFdmVudDp0cnVlLFVJRXZl
+bnQ6ZmFsc2UsV2luZG93OnRydWUsRE9NV2luZG93OnRydWUsRGVkaWNhdGVkV29ya2VyR2xvYmFsU2Nv
+cGU6dHJ1ZSxTZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGU6dHJ1ZSxTaGFyZWRXb3JrZXJHbG9iYWxTY29w
+ZTp0cnVlLFdvcmtlckdsb2JhbFNjb3BlOnRydWUsQXR0cjp0cnVlLENsaWVudFJlY3Q6dHJ1ZSxET01S
+ZWN0OnRydWUsTmFtZWROb2RlTWFwOnRydWUsTW96TmFtZWRBdHRyTWFwOnRydWUsSURCS2V5UmFuZ2U6
+dHJ1ZSxTVkdTY3JpcHRFbGVtZW50OnRydWUsU1ZHQUVsZW1lbnQ6dHJ1ZSxTVkdBbmltYXRlRWxlbWVu
+dDp0cnVlLFNWR0FuaW1hdGVNb3Rpb25FbGVtZW50OnRydWUsU1ZHQW5pbWF0ZVRyYW5zZm9ybUVsZW1l
+bnQ6dHJ1ZSxTVkdBbmltYXRpb25FbGVtZW50OnRydWUsU1ZHQ2lyY2xlRWxlbWVudDp0cnVlLFNWR0Ns
+aXBQYXRoRWxlbWVudDp0cnVlLFNWR0RlZnNFbGVtZW50OnRydWUsU1ZHRGVzY0VsZW1lbnQ6dHJ1ZSxT
+VkdEaXNjYXJkRWxlbWVudDp0cnVlLFNWR0VsbGlwc2VFbGVtZW50OnRydWUsU1ZHRkVCbGVuZEVsZW1l
+bnQ6dHJ1ZSxTVkdGRUNvbG9yTWF0cml4RWxlbWVudDp0cnVlLFNWR0ZFQ29tcG9uZW50VHJhbnNmZXJF
+bGVtZW50OnRydWUsU1ZHRkVDb21wb3NpdGVFbGVtZW50OnRydWUsU1ZHRkVDb252b2x2ZU1hdHJpeEVs
+ZW1lbnQ6dHJ1ZSxTVkdGRURpZmZ1c2VMaWdodGluZ0VsZW1lbnQ6dHJ1ZSxTVkdGRURpc3BsYWNlbWVu
+dE1hcEVsZW1lbnQ6dHJ1ZSxTVkdGRURpc3RhbnRMaWdodEVsZW1lbnQ6dHJ1ZSxTVkdGRUZsb29kRWxl
+bWVudDp0cnVlLFNWR0ZFRnVuY0FFbGVtZW50OnRydWUsU1ZHRkVGdW5jQkVsZW1lbnQ6dHJ1ZSxTVkdG
+RUZ1bmNHRWxlbWVudDp0cnVlLFNWR0ZFRnVuY1JFbGVtZW50OnRydWUsU1ZHRkVHYXVzc2lhbkJsdXJF
+bGVtZW50OnRydWUsU1ZHRkVJbWFnZUVsZW1lbnQ6dHJ1ZSxTVkdGRU1lcmdlRWxlbWVudDp0cnVlLFNW
+R0ZFTWVyZ2VOb2RlRWxlbWVudDp0cnVlLFNWR0ZFTW9ycGhvbG9neUVsZW1lbnQ6dHJ1ZSxTVkdGRU9m
+ZnNldEVsZW1lbnQ6dHJ1ZSxTVkdGRVBvaW50TGlnaHRFbGVtZW50OnRydWUsU1ZHRkVTcGVjdWxhckxp
+Z2h0aW5nRWxlbWVudDp0cnVlLFNWR0ZFU3BvdExpZ2h0RWxlbWVudDp0cnVlLFNWR0ZFVGlsZUVsZW1l
+bnQ6dHJ1ZSxTVkdGRVR1cmJ1bGVuY2VFbGVtZW50OnRydWUsU1ZHRmlsdGVyRWxlbWVudDp0cnVlLFNW
+R0ZvcmVpZ25PYmplY3RFbGVtZW50OnRydWUsU1ZHR0VsZW1lbnQ6dHJ1ZSxTVkdHZW9tZXRyeUVsZW1l
+bnQ6dHJ1ZSxTVkdHcmFwaGljc0VsZW1lbnQ6dHJ1ZSxTVkdJbWFnZUVsZW1lbnQ6dHJ1ZSxTVkdMaW5l
+RWxlbWVudDp0cnVlLFNWR0xpbmVhckdyYWRpZW50RWxlbWVudDp0cnVlLFNWR01hcmtlckVsZW1lbnQ6
+dHJ1ZSxTVkdNYXNrRWxlbWVudDp0cnVlLFNWR01ldGFkYXRhRWxlbWVudDp0cnVlLFNWR1BhdGhFbGVt
+ZW50OnRydWUsU1ZHUGF0dGVybkVsZW1lbnQ6dHJ1ZSxTVkdQb2x5Z29uRWxlbWVudDp0cnVlLFNWR1Bv
+bHlsaW5lRWxlbWVudDp0cnVlLFNWR1JhZGlhbEdyYWRpZW50RWxlbWVudDp0cnVlLFNWR1JlY3RFbGVt
+ZW50OnRydWUsU1ZHU2V0RWxlbWVudDp0cnVlLFNWR1N0b3BFbGVtZW50OnRydWUsU1ZHU3R5bGVFbGVt
+ZW50OnRydWUsU1ZHU1ZHRWxlbWVudDp0cnVlLFNWR1N3aXRjaEVsZW1lbnQ6dHJ1ZSxTVkdTeW1ib2xF
+bGVtZW50OnRydWUsU1ZHVFNwYW5FbGVtZW50OnRydWUsU1ZHVGV4dENvbnRlbnRFbGVtZW50OnRydWUs
+U1ZHVGV4dEVsZW1lbnQ6dHJ1ZSxTVkdUZXh0UGF0aEVsZW1lbnQ6dHJ1ZSxTVkdUZXh0UG9zaXRpb25p
+bmdFbGVtZW50OnRydWUsU1ZHVGl0bGVFbGVtZW50OnRydWUsU1ZHVXNlRWxlbWVudDp0cnVlLFNWR1Zp
+ZXdFbGVtZW50OnRydWUsU1ZHR3JhZGllbnRFbGVtZW50OnRydWUsU1ZHQ29tcG9uZW50VHJhbnNmZXJG
+dW5jdGlvbkVsZW1lbnQ6dHJ1ZSxTVkdGRURyb3BTaGFkb3dFbGVtZW50OnRydWUsU1ZHTVBhdGhFbGVt
+ZW50OnRydWUsU1ZHRWxlbWVudDpmYWxzZX0pCkguYjAuJG5hdGl2ZVN1cGVyY2xhc3NUYWc9IkFycmF5
+QnVmZmVyVmlldyIKSC5SRy4kbmF0aXZlU3VwZXJjbGFzc1RhZz0iQXJyYXlCdWZmZXJWaWV3IgpILlZQ
+LiRuYXRpdmVTdXBlcmNsYXNzVGFnPSJBcnJheUJ1ZmZlclZpZXciCkguRGcuJG5hdGl2ZVN1cGVyY2xh
+c3NUYWc9IkFycmF5QnVmZmVyVmlldyIKSC5XQi4kbmF0aXZlU3VwZXJjbGFzc1RhZz0iQXJyYXlCdWZm
+ZXJWaWV3IgpILlpHLiRuYXRpdmVTdXBlcmNsYXNzVGFnPSJBcnJheUJ1ZmZlclZpZXciCkguUGcuJG5h
+dGl2ZVN1cGVyY2xhc3NUYWc9IkFycmF5QnVmZmVyVmlldyJ9KSgpCmNvbnZlcnRBbGxUb0Zhc3RPYmpl
+Y3QodykKY29udmVydFRvRmFzdE9iamVjdCgkKTsoZnVuY3Rpb24oYSl7aWYodHlwZW9mIGRvY3VtZW50
+PT09InVuZGVmaW5lZCIpe2EobnVsbCkKcmV0dXJufWlmKHR5cGVvZiBkb2N1bWVudC5jdXJyZW50U2Ny
+aXB0IT0ndW5kZWZpbmVkJyl7YShkb2N1bWVudC5jdXJyZW50U2NyaXB0KQpyZXR1cm59dmFyIHQ9ZG9j
+dW1lbnQuc2NyaXB0cwpmdW5jdGlvbiBvbkxvYWQoYil7Zm9yKHZhciByPTA7cjx0Lmxlbmd0aDsrK3Ip
+dFtyXS5yZW1vdmVFdmVudExpc3RlbmVyKCJsb2FkIixvbkxvYWQsZmFsc2UpCmEoYi50YXJnZXQpfWZv
+cih2YXIgcz0wO3M8dC5sZW5ndGg7KytzKXRbc10uYWRkRXZlbnRMaXN0ZW5lcigibG9hZCIsb25Mb2Fk
+LGZhbHNlKX0pKGZ1bmN0aW9uKGEpe3YuY3VycmVudFNjcmlwdD1hCmlmKHR5cGVvZiBkYXJ0TWFpblJ1
+bm5lcj09PSJmdW5jdGlvbiIpZGFydE1haW5SdW5uZXIoTC5JcSxbXSkKZWxzZSBMLklxKFtdKX0pfSko
+KQovLyMgc291cmNlTWFwcGluZ1VSTD1taWdyYXRpb24uanMubWFwCg==
''';
diff --git a/pkg/analysis_server/lib/src/edit/nnbd_migration/unit_renderer.dart b/pkg/analysis_server/lib/src/edit/nnbd_migration/unit_renderer.dart
index 5817faa..b85ff1d 100644
--- a/pkg/analysis_server/lib/src/edit/nnbd_migration/unit_renderer.dart
+++ b/pkg/analysis_server/lib/src/edit/nnbd_migration/unit_renderer.dart
@@ -5,7 +5,6 @@
import 'dart:convert' show HtmlEscape, HtmlEscapeMode, LineSplitter;
import 'package:analysis_server/src/edit/nnbd_migration/migration_info.dart';
-import 'package:analysis_server/src/edit/nnbd_migration/offset_mapper.dart';
import 'package:analysis_server/src/edit/nnbd_migration/path_mapper.dart';
import 'package:analysis_server/src/edit/nnbd_migration/web/file_details.dart';
import 'package:path/path.dart' as path;
@@ -59,23 +58,23 @@
/// The content of the file (not including added links and anchors) will be
/// HTML-escaped.
String _computeNavigationContent() {
- String unitDir = pathContext.dirname(pathMapper.map(unitInfo.path));
- String content = unitInfo.content;
- OffsetMapper mapper = unitInfo.offsetMapper;
- Map<int, String> openInsertions = {};
- Map<int, String> closeInsertions = {};
+ var unitDir = pathContext.dirname(pathMapper.map(unitInfo.path));
+ var content = unitInfo.content;
+ var mapper = unitInfo.offsetMapper;
+ var openInsertions = <int, String>{};
+ var closeInsertions = <int, String>{};
//
// Compute insertions for navigation targets.
//
- for (NavigationTarget region in unitInfo.targets) {
+ for (var region in unitInfo.targets) {
if (region.length > 0) {
- int openOffset = mapper.map(region.offset);
- String openInsertion = openInsertions[openOffset] ?? '';
+ var openOffset = mapper.map(region.offset);
+ var openInsertion = openInsertions[openOffset] ?? '';
openInsertion = '<span id="o${region.offset}">$openInsertion';
openInsertions[openOffset] = openInsertion;
- int closeOffset = openOffset + region.length;
- String closeInsertion = closeInsertions[closeOffset] ?? '';
+ var closeOffset = openOffset + region.length;
+ var closeInsertion = closeInsertions[closeOffset] ?? '';
closeInsertion = '$closeInsertion</span>';
closeInsertions[closeOffset] = closeInsertion;
}
@@ -84,22 +83,22 @@
// Compute insertions for navigation sources, but skip the sources that
// point at themselves.
//
- for (NavigationSource region in unitInfo.sources ?? <NavigationSource>[]) {
+ for (var region in unitInfo.sources ?? <NavigationSource>[]) {
if (region.length > 0) {
- int openOffset = mapper.map(region.offset);
- NavigationTarget target = region.target;
+ var openOffset = mapper.map(region.offset);
+ var target = region.target;
if (target.filePath != unitInfo.path ||
region.offset != target.offset) {
- String openInsertion = openInsertions[openOffset] ?? '';
- String unitPath = pathContext
- .relative(pathMapper.map(target.filePath), from: unitDir);
- String targetUri = _uriForRelativePath(unitPath, target);
+ var openInsertion = openInsertions[openOffset] ?? '';
+ var unitPath = pathContext.relative(pathMapper.map(target.filePath),
+ from: unitDir);
+ var targetUri = _uriForRelativePath(unitPath, target);
openInsertion =
'<a href="$targetUri" class="nav-link">$openInsertion';
openInsertions[openOffset] = openInsertion;
- int closeOffset = openOffset + region.length;
- String closeInsertion = closeInsertions[closeOffset] ?? '';
+ var closeOffset = openOffset + region.length;
+ var closeInsertion = closeInsertions[closeOffset] ?? '';
closeInsertion = '$closeInsertion</a>';
closeInsertions[closeOffset] = closeInsertion;
}
@@ -108,11 +107,11 @@
//
// Apply the insertions that have been computed.
//
- List<int> offsets = [...openInsertions.keys, ...closeInsertions.keys];
+ var offsets = <int>[...openInsertions.keys, ...closeInsertions.keys];
offsets.sort();
- StringBuffer navContent2 = StringBuffer();
- int previousOffset = 0;
- for (int offset in offsets) {
+ var navContent2 = StringBuffer();
+ var previousOffset = 0;
+ for (var offset in offsets) {
navContent2.write(
_htmlEscape.convert(content.substring(previousOffset, offset)));
navContent2.write(closeInsertions[offset] ?? '');
@@ -131,16 +130,16 @@
/// The content of the file (not including added links and anchors) will be
/// HTML-escaped.
String _computeRegionContent(UnitInfo unit) {
- String content = unitInfo.content;
- StringBuffer regions = StringBuffer();
- int lineNumber = 1;
+ var content = unitInfo.content;
+ var regions = StringBuffer();
+ var lineNumber = 1;
void writeSplitLines(
String lines, {
String perLineOpeningTag = '',
String perLineClosingTag = '',
}) {
- Iterator<String> lineIterator = LineSplitter.split(lines).iterator;
+ var lineIterator = LineSplitter.split(lines).iterator;
lineIterator.moveNext();
while (true) {
@@ -180,19 +179,19 @@
throw StateError('Unexpected RegionType $type');
}
- int previousOffset = 0;
+ var previousOffset = 0;
regions.write('<table data-path="${unit.path}"><tbody>');
regions.write('<tr><td class="line-no">$lineNumber</td><td>');
for (var region in unitInfo.regions) {
- int offset = region.offset;
- int length = region.length;
+ var offset = region.offset;
+ var length = region.length;
if (offset > previousOffset) {
// Display a region of unmodified content.
writeSplitLines(content.substring(previousOffset, offset));
previousOffset = offset + length;
}
- String regionClass = classForRegion(region.regionType);
- String regionSpanTag = '<span class="region $regionClass" '
+ var regionClass = classForRegion(region.regionType);
+ var regionSpanTag = '<span class="region $regionClass" '
'data-offset="$offset" data-line="$lineNumber">';
writeSplitLines(content.substring(offset, offset + length),
perLineOpeningTag: regionSpanTag, perLineClosingTag: '</span>');
diff --git a/pkg/analysis_server/lib/src/edit/nnbd_migration/web/migration.dart b/pkg/analysis_server/lib/src/edit/nnbd_migration/web/migration.dart
index c187ebf..4dc2537 100644
--- a/pkg/analysis_server/lib/src/edit/nnbd_migration/web/migration.dart
+++ b/pkg/analysis_server/lib/src/edit/nnbd_migration/web/migration.dart
@@ -19,9 +19,9 @@
void main() {
document.addEventListener('DOMContentLoaded', (event) {
- String path = window.location.pathname;
- int offset = getOffset(window.location.href);
- int lineNumber = getLine(window.location.href);
+ var path = window.location.pathname;
+ var offset = getOffset(window.location.href);
+ var lineNumber = getLine(window.location.href);
loadNavigationTree();
if (path != '/' && path != rootPath) {
// TODO(srawlins): replaceState?
@@ -32,22 +32,42 @@
final applyMigrationButton = document.querySelector('.apply-migration');
applyMigrationButton.onClick.listen((event) {
- doPost('/apply-migration').then((xhr) {
- document.body.classes
- ..remove('proposed')
- ..add('applied');
- }).catchError((e, st) {
- logError('apply migration error: $e', st);
+ if (window.confirm(
+ "This will apply the changes you've previewed to your working "
+ 'directory. It is recommended you commit any changes you made before '
+ 'doing this.')) {
+ doPost('/apply-migration').then((xhr) {
+ document.body.classes
+ ..remove('proposed')
+ ..add('applied');
+ }).catchError((e, st) {
+ logError('apply migration error: $e', st);
- window.alert('Could not apply migration ($e).');
- });
+ window.alert('Could not apply migration ($e).');
+ });
+ }
+ });
+
+ final rerunMigrationButton = document.querySelector('.rerun-migration');
+ rerunMigrationButton.onClick.listen((event) async {
+ try {
+ document.body.classes..add('rerunning');
+ await doPost('/rerun-migration');
+ window.location.reload();
+ } catch (e, st) {
+ logError('rerun migration: $e', st);
+
+ window.alert('Failed to rerun migration: $e.');
+ } finally {
+ document.body.classes.remove('rerunning');
+ }
});
});
window.addEventListener('popstate', (event) {
- String path = window.location.pathname;
- int offset = getOffset(window.location.href);
- int lineNumber = getLine(window.location.href);
+ var path = window.location.pathname;
+ var offset = getOffset(window.location.href);
+ var lineNumber = getLine(window.location.href);
if (path.length > 1) {
loadFile(path, offset, lineNumber, false);
} else {
@@ -58,11 +78,31 @@
});
}
+/// Returns the "authToken" query parameter value of the current location.
+// TODO(srawlins): This feels a little fragile, as the user can accidentally
+// change/remove this text, and break their session. Normally auth tokens are
+// stored in cookies, but there is no authentication step during which the
+// server would attach such a token to cookies. We could do a little step where
+// the first request to the server with the token is considered
+// "authentication", and we subsequently store the token in cookies thereafter.
+final String authToken =
+ Uri.parse(window.location.href).queryParameters['authToken'];
+
+final Element editListElement =
+ document.querySelector('.edit-list .panel-content');
+
+final Element editPanel = document.querySelector('.edit-panel .panel-content');
+
+final Element footerPanel = document.querySelector('footer');
+
+final Element headerPanel = document.querySelector('header');
+
+final Element unitName = document.querySelector('#unit-name');
+
String get rootPath => querySelector('.root').text.trim();
void addArrowClickHandler(Element arrow) {
- Element childList =
- (arrow.parentNode as Element).querySelector(':scope > ul');
+ var childList = (arrow.parentNode as Element).querySelector(':scope > ul');
// Animating height from "auto" to "0" is not supported by CSS [1], so all we
// have are hacks. The `* 2` allows for events in which the list grows in
// height when resized, with additional text wrapping.
@@ -80,26 +120,27 @@
}
void addClickHandlers(String selector, bool clearEditDetails) {
- Element parentElement = document.querySelector(selector);
+ var parentElement = document.querySelector(selector);
// Add navigation handlers for navigation links in the source code.
List<Element> navLinks = parentElement.querySelectorAll('.nav-link');
navLinks.forEach((link) {
link.onClick.listen((event) {
- Element tableElement = document.querySelector('table[data-path]');
- String parentPath = tableElement.dataset['path'];
+ var tableElement = document.querySelector('table[data-path]');
+ var parentPath = tableElement.dataset['path'];
handleNavLinkClick(event, clearEditDetails, relativeTo: parentPath);
});
});
List<Element> regions = parentElement.querySelectorAll('.region');
if (regions.isNotEmpty) {
- Element table = parentElement.querySelector('table[data-path]');
- String path = table.dataset['path'];
+ var table = parentElement.querySelector('table[data-path]');
+ var path = table.dataset['path'];
regions.forEach((Element anchor) {
anchor.onClick.listen((event) {
- int offset = int.parse(anchor.dataset['offset']);
- loadAndPopulateEditDetails(path, offset);
+ var offset = int.parse(anchor.dataset['offset']);
+ var line = int.parse(anchor.dataset['line']);
+ loadAndPopulateEditDetails(path, offset, line);
});
});
}
@@ -110,8 +151,13 @@
});
}
+Future<HttpRequest> doGet(String path,
+ {Map<String, String> queryParameters = const {}}) =>
+ HttpRequest.request(pathWithQueryParameters(path, queryParameters),
+ requestHeaders: {'Content-Type': 'application/json; charset=UTF-8'});
+
Future<HttpRequest> doPost(String path) => HttpRequest.request(
- path,
+ pathWithQueryParameters(path, {}),
method: 'POST',
requestHeaders: {'Content-Type': 'application/json; charset=UTF-8'},
).then((HttpRequest xhr) {
@@ -124,12 +170,12 @@
});
int getLine(String location) {
- String str = Uri.parse(location).queryParameters['line'];
+ var str = Uri.parse(location).queryParameters['line'];
return str == null ? null : int.tryParse(str);
}
int getOffset(String location) {
- String str = Uri.parse(location).queryParameters['offset'];
+ var str = Uri.parse(location).queryParameters['offset'];
return str == null ? null : int.tryParse(str);
}
@@ -139,9 +185,10 @@
String relativeTo,
}) {
Element target = event.currentTarget;
+ event.preventDefault();
- String location = target.getAttribute('href');
- String path = location;
+ var location = target.getAttribute('href');
+ var path = location;
if (path.contains('?')) {
path = path.substring(0, path.indexOf('?'));
}
@@ -150,8 +197,8 @@
path = _p.normalize(_p.join(_p.dirname(relativeTo), path));
}
- int offset = getOffset(location);
- int lineNumber = getLine(location);
+ var offset = getOffset(location);
+ var lineNumber = getLine(location);
if (offset != null) {
navigate(path, offset, lineNumber, clearEditDetails, callback: () {
@@ -162,11 +209,10 @@
pushState(path, null, null);
});
}
- event.preventDefault();
}
void handlePostLinkClick(MouseEvent event) async {
- String path = (event.currentTarget as Element).getAttribute('href');
+ var path = (event.currentTarget as Element).getAttribute('href');
// Don't navigate on link click.
event.preventDefault();
@@ -193,16 +239,15 @@
});
}
-/// Load the explanation for [region], into the ".panel-content" div.
-void loadAndPopulateEditDetails(String path, int offset) {
+/// Loads the explanation for [region], into the ".panel-content" div.
+void loadAndPopulateEditDetails(String path, int offset, int line) {
// Request the region, then do work with the response.
- HttpRequest.request(
- '$path?region=region&offset=$offset',
- requestHeaders: {'Content-Type': 'application/json; charset=UTF-8'},
- ).then((HttpRequest xhr) {
+ doGet(path, queryParameters: {'region': 'region', 'offset': '$offset'})
+ .then((HttpRequest xhr) {
if (xhr.status == 200) {
var response = EditDetails.fromJson(jsonDecode(xhr.responseText));
populateEditDetails(response);
+ pushState(path, offset, line);
addClickHandlers('.edit-panel .panel-content', false);
} else {
window.alert('Request failed; status of ${xhr.status}');
@@ -235,16 +280,13 @@
}
// Navigating to another file; request it, then do work with the response.
- HttpRequest.request(
- path.contains('?') ? '$path&inline=true' : '$path?inline=true',
- requestHeaders: {'Content-Type': 'application/json; charset=UTF-8'},
- ).then((HttpRequest xhr) {
+ doGet(path, queryParameters: {'inline': 'true'}).then((HttpRequest xhr) {
if (xhr.status == 200) {
Map<String, dynamic> response = jsonDecode(xhr.responseText);
writeCodeAndRegions(
path, FileDetails.fromJson(response), clearEditDetails);
maybeScrollToAndHighlight(offset, line);
- String filePathPart =
+ var filePathPart =
path.contains('?') ? path.substring(0, path.indexOf('?')) : path;
updatePage(filePathPart, offset);
if (callback != null) {
@@ -262,13 +304,10 @@
/// Load the navigation tree into the ".nav-tree" div.
void loadNavigationTree() {
- String path = '/_preview/navigationTree.json';
+ var path = '/_preview/navigationTree.json';
// Request the navigation tree, then do work with the response.
- HttpRequest.request(
- path,
- requestHeaders: {'Content-Type': 'application/json; charset=UTF-8'},
- ).then((HttpRequest xhr) {
+ doGet(path).then((HttpRequest xhr) {
if (xhr.status == 200) {
dynamic response = jsonDecode(xhr.responseText);
var navTree = document.querySelector('.nav-tree');
@@ -290,12 +329,9 @@
window.console.error('$st');
}
-final Element headerPanel = document.querySelector('header');
-final Element footerPanel = document.querySelector('footer');
-
/// Scroll an element into view if it is not visible.
void maybeScrollIntoView(Element element) {
- Rectangle rect = element.getBoundingClientRect();
+ var rect = element.getBoundingClientRect();
// A line of text in the code view is 14px high. Including it here means we
// only choose to _not_ scroll a line of code into view if the entire line is
// visible.
@@ -353,8 +389,8 @@
bool clearEditDetails, {
VoidCallback callback,
}) {
- int currentOffset = getOffset(window.location.href);
- int currentLineNumber = getLine(window.location.href);
+ var currentOffset = getOffset(window.location.href);
+ var currentLineNumber = getLine(window.location.href);
removeHighlight(currentOffset, currentLineNumber);
if (path == window.location.pathname) {
// Navigating to same file; just scroll into view.
@@ -367,12 +403,26 @@
}
}
+/// Returns [path], which may include query parameters, with a new path which
+/// adds (or replaces) parameters from [queryParameters].
+///
+/// Additionally, the "authToken" parameter will be added with the authToken
+/// found in the current location.
+String pathWithQueryParameters(
+ String path, Map<String, String> queryParameters) {
+ var uri = Uri.parse(path);
+ var mergedQueryParameters = {
+ ...uri.queryParameters,
+ ...queryParameters,
+ 'authToken': authToken
+ };
+ return uri.replace(queryParameters: mergedQueryParameters).toString();
+}
+
String pluralize(int count, String single, {String multiple}) {
return count == 1 ? single : (multiple ?? '${single}s');
}
-final Element editPanel = document.querySelector('.edit-panel .panel-content');
-
void populateEditDetails([EditDetails response]) {
// Clear out any current edit details.
editPanel.innerHtml = '';
@@ -384,13 +434,13 @@
return;
}
- String filePath = response.path;
- String parentDirectory = _p.dirname(filePath);
+ var filePath = response.path;
+ var parentDirectory = _p.dirname(filePath);
// 'Changed ... at foo.dart:12.'
- String explanationMessage = response.explanation;
- String relPath = _p.relative(filePath, from: rootPath);
- int line = response.line;
+ var explanationMessage = response.explanation;
+ var relPath = _p.relative(filePath, from: rootPath);
+ var line = response.line;
Element explanation = editPanel.append(document.createElement('p'));
explanation.append(Text('$explanationMessage at $relPath:$line.'));
explanation.scrollIntoView();
@@ -399,16 +449,13 @@
_populateEditRationale(response, editPanel, parentDirectory);
}
-final Element editListElement =
- document.querySelector('.edit-list .panel-content');
-
/// Write the contents of the Edit List, from JSON data [editListData].
void populateProposedEdits(
String path, List<EditListItem> edits, bool clearEditDetails) {
editListElement.innerHtml = '';
Element p = editListElement.append(document.createElement('p'));
- int editCount = edits.length;
+ var editCount = edits.length;
if (editCount == 0) {
p.append(Text('No proposed edits'));
} else {
@@ -421,16 +468,16 @@
item.classes.add('edit');
AnchorElement anchor = item.append(document.createElement('a'));
anchor.classes.add('edit-link');
- int offset = edit.offset;
+ var offset = edit.offset;
anchor.dataset['offset'] = '$offset';
- int line = edit.line;
+ var line = edit.line;
anchor.dataset['line'] = '$line';
anchor.append(Text('line $line'));
anchor.onClick.listen((MouseEvent event) {
navigate(window.location.pathname, offset, line, true, callback: () {
pushState(window.location.pathname, offset, line);
});
- loadAndPopulateEditDetails(path, offset);
+ loadAndPopulateEditDetails(path, offset, line);
});
item.append(Text(': ${edit.explanation}'));
}
@@ -441,13 +488,15 @@
}
void pushState(String path, int offset, int line) {
- Uri uri = Uri.parse('${window.location.origin}$path');
+ var uri = Uri.parse('${window.location.origin}$path');
- Map<String, dynamic> params = {};
- if (offset != null) params['offset'] = '$offset';
- if (line != null) params['line'] = '$line';
+ var params = {
+ if (offset != null) 'offset': '$offset',
+ if (line != null) 'line': '$line',
+ 'authToken': authToken,
+ };
- uri = uri.replace(queryParameters: params.isEmpty ? null : params);
+ uri = uri.replace(queryParameters: params);
window.history.pushState({}, '', uri.toString());
}
@@ -478,8 +527,6 @@
}
}
-final Element unitName = document.querySelector('#unit-name');
-
/// Update the heading and navigation links.
///
/// Call this after updating page content on a navigation.
@@ -500,8 +547,8 @@
/// Load data from [data] into the .code and the .regions divs.
void writeCodeAndRegions(String path, FileDetails data, bool clearEditDetails) {
- Element regionsElement = document.querySelector('.regions');
- Element codeElement = document.querySelector('.code');
+ var regionsElement = document.querySelector('.regions');
+ var codeElement = document.querySelector('.code');
_PermissiveNodeValidator.setInnerHtml(regionsElement, data.regions);
_PermissiveNodeValidator.setInnerHtml(codeElement, data.navigationContent);
@@ -535,7 +582,7 @@
a.setAttribute('href', entity.href);
a.append(Text(entity.name));
a.onClick.listen((MouseEvent event) => handleNavLinkClick(event, true));
- int editCount = entity.editCount;
+ var editCount = entity.editCount;
if (editCount > 0) {
Element editsBadge = li.append(document.createElement('span'));
editsBadge.classes.add('edit-count');
@@ -548,12 +595,12 @@
}
AnchorElement _aElementForLink(TargetLink link, String parentDirectory) {
- int targetLine = link.line;
+ var targetLine = link.line;
AnchorElement a = document.createElement('a');
a.append(Text('${link.path}:$targetLine'));
- String relLink = link.href;
- String fullPath = _p.normalize(_p.join(parentDirectory, relLink));
+ var relLink = link.href;
+ var fullPath = _p.normalize(_p.join(parentDirectory, relLink));
a.setAttribute('href', fullPath);
a.classes.add('nav-link');
@@ -574,7 +621,7 @@
void _populateEditRationale(
EditDetails response, Element editPanel, String parentDirectory) {
- int detailCount = response.details.length;
+ var detailCount = response.details.length;
if (detailCount == 0) {
// Having 0 details is not necessarily an expected possibility, but handling
// the possibility prevents awkward text, "for 0 reasons:".
diff --git a/pkg/analysis_server/lib/src/edit/preview/dart_file_page.dart b/pkg/analysis_server/lib/src/edit/preview/dart_file_page.dart
index bc67bd5..7f7da1f 100644
--- a/pkg/analysis_server/lib/src/edit/preview/dart_file_page.dart
+++ b/pkg/analysis_server/lib/src/edit/preview/dart_file_page.dart
@@ -22,14 +22,16 @@
: super(site, unitInfo.path.substring(1));
@override
+ bool get requiresAuth => true;
+
+ @override
void generateBody(Map<String, String> params) {
throw UnsupportedError('generateBody');
}
@override
Future<void> generatePage(Map<String, String> params) async {
- UnitRenderer renderer =
- UnitRenderer(unitInfo, site.migrationInfo, site.pathMapper);
+ var renderer = UnitRenderer(unitInfo, site.migrationInfo, site.pathMapper);
buf.write(jsonEncode(renderer.render().toJson()));
}
}
diff --git a/pkg/analysis_server/lib/src/edit/preview/exception_page.dart b/pkg/analysis_server/lib/src/edit/preview/exception_page.dart
index 1a03854..bb18409 100644
--- a/pkg/analysis_server/lib/src/edit/preview/exception_page.dart
+++ b/pkg/analysis_server/lib/src/edit/preview/exception_page.dart
@@ -22,6 +22,9 @@
: super(site, path.substring(1));
@override
+ bool get requiresAuth => false;
+
+ @override
void generateBody(Map<String, String> params) {
buf.write('''
<h1>500 Exception in preview</h1>
diff --git a/pkg/analysis_server/lib/src/edit/preview/highlight_css_page.dart b/pkg/analysis_server/lib/src/edit/preview/highlight_css_page.dart
index 775b40b..0104a69 100644
--- a/pkg/analysis_server/lib/src/edit/preview/highlight_css_page.dart
+++ b/pkg/analysis_server/lib/src/edit/preview/highlight_css_page.dart
@@ -17,6 +17,9 @@
: super(site, PreviewSite.highlightCssPath.substring(1));
@override
+ bool get requiresAuth => false;
+
+ @override
void generateBody(Map<String, String> params) {
throw UnimplementedError();
}
diff --git a/pkg/analysis_server/lib/src/edit/preview/highlight_js_page.dart b/pkg/analysis_server/lib/src/edit/preview/highlight_js_page.dart
index 49646da..6fb15b0 100644
--- a/pkg/analysis_server/lib/src/edit/preview/highlight_js_page.dart
+++ b/pkg/analysis_server/lib/src/edit/preview/highlight_js_page.dart
@@ -17,6 +17,9 @@
: super(site, PreviewSite.highlightJsPath.substring(1));
@override
+ bool get requiresAuth => false;
+
+ @override
void generateBody(Map<String, String> params) {
throw UnimplementedError();
}
diff --git a/pkg/analysis_server/lib/src/edit/preview/http_preview_server.dart b/pkg/analysis_server/lib/src/edit/preview/http_preview_server.dart
index a554c67..caf4d48 100644
--- a/pkg/analysis_server/lib/src/edit/preview/http_preview_server.dart
+++ b/pkg/analysis_server/lib/src/edit/preview/http_preview_server.dart
@@ -33,11 +33,17 @@
Future<HttpServer> _serverFuture;
// A function which allows the migration to be rerun, taking changed paths.
- final Future<MigrationState> Function(List<String>) rerunFunction;
+ final Future<MigrationState> Function([List<String>]) rerunFunction;
/// Initialize a newly created HTTP server.
HttpPreviewServer(this.migrationState, this.rerunFunction);
+ Future<String> get authToken async {
+ await _serverFuture;
+ previewSite ??= PreviewSite(migrationState, rerunFunction);
+ return previewSite.serviceAuthToken;
+ }
+
/// Return the port this server is bound to.
Future<int> get boundPort async {
return (await _serverFuture)?.port;
@@ -59,7 +65,7 @@
_serverFuture =
HttpServer.bind(InternetAddress.loopbackIPv4, initialPort ?? 0);
- HttpServer server = await _serverFuture;
+ var server = await _serverFuture;
_handleServer(server);
return server.port;
} catch (ignore) {
@@ -86,7 +92,7 @@
/// Attach a listener to a newly created HTTP server.
void _handleServer(HttpServer httpServer) {
httpServer.listen((HttpRequest request) async {
- List<String> updateValues = request.headers[HttpHeaders.upgradeHeader];
+ var updateValues = request.headers[HttpHeaders.upgradeHeader];
if (request.method == 'GET') {
await _handleGetRequest(request);
} else if (request.method == 'POST') {
@@ -94,7 +100,7 @@
} else if (updateValues != null && updateValues.contains('websocket')) {
// We do not support serving analysis server communications over
// WebSocket connections.
- HttpResponse response = request.response;
+ var response = request.response;
response.statusCode = HttpStatus.notFound;
response.headers.contentType = ContentType.text;
response.write(
@@ -109,7 +115,7 @@
/// Return an error in response to an unrecognized request received by the HTTP
/// server.
void _returnUnknownRequest(HttpRequest request) {
- HttpResponse response = request.response;
+ var response = request.response;
response.statusCode = HttpStatus.notFound;
response.headers.contentType = ContentType.text;
response.write('Not found');
diff --git a/pkg/analysis_server/lib/src/edit/preview/index_file_page.dart b/pkg/analysis_server/lib/src/edit/preview/index_file_page.dart
index e0996d3..d3e5fa5 100644
--- a/pkg/analysis_server/lib/src/edit/preview/index_file_page.dart
+++ b/pkg/analysis_server/lib/src/edit/preview/index_file_page.dart
@@ -13,15 +13,16 @@
: super(site, site.migrationInfo.includedRoot);
@override
+ bool get requiresAuth => true;
+
+ @override
void generateBody(Map<String, String> params) {
throw UnsupportedError('generateBody');
}
@override
Future<void> generatePage(Map<String, String> params) async {
- InstrumentationRenderer renderer = InstrumentationRenderer(
- site.migrationInfo,
- site.pathMapper,
+ var renderer = InstrumentationRenderer(site.migrationInfo, site.pathMapper,
site.migrationState.hasBeenApplied);
buf.write(renderer.render());
}
diff --git a/pkg/analysis_server/lib/src/edit/preview/navigation_tree_page.dart b/pkg/analysis_server/lib/src/edit/preview/navigation_tree_page.dart
index 9cfc42e..415d6f6 100644
--- a/pkg/analysis_server/lib/src/edit/preview/navigation_tree_page.dart
+++ b/pkg/analysis_server/lib/src/edit/preview/navigation_tree_page.dart
@@ -16,6 +16,9 @@
: super(site, site.migrationInfo.includedRoot);
@override
+ bool get requiresAuth => true;
+
+ @override
// TODO(srawlins): Refactor JSON-returning pages like this to not inherit all
// of the HTML logic from [PreviewPage].
void generateBody(Map<String, String> params) {
diff --git a/pkg/analysis_server/lib/src/edit/preview/not_found_page.dart b/pkg/analysis_server/lib/src/edit/preview/not_found_page.dart
index bafcbe7..5865b5f 100644
--- a/pkg/analysis_server/lib/src/edit/preview/not_found_page.dart
+++ b/pkg/analysis_server/lib/src/edit/preview/not_found_page.dart
@@ -13,6 +13,9 @@
NotFoundPage(PreviewSite site, String id) : super(site, id);
@override
+ bool get requiresAuth => false;
+
+ @override
void generateBody(Map<String, String> params) {
buf.write('''
<h1>404 Not found</h1>
diff --git a/pkg/analysis_server/lib/src/edit/preview/preview_page.dart b/pkg/analysis_server/lib/src/edit/preview/preview_page.dart
index f927d6a..b82a4ef 100644
--- a/pkg/analysis_server/lib/src/edit/preview/preview_page.dart
+++ b/pkg/analysis_server/lib/src/edit/preview/preview_page.dart
@@ -16,6 +16,9 @@
/// portion of the path to the page that follows the initial slash ('/').
PreviewPage(this.site, String id) : super(id, '', description: '');
+ /// Whether pages of this type require authorization.
+ bool get requiresAuth;
+
/// Generate the content of the body tag.
void generateBody(Map<String, String> params);
diff --git a/pkg/analysis_server/lib/src/edit/preview/preview_site.dart b/pkg/analysis_server/lib/src/edit/preview/preview_site.dart
index 60efa22..cdbb8fb 100644
--- a/pkg/analysis_server/lib/src/edit/preview/preview_site.dart
+++ b/pkg/analysis_server/lib/src/edit/preview/preview_site.dart
@@ -3,7 +3,10 @@
// BSD-style license that can be found in the LICENSE file.
import 'dart:async';
+import 'dart:convert';
import 'dart:io';
+import 'dart:math';
+import 'dart:typed_data';
import 'package:analysis_server/src/edit/nnbd_migration/migration_info.dart';
import 'package:analysis_server/src/edit/nnbd_migration/migration_state.dart';
@@ -16,10 +19,22 @@
import 'package:analysis_server/src/edit/preview/index_file_page.dart';
import 'package:analysis_server/src/edit/preview/navigation_tree_page.dart';
import 'package:analysis_server/src/edit/preview/not_found_page.dart';
+import 'package:analysis_server/src/edit/preview/preview_page.dart';
import 'package:analysis_server/src/edit/preview/region_page.dart';
+import 'package:analysis_server/src/edit/preview/unauthorized_page.dart';
import 'package:analysis_server/src/protocol_server.dart';
import 'package:analysis_server/src/status/pages.dart';
-import 'package:analyzer/file_system/file_system.dart';
+
+// The randomly generated auth token used to access the preview site.
+String _makeAuthToken() {
+ final kTokenByteSize = 8;
+ var bytes = Uint8List(kTokenByteSize);
+ var random = Random.secure();
+ for (var i = 0; i < kTokenByteSize; i++) {
+ bytes[i] = random.nextInt(256);
+ }
+ return base64Url.encode(bytes);
+}
/// The site used to serve pages for the preview tool.
class PreviewSite extends Site
@@ -35,6 +50,8 @@
static const applyMigrationPath = '/apply-migration';
+ static const rerunMigrationPath = '/rerun-migration';
+
/// The state of the migration being previewed.
MigrationState migrationState;
@@ -43,7 +60,9 @@
final Map<String, UnitInfo> unitInfoMap = {};
// A function provided by DartFix to rerun the migration.
- final Future<MigrationState> Function(List<String>) rerunFunction;
+ final Future<MigrationState> Function([List<String>]) rerunFunction;
+
+ final String serviceAuthToken = _makeAuthToken();
/// Initialize a newly created site to serve a preview of the results of an
/// NNBD migration.
@@ -75,6 +94,10 @@
return ExceptionPage(this, path, message, stackTrace);
}
+ Page createUnauthorizedPage(String unauthorizedPath) {
+ return UnauthorizedPage(this, unauthorizedPath.substring(1));
+ }
+
@override
Page createUnknownPage(String unknownPath) {
return NotFoundPage(this, unknownPath.substring(1));
@@ -82,8 +105,8 @@
@override
Future<void> handleGetRequest(HttpRequest request) async {
- Uri uri = request.uri;
- String path = uri.path;
+ var uri = request.uri;
+ var path = uri.path;
try {
if (path == highlightCssPath) {
// Note: `return await` needed due to
@@ -105,16 +128,18 @@
return await respond(request, IndexFilePage(this));
}
- UnitInfo unitInfo = unitInfoMap[path];
+ var unitInfo = unitInfoMap[path];
if (unitInfo != null) {
if (uri.queryParameters.containsKey('inline')) {
- // TODO(devoncarew): Ensure that we don't serve content outside of our project.
+ // TODO(devoncarew): Ensure that we don't serve content outside of our
+ // project.
// Note: `return await` needed due to
// https://github.com/dart-lang/sdk/issues/39204
return await respond(request, DartFilePage(this, unitInfo));
} else if (uri.queryParameters.containsKey('region')) {
- // TODO(devoncarew): Ensure that we don't serve content outside of our project.
+ // TODO(devoncarew): Ensure that we don't serve content outside of our
+ // project.
// Note: `return await` needed due to
// https://github.com/dart-lang/sdk/issues/39204
@@ -136,14 +161,23 @@
@override
Future<void> handlePostRequest(HttpRequest request) async {
- Uri uri = request.uri;
- String path = uri.path;
+ var uri = request.uri;
+ var path = uri.path;
try {
+ // All POST requests must be authorized.
+ if (!_isAuthorized(request)) {
+ return _respondUnauthorized(request);
+ }
if (path == applyMigrationPath) {
performApply();
respondOk(request);
return;
+ } else if (path == rerunMigrationPath) {
+ await rerunMigration();
+
+ respondOk(request);
+ return;
} else if (uri.queryParameters.containsKey('replacement')) {
await performEdit(uri);
@@ -167,7 +201,7 @@
migrationState.markApplied();
for (final fileEdit in edits) {
final file = pathMapper.provider.getFile(fileEdit.file);
- String code = file.exists ? file.readAsStringSync() : '';
+ var code = file.exists ? file.readAsStringSync() : '';
code = SourceEdit.applySequence(code, fileEdit.edits);
file.writeAsStringSync(code);
}
@@ -178,31 +212,31 @@
//
// Update the code on disk.
//
- Map<String, String> params = uri.queryParameters;
- String path = uri.path;
- int offset = int.parse(params['offset']);
- int end = int.parse(params['end']);
- String replacement = params['replacement'];
- File file = pathMapper.provider.getFile(path);
- String oldContent = file.readAsStringSync();
- String newContent = oldContent.replaceRange(offset, end, replacement);
+ var params = uri.queryParameters;
+ var path = uri.path;
+ var offset = int.parse(params['offset']);
+ var end = int.parse(params['end']);
+ var replacement = params['replacement'];
+ var file = pathMapper.provider.getFile(path);
+ var oldContent = file.readAsStringSync();
+ var newContent = oldContent.replaceRange(offset, end, replacement);
file.writeAsStringSync(newContent);
await rerunMigration([path]);
}
- Future<void> rerunMigration(List<String> changedPaths) async {
+ Future<void> rerunMigration([List<String> changedPaths]) async {
migrationState = await rerunFunction(changedPaths);
reset();
}
void reset() {
unitInfoMap.clear();
- Set<UnitInfo> unitInfos = migrationInfo.units;
- ResourceProvider provider = pathMapper.provider;
- for (UnitInfo unit in unitInfos) {
+ var unitInfos = migrationInfo.units;
+ var provider = pathMapper.provider;
+ for (var unit in unitInfos) {
unitInfoMap[unit.path] = unit;
}
- for (UnitInfo unit in migrationInfo.unitMap.values) {
+ for (var unit in migrationInfo.unitMap.values) {
if (!unitInfos.contains(unit)) {
if (unit.content == null) {
try {
@@ -220,7 +254,12 @@
@override
Future<void> respond(HttpRequest request, Page page,
[int code = HttpStatus.ok]) async {
- HttpResponse response = request.response;
+ if (page is PreviewPage && page.requiresAuth) {
+ if (!_isAuthorized(request)) {
+ return _respondUnauthorized(request);
+ }
+ }
+ var response = request.response;
response.statusCode = code;
if (page is HighlightCssPage) {
response.headers.contentType =
@@ -235,6 +274,12 @@
response.close();
}
+ /// Returns whether [request] is an authorized request.
+ bool _isAuthorized(HttpRequest request) {
+ var authToken = request.uri.queryParameters['authToken'];
+ return authToken == serviceAuthToken;
+ }
+
Future<void> _respondInternalError(HttpRequest request, String path,
dynamic exception, StackTrace stackTrace) async {
try {
@@ -243,11 +288,22 @@
createExceptionPageWithPath(path, '$exception', stackTrace),
HttpStatus.internalServerError);
} catch (exception, stackTrace) {
- HttpResponse response = request.response;
+ var response = request.response;
response.statusCode = HttpStatus.internalServerError;
response.headers.contentType = ContentType.text;
response.write('$exception\n\n$stackTrace');
response.close();
}
}
+
+ /// Responds with a 401 Unauthorized response.
+ Future<void> _respondUnauthorized(HttpRequest request) async {
+ var page = createUnauthorizedPage(request.uri.path);
+ var response = request.response;
+ response
+ ..statusCode = HttpStatus.unauthorized
+ ..headers.contentType = ContentType.html
+ ..write(await page.generate(request.uri.queryParameters))
+ ..close();
+ }
}
diff --git a/pkg/analysis_server/lib/src/edit/preview/region_page.dart b/pkg/analysis_server/lib/src/edit/preview/region_page.dart
index 7e97997..89b67f0 100644
--- a/pkg/analysis_server/lib/src/edit/preview/region_page.dart
+++ b/pkg/analysis_server/lib/src/edit/preview/region_page.dart
@@ -20,6 +20,9 @@
: super(site, unitInfo.path.substring(1));
@override
+ bool get requiresAuth => true;
+
+ @override
void generateBody(Map<String, String> params) {
throw UnsupportedError('generateBody');
}
diff --git a/pkg/analysis_server/lib/src/edit/preview/unauthorized_page.dart b/pkg/analysis_server/lib/src/edit/preview/unauthorized_page.dart
new file mode 100644
index 0000000..e93f426
--- /dev/null
+++ b/pkg/analysis_server/lib/src/edit/preview/unauthorized_page.dart
@@ -0,0 +1,27 @@
+// Copyright (c) 2020, 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.
+
+import 'package:analysis_server/src/edit/preview/preview_page.dart';
+import 'package:analysis_server/src/edit/preview/preview_site.dart';
+
+/// The page that is displayed when a request could not be authenticated.
+class UnauthorizedPage extends PreviewPage {
+ /// Initialize a newly created unauthorized page within the given [site].
+ /// The [id] is the portion of the path to the page that follows the initial
+ /// slash ('/').
+ UnauthorizedPage(PreviewSite site, String id) : super(site, id);
+
+ @override
+ bool get requiresAuth => false;
+
+ @override
+ void generateBody(Map<String, String> params) {
+ buf.write('''
+<h1>401 Unauthorized</h1>
+<p>
+Request for '$path' is unauthorized.
+</p>
+''');
+ }
+}
diff --git a/pkg/analysis_server/lib/src/flutter/flutter_domain.dart b/pkg/analysis_server/lib/src/flutter/flutter_domain.dart
index 7686e8f..1a5f819 100644
--- a/pkg/analysis_server/lib/src/flutter/flutter_domain.dart
+++ b/pkg/analysis_server/lib/src/flutter/flutter_domain.dart
@@ -72,7 +72,7 @@
@override
Response handleRequest(Request request) {
try {
- String requestName = request.method;
+ var requestName = request.method;
if (requestName == FLUTTER_REQUEST_GET_WIDGET_DESCRIPTION) {
getWidgetDescription(request);
return Response.DELAYED_RESPONSE;
@@ -118,8 +118,11 @@
/// Implement the 'flutter.setSubscriptions' request.
Response setSubscriptions(Request request) {
var params = FlutterSetSubscriptionsParams.fromRequest(request);
- Map<FlutterService, Set<String>> subMap = mapMap(params.subscriptions,
- valueCallback: (List<String> subscriptions) => subscriptions.toSet());
+ var subMap =
+ mapMap<FlutterService, List<String>, FlutterService, Set<String>>(
+ params.subscriptions,
+ valueCallback: (List<String> subscriptions) =>
+ subscriptions.toSet());
server.setFlutterSubscriptions(subMap);
return FlutterSetSubscriptionsResult().toResponse(request.id);
}
diff --git a/pkg/analysis_server/lib/src/flutter/flutter_notifications.dart b/pkg/analysis_server/lib/src/flutter/flutter_notifications.dart
index 5f21fa8..9e31bd0 100644
--- a/pkg/analysis_server/lib/src/flutter/flutter_notifications.dart
+++ b/pkg/analysis_server/lib/src/flutter/flutter_notifications.dart
@@ -13,7 +13,7 @@
AnalysisServer server, ResolvedUnitResult resolvedUnit) {
_sendNotification(server, () {
var computer = FlutterOutlineComputer(resolvedUnit);
- protocol.FlutterOutline outline = computer.compute();
+ var outline = computer.compute();
// send notification
var params = protocol.FlutterOutlineParams(
resolvedUnit.path,
diff --git a/pkg/analysis_server/lib/src/flutter/flutter_outline_computer.dart b/pkg/analysis_server/lib/src/flutter/flutter_outline_computer.dart
index 18b772d..9e9990d 100644
--- a/pkg/analysis_server/lib/src/flutter/flutter_outline_computer.dart
+++ b/pkg/analysis_server/lib/src/flutter/flutter_outline_computer.dart
@@ -9,7 +9,6 @@
import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/ast/visitor.dart';
import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/dart/element/type.dart';
/// Computer for Flutter specific outlines.
class FlutterOutlineComputer {
@@ -21,7 +20,7 @@
FlutterOutlineComputer(this.resolvedUnit);
protocol.FlutterOutline compute() {
- protocol.Outline dartOutline = DartUnitOutlineComputer(
+ var dartOutline = DartUnitOutlineComputer(
resolvedUnit,
withBasicFlutter: false,
).compute();
@@ -67,7 +66,7 @@
var valueLocation = protocol.newLocation_fromNode(argument);
- String name = parameter.displayName;
+ var name = parameter.displayName;
var label = resolvedUnit.content.substring(argument.offset, argument.end);
if (label.contains('\n')) {
@@ -85,7 +84,7 @@
literalValueString = argument.stringValue;
} else {
if (argument is FunctionExpression) {
- bool hasParameters = argument.parameters != null &&
+ var hasParameters = argument.parameters != null &&
argument.parameters.parameters.isNotEmpty;
if (argument.body is ExpressionFunctionBody) {
label = hasParameters ? '(…) => …' : '() => …';
@@ -111,7 +110,7 @@
}
protocol.FlutterOutline _convert(protocol.Outline dartOutline) {
- protocol.FlutterOutline flutterOutline = protocol.FlutterOutline(
+ var flutterOutline = protocol.FlutterOutline(
protocol.FlutterOutlineKind.DART_ELEMENT,
dartOutline.offset,
dartOutline.length,
@@ -131,18 +130,18 @@
/// is a Flutter Widget class subtype, and [withGeneric] is `true`, return
/// a widget reference outline item.
protocol.FlutterOutline _createOutline(Expression node, bool withGeneric) {
- DartType type = node.staticType;
+ var type = node.staticType;
if (!flutter.isWidgetType(type)) {
return null;
}
- String className = type.element.displayName;
+ var className = type.element.displayName;
if (node is InstanceCreationExpression) {
var attributes = <protocol.FlutterOutlineAttribute>[];
var children = <protocol.FlutterOutline>[];
for (var argument in node.argumentList.arguments) {
- bool isWidgetArgument = flutter.isWidgetType(argument.staticType);
- bool isWidgetListArgument =
+ var isWidgetArgument = flutter.isWidgetType(argument.staticType);
+ var isWidgetListArgument =
flutter.isListOfWidgetsType(argument.staticType);
String parentAssociationLabel;
@@ -191,7 +190,7 @@
if (visitor.outlines.isNotEmpty) {
children.addAll(visitor.outlines);
} else {
- ParameterElement parameter = argument.staticParameterElement;
+ var parameter = argument.staticParameterElement;
_addAttribute(attributes, argument, parameter);
}
}
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/commands/simple_edit_handler.dart b/pkg/analysis_server/lib/src/lsp/handlers/commands/simple_edit_handler.dart
index 8bd5851..a5a96b2 100644
--- a/pkg/analysis_server/lib/src/lsp/handlers/commands/simple_edit_handler.dart
+++ b/pkg/analysis_server/lib/src/lsp/handlers/commands/simple_edit_handler.dart
@@ -23,6 +23,12 @@
String get commandName;
+ bool hasScanParseErrors(List<engine.AnalysisError> errors) {
+ return errors.any((error) =>
+ error.errorCode is engine.ScannerErrorCode ||
+ error.errorCode is engine.ParserErrorCode);
+ }
+
Future<ErrorOr<void>> sendSourceEditsToClient(
VersionedTextDocumentIdentifier docIdentifier,
CompilationUnit unit,
@@ -74,10 +80,4 @@
);
}
}
-
- bool hasScanParseErrors(List<engine.AnalysisError> errors) {
- return errors.any((error) =>
- error.errorCode is engine.ScannerErrorCode ||
- error.errorCode is engine.ParserErrorCode);
- }
}
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_code_actions.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_code_actions.dart
index 004e3e8..4b12674 100644
--- a/pkg/analysis_server/lib/src/lsp/handlers/handler_code_actions.dart
+++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_code_actions.dart
@@ -194,7 +194,7 @@
try {
for (final error in unit.errors) {
// Server lineNumber is one-based so subtract one.
- int errorLine = lineInfo.getLocation(error.offset).lineNumber - 1;
+ var errorLine = lineInfo.getLocation(error.offset).lineNumber - 1;
if (errorLine >= range.start.line && errorLine <= range.end.line) {
var workspace = DartChangeWorkspace(server.currentSessions);
var context = DartFixContextImpl(workspace, unit, error, (name) {
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_completion.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_completion.dart
index 3d322aa..bee5664 100644
--- a/pkg/analysis_server/lib/src/lsp/handlers/handler_completion.dart
+++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_completion.dart
@@ -171,7 +171,7 @@
.toList();
// Now compute items in suggestion sets.
- List<IncludedSuggestionSet> includedSuggestionSets = [];
+ var includedSuggestionSets = <IncludedSuggestionSet>[];
if (includedElementKinds != null && unit != null) {
computeIncludedSetList(
server.declarationsTracker,
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_definition.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_definition.dart
index 53a3e6e..dfa4dba 100644
--- a/pkg/analysis_server/lib/src/lsp/handlers/handler_definition.dart
+++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_definition.dart
@@ -36,7 +36,7 @@
final offset = await unit.mapResult((unit) => toOffset(unit.lineInfo, pos));
return offset.mapResult((offset) {
- NavigationCollectorImpl collector = NavigationCollectorImpl();
+ var collector = NavigationCollectorImpl();
computeDartNavigation(
server.resourceProvider, collector, unit.result.unit, offset, 0);
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_initialized.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_initialized.dart
index d512f55..854eaf5 100644
--- a/pkg/analysis_server/lib/src/lsp/handlers/handler_initialized.dart
+++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_initialized.dart
@@ -55,7 +55,7 @@
// requirements too. For example, the Angular plugin might wish to add HTML
// `DocumentFilter('html', 'file', null)` to many of these requests.
- int _lastRegistrationId = 1;
+ var _lastRegistrationId = 1;
final registrations = <Registration>[];
/// Helper for creating registrations with IDs.
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_references.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_references.dart
index d929594..be37eac 100644
--- a/pkg/analysis_server/lib/src/lsp/handlers/handler_references.dart
+++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_references.dart
@@ -56,7 +56,7 @@
Future<ErrorOr<List<Location>>> _getRefererences(String path, int offset,
ReferenceParams params, ResolvedUnitResult unit) async {
- Element element = await server.getElementAtOffset(path, offset);
+ var element = await server.getElementAtOffset(path, offset);
if (element is ImportElement) {
element = (element as ImportElement).prefix;
}
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_states.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_states.dart
index 6b77e9a..c50aff7 100644
--- a/pkg/analysis_server/lib/src/lsp/handlers/handler_states.dart
+++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_states.dart
@@ -9,6 +9,7 @@
import 'package:analysis_server/src/lsp/constants.dart';
import 'package:analysis_server/src/lsp/handlers/custom/handler_diagnostic_server.dart';
import 'package:analysis_server/src/lsp/handlers/custom/handler_super.dart';
+import 'package:analysis_server/src/lsp/handlers/handler_change_workspace_folders.dart';
import 'package:analysis_server/src/lsp/handlers/handler_code_actions.dart';
import 'package:analysis_server/src/lsp/handlers/handler_completion.dart';
import 'package:analysis_server/src/lsp/handlers/handler_completion_resolve.dart';
@@ -29,7 +30,6 @@
import 'package:analysis_server/src/lsp/handlers/handler_shutdown.dart';
import 'package:analysis_server/src/lsp/handlers/handler_signature_help.dart';
import 'package:analysis_server/src/lsp/handlers/handler_text_document_changes.dart';
-import 'package:analysis_server/src/lsp/handlers/handler_change_workspace_folders.dart';
import 'package:analysis_server/src/lsp/handlers/handler_workspace_symbols.dart';
import 'package:analysis_server/src/lsp/handlers/handlers.dart';
import 'package:analysis_server/src/lsp/lsp_analysis_server.dart';
@@ -133,6 +133,24 @@
}
}
+class ShuttingDownStateMessageHandler extends ServerStateMessageHandler {
+ ShuttingDownStateMessageHandler(LspAnalysisServer server) : super(server) {
+ registerHandler(ExitMessageHandler(server, clientDidCallShutdown: true));
+ }
+
+ @override
+ FutureOr<ErrorOr<Object>> handleUnknownMessage(IncomingMessage message) {
+ // Silently drop non-requests.
+ if (message is! RequestMessage) {
+ server.instrumentationService
+ .logInfo('Ignoring ${message.method} message while shutting down');
+ return success();
+ }
+ return error(ErrorCodes.InvalidRequest,
+ 'Unable to handle ${message.method} after shutdown request');
+ }
+}
+
class UninitializedStateMessageHandler extends ServerStateMessageHandler {
UninitializedStateMessageHandler(LspAnalysisServer server) : super(server) {
registerHandler(ShutdownMessageHandler(server));
@@ -152,21 +170,3 @@
'Unable to handle ${message.method} before client has sent initialize request');
}
}
-
-class ShuttingDownStateMessageHandler extends ServerStateMessageHandler {
- ShuttingDownStateMessageHandler(LspAnalysisServer server) : super(server) {
- registerHandler(ExitMessageHandler(server, clientDidCallShutdown: true));
- }
-
- @override
- FutureOr<ErrorOr<Object>> handleUnknownMessage(IncomingMessage message) {
- // Silently drop non-requests.
- if (message is! RequestMessage) {
- server.instrumentationService
- .logInfo('Ignoring ${message.method} message while shutting down');
- return success();
- }
- return error(ErrorCodes.InvalidRequest,
- 'Unable to handle ${message.method} after shutdown request');
- }
-}
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_text_document_changes.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_text_document_changes.dart
index eb10f75..d23bc22 100644
--- a/pkg/analysis_server/lib/src/lsp/handlers/handler_text_document_changes.dart
+++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_text_document_changes.dart
@@ -14,6 +14,25 @@
import 'package:analyzer/file_system/file_system.dart';
import 'package:path/path.dart' show dirname, join;
+/// Finds the nearest ancestor to [filePath] that contains a pubspec/.packages/build file.
+String _findProjectFolder(ResourceProvider resourceProvider, String filePath) {
+ // TODO(dantup): Is there something we can reuse for this?
+ var folder = dirname(filePath);
+ while (folder != dirname(folder)) {
+ final pubspec =
+ resourceProvider.getFile(join(folder, ContextManagerImpl.PUBSPEC_NAME));
+ final packages = resourceProvider
+ .getFile(join(folder, ContextManagerImpl.PACKAGE_SPEC_NAME));
+ final build = resourceProvider.getFile(join(folder, 'BUILD'));
+
+ if (pubspec.exists || packages.exists || build.exists) {
+ return folder;
+ }
+ folder = dirname(folder);
+ }
+ return null;
+}
+
class TextDocumentChangeHandler
extends MessageHandler<DidChangeTextDocumentParams, void> {
TextDocumentChangeHandler(LspAnalysisServer server) : super(server);
@@ -108,6 +127,8 @@
/// Whether analysis roots are based on open files and should be updated.
bool updateAnalysisRoots;
+ DateTime lastSentAnalyzeOpenFilesWarnings;
+
TextDocumentOpenHandler(LspAnalysisServer server, this.updateAnalysisRoots)
: super(server);
@@ -171,25 +192,4 @@
return success();
});
}
-
- DateTime lastSentAnalyzeOpenFilesWarnings;
-}
-
-/// Finds the nearest ancestor to [filePath] that contains a pubspec/.packages/build file.
-String _findProjectFolder(ResourceProvider resourceProvider, String filePath) {
- // TODO(dantup): Is there something we can reuse for this?
- var folder = dirname(filePath);
- while (folder != dirname(folder)) {
- final pubspec =
- resourceProvider.getFile(join(folder, ContextManagerImpl.PUBSPEC_NAME));
- final packages = resourceProvider
- .getFile(join(folder, ContextManagerImpl.PACKAGE_SPEC_NAME));
- final build = resourceProvider.getFile(join(folder, 'BUILD'));
-
- if (pubspec.exists || packages.exists || build.exists) {
- return folder;
- }
- folder = dirname(folder);
- }
- return null;
}
diff --git a/pkg/analysis_server/lib/src/lsp/lsp_analysis_server.dart b/pkg/analysis_server/lib/src/lsp/lsp_analysis_server.dart
index b806164..0145248 100644
--- a/pkg/analysis_server/lib/src/lsp/lsp_analysis_server.dart
+++ b/pkg/analysis_server/lib/src/lsp/lsp_analysis_server.dart
@@ -131,13 +131,13 @@
defaultContextOptions.useFastaParser = options.useFastaParser;
{
- String name = options.newAnalysisDriverLog;
+ var name = options.newAnalysisDriverLog;
StringSink sink = NullStringSink();
if (name != null) {
if (name == 'stdout') {
sink = io.stdout;
} else if (name.startsWith('file:')) {
- String path = name.substring('file:'.length);
+ var path = name.substring('file:'.length);
sink = io.File(path).openWrite(mode: io.FileMode.append);
}
}
@@ -593,10 +593,10 @@
@override
nd.AnalysisDriver addAnalysisDriver(
Folder folder, ContextRoot contextRoot, AnalysisOptions options) {
- ContextBuilder builder = createContextBuilder(folder, options);
- nd.AnalysisDriver analysisDriver = builder.buildDriver(contextRoot);
+ var builder = createContextBuilder(folder, options);
+ var analysisDriver = builder.buildDriver(contextRoot);
analysisDriver.results.listen((result) {
- String path = result.path;
+ var path = result.path;
if (analysisServer.shouldSendErrorsNotificationFor(path)) {
final serverErrors = protocol.mapEngineErrors(
result,
@@ -649,7 +649,7 @@
@override
void applyChangesToContext(Folder contextFolder, ChangeSet changeSet) {
- nd.AnalysisDriver analysisDriver = analysisServer.driverMap[contextFolder];
+ var analysisDriver = analysisServer.driverMap[contextFolder];
if (analysisDriver != null) {
changeSet.addedFiles.forEach((path) {
analysisDriver.addFile(path);
@@ -680,10 +680,10 @@
ContextBuilder createContextBuilder(Folder folder, AnalysisOptions options) {
String defaultPackageFilePath;
String defaultPackagesDirectoryPath;
- String path = (analysisServer.contextManager as ContextManagerImpl)
+ var path = (analysisServer.contextManager as ContextManagerImpl)
.normalizedPackageRoots[folder.path];
if (path != null) {
- Resource resource = resourceProvider.getResource(path);
+ var resource = resourceProvider.getResource(path);
if (resource.exists) {
if (resource is File) {
defaultPackageFilePath = path;
@@ -693,11 +693,11 @@
}
}
- ContextBuilderOptions builderOptions = ContextBuilderOptions();
+ var builderOptions = ContextBuilderOptions();
builderOptions.defaultOptions = options;
builderOptions.defaultPackageFilePath = defaultPackageFilePath;
builderOptions.defaultPackagesDirectoryPath = defaultPackagesDirectoryPath;
- ContextBuilder builder = ContextBuilder(
+ var builder = ContextBuilder(
resourceProvider, analysisServer.sdkManager, null,
options: builderOptions);
builder.analysisDriverScheduler = analysisServer.analysisDriverScheduler;
@@ -709,7 +709,7 @@
@override
void removeContext(Folder folder, List<String> flushedFiles) {
- nd.AnalysisDriver driver = analysisServer.driverMap.remove(folder);
+ var driver = analysisServer.driverMap.remove(folder);
// Flush any errors for these files that the client may be displaying.
flushedFiles
?.forEach((path) => analysisServer.publishDiagnostics(path, const []));
diff --git a/pkg/analysis_server/lib/src/lsp/lsp_packet_transformer.dart b/pkg/analysis_server/lib/src/lsp/lsp_packet_transformer.dart
index 780afdb..8f5021f 100644
--- a/pkg/analysis_server/lib/src/lsp/lsp_packet_transformer.dart
+++ b/pkg/analysis_server/lib/src/lsp/lsp_packet_transformer.dart
@@ -5,6 +5,22 @@
import 'dart:async';
import 'dart:convert';
+class InvalidEncodingError {
+ final String headers;
+ InvalidEncodingError(this.headers);
+
+ @override
+ String toString() =>
+ 'Encoding in supplied headers is not supported.\n\nHeaders:\n$headers';
+}
+
+class LspHeaders {
+ final String rawHeaders;
+ final int contentLength;
+ final String encoding;
+ LspHeaders(this.rawHeaders, this.contentLength, this.encoding);
+}
+
/// Transforms a stream of LSP data in the form:
///
/// Content-Length: xxx\r\n
@@ -20,7 +36,7 @@
StreamSubscription<int> input;
StreamController<String> _output;
final buffer = <int>[];
- bool isParsingHeaders = true;
+ var isParsingHeaders = true;
LspHeaders headers;
_output = StreamController<String>(
onListen: () {
@@ -67,6 +83,15 @@
buffer[l - 4] == 13;
}
+ static String _extractEncoding(String header) {
+ final charset = header
+ ?.split(';')
+ ?.map((s) => s.trim().toLowerCase())
+ ?.firstWhere((s) => s.startsWith('charset='), orElse: () => null);
+
+ return charset == null ? null : charset.split('=')[1];
+ }
+
/// Decodes [buffer] into a String and returns the 'Content-Length' header value.
static LspHeaders _parseHeaders(List<int> buffer) {
// Headers are specified as always ASCII in LSP.
@@ -80,29 +105,4 @@
final encoding = _extractEncoding(contentTypeHeader);
return LspHeaders(asString, int.parse(length), encoding);
}
-
- static String _extractEncoding(String header) {
- final charset = header
- ?.split(';')
- ?.map((s) => s.trim().toLowerCase())
- ?.firstWhere((s) => s.startsWith('charset='), orElse: () => null);
-
- return charset == null ? null : charset.split('=')[1];
- }
-}
-
-class LspHeaders {
- final String rawHeaders;
- final int contentLength;
- final String encoding;
- LspHeaders(this.rawHeaders, this.contentLength, this.encoding);
-}
-
-class InvalidEncodingError {
- final String headers;
- InvalidEncodingError(this.headers);
-
- @override
- String toString() =>
- 'Encoding in supplied headers is not supported.\n\nHeaders:\n$headers';
}
diff --git a/pkg/analysis_server/lib/src/lsp/mapping.dart b/pkg/analysis_server/lib/src/lsp/mapping.dart
index 3f3c452..ab35b3f 100644
--- a/pkg/analysis_server/lib/src/lsp/mapping.dart
+++ b/pkg/analysis_server/lib/src/lsp/mapping.dart
@@ -466,7 +466,7 @@
// appear in the completion list, so displaying them as setters is misleading.
// To avoid this, always show only the return type, whether it's a getter
// or a setter.
- String suffix = '';
+ var suffix = '';
if (declaration.kind == dec.DeclarationKind.GETTER) {
suffix = declaration.returnType;
} else {
@@ -616,9 +616,9 @@
// Build display labels and text to insert. insertText and filterText may
// differ from label (for ex. if the label includes things like (…)). If
// either are missing then label will be used by the client.
- String label = suggestion.displayText ?? suggestion.completion;
- String insertText = suggestion.completion;
- String filterText = suggestion.completion;
+ var label = suggestion.displayText ?? suggestion.completion;
+ var insertText = suggestion.completion;
+ var filterText = suggestion.completion;
// Trim any trailing comma from the (displayed) label.
if (label.endsWith(',')) {
@@ -647,7 +647,7 @@
: suggestionKindToCompletionItemKind(
supportedCompletionItemKinds, suggestion.kind, label);
- lsp.InsertTextFormat insertTextFormat = lsp.InsertTextFormat.PlainText;
+ var insertTextFormat = lsp.InsertTextFormat.PlainText;
if (supportsSnippets && suggestion.selectionOffset != 0) {
insertTextFormat = lsp.InsertTextFormat.Snippet;
insertText = buildSnippetStringWithSelection(
@@ -692,7 +692,7 @@
lsp.Diagnostic toDiagnostic(
server.ResolvedUnitResult result, server.AnalysisError error,
[server.ErrorSeverity errorSeverity]) {
- server.ErrorCode errorCode = error.errorCode;
+ var errorCode = error.errorCode;
// Default to the error's severity if none is specified.
errorSeverity ??= errorCode.errorSeverity;
@@ -704,7 +704,7 @@
.toList();
}
- String message = error.message;
+ var message = error.message;
if (error.correctionMessage != null) {
message = '$message\n${error.correctionMessage}';
}
@@ -721,8 +721,8 @@
lsp.DiagnosticRelatedInformation toDiagnosticRelatedInformation(
server.ResolvedUnitResult result, analyzer.DiagnosticMessage message) {
- String file = message.filePath;
- server.LineInfo lineInfo = result.session.getFile(file).lineInfo;
+ var file = message.filePath;
+ var lineInfo = result.session.getFile(file).lineInfo;
return lsp.DiagnosticRelatedInformation(
lsp.Location(
Uri.file(file).toString(),
diff --git a/pkg/analysis_server/lib/src/lsp/source_edits.dart b/pkg/analysis_server/lib/src/lsp/source_edits.dart
index 33f76cf..0153601 100644
--- a/pkg/analysis_server/lib/src/lsp/source_edits.dart
+++ b/pkg/analysis_server/lib/src/lsp/source_edits.dart
@@ -13,7 +13,7 @@
List<TextDocumentContentChangeEvent> changes, {
failureIsCritical = false,
}) {
- String newContent = oldContent;
+ var newContent = oldContent;
for (var change in changes) {
if (change.range == null && change.rangeLength == null) {
newContent = change.text;
diff --git a/pkg/analysis_server/lib/src/operation/operation_analysis.dart b/pkg/analysis_server/lib/src/operation/operation_analysis.dart
index e911619..9a0fadc 100644
--- a/pkg/analysis_server/lib/src/operation/operation_analysis.dart
+++ b/pkg/analysis_server/lib/src/operation/operation_analysis.dart
@@ -13,10 +13,8 @@
import 'package:analysis_server/src/computer/computer_overrides.dart';
import 'package:analysis_server/src/domains/analysis/implemented_dart.dart';
import 'package:analysis_server/src/protocol_server.dart' as protocol;
-import 'package:analysis_server/src/services/search/search_engine.dart';
import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/exception/exception.dart';
import 'package:analyzer/src/generated/engine.dart';
import 'package:analyzer/src/generated/source.dart';
@@ -25,17 +23,16 @@
AnalysisServer server, Iterable<String> files) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- SearchEngine searchEngine = server.searchEngine;
+ var searchEngine = server.searchEngine;
if (searchEngine == null) {
return;
}
- for (String file in files) {
- CompilationUnit unit = server.getCachedResolvedUnit(file)?.unit;
- CompilationUnitElement unitElement = unit?.declaredElement;
+ for (var file in files) {
+ var unit = server.getCachedResolvedUnit(file)?.unit;
+ var unitElement = unit?.declaredElement;
if (unitElement != null) {
try {
- ImplementedComputer computer =
- ImplementedComputer(searchEngine, unitElement);
+ var computer = ImplementedComputer(searchEngine, unitElement);
await computer.compute();
var params = protocol.AnalysisImplementedParams(
file, computer.classes, computer.members);
@@ -53,7 +50,7 @@
void sendAnalysisNotificationAnalyzedFiles(AnalysisServer server) {
_sendNotification(server, () {
- Set<String> analyzedFiles = server.driverMap.values
+ var analyzedFiles = server.driverMap.values
.map((driver) => driver.knownFiles)
.expand((files) => files)
.toSet();
@@ -62,7 +59,7 @@
// all the files in folders which contain analyzed files.
analyzedFiles.removeWhere((file) => file.endsWith('.yaml'));
- Set<String> prevAnalyzedFiles = server.prevAnalyzedFiles;
+ var prevAnalyzedFiles = server.prevAnalyzedFiles;
if (prevAnalyzedFiles != null &&
prevAnalyzedFiles.length == analyzedFiles.length &&
prevAnalyzedFiles.difference(analyzedFiles).isEmpty) {
@@ -71,8 +68,7 @@
return;
}
server.prevAnalyzedFiles = analyzedFiles;
- protocol.AnalysisAnalyzedFilesParams params =
- protocol.AnalysisAnalyzedFilesParams(analyzedFiles.toList());
+ var params = protocol.AnalysisAnalyzedFilesParams(analyzedFiles.toList());
server.sendNotification(params.toNotification());
});
}
@@ -130,10 +126,10 @@
}
// compute library name
- String libraryName = _computeLibraryName(resolvedUnit.unit);
+ var libraryName = _computeLibraryName(resolvedUnit.unit);
// compute Outline
- protocol.Outline outline = DartUnitOutlineComputer(
+ var outline = DartUnitOutlineComputer(
resolvedUnit,
withBasicFlutter: true,
).compute();
@@ -156,12 +152,12 @@
}
String _computeLibraryName(CompilationUnit unit) {
- for (Directive directive in unit.directives) {
+ for (var directive in unit.directives) {
if (directive is LibraryDirective && directive.name != null) {
return directive.name.name;
}
}
- for (Directive directive in unit.directives) {
+ for (var directive in unit.directives) {
if (directive is PartOfDirective && directive.libraryName != null) {
return directive.libraryName.name;
}
diff --git a/pkg/analysis_server/lib/src/plugin/notification_manager.dart b/pkg/analysis_server/lib/src/plugin/notification_manager.dart
index 8bdac58..b1a4b44 100644
--- a/pkg/analysis_server/lib/src/plugin/notification_manager.dart
+++ b/pkg/analysis_server/lib/src/plugin/notification_manager.dart
@@ -79,42 +79,40 @@
/// Handle the given [notification] from the plugin with the given [pluginId].
void handlePluginNotification(
String pluginId, plugin.Notification notification) {
- String event = notification.event;
+ var event = notification.event;
switch (event) {
case plugin.ANALYSIS_NOTIFICATION_ERRORS:
- plugin.AnalysisErrorsParams params =
- plugin.AnalysisErrorsParams.fromNotification(notification);
+ var params = plugin.AnalysisErrorsParams.fromNotification(notification);
recordAnalysisErrors(pluginId, params.file, params.errors);
break;
case plugin.ANALYSIS_NOTIFICATION_FOLDING:
- plugin.AnalysisFoldingParams params =
+ var params =
plugin.AnalysisFoldingParams.fromNotification(notification);
recordFoldingRegions(pluginId, params.file, params.regions);
break;
case plugin.ANALYSIS_NOTIFICATION_HIGHLIGHTS:
- plugin.AnalysisHighlightsParams params =
+ var params =
plugin.AnalysisHighlightsParams.fromNotification(notification);
recordHighlightRegions(pluginId, params.file, params.regions);
break;
case plugin.ANALYSIS_NOTIFICATION_NAVIGATION:
- plugin.AnalysisNavigationParams params =
+ var params =
plugin.AnalysisNavigationParams.fromNotification(notification);
recordNavigationParams(pluginId, params.file,
converter.convertAnalysisNavigationParams(params));
break;
case plugin.ANALYSIS_NOTIFICATION_OCCURRENCES:
- plugin.AnalysisOccurrencesParams params =
+ var params =
plugin.AnalysisOccurrencesParams.fromNotification(notification);
recordOccurrences(pluginId, params.file, params.occurrences);
break;
case plugin.ANALYSIS_NOTIFICATION_OUTLINE:
- plugin.AnalysisOutlineParams params =
+ var params =
plugin.AnalysisOutlineParams.fromNotification(notification);
recordOutlines(pluginId, params.file, params.outline);
break;
case plugin.PLUGIN_NOTIFICATION_ERROR:
- plugin.PluginErrorParams params =
- plugin.PluginErrorParams.fromNotification(notification);
+ var params = plugin.PluginErrorParams.fromNotification(notification);
// TODO(brianwilkerson) There is no indication for the client as to the
// fact that the error came from a plugin, let alone which plugin it
// came from. We should consider whether we really want to send them to
@@ -132,9 +130,8 @@
String pluginId, String filePath, List<AnalysisError> errorData) {
if (errors.isCollectingFor(filePath)) {
errors.putResults(filePath, pluginId, errorData);
- List<List<AnalysisError>> unmergedErrors = errors.getResults(filePath);
- List<AnalysisError> mergedErrors =
- merger.mergeAnalysisErrors(unmergedErrors);
+ var unmergedErrors = errors.getResults(filePath);
+ var mergedErrors = merger.mergeAnalysisErrors(unmergedErrors);
channel.sendNotification(
server.AnalysisErrorsParams(filePath, mergedErrors).toNotification());
}
@@ -146,9 +143,8 @@
String pluginId, String filePath, List<FoldingRegion> foldingData) {
if (folding.isCollectingFor(filePath)) {
folding.putResults(filePath, pluginId, foldingData);
- List<List<FoldingRegion>> unmergedFolding = folding.getResults(filePath);
- List<FoldingRegion> mergedFolding =
- merger.mergeFoldingRegions(unmergedFolding);
+ var unmergedFolding = folding.getResults(filePath);
+ var mergedFolding = merger.mergeFoldingRegions(unmergedFolding);
channel.sendNotification(
server.AnalysisFoldingParams(filePath, mergedFolding)
.toNotification());
@@ -161,10 +157,8 @@
String pluginId, String filePath, List<HighlightRegion> highlightData) {
if (highlights.isCollectingFor(filePath)) {
highlights.putResults(filePath, pluginId, highlightData);
- List<List<HighlightRegion>> unmergedHighlights =
- highlights.getResults(filePath);
- List<HighlightRegion> mergedHighlights =
- merger.mergeHighlightRegions(unmergedHighlights);
+ var unmergedHighlights = highlights.getResults(filePath);
+ var mergedHighlights = merger.mergeHighlightRegions(unmergedHighlights);
channel.sendNotification(
server.AnalysisHighlightsParams(filePath, mergedHighlights)
.toNotification());
@@ -177,10 +171,8 @@
server.AnalysisNavigationParams navigationData) {
if (navigation.isCollectingFor(filePath)) {
navigation.putResults(filePath, pluginId, navigationData);
- List<server.AnalysisNavigationParams> unmergedNavigations =
- navigation.getResults(filePath);
- server.AnalysisNavigationParams mergedNavigations =
- merger.mergeNavigation(unmergedNavigations);
+ var unmergedNavigations = navigation.getResults(filePath);
+ var mergedNavigations = merger.mergeNavigation(unmergedNavigations);
channel.sendNotification(mergedNavigations.toNotification());
}
}
@@ -191,10 +183,8 @@
String pluginId, String filePath, List<Occurrences> occurrencesData) {
if (occurrences.isCollectingFor(filePath)) {
occurrences.putResults(filePath, pluginId, occurrencesData);
- List<List<Occurrences>> unmergedOccurrences =
- occurrences.getResults(filePath);
- List<Occurrences> mergedOccurrences =
- merger.mergeOccurrences(unmergedOccurrences);
+ var unmergedOccurrences = occurrences.getResults(filePath);
+ var mergedOccurrences = merger.mergeOccurrences(unmergedOccurrences);
channel.sendNotification(
server.AnalysisOccurrencesParams(filePath, mergedOccurrences)
.toNotification());
@@ -207,8 +197,8 @@
String pluginId, String filePath, List<Outline> outlineData) {
if (outlines.isCollectingFor(filePath)) {
outlines.putResults(filePath, pluginId, outlineData);
- List<List<Outline>> unmergedOutlines = outlines.getResults(filePath);
- List<Outline> mergedOutlines = merger.mergeOutline(unmergedOutlines);
+ var unmergedOutlines = outlines.getResults(filePath);
+ var mergedOutlines = merger.mergeOutline(unmergedOutlines);
channel.sendNotification(server.AnalysisOutlineParams(
filePath, server.FileKind.LIBRARY, mergedOutlines[0])
.toNotification());
@@ -246,10 +236,10 @@
services.addAll(currentSubscriptions.keys);
services.addAll(newSubscriptions.keys);
services.forEach((server.AnalysisService service) {
- ResultCollector collector = collectorFor(service);
+ var collector = collectorFor(service);
if (collector != null) {
- Set<String> currentPaths = currentSubscriptions[service];
- Set<String> newPaths = newSubscriptions[service];
+ var currentPaths = currentSubscriptions[service];
+ var newPaths = newSubscriptions[service];
if (currentPaths == null) {
if (newPaths == null) {
// This should not happen.
@@ -286,7 +276,7 @@
/// [path] (because it is being analyzed).
bool _isIncluded(String path) {
bool isIncluded() {
- for (String includedPath in includedPaths) {
+ for (var includedPath in includedPaths) {
if (provider.pathContext.isWithin(includedPath, path) ||
provider.pathContext.equals(includedPath, path)) {
return true;
@@ -296,7 +286,7 @@
}
bool isExcluded() {
- for (String excludedPath in excludedPaths) {
+ for (var excludedPath in excludedPaths) {
if (provider.pathContext.isWithin(excludedPath, path)) {
return true;
}
diff --git a/pkg/analysis_server/lib/src/plugin/plugin_locator.dart b/pkg/analysis_server/lib/src/plugin/plugin_locator.dart
index b99707f..0ff0268 100644
--- a/pkg/analysis_server/lib/src/plugin/plugin_locator.dart
+++ b/pkg/analysis_server/lib/src/plugin/plugin_locator.dart
@@ -52,7 +52,7 @@
/// The implementation of [findPlugin].
String _findPlugin(String packageRoot) {
- Folder packageFolder = resourceProvider.getFolder(packageRoot);
+ var packageFolder = resourceProvider.getFolder(packageRoot);
// TODO(brianwilkerson) Re-enable this after deciding how we want to deal
// with discovery of plugins.
// import 'package:yaml/yaml.dart';
@@ -76,7 +76,7 @@
// // If we can't read the file, or if it isn't valid YAML, then ignore it.
// }
// }
- Folder pluginFolder = packageFolder
+ var pluginFolder = packageFolder
.getChildAssumingFolder(toolsFolderName)
.getChildAssumingFolder(defaultPluginFolderName);
if (pluginFolder.exists) {
diff --git a/pkg/analysis_server/lib/src/plugin/plugin_manager.dart b/pkg/analysis_server/lib/src/plugin/plugin_manager.dart
index 45a6774..de68843 100644
--- a/pkg/analysis_server/lib/src/plugin/plugin_manager.dart
+++ b/pkg/analysis_server/lib/src/plugin/plugin_manager.dart
@@ -5,15 +5,15 @@
import 'dart:async';
import 'dart:collection';
import 'dart:convert';
-import 'dart:io' show Platform, Process, ProcessResult;
+import 'dart:io' show Platform, Process;
import 'package:analysis_server/src/plugin/notification_manager.dart';
import 'package:analyzer/exception/exception.dart';
import 'package:analyzer/file_system/file_system.dart';
import 'package:analyzer/instrumentation/instrumentation.dart';
import 'package:analyzer/src/context/context_root.dart' as analyzer;
-import 'package:analyzer/src/generated/source.dart';
import 'package:analyzer/src/generated/engine.dart';
+import 'package:analyzer/src/generated/source.dart';
import 'package:analyzer/src/util/glob.dart';
import 'package:analyzer/src/workspace/bazel.dart';
import 'package:analyzer/src/workspace/gn.dart';
@@ -154,8 +154,8 @@
/// Add the given context [roots] to the set of context roots being analyzed
/// by this plugin.
void addContextRoots(Iterable<analyzer.ContextRoot> roots) {
- bool changed = false;
- for (analyzer.ContextRoot contextRoot in roots) {
+ var changed = false;
+ for (var contextRoot in roots) {
if (contextRoots.add(contextRoot)) {
changed = true;
}
@@ -201,7 +201,7 @@
throw StateError('Cannot start a plugin that is already running.');
}
currentSession = PluginSession(this);
- bool isRunning = await currentSession.start(byteStorePath, sdkPath);
+ var isRunning = await currentSession.start(byteStorePath, sdkPath);
if (!isRunning) {
currentSession = null;
}
@@ -213,7 +213,7 @@
if (currentSession == null) {
throw StateError('Cannot stop a plugin that is not running.');
}
- Future<void> doneFuture = currentSession.stop();
+ var doneFuture = currentSession.stop();
currentSession = null;
return doneFuture;
}
@@ -224,12 +224,11 @@
/// Update the context roots that the plugin should be analyzing.
void _updatePluginRoots() {
if (currentSession != null) {
- AnalysisSetContextRootsParams params = AnalysisSetContextRootsParams(
- contextRoots
- .map((analyzer.ContextRoot contextRoot) => ContextRoot(
- contextRoot.root, contextRoot.exclude,
- optionsFile: contextRoot.optionsFilePath))
- .toList());
+ var params = AnalysisSetContextRootsParams(contextRoots
+ .map((analyzer.ContextRoot contextRoot) => ContextRoot(
+ contextRoot.root, contextRoot.exclude,
+ optionsFile: contextRoot.optionsFilePath))
+ .toList());
currentSession.sendRequest(params);
}
}
@@ -297,8 +296,8 @@
analyzer.ContextRoot contextRoot, String path) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- PluginInfo plugin = _pluginMap[path];
- bool isNew = plugin == null;
+ var plugin = _pluginMap[path];
+ var isNew = plugin == null;
if (isNew) {
List<String> pluginPaths;
try {
@@ -315,7 +314,7 @@
_pluginMap[path] = plugin;
if (pluginPaths[0] != null) {
try {
- PluginSession session = await plugin.start(byteStorePath, sdkPath);
+ var session = await plugin.start(byteStorePath, sdkPath);
session?.onDone?.then((_) {
_pluginMap.remove(path);
});
@@ -347,10 +346,9 @@
/// response.
Map<PluginInfo, Future<Response>> broadcastRequest(RequestParams params,
{analyzer.ContextRoot contextRoot}) {
- List<PluginInfo> plugins = pluginsForContextRoot(contextRoot);
- Map<PluginInfo, Future<Response>> responseMap =
- <PluginInfo, Future<Response>>{};
- for (PluginInfo plugin in plugins) {
+ var plugins = pluginsForContextRoot(contextRoot);
+ var responseMap = <PluginInfo, Future<Response>>{};
+ for (var plugin in plugins) {
final request = plugin.currentSession?.sendRequest(params);
// Only add an entry to the map if we have sent a request.
if (request != null) {
@@ -368,7 +366,7 @@
watcher.WatchEvent watchEvent) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- String filePath = watchEvent.path;
+ var filePath = watchEvent.path;
/// Return `true` if the given glob [pattern] matches the file being
/// watched.
@@ -376,9 +374,9 @@
Glob(resourceProvider.pathContext.separator, pattern).matches(filePath);
WatchEvent event;
- List<Future<Response>> responses = <Future<Response>>[];
- for (PluginInfo plugin in _pluginMap.values) {
- PluginSession session = plugin.currentSession;
+ var responses = <Future<Response>>[];
+ for (var plugin in _pluginMap.values) {
+ var session = plugin.currentSession;
if (session != null &&
plugin.isAnalyzing(filePath) &&
session.interestingFiles != null &&
@@ -388,8 +386,7 @@
// then the plugin hasn't had a chance to analyze anything yet, and
// hence it does not needed to get watch events.
event ??= _convertWatchEvent(watchEvent);
- AnalysisHandleWatchEventsParams params =
- AnalysisHandleWatchEventsParams([event]);
+ var params = AnalysisHandleWatchEventsParams([event]);
responses.add(session.sendRequest(params));
}
}
@@ -401,16 +398,15 @@
/// prevents the plugin from being executing.
@visibleForTesting
List<String> pathsFor(String pluginPath) {
- Folder pluginFolder = resourceProvider.getFolder(pluginPath);
- File pubspecFile = pluginFolder.getChildAssumingFile('pubspec.yaml');
+ var pluginFolder = resourceProvider.getFolder(pluginPath);
+ var pubspecFile = pluginFolder.getChildAssumingFile('pubspec.yaml');
if (!pubspecFile.exists) {
// If there's no pubspec file, then we don't need to copy the package
// because we won't be running pub.
return _computePaths(pluginFolder);
}
- Workspace workspace =
- BazelWorkspace.find(resourceProvider, pluginFolder.path) ??
- GnWorkspace.find(resourceProvider, pluginFolder.path);
+ var workspace = BazelWorkspace.find(resourceProvider, pluginFolder.path) ??
+ GnWorkspace.find(resourceProvider, pluginFolder.path);
if (workspace != null) {
// Similarly, we won't be running pub if we're in a workspace because
// there is exactly one version of each package.
@@ -422,15 +418,15 @@
// it will be invariant across sessions, reducing the number of times the
// plugin will need to be copied and pub will need to be run.
//
- Folder stateFolder = resourceProvider.getStateLocation('.plugin_manager');
- String stateName = _uniqueDirectoryName(pluginPath);
- Folder parentFolder = stateFolder.getChildAssumingFolder(stateName);
+ var stateFolder = resourceProvider.getStateLocation('.plugin_manager');
+ var stateName = _uniqueDirectoryName(pluginPath);
+ var parentFolder = stateFolder.getChildAssumingFolder(stateName);
if (parentFolder.exists) {
- Folder executionFolder =
+ var executionFolder =
parentFolder.getChildAssumingFolder(pluginFolder.shortName);
return _computePaths(executionFolder, pubCommand: 'upgrade');
}
- Folder executionFolder = pluginFolder.copyTo(parentFolder);
+ var executionFolder = pluginFolder.copyTo(parentFolder);
return _computePaths(executionFolder, pubCommand: 'get');
}
@@ -441,8 +437,8 @@
if (contextRoot == null) {
return _pluginMap.values.toList();
}
- List<PluginInfo> plugins = <PluginInfo>[];
- for (PluginInfo plugin in _pluginMap.values) {
+ var plugins = <PluginInfo>[];
+ for (var plugin in _pluginMap.values) {
if (plugin.contextRoots.contains(contextRoot)) {
plugins.add(plugin);
}
@@ -458,9 +454,8 @@
try {
throw PluginException(message);
} catch (exception, stackTrace) {
- String pluginPath =
- path.join(hostPackageName, 'tools', 'analyzer_plugin');
- DiscoveredPluginInfo plugin = DiscoveredPluginInfo(
+ var pluginPath = path.join(hostPackageName, 'tools', 'analyzer_plugin');
+ var plugin = DiscoveredPluginInfo(
pluginPath, null, null, notificationManager, instrumentationService);
plugin.exception = CaughtException(exception, stackTrace);
_pluginMap[pluginPath] = plugin;
@@ -469,8 +464,8 @@
/// The given [contextRoot] is no longer being analyzed.
void removedContextRoot(analyzer.ContextRoot contextRoot) {
- List<PluginInfo> plugins = _pluginMap.values.toList();
- for (PluginInfo plugin in plugins) {
+ var plugins = _pluginMap.values.toList();
+ for (var plugin in plugins) {
plugin.removeContextRoot(contextRoot);
if (plugin is DiscoveredPluginInfo && plugin.contextRoots.isEmpty) {
_pluginMap.remove(plugin.path);
@@ -488,13 +483,13 @@
Future<void> restartPlugins() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- for (PluginInfo plugin in _pluginMap.values.toList()) {
+ for (var plugin in _pluginMap.values.toList()) {
if (plugin.currentSession != null) {
//
// Capture needed state.
//
- Set<analyzer.ContextRoot> contextRoots = plugin.contextRoots;
- String path = plugin.pluginId;
+ var contextRoots = plugin.contextRoots;
+ var path = plugin.pluginId;
//
// Stop the plugin.
//
@@ -503,7 +498,7 @@
// Restart the plugin.
//
_pluginMap[path] = plugin;
- PluginSession session = await plugin.start(byteStorePath, sdkPath);
+ var session = await plugin.start(byteStorePath, sdkPath);
session?.onDone?.then((_) {
_pluginMap.remove(path);
});
@@ -530,7 +525,7 @@
/// plugins.
void setAnalysisSetPriorityFilesParams(
AnalysisSetPriorityFilesParams params) {
- for (PluginInfo plugin in _pluginMap.values) {
+ for (var plugin in _pluginMap.values) {
plugin.sendRequest(params);
}
_analysisSetPriorityFilesParams = params;
@@ -541,7 +536,7 @@
/// the parameters so that they can be sent to any newly started plugins.
void setAnalysisSetSubscriptionsParams(
AnalysisSetSubscriptionsParams params) {
- for (PluginInfo plugin in _pluginMap.values) {
+ for (var plugin in _pluginMap.values) {
plugin.sendRequest(params);
}
_analysisSetSubscriptionsParams = params;
@@ -552,11 +547,11 @@
/// update the overlay state so that it can be sent to any newly started
/// plugins.
void setAnalysisUpdateContentParams(AnalysisUpdateContentParams params) {
- for (PluginInfo plugin in _pluginMap.values) {
+ for (var plugin in _pluginMap.values) {
plugin.sendRequest(params);
}
- Map<String, dynamic> files = params.files;
- for (String file in files.keys) {
+ var files = params.files;
+ for (var file in files.keys) {
Object overlay = files[file];
if (overlay is RemoveContentOverlay) {
_overlayState.remove(file);
@@ -564,7 +559,7 @@
_overlayState[file] = overlay;
} else if (overlay is ChangeContentOverlay) {
AddContentOverlay previousOverlay = _overlayState[file];
- String newContent =
+ var newContent =
SourceEdit.applySequence(previousOverlay.content, overlay.edits);
_overlayState[file] = AddContentOverlay(newContent);
} else {
@@ -590,28 +585,28 @@
/// Runs pub if [pubCommand] is provided and not null.
List<String> _computePaths(Folder pluginFolder,
{String pubCommand, Workspace workspace}) {
- File pluginFile = pluginFolder
+ var pluginFile = pluginFolder
.getChildAssumingFolder('bin')
.getChildAssumingFile('plugin.dart');
if (!pluginFile.exists) {
throw PluginException('File "${pluginFile.path}" does not exist.');
}
String reason;
- File packagesFile = pluginFolder.getChildAssumingFile('.packages');
+ var packagesFile = pluginFolder.getChildAssumingFile('.packages');
if (pubCommand != null) {
- String vmPath = Platform.executable;
- String pubPath = path.join(path.dirname(vmPath), 'pub');
+ var vmPath = Platform.executable;
+ var pubPath = path.join(path.dirname(vmPath), 'pub');
if (Platform.isWindows) {
// Process.run requires the `.bat` suffix on Windows
pubPath = '$pubPath.bat';
}
- ProcessResult result = Process.runSync(pubPath, <String>[pubCommand],
+ var result = Process.runSync(pubPath, <String>[pubCommand],
stderrEncoding: utf8,
stdoutEncoding: utf8,
workingDirectory: pluginFolder.path,
environment: {_pubEnvironmentKey: _getPubEnvironmentValue()});
if (result.exitCode != 0) {
- StringBuffer buffer = StringBuffer();
+ var buffer = StringBuffer();
buffer.writeln('Failed to run pub $pubCommand');
buffer.writeln(' pluginFolder = ${pluginFolder.path}');
buffer.writeln(' exitCode = ${result.exitCode}');
@@ -665,39 +660,39 @@
/// file.
File _createPackagesFile(
Folder pluginFolder, UriResolver packageUriResolver) {
- String pluginPath = pluginFolder.path;
- Folder stateFolder = resourceProvider.getStateLocation('.plugin_manager');
- String stateName = _uniqueDirectoryName(pluginPath) + '.packages';
- File packagesFile = stateFolder.getChildAssumingFile(stateName);
+ var pluginPath = pluginFolder.path;
+ var stateFolder = resourceProvider.getStateLocation('.plugin_manager');
+ var stateName = _uniqueDirectoryName(pluginPath) + '.packages';
+ var packagesFile = stateFolder.getChildAssumingFile(stateName);
if (!packagesFile.exists) {
- File pluginPubspec = pluginFolder.getChildAssumingFile('pubspec.yaml');
+ var pluginPubspec = pluginFolder.getChildAssumingFile('pubspec.yaml');
if (!pluginPubspec.exists) {
return null;
}
try {
- Map<String, String> visitedPackages = <String, String>{};
- path.Context context = resourceProvider.pathContext;
+ var visitedPackages = <String, String>{};
+ var context = resourceProvider.pathContext;
visitedPackages[context.basename(pluginPath)] =
context.join(pluginFolder.path, 'lib');
- List<File> pubspecFiles = <File>[];
+ var pubspecFiles = <File>[];
pubspecFiles.add(pluginPubspec);
while (pubspecFiles.isNotEmpty) {
- File pubspecFile = pubspecFiles.removeLast();
- for (String packageName in _readDependecies(pubspecFile)) {
+ var pubspecFile = pubspecFiles.removeLast();
+ for (var packageName in _readDependecies(pubspecFile)) {
if (!visitedPackages.containsKey(packageName)) {
- Uri uri = Uri.parse('package:$packageName/$packageName.dart');
- Source packageSource = packageUriResolver.resolveAbsolute(uri);
- String libDirPath = context.dirname(packageSource.fullName);
+ var uri = Uri.parse('package:$packageName/$packageName.dart');
+ var packageSource = packageUriResolver.resolveAbsolute(uri);
+ var libDirPath = context.dirname(packageSource.fullName);
visitedPackages[packageName] = libDirPath;
- String pubspecPath =
+ var pubspecPath =
context.join(context.dirname(libDirPath), 'pubspec.yaml');
pubspecFiles.add(resourceProvider.getFile(pubspecPath));
}
}
}
- StringBuffer buffer = StringBuffer();
+ var buffer = StringBuffer();
visitedPackages.forEach((String name, String path) {
buffer.write(name);
buffer.write(':');
@@ -716,9 +711,9 @@
/// Return the names of packages that are listed as dependencies in the given
/// [pubspecFile].
Iterable<String> _readDependecies(File pubspecFile) {
- YamlDocument document = loadYamlDocument(pubspecFile.readAsStringSync(),
+ var document = loadYamlDocument(pubspecFile.readAsStringSync(),
sourceUrl: pubspecFile.toUri());
- YamlNode contents = document.contents;
+ var contents = document.contents;
if (contents is YamlMap) {
YamlNode dependencies = contents['dependencies'];
if (dependencies is YamlMap) {
@@ -730,7 +725,7 @@
/// Return a hex-encoded MD5 signature of the given file [path].
String _uniqueDirectoryName(String path) {
- List<int> bytes = md5.convert(path.codeUnits).bytes;
+ var bytes = md5.convert(path.codeUnits).bytes;
return hex.encode(bytes);
}
@@ -822,8 +817,7 @@
/// Handle the given [notification].
void handleNotification(Notification notification) {
if (notification.event == PLUGIN_NOTIFICATION_ERROR) {
- PluginErrorParams params =
- PluginErrorParams.fromNotification(notification);
+ var params = PluginErrorParams.fromNotification(notification);
if (params.isFatal) {
info.stop();
stop();
@@ -844,8 +838,8 @@
/// Handle the fact that an unhandled error has occurred in the plugin.
void handleOnError(dynamic error) {
- List<String> errorPair = (error as List).cast<String>();
- StackTrace stackTrace = StackTrace.fromString(errorPair[1]);
+ var errorPair = (error as List).cast<String>();
+ var stackTrace = StackTrace.fromString(errorPair[1]);
info.exception = CaughtException(PluginException(errorPair[0]), stackTrace);
info.instrumentationService
.logPluginException(info.data, errorPair[0], stackTrace);
@@ -854,11 +848,11 @@
/// Handle a [response] from the plugin by completing the future that was
/// created when the request was sent.
void handleResponse(Response response) {
- _PendingRequest requestData = pendingRequests.remove(response.id);
- int responseTime = DateTime.now().millisecondsSinceEpoch;
- int duration = responseTime - requestData.requestTime;
+ var requestData = pendingRequests.remove(response.id);
+ var responseTime = DateTime.now().millisecondsSinceEpoch;
+ var duration = responseTime - requestData.requestTime;
PluginManager.recordResponseTime(info, requestData.method, duration);
- Completer<Response> completer = requestData.completer;
+ var completer = requestData.completer;
if (completer != null) {
completer.complete(response);
}
@@ -869,7 +863,7 @@
bool isNonResponsive() {
// TODO(brianwilkerson) Figure out when to invoke this method in order to
// identify non-responsive plugins and kill them.
- int cutOffTime = DateTime.now().millisecondsSinceEpoch -
+ var cutOffTime = DateTime.now().millisecondsSinceEpoch -
MAXIMUM_RESPONSE_TIME.inMilliseconds;
for (var requestData in pendingRequests.values) {
if (requestData.requestTime < cutOffTime) {
@@ -885,10 +879,10 @@
if (channel == null) {
throw StateError('Cannot send a request to a plugin that has stopped.');
}
- String id = nextRequestId;
- Completer<Response> completer = Completer();
- int requestTime = DateTime.now().millisecondsSinceEpoch;
- Request request = parameters.toRequest(id);
+ var id = nextRequestId;
+ var completer = Completer<Response>();
+ var requestTime = DateTime.now().millisecondsSinceEpoch;
+ var request = parameters.toRequest(id);
pendingRequests[id] =
_PendingRequest(request.method, requestTime, completer);
channel.sendRequest(request);
@@ -929,10 +923,9 @@
PluginException('Unrecorded error while starting the plugin.'), null);
return false;
}
- Response response = await sendRequest(PluginVersionCheckParams(
+ var response = await sendRequest(PluginVersionCheckParams(
byteStorePath ?? '', sdkPath, '1.0.0-alpha.0'));
- PluginVersionCheckResult result =
- PluginVersionCheckResult.fromResponse(response);
+ var result = PluginVersionCheckResult.fromResponse(response);
isCompatible = result.isCompatible;
contactInfo = result.contactInfo;
interestingFiles = result.interestingFiles;
diff --git a/pkg/analysis_server/lib/src/plugin/plugin_watcher.dart b/pkg/analysis_server/lib/src/plugin/plugin_watcher.dart
index 2be2631..1b8391c 100644
--- a/pkg/analysis_server/lib/src/plugin/plugin_watcher.dart
+++ b/pkg/analysis_server/lib/src/plugin/plugin_watcher.dart
@@ -10,8 +10,6 @@
import 'package:analyzer/src/context/context_root.dart';
import 'package:analyzer/src/dart/analysis/driver.dart';
import 'package:analyzer/src/dart/sdk/sdk.dart';
-import 'package:analyzer/src/generated/source.dart';
-import 'package:path/src/context.dart';
/// An object that watches the results produced by analysis drivers to identify
/// references to previously unseen packages and, if those packages have plugins
@@ -42,20 +40,20 @@
void addedDriver(AnalysisDriver driver, ContextRoot contextRoot) {
_driverInfo[driver] = _DriverInfo(
contextRoot, <String>[contextRoot.root, _getSdkPath(driver)]);
- List<String> enabledPlugins = driver.analysisOptions.enabledPluginNames;
- for (String hostPackageName in enabledPlugins) {
+ var enabledPlugins = driver.analysisOptions.enabledPluginNames;
+ for (var hostPackageName in enabledPlugins) {
//
// Determine whether the package exists and defines a plugin.
//
- String uri = 'package:$hostPackageName/$hostPackageName.dart';
- Source source = driver.sourceFactory.forUri(uri);
+ var uri = 'package:$hostPackageName/$hostPackageName.dart';
+ var source = driver.sourceFactory.forUri(uri);
if (source == null) {
manager.recordPluginFailure(hostPackageName,
'Could not resolve "$uri" in ${contextRoot.root}.');
} else {
- Context context = resourceProvider.pathContext;
- String packageRoot = context.dirname(context.dirname(source.fullName));
- String pluginPath = _locator.findPlugin(packageRoot);
+ var context = resourceProvider.pathContext;
+ var packageRoot = context.dirname(context.dirname(source.fullName));
+ var pluginPath = _locator.findPlugin(packageRoot);
if (pluginPath == null) {
manager.recordPluginFailure(
hostPackageName, 'Could not find plugin in "$packageRoot".');
@@ -75,7 +73,7 @@
/// The context manager has just removed the given analysis [driver].
@override
void removedDriver(AnalysisDriver driver) {
- _DriverInfo info = _driverInfo[driver];
+ var info = _driverInfo[driver];
if (info == null) {
throw StateError('Cannot remove a driver that was not added');
}
@@ -97,9 +95,9 @@
}
}
- String sdkRoot = coreSource.fullName;
+ var sdkRoot = coreSource.fullName;
while (resourceProvider.pathContext.basename(sdkRoot) != 'lib') {
- String parent = resourceProvider.pathContext.dirname(sdkRoot);
+ var parent = resourceProvider.pathContext.dirname(sdkRoot);
if (parent == sdkRoot) {
break;
}
diff --git a/pkg/analysis_server/lib/src/plugin/request_converter.dart b/pkg/analysis_server/lib/src/plugin/request_converter.dart
index 87bd81d..a08bc7b 100644
--- a/pkg/analysis_server/lib/src/plugin/request_converter.dart
+++ b/pkg/analysis_server/lib/src/plugin/request_converter.dart
@@ -21,11 +21,9 @@
plugin.AnalysisSetSubscriptionsParams convertAnalysisSetSubscriptionsParams(
server.AnalysisSetSubscriptionsParams params) {
- Map<server.AnalysisService, List<String>> serverSubscriptions =
- params.subscriptions;
- Map<plugin.AnalysisService, List<String>> pluginSubscriptions =
- <plugin.AnalysisService, List<String>>{};
- for (server.AnalysisService service in serverSubscriptions.keys) {
+ var serverSubscriptions = params.subscriptions;
+ var pluginSubscriptions = <plugin.AnalysisService, List<String>>{};
+ for (var service in serverSubscriptions.keys) {
try {
pluginSubscriptions[convertAnalysisService(service)] =
serverSubscriptions[service];
diff --git a/pkg/analysis_server/lib/src/plugin/result_collector.dart b/pkg/analysis_server/lib/src/plugin/result_collector.dart
index 8d5e7f3..9ce9ecc 100644
--- a/pkg/analysis_server/lib/src/plugin/result_collector.dart
+++ b/pkg/analysis_server/lib/src/plugin/result_collector.dart
@@ -37,7 +37,7 @@
/// Clear any results that have been contributed by the plugin with the given
/// [pluginId].
void clearResultsFromPlugin(String pluginId) {
- for (Map<String, E> partialResults in resultMap.values) {
+ for (var partialResults in resultMap.values) {
partialResults.remove(pluginId);
}
}
@@ -45,15 +45,15 @@
/// Return an iterator producing the partial results that have been
/// contributed for the given [filePath].
List<E> getResults(String filePath) {
- Map<String, E> partialResultMap = resultMap[filePath];
+ var partialResultMap = resultMap[filePath];
if (partialResultMap == null) {
return <E>[];
}
- List<E> values = partialResultMap.values.toList();
+ var values = partialResultMap.values.toList();
//
// Ensure that the server's contributions are always first in the list.
//
- E serverContributions = partialResultMap[serverId];
+ var serverContributions = partialResultMap[serverId];
if (serverContributions != null && values.remove(serverContributions)) {
values.insert(0, serverContributions);
}
@@ -72,7 +72,7 @@
/// Record the [partialResults] as having been contributed for the given
/// [filePath] by the plugin with the given [pluginId].
void putResults(String filePath, String pluginId, E partialResults) {
- Map<String, E> fileResults = resultMap[filePath];
+ var fileResults = resultMap[filePath];
if (fileResults == null) {
if (_shouldCollect != null && _shouldCollect(filePath)) {
resultMap[filePath] = <String, E>{pluginId: partialResults};
diff --git a/pkg/analysis_server/lib/src/plugin/result_converter.dart b/pkg/analysis_server/lib/src/plugin/result_converter.dart
index db4bb3e..3a0983b 100644
--- a/pkg/analysis_server/lib/src/plugin/result_converter.dart
+++ b/pkg/analysis_server/lib/src/plugin/result_converter.dart
@@ -15,7 +15,7 @@
server.AnalysisErrorFixes convertAnalysisErrorFixes(
plugin.AnalysisErrorFixes fixes) {
- List<SourceChange> changes = fixes.fixes
+ var changes = fixes.fixes
.map((plugin.PrioritizedSourceChange change) =>
convertPrioritizedSourceChange(change))
.toList();
diff --git a/pkg/analysis_server/lib/src/plugin/result_merger.dart b/pkg/analysis_server/lib/src/plugin/result_merger.dart
index a7d321e..b4ca545 100644
--- a/pkg/analysis_server/lib/src/plugin/result_merger.dart
+++ b/pkg/analysis_server/lib/src/plugin/result_merger.dart
@@ -27,7 +27,7 @@
List<List<plugin.AnalysisErrorFixes>> partialResultList) {
/// Return a key encoding the unique attributes of the given [error].
String computeKey(AnalysisError error) {
- StringBuffer buffer = StringBuffer();
+ var buffer = StringBuffer();
buffer.write(error.location.offset);
buffer.write(';');
buffer.write(error.code);
@@ -38,37 +38,35 @@
return buffer.toString();
}
- int count = partialResultList.length;
+ var count = partialResultList.length;
if (count == 0) {
return <plugin.AnalysisErrorFixes>[];
} else if (count == 1) {
return partialResultList[0];
}
- Map<String, plugin.AnalysisErrorFixes> fixesMap =
- <String, plugin.AnalysisErrorFixes>{};
- for (plugin.AnalysisErrorFixes fix in partialResultList[0]) {
+ var fixesMap = <String, plugin.AnalysisErrorFixes>{};
+ for (var fix in partialResultList[0]) {
fixesMap[computeKey(fix.error)] = fix;
}
- for (int i = 1; i < count; i++) {
- for (plugin.AnalysisErrorFixes fix in partialResultList[i]) {
- String key = computeKey(fix.error);
- plugin.AnalysisErrorFixes mergedFix = fixesMap[key];
+ for (var i = 1; i < count; i++) {
+ for (var fix in partialResultList[i]) {
+ var key = computeKey(fix.error);
+ var mergedFix = fixesMap[key];
if (mergedFix == null) {
fixesMap[key] = fix;
} else {
// If more than two plugins contribute fixes for the same error, this
// will result in extra copy operations.
- List<plugin.PrioritizedSourceChange> mergedChanges =
- mergedFix.fixes.toList();
+ var mergedChanges = mergedFix.fixes.toList();
mergedChanges.addAll(fix.fixes);
- plugin.AnalysisErrorFixes copiedFix =
+ var copiedFix =
plugin.AnalysisErrorFixes(mergedFix.error, fixes: mergedChanges);
fixesMap[key] = copiedFix;
}
}
}
- List<plugin.AnalysisErrorFixes> mergedFixes = fixesMap.values.toList();
- for (plugin.AnalysisErrorFixes fixes in mergedFixes) {
+ var mergedFixes = fixesMap.values.toList();
+ for (var fixes in mergedFixes) {
fixes.fixes.sort((first, second) => first.priority - second.priority);
}
return mergedFixes;
@@ -85,14 +83,14 @@
// TODO(brianwilkerson) Consider merging duplicate errors (same code,
// location, and messages). If we do that, we should return the logical-or
// of the hasFix fields from the merged errors.
- int count = partialResultList.length;
+ var count = partialResultList.length;
if (count == 0) {
return <AnalysisError>[];
} else if (count == 1) {
return partialResultList[0];
}
- List<AnalysisError> mergedErrors = <AnalysisError>[];
- for (List<AnalysisError> partialResults in partialResultList) {
+ var mergedErrors = <AnalysisError>[];
+ for (var partialResults in partialResultList) {
mergedErrors.addAll(partialResults);
}
return mergedErrors;
@@ -106,14 +104,14 @@
/// resulting list will contain duplications.
List<CompletionSuggestion> mergeCompletionSuggestions(
List<List<CompletionSuggestion>> partialResultList) {
- int count = partialResultList.length;
+ var count = partialResultList.length;
if (count == 0) {
return <CompletionSuggestion>[];
} else if (count == 1) {
return partialResultList[0];
}
- List<CompletionSuggestion> mergedSuggestions = <CompletionSuggestion>[];
- for (List<CompletionSuggestion> partialResults in partialResultList) {
+ var mergedSuggestions = <CompletionSuggestion>[];
+ for (var partialResults in partialResultList) {
mergedSuggestions.addAll(partialResults);
}
return mergedSuggestions;
@@ -129,22 +127,22 @@
/// not considered to be overlapping.)
List<FoldingRegion> mergeFoldingRegions(
List<List<FoldingRegion>> partialResultList) {
- int count = partialResultList.length;
+ var count = partialResultList.length;
if (count == 0) {
return <FoldingRegion>[];
} else if (count == 1) {
return partialResultList[0];
}
- List<FoldingRegion> mergedRegions = partialResultList[0].toList();
+ var mergedRegions = partialResultList[0].toList();
/// Return `true` if the [newRegion] does not overlap any of the regions in
/// the collection of [mergedRegions].
bool isNonOverlapping(FoldingRegion newRegion) {
- int newStart = newRegion.offset;
- int newEnd = newStart + newRegion.length;
- for (FoldingRegion existingRegion in mergedRegions) {
- int existingStart = existingRegion.offset;
- int existingEnd = existingStart + existingRegion.length;
+ var newStart = newRegion.offset;
+ var newEnd = newStart + newRegion.length;
+ for (var existingRegion in mergedRegions) {
+ var existingStart = existingRegion.offset;
+ var existingEnd = existingStart + existingRegion.length;
if (overlaps(newStart, newEnd, existingStart, existingEnd,
allowNesting: true)) {
return false;
@@ -153,9 +151,9 @@
return true;
}
- for (int i = 1; i < count; i++) {
- List<FoldingRegion> partialResults = partialResultList[i];
- for (FoldingRegion region in partialResults) {
+ for (var i = 1; i < count; i++) {
+ var partialResults = partialResultList[i];
+ for (var region in partialResults) {
if (isNonOverlapping(region)) {
mergedRegions.add(region);
}
@@ -172,14 +170,14 @@
/// the resulting list will contain duplications.
List<HighlightRegion> mergeHighlightRegions(
List<List<HighlightRegion>> partialResultList) {
- int count = partialResultList.length;
+ var count = partialResultList.length;
if (count == 0) {
return <HighlightRegion>[];
} else if (count == 1) {
return partialResultList[0];
}
- List<HighlightRegion> mergedRegions = <HighlightRegion>[];
- for (List<HighlightRegion> partialResults in partialResultList) {
+ var mergedRegions = <HighlightRegion>[];
+ for (var partialResults in partialResultList) {
mergedRegions.addAll(partialResults);
}
return mergedRegions;
@@ -193,9 +191,9 @@
/// entry from a different plugin, the entry will appear twice in the list.
KytheGetKytheEntriesResult mergeKytheEntries(
List<KytheGetKytheEntriesResult> partialResultList) {
- List<KytheEntry> mergedEntries = <KytheEntry>[];
- Set<String> mergedFiles = <String>{};
- for (KytheGetKytheEntriesResult partialResult in partialResultList) {
+ var mergedEntries = <KytheEntry>[];
+ var mergedFiles = <String>{};
+ for (var partialResult in partialResultList) {
mergedEntries.addAll(partialResult.entries);
mergedFiles.addAll(partialResult.files);
}
@@ -211,26 +209,26 @@
/// (For these purposes, nested regions are considered to be overlapping.)
AnalysisNavigationParams mergeNavigation(
List<AnalysisNavigationParams> partialResultList) {
- int count = partialResultList.length;
+ var count = partialResultList.length;
if (count == 0) {
return null;
} else if (count == 1) {
return partialResultList[0];
}
- AnalysisNavigationParams base = partialResultList[0];
- String file = base.file;
- List<NavigationRegion> mergedRegions = base.regions.toList();
- List<NavigationTarget> mergedTargets = base.targets.toList();
- List<String> mergedFiles = base.files.toList();
+ var base = partialResultList[0];
+ var file = base.file;
+ var mergedRegions = base.regions.toList();
+ var mergedTargets = base.targets.toList();
+ var mergedFiles = base.files.toList();
/// Return `true` if the [newRegion] does not overlap any of the regions in
/// the collection of [mergedRegions].
bool isNonOverlapping(NavigationRegion newRegion) {
- int newStart = newRegion.offset;
- int newEnd = newStart + newRegion.length;
- for (NavigationRegion mergedRegion in mergedRegions) {
- int mergedStart = mergedRegion.offset;
- int mergedEnd = mergedStart + mergedRegion.length;
+ var newStart = newRegion.offset;
+ var newEnd = newStart + newRegion.length;
+ for (var mergedRegion in mergedRegions) {
+ var mergedStart = mergedRegion.offset;
+ var mergedEnd = mergedStart + mergedRegion.length;
if (overlaps(newStart, newEnd, mergedStart, mergedEnd)) {
return false;
}
@@ -244,8 +242,8 @@
int matchingRegion(newRegion) {
int newOffset = newRegion.offset;
int newLength = newRegion.length;
- for (int i = 0; i < mergedRegions.length; i++) {
- NavigationRegion mergedRegion = mergedRegions[i];
+ for (var i = 0; i < mergedRegions.length; i++) {
+ var mergedRegion = mergedRegions[i];
if (newOffset == mergedRegion.offset &&
newLength == mergedRegion.length) {
return i;
@@ -254,23 +252,23 @@
return -1;
}
- for (int i = 1; i < count; i++) {
+ for (var i = 1; i < count; i++) {
// For now we take the optimistic approach of assuming that most or all of
// the regions will not overlap and that we therefore don't need to remove
// any unreferenced files or targets from the lists. If that isn't true
// then this could result in server sending more data to the client than
// is necessary.
- AnalysisNavigationParams result = partialResultList[i];
- List<NavigationRegion> regions = result.regions;
- List<NavigationTarget> targets = result.targets;
- List<String> files = result.files;
+ var result = partialResultList[i];
+ var regions = result.regions;
+ var targets = result.targets;
+ var files = result.files;
//
// Merge the file data.
//
- Map<int, int> fileMap = <int, int>{};
- for (int j = 0; j < files.length; j++) {
- String file = files[j];
- int index = mergedFiles.indexOf(file);
+ var fileMap = <int, int>{};
+ for (var j = 0; j < files.length; j++) {
+ var file = files[j];
+ var index = mergedFiles.indexOf(file);
if (index < 0) {
index = mergedFiles.length;
mergedFiles.add(file);
@@ -280,15 +278,15 @@
//
// Merge the target data.
//
- Map<int, int> targetMap = <int, int>{};
- for (int j = 0; j < targets.length; j++) {
- NavigationTarget target = targets[j];
- int newIndex = fileMap[target.fileIndex];
+ var targetMap = <int, int>{};
+ for (var j = 0; j < targets.length; j++) {
+ var target = targets[j];
+ var newIndex = fileMap[target.fileIndex];
if (target.fileIndex != newIndex) {
target = NavigationTarget(target.kind, newIndex, target.offset,
target.length, target.startLine, target.startColumn);
}
- int index = mergedTargets.indexOf(target);
+ var index = mergedTargets.indexOf(target);
if (index < 0) {
index = mergedTargets.length;
mergedTargets.add(target);
@@ -298,20 +296,20 @@
//
// Merge the region data.
//
- for (int j = 0; j < regions.length; j++) {
- NavigationRegion region = regions[j];
- List<int> newTargets = region.targets
+ for (var j = 0; j < regions.length; j++) {
+ var region = regions[j];
+ var newTargets = region.targets
.map((int oldTarget) => targetMap[oldTarget])
.toList();
if (region.targets != newTargets) {
region = NavigationRegion(region.offset, region.length, newTargets);
}
- int index = matchingRegion(region);
+ var index = matchingRegion(region);
if (index >= 0) {
- NavigationRegion mergedRegion = mergedRegions[index];
- List<int> mergedTargets = mergedRegion.targets;
- bool added = false;
- for (int target in region.targets) {
+ var mergedRegion = mergedRegions[index];
+ var mergedTargets = mergedRegion.targets;
+ var added = false;
+ for (var target in region.targets) {
if (!mergedTargets.contains(target)) {
if (added) {
mergedTargets.add(target);
@@ -353,24 +351,23 @@
/// the plugins without duplications.
List<Occurrences> mergeOccurrences(
List<List<Occurrences>> partialResultList) {
- int count = partialResultList.length;
+ var count = partialResultList.length;
if (count == 0) {
return <Occurrences>[];
} else if (count == 1) {
return partialResultList[0];
}
- Map<Element, Set<int>> elementMap = <Element, Set<int>>{};
- for (List<Occurrences> partialResults in partialResultList) {
- for (Occurrences occurances in partialResults) {
- Element element = occurances.element;
- Set<int> offsets =
- elementMap.putIfAbsent(element, () => HashSet<int>());
+ var elementMap = <Element, Set<int>>{};
+ for (var partialResults in partialResultList) {
+ for (var occurances in partialResults) {
+ var element = occurances.element;
+ var offsets = elementMap.putIfAbsent(element, () => HashSet<int>());
offsets.addAll(occurances.offsets);
}
}
- List<Occurrences> mergedOccurrences = <Occurrences>[];
+ var mergedOccurrences = <Occurrences>[];
elementMap.forEach((Element element, Set<int> offsets) {
- List<int> sortedOffsets = offsets.toList();
+ var sortedOffsets = offsets.toList();
sortedOffsets.sort();
mergedOccurrences
.add(Occurrences(element, sortedOffsets, element.name.length));
@@ -393,31 +390,31 @@
List<Outline> mergeOutline(List<List<Outline>> partialResultList) {
/// Return a key encoding the unique attributes of the given [element].
String computeKey(Element element) {
- Location location = element.location;
+ var location = element.location;
if (location == null) {
throw StateError(
'Elements in an outline are expected to have a location');
}
- StringBuffer buffer = StringBuffer();
+ var buffer = StringBuffer();
buffer.write(location.offset);
buffer.write(';');
buffer.write(element.kind.name);
return buffer.toString();
}
- int count = partialResultList.length;
+ var count = partialResultList.length;
if (count == 0) {
return <Outline>[];
} else if (count == 1) {
return partialResultList[0];
}
- List<Outline> mergedOutlines = partialResultList[0].toList();
- Map<String, Outline> outlineMap = <String, Outline>{};
- Map<Outline, Outline> copyMap = <Outline, Outline>{};
+ var mergedOutlines = partialResultList[0].toList();
+ var outlineMap = <String, Outline>{};
+ var copyMap = <Outline, Outline>{};
/// Add the given [outline] and all of its children to the [outlineMap].
void addToMap(Outline outline) {
- String key = computeKey(outline.element);
+ var key = computeKey(outline.element);
if (outlineMap.containsKey(key)) {
// TODO(brianwilkerson) Decide how to handle this more gracefully.
throw StateError('Inconsistent outlines');
@@ -429,11 +426,11 @@
/// Merge the children of the [newOutline] into the list of children of the
/// [mergedOutline].
void mergeChildren(Outline mergedOutline, Outline newOutline) {
- for (Outline newChild in newOutline.children) {
- Outline mergedChild = outlineMap[computeKey(newChild.element)];
+ for (var newChild in newOutline.children) {
+ var mergedChild = outlineMap[computeKey(newChild.element)];
if (mergedChild == null) {
// The [newChild] isn't in the existing list.
- Outline copiedOutline = copyMap.putIfAbsent(
+ var copiedOutline = copyMap.putIfAbsent(
mergedOutline,
() => Outline(
mergedOutline.element,
@@ -451,9 +448,9 @@
}
mergedOutlines.forEach(addToMap);
- for (int i = 1; i < count; i++) {
- for (Outline outline in partialResultList[i]) {
- Outline mergedOutline = outlineMap[computeKey(outline.element)];
+ for (var i = 1; i < count; i++) {
+ for (var outline in partialResultList[i]) {
+ var mergedOutline = outlineMap[computeKey(outline.element)];
if (mergedOutline == null) {
// The [outline] does not correspond to any previously merged outline.
mergedOutlines.add(outline);
@@ -470,14 +467,14 @@
/// given [outline] item, re-building each item if any of its children have
/// been updated by the merge process.
Outline traverse(Outline outline) {
- Outline copiedOutline = copyMap[outline];
- bool isCopied = copiedOutline != null;
+ var copiedOutline = copyMap[outline];
+ var isCopied = copiedOutline != null;
copiedOutline ??= outline;
- List<Outline> currentChildren = copiedOutline.children;
+ var currentChildren = copiedOutline.children;
if (currentChildren == null || currentChildren.isEmpty) {
return outline;
}
- List<Outline> updatedChildren =
+ var updatedChildren =
currentChildren.map((Outline child) => traverse(child)).toList();
if (currentChildren != updatedChildren) {
if (!isCopied) {
@@ -495,7 +492,7 @@
return outline;
}
- for (int i = 0; i < mergedOutlines.length; i++) {
+ for (var i = 0; i < mergedOutlines.length; i++) {
mergedOutlines[i] = traverse(mergedOutlines[i]);
}
return mergedOutlines;
@@ -509,16 +506,14 @@
/// resulting list will contain duplications.
List<plugin.PrioritizedSourceChange> mergePrioritizedSourceChanges(
List<List<plugin.PrioritizedSourceChange>> partialResultList) {
- int count = partialResultList.length;
+ var count = partialResultList.length;
if (count == 0) {
return <plugin.PrioritizedSourceChange>[];
} else if (count == 1) {
return partialResultList[0];
}
- List<plugin.PrioritizedSourceChange> mergedChanges =
- <plugin.PrioritizedSourceChange>[];
- for (List<plugin.PrioritizedSourceChange> partialResults
- in partialResultList) {
+ var mergedChanges = <plugin.PrioritizedSourceChange>[];
+ for (var partialResults in partialResultList) {
mergedChanges.addAll(partialResults);
}
mergedChanges.sort((first, second) => first.priority - second.priority);
@@ -537,13 +532,13 @@
/// same type. If that expectation is violated, and exception might be thrown.
RefactoringFeedback mergeRefactoringFeedbacks(
List<RefactoringFeedback> feedbacks) {
- int count = feedbacks.length;
+ var count = feedbacks.length;
if (count == 0) {
return null;
} else if (count == 1) {
return feedbacks[0];
}
- RefactoringFeedback first = feedbacks[0];
+ var first = feedbacks[0];
if (first is ConvertGetterToMethodFeedback) {
// The feedbacks are empty, so there's nothing to merge.
return first;
@@ -551,18 +546,16 @@
// The feedbacks are empty, so there's nothing to merge.
return first;
} else if (first is ExtractLocalVariableFeedback) {
- List<int> coveringExpressionOffsets =
- first.coveringExpressionOffsets == null
- ? <int>[]
- : first.coveringExpressionOffsets.toList();
- List<int> coveringExpressionLengths =
- first.coveringExpressionLengths == null
- ? <int>[]
- : first.coveringExpressionLengths.toList();
- List<String> names = first.names.toList();
- List<int> offsets = first.offsets.toList();
- List<int> lengths = first.lengths.toList();
- for (int i = 1; i < count; i++) {
+ var coveringExpressionOffsets = first.coveringExpressionOffsets == null
+ ? <int>[]
+ : first.coveringExpressionOffsets.toList();
+ var coveringExpressionLengths = first.coveringExpressionLengths == null
+ ? <int>[]
+ : first.coveringExpressionLengths.toList();
+ var names = first.names.toList();
+ var offsets = first.offsets.toList();
+ var lengths = first.lengths.toList();
+ for (var i = 1; i < count; i++) {
ExtractLocalVariableFeedback feedback = feedbacks[i];
// TODO(brianwilkerson) This doesn't ensure that the covering data is in
// the right order and consistent.
@@ -572,7 +565,7 @@
if (feedback.coveringExpressionLengths != null) {
coveringExpressionLengths.addAll(feedback.coveringExpressionLengths);
}
- for (String name in feedback.names) {
+ for (var name in feedback.names) {
if (!names.contains(name)) {
names.add(name);
}
@@ -588,20 +581,20 @@
? null
: coveringExpressionLengths));
} else if (first is ExtractMethodFeedback) {
- int offset = first.offset;
- int length = first.length;
- String returnType = first.returnType;
- List<String> names = first.names.toList();
- bool canCreateGetter = first.canCreateGetter;
- List<RefactoringMethodParameter> parameters = first.parameters;
- List<int> offsets = first.offsets.toList();
- List<int> lengths = first.lengths.toList();
- for (int i = 1; i < count; i++) {
+ var offset = first.offset;
+ var length = first.length;
+ var returnType = first.returnType;
+ var names = first.names.toList();
+ var canCreateGetter = first.canCreateGetter;
+ var parameters = first.parameters;
+ var offsets = first.offsets.toList();
+ var lengths = first.lengths.toList();
+ for (var i = 1; i < count; i++) {
ExtractMethodFeedback feedback = feedbacks[i];
if (returnType.isEmpty) {
returnType = feedback.returnType;
}
- for (String name in feedback.names) {
+ for (var name in feedback.names) {
if (!names.contains(name)) {
names.add(name);
}
@@ -615,8 +608,8 @@
return ExtractMethodFeedback(offset, length, returnType, names.toList(),
canCreateGetter, parameters, offsets, lengths);
} else if (first is InlineLocalVariableFeedback) {
- int occurrences = first.occurrences;
- for (int i = 1; i < count; i++) {
+ var occurrences = first.occurrences;
+ for (var i = 1; i < count; i++) {
occurrences +=
(feedbacks[i] as InlineLocalVariableFeedback).occurrences;
}
@@ -644,14 +637,14 @@
/// the plugins, but will not contain duplicate elements.
List<RefactoringKind> mergeRefactoringKinds(
List<List<RefactoringKind>> partialResultList) {
- int count = partialResultList.length;
+ var count = partialResultList.length;
if (count == 0) {
return <RefactoringKind>[];
} else if (count == 1) {
return partialResultList[0];
}
Set<RefactoringKind> mergedKinds = HashSet<RefactoringKind>();
- for (List<RefactoringKind> partialResults in partialResultList) {
+ for (var partialResults in partialResultList) {
mergedKinds.addAll(partialResults);
}
return mergedKinds.toList();
@@ -684,30 +677,30 @@
/// a concatenation of the individual edits within each file, even if
/// multiple plugins contribute duplicate or conflicting edits.
SourceChange mergeChanges(List<SourceChange> changes) {
- int count = changes.length;
+ var count = changes.length;
if (count == 0) {
return null;
} else if (count == 1) {
return changes[0];
}
- SourceChange first = changes[0];
- String message = first.message;
- Map<String, SourceFileEdit> editMap = <String, SourceFileEdit>{};
- for (SourceFileEdit edit in first.edits) {
+ var first = changes[0];
+ var message = first.message;
+ var editMap = <String, SourceFileEdit>{};
+ for (var edit in first.edits) {
editMap[edit.file] = edit;
}
- List<LinkedEditGroup> linkedEditGroups = first.linkedEditGroups.toList();
- Position selection = first.selection;
- for (int i = 1; i < count; i++) {
- SourceChange change = changes[i];
- for (SourceFileEdit edit in change.edits) {
- SourceFileEdit mergedEdit = editMap[edit.file];
+ var linkedEditGroups = first.linkedEditGroups.toList();
+ var selection = first.selection;
+ for (var i = 1; i < count; i++) {
+ var change = changes[i];
+ for (var edit in change.edits) {
+ var mergedEdit = editMap[edit.file];
if (mergedEdit == null) {
editMap[edit.file] = edit;
} else {
// This doesn't detect if multiple plugins contribute the same (or
// conflicting) edits.
- List<SourceEdit> edits = mergedEdit.edits.toList();
+ var edits = mergedEdit.edits.toList();
edits.addAll(edit.edits);
editMap[edit.file] = SourceFileEdit(
mergedEdit.file, mergedEdit.fileStamp,
@@ -724,27 +717,27 @@
selection: selection);
}
- int count = partialResultList.length;
+ var count = partialResultList.length;
if (count == 0) {
return null;
} else if (count == 1) {
return partialResultList[0];
}
- EditGetRefactoringResult result = partialResultList[0];
- List<RefactoringProblem> initialProblems = result.initialProblems.toList();
- List<RefactoringProblem> optionsProblems = result.optionsProblems.toList();
- List<RefactoringProblem> finalProblems = result.finalProblems.toList();
- List<RefactoringFeedback> feedbacks = <RefactoringFeedback>[];
+ var result = partialResultList[0];
+ var initialProblems = result.initialProblems.toList();
+ var optionsProblems = result.optionsProblems.toList();
+ var finalProblems = result.finalProblems.toList();
+ var feedbacks = <RefactoringFeedback>[];
if (result.feedback != null) {
feedbacks.add(result.feedback);
}
- List<SourceChange> changes = <SourceChange>[];
+ var changes = <SourceChange>[];
if (result.change != null) {
changes.add(result.change);
}
- List<String> potentialEdits = result.potentialEdits.toList();
- for (int i = 1; i < count; i++) {
- EditGetRefactoringResult result = partialResultList[1];
+ var potentialEdits = result.potentialEdits.toList();
+ for (var i = 1; i < count; i++) {
+ var result = partialResultList[1];
initialProblems.addAll(result.initialProblems);
optionsProblems.addAll(result.optionsProblems);
finalProblems.addAll(result.finalProblems);
@@ -771,14 +764,14 @@
/// resulting list will contain duplications.
List<SourceChange> mergeSourceChanges(
List<List<SourceChange>> partialResultList) {
- int count = partialResultList.length;
+ var count = partialResultList.length;
if (count == 0) {
return <SourceChange>[];
} else if (count == 1) {
return partialResultList[0];
}
- List<SourceChange> mergedChanges = <SourceChange>[];
- for (List<SourceChange> partialResults in partialResultList) {
+ var mergedChanges = <SourceChange>[];
+ for (var partialResults in partialResultList) {
mergedChanges.addAll(partialResults);
}
return mergedChanges;
diff --git a/pkg/analysis_server/lib/src/protocol/protocol_internal.dart b/pkg/analysis_server/lib/src/protocol/protocol_internal.dart
index 6e6a93f..c7c93b7 100644
--- a/pkg/analysis_server/lib/src/protocol/protocol_internal.dart
+++ b/pkg/analysis_server/lib/src/protocol/protocol_internal.dart
@@ -25,8 +25,8 @@
/// Adds the given [sourceEdit] to the list in [sourceFileEdit].
void addEditForSource(SourceFileEdit sourceFileEdit, SourceEdit sourceEdit) {
- List<SourceEdit> edits = sourceFileEdit.edits;
- int index = 0;
+ var edits = sourceFileEdit.edits;
+ var index = 0;
while (index < edits.length && edits[index].offset > sourceEdit.offset) {
index++;
}
@@ -36,7 +36,7 @@
/// Adds [edit] to the [FileEdit] for the given [file].
void addEditToSourceChange(
SourceChange change, String file, int fileStamp, SourceEdit edit) {
- SourceFileEdit fileEdit = change.getFileEdit(file);
+ var fileEdit = change.getFileEdit(file);
if (fileEdit == null) {
fileEdit = SourceFileEdit(file, fileStamp);
change.addFileEdit(fileEdit);
@@ -65,7 +65,7 @@
/// Returns the [FileEdit] for the given [file], maybe `null`.
SourceFileEdit getChangeFileEdit(SourceChange change, String file) {
- for (SourceFileEdit fileEdit in change.edits) {
+ for (var fileEdit in change.edits) {
if (fileEdit.file == file) {
return fileEdit;
}
@@ -86,7 +86,7 @@
if (listA.length != listB.length) {
return false;
}
- for (int i = 0; i < listA.length; i++) {
+ for (var i = 0; i < listA.length; i++) {
if (!itemEqual(listA[i], listB[i])) {
return false;
}
@@ -166,7 +166,7 @@
/// Create a [RefactoringFeedback] corresponding the given [kind].
RefactoringFeedback refactoringFeedbackFromJson(
JsonDecoder jsonDecoder, String jsonPath, Object json, Map feedbackJson) {
- RefactoringKind kind = jsonDecoder.refactoringKind;
+ var kind = jsonDecoder.refactoringKind;
if (kind == RefactoringKind.EXTRACT_LOCAL_VARIABLE) {
return ExtractLocalVariableFeedback.fromJson(jsonDecoder, jsonPath, json);
}
@@ -240,7 +240,7 @@
@override
dynamic mismatch(String jsonPath, String expected, [Object actual]) {
- StringBuffer buffer = StringBuffer();
+ var buffer = StringBuffer();
buffer.write('Expected to be ');
buffer.write(expected);
if (actual != null) {
@@ -275,7 +275,7 @@
@override
dynamic mismatch(String jsonPath, String expected, [Object actual]) {
- StringBuffer buffer = StringBuffer();
+ var buffer = StringBuffer();
buffer.write('Expected ');
buffer.write(expected);
if (actual != null) {
diff --git a/pkg/analysis_server/lib/src/protocol_server.dart b/pkg/analysis_server/lib/src/protocol_server.dart
index 7ab9eea..391b46b 100644
--- a/pkg/analysis_server/lib/src/protocol_server.dart
+++ b/pkg/analysis_server/lib/src/protocol_server.dart
@@ -39,7 +39,7 @@
/// Adds [edit] to the file containing the given [element].
void doSourceChange_addElementEdit(
SourceChange change, engine.Element element, SourceEdit edit) {
- engine.Source source = element.source;
+ var source = element.source;
doSourceChange_addSourceEdit(change, source, edit);
}
@@ -47,7 +47,7 @@
void doSourceChange_addSourceEdit(
SourceChange change, engine.Source source, SourceEdit edit,
{bool isNewFile = false}) {
- String file = source.fullName;
+ var file = source.fullName;
change.addEdit(file, isNewFile ? -1 : 0, edit);
}
@@ -59,7 +59,7 @@
return element.returnType?.getDisplayString(withNullability: false);
}
} else if (element is engine.VariableElement) {
- engine.DartType type = element.type;
+ var type = element.type;
return type != null
? type.getDisplayString(withNullability: false)
: 'dynamic';
@@ -78,14 +78,12 @@
T Function(engine.ResolvedUnitResult result, engine.AnalysisError error,
[engine.ErrorSeverity errorSeverity])
constructor) {
- engine.AnalysisOptions analysisOptions =
- result.session.analysisContext.analysisOptions;
- List<T> serverErrors = <T>[];
- for (engine.AnalysisError error in errors) {
- ErrorProcessor processor =
- ErrorProcessor.getProcessor(analysisOptions, error);
+ var analysisOptions = result.session.analysisContext.analysisOptions;
+ var serverErrors = <T>[];
+ for (var error in errors) {
+ var processor = ErrorProcessor.getProcessor(analysisOptions, error);
if (processor != null) {
- engine.ErrorSeverity severity = processor.severity;
+ var severity = processor.severity;
// Errors with null severity are filtered out.
if (severity != null) {
// Specified severities override.
@@ -104,16 +102,16 @@
AnalysisError newAnalysisError_fromEngine(
engine.ResolvedUnitResult result, engine.AnalysisError error,
[engine.ErrorSeverity errorSeverity]) {
- engine.ErrorCode errorCode = error.errorCode;
+ var errorCode = error.errorCode;
// prepare location
Location location;
{
- String file = error.source.fullName;
- int offset = error.offset;
- int length = error.length;
- int startLine = -1;
- int startColumn = -1;
- engine.LineInfo lineInfo = result.lineInfo;
+ var file = error.source.fullName;
+ var offset = error.offset;
+ var length = error.length;
+ var startLine = -1;
+ var startColumn = -1;
+ var lineInfo = result.lineInfo;
if (lineInfo != null) {
CharacterLocation lineLocation = lineInfo.getLocation(offset);
if (lineLocation != null) {
@@ -130,17 +128,17 @@
// done
var severity = AnalysisErrorSeverity(errorSeverity.name);
var type = AnalysisErrorType(errorCode.type.name);
- String message = error.message;
- String code = errorCode.name.toLowerCase();
+ var message = error.message;
+ var code = errorCode.name.toLowerCase();
List<DiagnosticMessage> contextMessages;
if (error.contextMessages.isNotEmpty) {
contextMessages = error.contextMessages
.map((message) => newDiagnosticMessage(result, message))
.toList();
}
- String correction = error.correction;
- bool fix = hasFix(error.errorCode);
- String url = errorCode.url;
+ var correction = error.correction;
+ var fix = hasFix(error.errorCode);
+ var url = errorCode.url;
return AnalysisError(severity, type, location, message, code,
contextMessages: contextMessages,
correction: correction,
@@ -151,12 +149,12 @@
/// Create a DiagnosticMessage based on an [engine.DiagnosticMessage].
DiagnosticMessage newDiagnosticMessage(
engine.ResolvedUnitResult result, engine.DiagnosticMessage message) {
- String file = message.filePath;
- int offset = message.offset;
- int length = message.length;
- int startLine = -1;
- int startColumn = -1;
- engine.LineInfo lineInfo = result.session.getFile(file).lineInfo;
+ var file = message.filePath;
+ var offset = message.offset;
+ var length = message.length;
+ var startLine = -1;
+ var startColumn = -1;
+ var lineInfo = result.session.getFile(file).lineInfo;
if (lineInfo != null) {
CharacterLocation lineLocation = lineInfo.getLocation(offset);
if (lineLocation != null) {
@@ -173,30 +171,29 @@
if (element == null || element.source == null) {
return null;
}
- int offset = element.nameOffset;
- int length = element.nameLength;
+ var offset = element.nameOffset;
+ var length = element.nameLength;
if (element is engine.CompilationUnitElement ||
(element is engine.LibraryElement && offset < 0)) {
offset = 0;
length = 0;
}
- engine.CompilationUnitElement unitElement = _getUnitElement(element);
- engine.SourceRange range = engine.SourceRange(offset, length);
+ var unitElement = _getUnitElement(element);
+ var range = engine.SourceRange(offset, length);
return _locationForArgs(unitElement, range);
}
/// Create a Location based on an [engine.SearchMatch].
Location newLocation_fromMatch(engine.SearchMatch match) {
- engine.CompilationUnitElement unitElement = _getUnitElement(match.element);
+ var unitElement = _getUnitElement(match.element);
return _locationForArgs(unitElement, match.sourceRange);
}
/// Create a Location based on an [engine.AstNode].
Location newLocation_fromNode(engine.AstNode node) {
- engine.CompilationUnit unit =
- node.thisOrAncestorOfType<engine.CompilationUnit>();
- engine.CompilationUnitElement unitElement = unit.declaredElement;
- engine.SourceRange range = engine.SourceRange(node.offset, node.length);
+ var unit = node.thisOrAncestorOfType<engine.CompilationUnit>();
+ var unitElement = unit.declaredElement;
+ var range = engine.SourceRange(node.offset, node.length);
return _locationForArgs(unitElement, range);
}
@@ -208,16 +205,16 @@
/// Construct based on an element from the analyzer engine.
OverriddenMember newOverriddenMember_fromEngine(engine.Element member) {
- Element element = convertElement(member);
- String className = member.enclosingElement.displayName;
+ var element = convertElement(member);
+ var className = member.enclosingElement.displayName;
return OverriddenMember(element, className);
}
/// Construct based on a value from the search engine.
SearchResult newSearchResult_fromMatch(engine.SearchMatch match) {
- SearchResultKind kind = newSearchResultKind_fromEngine(match.kind);
- Location location = newLocation_fromMatch(match);
- List<Element> path = _computePath(match.element);
+ var kind = newSearchResultKind_fromEngine(match.kind);
+ var location = newLocation_fromMatch(match);
+ var path = _computePath(match.element);
return SearchResult(location, kind, !match.isResolved, path);
}
@@ -251,7 +248,7 @@
}
List<Element> _computePath(engine.Element element) {
- List<Element> path = <Element>[];
+ var path = <Element>[];
while (element != null) {
path.add(convertElement(element));
// go up
@@ -287,10 +284,10 @@
/// Creates a new [Location].
Location _locationForArgs(
engine.CompilationUnitElement unitElement, engine.SourceRange range) {
- int startLine = 0;
- int startColumn = 0;
+ var startLine = 0;
+ var startColumn = 0;
try {
- engine.LineInfo lineInfo = unitElement.lineInfo;
+ var lineInfo = unitElement.lineInfo;
if (lineInfo != null) {
CharacterLocation offsetLocation = lineInfo.getLocation(range.offset);
startLine = offsetLocation.lineNumber;
diff --git a/pkg/analysis_server/lib/src/search/element_references.dart b/pkg/analysis_server/lib/src/search/element_references.dart
index f1e06ad..4b34793 100644
--- a/pkg/analysis_server/lib/src/search/element_references.dart
+++ b/pkg/analysis_server/lib/src/search/element_references.dart
@@ -21,16 +21,15 @@
Element element, bool withPotential) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- List<SearchResult> results = <SearchResult>[];
+ var results = <SearchResult>[];
// Add element references.
results.addAll(await _findElementsReferences(element));
// Add potential references.
if (withPotential && _isMemberElement(element)) {
- String name = element.displayName;
- List<SearchMatch> matches =
- await searchEngine.searchMemberReferences(name);
+ var name = element.displayName;
+ var matches = await searchEngine.searchMemberReferences(name);
matches = SearchMatch.withNotNullElement(matches);
results.addAll(matches.where((match) => !match.isResolved).map(toResult));
}
@@ -43,11 +42,10 @@
Future<List<SearchResult>> _findElementsReferences(Element element) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- List<SearchResult> allResults = <SearchResult>[];
- Iterable<Element> refElements = await _getRefElements(element);
- for (Element refElement in refElements) {
- List<SearchResult> elementResults =
- await _findSingleElementReferences(refElement);
+ var allResults = <SearchResult>[];
+ var refElements = await _getRefElements(element);
+ for (var refElement in refElements) {
+ var elementResults = await _findSingleElementReferences(refElement);
allResults.addAll(elementResults);
}
return allResults;
@@ -58,7 +56,7 @@
Element element) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- List<SearchMatch> matches = await searchEngine.searchReferences(element);
+ var matches = await searchEngine.searchReferences(element);
matches = SearchMatch.withNotNullElement(matches);
return matches.map(toResult).toList();
}
diff --git a/pkg/analysis_server/lib/src/search/search_domain.dart b/pkg/analysis_server/lib/src/search/search_domain.dart
index d37b303..5ddaa75 100644
--- a/pkg/analysis_server/lib/src/search/search_domain.dart
+++ b/pkg/analysis_server/lib/src/search/search_domain.dart
@@ -36,9 +36,9 @@
await null;
var params =
protocol.SearchFindElementReferencesParams.fromRequest(request);
- String file = params.file;
+ var file = params.file;
// prepare element
- Element element = await server.getElementAtOffset(file, params.offset);
+ var element = await server.getElementAtOffset(file, params.offset);
if (element is ImportElement) {
element = (element as ImportElement).prefix;
}
@@ -49,7 +49,7 @@
element = (element as PropertyAccessorElement).variable;
}
// respond
- String searchId = (_nextSearchId++).toString();
+ var searchId = (_nextSearchId++).toString();
var result = protocol.SearchFindElementReferencesResult();
if (element != null) {
result.id = searchId;
@@ -59,8 +59,7 @@
// search elements
if (element != null) {
var computer = ElementReferencesComputer(searchEngine);
- List<protocol.SearchResult> results =
- await computer.compute(element, params.includePotential);
+ var results = await computer.compute(element, params.includePotential);
_sendSearchNotification(searchId, true, results);
}
}
@@ -72,12 +71,11 @@
protocol.SearchFindMemberDeclarationsParams.fromRequest(request);
await server.onAnalysisComplete;
// respond
- String searchId = (_nextSearchId++).toString();
+ var searchId = (_nextSearchId++).toString();
_sendSearchResult(
request, protocol.SearchFindMemberDeclarationsResult(searchId));
// search
- List<SearchMatch> matches =
- await searchEngine.searchMemberDeclarations(params.name);
+ var matches = await searchEngine.searchMemberDeclarations(params.name);
matches = SearchMatch.withNotNullElement(matches);
_sendSearchNotification(searchId, true, matches.map(toResult));
}
@@ -88,12 +86,11 @@
var params = protocol.SearchFindMemberReferencesParams.fromRequest(request);
await server.onAnalysisComplete;
// respond
- String searchId = (_nextSearchId++).toString();
+ var searchId = (_nextSearchId++).toString();
_sendSearchResult(
request, protocol.SearchFindMemberReferencesResult(searchId));
// search
- List<SearchMatch> matches =
- await searchEngine.searchMemberReferences(params.name);
+ var matches = await searchEngine.searchMemberReferences(params.name);
matches = SearchMatch.withNotNullElement(matches);
_sendSearchNotification(searchId, true, matches.map(toResult));
}
@@ -114,12 +111,11 @@
await server.onAnalysisComplete;
// respond
- String searchId = (_nextSearchId++).toString();
+ var searchId = (_nextSearchId++).toString();
_sendSearchResult(
request, protocol.SearchFindTopLevelDeclarationsResult(searchId));
// search
- List<SearchMatch> matches =
- await searchEngine.searchTopLevelDeclarations(params.pattern);
+ var matches = await searchEngine.searchTopLevelDeclarations(params.pattern);
matches = SearchMatch.withNotNullElement(matches);
_sendSearchNotification(searchId, true, matches.map(toResult));
}
@@ -177,7 +173,7 @@
var tracker = server.declarationsTracker;
var files = <String>{};
- int remainingMaxResults = params.maxResults;
+ var remainingMaxResults = params.maxResults;
var declarations = search.WorkspaceSymbols(tracker).declarations(
regExp,
remainingMaxResults,
@@ -185,8 +181,7 @@
onlyForFile: params.file,
);
- List<protocol.ElementDeclaration> elementDeclarations =
- declarations.map((declaration) {
+ var elementDeclarations = declarations.map((declaration) {
return protocol.ElementDeclaration(
declaration.name,
getElementKind(declaration.kind),
@@ -211,38 +206,35 @@
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
var params = protocol.SearchGetTypeHierarchyParams.fromRequest(request);
- String file = params.file;
+ var file = params.file;
// prepare element
- Element element = await server.getElementAtOffset(file, params.offset);
+ var element = await server.getElementAtOffset(file, params.offset);
if (element == null) {
_sendTypeHierarchyNull(request);
return;
}
// maybe supertype hierarchy only
if (params.superOnly == true) {
- TypeHierarchyComputer computer =
- TypeHierarchyComputer(searchEngine, element);
- List<protocol.TypeHierarchyItem> items = computer.computeSuper();
- protocol.Response response =
+ var computer = TypeHierarchyComputer(searchEngine, element);
+ var items = computer.computeSuper();
+ var response =
protocol.SearchGetTypeHierarchyResult(hierarchyItems: items)
.toResponse(request.id);
server.sendResponse(response);
return;
}
// prepare type hierarchy
- TypeHierarchyComputer computer =
- TypeHierarchyComputer(searchEngine, element);
- List<protocol.TypeHierarchyItem> items = await computer.compute();
- protocol.Response response =
- protocol.SearchGetTypeHierarchyResult(hierarchyItems: items)
- .toResponse(request.id);
+ var computer = TypeHierarchyComputer(searchEngine, element);
+ var items = await computer.compute();
+ var response = protocol.SearchGetTypeHierarchyResult(hierarchyItems: items)
+ .toResponse(request.id);
server.sendResponse(response);
}
@override
protocol.Response handleRequest(protocol.Request request) {
try {
- String requestName = request.method;
+ var requestName = request.method;
if (requestName == SEARCH_REQUEST_FIND_ELEMENT_REFERENCES) {
findElementReferences(request);
return protocol.Response.DELAYED_RESPONSE;
@@ -282,7 +274,7 @@
}
void _sendTypeHierarchyNull(protocol.Request request) {
- protocol.Response response =
+ var response =
protocol.SearchGetTypeHierarchyResult().toResponse(request.id);
server.sendResponse(response);
}
diff --git a/pkg/analysis_server/lib/src/search/type_hierarchy.dart b/pkg/analysis_server/lib/src/search/type_hierarchy.dart
index 49355c1..91c2a9b 100644
--- a/pkg/analysis_server/lib/src/search/type_hierarchy.dart
+++ b/pkg/analysis_server/lib/src/search/type_hierarchy.dart
@@ -33,7 +33,7 @@
_pivotKind = _pivotElement.kind;
_pivotName = _pivotElement.name;
// try to find enclosing ClassElement
- Element element = _pivotElement;
+ var element = _pivotElement;
if (_pivotElement is FieldElement) {
_pivotFieldFinal = (_pivotElement as FieldElement).isFinal;
element = _pivotElement.enclosingElement;
@@ -68,23 +68,23 @@
Future _createSubclasses(
TypeHierarchyItem item, int itemId, ClassElement classElement) async {
var subElements = await getDirectSubClasses(_searchEngine, classElement);
- List<int> subItemIds = <int>[];
- for (ClassElement subElement in subElements) {
+ var subItemIds = <int>[];
+ for (var subElement in subElements) {
// check for recursion
- TypeHierarchyItem subItem = _elementItemMap[subElement];
+ var subItem = _elementItemMap[subElement];
if (subItem != null) {
- int id = _items.indexOf(subItem);
+ var id = _items.indexOf(subItem);
item.subclasses.add(id);
continue;
}
// create a subclass item
- ExecutableElement subMemberElement = _findMemberElement(subElement);
+ var subMemberElement = _findMemberElement(subElement);
subItem = TypeHierarchyItem(convertElement(subElement),
memberElement: subMemberElement != null
? convertElement(subMemberElement)
: null,
superclass: itemId);
- int subItemId = _items.length;
+ var subItemId = _items.length;
// remember
_elementItemMap[subElement] = subItem;
_items.add(subItem);
@@ -94,9 +94,9 @@
subItemIds.add(subItemId);
}
// compute subclasses of subclasses
- for (int subItemId in subItemIds) {
- TypeHierarchyItem subItem = _items[subItemId];
- ClassElement subItemElement = _itemClassElements[subItemId];
+ for (var subItemId in subItemIds) {
+ var subItem = _items[subItemId];
+ var subItemElement = _itemClassElements[subItemId];
await _createSubclasses(subItem, subItemId, subItemElement);
}
}
@@ -104,7 +104,7 @@
int _createSuperItem(
ClassElement classElement, List<DartType> typeArguments) {
// check for recursion
- TypeHierarchyItem item = _elementItemMap[classElement];
+ var item = _elementItemMap[classElement];
if (item != null) {
return _items.indexOf(item);
}
@@ -118,7 +118,7 @@
.join(', ');
displayName = classElement.displayName + '<' + typeArgumentsStr + '>';
}
- ExecutableElement memberElement = _findMemberElement(classElement);
+ var memberElement = _findMemberElement(classElement);
item = TypeHierarchyItem(convertElement(classElement),
displayName: displayName,
memberElement:
@@ -130,7 +130,7 @@
}
// superclass
{
- InterfaceType superType = classElement.supertype;
+ var superType = classElement.supertype;
if (superType != null) {
item.superclass = _createSuperItem(
superType.element,
@@ -140,12 +140,12 @@
}
// mixins
classElement.mixins.forEach((InterfaceType type) {
- int id = _createSuperItem(type.element, type.typeArguments);
+ var id = _createSuperItem(type.element, type.typeArguments);
item.mixins.add(id);
});
// interfaces
classElement.interfaces.forEach((InterfaceType type) {
- int id = _createSuperItem(type.element, type.typeArguments);
+ var id = _createSuperItem(type.element, type.typeArguments);
item.interfaces.add(id);
});
// done
@@ -171,8 +171,8 @@
return result;
}
// try to find in the class mixin
- for (InterfaceType mixin in clazz.mixins.reversed) {
- ClassElement mixinElement = mixin.element;
+ for (var mixin in clazz.mixins.reversed) {
+ var mixinElement = mixin.element;
if (_pivotKind == ElementKind.METHOD) {
result = mixinElement.lookUpMethod(_pivotName, _pivotLibrary);
} else if (_pivotKind == ElementKind.GETTER) {
diff --git a/pkg/analysis_server/lib/src/server/crash_reporting.dart b/pkg/analysis_server/lib/src/server/crash_reporting.dart
index 247f064..879adbc 100644
--- a/pkg/analysis_server/lib/src/server/crash_reporting.dart
+++ b/pkg/analysis_server/lib/src/server/crash_reporting.dart
@@ -26,7 +26,7 @@
if (exception is CaughtException) {
// Get the root CaughtException, which matters most for debugging.
- CaughtException root = exception.rootCaughtException;
+ var root = exception.rootCaughtException;
reporter
.sendReport(root.exception, root.stackTrace,
@@ -52,7 +52,7 @@
) {
// TODO(devoncarew): Temporarily disabled; re-enable after deciding on a
// plan of action for the AngularDart analysis plugin.
- const String angularPluginName = 'Angular Analysis Plugin';
+ const angularPluginName = 'Angular Analysis Plugin';
if (plugin.name == angularPluginName) {
return;
}
diff --git a/pkg/analysis_server/lib/src/server/dev_server.dart b/pkg/analysis_server/lib/src/server/dev_server.dart
index e8358b5..0a1593d 100644
--- a/pkg/analysis_server/lib/src/server/dev_server.dart
+++ b/pkg/analysis_server/lib/src/server/dev_server.dart
@@ -39,16 +39,16 @@
/// Return a future that will be completed with an exit code when analysis
/// finishes.
Future<int> processDirectories(List<String> directories) async {
- final String bold = _terminalSupportsAnsi ? '\u001b[1m' : '';
- final String none = _terminalSupportsAnsi ? '\u001b[0m' : '';
+ var bold = _terminalSupportsAnsi ? '\u001b[1m' : '';
+ var none = _terminalSupportsAnsi ? '\u001b[0m' : '';
print('Analyzing ${directories.join(', ')}...');
- Stopwatch timer = Stopwatch()..start();
+ var timer = Stopwatch()..start();
- Completer<int> whenComplete = Completer();
+ var whenComplete = Completer<int>();
- int exitCode = 0;
+ var exitCode = 0;
void handleStatusNotification(Notification notification) {
Map<String, dynamic> params = notification.params;
@@ -56,7 +56,7 @@
bool isAnalyzing = params['analysis']['isAnalyzing'];
if (!isAnalyzing) {
timer.stop();
- double seconds = timer.elapsedMilliseconds / 1000.0;
+ var seconds = timer.elapsedMilliseconds / 1000.0;
print('Completed in ${seconds.toStringAsFixed(1)}s.');
whenComplete.complete(exitCode);
}
@@ -73,7 +73,7 @@
filePath = path.relative(filePath);
- for (Map error in errors) {
+ for (var error in errors) {
if (error['type'] == 'TODO') {
continue;
}
@@ -115,7 +115,7 @@
whenComplete.completeError(message);
}
- StreamSubscription<Notification> notificationSubscriptions =
+ var notificationSubscriptions =
_channel.onNotification.listen((Notification notification) {
if (notification.event == 'server.status') {
handleStatusNotification(notification);
@@ -186,7 +186,7 @@
}
Future<Response> sendRequest(Request request) {
- Completer<Response> completer = Completer();
+ var completer = Completer<Response>();
_responseCompleters[request.id] = completer;
_requestController.add(request);
return completer.future;
@@ -194,7 +194,7 @@
@override
void sendResponse(Response response) {
- Completer<Response> completer = _responseCompleters.remove(response.id);
+ var completer = _responseCompleters.remove(response.id);
completer?.complete(response);
}
}
diff --git a/pkg/analysis_server/lib/src/server/driver.dart b/pkg/analysis_server/lib/src/server/driver.dart
index fbd4731..3d14a00 100644
--- a/pkg/analysis_server/lib/src/server/driver.dart
+++ b/pkg/analysis_server/lib/src/server/driver.dart
@@ -5,6 +5,7 @@
import 'dart:async';
import 'dart:ffi' as ffi;
import 'dart:io';
+import 'dart:isolate';
import 'dart:math';
import 'package:analysis_server/protocol/protocol_constants.dart'
@@ -19,6 +20,7 @@
import 'package:analysis_server/src/server/error_notifier.dart';
import 'package:analysis_server/src/server/features.dart';
import 'package:analysis_server/src/server/http_server.dart';
+import 'package:analysis_server/src/server/isolate_analysis_server.dart';
import 'package:analysis_server/src/server/lsp_stdio_server.dart';
import 'package:analysis_server/src/server/sdk_configuration.dart';
import 'package:analysis_server/src/server/stdio_server.dart';
@@ -135,10 +137,10 @@
List<String> parseDefinedVariables(
List<String> args, Map<String, String> definedVariables) {
- int count = args.length;
- List<String> remainingArgs = <String>[];
- for (int i = 0; i < count; i++) {
- String arg = args[i];
+ var count = args.length;
+ var remainingArgs = <String>[];
+ for (var i = 0; i < count; i++) {
+ var arg = args[i];
if (arg == '--') {
while (i < count) {
remainingArgs.add(args[i++]);
@@ -159,17 +161,17 @@
// Only filter args if the ignore flag is specified.
if (args.contains('--ignore-unrecognized-flags')) {
// Filter all unrecognized flags and options.
- List<String> filtered = <String>[];
- for (int i = 0; i < args.length; ++i) {
- String arg = args[i];
+ var filtered = <String>[];
+ for (var i = 0; i < args.length; ++i) {
+ var arg = args[i];
if (arg.startsWith('--') && arg.length > 2) {
- String option = arg.substring(2);
+ var option = arg.substring(2);
// remove any leading 'no-'
if (option.startsWith('no-')) {
option = option.substring(3);
}
// strip the last '=value'
- int equalsOffset = option.lastIndexOf('=');
+ var equalsOffset = option.lastIndexOf('=');
if (equalsOffset != -1) {
option = option.substring(0, equalsOffset);
}
@@ -217,6 +219,10 @@
/// The name of the option used to enable DartPad specific functionality.
static const String DARTPAD_OPTION = 'dartpad';
+ /// The name of the option used to disable exception handling.
+ static const String DISABLE_SERVER_EXCEPTION_HANDLING =
+ 'disable-server-exception-handling';
+
/// The name of the option to disable the completion feature.
static const String DISABLE_SERVER_FEATURE_COMPLETION =
'disable-server-feature-completion';
@@ -305,12 +311,15 @@
Driver();
/// Use the given command-line [arguments] to start this server.
+ ///
+ /// If [sendPort] is not null, assumes this is launched in an isolate and will
+ /// connect to the original isolate via an [IsolateChannel].
@override
- void start(List<String> arguments) {
- CommandLineParser parser = _createArgParser();
- ArgResults results = parser.parse(arguments, <String, String>{});
+ void start(List<String> arguments, [SendPort sendPort]) {
+ var parser = _createArgParser();
+ var results = parser.parse(arguments, <String, String>{});
- AnalysisServerOptions analysisServerOptions = AnalysisServerOptions();
+ var analysisServerOptions = AnalysisServerOptions();
analysisServerOptions.useAnalysisHighlight2 =
results[USE_ANALYSIS_HIGHLIGHT2];
analysisServerOptions.fileReadMode = results[FILE_READ_MODE];
@@ -328,7 +337,7 @@
analysisServerOptions.useNewRelevance = results[USE_NEW_RELEVANCE];
// Read in any per-SDK overrides specified in <sdk>/config/settings.json.
- SdkConfiguration sdkConfig = SdkConfiguration.readFromSdk();
+ var sdkConfig = SdkConfiguration.readFromSdk();
analysisServerOptions.configurationOverrides = sdkConfig;
// ML model configuration.
@@ -380,7 +389,7 @@
analytics.setSessionValue('cd1', analysisServerOptions.clientVersion);
}
- final EnablementCallback shouldSendCallback = () {
+ var shouldSendCallback = () {
// Check sdkConfig to optionally force reporting on.
if (sdkConfig.crashReportingForceEnabled == true) {
return true;
@@ -431,20 +440,21 @@
// TODO(brianwilkerson) It would be nice to avoid creating an SDK that
// cannot be re-used, but the SDK is needed to create a package map provider
// in the case where we need to run `pub` in order to get the package map.
- DartSdk defaultSdk = _createDefaultSdk(defaultSdkPath, true);
+ var defaultSdk = _createDefaultSdk(defaultSdkPath, true);
//
// Initialize the instrumentation service.
//
String logFilePath = results[INSTRUMENTATION_LOG_FILE];
- List<InstrumentationService> allInstrumentationServices =
- instrumentationService == null ? [] : [instrumentationService];
+ var allInstrumentationServices = instrumentationService == null
+ ? <InstrumentationService>[]
+ : [instrumentationService];
if (logFilePath != null) {
_rollLogFiles(logFilePath, 5);
allInstrumentationServices.add(
InstrumentationLogAdapter(FileInstrumentationLogger(logFilePath)));
}
- ErrorNotifier errorNotifier = ErrorNotifier();
+ var errorNotifier = ErrorNotifier();
allInstrumentationServices
.add(CrashReportingInstrumentation(crashReportSender));
instrumentationService =
@@ -474,6 +484,10 @@
}
if (analysisServerOptions.useLanguageServerProtocol) {
+ if (sendPort != null) {
+ throw UnimplementedError(
+ 'Isolate usage not implemented for LspAnalysisServer');
+ }
startLspServer(results, analysisServerOptions, dartSdkManager,
instrumentationService, diagnosticServerPort, errorNotifier);
} else {
@@ -487,7 +501,8 @@
RequestStatisticsHelper(),
analytics,
diagnosticServerPort,
- errorNotifier);
+ errorNotifier,
+ sendPort);
}
}
@@ -502,7 +517,11 @@
telemetry.Analytics analytics,
int diagnosticServerPort,
ErrorNotifier errorNotifier,
+ SendPort sendPort,
) {
+ var capture = results[DISABLE_SERVER_EXCEPTION_HANDLING]
+ ? (_, Function f, {Function(String) print}) => f()
+ : _captureExceptions;
String trainDirectory = results[TRAIN_USING];
if (trainDirectory != null) {
if (!FileSystemEntity.isDirectorySync(trainDirectory)) {
@@ -518,7 +537,7 @@
//
linter.registerLintRules();
- _DiagnosticServerImpl diagnosticServer = _DiagnosticServerImpl();
+ var diagnosticServer = _DiagnosticServerImpl();
// Ping analytics with our initial call.
analytics.sendScreenView('home');
@@ -544,17 +563,21 @@
}
if (trainDirectory != null) {
- Directory tempDriverDir =
+ if (sendPort != null) {
+ throw UnimplementedError(
+ 'isolate usage not supported for DevAnalysisServer');
+ }
+ var tempDriverDir =
Directory.systemTemp.createTempSync('analysis_server_');
analysisServerOptions.cacheFolder = tempDriverDir.path;
- DevAnalysisServer devServer = DevAnalysisServer(socketServer);
+ var devServer = DevAnalysisServer(socketServer);
devServer.initServer();
() async {
// We first analyze code with an empty driver cache.
print('Analyzing with an empty driver cache:');
- int exitCode = await devServer.processDirectories([trainDirectory]);
+ var exitCode = await devServer.processDirectories([trainDirectory]);
if (exitCode != 0) exit(exitCode);
print('');
@@ -580,9 +603,16 @@
exit(exitCode);
}();
} else {
- _captureExceptions(instrumentationService, () {
- StdioAnalysisServer stdioServer = StdioAnalysisServer(socketServer);
- stdioServer.serveStdio().then((_) async {
+ capture(instrumentationService, () {
+ Future serveResult;
+ if (sendPort == null) {
+ var stdioServer = StdioAnalysisServer(socketServer);
+ serveResult = stdioServer.serveStdio();
+ } else {
+ var isolateAnalysisServer = IsolateAnalysisServer(socketServer);
+ serveResult = isolateAnalysisServer.serveIsolate(sendPort);
+ }
+ serveResult.then((_) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
@@ -591,7 +621,7 @@
}
await instrumentationService.shutdown();
socketServer.analysisServer.shutdown();
- exit(0);
+ if (sendPort == null) exit(0);
});
startCompletionRanking(socketServer, null, analysisServerOptions);
},
@@ -639,11 +669,14 @@
int diagnosticServerPort,
ErrorNotifier errorNotifier,
) {
+ var capture = args[DISABLE_SERVER_EXCEPTION_HANDLING]
+ ? (_, Function f, {Function(String) print}) => f()
+ : _captureExceptions;
final serve_http = diagnosticServerPort != null;
linter.registerLintRules();
- _DiagnosticServerImpl diagnosticServer = _DiagnosticServerImpl();
+ var diagnosticServer = _DiagnosticServerImpl();
final socketServer = LspSocketServer(
analysisServerOptions,
@@ -660,8 +693,8 @@
diagnosticServer.startOnPort(diagnosticServerPort);
}
- _captureExceptions(instrumentationService, () {
- LspStdioAnalysisServer stdioServer = LspStdioAnalysisServer(socketServer);
+ capture(instrumentationService, () {
+ var stdioServer = LspStdioAnalysisServer(socketServer);
stdioServer.serveStdio().then((_) async {
// Only shutdown the server and exit if the server is not already
// handling the shutdown.
@@ -678,8 +711,8 @@
/// exceptions and both report them to the client and send them to the given
/// instrumentation [service]. If a [print] function is provided, then also
/// capture any data printed by the callback and redirect it to the function.
- dynamic _captureExceptions(
- InstrumentationService service, dynamic Function() callback,
+ void _captureExceptions(
+ InstrumentationService service, void Function() callback,
{void Function(String line) print}) {
void errorFunction(Zone self, ZoneDelegate parent, Zone zone,
dynamic exception, StackTrace stackTrace) {
@@ -694,14 +727,14 @@
// reserved for communication to the client.
print(line);
};
- ZoneSpecification zoneSpecification = ZoneSpecification(
+ var zoneSpecification = ZoneSpecification(
handleUncaughtError: errorFunction, print: printFunction);
return runZoned(callback, zoneSpecification: zoneSpecification);
}
/// Create and return the parser used to parse the command-line arguments.
CommandLineParser _createArgParser() {
- CommandLineParser parser = CommandLineParser();
+ var parser = CommandLineParser();
parser.addOption(CLIENT_ID,
help: 'an identifier used to identify the client');
parser.addOption(CLIENT_VERSION, help: 'the version of the client');
@@ -709,6 +742,13 @@
help: 'enable DartPad specific functionality',
defaultsTo: false,
hide: true);
+ parser.addFlag(DISABLE_SERVER_EXCEPTION_HANDLING,
+ // TODO(jcollins-g): Pipeline option through and apply to all
+ // exception-nullifying runZoned() calls.
+ help: 'disable analyzer exception capture for interactive debugging '
+ 'of the server',
+ defaultsTo: false,
+ hide: true);
parser.addFlag(DISABLE_SERVER_FEATURE_COMPLETION,
help: 'disable all completion features', defaultsTo: false, hide: true);
parser.addFlag(DISABLE_SERVER_FEATURE_SEARCH,
@@ -787,9 +827,8 @@
}
DartSdk _createDefaultSdk(String defaultSdkPath, bool useSummaries) {
- PhysicalResourceProvider resourceProvider =
- PhysicalResourceProvider.INSTANCE;
- FolderBasedDartSdk sdk = FolderBasedDartSdk(
+ var resourceProvider = PhysicalResourceProvider.INSTANCE;
+ var sdk = FolderBasedDartSdk(
resourceProvider, resourceProvider.getFolder(defaultSdkPath));
sdk.useSummary = useSummaries;
return sdk;
@@ -797,8 +836,8 @@
/// Constructs a uuid combining the current date and a random integer.
String _generateUuidString() {
- int millisecondsSinceEpoch = DateTime.now().millisecondsSinceEpoch;
- int random = Random().nextInt(0x3fffffff);
+ var millisecondsSinceEpoch = DateTime.now().millisecondsSinceEpoch;
+ var random = Random().nextInt(0x3fffffff);
return '$millisecondsSinceEpoch$random';
}
@@ -841,10 +880,10 @@
if (instrumentationLocation == null) {
return _generateUuidString();
}
- File uuidFile = File(instrumentationLocation.getChild('uuid.txt').path);
+ var uuidFile = File(instrumentationLocation.getChild('uuid.txt').path);
try {
if (uuidFile.existsSync()) {
- String uuid = uuidFile.readAsStringSync();
+ var uuid = uuidFile.readAsStringSync();
if (uuid != null && uuid.length > 5) {
return uuid;
}
@@ -852,7 +891,7 @@
} catch (exception, stackTrace) {
service.logException(exception, stackTrace);
}
- String uuid = _generateUuidString();
+ var uuid = _generateUuidString();
try {
uuidFile.parent.createSync(recursive: true);
uuidFile.writeAsStringSync(uuid);
@@ -870,9 +909,9 @@
/// Keep at most [numOld] files.
/// Rename the file with the given [path] to `[path].1`.
static void _rollLogFiles(String path, int numOld) {
- for (int i = numOld - 1; i >= 0; i--) {
+ for (var i = numOld - 1; i >= 0; i--) {
try {
- String oldPath = i == 0 ? path : '$path.$i';
+ var oldPath = i == 0 ? path : '$path.$i';
File(oldPath).renameSync('$path.${i + 1}');
} catch (e) {
// If a file can't be renamed, then leave it and attempt to rename the
diff --git a/pkg/analysis_server/lib/src/server/http_server.dart b/pkg/analysis_server/lib/src/server/http_server.dart
index a8b9b41..b1d8d36 100644
--- a/pkg/analysis_server/lib/src/server/http_server.dart
+++ b/pkg/analysis_server/lib/src/server/http_server.dart
@@ -73,7 +73,7 @@
_serverFuture =
HttpServer.bind(InternetAddress.loopbackIPv4, initialPort ?? 0);
- HttpServer server = await _serverFuture;
+ var server = await _serverFuture;
_handleServer(server);
return server.port;
} catch (ignore) {
@@ -100,13 +100,13 @@
httpServer.listen((HttpRequest request) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- List<String> updateValues = request.headers[HttpHeaders.upgradeHeader];
+ var updateValues = request.headers[HttpHeaders.upgradeHeader];
if (request.method == 'GET') {
await _handleGetRequest(request);
} else if (updateValues != null && updateValues.contains('websocket')) {
// We no longer support serving analysis server communications over
// WebSocket connections.
- HttpResponse response = request.response;
+ var response = request.response;
response.statusCode = HttpStatus.notFound;
response.headers.contentType = ContentType.text;
response.write(
@@ -121,7 +121,7 @@
/// Return an error in response to an unrecognized request received by the
/// HTTP server.
void _returnUnknownRequest(HttpRequest request) {
- HttpResponse response = request.response;
+ var response = request.response;
response.statusCode = HttpStatus.notFound;
response.headers.contentType = ContentType.text;
response.write('Not found');
diff --git a/pkg/analysis_server/lib/src/server/isolate_analysis_server.dart b/pkg/analysis_server/lib/src/server/isolate_analysis_server.dart
new file mode 100644
index 0000000..151bcdf
--- /dev/null
+++ b/pkg/analysis_server/lib/src/server/isolate_analysis_server.dart
@@ -0,0 +1,37 @@
+// Copyright (c) 2020, 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.
+
+import 'dart:async';
+import 'dart:io' show IOSink;
+import 'dart:isolate';
+
+import 'package:analysis_server/src/channel/byte_stream_channel.dart';
+import 'package:analysis_server/src/socket_server.dart';
+import 'package:stream_channel/isolate_channel.dart';
+
+/// This class translates messages sent across an [IsolateChannel] into
+/// a [ByteStreamServerChannel] for the analysis server.
+class IsolateAnalysisServer {
+ /// An object that can handle either a WebSocket connection or a connection
+ /// to the client over stdio.
+ SocketServer socketServer;
+
+ /// Initialize a newly created isolate server.
+ IsolateAnalysisServer(this.socketServer);
+
+ /// Initializes an [IsolateChannel] with [clientSendPort] and starts a server
+ /// with it.
+ Future<void> serveIsolate(SendPort clientSendPort) async {
+ var serverIsolateChannel =
+ IsolateChannel<List<int>>.connectSend(clientSendPort);
+ var serverChannel = ByteStreamServerChannel(
+ serverIsolateChannel.stream,
+ IOSink(serverIsolateChannel.sink),
+ socketServer.instrumentationService,
+ requestStatistics: socketServer.requestStatistics,
+ );
+ socketServer.createAnalysisServer(serverChannel);
+ await serverChannel.closed;
+ }
+}
diff --git a/pkg/analysis_server/lib/src/server/lsp_stdio_server.dart b/pkg/analysis_server/lib/src/server/lsp_stdio_server.dart
index bf1ea13..d73ef3e 100644
--- a/pkg/analysis_server/lib/src/server/lsp_stdio_server.dart
+++ b/pkg/analysis_server/lib/src/server/lsp_stdio_server.dart
@@ -24,7 +24,7 @@
///
/// Return a future that will be completed when stdin closes.
Future serveStdio() {
- LspByteStreamServerChannel serverChannel = LspByteStreamServerChannel(
+ var serverChannel = LspByteStreamServerChannel(
stdin, stdout.nonBlocking, socketServer.instrumentationService);
socketServer.createAnalysisServer(serverChannel);
return serverChannel.closed;
diff --git a/pkg/analysis_server/lib/src/server/stdio_server.dart b/pkg/analysis_server/lib/src/server/stdio_server.dart
index d58d9d1..322997d 100644
--- a/pkg/analysis_server/lib/src/server/stdio_server.dart
+++ b/pkg/analysis_server/lib/src/server/stdio_server.dart
@@ -24,7 +24,7 @@
///
/// Return a future that will be completed when stdin closes.
Future serveStdio() {
- ByteStreamServerChannel serverChannel = ByteStreamServerChannel(
+ var serverChannel = ByteStreamServerChannel(
stdin,
stdout,
socketServer.instrumentationService,
diff --git a/pkg/analysis_server/lib/src/services/completion/completion_performance.dart b/pkg/analysis_server/lib/src/services/completion/completion_performance.dart
index ddb78e0..c9c0fdc 100644
--- a/pkg/analysis_server/lib/src/services/completion/completion_performance.dart
+++ b/pkg/analysis_server/lib/src/services/completion/completion_performance.dart
@@ -2,6 +2,38 @@
// 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.
+/// Compute a string representing a code completion operation at the
+/// given source and location.
+///
+/// This string is useful for displaying to users in a diagnostic context.
+String computeCompletionSnippet(String contents, int offset) {
+ if (contents == null ||
+ offset == null ||
+ offset < 0 ||
+ contents.length < offset) {
+ return '???';
+ }
+ var start = offset;
+ while (start > 0) {
+ var ch = contents[start - 1];
+ if (ch == '\r' || ch == '\n') {
+ break;
+ }
+ --start;
+ }
+ var end = offset;
+ while (end < contents.length) {
+ var ch = contents[end];
+ if (ch == '\r' || ch == '\n') {
+ break;
+ }
+ ++end;
+ }
+ var prefix = contents.substring(start, offset);
+ var suffix = contents.substring(offset, end);
+ return '$prefix^$suffix';
+}
+
/// Overall performance of a code completion operation.
class CompletionPerformance {
final DateTime start = DateTime.now();
@@ -35,8 +67,8 @@
}
void logElapseTime(String tag) {
- Duration end = _stopwatch.elapsed;
- Duration start = _startTimes[tag];
+ var end = _stopwatch.elapsed;
+ var start = _startTimes[tag];
if (start == null) {
_logDuration(tag, null);
return null;
@@ -72,35 +104,3 @@
OperationPerformance(this.name, this.elapsed);
}
-
-/// Compute a string representing a code completion operation at the
-/// given source and location.
-///
-/// This string is useful for displaying to users in a diagnostic context.
-String computeCompletionSnippet(String contents, int offset) {
- if (contents == null ||
- offset == null ||
- offset < 0 ||
- contents.length < offset) {
- return '???';
- }
- int start = offset;
- while (start > 0) {
- String ch = contents[start - 1];
- if (ch == '\r' || ch == '\n') {
- break;
- }
- --start;
- }
- int end = offset;
- while (end < contents.length) {
- String ch = contents[end];
- if (ch == '\r' || ch == '\n') {
- break;
- }
- ++end;
- }
- String prefix = contents.substring(start, offset);
- String suffix = contents.substring(offset, end);
- return '$prefix^$suffix';
-}
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/arglist_contributor.dart b/pkg/analysis_server/lib/src/services/completion/dart/arglist_contributor.dart
index 8c3d863..23e8240 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/arglist_contributor.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/arglist_contributor.dart
@@ -137,8 +137,7 @@
// method which returns some enum with 5+ cases.
if (_isEditingNamedArgLabel() || _isAppendingToArgList()) {
if (requiredCount == 0 || requiredCount < _argCount()) {
- bool addTrailingComma =
- !_isFollowedByAComma() && _isInFlutterCreation();
+ var addTrailingComma = !_isFollowedByAComma() && _isInFlutterCreation();
_addDefaultParamSuggestions(parameters, addTrailingComma);
}
} else if (_isInsertingToArgListWithNoSynthetic()) {
@@ -243,7 +242,7 @@
if (argumentList != null) {
var entity = request.target.entity;
if (entity is NamedExpression) {
- int offset = request.offset;
+ var offset = request.offset;
if (entity.offset < offset && offset < entity.end) {
return true;
}
@@ -260,7 +259,7 @@
var containingNode = request.target.containingNode;
var entity = request.target.entity;
- Token token =
+ var token =
entity is AstNode ? entity.endToken : entity is Token ? entity : null;
return (token != containingNode?.endToken) &&
token?.next?.type == TokenType.COMMA &&
@@ -270,7 +269,7 @@
bool _isInFlutterCreation() {
var flutter = Flutter.of(request.result);
var containingNode = request.target?.containingNode;
- InstanceCreationExpression newExpr = containingNode != null
+ var newExpr = containingNode != null
? flutter.identifyNewExpression(containingNode.parent)
: null;
return newExpr != null && flutter.isWidgetCreation(newExpr);
@@ -280,7 +279,7 @@
bool _isInNamedExpression() {
var entity = request.target.entity;
if (entity is NamedExpression) {
- Label name = entity.name;
+ var name = entity.name;
return name.offset < request.offset && request.offset < name.end;
}
return false;
@@ -306,7 +305,7 @@
if (argumentList != null) {
var entity = request.target.entity;
if (entity is SimpleIdentifier) {
- int argIndex = request.target.argIndex;
+ var argIndex = request.target.argIndex;
// if the next argument is a NamedExpression, then we are in the named
// parameter list, guard first against end of list
if (argumentList.arguments.length == argIndex + 1 ||
@@ -321,7 +320,7 @@
/// Return a list containing the currently specified named arguments.
List<String> _namedArgs() {
- List<String> namedArgs = <String>[];
+ var namedArgs = <String>[];
if (argumentList != null) {
for (var arg in argumentList.arguments) {
if (arg is NamedExpression) {
@@ -337,7 +336,7 @@
static void _setDocumentation(
CompletionSuggestion suggestion, String comment) {
if (comment != null) {
- String doc = getDartDocPlainText(comment);
+ var doc = getDartDocPlainText(comment);
suggestion.docComplete = doc;
suggestion.docSummary = getDartDocSummary(doc);
}
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/common_usage_sorter.dart b/pkg/analysis_server/lib/src/services/completion/dart/common_usage_sorter.dart
index 185f9d9..ca458ee 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/common_usage_sorter.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/common_usage_sorter.dart
@@ -53,7 +53,7 @@
var visitor = _BestTypeVisitor(target.entity);
var typeElem = target.containingNode.accept(visitor);
if (typeElem != null) {
- LibraryElement libElem = typeElem.library;
+ var libElem = typeElem.library;
if (libElem != null) {
_updateInvocationRelevance(typeElem.name, libElem, suggestions);
}
@@ -65,10 +65,10 @@
/// target type and library.
void _updateInvocationRelevance(String typeName, LibraryElement libElem,
Iterable<CompletionSuggestion> suggestions) {
- List<String> selectors = selectorRelevance['${libElem.name}.$typeName'];
+ var selectors = selectorRelevance['${libElem.name}.$typeName'];
if (selectors != null) {
- for (CompletionSuggestion suggestion in suggestions) {
- protocol.Element element = suggestion.element;
+ for (var suggestion in suggestions) {
+ var element = suggestion.element;
if (element != null &&
(element.kind == protocol.ElementKind.CONSTRUCTOR ||
element.kind == protocol.ElementKind.FIELD ||
@@ -77,7 +77,7 @@
element.kind == protocol.ElementKind.SETTER) &&
suggestion.kind == CompletionSuggestionKind.INVOCATION &&
suggestion.declaringType == typeName) {
- int index = selectors.indexOf(suggestion.completion);
+ var index = selectors.indexOf(suggestion.completion);
if (index != -1) {
suggestion.relevance = DART_RELEVANCE_COMMON_USAGE - index;
}
@@ -106,11 +106,11 @@
@override
Element visitNamedExpression(NamedExpression node) {
- AstNode parent = node.parent;
+ var parent = node.parent;
if (parent is ArgumentListImpl) {
- List<ParameterElement> params = parent.correspondingStaticParameters;
+ var params = parent.correspondingStaticParameters;
if (params != null) {
- int index = parent.arguments.indexOf(node);
+ var index = parent.arguments.indexOf(node);
return params[index]?.type?.element;
}
}
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/completion_manager.dart b/pkg/analysis_server/lib/src/services/completion/dart/completion_manager.dart
index d403ef5..e2544fe 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/completion_manager.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/completion_manager.dart
@@ -96,8 +96,7 @@
return const <CompletionSuggestion>[];
}
- CompletionPerformance performance =
- (request as CompletionRequestImpl).performance;
+ var performance = (request as CompletionRequestImpl).performance;
DartCompletionRequestImpl dartRequest =
await DartCompletionRequestImpl.from(request);
@@ -107,11 +106,10 @@
}
final ranking = CompletionRanking.instance;
- Future<Map<String, double>> probabilityFuture =
+ var probabilityFuture =
ranking != null ? ranking.predict(dartRequest) : Future.value(null);
- SourceRange range =
- dartRequest.target.computeReplacementRange(dartRequest.offset);
+ var range = dartRequest.target.computeReplacementRange(dartRequest.offset);
(request as CompletionRequestImpl)
..replacementOffset = range.offset
..replacementLength = range.length;
@@ -119,7 +117,7 @@
// Request Dart specific completions from each contributor
var suggestionMap = <String, CompletionSuggestion>{};
var constructorMap = <String, List<String>>{};
- List<DartCompletionContributor> contributors = <DartCompletionContributor>[
+ var contributors = <DartCompletionContributor>[
ArgListContributor(),
CombinatorContributor(),
ExtensionMemberContributor(),
@@ -148,32 +146,32 @@
}
try {
- for (DartCompletionContributor contributor in contributors) {
- String contributorTag =
+ for (var contributor in contributors) {
+ var contributorTag =
'DartCompletionManager - ${contributor.runtimeType}';
performance.logStartTime(contributorTag);
- List<CompletionSuggestion> contributorSuggestions =
+ var contributorSuggestions =
await contributor.computeSuggestions(dartRequest);
performance.logElapseTime(contributorTag);
request.checkAborted();
- for (CompletionSuggestion newSuggestion in contributorSuggestions) {
- String key = newSuggestion.completion;
+ for (var newSuggestion in contributorSuggestions) {
+ var key = newSuggestion.completion;
// Append parenthesis for constructors to disambiguate from classes.
if (_isConstructor(newSuggestion)) {
key += '()';
- String className = _getConstructorClassName(newSuggestion);
+ var className = _getConstructorClassName(newSuggestion);
_ensureList(constructorMap, className).add(key);
}
// Local declarations hide both the class and its constructors.
if (!_isClass(newSuggestion)) {
- List<String> constructorKeys = constructorMap[key];
+ var constructorKeys = constructorMap[key];
constructorKeys?.forEach(suggestionMap.remove);
}
- CompletionSuggestion oldSuggestion = suggestionMap[key];
+ var oldSuggestion = suggestionMap[key];
if (oldSuggestion == null ||
oldSuggestion.relevance < newSuggestion.relevance) {
suggestionMap[key] = newSuggestion;
@@ -187,7 +185,7 @@
}
// Adjust suggestion relevance before returning
- List<CompletionSuggestion> suggestions = suggestionMap.values.toList();
+ var suggestions = suggestionMap.values.toList();
const SORT_TAG = 'DartCompletionManager - sort';
performance.logStartTime(SORT_TAG);
if (ranking != null) {
@@ -316,7 +314,7 @@
}
static List<String> _ensureList(Map<String, List<String>> map, String key) {
- List<String> list = map[key];
+ var list = map[key];
if (list == null) {
list = <String>[];
map[key] = list;
@@ -325,8 +323,8 @@
}
static String _getConstructorClassName(CompletionSuggestion suggestion) {
- String completion = suggestion.completion;
- int dotIndex = completion.indexOf('.');
+ var completion = suggestion.completion;
+ var dotIndex = completion.indexOf('.');
if (dotIndex != -1) {
return completion.substring(0, dotIndex);
} else {
@@ -420,9 +418,9 @@
@override
LibraryElement get libraryElement {
//TODO(danrubel) build the library element rather than all the declarations
- CompilationUnit unit = target.unit;
+ var unit = target.unit;
if (unit != null) {
- CompilationUnitElement elem = unit.declaredElement;
+ var elem = unit.declaredElement;
if (elem != null) {
return elem.library;
}
@@ -459,7 +457,7 @@
_opType = null;
dotTarget = null;
target = CompletionTarget.forOffset(unit, offset);
- AstNode node = target.containingNode;
+ var node = target.containingNode;
if (node is MethodInvocation) {
if (identical(node.methodName, target.entity)) {
dotTarget = node.realTarget;
@@ -486,16 +484,15 @@
/// if the completion request has been aborted.
static Future<DartCompletionRequest> from(CompletionRequest request) async {
request.checkAborted();
- CompletionPerformance performance =
- (request as CompletionRequestImpl).performance;
+ var performance = (request as CompletionRequestImpl).performance;
const BUILD_REQUEST_TAG = 'build DartCompletionRequest';
performance.logStartTime(BUILD_REQUEST_TAG);
- CompilationUnit unit = request.result.unit;
- Source libSource = unit.declaredElement.library.source;
- InterfaceType objectType = request.result.typeProvider.objectType;
+ var unit = request.result.unit;
+ var libSource = unit.declaredElement.library.source;
+ var objectType = request.result.typeProvider.objectType;
- DartCompletionRequestImpl dartRequest = DartCompletionRequestImpl._(
+ var dartRequest = DartCompletionRequestImpl._(
request.result,
request.resourceProvider,
objectType,
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/completion_ranking.dart b/pkg/analysis_server/lib/src/services/completion/dart/completion_ranking.dart
index a718d23..c80e50f 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/completion_ranking.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/completion_ranking.dart
@@ -30,7 +30,7 @@
final port = ReceivePort();
sendPort.send(port.sendPort);
port.listen((message) {
- Map<String, Map<String, double>> response = {};
+ var response = <String, Map<String, double>>{};
switch (message['method']) {
case 'load':
model = LanguageModel.load(message['args'][0]);
@@ -109,11 +109,11 @@
performanceMetrics._incrementPredictionRequestCount();
- final Stopwatch timer = Stopwatch()..start();
- final response = await makePredictRequest(query);
+ var timer = Stopwatch()..start();
+ var response = await makePredictRequest(query);
timer.stop();
- final Map<String, double> result = response['data'];
+ var result = response['data'];
performanceMetrics._addPredictionResult(PredictionResult(
result,
@@ -179,7 +179,7 @@
var allowModelOnlySuggestions =
!testNamedArgument(suggestions) && !testFollowingDot(request);
- for (MapEntry entry in entries) {
+ for (var entry in entries) {
// There may be multiple like
// CompletionSuggestion and CompletionSuggestion().
final completionSuggestions = suggestions.where((suggestion) =>
@@ -252,7 +252,7 @@
await _startIsolate();
// Start the 2nd and later isolates.
- for (int i = 1; i < _ISOLATE_COUNT; i++) {
+ for (var i = 1; i < _ISOLATE_COUNT; i++) {
initializations.add(_startIsolate());
}
@@ -260,8 +260,8 @@
}
Future<void> _startIsolate() async {
- final Stopwatch timer = Stopwatch()..start();
- final port = ReceivePort();
+ var timer = Stopwatch()..start();
+ var port = ReceivePort();
await Isolate.spawn(entrypoint, port.sendPort);
SendPort sendPort = await port.first;
return makeLoadRequest(sendPort, [_directory]).whenComplete(() {
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/completion_ranking_internal.dart b/pkg/analysis_server/lib/src/services/completion/dart/completion_ranking_internal.dart
index 7456648..5fa273e 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/completion_ranking_internal.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/completion_ranking_internal.dart
@@ -4,38 +4,12 @@
import 'package:_fe_analyzer_shared/src/scanner/scanner.dart';
import 'package:analysis_server/src/protocol_server.dart';
-import 'package:analysis_server/src/services/correction/util.dart';
import 'package:analysis_server/src/provisional/completion/dart/completion_dart.dart';
+import 'package:analysis_server/src/services/correction/util.dart';
import 'package:analyzer/dart/analysis/features.dart';
import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/ast/token.dart';
-/// Constructs a [CompletionSuggestion] object.
-CompletionSuggestion createCompletionSuggestion(
- String completion, FeatureSet featureSet, int relevance) {
- final tokens = TokenUtils.getTokens(completion, featureSet);
- final token = tokens.isNotEmpty ? tokens[0] : null;
- final completionKind = token != null && token.isKeyword
- ? CompletionSuggestionKind.KEYWORD
- : CompletionSuggestionKind.IDENTIFIER;
- if (isLiteral(completion) &&
- (completion.startsWith('"package:') ||
- completion.startsWith('\'package:'))) {
- completion = completion.replaceAll('\'', '').replaceAll('\"', '');
- }
- return CompletionSuggestion(completionKind, relevance, completion,
- completion.length, 0, false, false);
-}
-
-/// Finds the token at which completion was requested.
-Token getCursorToken(DartCompletionRequest request) {
- final entity = request.target.entity;
- if (entity is AstNode) {
- return entity.endToken;
- }
- return entity is Token ? entity : null;
-}
-
/// Fuzzy matching between static analysis and model-predicted lexemes
/// that considers pairs like "main" and "main()" to be equal.
bool areCompletionsEquivalent(String dasCompletion, String modelCompletion) {
@@ -57,103 +31,6 @@
return dasCompletion.substring(0, index) == modelCompletion;
}
-/// Step to previous token until we are at the first token before where the
-/// cursor is located.
-bool isStopToken(Token token, int cursorOffset) {
- if (token == null) {
- return true;
- }
- if (token.isSynthetic && !token.isEof) {
- return false;
- }
- final position = token.offset + token.length;
- if (position == cursorOffset) {
- // If we are at the end of some token, step to previous only if the
- // token is NOT an identifier, keyword, or literal. The rationale is that
- // we want to keep moving if we have a situation like
- // FooBar foo^ since foo is not a previous token to pass to the model.
- return !token.lexeme[token.lexeme.length - 1]
- .contains(RegExp(r'[0-9A-Za-z_]'));
- }
- // Stop if the token's location is strictly before the cursor, continue
- // if the token's location is strictly after.
- return position < cursorOffset;
-}
-
-bool isStringLiteral(String lexeme) {
- if (lexeme == null || lexeme.isEmpty) {
- return false;
- }
- return (lexeme.length > 1 && lexeme[0] == "'") ||
- (lexeme.length > 2 && lexeme[0] == 'r' && lexeme[1] == "'");
-}
-
-bool isLiteral(String lexeme) {
- if (lexeme == null || lexeme.isEmpty) {
- return false;
- }
- if (RegExp(r'^[0-9]+$').hasMatch(lexeme)) {
- // Check for number lexeme.
- return true;
- }
- return isStringLiteral(lexeme);
-}
-
-bool isNotWhitespace(String lexeme) {
- return lexeme
- .replaceAll("'", '')
- .split('')
- .any((String chr) => !RegExp(r'\s').hasMatch(chr));
-}
-
-Token getCurrentToken(DartCompletionRequest request) {
- var token = getCursorToken(request);
- while (!isStopToken(token.previous, request.offset)) {
- token = token.previous;
- }
- return token;
-}
-
-bool testInsideQuotes(DartCompletionRequest request) {
- final token = getCurrentToken(request);
- if (token == null || token.isSynthetic) {
- return false;
- }
-
- final cursorOffset = request.offset;
- if (cursorOffset == token.offset ||
- cursorOffset == token.offset + token.length) {
- // We are not inside the current token, quoted or otherwise.
- return false;
- }
-
- final lexeme = token.lexeme;
- if (lexeme.length > 2 && lexeme[0] == 'r') {
- return lexeme[1] == "'" || lexeme[1] == '"';
- }
-
- return lexeme.length > 1 && (lexeme[0] == "'" || lexeme[0] == '"');
-}
-
-bool isTokenDot(Token token) {
- return token != null && !token.isSynthetic && token.lexeme.endsWith('.');
-}
-
-bool testFollowingDot(DartCompletionRequest request) {
- final token = getCurrentToken(request);
- return isTokenDot(token) || isTokenDot(token.previous);
-}
-
-/// Tests whether all completion suggestions are for named arguments.
-bool testNamedArgument(List<CompletionSuggestion> suggestions) {
- if (suggestions == null) {
- return false;
- }
-
- return suggestions.any((CompletionSuggestion suggestion) =>
- suggestion.kind == CompletionSuggestionKind.NAMED_ARGUMENT);
-}
-
/// Finds the previous n tokens occurring before the cursor.
List<String> constructQuery(DartCompletionRequest request, int n) {
var token = getCursorToken(request);
@@ -188,6 +65,23 @@
return result.reversed.toList(growable: false);
}
+/// Constructs a [CompletionSuggestion] object.
+CompletionSuggestion createCompletionSuggestion(
+ String completion, FeatureSet featureSet, int relevance) {
+ final tokens = TokenUtils.getTokens(completion, featureSet);
+ final token = tokens.isNotEmpty ? tokens[0] : null;
+ final completionKind = token != null && token.isKeyword
+ ? CompletionSuggestionKind.KEYWORD
+ : CompletionSuggestionKind.IDENTIFIER;
+ if (isLiteral(completion) &&
+ (completion.startsWith('"package:') ||
+ completion.startsWith('\'package:'))) {
+ completion = completion.replaceAll('\'', '').replaceAll('\"', '');
+ }
+ return CompletionSuggestion(completionKind, relevance, completion,
+ completion.length, 0, false, false);
+}
+
/// Maps included relevance tags formatted as
/// '${element.librarySource.uri}::${element.name}' to element.name.
String elementNameFromRelevanceTag(String tag) {
@@ -199,6 +93,76 @@
return tag.substring(index + 2);
}
+Token getCurrentToken(DartCompletionRequest request) {
+ var token = getCursorToken(request);
+ while (!isStopToken(token.previous, request.offset)) {
+ token = token.previous;
+ }
+ return token;
+}
+
+/// Finds the token at which completion was requested.
+Token getCursorToken(DartCompletionRequest request) {
+ final entity = request.target.entity;
+ if (entity is AstNode) {
+ return entity.endToken;
+ }
+ return entity is Token ? entity : null;
+}
+
+bool isLiteral(String lexeme) {
+ if (lexeme == null || lexeme.isEmpty) {
+ return false;
+ }
+ if (RegExp(r'^[0-9]+$').hasMatch(lexeme)) {
+ // Check for number lexeme.
+ return true;
+ }
+ return isStringLiteral(lexeme);
+}
+
+bool isNotWhitespace(String lexeme) {
+ return lexeme
+ .replaceAll("'", '')
+ .split('')
+ .any((String chr) => !RegExp(r'\s').hasMatch(chr));
+}
+
+/// Step to previous token until we are at the first token before where the
+/// cursor is located.
+bool isStopToken(Token token, int cursorOffset) {
+ if (token == null) {
+ return true;
+ }
+ if (token.isSynthetic && !token.isEof) {
+ return false;
+ }
+ final position = token.offset + token.length;
+ if (position == cursorOffset) {
+ // If we are at the end of some token, step to previous only if the
+ // token is NOT an identifier, keyword, or literal. The rationale is that
+ // we want to keep moving if we have a situation like
+ // FooBar foo^ since foo is not a previous token to pass to the model.
+ return !token.lexeme[token.lexeme.length - 1]
+ .contains(RegExp(r'[0-9A-Za-z_]'));
+ }
+ // Stop if the token's location is strictly before the cursor, continue
+ // if the token's location is strictly after.
+ return position < cursorOffset;
+}
+
+bool isStringLiteral(String lexeme) {
+ if (lexeme == null || lexeme.isEmpty) {
+ return false;
+ }
+ return (lexeme.length > 1 && lexeme[0] == "'") ||
+ (lexeme.length > 2 && lexeme[0] == 'r' && lexeme[1] == "'");
+}
+
+bool isTokenDot(Token token) {
+ return token != null && !token.isSynthetic && token.lexeme.endsWith('.');
+}
+
/// Filters the entries list down to only those which represent string literals
/// and then strips quotes.
List<MapEntry<String, double>> selectStringLiterals(List<MapEntry> entries) {
@@ -210,6 +174,42 @@
.toList();
}
+bool testFollowingDot(DartCompletionRequest request) {
+ final token = getCurrentToken(request);
+ return isTokenDot(token) || isTokenDot(token.previous);
+}
+
+bool testInsideQuotes(DartCompletionRequest request) {
+ final token = getCurrentToken(request);
+ if (token == null || token.isSynthetic) {
+ return false;
+ }
+
+ final cursorOffset = request.offset;
+ if (cursorOffset == token.offset ||
+ cursorOffset == token.offset + token.length) {
+ // We are not inside the current token, quoted or otherwise.
+ return false;
+ }
+
+ final lexeme = token.lexeme;
+ if (lexeme.length > 2 && lexeme[0] == 'r') {
+ return lexeme[1] == "'" || lexeme[1] == '"';
+ }
+
+ return lexeme.length > 1 && (lexeme[0] == "'" || lexeme[0] == '"');
+}
+
+/// Tests whether all completion suggestions are for named arguments.
+bool testNamedArgument(List<CompletionSuggestion> suggestions) {
+ if (suggestions == null) {
+ return false;
+ }
+
+ return suggestions.any((CompletionSuggestion suggestion) =>
+ suggestion.kind == CompletionSuggestionKind.NAMED_ARGUMENT);
+}
+
String trimQuotes(String input) {
final result = input[0] == '\'' ? input.substring(1) : input;
return result[result.length - 1] == '\''
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/extension_member_contributor.dart b/pkg/analysis_server/lib/src/services/completion/dart/extension_member_contributor.dart
index edb8e87..524ebf7 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/extension_member_contributor.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/extension_member_contributor.dart
@@ -26,7 +26,7 @@
@override
Future<List<CompletionSuggestion>> computeSuggestions(
DartCompletionRequest request) async {
- LibraryElement containingLibrary = request.libraryElement;
+ var containingLibrary = request.libraryElement;
// Gracefully degrade if the library could not be determined, such as with a
// detached part file or source change.
if (containingLibrary == null) {
@@ -36,7 +36,7 @@
builder = MemberSuggestionBuilder(request);
// Recompute the target because resolution might have changed it.
- Expression expression = request.dotTarget;
+ var expression = request.dotTarget;
if (expression == null) {
var classOrMixin = request.target.containingNode
@@ -72,7 +72,7 @@
return const <CompletionSuggestion>[];
}
if (expression is Identifier) {
- Element elem = expression.staticElement;
+ var elem = expression.staticElement;
if (elem is ClassElement) {
// Suggestions provided by StaticMemberContributor.
return const <CompletionSuggestion>[];
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/feature_computer.dart b/pkg/analysis_server/lib/src/services/completion/dart/feature_computer.dart
index d4f91c3..10c24e1 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/feature_computer.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/feature_computer.dart
@@ -31,7 +31,7 @@
assert(values.length == weights.length);
var totalValue = 0.0;
var totalWeight = 0.0;
- for (int i = 0; i < values.length; i++) {
+ for (var i = 0; i < values.length; i++) {
var value = values[i];
if (value >= 0.0) {
var weight = weights[i];
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/imported_reference_contributor.dart b/pkg/analysis_server/lib/src/services/completion/dart/imported_reference_contributor.dart
index 9592217..972878a 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/imported_reference_contributor.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/imported_reference_contributor.dart
@@ -5,66 +5,37 @@
import 'dart:async';
import 'package:analysis_server/src/provisional/completion/dart/completion_dart.dart';
-import 'package:analysis_server/src/services/completion/dart/completion_manager.dart';
import 'package:analysis_server/src/services/completion/dart/local_library_contributor.dart';
-import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/src/generated/resolver.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart' as protocol;
-import 'package:analyzer_plugin/src/utilities/completion/optype.dart';
import '../../../protocol_server.dart' show CompletionSuggestion;
-List<String> hiddenNamesIn(ImportElement importElem) {
- for (NamespaceCombinator combinator in importElem.combinators) {
- if (combinator is HideElementCombinator) {
- return combinator.hiddenNames;
- }
- }
- return null;
-}
-
-List<String> showNamesIn(ImportElement importElem) {
- for (NamespaceCombinator combinator in importElem.combinators) {
- if (combinator is ShowElementCombinator) {
- return combinator.shownNames;
- }
- }
- return null;
-}
-
/// A contributor for calculating suggestions for imported top level members.
class ImportedReferenceContributor extends DartCompletionContributor {
- DartCompletionRequest request;
- OpType optype;
-
@override
Future<List<CompletionSuggestion>> computeSuggestions(
DartCompletionRequest request) async {
- // TODO(brianwilkerson) Determine whether this await is necessary.
- await null;
if (!request.includeIdentifiers) {
return const <CompletionSuggestion>[];
}
- List<ImportElement> imports = request.libraryElement.imports;
+ var imports = request.libraryElement.imports;
if (imports == null) {
return const <CompletionSuggestion>[];
}
- this.request = request;
- optype = (request as DartCompletionRequestImpl).opType;
- List<CompletionSuggestion> suggestions = <CompletionSuggestion>[];
+ var suggestions = <CompletionSuggestion>[];
- final seenElements = <protocol.Element>{};
+ var seenElements = <protocol.Element>{};
// Traverse imports including dart:core
- for (ImportElement importElem in imports) {
- LibraryElement libElem = importElem?.importedLibrary;
- if (libElem != null) {
- final newSuggestions = _buildSuggestions(libElem.exportNamespace,
- prefix: importElem.prefix?.name,
- showNames: showNamesIn(importElem),
- hiddenNames: hiddenNamesIn(importElem));
+ for (var importElement in imports) {
+ var libraryElement = importElement.importedLibrary;
+ if (libraryElement != null) {
+ final newSuggestions = _buildSuggestions(
+ request, importElement.namespace,
+ prefix: importElement.prefix?.name);
for (var suggestion in newSuggestions) {
// Filter out multiply-exported elements (like Future and Stream).
if (seenElements.add(suggestion.element)) {
@@ -76,17 +47,11 @@
return suggestions;
}
- List<CompletionSuggestion> _buildSuggestions(Namespace namespace,
- {String prefix, List<String> showNames, List<String> hiddenNames}) {
- LibraryElementSuggestionBuilder visitor =
- LibraryElementSuggestionBuilder(request, optype, prefix);
- for (Element elem in namespace.definedNames.values) {
- if (showNames != null && !showNames.contains(elem.name)) {
- continue;
- }
- if (hiddenNames != null && hiddenNames.contains(elem.name)) {
- continue;
- }
+ List<CompletionSuggestion> _buildSuggestions(
+ DartCompletionRequest request, Namespace namespace,
+ {String prefix}) {
+ var visitor = LibraryElementSuggestionBuilder(request, prefix);
+ for (var elem in namespace.definedNames.values) {
elem.accept(visitor);
}
return visitor.suggestions;
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/inherited_reference_contributor.dart b/pkg/analysis_server/lib/src/services/completion/dart/inherited_reference_contributor.dart
index c632403..248b44f 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/inherited_reference_contributor.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/inherited_reference_contributor.dart
@@ -111,7 +111,7 @@
/// Return the class member containing the target or `null` if the target is
/// in a static method or static field or not in a class member.
ClassMember _enclosingMember(CompletionTarget target) {
- AstNode node = target.containingNode;
+ var node = target.containingNode;
while (node != null) {
if (node is MethodDeclaration) {
if (!node.isStatic) {
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/keyword_contributor.dart b/pkg/analysis_server/lib/src/services/completion/dart/keyword_contributor.dart
index 8f4714f..3e25727 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/keyword_contributor.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/keyword_contributor.dart
@@ -23,15 +23,13 @@
const SYNC_STAR = 'sync*';
const YIELD_STAR = 'yield*';
-/// A contributor for calculating `completion.getSuggestions` request results
-/// for the local library in which the completion is requested.
+/// A contributor that produces suggestions based on the set of keywords that
+/// are valid at the completion point.
class KeywordContributor extends DartCompletionContributor {
@override
Future<List<CompletionSuggestion>> computeSuggestions(
DartCompletionRequest request) async {
- // TODO(brianwilkerson) Determine whether this await is necessary.
- await null;
- List<CompletionSuggestion> suggestions = <CompletionSuggestion>[];
+ var suggestions = <CompletionSuggestion>[];
// Don't suggest anything right after double or integer literals.
if (request.target.isDoubleOrIntLiteral()) {
@@ -46,15 +44,24 @@
/// A visitor for generating keyword suggestions.
class _KeywordVisitor extends GeneralizingAstVisitor<void> {
final DartCompletionRequest request;
+
final Object entity;
+
final List<CompletionSuggestion> suggestions;
- _KeywordVisitor(DartCompletionRequest request, this.suggestions)
- : request = request,
- entity = request.target.entity;
+ _KeywordVisitor(this.request, this.suggestions)
+ : entity = request.target.entity;
+
+ int get defaultKeyword =>
+ request.useNewRelevance ? 800 : DART_RELEVANCE_KEYWORD;
Token get droppedToken => request.target.droppedToken;
+ int get highKeyword => request.useNewRelevance ? 1000 : DART_RELEVANCE_HIGH;
+
+ int get lowKeyword =>
+ request.useNewRelevance ? 400 : DART_RELEVANCE_KEYWORD - 1;
+
bool isEmptyBody(FunctionBody body) =>
body is EmptyFunctionBody ||
(body is BlockFunctionBody && body.beginToken.isSynthetic);
@@ -62,15 +69,13 @@
@override
void visitArgumentList(ArgumentList node) {
if (request is DartCompletionRequestImpl) {
- //TODO(danrubel) consider adding opType to the API then remove this cast
- OpType opType = (request as DartCompletionRequestImpl).opType;
- if (opType.includeOnlyNamedArgumentSuggestions) {
+ if (request.opType.includeOnlyNamedArgumentSuggestions) {
return;
}
}
if (entity == node.rightParenthesis) {
_addExpressionKeywords(node);
- Token previous = node.findPrevious(entity as Token);
+ var previous = node.findPrevious(entity as Token);
if (previous != null && previous.isSynthetic) {
previous = node.findPrevious(previous);
}
@@ -82,10 +87,10 @@
}
if (entity is SimpleIdentifier && node.arguments.contains(entity)) {
_addExpressionKeywords(node);
- int index = node.arguments.indexOf(entity);
+ var index = node.arguments.indexOf(entity);
if (index > 0) {
- Expression previousArgument = node.arguments[index - 1];
- Token endToken = previousArgument?.endToken;
+ var previousArgument = node.arguments[index - 1];
+ var endToken = previousArgument?.endToken;
if (endToken?.lexeme == ')' &&
endToken.next?.lexeme == ',' &&
endToken.next.isSynthetic) {
@@ -101,15 +106,15 @@
void visitAsExpression(AsExpression node) {
if (identical(entity, node.asOperator) &&
node.expression is ParenthesizedExpression) {
- _addSuggestion(Keyword.ASYNC, DART_RELEVANCE_HIGH);
- _addSuggestion2(ASYNC_STAR, relevance: DART_RELEVANCE_HIGH);
- _addSuggestion2(SYNC_STAR, relevance: DART_RELEVANCE_HIGH);
+ _addSuggestion(Keyword.ASYNC, relevance: highKeyword);
+ _addSuggestion2(ASYNC_STAR, relevance: highKeyword);
+ _addSuggestion2(SYNC_STAR, relevance: highKeyword);
}
}
@override
void visitBlock(Block node) {
- Statement prevStmt = OpType.getPreviousStatement(node, entity);
+ var prevStmt = OpType.getPreviousStatement(node, entity);
if (prevStmt is TryStatement) {
if (prevStmt.finallyBlock == null) {
_addSuggestion(Keyword.ON);
@@ -124,14 +129,14 @@
}
if (entity is ExpressionStatement) {
- Expression expression = (entity as ExpressionStatement).expression;
+ var expression = (entity as ExpressionStatement).expression;
if (expression is SimpleIdentifier) {
- Token token = expression.token;
- Token previous = node.findPrevious(token);
+ var token = expression.token;
+ var previous = node.findPrevious(token);
if (previous != null && previous.isSynthetic) {
previous = node.findPrevious(previous);
}
- Token next = token.next;
+ var next = token.next;
if (next.isSynthetic) {
next = next.next;
}
@@ -146,7 +151,7 @@
}
_addStatementKeywords(node);
if (_inCatchClause(node)) {
- _addSuggestion(Keyword.RETHROW, DART_RELEVANCE_KEYWORD - 1);
+ _addSuggestion(Keyword.RETHROW, relevance: lowKeyword);
}
}
@@ -160,8 +165,8 @@
_addClassBodyKeywords();
} else if (entity is ClassMember) {
_addClassBodyKeywords();
- int index = node.members.indexOf(entity);
- ClassMember previous = index > 0 ? node.members[index - 1] : null;
+ var index = node.members.indexOf(entity);
+ var previous = index > 0 ? node.members[index - 1] : null;
if (previous is MethodDeclaration && isEmptyBody(previous.body)) {
_addSuggestion(Keyword.ASYNC);
_addSuggestion2(ASYNC_STAR);
@@ -220,22 +225,19 @@
if (previousMember == null || previousMember is Directive) {
if (previousMember == null &&
!node.directives.any((d) => d is LibraryDirective)) {
- _addSuggestions([Keyword.LIBRARY], DART_RELEVANCE_HIGH);
+ _addSuggestions([Keyword.LIBRARY], relevance: highKeyword);
}
- _addSuggestion2(IMPORT_STATEMENT,
- offset: 8, relevance: DART_RELEVANCE_HIGH);
- _addSuggestion2(EXPORT_STATEMENT,
- offset: 8, relevance: DART_RELEVANCE_HIGH);
- _addSuggestion2(PART_STATEMENT,
- offset: 6, relevance: DART_RELEVANCE_HIGH);
+ _addSuggestion2(IMPORT_STATEMENT, offset: 8, relevance: highKeyword);
+ _addSuggestion2(EXPORT_STATEMENT, offset: 8, relevance: highKeyword);
+ _addSuggestion2(PART_STATEMENT, offset: 6, relevance: highKeyword);
}
if (entity == null || entity is Declaration) {
if (previousMember is FunctionDeclaration &&
previousMember.functionExpression is FunctionExpression &&
isEmptyBody(previousMember.functionExpression.body)) {
- _addSuggestion(Keyword.ASYNC, DART_RELEVANCE_HIGH);
- _addSuggestion2(ASYNC_STAR, relevance: DART_RELEVANCE_HIGH);
- _addSuggestion2(SYNC_STAR, relevance: DART_RELEVANCE_HIGH);
+ _addSuggestion(Keyword.ASYNC, relevance: highKeyword);
+ _addSuggestion2(ASYNC_STAR, relevance: highKeyword);
+ _addSuggestion2(SYNC_STAR, relevance: highKeyword);
}
_addCompilationUnitKeywords();
}
@@ -249,14 +251,14 @@
}
var last = node.initializers.last;
if (last == entity) {
- Token previous = node.findPrevious(last.beginToken);
+ var previous = node.findPrevious(last.beginToken);
if (previous != null && previous.end <= request.offset) {
_addSuggestion(Keyword.SUPER);
_addSuggestion(Keyword.THIS);
}
}
} else {
- Token separator = node.separator;
+ var separator = node.separator;
if (separator != null) {
var offset = request.offset;
if (separator.end <= offset && offset <= separator.next.offset) {
@@ -304,11 +306,11 @@
@override
void visitFieldDeclaration(FieldDeclaration node) {
- VariableDeclarationList fields = node.fields;
+ var fields = node.fields;
if (entity != fields) {
return;
}
- NodeList<VariableDeclaration> variables = fields.variables;
+ var variables = fields.variables;
if (variables.isEmpty || request.offset > variables.first.beginToken.end) {
return;
}
@@ -333,7 +335,7 @@
@override
void visitForEachParts(ForEachParts node) {
if (entity == node.inKeyword) {
- Token previous = node.findPrevious(node.inKeyword);
+ var previous = node.findPrevious(node.inKeyword);
if (previous is SyntheticStringToken && previous.lexeme == 'in') {
previous = node.findPrevious(previous);
}
@@ -341,7 +343,7 @@
_addSuggestions(
[Keyword.CONST, Keyword.FALSE, Keyword.NULL, Keyword.TRUE]);
} else {
- _addSuggestion(Keyword.IN, DART_RELEVANCE_HIGH);
+ _addSuggestion(Keyword.IN, relevance: highKeyword);
}
}
}
@@ -355,7 +357,7 @@
@override
void visitFormalParameterList(FormalParameterList node) {
- AstNode constructorDeclaration =
+ var constructorDeclaration =
node.thisOrAncestorOfType<ConstructorDeclaration>();
if (constructorDeclaration != null) {
_addSuggestions([Keyword.THIS]);
@@ -367,7 +369,7 @@
_addSuggestion(Keyword.REQUIRED);
}
} else if (entity is FormalParameter) {
- Token beginToken = (entity as FormalParameter).beginToken;
+ var beginToken = (entity as FormalParameter).beginToken;
if (beginToken != null && request.target.offset == beginToken.end) {
_addSuggestion(Keyword.COVARIANT);
_addSuggestion(Keyword.DYNAMIC);
@@ -388,7 +390,7 @@
node is ForPartsWithDeclarations &&
node.variables != null) {
if (_isPreviousTokenSynthetic(entity, TokenType.SEMICOLON)) {
- _addSuggestion(Keyword.IN, DART_RELEVANCE_HIGH);
+ _addSuggestion(Keyword.IN, relevance: highKeyword);
}
}
}
@@ -398,7 +400,7 @@
// Actual: for (va^)
// Parsed: for (va^; ;)
if (node.forLoopParts == entity) {
- _addSuggestion(Keyword.VAR, DART_RELEVANCE_HIGH);
+ _addSuggestion(Keyword.VAR, relevance: highKeyword);
}
}
@@ -415,15 +417,15 @@
@override
void visitFunctionExpression(FunctionExpression node) {
if (entity == node.body) {
- FunctionBody body = node.body;
+ var body = node.body;
if (!body.isAsynchronous) {
- _addSuggestion(Keyword.ASYNC, DART_RELEVANCE_HIGH);
+ _addSuggestion(Keyword.ASYNC, relevance: highKeyword);
if (body is! ExpressionFunctionBody) {
- _addSuggestion2(ASYNC_STAR, relevance: DART_RELEVANCE_HIGH);
- _addSuggestion2(SYNC_STAR, relevance: DART_RELEVANCE_HIGH);
+ _addSuggestion2(ASYNC_STAR, relevance: highKeyword);
+ _addSuggestion2(SYNC_STAR, relevance: highKeyword);
}
}
- if (node.body is EmptyFunctionBody &&
+ if (body is EmptyFunctionBody &&
node.parent is FunctionDeclaration &&
node.parent.parent is CompilationUnit) {
_addCompilationUnitKeywords();
@@ -444,14 +446,14 @@
// analyzer parser
// Actual: if (x i^)
// Parsed: if (x) i^
- _addSuggestion(Keyword.IS, DART_RELEVANCE_HIGH);
+ _addSuggestion(Keyword.IS, relevance: highKeyword);
} else if (entity == node.rightParenthesis) {
if (node.condition.endToken.next == droppedToken) {
// fasta parser
// Actual: if (x i^)
// Parsed: if (x)
// where "i" is in the token stream but not part of the AST
- _addSuggestion(Keyword.IS, DART_RELEVANCE_HIGH);
+ _addSuggestion(Keyword.IS, relevance: highKeyword);
}
} else if (entity == node.thenStatement || entity == node.elseStatement) {
_addStatementKeywords(node);
@@ -464,7 +466,7 @@
void visitImportDirective(ImportDirective node) {
if (entity == node.asKeyword) {
if (node.deferredKeyword == null) {
- _addSuggestion(Keyword.DEFERRED, DART_RELEVANCE_HIGH);
+ _addSuggestion(Keyword.DEFERRED, relevance: highKeyword);
}
}
// Handle degenerate case where import statement does not have a semicolon
@@ -489,7 +491,7 @@
@override
void visitIsExpression(IsExpression node) {
if (entity == node.isOperator) {
- _addSuggestion(Keyword.IS, DART_RELEVANCE_HIGH);
+ _addSuggestion(Keyword.IS, relevance: highKeyword);
} else {
_addExpressionKeywords(node);
}
@@ -515,10 +517,10 @@
_addSuggestion2(ASYNC_STAR);
_addSuggestion2(SYNC_STAR);
} else {
- _addSuggestion(Keyword.ASYNC, DART_RELEVANCE_HIGH);
+ _addSuggestion(Keyword.ASYNC, relevance: highKeyword);
if (node.body is! ExpressionFunctionBody) {
- _addSuggestion2(ASYNC_STAR, relevance: DART_RELEVANCE_HIGH);
- _addSuggestion2(SYNC_STAR, relevance: DART_RELEVANCE_HIGH);
+ _addSuggestion2(ASYNC_STAR, relevance: highKeyword);
+ _addSuggestion2(SYNC_STAR, relevance: highKeyword);
}
}
} else if (entity == node.returnType || entity == node.name) {
@@ -555,8 +557,8 @@
_addClassBodyKeywords();
} else if (entity is ClassMember) {
_addClassBodyKeywords();
- int index = node.members.indexOf(entity);
- ClassMember previous = index > 0 ? node.members[index - 1] : null;
+ var index = node.members.indexOf(entity);
+ var previous = index > 0 ? node.members[index - 1] : null;
if (previous is MethodDeclaration && isEmptyBody(previous.body)) {
_addSuggestion(Keyword.ASYNC);
_addSuggestion2(ASYNC_STAR);
@@ -581,14 +583,14 @@
@override
void visitParenthesizedExpression(ParenthesizedExpression node) {
- Expression expression = node.expression;
+ var expression = node.expression;
if (expression is Identifier || expression is PropertyAccess) {
if (entity == node.rightParenthesis) {
var next = expression.endToken.next;
if (next == entity || next == droppedToken) {
// Fasta parses `if (x i^)` as `if (x ^) where the `i` is in the token
// stream but not part of the ParenthesizedExpression.
- _addSuggestion(Keyword.IS, DART_RELEVANCE_HIGH);
+ _addSuggestion(Keyword.IS, relevance: highKeyword);
return;
}
}
@@ -647,8 +649,8 @@
_addExpressionKeywords(node);
} else if (entity == node.rightBracket) {
if (node.members.isEmpty) {
- _addSuggestion(Keyword.CASE, DART_RELEVANCE_HIGH);
- _addSuggestion2(DEFAULT_COLON, relevance: DART_RELEVANCE_HIGH);
+ _addSuggestion(Keyword.CASE, relevance: highKeyword);
+ _addSuggestion2(DEFAULT_COLON, relevance: highKeyword);
} else {
_addSuggestion(Keyword.CASE);
_addSuggestion2(DEFAULT_COLON);
@@ -657,8 +659,8 @@
}
if (node.members.contains(entity)) {
if (entity == node.members.first) {
- _addSuggestion(Keyword.CASE, DART_RELEVANCE_HIGH);
- _addSuggestion2(DEFAULT_COLON, relevance: DART_RELEVANCE_HIGH);
+ _addSuggestion(Keyword.CASE, relevance: highKeyword);
+ _addSuggestion2(DEFAULT_COLON, relevance: highKeyword);
} else {
_addSuggestion(Keyword.CASE);
_addSuggestion2(DEFAULT_COLON);
@@ -715,12 +717,12 @@
// Very simplistic suggestion because analyzer will warn if
// the extends / with / implements keywords are out of order
if (node.extendsClause == null) {
- _addSuggestion(Keyword.EXTENDS, DART_RELEVANCE_HIGH);
+ _addSuggestion(Keyword.EXTENDS, relevance: highKeyword);
} else if (node.withClause == null) {
- _addSuggestion(Keyword.WITH, DART_RELEVANCE_HIGH);
+ _addSuggestion(Keyword.WITH, relevance: highKeyword);
}
if (node.implementsClause == null) {
- _addSuggestion(Keyword.IMPLEMENTS, DART_RELEVANCE_HIGH);
+ _addSuggestion(Keyword.IMPLEMENTS, relevance: highKeyword);
}
}
@@ -744,12 +746,12 @@
Keyword.TYPEDEF,
Keyword.VAR,
Keyword.VOID
- ], DART_RELEVANCE_HIGH);
+ ], relevance: highKeyword);
if (request.featureSet.isEnabled(Feature.extension_methods)) {
- _addSuggestion(Keyword.EXTENSION, DART_RELEVANCE_HIGH);
+ _addSuggestion(Keyword.EXTENSION, relevance: highKeyword);
}
if (request.featureSet.isEnabled(Feature.non_nullable)) {
- _addSuggestion(Keyword.LATE, DART_RELEVANCE_HIGH);
+ _addSuggestion(Keyword.LATE, relevance: highKeyword);
}
}
@@ -787,27 +789,27 @@
void _addExtensionDeclarationKeywords(ExtensionDeclaration node) {
if (node.onKeyword == null || node.onKeyword.isSynthetic) {
- _addSuggestion(Keyword.ON, DART_RELEVANCE_HIGH);
+ _addSuggestion(Keyword.ON, relevance: highKeyword);
}
}
void _addImportDirectiveKeywords(ImportDirective node) {
- bool hasDeferredKeyword = node.deferredKeyword != null;
- bool hasAsKeyword = node.asKeyword != null;
+ var hasDeferredKeyword = node.deferredKeyword != null;
+ var hasAsKeyword = node.asKeyword != null;
if (!hasAsKeyword) {
- _addSuggestion(Keyword.AS, DART_RELEVANCE_HIGH);
+ _addSuggestion(Keyword.AS, relevance: highKeyword);
}
if (!hasDeferredKeyword) {
if (!hasAsKeyword) {
- _addSuggestion2(DEFERRED_AS, relevance: DART_RELEVANCE_HIGH);
+ _addSuggestion2(DEFERRED_AS, relevance: highKeyword);
} else if (entity == node.asKeyword) {
- _addSuggestion(Keyword.DEFERRED, DART_RELEVANCE_HIGH);
+ _addSuggestion(Keyword.DEFERRED, relevance: highKeyword);
}
}
if (!hasDeferredKeyword || hasAsKeyword) {
if (node.combinators.isEmpty) {
- _addSuggestion(Keyword.SHOW, DART_RELEVANCE_HIGH);
- _addSuggestion(Keyword.HIDE, DART_RELEVANCE_HIGH);
+ _addSuggestion(Keyword.SHOW, relevance: highKeyword);
+ _addSuggestion(Keyword.HIDE, relevance: highKeyword);
}
}
}
@@ -816,10 +818,10 @@
// Very simplistic suggestion because analyzer will warn if
// the on / implements clauses are out of order
if (node.onClause == null) {
- _addSuggestion(Keyword.ON, DART_RELEVANCE_HIGH);
+ _addSuggestion(Keyword.ON, relevance: highKeyword);
}
if (node.implementsClause == null) {
- _addSuggestion(Keyword.IMPLEMENTS, DART_RELEVANCE_HIGH);
+ _addSuggestion(Keyword.IMPLEMENTS, relevance: highKeyword);
}
}
@@ -864,32 +866,29 @@
}
}
- void _addSuggestion(Keyword keyword,
- [int relevance = DART_RELEVANCE_KEYWORD]) {
+ void _addSuggestion(Keyword keyword, {int relevance}) {
_addSuggestion2(keyword.lexeme, relevance: relevance);
}
- void _addSuggestion2(String completion,
- {int offset, int relevance = DART_RELEVANCE_KEYWORD}) {
+ void _addSuggestion2(String completion, {int offset, int relevance}) {
offset ??= completion.length;
suggestions.add(CompletionSuggestion(CompletionSuggestionKind.KEYWORD,
- relevance, completion, offset, 0, false, false));
+ relevance ?? defaultKeyword, completion, offset, 0, false, false));
}
- void _addSuggestions(List<Keyword> keywords,
- [int relevance = DART_RELEVANCE_KEYWORD]) {
+ void _addSuggestions(List<Keyword> keywords, {int relevance}) {
keywords.forEach((Keyword keyword) {
- _addSuggestion(keyword, relevance);
+ _addSuggestion(keyword, relevance: relevance);
});
}
bool _inAsyncMethodOrFunction(AstNode node) {
- FunctionBody body = node.thisOrAncestorOfType<FunctionBody>();
+ var body = node.thisOrAncestorOfType<FunctionBody>();
return body != null && body.isAsynchronous && body.star == null;
}
bool _inAsyncStarOrSyncStarMethodOrFunction(AstNode node) {
- FunctionBody body = node.thisOrAncestorOfType<FunctionBody>();
+ var body = node.thisOrAncestorOfType<FunctionBody>();
return body != null && body.keyword != null && body.star != null;
}
@@ -898,11 +897,11 @@
bool _inClassMemberBody(AstNode node) {
while (true) {
- AstNode body = node.thisOrAncestorOfType<FunctionBody>();
+ var body = node.thisOrAncestorOfType<FunctionBody>();
if (body == null) {
return false;
}
- AstNode parent = body.parent;
+ var parent = body.parent;
if (parent is ConstructorDeclaration || parent is MethodDeclaration) {
return true;
}
@@ -926,21 +925,21 @@
node.thisOrAncestorOfType<WhileStatement>() != null;
bool _isEntityAfterIfWithoutElse(AstNode node) {
- Block block = node?.thisOrAncestorOfType<Block>();
+ var block = node?.thisOrAncestorOfType<Block>();
if (block == null) {
return false;
}
- Object entity = this.entity;
+ var entity = this.entity;
if (entity is Statement) {
- int entityIndex = block.statements.indexOf(entity);
+ var entityIndex = block.statements.indexOf(entity);
if (entityIndex > 0) {
- Statement prevStatement = block.statements[entityIndex - 1];
+ var prevStatement = block.statements[entityIndex - 1];
return prevStatement is IfStatement &&
prevStatement.elseStatement == null;
}
}
if (entity is Token) {
- for (Statement statement in block.statements) {
+ for (var statement in block.statements) {
if (statement.endToken.next == entity) {
return statement is IfStatement && statement.elseStatement == null;
}
@@ -951,8 +950,8 @@
static bool _isPreviousTokenSynthetic(Object entity, TokenType type) {
if (entity is AstNode) {
- Token token = entity.beginToken;
- Token previousToken = entity.findPrevious(token);
+ var token = entity.beginToken;
+ var previousToken = entity.findPrevious(token);
return previousToken != null &&
previousToken.isSynthetic &&
previousToken.type == type;
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/library_prefix_contributor.dart b/pkg/analysis_server/lib/src/services/completion/dart/library_prefix_contributor.dart
index 8ecdc2d..3ed0ef1 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/library_prefix_contributor.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/library_prefix_contributor.dart
@@ -6,7 +6,6 @@
import 'package:analysis_server/src/provisional/completion/dart/completion_dart.dart';
import 'package:analysis_server/src/services/completion/dart/suggestion_builder.dart';
-import 'package:analyzer/dart/element/element.dart';
import '../../../protocol_server.dart'
show CompletionSuggestion, CompletionSuggestionKind;
@@ -32,7 +31,7 @@
// in which case not having one per library could be confusing.
var useNewRelevance = request.useNewRelevance;
var suggestions = <CompletionSuggestion>[];
- for (ImportElement element in imports) {
+ for (var element in imports) {
var completion = element.prefix?.name;
if (completion != null && completion.isNotEmpty) {
var libraryElement = element.importedLibrary;
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/local_constructor_contributor.dart b/pkg/analysis_server/lib/src/services/completion/dart/local_constructor_contributor.dart
index 0e8d54f..db6852f 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/local_constructor_contributor.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/local_constructor_contributor.dart
@@ -9,6 +9,7 @@
import 'package:analysis_server/src/provisional/completion/dart/completion_dart.dart';
import 'package:analysis_server/src/services/completion/dart/completion_manager.dart'
show DartCompletionRequestImpl;
+import 'package:analysis_server/src/services/completion/dart/feature_computer.dart';
import 'package:analysis_server/src/services/completion/dart/suggestion_builder.dart';
import 'package:analysis_server/src/services/completion/dart/utilities.dart';
import 'package:analyzer/dart/analysis/features.dart';
@@ -17,24 +18,22 @@
import 'package:analyzer/dart/element/nullability_suffix.dart';
import 'package:analyzer/dart/element/type.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart' as protocol
- show Element, ElementKind;
+ show ElementKind;
import 'package:analyzer_plugin/src/utilities/completion/optype.dart';
import 'package:analyzer_plugin/src/utilities/visitors/local_declaration_visitor.dart'
show LocalDeclarationVisitor;
-/// A contributor for calculating constructor suggestions
-/// for declarations in the local file.
+/// A contributor that produces suggestions based on the constructors declared
+/// in the same file in which suggestions were requested.
class LocalConstructorContributor extends DartCompletionContributor {
@override
Future<List<CompletionSuggestion>> computeSuggestions(
DartCompletionRequest request) async {
- // TODO(brianwilkerson) Determine whether this await is necessary.
- await null;
- OpType optype = (request as DartCompletionRequestImpl).opType;
+ var optype = (request as DartCompletionRequestImpl).opType;
// Collect suggestions from the specific child [AstNode] that contains
// the completion offset and all of its parents recursively.
- List<CompletionSuggestion> suggestions = <CompletionSuggestion>[];
+ var suggestions = <CompletionSuggestion>[];
if (!optype.isPrefixed) {
if (optype.includeConstructorSuggestions) {
_Visitor(request, suggestions, optype)
@@ -57,8 +56,8 @@
@override
void declaredClass(ClassDeclaration declaration) {
- bool found = false;
- for (ClassMember member in declaration.members) {
+ var found = false;
+ for (var member in declaration.members) {
if (member is ConstructorDeclaration) {
found = true;
_addSuggestion(declaration, member);
@@ -103,20 +102,29 @@
void declaredTopLevelVar(
VariableDeclarationList varList, VariableDeclaration varDecl) {}
- /// For the given class and constructor,
- /// add a suggestion of the form B(...) or B.name(...).
- /// If the given constructor is `null`
- /// then add a default constructor suggestion.
+ /// For the given class and constructor, add a suggestion of the form `B(...)`
+ /// or `B.name(...)`. If the given constructor is `null` then add a default
+ /// constructor suggestion.
void _addSuggestion(
ClassDeclaration classDecl, ConstructorDeclaration constructorDecl) {
- String completion = classDecl.name.name;
+ var completion = classDecl.name.name;
- ClassElement classElement = classDecl.declaredElement;
- int relevance = optype.returnValueSuggestionsFilter(
- _instantiateClassElement(classElement), DART_RELEVANCE_DEFAULT);
+ var classElement = classDecl.declaredElement;
+ var useNewRelevance = request.useNewRelevance;
+ int relevance;
+ if (useNewRelevance) {
+ var contextType = request.featureComputer
+ .computeContextType(request.target.containingNode);
+ var contextTypeFeature = request.featureComputer
+ .contextTypeFeature(contextType, classElement.thisType);
+ relevance = toRelevance(contextTypeFeature, Relevance.constructor);
+ } else {
+ relevance = optype.returnValueSuggestionsFilter(
+ _instantiateClassElement(classElement), DART_RELEVANCE_DEFAULT);
+ }
if (constructorDecl != null) {
- // Build a suggestion for explicitly declared constructor
- ConstructorElement element = constructorDecl.declaredElement;
+ // Build a suggestion for explicitly declared constructor.
+ var element = constructorDecl.declaredElement;
if (element == null) {
return;
}
@@ -124,30 +132,26 @@
return;
}
- String name = constructorDecl.name?.name;
+ var name = constructorDecl.name?.name;
if (name != null && name.isNotEmpty) {
completion = '$completion.$name';
}
- CompletionSuggestion suggestion = createSuggestion(element,
- completion: completion, relevance: relevance);
+ var suggestion = createSuggestion(element,
+ completion: completion,
+ relevance: relevance,
+ useNewRelevance: useNewRelevance);
if (suggestion != null) {
suggestions.add(suggestion);
}
} else if (!classElement.isAbstract) {
- // Build a suggestion for an implicit constructor
- protocol.Element element = createLocalElement(
+ // Build a suggestion for an implicit constructor.
+ var element = createLocalElement(
request.source, protocol.ElementKind.CONSTRUCTOR, null,
parameters: '()');
element.returnType = classDecl.name.name;
- CompletionSuggestion suggestion = CompletionSuggestion(
- CompletionSuggestionKind.INVOCATION,
- relevance,
- completion,
- completion.length,
- 0,
- false,
- false,
+ var suggestion = CompletionSuggestion(CompletionSuggestionKind.INVOCATION,
+ relevance, completion, completion.length, 0, false, false,
declaringType: classDecl.name.name,
element: element,
parameterNames: [],
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/local_library_contributor.dart b/pkg/analysis_server/lib/src/services/completion/dart/local_library_contributor.dart
index a6cd858..8ed08d6 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/local_library_contributor.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/local_library_contributor.dart
@@ -5,7 +5,7 @@
import 'dart:async';
import 'package:analysis_server/src/provisional/completion/dart/completion_dart.dart';
-import 'package:analysis_server/src/services/completion/dart/completion_manager.dart';
+import 'package:analysis_server/src/services/completion/dart/feature_computer.dart';
import 'package:analysis_server/src/services/completion/dart/suggestion_builder.dart'
show createSuggestion, ElementSuggestionBuilder;
import 'package:analyzer/dart/analysis/features.dart';
@@ -24,15 +24,23 @@
class LibraryElementSuggestionBuilder extends GeneralizingElementVisitor
with ElementSuggestionBuilder {
final DartCompletionRequest request;
+
final OpType optype;
+
+ DartType contextType;
+
@override
CompletionSuggestionKind kind;
+
final String prefix;
/// The set of libraries that have been, or are currently being, visited.
final Set<LibraryElement> visitedLibraries = <LibraryElement>{};
- LibraryElementSuggestionBuilder(this.request, this.optype, [this.prefix]) {
+ LibraryElementSuggestionBuilder(this.request, [this.prefix])
+ : optype = request.opType {
+ contextType = request.featureComputer
+ .computeContextType(request.target.containingNode);
kind = request.target.isFunctionalArgument()
? CompletionSuggestionKind.IDENTIFIER
: optype.suggestKind;
@@ -45,28 +53,50 @@
void visitClassElement(ClassElement element) {
if (optype.includeTypeNameSuggestions) {
// if includeTypeNameSuggestions, then use the filter
- int relevance = optype.typeNameSuggestionsFilter(
- _instantiateClassElement(element), DART_RELEVANCE_DEFAULT);
+ var useNewRelevance = request.useNewRelevance;
+ int relevance;
+ if (useNewRelevance) {
+ relevance = _relevanceForType(element.thisType);
+ } else {
+ relevance = optype.typeNameSuggestionsFilter(
+ _instantiateClassElement(element), DART_RELEVANCE_DEFAULT);
+ }
if (relevance != null) {
- addSuggestion(element, prefix: prefix, relevance: relevance);
+ addSuggestion(element,
+ prefix: prefix,
+ relevance: relevance,
+ useNewRelevance: useNewRelevance);
}
}
if (optype.includeConstructorSuggestions) {
- int relevance = optype.returnValueSuggestionsFilter(
- _instantiateClassElement(element), DART_RELEVANCE_DEFAULT);
- _addConstructorSuggestions(element, relevance);
+ var useNewRelevance = request.useNewRelevance;
+ int relevance;
+ if (useNewRelevance) {
+ relevance = _relevanceForType(element.thisType);
+ } else {
+ relevance = optype.returnValueSuggestionsFilter(
+ _instantiateClassElement(element), DART_RELEVANCE_DEFAULT);
+ }
+ _addConstructorSuggestions(element, relevance, useNewRelevance);
}
if (optype.includeReturnValueSuggestions) {
if (element.isEnum) {
- String enumName = element.displayName;
- int relevance = optype.returnValueSuggestionsFilter(
- _instantiateClassElement(element), DART_RELEVANCE_DEFAULT);
+ var enumName = element.displayName;
+ var useNewRelevance = request.useNewRelevance;
+ int relevance;
+ if (useNewRelevance) {
+ relevance = _relevanceForType(element.thisType);
+ } else {
+ relevance = optype.returnValueSuggestionsFilter(
+ _instantiateClassElement(element), DART_RELEVANCE_DEFAULT);
+ }
for (var field in element.fields) {
if (field.isEnumConstant) {
addSuggestion(field,
prefix: prefix,
relevance: relevance,
- elementCompletion: '$enumName.${field.name}');
+ elementCompletion: '$enumName.${field.name}',
+ useNewRelevance: useNewRelevance);
}
}
}
@@ -86,7 +116,17 @@
@override
void visitExtensionElement(ExtensionElement element) {
if (optype.includeReturnValueSuggestions) {
- addSuggestion(element, prefix: prefix, relevance: DART_RELEVANCE_DEFAULT);
+ var useNewRelevance = request.useNewRelevance;
+ int relevance;
+ if (useNewRelevance) {
+ relevance = _relevanceForType(element.extendedType);
+ } else {
+ relevance = DART_RELEVANCE_DEFAULT;
+ }
+ addSuggestion(element,
+ prefix: prefix,
+ relevance: relevance,
+ useNewRelevance: useNewRelevance);
}
element.visitChildren(this);
}
@@ -100,17 +140,29 @@
if (element.enclosingElement is! CompilationUnitElement) {
return;
}
- int relevance = element.library == containingLibrary
- ? DART_RELEVANCE_LOCAL_FUNCTION
- : DART_RELEVANCE_DEFAULT;
- DartType returnType = element.returnType;
+ var returnType = element.returnType;
+ var useNewRelevance = request.useNewRelevance;
+ int relevance;
+ if (useNewRelevance) {
+ relevance = _relevanceForType(returnType);
+ } else {
+ relevance = element.library == containingLibrary
+ ? DART_RELEVANCE_LOCAL_FUNCTION
+ : DART_RELEVANCE_DEFAULT;
+ }
if (returnType != null && returnType.isVoid) {
if (optype.includeVoidReturnSuggestions) {
- addSuggestion(element, prefix: prefix, relevance: relevance);
+ addSuggestion(element,
+ prefix: prefix,
+ relevance: relevance,
+ useNewRelevance: useNewRelevance);
}
} else {
if (optype.includeReturnValueSuggestions) {
- addSuggestion(element, prefix: prefix, relevance: relevance);
+ addSuggestion(element,
+ prefix: prefix,
+ relevance: relevance,
+ useNewRelevance: useNewRelevance);
}
}
}
@@ -118,10 +170,21 @@
@override
void visitFunctionTypeAliasElement(FunctionTypeAliasElement element) {
if (optype.includeTypeNameSuggestions) {
- int relevance = element.library == containingLibrary
- ? DART_RELEVANCE_LOCAL_FUNCTION
- : DART_RELEVANCE_DEFAULT;
- addSuggestion(element, prefix: prefix, relevance: relevance);
+ var useNewRelevance = request.useNewRelevance;
+ int relevance;
+ if (useNewRelevance) {
+ // TODO(brianwilkerson) Figure out whether there are any features that
+ // ought to be used here and what the right default value is.
+ relevance = 400;
+ } else {
+ relevance = element.library == containingLibrary
+ ? DART_RELEVANCE_LOCAL_FUNCTION
+ : DART_RELEVANCE_DEFAULT;
+ }
+ addSuggestion(element,
+ prefix: prefix,
+ relevance: relevance,
+ useNewRelevance: useNewRelevance);
}
}
@@ -135,34 +198,52 @@
@override
void visitPropertyAccessorElement(PropertyAccessorElement element) {
if (optype.includeReturnValueSuggestions) {
+ var useNewRelevance = request.useNewRelevance;
int relevance;
- if (element.library == containingLibrary) {
- if (element.enclosingElement is ClassElement) {
- relevance = DART_RELEVANCE_LOCAL_FIELD;
- } else {
- relevance = DART_RELEVANCE_LOCAL_TOP_LEVEL_VARIABLE;
- }
+ if (useNewRelevance) {
+ relevance = _relevanceForType(element.returnType);
} else {
- relevance = DART_RELEVANCE_DEFAULT;
+ if (element.library == containingLibrary) {
+ if (element.enclosingElement is ClassElement) {
+ relevance = DART_RELEVANCE_LOCAL_FIELD;
+ } else {
+ relevance = DART_RELEVANCE_LOCAL_TOP_LEVEL_VARIABLE;
+ }
+ } else {
+ relevance = DART_RELEVANCE_DEFAULT;
+ }
}
- addSuggestion(element, prefix: prefix, relevance: relevance);
+ addSuggestion(element,
+ prefix: prefix,
+ relevance: relevance,
+ useNewRelevance: useNewRelevance);
}
}
@override
void visitTopLevelVariableElement(TopLevelVariableElement element) {
if (optype.includeReturnValueSuggestions) {
- int relevance = element.library == containingLibrary
- ? DART_RELEVANCE_LOCAL_TOP_LEVEL_VARIABLE
- : DART_RELEVANCE_DEFAULT;
- addSuggestion(element, prefix: prefix, relevance: relevance);
+ var useNewRelevance = request.useNewRelevance;
+ int relevance;
+ if (useNewRelevance) {
+ relevance = _relevanceForType(element.type);
+ } else {
+ relevance = element.library == containingLibrary
+ ? DART_RELEVANCE_LOCAL_TOP_LEVEL_VARIABLE
+ : DART_RELEVANCE_DEFAULT;
+ }
+ addSuggestion(element,
+ prefix: prefix,
+ relevance: relevance,
+ useNewRelevance: useNewRelevance);
}
}
/// Add constructor suggestions for the given class.
- void _addConstructorSuggestions(ClassElement classElem, int relevance) {
- String className = classElem.name;
- for (ConstructorElement constructor in classElem.constructors) {
+ void _addConstructorSuggestions(
+ ClassElement classElem, int relevance, bool useNewRelevance) {
+ var className = classElem.name;
+ for (var constructor in classElem.constructors) {
if (constructor.isPrivate) {
continue;
}
@@ -170,10 +251,10 @@
continue;
}
- CompletionSuggestion suggestion =
- createSuggestion(constructor, relevance: relevance);
+ var suggestion = createSuggestion(constructor,
+ relevance: relevance, useNewRelevance: useNewRelevance);
if (suggestion != null) {
- String name = suggestion.completion;
+ var name = suggestion.completion;
name = name.isNotEmpty ? '$className.$name' : className;
if (prefix != null && prefix.isNotEmpty) {
name = '$prefix.$name';
@@ -204,11 +285,19 @@
nullabilitySuffix: nullabilitySuffix,
);
}
+
+ int _relevanceForType(DartType elementType) {
+ var contextTypeFeature =
+ request.featureComputer.contextTypeFeature(contextType, elementType);
+ // TODO(brianwilkerson) Figure out whether there are other features that
+ // ought to be used here and what the right default value is.
+ return toRelevance(contextTypeFeature, 800);
+ }
}
-/// A contributor for calculating suggestions for top level members
-/// in the library in which the completion is requested
-/// but outside the file in which the completion is requested.
+/// A contributor that produces suggestions based on the top level members in
+/// the library in which the completion is requested but outside the file in
+/// which the completion is requested.
class LocalLibraryContributor extends DartCompletionContributor {
@override
Future<List<CompletionSuggestion>> computeSuggestions(
@@ -217,16 +306,13 @@
return const <CompletionSuggestion>[];
}
- List<CompilationUnitElement> libraryUnits =
- request.result.unit.declaredElement.library.units;
+ var libraryUnits = request.result.unit.declaredElement.library.units;
if (libraryUnits == null) {
return const <CompletionSuggestion>[];
}
- OpType optype = (request as DartCompletionRequestImpl).opType;
- LibraryElementSuggestionBuilder visitor =
- LibraryElementSuggestionBuilder(request, optype);
- for (CompilationUnitElement unit in libraryUnits) {
+ var visitor = LibraryElementSuggestionBuilder(request);
+ for (var unit in libraryUnits) {
if (unit != null && unit.source != request.source) {
unit.accept(visitor);
}
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/local_reference_contributor.dart b/pkg/analysis_server/lib/src/services/completion/dart/local_reference_contributor.dart
index f630cb3..2c27a26 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/local_reference_contributor.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/local_reference_contributor.dart
@@ -7,8 +7,7 @@
import 'package:analysis_server/src/protocol_server.dart'
show CompletionSuggestion, CompletionSuggestionKind, Location;
import 'package:analysis_server/src/provisional/completion/dart/completion_dart.dart';
-import 'package:analysis_server/src/services/completion/dart/completion_manager.dart'
- show DartCompletionRequestImpl;
+import 'package:analysis_server/src/services/completion/dart/feature_computer.dart';
import 'package:analysis_server/src/services/completion/dart/utilities.dart';
import 'package:analysis_server/src/utilities/strings.dart';
import 'package:analyzer/dart/analysis/features.dart';
@@ -26,43 +25,41 @@
show LocalDeclarationVisitor;
import 'package:meta/meta.dart';
-/// A contributor for calculating suggestions for declarations in the local
-/// file and containing library.
+/// A contributor that produces suggestions based on the declarations in the
+/// local file and containing library.
class LocalReferenceContributor extends DartCompletionContributor {
@override
Future<List<CompletionSuggestion>> computeSuggestions(
DartCompletionRequest request) async {
- // TODO(brianwilkerson) Determine whether this await is necessary.
- await null;
- OpType optype = (request as DartCompletionRequestImpl).opType;
- AstNode node = request.target.containingNode;
+ var opType = request.opType;
+ var node = request.target.containingNode;
- // Suggest local fields for constructor initializers
- bool suggestLocalFields = node is ConstructorDeclaration &&
+ // Suggest local fields for constructor initializers.
+ var suggestLocalFields = node is ConstructorDeclaration &&
node.initializers.contains(request.target.entity);
- // Collect suggestions from the specific child [AstNode] that contains
- // the completion offset and all of its parents recursively.
- if (!optype.isPrefixed) {
- if (optype.includeReturnValueSuggestions ||
- optype.includeTypeNameSuggestions ||
- optype.includeVoidReturnSuggestions ||
+ // Collect suggestions from the specific child [AstNode] that contains the
+ // completion offset and all of its parents recursively.
+ if (!opType.isPrefixed) {
+ if (opType.includeReturnValueSuggestions ||
+ opType.includeTypeNameSuggestions ||
+ opType.includeVoidReturnSuggestions ||
suggestLocalFields) {
- // Do not suggest local vars within the current expression
+ // Do not suggest local variables within the current expression.
while (node is Expression) {
node = node.parent;
}
- // Do not suggest loop variable of a ForEachStatement
- // when completing the expression of the ForEachStatement
+ // Do not suggest loop variable of a ForEachStatement when completing
+ // the expression of the ForEachStatement.
if (node is ForStatement && node.forLoopParts is ForEachParts) {
node = node.parent;
} else if (node is ForEachParts) {
node = node.parent.parent;
}
- _LocalVisitor visitor = _LocalVisitor(request, request.offset, optype,
- suggestLocalFields: suggestLocalFields);
+ var visitor =
+ _LocalVisitor(request, suggestLocalFields: suggestLocalFields);
visitor.visit(node);
return visitor.suggestions;
}
@@ -74,51 +71,76 @@
/// A visitor for collecting suggestions from the most specific child [AstNode]
/// that contains the completion offset to the [CompilationUnit].
class _LocalVisitor extends LocalDeclarationVisitor {
+ /// The request for which suggestions are being computed.
final DartCompletionRequest request;
- final OpType optype;
+
+ /// The op type associated with the request.
+ final OpType opType;
+
+ /// A flag indicating whether the suggestions should use the new relevance
+ /// scores.
+ final bool useNewRelevance;
+
+ /// A flag indicating whether the target of the request is a function-valued
+ /// argument in an argument list.
+ final bool targetIsFunctionalArgument;
+
+ /// A flag indicating whether local fields should be suggested.
final bool suggestLocalFields;
+
final Map<String, CompletionSuggestion> suggestionMap =
<String, CompletionSuggestion>{};
+
+ /// The context type of the completion offset, or `null` if there is no
+ /// context type at that location.
+ DartType contextType;
+
+ /// Only used when [useNewRelevance] is `false`.
int privateMemberRelevance = DART_RELEVANCE_DEFAULT;
- bool targetIsFunctionalArgument;
- _LocalVisitor(this.request, int offset, this.optype,
- {this.suggestLocalFields})
- : super(offset) {
- // Suggestions for inherited members provided by
- // InheritedReferenceContributor
- targetIsFunctionalArgument = request.target.isFunctionalArgument();
-
- // If user typed identifier starting with '_'
- // then do not suppress the relevance of private members
- var data = request.result != null
- ? request.result.content
- : request.sourceContents;
- int offset = request.offset;
- if (data != null && 0 < offset && offset <= data.length) {
- bool isIdentifierChar(int index) {
- int code = data.codeUnitAt(index);
- return isLetterOrDigit(code) || code == CHAR_UNDERSCORE;
- }
-
- if (isIdentifierChar(offset - 1)) {
- while (offset > 0 && isIdentifierChar(offset - 1)) {
- --offset;
+ _LocalVisitor(this.request, {@required this.suggestLocalFields})
+ : opType = request.opType,
+ useNewRelevance = request.useNewRelevance,
+ targetIsFunctionalArgument = request.target.isFunctionalArgument(),
+ super(request.offset) {
+ // Suggestions for inherited members are provided by
+ // InheritedReferenceContributor.
+ if (useNewRelevance) {
+ contextType = request.featureComputer
+ .computeContextType(request.target.containingNode);
+ } else {
+ // If the user typed an identifier starting with '_' then do not suppress
+ // the relevance of private members.
+ var data = request.result != null
+ ? request.result.content
+ : request.sourceContents;
+ var offset = request.offset;
+ if (data != null && 0 < offset && offset <= data.length) {
+ bool isIdentifierChar(int index) {
+ var code = data.codeUnitAt(index);
+ return isLetterOrDigit(code) || code == CHAR_UNDERSCORE;
}
- if (data.codeUnitAt(offset) == CHAR_UNDERSCORE) {
- privateMemberRelevance = null;
+
+ if (isIdentifierChar(offset - 1)) {
+ while (offset > 0 && isIdentifierChar(offset - 1)) {
+ --offset;
+ }
+ if (data.codeUnitAt(offset) == CHAR_UNDERSCORE) {
+ privateMemberRelevance = null;
+ }
}
}
}
}
+ /// Return the suggestions that have been computed.
List<CompletionSuggestion> get suggestions => suggestionMap.values.toList();
TypeProvider get typeProvider => request.libraryElement.typeProvider;
@override
void declaredClass(ClassDeclaration declaration) {
- if (optype.includeTypeNameSuggestions) {
+ if (opType.includeTypeNameSuggestions) {
_addLocalSuggestion_includeTypeNameSuggestions(
declaration.documentationComment,
declaration.name,
@@ -133,7 +155,7 @@
@override
void declaredClassTypeAlias(ClassTypeAlias declaration) {
- if (optype.includeTypeNameSuggestions) {
+ if (opType.includeTypeNameSuggestions) {
_addLocalSuggestion_includeTypeNameSuggestions(
declaration.documentationComment,
declaration.name,
@@ -148,7 +170,7 @@
@override
void declaredEnum(EnumDeclaration declaration) {
- if (optype.includeTypeNameSuggestions) {
+ if (opType.includeTypeNameSuggestions) {
_addLocalSuggestion_includeTypeNameSuggestions(
declaration.documentationComment,
declaration.name,
@@ -157,7 +179,7 @@
isDeprecated: isDeprecated(declaration),
type: _instantiateClassElement(declaration.declaredElement),
);
- for (EnumConstantDeclaration enumConstant in declaration.constants) {
+ for (var enumConstant in declaration.constants) {
if (!enumConstant.isSynthetic) {
_addLocalSuggestion_includeReturnValueSuggestions_enumConstant(
enumConstant,
@@ -171,7 +193,7 @@
@override
void declaredExtension(ExtensionDeclaration declaration) {
- if (optype.includeReturnValueSuggestions && declaration.name != null) {
+ if (opType.includeReturnValueSuggestions && declaration.name != null) {
_addLocalSuggestion_includeReturnValueSuggestions(
declaration.documentationComment,
declaration.name,
@@ -185,48 +207,58 @@
@override
void declaredField(FieldDeclaration fieldDecl, VariableDeclaration varDecl) {
- if ((optype.includeReturnValueSuggestions &&
- (!optype.inStaticMethodBody || fieldDecl.isStatic)) ||
+ if ((opType.includeReturnValueSuggestions &&
+ (!opType.inStaticMethodBody || fieldDecl.isStatic)) ||
suggestLocalFields) {
- bool deprecated = isDeprecated(fieldDecl) || isDeprecated(varDecl);
- TypeAnnotation typeName = fieldDecl.fields.type;
+ var deprecated = isDeprecated(fieldDecl) || isDeprecated(varDecl);
+ var fieldType = varDecl.declaredElement.type;
+ var typeName = fieldDecl.fields.type;
+ int relevance;
+ if (useNewRelevance) {
+ relevance = _relevanceForType(fieldType);
+ } else {
+ relevance = DART_RELEVANCE_LOCAL_FIELD;
+ }
_addLocalSuggestion_includeReturnValueSuggestions(
fieldDecl.documentationComment,
varDecl.name,
typeName,
protocol.ElementKind.FIELD,
isDeprecated: deprecated,
- relevance: DART_RELEVANCE_LOCAL_FIELD,
+ relevance: relevance,
classDecl: fieldDecl.parent,
- type: varDecl.declaredElement.type,
+ type: fieldType,
);
}
}
@override
void declaredFunction(FunctionDeclaration declaration) {
- if (optype.includeReturnValueSuggestions ||
- optype.includeVoidReturnSuggestions) {
- TypeAnnotation typeName = declaration.returnType;
+ if (opType.includeReturnValueSuggestions ||
+ opType.includeVoidReturnSuggestions) {
+ var typeName = declaration.returnType;
protocol.ElementKind elemKind;
- int relevance = DART_RELEVANCE_DEFAULT;
+ var relevance = DART_RELEVANCE_DEFAULT;
if (declaration.isGetter) {
elemKind = protocol.ElementKind.GETTER;
relevance = DART_RELEVANCE_LOCAL_ACCESSOR;
} else if (declaration.isSetter) {
- if (!optype.includeVoidReturnSuggestions) {
+ if (!opType.includeVoidReturnSuggestions) {
return;
}
elemKind = protocol.ElementKind.SETTER;
typeName = NO_RETURN_TYPE;
relevance = DART_RELEVANCE_LOCAL_ACCESSOR;
} else {
- if (!optype.includeVoidReturnSuggestions && _isVoid(typeName)) {
+ if (!opType.includeVoidReturnSuggestions && _isVoid(typeName)) {
return;
}
elemKind = protocol.ElementKind.FUNCTION;
relevance = DART_RELEVANCE_LOCAL_FUNCTION;
}
+ if (useNewRelevance) {
+ relevance = _relevanceForType(declaration.declaredElement.returnType);
+ }
_addLocalSuggestion_includeReturnValueSuggestions(
declaration.documentationComment,
declaration.name,
@@ -242,7 +274,7 @@
@override
void declaredFunctionTypeAlias(FunctionTypeAlias declaration) {
- if (optype.includeTypeNameSuggestions) {
+ if (opType.includeTypeNameSuggestions) {
// TODO (danrubel) determine parameters and return type
_addLocalSuggestion_includeTypeNameSuggestions(
declaration.documentationComment,
@@ -258,7 +290,7 @@
@override
void declaredGenericTypeAlias(GenericTypeAlias declaration) {
- if (optype.includeTypeNameSuggestions) {
+ if (opType.includeTypeNameSuggestions) {
// TODO (danrubel) determine parameters and return type
_addLocalSuggestion_includeTypeNameSuggestions(
declaration.documentationComment,
@@ -279,47 +311,58 @@
@override
void declaredLocalVar(SimpleIdentifier id, TypeAnnotation typeName) {
- if (optype.includeReturnValueSuggestions) {
+ if (opType.includeReturnValueSuggestions) {
+ var variableType = (id.staticElement as LocalVariableElement)?.type;
+ int relevance;
+ if (useNewRelevance) {
+ // TODO(brianwilkerson) Use the distance to the local variable as
+ // another feature.
+ relevance = _relevanceForType(variableType);
+ } else {
+ relevance = DART_RELEVANCE_LOCAL_VARIABLE;
+ }
_addLocalSuggestion_includeReturnValueSuggestions(
null,
id,
typeName,
protocol.ElementKind.LOCAL_VARIABLE,
- relevance: DART_RELEVANCE_LOCAL_VARIABLE,
- type: (id.staticElement as LocalVariableElement)?.type ??
- typeProvider.dynamicType,
+ relevance: relevance,
+ type: variableType ?? typeProvider.dynamicType,
);
}
}
@override
void declaredMethod(MethodDeclaration declaration) {
- if ((optype.includeReturnValueSuggestions ||
- optype.includeVoidReturnSuggestions) &&
- (!optype.inStaticMethodBody || declaration.isStatic)) {
+ if ((opType.includeReturnValueSuggestions ||
+ opType.includeVoidReturnSuggestions) &&
+ (!opType.inStaticMethodBody || declaration.isStatic)) {
protocol.ElementKind elemKind;
FormalParameterList param;
- TypeAnnotation typeName = declaration.returnType;
- int relevance = DART_RELEVANCE_DEFAULT;
+ var typeName = declaration.returnType;
+ var relevance = DART_RELEVANCE_DEFAULT;
if (declaration.isGetter) {
elemKind = protocol.ElementKind.GETTER;
param = null;
relevance = DART_RELEVANCE_LOCAL_ACCESSOR;
} else if (declaration.isSetter) {
- if (!optype.includeVoidReturnSuggestions) {
+ if (!opType.includeVoidReturnSuggestions) {
return;
}
elemKind = protocol.ElementKind.SETTER;
typeName = NO_RETURN_TYPE;
relevance = DART_RELEVANCE_LOCAL_ACCESSOR;
} else {
- if (!optype.includeVoidReturnSuggestions && _isVoid(typeName)) {
+ if (!opType.includeVoidReturnSuggestions && _isVoid(typeName)) {
return;
}
elemKind = protocol.ElementKind.METHOD;
param = declaration.parameters;
relevance = DART_RELEVANCE_LOCAL_METHOD;
}
+ if (useNewRelevance) {
+ relevance = _relevanceForType(declaration.declaredElement.returnType);
+ }
_addLocalSuggestion_includeReturnValueSuggestions(
declaration.documentationComment,
declaration.name,
@@ -337,7 +380,7 @@
@override
void declaredMixin(MixinDeclaration declaration) {
- if (optype.includeTypeNameSuggestions) {
+ if (opType.includeTypeNameSuggestions) {
_addLocalSuggestion_includeTypeNameSuggestions(
declaration.documentationComment,
declaration.name,
@@ -352,14 +395,21 @@
@override
void declaredParam(SimpleIdentifier id, TypeAnnotation typeName) {
- if (optype.includeReturnValueSuggestions) {
+ if (opType.includeReturnValueSuggestions) {
+ var parameterType = (id.staticElement as VariableElement).type;
+ int relevance;
+ if (useNewRelevance) {
+ relevance = _relevanceForType(parameterType);
+ } else {
+ relevance = DART_RELEVANCE_PARAMETER;
+ }
_addLocalSuggestion_includeReturnValueSuggestions(
null,
id,
typeName,
protocol.ElementKind.PARAMETER,
- relevance: DART_RELEVANCE_PARAMETER,
- type: (id.staticElement as VariableElement).type,
+ relevance: relevance,
+ type: parameterType,
);
}
}
@@ -367,22 +417,35 @@
@override
void declaredTopLevelVar(
VariableDeclarationList varList, VariableDeclaration varDecl) {
- if (optype.includeReturnValueSuggestions) {
+ if (opType.includeReturnValueSuggestions) {
+ var variableType = varDecl.declaredElement.type;
+ int relevance;
+ if (useNewRelevance) {
+ relevance = _relevanceForType(variableType);
+ } else {
+ relevance = DART_RELEVANCE_LOCAL_TOP_LEVEL_VARIABLE;
+ }
_addLocalSuggestion_includeReturnValueSuggestions(
varDecl.documentationComment,
varDecl.name,
varList.type,
protocol.ElementKind.TOP_LEVEL_VARIABLE,
isDeprecated: isDeprecated(varList) || isDeprecated(varDecl),
- relevance: DART_RELEVANCE_LOCAL_TOP_LEVEL_VARIABLE,
- type: varDecl.declaredElement.type,
+ relevance: relevance,
+ type: variableType,
);
}
}
@override
void declaredTypeParameter(TypeParameter node) {
- if (optype.includeTypeNameSuggestions) {
+ if (opType.includeTypeNameSuggestions) {
+ int relevance;
+ if (useNewRelevance) {
+ relevance = Relevance.typeParameter;
+ } else {
+ relevance = DART_RELEVANCE_TYPE_PARAMETER;
+ }
_addLocalSuggestion(
null,
node.name,
@@ -390,7 +453,7 @@
protocol.ElementKind.TYPE_PARAMETER,
isDeprecated: isDeprecated(node),
kind: CompletionSuggestionKind.IDENTIFIER,
- relevance: DART_RELEVANCE_TYPE_PARAMETER,
+ relevance: relevance,
);
}
}
@@ -403,15 +466,19 @@
CompletionSuggestionKind kind,
FormalParameterList param,
int relevance = DART_RELEVANCE_DEFAULT}) {
+ if (id == null) {
+ return null;
+ }
kind ??= targetIsFunctionalArgument
? CompletionSuggestionKind.IDENTIFIER
- : optype.suggestKind;
- CompletionSuggestion suggestion = createLocalSuggestion(
+ : opType.suggestKind;
+ var suggestion = _createLocalSuggestion(
id, isDeprecated, relevance, typeName,
classDecl: classDecl, kind: kind);
if (suggestion != null) {
_setDocumentation(suggestion, documentationComment);
- if (privateMemberRelevance != null &&
+ if (!useNewRelevance &&
+ privateMemberRelevance != null &&
suggestion.completion.startsWith('_')) {
suggestion.relevance = privateMemberRelevance;
}
@@ -432,34 +499,27 @@
void _addLocalSuggestion_enumConstant(
EnumConstantDeclaration constantDeclaration,
EnumDeclaration enumDeclaration,
- {bool isAbstract = false,
- bool isDeprecated = false,
+ {bool isDeprecated = false,
int relevance = DART_RELEVANCE_DEFAULT}) {
- String completion =
- '${enumDeclaration.name.name}.${constantDeclaration.name.name}';
- CompletionSuggestion suggestion = CompletionSuggestion(
- CompletionSuggestionKind.INVOCATION,
- isDeprecated ? DART_RELEVANCE_LOW : relevance,
- completion,
- completion.length,
- 0,
- isDeprecated,
- false,
- returnType: enumDeclaration.name.name);
+ var constantNameNode = constantDeclaration.name;
+ var constantName = constantNameNode.name;
+ var enumName = enumDeclaration.name.name;
+ var completion = '$enumName.$constantName';
+ if (!useNewRelevance) {
+ relevance = isDeprecated ? DART_RELEVANCE_LOW : relevance;
+ }
+ var suggestion = CompletionSuggestion(CompletionSuggestionKind.INVOCATION,
+ relevance, completion, completion.length, 0, isDeprecated, false,
+ returnType: enumName);
suggestionMap.putIfAbsent(suggestion.completion, () => suggestion);
- int flags = protocol.Element.makeFlags(
- isAbstract: isAbstract,
+ var flags = protocol.Element.makeFlags(
isDeprecated: isDeprecated,
- isPrivate: Identifier.isPrivateName(constantDeclaration.name.name));
- suggestion.element = protocol.Element(protocol.ElementKind.ENUM_CONSTANT,
- constantDeclaration.name.name, flags,
- location: Location(
- request.source.fullName,
- constantDeclaration.name.offset,
- constantDeclaration.name.length,
- 0,
- 0));
+ isPrivate: Identifier.isPrivateName(constantName));
+ suggestion.element = protocol.Element(
+ protocol.ElementKind.ENUM_CONSTANT, constantName, flags,
+ location: Location(request.source.fullName, constantNameNode.offset,
+ constantNameNode.length, 0, 0));
}
void _addLocalSuggestion_includeReturnValueSuggestions(
@@ -473,7 +533,9 @@
FormalParameterList param,
int relevance = DART_RELEVANCE_DEFAULT,
@required DartType type}) {
- relevance = optype.returnValueSuggestionsFilter(type, relevance);
+ if (!useNewRelevance) {
+ relevance = opType.returnValueSuggestionsFilter(type, relevance);
+ }
if (relevance != null) {
_addLocalSuggestion(documentationComment, id, typeName, elemKind,
isAbstract: isAbstract,
@@ -487,17 +549,18 @@
void _addLocalSuggestion_includeReturnValueSuggestions_enumConstant(
EnumConstantDeclaration constantDeclaration,
EnumDeclaration enumDeclaration,
- {bool isAbstract = false,
- bool isDeprecated = false,
- int relevance = DART_RELEVANCE_DEFAULT}) {
- ClassElement classElement = enumDeclaration.declaredElement;
- relevance = optype.returnValueSuggestionsFilter(
- _instantiateClassElement(classElement), relevance);
+ {@required bool isDeprecated}) {
+ var enumElement = enumDeclaration.declaredElement;
+ int relevance;
+ if (useNewRelevance) {
+ relevance = _relevanceForType(enumElement.thisType);
+ } else {
+ relevance = opType.returnValueSuggestionsFilter(
+ _instantiateClassElement(enumElement), DART_RELEVANCE_DEFAULT);
+ }
if (relevance != null) {
_addLocalSuggestion_enumConstant(constantDeclaration, enumDeclaration,
- isAbstract: isAbstract,
- isDeprecated: isDeprecated,
- relevance: relevance);
+ isDeprecated: isDeprecated, relevance: relevance);
}
}
@@ -508,17 +571,18 @@
protocol.ElementKind elemKind,
{bool isAbstract = false,
bool isDeprecated = false,
- ClassDeclaration classDecl,
- FormalParameterList param,
- int relevance = DART_RELEVANCE_DEFAULT,
@required DartType type}) {
- relevance = optype.typeNameSuggestionsFilter(type, relevance);
+ int relevance;
+ if (useNewRelevance) {
+ relevance = _relevanceForType(type);
+ } else {
+ relevance =
+ opType.typeNameSuggestionsFilter(type, DART_RELEVANCE_DEFAULT);
+ }
if (relevance != null) {
_addLocalSuggestion(documentationComment, id, typeName, elemKind,
isAbstract: isAbstract,
isDeprecated: isDeprecated,
- classDecl: classDecl,
- param: param,
relevance: relevance);
}
}
@@ -532,7 +596,7 @@
suggestion.parameterTypes = paramList.map((FormalParameter param) {
TypeAnnotation type;
if (param is DefaultFormalParameter) {
- NormalFormalParameter child = param.parameter;
+ var child = param.parameter;
if (child is SimpleFormalParameter) {
type = child.type;
} else if (child is FieldFormalParameter) {
@@ -548,7 +612,7 @@
return 'dynamic';
}
if (type is TypeName) {
- Identifier typeId = type.name;
+ var typeId = type.name;
if (typeId == null) {
return 'dynamic';
}
@@ -558,12 +622,12 @@
return 'dynamic';
}).toList();
- Iterable<ParameterElement> requiredParameters = paramList
+ var requiredParameters = paramList
.where((FormalParameter param) => param.isRequiredPositional)
.map((p) => p.declaredElement);
suggestion.requiredParameterCount = requiredParameters.length;
- Iterable<ParameterElement> namedParameters = paramList
+ var namedParameters = paramList
.where((FormalParameter param) => param.isNamed)
.map((p) => p.declaredElement);
suggestion.hasNamedParameters = namedParameters.isNotEmpty;
@@ -571,6 +635,29 @@
addDefaultArgDetails(suggestion, null, requiredParameters, namedParameters);
}
+ /// Create a new suggestion based upon the given information. Return the new
+ /// suggestion or `null` if it could not be created.
+ CompletionSuggestion _createLocalSuggestion(SimpleIdentifier id,
+ bool isDeprecated, int relevance, TypeAnnotation returnType,
+ {ClassOrMixinDeclaration classDecl,
+ @required CompletionSuggestionKind kind}) {
+ var completion = id.name;
+ if (completion == null || completion.isEmpty || completion == '_') {
+ return null;
+ }
+ if (!useNewRelevance) {
+ relevance = isDeprecated ? DART_RELEVANCE_LOW : relevance;
+ }
+ var suggestion = CompletionSuggestion(
+ kind, relevance, completion, completion.length, 0, isDeprecated, false,
+ returnType: nameForType(id, returnType));
+ var className = classDecl?.name?.name;
+ if (className != null && className.isNotEmpty) {
+ suggestion.declaringType = className;
+ }
+ return suggestion;
+ }
+
InterfaceType _instantiateClassElement(ClassElement element) {
var typeParameters = element.typeParameters;
var typeArguments = const <DartType>[];
@@ -611,7 +698,7 @@
bool _isVoid(TypeAnnotation returnType) {
if (returnType is TypeName) {
- Identifier id = returnType.name;
+ var id = returnType.name;
if (id != null && id.name == 'void') {
return true;
}
@@ -619,16 +706,26 @@
return false;
}
+ /// Return the relevance for an element with the given [elementType].
+ int _relevanceForType(DartType elementType) {
+ var contextTypeFeature =
+ request.featureComputer.contextTypeFeature(contextType, elementType);
+ // TODO(brianwilkerson) Figure out whether there are other features that
+ // ought to be used here and what the right default value is. It's possible
+ // that the right default value depends on where this is called from.
+ return toRelevance(contextTypeFeature, 800);
+ }
+
/// If the given [documentationComment] is not `null`, fill the [suggestion]
/// documentation fields.
static void _setDocumentation(
CompletionSuggestion suggestion, Comment documentationComment) {
if (documentationComment != null) {
- String text = documentationComment.tokens
+ var text = documentationComment.tokens
.map((Token t) => t.toString())
.join('\n')
.replaceAll('\r\n', '\n');
- String doc = getDartDocPlainText(text);
+ var doc = getDartDocPlainText(text);
suggestion.docComplete = doc;
suggestion.docSummary = getDartDocSummary(doc);
}
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/override_contributor.dart b/pkg/analysis_server/lib/src/services/completion/dart/override_contributor.dart
index 5c11d07..bfecf44 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/override_contributor.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/override_contributor.dart
@@ -15,7 +15,6 @@
import 'package:analyzer/dart/element/nullability_suffix.dart';
import 'package:analyzer/dart/element/type.dart';
import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
-import 'package:analyzer/src/generated/source.dart';
import 'package:analyzer_plugin/src/utilities/completion/completion_target.dart';
import 'package:analyzer_plugin/utilities/change_builder/change_builder_dart.dart';
import 'package:analyzer_plugin/utilities/range_factory.dart';
@@ -26,7 +25,7 @@
@override
Future<List<CompletionSuggestion>> computeSuggestions(
DartCompletionRequest request) async {
- SimpleIdentifier targetId = _getTargetId(request.target);
+ var targetId = _getTargetId(request.target);
if (targetId == null) {
return const <CompletionSuggestion>[];
}
@@ -46,9 +45,9 @@
_namesToOverride(classElem.librarySource.uri, interface);
// Build suggestions
- List<CompletionSuggestion> suggestions = <CompletionSuggestion>[];
- for (Name name in namesToOverride) {
- ExecutableElement element = interfaceMap[name];
+ var suggestions = <CompletionSuggestion>[];
+ for (var name in namesToOverride) {
+ var element = interfaceMap[name];
// Gracefully degrade if the overridden element has not been resolved.
if (element.returnType != null) {
var invokeSuper = interface.isSuperImplemented(name);
@@ -87,9 +86,9 @@
var sourceEdits = fileEdits[0].edits;
if (sourceEdits.length != 1) return null;
- String replacement = sourceEdits[0].replacement;
- String completion = replacement.trim();
- String overrideAnnotation = '@override';
+ var replacement = sourceEdits[0].replacement;
+ var completion = replacement.trim();
+ var overrideAnnotation = '@override';
if (_hasOverride(request.target.containingNode) &&
completion.startsWith(overrideAnnotation)) {
completion = completion.substring(overrideAnnotation.length).trim();
@@ -98,14 +97,14 @@
return null;
}
- SourceRange selectionRange = builder.selectionRange;
+ var selectionRange = builder.selectionRange;
if (selectionRange == null) {
return null;
}
- int offsetDelta = targetId.offset + replacement.indexOf(completion);
- String displayText =
+ var offsetDelta = targetId.offset + replacement.indexOf(completion);
+ var displayText =
displayTextBuffer.isNotEmpty ? displayTextBuffer.toString() : null;
- CompletionSuggestion suggestion = CompletionSuggestion(
+ var suggestion = CompletionSuggestion(
CompletionSuggestionKind.OVERRIDE,
request.useNewRelevance ? Relevance.override : DART_RELEVANCE_HIGH,
completion,
@@ -121,14 +120,14 @@
/// If the target looks like a partial identifier inside a class declaration
/// then return that identifier, otherwise return `null`.
SimpleIdentifier _getTargetId(CompletionTarget target) {
- AstNode node = target.containingNode;
+ var node = target.containingNode;
if (node is ClassOrMixinDeclaration) {
- Object entity = target.entity;
+ var entity = target.entity;
if (entity is FieldDeclaration) {
return _getTargetIdFromVarList(entity.fields);
}
} else if (node is FieldDeclaration) {
- Object entity = target.entity;
+ var entity = target.entity;
if (entity is VariableDeclarationList) {
return _getTargetIdFromVarList(entity);
}
@@ -137,10 +136,10 @@
}
SimpleIdentifier _getTargetIdFromVarList(VariableDeclarationList fields) {
- NodeList<VariableDeclaration> variables = fields.variables;
+ var variables = fields.variables;
if (variables.length == 1) {
- VariableDeclaration variable = variables[0];
- SimpleIdentifier targetId = variable.name;
+ var variable = variables[0];
+ var targetId = variable.name;
if (targetId.name.isEmpty) {
// analyzer parser
// Actual: class C { foo^ }
@@ -160,8 +159,8 @@
/// Return `true` if the given [node] has an `override` annotation.
bool _hasOverride(AstNode node) {
if (node is AnnotatedNode) {
- NodeList<Annotation> metadata = node.metadata;
- for (Annotation annotation in metadata) {
+ var metadata = node.metadata;
+ for (var annotation in metadata) {
if (annotation.name.name == 'override' &&
annotation.arguments == null) {
return true;
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/static_member_contributor.dart b/pkg/analysis_server/lib/src/services/completion/dart/static_member_contributor.dart
index 988a547..2ef8b70 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/static_member_contributor.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/static_member_contributor.dart
@@ -23,16 +23,16 @@
@override
Future<List<CompletionSuggestion>> computeSuggestions(
DartCompletionRequest request) async {
- Expression targetId = request.dotTarget;
+ var targetId = request.dotTarget;
if (targetId is Identifier && !request.target.isCascade) {
- Element elem = targetId.staticElement;
+ var elem = targetId.staticElement;
if (elem is ClassElement || elem is ExtensionElement) {
if (request.libraryElement == null) {
// Gracefully degrade if the library could not be determined, such as
// a detached part file or source change.
return const <CompletionSuggestion>[];
}
- _SuggestionBuilder builder = _SuggestionBuilder(request);
+ var builder = _SuggestionBuilder(request);
elem.accept(builder);
return builder.suggestions;
}
@@ -103,7 +103,7 @@
return;
}
}
- String completion = element.displayName;
+ var completion = element.displayName;
if (completion == null || completion.isEmpty) {
return;
}
@@ -116,7 +116,7 @@
relevance = _computeRelevance(
contextType: contextType, hasDeprecated: hasDeprecated);
}
- CompletionSuggestion suggestion = createSuggestion(element,
+ var suggestion = createSuggestion(element,
completion: completion,
relevance: relevance,
useNewRelevance: useNewRelevance);
@@ -144,7 +144,7 @@
/// Determine whether the [element] is one of the synthetic enum accessors
/// for which we should generate a suggestion.
bool _isSpecialEnumField(FieldElement element) {
- Element parent = element.enclosingElement;
+ var parent = element.enclosingElement;
if (parent is ClassElement && parent.isEnum) {
return element.name == 'values';
}
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart b/pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart
index c270a1a..0831608 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart
@@ -13,7 +13,6 @@
import 'package:analysis_server/src/services/completion/dart/feature_computer.dart';
import 'package:analysis_server/src/services/completion/dart/utilities.dart';
import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/dart/element/type.dart';
import 'package:analyzer/dart/element/visitor.dart';
import 'package:analyzer/src/util/comment.dart';
import 'package:meta/meta.dart';
@@ -34,20 +33,20 @@
}
completion ??= element.displayName;
kind ??= CompletionSuggestionKind.INVOCATION;
- bool isDeprecated = element.hasDeprecated;
+ var isDeprecated = element.hasDeprecated;
if (!useNewRelevance && isDeprecated) {
relevance = DART_RELEVANCE_LOW;
}
- CompletionSuggestion suggestion = CompletionSuggestion(
+ var suggestion = CompletionSuggestion(
kind, relevance, completion, completion.length, 0, isDeprecated, false);
// Attach docs.
- String doc = getDartDocPlainText(element.documentationComment);
+ var doc = getDartDocPlainText(element.documentationComment);
suggestion.docComplete = doc;
suggestion.docSummary = getDartDocSummary(doc);
suggestion.element = protocol.convertElement(element);
- Element enclosingElement = element.enclosingElement;
+ var enclosingElement = element.enclosingElement;
if (enclosingElement is ClassElement) {
suggestion.declaringType = enclosingElement.displayName;
}
@@ -58,18 +57,18 @@
.toList();
suggestion.parameterTypes =
element.parameters.map((ParameterElement parameter) {
- DartType paramType = parameter.type;
+ var paramType = parameter.type;
// Gracefully degrade if type not resolved yet
return paramType != null
? paramType.getDisplayString(withNullability: false)
: 'var';
}).toList();
- Iterable<ParameterElement> requiredParameters = element.parameters
+ var requiredParameters = element.parameters
.where((ParameterElement param) => param.isRequiredPositional);
suggestion.requiredParameterCount = requiredParameters.length;
- Iterable<ParameterElement> namedParameters =
+ var namedParameters =
element.parameters.where((ParameterElement param) => param.isNamed);
suggestion.hasNamedParameters = namedParameters.isNotEmpty;
@@ -108,7 +107,7 @@
return null;
}
}
- String completion = elementCompletion ?? element.displayName;
+ var completion = elementCompletion ?? element.displayName;
if (prefix != null && prefix.isNotEmpty) {
if (completion == null || completion.isEmpty) {
completion = prefix;
@@ -119,7 +118,7 @@
if (completion == null || completion.isEmpty) {
return null;
}
- CompletionSuggestion suggestion = createSuggestion(element,
+ var suggestion = createSuggestion(element,
completion: completion,
kind: kind,
relevance: relevance,
@@ -135,16 +134,14 @@
cacheKey = cacheKey.substring(0, cacheKey.length - 1);
}
if (cacheKey != null) {
- CompletionSuggestion existingSuggestion = _syntheticMap[cacheKey];
+ var existingSuggestion = _syntheticMap[cacheKey];
// Pair getter/setter by updating the existing suggestion
if (existingSuggestion != null) {
- CompletionSuggestion getter =
- element.isGetter ? suggestion : existingSuggestion;
- protocol.ElementKind elemKind =
- element.enclosingElement is ClassElement
- ? protocol.ElementKind.FIELD
- : protocol.ElementKind.TOP_LEVEL_VARIABLE;
+ var getter = element.isGetter ? suggestion : existingSuggestion;
+ var elemKind = element.enclosingElement is ClassElement
+ ? protocol.ElementKind.FIELD
+ : protocol.ElementKind.TOP_LEVEL_VARIABLE;
existingSuggestion.element = protocol.Element(
elemKind,
existingSuggestion.element.name,
@@ -336,7 +333,7 @@
if (accessor.hasDeprecated) {
return DART_RELEVANCE_LOW;
}
- String identifier = accessor.displayName;
+ var identifier = accessor.displayName;
if (identifier != null && identifier.startsWith(r'$')) {
// Decrease relevance of suggestions starting with $
// https://github.com/dart-lang/sdk/issues/27303
@@ -419,7 +416,7 @@
// same name as the containing method.
return DART_RELEVANCE_HIGH;
}
- String identifier = method.displayName;
+ var identifier = method.displayName;
if (identifier != null && identifier.startsWith(r'$')) {
// Decrease relevance of suggestions starting with $
// https://github.com/dart-lang/sdk/issues/27303
@@ -460,9 +457,9 @@
CompletionSuggestion _addSuggestion(
Element element, int relevance, bool useNewRelevance,
{CompletionSuggestionKind kind}) {
- String identifier = element.displayName;
+ var identifier = element.displayName;
- int alreadyGenerated = _completionTypesGenerated.putIfAbsent(
+ var alreadyGenerated = _completionTypesGenerated.putIfAbsent(
identifier, () => _COMPLETION_TYPE_NONE);
if (element is MethodElement) {
// Anything shadows a method.
@@ -498,7 +495,7 @@
assert(false);
return null;
}
- CompletionSuggestion suggestion = createSuggestion(element,
+ var suggestion = createSuggestion(element,
kind: kind, relevance: relevance, useNewRelevance: useNewRelevance);
if (suggestion != null) {
addCompletionSuggestion(suggestion);
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/type_member_contributor.dart b/pkg/analysis_server/lib/src/services/completion/dart/type_member_contributor.dart
index f65db45..e43b3bf 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/type_member_contributor.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/type_member_contributor.dart
@@ -24,7 +24,7 @@
@override
Future<List<CompletionSuggestion>> computeSuggestions(
DartCompletionRequest request) async {
- LibraryElement containingLibrary = request.libraryElement;
+ var containingLibrary = request.libraryElement;
// Gracefully degrade if the library could not be determined, such as with a
// detached part file or source change.
if (containingLibrary == null) {
@@ -32,14 +32,14 @@
}
// Recompute the target because resolution might have changed it.
- Expression expression = request.dotTarget;
+ var expression = request.dotTarget;
if (expression == null ||
expression.isSynthetic ||
expression is ExtensionOverride) {
return const <CompletionSuggestion>[];
}
if (expression is Identifier) {
- Element elem = expression.staticElement;
+ var elem = expression.staticElement;
if (elem is ClassElement) {
// Suggestions provided by StaticMemberContributor.
return const <CompletionSuggestion>[];
@@ -51,12 +51,12 @@
}
// Determine the target expression's type.
- DartType type = expression.staticType;
+ var type = expression.staticType;
if (type == null || type.isDynamic) {
// If the expression does not provide a good type, then attempt to get a
// better type from the element.
if (expression is Identifier) {
- Element elem = expression.staticElement;
+ var elem = expression.staticElement;
if (elem is FunctionTypedElement) {
type = elem.returnType;
} else if (elem is ParameterElement) {
@@ -68,8 +68,7 @@
expression is SimpleIdentifier) {
// If the element does not provide a good type, then attempt to get a
// better type from a local declaration.
- _LocalBestTypeVisitor visitor =
- _LocalBestTypeVisitor(expression.name, request.offset);
+ var visitor = _LocalBestTypeVisitor(expression.name, request.offset);
if (visitor.visit(expression) && visitor.typeFound != null) {
type = visitor.typeFound;
}
@@ -86,10 +85,10 @@
type = (type as InterfaceType).superclass;
// Determine the name of the containing method because the most likely
// completion is a super expression with same name.
- MethodDeclaration containingMethod =
+ var containingMethod =
expression.thisOrAncestorOfType<MethodDeclaration>();
if (containingMethod != null) {
- SimpleIdentifier id = containingMethod.name;
+ var id = containingMethod.name;
if (id != null) {
containingMethodName = id.name;
}
@@ -102,13 +101,13 @@
// Build the suggestions.
if (type is InterfaceType) {
- _SuggestionBuilder builder = _SuggestionBuilder(request);
+ var builder = _SuggestionBuilder(request);
builder.buildSuggestions(type, containingMethodName,
mixins: mixins, superclassConstraints: superclassConstraints);
return builder.suggestions.toList();
}
if (type is FunctionType) {
- _SuggestionBuilder builder = _SuggestionBuilder(request);
+ var builder = _SuggestionBuilder(request);
return [builder._createFunctionCallSuggestion()];
}
@@ -159,7 +158,7 @@
@override
void declaredFunction(FunctionDeclaration declaration) {
if (declaration.name.name == targetName) {
- TypeAnnotation typeName = declaration.returnType;
+ var typeName = declaration.returnType;
if (typeName != null) {
typeFound = typeName.type;
}
@@ -170,7 +169,7 @@
@override
void declaredFunctionTypeAlias(FunctionTypeAlias declaration) {
if (declaration.name.name == targetName) {
- TypeAnnotation typeName = declaration.returnType;
+ var typeName = declaration.returnType;
if (typeName != null) {
typeFound = typeName.type;
}
@@ -181,7 +180,7 @@
@override
void declaredGenericTypeAlias(GenericTypeAlias declaration) {
if (declaration.name.name == targetName) {
- TypeAnnotation typeName = declaration.functionType?.returnType;
+ var typeName = declaration.functionType?.returnType;
if (typeName != null) {
typeFound = typeName.type;
}
@@ -209,7 +208,7 @@
@override
void declaredMethod(MethodDeclaration declaration) {
if (declaration.name.name == targetName) {
- TypeAnnotation typeName = declaration.returnType;
+ var typeName = declaration.returnType;
if (typeName != null) {
typeFound = typeName.type;
}
@@ -250,7 +249,7 @@
// completions. If multiple elements are found that complete to the same
// identifier, addSuggestion will discard all but the first (with a few
// exceptions to handle getter/setter pairs).
- List<InterfaceType> types = _getTypeOrdering(type);
+ var types = _getTypeOrdering(type);
if (mixins != null) {
types.addAll(mixins);
}
@@ -321,11 +320,11 @@
// We short-circuit loops in the class hierarchy by keeping track of the
// classes seen (not the interfaces) so that we won't be fooled by nonsense
// like "class C<T> extends C<List<T>> {}"
- List<InterfaceType> result = <InterfaceType>[];
+ var result = <InterfaceType>[];
Set<ClassElement> classesSeen = HashSet<ClassElement>();
- List<InterfaceType> typesToVisit = <InterfaceType>[type];
+ var typesToVisit = <InterfaceType>[type];
while (typesToVisit.isNotEmpty) {
- InterfaceType nextType = typesToVisit.removeLast();
+ var nextType = typesToVisit.removeLast();
if (!classesSeen.add(nextType.element)) {
// Class had already been seen, so ignore this type.
continue;
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/uri_contributor.dart b/pkg/analysis_server/lib/src/services/completion/dart/uri_contributor.dart
index e55d03b..245e9d6 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/uri_contributor.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/uri_contributor.dart
@@ -11,13 +11,10 @@
import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/ast/visitor.dart';
import 'package:analyzer/file_system/file_system.dart';
-import 'package:analyzer/src/generated/sdk.dart';
-import 'package:analyzer/src/generated/source.dart';
import 'package:path/path.dart' show posix;
-import 'package:path/src/context.dart';
-/// A contributor for calculating uri suggestions for import and part
-/// directives.
+/// A contributor that produces suggestions based on the content of the file
+/// system to complete within URIs in import, export and part directives.
class UriContributor extends DartCompletionContributor {
/// A flag indicating whether file: and package: URI suggestions should
/// be included in the list of completion suggestions.
@@ -26,21 +23,23 @@
// to only those paths within context roots.
static bool suggestFilePaths = true;
- _UriSuggestionBuilder builder;
-
@override
Future<List<CompletionSuggestion>> computeSuggestions(
DartCompletionRequest request) async {
- // TODO(brianwilkerson) Determine whether this await is necessary.
- await null;
- builder = _UriSuggestionBuilder(request);
+ var builder = _UriSuggestionBuilder(request);
request.target.containingNode.accept(builder);
return builder.suggestions;
}
}
class _UriSuggestionBuilder extends SimpleAstVisitor<void> {
+ // TODO(brianwilkerson) Consider whether to make these constants in
+ // Relevance (after renaming them).
+ static const int dartCoreRelevance = 100;
+ static const int defaultRelevance = 900;
+
final DartCompletionRequest request;
+
final List<CompletionSuggestion> suggestions = <CompletionSuggestion>[];
_UriSuggestionBuilder(this.request);
@@ -56,11 +55,11 @@
}
void visitNamespaceDirective(NamespaceDirective node) {
- StringLiteral uri = node.uri;
+ var uri = node.uri;
if (uri is SimpleStringLiteral) {
- int offset = request.offset;
- int start = uri.offset;
- int end = uri.end;
+ var offset = request.offset;
+ var start = uri.offset;
+ var end = uri.end;
if (offset > start) {
if (offset < end) {
// Quoted non-empty string
@@ -70,9 +69,9 @@
// Quoted empty string
visitSimpleStringLiteral(uri);
} else {
- String data = request.sourceContents;
+ var data = request.sourceContents;
if (end == data.length) {
- String ch = data[end - 1];
+ var ch = data[end - 1];
if (ch != '"' && ch != "'") {
// Insertion point at end of file
// and missing closing quote on non-empty string
@@ -82,9 +81,9 @@
}
}
} else if (offset == start && offset == end) {
- String data = request.sourceContents;
+ var data = request.sourceContents;
if (end == data.length) {
- String ch = data[end - 1];
+ var ch = data[end - 1];
if (ch == '"' || ch == "'") {
// Insertion point at end of file
// and missing closing quote on empty string
@@ -97,9 +96,9 @@
@override
void visitSimpleStringLiteral(SimpleStringLiteral node) {
- AstNode parent = node.parent;
+ var parent = node.parent;
if (parent is NamespaceDirective && parent.uri == node) {
- String partialUri = _extractPartialUri(node);
+ var partialUri = _extractPartialUri(node);
if (partialUri != null) {
_addDartSuggestions();
if (UriContributor.suggestFilePaths) {
@@ -108,7 +107,7 @@
}
}
} else if (parent is PartDirective && parent.uri == node) {
- String partialUri = _extractPartialUri(node);
+ var partialUri = _extractPartialUri(node);
if (partialUri != null) {
if (UriContributor.suggestFilePaths) {
_addFileSuggestions(partialUri);
@@ -119,23 +118,30 @@
void _addDartSuggestions() {
_addSuggestion('dart:');
- SourceFactory factory = request.sourceFactory;
- for (SdkLibrary lib in factory.dartSdk.sdkLibraries) {
+ var factory = request.sourceFactory;
+ for (var lib in factory.dartSdk.sdkLibraries) {
if (!lib.isInternal && !lib.isImplementation) {
if (!lib.shortName.startsWith('dart:_')) {
- _addSuggestion(lib.shortName,
- relevance: lib.shortName == 'dart:core'
- ? DART_RELEVANCE_LOW
- : DART_RELEVANCE_DEFAULT);
+ int relevance;
+ if (request.useNewRelevance) {
+ relevance = lib.shortName == 'dart:core'
+ ? dartCoreRelevance
+ : defaultRelevance;
+ } else {
+ relevance = lib.shortName == 'dart:core'
+ ? DART_RELEVANCE_LOW
+ : DART_RELEVANCE_DEFAULT;
+ }
+ _addSuggestion(lib.shortName, relevance: relevance);
}
}
}
}
void _addFileSuggestions(String partialUri) {
- ResourceProvider resProvider = request.resourceProvider;
- Context resContext = resProvider.pathContext;
- Source source = request.source;
+ var resProvider = request.resourceProvider;
+ var resContext = resProvider.pathContext;
+ var source = request.source;
String parentUri;
if ((partialUri.endsWith('/'))) {
@@ -146,27 +152,27 @@
parentUri = '$parentUri/';
}
}
- String uriPrefix = parentUri == '.' ? '' : parentUri;
+ var uriPrefix = parentUri == '.' ? '' : parentUri;
// Only handle file uris in the format file:///xxx or /xxx
- String parentUriScheme = Uri.parse(parentUri).scheme;
+ var parentUriScheme = Uri.parse(parentUri).scheme;
if (!parentUri.startsWith('file://') && parentUriScheme != '') {
return;
}
- String dirPath = resProvider.pathContext.fromUri(parentUri);
+ var dirPath = resProvider.pathContext.fromUri(parentUri);
dirPath = resContext.normalize(dirPath);
if (resContext.isRelative(dirPath)) {
- String sourceDirPath = resContext.dirname(source.fullName);
+ var sourceDirPath = resContext.dirname(source.fullName);
if (resContext.isAbsolute(sourceDirPath)) {
dirPath = resContext.normalize(resContext.join(sourceDirPath, dirPath));
} else {
return;
}
// Do not suggest relative paths reaching outside the 'lib' directory.
- bool srcInLib = resContext.split(sourceDirPath).contains('lib');
- bool dstInLib = resContext.split(dirPath).contains('lib');
+ var srcInLib = resContext.split(sourceDirPath).contains('lib');
+ var dstInLib = resContext.split(dirPath).contains('lib');
if (srcInLib && !dstInLib) {
return;
}
@@ -175,10 +181,10 @@
dirPath = dirPath.substring(0, dirPath.length - 1);
}
- Resource dir = resProvider.getResource(dirPath);
+ var dir = resProvider.getResource(dirPath);
if (dir is Folder) {
try {
- for (Resource child in dir.getChildren()) {
+ for (var child in dir.getChildren()) {
String completion;
if (child is Folder) {
if (!child.shortName.startsWith('.')) {
@@ -202,9 +208,9 @@
void _addPackageFolderSuggestions(
String partial, String prefix, Folder folder) {
try {
- for (Resource child in folder.getChildren()) {
+ for (var child in folder.getChildren()) {
if (child is Folder) {
- String childPrefix = '$prefix${child.shortName}/';
+ var childPrefix = '$prefix${child.shortName}/';
_addSuggestion(childPrefix);
if (partial.startsWith(childPrefix)) {
_addPackageFolderSuggestions(partial, childPrefix, child);
@@ -220,14 +226,14 @@
}
void _addPackageSuggestions(String partial) {
- SourceFactory factory = request.sourceFactory;
- Map<String, List<Folder>> packageMap = factory.packageMap;
+ var factory = request.sourceFactory;
+ var packageMap = factory.packageMap;
if (packageMap != null) {
_addSuggestion('package:');
- packageMap.forEach((String pkgName, List<Folder> folders) {
- String prefix = 'package:$pkgName/';
+ packageMap.forEach((pkgName, folders) {
+ var prefix = 'package:$pkgName/';
_addSuggestion(prefix);
- for (Folder folder in folders) {
+ for (var folder in folders) {
if (folder.exists) {
_addPackageFolderSuggestions(partial, prefix, folder);
}
@@ -236,8 +242,12 @@
}
}
- void _addSuggestion(String completion,
- {int relevance = DART_RELEVANCE_DEFAULT}) {
+ void _addSuggestion(String completion, {int relevance}) {
+ if (request.useNewRelevance) {
+ relevance ??= defaultRelevance;
+ } else {
+ relevance ??= DART_RELEVANCE_DEFAULT;
+ }
suggestions.add(CompletionSuggestion(CompletionSuggestionKind.IMPORT,
relevance, completion, completion.length, 0, false, false));
}
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/utilities.dart b/pkg/analysis_server/lib/src/services/completion/dart/utilities.dart
index 9ad6083..d6da442 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/utilities.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/utilities.dart
@@ -4,7 +4,7 @@
/// A collection of utility methods used by completion contributors.
import 'package:analysis_server/src/protocol_server.dart'
- show CompletionSuggestion, CompletionSuggestionKind, Location;
+ show CompletionSuggestion, Location;
import 'package:analysis_server/src/provisional/completion/dart/completion_dart.dart';
import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/ast/standard_ast_factory.dart';
@@ -40,12 +40,12 @@
Element element,
Iterable<ParameterElement> requiredParams,
Iterable<ParameterElement> namedParams) {
- StringBuffer sb = StringBuffer();
- List<int> ranges = <int>[];
+ var sb = StringBuffer();
+ var ranges = <int>[];
int offset;
- for (ParameterElement param in requiredParams) {
+ for (var param in requiredParams) {
if (sb.isNotEmpty) {
sb.write(', ');
}
@@ -84,21 +84,21 @@
sb.write(blockBuffer);
ranges.addAll([rangeStart, rangeLength]);
} else {
- String name = param.name;
+ var name = param.name;
sb.write(name);
ranges.addAll([offset, name.length]);
}
}
- for (ParameterElement param in namedParams) {
+ for (var param in namedParams) {
if (param.hasRequired) {
if (sb.isNotEmpty) {
sb.write(', ');
}
- String name = param.name;
+ var name = param.name;
sb.write('$name: ');
offset = sb.length;
- String defaultValue = _getDefaultValue(param);
+ var defaultValue = _getDefaultValue(param);
sb.write(defaultValue);
ranges.addAll([offset, defaultValue.length]);
}
@@ -158,7 +158,7 @@
name = '';
location = Location(source.fullName, -1, 0, 1, 0);
}
- int flags = protocol.Element.makeFlags(
+ var flags = protocol.Element.makeFlags(
isAbstract: isAbstract,
isDeprecated: isDeprecated,
isPrivate: Identifier.isPrivateName(name));
@@ -168,45 +168,9 @@
returnType: nameForType(id, returnType));
}
-/// Create a new suggestion based upon the given information. Return the new
-/// suggestion or `null` if it could not be created.
-CompletionSuggestion createLocalSuggestion(SimpleIdentifier id,
- bool isDeprecated, int defaultRelevance, TypeAnnotation returnType,
- {ClassOrMixinDeclaration classDecl,
- CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION,
- protocol.Element element}) {
- if (id == null) {
- return null;
- }
- String completion = id.name;
- if (completion == null || completion.isEmpty || completion == '_') {
- return null;
- }
- CompletionSuggestion suggestion = CompletionSuggestion(
- kind,
- isDeprecated ? DART_RELEVANCE_LOW : defaultRelevance,
- completion,
- completion.length,
- 0,
- isDeprecated,
- false,
- returnType: nameForType(id, returnType),
- element: element);
- if (classDecl != null) {
- SimpleIdentifier classId = classDecl.name;
- if (classId != null) {
- String className = classId.name;
- if (className != null && className.isNotEmpty) {
- suggestion.declaringType = className;
- }
- }
- }
- return suggestion;
-}
-
DefaultArgument getDefaultStringParameterValue(ParameterElement param) {
if (param != null) {
- DartType type = param.type;
+ var type = param.type;
if (type is InterfaceType && type.isDartCoreList) {
String getTypeArgumentsStr() {
var elementType = type.typeArguments.single;
@@ -220,15 +184,15 @@
}
}
- String typeArgumentStr = getTypeArgumentsStr();
- String text = '$typeArgumentStr[]';
+ var typeArgumentStr = getTypeArgumentsStr();
+ var text = '$typeArgumentStr[]';
return DefaultArgument(text, cursorPosition: text.length - 1);
} else if (type is FunctionType) {
- String params = type.parameters
+ var params = type.parameters
.map((p) => '${getTypeString(p.type)}${p.name}')
.join(', ');
// TODO(devoncarew): Support having this method return text with newlines.
- String text = '($params) { }';
+ var text = '($params) { }';
return DefaultArgument(text, cursorPosition: text.length - 2);
}
@@ -266,7 +230,7 @@
/// Return `true` if the @deprecated annotation is present on the given [node].
bool isDeprecated(AnnotatedNode node) {
if (node != null) {
- NodeList<Annotation> metadata = node.metadata;
+ var metadata = node.metadata;
if (metadata != null) {
return metadata.any((Annotation a) {
return a.name is SimpleIdentifier && a.name.name == 'deprecated';
@@ -285,7 +249,7 @@
// Get the type from the identifier element.
DartType type;
- Element element = identifier.staticElement;
+ var element = identifier.staticElement;
if (element == null) {
return DYNAMIC;
} else if (element is FunctionTypedElement) {
@@ -304,7 +268,7 @@
// If the type is unresolved, use the declared type.
if (type != null && type.isDynamic) {
if (declaredType is TypeName) {
- Identifier id = declaredType.name;
+ var id = declaredType.name;
if (id != null) {
return id.name;
}
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/variable_name_contributor.dart b/pkg/analysis_server/lib/src/services/completion/dart/variable_name_contributor.dart
index 9541a62..a0ee964 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/variable_name_contributor.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/variable_name_contributor.dart
@@ -7,54 +7,25 @@
import 'package:analysis_server/src/protocol_server.dart'
show CompletionSuggestion, CompletionSuggestionKind;
import 'package:analysis_server/src/provisional/completion/dart/completion_dart.dart';
-import 'package:analysis_server/src/services/completion/dart/completion_manager.dart'
- show DartCompletionRequestImpl;
import 'package:analysis_server/src/services/correction/name_suggestion.dart';
import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer_plugin/src/utilities/completion/completion_target.dart';
-import 'package:analyzer_plugin/src/utilities/completion/optype.dart';
-/// Given some [String] name "foo", return a [CompletionSuggestion] with the
-/// [String].
-///
-/// If the passed [String] is null or empty, null is returned.
-CompletionSuggestion _createNameSuggestion(String name) {
- if (name == null || name.isEmpty) {
- return null;
- }
- return CompletionSuggestion(CompletionSuggestionKind.IDENTIFIER,
- DART_RELEVANCE_DEFAULT, name, name.length, 0, false, false);
-}
-
-/// Convert some [Identifier] to its [String] name.
-String _getStringName(Identifier id) {
- if (id == null) {
- return null;
- }
- if (id is SimpleIdentifier) {
- return id.name;
- } else if (id is PrefixedIdentifier) {
- return id.identifier.name;
- }
- return id.name;
-}
-
-/// A contributor for calculating suggestions for variable names.
+/// A contributor that produces suggestions for variable names based on the
+/// static type of the variable.
class VariableNameContributor extends DartCompletionContributor {
@override
Future<List<CompletionSuggestion>> computeSuggestions(
DartCompletionRequest request) async {
- // TODO(brianwilkerson) Determine whether this await is necessary.
- await null;
- OpType optype = (request as DartCompletionRequestImpl).opType;
+ var opType = request.opType;
// Collect suggestions from the specific child [AstNode] that contains
// the completion offset and all of its parents recursively.
- if (optype.includeVarNameSuggestions) {
- // Resolution not needed for this completion
+ if (opType.includeVarNameSuggestions) {
+ // Resolution not needed for this completion.
- AstNode node = request.target.containingNode;
- int offset = request.target.offset;
+ var node = request.target.containingNode;
+ var offset = request.target.offset;
// Use the refined node.
if (node is FormalParameterList) {
@@ -79,17 +50,16 @@
// 'Foo ': handled above
// 'Foo ;': TopLevelVariableDeclaration with type null, and a first
// variable of 'Foo'
- VariableDeclarationList varDeclarationList = node.variables;
- TypeAnnotation typeAnnotation = varDeclarationList.type;
+ var varDeclarationList = node.variables;
+ var typeAnnotation = varDeclarationList.type;
if (typeAnnotation != null) {
var identifier = _typeAnnotationIdentifier(typeAnnotation);
strName = _getStringName(identifier);
} else {
- NodeList<VariableDeclaration> varDeclarations =
- varDeclarationList.variables;
+ var varDeclarations = varDeclarationList.variables;
if (varDeclarations.length == 1) {
- VariableDeclaration varDeclaration = varDeclarations.first;
- strName = _getStringName(varDeclaration.name);
+ var declaration = varDeclarations.first;
+ strName = _getStringName(declaration.name);
}
}
}
@@ -98,19 +68,18 @@
}
var doIncludePrivateVersion =
- optype.inFieldDeclaration || optype.inTopLevelVariableDeclaration;
+ opType.inFieldDeclaration || opType.inTopLevelVariableDeclaration;
- List<String> variableNameSuggestions = getCamelWordCombinations(strName);
+ var variableNameSuggestions = getCamelWordCombinations(strName);
variableNameSuggestions.remove(strName);
- List<CompletionSuggestion> suggestions = <CompletionSuggestion>[];
- for (String varName in variableNameSuggestions) {
- CompletionSuggestion suggestion = _createNameSuggestion(varName);
+ var suggestions = <CompletionSuggestion>[];
+ for (var varName in variableNameSuggestions) {
+ var suggestion = _createNameSuggestion(request, varName);
if (suggestion != null) {
suggestions.add(suggestion);
}
if (doIncludePrivateVersion) {
- CompletionSuggestion privateSuggestion =
- _createNameSuggestion('_' + varName);
+ var privateSuggestion = _createNameSuggestion(request, '_' + varName);
if (privateSuggestion != null) {
suggestions.add(privateSuggestion);
}
@@ -121,6 +90,39 @@
return const <CompletionSuggestion>[];
}
+ /// Given some [name], return a [CompletionSuggestion] with the name.
+ ///
+ /// If the passed name is `null` or empty, `null` is returned.
+ CompletionSuggestion _createNameSuggestion(
+ DartCompletionRequest request, String name) {
+ if (name == null || name.isEmpty) {
+ return null;
+ }
+ // TODO(brianwilkerson) Explore whether there are any features of the name
+ // that can be used to provide better relevance scores.
+ return CompletionSuggestion(
+ CompletionSuggestionKind.IDENTIFIER,
+ request.useNewRelevance ? 500 : DART_RELEVANCE_DEFAULT,
+ name,
+ name.length,
+ 0,
+ false,
+ false);
+ }
+
+ /// Convert some [Identifier] to its [String] name.
+ String _getStringName(Identifier id) {
+ if (id == null) {
+ return null;
+ }
+ if (id is SimpleIdentifier) {
+ return id.name;
+ } else if (id is PrefixedIdentifier) {
+ return id.identifier.name;
+ }
+ return id.name;
+ }
+
static Identifier _formalParameterTypeIdentifier(FormalParameter node) {
if (node is SimpleFormalParameter) {
var type = node.type;
diff --git a/pkg/analysis_server/lib/src/services/completion/postfix/postfix_completion.dart b/pkg/analysis_server/lib/src/services/completion/postfix/postfix_completion.dart
index bb8defe..95ddfce 100644
--- a/pkg/analysis_server/lib/src/services/completion/postfix/postfix_completion.dart
+++ b/pkg/analysis_server/lib/src/services/completion/postfix/postfix_completion.dart
@@ -87,7 +87,7 @@
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
return processor.expand(kind, processor.findIterableExpression, (expr) {
- String value = processor.newVariable('value');
+ var value = processor.newVariable('value');
return 'for (var $value in ${processor.utils.getNodeText(expr)})';
});
}
@@ -97,7 +97,7 @@
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
return processor.expand(kind, processor.findIntExpression, (expr) {
- String index = processor.newVariable('i');
+ var index = processor.newVariable('i');
return 'for (int $index = 0; $index < ${processor.utils.getNodeText(expr)}; $index++)';
});
}
@@ -306,7 +306,7 @@
if (node == null) {
return NO_COMPLETION;
}
- PostfixCompletionKind completer = DartPostfixCompletion.forKey(key);
+ var completer = DartPostfixCompletion.forKey(key);
return completer?.computer(this, completer) ?? NO_COMPLETION;
}
@@ -320,7 +320,7 @@
return null;
}
- DartChangeBuilder changeBuilder = DartChangeBuilder(session);
+ var changeBuilder = DartChangeBuilder(session);
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.addReplacement(range.node(expr), (DartEditBuilder builder) {
String newSrc = sourcer(expr);
@@ -331,7 +331,7 @@
if (withBraces) {
builder.write(' {');
builder.write(eol);
- String indent = utils.getNodePrefix(expr);
+ var indent = utils.getNodePrefix(expr);
builder.write(indent);
builder.write(utils.getIndent(1));
builder.selectHere();
@@ -356,7 +356,7 @@
if (stmt == null) {
return null;
}
- DartChangeBuilder changeBuilder = DartChangeBuilder(session);
+ var changeBuilder = DartChangeBuilder(session);
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
// Embed the full line(s) of the statement in the try block.
var startLine = lineInfo.getLocation(stmt.offset).lineNumber - 1;
@@ -367,7 +367,7 @@
var startOffset = lineInfo.getOffsetOfLine(startLine);
var endOffset = lineInfo.getOffsetOfLine(endLine);
var src = utils.getText(startOffset, endOffset - startOffset);
- String indent = utils.getLinePrefix(stmt.offset);
+ var indent = utils.getLinePrefix(stmt.offset);
builder.addReplacement(range.startOffsetEndOffset(startOffset, endOffset),
(DartEditBuilder builder) {
builder.write(indent);
@@ -399,7 +399,7 @@
Expression findAssertExpression() {
if (node is Expression) {
- Expression boolExpr = _findOuterExpression(node, typeProvider.boolType);
+ var boolExpr = _findOuterExpression(node, typeProvider.boolType);
if (boolExpr == null) {
return null;
}
@@ -461,13 +461,13 @@
if (node == null) {
return false;
}
- PostfixCompletionKind completer = DartPostfixCompletion.forKey(key);
+ var completer = DartPostfixCompletion.forKey(key);
return completer?.selector(this);
}
String makeNegatedBoolExpr(Expression expr) {
- String originalSrc = utils.getNodeText(expr);
- String newSrc = utils.invertCondition(expr);
+ var originalSrc = utils.getNodeText(expr);
+ var newSrc = utils.invertCondition(expr);
if (newSrc != originalSrc) {
return newSrc;
} else {
@@ -480,7 +480,7 @@
astNode = (astNode as ExpressionStatement).expression;
}
if (astNode is ThrowExpression) {
- ThrowExpression expr = astNode;
+ var expr = astNode;
var type = expr.expression.staticType;
return type.getDisplayString(withNullability: false);
}
@@ -488,10 +488,9 @@
}
String newVariable(String base) {
- String name = base;
- int i = 1;
- Set<String> vars =
- utils.findPossibleLocalVariableConflicts(selectionOffset);
+ var name = base;
+ var i = 1;
+ var vars = utils.findPossibleLocalVariableConflicts(selectionOffset);
while (vars.contains(name)) {
name = '$base${i++}';
}
@@ -519,8 +518,8 @@
parent = parent.parent;
}
- Expression expr = list.firstWhere((expr) {
- DartType type = expr.staticType;
+ var expr = list.firstWhere((expr) {
+ var type = expr.staticType;
if (type == null) return false;
return typeSystem.isSubtypeOf(type, builtInType);
}, orElse: () => null);
@@ -539,7 +538,7 @@
void _setCompletionFromBuilder(
DartChangeBuilder builder, PostfixCompletionKind kind,
[List args]) {
- SourceChange change = builder.sourceChange;
+ var change = builder.sourceChange;
if (change.edits.isEmpty) {
completion = null;
return;
diff --git a/pkg/analysis_server/lib/src/services/completion/statement/statement_completion.dart b/pkg/analysis_server/lib/src/services/completion/statement/statement_completion.dart
index a284333..9b025cd 100644
--- a/pkg/analysis_server/lib/src/services/completion/statement/statement_completion.dart
+++ b/pkg/analysis_server/lib/src/services/completion/statement/statement_completion.dart
@@ -152,7 +152,7 @@
if (_isEmptyStatementOrEmptyBlock(node)) {
node = node.parent;
}
- for (engine.AnalysisError error in statementContext.resolveResult.errors) {
+ for (var error in statementContext.resolveResult.errors) {
if (error.offset >= node.offset && error.offset <= node.end) {
if (error.errorCode is! HintCode) {
errors.add(error);
@@ -200,19 +200,19 @@
}
void _addInsertEdit(int offset, String text) {
- SourceEdit edit = SourceEdit(offset, 0, text);
+ var edit = SourceEdit(offset, 0, text);
doSourceChange_addElementEdit(change, unitElement, edit);
}
void _addReplaceEdit(SourceRange range, String text) {
- SourceEdit edit = SourceEdit(range.offset, range.length, text);
+ var edit = SourceEdit(range.offset, range.length, text);
doSourceChange_addElementEdit(change, unitElement, edit);
}
void _appendEmptyBraces(SourceBuilder sb, [bool needsExitMark = false]) {
sb.append('{');
sb.append(eol);
- String indent = utils.getLinePrefix(selectionOffset);
+ var indent = utils.getLinePrefix(selectionOffset);
sb.append(indent);
sb.append(utils.getIndent(1));
if (needsExitMark && sb.exitOffset == null) {
@@ -230,14 +230,14 @@
int _appendNewlinePlusIndentAt(int offset) {
// Append a newline plus proper indent and another newline.
// Return the position before the second newline.
- String indent = utils.getLinePrefix(offset);
- int loc = utils.getLineNext(offset);
+ var indent = utils.getLinePrefix(offset);
+ var loc = utils.getLineNext(offset);
_addInsertEdit(loc, indent + eol);
return loc + indent.length;
}
String _baseNodeText(AstNode astNode) {
- String text = utils.getNodeText(astNode);
+ var text = utils.getNodeText(astNode);
if (text.endsWith(eol)) {
text = text.substring(0, text.length - eol.length);
}
@@ -252,7 +252,7 @@
if (error == null) {
return null;
}
- AstNode expr = _selectedNode();
+ var expr = _selectedNode();
return (expr.thisOrAncestorOfType<StringInterpolation>() == null)
? expr
: null;
@@ -260,9 +260,9 @@
var expr = errorMatching(ScannerErrorCode.UNTERMINATED_STRING_LITERAL);
if (expr != null) {
- String source = utils.getNodeText(expr);
- String content = source;
- int char = content.codeUnitAt(0);
+ var source = utils.getNodeText(expr);
+ var content = source;
+ var char = content.codeUnitAt(0);
if (char == 'r'.codeUnitAt(0)) {
content = source.substring(1);
char = content.codeUnitAt(0);
@@ -274,7 +274,7 @@
char == content.codeUnitAt(2)) {
// multi-line string
delimiter = content.substring(0, 3);
- int newlineLoc = source.indexOf(eol, selectionOffset - expr.offset);
+ var newlineLoc = source.indexOf(eol, selectionOffset - expr.offset);
if (newlineLoc < 0) {
newlineLoc = source.length;
}
@@ -294,10 +294,10 @@
if (expr != null) {
ListLiteral lit = expr;
if (lit.rightBracket.isSynthetic) {
- String src = utils.getNodeText(expr).trim();
- int loc = expr.offset + src.length;
+ var src = utils.getNodeText(expr).trim();
+ var loc = expr.offset + src.length;
if (src.contains(eol)) {
- String indent = utils.getNodePrefix(node);
+ var indent = utils.getNodePrefix(node);
_addInsertEdit(loc, ',' + eol + indent + ']');
} else {
_addInsertEdit(loc, ']');
@@ -343,7 +343,7 @@
ClassDeclaration decl = node;
if (decl.leftBracket.isSynthetic && errors.length == 1) {
// The space before the left brace is assumed to exist, even if it does not.
- SourceBuilder sb = SourceBuilder(file, decl.end - 1);
+ var sb = SourceBuilder(file, decl.end - 1);
sb.append(' ');
_appendEmptyBraces(sb, true);
_insertBuilder(sb);
@@ -354,7 +354,7 @@
}
bool _complete_controlFlowBlock() {
- Expression expr = (node is ExpressionStatement)
+ var expr = (node is ExpressionStatement)
? (node as ExpressionStatement).expression
: (node is ReturnStatement
? (node as ReturnStatement).expression
@@ -365,15 +365,15 @@
if (node.parent is! Block) {
return false;
}
- AstNode outer = node.parent.parent;
+ var outer = node.parent.parent;
if (!(outer is DoStatement ||
outer is ForStatement ||
outer is IfStatement ||
outer is WhileStatement)) {
return false;
}
- int previousInsertions = _lengthOfInsertions();
- int delta = 0;
+ var previousInsertions = _lengthOfInsertions();
+ var delta = 0;
if (errors.isNotEmpty) {
var error =
_findError(ParserErrorCode.EXPECTED_TOKEN, partialMatch: "';'");
@@ -402,7 +402,7 @@
delta = 1;
}
}
- int offset = _appendNewlinePlusIndentAt(node.parent.end);
+ var offset = _appendNewlinePlusIndentAt(node.parent.end);
exitPosition = Position(file, offset + delta + previousInsertions);
_setCompletion(DartStatementCompletion.COMPLETE_CONTROL_FLOW_BLOCK);
return true;
@@ -413,27 +413,27 @@
return false;
}
DoStatement statement = node;
- SourceBuilder sb = _sourceBuilderAfterKeyword(statement.doKeyword);
+ var sb = _sourceBuilderAfterKeyword(statement.doKeyword);
// I modified the code and ran the tests with both the old and new parser.
// Apparently the old parser sometimes sticks something other than 'while'
// into the whileKeyword field, which causes statement completion to throw
// an exception further downstream.
// TODO(danrubel): change `statement.whileKeyword?.lexeme == "while"`
// to `statement.whileKeyword != null` once the fasta parser is the default.
- bool hasWhileKeyword = statement.whileKeyword?.lexeme == 'while' &&
+ var hasWhileKeyword = statement.whileKeyword?.lexeme == 'while' &&
!statement.whileKeyword.isSynthetic;
- int exitDelta = 0;
+ var exitDelta = 0;
if (!_statementHasValidBody(statement.doKeyword, statement.body)) {
- String text = utils.getNodeText(statement.body);
- int delta = 0;
+ var text = utils.getNodeText(statement.body);
+ var delta = 0;
if (text.startsWith(';')) {
delta = 1;
_addReplaceEdit(range.startLength(statement.body, delta), '');
if (hasWhileKeyword) {
text = utils.getNodeText(statement);
if (text.indexOf(RegExp(r'do\s*;\s*while')) == 0) {
- int end = text.indexOf('while');
- int start = text.indexOf(';') + 1;
+ var end = text.indexOf('while');
+ var start = text.indexOf(';') + 1;
delta += end - start - 1;
_addReplaceEdit(
SourceRange(start + statement.offset, end - start), ' ');
@@ -525,8 +525,8 @@
if (inKeyword.isSynthetic) {
return false; // Can't happen -- would be parsed as a for-statement.
}
- SourceBuilder sb = SourceBuilder(file, rightParenthesis.offset + 1);
- String src = utils.getNodeText(node);
+ var sb = SourceBuilder(file, rightParenthesis.offset + 1);
+ var src = utils.getNodeText(node);
if (name == null) {
exitPosition = Position(file, leftParenthesis.offset + 1);
src = src.substring(leftParenthesis.offset - node.offset);
@@ -562,7 +562,7 @@
bool _complete_forStatement(ForStatement forNode, ForParts forParts) {
SourceBuilder sb;
- int replacementLength = 0;
+ var replacementLength = 0;
if (forNode.leftParenthesis.isSynthetic) {
if (!forNode.rightParenthesis.isSynthetic) {
return false;
@@ -579,17 +579,16 @@
sb = SourceBuilder(file, forNode.rightParenthesis.offset + 1);
} else if (!forParts.leftSeparator.isSynthetic) {
if (_isSyntheticExpression(forParts.condition)) {
- String text = utils
+ var text = utils
.getNodeText(forNode)
.substring(forParts.leftSeparator.offset - forNode.offset);
- Match match =
- RegExp(r';\s*(/\*.*\*/\s*)?\)[ \t]*').matchAsPrefix(text);
+ var match = RegExp(r';\s*(/\*.*\*/\s*)?\)[ \t]*').matchAsPrefix(text);
if (match != null) {
// emptyCondition, emptyInitializersEmptyCondition
replacementLength = match.end - match.start;
sb = SourceBuilder(file, forParts.leftSeparator.offset);
sb.append('; ${match.group(1) ?? ''}; )');
- String suffix = text.substring(match.end);
+ var suffix = text.substring(match.end);
if (suffix.trim().isNotEmpty) {
sb.append(' ');
sb.append(suffix.trim());
@@ -628,12 +627,11 @@
forNode.rightParenthesis,
forNode.body);
} else {
- int start = forParts.condition.offset + forParts.condition.length;
- String text =
- utils.getNodeText(forNode).substring(start - forNode.offset);
+ var start = forParts.condition.offset + forParts.condition.length;
+ var text = utils.getNodeText(forNode).substring(start - forNode.offset);
if (text.startsWith(RegExp(r'\s*\)'))) {
// missingLeftSeparator
- int end = text.indexOf(')');
+ var end = text.indexOf(')');
sb = SourceBuilder(file, start);
_addReplaceEdit(SourceRange(start, end), '; ; ');
exitPosition = Position(file, start - (end - '; '.length));
@@ -678,7 +676,7 @@
if (node is! MethodDeclaration && node is! FunctionDeclaration) {
return false;
}
- bool needsParen = false;
+ var needsParen = false;
int computeExitPos(FormalParameterList parameters) {
if (needsParen = parameters.rightParenthesis.isSynthetic) {
var error = _findError(ParserErrorCode.MISSING_CLOSING_PARENTHESIS);
@@ -697,7 +695,7 @@
MethodDeclaration meth = node;
paramListEnd = computeExitPos(meth.parameters);
}
- SourceBuilder sb = SourceBuilder(file, paramListEnd);
+ var sb = SourceBuilder(file, paramListEnd);
if (needsParen) {
sb.append(')');
}
@@ -715,18 +713,18 @@
var error = _findError(ParserErrorCode.EXPECTED_TOKEN, partialMatch: "';'");
if (error != null) {
FunctionDeclarationStatement stmt = node;
- String src = utils.getNodeText(stmt);
- int insertOffset = stmt.functionDeclaration.end - 1;
+ var src = utils.getNodeText(stmt);
+ var insertOffset = stmt.functionDeclaration.end - 1;
if (stmt.functionDeclaration.functionExpression.body
is ExpressionFunctionBody) {
ExpressionFunctionBody fnb =
stmt.functionDeclaration.functionExpression.body;
- int fnbOffset = fnb.functionDefinition.offset;
- String fnSrc = src.substring(fnbOffset - stmt.offset);
+ var fnbOffset = fnb.functionDefinition.offset;
+ var fnSrc = src.substring(fnbOffset - stmt.offset);
if (!fnSrc.startsWith('=>')) {
return false;
}
- int delta = 0;
+ var delta = 0;
if (fnb.expression.isSynthetic) {
if (!fnSrc.startsWith('=> ')) {
_addInsertEdit(insertOffset, ' ');
@@ -752,11 +750,11 @@
if (_statementHasValidBody(statement.keyword, statement.block)) {
return false;
}
- SourceBuilder sb = _complete_keywordCondition(statement);
+ var sb = _complete_keywordCondition(statement);
if (sb == null) {
return false;
}
- int overshoot = _lengthOfDeletions();
+ var overshoot = _lengthOfDeletions();
sb.append(' ');
_appendEmptyBraces(sb, exitPosition == null);
_insertBuilder(sb);
@@ -775,8 +773,8 @@
if (ifNode.elseKeyword != null) {
if (selectionOffset >= ifNode.elseKeyword.end &&
_isEmptyStatement(ifNode.elseStatement)) {
- SourceBuilder sb = SourceBuilder(file, selectionOffset);
- String src = utils.getNodeText(ifNode);
+ var sb = SourceBuilder(file, selectionOffset);
+ var src = utils.getNodeText(ifNode);
if (!src
.substring(ifNode.elseKeyword.end - node.offset)
.startsWith(RegExp(r'[ \t]'))) {
@@ -819,7 +817,7 @@
sb = SourceBuilder(file, statement.condition.end);
sb.append(')');
} else {
- int afterParen = statement.rightParenthesis.offset + 1;
+ var afterParen = statement.rightParenthesis.offset + 1;
if (utils
.getNodeText(node)
.substring(afterParen - node.offset)
@@ -848,9 +846,9 @@
if (argList?.thisOrAncestorMatching((n) => n == node) == null) {
return false;
}
- int previousInsertions = _lengthOfInsertions();
- int loc = min(selectionOffset, argList.end - 1);
- int delta = 1;
+ var previousInsertions = _lengthOfInsertions();
+ var loc = min(selectionOffset, argList.end - 1);
+ var delta = 1;
var semicolonError =
_findError(ParserErrorCode.EXPECTED_TOKEN, partialMatch: "';'");
if (semicolonError == null) {
@@ -861,8 +859,8 @@
if (semicolonError != null) {
_addInsertEdit(loc, ';');
}
- String indent = utils.getLinePrefix(selectionOffset);
- int exit = utils.getLineNext(selectionOffset);
+ var indent = utils.getLinePrefix(selectionOffset);
+ var exit = utils.getLineNext(selectionOffset);
_addInsertEdit(exit, indent + eol);
exit += indent.length + eol.length + previousInsertions;
@@ -875,8 +873,8 @@
if (errors.isNotEmpty) {
offset = selectionOffset;
} else {
- String indent = utils.getLinePrefix(selectionOffset);
- int loc = utils.getLineNext(selectionOffset);
+ var indent = utils.getLinePrefix(selectionOffset);
+ var loc = utils.getLineNext(selectionOffset);
_addInsertEdit(loc, indent + eol);
offset = loc + indent.length;
}
@@ -890,11 +888,11 @@
}
var error = _findError(ParserErrorCode.EXPECTED_TOKEN, partialMatch: "';'");
if (error != null) {
- int previousInsertions = _lengthOfInsertions();
+ var previousInsertions = _lengthOfInsertions();
// TODO(messick) Fix this to find the correct place in all cases.
- int insertOffset = error.offset + error.length;
+ var insertOffset = error.offset + error.length;
_addInsertEdit(insertOffset, ';');
- int offset = _appendNewlinePlusIndent() + 1 /*';'*/ + previousInsertions;
+ var offset = _appendNewlinePlusIndent() + 1 /*';'*/ + previousInsertions;
_setCompletionAt(DartStatementCompletion.SIMPLE_SEMICOLON, offset);
return true;
}
@@ -910,7 +908,7 @@
if (switchNode.leftParenthesis.isSynthetic &&
switchNode.rightParenthesis.isSynthetic) {
exitPosition = Position(file, switchNode.switchKeyword.end + 2);
- String src = utils.getNodeText(switchNode);
+ var src = utils.getNodeText(switchNode);
if (src
.substring(switchNode.switchKeyword.end - switchNode.offset)
.startsWith(RegExp(r'[ \t]+'))) {
@@ -935,10 +933,10 @@
sb.append(' ');
_appendEmptyBraces(sb, exitPosition == null);
} else {
- SwitchMember member = _findInvalidElement(switchNode.members);
+ var member = _findInvalidElement(switchNode.members);
if (member != null) {
if (member.colon.isSynthetic) {
- int loc =
+ var loc =
member is SwitchCase ? member.expression.end : member.keyword.end;
sb = SourceBuilder(file, loc);
sb.append(': ');
@@ -958,9 +956,9 @@
TryStatement tryNode = node;
SourceBuilder sb;
CatchClause catchNode;
- bool addSpace = true;
+ var addSpace = true;
if (tryNode.body.leftBracket.isSynthetic) {
- String src = utils.getNodeText(tryNode);
+ var src = utils.getNodeText(tryNode);
if (src
.substring(tryNode.tryKeyword.end - tryNode.offset)
.startsWith(RegExp(r'[ \t]+'))) {
@@ -981,7 +979,7 @@
null !=
_findError(StaticWarningCode.NON_TYPE_IN_CATCH_CLAUSE,
partialMatch: "name 'catch")) {
- String src = utils.getNodeText(catchNode);
+ var src = utils.getNodeText(catchNode);
if (src.startsWith(RegExp(r'on[ \t]+'))) {
if (src.startsWith(RegExp(r'on[ \t][ \t]+'))) {
// onSpaces
@@ -1086,13 +1084,13 @@
void _insertBuilder(SourceBuilder builder, [int length = 0]) {
{
- SourceRange range = SourceRange(builder.offset, length);
- String text = builder.toString();
+ var range = SourceRange(builder.offset, length);
+ var text = builder.toString();
_addReplaceEdit(range, text);
}
// add exit position
{
- int exitOffset = builder.exitOffset;
+ var exitOffset = builder.exitOffset;
if (exitOffset != null) {
exitPosition = _newPosition(exitOffset);
}
@@ -1105,7 +1103,7 @@
bool _isEmptyStatement(AstNode stmt) {
if (stmt is ExpressionStatement) {
- Expression expression = stmt.expression;
+ var expression = stmt.expression;
if (expression is SimpleIdentifier) {
return expression.token.isSynthetic;
}
@@ -1124,7 +1122,7 @@
if (n is! VariableDeclaration && n is! FunctionDeclaration) {
return true;
}
- AstNode p = n.parent;
+ var p = n.parent;
return p is! Statement &&
p?.parent is! Statement &&
p?.parent?.parent is! Statement;
@@ -1138,9 +1136,9 @@
if (change.edits.isEmpty) {
return 0;
}
- int length = 0;
- for (SourceFileEdit edit in change.edits) {
- for (SourceEdit srcEdit in edit.edits) {
+ var length = 0;
+ for (var edit in change.edits) {
+ for (var srcEdit in edit.edits) {
if (srcEdit.length > 0) {
length += srcEdit.length - srcEdit.replacement.length;
}
@@ -1158,9 +1156,9 @@
if (change.edits.isEmpty) {
return 0;
}
- int length = 0;
- for (SourceFileEdit edit in change.edits) {
- for (SourceEdit srcEdit in edit.edits) {
+ var length = 0;
+ for (var edit in change.edits) {
+ for (var srcEdit in edit.edits) {
if (srcEdit.length == 0) {
length += srcEdit.replacement.length;
}
@@ -1199,9 +1197,9 @@
SourceBuilder _sourceBuilderAfterKeyword(Token keyword) {
SourceBuilder sb;
- String text = _baseNodeText(node);
+ var text = _baseNodeText(node);
text = text.substring(keyword.offset - node.offset);
- int len = keyword.length;
+ var len = keyword.length;
if (text.length == len || // onCatchComment
!text.substring(len, len + 1).contains(RegExp(r'[ \t]'))) {
sb = SourceBuilder(file, keyword.offset + len);
@@ -1219,7 +1217,7 @@
return false;
}
if (body is Block) {
- Block block = body;
+ var block = body;
return (!(block.leftBracket.isSynthetic));
}
return (lineInfo.getLocation(keyword.offset) ==
diff --git a/pkg/analysis_server/lib/src/services/completion/token_details/token_detail_builder.dart b/pkg/analysis_server/lib/src/services/completion/token_details/token_detail_builder.dart
index fd1f052..8316e43 100644
--- a/pkg/analysis_server/lib/src/services/completion/token_details/token_detail_builder.dart
+++ b/pkg/analysis_server/lib/src/services/completion/token_details/token_detail_builder.dart
@@ -4,7 +4,6 @@
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/ast/syntactic_entity.dart';
import 'package:analyzer/dart/ast/token.dart';
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/dart/element/type.dart';
@@ -21,7 +20,7 @@
/// Visit a [node] in the AST structure to build details for all of the tokens
/// contained by that node.
void visitNode(AstNode node) {
- for (SyntacticEntity entity in node.childEntities) {
+ for (var entity in node.childEntities) {
if (entity is Token) {
_createDetails(entity, null, null);
} else if (entity is SimpleIdentifier) {
@@ -44,7 +43,7 @@
} else {
type = _typeStr(entity.staticType);
}
- List<String> kinds = [];
+ var kinds = <String>[];
if (entity.inDeclarationContext()) {
kinds.add('declaration');
} else {
@@ -75,12 +74,12 @@
/// Return the [TypeName] with the [identifier].
TypeName _getTypeName(SimpleIdentifier identifier) {
- AstNode parent = identifier.parent;
+ var parent = identifier.parent;
if (parent is TypeName && identifier == parent.name) {
return parent;
} else if (parent is PrefixedIdentifier &&
parent.identifier == identifier) {
- AstNode parent2 = parent.parent;
+ var parent2 = parent.parent;
if (parent2 is TypeName && parent == parent2.name) {
return parent2;
}
@@ -90,7 +89,7 @@
/// Return a unique identifier for the [type].
String _typeStr(DartType type) {
- StringBuffer buffer = StringBuffer();
+ var buffer = StringBuffer();
_writeType(buffer, type);
return buffer.toString();
}
@@ -103,7 +102,7 @@
} else if (type is FunctionType) {
_writeType(buffer, type.returnType);
buffer.write(' Function(');
- bool first = true;
+ var first = true;
for (var parameter in type.parameters) {
if (first) {
first = false;
@@ -119,9 +118,9 @@
buffer.write(type.getDisplayString(withNullability: false));
} else {
// String uri = element.library.source.uri.toString();
- String name = element.name;
+ var name = element.name;
if (element is ClassMemberElement) {
- String className = element.enclosingElement.name;
+ var className = element.enclosingElement.name;
// TODO(brianwilkerson) Figure out why the uri is a file: URI when it
// ought to be a package: URI and restore the code below to include
// the URI in the string.
diff --git a/pkg/analysis_server/lib/src/services/correction/assist_internal.dart b/pkg/analysis_server/lib/src/services/correction/assist_internal.dart
index c4c3ff7..56190d1 100644
--- a/pkg/analysis_server/lib/src/services/correction/assist_internal.dart
+++ b/pkg/analysis_server/lib/src/services/correction/assist_internal.dart
@@ -224,7 +224,7 @@
if (builder == null) {
return;
}
- SourceChange change = builder.sourceChange;
+ var change = builder.sourceChange;
if (change.edits.isEmpty) {
_coverageMarker();
return;
@@ -310,8 +310,9 @@
body = exp.body;
}
if (body is BlockFunctionBody) {
+ var blockBody = body;
// Check for an obvious pre-existing assertion.
- for (var statement in body.block.statements) {
+ for (var statement in blockBody.block.statements) {
if (statement is AssertStatement) {
final condition = statement.condition;
if (condition is BinaryExpression) {
@@ -339,8 +340,8 @@
// adding the statement to the beginning of the list, special casing
// when there are no statements (or when there's a single statement
// and the whole block is on the same line).
- final int offset = min(utils.getLineNext(body.beginToken.offset),
- body.endToken.offset);
+ var offset = min(utils.getLineNext(blockBody.beginToken.offset),
+ blockBody.endToken.offset);
builder.addSimpleInsertion(
offset, '$prefix${indent}assert($id != null);$eol');
_addAssistFromBuilder(
@@ -355,7 +356,7 @@
// prepare enclosing ExpressionStatement
ExpressionStatement expressionStatement;
// ignore: unnecessary_this
- for (AstNode node = this.node; node != null; node = node.parent) {
+ for (var node = this.node; node != null; node = node.parent) {
if (node is ExpressionStatement) {
expressionStatement = node;
break;
@@ -373,20 +374,20 @@
return;
}
// prepare expression
- Expression expression = expressionStatement.expression;
- int offset = expression.offset;
+ var expression = expressionStatement.expression;
+ var offset = expression.offset;
// prepare expression type
- DartType type = expression.staticType;
+ var type = expression.staticType;
if (type.isVoid) {
_coverageMarker();
return;
}
// prepare excluded names
- Set<String> excluded = <String>{};
- ScopedNameFinder scopedNameFinder = ScopedNameFinder(offset);
+ var excluded = <String>{};
+ var scopedNameFinder = ScopedNameFinder(offset);
expression.accept(scopedNameFinder);
excluded.addAll(scopedNameFinder.locals.keys.toSet());
- List<String> suggestions =
+ var suggestions =
getVariableNameSuggestionsForExpression(type, expression, excluded);
if (suggestions.isNotEmpty) {
@@ -420,8 +421,7 @@
}
Future<void> _addProposal_convertClassToMixin() async {
- ClassDeclaration classDeclaration =
- node.thisOrAncestorOfType<ClassDeclaration>();
+ var classDeclaration = node.thisOrAncestorOfType<ClassDeclaration>();
if (classDeclaration == null) {
return;
}
@@ -433,21 +433,21 @@
.any((member) => member is ConstructorDeclaration)) {
return;
}
- _SuperclassReferenceFinder finder = _SuperclassReferenceFinder();
+ var finder = _SuperclassReferenceFinder();
classDeclaration.accept(finder);
- List<ClassElement> referencedClasses = finder.referencedClasses;
- List<InterfaceType> superclassConstraints = <InterfaceType>[];
- List<InterfaceType> interfaces = <InterfaceType>[];
+ var referencedClasses = finder.referencedClasses;
+ var superclassConstraints = <InterfaceType>[];
+ var interfaces = <InterfaceType>[];
- ClassElement classElement = classDeclaration.declaredElement;
- for (InterfaceType type in classElement.mixins) {
+ var classElement = classDeclaration.declaredElement;
+ for (var type in classElement.mixins) {
if (referencedClasses.contains(type.element)) {
superclassConstraints.add(type);
} else {
interfaces.add(type);
}
}
- ExtendsClause extendsClause = classDeclaration.extendsClause;
+ var extendsClause = classDeclaration.extendsClause;
if (extendsClause != null) {
if (referencedClasses.length > superclassConstraints.length) {
superclassConstraints.insert(0, classElement.supertype);
@@ -482,7 +482,7 @@
}
Future<void> _addProposal_convertDocumentationIntoBlock() async {
- Comment comment = node.thisOrAncestorOfType<Comment>();
+ var comment = node.thisOrAncestorOfType<Comment>();
if (comment == null || !comment.isDocumentation) {
return;
}
@@ -493,13 +493,13 @@
token.type != TokenType.SINGLE_LINE_COMMENT)) {
return;
}
- String prefix = utils.getNodePrefix(comment);
+ var prefix = utils.getNodePrefix(comment);
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.addReplacement(range.node(comment), (DartEditBuilder builder) {
builder.writeln('/**');
- for (Token token in comment.tokens) {
+ for (var token in comment.tokens) {
builder.write(prefix);
builder.write(' *');
builder.writeln(token.lexeme.substring('///'.length));
@@ -521,7 +521,7 @@
Future<void> _addProposal_convertIntoFinalField() async {
// Find the enclosing getter.
MethodDeclaration getter;
- for (AstNode n = node; n != null; n = n.parent) {
+ for (var n = node; n != null; n = n.parent) {
if (n is MethodDeclaration) {
getter = n;
break;
@@ -538,11 +538,11 @@
}
// Check that there is no corresponding setter.
{
- ExecutableElement element = getter.declaredElement;
+ var element = getter.declaredElement;
if (element == null) {
return;
}
- Element enclosing = element.enclosingElement;
+ var enclosing = element.enclosingElement;
if (enclosing is ClassElement) {
if (enclosing.getSetter(element.name) != null) {
return;
@@ -552,13 +552,13 @@
// Try to find the returned expression.
Expression expression;
{
- FunctionBody body = getter.body;
+ var body = getter.body;
if (body is ExpressionFunctionBody) {
expression = body.expression;
} else if (body is BlockFunctionBody) {
List<Statement> statements = body.block.statements;
if (statements.length == 1) {
- Statement statement = statements.first;
+ var statement = statements.first;
if (statement is ReturnStatement) {
expression = statement.expression;
}
@@ -567,7 +567,7 @@
}
// Use the returned expression as the field initializer.
if (expression != null) {
- String code = 'final';
+ var code = 'final';
if (getter.returnType != null) {
code += ' ' + _getNodeText(getter.returnType);
}
@@ -576,7 +576,7 @@
code += ' = ' + _getNodeText(expression);
}
code += ';';
- SourceRange replacementRange =
+ var replacementRange =
range.startEnd(getter.returnType ?? getter.propertyKeyword, getter);
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
@@ -590,7 +590,7 @@
Future<void> _addProposal_convertIntoGetter() async {
// Find the enclosing field declaration.
FieldDeclaration fieldDeclaration;
- for (AstNode n = node; n != null; n = n.parent) {
+ for (var n = node; n != null; n = n.parent) {
if (n is FieldDeclaration) {
fieldDeclaration = n;
break;
@@ -608,18 +608,18 @@
return;
}
// The field must be final and has only one variable.
- VariableDeclarationList fieldList = fieldDeclaration.fields;
+ var fieldList = fieldDeclaration.fields;
if (!fieldList.isFinal || fieldList.variables.length != 1) {
return;
}
- VariableDeclaration field = fieldList.variables.first;
+ var field = fieldList.variables.first;
// Prepare the initializer.
- Expression initializer = field.initializer;
+ var initializer = field.initializer;
if (initializer == null) {
return;
}
// Add proposal.
- String code = '';
+ var code = '';
if (fieldList.type != null) {
code += _getNodeText(fieldList.type) + ' ';
}
@@ -627,8 +627,7 @@
code += ' ' + _getNodeText(field.name);
code += ' => ' + _getNodeText(initializer);
code += ';';
- SourceRange replacementRange =
- range.startEnd(fieldList.keyword, fieldDeclaration);
+ var replacementRange = range.startEnd(fieldList.keyword, fieldDeclaration);
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.addSimpleReplacement(replacementRange, code);
@@ -643,15 +642,15 @@
}
Future<void> _addProposal_convertPartOfToUri() async {
- PartOfDirective directive = node.thisOrAncestorOfType<PartOfDirective>();
+ var directive = node.thisOrAncestorOfType<PartOfDirective>();
if (directive == null || directive.libraryName == null) {
return;
}
- String libraryPath = context.resolveResult.libraryElement.source.fullName;
- String partPath = context.resolveResult.path;
- String relativePath = relative(libraryPath, from: dirname(partPath));
- String uri = Uri.file(relativePath).toString();
- SourceRange replacementRange = range.node(directive.libraryName);
+ var libraryPath = context.resolveResult.libraryElement.source.fullName;
+ var partPath = context.resolveResult.path;
+ var relativePath = relative(libraryPath, from: dirname(partPath));
+ var uri = Uri.file(relativePath).toString();
+ var replacementRange = range.node(directive.libraryName);
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.addSimpleReplacement(replacementRange, "'$uri'");
@@ -660,7 +659,7 @@
}
Future<void> _addProposal_convertToAsyncFunctionBody() async {
- FunctionBody body = getEnclosingFunctionBody();
+ var body = getEnclosingFunctionBody();
if (body == null ||
body is EmptyFunctionBody ||
body.isAsynchronous ||
@@ -680,7 +679,7 @@
return;
}
- AstNode parent = body.parent;
+ var parent = body.parent;
if (parent is ConstructorDeclaration) {
return;
}
@@ -694,14 +693,14 @@
}
Future<void> _addProposal_convertToBlockFunctionBody() async {
- FunctionBody body = getEnclosingFunctionBody();
+ var body = getEnclosingFunctionBody();
// prepare expression body
if (body is! ExpressionFunctionBody || body.isGenerator) {
_coverageMarker();
return;
}
- Expression returnValue = (body as ExpressionFunctionBody).expression;
+ var returnValue = (body as ExpressionFunctionBody).expression;
// Return expressions can be quite large, e.g. Flutter build() methods.
// It is surprising to see this Quick Assist deep in the function body.
@@ -710,11 +709,11 @@
return;
}
- DartType returnValueType = returnValue.staticType;
- String returnValueCode = _getNodeText(returnValue);
+ var returnValueType = returnValue.staticType;
+ var returnValueCode = _getNodeText(returnValue);
// prepare prefix
- String prefix = utils.getNodePrefix(body.parent);
- String indent = utils.getIndent(1);
+ var prefix = utils.getNodePrefix(body.parent);
+ var indent = utils.getIndent(1);
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
@@ -751,12 +750,11 @@
return;
}
// prepare ConstructorDeclaration
- ConstructorDeclaration constructor =
- node.thisOrAncestorOfType<ConstructorDeclaration>();
+ var constructor = node.thisOrAncestorOfType<ConstructorDeclaration>();
if (constructor == null) {
return;
}
- FormalParameterList parameterList = constructor.parameters;
+ var parameterList = constructor.parameters;
List<ConstructorInitializer> initializers = constructor.initializers;
// prepare parameter
SimpleFormalParameter parameter;
@@ -767,10 +765,10 @@
}
if (node is SimpleIdentifier &&
node.parent is ConstructorFieldInitializer) {
- String name = (node as SimpleIdentifier).name;
+ var name = (node as SimpleIdentifier).name;
ConstructorFieldInitializer initializer = node.parent;
if (initializer.expression == node) {
- for (FormalParameter formalParameter in parameterList.parameters) {
+ for (var formalParameter in parameterList.parameters) {
if (formalParameter is SimpleFormalParameter &&
formalParameter.identifier.name == name) {
parameter = formalParameter;
@@ -780,18 +778,18 @@
}
// analyze parameter
if (parameter != null) {
- String parameterName = parameter.identifier.name;
- ParameterElement parameterElement = parameter.declaredElement;
+ var parameterName = parameter.identifier.name;
+ var parameterElement = parameter.declaredElement;
// check number of references
{
- int numOfReferences = 0;
+ var numOfReferences = 0;
AstVisitor visitor =
_SimpleIdentifierRecursiveAstVisitor((SimpleIdentifier node) {
if (node.staticElement == parameterElement) {
numOfReferences++;
}
});
- for (ConstructorInitializer initializer in initializers) {
+ for (var initializer in initializers) {
initializer.accept(visitor);
}
if (numOfReferences != 1) {
@@ -800,9 +798,9 @@
}
// find the field initializer
ConstructorFieldInitializer parameterInitializer;
- for (ConstructorInitializer initializer in initializers) {
+ for (var initializer in initializers) {
if (initializer is ConstructorFieldInitializer) {
- Expression expression = initializer.expression;
+ var expression = initializer.expression;
if (expression is SimpleIdentifier &&
expression.name == parameterName) {
parameterInitializer = initializer;
@@ -812,23 +810,23 @@
if (parameterInitializer == null) {
return;
}
- String fieldName = parameterInitializer.fieldName.name;
+ var fieldName = parameterInitializer.fieldName.name;
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
// replace parameter
builder.addSimpleReplacement(range.node(parameter), 'this.$fieldName');
// remove initializer
- int initializerIndex = initializers.indexOf(parameterInitializer);
+ var initializerIndex = initializers.indexOf(parameterInitializer);
if (initializers.length == 1) {
builder
.addDeletion(range.endEnd(parameterList, parameterInitializer));
} else {
if (initializerIndex == 0) {
- ConstructorInitializer next = initializers[initializerIndex + 1];
+ var next = initializers[initializerIndex + 1];
builder.addDeletion(range.startStart(parameterInitializer, next));
} else {
- ConstructorInitializer prev = initializers[initializerIndex - 1];
+ var prev = initializers[initializerIndex - 1];
builder.addDeletion(range.endEnd(prev, parameterInitializer));
}
}
@@ -840,8 +838,9 @@
Future<void> _addProposal_convertToForIndexLoop() async {
// find enclosing ForEachStatement
- ForStatement forEachStatement = node.thisOrAncestorMatching(
- (node) => node is ForStatement && node.forLoopParts is ForEachParts);
+ var forEachStatement = node.thisOrAncestorMatching(
+ (node) => node is ForStatement && node.forLoopParts is ForEachParts)
+ as ForStatement;
if (forEachStatement == null) {
_coverageMarker();
return;
@@ -853,17 +852,16 @@
return;
}
// loop should declare variable
- DeclaredIdentifier loopVariable =
- forEachParts is ForEachPartsWithDeclaration
- ? forEachParts.loopVariable
- : null;
+ var loopVariable = forEachParts is ForEachPartsWithDeclaration
+ ? forEachParts.loopVariable
+ : null;
if (loopVariable == null) {
_coverageMarker();
return;
}
// iterable should be VariableElement
String listName;
- Expression iterable = forEachParts.iterable;
+ var iterable = forEachParts.iterable;
if (iterable is SimpleIdentifier &&
iterable.staticElement is VariableElement) {
listName = iterable.name;
@@ -873,7 +871,7 @@
}
// iterable should be List
{
- DartType iterableType = iterable.staticType;
+ var iterableType = iterable.staticType;
if (iterableType is! InterfaceType ||
iterableType.element != typeProvider.listElement) {
_coverageMarker();
@@ -889,7 +887,7 @@
// prepare a name for the index variable
String indexName;
{
- Set<String> conflicts =
+ var conflicts =
utils.findPossibleLocalVariableConflicts(forEachStatement.offset);
if (!conflicts.contains('i')) {
indexName = 'i';
@@ -903,9 +901,9 @@
}
}
// prepare environment
- String prefix = utils.getNodePrefix(forEachStatement);
- String indent = utils.getIndent(1);
- int firstBlockLine = utils.getLineContentEnd(body.leftBracket.end);
+ var prefix = utils.getNodePrefix(forEachStatement);
+ var indent = utils.getIndent(1);
+ var firstBlockLine = utils.getLineContentEnd(body.leftBracket.end);
// add change
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
@@ -932,7 +930,7 @@
Future<void> _addProposal_convertToIsNot_onIs() async {
// may be child of "is"
- AstNode node = this.node;
+ var node = this.node;
while (node != null && node is! IsExpression) {
node = node.parent;
}
@@ -941,25 +939,25 @@
_coverageMarker();
return;
}
- IsExpression isExpression = node as IsExpression;
+ var isExpression = node as IsExpression;
if (isExpression.notOperator != null) {
_coverageMarker();
return;
}
// prepare enclosing ()
- AstNode parent = isExpression.parent;
+ var parent = isExpression.parent;
if (parent is! ParenthesizedExpression) {
_coverageMarker();
return;
}
- ParenthesizedExpression parExpression = parent as ParenthesizedExpression;
+ var parExpression = parent as ParenthesizedExpression;
// prepare enclosing !()
- AstNode parent2 = parent.parent;
+ var parent2 = parent.parent;
if (parent2 is! PrefixExpression) {
_coverageMarker();
return;
}
- PrefixExpression prefExpression = parent2 as PrefixExpression;
+ var prefExpression = parent2 as PrefixExpression;
if (prefExpression.operator.type != TokenType.BANG) {
_coverageMarker();
return;
@@ -983,7 +981,7 @@
Future<void> _addProposal_convertToIsNot_onNot() async {
// may be () in prefix expression
- AstNode node = this.node;
+ var node = this.node;
if (node is ParenthesizedExpression && node.parent is PrefixExpression) {
node = node.parent;
}
@@ -992,26 +990,26 @@
_coverageMarker();
return;
}
- PrefixExpression prefExpression = node as PrefixExpression;
+ var prefExpression = node as PrefixExpression;
// should be ! operator
if (prefExpression.operator.type != TokenType.BANG) {
_coverageMarker();
return;
}
// prepare !()
- Expression operand = prefExpression.operand;
+ var operand = prefExpression.operand;
if (operand is! ParenthesizedExpression) {
_coverageMarker();
return;
}
- ParenthesizedExpression parExpression = operand as ParenthesizedExpression;
+ var parExpression = operand as ParenthesizedExpression;
operand = parExpression.expression;
// prepare "is"
if (operand is! IsExpression) {
_coverageMarker();
return;
}
- IsExpression isExpression = operand as IsExpression;
+ var isExpression = operand as IsExpression;
if (isExpression.notOperator != null) {
_coverageMarker();
return;
@@ -1039,8 +1037,8 @@
AstNode isEmptyAccess;
SimpleIdentifier isEmptyIdentifier;
if (node is SimpleIdentifier) {
- SimpleIdentifier identifier = node as SimpleIdentifier;
- AstNode parent = identifier.parent;
+ var identifier = node as SimpleIdentifier;
+ var parent = identifier.parent;
// normal case (but rare)
if (parent is PropertyAccess) {
isEmptyIdentifier = parent.propertyName;
@@ -1057,13 +1055,13 @@
return;
}
// should be "isEmpty"
- Element propertyElement = isEmptyIdentifier.staticElement;
+ var propertyElement = isEmptyIdentifier.staticElement;
if (propertyElement == null || 'isEmpty' != propertyElement.name) {
_coverageMarker();
return;
}
// should have "isNotEmpty"
- Element propertyTarget = propertyElement.enclosingElement;
+ var propertyTarget = propertyElement.enclosingElement;
if (propertyTarget == null ||
getChildren(propertyTarget, 'isNotEmpty').isEmpty) {
_coverageMarker();
@@ -1074,8 +1072,7 @@
_coverageMarker();
return;
}
- PrefixExpression prefixExpression =
- isEmptyAccess.parent as PrefixExpression;
+ var prefixExpression = isEmptyAccess.parent as PrefixExpression;
// should be !
if (prefixExpression.operator.type != TokenType.BANG) {
_coverageMarker();
@@ -1098,7 +1095,7 @@
node = (node as InterpolationElement).parent;
}
if (node is SingleStringLiteral) {
- SingleStringLiteral literal = node;
+ var literal = node;
if (!literal.isMultiline) {
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (builder) {
@@ -1130,10 +1127,10 @@
ConstructorDeclaration constructor = node.parent.parent.parent;
FormalParameterList parameterList = node.parent.parent;
FieldFormalParameter parameter = node.parent;
- ParameterElement parameterElement = parameter.declaredElement;
- String name = (node as SimpleIdentifier).name;
+ var parameterElement = parameter.declaredElement;
+ var name = (node as SimpleIdentifier).name;
// prepare type
- DartType type = parameterElement.type;
+ var type = parameterElement.type;
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
@@ -1173,8 +1170,7 @@
Future<void> _addProposal_encapsulateField() async {
// find FieldDeclaration
- FieldDeclaration fieldDeclaration =
- node.thisOrAncestorOfType<FieldDeclaration>();
+ var fieldDeclaration = node.thisOrAncestorOfType<FieldDeclaration>();
if (fieldDeclaration == null) {
_coverageMarker();
return;
@@ -1185,7 +1181,7 @@
return;
}
// has a parse error
- VariableDeclarationList variableList = fieldDeclaration.fields;
+ var variableList = fieldDeclaration.fields;
if (variableList.keyword == null && variableList.type == null) {
_coverageMarker();
return;
@@ -1201,11 +1197,11 @@
_coverageMarker();
return;
}
- VariableDeclaration field = fields.first;
- SimpleIdentifier nameNode = field.name;
+ var field = fields.first;
+ var nameNode = field.name;
FieldElement fieldElement = nameNode.staticElement;
// should have a public name
- String name = nameNode.name;
+ var name = nameNode.name;
if (Identifier.isPrivateName(name)) {
_coverageMarker();
return;
@@ -1221,13 +1217,13 @@
builder.addSimpleReplacement(range.node(nameNode), '_$name');
// update references in constructors
ClassOrMixinDeclaration classDeclaration = fieldDeclaration.parent;
- for (ClassMember member in classDeclaration.members) {
+ for (var member in classDeclaration.members) {
if (member is ConstructorDeclaration) {
- for (FormalParameter parameter in member.parameters.parameters) {
- ParameterElement parameterElement = parameter.declaredElement;
+ for (var parameter in member.parameters.parameters) {
+ var parameterElement = parameter.declaredElement;
if (parameterElement is FieldFormalParameterElement &&
parameterElement.field == fieldElement) {
- SimpleIdentifier identifier = parameter.identifier;
+ var identifier = parameter.identifier;
builder.addSimpleReplacement(range.node(identifier), '_$name');
}
}
@@ -1241,7 +1237,7 @@
docCode = utils.getNodeText(fieldDeclaration.documentationComment);
}
- String typeCode = '';
+ var typeCode = '';
if (variableList.type != null) {
typeCode = _getNodeText(variableList.type) + ' ';
}
@@ -1274,9 +1270,9 @@
// Find "child: widget" under selection.
NamedExpression namedExp;
{
- AstNode node = this.node;
- AstNode parent = node?.parent;
- AstNode parent2 = parent?.parent;
+ var node = this.node;
+ var parent = node?.parent;
+ var parent2 = parent?.parent;
if (node is SimpleIdentifier &&
parent is Label &&
parent2 is NamedExpression &&
@@ -1300,9 +1296,8 @@
}
Future<void> _addProposal_flutterConvertToStatefulWidget() async {
- ClassDeclaration widgetClass =
- node.thisOrAncestorOfType<ClassDeclaration>();
- TypeName superclass = widgetClass?.extendsClause?.superclass;
+ var widgetClass = node.thisOrAncestorOfType<ClassDeclaration>();
+ var superclass = widgetClass?.extendsClause?.superclass;
if (widgetClass == null || superclass == null) {
_coverageMarker();
return;
@@ -1332,14 +1327,14 @@
}
// Must be a StatelessWidget subclasses.
- ClassElement widgetClassElement = widgetClass.declaredElement;
+ var widgetClassElement = widgetClass.declaredElement;
if (!flutter.isExactlyStatelessWidgetType(widgetClassElement.supertype)) {
_coverageMarker();
return;
}
- String widgetName = widgetClassElement.displayName;
- String stateName = '_${widgetName}State';
+ var widgetName = widgetClassElement.displayName;
+ var stateName = '_${widgetName}State';
// Find fields assigned in constructors.
var fieldsAssignedInConstructors = <FieldElement>{};
@@ -1347,21 +1342,21 @@
if (member is ConstructorDeclaration) {
member.accept(_SimpleIdentifierRecursiveAstVisitor((node) {
if (node.parent is FieldFormalParameter) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is FieldFormalParameterElement) {
fieldsAssignedInConstructors.add(element.field);
}
}
if (node.parent is ConstructorFieldInitializer) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is FieldElement) {
fieldsAssignedInConstructors.add(element);
}
}
if (node.inSetterContext()) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is PropertyAccessorElement) {
- PropertyInducingElement field = element.variable;
+ var field = element.variable;
if (field is FieldElement) {
fieldsAssignedInConstructors.add(field);
}
@@ -1376,7 +1371,7 @@
var elementsToMove = <Element>{};
for (var member in widgetClass.members) {
if (member is FieldDeclaration && !member.isStatic) {
- for (VariableDeclaration fieldNode in member.fields.variables) {
+ for (var fieldNode in member.fields.variables) {
FieldElement fieldElement = fieldNode.declaredElement;
if (!fieldsAssignedInConstructors.contains(fieldElement)) {
nodesToMove.add(member);
@@ -1403,7 +1398,7 @@
var text = utils.getRangeText(linesRange);
// Insert `widget.` before references to the widget instance members.
- final List<SourceEdit> edits = [];
+ var edits = <SourceEdit>[];
movedNode.accept(_SimpleIdentifierRecursiveAstVisitor((node) {
if (node.inDeclarationContext()) {
return;
@@ -1415,7 +1410,7 @@
var offset = node.offset - linesRange.offset;
var qualifier = element.isStatic ? widgetName : 'widget';
- AstNode parent = node.parent;
+ var parent = node.parent;
if (parent is InterpolationExpression &&
parent.leftBracket.type ==
TokenType.STRING_INTERPOLATION_IDENTIFIER) {
@@ -1447,8 +1442,8 @@
builder.writeReference(statefulWidgetClass);
});
- int replaceOffset = 0;
- bool hasBuildMethod = false;
+ var replaceOffset = 0;
+ var hasBuildMethod = false;
var typeParams = '';
if (widgetClass.typeParameters != null) {
@@ -1461,7 +1456,7 @@
{bool replaceWithEmptyLine = false,
bool hasEmptyLineBeforeCreateState = false,
bool hasEmptyLineAfterCreateState = true}) {
- int replaceLength = replaceEnd - replaceOffset;
+ var replaceLength = replaceEnd - replaceOffset;
builder.addReplacement(
SourceRange(replaceOffset, replaceLength),
(builder) {
@@ -1485,8 +1480,8 @@
}
// Remove continuous ranges of lines of nodes being moved.
- bool lastToRemoveIsField = false;
- int endOfLastNodeToKeep = 0;
+ var lastToRemoveIsField = false;
+ var endOfLastNodeToKeep = 0;
for (var node in widgetClass.members) {
if (nodesToMove.contains(node)) {
if (replaceOffset == 0) {
@@ -1544,12 +1539,12 @@
builder.writeln('> {');
- bool writeEmptyLine = false;
+ var writeEmptyLine = false;
for (var member in nodesToMove) {
if (writeEmptyLine) {
builder.writeln();
}
- String text = rewriteWidgetMemberReferences(member);
+ var text = rewriteWidgetMemberReferences(member);
builder.write(text);
// Write empty lines between members, but not before the first.
writeEmptyLine = true;
@@ -1568,14 +1563,14 @@
return;
}
- AstNode parentList = widget.parent;
+ var parentList = widget.parent;
if (parentList is ListLiteral) {
List<CollectionElement> parentElements = parentList.elements;
- int index = parentElements.indexOf(widget);
+ var index = parentElements.indexOf(widget);
if (index != parentElements.length - 1) {
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
- CollectionElement nextWidget = parentElements[index + 1];
+ var nextWidget = parentElements[index + 1];
var nextRange = range.node(nextWidget);
var nextText = utils.getRangeText(nextRange);
@@ -1585,8 +1580,8 @@
builder.addSimpleReplacement(nextRange, widgetText);
builder.addSimpleReplacement(widgetRange, nextText);
- int lengthDelta = nextRange.length - widgetRange.length;
- int newWidgetOffset = nextRange.offset + lengthDelta;
+ var lengthDelta = nextRange.length - widgetRange.length;
+ var newWidgetOffset = nextRange.offset + lengthDelta;
changeBuilder.setSelection(Position(file, newWidgetOffset));
});
_addAssistFromBuilder(changeBuilder, DartAssistKind.FLUTTER_MOVE_DOWN);
@@ -1600,14 +1595,14 @@
return;
}
- AstNode parentList = widget.parent;
+ var parentList = widget.parent;
if (parentList is ListLiteral) {
List<CollectionElement> parentElements = parentList.elements;
- int index = parentElements.indexOf(widget);
+ var index = parentElements.indexOf(widget);
if (index > 0) {
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
- CollectionElement previousWidget = parentElements[index - 1];
+ var previousWidget = parentElements[index - 1];
var previousRange = range.node(previousWidget);
var previousText = utils.getRangeText(previousRange);
@@ -1617,7 +1612,7 @@
builder.addSimpleReplacement(previousRange, widgetText);
builder.addSimpleReplacement(widgetRange, previousText);
- int newWidgetOffset = previousRange.offset;
+ var newWidgetOffset = previousRange.offset;
changeBuilder.setSelection(Position(file, newWidgetOffset));
});
_addAssistFromBuilder(changeBuilder, DartAssistKind.FLUTTER_MOVE_UP);
@@ -1689,13 +1684,13 @@
}
Future<void> _addProposal_flutterSwapWithChild() async {
- InstanceCreationExpression parent = flutter.identifyNewExpression(node);
+ var parent = flutter.identifyNewExpression(node);
if (!flutter.isWidgetCreation(parent)) {
_coverageMarker();
return;
}
- NamedExpression childArgument = flutter.findChildArgument(parent);
+ var childArgument = flutter.findChildArgument(parent);
if (childArgument?.expression is! InstanceCreationExpression ||
!flutter.isWidgetCreation(childArgument.expression)) {
_coverageMarker();
@@ -1708,14 +1703,14 @@
}
Future<void> _addProposal_flutterSwapWithParent() async {
- InstanceCreationExpression child = flutter.identifyNewExpression(node);
+ var child = flutter.identifyNewExpression(node);
if (!flutter.isWidgetCreation(child)) {
_coverageMarker();
return;
}
// NamedExpression (child:), ArgumentList, InstanceCreationExpression
- AstNode expr = child.parent?.parent?.parent;
+ var expr = child.parent?.parent?.parent;
if (expr is! InstanceCreationExpression) {
_coverageMarker();
return;
@@ -1727,14 +1722,14 @@
}
Future<void> _addProposal_flutterWrapStreamBuilder() async {
- Expression widgetExpr = flutter.identifyWidgetExpression(node);
+ var widgetExpr = flutter.identifyWidgetExpression(node);
if (widgetExpr == null) {
return;
}
if (flutter.isExactWidgetTypeStreamBuilder(widgetExpr.staticType)) {
return;
}
- String widgetSrc = utils.getNodeText(widgetExpr);
+ var widgetSrc = utils.getNodeText(widgetExpr);
var streamBuilderElement = await sessionHelper.getClass(
flutter.widgetsUri,
@@ -1753,9 +1748,9 @@
builder.addSimpleLinkedEdit('type', 'Object');
builder.writeln('>(');
- String indentOld = utils.getLinePrefix(widgetExpr.offset);
- String indentNew1 = indentOld + utils.getIndent(1);
- String indentNew2 = indentOld + utils.getIndent(2);
+ var indentOld = utils.getLinePrefix(widgetExpr.offset);
+ var indentNew1 = indentOld + utils.getIndent(1);
+ var indentNew2 = indentOld + utils.getIndent(2);
builder.write(indentNew1);
builder.writeln('stream: null,');
@@ -1816,7 +1811,7 @@
String parentLibraryUri,
String parentClassName,
List<String> leadingLines = const []}) async {
- Expression widgetExpr = flutter.identifyWidgetExpression(node);
+ var widgetExpr = flutter.identifyWidgetExpression(node);
if (widgetExpr == null) {
_coverageMarker();
return;
@@ -1825,7 +1820,7 @@
_coverageMarker();
return;
}
- String widgetSrc = utils.getNodeText(widgetExpr);
+ var widgetSrc = utils.getNodeText(widgetExpr);
// If the wrapper class is specified, find its element.
ClassElement parentClassElement;
@@ -1847,8 +1842,8 @@
}
builder.write('(');
if (widgetSrc.contains(eol) || leadingLines.isNotEmpty) {
- String indentOld = utils.getLinePrefix(widgetExpr.offset);
- String indentNew = '$indentOld${utils.getIndent(1)}';
+ var indentOld = utils.getLinePrefix(widgetExpr.offset);
+ var indentNew = '$indentOld${utils.getIndent(1)}';
for (var leadingLine in leadingLines) {
builder.write(eol);
@@ -1880,7 +1875,7 @@
var analyzer = SelectionAnalyzer(selectionRange);
context.resolveResult.unit.accept(analyzer);
- List<Expression> widgetExpressions = [];
+ var widgetExpressions = <Expression>[];
if (analyzer.hasSelectedNodes) {
for (var selectedNode in analyzer.selectedNodes) {
if (!flutter.isWidgetExpression(selectedNode)) {
@@ -1901,15 +1896,15 @@
var firstWidget = widgetExpressions.first;
var lastWidget = widgetExpressions.last;
var selectedRange = range.startEnd(firstWidget, lastWidget);
- String src = utils.getRangeText(selectedRange);
+ var src = utils.getRangeText(selectedRange);
Future<void> addAssist(
{@required AssistKind kind,
@required String parentLibraryUri,
@required String parentClassName}) async {
- ClassElement parentClassElement =
+ var parentClassElement =
await sessionHelper.getClass(parentLibraryUri, parentClassName);
- ClassElement widgetClassElement =
+ var widgetClassElement =
await sessionHelper.getClass(flutter.widgetsUri, 'Widget');
if (parentClassElement == null || widgetClassElement == null) {
return;
@@ -1921,9 +1916,9 @@
builder.writeReference(parentClassElement);
builder.write('(');
- String indentOld = utils.getLinePrefix(firstWidget.offset);
- String indentNew1 = indentOld + utils.getIndent(1);
- String indentNew2 = indentOld + utils.getIndent(2);
+ var indentOld = utils.getLinePrefix(firstWidget.offset);
+ var indentNew1 = indentOld + utils.getIndent(1);
+ var indentNew2 = indentOld + utils.getIndent(2);
builder.write(eol);
builder.write(indentNew1);
@@ -1932,7 +1927,7 @@
builder.write('>[');
builder.write(eol);
- String newSrc = _replaceSourceIndent(src, indentOld, indentNew2);
+ var newSrc = _replaceSourceIndent(src, indentOld, indentNew2);
builder.write(indentNew2);
builder.write(newSrc);
@@ -1962,8 +1957,7 @@
Future<void> _addProposal_importAddShow() async {
// prepare ImportDirective
- ImportDirective importDirective =
- node.thisOrAncestorOfType<ImportDirective>();
+ var importDirective = node.thisOrAncestorOfType<ImportDirective>();
if (importDirective == null) {
_coverageMarker();
return;
@@ -1979,12 +1973,11 @@
_coverageMarker();
return;
}
- Map<String, Element> namespace = getImportNamespace(importElement);
+ var namespace = getImportNamespace(importElement);
// prepare names of referenced elements (from this import)
- SplayTreeSet<String> referencedNames = SplayTreeSet<String>();
- _SimpleIdentifierRecursiveAstVisitor visitor =
- _SimpleIdentifierRecursiveAstVisitor((SimpleIdentifier node) {
- Element element = node.staticElement;
+ var referencedNames = SplayTreeSet<String>();
+ var visitor = _SimpleIdentifierRecursiveAstVisitor((SimpleIdentifier node) {
+ var element = node.staticElement;
if (element != null &&
(namespace[node.name] == element ||
(node.name != element.name &&
@@ -2000,7 +1993,7 @@
}
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
- String showCombinator = ' show ${referencedNames.join(', ')}';
+ var showCombinator = ' show ${referencedNames.join(', ')}';
builder.addSimpleInsertion(importDirective.end - 1, showCombinator);
});
_addAssistFromBuilder(changeBuilder, DartAssistKind.IMPORT_ADD_SHOW);
@@ -2013,7 +2006,7 @@
}
Future<void> _addProposal_introduceLocalTestedType() async {
- AstNode node = this.node;
+ var node = this.node;
if (node is IfStatement) {
node = (node as IfStatement).condition;
} else if (node is WhileStatement) {
@@ -2025,14 +2018,14 @@
return;
}
IsExpression isExpression = node;
- DartType castType = isExpression.type.type;
- String castTypeCode = _getNodeText(isExpression.type);
+ var castType = isExpression.type.type;
+ var castTypeCode = _getNodeText(isExpression.type);
// prepare environment
- String indent = utils.getIndent(1);
+ var indent = utils.getIndent(1);
String prefix;
Block targetBlock;
{
- Statement statement = node.thisOrAncestorOfType<Statement>();
+ var statement = node.thisOrAncestorOfType<Statement>();
if (statement is IfStatement && statement.thenStatement is Block) {
targetBlock = statement.thenStatement;
} else if (statement is WhileStatement && statement.body is Block) {
@@ -2054,12 +2047,12 @@
statementPrefix = '';
}
// prepare excluded names
- Set<String> excluded = <String>{};
- ScopedNameFinder scopedNameFinder = ScopedNameFinder(offset);
+ var excluded = <String>{};
+ var scopedNameFinder = ScopedNameFinder(offset);
isExpression.accept(scopedNameFinder);
excluded.addAll(scopedNameFinder.locals.keys.toSet());
// name(s)
- List<String> suggestions =
+ var suggestions =
getVariableNameSuggestionsForExpression(castType, null, excluded);
if (suggestions.isNotEmpty) {
@@ -2087,18 +2080,18 @@
if (node is! IfStatement) {
return;
}
- IfStatement ifStatement = node as IfStatement;
- Expression condition = ifStatement.condition;
+ var ifStatement = node as IfStatement;
+ var condition = ifStatement.condition;
// should have both "then" and "else"
- Statement thenStatement = ifStatement.thenStatement;
- Statement elseStatement = ifStatement.elseStatement;
+ var thenStatement = ifStatement.thenStatement;
+ var elseStatement = ifStatement.elseStatement;
if (thenStatement == null || elseStatement == null) {
return;
}
// prepare source
- String invertedCondition = utils.invertCondition(condition);
- String thenSource = _getNodeText(thenStatement);
- String elseSource = _getNodeText(elseStatement);
+ var invertedCondition = utils.invertCondition(condition);
+ var thenSource = _getNodeText(thenStatement);
+ var elseSource = _getNodeText(elseStatement);
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
@@ -2111,7 +2104,7 @@
Future<void> _addProposal_joinIfStatementInner() async {
// climb up condition to the (supposedly) "if" statement
- AstNode node = this.node;
+ var node = this.node;
while (node is Expression) {
node = node.parent;
}
@@ -2120,32 +2113,32 @@
_coverageMarker();
return;
}
- IfStatement targetIfStatement = node as IfStatement;
+ var targetIfStatement = node as IfStatement;
if (targetIfStatement.elseStatement != null) {
_coverageMarker();
return;
}
// prepare inner "if" statement
- Statement targetThenStatement = targetIfStatement.thenStatement;
- Statement innerStatement = getSingleStatement(targetThenStatement);
+ var targetThenStatement = targetIfStatement.thenStatement;
+ var innerStatement = getSingleStatement(targetThenStatement);
if (innerStatement is! IfStatement) {
_coverageMarker();
return;
}
- IfStatement innerIfStatement = innerStatement as IfStatement;
+ var innerIfStatement = innerStatement as IfStatement;
if (innerIfStatement.elseStatement != null) {
_coverageMarker();
return;
}
// prepare environment
- String prefix = utils.getNodePrefix(targetIfStatement);
+ var prefix = utils.getNodePrefix(targetIfStatement);
// merge conditions
String condition;
{
- Expression targetCondition = targetIfStatement.condition;
- Expression innerCondition = innerIfStatement.condition;
- String targetConditionSource = _getNodeText(targetCondition);
- String innerConditionSource = _getNodeText(innerCondition);
+ var targetCondition = targetIfStatement.condition;
+ var innerCondition = innerIfStatement.condition;
+ var targetConditionSource = _getNodeText(targetCondition);
+ var innerConditionSource = _getNodeText(innerCondition);
if (_shouldWrapParenthesisBeforeAnd(targetCondition)) {
targetConditionSource = '($targetConditionSource)';
}
@@ -2155,11 +2148,11 @@
condition = '$targetConditionSource && $innerConditionSource';
}
// replace target "if" statement
- Statement innerThenStatement = innerIfStatement.thenStatement;
- List<Statement> innerThenStatements = getStatements(innerThenStatement);
- SourceRange lineRanges = utils.getLinesRangeStatements(innerThenStatements);
- String oldSource = utils.getRangeText(lineRanges);
- String newSource = utils.indentSourceLeftRight(oldSource);
+ var innerThenStatement = innerIfStatement.thenStatement;
+ var innerThenStatements = getStatements(innerThenStatement);
+ var lineRanges = utils.getLinesRangeStatements(innerThenStatements);
+ var oldSource = utils.getRangeText(lineRanges);
+ var newSource = utils.indentSourceLeftRight(oldSource);
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
@@ -2171,7 +2164,7 @@
Future<void> _addProposal_joinIfStatementOuter() async {
// climb up condition to the (supposedly) "if" statement
- AstNode node = this.node;
+ var node = this.node;
while (node is Expression) {
node = node.parent;
}
@@ -2180,13 +2173,13 @@
_coverageMarker();
return;
}
- IfStatement targetIfStatement = node as IfStatement;
+ var targetIfStatement = node as IfStatement;
if (targetIfStatement.elseStatement != null) {
_coverageMarker();
return;
}
// prepare outer "if" statement
- AstNode parent = targetIfStatement.parent;
+ var parent = targetIfStatement.parent;
if (parent is Block) {
if ((parent as Block).statements.length != 1) {
_coverageMarker();
@@ -2198,32 +2191,31 @@
_coverageMarker();
return;
}
- IfStatement outerIfStatement = parent as IfStatement;
+ var outerIfStatement = parent as IfStatement;
if (outerIfStatement.elseStatement != null) {
_coverageMarker();
return;
}
// prepare environment
- String prefix = utils.getNodePrefix(outerIfStatement);
+ var prefix = utils.getNodePrefix(outerIfStatement);
// merge conditions
- Expression targetCondition = targetIfStatement.condition;
- Expression outerCondition = outerIfStatement.condition;
- String targetConditionSource = _getNodeText(targetCondition);
- String outerConditionSource = _getNodeText(outerCondition);
+ var targetCondition = targetIfStatement.condition;
+ var outerCondition = outerIfStatement.condition;
+ var targetConditionSource = _getNodeText(targetCondition);
+ var outerConditionSource = _getNodeText(outerCondition);
if (_shouldWrapParenthesisBeforeAnd(targetCondition)) {
targetConditionSource = '($targetConditionSource)';
}
if (_shouldWrapParenthesisBeforeAnd(outerCondition)) {
outerConditionSource = '($outerConditionSource)';
}
- String condition = '$outerConditionSource && $targetConditionSource';
+ var condition = '$outerConditionSource && $targetConditionSource';
// replace outer "if" statement
- Statement targetThenStatement = targetIfStatement.thenStatement;
- List<Statement> targetThenStatements = getStatements(targetThenStatement);
- SourceRange lineRanges =
- utils.getLinesRangeStatements(targetThenStatements);
- String oldSource = utils.getRangeText(lineRanges);
- String newSource = utils.indentSourceLeftRight(oldSource);
+ var targetThenStatement = targetIfStatement.thenStatement;
+ var targetThenStatements = getStatements(targetThenStatement);
+ var lineRanges = utils.getLinesRangeStatements(targetThenStatements);
+ var oldSource = utils.getRangeText(lineRanges);
+ var newSource = utils.indentSourceLeftRight(oldSource);
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
@@ -2243,21 +2235,21 @@
_coverageMarker();
return;
}
- AssignmentExpression assignExpression = node.parent as AssignmentExpression;
+ var assignExpression = node.parent as AssignmentExpression;
// check that binary expression is assignment
if (assignExpression.operator.type != TokenType.EQ) {
_coverageMarker();
return;
}
// prepare "declaration" statement
- Element element = (node as SimpleIdentifier).staticElement;
+ var element = (node as SimpleIdentifier).staticElement;
if (element == null) {
_coverageMarker();
return;
}
- int declOffset = element.nameOffset;
+ var declOffset = element.nameOffset;
var unit = context.resolveResult.unit;
- AstNode declNode = NodeLocator(declOffset).searchWithin(unit);
+ var declNode = NodeLocator(declOffset).searchWithin(unit);
if (declNode != null &&
declNode.parent is VariableDeclaration &&
(declNode.parent as VariableDeclaration).name == declNode &&
@@ -2267,9 +2259,8 @@
_coverageMarker();
return;
}
- VariableDeclaration decl = declNode.parent as VariableDeclaration;
- VariableDeclarationStatement declStatement =
- decl.parent.parent as VariableDeclarationStatement;
+ var decl = declNode.parent as VariableDeclaration;
+ var declStatement = decl.parent.parent as VariableDeclarationStatement;
// may be has initializer
if (decl.initializer != null) {
_coverageMarker();
@@ -2282,15 +2273,14 @@
}
// check that the "declaration" and "assignment" statements are
// parts of the same Block
- ExpressionStatement assignStatement =
- node.parent.parent as ExpressionStatement;
+ var assignStatement = node.parent.parent as ExpressionStatement;
if (assignStatement.parent is Block &&
assignStatement.parent == declStatement.parent) {
} else {
_coverageMarker();
return;
}
- Block block = assignStatement.parent as Block;
+ var block = assignStatement.parent as Block;
// check that "declaration" and "assignment" statements are adjacent
List<Statement> statements = block.statements;
if (statements.indexOf(assignStatement) ==
@@ -2311,14 +2301,13 @@
Future<void> _addProposal_joinVariableDeclaration_onDeclaration() async {
// prepare enclosing VariableDeclarationList
- VariableDeclarationList declList =
- node.thisOrAncestorOfType<VariableDeclarationList>();
+ var declList = node.thisOrAncestorOfType<VariableDeclarationList>();
if (declList != null && declList.variables.length == 1) {
} else {
_coverageMarker();
return;
}
- VariableDeclaration decl = declList.variables[0];
+ var decl = declList.variables[0];
// already initialized
if (decl.initializer != null) {
_coverageMarker();
@@ -2331,29 +2320,27 @@
_coverageMarker();
return;
}
- VariableDeclarationStatement declStatement =
- declList.parent as VariableDeclarationStatement;
- Block block = declStatement.parent as Block;
+ var declStatement = declList.parent as VariableDeclarationStatement;
+ var block = declStatement.parent as Block;
List<Statement> statements = block.statements;
// prepare assignment
AssignmentExpression assignExpression;
{
// declaration should not be last Statement
- int declIndex = statements.indexOf(declStatement);
+ var declIndex = statements.indexOf(declStatement);
if (declIndex < statements.length - 1) {
} else {
_coverageMarker();
return;
}
// next Statement should be assignment
- Statement assignStatement = statements[declIndex + 1];
+ var assignStatement = statements[declIndex + 1];
if (assignStatement is ExpressionStatement) {
} else {
_coverageMarker();
return;
}
- ExpressionStatement expressionStatement =
- assignStatement as ExpressionStatement;
+ var expressionStatement = assignStatement as ExpressionStatement;
// expression should be assignment
if (expressionStatement.expression is AssignmentExpression) {
} else {
@@ -2394,15 +2381,15 @@
_coverageMarker();
return;
}
- String literalSrc = utils.getNodeText(node);
- int newlineIdx = literalSrc.lastIndexOf(eol);
+ var literalSrc = utils.getNodeText(node);
+ var newlineIdx = literalSrc.lastIndexOf(eol);
if (newlineIdx < 0 || newlineIdx == literalSrc.length - 1) {
_coverageMarker();
return; // Lists need to be in multi-line format already.
}
- String indentOld = utils.getLinePrefix(node.offset + 1 + newlineIdx);
- String indentArg = '$indentOld${utils.getIndent(1)}';
- String indentList = '$indentOld${utils.getIndent(2)}';
+ var indentOld = utils.getLinePrefix(node.offset + 1 + newlineIdx);
+ var indentArg = '$indentOld${utils.getIndent(1)}';
+ var indentList = '$indentOld${utils.getIndent(2)}';
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
@@ -2433,17 +2420,16 @@
Future<void> _addProposal_replaceConditionalWithIfElse() async {
ConditionalExpression conditional;
// may be on Statement with Conditional
- Statement statement = node.thisOrAncestorOfType<Statement>();
+ var statement = node.thisOrAncestorOfType<Statement>();
if (statement == null) {
_coverageMarker();
return;
}
// variable declaration
- bool inVariable = false;
+ var inVariable = false;
if (statement is VariableDeclarationStatement) {
- VariableDeclarationStatement variableStatement = statement;
- for (VariableDeclaration variable
- in variableStatement.variables.variables) {
+ var variableStatement = statement;
+ for (var variable in variableStatement.variables.variables) {
if (variable.initializer is ConditionalExpression) {
conditional = variable.initializer as ConditionalExpression;
inVariable = true;
@@ -2452,12 +2438,11 @@
}
}
// assignment
- bool inAssignment = false;
+ var inAssignment = false;
if (statement is ExpressionStatement) {
- ExpressionStatement exprStmt = statement;
+ var exprStmt = statement;
if (exprStmt.expression is AssignmentExpression) {
- AssignmentExpression assignment =
- exprStmt.expression as AssignmentExpression;
+ var assignment = exprStmt.expression as AssignmentExpression;
if (assignment.operator.type == TokenType.EQ &&
assignment.rightHandSide is ConditionalExpression) {
conditional = assignment.rightHandSide as ConditionalExpression;
@@ -2466,31 +2451,30 @@
}
}
// return
- bool inReturn = false;
+ var inReturn = false;
if (statement is ReturnStatement) {
- ReturnStatement returnStatement = statement;
+ var returnStatement = statement;
if (returnStatement.expression is ConditionalExpression) {
conditional = returnStatement.expression as ConditionalExpression;
inReturn = true;
}
}
// prepare environment
- String indent = utils.getIndent(1);
- String prefix = utils.getNodePrefix(statement);
+ var indent = utils.getIndent(1);
+ var prefix = utils.getNodePrefix(statement);
if (inVariable || inAssignment || inReturn) {
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
// Type v = Conditional;
if (inVariable) {
- VariableDeclaration variable =
- conditional.parent as VariableDeclaration;
+ var variable = conditional.parent as VariableDeclaration;
builder.addDeletion(range.endEnd(variable.name, conditional));
- String conditionSrc = _getNodeText(conditional.condition);
- String thenSrc = _getNodeText(conditional.thenExpression);
- String elseSrc = _getNodeText(conditional.elseExpression);
- String name = variable.name.name;
- String src = eol;
+ var conditionSrc = _getNodeText(conditional.condition);
+ var thenSrc = _getNodeText(conditional.thenExpression);
+ var elseSrc = _getNodeText(conditional.elseExpression);
+ var name = variable.name.name;
+ var src = eol;
src += prefix + 'if ($conditionSrc) {' + eol;
src += prefix + indent + '$name = $thenSrc;' + eol;
src += prefix + '} else {' + eol;
@@ -2500,14 +2484,13 @@
}
// v = Conditional;
if (inAssignment) {
- AssignmentExpression assignment =
- conditional.parent as AssignmentExpression;
- Expression leftSide = assignment.leftHandSide;
- String conditionSrc = _getNodeText(conditional.condition);
- String thenSrc = _getNodeText(conditional.thenExpression);
- String elseSrc = _getNodeText(conditional.elseExpression);
- String name = _getNodeText(leftSide);
- String src = '';
+ var assignment = conditional.parent as AssignmentExpression;
+ var leftSide = assignment.leftHandSide;
+ var conditionSrc = _getNodeText(conditional.condition);
+ var thenSrc = _getNodeText(conditional.thenExpression);
+ var elseSrc = _getNodeText(conditional.elseExpression);
+ var name = _getNodeText(leftSide);
+ var src = '';
src += 'if ($conditionSrc) {' + eol;
src += prefix + indent + '$name = $thenSrc;' + eol;
src += prefix + '} else {' + eol;
@@ -2517,10 +2500,10 @@
}
// return Conditional;
if (inReturn) {
- String conditionSrc = _getNodeText(conditional.condition);
- String thenSrc = _getNodeText(conditional.thenExpression);
- String elseSrc = _getNodeText(conditional.elseExpression);
- String src = '';
+ var conditionSrc = _getNodeText(conditional.condition);
+ var thenSrc = _getNodeText(conditional.thenExpression);
+ var elseSrc = _getNodeText(conditional.elseExpression);
+ var src = '';
src += 'if ($conditionSrc) {' + eol;
src += prefix + indent + 'return $thenSrc;' + eol;
src += prefix + '} else {' + eol;
@@ -2540,23 +2523,23 @@
_coverageMarker();
return;
}
- IfStatement ifStatement = node as IfStatement;
+ var ifStatement = node as IfStatement;
// single then/else statements
- Statement thenStatement = getSingleStatement(ifStatement.thenStatement);
- Statement elseStatement = getSingleStatement(ifStatement.elseStatement);
+ var thenStatement = getSingleStatement(ifStatement.thenStatement);
+ var elseStatement = getSingleStatement(ifStatement.elseStatement);
if (thenStatement == null || elseStatement == null) {
_coverageMarker();
return;
}
Expression thenExpression;
Expression elseExpression;
- bool hasReturnStatements = false;
+ var hasReturnStatements = false;
if (thenStatement is ReturnStatement && elseStatement is ReturnStatement) {
hasReturnStatements = true;
thenExpression = thenStatement.expression;
elseExpression = elseStatement.expression;
}
- bool hasExpressionStatements = false;
+ var hasExpressionStatements = false;
if (thenStatement is ExpressionStatement &&
elseStatement is ExpressionStatement) {
if (thenStatement.expression is AssignmentExpression &&
@@ -2572,9 +2555,9 @@
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
// returns
if (hasReturnStatements) {
- String conditionSrc = _getNodeText(ifStatement.condition);
- String theSrc = _getNodeText(thenExpression);
- String elseSrc = _getNodeText(elseExpression);
+ var conditionSrc = _getNodeText(ifStatement.condition);
+ var theSrc = _getNodeText(thenExpression);
+ var elseSrc = _getNodeText(elseExpression);
builder.addSimpleReplacement(range.node(ifStatement),
'return $conditionSrc ? $theSrc : $elseSrc;');
}
@@ -2582,14 +2565,14 @@
if (hasExpressionStatements) {
AssignmentExpression thenAssignment = thenExpression;
AssignmentExpression elseAssignment = elseExpression;
- String thenTarget = _getNodeText(thenAssignment.leftHandSide);
- String elseTarget = _getNodeText(elseAssignment.leftHandSide);
+ var thenTarget = _getNodeText(thenAssignment.leftHandSide);
+ var elseTarget = _getNodeText(elseAssignment.leftHandSide);
if (thenAssignment.operator.type == TokenType.EQ &&
elseAssignment.operator.type == TokenType.EQ &&
thenTarget == elseTarget) {
- String conditionSrc = _getNodeText(ifStatement.condition);
- String theSrc = _getNodeText(thenAssignment.rightHandSide);
- String elseSrc = _getNodeText(elseAssignment.rightHandSide);
+ var conditionSrc = _getNodeText(ifStatement.condition);
+ var theSrc = _getNodeText(thenAssignment.rightHandSide);
+ var elseSrc = _getNodeText(elseAssignment.rightHandSide);
builder.addSimpleReplacement(range.node(ifStatement),
'$thenTarget = $conditionSrc ? $theSrc : $elseSrc;');
}
@@ -2711,13 +2694,13 @@
// prepare selected statements
List<Statement> selectedStatements;
{
- StatementAnalyzer selectionAnalyzer = StatementAnalyzer(
+ var selectionAnalyzer = StatementAnalyzer(
context.resolveResult, SourceRange(selectionOffset, selectionLength));
selectionAnalyzer.analyze();
- List<AstNode> selectedNodes = selectionAnalyzer.selectedNodes;
+ var selectedNodes = selectionAnalyzer.selectedNodes;
// convert nodes to statements
selectedStatements = [];
- for (AstNode selectedNode in selectedNodes) {
+ for (var selectedNode in selectedNodes) {
if (selectedNode is Statement) {
selectedStatements.add(selectedNode);
}
@@ -2735,13 +2718,12 @@
}
}
// prepare statement information
- Statement firstStatement = selectedStatements[0];
- SourceRange statementsRange =
- utils.getLinesRangeStatements(selectedStatements);
+ var firstStatement = selectedStatements[0];
+ var statementsRange = utils.getLinesRangeStatements(selectedStatements);
// prepare environment
- String indentOld = utils.getNodePrefix(firstStatement);
- String indentNew = '$indentOld${utils.getIndent(1)}';
- String indentedCode =
+ var indentOld = utils.getNodePrefix(firstStatement);
+ var indentNew = '$indentOld${utils.getIndent(1)}';
+ var indentedCode =
utils.replaceSourceRangeIndent(statementsRange, indentOld, indentNew);
// "block"
{
@@ -2921,7 +2903,7 @@
// flutter "setState((){ .. });"
{
- ClassDeclaration classDeclaration =
+ var classDeclaration =
node.parent.thisOrAncestorOfType<ClassDeclaration>();
if (classDeclaration != null &&
flutter.isState(classDeclaration.declaredElement)) {
@@ -2984,34 +2966,34 @@
Function getIndent,
Function getText,
DartFileEditBuilder builder) {
- Expression childArg = namedExp.expression;
- int childLoc = namedExp.offset + 'child'.length;
+ var childArg = namedExp.expression;
+ var childLoc = namedExp.offset + 'child'.length;
builder.addSimpleInsertion(childLoc, 'ren');
- int listLoc = childArg.offset;
+ var listLoc = childArg.offset;
String childArgSrc = getNodeText(childArg);
if (!childArgSrc.contains(eol)) {
builder.addSimpleInsertion(listLoc, '[');
builder.addSimpleInsertion(listLoc + childArg.length, ']');
} else {
- int newlineLoc = childArgSrc.lastIndexOf(eol);
+ var newlineLoc = childArgSrc.lastIndexOf(eol);
if (newlineLoc == childArgSrc.length) {
newlineLoc -= 1;
}
String indentOld = getLinePrefix(childArg.offset + 1 + newlineLoc);
- String indentNew = '$indentOld${getIndent(1)}';
+ var indentNew = '$indentOld${getIndent(1)}';
// The separator includes 'child:' but that has no newlines.
String separator =
getText(namedExp.offset, childArg.offset - namedExp.offset);
- String prefix = separator.contains(eol) ? '' : '$eol$indentNew';
+ var prefix = separator.contains(eol) ? '' : '$eol$indentNew';
if (prefix.isEmpty) {
builder.addSimpleInsertion(namedExp.offset + 'child:'.length, ' [');
- int argOffset = childArg.offset;
+ var argOffset = childArg.offset;
builder
.addDeletion(range.startOffsetEndOffset(argOffset - 2, argOffset));
} else {
builder.addSimpleInsertion(listLoc, '[');
}
- String newChildArgSrc =
+ var newChildArgSrc =
_replaceSourceIndent(childArgSrc, indentOld, indentNew);
newChildArgSrc = '$prefix$newChildArgSrc,$eol$indentOld]';
builder.addSimpleReplacement(range.node(childArg), newChildArgSrc);
@@ -3063,11 +3045,11 @@
// Write all the arguments of the parent.
// Don't write the "child".
Expression stableChild;
- for (Expression argument in childArgs.arguments) {
+ for (var argument in childArgs.arguments) {
if (flutter.isChildArgument(argument)) {
stableChild = argument;
} else {
- String text = _getNodeText(argument);
+ var text = _getNodeText(argument);
text = _replaceSourceIndent(text, childIndent, parentIndent);
builder.write(parentIndent);
builder.write(' ');
@@ -3085,9 +3067,9 @@
// Write all arguments of the parent.
// Don't write its child.
- for (Expression argument in parentArgs.arguments) {
+ for (var argument in parentArgs.arguments) {
if (!flutter.isChildArgument(argument)) {
- String text = _getNodeText(argument);
+ var text = _getNodeText(argument);
text = _replaceSourceIndent(text, parentIndent, childIndent);
builder.write(childIndent);
builder.write(' ');
@@ -3133,8 +3115,8 @@
/// we want to use it as operand of a logical `and` expression.
static bool _shouldWrapParenthesisBeforeAnd(Expression expr) {
if (expr is BinaryExpression) {
- BinaryExpression binary = expr;
- int precedence = binary.operator.type.precedence;
+ var binary = expr;
+ var precedence = binary.operator.type.precedence;
return precedence < TokenClass.LOGICAL_AND_OPERATOR.precedence;
}
return false;
@@ -3161,7 +3143,7 @@
@override
void visitSuperExpression(SuperExpression node) {
- AstNode parent = node.parent;
+ var parent = node.parent;
if (parent is BinaryExpression) {
_addElement(parent.staticElement);
} else if (parent is IndexExpression) {
@@ -3178,7 +3160,7 @@
void _addElement(Element element) {
if (element is ExecutableElement) {
- Element enclosingElement = element.enclosingElement;
+ var enclosingElement = element.enclosingElement;
if (enclosingElement is ClassElement) {
referencedClasses.add(enclosingElement);
}
diff --git a/pkg/analysis_server/lib/src/services/correction/base_processor.dart b/pkg/analysis_server/lib/src/services/correction/base_processor.dart
index 3bbc4f0..ecaaa94 100644
--- a/pkg/analysis_server/lib/src/services/correction/base_processor.dart
+++ b/pkg/analysis_server/lib/src/services/correction/base_processor.dart
@@ -79,18 +79,18 @@
// Getter.
if (parent is MethodDeclaration) {
- MethodDeclaration methodDeclaration = parent;
+ var methodDeclaration = parent;
var element = methodDeclaration.declaredElement;
if (element is PropertyAccessorElement) {
- PropertyAccessorElement propertyAccessor = element;
+ var propertyAccessor = element;
type = propertyAccessor.returnType;
}
// Field.
} else if (parent is VariableDeclaration) {
- VariableDeclaration variableDeclaration = parent;
+ var variableDeclaration = parent;
final element = variableDeclaration.declaredElement;
if (element is FieldElement) {
- FieldElement fieldElement = element;
+ var fieldElement = element;
type = fieldElement.type;
}
}
@@ -191,7 +191,7 @@
final body = debugFillProperties.body;
if (body is BlockFunctionBody) {
- BlockFunctionBody functionBody = body;
+ var functionBody = body;
var offset;
var prefix;
@@ -236,13 +236,13 @@
Future<ChangeBuilder>
createBuilder_addTypeAnnotation_DeclaredIdentifier() async {
- DeclaredIdentifier declaredIdentifier =
- node.thisOrAncestorOfType<DeclaredIdentifier>();
+ var declaredIdentifier = node.thisOrAncestorOfType<DeclaredIdentifier>();
if (declaredIdentifier == null) {
- ForStatement forEach = node.thisOrAncestorMatching(
- (node) => node is ForStatement && node.forLoopParts is ForEachParts);
+ var forEach = node.thisOrAncestorMatching((node) =>
+ node is ForStatement && node.forLoopParts is ForEachParts)
+ as ForStatement;
ForEachParts forEachParts = forEach?.forLoopParts;
- int offset = node.offset;
+ var offset = node.offset;
if (forEach != null &&
forEachParts.iterable != null &&
offset < forEachParts.iterable.offset) {
@@ -260,7 +260,7 @@
_coverageMarker();
return null;
}
- DartType type = declaredIdentifier.declaredElement.type;
+ var type = declaredIdentifier.declaredElement.type;
if (type is! InterfaceType && type is! FunctionType) {
_coverageMarker();
return null;
@@ -268,9 +268,9 @@
_configureTargetLocation(node);
var changeBuilder = _newDartChangeBuilder();
- bool validChange = true;
+ var validChange = true;
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
- Token keyword = declaredIdentifier.keyword;
+ var keyword = declaredIdentifier.keyword;
if (keyword.keyword == Keyword.VAR) {
builder.addReplacement(range.token(keyword), (DartEditBuilder builder) {
validChange = builder.writeType(type);
@@ -288,7 +288,7 @@
Future<ChangeBuilder>
createBuilder_addTypeAnnotation_SimpleFormalParameter() async {
- AstNode node = this.node;
+ var node = this.node;
// should be the name of a simple parameter
if (node is! SimpleIdentifier || node.parent is! SimpleFormalParameter) {
_coverageMarker();
@@ -302,7 +302,7 @@
return null;
}
// prepare the type
- DartType type = parameter.declaredElement.type;
+ var type = parameter.declaredElement.type;
// TODO(scheglov) If the parameter is in a method declaration, and if the
// method overrides a method that has a type for the corresponding
// parameter, it would be nice to copy down the type from the overridden
@@ -315,7 +315,7 @@
_configureTargetLocation(node);
var changeBuilder = _newDartChangeBuilder();
- bool validChange = true;
+ var validChange = true;
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.addInsertion(name.offset, (DartEditBuilder builder) {
validChange = builder.writeType(type);
@@ -327,10 +327,9 @@
Future<ChangeBuilder>
createBuilder_addTypeAnnotation_VariableDeclaration() async {
- AstNode node = this.node;
+ var node = this.node;
// prepare VariableDeclarationList
- VariableDeclarationList declarationList =
- node.thisOrAncestorOfType<VariableDeclarationList>();
+ var declarationList = node.thisOrAncestorOfType<VariableDeclarationList>();
if (declarationList == null) {
_coverageMarker();
return null;
@@ -346,19 +345,19 @@
_coverageMarker();
return null;
}
- VariableDeclaration variable = variables[0];
+ var variable = variables[0];
// must be not after the name of the variable
if (selectionOffset > variable.name.end) {
_coverageMarker();
return null;
}
// we need an initializer to get the type from
- Expression initializer = variable.initializer;
+ var initializer = variable.initializer;
if (initializer == null) {
_coverageMarker();
return null;
}
- DartType type = initializer.staticType;
+ var type = initializer.staticType;
// prepare type source
if ((type is! InterfaceType || type.isDartCoreNull) &&
type is! FunctionType) {
@@ -368,9 +367,9 @@
_configureTargetLocation(node);
var changeBuilder = _newDartChangeBuilder();
- bool validChange = true;
+ var validChange = true;
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
- Token keyword = declarationList.keyword;
+ var keyword = declarationList.keyword;
if (keyword?.keyword == Keyword.VAR) {
builder.addReplacement(range.token(keyword), (DartEditBuilder builder) {
validChange = builder.writeType(type);
@@ -387,7 +386,7 @@
Future<ConvertToSpreadCollectionsChange>
createBuilder_convertAddAllToSpread() async {
- AstNode node = this.node;
+ var node = this.node;
if (node is! SimpleIdentifier || node.parent is! MethodInvocation) {
_coverageMarker();
return null;
@@ -401,9 +400,9 @@
_coverageMarker();
return null;
}
- CascadeExpression cascade = invocation.thisOrAncestorOfType();
- NodeList<Expression> sections = cascade.cascadeSections;
- Expression target = cascade.target;
+ var cascade = invocation.thisOrAncestorOfType<CascadeExpression>();
+ var sections = cascade.cascadeSections;
+ var target = cascade.target;
if (target is! ListLiteral || sections[0] != invocation) {
// TODO(brianwilkerson) Consider extending this to handle set literals.
_coverageMarker();
@@ -414,14 +413,13 @@
expression is ListLiteral && expression.elements.isEmpty;
ListLiteral list = target;
- Expression argument = invocation.argumentList.arguments[0];
+ var argument = invocation.argumentList.arguments[0];
String elementText;
- ConvertToSpreadCollectionsChange change =
- ConvertToSpreadCollectionsChange();
+ var change = ConvertToSpreadCollectionsChange();
List<String> args;
if (argument is BinaryExpression &&
argument.operator.type == TokenType.QUESTION_QUESTION) {
- Expression right = argument.rightOperand;
+ var right = argument.rightOperand;
if (isEmptyListLiteral(right)) {
// ..addAll(things ?? const [])
// ..addAll(things ?? [])
@@ -429,31 +427,31 @@
}
} else if (experimentStatus.control_flow_collections &&
argument is ConditionalExpression) {
- Expression elseExpression = argument.elseExpression;
+ var elseExpression = argument.elseExpression;
if (isEmptyListLiteral(elseExpression)) {
// ..addAll(condition ? things : const [])
// ..addAll(condition ? things : [])
- String conditionText = utils.getNodeText(argument.condition);
- String thenText = utils.getNodeText(argument.thenExpression);
+ var conditionText = utils.getNodeText(argument.condition);
+ var thenText = utils.getNodeText(argument.thenExpression);
elementText = 'if ($conditionText) ...$thenText';
}
} else if (argument is ListLiteral) {
// ..addAll([ ... ])
- NodeList<CollectionElement> elements = argument.elements;
+ var elements = argument.elements;
if (elements.isEmpty) {
// TODO(brianwilkerson) Consider adding a cleanup for the empty list
// case. We can essentially remove the whole invocation because it does
// nothing.
return null;
}
- int startOffset = elements.first.offset;
- int endOffset = elements.last.end;
+ var startOffset = elements.first.offset;
+ var endOffset = elements.last.end;
elementText = utils.getText(startOffset, endOffset - startOffset);
change.isLineInvocation = true;
args = ['addAll'];
}
elementText ??= '...${utils.getNodeText(argument)}';
- DartChangeBuilder changeBuilder = _newDartChangeBuilder();
+ var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
if (list.elements.isNotEmpty) {
// ['a']..addAll(['b', 'c']);
@@ -476,19 +474,19 @@
_coverageMarker();
return null;
}
- AstNode nodeToReplace = node;
- AstNode parent = node.parent;
+ var nodeToReplace = node;
+ var parent = node.parent;
while (parent is ParenthesizedExpression) {
nodeToReplace = parent;
parent = parent.parent;
}
if (parent is ListLiteral || (parent is SetOrMapLiteral && parent.isSet)) {
ConditionalExpression conditional = node;
- Expression condition = conditional.condition.unParenthesized;
- Expression thenExpression = conditional.thenExpression.unParenthesized;
- Expression elseExpression = conditional.elseExpression.unParenthesized;
+ var condition = conditional.condition.unParenthesized;
+ var thenExpression = conditional.thenExpression.unParenthesized;
+ var elseExpression = conditional.elseExpression.unParenthesized;
- DartChangeBuilder changeBuilder = _newDartChangeBuilder();
+ var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.addReplacement(range.node(nodeToReplace),
(DartEditBuilder builder) {
@@ -507,28 +505,28 @@
}
Future<ChangeBuilder> createBuilder_convertDocumentationIntoLine() async {
- Comment comment = node.thisOrAncestorOfType<Comment>();
+ var comment = node.thisOrAncestorOfType<Comment>();
if (comment == null ||
!comment.isDocumentation ||
comment.tokens.length != 1) {
_coverageMarker();
return null;
}
- Token token = comment.tokens.first;
+ var token = comment.tokens.first;
if (token.type != TokenType.MULTI_LINE_COMMENT) {
_coverageMarker();
return null;
}
- String text = token.lexeme;
- List<String> lines = text.split('\n');
- String prefix = utils.getNodePrefix(comment);
- List<String> newLines = <String>[];
- bool firstLine = true;
- String linePrefix = '';
- for (String line in lines) {
+ var text = token.lexeme;
+ var lines = text.split('\n');
+ var prefix = utils.getNodePrefix(comment);
+ var newLines = <String>[];
+ var firstLine = true;
+ var linePrefix = '';
+ for (var line in lines) {
if (firstLine) {
firstLine = false;
- String expectedPrefix = '/**';
+ var expectedPrefix = '/**';
if (!line.startsWith(expectedPrefix)) {
_coverageMarker();
return null;
@@ -542,7 +540,7 @@
if (line.startsWith(prefix + ' */')) {
break;
}
- String expectedPrefix = prefix + ' *';
+ var expectedPrefix = prefix + ' *';
if (!line.startsWith(expectedPrefix)) {
_coverageMarker();
return null;
@@ -560,7 +558,7 @@
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.addReplacement(range.node(comment), (DartEditBuilder builder) {
- for (String newLine in newLines) {
+ for (var newLine in newLines) {
builder.write(newLine);
}
});
@@ -573,13 +571,12 @@
//
// Ensure that the selection is inside an invocation of Map.fromIterable.
//
- InstanceCreationExpression creation =
- node.thisOrAncestorOfType<InstanceCreationExpression>();
+ var creation = node.thisOrAncestorOfType<InstanceCreationExpression>();
if (creation == null) {
_coverageMarker();
return null;
}
- ConstructorElement element = creation.staticElement;
+ var element = creation.staticElement;
if (element == null ||
element.name != 'fromIterable' ||
element.enclosingElement != typeProvider.mapElement) {
@@ -589,23 +586,23 @@
//
// Ensure that the arguments have the right form.
//
- NodeList<Expression> arguments = creation.argumentList.arguments;
+ var arguments = creation.argumentList.arguments;
if (arguments.length != 3) {
_coverageMarker();
return null;
}
- Expression iterator = arguments[0].unParenthesized;
- Expression secondArg = arguments[1];
- Expression thirdArg = arguments[2];
+ var iterator = arguments[0].unParenthesized;
+ var secondArg = arguments[1];
+ var thirdArg = arguments[2];
Expression extractBody(FunctionExpression expression) {
- FunctionBody body = expression.body;
+ var body = expression.body;
if (body is ExpressionFunctionBody) {
return body.expression;
} else if (body is BlockFunctionBody) {
- NodeList<Statement> statements = body.block.statements;
+ var statements = body.block.statements;
if (statements.length == 1) {
- Statement statement = statements[0];
+ var statement = statements[0];
if (statement is ReturnStatement) {
return statement.expression;
}
@@ -616,10 +613,9 @@
FunctionExpression extractClosure(String name, Expression argument) {
if (argument is NamedExpression && argument.name.label.name == name) {
- Expression expression = argument.expression.unParenthesized;
+ var expression = argument.expression.unParenthesized;
if (expression is FunctionExpression) {
- NodeList<FormalParameter> parameters =
- expression.parameters.parameters;
+ var parameters = expression.parameters.parameters;
if (parameters.length == 1 && parameters[0].isRequiredPositional) {
if (extractBody(expression) != null) {
return expression;
@@ -630,9 +626,9 @@
return null;
}
- FunctionExpression keyClosure =
+ var keyClosure =
extractClosure('key', secondArg) ?? extractClosure('key', thirdArg);
- FunctionExpression valueClosure =
+ var valueClosure =
extractClosure('value', thirdArg) ?? extractClosure('value', secondArg);
if (keyClosure == null || valueClosure == null) {
_coverageMarker();
@@ -643,29 +639,28 @@
// necessary.
//
SimpleFormalParameter keyParameter = keyClosure.parameters.parameters[0];
- String keyParameterName = keyParameter.identifier.name;
+ var keyParameterName = keyParameter.identifier.name;
SimpleFormalParameter valueParameter =
valueClosure.parameters.parameters[0];
- String valueParameterName = valueParameter.identifier.name;
- Expression keyBody = extractBody(keyClosure);
- String keyExpressionText = utils.getNodeText(keyBody);
- Expression valueBody = extractBody(valueClosure);
- String valueExpressionText = utils.getNodeText(valueBody);
+ var valueParameterName = valueParameter.identifier.name;
+ var keyBody = extractBody(keyClosure);
+ var keyExpressionText = utils.getNodeText(keyBody);
+ var valueBody = extractBody(valueClosure);
+ var valueExpressionText = utils.getNodeText(valueBody);
String loopVariableName;
if (keyParameterName == valueParameterName) {
loopVariableName = keyParameterName;
} else {
- _ParameterReferenceFinder keyFinder =
- _ParameterReferenceFinder(keyParameter.declaredElement);
+ var keyFinder = _ParameterReferenceFinder(keyParameter.declaredElement);
keyBody.accept(keyFinder);
- _ParameterReferenceFinder valueFinder =
+ var valueFinder =
_ParameterReferenceFinder(valueParameter.declaredElement);
valueBody.accept(valueFinder);
String computeUnusedVariableName() {
- String candidate = 'e';
+ var candidate = 'e';
var index = 1;
while (keyFinder.referencesName(candidate) ||
valueFinder.referencesName(candidate)) {
@@ -710,7 +705,7 @@
//
// Construct the edit.
//
- DartChangeBuilder changeBuilder = _newDartChangeBuilder();
+ var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.addReplacement(range.node(creation), (DartEditBuilder builder) {
builder.write('{ for (var ');
@@ -731,11 +726,11 @@
if (node is SimpleStringLiteral) {
SimpleStringLiteral literal = node;
if (fromDouble ? !literal.isSingleQuoted : literal.isSingleQuoted) {
- String newQuote = literal.isMultiline
+ var newQuote = literal.isMultiline
? (fromDouble ? "'''" : '"""')
: (fromDouble ? "'" : '"');
- int quoteLength = literal.isMultiline ? 3 : 1;
- String lexeme = literal.literal.lexeme;
+ var quoteLength = literal.isMultiline ? 3 : 1;
+ var lexeme = literal.literal.lexeme;
if (!lexeme.contains(newQuote)) {
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
@@ -752,15 +747,15 @@
} else if (node is InterpolationString) {
StringInterpolation parent = node.parent;
if (fromDouble ? !parent.isSingleQuoted : parent.isSingleQuoted) {
- String newQuote = parent.isMultiline
+ var newQuote = parent.isMultiline
? (fromDouble ? "'''" : '"""')
: (fromDouble ? "'" : '"');
- int quoteLength = parent.isMultiline ? 3 : 1;
- NodeList<InterpolationElement> elements = parent.elements;
- for (int i = 0; i < elements.length; i++) {
- InterpolationElement element = elements[i];
+ var quoteLength = parent.isMultiline ? 3 : 1;
+ var elements = parent.elements;
+ for (var i = 0; i < elements.length; i++) {
+ var element = elements[i];
if (element is InterpolationString) {
- String lexeme = element.contents.lexeme;
+ var lexeme = element.contents.lexeme;
if (lexeme.contains(newQuote)) {
return null;
}
@@ -782,7 +777,7 @@
Future<ChangeBuilder> createBuilder_convertToExpressionFunctionBody() async {
// prepare current body
- FunctionBody body = getEnclosingFunctionBody();
+ var body = getEnclosingFunctionBody();
if (body is! BlockFunctionBody || body.isGenerator) {
_coverageMarker();
return null;
@@ -793,7 +788,7 @@
_coverageMarker();
return null;
}
- Statement onlyStatement = statements.first;
+ var onlyStatement = statements.first;
// prepare returned expression
Expression returnExpression;
if (onlyStatement is ReturnStatement) {
@@ -831,7 +826,7 @@
}
Future<ChangeBuilder> createBuilder_convertToGenericFunctionSyntax() async {
- AstNode node = this.node;
+ var node = this.node;
while (node != null) {
if (node is FunctionTypeAlias) {
return _createBuilder_convertFunctionTypeAliasToGenericTypeAlias(node);
@@ -881,7 +876,7 @@
node = node.parent;
}
if (node is ImportDirective) {
- ImportDirective importDirective = node;
+ var importDirective = node;
var uriSource = importDirective.uriSource;
// Ignore if invalid URI.
@@ -932,7 +927,7 @@
}
// Ignore if the uri is not a package: uri.
- Uri sourceUri = resolvedResult.uri;
+ var sourceUri = resolvedResult.uri;
if (sourceUri.scheme != 'package') {
return null;
}
@@ -951,8 +946,8 @@
// Verify that the source's uri and the import uri have the same package
// name.
- List<String> sourceSegments = sourceUri.pathSegments;
- List<String> importSegments = importUri.pathSegments;
+ var sourceSegments = sourceUri.pathSegments;
+ var importSegments = importUri.pathSegments;
if (sourceSegments.isEmpty ||
importSegments.isEmpty ||
sourceSegments.first != importSegments.first) {
@@ -960,12 +955,12 @@
}
// We only write posix style paths in import directives.
- final String relativePath = path.posix.relative(
+ var relativePath = path.posix.relative(
importUri.path,
from: path.dirname(sourceUri.path),
);
- DartChangeBuilder changeBuilder = _newDartChangeBuilder();
+ var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (builder) {
builder.addSimpleReplacement(
range.node(importDirective.uri).getExpanded(-1),
@@ -976,7 +971,7 @@
}
Future<ChangeBuilder> createBuilder_inlineAdd() async {
- AstNode node = this.node;
+ var node = this.node;
if (node is! SimpleIdentifier || node.parent is! MethodInvocation) {
_coverageMarker();
return null;
@@ -990,19 +985,19 @@
_coverageMarker();
return null;
}
- CascadeExpression cascade = invocation.thisOrAncestorOfType();
- NodeList<Expression> sections = cascade.cascadeSections;
- Expression target = cascade.target;
+ var cascade = invocation.thisOrAncestorOfType<CascadeExpression>();
+ var sections = cascade.cascadeSections;
+ var target = cascade.target;
if (target is! ListLiteral || sections[0] != invocation) {
// TODO(brianwilkerson) Consider extending this to handle set literals.
_coverageMarker();
return null;
}
ListLiteral list = target;
- Expression argument = invocation.argumentList.arguments[0];
- String elementText = utils.getNodeText(argument);
+ var argument = invocation.argumentList.arguments[0];
+ var elementText = utils.getNodeText(argument);
- DartChangeBuilder changeBuilder = _newDartChangeBuilder();
+ var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
if (list.elements.isNotEmpty) {
// ['a']..add(e);
@@ -1018,24 +1013,23 @@
/// todo (pq): unify with similar behavior in fix.
Future<ChangeBuilder> createBuilder_removeTypeAnnotation() async {
- VariableDeclarationList declarationList =
- node.thisOrAncestorOfType<VariableDeclarationList>();
+ var declarationList = node.thisOrAncestorOfType<VariableDeclarationList>();
if (declarationList == null) {
- DeclaredIdentifier declaration = node.thisOrAncestorOfType();
+ var declaration = node.thisOrAncestorOfType<DeclaredIdentifier>();
if (declaration == null) {
_coverageMarker();
return null;
}
- TypeAnnotation typeNode = declaration.type;
+ var typeNode = declaration.type;
if (typeNode == null) {
_coverageMarker();
return null;
}
- Token keyword = declaration.keyword;
+ var keyword = declaration.keyword;
var variableName = declaration.identifier;
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
- SourceRange typeRange = range.startStart(typeNode, variableName);
+ var typeRange = range.startStart(typeNode, variableName);
if (keyword != null && keyword.lexeme != 'var') {
builder.addSimpleReplacement(typeRange, '');
} else {
@@ -1045,7 +1039,7 @@
return changeBuilder;
}
// we need a type
- TypeAnnotation typeNode = declarationList.type;
+ var typeNode = declarationList.type;
if (typeNode == null) {
_coverageMarker();
return null;
@@ -1057,7 +1051,7 @@
return null;
}
// must be not after the name of the variable
- VariableDeclaration firstVariable = declarationList.variables[0];
+ var firstVariable = declarationList.variables[0];
if (selectionOffset > firstVariable.name.end) {
_coverageMarker();
return null;
@@ -1068,10 +1062,10 @@
_coverageMarker();
return null;
}
- Token keyword = declarationList.keyword;
+ var keyword = declarationList.keyword;
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
- SourceRange typeRange = range.startStart(typeNode, firstVariable);
+ var typeRange = range.startStart(typeNode, firstVariable);
if (keyword != null && keyword.lexeme != 'var') {
builder.addSimpleReplacement(typeRange, '');
} else {
@@ -1082,7 +1076,7 @@
}
Future<ChangeBuilder> createBuilder_replaceWithVar() async {
- final TypeAnnotation type = node.thisOrAncestorOfType<TypeAnnotation>();
+ var type = node.thisOrAncestorOfType<TypeAnnotation>();
if (type == null) {
return null;
}
@@ -1151,7 +1145,7 @@
}
Future<ChangeBuilder> createBuilder_sortChildPropertyLast() async {
- NamedExpression childProp = flutter.findNamedExpression(node, 'child');
+ var childProp = flutter.findNamedExpression(node, 'child');
childProp ??= flutter.findNamedExpression(node, 'children');
if (childProp == null) {
return null;
@@ -1319,28 +1313,25 @@
// TODO(brianwilkerson) Determine whether there is a reason why this method
// isn't just "return node.getAncestor((node) => node is FunctionBody);"
{
- FunctionExpression function =
- node.thisOrAncestorOfType<FunctionExpression>();
+ var function = node.thisOrAncestorOfType<FunctionExpression>();
if (function != null) {
return function.body;
}
}
{
- FunctionDeclaration function =
- node.thisOrAncestorOfType<FunctionDeclaration>();
+ var function = node.thisOrAncestorOfType<FunctionDeclaration>();
if (function != null) {
return function.functionExpression.body;
}
}
{
- ConstructorDeclaration constructor =
- node.thisOrAncestorOfType<ConstructorDeclaration>();
+ var constructor = node.thisOrAncestorOfType<ConstructorDeclaration>();
if (constructor != null) {
return constructor.body;
}
}
{
- MethodDeclaration method = node.thisOrAncestorOfType<MethodDeclaration>();
+ var method = node.thisOrAncestorOfType<MethodDeclaration>();
if (method != null) {
return method.body;
}
@@ -1367,7 +1358,7 @@
if (isExactIterable(element)) {
return true;
}
- for (InterfaceType type in element.allSupertypes) {
+ for (var type in element.allSupertypes) {
if (isExactIterable(type.element)) {
return true;
}
@@ -1385,7 +1376,7 @@
/// Return `true` if all of the parameters in the given list of [parameters]
/// have an explicit type annotation.
bool _allParametersHaveTypes(FormalParameterList parameters) {
- for (FormalParameter parameter in parameters.parameters) {
+ for (var parameter in parameters.parameters) {
if (parameter is DefaultFormalParameter) {
parameter = (parameter as DefaultFormalParameter).parameter;
}
@@ -1404,7 +1395,7 @@
void _configureTargetLocation(Object target) {
utils.targetClassElement = null;
if (target is AstNode) {
- ClassDeclaration targetClassDeclaration =
+ var targetClassDeclaration =
target.thisOrAncestorOfType<ClassDeclaration>();
if (targetClassDeclaration != null) {
utils.targetClassElement = targetClassDeclaration.declaredElement;
@@ -1422,9 +1413,9 @@
if (node.returnType != null) {
returnType = utils.getNodeText(node.returnType);
}
- String functionName = utils.getRangeText(
+ var functionName = utils.getRangeText(
range.startEnd(node.name, node.typeParameters ?? node.name));
- String parameters = utils.getNodeText(node.parameters);
+ var parameters = utils.getNodeText(node.parameters);
String replacement;
if (returnType == null) {
replacement = '$functionName = Function$parameters';
@@ -1451,9 +1442,9 @@
if (node.returnType != null) {
returnType = utils.getNodeText(node.returnType);
}
- String functionName = utils.getRangeText(range.startEnd(
+ var functionName = utils.getRangeText(range.startEnd(
node.identifier, node.typeParameters ?? node.identifier));
- String parameters = utils.getNodeText(node.parameters);
+ var parameters = utils.getNodeText(node.parameters);
String replacement;
if (returnType == null) {
replacement = 'Function$parameters $functionName';
@@ -1518,9 +1509,9 @@
/// the [newName]. The [offset] is the offset of the first character of the
/// [source] relative to the start of the file.
String replaceName(String source, String newName, int offset) {
- int oldLength = parameter.name.length;
- for (int i = references.length - 1; i >= 0; i--) {
- int oldOffset = references[i].offset - offset;
+ var oldLength = parameter.name.length;
+ for (var i = references.length - 1; i >= 0; i--) {
+ var oldOffset = references[i].offset - offset;
source = source.replaceRange(oldOffset, oldOffset + oldLength, newName);
}
return source;
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/add_field_formal_parameters.dart b/pkg/analysis_server/lib/src/services/correction/dart/add_field_formal_parameters.dart
index 76a79c7..2d5018e 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/add_field_formal_parameters.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/add_field_formal_parameters.dart
@@ -6,7 +6,6 @@
import 'package:analysis_server/src/services/correction/fix.dart';
import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/dart/element/type.dart';
import 'package:analyzer/src/generated/error_verifier.dart';
import 'package:analyzer_plugin/utilities/change_builder/change_builder_dart.dart';
import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
@@ -24,16 +23,15 @@
List<FormalParameter> parameters = constructor.parameters.parameters;
ClassDeclaration classNode = constructor.parent;
- InterfaceType superType = classNode.declaredElement.supertype;
+ var superType = classNode.declaredElement.supertype;
// Compute uninitialized final fields.
- List<FieldElement> fields =
- ErrorVerifier.computeNotInitializedFields(constructor);
+ var fields = ErrorVerifier.computeNotInitializedFields(constructor);
fields.retainWhere((FieldElement field) => field.isFinal);
// Prepare new parameters code.
fields.sort((a, b) => a.nameOffset - b.nameOffset);
- String fieldParametersCode =
+ var fieldParametersCode =
fields.map((field) => 'this.${field.name}').join(', ');
// Specialize for Flutter widgets.
@@ -52,7 +50,7 @@
// Prepare the last required parameter.
FormalParameter lastRequiredParameter;
- for (FormalParameter parameter in parameters) {
+ for (var parameter in parameters) {
if (parameter.isRequiredPositional) {
lastRequiredParameter = parameter;
}
@@ -65,7 +63,7 @@
', $fieldParametersCode',
);
} else {
- int offset = constructor.parameters.leftParenthesis.end;
+ var offset = constructor.parameters.leftParenthesis.end;
if (parameters.isNotEmpty) {
fieldParametersCode += ', ';
}
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/add_return_type.dart b/pkg/analysis_server/lib/src/services/correction/dart/add_return_type.dart
index ede0d75..c1f61c6 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/add_return_type.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/add_return_type.dart
@@ -133,12 +133,12 @@
void visitReturnStatement(ReturnStatement node) {
hasReturn = true;
// prepare expression
- Expression expression = node.expression;
+ var expression = node.expression;
if (expression == null) {
return;
}
// prepare type
- DartType type = expression.staticType;
+ var type = expression.staticType;
if (type.isBottom) {
return;
}
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/convert_to_list_literal.dart b/pkg/analysis_server/lib/src/services/correction/dart/convert_to_list_literal.dart
index 304342b..1c4dda0 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/convert_to_list_literal.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/convert_to_list_literal.dart
@@ -34,8 +34,7 @@
//
// Extract the information needed to build the edit.
//
- TypeArgumentList constructorTypeArguments =
- creation.constructorName.type.typeArguments;
+ var constructorTypeArguments = creation.constructorName.type.typeArguments;
//
// Build the edit.
//
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/convert_to_map_literal.dart b/pkg/analysis_server/lib/src/services/correction/dart/convert_to_map_literal.dart
index bf09d53..b8098ce 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/convert_to_map_literal.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/convert_to_map_literal.dart
@@ -36,8 +36,7 @@
//
// Extract the information needed to build the edit.
//
- TypeArgumentList constructorTypeArguments =
- creation.constructorName.type.typeArguments;
+ var constructorTypeArguments = creation.constructorName.type.typeArguments;
//
// Build the edit.
//
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/convert_to_null_aware.dart b/pkg/analysis_server/lib/src/services/correction/dart/convert_to_null_aware.dart
index 125a874..adace32 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/convert_to_null_aware.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/convert_to_null_aware.dart
@@ -22,7 +22,7 @@
@override
Future<void> compute(DartChangeBuilder builder) async {
- AstNode node = this.node;
+ var node = this.node;
if (node.parent is BinaryExpression &&
node.parent.parent is ConditionalExpression) {
node = node.parent.parent;
@@ -31,7 +31,7 @@
return;
}
ConditionalExpression conditional = node;
- Expression condition = conditional.condition.unParenthesized;
+ var condition = conditional.condition.unParenthesized;
SimpleIdentifier identifier;
Expression nullExpression;
Expression nonNullExpression;
@@ -42,8 +42,8 @@
// Identify the variable being compared to `null`, or return if the
// condition isn't a simple comparison of `null` to a variable's value.
//
- Expression leftOperand = condition.leftOperand;
- Expression rightOperand = condition.rightOperand;
+ var leftOperand = condition.leftOperand;
+ var rightOperand = condition.rightOperand;
if (leftOperand is NullLiteral && rightOperand is SimpleIdentifier) {
identifier = rightOperand;
} else if (rightOperand is NullLiteral &&
@@ -74,7 +74,7 @@
if (nullExpression.unParenthesized is! NullLiteral) {
return;
}
- Expression unwrappedExpression = nonNullExpression.unParenthesized;
+ var unwrappedExpression = nonNullExpression.unParenthesized;
Expression target;
Token operator;
if (unwrappedExpression is MethodInvocation) {
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/convert_to_set_literal.dart b/pkg/analysis_server/lib/src/services/correction/dart/convert_to_set_literal.dart
index b1d00d3..bf39226 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/convert_to_set_literal.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/convert_to_set_literal.dart
@@ -63,12 +63,12 @@
// Handle an invocation of the default constructor `Set()`.
} else if (name.name == 'from' || name.name == 'of') {
// Handle an invocation of the constructor `Set.from()` or `Set.of()`.
- NodeList<Expression> arguments = creation.argumentList.arguments;
+ var arguments = creation.argumentList.arguments;
if (arguments.length != 1) {
return;
}
if (arguments[0] is ListLiteral) {
- ListLiteral elements = arguments[0] as ListLiteral;
+ var elements = arguments[0] as ListLiteral;
elementTypeArguments = elements.typeArguments;
elementsRange =
range.endStart(elements.leftBracket, elements.rightBracket);
@@ -133,7 +133,7 @@
/// Return `true` if the instance [creation] contains at least one unambiguous
/// element that would cause a set to be inferred.
bool _hasUnambiguousElement(InstanceCreationExpression creation) {
- NodeList<Expression> arguments = creation.argumentList.arguments;
+ var arguments = creation.argumentList.arguments;
if (arguments == null || arguments.isEmpty) {
return false;
}
@@ -159,7 +159,7 @@
/// set literal rather than a map literal.
bool _listHasUnambiguousElement(AstNode node) {
if (node is ListLiteral && node.elements.isNotEmpty) {
- for (CollectionElement element in node.elements) {
+ for (var element in node.elements) {
if (_isUnambiguousElement(element)) {
return true;
}
@@ -171,9 +171,9 @@
/// Return `true` if a set would be inferred if the literal replacing the
/// instance [creation] did not have explicit type arguments.
bool _setWouldBeInferred(InstanceCreationExpression creation) {
- AstNode parent = creation.parent;
+ var parent = creation.parent;
if (parent is VariableDeclaration) {
- AstNode parent2 = parent.parent;
+ var parent2 = parent.parent;
if (parent2 is VariableDeclarationList &&
parent2.type?.type?.element == typeProvider.setElement) {
return true;
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/convert_to_where_type.dart b/pkg/analysis_server/lib/src/services/correction/dart/convert_to_where_type.dart
index 6bb40c4..fd1a83d 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/convert_to_where_type.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/convert_to_where_type.dart
@@ -15,7 +15,7 @@
@override
Future<void> compute(DartChangeBuilder builder) async {
- AstNode node = this.node;
+ var node = this.node;
if (node is! SimpleIdentifier || node.parent is! MethodInvocation) {
return;
}
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/exchange_operands.dart b/pkg/analysis_server/lib/src/services/correction/dart/exchange_operands.dart
index d9e67ed..c04eceb 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/exchange_operands.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/exchange_operands.dart
@@ -6,7 +6,6 @@
import 'package:analysis_server/src/services/correction/dart/abstract_producer.dart';
import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/ast/token.dart';
-import 'package:analyzer/source/source_range.dart';
import 'package:analyzer_plugin/utilities/assist/assist.dart';
import 'package:analyzer_plugin/utilities/change_builder/change_builder_dart.dart';
import 'package:analyzer_plugin/utilities/range_factory.dart';
@@ -21,31 +20,30 @@
if (node is! BinaryExpression) {
return;
}
- BinaryExpression binaryExpression = node as BinaryExpression;
+ var binaryExpression = node as BinaryExpression;
// prepare operator position
if (!isOperatorSelected(binaryExpression)) {
return;
}
// add edits
- Expression leftOperand = binaryExpression.leftOperand;
- Expression rightOperand = binaryExpression.rightOperand;
+ var leftOperand = binaryExpression.leftOperand;
+ var rightOperand = binaryExpression.rightOperand;
// find "wide" enclosing binary expression with same operator
while (binaryExpression.parent is BinaryExpression) {
- BinaryExpression newBinaryExpression =
- binaryExpression.parent as BinaryExpression;
+ var newBinaryExpression = binaryExpression.parent as BinaryExpression;
if (newBinaryExpression.operator.type != binaryExpression.operator.type) {
break;
}
binaryExpression = newBinaryExpression;
}
// exchange parts of "wide" expression parts
- SourceRange leftRange = range.startEnd(binaryExpression, leftOperand);
- SourceRange rightRange = range.startEnd(rightOperand, binaryExpression);
+ var leftRange = range.startEnd(binaryExpression, leftOperand);
+ var rightRange = range.startEnd(rightOperand, binaryExpression);
// maybe replace the operator
- Token operator = binaryExpression.operator;
+ var operator = binaryExpression.operator;
// prepare a new operator
String newOperator;
- TokenType operatorType = operator.type;
+ var operatorType = operator.type;
if (operatorType == TokenType.LT) {
newOperator = '>';
} else if (operatorType == TokenType.LT_EQ) {
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/inline_typedef.dart b/pkg/analysis_server/lib/src/services/correction/dart/inline_typedef.dart
index fdb48cc..82832ec 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/inline_typedef.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/inline_typedef.dart
@@ -69,7 +69,7 @@
}
String groupEnd;
builder.write('(');
- for (int i = 0; i < parameters.length; i++) {
+ for (var i = 0; i < parameters.length; i++) {
var parameter = parameters[i];
if (i > 0) {
// This intentionally drops any trailing comma in order to improve
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/remove_dead_if_null.dart b/pkg/analysis_server/lib/src/services/correction/dart/remove_dead_if_null.dart
index 523cb3f..fc64406 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/remove_dead_if_null.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/remove_dead_if_null.dart
@@ -6,7 +6,6 @@
import 'package:analysis_server/src/services/correction/fix.dart';
import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/ast/token.dart';
-import 'package:analyzer/source/source_range.dart';
import 'package:analyzer_plugin/utilities/change_builder/change_builder_dart.dart';
import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
import 'package:analyzer_plugin/utilities/range_factory.dart';
@@ -42,7 +41,7 @@
//
// Extract the information needed to build the edit.
//
- SourceRange sourceRange =
+ var sourceRange =
range.endEnd(expression.leftOperand, expression.rightOperand);
//
// Build the edit.
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/replace_with_interpolation.dart b/pkg/analysis_server/lib/src/services/correction/dart/replace_with_interpolation.dart
index f21548a..bdced61 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/replace_with_interpolation.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/replace_with_interpolation.dart
@@ -100,7 +100,7 @@
var quotes = style.quotes;
var buffer = StringBuffer();
buffer.write(quotes);
- for (int i = 0; i < components.length; i++) {
+ for (var i = 0; i < components.length; i++) {
var component = components[i];
if (component is SimpleStringLiteral) {
var contents = utils.getRangeText(range.startOffsetEndOffset(
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/shadow_field.dart b/pkg/analysis_server/lib/src/services/correction/dart/shadow_field.dart
index be9dfa5..54306ba 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/shadow_field.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/shadow_field.dart
@@ -40,7 +40,7 @@
return;
}
var enclosingBlock = statement.parent as Block;
- _ReferenceFinder finder = _ReferenceFinder(accessor.correspondingSetter);
+ var finder = _ReferenceFinder(accessor.correspondingSetter);
enclosingBlock.accept(finder);
if (finder.hasSetterReference) {
return;
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/split_and_condition.dart b/pkg/analysis_server/lib/src/services/correction/dart/split_and_condition.dart
index 553e486..3fdefb9 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/split_and_condition.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/split_and_condition.dart
@@ -7,7 +7,6 @@
import 'package:analysis_server/src/services/correction/util.dart';
import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/ast/token.dart';
-import 'package:analyzer/source/source_range.dart';
import 'package:analyzer_plugin/utilities/assist/assist.dart';
import 'package:analyzer_plugin/utilities/change_builder/change_builder_dart.dart';
import 'package:analyzer_plugin/utilities/range_factory.dart';
@@ -22,7 +21,7 @@
if (node is! BinaryExpression) {
return;
}
- BinaryExpression binaryExpression = node as BinaryExpression;
+ var binaryExpression = node as BinaryExpression;
// prepare operator position
if (!isOperatorSelected(binaryExpression)) {
return;
@@ -32,17 +31,17 @@
return;
}
// prepare "if"
- Statement statement = node.thisOrAncestorOfType<Statement>();
+ var statement = node.thisOrAncestorOfType<Statement>();
if (statement is! IfStatement) {
return;
}
- IfStatement ifStatement = statement as IfStatement;
+ var ifStatement = statement as IfStatement;
// no support "else"
if (ifStatement.elseStatement != null) {
return;
}
// check that binary expression is part of first level && condition of "if"
- BinaryExpression condition = binaryExpression;
+ var condition = binaryExpression;
while (condition.parent is BinaryExpression &&
(condition.parent as BinaryExpression).operator.type ==
TokenType.AMPERSAND_AMPERSAND) {
@@ -52,12 +51,12 @@
return;
}
// prepare environment
- String prefix = utils.getNodePrefix(ifStatement);
- String indent = utils.getIndent(1);
+ var prefix = utils.getNodePrefix(ifStatement);
+ var indent = utils.getIndent(1);
// prepare "rightCondition"
String rightConditionSource;
{
- SourceRange rightConditionRange =
+ var rightConditionRange =
range.startEnd(binaryExpression.rightOperand, condition);
rightConditionSource = getRangeText(rightConditionRange);
}
@@ -67,30 +66,30 @@
builder
.addDeletion(range.endEnd(binaryExpression.leftOperand, condition));
// update "then" statement
- Statement thenStatement = ifStatement.thenStatement;
+ var thenStatement = ifStatement.thenStatement;
if (thenStatement is Block) {
- Block thenBlock = thenStatement;
- SourceRange thenBlockRange = range.node(thenBlock);
+ var thenBlock = thenStatement;
+ var thenBlockRange = range.node(thenBlock);
// insert inner "if" with right part of "condition"
- int thenBlockInsideOffset = thenBlockRange.offset + 1;
+ var thenBlockInsideOffset = thenBlockRange.offset + 1;
builder.addSimpleInsertion(thenBlockInsideOffset,
'$eol$prefix${indent}if ($rightConditionSource) {');
// insert closing "}" for inner "if"
- int thenBlockEnd = thenBlockRange.end;
+ var thenBlockEnd = thenBlockRange.end;
// insert before outer "then" block "}"
builder.addSimpleInsertion(thenBlockEnd - 1, '$indent}$eol$prefix');
} else {
// insert inner "if" with right part of "condition"
- String source = '$eol$prefix${indent}if ($rightConditionSource)';
+ var source = '$eol$prefix${indent}if ($rightConditionSource)';
builder.addSimpleInsertion(
ifStatement.rightParenthesis.offset + 1, source);
}
// indent "then" statements to correspond inner "if"
{
- List<Statement> thenStatements = getStatements(thenStatement);
- SourceRange linesRange = utils.getLinesRangeStatements(thenStatements);
- String thenIndentOld = '$prefix$indent';
- String thenIndentNew = '$thenIndentOld$indent';
+ var thenStatements = getStatements(thenStatement);
+ var linesRange = utils.getLinesRangeStatements(thenStatements);
+ var thenIndentOld = '$prefix$indent';
+ var thenIndentNew = '$thenIndentOld$indent';
builder.addSimpleReplacement(
linesRange,
utils.replaceSourceRangeIndent(
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/wrap_in_text.dart b/pkg/analysis_server/lib/src/services/correction/dart/wrap_in_text.dart
index 7f26c42..e391f54 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/wrap_in_text.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/wrap_in_text.dart
@@ -5,11 +5,15 @@
import 'package:analysis_server/src/services/correction/dart/abstract_producer.dart';
import 'package:analysis_server/src/services/correction/fix.dart';
import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer_plugin/utilities/change_builder/change_builder_dart.dart';
import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
import 'package:analyzer_plugin/utilities/range_factory.dart';
class WrapInText extends CorrectionProducer {
+ ParameterElement _parameterElement;
+ Expression _stringExpression;
+
@override
FixKind get fixKind => DartFixKind.WRAP_IN_TEXT;
@@ -18,29 +22,34 @@
//
// Extract the information needed to build the edit.
//
- var value = _findStringToWrap(node);
- if (value == null) {
+ _extractContextInformation(node);
+ if (_parameterElement == null || _stringExpression == null) {
return;
}
- var parameter = (value.parent as Expression).staticParameterElement;
- if (parameter == null || !flutter.isWidget(parameter.type.element)) {
+ if (!flutter.isWidgetType(_parameterElement.type)) {
return;
}
+
//
// Extract the information needed to build the edit.
//
- var literalSource = utils.getNodeText(value);
+ var stringExpressionCode = utils.getNodeText(_stringExpression);
+
//
// Build the edit.
//
await builder.addFileEdit(file, (DartFileEditBuilder builder) {
- builder.addSimpleReplacement(range.node(value), 'Text($literalSource)');
+ builder.addSimpleReplacement(
+ range.node(_stringExpression),
+ 'Text($stringExpressionCode)',
+ );
});
}
- /// Return the expression that should be wrapped in an invocation of the
- /// constructor for `Text`.
- Expression _findStringToWrap(AstNode node) {
+ /// Set the `String` typed named expression to [_stringExpression], and the
+ /// corresponding parameter to [_parameterElement]. Leave the fields `null`
+ /// if not a named argument, or not a `String` typed expression.
+ void _extractContextInformation(AstNode node) {
if (node is SimpleIdentifier) {
var label = node.parent;
if (label is Label) {
@@ -48,11 +57,11 @@
if (namedExpression is NamedExpression) {
var expression = namedExpression.expression;
if (expression.staticType.isDartCoreString) {
- return expression;
+ _parameterElement = node.staticElement;
+ _stringExpression = expression;
}
}
}
}
- return null;
}
}
diff --git a/pkg/analysis_server/lib/src/services/correction/fix/analysis_options/fix_generator.dart b/pkg/analysis_server/lib/src/services/correction/fix/analysis_options/fix_generator.dart
index d0806ae..c6e25e8 100644
--- a/pkg/analysis_server/lib/src/services/correction/fix/analysis_options/fix_generator.dart
+++ b/pkg/analysis_server/lib/src/services/correction/fix/analysis_options/fix_generator.dart
@@ -14,8 +14,6 @@
import 'package:analyzer/src/analysis_options/error/option_codes.dart';
import 'package:analyzer/src/generated/java_core.dart';
import 'package:analyzer/src/generated/source.dart';
-import 'package:analyzer_plugin/protocol/protocol_common.dart'
- show SourceChange;
import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
import 'package:yaml/yaml.dart';
@@ -49,14 +47,14 @@
/// Return the list of fixes that apply to the error being fixed.
Future<List<Fix>> computeFixes() async {
- YamlNodeLocator locator =
+ var locator =
YamlNodeLocator(start: errorOffset, end: errorOffset + errorLength - 1);
coveringNodePath = locator.searchWithin(options);
if (coveringNodePath.isEmpty) {
return fixes;
}
- ErrorCode errorCode = error.errorCode;
+ var errorCode = error.errorCode;
// if (errorCode == AnalysisOptionsErrorCode.INCLUDED_FILE_PARSE_ERROR) {
// } else if (errorCode == AnalysisOptionsErrorCode.PARSE_ERROR) {
// } else if (errorCode ==
@@ -92,22 +90,22 @@
void _addFix_removeSetting() async {
if (coveringNodePath[0] is YamlScalar) {
SourceRange deletionRange;
- int index = 1;
+ var index = 1;
while (index < coveringNodePath.length) {
- YamlNode parent = coveringNodePath[index];
+ var parent = coveringNodePath[index];
if (parent is YamlList) {
if (parent.nodes.length > 1) {
- YamlNode nodeToDelete = coveringNodePath[index - 1];
+ var nodeToDelete = coveringNodePath[index - 1];
deletionRange = _lines(
nodeToDelete.span.start.offset, nodeToDelete.span.end.offset);
break;
}
} else if (parent is YamlMap) {
- Map<dynamic, YamlNode> nodes = parent.nodes;
+ var nodes = parent.nodes;
if (nodes.length > 1) {
YamlNode key;
YamlNode value;
- YamlNode child = coveringNodePath[index - 1];
+ var child = coveringNodePath[index - 1];
if (nodes.containsKey(child)) {
key = child;
value = nodes[child];
@@ -133,10 +131,10 @@
}
index++;
}
- YamlNode nodeToDelete = coveringNodePath[index - 1];
+ var nodeToDelete = coveringNodePath[index - 1];
deletionRange ??=
_lines(nodeToDelete.span.start.offset, nodeToDelete.span.end.offset);
- ChangeBuilder builder = ChangeBuilder();
+ var builder = ChangeBuilder();
await builder.addFileEdit(file, (builder) {
builder.addDeletion(deletionRange);
});
@@ -149,7 +147,7 @@
/// [kind]. If [args] are provided, they will be used to fill in the message
/// for the fix.
void _addFixFromBuilder(ChangeBuilder builder, FixKind kind, {List args}) {
- SourceChange change = builder.sourceChange;
+ var change = builder.sourceChange;
if (change.edits.isEmpty) {
return;
}
@@ -166,9 +164,9 @@
SourceRange _lines(int start, int end) {
CharacterLocation startLocation = lineInfo.getLocation(start);
- int startOffset = lineInfo.getOffsetOfLine(startLocation.lineNumber - 1);
+ var startOffset = lineInfo.getOffsetOfLine(startLocation.lineNumber - 1);
CharacterLocation endLocation = lineInfo.getLocation(end);
- int endOffset = lineInfo.getOffsetOfLine(
+ var endOffset = lineInfo.getOffsetOfLine(
math.min(endLocation.lineNumber, lineInfo.lineCount - 1));
return SourceRange(startOffset, endOffset - startOffset);
}
diff --git a/pkg/analysis_server/lib/src/services/correction/fix/manifest/fix_generator.dart b/pkg/analysis_server/lib/src/services/correction/fix/manifest/fix_generator.dart
index 6d2bb89..d073108 100644
--- a/pkg/analysis_server/lib/src/services/correction/fix/manifest/fix_generator.dart
+++ b/pkg/analysis_server/lib/src/services/correction/fix/manifest/fix_generator.dart
@@ -12,13 +12,10 @@
import 'package:analyzer/src/generated/java_core.dart';
import 'package:analyzer/src/generated/source.dart';
import 'package:analyzer/src/manifest/manifest_warning_code.dart';
-import 'package:analyzer_plugin/protocol/protocol_common.dart'
- show SourceChange;
import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
import 'package:html/dom.dart';
import 'package:meta/meta.dart';
-import 'package:source_span/source_span.dart';
/// An object used to locate the HTML [Node] associated with a source range.
/// More specifically, it will return the deepest HTML [Node] which completely
@@ -44,17 +41,17 @@
/// node was found. The path is represented by all of the elements from the
/// starting [node] to the most deeply nested node, in reverse order.
List<Node> searchWithin(Node node) {
- List<Node> path = [];
+ var path = <Node>[];
_searchWithin(path, node);
return path;
}
void _searchWithin(List<Node> path, Node node) {
- FileSpan span = node.sourceSpan;
+ var span = node.sourceSpan;
if (span.start.offset > _endOffset || span.end.offset < _startOffset) {
return;
}
- for (Element element in node.children) {
+ for (var element in node.children) {
_searchWithin(path, element);
if (path.isNotEmpty) {
path.add(node);
@@ -94,14 +91,14 @@
/// Return the list of fixes that apply to the error being fixed.
Future<List<Fix>> computeFixes() async {
- HtmlNodeLocator locator =
+ var locator =
HtmlNodeLocator(start: errorOffset, end: errorOffset + errorLength - 1);
coveringNodePath = locator.searchWithin(document);
if (coveringNodePath.isEmpty) {
return fixes;
}
- ErrorCode errorCode = error.errorCode;
+ var errorCode = error.errorCode;
if (errorCode == ManifestWarningCode.UNSUPPORTED_CHROME_OS_HARDWARE) {
} else if (errorCode ==
ManifestWarningCode.PERMISSION_IMPLIES_UNSUPPORTED_HARDWARE) {
@@ -115,7 +112,7 @@
/// for the fix.
// ignore: unused_element
void _addFixFromBuilder(ChangeBuilder builder, FixKind kind, {List args}) {
- SourceChange change = builder.sourceChange;
+ var change = builder.sourceChange;
if (change.edits.isEmpty) {
return;
}
@@ -134,9 +131,9 @@
// ignore: unused_element
SourceRange _lines(int start, int end) {
CharacterLocation startLocation = lineInfo.getLocation(start);
- int startOffset = lineInfo.getOffsetOfLine(startLocation.lineNumber - 1);
+ var startOffset = lineInfo.getOffsetOfLine(startLocation.lineNumber - 1);
CharacterLocation endLocation = lineInfo.getLocation(end);
- int endOffset = lineInfo.getOffsetOfLine(
+ var endOffset = lineInfo.getOffsetOfLine(
math.min(endLocation.lineNumber, lineInfo.lineCount - 1));
return SourceRange(startOffset, endOffset - startOffset);
}
diff --git a/pkg/analysis_server/lib/src/services/correction/fix/pubspec/fix_generator.dart b/pkg/analysis_server/lib/src/services/correction/fix/pubspec/fix_generator.dart
index 4c6bf66..7e66f79 100644
--- a/pkg/analysis_server/lib/src/services/correction/fix/pubspec/fix_generator.dart
+++ b/pkg/analysis_server/lib/src/services/correction/fix/pubspec/fix_generator.dart
@@ -13,8 +13,6 @@
import 'package:analyzer/src/generated/java_core.dart';
import 'package:analyzer/src/generated/source.dart';
import 'package:analyzer/src/pubspec/pubspec_warning_code.dart';
-import 'package:analyzer_plugin/protocol/protocol_common.dart'
- show SourceChange;
import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
import 'package:yaml/yaml.dart';
@@ -48,14 +46,14 @@
/// Return the list of fixes that apply to the error being fixed.
Future<List<Fix>> computeFixes() async {
- YamlNodeLocator locator =
+ var locator =
YamlNodeLocator(start: errorOffset, end: errorOffset + errorLength - 1);
coveringNodePath = locator.searchWithin(options);
if (coveringNodePath.isEmpty) {
return fixes;
}
- ErrorCode errorCode = error.errorCode;
+ var errorCode = error.errorCode;
if (errorCode == PubspecWarningCode.ASSET_DOES_NOT_EXIST) {
} else if (errorCode == PubspecWarningCode.ASSET_DIRECTORY_DOES_NOT_EXIST) {
} else if (errorCode == PubspecWarningCode.ASSET_FIELD_NOT_LIST) {
@@ -73,7 +71,7 @@
/// for the fix.
// ignore: unused_element
void _addFixFromBuilder(ChangeBuilder builder, FixKind kind, {List args}) {
- SourceChange change = builder.sourceChange;
+ var change = builder.sourceChange;
if (change.edits.isEmpty) {
return;
}
@@ -92,9 +90,9 @@
// ignore: unused_element
SourceRange _lines(int start, int end) {
CharacterLocation startLocation = lineInfo.getLocation(start);
- int startOffset = lineInfo.getOffsetOfLine(startLocation.lineNumber - 1);
+ var startOffset = lineInfo.getOffsetOfLine(startLocation.lineNumber - 1);
CharacterLocation endLocation = lineInfo.getLocation(end);
- int endOffset = lineInfo.getOffsetOfLine(
+ var endOffset = lineInfo.getOffsetOfLine(
math.min(endLocation.lineNumber, lineInfo.lineCount - 1));
return SourceRange(startOffset, endOffset - startOffset);
}
diff --git a/pkg/analysis_server/lib/src/services/correction/fix_internal.dart b/pkg/analysis_server/lib/src/services/correction/fix_internal.dart
index cc2d77c..11f111b 100644
--- a/pkg/analysis_server/lib/src/services/correction/fix_internal.dart
+++ b/pkg/analysis_server/lib/src/services/correction/fix_internal.dart
@@ -44,7 +44,6 @@
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/dart/element/nullability_suffix.dart';
import 'package:analyzer/dart/element/type.dart';
-import 'package:analyzer/dart/element/type_provider.dart';
import 'package:analyzer/dart/element/type_system.dart';
import 'package:analyzer/error/error.dart';
import 'package:analyzer/file_system/file_system.dart';
@@ -78,9 +77,9 @@
@override
Future<List<Fix>> computeFixes(DartFixContext context) async {
try {
- FixProcessor processor = FixProcessor(context);
- List<Fix> fixes = await processor.compute();
- List<Fix> fixAllFixes = await _computeFixAllFixes(context, fixes);
+ var processor = FixProcessor(context);
+ var fixes = await processor.compute();
+ var fixAllFixes = await _computeFixAllFixes(context, fixes);
return List.from(fixes)..addAll(fixAllFixes);
} on CancelCorrectionException {
return const <Fix>[];
@@ -107,22 +106,22 @@
}
// A map between each FixKind and the List of associated fixes
- final HashMap<FixKind, List<Fix>> map = HashMap();
+ var map = <FixKind, List<Fix>>{};
// Populate the HashMap by looping through all AnalysisErrors, creating a
// new FixProcessor to compute the other fixes that can be applied with this
// one.
// For each fix, put the fix into the HashMap.
- for (int i = 0; i < allAnalysisErrors.length; i++) {
+ for (var i = 0; i < allAnalysisErrors.length; i++) {
final FixContext fixContextI = DartFixContextImpl(
context.workspace,
context.resolveResult,
allAnalysisErrors[i],
(name) => [],
);
- final FixProcessor processorI = FixProcessor(fixContextI);
- final List<Fix> fixesListI = await processorI.compute();
- for (Fix f in fixesListI) {
+ var processorI = FixProcessor(fixContextI);
+ var fixesListI = await processorI.compute();
+ for (var f in fixesListI) {
if (!map.containsKey(f.kind)) {
map[f.kind] = <Fix>[]..add(f);
} else {
@@ -133,10 +132,10 @@
// For each FixKind in the HashMap, union each list together, then return
// the set of unioned Fixes.
- final List<Fix> result = <Fix>[];
+ var result = <Fix>[];
map.forEach((FixKind kind, List<Fix> fixesListJ) {
if (fixesListJ.first.kind.canBeAppliedTogether()) {
- Fix unionFix = _unionFixList(fixesListJ);
+ var unionFix = _unionFixList(fixesListJ);
if (unionFix != null) {
result.add(unionFix);
}
@@ -151,14 +150,13 @@
} else if (fixList.length == 1) {
return fixList[0];
}
- final SourceChange sourceChange =
- SourceChange(fixList[0].kind.appliedTogetherMessage);
+ var sourceChange = SourceChange(fixList[0].kind.appliedTogetherMessage);
sourceChange.edits = List.from(fixList[0].change.edits);
- final List<SourceEdit> edits = <SourceEdit>[];
+ var edits = <SourceEdit>[];
edits.addAll(fixList[0].change.edits[0].edits);
sourceChange.linkedEditGroups =
List.from(fixList[0].change.linkedEditGroups);
- for (int i = 1; i < fixList.length; i++) {
+ for (var i = 1; i < fixList.length; i++) {
edits.addAll(fixList[i].change.edits[0].edits);
sourceChange.linkedEditGroups..addAll(fixList[i].change.linkedEditGroups);
}
@@ -223,7 +221,7 @@
}
// analyze ErrorCode
- ErrorCode errorCode = error.errorCode;
+ var errorCode = error.errorCode;
if (errorCode == StaticWarningCode.UNDEFINED_CLASS_BOOLEAN) {
await _addFix_boolInsteadOfBoolean();
}
@@ -244,7 +242,7 @@
errorCode == CompileTimeErrorCode.UNDEFINED_ANNOTATION) {
if (node is Annotation) {
Annotation annotation = node;
- Identifier name = annotation.name;
+ var name = annotation.name;
if (name != null && name.staticElement == null) {
node = name;
if (annotation.arguments == null) {
@@ -591,7 +589,7 @@
}
// lints
if (errorCode is LintCode) {
- String name = errorCode.name;
+ var name = errorCode.name;
if (name == LintNames.always_specify_types ||
name == LintNames.type_annotate_public_apis) {
await _addFix_addTypeAnnotation();
@@ -766,15 +764,15 @@
}
Future<Fix> computeFix() async {
- List<Fix> fixes = await compute();
+ var fixes = await compute();
fixes.sort(Fix.SORT_BY_RELEVANCE);
return fixes.isNotEmpty ? fixes.first : null;
}
Future<void> _addFix_addAsync() async {
- FunctionBody body = node.thisOrAncestorOfType<FunctionBody>();
+ var body = node.thisOrAncestorOfType<FunctionBody>();
if (body != null && body.keyword == null) {
- TypeProvider typeProvider = this.typeProvider;
+ var typeProvider = this.typeProvider;
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.convertFunctionFromSyncToAsync(body, typeProvider);
@@ -840,9 +838,9 @@
return;
}
Expression target = coveredNode;
- DartType fromType = target.staticType;
+ var fromType = target.staticType;
DartType toType;
- AstNode parent = target.parent;
+ var parent = target.parent;
if (parent is AssignmentExpression && target == parent.rightHandSide) {
toType = parent.leftHandSide.staticType;
} else if (parent is VariableDeclaration && target == parent.initializer) {
@@ -853,9 +851,9 @@
}
// TODO(brianwilkerson) Handle `toSet` in a manner similar to the below.
if (_isToListMethodInvocation(target)) {
- Expression targetTarget = (target as MethodInvocation).target;
+ var targetTarget = (target as MethodInvocation).target;
if (targetTarget != null) {
- DartType targetTargetType = targetTarget.staticType;
+ var targetTargetType = targetTarget.staticType;
if (_isDartCoreIterable(targetTargetType) ||
_isDartCoreList(targetTargetType) ||
_isDartCoreMap(targetTargetType) ||
@@ -869,7 +867,7 @@
// TODO(brianwilkerson) Consider updating the right operand.
return;
}
- bool needsParentheses = target.precedence < Precedence.postfix;
+ var needsParentheses = target.precedence < Precedence.postfix;
if (((_isDartCoreIterable(fromType) || _isDartCoreList(fromType)) &&
_isDartCoreList(toType)) ||
(_isDartCoreSet(fromType) && _isDartCoreSet(toType))) {
@@ -935,15 +933,15 @@
}
Future<void> _addFix_addMissingEnumCaseClauses() async {
- SwitchStatement statement = node as SwitchStatement;
+ var statement = node as SwitchStatement;
String enumName;
- List<String> enumConstantNames = [];
- DartType expressionType = statement.expression.staticType;
+ var enumConstantNames = <String>[];
+ var expressionType = statement.expression.staticType;
if (expressionType is InterfaceType) {
- ClassElement enumElement = expressionType.element;
+ var enumElement = expressionType.element;
if (enumElement.isEnum) {
enumName = enumElement.name;
- for (FieldElement field in enumElement.fields) {
+ for (var field in enumElement.fields) {
if (!field.isSynthetic) {
enumConstantNames.add(field.name);
}
@@ -953,11 +951,11 @@
if (enumName == null) {
return;
}
- for (SwitchMember member in statement.members) {
+ for (var member in statement.members) {
if (member is SwitchCase) {
- Expression expression = member.expression;
+ var expression = member.expression;
if (expression is Identifier) {
- Element element = expression.staticElement;
+ var element = expression.staticElement;
if (element is PropertyAccessorElement) {
enumConstantNames.remove(element.name);
}
@@ -968,13 +966,13 @@
return;
}
- String statementIndent = utils.getLinePrefix(statement.offset);
- String singleIndent = utils.getIndent(1);
+ var statementIndent = utils.getLinePrefix(statement.offset);
+ var singleIndent = utils.getIndent(1);
- DartChangeBuilder changeBuilder = _newDartChangeBuilder();
+ var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.addInsertion(utils.getLineThis(statement.end), (builder) {
- for (String constantName in enumConstantNames) {
+ for (var constantName in enumConstantNames) {
builder.write(statementIndent);
builder.write(singleIndent);
builder.write('case ');
@@ -1048,11 +1046,11 @@
}
// prepare the argument to add a new parameter for
- int numRequired = context.required.length;
+ var numRequired = context.required.length;
if (numRequired >= arguments.length) {
return;
}
- Expression argument = arguments[numRequired];
+ var argument = arguments[numRequired];
Future<void> addParameter(
FixKind kind, int offset, String prefix, String suffix) async {
@@ -1105,7 +1103,7 @@
return;
}
SimpleIdentifier node = this.node;
- String name = node.name;
+ var name = node.name;
// We expect that the node is part of a NamedExpression.
if (node.parent?.parent is! NamedExpression) {
@@ -1117,7 +1115,7 @@
if (namedExpression.parent is! ArgumentList) {
return;
}
- AstNode argumentList = namedExpression.parent;
+ var argumentList = namedExpression.parent;
// Prepare the invoked element.
var context = _ExecutableParameters(sessionHelper, argumentList.parent);
@@ -1165,7 +1163,7 @@
ArgumentList argumentList;
if (node is SimpleIdentifier) {
- AstNode invocation = node.parent;
+ var invocation = node.parent;
if (invocation is MethodInvocation) {
targetElement = invocation.methodName.staticElement;
argumentList = invocation.argumentList;
@@ -1181,13 +1179,13 @@
if (targetElement is ExecutableElement) {
// Format: "Missing required argument 'foo"
- List<String> messageParts = error.message.split("'");
+ var messageParts = error.message.split("'");
if (messageParts.length < 2) {
return;
}
- String missingParameterName = messageParts[1];
+ var missingParameterName = messageParts[1];
- ParameterElement missingParameter = targetElement.parameters.firstWhere(
+ var missingParameter = targetElement.parameters.firstWhere(
(p) => p.name == missingParameterName,
orElse: () => null);
if (missingParameter == null) {
@@ -1195,13 +1193,13 @@
}
int offset;
- bool hasTrailingComma = false;
- bool insertBetweenParams = false;
+ var hasTrailingComma = false;
+ var insertBetweenParams = false;
List<Expression> arguments = argumentList.arguments;
if (arguments.isEmpty) {
offset = argumentList.leftParenthesis.end;
} else {
- Expression lastArgument = arguments.last;
+ var lastArgument = arguments.last;
offset = lastArgument.end;
hasTrailingComma = lastArgument.endToken.next.type == TokenType.COMMA;
@@ -1225,8 +1223,7 @@
builder.write('$missingParameterName: ');
- DefaultArgument defaultValue =
- getDefaultStringParameterValue(missingParameter);
+ var defaultValue = getDefaultStringParameterValue(missingParameter);
// Use defaultValue.cursorPosition if it's not null.
if (defaultValue?.cursorPosition != null) {
builder.write(
@@ -1246,7 +1243,7 @@
builder.writeln(',');
// Insert indent before the child: or children: param.
- String indent = utils.getLinePrefix(offset);
+ var indent = utils.getLinePrefix(offset);
builder.write(indent);
}
}
@@ -1259,7 +1256,7 @@
}
Future<void> _addFix_addOverrideAnnotation() async {
- ClassMember member = node.thisOrAncestorOfType<ClassMember>();
+ var member = node.thisOrAncestorOfType<ClassMember>();
if (member == null) {
return;
}
@@ -1267,13 +1264,13 @@
//TODO(pq): migrate annotation edit building to change_builder
// Handle doc comments.
- Token token = member.beginToken;
+ var token = member.beginToken;
if (token is CommentToken) {
token = (token as CommentToken).parent;
}
- Position exitPosition = Position(file, token.offset - 1);
- String indent = utils.getIndent(1);
+ var exitPosition = Position(file, token.offset - 1);
+ var indent = utils.getIndent(1);
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.addSimpleReplacement(
@@ -1292,8 +1289,7 @@
}
Future<void> _addFix_addStatic() async {
- FieldDeclaration declaration =
- node.thisOrAncestorOfType<FieldDeclaration>();
+ var declaration = node.thisOrAncestorOfType<FieldDeclaration>();
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
var offset = declaration.firstTokenAfterCommentAndMetadata.offset;
@@ -1324,11 +1320,11 @@
}
Future<void> _addFix_canBeNullAfterNullAware() async {
- AstNode node = coveredNode;
+ var node = coveredNode;
if (node is Expression) {
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
- AstNode parent = node.parent;
+ var parent = node.parent;
while (parent != null) {
if (parent is MethodInvocation && parent.target == node) {
builder.addSimpleReplacement(range.token(parent.operator), '?.');
@@ -1346,10 +1342,10 @@
}
Future<void> _addFix_changeArgumentName() async {
- const int maxDistance = 4;
+ const maxDistance = 4;
List<String> getNamedParameterNames() {
- AstNode namedExpression = node?.parent?.parent;
+ var namedExpression = node?.parent?.parent;
if (node is SimpleIdentifier &&
namedExpression is NamedExpression &&
namedExpression.name == node.parent &&
@@ -1374,17 +1370,17 @@
return levenshtein(current, proposal, maxDistance, caseSensitive: false);
}
- List<String> names = getNamedParameterNames();
+ var names = getNamedParameterNames();
if (names == null || names.isEmpty) {
return;
}
SimpleIdentifier argumentName = node;
- String invalidName = argumentName.name;
- for (String proposedName in names) {
- int distance = computeDistance(invalidName, proposedName);
+ var invalidName = argumentName.name;
+ for (var proposedName in names) {
+ var distance = computeDistance(invalidName, proposedName);
if (distance <= maxDistance) {
- DartChangeBuilder changeBuilder = _newDartChangeBuilder();
+ var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (builder) {
builder.addSimpleReplacement(range.node(argumentName), proposedName);
});
@@ -1398,9 +1394,9 @@
Future<void> _addFix_changeToNearestPreciseValue() async {
IntegerLiteral integer = node;
- String lexeme = integer.literal.lexeme;
- BigInt precise = BigInt.from(IntegerLiteralImpl.nearestValidDouble(lexeme));
- String correction = lexeme.toLowerCase().contains('x')
+ var lexeme = integer.literal.lexeme;
+ var precise = BigInt.from(IntegerLiteralImpl.nearestValidDouble(lexeme));
+ var correction = lexeme.toLowerCase().contains('x')
? '0x${precise.toRadixString(16).toUpperCase()}'
: precise.toString();
var changeBuilder = _newDartChangeBuilder();
@@ -1413,16 +1409,16 @@
}
Future<void> _addFix_changeTypeAnnotation() async {
- AstNode declaration = coveredNode.parent;
+ var declaration = coveredNode.parent;
if (declaration is VariableDeclaration &&
declaration.initializer == coveredNode) {
- AstNode variableList = declaration.parent;
+ var variableList = declaration.parent;
if (variableList is VariableDeclarationList &&
variableList.variables.length == 1) {
- TypeAnnotation typeNode = variableList.type;
+ var typeNode = variableList.type;
if (typeNode != null) {
Expression initializer = coveredNode;
- DartType newType = initializer.staticType;
+ var newType = initializer.staticType;
if (newType is InterfaceType || newType is FunctionType) {
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file,
@@ -1468,13 +1464,13 @@
}
Future<void> _addFix_convertFlutterChild() async {
- NamedExpression named = flutter.findNamedExpression(node, 'child');
+ var named = flutter.findNamedExpression(node, 'child');
if (named == null) {
return;
}
// child: widget
- Expression expression = named.expression;
+ var expression = named.expression;
if (flutter.isWidgetExpression(expression)) {
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
@@ -1505,18 +1501,18 @@
}
Future<void> _addFix_convertFlutterChildren() async {
- AstNode node = this.node;
+ var node = this.node;
if (node is SimpleIdentifier &&
node.name == 'children' &&
node.parent?.parent is NamedExpression) {
NamedExpression named = node.parent?.parent;
- Expression expression = named.expression;
+ var expression = named.expression;
if (expression is ListLiteral && expression.elements.length == 1) {
- CollectionElement widget = expression.elements[0];
+ var widget = expression.elements[0];
if (flutter.isWidgetExpression(widget)) {
- String widgetText = utils.getNodeText(widget);
- String indentOld = utils.getLinePrefix(widget.offset);
- String indentNew = utils.getLinePrefix(named.offset);
+ var widgetText = utils.getNodeText(widget);
+ var indentOld = utils.getLinePrefix(widget.offset);
+ var indentNew = utils.getLinePrefix(named.offset);
widgetText = _replaceSourceIndent(widgetText, indentOld, indentNew);
var builder = _newDartChangeBuilder();
@@ -1616,7 +1612,7 @@
}
// Prepare named parameters.
- int numberOfPositionalParameters = 0;
+ var numberOfPositionalParameters = 0;
var namedParameters = <ParameterElement>[];
for (var parameter in parameters) {
if (parameter.isNamed) {
@@ -1631,7 +1627,7 @@
// Find named parameters for extra arguments.
var argumentToParameter = <Expression, ParameterElement>{};
- Iterable<Expression> extraArguments =
+ var extraArguments =
argumentList.arguments.skip(numberOfPositionalParameters);
for (var argument in extraArguments) {
if (argument is! NamedExpression) {
@@ -1683,7 +1679,7 @@
String name;
SimpleIdentifier nameNode;
if (node is SimpleIdentifier) {
- AstNode parent = node.parent;
+ var parent = node.parent;
if (parent is PrefixedIdentifier) {
PrefixedIdentifier prefixedIdentifier = parent;
prefixElement = prefixedIdentifier.prefix.staticElement;
@@ -1705,15 +1701,14 @@
}
// prepare environment
Element targetUnit;
- String prefix = '';
- String suffix = '';
- int offset = -1;
+ var prefix = '';
+ var suffix = '';
+ var offset = -1;
String filePath;
if (prefixElement == null) {
targetUnit = unit.declaredElement;
- CompilationUnitMember enclosingMember = node.thisOrAncestorMatching(
- (node) =>
- node is CompilationUnitMember && node.parent is CompilationUnit);
+ var enclosingMember = node.thisOrAncestorMatching((node) =>
+ node is CompilationUnitMember && node.parent is CompilationUnit);
if (enclosingMember == null) {
return;
}
@@ -1721,12 +1716,12 @@
filePath = file;
prefix = '$eol$eol';
} else {
- for (ImportElement import in unitLibraryElement.imports) {
+ for (var import in unitLibraryElement.imports) {
if (prefixElement is PrefixElement && import.prefix == prefixElement) {
- LibraryElement library = import.importedLibrary;
+ var library = import.importedLibrary;
if (library != null) {
targetUnit = library.definingCompilationUnit;
- Source targetSource = targetUnit.source;
+ var targetSource = targetUnit.source;
try {
offset = targetSource.contents.data.length;
filePath = targetSource.fullName;
@@ -1765,19 +1760,18 @@
return;
}
- ClassDeclaration classDeclaration =
- node.thisOrAncestorOfType<ClassDeclaration>();
+ var classDeclaration = node.thisOrAncestorOfType<ClassDeclaration>();
if (classDeclaration == null) {
return;
}
- String className = classDeclaration.name.name;
- InterfaceType superType = classDeclaration.declaredElement.supertype;
+ var className = classDeclaration.name.name;
+ var superType = classDeclaration.declaredElement.supertype;
// prepare names of uninitialized final fields
- List<String> fieldNames = <String>[];
- for (ClassMember member in classDeclaration.members) {
+ var fieldNames = <String>[];
+ for (var member in classDeclaration.members) {
if (member is FieldDeclaration) {
- VariableDeclarationList variableList = member.fields;
+ var variableList = member.fields;
if (variableList.isFinal) {
fieldNames.addAll(variableList.variables
.where((v) => v.initializer == null)
@@ -1786,15 +1780,13 @@
}
}
// prepare location for a new constructor
- ClassMemberLocation targetLocation =
- utils.prepareNewConstructorLocation(classDeclaration);
+ var targetLocation = utils.prepareNewConstructorLocation(classDeclaration);
var changeBuilder = _newDartChangeBuilder();
if (flutter.isExactlyStatelessWidgetType(superType) ||
flutter.isExactlyStatefulWidgetType(superType)) {
// Specialize for Flutter widgets.
- ClassElement keyClass =
- await sessionHelper.getClass(flutter.widgetsUri, 'Key');
+ var keyClass = await sessionHelper.getClass(flutter.widgetsUri, 'Key');
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.addInsertion(targetLocation.offset, (DartEditBuilder builder) {
builder.write(targetLocation.prefix);
@@ -1811,8 +1803,8 @@
);
builder.write(' key');
- List<String> childrenFields = [];
- for (String fieldName in fieldNames) {
+ var childrenFields = <String>[];
+ for (var fieldName in fieldNames) {
if (fieldName == 'child' || fieldName == 'children') {
childrenFields.add(fieldName);
continue;
@@ -1820,7 +1812,7 @@
builder.write(', this.');
builder.write(fieldName);
}
- for (String fieldName in childrenFields) {
+ for (var fieldName in childrenFields) {
builder.write(', this.');
builder.write(fieldName);
}
@@ -1851,9 +1843,9 @@
return;
}
InstanceCreationExpression instanceCreation = node.parent;
- ConstructorName constructorName = instanceCreation.constructorName;
+ var constructorName = instanceCreation.constructorName;
// should be synthetic default constructor
- ConstructorElement constructorElement = constructorName.staticElement;
+ var constructorElement = constructorName.staticElement;
if (constructorElement == null ||
!constructorElement.isDefaultConstructor ||
!constructorElement.isSynthetic) {
@@ -1876,8 +1868,8 @@
var targetLocation = CorrectionUtils(targetResult.resolvedUnit)
.prepareNewConstructorLocation(targetNode);
- Source targetSource = targetElement.source;
- String targetFile = targetSource.fullName;
+ var targetSource = targetElement.source;
+ var targetFile = targetSource.fullName;
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(targetFile, (DartFileEditBuilder builder) {
builder.addInsertion(targetLocation.offset, (DartEditBuilder builder) {
@@ -1918,7 +1910,7 @@
return;
}
// prepare target interface type
- DartType targetType = constructorName.type.type;
+ var targetType = constructorName.type.type;
if (targetType is! InterfaceType) {
return;
}
@@ -1935,7 +1927,7 @@
var targetLocation = CorrectionUtils(targetResult.resolvedUnit)
.prepareNewConstructorLocation(targetNode);
- String targetFile = targetElement.source.fullName;
+ var targetFile = targetElement.source.fullName;
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(targetFile, (DartFileEditBuilder builder) {
builder.addInsertion(targetLocation.offset, (DartEditBuilder builder) {
@@ -1959,15 +1951,13 @@
node.parent.parent is! ClassDeclaration) {
return;
}
- ConstructorDeclaration targetConstructor =
- node.parent as ConstructorDeclaration;
- ClassDeclaration targetClassNode =
- targetConstructor.parent as ClassDeclaration;
- ClassElement targetClassElement = targetClassNode.declaredElement;
- InterfaceType superType = targetClassElement.supertype;
+ var targetConstructor = node.parent as ConstructorDeclaration;
+ var targetClassNode = targetConstructor.parent as ClassDeclaration;
+ var targetClassElement = targetClassNode.declaredElement;
+ var superType = targetClassElement.supertype;
// add proposals for all super constructors
- for (ConstructorElement superConstructor in superType.constructors) {
- String constructorName = superConstructor.name;
+ for (var superConstructor in superType.constructors) {
+ var constructorName = superConstructor.name;
// skip private
if (Identifier.isPrivateName(constructorName)) {
continue;
@@ -1980,12 +1970,11 @@
insertOffset = targetConstructor.parameters.end;
prefix = ' : ';
} else {
- ConstructorInitializer lastInitializer =
- initializers[initializers.length - 1];
+ var lastInitializer = initializers[initializers.length - 1];
insertOffset = lastInitializer.end;
prefix = ', ';
}
- String proposalName = _getConstructorProposalName(superConstructor);
+ var proposalName = _getConstructorProposalName(superConstructor);
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.addInsertion(insertOffset, (DartEditBuilder builder) {
@@ -1998,8 +1987,8 @@
}
// add arguments
builder.write('(');
- bool firstParameter = true;
- for (ParameterElement parameter in superConstructor.parameters) {
+ var firstParameter = true;
+ for (var parameter in superConstructor.parameters) {
// skip non-required parameters
if (parameter.isOptional) {
break;
@@ -2024,38 +2013,35 @@
}
Future<void> _addFix_createConstructorSuperImplicit() async {
- ClassDeclaration targetClassNode =
- node.thisOrAncestorOfType<ClassDeclaration>();
- ClassElement targetClassElement = targetClassNode.declaredElement;
- InterfaceType superType = targetClassElement.supertype;
- String targetClassName = targetClassElement.name;
+ var targetClassNode = node.thisOrAncestorOfType<ClassDeclaration>();
+ var targetClassElement = targetClassNode.declaredElement;
+ var superType = targetClassElement.supertype;
+ var targetClassName = targetClassElement.name;
// add proposals for all super constructors
- for (ConstructorElement superConstructor in superType.constructors) {
- String constructorName = superConstructor.name;
+ for (var superConstructor in superType.constructors) {
+ var constructorName = superConstructor.name;
// skip private
if (Identifier.isPrivateName(constructorName)) {
continue;
}
// prepare parameters and arguments
- Iterable<ParameterElement> requiredParameters = superConstructor
- .parameters
+ var requiredParameters = superConstructor.parameters
.where((parameter) => parameter.isRequiredPositional);
// add proposal
- ClassMemberLocation targetLocation =
- utils.prepareNewConstructorLocation(targetClassNode);
- String proposalName = _getConstructorProposalName(superConstructor);
+ var targetLocation = utils.prepareNewConstructorLocation(targetClassNode);
+ var proposalName = _getConstructorProposalName(superConstructor);
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.addInsertion(targetLocation.offset, (DartEditBuilder builder) {
void writeParameters(bool includeType) {
- bool firstParameter = true;
- for (ParameterElement parameter in requiredParameters) {
+ var firstParameter = true;
+ for (var parameter in requiredParameters) {
if (firstParameter) {
firstParameter = false;
} else {
builder.write(', ');
}
- String parameterName = parameter.displayName;
+ var parameterName = parameter.displayName;
if (parameterName.length > 1 && parameterName.startsWith('_')) {
parameterName = parameterName.substring(1);
}
@@ -2095,11 +2081,11 @@
return;
}
SimpleIdentifier nameNode = node;
- String name = nameNode.name;
+ var name = nameNode.name;
// prepare target Expression
Expression target;
{
- AstNode nameParent = nameNode.parent;
+ var nameParent = nameNode.parent;
if (nameParent is PrefixedIdentifier) {
target = nameParent.prefix;
} else if (nameParent is PropertyAccess) {
@@ -2107,14 +2093,14 @@
}
}
// prepare target ClassElement
- bool staticModifier = false;
+ var staticModifier = false;
ClassElement targetClassElement;
if (target != null) {
targetClassElement = _getTargetClassElement(target);
// maybe static
if (target is Identifier) {
- Identifier targetIdentifier = target;
- Element targetElement = targetIdentifier.staticElement;
+ var targetIdentifier = target;
+ var targetElement = targetIdentifier.staticElement;
if (targetElement == null) {
return;
}
@@ -2142,16 +2128,15 @@
}
ClassOrMixinDeclaration targetNode = targetDeclarationResult.node;
// prepare location
- ClassMemberLocation targetLocation =
- CorrectionUtils(targetDeclarationResult.resolvedUnit)
- .prepareNewFieldLocation(targetNode);
+ var targetLocation = CorrectionUtils(targetDeclarationResult.resolvedUnit)
+ .prepareNewFieldLocation(targetNode);
// build field source
- Source targetSource = targetClassElement.source;
- String targetFile = targetSource.fullName;
+ var targetSource = targetClassElement.source;
+ var targetFile = targetSource.fullName;
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(targetFile, (DartFileEditBuilder builder) {
- Expression fieldTypeNode = climbPropertyAccess(nameNode);
- DartType fieldType = _inferUndefinedExpressionType(fieldTypeNode);
+ var fieldTypeNode = climbPropertyAccess(nameNode);
+ var fieldType = _inferUndefinedExpressionType(fieldTypeNode);
builder.addInsertion(targetLocation.offset, (DartEditBuilder builder) {
builder.write(targetLocation.prefix);
builder.writeFieldDeclaration(name,
@@ -2169,26 +2154,23 @@
//
// Ensure that we are in an initializing formal parameter.
//
- FieldFormalParameter parameter =
- node.thisOrAncestorOfType<FieldFormalParameter>();
+ var parameter = node.thisOrAncestorOfType<FieldFormalParameter>();
if (parameter == null) {
return;
}
- ClassDeclaration targetClassNode =
- parameter.thisOrAncestorOfType<ClassDeclaration>();
+ var targetClassNode = parameter.thisOrAncestorOfType<ClassDeclaration>();
if (targetClassNode == null) {
return;
}
- SimpleIdentifier nameNode = parameter.identifier;
- String name = nameNode.name;
- ClassMemberLocation targetLocation =
- utils.prepareNewFieldLocation(targetClassNode);
+ var nameNode = parameter.identifier;
+ var name = nameNode.name;
+ var targetLocation = utils.prepareNewFieldLocation(targetClassNode);
//
// Add proposal.
//
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
- DartType fieldType = parameter.type?.type;
+ var fieldType = parameter.type?.type;
builder.addInsertion(targetLocation.offset, (DartEditBuilder builder) {
builder.write(targetLocation.prefix);
builder.writeFieldDeclaration(name,
@@ -2201,14 +2183,14 @@
Future<void> _addFix_createFunction_forFunctionType() async {
if (node is SimpleIdentifier) {
- SimpleIdentifier nameNode = node as SimpleIdentifier;
+ var nameNode = node as SimpleIdentifier;
// prepare argument expression (to get parameter)
ClassElement targetElement;
Expression argument;
{
- Expression target = getQualifiedPropertyTarget(node);
+ var target = getQualifiedPropertyTarget(node);
if (target != null) {
- DartType targetType = target.staticType;
+ var targetType = target.staticType;
if (targetType != null && targetType.element is ClassElement) {
targetElement = targetType.element as ClassElement;
argument = target.parent as Expression;
@@ -2216,7 +2198,7 @@
return;
}
} else {
- ClassOrMixinDeclaration enclosingClass =
+ var enclosingClass =
node.thisOrAncestorOfType<ClassOrMixinDeclaration>();
targetElement = enclosingClass?.declaredElement;
argument = nameNode;
@@ -2224,12 +2206,12 @@
}
argument = stepUpNamedExpression(argument);
// should be argument of some invocation
- ParameterElement parameterElement = argument.staticParameterElement;
+ var parameterElement = argument.staticParameterElement;
if (parameterElement == null) {
return;
}
// should be parameter of function type
- DartType parameterType = parameterElement.type;
+ var parameterType = parameterElement.type;
if (parameterType is InterfaceType && parameterType.isDartCoreFunction) {
parameterType = FunctionTypeImpl(
typeFormals: const [],
@@ -2241,7 +2223,7 @@
if (parameterType is! FunctionType) {
return;
}
- FunctionType functionType = parameterType as FunctionType;
+ var functionType = parameterType as FunctionType;
// add proposal
if (targetElement != null) {
await _addProposal_createFunction_method(targetElement, functionType);
@@ -2256,14 +2238,14 @@
return;
}
SimpleIdentifier nameNode = node;
- String name = nameNode.name;
+ var name = nameNode.name;
if (!nameNode.inGetterContext()) {
return;
}
// prepare target
Expression target;
{
- AstNode nameParent = nameNode.parent;
+ var nameParent = nameNode.parent;
if (nameParent is PrefixedIdentifier) {
target = nameParent.prefix;
} else if (nameParent is PropertyAccess) {
@@ -2271,7 +2253,7 @@
}
}
// prepare target element
- bool staticModifier = false;
+ var staticModifier = false;
Element targetElement;
if (target is ExtensionOverride) {
targetElement = target.staticElement;
@@ -2281,15 +2263,15 @@
staticModifier = true;
} else if (target != null) {
// prepare target interface type
- DartType targetType = target.staticType;
+ var targetType = target.staticType;
if (targetType is! InterfaceType) {
return;
}
targetElement = targetType.element;
// maybe static
if (target is Identifier) {
- Identifier targetIdentifier = target;
- Element targetElement = targetIdentifier.staticElement;
+ var targetIdentifier = target;
+ var targetElement = targetIdentifier.staticElement;
staticModifier = targetElement?.kind == ElementKind.CLASS;
}
} else {
@@ -2315,17 +2297,16 @@
}
CompilationUnitMember targetNode = targetDeclarationResult.node;
// prepare location
- ClassMemberLocation targetLocation =
- CorrectionUtils(targetDeclarationResult.resolvedUnit)
- .prepareNewGetterLocation(targetNode);
+ var targetLocation = CorrectionUtils(targetDeclarationResult.resolvedUnit)
+ .prepareNewGetterLocation(targetNode);
// build method source
- Source targetSource = targetElement.source;
- String targetFile = targetSource.fullName;
+ var targetSource = targetElement.source;
+ var targetFile = targetSource.fullName;
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(targetFile, (DartFileEditBuilder builder) {
builder.addInsertion(targetLocation.offset, (DartEditBuilder builder) {
- Expression fieldTypeNode = climbPropertyAccess(nameNode);
- DartType fieldType = _inferUndefinedExpressionType(fieldTypeNode);
+ var fieldTypeNode = climbPropertyAccess(nameNode);
+ var fieldType = _inferUndefinedExpressionType(fieldTypeNode);
builder.write(targetLocation.prefix);
builder.writeGetterDeclaration(name,
isStatic: staticModifier,
@@ -2343,9 +2324,9 @@
// TODO(brianwilkerson) Support the case where the node's parent is a Configuration.
if (node is SimpleStringLiteral && node.parent is ImportDirective) {
ImportDirective importDirective = node.parent;
- Source source = importDirective.uriSource;
+ var source = importDirective.uriSource;
if (source != null) {
- String file = source.fullName;
+ var file = source.fullName;
if (isAbsolute(file) && AnalysisEngine.isDartFileName(file)) {
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(source.fullName, (builder) {
@@ -2366,7 +2347,7 @@
return;
}
SimpleIdentifier nameNode = node;
- String name = nameNode.name;
+ var name = nameNode.name;
// if variable is assigned, convert assignment into declaration
if (node.parent is AssignmentExpression) {
AssignmentExpression assignment = node.parent;
@@ -2383,13 +2364,13 @@
}
}
// prepare target Statement
- Statement target = node.thisOrAncestorOfType<Statement>();
+ var target = node.thisOrAncestorOfType<Statement>();
if (target == null) {
return;
}
- String prefix = utils.getNodePrefix(target);
+ var prefix = utils.getNodePrefix(target);
// compute type
- DartType type = _inferUndefinedExpressionType(node);
+ var type = _inferUndefinedExpressionType(node);
if (!(type == null || type is InterfaceType || type is FunctionType)) {
return;
}
@@ -2412,15 +2393,15 @@
if (node is! SimpleIdentifier || node.parent is! MethodInvocation) {
return;
}
- String name = (node as SimpleIdentifier).name;
- MethodInvocation invocation = node.parent as MethodInvocation;
+ var name = (node as SimpleIdentifier).name;
+ var invocation = node.parent as MethodInvocation;
// prepare environment
Element targetElement;
- bool staticModifier = false;
+ var staticModifier = false;
CompilationUnitMember targetNode;
- Expression target = invocation.realTarget;
- CorrectionUtils utils = this.utils;
+ var target = invocation.realTarget;
+ var utils = this.utils;
if (target is ExtensionOverride) {
targetElement = target.staticElement;
targetNode = await _getExtensionDeclaration(targetElement);
@@ -2437,7 +2418,7 @@
staticModifier = true;
} else if (target == null) {
targetElement = unit.declaredElement;
- ClassMember enclosingMember = node.thisOrAncestorOfType<ClassMember>();
+ var enclosingMember = node.thisOrAncestorOfType<ClassMember>();
if (enclosingMember == null) {
// If the undefined identifier isn't inside a class member, then it
// doesn't make sense to create a method.
@@ -2468,9 +2449,8 @@
var targetResolveResult = await session.getResolvedUnit(targetPath);
utils = CorrectionUtils(targetResolveResult);
}
- ClassMemberLocation targetLocation =
- utils.prepareNewMethodLocation(targetNode);
- String targetFile = targetElement.source.fullName;
+ var targetLocation = utils.prepareNewMethodLocation(targetNode);
+ var targetFile = targetElement.source.fullName;
// build method source
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(targetFile, (DartFileEditBuilder builder) {
@@ -2482,7 +2462,7 @@
}
// append return type
{
- DartType type = _inferUndefinedExpressionType(invocation);
+ var type = _inferUndefinedExpressionType(invocation);
if (builder.writeType(type, groupName: 'RETURN_TYPE')) {
builder.write(' ');
}
@@ -2507,14 +2487,14 @@
if (node.parent is! ClassDeclaration) {
return;
}
- ClassDeclaration targetClass = node.parent as ClassDeclaration;
- ClassElement targetClassElement = targetClass.declaredElement;
+ var targetClass = node.parent as ClassDeclaration;
+ var targetClassElement = targetClass.declaredElement;
utils.targetClassElement = targetClassElement;
- List<ExecutableElement> signatures =
+ var signatures =
InheritanceOverrideVerifier.missingOverrides(targetClass).toList();
// sort by name, getters before setters
signatures.sort((ExecutableElement a, ExecutableElement b) {
- int names = compareStrings(a.displayName, b.displayName);
+ var names = compareStrings(a.displayName, b.displayName);
if (names != 0) {
return names;
}
@@ -2523,17 +2503,17 @@
}
return 1;
});
- int numElements = signatures.length;
+ var numElements = signatures.length;
- ClassMemberLocation location =
+ var location =
utils.prepareNewClassMemberLocation(targetClass, (_) => true);
- String prefix = utils.getIndent(1);
+ var prefix = utils.getIndent(1);
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.addInsertion(location.offset, (DartEditBuilder builder) {
// Separator management.
- int numOfMembersWritten = 0;
+ var numOfMembersWritten = 0;
void addSeparatorBetweenDeclarations() {
if (numOfMembersWritten == 0) {
builder.write(location.prefix);
@@ -2546,10 +2526,10 @@
}
// merge getter/setter pairs into fields
- for (int i = 0; i < signatures.length; i++) {
- ExecutableElement element = signatures[i];
+ for (var i = 0; i < signatures.length; i++) {
+ var element = signatures[i];
if (element.kind == ElementKind.GETTER && i + 1 < signatures.length) {
- ExecutableElement nextElement = signatures[i + 1];
+ var nextElement = signatures[i + 1];
if (nextElement.kind == ElementKind.SETTER) {
// remove this and the next elements, adjust iterator
signatures.removeAt(i + 1);
@@ -2571,7 +2551,7 @@
}
}
// add elements
- for (ExecutableElement element in signatures) {
+ for (var element in signatures) {
addSeparatorBetweenDeclarations();
builder.writeOverride(element);
}
@@ -2588,7 +2568,7 @@
String name;
SimpleIdentifier nameNode;
if (node is SimpleIdentifier) {
- AstNode parent = node.parent;
+ var parent = node.parent;
if (parent is PrefixedIdentifier) {
if (parent.parent is InstanceCreationExpression) {
return;
@@ -2617,15 +2597,14 @@
}
// prepare environment
Element targetUnit;
- String prefix = '';
- String suffix = '';
- int offset = -1;
+ var prefix = '';
+ var suffix = '';
+ var offset = -1;
String filePath;
if (prefixElement == null) {
targetUnit = unit.declaredElement;
- CompilationUnitMember enclosingMember = node.thisOrAncestorMatching(
- (node) =>
- node is CompilationUnitMember && node.parent is CompilationUnit);
+ var enclosingMember = node.thisOrAncestorMatching((node) =>
+ node is CompilationUnitMember && node.parent is CompilationUnit);
if (enclosingMember == null) {
return;
}
@@ -2633,12 +2612,12 @@
filePath = file;
prefix = '$eol$eol';
} else {
- for (ImportElement import in unitLibraryElement.imports) {
+ for (var import in unitLibraryElement.imports) {
if (prefixElement is PrefixElement && import.prefix == prefixElement) {
- LibraryElement library = import.importedLibrary;
+ var library = import.importedLibrary;
if (library != null) {
targetUnit = library.definingCompilationUnit;
- Source targetSource = targetUnit.source;
+ var targetSource = targetUnit.source;
try {
offset = targetSource.contents.data.length;
filePath = targetSource.fullName;
@@ -2674,10 +2653,10 @@
if (node.parent is! ClassDeclaration) {
return;
}
- ClassDeclaration targetClass = node.parent as ClassDeclaration;
+ var targetClass = node.parent as ClassDeclaration;
// prepare environment
- String prefix = utils.getIndent(1);
- int insertOffset = targetClass.end - 1;
+ var prefix = utils.getIndent(1);
+ var insertOffset = targetClass.end - 1;
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.addInsertion(insertOffset, (DartEditBuilder builder) {
@@ -2700,9 +2679,9 @@
// TODO(brianwilkerson) Generalize this to allow other valid string literals.
if (node is SimpleStringLiteral && node.parent is PartDirective) {
PartDirective partDirective = node.parent;
- Source source = partDirective.uriSource;
+ var source = partDirective.uriSource;
if (source != null) {
- String libName = unitLibraryElement.name;
+ var libName = unitLibraryElement.name;
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(source.fullName,
(DartFileEditBuilder builder) {
@@ -2726,7 +2705,7 @@
// prepare target
Expression target;
{
- AstNode nameParent = nameNode.parent;
+ var nameParent = nameNode.parent;
if (nameParent is PrefixedIdentifier) {
target = nameParent.prefix;
} else if (nameParent is PropertyAccess) {
@@ -2734,7 +2713,7 @@
}
}
// prepare target element
- bool staticModifier = false;
+ var staticModifier = false;
Element targetElement;
if (target is ExtensionOverride) {
targetElement = target.staticElement;
@@ -2744,15 +2723,15 @@
staticModifier = true;
} else if (target != null) {
// prepare target interface type
- DartType targetType = target.staticType;
+ var targetType = target.staticType;
if (targetType is! InterfaceType) {
return;
}
targetElement = targetType.element;
// maybe static
if (target is Identifier) {
- Identifier targetIdentifier = target;
- Element targetElement = targetIdentifier.staticElement;
+ var targetIdentifier = target;
+ var targetElement = targetIdentifier.staticElement;
staticModifier = targetElement?.kind == ElementKind.CLASS;
}
} else {
@@ -2769,25 +2748,26 @@
// prepare target declaration
var targetDeclarationResult =
await sessionHelper.getElementDeclaration(targetElement);
+ if (targetDeclarationResult == null) {
+ return;
+ }
if (targetDeclarationResult.node is! ClassOrMixinDeclaration &&
targetDeclarationResult.node is! ExtensionDeclaration) {
return;
}
CompilationUnitMember targetNode = targetDeclarationResult.node;
// prepare location
- ClassMemberLocation targetLocation = CorrectionUtils(
- targetDeclarationResult.resolvedUnit)
+ var targetLocation = CorrectionUtils(targetDeclarationResult.resolvedUnit)
.prepareNewGetterLocation(targetNode); // Rename to "AccessorLocation"
// build method source
- Source targetSource = targetElement.source;
- String targetFile = targetSource.fullName;
- String name = nameNode.name;
+ var targetSource = targetElement.source;
+ var targetFile = targetSource.fullName;
+ var name = nameNode.name;
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(targetFile, (DartFileEditBuilder builder) {
builder.addInsertion(targetLocation.offset, (DartEditBuilder builder) {
- Expression parameterTypeNode = climbPropertyAccess(nameNode);
- DartType parameterType =
- _inferUndefinedExpressionType(parameterTypeNode);
+ var parameterTypeNode = climbPropertyAccess(nameNode);
+ var parameterType = _inferUndefinedExpressionType(parameterTypeNode);
builder.write(targetLocation.prefix);
builder.writeSetterDeclaration(name,
isStatic: staticModifier,
@@ -2801,15 +2781,14 @@
}
Future<void> _addFix_extendClassForMixin() async {
- ClassDeclaration declaration =
- node.thisOrAncestorOfType<ClassDeclaration>();
+ var declaration = node.thisOrAncestorOfType<ClassDeclaration>();
if (declaration != null && declaration.extendsClause == null) {
// TODO(brianwilkerson) Find a way to pass in the name of the class
// without needing to parse the message.
- String message = error.message;
- int endIndex = message.lastIndexOf("'");
- int startIndex = message.lastIndexOf("'", endIndex - 1) + 1;
- String typeName = message.substring(startIndex, endIndex);
+ var message = error.message;
+ var endIndex = message.lastIndexOf("'");
+ var startIndex = message.lastIndexOf("'", endIndex - 1) + 1;
+ var typeName = message.substring(startIndex, endIndex);
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.addSimpleInsertion(
@@ -2823,8 +2802,8 @@
Future<void> _addFix_illegalAsyncReturnType() async {
// prepare the existing type
- TypeAnnotation typeName = node.thisOrAncestorOfType<TypeAnnotation>();
- TypeProvider typeProvider = this.typeProvider;
+ var typeName = node.thisOrAncestorOfType<TypeAnnotation>();
+ var typeProvider = this.typeProvider;
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.replaceTypeWithFuture(typeName, typeProvider);
@@ -2868,10 +2847,10 @@
// may be there is an existing import,
// but it is with prefix and we don't use this prefix
var alreadyImportedWithPrefix = <String>{};
- for (ImportElement imp in unitLibraryElement.imports) {
+ for (var imp in unitLibraryElement.imports) {
// prepare element
- LibraryElement libraryElement = imp.importedLibrary;
- Element element = getExportedElement(libraryElement, name);
+ var libraryElement = imp.importedLibrary;
+ var element = getExportedElement(libraryElement, name);
if (element == null) {
continue;
}
@@ -2882,7 +2861,7 @@
continue;
}
// may be apply prefix
- PrefixElement prefix = imp.prefix;
+ var prefix = imp.prefix;
if (prefix != null) {
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
@@ -2894,16 +2873,15 @@
continue;
}
// may be update "show" directive
- List<NamespaceCombinator> combinators = imp.combinators;
+ var combinators = imp.combinators;
if (combinators.length == 1 && combinators[0] is ShowElementCombinator) {
- ShowElementCombinator showCombinator =
- combinators[0] as ShowElementCombinator;
+ var showCombinator = combinators[0] as ShowElementCombinator;
// prepare new set of names to show
Set<String> showNames = SplayTreeSet<String>();
showNames.addAll(showCombinator.shownNames);
showNames.add(name);
// prepare library name - unit name or 'dart:name' for SDK library
- String libraryName =
+ var libraryName =
libraryElement.definingCompilationUnit.source.uri.toString();
if (libraryElement.isInSdk) {
libraryName = libraryElement.source.shortName;
@@ -2911,11 +2889,10 @@
// don't add this library again
alreadyImportedWithPrefix.add(libraryElement.source.fullName);
// update library
- String newShowCode = 'show ${showNames.join(', ')}';
- int offset = showCombinator.offset;
- int length = showCombinator.end - offset;
- String libraryFile =
- context.resolveResult.libraryElement.source.fullName;
+ var newShowCode = 'show ${showNames.join(', ')}';
+ var offset = showCombinator.offset;
+ var length = showCombinator.end - offset;
+ var libraryFile = context.resolveResult.libraryElement.source.fullName;
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(libraryFile,
(DartFileEditBuilder builder) {
@@ -2966,7 +2943,7 @@
Future<void> _addFix_importLibrary_withExtension() async {
if (node is SimpleIdentifier) {
- String extensionName = (node as SimpleIdentifier).name;
+ var extensionName = (node as SimpleIdentifier).name;
await _addFix_importLibrary_withElement(
extensionName,
const [ElementKind.EXTENSION],
@@ -2977,13 +2954,13 @@
Future<void> _addFix_importLibrary_withFunction() async {
if (node is SimpleIdentifier) {
if (node.parent is MethodInvocation) {
- MethodInvocation invocation = node.parent as MethodInvocation;
+ var invocation = node.parent as MethodInvocation;
if (invocation.realTarget != null || invocation.methodName != node) {
return;
}
}
- String name = (node as SimpleIdentifier).name;
+ var name = (node as SimpleIdentifier).name;
await _addFix_importLibrary_withElement(name, const [
ElementKind.FUNCTION,
ElementKind.TOP_LEVEL_VARIABLE
@@ -2996,7 +2973,7 @@
Future<void> _addFix_importLibrary_withTopLevelVariable() async {
if (node is SimpleIdentifier) {
- String name = (node as SimpleIdentifier).name;
+ var name = (node as SimpleIdentifier).name;
await _addFix_importLibrary_withElement(
name,
const [ElementKind.TOP_LEVEL_VARIABLE],
@@ -3006,13 +2983,13 @@
Future<void> _addFix_importLibrary_withType() async {
if (_mayBeTypeIdentifier(node)) {
- String typeName = (node as SimpleIdentifier).name;
+ var typeName = (node as SimpleIdentifier).name;
await _addFix_importLibrary_withElement(
typeName,
const [ElementKind.CLASS, ElementKind.FUNCTION_TYPE_ALIAS],
const [TopLevelDeclarationKind.type]);
} else if (_mayBeImplicitConstructor(node)) {
- String typeName = (node as SimpleIdentifier).name;
+ var typeName = (node as SimpleIdentifier).name;
await _addFix_importLibrary_withElement(typeName,
const [ElementKind.CLASS], const [TopLevelDeclarationKind.type]);
}
@@ -3023,7 +3000,7 @@
if (_isAwaitNode()) {
return;
}
- int insertOffset = error.offset + error.length;
+ var insertOffset = error.offset + error.length;
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.addSimpleInsertion(insertOffset, ';');
@@ -3037,12 +3014,12 @@
return;
}
PrefixExpression prefixExpression = node;
- Token negation = prefixExpression.operator;
+ var negation = prefixExpression.operator;
if (negation.type != TokenType.BANG) {
return;
}
SimpleIdentifier identifier;
- Expression expression = prefixExpression.operand;
+ var expression = prefixExpression.operand;
if (expression is PrefixedIdentifier) {
identifier = expression.identifier;
} else if (expression is PropertyAccess) {
@@ -3060,7 +3037,7 @@
Future<void> _addFix_isNotNull() async {
if (coveredNode is IsExpression) {
- IsExpression isExpression = coveredNode as IsExpression;
+ var isExpression = coveredNode as IsExpression;
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder
@@ -3075,7 +3052,7 @@
Future<void> _addFix_isNull() async {
if (coveredNode is IsExpression) {
- IsExpression isExpression = coveredNode as IsExpression;
+ var isExpression = coveredNode as IsExpression;
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder
@@ -3089,12 +3066,11 @@
}
Future<void> _addFix_makeEnclosingClassAbstract() async {
- ClassDeclaration enclosingClass =
- node.thisOrAncestorOfType<ClassDeclaration>();
+ var enclosingClass = node.thisOrAncestorOfType<ClassDeclaration>();
if (enclosingClass == null) {
return;
}
- String className = enclosingClass.name.name;
+ var className = enclosingClass.name.name;
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.addSimpleInsertion(
@@ -3105,7 +3081,7 @@
}
Future<void> _addFix_makeFieldNotFinal() async {
- AstNode node = this.node;
+ var node = this.node;
if (node is SimpleIdentifier &&
node.staticElement is PropertyAccessorElement) {
PropertyAccessorElement getter = node.staticElement;
@@ -3116,12 +3092,12 @@
getter.enclosingElement is ClassElement) {
var declarationResult =
await sessionHelper.getElementDeclaration(getter.variable);
- AstNode variable = declarationResult.node;
+ var variable = declarationResult.node;
if (variable is VariableDeclaration &&
variable.parent is VariableDeclarationList &&
variable.parent.parent is FieldDeclaration) {
VariableDeclarationList declarationList = variable.parent;
- Token keywordToken = declarationList.keyword;
+ var keywordToken = declarationList.keyword;
if (declarationList.variables.length == 1 &&
keywordToken.keyword == Keyword.FINAL) {
var changeBuilder = _newDartChangeBuilder();
@@ -3138,7 +3114,7 @@
});
}
});
- String fieldName = getter.variable.displayName;
+ var fieldName = getter.variable.displayName;
_addFixFromBuilder(changeBuilder, DartFixKind.MAKE_FIELD_NOT_FINAL,
args: [fieldName]);
}
@@ -3148,7 +3124,7 @@
}
Future<void> _addFix_makeVariableFinal() async {
- AstNode node = this.node;
+ var node = this.node;
if (node is SimpleIdentifier && node.parent is VariableDeclaration) {
VariableDeclaration declaration = node.parent;
VariableDeclarationList list = declaration.parent;
@@ -3167,7 +3143,7 @@
}
Future<void> _addFix_makeVariableNotFinal() async {
- AstNode node = this.node;
+ var node = this.node;
if (node is SimpleIdentifier &&
node.staticElement is LocalVariableElement) {
LocalVariableElement variable = node.staticElement;
@@ -3204,17 +3180,17 @@
return;
}
InstanceCreationExpression creation = typeArguments.parent;
- TypeName typeName = creation.constructorName.type;
+ var typeName = creation.constructorName.type;
if (typeName.typeArguments != null) {
return;
}
- Element element = typeName.type.element;
+ var element = typeName.type.element;
if (element is ClassElement &&
element.typeParameters != null &&
element.typeParameters.length == typeArguments.arguments.length) {
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
- String argumentText = utils.getNodeText(typeArguments);
+ var argumentText = utils.getNodeText(typeArguments);
builder.addSimpleInsertion(typeName.end, argumentText);
builder.addDeletion(range.node(typeArguments));
});
@@ -3237,7 +3213,7 @@
return;
}
SimpleIdentifier memberName = node;
- AstNode parent = node.parent;
+ var parent = node.parent;
AstNode target;
if (parent is MethodInvocation && node == parent.methodName) {
target = parent.target;
@@ -3247,7 +3223,7 @@
if (target != null) {
return;
}
- Element enclosingElement = memberName.staticElement.enclosingElement;
+ var enclosingElement = memberName.staticElement.enclosingElement;
if (enclosingElement.library != unitLibraryElement) {
// TODO(brianwilkerson) Support qualifying references to members defined
// in other libraries. `DartEditBuilder` currently defines the method
@@ -3255,7 +3231,7 @@
// which don't have a type.
return;
}
- String containerName = enclosingElement.name;
+ var containerName = enclosingElement.name;
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.addSimpleInsertion(node.offset, '$containerName.');
@@ -3269,9 +3245,9 @@
if (node == null) {
return;
}
- Token followingToken = node.endToken.next;
+ var followingToken = node.endToken.next;
followingToken = followingToken.precedingComments ?? followingToken;
- DartChangeBuilder changeBuilder = _newDartChangeBuilder();
+ var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.addDeletion(range.startStart(node, followingToken));
});
@@ -3286,7 +3262,7 @@
orElse: () => null);
}
- AstNode node = coveredNode;
+ var node = coveredNode;
if (node is Annotation) {
await addFix(node);
} else if (node is DefaultFormalParameter) {
@@ -3294,12 +3270,11 @@
} else if (node is NormalFormalParameter) {
await addFix(findAnnotation(node.metadata, 'required'));
} else if (node is DeclaredSimpleIdentifier) {
- AstNode parent = node.parent;
+ var parent = node.parent;
if (parent is MethodDeclaration) {
await addFix(findAnnotation(parent.metadata, 'override'));
} else if (parent is VariableDeclaration) {
- FieldDeclaration fieldDeclaration =
- parent.thisOrAncestorOfType<FieldDeclaration>();
+ var fieldDeclaration = parent.thisOrAncestorOfType<FieldDeclaration>();
if (fieldDeclaration != null) {
await addFix(findAnnotation(fieldDeclaration.metadata, 'override'));
}
@@ -3313,8 +3288,7 @@
arg = arg.parent;
}
- final ArgumentList argumentList =
- arg.parent.thisOrAncestorOfType<ArgumentList>();
+ var argumentList = arg.parent.thisOrAncestorOfType<ArgumentList>();
if (argumentList != null) {
final changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (builder) {
@@ -3367,9 +3341,9 @@
}
Future<void> _addFix_removeDeadCode() async {
- AstNode coveringNode = coveredNode;
+ var coveringNode = coveredNode;
if (coveringNode is Expression) {
- AstNode parent = coveredNode.parent;
+ var parent = coveredNode.parent;
if (parent is BinaryExpression) {
if (parent.rightOperand == coveredNode) {
var changeBuilder = _newDartChangeBuilder();
@@ -3380,17 +3354,16 @@
}
}
} else if (coveringNode is Block) {
- Block block = coveringNode;
- List<Statement> statementsToRemove = <Statement>[];
+ var block = coveringNode;
+ var statementsToRemove = <Statement>[];
var errorRange = SourceRange(errorOffset, errorLength);
- for (Statement statement in block.statements) {
+ for (var statement in block.statements) {
if (range.node(statement).intersects(errorRange)) {
statementsToRemove.add(statement);
}
}
if (statementsToRemove.isNotEmpty) {
- SourceRange rangeToRemove =
- utils.getLinesRangeStatements(statementsToRemove);
+ var rangeToRemove = utils.getLinesRangeStatements(statementsToRemove);
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.addDeletion(rangeToRemove);
@@ -3398,7 +3371,7 @@
_addFixFromBuilder(changeBuilder, DartFixKind.REMOVE_DEAD_CODE);
}
} else if (coveringNode is Statement) {
- SourceRange rangeToRemove =
+ var rangeToRemove =
utils.getLinesRangeStatements(<Statement>[coveringNode]);
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
@@ -3407,11 +3380,10 @@
_addFixFromBuilder(changeBuilder, DartFixKind.REMOVE_DEAD_CODE);
} else if (coveringNode is CatchClause) {
TryStatement tryStatement = coveringNode.parent;
- NodeList<CatchClause> catchClauses = tryStatement.catchClauses;
- int index = catchClauses.indexOf(coveringNode);
- AstNode previous =
- index == 0 ? tryStatement.body : catchClauses[index - 1];
- DartChangeBuilder changeBuilder = _newDartChangeBuilder();
+ var catchClauses = tryStatement.catchClauses;
+ var index = catchClauses.indexOf(coveringNode);
+ var previous = index == 0 ? tryStatement.body : catchClauses[index - 1];
+ var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.addDeletion(range.endEnd(previous, coveringNode));
});
@@ -3469,7 +3441,7 @@
} else {
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
- Token previous = emptyStatement.findPrevious(emptyStatement.beginToken);
+ var previous = emptyStatement.findPrevious(emptyStatement.beginToken);
if (previous != null) {
builder.addSimpleReplacement(
range.endEnd(previous, emptyStatement), ' {}');
@@ -3503,9 +3475,9 @@
}
Future<void> _addFix_removeInterpolationBraces() async {
- AstNode node = this.node;
+ var node = this.node;
if (node is InterpolationExpression) {
- Token right = node.rightBracket;
+ var right = node.rightBracket;
if (node.expression != null && right != null) {
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
@@ -3520,8 +3492,7 @@
}
Future<void> _addFix_removeMethodDeclaration() async {
- MethodDeclaration declaration =
- node.thisOrAncestorOfType<MethodDeclaration>();
+ var declaration = node.thisOrAncestorOfType<MethodDeclaration>();
if (declaration != null) {
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
@@ -3533,18 +3504,18 @@
Future<void> _addFix_removeNameFromCombinator() async {
SourceRange rangeForCombinator(Combinator combinator) {
- AstNode parent = combinator.parent;
+ var parent = combinator.parent;
if (parent is NamespaceDirective) {
- NodeList<Combinator> combinators = parent.combinators;
+ var combinators = parent.combinators;
if (combinators.length == 1) {
- Token previousToken =
+ var previousToken =
combinator.parent.findPrevious(combinator.beginToken);
if (previousToken != null) {
return range.endEnd(previousToken, combinator);
}
return null;
}
- int index = combinators.indexOf(combinator);
+ var index = combinators.indexOf(combinator);
if (index < 0) {
return null;
} else if (index == combinators.length - 1) {
@@ -3568,7 +3539,7 @@
if (names.length == 1) {
return rangeForCombinator(combinator);
}
- int index = names.indexOf(name);
+ var index = names.indexOf(name);
if (index < 0) {
return null;
} else if (index == names.length - 1) {
@@ -3577,15 +3548,15 @@
return range.startStart(name, names[index + 1]);
}
- AstNode node = coveredNode;
+ var node = coveredNode;
if (node is SimpleIdentifier) {
- AstNode parent = coveredNode.parent;
+ var parent = coveredNode.parent;
if (parent is Combinator) {
- SourceRange rangeToRemove = rangeForNameInCombinator(parent, node);
+ var rangeToRemove = rangeForNameInCombinator(parent, node);
if (rangeToRemove == null) {
return;
}
- DartChangeBuilder changeBuilder = _newDartChangeBuilder();
+ var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.addDeletion(rangeToRemove);
});
@@ -3624,9 +3595,9 @@
Future<void> _addFix_removeParameters_inGetterDeclaration() async {
if (node is MethodDeclaration) {
// Support for the analyzer error.
- MethodDeclaration method = node as MethodDeclaration;
- SimpleIdentifier name = method.name;
- FunctionBody body = method.body;
+ var method = node as MethodDeclaration;
+ var name = method.name;
+ var body = method.body;
if (name != null && body != null) {
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
@@ -3692,7 +3663,7 @@
}
Future<void> _addFix_removeTypeAnnotation() async {
- final TypeAnnotation type = node.thisOrAncestorOfType<TypeAnnotation>();
+ var type = node.thisOrAncestorOfType<TypeAnnotation>();
if (type != null) {
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
@@ -3717,9 +3688,9 @@
if (coveredNode is! AsExpression) {
return;
}
- AsExpression asExpression = coveredNode as AsExpression;
- Expression expression = asExpression.expression;
- Precedence expressionPrecedence = getExpressionPrecedence(expression);
+ var asExpression = coveredNode as AsExpression;
+ var expression = asExpression.expression;
+ var expressionPrecedence = getExpressionPrecedence(expression);
// remove 'as T' from 'e as T'
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
@@ -3731,7 +3702,7 @@
Future<void> _addFix_removeUnusedCatchClause() async {
if (node is SimpleIdentifier) {
- AstNode catchClause = node.parent;
+ var catchClause = node.parent;
if (catchClause is CatchClause &&
catchClause.exceptionParameter == node) {
var changeBuilder = _newDartChangeBuilder();
@@ -3747,7 +3718,7 @@
Future<void> _addFix_removeUnusedCatchStack() async {
if (node is SimpleIdentifier) {
- AstNode catchClause = node.parent;
+ var catchClause = node.parent;
if (catchClause is CatchClause &&
catchClause.stackTraceParameter == node &&
catchClause.exceptionParameter != null) {
@@ -3764,8 +3735,7 @@
Future<void> _addFix_removeUnusedImport() async {
// prepare ImportDirective
- ImportDirective importDirective =
- node.thisOrAncestorOfType<ImportDirective>();
+ var importDirective = node.thisOrAncestorOfType<ImportDirective>();
if (importDirective == null) {
return;
}
@@ -3796,7 +3766,7 @@
SimpleIdentifier identifier = node;
// Prepare the new name.
- List<String> words = identifier.name.split('_');
+ var words = identifier.name.split('_');
if (words.length < 2) {
return;
}
@@ -3804,13 +3774,13 @@
// Find references to the identifier.
List<SimpleIdentifier> references;
- Element element = identifier.staticElement;
+ var element = identifier.staticElement;
if (element is LocalVariableElement) {
AstNode root = node.thisOrAncestorOfType<Block>();
references = findLocalElementReferences(root, element);
} else if (element is ParameterElement) {
if (!element.isNamed) {
- AstNode root = node.thisOrAncestorMatching((node) =>
+ var root = node.thisOrAncestorMatching((node) =>
node.parent is ClassOrMixinDeclaration ||
node.parent is CompilationUnit);
references = findLocalElementReferences(root, element);
@@ -3966,7 +3936,7 @@
if (node is! SimpleIdentifier) {
return;
}
- AstNode parent = node.parent;
+ var parent = node.parent;
AstNode target;
if (parent is MethodInvocation && node == parent.methodName) {
target = parent.target;
@@ -3987,7 +3957,7 @@
}
Future<void> _addFix_replaceWithIdentifier() async {
- final FunctionTypedFormalParameter functionTyped =
+ var functionTyped =
node.thisOrAncestorOfType<FunctionTypedFormalParameter>();
if (functionTyped != null) {
var changeBuilder = _newDartChangeBuilder();
@@ -4031,12 +4001,12 @@
return null;
}
- BinaryExpression binary = node.thisOrAncestorOfType();
- TokenType operator = binary.operator.type;
+ var binary = node.thisOrAncestorOfType<BinaryExpression>();
+ var operator = binary.operator.type;
String getter;
FixKind kind;
Expression lengthTarget;
- int rightValue = getIntValue(binary.rightOperand);
+ var rightValue = getIntValue(binary.rightOperand);
if (rightValue != null) {
lengthTarget = getLengthTarget(binary.leftOperand);
if (rightValue == 0) {
@@ -4059,7 +4029,7 @@
}
}
} else {
- int leftValue = getIntValue(binary.leftOperand);
+ var leftValue = getIntValue(binary.leftOperand);
if (leftValue != null) {
lengthTarget = getLengthTarget(binary.rightOperand);
if (leftValue == 0) {
@@ -4087,8 +4057,8 @@
if (lengthTarget == null || getter == null || kind == null) {
return;
}
- String target = utils.getNodeText(lengthTarget);
- DartChangeBuilder changeBuilder = _newDartChangeBuilder();
+ var target = utils.getNodeText(lengthTarget);
+ var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.addSimpleReplacement(range.node(binary), '$target.$getter');
});
@@ -4106,8 +4076,7 @@
}
Future<void> _addFix_replaceWithTearOff() async {
- FunctionExpression ancestor =
- node.thisOrAncestorOfType<FunctionExpression>();
+ var ancestor = node.thisOrAncestorOfType<FunctionExpression>();
if (ancestor == null) {
return;
}
@@ -4152,11 +4121,11 @@
}
Future<void> _addFix_undefinedClass_useSimilar() async {
- AstNode node = this.node;
+ var node = this.node;
// Prepare the optional import prefix name.
String prefixName;
if (node is SimpleIdentifier && node.staticElement is PrefixElement) {
- AstNode parent = node.parent;
+ var parent = node.parent;
if (parent is PrefixedIdentifier &&
parent.prefix == node &&
parent.parent is TypeName) {
@@ -4167,27 +4136,27 @@
// Process if looks like a type.
if (_mayBeTypeIdentifier(node)) {
// Prepare for selecting the closest element.
- String name = (node as SimpleIdentifier).name;
- _ClosestElementFinder finder = _ClosestElementFinder(
+ var name = (node as SimpleIdentifier).name;
+ var finder = _ClosestElementFinder(
name,
(Element element) => element is ClassElement,
MAX_LEVENSHTEIN_DISTANCE);
// Check elements of this library.
if (prefixName == null) {
- for (CompilationUnitElement unit in unitLibraryElement.units) {
+ for (var unit in unitLibraryElement.units) {
finder._updateList(unit.types);
}
}
// Check elements from imports.
- for (ImportElement importElement in unitLibraryElement.imports) {
+ for (var importElement in unitLibraryElement.imports) {
if (importElement.prefix?.name == prefixName) {
- Map<String, Element> namespace = getImportNamespace(importElement);
+ var namespace = getImportNamespace(importElement);
finder._updateList(namespace.values);
}
}
// If we have a close enough element, suggest to use it.
if (finder._element != null) {
- String closestName = finder._element.name;
+ var closestName = finder._element.name;
if (closestName != null) {
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
@@ -4201,7 +4170,7 @@
}
Future<void> _addFix_undefinedClassAccessor_useSimilar() async {
- AstNode node = this.node;
+ var node = this.node;
if (node is SimpleIdentifier) {
// prepare target
Expression target;
@@ -4232,14 +4201,14 @@
Future<void> _addFix_undefinedClassMember_useSimilar(
Expression target, ElementPredicate predicate) async {
if (node is SimpleIdentifier) {
- String name = (node as SimpleIdentifier).name;
- _ClosestElementFinder finder =
+ var name = (node as SimpleIdentifier).name;
+ var finder =
_ClosestElementFinder(name, predicate, MAX_LEVENSHTEIN_DISTANCE);
// unqualified invocation
if (target == null) {
- ClassDeclaration clazz = node.thisOrAncestorOfType<ClassDeclaration>();
+ var clazz = node.thisOrAncestorOfType<ClassDeclaration>();
if (clazz != null) {
- ClassElement classElement = clazz.declaredElement;
+ var classElement = clazz.declaredElement;
_updateFinderWithClassMembers(finder, classElement);
}
} else if (target is ExtensionOverride) {
@@ -4255,7 +4224,7 @@
}
// if we have close enough element, suggest to use it
if (finder._element != null) {
- String closestName = finder._element.displayName;
+ var closestName = finder._element.displayName;
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.addSimpleReplacement(range.node(node), closestName);
@@ -4272,10 +4241,10 @@
} else {
return;
}
- String name = (node as SimpleIdentifier).name;
- MethodInvocation invocation = node.parent as MethodInvocation;
+ var name = (node as SimpleIdentifier).name;
+ var invocation = node.parent as MethodInvocation;
// function invocation has no target
- Expression target = invocation.realTarget;
+ var target = invocation.realTarget;
if (target != null) {
return;
}
@@ -4294,7 +4263,7 @@
builder.write(sourcePrefix);
// append return type
{
- DartType type = _inferUndefinedExpressionType(invocation);
+ var type = _inferUndefinedExpressionType(invocation);
if (builder.writeType(type, groupName: 'RETURN_TYPE')) {
builder.write(' ');
}
@@ -4314,14 +4283,14 @@
}
Future<void> _addFix_undefinedFunction_useSimilar() async {
- AstNode node = this.node;
+ var node = this.node;
if (node is SimpleIdentifier) {
// Prepare the optional import prefix name.
String prefixName;
{
- AstNode invocation = node.parent;
+ var invocation = node.parent;
if (invocation is MethodInvocation && invocation.methodName == node) {
- Expression target = invocation.target;
+ var target = invocation.target;
if (target is SimpleIdentifier &&
target.staticElement is PrefixElement) {
prefixName = target.name;
@@ -4329,26 +4298,26 @@
}
}
// Prepare for selecting the closest element.
- _ClosestElementFinder finder = _ClosestElementFinder(
+ var finder = _ClosestElementFinder(
node.name,
(Element element) => element is FunctionElement,
MAX_LEVENSHTEIN_DISTANCE);
// Check to this library units.
if (prefixName == null) {
- for (CompilationUnitElement unit in unitLibraryElement.units) {
+ for (var unit in unitLibraryElement.units) {
finder._updateList(unit.functions);
}
}
// Check unprefixed imports.
- for (ImportElement importElement in unitLibraryElement.imports) {
+ for (var importElement in unitLibraryElement.imports) {
if (importElement.prefix?.name == prefixName) {
- Map<String, Element> namespace = getImportNamespace(importElement);
+ var namespace = getImportNamespace(importElement);
finder._updateList(namespace.values);
}
}
// If we have a close enough element, suggest to use it.
if (finder._element != null) {
- String closestName = finder._element.name;
+ var closestName = finder._element.name;
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.addSimpleReplacement(range.node(node), closestName);
@@ -4361,16 +4330,16 @@
Future<void> _addFix_undefinedMethod_useSimilar() async {
if (node.parent is MethodInvocation) {
- MethodInvocation invocation = node.parent as MethodInvocation;
+ var invocation = node.parent as MethodInvocation;
await _addFix_undefinedClassMember_useSimilar(invocation.realTarget,
(Element element) => element is MethodElement && !element.isOperator);
}
}
Future<void> _addFix_updateSdkConstraints(String minimumVersion) async {
- Context context = resourceProvider.pathContext;
+ var context = resourceProvider.pathContext;
File pubspecFile;
- Folder folder = resourceProvider.getFolder(context.dirname(file));
+ var folder = resourceProvider.getFolder(context.dirname(file));
while (folder != null) {
pubspecFile = folder.getChildAssumingFile('pubspec.yaml');
if (pubspecFile.exists) {
@@ -4382,15 +4351,15 @@
if (pubspecFile == null) {
return;
}
- SdkConstraintExtractor extractor = SdkConstraintExtractor(pubspecFile);
- String text = extractor.constraintText();
- int offset = extractor.constraintOffset();
+ var extractor = SdkConstraintExtractor(pubspecFile);
+ var text = extractor.constraintText();
+ var offset = extractor.constraintOffset();
if (text == null || offset < 0) {
return;
}
- int length = text.length;
+ var length = text.length;
String newText;
- int spaceOffset = text.indexOf(' ');
+ var spaceOffset = text.indexOf(' ');
if (spaceOffset >= 0) {
length = spaceOffset;
}
@@ -4414,15 +4383,15 @@
}
Future<void> _addFix_useEffectiveIntegerDivision() async {
- for (AstNode n = node; n != null; n = n.parent) {
+ for (var n = node; n != null; n = n.parent) {
if (n is MethodInvocation &&
n.offset == errorOffset &&
n.length == errorLength) {
- Expression target = (n as MethodInvocation).target.unParenthesized;
+ var target = (n as MethodInvocation).target.unParenthesized;
var changeBuilder = _newDartChangeBuilder();
await changeBuilder.addFileEdit(file, (DartFileEditBuilder builder) {
// replace "/" with "~/"
- BinaryExpression binary = target as BinaryExpression;
+ var binary = target as BinaryExpression;
builder.addSimpleReplacement(range.token(binary.operator), '~/');
// remove everything before and after
builder.addDeletion(range.startStart(n, binary.leftOperand));
@@ -4455,10 +4424,10 @@
Future<void> _addFix_useStaticAccess_method() async {
if (node is SimpleIdentifier && node.parent is MethodInvocation) {
- MethodInvocation invocation = node.parent as MethodInvocation;
+ var invocation = node.parent as MethodInvocation;
if (invocation.methodName == node) {
- Expression target = invocation.target;
- Element invokedElement = invocation.methodName.staticElement;
+ var target = invocation.target;
+ var invokedElement = invocation.methodName.staticElement;
await _addFix_useStaticAccess(target, invokedElement);
}
}
@@ -4466,10 +4435,10 @@
Future<void> _addFix_useStaticAccess_property() async {
if (node is SimpleIdentifier && node.parent is PrefixedIdentifier) {
- PrefixedIdentifier prefixed = node.parent as PrefixedIdentifier;
+ var prefixed = node.parent as PrefixedIdentifier;
if (prefixed.identifier == node) {
Expression target = prefixed.prefix;
- Element invokedElement = prefixed.identifier.staticElement;
+ var invokedElement = prefixed.identifier.staticElement;
await _addFix_useStaticAccess(target, invokedElement);
}
}
@@ -4478,7 +4447,7 @@
void _addFixFromBuilder(ChangeBuilder builder, FixKind kind,
{List<Object> args, bool importsOnly = false}) {
if (builder == null) return;
- SourceChange change = builder.sourceChange;
+ var change = builder.sourceChange;
if (change.edits.isEmpty && !importsOnly) {
return;
}
@@ -4527,7 +4496,7 @@
StaticWarningCode.FINAL_NOT_INITIALIZED_CONSTRUCTOR_3_PLUS) {
await compute(AddFieldFormalParameters());
} else if (errorCode is LintCode) {
- String name = errorCode.name;
+ var name = errorCode.name;
if (name == LintNames.always_declare_return_types) {
await compute(AddReturnType());
} else if (name == LintNames.avoid_private_typedef_functions) {
@@ -4602,14 +4571,14 @@
/// [FunctionType] in the given [ClassElement].
Future<void> _addProposal_createFunction_function(
FunctionType functionType) async {
- String name = (node as SimpleIdentifier).name;
+ var name = (node as SimpleIdentifier).name;
// prepare environment
- int insertOffset = unit.end;
+ var insertOffset = unit.end;
// prepare prefix
- String prefix = '';
- String sourcePrefix = '$eol';
- String sourceSuffix = eol;
- DartChangeBuilder changeBuilder = await _addProposal_createFunction(
+ var prefix = '';
+ var sourcePrefix = '$eol';
+ var sourceSuffix = eol;
+ var changeBuilder = await _addProposal_createFunction(
functionType,
name,
file,
@@ -4627,25 +4596,25 @@
/// [FunctionType] in the given [ClassElement].
Future<void> _addProposal_createFunction_method(
ClassElement targetClassElement, FunctionType functionType) async {
- String name = (node as SimpleIdentifier).name;
+ var name = (node as SimpleIdentifier).name;
// prepare environment
- Source targetSource = targetClassElement.source;
+ var targetSource = targetClassElement.source;
// prepare insert offset
var targetNode = await _getClassDeclaration(targetClassElement);
if (targetNode == null) {
return;
}
- int insertOffset = targetNode.end - 1;
+ var insertOffset = targetNode.end - 1;
// prepare prefix
- String prefix = ' ';
+ var prefix = ' ';
String sourcePrefix;
if (targetNode.members.isEmpty) {
sourcePrefix = '';
} else {
sourcePrefix = eol;
}
- String sourceSuffix = eol;
- DartChangeBuilder changeBuilder = await _addProposal_createFunction(
+ var sourceSuffix = eol;
+ var changeBuilder = await _addProposal_createFunction(
functionType,
name,
targetSource.fullName,
@@ -4671,9 +4640,9 @@
/// Return the string to display as the name of the given constructor in a
/// proposal name.
String _getConstructorProposalName(ConstructorElement constructor) {
- StringBuffer buffer = StringBuffer();
+ var buffer = StringBuffer();
buffer.write('super');
- String constructorName = constructor.displayName;
+ var constructorName = constructor.displayName;
if (constructorName.isNotEmpty) {
buffer.write('.');
buffer.write(constructorName);
@@ -4704,7 +4673,7 @@
var sourceDirectory = pathCtx.dirname(path);
if (pathCtx.isWithin(libraryDirectory, path) ||
pathCtx.isWithin(sourceDirectory, libraryDirectory)) {
- String relativeFile = pathCtx.relative(path, from: libraryDirectory);
+ var relativeFile = pathCtx.relative(path, from: libraryDirectory);
return pathCtx.split(relativeFile).join('/');
}
return null;
@@ -4713,7 +4682,7 @@
/// Returns an expected [DartType] of [expression], may be `null` if cannot be
/// inferred.
DartType _inferUndefinedExpressionType(Expression expression) {
- AstNode parent = expression.parent;
+ var parent = expression.parent;
// myFunction();
if (parent is ExpressionStatement) {
if (expression is MethodInvocation) {
@@ -4722,14 +4691,14 @@
}
// return myFunction();
if (parent is ReturnStatement) {
- ExecutableElement executable = getEnclosingExecutableElement(expression);
+ var executable = getEnclosingExecutableElement(expression);
return executable?.returnType;
}
// int v = myFunction();
if (parent is VariableDeclaration) {
- VariableDeclaration variableDeclaration = parent;
+ var variableDeclaration = parent;
if (variableDeclaration.initializer == expression) {
- VariableElement variableElement = variableDeclaration.declaredElement;
+ var variableElement = variableDeclaration.declaredElement;
if (variableElement != null) {
return variableElement.type;
}
@@ -4737,9 +4706,9 @@
}
// myField = 42;
if (parent is AssignmentExpression) {
- AssignmentExpression assignment = parent;
+ var assignment = parent;
if (assignment.leftHandSide == expression) {
- Expression rhs = assignment.rightHandSide;
+ var rhs = assignment.rightHandSide;
if (rhs != null) {
return rhs.staticType;
}
@@ -4747,19 +4716,19 @@
}
// v = myFunction();
if (parent is AssignmentExpression) {
- AssignmentExpression assignment = parent;
+ var assignment = parent;
if (assignment.rightHandSide == expression) {
if (assignment.operator.type == TokenType.EQ) {
// v = myFunction();
- Expression lhs = assignment.leftHandSide;
+ var lhs = assignment.leftHandSide;
if (lhs != null) {
return lhs.staticType;
}
} else {
// v += myFunction();
- MethodElement method = assignment.staticElement;
+ var method = assignment.staticElement;
if (method != null) {
- List<ParameterElement> parameters = method.parameters;
+ var parameters = method.parameters;
if (parameters.length == 1) {
return parameters[0].type;
}
@@ -4769,61 +4738,61 @@
}
// v + myFunction();
if (parent is BinaryExpression) {
- BinaryExpression binary = parent;
- MethodElement method = binary.staticElement;
+ var binary = parent;
+ var method = binary.staticElement;
if (method != null) {
if (binary.rightOperand == expression) {
- List<ParameterElement> parameters = method.parameters;
+ var parameters = method.parameters;
return parameters.length == 1 ? parameters[0].type : null;
}
}
}
// foo( myFunction() );
if (parent is ArgumentList) {
- ParameterElement parameter = expression.staticParameterElement;
+ var parameter = expression.staticParameterElement;
return parameter?.type;
}
// bool
{
// assert( myFunction() );
if (parent is AssertStatement) {
- AssertStatement statement = parent;
+ var statement = parent;
if (statement.condition == expression) {
return coreTypeBool;
}
}
// if ( myFunction() ) {}
if (parent is IfStatement) {
- IfStatement statement = parent;
+ var statement = parent;
if (statement.condition == expression) {
return coreTypeBool;
}
}
// while ( myFunction() ) {}
if (parent is WhileStatement) {
- WhileStatement statement = parent;
+ var statement = parent;
if (statement.condition == expression) {
return coreTypeBool;
}
}
// do {} while ( myFunction() );
if (parent is DoStatement) {
- DoStatement statement = parent;
+ var statement = parent;
if (statement.condition == expression) {
return coreTypeBool;
}
}
// !myFunction()
if (parent is PrefixExpression) {
- PrefixExpression prefixExpression = parent;
+ var prefixExpression = parent;
if (prefixExpression.operator.type == TokenType.BANG) {
return coreTypeBool;
}
}
// binary expression '&&' or '||'
if (parent is BinaryExpression) {
- BinaryExpression binaryExpression = parent;
- TokenType operatorType = binaryExpression.operator.type;
+ var binaryExpression = parent;
+ var operatorType = binaryExpression.operator.type;
if (operatorType == TokenType.AMPERSAND_AMPERSAND ||
operatorType == TokenType.BAR_BAR) {
return coreTypeBool;
@@ -4845,12 +4814,12 @@
return true;
}
// static method
- MethodDeclaration method = node.thisOrAncestorOfType<MethodDeclaration>();
+ var method = node.thisOrAncestorOfType<MethodDeclaration>();
return method != null && method.isStatic;
}
bool _isAwaitNode() {
- AstNode node = this.node;
+ var node = this.node;
return node is SimpleIdentifier && node.name == 'await';
}
@@ -4867,7 +4836,7 @@
bool _isCastMethodInvocation(Expression expression) {
if (expression is MethodInvocation) {
- Element element = expression.methodName.staticElement;
+ var element = expression.methodName.staticElement;
return element is MethodElement && _isCastMethodElement(element);
}
return false;
@@ -4900,8 +4869,8 @@
element != null && element.name == 'Set' && element.library.isDartCore;
bool _isLibSrcPath(String path) {
- List<String> parts = resourceProvider.pathContext.split(path);
- for (int i = 0; i < parts.length - 2; i++) {
+ var parts = resourceProvider.pathContext.split(path);
+ for (var i = 0; i < parts.length - 2; i++) {
if (parts[i] == 'lib' && parts[i + 1] == 'src') {
return true;
}
@@ -4920,7 +4889,7 @@
bool _isToListMethodInvocation(Expression expression) {
if (expression is MethodInvocation) {
- Element element = expression.methodName.staticElement;
+ var element = expression.methodName.staticElement;
return element is MethodElement && _isToListMethodElement(element);
}
return false;
@@ -4936,8 +4905,7 @@
void _removeEnclosingParentheses(
DartFileEditBuilder builder, Expression expr, Precedence exprPrecedence) {
while (expr.parent is ParenthesizedExpression) {
- ParenthesizedExpression parenthesized =
- expr.parent as ParenthesizedExpression;
+ var parenthesized = expr.parent as ParenthesizedExpression;
if (getExpressionParentPrecedence(parenthesized) > exprPrecedence) {
break;
}
@@ -4950,7 +4918,7 @@
void _updateFinderWithClassMembers(
_ClosestElementFinder finder, ClassElement clazz) {
if (clazz != null) {
- List<Element> members = getMembers(clazz);
+ var members = getMembers(clazz);
finder._updateList(members);
}
}
@@ -4979,7 +4947,7 @@
if (name.isEmpty) {
return false;
}
- String firstLetter = name.substring(0, 1);
+ var firstLetter = name.substring(0, 1);
if (firstLetter.toUpperCase() != firstLetter) {
return false;
}
@@ -4990,7 +4958,7 @@
/// constructor invocation would be allowed.
static bool _mayBeImplicitConstructor(AstNode node) {
if (node is SimpleIdentifier) {
- AstNode parent = node.parent;
+ var parent = node.parent;
if (parent is MethodInvocation) {
return parent.realTarget == null;
}
@@ -5001,7 +4969,7 @@
/// Returns `true` if [node] is a type name.
static bool _mayBeTypeIdentifier(AstNode node) {
if (node is SimpleIdentifier) {
- AstNode parent = node.parent;
+ var parent = node.parent;
if (parent is TypeName) {
return true;
}
@@ -5028,7 +4996,7 @@
void _update(Element element) {
if (_predicate(element)) {
- int memberDistance = levenshtein(element.name, _targetName, _distance);
+ var memberDistance = levenshtein(element.name, _targetName, _distance);
if (memberDistance < _distance) {
_element = element;
_distance = memberDistance;
@@ -5037,7 +5005,7 @@
}
void _updateList(Iterable<Element> elements) {
- for (Element element in elements) {
+ for (var element in elements) {
_update(element);
}
}
@@ -5098,7 +5066,7 @@
if (targetDeclaration is ConstructorDeclaration) {
return targetDeclaration.parameters;
} else if (targetDeclaration is FunctionDeclaration) {
- FunctionExpression function = targetDeclaration.functionExpression;
+ var function = targetDeclaration.functionExpression;
return function.parameters;
} else if (targetDeclaration is MethodDeclaration) {
return targetDeclaration.parameters;
@@ -5111,7 +5079,7 @@
Future<FormalParameter> getParameterNode(ParameterElement element) async {
var result = await sessionHelper.getElementDeclaration(element);
var declaration = result.node;
- for (AstNode node = declaration; node != null; node = node.parent) {
+ for (var node = declaration; node != null; node = node.parent) {
if (node is FormalParameter && node.parent is FormalParameterList) {
return node;
}
diff --git a/pkg/analysis_server/lib/src/services/correction/levenshtein.dart b/pkg/analysis_server/lib/src/services/correction/levenshtein.dart
index a517a9d..42f8cda 100644
--- a/pkg/analysis_server/lib/src/services/correction/levenshtein.dart
+++ b/pkg/analysis_server/lib/src/services/correction/levenshtein.dart
@@ -34,8 +34,8 @@
t = t.toLowerCase();
}
- int s_len = s.length;
- int t_len = t.length;
+ var s_len = s.length;
+ var t_len = t.length;
// if one string is empty,
// the edit distance is necessarily the length of the other
@@ -52,7 +52,7 @@
// swap the two strings to consume less memory
if (s_len > t_len) {
- String tmp = s;
+ var tmp = s;
s = t;
t = tmp;
s_len = t_len;
@@ -60,15 +60,15 @@
}
// 'previous' cost array, horizontally
- List<int> p = List<int>.filled(s_len + 1, 0);
+ var p = List<int>.filled(s_len + 1, 0);
// cost array, horizontally
- List<int> d = List<int>.filled(s_len + 1, 0);
+ var d = List<int>.filled(s_len + 1, 0);
// placeholder to assist in swapping p and d
List<int> _d;
// fill in starting table values
- int boundary = math.min(s_len, threshold) + 1;
- for (int i = 0; i < boundary; i++) {
+ var boundary = math.min(s_len, threshold) + 1;
+ for (var i = 0; i < boundary; i++) {
p[i] = i;
}
@@ -78,14 +78,14 @@
_setRange(d, 0, d.length, _MAX_VALUE);
// iterates through t
- for (int j = 1; j <= t_len; j++) {
+ for (var j = 1; j <= t_len; j++) {
// jth character of t
- int t_j = t.codeUnitAt(j - 1);
+ var t_j = t.codeUnitAt(j - 1);
d[0] = j;
// compute stripe indices, constrain to array size
- int min = math.max(1, j - threshold);
- int max = math.min(s_len, j + threshold);
+ var min = math.max(1, j - threshold);
+ var max = math.min(s_len, j + threshold);
// the stripe may lead off of the table if s and t are of different sizes
if (min > max) {
@@ -98,7 +98,7 @@
}
// iterates through [min, max] in s
- for (int i = min; i <= max; i++) {
+ for (var i = min; i <= max; i++) {
if (s.codeUnitAt(i - 1) == t_j) {
// diagonally left and up
d[i] = p[i - 1];
@@ -124,7 +124,7 @@
}
void _setRange(List<int> a, int start, int end, int value) {
- for (int i = start; i < end; i++) {
+ for (var i = start; i < end; i++) {
a[i] = value;
}
}
diff --git a/pkg/analysis_server/lib/src/services/correction/name_suggestion.dart b/pkg/analysis_server/lib/src/services/correction/name_suggestion.dart
index 648ecfb..8d134df 100644
--- a/pkg/analysis_server/lib/src/services/correction/name_suggestion.dart
+++ b/pkg/analysis_server/lib/src/services/correction/name_suggestion.dart
@@ -12,12 +12,12 @@
/// Returns all variants of names by removing leading words one by one.
List<String> getCamelWordCombinations(String name) {
- List<String> result = [];
- List<String> parts = getCamelWords(name);
- for (int i = 0; i < parts.length; i++) {
+ var result = <String>[];
+ var parts = getCamelWords(name);
+ for (var i = 0; i < parts.length; i++) {
var s1 = parts[i].toLowerCase();
var s2 = parts.skip(i + 1).join();
- String suggestion = '$s1$s2';
+ var suggestion = '$s1$s2';
result.add(suggestion);
}
return result;
@@ -32,27 +32,25 @@
if (isMethod) {
// If we're in a build() method, use 'build' as the name prefix.
- MethodDeclaration method =
- assignedExpression.thisOrAncestorOfType<MethodDeclaration>();
+ var method = assignedExpression.thisOrAncestorOfType<MethodDeclaration>();
if (method != null) {
- String enclosingName = method.name?.name;
+ var enclosingName = method.name?.name;
if (enclosingName != null && enclosingName.startsWith('build')) {
prefix = 'build';
}
}
}
- Set<String> res = {};
+ var res = <String>{};
// use expression
if (assignedExpression != null) {
- String nameFromExpression = _getBaseNameFromExpression(assignedExpression);
+ var nameFromExpression = _getBaseNameFromExpression(assignedExpression);
if (nameFromExpression != null) {
nameFromExpression = removeStart(nameFromExpression, '_');
_addAll(excluded, res, getCamelWordCombinations(nameFromExpression),
prefix: prefix);
}
- String nameFromParent =
- _getBaseNameFromLocationInParent(assignedExpression);
+ var nameFromParent = _getBaseNameFromLocationInParent(assignedExpression);
if (nameFromParent != null) {
_addAll(excluded, res, getCamelWordCombinations(nameFromParent));
}
@@ -79,9 +77,9 @@
String text, Set<String> excluded) {
// filter out everything except of letters and white spaces
{
- StringBuffer sb = StringBuffer();
- for (int i = 0; i < text.length; i++) {
- int c = text.codeUnitAt(i);
+ var sb = StringBuffer();
+ for (var i = 0; i < text.length; i++) {
+ var c = text.codeUnitAt(i);
if (isLetter(c) || isWhitespace(c)) {
sb.writeCharCode(c);
}
@@ -90,10 +88,10 @@
}
// make single camel-case text
{
- List<String> words = text.split(' ');
- StringBuffer sb = StringBuffer();
- for (int i = 0; i < words.length; i++) {
- String word = words[i];
+ var words = text.split(' ');
+ var sb = StringBuffer();
+ for (var i = 0; i < words.length; i++) {
+ var word = words[i];
if (i > 0) {
word = capitalize(word);
}
@@ -102,7 +100,7 @@
text = sb.toString();
}
// split camel-case into separate suggested names
- Set<String> res = {};
+ var res = <String>{};
_addAll(excluded, res, getCamelWordCombinations(text));
return List.from(res);
}
@@ -110,11 +108,11 @@
/// Adds [toAdd] items which are not excluded.
void _addAll(Set<String> excluded, Set<String> result, Iterable<String> toAdd,
{String prefix}) {
- for (String item in toAdd) {
+ for (var item in toAdd) {
// add name based on "item", but not "excluded"
- for (int suffix = 1;; suffix++) {
+ for (var suffix = 1;; suffix++) {
// prepare name, just "item" or "item2", "item3", etc
- String name = item;
+ var name = item;
if (suffix > 1) {
name += suffix.toString();
}
@@ -130,7 +128,7 @@
/// Adds to [result] either [c] or the first ASCII character after it.
void _addSingleCharacterName(Set<String> excluded, Set<String> result, int c) {
while (c < 0x7A) {
- String name = String.fromCharCode(c);
+ var name = String.fromCharCode(c);
// may be done
if (!excluded.contains(name)) {
result.add(name);
@@ -153,13 +151,13 @@
String _getBaseNameFromLocationInParent(Expression expression) {
// value in named expression
if (expression.parent is NamedExpression) {
- NamedExpression namedExpression = expression.parent as NamedExpression;
+ var namedExpression = expression.parent as NamedExpression;
if (namedExpression.expression == expression) {
return namedExpression.name.label.name;
}
}
// positional argument
- ParameterElement parameter = expression.staticParameterElement;
+ var parameter = expression.staticParameterElement;
if (parameter != null) {
return parameter.displayName;
}
@@ -179,17 +177,17 @@
} else if (expression is MethodInvocation) {
name = expression.methodName.name;
} else if (expression is InstanceCreationExpression) {
- ConstructorName constructorName = expression.constructorName;
- TypeName typeName = constructorName.type;
+ var constructorName = expression.constructorName;
+ var typeName = constructorName.type;
if (typeName != null) {
- Identifier typeNameIdentifier = typeName.name;
+ var typeNameIdentifier = typeName.name;
// new ClassName()
if (typeNameIdentifier is SimpleIdentifier) {
return typeNameIdentifier.name;
}
// new prefix.name();
if (typeNameIdentifier is PrefixedIdentifier) {
- PrefixedIdentifier prefixed = typeNameIdentifier;
+ var prefixed = typeNameIdentifier;
// new prefix.ClassName()
if (prefixed.prefix.staticElement is PrefixElement) {
return prefixed.identifier.name;
@@ -206,8 +204,8 @@
}
// strip known prefixes
if (name != null) {
- for (int i = 0; i < _KNOWN_METHOD_NAME_PREFIXES.length; i++) {
- String curr = _KNOWN_METHOD_NAME_PREFIXES[i];
+ for (var i = 0; i < _KNOWN_METHOD_NAME_PREFIXES.length; i++) {
+ var curr = _KNOWN_METHOD_NAME_PREFIXES[i];
if (name.startsWith(curr)) {
if (name == curr) {
return null;
diff --git a/pkg/analysis_server/lib/src/services/correction/namespace.dart b/pkg/analysis_server/lib/src/services/correction/namespace.dart
index 976917f..f80cee9 100644
--- a/pkg/analysis_server/lib/src/services/correction/namespace.dart
+++ b/pkg/analysis_server/lib/src/services/correction/namespace.dart
@@ -16,8 +16,7 @@
/// Returns the export namespace of the given [LibraryElement].
Map<String, Element> getExportNamespaceForLibrary(LibraryElement library) {
- Namespace namespace =
- NamespaceBuilder().createExportNamespaceForLibrary(library);
+ var namespace = NamespaceBuilder().createExportNamespaceForLibrary(library);
return namespace.definedNames;
}
@@ -25,7 +24,7 @@
/// the node does not reference a prefix or if we cannot determine which import
/// is being referenced.
ImportElement getImportElement(SimpleIdentifier prefixNode) {
- AstNode parent = prefixNode.parent;
+ var parent = prefixNode.parent;
if (parent is ImportDirective) {
return parent.element;
}
@@ -50,16 +49,16 @@
if (element.enclosingElement is! CompilationUnitElement) {
return null;
}
- LibraryElement usedLibrary = element.library;
+ var usedLibrary = element.library;
// find ImportElement that imports used library with used prefix
List<ImportElement> candidates;
- for (ImportElement importElement in libraryElement.imports) {
+ for (var importElement in libraryElement.imports) {
// required library
if (importElement.importedLibrary != usedLibrary) {
continue;
}
// required prefix
- PrefixElement prefixElement = importElement.prefix;
+ var prefixElement = importElement.prefix;
if (prefix == null) {
if (prefixElement != null) {
continue;
@@ -89,17 +88,17 @@
return candidates[0];
}
// ensure that each ImportElement has set of elements
- for (ImportElement importElement in candidates) {
+ for (var importElement in candidates) {
if (importElementsMap.containsKey(importElement)) {
continue;
}
- Namespace namespace = importElement.namespace;
- Set<Element> elements = Set.from(namespace.definedNames.values);
+ var namespace = importElement.namespace;
+ var elements = Set<Element>.from(namespace.definedNames.values);
importElementsMap[importElement] = elements;
}
// use import namespace to choose correct one
- for (ImportElement importElement in importElementsMap.keys) {
- Set<Element> elements = importElementsMap[importElement];
+ for (var importElement in importElementsMap.keys) {
+ var elements = importElementsMap[importElement];
if (elements.contains(element)) {
return importElement;
}
@@ -112,19 +111,19 @@
/// [PrefixElement], maybe `null`.
ImportElement internal_getImportElementInfo(SimpleIdentifier prefixNode) {
// prepare environment
- AstNode parent = prefixNode.parent;
- CompilationUnit unit = prefixNode.thisOrAncestorOfType<CompilationUnit>();
- LibraryElement libraryElement = unit.declaredElement.library;
+ var parent = prefixNode.parent;
+ var unit = prefixNode.thisOrAncestorOfType<CompilationUnit>();
+ var libraryElement = unit.declaredElement.library;
// prepare used element
Element usedElement;
if (parent is PrefixedIdentifier) {
- PrefixedIdentifier prefixed = parent;
+ var prefixed = parent;
if (prefixed.prefix == prefixNode) {
usedElement = prefixed.staticElement;
}
}
if (parent is MethodInvocation) {
- MethodInvocation invocation = parent;
+ var invocation = parent;
if (invocation.target == prefixNode) {
usedElement = invocation.methodName.staticElement;
}
@@ -134,8 +133,8 @@
return null;
}
// find ImportElement
- String prefix = prefixNode.name;
- Map<ImportElement, Set<Element>> importElementsMap = {};
+ var prefix = prefixNode.name;
+ var importElementsMap = <ImportElement, Set<Element>>{};
return internal_getImportElement(
libraryElement, prefix, usedElement, importElementsMap);
}
diff --git a/pkg/analysis_server/lib/src/services/correction/organize_directives.dart b/pkg/analysis_server/lib/src/services/correction/organize_directives.dart
index 98a2a16..aefd3cd 100644
--- a/pkg/analysis_server/lib/src/services/correction/organize_directives.dart
+++ b/pkg/analysis_server/lib/src/services/correction/organize_directives.dart
@@ -34,10 +34,10 @@
List<SourceEdit> organize() {
_organizeDirectives();
// prepare edits
- List<SourceEdit> edits = <SourceEdit>[];
+ var edits = <SourceEdit>[];
if (code != initialCode) {
- int suffixLength = findCommonSuffix(initialCode, code);
- SourceEdit edit = SourceEdit(0, initialCode.length - suffixLength,
+ var suffixLength = findCommonSuffix(initialCode, code);
+ var edit = SourceEdit(0, initialCode.length - suffixLength,
code.substring(0, code.length - suffixLength));
edits.add(edit);
}
@@ -45,7 +45,7 @@
}
bool _isUnusedImport(UriBasedDirective directive) {
- for (AnalysisError error in errors) {
+ for (var error in errors) {
if ((error.errorCode == HintCode.DUPLICATE_IMPORT ||
error.errorCode == HintCode.UNUSED_IMPORT) &&
directive.uri.offset == error.offset) {
@@ -58,15 +58,15 @@
/// Organize all [Directive]s.
void _organizeDirectives() {
var lineInfo = unit.lineInfo;
- List<_DirectiveInfo> directives = [];
- for (Directive directive in unit.directives) {
+ var directives = <_DirectiveInfo>[];
+ for (var directive in unit.directives) {
if (directive is UriBasedDirective) {
- _DirectivePriority priority = getDirectivePriority(directive);
+ var priority = getDirectivePriority(directive);
if (priority != null) {
- int offset = directive.offset;
+ var offset = directive.offset;
- int end = directive.end;
- int line = lineInfo.getLocation(end).lineNumber;
+ var end = directive.end;
+ var line = lineInfo.getLocation(end).lineNumber;
Token comment = directive.endToken.next.precedingComments;
while (comment != null) {
if (lineInfo.getLocation(comment.offset).lineNumber == line) {
@@ -75,8 +75,8 @@
comment = comment.next;
}
- String text = code.substring(offset, end);
- String uriContent = directive.uri.stringValue;
+ var text = code.substring(offset, end);
+ var uriContent = directive.uri.stringValue;
directives.add(
_DirectiveInfo(
directive,
@@ -94,18 +94,18 @@
if (directives.isEmpty) {
return;
}
- int firstDirectiveOffset = directives.first.offset;
- int lastDirectiveEnd = directives.last.end;
+ var firstDirectiveOffset = directives.first.offset;
+ var lastDirectiveEnd = directives.last.end;
// sort
directives.sort();
// append directives with grouping
String directivesCode;
{
- StringBuffer sb = StringBuffer();
+ var sb = StringBuffer();
_DirectivePriority currentPriority;
- for (_DirectiveInfo directiveInfo in directives) {
+ for (var directiveInfo in directives) {
if (!hasUnresolvedIdentifierError) {
- UriBasedDirective directive = directiveInfo.directive;
+ var directive = directiveInfo.directive;
if (removeUnused && _isUnusedImport(directive)) {
continue;
}
@@ -123,13 +123,13 @@
directivesCode = directivesCode.trimRight();
}
// prepare code
- String beforeDirectives = code.substring(0, firstDirectiveOffset);
- String afterDirectives = code.substring(lastDirectiveEnd);
+ var beforeDirectives = code.substring(0, firstDirectiveOffset);
+ var afterDirectives = code.substring(lastDirectiveEnd);
code = beforeDirectives + directivesCode + afterDirectives;
}
static _DirectivePriority getDirectivePriority(UriBasedDirective directive) {
- String uriContent = directive.uri.stringValue;
+ var uriContent = directive.uri.stringValue;
if (directive is ImportDirective) {
if (uriContent.startsWith('dart:')) {
return _DirectivePriority.IMPORT_SDK;
@@ -203,8 +203,8 @@
String toString() => '(priority=$priority; text=$text)';
static int _compareUri(String a, String b) {
- List<String> aList = _splitUri(a);
- List<String> bList = _splitUri(b);
+ var aList = _splitUri(a);
+ var bList = _splitUri(b);
int result;
if ((result = aList[0].compareTo(bList[0])) != 0) return result;
if ((result = aList[1].compareTo(bList[1])) != 0) return result;
@@ -214,7 +214,7 @@
/// Split the given [uri] like `package:some.name/and/path.dart` into a list
/// like `[package:some.name, and/path.dart]`.
static List<String> _splitUri(String uri) {
- int index = uri.indexOf('/');
+ var index = uri.indexOf('/');
if (index == -1) {
return <String>[uri, ''];
}
diff --git a/pkg/analysis_server/lib/src/services/correction/selection_analyzer.dart b/pkg/analysis_server/lib/src/services/correction/selection_analyzer.dart
index 7c50902..deac73d 100644
--- a/pkg/analysis_server/lib/src/services/correction/selection_analyzer.dart
+++ b/pkg/analysis_server/lib/src/services/correction/selection_analyzer.dart
@@ -78,7 +78,7 @@
@override
void visitNode(AstNode node) {
- SourceRange nodeRange = range.node(node);
+ var nodeRange = range.node(node);
if (selection.covers(nodeRange)) {
if (isFirstNode) {
handleFirstSelectedNode(node);
diff --git a/pkg/analysis_server/lib/src/services/correction/sort_members.dart b/pkg/analysis_server/lib/src/services/correction/sort_members.dart
index 98af241..586b5a6 100644
--- a/pkg/analysis_server/lib/src/services/correction/sort_members.dart
+++ b/pkg/analysis_server/lib/src/services/correction/sort_members.dart
@@ -58,24 +58,24 @@
// would confuse the offsets used by the other sort functions.
_sortUnitDirectives();
// prepare edits
- List<SourceEdit> edits = <SourceEdit>[];
+ var edits = <SourceEdit>[];
if (code != initialCode) {
- SimpleDiff diff = computeSimpleDiff(initialCode, code);
- SourceEdit edit = SourceEdit(diff.offset, diff.length, diff.replacement);
+ var diff = computeSimpleDiff(initialCode, code);
+ var edit = SourceEdit(diff.offset, diff.length, diff.replacement);
edits.add(edit);
}
return edits;
}
void _sortAndReorderMembers(List<_MemberInfo> members) {
- List<_MemberInfo> membersSorted = _getSortedMembers(members);
- int size = membersSorted.length;
- for (int i = 0; i < size; i++) {
- _MemberInfo newInfo = membersSorted[size - 1 - i];
- _MemberInfo oldInfo = members[size - 1 - i];
+ var membersSorted = _getSortedMembers(members);
+ var size = membersSorted.length;
+ for (var i = 0; i < size; i++) {
+ var newInfo = membersSorted[size - 1 - i];
+ var oldInfo = members[size - 1 - i];
if (newInfo != oldInfo) {
- String beforeCode = code.substring(0, oldInfo.offset);
- String afterCode = code.substring(oldInfo.end);
+ var beforeCode = code.substring(0, oldInfo.offset);
+ var afterCode = code.substring(oldInfo.end);
code = beforeCode + newInfo.text + afterCode;
}
}
@@ -83,7 +83,7 @@
/// Sorts all members of all [ClassOrMixinDeclaration]s.
void _sortClassesMembers() {
- for (CompilationUnitMember unitMember in unit.declarations) {
+ for (var unitMember in unit.declarations) {
if (unitMember is ClassOrMixinDeclaration) {
_sortClassMembers(unitMember);
}
@@ -92,14 +92,14 @@
/// Sorts all members of the given [classDeclaration].
void _sortClassMembers(ClassOrMixinDeclaration classDeclaration) {
- List<_MemberInfo> members = <_MemberInfo>[];
- for (ClassMember member in classDeclaration.members) {
+ var members = <_MemberInfo>[];
+ for (var member in classDeclaration.members) {
_MemberKind kind;
- bool isStatic = false;
+ var isStatic = false;
String name;
if (member is ConstructorDeclaration) {
kind = _MemberKind.CLASS_CONSTRUCTOR;
- SimpleIdentifier nameNode = member.name;
+ var nameNode = member.name;
if (nameNode == null) {
name = '';
} else {
@@ -107,7 +107,7 @@
}
}
if (member is FieldDeclaration) {
- FieldDeclaration fieldDeclaration = member;
+ var fieldDeclaration = member;
List<VariableDeclaration> fields = fieldDeclaration.fields.variables;
if (fields.isNotEmpty) {
kind = _MemberKind.CLASS_FIELD;
@@ -116,7 +116,7 @@
}
}
if (member is MethodDeclaration) {
- MethodDeclaration method = member;
+ var method = member;
isStatic = method.isStatic;
name = method.name.name;
if (method.isGetter) {
@@ -130,10 +130,10 @@
}
}
if (name != null) {
- _PriorityItem item = _PriorityItem.forName(isStatic, name, kind);
- int offset = member.offset;
- int length = member.length;
- String text = code.substring(offset, offset + length);
+ var item = _PriorityItem.forName(isStatic, name, kind);
+ var offset = member.offset;
+ var length = member.length;
+ var text = code.substring(offset, offset + length);
members.add(_MemberInfo(item, name, offset, length, text));
}
}
@@ -143,17 +143,17 @@
/// Sorts all [Directive]s.
void _sortUnitDirectives() {
- bool hasLibraryDirective = false;
- List<_DirectiveInfo> directives = [];
- for (Directive directive in unit.directives) {
+ var hasLibraryDirective = false;
+ var directives = <_DirectiveInfo>[];
+ for (var directive in unit.directives) {
if (directive is LibraryDirective) {
hasLibraryDirective = true;
}
if (directive is! UriBasedDirective) {
continue;
}
- UriBasedDirective uriDirective = directive as UriBasedDirective;
- String uriContent = uriDirective.uri.stringValue;
+ var uriDirective = directive as UriBasedDirective;
+ var uriContent = uriDirective.uri.stringValue;
_DirectivePriority kind;
if (directive is ImportDirective) {
if (uriContent.startsWith('dart:')) {
@@ -192,9 +192,9 @@
annotationText = code.substring(directive.metadata.beginToken.offset,
directive.metadata.endToken.end);
}
- int offset = directive.firstTokenAfterCommentAndMetadata.offset;
- int length = directive.end - offset;
- String text = code.substring(offset, offset + length);
+ var offset = directive.firstTokenAfterCommentAndMetadata.offset;
+ var length = directive.end - offset;
+ var text = code.substring(offset, offset + length);
directives.add(_DirectiveInfo(directive, kind, uriContent,
documentationText, annotationText, text));
}
@@ -203,8 +203,8 @@
if (directives.isEmpty) {
return;
}
- int firstDirectiveOffset = directives[0].directive.offset;
- int lastDirectiveEnd = directives[directives.length - 1].directive.end;
+ var firstDirectiveOffset = directives[0].directive.offset;
+ var lastDirectiveEnd = directives[directives.length - 1].directive.end;
// Without a library directive, the library comment is the comment of the
// first directive.
_DirectiveInfo libraryDocumentationDirective;
@@ -216,11 +216,11 @@
// append directives with grouping
String directivesCode;
{
- StringBuffer sb = StringBuffer();
- String endOfLine = this.endOfLine;
+ var sb = StringBuffer();
+ var endOfLine = this.endOfLine;
_DirectivePriority currentPriority;
- bool firstOutputDirective = true;
- for (_DirectiveInfo directive in directives) {
+ var firstOutputDirective = true;
+ for (var directive in directives) {
if (currentPriority != directive.priority) {
if (sb.length != 0) {
sb.write(endOfLine);
@@ -251,15 +251,15 @@
directivesCode = directivesCode.trimRight();
}
// prepare code
- String beforeDirectives = code.substring(0, firstDirectiveOffset);
- String afterDirectives = code.substring(lastDirectiveEnd);
+ var beforeDirectives = code.substring(0, firstDirectiveOffset);
+ var afterDirectives = code.substring(lastDirectiveEnd);
code = beforeDirectives + directivesCode + afterDirectives;
}
/// Sorts all [CompilationUnitMember]s.
void _sortUnitMembers() {
- List<_MemberInfo> members = [];
- for (CompilationUnitMember member in unit.declarations) {
+ var members = <_MemberInfo>[];
+ for (var member in unit.declarations) {
_MemberKind kind;
String name;
if (member is ClassOrMixinDeclaration) {
@@ -275,7 +275,7 @@
kind = _MemberKind.UNIT_EXTENSION;
name = member.name?.name ?? '';
} else if (member is FunctionDeclaration) {
- FunctionDeclaration function = member;
+ var function = member;
name = function.name.name;
if (function.isGetter) {
kind = _MemberKind.UNIT_ACCESSOR;
@@ -297,7 +297,7 @@
kind = _MemberKind.UNIT_GENERIC_TYPE_ALIAS;
name = member.name.name;
} else if (member is TopLevelVariableDeclaration) {
- TopLevelVariableDeclaration variableDeclaration = member;
+ var variableDeclaration = member;
List<VariableDeclaration> variables =
variableDeclaration.variables.variables;
if (variables.isNotEmpty) {
@@ -310,10 +310,10 @@
}
}
if (name != null) {
- _PriorityItem item = _PriorityItem.forName(false, name, kind);
- int offset = member.offset;
- int length = member.length;
- String text = code.substring(offset, offset + length);
+ var item = _PriorityItem.forName(false, name, kind);
+ var offset = member.offset;
+ var length = member.length;
+ var text = code.substring(offset, offset + length);
members.add(_MemberInfo(item, name, offset, length, text));
}
}
@@ -331,7 +331,7 @@
}
static int _getPriority(_PriorityItem item) {
- for (int i = 0; i < _PRIORITY_ITEMS.length; i++) {
+ for (var i = 0; i < _PRIORITY_ITEMS.length; i++) {
if (_PRIORITY_ITEMS[i] == item) {
return i;
}
@@ -340,18 +340,18 @@
}
static List<_MemberInfo> _getSortedMembers(List<_MemberInfo> members) {
- List<_MemberInfo> membersSorted = List<_MemberInfo>.from(members);
+ var membersSorted = List<_MemberInfo>.from(members);
membersSorted.sort((_MemberInfo o1, _MemberInfo o2) {
- int priority1 = _getPriority(o1.item);
- int priority2 = _getPriority(o2.item);
+ var priority1 = _getPriority(o1.item);
+ var priority2 = _getPriority(o2.item);
if (priority1 == priority2) {
// don't reorder class fields
if (o1.item.kind == _MemberKind.CLASS_FIELD) {
return o1.offset - o2.offset;
}
// sort all other members by name
- String name1 = o1.name.toLowerCase();
- String name2 = o2.name.toLowerCase();
+ var name1 = o1.name.toLowerCase();
+ var name2 = o2.name.toLowerCase();
return name1.compareTo(name2);
}
return priority1 - priority2;
@@ -383,8 +383,8 @@
String toString() => '(priority=$priority; text=$text)';
static int _compareUri(String a, String b) {
- List<String> aList = _splitUri(a);
- List<String> bList = _splitUri(b);
+ var aList = _splitUri(a);
+ var bList = _splitUri(b);
int result;
if ((result = aList[0].compareTo(bList[0])) != 0) return result;
if ((result = aList[1].compareTo(bList[1])) != 0) return result;
@@ -394,7 +394,7 @@
/// Split the given [uri] like `package:some.name/and/path.dart` into a list
/// like `[package:some.name, and/path.dart]`.
static List<String> _splitUri(String uri) {
- int index = uri.indexOf('/');
+ var index = uri.indexOf('/');
if (index == -1) {
return <String>[uri, ''];
}
@@ -472,13 +472,13 @@
_PriorityItem(this.isStatic, this.kind, this.isPrivate);
factory _PriorityItem.forName(bool isStatic, String name, _MemberKind kind) {
- bool isPrivate = Identifier.isPrivateName(name);
+ var isPrivate = Identifier.isPrivateName(name);
return _PriorityItem(isStatic, kind, isPrivate);
}
@override
bool operator ==(Object obj) {
- _PriorityItem other = obj as _PriorityItem;
+ var other = obj as _PriorityItem;
if (kind == _MemberKind.CLASS_FIELD) {
return other.kind == kind && other.isStatic == isStatic;
}
diff --git a/pkg/analysis_server/lib/src/services/correction/statement_analyzer.dart b/pkg/analysis_server/lib/src/services/correction/statement_analyzer.dart
index a081522..b1ce6a5 100644
--- a/pkg/analysis_server/lib/src/services/correction/statement_analyzer.dart
+++ b/pkg/analysis_server/lib/src/services/correction/statement_analyzer.dart
@@ -19,10 +19,10 @@
/// tokens or some exception happens.
List<Token> _getTokens(String text, FeatureSet featureSet) {
try {
- List<Token> tokens = <Token>[];
- Scanner scanner = Scanner(null, CharSequenceReader(text), null)
+ var tokens = <Token>[];
+ var scanner = Scanner(null, CharSequenceReader(text), null)
..configureFeatures(featureSet);
- Token token = scanner.tokenize();
+ var token = scanner.tokenize();
while (token.type != TokenType.EOF) {
tokens.add(token);
token = token.next;
@@ -66,10 +66,10 @@
}
// check that selection does not begin/end in comment
{
- int selectionStart = selection.offset;
- int selectionEnd = selection.end;
- List<SourceRange> commentRanges = getCommentRanges(resolveResult.unit);
- for (SourceRange commentRange in commentRanges) {
+ var selectionStart = selection.offset;
+ var selectionEnd = selection.end;
+ var commentRanges = getCommentRanges(resolveResult.unit);
+ for (var commentRange in commentRanges) {
if (commentRange.contains(selectionStart)) {
invalidSelection('Selection begins inside a comment.');
}
@@ -88,7 +88,7 @@
@override
Object visitDoStatement(DoStatement node) {
super.visitDoStatement(node);
- List<AstNode> selectedNodes = this.selectedNodes;
+ var selectedNodes = this.selectedNodes;
if (_contains(selectedNodes, node.body)) {
invalidSelection(
"Operation not applicable to a 'do' statement's body and expression.");
@@ -101,7 +101,7 @@
super.visitForStatement(node);
var forLoopParts = node.forLoopParts;
if (forLoopParts is ForParts) {
- List<AstNode> selectedNodes = this.selectedNodes;
+ var selectedNodes = this.selectedNodes;
bool containsInit;
if (forLoopParts is ForPartsWithExpression) {
containsInit = _contains(selectedNodes, forLoopParts.initialization);
@@ -110,10 +110,9 @@
} else {
throw StateError('Unrecognized for loop parts');
}
- bool containsCondition = _contains(selectedNodes, forLoopParts.condition);
- bool containsUpdaters =
- _containsAny(selectedNodes, forLoopParts.updaters);
- bool containsBody = _contains(selectedNodes, node.body);
+ var containsCondition = _contains(selectedNodes, forLoopParts.condition);
+ var containsUpdaters = _containsAny(selectedNodes, forLoopParts.updaters);
+ var containsBody = _contains(selectedNodes, node.body);
if (containsInit && containsCondition) {
invalidSelection(
"Operation not applicable to a 'for' statement's initializer and condition.");
@@ -131,9 +130,9 @@
@override
Object visitSwitchStatement(SwitchStatement node) {
super.visitSwitchStatement(node);
- List<AstNode> selectedNodes = this.selectedNodes;
+ var selectedNodes = this.selectedNodes;
List<SwitchMember> switchMembers = node.members;
- for (AstNode selectedNode in selectedNodes) {
+ for (var selectedNode in selectedNodes) {
if (switchMembers.contains(selectedNode)) {
invalidSelection(
'Selection must either cover whole switch statement or parts of a single case block.');
@@ -146,7 +145,7 @@
@override
Object visitTryStatement(TryStatement node) {
super.visitTryStatement(node);
- AstNode firstSelectedNode = this.firstSelectedNode;
+ var firstSelectedNode = this.firstSelectedNode;
if (firstSelectedNode != null) {
if (firstSelectedNode == node.body ||
firstSelectedNode == node.finallyBlock) {
@@ -154,7 +153,7 @@
'Selection must either cover whole try statement or parts of try, catch, or finally block.');
} else {
List<CatchClause> catchClauses = node.catchClauses;
- for (CatchClause catchClause in catchClauses) {
+ for (var catchClause in catchClauses) {
if (firstSelectedNode == catchClause ||
firstSelectedNode == catchClause.body ||
firstSelectedNode == catchClause.exceptionParameter) {
@@ -170,7 +169,7 @@
@override
Object visitWhileStatement(WhileStatement node) {
super.visitWhileStatement(node);
- List<AstNode> selectedNodes = this.selectedNodes;
+ var selectedNodes = this.selectedNodes;
if (_contains(selectedNodes, node.condition) &&
_contains(selectedNodes, node.body)) {
invalidSelection(
@@ -181,11 +180,11 @@
/// Checks final selected [AstNode]s after processing [CompilationUnit].
void _checkSelectedNodes(CompilationUnit unit) {
- List<AstNode> nodes = selectedNodes;
+ var nodes = selectedNodes;
// some tokens before first selected node
{
- AstNode firstNode = nodes[0];
- SourceRange rangeBeforeFirstNode =
+ var firstNode = nodes[0];
+ var rangeBeforeFirstNode =
range.startOffsetEndOffset(selection.offset, firstNode.offset);
if (_hasTokens(rangeBeforeFirstNode)) {
invalidSelection(
@@ -196,8 +195,8 @@
}
// some tokens after last selected node
{
- AstNode lastNode = nodes.last;
- SourceRange rangeAfterLastNode =
+ var lastNode = nodes.last;
+ var rangeAfterLastNode =
range.startOffsetEndOffset(lastNode.end, selection.end);
if (_hasTokens(rangeAfterLastNode)) {
invalidSelection(
@@ -210,8 +209,8 @@
/// Returns `true` if there are [Token]s in the given [SourceRange].
bool _hasTokens(SourceRange range) {
- String fullText = resolveResult.content;
- String rangeText = fullText.substring(range.offset, range.end);
+ var fullText = resolveResult.content;
+ var rangeText = fullText.substring(range.offset, range.end);
return _getTokens(rangeText, resolveResult.unit.featureSet).isNotEmpty;
}
@@ -221,7 +220,7 @@
/// Returns `true` if [nodes] contains one of the [otherNodes].
static bool _containsAny(List<AstNode> nodes, List<AstNode> otherNodes) {
- for (AstNode otherNode in otherNodes) {
+ for (var otherNode in otherNodes) {
if (nodes.contains(otherNode)) {
return true;
}
diff --git a/pkg/analysis_server/lib/src/services/correction/status.dart b/pkg/analysis_server/lib/src/services/correction/status.dart
index 1e4c523..20c2268 100644
--- a/pkg/analysis_server/lib/src/services/correction/status.dart
+++ b/pkg/analysis_server/lib/src/services/correction/status.dart
@@ -18,21 +18,21 @@
/// Creates a new [RefactoringStatus] with the ERROR severity.
factory RefactoringStatus.error(String msg, [Location location]) {
- RefactoringStatus status = RefactoringStatus();
+ var status = RefactoringStatus();
status.addError(msg, location);
return status;
}
/// Creates a new [RefactoringStatus] with the FATAL severity.
factory RefactoringStatus.fatal(String msg, [Location location]) {
- RefactoringStatus status = RefactoringStatus();
+ var status = RefactoringStatus();
status.addFatalError(msg, location);
return status;
}
/// Creates a new [RefactoringStatus] with the WARNING severity.
factory RefactoringStatus.warning(String msg, [Location location]) {
- RefactoringStatus status = RefactoringStatus();
+ var status = RefactoringStatus();
status.addWarning(msg, location);
return status;
}
@@ -55,7 +55,7 @@
/// Returns the message of the [RefactoringProblem] with highest severity;
/// may be `null` if no problems.
String get message {
- RefactoringProblem problem = this.problem;
+ var problem = this.problem;
if (problem == null) {
return null;
}
@@ -66,7 +66,7 @@
///
/// Returns `null` if no entries.
RefactoringProblem get problem {
- for (RefactoringProblem problem in problems) {
+ for (var problem in problems) {
if (problem.severity == _severity) {
return problem;
}
@@ -112,7 +112,7 @@
@override
String toString() {
- StringBuffer sb = StringBuffer();
+ var sb = StringBuffer();
sb.write('<');
if (_severity == null) {
sb.write('OK');
@@ -121,7 +121,7 @@
}
if (!isOK) {
sb.write('\n');
- for (RefactoringProblem problem in problems) {
+ for (var problem in problems) {
sb.write('\t');
sb.write(problem);
sb.write('\n');
@@ -135,7 +135,7 @@
void _addProblem(RefactoringProblem problem) {
problems.add(problem);
// update maximum severity
- RefactoringProblemSeverity severity = problem.severity;
+ var severity = problem.severity;
_severity = RefactoringProblemSeverity.max(_severity, severity);
}
}
diff --git a/pkg/analysis_server/lib/src/services/correction/util.dart b/pkg/analysis_server/lib/src/services/correction/util.dart
index c0cc9f0..bd5d17b 100644
--- a/pkg/analysis_server/lib/src/services/correction/util.dart
+++ b/pkg/analysis_server/lib/src/services/correction/util.dart
@@ -33,11 +33,11 @@
var libraryPath = targetLibrary.source.fullName;
var resolveResult = await session.getResolvedUnit(libraryPath);
var libUtils = CorrectionUtils(resolveResult);
- String eol = libUtils.endOfLine;
+ var eol = libUtils.endOfLine;
// Prepare information about existing imports.
LibraryDirective libraryDirective;
- List<_ImportDirectiveInfo> importDirectives = <_ImportDirectiveInfo>[];
- for (Directive directive in libUtils.unit.directives) {
+ var importDirectives = <_ImportDirectiveInfo>[];
+ for (var directive in libUtils.unit.directives) {
if (directive is LibraryDirective) {
libraryDirective = directive;
} else if (directive is ImportDirective) {
@@ -47,7 +47,7 @@
}
// Prepare all URIs to import.
- List<String> uriList = libraries
+ var uriList = libraries
.map((library) => getLibrarySourceUri(
session.resourceProvider.pathContext, targetLibrary, library.uri))
.toList();
@@ -55,12 +55,12 @@
// Insert imports: between existing imports.
if (importDirectives.isNotEmpty) {
- bool isFirstPackage = true;
- for (String importUri in uriList) {
- bool inserted = false;
- bool isPackage = importUri.startsWith('package:');
- bool isAfterDart = false;
- for (_ImportDirectiveInfo existingImport in importDirectives) {
+ var isFirstPackage = true;
+ for (var importUri in uriList) {
+ var inserted = false;
+ var isPackage = importUri.startsWith('package:');
+ var isAfterDart = false;
+ for (var existingImport in importDirectives) {
if (existingImport.uri.startsWith('dart:')) {
isAfterDart = true;
}
@@ -68,7 +68,7 @@
isFirstPackage = false;
}
if (importUri.compareTo(existingImport.uri) < 0) {
- String importCode = "import '$importUri';$eol";
+ var importCode = "import '$importUri';$eol";
doSourceChange_addElementEdit(change, targetLibrary,
SourceEdit(existingImport.offset, 0, importCode));
inserted = true;
@@ -76,7 +76,7 @@
}
}
if (!inserted) {
- String importCode = "${eol}import '$importUri';";
+ var importCode = "${eol}import '$importUri';";
if (isPackage && isFirstPackage && isAfterDart) {
importCode = eol + importCode;
}
@@ -92,9 +92,9 @@
// Insert imports: after the library directive.
if (libraryDirective != null) {
- String prefix = eol + eol;
- for (String importUri in uriList) {
- String importCode = "${prefix}import '$importUri';";
+ var prefix = eol + eol;
+ for (var importUri in uriList) {
+ var importCode = "${prefix}import '$importUri';";
prefix = eol;
doSourceChange_addElementEdit(change, targetLibrary,
SourceEdit(libraryDirective.end, 0, importCode));
@@ -104,11 +104,11 @@
// If still at the beginning of the file, skip shebang and line comments.
{
- CorrectionUtils_InsertDesc desc = libUtils.getInsertDescTop();
- int offset = desc.offset;
- for (int i = 0; i < uriList.length; i++) {
- String importUri = uriList[i];
- String importCode = "import '$importUri';$eol";
+ var desc = libUtils.getInsertDescTop();
+ var offset = desc.offset;
+ for (var i = 0; i < uriList.length; i++) {
+ var importUri = uriList[i];
+ var importCode = "import '$importUri';$eol";
if (i == 0) {
importCode = desc.prefix + importCode;
}
@@ -125,7 +125,7 @@
/// [node].
Expression climbPropertyAccess(AstNode node) {
while (true) {
- AstNode parent = node.parent;
+ var parent = node.parent;
if (parent is PrefixedIdentifier && parent.identifier == node) {
node = parent;
continue;
@@ -151,8 +151,8 @@
///
/// Returns [SourceRange]s of all comments in [unit].
List<SourceRange> getCommentRanges(CompilationUnit unit) {
- List<SourceRange> ranges = <SourceRange>[];
- Token token = unit.beginToken;
+ var ranges = <SourceRange>[];
+ var token = unit.beginToken;
while (token != null && token.type != TokenType.EOF) {
Token commentToken = token.precedingComments;
while (commentToken != null) {
@@ -207,7 +207,7 @@
/// Returns the name to display in the UI for the given [Element].
String getElementQualifiedName(Element element) {
- ElementKind kind = element.kind;
+ var kind = element.kind;
if (kind == ElementKind.CONSTRUCTOR ||
kind == ElementKind.FIELD ||
kind == ElementKind.METHOD) {
@@ -224,7 +224,7 @@
/// Returns a class or an unit member enclosing the given [node].
AstNode getEnclosingClassOrUnitMember(AstNode node) {
- AstNode member = node;
+ var member = node;
while (node != null) {
if (node is ClassDeclaration) {
return member;
@@ -282,7 +282,7 @@
///
/// The reason is that `(expr)` is always executed after `expr`.
Precedence getExpressionParentPrecedence(AstNode node) {
- AstNode parent = node.parent;
+ var parent = node.parent;
if (parent is ParenthesizedExpression) {
return Precedence.assignment;
} else if (parent is IndexExpression && parent.index == node) {
@@ -318,8 +318,8 @@
String getLibrarySourceUri(
pathos.Context pathContext, LibraryElement from, Uri what) {
if (what.scheme == 'file') {
- String fromFolder = pathContext.dirname(from.source.fullName);
- String relativeFile = pathContext.relative(what.path, from: fromFolder);
+ var fromFolder = pathContext.dirname(from.source.fullName);
+ var relativeFile = pathContext.relative(what.path, from: fromFolder);
return pathContext.split(relativeFile).join('/');
}
return what.toString();
@@ -328,9 +328,9 @@
/// Returns the line prefix from the given source, i.e. basically just a
/// whitespace prefix of the given [String].
String getLinePrefix(String line) {
- int index = 0;
+ var index = 0;
while (index < line.length) {
- int c = line.codeUnitAt(index);
+ var c = line.codeUnitAt(index);
if (!isWhitespace(c)) {
break;
}
@@ -342,7 +342,7 @@
/// Return the [LocalVariableElement] if given [node] is a reference to a local
/// variable, or `null` in the other case.
LocalVariableElement getLocalVariableElement(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is LocalVariableElement) {
return element;
}
@@ -356,17 +356,17 @@
return null;
}
// prepare parents
- List<List<AstNode>> parents = [];
- for (AstNode node in nodes) {
+ var parents = <List<AstNode>>[];
+ for (var node in nodes) {
parents.add(getParents(node));
}
// find min length
- int minLength = 1 << 20;
- for (List<AstNode> parentList in parents) {
+ var minLength = 1 << 20;
+ for (var parentList in parents) {
minLength = min(minLength, parentList.length);
}
// find deepest parent
- int i = 0;
+ var i = 0;
for (; i < minLength; i++) {
if (!_allListsIdentical(parents, i)) {
break;
@@ -378,7 +378,7 @@
/// Returns the [Expression] qualifier if given [node] is the name part of a
/// [PropertyAccess] or a [PrefixedIdentifier]. Maybe `null`.
Expression getNodeQualifier(SimpleIdentifier node) {
- AstNode parent = node.parent;
+ var parent = node.parent;
if (parent is MethodInvocation && identical(parent.methodName, node)) {
return parent.target;
}
@@ -394,7 +394,7 @@
/// Returns the [ParameterElement] if the given [node] is a reference to a
/// parameter, or `null` in the other case.
ParameterElement getParameterElement(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is ParameterElement) {
return element;
}
@@ -405,18 +405,18 @@
/// [node].
List<AstNode> getParents(AstNode node) {
// prepare number of parents
- int numParents = 0;
+ var numParents = 0;
{
- AstNode current = node.parent;
+ var current = node.parent;
while (current != null) {
numParents++;
current = current.parent;
}
}
// fill array of parents
- List<AstNode> parents = List<AstNode>(numParents);
- AstNode current = node.parent;
- int index = numParents;
+ var parents = List<AstNode>(numParents);
+ var current = node.parent;
+ var index = numParents;
while (current != null) {
parents[--index] = current;
current = current.parent;
@@ -427,15 +427,15 @@
/// If given [node] is name of qualified property extraction, returns target
/// from which this property is extracted, otherwise `null`.
Expression getQualifiedPropertyTarget(AstNode node) {
- AstNode parent = node.parent;
+ var parent = node.parent;
if (parent is PrefixedIdentifier) {
- PrefixedIdentifier prefixed = parent;
+ var prefixed = parent;
if (prefixed.identifier == node) {
return parent.prefix;
}
}
if (parent is PropertyAccess) {
- PropertyAccess access = parent;
+ var access = parent;
if (access.propertyName == node) {
return access.realTarget;
}
@@ -485,11 +485,11 @@
/// Return `true` if the given [node] is the name of a [NamedExpression].
bool isNamedExpressionName(SimpleIdentifier node) {
- AstNode parent = node.parent;
+ var parent = node.parent;
if (parent is Label) {
- Label label = parent;
+ var label = parent;
if (identical(label.label, node)) {
- AstNode parent2 = label.parent;
+ var parent2 = label.parent;
if (parent2 is NamedExpression) {
return identical(parent2.name, label);
}
@@ -503,7 +503,7 @@
/// [expression].
Expression stepUpNamedExpression(Expression expression) {
if (expression != null) {
- AstNode parent = expression.parent;
+ var parent = expression.parent;
if (parent is NamedExpression && parent.expression == expression) {
return parent;
}
@@ -514,7 +514,7 @@
/// Return `true` if the given [lists] are identical at the given [position].
bool _allListsIdentical(List<List> lists, int position) {
Object element = lists[0][position];
- for (List list in lists) {
+ for (var list in lists) {
if (list[position] != element) {
return false;
}
@@ -577,12 +577,11 @@
/// Returns names of elements that might conflict with a new local variable
/// declared at [offset].
Set<String> findPossibleLocalVariableConflicts(int offset) {
- Set<String> conflicts = <String>{};
- AstNode enclosingNode = findNode(offset);
- Block enclosingBlock = enclosingNode.thisOrAncestorOfType<Block>();
+ var conflicts = <String>{};
+ var enclosingNode = findNode(offset);
+ var enclosingBlock = enclosingNode.thisOrAncestorOfType<Block>();
if (enclosingBlock != null) {
- _CollectReferencedUnprefixedNames visitor =
- _CollectReferencedUnprefixedNames();
+ var visitor = _CollectReferencedUnprefixedNames();
enclosingBlock.accept(visitor);
return visitor.names;
}
@@ -596,21 +595,21 @@
/// top-level declaration at the top of the file.
CorrectionUtils_InsertDesc getInsertDescTop() {
// skip leading line comments
- int offset = 0;
- bool insertEmptyLineBefore = false;
- bool insertEmptyLineAfter = false;
- String source = _buffer;
+ var offset = 0;
+ var insertEmptyLineBefore = false;
+ var insertEmptyLineAfter = false;
+ var source = _buffer;
// skip hash-bang
if (offset < source.length - 2) {
- String linePrefix = getText(offset, 2);
+ var linePrefix = getText(offset, 2);
if (linePrefix == '#!') {
insertEmptyLineBefore = true;
offset = getLineNext(offset);
// skip empty lines to first line comment
- int emptyOffset = offset;
+ var emptyOffset = offset;
while (emptyOffset < source.length - 2) {
- int nextLineOffset = getLineNext(emptyOffset);
- String line = source.substring(emptyOffset, nextLineOffset);
+ var nextLineOffset = getLineNext(emptyOffset);
+ var line = source.substring(emptyOffset, nextLineOffset);
if (line.trim().isEmpty) {
emptyOffset = nextLineOffset;
continue;
@@ -625,7 +624,7 @@
}
// skip line comments
while (offset < source.length - 2) {
- String linePrefix = getText(offset, 2);
+ var linePrefix = getText(offset, 2);
if (linePrefix == '//') {
insertEmptyLineBefore = true;
offset = getLineNext(offset);
@@ -634,13 +633,13 @@
}
}
// determine if empty line is required after
- int nextLineOffset = getLineNext(offset);
- String insertLine = source.substring(offset, nextLineOffset);
+ var nextLineOffset = getLineNext(offset);
+ var insertLine = source.substring(offset, nextLineOffset);
if (insertLine.trim().isNotEmpty) {
insertEmptyLineAfter = true;
}
// fill InsertDesc
- CorrectionUtils_InsertDesc desc = CorrectionUtils_InsertDesc();
+ var desc = CorrectionUtils_InsertDesc();
desc.offset = offset;
if (insertEmptyLineBefore) {
desc.prefix = endOfLine;
@@ -656,10 +655,10 @@
/// If [index] the end of a statement or method, then in the most cases it is
/// a start of the next line.
int getLineContentEnd(int index) {
- int length = _buffer.length;
+ var length = _buffer.length;
// skip whitespace characters
while (index < length) {
- int c = _buffer.codeUnitAt(index);
+ var c = _buffer.codeUnitAt(index);
if (!isWhitespace(c) || isEOL(c)) {
break;
}
@@ -683,7 +682,7 @@
/// start on its line.
int getLineContentStart(int index) {
while (index > 0) {
- int c = _buffer.codeUnitAt(index - 1);
+ var c = _buffer.codeUnitAt(index - 1);
if (!isSpace(c)) {
break;
}
@@ -695,10 +694,10 @@
/// Returns a start index of the next line after the line which contains the
/// given index.
int getLineNext(int index) {
- int length = _buffer.length;
+ var length = _buffer.length;
// skip to the end of the line
while (index < length) {
- int c = _buffer.codeUnitAt(index);
+ var c = _buffer.codeUnitAt(index);
if (c == 0xD || c == 0xA) {
break;
}
@@ -718,11 +717,11 @@
/// Returns the whitespace prefix of the line which contains given offset.
String getLinePrefix(int index) {
- int lineStart = getLineThis(index);
- int length = _buffer.length;
- int lineNonWhitespace = lineStart;
+ var lineStart = getLineThis(index);
+ var length = _buffer.length;
+ var lineNonWhitespace = lineStart;
while (lineNonWhitespace < length) {
- int c = _buffer.codeUnitAt(lineNonWhitespace);
+ var c = _buffer.codeUnitAt(lineNonWhitespace);
if (c == 0xD || c == 0xA) {
break;
}
@@ -739,15 +738,15 @@
SourceRange getLinesRange(SourceRange sourceRange,
{bool skipLeadingEmptyLines = false}) {
// start
- int startOffset = sourceRange.offset;
- int startLineOffset = getLineContentStart(startOffset);
+ var startOffset = sourceRange.offset;
+ var startLineOffset = getLineContentStart(startOffset);
if (skipLeadingEmptyLines) {
startLineOffset = skipEmptyLinesLeft(startLineOffset);
}
// end
- int endOffset = sourceRange.end;
- int afterEndLineOffset = endOffset;
- int lineStart = unit.lineInfo.getOffsetOfLine(
+ var endOffset = sourceRange.end;
+ var afterEndLineOffset = endOffset;
+ var lineStart = unit.lineInfo.getOffsetOfLine(
unit.lineInfo.getLocation(startLineOffset).lineNumber - 1);
if (lineStart == startLineOffset) {
// Only consume line ends after the end of the range if there is nothing
@@ -767,7 +766,7 @@
/// Returns the start index of the line which contains given index.
int getLineThis(int index) {
while (index > 0) {
- int c = _buffer.codeUnitAt(index - 1);
+ var c = _buffer.codeUnitAt(index - 1);
if (c == 0xD || c == 0xA) {
break;
}
@@ -779,7 +778,7 @@
/// Returns the line prefix consisting of spaces and tabs on the left from the
/// given [AstNode].
String getNodePrefix(AstNode node) {
- int offset = node.offset;
+ var offset = node.offset;
// function literal is special, it uses offset of enclosing line
if (node is FunctionExpression) {
return getLinePrefix(offset);
@@ -796,7 +795,7 @@
/// Returns the line prefix consisting of spaces and tabs on the left from the
/// given offset.
String getPrefix(int endIndex) {
- int startIndex = getLineContentStart(endIndex);
+ var startIndex = getLineContentStart(endIndex);
return _buffer.substring(startIndex, endIndex);
}
@@ -816,13 +815,13 @@
/// used by the generated source, but not imported.
String getTypeSource(DartType type, Set<Source> librariesToImport,
{StringBuffer parametersBuffer}) {
- StringBuffer sb = StringBuffer();
+ var sb = StringBuffer();
// type parameter
if (!_isTypeVisible(type)) {
return 'dynamic';
}
- Element element = type.element;
+ var element = type.element;
// Typedef(s) are represented as GenericFunctionTypeElement(s).
if (element is GenericFunctionTypeElement &&
@@ -837,8 +836,8 @@
return 'Function';
}
parametersBuffer.write('(');
- for (ParameterElement parameter in type.parameters) {
- String parameterType = getTypeSource(parameter.type, librariesToImport);
+ for (var parameter in type.parameters) {
+ var parameterType = getTypeSource(parameter.type, librariesToImport);
if (parametersBuffer.length != 1) {
parametersBuffer.write(', ');
}
@@ -855,20 +854,20 @@
}
// prepare element
if (element == null) {
- String source = type.toString();
+ var source = type.toString();
source = source.replaceAll('<dynamic>', '');
source = source.replaceAll('<dynamic, dynamic>', '');
return source;
}
// check if imported
- LibraryElement library = element.library;
+ var library = element.library;
if (library != null && library != _library) {
// no source, if private
if (element.isPrivate) {
return null;
}
// ensure import
- ImportElement importElement = _getImportElement(element);
+ var importElement = _getImportElement(element);
if (importElement != null) {
if (importElement.prefix != null) {
sb.write(importElement.prefix.displayName);
@@ -879,27 +878,27 @@
}
}
// append simple name
- String name = element.displayName;
+ var name = element.displayName;
sb.write(name);
// may be type arguments
if (type is ParameterizedType) {
- List<DartType> arguments = type.typeArguments;
+ var arguments = type.typeArguments;
// check if has arguments
- bool hasArguments = false;
- bool allArgumentsVisible = true;
- for (DartType argument in arguments) {
+ var hasArguments = false;
+ var allArgumentsVisible = true;
+ for (var argument in arguments) {
hasArguments = hasArguments || !argument.isDynamic;
allArgumentsVisible = allArgumentsVisible && _isTypeVisible(argument);
}
// append type arguments
if (hasArguments && allArgumentsVisible) {
sb.write('<');
- for (int i = 0; i < arguments.length; i++) {
- DartType argument = arguments[i];
+ for (var i = 0; i < arguments.length; i++) {
+ var argument = arguments[i];
if (i != 0) {
sb.write(', ');
}
- String argumentSrc = getTypeSource(argument, librariesToImport);
+ var argumentSrc = getTypeSource(argument, librariesToImport);
if (argumentSrc != null) {
sb.write(argumentSrc);
} else {
@@ -915,12 +914,12 @@
/// Indents given source left or right.
String indentSourceLeftRight(String source, {bool indentLeft = true}) {
- StringBuffer sb = StringBuffer();
- String indent = getIndent(1);
- String eol = endOfLine;
- List<String> lines = source.split(eol);
- for (int i = 0; i < lines.length; i++) {
- String line = lines[i];
+ var sb = StringBuffer();
+ var indent = getIndent(1);
+ var eol = endOfLine;
+ var lines = source.split(eol);
+ for (var i = 0; i < lines.length; i++) {
+ var line = lines[i];
// last line, stop if empty
if (i == lines.length - 1 && isEmpty(line)) {
break;
@@ -952,7 +951,7 @@
/// Return <code>true</code> if [range] contains only whitespace or comments.
bool isJustWhitespaceOrComment(SourceRange range) {
- String trimmedText = getRangeText(range).trim();
+ var trimmedText = getRangeText(range).trim();
// may be whitespace
if (trimmedText.isEmpty) {
return true;
@@ -964,14 +963,14 @@
ClassMemberLocation prepareNewClassMemberLocation(
CompilationUnitMember declaration,
bool Function(ClassMember existingMember) shouldSkip) {
- String indent = getIndent(1);
+ var indent = getIndent(1);
// Find the last target member.
ClassMember targetMember;
- List<ClassMember> members = _getMembers(declaration);
+ var members = _getMembers(declaration);
if (members == null) {
return null;
}
- for (ClassMember member in members) {
+ for (var member in members) {
if (shouldSkip(member)) {
targetMember = member;
} else {
@@ -984,7 +983,7 @@
endOfLine + endOfLine + indent, targetMember.end, '');
}
// At the beginning of the class.
- String suffix = members.isNotEmpty || isClassWithEmptyBody(declaration)
+ var suffix = members.isNotEmpty || isClassWithEmptyBody(declaration)
? endOfLine
: '';
return ClassMemberLocation(
@@ -1030,10 +1029,10 @@
String replaceSourceIndent(
String source, String oldIndent, String newIndent) {
// prepare STRING token ranges
- List<SourceRange> lineRanges = [];
+ var lineRanges = <SourceRange>[];
{
- List<Token> tokens = TokenUtils.getTokens(source, unit.featureSet);
- for (Token token in tokens) {
+ var tokens = TokenUtils.getTokens(source, unit.featureSet);
+ for (var token in tokens) {
if (token.type == TokenType.STRING) {
lineRanges.add(range.token(token));
}
@@ -1041,19 +1040,19 @@
}
}
// re-indent lines
- StringBuffer sb = StringBuffer();
- String eol = endOfLine;
- List<String> lines = source.split(eol);
- int lineOffset = 0;
- for (int i = 0; i < lines.length; i++) {
- String line = lines[i];
+ var sb = StringBuffer();
+ var eol = endOfLine;
+ var lines = source.split(eol);
+ var lineOffset = 0;
+ for (var i = 0; i < lines.length; i++) {
+ var line = lines[i];
// last line, stop if empty
if (i == lines.length - 1 && isEmpty(line)) {
break;
}
// check if "offset" is in one of the String ranges
- bool inString = false;
- for (SourceRange lineRange in lineRanges) {
+ var inString = false;
+ for (var lineRange in lineRanges) {
if (lineOffset > lineRange.offset && lineOffset < lineRange.end) {
inString = true;
}
@@ -1078,7 +1077,7 @@
/// to each other.
String replaceSourceRangeIndent(
SourceRange range, String oldIndent, String newIndent) {
- String oldSource = getRangeText(range);
+ var oldSource = getRangeText(range);
return replaceSourceIndent(oldSource, oldIndent, newIndent);
}
@@ -1095,9 +1094,9 @@
/// If [index] is the start of a method, then in the most cases return the end
/// of the previous not-whitespace line.
int skipEmptyLinesLeft(int index) {
- int lastLine = index;
+ var lastLine = index;
while (index > 0) {
- int c = _buffer.codeUnitAt(index - 1);
+ var c = _buffer.codeUnitAt(index - 1);
if (!isWhitespace(c)) {
return lastLine;
}
@@ -1112,8 +1111,8 @@
/// Return the import element used to import given [element] into the library.
/// May be `null` if was not imported, i.e. declared in the same library.
ImportElement _getImportElement(Element element) {
- for (ImportElement imp in _library.imports) {
- Map<String, Element> definedNames = getImportNamespace(imp);
+ for (var imp in _library.imports) {
+ var definedNames = getImportNamespace(imp);
if (definedNames.containsValue(element)) {
return imp;
}
@@ -1157,11 +1156,11 @@
return _InvertedCondition._simple('true');
}
} else if (expression is BinaryExpression) {
- TokenType operator = expression.operator.type;
- Expression le = expression.leftOperand;
- Expression re = expression.rightOperand;
- _InvertedCondition ls = _InvertedCondition._simple(getNodeText(le));
- _InvertedCondition rs = _InvertedCondition._simple(getNodeText(re));
+ var operator = expression.operator.type;
+ var le = expression.leftOperand;
+ var re = expression.rightOperand;
+ var ls = _InvertedCondition._simple(getNodeText(le));
+ var rs = _InvertedCondition._simple(getNodeText(re));
if (operator == TokenType.LT) {
return _InvertedCondition._binary2(ls, ' >= ', rs);
}
@@ -1193,23 +1192,23 @@
TokenType.AMPERSAND_AMPERSAND.precedence, ls, ' && ', rs);
}
} else if (expression is IsExpression) {
- String expressionSource = getNodeText(expression.expression);
- String typeSource = getNodeText(expression.type);
+ var expressionSource = getNodeText(expression.expression);
+ var typeSource = getNodeText(expression.type);
if (expression.notOperator == null) {
return _InvertedCondition._simple('$expressionSource is! $typeSource');
} else {
return _InvertedCondition._simple('$expressionSource is $typeSource');
}
} else if (expression is PrefixExpression) {
- TokenType operator = expression.operator.type;
+ var operator = expression.operator.type;
if (operator == TokenType.BANG) {
- Expression operand = expression.operand.unParenthesized;
+ var operand = expression.operand.unParenthesized;
return _InvertedCondition._simple(getNodeText(operand));
}
} else if (expression is ParenthesizedExpression) {
return _invertCondition0(expression.unParenthesized);
}
- DartType type = expression.staticType;
+ var type = expression.staticType;
if (type.isDartCoreBool) {
return _InvertedCondition._simple('!${getNodeText(expression)}');
}
@@ -1220,8 +1219,8 @@
/// [targetClassElement].
bool _isTypeVisible(DartType type) {
if (type is TypeParameterType) {
- TypeParameterElement parameterElement = type.element;
- Element parameterClassElement = parameterElement.enclosingElement;
+ var parameterElement = type.element;
+ var parameterClassElement = parameterElement.enclosingElement;
return identical(parameterClassElement, targetExecutableElement) ||
identical(parameterClassElement, targetClassElement);
}
@@ -1275,10 +1274,10 @@
/// tokens or some exception happens.
static List<Token> getTokens(String s, FeatureSet featureSet) {
try {
- List<Token> tokens = [];
- Scanner scanner = Scanner(null, CharSequenceReader(s), null)
+ var tokens = <Token>[];
+ var scanner = Scanner(null, CharSequenceReader(s), null)
..configureFeatures(featureSet);
- Token token = scanner.tokenize();
+ var token = scanner.tokenize();
while (token.type != TokenType.EOF) {
tokens.add(token);
token = token.next;
@@ -1301,7 +1300,7 @@
}
static bool _isPrefixed(SimpleIdentifier node) {
- AstNode parent = node.parent;
+ var parent = node.parent;
return parent is ConstructorName && parent.name == node ||
parent is MethodInvocation &&
parent.methodName == node &&
@@ -1343,7 +1342,7 @@
static _InvertedCondition _binary(int precedence, _InvertedCondition left,
String operation, _InvertedCondition right) {
- String src = _parenthesizeIfRequired(left, precedence) +
+ var src = _parenthesizeIfRequired(left, precedence) +
operation +
_parenthesizeIfRequired(right, precedence);
return _InvertedCondition(precedence, src);
@@ -1377,7 +1376,7 @@
@override
void visitSimpleIdentifier(SimpleIdentifier node) {
if (node.inDeclarationContext()) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is LocalElement) {
elements.add(element);
}
diff --git a/pkg/analysis_server/lib/src/services/kythe/kythe_visitors.dart b/pkg/analysis_server/lib/src/services/kythe/kythe_visitors.dart
index be5ac64..8e289c2 100644
--- a/pkg/analysis_server/lib/src/services/kythe/kythe_visitors.dart
+++ b/pkg/analysis_server/lib/src/services/kythe/kythe_visitors.dart
@@ -52,12 +52,12 @@
// "dynamic"
return '';
}
- String path = e.source.fullName;
- BazelWorkspace bazelWorkspace = BazelWorkspace.find(provider, path);
+ var path = e.source.fullName;
+ var bazelWorkspace = BazelWorkspace.find(provider, path);
if (bazelWorkspace != null) {
return provider.pathContext.relative(path, from: bazelWorkspace.root);
}
- GnWorkspace gnWorkspace = GnWorkspace.find(provider, path);
+ var gnWorkspace = GnWorkspace.find(provider, path);
if (gnWorkspace != null) {
return provider.pathContext.relative(path, from: gnWorkspace.root);
}
@@ -129,7 +129,7 @@
if (refVName != null) {
var parentNode = node.parent;
if (parentNode is Declaration) {
- Element parentElement = parentNode.declaredElement;
+ var parentElement = parentNode.declaredElement;
if (parentNode is TopLevelVariableDeclaration) {
_handleVariableDeclarationListAnnotations(
parentNode.variables, refVName);
@@ -164,8 +164,8 @@
// NOTE: usage node only written out if assignment is not the '=' operator,
// we are looking for an operator such as +=, -=, *=, /=
//
- Token operator = node.operator;
- MethodElement element = node.staticElement;
+ var operator = node.operator;
+ var element = node.staticElement;
if (operator.type != TokenType.EQ && element != null) {
// method
_vNameFromElement(element, schema.FUNCTION_KIND);
@@ -186,7 +186,7 @@
//
// operators such as +, -, *, /
//
- MethodElement element = node.staticElement;
+ var element = node.staticElement;
if (element != null) {
// method
_vNameFromElement(element, schema.FUNCTION_KIND);
@@ -700,7 +700,7 @@
node.declaredElement.name,
),
);
- for (ExecutableElement overridden in overriddenList) {
+ for (var overridden in overriddenList) {
addEdge(
methodVName,
schema.OVERRIDES_EDGE,
@@ -961,7 +961,7 @@
}
void _handleThisOrSuper(Expression thisOrSuperNode) {
- DartType type = thisOrSuperNode.staticType;
+ var type = thisOrSuperNode.staticType;
if (type != null && type.element != null) {
// Expected SuperExpression.staticType to return the type of the
// supertype, but it returns the type of the enclosing class (same as
@@ -1070,7 +1070,7 @@
}
void _withEnclosingElement(Element element, Function() f) {
- Element outerEnclosingElement = _enclosingElement;
+ var outerEnclosingElement = _enclosingElement;
Element outerEnclosingClassElement = _enclosingClassElement;
var outerEnclosingVName = _enclosingVName;
var outerEnclosingClassVName = _enclosingClassVName;
@@ -1170,7 +1170,7 @@
addFact(anchorVName, schema.ANCHOR_START_FACT, _encodeInt(start));
addFact(anchorVName, schema.ANCHOR_END_FACT, _encodeInt(end));
if (target != null) {
- for (String edge in edges) {
+ for (var edge in edges) {
addEdge(anchorVName, edge, target);
}
if (enclosingTarget != null) {
@@ -1268,7 +1268,7 @@
}
if (paramNodes != null) {
- for (FormalParameter paramNode in paramNodes.parameters) {
+ for (var paramNode in paramNodes.parameters) {
var paramTypeVName = dynamicBuiltin;
if (!paramNode.declaredElement.type.isDynamic) {
paramTypeVName = _vNameFromElement(
diff --git a/pkg/analysis_server/lib/src/services/refactoring/convert_getter_to_method.dart b/pkg/analysis_server/lib/src/services/refactoring/convert_getter_to_method.dart
index b0eb8c8..9253e3b 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/convert_getter_to_method.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/convert_getter_to_method.dart
@@ -15,7 +15,6 @@
import 'package:analyzer/dart/ast/token.dart';
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/src/dart/analysis/session_helper.dart';
-import 'package:analyzer/src/generated/source.dart';
import 'package:analyzer_plugin/utilities/range_factory.dart';
/// [ConvertMethodToGetterRefactoring] implementation.
@@ -35,13 +34,13 @@
@override
Future<RefactoringStatus> checkFinalConditions() {
- RefactoringStatus result = RefactoringStatus();
+ var result = RefactoringStatus();
return Future.value(result);
}
@override
Future<RefactoringStatus> checkInitialConditions() {
- RefactoringStatus result = _checkInitialConditions();
+ var result = _checkInitialConditions();
return Future.value(result);
}
@@ -58,13 +57,12 @@
// method
if (element.enclosingElement is ClassElement) {
FieldElement field = element.variable;
- Set<ClassMemberElement> elements =
- await getHierarchyMembers(searchEngine, field);
+ var elements = await getHierarchyMembers(searchEngine, field);
await Future.forEach(elements, (ClassMemberElement member) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (member is FieldElement) {
- PropertyAccessorElement getter = member.getter;
+ var getter = member.getter;
if (!getter.isSynthetic) {
await _updateElementDeclaration(getter);
return _updateElementReferences(getter);
@@ -104,14 +102,14 @@
}
// remove "get "
if (getKeyword != null) {
- SourceRange getRange =
+ var getRange =
range.startOffsetEndOffset(getKeyword.offset, element.nameOffset);
- SourceEdit edit = newSourceEdit_range(getRange, '');
+ var edit = newSourceEdit_range(getRange, '');
doSourceChange_addElementEdit(change, element, edit);
}
// add parameters "()"
{
- SourceEdit edit = SourceEdit(range.elementName(element).end, 0, '()');
+ var edit = SourceEdit(range.elementName(element).end, 0, '()');
doSourceChange_addElementEdit(change, element, edit);
}
}
@@ -119,11 +117,11 @@
Future _updateElementReferences(Element element) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- List<SearchMatch> matches = await searchEngine.searchReferences(element);
- List<SourceReference> references = getSourceReferences(matches);
- for (SourceReference reference in references) {
- Element refElement = reference.element;
- SourceRange refRange = reference.range;
+ var matches = await searchEngine.searchReferences(element);
+ var references = getSourceReferences(matches);
+ for (var reference in references) {
+ var refElement = reference.element;
+ var refRange = reference.range;
// insert "()"
var edit = SourceEdit(refRange.end, 0, '()');
doSourceChange_addElementEdit(change, refElement, edit);
diff --git a/pkg/analysis_server/lib/src/services/refactoring/convert_method_to_getter.dart b/pkg/analysis_server/lib/src/services/refactoring/convert_method_to_getter.dart
index c8aded7..6744118 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/convert_method_to_getter.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/convert_method_to_getter.dart
@@ -14,7 +14,6 @@
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/src/dart/analysis/session_helper.dart';
import 'package:analyzer/src/dart/ast/utilities.dart';
-import 'package:analyzer/src/generated/source.dart';
import 'package:analyzer_plugin/utilities/range_factory.dart';
/// [ConvertMethodToGetterRefactoring] implementation.
@@ -34,7 +33,7 @@
@override
Future<RefactoringStatus> checkFinalConditions() {
- RefactoringStatus result = RefactoringStatus();
+ var result = RefactoringStatus();
return Future.value(result);
}
@@ -79,8 +78,7 @@
// MethodElement
if (element is MethodElement) {
MethodElement method = element;
- Set<ClassMemberElement> elements =
- await getHierarchyMembers(searchEngine, method);
+ var elements = await getHierarchyMembers(searchEngine, method);
await Future.forEach(elements, (Element element) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
@@ -110,12 +108,12 @@
}
// insert "get "
{
- SourceEdit edit = SourceEdit(element.nameOffset, 0, 'get ');
+ var edit = SourceEdit(element.nameOffset, 0, 'get ');
doSourceChange_addElementEdit(change, element, edit);
}
// remove parameters
{
- SourceEdit edit = newSourceEdit_range(range.node(parameters), '');
+ var edit = newSourceEdit_range(range.node(parameters), '');
doSourceChange_addElementEdit(change, element, edit);
}
}
@@ -123,11 +121,11 @@
Future<void> _updateElementReferences(Element element) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- List<SearchMatch> matches = await searchEngine.searchReferences(element);
- List<SourceReference> references = getSourceReferences(matches);
- for (SourceReference reference in references) {
- Element refElement = reference.element;
- SourceRange refRange = reference.range;
+ var matches = await searchEngine.searchReferences(element);
+ var references = getSourceReferences(matches);
+ for (var reference in references) {
+ var refElement = reference.element;
+ var refRange = reference.range;
// prepare invocation
MethodInvocation invocation;
{
@@ -139,7 +137,7 @@
}
// we need invocation
if (invocation != null) {
- SourceEdit edit = newSourceEdit_range(
+ var edit = newSourceEdit_range(
range.startOffsetEndOffset(refRange.end, invocation.end), '');
doSourceChange_addElementEdit(change, refElement, edit);
}
diff --git a/pkg/analysis_server/lib/src/services/refactoring/extract_local.dart b/pkg/analysis_server/lib/src/services/refactoring/extract_local.dart
index 01f4fa8..a582de6 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/extract_local.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/extract_local.dart
@@ -83,14 +83,14 @@
@override
Future<RefactoringStatus> checkFinalConditions() {
- RefactoringStatus result = RefactoringStatus();
+ var result = RefactoringStatus();
result.addStatus(checkName());
return Future.value(result);
}
@override
Future<RefactoringStatus> checkInitialConditions() {
- RefactoringStatus result = RefactoringStatus();
+ var result = RefactoringStatus();
// selection
result.addStatus(_checkSelection());
if (result.hasFatalError) {
@@ -109,7 +109,7 @@
@override
RefactoringStatus checkName() {
- RefactoringStatus result = RefactoringStatus();
+ var result = RefactoringStatus();
result.addStatus(validateVariableName(name));
if (excludedVariableNames.contains(name)) {
result.addError(
@@ -120,7 +120,7 @@
@override
Future<SourceChange> createChange() {
- SourceChange change = SourceChange(refactoringName);
+ var change = SourceChange(refactoringName);
// prepare occurrences
List<SourceRange> occurrences;
if (extractAll) {
@@ -133,16 +133,15 @@
// then convert it into a variable declaration statement.
if (singleExpression?.parent is ExpressionStatement &&
occurrences.length == 1) {
- String keyword = _declarationKeyword;
- String declarationSource = '$keyword $name = ';
- SourceEdit edit =
- SourceEdit(singleExpression.offset, 0, declarationSource);
+ var keyword = _declarationKeyword;
+ var declarationSource = '$keyword $name = ';
+ var edit = SourceEdit(singleExpression.offset, 0, declarationSource);
doSourceChange_addElementEdit(change, unitElement, edit);
return Future.value(change);
}
// prepare positions
- List<Position> positions = <Position>[];
- int occurrencesShift = 0;
+ var positions = <Position>[];
+ var occurrencesShift = 0;
void addPosition(int offset) {
positions.add(Position(file, offset));
}
@@ -156,34 +155,33 @@
nameOffsetInDeclarationCode = declarationCode.length;
declarationCode += "$name = '$stringLiteralPart';";
} else {
- String keyword = _declarationKeyword;
- String initializerCode = utils.getRangeText(selectionRange);
+ var keyword = _declarationKeyword;
+ var initializerCode = utils.getRangeText(selectionRange);
declarationCode = '$keyword ';
nameOffsetInDeclarationCode = declarationCode.length;
declarationCode += '$name = $initializerCode;';
}
// prepare location for declaration
- AstNode target = _findDeclarationTarget(occurrences);
- String eol = utils.endOfLine;
+ var target = _findDeclarationTarget(occurrences);
+ var eol = utils.endOfLine;
// insert variable declaration
if (target is Statement) {
- String prefix = utils.getNodePrefix(target);
- SourceEdit edit =
- SourceEdit(target.offset, 0, declarationCode + eol + prefix);
+ var prefix = utils.getNodePrefix(target);
+ var edit = SourceEdit(target.offset, 0, declarationCode + eol + prefix);
doSourceChange_addElementEdit(change, unitElement, edit);
addPosition(edit.offset + nameOffsetInDeclarationCode);
occurrencesShift = edit.replacement.length;
} else if (target is ExpressionFunctionBody) {
- String prefix = utils.getNodePrefix(target.parent);
- String indent = utils.getIndent(1);
- Expression expr = target.expression;
+ var prefix = utils.getNodePrefix(target.parent);
+ var indent = utils.getIndent(1);
+ var expr = target.expression;
{
- String code = '{' + eol + prefix + indent;
+ var code = '{' + eol + prefix + indent;
addPosition(
target.offset + code.length + nameOffsetInDeclarationCode);
code += declarationCode + eol;
code += prefix + indent + 'return ';
- SourceEdit edit =
+ var edit =
SourceEdit(target.offset, expr.offset - target.offset, code);
occurrencesShift = target.offset + code.length - expr.offset;
doSourceChange_addElementEdit(change, unitElement, edit);
@@ -196,14 +194,14 @@
}
}
// prepare replacement
- String occurrenceReplacement = name;
+ var occurrenceReplacement = name;
if (stringLiteralPart != null) {
occurrenceReplacement = '\${$name}';
occurrencesShift += 2;
}
// replace occurrences with variable reference
- for (SourceRange range in occurrences) {
- SourceEdit edit = newSourceEdit_range(range, occurrenceReplacement);
+ for (var range in occurrences) {
+ var edit = newSourceEdit_range(range, occurrenceReplacement);
addPosition(range.offset + occurrencesShift);
occurrencesShift += name.length - range.length;
doSourceChange_addElementEdit(change, unitElement, edit);
@@ -241,17 +239,16 @@
// exclude whitespaces
{
- int numLeading = countLeadingWhitespaces(selectionStr);
- int numTrailing = countTrailingWhitespaces(selectionStr);
- int offset = selectionRange.offset + numLeading;
- int end = selectionRange.end - numTrailing;
+ var numLeading = countLeadingWhitespaces(selectionStr);
+ var numTrailing = countTrailingWhitespaces(selectionStr);
+ var offset = selectionRange.offset + numLeading;
+ var end = selectionRange.end - numTrailing;
selectionRange = SourceRange(offset, end - offset);
}
// get covering node
- AstNode coveringNode =
- NodeLocator(selectionRange.offset, selectionRange.end)
- .searchWithin(unit);
+ var coveringNode = NodeLocator(selectionRange.offset, selectionRange.end)
+ .searchWithin(unit);
// We need an enclosing function.
// If it has a block body, we can add a new variable declaration statement
@@ -274,8 +271,8 @@
}
}
// compute covering expressions
- for (AstNode node = coveringNode; node != null; node = node.parent) {
- AstNode parent = node.parent;
+ for (var node = coveringNode; node != null; node = node.parent) {
+ var parent = node.parent;
// skip some nodes
if (node is ArgumentList ||
node is AssignmentExpression ||
@@ -300,8 +297,8 @@
}
// stop at void method invocations
if (node is MethodInvocation) {
- MethodInvocation invocation = node;
- Element element = invocation.methodName.staticElement;
+ var invocation = node;
+ var element = invocation.methodName.staticElement;
if (element is ExecutableElement &&
element.returnType != null &&
element.returnType.isVoid) {
@@ -321,7 +318,7 @@
'Cannot extract the name part of a declaration.',
newLocation_fromNode(node));
}
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is FunctionElement || element is MethodElement) {
continue;
}
@@ -354,7 +351,7 @@
if (element == null) {
return null;
}
- int id = elementIds[element];
+ var id = elementIds[element];
if (id == null) {
id = elementIds.length;
elementIds[element] = id;
@@ -380,11 +377,11 @@
expr.accept(_TokenLocalElementVisitor(map));
// map and join tokens
var result = tokens.map((Token token) {
- String tokenString = token.lexeme;
+ var tokenString = token.lexeme;
// append token's Element id
- Element element = map[token];
+ var element = map[token];
if (element != null) {
- int elementId = _encodeElement(element);
+ var elementId = _encodeElement(element);
if (elementId != null) {
tokenString += '-$elementId';
}
@@ -398,12 +395,12 @@
/// Return the [AstNode] to defined the variable before.
/// It should be accessible by all the given [occurrences].
AstNode _findDeclarationTarget(List<SourceRange> occurrences) {
- List<AstNode> nodes = _findNodes(occurrences);
- AstNode commonParent = getNearestCommonAncestor(nodes);
+ var nodes = _findNodes(occurrences);
+ var commonParent = getNearestCommonAncestor(nodes);
// Block
if (commonParent is Block) {
- List<AstNode> firstParents = getParents(nodes[0]);
- int commonIndex = firstParents.indexOf(commonParent);
+ var firstParents = getParents(nodes[0]);
+ var commonIndex = firstParents.indexOf(commonParent);
return firstParents[commonIndex + 1];
}
// ExpressionFunctionBody
@@ -421,9 +418,9 @@
/// Returns [AstNode]s at the offsets of the given [SourceRange]s.
List<AstNode> _findNodes(List<SourceRange> ranges) {
- List<AstNode> nodes = <AstNode>[];
- for (SourceRange range in ranges) {
- AstNode node = NodeLocator(range.offset).searchWithin(unit);
+ var nodes = <AstNode>[];
+ for (var range in ranges) {
+ var node = NodeLocator(range.offset).searchWithin(unit);
nodes.add(node);
}
return nodes;
@@ -501,7 +498,7 @@
void _prepareOffsetsLengths() {
offsets.clear();
lengths.clear();
- for (SourceRange occurrence in occurrences) {
+ for (var occurrence in occurrences) {
offsets.add(occurrence.offset);
lengths.add(occurrence.length);
}
@@ -536,17 +533,17 @@
@override
void visitStringLiteral(StringLiteral node) {
if (ref.stringLiteralPart != null) {
- int length = ref.stringLiteralPart.length;
- String value = ref.utils.getNodeText(node);
- int lastIndex = 0;
+ var length = ref.stringLiteralPart.length;
+ var value = ref.utils.getNodeText(node);
+ var lastIndex = 0;
while (true) {
- int index = value.indexOf(ref.stringLiteralPart, lastIndex);
+ var index = value.indexOf(ref.stringLiteralPart, lastIndex);
if (index == -1) {
break;
}
lastIndex = index + length;
- int start = node.offset + index;
- SourceRange range = SourceRange(start, length);
+ var start = node.offset + index;
+ var range = SourceRange(start, length);
occurrences.add(range);
}
return;
@@ -578,7 +575,7 @@
@override
void visitSimpleIdentifier(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is LocalVariableElement) {
map[node.token] = element;
}
diff --git a/pkg/analysis_server/lib/src/services/refactoring/extract_method.dart b/pkg/analysis_server/lib/src/services/refactoring/extract_method.dart
index 6633c28..7818889 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/extract_method.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/extract_method.dart
@@ -20,11 +20,9 @@
import 'package:analyzer/dart/analysis/features.dart';
import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/ast/token.dart';
import 'package:analyzer/dart/ast/visitor.dart';
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/dart/element/type.dart';
-import 'package:analyzer/dart/element/type_provider.dart';
import 'package:analyzer/dart/element/type_system.dart';
import 'package:analyzer/src/dart/analysis/session_helper.dart';
import 'package:analyzer/src/dart/ast/utilities.dart';
@@ -36,7 +34,7 @@
const String _TOKEN_SEPARATOR = '\uFFFF';
Element _getLocalElement(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is LocalVariableElement ||
element is ParameterElement ||
element is FunctionElement &&
@@ -49,13 +47,13 @@
/// Returns the "normalized" version of the given source, which is reconstructed
/// from tokens, so ignores all the comments and spaces.
String _getNormalizedSource(String src, FeatureSet featureSet) {
- List<Token> selectionTokens = TokenUtils.getTokens(src, featureSet);
+ var selectionTokens = TokenUtils.getTokens(src, featureSet);
return selectionTokens.join(_TOKEN_SEPARATOR);
}
/// Returns the [Map] which maps [map] values to their keys.
Map<String, String> _inverseMap(Map<String, String> map) {
- Map<String, String> result = <String, String>{};
+ var result = <String, String>{};
map.forEach((String key, String value) {
result[value] = key;
});
@@ -134,8 +132,7 @@
@override
String get refactoringName {
- AstNode node =
- NodeLocator(selectionOffset).searchWithin(resolveResult.unit);
+ var node = NodeLocator(selectionOffset).searchWithin(resolveResult.unit);
if (node != null && node.thisOrAncestorOfType<ClassDeclaration>() != null) {
return 'Extract Method';
}
@@ -143,7 +140,7 @@
}
String get signature {
- StringBuffer sb = StringBuffer();
+ var sb = StringBuffer();
if (createGetter) {
sb.write('get ');
sb.write(name);
@@ -151,8 +148,8 @@
sb.write(name);
sb.write('(');
// add all parameters
- bool firstParameter = true;
- for (RefactoringMethodParameter parameter in _parameters) {
+ var firstParameter = true;
+ for (var parameter in _parameters) {
// may be comma
if (firstParameter) {
firstParameter = false;
@@ -161,7 +158,7 @@
}
// type
{
- String typeSource = parameter.type;
+ var typeSource = parameter.type;
if ('dynamic' != typeSource && '' != typeSource) {
sb.write(typeSource);
sb.write(' ');
@@ -184,10 +181,10 @@
Future<RefactoringStatus> checkFinalConditions() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- RefactoringStatus result = RefactoringStatus();
+ var result = RefactoringStatus();
result.addStatus(validateMethodName(name));
result.addStatus(_checkParameterNames());
- RefactoringStatus status = await _checkPossibleConflicts();
+ var status = await _checkPossibleConflicts();
result.addStatus(status);
return result;
}
@@ -196,14 +193,14 @@
Future<RefactoringStatus> checkInitialConditions() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- RefactoringStatus result = RefactoringStatus();
+ var result = RefactoringStatus();
// selection
result.addStatus(_checkSelection());
if (result.hasFatalError) {
return result;
}
// prepare parts
- RefactoringStatus status = await _initializeParameters();
+ var status = await _initializeParameters();
result.addStatus(status);
_initializeHasAwait();
await _initializeReturnType();
@@ -219,7 +216,7 @@
_prepareNames();
// closure cannot have parameters
if (_selectionFunctionExpression != null && _parameters.isNotEmpty) {
- String message = format(
+ var message = format(
'Cannot extract closure as method, it references {0} external variable(s).',
_parameters.length);
return RefactoringStatus.fatal(message);
@@ -236,10 +233,10 @@
Future<SourceChange> createChange() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- SourceChange change = SourceChange(refactoringName);
+ var change = SourceChange(refactoringName);
// replace occurrences with method invocation
- for (_Occurrence occurrence in _occurrences) {
- SourceRange range = occurrence.range;
+ for (var occurrence in _occurrences) {
+ var range = occurrence.range;
// may be replacement of duplicates disabled
if (!extractAll && !occurrence.isSelection) {
continue;
@@ -249,12 +246,12 @@
if (_selectionFunctionExpression != null) {
invocationSource = name;
} else {
- StringBuffer sb = StringBuffer();
+ var sb = StringBuffer();
// may be returns value
if (_selectionStatements != null && variableType != null) {
// single variable assignment / return statement
if (_returnVariableName != null) {
- String occurrenceName =
+ var occurrenceName =
occurrence._parameterOldToOccurrenceName[_returnVariableName];
// may be declare variable
if (!_parametersMap.containsKey(_returnVariableName)) {
@@ -280,8 +277,8 @@
sb.write(name);
if (!createGetter) {
sb.write('(');
- bool firstParameter = true;
- for (RefactoringMethodParameter parameter in _parameters) {
+ var firstParameter = true;
+ for (var parameter in _parameters) {
// may be comma
if (firstParameter) {
firstParameter = false;
@@ -290,7 +287,7 @@
}
// argument name
{
- String argumentName =
+ var argumentName =
occurrence._parameterOldToOccurrenceName[parameter.id];
sb.write(argumentName);
}
@@ -304,17 +301,17 @@
}
}
// add replace edit
- SourceEdit edit = newSourceEdit_range(range, invocationSource);
+ var edit = newSourceEdit_range(range, invocationSource);
doSourceChange_addElementEdit(
change, resolveResult.unit.declaredElement, edit);
}
// add method declaration
{
// prepare environment
- String prefix = utils.getNodePrefix(_parentMember);
- String eol = utils.endOfLine;
+ var prefix = utils.getNodePrefix(_parentMember);
+ var eol = utils.endOfLine;
// prepare annotations
- String annotations = '';
+ var annotations = '';
{
// may be "static"
if (_staticContext) {
@@ -324,20 +321,20 @@
// prepare declaration source
String declarationSource;
{
- String returnExpressionSource = _getMethodBodySource();
+ var returnExpressionSource = _getMethodBodySource();
// closure
if (_selectionFunctionExpression != null) {
- String returnTypeCode = _getExpectedClosureReturnTypeCode();
+ var returnTypeCode = _getExpectedClosureReturnTypeCode();
declarationSource = '$returnTypeCode$name$returnExpressionSource';
if (_selectionFunctionExpression.body is ExpressionFunctionBody) {
declarationSource += ';';
}
}
// optional 'async' body modifier
- String asyncKeyword = _hasAwait ? ' async' : '';
+ var asyncKeyword = _hasAwait ? ' async' : '';
// expression
if (_selectionExpression != null) {
- bool isMultiLine = returnExpressionSource.contains(eol);
+ var isMultiLine = returnExpressionSource.contains(eol);
// We generate the method body using the shorthand syntax if it fits
// into a single line and use the regular method syntax otherwise.
@@ -383,9 +380,8 @@
}
// insert declaration
if (declarationSource != null) {
- int offset = _parentMember.end;
- SourceEdit edit =
- SourceEdit(offset, 0, '$eol$eol$prefix$declarationSource');
+ var offset = _parentMember.end;
+ var edit = SourceEdit(offset, 0, '$eol$eol$prefix$declarationSource');
doSourceChange_addElementEdit(
change, resolveResult.unit.declaredElement, edit);
}
@@ -403,7 +399,7 @@
/// Adds a new reference to the parameter with the given name.
void _addParameterReference(String name, SourceRange range) {
- List<SourceRange> references = _parameterReferencesMap[name];
+ var references = _parameterReferencesMap[name];
if (references == null) {
references = [];
_parameterReferencesMap[name] = references;
@@ -412,10 +408,10 @@
}
RefactoringStatus _checkParameterNames() {
- RefactoringStatus result = RefactoringStatus();
- for (RefactoringMethodParameter parameter in _parameters) {
+ var result = RefactoringStatus();
+ for (var parameter in _parameters) {
result.addStatus(validateParameterName(parameter.name));
- for (RefactoringMethodParameter other in _parameters) {
+ for (var other in _parameters) {
if (!identical(parameter, other) && other.name == parameter.name) {
result.addError(
format("Parameter '{0}' already exists", parameter.name));
@@ -437,16 +433,16 @@
Future<RefactoringStatus> _checkPossibleConflicts() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- RefactoringStatus result = RefactoringStatus();
- AstNode parent = _parentMember.parent;
+ var result = RefactoringStatus();
+ var parent = _parentMember.parent;
// top-level function
if (parent is CompilationUnit) {
- LibraryElement libraryElement = parent.declaredElement.library;
+ var libraryElement = parent.declaredElement.library;
return validateCreateFunction(searchEngine, libraryElement, name);
}
// method of class
if (parent is ClassDeclaration) {
- ClassElement classElement = parent.declaredElement;
+ var classElement = parent.declaredElement;
return validateCreateMethod(searchEngine,
AnalysisSessionHelper(resolveResult.session), classElement, name);
}
@@ -468,7 +464,7 @@
// Check for implicitly selected closure.
{
- FunctionExpression function = _findFunctionExpression();
+ var function = _findFunctionExpression();
if (function != null) {
_selectionFunctionExpression = function;
selectionRange = range.node(function);
@@ -486,7 +482,7 @@
}
}
- List<AstNode> selectedNodes = analyzer.selectedNodes;
+ var selectedNodes = analyzer.selectedNodes;
// If no selected nodes, extract the smallest covering expression.
if (selectedNodes.isEmpty) {
@@ -504,7 +500,7 @@
// Check selected nodes.
if (selectedNodes.isNotEmpty) {
- AstNode selectedNode = selectedNodes.first;
+ var selectedNode = selectedNodes.first;
_parentMember = getEnclosingClassOrUnitMember(selectedNode);
// single expression selected
if (selectedNodes.length == 1) {
@@ -525,8 +521,8 @@
}
// statements selected
{
- List<Statement> selectedStatements = [];
- for (AstNode selectedNode in selectedNodes) {
+ var selectedStatements = <Statement>[];
+ for (var selectedNode in selectedNodes) {
if (selectedNode is Statement) {
selectedStatements.add(selectedNode);
}
@@ -572,14 +568,12 @@
if (selectionRange.length != 0) {
return null;
}
- int offset = selectionRange.offset;
- AstNode node =
- NodeLocator2(offset, offset).searchWithin(resolveResult.unit);
+ var offset = selectionRange.offset;
+ var node = NodeLocator2(offset, offset).searchWithin(resolveResult.unit);
// Check for the parameter list of a FunctionExpression.
{
- FunctionExpression function =
- node?.thisOrAncestorOfType<FunctionExpression>();
+ var function = node?.thisOrAncestorOfType<FunctionExpression>();
if (function != null &&
function.parameters != null &&
range.node(function.parameters).contains(offset)) {
@@ -592,7 +586,7 @@
node.parent is Label &&
node.parent.parent is NamedExpression) {
NamedExpression namedExpression = node.parent.parent;
- Expression expression = namedExpression.expression;
+ var expression = namedExpression.expression;
if (expression is FunctionExpression) {
return expression;
}
@@ -610,11 +604,11 @@
if (argument.parent is NamedExpression) {
argument = argument.parent as NamedExpression;
}
- ParameterElement parameter = argument.staticParameterElement;
+ var parameter = argument.staticParameterElement;
if (parameter != null) {
- DartType parameterType = parameter.type;
+ var parameterType = parameter.type;
if (parameterType is FunctionType) {
- String typeCode = _getTypeCode(parameterType.returnType);
+ var typeCode = _getTypeCode(parameterType.returnType);
if (typeCode != 'dynamic') {
return typeCode + ' ';
}
@@ -626,13 +620,13 @@
/// Returns the selected [Expression] source, with applying new parameter
/// names.
String _getMethodBodySource() {
- String source = utils.getRangeText(selectionRange);
+ var source = utils.getRangeText(selectionRange);
// prepare operations to replace variables with parameters
- List<SourceEdit> replaceEdits = [];
- for (RefactoringMethodParameter parameter in _parameters) {
- List<SourceRange> ranges = _parameterReferencesMap[parameter.id];
+ var replaceEdits = <SourceEdit>[];
+ for (var parameter in _parameters) {
+ var ranges = _parameterReferencesMap[parameter.id];
if (ranges != null) {
- for (SourceRange range in ranges) {
+ for (var range in ranges) {
replaceEdits.add(SourceEdit(range.offset - selectionRange.offset,
range.length, parameter.name));
}
@@ -646,15 +640,15 @@
AstNode baseNode =
_selectionFunctionExpression.thisOrAncestorOfType<Statement>();
if (baseNode != null) {
- String baseIndent = utils.getNodePrefix(baseNode);
- String targetIndent = utils.getNodePrefix(_parentMember);
+ var baseIndent = utils.getNodePrefix(baseNode);
+ var targetIndent = utils.getNodePrefix(_parentMember);
source = utils.replaceSourceIndent(source, baseIndent, targetIndent);
source = source.trim();
}
}
if (_selectionStatements != null) {
- String selectionIndent = utils.getNodePrefix(_selectionStatements[0]);
- String targetIndent = utils.getNodePrefix(_parentMember) + ' ';
+ var selectionIndent = utils.getNodePrefix(_selectionStatements[0]);
+ var targetIndent = utils.getNodePrefix(_parentMember) + ' ';
source = utils.replaceSourceIndent(source, selectionIndent, targetIndent);
}
// done
@@ -662,13 +656,13 @@
}
_SourcePattern _getSourcePattern(SourceRange range) {
- String originalSource = utils.getText(range.offset, range.length);
- _SourcePattern pattern = _SourcePattern();
- List<SourceEdit> replaceEdits = <SourceEdit>[];
+ var originalSource = utils.getText(range.offset, range.length);
+ var pattern = _SourcePattern();
+ var replaceEdits = <SourceEdit>[];
resolveResult.unit
.accept(_GetSourcePatternVisitor(range, pattern, replaceEdits));
replaceEdits = replaceEdits.reversed.toList();
- String source = SourceEdit.applySequence(originalSource, replaceEdits);
+ var source = SourceEdit.applySequence(originalSource, replaceEdits);
pattern.normalizedSource =
_getNormalizedSource(source, resolveResult.unit.featureSet);
return pattern;
@@ -679,7 +673,7 @@
}
void _initializeHasAwait() {
- _HasAwaitVisitor visitor = _HasAwaitVisitor();
+ var visitor = _HasAwaitVisitor();
if (_selectionExpression != null) {
_selectionExpression.accept(visitor);
} else if (_selectionStatements != null) {
@@ -694,11 +688,11 @@
void _initializeOccurrences() {
_occurrences.clear();
// prepare selection
- _SourcePattern selectionPattern = _getSourcePattern(selectionRange);
- Map<String, String> patternToSelectionName =
+ var selectionPattern = _getSourcePattern(selectionRange);
+ var patternToSelectionName =
_inverseMap(selectionPattern.originalToPatternNames);
// prepare an enclosing parent - class or unit
- AstNode enclosingMemberParent = _parentMember.parent;
+ var enclosingMemberParent = _parentMember.parent;
// visit nodes which will able to access extracted method
enclosingMemberParent.accept(_InitializeOccurrencesVisitor(
this, selectionPattern, patternToSelectionName));
@@ -712,8 +706,8 @@
_parameters.clear();
_parametersMap.clear();
_parameterReferencesMap.clear();
- RefactoringStatus result = RefactoringStatus();
- List<VariableElement> assignedUsedVariables = [];
+ var result = RefactoringStatus();
+ var assignedUsedVariables = <VariableElement>[];
var unit = resolveResult.unit;
_visibleRangeMap = VisibleRangesComputer.forNode(unit);
@@ -727,7 +721,7 @@
}
// verify that none or all execution flows end with a "return"
if (_selectionStatements != null) {
- bool hasReturn = _selectionStatements.any(_mayEndWithReturnStatement);
+ var hasReturn = _selectionStatements.any(_mayEndWithReturnStatement);
if (hasReturn && !ExitDetector.exits(_selectionStatements.last)) {
result.addError(ERROR_EXITS);
}
@@ -735,7 +729,7 @@
// maybe ends with "return" statement
if (_selectionStatements != null) {
TypeSystem typeSystem = await resolveResult.typeSystem;
- _ReturnTypeComputer returnTypeComputer = _ReturnTypeComputer(typeSystem);
+ var returnTypeComputer = _ReturnTypeComputer(typeSystem);
_selectionStatements.forEach((statement) {
statement.accept(returnTypeComputer);
});
@@ -751,14 +745,14 @@
return result;
}
// prepare to return an assigned variable
- VariableElement returnVariable = assignedUsedVariables[0];
+ var returnVariable = assignedUsedVariables[0];
_returnType = returnVariable.type;
_returnVariableName = returnVariable.displayName;
}
// fatal, if multiple variables assigned and used after selection
if (assignedUsedVariables.length > 1) {
- StringBuffer sb = StringBuffer();
- for (VariableElement variable in assignedUsedVariables) {
+ var sb = StringBuffer();
+ for (var variable in assignedUsedVariables) {
sb.write(variable.displayName);
sb.write('\n');
}
@@ -774,7 +768,7 @@
Future<void> _initializeReturnType() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- TypeProvider typeProvider = await resolveResult.typeProvider;
+ var typeProvider = await resolveResult.typeProvider;
if (_selectionFunctionExpression != null) {
variableType = '';
returnType = '';
@@ -817,13 +811,13 @@
}
bool _isParameterNameConflictWithBody(RefactoringMethodParameter parameter) {
- String id = parameter.id;
- String name = parameter.name;
- List<SourceRange> parameterRanges = _parameterReferencesMap[id];
- List<SourceRange> otherRanges = _localNames[name];
- for (SourceRange parameterRange in parameterRanges) {
+ var id = parameter.id;
+ var name = parameter.name;
+ var parameterRanges = _parameterReferencesMap[id];
+ var otherRanges = _localNames[name];
+ for (var parameterRange in parameterRanges) {
if (otherRanges != null) {
- for (SourceRange otherRange in otherRanges) {
+ for (var otherRange in otherRanges) {
if (parameterRange.intersects(otherRange)) {
return true;
}
@@ -847,7 +841,7 @@
/// proposed as names of the extracted method.
void _prepareExcludedNames() {
_excludedNames.clear();
- List<LocalElement> localElements = getDefinedLocalElements(_parentMember);
+ var localElements = getDefinedLocalElements(_parentMember);
_excludedNames.addAll(localElements.map((e) => e.name));
}
@@ -863,7 +857,7 @@
void _prepareOffsetsLengths() {
offsets.clear();
lengths.clear();
- for (_Occurrence occurrence in _occurrences) {
+ for (var occurrence in _occurrences) {
offsets.add(occurrence.range.offset);
lengths.add(occurrence.range.length);
}
@@ -895,7 +889,7 @@
/// Returns `true` if the given [statement] may end with a [ReturnStatement].
static bool _mayEndWithReturnStatement(Statement statement) {
- _HasReturnStatementVisitor visitor = _HasReturnStatementVisitor();
+ var visitor = _HasReturnStatementVisitor();
statement.accept(visitor);
return visitor.hasReturn;
}
@@ -924,7 +918,7 @@
@override
Object visitAssignmentExpression(AssignmentExpression node) {
super.visitAssignmentExpression(node);
- Expression lhs = node.leftHandSide;
+ var lhs = node.leftHandSide;
if (_isFirstSelectedNode(lhs)) {
invalidSelection('Cannot extract the left-hand side of an assignment.',
newLocation_fromNode(lhs));
@@ -984,7 +978,7 @@
invalidSelection('Cannot extract the name part of a declaration.');
}
// method name
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is FunctionElement || element is MethodElement) {
invalidSelection('Cannot extract a single method name.');
}
@@ -1019,7 +1013,7 @@
}
void _checkParent(AstNode node) {
- AstNode firstParent = firstSelectedNode.parent;
+ var firstParent = firstSelectedNode.parent;
do {
node = node.parent;
if (identical(node, firstParent)) {
@@ -1042,19 +1036,19 @@
@override
void visitSimpleIdentifier(SimpleIdentifier node) {
- SourceRange nodeRange = range.node(node);
+ var nodeRange = range.node(node);
if (partRange.covers(nodeRange)) {
- Element element = _getLocalElement(node);
+ var element = _getLocalElement(node);
if (element != null) {
// name of a named expression
if (isNamedExpressionName(node)) {
return;
}
// continue
- String originalName = element.displayName;
- String patternName = pattern.originalToPatternNames[originalName];
+ var originalName = element.displayName;
+ var patternName = pattern.originalToPatternNames[originalName];
if (patternName == null) {
- DartType parameterType = _getElementType(element);
+ var parameterType = _getElementType(element);
pattern.parameterTypes.add(parameterType);
patternName = '__refVar${pattern.originalToPatternNames.length}';
pattern.originalToPatternNames[originalName] = patternName;
@@ -1138,7 +1132,7 @@
if (ref._selectionFunctionExpression != null ||
ref._selectionExpression != null &&
node.runtimeType == ref._selectionExpression.runtimeType) {
- SourceRange nodeRange = range.node(node);
+ var nodeRange = range.node(node);
_tryToFindOccurrence(nodeRange);
}
super.visitExpression(node);
@@ -1170,16 +1164,16 @@
return false;
}
// prepare node source
- _SourcePattern nodePattern = ref._getSourcePattern(nodeRange);
+ var nodePattern = ref._getSourcePattern(nodeRange);
// if matches normalized node source, then add as occurrence
if (selectionPattern.isCompatible(nodePattern)) {
- _Occurrence occurrence =
+ var occurrence =
_Occurrence(nodeRange, ref.selectionRange.intersects(nodeRange));
ref._occurrences.add(occurrence);
// prepare mapping of parameter names to the occurrence variables
nodePattern.originalToPatternNames
.forEach((String originalName, String patternName) {
- String selectionName = patternToSelectionName[patternName];
+ var selectionName = patternToSelectionName[patternName];
occurrence._parameterOldToOccurrenceName[selectionName] = originalName;
});
// update static
@@ -1194,12 +1188,12 @@
}
void _visitStatements(List<Statement> statements) {
- int beginStatementIndex = 0;
- int selectionCount = ref._selectionStatements.length;
+ var beginStatementIndex = 0;
+ var selectionCount = ref._selectionStatements.length;
while (beginStatementIndex + selectionCount <= statements.length) {
- SourceRange nodeRange = range.startEnd(statements[beginStatementIndex],
+ var nodeRange = range.startEnd(statements[beginStatementIndex],
statements[beginStatementIndex + selectionCount - 1]);
- bool found = _tryToFindOccurrence(nodeRange);
+ var found = _tryToFindOccurrence(nodeRange);
// next statement
if (found) {
beginStatementIndex += selectionCount;
@@ -1218,13 +1212,13 @@
@override
void visitSimpleIdentifier(SimpleIdentifier node) {
- SourceRange nodeRange = range.node(node);
+ var nodeRange = range.node(node);
if (!ref.selectionRange.covers(nodeRange)) {
return;
}
- String name = node.name;
+ var name = node.name;
// analyze local element
- Element element = _getLocalElement(node);
+ var element = _getLocalElement(node);
if (element != null) {
// name of the named expression
if (isNamedExpressionName(node)) {
@@ -1233,14 +1227,14 @@
// if declared outside, add parameter
if (!ref._isDeclaredInSelection(element)) {
// add parameter
- RefactoringMethodParameter parameter = ref._parametersMap[name];
+ var parameter = ref._parametersMap[name];
if (parameter == null) {
- DartType parameterType = node.staticType;
- StringBuffer parametersBuffer = StringBuffer();
- String parameterTypeCode = ref.utils.getTypeSource(
+ var parameterType = node.staticType;
+ var parametersBuffer = StringBuffer();
+ var parameterTypeCode = ref.utils.getTypeSource(
parameterType, ref.librariesToImport,
parametersBuffer: parametersBuffer);
- String parametersCode =
+ var parametersCode =
parametersBuffer.isNotEmpty ? parametersBuffer.toString() : null;
parameter = RefactoringMethodParameter(
RefactoringMethodParameterKind.REQUIRED, parameterTypeCode, name,
@@ -1283,9 +1277,9 @@
@override
void visitSimpleIdentifier(SimpleIdentifier node) {
- Element nodeElement = node.staticElement;
+ var nodeElement = node.staticElement;
if (identical(nodeElement, element)) {
- int nodeOffset = node.offset;
+ var nodeOffset = node.offset;
if (nodeOffset > ref.selectionRange.end) {
result = true;
}
@@ -1317,12 +1311,12 @@
@override
void visitReturnStatement(ReturnStatement node) {
// prepare expression
- Expression expression = node.expression;
+ var expression = node.expression;
if (expression == null) {
return;
}
// prepare type
- DartType type = expression.staticType;
+ var type = expression.staticType;
if (type.isBottom) {
return;
}
@@ -1354,7 +1348,7 @@
if (other.parameterTypes.length != parameterTypes.length) {
return false;
}
- for (int i = 0; i < parameterTypes.length; i++) {
+ for (var i = 0; i < parameterTypes.length; i++) {
if (other.parameterTypes[i] != parameterTypes[i]) {
return false;
}
diff --git a/pkg/analysis_server/lib/src/services/refactoring/extract_widget.dart b/pkg/analysis_server/lib/src/services/refactoring/extract_widget.dart
index 2d9c23c..843a254 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/extract_widget.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/extract_widget.dart
@@ -96,7 +96,7 @@
Future<RefactoringStatus> checkFinalConditions() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- RefactoringStatus result = RefactoringStatus();
+ var result = RefactoringStatus();
result.addStatus(validateClassName(name));
return result;
}
@@ -105,14 +105,14 @@
Future<RefactoringStatus> checkInitialConditions() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- RefactoringStatus result = RefactoringStatus();
+ var result = RefactoringStatus();
result.addStatus(_checkSelection());
if (result.hasFatalError) {
return result;
}
- AstNode astNode = _expression ?? _method ?? _statements.first;
+ var astNode = _expression ?? _method ?? _statements.first;
_enclosingUnitMember = astNode.thisOrAncestorMatching((n) {
return n is CompilationUnitMember && n.parent is CompilationUnit;
});
@@ -125,7 +125,7 @@
@override
RefactoringStatus checkName() {
- RefactoringStatus result = RefactoringStatus();
+ var result = RefactoringStatus();
// Validate the name.
result.addStatus(validateClassName(name));
@@ -134,10 +134,8 @@
if (!result.hasFatalError) {
visitLibraryTopLevelElements(resolveResult.libraryElement, (element) {
if (hasDisplayName(element, name)) {
- String message = format(
- "Library already declares {0} with name '{1}'.",
- getElementKindName(element),
- name);
+ var message = format("Library already declares {0} with name '{1}'.",
+ getElementKindName(element), name);
result.addError(message, newLocation_fromElement(element));
}
});
@@ -179,7 +177,7 @@
/// Checks if [offset] is a widget creation expression that can be extracted.
RefactoringStatus _checkSelection() {
- AstNode node =
+ var node =
NodeLocator(offset, offset + length).searchWithin(resolveResult.unit);
// Treat single ReturnStatement as its expression.
@@ -228,7 +226,7 @@
break;
}
if (node is MethodDeclaration) {
- DartType returnType = node.returnType?.type;
+ var returnType = node.returnType?.type;
if (flutter.isWidgetType(returnType) && node.body != null) {
_method = node;
return RefactoringStatus();
@@ -286,7 +284,7 @@
await null;
_ParametersCollector collector;
if (_expression != null) {
- SourceRange localRange = range.node(_expression);
+ var localRange = range.node(_expression);
collector = _ParametersCollector(_enclosingClassElement, localRange);
_expression.accept(collector);
}
@@ -298,7 +296,7 @@
}
}
if (_method != null) {
- SourceRange localRange = range.node(_method);
+ var localRange = range.node(_method);
collector = _ParametersCollector(_enclosingClassElement, localRange);
_method.body.accept(collector);
}
@@ -322,7 +320,7 @@
}
}
- RefactoringStatus status = collector.status;
+ var status = collector.status;
// If there is an existing parameter "key" warn the user.
// We could rename it, but that would require renaming references to it.
@@ -362,8 +360,8 @@
/// Remove the [_method] declaration.
void _removeMethodDeclaration(DartFileEditBuilder builder) {
- SourceRange methodRange = range.node(_method);
- SourceRange linesRange =
+ var methodRange = range.node(_method);
+ var linesRange =
utils.getLinesRange(methodRange, skipLeadingEmptyLines: true);
builder.addDeletion(linesRange);
}
@@ -385,7 +383,7 @@
// Insert field references (as named arguments).
// Ensure that invocation arguments are named.
- int argumentIndex = 0;
+ var argumentIndex = 0;
for (var parameter in _parameters) {
if (parameter != _parameters.first) {
builder.write(', ');
@@ -393,7 +391,7 @@
builder.write(parameter.name);
builder.write(': ');
if (parameter.isMethodParameter) {
- Expression argument = arguments[argumentIndex++];
+ var argument = arguments[argumentIndex++];
if (argument is NamedExpression) {
argument = (argument as NamedExpression).expression;
}
@@ -505,10 +503,10 @@
},
bodyWriter: () {
if (_expression != null) {
- String indentOld = utils.getLinePrefix(_expression.offset);
- String indentNew = ' ';
+ var indentOld = utils.getLinePrefix(_expression.offset);
+ var indentNew = ' ';
- String code = utils.getNodeText(_expression);
+ var code = utils.getNodeText(_expression);
code = _replaceIndent(code, indentOld, indentNew);
builder.writeln('{');
@@ -519,10 +517,10 @@
builder.writeln(' }');
} else if (_statements != null) {
- String indentOld = utils.getLinePrefix(_statementsRange.offset);
- String indentNew = ' ';
+ var indentOld = utils.getLinePrefix(_statementsRange.offset);
+ var indentNew = ' ';
- String code = utils.getRangeText(_statementsRange);
+ var code = utils.getRangeText(_statementsRange);
code = _replaceIndent(code, indentOld, indentNew);
builder.writeln('{');
@@ -533,7 +531,7 @@
builder.writeln(' }');
} else {
- String code = utils.getNodeText(_method.body);
+ var code = utils.getNodeText(_method.body);
builder.writeln(code);
}
},
@@ -607,11 +605,11 @@
@override
void visitSimpleIdentifier(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element == null) {
return;
}
- String elementName = element.displayName;
+ var elementName = element.displayName;
DartType type;
if (element is MethodElement) {
@@ -628,7 +626,7 @@
}
}
} else if (element is PropertyAccessorElement) {
- PropertyInducingElement field = element.variable;
+ var field = element.variable;
if (_isMemberOfEnclosingClass(field)) {
if (node.inSetterContext()) {
status.addError("Write to '$elementName' cannot be extracted.");
diff --git a/pkg/analysis_server/lib/src/services/refactoring/inline_local.dart b/pkg/analysis_server/lib/src/services/refactoring/inline_local.dart
index 0db156b..f5e2e3f 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/inline_local.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/inline_local.dart
@@ -12,13 +12,11 @@
import 'package:analysis_server/src/services/search/search_engine.dart';
import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/ast/precedence.dart';
import 'package:analyzer/dart/ast/token.dart';
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/src/dart/analysis/session_helper.dart';
import 'package:analyzer/src/dart/ast/utilities.dart';
import 'package:analyzer/src/generated/java_core.dart';
-import 'package:analyzer/src/generated/source.dart';
import 'package:analyzer_plugin/utilities/range_factory.dart';
/// [InlineLocalRefactoring] implementation.
@@ -59,7 +57,7 @@
@override
Future<RefactoringStatus> checkFinalConditions() {
- RefactoringStatus result = RefactoringStatus();
+ var result = RefactoringStatus();
return Future.value(result);
}
@@ -67,12 +65,12 @@
Future<RefactoringStatus> checkInitialConditions() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- RefactoringStatus result = RefactoringStatus();
+ var result = RefactoringStatus();
// prepare variable
{
- AstNode offsetNode = NodeLocator(offset).searchWithin(resolveResult.unit);
+ var offsetNode = NodeLocator(offset).searchWithin(resolveResult.unit);
if (offsetNode is SimpleIdentifier) {
- Element element = offsetNode.staticElement;
+ var element = offsetNode.staticElement;
if (element is LocalVariableElement) {
_variableElement = element;
var declarationResult =
@@ -91,7 +89,7 @@
}
// should have initializer at declaration
if (_variableNode.initializer == null) {
- String message = format(
+ var message = format(
"Local variable '{0}' is not initialized at declaration.",
_variableElement.displayName);
result =
@@ -101,10 +99,9 @@
// prepare references
_references = await searchEngine.searchReferences(_variableElement);
// should not have assignments
- for (SearchMatch reference in _references) {
+ for (var reference in _references) {
if (reference.kind != MatchKind.READ) {
- String message = format(
- "Local variable '{0}' is assigned more than once.",
+ var message = format("Local variable '{0}' is assigned more than once.",
[_variableElement.displayName]);
return RefactoringStatus.fatal(
message, newLocation_fromMatch(reference));
@@ -116,25 +113,25 @@
@override
Future<SourceChange> createChange() {
- SourceChange change = SourceChange(refactoringName);
+ var change = SourceChange(refactoringName);
// remove declaration
{
Statement declarationStatement =
_variableNode.thisOrAncestorOfType<VariableDeclarationStatement>();
- SourceRange range = utils.getLinesRangeStatements([declarationStatement]);
+ var range = utils.getLinesRangeStatements([declarationStatement]);
doSourceChange_addElementEdit(change, resolveResult.unit.declaredElement,
newSourceEdit_range(range, ''));
}
// prepare initializer
- Expression initializer = _variableNode.initializer;
- String initializerCode = utils.getNodeText(initializer);
+ var initializer = _variableNode.initializer;
+ var initializerCode = utils.getNodeText(initializer);
// replace references
- for (SearchMatch reference in _references) {
- SourceRange editRange = reference.sourceRange;
+ for (var reference in _references) {
+ var editRange = reference.sourceRange;
// prepare context
- int offset = editRange.offset;
- AstNode node = utils.findNode(offset);
- AstNode parent = node.parent;
+ var offset = editRange.offset;
+ var node = utils.findNode(offset);
+ var parent = node.parent;
// prepare code
String codeForReference;
if (parent is InterpolationExpression) {
@@ -145,8 +142,8 @@
(!initializer.isMultiline || target.isMultiline)) {
editRange = range.node(parent);
// unwrap the literal being inlined
- int initOffset = initializer.contentsOffset;
- int initLength = initializer.contentsEnd - initOffset;
+ var initOffset = initializer.contentsOffset;
+ var initLength = initializer.contentsEnd - initOffset;
codeForReference = utils.getText(initOffset, initLength);
} else if (_shouldBeExpressionInterpolation(parent, initializer)) {
codeForReference = '{$initializerCode}';
@@ -170,7 +167,7 @@
if (_variableNode == null) {
return false;
}
- AstNode parent = _variableNode.parent;
+ var parent = _variableNode.parent;
if (parent is VariableDeclarationList) {
parent = parent.parent;
if (parent is VariableDeclarationStatement) {
@@ -183,22 +180,22 @@
static bool _shouldBeExpressionInterpolation(
InterpolationExpression target, Expression expression) {
- TokenType targetType = target.beginToken.type;
+ var targetType = target.beginToken.type;
return targetType == TokenType.STRING_INTERPOLATION_IDENTIFIER &&
expression is! SimpleIdentifier;
}
static bool _shouldUseParenthesis(Expression init, AstNode node) {
// check precedence
- Precedence initPrecedence = getExpressionPrecedence(init);
+ var initPrecedence = getExpressionPrecedence(init);
if (initPrecedence < getExpressionParentPrecedence(node)) {
return true;
}
// special case for '-'
- AstNode parent = node.parent;
+ var parent = node.parent;
if (init is PrefixExpression && parent is PrefixExpression) {
if (parent.operator.type == TokenType.MINUS) {
- TokenType initializerOperator = init.operator.type;
+ var initializerOperator = init.operator.type;
if (initializerOperator == TokenType.MINUS ||
initializerOperator == TokenType.MINUS_MINUS) {
return true;
diff --git a/pkg/analysis_server/lib/src/services/refactoring/inline_method.dart b/pkg/analysis_server/lib/src/services/refactoring/inline_method.dart
index eb0afb6..a35aa2a 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/inline_method.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/inline_method.dart
@@ -26,12 +26,12 @@
/// Returns the [SourceRange] to find conflicting locals in.
SourceRange _getLocalsConflictingRange(AstNode node) {
// maybe Block
- Block block = node.thisOrAncestorOfType<Block>();
+ var block = node.thisOrAncestorOfType<Block>();
if (block != null) {
return range.startEnd(node, block);
}
// maybe whole executable
- AstNode executableNode = getEnclosingExecutableNode(node);
+ var executableNode = getEnclosingExecutableNode(node);
if (executableNode != null) {
return range.node(executableNode);
}
@@ -49,12 +49,12 @@
Expression targetExpression,
List<Expression> arguments) {
// prepare edits to replace parameters with arguments
- List<SourceEdit> edits = <SourceEdit>[];
+ var edits = <SourceEdit>[];
part._parameters.forEach(
(ParameterElement parameter, List<_ParameterOccurrence> occurrences) {
// prepare argument
Expression argument;
- for (Expression arg in arguments) {
+ for (var arg in arguments) {
if (arg.staticParameterElement == parameter) {
argument = arg;
break;
@@ -82,8 +82,8 @@
argumentSource ??= 'null';
}
// replace all occurrences of this parameter
- for (_ParameterOccurrence occurrence in occurrences) {
- SourceRange range = occurrence.range;
+ for (var occurrence in occurrences) {
+ var range = occurrence.range;
// prepare argument source to apply at this occurrence
String occurrenceArgumentSource;
if (argumentPrecedence < occurrence.parentPrecedence) {
@@ -97,33 +97,33 @@
});
// replace static field "qualifier" with invocation target
part._implicitClassNameOffsets.forEach((String className, List<int> offsets) {
- for (int offset in offsets) {
+ for (var offset in offsets) {
// edits.add(newSourceEdit_range(range, className + '.'));
edits.add(SourceEdit(offset, 0, className + '.'));
}
});
// replace "this" references with invocation target
if (targetExpression != null) {
- String targetSource = utils.getNodeText(targetExpression);
+ var targetSource = utils.getNodeText(targetExpression);
// explicit "this" references
- for (int offset in part._explicitThisOffsets) {
+ for (var offset in part._explicitThisOffsets) {
edits.add(SourceEdit(offset, 4, targetSource));
}
// implicit "this" references
targetSource += '.';
- for (int offset in part._implicitThisOffsets) {
+ for (var offset in part._implicitThisOffsets) {
edits.add(SourceEdit(offset, 0, targetSource));
}
}
// prepare edits to replace conflicting variables
- Set<String> conflictingNames = _getNamesConflictingAt(contextNode);
+ var conflictingNames = _getNamesConflictingAt(contextNode);
part._variables.forEach((VariableElement variable, List<SourceRange> ranges) {
- String originalName = variable.displayName;
+ var originalName = variable.displayName;
// prepare unique name
String uniqueName;
{
uniqueName = originalName;
- int uniqueIndex = 2;
+ var uniqueIndex = 2;
while (conflictingNames.contains(uniqueName)) {
uniqueName = originalName + uniqueIndex.toString();
uniqueIndex++;
@@ -131,7 +131,7 @@
}
// update references, if name was change
if (uniqueName != originalName) {
- for (SourceRange range in ranges) {
+ for (var range in ranges) {
edits.add(newSourceEdit_range(range, uniqueName));
}
}
@@ -144,11 +144,11 @@
/// Returns the names which will shadow or will be shadowed by any declaration
/// at [node].
Set<String> _getNamesConflictingAt(AstNode node) {
- Set<String> result = <String>{};
+ var result = <String>{};
// local variables and functions
{
- SourceRange localsRange = _getLocalsConflictingRange(node);
- AstNode enclosingExecutable = getEnclosingExecutableNode(node);
+ var localsRange = _getLocalsConflictingRange(node);
+ var enclosingExecutable = getEnclosingExecutableNode(node);
var visibleRangeMap = VisibleRangesComputer.forNode(enclosingExecutable);
visibleRangeMap.forEach((element, elementRange) {
if (elementRange.intersects(localsRange)) {
@@ -158,14 +158,14 @@
}
// fields
{
- ClassElement enclosingClassElement = getEnclosingClassElement(node);
+ var enclosingClassElement = getEnclosingClassElement(node);
if (enclosingClassElement != null) {
- Set<ClassElement> elements = <ClassElement>{};
+ var elements = <ClassElement>{};
elements.add(enclosingClassElement);
elements.addAll(getSuperClasses(enclosingClassElement));
- for (ClassElement classElement in elements) {
- List<Element> classMembers = getChildren(classElement);
- for (Element classMemberElement in classMembers) {
+ for (var classElement in elements) {
+ var classMembers = getChildren(classElement);
+ for (var classMemberElement in classMembers) {
result.add(classMemberElement.displayName);
}
}
@@ -213,7 +213,7 @@
if (_methodElement == null) {
return null;
}
- Element classElement = _methodElement.enclosingElement;
+ var classElement = _methodElement.enclosingElement;
if (classElement is ClassElement) {
return classElement.displayName;
}
@@ -240,19 +240,19 @@
@override
Future<RefactoringStatus> checkFinalConditions() {
change = SourceChange(refactoringName);
- RefactoringStatus result = RefactoringStatus();
+ var result = RefactoringStatus();
// check for compatibility of "deleteSource" and "inlineAll"
if (deleteSource && !inlineAll) {
result.addError('All references must be inlined to remove the source.');
}
// prepare changes
- for (_ReferenceProcessor processor in _referenceProcessors) {
+ for (var processor in _referenceProcessors) {
processor._process(result);
}
// delete method
if (deleteSource && inlineAll) {
- SourceRange methodRange = range.node(_methodNode);
- SourceRange linesRange =
+ var methodRange = range.node(_methodNode);
+ var linesRange =
_methodUtils.getLinesRange(methodRange, skipLeadingEmptyLines: true);
doSourceChange_addElementEdit(
change, _methodElement, newSourceEdit_range(linesRange, ''));
@@ -265,7 +265,7 @@
Future<RefactoringStatus> checkInitialConditions() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- RefactoringStatus result = RefactoringStatus();
+ var result = RefactoringStatus();
// prepare method information
result.addStatus(await _prepareMethod());
if (result.hasFatalError) {
@@ -284,11 +284,10 @@
// analyze method body
result.addStatus(_prepareMethodParts());
// process references
- List<SearchMatch> references =
- await searchEngine.searchReferences(_methodElement);
+ var references = await searchEngine.searchReferences(_methodElement);
_referenceProcessors.clear();
- for (SearchMatch reference in references) {
- _ReferenceProcessor processor = _ReferenceProcessor(this, reference);
+ for (var reference in references) {
+ var processor = _ReferenceProcessor(this, reference);
await processor.init();
_referenceProcessors.add(processor);
}
@@ -301,9 +300,9 @@
}
_SourcePart _createSourcePart(SourceRange range) {
- String source = _methodUtils.getRangeText(range);
- String prefix = getLinePrefix(source);
- _SourcePart result = _SourcePart(range.offset, source, prefix);
+ var source = _methodUtils.getRangeText(range);
+ var prefix = getLinePrefix(source);
+ var result = _SourcePart(range.offset, source, prefix);
// remember parameters and variables occurrences
_methodUnit.accept(_VariablesVisitor(_methodElement, range, result));
// done
@@ -320,16 +319,16 @@
deleteSource = false;
inlineAll = false;
// prepare for failure
- RefactoringStatus fatalStatus = RefactoringStatus.fatal(
+ var fatalStatus = RefactoringStatus.fatal(
'Method declaration or reference must be selected to activate this refactoring.');
// prepare selected SimpleIdentifier
- AstNode node = NodeLocator(offset).searchWithin(resolveResult.unit);
+ var node = NodeLocator(offset).searchWithin(resolveResult.unit);
if (node is! SimpleIdentifier) {
return fatalStatus;
}
- SimpleIdentifier identifier = node as SimpleIdentifier;
+ var identifier = node as SimpleIdentifier;
// prepare selected ExecutableElement
- Element element = identifier.staticElement;
+ var element = identifier.staticElement;
if (element is! ExecutableElement) {
return fatalStatus;
}
@@ -366,22 +365,22 @@
/// Analyze [_methodBody] to fill [_methodExpressionPart] and
/// [_methodStatementsPart].
RefactoringStatus _prepareMethodParts() {
- RefactoringStatus result = RefactoringStatus();
+ var result = RefactoringStatus();
if (_methodBody is ExpressionFunctionBody) {
- ExpressionFunctionBody body = _methodBody as ExpressionFunctionBody;
+ var body = _methodBody as ExpressionFunctionBody;
_methodExpression = body.expression;
- SourceRange methodExpressionRange = range.node(_methodExpression);
+ var methodExpressionRange = range.node(_methodExpression);
_methodExpressionPart = _createSourcePart(methodExpressionRange);
} else if (_methodBody is BlockFunctionBody) {
- Block body = (_methodBody as BlockFunctionBody).block;
+ var body = (_methodBody as BlockFunctionBody).block;
List<Statement> statements = body.statements;
if (statements.isNotEmpty) {
- Statement lastStatement = statements[statements.length - 1];
+ var lastStatement = statements[statements.length - 1];
// "return" statement requires special handling
if (lastStatement is ReturnStatement) {
_methodExpression = lastStatement.expression;
if (_methodExpression != null) {
- SourceRange methodExpressionRange = range.node(_methodExpression);
+ var methodExpressionRange = range.node(_methodExpression);
_methodExpressionPart = _createSourcePart(methodExpressionRange);
}
// exclude "return" statement from statements
@@ -389,7 +388,7 @@
}
// if there are statements, process them
if (statements.isNotEmpty) {
- SourceRange statementsRange =
+ var statementsRange =
_methodUtils.getLinesRangeStatements(statements);
_methodStatementsPart = _createSourcePart(statementsRange);
}
@@ -434,7 +433,7 @@
// prepare node and environment
_node = _refUtils.findNode(reference.sourceRange.offset);
- Statement refStatement = _node.thisOrAncestorOfType<Statement>();
+ var refStatement = _node.thisOrAncestorOfType<Statement>();
if (refStatement != null) {
_refLineRange = _refUtils.getLinesRangeStatements([refStatement]);
_refPrefix = _refUtils.getNodePrefix(refStatement);
@@ -459,15 +458,15 @@
return true;
}
// analyze point of invocation
- AstNode parent = usage.parent;
- AstNode parent2 = parent.parent;
+ var parent = usage.parent;
+ var parent2 = parent.parent;
// OK, if statement in block
if (parent is Statement) {
return parent2 is Block;
}
// maybe assignment, in block
if (parent is AssignmentExpression) {
- AssignmentExpression assignment = parent;
+ var assignment = parent;
// inlining setter
if (assignment.leftHandSide == usage) {
return parent2 is Statement && parent2.parent is Block;
@@ -479,7 +478,7 @@
if (ref._methodExpressionPart != null) {
if (parent is VariableDeclaration) {
if (parent2 is VariableDeclarationList) {
- AstNode parent3 = parent2.parent;
+ var parent3 = parent2.parent;
return parent3 is VariableDeclarationStatement &&
parent3.parent is Block;
}
@@ -501,30 +500,30 @@
// insert non-return statements
if (ref._methodStatementsPart != null) {
// prepare statements source for invocation
- String source = _getMethodSourceForInvocation(status,
+ var source = _getMethodSourceForInvocation(status,
ref._methodStatementsPart, _refUtils, usage, target, arguments);
source = _refUtils.replaceSourceIndent(
source, ref._methodStatementsPart._prefix, _refPrefix);
// do insert
- SourceEdit edit =
+ var edit =
newSourceEdit_range(SourceRange(_refLineRange.offset, 0), source);
_addRefEdit(edit);
}
// replace invocation with return expression
if (ref._methodExpressionPart != null) {
// prepare expression source for invocation
- String source = _getMethodSourceForInvocation(status,
+ var source = _getMethodSourceForInvocation(status,
ref._methodExpressionPart, _refUtils, usage, target, arguments);
if (getExpressionPrecedence(ref._methodExpression) <
getExpressionParentPrecedence(usage)) {
source = '($source)';
}
// do replace
- SourceRange methodUsageRange = range.node(usage);
- SourceEdit edit = newSourceEdit_range(methodUsageRange, source);
+ var methodUsageRange = range.node(usage);
+ var edit = newSourceEdit_range(methodUsageRange, source);
_addRefEdit(edit);
} else {
- SourceEdit edit = newSourceEdit_range(_refLineRange, '');
+ var edit = newSourceEdit_range(_refLineRange, '');
_addRefEdit(edit);
}
return;
@@ -534,18 +533,17 @@
{
source = ref._methodUtils.getRangeText(range.startEnd(
ref._methodParameters.leftParenthesis, ref._methodNode));
- String methodPrefix =
- ref._methodUtils.getLinePrefix(ref._methodNode.offset);
+ var methodPrefix = ref._methodUtils.getLinePrefix(ref._methodNode.offset);
source = _refUtils.replaceSourceIndent(source, methodPrefix, _refPrefix);
source = source.trim();
}
// do insert
- SourceEdit edit = newSourceEdit_range(range.node(_node), source);
+ var edit = newSourceEdit_range(range.node(_node), source);
_addRefEdit(edit);
}
void _process(RefactoringStatus status) {
- AstNode nodeParent = _node.parent;
+ var nodeParent = _node.parent;
// may be only single place should be inlined
if (!_shouldProcess()) {
return;
@@ -553,7 +551,7 @@
// If the element being inlined is async, ensure that the function
// body that encloses the method is also async.
if (ref._methodElement.isAsynchronous) {
- FunctionBody body = _node.thisOrAncestorOfType<FunctionBody>();
+ var body = _node.thisOrAncestorOfType<FunctionBody>();
if (body != null) {
if (body.isSynchronous) {
if (body.isGenerator) {
@@ -571,7 +569,7 @@
}
}
if (ref._alreadyMadeAsync.add(refElement)) {
- SourceRange bodyStart = range.startLength(body, 0);
+ var bodyStart = range.startLength(body, 0);
_addRefEdit(newSourceEdit_range(bodyStart, 'async '));
}
}
@@ -579,8 +577,8 @@
}
// may be invocation of inline method
if (nodeParent is MethodInvocation) {
- MethodInvocation invocation = nodeParent;
- Expression target = invocation.target;
+ var invocation = nodeParent;
+ var target = invocation.target;
List<Expression> arguments = invocation.argumentList.arguments;
_inlineMethodInvocation(
status, invocation, invocation.isCascaded, target, arguments);
@@ -595,24 +593,23 @@
if (ref._methodElement is PropertyAccessorElement) {
Expression usage = _node;
Expression target;
- bool cascade = false;
+ var cascade = false;
if (nodeParent is PrefixedIdentifier) {
- PrefixedIdentifier propertyAccess = nodeParent;
+ var propertyAccess = nodeParent;
usage = propertyAccess;
target = propertyAccess.prefix;
cascade = false;
}
if (nodeParent is PropertyAccess) {
- PropertyAccess propertyAccess = nodeParent;
+ var propertyAccess = nodeParent;
usage = propertyAccess;
target = propertyAccess.realTarget;
cascade = propertyAccess.isCascaded;
}
// prepare arguments
- List<Expression> arguments = [];
+ var arguments = <Expression>[];
if (_node.inSetterContext()) {
- AssignmentExpression assignment =
- _node.thisOrAncestorOfType<AssignmentExpression>();
+ var assignment = _node.thisOrAncestorOfType<AssignmentExpression>();
arguments.add(assignment.rightHandSide);
}
// inline body
@@ -624,7 +621,7 @@
{
source = ref._methodUtils.getRangeText(range.startEnd(
ref._methodParameters.leftParenthesis, ref._methodNode));
- String methodPrefix =
+ var methodPrefix =
ref._methodUtils.getLinePrefix(ref._methodNode.offset);
source =
_refUtils.replaceSourceIndent(source, methodPrefix, _refPrefix);
@@ -632,14 +629,14 @@
source = removeEnd(source, ';');
}
// do insert
- SourceEdit edit = newSourceEdit_range(range.node(_node), source);
+ var edit = newSourceEdit_range(range.node(_node), source);
_addRefEdit(edit);
}
}
bool _shouldProcess() {
if (!ref.inlineAll) {
- SourceRange parentRange = range.node(_node);
+ var parentRange = range.node(_node);
return parentRange.contains(ref.offset);
}
return true;
@@ -694,7 +691,7 @@
}
void addImplicitClassNameOffset(String className, int offset) {
- List<int> offsets = _implicitClassNameOffsets[className];
+ var offsets = _implicitClassNameOffsets[className];
if (offsets == null) {
offsets = [];
_implicitClassNameOffsets[className] = offsets;
@@ -709,7 +706,7 @@
void addParameterOccurrence(ParameterElement parameter,
SourceRange identifierRange, Precedence precedence) {
if (parameter != null) {
- List<_ParameterOccurrence> occurrences = _parameters[parameter];
+ var occurrences = _parameters[parameter];
if (occurrences == null) {
occurrences = [];
_parameters[parameter] = occurrences;
@@ -720,7 +717,7 @@
}
void addVariable(VariableElement element, SourceRange identifierRange) {
- List<SourceRange> ranges = _variables[element];
+ var ranges = _variables[element];
if (ranges == null) {
ranges = [];
_variables[element] = ranges;
@@ -747,7 +744,7 @@
@override
void visitNode(AstNode node) {
- SourceRange nodeRange = range.node(node);
+ var nodeRange = range.node(node);
if (!bodyRange.intersects(nodeRange)) {
return null;
}
@@ -756,7 +753,7 @@
@override
void visitSimpleIdentifier(SimpleIdentifier node) {
- SourceRange nodeRange = range.node(node);
+ var nodeRange = range.node(node);
if (bodyRange.covers(nodeRange)) {
_addMemberQualifier(node);
_addParameter(node);
@@ -766,7 +763,7 @@
@override
void visitThisExpression(ThisExpression node) {
- int offset = node.offset;
+ var offset = node.offset;
if (bodyRange.contains(offset)) {
result.addExplicitThisOffset(offset);
}
@@ -779,7 +776,7 @@
return;
}
// should be a method or field reference
- Element element = node.staticElement;
+ var element = node.staticElement;
if (!(element is MethodElement || element is PropertyAccessorElement)) {
return;
}
@@ -788,9 +785,9 @@
}
// record the implicit static or instance reference
ExecutableElement member = element;
- int offset = node.offset;
+ var offset = node.offset;
if (member.isStatic) {
- String className = member.enclosingElement.displayName;
+ var className = member.enclosingElement.displayName;
result.addImplicitClassNameOffset(className, offset);
} else {
result.addImplicitThisOffset(offset);
@@ -798,7 +795,7 @@
}
void _addParameter(SimpleIdentifier node) {
- ParameterElement parameterElement = getParameterElement(node);
+ var parameterElement = getParameterElement(node);
// not a parameter
if (parameterElement == null) {
return;
@@ -808,8 +805,8 @@
return;
}
// OK, add occurrence
- SourceRange nodeRange = range.node(node);
- Precedence parentPrecedence = getExpressionParentPrecedence(node);
+ var nodeRange = range.node(node);
+ var parentPrecedence = getExpressionParentPrecedence(node);
result.addParameterOccurrence(
parameterElement, nodeRange, parentPrecedence);
}
@@ -817,7 +814,7 @@
void _addVariable(SimpleIdentifier node) {
VariableElement variableElement = getLocalVariableElement(node);
if (variableElement != null) {
- SourceRange nodeRange = range.node(node);
+ var nodeRange = range.node(node);
result.addVariable(variableElement, nodeRange);
}
}
diff --git a/pkg/analysis_server/lib/src/services/refactoring/move_file.dart b/pkg/analysis_server/lib/src/services/refactoring/move_file.dart
index 85f64e7..5de7725 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/move_file.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/move_file.dart
@@ -9,10 +9,8 @@
import 'package:analysis_server/src/services/correction/status.dart';
import 'package:analysis_server/src/services/refactoring/refactoring.dart';
import 'package:analysis_server/src/services/refactoring/refactoring_internal.dart';
-import 'package:analysis_server/src/services/search/search_engine.dart';
import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/file_system/file_system.dart';
import 'package:analyzer/src/dart/analysis/driver.dart';
import 'package:analyzer/src/generated/source.dart';
@@ -68,8 +66,8 @@
@override
Future<SourceChange> createChange() async {
- final ChangeBuilder changeBuilder = ChangeBuilder();
- final CompilationUnitElement element = resolvedUnit.unit.declaredElement;
+ var changeBuilder = ChangeBuilder();
+ var element = resolvedUnit.unit.declaredElement;
if (element == null) {
return changeBuilder.sourceChange;
}
@@ -80,12 +78,12 @@
// If this element is a library, update outgoing references inside the file.
if (element == libraryElement.definingCompilationUnit) {
// Handle part-of directives in this library
- final ResolvedLibraryResult libraryResult = await driver.currentSession
+ var libraryResult = await driver.currentSession
.getResolvedLibraryByElement(libraryElement);
ResolvedUnitResult definingUnitResult;
- for (ResolvedUnitResult result in libraryResult.units) {
+ for (var result in libraryResult.units) {
if (result.isPart) {
- Iterable<PartOfDirective> partOfs = result.unit.directives
+ var partOfs = result.unit.directives
.whereType<PartOfDirective>()
.where(
(po) => po.uri != null && _isRelativeUri(po.uri.stringValue));
@@ -95,9 +93,9 @@
partOfs.forEach((po) {
final oldDir = pathContext.dirname(oldFile);
final newDir = pathContext.dirname(newFile);
- String newLocation =
+ var newLocation =
pathContext.join(newDir, pathos.basename(newFile));
- String newUri = _getRelativeUri(newLocation, oldDir);
+ var newUri = _getRelativeUri(newLocation, oldDir);
builder.addSimpleReplacement(
SourceRange(po.uri.offset, po.uri.length), "'$newUri'");
});
@@ -110,8 +108,8 @@
}
await changeBuilder.addFileEdit(definingUnitResult.path, (builder) {
- final String oldDir = pathContext.dirname(oldFile);
- final String newDir = pathContext.dirname(newFile);
+ var oldDir = pathContext.dirname(oldFile);
+ var newDir = pathContext.dirname(newFile);
for (var directive in definingUnitResult.unit.directives) {
if (directive is UriBasedDirective) {
_updateUriReference(builder, directive, oldDir, newDir);
@@ -120,7 +118,7 @@
});
} else {
// Otherwise, we need to update any relative part-of references.
- Iterable<PartOfDirective> partOfs = resolvedUnit.unit.directives
+ var partOfs = resolvedUnit.unit.directives
.whereType<PartOfDirective>()
.where((po) => po.uri != null && _isRelativeUri(po.uri.stringValue));
@@ -129,8 +127,8 @@
partOfs.forEach((po) {
final oldDir = pathContext.dirname(oldFile);
final newDir = pathContext.dirname(newFile);
- String oldLocation = pathContext.join(oldDir, po.uri.stringValue);
- String newUri = _getRelativeUri(oldLocation, newDir);
+ var oldLocation = pathContext.join(oldDir, po.uri.stringValue);
+ var newUri = _getRelativeUri(oldLocation, newDir);
builder.addSimpleReplacement(
SourceRange(po.uri.offset, po.uri.length), "'$newUri'");
});
@@ -139,12 +137,12 @@
}
// Update incoming references to this file
- List<SearchMatch> matches =
+ var matches =
await refactoringWorkspace.searchEngine.searchReferences(element);
- List<SourceReference> references = getSourceReferences(matches);
- for (SourceReference reference in references) {
+ var references = getSourceReferences(matches);
+ for (var reference in references) {
await changeBuilder.addFileEdit(reference.file, (builder) {
- String newUri = _computeNewUri(reference);
+ var newUri = _computeNewUri(reference);
builder.addSimpleReplacement(reference.range, "'$newUri'");
});
}
@@ -154,12 +152,12 @@
/// Computes the URI to use to reference [newFile] from [reference].
String _computeNewUri(SourceReference reference) {
- String refDir = pathContext.dirname(reference.file);
+ var refDir = pathContext.dirname(reference.file);
// Try to keep package: URI
if (_isPackageReference(reference)) {
Source newSource =
NonExistingSource(newFile, pathos.toUri(newFile), UriKind.FILE_URI);
- Uri restoredUri = driver.sourceFactory.restoreUri(newSource);
+ var restoredUri = driver.sourceFactory.restoreUri(newSource);
if (restoredUri != null) {
return restoredUri.toString();
}
@@ -168,15 +166,14 @@
}
String _getRelativeUri(String path, String from) {
- String uri = pathContext.relative(path, from: from);
- List<String> parts = pathContext.split(uri);
+ var uri = pathContext.relative(path, from: from);
+ var parts = pathContext.split(uri);
return pathos.posix.joinAll(parts);
}
bool _isPackageReference(SourceReference reference) {
- final Source source = reference.element.source;
- final String quotedImportUri = source.contents.data.substring(
- reference.range.offset,
+ var source = reference.element.source;
+ var quotedImportUri = source.contents.data.substring(reference.range.offset,
reference.range.offset + reference.range.length);
return packagePrefixedStringPattern.hasMatch(quotedImportUri);
}
@@ -204,8 +201,8 @@
var uriNode = directive.uri;
var uriValue = uriNode.stringValue;
if (_isRelativeUri(uriValue)) {
- String elementPath = pathContext.join(oldDir, uriValue);
- String newUri = _getRelativeUri(elementPath, newDir);
+ var elementPath = pathContext.join(oldDir, uriValue);
+ var newUri = _getRelativeUri(elementPath, newDir);
builder.addSimpleReplacement(range.node(uriNode), "'$newUri'");
}
}
diff --git a/pkg/analysis_server/lib/src/services/refactoring/naming_conventions.dart b/pkg/analysis_server/lib/src/services/refactoring/naming_conventions.dart
index 6eba14f..d139ce5 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/naming_conventions.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/naming_conventions.dart
@@ -83,17 +83,17 @@
return RefactoringStatus.fatal('Library name must not be blank.');
}
// check identifiers
- List<String> identifiers = name.split('.');
- for (String identifier in identifiers) {
- RefactoringStatus status = _validateIdentifier(identifier,
- 'Library name identifier', 'a lowercase letter or underscore');
+ var identifiers = name.split('.');
+ for (var identifier in identifiers) {
+ var status = _validateIdentifier(identifier, 'Library name identifier',
+ 'a lowercase letter or underscore');
if (!status.isOK) {
return status;
}
}
// should not have upper-case letters
- for (String identifier in identifiers) {
- for (int c in identifier.codeUnits) {
+ for (var identifier in identifiers) {
+ for (var c in identifier.codeUnits) {
if (isUpperCase(c)) {
return RefactoringStatus.warning(
'Library name should consist of lowercase identifier separated by dots.');
@@ -132,47 +132,47 @@
String identifier, String desc, String beginDesc,
{bool allowBuiltIn = false}) {
// has leading/trailing spaces
- String trimmed = identifier.trim();
+ var trimmed = identifier.trim();
if (identifier != trimmed) {
- String message = '$desc must not start or end with a blank.';
+ var message = '$desc must not start or end with a blank.';
return RefactoringStatus.fatal(message);
}
// empty
- int length = identifier.length;
+ var length = identifier.length;
if (length == 0) {
- String message = '$desc must not be empty.';
+ var message = '$desc must not be empty.';
return RefactoringStatus.fatal(message);
}
// keyword
{
- Keyword keyword = Keyword.keywords[identifier];
+ var keyword = Keyword.keywords[identifier];
if (keyword != null) {
if (keyword.isBuiltInOrPseudo && allowBuiltIn) {
- String message = 'Avoid using built-in identifiers as names.';
+ var message = 'Avoid using built-in identifiers as names.';
return RefactoringStatus.warning(message);
} else {
- String message = '$desc must not be a keyword.';
+ var message = '$desc must not be a keyword.';
return RefactoringStatus.fatal(message);
}
}
}
// invalid characters
- for (int i = 0; i < length; i++) {
- int currentChar = identifier.codeUnitAt(i);
+ for (var i = 0; i < length; i++) {
+ var currentChar = identifier.codeUnitAt(i);
if (!isLetterOrDigit(currentChar) &&
currentChar != CHAR_UNDERSCORE &&
currentChar != CHAR_DOLLAR) {
- String charStr = String.fromCharCode(currentChar);
- String message = "$desc must not contain '$charStr'.";
+ var charStr = String.fromCharCode(currentChar);
+ var message = "$desc must not contain '$charStr'.";
return RefactoringStatus.fatal(message);
}
}
// first character
- final int currentChar = identifier.codeUnitAt(0);
+ var currentChar = identifier.codeUnitAt(0);
if (!isLetter(currentChar) &&
currentChar != CHAR_UNDERSCORE &&
currentChar != CHAR_DOLLAR) {
- String message = '$desc must begin with $beginDesc.';
+ var message = '$desc must begin with $beginDesc.';
return RefactoringStatus.fatal(message);
}
// OK
@@ -185,11 +185,11 @@
desc += ' name';
// null
if (identifier == null) {
- String message = '$desc must not be null.';
+ var message = '$desc must not be null.';
return RefactoringStatus.fatal(message);
}
// is not identifier
- RefactoringStatus status = _validateIdentifier(
+ var status = _validateIdentifier(
identifier, desc, 'a lowercase letter or underscore',
allowBuiltIn: allowBuiltIn);
if (!status.isOK) {
@@ -205,7 +205,7 @@
}
// does not start with lower case
if (!isLowerCase(identifier.codeUnitAt(0))) {
- String message = '$desc should start with a lowercase letter.';
+ var message = '$desc should start with a lowercase letter.';
return RefactoringStatus.warning(message);
}
// OK
@@ -217,11 +217,11 @@
desc += ' name';
// null
if (identifier == null) {
- String message = '$desc must not be null.';
+ var message = '$desc must not be null.';
return RefactoringStatus.fatal(message);
}
// is not identifier
- RefactoringStatus status = _validateIdentifier(
+ var status = _validateIdentifier(
identifier, desc, 'an uppercase letter or underscore');
if (!status.isOK) {
return status;
@@ -237,7 +237,7 @@
// does not start with upper case
if (!isUpperCase(identifier.codeUnitAt(0))) {
// By convention, class names usually start with an uppercase letter
- String message = '$desc should start with an uppercase letter.';
+ var message = '$desc should start with an uppercase letter.';
return RefactoringStatus.warning(message);
}
// OK
diff --git a/pkg/analysis_server/lib/src/services/refactoring/refactoring.dart b/pkg/analysis_server/lib/src/services/refactoring/refactoring.dart
index 1b43684..c4220c4 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/refactoring.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/refactoring.dart
@@ -382,8 +382,8 @@
/// the class when on the `new` keyword).
static RenameRefactoringElement getElementToRename(
AstNode node, Element element) {
- int offset = node.offset;
- int length = node.length;
+ var offset = node.offset;
+ var length = node.length;
if (node is SimpleIdentifier && element is ParameterElement) {
element = declaredParameterElement(node, element);
@@ -407,7 +407,7 @@
// Rename the class when on `new` in an instance creation.
if (node is InstanceCreationExpression) {
- InstanceCreationExpression creation = node;
+ var creation = node;
var typeIdentifier = creation.constructorName.type.name;
element = typeIdentifier.staticElement;
offset = typeIdentifier.offset;
diff --git a/pkg/analysis_server/lib/src/services/refactoring/refactoring_internal.dart b/pkg/analysis_server/lib/src/services/refactoring/refactoring_internal.dart
index c138323..b32654d 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/refactoring_internal.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/refactoring_internal.dart
@@ -22,9 +22,9 @@
/// refactorings we want to update each [Source] only once.
List<SourceReference> getSourceReferences(List<SearchMatch> matches) {
var uniqueReferences = HashMap<SourceReference, SourceReference>();
- for (SearchMatch match in matches) {
- SourceReference newReference = getSourceReference(match);
- SourceReference oldReference = uniqueReferences[newReference];
+ for (var match in matches) {
+ var newReference = getSourceReference(match);
+ var oldReference = uniqueReferences[newReference];
if (oldReference == null) {
uniqueReferences[newReference] = newReference;
oldReference = newReference;
@@ -42,7 +42,7 @@
Future<RefactoringStatus> checkAllConditions() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- RefactoringStatus result = RefactoringStatus();
+ var result = RefactoringStatus();
result.addStatus(await checkInitialConditions());
if (result.hasFatalError) {
return result;
@@ -67,7 +67,7 @@
@override
int get hashCode {
- int hash = file.hashCode;
+ var hash = file.hashCode;
hash = ((hash << 16) & 0xFFFFFFFF) + range.hashCode;
return hash;
}
@@ -91,7 +91,7 @@
/// Adds the [SourceEdit] to replace this reference.
void addEdit(SourceChange change, String newText, {String id}) {
- SourceEdit edit = createEdit(newText, id: id);
+ var edit = createEdit(newText, id: id);
doSourceChange_addSourceEdit(change, unitSource, edit);
}
diff --git a/pkg/analysis_server/lib/src/services/refactoring/rename.dart b/pkg/analysis_server/lib/src/services/refactoring/rename.dart
index 25b18e4..371f720 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/rename.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/rename.dart
@@ -25,16 +25,15 @@
/// Add the edit that updates the [element] declaration.
void addDeclarationEdit(Element element) {
if (element != null && workspace.containsElement(element)) {
- SourceEdit edit =
- newSourceEdit_range(range.elementName(element), newName);
+ var edit = newSourceEdit_range(range.elementName(element), newName);
doSourceChange_addElementEdit(change, element, edit);
}
}
/// Add edits that update [matches].
void addReferenceEdits(List<SearchMatch> matches) {
- List<SourceReference> references = getSourceReferences(matches);
- for (SourceReference reference in references) {
+ var references = getSourceReferences(matches);
+ for (var reference in references) {
if (!workspace.containsElement(reference.element)) {
continue;
}
@@ -75,16 +74,16 @@
@override
Future<RefactoringStatus> checkInitialConditions() {
- RefactoringStatus result = RefactoringStatus();
+ var result = RefactoringStatus();
if (element.source.isInSystemLibrary) {
- String message = format(
+ var message = format(
"The {0} '{1}' is defined in the SDK, so cannot be renamed.",
getElementKindName(element),
getElementQualifiedName(element));
result.addFatalError(message);
}
if (!workspace.containsElement(element)) {
- String message = format(
+ var message = format(
"The {0} '{1}' is defined outside of the project, so cannot be renamed.",
getElementKindName(element),
getElementQualifiedName(element));
@@ -95,7 +94,7 @@
@override
RefactoringStatus checkNewName() {
- RefactoringStatus result = RefactoringStatus();
+ var result = RefactoringStatus();
if (newName == oldName) {
result.addFatalError(
'The new name must be different than the current name.');
@@ -107,7 +106,7 @@
Future<SourceChange> createChange() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- String changeName = "$refactoringName '$oldName' to '$newName'";
+ var changeName = "$refactoringName '$oldName' to '$newName'";
change = SourceChange(changeName);
await fillChange();
return change;
@@ -118,7 +117,7 @@
static String _getDisplayName(Element element) {
if (element is ImportElement) {
- PrefixElement prefix = element.prefix;
+ var prefix = element.prefix;
if (prefix != null) {
return prefix.displayName;
}
diff --git a/pkg/analysis_server/lib/src/services/refactoring/rename_class_member.dart b/pkg/analysis_server/lib/src/services/refactoring/rename_class_member.dart
index 12e19b5..38fc012 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/rename_class_member.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/rename_class_member.dart
@@ -68,7 +68,7 @@
Future<RefactoringStatus> checkInitialConditions() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- RefactoringStatus result = await super.checkInitialConditions();
+ var result = await super.checkInitialConditions();
if (element is MethodElement && (element as MethodElement).isOperator) {
result.addFatalError('Cannot rename operator.');
}
@@ -77,7 +77,7 @@
@override
RefactoringStatus checkNewName() {
- RefactoringStatus result = super.checkNewName();
+ var result = super.checkNewName();
if (element is FieldElement) {
result.addStatus(validateFieldName(newName));
}
@@ -91,7 +91,7 @@
Future<void> fillChange() async {
var processor = RenameProcessor(workspace, change, newName);
// update declarations
- for (Element renameElement in _validator.elements) {
+ for (var renameElement in _validator.elements) {
if (renameElement.isSynthetic && renameElement is FieldElement) {
processor.addDeclarationEdit(renameElement.getter);
processor.addDeclarationEdit(renameElement.setter);
@@ -102,17 +102,16 @@
// update references
processor.addReferenceEdits(_validator.references);
// potential matches
- List<SearchMatch> nameMatches =
- await searchEngine.searchMemberReferences(oldName);
- List<SourceReference> nameRefs = getSourceReferences(nameMatches);
- for (SourceReference reference in nameRefs) {
+ var nameMatches = await searchEngine.searchMemberReferences(oldName);
+ var nameRefs = getSourceReferences(nameMatches);
+ for (var reference in nameRefs) {
// ignore references from SDK and pub cache
if (!workspace.containsElement(reference.element)) {
continue;
}
// check the element being renamed is accessible
{
- LibraryElement whereLibrary = reference.element.library;
+ var whereLibrary = reference.element.library;
if (!element.isAccessibleIn(whereLibrary)) {
continue;
}
@@ -123,7 +122,7 @@
}
String _newPotentialId() {
- String id = potentialEditIds.length.toString();
+ var id = potentialEditIds.length.toString();
potentialEditIds.add(id);
return id;
}
@@ -164,7 +163,7 @@
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// check if there is a member with "newName" in the same ClassElement
- for (Element newNameMember in getChildren(elementClass, name)) {
+ for (var newNameMember in getChildren(elementClass, name)) {
result.addError(
format(
"Class '{0}' already declares {1} with name '{2}'.",
@@ -174,13 +173,12 @@
newLocation_fromElement(newNameMember));
}
// do chained computations
- Set<ClassElement> superClasses = getSuperClasses(elementClass);
+ var superClasses = getSuperClasses(elementClass);
await _prepareReferences();
- Set<ClassElement> subClasses =
- await searchEngine.searchAllSubtypes(elementClass);
+ var subClasses = await searchEngine.searchAllSubtypes(elementClass);
// check shadowing of class names
if (element != null) {
- for (Element element in elements) {
+ for (var element in elements) {
ClassElement clazz = element.enclosingElement;
if (clazz.name == name) {
result.addError(
@@ -203,9 +201,9 @@
}
// usage of the renamed Element is shadowed by a local element
{
- _MatchShadowedByLocal conflict = await _getShadowingLocalElement();
+ var conflict = await _getShadowingLocalElement();
if (conflict != null) {
- LocalElement localElement = conflict.localElement;
+ var localElement = conflict.localElement;
result.addError(
format(
"Usage of renamed {0} will be shadowed by {1} '{2}'.",
@@ -216,11 +214,10 @@
}
}
// check shadowing in the hierarchy
- List<SearchMatch> declarations =
- await searchEngine.searchMemberDeclarations(name);
- for (SearchMatch declaration in declarations) {
- Element nameElement = getSyntheticAccessorVariable(declaration.element);
- Element nameClass = nameElement.enclosingElement;
+ var declarations = await searchEngine.searchMemberDeclarations(name);
+ for (var declaration in declarations) {
+ var nameElement = getSyntheticAccessorVariable(declaration.element);
+ var nameClass = nameElement.enclosingElement;
// the renamed Element shadows a member of a superclass
if (superClasses.contains(nameClass)) {
result.addError(
@@ -275,15 +272,15 @@
return localElements;
}
- for (SearchMatch match in references) {
+ for (var match in references) {
// Qualified reference cannot be shadowed by local elements.
if (match.isQualified) {
continue;
}
// Check local elements that might shadow the reference.
var localElements = await getLocalElements(match.element);
- for (LocalElement localElement in localElements) {
- SourceRange elementRange = visibleRangeMap[localElement];
+ for (var localElement in localElements) {
+ var elementRange = visibleRangeMap[localElement];
if (elementRange != null &&
elementRange.intersects(match.sourceRange)) {
return _MatchShadowedByLocal(match, localElement);
@@ -315,8 +312,7 @@
await Future.forEach(elements, (Element element) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- List<SearchMatch> elementReferences =
- await searchEngine.searchReferences(element);
+ var elementReferences = await searchEngine.searchReferences(element);
references.addAll(elementReferences);
});
}
@@ -326,11 +322,11 @@
if (!Identifier.isPrivateName(name)) {
return;
}
- for (SearchMatch reference in references) {
- Element refElement = reference.element;
- LibraryElement refLibrary = refElement.library;
+ for (var reference in references) {
+ var refElement = reference.element;
+ var refLibrary = refElement.library;
if (refLibrary != library) {
- String message = format("Renamed {0} will be invisible in '{1}'.",
+ var message = format("Renamed {0} will be invisible in '{1}'.",
getElementKindName(element), getElementQualifiedName(refLibrary));
result.addError(message, newLocation_fromMatch(reference));
}
@@ -346,7 +342,7 @@
@override
void visitSimpleIdentifier(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is LocalElement && element.name == name) {
elements.add(element);
}
diff --git a/pkg/analysis_server/lib/src/services/refactoring/rename_constructor.dart b/pkg/analysis_server/lib/src/services/refactoring/rename_constructor.dart
index 4602b47..9376f8a 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/rename_constructor.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/rename_constructor.dart
@@ -40,13 +40,13 @@
@override
Future<RefactoringStatus> checkFinalConditions() {
- RefactoringStatus result = RefactoringStatus();
+ var result = RefactoringStatus();
return Future.value(result);
}
@override
RefactoringStatus checkNewName() {
- RefactoringStatus result = super.checkNewName();
+ var result = super.checkNewName();
result.addStatus(validateConstructorName(newName));
if (newName != null) {
_analyzePossibleConflicts(result);
@@ -59,8 +59,8 @@
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// prepare references
- List<SearchMatch> matches = await searchEngine.searchReferences(element);
- List<SourceReference> references = getSourceReferences(matches);
+ var matches = await searchEngine.searchReferences(element);
+ var references = getSourceReferences(matches);
// append declaration
if (element.isSynthetic) {
await _replaceSynthetic();
@@ -68,33 +68,30 @@
references.add(_createDeclarationReference());
}
// update references
- String replacement = newName.isEmpty ? '' : '.$newName';
- for (SourceReference reference in references) {
+ var replacement = newName.isEmpty ? '' : '.$newName';
+ for (var reference in references) {
reference.addEdit(change, replacement);
}
}
void _analyzePossibleConflicts(RefactoringStatus result) {
- ClassElement parentClass = element.enclosingElement;
+ var parentClass = element.enclosingElement;
// Check if the "newName" is the name of the enclosing class.
if (parentClass.name == newName) {
result.addError('The constructor should not have the same name '
'as the name of the enclosing class.');
}
// check if there are members with "newName" in the same ClassElement
- for (Element newNameMember in getChildren(parentClass, newName)) {
- String message = format(
- "Class '{0}' already declares {1} with name '{2}'.",
- parentClass.displayName,
- getElementKindName(newNameMember),
- newName);
+ for (var newNameMember in getChildren(parentClass, newName)) {
+ var message = format("Class '{0}' already declares {1} with name '{2}'.",
+ parentClass.displayName, getElementKindName(newNameMember), newName);
result.addError(message, newLocation_fromElement(newNameMember));
}
}
SourceReference _createDeclarationReference() {
SourceRange sourceRange;
- int offset = element.periodOffset;
+ var offset = element.periodOffset;
if (offset != null) {
sourceRange = range.startOffsetEndOffset(offset, element.nameEnd);
} else {
@@ -115,7 +112,7 @@
Future<void> _replaceSynthetic() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- ClassElement classElement = element.enclosingElement;
+ var classElement = element.enclosingElement;
var result = await AnalysisSessionHelper(session)
.getElementDeclaration(classElement);
diff --git a/pkg/analysis_server/lib/src/services/refactoring/rename_extension_member.dart b/pkg/analysis_server/lib/src/services/refactoring/rename_extension_member.dart
index b0e1bcf..700f7cf 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/rename_extension_member.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/rename_extension_member.dart
@@ -53,7 +53,7 @@
@override
Future<RefactoringStatus> checkInitialConditions() async {
- RefactoringStatus result = await super.checkInitialConditions();
+ var result = await super.checkInitialConditions();
if (element is MethodElement && (element as MethodElement).isOperator) {
result.addFatalError('Cannot rename operator.');
}
@@ -62,7 +62,7 @@
@override
RefactoringStatus checkNewName() {
- RefactoringStatus result = super.checkNewName();
+ var result = super.checkNewName();
if (element is FieldElement) {
result.addStatus(validateFieldName(newName));
}
@@ -115,7 +115,7 @@
Future<RefactoringStatus> validate() async {
// Check if there is a member with "newName" in the extension.
- for (Element newNameMember in getChildren(elementExtension, name)) {
+ for (var newNameMember in getChildren(elementExtension, name)) {
result.addError(
format(
"Extension '{0}' already declares {1} with name '{2}'.",
@@ -131,9 +131,9 @@
// usage of the renamed Element is shadowed by a local element
{
- _MatchShadowedByLocal conflict = await _getShadowingLocalElement();
+ var conflict = await _getShadowingLocalElement();
if (conflict != null) {
- LocalElement localElement = conflict.localElement;
+ var localElement = conflict.localElement;
result.addError(
format(
"Usage of renamed {0} will be shadowed by {1} '{2}'.",
@@ -172,15 +172,15 @@
return localElements;
}
- for (SearchMatch match in references) {
+ for (var match in references) {
// Qualified reference cannot be shadowed by local elements.
if (match.isQualified) {
continue;
}
// Check local elements that might shadow the reference.
var localElements = await getLocalElements(match.element);
- for (LocalElement localElement in localElements) {
- SourceRange elementRange = visibleRangeMap[localElement];
+ for (var localElement in localElements) {
+ var elementRange = visibleRangeMap[localElement];
if (elementRange != null &&
elementRange.intersects(match.sourceRange)) {
return _MatchShadowedByLocal(match, localElement);
@@ -208,7 +208,7 @@
@override
void visitSimpleIdentifier(SimpleIdentifier node) {
- Element element = node.staticElement;
+ var element = node.staticElement;
if (element is LocalElement && element.name == name) {
elements.add(element);
}
diff --git a/pkg/analysis_server/lib/src/services/refactoring/rename_import.dart b/pkg/analysis_server/lib/src/services/refactoring/rename_import.dart
index 24e106e..0876e3a 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/rename_import.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/rename_import.dart
@@ -10,7 +10,6 @@
import 'package:analysis_server/src/services/refactoring/refactoring.dart';
import 'package:analysis_server/src/services/refactoring/refactoring_internal.dart';
import 'package:analysis_server/src/services/refactoring/rename.dart';
-import 'package:analysis_server/src/services/search/search_engine.dart';
import 'package:analyzer/dart/analysis/session.dart';
import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/element/element.dart';
@@ -36,13 +35,13 @@
@override
Future<RefactoringStatus> checkFinalConditions() {
- RefactoringStatus result = RefactoringStatus();
+ var result = RefactoringStatus();
return Future.value(result);
}
@override
RefactoringStatus checkNewName() {
- RefactoringStatus result = super.checkNewName();
+ var result = super.checkNewName();
result.addStatus(validateImportPrefixName(newName));
return result;
}
@@ -53,22 +52,22 @@
await null;
// update declaration
{
- PrefixElement prefix = element.prefix;
+ var prefix = element.prefix;
SourceEdit edit;
if (newName.isEmpty) {
- ImportDirective node = _findNode();
- int uriEnd = node.uri.end;
- int prefixEnd = element.prefixOffset + prefix.nameLength;
+ var node = _findNode();
+ var uriEnd = node.uri.end;
+ var prefixEnd = element.prefixOffset + prefix.nameLength;
edit = newSourceEdit_range(
range.startOffsetEndOffset(uriEnd, prefixEnd), '');
} else {
if (prefix == null) {
- ImportDirective node = _findNode();
- int uriEnd = node.uri.end;
+ var node = _findNode();
+ var uriEnd = node.uri.end;
edit = newSourceEdit_range(SourceRange(uriEnd, 0), ' as $newName');
} else {
- int offset = element.prefixOffset;
- int length = prefix.nameLength;
+ var offset = element.prefixOffset;
+ var length = prefix.nameLength;
edit = newSourceEdit_range(SourceRange(offset, length), newName);
}
}
@@ -77,14 +76,13 @@
}
}
// update references
- List<SearchMatch> matches = await searchEngine.searchReferences(element);
- List<SourceReference> references = getSourceReferences(matches);
- for (SourceReference reference in references) {
+ var matches = await searchEngine.searchReferences(element);
+ var references = getSourceReferences(matches);
+ for (var reference in references) {
if (newName.isEmpty) {
reference.addEdit(change, '');
} else {
- SimpleIdentifier interpolationIdentifier =
- _getInterpolationIdentifier(reference);
+ var interpolationIdentifier = _getInterpolationIdentifier(reference);
if (interpolationIdentifier != null) {
doSourceChange_addElementEdit(
change,
@@ -102,10 +100,10 @@
/// Return the [ImportDirective] node that corresponds to the [element].
ImportDirective _findNode() {
- LibraryElement library = element.library;
- String path = library.source.fullName;
- CompilationUnit unit = session.getParsedUnit(path).unit;
- int index = library.imports.indexOf(element);
+ var library = element.library;
+ var path = library.source.fullName;
+ var unit = session.getParsedUnit(path).unit;
+ var index = library.imports.indexOf(element);
return unit.directives.whereType<ImportDirective>().elementAt(index);
}
@@ -113,12 +111,12 @@
/// an [InterpolationExpression] without surrounding curly brackets, return
/// it. Otherwise return `null`.
SimpleIdentifier _getInterpolationIdentifier(SourceReference reference) {
- Source source = reference.element.source;
- CompilationUnit unit = session.getParsedUnit(source.fullName).unit;
- NodeLocator nodeLocator = NodeLocator(reference.range.offset);
- AstNode node = nodeLocator.searchWithin(unit);
+ var source = reference.element.source;
+ var unit = session.getParsedUnit(source.fullName).unit;
+ var nodeLocator = NodeLocator(reference.range.offset);
+ var node = nodeLocator.searchWithin(unit);
if (node is SimpleIdentifier) {
- AstNode parent = node.parent;
+ var parent = node.parent;
if (parent is InterpolationExpression && parent.rightBracket == null) {
return node;
}
diff --git a/pkg/analysis_server/lib/src/services/refactoring/rename_label.dart b/pkg/analysis_server/lib/src/services/refactoring/rename_label.dart
index a437947..cebd04e 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/rename_label.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/rename_label.dart
@@ -24,13 +24,13 @@
@override
Future<RefactoringStatus> checkFinalConditions() {
- RefactoringStatus result = RefactoringStatus();
+ var result = RefactoringStatus();
return Future.value(result);
}
@override
RefactoringStatus checkNewName() {
- RefactoringStatus result = super.checkNewName();
+ var result = super.checkNewName();
result.addStatus(validateLabelName(newName));
return result;
}
diff --git a/pkg/analysis_server/lib/src/services/refactoring/rename_library.dart b/pkg/analysis_server/lib/src/services/refactoring/rename_library.dart
index 8ff32ce..f6eaa71 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/rename_library.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/rename_library.dart
@@ -26,13 +26,13 @@
@override
Future<RefactoringStatus> checkFinalConditions() {
- RefactoringStatus result = RefactoringStatus();
+ var result = RefactoringStatus();
return Future.value(result);
}
@override
RefactoringStatus checkNewName() {
- RefactoringStatus result = super.checkNewName();
+ var result = super.checkNewName();
result.addStatus(validateLibraryName(newName));
return result;
}
diff --git a/pkg/analysis_server/lib/src/services/refactoring/rename_local.dart b/pkg/analysis_server/lib/src/services/refactoring/rename_local.dart
index 26bf40b..386496d 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/rename_local.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/rename_local.dart
@@ -46,9 +46,9 @@
@override
Future<RefactoringStatus> checkFinalConditions() async {
- RefactoringStatus result = RefactoringStatus();
+ var result = RefactoringStatus();
await _prepareElements();
- for (LocalElement element in elements) {
+ for (var element in elements) {
var resolvedUnit = await sessionHelper.getResolvedUnitByElement(element);
var unit = resolvedUnit.unit;
unit.accept(
@@ -65,7 +65,7 @@
@override
RefactoringStatus checkNewName() {
- RefactoringStatus result = super.checkNewName();
+ var result = super.checkNewName();
if (element is LocalVariableElement) {
result.addStatus(validateVariableName(newName));
} else if (element is ParameterElement) {
@@ -119,13 +119,13 @@
@override
void visitSimpleIdentifier(SimpleIdentifier node) {
- Element nodeElement = node.staticElement;
+ var nodeElement = node.staticElement;
if (nodeElement != null && nodeElement.name == newName) {
// Duplicate declaration.
if (node.inDeclarationContext() && _isVisibleWithTarget(nodeElement)) {
conflictingLocals.add(nodeElement);
- String nodeKind = nodeElement.kind.displayName;
- String message = "Duplicate $nodeKind '$newName'.";
+ var nodeKind = nodeElement.kind.displayName;
+ var message = "Duplicate $nodeKind '$newName'.";
result.addError(message, newLocation_fromElement(nodeElement));
return;
}
@@ -133,17 +133,17 @@
return;
}
// Shadowing by the target element.
- SourceRange targetRange = _getVisibleRange(target);
+ var targetRange = _getVisibleRange(target);
if (targetRange != null &&
targetRange.contains(node.offset) &&
!node.isQualified &&
!_isNamedExpressionName(node)) {
nodeElement = getSyntheticAccessorVariable(nodeElement);
- String nodeKind = nodeElement.kind.displayName;
- String nodeName = getElementQualifiedName(nodeElement);
- String nameElementSourceName = nodeElement.source.shortName;
- String refKind = target.kind.displayName;
- String message = 'Usage of $nodeKind "$nodeName" declared in '
+ var nodeKind = nodeElement.kind.displayName;
+ var nodeName = getElementQualifiedName(nodeElement);
+ var nameElementSourceName = nodeElement.source.shortName;
+ var refKind = target.kind.displayName;
+ var message = 'Usage of $nodeKind "$nodeName" declared in '
'"$nameElementSourceName" will be shadowed by renamed $refKind.';
result.addError(message, newLocation_fromNode(node));
}
@@ -157,8 +157,8 @@
/// Returns whether [element] and [target] are visible together.
bool _isVisibleWithTarget(Element element) {
if (element is LocalElement) {
- SourceRange targetRange = _getVisibleRange(target);
- SourceRange elementRange = _getVisibleRange(element);
+ var targetRange = _getVisibleRange(target);
+ var elementRange = _getVisibleRange(element);
return targetRange != null &&
elementRange != null &&
elementRange.intersects(targetRange);
diff --git a/pkg/analysis_server/lib/src/services/refactoring/rename_unit_member.dart b/pkg/analysis_server/lib/src/services/refactoring/rename_unit_member.dart
index 8ac2532..e6306ba 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/rename_unit_member.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/rename_unit_member.dart
@@ -89,7 +89,7 @@
@override
RefactoringStatus checkNewName() {
- RefactoringStatus result = super.checkNewName();
+ var result = super.checkNewName();
if (element is TopLevelVariableElement) {
result.addStatus(validateVariableName(newName));
}
@@ -108,11 +108,11 @@
@override
Future<void> fillChange() async {
// prepare elements
- List<Element> elements = [];
+ var elements = <Element>[];
if (element is PropertyInducingElement && element.isSynthetic) {
- PropertyInducingElement property = element as PropertyInducingElement;
- PropertyAccessorElement getter = property.getter;
- PropertyAccessorElement setter = property.setter;
+ var property = element as PropertyInducingElement;
+ var getter = property.getter;
+ var setter = property.setter;
if (getter != null) {
elements.add(getter);
}
@@ -200,13 +200,13 @@
/// Returns `true` if [element] is visible at the given [SearchMatch].
bool _isVisibleAt(Element element, SearchMatch at) {
- LibraryElement atLibrary = at.element.library;
+ var atLibrary = at.element.library;
// may be the same library
if (library == atLibrary) {
return true;
}
// check imports
- for (ImportElement importElement in atLibrary.imports) {
+ for (var importElement in atLibrary.imports) {
// ignore if imported with prefix
if (importElement.prefix != null) {
continue;
@@ -225,11 +225,11 @@
if (!Identifier.isPrivateName(name)) {
return;
}
- for (SearchMatch reference in references) {
- Element refElement = reference.element;
- LibraryElement refLibrary = refElement.library;
+ for (var reference in references) {
+ var refElement = reference.element;
+ var refLibrary = refElement.library;
if (refLibrary != library) {
- String message = format("Renamed {0} will be invisible in '{1}'.",
+ var message = format("Renamed {0} will be invisible in '{1}'.",
getElementKindName(element), getElementQualifiedName(refLibrary));
result.addError(message, newLocation_fromMatch(reference));
}
@@ -238,13 +238,13 @@
/// Validates if any usage of [element] renamed to [name] will be shadowed.
void _validateWillBeShadowed() {
- for (SearchMatch reference in references) {
- Element refElement = reference.element;
- ClassElement refClass = refElement.thisOrAncestorOfType();
+ for (var reference in references) {
+ var refElement = reference.element;
+ var refClass = refElement.thisOrAncestorOfType<ClassElement>();
if (refClass != null) {
visitChildren(refClass, (shadow) {
if (hasDisplayName(shadow, name)) {
- String message = format(
+ var message = format(
"Reference to renamed {0} will be shadowed by {1} '{2}'.",
getElementKindName(element),
getElementKindName(shadow),
@@ -262,7 +262,7 @@
void _validateWillConflict() {
visitLibraryTopLevelElements(library, (element) {
if (hasDisplayName(element, name)) {
- String message = format("Library already declares {0} with name '{1}'.",
+ var message = format("Library already declares {0} with name '{1}'.",
getElementKindName(element), name);
result.addError(message, newLocation_fromElement(element));
}
@@ -273,21 +273,19 @@
Future _validateWillShadow() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- List<SearchMatch> declarations =
- await searchEngine.searchMemberDeclarations(name);
- for (SearchMatch declaration in declarations) {
- Element member = declaration.element;
+ var declarations = await searchEngine.searchMemberDeclarations(name);
+ for (var declaration in declarations) {
+ var member = declaration.element;
ClassElement declaringClass = member.enclosingElement;
- List<SearchMatch> memberReferences =
- await searchEngine.searchReferences(member);
- for (SearchMatch memberReference in memberReferences) {
- Element refElement = memberReference.element;
+ var memberReferences = await searchEngine.searchReferences(member);
+ for (var memberReference in memberReferences) {
+ var refElement = memberReference.element;
// cannot be shadowed if qualified
if (memberReference.isQualified) {
continue;
}
// cannot be shadowed if declared in the same class as reference
- ClassElement refClass = refElement.thisOrAncestorOfType();
+ var refClass = refElement.thisOrAncestorOfType<ClassElement>();
if (refClass == declaringClass) {
continue;
}
@@ -296,7 +294,7 @@
continue;
}
// OK, reference will be shadowed be the element being renamed
- String message = format(
+ var message = format(
isRename
? "Renamed {0} will shadow {1} '{2}'."
: "Created {0} will shadow {1} '{2}'.",
diff --git a/pkg/analysis_server/lib/src/services/search/element_visitors.dart b/pkg/analysis_server/lib/src/services/search/element_visitors.dart
index 1671dfe..d3e11ae 100644
--- a/pkg/analysis_server/lib/src/services/search/element_visitors.dart
+++ b/pkg/analysis_server/lib/src/services/search/element_visitors.dart
@@ -64,7 +64,7 @@
@override
void visitElement(Element element) {
- bool visitChildren = processor(element);
+ var visitChildren = processor(element);
if (visitChildren == true) {
element.visitChildren(this);
}
diff --git a/pkg/analysis_server/lib/src/services/search/hierarchy.dart b/pkg/analysis_server/lib/src/services/search/hierarchy.dart
index 87f0d1e..59cccd8 100644
--- a/pkg/analysis_server/lib/src/services/search/hierarchy.dart
+++ b/pkg/analysis_server/lib/src/services/search/hierarchy.dart
@@ -8,11 +8,10 @@
import 'package:analysis_server/src/services/search/element_visitors.dart';
import 'package:analysis_server/src/services/search/search_engine.dart';
import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/dart/element/type.dart';
/// Returns direct children of [parent].
List<Element> getChildren(Element parent, [String name]) {
- List<Element> children = <Element>[];
+ var children = <Element>[];
visitChildren(parent, (Element element) {
if (name == null || element.displayName == name) {
children.add(element);
@@ -27,7 +26,7 @@
/// Includes: fields, accessors and methods.
/// Excludes: constructors and synthetic elements.
List<Element> getClassMembers(ClassElement clazz, [String name]) {
- List<Element> members = <Element>[];
+ var members = <Element>[];
visitChildren(clazz, (Element element) {
if (element.isSynthetic) {
return false;
@@ -54,14 +53,14 @@
SearchEngine searchEngine, ClassElement seed) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- List<SearchMatch> matches = await searchEngine.searchSubtypes(seed);
+ var matches = await searchEngine.searchSubtypes(seed);
return matches.map((match) => match.element).cast<ClassElement>().toSet();
}
/// Return the non-synthetic children of the given [extension]. This includes
/// fields, accessors and methods, but excludes synthetic elements.
List<Element> getExtensionMembers(ExtensionElement extension, [String name]) {
- List<Element> members = <Element>[];
+ var members = <Element>[];
visitChildren(extension, (Element element) {
if (element.isSynthetic) {
return false;
@@ -98,22 +97,21 @@
return Future.value(result);
}
// method, field, etc
- String name = member.displayName;
+ var name = member.displayName;
ClassElement memberClass = member.enclosingElement;
- Set<ClassElement> searchClasses = getSuperClasses(memberClass);
+ var searchClasses = getSuperClasses(memberClass);
searchClasses.add(memberClass);
- for (ClassElement superClass in searchClasses) {
+ for (var superClass in searchClasses) {
// ignore if super- class does not declare member
if (getClassMembers(superClass, name).isEmpty) {
continue;
}
// check all sub- classes
- Set<ClassElement> subClasses =
- await searchEngine.searchAllSubtypes(superClass);
+ var subClasses = await searchEngine.searchAllSubtypes(superClass);
subClasses.add(superClass);
- for (ClassElement subClass in subClasses) {
- List<Element> subClassMembers = getChildren(subClass, name);
- for (Element member in subClassMembers) {
+ for (var subClass in subClasses) {
+ var subClassMembers = getChildren(subClass, name);
+ for (var member in subClassMembers) {
if (member is ClassMemberElement) {
result.add(member);
}
@@ -130,11 +128,11 @@
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (element.isNamed) {
- Element method = element.enclosingElement;
+ var method = element.enclosingElement;
if (method is MethodElement) {
var hierarchyParameters = <ParameterElement>[];
var hierarchyMembers = await getHierarchyMembers(searchEngine, method);
- for (ClassMemberElement hierarchyMethod in hierarchyMembers) {
+ for (var hierarchyMethod in hierarchyMembers) {
if (hierarchyMethod is MethodElement) {
for (var hierarchyParameter in hierarchyMethod.parameters) {
if (hierarchyParameter.isNamed &&
@@ -158,10 +156,10 @@
///
/// Excludes: constructors and synthetic elements.
List<Element> getMembers(ClassElement clazz) {
- List<Element> members = <Element>[];
+ var members = <Element>[];
members.addAll(getClassMembers(clazz));
- Set<ClassElement> superClasses = getSuperClasses(clazz);
- for (ClassElement superClass in superClasses) {
+ var superClasses = getSuperClasses(clazz);
+ for (var superClass in superClasses) {
members.addAll(getClassMembers(superClass));
}
return members;
@@ -171,28 +169,28 @@
Set<ClassElement> getSuperClasses(ClassElement seed) {
Set<ClassElement> result = HashSet<ClassElement>();
// prepare queue
- List<ClassElement> queue = <ClassElement>[];
+ var queue = <ClassElement>[];
queue.add(seed);
// process queue
while (queue.isNotEmpty) {
- ClassElement current = queue.removeLast();
+ var current = queue.removeLast();
// add if not checked already
if (!result.add(current)) {
continue;
}
// append supertype
{
- InterfaceType superType = current.supertype;
+ var superType = current.supertype;
if (superType != null) {
queue.add(superType.element);
}
}
// append superclass constraints
- for (InterfaceType interface in current.superclassConstraints) {
+ for (var interface in current.superclassConstraints) {
queue.add(interface.element);
}
// append interfaces
- for (InterfaceType interface in current.interfaces) {
+ for (var interface in current.interfaces) {
queue.add(interface.element);
}
}
diff --git a/pkg/analysis_server/lib/src/services/search/search_engine_internal.dart b/pkg/analysis_server/lib/src/services/search/search_engine_internal.dart
index 232b386..968e7a1 100644
--- a/pkg/analysis_server/lib/src/services/search/search_engine_internal.dart
+++ b/pkg/analysis_server/lib/src/services/search/search_engine_internal.dart
@@ -20,13 +20,13 @@
Future<Set<String>> membersOfSubtypes(ClassElement type) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- List<AnalysisDriver> drivers = _drivers.toList();
- SearchedFiles searchedFiles = _createSearchedFiles(drivers);
+ var drivers = _drivers.toList();
+ var searchedFiles = _createSearchedFiles(drivers);
- String libraryUriStr = type.librarySource.uri.toString();
- bool hasSubtypes = false;
- Set<String> visitedIds = <String>{};
- Set<String> members = <String>{};
+ var libraryUriStr = type.librarySource.uri.toString();
+ var hasSubtypes = false;
+ var visitedIds = <String>{};
+ var members = <String>{};
Future<void> addMembers(ClassElement type, SubtypeResult subtype) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
@@ -34,10 +34,10 @@
if (subtype != null && !visitedIds.add(subtype.id)) {
return;
}
- for (AnalysisDriver driver in drivers) {
- List<SubtypeResult> subtypes = await driver.search
+ for (var driver in drivers) {
+ var subtypes = await driver.search
.subtypes(searchedFiles, type: type, subtype: subtype);
- for (SubtypeResult subtype in subtypes) {
+ for (var subtype in subtypes) {
hasSubtypes = true;
members.addAll(subtype.libraryUri == libraryUriStr
? subtype.members
@@ -59,13 +59,13 @@
Future<Set<ClassElement>> searchAllSubtypes(ClassElement type) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- Set<ClassElement> allSubtypes = <ClassElement>{};
+ var allSubtypes = <ClassElement>{};
Future<void> addSubtypes(ClassElement type) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- List<SearchResult> directResults = await _searchDirectSubtypes(type);
- for (SearchResult directResult in directResults) {
+ var directResults = await _searchDirectSubtypes(type);
+ for (var directResult in directResults) {
var directSubtype = directResult.enclosingElement as ClassElement;
if (allSubtypes.add(directSubtype)) {
await addSubtypes(directSubtype);
@@ -81,10 +81,10 @@
Future<List<SearchMatch>> searchMemberDeclarations(String name) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- List<SearchMatch> allDeclarations = [];
- List<AnalysisDriver> drivers = _drivers.toList();
- for (AnalysisDriver driver in drivers) {
- List<Element> elements = await driver.search.classMembers(name);
+ var allDeclarations = <SearchMatch>[];
+ var drivers = _drivers.toList();
+ for (var driver in drivers) {
+ var elements = await driver.search.classMembers(name);
allDeclarations.addAll(elements.map(SearchMatchImpl.forElement));
}
return allDeclarations;
@@ -94,11 +94,11 @@
Future<List<SearchMatch>> searchMemberReferences(String name) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- List<SearchResult> allResults = [];
- List<AnalysisDriver> drivers = _drivers.toList();
- SearchedFiles searchedFiles = _createSearchedFiles(drivers);
- for (AnalysisDriver driver in drivers) {
- List<SearchResult> results =
+ var allResults = <SearchResult>[];
+ var drivers = _drivers.toList();
+ var searchedFiles = _createSearchedFiles(drivers);
+ for (var driver in drivers) {
+ var results =
await driver.search.unresolvedMemberReferences(name, searchedFiles);
allResults.addAll(results);
}
@@ -109,12 +109,11 @@
Future<List<SearchMatch>> searchReferences(Element element) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- List<SearchResult> allResults = [];
- List<AnalysisDriver> drivers = _drivers.toList();
- SearchedFiles searchedFiles = _createSearchedFiles(drivers);
- for (AnalysisDriver driver in drivers) {
- List<SearchResult> results =
- await driver.search.references(element, searchedFiles);
+ var allResults = <SearchResult>[];
+ var drivers = _drivers.toList();
+ var searchedFiles = _createSearchedFiles(drivers);
+ for (var driver in drivers) {
+ var results = await driver.search.references(element, searchedFiles);
allResults.addAll(results);
}
return allResults.map(SearchMatchImpl.forSearchResult).toList();
@@ -124,7 +123,7 @@
Future<List<SearchMatch>> searchSubtypes(ClassElement type) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- List<SearchResult> results = await _searchDirectSubtypes(type);
+ var results = await _searchDirectSubtypes(type);
return results.map(SearchMatchImpl.forSearchResult).toList();
}
@@ -132,11 +131,11 @@
Future<List<SearchMatch>> searchTopLevelDeclarations(String pattern) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- Set<Element> allElements = <Element>{};
- RegExp regExp = RegExp(pattern);
- List<AnalysisDriver> drivers = _drivers.toList();
- for (AnalysisDriver driver in drivers) {
- List<Element> elements = await driver.search.topLevelElements(regExp);
+ var allElements = <Element>{};
+ var regExp = RegExp(pattern);
+ var drivers = _drivers.toList();
+ for (var driver in drivers) {
+ var elements = await driver.search.topLevelElements(regExp);
allElements.addAll(elements);
}
return allElements.map(SearchMatchImpl.forElement).toList();
@@ -146,7 +145,7 @@
/// by the drivers that have them added.
SearchedFiles _createSearchedFiles(List<AnalysisDriver> drivers) {
var searchedFiles = SearchedFiles();
- for (AnalysisDriver driver in drivers) {
+ for (var driver in drivers) {
searchedFiles.ownAdded(driver.search);
}
return searchedFiles;
@@ -155,12 +154,11 @@
Future<List<SearchResult>> _searchDirectSubtypes(ClassElement type) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- List<SearchResult> allResults = [];
- List<AnalysisDriver> drivers = _drivers.toList();
- SearchedFiles searchedFiles = _createSearchedFiles(drivers);
- for (AnalysisDriver driver in drivers) {
- List<SearchResult> results =
- await driver.search.subTypes(type, searchedFiles);
+ var allResults = <SearchResult>[];
+ var drivers = _drivers.toList();
+ var searchedFiles = _createSearchedFiles(drivers);
+ for (var driver in drivers) {
+ var results = await driver.search.subTypes(type, searchedFiles);
allResults.addAll(results);
}
return allResults;
@@ -208,7 +206,7 @@
@override
String toString() {
- StringBuffer buffer = StringBuffer();
+ var buffer = StringBuffer();
buffer.write('SearchMatch(kind=');
buffer.write(kind);
buffer.write(', libraryUri=');
@@ -239,7 +237,7 @@
}
static SearchMatchImpl forSearchResult(SearchResult result) {
- Element enclosingElement = result.enclosingElement;
+ var enclosingElement = result.enclosingElement;
return SearchMatchImpl(
enclosingElement.source.fullName,
enclosingElement.librarySource,
diff --git a/pkg/analysis_server/lib/src/socket_server.dart b/pkg/analysis_server/lib/src/socket_server.dart
index a742bcf..25ad0f77 100644
--- a/pkg/analysis_server/lib/src/socket_server.dart
+++ b/pkg/analysis_server/lib/src/socket_server.dart
@@ -57,7 +57,7 @@
/// given serverChannel.
void createAnalysisServer(ServerCommunicationChannel serverChannel) {
if (analysisServer != null) {
- RequestError error = RequestError(
+ var error = RequestError(
RequestErrorCode.SERVER_ALREADY_STARTED, 'Server already started');
serverChannel.sendResponse(Response('', error: error));
serverChannel.listen((Request request) {
diff --git a/pkg/analysis_server/lib/src/status/ast_writer.dart b/pkg/analysis_server/lib/src/status/ast_writer.dart
index fda1903..6d9bbf2 100644
--- a/pkg/analysis_server/lib/src/status/ast_writer.dart
+++ b/pkg/analysis_server/lib/src/status/ast_writer.dart
@@ -165,7 +165,7 @@
} else if (node is FieldDeclaration) {
return _getNames(node.fields);
} else if (node is FunctionDeclaration) {
- SimpleIdentifier nameNode = node.name;
+ var nameNode = node.name;
if (nameNode != null) {
return nameNode.name;
}
@@ -190,9 +190,9 @@
/// Return a string containing a comma-separated list of the names of all of
/// the variables in the given list of [variables].
String _getNames(VariableDeclarationList variables) {
- StringBuffer buffer = StringBuffer();
- bool first = true;
- for (VariableDeclaration variable in variables.variables) {
+ var buffer = StringBuffer();
+ var first = true;
+ for (var variable in variables.variables) {
if (first) {
first = false;
} else {
diff --git a/pkg/analysis_server/lib/src/status/diagnostics.dart b/pkg/analysis_server/lib/src/status/diagnostics.dart
index c30a0aa..3814029 100644
--- a/pkg/analysis_server/lib/src/status/diagnostics.dart
+++ b/pkg/analysis_server/lib/src/status/diagnostics.dart
@@ -16,7 +16,6 @@
show LspAnalysisServer;
import 'package:analysis_server/src/plugin/plugin_manager.dart';
import 'package:analysis_server/src/server/http_server.dart';
-import 'package:analysis_server/src/server/sdk_configuration.dart';
import 'package:analysis_server/src/services/completion/completion_performance.dart';
import 'package:analysis_server/src/services/completion/dart/completion_ranking.dart';
import 'package:analysis_server/src/socket_server.dart';
@@ -24,19 +23,13 @@
import 'package:analysis_server/src/status/element_writer.dart';
import 'package:analysis_server/src/status/pages.dart';
import 'package:analysis_server/src/utilities/profiling.dart';
-import 'package:analyzer/dart/analysis/results.dart';
-import 'package:analyzer/file_system/file_system.dart';
-import 'package:analyzer/instrumentation/instrumentation.dart';
import 'package:analyzer/src/context/context_root.dart';
import 'package:analyzer/src/context/source.dart';
-import 'package:analyzer/src/dart/analysis/driver.dart';
import 'package:analyzer/src/dart/sdk/sdk.dart';
import 'package:analyzer/src/dartdoc/dartdoc_directive_info.dart';
import 'package:analyzer/src/generated/engine.dart';
-import 'package:analyzer/src/generated/sdk.dart';
import 'package:analyzer/src/generated/source.dart';
import 'package:analyzer/src/generated/utilities_general.dart';
-import 'package:analyzer/src/lint/linter.dart';
import 'package:analyzer/src/lint/registry.dart';
import 'package:analyzer/src/services/lint.dart';
import 'package:analyzer/src/source/package_map_resolver.dart';
@@ -154,7 +147,7 @@
final bool _showLints = false;
String get _sdkVersion {
- String version = Platform.version;
+ var version = Platform.version;
if (version.contains(' ')) {
version = version.substring(0, version.indexOf(' '));
}
@@ -176,22 +169,22 @@
@override
Future generateContent(Map<String, String> params) async {
- List<CompletionPerformance> completions = performanceItems;
+ var completions = performanceItems;
if (completions.isEmpty) {
blankslate('No completions recorded.');
return;
}
- int fastCount =
+ var fastCount =
completions.where((c) => c.elapsedInMilliseconds <= 100).length;
p('${completions.length} results; ${printPercentage(fastCount / completions.length)} within 100ms.');
// draw a chart
buf.writeln(
'<div id="chart-div" style="width: 700px; height: 300px;"></div>');
- StringBuffer rowData = StringBuffer();
- for (int i = completions.length - 1; i >= 0; i--) {
+ var rowData = StringBuffer();
+ for (var i = completions.length - 1; i >= 0; i--) {
// [' ', 101.5]
if (rowData.isNotEmpty) {
rowData.write(',');
@@ -218,8 +211,8 @@
buf.writeln('<table>');
buf.writeln(
'<tr><th>Time</th><th>Results</th><th>Source</th><th>Snippet</th></tr>');
- for (CompletionPerformance completion in completions) {
- String shortName = pathContext.basename(completion.path);
+ for (var completion in completions) {
+ var shortName = pathContext.basename(completion.path);
buf.writeln('<tr>'
'<td class="pre right">${printMilliseconds(completion.elapsedInMilliseconds)}</td>'
'<td class="right">${completion.suggestionCount}</td>'
@@ -245,18 +238,18 @@
@override
Future<void> generateContent(Map<String, String> params) async {
- String filePath = params['file'];
+ var filePath = params['file'];
if (filePath == null) {
p('No file path provided.');
return;
}
- AnalysisDriver driver = server.getAnalysisDriver(filePath);
+ var driver = server.getAnalysisDriver(filePath);
if (driver == null) {
p('The file <code>${escape(filePath)}</code> is not being analyzed.',
raw: true);
return;
}
- ResolvedUnitResult result = await driver.getResult(filePath);
+ var result = await driver.getResult(filePath);
if (result == null) {
p(
'An AST could not be produced for the file '
@@ -265,7 +258,7 @@
return;
}
- AstWriter writer = AstWriter(buf);
+ var writer = AstWriter(buf);
result.unit.accept(writer);
}
@@ -290,8 +283,8 @@
Future generateContent(Map<String, String> params) async {
void writeRow(List<String> data, {List<String> classes}) {
buf.write('<tr>');
- for (int i = 0; i < data.length; i++) {
- String c = classes == null ? null : classes[i];
+ for (var i = 0; i < data.length; i++) {
+ var c = classes == null ? null : classes[i];
if (c != null) {
buf.write('<td class="$c">${escape(data[i])}</td>');
} else {
@@ -309,7 +302,7 @@
h3('Current');
_writePerformanceTable(server.performanceAfterStartup, writeRow);
- String time = server.uptime.toString();
+ var time = server.uptime.toString();
if (time.contains('.')) {
time = time.substring(0, time.indexOf('.'));
}
@@ -324,7 +317,7 @@
_writePerformanceTable(server.performanceDuringStartup, writeRow);
if (server.performanceAfterStartup != null) {
- int startupTime = server.performanceAfterStartup.startTime -
+ var startupTime = server.performanceAfterStartup.startTime -
server.performanceDuringStartup.startTime;
buf.writeln(
writeOption('Initial analysis time', printMilliseconds(startupTime)));
@@ -337,12 +330,12 @@
void _writePerformanceTable(ServerPerformance perf,
void Function(List<String> data, {List<String> classes}) writeRow) {
- int requestCount = perf.requestCount;
- int latencyCount = perf.latencyCount;
- int averageLatency =
+ var requestCount = perf.requestCount;
+ var latencyCount = perf.latencyCount;
+ var averageLatency =
latencyCount > 0 ? (perf.requestLatency ~/ latencyCount) : 0;
- int maximumLatency = perf.maxLatency;
- double slowRequestPercent =
+ var maximumLatency = perf.maxLatency;
+ var slowRequestPercent =
latencyCount > 0 ? (perf.slowRequestCount / latencyCount) : 0.0;
buf.write('<table>');
@@ -380,6 +373,62 @@
completionDomain.performanceList.items.toList();
}
+class ContentsPage extends DiagnosticPageWithNav {
+ String _description;
+
+ ContentsPage(DiagnosticsSite site)
+ : super(site, 'contents', 'Contents',
+ description: 'The Contents/Overlay of a file.');
+
+ @override
+ String get description => _description ?? super.description;
+
+ @override
+ bool get showInNav => false;
+
+ @override
+ Future<void> generateContent(Map<String, String> params) async {
+ var filePath = params['file'];
+ if (filePath == null) {
+ p('No file path provided.');
+ return;
+ }
+ var driver = server.getAnalysisDriver(filePath);
+ if (driver == null) {
+ p('The file <code>${escape(filePath)}</code> is not being analyzed.',
+ raw: true);
+ return;
+ }
+ var file = await server.resourceProvider.getFile(filePath);
+ if (!file.exists) {
+ p('The file <code>${escape(filePath)}</code> does not exist.', raw: true);
+ return;
+ }
+
+ if (server.resourceProvider.hasOverlay(filePath)) {
+ p('Showing overlay for file.');
+ } else {
+ p('Showing file system contents for file.');
+ }
+
+ pre(() {
+ buf.write('<code>');
+ buf.write(escape(file.readAsStringSync()));
+ buf.writeln('</code>');
+ });
+ }
+
+ @override
+ Future<void> generatePage(Map<String, String> params) async {
+ try {
+ _description = params['file'];
+ await super.generatePage(params);
+ } finally {
+ _description = null;
+ }
+ }
+}
+
class ContextsPage extends DiagnosticPageWithNav {
ContextsPage(DiagnosticsSite site)
: super(site, 'contexts', 'Contexts',
@@ -390,7 +439,7 @@
String get navDetail => printInteger(server.driverMap.length);
String describe(AnalysisOptionsImpl options) {
- StringBuffer b = StringBuffer();
+ var b = StringBuffer();
b.write(writeOption('Strong mode', options.strongMode));
b.write(writeOption('Implicit dynamic', options.implicitDynamic));
@@ -413,17 +462,17 @@
@override
Future generateContent(Map<String, String> params) async {
- Map<Folder, AnalysisDriver> driverMap = server.driverMap;
+ var driverMap = server.driverMap;
if (driverMap.isEmpty) {
blankslate('No contexts.');
return;
}
- String contextPath = params['context'];
- List<Folder> folders = driverMap.keys.toList();
+ var contextPath = params['context'];
+ var folders = driverMap.keys.toList();
folders
.sort((first, second) => first.shortName.compareTo(second.shortName));
- Folder folder =
+ var folder =
folders.firstWhere((f) => f.path == contextPath, orElse: () => null);
if (folder == null) {
@@ -431,16 +480,16 @@
contextPath = folder.path;
}
- AnalysisDriver driver = driverMap[folder];
+ var driver = driverMap[folder];
buf.writeln('<div class="tabnav">');
buf.writeln('<nav class="tabnav-tabs">');
- for (Folder f in folders) {
+ for (var f in folders) {
if (f == folder) {
buf.writeln(
'<a class="tabnav-tab selected">${escape(f.shortName)}</a>');
} else {
- String p = '${this.path}?context=${Uri.encodeQueryComponent(f.path)}';
+ var p = '${this.path}?context=${Uri.encodeQueryComponent(f.path)}';
buf.writeln(
'<a href="$p" class="tabnav-tab">${escape(f.shortName)}</a>');
}
@@ -469,7 +518,7 @@
buf.writeln('</div>');
buf.writeln('<div class="column one-half">');
- DartSdk sdk = driver?.sourceFactory?.dartSdk;
+ var sdk = driver?.sourceFactory?.dartSdk;
AnalysisOptionsImpl sdkOptions = sdk?.context?.analysisOptions;
if (sdkOptions != null) {
h3('SDK analysis options');
@@ -485,8 +534,8 @@
buf.writeln('</div>');
h3('Lints');
- List<String> lints =
- driver.analysisOptions.lintRules.map((l) => l.name).toList()..sort();
+ var lints = driver.analysisOptions.lintRules.map((l) => l.name).toList()
+ ..sort();
ul(lints, (String lint) => buf.write(lint), classes: 'scroll-table');
h3('Error processors');
@@ -497,9 +546,9 @@
h3('Plugins');
p(driver.analysisOptions.enabledPluginNames.join(', '));
- List<String> priorityFiles = driver.priorityFiles;
- List<String> addedFiles = driver.addedFiles.toList();
- List<String> implicitFiles =
+ var priorityFiles = driver.priorityFiles;
+ var addedFiles = driver.addedFiles.toList();
+ var implicitFiles =
driver.knownFiles.difference(driver.addedFiles).toList();
addedFiles.sort();
implicitFiles.sort();
@@ -511,10 +560,10 @@
h3('Context files');
void writeFile(String file) {
- String astPath = '/ast?file=${Uri.encodeQueryComponent(file)}';
- String elementPath = '/element?file=${Uri.encodeQueryComponent(file)}';
- String contentsPath = '/contents?file=${Uri.encodeQueryComponent(file)}';
- bool hasOverlay = server.resourceProvider.hasOverlay(file);
+ var astPath = '/ast?file=${Uri.encodeQueryComponent(file)}';
+ var elementPath = '/element?file=${Uri.encodeQueryComponent(file)}';
+ var contentsPath = '/contents?file=${Uri.encodeQueryComponent(file)}';
+ var hasOverlay = server.resourceProvider.hasOverlay(file);
buf.write(file);
buf.writeln(' <a href="$astPath">ast</a>');
@@ -532,14 +581,14 @@
h4('Implicit files ${lenCounter(implicitFiles)}', raw: true);
ul(implicitFiles, writeFile, classes: 'scroll-table');
- SourceFactory sourceFactory = driver.sourceFactory;
+ var sourceFactory = driver.sourceFactory;
if (sourceFactory is SourceFactoryImpl) {
h3('Resolvers');
- for (UriResolver resolver in sourceFactory.resolvers) {
+ for (var resolver in sourceFactory.resolvers) {
h4(resolver.runtimeType.toString());
buf.write('<p class="scroll-table">');
if (resolver is DartUriResolver) {
- DartSdk sdk = resolver.dartSdk;
+ var sdk = resolver.dartSdk;
buf.write(' (sdk = ');
buf.write(sdk.runtimeType);
if (sdk is FolderBasedDartSdk) {
@@ -560,7 +609,7 @@
}
h3('Dartdoc template info');
- DartdocDirectiveInfo info = server.declarationsTracker
+ var info = server.declarationsTracker
?.getContext(driver.analysisContext)
?.dartdocDirectiveInfo ??
DartdocDirectiveInfo();
@@ -574,14 +623,14 @@
}
void writeMap<V>(Map<String, V> map) {
- List<String> keys = map.keys.toList();
+ var keys = map.keys.toList();
keys.sort();
- int length = keys.length;
+ var length = keys.length;
buf.write('{');
- for (int i = 0; i < length; i++) {
+ for (var i = 0; i < length; i++) {
buf.write('<br>');
- String key = keys[i];
- V value = map[key];
+ var key = keys[i];
+ var value = map[key];
buf.write(key);
buf.write(' = ');
if (value is List) {
@@ -595,62 +644,6 @@
}
}
-class ContentsPage extends DiagnosticPageWithNav {
- String _description;
-
- ContentsPage(DiagnosticsSite site)
- : super(site, 'contents', 'Contents',
- description: 'The Contents/Overlay of a file.');
-
- @override
- String get description => _description ?? super.description;
-
- @override
- bool get showInNav => false;
-
- @override
- Future<void> generateContent(Map<String, String> params) async {
- String filePath = params['file'];
- if (filePath == null) {
- p('No file path provided.');
- return;
- }
- AnalysisDriver driver = server.getAnalysisDriver(filePath);
- if (driver == null) {
- p('The file <code>${escape(filePath)}</code> is not being analyzed.',
- raw: true);
- return;
- }
- File file = await server.resourceProvider.getFile(filePath);
- if (!file.exists) {
- p('The file <code>${escape(filePath)}</code> does not exist.', raw: true);
- return;
- }
-
- if (server.resourceProvider.hasOverlay(filePath)) {
- p('Showing overlay for file.');
- } else {
- p('Showing file system contents for file.');
- }
-
- pre(() {
- buf.write('<code>');
- buf.write(escape(file.readAsStringSync()));
- buf.writeln('</code>');
- });
- }
-
- @override
- Future<void> generatePage(Map<String, String> params) async {
- try {
- _description = params['file'];
- await super.generatePage(params);
- } finally {
- _description = null;
- }
- }
-}
-
/// A page with a proscriptive notion of layout.
abstract class DiagnosticPage extends Page {
final DiagnosticsSite site;
@@ -754,10 +747,10 @@
buf.writeln('<div class="one-fifth column">');
buf.writeln('<nav class="menu docs-menu">');
- for (Page page in site.pages.where(shouldShowInNav)) {
+ for (var page in site.pages.where(shouldShowInNav)) {
buf.write('<a class="menu-item ${page == this ? ' selected' : ''}" '
'href="${page.path}">${escape(page.title)}');
- String detail = (page as DiagnosticPageWithNav).navDetail;
+ var detail = (page as DiagnosticPageWithNav).navDetail;
if (detail != null) {
buf.write('<span class="counter">$detail</span>');
}
@@ -797,7 +790,7 @@
// Add server-specific pages. Ordering doesn't matter as the items are
// sorted later.
- final AbstractAnalysisServer server = socketServer.analysisServer;
+ var server = socketServer.analysisServer;
pages.add(MLCompletionPage(this, server));
if (server is AnalysisServer) {
@@ -809,7 +802,7 @@
pages.add(LspCapabilitiesPage(this, server));
}
- ProcessProfiler profiler = ProcessProfiler.getProfilerForPlatform();
+ var profiler = ProcessProfiler.getProfilerForPlatform();
if (profiler != null) {
pages.add(MemoryAndCpuPage(this, profiler));
}
@@ -853,18 +846,18 @@
@override
Future<void> generateContent(Map<String, String> params) async {
- String filePath = params['file'];
+ var filePath = params['file'];
if (filePath == null) {
p('No file path provided.');
return;
}
- AnalysisDriver driver = server.getAnalysisDriver(filePath);
+ var driver = server.getAnalysisDriver(filePath);
if (driver == null) {
p('The file <code>${escape(filePath)}</code> is not being analyzed.',
raw: true);
return;
}
- ResolvedUnitResult result = await driver.getResult(filePath);
+ var result = await driver.getResult(filePath);
if (result == null) {
p(
'An element model could not be produced for the file '
@@ -873,7 +866,7 @@
return;
}
- ElementWriter writer = ElementWriter(buf);
+ var writer = ElementWriter(buf);
result.unit.declaredElement.accept(writer);
}
@@ -898,8 +891,8 @@
Future generateContent(Map<String, String> params) async {
buf.writeln('<table>');
buf.writeln('<tr><th>Variable</th><th>Value</th></tr>');
- for (String key in Platform.environment.keys.toList()..sort()) {
- String value = Platform.environment[key];
+ for (var key in Platform.environment.keys.toList()..sort()) {
+ var value = Platform.environment[key];
buf.writeln('<tr><td>${escape(key)}</td><td>${escape(value)}</td></tr>');
}
buf.writeln('</table>');
@@ -933,7 +926,7 @@
if (exceptions.isEmpty) {
blankslate('No exceptions encountered!');
} else {
- for (ServerException ex in exceptions) {
+ for (var ex in exceptions) {
h3('Exception ${ex.exception}');
p('${escape(ex.message)}<br>${writeOption('fatal', ex.fatal)}',
raw: true);
@@ -952,7 +945,7 @@
@override
Future generateContent(Map<String, String> params) async {
- final String issuesUrl = 'https://github.com/dart-lang/sdk/issues';
+ var issuesUrl = 'https://github.com/dart-lang/sdk/issues';
p(
'To file issues or feature requests, see our '
'<a href="$issuesUrl">bug tracker</a>. When filing an issue, please describe:',
@@ -964,14 +957,14 @@
'what you think the expected behavior should have been',
], (line) => buf.writeln(line));
- List<String> ideInfo = [];
+ var ideInfo = <String>[];
if (server.options.clientId != null) {
ideInfo.add(server.options.clientId);
}
if (server.options.clientVersion != null) {
ideInfo.add(server.options.clientVersion);
}
- String ideText = ideInfo.map((str) => '<code>$str</code>').join(', ');
+ var ideText = ideInfo.map((str) => '<code>$str</code>').join(', ');
p('Other data to include:');
ul([
@@ -1075,10 +1068,9 @@
@override
Future generateContent(Map<String, String> params) async {
- UsageInfo usage = await profiler.getProcessUsage(pid);
+ var usage = await profiler.getProcessUsage(pid);
- developer.ServiceProtocolInfo serviceProtocolInfo =
- await developer.Service.getInfo();
+ var serviceProtocolInfo = await developer.Service.getInfo();
if (usage != null) {
buf.writeln(
@@ -1120,7 +1112,7 @@
@override
Future<void> generateContent(Map<String, String> params) async {
- final bool hasMLComplete = CompletionRanking.instance != null;
+ var hasMLComplete = CompletionRanking.instance != null;
if (!hasMLComplete) {
blankslate('''ML code completion is not enabled (see <a
href="https://github.com/dart-lang/sdk/wiki/Previewing-Dart-code-completions-powered-by-machine-learning"
@@ -1130,14 +1122,14 @@
buf.writeln('ML completion enabled.<br>');
- final String isolateTimes = CompletionRanking
+ var isolateTimes = CompletionRanking
.instance.performanceMetrics.isolateInitTimes
.map((Duration time) {
return '${time.inMilliseconds}ms';
}).join(', ');
p('ML isolate init times: $isolateTimes');
- final List<PredictionResult> predictions = CompletionRanking
+ var predictions = CompletionRanking
.instance.performanceMetrics.predictionResults
.toList();
@@ -1152,8 +1144,8 @@
// draw a chart
buf.writeln(
'<div id="chart-div" style="width: 700px; height: 300px;"></div>');
- StringBuffer rowData = StringBuffer();
- for (PredictionResult prediction in predictions.reversed) {
+ var rowData = StringBuffer();
+ for (var prediction in predictions.reversed) {
// [' ', 101.5]
if (rowData.isNotEmpty) {
rowData.write(',');
@@ -1177,10 +1169,9 @@
''');
String summarize(PredictionResult prediction) {
- List<MapEntry<String, double>> entries =
- prediction.results.entries.toList();
+ var entries = prediction.results.entries.toList();
entries.sort((a, b) => b.value.compareTo(a.value));
- String summary = entries
+ var summary = entries
.take(3)
.map((entry) => '"${entry.key}":${entry.value.toStringAsFixed(3)}')
.join('<br>');
@@ -1191,7 +1182,7 @@
buf.writeln('<table>');
buf.writeln(
'<tr><th>Time</th><th>Results</th><th>Snippet</th><th>Top suggestions</th></tr>');
- for (PredictionResult prediction in predictions) {
+ for (var prediction in predictions) {
buf.writeln('<tr>'
'<td class="pre right">${printMilliseconds(prediction.elapsedTime.inMilliseconds)}</td>'
'<td class="right">${prediction.results.length}</td>'
@@ -1224,21 +1215,20 @@
@override
Future generateContent(Map<String, String> params) async {
h3('Analysis plugins');
- List<PluginInfo> analysisPlugins = server.pluginManager.plugins;
+ var analysisPlugins = server.pluginManager.plugins;
if (analysisPlugins.isEmpty) {
blankslate('No known analysis plugins.');
} else {
analysisPlugins
.sort((first, second) => first.pluginId.compareTo(second.pluginId));
- for (PluginInfo plugin in analysisPlugins) {
- String id = plugin.pluginId;
- PluginData data = plugin.data;
- Map<String, List<int>> responseTimes =
- PluginManager.pluginResponseTimes[plugin];
+ for (var plugin in analysisPlugins) {
+ var id = plugin.pluginId;
+ var data = plugin.data;
+ var responseTimes = PluginManager.pluginResponseTimes[plugin];
- List<String> components = path.split(id);
- int length = components.length;
+ var components = path.split(id);
+ var length = components.length;
String name;
if (length == 0) {
name = 'unknown plugin';
@@ -1266,7 +1256,7 @@
p('name: ${data.name}');
p('version: ${data.version}');
p('Associated contexts:');
- Set<ContextRoot> contexts = plugin.contextRoots;
+ var contexts = plugin.contextRoots;
if (contexts.isEmpty) {
blankslate('none');
} else {
@@ -1275,13 +1265,13 @@
});
}
p('Performance:');
- List<String> requestNames = responseTimes.keys.toList();
+ var requestNames = responseTimes.keys.toList();
requestNames.sort();
- for (String requestName in requestNames) {
- List<int> data = responseTimes[requestName];
+ for (var requestName in requestNames) {
+ var data = responseTimes[requestName];
// TODO(brianwilkerson) Consider displaying these times as a graph,
// similar to the one in AbstractCompletionPage.generateContent.
- StringBuffer buffer = StringBuffer();
+ var buffer = StringBuffer();
buffer.write(requestName);
buffer.write(' ');
buffer.write(data);
@@ -1303,19 +1293,19 @@
h3('Profiling performance tag data');
// prepare sorted tags
- List<PerformanceTag> tags = PerformanceTag.all.toList();
+ var tags = PerformanceTag.all.toList();
tags.remove(ServerPerformanceStatistics.idle);
tags.remove(PerformanceTag.unknown);
tags.removeWhere((tag) => tag.elapsedMs == 0);
tags.sort((a, b) => b.elapsedMs - a.elapsedMs);
// print total time
- int totalTime =
+ var totalTime =
tags.fold<int>(0, (int a, PerformanceTag tag) => a + tag.elapsedMs);
p('Total measured time: ${printMilliseconds(totalTime)}');
// draw a pie chart
- String rowData =
+ var rowData =
tags.map((tag) => "['${tag.label}', ${tag.elapsedMs}]").join(',');
buf.writeln(
'<div id="chart-div" style="width: 700px; height: 300px;"></div>');
@@ -1340,13 +1330,13 @@
void _writeRow(List<String> data, {bool header = false}) {
buf.write('<tr>');
if (header) {
- for (String d in data) {
+ for (var d in data) {
buf.write('<th>$d</th>');
}
} else {
buf.write('<td>${data[0]}</td>');
- for (String d in data.sublist(1)) {
+ for (var d in data.sublist(1)) {
buf.write('<td class="right">$d</td>');
}
}
@@ -1356,7 +1346,7 @@
buf.write('<table>');
_writeRow(['Tag name', 'Time (in ms)', 'Percent'], header: true);
void writeRow(PerformanceTag tag) {
- double percent = tag.elapsedMs / totalTime;
+ var percent = tag.elapsedMs / totalTime;
_writeRow([
tag.label,
printMilliseconds(tag.elapsedMs),
@@ -1369,14 +1359,14 @@
if (_showLints) {
h3('Lint rule timings');
- List<LintRule> rules = Registry.ruleRegistry.rules.toList();
- int totalLintTime = rules.fold(0,
+ var rules = Registry.ruleRegistry.rules.toList();
+ var totalLintTime = rules.fold(0,
(sum, rule) => sum + lintRegistry.getTimer(rule).elapsedMilliseconds);
p('Total time spent in lints: ${printMilliseconds(totalLintTime)}');
rules.sort((first, second) {
- int firstTime = lintRegistry.getTimer(first).elapsedMilliseconds;
- int secondTime = lintRegistry.getTimer(second).elapsedMilliseconds;
+ var firstTime = lintRegistry.getTimer(first).elapsedMilliseconds;
+ var secondTime = lintRegistry.getTimer(second).elapsedMilliseconds;
if (firstTime == secondTime) {
return first.lintCode.name.compareTo(second.lintCode.name);
}
@@ -1385,7 +1375,7 @@
buf.write('<table>');
_writeRow(['Lint code', 'Time (in ms)'], header: true);
for (var rule in rules) {
- int time = lintRegistry.getTimer(rule).elapsedMilliseconds;
+ var time = lintRegistry.getTimer(rule).elapsedMilliseconds;
_writeRow([rule.lintCode.name, printMilliseconds(time)]);
}
buf.write('</table>');
@@ -1420,7 +1410,7 @@
buf.writeln('</div>');
// SDK configuration overrides.
- SdkConfiguration sdkConfig = server.options.configurationOverrides;
+ var sdkConfig = server.options.configurationOverrides;
if (sdkConfig?.hasAnyOverrides == true) {
buf.writeln('<div class="columns">');
@@ -1432,7 +1422,7 @@
buf.writeln('</div>');
}
- List<String> lines = site.lastPrintedLines;
+ var lines = site.lastPrintedLines;
if (lines.isNotEmpty) {
h3('Debug output');
p(lines.join('\n'), style: 'white-space: pre');
@@ -1462,7 +1452,7 @@
// analysis domain
h3('Analysis domain subscriptions');
- for (AnalysisService service in AnalysisService.VALUES) {
+ for (var service in AnalysisService.VALUES) {
buf.writeln('${service.name}<br>');
ul(server.analysisServices[service] ?? [], (item) {
buf.write('$item');
diff --git a/pkg/analysis_server/lib/src/status/element_writer.dart b/pkg/analysis_server/lib/src/status/element_writer.dart
index 8c092f0..929313a 100644
--- a/pkg/analysis_server/lib/src/status/element_writer.dart
+++ b/pkg/analysis_server/lib/src/status/element_writer.dart
@@ -45,8 +45,6 @@
properties['isAbstract'] = element.isAbstract;
properties['isEnum'] = element.isEnum;
properties['isMixinApplication'] = element.isMixinApplication;
- properties['isOrInheritsProxy'] = element.isOrInheritsProxy;
- properties['isProxy'] = element.isProxy;
properties['isValidMixin'] = element.isValidMixin;
properties['mixins'] = element.mixins;
properties['superclassConstraints'] = element.superclassConstraints;
diff --git a/pkg/analysis_server/lib/src/status/pages.dart b/pkg/analysis_server/lib/src/status/pages.dart
index 322d792..2a83d87 100644
--- a/pkg/analysis_server/lib/src/status/pages.dart
+++ b/pkg/analysis_server/lib/src/status/pages.dart
@@ -93,7 +93,7 @@
void inputList<T>(Iterable<T> items, void Function(T item) gen) {
buf.writeln('<select size="8" style="width: 100%">');
- for (T item in items) {
+ for (var item in items) {
buf.write('<option>');
gen(item);
buf.write('</option>');
@@ -104,7 +104,7 @@
bool isCurrentPage(String pathToTest) => path == pathToTest;
void p(String text, {String style, bool raw = false, String classes}) {
- String c = classes == null ? '' : ' class="$classes"';
+ var c = classes == null ? '' : ' class="$classes"';
if (style != null) {
buf.writeln('<p$c style="$style">${raw ? text : escape(text)}</p>');
@@ -132,7 +132,7 @@
void ul<T>(Iterable<T> items, void Function(T item) gen, {String classes}) {
buf.writeln('<ul${classes == null ? '' : ' class=$classes'}>');
- for (T item in items) {
+ for (var item in items) {
buf.write('<li>');
gen(item);
buf.write('</li>');
@@ -158,16 +158,16 @@
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
try {
- String path = request.uri.path;
+ var path = request.uri.path;
if (path == '/') {
respondRedirect(request, pages.first.path);
return;
}
- for (Page page in pages) {
+ for (var page in pages) {
if (page.path == path) {
- HttpResponse response = request.response;
+ var response = request.response;
response.headers.contentType = ContentType.html;
response.write(await page.generate(request.uri.queryParameters));
response.close();
@@ -181,7 +181,7 @@
await respond(request, createExceptionPage('$e', st),
HttpStatus.internalServerError);
} catch (e, st) {
- HttpResponse response = request.response;
+ var response = request.response;
response.statusCode = HttpStatus.internalServerError;
response.headers.contentType = ContentType.text;
response.write('$e\n\n$st');
@@ -197,7 +197,7 @@
]) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- HttpResponse response = request.response;
+ var response = request.response;
response.statusCode = code;
response.headers.contentType = ContentType.html;
response.write(await page.generate(request.uri.queryParameters));
@@ -208,13 +208,13 @@
HttpRequest request, {
int code = HttpStatus.ok,
}) async {
- HttpResponse response = request.response;
+ var response = request.response;
response.statusCode = code;
await response.close();
}
Future<void> respondRedirect(HttpRequest request, String pathFragment) async {
- HttpResponse response = request.response;
+ var response = request.response;
response.statusCode = HttpStatus.movedTemporarily;
await response.redirect(request.uri.resolve(pathFragment));
}
diff --git a/pkg/analysis_server/lib/src/status/tree_writer.dart b/pkg/analysis_server/lib/src/status/tree_writer.dart
index beaa109..4ed9ad0 100644
--- a/pkg/analysis_server/lib/src/status/tree_writer.dart
+++ b/pkg/analysis_server/lib/src/status/tree_writer.dart
@@ -6,7 +6,6 @@
import 'package:analyzer/exception/exception.dart';
import 'package:analyzer/src/dart/element/element.dart';
-import 'package:analyzer/src/generated/constant.dart';
import 'package:analyzer/src/generated/source.dart';
/// Utility methods that can be mixed in to classes that produce an HTML
@@ -23,12 +22,12 @@
List<CaughtException> exceptions = <CaughtException>[];
void indent([int extra = 0]) {
- for (int i = 0; i < indentLevel; i++) {
+ for (var i = 0; i < indentLevel; i++) {
buffer.write('┊ ');
}
if (extra > 0) {
buffer.write('┊ ');
- for (int i = 1; i < extra; i++) {
+ for (var i = 1; i < extra; i++) {
buffer.write(' ');
}
}
@@ -36,9 +35,9 @@
/// Write a representation of the given [properties] to the buffer.
void writeProperties(Map<String, Object> properties) {
- List<String> propertyNames = properties.keys.toList();
+ var propertyNames = properties.keys.toList();
propertyNames.sort();
- for (String propertyName in propertyNames) {
+ for (var propertyName in propertyNames) {
writeProperty(propertyName, properties[propertyName]);
}
}
@@ -58,9 +57,9 @@
if (value is Source) {
return 'Source (uri="${value.uri}", path="${value.fullName}")';
} else if (value is ElementAnnotationImpl) {
- StringBuffer buffer = StringBuffer();
+ var buffer = StringBuffer();
buffer.write(_toString(value.element));
- EvaluationResultImpl result = value.evaluationResult;
+ var result = value.evaluationResult;
if (result == null) {
buffer.write(': no result');
} else {
@@ -85,7 +84,7 @@
if (value.isEmpty) {
buffer.write('[]');
} else {
- int elementIndent = baseIndent + 2;
+ var elementIndent = baseIndent + 2;
buffer.write('[<br>');
for (Object element in value) {
indent(elementIndent);
@@ -96,7 +95,7 @@
buffer.write(']');
}
} else {
- String valueString = _toString(value);
+ var valueString = _toString(value);
if (valueString == null) {
buffer.write('<span style="color: #FF0000">');
buffer.write(htmlEscape.convert(value.runtimeType.toString()));
diff --git a/pkg/analysis_server/lib/src/utilities/flutter.dart b/pkg/analysis_server/lib/src/utilities/flutter.dart
index c4114ad..08c9469ab 100644
--- a/pkg/analysis_server/lib/src/utilities/flutter.dart
+++ b/pkg/analysis_server/lib/src/utilities/flutter.dart
@@ -107,31 +107,31 @@
Function _addRemoveEdit,
Function _addReplaceEdit,
Function rangeNode) {
- int childLoc = namedExp.offset + 'child'.length;
+ var childLoc = namedExp.offset + 'child'.length;
_addInsertEdit(childLoc, 'ren');
- int listLoc = childArg.offset;
+ var listLoc = childArg.offset;
String childArgSrc = getNodeText(childArg);
if (!childArgSrc.contains(eol)) {
_addInsertEdit(listLoc, '[');
_addInsertEdit(listLoc + childArg.length, ']');
} else {
- int newlineLoc = childArgSrc.lastIndexOf(eol);
+ var newlineLoc = childArgSrc.lastIndexOf(eol);
if (newlineLoc == childArgSrc.length) {
newlineLoc -= 1;
}
String indentOld = getLinePrefix(childArg.offset + 1 + newlineLoc);
- String indentNew = '$indentOld${getIndent(1)}';
+ var indentNew = '$indentOld${getIndent(1)}';
// The separator includes 'child:' but that has no newlines.
String separator =
getText(namedExp.offset, childArg.offset - namedExp.offset);
- String prefix = separator.contains(eol) ? '' : '$eol$indentNew';
+ var prefix = separator.contains(eol) ? '' : '$eol$indentNew';
if (prefix.isEmpty) {
_addInsertEdit(namedExp.offset + 'child:'.length, ' [');
_addRemoveEdit(SourceRange(childArg.offset - 2, 2));
} else {
_addInsertEdit(listLoc, '[');
}
- String newChildArgSrc = childArgSrc.replaceAll(
+ var newChildArgSrc = childArgSrc.replaceAll(
RegExp('^$indentOld', multiLine: true), '$indentNew');
newChildArgSrc = '$prefix$newChildArgSrc,$eol$indentOld]';
_addReplaceEdit(rangeNode(childArg), newChildArgSrc);
@@ -148,31 +148,31 @@
Function getIndent,
Function getText,
Function rangeNode) {
- int childLoc = namedExp.offset + 'child'.length;
+ var childLoc = namedExp.offset + 'child'.length;
builder.addSimpleInsertion(childLoc, 'ren');
- int listLoc = childArg.offset;
+ var listLoc = childArg.offset;
String childArgSrc = getNodeText(childArg);
if (!childArgSrc.contains(eol)) {
builder.addSimpleInsertion(listLoc, '[');
builder.addSimpleInsertion(listLoc + childArg.length, ']');
} else {
- int newlineLoc = childArgSrc.lastIndexOf(eol);
+ var newlineLoc = childArgSrc.lastIndexOf(eol);
if (newlineLoc == childArgSrc.length) {
newlineLoc -= 1;
}
String indentOld = getLinePrefix(childArg.offset + 1 + newlineLoc);
- String indentNew = '$indentOld${getIndent(1)}';
+ var indentNew = '$indentOld${getIndent(1)}';
// The separator includes 'child:' but that has no newlines.
String separator =
getText(namedExp.offset, childArg.offset - namedExp.offset);
- String prefix = separator.contains(eol) ? '' : '$eol$indentNew';
+ var prefix = separator.contains(eol) ? '' : '$eol$indentNew';
if (prefix.isEmpty) {
builder.addSimpleInsertion(namedExp.offset + 'child:'.length, ' [');
builder.addDeletion(SourceRange(childArg.offset - 2, 2));
} else {
builder.addSimpleInsertion(listLoc, '[');
}
- String newChildArgSrc = childArgSrc.replaceAll(
+ var newChildArgSrc = childArgSrc.replaceAll(
RegExp('^$indentOld', multiLine: true), '$indentNew');
newChildArgSrc = '$prefix$newChildArgSrc,$eol$indentOld]';
builder.addSimpleReplacement(rangeNode(childArg), newChildArgSrc);
@@ -195,7 +195,7 @@
/// 'child' argument of the given [newExpr], or null if none.
InstanceCreationExpression findChildWidget(
InstanceCreationExpression newExpr) {
- NamedExpression child = findChildArgument(newExpr);
+ var child = findChildArgument(newExpr);
return getChildWidget(child);
}
@@ -238,7 +238,7 @@
/// Return the expression that is a Flutter Widget that is the value of the
/// given [child], or null if none.
Expression getChildWidget(NamedExpression child) {
- Expression expression = child?.expression;
+ var expression = child?.expression;
if (isWidgetExpression(expression)) {
return expression;
}
@@ -247,15 +247,15 @@
/// Return the presentation for the given Flutter `Widget` creation [node].
String getWidgetPresentationText(InstanceCreationExpression node) {
- ClassElement element = node.staticElement?.enclosingElement;
+ var element = node.staticElement?.enclosingElement;
if (!isWidget(element)) {
return null;
}
List<Expression> arguments = node.argumentList.arguments;
if (_isExactWidget(element, 'Icon', _uriWidgetsIcon)) {
if (arguments.isNotEmpty) {
- String text = arguments[0].toString();
- String arg = shorten(text, 32);
+ var text = arguments[0].toString();
+ var arg = shorten(text, 32);
return 'Icon($arg)';
} else {
return 'Icon';
@@ -263,8 +263,8 @@
}
if (_isExactWidget(element, 'Text', _uriWidgetsText)) {
if (arguments.isNotEmpty) {
- String text = arguments[0].toString();
- String arg = shorten(text, 32);
+ var text = arguments[0].toString();
+ var arg = shorten(text, 32);
return 'Text($arg)';
} else {
return 'Text';
@@ -513,7 +513,7 @@
if (_isExactWidget(element, _nameWidget, _uriFramework)) {
return true;
}
- for (InterfaceType type in element.allSupertypes) {
+ for (var type in element.allSupertypes) {
if (_isExactWidget(type.element, _nameWidget, _uriFramework)) {
return true;
}
@@ -524,7 +524,7 @@
/// Return `true` if the given [expr] is a constructor invocation for a
/// class that has the Flutter class `Widget` as a superclass.
bool isWidgetCreation(InstanceCreationExpression expr) {
- ClassElement element = expr?.staticElement?.enclosingElement;
+ var element = expr?.staticElement?.enclosingElement;
return isWidget(element);
}
@@ -562,9 +562,9 @@
if (element == null) {
return false;
}
- for (InterfaceType type in element.allSupertypes) {
+ for (var type in element.allSupertypes) {
if (type.element.name == requiredName) {
- Uri uri = type.element.source.uri;
+ var uri = type.element.source.uri;
if (uri == requiredUri) {
return true;
}
diff --git a/pkg/analysis_server/lib/src/utilities/mocks.dart b/pkg/analysis_server/lib/src/utilities/mocks.dart
index fc583aa..1552225 100644
--- a/pkg/analysis_server/lib/src/utilities/mocks.dart
+++ b/pkg/analysis_server/lib/src/utilities/mocks.dart
@@ -112,8 +112,8 @@
{bool throwOnError = true}) {
// TODO(brianwilkerson) Attempt to remove the `throwOnError` parameter and
// have the default behavior be the only behavior.
- String id = request.id;
- Future<Response> response =
+ var id = request.id;
+ var response =
responseController.stream.firstWhere((response) => response.id == id);
if (throwOnError) {
errorCompleter = Completer<Response>();
diff --git a/pkg/analysis_server/lib/src/utilities/profiling.dart b/pkg/analysis_server/lib/src/utilities/profiling.dart
index 88e30a2..7de48e8 100644
--- a/pkg/analysis_server/lib/src/utilities/profiling.dart
+++ b/pkg/analysis_server/lib/src/utilities/profiling.dart
@@ -50,7 +50,7 @@
Future<UsageInfo> getProcessUsage(int processId) {
try {
// Execution time is typically 2-4ms.
- Future<ProcessResult> future =
+ var future =
Process.run('ps', ['-o', '%cpu=,rss=', processId.toString()]);
return future.then((ProcessResult result) {
if (result.exitCode != 0) {
@@ -67,8 +67,8 @@
UsageInfo _parse(String psResults) {
try {
// " 0.0 378940"
- String line = psResults.split('\n').first.trim();
- List<String> values = line.split(stringSplitRegExp);
+ var line = psResults.split('\n').first.trim();
+ var values = line.split(stringSplitRegExp);
return UsageInfo(double.parse(values[0]), int.parse(values[1]));
} catch (e) {
return null;
diff --git a/pkg/analysis_server/lib/src/utilities/strings.dart b/pkg/analysis_server/lib/src/utilities/strings.dart
index d7f6723..42155b9 100644
--- a/pkg/analysis_server/lib/src/utilities/strings.dart
+++ b/pkg/analysis_server/lib/src/utilities/strings.dart
@@ -34,11 +34,11 @@
/// Return a simple difference between the given [oldStr] and [newStr].
SimpleDiff computeSimpleDiff(String oldStr, String newStr) {
- int prefixLength = findCommonPrefix(oldStr, newStr);
- int suffixLength = findCommonSuffix(oldStr, newStr);
+ var prefixLength = findCommonPrefix(oldStr, newStr);
+ var suffixLength = findCommonSuffix(oldStr, newStr);
while (prefixLength >= 0) {
- int oldReplaceLength = oldStr.length - prefixLength - suffixLength;
- int newReplaceLength = newStr.length - prefixLength - suffixLength;
+ var oldReplaceLength = oldStr.length - prefixLength - suffixLength;
+ var newReplaceLength = newStr.length - prefixLength - suffixLength;
if (oldReplaceLength >= 0 && newReplaceLength >= 0) {
return SimpleDiff(prefixLength, oldReplaceLength,
newStr.substring(prefixLength, newStr.length - suffixLength));
@@ -49,9 +49,9 @@
}
int countLeadingWhitespaces(String str) {
- int i = 0;
+ var i = 0;
for (; i < str.length; i++) {
- int c = str.codeUnitAt(i);
+ var c = str.codeUnitAt(i);
if (!isWhitespace(c)) {
break;
}
@@ -64,8 +64,8 @@
if (isEmpty(str) || isEmpty(sub)) {
return 0;
}
- int count = 0;
- int idx = 0;
+ var count = 0;
+ var idx = 0;
while ((idx = str.indexOf(sub, idx)) != -1) {
count++;
idx += sub.length;
@@ -74,9 +74,9 @@
}
int countTrailingWhitespaces(String str) {
- int i = 0;
+ var i = 0;
for (; i < str.length; i++) {
- int c = str.codeUnitAt(str.length - 1 - i);
+ var c = str.codeUnitAt(str.length - 1 - i);
if (!isWhitespace(c)) {
break;
}
@@ -86,8 +86,8 @@
/// Returns the number of characters common to the start of [a] and [b].
int findCommonPrefix(String a, String b) {
- int n = min(a.length, b.length);
- for (int i = 0; i < n; i++) {
+ var n = min(a.length, b.length);
+ for (var i = 0; i < n; i++) {
if (a.codeUnitAt(i) != b.codeUnitAt(i)) {
return i;
}
@@ -97,10 +97,10 @@
/// Returns the number of characters common to the end of [a] and [b].
int findCommonSuffix(String a, String b) {
- int a_length = a.length;
- int b_length = b.length;
- int n = min(a_length, b_length);
- for (int i = 1; i <= n; i++) {
+ var a_length = a.length;
+ var b_length = b.length;
+ var n = min(a_length, b_length);
+ for (var i = 1; i <= n; i++) {
if (a.codeUnitAt(a_length - i) != b.codeUnitAt(b_length - i)) {
return i - 1;
}
@@ -152,8 +152,8 @@
}
String repeat(String s, int n) {
- StringBuffer sb = StringBuffer();
- for (int i = 0; i < n; i++) {
+ var sb = StringBuffer();
+ for (var i = 0; i < n; i++) {
sb.write(s);
}
return sb.toString();
@@ -162,8 +162,8 @@
/// If the [text] length is above the [limit], replace the middle with `...`.
String shorten(String text, int limit) {
if (text.length > limit) {
- int headLength = limit ~/ 2 - 1;
- int tailLength = limit - headLength - 3;
+ var headLength = limit ~/ 2 - 1;
+ var tailLength = limit - headLength - 3;
return text.substring(0, headLength) +
'...' +
text.substring(text.length - tailLength);
diff --git a/pkg/analysis_server/lib/src/utilities/yaml_node_locator.dart b/pkg/analysis_server/lib/src/utilities/yaml_node_locator.dart
index 765e01b..809748f 100644
--- a/pkg/analysis_server/lib/src/utilities/yaml_node_locator.dart
+++ b/pkg/analysis_server/lib/src/utilities/yaml_node_locator.dart
@@ -3,7 +3,6 @@
// BSD-style license that can be found in the LICENSE file.
import 'package:meta/meta.dart';
-import 'package:source_span/src/span.dart';
import 'package:yaml/yaml.dart';
/// An object used to locate the [YamlNode] associated with a source range.
@@ -30,18 +29,18 @@
/// node was found. The path is represented by all of the elements from the
/// starting [node] to the most deeply nested node, in reverse order.
List<YamlNode> searchWithin(YamlNode node) {
- List<YamlNode> path = [];
+ var path = <YamlNode>[];
_searchWithin(path, node);
return path;
}
void _searchWithin(List<YamlNode> path, YamlNode node) {
- SourceSpan span = node.span;
+ var span = node.span;
if (span.start.offset > _endOffset || span.end.offset < _startOffset) {
return;
}
if (node is YamlList) {
- for (YamlNode element in node.nodes) {
+ for (var element in node.nodes) {
_searchWithin(path, element);
if (path.isNotEmpty) {
path.add(node);
@@ -49,7 +48,7 @@
}
}
} else if (node is YamlMap) {
- Map<dynamic, YamlNode> nodeMap = node.nodes;
+ var nodeMap = node.nodes;
for (YamlNode key in nodeMap.keys) {
_searchWithin(path, key);
if (path.isNotEmpty) {
diff --git a/pkg/analysis_server/lib/starter.dart b/pkg/analysis_server/lib/starter.dart
index 859f8e7..5877e34 100644
--- a/pkg/analysis_server/lib/starter.dart
+++ b/pkg/analysis_server/lib/starter.dart
@@ -2,6 +2,8 @@
// 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.
+import 'dart:isolate';
+
import 'package:analysis_server/src/server/crash_reporting_attachments.dart';
import 'package:analysis_server/src/server/detachable_filesystem_manager.dart';
import 'package:analysis_server/src/server/driver.dart';
@@ -29,5 +31,5 @@
set instrumentationService(InstrumentationService service);
/// Use the given command-line [arguments] to start this server.
- void start(List<String> arguments);
+ void start(List<String> arguments, [SendPort sendPort]);
}
diff --git a/pkg/analysis_server/pubspec.yaml b/pkg/analysis_server/pubspec.yaml
index 73ed2fb..2ea56a3 100644
--- a/pkg/analysis_server/pubspec.yaml
+++ b/pkg/analysis_server/pubspec.yaml
@@ -17,6 +17,7 @@
meta: any
nnbd_migration: any
source_span: any
+ stream_channel: any
package_config: any
path: any
tflite_native: any
diff --git a/pkg/analysis_server/test/abstract_context.dart b/pkg/analysis_server/test/abstract_context.dart
index 36ad804..338b521 100644
--- a/pkg/analysis_server/test/abstract_context.dart
+++ b/pkg/analysis_server/test/abstract_context.dart
@@ -74,7 +74,7 @@
}
void addMetaPackage() {
- Folder libFolder = MockPackages.instance.addMeta(resourceProvider);
+ var libFolder = MockPackages.instance.addMeta(resourceProvider);
addTestPackageDependency('meta', libFolder.parent.path);
}
@@ -88,8 +88,8 @@
}
Source addSource(String path, String content, [Uri uri]) {
- File file = newFile(path, content: content);
- Source source = file.createSource(uri);
+ var file = newFile(path, content: content);
+ var source = file.createSource(uri);
driver.addFile(file.path);
driver.changeFile(file.path);
return source;
@@ -114,7 +114,7 @@
}
void addVectorMathPackage() {
- Folder libFolder = MockPackages.instance.addVectorMath(resourceProvider);
+ var libFolder = MockPackages.instance.addVectorMath(resourceProvider);
addTestPackageDependency('vector_math', libFolder.parent.path);
}
@@ -134,12 +134,12 @@
/// Create an analysis options file based on the given arguments.
void createAnalysisOptionsFile(
{List<String> experiments, List<String> lints}) {
- StringBuffer buffer = StringBuffer();
+ var buffer = StringBuffer();
if (experiments != null) {
buffer.writeln('analyzer:');
buffer.writeln(' enable-experiment:');
- for (String experiment in experiments) {
+ for (var experiment in experiments) {
buffer.writeln(' - $experiment');
}
}
@@ -147,7 +147,7 @@
if (lints != null) {
buffer.writeln('linter:');
buffer.writeln(' rules:');
- for (String lint in lints) {
+ for (var lint in lints) {
buffer.writeln(' - $lint');
}
}
diff --git a/pkg/analysis_server/test/abstract_single_unit.dart b/pkg/analysis_server/test/abstract_single_unit.dart
index 652e1f6..c6e2124 100644
--- a/pkg/analysis_server/test/abstract_single_unit.dart
+++ b/pkg/analysis_server/test/abstract_single_unit.dart
@@ -60,7 +60,7 @@
}
AstNode findNodeAtOffset(int offset, [Predicate<AstNode> predicate]) {
- AstNode result = NodeLocator(offset).searchWithin(testUnit);
+ var result = NodeLocator(offset).searchWithin(testUnit);
if (result != null && predicate != null) {
result = result.thisOrAncestorMatching(predicate);
}
@@ -68,13 +68,13 @@
}
AstNode findNodeAtString(String search, [Predicate<AstNode> predicate]) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
return findNodeAtOffset(offset, predicate);
}
Element findNodeElementAtString(String search,
[Predicate<AstNode> predicate]) {
- AstNode node = findNodeAtString(search, predicate);
+ var node = findNodeAtString(search, predicate);
if (node == null) {
return null;
}
@@ -82,15 +82,15 @@
}
int findOffset(String search) {
- int offset = testCode.indexOf(search);
+ var offset = testCode.indexOf(search);
expect(offset, isNonNegative, reason: "Not found '$search' in\n$testCode");
return offset;
}
int getLeadingIdentifierLength(String search) {
- int length = 0;
+ var length = 0;
while (length < search.length) {
- int c = search.codeUnitAt(length);
+ var c = search.codeUnitAt(length);
if (c >= 'a'.codeUnitAt(0) && c <= 'z'.codeUnitAt(0)) {
length++;
continue;
diff --git a/pkg/analysis_server/test/analysis/get_errors_test.dart b/pkg/analysis_server/test/analysis/get_errors_test.dart
index afe13b2..d6f4ef2 100644
--- a/pkg/analysis_server/test/analysis/get_errors_test.dart
+++ b/pkg/analysis_server/test/analysis/get_errors_test.dart
@@ -40,13 +40,13 @@
}
''');
await waitForTasksFinished();
- List<AnalysisError> errors = await _getErrors(testFile);
+ var errors = await _getErrors(testFile);
expect(errors, hasLength(1));
}
Future<void> test_errorInPart() async {
- String libPath = join(testFolder, 'main.dart');
- String partPath = join(testFolder, 'main_part.dart');
+ var libPath = join(testFolder, 'main.dart');
+ var partPath = join(testFolder, 'main_part.dart');
newFile(libPath, content: r'''
library main;
part 'main_part.dart';
@@ -58,11 +58,11 @@
''');
await waitForTasksFinished();
{
- List<AnalysisError> libErrors = await _getErrors(libPath);
+ var libErrors = await _getErrors(libPath);
expect(libErrors, isEmpty);
}
{
- List<AnalysisError> partErrors = await _getErrors(partPath);
+ var partErrors = await _getErrors(partPath);
expect(partErrors, hasLength(1));
}
}
@@ -70,7 +70,7 @@
@failingTest
Future<void> test_fileWithoutContext() async {
// Broken under the new driver.
- String file = convertPath('/outside.dart');
+ var file = convertPath('/outside.dart');
newFile(file, content: '''
main() {
print(42);
@@ -85,10 +85,10 @@
print(42)
}
''');
- List<AnalysisError> errors = await _getErrors(testFile);
+ var errors = await _getErrors(testFile);
expect(errors, hasLength(1));
{
- AnalysisError error = errors[0];
+ var error = errors[0];
expect(error.severity, AnalysisErrorSeverity.ERROR);
expect(error.type, AnalysisErrorType.SYNTACTIC_ERROR);
expect(error.location.file, testFile);
@@ -120,13 +120,13 @@
print(42);
}
''');
- List<AnalysisError> errors = await _getErrors(testFile);
+ var errors = await _getErrors(testFile);
expect(errors, isEmpty);
}
Future<void> _checkInvalid(String file) async {
- Request request = _createGetErrorsRequest(file);
- Response response = await serverChannel.sendRequest(request);
+ var request = _createGetErrorsRequest(file);
+ var response = await serverChannel.sendRequest(request);
expect(response.error, isNotNull);
expect(response.error.code, RequestErrorCode.GET_ERRORS_INVALID_FILE);
}
@@ -136,8 +136,8 @@
}
Future<List<AnalysisError>> _getErrors(String file) async {
- Request request = _createGetErrorsRequest(file);
- Response response = await serverChannel.sendRequest(request);
+ var request = _createGetErrorsRequest(file);
+ var response = await serverChannel.sendRequest(request);
return AnalysisGetErrorsResult.fromResponse(response).errors;
}
}
diff --git a/pkg/analysis_server/test/analysis/get_hover_test.dart b/pkg/analysis_server/test/analysis/get_hover_test.dart
index 619e0eb..c9df867 100644
--- a/pkg/analysis_server/test/analysis/get_hover_test.dart
+++ b/pkg/analysis_server/test/analysis/get_hover_test.dart
@@ -4,7 +4,6 @@
import 'dart:async';
-import 'package:analysis_server/protocol/protocol.dart';
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -21,16 +20,16 @@
@reflectiveTest
class AnalysisHoverTest extends AbstractAnalysisTest {
Future<HoverInformation> prepareHover(String search) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
return prepareHoverAt(offset);
}
Future<HoverInformation> prepareHoverAt(int offset) async {
await waitForTasksFinished();
- Request request = AnalysisGetHoverParams(testFile, offset).toRequest('0');
- Response response = await waitResponse(request);
+ var request = AnalysisGetHoverParams(testFile, offset).toRequest('0');
+ var response = await waitResponse(request);
var result = AnalysisGetHoverResult.fromResponse(response);
- List<HoverInformation> hovers = result.hovers;
+ var hovers = result.hovers;
return hovers.isNotEmpty ? hovers.first : null;
}
@@ -49,7 +48,7 @@
class M2<E> {}
class B<T> extends A<T> with M1, M2<int> implements I1<int, String>, I2 {}
''');
- HoverInformation hover = await prepareHover('B<T>');
+ var hover = await prepareHover('B<T>');
expect(
hover.elementDescription,
'class B<T> extends A<T> with M1, M2<int> '
@@ -63,7 +62,7 @@
class A {}
abstract class B extends A {}
''');
- HoverInformation hover = await prepareHover('B extends');
+ var hover = await prepareHover('B extends');
expect(hover.elementDescription, 'abstract class B extends A');
expect(hover.staticType, isNull);
expect(hover.propagatedType, isNull);
@@ -91,11 +90,11 @@
}
{
- HoverInformation hover = await prepareHover('new A');
+ var hover = await prepareHover('new A');
onConstructor(hover);
}
{
- HoverInformation hover = await prepareHover('named();');
+ var hover = await prepareHover('named();');
onConstructor(hover);
}
}
@@ -110,7 +109,7 @@
const a = A(0);
}
''');
- HoverInformation hover = await prepareHover('A(0)');
+ var hover = await prepareHover('A(0)');
// range
expect(hover.offset, findOffset('A(0)'));
expect(hover.length, 'A'.length);
@@ -135,7 +134,7 @@
var a = A();
}
''');
- HoverInformation hover = await prepareHover('A()');
+ var hover = await prepareHover('A()');
// range
expect(hover.offset, findOffset('A()'));
expect(hover.length, 'A'.length);
@@ -161,7 +160,7 @@
new A();
}
''');
- HoverInformation hover = await prepareHover('new A');
+ var hover = await prepareHover('new A');
// range
expect(hover.offset, findOffset('new A') + 'new '.length);
expect(hover.length, 'A'.length);
@@ -204,15 +203,15 @@
}
{
- HoverInformation hover = await prepareHover('new A');
+ var hover = await prepareHover('new A');
onConstructor(hover);
}
{
- HoverInformation hover = await prepareHover('A<String>()');
+ var hover = await prepareHover('A<String>()');
onConstructor(hover);
}
{
- HoverInformation hover = await prepareHover('String>');
+ var hover = await prepareHover('String>');
expect(hover.containingLibraryName, 'dart:core');
expect(hover.offset, findOffset('String>'));
expect(hover.length, 'String'.length);
@@ -229,7 +228,7 @@
main() {
}
''');
- HoverInformation hover = await prepareHover('main() {');
+ var hover = await prepareHover('main() {');
expect(hover.dartdoc, '''doc aaa\ndoc bbb''');
}
@@ -244,7 +243,7 @@
m() {} // in B
}
''');
- HoverInformation hover = await prepareHover('m() {} // in B');
+ var hover = await prepareHover('m() {} // in B');
expect(hover.dartdoc, '''my doc\n\nCopied from `A`.''');
}
@@ -259,7 +258,7 @@
m() {} // in B
}
''');
- HoverInformation hover = await prepareHover('m() {} // in B');
+ var hover = await prepareHover('m() {} // in B');
expect(hover.dartdoc, '''my doc\n\nCopied from `A`.''');
}
@@ -275,7 +274,7 @@
class C extends B {
m() {} // in C
}''');
- HoverInformation hover = await prepareHover('m() {} // in C');
+ var hover = await prepareHover('m() {} // in C');
expect(hover.dartdoc, '''my doc\n\nCopied from `A`.''');
}
@@ -294,7 +293,7 @@
class C extends B implements I {
m() {} // in C
}''');
- HoverInformation hover = await prepareHover('m() {} // in C');
+ var hover = await prepareHover('m() {} // in C');
expect(hover.dartdoc, '''my doc\n\nCopied from `A`.''');
}
@@ -305,7 +304,7 @@
main() {
}
''');
- HoverInformation hover = await prepareHover('main() {');
+ var hover = await prepareHover('main() {');
expect(hover.dartdoc, '''doc aaa\ndoc bbb''');
}
@@ -313,7 +312,7 @@
addTestFile('''
enum MyEnum {AAA, BBB, CCC}
''');
- HoverInformation hover = await prepareHover('MyEnum');
+ var hover = await prepareHover('MyEnum');
expect(hover.elementDescription, 'enum MyEnum');
expect(hover.staticType, isNull);
expect(hover.propagatedType, isNull);
@@ -326,7 +325,7 @@
/// Comment
extension E on A {}
''');
- HoverInformation hover = await prepareHover('E');
+ var hover = await prepareHover('E');
expect(hover.elementDescription, 'extension E on A');
expect(hover.dartdoc, 'Comment');
expect(hover.staticType, isNull);
@@ -341,7 +340,7 @@
List<String> fff(int a, String b) {
}
''');
- HoverInformation hover = await prepareHover('fff(int a');
+ var hover = await prepareHover('fff(int a');
// element
expect(hover.containingLibraryName, 'bin/test.dart');
expect(hover.containingLibraryPath, testFile);
@@ -368,7 +367,7 @@
print(a.fff);
}
''');
- HoverInformation hover = await prepareHover('fff);');
+ var hover = await prepareHover('fff);');
// element
expect(hover.containingLibraryName, 'bin/test.dart');
expect(hover.containingLibraryPath, testFile);
@@ -388,7 +387,7 @@
}
foo(Object myParameter) {}
''');
- HoverInformation hover = await prepareHover('123');
+ var hover = await prepareHover('123');
// range
expect(hover.offset, findOffset('123'));
expect(hover.length, 3);
@@ -413,7 +412,7 @@
}
foo(double myParameter) {}
''');
- HoverInformation hover = await prepareHover('123');
+ var hover = await prepareHover('123');
// range
expect(hover.offset, findOffset('123'));
expect(hover.length, 3);
@@ -460,7 +459,7 @@
}
}
''');
- HoverInformation hover = await prepareHover('vvv = 42');
+ var hover = await prepareHover('vvv = 42');
// element
expect(hover.containingLibraryName, isNull);
expect(hover.containingLibraryPath, isNull);
@@ -483,7 +482,7 @@
print(vvv);
}
''');
- HoverInformation hover = await prepareHover('vvv);');
+ var hover = await prepareHover('vvv);');
// element
expect(hover.containingLibraryName, isNull);
expect(hover.containingLibraryPath, isNull);
@@ -506,7 +505,7 @@
}
}
''');
- HoverInformation hover = await prepareHover('mmm(int a');
+ var hover = await prepareHover('mmm(int a');
// element
expect(hover.containingLibraryName, 'bin/test.dart');
expect(hover.containingLibraryPath, testFile);
@@ -532,7 +531,7 @@
a.mmm(42, 'foo');
}
''');
- HoverInformation hover = await prepareHover('mm(42, ');
+ var hover = await prepareHover('mm(42, ');
// range
expect(hover.offset, findOffset('mmm(42, '));
expect(hover.length, 'mmm'.length);
@@ -559,7 +558,7 @@
A.test();
}
''');
- HoverInformation hover = await prepareHover('test();');
+ var hover = await prepareHover('test();');
// element
expect(hover.containingLibraryPath, testFile);
expect(hover.elementDescription, 'void test()');
@@ -580,7 +579,7 @@
s.transform(null);
}
''');
- HoverInformation hover = await prepareHover('nsform(n');
+ var hover = await prepareHover('nsform(n');
// range
expect(hover.offset, findOffset('transform(n'));
expect(hover.length, 'transform'.length);
@@ -607,7 +606,7 @@
class D {}
class E {}
''');
- HoverInformation hover = await prepareHover('A');
+ var hover = await prepareHover('A');
expect(hover.elementDescription, 'mixin A on B, C implements D, E');
expect(hover.staticType, isNull);
expect(hover.propagatedType, isNull);
@@ -620,7 +619,7 @@
abstract class B {}
class C with A implements B {}
''');
- HoverInformation hover = await prepareHover('A i');
+ var hover = await prepareHover('A i');
expect(hover.elementDescription, 'mixin A');
expect(hover.staticType, isNull);
expect(hover.propagatedType, isNull);
@@ -633,7 +632,7 @@
// nothing
}
''');
- HoverInformation hover = await prepareHover('nothing');
+ var hover = await prepareHover('nothing');
expect(hover, isNull);
}
@@ -662,7 +661,7 @@
new A(fff: 42);
}
''');
- HoverInformation hover = await prepareHover('fff});');
+ var hover = await prepareHover('fff});');
expect(hover.containingLibraryName, isNull);
expect(hover.containingLibraryPath, isNull);
expect(hover.containingClassDescription, isNull);
@@ -681,7 +680,7 @@
}
}
''');
- HoverInformation hover = await prepareHover('p) {');
+ var hover = await prepareHover('p) {');
// element
expect(hover.containingLibraryName, isNull);
expect(hover.containingLibraryPath, isNull);
@@ -707,7 +706,7 @@
new A(fff: 42);
}
''');
- HoverInformation hover = await prepareHover('fff: 42');
+ var hover = await prepareHover('fff: 42');
expect(hover.containingLibraryName, isNull);
expect(hover.containingLibraryPath, isNull);
expect(hover.containingClassDescription, isNull);
diff --git a/pkg/analysis_server/test/analysis/get_navigation_test.dart b/pkg/analysis_server/test/analysis/get_navigation_test.dart
index 4454b8a..1517645 100644
--- a/pkg/analysis_server/test/analysis/get_navigation_test.dart
+++ b/pkg/analysis_server/test/analysis/get_navigation_test.dart
@@ -47,7 +47,7 @@
Future<void> test_fieldType() async {
// This test mirrors test_navigation() from
// test/integration/analysis/get_navigation_test.dart
- String text = r'''
+ var text = r'''
class Foo {}
class Bar {
@@ -57,7 +57,7 @@
addTestFile(text);
await _getNavigation(testFile, text.indexOf('Foo foo'), 0);
expect(targets, hasLength(1));
- NavigationTarget target = targets.first;
+ var target = targets.first;
expect(target.kind, ElementKind.CLASS);
expect(target.offset, text.indexOf('Foo {'));
expect(target.length, 3);
@@ -66,9 +66,9 @@
}
Future<void> test_fileDoesNotExist() async {
- String file = convertPath('$projectPath/doesNotExist.dart');
- Request request = _createGetNavigationRequest(file, 0, 100);
- Response response = await serverChannel.sendRequest(request);
+ var file = convertPath('$projectPath/doesNotExist.dart');
+ var request = _createGetNavigationRequest(file, 0, 100);
+ var response = await serverChannel.sendRequest(request);
expect(response.error, isNull);
expect(response.result['files'], isEmpty);
expect(response.result['targets'], isEmpty);
@@ -161,7 +161,7 @@
''');
await waitForTasksFinished();
// request navigation
- String navCode = ' + bbb + ';
+ var navCode = ' + bbb + ';
await _getNavigation(testFile, testCode.indexOf(navCode), navCode.length);
// verify
{
@@ -194,32 +194,32 @@
''');
await waitForTasksFinished();
{
- String search = '[0';
+ var search = '[0';
await _getNavigation(testFile, testCode.indexOf(search), 1);
assertHasOperatorRegion(search, 1, '[](index)', 2);
}
{
- String search = '] // []';
+ var search = '] // []';
await _getNavigation(testFile, testCode.indexOf(search), 1);
assertHasOperatorRegion(search, 1, '[](index)', 2);
}
{
- String search = '[1';
+ var search = '[1';
await _getNavigation(testFile, testCode.indexOf(search), 1);
assertHasOperatorRegion(search, 1, '[]=(index', 3);
}
{
- String search = '] = 1';
+ var search = '] = 1';
await _getNavigation(testFile, testCode.indexOf(search), 1);
assertHasOperatorRegion(search, 1, '[]=(index', 3);
}
{
- String search = '[2';
+ var search = '[2';
await _getNavigation(testFile, testCode.indexOf(search), 1);
assertHasOperatorRegion(search, 1, '[]=(index', 3);
}
{
- String search = '] += 2';
+ var search = '] += 2';
await _getNavigation(testFile, testCode.indexOf(search), 1);
assertHasOperatorRegion(search, 1, '[]=(index', 3);
}
@@ -257,10 +257,9 @@
}
Future<void> _getNavigation(String file, int offset, int length) async {
- Request request = _createGetNavigationRequest(file, offset, length);
- Response response = await serverChannel.sendRequest(request);
- AnalysisGetNavigationResult result =
- AnalysisGetNavigationResult.fromResponse(response);
+ var request = _createGetNavigationRequest(file, offset, length);
+ var response = await serverChannel.sendRequest(request);
+ var result = AnalysisGetNavigationResult.fromResponse(response);
targetFiles = result.files;
targets = result.targets;
regions = result.regions;
diff --git a/pkg/analysis_server/test/analysis/get_signature_test.dart b/pkg/analysis_server/test/analysis/get_signature_test.dart
index c8b33f2..24a954c 100644
--- a/pkg/analysis_server/test/analysis/get_signature_test.dart
+++ b/pkg/analysis_server/test/analysis/get_signature_test.dart
@@ -22,25 +22,25 @@
@reflectiveTest
class AnalysisSignatureTest extends AbstractAnalysisTest {
Future<Response> prepareRawSignature(String search) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
return prepareRawSignatureAt(offset);
}
Future<Response> prepareRawSignatureAt(int offset, {String file}) async {
await waitForTasksFinished();
- Request request =
+ var request =
AnalysisGetSignatureParams(file ?? testFile, offset).toRequest('0');
return waitResponse(request);
}
Future<AnalysisGetSignatureResult> prepareSignature(String search) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
return prepareSignatureAt(offset);
}
Future<AnalysisGetSignatureResult> prepareSignatureAt(int offset,
{String file}) async {
- Response response = await prepareRawSignatureAt(offset, file: file);
+ var response = await prepareRawSignatureAt(offset, file: file);
return AnalysisGetSignatureResult.fromResponse(response);
}
diff --git a/pkg/analysis_server/test/analysis/notification_analysis_options_test.dart b/pkg/analysis_server/test/analysis/notification_analysis_options_test.dart
index 631c7d6..3448021 100644
--- a/pkg/analysis_server/test/analysis/notification_analysis_options_test.dart
+++ b/pkg/analysis_server/test/analysis/notification_analysis_options_test.dart
@@ -7,7 +7,6 @@
import 'package:analysis_server/protocol/protocol_generated.dart'
hide AnalysisOptions;
import 'package:analysis_server/src/domain_analysis.dart';
-import 'package:analyzer/src/generated/engine.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:linter/src/rules.dart';
import 'package:test/test.dart';
@@ -53,7 +52,7 @@
}
void setAnalysisRoot() {
- Request request =
+ var request =
AnalysisSetAnalysisRootsParams([projectPath], []).toRequest('0');
handleSuccessfulRequest(request);
}
@@ -253,7 +252,7 @@
}
void verifyLintsEnabled(List<String> lints) {
- AnalysisOptions options = analysisOptions;
+ var options = analysisOptions;
expect(options.lint, true);
var rules = options.lintRules.map((rule) => rule.name);
expect(rules, unorderedEquals(lints));
diff --git a/pkg/analysis_server/test/analysis/notification_analyzed_files_test.dart b/pkg/analysis_server/test/analysis/notification_analyzed_files_test.dart
index f8427e9..724900e 100644
--- a/pkg/analysis_server/test/analysis/notification_analyzed_files_test.dart
+++ b/pkg/analysis_server/test/analysis/notification_analyzed_files_test.dart
@@ -7,7 +7,6 @@
import 'package:analysis_server/protocol/protocol.dart';
import 'package:analysis_server/protocol/protocol_constants.dart';
import 'package:analysis_server/protocol/protocol_generated.dart';
-import 'package:analyzer/file_system/file_system.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -42,8 +41,7 @@
@override
void processNotification(Notification notification) {
if (notification.event == ANALYSIS_NOTIFICATION_ANALYZED_FILES) {
- AnalysisAnalyzedFilesParams params =
- AnalysisAnalyzedFilesParams.fromNotification(notification);
+ var params = AnalysisAnalyzedFilesParams.fromNotification(notification);
analyzedFilesReceived = true;
analyzedFiles = params.directories;
}
@@ -74,7 +72,7 @@
}
Future<void> test_beforeAnalysis_excludeYamlFiles() async {
- File yamlFile = getFolder(projectPath).getChildAssumingFile('sample.yaml');
+ var yamlFile = getFolder(projectPath).getChildAssumingFile('sample.yaml');
yamlFile.writeAsStringSync('');
addTestFile('''
class A {}
diff --git a/pkg/analysis_server/test/analysis/notification_errors_test.dart b/pkg/analysis_server/test/analysis/notification_errors_test.dart
index 5461be7..613fd20 100644
--- a/pkg/analysis_server/test/analysis/notification_errors_test.dart
+++ b/pkg/analysis_server/test/analysis/notification_errors_test.dart
@@ -7,7 +7,6 @@
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analysis_server/src/domain_analysis.dart';
import 'package:analyzer/src/lint/linter.dart';
-import 'package:analyzer/src/services/lint.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:linter/src/rules.dart';
import 'package:test/test.dart';
@@ -49,14 +48,14 @@
}
Future<void> test_analysisOptionsFile() async {
- String filePath = join(projectPath, 'analysis_options.yaml');
- String analysisOptionsFile = newFile(filePath, content: '''
+ var filePath = join(projectPath, 'analysis_options.yaml');
+ var analysisOptionsFile = newFile(filePath, content: '''
linter:
rules:
- invalid_lint_rule_name
''').path;
- Request request =
+ var request =
AnalysisSetAnalysisRootsParams([projectPath], []).toRequest('0');
handleSuccessfulRequest(request);
await waitForTasksFinished();
@@ -64,17 +63,17 @@
//
// Verify the error result.
//
- List<AnalysisError> errors = filesErrors[analysisOptionsFile];
+ var errors = filesErrors[analysisOptionsFile];
expect(errors, hasLength(1));
- AnalysisError error = errors[0];
+ var error = errors[0];
expect(error.location.file, filePath);
expect(error.severity, AnalysisErrorSeverity.WARNING);
expect(error.type, AnalysisErrorType.STATIC_WARNING);
}
Future<void> test_androidManifestFile() async {
- String filePath = join(projectPath, 'android', 'AndroidManifest.xml');
- String manifestFile = newFile(filePath, content: '''
+ var filePath = join(projectPath, 'android', 'AndroidManifest.xml');
+ var manifestFile = newFile(filePath, content: '''
<manifest
xmlns:android="http://schemas.android.com/apk/res/android">
<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
@@ -87,7 +86,7 @@
chrome-os-manifest-checks: true
''');
- Request request =
+ var request =
AnalysisSetAnalysisRootsParams([projectPath], []).toRequest('0');
handleSuccessfulRequest(request);
await waitForTasksFinished();
@@ -95,18 +94,17 @@
//
// Verify the error result.
//
- List<AnalysisError> errors = filesErrors[manifestFile];
+ var errors = filesErrors[manifestFile];
expect(errors, hasLength(1));
- AnalysisError error = errors[0];
+ var error = errors[0];
expect(error.location.file, filePath);
expect(error.severity, AnalysisErrorSeverity.WARNING);
expect(error.type, AnalysisErrorType.STATIC_WARNING);
}
Future<void> test_androidManifestFile_dotDirectoryIgnored() async {
- String filePath =
- join(projectPath, 'ios', '.symlinks', 'AndroidManifest.xml');
- String manifestFile = newFile(filePath, content: '''
+ var filePath = join(projectPath, 'ios', '.symlinks', 'AndroidManifest.xml');
+ var manifestFile = newFile(filePath, content: '''
<manifest
xmlns:android="http://schemas.android.com/apk/res/android">
<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
@@ -119,7 +117,7 @@
chrome-os-manifest-checks: true
''');
- Request request =
+ var request =
AnalysisSetAnalysisRootsParams([projectPath], []).toRequest('0');
handleSuccessfulRequest(request);
await waitForTasksFinished();
@@ -127,7 +125,7 @@
//
// Verify that the file wasn't analyzed.
//
- List<AnalysisError> errors = filesErrors[manifestFile];
+ var errors = filesErrors[manifestFile];
expect(errors, isNull);
}
@@ -137,7 +135,7 @@
// is analyzed).
createProject();
addTestFile('');
- String brokenFile =
+ var brokenFile =
newFile(join(projectPath, '.dart_tool/broken.dart'), content: 'err')
.path;
@@ -162,7 +160,7 @@
// editor forever.
createProject();
addTestFile('');
- String brokenFile =
+ var brokenFile =
newFile(join(projectPath, '.dart_tool/broken.dart'), content: 'err')
.path;
@@ -187,11 +185,11 @@
''');
await waitForTasksFinished();
await pumpEventQueue(times: 5000);
- List<AnalysisError> errors = filesErrors[testFile];
+ var errors = filesErrors[testFile];
// Verify that we are generating only 1 error for the bad URI.
// https://github.com/dart-lang/sdk/issues/23754
expect(errors, hasLength(1));
- AnalysisError error = errors[0];
+ var error = errors[0];
expect(error.severity, AnalysisErrorSeverity.ERROR);
expect(error.type, AnalysisErrorType.COMPILE_TIME_ERROR);
expect(error.message, startsWith("Target of URI doesn't exist"));
@@ -208,24 +206,24 @@
addTestFile('class a { }');
- Request request =
+ var request =
AnalysisSetAnalysisRootsParams([projectPath], []).toRequest('0');
handleSuccessfulRequest(request);
await waitForTasksFinished();
var testDriver = server.getAnalysisDriver(testFile);
- List<Linter> lints = testDriver.analysisOptions.lintRules;
+ var lints = testDriver.analysisOptions.lintRules;
// Registry should only contain single lint rule.
expect(lints, hasLength(1));
- LintRule lint = lints.first as LintRule;
+ var lint = lints.first as LintRule;
expect(lint.name, camelCaseTypesLintName);
// Verify lint error result.
- List<AnalysisError> errors = filesErrors[testFile];
+ var errors = filesErrors[testFile];
expect(errors, hasLength(1));
- AnalysisError error = errors[0];
+ var error = errors[0];
expect(error.location.file, join(projectPath, 'bin', 'test.dart'));
expect(error.severity, AnalysisErrorSeverity.INFO);
expect(error.type, AnalysisErrorType.LINT);
@@ -234,7 +232,7 @@
Future<void> test_notInAnalysisRoot() async {
createProject();
- String otherFile = newFile('/other.dart', content: 'UnknownType V;').path;
+ var otherFile = newFile('/other.dart', content: 'UnknownType V;').path;
addTestFile('''
import '/other.dart';
main() {
@@ -250,7 +248,7 @@
// if they have overlays added.
createProject();
addTestFile('');
- String brokenFile =
+ var brokenFile =
newFile(join(projectPath, '.dart_tool/broken.dart'), content: 'err')
.path;
@@ -278,7 +276,7 @@
// should clear the errors.
createProject();
addTestFile('');
- String brokenFile = convertPath(join(projectPath, 'broken.dart'));
+ var brokenFile = convertPath(join(projectPath, 'broken.dart'));
// Add and overlay and give chance for the file to be analyzed.
await waitResponse(
@@ -314,7 +312,7 @@
// removed.
createProject();
addTestFile('');
- String brokenFile = convertPath(join(projectPath, 'broken.dart'));
+ var brokenFile = convertPath(join(projectPath, 'broken.dart'));
// Add and overlay and give chance for the file to be analyzed.
await waitResponse(
@@ -352,9 +350,9 @@
addTestFile('library lib');
await waitForTasksFinished();
await pumpEventQueue(times: 5000);
- List<AnalysisError> errors = filesErrors[testFile];
+ var errors = filesErrors[testFile];
expect(errors, hasLength(1));
- AnalysisError error = errors[0];
+ var error = errors[0];
expect(error.location.file, join(projectPath, 'bin', 'test.dart'));
expect(error.location.offset, isPositive);
expect(error.location.length, isNonNegative);
@@ -364,12 +362,12 @@
}
Future<void> test_pubspecFile() async {
- String filePath = join(projectPath, 'pubspec.yaml');
- String pubspecFile = newFile(filePath, content: '''
+ var filePath = join(projectPath, 'pubspec.yaml');
+ var pubspecFile = newFile(filePath, content: '''
version: 1.3.2
''').path;
- Request setRootsRequest =
+ var setRootsRequest =
AnalysisSetAnalysisRootsParams([projectPath], []).toRequest('0');
handleSuccessfulRequest(setRootsRequest);
await waitForTasksFinished();
@@ -377,9 +375,9 @@
//
// Verify the error result.
//
- List<AnalysisError> errors = filesErrors[pubspecFile];
+ var errors = filesErrors[pubspecFile];
expect(errors, hasLength(1));
- AnalysisError error = errors[0];
+ var error = errors[0];
expect(error.location.file, filePath);
expect(error.severity, AnalysisErrorSeverity.WARNING);
expect(error.type, AnalysisErrorType.STATIC_WARNING);
@@ -407,9 +405,9 @@
''');
await waitForTasksFinished();
await pumpEventQueue(times: 5000);
- List<AnalysisError> errors = filesErrors[testFile];
+ var errors = filesErrors[testFile];
expect(errors, hasLength(1));
- AnalysisError error = errors[0];
+ var error = errors[0];
expect(error.severity, AnalysisErrorSeverity.ERROR);
expect(error.type, AnalysisErrorType.STATIC_WARNING);
}
diff --git a/pkg/analysis_server/test/analysis/notification_highlights2_test.dart b/pkg/analysis_server/test/analysis/notification_highlights2_test.dart
index 283fccc..121574d 100644
--- a/pkg/analysis_server/test/analysis/notification_highlights2_test.dart
+++ b/pkg/analysis_server/test/analysis/notification_highlights2_test.dart
@@ -1011,8 +1011,7 @@
}
''');
await prepareHighlights();
- HighlightRegionType type =
- HighlightRegionType.UNRESOLVED_INSTANCE_MEMBER_REFERENCE;
+ var type = HighlightRegionType.UNRESOLVED_INSTANCE_MEMBER_REFERENCE;
assertHasRegion(type, 'aaa');
assertHasRegion(type, 'aaa++');
assertHasRegion(type, 'aaa += 0');
@@ -1040,7 +1039,7 @@
}
''');
await prepareHighlights();
- HighlightRegionType type = HighlightRegionType.IDENTIFIER_DEFAULT;
+ var type = HighlightRegionType.IDENTIFIER_DEFAULT;
assertHasRegion(type, 'aaa()');
assertHasRegion(type, 'bbb()');
assertHasRegion(type, 'ccc()');
@@ -1056,7 +1055,7 @@
final Completer<void> _resultsAvailable = Completer();
void assertHasRawRegion(HighlightRegionType type, int offset, int length) {
- for (HighlightRegion region in regions) {
+ for (var region in regions) {
if (region.offset == offset &&
region.length == length &&
region.type == type) {
@@ -1069,19 +1068,19 @@
void assertHasRegion(HighlightRegionType type, String search,
[int length = -1]) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
length = findRegionLength(search, length);
assertHasRawRegion(type, offset, length);
}
void assertHasStringRegion(HighlightRegionType type, String str) {
- int offset = findOffset(str);
- int length = str.length;
+ var offset = findOffset(str);
+ var length = str.length;
assertHasRawRegion(type, offset, length);
}
void assertNoRawRegion(HighlightRegionType type, int offset, int length) {
- for (HighlightRegion region in regions) {
+ for (var region in regions) {
if (region.offset == offset &&
region.length == length &&
region.type == type) {
@@ -1094,7 +1093,7 @@
void assertNoRegion(HighlightRegionType type, String search,
[int length = -1]) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
length = findRegionLength(search, length);
assertNoRawRegion(type, offset, length);
}
@@ -1103,7 +1102,7 @@
if (length == -1) {
length = 0;
while (length < search.length) {
- int c = search.codeUnitAt(length);
+ var c = search.codeUnitAt(length);
if (length == 0 && c == '@'.codeUnitAt(0)) {
length++;
continue;
diff --git a/pkg/analysis_server/test/analysis/notification_highlights_test.dart b/pkg/analysis_server/test/analysis/notification_highlights_test.dart
index 6d8d154..30966bf 100644
--- a/pkg/analysis_server/test/analysis/notification_highlights_test.dart
+++ b/pkg/analysis_server/test/analysis/notification_highlights_test.dart
@@ -904,7 +904,7 @@
final Completer<void> _resultsAvailable = Completer();
void assertHasRawRegion(HighlightRegionType type, int offset, int length) {
- for (HighlightRegion region in regions) {
+ for (var region in regions) {
if (region.offset == offset &&
region.length == length &&
region.type == type) {
@@ -917,19 +917,19 @@
void assertHasRegion(HighlightRegionType type, String search,
[int length = -1]) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
length = findRegionLength(search, length);
assertHasRawRegion(type, offset, length);
}
void assertHasStringRegion(HighlightRegionType type, String str) {
- int offset = findOffset(str);
- int length = str.length;
+ var offset = findOffset(str);
+ var length = str.length;
assertHasRawRegion(type, offset, length);
}
void assertNoRawRegion(HighlightRegionType type, int offset, int length) {
- for (HighlightRegion region in regions) {
+ for (var region in regions) {
if (region.offset == offset &&
region.length == length &&
region.type == type) {
@@ -942,7 +942,7 @@
void assertNoRegion(HighlightRegionType type, String search,
[int length = -1]) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
length = findRegionLength(search, length);
assertNoRawRegion(type, offset, length);
}
@@ -951,7 +951,7 @@
if (length == -1) {
length = 0;
while (length < search.length) {
- int c = search.codeUnitAt(length);
+ var c = search.codeUnitAt(length);
if (length == 0 && c == '@'.codeUnitAt(0)) {
length++;
continue;
diff --git a/pkg/analysis_server/test/analysis/notification_implemented_test.dart b/pkg/analysis_server/test/analysis/notification_implemented_test.dart
index 2abb4a0..2c0ab59 100644
--- a/pkg/analysis_server/test/analysis/notification_implemented_test.dart
+++ b/pkg/analysis_server/test/analysis/notification_implemented_test.dart
@@ -29,14 +29,14 @@
/// If [length] is not specified explicitly, then length of an identifier
/// from [search] is used.
void assertHasImplementedClass(String search, [int length = -1]) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
if (length == -1) {
length = findIdentifierLength(search);
}
if (implementedClasses == null) {
fail('No notification of impemented classes was received');
}
- for (ImplementedClass clazz in implementedClasses) {
+ for (var clazz in implementedClasses) {
if (clazz.offset == offset && clazz.length == length) {
return;
}
@@ -50,14 +50,14 @@
/// If [length] is not specified explicitly, then length of an identifier
/// from [search] is used.
void assertHasImplementedMember(String search, [int length = -1]) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
if (length == -1) {
length = findIdentifierLength(search);
}
if (implementedMembers == null) {
fail('No notification of impemented members was received');
}
- for (ImplementedMember member in implementedMembers) {
+ for (var member in implementedMembers) {
if (member.offset == offset && member.length == length) {
return;
}
@@ -71,14 +71,14 @@
/// If [length] is not specified explicitly, then length of an identifier
/// from [search] is used.
void assertNoImplementedMember(String search, [int length = -1]) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
if (length == -1) {
length = findIdentifierLength(search);
}
if (implementedMembers == null) {
fail('No notification of impemented members was received');
}
- for (ImplementedMember member in implementedMembers) {
+ for (var member in implementedMembers) {
if (member.offset == offset) {
fail('Unexpected implemented member at $offset'
' in $implementedMembers');
diff --git a/pkg/analysis_server/test/analysis/notification_navigation_test.dart b/pkg/analysis_server/test/analysis/notification_navigation_test.dart
index 6599b06..d0528ad 100644
--- a/pkg/analysis_server/test/analysis/notification_navigation_test.dart
+++ b/pkg/analysis_server/test/analysis/notification_navigation_test.dart
@@ -32,7 +32,7 @@
/// Validates that there is a target in [testTargetIndexes] with [file],
/// at [offset] and with the given [length].
void assertHasFileTarget(String file, int offset, int length) {
- for (NavigationTarget target in testTargets) {
+ for (var target in testTargets) {
if (targetFiles[target.fileIndex] == file &&
target.offset == offset &&
target.length == length) {
@@ -56,7 +56,7 @@
/// If [length] is not specified explicitly, then length of an identifier
/// from [search] is used.
void assertHasRegion(String search, [int length = -1]) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
if (length == -1) {
length = findIdentifierLength(search);
}
@@ -66,7 +66,7 @@
/// Validates that there is a region at the offset of [search] in [testFile]
/// with the given [length] or the length of [search].
void assertHasRegionString(String search, [int length = -1]) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
if (length == -1) {
length = search.length;
}
@@ -84,7 +84,7 @@
/// offset of [search] in [testFile], and with the given [length] or the
/// length of an leading identifier in [search].
void assertHasTarget(String search, [int length = -1]) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
if (length == -1) {
length = findIdentifierLength(search);
}
@@ -100,27 +100,27 @@
/// Validates that there is no a region at [search] and with the given
/// [length].
void assertNoRegion(String search, int length) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
findRegion(offset, length, false);
}
/// Validates that there is no a region at [search] with any length.
void assertNoRegionAt(String search) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
findRegion(offset, -1, false);
}
/// Validates that there is no a region for [search] string.
void assertNoRegionString(String search) {
- int offset = findOffset(search);
- int length = search.length;
+ var offset = findOffset(search);
+ var length = search.length;
findRegion(offset, length, false);
}
void assertRegionsSorted() {
- int lastEnd = -1;
- for (NavigationRegion region in regions) {
- int offset = region.offset;
+ var lastEnd = -1;
+ for (var region in regions) {
+ var offset = region.offset;
if (offset < lastEnd) {
fail('$lastEnd was expected to be > $offset in\n' + regions.join('\n'));
}
@@ -137,7 +137,7 @@
///
/// If [exists] is `false`, then fails if such region exists.
void findRegion(int offset, int length, bool exists) {
- for (NavigationRegion region in regions) {
+ for (var region in regions) {
if (region.offset == offset &&
(length == -1 || region.length == length)) {
if (exists == false) {
@@ -305,8 +305,8 @@
''');
await prepareNavigation();
assertHasRegion('int V');
- int targetIndex = testTargetIndexes[0];
- NavigationTarget target = targets[targetIndex];
+ var targetIndex = testTargetIndexes[0];
+ var target = targets[targetIndex];
expect(target.startLine, greaterThan(0));
expect(target.startColumn, greaterThan(0));
}
diff --git a/pkg/analysis_server/test/analysis/notification_occurrences_test.dart b/pkg/analysis_server/test/analysis/notification_occurrences_test.dart
index e266603..31fe525 100644
--- a/pkg/analysis_server/test/analysis/notification_occurrences_test.dart
+++ b/pkg/analysis_server/test/analysis/notification_occurrences_test.dart
@@ -28,7 +28,7 @@
/// Asserts that there is an offset of [search] in [testOccurrences].
void assertHasOffset(String search) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
expect(testOccurrences.offsets, contains(offset));
}
@@ -36,7 +36,7 @@
/// If [length] is not specified explicitly, then length of an identifier
/// from [search] is used.
void assertHasRegion(String search, [int length = -1]) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
if (length == -1) {
length = findIdentifierLength(search);
}
@@ -50,11 +50,11 @@
///
/// If [exists] is `false`, then fails if such [Occurrences] exists.
void findRegion(int offset, int length, [bool exists]) {
- for (Occurrences occurrences in occurrencesList) {
+ for (var occurrences in occurrencesList) {
if (occurrences.length != length) {
continue;
}
- for (int occurrenceOffset in occurrences.offsets) {
+ for (var occurrenceOffset in occurrences.offsets) {
if (occurrenceOffset == offset) {
if (exists == false) {
fail('Not expected to find (offset=$offset; length=$length) in\n'
@@ -236,7 +236,7 @@
dynamic V = 3;
''');
await prepareOccurrences();
- int offset = findOffset('dynamic a');
+ var offset = findOffset('dynamic a');
findRegion(offset, 'dynamic'.length, false);
}
@@ -246,7 +246,7 @@
}
''');
await prepareOccurrences();
- int offset = findOffset('void main()');
+ var offset = findOffset('void main()');
findRegion(offset, 'void'.length, false);
}
}
diff --git a/pkg/analysis_server/test/analysis/notification_outline_test.dart b/pkg/analysis_server/test/analysis/notification_outline_test.dart
index 35df343..d43aeb2 100644
--- a/pkg/analysis_server/test/analysis/notification_outline_test.dart
+++ b/pkg/analysis_server/test/analysis/notification_outline_test.dart
@@ -69,8 +69,8 @@
await waitForTasksFinished();
expect(outline, isNull);
await prepareOutline();
- Outline unitOutline = outline;
- List<Outline> outlines = unitOutline.children;
+ var unitOutline = outline;
+ var outlines = unitOutline.children;
expect(outlines, hasLength(2));
}
diff --git a/pkg/analysis_server/test/analysis/notification_overrides_test.dart b/pkg/analysis_server/test/analysis/notification_overrides_test.dart
index a480908..8ac4dd2 100644
--- a/pkg/analysis_server/test/analysis/notification_overrides_test.dart
+++ b/pkg/analysis_server/test/analysis/notification_overrides_test.dart
@@ -28,8 +28,8 @@
/// Asserts that there is an overridden interface [OverriddenMember] at the
/// offset of [search] in [override].
void assertHasInterfaceMember(String search) {
- int offset = findOffset(search);
- for (OverriddenMember member in overrideObject.interfaceMembers) {
+ var offset = findOffset(search);
+ for (var member in overrideObject.interfaceMembers) {
if (member.element.location.offset == offset) {
return;
}
@@ -43,7 +43,7 @@
/// If [length] is not specified explicitly, then length of an identifier
/// from [search] is used.
void assertHasOverride(String search, [int length = -1]) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
if (length == -1) {
length = findIdentifierLength(search);
}
@@ -53,8 +53,8 @@
/// Asserts that there is an overridden superclass [OverriddenMember] at the
/// offset of [search] in [override].
void assertHasSuperElement(String search) {
- int offset = findOffset(search);
- OverriddenMember member = overrideObject.superclassMember;
+ var offset = findOffset(search);
+ var member = overrideObject.superclassMember;
expect(member.element.location.offset, offset);
}
@@ -68,7 +68,7 @@
/// If [length] is not specified explicitly, then length of an identifier
/// from [search] is used.
void assertNoOverride(String search, [int length = -1]) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
if (length == -1) {
length = findIdentifierLength(search);
}
@@ -87,7 +87,7 @@
///
/// If [exists] is `false`, then fails if such [Override] exists.
void findOverride(int offset, int length, [bool exists]) {
- for (Override override in overridesList) {
+ for (var override in overridesList) {
if (override.offset == offset && override.length == length) {
if (exists == false) {
fail('Not expected to find (offset=$offset; length=$length) in\n'
diff --git a/pkg/analysis_server/test/analysis/set_priority_files_test.dart b/pkg/analysis_server/test/analysis/set_priority_files_test.dart
index 5c6df7dc..44ae720 100644
--- a/pkg/analysis_server/test/analysis/set_priority_files_test.dart
+++ b/pkg/analysis_server/test/analysis/set_priority_files_test.dart
@@ -5,8 +5,6 @@
import 'package:analysis_server/protocol/protocol.dart';
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analysis_server/src/domain_analysis.dart';
-import 'package:analyzer/src/dart/analysis/driver.dart';
-import 'package:analyzer_plugin/protocol/protocol_generated.dart' as plugin;
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -31,15 +29,15 @@
}
Future<void> test_fileDoesNotExist() async {
- String file = convertPath('$projectPath/doesNotExist.dart');
- Response response = await _setPriorityFile(file);
+ var file = convertPath('$projectPath/doesNotExist.dart');
+ var response = await _setPriorityFile(file);
expect(response, isResponseSuccess('0'));
}
Future<void> test_fileInAnalysisRoot() async {
addTestFile('');
// set priority files
- Response response = await _setPriorityFile(testFile);
+ var response = await _setPriorityFile(testFile);
expect(response, isResponseSuccess('0'));
// verify
_verifyPriorityFiles(testFile);
@@ -48,22 +46,22 @@
Future<void> test_fileInSdk() async {
addTestFile('');
// set priority files
- String filePath = convertPath('/lib/convert/convert.dart');
- Response response = await _setPriorityFile(filePath);
+ var filePath = convertPath('/lib/convert/convert.dart');
+ var response = await _setPriorityFile(filePath);
expect(response, isResponseSuccess('0'));
// verify
_verifyPriorityFiles(filePath);
}
Future<void> test_fileNotInAnalysisRoot() async {
- String path = convertPath('/other/file.dart');
+ var path = convertPath('/other/file.dart');
newFile(path);
await _setPriorityFile(path);
_verifyPriorityFiles(path);
}
Future<void> test_ignoredInAnalysisOptions() async {
- String sampleFile = convertPath('$projectPath/samples/sample.dart');
+ var sampleFile = convertPath('$projectPath/samples/sample.dart');
newFile('$projectPath/.analysis_options', content: r'''
analyzer:
exclude:
@@ -78,7 +76,7 @@
Future<void> test_ignoredInAnalysisOptions_inChildContext() async {
newFile('$projectPath/.packages');
newFile('$projectPath/child/.packages');
- String sampleFile = convertPath('$projectPath/child/samples/sample.dart');
+ var sampleFile = convertPath('$projectPath/child/samples/sample.dart');
newFile('$projectPath/child/.analysis_options', content: r'''
analyzer:
exclude:
@@ -93,7 +91,7 @@
Future<void> test_ignoredInAnalysisOptions_inRootContext() async {
newFile('$projectPath/.packages');
newFile('$projectPath/child/.packages');
- String sampleFile = convertPath('$projectPath/child/samples/sample.dart');
+ var sampleFile = convertPath('$projectPath/child/samples/sample.dart');
newFile('$projectPath/.analysis_options', content: r'''
analyzer:
exclude:
@@ -128,24 +126,22 @@
Future<void> test_sentToPlugins() async {
addTestFile('');
// set priority files
- Response response = await _setPriorityFile(testFile);
+ var response = await _setPriorityFile(testFile);
expect(response, isResponseSuccess('0'));
// verify
- plugin.AnalysisSetPriorityFilesParams params =
- pluginManager.analysisSetPriorityFilesParams;
+ var params = pluginManager.analysisSetPriorityFilesParams;
expect(params, isNotNull);
expect(params.files, <String>[testFile]);
}
Future<Response> _setPriorityFile(String file) async {
- Request request =
- AnalysisSetPriorityFilesParams(<String>[file]).toRequest('0');
+ var request = AnalysisSetPriorityFilesParams(<String>[file]).toRequest('0');
return await serverChannel.sendRequest(request);
}
void _verifyPriorityFiles(String path) {
- AnalysisDriver driver = server.getAnalysisDriver(path);
- List<String> prioritySources = driver.priorityFiles;
+ var driver = server.getAnalysisDriver(path);
+ var prioritySources = driver.priorityFiles;
expect(prioritySources, [path]);
}
}
diff --git a/pkg/analysis_server/test/analysis/update_content_test.dart b/pkg/analysis_server/test/analysis/update_content_test.dart
index 6e794cd..d8894c8 100644
--- a/pkg/analysis_server/test/analysis/update_content_test.dart
+++ b/pkg/analysis_server/test/analysis/update_content_test.dart
@@ -5,7 +5,6 @@
import 'package:analysis_server/protocol/protocol.dart';
import 'package:analysis_server/protocol/protocol_constants.dart';
import 'package:analysis_server/protocol/protocol_generated.dart';
-import 'package:analyzer/file_system/file_system.dart';
import 'package:analyzer/src/dart/analysis/driver.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart' as plugin;
import 'package:analyzer_plugin/protocol/protocol_common.dart';
@@ -49,7 +48,7 @@
// doesn't have an overlay yet.
createProject();
addTestFile('library foo;');
- String id = 'myId';
+ var id = 'myId';
try {
server.updateContent(id, {
testFile: ChangeContentOverlay([SourceEdit(8, 3, 'bar')])
@@ -84,21 +83,21 @@
}
Future<void> test_multiple_contexts() async {
- String project1path = convertPath('/project1');
- String project2path = convertPath('/project2');
- String fooPath = newFile('/project1/foo.dart', content: '''
+ var project1path = convertPath('/project1');
+ var project2path = convertPath('/project2');
+ var fooPath = newFile('/project1/foo.dart', content: '''
library foo;
import '../project2/baz.dart';
main() { f(); }''').path;
- String barPath = newFile('/project2/bar.dart', content: '''
+ var barPath = newFile('/project2/bar.dart', content: '''
library bar;
import 'baz.dart';
main() { f(); }''').path;
- String bazPath = newFile('/project2/baz.dart', content: '''
+ var bazPath = newFile('/project2/baz.dart', content: '''
library baz;
f(int i) {}
''').path;
- Request request =
+ var request =
AnalysisSetAnalysisRootsParams([project1path, project2path], [])
.toRequest('0');
handleSuccessfulRequest(request);
@@ -128,7 +127,7 @@
@failingTest
Future<void> test_overlay_addPreviouslyImported() async {
// The list of errors doesn't include errors for '/project/target.dart'.
- Folder project = newFolder('/project');
+ var project = newFolder('/project');
handleSuccessfulRequest(
AnalysisSetAnalysisRootsParams([project.path], []).toRequest('0'));
@@ -163,8 +162,8 @@
// exactly 2 contexts
expect(server.driverMap, hasLength(2));
- AnalysisDriver driver1 = server.getAnalysisDriver(filePath1);
- AnalysisDriver driver2 = server.getAnalysisDriver(filePath2);
+ var driver1 = server.getAnalysisDriver(filePath1);
+ var driver2 = server.getAnalysisDriver(filePath2);
// no sources
expect(_getUserSources(driver1), isEmpty);
@@ -224,18 +223,17 @@
}
void test_sentToPlugins() {
- String filePath = convertPath('/project/target.dart');
- String fileContent = 'import "none.dart";';
+ var filePath = convertPath('/project/target.dart');
+ var fileContent = 'import "none.dart";';
//
// Add
//
handleSuccessfulRequest(AnalysisUpdateContentParams(
<String, dynamic>{filePath: AddContentOverlay(fileContent)})
.toRequest('0'));
- plugin.AnalysisUpdateContentParams params =
- pluginManager.analysisUpdateContentParams;
+ var params = pluginManager.analysisUpdateContentParams;
expect(params, isNotNull);
- Map<String, dynamic> files = params.files;
+ var files = params.files;
expect(files, hasLength(1));
Object overlay = files[filePath];
expect(overlay, const TypeMatcher<plugin.AddContentOverlay>());
@@ -279,7 +277,7 @@
// }
List<String> _getUserSources(AnalysisDriver driver) {
- List<String> sources = <String>[];
+ var sources = <String>[];
driver.addedFiles.forEach((path) {
if (path.startsWith(convertPath('/User/'))) {
sources.add(path);
diff --git a/pkg/analysis_server/test/analysis_abstract.dart b/pkg/analysis_server/test/analysis_abstract.dart
index 07447dd..e9f979d 100644
--- a/pkg/analysis_server/test/analysis_abstract.dart
+++ b/pkg/analysis_server/test/analysis_abstract.dart
@@ -12,7 +12,6 @@
import 'package:analysis_server/src/domain_analysis.dart';
import 'package:analysis_server/src/server/crash_reporting_attachments.dart';
import 'package:analysis_server/src/utilities/mocks.dart';
-import 'package:analyzer/file_system/file_system.dart';
import 'package:analyzer/instrumentation/instrumentation.dart';
import 'package:analyzer/src/dart/analysis/driver.dart';
import 'package:analyzer/src/generated/engine.dart';
@@ -24,9 +23,9 @@
import 'mocks.dart';
int findIdentifierLength(String search) {
- int length = 0;
+ var length = 0;
while (length < search.length) {
- int c = search.codeUnitAt(length);
+ var c = search.codeUnitAt(length);
if (!(c >= 'a'.codeUnitAt(0) && c <= 'z'.codeUnitAt(0) ||
c >= 'A'.codeUnitAt(0) && c <= 'Z'.codeUnitAt(0) ||
c >= '0'.codeUnitAt(0) && c <= '9'.codeUnitAt(0) ||
@@ -79,14 +78,14 @@
}
files.add(file);
// set subscriptions
- Request request =
+ var request =
AnalysisSetSubscriptionsParams(analysisSubscriptions).toRequest('0');
handleSuccessfulRequest(request);
}
void addGeneralAnalysisSubscription(GeneralAnalysisService service) {
generalServices.add(service);
- Request request =
+ var request =
AnalysisSetGeneralSubscriptionsParams(generalServices).toRequest('0');
handleSuccessfulRequest(request);
}
@@ -99,11 +98,11 @@
/// Create an analysis options file based on the given arguments.
void createAnalysisOptionsFile({List<String> experiments}) {
- StringBuffer buffer = StringBuffer();
+ var buffer = StringBuffer();
if (experiments != null) {
buffer.writeln('analyzer:');
buffer.writeln(' enable-experiment:');
- for (String experiment in experiments) {
+ for (var experiment in experiments) {
buffer.writeln(' - $experiment');
}
}
@@ -120,7 +119,7 @@
//
// Create server
//
- AnalysisServerOptions options = AnalysisServerOptions();
+ var options = AnalysisServerOptions();
return AnalysisServer(
serverChannel,
resourceProvider,
@@ -133,7 +132,7 @@
/// Creates a project [projectPath].
void createProject({Map<String, String> packageRoots}) {
newFolder(projectPath);
- Request request = AnalysisSetAnalysisRootsParams([projectPath], [],
+ var request = AnalysisSetAnalysisRootsParams([projectPath], [],
packageRoots: packageRoots)
.toRequest('0');
handleSuccessfulRequest(request, handler: analysisHandler);
@@ -148,9 +147,9 @@
/// Returns the offset of [search] in the file at the given [path].
/// Fails if not found.
int findFileOffset(String path, String search) {
- File file = getFile(path);
- String code = file.createSource().contents.data;
- int offset = code.indexOf(search);
+ var file = getFile(path);
+ var code = file.createSource().contents.data;
+ var offset = code.indexOf(search);
expect(offset, isNot(-1), reason: '"$search" in\n$code');
return offset;
}
@@ -158,7 +157,7 @@
/// Returns the offset of [search] in [testCode].
/// Fails if not found.
int findOffset(String search) {
- int offset = testCode.indexOf(search);
+ var offset = testCode.indexOf(search);
expect(offset, isNot(-1));
return offset;
}
@@ -166,7 +165,7 @@
/// Validates that the given [request] is handled successfully.
Response handleSuccessfulRequest(Request request, {RequestHandler handler}) {
handler ??= this.handler;
- Response response = handler.handleRequest(request);
+ var response = handler.handleRequest(request);
expect(response, isResponseSuccess(request.id));
return response;
}
@@ -185,7 +184,7 @@
void removeGeneralAnalysisSubscription(GeneralAnalysisService service) {
generalServices.remove(service);
- Request request =
+ var request =
AnalysisSetGeneralSubscriptionsParams(generalServices).toRequest('0');
handleSuccessfulRequest(request);
}
@@ -205,8 +204,7 @@
server.pluginManager = pluginManager;
handler = analysisHandler;
// listen for notifications
- Stream<Notification> notificationStream =
- serverChannel.notificationController.stream;
+ var notificationStream = serverChannel.notificationController.stream;
notificationStream.listen((Notification notification) {
processNotification(notification);
});
diff --git a/pkg/analysis_server/test/analysis_server_test.dart b/pkg/analysis_server/test/analysis_server_test.dart
index 9588a2f..3788ce4 100644
--- a/pkg/analysis_server/test/analysis_server_test.dart
+++ b/pkg/analysis_server/test/analysis_server_test.dart
@@ -11,7 +11,6 @@
import 'package:analysis_server/src/domain_server.dart';
import 'package:analysis_server/src/server/crash_reporting_attachments.dart';
import 'package:analysis_server/src/utilities/mocks.dart';
-import 'package:analyzer/file_system/file_system.dart';
import 'package:analyzer/instrumentation/instrumentation.dart';
import 'package:analyzer/src/generated/sdk.dart';
import 'package:analyzer/src/test_utilities/mock_sdk.dart';
@@ -39,11 +38,10 @@
newFolder('/foo');
newFolder('/bar');
newFile('/foo/foo.dart', content: 'import "../bar/bar.dart";');
- File bar = newFile('/bar/bar.dart', content: 'library bar;');
+ var bar = newFile('/bar/bar.dart', content: 'library bar;');
server.setAnalysisRoots('0', ['/foo', '/bar'], [], {});
- Map<AnalysisService, Set<String>> subscriptions =
- <AnalysisService, Set<String>>{};
- for (AnalysisService service in AnalysisService.VALUES) {
+ var subscriptions = <AnalysisService, Set<String>>{};
+ for (var service in AnalysisService.VALUES) {
subscriptions[service] = <String>{bar.path};
}
// The following line causes the isolate to continue running even though the
@@ -57,9 +55,9 @@
await server.onAnalysisComplete;
expect(server.statusAnalyzing, isFalse);
expect(channel.notificationsReceived, isNotEmpty);
- Set<String> notificationTypesReceived = <String>{};
- for (Notification notification in channel.notificationsReceived) {
- String notificationType = notification.event;
+ var notificationTypesReceived = <String>{};
+ for (var notification in channel.notificationsReceived) {
+ var notificationType = notification.event;
switch (notificationType) {
case 'server.status':
case 'analysis.errors':
@@ -162,7 +160,7 @@
Future<void>
test_setAnalysisSubscriptions_fileInIgnoredFolder_newOptions() async {
- String path = convertPath('/project/samples/sample.dart');
+ var path = convertPath('/project/samples/sample.dart');
newFile(path);
newFile('/project/analysis_options.yaml', content: r'''
analyzer:
@@ -183,7 +181,7 @@
Future<void>
test_setAnalysisSubscriptions_fileInIgnoredFolder_oldOptions() async {
- String path = convertPath('/project/samples/sample.dart');
+ var path = convertPath('/project/samples/sample.dart');
newFile(path);
newFile('/project/.analysis_options', content: r'''
analyzer:
diff --git a/pkg/analysis_server/test/benchmarks_test.dart b/pkg/analysis_server/test/benchmarks_test.dart
index 21e70e5..86b6e5f 100644
--- a/pkg/analysis_server/test/benchmarks_test.dart
+++ b/pkg/analysis_server/test/benchmarks_test.dart
@@ -13,26 +13,26 @@
void main() => defineTests();
String get _serverSourcePath {
- String script = Platform.script.toFilePath(windows: Platform.isWindows);
- String pkgPath = path.normalize(path.join(path.dirname(script), '..', '..'));
+ var script = Platform.script.toFilePath(windows: Platform.isWindows);
+ var pkgPath = path.normalize(path.join(path.dirname(script), '..', '..'));
return path.join(pkgPath, 'analysis_server');
}
void defineTests() {
group('benchmarks', () {
- final List<String> benchmarks = _listBenchmarks();
+ var benchmarks = _listBenchmarks();
test('can list', () {
expect(benchmarks, isNotEmpty);
});
- for (String benchmarkId in benchmarks) {
+ for (var benchmarkId in benchmarks) {
if (benchmarkId == 'analysis-flutter-analyze') {
continue;
}
test(benchmarkId, () {
- ProcessResult r = Process.runSync(
+ var r = Process.runSync(
Platform.resolvedExecutable,
[
path.join('benchmark', 'benchmarks.dart'),
@@ -51,7 +51,7 @@
}
List<String> _listBenchmarks() {
- ProcessResult result = Process.runSync(
+ var result = Process.runSync(
Platform.resolvedExecutable,
[path.join('benchmark', 'benchmarks.dart'), 'list', '--machine'],
workingDirectory: _serverSourcePath,
diff --git a/pkg/analysis_server/test/channel/byte_stream_channel_test.dart b/pkg/analysis_server/test/channel/byte_stream_channel_test.dart
index 210f9cc..8f3b055 100644
--- a/pkg/analysis_server/test/channel/byte_stream_channel_test.dart
+++ b/pkg/analysis_server/test/channel/byte_stream_channel_test.dart
@@ -45,8 +45,8 @@
}
Future<void> test_close() {
- bool doneCalled = false;
- bool closeCalled = false;
+ var doneCalled = false;
+ var closeCalled = false;
// add listener so that outputSink will trigger done/close futures
outputLineStream.listen((_) {/* no-op */});
outputSink.done.then((_) {
@@ -62,7 +62,7 @@
}
Future<void> test_listen_notification() {
- List<Notification> notifications = [];
+ var notifications = <Notification>[];
channel.notificationStream.forEach((n) => notifications.add(n));
inputSink.writeln('{"event":"server.connected"}');
return pumpEventQueue().then((_) {
@@ -72,7 +72,7 @@
}
Future<void> test_listen_response() {
- List<Response> responses = [];
+ var responses = <Response>[];
channel.responseStream.forEach((n) => responses.add(n));
inputSink.writeln('{"id":"72"}');
return pumpEventQueue().then((_) {
@@ -82,8 +82,8 @@
}
Future<void> test_sendRequest() {
- int assertCount = 0;
- Request request = Request('72', 'foo.bar');
+ var assertCount = 0;
+ var request = Request('72', 'foo.bar');
outputLineStream.first.then((line) => json.decode(line)).then((json) {
expect(json[Request.ID], equals('72'));
expect(json[Request.METHOD], equals('foo.bar'));
@@ -120,21 +120,20 @@
Future doneFuture;
void setUp() {
- StreamController<List<int>> inputStream = StreamController<List<int>>();
+ var inputStream = StreamController<List<int>>();
inputSink = IOSink(inputStream);
- StreamController<List<int>> outputStream = StreamController<List<int>>();
+ var outputStream = StreamController<List<int>>();
outputLineStream = outputStream.stream
.transform((Utf8Codec()).decoder)
.transform(LineSplitter());
- IOSink outputSink = IOSink(outputStream);
+ var outputSink = IOSink(outputStream);
channel = ByteStreamServerChannel(
inputStream.stream, outputSink, InstrumentationService.NULL_SERVICE);
- StreamController<Request> requestStreamController =
- StreamController<Request>();
+ var requestStreamController = StreamController<Request>();
requestStream = requestStreamController.stream;
- StreamController errorStreamController = StreamController();
+ var errorStreamController = StreamController();
errorStream = errorStreamController.stream;
- Completer doneCompleter = Completer();
+ var doneCompleter = Completer();
doneFuture = doneCompleter.future;
channel.listen((Request request) {
requestStreamController.add(request);
diff --git a/pkg/analysis_server/test/client/impl/completion_driver.dart b/pkg/analysis_server/test/client/impl/completion_driver.dart
index b586253..3eabfb6 100644
--- a/pkg/analysis_server/test/client/impl/completion_driver.dart
+++ b/pkg/analysis_server/test/client/impl/completion_driver.dart
@@ -101,7 +101,7 @@
return super.addTestFile(content);
}
expect(completionOffset, isNot(equals(-1)), reason: 'missing ^');
- int nextOffset = content.indexOf('^', completionOffset + 1);
+ var nextOffset = content.indexOf('^', completionOffset + 1);
expect(nextOffset, equals(-1), reason: 'too many ^');
return super.addTestFile(content.substring(0, completionOffset) +
content.substring(completionOffset + 1));
diff --git a/pkg/analysis_server/test/completion_test.dart b/pkg/analysis_server/test/completion_test.dart
index 846a7d4..a7c48cf 100644
--- a/pkg/analysis_server/test/completion_test.dart
+++ b/pkg/analysis_server/test/completion_test.dart
@@ -10,7 +10,7 @@
import 'completion_test_support.dart';
void main() {
- CompletionTestBuilder builder = CompletionTestBuilder();
+ var builder = CompletionTestBuilder();
builder.buildAll();
}
@@ -28,7 +28,7 @@
buildCompletionTests();
buildOtherTests();
buildLibraryTests();
- int testCount = expectedPassCount + expectedFailCount;
+ var testCount = expectedPassCount + expectedFailCount;
print(
'Total $testCount tests, of which $expectedFailCount are expected to fail.');
}
@@ -2415,8 +2415,7 @@
/// have not yet been fixed.
void buildTests(String baseName, String originalSource, List<String> results,
{Map<String, String> extraFiles, String failingTests = ''}) {
- List<LocationSpec> completionTests =
- LocationSpec.from(originalSource, results);
+ var completionTests = LocationSpec.from(originalSource, results);
completionTests.sort((LocationSpec first, LocationSpec second) {
return first.id.compareTo(second.id);
});
@@ -2426,9 +2425,9 @@
'position at which code completion should occur');
});
}
- Set<String> allSpecIds =
+ var allSpecIds =
completionTests.map((LocationSpec spec) => spec.id).toSet();
- for (String id in failingTests.split('')) {
+ for (var id in failingTests.split('')) {
if (!allSpecIds.contains(id)) {
test('$baseName-$id', () {
fail(
@@ -2436,12 +2435,12 @@
});
}
}
- for (LocationSpec spec in completionTests) {
- String testName = '$baseName-${spec.id}';
+ for (var spec in completionTests) {
+ var testName = '$baseName-${spec.id}';
if (failingTests.contains(spec.id)) {
++expectedFailCount;
test('$testName (expected failure $expectedFailCount)', () {
- CompletionTestCase test = CompletionTestCase();
+ var test = CompletionTestCase();
return Future(() => test.runTest(spec, extraFiles)).then((_) {
fail('Test passed - expected to fail.');
}, onError: (_) {});
@@ -2449,7 +2448,7 @@
} else {
++expectedPassCount;
test(testName, () {
- CompletionTestCase test = CompletionTestCase();
+ var test = CompletionTestCase();
return test.runTest(spec, extraFiles);
});
}
diff --git a/pkg/analysis_server/test/completion_test_support.dart b/pkg/analysis_server/test/completion_test_support.dart
index 3f1093a..83660df 100644
--- a/pkg/analysis_server/test/completion_test_support.dart
+++ b/pkg/analysis_server/test/completion_test_support.dart
@@ -19,7 +19,7 @@
.toList();
void assertHasCompletion(String completion) {
- int expectedOffset = completion.indexOf(CURSOR_MARKER);
+ var expectedOffset = completion.indexOf(CURSOR_MARKER);
if (expectedOffset >= 0) {
if (completion.contains(CURSOR_MARKER, expectedOffset + 1)) {
fail(
@@ -65,7 +65,7 @@
/// Discard any results that do not start with the characters the user has
/// "already typed".
void filterResults(String content) {
- String charsAlreadyTyped =
+ var charsAlreadyTyped =
content.substring(replacementOffset, completionOffset).toLowerCase();
suggestions = suggestions
.where((CompletionSuggestion suggestion) =>
@@ -76,7 +76,7 @@
Future runTest(LocationSpec spec, [Map<String, String> extraFiles]) {
super.setUp();
return Future(() {
- String content = spec.source;
+ var content = spec.source;
newFile(testFile, content: content);
testCode = content;
completionOffset = spec.testLocation;
@@ -87,10 +87,10 @@
}
}).then((_) => getSuggestions()).then((_) {
filterResults(spec.source);
- for (String result in spec.positiveResults) {
+ for (var result in spec.positiveResults) {
assertHasCompletion(result);
}
- for (String result in spec.negativeResults) {
+ for (var result in spec.negativeResults) {
assertHasNoCompletion(result);
}
}).whenComplete(() {
@@ -127,18 +127,18 @@
static List<LocationSpec> from(
String originalSource, List<String> validationStrings) {
Map<String, LocationSpec> tests = HashMap<String, LocationSpec>();
- String modifiedSource = originalSource;
- int modifiedPosition = 0;
+ var modifiedSource = originalSource;
+ var modifiedPosition = 0;
while (true) {
- int index = modifiedSource.indexOf('!', modifiedPosition);
+ var index = modifiedSource.indexOf('!', modifiedPosition);
if (index < 0) {
break;
}
- int n = 1; // only delete one char for double-bangs
- String id = modifiedSource.substring(index + 1, index + 2);
+ var n = 1; // only delete one char for double-bangs
+ var id = modifiedSource.substring(index + 1, index + 2);
if (id != '!') {
n = 2;
- LocationSpec test = LocationSpec(id);
+ var test = LocationSpec(id);
tests[id] = test;
test.testLocation = index;
} else {
@@ -150,14 +150,14 @@
if (modifiedSource == originalSource) {
throw StateError('No tests in source: ' + originalSource);
}
- for (String result in validationStrings) {
+ for (var result in validationStrings) {
if (result.length < 3) {
throw StateError('Invalid location result: ' + result);
}
- String id = result.substring(0, 1);
- String sign = result.substring(1, 2);
- String value = result.substring(2);
- LocationSpec test = tests[id];
+ var id = result.substring(0, 1);
+ var sign = result.substring(1, 2);
+ var value = result.substring(2);
+ var test = tests[id];
if (test == null) {
throw StateError('Invalid location result id: $id for: $result');
}
@@ -167,13 +167,13 @@
} else if (sign == '-') {
test.negativeResults.add(value);
} else {
- String err = 'Invalid location result sign: $sign for: $result';
+ var err = 'Invalid location result sign: $sign for: $result';
throw StateError(err);
}
}
- List<String> badPoints = <String>[];
- List<String> badResults = <String>[];
- for (LocationSpec test in tests.values) {
+ var badPoints = <String>[];
+ var badResults = <String>[];
+ for (var test in tests.values) {
if (test.testLocation == -1) {
badPoints.add(test.id);
}
@@ -182,17 +182,17 @@
}
}
if (!(badPoints.isEmpty && badResults.isEmpty)) {
- StringBuffer err = StringBuffer();
+ var err = StringBuffer();
if (badPoints.isNotEmpty) {
err.write('No test location for tests:');
- for (String ch in badPoints) {
+ for (var ch in badPoints) {
err..write(' ')..write(ch);
}
err.write(' ');
}
if (badResults.isNotEmpty) {
err.write('No results for tests:');
- for (String ch in badResults) {
+ for (var ch in badResults) {
err..write(' ')..write(ch);
}
}
diff --git a/pkg/analysis_server/test/context_manager_test.dart b/pkg/analysis_server/test/context_manager_test.dart
index 80a76a6..6758b54 100644
--- a/pkg/analysis_server/test/context_manager_test.dart
+++ b/pkg/analysis_server/test/context_manager_test.dart
@@ -59,26 +59,25 @@
@reflectiveTest
class AbstractContextManagerTest extends ContextManagerTest {
void test_contextsInAnalysisRoot_nestedContext() {
- String subProjPath = join(projPath, 'subproj');
- Folder subProjFolder = resourceProvider.newFolder(subProjPath);
+ var subProjPath = join(projPath, 'subproj');
+ var subProjFolder = resourceProvider.newFolder(subProjPath);
resourceProvider.newFile(join(subProjPath, 'pubspec.yaml'), 'contents');
- String subProjFilePath = join(subProjPath, 'file.dart');
+ var subProjFilePath = join(subProjPath, 'file.dart');
resourceProvider.newFile(subProjFilePath, 'contents');
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
// Make sure that there really are contexts for both the main project and
// the subproject.
- Folder projectFolder = resourceProvider.getFolder(projPath);
- ContextInfo projContextInfo = manager.getContextInfoFor(projectFolder);
+ var projectFolder = resourceProvider.getFolder(projPath);
+ var projContextInfo = manager.getContextInfoFor(projectFolder);
expect(projContextInfo, isNotNull);
expect(projContextInfo.folder, projectFolder);
- ContextInfo subProjContextInfo = manager.getContextInfoFor(subProjFolder);
+ var subProjContextInfo = manager.getContextInfoFor(subProjFolder);
expect(subProjContextInfo, isNotNull);
expect(subProjContextInfo.folder, subProjFolder);
expect(projContextInfo.analysisDriver,
isNot(equals(subProjContextInfo.analysisDriver)));
// Check that getDriversInAnalysisRoot() works.
- List<AnalysisDriver> drivers =
- manager.getDriversInAnalysisRoot(projectFolder);
+ var drivers = manager.getDriversInAnalysisRoot(projectFolder);
expect(drivers, isNotNull);
expect(drivers, hasLength(2));
expect(drivers, contains(projContextInfo.analysisDriver));
@@ -97,12 +96,12 @@
//return super.test_embedder_added();
_fail('NoSuchMethodError');
// Create files.
- String libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
+ var libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
newFile('$libPath/main.dart');
newFile('$libPath/nope.dart');
- String embedderPath = '$projPath/embedder';
+ var embedderPath = '$projPath/embedder';
newFile('$embedderPath/entry.dart');
- String embedderSrcPath = '$projPath/embedder/src';
+ var embedderSrcPath = '$projPath/embedder/src';
newFile('$embedderSrcPath/part.dart');
// Setup _embedder.yaml.
@@ -112,7 +111,7 @@
"dart:typed_data": "../embedder/src/part"
''');
- Folder projectFolder = resourceProvider.newFolder(projPath);
+ var projectFolder = resourceProvider.newFolder(projPath);
// NOTE that this is Not in our package path yet.
@@ -120,8 +119,7 @@
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
await pumpEventQueue();
// Confirm that one driver / context was created.
- List<AnalysisDriver> drivers =
- manager.getDriversInAnalysisRoot(projectFolder);
+ var drivers = manager.getDriversInAnalysisRoot(projectFolder);
expect(drivers, isNotNull);
expect(drivers, hasLength(1));
@@ -145,12 +143,12 @@
Future<void> test_embedder_packagespec() async {
// Create files.
- String libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
+ var libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
newFile('$libPath/main.dart');
newFile('$libPath/nope.dart');
- String sdkExtPath = '$projPath/sdk_ext';
+ var sdkExtPath = '$projPath/sdk_ext';
newFile('$sdkExtPath/entry.dart');
- String sdkExtSrcPath = '$projPath/sdk_ext/src';
+ var sdkExtSrcPath = '$projPath/sdk_ext/src';
newFile('$sdkExtSrcPath/part.dart');
// Setup _embedder.yaml.
newFile('$libPath/_embedder.yaml', content: r'''
@@ -166,7 +164,7 @@
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
await pumpEventQueue();
// Confirm that one context was created.
- int count = manager
+ var count = manager
.numberOfContextsInAnalysisRoot(resourceProvider.newFolder(projPath));
expect(count, equals(1));
var source = sourceFactory.forUri('dart:foobar');
@@ -182,8 +180,8 @@
void test_isInAnalysisRoot_excluded() {
// prepare paths
- String project = convertPath('/project');
- String excludedFolder = convertPath('$project/excluded');
+ var project = convertPath('/project');
+ var excludedFolder = convertPath('$project/excluded');
// set roots
resourceProvider.newFolder(project);
resourceProvider.newFolder(excludedFolder);
@@ -195,14 +193,14 @@
}
void test_isInAnalysisRoot_inNestedContext() {
- String subProjPath = join(projPath, 'subproj');
- Folder subProjFolder = resourceProvider.newFolder(subProjPath);
+ var subProjPath = join(projPath, 'subproj');
+ var subProjFolder = resourceProvider.newFolder(subProjPath);
resourceProvider.newFile(join(subProjPath, 'pubspec.yaml'), 'contents');
- String subProjFilePath = join(subProjPath, 'file.dart');
+ var subProjFilePath = join(subProjPath, 'file.dart');
resourceProvider.newFile(subProjFilePath, 'contents');
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
// Make sure that there really is a context for the subproject.
- ContextInfo subProjContextInfo = manager.getContextInfoFor(subProjFolder);
+ var subProjContextInfo = manager.getContextInfoFor(subProjFolder);
expect(subProjContextInfo, isNotNull);
expect(subProjContextInfo.folder, subProjFolder);
// Check that isInAnalysisRoot() works.
@@ -221,15 +219,15 @@
Future<void> test_packagesFolder_areAnalyzed() {
// create a context with a pubspec.yaml file
- String pubspecPath = join(projPath, 'pubspec.yaml');
+ var pubspecPath = join(projPath, 'pubspec.yaml');
resourceProvider.newFile(pubspecPath, 'pubspec');
// create a file in the "packages" folder
- String filePath1 = join(projPath, 'packages', 'file1.dart');
- File file1 = resourceProvider.newFile(filePath1, 'contents');
+ var filePath1 = join(projPath, 'packages', 'file1.dart');
+ var file1 = resourceProvider.newFile(filePath1, 'contents');
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
expect(callbacks.currentFilePaths, unorderedEquals([file1.path]));
- String filePath2 = join(projPath, 'packages', 'file2.dart');
- File file2 = resourceProvider.newFile(filePath2, 'contents');
+ var filePath2 = join(projPath, 'packages', 'file2.dart');
+ var file2 = resourceProvider.newFile(filePath2, 'contents');
return pumpEventQueue().then((_) {
expect(callbacks.currentFilePaths,
unorderedEquals([file1.path, file2.path]));
@@ -238,33 +236,33 @@
Future<void> test_path_filter() async {
// Setup context.
- Folder root = resourceProvider.newFolder(projPath);
+ var root = resourceProvider.newFolder(projPath);
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
expect(callbacks.currentFilePaths, isEmpty);
// Set ignore patterns for context.
- ContextInfo rootInfo = manager.getContextInfoFor(root);
+ var rootInfo = manager.getContextInfoFor(root);
manager.setIgnorePatternsForContext(
rootInfo, ['sdk_ext/**', 'lib/ignoreme.dart']);
// Start creating files.
newFile('$projPath/${ContextManagerImpl.PUBSPEC_NAME}');
- String libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
+ var libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
newFile('$libPath/main.dart');
newFile('$libPath/ignoreme.dart');
- String sdkExtPath = '$projPath/sdk_ext';
+ var sdkExtPath = '$projPath/sdk_ext';
newFile('$sdkExtPath/entry.dart');
- String sdkExtSrcPath = '$projPath/sdk_ext/src';
+ var sdkExtSrcPath = '$projPath/sdk_ext/src';
newFile('$sdkExtSrcPath/part.dart');
// Pump event loop so new files are discovered and added to context.
await pumpEventQueue();
// Verify that ignored files were ignored.
- Iterable<String> filePaths = callbacks.currentFilePaths;
+ var filePaths = callbacks.currentFilePaths;
expect(filePaths, hasLength(1));
expect(filePaths, contains(convertPath('/my/proj/lib/main.dart')));
}
Future<void> test_refresh_folder_with_packagespec() {
// create a context with a .packages file
- String packagespecFile = join(projPath, '.packages');
+ var packagespecFile = join(projPath, '.packages');
resourceProvider.newFile(packagespecFile, '');
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
return pumpEventQueue().then((_) {
@@ -284,10 +282,10 @@
Future<void> test_refresh_folder_with_packagespec_subfolders() {
// Create a folder with no .packages file, containing two subfolders with
// .packages files.
- String subdir1Path = join(projPath, 'subdir1');
- String subdir2Path = join(projPath, 'subdir2');
- String packagespec1Path = join(subdir1Path, '.packages');
- String packagespec2Path = join(subdir2Path, '.packages');
+ var subdir1Path = join(projPath, 'subdir1');
+ var subdir2Path = join(projPath, 'subdir2');
+ var packagespec1Path = join(subdir1Path, '.packages');
+ var packagespec2Path = join(subdir2Path, '.packages');
resourceProvider.newFile(packagespec1Path, '');
resourceProvider.newFile(packagespec2Path, '');
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
@@ -308,7 +306,7 @@
Future<void> test_refresh_folder_with_pubspec() {
// create a context with a pubspec.yaml file
- String pubspecPath = join(projPath, 'pubspec.yaml');
+ var pubspecPath = join(projPath, 'pubspec.yaml');
resourceProvider.newFile(pubspecPath, 'pubspec');
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
return pumpEventQueue().then((_) {
@@ -325,10 +323,10 @@
Future<void> test_refresh_folder_with_pubspec_subfolders() {
// Create a folder with no pubspec.yaml, containing two subfolders with
// pubspec.yaml files.
- String subdir1Path = join(projPath, 'subdir1');
- String subdir2Path = join(projPath, 'subdir2');
- String pubspec1Path = join(subdir1Path, 'pubspec.yaml');
- String pubspec2Path = join(subdir2Path, 'pubspec.yaml');
+ var subdir1Path = join(projPath, 'subdir1');
+ var subdir2Path = join(projPath, 'subdir2');
+ var pubspec1Path = join(subdir1Path, 'pubspec.yaml');
+ var pubspec2Path = join(subdir2Path, 'pubspec.yaml');
resourceProvider.newFile(pubspec1Path, 'pubspec');
resourceProvider.newFile(pubspec2Path, 'pubspec');
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
@@ -349,19 +347,19 @@
Future<void> test_refresh_oneContext() {
// create two contexts with pubspec.yaml files
- String pubspecPath = join(projPath, 'pubspec.yaml');
+ var pubspecPath = join(projPath, 'pubspec.yaml');
resourceProvider.newFile(pubspecPath, 'pubspec1');
- String proj2Path = convertPath('/my/proj2');
+ var proj2Path = convertPath('/my/proj2');
resourceProvider.newFolder(proj2Path);
- String pubspec2Path = join(proj2Path, 'pubspec.yaml');
+ var pubspec2Path = join(proj2Path, 'pubspec.yaml');
resourceProvider.newFile(pubspec2Path, 'pubspec2');
- List<String> roots = <String>[projPath, proj2Path];
+ var roots = <String>[projPath, proj2Path];
manager.setRoots(roots, <String>[], <String, String>{});
return pumpEventQueue().then((_) {
expect(callbacks.currentContextRoots, unorderedEquals(roots));
- int then = callbacks.now;
+ var then = callbacks.now;
callbacks.now++;
manager.refresh([resourceProvider.getResource(proj2Path)]);
return pumpEventQueue().then((_) {
@@ -373,33 +371,33 @@
}
void test_setRoots_addFolderWithDartFile() {
- String filePath = resourceProvider.pathContext.join(projPath, 'foo.dart');
+ var filePath = resourceProvider.pathContext.join(projPath, 'foo.dart');
resourceProvider.newFile(filePath, 'contents');
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
// verify
- Iterable<String> filePaths = callbacks.currentFilePaths;
+ var filePaths = callbacks.currentFilePaths;
expect(filePaths, hasLength(1));
expect(filePaths, contains(filePath));
- List<AnalysisDriver> drivers =
+ var drivers =
manager.getDriversInAnalysisRoot(resourceProvider.newFolder(projPath));
expect(drivers, hasLength(1));
expect(drivers[0], isNotNull);
- Source result = sourceFactory.forUri('dart:async');
+ var result = sourceFactory.forUri('dart:async');
expect(result, isNotNull);
}
void test_setRoots_addFolderWithDartFileInSubfolder() {
- String filePath = join(projPath, 'foo', 'bar.dart');
+ var filePath = join(projPath, 'foo', 'bar.dart');
resourceProvider.newFile(filePath, 'contents');
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
// verify
- Iterable<String> filePaths = callbacks.currentFilePaths;
+ var filePaths = callbacks.currentFilePaths;
expect(filePaths, hasLength(1));
expect(filePaths, contains(filePath));
}
void test_setRoots_addFolderWithDummyLink() {
- String filePath = join(projPath, 'foo.dart');
+ var filePath = join(projPath, 'foo.dart');
resourceProvider.newDummyLink(filePath);
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
// verify
@@ -407,9 +405,9 @@
}
void test_setRoots_addFolderWithNestedPackageSpec() {
- String examplePath =
+ var examplePath =
convertPath('$projPath/${ContextManagerTest.EXAMPLE_NAME}');
- String libPath = convertPath('$projPath/${ContextManagerTest.LIB_NAME}');
+ var libPath = convertPath('$projPath/${ContextManagerTest.LIB_NAME}');
newFile('$projPath/${ContextManagerImpl.PACKAGE_SPEC_NAME}');
newFile('$libPath/main.dart');
@@ -421,22 +419,22 @@
expect(callbacks.currentContextRoots, hasLength(2));
expect(callbacks.currentContextRoots, contains(projPath));
- Iterable<Source> projSources = callbacks.currentFileSources(projPath);
+ var projSources = callbacks.currentFileSources(projPath);
expect(projSources, hasLength(1));
expect(projSources.first.uri.toString(),
(Uri.file(join(libPath, 'main.dart')).toString()));
expect(callbacks.currentContextRoots, contains(examplePath));
- Iterable<Source> exampleSources = callbacks.currentFileSources(examplePath);
+ var exampleSources = callbacks.currentFileSources(examplePath);
expect(exampleSources, hasLength(1));
expect(exampleSources.first.uri.toString(),
(Uri.file(join(examplePath, 'example.dart')).toString()));
}
void test_setRoots_addFolderWithNestedPubspec() {
- String examplePath =
+ var examplePath =
convertPath('$projPath/${ContextManagerTest.EXAMPLE_NAME}');
- String libPath = convertPath('$projPath/${ContextManagerTest.LIB_NAME}');
+ var libPath = convertPath('$projPath/${ContextManagerTest.LIB_NAME}');
newFile('$projPath/${ContextManagerImpl.PUBSPEC_NAME}');
newFile('$projPath/${ContextManagerImpl.PACKAGE_SPEC_NAME}',
@@ -450,12 +448,12 @@
expect(callbacks.currentContextRoots, hasLength(2));
expect(callbacks.currentContextRoots, contains(projPath));
- Iterable<Source> projSources = callbacks.currentFileSources(projPath);
+ var projSources = callbacks.currentFileSources(projPath);
expect(projSources, hasLength(1));
expect(projSources.first.uri.toString(), 'package:proj/main.dart');
expect(callbacks.currentContextRoots, contains(examplePath));
- Iterable<Source> exampleSources = callbacks.currentFileSources(examplePath);
+ var exampleSources = callbacks.currentFileSources(examplePath);
expect(exampleSources, hasLength(1));
expect(exampleSources.first.uri.toString(),
(Uri.file('$examplePath/example.dart').toString()));
@@ -469,13 +467,13 @@
}
void test_setRoots_addFolderWithPackagespec() {
- String packagespecPath = join(projPath, '.packages');
+ var packagespecPath = join(projPath, '.packages');
var testLib = convertPath('/home/somebody/.pub/cache/unittest-0.9.9/lib');
var testLibUri = resourceProvider.pathContext.toUri(testLib);
resourceProvider.newFile(packagespecPath, 'unittest:$testLibUri');
- String libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
- File mainFile = newFile('$libPath/main.dart');
- Source source = mainFile.createSource();
+ var libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
+ var mainFile = newFile('$libPath/main.dart');
+ var source = mainFile.createSource();
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
@@ -484,7 +482,7 @@
expect(callbacks.currentFilePaths, hasLength(1));
// smoketest resolution
- Source resolvedSource =
+ var resolvedSource =
sourceFactory.resolveUri(source, 'package:unittest/unittest.dart');
expect(resolvedSource, isNotNull);
expect(resolvedSource.fullName, convertPath('$testLib/unittest.dart'));
@@ -492,11 +490,11 @@
void test_setRoots_addFolderWithPackagespecAndPackageRoot() {
// The package root should take priority.
- String packagespecPath = join(projPath, '.packages');
+ var packagespecPath = join(projPath, '.packages');
var testLib = convertPath('/home/somebody/.pub/cache/unittest-0.9.9/lib');
var testLibUri = resourceProvider.pathContext.toUri(testLib);
resourceProvider.newFile(packagespecPath, 'unittest:$testLibUri');
- String packageRootPath = '/package/root/';
+ var packageRootPath = '/package/root/';
manager.setRoots(<String>[projPath], <String>[],
<String, String>{projPath: packageRootPath});
expect(callbacks.currentContextRoots, unorderedEquals([projPath]));
@@ -504,7 +502,7 @@
}
void test_setRoots_addFolderWithPubspec() {
- String pubspecPath = join(projPath, 'pubspec.yaml');
+ var pubspecPath = join(projPath, 'pubspec.yaml');
resourceProvider.newFile(pubspecPath, 'pubspec');
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
// verify
@@ -513,8 +511,8 @@
}
void test_setRoots_addFolderWithPubspec_andPackagespec() {
- String pubspecPath = join(projPath, 'pubspec.yaml');
- String packagespecPath = join(projPath, '.packages');
+ var pubspecPath = join(projPath, 'pubspec.yaml');
+ var packagespecPath = join(projPath, '.packages');
resourceProvider.newFile(pubspecPath, 'pubspec');
resourceProvider.newFile(packagespecPath, '');
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
@@ -523,26 +521,25 @@
}
void test_setRoots_addFolderWithPubspecAndLib() {
- String binPath = '$projPath/${ContextManagerTest.BIN_NAME}';
- String libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
- String srcPath = '$libPath/${ContextManagerTest.SRC_NAME}';
- String testPath = '$projPath/${ContextManagerTest.TEST_NAME}';
+ var binPath = '$projPath/${ContextManagerTest.BIN_NAME}';
+ var libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
+ var srcPath = '$libPath/${ContextManagerTest.SRC_NAME}';
+ var testPath = '$projPath/${ContextManagerTest.TEST_NAME}';
newFile('$projPath/${ContextManagerImpl.PUBSPEC_NAME}');
newFile('$projPath/${ContextManagerImpl.PACKAGE_SPEC_NAME}',
content: 'proj:lib/');
- String appPath = newFile('$binPath/app.dart').path;
+ var appPath = newFile('$binPath/app.dart').path;
newFile('$libPath/main.dart');
newFile('$srcPath/internal.dart');
- String testFilePath = newFile('$testPath/main_test.dart').path;
+ var testFilePath = newFile('$testPath/main_test.dart').path;
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
- Iterable<Source> sources = callbacks.currentFileSources(projPath);
+ var sources = callbacks.currentFileSources(projPath);
expect(callbacks.currentContextRoots, unorderedEquals([projPath]));
expect(sources, hasLength(4));
- List<String> uris =
- sources.map((Source source) => source.uri.toString()).toList();
+ var uris = sources.map((Source source) => source.uri.toString()).toList();
expect(uris, contains((Uri.file(appPath)).toString()));
expect(uris, contains('package:proj/main.dart'));
expect(uris, contains('package:proj/src/internal.dart'));
@@ -551,12 +548,12 @@
void test_setRoots_addFolderWithPubspecAndPackagespecFolders() {
// prepare paths
- String root = convertPath('/root');
- String rootFile = convertPath('$root/root.dart');
- String subProjectA = convertPath('$root/sub/aaa');
- String subProjectB = convertPath('$root/sub/sub2/bbb');
- String subProjectA_file = convertPath('$subProjectA/bin/a.dart');
- String subProjectB_file = convertPath('$subProjectB/bin/b.dart');
+ var root = convertPath('/root');
+ var rootFile = convertPath('$root/root.dart');
+ var subProjectA = convertPath('$root/sub/aaa');
+ var subProjectB = convertPath('$root/sub/sub2/bbb');
+ var subProjectA_file = convertPath('$subProjectA/bin/a.dart');
+ var subProjectB_file = convertPath('$subProjectB/bin/b.dart');
// create files
newFile('$subProjectA/pubspec.yaml', content: 'pubspec');
newFile('$subProjectB/pubspec.yaml', content: 'pubspec');
@@ -578,14 +575,14 @@
void test_setRoots_addFolderWithPubspecFolders() {
// prepare paths
- String root = convertPath('/root');
- String rootFile = convertPath('$root/root.dart');
- String projectA = convertPath('$root/sub/aaa');
- String projectALib = convertPath('$root/sub/aaa/lib');
- String subProjectA_file = convertPath('$projectA/bin/a.dart');
- String projectB = convertPath('$root/sub/sub2/bbb');
- String projectBLib = convertPath('$root/sub/sub2/bbb/lib');
- String subProjectB_file = convertPath('$projectB/bin/b.dart');
+ var root = convertPath('/root');
+ var rootFile = convertPath('$root/root.dart');
+ var projectA = convertPath('$root/sub/aaa');
+ var projectALib = convertPath('$root/sub/aaa/lib');
+ var subProjectA_file = convertPath('$projectA/bin/a.dart');
+ var projectB = convertPath('$root/sub/sub2/bbb');
+ var projectBLib = convertPath('$root/sub/sub2/bbb/lib');
+ var subProjectB_file = convertPath('$projectB/bin/b.dart');
// create files
newFile('$projectA/${ContextManagerImpl.PUBSPEC_NAME}');
newFile('$projectA/${ContextManagerImpl.PACKAGE_SPEC_NAME}',
@@ -618,13 +615,13 @@
}
void test_setRoots_addPackageRoot() {
- String packagePathFoo = convertPath('/package1/foo');
- String packageRootPath = convertPath('/package2/foo');
+ var packagePathFoo = convertPath('/package1/foo');
+ var packageRootPath = convertPath('/package2/foo');
newFile('$projPath/${ContextManagerImpl.PACKAGE_SPEC_NAME}',
content: 'foo:${toUriStr('/package1/foo')}');
- Folder packageFolder = resourceProvider.newFolder(packagePathFoo);
- List<String> includedPaths = <String>[projPath];
- List<String> excludedPaths = <String>[];
+ var packageFolder = resourceProvider.newFolder(packagePathFoo);
+ var includedPaths = <String>[projPath];
+ var excludedPaths = <String>[];
manager.setRoots(includedPaths, excludedPaths, <String, String>{});
expect(
_currentPackageMap,
@@ -637,10 +634,10 @@
}
void test_setRoots_changePackageRoot() {
- String packageRootPath1 = '/package1';
- String packageRootPath2 = '/package2';
- List<String> includedPaths = <String>[projPath];
- List<String> excludedPaths = <String>[];
+ var packageRootPath1 = '/package1';
+ var packageRootPath2 = '/package2';
+ var includedPaths = <String>[projPath];
+ var excludedPaths = <String>[];
manager.setRoots(includedPaths, excludedPaths,
<String, String>{projPath: packageRootPath1});
_checkPackageRoot(projPath, equals(packageRootPath1));
@@ -651,9 +648,9 @@
void test_setRoots_exclude_newRoot_withExcludedFile() {
// prepare paths
- String project = convertPath('/project');
- String file1 = convertPath('$project/file1.dart');
- String file2 = convertPath('$project/file2.dart');
+ var project = convertPath('/project');
+ var file1 = convertPath('$project/file1.dart');
+ var file2 = convertPath('$project/file2.dart');
// create files
resourceProvider.newFile(file1, '// 1');
resourceProvider.newFile(file2, '// 2');
@@ -665,11 +662,11 @@
void test_setRoots_exclude_newRoot_withExcludedFolder() {
// prepare paths
- String project = convertPath('/project');
- String folderA = convertPath('$project/aaa');
- String folderB = convertPath('$project/bbb');
- String fileA = convertPath('$folderA/a.dart');
- String fileB = convertPath('$folderB/b.dart');
+ var project = convertPath('/project');
+ var folderA = convertPath('$project/aaa');
+ var folderB = convertPath('$project/bbb');
+ var fileA = convertPath('$folderA/a.dart');
+ var fileB = convertPath('$folderB/b.dart');
// create files
resourceProvider.newFile(fileA, 'library a;');
resourceProvider.newFile(fileB, 'library b;');
@@ -681,9 +678,9 @@
void test_setRoots_exclude_sameRoot_addExcludedFile() {
// prepare paths
- String project = convertPath('/project');
- String file1 = convertPath('$project/file1.dart');
- String file2 = convertPath('$project/file2.dart');
+ var project = convertPath('/project');
+ var file1 = convertPath('$project/file1.dart');
+ var file2 = convertPath('$project/file2.dart');
// create files
resourceProvider.newFile(file1, '// 1');
resourceProvider.newFile(file2, '// 2');
@@ -699,11 +696,11 @@
void test_setRoots_exclude_sameRoot_addExcludedFolder() {
// prepare paths
- String project = convertPath('/project');
- String folderA = convertPath('$project/aaa');
- String folderB = convertPath('$project/bbb');
- String fileA = convertPath('$folderA/a.dart');
- String fileB = convertPath('$folderB/b.dart');
+ var project = convertPath('/project');
+ var folderA = convertPath('$project/aaa');
+ var folderB = convertPath('$project/bbb');
+ var fileA = convertPath('$folderA/a.dart');
+ var fileB = convertPath('$folderB/b.dart');
// create files
resourceProvider.newFile(fileA, 'library a;');
resourceProvider.newFile(fileB, 'library b;');
@@ -719,9 +716,9 @@
void test_setRoots_exclude_sameRoot_removeExcludedFile() {
// prepare paths
- String project = convertPath('/project');
- String file1 = convertPath('$project/file1.dart');
- String file2 = convertPath('$project/file2.dart');
+ var project = convertPath('/project');
+ var file1 = convertPath('$project/file1.dart');
+ var file2 = convertPath('$project/file2.dart');
// create files
resourceProvider.newFile(file1, '// 1');
resourceProvider.newFile(file2, '// 2');
@@ -737,9 +734,9 @@
void test_setRoots_exclude_sameRoot_removeExcludedFile_inFolder() {
// prepare paths
- String project = convertPath('/project');
- String file1 = convertPath('$project/bin/file1.dart');
- String file2 = convertPath('$project/bin/file2.dart');
+ var project = convertPath('/project');
+ var file1 = convertPath('$project/bin/file1.dart');
+ var file2 = convertPath('$project/bin/file2.dart');
// create files
resourceProvider.newFile(file1, '// 1');
resourceProvider.newFile(file2, '// 2');
@@ -755,11 +752,11 @@
void test_setRoots_exclude_sameRoot_removeExcludedFolder() {
// prepare paths
- String project = convertPath('/project');
- String folderA = convertPath('$project/aaa');
- String folderB = convertPath('$project/bbb');
- String fileA = convertPath('$folderA/a.dart');
- String fileB = convertPath('$folderB/b.dart');
+ var project = convertPath('/project');
+ var folderA = convertPath('$project/aaa');
+ var folderB = convertPath('$project/bbb');
+ var fileA = convertPath('$folderA/a.dart');
+ var fileB = convertPath('$folderB/b.dart');
// create files
resourceProvider.newFile(fileA, 'library a;');
resourceProvider.newFile(fileB, 'library b;');
@@ -774,10 +771,10 @@
}
void test_setRoots_ignoreDocFolder() {
- String project = convertPath('/project');
- String fileA = convertPath('$project/foo.dart');
- String fileB = convertPath('$project/lib/doc/bar.dart');
- String fileC = convertPath('$project/doc/bar.dart');
+ var project = convertPath('/project');
+ var fileA = convertPath('$project/foo.dart');
+ var fileB = convertPath('$project/lib/doc/bar.dart');
+ var fileC = convertPath('$project/doc/bar.dart');
resourceProvider.newFile(fileA, '');
resourceProvider.newFile(fileB, '');
resourceProvider.newFile(fileC, '');
@@ -787,10 +784,10 @@
}
void test_setRoots_nested_includedByOuter_innerFirst() {
- String project = convertPath('/project');
- String projectPubspec = convertPath('$project/pubspec.yaml');
- String example = convertPath('$project/example');
- String examplePubspec = convertPath('$example/pubspec.yaml');
+ var project = convertPath('/project');
+ var projectPubspec = convertPath('$project/pubspec.yaml');
+ var example = convertPath('$project/example');
+ var examplePubspec = convertPath('$example/pubspec.yaml');
// create files
resourceProvider.newFile(projectPubspec, 'name: project');
resourceProvider.newFile(examplePubspec, 'name: example');
@@ -798,14 +795,14 @@
.setRoots(<String>[example, project], <String>[], <String, String>{});
// verify
{
- ContextInfo rootInfo = manager.rootInfo;
+ var rootInfo = manager.rootInfo;
expect(rootInfo.children, hasLength(1));
{
- ContextInfo projectInfo = rootInfo.children[0];
+ var projectInfo = rootInfo.children[0];
expect(projectInfo.folder.path, project);
expect(projectInfo.children, hasLength(1));
{
- ContextInfo exampleInfo = projectInfo.children[0];
+ var exampleInfo = projectInfo.children[0];
expect(exampleInfo.folder.path, example);
expect(exampleInfo.children, isEmpty);
}
@@ -815,9 +812,9 @@
}
void test_setRoots_nested_includedByOuter_outerPubspec() {
- String project = convertPath('/project');
- String projectPubspec = convertPath('$project/pubspec.yaml');
- String example = convertPath('$project/example');
+ var project = convertPath('/project');
+ var projectPubspec = convertPath('$project/pubspec.yaml');
+ var example = convertPath('$project/example');
// create files
resourceProvider.newFile(projectPubspec, 'name: project');
resourceProvider.newFolder(example);
@@ -825,10 +822,10 @@
.setRoots(<String>[project, example], <String>[], <String, String>{});
// verify
{
- ContextInfo rootInfo = manager.rootInfo;
+ var rootInfo = manager.rootInfo;
expect(rootInfo.children, hasLength(1));
{
- ContextInfo projectInfo = rootInfo.children[0];
+ var projectInfo = rootInfo.children[0];
expect(projectInfo.folder.path, project);
expect(projectInfo.children, isEmpty);
}
@@ -837,10 +834,10 @@
}
void test_setRoots_nested_includedByOuter_twoPubspecs() {
- String project = convertPath('/project');
- String projectPubspec = convertPath('$project/pubspec.yaml');
- String example = convertPath('$project/example');
- String examplePubspec = convertPath('$example/pubspec.yaml');
+ var project = convertPath('/project');
+ var projectPubspec = convertPath('$project/pubspec.yaml');
+ var example = convertPath('$project/example');
+ var examplePubspec = convertPath('$example/pubspec.yaml');
// create files
resourceProvider.newFile(projectPubspec, 'name: project');
resourceProvider.newFile(examplePubspec, 'name: example');
@@ -848,14 +845,14 @@
.setRoots(<String>[project, example], <String>[], <String, String>{});
// verify
{
- ContextInfo rootInfo = manager.rootInfo;
+ var rootInfo = manager.rootInfo;
expect(rootInfo.children, hasLength(1));
{
- ContextInfo projectInfo = rootInfo.children[0];
+ var projectInfo = rootInfo.children[0];
expect(projectInfo.folder.path, project);
expect(projectInfo.children, hasLength(1));
{
- ContextInfo exampleInfo = projectInfo.children[0];
+ var exampleInfo = projectInfo.children[0];
expect(exampleInfo.folder.path, example);
expect(exampleInfo.children, isEmpty);
}
@@ -865,17 +862,17 @@
}
void test_setRoots_newFolderWithPackageRoot() {
- String packageRootPath = '/package';
+ var packageRootPath = '/package';
manager.setRoots(<String>[projPath], <String>[],
<String, String>{projPath: packageRootPath});
_checkPackageRoot(projPath, equals(packageRootPath));
}
void test_setRoots_newlyAddedFoldersGetProperPackageMap() {
- String packagePath = convertPath('/package/foo');
+ var packagePath = convertPath('/package/foo');
newFile('$projPath/${ContextManagerImpl.PACKAGE_SPEC_NAME}',
content: 'foo:${toUriStr('/package/foo')}');
- Folder packageFolder = resourceProvider.newFolder(packagePath);
+ var packageFolder = resourceProvider.newFolder(packagePath);
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
expect(
_currentPackageMap,
@@ -886,9 +883,9 @@
void test_setRoots_noContext_excludedFolder() {
// prepare paths
- String project = convertPath('/project');
- String excludedFolder = convertPath('$project/excluded');
- String excludedPubspec = convertPath('$excludedFolder/pubspec.yaml');
+ var project = convertPath('/project');
+ var excludedFolder = convertPath('$project/excluded');
+ var excludedPubspec = convertPath('$excludedFolder/pubspec.yaml');
// create files
resourceProvider.newFile(excludedPubspec, 'name: ignore-me');
// set "/project", and exclude "/project/excluded"
@@ -898,7 +895,7 @@
}
void test_setRoots_noContext_inDotFolder() {
- String pubspecPath = join(projPath, '.pub', 'pubspec.yaml');
+ var pubspecPath = join(projPath, '.pub', 'pubspec.yaml');
resourceProvider.newFile(pubspecPath, 'name: test');
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
// verify
@@ -908,7 +905,7 @@
}
void test_setRoots_packageResolver() {
- String filePath = join(projPath, 'lib', 'foo.dart');
+ var filePath = join(projPath, 'lib', 'foo.dart');
newFile('$projPath/${ContextManagerImpl.PACKAGE_SPEC_NAME}',
content: 'foo:lib/');
resourceProvider.newFile(filePath, 'contents');
@@ -918,12 +915,12 @@
manager.getDriversInAnalysisRoot(resourceProvider.newFolder(projPath));
expect(drivers, hasLength(1));
expect(drivers[0], isNotNull);
- Source result = sourceFactory.forUri('package:foo/foo.dart');
+ var result = sourceFactory.forUri('package:foo/foo.dart');
expect(result.fullName, filePath);
}
void test_setRoots_packagesFolder_hasContext() {
- String pubspecPath = join(projPath, 'packages', 'pubspec.yaml');
+ var pubspecPath = join(projPath, 'packages', 'pubspec.yaml');
resourceProvider.newFile(pubspecPath, 'name: test');
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
// verify
@@ -935,9 +932,9 @@
void test_setRoots_pathContainsDotFile() {
// If the path to a file (relative to the context root) contains a folder
// whose name begins with '.', then the file is ignored.
- String project = convertPath('/project');
- String fileA = convertPath('$project/foo.dart');
- String fileB = convertPath('$project/.pub/bar.dart');
+ var project = convertPath('/project');
+ var fileA = convertPath('$project/foo.dart');
+ var fileB = convertPath('$project/.pub/bar.dart');
resourceProvider.newFile(fileA, '');
resourceProvider.newFile(fileB, '');
manager.setRoots(<String>[project], <String>[], <String, String>{});
@@ -957,7 +954,7 @@
void test_setRoots_removeFolderWithPackagespec() {
// create a pubspec
- String pubspecPath = join(projPath, '.packages');
+ var pubspecPath = join(projPath, '.packages');
resourceProvider.newFile(pubspecPath, '');
// add one root - there is a context
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
@@ -972,16 +969,16 @@
void test_setRoots_removeFolderWithPackagespecFolder() {
// prepare paths
- String projectA = convertPath('/projectA');
- String projectB = convertPath('/projectB');
- String subProjectA = convertPath('$projectA/sub');
- String subProjectB = convertPath('$projectB/sub');
- String projectA_file = convertPath('$projectA/a.dart');
- String projectB_file = convertPath('$projectB/a.dart');
- String subProjectA_pubspec = convertPath('$subProjectA/.packages');
- String subProjectB_pubspec = convertPath('$subProjectB/.packages');
- String subProjectA_file = convertPath('$subProjectA/bin/sub_a.dart');
- String subProjectB_file = convertPath('$subProjectB/bin/sub_b.dart');
+ var projectA = convertPath('/projectA');
+ var projectB = convertPath('/projectB');
+ var subProjectA = convertPath('$projectA/sub');
+ var subProjectB = convertPath('$projectB/sub');
+ var projectA_file = convertPath('$projectA/a.dart');
+ var projectB_file = convertPath('$projectB/a.dart');
+ var subProjectA_pubspec = convertPath('$subProjectA/.packages');
+ var subProjectB_pubspec = convertPath('$subProjectB/.packages');
+ var subProjectA_file = convertPath('$subProjectA/bin/sub_a.dart');
+ var subProjectB_file = convertPath('$subProjectB/bin/sub_b.dart');
// create files
resourceProvider.newFile(projectA_file, '// a');
resourceProvider.newFile(projectB_file, '// b');
@@ -1007,7 +1004,7 @@
void test_setRoots_removeFolderWithPubspec() {
// create a pubspec
- String pubspecPath = join(projPath, 'pubspec.yaml');
+ var pubspecPath = join(projPath, 'pubspec.yaml');
resourceProvider.newFile(pubspecPath, 'pubspec');
// add one root - there is a context
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
@@ -1020,16 +1017,16 @@
void test_setRoots_removeFolderWithPubspecFolder() {
// prepare paths
- String projectA = convertPath('/projectA');
- String projectB = convertPath('/projectB');
- String subProjectA = convertPath('$projectA/sub');
- String subProjectB = convertPath('$projectB/sub');
- String projectA_file = convertPath('$projectA/a.dart');
- String projectB_file = convertPath('$projectB/a.dart');
- String subProjectA_pubspec = convertPath('$subProjectA/pubspec.yaml');
- String subProjectB_pubspec = convertPath('$subProjectB/pubspec.yaml');
- String subProjectA_file = convertPath('$subProjectA/bin/sub_a.dart');
- String subProjectB_file = convertPath('$subProjectB/bin/sub_b.dart');
+ var projectA = convertPath('/projectA');
+ var projectB = convertPath('/projectB');
+ var subProjectA = convertPath('$projectA/sub');
+ var subProjectB = convertPath('$projectB/sub');
+ var projectA_file = convertPath('$projectA/a.dart');
+ var projectB_file = convertPath('$projectB/a.dart');
+ var subProjectA_pubspec = convertPath('$subProjectA/pubspec.yaml');
+ var subProjectB_pubspec = convertPath('$subProjectB/pubspec.yaml');
+ var subProjectA_file = convertPath('$subProjectA/bin/sub_a.dart');
+ var subProjectB_file = convertPath('$subProjectB/bin/sub_b.dart');
// create files
resourceProvider.newFile(projectA_file, '// a');
resourceProvider.newFile(projectB_file, '// b');
@@ -1054,13 +1051,13 @@
}
void test_setRoots_removePackageRoot() {
- String packagePathFoo = convertPath('/package1/foo');
- String packageRootPath = convertPath('/package2/foo');
- Folder packageFolder = resourceProvider.newFolder(packagePathFoo);
+ var packagePathFoo = convertPath('/package1/foo');
+ var packageRootPath = convertPath('/package2/foo');
+ var packageFolder = resourceProvider.newFolder(packagePathFoo);
newFile('$projPath/${ContextManagerImpl.PACKAGE_SPEC_NAME}',
content: 'foo:${toUriStr('/package1/foo')}');
- List<String> includedPaths = <String>[projPath];
- List<String> excludedPaths = <String>[];
+ var includedPaths = <String>[projPath];
+ var excludedPaths = <String>[];
manager.setRoots(includedPaths, excludedPaths,
<String, String>{projPath: packageRootPath});
_checkPackageRoot(projPath, equals(packageRootPath));
@@ -1076,8 +1073,8 @@
// If the path to the context root itself contains a folder whose name
// begins with '.', then that is not sufficient to cause any files in the
// context to be ignored.
- String project = convertPath('/.pub/project');
- String fileA = convertPath('$project/foo.dart');
+ var project = convertPath('/.pub/project');
+ var fileA = convertPath('$project/foo.dart');
resourceProvider.newFile(fileA, '');
manager.setRoots(<String>[project], <String>[], <String, String>{});
callbacks.assertContextPaths([project]);
@@ -1089,7 +1086,7 @@
// empty folder initially
expect(callbacks.currentFilePaths, isEmpty);
// add link
- String filePath = join(projPath, 'foo.dart');
+ var filePath = join(projPath, 'foo.dart');
resourceProvider.newDummyLink(filePath);
// the link was ignored
return pumpEventQueue().then((_) {
@@ -1102,11 +1099,11 @@
// empty folder initially
expect(callbacks.currentFilePaths, hasLength(0));
// add file
- String filePath = join(projPath, 'foo.dart');
+ var filePath = join(projPath, 'foo.dart');
resourceProvider.newFile(filePath, 'contents');
// the file was added
return pumpEventQueue().then((_) {
- Iterable<String> filePaths = callbacks.currentFilePaths;
+ var filePaths = callbacks.currentFilePaths;
expect(filePaths, hasLength(1));
expect(filePaths, contains(filePath));
});
@@ -1114,11 +1111,11 @@
Future<void> test_watch_addFile_excluded() {
// prepare paths
- String project = convertPath('/project');
- String folderA = convertPath('$project/aaa');
- String folderB = convertPath('$project/bbb');
- String fileA = convertPath('$folderA/a.dart');
- String fileB = convertPath('$folderB/b.dart');
+ var project = convertPath('/project');
+ var folderA = convertPath('$project/aaa');
+ var folderB = convertPath('$project/bbb');
+ var fileA = convertPath('$folderA/a.dart');
+ var fileB = convertPath('$folderB/b.dart');
// create files
resourceProvider.newFile(fileA, 'library a;');
// set roots
@@ -1135,9 +1132,9 @@
Future<void> test_watch_addFile_inDocFolder_inner() {
// prepare paths
- String project = convertPath('/project');
- String fileA = convertPath('$project/a.dart');
- String fileB = convertPath('$project/lib/doc/b.dart');
+ var project = convertPath('/project');
+ var fileA = convertPath('$project/a.dart');
+ var fileB = convertPath('$project/lib/doc/b.dart');
// create files
resourceProvider.newFile(fileA, '');
// set roots
@@ -1154,9 +1151,9 @@
Future<void> test_watch_addFile_inDocFolder_topLevel() {
// prepare paths
- String project = convertPath('/project');
- String fileA = convertPath('$project/a.dart');
- String fileB = convertPath('$project/doc/b.dart');
+ var project = convertPath('/project');
+ var fileA = convertPath('$project/a.dart');
+ var fileB = convertPath('$project/doc/b.dart');
// create files
resourceProvider.newFile(fileA, '');
// set roots
@@ -1174,9 +1171,9 @@
Future<void> test_watch_addFile_pathContainsDotFile() async {
// If a file is added and the path to it (relative to the context root)
// contains a folder whose name begins with '.', then the file is ignored.
- String project = convertPath('/project');
- String fileA = convertPath('$project/foo.dart');
- String fileB = convertPath('$project/.pub/bar.dart');
+ var project = convertPath('/project');
+ var fileA = convertPath('$project/foo.dart');
+ var fileB = convertPath('$project/.pub/bar.dart');
resourceProvider.newFile(fileA, '');
manager.setRoots(<String>[project], <String>[], <String, String>{});
callbacks.assertContextPaths([project]);
@@ -1190,9 +1187,9 @@
Future<void> test_watch_addFile_rootPathContainsDotFile() async {
// If a file is added and the path to the context contains a folder whose
// name begins with '.', then the file is not ignored.
- String project = convertPath('/.pub/project');
- String fileA = convertPath('$project/foo.dart');
- String fileB = convertPath('$project/bar/baz.dart');
+ var project = convertPath('/.pub/project');
+ var fileA = convertPath('$project/foo.dart');
+ var fileB = convertPath('$project/bar/baz.dart');
resourceProvider.newFile(fileA, '');
manager.setRoots(<String>[project], <String>[], <String, String>{});
callbacks.assertContextPaths([project]);
@@ -1208,11 +1205,11 @@
// empty folder initially
expect(callbacks.currentFilePaths, hasLength(0));
// add file in subfolder
- String filePath = join(projPath, 'foo', 'bar.dart');
+ var filePath = join(projPath, 'foo', 'bar.dart');
resourceProvider.newFile(filePath, 'contents');
// the file was added
return pumpEventQueue().then((_) {
- Iterable<String> filePaths = callbacks.currentFilePaths;
+ var filePaths = callbacks.currentFilePaths;
expect(filePaths, hasLength(1));
expect(filePaths, contains(filePath));
});
@@ -1220,9 +1217,9 @@
Future<void> test_watch_addPackagespec_toRoot() {
// prepare paths
- String root = convertPath('/root');
- String rootFile = convertPath('$root/root.dart');
- String rootPackagespec = convertPath('$root/.packages');
+ var root = convertPath('/root');
+ var rootFile = convertPath('$root/root.dart');
+ var rootPackagespec = convertPath('$root/.packages');
// create files
resourceProvider.newFile(rootFile, 'library root;');
// set roots
@@ -1242,11 +1239,11 @@
Future<void> test_watch_addPackagespec_toSubFolder() {
// prepare paths
- String root = convertPath('/root');
- String rootFile = convertPath('$root/root.dart');
- String subProject = convertPath('$root/sub/aaa');
- String subPubspec = convertPath('$subProject/.packages');
- String subFile = convertPath('$subProject/bin/a.dart');
+ var root = convertPath('/root');
+ var rootFile = convertPath('$root/root.dart');
+ var subProject = convertPath('$root/sub/aaa');
+ var subPubspec = convertPath('$subProject/.packages');
+ var subFile = convertPath('$subProject/bin/a.dart');
// create files
resourceProvider.newFile(rootFile, 'library root;');
resourceProvider.newFile(subFile, 'library a;');
@@ -1266,12 +1263,12 @@
Future<void> test_watch_addPackagespec_toSubFolder_ofSubFolder() {
// prepare paths
- String root = convertPath('/root');
- String rootFile = convertPath('$root/root.dart');
- String subProject = convertPath('$root/sub');
- String subPubspec = convertPath('$subProject/.packages');
- String subFile = convertPath('$subProject/bin/sub.dart');
- String subSubPubspec = convertPath('$subProject/subsub/.packages');
+ var root = convertPath('/root');
+ var rootFile = convertPath('$root/root.dart');
+ var subProject = convertPath('$root/sub');
+ var subPubspec = convertPath('$subProject/.packages');
+ var subFile = convertPath('$subProject/bin/sub.dart');
+ var subSubPubspec = convertPath('$subProject/subsub/.packages');
// create files
resourceProvider.newFile(rootFile, 'library root;');
resourceProvider.newFile(subPubspec, '');
@@ -1292,12 +1289,12 @@
Future<void> test_watch_addPackagespec_toSubFolder_withPubspec() {
// prepare paths
- String root = convertPath('/root');
- String rootFile = convertPath('$root/root.dart');
- String subProject = convertPath('$root/sub/aaa');
- String subPackagespec = convertPath('$subProject/.packages');
- String subPubspec = convertPath('$subProject/pubspec.yaml');
- String subFile = convertPath('$subProject/bin/a.dart');
+ var root = convertPath('/root');
+ var rootFile = convertPath('$root/root.dart');
+ var subProject = convertPath('$root/sub/aaa');
+ var subPackagespec = convertPath('$subProject/.packages');
+ var subPubspec = convertPath('$subProject/pubspec.yaml');
+ var subFile = convertPath('$subProject/bin/a.dart');
// create files
resourceProvider.newFile(subPubspec, 'pubspec');
resourceProvider.newFile(rootFile, 'library root;');
@@ -1321,9 +1318,9 @@
Future<void> test_watch_addPubspec_toRoot() {
// prepare paths
- String root = convertPath('/root');
- String rootFile = convertPath('$root/root.dart');
- String rootPubspec = convertPath('$root/pubspec.yaml');
+ var root = convertPath('/root');
+ var rootFile = convertPath('$root/root.dart');
+ var rootPubspec = convertPath('$root/pubspec.yaml');
// create files
resourceProvider.newFile(rootFile, 'library root;');
// set roots
@@ -1341,11 +1338,11 @@
Future<void> test_watch_addPubspec_toSubFolder() {
// prepare paths
- String root = convertPath('/root');
- String rootFile = convertPath('$root/root.dart');
- String subProject = convertPath('$root/sub/aaa');
- String subPubspec = convertPath('$subProject/pubspec.yaml');
- String subFile = convertPath('$subProject/bin/a.dart');
+ var root = convertPath('/root');
+ var rootFile = convertPath('$root/root.dart');
+ var subProject = convertPath('$root/sub/aaa');
+ var subPubspec = convertPath('$subProject/pubspec.yaml');
+ var subFile = convertPath('$subProject/bin/a.dart');
// create files
resourceProvider.newFile(rootFile, 'library root;');
resourceProvider.newFile(subFile, 'library a;');
@@ -1365,12 +1362,12 @@
Future<void> test_watch_addPubspec_toSubFolder_ofSubFolder() {
// prepare paths
- String root = convertPath('/root');
- String rootFile = convertPath('$root/root.dart');
- String subProject = convertPath('$root/sub');
- String subPubspec = convertPath('$subProject/pubspec.yaml');
- String subFile = convertPath('$subProject/bin/sub.dart');
- String subSubPubspec = convertPath('$subProject/subsub/pubspec.yaml');
+ var root = convertPath('/root');
+ var rootFile = convertPath('$root/root.dart');
+ var subProject = convertPath('$root/sub');
+ var subPubspec = convertPath('$subProject/pubspec.yaml');
+ var subFile = convertPath('$subProject/bin/sub.dart');
+ var subSubPubspec = convertPath('$subProject/subsub/pubspec.yaml');
// create files
resourceProvider.newFile(rootFile, 'library root;');
resourceProvider.newFile(subPubspec, 'pubspec');
@@ -1390,13 +1387,13 @@
}
Future<void> test_watch_deleteFile() {
- String filePath = join(projPath, 'foo.dart');
+ var filePath = join(projPath, 'foo.dart');
// add root with a file
- File file = resourceProvider.newFile(filePath, 'contents');
- Folder projFolder = file.parent;
+ var file = resourceProvider.newFile(filePath, 'contents');
+ var projFolder = file.parent;
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
// the file was added
- Iterable<String> filePaths = callbacks.currentFilePaths;
+ var filePaths = callbacks.currentFilePaths;
expect(filePaths, hasLength(1));
expect(filePaths, contains(filePath));
expect(file.exists, isTrue);
@@ -1411,13 +1408,13 @@
}
Future<void> test_watch_deleteFolder() {
- String filePath = join(projPath, 'foo.dart');
+ var filePath = join(projPath, 'foo.dart');
// add root with a file
- File file = resourceProvider.newFile(filePath, 'contents');
- Folder projFolder = file.parent;
+ var file = resourceProvider.newFile(filePath, 'contents');
+ var projFolder = file.parent;
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
// the file was added
- Iterable<String> filePaths = callbacks.currentFilePaths;
+ var filePaths = callbacks.currentFilePaths;
expect(filePaths, hasLength(1));
expect(filePaths, contains(filePath));
expect(file.exists, isTrue);
@@ -1433,9 +1430,9 @@
Future<void> test_watch_deletePackagespec_fromRoot() {
// prepare paths
- String root = convertPath('/root');
- String rootPubspec = convertPath('$root/.packages');
- String rootFile = convertPath('$root/root.dart');
+ var root = convertPath('/root');
+ var rootPubspec = convertPath('$root/.packages');
+ var rootFile = convertPath('$root/root.dart');
// create files
resourceProvider.newFile(rootPubspec, '');
resourceProvider.newFile(rootFile, 'library root;');
@@ -1453,11 +1450,11 @@
Future<void> test_watch_deletePackagespec_fromSubFolder() {
// prepare paths
- String root = convertPath('/root');
- String rootFile = convertPath('$root/root.dart');
- String subProject = convertPath('$root/sub/aaa');
- String subPubspec = convertPath('$subProject/.packages');
- String subFile = convertPath('$subProject/bin/a.dart');
+ var root = convertPath('/root');
+ var rootFile = convertPath('$root/root.dart');
+ var subProject = convertPath('$root/sub/aaa');
+ var subPubspec = convertPath('$subProject/.packages');
+ var subFile = convertPath('$subProject/bin/a.dart');
// create files
resourceProvider.newFile(subPubspec, '');
resourceProvider.newFile(rootFile, 'library root;');
@@ -1488,12 +1485,12 @@
// bin
// a.dart
//
- String root = convertPath('/root');
- String rootFile = convertPath('$root/root.dart');
- String subProject = convertPath('$root/sub/aaa');
- String subPackagespec = convertPath('$subProject/.packages');
- String subPubspec = convertPath('$subProject/pubspec.yaml');
- String subFile = convertPath('$subProject/bin/a.dart');
+ var root = convertPath('/root');
+ var rootFile = convertPath('$root/root.dart');
+ var subProject = convertPath('$root/sub/aaa');
+ var subPackagespec = convertPath('$subProject/.packages');
+ var subPubspec = convertPath('$subProject/pubspec.yaml');
+ var subFile = convertPath('$subProject/bin/a.dart');
// create files
resourceProvider.newFile(subPackagespec, '');
resourceProvider.newFile(subPubspec, 'pubspec');
@@ -1516,9 +1513,9 @@
Future<void> test_watch_deletePubspec_fromRoot() {
// prepare paths
- String root = convertPath('/root');
- String rootPubspec = convertPath('$root/pubspec.yaml');
- String rootFile = convertPath('$root/root.dart');
+ var root = convertPath('/root');
+ var rootPubspec = convertPath('$root/pubspec.yaml');
+ var rootFile = convertPath('$root/root.dart');
// create files
resourceProvider.newFile(rootPubspec, 'pubspec');
resourceProvider.newFile(rootFile, 'library root;');
@@ -1536,11 +1533,11 @@
Future<void> test_watch_deletePubspec_fromSubFolder() {
// prepare paths
- String root = convertPath('/root');
- String rootFile = convertPath('$root/root.dart');
- String subProject = convertPath('$root/sub/aaa');
- String subPubspec = convertPath('$subProject/pubspec.yaml');
- String subFile = convertPath('$subProject/bin/a.dart');
+ var root = convertPath('/root');
+ var rootFile = convertPath('$root/root.dart');
+ var subProject = convertPath('$root/sub/aaa');
+ var subPubspec = convertPath('$subProject/pubspec.yaml');
+ var subFile = convertPath('$subProject/bin/a.dart');
// create files
resourceProvider.newFile(subPubspec, 'pubspec');
resourceProvider.newFile(rootFile, 'library root;');
@@ -1560,12 +1557,12 @@
}
Future<void> test_watch_modifyFile() {
- String filePath = join(projPath, 'foo.dart');
+ var filePath = join(projPath, 'foo.dart');
// add root with a file
resourceProvider.newFile(filePath, 'contents');
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
// the file was added
- Iterable<String> filePaths = callbacks.currentFilePaths;
+ var filePaths = callbacks.currentFilePaths;
expect(filePaths, hasLength(1));
expect(filePaths, contains(filePath));
// TODO(brianwilkerson) Test when the file was modified
@@ -1578,15 +1575,15 @@
}
Future<void> test_watch_modifyPackagespec() {
- String packagesPath = convertPath('$projPath/.packages');
- String filePath = convertPath('$projPath/bin/main.dart');
+ var packagesPath = convertPath('$projPath/.packages');
+ var filePath = convertPath('$projPath/bin/main.dart');
resourceProvider.newFile(packagesPath, '');
resourceProvider.newFile(filePath, 'library main;');
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
- Iterable<String> filePaths = callbacks.currentFilePaths;
+ var filePaths = callbacks.currentFilePaths;
expect(filePaths, hasLength(1));
expect(filePaths, contains(filePath));
expect(_currentPackageMap, isEmpty);
@@ -1652,7 +1649,7 @@
]);
List<Glob> get analysisFilesGlobs {
- List<String> patterns = <String>[
+ var patterns = <String>[
'**/*.${AnalysisEngine.SUFFIX_DART}',
'**/*.${AnalysisEngine.SUFFIX_HTML}',
'**/*.${AnalysisEngine.SUFFIX_HTM}',
@@ -1688,23 +1685,23 @@
resourceProvider.newFolder(projPath);
// Create an SDK in the mock file system.
MockSdk(generateSummaryFiles: true, resourceProvider: resourceProvider);
- DartSdkManager sdkManager = DartSdkManager(convertPath('/sdk'), true);
+ var sdkManager = DartSdkManager(convertPath('/sdk'), true);
manager = ContextManagerImpl(
resourceProvider,
sdkManager,
analysisFilesGlobs,
InstrumentationService.NULL_SERVICE,
AnalysisOptionsImpl());
- PerformanceLog logger = PerformanceLog(NullStringSink());
- AnalysisDriverScheduler scheduler = AnalysisDriverScheduler(logger);
+ var logger = PerformanceLog(NullStringSink());
+ var scheduler = AnalysisDriverScheduler(logger);
callbacks = TestContextManagerCallbacks(
resourceProvider, sdkManager, logger, scheduler);
manager.callbacks = callbacks;
}
Map<String, List<Folder>> _packageMap(String contextPath) {
- Folder folder = resourceProvider.getFolder(contextPath);
- ContextInfo info = manager.getContextInfoFor(folder);
+ var folder = resourceProvider.getFolder(contextPath);
+ var info = manager.getContextInfoFor(folder);
return info.analysisDriver.sourceFactory?.packageMap;
}
}
@@ -1752,7 +1749,7 @@
// This fails because the ContextBuilder doesn't pick up the strongMode
// flag from the embedder.yaml file.
// Setup _embedder.yaml.
- String libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
+ var libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
newFile('$libPath/_embedder.yaml', content: r'''
analyzer:
language:
@@ -1799,11 +1796,11 @@
Future<void> test_analysis_options_include() async {
// Create files.
- String libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
+ var libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
newFile('$libPath/main.dart');
- String sdkExtPath = '$projPath/sdk_ext';
+ var sdkExtPath = '$projPath/sdk_ext';
newFile('$sdkExtPath/entry.dart');
- String sdkExtSrcPath = '$projPath/sdk_ext/src';
+ var sdkExtSrcPath = '$projPath/sdk_ext/src';
newFile('$sdkExtSrcPath/part.dart');
// Setup analysis options file which includes another options file.
newFile('$projPath/$optionsFileName', content: r'''
@@ -1828,14 +1825,14 @@
Future<void> test_analysis_options_include_package() async {
// Create files.
- String libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
+ var libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
newFile('$libPath/main.dart');
- String sdkExtPath = '$projPath/sdk_ext';
+ var sdkExtPath = '$projPath/sdk_ext';
newFile('$sdkExtPath/entry.dart');
- String sdkExtSrcPath = '$projPath/sdk_ext/src';
+ var sdkExtSrcPath = '$projPath/sdk_ext/src';
newFile('$sdkExtSrcPath/part.dart');
// Setup package
- String booLibPosixPath = '/my/pkg/boo/lib';
+ var booLibPosixPath = '/my/pkg/boo/lib';
newFile('$booLibPosixPath/other_options.yaml', content: r'''
analyzer:
errors:
@@ -1862,14 +1859,14 @@
@failingTest
Future<void> test_analysis_options_parse_failure() async {
// Create files.
- String libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
+ var libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
newFile('$libPath/main.dart');
- String sdkExtPath = '$projPath/sdk_ext';
+ var sdkExtPath = '$projPath/sdk_ext';
newFile('$sdkExtPath/entry.dart');
- String sdkExtSrcPath = '$projPath/sdk_ext/src';
+ var sdkExtSrcPath = '$projPath/sdk_ext/src';
newFile('$sdkExtSrcPath/part.dart');
// Setup analysis options file with ignore list.
- String optionsFilePath = newFile('$projPath/$optionsFileName', content: r'''
+ var optionsFilePath = newFile('$projPath/$optionsFileName', content: r'''
;
''').path;
// Setup context.
@@ -1900,12 +1897,12 @@
// This fails because the ContextBuilder doesn't pick up the strongMode
// flag from the embedder.yaml file.
// Create files.
- String libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
- String sdkExtPath = '$projPath/sdk_ext';
+ var libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
+ var sdkExtPath = '$projPath/sdk_ext';
newFile('$projPath/test', content: 'test.dart');
newFile('$sdkExtPath/entry.dart');
var synchronousSession = SynchronousSession(analysisOptions, null);
- List<int> bytes =
+ var bytes =
SummaryBuilder([], AnalysisContextImpl(synchronousSession, null))
.build(featureSet: FeatureSet.fromEnableFlags([]));
newFileWithBytes('$projPath/sdk.ds', bytes);
@@ -1942,7 +1939,7 @@
await pumpEventQueue();
// Confirm that one context was created.
- int count = manager
+ var count = manager
.numberOfContextsInAnalysisRoot(resourceProvider.newFolder(projPath));
expect(count, equals(1));
@@ -2048,7 +2045,7 @@
Future<void> test_non_analyzable_files_not_considered() async {
// Set up project and get a reference to the driver.
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
- Folder projectFolder = resourceProvider.newFolder(projPath);
+ var projectFolder = resourceProvider.newFolder(projPath);
var drivers = manager.getDriversInAnalysisRoot(projectFolder);
expect(drivers, hasLength(1));
@@ -2124,12 +2121,12 @@
Future<void> test_path_filter_analysis_option() async {
// This fails because we're not analyzing the analysis options file.
// Create files.
- String libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
+ var libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
newFile('$libPath/main.dart');
newFile('$libPath/nope.dart');
- String sdkExtPath = '$projPath/sdk_ext';
+ var sdkExtPath = '$projPath/sdk_ext';
newFile('$sdkExtPath/entry.dart');
- String sdkExtSrcPath = '$projPath/sdk_ext/src';
+ var sdkExtSrcPath = '$projPath/sdk_ext/src';
newFile('$sdkExtSrcPath/part.dart');
// Setup analysis options file with ignore list.
newFile('$projPath/$optionsFileName', content: r'''
@@ -2142,10 +2139,10 @@
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
// Verify that analysis options was parsed and the ignore patterns applied.
- Folder projectFolder = resourceProvider.newFolder(projPath);
+ var projectFolder = resourceProvider.newFolder(projPath);
var drivers = manager.getDriversInAnalysisRoot(projectFolder);
expect(drivers, hasLength(1));
- AnalysisDriver driver = drivers[0];
+ var driver = drivers[0];
expect(
driver.addedFiles,
unorderedEquals(
@@ -2154,12 +2151,12 @@
Future<void> test_path_filter_child_contexts_option() async {
// Create files.
- String libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
+ var libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
newFile('$libPath/main.dart');
newFile('$libPath/pubspec.yaml', content: r'''
name: foobar
''');
- String otherLibPath = '$projPath/other_lib';
+ var otherLibPath = '$projPath/other_lib';
newFile('$otherLibPath/entry.dart');
newFile('$otherLibPath/pubspec.yaml', content: r'''
name: other_lib
@@ -2175,7 +2172,7 @@
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
// Verify that the context in other_lib wasn't created and that the
// context in lib was created.
- Folder projectFolder = resourceProvider.newFolder(projPath);
+ var projectFolder = resourceProvider.newFolder(projPath);
var drivers = manager.getDriversInAnalysisRoot(projectFolder);
expect(drivers, hasLength(2));
expect(drivers[0].name, equals(convertPath('/my/proj')));
@@ -2185,12 +2182,12 @@
Future<void>
test_path_filter_recursive_wildcard_child_contexts_option() async {
// Create files.
- String libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
+ var libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
newFile('$libPath/main.dart');
newFile('$libPath/pubspec.yaml', content: r'''
name: foobar
''');
- String otherLibPath = '$projPath/other_lib';
+ var otherLibPath = '$projPath/other_lib';
newFile('$otherLibPath/entry.dart');
newFile('$otherLibPath/pubspec.yaml', content: r'''
name: other_lib
@@ -2207,7 +2204,7 @@
// Verify that the context in other_lib wasn't created and that the
// context in lib was created.
- Folder projectFolder = resourceProvider.newFolder(projPath);
+ var projectFolder = resourceProvider.newFolder(projPath);
var drivers = manager.getDriversInAnalysisRoot(projectFolder);
expect(drivers, hasLength(2));
expect(drivers[0].name, equals(convertPath('/my/proj')));
@@ -2216,12 +2213,12 @@
Future<void> test_path_filter_wildcard_child_contexts_option() async {
// Create files.
- String libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
+ var libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
newFile('$libPath/main.dart');
newFile('$libPath/pubspec.yaml', content: r'''
name: foobar
''');
- String otherLibPath = '$projPath/other_lib';
+ var otherLibPath = '$projPath/other_lib';
newFile('$otherLibPath/entry.dart');
newFile('$otherLibPath/pubspec.yaml', content: r'''
name: other_lib
@@ -2236,7 +2233,7 @@
// Setup context / driver.
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
- Folder projectFolder = resourceProvider.newFolder(projPath);
+ var projectFolder = resourceProvider.newFolder(projPath);
var drivers = manager.getDriversInAnalysisRoot(projectFolder);
expect(drivers, hasLength(2));
expect(drivers[0].name, equals(convertPath('/my/proj')));
@@ -2244,10 +2241,10 @@
}
void test_setRoots_nested_excludedByOuter() {
- String project = convertPath('/project');
- String projectPubspec = convertPath('$project/pubspec.yaml');
- String example = convertPath('$project/example');
- String examplePubspec = convertPath('$example/pubspec.yaml');
+ var project = convertPath('/project');
+ var projectPubspec = convertPath('$project/pubspec.yaml');
+ var example = convertPath('$project/example');
+ var examplePubspec = convertPath('$example/pubspec.yaml');
// create files
resourceProvider.newFile(projectPubspec, 'name: project');
resourceProvider.newFile(examplePubspec, 'name: example');
@@ -2260,14 +2257,14 @@
.setRoots(<String>[project, example], <String>[], <String, String>{});
// verify
{
- ContextInfo rootInfo = manager.rootInfo;
+ var rootInfo = manager.rootInfo;
expect(rootInfo.children, hasLength(1));
{
- ContextInfo projectInfo = rootInfo.children[0];
+ var projectInfo = rootInfo.children[0];
expect(projectInfo.folder.path, project);
expect(projectInfo.children, hasLength(1));
{
- ContextInfo exampleInfo = projectInfo.children[0];
+ var exampleInfo = projectInfo.children[0];
expect(exampleInfo.folder.path, example);
expect(exampleInfo.children, isEmpty);
}
@@ -2278,10 +2275,10 @@
}
void test_setRoots_nested_excludedByOuter_deep() {
- String a = convertPath('/a');
- String c = convertPath('$a/b/c');
- String aPubspec = convertPath('$a/pubspec.yaml');
- String cPubspec = convertPath('$c/pubspec.yaml');
+ var a = convertPath('/a');
+ var c = convertPath('$a/b/c');
+ var aPubspec = convertPath('$a/pubspec.yaml');
+ var cPubspec = convertPath('$c/pubspec.yaml');
// create files
resourceProvider.newFile(aPubspec, 'name: aaa');
resourceProvider.newFile(cPubspec, 'name: ccc');
@@ -2293,14 +2290,14 @@
manager.setRoots(<String>[a, c], <String>[], <String, String>{});
// verify
{
- ContextInfo rootInfo = manager.rootInfo;
+ var rootInfo = manager.rootInfo;
expect(rootInfo.children, hasLength(1));
{
- ContextInfo aInfo = rootInfo.children[0];
+ var aInfo = rootInfo.children[0];
expect(aInfo.folder.path, a);
expect(aInfo.children, hasLength(1));
{
- ContextInfo cInfo = aInfo.children[0];
+ var cInfo = aInfo.children[0];
expect(cInfo.folder.path, c);
expect(cInfo.children, isEmpty);
}
@@ -2311,7 +2308,7 @@
}
Future<void> test_watchEvents() async {
- String libPath = newFolder('$projPath/${ContextManagerTest.LIB_NAME}').path;
+ var libPath = newFolder('$projPath/${ContextManagerTest.LIB_NAME}').path;
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
newFile('$libPath/main.dart');
await Future.delayed(Duration(milliseconds: 1));
@@ -2387,14 +2384,13 @@
@override
AnalysisDriver addAnalysisDriver(
Folder folder, ContextRoot contextRoot, AnalysisOptions options) {
- String path = folder.path;
+ var path = folder.path;
expect(currentContextRoots, isNot(contains(path)));
expect(contextRoot, isNotNull);
expect(contextRoot.root, path);
currentContextTimestamps[path] = now;
- ContextBuilder builder =
- createContextBuilder(folder, options, useSummaries: true);
+ var builder = createContextBuilder(folder, options, useSummaries: true);
builder.analysisDriverScheduler = scheduler;
builder.byteStore = MemoryByteStore();
builder.performanceLog = logger;
@@ -2418,7 +2414,7 @@
@override
void applyChangesToContext(Folder contextFolder, ChangeSet changeSet) {
- AnalysisDriver driver = driverMap[contextFolder.path];
+ var driver = driverMap[contextFolder.path];
if (driver != null) {
changeSet.addedFiles.forEach((source) {
driver.addFile(source);
@@ -2453,9 +2449,9 @@
@override
ContextBuilder createContextBuilder(Folder folder, AnalysisOptions options,
{bool useSummaries = false}) {
- ContextBuilderOptions builderOptions = ContextBuilderOptions();
+ var builderOptions = ContextBuilderOptions();
builderOptions.defaultOptions = options;
- ContextBuilder builder = ContextBuilder(resourceProvider, sdkManager, null,
+ var builder = ContextBuilder(resourceProvider, sdkManager, null,
options: builderOptions);
return builder;
}
@@ -2465,12 +2461,12 @@
if (currentDriver == null) {
return <Source>[];
}
- AnalysisDriver driver = driverMap[contextPath];
- SourceFactory sourceFactory = driver.sourceFactory;
+ var driver = driverMap[contextPath];
+ var sourceFactory = driver.sourceFactory;
return driver.addedFiles.map((String path) {
- File file = resourceProvider.getFile(path);
- Source source = file.createSource();
- Uri uri = sourceFactory.restoreUri(source);
+ var file = resourceProvider.getFile(path);
+ var source = file.createSource();
+ var uri = sourceFactory.restoreUri(source);
return file.createSource(uri);
});
}
@@ -2485,7 +2481,7 @@
@override
void removeContext(Folder folder, List<String> flushedFiles) {
- String path = folder.path;
+ var path = folder.path;
expect(currentContextRoots, contains(path));
currentContextTimestamps.remove(path);
currentContextFilePaths.remove(path);
diff --git a/pkg/analysis_server/test/domain_analysis_test.dart b/pkg/analysis_server/test/domain_analysis_test.dart
index e2a2668..7ea4141 100644
--- a/pkg/analysis_server/test/domain_analysis_test.dart
+++ b/pkg/analysis_server/test/domain_analysis_test.dart
@@ -34,16 +34,15 @@
@reflectiveTest
class AnalysisDomainHandlerTest extends AbstractAnalysisTest {
Future<void> outOfRangeTest(SourceEdit edit) async {
- AnalysisTestHelper helper = AnalysisTestHelper();
+ var helper = AnalysisTestHelper();
helper.createSingleFileProject('library A;');
await helper.onAnalysisComplete;
helper.sendContentChange(AddContentOverlay('library B;'));
await helper.onAnalysisComplete;
- ChangeContentOverlay contentChange = ChangeContentOverlay([edit]);
- Request request =
- AnalysisUpdateContentParams({helper.testFile: contentChange})
- .toRequest('0');
- Response response = helper.handler.handleRequest(request);
+ var contentChange = ChangeContentOverlay([edit]);
+ var request = AnalysisUpdateContentParams({helper.testFile: contentChange})
+ .toRequest('0');
+ var response = helper.handler.handleRequest(request);
expect(response,
isResponseFailure('0', RequestErrorCode.INVALID_OVERLAY_CHANGE));
}
@@ -58,7 +57,7 @@
Future<void> test_setAnalysisRoots_included_newFolder() async {
newFile('/project/pubspec.yaml', content: 'name: project');
- String file = newFile('/project/bin/test.dart', content: 'main() {}').path;
+ var file = newFile('/project/bin/test.dart', content: 'main() {}').path;
var response = testSetAnalysisRoots([projectPath], []);
var serverRef = server;
expect(response, isResponseSuccess('0'));
@@ -69,9 +68,9 @@
}
Future<void> test_setAnalysisRoots_included_nonexistentFolder() async {
- String projectA = convertPath('/project_a');
- String projectB = convertPath('/project_b');
- String fileB = newFile('/project_b/b.dart', content: '// b').path;
+ var projectA = convertPath('/project_a');
+ var projectB = convertPath('/project_b');
+ var fileB = newFile('/project_b/b.dart', content: '// b').path;
var response = testSetAnalysisRoots([projectA, projectB], []);
var serverRef = server;
expect(response, isResponseSuccess('0'));
@@ -144,22 +143,22 @@
}
Future<void> test_updateContent_badType() async {
- AnalysisTestHelper helper = AnalysisTestHelper();
+ var helper = AnalysisTestHelper();
helper.createSingleFileProject('// empty');
await helper.onAnalysisComplete;
- Request request = Request('0', ANALYSIS_REQUEST_UPDATE_CONTENT, {
+ var request = Request('0', ANALYSIS_REQUEST_UPDATE_CONTENT, {
ANALYSIS_REQUEST_UPDATE_CONTENT_FILES: {
helper.testFile: {
'type': 'foo',
}
}
});
- Response response = helper.handler.handleRequest(request);
+ var response = helper.handler.handleRequest(request);
expect(response, isResponseFailure('0'));
}
Future<void> test_updateContent_changeOnDisk_duringOverride() async {
- AnalysisTestHelper helper = AnalysisTestHelper();
+ var helper = AnalysisTestHelper();
helper.createSingleFileProject('library A;');
await helper.onAnalysisComplete;
// update code
@@ -181,7 +180,7 @@
}
Future<void> test_updateContent_changeOnDisk_normal() async {
- AnalysisTestHelper helper = AnalysisTestHelper();
+ var helper = AnalysisTestHelper();
helper.createSingleFileProject('library A;');
await helper.onAnalysisComplete;
// There should be no errors
@@ -195,11 +194,11 @@
}
Future<void> test_updateContent_fullContent() async {
- AnalysisTestHelper helper = AnalysisTestHelper();
+ var helper = AnalysisTestHelper();
helper.createSingleFileProject('// empty');
await helper.onAnalysisComplete;
// no errors initially
- List<AnalysisError> errors = helper.getTestErrors();
+ var errors = helper.getTestErrors();
expect(errors, isEmpty);
// update code
helper.sendContentChange(AddContentOverlay('library lib'));
@@ -210,12 +209,12 @@
}
Future<void> test_updateContent_incremental() async {
- AnalysisTestHelper helper = AnalysisTestHelper();
- String initialContent = 'library A;';
+ var helper = AnalysisTestHelper();
+ var initialContent = 'library A;';
helper.createSingleFileProject(initialContent);
await helper.onAnalysisComplete;
// no errors initially
- List<AnalysisError> errors = helper.getTestErrors();
+ var errors = helper.getTestErrors();
expect(errors, isEmpty);
// Add the file to the cache
helper.sendContentChange(AddContentOverlay(initialContent));
@@ -258,7 +257,7 @@
}
Response testSetAnalysisRoots(List<String> included, List<String> excluded) {
- Request request =
+ var request =
AnalysisSetAnalysisRootsParams(included, excluded).toRequest('0');
return handler.handleRequest(request);
}
@@ -282,7 +281,7 @@
Future<void> xtest_getReachableSources_validSources() async {
// TODO(brianwilkerson) Re-enable this test if we re-enable the
// analysis.getReachableSources request.
- String fileA = newFile('/project/a.dart', content: 'import "b.dart";').path;
+ var fileA = newFile('/project/a.dart', content: 'import "b.dart";').path;
newFile('/project/b.dart');
server.setAnalysisRoots('0', ['/project/'], [], {});
@@ -316,7 +315,7 @@
Future<void> test_setRoots_packages() {
// prepare package
- String pkgFile = newFile('/packages/pkgA/libA.dart', content: '''
+ var pkgFile = newFile('/packages/pkgA/libA.dart', content: '''
library lib_a;
class A {}
''').path;
@@ -369,8 +368,7 @@
InstrumentationService.NULL_SERVICE);
handler = AnalysisDomainHandler(server);
// listen for notifications
- Stream<Notification> notificationStream =
- serverChannel.notificationController.stream;
+ var notificationStream = serverChannel.notificationController.stream;
notificationStream.listen((Notification notification) {
if (notification.event == ANALYSIS_NOTIFICATION_ERRORS) {
var decoded = AnalysisErrorsParams.fromNotification(notification);
@@ -401,7 +399,7 @@
}
files.add(file);
// set subscriptions
- Request request =
+ var request =
AnalysisSetSubscriptionsParams(analysisSubscriptions).toRequest('0');
handleSuccessfulRequest(request);
}
@@ -417,7 +415,7 @@
/// Creates an empty project `/project`.
void createEmptyProject() {
newFolder(projectPath);
- Request request =
+ var request =
AnalysisSetAnalysisRootsParams([projectPath], []).toRequest('0');
handleSuccessfulRequest(request);
}
@@ -428,7 +426,7 @@
testCode = _getCodeString(code);
newFolder(projectPath);
newFile(testFile, content: testCode);
- Request request =
+ var request =
AnalysisSetAnalysisRootsParams([projectPath], []).toRequest('0');
handleSuccessfulRequest(request);
}
@@ -436,7 +434,7 @@
/// Returns the offset of [search] in [testCode].
/// Fails if not found.
int findOffset(String search) {
- int offset = testCode.indexOf(search);
+ var offset = testCode.indexOf(search);
expect(offset, isNot(-1));
return offset;
}
@@ -444,7 +442,7 @@
/// Returns [AnalysisError]s recorded for the given [file].
/// May be empty, but not `null`.
List<AnalysisError> getErrors(String file) {
- List<AnalysisError> errors = filesErrors[file];
+ var errors = filesErrors[file];
if (errors != null) {
return errors;
}
@@ -454,7 +452,7 @@
/// Returns highlights recorded for the given [file].
/// May be empty, but not `null`.
List<HighlightRegion> getHighlights(String file) {
- List<HighlightRegion> highlights = filesHighlights[file];
+ var highlights = filesHighlights[file];
if (highlights != null) {
return highlights;
}
@@ -464,7 +462,7 @@
/// Returns navigation regions recorded for the given [file].
/// May be empty, but not `null`.
List<NavigationRegion> getNavigation(String file) {
- List<NavigationRegion> navigation = filesNavigation[file];
+ var navigation = filesNavigation[file];
if (navigation != null) {
return navigation;
}
@@ -491,13 +489,13 @@
/// Validates that the given [request] is handled successfully.
void handleSuccessfulRequest(Request request) {
- Response response = handler.handleRequest(request);
+ var response = handler.handleRequest(request);
expect(response, isResponseSuccess('0'));
}
/// Send an `updateContent` request for [testFile].
void sendContentChange(dynamic contentChange) {
- Request request =
+ var request =
AnalysisUpdateContentParams({testFile: contentChange}).toRequest('0');
handleSuccessfulRequest(request);
}
@@ -544,7 +542,7 @@
}
Future<void> test_afterAnalysis_noSuchFile() async {
- String file = convertPath('/no-such-file.dart');
+ var file = convertPath('/no-such-file.dart');
addTestFile('// no matter');
createProject();
// wait for analysis, no results initially
@@ -558,7 +556,7 @@
}
Future<void> test_afterAnalysis_packageFile_external() async {
- String pkgFile = newFile('/packages/pkgA/lib/libA.dart', content: '''
+ var pkgFile = newFile('/packages/pkgA/lib/libA.dart', content: '''
library lib_a;
class A {}
''').path;
@@ -582,9 +580,9 @@
}
Future<void> test_afterAnalysis_packageFile_inRoot() async {
- String pkgA = convertPath('/pkgA');
- String pkgB = convertPath('/pkgA');
- String pkgFileA = newFile('$pkgA/lib/libA.dart', content: '''
+ var pkgA = convertPath('/pkgA');
+ var pkgB = convertPath('/pkgA');
+ var pkgFileA = newFile('$pkgA/lib/libA.dart', content: '''
library lib_a;
class A {}
''').path;
@@ -609,7 +607,7 @@
}
Future<void> test_afterAnalysis_packageFile_notUsed() async {
- String pkgFile = newFile('/packages/pkgA/lib/libA.dart', content: '''
+ var pkgFile = newFile('/packages/pkgA/lib/libA.dart', content: '''
library lib_a;
class A {}
''').path;
@@ -630,7 +628,7 @@
}
Future<void> test_afterAnalysis_sdkFile() async {
- String file = convertPath('/sdk/lib/core/core.dart');
+ var file = convertPath('/sdk/lib/core/core.dart');
addTestFile('// no matter');
createProject();
// wait for analysis, no results initially
@@ -660,13 +658,11 @@
addAnalysisSubscription(AnalysisService.HIGHLIGHTS, testFile);
// wait for analysis
await waitForTasksFinished();
- plugin.AnalysisSetSubscriptionsParams params =
- pluginManager.analysisSetSubscriptionsParams;
+ var params = pluginManager.analysisSetSubscriptionsParams;
expect(params, isNotNull);
- Map<plugin.AnalysisService, List<String>> subscriptions =
- params.subscriptions;
+ var subscriptions = params.subscriptions;
expect(subscriptions, hasLength(1));
- List<String> files = subscriptions[plugin.AnalysisService.HIGHLIGHTS];
+ var files = subscriptions[plugin.AnalysisService.HIGHLIGHTS];
expect(files, [testFile]);
}
}
diff --git a/pkg/analysis_server/test/domain_completion_test.dart b/pkg/analysis_server/test/domain_completion_test.dart
index 804f730..0d7f152 100644
--- a/pkg/analysis_server/test/domain_completion_test.dart
+++ b/pkg/analysis_server/test/domain_completion_test.dart
@@ -4,7 +4,6 @@
import 'dart:async';
-import 'package:analysis_server/protocol/protocol.dart';
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analysis_server/src/plugin/plugin_manager.dart';
import 'package:analysis_server/src/provisional/completion/completion_core.dart';
@@ -290,24 +289,22 @@
c^''');
// Make a request for suggestions
- Request request1 =
- CompletionGetSuggestionsParams(testFile, completionOffset)
- .toRequest('7');
- Future<Response> responseFuture1 = waitResponse(request1);
+ var request1 = CompletionGetSuggestionsParams(testFile, completionOffset)
+ .toRequest('7');
+ var responseFuture1 = waitResponse(request1);
// Make another request before the first request completes
- Request request2 =
- CompletionGetSuggestionsParams(testFile, completionOffset)
- .toRequest('8');
- Future<Response> responseFuture2 = waitResponse(request2);
+ var request2 = CompletionGetSuggestionsParams(testFile, completionOffset)
+ .toRequest('8');
+ var responseFuture2 = waitResponse(request2);
// Await first response
- Response response1 = await responseFuture1;
+ var response1 = await responseFuture1;
var result1 = CompletionGetSuggestionsResult.fromResponse(response1);
assertValidId(result1.id);
// Await second response
- Response response2 = await responseFuture2;
+ var response2 = await responseFuture2;
var result2 = CompletionGetSuggestionsResult.fromResponse(response2);
assertValidId(result2.id);
@@ -335,9 +332,9 @@
c^''');
// Make a request for suggestions
- Request request = CompletionGetSuggestionsParams(testFile, completionOffset)
+ var request = CompletionGetSuggestionsParams(testFile, completionOffset)
.toRequest('0');
- Future<Response> responseFuture = waitResponse(request);
+ var responseFuture = waitResponse(request);
// Simulate user deleting text after request but before suggestions returned
server.updateContent('uc1', {testFile: AddContentOverlay(testCode)});
@@ -346,7 +343,7 @@
});
// Await a response
- Response response = await responseFuture;
+ var response = await responseFuture;
completionId = response.id;
assertValidId(completionId);
@@ -390,7 +387,7 @@
// Wait for analysis then edit the content
await waitForTasksFinished();
- String revisedContent = testCode.substring(0, completionOffset) +
+ var revisedContent = testCode.substring(0, completionOffset) +
'i' +
testCode.substring(completionOffset);
++completionOffset;
@@ -398,7 +395,7 @@
{testFile: AddContentOverlay(revisedContent)}).toRequest('add1'));
// Request code completion immediately after edit
- Response response = await waitResponse(
+ var response = await waitResponse(
CompletionGetSuggestionsParams(testFile, completionOffset)
.toRequest('0'));
completionId = response.id;
@@ -728,9 +725,9 @@
Future<void> test_offset_past_eof() async {
addTestFile('main() { }', offset: 300);
- Request request = CompletionGetSuggestionsParams(testFile, completionOffset)
+ var request = CompletionGetSuggestionsParams(testFile, completionOffset)
.toRequest('0');
- Response response = await waitResponse(request);
+ var response = await waitResponse(request);
expect(response.id, '0');
expect(response.error.code, RequestErrorCode.INVALID_PARAMETER);
}
@@ -802,9 +799,8 @@
}
''');
PluginInfo info = DiscoveredPluginInfo('a', 'b', 'c', null, null);
- plugin.CompletionGetSuggestionsResult result =
- plugin.CompletionGetSuggestionsResult(
- testFile.indexOf('^'), 0, <CompletionSuggestion>[
+ var result = plugin.CompletionGetSuggestionsResult(
+ testFile.indexOf('^'), 0, <CompletionSuggestion>[
CompletionSuggestion(CompletionSuggestionKind.IDENTIFIER,
DART_RELEVANCE_DEFAULT, 'plugin completion', 3, 0, false, false)
]);
@@ -867,8 +863,8 @@
void expectTokens(String content, List<TokenDetails> expectedTokens) async {
newFile(testFile, content: content);
- Request request = CompletionListTokenDetailsParams(testFile).toRequest('0');
- Response response = await waitResponse(request);
+ var request = CompletionListTokenDetailsParams(testFile).toRequest('0');
+ var response = await waitResponse(request);
List<Map<String, dynamic>> tokens = response.result['tokens'];
_compareTokens(tokens, expectedTokens);
}
@@ -1228,12 +1224,12 @@
void _compareTokens(List<Map<String, dynamic>> actualTokens,
List<TokenDetails> expectedTokens) {
- int length = expectedTokens.length;
+ var length = expectedTokens.length;
expect(actualTokens, hasLength(length));
- List<String> errors = [];
- for (int i = 0; i < length; i++) {
- Map<String, dynamic> actual = actualTokens[i];
- TokenDetails expected = expectedTokens[i];
+ var errors = <String>[];
+ for (var i = 0; i < length; i++) {
+ var actual = actualTokens[i];
+ var expected = expectedTokens[i];
if (actual['lexeme'] != expected.lexeme) {
errors.add('Lexeme at $i: '
'expected "${expected.lexeme}", '
@@ -1266,11 +1262,11 @@
} else if (expected == null) {
return true;
}
- int expectedLength = expected.length;
+ var expectedLength = expected.length;
if (actual.length != expectedLength) {
return true;
}
- for (int i = 0; i < expectedLength; i++) {
+ for (var i = 0; i < expectedLength; i++) {
if (actual[i] != expected[i]) {
return true;
}
diff --git a/pkg/analysis_server/test/domain_completion_util.dart b/pkg/analysis_server/test/domain_completion_util.dart
index c6f4ef4..424b3d0 100644
--- a/pkg/analysis_server/test/domain_completion_util.dart
+++ b/pkg/analysis_server/test/domain_completion_util.dart
@@ -34,7 +34,7 @@
return super.addTestFile(content);
}
expect(completionOffset, isNot(equals(-1)), reason: 'missing ^');
- int nextOffset = content.indexOf('^', completionOffset + 1);
+ var nextOffset = content.indexOf('^', completionOffset + 1);
expect(nextOffset, equals(-1), reason: 'too many ^');
return super.addTestFile(content.substring(0, completionOffset) +
content.substring(completionOffset + 1));
@@ -62,7 +62,7 @@
if (cs == null) {
var completions = suggestions.map((s) => s.completion).toList();
- String expectationText = '"$completion"';
+ var expectationText = '"$completion"';
if (elementKind != null) {
expectationText += ' ($elementKind)';
}
@@ -93,9 +93,9 @@
Future getSuggestions() async {
await waitForTasksFinished();
- Request request = CompletionGetSuggestionsParams(testFile, completionOffset)
+ var request = CompletionGetSuggestionsParams(testFile, completionOffset)
.toRequest('0');
- Response response = await waitResponse(request);
+ var response = await waitResponse(request);
var result = CompletionGetSuggestionsResult.fromResponse(response);
completionId = result.id;
assertValidId(completionId);
@@ -107,7 +107,7 @@
Future<void> processNotification(Notification notification) async {
if (notification.event == COMPLETION_RESULTS) {
var params = CompletionResultsParams.fromNotification(notification);
- String id = params.id;
+ var id = params.id;
assertValidId(id);
replacementOffset = params.replacementOffset;
replacementLength = params.replacementLength;
diff --git a/pkg/analysis_server/test/domain_diagnostic_test.dart b/pkg/analysis_server/test/domain_diagnostic_test.dart
index 41135d6..1bed1c5 100644
--- a/pkg/analysis_server/test/domain_diagnostic_test.dart
+++ b/pkg/analysis_server/test/domain_diagnostic_test.dart
@@ -39,7 +39,7 @@
expect(result.contexts, hasLength(1));
- ContextData context = result.contexts[0];
+ var context = result.contexts[0];
expect(context.name, convertPath('/project'));
expect(context.explicitFileCount, 1); /* test.dart */
diff --git a/pkg/analysis_server/test/domain_edit_dartfix_test.dart b/pkg/analysis_server/test/domain_edit_dartfix_test.dart
index c1b942b..c493bf4 100644
--- a/pkg/analysis_server/test/domain_edit_dartfix_test.dart
+++ b/pkg/analysis_server/test/domain_edit_dartfix_test.dart
@@ -32,7 +32,7 @@
void expectFileEdits(
String originalSource, SourceFileEdit fileEdit, String expectedSource) {
- String source = SourceEdit.applySequence(originalSource, fileEdit.edits);
+ var source = SourceEdit.applySequence(originalSource, fileEdit.edits);
expect(source, expectedSource);
}
@@ -87,7 +87,7 @@
}
''');
createProject();
- EditDartfixResult result = await performFix(
+ var result = await performFix(
includedFixes: ['prefer_if_elements_to_conditional_expressions']);
expect(result.suggestions.length, greaterThanOrEqualTo(1));
expect(result.hasErrors, isFalse);
@@ -137,7 +137,7 @@
}
''');
createProject();
- EditDartfixResult result = await performFix(
+ var result = await performFix(
includedFixes: ['wrong_number_of_type_arguments_constructor']);
expect(result.suggestions, hasLength(1));
expectSuggestion(result.suggestions[0], 'type arguments', 60, 8);
@@ -181,8 +181,7 @@
name: testnnbd
''');
createProject();
- EditDartfixResult result =
- await performFix(includedFixes: ['non-nullable']);
+ var result = await performFix(includedFixes: ['non-nullable']);
expect(result.suggestions.length, greaterThanOrEqualTo(1));
expect(result.hasErrors, isFalse);
expect(result.edits, hasLength(1));
@@ -195,7 +194,7 @@
}
Future<void> test_nonNullable_analysisOptions_experimentsAdded() async {
- String originalOptions = '''
+ var originalOptions = '''
analyzer:
something:
- other
@@ -205,8 +204,7 @@
''';
newFile('/project/analysis_options.yaml', content: originalOptions);
createProject();
- EditDartfixResult result =
- await performFix(includedFixes: ['non-nullable']);
+ var result = await performFix(includedFixes: ['non-nullable']);
expect(result.suggestions.length, greaterThanOrEqualTo(1));
expect(result.hasErrors, isFalse);
expect(result.edits, hasLength(1));
@@ -223,7 +221,7 @@
}
Future<void> test_nonNullable_analysisOptions_nnbdAdded() async {
- String originalOptions = '''
+ var originalOptions = '''
analyzer:
enable-experiment:
- other
@@ -232,8 +230,7 @@
''';
newFile('/project/analysis_options.yaml', content: originalOptions);
createProject();
- EditDartfixResult result =
- await performFix(includedFixes: ['non-nullable']);
+ var result = await performFix(includedFixes: ['non-nullable']);
expect(result.suggestions.length, greaterThanOrEqualTo(1));
expect(result.hasErrors, isFalse);
expect(result.edits, hasLength(1));
@@ -259,8 +256,7 @@
createProject();
// Assert dartfix suggestions
- EditDartfixResult result =
- await performFix(includedFixes: ['prefer_int_literals']);
+ var result = await performFix(includedFixes: ['prefer_int_literals']);
expect(result.suggestions, hasLength(1));
expectSuggestion(result.suggestions[0], 'int literal', 38, 4);
expectEdits(result.edits, '''
@@ -277,8 +273,7 @@
createProject();
// Assert dartfix suggestions
- EditDartfixResult result =
- await performFix(includedFixes: ['prefer_int_literals']);
+ var result = await performFix(includedFixes: ['prefer_int_literals']);
expect(result.suggestions, hasLength(1));
expectSuggestion(result.suggestions[0], 'int literal', 38, 4);
expectEdits(result.edits, '''
@@ -290,7 +285,7 @@
Future<void> test_pedantic() async {
addTestFile('main(List args) { if (args.length == 0) { } }');
createProject();
- EditDartfixResult result = await performFix(pedantic: true);
+ var result = await performFix(pedantic: true);
expect(result.suggestions, hasLength(1));
expectSuggestion(result.suggestions[0], "Replace with 'isEmpty'", 22, 16);
expect(result.hasErrors, isFalse);
@@ -301,7 +296,7 @@
// Add analysis options to enable ui as code
addTestFile('f({a: 1}) { }');
createProject();
- EditDartfixResult result =
+ var result =
await performFix(includedFixes: ['prefer_equal_for_default_values']);
expect(result.suggestions, hasLength(1));
expectSuggestion(result.suggestions[0], "Replace ':' with '='", 4, 1);
@@ -315,7 +310,7 @@
Map<int, int>.fromIterable([1, 2, 3], key: (i) => i, value: (i) => i * 2);
''');
createProject();
- EditDartfixResult result = await performFix(
+ var result = await performFix(
includedFixes: ['prefer_for_elements_to_map_fromIterable']);
expect(result.suggestions, hasLength(1));
expectSuggestion(
@@ -331,7 +326,7 @@
f(bool b) => ['a', b ? 'c' : 'd', 'e'];
''');
createProject();
- EditDartfixResult result = await performFix(
+ var result = await performFix(
includedFixes: ['prefer_if_elements_to_conditional_expressions']);
expect(result.suggestions, hasLength(1));
expectSuggestion(
@@ -346,8 +341,7 @@
const double myDouble = 42.0;
''');
createProject();
- EditDartfixResult result =
- await performFix(includedFixes: ['prefer_int_literals']);
+ var result = await performFix(includedFixes: ['prefer_int_literals']);
expect(result.suggestions, hasLength(1));
expectSuggestion(result.suggestions[0], 'int literal', 24, 4);
expectEdits(result.edits, '''
@@ -358,8 +352,7 @@
Future<void> test_preferIsEmpty() async {
addTestFile('main(List<String> args) { if (args.length == 0) { } }');
createProject();
- EditDartfixResult result =
- await performFix(includedFixes: ['prefer_is_empty']);
+ var result = await performFix(includedFixes: ['prefer_is_empty']);
expect(result.suggestions, hasLength(1));
expectSuggestion(result.suggestions[0], "Replace with 'isEmpty'", 30, 16);
expect(result.hasErrors, isFalse);
@@ -374,8 +367,7 @@
class C with B {}
''');
createProject();
- EditDartfixResult result =
- await performFix(includedFixes: ['convert_class_to_mixin']);
+ var result = await performFix(includedFixes: ['convert_class_to_mixin']);
expect(result.suggestions, hasLength(1));
expectSuggestion(result.suggestions[0], 'mixin', 17, 1);
expectEdits(result.edits, '''
@@ -396,8 +388,7 @@
];
''');
createProject();
- EditDartfixResult result =
- await performFix(includedFixes: ['prefer_single_quotes']);
+ var result = await performFix(includedFixes: ['prefer_single_quotes']);
expect(result.suggestions, hasLength(2));
expectSuggestion(
result.suggestions[0], 'Convert to single quoted string', 12, 5);
@@ -421,8 +412,7 @@
var l2 = ['a']..addAll(l1);
''');
createProject();
- EditDartfixResult result =
- await performFix(includedFixes: ['prefer_spread_collections']);
+ var result = await performFix(includedFixes: ['prefer_spread_collections']);
expect(result.suggestions.length, greaterThanOrEqualTo(1));
expect(result.hasErrors, isFalse);
expectEdits(result.edits, '''
diff --git a/pkg/analysis_server/test/domain_execution_test.dart b/pkg/analysis_server/test/domain_execution_test.dart
index c439ee55..8532220 100644
--- a/pkg/analysis_server/test/domain_execution_test.dart
+++ b/pkg/analysis_server/test/domain_execution_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/protocol/protocol.dart';
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analysis_server/src/analysis_server.dart';
import 'package:analysis_server/src/domain_execution.dart';
@@ -23,7 +22,7 @@
defineReflectiveTests(ExecutionDomainTest);
});
group('ExecutionDomainHandler', () {
- MemoryResourceProvider provider = MemoryResourceProvider();
+ var provider = MemoryResourceProvider();
AnalysisServer server;
ExecutionDomainHandler handler;
@@ -40,19 +39,17 @@
group('createContext/deleteContext', () {
test('create/delete multiple contexts', () {
- Request request =
- ExecutionCreateContextParams('/a/b.dart').toRequest('0');
- Response response = handler.handleRequest(request);
+ var request = ExecutionCreateContextParams('/a/b.dart').toRequest('0');
+ var response = handler.handleRequest(request);
expect(response, isResponseSuccess('0'));
- ExecutionCreateContextResult result =
- ExecutionCreateContextResult.fromResponse(response);
- String id0 = result.id;
+ var result = ExecutionCreateContextResult.fromResponse(response);
+ var id0 = result.id;
request = ExecutionCreateContextParams('/c/d.dart').toRequest('1');
response = handler.handleRequest(request);
expect(response, isResponseSuccess('1'));
result = ExecutionCreateContextResult.fromResponse(response);
- String id1 = result.id;
+ var id1 = result.id;
expect(id0 == id1, isFalse);
@@ -66,8 +63,8 @@
});
test('delete non-existent context', () {
- Request request = ExecutionDeleteContextParams('13').toRequest('0');
- Response response = handler.handleRequest(request);
+ var request = ExecutionDeleteContextParams('13').toRequest('0');
+ var response = handler.handleRequest(request);
// TODO(brianwilkerson) It isn't currently specified to be an error if a
// client attempts to delete a context that doesn't exist. Should it be?
// expect(response, isResponseFailure('0'));
@@ -190,16 +187,16 @@
}
''';
- String path = newFile('/test.dart').path;
+ var path = newFile('/test.dart').path;
newFile(path, content: code);
- Request request = ExecutionGetSuggestionsParams(
+ var request = ExecutionGetSuggestionsParams(
'a.',
2,
path,
code.indexOf('// context line'),
<RuntimeCompletionVariable>[]).toRequest('0');
- Response response = await waitResponse(request);
+ var response = await waitResponse(request);
var result = ExecutionGetSuggestionsResult.fromResponse(response);
// expect(result.suggestions, isNotEmpty);
@@ -215,50 +212,49 @@
}
void test_mapUri_file() {
- String path = newFile('/a/b.dart').path;
+ var path = newFile('/a/b.dart').path;
// map the file
- ExecutionMapUriResult result = _mapUri(file: path);
+ var result = _mapUri(file: path);
expect(result.file, isNull);
expect(result.uri, Uri.file(path).toString());
}
void test_mapUri_file_dartUriKind() {
- String path = server.findSdk().mapDartUri('dart:async').fullName;
+ var path = server.findSdk().mapDartUri('dart:async').fullName;
// hack - pretend that the SDK file exists in the project FS
newFile(path, content: '// hack');
// map file
- ExecutionMapUriResult result = _mapUri(file: path);
+ var result = _mapUri(file: path);
expect(result.file, isNull);
expect(result.uri, 'dart:async');
}
void test_mapUri_uri() {
- String path = newFile('/a/b.dart').path;
+ var path = newFile('/a/b.dart').path;
// map the uri
- ExecutionMapUriResult result = _mapUri(uri: Uri.file(path).toString());
+ var result = _mapUri(uri: Uri.file(path).toString());
expect(result.file, convertPath('/a/b.dart'));
expect(result.uri, isNull);
}
void _createExecutionContext(String path) {
- Request request = ExecutionCreateContextParams(path).toRequest('0');
- Response response = handler.handleRequest(request);
+ var request = ExecutionCreateContextParams(path).toRequest('0');
+ var response = handler.handleRequest(request);
expect(response, isResponseSuccess('0'));
- ExecutionCreateContextResult result =
- ExecutionCreateContextResult.fromResponse(response);
+ var result = ExecutionCreateContextResult.fromResponse(response);
contextId = result.id;
}
void _disposeExecutionContext() {
- Request request = ExecutionDeleteContextParams(contextId).toRequest('1');
- Response response = handler.handleRequest(request);
+ var request = ExecutionDeleteContextParams(contextId).toRequest('1');
+ var response = handler.handleRequest(request);
expect(response, isResponseSuccess('1'));
}
ExecutionMapUriResult _mapUri({String file, String uri}) {
- Request request =
+ var request =
ExecutionMapUriParams(contextId, file: file, uri: uri).toRequest('2');
- Response response = handler.handleRequest(request);
+ var response = handler.handleRequest(request);
expect(response, isResponseSuccess('2'));
return ExecutionMapUriResult.fromResponse(response);
}
diff --git a/pkg/analysis_server/test/domain_server_test.dart b/pkg/analysis_server/test/domain_server_test.dart
index 9447a19..cb73ed3 100644
--- a/pkg/analysis_server/test/domain_server_test.dart
+++ b/pkg/analysis_server/test/domain_server_test.dart
@@ -49,7 +49,7 @@
group('setSubscriptions', () {
test('invalid service name', () {
- Request request = Request('0', SERVER_REQUEST_SET_SUBSCRIPTIONS, {
+ var request = Request('0', SERVER_REQUEST_SET_SUBSCRIPTIONS, {
SUBSCRIPTIONS: ['noSuchService']
});
var response = handler.handleRequest(request);
@@ -59,7 +59,7 @@
test('success', () {
expect(server.serverServices, isEmpty);
// send request
- Request request =
+ var request =
ServerSetSubscriptionsParams([ServerService.STATUS]).toRequest('0');
var response = handler.handleRequest(request);
expect(response, isResponseSuccess('0'));
diff --git a/pkg/analysis_server/test/edit/assists_test.dart b/pkg/analysis_server/test/edit/assists_test.dart
index aec8477..5db8580 100644
--- a/pkg/analysis_server/test/edit/assists_test.dart
+++ b/pkg/analysis_server/test/edit/assists_test.dart
@@ -4,7 +4,6 @@
import 'dart:async';
-import 'package:analysis_server/protocol/protocol.dart';
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analysis_server/src/edit/edit_domain.dart';
import 'package:analysis_server/src/plugin/plugin_manager.dart';
@@ -29,14 +28,13 @@
List<SourceChange> changes;
Future<void> prepareAssists(String search, [int length = 0]) async {
- int offset = findOffset(search);
+ var offset = findOffset(search);
await prepareAssistsAt(offset, length);
}
Future<void> prepareAssistsAt(int offset, int length) async {
- Request request =
- EditGetAssistsParams(testFile, offset, length).toRequest('0');
- Response response = await waitResponse(request);
+ var request = EditGetAssistsParams(testFile, offset, length).toRequest('0');
+ var response = await waitResponse(request);
var result = EditGetAssistsResult.fromResponse(response);
changes = result.assists;
}
@@ -50,13 +48,13 @@
Future<void> test_fromPlugins() async {
PluginInfo info = DiscoveredPluginInfo('a', 'b', 'c', null, null);
- String message = 'From a plugin';
- plugin.PrioritizedSourceChange change = plugin.PrioritizedSourceChange(
+ var message = 'From a plugin';
+ var change = plugin.PrioritizedSourceChange(
5,
SourceChange(message, edits: <SourceFileEdit>[
SourceFileEdit('', 0, edits: <SourceEdit>[SourceEdit(0, 0, 'x')])
]));
- plugin.EditGetAssistsResult result =
+ var result =
plugin.EditGetAssistsResult(<plugin.PrioritizedSourceChange>[change]);
pluginManager.broadcastResults = <PluginInfo, Future<plugin.Response>>{
info: Future.value(result.toResponse('-', 1))
@@ -127,8 +125,8 @@
}
''');
await waitForTasksFinished();
- int offset = findOffset(' print(1)');
- int length = findOffset('}') - offset;
+ var offset = findOffset(' print(1)');
+ var length = findOffset('}') - offset;
await prepareAssistsAt(offset, length);
_assertHasChange("Surround with 'if'", '''
main() {
@@ -141,9 +139,9 @@
}
void _assertHasChange(String message, String expectedCode) {
- for (SourceChange change in changes) {
+ for (var change in changes) {
if (change.message == message) {
- String resultCode =
+ var resultCode =
SourceEdit.applySequence(testCode, change.edits[0].edits);
expect(resultCode, expectedCode);
return;
diff --git a/pkg/analysis_server/test/edit/fixes_test.dart b/pkg/analysis_server/test/edit/fixes_test.dart
index cf10976..738501c 100644
--- a/pkg/analysis_server/test/edit/fixes_test.dart
+++ b/pkg/analysis_server/test/edit/fixes_test.dart
@@ -4,7 +4,6 @@
import 'dart:async';
-import 'package:analysis_server/protocol/protocol.dart';
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analysis_server/src/edit/edit_domain.dart';
import 'package:analysis_server/src/plugin/plugin_manager.dart';
@@ -42,10 +41,9 @@
''');
await waitForTasksFinished();
doAllDeclarationsTrackerWork();
- List<AnalysisErrorFixes> errorFixes =
- await _getFixesAt('Completer<String>');
+ var errorFixes = await _getFixesAt('Completer<String>');
expect(errorFixes, hasLength(1));
- List<SourceChange> fixes = errorFixes[0].fixes;
+ var fixes = errorFixes[0].fixes;
expect(fixes, hasLength(3));
expect(fixes[0].message, matches('Import library'));
expect(fixes[1].message, matches('Create class'));
@@ -54,14 +52,13 @@
Future<void> test_fromPlugins() async {
PluginInfo info = DiscoveredPluginInfo('a', 'b', 'c', null, null);
- plugin.AnalysisErrorFixes fixes = plugin.AnalysisErrorFixes(AnalysisError(
+ var fixes = plugin.AnalysisErrorFixes(AnalysisError(
AnalysisErrorSeverity.ERROR,
AnalysisErrorType.HINT,
Location('', 0, 0, 0, 0),
'message',
'code'));
- plugin.EditGetFixesResult result =
- plugin.EditGetFixesResult(<plugin.AnalysisErrorFixes>[fixes]);
+ var result = plugin.EditGetFixesResult(<plugin.AnalysisErrorFixes>[fixes]);
pluginManager.broadcastResults = <PluginInfo, Future<plugin.Response>>{
info: Future.value(result.toResponse('-', 1))
};
@@ -69,7 +66,7 @@
createProject();
addTestFile('main() {}');
await waitForTasksFinished();
- List<AnalysisErrorFixes> errorFixes = await _getFixesAt('in(');
+ var errorFixes = await _getFixesAt('in(');
expect(errorFixes, hasLength(1));
}
@@ -86,13 +83,13 @@
await waitForTasksFinished();
// print(1)
{
- List<AnalysisErrorFixes> errorFixes = await _getFixesAt('print(1)');
+ var errorFixes = await _getFixesAt('print(1)');
expect(errorFixes, hasLength(1));
_isSyntacticErrorWithSingleFix(errorFixes[0]);
}
// print(10)
{
- List<AnalysisErrorFixes> errorFixes = await _getFixesAt('print(10)');
+ var errorFixes = await _getFixesAt('print(10)');
expect(errorFixes, hasLength(2));
_isSyntacticErrorWithSingleFix(errorFixes[0]);
_isSyntacticErrorWithSingleFix(errorFixes[1]);
@@ -128,7 +125,7 @@
_addOverlay(testFile, testCode);
// ask for fixes
await waitForTasksFinished();
- List<AnalysisErrorFixes> errorFixes = await _getFixesAt('print(1)');
+ var errorFixes = await _getFixesAt('print(1)');
expect(errorFixes, hasLength(1));
_isSyntacticErrorWithSingleFix(errorFixes[0]);
}
@@ -165,7 +162,7 @@
await waitForTasksFinished();
doAllDeclarationsTrackerWork();
- List<String> fixes = (await _getFixesAt('Foo()'))
+ var fixes = (await _getFixesAt('Foo()'))
.single
.fixes
.map((f) => f.message)
@@ -180,26 +177,26 @@
}
void _addOverlay(String name, String contents) {
- Request request =
+ var request =
AnalysisUpdateContentParams({name: AddContentOverlay(contents)})
.toRequest('0');
handleSuccessfulRequest(request, handler: analysisHandler);
}
Future<List<AnalysisErrorFixes>> _getFixes(int offset) async {
- Request request = EditGetFixesParams(testFile, offset).toRequest('0');
- Response response = await waitResponse(request);
+ var request = EditGetFixesParams(testFile, offset).toRequest('0');
+ var response = await waitResponse(request);
var result = EditGetFixesResult.fromResponse(response);
return result.fixes;
}
Future<List<AnalysisErrorFixes>> _getFixesAt(String search) async {
- int offset = findOffset(search);
+ var offset = findOffset(search);
return await _getFixes(offset);
}
void _isSyntacticErrorWithSingleFix(AnalysisErrorFixes fixes) {
- AnalysisError error = fixes.error;
+ var error = fixes.error;
expect(error.severity, AnalysisErrorSeverity.ERROR);
expect(error.type, AnalysisErrorType.SYNTACTIC_ERROR);
expect(fixes.fixes, hasLength(1));
diff --git a/pkg/analysis_server/test/edit/format_test.dart b/pkg/analysis_server/test/edit/format_test.dart
index 82fccdc..8759121 100644
--- a/pkg/analysis_server/test/edit/format_test.dart
+++ b/pkg/analysis_server/test/edit/format_test.dart
@@ -4,10 +4,8 @@
import 'dart:async';
-import 'package:analysis_server/protocol/protocol.dart';
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analysis_server/src/edit/edit_domain.dart';
-import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -30,14 +28,14 @@
}
Future test_format_longLine() {
- String content = '''
+ var content = '''
fun(firstParam, secondParam, thirdParam, fourthParam) {
if (firstParam.noNull && secondParam.noNull && thirdParam.noNull && fourthParam.noNull) {}
}
''';
addTestFile(content);
return waitForTasksFinished().then((_) {
- EditFormatResult formatResult = _formatAt(0, 3, lineLength: 100);
+ var formatResult = _formatAt(0, 3, lineLength: 100);
expect(formatResult.edits, isNotNull);
expect(formatResult.edits, hasLength(0));
@@ -55,7 +53,7 @@
}
''');
return waitForTasksFinished().then((_) {
- EditFormatResult formatResult = _formatAt(0, 3);
+ var formatResult = _formatAt(0, 3);
expect(formatResult.edits, isNotNull);
expect(formatResult.edits, hasLength(0));
});
@@ -66,12 +64,12 @@
main() { int x = 3; }
''');
await waitForTasksFinished();
- EditFormatResult formatResult = _formatAt(0, 0);
+ var formatResult = _formatAt(0, 0);
expect(formatResult.edits, isNotNull);
expect(formatResult.edits, hasLength(1));
- SourceEdit edit = formatResult.edits[0];
+ var edit = formatResult.edits[0];
expect(edit.replacement, equals('''
main() {
int x = 3;
@@ -86,12 +84,12 @@
main() { int x = 3; }
''');
return waitForTasksFinished().then((_) {
- EditFormatResult formatResult = _formatAt(0, 3);
+ var formatResult = _formatAt(0, 3);
expect(formatResult.edits, isNotNull);
expect(formatResult.edits, hasLength(1));
- SourceEdit edit = formatResult.edits[0];
+ var edit = formatResult.edits[0];
expect(edit.replacement, equals('''
main() {
int x = 3;
@@ -107,19 +105,18 @@
main() { int x =
''');
return waitForTasksFinished().then((_) {
- Request request = EditFormatParams(testFile, 0, 3).toRequest('0');
- Response response = handler.handleRequest(request);
+ var request = EditFormatParams(testFile, 0, 3).toRequest('0');
+ var response = handler.handleRequest(request);
expect(response, isResponseFailure('0'));
});
}
EditFormatResult _formatAt(int selectionOffset, int selectionLength,
{int lineLength}) {
- Request request = EditFormatParams(
- testFile, selectionOffset, selectionLength,
+ var request = EditFormatParams(testFile, selectionOffset, selectionLength,
lineLength: lineLength)
.toRequest('0');
- Response response = handleSuccessfulRequest(request);
+ var response = handleSuccessfulRequest(request);
return EditFormatResult.fromResponse(response);
}
}
diff --git a/pkg/analysis_server/test/edit/organize_directives_test.dart b/pkg/analysis_server/test/edit/organize_directives_test.dart
index f565197..dff0f63 100644
--- a/pkg/analysis_server/test/edit/organize_directives_test.dart
+++ b/pkg/analysis_server/test/edit/organize_directives_test.dart
@@ -4,7 +4,6 @@
import 'dart:async';
-import 'package:analysis_server/protocol/protocol.dart';
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analysis_server/src/edit/edit_domain.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
@@ -34,10 +33,10 @@
@failingTest
Future test_BAD_doesNotExist() async {
// The analysis driver fails to return an error
- Request request =
+ var request =
EditOrganizeDirectivesParams(convertPath('/no/such/file.dart'))
.toRequest('0');
- Response response = await waitResponse(request);
+ var response = await waitResponse(request);
expect(
response, isResponseFailure('0', RequestErrorCode.FILE_NOT_ANALYZED));
}
@@ -48,17 +47,17 @@
main() {}
''');
- Request request = EditOrganizeDirectivesParams(testFile).toRequest('0');
- Response response = await waitResponse(request);
+ var request = EditOrganizeDirectivesParams(testFile).toRequest('0');
+ var response = await waitResponse(request);
expect(response,
isResponseFailure('0', RequestErrorCode.ORGANIZE_DIRECTIVES_ERROR));
}
Future test_BAD_notDartFile() async {
- Request request = EditOrganizeDirectivesParams(
+ var request = EditOrganizeDirectivesParams(
convertPath('/not-a-Dart-file.txt'),
).toRequest('0');
- Response response = await waitResponse(request);
+ var response = await waitResponse(request);
expect(
response, isResponseFailure('0', RequestErrorCode.FILE_NOT_ANALYZED));
}
@@ -150,13 +149,13 @@
Future _assertOrganized(String expectedCode) async {
await _requestOrganize();
- String resultCode = SourceEdit.applySequence(testCode, fileEdit.edits);
+ var resultCode = SourceEdit.applySequence(testCode, fileEdit.edits);
expect(resultCode, expectedCode);
}
Future _requestOrganize() async {
- Request request = EditOrganizeDirectivesParams(testFile).toRequest('0');
- Response response = await waitResponse(request);
+ var request = EditOrganizeDirectivesParams(testFile).toRequest('0');
+ var response = await waitResponse(request);
var result = EditOrganizeDirectivesResult.fromResponse(response);
fileEdit = result.edit;
}
diff --git a/pkg/analysis_server/test/edit/postfix_completion_test.dart b/pkg/analysis_server/test/edit/postfix_completion_test.dart
index 21bafc6..fdd4948 100644
--- a/pkg/analysis_server/test/edit/postfix_completion_test.dart
+++ b/pkg/analysis_server/test/edit/postfix_completion_test.dart
@@ -70,7 +70,7 @@
void _assertHasChange(String message, String expectedCode, [Function cmp]) {
if (change.message == message) {
if (change.edits.isNotEmpty) {
- String resultCode =
+ var resultCode =
SourceEdit.applySequence(testCode, change.edits[0].edits);
expect(resultCode, expectedCode.replaceAll('/*caret*/', ''));
if (cmp != null) {
@@ -90,8 +90,8 @@
Future<void> _prepareCompletion(String key,
{bool atStart = false, bool atEnd = false, int delta = 0}) async {
- int offset = findOffset(key);
- String src = testCode.replaceFirst(key, '', offset);
+ var offset = findOffset(key);
+ var src = testCode.replaceFirst(key, '', offset);
modifyTestFile(src);
await _prepareCompletionAt(offset, key);
}
@@ -100,7 +100,7 @@
var params = EditGetPostfixCompletionParams(testFile, key, offset);
var request =
Request('0', 'edit.isPostfixCompletionApplicable', params.toJson());
- Response response = await waitResponse(request, throwOnError: false);
+ var response = await waitResponse(request, throwOnError: false);
var isApplicable =
EditIsPostfixCompletionApplicableResult.fromResponse(response);
if (!isApplicable.value) {
diff --git a/pkg/analysis_server/test/edit/refactoring_test.dart b/pkg/analysis_server/test/edit/refactoring_test.dart
index 1f1e01d..4ae3ed16 100644
--- a/pkg/analysis_server/test/edit/refactoring_test.dart
+++ b/pkg/analysis_server/test/edit/refactoring_test.dart
@@ -122,7 +122,7 @@
}
Future<Response> _sendConvertRequest(String search) {
- Request request = EditGetRefactoringParams(
+ var request = EditGetRefactoringParams(
RefactoringKind.CONVERT_GETTER_TO_METHOD,
testFile,
findOffset(search),
@@ -234,7 +234,7 @@
}
Future<Response> _sendConvertRequest(String search) {
- Request request = EditGetRefactoringParams(
+ var request = EditGetRefactoringParams(
RefactoringKind.CONVERT_METHOD_TO_GETTER,
testFile,
findOffset(search),
@@ -249,23 +249,23 @@
class ExtractLocalVariableTest extends _AbstractGetRefactoring_Test {
Future<Response> sendExtractRequest(
int offset, int length, String name, bool extractAll) {
- RefactoringKind kind = RefactoringKind.EXTRACT_LOCAL_VARIABLE;
- ExtractLocalVariableOptions options =
+ var kind = RefactoringKind.EXTRACT_LOCAL_VARIABLE;
+ var options =
name != null ? ExtractLocalVariableOptions(name, extractAll) : null;
return sendRequest(kind, offset, length, options, false);
}
Future<Response> sendStringRequest(
String search, String name, bool extractAll) {
- int offset = findOffset(search);
- int length = search.length;
+ var offset = findOffset(search);
+ var length = search.length;
return sendExtractRequest(offset, length, name, extractAll);
}
Future<Response> sendStringSuffixRequest(
String search, String suffix, String name, bool extractAll) {
- int offset = findOffset(search + suffix);
- int length = search.length;
+ var offset = findOffset(search + suffix);
+ var length = search.length;
return sendExtractRequest(offset, length, name, extractAll);
}
@@ -289,7 +289,7 @@
}
''');
// Start refactoring.
- EditGetRefactoringResult result = await getRefactoringResult(() {
+ var result = await getRefactoringResult(() {
return sendStringRequest('1 + 2', 'res', true);
});
// We get the refactoring feedback....
@@ -387,7 +387,7 @@
var a = getSelectedItem();
}
''');
- EditGetRefactoringResult result = await getRefactoringResult(() {
+ var result = await getRefactoringResult(() {
return sendStringSuffixRequest('getSelectedItem()', ';', null, true);
});
ExtractLocalVariableFeedback feedback = result.feedback;
@@ -402,7 +402,7 @@
print(1 + 2);
}
''');
- EditGetRefactoringResult result = await getRefactoringResult(() {
+ var result = await getRefactoringResult(() {
return sendStringRequest('1 + 2', 'Name', true);
});
assertResultProblemsWarning(result.optionsProblems,
@@ -443,7 +443,7 @@
await getRefactoringResult(() {
return sendStringRequest('1 + 2', 'res', true);
});
- int initialResetCount = test_resetCount;
+ var initialResetCount = test_resetCount;
doUpdate();
await pumpEventQueue();
expect(test_resetCount, initialResetCount + 1);
@@ -477,7 +477,7 @@
}
Future<void> test_resetOnAnalysisSetChanged_watch_otherFile() async {
- String otherFile = join(testFolder, 'other.dart');
+ var otherFile = join(testFolder, 'other.dart');
newFile(otherFile, content: '// other 1');
addTestFile('''
main() {
@@ -487,13 +487,13 @@
''');
// Send the first request.
{
- EditGetRefactoringResult result = await getRefactoringResult(() {
+ var result = await getRefactoringResult(() {
return sendStringRequest('1 + 2', 'res', true);
});
ExtractLocalVariableFeedback feedback = result.feedback;
expect(feedback.names, contains('myName'));
}
- int initialResetCount = test_resetCount;
+ var initialResetCount = test_resetCount;
// Update the other.dart file.
// The refactoring is reset, even though it's a different file. It is up to
// analyzer to track dependencies and provide resolved units fast when
@@ -512,13 +512,13 @@
''');
// Send the first request.
{
- EditGetRefactoringResult result = await getRefactoringResult(() {
+ var result = await getRefactoringResult(() {
return sendStringRequest('1 + 2', 'res', true);
});
ExtractLocalVariableFeedback feedback = result.feedback;
expect(feedback.names, contains('myName'));
}
- int initialResetCount = test_resetCount;
+ var initialResetCount = test_resetCount;
// Update the test.dart file.
modifyTestFile('''
main() {
@@ -531,7 +531,7 @@
expect(test_resetCount, initialResetCount + 1);
// Send the second request, with the same kind, file and offset.
{
- EditGetRefactoringResult result = await getRefactoringResult(() {
+ var result = await getRefactoringResult(() {
return sendStringRequest('1 + 2', 'res', true);
});
ExtractLocalVariableFeedback feedback = result.feedback;
@@ -645,7 +645,7 @@
_setOffsetLengthForString('a + b');
return getRefactoringResult(_computeChange).then((result) {
ExtractMethodFeedback feedback = result.feedback;
- List<RefactoringMethodParameter> parameters = feedback.parameters;
+ var parameters = feedback.parameters;
parameters[0].name = 'aaa';
parameters[1].name = 'bbb';
parameters[1].type = 'num';
@@ -774,7 +774,7 @@
Future<ExtractMethodFeedback> _computeInitialFeedback() async {
await waitForTasksFinished();
- Response response = await _sendExtractRequest();
+ var response = await _sendExtractRequest();
var result = EditGetRefactoringResult.fromResponse(response);
return result.feedback;
}
@@ -795,7 +795,7 @@
}
Future<Response> _sendExtractRequest() {
- RefactoringKind kind = RefactoringKind.EXTRACT_METHOD;
+ var kind = RefactoringKind.EXTRACT_METHOD;
return sendRequest(kind, offset, length, options, false);
}
@@ -830,7 +830,7 @@
await waitForTasksFinished();
await getRefactoringsAtString(search);
// verify
- Matcher matcher = contains(kind);
+ var matcher = contains(kind);
if (!expected) {
matcher = isNot(matcher);
}
@@ -845,9 +845,8 @@
/// Returns the list of available refactorings for the given [offset] and
/// [length].
Future getRefactorings(int offset, int length) async {
- Request request =
- EditGetAvailableRefactoringsParams(testFile, offset, length)
- .toRequest('0');
+ var request = EditGetAvailableRefactoringsParams(testFile, offset, length)
+ .toRequest('0');
serverChannel.sendRequest(request);
var response = await serverChannel.waitForResponse(request);
var result = EditGetAvailableRefactoringsResult.fromResponse(response);
@@ -856,12 +855,12 @@
/// Returns the list of available refactorings at the offset of [search].
Future getRefactoringsAtString(String search) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
return getRefactorings(offset, 0);
}
Future getRefactoringsForString(String search) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
return getRefactorings(offset, search.length);
}
@@ -1062,7 +1061,7 @@
class InlineLocalTest extends _AbstractGetRefactoring_Test {
Future<void> test_analysis_onlyOneFile() async {
shouldWaitForFullAnalysis = false;
- String otherFile = join(testFolder, 'other.dart');
+ var otherFile = join(testFolder, 'other.dart');
newFile(otherFile, content: r'''
foo(int p) {}
''');
@@ -1075,7 +1074,7 @@
}
''');
// Start refactoring.
- EditGetRefactoringResult result = await getRefactoringResult(() {
+ var result = await getRefactoringResult(() {
return _sendInlineRequest('res =');
});
// We get the refactoring feedback....
@@ -1142,7 +1141,7 @@
await getRefactoringResult(() {
return _sendInlineRequest('res = ');
});
- int initialResetCount = test_resetCount;
+ var initialResetCount = test_resetCount;
// Update the test.dart file.
modifyTestFile('''
main() {
@@ -1155,7 +1154,7 @@
}
Future<Response> _sendInlineRequest(String search) {
- Request request = EditGetRefactoringParams(
+ var request = EditGetRefactoringParams(
RefactoringKind.INLINE_LOCAL_VARIABLE,
testFile,
findOffset(search),
@@ -1280,7 +1279,7 @@
}
Future<Response> _sendInlineRequest(String search) {
- Request request = EditGetRefactoringParams(RefactoringKind.INLINE_METHOD,
+ var request = EditGetRefactoringParams(RefactoringKind.INLINE_METHOD,
testFile, findOffset(search), 0, false,
options: options)
.toRequest('0');
@@ -1310,7 +1309,7 @@
}
Future<Response> _sendMoveRequest() {
- Request request = EditGetRefactoringParams(
+ var request = EditGetRefactoringParams(
RefactoringKind.MOVE_FILE, testFile, 0, 0, false,
options: options)
.toRequest('0');
@@ -1326,8 +1325,8 @@
class RenameTest extends _AbstractGetRefactoring_Test {
Future<Response> sendRenameRequest(String search, String newName,
{String id = '0', bool validateOnly = false}) {
- RenameOptions options = newName != null ? RenameOptions(newName) : null;
- Request request = EditGetRefactoringParams(RefactoringKind.RENAME, testFile,
+ var options = newName != null ? RenameOptions(newName) : null;
+ var request = EditGetRefactoringParams(RefactoringKind.RENAME, testFile,
findOffset(search), 0, validateOnly,
options: options)
.toRequest(id);
@@ -1350,11 +1349,11 @@
}
''');
// send the "1" request, but don't wait for it
- Future<Response> futureA = sendRenameRequest('test =', 'nameA', id: '1');
+ var futureA = sendRenameRequest('test =', 'nameA', id: '1');
// send the "2" request and wait for it
- Response responseB = await sendRenameRequest('test =', 'nameB', id: '2');
+ var responseB = await sendRenameRequest('test =', 'nameB', id: '2');
// wait for the (delayed) "1" response
- Response responseA = await futureA;
+ var responseA = await futureA;
// "1" was cancelled
// "2" is successful
expect(responseA,
@@ -1737,12 +1736,12 @@
}).then((result) {
assertResultProblemsOK(result);
// prepare potential edit ID
- List<String> potentialIds = result.potentialEdits;
+ var potentialIds = result.potentialEdits;
expect(potentialIds, hasLength(1));
- String potentialId = potentialIds[0];
+ var potentialId = potentialIds[0];
// find potential edit
- SourceChange change = result.change;
- SourceEdit potentialEdit = _findEditWithId(change, potentialId);
+ var change = result.change;
+ var potentialEdit = _findEditWithId(change, potentialId);
expect(potentialEdit, isNotNull);
expect(potentialEdit.offset, findOffset('test(); // a2'));
expect(potentialEdit.length, 4);
@@ -2058,7 +2057,7 @@
return getRefactoringResult(() {
return sendRenameRequest('test = 0', 'newName');
}).then((result) {
- List<RefactoringProblem> problems = result.finalProblems;
+ var problems = result.finalProblems;
expect(problems, hasLength(1));
assertResultProblemsError(
problems, "Duplicate local variable 'newName'.");
@@ -2118,7 +2117,7 @@
}
''');
// send the first request
- EditGetRefactoringResult result = await getRefactoringResult(() {
+ var result = await getRefactoringResult(() {
return sendRenameRequest('initialName =', 'newName', validateOnly: true);
});
_validateFeedback(result, oldName: 'initialName');
@@ -2173,7 +2172,7 @@
/// Asserts that [problems] has a single ERROR problem.
void assertResultProblemsError(List<RefactoringProblem> problems,
[String message]) {
- RefactoringProblem problem = problems[0];
+ var problem = problems[0];
expect(problem.severity, RefactoringProblemSeverity.ERROR,
reason: problem.toString());
if (message != null) {
@@ -2184,7 +2183,7 @@
/// Asserts that [result] has a single FATAL problem.
void assertResultProblemsFatal(List<RefactoringProblem> problems,
[String message]) {
- RefactoringProblem problem = problems[0];
+ var problem = problems[0];
expect(problems, hasLength(1));
expect(problem.severity, RefactoringProblemSeverity.FATAL,
reason: problem.toString());
@@ -2203,7 +2202,7 @@
/// Asserts that [result] has a single WARNING problem.
void assertResultProblemsWarning(List<RefactoringProblem> problems,
[String message]) {
- RefactoringProblem problem = problems[0];
+ var problem = problems[0];
expect(problems, hasLength(1));
expect(problem.severity, RefactoringProblemSeverity.WARNING,
reason: problem.toString());
@@ -2215,7 +2214,7 @@
Future assertSuccessfulRefactoring(
Future<Response> Function() requestSender, String expectedCode,
{void Function(RefactoringFeedback) feedbackValidator}) async {
- EditGetRefactoringResult result = await getRefactoringResult(requestSender);
+ var result = await getRefactoringResult(requestSender);
assertResultProblemsOK(result);
if (feedbackValidator != null) {
feedbackValidator(result.feedback);
@@ -2227,11 +2226,11 @@
/// which results in the [expectedCode].
void assertTestRefactoringResult(
EditGetRefactoringResult result, String expectedCode) {
- SourceChange change = result.change;
+ var change = result.change;
expect(change, isNotNull);
- for (SourceFileEdit fileEdit in change.edits) {
+ for (var fileEdit in change.edits) {
if (fileEdit.file == testFile) {
- String actualCode = SourceEdit.applySequence(testCode, fileEdit.edits);
+ var actualCode = SourceEdit.applySequence(testCode, fileEdit.edits);
expect(actualCode, expectedCode);
return;
}
@@ -2244,14 +2243,14 @@
if (shouldWaitForFullAnalysis) {
await waitForTasksFinished();
}
- Response response = await requestSender();
+ var response = await requestSender();
return EditGetRefactoringResult.fromResponse(response);
}
Future<Response> sendRequest(
RefactoringKind kind, int offset, int length, RefactoringOptions options,
[bool validateOnly = false]) {
- Request request = EditGetRefactoringParams(
+ var request = EditGetRefactoringParams(
kind, testFile, offset, length, validateOnly,
options: options)
.toRequest('0');
diff --git a/pkg/analysis_server/test/edit/sort_members_test.dart b/pkg/analysis_server/test/edit/sort_members_test.dart
index 3eeaf6a..94d0659 100644
--- a/pkg/analysis_server/test/edit/sort_members_test.dart
+++ b/pkg/analysis_server/test/edit/sort_members_test.dart
@@ -4,7 +4,6 @@
import 'dart:async';
-import 'package:analysis_server/protocol/protocol.dart';
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analysis_server/src/edit/edit_domain.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
@@ -34,9 +33,9 @@
@failingTest
Future<void> test_BAD_doesNotExist() async {
// The analysis driver fails to return an error
- Request request =
+ var request =
EditSortMembersParams(convertPath('/no/such/file.dart')).toRequest('0');
- Response response = await waitResponse(request);
+ var response = await waitResponse(request);
expect(response,
isResponseFailure('0', RequestErrorCode.SORT_MEMBERS_INVALID_FILE));
}
@@ -47,17 +46,17 @@
print()
}
''');
- Request request = EditSortMembersParams(testFile).toRequest('0');
- Response response = await waitResponse(request);
+ var request = EditSortMembersParams(testFile).toRequest('0');
+ var response = await waitResponse(request);
expect(response,
isResponseFailure('0', RequestErrorCode.SORT_MEMBERS_PARSE_ERRORS));
}
Future<void> test_BAD_notDartFile() async {
- Request request = EditSortMembersParams(
+ var request = EditSortMembersParams(
convertPath('/not-a-Dart-file.txt'),
).toRequest('0');
- Response response = await waitResponse(request);
+ var response = await waitResponse(request);
expect(response,
isResponseFailure('0', RequestErrorCode.SORT_MEMBERS_INVALID_FILE));
}
@@ -263,13 +262,13 @@
Future _assertSorted(String expectedCode) async {
await _requestSort();
- String resultCode = SourceEdit.applySequence(testCode, fileEdit.edits);
+ var resultCode = SourceEdit.applySequence(testCode, fileEdit.edits);
expect(resultCode, expectedCode);
}
Future _requestSort() async {
- Request request = EditSortMembersParams(testFile).toRequest('0');
- Response response = await waitResponse(request);
+ var request = EditSortMembersParams(testFile).toRequest('0');
+ var response = await waitResponse(request);
var result = EditSortMembersResult.fromResponse(response);
fileEdit = result.edit;
}
diff --git a/pkg/analysis_server/test/edit/statement_completion_test.dart b/pkg/analysis_server/test/edit/statement_completion_test.dart
index 4bcd67f..db31cac 100644
--- a/pkg/analysis_server/test/edit/statement_completion_test.dart
+++ b/pkg/analysis_server/test/edit/statement_completion_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/protocol/protocol.dart';
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analysis_server/src/edit/edit_domain.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
@@ -89,7 +88,7 @@
}
''');
await waitForTasksFinished();
- String match = 'v =';
+ var match = 'v =';
await _prepareCompletion(match, atEnd: true);
_assertHasChange(
'Insert a newline at the end of the current line',
@@ -105,7 +104,7 @@
void _assertHasChange(String message, String expectedCode, [Function cmp]) {
if (change.message == message) {
if (change.edits.isNotEmpty) {
- String resultCode =
+ var resultCode =
SourceEdit.applySequence(testCode, change.edits[0].edits);
expect(resultCode, expectedCode.replaceAll('/*caret*/', ''));
if (cmp != null) {
@@ -125,7 +124,7 @@
Future<void> _prepareCompletion(String search,
{bool atStart = false, bool atEnd = false, int delta = 0}) async {
- int offset = findOffset(search);
+ var offset = findOffset(search);
if (atStart) {
delta = 0;
} else if (atEnd) {
@@ -135,9 +134,9 @@
}
Future<void> _prepareCompletionAt(int offset) async {
- Request request =
+ var request =
EditGetStatementCompletionParams(testFile, offset).toRequest('0');
- Response response = await waitResponse(request);
+ var response = await waitResponse(request);
var result = EditGetStatementCompletionResult.fromResponse(response);
change = result.change;
}
diff --git a/pkg/analysis_server/test/edit/token_details_test.dart b/pkg/analysis_server/test/edit/token_details_test.dart
index f45edeb..0516889 100644
--- a/pkg/analysis_server/test/edit/token_details_test.dart
+++ b/pkg/analysis_server/test/edit/token_details_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/protocol/protocol.dart';
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analysis_server/src/domain_completion.dart';
import 'package:test/test.dart';
@@ -21,10 +20,9 @@
CompletionDomainHandler completionHandler;
Future<CompletionListTokenDetailsResult> getTokenDetails() async {
- CompletionListTokenDetailsParams params =
- CompletionListTokenDetailsParams(testFile);
+ var params = CompletionListTokenDetailsParams(testFile);
await completionHandler.listTokenDetails(params.toRequest('0'));
- Response response = await serverChannel.responseController.stream.first;
+ var response = await serverChannel.responseController.stream.first;
return CompletionListTokenDetailsResult.fromResponse(response);
}
@@ -47,8 +45,8 @@
C c;
''');
createProject();
- CompletionListTokenDetailsResult result = await getTokenDetails();
- List<TokenDetails> tokens = result.tokens;
+ var result = await getTokenDetails();
+ var tokens = result.tokens;
expect(tokens, hasLength(6));
}
}
diff --git a/pkg/analysis_server/test/integration/analysis/analysis_options_test.dart b/pkg/analysis_server/test/integration/analysis/analysis_options_test.dart
index 0032db9..fc5ae08 100644
--- a/pkg/analysis_server/test/integration/analysis/analysis_options_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/analysis_options_test.dart
@@ -24,7 +24,7 @@
}
Future<void> test_option_warning_optionFile() async {
- String options = sourcePath(AnalysisEngine.ANALYSIS_OPTIONS_YAML_FILE);
+ var options = sourcePath(AnalysisEngine.ANALYSIS_OPTIONS_YAML_FILE);
writeFile(options, '''
linter:
rules:
@@ -36,9 +36,9 @@
await analysisFinished;
expect(currentAnalysisErrors[options], isList);
- List<AnalysisError> errors = currentAnalysisErrors[options];
+ var errors = currentAnalysisErrors[options];
expect(errors, hasLength(1));
- AnalysisError error = errors[0];
+ var error = errors[0];
expect(error.location.file, options);
expect(error.severity, AnalysisErrorSeverity.WARNING);
expect(error.type, AnalysisErrorType.STATIC_WARNING);
diff --git a/pkg/analysis_server/test/integration/analysis/error_test.dart b/pkg/analysis_server/test/integration/analysis/error_test.dart
index 55d0fa2..90dfb31 100644
--- a/pkg/analysis_server/test/integration/analysis/error_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/error_test.dart
@@ -19,9 +19,9 @@
class AnalysisErrorIntegrationTest
extends AbstractAnalysisServerIntegrationTest {
Future<void> test_analysisRootDoesNotExist() async {
- String packagePath = sourcePath('package');
- String filePath = sourcePath('package/lib/test.dart');
- String content = '''
+ var packagePath = sourcePath('package');
+ var filePath = sourcePath('package/lib/test.dart');
+ var content = '''
main() {
print(null) // parse error: missing ';'
}''';
@@ -31,13 +31,13 @@
await analysisFinished;
expect(currentAnalysisErrors[filePath], isList);
- List<AnalysisError> errors = currentAnalysisErrors[filePath];
+ var errors = currentAnalysisErrors[filePath];
expect(errors, hasLength(1));
expect(errors[0].location.file, equals(filePath));
}
Future<void> test_detect_simple_error() {
- String pathname = sourcePath('test.dart');
+ var pathname = sourcePath('test.dart');
writeFile(pathname, '''
main() {
print(null) // parse error: missing ';'
@@ -45,14 +45,14 @@
standardAnalysisSetup();
return analysisFinished.then((_) {
expect(currentAnalysisErrors[pathname], isList);
- List<AnalysisError> errors = currentAnalysisErrors[pathname];
+ var errors = currentAnalysisErrors[pathname];
expect(errors, hasLength(1));
expect(errors[0].location.file, equals(pathname));
});
}
Future<void> test_super_mixins_disabled() async {
- String pathname = sourcePath('test.dart');
+ var pathname = sourcePath('test.dart');
writeFile(pathname, '''
class Test extends Object with C {
void foo() {}
@@ -69,10 +69,9 @@
standardAnalysisSetup();
await analysisFinished;
expect(currentAnalysisErrors[pathname], isList);
- List<AnalysisError> errors = currentAnalysisErrors[pathname];
+ var errors = currentAnalysisErrors[pathname];
expect(errors, hasLength(2));
- Set<String> allErrorMessages =
- errors.map((AnalysisError e) => e.message).toSet();
+ var allErrorMessages = errors.map((AnalysisError e) => e.message).toSet();
expect(
allErrorMessages,
contains(
@@ -92,7 +91,7 @@
// AnalysisError:{"severity":"ERROR","type":"COMPILE_TIME_ERROR","location":{"file":"/var/folders/00/0w95r000h01000cxqpysvccm003j4q/T/analysisServerfbuOQb/test.dart","offset":31,"length":1,"startLine":1,"startColumn":32},"message":"The class 'C' can't be used as a mixin because it references 'super'.","correction":"","code":"mixin_references_super","hasFix":false}
// ]
- String pathname = sourcePath('test.dart');
+ var pathname = sourcePath('test.dart');
writeFile(pathname, '''
class Test extends Object with C {
void foo() {}
@@ -112,7 +111,7 @@
standardAnalysisSetup();
await analysisFinished;
expect(currentAnalysisErrors[pathname], isList);
- List<AnalysisError> errors = currentAnalysisErrors[pathname];
+ var errors = currentAnalysisErrors[pathname];
expect(errors, isEmpty);
}
}
diff --git a/pkg/analysis_server/test/integration/analysis/get_errors_non_standard_sdk_test.dart b/pkg/analysis_server/test/integration/analysis/get_errors_non_standard_sdk_test.dart
index 93f0d98..11cf543 100644
--- a/pkg/analysis_server/test/integration/analysis/get_errors_non_standard_sdk_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/get_errors_non_standard_sdk_test.dart
@@ -5,7 +5,6 @@
import 'dart:async';
import 'dart:io';
-import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:path/path.dart' as path;
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -76,7 +75,7 @@
@override
Future startServer({int diagnosticPort, int servicesPort}) {
- String sdkPath = createNonStandardSdk();
+ var sdkPath = createNonStandardSdk();
return server.start(
diagnosticPort: diagnosticPort,
sdkPath: sdkPath,
@@ -84,15 +83,15 @@
}
Future test_getErrors() async {
- String pathname = sourcePath('test.dart');
- String text = r'''
+ var pathname = sourcePath('test.dart');
+ var text = r'''
import 'dart:core';
import 'dart:fake';
''';
writeFile(pathname, text);
standardAnalysisSetup();
await analysisFinished;
- List<AnalysisError> errors = currentAnalysisErrors[pathname];
+ var errors = currentAnalysisErrors[pathname];
expect(errors, hasLength(1));
expect(errors[0].code, 'unused_import');
}
diff --git a/pkg/analysis_server/test/integration/analysis/get_errors_test.dart b/pkg/analysis_server/test/integration/analysis/get_errors_test.dart
index 76563d4..260cb6c 100644
--- a/pkg/analysis_server/test/integration/analysis/get_errors_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/get_errors_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -17,15 +16,15 @@
@reflectiveTest
class GetErrorsTest extends AbstractAnalysisServerIntegrationTest {
Future<void> test_getErrors() async {
- String pathname = sourcePath('test.dart');
- String text = r'''
+ var pathname = sourcePath('test.dart');
+ var text = r'''
main() {
var x // parse error: missing ';'
}''';
writeFile(pathname, text);
standardAnalysisSetup();
await analysisFinished;
- AnalysisGetErrorsResult result = await sendAnalysisGetErrors(pathname);
+ var result = await sendAnalysisGetErrors(pathname);
expect(result.errors, equals(currentAnalysisErrors[pathname]));
}
}
diff --git a/pkg/analysis_server/test/integration/analysis/get_hover_test.dart b/pkg/analysis_server/test/integration/analysis/get_hover_test.dart
index e20f7f0..9458086 100644
--- a/pkg/analysis_server/test/integration/analysis/get_hover_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/get_hover_test.dart
@@ -67,10 +67,10 @@
bool isLiteral = false,
List<String> parameterRegexps,
}) {
- int offset = text.indexOf(target);
+ var offset = text.indexOf(target);
return sendAnalysisGetHover(pathname, offset).then((result) async {
expect(result.hovers, hasLength(1));
- HoverInformation info = result.hovers[0];
+ var info = result.hovers[0];
expect(info.offset, equals(offset));
expect(info.length, equals(length));
if (isCore) {
@@ -92,7 +92,7 @@
expect(info.elementDescription, isNull);
} else {
expect(info.elementDescription, isString);
- for (String descriptionRegexp in descriptionRegexps) {
+ for (var descriptionRegexp in descriptionRegexps) {
expect(info.elementDescription, matches(descriptionRegexp));
}
}
@@ -101,7 +101,7 @@
expect(info.parameter, isNull);
} else {
expect(info.parameter, isString);
- for (String parameterRegexp in parameterRegexps) {
+ for (var parameterRegexp in parameterRegexps) {
expect(info.parameter, matches(parameterRegexp));
}
}
@@ -109,7 +109,7 @@
expect(info.staticType, isNull);
} else {
expect(info.staticType, isString);
- for (String staticTypeRegexp in staticTypeRegexps) {
+ for (var staticTypeRegexp in staticTypeRegexps) {
expect(info.staticType, matches(staticTypeRegexp));
}
}
@@ -120,7 +120,7 @@
/// Check that a getHover request on the substring [target] produces no
/// results.
Future checkNoHover(String target) {
- int offset = text.indexOf(target);
+ var offset = text.indexOf(target);
return sendAnalysisGetHover(pathname, offset).then((result) {
expect(result.hovers, hasLength(0));
});
@@ -141,7 +141,7 @@
// returns the latest results that are available at the time that the
// request is made. So wait for analysis to finish before testing anything.
return analysisFinished.then((_) {
- List<Future> tests = [];
+ var tests = <Future>[];
tests.add(checkHover('topLevelVar;', 11, ['List', 'topLevelVar'],
'top level variable', ['List']));
tests.add(checkHover(
diff --git a/pkg/analysis_server/test/integration/analysis/get_imported_elements_test.dart b/pkg/analysis_server/test/integration/analysis/get_imported_elements_test.dart
index 7fdd1af..9c87374 100644
--- a/pkg/analysis_server/test/integration/analysis/get_imported_elements_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/get_imported_elements_test.dart
@@ -36,10 +36,10 @@
ImportedElements actualElements, ImportedElements expectedElements) {
if (actualElements.path.endsWith(expectedElements.path) &&
actualElements.prefix == expectedElements.prefix) {
- List<String> actual = actualElements.elements;
- List<String> expected = expectedElements.elements;
+ var actual = actualElements.elements;
+ var expected = expectedElements.elements;
if (actual.length == expected.length) {
- for (int i = 0; i < actual.length; i++) {
+ for (var i = 0; i < actual.length; i++) {
if (!expected.contains(actual[i])) {
return false;
}
@@ -51,8 +51,8 @@
}
int find(List<ImportedElements> actual, ImportedElements expectedElements) {
- for (int i = 0; i < actual.length; i++) {
- ImportedElements actualElements = actual[i];
+ for (var i = 0; i < actual.length; i++) {
+ var actualElements = actual[i];
if (equals(actualElements, expectedElements)) {
return i;
}
@@ -60,14 +60,14 @@
return -1;
}
- int offset = text.indexOf(target);
- AnalysisGetImportedElementsResult result =
+ var offset = text.indexOf(target);
+ var result =
await sendAnalysisGetImportedElements(pathname, offset, target.length);
- List<ImportedElements> actual = result.elements;
+ var actual = result.elements;
expect(actual, hasLength(expected.length));
- for (ImportedElements elements in expected) {
- int index = find(actual, elements);
+ for (var elements in expected) {
+ var index = find(actual, elements);
if (index < 0) {
fail('Expected $elements; not found');
}
@@ -78,8 +78,8 @@
/// Check that an analysis.getImportedElements request on the region matching
/// [target] produces an empty list of elements.
Future<void> checkNoElements(String target) async {
- int offset = text.indexOf(target);
- AnalysisGetImportedElementsResult result =
+ var offset = text.indexOf(target);
+ var result =
await sendAnalysisGetImportedElements(pathname, offset, target.length);
expect(result.elements, hasLength(0));
@@ -104,7 +104,7 @@
}
Future<void> test_getImportedElements_some() async {
- String selection = r'''
+ var selection = r'''
main() {
Random r = new Random();
String s = r.nextBool().toString();
diff --git a/pkg/analysis_server/test/integration/analysis/get_library_dependencies_test.dart b/pkg/analysis_server/test/integration/analysis/get_library_dependencies_test.dart
index 8ba8b93..568b151 100644
--- a/pkg/analysis_server/test/integration/analysis/get_library_dependencies_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/get_library_dependencies_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -20,8 +19,8 @@
Future<void> test_libraryDeps() async {
// This fails with the new analysis driver ('Bad state: Should not be used
// with the new analysis driver') - #29310.
- String pathname = sourcePath('test.dart');
- String text = r'''
+ var pathname = sourcePath('test.dart');
+ var text = r'''
class Foo {}
class Bar {
@@ -32,16 +31,15 @@
standardAnalysisSetup();
await analysisFinished;
- AnalysisGetLibraryDependenciesResult result =
- await sendAnalysisGetLibraryDependencies();
- List<String> libraries = result.libraries;
- Map<String, Map<String, List<String>>> packageMaps = result.packageMap;
+ var result = await sendAnalysisGetLibraryDependencies();
+ var libraries = result.libraries;
+ var packageMaps = result.packageMap;
expect(libraries, contains(pathname));
expect(libraries.any((String lib) => lib.endsWith('core/core.dart')), true);
expect(packageMaps.keys, hasLength(1));
- Map<String, List<String>> map = packageMaps[packageMaps.keys.first];
+ var map = packageMaps[packageMaps.keys.first];
expect(map.keys, isEmpty);
}
}
diff --git a/pkg/analysis_server/test/integration/analysis/get_navigation_test.dart b/pkg/analysis_server/test/integration/analysis/get_navigation_test.dart
index a51347d..bd69280 100644
--- a/pkg/analysis_server/test/integration/analysis/get_navigation_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/get_navigation_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -18,8 +17,8 @@
@reflectiveTest
class GetNavigationTest extends AbstractAnalysisServerIntegrationTest {
Future<void> test_navigation() async {
- String pathname = sourcePath('test.dart');
- String text = r'''
+ var pathname = sourcePath('test.dart');
+ var text = r'''
class Foo {}
class Bar {
@@ -31,10 +30,10 @@
await analysisFinished;
- AnalysisGetNavigationResult result =
+ var result =
await sendAnalysisGetNavigation(pathname, text.indexOf('Foo foo'), 0);
expect(result.targets, hasLength(1));
- NavigationTarget target = result.targets.first;
+ var target = result.targets.first;
expect(target.kind, ElementKind.CLASS);
expect(target.offset, text.indexOf('Foo {}'));
expect(target.length, 3);
@@ -45,8 +44,8 @@
@failingTest
Future<void> test_navigation_no_result() async {
// This fails - it returns navigation results for a whitespace area (#28799).
- String pathname = sourcePath('test.dart');
- String text = r'''
+ var pathname = sourcePath('test.dart');
+ var text = r'''
//
class Foo {}
@@ -60,8 +59,7 @@
await analysisFinished;
- AnalysisGetNavigationResult result =
- await sendAnalysisGetNavigation(pathname, 0, 0);
+ var result = await sendAnalysisGetNavigation(pathname, 0, 0);
expect(result.targets, isEmpty);
}
}
diff --git a/pkg/analysis_server/test/integration/analysis/get_reachable_sources_test.dart b/pkg/analysis_server/test/integration/analysis/get_reachable_sources_test.dart
index 1ba0993..0073bde 100644
--- a/pkg/analysis_server/test/integration/analysis/get_reachable_sources_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/get_reachable_sources_test.dart
@@ -4,7 +4,6 @@
import 'dart:io';
-import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -22,8 +21,8 @@
Future<void> test_reachable() async {
// This fails with the new analysis driver ('Bad state: Should not be used
// with the new analysis driver') - #29311.
- String pathname = sourcePath('test.dart');
- String text = r'''
+ var pathname = sourcePath('test.dart');
+ var text = r'''
class Foo {}
class Bar {
@@ -34,12 +33,12 @@
standardAnalysisSetup();
await analysisFinished;
- AnalysisGetReachableSourcesResult result =
+ var result =
// ignore: deprecated_member_use_from_same_package
await sendAnalysisGetReachableSources(pathname);
- Map<String, List<String>> sources = result.sources;
- List<String> keys = sources.keys.toList();
- String url = File(pathname).uri.toString();
+ var sources = result.sources;
+ var keys = sources.keys.toList();
+ var url = File(pathname).uri.toString();
expect(keys, contains('dart:core'));
expect(keys, contains('dart:collection'));
diff --git a/pkg/analysis_server/test/integration/analysis/highlights2_test.dart b/pkg/analysis_server/test/integration/analysis/highlights2_test.dart
index fee617f..93c8a9e 100644
--- a/pkg/analysis_server/test/integration/analysis/highlights2_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/highlights2_test.dart
@@ -36,11 +36,11 @@
onAnalysisHighlights.listen((AnalysisHighlightsParams params) {
expect(params.file, equals(pathname));
highlights = <HighlightRegionType, Set<String>>{};
- for (HighlightRegion region in params.regions) {
- int startIndex = region.offset;
- int endIndex = startIndex + region.length;
- String highlightedText = text.substring(startIndex, endIndex);
- HighlightRegionType type = region.type;
+ for (var region in params.regions) {
+ var startIndex = region.offset;
+ var endIndex = startIndex + region.length;
+ var highlightedText = text.substring(startIndex, endIndex);
+ var type = region.type;
if (!highlights.containsKey(type)) {
highlights[type] = <String>{};
}
@@ -62,8 +62,8 @@
}
Future<void> test_highlights() async {
- String pathname = sourcePath('test.dart');
- String text = r'''
+ var pathname = sourcePath('test.dart');
+ var text = r'''
import 'dart:async' as async;
/**
@@ -166,8 +166,8 @@
}
Future<void> test_highlights_mixin() async {
- String pathname = sourcePath('test.dart');
- String text = r'''
+ var pathname = sourcePath('test.dart');
+ var text = r'''
mixin M on A implements B {}
class A {}
class B {}
diff --git a/pkg/analysis_server/test/integration/analysis/highlights_test.dart b/pkg/analysis_server/test/integration/analysis/highlights_test.dart
index 1ad5fe2..c7bce82 100644
--- a/pkg/analysis_server/test/integration/analysis/highlights_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/highlights_test.dart
@@ -34,11 +34,11 @@
onAnalysisHighlights.listen((AnalysisHighlightsParams params) {
expect(params.file, equals(pathname));
highlights = <HighlightRegionType, Set<String>>{};
- for (HighlightRegion region in params.regions) {
- int startIndex = region.offset;
- int endIndex = startIndex + region.length;
- String highlightedText = text.substring(startIndex, endIndex);
- HighlightRegionType type = region.type;
+ for (var region in params.regions) {
+ var startIndex = region.offset;
+ var endIndex = startIndex + region.length;
+ var highlightedText = text.substring(startIndex, endIndex);
+ var type = region.type;
if (!highlights.containsKey(type)) {
highlights[type] = <String>{};
}
@@ -49,8 +49,8 @@
}
Future<void> test_highlights() async {
- String pathname = sourcePath('test.dart');
- String text = r'''
+ var pathname = sourcePath('test.dart');
+ var text = r'''
import 'dart:async' as async;
/**
@@ -149,8 +149,8 @@
}
Future<void> test_highlights_mixin() async {
- String pathname = sourcePath('test.dart');
- String text = r'''
+ var pathname = sourcePath('test.dart');
+ var text = r'''
mixin M on A implements B {}
class A {}
class B {}
diff --git a/pkg/analysis_server/test/integration/analysis/lint_test.dart b/pkg/analysis_server/test/integration/analysis/lint_test.dart
index 05051f5..a7d5164 100644
--- a/pkg/analysis_server/test/integration/analysis/lint_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/lint_test.dart
@@ -18,7 +18,7 @@
@reflectiveTest
class LintIntegrationTest extends AbstractAnalysisServerIntegrationTest {
Future<void> test_no_lints_when_not_specified() async {
- String source = sourcePath('test.dart');
+ var source = sourcePath('test.dart');
writeFile(source, '''
class abc { // lint: not CamelCase (should get ignored though)
}''');
@@ -27,7 +27,7 @@
await analysisFinished;
expect(currentAnalysisErrors[source], isList);
// Should be empty without an analysis options file.
- List<AnalysisError> errors = currentAnalysisErrors[source];
+ var errors = currentAnalysisErrors[source];
expect(errors, hasLength(0));
}
@@ -38,7 +38,7 @@
- camel_case_types
''');
- String source = sourcePath('test.dart');
+ var source = sourcePath('test.dart');
writeFile(source, '''
class a { // lint: not CamelCase
}''');
@@ -48,9 +48,9 @@
await analysisFinished;
expect(currentAnalysisErrors[source], isList);
- List<AnalysisError> errors = currentAnalysisErrors[source];
+ var errors = currentAnalysisErrors[source];
expect(errors, hasLength(1));
- AnalysisError error = errors[0];
+ var error = errors[0];
expect(error.location.file, source);
expect(error.severity, AnalysisErrorSeverity.INFO);
expect(error.type, AnalysisErrorType.LINT);
diff --git a/pkg/analysis_server/test/integration/analysis/navigation_test.dart b/pkg/analysis_server/test/integration/analysis/navigation_test.dart
index 46181e3..9ba891d 100644
--- a/pkg/analysis_server/test/integration/analysis/navigation_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/navigation_test.dart
@@ -18,8 +18,8 @@
@reflectiveTest
class AnalysisNavigationTest extends AbstractAnalysisServerIntegrationTest {
Future<void> test_navigation() async {
- String pathname1 = sourcePath('test1.dart');
- String text1 = r'''
+ var pathname1 = sourcePath('test1.dart');
+ var text1 = r'''
library foo;
import 'dart:async';
@@ -49,8 +49,8 @@
}
''';
writeFile(pathname1, text1);
- String pathname2 = sourcePath('test2.dart');
- String text2 = r'''
+ var pathname2 = sourcePath('test2.dart');
+ var text2 = r'''
part of foo;
''';
writeFile(pathname2, text2);
@@ -75,10 +75,10 @@
expect(currentAnalysisErrors[pathname1], hasLength(1));
expect(currentAnalysisErrors[pathname2], isEmpty);
NavigationTarget findTargetElement(int index) {
- for (NavigationRegion region in regions) {
+ for (var region in regions) {
if (region.offset <= index && index < region.offset + region.length) {
expect(region.targets, hasLength(1));
- int targetIndex = region.targets[0];
+ var targetIndex = region.targets[0];
return targets[targetIndex];
}
}
@@ -87,9 +87,9 @@
void checkLocal(
String source, String expectedTarget, ElementKind expectedKind) {
- int sourceIndex = text1.indexOf(source);
- int targetIndex = text1.indexOf(expectedTarget);
- NavigationTarget element = findTargetElement(sourceIndex);
+ var sourceIndex = text1.indexOf(source);
+ var targetIndex = text1.indexOf(expectedTarget);
+ var element = findTargetElement(sourceIndex);
expect(targetFiles[element.fileIndex], equals(pathname1));
expect(element.offset, equals(targetIndex));
expect(element.kind, equals(expectedKind));
@@ -97,8 +97,8 @@
void checkRemote(
String source, String expectedTargetRegexp, ElementKind expectedKind) {
- int sourceIndex = text1.indexOf(source);
- NavigationTarget element = findTargetElement(sourceIndex);
+ var sourceIndex = text1.indexOf(source);
+ var element = findTargetElement(sourceIndex);
expect(targetFiles[element.fileIndex], matches(expectedTargetRegexp));
expect(element.kind, equals(expectedKind));
}
diff --git a/pkg/analysis_server/test/integration/analysis/occurrences_test.dart b/pkg/analysis_server/test/integration/analysis/occurrences_test.dart
index 8ecd96e..112445a 100644
--- a/pkg/analysis_server/test/integration/analysis/occurrences_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/occurrences_test.dart
@@ -18,8 +18,8 @@
@reflectiveTest
class OccurrencesTest extends AbstractAnalysisServerIntegrationTest {
Future<void> test_occurrences() {
- String pathname = sourcePath('test.dart');
- String text = r'''
+ var pathname = sourcePath('test.dart');
+ var text = r'''
main() {
int sum = 0;
for (int i = 0; i < 10; i++) {
@@ -43,7 +43,7 @@
return analysisFinished.then((_) {
expect(currentAnalysisErrors[pathname], isEmpty);
Set<int> findOffsets(String elementName) {
- for (Occurrences occurrence in occurrences) {
+ for (var occurrence in occurrences) {
if (occurrence.element.name == elementName) {
return occurrence.offsets.toSet();
}
@@ -52,10 +52,10 @@
}
void check(String elementName, Iterable<String> expectedOccurrences) {
- Set<int> expectedOffsets = expectedOccurrences
+ var expectedOffsets = expectedOccurrences
.map((String substring) => text.indexOf(substring))
.toSet();
- Set<int> foundOffsets = findOffsets(elementName);
+ var foundOffsets = findOffsets(elementName);
expect(foundOffsets, equals(expectedOffsets));
}
diff --git a/pkg/analysis_server/test/integration/analysis/outline_test.dart b/pkg/analysis_server/test/integration/analysis/outline_test.dart
index 8b87756..7271ce6 100644
--- a/pkg/analysis_server/test/integration/analysis/outline_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/outline_test.dart
@@ -18,8 +18,8 @@
@reflectiveTest
class OutlineTest extends AbstractAnalysisServerIntegrationTest {
Future<void> test_outline() {
- String pathname = sourcePath('test.dart');
- String text = r'''
+ var pathname = sourcePath('test.dart');
+ var text = r'''
class Class1 {
int field;
@@ -54,12 +54,12 @@
expect(outline.element.kind, equals(ElementKind.COMPILATION_UNIT));
expect(outline.offset, equals(0));
expect(outline.length, equals(text.length));
- List<Outline> classes = outline.children;
+ var classes = outline.children;
expect(classes, hasLength(2));
expect(classes[0].element.name, equals('Class1'));
expect(classes[1].element.name, equals('Class2'));
- List<Outline> members = classes[0].children;
+ var members = classes[0].children;
expect(members, hasLength(5));
expect(members[0].element.name, equals('field'));
expect(members[1].element.name, equals('method'));
diff --git a/pkg/analysis_server/test/integration/analysis/overrides_test.dart b/pkg/analysis_server/test/integration/analysis/overrides_test.dart
index 58a4f75..dc3167f 100644
--- a/pkg/analysis_server/test/integration/analysis/overrides_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/overrides_test.dart
@@ -17,8 +17,8 @@
@reflectiveTest
class OverridesTest extends AbstractAnalysisServerIntegrationTest {
Future<void> test_overrides() {
- String pathname = sourcePath('test.dart');
- String text = r'''
+ var pathname = sourcePath('test.dart');
+ var text = r'''
abstract class Interface1 {
method0();
method1();
@@ -62,10 +62,10 @@
overrides = params.overrides;
});
return analysisFinished.then((_) {
- int targetOffset = text.indexOf('Target');
+ var targetOffset = text.indexOf('Target');
Override findOverride(String methodName) {
- int methodOffset = text.indexOf(methodName, targetOffset);
- for (Override override in overrides) {
+ var methodOffset = text.indexOf(methodName, targetOffset);
+ for (var override in overrides) {
if (override.offset == methodOffset) {
return override;
}
@@ -75,7 +75,7 @@
void checkOverrides(String methodName, bool expectedOverridesBase,
List<String> expectedOverridesInterfaces) {
- Override override = findOverride(methodName);
+ var override = findOverride(methodName);
if (!expectedOverridesBase && expectedOverridesInterfaces.isEmpty) {
// This method overrides nothing, so it should not appear in the
// overrides list.
@@ -85,21 +85,21 @@
expect(override, isNotNull);
}
expect(override.length, equals(methodName.length));
- OverriddenMember superclassMember = override.superclassMember;
+ var superclassMember = override.superclassMember;
if (expectedOverridesBase) {
expect(superclassMember.element.name, equals(methodName));
expect(superclassMember.className, equals('Base'));
} else {
expect(superclassMember, isNull);
}
- List<OverriddenMember> interfaceMembers = override.interfaceMembers;
+ var interfaceMembers = override.interfaceMembers;
if (expectedOverridesInterfaces.isNotEmpty) {
expect(interfaceMembers, isNotNull);
- Set<String> actualOverridesInterfaces = <String>{};
- for (OverriddenMember overriddenMember in interfaceMembers) {
+ var actualOverridesInterfaces = <String>{};
+ for (var overriddenMember in interfaceMembers) {
expect(overriddenMember.element.name, equals(methodName));
- String className = overriddenMember.className;
- bool wasAdded = actualOverridesInterfaces.add(className);
+ var className = overriddenMember.className;
+ var wasAdded = actualOverridesInterfaces.add(className);
expect(wasAdded, isTrue);
}
expect(actualOverridesInterfaces,
diff --git a/pkg/analysis_server/test/integration/analysis/package_root_test.dart b/pkg/analysis_server/test/integration/analysis/package_root_test.dart
index 55f0d19..f3cac4b 100644
--- a/pkg/analysis_server/test/integration/analysis/package_root_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/package_root_test.dart
@@ -22,11 +22,11 @@
class SetAnalysisRootsTest extends AbstractAnalysisServerIntegrationTest {
Future<void> xtest_package_root() async {
// TODO(devoncarew): This test fails intermittently on the bots; #33879.
- String projPath = sourcePath('project');
- String mainPath = path.join(projPath, 'main.dart');
- String packagesPath = sourcePath('packages');
- String fooBarPath = path.join(packagesPath, 'foo', 'bar.dart');
- String mainText = """
+ var projPath = sourcePath('project');
+ var mainPath = path.join(projPath, 'main.dart');
+ var packagesPath = sourcePath('packages');
+ var fooBarPath = path.join(packagesPath, 'foo', 'bar.dart');
+ var mainText = """
library main;
import 'package:foo/bar.dart'
@@ -35,16 +35,15 @@
f();
}
""";
- String fooBarText = '''
+ var fooBarText = '''
library foo.bar;
f() {}
''';
writeFile(mainPath, mainText);
- String normalizedFooBarPath = writeFile(fooBarPath, fooBarText);
+ var normalizedFooBarPath = writeFile(fooBarPath, fooBarText);
sendServerSetSubscriptions([ServerService.STATUS]);
- Future<AnalysisNavigationParams> navigationParamsFuture =
- onAnalysisNavigation.first;
+ var navigationParamsFuture = onAnalysisNavigation.first;
sendAnalysisSetSubscriptions({
AnalysisService.NAVIGATION: [mainPath]
});
@@ -56,7 +55,7 @@
packageRoots: {projPath: packagesPath});
sendAnalysisSetPriorityFiles([mainPath]);
- AnalysisNavigationParams params = await navigationParamsFuture;
+ var params = await navigationParamsFuture;
expect(params.file, equals(mainPath));
navigationRegions = params.regions;
@@ -67,18 +66,16 @@
// Verify that fooBarPath was properly resolved by checking that f()
// refers to it.
- bool found = false;
- for (NavigationRegion region in navigationRegions) {
- String navigationSource =
+ var found = false;
+ for (var region in navigationRegions) {
+ var navigationSource =
mainText.substring(region.offset, region.offset + region.length);
if (navigationSource == 'f') {
found = true;
expect(region.targets, hasLength(1));
- int navigationTargetIndex = region.targets[0];
- NavigationTarget navigationTarget =
- navigationTargets[navigationTargetIndex];
- String navigationFile =
- navigationTargetFiles[navigationTarget.fileIndex];
+ var navigationTargetIndex = region.targets[0];
+ var navigationTarget = navigationTargets[navigationTargetIndex];
+ var navigationFile = navigationTargetFiles[navigationTarget.fileIndex];
expect(navigationFile, equals(normalizedFooBarPath));
}
}
diff --git a/pkg/analysis_server/test/integration/analysis/reanalyze_concurrent_test.dart b/pkg/analysis_server/test/integration/analysis/reanalyze_concurrent_test.dart
index dfded7d..08eb92d 100644
--- a/pkg/analysis_server/test/integration/analysis/reanalyze_concurrent_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/reanalyze_concurrent_test.dart
@@ -23,8 +23,8 @@
class ReanalyzeTest extends AbstractAnalysisServerIntegrationTest {
@TestTimeout(Timeout.factor(2))
Future<void> test_reanalyze_concurrent() {
- String pathname = sourcePath('test.dart');
- String text = '''
+ var pathname = sourcePath('test.dart');
+ var text = '''
// Do a bunch of imports so that analysis has some work to do.
import 'dart:io';
import 'dart:convert';
diff --git a/pkg/analysis_server/test/integration/analysis/reanalyze_test.dart b/pkg/analysis_server/test/integration/analysis/reanalyze_test.dart
index 153eed1..064d578 100644
--- a/pkg/analysis_server/test/integration/analysis/reanalyze_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/reanalyze_test.dart
@@ -17,13 +17,13 @@
@reflectiveTest
class ReanalyzeTest extends AbstractAnalysisServerIntegrationTest {
Future<void> test_reanalyze() {
- String pathname = sourcePath('test.dart');
- String text = 'main() {}';
+ var pathname = sourcePath('test.dart');
+ var text = 'main() {}';
writeFile(pathname, text);
standardAnalysisSetup();
return analysisFinished.then((_) {
// Make sure that reanalyze causes analysis to restart.
- bool analysisRestarted = false;
+ var analysisRestarted = false;
onServerStatus.listen((ServerStatusParams data) {
if (data.analysis != null) {
if (data.analysis.isAnalyzing) {
diff --git a/pkg/analysis_server/test/integration/analysis/set_analysis_roots_test.dart b/pkg/analysis_server/test/integration/analysis/set_analysis_roots_test.dart
index 18be9fa..c8b991d 100644
--- a/pkg/analysis_server/test/integration/analysis/set_analysis_roots_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/set_analysis_roots_test.dart
@@ -16,7 +16,7 @@
@reflectiveTest
class SetAnalysisRootsTest extends AbstractAnalysisServerIntegrationTest {
Future<void> test_options() async {
- String pathname = sourcePath('test.dart');
+ var pathname = sourcePath('test.dart');
writeFile(pathname, '''
class Foo {
void bar() {}
diff --git a/pkg/analysis_server/test/integration/analysis/set_general_subscriptions_test.dart b/pkg/analysis_server/test/integration/analysis/set_general_subscriptions_test.dart
index a8a7489..18cc929 100644
--- a/pkg/analysis_server/test/integration/analysis/set_general_subscriptions_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/set_general_subscriptions_test.dart
@@ -19,7 +19,7 @@
class SetGeneralSubscriptionsTest
extends AbstractAnalysisServerIntegrationTest {
Future<void> test_options() async {
- String pathname = sourcePath('test.dart');
+ var pathname = sourcePath('test.dart');
writeFile(pathname, '''
class Foo {
void bar() {}
diff --git a/pkg/analysis_server/test/integration/analysis/set_priority_files_test.dart b/pkg/analysis_server/test/integration/analysis/set_priority_files_test.dart
index cd1e3bd..a7151cf 100644
--- a/pkg/analysis_server/test/integration/analysis/set_priority_files_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/set_priority_files_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -17,14 +16,14 @@
@reflectiveTest
class SetPriorityFilesTest extends AbstractAnalysisServerIntegrationTest {
Future<void> test_options() async {
- String pathname = sourcePath('foo.dart');
+ var pathname = sourcePath('foo.dart');
writeFile(pathname, 'class Foo { void baz() {} }');
writeFile(sourcePath('bar.dart'), 'class Bar { void baz() {} }');
standardAnalysisSetup();
await sendAnalysisSetPriorityFiles([pathname]);
- ServerStatusParams status = await analysisFinished;
+ var status = await analysisFinished;
expect(status.analysis.isAnalyzing, false);
}
}
diff --git a/pkg/analysis_server/test/integration/analysis/set_subscriptions_test.dart b/pkg/analysis_server/test/integration/analysis/set_subscriptions_test.dart
index 79c0461..d9d22d0 100644
--- a/pkg/analysis_server/test/integration/analysis/set_subscriptions_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/set_subscriptions_test.dart
@@ -16,7 +16,7 @@
@reflectiveTest
class SetSubscriptionsTest extends AbstractAnalysisServerIntegrationTest {
Future<void> test_subscriptions() async {
- String pathname = sourcePath('test.dart');
+ var pathname = sourcePath('test.dart');
writeFile(pathname, '''
class Foo {
void bar() {}
diff --git a/pkg/analysis_server/test/integration/analysis/update_content_list_test.dart b/pkg/analysis_server/test/integration/analysis/update_content_list_test.dart
index a235d37..40c015c 100644
--- a/pkg/analysis_server/test/integration/analysis/update_content_list_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/update_content_list_test.dart
@@ -17,13 +17,13 @@
@reflectiveTest
class UpdateContentTest extends AbstractAnalysisServerIntegrationTest {
Future<void> test_updateContent_list() {
- String pathname = sourcePath('test.dart');
- String goodText = r'''
+ var pathname = sourcePath('test.dart');
+ var goodText = r'''
main() {
print("Hello");
print("World!");
}''';
- String badText = goodText.replaceAll('"', '');
+ var badText = goodText.replaceAll('"', '');
// Create a dummy file
writeFile(pathname, '// dummy text');
standardAnalysisSetup();
@@ -37,7 +37,7 @@
// order in which they appear in the file. If these edits are applied in
// the wrong order, some of the quotation marks will be in the wrong
// places, and there will still be errors.
- List<SourceEdit> edits = '"'
+ var edits = '"'
.allMatches(goodText)
.map((Match match) => SourceEdit(match.start, 0, '"'))
.toList();
diff --git a/pkg/analysis_server/test/integration/analysis/update_content_test.dart b/pkg/analysis_server/test/integration/analysis/update_content_test.dart
index c2c8ce0..9ab0807 100644
--- a/pkg/analysis_server/test/integration/analysis/update_content_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/update_content_test.dart
@@ -17,13 +17,13 @@
@reflectiveTest
class UpdateContentTest extends AbstractAnalysisServerIntegrationTest {
Future<void> test_updateContent() async {
- String path = sourcePath('test.dart');
- String goodText = r'''
+ var path = sourcePath('test.dart');
+ var goodText = r'''
main() {
print("Hello, world!");
}''';
- String badText = goodText.replaceAll(';', '');
+ var badText = goodText.replaceAll(';', '');
writeFile(path, badText);
standardAnalysisSetup();
@@ -59,7 +59,7 @@
}
Future<void> test_updateContent_multipleAdds() async {
- String pathname = sourcePath('test.dart');
+ var pathname = sourcePath('test.dart');
writeFile(pathname, r'''
class Person {
String _name;
@@ -76,7 +76,7 @@
standardAnalysisSetup();
await analysisFinished;
expect(currentAnalysisErrors[pathname], isList);
- List<AnalysisError> errors1 = currentAnalysisErrors[pathname];
+ var errors1 = currentAnalysisErrors[pathname];
expect(errors1, hasLength(1));
expect(errors1[0].location.file, equals(pathname));
@@ -97,7 +97,7 @@
});
await analysisFinished;
expect(currentAnalysisErrors[pathname], isList);
- List<AnalysisError> errors2 = currentAnalysisErrors[pathname];
+ var errors2 = currentAnalysisErrors[pathname];
expect(errors2, hasLength(1));
expect(errors2[0].location.file, equals(pathname));
}
diff --git a/pkg/analysis_server/test/integration/analysis/update_options_test.dart b/pkg/analysis_server/test/integration/analysis/update_options_test.dart
index d61bcde..4864f2c 100644
--- a/pkg/analysis_server/test/integration/analysis/update_options_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/update_options_test.dart
@@ -20,7 +20,7 @@
Future<void> test_options() async {
// We fail after the first analysis.updateOptions - we should not see a hint
// for the unused import (#28800).
- String pathname = sourcePath('test.dart');
+ var pathname = sourcePath('test.dart');
writeFile(pathname, '''
import 'dart:async'; // unused
diff --git a/pkg/analysis_server/test/integration/analytics/enable_test.dart b/pkg/analysis_server/test/integration/analytics/enable_test.dart
index a6d0138..780810e 100644
--- a/pkg/analysis_server/test/integration/analytics/enable_test.dart
+++ b/pkg/analysis_server/test/integration/analytics/enable_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -22,11 +21,11 @@
// Toggle the value twice; do light verification of the changes, as the
// analysis server - when running on our CI bots - deliberately does not
// send analytics info.
- AnalyticsIsEnabledResult result1 = await sendAnalyticsIsEnabled();
+ var result1 = await sendAnalyticsIsEnabled();
expect(result1.enabled, isNotNull);
await sendAnalyticsEnable(!result1.enabled);
- AnalyticsIsEnabledResult result2 = await sendAnalyticsIsEnabled();
+ var result2 = await sendAnalyticsIsEnabled();
expect(result2.enabled, isNotNull);
await sendAnalyticsEnable(result1.enabled);
diff --git a/pkg/analysis_server/test/integration/analytics/is_enabled_test.dart b/pkg/analysis_server/test/integration/analytics/is_enabled_test.dart
index a38ec1f..0f86bfe 100644
--- a/pkg/analysis_server/test/integration/analytics/is_enabled_test.dart
+++ b/pkg/analysis_server/test/integration/analytics/is_enabled_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -19,7 +18,7 @@
Future<void> test_isEnabled() async {
standardAnalysisSetup();
- AnalyticsIsEnabledResult result = await sendAnalyticsIsEnabled();
+ var result = await sendAnalyticsIsEnabled();
// Very lightweight validation of the returned data.
expect(result, isNotNull);
}
diff --git a/pkg/analysis_server/test/integration/analytics/send_event_test.dart b/pkg/analysis_server/test/integration/analytics/send_event_test.dart
index d23b104..5f5aefe 100644
--- a/pkg/analysis_server/test/integration/analytics/send_event_test.dart
+++ b/pkg/analysis_server/test/integration/analytics/send_event_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
import '../support/integration_tests.dart';
@@ -19,7 +18,7 @@
standardAnalysisSetup();
// Disable analytics.
- AnalyticsIsEnabledResult result1 = await sendAnalyticsIsEnabled();
+ var result1 = await sendAnalyticsIsEnabled();
await sendAnalyticsEnable(false);
// Send an event.
diff --git a/pkg/analysis_server/test/integration/analytics/send_timing_test.dart b/pkg/analysis_server/test/integration/analytics/send_timing_test.dart
index 3d7854f..8e74028 100644
--- a/pkg/analysis_server/test/integration/analytics/send_timing_test.dart
+++ b/pkg/analysis_server/test/integration/analytics/send_timing_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
import '../support/integration_tests.dart';
@@ -19,7 +18,7 @@
standardAnalysisSetup();
// Disable analytics.
- AnalyticsIsEnabledResult result1 = await sendAnalyticsIsEnabled();
+ var result1 = await sendAnalyticsIsEnabled();
await sendAnalyticsEnable(false);
// Send an event.
diff --git a/pkg/analysis_server/test/integration/completion/get_suggestions_test.dart b/pkg/analysis_server/test/integration/completion/get_suggestions_test.dart
index 6848ce3..1dd38a1 100644
--- a/pkg/analysis_server/test/integration/completion/get_suggestions_test.dart
+++ b/pkg/analysis_server/test/integration/completion/get_suggestions_test.dart
@@ -26,7 +26,7 @@
expect(completionOffset, isNull, reason: 'Call addTestUnit exactly once');
completionOffset = content.indexOf('^');
expect(completionOffset, isNot(equals(-1)), reason: 'missing ^');
- int nextOffset = content.indexOf('^', completionOffset + 1);
+ var nextOffset = content.indexOf('^', completionOffset + 1);
expect(nextOffset, equals(-1), reason: 'too many ^');
this.content = content.substring(0, completionOffset) +
content.substring(completionOffset + 1);
@@ -42,10 +42,9 @@
writeFile(path, content);
await standardAnalysisSetup();
await analysisFinished;
- CompletionGetSuggestionsResult result =
- await sendCompletionGetSuggestions(path, completionOffset);
- String completionId = result.id;
- CompletionResultsParams param = await onCompletionResults.firstWhere(
+ var result = await sendCompletionGetSuggestions(path, completionOffset);
+ var completionId = result.id;
+ var param = await onCompletionResults.firstWhere(
(CompletionResultsParams param) =>
param.id == completionId && param.isLast);
expect(param.replacementOffset, completionOffset);
@@ -66,10 +65,9 @@
await standardAnalysisSetup();
await sendAnalysisUpdateContent({path: AddContentOverlay(content)});
await analysisFinished;
- CompletionGetSuggestionsResult result =
- await sendCompletionGetSuggestions(path, completionOffset);
- String completionId = result.id;
- CompletionResultsParams param = await onCompletionResults.firstWhere(
+ var result = await sendCompletionGetSuggestions(path, completionOffset);
+ var completionId = result.id;
+ var param = await onCompletionResults.firstWhere(
(CompletionResultsParams param) =>
param.id == completionId && param.isLast);
expect(param.replacementOffset, completionOffset);
@@ -91,7 +89,7 @@
standardAnalysisSetup(subscribeStatus: false);
sendAnalysisUpdateContent({path: AddContentOverlay(content)});
sendCompletionGetSuggestions(path, completionOffset);
- CompletionResultsParams param = await onCompletionResults
+ var param = await onCompletionResults
.firstWhere((CompletionResultsParams param) => param.isLast);
expect(param.replacementOffset, completionOffset);
expect(param.replacementLength, 0);
diff --git a/pkg/analysis_server/test/integration/completion/list_token_details_test.dart b/pkg/analysis_server/test/integration/completion/list_token_details_test.dart
index f649dc9..227fc83 100644
--- a/pkg/analysis_server/test/integration/completion/list_token_details_test.dart
+++ b/pkg/analysis_server/test/integration/completion/list_token_details_test.dart
@@ -27,7 +27,7 @@
@override
Future standardAnalysisSetup({bool subscribeStatus = true}) {
- List<Future> futures = <Future>[];
+ var futures = <Future>[];
if (subscribeStatus) {
futures.add(sendServerSetSubscriptions([ServerService.STATUS]));
}
@@ -36,8 +36,8 @@
}
Future<void> test_getSuggestions() async {
- String aPath = path.join(sourceDirectory.path, 'a');
- String aLibPath = path.join(aPath, 'lib');
+ var aPath = path.join(sourceDirectory.path, 'a');
+ var aLibPath = path.join(aPath, 'lib');
writeFile(path.join(aLibPath, 'a.dart'), '''
class A {}
''');
@@ -45,7 +45,7 @@
a:file://${path.toUri(aLibPath)}
test_package:lib/
''');
- String testFilePath = path.join(testPackagePath, 'lib', 'test.dart');
+ var testFilePath = path.join(testPackagePath, 'lib', 'test.dart');
writeFile(testFilePath, '''
import 'package:a/a.dart';
class B {}
@@ -54,8 +54,7 @@
await standardAnalysisSetup();
await analysisFinished;
- CompletionListTokenDetailsResult result =
- await sendCompletionListTokenDetails(testFilePath);
+ var result = await sendCompletionListTokenDetails(testFilePath);
expect(result, isNotNull);
}
}
diff --git a/pkg/analysis_server/test/integration/coverage_test.dart b/pkg/analysis_server/test/integration/coverage_test.dart
index 3941a75..73caa7a 100644
--- a/pkg/analysis_server/test/integration/coverage_test.dart
+++ b/pkg/analysis_server/test/integration/coverage_test.dart
@@ -29,10 +29,10 @@
coverageFile =
File(path.join(pathPrefix, 'test', 'integration', 'coverage.md'));
- List<String> lines = coverageFile.readAsLinesSync();
+ var lines = coverageFile.readAsLinesSync();
// ## server domain
- Set<String> coveredDomains = lines
+ var coveredDomains = lines
.where((line) => line.startsWith('## ') && line.endsWith(' domain'))
.map((line) =>
line.substring('##'.length, line.length - 'domain'.length).trim())
@@ -40,22 +40,22 @@
// Remove any ' (test failed)' suffixes.
lines = lines.map((String line) {
- int index = line.indexOf('(');
+ var index = line.indexOf('(');
return index != -1 ? line.substring(0, index).trim() : line;
}).toList();
// - [ ] server.getVersion
- Set<String> allMembers = lines
+ var allMembers = lines
.where((line) => line.startsWith('- '))
.map((line) => line.substring('- [ ]'.length).trim())
.toSet();
- Set<String> coveredMembers = lines
+ var coveredMembers = lines
.where((line) => line.startsWith('- [x]'))
.map((line) => line.substring('- [x]'.length).trim())
.toSet();
// generate domain tests
- for (Domain domain in api.domains) {
+ for (var domain in api.domains) {
group('integration coverage of ${domain.name}', () {
// domain
test('domain', () {
@@ -66,19 +66,18 @@
// requests
group('request', () {
- for (Request request in domain.requests) {
- String fullName = '${domain.name}.${request.method}';
+ for (var request in domain.requests) {
+ var fullName = '${domain.name}.${request.method}';
test(fullName, () {
if (!allMembers.contains(fullName)) {
fail('$fullName not found in ${coverageFile.path}');
}
- final String fileName = getCamelWords(request.method)
+ var fileName = getCamelWords(request.method)
.map((s) => s.toLowerCase())
.join('_');
- final String testName =
- path.join(domain.name, '${fileName}_test.dart');
- final String testPath =
+ var testName = path.join(domain.name, '${fileName}_test.dart');
+ var testPath =
path.join(pathPrefix, 'test', 'integration', testName);
// Test that if checked, a test file exists; if not checked, no such
@@ -92,19 +91,18 @@
// notifications
group('notification', () {
- for (Notification notification in domain.notifications) {
- String fullName = '${domain.name}.${notification.event}';
+ for (var notification in domain.notifications) {
+ var fullName = '${domain.name}.${notification.event}';
test(fullName, () {
if (!allMembers.contains(fullName)) {
fail('$fullName not found in ${coverageFile.path}');
}
- final String fileName = getCamelWords(notification.event)
+ var fileName = getCamelWords(notification.event)
.map((s) => s.toLowerCase())
.join('_');
- final String testName =
- path.join(domain.name, '${fileName}_test.dart');
- final String testPath =
+ var testName = path.join(domain.name, '${fileName}_test.dart');
+ var testPath =
path.join(pathPrefix, 'test', 'integration', testName);
// Test that if checked, a test file exists; if not checked, no such
@@ -121,7 +119,7 @@
// validate no unexpected domains
group('integration coverage', () {
test('no unexpected domains', () {
- for (String domain in coveredDomains) {
+ for (var domain in coveredDomains) {
expect(api.domains.map((d) => d.name), contains(domain));
}
});
diff --git a/pkg/analysis_server/test/integration/diagnostic/get_diagnostics_test.dart b/pkg/analysis_server/test/integration/diagnostic/get_diagnostics_test.dart
index bbd1211..84b84ae 100644
--- a/pkg/analysis_server/test/integration/diagnostic/get_diagnostics_test.dart
+++ b/pkg/analysis_server/test/integration/diagnostic/get_diagnostics_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -19,12 +18,11 @@
Future<void> test_getDiagnostics() async {
standardAnalysisSetup();
- DiagnosticGetDiagnosticsResult result =
- await sendDiagnosticGetDiagnostics();
+ var result = await sendDiagnosticGetDiagnostics();
// Do some lightweight validation of the returned data.
expect(result.contexts, hasLength(1));
- ContextData context = result.contexts.first;
+ var context = result.contexts.first;
expect(context.name, isNotEmpty);
}
}
diff --git a/pkg/analysis_server/test/integration/diagnostic/get_server_port_test.dart b/pkg/analysis_server/test/integration/diagnostic/get_server_port_test.dart
index 8ac45b1..42541e2 100644
--- a/pkg/analysis_server/test/integration/diagnostic/get_server_port_test.dart
+++ b/pkg/analysis_server/test/integration/diagnostic/get_server_port_test.dart
@@ -5,7 +5,6 @@
import 'dart:convert';
import 'dart:io';
-import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -22,16 +21,16 @@
Future<void> test_connect() async {
standardAnalysisSetup();
- DiagnosticGetServerPortResult result = await sendDiagnosticGetServerPort();
+ var result = await sendDiagnosticGetServerPort();
expect(result.port, isNotNull);
expect(result.port, isNonZero);
// Connect to the server and verify that it's serving the status page.
- HttpClient client = HttpClient();
- HttpClientRequest request = await client
+ var client = HttpClient();
+ var request = await client
.getUrl(Uri.parse('http://localhost:${result.port}/status'));
- HttpClientResponse response = await request.close();
- String responseBody = await utf8.decodeStream(response.cast<List<int>>());
+ var response = await request.close();
+ var responseBody = await utf8.decodeStream(response.cast<List<int>>());
expect(responseBody, contains('<title>Analysis Server</title>'));
}
}
diff --git a/pkg/analysis_server/test/integration/edit/dartfix_test.dart b/pkg/analysis_server/test/integration/edit/dartfix_test.dart
index f99498e..7029973 100644
--- a/pkg/analysis_server/test/integration/edit/dartfix_test.dart
+++ b/pkg/analysis_server/test/integration/edit/dartfix_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -27,7 +26,7 @@
Future<void> test_dartfix_exclude() async {
setupTarget();
- EditDartfixResult result = await sendEditDartfix([(sourceDirectory.path)],
+ var result = await sendEditDartfix([(sourceDirectory.path)],
excludedFixes: ['convert_class_to_mixin']);
expect(result.hasErrors, isFalse);
expect(result.suggestions.length, 0);
@@ -36,7 +35,7 @@
Future<void> test_dartfix_include() async {
setupTarget();
- EditDartfixResult result = await sendEditDartfix([(sourceDirectory.path)],
+ var result = await sendEditDartfix([(sourceDirectory.path)],
includedFixes: ['convert_class_to_mixin']);
expect(result.hasErrors, isFalse);
expect(result.suggestions.length, greaterThanOrEqualTo(1));
@@ -45,7 +44,7 @@
Future<void> test_dartfix_include_other() async {
setupTarget();
- EditDartfixResult result = await sendEditDartfix([(sourceDirectory.path)],
+ var result = await sendEditDartfix([(sourceDirectory.path)],
includedFixes: ['prefer_int_literals']);
expect(result.hasErrors, isFalse);
expect(result.suggestions.length, 0);
diff --git a/pkg/analysis_server/test/integration/edit/format_test.dart b/pkg/analysis_server/test/integration/edit/format_test.dart
index 530d73a..081d9fc 100644
--- a/pkg/analysis_server/test/integration/edit/format_test.dart
+++ b/pkg/analysis_server/test/integration/edit/format_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -17,10 +16,10 @@
@reflectiveTest
class FormatTest extends AbstractAnalysisServerIntegrationTest {
String formatTestSetup({bool withErrors = false}) {
- String pathname = sourcePath('test.dart');
+ var pathname = sourcePath('test.dart');
if (withErrors) {
- String text = r'''
+ var text = r'''
class Class1 {
int field
void foo() {
@@ -29,7 +28,7 @@
''';
writeFile(pathname, text);
} else {
- String text = r'''
+ var text = r'''
class Class1 {
int field;
@@ -47,28 +46,27 @@
}
Future<void> test_format() async {
- String pathname = formatTestSetup();
+ var pathname = formatTestSetup();
- EditFormatResult result = await sendEditFormat(pathname, 0, 0);
+ var result = await sendEditFormat(pathname, 0, 0);
expect(result.edits, isNotEmpty);
expect(result.selectionOffset, 0);
expect(result.selectionLength, 0);
}
Future<void> test_format_preserve_selection() async {
- String pathname = formatTestSetup();
+ var pathname = formatTestSetup();
// format with 'bar' selected
- int initialPosition = readFile(pathname).indexOf('bar()');
- EditFormatResult result =
- await sendEditFormat(pathname, initialPosition, 'bar'.length);
+ var initialPosition = readFile(pathname).indexOf('bar()');
+ var result = await sendEditFormat(pathname, initialPosition, 'bar'.length);
expect(result.edits, isNotEmpty);
expect(result.selectionOffset, initialPosition - 3);
expect(result.selectionLength, 'bar'.length);
}
Future<void> test_format_with_errors() async {
- String pathname = formatTestSetup(withErrors: true);
+ var pathname = formatTestSetup(withErrors: true);
try {
await sendEditFormat(pathname, 0, 0);
diff --git a/pkg/analysis_server/test/integration/edit/get_assists_test.dart b/pkg/analysis_server/test/integration/edit/get_assists_test.dart
index a5fff4f..a84f534 100644
--- a/pkg/analysis_server/test/integration/edit/get_assists_test.dart
+++ b/pkg/analysis_server/test/integration/edit/get_assists_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -18,8 +17,8 @@
@reflectiveTest
class GetAssistsTest extends AbstractAnalysisServerIntegrationTest {
Future<void> test_has_assists() async {
- String pathname = sourcePath('test.dart');
- String text = r'''
+ var pathname = sourcePath('test.dart');
+ var text = r'''
import 'dart:async';
Future f;
@@ -31,16 +30,16 @@
expect(currentAnalysisErrors[pathname], isEmpty);
// expect at least one assist (add show combinator to the dart:async import)
- EditGetAssistsResult result =
+ var result =
await sendEditGetAssists(pathname, text.indexOf('dart:async'), 0);
expect(result.assists, isNotEmpty);
// apply it and make sure that the code analyzing cleanly
- SourceChange change = result.assists.singleWhere((SourceChange change) =>
+ var change = result.assists.singleWhere((SourceChange change) =>
change.message == "Add explicit 'show' combinator");
expect(change.edits, hasLength(1));
expect(change.edits.first.edits, hasLength(1));
- SourceEdit edit = change.edits.first.edits.first;
+ var edit = change.edits.first.edits.first;
text = text.replaceRange(edit.offset, edit.end, edit.replacement);
writeFile(pathname, text);
diff --git a/pkg/analysis_server/test/integration/edit/get_available_refactorings_test.dart b/pkg/analysis_server/test/integration/edit/get_available_refactorings_test.dart
index 7b11a6e..79b7389 100644
--- a/pkg/analysis_server/test/integration/edit/get_available_refactorings_test.dart
+++ b/pkg/analysis_server/test/integration/edit/get_available_refactorings_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -18,8 +17,8 @@
class GetAvailableRefactoringsTest
extends AbstractAnalysisServerIntegrationTest {
Future<void> test_has_refactorings() async {
- String pathname = sourcePath('test.dart');
- String text = r'''
+ var pathname = sourcePath('test.dart');
+ var text = r'''
void foo() { }
''';
writeFile(pathname, text);
@@ -29,9 +28,8 @@
expect(currentAnalysisErrors[pathname], isEmpty);
// expect at least one refactoring
- EditGetAvailableRefactoringsResult result =
- await sendEditGetAvailableRefactorings(
- pathname, text.indexOf('foo('), 0);
+ var result = await sendEditGetAvailableRefactorings(
+ pathname, text.indexOf('foo('), 0);
expect(result.kinds, isNotEmpty);
}
}
diff --git a/pkg/analysis_server/test/integration/edit/get_dartfix_info_test.dart b/pkg/analysis_server/test/integration/edit/get_dartfix_info_test.dart
index 3d445e0..3d3bf9f 100644
--- a/pkg/analysis_server/test/integration/edit/get_dartfix_info_test.dart
+++ b/pkg/analysis_server/test/integration/edit/get_dartfix_info_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -18,7 +17,7 @@
class GetDartfixInfoTest extends AbstractAnalysisServerIntegrationTest {
Future<void> test_getDartfixInfo() async {
standardAnalysisSetup();
- EditGetDartfixInfoResult info = await sendEditGetDartfixInfo();
+ var info = await sendEditGetDartfixInfo();
expect(info.fixes.length, greaterThanOrEqualTo(3));
}
}
diff --git a/pkg/analysis_server/test/integration/edit/get_fixes_test.dart b/pkg/analysis_server/test/integration/edit/get_fixes_test.dart
index 23e238a..6610ea2 100644
--- a/pkg/analysis_server/test/integration/edit/get_fixes_test.dart
+++ b/pkg/analysis_server/test/integration/edit/get_fixes_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -18,8 +17,8 @@
@reflectiveTest
class GetFixesTest extends AbstractAnalysisServerIntegrationTest {
Future<void> test_has_fixes() async {
- String pathname = sourcePath('test.dart');
- String text = r'''
+ var pathname = sourcePath('test.dart');
+ var text = r'''
FutureOr f;
''';
writeFile(pathname, text);
@@ -28,25 +27,24 @@
await analysisFinished;
expect(currentAnalysisErrors[pathname], isNotEmpty);
- EditGetFixesResult result =
- await sendEditGetFixes(pathname, text.indexOf('FutureOr f'));
+ var result = await sendEditGetFixes(pathname, text.indexOf('FutureOr f'));
expect(result.fixes, hasLength(1));
- AnalysisErrorFixes fix = result.fixes.first;
+ var fix = result.fixes.first;
expect(fix.error.code, 'undefined_class');
// expect a suggestion to add the dart:async import
expect(fix.fixes, isNotEmpty);
- SourceChange change = fix.fixes.singleWhere(
+ var change = fix.fixes.singleWhere(
(SourceChange change) => change.message.startsWith('Import '));
expect(change.edits, hasLength(1));
expect(change.edits.first.edits, hasLength(1));
}
Future<void> test_no_fixes() async {
- String pathname = sourcePath('test.dart');
- String text = r'''
+ var pathname = sourcePath('test.dart');
+ var text = r'''
import 'dart:async';
FutureOr f;
@@ -54,8 +52,7 @@
writeFile(pathname, text);
standardAnalysisSetup();
- EditGetFixesResult result =
- await sendEditGetFixes(pathname, text.indexOf('FutureOr f'));
+ var result = await sendEditGetFixes(pathname, text.indexOf('FutureOr f'));
expect(result.fixes, isEmpty);
}
}
diff --git a/pkg/analysis_server/test/integration/edit/get_postfix_completion_test.dart b/pkg/analysis_server/test/integration/edit/get_postfix_completion_test.dart
index 61b0d99..db032ec 100644
--- a/pkg/analysis_server/test/integration/edit/get_postfix_completion_test.dart
+++ b/pkg/analysis_server/test/integration/edit/get_postfix_completion_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -19,14 +18,14 @@
class GetPostfixCompletionTest extends AbstractAnalysisServerIntegrationTest {
@TestTimeout(Timeout.factor(2))
Future<void> test_postfix_completion() async {
- String pathname = sourcePath('test.dart');
- String text = r'''
+ var pathname = sourcePath('test.dart');
+ var text = r'''
void bar() {
foo();.tryon
}
void foo() { }
''';
- int loc = text.indexOf('.tryon');
+ var loc = text.indexOf('.tryon');
text = text.replaceAll('.tryon', '');
writeFile(pathname, text);
standardAnalysisSetup();
@@ -35,14 +34,13 @@
expect(currentAnalysisErrors[pathname], isEmpty);
// expect a postfix completion result
- EditGetPostfixCompletionResult result =
- await sendEditGetPostfixCompletion(pathname, '.tryon', loc);
+ var result = await sendEditGetPostfixCompletion(pathname, '.tryon', loc);
expect(result.change.edits, isNotEmpty);
// apply the edit, expect that the new code has no errors
- SourceChange change = result.change;
+ var change = result.change;
expect(change.edits.first.edits, isNotEmpty);
- for (SourceEdit edit in change.edits.first.edits) {
+ for (var edit in change.edits.first.edits) {
text = text.replaceRange(edit.offset, edit.end, edit.replacement);
}
await sendAnalysisUpdateContent({pathname: AddContentOverlay(text)});
diff --git a/pkg/analysis_server/test/integration/edit/get_refactoring_test.dart b/pkg/analysis_server/test/integration/edit/get_refactoring_test.dart
index bb0d602..81b5e22 100644
--- a/pkg/analysis_server/test/integration/edit/get_refactoring_test.dart
+++ b/pkg/analysis_server/test/integration/edit/get_refactoring_test.dart
@@ -18,8 +18,8 @@
@reflectiveTest
class GetRefactoringTest extends AbstractAnalysisServerIntegrationTest {
Future<void> test_rename() async {
- String pathname = sourcePath('test.dart');
- String text = r'''
+ var pathname = sourcePath('test.dart');
+ var text = r'''
void foo() { }
void bar() {
@@ -34,7 +34,7 @@
expect(currentAnalysisErrors[pathname], isEmpty);
// expect no edits if no rename options specified
- EditGetRefactoringResult result = await sendEditGetRefactoring(
+ var result = await sendEditGetRefactoring(
RefactoringKind.RENAME, pathname, text.indexOf('foo('), 0, false);
expect(result.initialProblems, isEmpty);
expect(result.optionsProblems, isEmpty);
@@ -53,9 +53,9 @@
expect(result.change.edits, isNotEmpty);
// apply the refactoring, expect that the new code has no errors
- SourceChange change = result.change;
+ var change = result.change;
expect(change.edits.first.edits, isNotEmpty);
- for (SourceEdit edit in change.edits.first.edits) {
+ for (var edit in change.edits.first.edits) {
text = text.replaceRange(edit.offset, edit.end, edit.replacement);
}
await sendAnalysisUpdateContent({pathname: AddContentOverlay(text)});
diff --git a/pkg/analysis_server/test/integration/edit/get_statement_completion_test.dart b/pkg/analysis_server/test/integration/edit/get_statement_completion_test.dart
index 5b12cc8..5c3ce3e 100644
--- a/pkg/analysis_server/test/integration/edit/get_statement_completion_test.dart
+++ b/pkg/analysis_server/test/integration/edit/get_statement_completion_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -19,8 +18,8 @@
class GetStatementCompletionTest extends AbstractAnalysisServerIntegrationTest {
@TestTimeout(Timeout.factor(2))
Future<void> test_statement_completion() async {
- String pathname = sourcePath('test.dart');
- String text = r'''
+ var pathname = sourcePath('test.dart');
+ var text = r'''
void bar() { foo() } // missing semi-colon
void foo() { }''';
writeFile(pathname, text);
@@ -30,14 +29,14 @@
expect(currentAnalysisErrors[pathname], isNotEmpty);
// expect a statement completion result
- EditGetStatementCompletionResult result =
+ var result =
await sendEditGetStatementCompletion(pathname, text.indexOf('foo('));
expect(result.change.edits, isNotEmpty);
// apply the edit, expect that the new code has no errors
- SourceChange change = result.change;
+ var change = result.change;
expect(change.edits.first.edits, isNotEmpty);
- for (SourceEdit edit in change.edits.first.edits) {
+ for (var edit in change.edits.first.edits) {
text = text.replaceRange(edit.offset, edit.end, edit.replacement);
}
expect(text, r'''
diff --git a/pkg/analysis_server/test/integration/edit/import_elements_test.dart b/pkg/analysis_server/test/integration/edit/import_elements_test.dart
index bf89c2c..790173e 100644
--- a/pkg/analysis_server/test/integration/edit/import_elements_test.dart
+++ b/pkg/analysis_server/test/integration/edit/import_elements_test.dart
@@ -37,8 +37,8 @@
}
int find(List<SourceEdit> actual, SourceEdit expectedEdit) {
- for (int i = 0; i < actual.length; i++) {
- SourceEdit actualEdit = actual[i];
+ for (var i = 0; i < actual.length; i++) {
+ var actualEdit = actual[i];
if (equals(actualEdit, expectedEdit)) {
return i;
}
@@ -46,20 +46,19 @@
return -1;
}
- EditImportElementsResult result =
- await sendEditImportElements(pathname, elements);
+ var result = await sendEditImportElements(pathname, elements);
- SourceFileEdit edit = result.edit;
+ var edit = result.edit;
expect(edit, isNotNull);
if (expectedFile == null) {
expect(edit.file, pathname);
} else {
expect(edit.file, expectedFile);
}
- List<SourceEdit> actual = edit.edits;
+ var actual = edit.edits;
expect(actual, hasLength(expected.length));
- for (SourceEdit expectedEdit in expected) {
- int index = find(actual, expectedEdit);
+ for (var expectedEdit in expected) {
+ var index = find(actual, expectedEdit);
if (index < 0) {
fail('Expected $expectedEdit; not found');
}
@@ -70,8 +69,7 @@
/// Check that an edit.importElements request with the given list of
/// [elements] produces no edits.
Future<void> checkNoEdits(List<ImportedElements> elements) async {
- EditImportElementsResult result =
- await sendEditImportElements(pathname, <ImportedElements>[]);
+ var result = await sendEditImportElements(pathname, <ImportedElements>[]);
expect(result.edit, isNull);
}
@@ -86,9 +84,9 @@
writeFile(pathname, 'main() {}');
standardAnalysisSetup();
await analysisFinished;
- PhysicalResourceProvider provider = PhysicalResourceProvider.INSTANCE;
- String sdkPath = FolderBasedDartSdk.defaultSdkDirectory(provider).path;
- String mathPath =
+ var provider = PhysicalResourceProvider.INSTANCE;
+ var sdkPath = FolderBasedDartSdk.defaultSdkDirectory(provider).path;
+ var mathPath =
provider.pathContext.join(sdkPath, 'lib', 'math', 'math.dart');
await checkEdits(<ImportedElements>[
@@ -107,7 +105,7 @@
}
Future<void> test_importElements_part() async {
- String libName = sourcePath('lib.dart');
+ var libName = sourcePath('lib.dart');
writeFile(libName, '''
part 'test.dart';
main() {}
@@ -119,9 +117,9 @@
''');
standardAnalysisSetup();
await analysisFinished;
- PhysicalResourceProvider provider = PhysicalResourceProvider.INSTANCE;
- String sdkPath = FolderBasedDartSdk.defaultSdkDirectory(provider).path;
- String mathPath =
+ var provider = PhysicalResourceProvider.INSTANCE;
+ var sdkPath = FolderBasedDartSdk.defaultSdkDirectory(provider).path;
+ var mathPath =
provider.pathContext.join(sdkPath, 'lib', 'math', 'math.dart');
await checkEdits(<ImportedElements>[
diff --git a/pkg/analysis_server/test/integration/edit/is_postfix_completion_applicable_test.dart b/pkg/analysis_server/test/integration/edit/is_postfix_completion_applicable_test.dart
index 712a698..af423d1 100644
--- a/pkg/analysis_server/test/integration/edit/is_postfix_completion_applicable_test.dart
+++ b/pkg/analysis_server/test/integration/edit/is_postfix_completion_applicable_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -18,14 +17,14 @@
class IsPostfixCompletionApplicableTest
extends AbstractAnalysisServerIntegrationTest {
Future<void> test_is_postfix_completion_applicable() async {
- String pathname = sourcePath('test.dart');
- String text = r'''
+ var pathname = sourcePath('test.dart');
+ var text = r'''
void bar() {
foo();.tryon
}
void foo() { }
''';
- int loc = text.indexOf('.tryon');
+ var loc = text.indexOf('.tryon');
text = text.replaceAll('.tryon', '');
writeFile(pathname, text);
standardAnalysisSetup();
@@ -34,7 +33,7 @@
expect(currentAnalysisErrors[pathname], isEmpty);
// expect a postfix completion applicable result
- EditIsPostfixCompletionApplicableResult result =
+ var result =
await sendEditIsPostfixCompletionApplicable(pathname, '.tryon', loc);
expect(result.value, isTrue);
}
diff --git a/pkg/analysis_server/test/integration/edit/list_postfix_completion_templates_test.dart b/pkg/analysis_server/test/integration/edit/list_postfix_completion_templates_test.dart
index 4c96713..21f950d 100644
--- a/pkg/analysis_server/test/integration/edit/list_postfix_completion_templates_test.dart
+++ b/pkg/analysis_server/test/integration/edit/list_postfix_completion_templates_test.dart
@@ -18,8 +18,8 @@
class ListPostfixCompletionTemplatesTest
extends AbstractAnalysisServerIntegrationTest {
Future<void> test_list_postfix_completion_templates() async {
- String pathname = sourcePath('test.dart');
- String text = r'''
+ var pathname = sourcePath('test.dart');
+ var text = r'''
void bar() {
foo();.tryon
}
@@ -32,8 +32,7 @@
await analysisFinished;
// expect a postfix template list result
- EditListPostfixCompletionTemplatesResult result =
- await sendEditListPostfixCompletionTemplates();
+ var result = await sendEditListPostfixCompletionTemplates();
expect(result.templates, isNotNull);
expect(result.templates.length, greaterThan(15));
expect(result.templates[0].runtimeType, PostfixTemplateDescriptor);
diff --git a/pkg/analysis_server/test/integration/edit/organize_directives_test.dart b/pkg/analysis_server/test/integration/edit/organize_directives_test.dart
index 410df1b..8a74524 100644
--- a/pkg/analysis_server/test/integration/edit/organize_directives_test.dart
+++ b/pkg/analysis_server/test/integration/edit/organize_directives_test.dart
@@ -2,8 +2,6 @@
// 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.
-import 'package:analysis_server/protocol/protocol_generated.dart';
-import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -18,8 +16,8 @@
@reflectiveTest
class OrganizeDirectivesTest extends AbstractAnalysisServerIntegrationTest {
Future<void> test_organize_directives() async {
- String pathname = sourcePath('test.dart');
- String text = r'''
+ var pathname = sourcePath('test.dart');
+ var text = r'''
import 'dart:math';
import 'dart:async';
@@ -29,17 +27,16 @@
writeFile(pathname, text);
standardAnalysisSetup();
- EditOrganizeDirectivesResult result =
- await sendEditOrganizeDirectives(pathname);
- SourceFileEdit edit = result.edit;
+ var result = await sendEditOrganizeDirectives(pathname);
+ var edit = result.edit;
expect(edit.edits, hasLength(1));
expect(edit.edits.first.replacement,
"import 'dart:async';\nimport 'dart:math");
}
Future<void> test_organize_directives_no_changes() async {
- String pathname = sourcePath('test.dart');
- String text = r'''
+ var pathname = sourcePath('test.dart');
+ var text = r'''
import 'dart:async';
import 'dart:math';
@@ -49,15 +46,14 @@
writeFile(pathname, text);
standardAnalysisSetup();
- EditOrganizeDirectivesResult result =
- await sendEditOrganizeDirectives(pathname);
- SourceFileEdit edit = result.edit;
+ var result = await sendEditOrganizeDirectives(pathname);
+ var edit = result.edit;
expect(edit.edits, isEmpty);
}
Future<void> test_organize_directives_with_errors() async {
- String pathname = sourcePath('test.dart');
- String text = r'''
+ var pathname = sourcePath('test.dart');
+ var text = r'''
import 'dart:async'
import 'dart:math';
diff --git a/pkg/analysis_server/test/integration/edit/sort_members_test.dart b/pkg/analysis_server/test/integration/edit/sort_members_test.dart
index 607e05a..a49aca3 100644
--- a/pkg/analysis_server/test/integration/edit/sort_members_test.dart
+++ b/pkg/analysis_server/test/integration/edit/sort_members_test.dart
@@ -2,8 +2,6 @@
// 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.
-import 'package:analysis_server/protocol/protocol_generated.dart';
-import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -18,37 +16,37 @@
@reflectiveTest
class SortMembersTest extends AbstractAnalysisServerIntegrationTest {
Future<void> test_sort() async {
- String pathname = sourcePath('test.dart');
- String text = r'''
+ var pathname = sourcePath('test.dart');
+ var text = r'''
int foo;
int bar;
''';
writeFile(pathname, text);
standardAnalysisSetup();
- EditSortMembersResult result = await sendEditSortMembers(pathname);
- SourceFileEdit edit = result.edit;
+ var result = await sendEditSortMembers(pathname);
+ var edit = result.edit;
expect(edit.edits, hasLength(1));
expect(edit.edits.first.replacement, 'bar;\nint foo');
}
Future<void> test_sort_no_changes() async {
- String pathname = sourcePath('test.dart');
- String text = r'''
+ var pathname = sourcePath('test.dart');
+ var text = r'''
int bar;
int foo;
''';
writeFile(pathname, text);
standardAnalysisSetup();
- EditSortMembersResult result = await sendEditSortMembers(pathname);
- SourceFileEdit edit = result.edit;
+ var result = await sendEditSortMembers(pathname);
+ var edit = result.edit;
expect(edit.edits, isEmpty);
}
Future<void> test_sort_with_errors() async {
- String pathname = sourcePath('test.dart');
- String text = r'''
+ var pathname = sourcePath('test.dart');
+ var text = r'''
int foo
int bar;
''';
diff --git a/pkg/analysis_server/test/integration/execution/create_context_test.dart b/pkg/analysis_server/test/integration/execution/create_context_test.dart
index 3c05f33..563e405 100644
--- a/pkg/analysis_server/test/integration/execution/create_context_test.dart
+++ b/pkg/analysis_server/test/integration/execution/create_context_test.dart
@@ -17,8 +17,7 @@
class CreateContextTest extends AbstractAnalysisServerIntegrationTest {
Future<void> test_create() async {
standardAnalysisSetup();
- String contextId =
- (await sendExecutionCreateContext(sourceDirectory.path)).id;
+ var contextId = (await sendExecutionCreateContext(sourceDirectory.path)).id;
expect(contextId, isNotNull);
}
}
diff --git a/pkg/analysis_server/test/integration/execution/delete_context_test.dart b/pkg/analysis_server/test/integration/execution/delete_context_test.dart
index 05b2db7..4087c06 100644
--- a/pkg/analysis_server/test/integration/execution/delete_context_test.dart
+++ b/pkg/analysis_server/test/integration/execution/delete_context_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -17,15 +16,14 @@
@reflectiveTest
class DeleteContextTest extends AbstractAnalysisServerIntegrationTest {
Future<void> test_delete() async {
- String pathname = sourcePath('lib/main.dart');
+ var pathname = sourcePath('lib/main.dart');
writeFile(pathname, '// dummy');
writeFile(sourcePath('.packages'), 'foo:lib/');
standardAnalysisSetup();
- String contextId =
- (await sendExecutionCreateContext(sourceDirectory.path)).id;
+ var contextId = (await sendExecutionCreateContext(sourceDirectory.path)).id;
- ExecutionMapUriResult result =
+ var result =
await sendExecutionMapUri(contextId, uri: 'package:foo/main.dart');
expect(result.file, pathname);
diff --git a/pkg/analysis_server/test/integration/execution/map_uri_test.dart b/pkg/analysis_server/test/integration/execution/map_uri_test.dart
index 384cc6d..98f9e7e 100644
--- a/pkg/analysis_server/test/integration/execution/map_uri_test.dart
+++ b/pkg/analysis_server/test/integration/execution/map_uri_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -17,23 +16,22 @@
@reflectiveTest
class MapUriTest extends AbstractAnalysisServerIntegrationTest {
Future<void> test_mapUri() async {
- String pathname = sourcePath('lib/main.dart');
+ var pathname = sourcePath('lib/main.dart');
writeFile(pathname, '// dummy');
writeFile(sourcePath('.packages'), 'foo:lib/');
standardAnalysisSetup();
- String contextId =
+ var contextId =
(await sendExecutionCreateContext(sourceDirectory.path))?.id;
{
- ExecutionMapUriResult result =
+ var result =
await sendExecutionMapUri(contextId, uri: 'package:foo/main.dart');
expect(result.file, pathname);
}
{
- ExecutionMapUriResult result =
- await sendExecutionMapUri(contextId, file: pathname);
+ var result = await sendExecutionMapUri(contextId, file: pathname);
expect(result.uri, 'package:foo/main.dart');
}
}
diff --git a/pkg/analysis_server/test/integration/kythe/get_kythe_entries_test.dart b/pkg/analysis_server/test/integration/kythe/get_kythe_entries_test.dart
index 7646865..00719b3 100644
--- a/pkg/analysis_server/test/integration/kythe/get_kythe_entries_test.dart
+++ b/pkg/analysis_server/test/integration/kythe/get_kythe_entries_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -18,8 +17,8 @@
class GetKytheEntriesTest extends AbstractAnalysisServerIntegrationTest {
Future<void> test_getKytheEntries() async {
writeFile(sourcePath('WORKSPACE'), '');
- String pathname = sourcePath('pkg/test.dart');
- String text = r'''
+ var pathname = sourcePath('pkg/test.dart');
+ var text = r'''
class Foo {}
class Bar {
@@ -31,8 +30,7 @@
await analysisFinished;
- KytheGetKytheEntriesResult result =
- await sendKytheGetKytheEntries(pathname);
+ var result = await sendKytheGetKytheEntries(pathname);
expect(result.entries, isNotEmpty);
expect(result.files, isEmpty);
}
diff --git a/pkg/analysis_server/test/integration/lsp_server/integration_tests.dart b/pkg/analysis_server/test/integration/lsp_server/integration_tests.dart
index f0ddbfd..4e79f93 100644
--- a/pkg/analysis_server/test/integration/lsp_server/integration_tests.dart
+++ b/pkg/analysis_server/test/integration/lsp_server/integration_tests.dart
@@ -127,7 +127,7 @@
/// upward to the 'test' dir, and then going up one more directory.
String findRoot(String pathname) {
while (!['benchmark', 'test'].contains(basename(pathname))) {
- String parent = dirname(pathname);
+ var parent = dirname(pathname);
if (parent.length >= pathname.length) {
throw Exception("Can't find root directory");
}
@@ -141,9 +141,9 @@
throw Exception('Process already started');
}
- String dartBinary = Platform.executable;
+ var dartBinary = Platform.executable;
- final bool useSnapshot = true;
+ var useSnapshot = true;
String serverPath;
if (useSnapshot) {
diff --git a/pkg/analysis_server/test/integration/lsp_server/server_test.dart b/pkg/analysis_server/test/integration/lsp_server/server_test.dart
index 12b3f00..8ceb281 100644
--- a/pkg/analysis_server/test/integration/lsp_server/server_test.dart
+++ b/pkg/analysis_server/test/integration/lsp_server/server_test.dart
@@ -31,7 +31,7 @@
// Ensure the server was actually started.
final client = HttpClient();
- HttpClientRequest request = await client
+ var request = await client
.getUrl(Uri.parse('http://localhost:${server.port}/status'));
final response = await request.close();
final responseBody = await utf8.decodeStream(response.cast<List<int>>());
diff --git a/pkg/analysis_server/test/integration/search/find_element_references_test.dart b/pkg/analysis_server/test/integration/search/find_element_references_test.dart
index fa9d879..222d0dc 100644
--- a/pkg/analysis_server/test/integration/search/find_element_references_test.dart
+++ b/pkg/analysis_server/test/integration/search/find_element_references_test.dart
@@ -21,7 +21,7 @@
String pathname;
Future<void> test_badTarget() async {
- String text = r'''
+ var text = r'''
main() {
if /* target */ (true) {
print('Hello');
@@ -34,12 +34,12 @@
standardAnalysisSetup();
await analysisFinished;
- List<SearchResult> results = await _findElementReferences(text);
+ var results = await _findElementReferences(text);
expect(results, isNull);
}
Future<void> test_findReferences() async {
- String text = r'''
+ var text = r'''
main() {
foo /* target */ ('Hello');
}
@@ -52,9 +52,9 @@
standardAnalysisSetup();
await analysisFinished;
- List<SearchResult> results = await _findElementReferences(text);
+ var results = await _findElementReferences(text);
expect(results, hasLength(1));
- SearchResult result = results.first;
+ var result = results.first;
expect(result.location.file, pathname);
expect(result.isPotential, isFalse);
expect(result.kind.name, SearchResultKind.INVOCATION.name);
@@ -62,11 +62,10 @@
}
Future<List<SearchResult>> _findElementReferences(String text) async {
- int offset = text.indexOf(' /* target */') - 1;
- SearchFindElementReferencesResult result =
- await sendSearchFindElementReferences(pathname, offset, false);
+ var offset = text.indexOf(' /* target */') - 1;
+ var result = await sendSearchFindElementReferences(pathname, offset, false);
if (result.id == null) return null;
- SearchResultsParams searchParams = await onSearchResults.first;
+ var searchParams = await onSearchResults.first;
expect(searchParams.id, result.id);
expect(searchParams.isLast, isTrue);
return searchParams.results;
diff --git a/pkg/analysis_server/test/integration/search/find_member_declarations_test.dart b/pkg/analysis_server/test/integration/search/find_member_declarations_test.dart
index 57eb550..74fab07 100644
--- a/pkg/analysis_server/test/integration/search/find_member_declarations_test.dart
+++ b/pkg/analysis_server/test/integration/search/find_member_declarations_test.dart
@@ -19,7 +19,7 @@
String pathname;
Future<void> test_findMemberDeclarations() async {
- String text = r'''
+ var text = r'''
String qux() => 'qux';
class Foo {
@@ -33,16 +33,15 @@
standardAnalysisSetup();
await analysisFinished;
- SearchFindMemberDeclarationsResult declarationsResult =
- await sendSearchFindMemberDeclarations('bar');
+ var declarationsResult = await sendSearchFindMemberDeclarations('bar');
expect(declarationsResult.id, isNotNull);
- SearchResultsParams searchParams = await onSearchResults.first;
+ var searchParams = await onSearchResults.first;
expect(searchParams.id, declarationsResult.id);
expect(searchParams.isLast, isTrue);
expect(searchParams.results, isNotEmpty);
- SearchResult result = searchParams.results.first;
+ var result = searchParams.results.first;
expect(result.location.file, pathname);
expect(result.isPotential, isFalse);
expect(result.kind.name, SearchResultKind.DECLARATION.name);
diff --git a/pkg/analysis_server/test/integration/search/find_member_references_test.dart b/pkg/analysis_server/test/integration/search/find_member_references_test.dart
index bb88f5f..249a3ba 100644
--- a/pkg/analysis_server/test/integration/search/find_member_references_test.dart
+++ b/pkg/analysis_server/test/integration/search/find_member_references_test.dart
@@ -19,7 +19,7 @@
String pathname;
Future<void> test_findMemberReferences() async {
- String text = r'''
+ var text = r'''
String qux() => 'qux';
class Foo {
@@ -33,17 +33,16 @@
standardAnalysisSetup();
await analysisFinished;
- SearchFindMemberReferencesResult referencesResult =
- await sendSearchFindMemberReferences('bar');
+ var referencesResult = await sendSearchFindMemberReferences('bar');
expect(referencesResult.id, isNotNull);
- SearchResultsParams searchParams = await onSearchResults.first;
+ var searchParams = await onSearchResults.first;
expect(searchParams.id, referencesResult.id);
expect(searchParams.isLast, isTrue);
expect(searchParams.results, isNotEmpty);
expect(searchParams.results, hasLength(2));
- SearchResult result = searchParams.results.first;
+ var result = searchParams.results.first;
expect(result.location.file, pathname);
expect(result.isPotential, isTrue);
expect(result.kind.name, SearchResultKind.INVOCATION.name);
diff --git a/pkg/analysis_server/test/integration/search/find_top_level_declarations_test.dart b/pkg/analysis_server/test/integration/search/find_top_level_declarations_test.dart
index 231edca..79d3eb8 100644
--- a/pkg/analysis_server/test/integration/search/find_top_level_declarations_test.dart
+++ b/pkg/analysis_server/test/integration/search/find_top_level_declarations_test.dart
@@ -20,7 +20,7 @@
String pathname;
Future<void> test_findTopLevelDeclarations() async {
- String text = r'''
+ var text = r'''
String qux() => 'qux';
class Foo {
@@ -34,16 +34,15 @@
standardAnalysisSetup();
await analysisFinished;
- SearchFindTopLevelDeclarationsResult declarationsResult =
- await sendSearchFindTopLevelDeclarations(r'qu.*');
+ var declarationsResult = await sendSearchFindTopLevelDeclarations(r'qu.*');
expect(declarationsResult.id, isNotNull);
- SearchResultsParams searchParams = await onSearchResults.first;
+ var searchParams = await onSearchResults.first;
expect(searchParams.id, declarationsResult.id);
expect(searchParams.isLast, isTrue);
expect(searchParams.results, isNotEmpty);
- for (SearchResult result in searchParams.results) {
+ for (var result in searchParams.results) {
if (result.location.file == pathname) {
expect(result.isPotential, isFalse);
expect(result.kind.name, SearchResultKind.DECLARATION.name);
diff --git a/pkg/analysis_server/test/integration/search/get_type_hierarchy_test.dart b/pkg/analysis_server/test/integration/search/get_type_hierarchy_test.dart
index cda59bd..ceaf72d 100644
--- a/pkg/analysis_server/test/integration/search/get_type_hierarchy_test.dart
+++ b/pkg/analysis_server/test/integration/search/get_type_hierarchy_test.dart
@@ -23,7 +23,7 @@
String pathname;
Future getTypeHierarchy_badTarget() {
- String text = r'''
+ var text = r'''
main() {
if /* target */ (true) {
print('Hello');
@@ -36,7 +36,7 @@
}
Future getTypeHierarchy_classElement() {
- String text = r'''
+ var text = r'''
class Base {}
class Pivot /* target */ extends Base {}
class Derived extends Pivot {}
@@ -47,7 +47,7 @@
void checkElement(String name) {
// We don't check the full element data structure; just enough to make
// sure that we're pointing to the correct element.
- Element element = results.items[results.nameToIndex[name]].classElement;
+ var element = results.items[results.nameToIndex[name]].classElement;
expect(element.kind, equals(ElementKind.CLASS));
expect(element.name, equals(name));
if (name != 'Object') {
@@ -64,7 +64,7 @@
}
Future getTypeHierarchy_displayName() {
- String text = r'''
+ var text = r'''
class Base<T> {}
class Pivot /* target */ extends Base<int> {}
''';
@@ -77,7 +77,7 @@
}
Future getTypeHierarchy_functionTarget() {
- String text = r'''
+ var text = r'''
main /* target */ () {
}
''';
@@ -87,7 +87,7 @@
}
Future getTypeHierarchy_interfaces() {
- String text = r'''
+ var text = r'''
class Interface1 {}
class Interface2 {}
class Pivot /* target */ implements Interface1, Interface2 {}
@@ -106,7 +106,7 @@
}
Future getTypeHierarchy_memberElement() {
- String text = r'''
+ var text = r'''
class Base1 {
void foo /* base1 */ ();
}
@@ -133,7 +133,7 @@
}
Future getTypeHierarchy_mixins() {
- String text = r'''
+ var text = r'''
class Base {}
class Mixin1 {}
class Mixin2 {}
@@ -152,7 +152,7 @@
}
Future getTypeHierarchy_subclasses() {
- String text = r'''
+ var text = r'''
class Base {}
class Pivot /* target */ extends Base {}
class Sub1 extends Pivot {}
@@ -174,7 +174,7 @@
}
Future getTypeHierarchy_superclass() {
- String text = r'''
+ var text = r'''
class Base1 {}
class Base2 extends Base1 {}
class Pivot /* target */ extends Base2 {}
@@ -200,7 +200,7 @@
// Run all the getTypeHierarchy tests at once so that the server can take
// advantage of incremental analysis and the test doesn't time out.
- List tests = [
+ var tests = [
getTypeHierarchy_classElement,
getTypeHierarchy_displayName,
getTypeHierarchy_memberElement,
@@ -215,7 +215,7 @@
}
Future<HierarchyResults> typeHierarchyTest(String text) async {
- int offset = text.indexOf(' /* target */') - 1;
+ var offset = text.indexOf(' /* target */') - 1;
sendAnalysisUpdateContent({pathname: AddContentOverlay(text)});
await analysisFinished;
var result = await sendSearchGetTypeHierarchy(pathname, offset);
@@ -244,7 +244,7 @@
HierarchyResults(this.items) {
pivot = items[0];
nameToIndex = <String, int>{};
- for (int i = 0; i < items.length; i++) {
+ for (var i = 0; i < items.length; i++) {
nameToIndex[items[i].classElement.name] = i;
}
}
diff --git a/pkg/analysis_server/test/integration/server/set_subscriptions_test.dart b/pkg/analysis_server/test/integration/server/set_subscriptions_test.dart
index 7388d13..20f1d5f 100644
--- a/pkg/analysis_server/test/integration/server/set_subscriptions_test.dart
+++ b/pkg/analysis_server/test/integration/server/set_subscriptions_test.dart
@@ -36,8 +36,8 @@
'This test times out on the bots and has been disabled to keep them green.'
'We need to discover the cause and re-enable it.');
- bool statusReceived = false;
- Completer analysisBegun = Completer();
+ var statusReceived = false;
+ var analysisBegun = Completer();
onServerStatus.listen((_) {
statusReceived = true;
});
@@ -47,7 +47,7 @@
}
});
return sendServerSetSubscriptions([]).then((_) {
- String pathname = sourcePath('test.dart');
+ var pathname = sourcePath('test.dart');
writeFile(pathname, '''
main() {
var x;
diff --git a/pkg/analysis_server/test/integration/server/status_test.dart b/pkg/analysis_server/test/integration/server/status_test.dart
index 93126a6..48c7013 100644
--- a/pkg/analysis_server/test/integration/server/status_test.dart
+++ b/pkg/analysis_server/test/integration/server/status_test.dart
@@ -22,8 +22,8 @@
// After we kick off analysis, we should get one server.status message with
// analyzing=true, and another server.status message after that with
// analyzing=false.
- Completer analysisBegun = Completer();
- Completer analysisFinished = Completer();
+ var analysisBegun = Completer();
+ var analysisFinished = Completer();
onServerStatus.listen((ServerStatusParams params) {
if (params.analysis != null) {
if (params.analysis.isAnalyzing) {
diff --git a/pkg/analysis_server/test/integration/support/integration_test_methods.dart b/pkg/analysis_server/test/integration/support/integration_test_methods.dart
index cf1d8fd..0b7be3b 100644
--- a/pkg/analysis_server/test/integration/support/integration_test_methods.dart
+++ b/pkg/analysis_server/test/integration/support/integration_test_methods.dart
@@ -30,7 +30,7 @@
/// The version number of the analysis server.
Future<ServerGetVersionResult> sendServerGetVersion() async {
var result = await server.send('server.getVersion', null);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return ServerGetVersionResult.fromJson(decoder, 'result', result);
}
@@ -182,7 +182,7 @@
Future<AnalysisGetErrorsResult> sendAnalysisGetErrors(String file) async {
var params = AnalysisGetErrorsParams(file).toJson();
var result = await server.send('analysis.getErrors', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return AnalysisGetErrorsResult.fromJson(decoder, 'result', result);
}
@@ -213,7 +213,7 @@
String file, int offset) async {
var params = AnalysisGetHoverParams(file, offset).toJson();
var result = await server.send('analysis.getHover', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return AnalysisGetHoverResult.fromJson(decoder, 'result', result);
}
@@ -252,7 +252,7 @@
var params =
AnalysisGetImportedElementsParams(file, offset, length).toJson();
var result = await server.send('analysis.getImportedElements', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return AnalysisGetImportedElementsResult.fromJson(
decoder, 'result', result);
}
@@ -278,7 +278,7 @@
Future<AnalysisGetLibraryDependenciesResult>
sendAnalysisGetLibraryDependencies() async {
var result = await server.send('analysis.getLibraryDependencies', null);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return AnalysisGetLibraryDependenciesResult.fromJson(
decoder, 'result', result);
}
@@ -339,7 +339,7 @@
String file, int offset, int length) async {
var params = AnalysisGetNavigationParams(file, offset, length).toJson();
var result = await server.send('analysis.getNavigation', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return AnalysisGetNavigationResult.fromJson(decoder, 'result', result);
}
@@ -372,7 +372,7 @@
String file) async {
var params = AnalysisGetReachableSourcesParams(file).toJson();
var result = await server.send('analysis.getReachableSources', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return AnalysisGetReachableSourcesResult.fromJson(
decoder, 'result', result);
}
@@ -425,7 +425,7 @@
String file, int offset) async {
var params = AnalysisGetSignatureParams(file, offset).toJson();
var result = await server.send('analysis.getSignature', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return AnalysisGetSignatureResult.fromJson(decoder, 'result', result);
}
@@ -616,7 +616,7 @@
Map<String, dynamic> files) async {
var params = AnalysisUpdateContentParams(files).toJson();
var result = await server.send('analysis.updateContent', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return AnalysisUpdateContentResult.fromJson(decoder, 'result', result);
}
@@ -957,7 +957,7 @@
String file, int offset) async {
var params = CompletionGetSuggestionsParams(file, offset).toJson();
var result = await server.send('completion.getSuggestions', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return CompletionGetSuggestionsResult.fromJson(decoder, 'result', result);
}
@@ -1049,7 +1049,7 @@
var params =
CompletionGetSuggestionDetailsParams(file, id, label, offset).toJson();
var result = await server.send('completion.getSuggestionDetails', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return CompletionGetSuggestionDetailsResult.fromJson(
decoder, 'result', result);
}
@@ -1074,7 +1074,7 @@
String file) async {
var params = CompletionListTokenDetailsParams(file).toJson();
var result = await server.send('completion.listTokenDetails', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return CompletionListTokenDetailsResult.fromJson(decoder, 'result', result);
}
@@ -1240,7 +1240,7 @@
SearchFindElementReferencesParams(file, offset, includePotential)
.toJson();
var result = await server.send('search.findElementReferences', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return SearchFindElementReferencesResult.fromJson(
decoder, 'result', result);
}
@@ -1266,7 +1266,7 @@
String name) async {
var params = SearchFindMemberDeclarationsParams(name).toJson();
var result = await server.send('search.findMemberDeclarations', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return SearchFindMemberDeclarationsResult.fromJson(
decoder, 'result', result);
}
@@ -1294,7 +1294,7 @@
String name) async {
var params = SearchFindMemberReferencesParams(name).toJson();
var result = await server.send('search.findMemberReferences', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return SearchFindMemberReferencesResult.fromJson(decoder, 'result', result);
}
@@ -1321,7 +1321,7 @@
sendSearchFindTopLevelDeclarations(String pattern) async {
var params = SearchFindTopLevelDeclarationsParams(pattern).toJson();
var result = await server.send('search.findTopLevelDeclarations', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return SearchFindTopLevelDeclarationsResult.fromJson(
decoder, 'result', result);
}
@@ -1360,7 +1360,7 @@
file: file, pattern: pattern, maxResults: maxResults)
.toJson();
var result = await server.send('search.getElementDeclarations', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return SearchGetElementDeclarationsResult.fromJson(
decoder, 'result', result);
}
@@ -1404,7 +1404,7 @@
SearchGetTypeHierarchyParams(file, offset, superOnly: superOnly)
.toJson();
var result = await server.send('search.getTypeHierarchy', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return SearchGetTypeHierarchyResult.fromJson(decoder, 'result', result);
}
@@ -1485,7 +1485,7 @@
lineLength: lineLength)
.toJson();
var result = await server.send('edit.format', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return EditFormatResult.fromJson(decoder, 'result', result);
}
@@ -1517,7 +1517,7 @@
String file, int offset, int length) async {
var params = EditGetAssistsParams(file, offset, length).toJson();
var result = await server.send('edit.getAssists', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return EditGetAssistsResult.fromJson(decoder, 'result', result);
}
@@ -1548,7 +1548,7 @@
var params =
EditGetAvailableRefactoringsParams(file, offset, length).toJson();
var result = await server.send('edit.getAvailableRefactorings', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return EditGetAvailableRefactoringsResult.fromJson(
decoder, 'result', result);
}
@@ -1566,7 +1566,7 @@
Future<EditGetDartfixInfoResult> sendEditGetDartfixInfo() async {
var params = EditGetDartfixInfoParams().toJson();
var result = await server.send('edit.getDartfixInfo', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return EditGetDartfixInfoResult.fromJson(decoder, 'result', result);
}
@@ -1677,7 +1677,7 @@
outputDir: outputDir)
.toJson();
var result = await server.send('edit.dartfix', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return EditDartfixResult.fromJson(decoder, 'result', result);
}
@@ -1702,7 +1702,7 @@
Future<EditGetFixesResult> sendEditGetFixes(String file, int offset) async {
var params = EditGetFixesParams(file, offset).toJson();
var result = await server.send('edit.getFixes', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return EditGetFixesResult.fromJson(decoder, 'result', result);
}
@@ -1733,7 +1733,7 @@
String file, String key, int offset) async {
var params = EditGetPostfixCompletionParams(file, key, offset).toJson();
var result = await server.send('edit.getPostfixCompletion', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return EditGetPostfixCompletionResult.fromJson(decoder, 'result', result);
}
@@ -1825,7 +1825,7 @@
options: options)
.toJson();
var result = await server.send('edit.getRefactoring', params);
- ResponseDecoder decoder = ResponseDecoder(kind);
+ var decoder = ResponseDecoder(kind);
return EditGetRefactoringResult.fromJson(decoder, 'result', result);
}
@@ -1861,7 +1861,7 @@
String file, int offset) async {
var params = EditGetStatementCompletionParams(file, offset).toJson();
var result = await server.send('edit.getStatementCompletion', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return EditGetStatementCompletionResult.fromJson(decoder, 'result', result);
}
@@ -1895,7 +1895,7 @@
EditIsPostfixCompletionApplicableParams(file, key, offset).toJson();
var result =
await server.send('edit.isPostfixCompletionApplicable', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return EditIsPostfixCompletionApplicableResult.fromJson(
decoder, 'result', result);
}
@@ -1910,7 +1910,7 @@
Future<EditListPostfixCompletionTemplatesResult>
sendEditListPostfixCompletionTemplates() async {
var result = await server.send('edit.listPostfixCompletionTemplates', null);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return EditListPostfixCompletionTemplatesResult.fromJson(
decoder, 'result', result);
}
@@ -1957,7 +1957,7 @@
var params =
EditImportElementsParams(file, elements, offset: offset).toJson();
var result = await server.send('edit.importElements', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return EditImportElementsResult.fromJson(decoder, 'result', result);
}
@@ -1986,7 +1986,7 @@
Future<EditSortMembersResult> sendEditSortMembers(String file) async {
var params = EditSortMembersParams(file).toJson();
var result = await server.send('edit.sortMembers', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return EditSortMembersResult.fromJson(decoder, 'result', result);
}
@@ -2018,7 +2018,7 @@
String file) async {
var params = EditOrganizeDirectivesParams(file).toJson();
var result = await server.send('edit.organizeDirectives', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return EditOrganizeDirectivesResult.fromJson(decoder, 'result', result);
}
@@ -2043,7 +2043,7 @@
String contextRoot) async {
var params = ExecutionCreateContextParams(contextRoot).toJson();
var result = await server.send('execution.createContext', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return ExecutionCreateContextResult.fromJson(decoder, 'result', result);
}
@@ -2148,7 +2148,7 @@
expressions: expressions)
.toJson();
var result = await server.send('execution.getSuggestions', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return ExecutionGetSuggestionsResult.fromJson(decoder, 'result', result);
}
@@ -2202,7 +2202,7 @@
{String file, String uri}) async {
var params = ExecutionMapUriParams(id, file: file, uri: uri).toJson();
var result = await server.send('execution.mapUri', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return ExecutionMapUriResult.fromJson(decoder, 'result', result);
}
@@ -2265,7 +2265,7 @@
/// The list of analysis contexts.
Future<DiagnosticGetDiagnosticsResult> sendDiagnosticGetDiagnostics() async {
var result = await server.send('diagnostic.getDiagnostics', null);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return DiagnosticGetDiagnosticsResult.fromJson(decoder, 'result', result);
}
@@ -2281,7 +2281,7 @@
/// The diagnostic server port.
Future<DiagnosticGetServerPortResult> sendDiagnosticGetServerPort() async {
var result = await server.send('diagnostic.getServerPort', null);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return DiagnosticGetServerPortResult.fromJson(decoder, 'result', result);
}
@@ -2307,7 +2307,7 @@
/// Whether sending analytics is enabled or not.
Future<AnalyticsIsEnabledResult> sendAnalyticsIsEnabled() async {
var result = await server.send('analytics.isEnabled', null);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return AnalyticsIsEnabledResult.fromJson(decoder, 'result', result);
}
@@ -2413,7 +2413,7 @@
String file) async {
var params = KytheGetKytheEntriesParams(file).toJson();
var result = await server.send('kythe.getKytheEntries', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return KytheGetKytheEntriesResult.fromJson(decoder, 'result', result);
}
@@ -2448,7 +2448,7 @@
String file, int offset) async {
var params = FlutterGetWidgetDescriptionParams(file, offset).toJson();
var result = await server.send('flutter.getWidgetDescription', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return FlutterGetWidgetDescriptionResult.fromJson(
decoder, 'result', result);
}
@@ -2493,7 +2493,7 @@
{FlutterWidgetPropertyValue value}) async {
var params = FlutterSetWidgetPropertyValueParams(id, value: value).toJson();
var result = await server.send('flutter.setWidgetPropertyValue', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return FlutterSetWidgetPropertyValueResult.fromJson(
decoder, 'result', result);
}
@@ -2625,7 +2625,7 @@
/// Dispatch the notification named [event], and containing parameters
/// [params], to the appropriate stream.
void dispatchNotification(String event, params) {
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
switch (event) {
case 'server.connected':
outOfTestExpect(params, isServerConnectedParams);
diff --git a/pkg/analysis_server/test/integration/support/integration_tests.dart b/pkg/analysis_server/test/integration/support/integration_tests.dart
index d5ff3e3..eeb9a1c 100644
--- a/pkg/analysis_server/test/integration/support/integration_tests.dart
+++ b/pkg/analysis_server/test/integration/support/integration_tests.dart
@@ -118,7 +118,7 @@
/// multiple times in one test; each time it is used it will wait afresh for
/// analysis to finish.
Future<ServerStatusParams> get analysisFinished {
- Completer<ServerStatusParams> completer = Completer<ServerStatusParams>();
+ var completer = Completer<ServerStatusParams>();
StreamSubscription<ServerStatusParams> subscription;
// This will only work if the caller has already subscribed to
// SERVER_STATUS (e.g. using sendServerSetSubscriptions(['STATUS']))
@@ -163,7 +163,7 @@
onAnalysisAnalyzedFiles.listen((AnalysisAnalyzedFilesParams params) {
lastAnalyzedFiles = params.directories;
});
- Completer serverConnected = Completer();
+ var serverConnected = Completer();
onServerConnected.listen((_) {
outOfTestExpect(serverConnected.isCompleted, isFalse);
serverConnected.complete();
@@ -207,7 +207,7 @@
/// then also enable [SERVER_NOTIFICATION_STATUS] notifications so that
/// [analysisFinished] can be used.
Future standardAnalysisSetup({bool subscribeStatus = true}) {
- List<Future> futures = <Future>[];
+ var futures = <Future>[];
if (subscribeStatus) {
futures.add(sendServerSetSubscriptions([ServerService.STATUS]));
}
@@ -241,7 +241,7 @@
/// Return a normalized path to the file (with symbolic links resolved).
String writeFile(String pathname, String contents) {
Directory(dirname(pathname)).createSync(recursive: true);
- File file = File(pathname);
+ var file = File(pathname);
file.writeAsStringSync(contents);
return file.resolveSymbolicLinksSync();
}
@@ -424,7 +424,7 @@
return;
}
_debuggingStdio = true;
- for (String line in _recordedStdio) {
+ for (var line in _recordedStdio) {
print(line);
}
}
@@ -433,7 +433,7 @@
/// upward to the 'test' dir, and then going up one more directory.
String findRoot(String pathname) {
while (!['benchmark', 'test'].contains(basename(pathname))) {
- String parent = dirname(pathname);
+ var parent = dirname(pathname);
if (parent.length >= pathname.length) {
throw Exception("Can't find root directory");
}
@@ -464,11 +464,11 @@
.transform(LineSplitter())
.listen((String line) {
lastCommunicationTime = currentElapseTime;
- String trimmedLine = line.trim();
+ var trimmedLine = line.trim();
// Guard against lines like:
// {"event":"server.connected","params":{...}}Observatory listening on ...
- final String observatoryMessage = 'Observatory listening on ';
+ var observatoryMessage = 'Observatory listening on ';
if (trimmedLine.contains(observatoryMessage)) {
trimmedLine = trimmedLine
.substring(0, trimmedLine.indexOf(observatoryMessage))
@@ -491,7 +491,7 @@
if (messageAsMap.containsKey('id')) {
outOfTestExpect(messageAsMap['id'], isString);
String id = message['id'];
- Completer<Map<String, dynamic>> completer = _pendingCommands[id];
+ var completer = _pendingCommands[id];
if (completer == null) {
fail('Unexpected response from server: id=$id');
} else {
@@ -522,7 +522,7 @@
.transform((Utf8Codec()).decoder)
.transform(LineSplitter())
.listen((String line) {
- String trimmedLine = line.trim();
+ var trimmedLine = line.trim();
_recordStdio('ERR: $trimmedLine');
_badDataFromServer('Message received on stderr', silent: true);
});
@@ -536,18 +536,14 @@
/// with an error response, the future will be completed with an error.
Future<Map<String, dynamic>> send(
String method, Map<String, dynamic> params) {
- String id = '${_nextId++}';
- Map<String, dynamic> command = <String, dynamic>{
- 'id': id,
- 'method': method
- };
+ var id = '${_nextId++}';
+ var command = <String, dynamic>{'id': id, 'method': method};
if (params != null) {
command['params'] = params;
}
- Completer<Map<String, dynamic>> completer =
- Completer<Map<String, dynamic>>();
+ var completer = Completer<Map<String, dynamic>>();
_pendingCommands[id] = completer;
- String line = json.encode(command);
+ var line = json.encode(command);
_recordStdio('==> $line');
_process.stdin.add(utf8.encoder.convert('$line\n'));
return completer.future;
@@ -568,11 +564,11 @@
throw Exception('Process already started');
}
_time.start();
- String dartBinary = Platform.executable;
+ var dartBinary = Platform.executable;
// The integration tests run 3x faster when run from snapshots (you need to
// run test.py with --use-sdk).
- final bool useSnapshot = true;
+ var useSnapshot = true;
String serverPath;
if (useSnapshot) {
@@ -586,12 +582,12 @@
'dart-sdk', 'bin', 'snapshots', 'analysis_server.dart.snapshot'));
}
} else {
- String rootDir =
+ var rootDir =
findRoot(Platform.script.toFilePath(windows: Platform.isWindows));
serverPath = normalize(join(rootDir, 'bin', 'server.dart'));
}
- List<String> arguments = [];
+ var arguments = <String>[];
//
// Add VM arguments.
//
@@ -662,7 +658,7 @@
/// Record a message that was exchanged with the server, and print it out if
/// [debugStdio] has been called.
void _recordStdio(String line) {
- double elapsedTime = currentElapseTime;
+ var elapsedTime = currentElapseTime;
line = '$elapsedTime: $line';
if (_debuggingStdio) {
print(line);
@@ -772,7 +768,7 @@
@override
Description describe(Description description) {
- for (int i = 0; i < choiceMatchers.length; i++) {
+ for (var i = 0; i < choiceMatchers.length; i++) {
if (i != 0) {
if (choiceMatchers.length == 2) {
description = description.add(' or ');
@@ -790,8 +786,8 @@
@override
bool matches(item, Map matchState) {
- for (Matcher choiceMatcher in choiceMatchers) {
- Map subState = {};
+ for (var choiceMatcher in choiceMatchers) {
+ var subState = {};
if (choiceMatcher.matches(item, subState)) {
return true;
}
@@ -814,14 +810,14 @@
Matcher matcher,
List<MismatchDescriber> mismatches,
Description Function(Description) describeSubstructure) {
- Map subState = {};
+ var subState = {};
if (!matcher.matches(item, subState)) {
mismatches.add((Description mismatchDescription) {
mismatchDescription = mismatchDescription.add('contains malformed ');
mismatchDescription = describeSubstructure(mismatchDescription);
mismatchDescription =
mismatchDescription.add(' (should be ').addDescriptionOf(matcher);
- String subDescription = matcher
+ var subDescription = matcher
.describeMismatch(item, StringDescription(), subState, false)
.toString();
if (subDescription.isNotEmpty) {
@@ -836,11 +832,10 @@
@override
Description describeMismatch(
item, Description mismatchDescription, Map matchState, bool verbose) {
- List<MismatchDescriber> mismatches =
- matchState['mismatches'] as List<MismatchDescriber>;
+ var mismatches = matchState['mismatches'] as List<MismatchDescriber>;
if (mismatches != null) {
- for (int i = 0; i < mismatches.length; i++) {
- MismatchDescriber mismatch = mismatches[i];
+ for (var i = 0; i < mismatches.length; i++) {
+ var mismatch = mismatches[i];
if (i > 0) {
if (mismatches.length == 2) {
mismatchDescription = mismatchDescription.add(' and ');
@@ -861,7 +856,7 @@
@override
bool matches(item, Map matchState) {
- List<MismatchDescriber> mismatches = <MismatchDescriber>[];
+ var mismatches = <MismatchDescriber>[];
populateMismatches(item, mismatches);
if (mismatches.isEmpty) {
return true;
diff --git a/pkg/analysis_server/test/lsp/definition_test.dart b/pkg/analysis_server/test/lsp/definition_test.dart
index 25680ff..2d5c444 100644
--- a/pkg/analysis_server/test/lsp/definition_test.dart
+++ b/pkg/analysis_server/test/lsp/definition_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/lsp_protocol/protocol_generated.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -48,7 +47,7 @@
await getDefinition(mainFileUri, positionFromMarker(mainContents));
expect(res, hasLength(1));
- Location loc = res.single;
+ var loc = res.single;
expect(loc.range, equals(rangeFromMarkers(referencedContents)));
expect(loc.uri, equals(referencedFileUri.toString()));
}
@@ -73,7 +72,7 @@
final res = await getDefinition(mainFileUri, positionFromMarker(contents));
expect(res, hasLength(1));
- Location loc = res.single;
+ var loc = res.single;
expect(loc.range, equals(rangeFromMarkers(contents)));
expect(loc.uri, equals(mainFileUri.toString()));
}
@@ -90,7 +89,7 @@
final res = await getDefinition(mainFileUri, positionFromMarker(contents));
expect(res, hasLength(1));
- Location loc = res.single;
+ var loc = res.single;
expect(loc.range, equals(rangeFromMarkers(contents)));
expect(loc.uri, equals(mainFileUri.toString()));
}
diff --git a/pkg/analysis_server/test/lsp/initialization_test.dart b/pkg/analysis_server/test/lsp/initialization_test.dart
index dae70ae..0d0421f 100644
--- a/pkg/analysis_server/test/lsp/initialization_test.dart
+++ b/pkg/analysis_server/test/lsp/initialization_test.dart
@@ -85,7 +85,7 @@
// should be no `client/registerCapability` calls.
// Set a flag if any registerCapability request comes through.
- bool didGetRegisterCapabilityRequest = false;
+ var didGetRegisterCapabilityRequest = false;
requestsFromServer
.firstWhere((n) => n.method == Method.client_registerCapability)
.then((params) {
diff --git a/pkg/analysis_server/test/lsp/references_test.dart b/pkg/analysis_server/test/lsp/references_test.dart
index 738a752..a780df9 100644
--- a/pkg/analysis_server/test/lsp/references_test.dart
+++ b/pkg/analysis_server/test/lsp/references_test.dart
@@ -94,7 +94,7 @@
referencedFileUri, positionFromMarker(referencedContents));
expect(res, hasLength(1));
- Location loc = res.single;
+ var loc = res.single;
expect(loc.range, equals(rangeFromMarkers(mainContents)));
expect(loc.uri, equals(mainFileUri.toString()));
}
diff --git a/pkg/analysis_server/test/lsp/server_abstract.dart b/pkg/analysis_server/test/lsp/server_abstract.dart
index abff347..d393fb4 100644
--- a/pkg/analysis_server/test/lsp/server_abstract.dart
+++ b/pkg/analysis_server/test/lsp/server_abstract.dart
@@ -392,7 +392,7 @@
}
String applyTextEdits(String oldContent, List<TextEdit> changes) {
- String newContent = oldContent;
+ var newContent = oldContent;
// Complex text manipulations are described with an array of TextEdit's,
// representing a single change to the document.
//
@@ -419,8 +419,8 @@
(p.line == other.line && p.character > other.character);
// Check if two ranges intersect or touch.
bool rangesIntersect(Range r1, Range r2) {
- bool endsBefore = isBefore(r1.end, r2.start);
- bool startsAfter = isAfter(r1.start, r2.end);
+ var endsBefore = isBefore(r1.end, r2.start);
+ var startsAfter = isAfter(r1.start, r2.end);
return !(endsBefore || startsAfter);
}
diff --git a/pkg/analysis_server/test/mocks.dart b/pkg/analysis_server/test/mocks.dart
index 56c45f4..ad4fa8c 100644
--- a/pkg/analysis_server/test/mocks.dart
+++ b/pkg/analysis_server/test/mocks.dart
@@ -260,7 +260,7 @@
item, Description mismatchDescription, Map matchState, bool verbose) {
Response response = item;
var id = response.id;
- RequestError error = response.error;
+ var error = response.error;
mismatchDescription.add('has identifier "$id"');
if (error == null) {
mismatchDescription.add(' and has no error');
@@ -304,7 +304,7 @@
mismatchDescription.add('is null response');
} else {
var id = response.id;
- RequestError error = response.error;
+ var error = response.error;
mismatchDescription.add('has identifier "$id"');
if (error != null) {
mismatchDescription.add(' and has error $error');
diff --git a/pkg/analysis_server/test/plugin/protocol_dart_test.dart b/pkg/analysis_server/test/plugin/protocol_dart_test.dart
index 7927686..c0a13a9 100644
--- a/pkg/analysis_server/test/plugin/protocol_dart_test.dart
+++ b/pkg/analysis_server/test/plugin/protocol_dart_test.dart
@@ -105,20 +105,20 @@
}
Future<void> test_fromElement_CLASS() async {
- engine.Source source = addSource('/test.dart', '''
+ var source = addSource('/test.dart', '''
@deprecated
abstract class _A {}
class B<K, V> {}''');
- engine.CompilationUnit unit = await resolveLibraryUnit(source);
+ var unit = await resolveLibraryUnit(source);
{
engine.ClassElement engineElement = findElementInUnit(unit, '_A');
// create notification Element
- Element element = convertElement(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.CLASS);
expect(element.name, '_A');
expect(element.typeParameters, isNull);
{
- Location location = element.location;
+ var location = element.location;
expect(location.file, convertPath('/test.dart'));
expect(location.offset, 27);
expect(location.length, '_A'.length);
@@ -135,7 +135,7 @@
{
engine.ClassElement engineElement = findElementInUnit(unit, 'B');
// create notification Element
- Element element = convertElement(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.CLASS);
expect(element.name, 'B');
expect(element.typeParameters, '<K, V>');
@@ -144,20 +144,20 @@
}
Future<void> test_fromElement_CONSTRUCTOR() async {
- engine.Source source = addSource('/test.dart', '''
+ var source = addSource('/test.dart', '''
class A {
const A.myConstructor(int a, [String b]);
}''');
- engine.CompilationUnit unit = await resolveLibraryUnit(source);
+ var unit = await resolveLibraryUnit(source);
engine.ConstructorElement engineElement =
findElementInUnit(unit, 'myConstructor');
// create notification Element
- Element element = convertElement(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.CONSTRUCTOR);
expect(element.name, 'myConstructor');
expect(element.typeParameters, isNull);
{
- Location location = element.location;
+ var location = element.location;
expect(location.file, convertPath('/test.dart'));
expect(location.offset, 20);
expect(location.length, 'myConstructor'.length);
@@ -171,34 +171,34 @@
Future<void> test_fromElement_CONSTRUCTOR_required_parameters_1() async {
addMetaPackage();
- engine.Source source = addSource('/test.dart', '''
+ var source = addSource('/test.dart', '''
import 'package:meta/meta.dart';
class A {
const A.myConstructor(int a, {int b, @required int c});
}''');
- engine.CompilationUnit unit = await resolveLibraryUnit(source);
+ var unit = await resolveLibraryUnit(source);
engine.ConstructorElement engineElement =
findElementInUnit(unit, 'myConstructor');
// create notification Element
- Element element = convertElement(engineElement);
+ var element = convertElement(engineElement);
expect(element.parameters, '(int a, {@required int c, int b})');
}
/// Verify parameter re-ordering for required params
Future<void> test_fromElement_CONSTRUCTOR_required_parameters_2() async {
addMetaPackage();
- engine.Source source = addSource('/test.dart', '''
+ var source = addSource('/test.dart', '''
import 'package:meta/meta.dart';
class A {
const A.myConstructor(int a, {int b, @required int d, @required int c});
}''');
- engine.CompilationUnit unit = await resolveLibraryUnit(source);
+ var unit = await resolveLibraryUnit(source);
engine.ConstructorElement engineElement =
findElementInUnit(unit, 'myConstructor');
// create notification Element
- Element element = convertElement(engineElement);
+ var element = convertElement(engineElement);
expect(element.parameters,
'(int a, {@required int d, @required int c, int b})');
}
@@ -206,17 +206,17 @@
/// Verify parameter re-ordering for required params
Future<void> test_fromElement_CONSTRUCTOR_required_parameters_3() async {
addMetaPackage();
- engine.Source source = addSource('/test.dart', '''
+ var source = addSource('/test.dart', '''
import 'package:meta/meta.dart';
class A {
const A.myConstructor(int a, {int b, @required int d, @required int c, int a});
}''');
- engine.CompilationUnit unit = await resolveLibraryUnit(source);
+ var unit = await resolveLibraryUnit(source);
engine.ConstructorElement engineElement =
findElementInUnit(unit, 'myConstructor');
// create notification Element
- Element element = convertElement(engineElement);
+ var element = convertElement(engineElement);
expect(element.parameters,
'(int a, {@required int d, @required int c, int b, int a})');
}
@@ -224,7 +224,7 @@
void test_fromElement_dynamic() {
var engineElement = engine.DynamicElementImpl.instance;
// create notification Element
- Element element = convertElement(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.UNKNOWN);
expect(element.name, 'dynamic');
expect(element.location, isNull);
@@ -234,21 +234,21 @@
}
Future<void> test_fromElement_ENUM() async {
- engine.Source source = addSource('/test.dart', '''
+ var source = addSource('/test.dart', '''
@deprecated
enum _E1 { one, two }
enum E2 { three, four }''');
- engine.CompilationUnit unit = await resolveLibraryUnit(source);
+ var unit = await resolveLibraryUnit(source);
{
engine.ClassElement engineElement = findElementInUnit(unit, '_E1');
expect(engineElement.hasDeprecated, isTrue);
// create notification Element
- Element element = convertElement(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.ENUM);
expect(element.name, '_E1');
expect(element.typeParameters, isNull);
{
- Location location = element.location;
+ var location = element.location;
expect(location.file, convertPath('/test.dart'));
expect(location.offset, 17);
expect(location.length, '_E1'.length);
@@ -264,7 +264,7 @@
{
engine.ClassElement engineElement = findElementInUnit(unit, 'E2');
// create notification Element
- Element element = convertElement(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.ENUM);
expect(element.name, 'E2');
expect(element.typeParameters, isNull);
@@ -273,19 +273,19 @@
}
Future<void> test_fromElement_ENUM_CONSTANT() async {
- engine.Source source = addSource('/test.dart', '''
+ var source = addSource('/test.dart', '''
@deprecated
enum _E1 { one, two }
enum E2 { three, four }''');
- engine.CompilationUnit unit = await resolveLibraryUnit(source);
+ var unit = await resolveLibraryUnit(source);
{
engine.FieldElement engineElement = findElementInUnit(unit, 'one');
// create notification Element
- Element element = convertElement(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.ENUM_CONSTANT);
expect(element.name, 'one');
{
- Location location = element.location;
+ var location = element.location;
expect(location.file, convertPath('/test.dart'));
expect(location.offset, 23);
expect(location.length, 'one'.length);
@@ -305,11 +305,11 @@
{
engine.FieldElement engineElement = findElementInUnit(unit, 'three');
// create notification Element
- Element element = convertElement(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.ENUM_CONSTANT);
expect(element.name, 'three');
{
- Location location = element.location;
+ var location = element.location;
expect(location.file, convertPath('/test.dart'));
expect(location.offset, 44);
expect(location.length, 'three'.length);
@@ -321,14 +321,13 @@
expect(element.flags, Element.FLAG_CONST | Element.FLAG_STATIC);
}
{
- engine.FieldElement engineElement =
- unit.declaredElement.enums[1].getField('index');
+ var engineElement = unit.declaredElement.enums[1].getField('index');
// create notification Element
- Element element = convertElement(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.FIELD);
expect(element.name, 'index');
{
- Location location = element.location;
+ var location = element.location;
expect(location.file, convertPath('/test.dart'));
expect(location.offset, -1);
expect(location.length, 'index'.length);
@@ -340,14 +339,13 @@
expect(element.flags, Element.FLAG_FINAL);
}
{
- engine.FieldElement engineElement =
- unit.declaredElement.enums[1].getField('values');
+ var engineElement = unit.declaredElement.enums[1].getField('values');
// create notification Element
- Element element = convertElement(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.FIELD);
expect(element.name, 'values');
{
- Location location = element.location;
+ var location = element.location;
expect(location.file, convertPath('/test.dart'));
expect(location.offset, -1);
expect(location.length, 'values'.length);
@@ -361,18 +359,18 @@
}
Future<void> test_fromElement_FIELD() async {
- engine.Source source = addSource('/test.dart', '''
+ var source = addSource('/test.dart', '''
class A {
static const myField = 42;
}''');
- engine.CompilationUnit unit = await resolveLibraryUnit(source);
+ var unit = await resolveLibraryUnit(source);
engine.FieldElement engineElement = findElementInUnit(unit, 'myField');
// create notification Element
- Element element = convertElement(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.FIELD);
expect(element.name, 'myField');
{
- Location location = element.location;
+ var location = element.location;
expect(location.file, convertPath('/test.dart'));
expect(location.offset, 25);
expect(location.length, 'myField'.length);
@@ -385,19 +383,19 @@
}
Future<void> test_fromElement_FUNCTION_TYPE_ALIAS() async {
- engine.Source source = addSource('/test.dart', '''
+ var source = addSource('/test.dart', '''
typedef int F<T>(String x);
''');
- engine.CompilationUnit unit = await resolveLibraryUnit(source);
+ var unit = await resolveLibraryUnit(source);
engine.FunctionTypeAliasElement engineElement =
findElementInUnit(unit, 'F');
// create notification Element
- Element element = convertElement(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.FUNCTION_TYPE_ALIAS);
expect(element.name, 'F');
expect(element.typeParameters, '<T>');
{
- Location location = element.location;
+ var location = element.location;
expect(location.file, convertPath('/test.dart'));
expect(location.offset, 12);
expect(location.length, 'F'.length);
@@ -410,18 +408,18 @@
}
Future<void> test_fromElement_FUNCTION_TYPE_ALIAS_genericTypeAlias() async {
- engine.Source source = addSource('/test.dart', '''
+ var source = addSource('/test.dart', '''
typedef F<T> = int Function(String x);
''');
- engine.CompilationUnit unit = await resolveLibraryUnit(source);
+ var unit = await resolveLibraryUnit(source);
engine.GenericTypeAliasElement engineElement = findElementInUnit(unit, 'F');
// create notification Element
- Element element = convertElement(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.FUNCTION_TYPE_ALIAS);
expect(element.name, 'F');
expect(element.typeParameters, '<T>');
{
- Location location = element.location;
+ var location = element.location;
expect(location.file, convertPath('/test.dart'));
expect(location.offset, 8);
expect(location.length, 'F'.length);
@@ -434,19 +432,19 @@
}
Future<void> test_fromElement_GETTER() async {
- engine.Source source = addSource('/test.dart', '''
+ var source = addSource('/test.dart', '''
class A {
String get myGetter => 42;
}''');
- engine.CompilationUnit unit = await resolveLibraryUnit(source);
+ var unit = await resolveLibraryUnit(source);
engine.PropertyAccessorElement engineElement =
findElementInUnit(unit, 'myGetter', engine.ElementKind.GETTER);
// create notification Element
- Element element = convertElement(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.GETTER);
expect(element.name, 'myGetter');
{
- Location location = element.location;
+ var location = element.location;
expect(location.file, convertPath('/test.dart'));
expect(location.offset, 23);
expect(location.length, 'myGetter'.length);
@@ -459,21 +457,21 @@
}
Future<void> test_fromElement_LABEL() async {
- engine.Source source = addSource('/test.dart', '''
+ var source = addSource('/test.dart', '''
main() {
myLabel:
while (true) {
break myLabel;
}
}''');
- engine.CompilationUnit unit = await resolveLibraryUnit(source);
+ var unit = await resolveLibraryUnit(source);
engine.LabelElement engineElement = findElementInUnit(unit, 'myLabel');
// create notification Element
- Element element = convertElement(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.LABEL);
expect(element.name, 'myLabel');
{
- Location location = element.location;
+ var location = element.location;
expect(location.file, convertPath('/test.dart'));
expect(location.offset, 9);
expect(location.length, 'myLabel'.length);
@@ -486,20 +484,20 @@
}
Future<void> test_fromElement_METHOD() async {
- engine.Source source = addSource('/test.dart', '''
+ var source = addSource('/test.dart', '''
class A {
static List<String> myMethod(int a, {String b, int c}) {
return null;
}
}''');
- engine.CompilationUnit unit = await resolveLibraryUnit(source);
+ var unit = await resolveLibraryUnit(source);
engine.MethodElement engineElement = findElementInUnit(unit, 'myMethod');
// create notification Element
- Element element = convertElement(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.METHOD);
expect(element.name, 'myMethod');
{
- Location location = element.location;
+ var location = element.location;
expect(location.file, convertPath('/test.dart'));
expect(location.offset, 32);
expect(location.length, 'myGetter'.length);
@@ -512,19 +510,19 @@
}
Future<void> test_fromElement_MIXIN() async {
- engine.Source source = addSource('/test.dart', '''
+ var source = addSource('/test.dart', '''
mixin A {}
''');
- engine.CompilationUnit unit = await resolveLibraryUnit(source);
+ var unit = await resolveLibraryUnit(source);
{
engine.ClassElement engineElement = findElementInUnit(unit, 'A');
// create notification Element
- Element element = convertElement(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.MIXIN);
expect(element.name, 'A');
expect(element.typeParameters, isNull);
{
- Location location = element.location;
+ var location = element.location;
expect(location.file, convertPath('/test.dart'));
expect(location.offset, 6);
expect(location.length, 'A'.length);
@@ -537,19 +535,19 @@
}
Future<void> test_fromElement_SETTER() async {
- engine.Source source = addSource('/test.dart', '''
+ var source = addSource('/test.dart', '''
class A {
set mySetter(String x) {}
}''');
- engine.CompilationUnit unit = await resolveLibraryUnit(source);
+ var unit = await resolveLibraryUnit(source);
engine.PropertyAccessorElement engineElement =
findElementInUnit(unit, 'mySetter', engine.ElementKind.SETTER);
// create notification Element
- Element element = convertElement(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.SETTER);
expect(element.name, 'mySetter');
{
- Location location = element.location;
+ var location = element.location;
expect(location.file, convertPath('/test.dart'));
expect(location.offset, 16);
expect(location.length, 'mySetter'.length);
diff --git a/pkg/analysis_server/test/protocol_server_test.dart b/pkg/analysis_server/test/protocol_server_test.dart
index 734ed60..5267658 100644
--- a/pkg/analysis_server/test/protocol_server_test.dart
+++ b/pkg/analysis_server/test/protocol_server_test.dart
@@ -45,7 +45,7 @@
engineError = MockAnalysisError(source,
engine.CompileTimeErrorCode.AMBIGUOUS_EXPORT, 10, 20, 'my message');
// prepare ResolvedUnitResult
- engine.LineInfo lineInfo = engine.LineInfo([0, 5, 9, 20]);
+ var lineInfo = engine.LineInfo([0, 5, 9, 20]);
result = engine.ResolvedUnitResultImpl(null, 'foo.dart', null, true, null,
lineInfo, false, null, [engineError]);
}
@@ -58,10 +58,10 @@
void test_fromEngine_hasContextMessage() {
engineError.contextMessages.add(engine.DiagnosticMessageImpl(
filePath: 'bar.dart', offset: 30, length: 5, message: 'context'));
- MockAnalysisSession session = MockAnalysisSession();
+ var session = MockAnalysisSession();
session.addFileResult(engine.FileResultImpl(
session, 'bar.dart', null, engine.LineInfo([0, 5, 9, 20]), false));
- AnalysisError error = newAnalysisError_fromEngine(
+ var error = newAnalysisError_fromEngine(
engine.ResolvedUnitResultImpl(session, 'foo.dart', null, true, null,
engine.LineInfo([0, 5, 9, 20]), false, null, [engineError]),
engineError);
@@ -95,7 +95,7 @@
void test_fromEngine_hasCorrection() {
engineError.correction = 'my correction';
- AnalysisError error = newAnalysisError_fromEngine(result, engineError);
+ var error = newAnalysisError_fromEngine(result, engineError);
expect(error.toJson(), {
SEVERITY: 'ERROR',
TYPE: 'COMPILE_TIME_ERROR',
@@ -120,7 +120,7 @@
10,
20,
'my message');
- AnalysisError error = newAnalysisError_fromEngine(result, engineError);
+ var error = newAnalysisError_fromEngine(result, engineError);
expect(error.toJson(), {
SEVERITY: 'ERROR',
TYPE: 'COMPILE_TIME_ERROR',
@@ -145,7 +145,7 @@
10,
20,
'my message');
- AnalysisError error = newAnalysisError_fromEngine(result, engineError);
+ var error = newAnalysisError_fromEngine(result, engineError);
expect(error.toJson(), {
SEVERITY: 'INFO',
TYPE: 'LINT',
@@ -165,7 +165,7 @@
void test_fromEngine_noCorrection() {
engineError.correction = null;
- AnalysisError error = newAnalysisError_fromEngine(result, engineError);
+ var error = newAnalysisError_fromEngine(result, engineError);
expect(error.toJson(), {
SEVERITY: 'ERROR',
TYPE: 'COMPILE_TIME_ERROR',
@@ -184,7 +184,7 @@
void test_fromEngine_noLineInfo() {
engineError.correction = null;
- AnalysisError error = newAnalysisError_fromEngine(
+ var error = newAnalysisError_fromEngine(
engine.ResolvedUnitResultImpl(null, 'foo.dart', null, true, null, null,
false, null, [engineError]),
engineError);
@@ -254,7 +254,7 @@
/// the given key results in the given value.
void run(ApiEnum Function(EngineEnum) convert,
{Map<EngineEnum, ApiEnum> exceptions = const {}}) {
- ClassMirror engineClass = reflectClass(EngineEnum);
+ var engineClass = reflectClass(EngineEnum);
engineClass.staticMembers.forEach((Symbol symbol, MethodMirror method) {
if (symbol == #values) {
return;
@@ -262,22 +262,21 @@
if (!method.isGetter) {
return;
}
- String enumName = MirrorSystem.getName(symbol);
- EngineEnum engineValue =
- engineClass.getField(symbol).reflectee as EngineEnum;
+ var enumName = MirrorSystem.getName(symbol);
+ var engineValue = engineClass.getField(symbol).reflectee as EngineEnum;
expect(engineValue, TypeMatcher<EngineEnum>());
if (exceptions.containsKey(engineValue)) {
- ApiEnum expectedResult = exceptions[engineValue];
+ var expectedResult = exceptions[engineValue];
if (expectedResult == null) {
expect(() {
convert(engineValue);
}, throwsException);
} else {
- ApiEnum apiValue = convert(engineValue);
+ var apiValue = convert(engineValue);
expect(apiValue, equals(expectedResult));
}
} else {
- ApiEnum apiValue = convert(engineValue);
+ var apiValue = convert(engineValue);
expect((apiValue as dynamic).name, equals(enumName));
}
});
diff --git a/pkg/analysis_server/test/protocol_test.dart b/pkg/analysis_server/test/protocol_test.dart
index e6dbec1..7f534a2 100644
--- a/pkg/analysis_server/test/protocol_test.dart
+++ b/pkg/analysis_server/test/protocol_test.dart
@@ -24,28 +24,28 @@
@reflectiveTest
class NotificationTest {
void test_fromJson() {
- Notification original = Notification('foo');
- Notification notification = Notification.fromJson(original.toJson());
+ var original = Notification('foo');
+ var notification = Notification.fromJson(original.toJson());
expect(notification.event, equals('foo'));
expect(notification.toJson().keys, isNot(contains('params')));
}
void test_fromJson_withParams() {
- Notification original = Notification('foo', {'x': 'y'});
- Notification notification = Notification.fromJson(original.toJson());
+ var original = Notification('foo', {'x': 'y'});
+ var notification = Notification.fromJson(original.toJson());
expect(notification.event, equals('foo'));
expect(notification.toJson()['params'], equals({'x': 'y'}));
}
void test_toJson_noParams() {
- Notification notification = Notification('foo');
+ var notification = Notification('foo');
expect(notification.event, equals('foo'));
expect(notification.toJson().keys, isNot(contains('params')));
expect(notification.toJson(), equals({'event': 'foo'}));
}
void test_toJson_withParams() {
- Notification notification = Notification('foo', {'x': 'y'});
+ var notification = Notification('foo', {'x': 'y'});
expect(notification.event, equals('foo'));
expect(notification.toJson()['params'], equals({'x': 'y'}));
expect(
@@ -60,7 +60,7 @@
@reflectiveTest
class RequestErrorTest {
void test_create() {
- RequestError error = RequestError(RequestErrorCode.INVALID_REQUEST, 'msg');
+ var error = RequestError(RequestErrorCode.INVALID_REQUEST, 'msg');
expect(error.code, RequestErrorCode.INVALID_REQUEST);
expect(error.message, 'msg');
expect(error.toJson(), equals({CODE: 'INVALID_REQUEST', MESSAGE: 'msg'}));
@@ -73,7 +73,7 @@
MESSAGE: 'foo',
STACK_TRACE: trace
};
- RequestError error = RequestError.fromJson(ResponseDecoder(null), '', json);
+ var error = RequestError.fromJson(ResponseDecoder(null), '', json);
expect(error.code, RequestErrorCode.INVALID_PARAMETER);
expect(error.message, 'foo');
expect(error.stackTrace, trace);
@@ -81,7 +81,7 @@
void test_toJson() {
var trace = 'a stack trace\r\nbar';
- RequestError error = RequestError(RequestErrorCode.UNKNOWN_REQUEST, 'msg',
+ var error = RequestError(RequestErrorCode.UNKNOWN_REQUEST, 'msg',
stackTrace: trace);
expect(error.toJson(),
{CODE: 'UNKNOWN_REQUEST', MESSAGE: 'msg', STACK_TRACE: trace});
@@ -91,70 +91,68 @@
@reflectiveTest
class RequestTest {
void test_fromJson() {
- Request original = Request('one', 'aMethod');
- String jsonData = json.encode(original.toJson());
- Request request = Request.fromString(jsonData);
+ var original = Request('one', 'aMethod');
+ var jsonData = json.encode(original.toJson());
+ var request = Request.fromString(jsonData);
expect(request.id, equals('one'));
expect(request.method, equals('aMethod'));
expect(request.clientRequestTime, isNull);
}
void test_fromJson_invalidId() {
- String json =
- '{"id":{"one":"two"},"method":"aMethod","params":{"foo":"bar"}}';
- Request request = Request.fromString(json);
+ var json = '{"id":{"one":"two"},"method":"aMethod","params":{"foo":"bar"}}';
+ var request = Request.fromString(json);
expect(request, isNull);
}
void test_fromJson_invalidMethod() {
- String json =
- '{"id":"one","method":{"boo":"aMethod"},"params":{"foo":"bar"}}';
- Request request = Request.fromString(json);
+ var json = '{"id":"one","method":{"boo":"aMethod"},"params":{"foo":"bar"}}';
+ var request = Request.fromString(json);
expect(request, isNull);
}
void test_fromJson_invalidParams() {
- String json = '{"id":"one","method":"aMethod","params":"foobar"}';
- Request request = Request.fromString(json);
+ var json = '{"id":"one","method":"aMethod","params":"foobar"}';
+ var request = Request.fromString(json);
expect(request, isNull);
}
void test_fromJson_withBadClientTime() {
- Request original = Request('one', 'aMethod', null, 347);
- Map<String, Object> map = original.toJson();
+ var original = Request('one', 'aMethod', null, 347);
+ var map = original.toJson();
// Insert bad value - should be int but client sent string instead
map[Request.CLIENT_REQUEST_TIME] = '347';
- String jsonData = json.encode(map);
- Request request = Request.fromString(jsonData);
+ var jsonData = json.encode(map);
+ var request = Request.fromString(jsonData);
expect(request, isNull);
}
void test_fromJson_withClientTime() {
- Request original = Request('one', 'aMethod', null, 347);
- String jsonData = json.encode(original.toJson());
- Request request = Request.fromString(jsonData);
+ var original = Request('one', 'aMethod', null, 347);
+ var jsonData = json.encode(original.toJson());
+ var request = Request.fromString(jsonData);
expect(request.id, equals('one'));
expect(request.method, equals('aMethod'));
expect(request.clientRequestTime, 347);
}
void test_fromJson_withParams() {
- Request original = Request('one', 'aMethod', {'foo': 'bar'});
- String jsonData = json.encode(original.toJson());
- Request request = Request.fromString(jsonData);
+ var original = Request('one', 'aMethod', {'foo': 'bar'});
+ var jsonData = json.encode(original.toJson());
+ var request = Request.fromString(jsonData);
expect(request.id, equals('one'));
expect(request.method, equals('aMethod'));
expect(request.toJson()['params'], equals({'foo': 'bar'}));
}
void test_toJson() {
- Request request = Request('one', 'aMethod');
+ var request = Request('one', 'aMethod');
expect(request.toJson(),
equals({Request.ID: 'one', Request.METHOD: 'aMethod'}));
}
void test_toJson_withParams() {
- Request request = Request('one', 'aMethod', {'foo': 'bar'});
+ var request = Request('one', 'aMethod', {'foo': 'bar'});
expect(
request.toJson(),
equals({
@@ -168,7 +166,7 @@
@reflectiveTest
class ResponseTest {
void test_create_invalidRequestFormat() {
- Response response = Response.invalidRequestFormat();
+ var response = Response.invalidRequestFormat();
expect(response.id, equals(''));
expect(response.error, isNotNull);
expect(
@@ -183,7 +181,7 @@
}
void test_create_unknownRequest() {
- Response response = Response.unknownRequest(Request('0', ''));
+ var response = Response.unknownRequest(Request('0', ''));
expect(response.id, equals('0'));
expect(response.error, isNotNull);
expect(
@@ -198,27 +196,26 @@
}
void test_fromJson() {
- Response original = Response('myId');
- Response response = Response.fromJson(original.toJson());
+ var original = Response('myId');
+ var response = Response.fromJson(original.toJson());
expect(response.id, equals('myId'));
}
void test_fromJson_withError() {
- Response original = Response.invalidRequestFormat();
- Response response = Response.fromJson(original.toJson());
+ var original = Response.invalidRequestFormat();
+ var response = Response.fromJson(original.toJson());
expect(response.id, equals(''));
expect(response.error, isNotNull);
- RequestError error = response.error;
+ var error = response.error;
expect(error.code, equals(RequestErrorCode.INVALID_REQUEST));
expect(error.message, equals('Invalid request'));
}
void test_fromJson_withResult() {
- Response original = Response('myId', result: {'foo': 'bar'});
- Response response = Response.fromJson(original.toJson());
+ var original = Response('myId', result: {'foo': 'bar'});
+ var response = Response.fromJson(original.toJson());
expect(response.id, equals('myId'));
- Map<String, Object> result =
- response.toJson()['result'] as Map<String, Object>;
+ var result = response.toJson()['result'] as Map<String, Object>;
expect(result.length, equals(1));
expect(result['foo'], equals('bar'));
}
diff --git a/pkg/analysis_server/test/search/abstract_search_domain.dart b/pkg/analysis_server/test/search/abstract_search_domain.dart
index 48aab00..faa06b0 100644
--- a/pkg/analysis_server/test/search/abstract_search_domain.dart
+++ b/pkg/analysis_server/test/search/abstract_search_domain.dart
@@ -20,21 +20,21 @@
SearchResult result;
void assertHasResult(SearchResultKind kind, String search, [int length]) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
length ??= findIdentifierLength(search);
findResult(kind, testFile, offset, length, true);
}
void assertNoResult(SearchResultKind kind, String search, [int length]) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
length ??= findIdentifierLength(search);
findResult(kind, testFile, offset, length, false);
}
void findResult(SearchResultKind kind, String file, int offset, int length,
bool expected) {
- for (SearchResult result in results) {
- Location location = result.location;
+ for (var result in results) {
+ var location = result.location;
if (result.kind == kind &&
location.file == file &&
location.offset == offset &&
@@ -55,8 +55,8 @@
String getPathString(List<Element> path) {
return path.map((Element element) {
- String kindName = element.kind.name;
- String name = element.name;
+ var kindName = element.kind.name;
+ var name = element.name;
if (name.isEmpty) {
return kindName;
} else {
@@ -70,8 +70,8 @@
super.processNotification(notification);
if (notification.event == SEARCH_NOTIFICATION_RESULTS) {
var params = SearchResultsParams.fromNotification(notification);
- String id = params.id;
- _ResultSet resultSet = resultSets[id];
+ var id = params.id;
+ var resultSet = resultSets[id];
if (resultSet == null) {
resultSet = _ResultSet(id);
resultSets[id] = resultSet;
@@ -91,7 +91,7 @@
}
Future waitForSearchResults() {
- _ResultSet resultSet = resultSets[searchId];
+ var resultSet = resultSets[searchId];
if (resultSet != null && resultSet.done) {
results = resultSet.results;
return Future.value();
diff --git a/pkg/analysis_server/test/search/declarations_test.dart b/pkg/analysis_server/test/search/declarations_test.dart
index f283321..88ebb33 100644
--- a/pkg/analysis_server/test/search/declarations_test.dart
+++ b/pkg/analysis_server/test/search/declarations_test.dart
@@ -4,7 +4,6 @@
import 'dart:async';
-import 'package:analysis_server/protocol/protocol.dart';
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
@@ -136,7 +135,7 @@
expect(declarationsResult.files, contains(b));
{
- ElementDeclaration declaration =
+ var declaration =
declarationsResult.declarations.singleWhere((d) => d.name == 'A');
expect(declaration.name, 'A');
expect(declaration.kind, ElementKind.CLASS);
@@ -147,7 +146,7 @@
}
{
- ElementDeclaration declaration =
+ var declaration =
declarationsResult.declarations.singleWhere((d) => d.name == 'B');
expect(declaration.name, 'B');
expect(declaration.kind, ElementKind.CLASS);
@@ -176,7 +175,7 @@
''');
await _getDeclarations();
- ElementDeclaration declaration = assertHas('f', ElementKind.FUNCTION);
+ var declaration = assertHas('f', ElementKind.FUNCTION);
expect(declaration.parameters, '(bool a, String b)');
}
@@ -216,10 +215,10 @@
Future<void> _getDeclarations(
{String file, String pattern, int maxResults}) async {
- Request request = SearchGetElementDeclarationsParams(
+ var request = SearchGetElementDeclarationsParams(
file: file, pattern: pattern, maxResults: maxResults)
.toRequest('0');
- Response response = await waitResponse(request);
+ var response = await waitResponse(request);
declarationsResult =
SearchGetElementDeclarationsResult.fromResponse(response);
diff --git a/pkg/analysis_server/test/search/element_references_test.dart b/pkg/analysis_server/test/search/element_references_test.dart
index 5792f5b..7bbc24e 100644
--- a/pkg/analysis_server/test/search/element_references_test.dart
+++ b/pkg/analysis_server/test/search/element_references_test.dart
@@ -4,7 +4,6 @@
import 'dart:async';
-import 'package:analysis_server/protocol/protocol.dart';
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
@@ -29,12 +28,12 @@
Future<void> findElementReferences(
String search, bool includePotential) async {
- int offset = findOffset(search);
+ var offset = findOffset(search);
await waitForTasksFinished();
- Request request =
+ var request =
SearchFindElementReferencesParams(testFile, offset, includePotential)
.toRequest('0');
- Response response = await waitResponse(request);
+ var response = await waitResponse(request);
var result = SearchFindElementReferencesResult.fromResponse(response);
searchId = result.id;
searchElement = result.element;
diff --git a/pkg/analysis_server/test/search/member_declarations_test.dart b/pkg/analysis_server/test/search/member_declarations_test.dart
index 8c9016e..5b213e9 100644
--- a/pkg/analysis_server/test/search/member_declarations_test.dart
+++ b/pkg/analysis_server/test/search/member_declarations_test.dart
@@ -4,7 +4,6 @@
import 'dart:async';
-import 'package:analysis_server/protocol/protocol.dart';
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
@@ -29,17 +28,17 @@
Future findMemberDeclarations(String name) async {
await waitForTasksFinished();
- Request request = SearchFindMemberDeclarationsParams(name).toRequest('0');
- Response response = await waitResponse(request);
+ var request = SearchFindMemberDeclarationsParams(name).toRequest('0');
+ var response = await waitResponse(request);
var result = SearchFindMemberDeclarationsResult.fromResponse(response);
searchId = result.id;
return waitForSearchResults();
}
SearchResult findTopLevelResult(ElementKind kind, String enclosingClass) {
- for (SearchResult result in results) {
- Element element = result.path[0];
- Element clazz = result.path[1];
+ for (var result in results) {
+ var element = result.path[0];
+ var clazz = result.path[1];
if (element.kind == kind && clazz.name == enclosingClass) {
return result;
}
diff --git a/pkg/analysis_server/test/search/member_references_test.dart b/pkg/analysis_server/test/search/member_references_test.dart
index 9f65668..9438381 100644
--- a/pkg/analysis_server/test/search/member_references_test.dart
+++ b/pkg/analysis_server/test/search/member_references_test.dart
@@ -4,7 +4,6 @@
import 'dart:async';
-import 'package:analysis_server/protocol/protocol.dart';
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -26,8 +25,8 @@
Future findMemberReferences(String name) async {
await waitForTasksFinished();
- Request request = SearchFindMemberReferencesParams(name).toRequest('0');
- Response response = await waitResponse(request);
+ var request = SearchFindMemberReferencesParams(name).toRequest('0');
+ var response = await waitResponse(request);
searchId = SearchFindMemberReferencesResult.fromResponse(response).id;
return waitForSearchResults();
}
diff --git a/pkg/analysis_server/test/search/top_level_declarations_test.dart b/pkg/analysis_server/test/search/top_level_declarations_test.dart
index 6895313..78086d1 100644
--- a/pkg/analysis_server/test/search/top_level_declarations_test.dart
+++ b/pkg/analysis_server/test/search/top_level_declarations_test.dart
@@ -4,7 +4,6 @@
import 'dart:async';
-import 'package:analysis_server/protocol/protocol.dart';
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
@@ -36,9 +35,8 @@
Future findTopLevelDeclarations(String pattern) async {
await waitForTasksFinished();
- Request request =
- SearchFindTopLevelDeclarationsParams(pattern).toRequest('0');
- Response response = await waitResponse(request);
+ var request = SearchFindTopLevelDeclarationsParams(pattern).toRequest('0');
+ var response = await waitResponse(request);
if (response.error != null) {
return response.error;
}
@@ -47,8 +45,8 @@
}
SearchResult findTopLevelResult(ElementKind kind, String name) {
- for (SearchResult result in results) {
- Element element = result.path[0];
+ for (var result in results) {
+ var element = result.path[0];
if (element.kind == kind && element.name == name) {
return result;
}
diff --git a/pkg/analysis_server/test/search/type_hierarchy_test.dart b/pkg/analysis_server/test/search/type_hierarchy_test.dart
index 40a2278..618f5b9 100644
--- a/pkg/analysis_server/test/search/type_hierarchy_test.dart
+++ b/pkg/analysis_server/test/search/type_hierarchy_test.dart
@@ -7,7 +7,6 @@
import 'package:analysis_server/protocol/protocol.dart';
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analysis_server/src/search/search_domain.dart';
-import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -37,7 +36,7 @@
main() {
}
''');
- List<TypeHierarchyItem> items = await _getTypeHierarchy('main() {');
+ var items = await _getTypeHierarchy('main() {');
expect(items, isNull);
}
@@ -47,7 +46,7 @@
/* target */
}
''');
- List<TypeHierarchyItem> items = await _getTypeHierarchy('/* target */');
+ var items = await _getTypeHierarchy('/* target */');
expect(items, isNull);
}
@@ -58,7 +57,7 @@
class B extends A {
}
''');
- List<TypeHierarchyItem> items = await _getTypeHierarchy('B extends A');
+ var items = await _getTypeHierarchy('B extends A');
expect(_toJson(items), [
{
'classElement': {
@@ -94,7 +93,7 @@
class B extends A<int> {
}
''');
- List<TypeHierarchyItem> items = await _getTypeHierarchy('B extends');
+ var items = await _getTypeHierarchy('B extends');
var itemB = items[0];
var itemA = items[itemB.superclass];
expect(itemA.classElement.name, 'A');
@@ -110,7 +109,7 @@
class CCC extends BBB implements AAA {}
''');
- List<TypeHierarchyItem> items = await _getTypeHierarchy('AAA {} // A');
+ var items = await _getTypeHierarchy('AAA {} // A');
expect(_toJson(items), [
{
'classElement': {
@@ -180,12 +179,12 @@
''');
await waitForTasksFinished();
// configure roots
- Request request = AnalysisSetAnalysisRootsParams(
+ var request = AnalysisSetAnalysisRootsParams(
[projectPath, convertPath('/packages/pkgA')], []).toRequest('0');
handleSuccessfulRequest(request);
// test A type hierarchy
- List<TypeHierarchyItem> items = await _getTypeHierarchy('A {}');
- Set<String> names = _toClassNames(items);
+ var items = await _getTypeHierarchy('A {}');
+ var names = _toClassNames(items);
expect(names, contains('A'));
expect(names, contains('B'));
expect(names, contains('C'));
@@ -199,7 +198,7 @@
class C extends B {
}
''');
- List<TypeHierarchyItem> items = await _getTypeHierarchy('A {}');
+ var items = await _getTypeHierarchy('A {}');
expect(_toJson(items), [
{
'classElement': {
@@ -260,7 +259,7 @@
class C extends B {
}
''');
- List<TypeHierarchyItem> items = await _getTypeHierarchy('B extends');
+ var items = await _getTypeHierarchy('B extends');
expect(_toJson(items), [
{
'classElement': {
@@ -321,7 +320,7 @@
class C extends B {
}
''');
- List<TypeHierarchyItem> items = await _getTypeHierarchy('C extends');
+ var items = await _getTypeHierarchy('C extends');
expect(_toJson(items), [
{
'classElement': {
@@ -382,7 +381,7 @@
class T implements MA, MB {
}
''');
- List<TypeHierarchyItem> items = await _getTypeHierarchy('T implements');
+ var items = await _getTypeHierarchy('T implements');
expect(_toJson(items), [
{
'classElement': {
@@ -443,7 +442,7 @@
class T extends Object with MA, MB {
}
''');
- List<TypeHierarchyItem> items = await _getTypeHierarchy('T extends Object');
+ var items = await _getTypeHierarchy('T extends Object');
expect(_toJson(items), [
{
'classElement': {
@@ -505,11 +504,11 @@
}
class B extends A with Mixin {}
''');
- List<TypeHierarchyItem> items = await _getTypeHierarchy('test = 1;');
+ var items = await _getTypeHierarchy('test = 1;');
var itemA = items.firstWhere((e) => e.classElement.name == 'A');
var itemB = items.firstWhere((e) => e.classElement.name == 'B');
- Element memberA = itemA.memberElement;
- Element memberB = itemB.memberElement;
+ var memberA = itemA.memberElement;
+ var memberB = itemB.memberElement;
expect(memberA, isNotNull);
expect(memberB, isNotNull);
expect(memberA.location.offset, findOffset('test = 1;'));
@@ -526,11 +525,11 @@
}
class B extends A with Mixin {}
''');
- List<TypeHierarchyItem> items = await _getTypeHierarchy('test = 1;');
+ var items = await _getTypeHierarchy('test = 1;');
var itemA = items.firstWhere((e) => e.classElement.name == 'A');
var itemB = items.firstWhere((e) => e.classElement.name == 'B');
- Element memberA = itemA.memberElement;
- Element memberB = itemB.memberElement;
+ var memberA = itemA.memberElement;
+ var memberB = itemB.memberElement;
expect(memberA, isNotNull);
expect(memberB, isNotNull);
expect(memberA.location.offset, findOffset('test = 1;'));
@@ -546,9 +545,9 @@
var test = 2;
}
''');
- List<TypeHierarchyItem> items = await _getTypeHierarchy('test = 2;');
- TypeHierarchyItem itemB = items[0];
- TypeHierarchyItem itemA = items[itemB.superclass];
+ var items = await _getTypeHierarchy('test = 2;');
+ var itemB = items[0];
+ var itemA = items[itemB.superclass];
expect(itemA.classElement.name, 'A');
expect(itemB.classElement.name, 'B');
expect(itemA.memberElement.location.offset, findOffset('test = 1;'));
@@ -564,9 +563,9 @@
var test = 2;
}
''');
- List<TypeHierarchyItem> items = await _getTypeHierarchy('test = 2;');
- TypeHierarchyItem itemB = items[0];
- TypeHierarchyItem itemA = items[itemB.superclass];
+ var items = await _getTypeHierarchy('test = 2;');
+ var itemB = items[0];
+ var itemA = items[itemB.superclass];
expect(itemA.classElement.name, 'A');
expect(itemB.classElement.name, 'B');
expect(itemA.memberElement.location.offset, findOffset('test => 1'));
@@ -582,9 +581,9 @@
var test = 2;
}
''');
- List<TypeHierarchyItem> items = await _getTypeHierarchy('test = 2;');
- TypeHierarchyItem itemB = items[0];
- TypeHierarchyItem itemA = items[itemB.superclass];
+ var items = await _getTypeHierarchy('test = 2;');
+ var itemB = items[0];
+ var itemA = items[itemB.superclass];
expect(itemA.classElement.name, 'A');
expect(itemB.classElement.name, 'B');
expect(itemA.memberElement.location.offset, findOffset('test(a) {}'));
@@ -600,9 +599,9 @@
final test = 2;
}
''');
- List<TypeHierarchyItem> items = await _getTypeHierarchy('test = 2;');
- TypeHierarchyItem itemB = items[0];
- TypeHierarchyItem itemA = items[itemB.superclass];
+ var items = await _getTypeHierarchy('test = 2;');
+ var itemB = items[0];
+ var itemA = items[itemB.superclass];
expect(itemA.classElement.name, 'A');
expect(itemB.classElement.name, 'B');
expect(itemA.memberElement.location.offset, findOffset('test => 1;'));
@@ -618,9 +617,9 @@
final test = 2;
}
''');
- List<TypeHierarchyItem> items = await _getTypeHierarchy('test = 2;');
- TypeHierarchyItem itemB = items[0];
- TypeHierarchyItem itemA = items[itemB.superclass];
+ var items = await _getTypeHierarchy('test = 2;');
+ var itemB = items[0];
+ var itemA = items[itemB.superclass];
expect(itemA.classElement.name, 'A');
expect(itemB.classElement.name, 'B');
expect(itemA.memberElement, isNull);
@@ -641,12 +640,11 @@
get test => null; // in D
}
''');
- List<TypeHierarchyItem> items =
- await _getTypeHierarchy('test => null; // in B');
- TypeHierarchyItem itemB = items[0];
- TypeHierarchyItem itemA = items[itemB.superclass];
- TypeHierarchyItem itemC = items[itemB.subclasses[0]];
- TypeHierarchyItem itemD = items[itemC.subclasses[0]];
+ var items = await _getTypeHierarchy('test => null; // in B');
+ var itemB = items[0];
+ var itemA = items[itemB.superclass];
+ var itemC = items[itemB.subclasses[0]];
+ var itemD = items[itemC.subclasses[0]];
expect(itemA.classElement.name, 'A');
expect(itemB.classElement.name, 'B');
expect(itemC.classElement.name, 'C');
@@ -674,8 +672,7 @@
test() {} // in D
}
''');
- List<TypeHierarchyItem> items =
- await _getTypeHierarchy('test() {} // in B');
+ var items = await _getTypeHierarchy('test() {} // in B');
var itemB = items[0];
var itemA = items[itemB.superclass];
var itemC = items[itemB.subclasses[0]];
@@ -712,7 +709,7 @@
_m() {} // in D
}
''');
- List<TypeHierarchyItem> items = await _getTypeHierarchy('_m() {} // in B');
+ var items = await _getTypeHierarchy('_m() {} // in B');
var itemB = items[0];
var itemA = items[itemB.superclass];
var itemC = items[itemB.subclasses[0]];
@@ -739,7 +736,7 @@
_m() {} // in C
}
''');
- List<TypeHierarchyItem> items = await _getTypeHierarchy('_m() {} // in B');
+ var items = await _getTypeHierarchy('_m() {} // in B');
var itemB = items[0];
var itemA = items[itemB.superclass];
var itemC = items[itemB.subclasses[0]];
@@ -766,8 +763,7 @@
void test() {} // in D4
}
''');
- List<TypeHierarchyItem> items =
- await _getTypeHierarchy('test() {} // in M1');
+ var items = await _getTypeHierarchy('test() {} // in M1');
var itemM1 = items.firstWhere((e) => e.classElement.name == 'M1');
var item1 = items.firstWhere((e) => e.classElement.name == 'D1');
var item2 = items.firstWhere((e) => e.classElement.name == 'D2');
@@ -780,23 +776,23 @@
expect(item4, isNotNull);
// D1 does not override
{
- Element member1 = item1.memberElement;
+ var member1 = item1.memberElement;
expect(member1, isNull);
}
// D2 mixes-in M2 last, which overrides
{
- Element member2 = item2.memberElement;
+ var member2 = item2.memberElement;
expect(member2, isNotNull);
expect(member2.location.offset, findOffset('test() {} // in M2'));
}
// D3 mixes-in M1 last and does not override itself
{
- Element member3 = item3.memberElement;
+ var member3 = item3.memberElement;
expect(member3, isNull);
}
// D4 mixes-in M1 last, but it also overrides
{
- Element member4 = item4.memberElement;
+ var member4 = item4.memberElement;
expect(member4.location.offset, findOffset('test() {} // in D4'));
}
}
@@ -814,13 +810,13 @@
get test => null; // in Derived2
}
''');
- List<TypeHierarchyItem> items = await _getTypeHierarchy('test; // in Base');
+ var items = await _getTypeHierarchy('test; // in Base');
var itemBase = items.firstWhere((e) => e.classElement.name == 'Base');
var item1 = items.firstWhere((e) => e.classElement.name == 'Derived1');
var item2 = items.firstWhere((e) => e.classElement.name == 'Derived2');
- Element memberBase = itemBase.memberElement;
- Element member1 = item1.memberElement;
- Element member2 = item2.memberElement;
+ var memberBase = itemBase.memberElement;
+ var member1 = item1.memberElement;
+ var member2 = item2.memberElement;
expect(memberBase, isNotNull);
expect(member1, isNotNull);
expect(member2, isNotNull);
@@ -842,14 +838,13 @@
void test() {} // in Derived2
}
''');
- List<TypeHierarchyItem> items =
- await _getTypeHierarchy('test(); // in Base');
+ var items = await _getTypeHierarchy('test(); // in Base');
var itemBase = items.firstWhere((e) => e.classElement.name == 'Base');
var item1 = items.firstWhere((e) => e.classElement.name == 'Derived1');
var item2 = items.firstWhere((e) => e.classElement.name == 'Derived2');
- Element memberBase = itemBase.memberElement;
- Element member1 = item1.memberElement;
- Element member2 = item2.memberElement;
+ var memberBase = itemBase.memberElement;
+ var member1 = item1.memberElement;
+ var member2 = item2.memberElement;
expect(memberBase, isNotNull);
expect(member1, isNotNull);
expect(member2, isNotNull);
@@ -871,14 +866,13 @@
set test(x) {} // in Derived2
}
''');
- List<TypeHierarchyItem> items =
- await _getTypeHierarchy('test(x); // in Base');
+ var items = await _getTypeHierarchy('test(x); // in Base');
var itemBase = items.firstWhere((e) => e.classElement.name == 'Base');
var item1 = items.firstWhere((e) => e.classElement.name == 'Derived1');
var item2 = items.firstWhere((e) => e.classElement.name == 'Derived2');
- Element memberBase = itemBase.memberElement;
- Element member1 = item1.memberElement;
- Element member2 = item2.memberElement;
+ var memberBase = itemBase.memberElement;
+ var member1 = item1.memberElement;
+ var member2 = item2.memberElement;
expect(memberBase, isNotNull);
expect(member1, isNotNull);
expect(member2, isNotNull);
@@ -958,8 +952,7 @@
operator ==(x) => null; // in D
}
''');
- List<TypeHierarchyItem> items =
- await _getTypeHierarchy('==(x) => null; // in B');
+ var items = await _getTypeHierarchy('==(x) => null; // in B');
var itemB = items[0];
var itemA = items[itemB.superclass];
var itemC = items[itemB.subclasses[0]];
@@ -991,8 +984,7 @@
set test(x) {} // in D
}
''');
- List<TypeHierarchyItem> items =
- await _getTypeHierarchy('test(x) {} // in B');
+ var items = await _getTypeHierarchy('test(x) {} // in B');
var itemB = items[0];
var itemA = items[itemB.superclass];
var itemC = items[itemB.subclasses[0]];
@@ -1017,8 +1009,7 @@
class C extends A implements B {}
class D extends C {}
''');
- List<TypeHierarchyItem> items =
- await _getTypeHierarchy('C extends', superOnly: true);
+ var items = await _getTypeHierarchy('C extends', superOnly: true);
expect(_toJson(items), [
{
'classElement': {
@@ -1071,12 +1062,12 @@
}
Future<void> test_superOnly_fileDoesNotExist() async {
- Request request = SearchGetTypeHierarchyParams(
+ var request = SearchGetTypeHierarchyParams(
convertPath('/does/not/exist.dart'), 0,
superOnly: true)
.toRequest(requestId);
- Response response = await serverChannel.sendRequest(request);
- List<TypeHierarchyItem> items =
+ var response = await serverChannel.sendRequest(request);
+ var items =
SearchGetTypeHierarchyResult.fromResponse(response).hierarchyItems;
expect(items, isNull);
}
@@ -1094,9 +1085,8 @@
Future<List<TypeHierarchyItem>> _getTypeHierarchy(String search,
{bool superOnly}) async {
await waitForTasksFinished();
- Request request =
- _createGetTypeHierarchyRequest(search, superOnly: superOnly);
- Response response = await serverChannel.sendRequest(request);
+ var request = _createGetTypeHierarchyRequest(search, superOnly: superOnly);
+ var response = await serverChannel.sendRequest(request);
return SearchGetTypeHierarchyResult.fromResponse(response).hierarchyItems;
}
diff --git a/pkg/analysis_server/test/services/completion/dart/arglist_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/arglist_contributor_test.dart
index e1aa7f1..33834f2 100644
--- a/pkg/analysis_server/test/services/completion/dart/arglist_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/arglist_contributor_test.dart
@@ -19,7 +19,7 @@
@reflectiveTest
class ArgListContributorTest extends DartCompletionContributorTest {
void assertNoOtherSuggestions(Iterable<CompletionSuggestion> expected) {
- for (CompletionSuggestion suggestion in suggestions) {
+ for (var suggestion in suggestions) {
if (!expected.contains(suggestion)) {
failedCompletion('did not expect completion: '
'${suggestion.completion}\n $suggestion');
@@ -31,8 +31,7 @@
/// the given [completion], [selectionOffset] and [selectionLength].
void assertSuggestArgumentAndCompletion(String name,
{String completion, int selectionOffset, int selectionLength = 0}) {
- CompletionSuggestion suggestion =
- suggestions.firstWhere((s) => s.parameterName == name);
+ var suggestion = suggestions.firstWhere((s) => s.parameterName == name);
expect(suggestion, isNotNull);
expect(suggestion.completion, completion);
expect(suggestion.selectionOffset, selectionOffset);
@@ -48,7 +47,7 @@
actualNames.length == expectedNames.length &&
actualTypes != null &&
actualTypes.length == expectedTypes.length) {
- int index = 0;
+ var index = 0;
while (index < expectedNames.length) {
if (actualNames[index] != expectedNames[index] ||
actualTypes[index] != expectedTypes[index]) {
@@ -60,7 +59,7 @@
return;
}
}
- StringBuffer msg = StringBuffer();
+ var msg = StringBuffer();
msg.writeln('Argument list not the same');
msg.writeln(' Expected names: $expectedNames');
msg.writeln(' found: $actualNames');
@@ -76,16 +75,16 @@
List<int> requiredParamIndices = const <int>[],
bool includeColon = true,
bool includeComma = false}) {
- List<CompletionSuggestion> expected = <CompletionSuggestion>[];
- int paramIndex = 0;
+ var expected = <CompletionSuggestion>[];
+ var paramIndex = 0;
namedArgumentsWithTypes.forEach((String name, String type) {
- String completion = includeColon ? '$name: ' : name;
+ var completion = includeColon ? '$name: ' : name;
// Selection should be before any trailing commas.
- int selectionOffset = completion.length;
+ var selectionOffset = completion.length;
if (includeComma) {
completion = '$completion,';
}
- int relevance = requiredParamIndices.contains(paramIndex++)
+ var relevance = requiredParamIndices.contains(paramIndex++)
? DART_RELEVANCE_NAMED_PARAMETER_REQUIRED
: DART_RELEVANCE_NAMED_PARAMETER;
expected.add(assertSuggest(completion,
@@ -100,10 +99,10 @@
/// Assert that the specified suggestions are the only suggestions.
void assertSuggestions(List<String> suggestions) {
- List<CompletionSuggestion> expected = <CompletionSuggestion>[];
- for (String suggestion in suggestions) {
+ var expected = <CompletionSuggestion>[];
+ for (var suggestion in suggestions) {
// Selection offset should be before any trailing commas.
- int selectionOffset =
+ var selectionOffset =
suggestion.endsWith(',') ? suggestion.length - 1 : suggestion.length;
expected.add(assertSuggest('$suggestion',
csKind: CompletionSuggestionKind.NAMED_ARGUMENT,
@@ -786,7 +785,7 @@
Future<void>
test_ArgumentList_local_constructor_named_fieldFormal_documentation() async {
- String content = '''
+ var content = '''
class A {
/// aaa
///
@@ -803,11 +802,11 @@
await computeSuggestions();
expect(suggestions, hasLength(1));
- CompletionSuggestion suggestion = suggestions[0];
+ var suggestion = suggestions[0];
expect(suggestion.docSummary, 'aaa');
expect(suggestion.docComplete, 'aaa\n\nbbb\nccc');
- Element element = suggestion.element;
+ var element = suggestion.element;
expect(element, isNotNull);
expect(element.kind, ElementKind.PARAMETER);
expect(element.name, 'fff');
@@ -816,7 +815,7 @@
Future<void>
test_ArgumentList_local_constructor_named_fieldFormal_noDocumentation() async {
- String content = '''
+ var content = '''
class A {
int fff;
A({this.fff});
@@ -829,11 +828,11 @@
await computeSuggestions();
expect(suggestions, hasLength(1));
- CompletionSuggestion suggestion = suggestions[0];
+ var suggestion = suggestions[0];
expect(suggestion.docSummary, isNull);
expect(suggestion.docComplete, isNull);
- Element element = suggestion.element;
+ var element = suggestion.element;
expect(element, isNotNull);
expect(element.kind, ElementKind.PARAMETER);
expect(element.name, 'fff');
diff --git a/pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart b/pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart
index 48edb3f..c4521dc 100644
--- a/pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart
+++ b/pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart
@@ -18,8 +18,8 @@
import '../../../abstract_context.dart';
int suggestionComparator(CompletionSuggestion s1, CompletionSuggestion s2) {
- String c1 = s1.completion.toLowerCase();
- String c2 = s2.completion.toLowerCase();
+ var c1 = s1.completion.toLowerCase();
+ var c2 = s2.completion.toLowerCase();
return c1.compareTo(c2);
}
@@ -125,7 +125,7 @@
expect(completionOffset, isNull, reason: 'Call addTestUnit exactly once');
completionOffset = content.indexOf('^');
expect(completionOffset, isNot(equals(-1)), reason: 'missing ^');
- int nextOffset = content.indexOf('^', completionOffset + 1);
+ var nextOffset = content.indexOf('^', completionOffset + 1);
expect(nextOffset, equals(-1), reason: 'too many ^');
content = content.substring(0, completionOffset) +
content.substring(completionOffset + 1);
@@ -155,7 +155,7 @@
}
return;
}
- CompletionSuggestion suggestion = suggestions.firstWhere(
+ var suggestion = suggestions.firstWhere(
(CompletionSuggestion cs) => cs.kind == kind,
orElse: () => null);
if (suggestion != null) {
@@ -164,7 +164,7 @@
}
void assertNotSuggested(String completion) {
- CompletionSuggestion suggestion = suggestions.firstWhere(
+ var suggestion = suggestions.firstWhere(
(CompletionSuggestion cs) => cs.completion == completion,
orElse: () => null);
if (suggestion != null) {
@@ -186,7 +186,7 @@
String defaultArgListString = _UNCHECKED,
List<int> defaultArgumentListTextRanges,
bool isSynthetic = false}) {
- CompletionSuggestion cs =
+ var cs =
getSuggest(completion: completion, csKind: csKind, elemKind: elemKind);
if (cs == null) {
failedCompletion('expected $completion $csKind $elemKind', suggestions);
@@ -237,14 +237,14 @@
String elemFile,
String elemName,
int elemOffset}) {
- CompletionSuggestion cs = assertSuggest(name,
+ var cs = assertSuggest(name,
csKind: kind,
relevance: relevance,
isDeprecated: isDeprecated,
elemFile: elemFile,
elemKind: ElementKind.CLASS,
elemOffset: elemOffset);
- Element element = cs.element;
+ var element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(ElementKind.CLASS));
expect(element.name, equals(elemName ?? name));
@@ -257,9 +257,8 @@
CompletionSuggestion assertSuggestClassTypeAlias(String name,
{int relevance,
CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION}) {
- CompletionSuggestion cs =
- assertSuggest(name, csKind: kind, relevance: relevance);
- Element element = cs.element;
+ var cs = assertSuggest(name, csKind: kind, relevance: relevance);
+ var element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(ElementKind.CLASS_TYPE_ALIAS));
expect(element.name, equals(name));
@@ -275,16 +274,16 @@
int elemOffset,
String defaultArgListString = _UNCHECKED,
List<int> defaultArgumentListTextRanges}) {
- CompletionSuggestion cs = assertSuggest(name,
+ var cs = assertSuggest(name,
relevance: relevance,
elemKind: ElementKind.CONSTRUCTOR,
elemOffset: elemOffset,
defaultArgListString: defaultArgListString,
defaultArgumentListTextRanges: defaultArgumentListTextRanges);
- Element element = cs.element;
+ var element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(ElementKind.CONSTRUCTOR));
- int index = name.indexOf('.');
+ var index = name.indexOf('.');
elementName ??= index >= 0 ? name.substring(index + 1) : '';
expect(element.name, elementName);
return cs;
@@ -292,8 +291,7 @@
CompletionSuggestion assertSuggestEnum(String completion,
{bool isDeprecated = false}) {
- CompletionSuggestion suggestion =
- assertSuggest(completion, isDeprecated: isDeprecated);
+ var suggestion = assertSuggest(completion, isDeprecated: isDeprecated);
expect(suggestion.isDeprecated, isDeprecated);
expect(suggestion.element.kind, ElementKind.ENUM);
return suggestion;
@@ -311,7 +309,7 @@
if (hasTypeBoost) {
relevance += DART_RELEVANCE_BOOST_TYPE;
}
- CompletionSuggestion suggestion = assertSuggest(completion,
+ var suggestion = assertSuggest(completion,
relevance: relevance, isDeprecated: isDeprecated);
expect(suggestion.completion, completion);
expect(suggestion.isDeprecated, isDeprecated);
@@ -323,14 +321,14 @@
{int relevance,
CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION,
bool isDeprecated = false}) {
- CompletionSuggestion cs = assertSuggest(name,
+ var cs = assertSuggest(name,
csKind: kind,
relevance: relevance,
elemKind: ElementKind.FIELD,
isDeprecated: isDeprecated);
// The returnType represents the type of a field
expect(cs.returnType, type ?? 'dynamic');
- Element element = cs.element;
+ var element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(ElementKind.FIELD));
expect(element.name, equals(name));
@@ -347,7 +345,7 @@
int relevance,
String defaultArgListString = _UNCHECKED,
List<int> defaultArgumentListTextRanges}) {
- CompletionSuggestion cs = assertSuggest(name,
+ var cs = assertSuggest(name,
csKind: kind,
relevance: relevance,
isDeprecated: isDeprecated,
@@ -358,12 +356,12 @@
} else if (isNullExpectedReturnTypeConsideredDynamic) {
expect(cs.returnType, 'dynamic');
}
- Element element = cs.element;
+ var element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(ElementKind.FUNCTION));
expect(element.name, equals(name));
expect(element.isDeprecated, equals(isDeprecated));
- String param = element.parameters;
+ var param = element.parameters;
expect(param, isNotNull);
expect(param[0], equals('('));
expect(param[param.length - 1], equals(')'));
@@ -383,7 +381,7 @@
int relevance,
CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION,
}) {
- CompletionSuggestion cs = assertSuggest(name,
+ var cs = assertSuggest(name,
csKind: kind, relevance: relevance, isDeprecated: isDeprecated);
if (returnType != null) {
expect(cs.returnType, returnType);
@@ -392,7 +390,7 @@
} else {
expect(cs.returnType, isNull);
}
- Element element = cs.element;
+ var element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(ElementKind.FUNCTION_TYPE_ALIAS));
expect(element.name, equals(name));
@@ -412,13 +410,13 @@
{int relevance,
CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION,
bool isDeprecated = false}) {
- CompletionSuggestion cs = assertSuggest(name,
+ var cs = assertSuggest(name,
csKind: kind,
relevance: relevance,
elemKind: ElementKind.GETTER,
isDeprecated: isDeprecated);
expect(cs.returnType, returnType ?? 'dynamic');
- Element element = cs.element;
+ var element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(ElementKind.GETTER));
expect(element.name, equals(name));
@@ -435,7 +433,7 @@
bool isDeprecated = false,
String defaultArgListString = _UNCHECKED,
List<int> defaultArgumentListTextRanges}) {
- CompletionSuggestion cs = assertSuggest(name,
+ var cs = assertSuggest(name,
csKind: kind,
relevance: relevance,
isDeprecated: isDeprecated,
@@ -443,11 +441,11 @@
defaultArgumentListTextRanges: defaultArgumentListTextRanges);
expect(cs.declaringType, equals(declaringType));
expect(cs.returnType, returnType ?? 'dynamic');
- Element element = cs.element;
+ var element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(ElementKind.METHOD));
expect(element.name, equals(name));
- String param = element.parameters;
+ var param = element.parameters;
expect(param, isNotNull);
expect(param[0], equals('('));
expect(param[param.length - 1], equals(')'));
@@ -463,14 +461,14 @@
String elemFile,
String elemName,
int elemOffset}) {
- CompletionSuggestion cs = assertSuggest(name,
+ var cs = assertSuggest(name,
csKind: kind,
relevance: relevance,
isDeprecated: isDeprecated,
elemFile: elemFile,
elemKind: ElementKind.MIXIN,
elemOffset: elemOffset);
- Element element = cs.element;
+ var element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(ElementKind.MIXIN));
expect(element.name, equals(elemName ?? name));
@@ -484,7 +482,7 @@
{int relevance,
CompletionSuggestionKind kind = CompletionSuggestionKind.IDENTIFIER,
bool isDeprecated = false}) {
- CompletionSuggestion cs = assertSuggest(name,
+ var cs = assertSuggest(name,
csKind: kind, relevance: relevance, isDeprecated: isDeprecated);
expect(cs.completion, equals(name));
expect(cs.element, isNull);
@@ -495,9 +493,9 @@
CompletionSuggestion assertSuggestSetter(String name,
{int relevance,
CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION}) {
- CompletionSuggestion cs = assertSuggest(name,
+ var cs = assertSuggest(name,
csKind: kind, relevance: relevance, elemKind: ElementKind.SETTER);
- Element element = cs.element;
+ var element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(ElementKind.SETTER));
expect(element.name, equals(name));
@@ -517,14 +515,13 @@
int relevance,
CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION,
}) {
- CompletionSuggestion cs =
- assertSuggest(name, csKind: kind, relevance: relevance);
+ var cs = assertSuggest(name, csKind: kind, relevance: relevance);
if (returnType != null) {
expect(cs.returnType, returnType);
} else if (isNullExpectedReturnTypeConsideredDynamic) {
expect(cs.returnType, 'dynamic');
}
- Element element = cs.element;
+ var element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(ElementKind.TOP_LEVEL_VARIABLE));
expect(element.name, equals(name));
@@ -543,8 +540,8 @@
Future computeSuggestions({int times = 200}) async {
var resolveResult = await session.getResolvedUnit(testFile);
- CompletionRequestImpl baseRequest = CompletionRequestImpl(resolveResult,
- completionOffset, useNewRelevance, CompletionPerformance());
+ var baseRequest = CompletionRequestImpl(resolveResult, completionOffset,
+ useNewRelevance, CompletionPerformance());
// Build the request
var request = await DartCompletionRequestImpl.from(baseRequest);
@@ -560,7 +557,7 @@
void failedCompletion(String message,
[Iterable<CompletionSuggestion> completions]) {
- StringBuffer sb = StringBuffer(message);
+ var sb = StringBuffer(message);
if (completions != null) {
sb.write('\n found');
completions.toList()
@@ -586,7 +583,7 @@
return;
}
if (elemKind != null) {
- Element element = s.element;
+ var element = s.element;
if (element == null || elemKind != element.kind) {
return;
}
diff --git a/pkg/analysis_server/test/services/completion/dart/completion_manager_test.dart b/pkg/analysis_server/test/services/completion/dart/completion_manager_test.dart
index 7a677d8..86d3b20 100644
--- a/pkg/analysis_server/test/services/completion/dart/completion_manager_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/completion_manager_test.dart
@@ -45,13 +45,12 @@
addTestSource('part of libB; main() {^}');
// Build the request
- CompletionRequestImpl baseRequest = CompletionRequestImpl(
+ var baseRequest = CompletionRequestImpl(
await session.getResolvedUnit(testFile),
completionOffset,
false,
CompletionPerformance());
- Completer<DartCompletionRequest> requestCompleter =
- Completer<DartCompletionRequest>();
+ var requestCompleter = Completer<DartCompletionRequest>();
DartCompletionRequestImpl.from(baseRequest)
.then((DartCompletionRequest request) {
requestCompleter.complete(request);
@@ -60,13 +59,13 @@
var directives = request.target.unit.directives;
- List<ImportElement> imports = request.libraryElement.imports;
+ var imports = request.libraryElement.imports;
expect(imports, hasLength(directives.length + 1));
ImportElement importNamed(String expectedUri) {
- List<String> uriList = <String>[];
- for (ImportElement importElement in imports) {
- String uri = importElement.importedLibrary.source.uri.toString();
+ var uriList = <String>[];
+ for (var importElement in imports) {
+ var uri = importElement.importedLibrary.source.uri.toString();
uriList.add(uri);
if (uri.endsWith(expectedUri)) {
return importElement;
@@ -76,7 +75,7 @@
}
void assertImportedLib(String expectedUri) {
- ImportElement importElem = importNamed(expectedUri);
+ var importElem = importNamed(expectedUri);
expect(importElem.importedLibrary.exportNamespace, isNotNull);
}
diff --git a/pkg/analysis_server/test/services/completion/dart/imported_reference_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/imported_reference_contributor_test.dart
index 53a6f80..70752af 100644
--- a/pkg/analysis_server/test/services/completion/dart/imported_reference_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/imported_reference_contributor_test.dart
@@ -1362,7 +1362,7 @@
expect(replacementLength, 0);
assertNotSuggested('A');
assertNotSuggested('_B');
- CompletionSuggestion suggestionO = assertSuggestClass('Object');
+ var suggestionO = assertSuggestClass('Object');
if (suggestionO != null) {
expect(suggestionO.element.isDeprecated, isFalse);
expect(suggestionO.element.isPrivate, isFalse);
@@ -1786,7 +1786,7 @@
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestClass('A');
+ var suggestion = assertSuggestClass('A');
expect(suggestion.docSummary, 'My class.\nShort description.');
expect(suggestion.docComplete,
'My class.\nShort description.\n\nLonger description.');
@@ -1808,7 +1808,7 @@
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestFunction('myFunc', 'int');
+ var suggestion = assertSuggestFunction('myFunc', 'int');
expect(suggestion.docSummary, 'My function.\nShort description.');
expect(suggestion.docComplete,
'My function.\nShort description.\n\nLonger description.');
@@ -1829,7 +1829,7 @@
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestFunction('myFunc', 'int');
+ var suggestion = assertSuggestFunction('myFunc', 'int');
expect(suggestion.docSummary, 'My function.\nShort description.');
expect(suggestion.docComplete,
'My function.\nShort description.\n\nLonger description.');
@@ -2142,7 +2142,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestFunction('m', 'int');
+ var suggestion = assertSuggestFunction('m', 'int');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -2163,7 +2163,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestFunction('m', 'void');
+ var suggestion = assertSuggestFunction('m', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -2184,7 +2184,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestFunction('m', 'void');
+ var suggestion = assertSuggestFunction('m', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -2206,7 +2206,7 @@
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestFunction('m', 'void');
+ var suggestion = assertSuggestFunction('m', 'void');
expect(suggestion.parameterNames, isEmpty);
expect(suggestion.parameterTypes, isEmpty);
expect(suggestion.requiredParameterCount, 0);
@@ -2224,7 +2224,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestFunction('m', 'void');
+ var suggestion = assertSuggestFunction('m', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -2245,7 +2245,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestFunction('m', 'void');
+ var suggestion = assertSuggestFunction('m', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -3119,7 +3119,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestFunction('m', 'void');
+ var suggestion = assertSuggestFunction('m', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -3140,7 +3140,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestFunction('m', 'void');
+ var suggestion = assertSuggestFunction('m', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -3161,7 +3161,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestFunction('m', 'void');
+ var suggestion = assertSuggestFunction('m', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -3183,7 +3183,7 @@
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestFunction('m', 'void');
+ var suggestion = assertSuggestFunction('m', 'void');
expect(suggestion.parameterNames, isEmpty);
expect(suggestion.parameterTypes, isEmpty);
expect(suggestion.requiredParameterCount, 0);
@@ -3201,7 +3201,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestFunction('m', 'void');
+ var suggestion = assertSuggestFunction('m', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -3222,7 +3222,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestFunction('m', 'void');
+ var suggestion = assertSuggestFunction('m', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -3567,7 +3567,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestTopLevelVar('x', null);
+ var suggestion = assertSuggestTopLevelVar('x', null);
assertHasNoParameterInfo(suggestion);
}
@@ -3582,7 +3582,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestGetter('x', 'int');
+ var suggestion = assertSuggestGetter('x', 'int');
assertHasNoParameterInfo(suggestion);
}
@@ -3597,7 +3597,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestSetter('x');
+ var suggestion = assertSuggestSetter('x');
assertHasNoParameterInfo(suggestion);
}
diff --git a/pkg/analysis_server/test/services/completion/dart/inherited_reference_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/inherited_reference_contributor_test.dart
index 2b43a5c..8f3172c 100644
--- a/pkg/analysis_server/test/services/completion/dart/inherited_reference_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/inherited_reference_contributor_test.dart
@@ -4,7 +4,6 @@
import 'dart:async';
-import 'package:analysis_server/src/protocol_server.dart';
import 'package:analysis_server/src/provisional/completion/dart/completion_dart.dart';
import 'package:analysis_server/src/services/completion/dart/inherited_reference_contributor.dart';
import 'package:test/test.dart';
@@ -252,7 +251,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'A', 'void');
+ var suggestion = assertSuggestMethod('m', 'A', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -272,7 +271,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'A', 'void');
+ var suggestion = assertSuggestMethod('m', 'A', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -295,7 +294,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'A', 'void');
+ var suggestion = assertSuggestMethod('m', 'A', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -316,7 +315,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'A', 'void');
+ var suggestion = assertSuggestMethod('m', 'A', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -339,7 +338,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'A', 'void');
+ var suggestion = assertSuggestMethod('m', 'A', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -359,7 +358,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'A', 'void');
+ var suggestion = assertSuggestMethod('m', 'A', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -382,7 +381,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'A', 'void');
+ var suggestion = assertSuggestMethod('m', 'A', 'void');
expect(suggestion.parameterNames, isEmpty);
expect(suggestion.parameterTypes, isEmpty);
expect(suggestion.requiredParameterCount, 0);
@@ -399,7 +398,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'A', 'void');
+ var suggestion = assertSuggestMethod('m', 'A', 'void');
expect(suggestion.parameterNames, isEmpty);
expect(suggestion.parameterTypes, isEmpty);
expect(suggestion.requiredParameterCount, 0);
@@ -419,7 +418,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'A', 'void');
+ var suggestion = assertSuggestMethod('m', 'A', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -439,7 +438,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'A', 'void');
+ var suggestion = assertSuggestMethod('m', 'A', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -462,7 +461,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'A', 'void');
+ var suggestion = assertSuggestMethod('m', 'A', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -507,7 +506,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestField('x', 'int');
+ var suggestion = assertSuggestField('x', 'int');
assertHasNoParameterInfo(suggestion);
}
@@ -524,7 +523,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestGetter('x', 'int');
+ var suggestion = assertSuggestGetter('x', 'int');
assertHasNoParameterInfo(suggestion);
}
@@ -541,7 +540,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestSetter('x');
+ var suggestion = assertSuggestSetter('x');
assertHasNoParameterInfo(suggestion);
}
@@ -689,8 +688,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion cs =
- assertSuggest(completion, selectionOffset: selectionOffset);
+ var cs = assertSuggest(completion, selectionOffset: selectionOffset);
expect(cs.selectionLength, 0);
// It is an invocation, but we don't need any additional info for it.
diff --git a/pkg/analysis_server/test/services/completion/dart/keyword_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/keyword_contributor_test.dart
index 39f4986..4272bdc 100644
--- a/pkg/analysis_server/test/services/completion/dart/keyword_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/keyword_contributor_test.dart
@@ -51,7 +51,7 @@
];
List<Keyword> get classBodyKeywords {
- List<Keyword> keywords = [
+ var keywords = <Keyword>[
Keyword.CONST,
Keyword.COVARIANT,
Keyword.DYNAMIC,
@@ -71,7 +71,7 @@
}
List<Keyword> get constructorParameter {
- List<Keyword> keywords = [Keyword.COVARIANT, Keyword.DYNAMIC, Keyword.THIS];
+ var keywords = <Keyword>[Keyword.COVARIANT, Keyword.DYNAMIC, Keyword.THIS];
if (isEnabled(ExperimentalFeatures.non_nullable)) {
keywords.add(Keyword.REQUIRED);
}
@@ -79,7 +79,7 @@
}
List<Keyword> get declarationKeywords {
- List<Keyword> keywords = [
+ var keywords = <Keyword>[
Keyword.ABSTRACT,
Keyword.CLASS,
Keyword.CONST,
@@ -100,7 +100,7 @@
}
List<Keyword> get directiveAndDeclarationKeywords {
- List<Keyword> keywords = [
+ var keywords = <Keyword>[
Keyword.ABSTRACT,
Keyword.CLASS,
Keyword.CONST,
@@ -124,7 +124,7 @@
}
List<Keyword> get directiveDeclarationAndLibraryKeywords {
- List<Keyword> keywords = directiveDeclarationKeywords..add(Keyword.LIBRARY);
+ var keywords = directiveDeclarationKeywords..add(Keyword.LIBRARY);
if (isEnabled(ExperimentalFeatures.non_nullable)) {
keywords.add(Keyword.LATE);
}
@@ -132,7 +132,7 @@
}
List<Keyword> get directiveDeclarationKeywords {
- List<Keyword> keywords = [
+ var keywords = <Keyword>[
Keyword.ABSTRACT,
Keyword.CLASS,
Keyword.CONST,
@@ -156,7 +156,7 @@
}
List<Keyword> get methodParameter {
- List<Keyword> keywords = [Keyword.COVARIANT, Keyword.DYNAMIC];
+ var keywords = <Keyword>[Keyword.COVARIANT, Keyword.DYNAMIC];
if (isEnabled(ExperimentalFeatures.non_nullable)) {
keywords.add(Keyword.REQUIRED);
}
@@ -164,7 +164,7 @@
}
List<Keyword> get statementStartInClass {
- List<Keyword> keywords = [
+ var keywords = <Keyword>[
Keyword.ASSERT,
Keyword.CONST,
Keyword.DO,
@@ -189,7 +189,7 @@
}
List<Keyword> get statementStartInLoopInClass {
- List<Keyword> keywords = [
+ var keywords = <Keyword>[
Keyword.ASSERT,
Keyword.BREAK,
Keyword.CONST,
@@ -216,7 +216,7 @@
}
List<Keyword> get statementStartInLoopOutsideClass {
- List<Keyword> keywords = [
+ var keywords = <Keyword>[
Keyword.ASSERT,
Keyword.BREAK,
Keyword.CONST,
@@ -241,7 +241,7 @@
}
List<Keyword> get statementStartInSwitchCaseInClass {
- List<Keyword> keywords = [
+ var keywords = <Keyword>[
Keyword.ASSERT,
Keyword.BREAK,
Keyword.CONST,
@@ -267,7 +267,7 @@
}
List<Keyword> get statementStartInSwitchCaseOutsideClass {
- List<Keyword> keywords = [
+ var keywords = <Keyword>[
Keyword.ASSERT,
Keyword.BREAK,
Keyword.CONST,
@@ -291,7 +291,7 @@
}
List<Keyword> get statementStartInSwitchInClass {
- List<Keyword> keywords = [
+ var keywords = <Keyword>[
Keyword.ASSERT,
Keyword.BREAK,
Keyword.CASE,
@@ -319,7 +319,7 @@
}
List<Keyword> get statementStartInSwitchOutsideClass {
- List<Keyword> keywords = [
+ var keywords = <Keyword>[
Keyword.ASSERT,
Keyword.BREAK,
Keyword.CASE,
@@ -345,7 +345,7 @@
}
List<Keyword> get statementStartOutsideClass {
- List<Keyword> keywords = [
+ var keywords = <Keyword>[
Keyword.ASSERT,
Keyword.CONST,
Keyword.DO,
@@ -368,7 +368,7 @@
}
List<Keyword> get staticMember {
- List<Keyword> keywords = [Keyword.CONST, Keyword.COVARIANT, Keyword.FINAL];
+ var keywords = <Keyword>[Keyword.CONST, Keyword.COVARIANT, Keyword.FINAL];
if (isEnabled(ExperimentalFeatures.non_nullable)) {
keywords.add(Keyword.LATE);
}
@@ -378,11 +378,11 @@
void assertSuggestKeywords(Iterable<Keyword> expectedKeywords,
{List<String> pseudoKeywords = NO_PSEUDO_KEYWORDS,
int relevance = DART_RELEVANCE_KEYWORD}) {
- Set<String> expectedCompletions = <String>{};
- Map<String, int> expectedOffsets = <String, int>{};
- Set<String> actualCompletions = <String>{};
+ var expectedCompletions = <String>{};
+ var expectedOffsets = <String, int>{};
+ var actualCompletions = <String>{};
expectedCompletions.addAll(expectedKeywords.map((keyword) {
- String text = keyword.lexeme;
+ var text = keyword.lexeme;
if (['import', 'export', 'part'].contains(text)) {
return '$text \'\';';
} else if (text == 'default') {
@@ -392,9 +392,9 @@
}));
expectedCompletions.addAll(pseudoKeywords);
- for (CompletionSuggestion s in suggestions) {
+ for (var s in suggestions) {
if (s.kind == CompletionSuggestionKind.KEYWORD) {
- Keyword k = Keyword.keywords[s.completion];
+ var k = Keyword.keywords[s.completion];
if (k == null && !expectedCompletions.contains(s.completion)) {
fail('Invalid keyword suggested: ${s.completion}');
} else {
@@ -405,17 +405,17 @@
}
}
if (!_equalSets(expectedCompletions, actualCompletions)) {
- StringBuffer msg = StringBuffer();
+ var msg = StringBuffer();
msg.writeln('Expected:');
_appendCompletions(msg, expectedCompletions, actualCompletions);
msg.writeln('but found:');
_appendCompletions(msg, actualCompletions, expectedCompletions);
fail(msg.toString());
}
- for (CompletionSuggestion s in suggestions) {
+ for (var s in suggestions) {
if (s.kind == CompletionSuggestionKind.KEYWORD) {
if (s.completion.startsWith(Keyword.IMPORT.lexeme)) {
- int importRelevance = relevance;
+ var importRelevance = relevance;
expect(s.relevance, equals(importRelevance), reason: s.completion);
} else {
if (s.completion == Keyword.RETHROW.lexeme) {
@@ -424,7 +424,7 @@
expect(s.relevance, equals(relevance), reason: s.completion);
}
}
- int expectedOffset = expectedOffsets[s.completion];
+ var expectedOffset = expectedOffsets[s.completion];
expectedOffset ??= s.completion.length;
expect(
s.selectionOffset,
@@ -1319,7 +1319,7 @@
Future<void> test_if_afterThen_nextCloseCurlyBrace0() async {
addTestSource('main() { if (true) {} ^ }');
await computeSuggestions();
- List<Keyword> keywords = [];
+ var keywords = <Keyword>[];
keywords.addAll(statementStartOutsideClass);
keywords.add(Keyword.ELSE);
assertSuggestKeywords(keywords, relevance: DART_RELEVANCE_KEYWORD);
@@ -1328,7 +1328,7 @@
Future<void> test_if_afterThen_nextCloseCurlyBrace1() async {
addTestSource('main() { if (true) {} e^ }');
await computeSuggestions();
- List<Keyword> keywords = [];
+ var keywords = <Keyword>[];
keywords.addAll(statementStartOutsideClass);
keywords.add(Keyword.ELSE);
assertSuggestKeywords(keywords, relevance: DART_RELEVANCE_KEYWORD);
@@ -1337,7 +1337,7 @@
Future<void> test_if_afterThen_nextStatement0() async {
addTestSource('main() { if (true) {} ^ print(0); }');
await computeSuggestions();
- List<Keyword> keywords = [];
+ var keywords = <Keyword>[];
keywords.addAll(statementStartOutsideClass);
keywords.add(Keyword.ELSE);
assertSuggestKeywords(keywords, relevance: DART_RELEVANCE_KEYWORD);
@@ -2219,7 +2219,7 @@
void _appendCompletions(
StringBuffer msg, Iterable<String> completions, Iterable<String> other) {
- List<String> sorted = completions.toList();
+ var sorted = completions.toList();
sorted.sort((c1, c2) => c1.compareTo(c2));
sorted.forEach(
(c) => msg.writeln(' $c, ${other.contains(c) ? '' : '<<<<<<<<<<<'}'));
diff --git a/pkg/analysis_server/test/services/completion/dart/label_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/label_contributor_test.dart
index e6a7f5b..7d420a4 100644
--- a/pkg/analysis_server/test/services/completion/dart/label_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/label_contributor_test.dart
@@ -21,10 +21,9 @@
CompletionSuggestion assertSuggestLabel(String name,
{int relevance = DART_RELEVANCE_DEFAULT,
CompletionSuggestionKind kind = CompletionSuggestionKind.IDENTIFIER}) {
- CompletionSuggestion cs =
- assertSuggest(name, csKind: kind, relevance: relevance);
+ var cs = assertSuggest(name, csKind: kind, relevance: relevance);
expect(cs.returnType, isNull);
- Element element = cs.element;
+ var element = cs.element;
expect(element, isNotNull);
expect(element.flags, 0);
expect(element.kind, equals(ElementKind.LABEL));
diff --git a/pkg/analysis_server/test/services/completion/dart/library_prefix_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/library_prefix_contributor_test.dart
index 1891fbf..7d13c2d 100644
--- a/pkg/analysis_server/test/services/completion/dart/library_prefix_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/library_prefix_contributor_test.dart
@@ -19,11 +19,11 @@
@reflectiveTest
class LibraryPrefixContributorTest extends DartCompletionContributorTest {
void assertSuggestLibraryPrefixes(List<String> expectedPrefixes) {
- for (String prefix in expectedPrefixes) {
- CompletionSuggestion cs = assertSuggest(prefix,
+ for (var prefix in expectedPrefixes) {
+ var cs = assertSuggest(prefix,
csKind: CompletionSuggestionKind.IDENTIFIER,
relevance: DART_RELEVANCE_DEFAULT);
- Element element = cs.element;
+ var element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(ElementKind.LIBRARY));
expect(element.parameters, isNull);
diff --git a/pkg/analysis_server/test/services/completion/dart/local_constructor_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/local_constructor_contributor_test.dart
index 725ea5c..b54d6d8 100644
--- a/pkg/analysis_server/test/services/completion/dart/local_constructor_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/local_constructor_contributor_test.dart
@@ -22,10 +22,10 @@
String name, String returnType,
{int relevance = DART_RELEVANCE_LOCAL_VARIABLE}) {
// Local variables should only be suggested by LocalReferenceContributor
- CompletionSuggestion cs = assertSuggest(name,
+ var cs = assertSuggest(name,
csKind: CompletionSuggestionKind.INVOCATION, relevance: relevance);
expect(cs.returnType, returnType ?? 'dynamic');
- Element element = cs.element;
+ var element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(ElementKind.LOCAL_VARIABLE));
expect(element.name, equals(name));
@@ -37,10 +37,10 @@
CompletionSuggestion assertSuggestParameter(String name, String returnType,
{int relevance = DART_RELEVANCE_PARAMETER}) {
- CompletionSuggestion cs = assertSuggest(name,
+ var cs = assertSuggest(name,
csKind: CompletionSuggestionKind.INVOCATION, relevance: relevance);
expect(cs.returnType, returnType ?? 'dynamic');
- Element element = cs.element;
+ var element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(ElementKind.PARAMETER));
expect(element.name, equals(name));
diff --git a/pkg/analysis_server/test/services/completion/dart/local_reference_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/local_reference_contributor_test.dart
index f54ca0f..8bf8c19 100644
--- a/pkg/analysis_server/test/services/completion/dart/local_reference_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/local_reference_contributor_test.dart
@@ -31,10 +31,10 @@
relevance += DART_RELEVANCE_BOOST_SUBTYPE;
}
// Local variables should only be suggested by LocalReferenceContributor
- CompletionSuggestion cs = assertSuggest(name,
+ var cs = assertSuggest(name,
csKind: CompletionSuggestionKind.INVOCATION, relevance: relevance);
expect(cs.returnType, returnType ?? 'dynamic');
- Element element = cs.element;
+ var element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(ElementKind.LOCAL_VARIABLE));
expect(element.name, equals(name));
@@ -46,10 +46,10 @@
CompletionSuggestion assertSuggestParameter(String name, String returnType,
{int relevance = DART_RELEVANCE_PARAMETER}) {
- CompletionSuggestion cs = assertSuggest(name,
+ var cs = assertSuggest(name,
csKind: CompletionSuggestionKind.INVOCATION, relevance: relevance);
expect(cs.returnType, returnType ?? 'dynamic');
- Element element = cs.element;
+ var element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(ElementKind.PARAMETER));
expect(element.name, equals(name));
@@ -60,10 +60,10 @@
CompletionSuggestion assertSuggestTypeParameter(String name,
{int relevance = DART_RELEVANCE_TYPE_PARAMETER}) {
- CompletionSuggestion cs = assertSuggest(name,
+ var cs = assertSuggest(name,
csKind: CompletionSuggestionKind.IDENTIFIER, relevance: relevance);
expect(cs.returnType, isNull);
- Element element = cs.element;
+ var element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(ElementKind.TYPE_PARAMETER));
expect(element.name, equals(name));
@@ -1590,13 +1590,13 @@
expect(replacementOffset, completionOffset);
expect(replacementLength, 0);
- CompletionSuggestion suggestionA = assertSuggestClass('A',
+ var suggestionA = assertSuggestClass('A',
relevance: DART_RELEVANCE_LOW, isDeprecated: true);
if (suggestionA != null) {
expect(suggestionA.element.isDeprecated, isTrue);
expect(suggestionA.element.isPrivate, isFalse);
}
- CompletionSuggestion suggestionB = assertSuggestClass('_B');
+ var suggestionB = assertSuggestClass('_B');
if (suggestionB != null) {
expect(suggestionB.element.isDeprecated, isFalse);
expect(suggestionB.element.isPrivate, isTrue);
@@ -2107,7 +2107,7 @@
}
Future<void> test_doc_classMember() async {
- String docLines = r'''
+ var docLines = r'''
/// My documentation.
/// Short description.
///
@@ -2134,25 +2134,24 @@
}''');
await computeSuggestions();
{
- CompletionSuggestion suggestion = assertSuggestField('myField', 'int',
+ var suggestion = assertSuggestField('myField', 'int',
relevance: DART_RELEVANCE_LOCAL_FIELD);
assertDoc(suggestion);
}
{
- CompletionSuggestion suggestion = assertSuggestMethod(
- 'myMethod', 'C', null,
+ var suggestion = assertSuggestMethod('myMethod', 'C', null,
relevance: DART_RELEVANCE_LOCAL_METHOD);
assertDoc(suggestion);
}
{
- CompletionSuggestion suggestion = assertSuggestGetter('myGetter', 'int',
+ var suggestion = assertSuggestGetter('myGetter', 'int',
relevance: DART_RELEVANCE_LOCAL_ACCESSOR);
assertDoc(suggestion);
}
}
Future<void> test_doc_topLevel() async {
- String docLines = r'''
+ var docLines = r'''
/// My documentation.
/// Short description.
///
@@ -2184,27 +2183,24 @@
''');
await computeSuggestions();
{
- CompletionSuggestion suggestion = assertSuggestClass('MyClass');
+ var suggestion = assertSuggestClass('MyClass');
assertDoc(suggestion);
}
{
- CompletionSuggestion suggestion =
- assertSuggestClassTypeAlias('MyClassTypeAlias');
+ var suggestion = assertSuggestClassTypeAlias('MyClassTypeAlias');
assertDoc(suggestion);
}
{
- CompletionSuggestion suggestion = assertSuggestEnum('MyEnum');
+ var suggestion = assertSuggestEnum('MyEnum');
assertDoc(suggestion);
}
{
- CompletionSuggestion suggestion = assertSuggestFunction(
- 'myFunction', 'void',
+ var suggestion = assertSuggestFunction('myFunction', 'void',
relevance: DART_RELEVANCE_LOCAL_FUNCTION);
assertDoc(suggestion);
}
{
- CompletionSuggestion suggestion = assertSuggestTopLevelVar(
- 'myVariable', 'int',
+ var suggestion = assertSuggestTopLevelVar('myVariable', 'int',
relevance: DART_RELEVANCE_LOCAL_TOP_LEVEL_VARIABLE);
assertDoc(suggestion);
}
@@ -2770,7 +2766,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestFunction('m', 'void',
+ var suggestion = assertSuggestFunction('m', 'void',
relevance: DART_RELEVANCE_LOCAL_FUNCTION);
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
@@ -2789,7 +2785,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestFunction('m', 'void',
+ var suggestion = assertSuggestFunction('m', 'void',
relevance: DART_RELEVANCE_LOCAL_FUNCTION);
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
@@ -2808,7 +2804,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestFunction('m', 'void',
+ var suggestion = assertSuggestFunction('m', 'void',
relevance: DART_RELEVANCE_LOCAL_FUNCTION);
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
@@ -2827,7 +2823,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestFunction('m', 'void',
+ var suggestion = assertSuggestFunction('m', 'void',
relevance: DART_RELEVANCE_LOCAL_FUNCTION);
expect(suggestion.parameterNames, isEmpty);
expect(suggestion.parameterTypes, isEmpty);
@@ -2843,7 +2839,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestFunction('m', 'void',
+ var suggestion = assertSuggestFunction('m', 'void',
relevance: DART_RELEVANCE_LOCAL_FUNCTION);
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
@@ -2862,7 +2858,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestFunction('m', 'void',
+ var suggestion = assertSuggestFunction('m', 'void',
relevance: DART_RELEVANCE_LOCAL_FUNCTION);
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
@@ -3695,19 +3691,19 @@
expect(replacementOffset, completionOffset);
expect(replacementLength, 0);
- CompletionSuggestion methodA = assertSuggestMethod('a', 'A', 'Z',
+ var methodA = assertSuggestMethod('a', 'A', 'Z',
relevance: DART_RELEVANCE_LOCAL_METHOD);
if (methodA != null) {
expect(methodA.element.isDeprecated, isFalse);
expect(methodA.element.isPrivate, isFalse);
}
- CompletionSuggestion getterF = assertSuggestGetter('f', 'X',
+ var getterF = assertSuggestGetter('f', 'X',
relevance: DART_RELEVANCE_LOW, isDeprecated: true);
if (getterF != null) {
expect(getterF.element.isDeprecated, isTrue);
expect(getterF.element.isPrivate, isFalse);
}
- CompletionSuggestion getterG =
+ var getterG =
assertSuggestGetter('_g', null, relevance: DART_RELEVANCE_DEFAULT);
if (getterG != null) {
expect(getterG.element.isDeprecated, isFalse);
@@ -3760,13 +3756,13 @@
expect(replacementOffset, completionOffset);
expect(replacementLength, 0);
- CompletionSuggestion methodA =
+ var methodA =
assertSuggestMethod('_a', 'A', 'Z', relevance: DART_RELEVANCE_DEFAULT);
if (methodA != null) {
expect(methodA.element.isDeprecated, isFalse);
expect(methodA.element.isPrivate, isTrue);
}
- CompletionSuggestion getterF = assertSuggestField('f', 'X',
+ var getterF = assertSuggestField('f', 'X',
relevance: DART_RELEVANCE_LOW, isDeprecated: true);
if (getterF != null) {
expect(getterF.element.isDeprecated, isTrue);
@@ -3774,7 +3770,7 @@
expect(getterF.element.parameters, isNull);
}
// If user did not type '_' then relevance of private members is not raised
- CompletionSuggestion getterG =
+ var getterG =
assertSuggestField('_g', null, relevance: DART_RELEVANCE_DEFAULT);
if (getterG != null) {
expect(getterG.element.isDeprecated, isFalse);
@@ -3791,13 +3787,13 @@
expect(replacementOffset, completionOffset - 1);
expect(replacementLength, 1);
- CompletionSuggestion methodA = assertSuggestMethod('_a', 'A', 'Z',
+ var methodA = assertSuggestMethod('_a', 'A', 'Z',
relevance: DART_RELEVANCE_LOCAL_METHOD);
if (methodA != null) {
expect(methodA.element.isDeprecated, isFalse);
expect(methodA.element.isPrivate, isTrue);
}
- CompletionSuggestion getterF = assertSuggestField('f', 'X',
+ var getterF = assertSuggestField('f', 'X',
relevance: DART_RELEVANCE_LOW, isDeprecated: true);
if (getterF != null) {
expect(getterF.element.isDeprecated, isTrue);
@@ -3806,7 +3802,7 @@
}
// If user prefixed completion with '_' then suggestion of private members
// should be the same as public members
- CompletionSuggestion getterG =
+ var getterG =
assertSuggestField('_g', null, relevance: DART_RELEVANCE_LOCAL_FIELD);
if (getterG != null) {
expect(getterG.element.isDeprecated, isFalse);
@@ -3823,7 +3819,7 @@
expect(replacementOffset, completionOffset);
expect(replacementLength, 0);
- CompletionSuggestion methodA = assertSuggestMethod('a', 'A', 'Z',
+ var methodA = assertSuggestMethod('a', 'A', 'Z',
relevance: DART_RELEVANCE_LOW, isDeprecated: true);
if (methodA != null) {
expect(methodA.element.isDeprecated, isTrue);
@@ -4035,12 +4031,12 @@
expect(replacementOffset, completionOffset);
expect(replacementLength, 0);
- CompletionSuggestion suggestionM = assertSuggestMixin('M');
+ var suggestionM = assertSuggestMixin('M');
if (suggestionM != null) {
expect(suggestionM.element.isDeprecated, isFalse);
expect(suggestionM.element.isPrivate, isFalse);
}
- CompletionSuggestion suggestionB = assertSuggestClass('_B');
+ var suggestionB = assertSuggestClass('_B');
if (suggestionB != null) {
expect(suggestionB.element.isDeprecated, isFalse);
expect(suggestionB.element.isPrivate, isTrue);
@@ -5091,7 +5087,7 @@
expect(replacementOffset, completionOffset);
expect(replacementLength, 0);
- CompletionSuggestion suggestionB = assertSuggestClass('_B');
+ var suggestionB = assertSuggestClass('_B');
if (suggestionB != null) {
expect(suggestionB.element.isDeprecated, isFalse);
expect(suggestionB.element.isPrivate, isTrue);
diff --git a/pkg/analysis_server/test/services/completion/dart/named_constructor_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/named_constructor_contributor_test.dart
index 4c0b1c5..b014fe0 100644
--- a/pkg/analysis_server/test/services/completion/dart/named_constructor_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/named_constructor_contributor_test.dart
@@ -22,13 +22,12 @@
String name, String returnType,
[int relevance = DART_RELEVANCE_DEFAULT,
CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION]) {
- CompletionSuggestion cs =
- assertSuggest(name, csKind: kind, relevance: relevance);
- Element element = cs.element;
+ var cs = assertSuggest(name, csKind: kind, relevance: relevance);
+ var element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(ElementKind.CONSTRUCTOR));
expect(element.name, equals(name));
- String param = element.parameters;
+ var param = element.parameters;
expect(param, isNotNull);
expect(param[0], equals('('));
expect(param[param.length - 1], equals(')'));
diff --git a/pkg/analysis_server/test/services/completion/dart/override_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/override_contributor_test.dart
index a43e2ea..ff816cc 100644
--- a/pkg/analysis_server/test/services/completion/dart/override_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/override_contributor_test.dart
@@ -413,7 +413,7 @@
CompletionSuggestion _assertOverride(String completion,
{String displayText, int selectionOffset, int selectionLength}) {
- CompletionSuggestion cs = getSuggest(
+ var cs = getSuggest(
completion: completion,
csKind: CompletionSuggestionKind.OVERRIDE,
elemKind: null);
diff --git a/pkg/analysis_server/test/services/completion/dart/relevance/completion_relevance.dart b/pkg/analysis_server/test/services/completion/dart/relevance/completion_relevance.dart
index 052307d..15e904c 100644
--- a/pkg/analysis_server/test/services/completion/dart/relevance/completion_relevance.dart
+++ b/pkg/analysis_server/test/services/completion/dart/relevance/completion_relevance.dart
@@ -26,7 +26,7 @@
expect(length, greaterThan(1),
reason: 'Test must specify more than one suggestion');
var previous = suggestions[0];
- for (int i = 1; i < length; i++) {
+ for (var i = 1; i < length; i++) {
var current = suggestions[i];
expect(current.relevance, lessThan(previous.relevance));
previous = current;
diff --git a/pkg/analysis_server/test/services/completion/dart/relevance/instance_member_relevance_test.dart b/pkg/analysis_server/test/services/completion/dart/relevance/instance_member_relevance_test.dart
index 9558d8d..a456ad4 100644
--- a/pkg/analysis_server/test/services/completion/dart/relevance/instance_member_relevance_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/relevance/instance_member_relevance_test.dart
@@ -31,7 +31,7 @@
expect(length, greaterThan(1),
reason: 'Test must specify more than one suggestion');
var previous = suggestions[0];
- for (int i = 1; i < length; i++) {
+ for (var i = 1; i < length; i++) {
var current = suggestions[i];
expect(current.relevance, lessThan(previous.relevance));
previous = current;
diff --git a/pkg/analysis_server/test/services/completion/dart/type_member_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/type_member_contributor_test.dart
index 7dd7a0d..f5c8488 100644
--- a/pkg/analysis_server/test/services/completion/dart/type_member_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/type_member_contributor_test.dart
@@ -42,7 +42,7 @@
}
''');
await computeSuggestions();
- List<CompletionSuggestion> suggestionsForX = suggestions
+ var suggestionsForX = suggestions
.where((CompletionSuggestion s) => s.completion == 'x')
.toList();
expect(suggestionsForX, hasLength(1));
@@ -2064,7 +2064,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'C', 'int');
+ var suggestion = assertSuggestMethod('m', 'C', 'int');
expect(suggestion.parameterTypes[0], 'int');
expect(suggestion.element.returnType, 'int');
expect(suggestion.element.parameters, '(int t)');
@@ -2083,7 +2083,7 @@
// TODO(paulberry): modify assertSuggestSetter so that we can pass 'int'
// as a parmeter to it, and it will check the appropriate field in
// the suggestion object.
- CompletionSuggestion suggestion = assertSuggestSetter('t');
+ var suggestion = assertSuggestSetter('t');
expect(suggestion.element.parameters, '(int value)');
}
@@ -2727,7 +2727,7 @@
}
void main() {new C().^}''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'C', 'void');
+ var suggestion = assertSuggestMethod('m', 'C', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -2744,7 +2744,7 @@
}
void main() {new C().^}''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'C', 'void');
+ var suggestion = assertSuggestMethod('m', 'C', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -2761,7 +2761,7 @@
}
void main() {new C().^}''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'C', 'void');
+ var suggestion = assertSuggestMethod('m', 'C', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -2778,7 +2778,7 @@
}
void main() {new C().^}''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'C', 'void');
+ var suggestion = assertSuggestMethod('m', 'C', 'void');
expect(suggestion.parameterNames, isEmpty);
expect(suggestion.parameterTypes, isEmpty);
expect(suggestion.requiredParameterCount, 0);
@@ -2792,7 +2792,7 @@
}
void main() {new C().^}''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'C', 'void');
+ var suggestion = assertSuggestMethod('m', 'C', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -2809,7 +2809,7 @@
}
void main() {new C().^}''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'C', 'void');
+ var suggestion = assertSuggestMethod('m', 'C', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -3101,7 +3101,7 @@
}
void main() {new C().^}''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestField('x', 'int');
+ var suggestion = assertSuggestField('x', 'int');
assertHasNoParameterInfo(suggestion);
}
@@ -3112,7 +3112,7 @@
}
void main() {int y = new C().^}''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestGetter('x', 'int');
+ var suggestion = assertSuggestGetter('x', 'int');
assertHasNoParameterInfo(suggestion);
}
@@ -3123,7 +3123,7 @@
}
void main() {int y = new C().^}''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestSetter('x');
+ var suggestion = assertSuggestSetter('x');
assertHasNoParameterInfo(suggestion);
}
diff --git a/pkg/analysis_server/test/services/completion/postfix/postfix_completion_test.dart b/pkg/analysis_server/test/services/completion/postfix/postfix_completion_test.dart
index 22a6854..ec15e1d 100644
--- a/pkg/analysis_server/test/services/completion/postfix/postfix_completion_test.dart
+++ b/pkg/analysis_server/test/services/completion/postfix/postfix_completion_test.dart
@@ -33,7 +33,7 @@
void _assertHasChange(String message, String expectedCode, [Function cmp]) {
if (change.message == message) {
if (change.edits.isNotEmpty) {
- String resultCode =
+ var resultCode =
SourceEdit.applySequence(testCode, change.edits[0].edits);
expect(resultCode, expectedCode.replaceAll('/*caret*/', ''));
if (cmp != null) {
@@ -54,26 +54,26 @@
Future<void> _assertNotApplicable(String key, String code) async {
await _prepareProcessor(key, code);
- bool isApplicable = await processor.isApplicable();
+ var isApplicable = await processor.isApplicable();
expect(isApplicable, isFalse);
}
Future<void> _prepareCompletion(String key, String code) async {
await _prepareProcessor(key, code);
- bool isApplicable = await processor.isApplicable();
+ var isApplicable = await processor.isApplicable();
if (!isApplicable) {
fail('Postfix completion not applicable at given location');
}
if (isApplicable) {
- PostfixCompletion completion = await processor.compute();
+ var completion = await processor.compute();
change = completion.change;
}
}
Future<void> _prepareProcessor(String key, String code) async {
- int offset = code.indexOf(key);
+ var offset = code.indexOf(key);
code = code.replaceFirst(key, '', offset);
verifyNoTestUnitErrors = false;
diff --git a/pkg/analysis_server/test/services/completion/statement/statement_completion_test.dart b/pkg/analysis_server/test/services/completion/statement/statement_completion_test.dart
index 3e3836c..11cbc6b 100644
--- a/pkg/analysis_server/test/services/completion/statement/statement_completion_test.dart
+++ b/pkg/analysis_server/test/services/completion/statement/statement_completion_test.dart
@@ -4,7 +4,6 @@
import 'package:analysis_server/src/protocol_server.dart';
import 'package:analysis_server/src/services/completion/statement/statement_completion.dart';
-import 'package:analyzer/dart/analysis/results.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -42,17 +41,17 @@
]) {
if (change.message == message) {
if (change.edits.isNotEmpty) {
- String resultCode =
+ var resultCode =
SourceEdit.applySequence(testCode, change.edits[0].edits);
expect(resultCode, expectedCode.replaceAll('////', ''));
if (cmp != null) {
- int offset = cmp(resultCode);
+ var offset = cmp(resultCode);
expect(change.selection.offset, offset);
}
} else {
expect(testCode, expectedCode.replaceAll('////', ''));
if (cmp != null) {
- int offset = cmp(testCode);
+ var offset = cmp(testCode);
expect(change.selection.offset, offset);
}
}
@@ -63,18 +62,17 @@
Future<void> _computeCompletion(int offset) async {
driver.changeFile(testFile);
- ResolvedUnitResult result = await session.getResolvedUnit(testFile);
+ var result = await session.getResolvedUnit(testFile);
var context = StatementCompletionContext(result, offset);
- StatementCompletionProcessor processor =
- StatementCompletionProcessor(context);
- StatementCompletion completion = await processor.compute();
+ var processor = StatementCompletionProcessor(context);
+ var completion = await processor.compute();
change = completion.change;
}
Future<void> _prepareCompletion(String search, String sourceCode,
{bool atEnd = false, int delta = 0}) async {
testCode = sourceCode.replaceAll('////', '');
- int offset = findOffset(search);
+ var offset = findOffset(search);
if (atEnd) {
delta = search.length;
}
@@ -1413,12 +1411,12 @@
// Fixing this properly means modifying the scanner not to generate
// closing ')', then updating the parser to handle that situation.
// This is a fair amount of work and won't be tackled today.
- String before = '''
+ var before = '''
main() {
var s = 'sample'.substring(3;
}
''';
- String after = '''
+ var after = '''
main() {
var s = 'sample'.substring(3);
////
diff --git a/pkg/analysis_server/test/services/correction/change_test.dart b/pkg/analysis_server/test/services/correction/change_test.dart
index 75d9adf..ea70891 100644
--- a/pkg/analysis_server/test/services/correction/change_test.dart
+++ b/pkg/analysis_server/test/services/correction/change_test.dart
@@ -23,35 +23,35 @@
@reflectiveTest
class ChangeTest {
void test_addEdit() {
- SourceChange change = SourceChange('msg');
- SourceEdit edit1 = SourceEdit(1, 2, 'a');
- SourceEdit edit2 = SourceEdit(1, 2, 'b');
+ var change = SourceChange('msg');
+ var edit1 = SourceEdit(1, 2, 'a');
+ var edit2 = SourceEdit(1, 2, 'b');
expect(change.edits, hasLength(0));
change.addEdit('/a.dart', 0, edit1);
expect(change.edits, hasLength(1));
change.addEdit('/a.dart', 0, edit2);
expect(change.edits, hasLength(1));
{
- SourceFileEdit fileEdit = change.getFileEdit('/a.dart');
+ var fileEdit = change.getFileEdit('/a.dart');
expect(fileEdit, isNotNull);
expect(fileEdit.edits, unorderedEquals([edit1, edit2]));
}
}
void test_getFileEdit() {
- SourceChange change = SourceChange('msg');
- SourceFileEdit fileEdit = SourceFileEdit('/a.dart', 0);
+ var change = SourceChange('msg');
+ var fileEdit = SourceFileEdit('/a.dart', 0);
change.addFileEdit(fileEdit);
expect(change.getFileEdit('/a.dart'), fileEdit);
}
void test_getFileEdit_empty() {
- SourceChange change = SourceChange('msg');
+ var change = SourceChange('msg');
expect(change.getFileEdit('/some.dart'), isNull);
}
void test_toJson() {
- SourceChange change = SourceChange('msg');
+ var change = SourceChange('msg');
change.addFileEdit(SourceFileEdit('/a.dart', 1)
..add(SourceEdit(1, 2, 'aaa'))
..add(SourceEdit(10, 20, 'bbb')));
@@ -124,22 +124,22 @@
@reflectiveTest
class EditTest {
void test_applySequence() {
- SourceEdit edit1 = SourceEdit(5, 2, 'abc');
- SourceEdit edit2 = SourceEdit(1, 0, '!');
+ var edit1 = SourceEdit(5, 2, 'abc');
+ var edit2 = SourceEdit(1, 0, '!');
expect(
SourceEdit.applySequence('0123456789', [edit1, edit2]), '0!1234abc789');
}
void test_editFromRange() {
- SourceRange range = SourceRange(1, 2);
- SourceEdit edit = newSourceEdit_range(range, 'foo');
+ var range = SourceRange(1, 2);
+ var edit = newSourceEdit_range(range, 'foo');
expect(edit.offset, 1);
expect(edit.length, 2);
expect(edit.replacement, 'foo');
}
void test_eqEq() {
- SourceEdit a = SourceEdit(1, 2, 'aaa');
+ var a = SourceEdit(1, 2, 'aaa');
expect(a == a, isTrue);
expect(a == SourceEdit(1, 2, 'aaa'), isTrue);
// ignore: unrelated_type_equality_checks
@@ -149,7 +149,7 @@
}
void test_new() {
- SourceEdit edit = SourceEdit(1, 2, 'foo', id: 'my-id');
+ var edit = SourceEdit(1, 2, 'foo', id: 'my-id');
expect(edit.offset, 1);
expect(edit.length, 2);
expect(edit.replacement, 'foo');
@@ -158,7 +158,7 @@
}
void test_toJson() {
- SourceEdit edit = SourceEdit(1, 2, 'foo');
+ var edit = SourceEdit(1, 2, 'foo');
var expectedJson = {OFFSET: 1, LENGTH: 2, REPLACEMENT: 'foo'};
expect(edit.toJson(), expectedJson);
}
@@ -167,11 +167,11 @@
@reflectiveTest
class FileEditTest {
void test_add_sorts() {
- SourceEdit edit1a = SourceEdit(1, 0, 'a1');
- SourceEdit edit1b = SourceEdit(1, 0, 'a2');
- SourceEdit edit10 = SourceEdit(10, 1, 'b');
- SourceEdit edit100 = SourceEdit(100, 2, 'c');
- SourceFileEdit fileEdit = SourceFileEdit('/test.dart', 0);
+ var edit1a = SourceEdit(1, 0, 'a1');
+ var edit1b = SourceEdit(1, 0, 'a2');
+ var edit10 = SourceEdit(10, 1, 'b');
+ var edit100 = SourceEdit(100, 2, 'c');
+ var fileEdit = SourceFileEdit('/test.dart', 0);
fileEdit.add(edit100);
fileEdit.add(edit1a);
fileEdit.add(edit1b);
@@ -180,17 +180,17 @@
}
void test_addAll() {
- SourceEdit edit1a = SourceEdit(1, 0, 'a1');
- SourceEdit edit1b = SourceEdit(1, 0, 'a2');
- SourceEdit edit10 = SourceEdit(10, 1, 'b');
- SourceEdit edit100 = SourceEdit(100, 2, 'c');
- SourceFileEdit fileEdit = SourceFileEdit('/test.dart', 0);
+ var edit1a = SourceEdit(1, 0, 'a1');
+ var edit1b = SourceEdit(1, 0, 'a2');
+ var edit10 = SourceEdit(10, 1, 'b');
+ var edit100 = SourceEdit(100, 2, 'c');
+ var fileEdit = SourceFileEdit('/test.dart', 0);
fileEdit.addAll([edit100, edit1a, edit10, edit1b]);
expect(fileEdit.edits, [edit100, edit10, edit1b, edit1a]);
}
void test_new() {
- SourceFileEdit fileEdit = SourceFileEdit('/test.dart', 100);
+ var fileEdit = SourceFileEdit('/test.dart', 100);
fileEdit.add(SourceEdit(1, 2, 'aaa'));
fileEdit.add(SourceEdit(10, 20, 'bbb'));
expect(
@@ -201,7 +201,7 @@
}
void test_toJson() {
- SourceFileEdit fileEdit = SourceFileEdit('/test.dart', 100);
+ var fileEdit = SourceFileEdit('/test.dart', 100);
fileEdit.add(SourceEdit(1, 2, 'aaa'));
fileEdit.add(SourceEdit(10, 20, 'bbb'));
var expectedJson = {
@@ -219,7 +219,7 @@
@reflectiveTest
class LinkedEditGroupTest {
void test_new() {
- LinkedEditGroup group = LinkedEditGroup.empty();
+ var group = LinkedEditGroup.empty();
group.addPosition(Position('/a.dart', 1), 2);
group.addPosition(Position('/b.dart', 10), 2);
expect(
@@ -230,7 +230,7 @@
}
void test_toJson() {
- LinkedEditGroup group = LinkedEditGroup.empty();
+ var group = LinkedEditGroup.empty();
group.addPosition(Position('/a.dart', 1), 2);
group.addPosition(Position('/b.dart', 10), 2);
group.addSuggestion(
@@ -270,9 +270,9 @@
@reflectiveTest
class PositionTest {
void test_eqEq() {
- Position a = Position('/a.dart', 1);
- Position a2 = Position('/a.dart', 1);
- Position b = Position('/b.dart', 1);
+ var a = Position('/a.dart', 1);
+ var a2 = Position('/a.dart', 1);
+ var b = Position('/b.dart', 1);
expect(a == a, isTrue);
expect(a == a2, isTrue);
expect(a == b, isFalse);
@@ -281,19 +281,19 @@
}
void test_hashCode() {
- Position position = Position('/test.dart', 1);
+ var position = Position('/test.dart', 1);
position.hashCode;
}
void test_new() {
- Position position = Position('/test.dart', 1);
+ var position = Position('/test.dart', 1);
expect(position.file, '/test.dart');
expect(position.offset, 1);
expect(position.toString(), '{"file":"/test.dart","offset":1}');
}
void test_toJson() {
- Position position = Position('/test.dart', 1);
+ var position = Position('/test.dart', 1);
var expectedJson = {FILE: '/test.dart', OFFSET: 1};
expect(position.toJson(), expectedJson);
}
diff --git a/pkg/analysis_server/test/services/correction/name_suggestion_test.dart b/pkg/analysis_server/test/services/correction/name_suggestion_test.dart
index 747aa1a..c758f82 100644
--- a/pkg/analysis_server/test/services/correction/name_suggestion_test.dart
+++ b/pkg/analysis_server/test/services/correction/name_suggestion_test.dart
@@ -4,7 +4,6 @@
import 'package:analysis_server/src/services/correction/name_suggestion.dart';
import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/element/type.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -38,11 +37,11 @@
TreeNode node = null;
}
''');
- Set<String> excluded = <String>{};
- DartType expectedType = findLocalVariable('node').type;
+ var excluded = <String>{};
+ var expectedType = findLocalVariable('node').type;
Expression assignedExpression =
findNodeAtString('null;', (node) => node is NullLiteral);
- List<String> suggestions = getVariableNameSuggestionsForExpression(
+ var suggestions = getVariableNameSuggestionsForExpression(
expectedType, assignedExpression, excluded);
expect(suggestions, unorderedEquals(['treeNode', 'node']));
}
@@ -53,7 +52,7 @@
double res = 0.0;
}
''');
- DartType expectedType = findLocalVariable('res').type;
+ var expectedType = findLocalVariable('res').type;
Expression assignedExpression = findNodeAtString('0.0;');
// first choice for "double" is "d"
expect(
@@ -73,7 +72,7 @@
int res = 0;
}
''');
- DartType expectedType = findLocalVariable('res').type;
+ var expectedType = findLocalVariable('res').type;
Expression assignedExpression = findNodeAtString('0;');
// first choice for "int" is "i"
expect(
@@ -93,7 +92,7 @@
String res = 'abc';
}
''');
- DartType expectedType = findLocalVariable('res').type;
+ var expectedType = findLocalVariable('res').type;
Expression assignedExpression = findNodeAtString("'abc';");
// first choice for "String" is "s"
expect(
@@ -352,15 +351,15 @@
void test_forText() {
{
- Set<String> excluded = <String>{};
- List<String> suggestions =
+ var excluded = <String>{};
+ var suggestions =
getVariableNameSuggestionsForText('Goodbye, cruel world!', excluded);
expect(suggestions,
unorderedEquals(['goodbyeCruelWorld', 'cruelWorld', 'world']));
}
{
- Set<String> excluded = <String>{'world'};
- List<String> suggestions =
+ var excluded = <String>{'world'};
+ var suggestions =
getVariableNameSuggestionsForText('Goodbye, cruel world!', excluded);
expect(suggestions,
unorderedEquals(['goodbyeCruelWorld', 'cruelWorld', 'world2']));
diff --git a/pkg/analysis_server/test/services/correction/organize_directives_test.dart b/pkg/analysis_server/test/services/correction/organize_directives_test.dart
index 9842672..c1dd563 100644
--- a/pkg/analysis_server/test/services/correction/organize_directives_test.dart
+++ b/pkg/analysis_server/test/services/correction/organize_directives_test.dart
@@ -5,7 +5,6 @@
import 'dart:async';
import 'package:analysis_server/src/services/correction/organize_directives.dart';
-import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/error/error.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart'
hide AnalysisError;
@@ -182,7 +181,7 @@
Future<void> test_remove_unusedImports_hasUnresolvedError() async {
Future<void> check(String declaration) async {
- String code = '''
+ var code = '''
import 'dart:async';
$declaration
''';
@@ -316,18 +315,16 @@
}
void _assertOrganize(String expectedCode, {bool removeUnused = false}) {
- DirectiveOrganizer organizer = DirectiveOrganizer(
- testCode, testUnit, testErrors,
+ var organizer = DirectiveOrganizer(testCode, testUnit, testErrors,
removeUnused: removeUnused);
- List<SourceEdit> edits = organizer.organize();
- String result = SourceEdit.applySequence(testCode, edits);
+ var edits = organizer.organize();
+ var result = SourceEdit.applySequence(testCode, edits);
expect(result, expectedCode);
}
Future<void> _computeUnitAndErrors(String code) async {
addTestSource(code);
- ResolvedUnitResult result =
- await session.getResolvedUnit(testSource.fullName);
+ var result = await session.getResolvedUnit(testSource.fullName);
testUnit = result.unit;
testErrors = result.errors;
}
diff --git a/pkg/analysis_server/test/services/correction/sort_members_test.dart b/pkg/analysis_server/test/services/correction/sort_members_test.dart
index 366d875..81b2afb 100644
--- a/pkg/analysis_server/test/services/correction/sort_members_test.dart
+++ b/pkg/analysis_server/test/services/correction/sort_members_test.dart
@@ -5,7 +5,6 @@
import 'dart:async';
import 'package:analysis_server/src/services/correction/sort_members.dart';
-import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -877,15 +876,15 @@
}
void _assertSort(String expectedCode) {
- MemberSorter sorter = MemberSorter(testCode, testUnit);
- List<SourceEdit> edits = sorter.sort();
- String result = SourceEdit.applySequence(testCode, edits);
+ var sorter = MemberSorter(testCode, testUnit);
+ var edits = sorter.sort();
+ var result = SourceEdit.applySequence(testCode, edits);
expect(result, expectedCode);
}
Future<void> _parseTestUnit(String code) async {
addTestSource(code);
- ParsedUnitResult result = session.getParsedUnit(testSource.fullName);
+ var result = session.getParsedUnit(testSource.fullName);
testUnit = result.unit;
}
}
diff --git a/pkg/analysis_server/test/services/correction/status_test.dart b/pkg/analysis_server/test/services/correction/status_test.dart
index 250b663..8e2582c 100644
--- a/pkg/analysis_server/test/services/correction/status_test.dart
+++ b/pkg/analysis_server/test/services/correction/status_test.dart
@@ -6,8 +6,6 @@
import 'package:analysis_server/src/services/correction/status.dart';
import 'package:analysis_server/src/services/search/search_engine.dart';
import 'package:analysis_server/src/services/search/search_engine_internal.dart';
-import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/src/generated/source.dart';
import 'package:analyzer_plugin/utilities/range_factory.dart';
import 'package:test/test.dart';
@@ -26,9 +24,9 @@
class RefactoringLocationTest extends AbstractSingleUnitTest {
Future<void> test_createLocation_forElement() async {
await resolveTestUnit('class MyClass {}');
- Element element = findElement('MyClass');
+ var element = findElement('MyClass');
// check
- Location location = newLocation_fromElement(element);
+ var location = newLocation_fromElement(element);
expect(location.file, testFile);
expect(location.offset, 6);
expect(location.length, 7);
@@ -38,8 +36,8 @@
Future<void> test_createLocation_forMatch() async {
await resolveTestUnit('class MyClass {}');
- Element element = findElement('MyClass');
- SourceRange sourceRange = range.elementName(element);
+ var element = findElement('MyClass');
+ var sourceRange = range.elementName(element);
SearchMatch match = SearchMatchImpl(
element.source.fullName,
element.library.source,
@@ -51,7 +49,7 @@
MatchKind.DECLARATION,
sourceRange);
// check
- Location location = newLocation_fromMatch(match);
+ var location = newLocation_fromMatch(match);
expect(location.file, testFile);
expect(location.offset, sourceRange.offset);
expect(location.length, sourceRange.length);
@@ -62,9 +60,9 @@
main() {
}
''');
- AstNode node = findNodeAtString('main');
+ var node = findNodeAtString('main');
// check
- Location location = newLocation_fromNode(node);
+ var location = newLocation_fromNode(node);
expect(location.file, testFile);
expect(location.offset, node.offset);
expect(location.length, node.length);
@@ -72,9 +70,9 @@
Future<void> test_createLocation_forUnit() async {
await resolveTestUnit('');
- SourceRange sourceRange = SourceRange(10, 20);
+ var sourceRange = SourceRange(10, 20);
// check
- Location location = newLocation_fromUnit(testUnit, sourceRange);
+ var location = newLocation_fromUnit(testUnit, sourceRange);
expect(location.file, testFile);
expect(location.offset, sourceRange.offset);
expect(location.length, sourceRange.length);
@@ -84,7 +82,7 @@
@reflectiveTest
class RefactoringStatusTest {
void test_addError() {
- RefactoringStatus refactoringStatus = RefactoringStatus();
+ var refactoringStatus = RefactoringStatus();
// initial state
expect(refactoringStatus.severity, null);
// add ERROR
@@ -94,14 +92,14 @@
expect(refactoringStatus.hasFatalError, isFalse);
expect(refactoringStatus.hasError, isTrue);
// problems
- List<RefactoringProblem> problems = refactoringStatus.problems;
+ var problems = refactoringStatus.problems;
expect(problems, hasLength(1));
expect(problems[0].message, 'msg');
}
void test_addFatalError_withLocation() {
- Location location = Location('/test.dart', 1, 2, 3, 4);
- RefactoringStatus refactoringStatus = RefactoringStatus();
+ var location = Location('/test.dart', 1, 2, 3, 4);
+ var refactoringStatus = RefactoringStatus();
// initial state
expect(refactoringStatus.severity, null);
// add FATAL
@@ -111,7 +109,7 @@
expect(refactoringStatus.hasFatalError, isTrue);
expect(refactoringStatus.hasError, isTrue);
// problems
- List<RefactoringProblem> problems = refactoringStatus.problems;
+ var problems = refactoringStatus.problems;
expect(problems, hasLength(1));
expect(problems[0].message, 'msg');
expect(problems[0].location.file, '/test.dart');
@@ -123,7 +121,7 @@
}
void test_addFatalError_withoutContext() {
- RefactoringStatus refactoringStatus = RefactoringStatus();
+ var refactoringStatus = RefactoringStatus();
// initial state
expect(refactoringStatus.severity, null);
// add FATAL
@@ -133,19 +131,19 @@
expect(refactoringStatus.hasFatalError, isTrue);
expect(refactoringStatus.hasError, isTrue);
// problems
- List<RefactoringProblem> problems = refactoringStatus.problems;
+ var problems = refactoringStatus.problems;
expect(problems, hasLength(1));
expect(problems[0].message, 'msg');
expect(problems[0].location, isNull);
}
void test_addStatus_Error_withWarning() {
- RefactoringStatus refactoringStatus = RefactoringStatus();
+ var refactoringStatus = RefactoringStatus();
refactoringStatus.addError('err');
expect(refactoringStatus.severity, RefactoringProblemSeverity.ERROR);
// merge with OK
{
- RefactoringStatus other = RefactoringStatus();
+ var other = RefactoringStatus();
other.addWarning('warn');
refactoringStatus.addStatus(other);
}
@@ -154,7 +152,7 @@
}
void test_addStatus_Warning_null() {
- RefactoringStatus refactoringStatus = RefactoringStatus();
+ var refactoringStatus = RefactoringStatus();
refactoringStatus.addWarning('warn');
expect(refactoringStatus.severity, RefactoringProblemSeverity.WARNING);
// merge with "null"
@@ -163,12 +161,12 @@
}
void test_addStatus_Warning_withError() {
- RefactoringStatus refactoringStatus = RefactoringStatus();
+ var refactoringStatus = RefactoringStatus();
refactoringStatus.addWarning('warn');
expect(refactoringStatus.severity, RefactoringProblemSeverity.WARNING);
// merge with OK
{
- RefactoringStatus other = RefactoringStatus();
+ var other = RefactoringStatus();
other.addError('err');
refactoringStatus.addStatus(other);
}
@@ -177,7 +175,7 @@
}
void test_addWarning() {
- RefactoringStatus refactoringStatus = RefactoringStatus();
+ var refactoringStatus = RefactoringStatus();
// initial state
expect(refactoringStatus.severity, null);
// add WARNING
@@ -188,13 +186,13 @@
expect(refactoringStatus.hasError, isFalse);
expect(refactoringStatus.hasWarning, isTrue);
// problems
- List<RefactoringProblem> problems = refactoringStatus.problems;
+ var problems = refactoringStatus.problems;
expect(problems, hasLength(1));
expect(problems[0].message, 'msg');
}
void test_get_problem() {
- RefactoringStatus refactoringStatus = RefactoringStatus();
+ var refactoringStatus = RefactoringStatus();
// no entries
expect(refactoringStatus.problem, isNull);
expect(refactoringStatus.message, isNull);
@@ -204,7 +202,7 @@
refactoringStatus.addFatalError('msgFatalError');
// get entry
{
- RefactoringProblem problem = refactoringStatus.problem;
+ var problem = refactoringStatus.problem;
expect(problem.severity, RefactoringProblemSeverity.FATAL);
expect(problem.message, 'msgFatalError');
}
@@ -213,22 +211,21 @@
}
void test_newError() {
- Location location = Location('/test.dart', 1, 2, 3, 4);
- RefactoringStatus refactoringStatus =
- RefactoringStatus.error('msg', location);
+ var location = Location('/test.dart', 1, 2, 3, 4);
+ var refactoringStatus = RefactoringStatus.error('msg', location);
expect(refactoringStatus.severity, RefactoringProblemSeverity.ERROR);
expect(refactoringStatus.problem.message, 'msg');
expect(refactoringStatus.problem.location.file, '/test.dart');
}
void test_newFatalError() {
- RefactoringStatus refactoringStatus = RefactoringStatus.fatal('msg');
+ var refactoringStatus = RefactoringStatus.fatal('msg');
expect(refactoringStatus.severity, RefactoringProblemSeverity.FATAL);
expect(refactoringStatus.message, 'msg');
}
void test_newWarning() {
- RefactoringStatus refactoringStatus = RefactoringStatus.warning('msg');
+ var refactoringStatus = RefactoringStatus.warning('msg');
expect(refactoringStatus.severity, RefactoringProblemSeverity.WARNING);
expect(refactoringStatus.message, 'msg');
}
diff --git a/pkg/analysis_server/test/services/correction/util_test.dart b/pkg/analysis_server/test/services/correction/util_test.dart
index fdd64e2..31dfce9 100644
--- a/pkg/analysis_server/test/services/correction/util_test.dart
+++ b/pkg/analysis_server/test/services/correction/util_test.dart
@@ -34,9 +34,8 @@
}
''');
IfStatement ifStatement = findNodeAtString('if (');
- Expression condition = ifStatement.condition;
- String result =
- CorrectionUtils(testAnalysisResult).invertCondition(condition);
+ var condition = ifStatement.condition;
+ var result = CorrectionUtils(testAnalysisResult).invertCondition(condition);
expect(result, expected);
}
@@ -45,7 +44,7 @@
import 'dart:async';
import 'dart:math';
''');
- Source newLibrary = _getDartSource('dart:collection');
+ var newLibrary = _getDartSource('dart:collection');
await _assertAddLibraryImport(<Source>[newLibrary], '''
import 'dart:async';
import 'dart:collection';
@@ -58,7 +57,7 @@
import 'dart:collection';
import 'dart:math';
''');
- Source newLibrary = _getDartSource('dart:async');
+ var newLibrary = _getDartSource('dart:async');
await _assertAddLibraryImport(<Source>[newLibrary], '''
import 'dart:async';
import 'dart:collection';
@@ -71,7 +70,7 @@
import 'dart:async';
import 'dart:collection';
''');
- Source newLibrary = _getDartSource('dart:math');
+ var newLibrary = _getDartSource('dart:math');
await _assertAddLibraryImport(<Source>[newLibrary], '''
import 'dart:async';
import 'dart:collection';
@@ -84,8 +83,8 @@
import 'dart:collection';
import 'dart:math';
''');
- Source newLibrary1 = _getDartSource('dart:async');
- Source newLibrary2 = _getDartSource('dart:html');
+ var newLibrary1 = _getDartSource('dart:async');
+ var newLibrary2 = _getDartSource('dart:html');
await _assertAddLibraryImport(<Source>[newLibrary1, newLibrary2], '''
import 'dart:async';
import 'dart:collection';
@@ -99,8 +98,8 @@
import 'dart:html';
import 'dart:math';
''');
- Source newLibrary1 = _getDartSource('dart:async');
- Source newLibrary2 = _getDartSource('dart:collection');
+ var newLibrary1 = _getDartSource('dart:async');
+ var newLibrary2 = _getDartSource('dart:collection');
await _assertAddLibraryImport(<Source>[newLibrary1, newLibrary2], '''
import 'dart:async';
import 'dart:collection';
@@ -114,8 +113,8 @@
import 'dart:async';
import 'dart:collection';
''');
- Source newLibrary1 = _getDartSource('dart:html');
- Source newLibrary2 = _getDartSource('dart:math');
+ var newLibrary1 = _getDartSource('dart:html');
+ var newLibrary2 = _getDartSource('dart:math');
await _assertAddLibraryImport(<Source>[newLibrary1, newLibrary2], '''
import 'dart:async';
import 'dart:collection';
@@ -130,8 +129,8 @@
class A {}
''');
- Source newLibrary1 = _getDartSource('dart:math');
- Source newLibrary2 = _getDartSource('dart:async');
+ var newLibrary1 = _getDartSource('dart:math');
+ var newLibrary2 = _getDartSource('dart:async');
await _assertAddLibraryImport(<Source>[newLibrary1, newLibrary2], '''
library test;
@@ -148,8 +147,8 @@
class A {}
''');
- Source newLibrary1 = _getDartSource('dart:math');
- Source newLibrary2 = _getDartSource('dart:async');
+ var newLibrary1 = _getDartSource('dart:math');
+ var newLibrary2 = _getDartSource('dart:async');
await _assertAddLibraryImport(<Source>[newLibrary1, newLibrary2], '''
/// Comment.
@@ -166,8 +165,8 @@
class A {}
''');
- Source newLibrary1 = _getDartSource('dart:math');
- Source newLibrary2 = _getDartSource('dart:async');
+ var newLibrary1 = _getDartSource('dart:math');
+ var newLibrary2 = _getDartSource('dart:async');
await _assertAddLibraryImport(<Source>[newLibrary1, newLibrary2], '''
#!/bin/dart
@@ -182,8 +181,8 @@
await resolveTestUnit('''
class A {}
''');
- Source newLibrary1 = _getDartSource('dart:math');
- Source newLibrary2 = _getDartSource('dart:async');
+ var newLibrary1 = _getDartSource('dart:math');
+ var newLibrary2 = _getDartSource('dart:async');
await _assertAddLibraryImport(<Source>[newLibrary1, newLibrary2], '''
import 'dart:async';
import 'dart:math';
@@ -200,7 +199,7 @@
import 'package:aaa/aaa.dart';
''');
- Source newLibrary = _getSource('/lib/bbb.dart', 'package:bbb/bbb.dart');
+ var newLibrary = _getSource('/lib/bbb.dart', 'package:bbb/bbb.dart');
await _assertAddLibraryImport(<Source>[newLibrary], '''
import 'dart:async';
@@ -217,7 +216,7 @@
import 'package:bbb/bbb.dart';
''');
- Source newLibrary = _getSource('/lib/aaa.dart', 'package:aaa/aaa.dart');
+ var newLibrary = _getSource('/lib/aaa.dart', 'package:aaa/aaa.dart');
await _assertAddLibraryImport(<Source>[newLibrary], '''
import 'dart:async';
@@ -233,8 +232,8 @@
import 'package:aaa/aaa.dart';
import 'package:ddd/ddd.dart';
''');
- Source newLibrary1 = _getSource('/lib/bbb.dart', 'package:bbb/bbb.dart');
- Source newLibrary2 = _getSource('/lib/ccc.dart', 'package:ccc/ccc.dart');
+ var newLibrary1 = _getSource('/lib/bbb.dart', 'package:bbb/bbb.dart');
+ var newLibrary2 = _getSource('/lib/ccc.dart', 'package:ccc/ccc.dart');
await _assertAddLibraryImport(<Source>[newLibrary1, newLibrary2], '''
import 'package:aaa/aaa.dart';
import 'package:bbb/bbb.dart';
@@ -290,17 +289,17 @@
Future<void> _assertAddLibraryImport(
List<Source> newLibraries, String expectedCode) async {
- SourceChange change = SourceChange('');
+ var change = SourceChange('');
await addLibraryImports(testAnalysisResult.session, change,
testLibraryElement, newLibraries.toSet());
- SourceFileEdit testEdit = change.getFileEdit(testFile);
+ var testEdit = change.getFileEdit(testFile);
expect(testEdit, isNotNull);
- String resultCode = SourceEdit.applySequence(testCode, testEdit.edits);
+ var resultCode = SourceEdit.applySequence(testCode, testEdit.edits);
expect(resultCode, expectedCode);
}
Source _getDartSource(String uri) {
- String path = removeStart(uri, 'dart:');
+ var path = removeStart(uri, 'dart:');
return _SourceMock('/sdk/lib/$path.dart', Uri.parse(uri));
}
diff --git a/pkg/analysis_server/test/services/refactoring/abstract_refactoring.dart b/pkg/analysis_server/test/services/refactoring/abstract_refactoring.dart
index d17ac7b..640868c 100644
--- a/pkg/analysis_server/test/services/refactoring/abstract_refactoring.dart
+++ b/pkg/analysis_server/test/services/refactoring/abstract_refactoring.dart
@@ -8,23 +8,17 @@
import 'package:analysis_server/src/services/refactoring/refactoring.dart';
import 'package:analysis_server/src/services/search/search_engine.dart';
import 'package:analysis_server/src/services/search/search_engine_internal.dart';
-import 'package:analyzer/file_system/file_system.dart';
import 'package:analyzer/src/generated/source.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart'
- show
- RefactoringProblem,
- RefactoringProblemSeverity,
- SourceChange,
- SourceEdit,
- SourceFileEdit;
+ show RefactoringProblemSeverity, SourceChange, SourceEdit;
import 'package:test/test.dart';
import '../../abstract_single_unit.dart';
int findIdentifierLength(String search) {
- int length = 0;
+ var length = 0;
while (length < search.length) {
- int c = search.codeUnitAt(length);
+ var c = search.codeUnitAt(length);
if (!(c >= 'a'.codeUnitAt(0) && c <= 'z'.codeUnitAt(0) ||
c >= 'A'.codeUnitAt(0) && c <= 'Z'.codeUnitAt(0) ||
c >= '0'.codeUnitAt(0) && c <= '9'.codeUnitAt(0))) {
@@ -47,25 +41,25 @@
/// with the given [path], and it results the [expectedCode].
void assertFileChangeResult(String path, String expectedCode) {
// prepare FileEdit
- SourceFileEdit fileEdit = refactoringChange.getFileEdit(convertPath(path));
+ var fileEdit = refactoringChange.getFileEdit(convertPath(path));
expect(fileEdit, isNotNull, reason: 'No file edit for $path');
// validate resulting code
- File file = getFile(path);
- String ini = file.readAsStringSync();
- String actualCode = SourceEdit.applySequence(ini, fileEdit.edits);
+ var file = getFile(path);
+ var ini = file.readAsStringSync();
+ var actualCode = SourceEdit.applySequence(ini, fileEdit.edits);
expect(actualCode, expectedCode);
}
/// Asserts that [refactoringChange] does not contain a [FileEdit] for the
/// file with the given [path].
void assertNoFileChange(String path) {
- SourceFileEdit fileEdit = refactoringChange.getFileEdit(path);
+ var fileEdit = refactoringChange.getFileEdit(path);
expect(fileEdit, isNull);
}
/// Asserts that [refactoring] initial/final conditions status is OK.
Future assertRefactoringConditionsOK() async {
- RefactoringStatus status = await refactoring.checkInitialConditions();
+ var status = await refactoring.checkInitialConditions();
assertRefactoringStatusOK(status);
status = await refactoring.checkFinalConditions();
assertRefactoringStatusOK(status);
@@ -73,7 +67,7 @@
/// Asserts that [refactoring] final conditions status is OK.
Future assertRefactoringFinalConditionsOK() async {
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatusOK(status);
}
@@ -85,7 +79,7 @@
String expectedContextSearch}) {
expect(status.severity, expectedSeverity, reason: status.toString());
if (expectedSeverity != null) {
- RefactoringProblem problem = status.problem;
+ var problem = status.problem;
expect(problem.severity, expectedSeverity);
if (expectedMessage != null) {
expect(problem.message, expectedMessage);
@@ -95,8 +89,8 @@
expect(problem.location.length, expectedContextRange.length);
}
if (expectedContextSearch != null) {
- int expectedOffset = findOffset(expectedContextSearch);
- int expectedLength = findIdentifierLength(expectedContextSearch);
+ var expectedOffset = findOffset(expectedContextSearch);
+ var expectedLength = findIdentifierLength(expectedContextSearch);
expect(problem.location.offset, expectedOffset);
expect(problem.location.length, expectedLength);
}
@@ -112,7 +106,7 @@
/// applying the [Change] to [testUnit] is [expectedCode].
Future assertSuccessfulRefactoring(String expectedCode) async {
await assertRefactoringConditionsOK();
- SourceChange change = await refactoring.createChange();
+ var change = await refactoring.createChange();
refactoringChange = change;
assertTestChangeResult(expectedCode);
}
@@ -121,10 +115,10 @@
/// it results the [expectedCode].
void assertTestChangeResult(String expectedCode) {
// prepare FileEdit
- SourceFileEdit fileEdit = refactoringChange.getFileEdit(testFile);
+ var fileEdit = refactoringChange.getFileEdit(testFile);
expect(fileEdit, isNotNull);
// validate resulting code
- String actualCode = SourceEdit.applySequence(testCode, fileEdit.edits);
+ var actualCode = SourceEdit.applySequence(testCode, fileEdit.edits);
expect(actualCode, expectedCode);
}
diff --git a/pkg/analysis_server/test/services/refactoring/abstract_rename.dart b/pkg/analysis_server/test/services/refactoring/abstract_rename.dart
index 18a92d3..d1bf07c 100644
--- a/pkg/analysis_server/test/services/refactoring/abstract_rename.dart
+++ b/pkg/analysis_server/test/services/refactoring/abstract_rename.dart
@@ -19,14 +19,14 @@
/// Asserts that [refactoring] has potential edits in [testFile] at offset
/// of the given [searches].
void assertPotentialEdits(List<String> searches) {
- Set<int> expectedOffsets = <int>{};
- for (String search in searches) {
- int offset = findOffset(search);
+ var expectedOffsets = <int>{};
+ for (var search in searches) {
+ var offset = findOffset(search);
expectedOffsets.add(offset);
}
// remove offset marked as potential
- for (String potentialId in refactoring.potentialEditIds) {
- SourceEdit edit = findEditById(potentialId);
+ for (var potentialId in refactoring.potentialEditIds) {
+ var edit = findEditById(potentialId);
expect(edit, isNotNull);
expectedOffsets.remove(edit.offset);
}
@@ -37,8 +37,8 @@
/// Creates a new [RenameRefactoring] in [refactoring] for the [Element] of
/// the [SimpleIdentifier] at the given [search] pattern.
void createRenameRefactoringAtString(String search) {
- SimpleIdentifier identifier = findIdentifier(search);
- Element element = identifier.staticElement;
+ var identifier = findIdentifier(search);
+ var element = identifier.staticElement;
if (element is PrefixElement) {
element = getImportElement(identifier);
}
@@ -55,8 +55,8 @@
/// Returns the [Edit] with the given [id], maybe `null`.
SourceEdit findEditById(String id) {
- for (SourceFileEdit fileEdit in refactoringChange.edits) {
- for (SourceEdit edit in fileEdit.edits) {
+ for (var fileEdit in refactoringChange.edits) {
+ for (var edit in fileEdit.edits) {
if (edit.id == id) {
return edit;
}
diff --git a/pkg/analysis_server/test/services/refactoring/convert_getter_to_method_test.dart b/pkg/analysis_server/test/services/refactoring/convert_getter_to_method_test.dart
index c4dafb2..fc2abaa 100644
--- a/pkg/analysis_server/test/services/refactoring/convert_getter_to_method_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/convert_getter_to_method_test.dart
@@ -4,7 +4,6 @@
import 'dart:async';
-import 'package:analysis_server/src/services/correction/status.dart';
import 'package:analysis_server/src/services/refactoring/refactoring.dart';
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart' hide ElementKind;
@@ -130,7 +129,7 @@
}
Future _assertInitialConditions_fatal(String message) async {
- RefactoringStatus status = await refactoring.checkInitialConditions();
+ var status = await refactoring.checkInitialConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL,
expectedMessage: message);
}
@@ -139,7 +138,7 @@
/// change to [testUnit] is [expectedCode].
Future _assertSuccessfulRefactoring(String expectedCode) async {
await assertRefactoringConditionsOK();
- SourceChange refactoringChange = await refactoring.createChange();
+ var refactoringChange = await refactoring.createChange();
this.refactoringChange = refactoringChange;
assertTestChangeResult(expectedCode);
}
diff --git a/pkg/analysis_server/test/services/refactoring/convert_method_to_getter_test.dart b/pkg/analysis_server/test/services/refactoring/convert_method_to_getter_test.dart
index e6536ff..c7a468d 100644
--- a/pkg/analysis_server/test/services/refactoring/convert_method_to_getter_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/convert_method_to_getter_test.dart
@@ -4,12 +4,11 @@
import 'dart:async';
-import 'package:analysis_server/src/services/correction/status.dart';
import 'package:analysis_server/src/services/refactoring/refactoring.dart';
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/src/generated/testing/element_search.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart'
- show RefactoringProblemSeverity, SourceChange;
+ show RefactoringProblemSeverity;
import 'package:test_reflective_loader/test_reflective_loader.dart';
import 'abstract_refactoring.dart';
@@ -184,7 +183,7 @@
}
Future _assertInitialConditions_fatal(String message) async {
- RefactoringStatus status = await refactoring.checkInitialConditions();
+ var status = await refactoring.checkInitialConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL,
expectedMessage: message);
}
@@ -193,7 +192,7 @@
/// to [testUnit] is [expectedCode].
Future _assertSuccessfulRefactoring(String expectedCode) async {
await assertRefactoringConditionsOK();
- SourceChange refactoringChange = await refactoring.createChange();
+ var refactoringChange = await refactoring.createChange();
this.refactoringChange = refactoringChange;
assertTestChangeResult(expectedCode);
}
diff --git a/pkg/analysis_server/test/services/refactoring/extract_local_test.dart b/pkg/analysis_server/test/services/refactoring/extract_local_test.dart
index 0ad6138..5d89491 100644
--- a/pkg/analysis_server/test/services/refactoring/extract_local_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/extract_local_test.dart
@@ -5,7 +5,6 @@
import 'dart:async';
import 'dart:convert';
-import 'package:analysis_server/src/services/correction/status.dart';
import 'package:analysis_server/src/services/linter/lint_names.dart';
import 'package:analysis_server/src/services/refactoring/extract_local.dart';
import 'package:analysis_server/src/services/refactoring/refactoring.dart';
@@ -35,7 +34,7 @@
''');
_createRefactoringForString('1 + 2');
// conflicting name
- RefactoringStatus status = await refactoring.checkAllConditions();
+ var status = await refactoring.checkAllConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage: "The name 'res' is already used in the scope.");
}
@@ -49,7 +48,7 @@
''');
_createRefactoringForString('1 + 2');
// conflicting name
- RefactoringStatus status = await refactoring.checkAllConditions();
+ var status = await refactoring.checkAllConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage: "The name 'res' is already used in the scope.");
}
@@ -61,7 +60,7 @@
}
''');
_createRefactoring(0, 1 << 20);
- RefactoringStatus status = await refactoring.checkAllConditions();
+ var status = await refactoring.checkAllConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL);
}
@@ -72,7 +71,7 @@
}
''');
_createRefactoring(-10, 20);
- RefactoringStatus status = await refactoring.checkAllConditions();
+ var status = await refactoring.checkAllConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL);
}
@@ -85,7 +84,7 @@
''');
_createRefactoringWithSuffix('v', ' = 1;');
// check conditions
- RefactoringStatus status = await refactoring.checkAllConditions();
+ var status = await refactoring.checkAllConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL,
expectedMessage: 'Cannot extract the left-hand side of an assignment.');
}
@@ -99,7 +98,7 @@
''');
_createRefactoringWithSuffix('foo', '()');
// check conditions
- RefactoringStatus status = await refactoring.checkAllConditions();
+ var status = await refactoring.checkAllConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL,
expectedMessage: 'Cannot extract the name part of a declaration.');
}
@@ -113,7 +112,7 @@
''');
_createRefactoringWithSuffix('vvv', ' = 0;');
// check conditions
- RefactoringStatus status = await refactoring.checkAllConditions();
+ var status = await refactoring.checkAllConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL,
expectedMessage: 'Cannot extract the name part of a declaration.');
}
@@ -135,7 +134,7 @@
''');
_createRefactoringForString('1 + 2');
// check conditions
- RefactoringStatus status = await refactoring.checkAllConditions();
+ var status = await refactoring.checkAllConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL,
expectedMessage: 'An expression inside a function must be selected '
'to activate this refactoring.');
@@ -183,7 +182,7 @@
''');
_createRefactoringForString('print');
// check conditions
- RefactoringStatus status = await refactoring.checkInitialConditions();
+ var status = await refactoring.checkInitialConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL,
expectedMessage: 'Cannot extract the void expression.');
}
@@ -420,7 +419,7 @@
_createRefactoring(testCode.indexOf('bb * 2'), 0);
// check conditions
await refactoring.checkInitialConditions();
- List<String> subExpressions = _getCoveringExpressions();
+ var subExpressions = _getCoveringExpressions();
expect(subExpressions,
['bbb', 'bbb * 2', 'aaa + bbb * 2', 'aaa + bbb * 2 + 3']);
}
@@ -435,7 +434,7 @@
_createRefactoring(testCode.indexOf('11 +'), 0);
// check conditions
await refactoring.checkInitialConditions();
- List<String> subExpressions = _getCoveringExpressions();
+ var subExpressions = _getCoveringExpressions();
expect(subExpressions, ['111', '111 + 222', 'foo(111 + 222)']);
}
@@ -449,7 +448,7 @@
_createRefactoring(testCode.indexOf('11 +'), 0);
// check conditions
await refactoring.checkInitialConditions();
- List<String> subExpressions = _getCoveringExpressions();
+ var subExpressions = _getCoveringExpressions();
expect(subExpressions, ['111', '111 + 222']);
}
@@ -463,7 +462,7 @@
_createRefactoring(testCode.indexOf('42'), 0);
// check conditions
await refactoring.checkInitialConditions();
- List<String> subExpressions = _getCoveringExpressions();
+ var subExpressions = _getCoveringExpressions();
expect(subExpressions, ['42', 'foo(ppp: 42)']);
}
@@ -478,7 +477,7 @@
_createRefactoring(testCode.indexOf('11 +'), 0);
// check conditions
await refactoring.checkInitialConditions();
- List<String> subExpressions = _getCoveringExpressions();
+ var subExpressions = _getCoveringExpressions();
expect(subExpressions, ['111', '111 + 222', 'foo(v = 111 + 222)']);
}
@@ -494,7 +493,7 @@
_createRefactoring(testCode.indexOf('AA.name();'), 5);
// check conditions
await refactoring.checkInitialConditions();
- List<String> subExpressions = _getCoveringExpressions();
+ var subExpressions = _getCoveringExpressions();
expect(subExpressions, ['new AAA.name()']);
}
@@ -510,7 +509,7 @@
_createRefactoring(testCode.indexOf('ame();'), 0);
// check conditions
await refactoring.checkInitialConditions();
- List<String> subExpressions = _getCoveringExpressions();
+ var subExpressions = _getCoveringExpressions();
expect(subExpressions, ['new A.name()']);
}
@@ -524,7 +523,7 @@
_createRefactoring(testCode.indexOf('A();'), 0);
// check conditions
await refactoring.checkInitialConditions();
- List<String> subExpressions = _getCoveringExpressions();
+ var subExpressions = _getCoveringExpressions();
expect(subExpressions, ['new A()']);
}
@@ -539,7 +538,7 @@
_createRefactoring(testCode.indexOf('ring>'), 0);
// check conditions
await refactoring.checkInitialConditions();
- List<String> subExpressions = _getCoveringExpressions();
+ var subExpressions = _getCoveringExpressions();
expect(subExpressions, ['new A<String>()']);
}
@@ -553,7 +552,7 @@
_createRefactoring(testCode.indexOf('pp: 42'), 0);
// check conditions
await refactoring.checkInitialConditions();
- List<String> subExpressions = _getCoveringExpressions();
+ var subExpressions = _getCoveringExpressions();
expect(subExpressions, ['foo(ppp: 42)']);
}
@@ -1359,7 +1358,7 @@
}
Future _assertInitialConditions_fatal_selection() async {
- RefactoringStatus status = await refactoring.checkInitialConditions();
+ var status = await refactoring.checkInitialConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL,
expectedMessage:
'Expression must be selected to activate this refactoring.');
@@ -1379,7 +1378,7 @@
}
void _assertSingleLinkedEditGroupJson(String expectedJsonString) {
- List<LinkedEditGroup> editGroups = refactoringChange.linkedEditGroups;
+ var editGroups = refactoringChange.linkedEditGroups;
expect(editGroups, hasLength(1));
expect(editGroups.first.toJson(), json.decode(expectedJsonString));
}
@@ -1388,7 +1387,7 @@
/// [SourceChange] to [testUnit] is [expectedCode].
Future _assertSuccessfulRefactoring(String expectedCode) async {
await assertRefactoringConditionsOK();
- SourceChange refactoringChange = await refactoring.createChange();
+ var refactoringChange = await refactoring.createChange();
this.refactoringChange = refactoringChange;
assertTestChangeResult(expectedCode);
}
@@ -1401,30 +1400,30 @@
/// Creates a new refactoring in [refactoring] at the offset of the given
/// [search] pattern, and with the length `0`.
void _createRefactoringAtString(String search) {
- int offset = findOffset(search);
- int length = 0;
+ var offset = findOffset(search);
+ var length = 0;
_createRefactoring(offset, length);
}
/// Creates a new refactoring in [refactoring] for the selection range of the
/// given [search] pattern.
void _createRefactoringForString(String search) {
- int offset = findOffset(search);
- int length = search.length;
+ var offset = findOffset(search);
+ var length = search.length;
_createRefactoring(offset, length);
}
void _createRefactoringWithSuffix(String selectionSearch, String suffix) {
- int offset = findOffset(selectionSearch + suffix);
- int length = selectionSearch.length;
+ var offset = findOffset(selectionSearch + suffix);
+ var length = selectionSearch.length;
_createRefactoring(offset, length);
}
List<String> _getCoveringExpressions() {
- List<String> subExpressions = <String>[];
- for (int i = 0; i < refactoring.coveringExpressionOffsets.length; i++) {
- int offset = refactoring.coveringExpressionOffsets[i];
- int length = refactoring.coveringExpressionLengths[i];
+ var subExpressions = <String>[];
+ for (var i = 0; i < refactoring.coveringExpressionOffsets.length; i++) {
+ var offset = refactoring.coveringExpressionOffsets[i];
+ var length = refactoring.coveringExpressionLengths[i];
subExpressions.add(testCode.substring(offset, offset + length));
}
return subExpressions;
diff --git a/pkg/analysis_server/test/services/refactoring/extract_method_test.dart b/pkg/analysis_server/test/services/refactoring/extract_method_test.dart
index 2ee8aff..bee3353 100644
--- a/pkg/analysis_server/test/services/refactoring/extract_method_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/extract_method_test.dart
@@ -4,7 +4,6 @@
import 'dart:async';
-import 'package:analysis_server/src/services/correction/status.dart';
import 'package:analysis_server/src/services/refactoring/extract_method.dart';
import 'package:analysis_server/src/services/refactoring/refactoring.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
@@ -375,7 +374,7 @@
// update parameters
await refactoring.checkInitialConditions();
{
- List<RefactoringMethodParameter> parameters = _getParametersCopy();
+ var parameters = _getParametersCopy();
expect(parameters, hasLength(2));
parameters[0].name = 'dup';
parameters[1].name = 'dup';
@@ -399,7 +398,7 @@
// update parameters
await refactoring.checkInitialConditions();
{
- List<RefactoringMethodParameter> parameters = _getParametersCopy();
+ var parameters = _getParametersCopy();
expect(parameters, hasLength(2));
parameters[0].name = 'f';
refactoring.parameters = parameters;
@@ -422,7 +421,7 @@
// update parameters
await refactoring.checkInitialConditions();
{
- List<RefactoringMethodParameter> parameters = _getParametersCopy();
+ var parameters = _getParametersCopy();
expect(parameters, hasLength(2));
parameters[0].name = 'a';
refactoring.parameters = parameters;
@@ -448,7 +447,7 @@
// update parameters
await refactoring.checkInitialConditions();
{
- List<RefactoringMethodParameter> parameters = _getParametersCopy();
+ var parameters = _getParametersCopy();
expect(parameters, hasLength(2));
parameters[0].name = 'm';
refactoring.parameters = parameters;
@@ -770,7 +769,7 @@
}
''');
_createRefactoring(0, 1 << 20);
- RefactoringStatus status = await refactoring.checkAllConditions();
+ var status = await refactoring.checkAllConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL);
}
@@ -781,7 +780,7 @@
}
''');
_createRefactoring(-10, 20);
- RefactoringStatus status = await refactoring.checkAllConditions();
+ var status = await refactoring.checkAllConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL);
}
@@ -954,7 +953,7 @@
''');
_createRefactoringForString('(x) => x * k');
// check
- RefactoringStatus status = await refactoring.checkInitialConditions();
+ var status = await refactoring.checkInitialConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL,
expectedMessage:
'Cannot extract closure as method, it references 1 external variable(s).');
@@ -969,7 +968,7 @@
''');
_createRefactoringForString('(x) => x * k');
// check
- RefactoringStatus status = await refactoring.checkInitialConditions();
+ var status = await refactoring.checkInitialConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL,
expectedMessage:
'Cannot extract closure as method, it references 1 external variable(s).');
@@ -1816,7 +1815,7 @@
// apply refactoring
await refactoring.checkInitialConditions();
{
- List<RefactoringMethodParameter> parameters = _getParametersCopy();
+ var parameters = _getParametersCopy();
expect(parameters, hasLength(2));
expect(parameters[0].name, 'v1');
expect(parameters[1].name, 'v2');
@@ -1853,7 +1852,7 @@
// apply refactoring
await refactoring.checkInitialConditions();
{
- List<RefactoringMethodParameter> parameters = _getParametersCopy();
+ var parameters = _getParametersCopy();
expect(parameters, hasLength(2));
expect(parameters[0].name, 'v1');
expect(parameters[1].name, 'v2');
@@ -1912,7 +1911,7 @@
// apply refactoring
await refactoring.checkInitialConditions();
{
- List<RefactoringMethodParameter> parameters = _getParametersCopy();
+ var parameters = _getParametersCopy();
expect(parameters, hasLength(3));
expect(parameters[0].name, 'v1');
expect(parameters[1].name, 'v2');
@@ -2172,7 +2171,7 @@
''');
_createRefactoringForStartEndComments();
// check conditions
- RefactoringStatus status = await refactoring.checkInitialConditions();
+ var status = await refactoring.checkInitialConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL);
}
@@ -2888,25 +2887,25 @@
}
Future _assertConditionsError(String message) async {
- RefactoringStatus status = await refactoring.checkAllConditions();
+ var status = await refactoring.checkAllConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage: message);
}
Future _assertConditionsFatal(String message) async {
- RefactoringStatus status = await refactoring.checkAllConditions();
+ var status = await refactoring.checkAllConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL,
expectedMessage: message);
}
Future _assertFinalConditionsError(String message) async {
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage: message);
}
Future _assertRefactoringChange(String expectedCode) async {
- SourceChange refactoringChange = await refactoring.createChange();
+ var refactoringChange = await refactoring.createChange();
this.refactoringChange = refactoringChange;
assertTestChangeResult(expectedCode);
}
@@ -2926,36 +2925,36 @@
}
void _createRefactoringForStartEndComments() {
- int offset = findEnd('// start') + '\n'.length;
- int end = findOffset('// end');
+ var offset = findEnd('// start') + '\n'.length;
+ var end = findOffset('// end');
_createRefactoring(offset, end - offset);
}
void _createRefactoringForStartEndString(
String startSearch, String endSearch) {
- int offset = findOffset(startSearch);
- int end = findOffset(endSearch);
+ var offset = findOffset(startSearch);
+ var end = findOffset(endSearch);
_createRefactoring(offset, end - offset);
}
/// Creates a new refactoring in [refactoring] for the selection range of the
/// given [search] pattern.
void _createRefactoringForString(String search) {
- int offset = findOffset(search);
- int length = search.length;
+ var offset = findOffset(search);
+ var length = search.length;
_createRefactoring(offset, length);
}
/// Creates a new refactoring in [refactoring] at the offset of the given
/// [search] pattern, and with `0` length.
void _createRefactoringForStringOffset(String search) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
_createRefactoring(offset, 0);
}
void _createRefactoringWithSuffix(String selectionSearch, String suffix) {
- int offset = findOffset(selectionSearch + suffix);
- int length = selectionSearch.length;
+ var offset = findOffset(selectionSearch + suffix);
+ var length = selectionSearch.length;
_createRefactoring(offset, length);
}
diff --git a/pkg/analysis_server/test/services/refactoring/extract_widget_test.dart b/pkg/analysis_server/test/services/refactoring/extract_widget_test.dart
index a22d303..9f2dd3a 100644
--- a/pkg/analysis_server/test/services/refactoring/extract_widget_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/extract_widget_test.dart
@@ -4,7 +4,6 @@
import 'dart:async';
-import 'package:analysis_server/src/services/correction/status.dart';
import 'package:analysis_server/src/services/refactoring/extract_widget.dart';
import 'package:analysis_server/src/services/refactoring/refactoring.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
@@ -32,7 +31,7 @@
''');
_createRefactoringForStringOffset('class C');
- RefactoringStatus status = await refactoring.checkAllConditions();
+ var status = await refactoring.checkAllConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL);
}
@@ -243,7 +242,7 @@
''');
Future<void> assertResult(String str) async {
- int offset = findOffset(str);
+ var offset = findOffset(str);
_createRefactoring(offset, str.length);
await _assertSuccessfulRefactoring('''
@@ -342,7 +341,7 @@
''');
_createRefactoringForStringOffset('new GestureDetector');
- RefactoringStatus status = await refactoring.checkAllConditions();
+ var status = await refactoring.checkAllConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR);
}
@@ -369,7 +368,7 @@
''');
_createRefactoringForStringOffset('new GestureDetector');
- RefactoringStatus status = await refactoring.checkAllConditions();
+ var status = await refactoring.checkAllConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR);
}
@@ -786,7 +785,7 @@
''');
_createRefactoringForStringOffset('new GestureDetector');
- RefactoringStatus status = await refactoring.checkAllConditions();
+ var status = await refactoring.checkAllConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR);
}
@@ -813,7 +812,7 @@
''');
_createRefactoringForStringOffset('new GestureDetector');
- RefactoringStatus status = await refactoring.checkAllConditions();
+ var status = await refactoring.checkAllConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR);
}
@@ -894,7 +893,7 @@
''');
_createRefactoringForStringOffset('new Text');
- RefactoringStatus status = await refactoring.checkAllConditions();
+ var status = await refactoring.checkAllConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR);
}
@@ -960,7 +959,7 @@
''');
_createRefactoringForStringOffset('new GestureDetector');
- RefactoringStatus status = await refactoring.checkAllConditions();
+ var status = await refactoring.checkAllConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR);
}
@@ -1220,7 +1219,7 @@
}
Future<void> _assertRefactoringChange(String expectedCode) async {
- SourceChange refactoringChange = await refactoring.createChange();
+ var refactoringChange = await refactoring.createChange();
this.refactoringChange = refactoringChange;
assertTestChangeResult(expectedCode);
}
@@ -1239,15 +1238,15 @@
}
void _createRefactoringForStartEnd() {
- int offset = findOffset('// start\n') + '// start\n'.length;
- int length = findOffset('// end') - offset;
+ var offset = findOffset('// start\n') + '// start\n'.length;
+ var length = findOffset('// end') - offset;
_createRefactoring(offset, length);
}
/// Creates a new refactoring in [refactoring] at the offset of the given
/// [search] pattern.
void _createRefactoringForStringOffset(String search) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
_createRefactoring(offset, 0);
}
}
diff --git a/pkg/analysis_server/test/services/refactoring/inline_local_test.dart b/pkg/analysis_server/test/services/refactoring/inline_local_test.dart
index 5fb906e..e60b02b 100644
--- a/pkg/analysis_server/test/services/refactoring/inline_local_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/inline_local_test.dart
@@ -44,7 +44,7 @@
}
''');
_createRefactoring('main() {');
- RefactoringStatus status = await refactoring.checkInitialConditions();
+ var status = await refactoring.checkInitialConditions();
_assert_fatalError_selection(status);
}
@@ -54,7 +54,7 @@
}
''');
_createRefactoring('test) {');
- RefactoringStatus status = await refactoring.checkInitialConditions();
+ var status = await refactoring.checkInitialConditions();
_assert_fatalError_selection(status);
}
@@ -66,7 +66,7 @@
}
''');
_createRefactoring('test = 0');
- RefactoringStatus status = await refactoring.checkInitialConditions();
+ var status = await refactoring.checkInitialConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL,
expectedContextSearch: 'test = 1');
}
@@ -79,7 +79,7 @@
}
''');
_createRefactoring('test = 0');
- RefactoringStatus status = await refactoring.checkInitialConditions();
+ var status = await refactoring.checkInitialConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL,
expectedContextSearch: 'test += 1');
}
@@ -92,7 +92,7 @@
}
''');
_createRefactoring('test = 0');
- RefactoringStatus status = await refactoring.checkInitialConditions();
+ var status = await refactoring.checkInitialConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL);
}
@@ -103,7 +103,7 @@
}
''');
_createRefactoring('test;');
- RefactoringStatus status = await refactoring.checkInitialConditions();
+ var status = await refactoring.checkInitialConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL);
}
@@ -636,7 +636,7 @@
}
void _createRefactoring(String search) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
refactoring = InlineLocalRefactoring(
searchEngine,
testAnalysisResult,
diff --git a/pkg/analysis_server/test/services/refactoring/inline_method_test.dart b/pkg/analysis_server/test/services/refactoring/inline_method_test.dart
index aac7820..1fa40a3 100644
--- a/pkg/analysis_server/test/services/refactoring/inline_method_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/inline_method_test.dart
@@ -4,7 +4,6 @@
import 'dart:async';
-import 'package:analysis_server/src/services/correction/status.dart';
import 'package:analysis_server/src/services/refactoring/inline_method.dart';
import 'package:analysis_server/src/services/refactoring/refactoring.dart';
import 'package:analyzer/src/generated/source.dart';
@@ -129,7 +128,7 @@
''');
_createRefactoring('test() {');
// error
- RefactoringStatus status = await refactoring.checkAllConditions();
+ var status = await refactoring.checkAllConditions();
var location = SourceRange(findOffset('..test()'), '..test()'.length);
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage: 'Cannot inline cascade invocation.',
@@ -159,7 +158,7 @@
''');
_createRefactoring('test(1, 2)');
// initial conditions
- RefactoringStatus status = await refactoring.checkInitialConditions();
+ var status = await refactoring.checkInitialConditions();
assertRefactoringStatusOK(status);
refactoring.deleteSource = true;
refactoring.inlineAll = false;
@@ -1438,7 +1437,7 @@
''');
_createRefactoring('test();');
// error
- RefactoringStatus status = await refactoring.checkAllConditions();
+ var status = await refactoring.checkAllConditions();
var location = SourceRange(findOffset('test();'), 'test()'.length);
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage: 'No argument for the parameter "a".',
@@ -1744,13 +1743,13 @@
}
Future _assertConditionsError(String message) async {
- RefactoringStatus status = await refactoring.checkAllConditions();
+ var status = await refactoring.checkAllConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage: message);
}
Future _assertConditionsFatal(String message) async {
- RefactoringStatus status = await refactoring.checkAllConditions();
+ var status = await refactoring.checkAllConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL,
expectedMessage: message);
}
@@ -1761,7 +1760,7 @@
}
Future _assertSuccessfulRefactoring(String expectedCode) async {
- RefactoringStatus status = await refactoring.checkInitialConditions();
+ var status = await refactoring.checkInitialConditions();
assertRefactoringStatusOK(status);
// configure
if (deleteSource != null) {
@@ -1774,13 +1773,13 @@
status = await refactoring.checkFinalConditions();
assertRefactoringStatusOK(status);
// change
- SourceChange change = await refactoring.createChange();
+ var change = await refactoring.createChange();
refactoringChange = change;
assertTestChangeResult(expectedCode);
}
void _createRefactoring(String search) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
refactoring = InlineMethodRefactoring(
searchEngine,
testAnalysisResult,
diff --git a/pkg/analysis_server/test/services/refactoring/move_file_test.dart b/pkg/analysis_server/test/services/refactoring/move_file_test.dart
index 335a247..d9a993f 100644
--- a/pkg/analysis_server/test/services/refactoring/move_file_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/move_file_test.dart
@@ -5,7 +5,6 @@
import 'dart:async';
import 'package:analysis_server/src/protocol_server.dart';
-import 'package:analysis_server/src/services/correction/status.dart';
import 'package:analysis_server/src/services/refactoring/refactoring.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -24,9 +23,9 @@
MoveFileRefactoring refactoring;
Future<void> test_file_containing_imports_exports_parts() async {
- String pathA = convertPath('/home/test/000/1111/a.dart');
- String pathB = convertPath('/home/test/000/1111/b.dart');
- String pathC = convertPath('/home/test/000/1111/22/c.dart');
+ var pathA = convertPath('/home/test/000/1111/a.dart');
+ var pathB = convertPath('/home/test/000/1111/b.dart');
+ var pathC = convertPath('/home/test/000/1111/22/c.dart');
testFile = convertPath('/home/test/000/1111/test.dart');
addSource('/absolute/uri.dart', '');
addSource(pathA, 'part of lib;');
@@ -184,7 +183,7 @@
}
Future<void> test_file_imported_with_relative_uri_down() async {
- String pathA = convertPath('/home/test/000/1111/a.dart');
+ var pathA = convertPath('/home/test/000/1111/a.dart');
testFile = convertPath('/home/test/000/1111/test.dart');
addSource(pathA, '''
import 'test.dart';
@@ -202,7 +201,7 @@
}
Future<void> test_file_imported_with_relative_uri_sideways() async {
- String pathA = convertPath('/home/test/000/1111/a.dart');
+ var pathA = convertPath('/home/test/000/1111/a.dart');
testFile = convertPath('/home/test/000/1111/sub/folder/test.dart');
addSource(pathA, '''
import 'sub/folder/test.dart';
@@ -218,7 +217,7 @@
}
Future<void> test_file_imported_with_relative_uri_up() async {
- String pathA = convertPath('/home/test/000/1111/a.dart');
+ var pathA = convertPath('/home/test/000/1111/a.dart');
testFile = convertPath('/home/test/000/1111/22/test.dart');
addSource(pathA, '''
import '22/test.dart';
@@ -237,8 +236,8 @@
Future<void> test_file_referenced_by_multiple_libraries() async {
// This test fails because the search index doesn't support multiple uris for
// a library, so only one of them is updated.
- String pathA = convertPath('/home/test/000/1111/a.dart');
- String pathB = convertPath('/home/test/000/b.dart');
+ var pathA = convertPath('/home/test/000/1111/a.dart');
+ var pathB = convertPath('/home/test/000/b.dart');
testFile = convertPath('/home/test/000/1111/22/test.dart');
addSource(pathA, '''
library lib;
@@ -266,7 +265,7 @@
}
Future<void> test_file_referenced_by_part() async {
- String pathA = convertPath('/home/test/000/1111/a.dart');
+ var pathA = convertPath('/home/test/000/1111/a.dart');
testFile = convertPath('/home/test/000/1111/22/test.dart');
addSource(pathA, '''
library lib;
@@ -325,7 +324,7 @@
// If the file is a part in a library, and the part-of directive uses a URI
// rather than a library name, that will need updating too (if the relative
// path to the parent changes).
- String pathA = convertPath('/home/test/000/1111/a.dart');
+ var pathA = convertPath('/home/test/000/1111/a.dart');
testFile = convertPath('/home/test/000/1111/22/test.dart');
addSource(pathA, '''
library lib;
@@ -350,7 +349,7 @@
// If the file is a part in a library, and the part-of directive uses a URI
// rather than a library name, that will need updating too (if the relative
// path to the parent changes).
- String pathA = convertPath('/home/test/000/1111/a.dart');
+ var pathA = convertPath('/home/test/000/1111/a.dart');
testFile = convertPath('/home/test/000/1111/test.dart');
addSource(pathA, '''
part of 'test.dart';
@@ -373,7 +372,7 @@
// If the file is a part in a library, and the part-of directive uses a URI
// rather than a library name, that will need updating too (if the relative
// path to the parent changes).
- String pathA = convertPath('/home/test/000/1111/a.dart');
+ var pathA = convertPath('/home/test/000/1111/a.dart');
testFile = convertPath('/home/test/000/1111/test.dart');
addSource(pathA, '''
part of 'test.dart';
@@ -396,7 +395,7 @@
// If the file is a part in a library, and the part-of directive uses a URI
// rather than a library name, that will need updating too (if the relative
// path to the parent changes).
- String pathA = convertPath('/home/test/000/1111/a.dart');
+ var pathA = convertPath('/home/test/000/1111/a.dart');
testFile = convertPath('/home/test/000/1111/test.dart');
addSource(pathA, '''
part 'test.dart';
@@ -419,7 +418,7 @@
// If the file is a part in a library, and the part-of directive uses a URI
// rather than a library name, that will need updating too (if the relative
// path to the parent changes).
- String pathA = convertPath('/home/test/000/1111/a.dart');
+ var pathA = convertPath('/home/test/000/1111/a.dart');
testFile = convertPath('/home/test/000/1111/test.dart');
addSource(pathA, '''
part 'test.dart';
@@ -440,7 +439,7 @@
Future _assertFailedRefactoring(RefactoringProblemSeverity expectedSeverity,
{String expectedMessage}) async {
- RefactoringStatus status = await refactoring.checkAllConditions();
+ var status = await refactoring.checkAllConditions();
assertRefactoringStatus(status, expectedSeverity,
expectedMessage: expectedMessage);
}
diff --git a/pkg/analysis_server/test/services/refactoring/rename_class_member_test.dart b/pkg/analysis_server/test/services/refactoring/rename_class_member_test.dart
index fc05cbd..b6dacb9 100644
--- a/pkg/analysis_server/test/services/refactoring/rename_class_member_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/rename_class_member_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/src/services/correction/status.dart';
import 'package:analyzer/src/generated/source.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
@@ -27,7 +26,7 @@
createRenameRefactoringAtString('test() {}');
// check status
refactoring.newName = 'NewName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage:
"Renamed method has the same name as the declaring class 'NewName'.",
@@ -46,7 +45,7 @@
createRenameRefactoringAtString('test() {} // 1');
// check status
refactoring.newName = 'NewName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage:
"Renamed method has the same name as the declaring class 'NewName'.",
@@ -65,7 +64,7 @@
createRenameRefactoringAtString('test() {} // 2');
// check status
refactoring.newName = 'NewName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage:
"Renamed method has the same name as the declaring class 'NewName'.",
@@ -82,7 +81,7 @@
createRenameRefactoringAtString('test() {}');
// check status
refactoring.newName = 'newName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage:
"Class 'A' already declares method with name 'newName'.",
@@ -101,7 +100,7 @@
createRenameRefactoringAtString('testOld() {}');
// check status
refactoring.newName = 'test';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatusOK(status);
}
@@ -122,7 +121,7 @@
createRenameRefactoringAtString('test() {}');
// check status
refactoring.newName = 'newName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatusOK(status);
}
@@ -147,7 +146,7 @@
createRenameRefactoringAtString('bar; // declaration');
// check status
refactoring.newName = 'foo';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatusOK(status);
}
@@ -169,7 +168,7 @@
createRenameRefactoringAtString('test() {}');
// check status
refactoring.newName = '_newName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage: "Renamed method will be invisible in 'my.lib'.");
}
@@ -188,7 +187,7 @@
createRenameRefactoringAtString('test() {}');
// check status
refactoring.newName = 'newName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage:
"Usage of renamed method will be shadowed by function 'newName'.",
@@ -209,7 +208,7 @@
createRenameRefactoringAtString('test() {}');
// check status
refactoring.newName = 'newName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage:
"Usage of renamed method will be shadowed by local variable 'newName'.",
@@ -232,7 +231,7 @@
createRenameRefactoringAtString('test() {}');
// check status
refactoring.newName = 'newName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage:
"Usage of renamed method will be shadowed by local variable 'newName'.",
@@ -253,7 +252,7 @@
createRenameRefactoringAtString('test() {}');
// check status
refactoring.newName = 'newName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatusOK(status);
}
@@ -270,7 +269,7 @@
createRenameRefactoringAtString('test() {}');
// check status
refactoring.newName = 'newName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatusOK(status);
}
@@ -287,7 +286,7 @@
createRenameRefactoringAtString('test() {}');
// check status
refactoring.newName = 'newName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage:
"Usage of renamed method will be shadowed by parameter 'newName'.",
@@ -309,7 +308,7 @@
createRenameRefactoringAtString('test() {}');
// check status
refactoring.newName = 'newName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage:
"Renamed method will be shadowed by method 'B.newName'.",
@@ -333,7 +332,7 @@
createRenameRefactoringAtString('test() {}');
// check status
refactoring.newName = 'newName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage: "Renamed method will shadow field 'A.newName'.",
expectedContextSearch: 'newName; // marker');
@@ -351,7 +350,7 @@
createRenameRefactoringAtString('test() {}');
// check status
refactoring.newName = 'newName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage: "Renamed method will shadow method 'A.newName'.",
expectedContextSearch: 'newName() {} // marker');
@@ -374,7 +373,7 @@
createRenameRefactoringAtString('test() {}');
// check status
refactoring.newName = 'newName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage: "Renamed method will shadow method 'A.newName'.",
expectedContextRange: SourceRange(
@@ -390,7 +389,7 @@
createRenameRefactoringAtString('toUpperCase()');
// check status
refactoring.newName = 'NewName';
- RefactoringStatus status = await refactoring.checkInitialConditions();
+ var status = await refactoring.checkInitialConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL,
expectedMessage:
"The method 'String.toUpperCase' is defined in the SDK, so cannot be renamed.");
@@ -405,7 +404,7 @@
createRenameRefactoringAtString('-(other)');
// check status
refactoring.newName = 'newName';
- RefactoringStatus status = await refactoring.checkInitialConditions();
+ var status = await refactoring.checkInitialConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL);
}
@@ -758,7 +757,7 @@
a.newName();
}
''');
- SourceFileEdit fileEdit = refactoringChange.getFileEdit(externalPath);
+ var fileEdit = refactoringChange.getFileEdit(externalPath);
expect(fileEdit, isNull);
}
diff --git a/pkg/analysis_server/test/services/refactoring/rename_constructor_test.dart b/pkg/analysis_server/test/services/refactoring/rename_constructor_test.dart
index dc99c2b..bd45b2f 100644
--- a/pkg/analysis_server/test/services/refactoring/rename_constructor_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/rename_constructor_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/src/services/correction/status.dart';
import 'package:analysis_server/src/services/refactoring/refactoring.dart';
import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/element/element.dart';
@@ -29,7 +28,7 @@
createRenameRefactoringAtString('fromCharCodes(');
// check status
refactoring.newName = 'newName';
- RefactoringStatus status = await refactoring.checkInitialConditions();
+ var status = await refactoring.checkInitialConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL,
expectedMessage:
"The constructor 'String.fromCharCodes' is defined in the SDK, so cannot be renamed.");
@@ -72,7 +71,7 @@
_createConstructorDeclarationRefactoring('test() {}');
// check status
refactoring.newName = 'newName';
- RefactoringStatus status = refactoring.checkNewName();
+ var status = refactoring.checkNewName();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage:
"Class 'A' already declares constructor with name 'newName'.",
@@ -89,7 +88,7 @@
_createConstructorDeclarationRefactoring('test() {}');
// check status
refactoring.newName = 'newName';
- RefactoringStatus status = refactoring.checkNewName();
+ var status = refactoring.checkNewName();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage:
"Class 'A' already declares method with name 'newName'.",
diff --git a/pkg/analysis_server/test/services/refactoring/rename_extension_member_test.dart b/pkg/analysis_server/test/services/refactoring/rename_extension_member_test.dart
index 87c9044..c61686d 100644
--- a/pkg/analysis_server/test/services/refactoring/rename_extension_member_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/rename_extension_member_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/src/services/correction/status.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -33,7 +32,7 @@
createRenameRefactoringAtString('test() {}');
// check status
refactoring.newName = 'newName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage:
"Extension 'E' already declares method with name 'newName'.",
@@ -49,7 +48,7 @@
createRenameRefactoringAtString('testOld() {}');
// check status
refactoring.newName = 'test';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatusOK(status);
}
@@ -67,7 +66,7 @@
createRenameRefactoringAtString('test() {}');
// check status
refactoring.newName = 'newName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(
status,
RefactoringProblemSeverity.ERROR,
@@ -91,7 +90,7 @@
createRenameRefactoringAtString('test() {}');
// check status
refactoring.newName = 'newName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(
status,
RefactoringProblemSeverity.ERROR,
@@ -114,7 +113,7 @@
createRenameRefactoringAtString('test() {}');
// check status
refactoring.newName = 'newName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(
status,
RefactoringProblemSeverity.ERROR,
@@ -133,7 +132,7 @@
createRenameRefactoringAtString('-(other)');
// check status
refactoring.newName = 'newName';
- RefactoringStatus status = await refactoring.checkInitialConditions();
+ var status = await refactoring.checkInitialConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL);
}
diff --git a/pkg/analysis_server/test/services/refactoring/rename_local_test.dart b/pkg/analysis_server/test/services/refactoring/rename_local_test.dart
index 74f8c37..b0d2aff 100644
--- a/pkg/analysis_server/test/services/refactoring/rename_local_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/rename_local_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/src/services/correction/status.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -27,7 +26,7 @@
createRenameRefactoringAtString('test = 0');
// check status
refactoring.newName = 'newName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage: "Duplicate function 'newName'.",
expectedContextSearch: 'newName() => 1');
@@ -43,7 +42,7 @@
createRenameRefactoringAtString('test = 0');
// check status
refactoring.newName = 'newName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage: "Duplicate function 'newName'.");
}
@@ -59,7 +58,7 @@
createRenameRefactoringAtString('test = 0');
// check status
refactoring.newName = 'newName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
expect(status.problems, hasLength(1));
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage: "Duplicate local variable 'newName'.",
@@ -76,7 +75,7 @@
createRenameRefactoringAtString('test = 0');
// check status
refactoring.newName = 'newName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage: "Duplicate local variable 'newName'.",
expectedContextSearch: 'newName = 1;');
@@ -155,7 +154,7 @@
createRenameRefactoringAtString('test = 0');
// check status
refactoring.newName = 'newName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage: 'Usage of field "A.newName" declared in "test.dart" '
'will be shadowed by renamed local variable.',
@@ -179,7 +178,7 @@
createRenameRefactoringAtString('test: 1}) { // in A');
// check status
refactoring.newName = 'newName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage: 'Usage of field "B.newName" declared in "test.dart" '
'will be shadowed by renamed parameter.',
@@ -229,7 +228,7 @@
createRenameRefactoringAtString('test = 0');
// check status
refactoring.newName = 'newName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedContextSearch: 'newName(); // ref');
}
diff --git a/pkg/analysis_server/test/services/refactoring/rename_unit_member_test.dart b/pkg/analysis_server/test/services/refactoring/rename_unit_member_test.dart
index d78f249..5ddd748 100644
--- a/pkg/analysis_server/test/services/refactoring/rename_unit_member_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/rename_unit_member_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/src/services/correction/status.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -25,7 +24,7 @@
createRenameRefactoringAtString('Test {}');
// check status
refactoring.newName = 'NewName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage: "Library already declares class with name 'NewName'.",
expectedContextSearch: 'NewName {} // existing');
@@ -40,7 +39,7 @@
createRenameRefactoringAtString('Test {}');
// check status
refactoring.newName = 'NewName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage:
"Library already declares function type alias with name 'NewName'.",
@@ -63,7 +62,7 @@
createRenameRefactoringAtString('Test {}');
// check status
refactoring.newName = 'NewName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatusOK(status);
}
@@ -83,7 +82,7 @@
createRenameRefactoringAtString('Test {}');
// check status
refactoring.newName = '_NewName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage: "Renamed class will be invisible in 'my.lib'.");
}
@@ -101,7 +100,7 @@
createRenameRefactoringAtString('Test {}');
// check status
refactoring.newName = 'NewName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage:
"Reference to renamed class will be shadowed by method 'A.NewName'.",
@@ -127,7 +126,7 @@
createRenameRefactoringAtString('Test {}');
// check status
refactoring.newName = 'NewName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage: "Renamed class will shadow method 'A.NewName'.");
}
@@ -152,7 +151,7 @@
createRenameRefactoringAtString('Test {}');
// check status
refactoring.newName = 'NewName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatusOK(status);
}
@@ -172,7 +171,7 @@
createRenameRefactoringAtString('Test {}');
// check status
refactoring.newName = 'NewName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.ERROR,
expectedMessage: "Renamed class will shadow method 'A.NewName'.",
expectedContextSearch: 'NewName(); // super-ref');
@@ -197,7 +196,7 @@
createRenameRefactoringAtString('Test {}');
// check status
refactoring.newName = 'NewName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatusOK(status);
}
@@ -216,7 +215,7 @@
createRenameRefactoringAtString('Test {}');
// check status
refactoring.newName = 'NewName';
- RefactoringStatus status = await refactoring.checkFinalConditions();
+ var status = await refactoring.checkFinalConditions();
assertRefactoringStatusOK(status);
}
@@ -229,7 +228,7 @@
createRenameRefactoringAtString('String s');
// check status
refactoring.newName = 'NewName';
- RefactoringStatus status = await refactoring.checkInitialConditions();
+ var status = await refactoring.checkInitialConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL,
expectedMessage:
"The class 'String' is defined in the SDK, so cannot be renamed.");
@@ -248,7 +247,7 @@
createRenameRefactoringAtString('A a');
// check status
refactoring.newName = 'NewName';
- RefactoringStatus status = await refactoring.checkInitialConditions();
+ var status = await refactoring.checkInitialConditions();
assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL,
expectedMessage:
"The class 'A' is defined outside of the project, so cannot be renamed.");
diff --git a/pkg/analysis_server/test/services/search/hierarchy_test.dart b/pkg/analysis_server/test/services/search/hierarchy_test.dart
index 333b02a..8aba26f 100644
--- a/pkg/analysis_server/test/services/search/hierarchy_test.dart
+++ b/pkg/analysis_server/test/services/search/hierarchy_test.dart
@@ -44,12 +44,12 @@
''');
{
ClassElement classA = findElement('A');
- List<Element> members = getClassMembers(classA);
+ var members = getClassMembers(classA);
expect(members.map((e) => e.name), unorderedEquals(['ma1', 'ma2']));
}
{
ClassElement classB = findElement('B');
- List<Element> members = getClassMembers(classB);
+ var members = getClassMembers(classB);
expect(members.map((e) => e.name), unorderedEquals(['mb1', 'mb2']));
}
}
@@ -133,18 +133,15 @@
ClassMemberElement memberB = classB.fields[0];
ClassMemberElement memberC = classC.fields[0];
{
- Set<ClassMemberElement> members =
- await getHierarchyMembers(searchEngine, memberA);
+ var members = await getHierarchyMembers(searchEngine, memberA);
expect(members, unorderedEquals([memberA]));
}
{
- Set<ClassMemberElement> members =
- await getHierarchyMembers(searchEngine, memberB);
+ var members = await getHierarchyMembers(searchEngine, memberB);
expect(members, unorderedEquals([memberB]));
}
{
- Set<ClassMemberElement> members =
- await getHierarchyMembers(searchEngine, memberC);
+ var members = await getHierarchyMembers(searchEngine, memberC);
expect(members, unorderedEquals([memberC]));
}
}
@@ -209,13 +206,11 @@
ClassMemberElement memberA = classA.methods[0];
ClassMemberElement memberB = classB.methods[0];
{
- Set<ClassMemberElement> members =
- await getHierarchyMembers(searchEngine, memberA);
+ var members = await getHierarchyMembers(searchEngine, memberA);
expect(members, unorderedEquals([memberA]));
}
{
- Set<ClassMemberElement> members =
- await getHierarchyMembers(searchEngine, memberB);
+ var members = await getHierarchyMembers(searchEngine, memberB);
expect(members, unorderedEquals([memberB]));
}
}
@@ -278,11 +273,11 @@
ClassElement classC = findElement('C');
ClassElement classD = findElement('D');
ClassElement classE = findElement('E');
- ParameterElement parameterA = classA.methods[0].parameters[0];
- ParameterElement parameterB = classB.methods[0].parameters[0];
- ParameterElement parameterC = classC.methods[0].parameters[0];
- ParameterElement parameterD = classD.methods[0].parameters[0];
- ParameterElement parameterE = classE.methods[0].parameters[0];
+ var parameterA = classA.methods[0].parameters[0];
+ var parameterB = classB.methods[0].parameters[0];
+ var parameterC = classC.methods[0].parameters[0];
+ var parameterD = classD.methods[0].parameters[0];
+ var parameterE = classE.methods[0].parameters[0];
{
var result = await getHierarchyNamedParameters(searchEngine, parameterA);
@@ -321,7 +316,7 @@
}
''');
ClassElement classA = findElement('A');
- ParameterElement parameterA = classA.methods[0].parameters[0];
+ var parameterA = classA.methods[0].parameters[0];
var result = await getHierarchyNamedParameters(searchEngine, parameterA);
expect(result, unorderedEquals([parameterA]));
@@ -338,7 +333,7 @@
}
''');
ClassElement classA = findElement('A');
- ParameterElement parameterA = classA.methods[0].parameters[0];
+ var parameterA = classA.methods[0].parameters[0];
var result = await getHierarchyNamedParameters(searchEngine, parameterA);
expect(result, unorderedEquals([parameterA]));
@@ -360,7 +355,7 @@
''');
{
ClassElement classA = findElement('A');
- List<Element> members = getMembers(classA);
+ var members = getMembers(classA);
expect(
members.map((e) => e.name),
unorderedEquals([
@@ -375,7 +370,7 @@
}
{
ClassElement classB = findElement('B');
- List<Element> members = getMembers(classB);
+ var members = getMembers(classB);
expect(
members.map((e) => e.name),
unorderedEquals([
@@ -408,40 +403,40 @@
ClassElement classD = findElement('D');
ClassElement classE = findElement('E');
ClassElement classF = findElement('F');
- ClassElement objectElement = classA.supertype.element;
+ var objectElement = classA.supertype.element;
// Object
{
- Set<ClassElement> supers = getSuperClasses(objectElement);
+ var supers = getSuperClasses(objectElement);
expect(supers, isEmpty);
}
// A
{
- Set<ClassElement> supers = getSuperClasses(classA);
+ var supers = getSuperClasses(classA);
expect(supers, unorderedEquals([objectElement]));
}
// B
{
- Set<ClassElement> supers = getSuperClasses(classB);
+ var supers = getSuperClasses(classB);
expect(supers, unorderedEquals([objectElement, classA]));
}
// C
{
- Set<ClassElement> supers = getSuperClasses(classC);
+ var supers = getSuperClasses(classC);
expect(supers, unorderedEquals([objectElement, classA, classB]));
}
// D
{
- Set<ClassElement> supers = getSuperClasses(classD);
+ var supers = getSuperClasses(classD);
expect(supers, unorderedEquals([objectElement, classA, classB]));
}
// E
{
- Set<ClassElement> supers = getSuperClasses(classE);
+ var supers = getSuperClasses(classE);
expect(supers, unorderedEquals([objectElement, classA]));
}
// F
{
- Set<ClassElement> supers = getSuperClasses(classF);
+ var supers = getSuperClasses(classF);
expect(supers, unorderedEquals([objectElement, classA]));
}
}
@@ -466,7 +461,7 @@
ClassElement m3 = findElement('M3');
ClassElement m4 = findElement('M4');
ClassElement m5 = findElement('M5');
- ClassElement object = a.supertype.element;
+ var object = a.supertype.element;
_assertSuperClasses(object, []);
_assertSuperClasses(a, [object]);
diff --git a/pkg/analysis_server/test/services/search/search_engine_test.dart b/pkg/analysis_server/test/services/search/search_engine_test.dart
index b09dfac..b88c020 100644
--- a/pkg/analysis_server/test/services/search/search_engine_test.dart
+++ b/pkg/analysis_server/test/services/search/search_engine_test.dart
@@ -76,10 +76,10 @@
await scheduler.waitForIdle();
var resultA = await driver1.getResult(a);
- ClassElement elementA = resultA.unit.declaredElement.types[0];
+ var elementA = resultA.unit.declaredElement.types[0];
var searchEngine = SearchEngineImpl([driver1, driver2]);
- Set<String> members = await searchEngine.membersOfSubtypes(elementA);
+ var members = await searchEngine.membersOfSubtypes(elementA);
expect(members, unorderedEquals(['a', 'b']));
}
@@ -103,10 +103,10 @@
await scheduler.waitForIdle();
var resultA = await driver.getResult(a);
- ClassElement elementA = resultA.unit.declaredElement.types[0];
+ var elementA = resultA.unit.declaredElement.types[0];
var searchEngine = SearchEngineImpl([driver]);
- Set<String> members = await searchEngine.membersOfSubtypes(elementA);
+ var members = await searchEngine.membersOfSubtypes(elementA);
expect(members, isEmpty);
}
@@ -132,10 +132,10 @@
await scheduler.waitForIdle();
var resultA = await driver.getResult(a);
- ClassElement elementA = resultA.unit.declaredElement.types[0];
+ var elementA = resultA.unit.declaredElement.types[0];
var searchEngine = SearchEngineImpl([driver]);
- Set<String> members = await searchEngine.membersOfSubtypes(elementA);
+ var members = await searchEngine.membersOfSubtypes(elementA);
expect(members, isNull);
}
@@ -169,10 +169,10 @@
await scheduler.waitForIdle();
var resultA = await driver1.getResult(a);
- ClassElement elementA = resultA.unit.declaredElement.types[0];
+ var elementA = resultA.unit.declaredElement.types[0];
var searchEngine = SearchEngineImpl([driver1, driver2]);
- Set<String> members = await searchEngine.membersOfSubtypes(elementA);
+ var members = await searchEngine.membersOfSubtypes(elementA);
expect(members, unorderedEquals(['a', '_b']));
}
@@ -188,10 +188,10 @@
driver.addFile(p);
var resultA = await driver.getResult(p);
- ClassElement element = resultA.unit.declaredElement.types[0];
+ var element = resultA.unit.declaredElement.types[0];
var searchEngine = SearchEngineImpl([driver]);
- Set<ClassElement> subtypes = await searchEngine.searchAllSubtypes(element);
+ var subtypes = await searchEngine.searchAllSubtypes(element);
expect(subtypes, hasLength(3));
_assertContainsClass(subtypes, 'A');
_assertContainsClass(subtypes, 'B');
@@ -216,10 +216,10 @@
driver2.addFile(b);
var resultA = await driver1.getResult(a);
- ClassElement element = resultA.unit.declaredElement.types[0];
+ var element = resultA.unit.declaredElement.types[0];
var searchEngine = SearchEngineImpl([driver1, driver2]);
- Set<ClassElement> subtypes = await searchEngine.searchAllSubtypes(element);
+ var subtypes = await searchEngine.searchAllSubtypes(element);
expect(subtypes, hasLength(3));
expect(subtypes, contains(predicate((ClassElement e) => e.name == 'A')));
expect(subtypes, contains(predicate((ClassElement e) => e.name == 'B')));
@@ -243,10 +243,10 @@
driver.addFile(p);
var resultA = await driver.getResult(p);
- ClassElement element = resultA.unit.declaredElement.types[0];
+ var element = resultA.unit.declaredElement.types[0];
var searchEngine = SearchEngineImpl([driver]);
- Set<ClassElement> subtypes = await searchEngine.searchAllSubtypes(element);
+ var subtypes = await searchEngine.searchAllSubtypes(element);
expect(subtypes, hasLength(5));
_assertContainsClass(subtypes, 'A');
_assertContainsClass(subtypes, 'B');
@@ -284,8 +284,7 @@
}
var searchEngine = SearchEngineImpl([driver1, driver2]);
- List<SearchMatch> matches =
- await searchEngine.searchMemberDeclarations('test');
+ var matches = await searchEngine.searchMemberDeclarations('test');
expect(matches, hasLength(2));
void assertHasElement(String name, int nameOffset) {
@@ -324,8 +323,7 @@
driver2.addFile(b);
var searchEngine = SearchEngineImpl([driver1, driver2]);
- List<SearchMatch> matches =
- await searchEngine.searchMemberReferences('test');
+ var matches = await searchEngine.searchMemberReferences('test');
expect(matches, hasLength(2));
expect(
matches,
@@ -354,10 +352,10 @@
driver2.addFile(b);
var resultA = await driver1.getResult(a);
- ClassElement element = resultA.unit.declaredElement.types[0];
+ var element = resultA.unit.declaredElement.types[0];
var searchEngine = SearchEngineImpl([driver1, driver2]);
- List<SearchMatch> matches = await searchEngine.searchReferences(element);
+ var matches = await searchEngine.searchReferences(element);
expect(matches, hasLength(2));
expect(
matches, contains(predicate((SearchMatch m) => m.element.name == 'a')));
@@ -380,8 +378,8 @@
driver1.addFile(t);
driver2.addFile(a);
- LibraryElement coreLib = await driver1.getLibraryByUri('dart:core');
- ClassElement intElement = coreLib.getType('int');
+ var coreLib = await driver1.getLibraryByUri('dart:core');
+ var intElement = coreLib.getType('int');
var searchEngine = SearchEngineImpl([driver1, driver2]);
var matches = await searchEngine.searchReferences(intElement);
@@ -423,7 +421,7 @@
expect(matches, hasLength(4));
void assertHasOneElement(String name) {
- Iterable<SearchMatch> nameMatches = matches.where((SearchMatch m) =>
+ var nameMatches = matches.where((SearchMatch m) =>
m.kind == MatchKind.DECLARATION && m.element.name == name);
expect(nameMatches, hasLength(1));
}
@@ -455,15 +453,14 @@
}
var searchEngine = SearchEngineImpl([driver1, driver2]);
- List<SearchMatch> matches =
- await searchEngine.searchTopLevelDeclarations('.*');
+ var matches = await searchEngine.searchTopLevelDeclarations('.*');
// We get exactly two items: A and B.
// I.e. we get exactly one A.
expect(
matches.where((match) => !match.libraryElement.isInSdk), hasLength(2));
void assertHasOneElement(String name) {
- Iterable<SearchMatch> nameMatches = matches.where((SearchMatch m) =>
+ var nameMatches = matches.where((SearchMatch m) =>
m.kind == MatchKind.DECLARATION && m.element.name == name);
expect(nameMatches, hasLength(1));
}
diff --git a/pkg/analysis_server/test/socket_server_test.dart b/pkg/analysis_server/test/socket_server_test.dart
index a2ede5d..260bf0b 100644
--- a/pkg/analysis_server/test/socket_server_test.dart
+++ b/pkg/analysis_server/test/socket_server_test.dart
@@ -30,9 +30,9 @@
class SocketServerTest {
static void createAnalysisServer_alreadyStarted() {
- MockServerChannel channel1 = MockServerChannel();
- MockServerChannel channel2 = MockServerChannel();
- SocketServer server = _createSocketServer(channel1);
+ var channel1 = MockServerChannel();
+ var channel2 = MockServerChannel();
+ var server = _createSocketServer(channel1);
expect(
channel1.notificationsReceived[0].event, SERVER_NOTIFICATION_CONNECTED);
server.createAnalysisServer(channel2);
@@ -54,7 +54,7 @@
}
static Future createAnalysisServer_successful() {
- MockServerChannel channel = MockServerChannel();
+ var channel = MockServerChannel();
_createSocketServer(channel);
channel.expectMsgCount(notificationCount: 1);
expect(
@@ -69,12 +69,12 @@
}
static Future requestHandler_exception() {
- MockServerChannel channel = MockServerChannel();
- SocketServer server = _createSocketServer(channel);
+ var channel = MockServerChannel();
+ var server = _createSocketServer(channel);
channel.expectMsgCount(notificationCount: 1);
expect(
channel.notificationsReceived[0].event, SERVER_NOTIFICATION_CONNECTED);
- _MockRequestHandler handler = _MockRequestHandler(false);
+ var handler = _MockRequestHandler(false);
server.analysisServer.handlers = [handler];
var request = ServerGetVersionParams().toRequest('0');
return channel.sendRequest(request).then((Response response) {
@@ -89,12 +89,12 @@
}
static Future requestHandler_futureException() async {
- MockServerChannel channel = MockServerChannel();
- SocketServer server = _createSocketServer(channel);
- _MockRequestHandler handler = _MockRequestHandler(true);
+ var channel = MockServerChannel();
+ var server = _createSocketServer(channel);
+ var handler = _MockRequestHandler(true);
server.analysisServer.handlers = [handler];
var request = ServerGetVersionParams().toRequest('0');
- Response response = await channel.sendRequest(request, throwOnError: false);
+ var response = await channel.sendRequest(request, throwOnError: false);
expect(response.id, equals('0'));
expect(response.error, isNull);
channel.expectMsgCount(responseCount: 1, notificationCount: 2);
diff --git a/pkg/analysis_server/test/src/computer/closing_labels_computer_test.dart b/pkg/analysis_server/test/src/computer/closing_labels_computer_test.dart
index b3783bb..ba1761d 100644
--- a/pkg/analysis_server/test/src/computer/closing_labels_computer_test.dart
+++ b/pkg/analysis_server/test/src/computer/closing_labels_computer_test.dart
@@ -6,7 +6,6 @@
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analysis_server/src/computer/computer_closingLabels.dart';
-import 'package:analyzer/dart/analysis/results.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -29,7 +28,7 @@
}
Future<void> test_adjacentLinesExcluded() async {
- String content = '''
+ var content = '''
void myMethod() {
return /*1*/new Wrapper(
/*2*/new Thing(1,
@@ -46,7 +45,7 @@
/// of the expression and not where the opening paren is, so this test ensures we
/// don't end up with lots of unwanted labels on each line here.
Future<void> test_chainedConstructorOverManyLines() async {
- String content = '''
+ var content = '''
main() {
return new thing
.whatIsSplit
@@ -62,7 +61,7 @@
/// of the expression and not where the opening paren is, so this test ensures we
/// don't end up with lots of unwanted labels on each line here.
Future<void> test_chainedMethodsOverManyLines() async {
- String content = '''
+ var content = '''
List<ClosingLabel> compute() {
_unit.accept(new _DartUnitClosingLabelsComputerVisitor(this));
return _closingLabelsByEndLine.values
@@ -78,7 +77,7 @@
}
Future<void> test_constConstructor() async {
- String content = '''
+ var content = '''
void myMethod() {
return /*1*/new Wrapper(
/*2*/const Class(
@@ -94,7 +93,7 @@
}
Future<void> test_constNamedConstructor() async {
- String content = '''
+ var content = '''
void myMethod() {
return /*1*/new Wrapper(
/*2*/const Class.fromThing(
@@ -111,7 +110,7 @@
Future<void> test_knownBadCode1() async {
// This code crashed during testing when I accidentally inserted a test snippet.
- String content = """
+ var content = """
@override
Widget build(BuildContext context) {
new SliverGrid(
@@ -139,7 +138,7 @@
}
Future<void> test_labelsShownForMultipleElements() async {
- String content = '''
+ var content = '''
Widget build(BuildContext context) {
return /*1*/new Row(
child: new RaisedButton(),
@@ -152,7 +151,7 @@
}
Future<void> test_labelsShownForMultipleElements_2() async {
- String content = '''
+ var content = '''
Widget build(BuildContext context) {
return /*1*/new Row(
child: /*2*/new RaisedButton(
@@ -167,7 +166,7 @@
}
Future<void> test_listLiterals() async {
- String content = '''
+ var content = '''
void myMethod() {
return /*1*/new Wrapper(
Widget.createWidget(/*2*/<Widget>[
@@ -186,7 +185,7 @@
/// other labels that end on the same line, even if they are 1-2 lines, otherwise
/// it isn't obvious which closing bracket goes with the label.
Future<void> test_mixedLineSpanning() async {
- String content = '''
+ var content = '''
main() {
/*1*/new Foo((m) {
/*2*/new Bar(
@@ -203,7 +202,7 @@
}
Future<void> test_multipleNested() async {
- String content = """
+ var content = """
Widget build(BuildContext context) {
return /*1*/new Row(
children: /*2*/<Widget>[
@@ -227,7 +226,7 @@
}
Future<void> test_newConstructor() async {
- String content = '''
+ var content = '''
void myMethod() {
return /*1*/new Wrapper(
/*2*/new Class(
@@ -243,7 +242,7 @@
}
Future<void> test_newNamedConstructor() async {
- String content = '''
+ var content = '''
void myMethod() {
return /*1*/new Wrapper(
/*2*/new Class.fromThing(
@@ -259,7 +258,7 @@
}
Future<void> test_noLabelsForOneElement() async {
- String content = '''
+ var content = '''
Widget build(BuildContext context) {
return new Row(
);
@@ -271,7 +270,7 @@
}
Future<void> test_NoLabelsFromInterpolatedStrings() async {
- String content = """
+ var content = """
void main(HighlightRegionType type, int offset, int length) {
/*1*/new Wrapper(
/*2*/new Fail(
@@ -286,7 +285,7 @@
}
Future<void> test_prefixedConstConstructor() async {
- String content = """
+ var content = """
import 'dart:async' as a;
void myMethod() {
return /*1*/new Wrapper(
@@ -303,7 +302,7 @@
}
Future<void> test_prefixedConstNamedConstructor() async {
- String content = """
+ var content = """
import 'dart:async' as a;
void myMethod() {
return /*1*/new Wrapper(
@@ -320,7 +319,7 @@
}
Future<void> test_prefixedNewConstructor() async {
- String content = """
+ var content = """
import 'dart:async' as a;
void myMethod() {
return /*1*/new Wrapper(
@@ -337,7 +336,7 @@
}
Future<void> test_prefixedNewNamedConstructor() async {
- String content = """
+ var content = """
import 'dart:async' as a;
void myMethod() {
return /*1*/new Wrapper(
@@ -354,7 +353,7 @@
}
Future<void> test_sameLineExcluded() async {
- String content = '''
+ var content = '''
void myMethod() {
return new Thing();
}
@@ -399,9 +398,8 @@
Future<List<ClosingLabel>> _computeElements(String sourceContent) async {
newFile(sourcePath, content: sourceContent);
- ResolvedUnitResult result = await session.getResolvedUnit(sourcePath);
- DartUnitClosingLabelsComputer computer =
- DartUnitClosingLabelsComputer(result.lineInfo, result.unit);
+ var result = await session.getResolvedUnit(sourcePath);
+ var computer = DartUnitClosingLabelsComputer(result.lineInfo, result.unit);
return computer.compute();
}
}
diff --git a/pkg/analysis_server/test/src/computer/folding_computer_test.dart b/pkg/analysis_server/test/src/computer/folding_computer_test.dart
index fbe1015..935dd8d 100644
--- a/pkg/analysis_server/test/src/computer/folding_computer_test.dart
+++ b/pkg/analysis_server/test/src/computer/folding_computer_test.dart
@@ -6,7 +6,6 @@
import 'package:analysis_server/src/computer/computer_folding.dart';
import 'package:analysis_server/src/protocol_server.dart';
-import 'package:analyzer/dart/analysis/results.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -29,7 +28,7 @@
}
Future<void> test_annotations() async {
- String content = '''
+ var content = '''
@myMultilineAnnotation/*1:INC*/(
"this",
"is a test"
@@ -80,7 +79,7 @@
}
Future<void> test_assertInitializer() async {
- String content = '''
+ var content = '''
class C {/*1:INC*/
C() : assert(/*2:INC*/
true,
@@ -93,7 +92,7 @@
}
Future<void> test_assertStatement() async {
- String content = '''
+ var content = '''
main() {/*1:INC*/
assert(/*2:INC*/
true,
@@ -106,7 +105,7 @@
}
Future<void> test_class() async {
- String content = '''
+ var content = '''
// Content before
class Person {/*1:INC*/
@@ -127,7 +126,7 @@
}
Future<void> test_comment_is_not_considered_file_header() async {
- String content = """
+ var content = """
// This is not the file header
// It's just a comment
main() {}
@@ -140,7 +139,7 @@
}
Future<void> test_constructor_invocations() async {
- String content = '''
+ var content = '''
// Content before
main() {/*1:INC*/
@@ -157,7 +156,7 @@
}
Future<void> test_file_header() async {
- String content = """
+ var content = """
// Copyright some year by some people/*1:EXC*/
// See LICENCE etc./*1:INC:FILE_HEADER*/
@@ -171,7 +170,7 @@
}
Future<void> test_file_header_does_not_include_block_comments() async {
- String content = """
+ var content = """
/*
* Copyright some year by some people
* See LICENCE etc.
@@ -186,7 +185,7 @@
}
Future<void> test_file_header_with_no_function_comment() async {
- String content = '''
+ var content = '''
// Copyright some year by some people/*1:EXC*/
// See LICENCE etc./*1:INC:FILE_HEADER*/
@@ -198,7 +197,7 @@
}
Future<void> test_file_header_with_non_end_of_line_comment() async {
- String content = """
+ var content = """
// Copyright some year by some people/*1:EXC*/
// See LICENCE etc./*1:INC:FILE_HEADER*/
/* This shouldn't be part of the file header */
@@ -211,7 +210,7 @@
}
Future<void> test_file_header_with_script_prefix() async {
- String content = """
+ var content = """
#! /usr/bin/dart
// Copyright some year by some people/*1:EXC*/
// See LICENCE etc./*1:INC:FILE_HEADER*/
@@ -226,7 +225,7 @@
}
Future<void> test_function() async {
- String content = '''
+ var content = '''
// Content before
main() {/*1:INC*/
@@ -241,7 +240,7 @@
}
Future<void> test_function_expression_invocation() async {
- String content = '''
+ var content = '''
// Content before
getFunc() => (String a, String b) {/*1:INC*/
@@ -263,7 +262,7 @@
}
Future<void> test_function_with_dart_doc() async {
- String content = '''
+ var content = '''
// Content before
/*1:EXC*//// This is a doc comment
@@ -280,7 +279,7 @@
}
Future<void> test_invocations() async {
- String content = '''
+ var content = '''
// Content before
main() {/*1:INC*/
@@ -297,7 +296,7 @@
}
Future<void> test_literal_list() async {
- String content = '''
+ var content = '''
// Content before
main() {/*1:INC*/
@@ -315,7 +314,7 @@
}
Future<void> test_literal_map() async {
- String content = '''
+ var content = '''
// Content before
main2() {/*1:INC*/
@@ -333,7 +332,7 @@
}
Future<void> test_mixin() async {
- String content = '''
+ var content = '''
// Content before
mixin M {/*1:INC*/
@@ -350,7 +349,7 @@
}
Future<void> test_multiple_directive_types() async {
- String content = """
+ var content = """
import/*1:INC*/ 'dart:async';
// We can have comments
@@ -367,7 +366,7 @@
}
Future<void> test_multiple_import_directives() async {
- String content = """
+ var content = """
import/*1:INC*/ 'dart:async';
// We can have comments
@@ -384,7 +383,7 @@
}
Future<void> test_nested_function() async {
- String content = '''
+ var content = '''
// Content before
main() {/*1:INC*/
@@ -402,7 +401,7 @@
}
Future<void> test_nested_invocations() async {
- String content = '''
+ var content = '''
// Content before
main() {/*1:INC*/
@@ -423,7 +422,7 @@
}
Future<void> test_single_import_directives() async {
- String content = """
+ var content = """
import 'dart:async';
main() {}
@@ -473,9 +472,8 @@
Future<List<FoldingRegion>> _computeRegions(String sourceContent) async {
newFile(sourcePath, content: sourceContent);
- ResolvedUnitResult result = await session.getResolvedUnit(sourcePath);
- DartUnitFoldingComputer computer =
- DartUnitFoldingComputer(result.lineInfo, result.unit);
+ var result = await session.getResolvedUnit(sourcePath);
+ var computer = DartUnitFoldingComputer(result.lineInfo, result.unit);
return computer.compute();
}
}
diff --git a/pkg/analysis_server/test/src/computer/highlights2_computer_test.dart b/pkg/analysis_server/test/src/computer/highlights2_computer_test.dart
index 6579b8d..922c42e 100644
--- a/pkg/analysis_server/test/src/computer/highlights2_computer_test.dart
+++ b/pkg/analysis_server/test/src/computer/highlights2_computer_test.dart
@@ -6,7 +6,6 @@
import 'package:analysis_server/src/computer/computer_highlights2.dart';
import 'package:analysis_server/src/protocol_server.dart';
-import 'package:analyzer/dart/analysis/results.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -68,9 +67,9 @@
void _check(HighlightRegionType expectedType, String expectedText) {
for (var region in highlights) {
if (region.type == expectedType) {
- int startIndex = region.offset;
- int endIndex = startIndex + region.length;
- String highlightedText = content.substring(startIndex, endIndex);
+ var startIndex = region.offset;
+ var endIndex = startIndex + region.length;
+ var highlightedText = content.substring(startIndex, endIndex);
if (highlightedText == expectedText) {
return;
}
@@ -85,7 +84,7 @@
}) async {
this.content = content;
newFile(sourcePath, content: content);
- ResolvedUnitResult result = await session.getResolvedUnit(sourcePath);
+ var result = await session.getResolvedUnit(sourcePath);
if (hasErrors) {
expect(result.errors, isNotEmpty);
@@ -93,8 +92,7 @@
expect(result.errors, isEmpty);
}
- DartUnitHighlightsComputer2 computer =
- DartUnitHighlightsComputer2(result.unit);
+ var computer = DartUnitHighlightsComputer2(result.unit);
highlights = computer.compute();
}
}
diff --git a/pkg/analysis_server/test/src/computer/highlights_computer_test.dart b/pkg/analysis_server/test/src/computer/highlights_computer_test.dart
index 36860bd..f145825 100644
--- a/pkg/analysis_server/test/src/computer/highlights_computer_test.dart
+++ b/pkg/analysis_server/test/src/computer/highlights_computer_test.dart
@@ -6,7 +6,6 @@
import 'package:analysis_server/src/computer/computer_highlights.dart';
import 'package:analysis_server/src/protocol_server.dart';
-import 'package:analyzer/dart/analysis/results.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -54,9 +53,9 @@
void _check(HighlightRegionType expectedType, String expectedText) {
for (var region in highlights) {
if (region.type == expectedType) {
- int startIndex = region.offset;
- int endIndex = startIndex + region.length;
- String highlightedText = content.substring(startIndex, endIndex);
+ var startIndex = region.offset;
+ var endIndex = startIndex + region.length;
+ var highlightedText = content.substring(startIndex, endIndex);
if (highlightedText == expectedText) {
return;
}
@@ -71,7 +70,7 @@
}) async {
this.content = content;
newFile(sourcePath, content: content);
- ResolvedUnitResult result = await session.getResolvedUnit(sourcePath);
+ var result = await session.getResolvedUnit(sourcePath);
if (hasErrors) {
expect(result.errors, isNotEmpty);
@@ -79,8 +78,7 @@
expect(result.errors, isEmpty);
}
- DartUnitHighlightsComputer computer =
- DartUnitHighlightsComputer(result.unit);
+ var computer = DartUnitHighlightsComputer(result.unit);
highlights = computer.compute();
}
}
diff --git a/pkg/analysis_server/test/src/computer/import_elements_computer_test.dart b/pkg/analysis_server/test/src/computer/import_elements_computer_test.dart
index 2fe414a..fd511a0 100644
--- a/pkg/analysis_server/test/src/computer/import_elements_computer_test.dart
+++ b/pkg/analysis_server/test/src/computer/import_elements_computer_test.dart
@@ -6,7 +6,6 @@
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analysis_server/src/computer/import_elements_computer.dart';
-import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -27,7 +26,7 @@
SourceFileEdit sourceFileEdit;
void assertChanges(String expectedContent) {
- String resultCode =
+ var resultCode =
SourceEdit.applySequence(originalContent, sourceFileEdit.edits);
expect(resultCode, expectedContent);
}
@@ -37,9 +36,9 @@
}
Future<void> computeChanges(List<ImportedElements> importedElements) async {
- SourceChange change = await computer.createEdits(importedElements);
+ var change = await computer.createEdits(importedElements);
expect(change, isNotNull);
- List<SourceFileEdit> edits = change.edits;
+ var edits = change.edits;
if (edits.length == 1) {
sourceFileEdit = edits[0];
expect(sourceFileEdit, isNotNull);
@@ -51,7 +50,7 @@
Future<void> createBuilder(String content) async {
originalContent = content;
newFile(path, content: content);
- ResolvedUnitResult result = await session.getResolvedUnit(path);
+ var result = await session.getResolvedUnit(path);
computer = ImportElementsComputer(resourceProvider, result);
}
diff --git a/pkg/analysis_server/test/src/computer/imported_elements_computer_test.dart b/pkg/analysis_server/test/src/computer/imported_elements_computer_test.dart
index b7c07c7..c4a6a06 100644
--- a/pkg/analysis_server/test/src/computer/imported_elements_computer_test.dart
+++ b/pkg/analysis_server/test/src/computer/imported_elements_computer_test.dart
@@ -6,7 +6,6 @@
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analysis_server/src/computer/imported_elements_computer.dart';
-import 'package:analyzer/dart/analysis/results.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -26,10 +25,10 @@
void assertElements(List<ImportedElements> expectedElementsList) {
expect(importedElements, hasLength(expectedElementsList.length));
- for (ImportedElements expectedElements in expectedElementsList) {
- String expectedPath = convertPath(expectedElements.path);
- bool found = false;
- for (ImportedElements actualElements in importedElements) {
+ for (var expectedElements in expectedElementsList) {
+ var expectedPath = convertPath(expectedElements.path);
+ var found = false;
+ for (var actualElements in importedElements) {
if (expectedPath == actualElements.path &&
actualElements.prefix == expectedElements.prefix) {
expect(actualElements.elements,
@@ -51,8 +50,8 @@
}
Future<void> test_dartAsync_noPrefix() async {
- String selection = 'Future<String> f = null;';
- String content = '''
+ var selection = 'Future<String> f = null;';
+ var content = '''
import 'dart:async';
printer() {
$selection
@@ -67,8 +66,8 @@
}
Future<void> test_dartAsync_prefix() async {
- String selection = 'a.Future<String> f = null;';
- String content = '''
+ var selection = 'a.Future<String> f = null;';
+ var content = '''
import 'dart:async' as a;
printer() {
$selection
@@ -83,8 +82,8 @@
}
Future<void> test_dartCore_noPrefix() async {
- String selection = "String s = '';";
- String content = '''
+ var selection = "String s = '';";
+ var content = '''
blankLine() {
$selection
print(s);
@@ -97,8 +96,8 @@
}
Future<void> test_dartCore_prefix() async {
- String selection = "core.String s = '';";
- String content = '''
+ var selection = "core.String s = '';";
+ var content = '''
import 'dart:core' as core;
blankLine() {
$selection
@@ -112,8 +111,8 @@
}
Future<void> test_dartMath_noPrefix() async {
- String selection = 'new Random();';
- String content = '''
+ var selection = 'new Random();';
+ var content = '''
import 'dart:math';
bool randomBool() {
Random r = $selection
@@ -127,8 +126,8 @@
}
Future<void> test_import_simple() async {
- String selection = "import 'dart:math';";
- String content = '''
+ var selection = "import 'dart:math';";
+ var content = '''
$selection
bool randomBool() {
Random r = new Random();
@@ -140,8 +139,8 @@
}
Future<void> test_import_simple_show() async {
- String selection = "import 'dart:math' show Random;";
- String content = '''
+ var selection = "import 'dart:math' show Random;";
+ var content = '''
$selection
bool randomBool() {
Random r = new Random();
@@ -153,14 +152,14 @@
}
Future<void> test_multiple() async {
- String selection = r'''
+ var selection = r'''
main() {
Random r = new Random();
String s = r.nextBool().toString();
print(s);
}
''';
- String content = '''
+ var content = '''
import 'dart:math';
$selection
@@ -173,8 +172,8 @@
}
Future<void> test_none_comment() async {
- String selection = 'comment';
- String content = '''
+ var selection = 'comment';
+ var content = '''
// Method $selection.
blankLine() {
print('');
@@ -185,13 +184,13 @@
}
Future<void> test_none_constructorDeclarationReturnType() async {
- String selection = r'''
+ var selection = r'''
class A {
A();
A.named();
}
''';
- String content = '''
+ var content = '''
$selection
''';
await _computeElements(content, selection);
@@ -199,8 +198,8 @@
}
Future<void> test_none_partialNames() async {
- String selection = 'x + y';
- String content = '''
+ var selection = 'x + y';
+ var content = '''
plusThree(int xx) {
int yy = 2;
print(x${selection}y);
@@ -211,8 +210,8 @@
}
Future<void> test_none_wholeNames() async {
- String selection = 'x + y + 1';
- String content = '''
+ var selection = 'x + y + 1';
+ var content = '''
plusThree(int x) {
int y = 2;
print($selection);
@@ -231,8 +230,8 @@
static String b = '';
}
''');
- String selection = 'A.a + B.b';
- String content = '''
+ var selection = 'A.a + B.b';
+ var content = '''
import 'package:foo/foo.dart';
blankLine() {
print($selection);
@@ -250,8 +249,8 @@
static String first = '';
}
''');
- String selection = 'Foo.first';
- String content = '''
+ var selection = 'Foo.first';
+ var content = '''
import 'package:foo/foo.dart';
blankLine() {
print($selection);
@@ -269,8 +268,8 @@
static String first = '';
}
''');
- String selection = 'f.Foo.first';
- String content = '''
+ var selection = 'f.Foo.first';
+ var content = '''
import 'package:foo/foo.dart' as f;
blankLine() {
print($selection);
@@ -286,8 +285,8 @@
addPackageFile('foo', 'foo.dart', '''
String foo() => '';
''');
- String selection = 'f.foo()';
- String content = '''
+ var selection = 'f.foo()';
+ var content = '''
import 'package:foo/foo.dart' as f;
blankLine() {
print($selection);
@@ -303,8 +302,8 @@
addPackageFile('foo', 'foo.dart', '''
String foo = '';
''');
- String selection = 'f.foo';
- String content = '''
+ var selection = 'f.foo';
+ var content = '''
import 'package:foo/foo.dart' as f;
blankLine() {
print($selection);
@@ -320,8 +319,8 @@
addPackageFile('foo', 'foo.dart', '''
String foo = '';
''');
- String selection = 'f.foo';
- String content = '''
+ var selection = 'f.foo';
+ var content = '''
import 'package:foo/foo.dart' as f;
main() {
$selection = '';
@@ -339,8 +338,8 @@
static String first = '';
}
''');
- String selection = 'Foo.first';
- String content = '''
+ var selection = 'Foo.first';
+ var content = '''
import 'package:foo/foo.dart' as f;
blankLine() {
print(f.$selection);
@@ -359,8 +358,8 @@
static String second = '';
}
''');
- String selection = 'f.Foo.first + Foo.second';
- String content = '''
+ var selection = 'f.Foo.first + Foo.second';
+ var content = '''
import 'package:foo/foo.dart';
import 'package:foo/foo.dart' as f;
blankLine() {
@@ -375,8 +374,8 @@
}
Future<void> test_self() async {
- String selection = 'A parent;';
- String content = '''
+ var selection = 'A parent;';
+ var content = '''
class A {
$selection
}
@@ -388,7 +387,7 @@
}
Future<void> test_wholeFile_noImports() async {
- String content = '''
+ var content = '''
blankLine() {
String s = '';
print(s);
@@ -401,7 +400,7 @@
}
Future<void> test_wholeFile_withImports() async {
- String content = '''
+ var content = '''
import 'dart:math';
bool randomBool() {
Random r = new Random();
@@ -415,8 +414,8 @@
Future<void> _computeElements(String content, String selection) async {
// TODO(brianwilkerson) Automatically extract the selection from the content.
newFile(sourcePath, content: content);
- ResolvedUnitResult result = await session.getResolvedUnit(sourcePath);
- ImportedElementsComputer computer = ImportedElementsComputer(
+ var result = await session.getResolvedUnit(sourcePath);
+ var computer = ImportedElementsComputer(
result.unit, content.indexOf(selection), selection.length);
importedElements = computer.compute();
}
diff --git a/pkg/analysis_server/test/src/computer/outline_computer_test.dart b/pkg/analysis_server/test/src/computer/outline_computer_test.dart
index 56759cd..8113eed 100644
--- a/pkg/analysis_server/test/src/computer/outline_computer_test.dart
+++ b/pkg/analysis_server/test/src/computer/outline_computer_test.dart
@@ -50,7 +50,7 @@
}
Future<void> test_columnWithChildren() async {
- Outline unitOutline = await _computeOutline('''
+ var unitOutline = await _computeOutline('''
import 'package:flutter/widgets.dart';
class MyWidget extends StatelessWidget {
@@ -75,8 +75,8 @@
var columnOutline = build.children[0];
{
- int offset = testCode.indexOf('new Column');
- int length = testCode.indexOf('; // Column') - offset;
+ var offset = testCode.indexOf('new Column');
+ var length = testCode.indexOf('; // Column') - offset;
_expect(columnOutline,
name: 'Column',
elementOffset: offset,
@@ -86,8 +86,8 @@
{
var textOutline = columnOutline.children[0];
- String text = "const Text('aaa')";
- int offset = testCode.indexOf(text);
+ var text = "const Text('aaa')";
+ var offset = testCode.indexOf(text);
_expect(textOutline,
name: "Text('aaa')",
elementOffset: offset,
@@ -97,8 +97,8 @@
{
var textOutline = columnOutline.children[1];
- String text = "const Text('bbb')";
- int offset = testCode.indexOf(text);
+ var text = "const Text('bbb')";
+ var offset = testCode.indexOf(text);
_expect(textOutline,
name: "Text('bbb')",
elementOffset: offset,
@@ -112,7 +112,7 @@
@required int elementOffset,
@required int offset,
@required int length}) {
- Element element = outline.element;
+ var element = outline.element;
expect(element.name, name);
expect(element.location.offset, elementOffset);
expect(outline.offset, offset);
@@ -140,7 +140,7 @@
@reflectiveTest
class OutlineComputerTest extends AbstractOutlineComputerTest {
Future<void> test_class() async {
- Outline unitOutline = await _computeOutline('''
+ var unitOutline = await _computeOutline('''
abstract class A<K, V> {
int fa, fb;
String fc;
@@ -159,56 +159,56 @@
String fa(int pa) => null;
R fb<R, P>(P p) {}
''');
- List<Outline> topOutlines = unitOutline.children;
+ var topOutlines = unitOutline.children;
expect(topOutlines, hasLength(4));
// A
{
- Outline outline_A = topOutlines[0];
- Element element_A = outline_A.element;
+ var outline_A = topOutlines[0];
+ var element_A = outline_A.element;
expect(element_A.kind, ElementKind.CLASS);
expect(element_A.name, 'A');
expect(element_A.typeParameters, '<K, V>');
{
- Location location = element_A.location;
+ var location = element_A.location;
expect(location.offset, testCode.indexOf('A<K, V> {'));
expect(location.length, 1);
}
expect(element_A.parameters, null);
expect(element_A.returnType, null);
// A children
- List<Outline> outlines_A = outline_A.children;
+ var outlines_A = outline_A.children;
expect(outlines_A, hasLength(11));
{
- Outline outline = outlines_A[0];
- Element element = outline.element;
+ var outline = outlines_A[0];
+ var element = outline.element;
expect(element.kind, ElementKind.FIELD);
expect(element.name, 'fa');
expect(element.parameters, isNull);
expect(element.returnType, 'int');
}
{
- Outline outline = outlines_A[1];
- Element element = outline.element;
+ var outline = outlines_A[1];
+ var element = outline.element;
expect(element.kind, ElementKind.FIELD);
expect(element.name, 'fb');
expect(element.parameters, isNull);
expect(element.returnType, 'int');
}
{
- Outline outline = outlines_A[2];
- Element element = outline.element;
+ var outline = outlines_A[2];
+ var element = outline.element;
expect(element.kind, ElementKind.FIELD);
expect(element.name, 'fc');
expect(element.parameters, isNull);
expect(element.returnType, 'String');
}
{
- Outline outline = outlines_A[3];
- Element element = outline.element;
+ var outline = outlines_A[3];
+ var element = outline.element;
expect(element.kind, ElementKind.CONSTRUCTOR);
expect(element.name, 'A');
{
- Location location = element.location;
+ var location = element.location;
expect(location.offset, testCode.indexOf('A(int i, String s);'));
expect(location.length, 'A'.length);
}
@@ -218,12 +218,12 @@
expect(element.isStatic, isFalse);
}
{
- Outline outline = outlines_A[4];
- Element element = outline.element;
+ var outline = outlines_A[4];
+ var element = outline.element;
expect(element.kind, ElementKind.CONSTRUCTOR);
expect(element.name, 'A.name');
{
- Location location = element.location;
+ var location = element.location;
expect(location.offset, testCode.indexOf('name(num p);'));
expect(location.length, 'name'.length);
}
@@ -233,12 +233,12 @@
expect(element.isStatic, isFalse);
}
{
- Outline outline = outlines_A[5];
- Element element = outline.element;
+ var outline = outlines_A[5];
+ var element = outline.element;
expect(element.kind, ElementKind.CONSTRUCTOR);
expect(element.name, 'A._privateName');
{
- Location location = element.location;
+ var location = element.location;
expect(location.offset, testCode.indexOf('_privateName(num p);'));
expect(location.length, '_privateName'.length);
}
@@ -248,12 +248,12 @@
expect(element.isStatic, isFalse);
}
{
- Outline outline = outlines_A[6];
- Element element = outline.element;
+ var outline = outlines_A[6];
+ var element = outline.element;
expect(element.kind, ElementKind.METHOD);
expect(element.name, 'ma');
{
- Location location = element.location;
+ var location = element.location;
expect(location.offset, testCode.indexOf('ma(int pa) => null;'));
expect(location.length, 'ma'.length);
}
@@ -263,12 +263,12 @@
expect(element.isStatic, isTrue);
}
{
- Outline outline = outlines_A[7];
- Element element = outline.element;
+ var outline = outlines_A[7];
+ var element = outline.element;
expect(element.kind, ElementKind.METHOD);
expect(element.name, '_mb');
{
- Location location = element.location;
+ var location = element.location;
expect(location.offset, testCode.indexOf('_mb(int pb);'));
expect(location.length, '_mb'.length);
}
@@ -278,12 +278,12 @@
expect(element.isStatic, isFalse);
}
{
- Outline outline = outlines_A[8];
- Element element = outline.element;
+ var outline = outlines_A[8];
+ var element = outline.element;
expect(element.kind, ElementKind.METHOD);
expect(element.name, 'mc');
{
- Location location = element.location;
+ var location = element.location;
expect(location.offset, testCode.indexOf('mc<R, P>'));
expect(location.length, 'mc'.length);
}
@@ -294,12 +294,12 @@
expect(element.isStatic, isFalse);
}
{
- Outline outline = outlines_A[9];
- Element element = outline.element;
+ var outline = outlines_A[9];
+ var element = outline.element;
expect(element.kind, ElementKind.GETTER);
expect(element.name, 'propA');
{
- Location location = element.location;
+ var location = element.location;
expect(location.offset, testCode.indexOf('propA => null;'));
expect(location.length, 'propA'.length);
}
@@ -307,12 +307,12 @@
expect(element.returnType, 'String');
}
{
- Outline outline = outlines_A[10];
- Element element = outline.element;
+ var outline = outlines_A[10];
+ var element = outline.element;
expect(element.kind, ElementKind.SETTER);
expect(element.name, 'propB');
{
- Location location = element.location;
+ var location = element.location;
expect(location.offset, testCode.indexOf('propB(int v) {}'));
expect(location.length, 'propB'.length);
}
@@ -322,28 +322,28 @@
}
// B
{
- Outline outline_B = topOutlines[1];
- Element element_B = outline_B.element;
+ var outline_B = topOutlines[1];
+ var element_B = outline_B.element;
expect(element_B.kind, ElementKind.CLASS);
expect(element_B.name, 'B');
expect(element_B.typeParameters, isNull);
{
- Location location = element_B.location;
+ var location = element_B.location;
expect(location.offset, testCode.indexOf('B {'));
expect(location.length, 1);
}
expect(element_B.parameters, null);
expect(element_B.returnType, null);
// B children
- List<Outline> outlines_B = outline_B.children;
+ var outlines_B = outline_B.children;
expect(outlines_B, hasLength(1));
{
- Outline outline = outlines_B[0];
- Element element = outline.element;
+ var outline = outlines_B[0];
+ var element = outline.element;
expect(element.kind, ElementKind.CONSTRUCTOR);
expect(element.name, 'B');
{
- Location location = element.location;
+ var location = element.location;
expect(location.offset, testCode.indexOf('B(int p);'));
expect(location.length, 'B'.length);
}
@@ -352,12 +352,12 @@
}
}
{
- Outline outline = topOutlines[2];
- Element element = outline.element;
+ var outline = topOutlines[2];
+ var element = outline.element;
expect(element.kind, ElementKind.FUNCTION);
expect(element.name, 'fa');
{
- Location location = element.location;
+ var location = element.location;
expect(location.offset, testCode.indexOf('fa(int pa)'));
expect(location.length, 'ma'.length);
}
@@ -367,12 +367,12 @@
expect(element.isStatic, isTrue);
}
{
- Outline outline = topOutlines[3];
- Element element = outline.element;
+ var outline = topOutlines[3];
+ var element = outline.element;
expect(element.kind, ElementKind.FUNCTION);
expect(element.name, 'fb');
{
- Location location = element.location;
+ var location = element.location;
expect(location.offset, testCode.indexOf('fb<R, P>'));
expect(location.length, 'fb'.length);
}
@@ -385,28 +385,28 @@
}
Future<void> test_enum() async {
- Outline unitOutline = await _computeOutline('''
+ var unitOutline = await _computeOutline('''
enum MyEnum {
A, B, C
}
''');
- List<Outline> topOutlines = unitOutline.children;
+ var topOutlines = unitOutline.children;
expect(topOutlines, hasLength(1));
// MyEnum
{
- Outline outline_MyEnum = topOutlines[0];
- Element element_MyEnum = outline_MyEnum.element;
+ var outline_MyEnum = topOutlines[0];
+ var element_MyEnum = outline_MyEnum.element;
expect(element_MyEnum.kind, ElementKind.ENUM);
expect(element_MyEnum.name, 'MyEnum');
{
- Location location = element_MyEnum.location;
+ var location = element_MyEnum.location;
expect(location.offset, testCode.indexOf('MyEnum {'));
expect(location.length, 'MyEnum'.length);
}
expect(element_MyEnum.parameters, null);
expect(element_MyEnum.returnType, null);
// MyEnum children
- List<Outline> outlines_MyEnum = outline_MyEnum.children;
+ var outlines_MyEnum = outline_MyEnum.children;
expect(outlines_MyEnum, hasLength(3));
_isEnumConstant(outlines_MyEnum[0], 'A');
_isEnumConstant(outlines_MyEnum[1], 'B');
@@ -416,7 +416,7 @@
Future<void> test_extension_named() async {
createAnalysisOptionsFile(experiments: [EnableString.extension_methods]);
- Outline unitOutline = await _computeOutline('''
+ var unitOutline = await _computeOutline('''
extension MyExt on String {
int get halfLength => length ~/ 2;
void writeOn(StringBuffer b) {
@@ -424,30 +424,30 @@
}
}
''');
- List<Outline> topOutlines = unitOutline.children;
+ var topOutlines = unitOutline.children;
expect(topOutlines, hasLength(1));
// MyExt
{
- Outline outline_MyExt = topOutlines[0];
- Element element_MyExt = outline_MyExt.element;
+ var outline_MyExt = topOutlines[0];
+ var element_MyExt = outline_MyExt.element;
expect(element_MyExt.kind, ElementKind.EXTENSION);
expect(element_MyExt.name, 'MyExt');
{
- Location location = element_MyExt.location;
+ var location = element_MyExt.location;
expect(location.offset, testCode.indexOf('MyExt on'));
expect(location.length, 'MyExt'.length);
}
expect(element_MyExt.parameters, null);
expect(element_MyExt.returnType, null);
// StringUtilities children
- List<Outline> outlines_MyExt = outline_MyExt.children;
+ var outlines_MyExt = outline_MyExt.children;
expect(outlines_MyExt, hasLength(2));
}
}
Future<void> test_extension_unnamed() async {
createAnalysisOptionsFile(experiments: [EnableString.extension_methods]);
- Outline unitOutline = await _computeOutline('''
+ var unitOutline = await _computeOutline('''
extension on String {
int get halfLength => length ~/ 2;
void writeOn(StringBuffer b) {
@@ -455,40 +455,40 @@
}
}
''');
- List<Outline> topOutlines = unitOutline.children;
+ var topOutlines = unitOutline.children;
expect(topOutlines, hasLength(1));
// MyExt
{
- Outline outline_MyExt = topOutlines[0];
- Element element_MyExt = outline_MyExt.element;
+ var outline_MyExt = topOutlines[0];
+ var element_MyExt = outline_MyExt.element;
expect(element_MyExt.kind, ElementKind.EXTENSION);
expect(element_MyExt.name, '');
{
- Location location = element_MyExt.location;
+ var location = element_MyExt.location;
expect(location.offset, testCode.indexOf('String'));
expect(location.length, 'String'.length);
}
expect(element_MyExt.parameters, null);
expect(element_MyExt.returnType, null);
// StringUtilities children
- List<Outline> outlines_MyExt = outline_MyExt.children;
+ var outlines_MyExt = outline_MyExt.children;
expect(outlines_MyExt, hasLength(2));
}
}
Future<void> test_genericTypeAlias_incomplete() async {
- Outline unitOutline = await _computeOutline('''
+ var unitOutline = await _computeOutline('''
typedef F = Object;
''');
- List<Outline> topOutlines = unitOutline.children;
+ var topOutlines = unitOutline.children;
expect(topOutlines, hasLength(1));
// F
- Outline outline_F = topOutlines[0];
- Element element_F = outline_F.element;
+ var outline_F = topOutlines[0];
+ var element_F = outline_F.element;
expect(element_F.kind, ElementKind.FUNCTION_TYPE_ALIAS);
expect(element_F.name, 'F');
{
- Location location = element_F.location;
+ var location = element_F.location;
expect(location.offset, testCode.indexOf('F ='));
expect(location.length, 'F'.length);
}
@@ -497,18 +497,18 @@
}
Future<void> test_genericTypeAlias_minimal() async {
- Outline unitOutline = await _computeOutline('''
+ var unitOutline = await _computeOutline('''
typedef F = void Function();
''');
- List<Outline> topOutlines = unitOutline.children;
+ var topOutlines = unitOutline.children;
expect(topOutlines, hasLength(1));
// F
- Outline outline_F = topOutlines[0];
- Element element_F = outline_F.element;
+ var outline_F = topOutlines[0];
+ var element_F = outline_F.element;
expect(element_F.kind, ElementKind.FUNCTION_TYPE_ALIAS);
expect(element_F.name, 'F');
{
- Location location = element_F.location;
+ var location = element_F.location;
expect(location.offset, testCode.indexOf('F ='));
expect(location.length, 'F'.length);
}
@@ -517,18 +517,18 @@
}
Future<void> test_genericTypeAlias_noReturnType() async {
- Outline unitOutline = await _computeOutline('''
+ var unitOutline = await _computeOutline('''
typedef F = Function();
''');
- List<Outline> topOutlines = unitOutline.children;
+ var topOutlines = unitOutline.children;
expect(topOutlines, hasLength(1));
// F
- Outline outline_F = topOutlines[0];
- Element element_F = outline_F.element;
+ var outline_F = topOutlines[0];
+ var element_F = outline_F.element;
expect(element_F.kind, ElementKind.FUNCTION_TYPE_ALIAS);
expect(element_F.name, 'F');
{
- Location location = element_F.location;
+ var location = element_F.location;
expect(location.offset, testCode.indexOf('F ='));
expect(location.length, 'F'.length);
}
@@ -537,7 +537,7 @@
}
Future<void> test_groupAndTest() async {
- Outline outline = await _computeOutline('''
+ var outline = await _computeOutline('''
void group(name, closure) {}
void test(name) {}
void main() {
@@ -557,38 +557,38 @@
}
''');
// unit
- List<Outline> unit_children = outline.children;
+ var unit_children = outline.children;
expect(unit_children, hasLength(3));
// main
- Outline main_outline = unit_children[2];
+ var main_outline = unit_children[2];
_expect(main_outline,
kind: ElementKind.FUNCTION,
name: 'main',
offset: testCode.indexOf('main() {'),
parameters: '()',
returnType: 'void');
- List<Outline> main_children = main_outline.children;
+ var main_children = main_outline.children;
expect(main_children, hasLength(2));
// group1
- Outline group1_outline = main_children[0];
+ var group1_outline = main_children[0];
_expect(group1_outline,
kind: ElementKind.UNIT_TEST_GROUP,
length: 5,
name: 'group("group1")',
offset: testCode.indexOf("group('group1'"));
- List<Outline> group1_children = group1_outline.children;
+ var group1_children = group1_outline.children;
expect(group1_children, hasLength(2));
// group1_1
- Outline group1_1_outline = group1_children[0];
+ var group1_1_outline = group1_children[0];
_expect(group1_1_outline,
kind: ElementKind.UNIT_TEST_GROUP,
length: 5,
name: 'group("group1_1")',
offset: testCode.indexOf("group('group1_1'"));
- List<Outline> group1_1_children = group1_1_outline.children;
+ var group1_1_children = group1_1_outline.children;
expect(group1_1_children, hasLength(2));
// test1_1_1
- Outline test1_1_1_outline = group1_1_children[0];
+ var test1_1_1_outline = group1_1_children[0];
_expect(test1_1_1_outline,
kind: ElementKind.UNIT_TEST_TEST,
leaf: true,
@@ -596,7 +596,7 @@
name: 'test("test1_1_1")',
offset: testCode.indexOf("test('test1_1_1'"));
// test1_1_1
- Outline test1_1_2_outline = group1_1_children[1];
+ var test1_1_2_outline = group1_1_children[1];
_expect(test1_1_2_outline,
kind: ElementKind.UNIT_TEST_TEST,
leaf: true,
@@ -604,16 +604,16 @@
name: 'test("test1_1_2")',
offset: testCode.indexOf("test('test1_1_2'"));
// group1_2
- Outline group1_2_outline = group1_children[1];
+ var group1_2_outline = group1_children[1];
_expect(group1_2_outline,
kind: ElementKind.UNIT_TEST_GROUP,
length: 5,
name: 'group("group1_2")',
offset: testCode.indexOf("group('group1_2'"));
- List<Outline> group1_2_children = group1_2_outline.children;
+ var group1_2_children = group1_2_outline.children;
expect(group1_2_children, hasLength(1));
// test2_1
- Outline test1_2_1_outline = group1_2_children[0];
+ var test1_2_1_outline = group1_2_children[0];
_expect(test1_2_1_outline,
kind: ElementKind.UNIT_TEST_TEST,
leaf: true,
@@ -621,16 +621,16 @@
name: 'test("test1_2_1")',
offset: testCode.indexOf("test('test1_2_1'"));
// group2
- Outline group2_outline = main_children[1];
+ var group2_outline = main_children[1];
_expect(group2_outline,
kind: ElementKind.UNIT_TEST_GROUP,
length: 5,
name: 'group("group2")',
offset: testCode.indexOf("group('group2'"));
- List<Outline> group2_children = group2_outline.children;
+ var group2_children = group2_outline.children;
expect(group2_children, hasLength(2));
// test2_1
- Outline test2_1_outline = group2_children[0];
+ var test2_1_outline = group2_children[0];
_expect(test2_1_outline,
kind: ElementKind.UNIT_TEST_TEST,
leaf: true,
@@ -638,7 +638,7 @@
name: 'test("test2_1")',
offset: testCode.indexOf("test('test2_1'"));
// test2_2
- Outline test2_2_outline = group2_children[1];
+ var test2_2_outline = group2_children[1];
_expect(test2_2_outline,
kind: ElementKind.UNIT_TEST_TEST,
leaf: true,
@@ -651,7 +651,7 @@
///
/// https://code.google.com/p/dart/issues/detail?id=21373
Future<void> test_invalidGetterInConstructor() async {
- Outline outline = await _computeOutline('''
+ var outline = await _computeOutline('''
class A {
A() {
get badGetter {
@@ -667,7 +667,7 @@
///
/// https://github.com/dart-lang/sdk/issues/33228
Future<void> test_invocation_ofParameter() async {
- Outline outline = await _computeOutline('''
+ var outline = await _computeOutline('''
main(p()) {
p();
}
@@ -677,7 +677,7 @@
Future<void> test_isTest_isTestGroup() async {
addMetaPackage();
- Outline outline = await _computeOutline('''
+ var outline = await _computeOutline('''
import 'package:meta/meta.dart';
@isTestGroup
@@ -703,38 +703,38 @@
}
''');
// unit
- List<Outline> unit_children = outline.children;
+ var unit_children = outline.children;
expect(unit_children, hasLength(3));
// main
- Outline main_outline = unit_children[2];
+ var main_outline = unit_children[2];
_expect(main_outline,
kind: ElementKind.FUNCTION,
name: 'main',
offset: testCode.indexOf('main() {'),
parameters: '()',
returnType: 'void');
- List<Outline> main_children = main_outline.children;
+ var main_children = main_outline.children;
expect(main_children, hasLength(2));
// group1
- Outline group1_outline = main_children[0];
+ var group1_outline = main_children[0];
_expect(group1_outline,
kind: ElementKind.UNIT_TEST_GROUP,
length: 7,
name: 'myGroup("group1")',
offset: testCode.indexOf("myGroup('group1'"));
- List<Outline> group1_children = group1_outline.children;
+ var group1_children = group1_outline.children;
expect(group1_children, hasLength(2));
// group1_1
- Outline group1_1_outline = group1_children[0];
+ var group1_1_outline = group1_children[0];
_expect(group1_1_outline,
kind: ElementKind.UNIT_TEST_GROUP,
length: 7,
name: 'myGroup("group1_1")',
offset: testCode.indexOf("myGroup('group1_1'"));
- List<Outline> group1_1_children = group1_1_outline.children;
+ var group1_1_children = group1_1_outline.children;
expect(group1_1_children, hasLength(2));
// test1_1_1
- Outline test1_1_1_outline = group1_1_children[0];
+ var test1_1_1_outline = group1_1_children[0];
_expect(test1_1_1_outline,
kind: ElementKind.UNIT_TEST_TEST,
leaf: true,
@@ -742,7 +742,7 @@
name: 'myTest("test1_1_1")',
offset: testCode.indexOf("myTest('test1_1_1'"));
// test1_1_1
- Outline test1_1_2_outline = group1_1_children[1];
+ var test1_1_2_outline = group1_1_children[1];
_expect(test1_1_2_outline,
kind: ElementKind.UNIT_TEST_TEST,
leaf: true,
@@ -750,16 +750,16 @@
name: 'myTest("test1_1_2")',
offset: testCode.indexOf("myTest('test1_1_2'"));
// group1_2
- Outline group1_2_outline = group1_children[1];
+ var group1_2_outline = group1_children[1];
_expect(group1_2_outline,
kind: ElementKind.UNIT_TEST_GROUP,
length: 7,
name: 'myGroup("group1_2")',
offset: testCode.indexOf("myGroup('group1_2'"));
- List<Outline> group1_2_children = group1_2_outline.children;
+ var group1_2_children = group1_2_outline.children;
expect(group1_2_children, hasLength(1));
// test2_1
- Outline test1_2_1_outline = group1_2_children[0];
+ var test1_2_1_outline = group1_2_children[0];
_expect(test1_2_1_outline,
kind: ElementKind.UNIT_TEST_TEST,
leaf: true,
@@ -767,16 +767,16 @@
name: 'myTest("test1_2_1")',
offset: testCode.indexOf("myTest('test1_2_1'"));
// group2
- Outline group2_outline = main_children[1];
+ var group2_outline = main_children[1];
_expect(group2_outline,
kind: ElementKind.UNIT_TEST_GROUP,
length: 7,
name: 'myGroup("group2")',
offset: testCode.indexOf("myGroup('group2'"));
- List<Outline> group2_children = group2_outline.children;
+ var group2_children = group2_outline.children;
expect(group2_children, hasLength(2));
// test2_1
- Outline test2_1_outline = group2_children[0];
+ var test2_1_outline = group2_children[0];
_expect(test2_1_outline,
kind: ElementKind.UNIT_TEST_TEST,
leaf: true,
@@ -784,7 +784,7 @@
name: 'myTest("test2_1")',
offset: testCode.indexOf("myTest('test2_1'"));
// test2_2
- Outline test2_2_outline = group2_children[1];
+ var test2_2_outline = group2_children[1];
_expect(test2_2_outline,
kind: ElementKind.UNIT_TEST_TEST,
leaf: true,
@@ -794,7 +794,7 @@
}
Future<void> test_localFunctions() async {
- Outline unitOutline = await _computeOutline('''
+ var unitOutline = await _computeOutline('''
class A {
A() {
int local_A() {}
@@ -810,46 +810,46 @@
}
}
''');
- List<Outline> topOutlines = unitOutline.children;
+ var topOutlines = unitOutline.children;
expect(topOutlines, hasLength(2));
// A
{
- Outline outline_A = topOutlines[0];
- Element element_A = outline_A.element;
+ var outline_A = topOutlines[0];
+ var element_A = outline_A.element;
expect(element_A.kind, ElementKind.CLASS);
expect(element_A.name, 'A');
{
- Location location = element_A.location;
+ var location = element_A.location;
expect(location.offset, testCode.indexOf('A {'));
expect(location.length, 'A'.length);
}
expect(element_A.parameters, null);
expect(element_A.returnType, null);
// A children
- List<Outline> outlines_A = outline_A.children;
+ var outlines_A = outline_A.children;
expect(outlines_A, hasLength(2));
{
- Outline constructorOutline = outlines_A[0];
- Element constructorElement = constructorOutline.element;
+ var constructorOutline = outlines_A[0];
+ var constructorElement = constructorOutline.element;
expect(constructorElement.kind, ElementKind.CONSTRUCTOR);
expect(constructorElement.name, 'A');
{
- Location location = constructorElement.location;
+ var location = constructorElement.location;
expect(location.offset, testCode.indexOf('A() {'));
expect(location.length, 'A'.length);
}
expect(constructorElement.parameters, '()');
expect(constructorElement.returnType, isNull);
// local function
- List<Outline> outlines_constructor = constructorOutline.children;
+ var outlines_constructor = constructorOutline.children;
expect(outlines_constructor, hasLength(1));
{
- Outline outline = outlines_constructor[0];
- Element element = outline.element;
+ var outline = outlines_constructor[0];
+ var element = outline.element;
expect(element.kind, ElementKind.FUNCTION);
expect(element.name, 'local_A');
{
- Location location = element.location;
+ var location = element.location;
expect(location.offset, testCode.indexOf('local_A() {}'));
expect(location.length, 'local_A'.length);
}
@@ -858,27 +858,27 @@
}
}
{
- Outline outline_m = outlines_A[1];
- Element element_m = outline_m.element;
+ var outline_m = outlines_A[1];
+ var element_m = outline_m.element;
expect(element_m.kind, ElementKind.METHOD);
expect(element_m.name, 'm');
{
- Location location = element_m.location;
+ var location = element_m.location;
expect(location.offset, testCode.indexOf('m() {'));
expect(location.length, 'm'.length);
}
expect(element_m.parameters, '()');
expect(element_m.returnType, '');
// local function
- List<Outline> methodChildren = outline_m.children;
+ var methodChildren = outline_m.children;
expect(methodChildren, hasLength(1));
{
- Outline outline = methodChildren[0];
- Element element = outline.element;
+ var outline = methodChildren[0];
+ var element = outline.element;
expect(element.kind, ElementKind.FUNCTION);
expect(element.name, 'local_m');
{
- Location location = element.location;
+ var location = element.location;
expect(location.offset, testCode.indexOf('local_m() {}'));
expect(location.length, 'local_m'.length);
}
@@ -889,27 +889,27 @@
}
// f()
{
- Outline outline_f = topOutlines[1];
- Element element_f = outline_f.element;
+ var outline_f = topOutlines[1];
+ var element_f = outline_f.element;
expect(element_f.kind, ElementKind.FUNCTION);
expect(element_f.name, 'f');
{
- Location location = element_f.location;
+ var location = element_f.location;
expect(location.offset, testCode.indexOf('f() {'));
expect(location.length, 'f'.length);
}
expect(element_f.parameters, '()');
expect(element_f.returnType, '');
// f() children
- List<Outline> outlines_f = outline_f.children;
+ var outlines_f = outline_f.children;
expect(outlines_f, hasLength(2));
{
- Outline outline_f1 = outlines_f[0];
- Element element_f1 = outline_f1.element;
+ var outline_f1 = outlines_f[0];
+ var element_f1 = outline_f1.element;
expect(element_f1.kind, ElementKind.FUNCTION);
expect(element_f1.name, 'local_f1');
{
- Location location = element_f1.location;
+ var location = element_f1.location;
expect(location.offset, testCode.indexOf('local_f1(int i) {}'));
expect(location.length, 'local_f1'.length);
}
@@ -917,27 +917,27 @@
expect(element_f1.returnType, '');
}
{
- Outline outline_f2 = outlines_f[1];
- Element element_f2 = outline_f2.element;
+ var outline_f2 = outlines_f[1];
+ var element_f2 = outline_f2.element;
expect(element_f2.kind, ElementKind.FUNCTION);
expect(element_f2.name, 'local_f2');
{
- Location location = element_f2.location;
+ var location = element_f2.location;
expect(location.offset, testCode.indexOf('local_f2(String s) {'));
expect(location.length, 'local_f2'.length);
}
expect(element_f2.parameters, '(String s)');
expect(element_f2.returnType, '');
// local_f2() local function
- List<Outline> outlines_f2 = outline_f2.children;
+ var outlines_f2 = outline_f2.children;
expect(outlines_f2, hasLength(1));
{
- Outline outline_f21 = outlines_f2[0];
- Element element_f21 = outline_f21.element;
+ var outline_f21 = outlines_f2[0];
+ var element_f21 = outline_f21.element;
expect(element_f21.kind, ElementKind.FUNCTION);
expect(element_f21.name, 'local_f21');
{
- Location location = element_f21.location;
+ var location = element_f21.location;
expect(location.offset, testCode.indexOf('local_f21(int p) {'));
expect(location.length, 'local_f21'.length);
}
@@ -949,39 +949,39 @@
}
Future<void> test_mixin() async {
- Outline unitOutline = await _computeOutline('''
+ var unitOutline = await _computeOutline('''
mixin M<N> {
c(int d) {}
String get e => null;
set f(int g) {}
}
''');
- List<Outline> topOutlines = unitOutline.children;
+ var topOutlines = unitOutline.children;
expect(topOutlines, hasLength(1));
// M
{
- Outline outline_M = topOutlines[0];
- Element element_M = outline_M.element;
+ var outline_M = topOutlines[0];
+ var element_M = outline_M.element;
expect(element_M.kind, ElementKind.MIXIN);
expect(element_M.name, 'M');
expect(element_M.typeParameters, '<N>');
{
- Location location = element_M.location;
+ var location = element_M.location;
expect(location.offset, testCode.indexOf('M<N>'));
expect(location.length, 1);
}
expect(element_M.parameters, isNull);
expect(element_M.returnType, isNull);
// M children
- List<Outline> outlines_M = outline_M.children;
+ var outlines_M = outline_M.children;
expect(outlines_M, hasLength(3));
{
- Outline outline = outlines_M[0];
- Element element = outline.element;
+ var outline = outlines_M[0];
+ var element = outline.element;
expect(element.kind, ElementKind.METHOD);
expect(element.name, 'c');
{
- Location location = element.location;
+ var location = element.location;
expect(location.offset, testCode.indexOf('c(int d)'));
expect(location.length, 1);
}
@@ -991,12 +991,12 @@
expect(element.isStatic, isFalse);
}
{
- Outline outline = outlines_M[1];
- Element element = outline.element;
+ var outline = outlines_M[1];
+ var element = outline.element;
expect(element.kind, ElementKind.GETTER);
expect(element.name, 'e');
{
- Location location = element.location;
+ var location = element.location;
expect(location.offset, testCode.indexOf('e => null'));
expect(location.length, 1);
}
@@ -1004,12 +1004,12 @@
expect(element.returnType, 'String');
}
{
- Outline outline = outlines_M[2];
- Element element = outline.element;
+ var outline = outlines_M[2];
+ var element = outline.element;
expect(element.kind, ElementKind.SETTER);
expect(element.name, 'f');
{
- Location location = element.location;
+ var location = element.location;
expect(location.offset, testCode.indexOf('f(int g)'));
expect(location.length, 1);
}
@@ -1020,7 +1020,7 @@
}
Future<void> test_sourceRanges_fields() async {
- Outline unitOutline = await _computeOutline('''
+ var unitOutline = await _computeOutline('''
class A {
int fieldA, fieldB = 2;
@@ -1030,13 +1030,13 @@
int fieldD;
}
''');
- List<Outline> outlines = unitOutline.children[0].children;
+ var outlines = unitOutline.children[0].children;
expect(outlines, hasLength(4));
// fieldA
{
- Outline outline = outlines[0];
- Element element = outline.element;
+ var outline = outlines[0];
+ var element = outline.element;
expect(element.kind, ElementKind.FIELD);
expect(element.name, 'fieldA');
@@ -1049,8 +1049,8 @@
// fieldB
{
- Outline outline = outlines[1];
- Element element = outline.element;
+ var outline = outlines[1];
+ var element = outline.element;
expect(element.kind, ElementKind.FIELD);
expect(element.name, 'fieldB');
@@ -1063,8 +1063,8 @@
// fieldC
{
- Outline outline = outlines[2];
- Element element = outline.element;
+ var outline = outlines[2];
+ var element = outline.element;
expect(element.kind, ElementKind.FIELD);
expect(element.name, 'fieldC');
@@ -1077,8 +1077,8 @@
// fieldD
{
- Outline outline = outlines[3];
- Element element = outline.element;
+ var outline = outlines[3];
+ var element = outline.element;
expect(element.kind, ElementKind.FIELD);
expect(element.name, 'fieldD');
@@ -1091,19 +1091,19 @@
}
Future<void> test_sourceRanges_inUnit() async {
- Outline unitOutline = await _computeOutline('''
+ var unitOutline = await _computeOutline('''
/// My first class.
class A {}
class B {}
''');
- List<Outline> topOutlines = unitOutline.children;
+ var topOutlines = unitOutline.children;
expect(topOutlines, hasLength(2));
// A
{
- Outline outline = topOutlines[0];
- Element element = outline.element;
+ var outline = topOutlines[0];
+ var element = outline.element;
expect(element.kind, ElementKind.CLASS);
expect(element.name, 'A');
@@ -1116,8 +1116,8 @@
// B
{
- Outline outline = topOutlines[1];
- Element element = outline.element;
+ var outline = topOutlines[1];
+ var element = outline.element;
expect(element.kind, ElementKind.CLASS);
expect(element.name, 'B');
@@ -1130,7 +1130,7 @@
}
Future<void> test_sourceRanges_method() async {
- Outline unitOutline = await _computeOutline('''
+ var unitOutline = await _computeOutline('''
class A {
int methodA() {}
@@ -1139,13 +1139,13 @@
int methodB() {}
}
''');
- List<Outline> outlines = unitOutline.children[0].children;
+ var outlines = unitOutline.children[0].children;
expect(outlines, hasLength(2));
// methodA
{
- Outline outline = outlines[0];
- Element element = outline.element;
+ var outline = outlines[0];
+ var element = outline.element;
expect(element.kind, ElementKind.METHOD);
expect(element.name, 'methodA');
@@ -1158,8 +1158,8 @@
// methodB
{
- Outline outline = outlines[1];
- Element element = outline.element;
+ var outline = outlines[1];
+ var element = outline.element;
expect(element.kind, ElementKind.METHOD);
expect(element.name, 'methodB');
@@ -1172,7 +1172,7 @@
}
Future<void> test_topLevel() async {
- Outline unitOutline = await _computeOutline('''
+ var unitOutline = await _computeOutline('''
typedef String FTA<K, V>(int i, String s);
typedef FTB(int p);
typedef GTAF<T> = void Function<S>(T t, S s);
@@ -1185,17 +1185,17 @@
String get propA => null;
set propB(int v) {}
''');
- List<Outline> topOutlines = unitOutline.children;
+ var topOutlines = unitOutline.children;
expect(topOutlines, hasLength(11));
// FTA
{
- Outline outline = topOutlines[0];
- Element element = outline.element;
+ var outline = topOutlines[0];
+ var element = outline.element;
expect(element.kind, ElementKind.FUNCTION_TYPE_ALIAS);
expect(element.name, 'FTA');
expect(element.typeParameters, '<K, V>');
{
- Location location = element.location;
+ var location = element.location;
expect(location.offset, testCode.indexOf('FTA<K, V>('));
expect(location.length, 'FTA'.length);
}
@@ -1204,13 +1204,13 @@
}
// FTB
{
- Outline outline = topOutlines[1];
- Element element = outline.element;
+ var outline = topOutlines[1];
+ var element = outline.element;
expect(element.kind, ElementKind.FUNCTION_TYPE_ALIAS);
expect(element.name, 'FTB');
expect(element.typeParameters, isNull);
{
- Location location = element.location;
+ var location = element.location;
expect(location.offset, testCode.indexOf('FTB('));
expect(location.length, 'FTB'.length);
}
@@ -1219,13 +1219,13 @@
}
// GenericTypeAlias - function
{
- Outline outline = topOutlines[2];
- Element element = outline.element;
+ var outline = topOutlines[2];
+ var element = outline.element;
expect(element.kind, ElementKind.FUNCTION_TYPE_ALIAS);
expect(element.name, 'GTAF');
expect(element.typeParameters, '<T>');
{
- Location location = element.location;
+ var location = element.location;
expect(location.offset, testCode.indexOf('GTAF<T> ='));
expect(location.length, 'GTAF'.length);
}
@@ -1234,13 +1234,13 @@
}
// CTA
{
- Outline outline = topOutlines[5];
- Element element = outline.element;
+ var outline = topOutlines[5];
+ var element = outline.element;
expect(element.kind, ElementKind.CLASS_TYPE_ALIAS);
expect(element.name, 'CTA');
expect(element.typeParameters, '<T>');
{
- Location location = element.location;
+ var location = element.location;
expect(location.offset, testCode.indexOf('CTA<T> ='));
expect(location.length, 'CTA'.length);
}
@@ -1249,8 +1249,8 @@
}
// CTB
{
- Outline outline = topOutlines[6];
- Element element = outline.element;
+ var outline = topOutlines[6];
+ var element = outline.element;
expect(element.kind, ElementKind.CLASS_TYPE_ALIAS);
expect(element.name, 'CTB');
expect(element.typeParameters, isNull);
@@ -1258,12 +1258,12 @@
}
// fA
{
- Outline outline = topOutlines[7];
- Element element = outline.element;
+ var outline = topOutlines[7];
+ var element = outline.element;
expect(element.kind, ElementKind.FUNCTION);
expect(element.name, 'fA');
{
- Location location = element.location;
+ var location = element.location;
expect(location.offset, testCode.indexOf('fA('));
expect(location.length, 'fA'.length);
}
@@ -1272,12 +1272,12 @@
}
// fB
{
- Outline outline = topOutlines[8];
- Element element = outline.element;
+ var outline = topOutlines[8];
+ var element = outline.element;
expect(element.kind, ElementKind.FUNCTION);
expect(element.name, 'fB');
{
- Location location = element.location;
+ var location = element.location;
expect(location.offset, testCode.indexOf('fB('));
expect(location.length, 'fB'.length);
}
@@ -1286,12 +1286,12 @@
}
// propA
{
- Outline outline = topOutlines[9];
- Element element = outline.element;
+ var outline = topOutlines[9];
+ var element = outline.element;
expect(element.kind, ElementKind.GETTER);
expect(element.name, 'propA');
{
- Location location = element.location;
+ var location = element.location;
expect(location.offset, testCode.indexOf('propA => null;'));
expect(location.length, 'propA'.length);
}
@@ -1300,12 +1300,12 @@
}
// propB
{
- Outline outline = topOutlines[10];
- Element element = outline.element;
+ var outline = topOutlines[10];
+ var element = outline.element;
expect(element.kind, ElementKind.SETTER);
expect(element.name, 'propB');
{
- Location location = element.location;
+ var location = element.location;
expect(location.offset, testCode.indexOf('propB(int v) {}'));
expect(location.length, 'propB'.length);
}
@@ -1322,8 +1322,8 @@
int offset,
String parameters,
String returnType}) {
- Element element = outline.element;
- Location location = element.location;
+ var element = outline.element;
+ var location = element.location;
if (kind != null) {
expect(element.kind, kind);
@@ -1350,7 +1350,7 @@
}
void _isEnumConstant(Outline outline, String name) {
- Element element = outline.element;
+ var element = outline.element;
expect(element.kind, ElementKind.ENUM_CONSTANT);
expect(element.name, name);
expect(element.parameters, isNull);
diff --git a/pkg/analysis_server/test/src/domain_abstract_test.dart b/pkg/analysis_server/test/src/domain_abstract_test.dart
index 19f7c97..d21ce87 100644
--- a/pkg/analysis_server/test/src/domain_abstract_test.dart
+++ b/pkg/analysis_server/test/src/domain_abstract_test.dart
@@ -25,18 +25,15 @@
class AbstractRequestHandlerTest extends AbstractAnalysisTest {
Future<void> test_waitForResponses_empty_noTimeout() async {
AbstractRequestHandler handler = TestAbstractRequestHandler(server);
- Map<PluginInfo, Future<plugin.Response>> futures =
- <PluginInfo, Future<plugin.Response>>{};
- List<plugin.Response> responses = await handler.waitForResponses(futures);
+ var futures = <PluginInfo, Future<plugin.Response>>{};
+ var responses = await handler.waitForResponses(futures);
expect(responses, isEmpty);
}
Future<void> test_waitForResponses_empty_timeout() async {
AbstractRequestHandler handler = TestAbstractRequestHandler(server);
- Map<PluginInfo, Future<plugin.Response>> futures =
- <PluginInfo, Future<plugin.Response>>{};
- List<plugin.Response> responses =
- await handler.waitForResponses(futures, timeout: 250);
+ var futures = <PluginInfo, Future<plugin.Response>>{};
+ var responses = await handler.waitForResponses(futures, timeout: 250);
expect(responses, isEmpty);
}
@@ -44,14 +41,13 @@
AbstractRequestHandler handler = TestAbstractRequestHandler(server);
PluginInfo plugin1 = DiscoveredPluginInfo('p1', '', '', null, null);
PluginInfo plugin2 = DiscoveredPluginInfo('p2', '', '', null, null);
- plugin.Response response1 = plugin.Response('1', 1);
- plugin.Response response2 = plugin.Response('2', 2);
- Map<PluginInfo, Future<plugin.Response>> futures =
- <PluginInfo, Future<plugin.Response>>{
+ var response1 = plugin.Response('1', 1);
+ var response2 = plugin.Response('2', 2);
+ var futures = <PluginInfo, Future<plugin.Response>>{
plugin1: Future.value(response1),
plugin2: Future.value(response2),
};
- List<plugin.Response> responses = await handler.waitForResponses(futures);
+ var responses = await handler.waitForResponses(futures);
expect(responses, unorderedEquals([response1, response2]));
}
@@ -59,16 +55,15 @@
AbstractRequestHandler handler = TestAbstractRequestHandler(server);
PluginInfo plugin1 = DiscoveredPluginInfo('p1', '', '', null, null);
PluginInfo plugin2 = DiscoveredPluginInfo('p2', '', '', null, null);
- plugin.Response response1 = plugin.Response('1', 1);
- plugin.Response response2 = plugin.Response('2', 2,
+ var response1 = plugin.Response('1', 1);
+ var response2 = plugin.Response('2', 2,
error: plugin.RequestError(
plugin.RequestErrorCode.PLUGIN_ERROR, 'message'));
- Map<PluginInfo, Future<plugin.Response>> futures =
- <PluginInfo, Future<plugin.Response>>{
+ var futures = <PluginInfo, Future<plugin.Response>>{
plugin1: Future.value(response1),
plugin2: Future.value(response2),
};
- List<plugin.Response> responses = await handler.waitForResponses(futures);
+ var responses = await handler.waitForResponses(futures);
expect(responses, unorderedEquals([response1]));
}
@@ -77,17 +72,15 @@
PluginInfo plugin1 = DiscoveredPluginInfo('p1', '', '', null, null);
PluginInfo plugin2 = DiscoveredPluginInfo('p2', '', '', null, null);
PluginInfo plugin3 = DiscoveredPluginInfo('p3', '', '', null, null);
- plugin.Response response1 = plugin.Response('1', 1);
- plugin.Response response2 = plugin.Response('2', 2);
- plugin.Response response3 = plugin.Response('3', 3);
- Map<PluginInfo, Future<plugin.Response>> futures =
- <PluginInfo, Future<plugin.Response>>{
+ var response1 = plugin.Response('1', 1);
+ var response2 = plugin.Response('2', 2);
+ var response3 = plugin.Response('3', 3);
+ var futures = <PluginInfo, Future<plugin.Response>>{
plugin1: Future.delayed(Duration(milliseconds: 500), () => response1),
plugin2: Future.value(response2),
plugin3: Future.delayed(Duration(milliseconds: 500), () => response3)
};
- List<plugin.Response> responses =
- await handler.waitForResponses(futures, timeout: 50);
+ var responses = await handler.waitForResponses(futures, timeout: 50);
expect(responses, unorderedEquals([response2]));
}
}
diff --git a/pkg/analysis_server/test/src/domains/execution/completion_test.dart b/pkg/analysis_server/test/src/domains/execution/completion_test.dart
index a083383..6dda0c3 100644
--- a/pkg/analysis_server/test/src/domains/execution/completion_test.dart
+++ b/pkg/analysis_server/test/src/domains/execution/completion_test.dart
@@ -34,14 +34,14 @@
}
void assertNotSuggested(String completion) {
- CompletionSuggestion suggestion = getSuggest(completion);
+ var suggestion = getSuggest(completion);
if (suggestion != null) {
failedCompletion('unexpected $completion');
}
}
void assertSuggested(String completion, {String returnType}) {
- CompletionSuggestion suggestion = getSuggest(completion);
+ var suggestion = getSuggest(completion);
if (suggestion == null) {
failedCompletion('expected $completion');
}
@@ -55,7 +55,7 @@
List<RuntimeCompletionVariable> variables,
List<RuntimeCompletionExpression> expressions,
}) async {
- int codeOffset = code.indexOf('^');
+ var codeOffset = code.indexOf('^');
expect(codeOffset, isNonNegative);
code = code.replaceAll('^', '');
diff --git a/pkg/analysis_server/test/src/edit/fix/non_nullable_fix_test.dart b/pkg/analysis_server/test/src/edit/fix/non_nullable_fix_test.dart
index 8f688fd..62068dc 100644
--- a/pkg/analysis_server/test/src/edit/fix/non_nullable_fix_test.dart
+++ b/pkg/analysis_server/test/src/edit/fix/non_nullable_fix_test.dart
@@ -34,8 +34,8 @@
final id = nextRequestId;
final params = EditDartfixParams(included);
params.includedFixes = ['non-nullable'];
- Request request = Request(id, 'edit.dartfix', params.toJson());
- Response response = await EditDartFix(server, request).compute();
+ var request = Request(id, 'edit.dartfix', params.toJson());
+ var response = await EditDartFix(server, request).compute();
expect(response.id, id);
expect(response.error, isNull);
return EditDartfixResult.fromResponse(response);
@@ -72,12 +72,12 @@
}
Future<void> test_included_multipleRelativeDirectories() async {
- NonNullableFix fix = NonNullableFix(listener, included: ['lib', 'test']);
+ var fix = NonNullableFix(listener, included: ['lib', 'test']);
expect(fix.includedRoot, equals(convertPath('/project')));
}
Future<void> test_included_multipleRelativeDirectories_nonCanonical() async {
- NonNullableFix fix = NonNullableFix(listener, included: [
+ var fix = NonNullableFix(listener, included: [
convertPath('../project2/lib'),
convertPath('../project2/lib/src')
]);
@@ -86,7 +86,7 @@
Future<void>
test_included_multipleRelativeDirectories_nonCanonical_atRoot() async {
- NonNullableFix fix = NonNullableFix(listener, included: [
+ var fix = NonNullableFix(listener, included: [
convertPath('../project2/lib'),
convertPath('../project/lib')
]);
@@ -95,12 +95,12 @@
Future<void>
test_included_multipleRelativeDirectories_subAndSuperDirectories() async {
- NonNullableFix fix = NonNullableFix(listener, included: ['lib', '.']);
+ var fix = NonNullableFix(listener, included: ['lib', '.']);
expect(fix.includedRoot, equals(convertPath('/project')));
}
Future<void> test_included_multipleRelativeFiles() async {
- NonNullableFix fix = NonNullableFix(listener, included: [
+ var fix = NonNullableFix(listener, included: [
convertPath('lib/lib1.dart'),
convertPath('test/test.dart')
]);
@@ -108,13 +108,13 @@
}
Future<void> test_included_multipleRelativeFiles_sameDirectory() async {
- NonNullableFix fix = NonNullableFix(listener,
+ var fix = NonNullableFix(listener,
included: [convertPath('lib/lib1.dart'), convertPath('lib/lib2.dart')]);
expect(fix.includedRoot, equals(convertPath('/project/lib')));
}
Future<void> test_included_multipleRelativeFilesAndDirectories() async {
- NonNullableFix fix = NonNullableFix(listener, included: [
+ var fix = NonNullableFix(listener, included: [
convertPath('lib/lib1.dart'),
convertPath('lib/src'),
convertPath('../project/lib/src/lib3.dart')
@@ -123,19 +123,18 @@
}
Future<void> test_included_singleAbsoluteDirectory() async {
- NonNullableFix fix =
- NonNullableFix(listener, included: [convertPath('/project')]);
+ var fix = NonNullableFix(listener, included: [convertPath('/project')]);
expect(fix.includedRoot, equals(convertPath('/project')));
}
Future<void> test_included_singleAbsoluteFile() async {
- NonNullableFix fix = NonNullableFix(listener,
+ var fix = NonNullableFix(listener,
included: [convertPath('/project/bin/bin.dart')]);
expect(fix.includedRoot, equals(convertPath('/project/bin')));
}
Future<void> test_included_singleRelativeDirectory() async {
- NonNullableFix fix = NonNullableFix(listener, included: ['.']);
+ var fix = NonNullableFix(listener, included: ['.']);
expect(fix.includedRoot, equals(convertPath('/project')));
}
}
diff --git a/pkg/analysis_server/test/src/edit/nnbd_migration/info_builder_test.dart b/pkg/analysis_server/test/src/edit/nnbd_migration/info_builder_test.dart
index 0a5ec52..c3cb90f 100644
--- a/pkg/analysis_server/test/src/edit/nnbd_migration/info_builder_test.dart
+++ b/pkg/analysis_server/test/src/edit/nnbd_migration/info_builder_test.dart
@@ -24,7 +24,7 @@
@reflectiveTest
class BuildEnclosingMemberDescriptionTest extends AbstractAnalysisTest {
Future<ResolvedUnitResult> resolveTestFile() async {
- String includedRoot = resourceProvider.pathContext.dirname(testFile);
+ var includedRoot = resourceProvider.pathContext.dirname(testFile);
server.setAnalysisRoots('0', [includedRoot], [], {});
return await server
.getAnalysisDriver(testFile)
@@ -40,7 +40,7 @@
''');
var result = await resolveTestFile();
ClassDeclaration class_ = result.unit.declarations.single;
- ClassMember constructor = class_.members.single;
+ var constructor = class_.members.single;
expect(InfoBuilder.buildEnclosingMemberDescription(constructor),
equals("the constructor 'C.aaa'"));
}
@@ -53,7 +53,7 @@
''');
var result = await resolveTestFile();
ClassDeclaration class_ = result.unit.declarations.single;
- ClassMember constructor = class_.members.single;
+ var constructor = class_.members.single;
expect(InfoBuilder.buildEnclosingMemberDescription(constructor),
equals("the default constructor of 'C'"));
}
@@ -94,7 +94,7 @@
''');
var result = await resolveTestFile();
ClassDeclaration class_ = result.unit.declarations.single;
- ClassMember getter = class_.members.single;
+ var getter = class_.members.single;
expect(InfoBuilder.buildEnclosingMemberDescription(getter),
equals("the getter 'C.aaa'"));
}
@@ -107,7 +107,7 @@
''');
var result = await resolveTestFile();
ClassDeclaration class_ = result.unit.declarations.single;
- ClassMember method = class_.members.single;
+ var method = class_.members.single;
expect(InfoBuilder.buildEnclosingMemberDescription(method),
equals("the method 'C.aaa'"));
}
@@ -120,7 +120,7 @@
''');
var result = await resolveTestFile();
ClassDeclaration class_ = result.unit.declarations.single;
- ClassMember operator = class_.members.single;
+ var operator = class_.members.single;
expect(InfoBuilder.buildEnclosingMemberDescription(operator),
equals("the operator 'C.=='"));
}
@@ -133,7 +133,7 @@
''');
var result = await resolveTestFile();
ClassDeclaration class_ = result.unit.declarations.single;
- ClassMember setter = class_.members.single;
+ var setter = class_.members.single;
expect(InfoBuilder.buildEnclosingMemberDescription(setter),
equals("the setter 'C.aaa='"));
}
@@ -146,7 +146,7 @@
''');
var result = await resolveTestFile();
ExtensionDeclaration extension_ = result.unit.declarations.single;
- ClassMember method = extension_.members.single;
+ var method = extension_.members.single;
expect(InfoBuilder.buildEnclosingMemberDescription(method),
equals("the method 'E.aaa'"));
}
@@ -159,7 +159,7 @@
''');
var result = await resolveTestFile();
ExtensionDeclaration extension_ = result.unit.declarations.single;
- ClassMember method = extension_.members.single;
+ var method = extension_.members.single;
expect(InfoBuilder.buildEnclosingMemberDescription(method),
equals("the method 'aaa' in unnamed extension on List<dynamic>"));
}
@@ -172,7 +172,7 @@
''');
var result = await resolveTestFile();
MixinDeclaration mixin_ = result.unit.declarations.single;
- ClassMember method = mixin_.members.single;
+ var method = mixin_.members.single;
expect(InfoBuilder.buildEnclosingMemberDescription(method),
equals("the method 'C.aaa'"));
}
@@ -262,7 +262,7 @@
/// Assert that some target in [targets] has various properties.
void assertInTargets(
{@required Iterable<NavigationTarget> targets, int offset, int length}) {
- String failureReasons = [
+ var failureReasons = [
if (offset != null) 'offset: $offset',
if (length != null) 'length: $length',
].join(' and ');
@@ -303,7 +303,7 @@
}
Future<void> test_asExpression() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
void f([num a]) {
int b = a as int;
}
@@ -312,7 +312,7 @@
int? b = a as int?;
}
''');
- List<RegionInfo> regions = unit.regions;
+ var regions = unit.regions;
expect(regions, hasLength(3));
// regions[0] is `num? a`.
assertRegion(
@@ -326,7 +326,7 @@
}
Future<void> test_asExpression_insideReturn() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
int f([num a]) {
return a as int;
}
@@ -335,7 +335,7 @@
return a as int?;
}
''');
- List<RegionInfo> regions = unit.regions;
+ var regions = unit.regions;
expect(regions, hasLength(3));
// regions[0] is `inf? f`.
// regions[1] is `num? a`.
@@ -346,7 +346,7 @@
}
Future<void> test_bound() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
class C<T extends Object> {}
void f() {
@@ -359,7 +359,7 @@
C<int?/*?*/>? c = null;
}
''');
- List<RegionInfo> regions = unit.regions;
+ var regions = unit.regions;
expect(regions, hasLength(3));
assertRegion(
region: regions[0],
@@ -368,7 +368,7 @@
}
Future<void> test_bound_instantiation_explicit() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
class C<T extends Object> {}
void main() {
@@ -381,7 +381,7 @@
C<int?/*?*/>();
}
''');
- List<RegionInfo> regions = unit.regions;
+ var regions = unit.regions;
expect(regions, hasLength(2));
assertRegion(
region: regions[0],
@@ -390,7 +390,7 @@
}
Future<void> test_bound_instantiation_implicit() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
class C<T extends Object> {
C(T/*!*/ t);
}
@@ -407,7 +407,7 @@
C(null);
}
''');
- List<RegionInfo> regions = unit.regions;
+ var regions = unit.regions;
expect(regions, hasLength(2));
assertRegion(region: regions[0], offset: 24, details: [
'This type parameter is instantiated with an inferred nullable type'
@@ -415,7 +415,7 @@
}
Future<void> test_bound_method_explicit() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
f<T extends Object> {}
void main() {
@@ -428,7 +428,7 @@
f<int?/*?*/>();
}
''');
- List<RegionInfo> regions = unit.regions;
+ var regions = unit.regions;
expect(regions, hasLength(2));
assertRegion(
region: regions[0],
@@ -437,7 +437,7 @@
}
Future<void> test_bound_method_implicit() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
f<T extends Object>(T/*!*/ t) {}
void main() {
@@ -450,7 +450,7 @@
f(null);
}
''');
- List<RegionInfo> regions = unit.regions;
+ var regions = unit.regions;
expect(regions, hasLength(2));
assertRegion(region: regions[0], offset: 18, details: [
'This type parameter is instantiated with an inferred nullable type'
@@ -458,7 +458,7 @@
}
Future<void> test_discardCondition() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
void g(int i) {
print(i.isEven);
if (i != null) print('NULL');
@@ -469,14 +469,14 @@
/* if (i != null) */ print('NULL');
}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(2));
assertRegion(region: regions[0], offset: 38, length: 3);
assertRegion(region: regions[1], offset: 56, length: 3);
}
Future<void> test_discardElse() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
void g(int i) {
print(i.isEven);
if (i != null) print('NULL');
@@ -489,7 +489,7 @@
else print('NOT NULL'); */
}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(4));
assertRegion(region: regions[0], offset: 38, length: 3);
assertRegion(region: regions[1], offset: 56, length: 3);
@@ -498,7 +498,7 @@
}
Future<void> test_dynamicValueIsUsed() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
bool f(int i) {
if (i == null) return true;
else return false;
@@ -517,7 +517,7 @@
f(i);
}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(1));
var region = regions[0];
var edits = region.edits;
@@ -530,7 +530,7 @@
}
Future<void> test_exactNullable() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
void f(List<int> list) {
list[0] = null;
}
@@ -547,7 +547,7 @@
f(<int?>[]);
}
''');
- List<RegionInfo> regions = unit.regions;
+ var regions = unit.regions;
expect(regions, hasLength(3));
assertRegion(region: regions[0], offset: 15, details: [
"An explicit 'null' is assigned in the function 'f'",
@@ -561,7 +561,7 @@
@FailingTest(issue: 'https://dartbug.com/40587')
Future<void> test_exactNullable_exactNullable() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
void g(List<int> list1, List<int> list2) {
list1[0] = null;
list2[0] = list1[0];
@@ -572,7 +572,7 @@
list2[0] = list1[0];
}
''');
- List<RegionInfo> regions = unit.regions;
+ var regions = unit.regions;
expect(regions, hasLength(4));
// regions[0] is the hard edge that list1 is unconditionally indexed
assertRegion(region: regions[1], offset: 15, details: [
@@ -586,14 +586,14 @@
}
Future<void> test_expressionFunctionReturnTarget() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
String g() => 1 == 2 ? "Hello" : null;
''', migratedContent: '''
String? g() => 1 == 2 ? "Hello" : null;
''');
assertInTargets(targets: unit.targets, offset: 7, length: 1); // "g"
assertInTargets(targets: unit.targets, offset: 11, length: 2); // "=>"
- List<RegionInfo> regions = unit.regions;
+ var regions = unit.regions;
expect(regions, hasLength(1));
assertRegion(
region: regions[0],
@@ -603,7 +603,7 @@
}
Future<void> test_field_fieldFormalInitializer_optional() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
class A {
int _f;
A([this._f]);
@@ -614,7 +614,7 @@
A([this._f]);
}
''');
- List<RegionInfo> regions = unit.regions;
+ var regions = unit.regions;
expect(regions, hasLength(1));
assertRegion(region: regions[0], offset: 15, details: [
'This field is initialized by an optional field formal parameter that '
@@ -623,7 +623,7 @@
}
Future<void> test_field_fieldFormalInitializer_optional_defaultNull() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
class A {
int _f;
A([this._f = null]);
@@ -634,7 +634,7 @@
A([this._f = null]);
}
''');
- List<RegionInfo> regions = unit.regions;
+ var regions = unit.regions;
expect(regions, hasLength(1));
assertRegion(region: regions[0], offset: 15, details: [
'This field is initialized by an optional field formal parameter that '
@@ -643,7 +643,7 @@
}
Future<void> test_field_fieldFormalInitializer_required() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
class A {
int _f;
A(this._f);
@@ -660,7 +660,7 @@
A(null);
}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(1));
// TODO(brianwilkerson) It would be nice if the target for the region could
// be the argument rather than the field formal parameter.
@@ -671,7 +671,7 @@
}
Future<void> test_field_initializer() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
class A {
int _f = null;
int _f2 = _f;
@@ -682,7 +682,7 @@
int? _f2 = _f;
}
''');
- List<RegionInfo> regions = unit.regions;
+ var regions = unit.regions;
expect(regions, hasLength(2));
assertRegion(
region: regions[0],
@@ -695,7 +695,7 @@
}
Future<void> test_fieldLaterAssignedNullable() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
class Foo {
int value = 7;
void bar() {
@@ -710,9 +710,9 @@
}
}
''');
- List<RegionInfo> regions = unit.regions;
+ var regions = unit.regions;
expect(regions, hasLength(1));
- RegionInfo region = regions.single;
+ var region = regions.single;
assertRegion(region: region, offset: 17, details: [
"An explicit 'null' is assigned in the method 'Foo.bar'",
]);
@@ -721,7 +721,7 @@
}
Future<void> test_functionType_nullable_asArgument() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
class C {
f(void Function(int) cb1) {}
g(void Function(int) cb2) {
@@ -738,7 +738,7 @@
h() => f(null);
}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(1));
assertRegion(
region: regions[0],
@@ -748,7 +748,7 @@
}
Future<void> test_functionType_nullableParameter_asArgument() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
class C {
f(void Function(int) cb1) {
cb1(null);
@@ -767,7 +767,7 @@
}
}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(2));
assertRegion(
region: regions[0],
@@ -781,7 +781,7 @@
}
Future<void> test_functionType_nullableParameter_assignment() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
class C {
void Function(int) _cb = (x) {};
f(void Function(int) cb) {
@@ -798,7 +798,7 @@
g() => _cb(null);
}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(2));
// regions[0] is `void Function(int?) _cb`.
assertRegion(region: regions[1], offset: 68, details: [
@@ -809,7 +809,7 @@
}
Future<void> test_functionType_nullableParameter_fieldInitializer() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
class C {
void Function(int) _cb;
C(void Function(int) cb): _cb = cb;
@@ -822,7 +822,7 @@
f() => _cb(null);
}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(2));
assertRegion(
region: regions[0],
@@ -837,7 +837,7 @@
@FailingTest(issue: 'https://github.com/dart-lang/sdk/issues/40034')
Future<void> test_functionType_nullableParameter_typedef() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
typedef Cb = void Function(int);
class C {
Cb _cb;
@@ -852,7 +852,7 @@
f() => _cb(null);
}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(2));
// regions[0] is `typedef Cb = void Function(int?);`.
assertRegion(region: regions[1], offset: 75, details: [
@@ -863,7 +863,7 @@
}
Future<void> test_functionType_nullableReturn() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
class C {
int Function() _cb = () => 7;
f(int Function() cb) {
@@ -884,7 +884,7 @@
}
}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(2));
assertRegion(region: regions[0], offset: 15, details: [
'A function-typed value with a nullable return type is assigned'
@@ -893,7 +893,7 @@
}
Future<void> test_insertedRequired_fieldFormal() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
class C {
int level;
int level2;
@@ -906,7 +906,7 @@
C({required this.level}) : this.level2 = level + 1;
}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(1));
var region = regions[0];
var edits = region.edits;
@@ -919,7 +919,7 @@
}
Future<void> test_insertedRequired_parameter() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
class C {
int level = 0;
bool f({int lvl}) => lvl >= level;
@@ -930,7 +930,7 @@
bool f({required int lvl}) => lvl >= level;
}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(1));
var region = regions[0];
var edits = region.edits;
@@ -955,9 +955,9 @@
}
C /*!*/ _f(C c) => (c + c)!;
''';
- UnitInfo unit = await buildInfoForSingleTestFile(originalContent,
+ var unit = await buildInfoForSingleTestFile(originalContent,
migratedContent: migratedContent);
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(2));
assertRegion(
region: regions[0],
@@ -972,7 +972,7 @@
}
Future<void> test_listAndSetLiteralTypeArgument() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
void f() {
String s = null;
var x = <String>["hello", s];
@@ -985,7 +985,7 @@
var y = <String?>{"hello", s};
}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(3));
// regions[0] is the `String? s` fix.
assertRegion(
@@ -1001,7 +1001,7 @@
}
Future<void> test_listConstructor_length() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
void f() {
List<int> list = List<int>(10);
}
@@ -1010,7 +1010,7 @@
List<int?> list = List<int?>(10);
}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(2));
// regions[0] is `num? a`.
assertRegion(region: regions[1], offset: 40, details: [
@@ -1021,7 +1021,7 @@
@FailingTest(issue: 'https://github.com/dart-lang/sdk/issues/40064')
Future<void> test_listConstructor_length_implicitType() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
void f() {
List<int> list = List(10);
}
@@ -1030,7 +1030,7 @@
List<int?> list = List(10);
}
''');
- List<RegionInfo> regions = unit.regions;
+ var regions = unit.regions;
expect(regions, hasLength(2));
// regions[0] is `num? a`.
assertRegion(region: regions[1], offset: 40, details: [
@@ -1040,7 +1040,7 @@
}
Future<void> test_listLiteralTypeArgument_collectionIf() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
void f() {
String s = null;
var x = <String>[
@@ -1057,7 +1057,7 @@
];
}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(2));
// regions[0] is the `String? s` fix.
assertRegion(
@@ -1068,7 +1068,7 @@
}
Future<void> test_localVariable() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
void f() {
int v1 = null;
int v2 = v1;
@@ -1079,7 +1079,7 @@
int? v2 = v1;
}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(2));
assertRegion(
region: regions[0],
@@ -1092,7 +1092,7 @@
}
Future<void> test_mapLiteralTypeArgument() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
void f() {
String s = null;
var x = <String, bool>{"hello": false, s: true};
@@ -1105,7 +1105,7 @@
var y = <bool , String?>{false: "hello", true: s};
}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(3));
// regions[0] is the `String? s` fix.
assertRegion(
@@ -1121,7 +1121,7 @@
}
Future<void> test_namedParameterWithDefault_fromOverridden_explicit() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
class A {
void m({int p = 0}) {}
}
@@ -1142,7 +1142,7 @@
a.m(p: null);
}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(2));
// regions[0] is "an explicit null is passed..."
assertRegion(region: regions[1], offset: 71, details: [
@@ -1152,7 +1152,7 @@
}
Future<void> test_nonNullableType_assert() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
void f(String s) {
assert(s != null);
}
@@ -1161,24 +1161,24 @@
assert(s != null);
}
''');
- List<RegionInfo> regions = unit.informativeRegions;
+ var regions = unit.informativeRegions;
expect(regions, hasLength(1));
assertRegion(region: regions[0], offset: 13, length: 1, details: []);
}
Future<void> test_nonNullableType_exclamationComment() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
void f(String /*!*/ s) {}
''', migratedContent: '''
void f(String /*!*/ s) {}
''');
- List<RegionInfo> regions = unit.informativeRegions;
+ var regions = unit.informativeRegions;
expect(regions, hasLength(1));
assertRegion(region: regions[0], offset: 13, length: 1, details: []);
}
Future<void> test_nonNullableType_unconditionalFieldAccess() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
void f(String s) {
print(s.length);
}
@@ -1187,13 +1187,13 @@
print(s.length);
}
''');
- List<RegionInfo> regions = unit.informativeRegions;
+ var regions = unit.informativeRegions;
expect(regions, hasLength(1));
assertRegion(region: regions[0], offset: 13, length: 1, details: []);
}
Future<void> test_nullCheck_onMemberAccess() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
class C {
int value;
C([this.value]);
@@ -1210,7 +1210,7 @@
}
}
''');
- List<RegionInfo> regions = unit.regions;
+ var regions = unit.regions;
expect(regions, hasLength(2));
// regions[0] is `int?`.
var region = regions[1];
@@ -1222,7 +1222,7 @@
}
Future<void> test_nullCheck_onMethodCall() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
class C {
int value;
C([this.value]);
@@ -1239,7 +1239,7 @@
}
}
''');
- List<RegionInfo> regions = unit.regions;
+ var regions = unit.regions;
expect(regions, hasLength(2));
// regions[0] is `int?`.
assertRegion(region: regions[1], offset: 65, details: [
@@ -1248,7 +1248,7 @@
}
Future<void> test_parameter_fromInvocation_explicit() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
void f(String s) {}
void g() {
f(null);
@@ -1259,7 +1259,7 @@
f(null);
}
''');
- List<RegionInfo> regions = unit.regions;
+ var regions = unit.regions;
expect(regions, hasLength(1));
assertRegion(
region: regions[0],
@@ -1268,7 +1268,7 @@
}
Future<void> test_parameter_fromInvocation_implicit() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
void f(String s) {}
void g(p) {
f(p);
@@ -1281,7 +1281,7 @@
}
void h() => g(null);
''');
- List<RegionInfo> regions = unit.regions;
+ var regions = unit.regions;
expect(regions, hasLength(1));
assertRegion(region: regions[0], offset: 13, details: [
'A dynamic value, which is nullable is passed as an argument'
@@ -1289,7 +1289,7 @@
}
Future<void> test_parameter_fromMultipleOverridden_explicit() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
class A {
void m(int p) {}
}
@@ -1316,7 +1316,7 @@
a.m(null);
}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(3));
// regions[0] is "an explicit null is passed..."
assertRegion(region: regions[1], offset: 64, details: [
@@ -1330,7 +1330,7 @@
}
Future<void> test_parameter_fromMultipleOverridden_implicit() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
class A {
void m(int p) {}
}
@@ -1357,7 +1357,7 @@
a.m(null);
}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(2));
// regions[0] is "an explicit null is passed..."
assertRegion(region: regions[1], offset: 104, details: [
@@ -1366,7 +1366,7 @@
}
Future<void> test_parameter_fromOverridden_implicitDynamic() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
class A {
void m(p) {}
}
@@ -1381,13 +1381,13 @@
void m(Object p) {}
}
''');
- List<RegionInfo> regions = unit.informativeRegions;
+ var regions = unit.informativeRegions;
expect(regions, hasLength(1));
assertRegion(region: regions[0], offset: 62, details: []);
}
Future<void> test_parameter_fromOverriddenField_explicit() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
class A {
int m;
}
@@ -1404,7 +1404,7 @@
}
void f(A a) => a.m = null;
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(2));
assertRegion(region: regions[0], offset: 15, details: [
'This field is not initialized',
@@ -1429,7 +1429,7 @@
}
Future<void> test_parameter_named_omittedInCall() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
void f() { g(); }
void g({int i}) {}
@@ -1438,7 +1438,7 @@
void g({int? i}) {}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(1));
assertRegion(region: regions[0], offset: 30, details: [
'This named parameter is omitted in a call to this function',
@@ -1448,7 +1448,7 @@
}
Future<void> test_parameter_named_omittedInCall_inArgumentList() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
int f({int compare}) => 7
void g() {
h(f());
@@ -1461,7 +1461,7 @@
}
void h(int x) {}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(1));
assertRegion(region: regions[0], offset: 11, details: [
"This parameter has an implicit default value of 'null'",
@@ -1470,12 +1470,12 @@
}
Future<void> test_parameter_optional_explicitDefault_null() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
void f({String s = null}) {}
''', migratedContent: '''
void f({String? s = null}) {}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(1));
assertRegion(
region: regions[0],
@@ -1484,14 +1484,14 @@
}
Future<void> test_parameter_optional_explicitDefault_nullable() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
String sd = null;
void f({String s = sd}) {}
''', migratedContent: '''
String? sd = null;
void f({String? s = sd}) {}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(2));
assertRegion(
region: regions[1],
@@ -1500,12 +1500,12 @@
}
Future<void> test_parameter_optional_implicitDefault_named() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
void f({String s}) {}
''', migratedContent: '''
void f({String? s}) {}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(1));
assertRegion(
region: regions[0],
@@ -1514,12 +1514,12 @@
}
Future<void> test_parameter_optional_implicitDefault_positional() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
void f([String s]) {}
''', migratedContent: '''
void f([String? s]) {}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(1));
assertRegion(
region: regions[0],
@@ -1544,9 +1544,9 @@
print(i! + 1);
}
''';
- UnitInfo unit = await buildInfoForSingleTestFile(originalContent,
+ var unit = await buildInfoForSingleTestFile(originalContent,
migratedContent: migratedContent, removeViaComments: false);
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(3));
// regions[0] is the addition of `?` to the type of `i`.
assertRegion(
@@ -1561,7 +1561,7 @@
}
Future<void> test_return_fromOverriden() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
abstract class A {
String m();
}
@@ -1576,7 +1576,7 @@
String? m() => 1 == 2 ? "Hello" : null;
}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(2));
assertRegion(
region: regions[0],
@@ -1586,7 +1586,7 @@
}
Future<void> test_return_multipleReturns() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
String g() {
int x = 1;
if (x == 2) return x == 3 ? "Hello" : null;
@@ -1599,7 +1599,7 @@
return "Hello";
}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(1));
assertRegion(
region: regions[0],
@@ -1609,7 +1609,7 @@
}
Future<void> test_returnDetailTarget() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
String g() {
return 1 == 2 ? "Hello" : null;
}
@@ -1620,7 +1620,7 @@
''');
assertInTargets(targets: unit.targets, offset: 7, length: 1); // "g"
assertInTargets(targets: unit.targets, offset: 15, length: 6); // "return"
- List<RegionInfo> regions = unit.regions;
+ var regions = unit.regions;
expect(regions, hasLength(1));
assertRegion(
region: regions[0],
@@ -1630,7 +1630,7 @@
}
Future<void> test_returnNoValue() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
int f() {
return;
}
@@ -1639,7 +1639,7 @@
return;
}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(1));
assertRegion(region: regions[0], offset: 3, details: [
'This function contains a return statement with no value on line 2,'
@@ -1648,14 +1648,14 @@
}
Future<void> test_returnType_function_expression() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
int _f = null;
int f() => _f;
''', migratedContent: '''
int? _f = null;
int? f() => _f;
''');
- List<RegionInfo> regions = unit.regions;
+ var regions = unit.regions;
expect(regions, hasLength(2));
assertRegion(
region: regions[0],
@@ -1668,7 +1668,7 @@
}
Future<void> test_returnType_getter_block() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
class A {
int _f = null;
int get f {
@@ -1683,7 +1683,7 @@
}
}
''');
- List<RegionInfo> regions = unit.regions;
+ var regions = unit.regions;
expect(regions, hasLength(2));
assertRegion(
region: regions[0],
@@ -1696,7 +1696,7 @@
}
Future<void> test_returnType_getter_expression() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
class A {
int _f = null;
int get f => _f;
@@ -1707,7 +1707,7 @@
int? get f => _f;
}
''');
- List<RegionInfo> regions = unit.regions;
+ var regions = unit.regions;
expect(regions, hasLength(2));
assertRegion(
region: regions[0],
@@ -1720,7 +1720,7 @@
}
Future<void> test_setLiteralTypeArgument_nestedList() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
void f() {
String s = null;
var x = <List<String>>{
@@ -1737,7 +1737,7 @@
};
}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(2));
// regions[0] is the `String? s` fix.
assertRegion(
@@ -1750,14 +1750,14 @@
}
Future<void> test_topLevelVariable() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
int _f = null;
int _f2 = _f;
''', migratedContent: '''
int? _f = null;
int? _f2 = _f;
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(2));
assertRegion(
region: regions[0],
@@ -1770,7 +1770,7 @@
}
Future<void> test_trace_deadCode() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
void f(int/*!*/ i) {
if (i == null) return;
}
@@ -1803,7 +1803,7 @@
}
Future<void> test_trace_nullableType() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
void f(int i) {} // f
void g(int i) { // g
f(i);
@@ -1853,8 +1853,7 @@
}
Future<void> test_trace_nullCheck() async {
- UnitInfo unit = await buildInfoForSingleTestFile(
- 'int f(int/*?*/ i) => i + 1;',
+ var unit = await buildInfoForSingleTestFile('int f(int/*?*/ i) => i + 1;',
migratedContent: 'int f(int?/*?*/ i) => i! + 1;');
var region = unit.regions
.where((regionInfo) => regionInfo.offset == unit.content.indexOf('! +'))
@@ -1876,7 +1875,7 @@
}
Future<void> test_trace_nullCheck_notNullableReason() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
void f(int i) { // f
assert(i != null);
}
@@ -1929,7 +1928,7 @@
}
Future<void> test_trace_substitutionNode() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
class C<T extends Object/*!*/> {}
C<int /*?*/ > c;
@@ -1956,7 +1955,7 @@
}
Future<void> test_type_not_made_nullable() async {
- UnitInfo unit = await buildInfoForSingleTestFile('int i = 0;',
+ var unit = await buildInfoForSingleTestFile('int i = 0;',
migratedContent: 'int i = 0;');
var region = unit.regions
.where((regionInfo) => regionInfo.offset == unit.content.indexOf(' i'))
@@ -1971,7 +1970,7 @@
}
Future<void> test_uninitializedField() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
class C {
int value;
C();
@@ -1990,9 +1989,9 @@
C.two() {}
}
''');
- List<RegionInfo> regions = unit.regions;
+ var regions = unit.regions;
expect(regions, hasLength(1));
- RegionInfo region = regions.single;
+ var region = regions.single;
assertRegion(region: region, offset: 15, details: [
"The constructor 'C' does not initialize this field in its initializer "
'list',
@@ -2008,7 +2007,7 @@
}
Future<void> test_uninitializedMember() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
class C {
int level;
}
@@ -2017,7 +2016,7 @@
int? level;
}
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(1));
expect(regions[0].details, isNotEmpty);
assertRegion(
@@ -2028,7 +2027,7 @@
}
Future<void> test_uninitializedVariable_notLate_uninitializedUse() async {
- UnitInfo unit = await buildInfoForSingleTestFile('''
+ var unit = await buildInfoForSingleTestFile('''
void f() {
int v1;
if (1 == 2) v1 = 7;
@@ -2043,7 +2042,7 @@
}
void g(int i) => print(i.isEven);
''');
- List<RegionInfo> regions = unit.fixRegions;
+ var regions = unit.fixRegions;
expect(regions, hasLength(2));
assertRegion(
region: regions[0],
diff --git a/pkg/analysis_server/test/src/edit/nnbd_migration/navigation_tree_renderer_test.dart b/pkg/analysis_server/test/src/edit/nnbd_migration/navigation_tree_renderer_test.dart
index c4b308e..6a8451f 100644
--- a/pkg/analysis_server/test/src/edit/nnbd_migration/navigation_tree_renderer_test.dart
+++ b/pkg/analysis_server/test/src/edit/nnbd_migration/navigation_tree_renderer_test.dart
@@ -26,7 +26,7 @@
Map<String, String> files) async {
var packageRoot = convertPath('/project');
await buildInfoForTestFiles(files, includedRoot: packageRoot);
- MigrationInfo migrationInfo =
+ var migrationInfo =
MigrationInfo(infos, {}, resourceProvider.pathContext, packageRoot);
return NavigationTreeRenderer(migrationInfo, PathMapper(resourceProvider))
.render();
diff --git a/pkg/analysis_server/test/src/edit/nnbd_migration/nnbd_migration_test_base.dart b/pkg/analysis_server/test/src/edit/nnbd_migration/nnbd_migration_test_base.dart
index 427e00e..e5bd693 100644
--- a/pkg/analysis_server/test/src/edit/nnbd_migration/nnbd_migration_test_base.dart
+++ b/pkg/analysis_server/test/src/edit/nnbd_migration/nnbd_migration_test_base.dart
@@ -5,7 +5,6 @@
import 'package:analysis_server/src/edit/fix/dartfix_listener.dart';
import 'package:analysis_server/src/edit/fix/non_nullable_fix.dart';
import 'package:analysis_server/src/edit/nnbd_migration/info_builder.dart';
-import 'package:analysis_server/src/edit/nnbd_migration/instrumentation_information.dart';
import 'package:analysis_server/src/edit/nnbd_migration/instrumentation_listener.dart';
import 'package:analysis_server/src/edit/nnbd_migration/migration_info.dart';
import 'package:analyzer/dart/analysis/results.dart';
@@ -44,7 +43,7 @@
for (var info in infos) if (!info.path.contains('core.dart')) info
];
expect(filteredInfos, hasLength(1));
- UnitInfo unit = filteredInfos[0];
+ var unit = filteredInfos[0];
expect(unit.path, testFile);
expect(unit.content, migratedContent);
return unit;
@@ -76,10 +75,10 @@
// Compute the analysis results.
server.setAnalysisRoots('0', [includedRoot], [], {});
// Run the migration engine.
- DartFixListener listener = DartFixListener(server);
- InstrumentationListener instrumentationListener = InstrumentationListener();
- NullabilityMigrationAdapter adapter = NullabilityMigrationAdapter(listener);
- NullabilityMigration migration = NullabilityMigration(adapter,
+ var listener = DartFixListener(server);
+ var instrumentationListener = InstrumentationListener();
+ var adapter = NullabilityMigrationAdapter(listener);
+ var migration = NullabilityMigration(adapter,
permissive: false,
instrumentation: instrumentationListener,
removeViaComments: removeViaComments);
@@ -99,8 +98,8 @@
await _forEachPath(migration.finalizeInput);
migration.finish();
// Build the migration info.
- InstrumentationInformation info = instrumentationListener.data;
- InfoBuilder builder = InfoBuilder(
+ var info = instrumentationListener.data;
+ var builder = InfoBuilder(
resourceProvider, includedRoot, info, listener, adapter, migration);
infos = await builder.explainMigration();
}
diff --git a/pkg/analysis_server/test/src/edit/nnbd_migration/offset_mapper_test.dart b/pkg/analysis_server/test/src/edit/nnbd_migration/offset_mapper_test.dart
index a8302c4..87597b3 100644
--- a/pkg/analysis_server/test/src/edit/nnbd_migration/offset_mapper_test.dart
+++ b/pkg/analysis_server/test/src/edit/nnbd_migration/offset_mapper_test.dart
@@ -18,14 +18,14 @@
@reflectiveTest
class OffsetMapperTest extends AbstractAnalysisTest {
void test_identity() {
- OffsetMapper mapper = OffsetMapper.identity;
+ var mapper = OffsetMapper.identity;
expect(mapper.map(0), 0);
expect(mapper.map(20), 20);
expect(mapper.map(0xFFFFFF), 0xFFFFFF);
}
void test_multipleEdits() {
- OffsetMapper mapper = OffsetMapper.forEdits([
+ var mapper = OffsetMapper.forEdits([
SourceEdit(13, 0, '?'),
SourceEdit(21, 0, '!'),
SourceEdit(32, 0, '?'),
@@ -41,7 +41,7 @@
}
void test_singleEdit() {
- OffsetMapper mapper = OffsetMapper.forEdits([
+ var mapper = OffsetMapper.forEdits([
SourceEdit(13, 0, '?'),
]);
expect(mapper.map(0), 0);
diff --git a/pkg/analysis_server/test/src/edit/nnbd_migration/region_renderer_test.dart b/pkg/analysis_server/test/src/edit/nnbd_migration/region_renderer_test.dart
index 3f1d5ea..e6380b1 100644
--- a/pkg/analysis_server/test/src/edit/nnbd_migration/region_renderer_test.dart
+++ b/pkg/analysis_server/test/src/edit/nnbd_migration/region_renderer_test.dart
@@ -22,8 +22,8 @@
/// Render the region at [offset], using a [MigrationInfo] which knows only
/// about the library at `infos.single`.
EditDetails renderRegion(int offset) {
- String packageRoot = convertPath('/package');
- MigrationInfo migrationInfo =
+ var packageRoot = convertPath('/package');
+ var migrationInfo =
MigrationInfo(infos, {}, resourceProvider.pathContext, packageRoot);
var unitInfo = infos.single;
var region = unitInfo.regionAt(offset);
diff --git a/pkg/analysis_server/test/src/edit/nnbd_migration/unit_renderer_test.dart b/pkg/analysis_server/test/src/edit/nnbd_migration/unit_renderer_test.dart
index c0ac125..5c26be5 100644
--- a/pkg/analysis_server/test/src/edit/nnbd_migration/unit_renderer_test.dart
+++ b/pkg/analysis_server/test/src/edit/nnbd_migration/unit_renderer_test.dart
@@ -22,12 +22,12 @@
/// Render [libraryInfo], using a [MigrationInfo] which knows only about this
/// library.
List<FileDetails> renderUnits() {
- String packageRoot = convertPath('/package');
- MigrationInfo migrationInfo =
+ var packageRoot = convertPath('/package');
+ var migrationInfo =
MigrationInfo(infos, {}, resourceProvider.pathContext, packageRoot);
- List<FileDetails> contents = [];
- for (UnitInfo unitInfo in infos) {
+ var contents = <FileDetails>[];
+ for (var unitInfo in infos) {
contents.add(
UnitRenderer(unitInfo, migrationInfo, PathMapper(resourceProvider))
.render());
diff --git a/pkg/analysis_server/test/src/edit/preview/preview_site_test.dart b/pkg/analysis_server/test/src/edit/preview/preview_site_test.dart
index 8d51c29..52b74d1 100644
--- a/pkg/analysis_server/test/src/edit/preview/preview_site_test.dart
+++ b/pkg/analysis_server/test/src/edit/preview/preview_site_test.dart
@@ -32,7 +32,7 @@
state = MigrationState(null, null, dartfixListener, null, null);
state.pathMapper = PathMapper(resourceProvider);
state.migrationInfo = migrationInfo;
- site = PreviewSite(state, (_) => null);
+ site = PreviewSite(state, ([_]) => null);
}
void test_applyChangesEmpty() {
diff --git a/pkg/analysis_server/test/src/flutter/flutter_correction_test.dart b/pkg/analysis_server/test/src/flutter/flutter_correction_test.dart
index 96a9bcc..701dc96 100644
--- a/pkg/analysis_server/test/src/flutter/flutter_correction_test.dart
+++ b/pkg/analysis_server/test/src/flutter/flutter_correction_test.dart
@@ -22,7 +22,7 @@
@override
int findOffset(String search) {
- int offset = testCode.indexOf(search);
+ var offset = testCode.indexOf(search);
expect(offset, isNonNegative, reason: "Not found '$search' in\n$testCode");
return offset;
}
diff --git a/pkg/analysis_server/test/src/flutter/flutter_outline_computer_test.dart b/pkg/analysis_server/test/src/flutter/flutter_outline_computer_test.dart
index 9950666..58c910f 100644
--- a/pkg/analysis_server/test/src/flutter/flutter_outline_computer_test.dart
+++ b/pkg/analysis_server/test/src/flutter/flutter_outline_computer_test.dart
@@ -33,7 +33,7 @@
}
Future<void> test_attribute_namedExpression() async {
- FlutterOutline unitOutline = await _computeOutline('''
+ var unitOutline = await _computeOutline('''
import 'package:flutter/widgets.dart';
main() {
@@ -114,7 +114,7 @@
}
Future<void> test_attributes_string_interpolation() async {
- FlutterOutline unitOutline = await _computeOutline(r'''
+ var unitOutline = await _computeOutline(r'''
import 'package:flutter/widgets.dart';
class MyWidget extends StatelessWidget {
@@ -131,7 +131,7 @@
expect(textOutline.attributes, hasLength(1));
- FlutterOutlineAttribute attribute = textOutline.attributes[0];
+ var attribute = textOutline.attributes[0];
expect(attribute.name, 'data');
expect(attribute.label, r"'Hello, $name!'");
expect(attribute.literalValueString, isNull);
@@ -144,7 +144,7 @@
}
Future<void> test_attributes_unresolved() async {
- FlutterOutline unitOutline = await _computeOutline('''
+ var unitOutline = await _computeOutline('''
import 'package:flutter/widgets.dart';
class MyWidget extends StatelessWidget {
@@ -162,7 +162,7 @@
}
Future<void> test_children() async {
- FlutterOutline unitOutline = await _computeOutline('''
+ var unitOutline = await _computeOutline('''
import 'package:flutter/widgets.dart';
class MyWidget extends StatelessWidget {
@@ -188,24 +188,24 @@
var columnOutline = build.children[0];
{
- int offset = testCode.indexOf('new Column');
- int length = testCode.indexOf('; // Column') - offset;
+ var offset = testCode.indexOf('new Column');
+ var length = testCode.indexOf('; // Column') - offset;
expect(columnOutline.offset, offset);
expect(columnOutline.length, length);
}
{
var textOutline = columnOutline.children[0];
- String text = "const Text('aaa')";
- int offset = testCode.indexOf(text);
+ var text = "const Text('aaa')";
+ var offset = testCode.indexOf(text);
expect(textOutline.offset, offset);
expect(textOutline.length, text.length);
}
{
var textOutline = columnOutline.children[1];
- String text = "const Text('bbb')";
- int offset = testCode.indexOf(text);
+ var text = "const Text('bbb')";
+ var offset = testCode.indexOf(text);
expect(textOutline.offset, offset);
expect(textOutline.length, text.length);
}
@@ -221,7 +221,7 @@
WidgetA(this.factory);
}
''');
- FlutterOutline unitOutline = await _computeOutline('''
+ var unitOutline = await _computeOutline('''
import 'package:flutter/widgets.dart';
import 'a.dart';
@@ -257,7 +257,7 @@
WidgetA(this.factory);
}
''');
- FlutterOutline unitOutline = await _computeOutline('''
+ var unitOutline = await _computeOutline('''
import 'package:flutter/widgets.dart';
import 'a.dart';
@@ -279,7 +279,7 @@
}
Future<void> test_children_withCollectionElements() async {
- FlutterOutline unitOutline = await _computeOutline('''
+ var unitOutline = await _computeOutline('''
import 'package:flutter/widgets.dart';
class MyWidget extends StatelessWidget {
@@ -306,7 +306,7 @@
}
Future<void> test_codeOffsetLength() async {
- FlutterOutline unitOutline = await _computeOutline('''
+ var unitOutline = await _computeOutline('''
import 'package:flutter/widgets.dart';
/// Comment
@@ -337,7 +337,7 @@
}
Future<void> test_genericLabel_invocation() async {
- FlutterOutline unitOutline = await _computeOutline(r'''
+ var unitOutline = await _computeOutline(r'''
import 'package:flutter/widgets.dart';
class MyWidget extends StatelessWidget {
@@ -403,7 +403,7 @@
WidgetA({this.top, this.bottom});
}
''');
- FlutterOutline unitOutline = await _computeOutline('''
+ var unitOutline = await _computeOutline('''
import 'package:flutter/widgets.dart';
import 'a.dart';
@@ -427,7 +427,7 @@
}
Future<void> test_variableName() async {
- FlutterOutline unitOutline = await _computeOutline('''
+ var unitOutline = await _computeOutline('''
import 'package:flutter/widgets.dart';
class MyWidget extends StatelessWidget {
@@ -473,7 +473,7 @@
Future<FlutterOutlineAttribute> _getAttribute(
String name, String value) async {
- FlutterOutline unitOutline = await _computeOutline('''
+ var unitOutline = await _computeOutline('''
import 'package:flutter/widgets.dart';
main() {
diff --git a/pkg/analysis_server/test/src/flutter/flutter_outline_notification_test.dart b/pkg/analysis_server/test/src/flutter/flutter_outline_notification_test.dart
index a9c7518..67fec6f 100644
--- a/pkg/analysis_server/test/src/flutter/flutter_outline_notification_test.dart
+++ b/pkg/analysis_server/test/src/flutter/flutter_outline_notification_test.dart
@@ -42,7 +42,7 @@
}
files.add(file);
// set subscriptions
- Request request =
+ var request =
FlutterSetSubscriptionsParams(flutterSubscriptions).toRequest('0');
handleSuccessfulRequest(request, handler: flutterHandler);
}
@@ -93,27 +93,27 @@
''';
addTestFile(code);
await prepareOutline();
- FlutterOutline unitOutline = outline;
+ var unitOutline = outline;
- FlutterOutline myWidgetOutline = unitOutline.children[0];
+ var myWidgetOutline = unitOutline.children[0];
expect(myWidgetOutline.kind, FlutterOutlineKind.DART_ELEMENT);
expect(myWidgetOutline.dartElement.name, 'MyWidget');
- FlutterOutline buildOutline = myWidgetOutline.children[0];
+ var buildOutline = myWidgetOutline.children[0];
expect(buildOutline.kind, FlutterOutlineKind.DART_ELEMENT);
expect(buildOutline.dartElement.name, 'build');
- FlutterOutline columnOutline = buildOutline.children[0];
+ var columnOutline = buildOutline.children[0];
expect(columnOutline.kind, FlutterOutlineKind.NEW_INSTANCE);
expect(columnOutline.className, 'Column');
expect(columnOutline.children, hasLength(2));
- FlutterOutline textOutlineA = columnOutline.children[0];
+ var textOutlineA = columnOutline.children[0];
expect(textOutlineA.kind, FlutterOutlineKind.NEW_INSTANCE);
expect(textOutlineA.className, 'Text');
expect(textOutlineA.offset, code.indexOf("const Text('aaa')"));
- FlutterOutline textOutlineB = columnOutline.children[1];
+ var textOutlineB = columnOutline.children[1];
expect(textOutlineB.kind, FlutterOutlineKind.NEW_INSTANCE);
expect(textOutlineB.className, 'Text');
expect(textOutlineB.offset, code.indexOf("const Text('bbb')"));
diff --git a/pkg/analysis_server/test/src/plugin/notification_manager_test.dart b/pkg/analysis_server/test/src/plugin/notification_manager_test.dart
index 8ffa2bf..891e189 100644
--- a/pkg/analysis_server/test/src/plugin/notification_manager_test.dart
+++ b/pkg/analysis_server/test/src/plugin/notification_manager_test.dart
@@ -42,7 +42,7 @@
NotificationManager manager;
void setUp() {
- MemoryResourceProvider provider = MemoryResourceProvider();
+ var provider = MemoryResourceProvider();
testDir = provider.convertPath('/test');
fileA = provider.convertPath('/test/a.dart');
fileB = provider.convertPath('/test/b.dart');
@@ -52,10 +52,9 @@
void test_handlePluginNotification_errors() {
manager.setAnalysisRoots([testDir], []);
- AnalysisError error1 = analysisError(0, 0, file: fileA);
- AnalysisError error2 = analysisError(3, 4, file: fileA);
- plugin.AnalysisErrorsParams params =
- plugin.AnalysisErrorsParams(fileA, [error1, error2]);
+ var error1 = analysisError(0, 0, file: fileA);
+ var error2 = analysisError(3, 4, file: fileA);
+ var params = plugin.AnalysisErrorsParams(fileA, [error1, error2]);
manager.handlePluginNotification('a', params.toNotification());
_verifyErrors(fileA, [error1, error2]);
}
@@ -64,10 +63,9 @@
manager.setSubscriptions({
server.AnalysisService.FOLDING: {fileA, fileB}
});
- FoldingRegion region1 = foldingRegion(10, 3);
- FoldingRegion region2 = foldingRegion(20, 6);
- plugin.AnalysisFoldingParams params =
- plugin.AnalysisFoldingParams(fileA, [region1, region2]);
+ var region1 = foldingRegion(10, 3);
+ var region2 = foldingRegion(20, 6);
+ var params = plugin.AnalysisFoldingParams(fileA, [region1, region2]);
manager.handlePluginNotification('a', params.toNotification());
_verifyFoldingRegions(fileA, [region1, region2]);
}
@@ -76,10 +74,9 @@
manager.setSubscriptions({
server.AnalysisService.HIGHLIGHTS: {fileA, fileB}
});
- HighlightRegion region1 = highlightRegion(10, 3);
- HighlightRegion region2 = highlightRegion(20, 6);
- plugin.AnalysisHighlightsParams params =
- plugin.AnalysisHighlightsParams(fileA, [region1, region2]);
+ var region1 = highlightRegion(10, 3);
+ var region2 = highlightRegion(20, 6);
+ var params = plugin.AnalysisHighlightsParams(fileA, [region1, region2]);
manager.handlePluginNotification('a', params.toNotification());
_verifyHighlightRegions(fileA, [region1, region2]);
}
@@ -88,12 +85,10 @@
manager.setSubscriptions({
server.AnalysisService.NAVIGATION: {fileA, fileB}
});
- plugin.AnalysisNavigationParams pluginParams =
- pluginNavigationParams(0, 0, file: fileA);
+ var pluginParams = pluginNavigationParams(0, 0, file: fileA);
manager.handlePluginNotification('a', pluginParams.toNotification());
- server.AnalysisNavigationParams serverParams =
- serverNavigationParams(0, 0, file: fileA);
+ var serverParams = serverNavigationParams(0, 0, file: fileA);
_verifyNavigationParams(serverParams);
}
@@ -101,9 +96,9 @@
manager.setSubscriptions({
server.AnalysisService.OCCURRENCES: {fileA, fileB}
});
- Occurrences occurrences1 = occurrences(0, 0);
- Occurrences occurrences2 = occurrences(5, 7);
- plugin.AnalysisOccurrencesParams params =
+ var occurrences1 = occurrences(0, 0);
+ var occurrences2 = occurrences(5, 7);
+ var params =
plugin.AnalysisOccurrencesParams(fileA, [occurrences1, occurrences2]);
manager.handlePluginNotification('a', params.toNotification());
@@ -114,26 +109,24 @@
manager.setSubscriptions({
server.AnalysisService.OUTLINE: {fileA, fileB}
});
- Outline outline1 = outline(0, 0);
- plugin.AnalysisOutlineParams params =
- plugin.AnalysisOutlineParams(fileA, [outline1]);
+ var outline1 = outline(0, 0);
+ var params = plugin.AnalysisOutlineParams(fileA, [outline1]);
manager.handlePluginNotification('a', params.toNotification());
_verifyOutlines(fileA, outline1);
}
void test_handlePluginNotification_pluginError() {
- bool isFatal = false;
- String message = 'message';
- String stackTrace = 'stackTrace';
- plugin.PluginErrorParams params =
- plugin.PluginErrorParams(isFatal, message, stackTrace);
+ var isFatal = false;
+ var message = 'message';
+ var stackTrace = 'stackTrace';
+ var params = plugin.PluginErrorParams(isFatal, message, stackTrace);
manager.handlePluginNotification('a', params.toNotification());
_verifyPluginError(isFatal, message, stackTrace);
}
void test_recordAnalysisErrors_noSubscription() {
- AnalysisError error = analysisError(0, 0, file: fileA);
+ var error = analysisError(0, 0, file: fileA);
manager.recordAnalysisErrors('a', fileA, [error]);
expect(channel.sentNotification, isNull);
}
@@ -143,34 +136,34 @@
//
// Errors should be reported when they are recorded.
//
- AnalysisError error1 = analysisError(0, 0, file: fileA);
- AnalysisError error2 = analysisError(3, 4, file: fileA);
+ var error1 = analysisError(0, 0, file: fileA);
+ var error2 = analysisError(3, 4, file: fileA);
manager.recordAnalysisErrors('a', fileA, [error1, error2]);
_verifyErrors(fileA, [error1, error2]);
//
// Errors from different plugins should be cumulative.
//
- AnalysisError error3 = analysisError(6, 8, file: fileA);
+ var error3 = analysisError(6, 8, file: fileA);
manager.recordAnalysisErrors('b', fileA, [error3]);
_verifyErrors(fileA, [error1, error2, error3]);
//
// Overwriting errors from one plugin should not affect errors from other
// plugins.
//
- AnalysisError error4 = analysisError(9, 12, file: fileA);
+ var error4 = analysisError(9, 12, file: fileA);
manager.recordAnalysisErrors('a', fileA, [error4]);
_verifyErrors(fileA, [error4, error3]);
//
// Recording errors against a file should not affect the errors for other
// files.
//
- AnalysisError error5 = analysisError(12, 16, file: fileB);
+ var error5 = analysisError(12, 16, file: fileB);
manager.recordAnalysisErrors('a', fileB, [error5]);
_verifyErrors(fileB, [error5]);
}
void test_recordFoldingRegions_noSubscription() {
- FoldingRegion region = foldingRegion(10, 5);
+ var region = foldingRegion(10, 5);
manager.recordFoldingRegions('a', fileA, [region]);
expect(channel.sentNotification, isNull);
}
@@ -182,34 +175,34 @@
//
// Regions should be reported when they are recorded.
//
- FoldingRegion region1 = foldingRegion(10, 3);
- FoldingRegion region2 = foldingRegion(20, 6);
+ var region1 = foldingRegion(10, 3);
+ var region2 = foldingRegion(20, 6);
manager.recordFoldingRegions('a', fileA, [region1, region2]);
_verifyFoldingRegions(fileA, [region1, region2]);
//
// Regions from different plugins should be cumulative.
//
- FoldingRegion region3 = foldingRegion(30, 5);
+ var region3 = foldingRegion(30, 5);
manager.recordFoldingRegions('b', fileA, [region3]);
_verifyFoldingRegions(fileA, [region1, region2, region3]);
//
// Overwriting regions from one plugin should not affect regions from other
// plugins.
//
- FoldingRegion region4 = foldingRegion(40, 2);
+ var region4 = foldingRegion(40, 2);
manager.recordFoldingRegions('a', fileA, [region4]);
_verifyFoldingRegions(fileA, [region4, region3]);
//
// Recording regions against a file should not affect the regions for other
// files.
//
- FoldingRegion region5 = foldingRegion(50, 7);
+ var region5 = foldingRegion(50, 7);
manager.recordFoldingRegions('a', fileB, [region5]);
_verifyFoldingRegions(fileB, [region5]);
}
void test_recordHighlightRegions_noSubscription() {
- HighlightRegion region = highlightRegion(10, 5);
+ var region = highlightRegion(10, 5);
manager.recordHighlightRegions('a', fileA, [region]);
expect(channel.sentNotification, isNull);
}
@@ -221,35 +214,34 @@
//
// Regions should be reported when they are recorded.
//
- HighlightRegion region1 = highlightRegion(10, 3);
- HighlightRegion region2 = highlightRegion(20, 6);
+ var region1 = highlightRegion(10, 3);
+ var region2 = highlightRegion(20, 6);
manager.recordHighlightRegions('a', fileA, [region1, region2]);
_verifyHighlightRegions(fileA, [region1, region2]);
//
// Regions from different plugins should be cumulative.
//
- HighlightRegion region3 = highlightRegion(30, 5);
+ var region3 = highlightRegion(30, 5);
manager.recordHighlightRegions('b', fileA, [region3]);
_verifyHighlightRegions(fileA, [region1, region2, region3]);
//
// Overwriting regions from one plugin should not affect regions from other
// plugins.
//
- HighlightRegion region4 = highlightRegion(40, 2);
+ var region4 = highlightRegion(40, 2);
manager.recordHighlightRegions('a', fileA, [region4]);
_verifyHighlightRegions(fileA, [region4, region3]);
//
// Recording regions against a file should not affect the regions for other
// files.
//
- HighlightRegion region5 = highlightRegion(50, 7);
+ var region5 = highlightRegion(50, 7);
manager.recordHighlightRegions('a', fileB, [region5]);
_verifyHighlightRegions(fileB, [region5]);
}
void test_recordNavigationParams_noSubscription() {
- server.AnalysisNavigationParams params =
- serverNavigationParams(0, 0, file: fileA);
+ var params = serverNavigationParams(0, 0, file: fileA);
manager.recordNavigationParams('a', fileA, params);
expect(channel.sentNotification, isNull);
}
@@ -261,18 +253,15 @@
//
// Parameters should be reported when they are recorded.
//
- server.AnalysisNavigationParams params1 =
- serverNavigationParams(0, 0, file: fileA);
+ var params1 = serverNavigationParams(0, 0, file: fileA);
manager.recordNavigationParams('a', fileA, params1);
_verifyNavigationParams(params1);
//
// Parameters from different plugins should be cumulative.
//
- server.AnalysisNavigationParams params2 =
- serverNavigationParams(2, 4, file: fileA);
+ var params2 = serverNavigationParams(2, 4, file: fileA);
manager.recordNavigationParams('b', fileA, params2);
- server.AnalysisNavigationParams params1and2 =
- server.AnalysisNavigationParams(fileA, <NavigationRegion>[
+ var params1and2 = server.AnalysisNavigationParams(fileA, <NavigationRegion>[
NavigationRegion(0, 2, <int>[0]),
NavigationRegion(4, 2, <int>[1])
], <NavigationTarget>[
@@ -289,11 +278,9 @@
// Overwriting parameters from one plugin should not affect parameters from
// other plugins.
//
- server.AnalysisNavigationParams params3 =
- serverNavigationParams(4, 8, file: fileA);
+ var params3 = serverNavigationParams(4, 8, file: fileA);
manager.recordNavigationParams('a', fileA, params3);
- server.AnalysisNavigationParams params3and2 =
- server.AnalysisNavigationParams(fileA, <NavigationRegion>[
+ var params3and2 = server.AnalysisNavigationParams(fileA, <NavigationRegion>[
NavigationRegion(8, 2, <int>[0]),
NavigationRegion(4, 2, <int>[1])
], <NavigationTarget>[
@@ -310,14 +297,13 @@
// Recording parameters against a file should not affect the parameters for
// other files.
//
- server.AnalysisNavigationParams params4 =
- serverNavigationParams(6, 12, file: fileB);
+ var params4 = serverNavigationParams(6, 12, file: fileB);
manager.recordNavigationParams('a', fileB, params4);
_verifyNavigationParams(params4);
}
void test_recordOccurrences_noSubscription() {
- Occurrences occurrences1 = occurrences(0, 0);
+ var occurrences1 = occurrences(0, 0);
manager.recordOccurrences('a', fileA, [occurrences1]);
expect(channel.sentNotification, isNull);
}
@@ -329,34 +315,34 @@
//
// Occurrences should be reported when they are recorded.
//
- Occurrences occurrences1 = occurrences(0, 0);
- Occurrences occurrences2 = occurrences(5, 7);
+ var occurrences1 = occurrences(0, 0);
+ var occurrences2 = occurrences(5, 7);
manager.recordOccurrences('a', fileA, [occurrences1, occurrences2]);
_verifyOccurrences(fileA, [occurrences1, occurrences2]);
//
// Occurrences from different plugins should be cumulative.
//
- Occurrences occurrences3 = occurrences(10, 14);
+ var occurrences3 = occurrences(10, 14);
manager.recordOccurrences('b', fileA, [occurrences3]);
_verifyOccurrences(fileA, [occurrences1, occurrences2, occurrences3]);
//
// Overwriting occurrences from one plugin should not affect occurrences
// from other plugins.
//
- Occurrences occurrences4 = occurrences(15, 21);
+ var occurrences4 = occurrences(15, 21);
manager.recordOccurrences('a', fileA, [occurrences4]);
_verifyOccurrences(fileA, [occurrences4, occurrences3]);
//
// Recording occurrences against a file should not affect the occurrences
// for other files.
//
- Occurrences occurrences5 = occurrences(20, 28);
+ var occurrences5 = occurrences(20, 28);
manager.recordOccurrences('a', fileB, [occurrences5]);
_verifyOccurrences(fileB, [occurrences5]);
}
void test_recordOutlines_noSubscription() {
- Outline outline1 = outline(0, 0);
+ var outline1 = outline(0, 0);
manager.recordOutlines('a', fileA, [outline1]);
expect(channel.sentNotification, isNull);
}
@@ -372,15 +358,15 @@
//
// Outlines should be reported when they are recorded.
//
- Outline outline1 = outline(0, 0);
- Outline outline2 = outline(5, 7);
+ var outline1 = outline(0, 0);
+ var outline2 = outline(5, 7);
manager.recordOutlines('a', fileA, [outline1, outline2]);
// TODO(brianwilkerson) Figure out how to test this.
// _verifyOutlines(fileA, [outline1, outline2]);
//
// Outlines from different plugins should be cumulative.
//
- Outline outline3 = outline(10, 14);
+ var outline3 = outline(10, 14);
manager.recordOutlines('b', fileA, [outline3]);
// TODO(brianwilkerson) Figure out how to test this.
// _verifyOutlines(fileA, [outline1, outline2, outline3]);
@@ -388,7 +374,7 @@
// Overwriting outlines from one plugin should not affect outlines from
// other plugins.
//
- Outline outline4 = outline(15, 21);
+ var outline4 = outline(15, 21);
manager.recordOutlines('a', fileA, [outline4]);
// TODO(brianwilkerson) Figure out how to test this.
// _verifyOutlines(fileA, [outline4, outline3]);
@@ -396,18 +382,17 @@
// Recording outlines against a file should not affect the outlines for
// other files.
//
- Outline outline5 = outline(20, 28);
+ var outline5 = outline(20, 28);
manager.recordOutlines('a', fileB, [outline5]);
// TODO(brianwilkerson) Figure out how to test this.
// _verifyOutlines(fileB, [outline5]);
}
void _verifyErrors(String fileName, List<AnalysisError> expectedErrors) {
- server.Notification notification = channel.sentNotification;
+ var notification = channel.sentNotification;
expect(notification, isNotNull);
expect(notification.event, 'analysis.errors');
- server.AnalysisErrorsParams params =
- server.AnalysisErrorsParams.fromNotification(notification);
+ var params = server.AnalysisErrorsParams.fromNotification(notification);
expect(params, isNotNull);
expect(params.file, fileName);
expect(params.errors, equals(expectedErrors));
@@ -416,11 +401,10 @@
void _verifyFoldingRegions(
String fileName, List<FoldingRegion> expectedRegions) {
- server.Notification notification = channel.sentNotification;
+ var notification = channel.sentNotification;
expect(notification, isNotNull);
expect(notification.event, 'analysis.folding');
- server.AnalysisFoldingParams params =
- server.AnalysisFoldingParams.fromNotification(notification);
+ var params = server.AnalysisFoldingParams.fromNotification(notification);
expect(params, isNotNull);
expect(params.file, fileName);
expect(params.regions, equals(expectedRegions));
@@ -429,11 +413,10 @@
void _verifyHighlightRegions(
String fileName, List<HighlightRegion> expectedRegions) {
- server.Notification notification = channel.sentNotification;
+ var notification = channel.sentNotification;
expect(notification, isNotNull);
expect(notification.event, 'analysis.highlights');
- server.AnalysisHighlightsParams params =
- server.AnalysisHighlightsParams.fromNotification(notification);
+ var params = server.AnalysisHighlightsParams.fromNotification(notification);
expect(params, isNotNull);
expect(params.file, fileName);
expect(params.regions, equals(expectedRegions));
@@ -441,11 +424,10 @@
}
void _verifyNavigationParams(server.AnalysisNavigationParams expectedParams) {
- server.Notification notification = channel.sentNotification;
+ var notification = channel.sentNotification;
expect(notification, isNotNull);
expect(notification.event, 'analysis.navigation');
- server.AnalysisNavigationParams params =
- server.AnalysisNavigationParams.fromNotification(notification);
+ var params = server.AnalysisNavigationParams.fromNotification(notification);
expect(params, isNotNull);
expect(params.file, expectedParams.file);
expect(params.files, equals(expectedParams.files));
@@ -456,10 +438,10 @@
void _verifyOccurrences(
String fileName, List<Occurrences> expectedOccurrences) {
- server.Notification notification = channel.sentNotification;
+ var notification = channel.sentNotification;
expect(notification, isNotNull);
expect(notification.event, 'analysis.occurrences');
- server.AnalysisOccurrencesParams params =
+ var params =
server.AnalysisOccurrencesParams.fromNotification(notification);
expect(params, isNotNull);
expect(params.file, fileName);
@@ -468,11 +450,10 @@
}
void _verifyOutlines(String fileName, Outline expectedOutline) {
- server.Notification notification = channel.sentNotification;
+ var notification = channel.sentNotification;
expect(notification, isNotNull);
expect(notification.event, 'analysis.outline');
- server.AnalysisOutlineParams params =
- server.AnalysisOutlineParams.fromNotification(notification);
+ var params = server.AnalysisOutlineParams.fromNotification(notification);
expect(params, isNotNull);
expect(params.file, fileName);
expect(params.outline, equals(expectedOutline));
@@ -480,11 +461,10 @@
}
void _verifyPluginError(bool isFatal, String message, String stackTrace) {
- server.Notification notification = channel.sentNotification;
+ var notification = channel.sentNotification;
expect(notification, isNotNull);
expect(notification.event, 'server.error');
- server.ServerErrorParams params =
- server.ServerErrorParams.fromNotification(notification);
+ var params = server.ServerErrorParams.fromNotification(notification);
expect(params, isNotNull);
expect(params.isFatal, isFatal);
expect(params.message, message);
diff --git a/pkg/analysis_server/test/src/plugin/plugin_locator_test.dart b/pkg/analysis_server/test/src/plugin/plugin_locator_test.dart
index 6066b93..4e4cbda 100644
--- a/pkg/analysis_server/test/src/plugin/plugin_locator_test.dart
+++ b/pkg/analysis_server/test/src/plugin/plugin_locator_test.dart
@@ -29,7 +29,7 @@
void test_findPlugin_inPubspec_defaultDir() {
// Support for specifying plugin locations in the pubspec is temporarily
// disabled.
- String dirPath = _createPubspecWithKey();
+ var dirPath = _createPubspecWithKey();
_createDefaultDir();
expect(locator.findPlugin(packageRoot), dirPath);
}
@@ -38,7 +38,7 @@
void test_findPlugin_inPubspec_noDefaultDir() {
// Support for specifying plugin locations in the pubspec is temporarily
// disabled.
- String dirPath = _createPubspecWithKey();
+ var dirPath = _createPubspecWithKey();
expect(locator.findPlugin(packageRoot), dirPath);
}
@@ -75,7 +75,7 @@
}
String _createPubspecWithKey() {
- String nonDefaultPath = newFolder('/package/pluginDir').path;
+ var nonDefaultPath = newFolder('/package/pluginDir').path;
_createPubspec('''
name: test_project
${PluginLocator.analyzerPluginKey}: $nonDefaultPath
diff --git a/pkg/analysis_server/test/src/plugin/plugin_manager_test.dart b/pkg/analysis_server/test/src/plugin/plugin_manager_test.dart
index 7962f62..b53385c 100644
--- a/pkg/analysis_server/test/src/plugin/plugin_manager_test.dart
+++ b/pkg/analysis_server/test/src/plugin/plugin_manager_test.dart
@@ -7,7 +7,6 @@
import 'package:analysis_server/src/plugin/notification_manager.dart';
import 'package:analysis_server/src/plugin/plugin_manager.dart';
-import 'package:analyzer/file_system/file_system.dart';
import 'package:analyzer/file_system/physical_file_system.dart';
import 'package:analyzer/instrumentation/instrumentation.dart';
import 'package:analyzer/src/context/context_root.dart';
@@ -49,7 +48,7 @@
}
void test_addContextRoot() {
- ContextRoot contextRoot1 = _newContextRoot('/pkg1');
+ var contextRoot1 = _newContextRoot('/pkg1');
plugin.addContextRoot(contextRoot1);
expect(plugin.contextRoots, [contextRoot1]);
plugin.addContextRoot(contextRoot1);
@@ -64,8 +63,8 @@
}
void test_removeContextRoot() {
- ContextRoot contextRoot1 = _newContextRoot('/pkg1');
- ContextRoot contextRoot2 = _newContextRoot('/pkg2');
+ var contextRoot1 = _newContextRoot('/pkg1');
+ var contextRoot2 = _newContextRoot('/pkg2');
plugin.addContextRoot(contextRoot1);
expect(plugin.contextRoots, unorderedEquals([contextRoot1]));
plugin.addContextRoot(contextRoot2);
@@ -96,9 +95,8 @@
}
Future<void> test_stop_running() async {
- PluginSession session = PluginSession(plugin);
- TestServerCommunicationChannel channel =
- TestServerCommunicationChannel(session);
+ var session = PluginSession(plugin);
+ var channel = TestServerCommunicationChannel(session);
plugin.currentSession = session;
await plugin.stop();
expect(plugin.currentSession, isNull);
@@ -122,18 +120,17 @@
}
void test_addContextRoot() {
- String optionsFilePath = '/pkg1/analysis_options.yaml';
- ContextRoot contextRoot1 = _newContextRoot('/pkg1');
+ var optionsFilePath = '/pkg1/analysis_options.yaml';
+ var contextRoot1 = _newContextRoot('/pkg1');
contextRoot1.optionsFilePath = optionsFilePath;
- PluginSession session = PluginSession(plugin);
- TestServerCommunicationChannel channel =
- TestServerCommunicationChannel(session);
+ var session = PluginSession(plugin);
+ var channel = TestServerCommunicationChannel(session);
plugin.currentSession = session;
plugin.addContextRoot(contextRoot1);
expect(plugin.contextRoots, [contextRoot1]);
plugin.addContextRoot(contextRoot1);
expect(plugin.contextRoots, [contextRoot1]);
- List<Request> sentRequests = channel.sentRequests;
+ var sentRequests = channel.sentRequests;
expect(sentRequests, hasLength(1));
List<Map> roots = sentRequests[0].params['roots'];
expect(roots[0]['optionsFile'], optionsFilePath);
@@ -148,8 +145,8 @@
}
void test_removeContextRoot() {
- ContextRoot contextRoot1 = _newContextRoot('/pkg1');
- ContextRoot contextRoot2 = _newContextRoot('/pkg2');
+ var contextRoot1 = _newContextRoot('/pkg1');
+ var contextRoot2 = _newContextRoot('/pkg2');
plugin.addContextRoot(contextRoot1);
expect(plugin.contextRoots, unorderedEquals([contextRoot1]));
plugin.addContextRoot(contextRoot2);
@@ -180,9 +177,8 @@
}
Future<void> test_stop_running() async {
- PluginSession session = PluginSession(plugin);
- TestServerCommunicationChannel channel =
- TestServerCommunicationChannel(session);
+ var session = PluginSession(plugin);
+ var channel = TestServerCommunicationChannel(session);
plugin.currentSession = session;
await plugin.stop();
expect(plugin.currentSession, isNull);
@@ -207,10 +203,10 @@
reason: 'flaky timeouts',
issue: 'https://github.com/dart-lang/sdk/issues/38629')
Future<void> test_addPluginToContextRoot() async {
- io.Directory pkg1Dir = io.Directory.systemTemp.createTempSync('pkg1');
- String pkgPath = pkg1Dir.resolveSymbolicLinksSync();
+ var pkg1Dir = io.Directory.systemTemp.createTempSync('pkg1');
+ var pkgPath = pkg1Dir.resolveSymbolicLinksSync();
await withPlugin(test: (String pluginPath) async {
- ContextRoot contextRoot = _newContextRoot(pkgPath);
+ var contextRoot = _newContextRoot(pkgPath);
await manager.addPluginToContextRoot(contextRoot, pluginPath);
await manager.stopAll();
});
@@ -241,23 +237,21 @@
reason: 'flaky timeouts',
issue: 'https://github.com/dart-lang/sdk/issues/38629')
Future<void> test_broadcastRequest_many() async {
- io.Directory pkg1Dir = io.Directory.systemTemp.createTempSync('pkg1');
- String pkgPath = pkg1Dir.resolveSymbolicLinksSync();
+ var pkg1Dir = io.Directory.systemTemp.createTempSync('pkg1');
+ var pkgPath = pkg1Dir.resolveSymbolicLinksSync();
await withPlugin(
pluginName: 'plugin1',
test: (String plugin1Path) async {
await withPlugin(
pluginName: 'plugin2',
test: (String plugin2Path) async {
- ContextRoot contextRoot = _newContextRoot(pkgPath);
+ var contextRoot = _newContextRoot(pkgPath);
await manager.addPluginToContextRoot(contextRoot, plugin1Path);
await manager.addPluginToContextRoot(contextRoot, plugin2Path);
- Map<PluginInfo, Future<Response>> responses =
- manager.broadcastRequest(
- CompletionGetSuggestionsParams(
- '/pkg1/lib/pkg1.dart', 100),
- contextRoot: contextRoot);
+ var responses = manager.broadcastRequest(
+ CompletionGetSuggestionsParams('/pkg1/lib/pkg1.dart', 100),
+ contextRoot: contextRoot);
expect(responses, hasLength(2));
await manager.stopAll();
@@ -270,21 +264,20 @@
reason: 'flaky timeouts',
issue: 'https://github.com/dart-lang/sdk/issues/38629')
Future<void> test_broadcastRequest_many_noContextRoot() async {
- io.Directory pkg1Dir = io.Directory.systemTemp.createTempSync('pkg1');
- String pkgPath = pkg1Dir.resolveSymbolicLinksSync();
+ var pkg1Dir = io.Directory.systemTemp.createTempSync('pkg1');
+ var pkgPath = pkg1Dir.resolveSymbolicLinksSync();
await withPlugin(
pluginName: 'plugin1',
test: (String plugin1Path) async {
await withPlugin(
pluginName: 'plugin2',
test: (String plugin2Path) async {
- ContextRoot contextRoot = _newContextRoot(pkgPath);
+ var contextRoot = _newContextRoot(pkgPath);
await manager.addPluginToContextRoot(contextRoot, plugin1Path);
await manager.addPluginToContextRoot(contextRoot, plugin2Path);
- Map<PluginInfo, Future<Response>> responses =
- manager.broadcastRequest(CompletionGetSuggestionsParams(
- '/pkg1/lib/pkg1.dart', 100));
+ var responses = manager.broadcastRequest(
+ CompletionGetSuggestionsParams('/pkg1/lib/pkg1.dart', 100));
expect(responses, hasLength(2));
await manager.stopAll();
@@ -297,19 +290,18 @@
reason: 'flaky timeouts',
issue: 'https://github.com/dart-lang/sdk/issues/38629')
Future<void> test_broadcastRequest_noCurrentSession() async {
- io.Directory pkg1Dir = io.Directory.systemTemp.createTempSync('pkg1');
- String pkgPath = pkg1Dir.resolveSymbolicLinksSync();
+ var pkg1Dir = io.Directory.systemTemp.createTempSync('pkg1');
+ var pkgPath = pkg1Dir.resolveSymbolicLinksSync();
await withPlugin(
pluginName: 'plugin1',
content: '(invalid content here)',
test: (String plugin1Path) async {
- ContextRoot contextRoot = _newContextRoot(pkgPath);
+ var contextRoot = _newContextRoot(pkgPath);
await manager.addPluginToContextRoot(contextRoot, plugin1Path);
- Map<PluginInfo, Future<Response>> responses =
- manager.broadcastRequest(
- CompletionGetSuggestionsParams('/pkg1/lib/pkg1.dart', 100),
- contextRoot: contextRoot);
+ var responses = manager.broadcastRequest(
+ CompletionGetSuggestionsParams('/pkg1/lib/pkg1.dart', 100),
+ contextRoot: contextRoot);
expect(responses, hasLength(0));
await manager.stopAll();
@@ -321,21 +313,20 @@
reason: 'flaky timeouts',
issue: 'https://github.com/dart-lang/sdk/issues/38629')
Future<void> test_broadcastWatchEvent() async {
- io.Directory pkg1Dir = io.Directory.systemTemp.createTempSync('pkg1');
- String pkgPath = pkg1Dir.resolveSymbolicLinksSync();
+ var pkg1Dir = io.Directory.systemTemp.createTempSync('pkg1');
+ var pkgPath = pkg1Dir.resolveSymbolicLinksSync();
await withPlugin(
pluginName: 'plugin1',
test: (String plugin1Path) async {
- ContextRoot contextRoot = _newContextRoot(pkgPath);
+ var contextRoot = _newContextRoot(pkgPath);
await manager.addPluginToContextRoot(contextRoot, plugin1Path);
- List<PluginInfo> plugins = manager.pluginsForContextRoot(contextRoot);
+ var plugins = manager.pluginsForContextRoot(contextRoot);
expect(plugins, hasLength(1));
- watcher.WatchEvent watchEvent = watcher.WatchEvent(
+ var watchEvent = watcher.WatchEvent(
watcher.ChangeType.MODIFY, path.join(pkgPath, 'lib', 'lib.dart'));
- List<Future<Response>> responses =
- await manager.broadcastWatchEvent(watchEvent);
+ var responses = await manager.broadcastWatchEvent(watchEvent);
expect(responses, hasLength(1));
- Response response = await responses[0];
+ var response = await responses[0];
expect(response, isNotNull);
expect(response.error, isNull);
await manager.stopAll();
@@ -347,22 +338,21 @@
reason: 'flaky timeouts',
issue: 'https://github.com/dart-lang/sdk/issues/38629')
Future<void> test_pluginsForContextRoot_multiple() async {
- io.Directory pkg1Dir = io.Directory.systemTemp.createTempSync('pkg1');
- String pkgPath = pkg1Dir.resolveSymbolicLinksSync();
+ var pkg1Dir = io.Directory.systemTemp.createTempSync('pkg1');
+ var pkgPath = pkg1Dir.resolveSymbolicLinksSync();
await withPlugin(
pluginName: 'plugin1',
test: (String plugin1Path) async {
await withPlugin(
pluginName: 'plugin2',
test: (String plugin2Path) async {
- ContextRoot contextRoot = _newContextRoot(pkgPath);
+ var contextRoot = _newContextRoot(pkgPath);
await manager.addPluginToContextRoot(contextRoot, plugin1Path);
await manager.addPluginToContextRoot(contextRoot, plugin2Path);
- List<PluginInfo> plugins =
- manager.pluginsForContextRoot(contextRoot);
+ var plugins = manager.pluginsForContextRoot(contextRoot);
expect(plugins, hasLength(2));
- List<String> paths = plugins
+ var paths = plugins
.map((PluginInfo plugin) => plugin.pluginId)
.toList();
expect(paths, unorderedEquals([plugin1Path, plugin2Path]));
@@ -377,13 +367,13 @@
reason: 'flaky timeouts',
issue: 'https://github.com/dart-lang/sdk/issues/38629')
Future<void> test_pluginsForContextRoot_one() async {
- io.Directory pkg1Dir = io.Directory.systemTemp.createTempSync('pkg1');
- String pkgPath = pkg1Dir.resolveSymbolicLinksSync();
+ var pkg1Dir = io.Directory.systemTemp.createTempSync('pkg1');
+ var pkgPath = pkg1Dir.resolveSymbolicLinksSync();
await withPlugin(test: (String pluginPath) async {
- ContextRoot contextRoot = _newContextRoot(pkgPath);
+ var contextRoot = _newContextRoot(pkgPath);
await manager.addPluginToContextRoot(contextRoot, pluginPath);
- List<PluginInfo> plugins = manager.pluginsForContextRoot(contextRoot);
+ var plugins = manager.pluginsForContextRoot(contextRoot);
expect(plugins, hasLength(1));
expect(plugins[0].pluginId, pluginPath);
@@ -396,10 +386,10 @@
reason: 'flaky timeouts',
issue: 'https://github.com/dart-lang/sdk/issues/38629')
Future<void> test_removedContextRoot() async {
- io.Directory pkg1Dir = io.Directory.systemTemp.createTempSync('pkg1');
- String pkgPath = pkg1Dir.resolveSymbolicLinksSync();
+ var pkg1Dir = io.Directory.systemTemp.createTempSync('pkg1');
+ var pkgPath = pkg1Dir.resolveSymbolicLinksSync();
await withPlugin(test: (String pluginPath) async {
- ContextRoot contextRoot = _newContextRoot(pkgPath);
+ var contextRoot = _newContextRoot(pkgPath);
await manager.addPluginToContextRoot(contextRoot, pluginPath);
manager.removedContextRoot(contextRoot);
@@ -414,24 +404,24 @@
reason: 'flaky timeouts',
issue: 'https://github.com/dart-lang/sdk/issues/38629')
Future<void> test_restartPlugins() async {
- io.Directory pkg1Dir = io.Directory.systemTemp.createTempSync('pkg1');
- String pkg1Path = pkg1Dir.resolveSymbolicLinksSync();
- io.Directory pkg2Dir = io.Directory.systemTemp.createTempSync('pkg2');
- String pkg2Path = pkg2Dir.resolveSymbolicLinksSync();
+ var pkg1Dir = io.Directory.systemTemp.createTempSync('pkg1');
+ var pkg1Path = pkg1Dir.resolveSymbolicLinksSync();
+ var pkg2Dir = io.Directory.systemTemp.createTempSync('pkg2');
+ var pkg2Path = pkg2Dir.resolveSymbolicLinksSync();
await withPlugin(
pluginName: 'plugin1',
test: (String plugin1Path) async {
await withPlugin(
pluginName: 'plugin2',
test: (String plugin2Path) async {
- ContextRoot contextRoot1 = _newContextRoot(pkg1Path);
- ContextRoot contextRoot2 = _newContextRoot(pkg2Path);
+ var contextRoot1 = _newContextRoot(pkg1Path);
+ var contextRoot2 = _newContextRoot(pkg2Path);
await manager.addPluginToContextRoot(contextRoot1, plugin1Path);
await manager.addPluginToContextRoot(contextRoot1, plugin2Path);
await manager.addPluginToContextRoot(contextRoot2, plugin1Path);
await manager.restartPlugins();
- List<PluginInfo> plugins = manager.plugins;
+ var plugins = manager.plugins;
expect(plugins, hasLength(2));
expect(plugins[0].currentSession, isNotNull);
expect(plugins[1].currentSession, isNotNull);
@@ -469,8 +459,8 @@
}
void test_broadcastRequest_none() {
- ContextRoot contextRoot = _newContextRoot('/pkg1');
- Map<PluginInfo, Future<Response>> responses = manager.broadcastRequest(
+ var contextRoot = _newContextRoot('/pkg1');
+ var responses = manager.broadcastRequest(
CompletionGetSuggestionsParams('/pkg1/lib/pkg1.dart', 100),
contextRoot: contextRoot);
expect(responses, hasLength(0));
@@ -488,13 +478,13 @@
// Build the minimal directory structure for a plugin package that includes
// a .packages file.
//
- String pluginDirPath = newFolder('/plugin').path;
- String pluginFilePath = newFile('/plugin/bin/plugin.dart').path;
- String packagesFilePath = newFile('/plugin/.packages').path;
+ var pluginDirPath = newFolder('/plugin').path;
+ var pluginFilePath = newFile('/plugin/bin/plugin.dart').path;
+ var packagesFilePath = newFile('/plugin/.packages').path;
//
// Test path computation.
//
- List<String> paths = manager.pathsFor(pluginDirPath);
+ var paths = manager.pathsFor(pluginDirPath);
expect(paths, hasLength(2));
expect(paths[0], pluginFilePath);
expect(paths[1], packagesFilePath);
@@ -509,13 +499,13 @@
newFolder('/workspaceRoot/bazel-genfiles');
String newPackage(String packageName, [List<String> dependencies]) {
- String packageRoot =
+ var packageRoot =
newFolder('/workspaceRoot/third_party/dart/$packageName').path;
newFile('$packageRoot/lib/$packageName.dart');
- StringBuffer buffer = StringBuffer();
+ var buffer = StringBuffer();
if (dependencies != null) {
buffer.writeln('dependencies:');
- for (String dependency in dependencies) {
+ for (var dependency in dependencies) {
buffer.writeln(' $dependency: any');
}
}
@@ -523,21 +513,21 @@
return packageRoot;
}
- String pluginDirPath = newPackage('plugin', ['b', 'c']);
+ var pluginDirPath = newPackage('plugin', ['b', 'c']);
newPackage('b', ['d']);
newPackage('c', ['d']);
newPackage('d');
- String pluginFilePath = newFile('$pluginDirPath/bin/plugin.dart').path;
+ var pluginFilePath = newFile('$pluginDirPath/bin/plugin.dart').path;
//
// Test path computation.
//
- List<String> paths = manager.pathsFor(pluginDirPath);
+ var paths = manager.pathsFor(pluginDirPath);
expect(paths, hasLength(2));
expect(paths[0], pluginFilePath);
- File packagesFile = getFile(paths[1]);
+ var packagesFile = getFile(paths[1]);
expect(packagesFile.exists, isTrue);
- String content = packagesFile.readAsStringSync();
- List<String> lines = content.split('\n');
+ var content = packagesFile.readAsStringSync();
+ var lines = content.split('\n');
String asFileUri(String input) => Uri.file(convertPath(input)).toString();
expect(
lines,
@@ -551,7 +541,7 @@
}
void test_pluginsForContextRoot_none() {
- ContextRoot contextRoot = _newContextRoot('/pkg1');
+ var contextRoot = _newContextRoot('/pkg1');
expect(manager.pluginsForContextRoot(contextRoot), isEmpty);
}
@@ -567,9 +557,9 @@
issue: 'https://github.com/dart-lang/sdk/issues/38629')
Future<void> test_start_notRunning() async {
await withPlugin(test: (String pluginPath) async {
- String packagesPath = path.join(pluginPath, '.packages');
- String mainPath = path.join(pluginPath, 'bin', 'plugin.dart');
- String byteStorePath = path.join(pluginPath, 'byteStore');
+ var packagesPath = path.join(pluginPath, '.packages');
+ var mainPath = path.join(pluginPath, 'bin', 'plugin.dart');
+ var byteStorePath = path.join(pluginPath, 'byteStore');
io.Directory(byteStorePath).createSync();
PluginInfo plugin = DiscoveredPluginInfo(
pluginPath,
@@ -577,7 +567,7 @@
packagesPath,
notificationManager,
InstrumentationService.NULL_SERVICE);
- PluginSession session = PluginSession(plugin);
+ var session = PluginSession(plugin);
plugin.currentSession = session;
expect(await session.start(byteStorePath, ''), isTrue);
await session.stop();
@@ -607,7 +597,7 @@
}
void test_handleNotification() {
- Notification notification =
+ var notification =
AnalysisErrorsParams('/test.dart', <AnalysisError>[]).toNotification();
expect(notificationManager.notifications, hasLength(0));
session.handleNotification(notification);
@@ -616,8 +606,7 @@
}
void test_handleOnDone() {
- TestServerCommunicationChannel channel =
- TestServerCommunicationChannel(session);
+ var channel = TestServerCommunicationChannel(session);
session.handleOnDone();
expect(channel.closeCount, 1);
expect(session.pluginStoppedCompleter.isCompleted, isTrue);
@@ -631,16 +620,14 @@
Future<void> test_handleResponse() async {
TestServerCommunicationChannel(session);
- Response response = PluginVersionCheckResult(
- true, 'name', 'version', <String>[],
+ var response = PluginVersionCheckResult(true, 'name', 'version', <String>[],
contactInfo: 'contactInfo')
.toResponse('0', 1);
- Future<Response> future =
- session.sendRequest(PluginVersionCheckParams('', '', ''));
+ var future = session.sendRequest(PluginVersionCheckParams('', '', ''));
expect(session.pendingRequests, hasLength(1));
session.handleResponse(response);
expect(session.pendingRequests, hasLength(0));
- Response result = await future;
+ var result = await future;
expect(result, same(response));
}
@@ -651,8 +638,7 @@
}
void test_sendRequest() {
- TestServerCommunicationChannel channel =
- TestServerCommunicationChannel(session);
+ var channel = TestServerCommunicationChannel(session);
session.sendRequest(PluginVersionCheckParams('', '', ''));
expect(channel.sentRequests, hasLength(1));
expect(channel.sentRequests[0].method, 'plugin.versionCheck');
@@ -679,8 +665,7 @@
}
Future<void> test_stop_running() async {
- TestServerCommunicationChannel channel =
- TestServerCommunicationChannel(session);
+ var channel = TestServerCommunicationChannel(session);
await session.stop();
expect(channel.sentRequests, hasLength(1));
expect(channel.sentRequests[0].method, 'plugin.shutdown');
@@ -721,24 +706,24 @@
{String content,
String pluginName,
Future<void> Function(String) test}) async {
- io.Directory tempDirectory =
+ var tempDirectory =
io.Directory.systemTemp.createTempSync(pluginName ?? 'test_plugin');
try {
- String pluginPath = tempDirectory.resolveSymbolicLinksSync();
+ var pluginPath = tempDirectory.resolveSymbolicLinksSync();
//
// Create a .packages file.
//
- io.File packagesFile = io.File(path.join(pluginPath, '.packages'));
+ var packagesFile = io.File(path.join(pluginPath, '.packages'));
packagesFile.writeAsStringSync(_getPackagesFileContent());
//
// Create the 'bin' directory.
//
- String binPath = path.join(pluginPath, 'bin');
+ var binPath = path.join(pluginPath, 'bin');
io.Directory(binPath).createSync();
//
// Create the 'plugin.dart' file.
//
- io.File pluginFile = io.File(path.join(binPath, 'plugin.dart'));
+ var pluginFile = io.File(path.join(binPath, 'plugin.dart'));
pluginFile.writeAsStringSync(content ?? _defaultPluginContent());
//
// Run the actual test code.
@@ -768,24 +753,24 @@
{String content,
String pluginName,
Future<void> Function(String) test}) async {
- io.Directory tempDirectory =
+ var tempDirectory =
io.Directory.systemTemp.createTempSync(pluginName ?? 'test_plugin');
try {
- String pluginPath = tempDirectory.resolveSymbolicLinksSync();
+ var pluginPath = tempDirectory.resolveSymbolicLinksSync();
//
// Create a pubspec.yaml file.
//
- io.File pubspecFile = io.File(path.join(pluginPath, 'pubspec.yaml'));
+ var pubspecFile = io.File(path.join(pluginPath, 'pubspec.yaml'));
pubspecFile.writeAsStringSync(_getPubspecFileContent());
//
// Create the 'bin' directory.
//
- String binPath = path.join(pluginPath, 'bin');
+ var binPath = path.join(pluginPath, 'bin');
io.Directory(binPath).createSync();
//
// Create the 'plugin.dart' file.
//
- io.File pluginFile = io.File(path.join(binPath, 'plugin.dart'));
+ var pluginFile = io.File(path.join(binPath, 'plugin.dart'));
pluginFile.writeAsStringSync(content ?? _defaultPluginContent());
//
// Run the actual test code.
@@ -799,13 +784,13 @@
/// Convert the [sdkPackageMap] into a plugin-specific map by applying the
/// given relative path [delta] to each line.
String _convertPackageMap(String sdkDirPath, List<String> sdkPackageMap) {
- StringBuffer buffer = StringBuffer();
- for (String line in sdkPackageMap) {
+ var buffer = StringBuffer();
+ for (var line in sdkPackageMap) {
if (!line.startsWith('#')) {
- int index = line.indexOf(':');
- String packageName = line.substring(0, index + 1);
- String relativePath = line.substring(index + 1);
- String absolutePath = path.join(sdkDirPath, relativePath);
+ var index = line.indexOf(':');
+ var packageName = line.substring(0, index + 1);
+ var relativePath = line.substring(index + 1);
+ var absolutePath = path.join(sdkDirPath, relativePath);
// Convert to file:/// URI since that's how absolute paths in
// .packages must be for windows
absolutePath = Uri.file(absolutePath).toString();
@@ -864,8 +849,8 @@
/// Return the content to be used for the '.packages' file.
String _getPackagesFileContent() {
if (_packagesFileContent == null) {
- io.File sdkPackagesFile = io.File(_sdkPackagesPath());
- List<String> sdkPackageMap = sdkPackagesFile.readAsLinesSync();
+ var sdkPackagesFile = io.File(_sdkPackagesPath());
+ var sdkPackageMap = sdkPackagesFile.readAsLinesSync();
_packagesFileContent =
_convertPackageMap(path.dirname(sdkPackagesFile.path), sdkPackageMap);
}
@@ -884,7 +869,7 @@
/// Return the path to the '.packages' file in the root of the SDK checkout.
String _sdkPackagesPath() {
- String packagesPath = io.Platform.script.toFilePath();
+ var packagesPath = io.Platform.script.toFilePath();
while (packagesPath.isNotEmpty &&
path.basename(packagesPath) != 'analysis_server') {
packagesPath = path.dirname(packagesPath);
diff --git a/pkg/analysis_server/test/src/plugin/plugin_watcher_test.dart b/pkg/analysis_server/test/src/plugin/plugin_watcher_test.dart
index 8ae4f30..3ac4dac 100644
--- a/pkg/analysis_server/test/src/plugin/plugin_watcher_test.dart
+++ b/pkg/analysis_server/test/src/plugin/plugin_watcher_test.dart
@@ -18,7 +18,6 @@
import 'package:analyzer/src/source/package_map_resolver.dart';
import 'package:analyzer/src/test_utilities/mock_sdk.dart';
import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart';
-import 'package:path/path.dart' as path;
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -39,16 +38,16 @@
}
Future<void> test_addedDriver() async {
- String pkg1Path = newFolder('/pkg1').path;
+ var pkg1Path = newFolder('/pkg1').path;
newFile('/pkg1/lib/test1.dart');
newFile('/pkg2/lib/pkg2.dart');
newFile('/pkg2/pubspec.yaml', content: 'name: pkg2');
newFile(
'/pkg2/${PluginLocator.toolsFolderName}/${PluginLocator.defaultPluginFolderName}/bin/plugin.dart');
- ContextRoot contextRoot =
+ var contextRoot =
ContextRoot(pkg1Path, [], pathContext: resourceProvider.pathContext);
- TestDriver driver = TestDriver(resourceProvider, contextRoot);
+ var driver = TestDriver(resourceProvider, contextRoot);
driver.analysisOptions.enabledPluginNames = ['pkg2'];
expect(manager.addedContextRoots, isEmpty);
watcher.addedDriver(driver, contextRoot);
@@ -73,12 +72,12 @@
}
Future<void> test_addedDriver_missingPackage() async {
- String pkg1Path = newFolder('/pkg1').path;
+ var pkg1Path = newFolder('/pkg1').path;
newFile('/pkg1/lib/test1.dart');
- ContextRoot contextRoot =
+ var contextRoot =
ContextRoot(pkg1Path, [], pathContext: resourceProvider.pathContext);
- TestDriver driver = TestDriver(resourceProvider, contextRoot);
+ var driver = TestDriver(resourceProvider, contextRoot);
driver.analysisOptions.enabledPluginNames = ['pkg3'];
watcher.addedDriver(driver, contextRoot);
expect(manager.addedContextRoots, isEmpty);
@@ -97,10 +96,10 @@
}
void test_removedDriver() {
- String pkg1Path = newFolder('/pkg1').path;
- ContextRoot contextRoot =
+ var pkg1Path = newFolder('/pkg1').path;
+ var contextRoot =
ContextRoot(pkg1Path, [], pathContext: resourceProvider.pathContext);
- TestDriver driver = TestDriver(resourceProvider, contextRoot);
+ var driver = TestDriver(resourceProvider, contextRoot);
watcher.addedDriver(driver, contextRoot);
watcher.removedDriver(driver);
expect(manager.removedContextRoots, equals([contextRoot]));
@@ -121,10 +120,10 @@
final _resultController = StreamController<ResolvedUnitResult>();
TestDriver(this.resourceProvider, ContextRoot contextRoot) {
- path.Context pathContext = resourceProvider.pathContext;
- MockSdk sdk = MockSdk(resourceProvider: resourceProvider);
- String packageName = pathContext.basename(contextRoot.root);
- String libPath = pathContext.join(contextRoot.root, 'lib');
+ var pathContext = resourceProvider.pathContext;
+ var sdk = MockSdk(resourceProvider: resourceProvider);
+ var packageName = pathContext.basename(contextRoot.root);
+ var libPath = pathContext.join(contextRoot.root, 'lib');
sourceFactory = SourceFactory([
DartUriResolver(sdk),
PackageMapUriResolver(resourceProvider, {
diff --git a/pkg/analysis_server/test/src/plugin/protocol_test_utilities.dart b/pkg/analysis_server/test/src/plugin/protocol_test_utilities.dart
index 5c4bf36..ce4d3c4 100644
--- a/pkg/analysis_server/test/src/plugin/protocol_test_utilities.dart
+++ b/pkg/analysis_server/test/src/plugin/protocol_test_utilities.dart
@@ -102,7 +102,7 @@
/// On return, increment [stringIndex] by 5 and [intIndex] by 7.
Occurrences occurrences(int stringIndex, int intIndex) {
- Element referencedElement = element(stringIndex, intIndex);
+ var referencedElement = element(stringIndex, intIndex);
return Occurrences(referencedElement, <int>[intIndex + 5, intIndex + 6],
referencedElement.name.length);
}
diff --git a/pkg/analysis_server/test/src/plugin/request_converter_test.dart b/pkg/analysis_server/test/src/plugin/request_converter_test.dart
index 954b63b..78d9858 100644
--- a/pkg/analysis_server/test/src/plugin/request_converter_test.dart
+++ b/pkg/analysis_server/test/src/plugin/request_converter_test.dart
@@ -23,8 +23,7 @@
RequestConverter converter = RequestConverter();
void test_convertAnalysisService() {
- Map<plugin.AnalysisService, server.AnalysisService> kindMap =
- <plugin.AnalysisService, server.AnalysisService>{
+ var kindMap = <plugin.AnalysisService, server.AnalysisService>{
plugin.AnalysisService.FOLDING: server.AnalysisService.FOLDING,
plugin.AnalysisService.HIGHLIGHTS: server.AnalysisService.HIGHLIGHTS,
plugin.AnalysisService.NAVIGATION: server.AnalysisService.NAVIGATION,
@@ -38,27 +37,23 @@
}
void test_convertAnalysisSetPriorityFilesParams() {
- List<String> files = <String>['a', 'b', 'c'];
- plugin.AnalysisSetPriorityFilesParams result =
- converter.convertAnalysisSetPriorityFilesParams(
- server.AnalysisSetPriorityFilesParams(files));
+ var files = <String>['a', 'b', 'c'];
+ var result = converter.convertAnalysisSetPriorityFilesParams(
+ server.AnalysisSetPriorityFilesParams(files));
expect(result, isNotNull);
expect(result.files, files);
}
void test_convertAnalysisSetSubscriptionsParams() {
- Map<server.AnalysisService, List<String>> serverSubscriptions =
- <server.AnalysisService, List<String>>{
+ var serverSubscriptions = <server.AnalysisService, List<String>>{
server.AnalysisService.HIGHLIGHTS: <String>['a', 'b'],
server.AnalysisService.OUTLINE: <String>['c'],
server.AnalysisService.OVERRIDES: <String>['d', 'e']
};
- plugin.AnalysisSetSubscriptionsParams result =
- converter.convertAnalysisSetSubscriptionsParams(
- server.AnalysisSetSubscriptionsParams(serverSubscriptions));
+ var result = converter.convertAnalysisSetSubscriptionsParams(
+ server.AnalysisSetSubscriptionsParams(serverSubscriptions));
expect(result, isNotNull);
- Map<plugin.AnalysisService, List<String>> pluginSubscriptions =
- result.subscriptions;
+ var pluginSubscriptions = result.subscriptions;
expect(pluginSubscriptions, hasLength(2));
expect(
pluginSubscriptions[plugin.AnalysisService.HIGHLIGHTS], hasLength(2));
@@ -66,15 +61,14 @@
}
void test_convertAnalysisUpdateContentParams() {
- Map<String, dynamic> serverFiles = <String, dynamic>{
+ var serverFiles = <String, dynamic>{
'file1': AddContentOverlay('content1'),
'file2': AddContentOverlay('content2'),
};
- plugin.AnalysisUpdateContentParams result =
- converter.convertAnalysisUpdateContentParams(
- server.AnalysisUpdateContentParams(serverFiles));
+ var result = converter.convertAnalysisUpdateContentParams(
+ server.AnalysisUpdateContentParams(serverFiles));
expect(result, isNotNull);
- Map<String, dynamic> pluginFiles = result.files;
+ var pluginFiles = result.files;
expect(pluginFiles, hasLength(2));
expect(pluginFiles['file1'], const TypeMatcher<AddContentOverlay>());
expect(pluginFiles['file2'], const TypeMatcher<AddContentOverlay>());
diff --git a/pkg/analysis_server/test/src/plugin/result_collector_test.dart b/pkg/analysis_server/test/src/plugin/result_collector_test.dart
index ad8e954..39a4486 100644
--- a/pkg/analysis_server/test/src/plugin/result_collector_test.dart
+++ b/pkg/analysis_server/test/src/plugin/result_collector_test.dart
@@ -19,10 +19,10 @@
ResultCollector<String> collector = ResultCollector<String>(serverId);
void test_clearResultsForFile() {
- String filePath1 = 'test1.dart';
- String filePath2 = 'test2.dart';
- String value1 = 'r1';
- String value2 = 'r2';
+ var filePath1 = 'test1.dart';
+ var filePath2 = 'test2.dart';
+ var value1 = 'r1';
+ var value2 = 'r2';
collector.startCollectingFor(filePath1);
collector.startCollectingFor(filePath2);
collector.putResults(filePath1, 'p', value1);
@@ -36,11 +36,11 @@
}
void test_clearResultsFromPlugin() {
- String filePath = 'test.dart';
- String p1Name = 'p1';
- String p2Name = 'p2';
- String p1Value = 'r1';
- String p2Value = 'r2';
+ var filePath = 'test.dart';
+ var p1Name = 'p1';
+ var p2Name = 'p2';
+ var p1Value = 'r1';
+ var p2Value = 'r2';
collector.startCollectingFor(filePath);
collector.putResults(filePath, p1Name, p1Value);
@@ -60,9 +60,9 @@
void test_getResults_serverFirst() {
// This is a flaky test in that it is possible for the test to pass even
// when the code is broken.
- String filePath = 'test.dart';
- String value1 = 'r1';
- String value2 = 'r2';
+ var filePath = 'test.dart';
+ var value1 = 'r1';
+ var value2 = 'r2';
collector.startCollectingFor(filePath);
collector.putResults(filePath, 'p', value1);
collector.putResults(filePath, serverId, value2);
@@ -70,10 +70,10 @@
}
void test_putResults_collecting() {
- String filePath1 = 'test1.dart';
- String filePath2 = 'test2.dart';
- String value1 = 'r1';
- String value2 = 'r2';
+ var filePath1 = 'test1.dart';
+ var filePath2 = 'test2.dart';
+ var value1 = 'r1';
+ var value2 = 'r2';
expect(collector.getResults(filePath1), isEmpty);
expect(collector.getResults(filePath2), isEmpty);
@@ -88,7 +88,7 @@
}
void test_putResults_notCollecting() {
- String filePath = 'test.dart';
+ var filePath = 'test.dart';
expect(collector.getResults(filePath), isEmpty);
collector.putResults(filePath, 'p', 'r');
@@ -96,8 +96,8 @@
}
void test_stopCollectingFor() {
- String filePath = 'test.dart';
- String value = 'r';
+ var filePath = 'test.dart';
+ var value = 'r';
collector.startCollectingFor(filePath);
collector.putResults(filePath, 'p', value);
expect(collector.getResults(filePath), contains(value));
diff --git a/pkg/analysis_server/test/src/plugin/result_converter_test.dart b/pkg/analysis_server/test/src/plugin/result_converter_test.dart
index b782420..d45118b 100644
--- a/pkg/analysis_server/test/src/plugin/result_converter_test.dart
+++ b/pkg/analysis_server/test/src/plugin/result_converter_test.dart
@@ -40,20 +40,19 @@
ResultConverter converter = ResultConverter();
void test_convertAnalysisErrorFixes() {
- AnalysisError error = analysisError(0, 0);
- SourceChange change = sourceChange(4, 4);
- plugin.AnalysisErrorFixes initial = plugin.AnalysisErrorFixes(error,
+ var error = analysisError(0, 0);
+ var change = sourceChange(4, 4);
+ var initial = plugin.AnalysisErrorFixes(error,
fixes: <plugin.PrioritizedSourceChange>[
plugin.PrioritizedSourceChange(100, change)
]);
- server.AnalysisErrorFixes expected =
+ var expected =
server.AnalysisErrorFixes(error, fixes: <SourceChange>[change]);
expect(converter.convertAnalysisErrorFixes(initial), expected);
}
void test_convertAnalysisNavigationParams() {
- plugin.AnalysisNavigationParams initial =
- plugin.AnalysisNavigationParams('a.dart', <NavigationRegion>[
+ var initial = plugin.AnalysisNavigationParams('a.dart', <NavigationRegion>[
NavigationRegion(1, 2, <int>[3, 4])
], <NavigationTarget>[
NavigationTarget(ElementKind.FIELD, 5, 6, 7, 8, 9)
@@ -61,8 +60,7 @@
'a',
'b'
]);
- server.AnalysisNavigationParams expected =
- server.AnalysisNavigationParams('a.dart', <NavigationRegion>[
+ var expected = server.AnalysisNavigationParams('a.dart', <NavigationRegion>[
NavigationRegion(1, 2, <int>[3, 4])
], <NavigationTarget>[
NavigationTarget(ElementKind.FIELD, 5, 6, 7, 8, 9)
@@ -74,18 +72,18 @@
}
void test_convertEditGetRefactoringResult_inlineMethod() {
- RefactoringProblem problem1 = refactoringProblem(0, 0);
- RefactoringProblem problem2 = refactoringProblem(2, 4);
- RefactoringProblem problem3 = refactoringProblem(4, 8);
- SourceChange change = sourceChange(6, 12);
- plugin.EditGetRefactoringResult initial = plugin.EditGetRefactoringResult(
+ var problem1 = refactoringProblem(0, 0);
+ var problem2 = refactoringProblem(2, 4);
+ var problem3 = refactoringProblem(4, 8);
+ var change = sourceChange(6, 12);
+ var initial = plugin.EditGetRefactoringResult(
<RefactoringProblem>[problem1],
<RefactoringProblem>[problem2],
<RefactoringProblem>[problem3],
feedback: plugin.InlineMethodFeedback('a', true, className: 'b'),
change: change,
potentialEdits: <String>['f']);
- server.EditGetRefactoringResult expected = server.EditGetRefactoringResult(
+ var expected = server.EditGetRefactoringResult(
<RefactoringProblem>[problem1],
<RefactoringProblem>[problem2],
<RefactoringProblem>[problem3],
@@ -99,18 +97,18 @@
}
void test_convertEditGetRefactoringResult_moveFile() {
- RefactoringProblem problem1 = refactoringProblem(0, 0);
- RefactoringProblem problem2 = refactoringProblem(2, 4);
- RefactoringProblem problem3 = refactoringProblem(4, 8);
- SourceChange change = sourceChange(6, 12);
- plugin.EditGetRefactoringResult initial = plugin.EditGetRefactoringResult(
+ var problem1 = refactoringProblem(0, 0);
+ var problem2 = refactoringProblem(2, 4);
+ var problem3 = refactoringProblem(4, 8);
+ var change = sourceChange(6, 12);
+ var initial = plugin.EditGetRefactoringResult(
<RefactoringProblem>[problem1],
<RefactoringProblem>[problem2],
<RefactoringProblem>[problem3],
feedback: plugin.MoveFileFeedback(),
change: change,
potentialEdits: <String>['f']);
- server.EditGetRefactoringResult expected = server.EditGetRefactoringResult(
+ var expected = server.EditGetRefactoringResult(
<RefactoringProblem>[problem1],
<RefactoringProblem>[problem2],
<RefactoringProblem>[problem3],
@@ -123,9 +121,8 @@
}
void test_convertPrioritizedSourceChange() {
- SourceChange change = sourceChange(0, 0);
- plugin.PrioritizedSourceChange initial =
- plugin.PrioritizedSourceChange(100, change);
+ var change = sourceChange(0, 0);
+ var initial = plugin.PrioritizedSourceChange(100, change);
expect(converter.convertPrioritizedSourceChange(initial), change);
}
}
diff --git a/pkg/analysis_server/test/src/plugin/result_merger_test.dart b/pkg/analysis_server/test/src/plugin/result_merger_test.dart
index 2bb41bc..a0e743f 100644
--- a/pkg/analysis_server/test/src/plugin/result_merger_test.dart
+++ b/pkg/analysis_server/test/src/plugin/result_merger_test.dart
@@ -27,38 +27,27 @@
void test_mergeAnalysisErrorFixes() {
AnalysisError createError(int offset) {
- AnalysisErrorSeverity severity = AnalysisErrorSeverity.ERROR;
- AnalysisErrorType type = AnalysisErrorType.HINT;
- Location location = Location('test.dart', offset, 2, 3, 4);
+ var severity = AnalysisErrorSeverity.ERROR;
+ var type = AnalysisErrorType.HINT;
+ var location = Location('test.dart', offset, 2, 3, 4);
return AnalysisError(severity, type, location, '', '');
}
- AnalysisError error1 = createError(10);
- AnalysisError error2 = createError(20);
- AnalysisError error3 = createError(30);
- AnalysisError error4 = createError(40);
- plugin.PrioritizedSourceChange change1 =
- plugin.PrioritizedSourceChange(1, SourceChange('a'));
- plugin.PrioritizedSourceChange change2 =
- plugin.PrioritizedSourceChange(2, SourceChange('b'));
- plugin.PrioritizedSourceChange change3 =
- plugin.PrioritizedSourceChange(3, SourceChange('c'));
- plugin.PrioritizedSourceChange change4 =
- plugin.PrioritizedSourceChange(4, SourceChange('d'));
- plugin.PrioritizedSourceChange change5 =
- plugin.PrioritizedSourceChange(5, SourceChange('e'));
- plugin.AnalysisErrorFixes fix1 =
- plugin.AnalysisErrorFixes(error1, fixes: [change1]);
- plugin.AnalysisErrorFixes fix2 =
- plugin.AnalysisErrorFixes(error2, fixes: [change2]);
- plugin.AnalysisErrorFixes fix3 =
- plugin.AnalysisErrorFixes(error2, fixes: [change3]);
- plugin.AnalysisErrorFixes fix4 =
- plugin.AnalysisErrorFixes(error3, fixes: [change4]);
- plugin.AnalysisErrorFixes fix5 =
- plugin.AnalysisErrorFixes(error4, fixes: [change5]);
- plugin.AnalysisErrorFixes fix2and3 =
- plugin.AnalysisErrorFixes(error2, fixes: [change2, change3]);
+ var error1 = createError(10);
+ var error2 = createError(20);
+ var error3 = createError(30);
+ var error4 = createError(40);
+ var change1 = plugin.PrioritizedSourceChange(1, SourceChange('a'));
+ var change2 = plugin.PrioritizedSourceChange(2, SourceChange('b'));
+ var change3 = plugin.PrioritizedSourceChange(3, SourceChange('c'));
+ var change4 = plugin.PrioritizedSourceChange(4, SourceChange('d'));
+ var change5 = plugin.PrioritizedSourceChange(5, SourceChange('e'));
+ var fix1 = plugin.AnalysisErrorFixes(error1, fixes: [change1]);
+ var fix2 = plugin.AnalysisErrorFixes(error2, fixes: [change2]);
+ var fix3 = plugin.AnalysisErrorFixes(error2, fixes: [change3]);
+ var fix4 = plugin.AnalysisErrorFixes(error3, fixes: [change4]);
+ var fix5 = plugin.AnalysisErrorFixes(error4, fixes: [change5]);
+ var fix2and3 = plugin.AnalysisErrorFixes(error2, fixes: [change2, change3]);
void runTest() {
expect(
@@ -77,16 +66,16 @@
void test_mergeAnalysisErrors() {
AnalysisError createError(int offset) {
- AnalysisErrorSeverity severity = AnalysisErrorSeverity.ERROR;
- AnalysisErrorType type = AnalysisErrorType.HINT;
- Location location = Location('test.dart', offset, 2, 3, 4);
+ var severity = AnalysisErrorSeverity.ERROR;
+ var type = AnalysisErrorType.HINT;
+ var location = Location('test.dart', offset, 2, 3, 4);
return AnalysisError(severity, type, location, '', '');
}
- AnalysisError error1 = createError(10);
- AnalysisError error2 = createError(20);
- AnalysisError error3 = createError(30);
- AnalysisError error4 = createError(40);
+ var error1 = createError(10);
+ var error2 = createError(20);
+ var error3 = createError(30);
+ var error4 = createError(40);
void runTest() {
expect(
@@ -108,10 +97,10 @@
CompletionSuggestion(CompletionSuggestionKind.IDENTIFIER, 50,
completion, 0, 3, false, false);
- CompletionSuggestion suggestion1 = createSuggestion('a');
- CompletionSuggestion suggestion2 = createSuggestion('b');
- CompletionSuggestion suggestion3 = createSuggestion('c');
- CompletionSuggestion suggestion4 = createSuggestion('d');
+ var suggestion1 = createSuggestion('a');
+ var suggestion2 = createSuggestion('b');
+ var suggestion3 = createSuggestion('c');
+ var suggestion4 = createSuggestion('d');
void runTest() {
expect(
@@ -129,12 +118,12 @@
}
void test_mergeFoldingRegion() {
- FoldingKind kind = FoldingKind.FILE_HEADER;
- FoldingRegion region1 = FoldingRegion(kind, 30, 5);
- FoldingRegion region2 = FoldingRegion(kind, 0, 4);
- FoldingRegion region3 = FoldingRegion(kind, 20, 6);
- FoldingRegion region4 = FoldingRegion(kind, 10, 3);
- FoldingRegion region5 = FoldingRegion(kind, 2, 6); // overlaps
+ var kind = FoldingKind.FILE_HEADER;
+ var region1 = FoldingRegion(kind, 30, 5);
+ var region2 = FoldingRegion(kind, 0, 4);
+ var region3 = FoldingRegion(kind, 20, 6);
+ var region4 = FoldingRegion(kind, 10, 3);
+ var region5 = FoldingRegion(kind, 2, 6); // overlaps
void runTest() {
expect(
@@ -152,11 +141,11 @@
}
void test_mergeHighlightRegions() {
- HighlightRegionType type = HighlightRegionType.COMMENT_BLOCK;
- HighlightRegion region1 = HighlightRegion(type, 30, 5);
- HighlightRegion region2 = HighlightRegion(type, 0, 4);
- HighlightRegion region3 = HighlightRegion(type, 20, 6);
- HighlightRegion region4 = HighlightRegion(type, 10, 3);
+ var type = HighlightRegionType.COMMENT_BLOCK;
+ var region1 = HighlightRegion(type, 30, 5);
+ var region2 = HighlightRegion(type, 0, 4);
+ var region3 = HighlightRegion(type, 20, 6);
+ var region4 = HighlightRegion(type, 10, 3);
void runTest() {
expect(
@@ -181,15 +170,15 @@
//
// Create the parameters from the server.
//
- NavigationTarget target1_1 = target(0, 1);
- NavigationTarget target1_2 = target(0, 2);
- NavigationTarget target2_1 = target(1, 3);
- NavigationTarget target2_2 = target(1, 4);
- NavigationRegion region1_1 = NavigationRegion(10, 4, [0]);
- NavigationRegion region1_2 = NavigationRegion(20, 4, [1]);
- NavigationRegion region2_1 = NavigationRegion(30, 4, [2]);
- NavigationRegion region2_2 = NavigationRegion(40, 4, [3]);
- AnalysisNavigationParams params1 = AnalysisNavigationParams(
+ var target1_1 = target(0, 1);
+ var target1_2 = target(0, 2);
+ var target2_1 = target(1, 3);
+ var target2_2 = target(1, 4);
+ var region1_1 = NavigationRegion(10, 4, [0]);
+ var region1_2 = NavigationRegion(20, 4, [1]);
+ var region2_1 = NavigationRegion(30, 4, [2]);
+ var region2_2 = NavigationRegion(40, 4, [3]);
+ var params1 = AnalysisNavigationParams(
'a.dart',
[region1_1, region1_2, region2_1, region2_2],
[target1_1, target1_2, target2_1, target2_2],
@@ -198,23 +187,23 @@
// Create the parameters from the second plugin.
//
// same file and offset as target 2_2
- NavigationTarget target2_3 = target(0, 4);
- NavigationTarget target2_4 = target(0, 5);
- NavigationTarget target3_1 = target(1, 6);
- NavigationTarget target3_2 = target(1, 7);
+ var target2_3 = target(0, 4);
+ var target2_4 = target(0, 5);
+ var target3_1 = target(1, 6);
+ var target3_2 = target(1, 7);
// same region and target as region2_2
- NavigationRegion region2_3 = NavigationRegion(40, 4, [0]);
+ var region2_3 = NavigationRegion(40, 4, [0]);
// same region as region2_2, but a different target
- NavigationRegion region2_4 = NavigationRegion(40, 4, [2]);
- NavigationRegion region2_5 = NavigationRegion(50, 4, [1]);
- NavigationRegion region3_1 = NavigationRegion(60, 4, [2]);
- NavigationRegion region3_2 = NavigationRegion(70, 4, [3]);
- AnalysisNavigationParams params2 = AnalysisNavigationParams(
+ var region2_4 = NavigationRegion(40, 4, [2]);
+ var region2_5 = NavigationRegion(50, 4, [1]);
+ var region3_1 = NavigationRegion(60, 4, [2]);
+ var region3_2 = NavigationRegion(70, 4, [3]);
+ var params2 = AnalysisNavigationParams(
'a.dart',
[region2_3, region2_4, region2_5, region3_1, region3_2],
[target2_3, target2_4, target3_1, target3_2],
['two.dart', 'three.dart']);
- AnalysisNavigationParams expected = AnalysisNavigationParams('a.dart', [
+ var expected = AnalysisNavigationParams('a.dart', [
region1_1,
region1_2,
region2_1,
@@ -245,18 +234,18 @@
}
void test_mergeOccurrences() {
- Element element1 = Element(ElementKind.CLASS, 'e1', 0);
- Element element2 = Element(ElementKind.CLASS, 'e2', 0);
- Element element3 = Element(ElementKind.CLASS, 'e3', 0);
- Occurrences occurrence1 = Occurrences(element1, [1, 2, 4], 2);
- Occurrences occurrence2 = Occurrences(element2, [5], 2);
- Occurrences occurrence3 = Occurrences(element1, [2, 3], 2);
- Occurrences occurrence4 = Occurrences(element3, [8], 2);
- Occurrences occurrence5 = Occurrences(element2, [6], 2);
- Occurrences occurrence6 = Occurrences(element3, [7, 9], 2);
- Occurrences result1 = Occurrences(element1, [1, 2, 3, 4], 2);
- Occurrences result2 = Occurrences(element2, [5, 6], 2);
- Occurrences result3 = Occurrences(element3, [7, 8, 9], 2);
+ var element1 = Element(ElementKind.CLASS, 'e1', 0);
+ var element2 = Element(ElementKind.CLASS, 'e2', 0);
+ var element3 = Element(ElementKind.CLASS, 'e3', 0);
+ var occurrence1 = Occurrences(element1, [1, 2, 4], 2);
+ var occurrence2 = Occurrences(element2, [5], 2);
+ var occurrence3 = Occurrences(element1, [2, 3], 2);
+ var occurrence4 = Occurrences(element3, [8], 2);
+ var occurrence5 = Occurrences(element2, [6], 2);
+ var occurrence6 = Occurrences(element3, [7, 9], 2);
+ var result1 = Occurrences(element1, [1, 2, 3, 4], 2);
+ var result2 = Occurrences(element2, [5, 6], 2);
+ var result3 = Occurrences(element3, [7, 8, 9], 2);
void runTest() {
expect(
@@ -275,20 +264,20 @@
void test_mergeOutline() {
Element element(ElementKind kind, int offset) {
- Location location = Location('', offset, 0, 0, 0);
+ var location = Location('', offset, 0, 0, 0);
return Element(kind, '', 0, location: location);
}
- Element element1 = element(ElementKind.CLASS, 100);
- Element element1_1 = element(ElementKind.METHOD, 110);
- Element element1_2 = element(ElementKind.METHOD, 120);
- Element element2 = element(ElementKind.CLASS, 200);
- Element element2_1 = element(ElementKind.METHOD, 210);
- Element element2_2 = element(ElementKind.METHOD, 220);
- Element element3_1 = element(ElementKind.METHOD, 220); // same as 2_2
- Element element3_2 = element(ElementKind.METHOD, 230);
- Element element4 = element(ElementKind.CLASS, 300);
- Element element4_1 = element(ElementKind.METHOD, 310);
+ var element1 = element(ElementKind.CLASS, 100);
+ var element1_1 = element(ElementKind.METHOD, 110);
+ var element1_2 = element(ElementKind.METHOD, 120);
+ var element2 = element(ElementKind.CLASS, 200);
+ var element2_1 = element(ElementKind.METHOD, 210);
+ var element2_2 = element(ElementKind.METHOD, 220);
+ var element3_1 = element(ElementKind.METHOD, 220); // same as 2_2
+ var element3_2 = element(ElementKind.METHOD, 230);
+ var element4 = element(ElementKind.CLASS, 300);
+ var element4_1 = element(ElementKind.METHOD, 310);
//
// Unique, contributed from first plugin.
//
@@ -296,9 +285,9 @@
// - element1_1
// - element1_2
//
- Outline outline1_1 = Outline(element1_1, 0, 0, 0, 0, children: []);
- Outline outline1_2 = Outline(element1_2, 0, 0, 0, 0, children: []);
- Outline outline1 =
+ var outline1_1 = Outline(element1_1, 0, 0, 0, 0, children: []);
+ var outline1_2 = Outline(element1_2, 0, 0, 0, 0, children: []);
+ var outline1 =
Outline(element1, 0, 0, 0, 0, children: [outline1_1, outline1_2]);
//
// Same top level element, common child.
@@ -310,15 +299,15 @@
// - element3_1
// - element3_2
//
- Outline outline2_1 = Outline(element2_1, 0, 0, 0, 0, children: []);
- Outline outline2_2 = Outline(element2_2, 0, 0, 0, 0, children: []);
- Outline outline3_1 = Outline(element3_1, 0, 0, 0, 0, children: []);
- Outline outline3_2 = Outline(element3_2, 0, 0, 0, 0, children: []);
- Outline outline2 =
+ var outline2_1 = Outline(element2_1, 0, 0, 0, 0, children: []);
+ var outline2_2 = Outline(element2_2, 0, 0, 0, 0, children: []);
+ var outline3_1 = Outline(element3_1, 0, 0, 0, 0, children: []);
+ var outline3_2 = Outline(element3_2, 0, 0, 0, 0, children: []);
+ var outline2 =
Outline(element2, 0, 0, 0, 0, children: [outline2_1, outline2_2]);
- Outline outline3 =
+ var outline3 =
Outline(element2, 0, 0, 0, 0, children: [outline3_1, outline3_2]);
- Outline outline2and3 = Outline(element2, 0, 0, 0, 0,
+ var outline2and3 = Outline(element2, 0, 0, 0, 0,
children: [outline2_1, outline2_2, outline3_2]);
//
// Unique, contributed from second plugin.
@@ -326,8 +315,8 @@
// element4
// - element4_1
//
- Outline outline4_1 = Outline(element4_1, 0, 0, 0, 0, children: []);
- Outline outline4 = Outline(element4, 0, 0, 0, 0, children: [outline4_1]);
+ var outline4_1 = Outline(element4_1, 0, 0, 0, 0, children: []);
+ var outline4 = Outline(element4, 0, 0, 0, 0, children: [outline4_1]);
void runTest() {
expect(
@@ -344,14 +333,10 @@
}
void test_mergePrioritizedSourceChanges() {
- plugin.PrioritizedSourceChange kind1 =
- plugin.PrioritizedSourceChange(1, SourceChange(''));
- plugin.PrioritizedSourceChange kind2 =
- plugin.PrioritizedSourceChange(1, SourceChange(''));
- plugin.PrioritizedSourceChange kind3 =
- plugin.PrioritizedSourceChange(1, SourceChange(''));
- plugin.PrioritizedSourceChange kind4 =
- plugin.PrioritizedSourceChange(1, SourceChange(''));
+ var kind1 = plugin.PrioritizedSourceChange(1, SourceChange(''));
+ var kind2 = plugin.PrioritizedSourceChange(1, SourceChange(''));
+ var kind3 = plugin.PrioritizedSourceChange(1, SourceChange(''));
+ var kind4 = plugin.PrioritizedSourceChange(1, SourceChange(''));
void runTest() {
expect(
@@ -396,30 +381,30 @@
void
test_mergeRefactoringFeedbacks_extractLocalVariableFeedback_addEverything() {
- List<String> names1 = <String>['a', 'b', 'c'];
- List<int> offsets1 = <int>[10, 20];
- List<int> lengths1 = <int>[4, 5];
- List<int> coveringOffsets1 = <int>[100, 150, 200];
- List<int> coveringLengths1 = <int>[200, 100, 20];
+ var names1 = <String>['a', 'b', 'c'];
+ var offsets1 = <int>[10, 20];
+ var lengths1 = <int>[4, 5];
+ var coveringOffsets1 = <int>[100, 150, 200];
+ var coveringLengths1 = <int>[200, 100, 20];
RefactoringFeedback feedback1 = ExtractLocalVariableFeedback(
names1, offsets1, lengths1,
coveringExpressionOffsets: coveringOffsets1,
coveringExpressionLengths: coveringLengths1);
- List<String> names2 = <String>['c', 'd'];
- List<int> offsets2 = <int>[30];
- List<int> lengths2 = <int>[6];
- List<int> coveringOffsets2 = <int>[210];
- List<int> coveringLengths2 = <int>[5];
+ var names2 = <String>['c', 'd'];
+ var offsets2 = <int>[30];
+ var lengths2 = <int>[6];
+ var coveringOffsets2 = <int>[210];
+ var coveringLengths2 = <int>[5];
RefactoringFeedback feedback2 = ExtractLocalVariableFeedback(
names2, offsets2, lengths2,
coveringExpressionOffsets: coveringOffsets2,
coveringExpressionLengths: coveringLengths2);
- List<String> resultNames = <String>['a', 'b', 'c', 'd'];
- List<int> resultOffsets = List<int>.from(offsets1)..addAll(offsets2);
- List<int> resultLengths = List<int>.from(lengths1)..addAll(lengths2);
- List<int> resultCoveringOffsets = List<int>.from(coveringOffsets1)
+ var resultNames = <String>['a', 'b', 'c', 'd'];
+ var resultOffsets = List<int>.from(offsets1)..addAll(offsets2);
+ var resultLengths = List<int>.from(lengths1)..addAll(lengths2);
+ var resultCoveringOffsets = List<int>.from(coveringOffsets1)
..addAll(coveringOffsets2);
- List<int> resultCoveringLengths = List<int>.from(coveringLengths1)
+ var resultCoveringLengths = List<int>.from(coveringLengths1)
..addAll(coveringLengths2);
RefactoringFeedback result = ExtractLocalVariableFeedback(
resultNames, resultOffsets, resultLengths,
@@ -437,22 +422,22 @@
void
test_mergeRefactoringFeedbacks_extractLocalVariableFeedback_addOffsetsAndLengths() {
- List<String> names1 = <String>['a', 'b', 'c'];
- List<int> offsets1 = <int>[10, 20];
- List<int> lengths1 = <int>[4, 5];
- List<int> coveringOffsets1 = <int>[100, 150, 200];
- List<int> coveringLengths1 = <int>[200, 100, 20];
+ var names1 = <String>['a', 'b', 'c'];
+ var offsets1 = <int>[10, 20];
+ var lengths1 = <int>[4, 5];
+ var coveringOffsets1 = <int>[100, 150, 200];
+ var coveringLengths1 = <int>[200, 100, 20];
RefactoringFeedback feedback1 = ExtractLocalVariableFeedback(
names1, offsets1, lengths1,
coveringExpressionOffsets: coveringOffsets1,
coveringExpressionLengths: coveringLengths1);
- List<String> names2 = <String>[];
- List<int> offsets2 = <int>[30];
- List<int> lengths2 = <int>[6];
+ var names2 = <String>[];
+ var offsets2 = <int>[30];
+ var lengths2 = <int>[6];
RefactoringFeedback feedback2 =
ExtractLocalVariableFeedback(names2, offsets2, lengths2);
- List<int> resultOffsets = List<int>.from(offsets1)..addAll(offsets2);
- List<int> resultLengths = List<int>.from(lengths1)..addAll(lengths2);
+ var resultOffsets = List<int>.from(offsets1)..addAll(offsets2);
+ var resultLengths = List<int>.from(lengths1)..addAll(lengths2);
RefactoringFeedback result = ExtractLocalVariableFeedback(
names1, resultOffsets, resultLengths,
coveringExpressionOffsets: coveringOffsets1,
@@ -469,18 +454,18 @@
void
test_mergeRefactoringFeedbacks_extractLocalVariableFeedback_noCoverings() {
- List<String> names1 = <String>['a', 'b', 'c'];
- List<int> offsets1 = <int>[10, 20];
- List<int> lengths1 = <int>[4, 5];
+ var names1 = <String>['a', 'b', 'c'];
+ var offsets1 = <int>[10, 20];
+ var lengths1 = <int>[4, 5];
RefactoringFeedback feedback1 =
ExtractLocalVariableFeedback(names1, offsets1, lengths1);
- List<String> names2 = <String>[];
- List<int> offsets2 = <int>[30];
- List<int> lengths2 = <int>[6];
+ var names2 = <String>[];
+ var offsets2 = <int>[30];
+ var lengths2 = <int>[6];
RefactoringFeedback feedback2 =
ExtractLocalVariableFeedback(names2, offsets2, lengths2);
- List<int> resultOffsets = List<int>.from(offsets1)..addAll(offsets2);
- List<int> resultLengths = List<int>.from(lengths1)..addAll(lengths2);
+ var resultOffsets = List<int>.from(offsets1)..addAll(offsets2);
+ var resultLengths = List<int>.from(lengths1)..addAll(lengths2);
RefactoringFeedback result =
ExtractLocalVariableFeedback(names1, resultOffsets, resultLengths);
@@ -494,28 +479,26 @@
}
void test_mergeRefactoringFeedbacks_extractMethodFeedback() {
- int offset1 = 20;
- int length1 = 5;
- String returnType1 = 'int';
- List<String> names1 = <String>['a', 'b', 'c'];
- bool canCreateGetter1 = false;
- List<RefactoringMethodParameter> parameters1 =
- <RefactoringMethodParameter>[];
- List<int> offsets1 = <int>[10, 20];
- List<int> lengths1 = <int>[4, 5];
+ var offset1 = 20;
+ var length1 = 5;
+ var returnType1 = 'int';
+ var names1 = <String>['a', 'b', 'c'];
+ var canCreateGetter1 = false;
+ var parameters1 = <RefactoringMethodParameter>[];
+ var offsets1 = <int>[10, 20];
+ var lengths1 = <int>[4, 5];
RefactoringFeedback feedback1 = ExtractMethodFeedback(offset1, length1,
returnType1, names1, canCreateGetter1, parameters1, offsets1, lengths1);
- List<String> names2 = <String>['c', 'd'];
- bool canCreateGetter2 = true;
- List<RefactoringMethodParameter> parameters2 =
- <RefactoringMethodParameter>[];
- List<int> offsets2 = <int>[30];
- List<int> lengths2 = <int>[6];
+ var names2 = <String>['c', 'd'];
+ var canCreateGetter2 = true;
+ var parameters2 = <RefactoringMethodParameter>[];
+ var offsets2 = <int>[30];
+ var lengths2 = <int>[6];
RefactoringFeedback feedback2 = ExtractMethodFeedback(
0, 0, '', names2, canCreateGetter2, parameters2, offsets2, lengths2);
- List<String> resultNames = <String>['a', 'b', 'c', 'd'];
- List<int> resultOffsets = List<int>.from(offsets1)..addAll(offsets2);
- List<int> resultLengths = List<int>.from(lengths1)..addAll(lengths2);
+ var resultNames = <String>['a', 'b', 'c', 'd'];
+ var resultOffsets = List<int>.from(offsets1)..addAll(offsets2);
+ var resultLengths = List<int>.from(lengths1)..addAll(lengths2);
RefactoringFeedback result = ExtractMethodFeedback(
offset1,
length1,
@@ -589,11 +572,11 @@
}
void test_mergeRefactoringKinds() {
- RefactoringKind kind1 = RefactoringKind.CONVERT_GETTER_TO_METHOD;
- RefactoringKind kind2 = RefactoringKind.EXTRACT_LOCAL_VARIABLE;
- RefactoringKind kind3 = RefactoringKind.INLINE_LOCAL_VARIABLE;
- RefactoringKind kind4 = RefactoringKind.MOVE_FILE;
- RefactoringKind kind5 = RefactoringKind.EXTRACT_LOCAL_VARIABLE;
+ var kind1 = RefactoringKind.CONVERT_GETTER_TO_METHOD;
+ var kind2 = RefactoringKind.EXTRACT_LOCAL_VARIABLE;
+ var kind3 = RefactoringKind.INLINE_LOCAL_VARIABLE;
+ var kind4 = RefactoringKind.MOVE_FILE;
+ var kind5 = RefactoringKind.EXTRACT_LOCAL_VARIABLE;
void runTest() {
expect(
@@ -613,58 +596,50 @@
void test_mergeRefactorings() {
RefactoringProblem problem(String message) =>
RefactoringProblem(RefactoringProblemSeverity.ERROR, message);
- RefactoringProblem problem1 = problem('1');
- RefactoringProblem problem2 = problem('2');
- RefactoringProblem problem3 = problem('3');
- RefactoringProblem problem4 = problem('4');
- RefactoringProblem problem5 = problem('5');
- RefactoringProblem problem6 = problem('6');
+ var problem1 = problem('1');
+ var problem2 = problem('2');
+ var problem3 = problem('3');
+ var problem4 = problem('4');
+ var problem5 = problem('5');
+ var problem6 = problem('6');
- List<RefactoringProblem> initialProblems1 = <RefactoringProblem>[
- problem1,
- problem2
- ];
- List<RefactoringProblem> optionsProblems1 = <RefactoringProblem>[problem3];
- List<RefactoringProblem> finalProblems1 = <RefactoringProblem>[problem4];
+ var initialProblems1 = <RefactoringProblem>[problem1, problem2];
+ var optionsProblems1 = <RefactoringProblem>[problem3];
+ var finalProblems1 = <RefactoringProblem>[problem4];
RefactoringFeedback feedback1 = RenameFeedback(10, 0, '', '');
- SourceFileEdit edit1 = SourceFileEdit('file1.dart', 11, edits: <SourceEdit>[
+ var edit1 = SourceFileEdit('file1.dart', 11, edits: <SourceEdit>[
SourceEdit(12, 2, 'w', id: 'e1'),
SourceEdit(13, 3, 'x'),
]);
- SourceChange change1 = SourceChange('c1', edits: <SourceFileEdit>[edit1]);
- List<String> potentialEdits1 = <String>['e1'];
- EditGetRefactoringResult result1 = EditGetRefactoringResult(
+ var change1 = SourceChange('c1', edits: <SourceFileEdit>[edit1]);
+ var potentialEdits1 = <String>['e1'];
+ var result1 = EditGetRefactoringResult(
initialProblems1, optionsProblems1, finalProblems1,
feedback: feedback1, change: change1, potentialEdits: potentialEdits1);
- List<RefactoringProblem> initialProblems2 = <RefactoringProblem>[problem5];
- List<RefactoringProblem> optionsProblems2 = <RefactoringProblem>[];
- List<RefactoringProblem> finalProblems2 = <RefactoringProblem>[problem6];
+ var initialProblems2 = <RefactoringProblem>[problem5];
+ var optionsProblems2 = <RefactoringProblem>[];
+ var finalProblems2 = <RefactoringProblem>[problem6];
RefactoringFeedback feedback2 = RenameFeedback(20, 0, '', '');
- SourceFileEdit edit2 = SourceFileEdit('file2.dart', 21, edits: <SourceEdit>[
+ var edit2 = SourceFileEdit('file2.dart', 21, edits: <SourceEdit>[
SourceEdit(12, 2, 'y', id: 'e2'),
SourceEdit(13, 3, 'z'),
]);
- SourceChange change2 = SourceChange('c2', edits: <SourceFileEdit>[edit2]);
- List<String> potentialEdits2 = <String>['e2'];
- EditGetRefactoringResult result2 = EditGetRefactoringResult(
+ var change2 = SourceChange('c2', edits: <SourceFileEdit>[edit2]);
+ var potentialEdits2 = <String>['e2'];
+ var result2 = EditGetRefactoringResult(
initialProblems2, optionsProblems2, finalProblems2,
feedback: feedback2, change: change2, potentialEdits: potentialEdits2);
- List<RefactoringProblem> mergedInitialProblems = <RefactoringProblem>[
+ var mergedInitialProblems = <RefactoringProblem>[
problem1,
problem2,
problem5
];
- List<RefactoringProblem> mergedOptionsProblems = <RefactoringProblem>[
- problem3
- ];
- List<RefactoringProblem> mergedFinalProblems = <RefactoringProblem>[
- problem4,
- problem6
- ];
- SourceChange mergedChange =
+ var mergedOptionsProblems = <RefactoringProblem>[problem3];
+ var mergedFinalProblems = <RefactoringProblem>[problem4, problem6];
+ var mergedChange =
SourceChange('c1', edits: <SourceFileEdit>[edit1, edit2]);
- List<String> mergedPotentialEdits = <String>['e1', 'e2'];
- EditGetRefactoringResult mergedResult = EditGetRefactoringResult(
+ var mergedPotentialEdits = <String>['e1', 'e2'];
+ var mergedResult = EditGetRefactoringResult(
mergedInitialProblems, mergedOptionsProblems, mergedFinalProblems,
feedback: merger.mergeRefactoringFeedbacks([feedback1, feedback2]),
change: mergedChange,
@@ -679,10 +654,10 @@
}
void test_mergeSourceChanges() {
- SourceChange kind1 = SourceChange('');
- SourceChange kind2 = SourceChange('');
- SourceChange kind3 = SourceChange('');
- SourceChange kind4 = SourceChange('');
+ var kind1 = SourceChange('');
+ var kind2 = SourceChange('');
+ var kind3 = SourceChange('');
+ var kind4 = SourceChange('');
void runTest() {
expect(
diff --git a/pkg/analysis_server/test/src/server/sdk_configuration_test.dart b/pkg/analysis_server/test/src/server/sdk_configuration_test.dart
index 043c90a..a961393 100644
--- a/pkg/analysis_server/test/src/server/sdk_configuration_test.dart
+++ b/pkg/analysis_server/test/src/server/sdk_configuration_test.dart
@@ -22,7 +22,7 @@
test("custom settings file doesn't exist", () {
tempDir = Directory.systemTemp.createTempSync('SdkConfiguration');
- File file = File(path.join(tempDir.path, 'config.json'));
+ var file = File(path.join(tempDir.path, 'config.json'));
expect(() {
SdkConfiguration.readFromFile(file);
@@ -31,12 +31,12 @@
test('is not configured', () {
tempDir = Directory.systemTemp.createTempSync('SdkConfiguration');
- File file = File(path.join(tempDir.path, 'config.json'));
+ var file = File(path.join(tempDir.path, 'config.json'));
file.writeAsStringSync('''
{}
''');
- SdkConfiguration config = SdkConfiguration.readFromFile(file);
+ var config = SdkConfiguration.readFromFile(file);
expect(config.hasAnyOverrides, isFalse);
expect(config.analyticsId, isNull);
@@ -48,7 +48,7 @@
test('is configured', () {
tempDir = Directory.systemTemp.createTempSync('SdkConfiguration');
- File file = File(path.join(tempDir.path, 'config.json'));
+ var file = File(path.join(tempDir.path, 'config.json'));
file.writeAsStringSync('''
{
"server.analytics.id": "aaaa-1234",
@@ -61,7 +61,7 @@
}
''');
- SdkConfiguration config = SdkConfiguration.readFromFile(file);
+ var config = SdkConfiguration.readFromFile(file);
expect(config.hasAnyOverrides, isTrue);
expect(config.analyticsId, 'aaaa-1234');
diff --git a/pkg/analysis_server/test/src/services/correction/assist/assist_processor.dart b/pkg/analysis_server/test/src/services/correction/assist/assist_processor.dart
index 52ed25c..072f7bc 100644
--- a/pkg/analysis_server/test/src/services/correction/assist/assist_processor.dart
+++ b/pkg/analysis_server/test/src/services/correction/assist/assist_processor.dart
@@ -34,7 +34,7 @@
}
void assertExitPosition({String before, String after}) {
- Position exitPosition = _change.selection;
+ var exitPosition = _change.selection;
expect(exitPosition, isNotNull);
expect(exitPosition.file, testFile);
if (before != null) {
@@ -55,11 +55,11 @@
/// have been applied.
Future<void> assertHasAssist(String expected,
{Map<String, List<String>> additionallyChangedFiles}) async {
- Assist assist = await _assertHasAssist();
+ var assist = await _assertHasAssist();
_change = assist.change;
expect(_change.id, kind.id);
// apply to "file"
- List<SourceFileEdit> fileEdits = _change.edits;
+ var fileEdits = _change.edits;
if (additionallyChangedFiles == null) {
expect(fileEdits, hasLength(1));
_resultCode = SourceEdit.applySequence(testCode, _change.edits[0].edits);
@@ -69,9 +69,9 @@
_resultCode = SourceEdit.applySequence(
testCode, _change.getFileEdit(testFile).edits);
expect(_resultCode, expected);
- for (String filePath in additionallyChangedFiles.keys) {
- List<String> pair = additionallyChangedFiles[filePath];
- String resultCode = SourceEdit.applySequence(
+ for (var filePath in additionallyChangedFiles.keys) {
+ var pair = additionallyChangedFiles[filePath];
+ var resultCode = SourceEdit.applySequence(
pair[0], _change.getFileEdit(filePath).edits);
expect(resultCode, pair[1]);
}
@@ -84,11 +84,11 @@
{int length = 0}) async {
_offset = findOffset(snippet);
_length = length;
- Assist assist = await _assertHasAssist();
+ var assist = await _assertHasAssist();
_change = assist.change;
expect(_change.id, kind.id);
// apply to "file"
- List<SourceFileEdit> fileEdits = _change.edits;
+ var fileEdits = _change.edits;
expect(fileEdits, hasLength(1));
_resultCode = SourceEdit.applySequence(testCode, _change.edits[0].edits);
expect(_resultCode, expected);
@@ -96,8 +96,8 @@
void assertLinkedGroup(int groupIndex, List<String> expectedStrings,
[List<LinkedEditSuggestion> expectedSuggestions]) {
- LinkedEditGroup group = _change.linkedEditGroups[groupIndex];
- List<Position> expectedPositions = _findResultPositions(expectedStrings);
+ var group = _change.linkedEditGroups[groupIndex];
+ var expectedPositions = _findResultPositions(expectedStrings);
expect(group.positions, unorderedEquals(expectedPositions));
if (expectedSuggestions != null) {
expect(group.suggestions, unorderedEquals(expectedSuggestions));
@@ -106,8 +106,8 @@
/// Asserts that there is no [Assist] of the given [kind] at [_offset].
Future<void> assertNoAssist() async {
- List<Assist> assists = await _computeAssists();
- for (Assist assist in assists) {
+ var assists = await _computeAssists();
+ for (var assist in assists) {
if (assist.kind == kind) {
fail('Unexpected assist $kind in\n${assists.join('\n')}');
}
@@ -119,8 +119,8 @@
Future<void> assertNoAssistAt(String snippet, {int length = 0}) async {
_offset = findOffset(snippet);
_length = length;
- List<Assist> assists = await _computeAssists();
- for (Assist assist in assists) {
+ var assists = await _computeAssists();
+ for (var assist in assists) {
if (assist.kind == kind) {
fail('Unexpected assist $kind in\n${assists.join('\n')}');
}
@@ -162,8 +162,8 @@
/// Computes assists and verifies that there is an assist of the given kind.
Future<Assist> _assertHasAssist() async {
- List<Assist> assists = await _computeAssists();
- for (Assist assist in assists) {
+ var assists = await _computeAssists();
+ for (var assist in assists) {
if (assist.kind == kind) {
return assist;
}
@@ -183,9 +183,9 @@
}
List<Position> _findResultPositions(List<String> searchStrings) {
- List<Position> positions = <Position>[];
- for (String search in searchStrings) {
- int offset = _resultCode.indexOf(search);
+ var positions = <Position>[];
+ for (var search in searchStrings) {
+ var offset = _resultCode.indexOf(search);
positions.add(Position(testFile, offset));
}
return positions;
diff --git a/pkg/analysis_server/test/src/services/correction/assist/exchange_operands_test.dart b/pkg/analysis_server/test/src/services/correction/assist/exchange_operands_test.dart
index 21b3f96..dfd234c 100644
--- a/pkg/analysis_server/test/src/services/correction/assist/exchange_operands_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/assist/exchange_operands_test.dart
@@ -22,9 +22,9 @@
Future<void> test_compare() async {
const initialOperators = ['<', '<=', '>', '>='];
const resultOperators = ['>', '>=', '<', '<='];
- for (int i = 0; i <= 0; i++) {
- String initialOperator = initialOperators[i];
- String resultOperator = resultOperators[i];
+ for (var i = 0; i <= 0; i++) {
+ var initialOperator = initialOperators[i];
+ var resultOperator = resultOperators[i];
await resolveTestUnit('''
bool main(int a, int b) {
return a $initialOperator b;
diff --git a/pkg/analysis_server/test/src/services/correction/assist/import_add_show_test.dart b/pkg/analysis_server/test/src/services/correction/assist/import_add_show_test.dart
index b315f25..a196bfb 100644
--- a/pkg/analysis_server/test/src/services/correction/assist/import_add_show_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/assist/import_add_show_test.dart
@@ -65,6 +65,25 @@
''');
}
+ Future<void> test_onUri() async {
+ await resolveTestUnit('''
+import 'dart:math';
+main() {
+ PI;
+ E;
+ max(1, 2);
+}
+''');
+ await assertHasAssistAt('art:math', '''
+import 'dart:math' show E, PI, max;
+main() {
+ PI;
+ E;
+ max(1, 2);
+}
+''');
+ }
+
Future<void> test_setterOnDirective() async {
addSource('/home/test/lib/a.dart', r'''
void set setter(int i) {}
@@ -85,25 +104,6 @@
''');
}
- Future<void> test_onUri() async {
- await resolveTestUnit('''
-import 'dart:math';
-main() {
- PI;
- E;
- max(1, 2);
-}
-''');
- await assertHasAssistAt('art:math', '''
-import 'dart:math' show E, PI, max;
-main() {
- PI;
- E;
- max(1, 2);
-}
-''');
- }
-
Future<void> test_unresolvedUri() async {
verifyNoTestUnitErrors = false;
await resolveTestUnit('''
diff --git a/pkg/analysis_server/test/src/services/correction/assist/introduce_local_cast_type_test.dart b/pkg/analysis_server/test/src/services/correction/assist/introduce_local_cast_type_test.dart
index 1607452..33c0c35 100644
--- a/pkg/analysis_server/test/src/services/correction/assist/introduce_local_cast_type_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/assist/introduce_local_cast_type_test.dart
@@ -29,7 +29,7 @@
p = null;
}
''');
- String expected = '''
+ var expected = '''
class MyTypeName {}
main(p) {
if (p is MyTypeName) {
@@ -57,7 +57,7 @@
}
}
''');
- String expected = '''
+ var expected = '''
class MyTypeName {}
main(p) {
if (p is! MyTypeName) {
@@ -113,7 +113,7 @@
p = null;
}
''');
- String expected = '''
+ var expected = '''
main(p) {
while (p is String) {
String s = p;
diff --git a/pkg/analysis_server/test/src/services/correction/fix/add_missing_enum_case_clauses_test.dart b/pkg/analysis_server/test/src/services/correction/fix/add_missing_enum_case_clauses_test.dart
index ee1c619..41407c0 100644
--- a/pkg/analysis_server/test/src/services/correction/fix/add_missing_enum_case_clauses_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/fix/add_missing_enum_case_clauses_test.dart
@@ -21,7 +21,7 @@
FixKind get kind => DartFixKind.ADD_MISSING_ENUM_CASE_CLAUSES;
Future<void> assertHasFixWithFilter(String expected) async {
- bool noError = true;
+ var noError = true;
await assertHasFix(expected, errorFilter: (error) {
if (noError &&
error.errorCode ==
diff --git a/pkg/analysis_server/test/src/services/correction/fix/analysis_options/test_support.dart b/pkg/analysis_server/test/src/services/correction/fix/analysis_options/test_support.dart
index b64b851..4419e5d 100644
--- a/pkg/analysis_server/test/src/services/correction/fix/analysis_options/test_support.dart
+++ b/pkg/analysis_server/test/src/services/correction/fix/analysis_options/test_support.dart
@@ -5,13 +5,9 @@
import 'package:analysis_server/plugin/edit/fix/fix_core.dart';
import 'package:analysis_server/src/protocol_server.dart' show SourceEdit;
import 'package:analysis_server/src/services/correction/fix/analysis_options/fix_generator.dart';
-import 'package:analyzer/error/error.dart' as engine;
-import 'package:analyzer/file_system/file_system.dart';
import 'package:analyzer/src/generated/source.dart';
import 'package:analyzer/src/task/options.dart';
import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart';
-import 'package:analyzer_plugin/protocol/protocol_common.dart'
- show SourceFileEdit;
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
import 'package:yaml/src/yaml_node.dart';
@@ -22,31 +18,30 @@
class AnalysisOptionsFixTest with ResourceProviderMixin {
Future<void> assertHasFix(
String initialContent, String expectedContent) async {
- List<Fix> fixes = await _getFixes(initialContent);
+ var fixes = await _getFixes(initialContent);
expect(fixes, hasLength(1));
- List<SourceFileEdit> fileEdits = fixes[0].change.edits;
+ var fileEdits = fixes[0].change.edits;
expect(fileEdits, hasLength(1));
- String actualContent =
+ var actualContent =
SourceEdit.applySequence(initialContent, fileEdits[0].edits);
expect(actualContent, expectedContent);
}
Future<void> assertHasNoFix(String initialContent) async {
- List<Fix> fixes = await _getFixes(initialContent);
+ var fixes = await _getFixes(initialContent);
expect(fixes, hasLength(0));
}
Future<List<Fix>> _getFixes(String content) {
- File optionsFile = getFile('/analysis_options.yaml');
- SourceFactory sourceFactory = SourceFactory([]);
- List<engine.AnalysisError> errors = analyzeAnalysisOptions(
+ var optionsFile = getFile('/analysis_options.yaml');
+ var sourceFactory = SourceFactory([]);
+ var errors = analyzeAnalysisOptions(
optionsFile.createSource(), content, sourceFactory);
expect(errors, hasLength(1));
- engine.AnalysisError error = errors[0];
- YamlMap options = _parseYaml(content);
- AnalysisOptionsFixGenerator generator =
- AnalysisOptionsFixGenerator(error, content, options);
+ var error = errors[0];
+ var options = _parseYaml(content);
+ var generator = AnalysisOptionsFixGenerator(error, content, options);
return generator.computeFixes();
}
@@ -55,7 +50,7 @@
return YamlMap();
}
try {
- YamlNode doc = loadYamlNode(content);
+ var doc = loadYamlNode(content);
if (doc is YamlMap) {
return doc;
}
diff --git a/pkg/analysis_server/test/src/services/correction/fix/create_file_test.dart b/pkg/analysis_server/test/src/services/correction/fix/create_file_test.dart
index af8e317..0389835 100644
--- a/pkg/analysis_server/test/src/services/correction/fix/create_file_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/fix/create_file_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/src/protocol_server.dart';
import 'package:analysis_server/src/services/correction/fix.dart';
import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
import 'package:test/test.dart';
@@ -27,9 +26,9 @@
''');
await assertHasFixWithoutApplying();
// validate change
- List<SourceFileEdit> fileEdits = change.edits;
+ var fileEdits = change.edits;
expect(fileEdits, hasLength(1));
- SourceFileEdit fileEdit = change.edits[0];
+ var fileEdit = change.edits[0];
expect(fileEdit.file, convertPath('/home/test/lib/my_file.dart'));
expect(fileEdit.fileStamp, -1);
expect(fileEdit.edits, hasLength(1));
@@ -52,9 +51,9 @@
''');
await assertHasFixWithoutApplying();
// validate change
- List<SourceFileEdit> fileEdits = change.edits;
+ var fileEdits = change.edits;
expect(fileEdits, hasLength(1));
- SourceFileEdit fileEdit = change.edits[0];
+ var fileEdit = change.edits[0];
expect(fileEdit.file, convertPath('/home/test/lib/a/bb/my_lib.dart'));
expect(fileEdit.fileStamp, -1);
expect(fileEdit.edits, hasLength(1));
@@ -71,9 +70,9 @@
''');
await assertHasFixWithoutApplying();
// validate change
- List<SourceFileEdit> fileEdits = change.edits;
+ var fileEdits = change.edits;
expect(fileEdits, hasLength(1));
- SourceFileEdit fileEdit = change.edits[0];
+ var fileEdit = change.edits[0];
expect(fileEdit.file, convertPath('/home/test/test/a/bb/my_lib.dart'));
expect(fileEdit.fileStamp, -1);
expect(fileEdit.edits, hasLength(1));
@@ -90,9 +89,9 @@
''');
await assertHasFixWithoutApplying();
// validate change
- List<SourceFileEdit> fileEdits = change.edits;
+ var fileEdits = change.edits;
expect(fileEdits, hasLength(1));
- SourceFileEdit fileEdit = change.edits[0];
+ var fileEdit = change.edits[0];
expect(fileEdit.file, convertPath('/home/test/lib/my_part.dart'));
expect(fileEdit.fileStamp, -1);
expect(fileEdit.edits, hasLength(1));
diff --git a/pkg/analysis_server/test/src/services/correction/fix/create_getter_test.dart b/pkg/analysis_server/test/src/services/correction/fix/create_getter_test.dart
index f7d0fb6..5d0f6e8 100644
--- a/pkg/analysis_server/test/src/services/correction/fix/create_getter_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/fix/create_getter_test.dart
@@ -3,6 +3,7 @@
// BSD-style license that can be found in the LICENSE file.
import 'package:analysis_server/src/services/correction/fix.dart';
+import 'package:analyzer/src/error/codes.dart';
import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -254,6 +255,41 @@
''');
}
+ Future<void> test_qualified_instance_inPart_imported() async {
+ addSource('/home/test/lib/a.dart', '''
+part of lib;
+
+class A {}
+''');
+
+ await resolveTestUnit('''
+import 'package:test/a.dart';
+
+main(A a) {
+ int v = a.test;
+ print(v);
+}
+''');
+ await assertNoFix(errorFilter: (e) {
+ return e.errorCode == StaticTypeWarningCode.UNDEFINED_GETTER;
+ });
+ }
+
+ Future<void> test_qualified_instance_inPart_self() async {
+ await resolveTestUnit('''
+part of lib;
+
+class A {
+}
+
+main(A a) {
+ int v = a.test;
+ print(v);
+}
+''');
+ await assertNoFix();
+ }
+
Future<void> test_qualified_propagatedType() async {
await resolveTestUnit('''
class A {
diff --git a/pkg/analysis_server/test/src/services/correction/fix/create_local_variable_test.dart b/pkg/analysis_server/test/src/services/correction/fix/create_local_variable_test.dart
index b632fa0..e9253d7 100644
--- a/pkg/analysis_server/test/src/services/correction/fix/create_local_variable_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/fix/create_local_variable_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/src/protocol_server.dart';
import 'package:analysis_server/src/services/correction/fix.dart';
import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
import 'package:test/test.dart';
@@ -176,14 +175,14 @@
new C(a, b);
}
''');
- List<LinkedEditGroup> groups = change.linkedEditGroups;
+ var groups = change.linkedEditGroups;
expect(groups, hasLength(2));
- LinkedEditGroup typeGroup = groups[0];
- List<Position> typePositions = typeGroup.positions;
+ var typeGroup = groups[0];
+ var typePositions = typeGroup.positions;
expect(typePositions, hasLength(1));
expect(typePositions[0].offset, 112);
- LinkedEditGroup nameGroup = groups[1];
- List<Position> groupPositions = nameGroup.positions;
+ var nameGroup = groups[1];
+ var groupPositions = nameGroup.positions;
expect(groupPositions, hasLength(2));
expect(groupPositions[0].offset, 114);
expect(groupPositions[1].offset, 128);
diff --git a/pkg/analysis_server/test/src/services/correction/fix/create_method_test.dart b/pkg/analysis_server/test/src/services/correction/fix/create_method_test.dart
index e83d7ca..318248c 100644
--- a/pkg/analysis_server/test/src/services/correction/fix/create_method_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/fix/create_method_test.dart
@@ -322,7 +322,7 @@
}
''');
// linked positions
- int index = 0;
+ var index = 0;
assertLinkedGroup(
change.linkedEditGroups[index++], ['void myUndefinedMethod(']);
assertLinkedGroup(change.linkedEditGroups[index++],
@@ -365,7 +365,7 @@
}
''');
// linked positions
- int index = 0;
+ var index = 0;
assertLinkedGroup(
change.linkedEditGroups[index++], ['void myUndefinedMethod(']);
assertLinkedGroup(change.linkedEditGroups[index++],
@@ -713,7 +713,7 @@
}
Future<void> test_parameterType_differentPrefixInTargetUnit() async {
- String code2 = r'''
+ var code2 = r'''
import 'test3.dart' as bbb;
export 'test3.dart';
diff --git a/pkg/analysis_server/test/src/services/correction/fix/create_missing_overrides_test.dart b/pkg/analysis_server/test/src/services/correction/fix/create_missing_overrides_test.dart
index fe9c123..7100681 100644
--- a/pkg/analysis_server/test/src/services/correction/fix/create_missing_overrides_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/fix/create_missing_overrides_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analysis_server/src/protocol_server.dart';
import 'package:analysis_server/src/services/correction/fix.dart';
import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
import 'package:test/test.dart';
@@ -245,7 +244,7 @@
class B extends A {
}
''');
- String expectedCode = '''
+ var expectedCode = '''
abstract class A {
void m1();
int m2();
@@ -295,11 +294,11 @@
await assertHasFix(expectedCode);
{
// end position should be on "m1", not on "m2", "m3", etc.
- Position endPosition = change.selection;
+ var endPosition = change.selection;
expect(endPosition, isNotNull);
expect(endPosition.file, testFile);
- int endOffset = endPosition.offset;
- String endString = expectedCode.substring(endOffset, endOffset + 25);
+ var endOffset = endPosition.offset;
+ var endString = expectedCode.substring(endOffset, endOffset + 25);
expect(endString, contains('m1'));
expect(endString, isNot(contains('m2')));
expect(endString, isNot(contains('m3')));
diff --git a/pkg/analysis_server/test/src/services/correction/fix/create_mixin_test.dart b/pkg/analysis_server/test/src/services/correction/fix/create_mixin_test.dart
index cfb47a1..0fd84b2 100644
--- a/pkg/analysis_server/test/src/services/correction/fix/create_mixin_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/fix/create_mixin_test.dart
@@ -32,7 +32,7 @@
}
Future<void> test_inLibraryOfPrefix() async {
- String libCode = r'''
+ var libCode = r'''
class A {}
''';
addSource('/home/test/lib/lib.dart', libCode);
diff --git a/pkg/analysis_server/test/src/services/correction/fix/create_setter_test.dart b/pkg/analysis_server/test/src/services/correction/fix/create_setter_test.dart
index aba94f8..98216f6 100644
--- a/pkg/analysis_server/test/src/services/correction/fix/create_setter_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/fix/create_setter_test.dart
@@ -3,6 +3,7 @@
// BSD-style license that can be found in the LICENSE file.
import 'package:analysis_server/src/services/correction/fix.dart';
+import 'package:analyzer/src/error/codes.dart';
import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -251,6 +252,39 @@
''');
}
+ Future<void> test_qualified_instance_inPart_imported() async {
+ addSource('/home/test/lib/a.dart', '''
+part of lib;
+
+class A {}
+''');
+
+ await resolveTestUnit('''
+import 'package:test/a.dart';
+
+main(A a) {
+ a.test = 0;
+}
+''');
+ await assertNoFix(errorFilter: (e) {
+ return e.errorCode == StaticTypeWarningCode.UNDEFINED_SETTER;
+ });
+ }
+
+ Future<void> test_qualified_instance_inPart_self() async {
+ await resolveTestUnit('''
+part of lib;
+
+class A {
+}
+
+main(A a) {
+ a.test = 0;
+}
+''');
+ await assertNoFix();
+ }
+
Future<void> test_qualified_propagatedType() async {
await resolveTestUnit('''
class A {
diff --git a/pkg/analysis_server/test/src/services/correction/fix/fix_processor.dart b/pkg/analysis_server/test/src/services/correction/fix/fix_processor.dart
index 6631e92..d806718 100644
--- a/pkg/analysis_server/test/src/services/correction/fix/fix_processor.dart
+++ b/pkg/analysis_server/test/src/services/correction/fix/fix_processor.dart
@@ -83,17 +83,17 @@
String target,
int expectedNumberOfFixesForKind,
String matchFixMessage}) async {
- AnalysisError error = await _findErrorToFix(errorFilter, length: length);
- Fix fix = await _assertHasFix(error,
+ var error = await _findErrorToFix(errorFilter, length: length);
+ var fix = await _assertHasFix(error,
expectedNumberOfFixesForKind: expectedNumberOfFixesForKind,
matchFixMessage: matchFixMessage);
change = fix.change;
// apply to "file"
- List<SourceFileEdit> fileEdits = change.edits;
+ var fileEdits = change.edits;
expect(fileEdits, hasLength(1));
- String fileContent = testCode;
+ var fileContent = testCode;
if (target != null) {
expect(fileEdits.first.file, convertPath(target));
fileContent = getFile(target).readAsStringSync();
@@ -105,15 +105,15 @@
void assertHasFixAllFix(ErrorCode errorCode, String expected,
{String target}) async {
- AnalysisError error = await _findErrorToFixOfType(errorCode);
- Fix fix = await _assertHasFixAllFix(error);
+ var error = await _findErrorToFixOfType(errorCode);
+ var fix = await _assertHasFixAllFix(error);
change = fix.change;
// apply to "file"
- List<SourceFileEdit> fileEdits = change.edits;
+ var fileEdits = change.edits;
expect(fileEdits, hasLength(1));
- String fileContent = testCode;
+ var fileContent = testCode;
if (target != null) {
expect(fileEdits.first.file, convertPath(target));
fileContent = getFile(target).readAsStringSync();
@@ -125,14 +125,14 @@
Future<void> assertHasFixWithoutApplying(
{bool Function(AnalysisError) errorFilter}) async {
- AnalysisError error = await _findErrorToFix(errorFilter);
- Fix fix = await _assertHasFix(error);
+ var error = await _findErrorToFix(errorFilter);
+ var fix = await _assertHasFix(error);
change = fix.change;
}
void assertLinkedGroup(LinkedEditGroup group, List<String> expectedStrings,
[List<LinkedEditSuggestion> expectedSuggestions]) {
- List<Position> expectedPositions = _findResultPositions(expectedStrings);
+ var expectedPositions = _findResultPositions(expectedStrings);
expect(group.positions, unorderedEquals(expectedPositions));
if (expectedSuggestions != null) {
expect(group.suggestions, unorderedEquals(expectedSuggestions));
@@ -142,7 +142,7 @@
/// Compute fixes for all of the errors in the test file to effectively assert
/// that no exceptions will be thrown by doing so.
Future<void> assertNoExceptions() async {
- List<AnalysisError> errors = await _computeErrors();
+ var errors = await _computeErrors();
for (var error in errors) {
await _computeFixes(error);
}
@@ -151,7 +151,7 @@
/// Compute fixes and ensure that there is no fix of the [kind] being tested by
/// this class.
Future<void> assertNoFix({bool Function(AnalysisError) errorFilter}) async {
- AnalysisError error = await _findErrorToFix(errorFilter);
+ var error = await _findErrorToFix(errorFilter);
await _assertNoFix(error);
}
@@ -174,11 +174,11 @@
Future<Fix> _assertHasFix(AnalysisError error,
{int expectedNumberOfFixesForKind, String matchFixMessage}) async {
// Compute the fixes for this AnalysisError
- final List<Fix> fixes = await _computeFixes(error);
+ var fixes = await _computeFixes(error);
if (expectedNumberOfFixesForKind != null) {
- int actualNumberOfFixesForKind = 0;
- for (Fix fix in fixes) {
+ var actualNumberOfFixesForKind = 0;
+ for (var fix in fixes) {
if (fix.kind == kind) {
actualNumberOfFixesForKind++;
}
@@ -191,7 +191,7 @@
// If a matchFixMessage was provided,
if (matchFixMessage != null) {
- for (Fix fix in fixes) {
+ for (var fix in fixes) {
if (matchFixMessage == fix?.change?.message) {
return fix;
}
@@ -207,7 +207,7 @@
// Assert that none of the fixes are a fix-all fix.
Fix foundFix;
- for (Fix fix in fixes) {
+ for (var fix in fixes) {
if (fix.isFixAllFix()) {
fail('A fix-all fix was found for the error: $error '
'in the computed set of fixes:\n${fixes.join('\n')}');
@@ -230,11 +230,11 @@
}
// Compute the fixes for the error.
- List<Fix> fixes = await _computeFixes(error);
+ var fixes = await _computeFixes(error);
// Assert that there exists such a fix in the list.
Fix foundFix;
- for (Fix fix in fixes) {
+ for (var fix in fixes) {
if (fix.kind == kind && fix.isFixAllFix()) {
foundFix = fix;
break;
@@ -248,8 +248,8 @@
}
Future<void> _assertNoFix(AnalysisError error) async {
- List<Fix> fixes = await _computeFixes(error);
- for (Fix fix in fixes) {
+ var fixes = await _computeFixes(error);
+ for (var fix in fixes) {
if (fix.kind == kind) {
fail('Unexpected fix $kind in\n${fixes.join('\n')}');
}
@@ -294,7 +294,7 @@
Future<AnalysisError> _findErrorToFix(
bool Function(AnalysisError) errorFilter,
{int length}) async {
- List<AnalysisError> errors = await _computeErrors();
+ var errors = await _computeErrors();
if (errorFilter != null) {
if (errors.length == 1) {
fail('Unnecessary error filter');
@@ -304,9 +304,9 @@
if (errors.isEmpty) {
fail('Expected one error, found: none');
} else if (errors.length > 1) {
- StringBuffer buffer = StringBuffer();
+ var buffer = StringBuffer();
buffer.writeln('Expected one error, found:');
- for (AnalysisError error in errors) {
+ for (var error in errors) {
buffer.writeln(' $error [${error.errorCode}]');
}
fail(buffer.toString());
@@ -315,8 +315,8 @@
}
Future<AnalysisError> _findErrorToFixOfType(ErrorCode errorCode) async {
- List<AnalysisError> errors = await _computeErrors();
- for (AnalysisError error in errors) {
+ var errors = await _computeErrors();
+ for (var error in errors) {
if (error.errorCode == errorCode) {
return error;
}
@@ -325,9 +325,9 @@
}
List<Position> _findResultPositions(List<String> searchStrings) {
- List<Position> positions = <Position>[];
- for (String search in searchStrings) {
- int offset = resultCode.indexOf(search);
+ var positions = <Position>[];
+ for (var search in searchStrings) {
+ var offset = resultCode.indexOf(search);
positions.add(Position(testFile, offset));
}
return positions;
diff --git a/pkg/analysis_server/test/src/services/correction/fix/manifest/test_support.dart b/pkg/analysis_server/test/src/services/correction/fix/manifest/test_support.dart
index 4823859..f071ec8 100644
--- a/pkg/analysis_server/test/src/services/correction/fix/manifest/test_support.dart
+++ b/pkg/analysis_server/test/src/services/correction/fix/manifest/test_support.dart
@@ -5,15 +5,10 @@
import 'package:analysis_server/plugin/edit/fix/fix_core.dart';
import 'package:analysis_server/src/protocol_server.dart' show SourceEdit;
import 'package:analysis_server/src/services/correction/fix/manifest/fix_generator.dart';
-import 'package:analyzer/error/error.dart' as engine;
-import 'package:analyzer/file_system/file_system.dart';
import 'package:analyzer/src/manifest/manifest_validator.dart';
import 'package:analyzer/src/manifest/manifest_values.dart';
import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart';
-import 'package:analyzer_plugin/protocol/protocol_common.dart'
- show SourceFileEdit;
import 'package:analyzer_plugin/protocol/protocol_common.dart';
-import 'package:html/dom.dart';
import 'package:html/parser.dart';
import 'package:test/test.dart';
@@ -22,33 +17,31 @@
class ManifestFixTest with ResourceProviderMixin {
Future<void> assertHasFix(
String initialContent, String expectedContent) async {
- List<Fix> fixes = await _getFixes(initialContent);
+ var fixes = await _getFixes(initialContent);
expect(fixes, hasLength(1));
- List<SourceFileEdit> fileEdits = fixes[0].change.edits;
+ var fileEdits = fixes[0].change.edits;
expect(fileEdits, hasLength(1));
- String actualContent =
+ var actualContent =
SourceEdit.applySequence(initialContent, fileEdits[0].edits);
expect(actualContent, expectedContent);
}
Future<void> assertHasNoFix(String initialContent) async {
- List<Fix> fixes = await _getFixes(initialContent);
+ var fixes = await _getFixes(initialContent);
expect(fixes, hasLength(0));
}
Future<List<Fix>> _getFixes(String content) {
- File manifestFile = getFile('/package/AndroidManifest.xml');
- DocumentFragment document =
+ var manifestFile = getFile('/package/AndroidManifest.xml');
+ var document =
parseFragment(content, container: MANIFEST_TAG, generateSpans: true);
expect(document, isNotNull);
- ManifestValidator validator =
- ManifestValidator(manifestFile.createSource());
- List<engine.AnalysisError> errors = validator.validate(content, true);
+ var validator = ManifestValidator(manifestFile.createSource());
+ var errors = validator.validate(content, true);
expect(errors, hasLength(1));
- engine.AnalysisError error = errors[0];
- ManifestFixGenerator generator =
- ManifestFixGenerator(error, content, document);
+ var error = errors[0];
+ var generator = ManifestFixGenerator(error, content, document);
return generator.computeFixes();
}
}
diff --git a/pkg/analysis_server/test/src/services/correction/fix/pubspec/test_support.dart b/pkg/analysis_server/test/src/services/correction/fix/pubspec/test_support.dart
index de8987c..4eea061 100644
--- a/pkg/analysis_server/test/src/services/correction/fix/pubspec/test_support.dart
+++ b/pkg/analysis_server/test/src/services/correction/fix/pubspec/test_support.dart
@@ -5,12 +5,8 @@
import 'package:analysis_server/plugin/edit/fix/fix_core.dart';
import 'package:analysis_server/src/protocol_server.dart' show SourceEdit;
import 'package:analysis_server/src/services/correction/fix/pubspec/fix_generator.dart';
-import 'package:analyzer/error/error.dart' as engine;
-import 'package:analyzer/file_system/file_system.dart';
import 'package:analyzer/src/pubspec/pubspec_validator.dart';
import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart';
-import 'package:analyzer_plugin/protocol/protocol_common.dart'
- show SourceFileEdit;
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
import 'package:yaml/src/yaml_node.dart';
@@ -21,32 +17,31 @@
class PubspecFixTest with ResourceProviderMixin {
Future<void> assertHasFix(
String initialContent, String expectedContent) async {
- List<Fix> fixes = await _getFixes(initialContent);
+ var fixes = await _getFixes(initialContent);
expect(fixes, hasLength(1));
- List<SourceFileEdit> fileEdits = fixes[0].change.edits;
+ var fileEdits = fixes[0].change.edits;
expect(fileEdits, hasLength(1));
- String actualContent =
+ var actualContent =
SourceEdit.applySequence(initialContent, fileEdits[0].edits);
expect(actualContent, expectedContent);
}
Future<void> assertHasNoFix(String initialContent) async {
- List<Fix> fixes = await _getFixes(initialContent);
+ var fixes = await _getFixes(initialContent);
expect(fixes, hasLength(0));
}
Future<List<Fix>> _getFixes(String content) {
- File pubspecFile = getFile('/package/pubspec.yaml');
- YamlMap pubspec = _parseYaml(content);
+ var pubspecFile = getFile('/package/pubspec.yaml');
+ var pubspec = _parseYaml(content);
expect(pubspec, isNotNull);
- PubspecValidator validator =
+ var validator =
PubspecValidator(resourceProvider, pubspecFile.createSource());
- List<engine.AnalysisError> errors = validator.validate(pubspec.nodes);
+ var errors = validator.validate(pubspec.nodes);
expect(errors, hasLength(1));
- engine.AnalysisError error = errors[0];
- PubspecFixGenerator generator =
- PubspecFixGenerator(error, content, pubspec);
+ var error = errors[0];
+ var generator = PubspecFixGenerator(error, content, pubspec);
return generator.computeFixes();
}
@@ -55,7 +50,7 @@
return YamlMap();
}
try {
- YamlNode doc = loadYamlNode(content);
+ var doc = loadYamlNode(content);
if (doc is YamlMap) {
return doc;
}
diff --git a/pkg/analysis_server/test/src/services/correction/fix/wrap_in_text_test.dart b/pkg/analysis_server/test/src/services/correction/fix/wrap_in_text_test.dart
index a04df7c..d3b0b24 100644
--- a/pkg/analysis_server/test/src/services/correction/fix/wrap_in_text_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/fix/wrap_in_text_test.dart
@@ -44,7 +44,20 @@
await assertNoFix();
}
- Future<void> test_notWidget() async {
+ Future<void> test_parameterType_notClass() async {
+ await resolveTestUnit('''
+typedef F = void Function();
+
+void foo({F a}) {}
+
+void bar() {
+ foo(a: '');
+}
+''');
+ await assertNoFix();
+ }
+
+ Future<void> test_parameterType_notWidget() async {
await resolveTestUnit('''
void f(int i) {
f('a');
diff --git a/pkg/analysis_server/test/src/utilities/flutter_test.dart b/pkg/analysis_server/test/src/utilities/flutter_test.dart
index 1dd384d..4e52eff 100644
--- a/pkg/analysis_server/test/src/utilities/flutter_test.dart
+++ b/pkg/analysis_server/test/src/utilities/flutter_test.dart
@@ -117,9 +117,9 @@
{
ExpressionStatement statement = statements[0];
InstanceCreationExpression creation = statement.expression;
- ConstructorName constructorName = creation.constructorName;
- TypeName typeName = constructorName.type;
- ArgumentList argumentList = creation.argumentList;
+ var constructorName = creation.constructorName;
+ var typeName = constructorName.type;
+ var argumentList = creation.argumentList;
expect(flutter.identifyWidgetExpression(creation), creation);
expect(flutter.identifyWidgetExpression(constructorName), creation);
expect(flutter.identifyWidgetExpression(typeName), creation);
@@ -134,9 +134,9 @@
{
ExpressionStatement statement = statements[1];
InstanceCreationExpression creation = statement.expression;
- ConstructorName constructorName = creation.constructorName;
- TypeName typeName = constructorName.type;
- ArgumentList argumentList = creation.argumentList;
+ var constructorName = creation.constructorName;
+ var typeName = constructorName.type;
+ var argumentList = creation.argumentList;
expect(flutter.identifyWidgetExpression(creation), creation);
expect(flutter.identifyWidgetExpression(constructorName), creation);
expect(flutter.identifyWidgetExpression(typeName), creation);
@@ -166,7 +166,7 @@
MethodInvocation invocation = findNodeAtString(
'createEmptyText();', (node) => node is MethodInvocation);
expect(flutter.identifyWidgetExpression(invocation), invocation);
- ArgumentList argumentList = invocation.argumentList;
+ var argumentList = invocation.argumentList;
expect(flutter.identifyWidgetExpression(argumentList), isNull);
}
@@ -174,7 +174,7 @@
MethodInvocation invocation = findNodeAtString(
"createText('xyz');", (node) => node is MethodInvocation);
expect(flutter.identifyWidgetExpression(invocation), invocation);
- ArgumentList argumentList = invocation.argumentList;
+ var argumentList = invocation.argumentList;
expect(flutter.identifyWidgetExpression(argumentList), isNull);
expect(
flutter.identifyWidgetExpression(argumentList.arguments[0]),
@@ -464,10 +464,10 @@
''');
expect(flutter.isWidgetCreation(null), isFalse);
- InstanceCreationExpression a = _getTopVariableCreation('a');
+ var a = _getTopVariableCreation('a');
expect(flutter.isWidgetCreation(a), isFalse);
- InstanceCreationExpression b = _getTopVariableCreation('b');
+ var b = _getTopVariableCreation('b');
expect(flutter.isWidgetCreation(b), isTrue);
}
diff --git a/pkg/analysis_server/test/src/utilities/profiling_test.dart b/pkg/analysis_server/test/src/utilities/profiling_test.dart
index a846dd1..0485511 100644
--- a/pkg/analysis_server/test/src/utilities/profiling_test.dart
+++ b/pkg/analysis_server/test/src/utilities/profiling_test.dart
@@ -19,8 +19,8 @@
});
test('getProcessUsage', () async {
- ProcessProfiler profiler = ProcessProfiler.getProfilerForPlatform();
- UsageInfo info = await profiler.getProcessUsage(pid);
+ var profiler = ProcessProfiler.getProfilerForPlatform();
+ var info = await profiler.getProcessUsage(pid);
expect(info, isNotNull);
expect(info.cpuPercentage, greaterThanOrEqualTo(0.0));
diff --git a/pkg/analysis_server/test/src/utilities/strings_test.dart b/pkg/analysis_server/test/src/utilities/strings_test.dart
index 0a7ce0d..6f068d4 100644
--- a/pkg/analysis_server/test/src/utilities/strings_test.dart
+++ b/pkg/analysis_server/test/src/utilities/strings_test.dart
@@ -32,10 +32,10 @@
void test_computeSimpleDiff() {
void assertDiff(String oldStr, String newStr) {
- SimpleDiff diff = computeSimpleDiff(oldStr, newStr);
+ var diff = computeSimpleDiff(oldStr, newStr);
expect(diff.offset, isNonNegative);
expect(diff.length, isNonNegative);
- String applied = oldStr.substring(0, diff.offset) +
+ var applied = oldStr.substring(0, diff.offset) +
diff.replacement +
oldStr.substring(diff.offset + diff.length);
expect(applied, newStr);
@@ -83,7 +83,7 @@
}
void test_isDigit() {
- for (int c in '0123456789'.codeUnits) {
+ for (var c in '0123456789'.codeUnits) {
expect(isDigit(c), isTrue);
}
expect(isDigit(' '.codeUnitAt(0)), isFalse);
@@ -91,10 +91,10 @@
}
void test_isLetter() {
- for (int c in 'abcdefghijklmnopqrstuvwxyz'.codeUnits) {
+ for (var c in 'abcdefghijklmnopqrstuvwxyz'.codeUnits) {
expect(isLetter(c), isTrue);
}
- for (int c in 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.codeUnits) {
+ for (var c in 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.codeUnits) {
expect(isLetter(c), isTrue);
}
expect(isLetter(' '.codeUnitAt(0)), isFalse);
@@ -102,13 +102,13 @@
}
void test_isLetterOrDigit() {
- for (int c in 'abcdefghijklmnopqrstuvwxyz'.codeUnits) {
+ for (var c in 'abcdefghijklmnopqrstuvwxyz'.codeUnits) {
expect(isLetterOrDigit(c), isTrue);
}
- for (int c in 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.codeUnits) {
+ for (var c in 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.codeUnits) {
expect(isLetterOrDigit(c), isTrue);
}
- for (int c in '0123456789'.codeUnits) {
+ for (var c in '0123456789'.codeUnits) {
expect(isLetterOrDigit(c), isTrue);
}
expect(isLetterOrDigit(' '.codeUnitAt(0)), isFalse);
diff --git a/pkg/analysis_server/test/stress/completion/completion.dart b/pkg/analysis_server/test/stress/completion/completion.dart
index fccd680..b2b30f5 100644
--- a/pkg/analysis_server/test/stress/completion/completion.dart
+++ b/pkg/analysis_server/test/stress/completion/completion.dart
@@ -10,13 +10,13 @@
/// The main entry point for the code completion stress test.
void main(List<String> args) async {
- ArgParser parser = createArgParser();
- ArgResults result = parser.parse(args);
+ var parser = createArgParser();
+ var result = parser.parse(args);
if (validArguments(parser, result)) {
- String analysisRoot = result.rest[0];
+ var analysisRoot = result.rest[0];
- CompletionRunner runner = CompletionRunner(
+ var runner = CompletionRunner(
output: stdout,
printMissing: result['missing'],
printQuality: result['quality'],
@@ -29,7 +29,7 @@
/// Create a parser that can be used to parse the command-line arguments.
ArgParser createArgParser() {
- ArgParser parser = ArgParser();
+ var parser = ArgParser();
parser.addFlag(
'help',
abbr: 'h',
diff --git a/pkg/analysis_server/test/stress/completion/completion_runner.dart b/pkg/analysis_server/test/stress/completion/completion_runner.dart
index e601a70..3fae840 100644
--- a/pkg/analysis_server/test/stress/completion/completion_runner.dart
+++ b/pkg/analysis_server/test/stress/completion/completion_runner.dart
@@ -8,15 +8,12 @@
import 'package:analysis_server/src/services/completion/completion_performance.dart';
import 'package:analysis_server/src/services/completion/dart/completion_manager.dart';
import 'package:analysis_server/src/utilities/null_string_sink.dart';
-import 'package:analyzer/dart/analysis/analysis_context.dart';
import 'package:analyzer/dart/analysis/analysis_context_collection.dart';
-import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/ast/visitor.dart';
import 'package:analyzer/file_system/overlay_file_system.dart';
import 'package:analyzer/file_system/physical_file_system.dart';
import 'package:analyzer/source/line_info.dart';
-import 'package:analyzer/src/generated/source.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
/// A runner that can request code completion at the location of each identifier
@@ -58,44 +55,43 @@
/// Test the completion engine at the locations of each of the identifiers in
/// each of the files in the given [analysisRoot].
Future<void> runAll(String analysisRoot) async {
- OverlayResourceProvider resourceProvider =
+ var resourceProvider =
OverlayResourceProvider(PhysicalResourceProvider.INSTANCE);
- AnalysisContextCollection collection = AnalysisContextCollection(
+ var collection = AnalysisContextCollection(
includedPaths: <String>[analysisRoot],
resourceProvider: resourceProvider);
- DartCompletionManager contributor = DartCompletionManager();
- CompletionPerformance performance = CompletionPerformance();
- int stamp = 1;
+ var contributor = DartCompletionManager();
+ var performance = CompletionPerformance();
+ var stamp = 1;
- int fileCount = 0;
- int identifierCount = 0;
- int expectedCount = 0;
- int missingCount = 0;
- List<int> indexCount = List.filled(20, 0);
- List<int> filteredIndexCount = List.filled(20, 0);
+ var fileCount = 0;
+ var identifierCount = 0;
+ var expectedCount = 0;
+ var missingCount = 0;
+ var indexCount = List<int>.filled(20, 0);
+ var filteredIndexCount = List<int>.filled(20, 0);
// Consider getting individual timings so that we can also report the
// longest and shortest times, or even a distribution.
- Stopwatch timer = Stopwatch();
+ var timer = Stopwatch();
- for (AnalysisContext context in collection.contexts) {
- for (String path in context.contextRoot.analyzedFiles()) {
+ for (var context in collection.contexts) {
+ for (var path in context.contextRoot.analyzedFiles()) {
if (!path.endsWith('.dart')) {
continue;
}
fileCount++;
output.write('.');
- ResolvedUnitResult result =
- await context.currentSession.getResolvedUnit(path);
- String content = result.content;
- LineInfo lineInfo = result.lineInfo;
- List<SimpleIdentifier> identifiers = _identifiersIn(result.unit);
+ var result = await context.currentSession.getResolvedUnit(path);
+ var content = result.content;
+ var lineInfo = result.lineInfo;
+ var identifiers = _identifiersIn(result.unit);
- for (SimpleIdentifier identifier in identifiers) {
+ for (var identifier in identifiers) {
identifierCount++;
- int offset = identifier.offset;
+ var offset = identifier.offset;
if (deleteBeforeCompletion) {
- String modifiedContent = content.substring(0, offset) +
+ var modifiedContent = content.substring(0, offset) +
content.substring(identifier.end);
resourceProvider.setOverlay(path,
content: modifiedContent, modificationStamp: stamp++);
@@ -103,17 +99,16 @@
}
timer.start();
- CompletionRequestImpl request =
+ var request =
CompletionRequestImpl(result, offset, false, performance);
- List<CompletionSuggestion> suggestions =
- await contributor.computeSuggestions(request);
+ var suggestions = await contributor.computeSuggestions(request);
timer.stop();
if (!identifier.inDeclarationContext() &&
!_isNamedExpressionName(identifier)) {
expectedCount++;
suggestions = _sort(suggestions.toList());
- int index = _indexOf(suggestions, identifier.name);
+ var index = _indexOf(suggestions, identifier.name);
if (index < 0) {
missingCount++;
if (printMissing) {
@@ -128,9 +123,9 @@
if (index < indexCount.length) {
indexCount[index]++;
}
- List<CompletionSuggestion> filteredSuggestions =
+ var filteredSuggestions =
_filterBy(suggestions, identifier.name.substring(0, 1));
- int filteredIndex =
+ var filteredIndex =
_indexOf(filteredSuggestions, identifier.name);
if (filteredIndex < filteredIndexCount.length) {
filteredIndexCount[filteredIndex]++;
@@ -151,11 +146,11 @@
if (expectedCount > 0) {
output.writeln(' $expectedCount were expected to code complete');
if (printQuality) {
- int percent = (missingCount * 100 / expectedCount).round();
+ var percent = (missingCount * 100 / expectedCount).round();
output.writeln(' $percent% of which were missing suggestions '
'($missingCount)');
- int foundCount = expectedCount - missingCount;
+ var foundCount = expectedCount - missingCount;
void printCount(int count) {
if (count < 10) {
@@ -169,17 +164,17 @@
} else {
output.write(' $count ');
}
- int percent = (count * 100 / foundCount).floor();
- for (int j = 0; j < percent; j++) {
+ var percent = (count * 100 / foundCount).floor();
+ for (var j = 0; j < percent; j++) {
output.write('-');
}
output.writeln();
}
void _printCounts(List<int> counts) {
- int nearTopCount = 0;
- for (int i = 0; i < counts.length; i++) {
- int count = counts[i];
+ var nearTopCount = 0;
+ for (var i = 0; i < counts.length; i++) {
+ var count = counts[i];
printCount(count);
nearTopCount += count;
}
@@ -196,8 +191,8 @@
}
}
if (timing && identifierCount > 0) {
- int time = timer.elapsedMilliseconds;
- int averageTime = (time / identifierCount).round();
+ var time = timer.elapsedMilliseconds;
+ var averageTime = (time / identifierCount).round();
output.writeln('completion took $time ms, '
'which is an average of $averageTime ms per completion');
}
@@ -213,7 +208,7 @@
/// Return a list containing information about the identifiers in the given
/// compilation [unit].
List<SimpleIdentifier> _identifiersIn(CompilationUnit unit) {
- IdentifierCollector visitor = IdentifierCollector();
+ var visitor = IdentifierCollector();
unit.accept(visitor);
return visitor.identifiers;
}
@@ -221,7 +216,7 @@
/// If the given list of [suggestions] includes a suggestion for the given
/// [identifier], return the index of the suggestion. Otherwise, return `-1`.
int _indexOf(List<CompletionSuggestion> suggestions, String identifier) {
- for (int i = 0; i < suggestions.length; i++) {
+ for (var i = 0; i < suggestions.length; i++) {
if (suggestions[i].completion == identifier) {
return i;
}
@@ -232,7 +227,7 @@
/// Return `true` if the given [identifier] is being used as the name of a
/// named expression.
bool _isNamedExpressionName(SimpleIdentifier identifier) {
- AstNode parent = identifier.parent;
+ var parent = identifier.parent;
return parent is NamedExpression && parent.name.label == identifier;
}
@@ -243,7 +238,7 @@
return;
}
output.writeln(' Suggestions:');
- for (CompletionSuggestion suggestion in suggestions) {
+ for (var suggestion in suggestions) {
output.writeln(' ${suggestion.completion}');
}
}
diff --git a/pkg/analysis_server/test/stress/replay/replay.dart b/pkg/analysis_server/test/stress/replay/replay.dart
index 3cc486e..559dd24 100644
--- a/pkg/analysis_server/test/stress/replay/replay.dart
+++ b/pkg/analysis_server/test/stress/replay/replay.dart
@@ -27,7 +27,7 @@
/// Run the simulation based on the given command-line [arguments].
Future<void> main(List<String> arguments) async {
- Driver driver = Driver();
+ var driver = Driver();
await driver.run(arguments);
}
@@ -135,7 +135,7 @@
/// Create and return a parser that can be used to parse the command-line
/// arguments.
ArgParser _createArgParser() {
- ArgParser parser = ArgParser();
+ var parser = ArgParser();
parser.addFlag(HELP_FLAG_NAME,
abbr: 'h',
help: 'Print usage information',
@@ -160,27 +160,27 @@
/// Add source edits to the given [fileEdit] based on the given [blobDiff].
void _createSourceEdits(FileEdit fileEdit, BlobDiff blobDiff) {
- LineInfo info = fileEdit.lineInfo;
- for (DiffHunk hunk in blobDiff.hunks) {
- int srcStart = info.getOffsetOfLine(hunk.srcLine);
- int srcEnd = info.getOffsetOfLine(
+ var info = fileEdit.lineInfo;
+ for (var hunk in blobDiff.hunks) {
+ var srcStart = info.getOffsetOfLine(hunk.srcLine);
+ var srcEnd = info.getOffsetOfLine(
math.min(hunk.srcLine + hunk.removeLines.length, info.lineCount - 1));
- String addedText = _join(hunk.addLines);
+ var addedText = _join(hunk.addLines);
//
// Create the source edits.
//
- List<int> breakOffsets = _getBreakOffsets(addedText);
- int breakCount = breakOffsets.length;
- List<SourceEdit> sourceEdits = <SourceEdit>[];
+ var breakOffsets = _getBreakOffsets(addedText);
+ var breakCount = breakOffsets.length;
+ var sourceEdits = <SourceEdit>[];
if (breakCount == 0) {
sourceEdits.add(SourceEdit(srcStart, srcEnd - srcStart + 1, addedText));
} else {
- int previousOffset = breakOffsets[0];
- String string = addedText.substring(0, previousOffset);
+ var previousOffset = breakOffsets[0];
+ var string = addedText.substring(0, previousOffset);
sourceEdits.add(SourceEdit(srcStart, srcEnd - srcStart + 1, string));
- String reconstruction = string;
- for (int i = 1; i < breakCount; i++) {
- int offset = breakOffsets[i];
+ var reconstruction = string;
+ for (var i = 1; i < breakCount; i++) {
+ var offset = breakOffsets[i];
string = addedText.substring(previousOffset, offset);
reconstruction += string;
sourceEdits.add(SourceEdit(srcStart + previousOffset, 0, string));
@@ -200,13 +200,12 @@
/// Return the absolute paths of all of the pubspec files in all of the
/// analysis roots.
Iterable<String> _findPubspecsInAnalysisRoots() {
- List<String> pubspecFiles = <String>[];
- for (String directoryPath in analysisRoots) {
- Directory directory = Directory(directoryPath);
- List<FileSystemEntity> children =
- directory.listSync(recursive: true, followLinks: false);
- for (FileSystemEntity child in children) {
- String filePath = child.path;
+ var pubspecFiles = <String>[];
+ for (var directoryPath in analysisRoots) {
+ var directory = Directory(directoryPath);
+ var children = directory.listSync(recursive: true, followLinks: false);
+ for (var child in children) {
+ var filePath = child.path;
if (path.basename(filePath) == PUBSPEC_FILE_NAME) {
pubspecFiles.add(filePath);
}
@@ -218,17 +217,17 @@
/// Return a list of offsets into the given [text] that represent good places
/// to break the text when building edits.
List<int> _getBreakOffsets(String text) {
- List<int> breakOffsets = <int>[];
- Scanner scanner = Scanner(null, CharSequenceReader(text),
+ var breakOffsets = <int>[];
+ var scanner = Scanner(null, CharSequenceReader(text),
error.AnalysisErrorListener.NULL_LISTENER)
..configureFeatures(FeatureSet.forTesting(sdkVersion: '2.2.2'));
- Token token = scanner.tokenize();
+ var token = scanner.tokenize();
// TODO(brianwilkerson) Randomize. Sometimes add zero (0) as a break point.
while (token.type != TokenType.EOF) {
// TODO(brianwilkerson) Break inside comments?
// Token comment = token.precedingComments;
- int offset = token.offset;
- int length = token.length;
+ var offset = token.offset;
+ var length = token.length;
breakOffsets.add(offset);
if (token.type == TokenType.IDENTIFIER && length > 3) {
breakOffsets.add(offset + (length ~/ 2));
@@ -240,8 +239,8 @@
/// Join the given [lines] into a single string.
String _join(List<String> lines) {
- StringBuffer buffer = StringBuffer();
- for (int i = 0; i < lines.length; i++) {
+ var buffer = StringBuffer();
+ for (var i = 0; i < lines.length; i++) {
buffer.writeln(lines[i]);
}
return buffer.toString();
@@ -250,7 +249,7 @@
/// Process the command-line [arguments]. Return `true` if the simulation
/// should be run.
bool _processCommandLine(List<String> args) {
- ArgParser parser = _createArgParser();
+ var parser = _createArgParser();
ArgResults results;
try {
results = parser.parse(args);
@@ -276,7 +275,7 @@
logger = Logger(stdout);
}
- List<String> arguments = results.rest;
+ var arguments = results.rest;
if (arguments.length < 2) {
_showUsage(parser);
return false;
@@ -288,7 +287,7 @@
.sublist(1)
.map((String analysisRoot) => path.normalize(analysisRoot))
.toList();
- for (String analysisRoot in analysisRoots) {
+ for (var analysisRoot in analysisRoots) {
if (repositoryPath != analysisRoot &&
!path.isWithin(repositoryPath, analysisRoot)) {
_showUsage(parser,
@@ -304,21 +303,21 @@
//
// Get the revision history of the repo.
//
- LinearCommitHistory history = repository.getCommitHistory();
+ var history = repository.getCommitHistory();
statistics.commitCount = history.commitIds.length;
- LinearCommitHistoryIterator iterator = history.iterator();
+ var iterator = history.iterator();
try {
//
// Iterate over the history, applying changes.
//
- bool firstCheckout = true;
+ var firstCheckout = true;
ErrorMap expectedErrors;
Iterable<String> changedPubspecs;
while (iterator.moveNext()) {
//
// Checkout the commit on which the changes are based.
//
- String commit = iterator.srcCommit;
+ var commit = iterator.srcCommit;
repository.checkout(commit);
if (expectedErrors != null) {
// ErrorMap actualErrors =
@@ -341,13 +340,13 @@
}
await readServerOutput();
expectedErrors = await server.computeErrorMap(server.analyzedDartFiles);
- for (String filePath in changedPubspecs) {
+ for (var filePath in changedPubspecs) {
_runPub(filePath);
}
//
// Apply the changes.
//
- CommitDelta commitDelta = iterator.next();
+ var commitDelta = iterator.next();
commitDelta.filterDiffs(analysisRoots, fileGlobs);
if (commitDelta.hasDiffs) {
statistics.commitsWithChangeInRootCount++;
@@ -369,9 +368,9 @@
/// Replay the changes between two commits, as represented by the given
/// [commitDelta].
Future<void> _replayDiff(CommitDelta commitDelta) async {
- List<FileEdit> editList = <FileEdit>[];
- for (DiffRecord record in commitDelta.diffRecords) {
- FileEdit edit = FileEdit(overlayStyle, record);
+ var editList = <FileEdit>[];
+ for (var record in commitDelta.diffRecords) {
+ var edit = FileEdit(overlayStyle, record);
_createSourceEdits(edit, record.getBlobDiff());
editList.add(edit);
}
@@ -380,8 +379,8 @@
// Randomly select operations from different files to simulate a user
// editing multiple files simultaneously.
//
- for (FileEdit edit in editList) {
- List<String> currentFile = <String>[edit.filePath];
+ for (var edit in editList) {
+ var currentFile = <String>[edit.filePath];
server.sendAnalysisSetPriorityFiles(currentFile);
server.sendAnalysisSetSubscriptions({
AnalysisService.FOLDING: currentFile,
@@ -392,7 +391,7 @@
AnalysisService.OUTLINE: currentFile,
AnalysisService.OVERRIDES: currentFile
});
- for (ServerOperation operation in edit.getOperations()) {
+ for (var operation in edit.getOperations()) {
statistics.editCount++;
operation.perform(server);
await readServerOutput();
@@ -402,7 +401,7 @@
/// Run `pub` on the pubspec with the given [filePath].
void _runPub(String filePath) {
- String directoryPath = path.dirname(filePath);
+ var directoryPath = path.dirname(filePath);
if (Directory(directoryPath).existsSync()) {
Process.runSync(
'/Users/brianwilkerson/Dev/dart/dart-sdk/bin/pub', ['get'],
@@ -413,7 +412,7 @@
/// Run the simulation by starting up a server and sending it requests.
Future<void> _runSimulation() async {
server = Server(logger: logger);
- Stopwatch stopwatch = Stopwatch();
+ var stopwatch = Stopwatch();
statistics.stopwatch = stopwatch;
stopwatch.start();
await server.start();
@@ -510,7 +509,7 @@
/// Return a list of operations to be sent to the server.
List<ServerOperation> getOperations() {
- List<ServerOperation> operations = <ServerOperation>[];
+ var operations = <ServerOperation>[];
void addUpdateContent(var overlay) {
operations.add(Analysis_UpdateContent(filePath, overlay));
}
@@ -519,8 +518,8 @@
// Make the order of edits random. Doing so will require updating the
// offsets of edits after the selected edit point.
addUpdateContent(AddContentOverlay(content));
- for (List<SourceEdit> editList in editLists.reversed) {
- for (SourceEdit edit in editList.reversed) {
+ for (var editList in editLists.reversed) {
+ for (var edit in editList.reversed) {
var overlay;
if (overlayStyle == OverlayStyle.change) {
overlay = ChangeContentOverlay([edit]);
@@ -584,11 +583,11 @@
/// Return a textual representation of the given duration, represented in
/// [milliseconds].
String _printTime(int milliseconds) {
- int seconds = milliseconds ~/ 1000;
+ var seconds = milliseconds ~/ 1000;
milliseconds -= seconds * 1000;
- int minutes = seconds ~/ 60;
+ var minutes = seconds ~/ 60;
seconds -= minutes * 60;
- int hours = minutes ~/ 60;
+ var hours = minutes ~/ 60;
minutes -= hours * 60;
if (hours > 0) {
diff --git a/pkg/analysis_server/test/stress/utilities/git.dart b/pkg/analysis_server/test/stress/utilities/git.dart
index b9278d9..7993e44 100644
--- a/pkg/analysis_server/test/stress/utilities/git.dart
+++ b/pkg/analysis_server/test/stress/utilities/git.dart
@@ -30,18 +30,18 @@
/// Parse the result of the git diff command (the [input]).
void _parseInput(List<String> input) {
- for (String line in input) {
+ for (var line in input) {
_parseLine(line);
}
}
/// Parse a single [line] from the result of the git diff command.
void _parseLine(String line) {
- DiffHunk currentHunk = hunks.isEmpty ? null : hunks.last;
+ var currentHunk = hunks.isEmpty ? null : hunks.last;
if (line.startsWith('@@')) {
- Match match = hunkHeaderRegExp.matchAsPrefix(line);
- int srcLine = int.parse(match.group(1));
- int dstLine = int.parse(match.group(2));
+ var match = hunkHeaderRegExp.matchAsPrefix(line);
+ var srcLine = int.parse(match.group(1));
+ var dstLine = int.parse(match.group(2));
hunks.add(DiffHunk(srcLine, dstLine));
} else if (currentHunk != null && line.startsWith('+')) {
currentHunk.addLines.add(line.substring(1));
@@ -96,10 +96,10 @@
/// [globPatterns].
void filterDiffs(List<String> inclusionPaths, List<Glob> globPatterns) {
diffRecords.retainWhere((DiffRecord record) {
- String filePath = record.srcPath ?? record.dstPath;
- for (String inclusionPath in inclusionPaths) {
+ var filePath = record.srcPath ?? record.dstPath;
+ for (var inclusionPath in inclusionPaths) {
if (path.isWithin(inclusionPath, filePath)) {
- for (Glob glob in globPatterns) {
+ for (var glob in globPatterns) {
if (glob.matches(filePath)) {
return true;
}
@@ -113,8 +113,8 @@
/// Return the index of the first nul character in the given [string] that is
/// at or after the given [start] index.
int _findEnd(String string, int start) {
- int length = string.length;
- int end = start;
+ var length = string.length;
+ var end = start;
while (end < length && string.codeUnitAt(end) != NUL) {
end++;
}
@@ -129,8 +129,8 @@
/// Parse all of the diff records in the given [input].
void _parseInput(String input) {
- int length = input.length;
- int start = 0;
+ var length = input.length;
+ var start = 0;
while (start < length) {
start = _parseRecord(input, start);
}
@@ -161,18 +161,18 @@
// Skip the first five fields.
startIndex += 15;
// Parse field 6
- String srcSha = input.substring(startIndex, startIndex + SHA_LENGTH);
+ var srcSha = input.substring(startIndex, startIndex + SHA_LENGTH);
startIndex += SHA_LENGTH + 1;
// Parse field 8
- String dstSha = input.substring(startIndex, startIndex + SHA_LENGTH);
+ var dstSha = input.substring(startIndex, startIndex + SHA_LENGTH);
startIndex += SHA_LENGTH + 1;
// Parse field 10
- int endIndex = _findEnd(input, startIndex);
- String status = input.substring(startIndex, endIndex);
+ var endIndex = _findEnd(input, startIndex);
+ var status = input.substring(startIndex, endIndex);
startIndex = endIndex + 1;
// Parse field 12
endIndex = _findEnd(input, startIndex);
- String srcPath = _makeAbsolute(input.substring(startIndex, endIndex));
+ var srcPath = _makeAbsolute(input.substring(startIndex, endIndex));
startIndex = endIndex + 1;
// Parse field 14
String dstPath;
@@ -319,9 +319,8 @@
/// the SHA1 of the [srcBlob] and the SHA1 of the [dstBlob]. This is done by
/// running the command `git diff <blob> <blob>`.
BlobDiff getBlobDiff(String srcBlob, String dstBlob) {
- ProcessResult result = _run(['diff', '-U0', srcBlob, dstBlob]);
- List<String> diffResults =
- LineSplitter.split(result.stdout as String).toList();
+ var result = _run(['diff', '-U0', srcBlob, dstBlob]);
+ var diffResults = LineSplitter.split(result.stdout as String).toList();
return BlobDiff._(diffResults);
}
@@ -331,7 +330,7 @@
CommitDelta getCommitDiff(String srcCommit, String dstCommit) {
// Consider --find-renames instead of --no-renames if rename information is
// desired.
- ProcessResult result = _run([
+ var result = _run([
'diff',
'--raw',
'--no-abbrev',
@@ -346,9 +345,8 @@
/// Return a representation of the history of this repository. This is done by
/// running the command `git rev-list --first-parent HEAD`.
LinearCommitHistory getCommitHistory() {
- ProcessResult result = _run(['rev-list', '--first-parent', 'HEAD']);
- List<String> commitIds =
- LineSplitter.split(result.stdout as String).toList();
+ var result = _run(['rev-list', '--first-parent', 'HEAD']);
+ var commitIds = LineSplitter.split(result.stdout as String).toList();
return LinearCommitHistory(this, commitIds);
}
diff --git a/pkg/analysis_server/test/stress/utilities/logger.dart b/pkg/analysis_server/test/stress/utilities/logger.dart
index 753e78e..00d99fb 100644
--- a/pkg/analysis_server/test/stress/utilities/logger.dart
+++ b/pkg/analysis_server/test/stress/utilities/logger.dart
@@ -22,7 +22,7 @@
/// while the [content] contains the actual information. If a list of
/// [arguments] is provided, then they will be written after the content.
void log(String label, String content, {List<String> arguments}) {
- for (int i = _labelWidth - label.length; i > 0; i--) {
+ for (var i = _labelWidth - label.length; i > 0; i--) {
sink.write(' ');
}
sink.write(label);
diff --git a/pkg/analysis_server/test/stress/utilities/server.dart b/pkg/analysis_server/test/stress/utilities/server.dart
index d666623..186743f 100644
--- a/pkg/analysis_server/test/stress/utilities/server.dart
+++ b/pkg/analysis_server/test/stress/utilities/server.dart
@@ -174,7 +174,7 @@
bool isAnalyzed(String filePath) {
// TODO(brianwilkerson) This should use the path package to determine
// inclusion, and needs to take exclusions into account.
- for (String includedRoot in _analysisRootIncludes) {
+ for (var includedRoot in _analysisRootIncludes) {
if (filePath.startsWith(includedRoot)) {
return true;
}
@@ -182,8 +182,8 @@
return false;
}
- List<String> analyzedFiles = <String>[];
- for (String filePath in _analyzedFiles) {
+ var analyzedFiles = <String>[];
+ for (var filePath in _analyzedFiles) {
if (filePath.endsWith('.dart') && isAnalyzed(filePath)) {
analyzedFiles.add(filePath);
}
@@ -199,14 +199,13 @@
/// Compute a mapping from each of the file paths in the given list of
/// [filePaths] to the list of errors in the file at that path.
Future<ErrorMap> computeErrorMap(List<String> filePaths) async {
- ErrorMap errorMap = ErrorMap();
- List<Future> futures = <Future>[];
- for (String filePath in filePaths) {
- RequestData requestData = sendAnalysisGetErrors(filePath);
+ var errorMap = ErrorMap();
+ var futures = <Future>[];
+ for (var filePath in filePaths) {
+ var requestData = sendAnalysisGetErrors(filePath);
futures.add(requestData.respondedTo.then((Response response) {
if (response.result != null) {
- AnalysisGetErrorsResult result =
- AnalysisGetErrorsResult.fromResponse(response);
+ var result = AnalysisGetErrorsResult.fromResponse(response);
errorMap[filePath] = result.errors;
}
}));
@@ -218,7 +217,7 @@
/// Print information about the communications with the server.
void printStatistics() {
void writeSpaces(int count) {
- for (int i = 0; i < count; i++) {
+ for (var i = 0; i < count; i++) {
stdout.write(' ');
}
}
@@ -230,37 +229,36 @@
if (_requestDataMap.isEmpty) {
stdout.writeln(' none');
} else {
- Map<String, List<RequestData>> requestsByMethod =
- <String, List<RequestData>>{};
+ var requestsByMethod = <String, List<RequestData>>{};
_requestDataMap.values.forEach((RequestData requestData) {
requestsByMethod
.putIfAbsent(requestData.method, () => <RequestData>[])
.add(requestData);
});
- List<String> keys = requestsByMethod.keys.toList();
+ var keys = requestsByMethod.keys.toList();
keys.sort();
- int maxCount = requestsByMethod.values
+ var maxCount = requestsByMethod.values
.fold(0, (int count, List<RequestData> list) => count + list.length);
- int countWidth = maxCount.toString().length;
- for (String key in keys) {
- List<RequestData> requests = requestsByMethod[key];
- int noResponseCount = 0;
- int responseCount = 0;
- int minTime = -1;
- int maxTime = -1;
- int totalTime = 0;
+ var countWidth = maxCount.toString().length;
+ for (var key in keys) {
+ var requests = requestsByMethod[key];
+ var noResponseCount = 0;
+ var responseCount = 0;
+ var minTime = -1;
+ var maxTime = -1;
+ var totalTime = 0;
requests.forEach((RequestData data) {
if (data.responseTime == null) {
noResponseCount++;
} else {
responseCount++;
- int time = data.elapsedTime;
+ var time = data.elapsedTime;
minTime = minTime < 0 ? time : math.min(minTime, time);
maxTime = math.max(maxTime, time);
totalTime += time;
}
});
- String count = requests.length.toString();
+ var count = requests.length.toString();
writeSpaces(countWidth - count.length);
stdout.write(' ');
stdout.write(count);
@@ -291,12 +289,12 @@
if (_notificationCountMap.isEmpty) {
stdout.writeln(' none');
} else {
- List<String> keys = _notificationCountMap.keys.toList();
+ var keys = _notificationCountMap.keys.toList();
keys.sort();
- int maxCount = _notificationCountMap.values.fold(0, math.max);
- int countWidth = maxCount.toString().length;
- for (String key in keys) {
- String count = _notificationCountMap[key].toString();
+ var maxCount = _notificationCountMap.values.fold(0, math.max);
+ var countWidth = maxCount.toString().length;
+ for (var key in keys) {
+ var count = _notificationCountMap[key].toString();
writeSpaces(countWidth - count.length);
stdout.write(' ');
stdout.write(count);
@@ -309,7 +307,7 @@
/// Remove any existing overlays.
void removeAllOverlays() {
Map<String, dynamic> files = HashMap<String, dynamic>();
- for (String path in filesWithOverlays) {
+ for (var path in filesWithOverlays) {
files[path] = RemoveContentOverlay();
}
sendAnalysisUpdateContent(files);
@@ -529,12 +527,11 @@
if (_process != null) {
throw Exception('Process already started');
}
- String dartBinary = Platform.executable;
- String rootDir =
+ var dartBinary = Platform.executable;
+ var rootDir =
_findRoot(Platform.script.toFilePath(windows: Platform.isWindows));
- String serverPath =
- path.normalize(path.join(rootDir, 'bin', 'server.dart'));
- List<String> arguments = [];
+ var serverPath = path.normalize(path.join(rootDir, 'bin', 'server.dart'));
+ var arguments = <String>[];
//
// Add VM arguments.
//
@@ -588,7 +585,7 @@
/// upward to the 'test' dir, and then going up one more directory.
String _findRoot(String pathname) {
while (!['benchmark', 'test'].contains(path.basename(pathname))) {
- String parent = path.dirname(pathname);
+ var parent = path.dirname(pathname);
if (parent.length >= pathname.length) {
throw Exception("Can't find root directory");
}
@@ -610,8 +607,7 @@
break;
case 'server.status':
if (_analysisFinishedCompleter != null) {
- ServerStatusParams params =
- ServerStatusParams.fromNotification(notification);
+ var params = ServerStatusParams.fromNotification(notification);
var analysis = params.analysis;
if (analysis != null && !analysis.isAnalyzing) {
_analysisFinishedCompleter.complete(null);
@@ -619,13 +615,11 @@
}
break;
case 'analysis.analyzedFiles':
- AnalysisAnalyzedFilesParams params =
- AnalysisAnalyzedFilesParams.fromNotification(notification);
+ var params = AnalysisAnalyzedFilesParams.fromNotification(notification);
_analyzedFiles = params.directories;
break;
case 'analysis.errors':
- AnalysisErrorsParams params =
- AnalysisErrorsParams.fromNotification(notification);
+ var params = AnalysisErrorsParams.fromNotification(notification);
_errorMap.pathMap[params.file] = params.errors;
break;
case 'analysis.flushResults':
@@ -672,8 +666,8 @@
/// Handle a [response] received from the server.
void _handleResponse(Response response) {
- String id = response.id.toString();
- RequestData requestData = _requestDataMap[id];
+ var id = response.id.toString();
+ var requestData = _requestDataMap[id];
requestData.recordResponse(response);
// switch (requestData.method) {
// case "analysis.getErrors":
@@ -749,7 +743,7 @@
/// Handle a [line] of input read from stderr.
void _handleStdErr(String line) {
- String trimmedLine = line.trim();
+ var trimmedLine = line.trim();
logger?.log(fromStderr, '$trimmedLine');
throw StateError('Message received on stderr: "$trimmedLine"');
}
@@ -765,21 +759,21 @@
throw ArgumentError('Expected a Map, found a ${value.runtimeType}');
}
- String trimmedLine = line.trim();
+ var trimmedLine = line.trim();
if (trimmedLine.isEmpty ||
trimmedLine.startsWith('Observatory listening on ')) {
return;
}
logger?.log(fromServer, '$trimmedLine');
- Map message = asMap(json.decoder.convert(trimmedLine));
+ var message = asMap(json.decoder.convert(trimmedLine));
if (message.containsKey('id')) {
// The message is a response.
- Response response = Response.fromJson(message);
+ var response = Response.fromJson(message);
_handleResponse(response);
} else {
// The message is a notification.
- Notification notification = Notification.fromJson(message);
- String event = notification.event;
+ var notification = Notification.fromJson(message);
+ var event = notification.event;
_notificationCountMap[event] = (_notificationCountMap[event] ?? 0) + 1;
_handleNotification(notification);
}
@@ -804,17 +798,14 @@
/// Send a command to the server. An 'id' will be automatically assigned.
RequestData _send(String method, Map<String, dynamic> params,
{void Function(Response) onResponse}) {
- String id = '${_nextId++}';
- RequestData requestData = RequestData(id, method, params, currentTime);
+ var id = '${_nextId++}';
+ var requestData = RequestData(id, method, params, currentTime);
_requestDataMap[id] = requestData;
- Map<String, dynamic> command = <String, dynamic>{
- 'id': id,
- 'method': method
- };
+ var command = <String, dynamic>{'id': id, 'method': method};
if (params != null) {
command['params'] = params;
}
- String line = json.encode(command);
+ var line = json.encode(command);
_process.stdin.add(utf8.encoder.convert('$line\n'));
logger?.log(fromClient, '$line');
return requestData;
diff --git a/pkg/analysis_server/test/test_all.dart b/pkg/analysis_server/test/test_all.dart
index 0f8d453..64fb2ea 100644
--- a/pkg/analysis_server/test/test_all.dart
+++ b/pkg/analysis_server/test/test_all.dart
@@ -28,6 +28,7 @@
import 'socket_server_test.dart' as socket_server;
import 'src/test_all.dart' as src;
import 'tool/test_all.dart' as tool;
+import 'verify_sorted_test.dart' as verify_sorted;
import 'verify_tests_test.dart' as verify_tests;
void main() {
@@ -55,6 +56,7 @@
socket_server.main();
src.main();
tool.main();
+ verify_sorted.main();
verify_tests.main();
defineReflectiveSuite(() {
defineReflectiveTests(SpecTest);
diff --git a/pkg/analysis_server/test/timing/completion/completion_simple.dart b/pkg/analysis_server/test/timing/completion/completion_simple.dart
index 1ed6cc3..1c7b41d 100644
--- a/pkg/analysis_server/test/timing/completion/completion_simple.dart
+++ b/pkg/analysis_server/test/timing/completion/completion_simple.dart
@@ -13,7 +13,7 @@
/// Perform the timing test, printing the minimum, average and maximum times, as
/// well as the standard deviation to the output.
void main(List<String> args) {
- SimpleTest test = SimpleTest();
+ var test = SimpleTest();
test.run().then((TimingResult result) {
print('minTime = ${result.minTime}');
print('averageTime = ${result.averageTime}');
diff --git a/pkg/analysis_server/test/timing/timing_framework.dart b/pkg/analysis_server/test/timing/timing_framework.dart
index d25e324..8dae417 100644
--- a/pkg/analysis_server/test/timing/timing_framework.dart
+++ b/pkg/analysis_server/test/timing/timing_framework.dart
@@ -32,9 +32,9 @@
/// The maximum amount of time spent executing a single iteration, in
/// milliseconds.
int get maxTime {
- int maxTime = 0;
- int count = times.length;
- for (int i = 0; i < count; i++) {
+ var maxTime = 0;
+ var count = times.length;
+ for (var i = 0; i < count; i++) {
maxTime = max(maxTime, times[i]);
}
return maxTime ~/ NANOSECONDS_PER_MILLISECOND;
@@ -43,9 +43,9 @@
/// The minimum amount of time spent executing a single iteration, in
/// milliseconds.
int get minTime {
- int minTime = times[0];
- int count = times.length;
- for (int i = 1; i < count; i++) {
+ var minTime = times[0];
+ var count = times.length;
+ for (var i = 1; i < count; i++) {
minTime = min(minTime, times[i]);
}
return minTime ~/ NANOSECONDS_PER_MILLISECOND;
@@ -58,9 +58,9 @@
/// The total amount of time spent executing the test, in milliseconds.
int get totalTime {
- int totalTime = 0;
- int count = times.length;
- for (int i = 0; i < count; i++) {
+ var totalTime = 0;
+ var count = times.length;
+ for (var i = 0; i < count; i++) {
totalTime += times[i];
}
return totalTime ~/ NANOSECONDS_PER_MILLISECOND;
@@ -68,15 +68,15 @@
/// Compute the standard deviation of the given set of [values].
double computeStandardDeviation(List<int> values) {
- int count = values.length;
- double sumOfValues = 0;
- for (int i = 0; i < count; i++) {
+ var count = values.length;
+ var sumOfValues = 0;
+ for (var i = 0; i < count; i++) {
sumOfValues += values[i];
}
- double average = sumOfValues / count;
- double sumOfDiffSquared = 0;
- for (int i = 0; i < count; i++) {
- double diff = values[i] - average;
+ var average = sumOfValues / count;
+ var sumOfDiffSquared = 0.0;
+ for (var i = 0; i < count; i++) {
+ var diff = values[i] - average;
sumOfDiffSquared += diff * diff;
}
return sqrt((sumOfDiffSquared / (count - 1)));
@@ -85,9 +85,9 @@
/// Convert the given [times], expressed in nanoseconds, to times expressed in
/// milliseconds.
List<int> toMilliseconds(List<int> times) {
- int count = times.length;
- List<int> convertedValues = <int>[];
- for (int i = 0; i < count; i++) {
+ var count = times.length;
+ var convertedValues = <int>[];
+ for (var i = 0; i < count; i++) {
convertedValues.add(times[i] ~/ NANOSECONDS_PER_MILLISECOND);
}
return convertedValues;
@@ -142,7 +142,7 @@
initializeInttestMixin();
server = Server();
sourceDirectory = Directory.systemTemp.createTempSync('analysisServer');
- Completer serverConnected = Completer();
+ var serverConnected = Completer();
onServerConnected.listen((_) {
serverConnected.complete();
});
@@ -172,7 +172,7 @@
/// number of milliseconds required to perform the operation the specified
/// number of times.
Future<TimingResult> run() async {
- List<int> times = <int>[];
+ var times = <int>[];
await oneTimeSetUp();
await _repeat(warmupCount, null);
await _repeat(timingCount, times);
@@ -213,7 +213,7 @@
/// Repeatedly execute this test [count] times, adding timing information to
/// the given list of [times] if it is non-`null`.
Future _repeat(int count, List<int> times) {
- Stopwatch stopwatch = Stopwatch();
+ var stopwatch = Stopwatch();
return setUp().then((_) {
stopwatch.start();
return perform().then((_) {
diff --git a/pkg/analysis_server/test/tool/lsp_spec/json_test.dart b/pkg/analysis_server/test/tool/lsp_spec/json_test.dart
index 37450f5..878f36d 100644
--- a/pkg/analysis_server/test/tool/lsp_spec/json_test.dart
+++ b/pkg/analysis_server/test/tool/lsp_spec/json_test.dart
@@ -21,7 +21,7 @@
test('returns correct output for union types', () {
final message = RequestMessage(
Either2<num, String>.t1(1), Method.shutdown, null, 'test');
- String output = json.encode(message.toJson());
+ final output = json.encode(message.toJson());
expect(output, equals('{"id":1,"method":"shutdown","jsonrpc":"test"}'));
});
@@ -29,7 +29,7 @@
() {
final params = Either2<String, TextDocumentItem>.t2(
TextDocumentItem('!uri', '!language', 1, '!text'));
- String output = json.encode(params);
+ final output = json.encode(params);
expect(
output,
equals(
@@ -320,7 +320,7 @@
WorkspaceFolder('!uri1', '!name1'),
WorkspaceFolder('!uri2', '!name2'),
]);
- final String json = jsonEncode(obj);
+ final json = jsonEncode(obj);
final restoredObj = InitializeParams.fromJson(jsonDecode(json));
expect(
@@ -335,7 +335,7 @@
test('objects with enums can round-trip through to json and back', () {
final obj = FoldingRange(1, 2, 3, 4, FoldingRangeKind.Comment);
- final String json = jsonEncode(obj);
+ final json = jsonEncode(obj);
final restoredObj = FoldingRange.fromJson(jsonDecode(json));
expect(restoredObj.startLine, equals(obj.startLine));
@@ -353,7 +353,7 @@
'fileA': [TextEdit(range, 'text A')],
'fileB': [TextEdit(range, 'text B')]
}, null);
- final String json = jsonEncode(obj);
+ final json = jsonEncode(obj);
final restoredObj = WorkspaceEdit.fromJson(jsonDecode(json));
expect(restoredObj.documentChanges, equals(obj.documentChanges));
diff --git a/pkg/analysis_server/test/tool/lsp_spec/markdown_test.dart b/pkg/analysis_server/test/tool/lsp_spec/markdown_test.dart
index 834617f..bf968e7 100644
--- a/pkg/analysis_server/test/tool/lsp_spec/markdown_test.dart
+++ b/pkg/analysis_server/test/tool/lsp_spec/markdown_test.dart
@@ -9,18 +9,18 @@
void main() {
group('markdown parser', () {
test('extracts a typescript fenced block from Markdown', () {
- final String input = '''
+ final input = '''
```typescript
CONTENT
```
''';
- final List<String> output = extractTypeScriptBlocks(input);
+ final output = extractTypeScriptBlocks(input);
expect(output, hasLength(1));
expect(output, contains('CONTENT'));
});
test('does not extract unknown code blocks', () {
- final String input = '''
+ final input = '''
```
CONTENT
```
@@ -29,12 +29,12 @@
CONTENT
```
''';
- final List<String> output = extractTypeScriptBlocks(input);
+ final output = extractTypeScriptBlocks(input);
expect(output, hasLength(0));
});
test('extracts multiple code blocks', () {
- final String input = '''
+ final input = '''
```typescript
CONTENT1
```
@@ -43,7 +43,7 @@
CONTENT2
```
''';
- final List<String> output = extractTypeScriptBlocks(input);
+ final output = extractTypeScriptBlocks(input);
expect(output, hasLength(2));
expect(output, contains('CONTENT1'));
expect(output, contains('CONTENT2'));
diff --git a/pkg/analysis_server/test/tool/lsp_spec/typescript_test.dart b/pkg/analysis_server/test/tool/lsp_spec/typescript_test.dart
index 9464b50..45a7fc1 100644
--- a/pkg/analysis_server/test/tool/lsp_spec/typescript_test.dart
+++ b/pkg/analysis_server/test/tool/lsp_spec/typescript_test.dart
@@ -10,7 +10,7 @@
void main() {
group('typescript parser', () {
test('parses an interface', () {
- final String input = '''
+ final input = '''
/**
* Some options.
*/
@@ -21,7 +21,7 @@
options?: OptionKind[];
}
''';
- final List<AstNode> output = parseString(input);
+ final output = parseString(input);
expect(output, hasLength(1));
expect(output[0], const TypeMatcher<Interface>());
final Interface interface = output[0];
@@ -39,14 +39,14 @@
});
test('parses an interface with a field with an inline/unnamed type', () {
- final String input = '''
+ final input = '''
export interface Capabilities {
textDoc?: {
deprecated?: bool;
};
}
''';
- final List<AstNode> output = parseString(input);
+ final output = parseString(input);
// Length is two because we'll fabricate the type of textDoc.
expect(output, hasLength(2));
@@ -75,7 +75,7 @@
});
test('parses an interface with multiple fields', () {
- final String input = '''
+ final input = '''
export interface SomeOptions {
/**
* Options0 used by something.
@@ -87,7 +87,7 @@
options1: any;
}
''';
- final List<AstNode> output = parseString(input);
+ final output = parseString(input);
expect(output, hasLength(1));
expect(output[0], const TypeMatcher<Interface>());
final Interface interface = output[0];
@@ -101,12 +101,12 @@
});
test('parses an interface with type args', () {
- final String input = '''
+ final input = '''
interface MyInterface<D> {
data?: D;
}
''';
- final List<AstNode> output = parseString(input);
+ final output = parseString(input);
expect(output, hasLength(1));
expect(output[0], const TypeMatcher<Interface>());
final Interface interface = output[0];
@@ -120,7 +120,7 @@
});
test('parses an interface with Arrays in Array<T> format', () {
- final String input = '''
+ final input = '''
export interface MyMessage {
/**
* The method's params.
@@ -128,7 +128,7 @@
params?: Array<any> | string;
}
''';
- final List<AstNode> output = parseString(input);
+ final output = parseString(input);
expect(output, hasLength(1));
expect(output[0], const TypeMatcher<Interface>());
final Interface interface = output[0];
@@ -147,12 +147,12 @@
});
test('parses an interface with a map into a MapType', () {
- final String input = '''
+ final input = '''
export interface WorkspaceEdit {
changes: { [uri: string]: TextEdit[]; };
}
''';
- final List<AstNode> output = parseString(input);
+ final output = parseString(input);
expect(output, hasLength(1));
expect(output[0], const TypeMatcher<Interface>());
final Interface interface = output[0];
@@ -165,7 +165,7 @@
});
test('flags nullable undefined values', () {
- final String input = '''
+ final input = '''
export interface A {
canBeBoth?: string | null;
canBeNeither: string;
@@ -173,7 +173,7 @@
canBeUndefined?: string;
}
''';
- final List<AstNode> output = parseString(input);
+ final output = parseString(input);
final Interface interface = output[0];
expect(interface.members, hasLength(4));
interface.members.forEach((m) => expect(m, const TypeMatcher<Field>()));
@@ -192,7 +192,7 @@
});
test('formats comments correctly', () {
- final String input = '''
+ final input = '''
/**
* Describes the what this class in lots of words that wrap onto
* multiple lines that will need re-wrapping to format nicely when
@@ -213,7 +213,7 @@
a: a;
}
''';
- final List<AstNode> output = parseString(input);
+ final output = parseString(input);
final Interface interface = output[0];
expect(interface.commentText, equals('''
Describes the what this class in lots of words that wrap onto multiple lines that will need re-wrapping to format nicely when converted into Dart.
@@ -231,10 +231,10 @@
});
test('parses a type alias', () {
- final String input = '''
+ final input = '''
export type DocumentSelector = DocumentFilter[];
''';
- final List<AstNode> output = parseString(input);
+ final output = parseString(input);
expect(output, hasLength(1));
expect(output[0], const TypeMatcher<TypeAlias>());
final TypeAlias typeAlias = output[0];
@@ -243,7 +243,7 @@
});
test('parses a namespace of constants', () {
- final String input = '''
+ final input = '''
export namespace ResourceOperationKind {
/**
* Supports creating new files and folders.
@@ -261,7 +261,7 @@
export const Rename: ResourceOperationKind = 'rename';
}
''';
- final List<AstNode> output = parseString(input);
+ final output = parseString(input);
expect(output, hasLength(1));
expect(output[0], const TypeMatcher<Namespace>());
final Namespace namespace = output[0];
@@ -285,12 +285,12 @@
});
test('parses a tuple in an array', () {
- final String input = '''
+ final input = '''
interface SomeInformation {
label: string | [number, number];
}
''';
- final List<AstNode> output = parseString(input);
+ final output = parseString(input);
expect(output, hasLength(1));
expect(output[0], const TypeMatcher<Interface>());
final Interface interface = output[0];
@@ -306,12 +306,12 @@
});
test('parses an union including Object into a single type', () {
- final String input = '''
+ final input = '''
interface SomeInformation {
label: string | object;
}
''';
- final List<AstNode> output = parseString(input);
+ final output = parseString(input);
expect(output, hasLength(1));
expect(output[0], const TypeMatcher<Interface>());
final Interface interface = output[0];
diff --git a/pkg/analysis_server/test/utils/package_root.dart b/pkg/analysis_server/test/utils/package_root.dart
index ab5cdac..aa3d27c 100644
--- a/pkg/analysis_server/test/utils/package_root.dart
+++ b/pkg/analysis_server/test/utils/package_root.dart
@@ -11,17 +11,17 @@
String get packageRoot {
// If the package root directory is specified on the command line using
// -DpkgRoot=..., use it.
- const String pkgRootVar =
+ const pkgRootVar =
bool.hasEnvironment('pkgRoot') ? String.fromEnvironment('pkgRoot') : null;
if (pkgRootVar != null) {
- String path = pathos.join(Directory.current.path, pkgRootVar);
+ var path = pathos.join(Directory.current.path, pkgRootVar);
if (!path.endsWith(pathos.separator)) path += pathos.separator;
return path;
}
// Otherwise try to guess based on the script path.
- String scriptPath = pathos.fromUri(Platform.script);
- List<String> parts = pathos.split(scriptPath);
- int pkgIndex = parts.indexOf('pkg');
+ var scriptPath = pathos.fromUri(Platform.script);
+ var parts = pathos.split(scriptPath);
+ var pkgIndex = parts.indexOf('pkg');
if (pkgIndex != -1) {
return pathos.joinAll(parts.sublist(0, pkgIndex + 1)) + pathos.separator;
}
diff --git a/pkg/analysis_server/test/verify_sorted_test.dart b/pkg/analysis_server/test/verify_sorted_test.dart
new file mode 100644
index 0000000..26acde2
--- /dev/null
+++ b/pkg/analysis_server/test/verify_sorted_test.dart
@@ -0,0 +1,104 @@
+// Copyright (c) 2019, 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.
+
+import 'dart:io';
+
+import 'package:analysis_server/src/services/correction/sort_members.dart';
+import 'package:analyzer/dart/analysis/analysis_context_collection.dart';
+import 'package:analyzer/dart/analysis/results.dart';
+import 'package:analyzer/dart/analysis/session.dart';
+import 'package:analyzer/file_system/file_system.dart';
+import 'package:analyzer/file_system/physical_file_system.dart';
+import 'package:test/test.dart';
+
+import 'utils/package_root.dart';
+
+void main() {
+ var provider = PhysicalResourceProvider.INSTANCE;
+ var normalizedRoot = provider.pathContext.normalize(packageRoot);
+ var packagePath =
+ provider.pathContext.join(normalizedRoot, 'analysis_server');
+ var mockPackagesPath =
+ provider.pathContext.join(packagePath, 'test', 'mock_packages');
+ // TODO(brianwilkerson) Fix the generator to sort the generated files and
+ // remove these exclusions.
+ var generatedFilePaths = <String>[
+ provider.pathContext.join(
+ packagePath, 'lib', 'lsp_protocol', 'protocol_custom_generated.dart'),
+ provider.pathContext
+ .join(packagePath, 'lib', 'lsp_protocol', 'protocol_generated.dart'),
+ provider.pathContext
+ .join(packagePath, 'lib', 'protocol', 'protocol_constants.dart'),
+ provider.pathContext
+ .join(packagePath, 'lib', 'protocol', 'protocol_generated.dart'),
+ provider.pathContext.join(packagePath, 'lib', 'src', 'edit',
+ 'nnbd_migration', 'resources', 'resources.g.dart'),
+ provider.pathContext.join(packagePath, 'test', 'integration', 'support',
+ 'integration_test_methods.dart'),
+ provider.pathContext.join(packagePath, 'test', 'integration', 'support',
+ 'protocol_matchers.dart'),
+ // The following are not generated, but can't be sorted because the contain
+ // ignore comments in the directives, which sorting deletes.
+ provider.pathContext
+ .join(packagePath, 'lib', 'src', 'edit', 'edit_domain.dart'),
+ provider.pathContext
+ .join(packagePath, 'lib', 'src', 'services', 'kythe', 'schema.dart'),
+ provider.pathContext.join(
+ packagePath, 'test', 'services', 'completion', 'dart', 'test_all.dart'),
+ ];
+
+ var collection = AnalysisContextCollection(
+ includedPaths: <String>[packagePath],
+ excludedPaths: [mockPackagesPath, ...generatedFilePaths],
+ resourceProvider: provider);
+ var contexts = collection.contexts;
+ if (contexts.length != 1) {
+ fail('The directory $packagePath contains multiple analysis contexts.');
+ }
+
+ buildTestsIn(contexts[0].currentSession, packagePath, generatedFilePaths,
+ mockPackagesPath, provider.getFolder(packagePath));
+}
+
+void buildTestsIn(
+ AnalysisSession session,
+ String testDirPath,
+ List<String> generatedFilePaths,
+ String mockPackagesPath,
+ Folder directory) {
+ var pathContext = session.resourceProvider.pathContext;
+ var children = directory.getChildren();
+ children.sort((first, second) => first.shortName.compareTo(second.shortName));
+ for (var child in children) {
+ if (child is Folder) {
+ if (child.path != mockPackagesPath) {
+ buildTestsIn(
+ session, testDirPath, generatedFilePaths, mockPackagesPath, child);
+ }
+ } else if (child is File && child.shortName.endsWith('.dart')) {
+ var path = child.path;
+ if (generatedFilePaths.contains(path)) {
+ continue;
+ }
+ var relativePath = pathContext.relative(path, from: testDirPath);
+ test(relativePath, () {
+ var result = session.getParsedUnit(path);
+ if (result.state != ResultState.VALID) {
+ fail('Could not parse $path');
+ }
+ var code = result.content;
+ var unit = result.unit;
+ var errors = result.errors;
+ if (errors.isNotEmpty) {
+ fail('Errors found when parsing $path');
+ }
+ var sorter = MemberSorter(code, unit);
+ var edits = sorter.sort();
+ if (edits.isNotEmpty) {
+ fail('Unsorted file $path');
+ }
+ });
+ }
+ }
+}
diff --git a/pkg/analysis_server/test/verify_tests_test.dart b/pkg/analysis_server/test/verify_tests_test.dart
index 73ad1dc..573eb05 100644
--- a/pkg/analysis_server/test/verify_tests_test.dart
+++ b/pkg/analysis_server/test/verify_tests_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analyzer/dart/analysis/analysis_context.dart';
import 'package:analyzer/dart/analysis/analysis_context_collection.dart';
import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/dart/analysis/session.dart';
@@ -15,19 +14,19 @@
import 'utils/package_root.dart' as package_root;
void main() {
- PhysicalResourceProvider provider = PhysicalResourceProvider.INSTANCE;
- String packageRoot = provider.pathContext.normalize(package_root.packageRoot);
- String analysisServerPath =
+ var provider = PhysicalResourceProvider.INSTANCE;
+ var packageRoot = provider.pathContext.normalize(package_root.packageRoot);
+ var analysisServerPath =
provider.pathContext.join(packageRoot, 'analysis_server');
- String testDirPath = provider.pathContext.join(analysisServerPath, 'test');
- String mocksDirPath = provider.pathContext.join(testDirPath, 'mock_packages');
+ var testDirPath = provider.pathContext.join(analysisServerPath, 'test');
+ var mocksDirPath = provider.pathContext.join(testDirPath, 'mock_packages');
- AnalysisContextCollection collection = AnalysisContextCollection(
+ var collection = AnalysisContextCollection(
resourceProvider: provider,
includedPaths: <String>[testDirPath],
excludedPaths: <String>[mocksDirPath],
);
- List<AnalysisContext> contexts = collection.contexts;
+ var contexts = collection.contexts;
if (contexts.length != 1) {
fail('The test directory contains multiple analysis contexts.');
}
@@ -38,11 +37,11 @@
void buildTestsIn(
AnalysisSession session, String testDirPath, Folder directory) {
- List<String> testFileNames = [];
+ var testFileNames = <String>[];
File testAllFile;
- List<Resource> children = directory.getChildren();
+ var children = directory.getChildren();
children.sort((first, second) => first.shortName.compareTo(second.shortName));
- for (Resource child in children) {
+ for (var child in children) {
if (child is Folder) {
if (child.shortName != 'integration' &&
child.getChildAssumingFile('test_all.dart').exists) {
@@ -50,7 +49,7 @@
}
buildTestsIn(session, testDirPath, child);
} else if (child is File) {
- String name = child.shortName;
+ var name = child.shortName;
if (name == 'test_all.dart') {
testAllFile = child;
} else if (name.endsWith('_test.dart')) {
@@ -58,7 +57,7 @@
}
}
}
- String relativePath = path.relative(directory.path, from: testDirPath);
+ var relativePath = path.relative(directory.path, from: testDirPath);
test(relativePath, () {
if (testFileNames.isEmpty) {
return;
@@ -66,18 +65,18 @@
if (testAllFile == null) {
fail('Missing "test_all.dart" in $relativePath');
}
- ParsedUnitResult result = session.getParsedUnit(testAllFile.path);
+ var result = session.getParsedUnit(testAllFile.path);
if (result.state != ResultState.VALID) {
fail('Could not parse ${testAllFile.path}');
}
- List<String> importedFiles = [];
+ var importedFiles = <String>[];
for (var directive in result.unit.directives) {
if (directive is ImportDirective) {
importedFiles.add(directive.uri.stringValue);
}
}
- List<String> missingFiles = [];
- for (String testFileName in testFileNames) {
+ var missingFiles = <String>[];
+ for (var testFileName in testFileNames) {
if (!importedFiles.contains(testFileName)) {
missingFiles.add(testFileName);
}
diff --git a/pkg/analysis_server/tool/completion_metrics/code_metrics.dart b/pkg/analysis_server/tool/completion_metrics/code_metrics.dart
index fdb4ec0..47af3b7 100644
--- a/pkg/analysis_server/tool/completion_metrics/code_metrics.dart
+++ b/pkg/analysis_server/tool/completion_metrics/code_metrics.dart
@@ -17,8 +17,8 @@
/// Compute and print lexical and semantic information about a package.
Future<void> main(List<String> args) async {
- ArgParser parser = createArgParser();
- ArgResults result = parser.parse(args);
+ var parser = createArgParser();
+ var result = parser.parse(args);
if (validArguments(parser, result)) {
var out = io.stdout;
@@ -40,7 +40,7 @@
/// Create a parser that can be used to parse the command-line arguments.
ArgParser createArgParser() {
- ArgParser parser = ArgParser();
+ var parser = ArgParser();
parser.addOption(
'help',
abbr: 'h',
@@ -1357,7 +1357,7 @@
for (var filePath in context.contextRoot.analyzedFiles()) {
if (AnalysisEngine.isDartFileName(filePath)) {
try {
- ResolvedUnitResult resolvedUnitResult =
+ var resolvedUnitResult =
await context.currentSession.getResolvedUnit(filePath);
//
// Check for errors that cause the file to be skipped.
diff --git a/pkg/analysis_server/tool/completion_metrics/completion_metrics.dart b/pkg/analysis_server/tool/completion_metrics/completion_metrics.dart
index d0cf42f..be513c6 100644
--- a/pkg/analysis_server/tool/completion_metrics/completion_metrics.dart
+++ b/pkg/analysis_server/tool/completion_metrics/completion_metrics.dart
@@ -5,37 +5,36 @@
import 'dart:async';
import 'dart:io' as io;
-import 'package:analysis_server/src/domains/completion/available_suggestions.dart';
import 'package:analysis_server/src/protocol_server.dart';
import 'package:analysis_server/src/services/completion/completion_core.dart';
import 'package:analysis_server/src/services/completion/completion_performance.dart';
import 'package:analysis_server/src/services/completion/dart/completion_manager.dart';
import 'package:analysis_server/src/services/completion/dart/utilities.dart';
import 'package:analyzer/dart/analysis/analysis_context_collection.dart';
+import 'package:analyzer/dart/analysis/context_root.dart';
import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/diagnostic/diagnostic.dart';
import 'package:analyzer/error/error.dart' as err;
import 'package:analyzer/file_system/physical_file_system.dart';
-import 'package:analyzer/src/dart/analysis/byte_store.dart';
import 'package:analyzer/src/generated/engine.dart';
-import 'package:analyzer/src/services/available_declarations.dart';
import 'package:args/args.dart';
-import 'package:path/path.dart' as path;
import 'metrics_util.dart';
import 'utils.dart';
import 'visitors.dart';
Future<void> main(List<String> args) async {
- ArgParser parser = createArgParser();
- ArgResults result = parser.parse(args);
+ var parser = createArgParser();
+ var result = parser.parse(args);
- var stopwatch = Stopwatch()..start();
if (!validArguments(parser, result)) {
return io.exit(1);
}
- var code = await CompletionMetricsComputer(result.rest[0])
- .compute(corpus: result['corpus'], verbose: result['verbose']);
+ var root = result.rest[0];
+ print('Analyzing root: "$root"');
+ var stopwatch = Stopwatch()..start();
+ var code = await CompletionMetricsComputer(root, verbose: result['verbose'])
+ .compute();
stopwatch.stop();
var duration = Duration(milliseconds: stopwatch.elapsedMilliseconds);
@@ -46,12 +45,7 @@
/// Create a parser that can be used to parse the command-line arguments.
ArgParser createArgParser() {
- ArgParser parser = ArgParser();
- parser.addFlag(
- 'corpus',
- help: 'Analyze each of the subdirectories separately',
- negatable: false,
- );
+ var parser = ArgParser();
parser.addOption(
'help',
abbr: 'h',
@@ -139,110 +133,36 @@
/// object is constructed, [computeCompletionMetrics] is executed to do analysis
/// and print a summary of the metrics gathered from the completion tests.
class CompletionMetricsComputer {
- final String _rootPath;
+ final String rootPath;
+
+ final bool verbose;
String _currentFilePath;
- bool _verbose;
-
ResolvedUnitResult _resolvedUnitResult;
/// The int to be returned from the [compute] call.
int resultCode;
- CompletionMetrics metricsOldMode, metricsNewMode;
+ CompletionMetrics metricsOldMode;
- CompletionMetricsComputer(this._rootPath);
+ CompletionMetrics metricsNewMode;
+
+ CompletionMetricsComputer(this.rootPath, {this.verbose});
/// The path to the current file.
String get currentFilePath => _currentFilePath;
- /// The analysis root path that this CompletionMetrics class will be computed.
- String get rootPath => _rootPath;
-
- Future<int> compute({bool corpus = false, bool verbose = false}) async {
- _verbose = verbose;
+ Future<int> compute() async {
resultCode = 0;
metricsOldMode = CompletionMetrics('useNewRelevance = false');
metricsNewMode = CompletionMetrics('useNewRelevance = true');
-
- var roots = _computeRootPaths(_rootPath, corpus);
- for (var root in roots) {
- print('Analyzing root: "$root"');
- final collection = AnalysisContextCollection(
- includedPaths: [root],
- resourceProvider: PhysicalResourceProvider.INSTANCE,
- );
-
- for (var context in collection.contexts) {
- // Set the DeclarationsTracker, only call doWork to build up the available
- // suggestions if doComputeCompletionsFromAnalysisServer is true.
- var declarationsTracker = DeclarationsTracker(
- MemoryByteStore(), PhysicalResourceProvider.INSTANCE);
- declarationsTracker.addContext(context);
- while (declarationsTracker.hasWork) {
- declarationsTracker.doWork();
- }
-
- // Loop through each file, resolve the file and call
- // forEachExpectedCompletion
- for (var filePath in context.contextRoot.analyzedFiles()) {
- if (AnalysisEngine.isDartFileName(filePath)) {
- _currentFilePath = filePath;
- try {
- _resolvedUnitResult =
- await context.currentSession.getResolvedUnit(filePath);
-
- var analysisError = getFirstErrorOrNull(_resolvedUnitResult);
- if (analysisError != null) {
- print('File $filePath skipped due to errors such as:');
- print(' ${analysisError.toString()}');
- print('');
- resultCode = 1;
- continue;
- }
-
- // Use the ExpectedCompletionsVisitor to compute the set of expected
- // completions for this CompilationUnit.
- final visitor = ExpectedCompletionsVisitor();
- _resolvedUnitResult.unit.accept(visitor);
-
- for (var expectedCompletion in visitor.expectedCompletions) {
- // As this point the completion suggestions are computed,
- // and results are collected with varying settings for
- // comparison:
-
- // First we compute the completions useNewRelevance set to
- // false:
- var suggestions = await _computeCompletionSuggestions(
- _resolvedUnitResult,
- expectedCompletion.offset,
- metricsOldMode,
- declarationsTracker,
- false);
-
- forEachExpectedCompletion(
- expectedCompletion, suggestions, metricsOldMode);
-
- // And again here with useNewRelevance set to true:
- suggestions = await _computeCompletionSuggestions(
- _resolvedUnitResult,
- expectedCompletion.offset,
- metricsNewMode,
- declarationsTracker,
- true);
-
- forEachExpectedCompletion(
- expectedCompletion, suggestions, metricsNewMode);
- }
- } catch (e) {
- print('Exception caught analyzing: $filePath');
- print(e.toString());
- resultCode = 1;
- }
- }
- }
- }
+ final collection = AnalysisContextCollection(
+ includedPaths: [rootPath],
+ resourceProvider: PhysicalResourceProvider.INSTANCE,
+ );
+ for (var context in collection.contexts) {
+ await _computeInContext(context.contextRoot);
}
printMetrics(metricsOldMode);
printMetrics(metricsNewMode);
@@ -277,7 +197,7 @@
metrics.completionElementKindCounter
.count(expectedCompletion.elementKind.toString());
- if (_verbose) {
+ if (verbose) {
// The format "/file/path/foo.dart:3:4" makes for easier input
// with the Files dialog in IntelliJ.
var lineNumber = expectedCompletion.lineNumber;
@@ -296,7 +216,7 @@
print('');
print('====================');
print('Completion metrics for ${metrics.name}:');
- if (_verbose) {
+ if (verbose) {
metrics.completionMissedTokenCounter.printCounterValues();
print('');
@@ -322,7 +242,7 @@
metrics.nonTypeMemberMrrComputer.printMean();
print('');
- print('Summary for $_rootPath:');
+ print('Summary for $rootPath:');
metrics.meanCompletionMS.printMean();
metrics.completionCounter.printCounterValues();
print('====================');
@@ -332,8 +252,7 @@
ResolvedUnitResult resolvedUnitResult,
int offset,
CompletionMetrics metrics,
- [DeclarationsTracker declarationsTracker,
- bool useNewRelevance = false]) async {
+ [bool useNewRelevance = false]) async {
var completionRequestImpl = CompletionRequestImpl(
resolvedUnitResult,
offset,
@@ -347,28 +266,28 @@
var suggestions =
await DartCompletionManager().computeSuggestions(completionRequestImpl);
- // If a non-null declarationsTracker was passed, use it to call
- // computeIncludedSetList, this current implementation just adds the set of
- // included element names with relevance 0, future implementations should
- // compute out the relevance that clients will set to each value.
- if (declarationsTracker != null) {
- var includedSuggestionSets = <IncludedSuggestionSet>[];
- var includedElementNames = <String>{};
-
- computeIncludedSetList(declarationsTracker, resolvedUnitResult,
- includedSuggestionSets, includedElementNames);
-
- for (var eltName in includedElementNames) {
- suggestions.add(CompletionSuggestion(
- CompletionSuggestionKind.INVOCATION,
- 0,
- eltName,
- 0,
- eltName.length,
- false,
- false));
- }
- }
+// // If a non-null declarationsTracker was passed, use it to call
+// // computeIncludedSetList, this current implementation just adds the set of
+// // included element names with relevance 0, future implementations should
+// // compute out the relevance that clients will set to each value.
+// if (declarationsTracker != null) {
+// var includedSuggestionSets = <IncludedSuggestionSet>[];
+// var includedElementNames = <String>{};
+//
+// computeIncludedSetList(declarationsTracker, resolvedUnitResult,
+// includedSuggestionSets, includedElementNames);
+//
+// for (var eltName in includedElementNames) {
+// suggestions.add(CompletionSuggestion(
+// CompletionSuggestionKind.INVOCATION,
+// 0,
+// eltName,
+// 0,
+// eltName.length,
+// false,
+// false));
+// }
+// }
stopwatch.stop();
metrics.meanCompletionMS.addValue(stopwatch.elapsedMilliseconds);
@@ -376,6 +295,88 @@
return suggestions;
}
+ /// Compute the metrics for the files in the context [root], creating a
+ /// separate context collection to prevent accumulating memory. The metrics
+ /// should be captured in the [collector].
+ Future<void> _computeInContext(ContextRoot root) async {
+ // Create a new collection to avoid consuming large quantities of memory.
+ // TODO(brianwilkerson) Create an OverlayResourceProvider to allow the
+ // content of the files to be modified before computing suggestions.
+ final collection = AnalysisContextCollection(
+ includedPaths: root.includedPaths.toList(),
+ excludedPaths: root.excludedPaths.toList(),
+ resourceProvider: PhysicalResourceProvider.INSTANCE,
+ );
+ var context = collection.contexts[0];
+// // Set the DeclarationsTracker, only call doWork to build up the available
+// // suggestions if doComputeCompletionsFromAnalysisServer is true.
+// // TODO(brianwilkerson) Add a flag to control whether available suggestions
+// // are to be used.
+// var declarationsTracker = DeclarationsTracker(
+// MemoryByteStore(), PhysicalResourceProvider.INSTANCE);
+// declarationsTracker.addContext(context);
+// while (declarationsTracker.hasWork) {
+// declarationsTracker.doWork();
+// }
+
+ // Loop through each file, resolve the file and call
+ // forEachExpectedCompletion
+ for (var filePath in context.contextRoot.analyzedFiles()) {
+ if (AnalysisEngine.isDartFileName(filePath)) {
+ _currentFilePath = filePath;
+ try {
+ _resolvedUnitResult =
+ await context.currentSession.getResolvedUnit(filePath);
+
+ var analysisError = getFirstErrorOrNull(_resolvedUnitResult);
+ if (analysisError != null) {
+ print('File $filePath skipped due to errors such as:');
+ print(' ${analysisError.toString()}');
+ print('');
+ resultCode = 1;
+ continue;
+ }
+
+ // Use the ExpectedCompletionsVisitor to compute the set of expected
+ // completions for this CompilationUnit.
+ final visitor = ExpectedCompletionsVisitor();
+ _resolvedUnitResult.unit.accept(visitor);
+
+ for (var expectedCompletion in visitor.expectedCompletions) {
+ // As this point the completion suggestions are computed,
+ // and results are collected with varying settings for
+ // comparison:
+
+ // First we compute the completions useNewRelevance set to
+ // false:
+ var suggestions = await _computeCompletionSuggestions(
+ _resolvedUnitResult,
+ expectedCompletion.offset,
+ metricsOldMode,
+ false);
+
+ forEachExpectedCompletion(
+ expectedCompletion, suggestions, metricsOldMode);
+
+ // And again here with useNewRelevance set to true:
+ suggestions = await _computeCompletionSuggestions(
+ _resolvedUnitResult,
+ expectedCompletion.offset,
+ metricsNewMode,
+ true);
+
+ forEachExpectedCompletion(
+ expectedCompletion, suggestions, metricsNewMode);
+ }
+ } catch (e) {
+ print('Exception caught analyzing: $filePath');
+ print(e.toString());
+ resultCode = 1;
+ }
+ }
+ }
+ }
+
/// Given some [ResolvedUnitResult] return the first error of high severity
/// if such an error exists, `null` otherwise.
static err.AnalysisError getFirstErrorOrNull(
@@ -399,18 +400,4 @@
}
return Place.none();
}
-
- static List<String> _computeRootPaths(String rootPath, bool corpus) {
- var roots = <String>[];
- if (!corpus) {
- roots.add(rootPath);
- } else {
- for (var child in io.Directory(rootPath).listSync()) {
- if (child is io.Directory) {
- roots.add(path.join(rootPath, child.path));
- }
- }
- }
- return roots;
- }
}
diff --git a/pkg/analysis_server/tool/completion_metrics/metrics_util.dart b/pkg/analysis_server/tool/completion_metrics/metrics_util.dart
index b9bca81..07979bc 100644
--- a/pkg/analysis_server/tool/completion_metrics/metrics_util.dart
+++ b/pkg/analysis_server/tool/completion_metrics/metrics_util.dart
@@ -100,6 +100,20 @@
int get count => _count;
+ double get mrr {
+ if (count == 0) {
+ return 0;
+ }
+ return _sum / count;
+ }
+
+ double get mrr_5 {
+ if (count == 0) {
+ return 0;
+ }
+ return _sum_5 / count;
+ }
+
void addRank(int rank) {
if (rank != 0) {
_sum += 1 / rank;
@@ -116,20 +130,6 @@
_count = 0;
}
- double get mrr {
- if (count == 0) {
- return 0;
- }
- return _sum / count;
- }
-
- double get mrr_5 {
- if (count == 0) {
- return 0;
- }
- return _sum_5 / count;
- }
-
void printMean() {
print('Mean Reciprocal Rank \'$name\' (total = $count)');
print('mmr = ${mrr.toStringAsFixed(6)} '
diff --git a/pkg/analysis_server/tool/completion_metrics/relevance_metrics.dart b/pkg/analysis_server/tool/completion_metrics/relevance_metrics.dart
index 6c1f9e5..7c0157d 100644
--- a/pkg/analysis_server/tool/completion_metrics/relevance_metrics.dart
+++ b/pkg/analysis_server/tool/completion_metrics/relevance_metrics.dart
@@ -13,6 +13,7 @@
import 'package:analysis_server/src/services/completion/dart/feature_computer.dart';
import 'package:analysis_server/src/utilities/flutter.dart';
import 'package:analyzer/dart/analysis/analysis_context_collection.dart';
+import 'package:analyzer/dart/analysis/context_root.dart';
import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/ast/token.dart';
@@ -36,13 +37,12 @@
import 'package:analyzer/src/generated/engine.dart';
import 'package:args/args.dart';
import 'package:meta/meta.dart';
-import 'package:path/path.dart' as path;
/// Compute metrics to determine whether they should be used to compute a
/// relevance score for completion suggestions.
Future<void> main(List<String> args) async {
- ArgParser parser = createArgParser();
- ArgResults result = parser.parse(args);
+ var parser = createArgParser();
+ var result = parser.parse(args);
if (validArguments(parser, result)) {
var out = io.stdout;
@@ -52,8 +52,7 @@
var computer = RelevanceMetricsComputer();
var stopwatch = Stopwatch();
stopwatch.start();
- await computer.compute(rootPath,
- corpus: result['corpus'], verbose: result['verbose']);
+ await computer.compute(rootPath, verbose: result['verbose']);
stopwatch.stop();
var duration = Duration(milliseconds: stopwatch.elapsedMilliseconds);
@@ -66,12 +65,7 @@
/// Create a parser that can be used to parse the command-line arguments.
ArgParser createArgParser() {
- ArgParser parser = ArgParser();
- parser.addFlag(
- 'corpus',
- help: 'Analyze each of the subdirectories separately',
- negatable: false,
- );
+ var parser = ArgParser();
parser.addOption(
'help',
abbr: 'h',
@@ -1470,7 +1464,7 @@
/// annotation.
SyntacticEntity _firstChild(AstNode node) {
var children = node.childEntities.toList();
- for (int i = 0; i < children.length; i++) {
+ for (var i = 0; i < children.length; i++) {
var child = children[i];
if (child is! Comment && child is! Annotation) {
return child;
@@ -1582,7 +1576,7 @@
statements = parent.statements;
}
var index = statements.indexOf(node);
- for (int i = 0; i < index; i++) {
+ for (var i = 0; i < index; i++) {
var statement = statements[i];
if (statement is VariableDeclarationStatement) {
for (var declaredVariable
@@ -1647,7 +1641,7 @@
var contextType = featureComputer.computeContextType(node);
_recordContextType(contextType);
if (contextType != null) {
- DartType elementType = _returnType(_leftMostElement(node));
+ var elementType = _returnType(_leftMostElement(node));
if (elementType != null) {
_recordTypeRelationships(
'matches context type', contextType, elementType);
@@ -1729,8 +1723,8 @@
return depth;
}
- int superclassDepth = getSuperclassDepth();
- int interfaceDepth =
+ var superclassDepth = getSuperclassDepth();
+ var interfaceDepth =
featureComputer.inheritanceDistance(targetClass, memberClass);
if (superclassDepth >= 0) {
_recordDistance('member (superclass)', superclassDepth);
@@ -1784,9 +1778,9 @@
'parameter override', overriddenType, overrideType);
}
- int count =
+ var count =
math.min(positionalInOverride.length, positionalInOverridden.length);
- for (int i = 0; i < count; i++) {
+ for (var i = 0; i < count; i++) {
recordParameterOverride(
positionalInOverride[i], positionalInOverridden[i]);
}
@@ -1984,61 +1978,14 @@
/// Compute the metrics for the file(s) in the [rootPath].
/// If [corpus] is true, treat rootPath as a container of packages, creating
/// a new context collection for each subdirectory.
- void compute(String rootPath,
- {@required bool corpus, @required bool verbose}) async {
+ void compute(String rootPath, {@required bool verbose}) async {
+ final collection = AnalysisContextCollection(
+ includedPaths: [rootPath],
+ resourceProvider: PhysicalResourceProvider.INSTANCE,
+ );
final collector = RelevanceDataCollector(data);
- var roots = _computeRootPaths(rootPath, corpus);
- for (var root in roots) {
- final collection = AnalysisContextCollection(
- includedPaths: [root],
- resourceProvider: PhysicalResourceProvider.INSTANCE,
- );
- for (var context in collection.contexts) {
- for (var filePath in context.contextRoot.analyzedFiles()) {
- if (AnalysisEngine.isDartFileName(filePath)) {
- try {
- ResolvedUnitResult resolvedUnitResult =
- await context.currentSession.getResolvedUnit(filePath);
- //
- // Check for errors that cause the file to be skipped.
- //
- if (resolvedUnitResult == null) {
- print('File $filePath skipped because resolved unit was null.');
- if (verbose) {
- print('');
- }
- continue;
- } else if (resolvedUnitResult.state != ResultState.VALID) {
- print(
- 'File $filePath skipped because it could not be analyzed.');
- if (verbose) {
- print('');
- }
- continue;
- } else if (hasError(resolvedUnitResult)) {
- if (verbose) {
- print('File $filePath skipped due to errors:');
- for (var error in resolvedUnitResult.errors
- .where((e) => e.severity == Severity.error)) {
- print(' ${error.toString()}');
- }
- print('');
- } else {
- print('File $filePath skipped due to analysis errors.');
- }
- continue;
- }
-
- collector.initializeFrom(resolvedUnitResult);
- resolvedUnitResult.unit.accept(collector);
- } catch (exception, stacktrace) {
- print('Exception caught analyzing: "$filePath"');
- print(exception);
- print(stacktrace);
- }
- }
- }
- }
+ for (var context in collection.contexts) {
+ await _computeInContext(context.contextRoot, collector, verbose: verbose);
}
}
@@ -2107,7 +2054,7 @@
throw ArgumentError(
'non-empty rows must contain the same number of columns');
}
- for (int i = 0; i < rowLength; i++) {
+ for (var i = 0; i < rowLength; i++) {
var cellWidth = row[i].length;
columnWidths[i] = math.max(columnWidths[i], cellWidth);
}
@@ -2116,18 +2063,62 @@
return columnWidths;
}
- List<String> _computeRootPaths(String rootPath, bool corpus) {
- var roots = <String>[];
- if (!corpus) {
- roots.add(rootPath);
- } else {
- for (var child in io.Directory(rootPath).listSync()) {
- if (child is io.Directory) {
- roots.add(path.join(rootPath, child.path));
+ /// Compute the metrics for the files in the context [root], creating a
+ /// separate context collection to prevent accumulating memory. The metrics
+ /// should be captured in the [collector]. Include additional details in the
+ /// output if [verbose] is `true`.
+ void _computeInContext(ContextRoot root, RelevanceDataCollector collector,
+ {@required bool verbose}) async {
+ // Create a new collection to avoid consuming large quantities of memory.
+ final collection = AnalysisContextCollection(
+ includedPaths: root.includedPaths.toList(),
+ excludedPaths: root.excludedPaths.toList(),
+ resourceProvider: PhysicalResourceProvider.INSTANCE,
+ );
+ var context = collection.contexts[0];
+ for (var filePath in context.contextRoot.analyzedFiles()) {
+ if (AnalysisEngine.isDartFileName(filePath)) {
+ try {
+ var resolvedUnitResult =
+ await context.currentSession.getResolvedUnit(filePath);
+ //
+ // Check for errors that cause the file to be skipped.
+ //
+ if (resolvedUnitResult == null) {
+ print('File $filePath skipped because resolved unit was null.');
+ if (verbose) {
+ print('');
+ }
+ continue;
+ } else if (resolvedUnitResult.state != ResultState.VALID) {
+ print('File $filePath skipped because it could not be analyzed.');
+ if (verbose) {
+ print('');
+ }
+ continue;
+ } else if (hasError(resolvedUnitResult)) {
+ if (verbose) {
+ print('File $filePath skipped due to errors:');
+ for (var error in resolvedUnitResult.errors
+ .where((e) => e.severity == Severity.error)) {
+ print(' ${error.toString()}');
+ }
+ print('');
+ } else {
+ print('File $filePath skipped due to analysis errors.');
+ }
+ continue;
+ }
+
+ collector.initializeFrom(resolvedUnitResult);
+ resolvedUnitResult.unit.accept(collector);
+ } catch (exception, stacktrace) {
+ print('Exception caught analyzing: "$filePath"');
+ print(exception);
+ print(stacktrace);
}
}
}
- return roots;
}
Iterable<List<String>> _convertColumnsToRows(
@@ -2246,15 +2237,15 @@
var maxRowHeaderWidth = maxTargetDepth.toString().length;
var headerRow = [''];
- for (int depth = maxTargetDepth; depth > 0; depth--) {
+ for (var depth = maxTargetDepth; depth > 0; depth--) {
headerRow.add(intToString(depth, maxValueWidth));
}
var zero = intToString(0, maxValueWidth);
var table = [headerRow];
- for (int distance = maxTargetDepth - 1; distance >= 0; distance--) {
+ for (var distance = maxTargetDepth - 1; distance >= 0; distance--) {
var innerMap = matrix[distance] ?? {};
var row = [intToString(distance, maxRowHeaderWidth)];
- for (int depth = maxTargetDepth; depth > 0; depth--) {
+ for (var depth = maxTargetDepth; depth > 0; depth--) {
var value = innerMap[depth];
row.add(value == null
? (distance < depth ? zero : '')
@@ -2283,14 +2274,14 @@
void _writeTable(StringSink sink, List<List<String>> table) {
var columnWidths = _computeColumnWidths(table);
for (var row in table) {
- int lastNonEmpty = row.length - 1;
+ var lastNonEmpty = row.length - 1;
while (lastNonEmpty > 0) {
if (row[lastNonEmpty].isNotEmpty) {
break;
}
lastNonEmpty--;
}
- for (int i = 0; i <= lastNonEmpty; i++) {
+ for (var i = 0; i <= lastNonEmpty; i++) {
var cellContent = row[i];
var columnWidth = columnWidths[i];
var padding = columnWidth - cellContent.length;
@@ -2313,7 +2304,7 @@
.fold<int>(0, (previous, current) => previous + current);
secondColumn.add('matching tokens within a given distance ($total)');
var cumulative = 0;
- for (int i = 1; i <= 100; i++) {
+ for (var i = 1; i <= 100; i++) {
cumulative += distances[i] ?? 0;
var percent = _formatPercent(cumulative, total);
secondColumn.add(' $percent%: $i');
diff --git a/pkg/analysis_server/tool/instrumentation/log/log.dart b/pkg/analysis_server/tool/instrumentation/log/log.dart
index 2f984ca..f5663a0 100644
--- a/pkg/analysis_server/tool/instrumentation/log/log.dart
+++ b/pkg/analysis_server/tool/instrumentation/log/log.dart
@@ -52,7 +52,7 @@
/// Return the entry group with the given [id], or `null` if there is no group
/// with the given id.
static EntryGroup withId(String id) {
- for (EntryGroup group in groups) {
+ for (var group in groups) {
if (group.id == id) {
return group;
}
@@ -110,7 +110,7 @@
@override
void _appendDetails(StringBuffer buffer) {
super._appendDetails(buffer);
- for (String component in components) {
+ for (var component in components) {
buffer.write(component);
buffer.write('<br>');
}
@@ -210,12 +210,12 @@
/// analysis notification (or the end of the log if the log does not contain a
/// corresponding end notification.
List<TaskEntry> taskEntriesFor(int startIndex) {
- List<TaskEntry> taskEntries = <TaskEntry>[];
+ var taskEntries = <TaskEntry>[];
NotificationEntry startEntry = logEntries[startIndex];
- LogEntry endEntry = pairedEntry(startEntry);
- int lastIndex = endEntry == null ? logEntries.length : endEntry.index;
- for (int i = startEntry.index + 1; i < lastIndex; i++) {
- LogEntry entry = logEntries[i];
+ var endEntry = pairedEntry(startEntry);
+ var lastIndex = endEntry == null ? logEntries.length : endEntry.index;
+ for (var i = startEntry.index + 1; i < lastIndex; i++) {
+ var entry = logEntries[i];
if (entry is TaskEntry) {
taskEntries.add(entry);
}
@@ -228,7 +228,7 @@
if (logContent.length < 2) {
return false;
}
- String firstLine = logContent[0];
+ var firstLine = logContent[0];
return firstLine.startsWith('-----') && logContent[1].startsWith('~') ||
firstLine.startsWith('~');
}
@@ -241,17 +241,17 @@
}
String merge(String line, List<String> extraLines) {
- StringBuffer buffer = StringBuffer();
+ var buffer = StringBuffer();
buffer.writeln(line);
- for (String extraLine in extraLines) {
+ for (var extraLine in extraLines) {
buffer.writeln(extraLine);
}
return buffer.toString();
}
- List<String> extraLines = <String>[];
- for (int i = logContent.length - 1; i >= 0; i--) {
- String line = logContent[i];
+ var extraLines = <String>[];
+ for (var i = logContent.length - 1; i >= 0; i--) {
+ var line = logContent[i];
if (isStartOfEntry(line)) {
if (extraLines.isNotEmpty) {
logContent[i] = merge(line, extraLines);
@@ -263,11 +263,11 @@
}
}
if (extraLines.isNotEmpty) {
- int count = math.min(extraLines.length, 10);
- StringBuffer buffer = StringBuffer();
+ var count = math.min(extraLines.length, 10);
+ var buffer = StringBuffer();
buffer.writeln('${extraLines.length} non-entry lines before any entry');
buffer.writeln('First $count lines:');
- for (int i = 0; i < count; i++) {
+ for (var i = 0; i < count; i++) {
buffer.writeln(extraLines[i]);
}
throw StateError(buffer.toString());
@@ -280,7 +280,7 @@
if (logContent[0].startsWith('-----')) {
logContent.removeAt(0);
}
- int lastIndex = logContent.length - 1;
+ var lastIndex = logContent.length - 1;
if (logContent[lastIndex].startsWith('extraction complete')) {
logContent.removeAt(lastIndex);
}
@@ -290,17 +290,17 @@
logEntries = <LogEntry>[];
analysisRanges = <EntryRange>[];
NotificationEntry analysisStartEntry;
- int analysisStartIndex = -1;
+ var analysisStartIndex = -1;
NotificationEntry pubStartEntry;
- for (String line in logContent) {
- LogEntry entry = LogEntry.from(logEntries.length, line);
+ for (var line in logContent) {
+ var entry = LogEntry.from(logEntries.length, line);
if (entry != null) {
logEntries.add(entry);
if (entry is RequestEntry) {
_requestMap[entry.id] = entry;
} else if (entry is ResponseEntry) {
_responseMap[entry.id] = entry;
- RequestEntry request = _requestMap[entry.id];
+ var request = _requestMap[entry.id];
_pairedEntries[entry] = request;
_pairedEntries[request] = entry;
} else if (entry is NotificationEntry) {
@@ -319,7 +319,7 @@
entry.recordProblem(
'Analysis terminated without being started.');
} else {
- int analysisEnd = logEntries.length - 1;
+ var analysisEnd = logEntries.length - 1;
analysisRanges
.add(EntryRange(analysisStartIndex, analysisEnd));
_pairedEntries[entry] = analysisStartEntry;
@@ -359,7 +359,7 @@
_pluginRequestMap[entry.id] = entry;
} else if (entry is PluginResponseEntry) {
_pluginResponseMap[entry.id] = entry;
- PluginRequestEntry request = _pluginRequestMap[entry.id];
+ var request = _pluginRequestMap[entry.id];
_pairedEntries[entry] = request;
_pairedEntries[request] = entry;
}
@@ -402,11 +402,11 @@
// code produces an error of
// "log?start=3175:261 Uncaught SyntaxError: missing ) after argument list"
// in the sample log I was using.
- StringBuffer buffer = StringBuffer();
- int length = string.length;
- int index = 0;
+ var buffer = StringBuffer();
+ var length = string.length;
+ var index = 0;
while (index < length) {
- int char = string.codeUnitAt(index);
+ var char = string.codeUnitAt(index);
index++;
// TODO(brianwilkerson) Handle tabs and other special characters.
if (char == '\r'.codeUnitAt(0)) {
@@ -439,7 +439,7 @@
} else if (object is Map) {
buffer.write('{<br>');
object.forEach((Object key, Object value) {
- String newIndent = indent + singleIndent;
+ var newIndent = indent + singleIndent;
buffer.write(newIndent);
_format(buffer, newIndent, key);
buffer.write(' : ');
@@ -451,7 +451,7 @@
} else if (object is List) {
buffer.write('[<br>');
object.forEach((Object element) {
- String newIndent = indent + singleIndent;
+ var newIndent = indent + singleIndent;
buffer.write(newIndent);
_format(buffer, newIndent, element);
buffer.write('<br>');
@@ -522,14 +522,14 @@
return null;
}
try {
- List<String> components = _parseComponents(entry);
+ var components = _parseComponents(entry);
int timeStamp;
- String component = components[0];
+ var component = components[0];
if (component.startsWith('~')) {
component = component.substring(1);
}
timeStamp = int.parse(component);
- String entryKind = components[1];
+ var entryKind = components[1];
if (entryKind == InstrumentationLogAdapter.TAG_ERROR) {
return ErrorEntry(index, timeStamp, entryKind, components.sublist(2));
} else if (entryKind == InstrumentationLogAdapter.TAG_EXCEPTION) {
@@ -600,7 +600,7 @@
/// Return an HTML representation of the details of the entry.
String details() {
- StringBuffer buffer = StringBuffer();
+ var buffer = StringBuffer();
_appendDetails(buffer);
return buffer.toString();
}
@@ -614,7 +614,7 @@
/// Append details related to this entry to the given [buffer].
void _appendDetails(StringBuffer buffer) {
if (_problems != null) {
- for (String problem in _problems) {
+ for (var problem in _problems) {
buffer.write('<p><span class="error">$problem</span></p>');
}
}
@@ -626,11 +626,11 @@
/// components depend on the kind of the entry. Return the components that
/// were parsed.
static List<String> _parseComponents(String entry) {
- List<String> components = <String>[];
- StringBuffer component = StringBuffer();
- int length = entry.length;
- for (int i = 0; i < length; i++) {
- int char = entry.codeUnitAt(i);
+ var components = <String>[];
+ var component = StringBuffer();
+ var length = entry.length;
+ for (var i = 0; i < length; i++) {
+ var char = entry.codeUnitAt(i);
if (char == fieldSeparator) {
if (entry.codeUnitAt(i + 1) == fieldSeparator) {
component.write(':');
@@ -712,7 +712,7 @@
/// Return a shortened version of the plugin id.
String get shortPluginId {
- int index = pluginId.lastIndexOf(path.separator);
+ var index = pluginId.lastIndexOf(path.separator);
if (index > 0) {
return pluginId.substring(index + 1);
}
@@ -923,7 +923,7 @@
/// Split the description to get the task name and target description.
void _splitDescription() {
- int index = description.indexOf(' ');
+ var index = description.indexOf(' ');
if (index < 0) {
_taskName = '';
} else {
@@ -931,12 +931,12 @@
}
index = description.lastIndexOf(' ');
_target = description.substring(index + 1);
- int slash = context.lastIndexOf('/');
+ var slash = context.lastIndexOf('/');
if (slash < 0) {
slash = context.lastIndexOf('\\');
}
if (slash >= 0) {
- String prefix = context.substring(0, slash);
+ var prefix = context.substring(0, slash);
_target = _target.replaceAll(prefix, '...');
}
}
diff --git a/pkg/analysis_server/tool/instrumentation/log_viewer.dart b/pkg/analysis_server/tool/instrumentation/log_viewer.dart
index e5f86ac..aab0190 100644
--- a/pkg/analysis_server/tool/instrumentation/log_viewer.dart
+++ b/pkg/analysis_server/tool/instrumentation/log_viewer.dart
@@ -11,7 +11,7 @@
/// Start a web server that will allow an instrumentation log to be viewed.
void main(List<String> args) {
- Driver driver = Driver();
+ var driver = Driver();
driver.start(args);
}
@@ -34,7 +34,7 @@
/// Create and return the parser used to parse the command-line arguments.
ArgParser createParser() {
- ArgParser parser = ArgParser();
+ var parser = ArgParser();
parser.addFlag(helpFlag, help: 'Print this help text', negatable: false);
parser.addOption(portOption,
help: 'The port number on which the server should listen for requests',
@@ -68,14 +68,14 @@
/// Use the given command-line [args] to configure and start the web server.
void start(List<String> args) {
- ArgParser parser = createParser();
- ArgResults options = parser.parse(args);
+ var parser = createParser();
+ var options = parser.parse(args);
if (options[helpFlag]) {
printUsage(parser);
return;
}
- int port = defaultPortNumber;
+ var port = defaultPortNumber;
try {
port = int.parse(options[portOption]);
} catch (exception) {
@@ -83,13 +83,13 @@
return;
}
- List<String> arguments = options.rest;
+ var arguments = options.rest;
if (arguments == null || arguments.length != 1) {
printUsage(parser, error: 'Missing log file');
return;
}
- String fileName = arguments[0];
- io.File logFile = io.File(fileName);
+ var fileName = arguments[0];
+ var logFile = io.File(fileName);
List<String> lines;
try {
lines = logFile.readAsLinesSync();
@@ -102,8 +102,8 @@
}
print('Log file contains ${lines.length} lines');
- InstrumentationLog log = InstrumentationLog(<String>[logFile.path], lines);
- WebServer server = WebServer(log);
+ var log = InstrumentationLog(<String>[logFile.path], lines);
+ var server = WebServer(log);
server.serveHttp(port);
print('logViewer is listening on http://localhost:$port/log');
}
diff --git a/pkg/analysis_server/tool/instrumentation/page/log_page.dart b/pkg/analysis_server/tool/instrumentation/page/log_page.dart
index 5ec97e0..27a6b65 100644
--- a/pkg/analysis_server/tool/instrumentation/page/log_page.dart
+++ b/pkg/analysis_server/tool/instrumentation/page/log_page.dart
@@ -110,31 +110,31 @@
/// Write the given log [entry] to the given [sink].
void _writeEntry(StringSink sink, LogEntry entry) {
String id;
- String clickHandler = 'clearHighlight()';
- String icon = '';
- String description = entry.kindName;
+ var clickHandler = 'clearHighlight()';
+ var icon = '';
+ var description = entry.kindName;
if (entry is RequestEntry) {
- String entryId = entry.id;
+ var entryId = entry.id;
id = 'req$entryId';
clickHandler = 'highlight(\'req$entryId\', \'res$entryId\')';
icon = '→';
description = entry.method;
} else if (entry is ResponseEntry) {
- String entryId = entry.id;
- RequestEntry request = log.requestFor(entry);
+ var entryId = entry.id;
+ var request = log.requestFor(entry);
id = 'res$entryId';
clickHandler = 'highlight(\'req$entryId\', \'res$entryId\')';
icon = '←';
if (request != null) {
- int latency = entry.timeStamp - request.timeStamp;
+ var latency = entry.timeStamp - request.timeStamp;
description =
'${request.method} <span class="gray">($latency ms)</span>';
}
} else if (entry is NotificationEntry) {
id = 'e${entry.index}';
- LogEntry pairedEntry = log.pairedEntry(entry);
+ var pairedEntry = log.pairedEntry(entry);
if (pairedEntry != null) {
- String pairedId = 'e${pairedEntry.index}';
+ var pairedId = 'e${pairedEntry.index}';
clickHandler = 'highlight(\'$id\', \'$pairedId\')';
}
icon = '←';
@@ -145,7 +145,7 @@
if (analysisStatus['isAnalyzing']) {
description = '$description <span class="gray">(analyzing)</span>';
} else {
- String duration = _getDuration(pairedEntry, entry);
+ var duration = _getDuration(pairedEntry, entry);
description =
'$description <span class="gray">(analysis - $duration ms)</span>';
}
@@ -155,38 +155,38 @@
if (pubStatus['isListingPackageDirs']) {
description = '$description <span class="gray">(pub)</span>';
} else {
- String duration = _getDuration(pairedEntry, entry);
+ var duration = _getDuration(pairedEntry, entry);
description =
'$description <span class="gray">(pub - $duration ms)</span>';
}
}
}
} else if (entry is PluginRequestEntry) {
- String entryId = entry.id;
- int pluginId = getPluginId(entry.pluginId);
+ var entryId = entry.id;
+ var pluginId = getPluginId(entry.pluginId);
id = 'req$pluginId.$entryId';
clickHandler =
'highlight(\'req$pluginId.$entryId\', \'res$pluginId.$entryId\')';
icon = '→';
description = '${entry.method} (${entry.shortPluginId})';
} else if (entry is PluginResponseEntry) {
- String entryId = entry.id;
- int pluginId = getPluginId(entry.pluginId);
- PluginRequestEntry request = log.pluginRequestFor(entry);
+ var entryId = entry.id;
+ var pluginId = getPluginId(entry.pluginId);
+ var request = log.pluginRequestFor(entry);
id = 'res$pluginId.$entryId';
clickHandler =
'highlight(\'req$pluginId.$entryId\', \'res$pluginId.$entryId\')';
icon = '←';
if (request != null) {
- int latency = entry.timeStamp - request.timeStamp;
+ var latency = entry.timeStamp - request.timeStamp;
description =
'${request.method} <span class="gray">($latency ms)</span> (${entry.shortPluginId})';
}
} else if (entry is PluginNotificationEntry) {
id = 'e${entry.index}';
- LogEntry pairedEntry = log.pairedEntry(entry);
+ var pairedEntry = log.pairedEntry(entry);
if (pairedEntry != null) {
- String pairedId = 'e${pairedEntry.index}';
+ var pairedId = 'e${pairedEntry.index}';
clickHandler = 'highlight(\'$id\', \'$pairedId\')';
}
icon = '←';
@@ -205,7 +205,7 @@
}
id = id == null ? '' : 'id="$id" ';
clickHandler = '$clickHandler; setDetails(\'${escape(entry.details())}\')';
- String timeStamp = entry.timeStamp.toString();
+ var timeStamp = entry.timeStamp.toString();
if (prefixLength > 0) {
timeStamp = timeStamp.substring(prefixLength);
}
@@ -223,8 +223,8 @@
/// Write the entries in the instrumentation log to the given [sink].
void _writeLeftColumn(StringSink sink) {
- int length = entries.length;
- int pageEnd =
+ var length = entries.length;
+ var pageEnd =
pageLength == null ? length : math.min(pageStart + pageLength, length);
//
// Write the header of the column.
@@ -232,7 +232,7 @@
sink.writeln('<div class="columnHeader">');
sink.writeln('<div style="float: left">');
sink.writeln('<select id="entryGroup" onchange="selectEntryGroup()">');
- for (EntryGroup group in EntryGroup.groups) {
+ for (var group in EntryGroup.groups) {
sink.write('<option value="');
sink.write(group.id);
sink.write('"');
@@ -282,8 +282,8 @@
sink.writeln('<th>Time</th>');
sink.writeln('<th>Kind</th>');
sink.writeln('</tr>');
- for (int i = pageStart; i < pageEnd; i++) {
- LogEntry entry = entries[i];
+ for (var i = pageStart; i < pageEnd; i++) {
+ var entry = entries[i];
_writeEntry(sink, entry);
}
sink.writeln('</table>');
diff --git a/pkg/analysis_server/tool/instrumentation/page/page_writer.dart b/pkg/analysis_server/tool/instrumentation/page/page_writer.dart
index 185e9b7..c70e0be 100644
--- a/pkg/analysis_server/tool/instrumentation/page/page_writer.dart
+++ b/pkg/analysis_server/tool/instrumentation/page/page_writer.dart
@@ -20,14 +20,14 @@
/// Return the length of the common prefix for time stamps associated with the
/// given log [entries].
int computePrefixLength(List<LogEntry> entries) {
- int length = entries.length;
+ var length = entries.length;
if (length < 2) {
return 0;
}
- String firstTime = entries[0].timeStamp.toString();
- String lastTime = entries[length - 1].timeStamp.toString();
- int prefixLength = 0;
- int timeLength = firstTime.length;
+ var firstTime = entries[0].timeStamp.toString();
+ var lastTime = entries[length - 1].timeStamp.toString();
+ var prefixLength = 0;
+ var timeLength = firstTime.length;
while (prefixLength < timeLength &&
firstTime.codeUnitAt(prefixLength) ==
lastTime.codeUnitAt(prefixLength)) {
@@ -50,10 +50,10 @@
/// Write the given [date] to the given [sink].
void writeDate(StringSink sink, DateTime date) {
- String isoString = date.toIso8601String();
- int index = isoString.indexOf('T');
- String dateString = isoString.substring(0, index);
- String timeString = isoString.substring(index + 1);
+ var isoString = date.toIso8601String();
+ var index = isoString.indexOf('T');
+ var dateString = isoString.substring(0, index);
+ var timeString = isoString.substring(index + 1);
sink.write(dateString);
sink.write(' at ');
sink.write(timeString);
diff --git a/pkg/analysis_server/tool/instrumentation/page/stats_page.dart b/pkg/analysis_server/tool/instrumentation/page/stats_page.dart
index 5f3986f..e218583 100644
--- a/pkg/analysis_server/tool/instrumentation/page/stats_page.dart
+++ b/pkg/analysis_server/tool/instrumentation/page/stats_page.dart
@@ -61,7 +61,7 @@
/// Return the mean of the values in the given list of [values].
int _mean(List<int> values) {
- int sum = values.fold(0, (int sum, int latency) => sum + latency);
+ var sum = values.fold(0, (int sum, int latency) => sum + latency);
return sum ~/ values.length;
}
@@ -72,23 +72,23 @@
map[key] = (map[key] ?? 0) + 1;
}
- for (LogEntry entry in entries) {
- String kind = entry.kind;
+ for (var entry in entries) {
+ var kind = entry.kind;
increment(entryCounts, kind);
if (entry is ResponseEntry) {
if (entry.result('error') != null) {
errorCount++;
}
} else if (entry is RequestEntry) {
- String method = entry.method;
- int latency = entry.timeStamp - entry.clientRequestTime;
+ var method = entry.method;
+ var latency = entry.timeStamp - entry.clientRequestTime;
latencyData.putIfAbsent(method, () => <int>[]).add(latency);
if (method == 'completion.getSuggestions') {
- ResponseEntry response = log.responseFor(entry);
+ var response = log.responseFor(entry);
if (response != null) {
String id = response.result('id');
if (id != null) {
- List<NotificationEntry> events = log.completionEventsWithId(id);
+ var events = log.completionEventsWithId(id);
if (events != null && events.isNotEmpty) {
completionResponseTimes
.add(events[0].timeStamp - entry.timeStamp);
@@ -98,12 +98,12 @@
}
} else if (entry is PluginResponseEntry) {
if (entry.result('error') != null) {
- int count = pluginErrorCount[entry.pluginId] ?? 0;
+ var count = pluginErrorCount[entry.pluginId] ?? 0;
pluginErrorCount[entry.pluginId] = count + 1;
}
} else if (entry is PluginRequestEntry) {
- PluginResponseEntry response = log.pluginResponseFor(entry);
- int responseTime = response.timeStamp - entry.timeStamp;
+ var response = log.pluginResponseFor(entry);
+ var responseTime = response.timeStamp - entry.timeStamp;
var pluginData = pluginResponseData.putIfAbsent(
entry.pluginId, () => <String, List<int>>{});
pluginData.putIfAbsent(entry.method, () => <int>[]).add(responseTime);
@@ -112,12 +112,12 @@
}
void _writeLeftColumn(StringSink sink) {
- List<String> filePaths = log.logFilePaths;
- List<LogEntry> entries = log.logEntries;
- DateTime startDate = entries[0].toTime;
- DateTime endDate = entries[entries.length - 1].toTime;
- Duration duration = endDate.difference(startDate);
- List<String> entryKinds = entryCounts.keys.toList()..sort();
+ var filePaths = log.logFilePaths;
+ var entries = log.logEntries;
+ var startDate = entries[0].toTime;
+ var endDate = entries[entries.length - 1].toTime;
+ var duration = endDate.difference(startDate);
+ var entryKinds = entryCounts.keys.toList()..sort();
sink.writeln('<h3>General</h3>');
sink.writeln('<p>');
@@ -126,8 +126,8 @@
sink.write(filePaths[0]);
} else {
sink.write('<span class="label">Log files:</span> ');
- bool needsSeparator = false;
- for (String path in filePaths) {
+ var needsSeparator = false;
+ for (var path in filePaths) {
if (needsSeparator) {
sink.write(', ');
} else {
@@ -164,7 +164,7 @@
});
sink.writeln('<table>');
sink.writeln('<tr><th>count</th><th>kind</th></tr>');
- for (String kind in entryKinds) {
+ for (var kind in entryKinds) {
sink.write('<tr><td class="int">');
sink.write(entryCounts[kind]);
sink.write('</td><td>');
@@ -187,9 +187,9 @@
sink.writeln('<table>');
sink.writeln(
'<tr><th>min</th><th>mean</th><th>max</th><th>method</th></tr>');
- List<String> methodNames = latencyData.keys.toList()..sort();
- for (String method in methodNames) {
- List<int> latencies = latencyData[method]..sort();
+ var methodNames = latencyData.keys.toList()..sort();
+ for (var method in methodNames) {
+ var latencies = latencyData[method]..sort();
// TODO(brianwilkerson) Add a spark-line distribution graph.
sink.write('<tr><td class="int">');
sink.write(latencies[0]);
@@ -221,9 +221,9 @@
sink.write(pluginId);
sink.writeln('</p>');
sink.writeln('<table>');
- List<String> methodNames = responseData.keys.toList()..sort();
- for (String method in methodNames) {
- List<int> responseTimes = responseData[method]..sort();
+ var methodNames = responseData.keys.toList()..sort();
+ for (var method in methodNames) {
+ var responseTimes = responseData[method]..sort();
// TODO(brianwilkerson) Add a spark-line distribution graph.
sink.write('<tr><td class="int">');
sink.write(responseTimes[0]);
diff --git a/pkg/analysis_server/tool/instrumentation/server.dart b/pkg/analysis_server/tool/instrumentation/server.dart
index 1136723..70f3caf 100644
--- a/pkg/analysis_server/tool/instrumentation/server.dart
+++ b/pkg/analysis_server/tool/instrumentation/server.dart
@@ -38,12 +38,12 @@
Map<String, String> getParameterMap(HttpRequest request) {
Map<String, String> parameterMap = HashMap<String, String>();
- String query = request.uri.query;
+ var query = request.uri.query;
if (query != null && query.isNotEmpty) {
- List<String> pairs = query.split('&');
- for (String pair in pairs) {
- List<String> parts = pair.split('=');
- String value = parts[1].trim();
+ var pairs = query.split('&');
+ for (var pair in pairs) {
+ var parts = pair.split('=');
+ var value = parts[1].trim();
value = value.replaceAll('+', ' ');
parameterMap[parts[0].trim()] = value;
}
@@ -54,19 +54,19 @@
/// Return a table mapping the names of properties to the values of those
/// properties that is extracted from the given HTTP [request].
Future<Map<String, String>> getValueMap(HttpRequest request) async {
- StringBuffer buffer = StringBuffer();
+ var buffer = StringBuffer();
await request.forEach((List<int> element) {
- for (int code in element) {
+ for (var code in element) {
buffer.writeCharCode(code);
}
});
Map<String, String> valueMap = HashMap<String, String>();
- String parameters = buffer.toString();
+ var parameters = buffer.toString();
if (parameters.isNotEmpty) {
- List<String> pairs = parameters.split('&');
- for (String pair in pairs) {
- List<String> parts = pair.split('=');
- String value = parts[1].trim();
+ var pairs = parameters.split('&');
+ for (var pair in pairs) {
+ var parts = pair.split('=');
+ var value = parts[1].trim();
value = value.replaceAll('+', ' ');
valueMap[parts[0].trim()] = value;
}
@@ -84,9 +84,9 @@
/// Handle a GET [request] received by the HTTP server.
void _handleGetRequest(HttpRequest request) {
- StringBuffer buffer = StringBuffer();
+ var buffer = StringBuffer();
try {
- String path = request.uri.path;
+ var path = request.uri.path;
if (path == logPath) {
_writeLogPage(request, buffer);
} else if (path == statsPath) {
@@ -99,10 +99,10 @@
_returnUnknownRequest(request);
return;
} catch (exception, stackTrace) {
- HttpResponse response = request.response;
+ var response = request.response;
response.statusCode = HttpStatus.ok;
response.headers.contentType = _htmlContent;
- StringBuffer buffer = StringBuffer();
+ var buffer = StringBuffer();
buffer.write('<p><b>Exception while composing page:</b></p>');
buffer.write('<p>$exception</p>');
buffer.write('<p>');
@@ -113,7 +113,7 @@
return;
}
- HttpResponse response = request.response;
+ var response = request.response;
response.statusCode = HttpStatus.ok;
response.headers.contentType = _htmlContent;
response.write(buffer.toString());
@@ -128,7 +128,7 @@
/// Attach a listener to a newly created HTTP server.
void _handleServer(HttpServer httpServer) {
httpServer.listen((HttpRequest request) {
- String method = request.method;
+ var method = request.method;
if (method == 'GET') {
_handleGetRequest(request);
} else if (method == 'POST') {
@@ -142,7 +142,7 @@
/// Return an error in response to an unrecognized request received by the
/// HTTP server.
void _returnUnknownRequest(HttpRequest request) {
- HttpResponse response = request.response;
+ var response = request.response;
response.statusCode = HttpStatus.notFound;
response.headers.contentType =
ContentType('text', 'html', charset: 'utf-8');
@@ -152,10 +152,10 @@
}
void _writeLogPage(HttpRequest request, StringBuffer buffer) {
- Map<String, String> parameterMap = getParameterMap(request);
- String groupId = parameterMap['group'];
- String startIndex = parameterMap['start'];
- LogPage page = LogPage(log);
+ var parameterMap = getParameterMap(request);
+ var groupId = parameterMap['group'];
+ var startIndex = parameterMap['start'];
+ var page = LogPage(log);
page.selectedGroup = EntryGroup.withId(groupId ?? 'nonTask');
if (startIndex != null) {
page.pageStart = int.parse(startIndex);
@@ -169,7 +169,7 @@
/// Write a representation of the given [stackTrace] to the given [sink].
void _writeStackTrace(StringSink sink, StackTrace stackTrace) {
if (stackTrace != null) {
- String trace = stackTrace.toString().replaceAll('#', '<br>#');
+ var trace = stackTrace.toString().replaceAll('#', '<br>#');
if (trace.startsWith('<br>#')) {
trace = trace.substring(4);
}
diff --git a/pkg/analysis_server/tool/lsp_spec/codegen_dart.dart b/pkg/analysis_server/tool/lsp_spec/codegen_dart.dart
index a830ba6..4533588 100644
--- a/pkg/analysis_server/tool/lsp_spec/codegen_dart.dart
+++ b/pkg/analysis_server/tool/lsp_spec/codegen_dart.dart
@@ -145,7 +145,7 @@
yield line;
break;
} else {
- int lastSpace = line.lastIndexOf(' ', maxLength);
+ var lastSpace = line.lastIndexOf(' ', maxLength);
// If there was no valid place to wrap, yield the whole string.
if (lastSpace == -1) {
yield line;
@@ -501,7 +501,7 @@
..writeIndentedln('@override')
..writeIndentedln('int get hashCode {')
..indent()
- ..writeIndentedln('int hash = 0;');
+ ..writeIndentedln('var hash = 0;');
for (var field in _getAllFields(interface)) {
buffer.writeIndentedln(
'hash = JenkinsSmiHash.combine(hash, ${field.name}.hashCode);');
@@ -628,7 +628,7 @@
buffer
..writeIndentedln('Map<String, dynamic> toJson() {')
..indent()
- ..writeIndentedln('Map<String, dynamic> __result = {};');
+ ..writeIndentedln('var __result = <String, dynamic>{};');
// ResponseMessage must confirm to JSON-RPC which says only one of
// result/error can be included. Since this isn't encoded in the types we
// need to special-case it's toJson generation.
diff --git a/pkg/analysis_server/tool/lsp_spec/generate_all.dart b/pkg/analysis_server/tool/lsp_spec/generate_all.dart
index 9f90859..2ddf84a 100644
--- a/pkg/analysis_server/tool/lsp_spec/generate_all.dart
+++ b/pkg/analysis_server/tool/lsp_spec/generate_all.dart
@@ -22,10 +22,10 @@
return;
}
- final String script = Platform.script.toFilePath();
+ final script = Platform.script.toFilePath();
// 3x parent = file -> lsp_spec -> tool -> analysis_server.
- final String packageFolder = File(script).parent.parent.parent.path;
- final String outFolder = path.join(packageFolder, 'lib', 'lsp_protocol');
+ final packageFolder = File(script).parent.parent.parent.path;
+ final outFolder = path.join(packageFolder, 'lib', 'lsp_protocol');
Directory(outFolder).createSync();
// Collect definitions for types in the spec and our custom extensions.
@@ -39,8 +39,8 @@
recordTypes(customTypes);
// Generate formatted Dart code (as a string) for each set of types.
- final String specTypesOutput = generateDartForTypes(specTypes);
- final String customTypesOutput = generateDartForTypes(customTypes);
+ final specTypesOutput = generateDartForTypes(specTypes);
+ final customTypesOutput = generateDartForTypes(customTypes);
File(path.join(outFolder, 'protocol_generated.dart')).writeAsStringSync(
generatedFileHeader(2018, importCustom: true) + specTypesOutput);
@@ -195,7 +195,7 @@
null, Token.identifier(name), fieldType, canBeNull, canBeUndefined);
}
- final List<AstNode> customTypes = [
+ final customTypes = <AstNode>[
interface('DartDiagnosticServer', [field('port', type: 'number')]),
interface('AnalyzerStatusParams', [field('isAnalyzing', type: 'boolean')]),
interface('PublishClosingLabelsParams', [
@@ -264,9 +264,9 @@
if (args[argDownload]) {
await downloadSpec();
}
- final String spec = await readSpec();
+ final spec = await readSpec();
- final List<AstNode> types = extractTypeScriptBlocks(spec)
+ final types = extractTypeScriptBlocks(spec)
.where(shouldIncludeScriptBlock)
.map(parseString)
.expand((f) => f)
diff --git a/pkg/analysis_server/tool/lsp_spec/markdown.dart b/pkg/analysis_server/tool/lsp_spec/markdown.dart
index 8faa64c..4ca28a2 100644
--- a/pkg/analysis_server/tool/lsp_spec/markdown.dart
+++ b/pkg/analysis_server/tool/lsp_spec/markdown.dart
@@ -2,11 +2,18 @@
// 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.
-final _typeScriptBlockPattern =
- RegExp(r'\B```typescript([\S\s]*?)\n```', multiLine: true);
final _methodNamesPattern = RegExp(
r'''_(?:Notification|Request):?_:?(?:\r?\n)+\* method: '(.*?)'\r?\n''',
multiLine: true);
+final _typeScriptBlockPattern =
+ RegExp(r'\B```typescript([\S\s]*?)\n```', multiLine: true);
+
+List<String> extractMethodNames(String spec) {
+ return _methodNamesPattern
+ .allMatches(spec)
+ .map((m) => m.group(1).trim())
+ .toList();
+}
/// Extracts fenced code blocks that are explicitly marked as TypeScript from a
/// markdown document.
@@ -16,10 +23,3 @@
.map((m) => m.group(1).trim())
.toList();
}
-
-List<String> extractMethodNames(String spec) {
- return _methodNamesPattern
- .allMatches(spec)
- .map((m) => m.group(1).trim())
- .toList();
-}
diff --git a/pkg/analysis_server/tool/lsp_spec/typescript.dart b/pkg/analysis_server/tool/lsp_spec/typescript.dart
index 391a659..44f29f8 100644
--- a/pkg/analysis_server/tool/lsp_spec/typescript.dart
+++ b/pkg/analysis_server/tool/lsp_spec/typescript.dart
@@ -4,6 +4,21 @@
import 'typescript_parser.dart';
+/// Removes types that are in the spec that we don't want in other signatures.
+bool allowTypeInSignatures(TypeBase type) {
+ // Don't allow arrays of MarkedStrings, but do allow simple MarkedStrings.
+ // The only place that uses these are Hovers and we only send one value
+ // (to match the MarkupString equiv) so the array just makes the types
+ // unnecessarily complicated.
+ if (type is ArrayType) {
+ final elementType = type.elementType;
+ if (elementType is Type && elementType.name == 'MarkedString') {
+ return false;
+ }
+ }
+ return true;
+}
+
String cleanComment(String comment) {
if (comment == null) {
return null;
@@ -32,6 +47,21 @@
return comment.trim();
}
+/// Improves comments in generated code to support where types may have been
+/// altered (for ex. with [getImprovedType] above).
+String getImprovedComment(String interfaceName, String fieldName) {
+ const _improvedComments = <String, Map<String, String>>{
+ 'ResponseError': {
+ 'data':
+ '// A string that contains additional information about the error. Can be omitted.',
+ },
+ };
+
+ final interface = _improvedComments[interfaceName];
+
+ return interface != null ? interface[fieldName] : null;
+}
+
/// Improves types in generated code, including:
///
/// - Fixes up some enum types that are not as specific as they could be in the
@@ -42,7 +72,7 @@
/// and we know we always use a specific type. This avoids wrapping a lot
/// of code in `EitherX<Y,Z>.tX()` and simplifies the testing of them.
String getImprovedType(String interfaceName, String fieldName) {
- const Map<String, Map<String, String>> _improvedTypeMappings = {
+ const _improvedTypeMappings = <String, Map<String, String>>{
'Diagnostic': {
'severity': 'DiagnosticSeverity',
'code': 'String',
@@ -98,21 +128,6 @@
return interface != null ? interface[fieldName] : null;
}
-/// Improves comments in generated code to support where types may have been
-/// altered (for ex. with [getImprovedType] above).
-String getImprovedComment(String interfaceName, String fieldName) {
- const Map<String, Map<String, String>> _improvedComments = {
- 'ResponseError': {
- 'data':
- '// A string that contains additional information about the error. Can be omitted.',
- },
- };
-
- final interface = _improvedComments[interfaceName];
-
- return interface != null ? interface[fieldName] : null;
-}
-
List<String> getSpecialBaseTypes(Interface interface) {
if (interface.name == 'RequestMessage' ||
interface.name == 'NotificationMessage') {
@@ -133,18 +148,3 @@
// .startsWith() because there are inline types that will be generated.
!node.name.startsWith('MarkedString');
}
-
-/// Removes types that are in the spec that we don't want in other signatures.
-bool allowTypeInSignatures(TypeBase type) {
- // Don't allow arrays of MarkedStrings, but do allow simple MarkedStrings.
- // The only place that uses these are Hovers and we only send one value
- // (to match the MarkupString equiv) so the array just makes the types
- // unnecessarily complicated.
- if (type is ArrayType) {
- final elementType = type.elementType;
- if (elementType is Type && elementType.name == 'MarkedString') {
- return false;
- }
- }
- return true;
-}
diff --git a/pkg/analysis_server/tool/lsp_spec/typescript_parser.dart b/pkg/analysis_server/tool/lsp_spec/typescript_parser.dart
index b0246c3..d303886 100644
--- a/pkg/analysis_server/tool/lsp_spec/typescript_parser.dart
+++ b/pkg/analysis_server/tool/lsp_spec/typescript_parser.dart
@@ -305,7 +305,7 @@
// marked with number.
final commentText = leadingComment?.text;
if (commentText != null) {
- final RegExp _linkTypePattern = RegExp(r'See \{@link (\w+)\}\.?');
+ final _linkTypePattern = RegExp(r'See \{@link (\w+)\}\.?');
final linkTypeMatch = _linkTypePattern.firstMatch(commentText);
if (linkTypeMatch != null) {
type = Type.identifier(linkTypeMatch.group(1));
diff --git a/pkg/analysis_server/tool/migration_runner.dart b/pkg/analysis_server/tool/migration_runner.dart
index 4a1e7e3..851885c 100644
--- a/pkg/analysis_server/tool/migration_runner.dart
+++ b/pkg/analysis_server/tool/migration_runner.dart
@@ -69,8 +69,8 @@
//
// Create server
//
- AnalysisServerOptions options = AnalysisServerOptions();
- String sdkPath = FolderBasedDartSdk.defaultSdkDirectory(
+ var options = AnalysisServerOptions();
+ var sdkPath = FolderBasedDartSdk.defaultSdkDirectory(
PhysicalResourceProvider.INSTANCE,
).path;
return AnalysisServer(
@@ -106,8 +106,7 @@
server = createAnalysisServer();
server.pluginManager = TestPluginManager();
// listen for notifications
- Stream<Notification> notificationStream =
- serverChannel.notificationController.stream;
+ var notificationStream = serverChannel.notificationController.stream;
notificationStream.listen((Notification notification) {
processNotification(notification);
});
@@ -133,7 +132,7 @@
class MigrationTest extends MigrationBase {
Future<void> run(String packageRoot, int port) async {
- List<String> packageRoots = [packageRoot];
+ var packageRoots = <String>[packageRoot];
await sendAnalysisSetAnalysisRoots(packageRoots);
await sendEditDartfix(packageRoots, port);
}
diff --git a/pkg/analysis_server/tool/nnbd_migration/generate_resources.dart b/pkg/analysis_server/tool/nnbd_migration/generate_resources.dart
index cee1414..cdc22c5 100644
--- a/pkg/analysis_server/tool/nnbd_migration/generate_resources.dart
+++ b/pkg/analysis_server/tool/nnbd_migration/generate_resources.dart
@@ -71,7 +71,7 @@
];
String base64Encode(List<int> bytes) {
- String encoded = base64.encode(bytes);
+ var encoded = base64.encode(bytes);
// Logic to cut lines into 80-character chunks.
var lines = <String>[];
@@ -87,11 +87,11 @@
}
void compileWebFrontEnd({bool devMode = false}) async {
- String sdkBinDir = path.dirname(Platform.resolvedExecutable);
- String dart2jsPath = path.join(sdkBinDir, 'dart2js');
+ var sdkBinDir = path.dirname(Platform.resolvedExecutable);
+ var dart2jsPath = path.join(sdkBinDir, 'dart2js');
// dart2js -m -o output source
- Process process = await Process.start(dart2jsPath, [
+ var process = await Process.start(dart2jsPath, [
devMode ? '-O1' : '-m',
'--no-frequency-based-minification',
'-o',
@@ -100,7 +100,7 @@
]);
process.stdout.listen((List<int> data) => stdout.add(data));
process.stderr.listen((List<int> data) => stderr.add(data));
- int exitCode = await process.exitCode;
+ var exitCode = await process.exitCode;
if (exitCode != 0) {
fail('Failed compiling ${dartSources.path}.');
@@ -108,9 +108,9 @@
}
void createResourcesGDart() {
- String content =
+ var content =
generateResourceFile(sortDir(resourceDir.listSync()).where((entity) {
- String name = path.basename(entity.path);
+ var name = path.basename(entity.path);
return entity is File && resourceTypes.contains(path.extension(name));
}).cast<File>());
@@ -137,8 +137,8 @@
}
String generateResourceFile(Iterable<File> resources) {
- String filePath = path.relative(Platform.script.toFilePath());
- StringBuffer buf = StringBuffer('''
+ var filePath = path.relative(Platform.script.toFilePath());
+ var buf = StringBuffer('''
// Copyright (c) 2020, 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.
@@ -151,8 +151,8 @@
import 'dart:convert' as convert;
''');
- for (File resource in resources) {
- String name = path.basename(resource.path).replaceAll('.', '_');
+ for (var resource in resources) {
+ var name = path.basename(resource.path).replaceAll('.', '_');
print('adding $name...');
buf.writeln();
@@ -168,19 +168,19 @@
return String.fromCharCodes(convert.base64Decode(data));
}''');
- for (File resource in resources) {
- String name = path.basename(resource.path).replaceAll('.', '_');
- String source = resource.readAsStringSync();
+ for (var resource in resources) {
+ var name = path.basename(resource.path).replaceAll('.', '_');
+ var source = resource.readAsStringSync();
- String delimiter = "'''";
+ var delimiter = "'''";
buf.writeln();
buf.writeln('String _$name;');
if (name == path.basename(javascriptOutput.path).replaceAll('.', '_')) {
// Write out the crc for the dart code.
- StringBuffer sourceCode = StringBuffer();
+ var sourceCode = StringBuffer();
// collect the dart source code
- for (FileSystemEntity entity in sortDir(dartSources.parent.listSync())) {
+ for (var entity in sortDir(dartSources.parent.listSync())) {
if (entity.path.endsWith('.dart')) {
sourceCode.write((entity as File).readAsStringSync());
}
@@ -215,17 +215,16 @@
print('Verifying that ${path.basename(resourcesFile.path)} is up-to-date...');
// Find the hashes for the last generated version of resources.g.dart.
- Map<String, String> resourceHashes = {};
+ var resourceHashes = <String, String>{};
// highlight_css md5 is 'fb012626bafd286510d32da815dae448'
- RegExp hashPattern = RegExp(r"// (\S+) md5 is '(\S+)'");
- for (RegExpMatch match
- in hashPattern.allMatches(resourcesFile.readAsStringSync())) {
+ var hashPattern = RegExp(r"// (\S+) md5 is '(\S+)'");
+ for (var match in hashPattern.allMatches(resourcesFile.readAsStringSync())) {
resourceHashes[match.group(1)] = match.group(2);
}
// For all resources (modulo compiled JS ones), verify the hash.
- for (FileSystemEntity entity in sortDir(resourceDir.listSync())) {
- String name = path.basename(entity.path);
+ for (var entity in sortDir(resourceDir.listSync())) {
+ var name = path.basename(entity.path);
if (!resourceTypes.contains(path.extension(name))) {
continue;
}
@@ -235,11 +234,11 @@
continue;
}
- String key = name.replaceAll('.', '_');
+ var key = name.replaceAll('.', '_');
if (!resourceHashes.containsKey(key)) {
failVerification('No entry on resources.g.dart for $name');
} else {
- String hash = md5String((entity as File).readAsStringSync());
+ var hash = md5String((entity as File).readAsStringSync());
if (hash != resourceHashes[key]) {
failVerification('$name not up to date in resources.g.dart');
}
@@ -247,13 +246,13 @@
}
// verify the compiled dart code
- StringBuffer sourceCode = StringBuffer();
- for (FileSystemEntity entity in sortDir(dartSources.parent.listSync())) {
+ var sourceCode = StringBuffer();
+ for (var entity in sortDir(dartSources.parent.listSync())) {
if (entity.path.endsWith('.dart')) {
sourceCode.write((entity as File).readAsStringSync());
}
}
- String hash = md5String(sourceCode.toString());
+ var hash = md5String(sourceCode.toString());
if (hash != resourceHashes['migration_dart']) {
failVerification('Compiled javascript not up to date in resources.g.dart');
}
diff --git a/pkg/analysis_server/tool/spec/api.dart b/pkg/analysis_server/tool/spec/api.dart
index c062a7f..9619513 100644
--- a/pkg/analysis_server/tool/spec/api.dart
+++ b/pkg/analysis_server/tool/spec/api.dart
@@ -185,7 +185,7 @@
/// Get the full type of the notification object, including the common "id"
/// and "error" fields.
TypeDecl get notificationType {
- List<TypeObjectField> fields = [
+ var fields = <TypeObjectField>[
TypeObjectField('event', TypeReference('String', null), null,
value: '$domainName.$event')
];
@@ -253,7 +253,7 @@
/// Get the full type of the request object, including the common "id" and
/// "method" fields.
TypeDecl get requestType {
- List<TypeObjectField> fields = [
+ var fields = <TypeObjectField>[
TypeObjectField('id', TypeReference('String', null), null),
TypeObjectField('method', TypeReference('String', null), null,
value: '$domainName.$method')
@@ -267,7 +267,7 @@
/// Get the full type of the response object, including the common "id" and
/// "error" fields.
TypeDecl get responseType {
- List<TypeObjectField> fields = [
+ var fields = <TypeObjectField>[
TypeObjectField('id', TypeReference('String', null), null),
TypeObjectField('error', TypeReference('RequestError', null), null,
optional: true)
@@ -362,7 +362,7 @@
/// Return the field with the given [name], or null if there is no such field.
TypeObjectField getField(String name) {
- for (TypeObjectField field in fields) {
+ for (var field in fields) {
if (field.name == name) {
return field;
}
diff --git a/pkg/analysis_server/tool/spec/check_all_test.dart b/pkg/analysis_server/tool/spec/check_all_test.dart
index 3a4c769..de4be12 100644
--- a/pkg/analysis_server/tool/spec/check_all_test.dart
+++ b/pkg/analysis_server/tool/spec/check_all_test.dart
@@ -12,10 +12,10 @@
/// Check that all targets have been code generated. If they haven't tell the
/// user to run generate_all.dart.
void main() async {
- String script = Platform.script.toFilePath(windows: Platform.isWindows);
- List<String> components = split(script);
- int index = components.indexOf('analysis_server');
- String pkgPath = joinAll(components.sublist(0, index + 1));
+ var script = Platform.script.toFilePath(windows: Platform.isWindows);
+ var components = split(script);
+ var index = components.indexOf('analysis_server');
+ var pkgPath = joinAll(components.sublist(0, index + 1));
await GeneratedContent.checkAll(
pkgPath, join(pkgPath, 'tool', 'spec', 'generate_all.dart'), allTargets);
}
diff --git a/pkg/analysis_server/tool/spec/codegen_analysis_server.dart b/pkg/analysis_server/tool/spec/codegen_analysis_server.dart
index a95a5e8..e72548d 100644
--- a/pkg/analysis_server/tool/spec/codegen_analysis_server.dart
+++ b/pkg/analysis_server/tool/spec/codegen_analysis_server.dart
@@ -153,7 +153,7 @@
@override
void visitRequest(Request request) {
- String methodName = '${request.domainName}_${request.method}';
+ var methodName = '${request.domainName}_${request.method}';
publicMethod(methodName, () {
docComment(toHtmlVisitor.collectHtml(() {
toHtmlVisitor.write('{@code ${request.longMethod}}');
@@ -164,9 +164,9 @@
}
}));
write('public void $methodName(');
- List<String> arguments = [];
+ var arguments = <String>[];
if (request.params != null) {
- for (TypeObjectField field in request.params.fields) {
+ for (var field in request.params.fields) {
arguments.add('${javaType(field.type)} ${javaName(field.name)}');
}
}
diff --git a/pkg/analysis_server/tool/spec/codegen_dart.dart b/pkg/analysis_server/tool/spec/codegen_dart.dart
index 3bb993d..9dacf99 100644
--- a/pkg/analysis_server/tool/spec/codegen_dart.dart
+++ b/pkg/analysis_server/tool/spec/codegen_dart.dart
@@ -17,15 +17,15 @@
/// Convert the given [TypeDecl] to a Dart type.
String dartType(TypeDecl type) {
if (type is TypeReference) {
- String typeName = type.typeName;
- TypeDefinition referencedDefinition = api.types[typeName];
+ var typeName = type.typeName;
+ var referencedDefinition = api.types[typeName];
if (_typeRenames.containsKey(typeName)) {
return _typeRenames[typeName];
}
if (referencedDefinition == null) {
return typeName;
}
- TypeDecl referencedType = referencedDefinition.type;
+ var referencedType = referencedDefinition.type;
if (referencedType is TypeObject || referencedType is TypeEnum) {
return typeName;
}
diff --git a/pkg/analysis_server/tool/spec/codegen_dart_notification_handler.dart b/pkg/analysis_server/tool/spec/codegen_dart_notification_handler.dart
index cd914de..7fddd04 100644
--- a/pkg/analysis_server/tool/spec/codegen_dart_notification_handler.dart
+++ b/pkg/analysis_server/tool/spec/codegen_dart_notification_handler.dart
@@ -14,8 +14,7 @@
return GeneratedFile(
'../analysis_server_client/lib/handler/notification_handler.dart',
(String pkgPath) async {
- CodegenNotificationHandlerVisitor visitor =
- CodegenNotificationHandlerVisitor(readApi(pkgPath));
+ var visitor = CodegenNotificationHandlerVisitor(readApi(pkgPath));
return visitor.collectCode(visitor.visitApi);
});
}
@@ -46,14 +45,14 @@
}
void emitDartdoc(List<String> dartdoc) {
- bool first = true;
- for (String paragraph in dartdoc) {
+ var first = true;
+ for (var paragraph in dartdoc) {
if (first) {
first = false;
} else {
writeln(' ///');
}
- for (String line in paragraph.split(RegExp('\r?\n'))) {
+ for (var line in paragraph.split(RegExp('\r?\n'))) {
writeln(' /// ${line.trim()}');
}
}
@@ -64,7 +63,7 @@
}
void emitNotificationHandler() {
- _NotificationVisitor visitor = _NotificationVisitor(api)..visitApi();
+ var visitor = _NotificationVisitor(api)..visitApi();
final notifications = visitor.notificationConstants;
notifications.sort((n1, n2) => n1.constName.compareTo(n2.constName));
@@ -77,11 +76,11 @@
/// Clients may mix-in this class, but may not implement it.
mixin NotificationHandler {
void handleEvent(Notification notification) {
- Map<String, Object> params = notification.params;
- ResponseDecoder decoder = ResponseDecoder(null);
+ var params = notification.params;
+ var decoder = ResponseDecoder(null);
switch (notification.event) {
''');
- for (_Notification notification in notifications) {
+ for (var notification in notifications) {
writeln(' case ${notification.constName}:');
writeln(' ${notification.methodName}(');
writeln(' ${notification.paramsTypeName}');
@@ -93,7 +92,7 @@
writeln(' break;');
writeln(' }');
writeln(' }');
- for (_Notification notification in notifications) {
+ for (var notification in notifications) {
writeln();
emitDartdoc(notification.dartdoc);
writeln(' void ${notification.methodName}(');
diff --git a/pkg/analysis_server/tool/spec/codegen_dart_protocol.dart b/pkg/analysis_server/tool/spec/codegen_dart_protocol.dart
index 6f0d514..a9da290 100644
--- a/pkg/analysis_server/tool/spec/codegen_dart_protocol.dart
+++ b/pkg/analysis_server/tool/spec/codegen_dart_protocol.dart
@@ -29,11 +29,8 @@
return GeneratedFile(
'../analysis_server_client/lib/src/protocol/protocol_generated.dart',
(String pkgPath) async {
- CodegenProtocolVisitor visitor = CodegenProtocolVisitor(
- 'analysis_server_client',
- responseRequiresRequestTime,
- false,
- readApi(pkgPath));
+ var visitor = CodegenProtocolVisitor('analysis_server_client',
+ responseRequiresRequestTime, false, readApi(pkgPath));
return visitor.collectCode(visitor.visitApi);
});
}
@@ -41,11 +38,8 @@
GeneratedFile serverTarget(bool responseRequiresRequestTime) {
return GeneratedFile('lib/protocol/protocol_generated.dart',
(String pkgPath) async {
- CodegenProtocolVisitor visitor = CodegenProtocolVisitor(
- path.basename(pkgPath),
- responseRequiresRequestTime,
- true,
- readApi(pkgPath));
+ var visitor = CodegenProtocolVisitor(path.basename(pkgPath),
+ responseRequiresRequestTime, true, readApi(pkgPath));
return visitor.collectCode(visitor.visitApi);
});
}
@@ -107,22 +101,21 @@
/// Compute the code necessary to compare two objects for equality.
String compareEqualsCode(TypeDecl type, String thisVar, String otherVar) {
- TypeDecl resolvedType = resolveTypeReferenceChain(type);
+ var resolvedType = resolveTypeReferenceChain(type);
if (resolvedType is TypeReference ||
resolvedType is TypeEnum ||
resolvedType is TypeObject ||
resolvedType is TypeUnion) {
return '$thisVar == $otherVar';
} else if (resolvedType is TypeList) {
- String itemTypeName = dartType(resolvedType.itemType);
- String subComparison = compareEqualsCode(resolvedType.itemType, 'a', 'b');
- String closure = '($itemTypeName a, $itemTypeName b) => $subComparison';
+ var itemTypeName = dartType(resolvedType.itemType);
+ var subComparison = compareEqualsCode(resolvedType.itemType, 'a', 'b');
+ var closure = '($itemTypeName a, $itemTypeName b) => $subComparison';
return 'listEqual($thisVar, $otherVar, $closure)';
} else if (resolvedType is TypeMap) {
- String valueTypeName = dartType(resolvedType.valueType);
- String subComparison =
- compareEqualsCode(resolvedType.valueType, 'a', 'b');
- String closure = '($valueTypeName a, $valueTypeName b) => $subComparison';
+ var valueTypeName = dartType(resolvedType.valueType);
+ var subComparison = compareEqualsCode(resolvedType.valueType, 'a', 'b');
+ var closure = '($valueTypeName a, $valueTypeName b) => $subComparison';
return 'mapEqual($thisVar, $otherVar, $closure)';
}
throw Exception("Don't know how to compare for equality: $resolvedType");
@@ -130,9 +123,9 @@
/// Translate each of the given [types] implied by the API to a class.
void emitClasses(List<ImpliedType> types) {
- for (ImpliedType impliedType in types) {
- TypeDecl type = impliedType.type;
- String dartTypeName = capitalize(impliedType.camelName);
+ for (var impliedType in types) {
+ var type = impliedType.type;
+ var dartTypeName = capitalize(impliedType.camelName);
if (type == null) {
writeln();
emitEmptyObjectClass(dartTypeName, impliedType);
@@ -160,7 +153,7 @@
// Name of the constructor to create.
String constructorName;
// Extra arguments for the constructor.
- List<String> extraArgs = <String>[];
+ var extraArgs = <String>[];
switch (impliedType.kind) {
case 'requestParams':
inputType = 'Request';
@@ -195,11 +188,11 @@
default:
return false;
}
- List<String> args = ['$inputType $inputName'];
+ var args = <String>['$inputType $inputName'];
args.addAll(extraArgs);
writeln('factory $className.$constructorName(${args.join(', ')}) {');
indent(() {
- String fieldNameString =
+ var fieldNameString =
literalString(fieldName.replaceFirst(RegExp('^_'), ''));
if (className == 'EditGetRefactoringParams') {
writeln('var params = $className.fromJson(');
@@ -285,11 +278,11 @@
if (emitSpecialStaticMembers(className)) {
writeln();
}
- for (TypeEnumValue value in type.values) {
+ for (var value in type.values) {
docComment(toHtmlVisitor.collectHtml(() {
toHtmlVisitor.translateHtml(value.html);
}));
- String valueString = literalString(value.value);
+ var valueString = literalString(value.value);
writeln(
'static const $className ${value.value} = $className._($valueString);');
writeln();
@@ -301,8 +294,8 @@
write('> VALUES = <');
write(className);
write('>[');
- bool first = true;
- for (TypeEnumValue value in type.values) {
+ var first = true;
+ for (var value in type.values) {
if (first) {
first = false;
} else {
@@ -345,8 +338,8 @@
indent(() {
writeln('switch (name) {');
indent(() {
- for (TypeEnumValue value in type.values) {
- String valueString = literalString(value.value);
+ for (var value in type.values) {
+ var valueString = literalString(value.value);
writeln('case $valueString:');
indent(() {
writeln('return ${value.value};');
@@ -378,7 +371,7 @@
writeln('}');
});
writeln('}');
- String humanReadableNameString =
+ var humanReadableNameString =
literalString(impliedType.humanReadableName);
writeln(
'throw jsonDecoder.mismatch(jsonPath, $humanReadableNameString, json);');
@@ -395,7 +388,7 @@
writeln("import 'package:$packageName/protocol/protocol.dart';");
writeln(
"import 'package:$packageName/src/protocol/protocol_internal.dart';");
- for (String uri in api.types.importUris) {
+ for (var uri in api.types.importUris) {
write("import '");
write(uri);
writeln("';");
@@ -440,14 +433,14 @@
if (emitSpecialStaticMembers(className)) {
writeln();
}
- for (TypeObjectField field in type.fields) {
+ for (var field in type.fields) {
if (field.value != null) {
continue;
}
writeln('${dartType(field.type)} _${field.name};');
writeln();
}
- for (TypeObjectField field in type.fields) {
+ for (var field in type.fields) {
if (field.value != null) {
continue;
}
@@ -508,21 +501,21 @@
/// Emit the constructor for an object class.
void emitObjectConstructor(TypeObject type, String className) {
- List<String> args = <String>[];
- List<String> optionalArgs = <String>[];
- List<CodegenCallback> extraInitCode = <CodegenCallback>[];
- for (TypeObjectField field in type.fields) {
+ var args = <String>[];
+ var optionalArgs = <String>[];
+ var extraInitCode = <CodegenCallback>[];
+ for (var field in type.fields) {
if (field.value != null) {
continue;
}
- String arg = '${dartType(field.type)} ${field.name}';
- String setValueFromArg = 'this.${field.name} = ${field.name};';
+ var arg = '${dartType(field.type)} ${field.name}';
+ var setValueFromArg = 'this.${field.name} = ${field.name};';
if (isOptionalConstructorArg(className, field)) {
optionalArgs.add(arg);
if (!field.optional) {
// Optional constructor arg, but non-optional field. If no arg is
// given, the constructor should populate with the empty list.
- TypeDecl fieldType = field.type;
+ var fieldType = field.type;
if (fieldType is TypeList) {
extraInitCode.add(() {
writeln('if (${field.name} == null) {');
@@ -560,7 +553,7 @@
} else {
writeln(' {');
indent(() {
- for (CodegenCallback callback in extraInitCode) {
+ for (var callback in extraInitCode) {
callback();
}
});
@@ -577,7 +570,7 @@
indent(() {
var comparisons = <String>[];
if (type != null) {
- for (TypeObjectField field in type.fields) {
+ for (var field in type.fields) {
if (field.value != null) {
continue;
}
@@ -588,7 +581,7 @@
if (comparisons.isEmpty) {
writeln('return true;');
} else {
- String concatenated = comparisons.join(' &&\n ');
+ var concatenated = comparisons.join(' &&\n ');
writeln('return $concatenated;');
}
});
@@ -601,8 +594,7 @@
/// Emit the method for decoding an object from JSON.
void emitObjectFromJsonConstructor(
String className, TypeObject type, ImpliedType impliedType) {
- String humanReadableNameString =
- literalString(impliedType.humanReadableName);
+ var humanReadableNameString = literalString(impliedType.humanReadableName);
if (className == 'RefactoringFeedback') {
writeln('factory RefactoringFeedback.fromJson(JsonDecoder jsonDecoder, '
'String jsonPath, Object json, Map responseJson) {');
@@ -629,14 +621,14 @@
writeln('json ??= {};');
writeln('if (json is Map) {');
indent(() {
- List<String> args = <String>[];
- List<String> optionalArgs = <String>[];
- for (TypeObjectField field in type.fields) {
- String fieldNameString = literalString(field.name);
- String fieldAccessor = 'json[$fieldNameString]';
- String jsonPath = 'jsonPath + ${literalString('.${field.name}')}';
+ var args = <String>[];
+ var optionalArgs = <String>[];
+ for (var field in type.fields) {
+ var fieldNameString = literalString(field.name);
+ var fieldAccessor = 'json[$fieldNameString]';
+ var jsonPath = 'jsonPath + ${literalString('.${field.name}')}';
if (field.value != null) {
- String valueString = literalString(field.value);
+ var valueString = literalString(field.value);
writeln('if ($fieldAccessor != $valueString) {');
indent(() {
writeln(
@@ -650,12 +642,12 @@
} else {
args.add(field.name);
}
- TypeDecl fieldType = field.type;
- String fieldDartType = dartType(fieldType);
+ var fieldType = field.type;
+ var fieldDartType = dartType(fieldType);
writeln('$fieldDartType ${field.name};');
writeln('if (json.containsKey($fieldNameString)) {');
indent(() {
- String fromJson =
+ var fromJson =
fromJsonCode(fieldType).asSnippet(jsonPath, fieldAccessor);
writeln('${field.name} = $fromJson;');
});
@@ -693,7 +685,7 @@
writeln('return ${className.hashCode};');
} else {
writeln('var hash = 0;');
- for (TypeObjectField field in type.fields) {
+ for (var field in type.fields) {
String valueToCombine;
if (field.value != null) {
valueToCombine = field.value.hashCode.toString();
@@ -736,8 +728,8 @@
bool emitSpecialGetters(String className) {
switch (className) {
case 'Element':
- for (String name in specialElementFlags.keys) {
- String flag = 'FLAG_${name.toUpperCase()}';
+ for (var name in specialElementFlags.keys) {
+ var flag = 'FLAG_${name.toUpperCase()}';
writeln(
'bool get ${camelJoin(['is', name])} => (flags & $flag) != 0;');
}
@@ -821,11 +813,11 @@
bool emitSpecialStaticMembers(String className) {
switch (className) {
case 'Element':
- List<String> makeFlagsArgs = <String>[];
- List<String> makeFlagsStatements = <String>[];
+ var makeFlagsArgs = <String>[];
+ var makeFlagsStatements = <String>[];
specialElementFlags.forEach((String name, String value) {
- String flag = 'FLAG_${name.toUpperCase()}';
- String camelName = camelJoin(['is', name]);
+ var flag = 'FLAG_${name.toUpperCase()}';
+ var camelName = camelJoin(['is', name]);
writeln('static const int $flag = $value;');
makeFlagsArgs.add('$camelName = false');
makeFlagsStatements.add('if ($camelName) flags |= $flag;');
@@ -834,7 +826,7 @@
writeln('static int makeFlags({${makeFlagsArgs.join(', ')}}) {');
indent(() {
writeln('int flags = 0;');
- for (String statement in makeFlagsStatements) {
+ for (var statement in makeFlagsStatements) {
writeln(statement);
}
writeln('return flags;');
@@ -861,14 +853,14 @@
writeln('Map<String, dynamic> toJson() {');
indent(() {
writeln('var result = <String, dynamic>{};');
- for (TypeObjectField field in type.fields) {
- String fieldNameString = literalString(field.name);
+ for (var field in type.fields) {
+ var fieldNameString = literalString(field.name);
if (field.value != null) {
writeln('result[$fieldNameString] = ${literalString(field.value)};');
continue;
}
- String fieldToJson = toJsonCode(field.type).asSnippet(field.name);
- String populateField = 'result[$fieldNameString] = $fieldToJson;';
+ var fieldToJson = toJsonCode(field.type).asSnippet(field.name);
+ var populateField = 'result[$fieldNameString] = $fieldToJson;';
if (field.optional) {
writeln('if (${field.name} != null) {');
indent(() {
@@ -890,9 +882,9 @@
if (impliedType.kind == 'notificationParams') {
writeln('Notification toNotification() {');
indent(() {
- String eventString =
+ var eventString =
literalString((impliedType.apiNode as Notification).longEvent);
- String jsonPart = impliedType.type != null ? 'toJson()' : 'null';
+ var jsonPart = impliedType.type != null ? 'toJson()' : 'null';
writeln('return Notification($eventString, $jsonPart);');
});
writeln('}');
@@ -908,9 +900,9 @@
writeln('@override');
writeln('Request toRequest(String id) {');
indent(() {
- String methodString =
+ var methodString =
literalString((impliedType.apiNode as Request).longMethod);
- String jsonPart = impliedType.type != null ? 'toJson()' : 'null';
+ var jsonPart = impliedType.type != null ? 'toJson()' : 'null';
writeln('return Request(id, $methodString, $jsonPart);');
});
writeln('}');
@@ -930,7 +922,7 @@
writeln('Response toResponse(String id) {');
}
indent(() {
- String jsonPart = impliedType.type != null ? 'toJson()' : 'null';
+ var jsonPart = impliedType.type != null ? 'toJson()' : 'null';
if (responseRequiresRequestTime) {
writeln('return Response(id, requestTime, result: $jsonPart);');
} else {
@@ -946,12 +938,12 @@
/// Compute the code necessary to translate [type] from JSON.
FromJsonCode fromJsonCode(TypeDecl type) {
if (type is TypeReference) {
- TypeDefinition referencedDefinition = api.types[type.typeName];
+ var referencedDefinition = api.types[type.typeName];
if (referencedDefinition != null) {
- TypeDecl referencedType = referencedDefinition.type;
+ var referencedType = referencedDefinition.type;
if (referencedType is TypeObject || referencedType is TypeEnum) {
return FromJsonSnippet((String jsonPath, String json) {
- String typeName = dartType(type);
+ var typeName = dartType(type);
if (typeName == 'RefactoringFeedback') {
return '$typeName.fromJson(jsonDecoder, $jsonPath, $json, json)';
} else if (typeName == 'RefactoringOptions') {
@@ -987,12 +979,12 @@
} else {
keyCode = FromJsonIdentity();
}
- FromJsonCode valueCode = fromJsonCode(type.valueType);
+ var valueCode = fromJsonCode(type.valueType);
if (keyCode.isIdentity && valueCode.isIdentity) {
return FromJsonFunction('jsonDecoder.decodeMap');
} else {
return FromJsonSnippet((String jsonPath, String json) {
- StringBuffer result = StringBuffer();
+ var result = StringBuffer();
result.write('jsonDecoder.decodeMap($jsonPath, $json');
if (!keyCode.isIdentity) {
result.write(', keyDecoder: ${keyCode.asClosure}');
@@ -1005,7 +997,7 @@
});
}
} else if (type is TypeList) {
- FromJsonCode itemCode = fromJsonCode(type.itemType);
+ var itemCode = fromJsonCode(type.itemType);
if (itemCode.isIdentity) {
return FromJsonFunction('jsonDecoder.decodeList');
} else {
@@ -1013,11 +1005,11 @@
'jsonDecoder.decodeList($jsonPath, $json, ${itemCode.asClosure})');
}
} else if (type is TypeUnion) {
- List<String> decoders = <String>[];
- for (TypeDecl choice in type.choices) {
- TypeDecl resolvedChoice = resolveTypeReferenceChain(choice);
+ var decoders = <String>[];
+ for (var choice in type.choices) {
+ var resolvedChoice = resolveTypeReferenceChain(choice);
if (resolvedChoice is TypeObject) {
- TypeObjectField field = resolvedChoice.getField(type.field);
+ var field = resolvedChoice.getField(type.field);
if (field == null) {
throw Exception(
'Each choice in the union needs a field named ${type.field}');
@@ -1026,7 +1018,7 @@
throw Exception(
'Each choice in the union needs a constant value for the field ${type.field}');
}
- String closure = fromJsonCode(choice).asClosure;
+ var closure = fromJsonCode(choice).asClosure;
decoders.add('${literalString(field.value)}: $closure');
} else {
throw Exception('Union types must be unions of objects.');
@@ -1041,8 +1033,8 @@
/// Return a list of the classes to be emitted.
List<ImpliedType> getClassesToEmit() {
- List<ImpliedType> types = impliedTypes.values.where((ImpliedType type) {
- ApiNode node = type.apiNode;
+ var types = impliedTypes.values.where((ImpliedType type) {
+ var node = type.apiNode;
return !(node is TypeDefinition && node.isExternal);
}).toList();
types.sort((first, second) =>
@@ -1055,7 +1047,7 @@
if (field.optional) {
return true;
}
- List<String> forceOptional = _optionalConstructorArguments[className];
+ var forceOptional = _optionalConstructorArguments[className];
if (forceOptional != null && forceOptional.contains(field.name)) {
return true;
}
@@ -1075,11 +1067,11 @@
/// Compute the code necessary to convert [type] to JSON.
ToJsonCode toJsonCode(TypeDecl type) {
- TypeDecl resolvedType = resolveTypeReferenceChain(type);
+ var resolvedType = resolveTypeReferenceChain(type);
if (resolvedType is TypeReference) {
return ToJsonIdentity(dartType(type));
} else if (resolvedType is TypeList) {
- ToJsonCode itemCode = toJsonCode(resolvedType.itemType);
+ var itemCode = toJsonCode(resolvedType.itemType);
if (itemCode.isIdentity) {
return ToJsonIdentity(dartType(type));
} else {
@@ -1093,12 +1085,12 @@
} else {
keyCode = ToJsonIdentity(dartType(resolvedType.keyType));
}
- ToJsonCode valueCode = toJsonCode(resolvedType.valueType);
+ var valueCode = toJsonCode(resolvedType.valueType);
if (keyCode.isIdentity && valueCode.isIdentity) {
return ToJsonIdentity(dartType(resolvedType));
} else {
return ToJsonSnippet(dartType(type), (String value) {
- StringBuffer result = StringBuffer();
+ var result = StringBuffer();
result.write('mapMap($value');
if (!keyCode.isIdentity) {
result.write(', keyCallback: ${keyCode.asClosure}');
@@ -1111,7 +1103,7 @@
});
}
} else if (resolvedType is TypeUnion) {
- for (TypeDecl choice in resolvedType.choices) {
+ for (var choice in resolvedType.choices) {
if (resolveTypeReferenceChain(choice) is! TypeObject) {
throw Exception('Union types must be unions of objects');
}
diff --git a/pkg/analysis_server/tool/spec/codegen_inttest_methods.dart b/pkg/analysis_server/tool/spec/codegen_inttest_methods.dart
index 710dc62..09a412b 100644
--- a/pkg/analysis_server/tool/spec/codegen_inttest_methods.dart
+++ b/pkg/analysis_server/tool/spec/codegen_inttest_methods.dart
@@ -14,7 +14,7 @@
final GeneratedFile target =
GeneratedFile('test/integration/support/integration_test_methods.dart',
(String pkgPath) async {
- CodegenInttestMethodsVisitor visitor =
+ var visitor =
CodegenInttestMethodsVisitor(path.basename(pkgPath), readApi(pkgPath));
return visitor.collectCode(visitor.visitApi);
});
@@ -94,7 +94,7 @@
writeln();
writeln("import 'integration_tests.dart';");
writeln("import 'protocol_matchers.dart';");
- for (String uri in api.types.importUris) {
+ for (var uri in api.types.importUris) {
write("import '");
write(uri);
writeln("';");
@@ -123,7 +123,7 @@
}));
writeln('void dispatchNotification(String event, params) {');
indent(() {
- writeln('ResponseDecoder decoder = ResponseDecoder(null);');
+ writeln('var decoder = ResponseDecoder(null);');
writeln('switch (event) {');
indent(() {
write(notificationSwitchContents.join());
@@ -142,9 +142,9 @@
@override
void visitNotification(Notification notification) {
- String streamName =
+ var streamName =
camelJoin(['on', notification.domainName, notification.event]);
- String className = camelJoin(
+ var className = camelJoin(
[notification.domainName, notification.event, 'params'],
doCapitalize: true);
writeln();
@@ -165,7 +165,7 @@
notificationSwitchContents.add(collectCode(() {
writeln("case '${notification.longEvent}':");
indent(() {
- String paramsValidator = camelJoin(
+ var paramsValidator = camelJoin(
['is', notification.domainName, notification.event, 'params']);
writeln('outOfTestExpect(params, $paramsValidator);');
String constructorCall;
@@ -182,11 +182,11 @@
@override
void visitRequest(Request request) {
- String methodName = camelJoin(['send', request.domainName, request.method]);
- List<String> args = <String>[];
- List<String> optionalArgs = <String>[];
+ var methodName = camelJoin(['send', request.domainName, request.method]);
+ var args = <String>[];
+ var optionalArgs = <String>[];
if (request.params != null) {
- for (TypeObjectField field in request.params.fields) {
+ for (var field in request.params.fields) {
if (field.optional) {
optionalArgs.add(formatArgument(field));
} else {
@@ -217,15 +217,15 @@
}
writeln('$futureClass $methodName(${args.join(', ')}) async {');
indent(() {
- String requestClass = camelJoin(
+ var requestClass = camelJoin(
[request.domainName, request.method, 'params'],
doCapitalize: true);
- String paramsVar = 'null';
+ var paramsVar = 'null';
if (request.params != null) {
paramsVar = 'params';
- List<String> args = <String>[];
- List<String> optionalArgs = <String>[];
- for (TypeObjectField field in request.params.fields) {
+ var args = <String>[];
+ var optionalArgs = <String>[];
+ for (var field in request.params.fields) {
if (field.optional) {
optionalArgs.add('${field.name}: ${field.name}');
} else {
@@ -235,14 +235,14 @@
args.addAll(optionalArgs);
writeln('var params = $requestClass(${args.join(', ')}).toJson();');
}
- String methodJson = "'${request.longMethod}'";
+ var methodJson = "'${request.longMethod}'";
writeln('var result = await server.send($methodJson, $paramsVar);');
if (request.result != null) {
- String kind = 'null';
+ var kind = 'null';
if (requestClass == 'EditGetRefactoringParams') {
kind = 'kind';
}
- writeln('ResponseDecoder decoder = ResponseDecoder($kind);');
+ writeln('var decoder = ResponseDecoder($kind);');
writeln("return $resultClass.fromJson(decoder, 'result', result);");
} else {
writeln('outOfTestExpect(result, isNull);');
diff --git a/pkg/analysis_server/tool/spec/codegen_java.dart b/pkg/analysis_server/tool/spec/codegen_java.dart
index 89e24d2..f898732 100644
--- a/pkg/analysis_server/tool/spec/codegen_java.dart
+++ b/pkg/analysis_server/tool/spec/codegen_java.dart
@@ -15,14 +15,14 @@
GeneratedFile javaGeneratedFile(
String path, CodegenJavaVisitor Function(Api api) createVisitor) {
return GeneratedFile(path, (String pkgPath) async {
- CodegenJavaVisitor visitor = createVisitor(readApi(pkgPath));
+ var visitor = createVisitor(readApi(pkgPath));
return visitor.collectCode(visitor.visitApi);
});
}
/// Iterate through the values in [map] in the order of increasing keys.
Iterable<String> _valuesSortedByKey(Map<String, String> map) {
- List<String> keys = map.keys.toList();
+ var keys = map.keys.toList();
keys.sort();
return keys.map((String key) => map[key]);
}
@@ -96,7 +96,7 @@
/// Return true iff the passed [TypeDecl] will be represented as Object in
/// Java.
bool isObject(TypeDecl type) {
- String typeStr = javaType(type);
+ var typeStr = javaType(type);
return typeStr == 'Object';
}
@@ -104,7 +104,7 @@
/// type.
bool isPrimitive(TypeDecl type) {
if (type is TypeReference) {
- String typeStr = javaType(type);
+ var typeStr = javaType(type);
return typeStr == 'boolean' ||
typeStr == 'double' ||
typeStr == 'int' ||
@@ -135,7 +135,7 @@
String javaType(TypeDecl type, [bool optional = false]) {
if (type is TypeReference) {
TypeReference resolvedType = resolveTypeReferenceChain(type);
- String typeName = resolvedType.typeName;
+ var typeName = resolvedType.typeName;
if (_typeRenames.containsKey(typeName)) {
typeName = _typeRenames[typeName];
if (optional) {
@@ -169,32 +169,31 @@
/// sorted). [header] is the part of the class declaration before the
/// opening brace.
void makeClass(String header, void Function() callback) {
- _CodegenJavaState oldState = _state;
+ var oldState = _state;
try {
_state = _CodegenJavaState();
callback();
writeln('$header {');
indent(() {
// fields
- List<String> allFields = _state.publicFields.values.toList();
+ var allFields = _state.publicFields.values.toList();
allFields.addAll(_state.privateFields.values.toList());
- for (String field in allFields) {
+ for (var field in allFields) {
writeln();
write(field);
}
// constructors
- List<String> allConstructors = _state.constructors.values.toList();
- for (String constructor in allConstructors) {
+ var allConstructors = _state.constructors.values.toList();
+ for (var constructor in allConstructors) {
writeln();
write(constructor);
}
// methods (ordered by method name)
- List<String> allMethods =
- _valuesSortedByKey(_state.publicMethods).toList();
+ var allMethods = _valuesSortedByKey(_state.publicMethods).toList();
allMethods.addAll(_valuesSortedByKey(_state.privateMethods));
- for (String method in allMethods) {
+ for (var method in allMethods) {
writeln();
write(method);
}
@@ -228,7 +227,7 @@
@override
TypeDecl resolveTypeReferenceChain(TypeDecl type) {
- TypeDecl typeDecl = super.resolveTypeReferenceChain(type);
+ var typeDecl = super.resolveTypeReferenceChain(type);
if (typeDecl is TypeEnum) {
return TypeReference('String', null);
}
diff --git a/pkg/analysis_server/tool/spec/codegen_java_types.dart b/pkg/analysis_server/tool/spec/codegen_java_types.dart
index c8e7cf1..4ecbc1d 100644
--- a/pkg/analysis_server/tool/spec/codegen_java_types.dart
+++ b/pkg/analysis_server/tool/spec/codegen_java_types.dart
@@ -47,21 +47,21 @@
final GeneratedDirectory targetDir =
GeneratedDirectory(pathToGenTypes, (String pkgPath) {
- Api api = readApi(pkgPath);
- Map<String, ImpliedType> impliedTypes = computeImpliedTypes(api);
- Map<String, FileContentsComputer> map = <String, FileContentsComputer>{};
- for (ImpliedType impliedType in impliedTypes.values) {
- String typeNameInSpec = capitalize(impliedType.camelName);
- bool isRefactoringFeedback = impliedType.kind == 'refactoringFeedback';
- bool isRefactoringOption = impliedType.kind == 'refactoringOptions';
+ var api = readApi(pkgPath);
+ var impliedTypes = computeImpliedTypes(api);
+ var map = <String, FileContentsComputer>{};
+ for (var impliedType in impliedTypes.values) {
+ var typeNameInSpec = capitalize(impliedType.camelName);
+ var isRefactoringFeedback = impliedType.kind == 'refactoringFeedback';
+ var isRefactoringOption = impliedType.kind == 'refactoringOptions';
if (impliedType.kind == 'typeDefinition' ||
isRefactoringFeedback ||
isRefactoringOption) {
- TypeDecl type = impliedType.type;
+ var type = impliedType.type;
if (type is TypeObject || type is TypeEnum) {
// This is for situations such as 'Override' where the name in the spec
// doesn't match the java object that we generate:
- String typeNameInJava = typeNameInSpec;
+ var typeNameInJava = typeNameInSpec;
if (_typeRenames.containsKey(typeNameInSpec)) {
typeNameInJava = _typeRenames[typeNameInSpec];
}
@@ -74,18 +74,18 @@
superclassName = 'RefactoringOptions';
}
// configure accessors
- bool generateGetters = true;
- bool generateSetters = false;
+ var generateGetters = true;
+ var generateSetters = false;
if (isRefactoringOption ||
typeNameInSpec == 'Outline' ||
typeNameInSpec == 'RefactoringMethodParameter') {
generateSetters = true;
}
// create the visitor
- CodegenJavaType visitor = CodegenJavaType(api, typeNameInJava,
- superclassName, generateGetters, generateSetters);
+ var visitor = CodegenJavaType(api, typeNameInJava, superclassName,
+ generateGetters, generateSetters);
return visitor.collectCode(() {
- dom.Element doc = type.html;
+ var doc = type.html;
if (impliedType.apiNode is TypeDefinition) {
doc = (impliedType.apiNode as TypeDefinition).html;
}
@@ -126,7 +126,7 @@
}
String _getAsTypeMethodName(TypeDecl typeDecl) {
- String name = javaType(typeDecl, true);
+ var name = javaType(typeDecl, true);
if (name == 'String') {
return 'getAsString';
} else if (name == 'boolean' || name == 'Boolean') {
@@ -146,7 +146,7 @@
}
String _getEqualsLogicForField(TypeObjectField field, String other) {
- String name = javaName(field.name);
+ var name = javaName(field.name);
if (isPrimitive(field.type) && !field.optional) {
return '$other.$name == $name';
} else if (isArray(field.type)) {
@@ -159,7 +159,7 @@
/// For some [TypeObjectField] return the [String] source for the field value
/// for the toString generation.
String _getToStringForField(TypeObjectField field) {
- String name = javaName(field.name);
+ var name = javaName(field.name);
if (isArray(field.type) || isList(field.type)) {
return 'StringUtils.join($name, ", ")';
} else {
@@ -209,12 +209,12 @@
/// For some [TypeObjectField] write out the source that adds the field
/// information to the 'jsonObject'.
void _writeOutJsonObjectAddStatement(TypeObjectField field) {
- String name = javaName(field.name);
+ var name = javaName(field.name);
if (isDeclaredInSpec(field.type)) {
writeln('jsonObject.add("$name", $name.toJson());');
} else if (field.type is TypeList) {
- TypeDecl listItemType = (field.type as TypeList).itemType;
- String jsonArrayName = 'jsonArray${capitalize(name)}';
+ var listItemType = (field.type as TypeList).itemType;
+ var jsonArrayName = 'jsonArray${capitalize(name)}';
writeln('JsonArray $jsonArrayName = new JsonArray();');
writeln('for (${javaType(listItemType)} elt : $name) {');
indent(() {
@@ -238,12 +238,12 @@
toHtmlVisitor.write('@coverage dart.server.generated.types');
}));
makeClass('public class $className', () {
- TypeEnum typeEnum = type as TypeEnum;
- List<TypeEnumValue> values = typeEnum.values;
+ var typeEnum = type as TypeEnum;
+ var values = typeEnum.values;
//
// enum fields
//
- for (TypeEnumValue value in values) {
+ for (var value in values) {
privateField(javaName(value.value), () {
javadocComment(toHtmlVisitor.collectHtml(() {
toHtmlVisitor.translateHtml(value.html);
@@ -277,7 +277,7 @@
toHtmlVisitor.write('@coverage dart.server.generated.types');
}));
writeln('@SuppressWarnings("unused")');
- String header = 'public class $className';
+ var header = 'public class $className';
if (superclassName != null) {
header += ' extends $superclassName';
}
@@ -304,11 +304,11 @@
//
// "private static String name;" fields:
//
- TypeObject typeObject = type as TypeObject;
- List<TypeObjectField> fields = typeObject.fields;
- for (TypeObjectField field in fields) {
- String type = javaFieldType(field);
- String name = javaName(field.name);
+ var typeObject = type as TypeObject;
+ var fields = typeObject.fields;
+ for (var field in fields) {
+ var type = javaFieldType(field);
+ var name = javaName(field.name);
if (!(className == 'Outline' && name == 'children')) {
privateField(name, () {
javadocComment(toHtmlVisitor.collectHtml(() {
@@ -351,13 +351,13 @@
}));
write('public $className(');
// write out parameters to constructor
- List<String> parameters = [];
+ var parameters = <String>[];
if (className == 'Outline') {
parameters.add('Outline parent');
}
- for (TypeObjectField field in fields) {
- String type = javaFieldType(field);
- String name = javaName(field.name);
+ for (var field in fields) {
+ var type = javaFieldType(field);
+ var name = javaName(field.name);
if (!_isTypeFieldInUpdateContentUnionType(className, field.name) &&
!(className == 'Outline' && name == 'children')) {
parameters.add('$type $name');
@@ -370,8 +370,8 @@
if (className == 'Outline') {
writeln('this.parent = parent;');
}
- for (TypeObjectField field in fields) {
- String name = javaName(field.name);
+ for (var field in fields) {
+ var name = javaName(field.name);
if (!_isTypeFieldInUpdateContentUnionType(className, field.name) &&
!(className == 'Outline' && name == 'children')) {
writeln('this.$name = $name;');
@@ -391,9 +391,9 @@
// getter methods
//
if (generateGetters) {
- for (TypeObjectField field in fields) {
- String type = javaFieldType(field);
- String name = javaName(field.name);
+ for (var field in fields) {
+ var type = javaFieldType(field);
+ var name = javaName(field.name);
publicMethod('get$name', () {
javadocComment(toHtmlVisitor.collectHtml(() {
toHtmlVisitor.translateHtml(field.html);
@@ -413,14 +413,14 @@
// setter methods
//
if (generateSetters) {
- for (TypeObjectField field in fields) {
- String type = javaFieldType(field);
- String name = javaName(field.name);
+ for (var field in fields) {
+ var type = javaFieldType(field);
+ var name = javaName(field.name);
publicMethod('set$name', () {
javadocComment(toHtmlVisitor.collectHtml(() {
toHtmlVisitor.translateHtml(field.html);
}));
- String setterName = 'set' + capitalize(name);
+ var setterName = 'set' + capitalize(name);
writeln('public void $setterName($type $name) {');
writeln(' this.$name = $name;');
writeln('}');
@@ -468,7 +468,7 @@
publicMethod('fromJson', () {
writeln('public static $className fromJson(JsonObject jsonObject) {');
indent(() {
- for (TypeObjectField field in fields) {
+ for (var field in fields) {
write('${javaFieldType(field)} ${javaName(field.name)} = ');
if (field.optional) {
write(
@@ -500,8 +500,8 @@
writeln(';');
}
write('return new $className(');
- List<String> parameters = [];
- for (TypeObjectField field in fields) {
+ var parameters = <String>[];
+ for (var field in fields) {
if (!_isTypeFieldInUpdateContentUnionType(
className, field.name)) {
parameters.add('${javaName(field.name)}');
@@ -585,7 +585,7 @@
writeln('public JsonObject toJson() {');
indent(() {
writeln('JsonObject jsonObject = new JsonObject();');
- for (TypeObjectField field in fields) {
+ for (var field in fields) {
if (!isObject(field.type)) {
if (field.optional) {
writeln('if (${javaName(field.name)} != null) {');
@@ -616,8 +616,8 @@
writeln('$className other = ($className) obj;');
writeln('return');
indent(() {
- List<String> equalsForField = <String>[];
- for (TypeObjectField field in fields) {
+ var equalsForField = <String>[];
+ for (var field in fields) {
equalsForField.add(_getEqualsLogicForField(field, 'other'));
}
if (equalsForField.isNotEmpty) {
@@ -675,7 +675,7 @@
writeln('public int hashCode() {');
indent(() {
writeln('HashCodeBuilder builder = new HashCodeBuilder();');
- for (int i = 0; i < fields.length; i++) {
+ for (var i = 0; i < fields.length; i++) {
writeln('builder.append(${javaName(fields[i].name)});');
}
writeln('return builder.toHashCode();');
@@ -692,7 +692,7 @@
indent(() {
writeln('StringBuilder builder = new StringBuilder();');
writeln('builder.append(\"[\");');
- for (int i = 0; i < fields.length; i++) {
+ for (var i = 0; i < fields.length; i++) {
writeln('builder.append(\"${javaName(fields[i].name)}=\");');
write('builder.append(${_getToStringForField(fields[i])}');
if (i + 1 != fields.length) {
diff --git a/pkg/analysis_server/tool/spec/codegen_matchers.dart b/pkg/analysis_server/tool/spec/codegen_matchers.dart
index 0bc862e..afe7545 100644
--- a/pkg/analysis_server/tool/spec/codegen_matchers.dart
+++ b/pkg/analysis_server/tool/spec/codegen_matchers.dart
@@ -12,7 +12,7 @@
final GeneratedFile target = GeneratedFile(
'test/integration/support/protocol_matchers.dart', (String pkgPath) async {
- CodegenMatchersVisitor visitor = CodegenMatchersVisitor(readApi(pkgPath));
+ var visitor = CodegenMatchersVisitor(readApi(pkgPath));
return visitor.collectCode(visitor.visitApi);
});
@@ -67,8 +67,8 @@
}
writeln('{');
indent(() {
- bool commaNeeded = false;
- for (TypeObjectField field in fields) {
+ var commaNeeded = false;
+ for (var field in fields) {
if (commaNeeded) {
writeln(',');
}
@@ -94,10 +94,10 @@
writeln();
writeln("import 'integration_tests.dart';");
writeln();
- List<ImpliedType> impliedTypes = computeImpliedTypes(api).values.toList();
+ var impliedTypes = computeImpliedTypes(api).values.toList();
impliedTypes.sort((ImpliedType first, ImpliedType second) =>
first.camelName.compareTo(second.camelName));
- for (ImpliedType impliedType in impliedTypes) {
+ for (var impliedType in impliedTypes) {
makeMatcher(impliedType);
}
}
@@ -106,8 +106,8 @@
void visitTypeEnum(TypeEnum typeEnum) {
writeln("MatchesEnum('$context', [");
indent(() {
- bool commaNeeded = false;
- for (TypeEnumValue value in typeEnum.values) {
+ var commaNeeded = false;
+ for (var value in typeEnum.values) {
if (commaNeeded) {
writeln(',');
}
@@ -140,10 +140,10 @@
writeln('LazyMatcher(() => MatchesJsonObject(');
indent(() {
write("'$context', ");
- Iterable<TypeObjectField> requiredFields =
+ var requiredFields =
typeObject.fields.where((TypeObjectField field) => !field.optional);
outputObjectFields(requiredFields);
- List<TypeObjectField> optionalFields = typeObject.fields
+ var optionalFields = typeObject.fields
.where((TypeObjectField field) => field.optional)
.toList();
if (optionalFields.isNotEmpty) {
@@ -156,7 +156,7 @@
@override
void visitTypeReference(TypeReference typeReference) {
- String typeName = typeReference.typeName;
+ var typeName = typeReference.typeName;
if (typeName == 'long') {
typeName = 'int';
}
@@ -165,9 +165,9 @@
@override
void visitTypeUnion(TypeUnion typeUnion) {
- bool commaNeeded = false;
+ var commaNeeded = false;
write('isOneOf([');
- for (TypeDecl choice in typeUnion.choices) {
+ for (var choice in typeUnion.choices) {
if (commaNeeded) {
write(', ');
}
diff --git a/pkg/analysis_server/tool/spec/codegen_protocol_constants.dart b/pkg/analysis_server/tool/spec/codegen_protocol_constants.dart
index 6a0fee2..12e2dc2 100644
--- a/pkg/analysis_server/tool/spec/codegen_protocol_constants.dart
+++ b/pkg/analysis_server/tool/spec/codegen_protocol_constants.dart
@@ -11,19 +11,19 @@
final GeneratedFile clientTarget = GeneratedFile(
'../analysis_server_client/lib/src/protocol/protocol_constants.dart',
(String pkgPath) async {
- CodegenVisitor visitor = CodegenVisitor(readApi(pkgPath));
+ var visitor = CodegenVisitor(readApi(pkgPath));
return visitor.collectCode(visitor.visitApi);
});
final GeneratedFile serverTarget = GeneratedFile(
'lib/protocol/protocol_constants.dart', (String pkgPath) async {
- CodegenVisitor visitor = CodegenVisitor(readApi(pkgPath));
+ var visitor = CodegenVisitor(readApi(pkgPath));
return visitor.collectCode(visitor.visitApi);
});
/// Generate a name from the [domainName], [kind] and [name] components.
String generateConstName(String domainName, String kind, String name) {
- List<String> components = <String>[];
+ var components = <String>[];
components.addAll(_split(domainName));
components.add(kind);
components.addAll(_split(name));
@@ -38,10 +38,10 @@
/// Return the components of the given [string] that are indicated by an upper
/// case letter.
Iterable<String> _split(String first) {
- RegExp regExp = RegExp('[A-Z]');
- List<String> components = <String>[];
- int start = 1;
- int index = first.indexOf(regExp, start);
+ var regExp = RegExp('[A-Z]');
+ var components = <String>[];
+ var start = 1;
+ var index = first.indexOf(regExp, start);
while (index >= 0) {
components.add(first.substring(start - 1, index));
start = index + 1;
@@ -66,11 +66,11 @@
void generateConstants() {
writeln("const String PROTOCOL_VERSION = '${api.version}';");
writeln();
- _ConstantVisitor visitor = _ConstantVisitor(api);
+ var visitor = _ConstantVisitor(api);
visitor.visitApi();
- List<_Constant> constants = visitor.constants;
+ var constants = visitor.constants;
constants.sort((first, second) => first.name.compareTo(second.name));
- for (_Constant constant in constants) {
+ for (var constant in constants) {
generateContant(constant);
}
}
@@ -114,25 +114,24 @@
@override
void visitNotification(Notification notification) {
- String domainName = notification.domainName;
- String event = notification.event;
+ var domainName = notification.domainName;
+ var event = notification.event;
- String constantName = generateConstName(domainName, 'notification', event);
+ var constantName = generateConstName(domainName, 'notification', event);
constants.add(_Constant(constantName, "'$domainName.$event'"));
_addFieldConstants(constantName, notification.params);
}
@override
void visitRequest(Request request) {
- String domainName = request.domainName;
- String method = request.method;
+ var domainName = request.domainName;
+ var method = request.method;
- String requestConstantName =
- generateConstName(domainName, 'request', method);
+ var requestConstantName = generateConstName(domainName, 'request', method);
constants.add(_Constant(requestConstantName, "'$domainName.$method'"));
_addFieldConstants(requestConstantName, request.params);
- String responseConstantName =
+ var responseConstantName =
generateConstName(domainName, 'response', method);
_addFieldConstants(responseConstantName, request.result);
}
@@ -145,11 +144,11 @@
return;
}
type.fields.forEach((TypeObjectField field) {
- String name = field.name;
- List<String> components = <String>[];
+ var name = field.name;
+ var components = <String>[];
components.add(parentName);
components.addAll(_split(name));
- String fieldConstantName = _fromComponents(components);
+ var fieldConstantName = _fromComponents(components);
constants.add(_Constant(fieldConstantName, "'$name'"));
});
}
diff --git a/pkg/analysis_server/tool/spec/from_html.dart b/pkg/analysis_server/tool/spec/from_html.dart
index ed90a6d..5496a9c 100644
--- a/pkg/analysis_server/tool/spec/from_html.dart
+++ b/pkg/analysis_server/tool/spec/from_html.dart
@@ -15,8 +15,7 @@
/// Read the API description from the file 'plugin_spec.html'. [pkgPath] is the
/// path to the current package.
Api readApi(String pkgPath) {
- ApiReader reader =
- ApiReader(join(pkgPath, 'tool', 'spec', 'spec_input.html'));
+ var reader = ApiReader(join(pkgPath, 'tool', 'spec', 'spec_input.html'));
return reader.readApi();
}
@@ -74,8 +73,8 @@
/// Child elements of <api> can occur in any order.
Api apiFromHtml(dom.Element html) {
Api api;
- List<String> versions = <String>[];
- List<Domain> domains = <Domain>[];
+ var versions = <String>[];
+ var domains = <Domain>[];
Types types;
Refactorings refactorings;
recurse(html, 'api', {
@@ -108,7 +107,7 @@
void checkAttributes(
dom.Element element, List<String> requiredAttributes, String context,
{List<String> optionalAttributes = const []}) {
- Set<String> attributesFound = <String>{};
+ var attributesFound = <String>{};
element.attributes.forEach((name, value) {
if (!requiredAttributes.contains(name) &&
!optionalAttributes.contains(name)) {
@@ -117,7 +116,7 @@
}
attributesFound.add(name);
});
- for (String expectedAttribute in requiredAttributes) {
+ for (var expectedAttribute in requiredAttributes) {
if (!attributesFound.contains(expectedAttribute)) {
throw Exception(
'$context: ${element.localName} must contain attribute $expectedAttribute');
@@ -144,13 +143,13 @@
/// Child elements can occur in any order.
Domain domainFromHtml(dom.Element html) {
checkName(html, 'domain');
- String name = html.attributes['name'];
- String context = name ?? 'domain';
- bool experimental = html.attributes['experimental'] == 'true';
+ var name = html.attributes['name'];
+ var context = name ?? 'domain';
+ var experimental = html.attributes['experimental'] == 'true';
checkAttributes(html, ['name'], context,
optionalAttributes: ['experimental']);
- List<Request> requests = <Request>[];
- List<Notification> notifications = <Notification>[];
+ var requests = <Request>[];
+ var notifications = <Notification>[];
recurse(html, context, {
'request': (dom.Element child) {
requests.add(requestFromHtml(child, context));
@@ -164,7 +163,7 @@
}
dom.Element getAncestor(dom.Element html, String name, String context) {
- dom.Element ancestor = html.parent;
+ var ancestor = html.parent;
while (ancestor != null) {
if (ancestor.localName == name) {
return ancestor;
@@ -188,13 +187,13 @@
///
/// Child elements can occur in any order.
Notification notificationFromHtml(dom.Element html, String context) {
- String domainName = getAncestor(html, 'domain', context).attributes['name'];
+ var domainName = getAncestor(html, 'domain', context).attributes['name'];
checkName(html, 'notification', context);
- String event = html.attributes['event'];
+ var event = html.attributes['event'];
context = '$context.${event ?? 'event'}';
checkAttributes(html, ['event'], context,
optionalAttributes: ['experimental']);
- bool experimental = html.attributes['experimental'] == 'true';
+ var experimental = html.attributes['experimental'] == 'true';
TypeObject params;
recurse(html, context, {
'params': (dom.Element child) {
@@ -208,7 +207,7 @@
/// Create a single of [TypeDecl] corresponding to the type defined inside the
/// given HTML element.
TypeDecl processContentsAsType(dom.Element html, String context) {
- List<TypeDecl> types = processContentsAsTypes(html, context);
+ var types = processContentsAsTypes(html, context);
if (types.length != 1) {
throw Exception('$context: Exactly one type must be specified');
}
@@ -243,7 +242,7 @@
/// TYPE <!-- zero or more -->
/// </union>
List<TypeDecl> processContentsAsTypes(dom.Element html, String context) {
- List<TypeDecl> types = <TypeDecl>[];
+ var types = <TypeDecl>[];
recurse(html, context, {
'object': (dom.Element child) {
types.add(typeObjectFromHtml(child, context));
@@ -287,7 +286,7 @@
},
'union': (dom.Element child) {
checkAttributes(child, ['field'], context);
- String field = child.attributes['field'];
+ var field = child.attributes['field'];
types.add(
TypeUnion(processContentsAsTypes(child, context), field, child));
}
@@ -297,21 +296,21 @@
/// Read the API description from file with the given [filePath].
Api readApi() {
- String htmlContents = File(filePath).readAsStringSync();
- dom.Document document = parser.parse(htmlContents);
- dom.Element htmlElement = document.children
+ var htmlContents = File(filePath).readAsStringSync();
+ var document = parser.parse(htmlContents);
+ var htmlElement = document.children
.singleWhere((element) => element.localName.toLowerCase() == 'html');
return apiFromHtml(htmlElement);
}
void recurse(dom.Element parent, String context,
Map<String, ElementProcessor> elementProcessors) {
- for (String key in elementProcessors.keys) {
+ for (var key in elementProcessors.keys) {
if (!specialElements.contains(key)) {
throw Exception('$context: $key is not a special element');
}
}
- for (dom.Node node in parent.nodes) {
+ for (var node in parent.nodes) {
if (node is dom.Element) {
if (elementProcessors.containsKey(node.localName)) {
elementProcessors[node.localName](node);
@@ -337,8 +336,8 @@
/// Child elements can occur in any order.
Refactoring refactoringFromHtml(dom.Element html) {
checkName(html, 'refactoring');
- String kind = html.attributes['kind'];
- String context = kind ?? 'refactoring';
+ var kind = html.attributes['kind'];
+ var context = kind ?? 'refactoring';
checkAttributes(html, ['kind'], context);
TypeObject feedback;
TypeObject options;
@@ -360,9 +359,9 @@
/// </refactorings>
Refactorings refactoringsFromHtml(dom.Element html) {
checkName(html, 'refactorings');
- String context = 'refactorings';
+ var context = 'refactorings';
checkAttributes(html, [], context);
- List<Refactoring> refactorings = <Refactoring>[];
+ var refactorings = <Refactoring>[];
recurse(html, context, {
'refactoring': (dom.Element child) {
refactorings.add(refactoringFromHtml(child));
@@ -385,14 +384,14 @@
///
/// Child elements can occur in any order.
Request requestFromHtml(dom.Element html, String context) {
- String domainName = getAncestor(html, 'domain', context).attributes['name'];
+ var domainName = getAncestor(html, 'domain', context).attributes['name'];
checkName(html, 'request', context);
- String method = html.attributes['method'];
+ var method = html.attributes['method'];
context = '$context.${method ?? 'method'}';
checkAttributes(html, ['method'], context,
optionalAttributes: ['experimental', 'deprecated']);
- bool experimental = html.attributes['experimental'] == 'true';
- bool deprecated = html.attributes['deprecated'] == 'true';
+ var experimental = html.attributes['experimental'] == 'true';
+ var deprecated = html.attributes['deprecated'] == 'true';
TypeObject params;
TypeObject result;
recurse(html, context, {
@@ -418,13 +417,13 @@
/// Child elements can occur in any order.
TypeDefinition typeDefinitionFromHtml(dom.Element html) {
checkName(html, 'type');
- String name = html.attributes['name'];
- String context = name ?? 'type';
+ var name = html.attributes['name'];
+ var context = name ?? 'type';
checkAttributes(html, ['name'], context,
optionalAttributes: ['experimental', 'deprecated']);
- TypeDecl type = processContentsAsType(html, context);
- bool experimental = html.attributes['experimental'] == 'true';
- bool deprecated = html.attributes['deprecated'] == 'true';
+ var type = processContentsAsType(html, context);
+ var experimental = html.attributes['experimental'] == 'true';
+ var deprecated = html.attributes['deprecated'] == 'true';
return TypeDefinition(name, type, html,
experimental: experimental, deprecated: deprecated);
}
@@ -433,7 +432,7 @@
TypeEnum typeEnumFromHtml(dom.Element html, String context) {
checkName(html, 'enum', context);
checkAttributes(html, [], context);
- List<TypeEnumValue> values = <TypeEnumValue>[];
+ var values = <TypeEnumValue>[];
recurse(html, context, {
'value': (dom.Element child) {
values.add(typeEnumValueFromHtml(child, context));
@@ -454,11 +453,11 @@
TypeEnumValue typeEnumValueFromHtml(dom.Element html, String context) {
checkName(html, 'value', context);
checkAttributes(html, [], context, optionalAttributes: ['deprecated']);
- bool deprecated = html.attributes['deprecated'] == 'true';
- List<String> values = <String>[];
+ var deprecated = html.attributes['deprecated'] == 'true';
+ var values = <String>[];
recurse(html, context, {
'code': (dom.Element child) {
- String text = innerText(child).trim();
+ var text = innerText(child).trim();
values.add(text);
}
});
@@ -483,7 +482,7 @@
/// Child elements can occur in any order.
TypeObjectField typeObjectFieldFromHtml(dom.Element html, String context) {
checkName(html, 'field', context);
- String name = html.attributes['name'];
+ var name = html.attributes['name'];
context = '$context.${name ?? 'field'}';
checkAttributes(html, ['name'], context,
optionalAttributes: [
@@ -492,10 +491,10 @@
'deprecated',
'experimental'
]);
- bool deprecated = html.attributes['deprecated'] == 'true';
- bool experimental = html.attributes['experimental'] == 'true';
- bool optional = false;
- String optionalString = html.attributes['optional'];
+ var deprecated = html.attributes['deprecated'] == 'true';
+ var experimental = html.attributes['experimental'] == 'true';
+ var optional = false;
+ var optionalString = html.attributes['optional'];
if (optionalString != null) {
switch (optionalString) {
case 'true':
@@ -509,8 +508,8 @@
'$context: field contains invalid "optional" attribute: "$optionalString"');
}
}
- String value = html.attributes['value'];
- TypeDecl type = processContentsAsType(html, context);
+ var value = html.attributes['value'];
+ var type = processContentsAsType(html, context);
return TypeObjectField(name, type, html,
optional: optional,
value: value,
@@ -521,13 +520,13 @@
/// Create a [TypeObject] from an HTML description.
TypeObject typeObjectFromHtml(dom.Element html, String context) {
checkAttributes(html, [], context, optionalAttributes: ['experimental']);
- List<TypeObjectField> fields = <TypeObjectField>[];
+ var fields = <TypeObjectField>[];
recurse(html, context, {
'field': (dom.Element child) {
fields.add(typeObjectFieldFromHtml(child, context));
}
});
- bool experimental = html.attributes['experimental'] == 'true';
+ var experimental = html.attributes['experimental'] == 'true';
return TypeObject(fields, html, experimental: experimental);
}
@@ -538,36 +537,36 @@
/// </types>
Types typesFromHtml(dom.Element html) {
checkName(html, 'types');
- String context = 'types';
+ var context = 'types';
checkAttributes(html, [], context);
- List<String> importUris = <String>[];
- Map<String, TypeDefinition> typeMap = <String, TypeDefinition>{};
- List<dom.Element> childElements = <dom.Element>[];
+ var importUris = <String>[];
+ var typeMap = <String, TypeDefinition>{};
+ var childElements = <dom.Element>[];
recurse(html, context, {
'include': (dom.Element child) {
- String importUri = child.attributes['import'];
+ var importUri = child.attributes['import'];
if (importUri != null) {
importUris.add(importUri);
}
- String relativePath = child.attributes['path'];
- String path = normalize(join(dirname(filePath), relativePath));
- ApiReader reader = ApiReader(path);
- Api api = reader.readApi();
- for (TypeDefinition typeDefinition in api.types) {
+ var relativePath = child.attributes['path'];
+ var path = normalize(join(dirname(filePath), relativePath));
+ var reader = ApiReader(path);
+ var api = reader.readApi();
+ for (var typeDefinition in api.types) {
typeDefinition.isExternal = true;
childElements.add(typeDefinition.html);
typeMap[typeDefinition.name] = typeDefinition;
}
},
'type': (dom.Element child) {
- TypeDefinition typeDefinition = typeDefinitionFromHtml(child);
+ var typeDefinition = typeDefinitionFromHtml(child);
typeMap[typeDefinition.name] = typeDefinition;
}
});
- for (dom.Element element in childElements) {
+ for (var element in childElements) {
html.append(element);
}
- Types types = Types(typeMap, html);
+ var types = Types(typeMap, html);
types.importUris.addAll(importUris);
return types;
}
diff --git a/pkg/analysis_server/tool/spec/generate_all.dart b/pkg/analysis_server/tool/spec/generate_all.dart
index b5a1c79..ac9eb91 100644
--- a/pkg/analysis_server/tool/spec/generate_all.dart
+++ b/pkg/analysis_server/tool/spec/generate_all.dart
@@ -19,14 +19,14 @@
/// Generate all targets.
void main() async {
- String script = Platform.script.toFilePath(windows: Platform.isWindows);
- String pkgPath = normalize(join(dirname(script), '..', '..'));
+ var script = Platform.script.toFilePath(windows: Platform.isWindows);
+ var pkgPath = normalize(join(dirname(script), '..', '..'));
await GeneratedContent.generateAll(pkgPath, allTargets);
}
/// Get a list of all generated targets.
List<GeneratedContent> get allTargets {
- List<GeneratedContent> targets = <GeneratedContent>[];
+ var targets = <GeneratedContent>[];
targets.add(codegen_analysis_server.target);
targets.add(codegen_dart_notification_handler.clientTarget());
targets.add(codegen_dart_protocol.clientTarget(false));
diff --git a/pkg/analysis_server/tool/spec/implied_types.dart b/pkg/analysis_server/tool/spec/implied_types.dart
index de106d0..44d89c2 100644
--- a/pkg/analysis_server/tool/spec/implied_types.dart
+++ b/pkg/analysis_server/tool/spec/implied_types.dart
@@ -8,7 +8,7 @@
import 'api.dart';
Map<String, ImpliedType> computeImpliedTypes(Api api) {
- _ImpliedTypesVisitor visitor = _ImpliedTypesVisitor(api);
+ var visitor = _ImpliedTypesVisitor(api);
visitor.visitApi();
return visitor.impliedTypes;
}
@@ -41,13 +41,13 @@
void storeType(String name, String nameSuffix, TypeDecl type, String kind,
ApiNode apiNode) {
- String humanReadableName = name;
- List<String> camelNameParts = name.split('.');
+ var humanReadableName = name;
+ var camelNameParts = name.split('.');
if (nameSuffix != null) {
humanReadableName += ' $nameSuffix';
camelNameParts.add(nameSuffix);
}
- String camelName = camelJoin(camelNameParts);
+ var camelName = camelJoin(camelNameParts);
impliedTypes[camelName] =
ImpliedType(camelName, humanReadableName, type, kind, apiNode);
}
@@ -60,7 +60,7 @@
@override
void visitRefactoring(Refactoring refactoring) {
- String camelKind = camelJoin(refactoring.kind.toLowerCase().split('_'));
+ var camelKind = camelJoin(refactoring.kind.toLowerCase().split('_'));
storeType(camelKind, 'feedback', refactoring.feedback,
'refactoringFeedback', refactoring);
storeType(camelKind, 'options', refactoring.options, 'refactoringOptions',
diff --git a/pkg/analysis_server/tool/spec/to_html.dart b/pkg/analysis_server/tool/spec/to_html.dart
index d8b823e..9ad321a 100644
--- a/pkg/analysis_server/tool/spec/to_html.dart
+++ b/pkg/analysis_server/tool/spec/to_html.dart
@@ -125,10 +125,10 @@
final GeneratedFile target =
GeneratedFile('doc/api.html', (String pkgPath) async {
- ToHtmlVisitor visitor = ToHtmlVisitor(readApi(pkgPath));
- dom.Document document = dom.Document();
+ var visitor = ToHtmlVisitor(readApi(pkgPath));
+ var document = dom.Document();
document.append(dom.DocumentType('html', null, null));
- for (dom.Node node in visitor.collectHtml(visitor.visitApi)) {
+ for (var node in visitor.collectHtml(visitor.visitApi)) {
document.append(node);
}
return document.outerHtml;
@@ -349,7 +349,7 @@
});
ul(() {
- for (Request request in domain.requests) {
+ for (var request in domain.requests) {
if (request.experimental) continue;
li(() {
@@ -372,7 +372,7 @@
link('types', () => write('\u2191'));
write(')');
});
- List<String> sortedTypes = types.toList();
+ var sortedTypes = types.toList();
sortedTypes.sort();
element('div', {'class': 'subindex'}, () {
element('ul', {}, () {
@@ -385,7 +385,7 @@
void javadocParams(TypeObject typeObject) {
if (typeObject != null) {
- for (TypeObjectField field in typeObject.fields) {
+ for (var field in typeObject.fields) {
hangingIndent(() {
write('@param ${field.name} ');
translateHtml(field.html, squashParagraphs: true);
@@ -402,9 +402,9 @@
/// If [typeForBolding] is supplied, then fields in this type are shown in
/// boldface.
void showType(String shortDesc, TypeDecl type, [TypeObject typeForBolding]) {
- Set<String> fieldsToBold = <String>{};
+ var fieldsToBold = <String>{};
if (typeForBolding != null) {
- for (TypeObjectField field in typeForBolding.fields) {
+ for (var field in typeForBolding.fields) {
fieldsToBold.add(field.name);
}
}
@@ -412,7 +412,7 @@
if (shortDesc != null) {
write('$shortDesc: ');
}
- TypeVisitor typeVisitor = TypeVisitor(api, fieldsToBold: fieldsToBold);
+ var typeVisitor = TypeVisitor(api, fieldsToBold: fieldsToBold);
addAll(typeVisitor.collectHtml(() {
typeVisitor.visitTypeDecl(type);
}));
@@ -422,7 +422,7 @@
/// Copy the contents of the given HTML element, translating the special
/// elements that define the API appropriately.
void translateHtml(dom.Element html, {bool squashParagraphs = false}) {
- for (dom.Node node in html.nodes) {
+ for (var node in html.nodes) {
if (node is dom.Element) {
if (squashParagraphs && node.localName == 'p') {
translateHtml(node, squashParagraphs: squashParagraphs);
@@ -472,7 +472,7 @@
}
}
} else if (node is dom.Text) {
- String text = node.text;
+ var text = node.text;
write(text);
}
}
@@ -480,8 +480,7 @@
@override
void visitApi() {
- Iterable<TypeDefinition> apiTypes =
- api.types.where((TypeDefinition td) => !td.experimental);
+ var apiTypes = api.types.where((TypeDefinition td) => !td.experimental);
definedTypes = apiTypes.map((TypeDefinition td) => td.name).toSet();
html(() {
@@ -591,7 +590,7 @@
: 'typeDefinition', () {
anchor('type_${typeDefinition.name}', () {
write('${typeDefinition.name}: ');
- TypeVisitor typeVisitor = TypeVisitor(api, short: true);
+ var typeVisitor = TypeVisitor(api, short: true);
addAll(typeVisitor.collectHtml(() {
typeVisitor.visitTypeDecl(typeDefinition.type);
}));
@@ -612,8 +611,8 @@
@override
void visitTypeEnumValue(TypeEnumValue typeEnumValue) {
- bool isDocumented = false;
- for (dom.Node node in typeEnumValue.html.nodes) {
+ var isDocumented = false;
+ for (var node in typeEnumValue.html.nodes) {
if ((node is dom.Element && node.localName != 'code') ||
(node is dom.Text && node.text.trim().isNotEmpty)) {
isDocumented = true;
@@ -665,7 +664,7 @@
write(' = ${json.encode(typeObjectField.value)}');
} else {
write(': ');
- TypeVisitor typeVisitor = TypeVisitor(api, short: true);
+ var typeVisitor = TypeVisitor(api, short: true);
addAll(typeVisitor.collectHtml(() {
typeVisitor.visitTypeDecl(typeObjectField.type);
}));
@@ -687,7 +686,7 @@
void visitTypes(Types types) {
translateHtml(types.html);
dl(() {
- List<TypeDefinition> sortedTypes = types.toList();
+ var sortedTypes = types.toList();
sortedTypes.sort((TypeDefinition first, TypeDefinition second) =>
first.name.compareTo(second.name));
sortedTypes.forEach(visitTypeDefinition);
@@ -724,7 +723,7 @@
}
writeln('enum {');
indent(() {
- for (TypeEnumValue value in typeEnum.values) {
+ for (var value in typeEnum.values) {
writeln(value.value);
}
});
@@ -755,7 +754,7 @@
}
writeln('{');
indent(() {
- for (TypeObjectField field in typeObject.fields) {
+ for (var field in typeObject.fields) {
write('"');
if (fieldsToBold != null && fieldsToBold.contains(field.name)) {
b(() {
@@ -784,7 +783,7 @@
@override
void visitTypeReference(TypeReference typeReference) {
- String displayName = typeReference.typeName;
+ var displayName = typeReference.typeName;
if (api.types.containsKey(typeReference.typeName)) {
link('type_${typeReference.typeName}', () {
write(displayName);
@@ -796,8 +795,8 @@
@override
void visitTypeUnion(TypeUnion typeUnion) {
- bool verticalBarNeeded = false;
- for (TypeDecl choice in typeUnion.choices) {
+ var verticalBarNeeded = false;
+ for (var choice in typeUnion.choices) {
if (verticalBarNeeded) {
write(' | ');
}
diff --git a/pkg/analysis_server_client/analysis_options.yaml b/pkg/analysis_server_client/analysis_options.yaml
index d7b19d7..fe1ff59 100644
--- a/pkg/analysis_server_client/analysis_options.yaml
+++ b/pkg/analysis_server_client/analysis_options.yaml
@@ -27,7 +27,7 @@
- library_prefixes
- no_duplicate_case_values
- null_closures
- #- omit_local_variable_types # 421
+ - omit_local_variable_types
- prefer_adjacent_string_concatenation
- prefer_collection_literals
- prefer_conditional_assignment
diff --git a/pkg/analysis_server_client/example/example.dart b/pkg/analysis_server_client/example/example.dart
index bc62713..41af85c 100644
--- a/pkg/analysis_server_client/example/example.dart
+++ b/pkg/analysis_server_client/example/example.dart
@@ -14,15 +14,15 @@
/// A simple application that uses the analysis server to analyze a package.
void main(List<String> args) async {
- String target = await parseArgs(args);
+ var target = await parseArgs(args);
print('Analyzing $target');
// Launch the server
- Server server = Server();
+ var server = Server();
await server.start();
// Connect to the server
- _Handler handler = _Handler(server);
+ var handler = _Handler(server);
server.listenToOutput(notificationProcessor: handler.handleEvent);
if (!await handler.serverConnected(timeLimit: const Duration(seconds: 15))) {
exit(1);
@@ -73,9 +73,9 @@
@override
void onAnalysisErrors(AnalysisErrorsParams params) {
- List<AnalysisError> errors = params.errors;
- bool first = true;
- for (AnalysisError error in errors) {
+ var errors = params.errors;
+ var first = true;
+ for (var error in errors) {
if (error.type.name == 'TODO') {
// Ignore these types of "errors"
continue;
@@ -84,7 +84,7 @@
first = false;
print('${params.file}:');
}
- Location loc = error.location;
+ var loc = error.location;
print(' ${error.message} • ${loc.startLine}:${loc.startColumn}');
++errorCount;
}
diff --git a/pkg/analysis_server_client/lib/handler/connection_handler.dart b/pkg/analysis_server_client/lib/handler/connection_handler.dart
index aada7f4..107b361 100644
--- a/pkg/analysis_server_client/lib/handler/connection_handler.dart
+++ b/pkg/analysis_server_client/lib/handler/connection_handler.dart
@@ -41,7 +41,7 @@
@override
void onServerConnected(ServerConnectedParams params) {
- Version version = Version.parse(params.version);
+ var version = Version.parse(params.version);
if (checkServerProtocolVersion(version)) {
_connected.complete(true);
} else {
@@ -59,7 +59,7 @@
/// Return a future that completes with a `bool` indicating whether
/// a connection was successfully established with the server.
Future<bool> serverConnected({Duration timeLimit}) {
- Future<bool> future = _connected.future;
+ var future = _connected.future;
if (timeLimit != null) {
future = future.timeout(timeLimit, onTimeout: () {
onFailedToConnect();
diff --git a/pkg/analysis_server_client/lib/handler/notification_handler.dart b/pkg/analysis_server_client/lib/handler/notification_handler.dart
index 07ee328e..2d8715a 100644
--- a/pkg/analysis_server_client/lib/handler/notification_handler.dart
+++ b/pkg/analysis_server_client/lib/handler/notification_handler.dart
@@ -16,8 +16,8 @@
/// Clients may mix-in this class, but may not implement it.
mixin NotificationHandler {
void handleEvent(Notification notification) {
- Map<String, Object> params = notification.params;
- ResponseDecoder decoder = ResponseDecoder(null);
+ var params = notification.params;
+ var decoder = ResponseDecoder(null);
switch (notification.event) {
case ANALYSIS_NOTIFICATION_ANALYZED_FILES:
onAnalysisAnalyzedFiles(
diff --git a/pkg/analysis_server_client/lib/protocol.dart b/pkg/analysis_server_client/lib/protocol.dart
index ca508e8..7a1059b 100644
--- a/pkg/analysis_server_client/lib/protocol.dart
+++ b/pkg/analysis_server_client/lib/protocol.dart
@@ -5,6 +5,6 @@
export 'package:analysis_server_client/src/protocol/protocol_base.dart';
export 'package:analysis_server_client/src/protocol/protocol_common.dart';
export 'package:analysis_server_client/src/protocol/protocol_constants.dart';
+export 'package:analysis_server_client/src/protocol/protocol_generated.dart';
export 'package:analysis_server_client/src/protocol/protocol_internal.dart'
show ResponseDecoder;
-export 'package:analysis_server_client/src/protocol/protocol_generated.dart';
diff --git a/pkg/analysis_server_client/lib/server.dart b/pkg/analysis_server_client/lib/server.dart
index f02c204..d11442c 100644
--- a/pkg/analysis_server_client/lib/server.dart
+++ b/pkg/analysis_server_client/lib/server.dart
@@ -6,10 +6,11 @@
import 'dart:convert';
import 'dart:io';
-import 'package:analysis_server_client/src/server_base.dart';
import 'package:analysis_server_client/listener/server_listener.dart';
import 'package:analysis_server_client/protocol.dart';
+import 'package:analysis_server_client/src/server_base.dart';
import 'package:path/path.dart';
+
export 'package:analysis_server_client/src/server_base.dart'
show NotificationProcessor;
@@ -100,7 +101,7 @@
if (_process != null) {
throw Exception('Process already started');
}
- String dartBinary = Platform.executable;
+ var dartBinary = Platform.executable;
// The integration tests run 3x faster when run from snapshots
// (you need to run test.py with --use-sdk).
@@ -116,7 +117,7 @@
}
}
- List<String> arguments = [];
+ var arguments = <String>[];
//
// Add VM arguments.
//
diff --git a/pkg/analysis_server_client/lib/src/protocol/protocol_base.dart b/pkg/analysis_server_client/lib/src/protocol/protocol_base.dart
index af02e5c..8fa072d 100644
--- a/pkg/analysis_server_client/lib/src/protocol/protocol_base.dart
+++ b/pkg/analysis_server_client/lib/src/protocol/protocol_base.dart
@@ -50,7 +50,7 @@
/// Return a table representing the structure of the Json object that will be
/// sent to the client to represent this response.
Map<String, Object> toJson() {
- Map<String, Object> jsonObject = {};
+ var jsonObject = <String, Object>{};
jsonObject[EVENT] = event;
if (params != null) {
jsonObject[PARAMS] = params;
@@ -179,7 +179,7 @@
/// Return a table representing the structure of the Json object that will be
/// sent to the client to represent this response.
Map<String, Object> toJson() {
- Map<String, Object> jsonObject = <String, Object>{};
+ var jsonObject = <String, Object>{};
jsonObject[ID] = id;
jsonObject[METHOD] = method;
if (params.isNotEmpty) {
@@ -198,11 +198,11 @@
if (second == null) {
return false;
}
- int length = first.length;
+ var length = first.length;
if (length != second.length) {
return false;
}
- for (int i = 0; i < length; i++) {
+ for (var i = 0; i < length; i++) {
if (!_equalObjects(first[i], second[i])) {
return false;
}
@@ -486,7 +486,7 @@
/// Initialize a newly created instance to represent the SERVER_ERROR error
/// condition.
factory Response.serverError(Request request, exception, stackTrace) {
- RequestError error =
+ var error =
RequestError(RequestErrorCode.SERVER_ERROR, exception.toString());
if (stackTrace != null) {
error.stackTrace = stackTrace.toString();
@@ -524,7 +524,7 @@
/// Return a table representing the structure of the Json object that will be
/// sent to the client to represent this response.
Map<String, Object> toJson() {
- Map<String, Object> jsonObject = <String, Object>{};
+ var jsonObject = <String, Object>{};
jsonObject[ID] = id;
if (error != null) {
jsonObject[ERROR] = error.toJson();
diff --git a/pkg/analysis_server_client/lib/src/protocol/protocol_common.dart b/pkg/analysis_server_client/lib/src/protocol/protocol_common.dart
index 6e80c79..17afcd9 100644
--- a/pkg/analysis_server_client/lib/src/protocol/protocol_common.dart
+++ b/pkg/analysis_server_client/lib/src/protocol/protocol_common.dart
@@ -61,7 +61,7 @@
@override
Map<String, dynamic> toJson() {
- Map<String, dynamic> result = {};
+ var result = <String, dynamic>{};
result['type'] = 'add';
result['content'] = content;
return result;
@@ -80,7 +80,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, 704418402);
hash = JenkinsSmiHash.combine(hash, content.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -264,7 +264,7 @@
@override
Map<String, dynamic> toJson() {
- Map<String, dynamic> result = {};
+ var result = <String, dynamic>{};
result['severity'] = severity.toJson();
result['type'] = type.toJson();
result['location'] = location.toJson();
@@ -298,7 +298,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, severity.hashCode);
hash = JenkinsSmiHash.combine(hash, type.hashCode);
hash = JenkinsSmiHash.combine(hash, location.hashCode);
@@ -511,7 +511,7 @@
@override
Map<String, dynamic> toJson() {
- Map<String, dynamic> result = {};
+ var result = <String, dynamic>{};
result['type'] = 'change';
result['edits'] = edits.map((SourceEdit value) => value.toJson()).toList();
return result;
@@ -531,7 +531,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, 873118866);
hash = JenkinsSmiHash.combine(hash, edits.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -1055,7 +1055,7 @@
@override
Map<String, dynamic> toJson() {
- Map<String, dynamic> result = {};
+ var result = <String, dynamic>{};
result['kind'] = kind.toJson();
result['relevance'] = relevance;
result['completion'] = completion;
@@ -1148,7 +1148,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
hash = JenkinsSmiHash.combine(hash, relevance.hashCode);
hash = JenkinsSmiHash.combine(hash, completion.hashCode);
@@ -1324,7 +1324,7 @@
bool isStatic = false,
bool isPrivate = false,
bool isDeprecated = false}) {
- int flags = 0;
+ var flags = 0;
if (isAbstract) flags |= FLAG_ABSTRACT;
if (isConst) flags |= FLAG_CONST;
if (isFinal) flags |= FLAG_FINAL;
@@ -1513,7 +1513,7 @@
@override
Map<String, dynamic> toJson() {
- Map<String, dynamic> result = {};
+ var result = <String, dynamic>{};
result['kind'] = kind.toJson();
result['name'] = name;
if (location != null) {
@@ -1551,7 +1551,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
hash = JenkinsSmiHash.combine(hash, name.hashCode);
hash = JenkinsSmiHash.combine(hash, location.hashCode);
@@ -1932,7 +1932,7 @@
@override
Map<String, dynamic> toJson() {
- Map<String, dynamic> result = {};
+ var result = <String, dynamic>{};
result['kind'] = kind.toJson();
result['offset'] = offset;
result['length'] = length;
@@ -1954,7 +1954,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
hash = JenkinsSmiHash.combine(hash, offset.hashCode);
hash = JenkinsSmiHash.combine(hash, length.hashCode);
@@ -2042,7 +2042,7 @@
@override
Map<String, dynamic> toJson() {
- Map<String, dynamic> result = {};
+ var result = <String, dynamic>{};
result['type'] = type.toJson();
result['offset'] = offset;
result['length'] = length;
@@ -2064,7 +2064,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, type.hashCode);
hash = JenkinsSmiHash.combine(hash, offset.hashCode);
hash = JenkinsSmiHash.combine(hash, length.hashCode);
@@ -2776,7 +2776,7 @@
@override
Map<String, dynamic> toJson() {
- Map<String, dynamic> result = {};
+ var result = <String, dynamic>{};
result['source'] = source.toJson();
if (kind != null) {
result['kind'] = kind;
@@ -2808,7 +2808,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, source.hashCode);
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
hash = JenkinsSmiHash.combine(hash, target.hashCode);
@@ -2948,7 +2948,7 @@
@override
Map<String, dynamic> toJson() {
- Map<String, dynamic> result = {};
+ var result = <String, dynamic>{};
result['signature'] = signature;
result['corpus'] = corpus;
result['root'] = root;
@@ -2974,7 +2974,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, signature.hashCode);
hash = JenkinsSmiHash.combine(hash, corpus.hashCode);
hash = JenkinsSmiHash.combine(hash, root.hashCode);
@@ -3077,7 +3077,7 @@
@override
Map<String, dynamic> toJson() {
- Map<String, dynamic> result = {};
+ var result = <String, dynamic>{};
result['positions'] =
positions.map((Position value) => value.toJson()).toList();
result['length'] = length;
@@ -3115,7 +3115,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, positions.hashCode);
hash = JenkinsSmiHash.combine(hash, length.hashCode);
hash = JenkinsSmiHash.combine(hash, suggestions.hashCode);
@@ -3184,7 +3184,7 @@
@override
Map<String, dynamic> toJson() {
- Map<String, dynamic> result = {};
+ var result = <String, dynamic>{};
result['value'] = value;
result['kind'] = kind.toJson();
return result;
@@ -3203,7 +3203,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, value.hashCode);
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -3398,7 +3398,7 @@
@override
Map<String, dynamic> toJson() {
- Map<String, dynamic> result = {};
+ var result = <String, dynamic>{};
result['file'] = file;
result['offset'] = offset;
result['length'] = length;
@@ -3424,7 +3424,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, file.hashCode);
hash = JenkinsSmiHash.combine(hash, offset.hashCode);
hash = JenkinsSmiHash.combine(hash, length.hashCode);
@@ -3518,7 +3518,7 @@
@override
Map<String, dynamic> toJson() {
- Map<String, dynamic> result = {};
+ var result = <String, dynamic>{};
result['offset'] = offset;
result['length'] = length;
result['targets'] = targets;
@@ -3540,7 +3540,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, offset.hashCode);
hash = JenkinsSmiHash.combine(hash, length.hashCode);
hash = JenkinsSmiHash.combine(hash, targets.hashCode);
@@ -3696,7 +3696,7 @@
@override
Map<String, dynamic> toJson() {
- Map<String, dynamic> result = {};
+ var result = <String, dynamic>{};
result['kind'] = kind.toJson();
result['fileIndex'] = fileIndex;
result['offset'] = offset;
@@ -3724,7 +3724,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
hash = JenkinsSmiHash.combine(hash, fileIndex.hashCode);
hash = JenkinsSmiHash.combine(hash, offset.hashCode);
@@ -3816,7 +3816,7 @@
@override
Map<String, dynamic> toJson() {
- Map<String, dynamic> result = {};
+ var result = <String, dynamic>{};
result['element'] = element.toJson();
result['offsets'] = offsets;
result['length'] = length;
@@ -3838,7 +3838,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, element.hashCode);
hash = JenkinsSmiHash.combine(hash, offsets.hashCode);
hash = JenkinsSmiHash.combine(hash, length.hashCode);
@@ -3999,7 +3999,7 @@
@override
Map<String, dynamic> toJson() {
- Map<String, dynamic> result = {};
+ var result = <String, dynamic>{};
result['element'] = element.toJson();
result['offset'] = offset;
result['length'] = length;
@@ -4030,7 +4030,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, element.hashCode);
hash = JenkinsSmiHash.combine(hash, offset.hashCode);
hash = JenkinsSmiHash.combine(hash, length.hashCode);
@@ -4141,7 +4141,7 @@
@override
Map<String, dynamic> toJson() {
- Map<String, dynamic> result = {};
+ var result = <String, dynamic>{};
result['kind'] = kind.toJson();
result['name'] = name;
result['type'] = type;
@@ -4167,7 +4167,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
hash = JenkinsSmiHash.combine(hash, name.hashCode);
hash = JenkinsSmiHash.combine(hash, type.hashCode);
@@ -4297,7 +4297,7 @@
@override
Map<String, dynamic> toJson() {
- Map<String, dynamic> result = {};
+ var result = <String, dynamic>{};
result['file'] = file;
result['offset'] = offset;
return result;
@@ -4316,7 +4316,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, file.hashCode);
hash = JenkinsSmiHash.combine(hash, offset.hashCode);
return JenkinsSmiHash.finish(hash);
@@ -4548,7 +4548,7 @@
@override
Map<String, dynamic> toJson() {
- Map<String, dynamic> result = {};
+ var result = <String, dynamic>{};
if (id != null) {
result['id'] = id;
}
@@ -4578,7 +4578,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, id.hashCode);
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
hash = JenkinsSmiHash.combine(hash, type.hashCode);
@@ -4731,7 +4731,7 @@
@override
Map<String, dynamic> toJson() {
- Map<String, dynamic> result = {};
+ var result = <String, dynamic>{};
result['severity'] = severity.toJson();
result['message'] = message;
if (location != null) {
@@ -4755,7 +4755,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, severity.hashCode);
hash = JenkinsSmiHash.combine(hash, message.hashCode);
hash = JenkinsSmiHash.combine(hash, location.hashCode);
@@ -4874,7 +4874,7 @@
@override
Map<String, dynamic> toJson() {
- Map<String, dynamic> result = {};
+ var result = <String, dynamic>{};
result['type'] = 'remove';
return result;
}
@@ -4892,7 +4892,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, 114870849);
return JenkinsSmiHash.finish(hash);
}
@@ -5039,7 +5039,7 @@
@override
Map<String, dynamic> toJson() {
- Map<String, dynamic> result = {};
+ var result = <String, dynamic>{};
result['message'] = message;
result['edits'] =
edits.map((SourceFileEdit value) => value.toJson()).toList();
@@ -5091,7 +5091,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, message.hashCode);
hash = JenkinsSmiHash.combine(hash, edits.hashCode);
hash = JenkinsSmiHash.combine(hash, linkedEditGroups.hashCode);
@@ -5219,7 +5219,7 @@
@override
Map<String, dynamic> toJson() {
- Map<String, dynamic> result = {};
+ var result = <String, dynamic>{};
result['offset'] = offset;
result['length'] = length;
result['replacement'] = replacement;
@@ -5248,7 +5248,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, offset.hashCode);
hash = JenkinsSmiHash.combine(hash, length.hashCode);
hash = JenkinsSmiHash.combine(hash, replacement.hashCode);
@@ -5353,7 +5353,7 @@
@override
Map<String, dynamic> toJson() {
- Map<String, dynamic> result = {};
+ var result = <String, dynamic>{};
result['file'] = file;
result['fileStamp'] = fileStamp;
result['edits'] = edits.map((SourceEdit value) => value.toJson()).toList();
@@ -5381,7 +5381,7 @@
@override
int get hashCode {
- int hash = 0;
+ var hash = 0;
hash = JenkinsSmiHash.combine(hash, file.hashCode);
hash = JenkinsSmiHash.combine(hash, fileStamp.hashCode);
hash = JenkinsSmiHash.combine(hash, edits.hashCode);
diff --git a/pkg/analysis_server_client/lib/src/protocol/protocol_internal.dart b/pkg/analysis_server_client/lib/src/protocol/protocol_internal.dart
index c3367bb..e35a40d 100644
--- a/pkg/analysis_server_client/lib/src/protocol/protocol_internal.dart
+++ b/pkg/analysis_server_client/lib/src/protocol/protocol_internal.dart
@@ -20,8 +20,8 @@
/// Adds the given [sourceEdit] to the list in [sourceFileEdit].
void addEditForSource(SourceFileEdit sourceFileEdit, SourceEdit sourceEdit) {
- List<SourceEdit> edits = sourceFileEdit.edits;
- int index = 0;
+ var edits = sourceFileEdit.edits;
+ var index = 0;
while (index < edits.length && edits[index].offset > sourceEdit.offset) {
index++;
}
@@ -31,7 +31,7 @@
/// Adds [edit] to the [FileEdit] for the given [file].
void addEditToSourceChange(
SourceChange change, String file, int fileStamp, SourceEdit edit) {
- SourceFileEdit fileEdit = change.getFileEdit(file);
+ var fileEdit = change.getFileEdit(file);
if (fileEdit == null) {
fileEdit = SourceFileEdit(file, fileStamp);
change.addFileEdit(fileEdit);
@@ -60,7 +60,7 @@
/// Returns the [FileEdit] for the given [file], maybe `null`.
SourceFileEdit getChangeFileEdit(SourceChange change, String file) {
- for (SourceFileEdit fileEdit in change.edits) {
+ for (var fileEdit in change.edits) {
if (fileEdit.file == file) {
return fileEdit;
}
@@ -81,7 +81,7 @@
if (listA.length != listB.length) {
return false;
}
- for (int i = 0; i < listA.length; i++) {
+ for (var i = 0; i < listA.length; i++) {
if (!itemEqual(listA[i], listB[i])) {
return false;
}
@@ -161,7 +161,7 @@
/// Create a [RefactoringFeedback] corresponding the given [kind].
RefactoringFeedback refactoringFeedbackFromJson(
JsonDecoder jsonDecoder, String jsonPath, Object json, Map feedbackJson) {
- RefactoringKind kind = jsonDecoder.refactoringKind;
+ var kind = jsonDecoder.refactoringKind;
if (kind == RefactoringKind.EXTRACT_LOCAL_VARIABLE) {
return ExtractLocalVariableFeedback.fromJson(jsonDecoder, jsonPath, json);
}
@@ -248,7 +248,7 @@
} else if (json is int) {
return json.toDouble();
} else if (json is String) {
- double value = double.tryParse(json);
+ var value = double.tryParse(json);
if (value == null) {
throw mismatch(jsonPath, 'double', json);
}
@@ -263,7 +263,7 @@
if (json is int) {
return json;
} else if (json is String) {
- int value = int.tryParse(json);
+ var value = int.tryParse(json);
if (value == null) {
throw mismatch(jsonPath, 'int', json);
}
@@ -281,8 +281,8 @@
if (json == null) {
return <E>[];
} else if (json is List) {
- List<E> result = <E>[];
- for (int i = 0; i < json.length; i++) {
+ var result = <E>[];
+ for (var i = 0; i < json.length; i++) {
result.add(decoder('$jsonPath[$i]', json[i]));
}
return result;
@@ -299,7 +299,7 @@
if (jsonData == null) {
return {};
} else if (jsonData is Map) {
- Map<K, V> result = <K, V>{};
+ var result = <K, V>{};
jsonData.forEach((key, value) {
K decodedKey;
if (keyDecoder != null) {
@@ -338,7 +338,7 @@
throw missingKey(jsonPath, field);
}
var disambiguatorPath = '$jsonPath[${json.encode(field)}]';
- String disambiguator = decodeString(disambiguatorPath, jsonData[field]);
+ var disambiguator = decodeString(disambiguatorPath, jsonData[field]);
if (!decoders.containsKey(disambiguator)) {
throw mismatch(
disambiguatorPath, 'One of: ${decoders.keys.toList()}', jsonData);
@@ -374,7 +374,7 @@
@override
dynamic mismatch(String jsonPath, String expected, [Object actual]) {
- StringBuffer buffer = StringBuffer();
+ var buffer = StringBuffer();
buffer.write('Expected to be ');
buffer.write(expected);
if (actual != null) {
@@ -409,7 +409,7 @@
@override
dynamic mismatch(String jsonPath, String expected, [Object actual]) {
- StringBuffer buffer = StringBuffer();
+ var buffer = StringBuffer();
buffer.write('Expected ');
buffer.write(expected);
if (actual != null) {
diff --git a/pkg/analysis_server_client/lib/src/protocol/protocol_util.dart b/pkg/analysis_server_client/lib/src/protocol/protocol_util.dart
index a52f01f..02e8c75 100644
--- a/pkg/analysis_server_client/lib/src/protocol/protocol_util.dart
+++ b/pkg/analysis_server_client/lib/src/protocol/protocol_util.dart
@@ -17,6 +17,17 @@
/// same operations as the performance critical variant, but allocates an extra
/// object.
class JenkinsSmiHash {
+ int _hash = 0;
+
+ /// Finalizes the hash and return the resulting hashcode.
+ @override
+ int get hashCode => finish(_hash);
+
+ /// Accumulates the object [o] into the hash.
+ void add(Object o) {
+ _hash = combine(_hash, o.hashCode);
+ }
+
/// Accumulates the hash code [value] into the running hash [hash].
static int combine(int hash, int value) {
hash = 0x1fffffff & (hash + value);
@@ -41,15 +52,4 @@
/// Combines together four hash codes.
static int hash4(int a, int b, int c, int d) =>
finish(combine(combine(combine(combine(0, a), b), c), d));
-
- int _hash = 0;
-
- /// Accumulates the object [o] into the hash.
- void add(Object o) {
- _hash = combine(_hash, o.hashCode);
- }
-
- /// Finalizes the hash and return the resulting hashcode.
- @override
- int get hashCode => finish(_hash);
}
diff --git a/pkg/analysis_server_client/lib/src/server_base.dart b/pkg/analysis_server_client/lib/src/server_base.dart
index bb1e02e..39e9c1d 100644
--- a/pkg/analysis_server_client/lib/src/server_base.dart
+++ b/pkg/analysis_server_client/lib/src/server_base.dart
@@ -9,12 +9,6 @@
import 'package:analysis_server_client/listener/server_listener.dart';
import 'package:analysis_server_client/protocol.dart';
-/// Type of callbacks used to process notifications.
-typedef NotificationProcessor = void Function(Notification notification);
-
-/// A function via which data can be sent to a started server.
-typedef CommandSender = void Function(List<int> utf8bytes);
-
///
/// Add server arguments.
///
@@ -29,7 +23,7 @@
bool suppressAnalytics,
bool useAnalysisHighlight2 = false,
}) {
- List<String> arguments = [];
+ var arguments = <String>[];
if (clientId != null) {
arguments.add('--client-id');
@@ -58,6 +52,12 @@
return arguments;
}
+/// A function via which data can be sent to a started server.
+typedef CommandSender = void Function(List<int> utf8bytes);
+
+/// Type of callbacks used to process notifications.
+typedef NotificationProcessor = void Function(Notification notification);
+
/// Implementations of the class [ServerBase] manage an analysis server,
/// and facilitate communication to and from the server.
///
@@ -74,16 +74,26 @@
/// about interactions with the server.
final ServerListener _listener;
- ServerListener get listener => _listener;
+ /// Commands that have been sent to the server but not yet acknowledged,
+ /// and the [Completer] objects which should be completed
+ /// when acknowledgement is received.
+ final _pendingCommands = <String, Completer<Map<String, dynamic>>>{};
ServerBase({ServerListener listener, bool stdioPassthrough = false})
: _listener = listener,
_stdioPassthrough = stdioPassthrough;
- /// Commands that have been sent to the server but not yet acknowledged,
- /// and the [Completer] objects which should be completed
- /// when acknowledgement is received.
- final _pendingCommands = <String, Completer<Map<String, dynamic>>>{};
+ ServerListener get listener => _listener;
+
+ /// If the implementation of [ServerBase] captures an error stream,
+ /// it can use this to forward the errors to [listener] and [stderr] if
+ /// appropriate.
+ void errorProcessor(
+ String line, NotificationProcessor notificationProcessor) {
+ if (_stdioPassthrough) stderr.writeln(line);
+ var trimmedLine = line.trim();
+ listener?.errorMessage(trimmedLine);
+ }
/// Force kill the server. Returns a future that completes when the server
/// stops.
@@ -93,45 +103,6 @@
/// and deliver notifications to [notificationProcessor].
void listenToOutput({NotificationProcessor notificationProcessor});
- /// Send a command to the server. An 'id' will be automatically assigned.
- /// The returned [Future] will be completed when the server acknowledges
- /// the command with a response.
- /// If the server acknowledges the command with a normal (non-error) response,
- /// the future will be completed with the 'result' field from the response.
- /// If the server acknowledges the command with an error response,
- /// the future will be completed with an error.
- Future<Map<String, dynamic>> send(String method, Map<String, dynamic> params);
-
- /// Encodes a request for transmission and sends it as a utf8 encoded byte
- /// string with [sendWith].
- Future<Map<String, dynamic>> sendCommandWith(
- String method, Map<String, dynamic> params, CommandSender sendWith) {
- String id = '${_nextId++}';
- Map<String, dynamic> command = <String, dynamic>{
- Request.ID: id,
- Request.METHOD: method
- };
- if (params != null) {
- command[Request.PARAMS] = params;
- }
- final completer = Completer<Map<String, dynamic>>();
- _pendingCommands[id] = completer;
- String line = json.encode(command);
- listener?.requestSent(line);
- sendWith(utf8.encoder.convert('$line\n'));
- return completer.future;
- }
-
- /// If the implementation of [ServerBase] captures an error stream,
- /// it can use this to forward the errors to [listener] and [stderr] if
- /// appropriate.
- void errorProcessor(
- String line, NotificationProcessor notificationProcessor) {
- if (_stdioPassthrough) stderr.writeln(line);
- String trimmedLine = line.trim();
- listener?.errorMessage(trimmedLine);
- }
-
/// Handle a (possibly) json encoded object, completing the [Completer] in
/// [_pendingCommands] corresponding to the response. Reports problems in
/// decoding or message synchronization using [listener], and replicates
@@ -139,7 +110,7 @@
void outputProcessor(
String line, NotificationProcessor notificationProcessor) {
if (_stdioPassthrough) stdout.writeln(line);
- String trimmedLine = line.trim();
+ var trimmedLine = line.trim();
// Guard against lines like:
// {"event":"server.connected","params":{...}}Observatory listening on ...
@@ -189,6 +160,32 @@
}
}
+ /// Send a command to the server. An 'id' will be automatically assigned.
+ /// The returned [Future] will be completed when the server acknowledges
+ /// the command with a response.
+ /// If the server acknowledges the command with a normal (non-error) response,
+ /// the future will be completed with the 'result' field from the response.
+ /// If the server acknowledges the command with an error response,
+ /// the future will be completed with an error.
+ Future<Map<String, dynamic>> send(String method, Map<String, dynamic> params);
+
+ /// Encodes a request for transmission and sends it as a utf8 encoded byte
+ /// string with [sendWith].
+ Future<Map<String, dynamic>> sendCommandWith(
+ String method, Map<String, dynamic> params, CommandSender sendWith) {
+ var id = '${_nextId++}';
+ var command = <String, dynamic>{Request.ID: id, Request.METHOD: method};
+ if (params != null) {
+ command[Request.PARAMS] = params;
+ }
+ final completer = Completer<Map<String, dynamic>>();
+ _pendingCommands[id] = completer;
+ var line = json.encode(command);
+ listener?.requestSent(line);
+ sendWith(utf8.encoder.convert('$line\n'));
+ return completer.future;
+ }
+
/// Start the server. The returned future completes when the server
/// is started and it is valid to call [listenToOutput].
Future start({
diff --git a/pkg/analysis_server_client/test/all.dart b/pkg/analysis_server_client/test/all.dart
index a09450b..bd97ea7 100644
--- a/pkg/analysis_server_client/test/all.dart
+++ b/pkg/analysis_server_client/test/all.dart
@@ -2,10 +2,12 @@
// 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.
-import 'live_test.dart' as live_test;
-import 'server_test.dart' as server_test;
+import 'live_test.dart' as live;
+import 'server_test.dart' as server;
+import 'verify_sorted_test.dart' as verify_sorted;
void main() {
- server_test.main();
- live_test.main();
+ live.main();
+ server.main();
+ verify_sorted.main();
}
diff --git a/pkg/analysis_server_client/test/live_test.dart b/pkg/analysis_server_client/test/live_test.dart
index 64a3124..e9ed329 100644
--- a/pkg/analysis_server_client/test/live_test.dart
+++ b/pkg/analysis_server_client/test/live_test.dart
@@ -14,14 +14,14 @@
final server = Server(listener: _debug ? TestListener() : null);
await server.start(clientId: 'test', suppressAnalytics: true);
- TestHandler handler = TestHandler(server);
+ var handler = TestHandler(server);
server.listenToOutput(notificationProcessor: handler.handleEvent);
if (!await handler.serverConnected(
timeLimit: const Duration(seconds: 15))) {
fail('failed to connect to server');
}
- Map<String, dynamic> json = await server.send(
+ var json = await server.send(
SERVER_REQUEST_GET_VERSION, ServerGetVersionParams().toJson());
final result =
ServerGetVersionResult.fromJson(ResponseDecoder(null), 'result', json);
diff --git a/pkg/analysis_server_client/test/server_test.dart b/pkg/analysis_server_client/test/server_test.dart
index 308a4c8..2442e5b 100644
--- a/pkg/analysis_server_client/test/server_test.dart
+++ b/pkg/analysis_server_client/test/server_test.dart
@@ -74,7 +74,7 @@
process.stderr = _noMessage();
// ignore: unawaited_futures
process.mockin.controller.stream.first.then((_) {
- String encoded = json.encode({'id': '0'});
+ var encoded = json.encode({'id': '0'});
mockout.add(utf8.encoder.convert('$encoded\n'));
});
process.exitCode = Future.value(0);
@@ -165,7 +165,7 @@
@override
bool kill([ProcessSignal signal = ProcessSignal.sigterm]) {
- bool wasKilled = killed;
+ var wasKilled = killed;
killed = true;
return !wasKilled;
}
diff --git a/pkg/analysis_server_client/test/utils/package_root.dart b/pkg/analysis_server_client/test/utils/package_root.dart
new file mode 100644
index 0000000..e8befb2
--- /dev/null
+++ b/pkg/analysis_server_client/test/utils/package_root.dart
@@ -0,0 +1,29 @@
+// Copyright (c) 2017, 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.
+
+import 'dart:io';
+
+import 'package:path/path.dart' as pathos;
+
+/// Returns a path to the directory containing source code for packages such as
+/// kernel, front_end, and analyzer.
+String get packageRoot {
+ // If the package root directory is specified on the command line using
+ // -DpkgRoot=..., use it.
+ const pkgRootVar =
+ bool.hasEnvironment('pkgRoot') ? String.fromEnvironment('pkgRoot') : null;
+ if (pkgRootVar != null) {
+ var path = pathos.join(Directory.current.path, pkgRootVar);
+ if (!path.endsWith(pathos.separator)) path += pathos.separator;
+ return path;
+ }
+ // Otherwise try to guess based on the script path.
+ var scriptPath = pathos.fromUri(Platform.script);
+ var parts = pathos.split(scriptPath);
+ var pkgIndex = parts.indexOf('pkg');
+ if (pkgIndex != -1) {
+ return pathos.joinAll(parts.sublist(0, pkgIndex + 1)) + pathos.separator;
+ }
+ throw StateError('Unable to find sdk/pkg/ in $scriptPath');
+}
diff --git a/pkg/analysis_server_client/test/verify_sorted_test.dart b/pkg/analysis_server_client/test/verify_sorted_test.dart
new file mode 100644
index 0000000..88f936f
--- /dev/null
+++ b/pkg/analysis_server_client/test/verify_sorted_test.dart
@@ -0,0 +1,79 @@
+// Copyright (c) 2019, 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.
+
+import 'dart:io';
+
+import 'package:analysis_server/src/services/correction/sort_members.dart';
+import 'package:analyzer/dart/analysis/analysis_context_collection.dart';
+import 'package:analyzer/dart/analysis/results.dart';
+import 'package:analyzer/dart/analysis/session.dart';
+import 'package:analyzer/file_system/file_system.dart';
+import 'package:analyzer/file_system/physical_file_system.dart';
+import 'package:test/test.dart';
+
+import 'utils/package_root.dart';
+
+void main() {
+ var provider = PhysicalResourceProvider.INSTANCE;
+ var normalizedRoot = provider.pathContext.normalize(packageRoot);
+ var packagePath =
+ provider.pathContext.join(normalizedRoot, 'analysis_server_client');
+ // TODO(brianwilkerson) Fix the generator to sort the generated files and
+ // remove these exclusions.
+ var generatedFilePaths = [
+ provider.pathContext
+ .join(packagePath, 'lib', 'src', 'protocol', 'protocol_common.dart'),
+ provider.pathContext
+ .join(packagePath, 'lib', 'src', 'protocol', 'protocol_constants.dart'),
+ provider.pathContext
+ .join(packagePath, 'lib', 'src', 'protocol', 'protocol_generated.dart'),
+ ];
+
+ var collection = AnalysisContextCollection(
+ includedPaths: <String>[packagePath],
+ excludedPaths: generatedFilePaths,
+ resourceProvider: provider);
+ var contexts = collection.contexts;
+ if (contexts.length != 1) {
+ fail('The directory $packagePath contains multiple analysis contexts.');
+ }
+
+ buildTestsIn(contexts[0].currentSession, packagePath, generatedFilePaths,
+ provider.getFolder(packagePath));
+}
+
+void buildTestsIn(AnalysisSession session, String testDirPath,
+ List<String> generatedFilePaths, Folder directory) {
+ var pathContext = session.resourceProvider.pathContext;
+ var children = directory.getChildren();
+ children.sort((first, second) => first.shortName.compareTo(second.shortName));
+ for (var child in children) {
+ if (child is Folder) {
+ buildTestsIn(session, testDirPath, generatedFilePaths, child);
+ } else if (child is File && child.shortName.endsWith('.dart')) {
+ var path = child.path;
+ if (generatedFilePaths.contains(path)) {
+ continue;
+ }
+ var relativePath = pathContext.relative(path, from: testDirPath);
+ test(relativePath, () {
+ var result = session.getParsedUnit(path);
+ if (result.state != ResultState.VALID) {
+ fail('Could not parse $path');
+ }
+ var code = result.content;
+ var unit = result.unit;
+ var errors = result.errors;
+ if (errors.isNotEmpty) {
+ fail('Errors found when parsing $path');
+ }
+ var sorter = MemberSorter(code, unit);
+ var edits = sorter.sort();
+ if (edits.isNotEmpty) {
+ fail('Unsorted file $path');
+ }
+ });
+ }
+ }
+}
diff --git a/pkg/analyzer/lib/dart/element/element.dart b/pkg/analyzer/lib/dart/element/element.dart
index 81f3c23..4841b13 100644
--- a/pkg/analyzer/lib/dart/element/element.dart
+++ b/pkg/analyzer/lib/dart/element/element.dart
@@ -119,9 +119,15 @@
/// Return `true` if this class [isProxy], or if it inherits the proxy
/// annotation from a supertype.
+ @Deprecated(
+ 'The @proxy annotation is deprecated in the langauge, and will be removed',
+ )
bool get isOrInheritsProxy;
/// Return `true` if this element has an annotation of the form '@proxy'.
+ @Deprecated(
+ 'The @proxy annotation is deprecated in the langauge, and will be removed',
+ )
bool get isProxy;
/// Return `true` if this class can validly be used as a mixin when defining
@@ -1332,6 +1338,12 @@
bool get isNonNullableByDefault;
+ /// The major component of the language version for this library.
+ int get languageVersionMajor;
+
+ /// The minor component of the language version for this library.
+ int get languageVersionMinor;
+
/// Return the element representing the synthetic function `loadLibrary` that
/// is implicitly defined for this library if the library is imported using a
/// deferred import.
diff --git a/pkg/analyzer/lib/error/error.dart b/pkg/analyzer/lib/error/error.dart
index 47f3f08..bbcdc16 100644
--- a/pkg/analyzer/lib/error/error.dart
+++ b/pkg/analyzer/lib/error/error.dart
@@ -43,23 +43,23 @@
// error code in on the line following the pattern we're grepping for. Those
// need to be filled in by hand.
//
- AnalysisOptionsErrorCode.PARSE_ERROR,
AnalysisOptionsErrorCode.INCLUDED_FILE_PARSE_ERROR,
+ AnalysisOptionsErrorCode.PARSE_ERROR,
+ AnalysisOptionsHintCode.DEPRECATED_ANALYSIS_OPTIONS_FILE_NAME,
+ AnalysisOptionsHintCode.PREVIEW_DART_2_SETTING_DEPRECATED,
+ AnalysisOptionsHintCode.STRONG_MODE_SETTING_DEPRECATED,
+ AnalysisOptionsHintCode.SUPER_MIXINS_SETTING_DEPRECATED,
AnalysisOptionsWarningCode.ANALYSIS_OPTION_DEPRECATED,
AnalysisOptionsWarningCode.INCLUDE_FILE_NOT_FOUND,
AnalysisOptionsWarningCode.INCLUDED_FILE_WARNING,
AnalysisOptionsWarningCode.INVALID_OPTION,
AnalysisOptionsWarningCode.INVALID_SECTION_FORMAT,
+ AnalysisOptionsWarningCode.SPEC_MODE_REMOVED,
AnalysisOptionsWarningCode.UNRECOGNIZED_ERROR_CODE,
AnalysisOptionsWarningCode.UNSUPPORTED_OPTION_WITH_LEGAL_VALUE,
AnalysisOptionsWarningCode.UNSUPPORTED_OPTION_WITH_LEGAL_VALUES,
AnalysisOptionsWarningCode.UNSUPPORTED_OPTION_WITHOUT_VALUES,
AnalysisOptionsWarningCode.UNSUPPORTED_VALUE,
- AnalysisOptionsWarningCode.SPEC_MODE_REMOVED,
- AnalysisOptionsHintCode.DEPRECATED_ANALYSIS_OPTIONS_FILE_NAME,
- AnalysisOptionsHintCode.PREVIEW_DART_2_SETTING_DEPRECATED,
- AnalysisOptionsHintCode.STRONG_MODE_SETTING_DEPRECATED,
- AnalysisOptionsHintCode.SUPER_MIXINS_SETTING_DEPRECATED,
CheckedModeCompileTimeErrorCode.CONST_CONSTRUCTOR_FIELD_TYPE_MISMATCH,
CheckedModeCompileTimeErrorCode.CONST_CONSTRUCTOR_PARAM_TYPE_MISMATCH,
CheckedModeCompileTimeErrorCode.CONST_FIELD_INITIALIZER_NOT_ASSIGNABLE,
@@ -82,9 +82,9 @@
CompileTimeErrorCode.BUILT_IN_IDENTIFIER_AS_EXTENSION_NAME,
CompileTimeErrorCode.BUILT_IN_IDENTIFIER_AS_PREFIX_NAME,
CompileTimeErrorCode.BUILT_IN_IDENTIFIER_AS_TYPE,
- CompileTimeErrorCode.BUILT_IN_IDENTIFIER_AS_TYPEDEF_NAME,
CompileTimeErrorCode.BUILT_IN_IDENTIFIER_AS_TYPE_NAME,
CompileTimeErrorCode.BUILT_IN_IDENTIFIER_AS_TYPE_PARAMETER_NAME,
+ CompileTimeErrorCode.BUILT_IN_IDENTIFIER_AS_TYPEDEF_NAME,
CompileTimeErrorCode.CASE_EXPRESSION_TYPE_IMPLEMENTS_EQUALS,
CompileTimeErrorCode.CASE_EXPRESSION_TYPE_IS_NOT_SWITCH_EXPRESSION_SUBTYPE,
CompileTimeErrorCode.CONFLICTING_CONSTRUCTOR_AND_STATIC_FIELD,
@@ -137,8 +137,8 @@
CompileTimeErrorCode.DUPLICATE_DEFINITION,
CompileTimeErrorCode.DUPLICATE_NAMED_ARGUMENT,
CompileTimeErrorCode.DUPLICATE_PART,
- CompileTimeErrorCode.EQUAL_KEYS_IN_CONST_MAP,
CompileTimeErrorCode.EQUAL_ELEMENTS_IN_CONST_SET,
+ CompileTimeErrorCode.EQUAL_KEYS_IN_CONST_MAP,
CompileTimeErrorCode.EXPORT_INTERNAL_LIBRARY,
CompileTimeErrorCode.EXPORT_LEGACY_SYMBOL,
CompileTimeErrorCode.EXPORT_OF_NON_LIBRARY,
@@ -183,8 +183,8 @@
CompileTimeErrorCode.INSTANCE_MEMBER_ACCESS_FROM_FACTORY,
CompileTimeErrorCode.INSTANCE_MEMBER_ACCESS_FROM_STATIC,
CompileTimeErrorCode.INSTANTIATE_ENUM,
- CompileTimeErrorCode.INTEGER_LITERAL_OUT_OF_RANGE,
CompileTimeErrorCode.INTEGER_LITERAL_IMPRECISE_AS_DOUBLE,
+ CompileTimeErrorCode.INTEGER_LITERAL_OUT_OF_RANGE,
CompileTimeErrorCode.INVALID_ANNOTATION,
CompileTimeErrorCode.INVALID_ANNOTATION_FROM_DEFERRED_LIBRARY,
CompileTimeErrorCode.INVALID_ANNOTATION_GETTER,
@@ -192,9 +192,9 @@
CompileTimeErrorCode.INVALID_CONSTRUCTOR_NAME,
CompileTimeErrorCode.INVALID_EXTENSION_ARGUMENT_COUNT,
CompileTimeErrorCode.INVALID_FACTORY_NAME_NOT_A_CLASS,
+ CompileTimeErrorCode.INVALID_INLINE_FUNCTION_TYPE,
CompileTimeErrorCode.INVALID_MODIFIER_ON_CONSTRUCTOR,
CompileTimeErrorCode.INVALID_MODIFIER_ON_SETTER,
- CompileTimeErrorCode.INVALID_INLINE_FUNCTION_TYPE,
CompileTimeErrorCode.INVALID_OVERRIDE,
CompileTimeErrorCode.INVALID_REFERENCE_TO_THIS,
CompileTimeErrorCode.INVALID_TYPE_ARGUMENT_IN_CONST_LIST,
@@ -210,6 +210,7 @@
CompileTimeErrorCode.LATE_FINAL_FIELD_WITH_CONST_CONSTRUCTOR,
CompileTimeErrorCode.LATE_FINAL_LOCAL_ALREADY_ASSIGNED,
CompileTimeErrorCode.MAP_ENTRY_NOT_IN_MAP,
+ // ignore: deprecated_member_use_from_same_package
CompileTimeErrorCode.MEMBER_WITH_CLASS_NAME,
CompileTimeErrorCode.MISSING_CONST_IN_LIST_LITERAL,
CompileTimeErrorCode.MISSING_CONST_IN_MAP_LITERAL,
@@ -218,8 +219,8 @@
CompileTimeErrorCode.MISSING_DEFAULT_VALUE_FOR_PARAMETER,
CompileTimeErrorCode.MISSING_REQUIRED_ARGUMENT,
CompileTimeErrorCode.MIXIN_APPLICATION_CONCRETE_SUPER_INVOKED_MEMBER_TYPE,
- CompileTimeErrorCode.MIXIN_APPLICATION_NOT_IMPLEMENTED_INTERFACE,
CompileTimeErrorCode.MIXIN_APPLICATION_NO_CONCRETE_SUPER_INVOKED_MEMBER,
+ CompileTimeErrorCode.MIXIN_APPLICATION_NOT_IMPLEMENTED_INTERFACE,
CompileTimeErrorCode.MIXIN_CLASS_DECLARES_CONSTRUCTOR,
CompileTimeErrorCode.MIXIN_DECLARES_CONSTRUCTOR,
CompileTimeErrorCode.MIXIN_DEFERRED_CLASS,
@@ -237,6 +238,10 @@
CompileTimeErrorCode.MIXIN_WITH_NON_CLASS_SUPERCLASS,
CompileTimeErrorCode.MULTIPLE_REDIRECTING_CONSTRUCTOR_INVOCATIONS,
CompileTimeErrorCode.MULTIPLE_SUPER_INITIALIZERS,
+ CompileTimeErrorCode.NO_ANNOTATION_CONSTRUCTOR_ARGUMENTS,
+ CompileTimeErrorCode.NO_DEFAULT_SUPER_CONSTRUCTOR_EXPLICIT,
+ CompileTimeErrorCode.NO_DEFAULT_SUPER_CONSTRUCTOR_IMPLICIT,
+ CompileTimeErrorCode.NON_CONST_MAP_AS_EXPRESSION_STATEMENT,
CompileTimeErrorCode.NON_CONSTANT_ANNOTATION_CONSTRUCTOR,
CompileTimeErrorCode.NON_CONSTANT_CASE_EXPRESSION,
CompileTimeErrorCode.NON_CONSTANT_CASE_EXPRESSION_FROM_DEFERRED_LIBRARY,
@@ -244,15 +249,14 @@
CompileTimeErrorCode.NON_CONSTANT_DEFAULT_VALUE_FROM_DEFERRED_LIBRARY,
CompileTimeErrorCode.NON_CONSTANT_LIST_ELEMENT,
CompileTimeErrorCode.NON_CONSTANT_LIST_ELEMENT_FROM_DEFERRED_LIBRARY,
+ CompileTimeErrorCode.NON_CONSTANT_MAP_ELEMENT,
CompileTimeErrorCode.NON_CONSTANT_MAP_KEY,
CompileTimeErrorCode.NON_CONSTANT_MAP_KEY_FROM_DEFERRED_LIBRARY,
CompileTimeErrorCode.NON_CONSTANT_MAP_VALUE,
- CompileTimeErrorCode.NON_CONSTANT_MAP_ELEMENT,
CompileTimeErrorCode.NON_CONSTANT_MAP_VALUE_FROM_DEFERRED_LIBRARY,
CompileTimeErrorCode.NON_CONSTANT_SET_ELEMENT,
// ignore: deprecated_member_use_from_same_package
CompileTimeErrorCode.NON_CONSTANT_VALUE_IN_INITIALIZER,
- CompileTimeErrorCode.NON_CONST_MAP_AS_EXPRESSION_STATEMENT,
CompileTimeErrorCode.NON_GENERATIVE_CONSTRUCTOR,
CompileTimeErrorCode.NON_SYNC_FACTORY,
CompileTimeErrorCode.NOT_ASSIGNED_POTENTIALLY_NON_NULLABLE_LOCAL_VARIABLE,
@@ -265,9 +269,6 @@
CompileTimeErrorCode.NOT_ITERABLE_SPREAD,
CompileTimeErrorCode.NOT_MAP_SPREAD,
CompileTimeErrorCode.NOT_NULL_AWARE_NULL_SPREAD,
- CompileTimeErrorCode.NO_ANNOTATION_CONSTRUCTOR_ARGUMENTS,
- CompileTimeErrorCode.NO_DEFAULT_SUPER_CONSTRUCTOR_EXPLICIT,
- CompileTimeErrorCode.NO_DEFAULT_SUPER_CONSTRUCTOR_IMPLICIT,
CompileTimeErrorCode.NULLABLE_TYPE_IN_CATCH_CLAUSE,
CompileTimeErrorCode.NULLABLE_TYPE_IN_EXTENDS_CLAUSE,
CompileTimeErrorCode.NULLABLE_TYPE_IN_IMPLEMENTS_CLAUSE,
@@ -302,10 +303,10 @@
CompileTimeErrorCode.SET_ELEMENT_FROM_DEFERRED_LIBRARY,
CompileTimeErrorCode.SHARED_DEFERRED_PREFIX,
CompileTimeErrorCode.SPREAD_EXPRESSION_FROM_DEFERRED_LIBRARY,
- CompileTimeErrorCode.SUPER_INITIALIZER_IN_OBJECT,
CompileTimeErrorCode.SUPER_IN_EXTENSION,
CompileTimeErrorCode.SUPER_IN_INVALID_CONTEXT,
CompileTimeErrorCode.SUPER_IN_REDIRECTING_CONSTRUCTOR,
+ CompileTimeErrorCode.SUPER_INITIALIZER_IN_OBJECT,
CompileTimeErrorCode.SWITCH_CASE_COMPLETES_NORMALLY,
CompileTimeErrorCode.TYPE_ALIAS_CANNOT_REFERENCE_ITSELF,
CompileTimeErrorCode.TYPE_ARGUMENT_NOT_MATCHING_BOUNDS,
@@ -324,12 +325,12 @@
CompileTimeErrorCode.URI_DOES_NOT_EXIST,
CompileTimeErrorCode.URI_HAS_NOT_BEEN_GENERATED,
CompileTimeErrorCode.URI_WITH_INTERPOLATION,
+ CompileTimeErrorCode.WRONG_EXPLICIT_TYPE_PARAMETER_VARIANCE_IN_SUPERINTERFACE,
CompileTimeErrorCode.WRONG_NUMBER_OF_PARAMETERS_FOR_OPERATOR,
CompileTimeErrorCode.WRONG_NUMBER_OF_PARAMETERS_FOR_OPERATOR_MINUS,
CompileTimeErrorCode.WRONG_NUMBER_OF_PARAMETERS_FOR_SETTER,
CompileTimeErrorCode.WRONG_TYPE_PARAMETER_VARIANCE_IN_SUPERINTERFACE,
CompileTimeErrorCode.WRONG_TYPE_PARAMETER_VARIANCE_POSITION,
- CompileTimeErrorCode.WRONG_EXPLICIT_TYPE_PARAMETER_VARIANCE_IN_SUPERINTERFACE,
CompileTimeErrorCode.YIELD_EACH_IN_NON_GENERATOR,
CompileTimeErrorCode.YIELD_IN_NON_GENERATOR,
FfiCode.ANNOTATION_ON_POINTER_FIELD,
@@ -365,8 +366,8 @@
HintCode.DEPRECATED_MEMBER_USE_WITH_MESSAGE,
HintCode.DEPRECATED_MIXIN_FUNCTION,
HintCode.DIVISION_OPTIMIZATION,
- HintCode.DUPLICATE_IMPORT,
HintCode.DUPLICATE_HIDDEN_NAME,
+ HintCode.DUPLICATE_IMPORT,
HintCode.DUPLICATE_SHOWN_NAME,
HintCode.EQUAL_ELEMENTS_IN_SET,
HintCode.EQUAL_KEYS_IN_MAP,
@@ -426,8 +427,8 @@
HintCode.OVERRIDE_ON_NON_OVERRIDING_SETTER,
HintCode.PACKAGE_IMPORT_CONTAINS_DOT_DOT,
HintCode.RECEIVER_OF_TYPE_NEVER,
- HintCode.SDK_VERSION_ASYNC_EXPORTED_FROM_CORE,
HintCode.SDK_VERSION_AS_EXPRESSION_IN_CONST_CONTEXT,
+ HintCode.SDK_VERSION_ASYNC_EXPORTED_FROM_CORE,
HintCode.SDK_VERSION_BOOL_OPERATOR_IN_CONST_CONTEXT,
HintCode.SDK_VERSION_EQ_EQ_OPERATOR_IN_CONST_CONTEXT,
HintCode.SDK_VERSION_EXTENSION_METHODS,
@@ -458,8 +459,8 @@
HintCode.UNUSED_LOCAL_VARIABLE,
HintCode.UNUSED_SHOWN_NAME,
ManifestWarningCode.CAMERA_PERMISSIONS_INCOMPATIBLE,
- ManifestWarningCode.NON_RESIZABLE_ACTIVITY,
ManifestWarningCode.NO_TOUCHSCREEN_FEATURE,
+ ManifestWarningCode.NON_RESIZABLE_ACTIVITY,
ManifestWarningCode.PERMISSION_IMPLIES_UNSUPPORTED_HARDWARE,
ManifestWarningCode.SETTING_ORIENTATION_ON_ACTIVITY,
ManifestWarningCode.UNSUPPORTED_CHROME_OS_FEATURE,
@@ -478,7 +479,6 @@
ParserErrorCode.CLASS_IN_CLASS,
ParserErrorCode.COLON_IN_PLACE_OF_IN,
ParserErrorCode.CONFLICTING_MODIFIERS,
- ParserErrorCode.CONSTRUCTOR_WITH_RETURN_TYPE,
ParserErrorCode.CONST_AFTER_FACTORY,
ParserErrorCode.CONST_AND_COVARIANT,
ParserErrorCode.CONST_AND_FINAL,
@@ -489,6 +489,7 @@
ParserErrorCode.CONST_FACTORY,
ParserErrorCode.CONST_METHOD,
ParserErrorCode.CONST_TYPEDEF,
+ ParserErrorCode.CONSTRUCTOR_WITH_RETURN_TYPE,
ParserErrorCode.CONTINUE_OUTSIDE_OF_LOOP,
ParserErrorCode.CONTINUE_WITHOUT_LABEL_IN_CASE,
ParserErrorCode.COVARIANT_AFTER_FINAL,
@@ -497,13 +498,13 @@
ParserErrorCode.COVARIANT_CONSTRUCTOR,
ParserErrorCode.COVARIANT_MEMBER,
ParserErrorCode.COVARIANT_TOP_LEVEL_DECLARATION,
- ParserErrorCode.DEFERRED_AFTER_PREFIX,
ParserErrorCode.DEFAULT_VALUE_IN_FUNCTION_TYPE,
+ ParserErrorCode.DEFERRED_AFTER_PREFIX,
ParserErrorCode.DIRECTIVE_AFTER_DECLARATION,
ParserErrorCode.DUPLICATE_DEFERRED,
- ParserErrorCode.DUPLICATED_MODIFIER,
ParserErrorCode.DUPLICATE_LABEL_IN_SWITCH_STATEMENT,
ParserErrorCode.DUPLICATE_PREFIX,
+ ParserErrorCode.DUPLICATED_MODIFIER,
ParserErrorCode.EMPTY_ENUM_BODY,
ParserErrorCode.ENUM_IN_CLASS,
ParserErrorCode.EQUALITY_CANNOT_BE_EQUALITY_OPERAND,
@@ -527,6 +528,7 @@
ParserErrorCode.EXTERNAL_AFTER_STATIC,
ParserErrorCode.EXTERNAL_CLASS,
ParserErrorCode.EXTERNAL_CONSTRUCTOR_WITH_BODY,
+ ParserErrorCode.EXTERNAL_CONSTRUCTOR_WITH_INITIALIZER,
ParserErrorCode.EXTERNAL_ENUM,
ParserErrorCode.EXTERNAL_FACTORY_REDIRECTION,
ParserErrorCode.EXTERNAL_FACTORY_WITH_BODY,
@@ -538,10 +540,10 @@
ParserErrorCode.EXTERNAL_TYPEDEF,
ParserErrorCode.EXTRANEOUS_MODIFIER,
ParserErrorCode.FACTORY_TOP_LEVEL_DECLARATION,
- ParserErrorCode.FACTORY_WITHOUT_BODY,
ParserErrorCode.FACTORY_WITH_INITIALIZERS,
- ParserErrorCode.FIELD_INITIALIZER_OUTSIDE_CONSTRUCTOR,
+ ParserErrorCode.FACTORY_WITHOUT_BODY,
ParserErrorCode.FIELD_INITIALIZED_OUTSIDE_DECLARING_CLASS,
+ ParserErrorCode.FIELD_INITIALIZER_OUTSIDE_CONSTRUCTOR,
ParserErrorCode.FINAL_AND_COVARIANT,
ParserErrorCode.FINAL_AND_COVARIANT_LATE_WITH_INITIALIZER,
ParserErrorCode.FINAL_AND_VAR,
@@ -551,6 +553,7 @@
ParserErrorCode.FINAL_METHOD,
ParserErrorCode.FINAL_TYPEDEF,
ParserErrorCode.FUNCTION_TYPED_PARAMETER_VAR,
+ ParserErrorCode.GETTER_CONSTRUCTOR,
ParserErrorCode.GETTER_IN_FUNCTION,
ParserErrorCode.GETTER_WITH_PARAMETERS,
ParserErrorCode.ILLEGAL_ASSIGNMENT_TO_NON_ASSIGNABLE,
@@ -571,11 +574,14 @@
ParserErrorCode.INVALID_OPERATOR_FOR_SUPER,
ParserErrorCode.INVALID_OPERATOR_QUESTIONMARK_PERIOD_FOR_SUPER,
ParserErrorCode.INVALID_STAR_AFTER_ASYNC,
+ ParserErrorCode.INVALID_SUPER_IN_INITIALIZER,
ParserErrorCode.INVALID_SYNC,
+ ParserErrorCode.INVALID_THIS_IN_INITIALIZER,
ParserErrorCode.INVALID_UNICODE_ESCAPE,
ParserErrorCode.INVALID_USE_OF_COVARIANT_IN_EXTENSION,
ParserErrorCode.LIBRARY_DIRECTIVE_NOT_FIRST,
ParserErrorCode.LOCAL_FUNCTION_DECLARATION_MODIFIER,
+ ParserErrorCode.MEMBER_WITH_CLASS_NAME,
ParserErrorCode.MISSING_ASSIGNABLE_SELECTOR,
ParserErrorCode.MISSING_ASSIGNMENT_IN_INITIALIZER,
ParserErrorCode.MISSING_CATCH_OR_FINALLY,
@@ -606,10 +612,10 @@
ParserErrorCode.MIXIN_DECLARES_CONSTRUCTOR,
ParserErrorCode.MODIFIER_OUT_OF_ORDER,
ParserErrorCode.MULTIPLE_EXTENDS_CLAUSES,
- ParserErrorCode.MULTIPLE_ON_CLAUSES,
ParserErrorCode.MULTIPLE_IMPLEMENTS_CLAUSES,
ParserErrorCode.MULTIPLE_LIBRARY_DIRECTIVES,
ParserErrorCode.MULTIPLE_NAMED_PARAMETER_GROUPS,
+ ParserErrorCode.MULTIPLE_ON_CLAUSES,
ParserErrorCode.MULTIPLE_PART_OF_DIRECTIVES,
ParserErrorCode.MULTIPLE_POSITIONAL_PARAMETER_GROUPS,
ParserErrorCode.MULTIPLE_VARIABLES_IN_FOR_EACH,
@@ -633,6 +639,7 @@
ParserErrorCode.PREFIX_AFTER_COMBINATOR,
ParserErrorCode.REDIRECTING_CONSTRUCTOR_WITH_BODY,
ParserErrorCode.REDIRECTION_IN_NON_FACTORY_CONSTRUCTOR,
+ ParserErrorCode.SETTER_CONSTRUCTOR,
ParserErrorCode.SETTER_IN_FUNCTION,
ParserErrorCode.STACK_OVERFLOW,
ParserErrorCode.STATIC_AFTER_CONST,
@@ -643,16 +650,14 @@
ParserErrorCode.STATIC_OPERATOR,
ParserErrorCode.STATIC_SETTER_WITHOUT_BODY,
ParserErrorCode.STATIC_TOP_LEVEL_DECLARATION,
- ParserErrorCode.INVALID_SUPER_IN_INITIALIZER,
ParserErrorCode.SWITCH_HAS_CASE_AFTER_DEFAULT_CASE,
ParserErrorCode.SWITCH_HAS_MULTIPLE_DEFAULT_CASES,
- ParserErrorCode.INVALID_THIS_IN_INITIALIZER,
ParserErrorCode.TOP_LEVEL_OPERATOR,
- ParserErrorCode.TYPEDEF_IN_CLASS,
ParserErrorCode.TYPE_ARGUMENTS_ON_TYPE_VARIABLE,
ParserErrorCode.TYPE_BEFORE_FACTORY,
ParserErrorCode.TYPE_PARAMETER_ON_CONSTRUCTOR,
ParserErrorCode.TYPE_PARAMETER_ON_OPERATOR,
+ ParserErrorCode.TYPEDEF_IN_CLASS,
ParserErrorCode.UNEXPECTED_TERMINATOR_FOR_PARAMETER_GROUP,
ParserErrorCode.UNEXPECTED_TOKEN,
ParserErrorCode.VAR_AND_TYPE,
@@ -736,9 +741,9 @@
// ignore: deprecated_member_use_from_same_package
StaticWarningCode.EXTRA_POSITIONAL_ARGUMENTS_COULD_BE_NAMED,
StaticWarningCode.FIELD_INITIALIZED_IN_INITIALIZER_AND_DECLARATION,
- StaticWarningCode.FINAL_INITIALIZED_IN_DECLARATION_AND_CONSTRUCTOR,
StaticWarningCode.FIELD_INITIALIZER_NOT_ASSIGNABLE,
StaticWarningCode.FIELD_INITIALIZING_FORMAL_NOT_ASSIGNABLE,
+ StaticWarningCode.FINAL_INITIALIZED_IN_DECLARATION_AND_CONSTRUCTOR,
StaticWarningCode.FINAL_NOT_INITIALIZED,
StaticWarningCode.FINAL_NOT_INITIALIZED_CONSTRUCTOR_1,
StaticWarningCode.FINAL_NOT_INITIALIZED_CONSTRUCTOR_2,
@@ -812,14 +817,14 @@
StrongModeCode.IMPLICIT_DYNAMIC_RETURN,
StrongModeCode.IMPLICIT_DYNAMIC_TYPE,
StrongModeCode.IMPLICIT_DYNAMIC_VARIABLE,
+ StrongModeCode.INVALID_CAST_FUNCTION,
+ StrongModeCode.INVALID_CAST_FUNCTION_EXPR,
StrongModeCode.INVALID_CAST_LITERAL,
StrongModeCode.INVALID_CAST_LITERAL_LIST,
StrongModeCode.INVALID_CAST_LITERAL_MAP,
StrongModeCode.INVALID_CAST_LITERAL_SET,
- StrongModeCode.INVALID_CAST_FUNCTION_EXPR,
- StrongModeCode.INVALID_CAST_NEW_EXPR,
StrongModeCode.INVALID_CAST_METHOD,
- StrongModeCode.INVALID_CAST_FUNCTION,
+ StrongModeCode.INVALID_CAST_NEW_EXPR,
StrongModeCode.INVALID_PARAMETER_DECLARATION,
StrongModeCode.INVALID_SUPER_INVOCATION,
StrongModeCode.NOT_INSTANTIATED_BOUND,
diff --git a/pkg/analyzer/lib/src/dart/analysis/driver.dart b/pkg/analyzer/lib/src/dart/analysis/driver.dart
index ef9ae37..1066383 100644
--- a/pkg/analyzer/lib/src/dart/analysis/driver.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/driver.dart
@@ -91,7 +91,7 @@
/// TODO(scheglov) Clean up the list of implicitly analyzed files.
class AnalysisDriver implements AnalysisDriverGeneric {
/// The version of data format, should be incremented on every format change.
- static const int DATA_VERSION = 99;
+ static const int DATA_VERSION = 100;
/// The length of the list returned by [_computeDeclaredVariablesSignature].
static const int _declaredVariablesSignatureLength = 4;
@@ -953,6 +953,7 @@
_fileTracker.fileWasAnalyzed(path);
_resultController.add(result);
} catch (exception, stackTrace) {
+ _reportException(path, exception, stackTrace);
_fileTracker.fileWasAnalyzed(path);
_requestedFiles.remove(path).forEach((completer) {
completer.completeError(exception, stackTrace);
@@ -1112,6 +1113,7 @@
_partsToAnalyze.remove(path);
_resultController.add(result);
} catch (exception, stackTrace) {
+ _reportException(path, exception, stackTrace);
_partsToAnalyze.remove(path);
_requestedParts.remove(path).forEach((completer) {
completer.completeError(exception, stackTrace);
diff --git a/pkg/analyzer/lib/src/dart/analysis/feature_set_provider.dart b/pkg/analyzer/lib/src/dart/analysis/feature_set_provider.dart
index eb9896b..f062dd9 100644
--- a/pkg/analyzer/lib/src/dart/analysis/feature_set_provider.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/feature_set_provider.dart
@@ -7,6 +7,7 @@
import 'package:analyzer/src/context/packages.dart';
import 'package:analyzer/src/dart/analysis/experiments.dart';
import 'package:meta/meta.dart';
+import 'package:pub_semver/pub_semver.dart';
class FeatureSetProvider {
/// This flag will be turned to `true` and inlined when we un-fork SDK,
@@ -49,6 +50,21 @@
return _nonPackageDefaultFeatureSet;
}
+ /// Return the language version configured for the file.
+ Version getLanguageVersion(String path, Uri uri) {
+ for (var package in _packages.packages) {
+ if (package.rootFolder.contains(path)) {
+ var languageVersion = package.languageVersion;
+ if (languageVersion != null) {
+ return languageVersion;
+ }
+ break;
+ }
+ }
+
+ return ExperimentStatus.currentVersion;
+ }
+
static FeatureSetProvider build({
@required ResourceProvider resourceProvider,
@required Packages packages,
diff --git a/pkg/analyzer/lib/src/dart/analysis/file_state.dart b/pkg/analyzer/lib/src/dart/analysis/file_state.dart
index e831c4f..8fd8770 100644
--- a/pkg/analyzer/lib/src/dart/analysis/file_state.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/file_state.dart
@@ -5,7 +5,8 @@
import 'dart:convert';
import 'dart:typed_data';
-import 'package:_fe_analyzer_shared/src/scanner/token_impl.dart';
+import 'package:_fe_analyzer_shared/src/scanner/token_impl.dart'
+ show StringToken;
import 'package:analyzer/dart/analysis/declared_variables.dart';
import 'package:analyzer/dart/analysis/features.dart';
import 'package:analyzer/dart/ast/ast.dart';
@@ -20,6 +21,7 @@
import 'package:analyzer/src/dart/analysis/performance_logger.dart';
import 'package:analyzer/src/dart/analysis/referenced_names.dart';
import 'package:analyzer/src/dart/analysis/unlinked_api_signature.dart';
+import 'package:analyzer/src/dart/ast/ast.dart';
import 'package:analyzer/src/dart/scanner/reader.dart';
import 'package:analyzer/src/dart/scanner/scanner.dart';
import 'package:analyzer/src/generated/engine.dart';
@@ -608,6 +610,7 @@
try {
unit = parser.parseCompilationUnit(token);
unit.lineInfo = lineInfo;
+ _setLanguageVersion(unit, scanner.languageVersion);
} catch (e) {
throw StateError('''
Parser error.
@@ -638,6 +641,22 @@
return directive.uri;
}
+ /// Set the language version into the [unit], from the [languageVersionToken]
+ /// override, or the configured from the [FeatureSetProvider].
+ void _setLanguageVersion(
+ CompilationUnitImpl unit,
+ LanguageVersionToken languageVersionToken,
+ ) {
+ if (languageVersionToken != null) {
+ unit.languageVersionMajor = languageVersionToken.major;
+ unit.languageVersionMinor = languageVersionToken.minor;
+ } else {
+ var version = _fsState.featureSetProvider.getLanguageVersion(path, uri);
+ unit.languageVersionMajor = version.major;
+ unit.languageVersionMinor = version.minor;
+ }
+ }
+
static UnlinkedUnit2Builder serializeAstUnlinked2(CompilationUnit unit) {
var exports = <UnlinkedNamespaceDirectiveBuilder>[];
var imports = <UnlinkedNamespaceDirectiveBuilder>[];
diff --git a/pkg/analyzer/lib/src/dart/analysis/index.dart b/pkg/analyzer/lib/src/dart/analysis/index.dart
index 27aaef9..0cb5728 100644
--- a/pkg/analyzer/lib/src/dart/analysis/index.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/index.dart
@@ -44,7 +44,9 @@
return namedParameterElement(invocation.staticElement);
} else if (invocation is MethodInvocation) {
var executable = invocation.methodName.staticElement;
- return namedParameterElement(executable);
+ if (executable is ExecutableElement) {
+ return namedParameterElement(executable);
+ }
}
}
}
diff --git a/pkg/analyzer/lib/src/dart/analysis/library_context.dart b/pkg/analyzer/lib/src/dart/analysis/library_context.dart
index 606eba1..ec2e3e9 100644
--- a/pkg/analyzer/lib/src/dart/analysis/library_context.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/library_context.dart
@@ -6,6 +6,7 @@
import 'package:analyzer/dart/analysis/session.dart';
import 'package:analyzer/dart/element/element.dart'
show CompilationUnitElement, LibraryElement;
+import 'package:analyzer/exception/exception.dart';
import 'package:analyzer/src/context/context.dart';
import 'package:analyzer/src/dart/analysis/byte_store.dart';
import 'package:analyzer/src/dart/analysis/driver.dart';
@@ -169,11 +170,16 @@
inputsTimer.stop();
timerInputLibraries.stop();
- timerLinking.start();
- var linkResult = link2.link(elementFactory, inputLibraries);
- librariesLinked += cycle.libraries.length;
- counterLinkedLibraries += linkResult.bundle.libraries.length;
- timerLinking.stop();
+ link2.LinkResult linkResult;
+ try {
+ timerLinking.start();
+ linkResult = link2.link(elementFactory, inputLibraries);
+ librariesLinked += cycle.libraries.length;
+ counterLinkedLibraries += linkResult.bundle.libraries.length;
+ timerLinking.stop();
+ } catch (exception, stackTrace) {
+ _throwLibraryCycleLinkException(cycle, exception, stackTrace);
+ }
timerBundleToBytes.start();
bytes = linkResult.bundle.toBuffer();
@@ -273,4 +279,34 @@
elementFactory.createTypeProviders(dartCore, dartAsync);
}
}
+
+ /// The [exception] was caught during the [cycle] linking.
+ ///
+ /// Throw another exception that wraps the given one, with more information.
+ @alwaysThrows
+ void _throwLibraryCycleLinkException(
+ LibraryCycle cycle,
+ Object exception,
+ StackTrace stackTrace,
+ ) {
+ var fileContentMap = <String, String>{};
+ for (var libraryFile in cycle.libraries) {
+ for (var file in libraryFile.libraryFiles) {
+ fileContentMap[file.path] = file.content;
+ }
+ }
+ throw LibraryCycleLinkException(exception, stackTrace, fileContentMap);
+ }
+}
+
+/// Exception that wraps another exception that happened during linking, and
+/// includes the content of all files of the library cycle.
+class LibraryCycleLinkException extends CaughtException {
+ final Map<String, String> fileContentMap;
+
+ LibraryCycleLinkException(
+ Object exception,
+ StackTrace stackTrace,
+ this.fileContentMap,
+ ) : super(exception, stackTrace);
}
diff --git a/pkg/analyzer/lib/src/dart/ast/ast.dart b/pkg/analyzer/lib/src/dart/ast/ast.dart
index 5e1f4a5..85a3e57 100644
--- a/pkg/analyzer/lib/src/dart/ast/ast.dart
+++ b/pkg/analyzer/lib/src/dart/ast/ast.dart
@@ -2025,6 +2025,12 @@
@override
LineInfo lineInfo;
+ /// The major component of the actual language version (not just override).
+ int languageVersionMajor;
+
+ /// The minor component of the actual language version (not just override).
+ int languageVersionMinor;
+
@override
LanguageVersion get languageVersion {
final token = languageVersionToken;
diff --git a/pkg/analyzer/lib/src/dart/element/element.dart b/pkg/analyzer/lib/src/dart/element/element.dart
index 332fbe9..5422092 100644
--- a/pkg/analyzer/lib/src/dart/element/element.dart
+++ b/pkg/analyzer/lib/src/dart/element/element.dart
@@ -12,6 +12,7 @@
import 'package:analyzer/dart/element/nullability_suffix.dart';
import 'package:analyzer/dart/element/type.dart';
import 'package:analyzer/error/error.dart';
+import 'package:analyzer/src/dart/analysis/experiments.dart';
import 'package:analyzer/src/dart/analysis/session.dart';
import 'package:analyzer/src/dart/constant/compute.dart';
import 'package:analyzer/src/dart/constant/evaluation.dart';
@@ -758,18 +759,10 @@
}
@override
- bool get isOrInheritsProxy =>
- _safeIsOrInheritsProxy(this, HashSet<ClassElement>());
+ bool get isOrInheritsProxy => false;
@override
- bool get isProxy {
- for (ElementAnnotation annotation in metadata) {
- if (annotation.isProxy) {
- return true;
- }
- }
- return false;
- }
+ bool get isProxy => false;
@override
bool get isSimplyBounded {
@@ -1183,33 +1176,6 @@
!type.isDartCoreFunction;
}
- bool _safeIsOrInheritsProxy(
- ClassElement element, HashSet<ClassElement> visited) {
- if (visited.contains(element)) {
- return false;
- }
- visited.add(element);
- if (element.isProxy) {
- return true;
- } else if (element.supertype != null &&
- _safeIsOrInheritsProxy(element.supertype.element, visited)) {
- return true;
- }
- List<InterfaceType> supertypes = element.interfaces;
- for (int i = 0; i < supertypes.length; i++) {
- if (_safeIsOrInheritsProxy(supertypes[i].element, visited)) {
- return true;
- }
- }
- supertypes = element.mixins;
- for (int i = 0; i < supertypes.length; i++) {
- if (_safeIsOrInheritsProxy(supertypes[i].element, visited)) {
- return true;
- }
- }
- return false;
- }
-
static void collectAllSupertypes(List<InterfaceType> supertypes,
InterfaceType startingType, InterfaceType excludeType) {
List<InterfaceType> typesToVisit = <InterfaceType>[];
@@ -2661,6 +2627,12 @@
/// The length of the element's code, or `null` if the element is synthetic.
int _codeLength;
+ /// The major component of the language version.
+ int _languageVersionMajor;
+
+ /// The minor component of the language version.
+ int _languageVersionMinor;
+
/// Initialize a newly created element to have the given [name] at the given
/// [_nameOffset].
ElementImpl(String name, this._nameOffset, {this.reference})
@@ -5516,6 +5488,32 @@
ElementKind get kind => ElementKind.LIBRARY;
@override
+ int get languageVersionMajor {
+ if (_languageVersionMajor != null) return _languageVersionMajor;
+
+ if (linkedNode != null) {
+ _languageVersionMajor = linkedContext.getLanguageVersionMajor(linkedNode);
+ return _languageVersionMajor;
+ }
+
+ _languageVersionMajor = ExperimentStatus.currentVersion.major;
+ return _languageVersionMajor;
+ }
+
+ @override
+ int get languageVersionMinor {
+ if (_languageVersionMinor != null) return _languageVersionMinor;
+
+ if (linkedNode != null) {
+ _languageVersionMinor = linkedContext.getLanguageVersionMinor(linkedNode);
+ return _languageVersionMinor;
+ }
+
+ _languageVersionMinor = ExperimentStatus.currentVersion.minor;
+ return _languageVersionMinor;
+ }
+
+ @override
LibraryElement get library => this;
@override
@@ -5664,6 +5662,11 @@
return getTypeFromParts(className, _definingCompilationUnit, _parts);
}
+ void setLanguageVersion(int major, int minor) {
+ _languageVersionMajor = major;
+ _languageVersionMinor = minor;
+ }
+
/// Set whether the library has the given [capability] to
/// correspond to the given [value].
void setResolutionCapability(
diff --git a/pkg/analyzer/lib/src/dart/element/inheritance_manager3.dart b/pkg/analyzer/lib/src/dart/element/inheritance_manager3.dart
index 406df8d..bf23dce 100644
--- a/pkg/analyzer/lib/src/dart/element/inheritance_manager3.dart
+++ b/pkg/analyzer/lib/src/dart/element/inheritance_manager3.dart
@@ -5,8 +5,10 @@
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/dart/element/type.dart';
import 'package:analyzer/dart/element/type_system.dart';
+import 'package:analyzer/src/dart/element/element.dart';
import 'package:analyzer/src/dart/element/member.dart';
import 'package:analyzer/src/error/correct_override.dart';
+import 'package:analyzer/src/generated/type_system.dart' show TypeSystemImpl;
import 'package:analyzer/src/generated/utilities_general.dart';
import 'package:meta/meta.dart';
@@ -70,7 +72,7 @@
if (interface._inheritedMap == null) {
interface._inheritedMap = {};
_findMostSpecificFromNamedCandidates(
- type.element.library,
+ type.element,
interface._inheritedMap,
interface._overridden,
);
@@ -104,13 +106,12 @@
Map<Name, ExecutableElement> declared;
Interface superInterface;
Map<Name, ExecutableElement> implemented;
- Map<Name, ExecutableElement> implementedForMixing;
try {
// If a class declaration has a member declaration, the signature of that
// member declaration becomes the signature in the interface.
declared = _getTypeMembers(type);
- for (var interface in type.interfaces) {
+ for (var interface in type.interfaces.reversed) {
var interfaceObj = getInterface(interface);
_addCandidates(
namedCandidates,
@@ -141,7 +142,7 @@
// from its superclass constraints, whether it is abstract or concrete.
var superClass = <Name, ExecutableElement>{};
_findMostSpecificFromNamedCandidates(
- classLibrary,
+ classElement,
superClass,
superClassCandidates,
);
@@ -161,7 +162,6 @@
implemented = {};
}
- implementedForMixing = {};
for (var mixin in type.mixins) {
var interfaceObj = getInterface(mixin);
_addCandidates(
@@ -170,26 +170,25 @@
isNonNullableByDefault: isNonNullableByDefault,
);
- implemented = <Name, ExecutableElement>{}
- ..addAll(implemented)
- ..addAll(interfaceObj._implementedForMixing);
+ implemented = <Name, ExecutableElement>{}..addAll(implemented);
+ implemented.addEntries(
+ interfaceObj.implemented.entries.where((entry) {
+ var executable = entry.value;
+ if (executable.isAbstract) {
+ return false;
+ }
+ var class_ = executable.enclosingElement;
+ return class_ is ClassElement && !class_.isDartCoreObject;
+ }),
+ );
+
superImplemented.add(implemented);
- implementedForMixing.addAll(interfaceObj._implementedForMixing);
}
}
} finally {
_processingClasses.remove(classElement);
}
- var thisImplemented = <Name, ExecutableElement>{};
- _addImplemented(thisImplemented, type);
-
- if (classElement.isMixin) {
- implementedForMixing = thisImplemented;
- } else {
- implementedForMixing.addAll(thisImplemented);
- }
-
implemented = <Name, ExecutableElement>{}..addAll(implemented);
_addImplemented(implemented, type);
@@ -201,7 +200,7 @@
// signature becomes the signature of the class's interface.
Map<Name, ExecutableElement> map = Map.of(declared);
List<Conflict> conflicts = _findMostSpecificFromNamedCandidates(
- classLibrary,
+ classElement,
map,
namedCandidates,
);
@@ -230,7 +229,6 @@
declared,
implemented,
noSuchMethodForwarders,
- implementedForMixing,
namedCandidates,
superImplemented,
conflicts ?? const [],
@@ -382,9 +380,11 @@
/// such single most specific signature (i.e. no valid override), then add a
/// new conflict description.
List<Conflict> _findMostSpecificFromNamedCandidates(
- LibraryElement library,
+ ClassElement targetClass,
Map<Name, ExecutableElement> map,
Map<Name, List<ExecutableElement>> namedCandidates) {
+ TypeSystemImpl typeSystem = targetClass.library.typeSystem;
+
List<Conflict> conflicts;
for (var name in namedCandidates.keys) {
@@ -412,11 +412,11 @@
// candidates from [I1, I2, S, M1, M2]. But during method lookup
// candidates should be considered in backward order, i.e. from `M2`,
// then from `M1`, then from `S`.
- ExecutableElement validOverride;
+ var validOverrides = <ExecutableElement>[];
for (var i = candidates.length - 1; i >= 0; i--) {
- validOverride = candidates[i];
+ var validOverride = candidates[i];
var overrideHelper = CorrectOverrideHelper(
- library: library,
+ library: targetClass.library,
thisMember: validOverride,
);
for (var j = 0; j < candidates.length; j++) {
@@ -427,16 +427,17 @@
}
}
if (validOverride != null) {
- break;
+ validOverrides.add(validOverride);
}
}
- if (validOverride != null) {
- map[name] = validOverride;
- } else {
+ if (validOverrides.isEmpty) {
conflicts ??= <Conflict>[];
conflicts.add(Conflict(name, candidates));
+ continue;
}
+
+ map[name] = _topMerge(typeSystem, targetClass, validOverrides);
}
return conflicts;
@@ -467,6 +468,72 @@
return declared;
}
+ /// Given one or more [validOverrides], merge them into a single resulting
+ /// signature. This signature always exists.
+ ExecutableElement _topMerge(
+ TypeSystemImpl typeSystem,
+ ClassElement targetClass,
+ List<ExecutableElement> validOverrides,
+ ) {
+ var first = validOverrides[0];
+
+ if (validOverrides.length == 1) {
+ return first;
+ }
+
+ if (!typeSystem.isNonNullableByDefault) {
+ return first;
+ }
+
+ var firstType = first.type;
+ var allTypesEqual = true;
+ for (var executable in validOverrides) {
+ if (executable.type != firstType) {
+ allTypesEqual = false;
+ break;
+ }
+ }
+
+ if (allTypesEqual) {
+ return first;
+ }
+
+ FunctionType resultType;
+ for (var executable in validOverrides) {
+ var type = executable.type;
+ var normalizedType = typeSystem.normalize(type);
+ if (resultType == null) {
+ resultType = normalizedType;
+ } else {
+ resultType = typeSystem.topMerge(resultType, normalizedType);
+ }
+ }
+
+ for (var executable in validOverrides) {
+ if (executable.type == resultType) {
+ return executable;
+ }
+ }
+
+ if (first is MethodElement) {
+ var firstMethod = first;
+ var result = MethodElementImpl(firstMethod.name, -1);
+ result.enclosingElement = targetClass;
+ result.typeParameters = resultType.typeFormals;
+ result.returnType = resultType.returnType;
+ result.parameters = resultType.parameters;
+ return result;
+ } else {
+ var firstAccessor = first as PropertyAccessorElement;
+ var result = PropertyAccessorElementImpl(firstAccessor.name, -1);
+ result.enclosingElement = targetClass;
+ result.getter = firstAccessor.isGetter;
+ result.returnType = resultType.returnType;
+ result.parameters = resultType.parameters;
+ return result;
+ }
+ }
+
static bool _isDeclaredInObject(ExecutableElement element) {
var enclosing = element.enclosingElement;
return enclosing is ClassElement &&
@@ -483,7 +550,6 @@
const {},
<Name>{},
const {},
- const {},
const [{}],
const [],
);
@@ -500,10 +566,6 @@
/// The set of names that are `noSuchMethod` forwarders in [implemented].
final Set<Name> _noSuchMethodForwarders;
- /// The map of names to their concrete implementations that can be mixed
- /// when this type is used as a mixin.
- final Map<Name, ExecutableElement> _implementedForMixing;
-
/// The map of names to their signatures from the mixins, superclasses,
/// or interfaces.
final Map<Name, List<ExecutableElement>> _overridden;
@@ -528,7 +590,6 @@
this.declared,
this.implemented,
this._noSuchMethodForwarders,
- this._implementedForMixing,
this._overridden,
this._superImplemented,
this.conflicts,
diff --git a/pkg/analyzer/lib/src/dart/element/top_merge.dart b/pkg/analyzer/lib/src/dart/element/top_merge.dart
index 334b6c2..2db7d00 100644
--- a/pkg/analyzer/lib/src/dart/element/top_merge.dart
+++ b/pkg/analyzer/lib/src/dart/element/top_merge.dart
@@ -9,6 +9,7 @@
import 'package:analyzer/src/dart/element/type.dart';
import 'package:analyzer/src/dart/element/type_algebra.dart';
import 'package:analyzer/src/generated/type_system.dart';
+import 'package:analyzer/src/generated/utilities_dart.dart';
class TopMergeHelper {
final TypeSystemImpl typeSystem;
@@ -212,13 +213,8 @@
var T_parameter = T_parameters[i];
var S_parameter = S_parameters[i];
- // ignore: deprecated_member_use_from_same_package
- var T_kind = T_parameter.parameterKind;
-
- // ignore: deprecated_member_use_from_same_package
- var S_kind = S_parameter.parameterKind;
-
- if (T_kind != S_kind) {
+ var R_kind = _parameterKind(T_parameter, S_parameter);
+ if (R_kind == null) {
throw _TopMergeStateError(T, S, 'Different formal parameter kinds');
}
@@ -257,7 +253,7 @@
R_parameters[i] = ParameterElementImpl.synthetic(
T_parameter.name,
R_type,
- T_kind,
+ R_kind,
)..isExplicitlyCovariant = R_isCovariant;
}
@@ -290,6 +286,31 @@
}
}
+ ParameterKind _parameterKind(
+ ParameterElement T_parameter,
+ ParameterElement S_parameter,
+ ) {
+ // ignore: deprecated_member_use_from_same_package
+ var T_kind = T_parameter.parameterKind;
+
+ // ignore: deprecated_member_use_from_same_package
+ var S_kind = S_parameter.parameterKind;
+
+ if (T_kind == S_kind) {
+ return T_kind;
+ }
+
+ // Legacy named vs. Required named.
+ if (T_kind == ParameterKind.NAMED_REQUIRED &&
+ S_kind == ParameterKind.NAMED ||
+ T_kind == ParameterKind.NAMED &&
+ S_kind == ParameterKind.NAMED_REQUIRED) {
+ return ParameterKind.NAMED_REQUIRED;
+ }
+
+ return null;
+ }
+
_MergeTypeParametersResult _typeParameters(
List<TypeParameterElement> aParameters,
List<TypeParameterElement> bParameters,
diff --git a/pkg/analyzer/lib/src/dart/error/syntactic_errors.dart b/pkg/analyzer/lib/src/dart/error/syntactic_errors.dart
index 88fc991..50f4dd5 100644
--- a/pkg/analyzer/lib/src/dart/error/syntactic_errors.dart
+++ b/pkg/analyzer/lib/src/dart/error/syntactic_errors.dart
@@ -116,6 +116,11 @@
static const ParserErrorCode COVARIANT_AND_STATIC = _COVARIANT_AND_STATIC;
+ static const ParserErrorCode COVARIANT_CONSTRUCTOR = ParserErrorCode(
+ 'COVARIANT_CONSTRUCTOR',
+ "A constructor can't be declared to be 'covariant'.",
+ correction: "Try removing the keyword 'covariant'.");
+
static const ParserErrorCode COVARIANT_MEMBER = _COVARIANT_MEMBER;
static const ParserErrorCode COVARIANT_TOP_LEVEL_DECLARATION =
@@ -123,21 +128,18 @@
"Top-level declarations can't be declared to be covariant.",
correction: "Try removing the keyword 'covariant'.");
- static const ParserErrorCode COVARIANT_CONSTRUCTOR = ParserErrorCode(
- 'COVARIANT_CONSTRUCTOR',
- "A constructor can't be declared to be 'covariant'.",
- correction: "Try removing the keyword 'covariant'.");
-
- static const ParserErrorCode DEFERRED_AFTER_PREFIX = _DEFERRED_AFTER_PREFIX;
-
static const ParserErrorCode DEFAULT_VALUE_IN_FUNCTION_TYPE = ParserErrorCode(
'DEFAULT_VALUE_IN_FUNCTION_TYPE',
"Parameters in a function type cannot have default values",
correction: "Try removing the default value.");
+ static const ParserErrorCode DEFERRED_AFTER_PREFIX = _DEFERRED_AFTER_PREFIX;
+
static const ParserErrorCode DIRECTIVE_AFTER_DECLARATION =
_DIRECTIVE_AFTER_DECLARATION;
+ static const ParserErrorCode DUPLICATE_DEFERRED = _DUPLICATE_DEFERRED;
+
/**
* Parameters:
* 0: the label that was duplicated
@@ -145,7 +147,7 @@
static const ParserErrorCode DUPLICATE_LABEL_IN_SWITCH_STATEMENT =
_DUPLICATE_LABEL_IN_SWITCH_STATEMENT;
- static const ParserErrorCode DUPLICATE_DEFERRED = _DUPLICATE_DEFERRED;
+ static const ParserErrorCode DUPLICATE_PREFIX = _DUPLICATE_PREFIX;
/**
* Parameters:
@@ -153,8 +155,6 @@
*/
static const ParserErrorCode DUPLICATED_MODIFIER = _DUPLICATED_MODIFIER;
- static const ParserErrorCode DUPLICATE_PREFIX = _DUPLICATE_PREFIX;
-
static const ParserErrorCode EMPTY_ENUM_BODY = ParserErrorCode(
'EMPTY_ENUM_BODY', "An enum must declare at least one constant name.",
correction: "Try declaring a constant.");
@@ -182,6 +182,8 @@
correction:
"This appears to be incomplete code. Try removing it or completing it.");
+ static const ParserErrorCode EXPECTED_INSTEAD = _EXPECTED_INSTEAD;
+
static const ParserErrorCode EXPECTED_LIST_OR_MAP_LITERAL = ParserErrorCode(
'EXPECTED_LIST_OR_MAP_LITERAL', "Expected a list or map literal.",
correction:
@@ -197,8 +199,6 @@
static const ParserErrorCode EXPECTED_TOKEN =
ParserErrorCode('EXPECTED_TOKEN', "Expected to find '{0}'.");
- static const ParserErrorCode EXPECTED_INSTEAD = _EXPECTED_INSTEAD;
-
static const ParserErrorCode EXPECTED_TYPE_NAME =
ParserErrorCode('EXPECTED_TYPE_NAME', "Expected a type name.");
@@ -297,6 +297,9 @@
static const ParserErrorCode EXTERNAL_CONSTRUCTOR_WITH_BODY =
_EXTERNAL_CONSTRUCTOR_WITH_BODY;
+ static const ParserErrorCode EXTERNAL_CONSTRUCTOR_WITH_INITIALIZER =
+ _EXTERNAL_CONSTRUCTOR_WITH_INITIALIZER;
+
static const ParserErrorCode EXTERNAL_ENUM = _EXTERNAL_ENUM;
static const ParserErrorCode EXTERNAL_FACTORY_REDIRECTION =
@@ -344,12 +347,12 @@
"A non-redirecting 'factory' constructor must have a body.",
correction: "Try adding a body to the constructor.");
- static const ParserErrorCode FIELD_INITIALIZER_OUTSIDE_CONSTRUCTOR =
- _FIELD_INITIALIZER_OUTSIDE_CONSTRUCTOR;
-
static const ParserErrorCode FIELD_INITIALIZED_OUTSIDE_DECLARING_CLASS =
_FIELD_INITIALIZED_OUTSIDE_DECLARING_CLASS;
+ static const ParserErrorCode FIELD_INITIALIZER_OUTSIDE_CONSTRUCTOR =
+ _FIELD_INITIALIZER_OUTSIDE_CONSTRUCTOR;
+
static const ParserErrorCode FINAL_AND_COVARIANT = _FINAL_AND_COVARIANT;
static const ParserErrorCode FINAL_AND_COVARIANT_LATE_WITH_INITIALIZER =
@@ -382,6 +385,8 @@
"Function-typed parameters can't specify 'const', 'final' or 'var' in place of a return type.",
correction: "Try replacing the keyword with a return type.");
+ static const ParserErrorCode GETTER_CONSTRUCTOR = _GETTER_CONSTRUCTOR;
+
static const ParserErrorCode GETTER_IN_FUNCTION = ParserErrorCode(
'GETTER_IN_FUNCTION',
"Getters can't be defined within methods or functions.",
@@ -425,10 +430,8 @@
"Comment references should contain a possibly prefixed identifier and "
"can start with 'new', but shouldn't contain anything else.");
- static const ParserErrorCode INVALID_CONSTRUCTOR_NAME = ParserErrorCode(
- 'INVALID_CONSTRUCTOR_NAME',
- "The keyword '{0}' cannot be used to name a constructor.",
- correction: "Try giving the constructor a different name.");
+ static const ParserErrorCode INVALID_CONSTRUCTOR_NAME =
+ _INVALID_CONSTRUCTOR_NAME;
static const ParserErrorCode INVALID_GENERIC_FUNCTION_TYPE = ParserErrorCode(
'INVALID_GENERIC_FUNCTION_TYPE', "Invalid generic function type.",
@@ -522,6 +525,8 @@
"Local function declarations can't specify any modifiers.",
correction: "Try removing the modifier.");
+ static const ParserErrorCode MEMBER_WITH_CLASS_NAME = _MEMBER_WITH_CLASS_NAME;
+
static const ParserErrorCode MISSING_ASSIGNABLE_SELECTOR =
_MISSING_ASSIGNABLE_SELECTOR;
@@ -704,6 +709,9 @@
"through native extensions.",
correction: "Try removing the native clause.");
+ static const ParserErrorCode NATIVE_CLAUSE_SHOULD_BE_ANNOTATION =
+ _NATIVE_CLAUSE_SHOULD_BE_ANNOTATION;
+
static const ParserErrorCode NATIVE_FUNCTION_BODY_IN_NON_SDK_CODE =
ParserErrorCode(
'NATIVE_FUNCTION_BODY_IN_NON_SDK_CODE',
@@ -711,9 +719,6 @@
"loaded through native extensions.",
correction: "Try removing the word 'native'.");
- static const ParserErrorCode NATIVE_CLAUSE_SHOULD_BE_ANNOTATION =
- _NATIVE_CLAUSE_SHOULD_BE_ANNOTATION;
-
static const ParserErrorCode NON_CONSTRUCTOR_FACTORY = ParserErrorCode(
'NON_CONSTRUCTOR_FACTORY',
"Only a constructor can be declared to be a factory.",
@@ -772,6 +777,8 @@
static const ParserErrorCode REDIRECTION_IN_NON_FACTORY_CONSTRUCTOR =
_REDIRECTION_IN_NON_FACTORY_CONSTRUCTOR;
+ static const ParserErrorCode SETTER_CONSTRUCTOR = _SETTER_CONSTRUCTOR;
+
static const ParserErrorCode SETTER_IN_FUNCTION = ParserErrorCode(
'SETTER_IN_FUNCTION',
"Setters can't be defined within methods or functions.",
@@ -817,8 +824,6 @@
static const ParserErrorCode TYPE_BEFORE_FACTORY = _TYPE_BEFORE_FACTORY;
- static const ParserErrorCode TYPEDEF_IN_CLASS = _TYPEDEF_IN_CLASS;
-
static const ParserErrorCode TYPE_PARAMETER_ON_CONSTRUCTOR =
_TYPE_PARAMETER_ON_CONSTRUCTOR;
@@ -831,6 +836,8 @@
"Types parameters aren't allowed when defining an operator.",
correction: "Try removing the type parameters.");
+ static const ParserErrorCode TYPEDEF_IN_CLASS = _TYPEDEF_IN_CLASS;
+
/**
* Parameters:
* 0: the starting character that was missing
@@ -848,23 +855,6 @@
'UNEXPECTED_TOKEN', "Unexpected text '{0}'.",
correction: "Try removing the text.");
- static const ParserErrorCode WITH_BEFORE_EXTENDS = _WITH_BEFORE_EXTENDS;
-
- static const ParserErrorCode WRONG_SEPARATOR_FOR_POSITIONAL_PARAMETER =
- ParserErrorCode('WRONG_SEPARATOR_FOR_POSITIONAL_PARAMETER',
- "The default value of a positional parameter should be preceded by '='.",
- correction: "Try replacing the ':' with '='.");
-
- /**
- * Parameters:
- * 0: the terminator that was expected
- * 1: the terminator that was found
- */
- static const ParserErrorCode WRONG_TERMINATOR_FOR_PARAMETER_GROUP =
- ParserErrorCode('WRONG_TERMINATOR_FOR_PARAMETER_GROUP',
- "Expected '{0}' to close parameter group.",
- correction: "Try replacing '{0}' with '{1}'.");
-
static const ParserErrorCode VAR_AND_TYPE = _VAR_AND_TYPE;
static const ParserErrorCode VAR_AS_TYPE_NAME = _VAR_AS_TYPE_NAME;
@@ -887,6 +877,23 @@
static const ParserErrorCode VOID_WITH_TYPE_ARGUMENTS =
_VOID_WITH_TYPE_ARGUMENTS;
+ static const ParserErrorCode WITH_BEFORE_EXTENDS = _WITH_BEFORE_EXTENDS;
+
+ static const ParserErrorCode WRONG_SEPARATOR_FOR_POSITIONAL_PARAMETER =
+ ParserErrorCode('WRONG_SEPARATOR_FOR_POSITIONAL_PARAMETER',
+ "The default value of a positional parameter should be preceded by '='.",
+ correction: "Try replacing the ':' with '='.");
+
+ /**
+ * Parameters:
+ * 0: the terminator that was expected
+ * 1: the terminator that was found
+ */
+ static const ParserErrorCode WRONG_TERMINATOR_FOR_PARAMETER_GROUP =
+ ParserErrorCode('WRONG_TERMINATOR_FOR_PARAMETER_GROUP',
+ "Expected '{0}' to close parameter group.",
+ correction: "Try replacing '{0}' with '{1}'.");
+
/**
* Initialize a newly created error code to have the given [name]. The message
* associated with the error will be created from the given [message]
diff --git a/pkg/analyzer/lib/src/dart/error/syntactic_errors.g.dart b/pkg/analyzer/lib/src/dart/error/syntactic_errors.g.dart
index a6061ec..85aeefe 100644
--- a/pkg/analyzer/lib/src/dart/error/syntactic_errors.g.dart
+++ b/pkg/analyzer/lib/src/dart/error/syntactic_errors.g.dart
@@ -109,6 +109,11 @@
_TYPE_PARAMETER_ON_CONSTRUCTOR,
_VOID_WITH_TYPE_ARGUMENTS,
_FINAL_AND_COVARIANT_LATE_WITH_INITIALIZER,
+ _INVALID_CONSTRUCTOR_NAME,
+ _GETTER_CONSTRUCTOR,
+ _SETTER_CONSTRUCTOR,
+ _MEMBER_WITH_CLASS_NAME,
+ _EXTERNAL_CONSTRUCTOR_WITH_INITIALIZER,
];
const ParserErrorCode _ABSTRACT_CLASS_MEMBER = ParserErrorCode(
@@ -278,6 +283,10 @@
correction:
"Try removing the body of the constructor, or removing the keyword 'external'.");
+const ParserErrorCode _EXTERNAL_CONSTRUCTOR_WITH_INITIALIZER = ParserErrorCode(
+ 'EXTERNAL_CONSTRUCTOR_WITH_INITIALIZER',
+ r"An external constructor can't have any initializers.");
+
const ParserErrorCode _EXTERNAL_ENUM = ParserErrorCode(
'EXTERNAL_ENUM', r"Enums can't be declared to be 'external'.",
correction: "Try removing the keyword 'external'.");
@@ -339,6 +348,10 @@
'FINAL_AND_VAR', r"Members can't be declared to be both 'final' and 'var'.",
correction: "Try removing the keyword 'var'.");
+const ParserErrorCode _GETTER_CONSTRUCTOR = ParserErrorCode(
+ 'GETTER_CONSTRUCTOR', r"Constructors can't be a getter.",
+ correction: "Try removing 'get'.");
+
const ParserErrorCode _ILLEGAL_ASSIGNMENT_TO_NON_ASSIGNABLE = ParserErrorCode(
'ILLEGAL_ASSIGNMENT_TO_NON_ASSIGNABLE',
r"Illegal assignment to non-assignable expression.");
@@ -374,6 +387,10 @@
r"The keyword 'await' isn't allowed for a normal 'for' statement.",
correction: "Try removing the keyword, or use a for-each statement.");
+const ParserErrorCode _INVALID_CONSTRUCTOR_NAME = ParserErrorCode(
+ 'INVALID_CONSTRUCTOR_NAME',
+ r"The name of a constructor must match the name of the enclosing class.");
+
const ParserErrorCode _INVALID_HEX_ESCAPE = ParserErrorCode(
'INVALID_HEX_ESCAPE',
r"An escape sequence starting with '\x' must be followed by 2 hexadecimal digits.");
@@ -414,6 +431,11 @@
correction:
"Try moving the library directive before any other directives.");
+const ParserErrorCode _MEMBER_WITH_CLASS_NAME = ParserErrorCode(
+ 'MEMBER_WITH_CLASS_NAME',
+ r"A class member can't have the same name as the enclosing class.",
+ correction: "Try renaming the member.");
+
const ParserErrorCode _MISSING_ASSIGNABLE_SELECTOR = ParserErrorCode(
'MISSING_ASSIGNABLE_SELECTOR',
r"Missing selector such as '.identifier' or '[0]'.",
@@ -525,6 +547,10 @@
correction:
"Try making this a factory constructor, or remove the redirection.");
+const ParserErrorCode _SETTER_CONSTRUCTOR = ParserErrorCode(
+ 'SETTER_CONSTRUCTOR', r"Constructors can't be a setter.",
+ correction: "Try removing 'set'.");
+
const ParserErrorCode _STACK_OVERFLOW = ParserErrorCode('STACK_OVERFLOW',
r"The file has too many nested expressions or statements.",
correction: "Try simplifying the code.");
diff --git a/pkg/analyzer/lib/src/dart/micro/library_analyzer.dart b/pkg/analyzer/lib/src/dart/micro/library_analyzer.dart
index 2b74ca3..6dda3a4 100644
--- a/pkg/analyzer/lib/src/dart/micro/library_analyzer.dart
+++ b/pkg/analyzer/lib/src/dart/micro/library_analyzer.dart
@@ -193,7 +193,7 @@
PerformanceStatistics.lints.makeCurrentWhile(() {
var allUnits = _library.libraryFiles.map(
(file) {
- var content = getFileContent(file.path);
+ var content = _getFileContent(file.path);
return LinterContextUnit(content, units[file]);
},
).toList();
@@ -268,7 +268,7 @@
unit.accept(Dart2JSVerifier(errorReporter));
}
- var content = getFileContent(file.path);
+ var content = _getFileContent(file.path);
unit.accept(BestPracticesVerifier(
errorReporter, _typeProvider, _libraryElement, unit, content,
typeSystem: _typeSystem,
@@ -518,7 +518,8 @@
*/
CompilationUnit _parse(FileState file) {
AnalysisErrorListener errorListener = _getErrorListener(file);
- String content = getFileContent(file.path);
+ String content = _getFileContent(file.path);
+
CompilationUnit unit = file.parse(errorListener, content);
LineInfo lineInfo = unit.lineInfo;
@@ -788,6 +789,17 @@
}
/**
+ * Catch all exceptions from the `getFileContent` function.
+ */
+ String _getFileContent(String path) {
+ try {
+ return getFileContent(path);
+ } catch (_) {
+ return '';
+ }
+ }
+
+ /**
* Return `true` if the given [source] refers to a file that is assumed to be
* generated.
*/
diff --git a/pkg/analyzer/lib/src/dart/resolver/method_invocation_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/method_invocation_resolver.dart
index 9c45ee3..bf681d1 100644
--- a/pkg/analyzer/lib/src/dart/resolver/method_invocation_resolver.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/method_invocation_resolver.dart
@@ -572,6 +572,7 @@
SimpleIdentifier nameNode, String name) {
var enclosingClass = _resolver.enclosingClass;
if (SuperContext.of(receiver) != SuperContext.valid) {
+ _setDynamicResolution(node);
return;
}
diff --git a/pkg/analyzer/lib/src/dart/resolver/resolution_visitor.dart b/pkg/analyzer/lib/src/dart/resolver/resolution_visitor.dart
index 879e4e8..dd3dbcd1 100644
--- a/pkg/analyzer/lib/src/dart/resolver/resolution_visitor.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/resolution_visitor.dart
@@ -476,6 +476,7 @@
// ignore: deprecated_member_use_from_same_package
element.parameterKind = node.kind;
_setCodeRange(element, node);
+ element.metadata = _createElementAnnotations(node.metadata);
}
nameNode.staticElement = element;
}
diff --git a/pkg/analyzer/lib/src/error/codes.dart b/pkg/analyzer/lib/src/error/codes.dart
index b857c95..9ab905c 100644
--- a/pkg/analyzer/lib/src/error/codes.dart
+++ b/pkg/analyzer/lib/src/error/codes.dart
@@ -3502,6 +3502,7 @@
* 7 Classes: It is a compile time error if a class <i>C</i> declares a member
* with the same name as <i>C</i>.
*/
+ @Deprecated('Superseded by ParserErrorCode.MEMBER_WITH_CLASS_NAME')
static const CompileTimeErrorCode MEMBER_WITH_CLASS_NAME =
CompileTimeErrorCode('MEMBER_WITH_CLASS_NAME',
"Class members can't have the same name as the enclosing class.");
diff --git a/pkg/analyzer/lib/src/fasta/ast_builder.dart b/pkg/analyzer/lib/src/fasta/ast_builder.dart
index 770d6be..7828dae 100644
--- a/pkg/analyzer/lib/src/fasta/ast_builder.dart
+++ b/pkg/analyzer/lib/src/fasta/ast_builder.dart
@@ -8,7 +8,6 @@
Message,
MessageCode,
messageConstConstructorWithBody,
- messageConstructorWithReturnType,
messageConstructorWithTypeParameters,
messageDirectiveAfterDeclaration,
messageExpectedStatement,
@@ -668,7 +667,7 @@
FormalParameterList parameters = pop();
TypeParameterList typeParameters = pop();
var name = pop();
- TypeAnnotation returnType = pop();
+ pop(); // return type
_Modifiers modifiers = pop();
List<Annotation> metadata = pop();
Comment comment = _findComment(metadata, beginToken);
@@ -718,11 +717,6 @@
handleRecoverableError(
messageConstConstructorWithBody, bodyToken, bodyToken);
}
- if (returnType != null) {
- // This error is also reported in OutlineBuilder.endMethod
- handleRecoverableError(messageConstructorWithReturnType,
- returnType.beginToken, returnType.beginToken);
- }
ConstructorDeclaration constructor = ast.constructorDeclaration(
comment,
metadata,
diff --git a/pkg/analyzer/lib/src/fasta/error_converter.dart b/pkg/analyzer/lib/src/fasta/error_converter.dart
index 320a314..7a75120 100644
--- a/pkg/analyzer/lib/src/fasta/error_converter.dart
+++ b/pkg/analyzer/lib/src/fasta/error_converter.dart
@@ -175,10 +175,6 @@
errorReporter?.reportErrorForOffset(
ParserErrorCode.INVALID_CODE_POINT, offset, length, ['\\u{...}']);
return;
- case "INVALID_CONSTRUCTOR_NAME":
- errorReporter?.reportErrorForOffset(
- CompileTimeErrorCode.INVALID_CONSTRUCTOR_NAME, offset, length);
- return;
case "INVALID_GENERIC_FUNCTION_TYPE":
errorReporter?.reportErrorForOffset(
ParserErrorCode.INVALID_GENERIC_FUNCTION_TYPE, offset, length);
diff --git a/pkg/analyzer/lib/src/generated/element_resolver.dart b/pkg/analyzer/lib/src/generated/element_resolver.dart
index 7f41b77..cc87d16 100644
--- a/pkg/analyzer/lib/src/generated/element_resolver.dart
+++ b/pkg/analyzer/lib/src/generated/element_resolver.dart
@@ -722,8 +722,7 @@
CompileTimeErrorCode.INVALID_FACTORY_NAME_NOT_A_CLASS, node);
} else if (_isConstructorReturnType(node) &&
!identical(element, enclosingClass)) {
- _errorReporter.reportErrorForNode(
- CompileTimeErrorCode.INVALID_CONSTRUCTOR_NAME, node);
+ // This error is now reported by the parser.
element = null;
} else if (element == null ||
(element is PrefixElement && !_isValidAsPrefix(node))) {
diff --git a/pkg/analyzer/lib/src/generated/engine.dart b/pkg/analyzer/lib/src/generated/engine.dart
index 9b8c2980..aa2c4e3 100644
--- a/pkg/analyzer/lib/src/generated/engine.dart
+++ b/pkg/analyzer/lib/src/generated/engine.dart
@@ -758,6 +758,10 @@
buffer.addBool(enableLazyAssignmentOperators);
buffer.addBool(useFastaParser);
+ // Append the current language version.
+ buffer.addInt(ExperimentStatus.currentVersion.major);
+ buffer.addInt(ExperimentStatus.currentVersion.minor);
+
// Append features.
buffer.addInt(ExperimentStatus.knownFeatures.length);
for (var feature in ExperimentStatus.knownFeatures.values) {
diff --git a/pkg/analyzer/lib/src/generated/error_verifier.dart b/pkg/analyzer/lib/src/generated/error_verifier.dart
index a67b61e..3336cd5 100644
--- a/pkg/analyzer/lib/src/generated/error_verifier.dart
+++ b/pkg/analyzer/lib/src/generated/error_verifier.dart
@@ -455,7 +455,6 @@
_duplicateDefinitionVerifier.checkClass(node);
_checkForBuiltInIdentifierAsName(
node.name, CompileTimeErrorCode.BUILT_IN_IDENTIFIER_AS_TYPE_NAME);
- _checkForMemberWithClassName();
_checkForNoDefaultSuperConstructorImplicit(node);
_checkForConflictingTypeVariableErrorCodes();
TypeName superclass = node.extendsClause?.superclass;
@@ -1007,7 +1006,6 @@
_duplicateDefinitionVerifier.checkMixin(node);
_checkForBuiltInIdentifierAsName(
node.name, CompileTimeErrorCode.BUILT_IN_IDENTIFIER_AS_TYPE_NAME);
- _checkForMemberWithClassName();
_checkForConflictingTypeVariableErrorCodes();
OnClause onClause = node.onClause;
@@ -3380,31 +3378,6 @@
}
/**
- * Verify that the [_enclosingClass] does not define members with the same name
- * as the enclosing class.
- *
- * See [CompileTimeErrorCode.MEMBER_WITH_CLASS_NAME].
- */
- void _checkForMemberWithClassName() {
- if (_enclosingClass == null) {
- return;
- }
- String className = _enclosingClass.name;
- if (className == null) {
- return;
- }
-
- // check accessors
- for (PropertyAccessorElement accessor in _enclosingClass.accessors) {
- if (className == accessor.displayName) {
- _errorReporter.reportErrorForElement(
- CompileTimeErrorCode.MEMBER_WITH_CLASS_NAME, accessor);
- }
- }
- // don't check methods, they would be constructors
- }
-
- /**
* Check to make sure that the given switch [statement] whose static type is
* an enum type either have a default case or include all of the enum
* constants.
@@ -4990,42 +4963,52 @@
void _checkForWrongTypeParameterVarianceInMethod(MethodDeclaration method) {
// Only need to report errors for parameters with explicitly defined type
// parameters in classes or mixins.
- if (_enclosingClass != null) {
- for (var typeParameter in _enclosingClass.typeParameters) {
- // TODO (kallentu) : Clean up TypeParameterElementImpl casting once
- // variance is added to the interface.
- if (!(typeParameter as TypeParameterElementImpl).isLegacyCovariant) {
- if (method.typeParameters != null) {
- for (var methodTypeParameter
- in method.typeParameters.typeParameters) {
- Variance methodTypeParameterVariance = Variance.invariant.combine(
- Variance(typeParameter, methodTypeParameter.bound.type));
- _checkForWrongVariancePosition(methodTypeParameterVariance,
- typeParameter, methodTypeParameter);
- }
+ if (_enclosingClass == null) {
+ return;
+ }
+
+ for (var typeParameter in _enclosingClass.typeParameters) {
+ // TODO (kallentu) : Clean up TypeParameterElementImpl casting once
+ // variance is added to the interface.
+ if ((typeParameter as TypeParameterElementImpl).isLegacyCovariant) {
+ continue;
+ }
+
+ var methodTypeParameters = method.typeParameters?.typeParameters;
+ if (methodTypeParameters != null) {
+ for (var methodTypeParameter in methodTypeParameters) {
+ if (methodTypeParameter.bound == null) {
+ continue;
}
- if (method.parameters != null) {
- for (int i = 0; i < method.parameters.parameters.length; i++) {
- var methodParameterElement =
- method.parameters.parameterElements[i];
- var methodParameterNode = method.parameters.parameters[i];
- if (!methodParameterElement.isCovariant) {
- Variance methodParameterVariance = Variance.contravariant
- .combine(
- Variance(typeParameter, methodParameterElement.type));
- _checkForWrongVariancePosition(methodParameterVariance,
- typeParameter, methodParameterNode);
- }
- }
- }
- if (method.returnType != null) {
- Variance methodReturnTypeVariance =
- Variance(typeParameter, method.returnType.type);
- _checkForWrongVariancePosition(
- methodReturnTypeVariance, typeParameter, method.returnType);
- }
+ var methodTypeParameterVariance = Variance.invariant.combine(
+ Variance(typeParameter, methodTypeParameter.bound.type),
+ );
+ _checkForWrongVariancePosition(
+ methodTypeParameterVariance, typeParameter, methodTypeParameter);
}
}
+
+ var methodParameters = method.parameters?.parameters;
+ if (methodParameters != null) {
+ for (var methodParameter in methodParameters) {
+ var methodParameterElement = methodParameter.declaredElement;
+ if (methodParameterElement.isCovariant) {
+ continue;
+ }
+ var methodParameterVariance = Variance.contravariant.combine(
+ Variance(typeParameter, methodParameterElement.type),
+ );
+ _checkForWrongVariancePosition(
+ methodParameterVariance, typeParameter, methodParameter);
+ }
+ }
+
+ var returnType = method.returnType;
+ if (returnType != null) {
+ var methodReturnTypeVariance = Variance(typeParameter, returnType.type);
+ _checkForWrongVariancePosition(
+ methodReturnTypeVariance, typeParameter, returnType);
+ }
}
}
diff --git a/pkg/analyzer/lib/src/summary/format.dart b/pkg/analyzer/lib/src/summary/format.dart
index 9ccf569..2294207 100644
--- a/pkg/analyzer/lib/src/summary/format.dart
+++ b/pkg/analyzer/lib/src/summary/format.dart
@@ -3508,6 +3508,277 @@
String toString() => convert.json.encode(toJson());
}
+class CiderLinkedLibraryCycleBuilder extends Object
+ with _CiderLinkedLibraryCycleMixin
+ implements idl.CiderLinkedLibraryCycle {
+ LinkedNodeBundleBuilder _bundle;
+ List<int> _signature;
+
+ @override
+ LinkedNodeBundleBuilder get bundle => _bundle;
+
+ set bundle(LinkedNodeBundleBuilder value) {
+ this._bundle = value;
+ }
+
+ @override
+ List<int> get signature => _signature ??= <int>[];
+
+ /// The hash signature for this linked cycle. It depends of API signatures
+ /// of all files in the cycle, and on the signatures of the transitive
+ /// closure of the cycle dependencies.
+ set signature(List<int> value) {
+ assert(value == null || value.every((e) => e >= 0));
+ this._signature = value;
+ }
+
+ CiderLinkedLibraryCycleBuilder(
+ {LinkedNodeBundleBuilder bundle, List<int> signature})
+ : _bundle = bundle,
+ _signature = signature;
+
+ /// Flush [informative] data recursively.
+ void flushInformative() {
+ _bundle?.flushInformative();
+ }
+
+ /// Accumulate non-[informative] data into [signature].
+ void collectApiSignature(api_sig.ApiSignature signature) {
+ if (this._signature == null) {
+ signature.addInt(0);
+ } else {
+ signature.addInt(this._signature.length);
+ for (var x in this._signature) {
+ signature.addInt(x);
+ }
+ }
+ signature.addBool(this._bundle != null);
+ this._bundle?.collectApiSignature(signature);
+ }
+
+ List<int> toBuffer() {
+ fb.Builder fbBuilder = fb.Builder();
+ return fbBuilder.finish(finish(fbBuilder), "CLNB");
+ }
+
+ fb.Offset finish(fb.Builder fbBuilder) {
+ fb.Offset offset_bundle;
+ fb.Offset offset_signature;
+ if (_bundle != null) {
+ offset_bundle = _bundle.finish(fbBuilder);
+ }
+ if (!(_signature == null || _signature.isEmpty)) {
+ offset_signature = fbBuilder.writeListUint32(_signature);
+ }
+ fbBuilder.startTable();
+ if (offset_bundle != null) {
+ fbBuilder.addOffset(1, offset_bundle);
+ }
+ if (offset_signature != null) {
+ fbBuilder.addOffset(0, offset_signature);
+ }
+ return fbBuilder.endTable();
+ }
+}
+
+idl.CiderLinkedLibraryCycle readCiderLinkedLibraryCycle(List<int> buffer) {
+ fb.BufferContext rootRef = fb.BufferContext.fromBytes(buffer);
+ return const _CiderLinkedLibraryCycleReader().read(rootRef, 0);
+}
+
+class _CiderLinkedLibraryCycleReader
+ extends fb.TableReader<_CiderLinkedLibraryCycleImpl> {
+ const _CiderLinkedLibraryCycleReader();
+
+ @override
+ _CiderLinkedLibraryCycleImpl createObject(fb.BufferContext bc, int offset) =>
+ _CiderLinkedLibraryCycleImpl(bc, offset);
+}
+
+class _CiderLinkedLibraryCycleImpl extends Object
+ with _CiderLinkedLibraryCycleMixin
+ implements idl.CiderLinkedLibraryCycle {
+ final fb.BufferContext _bc;
+ final int _bcOffset;
+
+ _CiderLinkedLibraryCycleImpl(this._bc, this._bcOffset);
+
+ idl.LinkedNodeBundle _bundle;
+ List<int> _signature;
+
+ @override
+ idl.LinkedNodeBundle get bundle {
+ _bundle ??=
+ const _LinkedNodeBundleReader().vTableGet(_bc, _bcOffset, 1, null);
+ return _bundle;
+ }
+
+ @override
+ List<int> get signature {
+ _signature ??=
+ const fb.Uint32ListReader().vTableGet(_bc, _bcOffset, 0, const <int>[]);
+ return _signature;
+ }
+}
+
+abstract class _CiderLinkedLibraryCycleMixin
+ implements idl.CiderLinkedLibraryCycle {
+ @override
+ Map<String, Object> toJson() {
+ Map<String, Object> _result = <String, Object>{};
+ if (bundle != null) {
+ _result["bundle"] = bundle.toJson();
+ }
+ if (signature.isNotEmpty) {
+ _result["signature"] = signature;
+ }
+ return _result;
+ }
+
+ @override
+ Map<String, Object> toMap() => {
+ "bundle": bundle,
+ "signature": signature,
+ };
+
+ @override
+ String toString() => convert.json.encode(toJson());
+}
+
+class CiderUnlinkedUnitBuilder extends Object
+ with _CiderUnlinkedUnitMixin
+ implements idl.CiderUnlinkedUnit {
+ List<int> _contentDigest;
+ UnlinkedUnit2Builder _unlinkedUnit;
+
+ @override
+ List<int> get contentDigest => _contentDigest ??= <int>[];
+
+ /// The hash signature of the contents of the file.
+ set contentDigest(List<int> value) {
+ assert(value == null || value.every((e) => e >= 0));
+ this._contentDigest = value;
+ }
+
+ @override
+ UnlinkedUnit2Builder get unlinkedUnit => _unlinkedUnit;
+
+ /// Unlinked summary of the compilation unit.
+ set unlinkedUnit(UnlinkedUnit2Builder value) {
+ this._unlinkedUnit = value;
+ }
+
+ CiderUnlinkedUnitBuilder(
+ {List<int> contentDigest, UnlinkedUnit2Builder unlinkedUnit})
+ : _contentDigest = contentDigest,
+ _unlinkedUnit = unlinkedUnit;
+
+ /// Flush [informative] data recursively.
+ void flushInformative() {
+ _unlinkedUnit?.flushInformative();
+ }
+
+ /// Accumulate non-[informative] data into [signature].
+ void collectApiSignature(api_sig.ApiSignature signature) {
+ if (this._contentDigest == null) {
+ signature.addInt(0);
+ } else {
+ signature.addInt(this._contentDigest.length);
+ for (var x in this._contentDigest) {
+ signature.addInt(x);
+ }
+ }
+ signature.addBool(this._unlinkedUnit != null);
+ this._unlinkedUnit?.collectApiSignature(signature);
+ }
+
+ List<int> toBuffer() {
+ fb.Builder fbBuilder = fb.Builder();
+ return fbBuilder.finish(finish(fbBuilder), "CUUN");
+ }
+
+ fb.Offset finish(fb.Builder fbBuilder) {
+ fb.Offset offset_contentDigest;
+ fb.Offset offset_unlinkedUnit;
+ if (!(_contentDigest == null || _contentDigest.isEmpty)) {
+ offset_contentDigest = fbBuilder.writeListUint32(_contentDigest);
+ }
+ if (_unlinkedUnit != null) {
+ offset_unlinkedUnit = _unlinkedUnit.finish(fbBuilder);
+ }
+ fbBuilder.startTable();
+ if (offset_contentDigest != null) {
+ fbBuilder.addOffset(0, offset_contentDigest);
+ }
+ if (offset_unlinkedUnit != null) {
+ fbBuilder.addOffset(1, offset_unlinkedUnit);
+ }
+ return fbBuilder.endTable();
+ }
+}
+
+idl.CiderUnlinkedUnit readCiderUnlinkedUnit(List<int> buffer) {
+ fb.BufferContext rootRef = fb.BufferContext.fromBytes(buffer);
+ return const _CiderUnlinkedUnitReader().read(rootRef, 0);
+}
+
+class _CiderUnlinkedUnitReader extends fb.TableReader<_CiderUnlinkedUnitImpl> {
+ const _CiderUnlinkedUnitReader();
+
+ @override
+ _CiderUnlinkedUnitImpl createObject(fb.BufferContext bc, int offset) =>
+ _CiderUnlinkedUnitImpl(bc, offset);
+}
+
+class _CiderUnlinkedUnitImpl extends Object
+ with _CiderUnlinkedUnitMixin
+ implements idl.CiderUnlinkedUnit {
+ final fb.BufferContext _bc;
+ final int _bcOffset;
+
+ _CiderUnlinkedUnitImpl(this._bc, this._bcOffset);
+
+ List<int> _contentDigest;
+ idl.UnlinkedUnit2 _unlinkedUnit;
+
+ @override
+ List<int> get contentDigest {
+ _contentDigest ??=
+ const fb.Uint32ListReader().vTableGet(_bc, _bcOffset, 0, const <int>[]);
+ return _contentDigest;
+ }
+
+ @override
+ idl.UnlinkedUnit2 get unlinkedUnit {
+ _unlinkedUnit ??=
+ const _UnlinkedUnit2Reader().vTableGet(_bc, _bcOffset, 1, null);
+ return _unlinkedUnit;
+ }
+}
+
+abstract class _CiderUnlinkedUnitMixin implements idl.CiderUnlinkedUnit {
+ @override
+ Map<String, Object> toJson() {
+ Map<String, Object> _result = <String, Object>{};
+ if (contentDigest.isNotEmpty) {
+ _result["contentDigest"] = contentDigest;
+ }
+ if (unlinkedUnit != null) {
+ _result["unlinkedUnit"] = unlinkedUnit.toJson();
+ }
+ return _result;
+ }
+
+ @override
+ Map<String, Object> toMap() => {
+ "contentDigest": contentDigest,
+ "unlinkedUnit": unlinkedUnit,
+ };
+
+ @override
+ String toString() => convert.json.encode(toJson());
+}
+
class DiagnosticMessageBuilder extends Object
with _DiagnosticMessageMixin
implements idl.DiagnosticMessage {
@@ -3822,6 +4093,7 @@
List<String> _variantField_33;
idl.LinkedNodeCommentType _variantField_29;
List<LinkedNodeBuilder> _variantField_3;
+ int _variantField_16;
LinkedNodeBuilder _variantField_10;
idl.LinkedNodeFormalParameterKind _variantField_26;
double _variantField_21;
@@ -3831,7 +4103,6 @@
int _flags;
String _variantField_1;
int _variantField_36;
- int _variantField_16;
String _variantField_30;
LinkedNodeBuilder _variantField_14;
idl.LinkedNodeKind _kind;
@@ -6001,6 +6272,12 @@
}
@override
+ int get compilationUnit_languageVersionMajor {
+ assert(kind == idl.LinkedNodeKind.compilationUnit);
+ return _variantField_15 ??= 0;
+ }
+
+ @override
int get constructorName_element {
assert(kind == idl.LinkedNodeKind.constructorName);
return _variantField_15 ??= 0;
@@ -6072,6 +6349,12 @@
_variantField_15 = value;
}
+ set compilationUnit_languageVersionMajor(int value) {
+ assert(kind == idl.LinkedNodeKind.compilationUnit);
+ assert(value == null || value >= 0);
+ _variantField_15 = value;
+ }
+
set constructorName_element(int value) {
assert(kind == idl.LinkedNodeKind.constructorName);
assert(value == null || value >= 0);
@@ -6463,6 +6746,31 @@
}
@override
+ int get compilationUnit_languageVersionMinor {
+ assert(kind == idl.LinkedNodeKind.compilationUnit);
+ return _variantField_16 ??= 0;
+ }
+
+ @override
+ int get integerLiteral_value {
+ assert(kind == idl.LinkedNodeKind.integerLiteral);
+ return _variantField_16 ??= 0;
+ }
+
+ /// The minor component of the actual language version (not just override).
+ set compilationUnit_languageVersionMinor(int value) {
+ assert(kind == idl.LinkedNodeKind.compilationUnit);
+ assert(value == null || value >= 0);
+ _variantField_16 = value;
+ }
+
+ set integerLiteral_value(int value) {
+ assert(kind == idl.LinkedNodeKind.integerLiteral);
+ assert(value == null || value >= 0);
+ _variantField_16 = value;
+ }
+
+ @override
LinkedNodeBuilder get constructorDeclaration_returnType {
assert(kind == idl.LinkedNodeKind.constructorDeclaration);
return _variantField_10;
@@ -6700,18 +7008,6 @@
}
@override
- int get integerLiteral_value {
- assert(kind == idl.LinkedNodeKind.integerLiteral);
- return _variantField_16 ??= 0;
- }
-
- set integerLiteral_value(int value) {
- assert(kind == idl.LinkedNodeKind.integerLiteral);
- assert(value == null || value >= 0);
- _variantField_16 = value;
- }
-
- @override
String get interpolationString_value {
assert(kind == idl.LinkedNodeKind.interpolationString);
return _variantField_30 ??= '';
@@ -7093,12 +7389,16 @@
LinkedNodeBuilder.compilationUnit({
List<LinkedNodeBuilder> compilationUnit_declarations,
LinkedNodeBuilder compilationUnit_scriptTag,
+ int compilationUnit_languageVersionMajor,
List<LinkedNodeBuilder> compilationUnit_directives,
+ int compilationUnit_languageVersionMinor,
int informativeId,
}) : _kind = idl.LinkedNodeKind.compilationUnit,
_variantField_2 = compilationUnit_declarations,
_variantField_6 = compilationUnit_scriptTag,
+ _variantField_15 = compilationUnit_languageVersionMajor,
_variantField_3 = compilationUnit_directives,
+ _variantField_16 = compilationUnit_languageVersionMinor,
_variantField_36 = informativeId;
LinkedNodeBuilder.conditionalExpression({
@@ -7547,11 +7847,11 @@
_variantField_25 = expression_type;
LinkedNodeBuilder.integerLiteral({
- LinkedNodeTypeBuilder expression_type,
int integerLiteral_value,
+ LinkedNodeTypeBuilder expression_type,
}) : _kind = idl.LinkedNodeKind.integerLiteral,
- _variantField_25 = expression_type,
- _variantField_16 = integerLiteral_value;
+ _variantField_16 = integerLiteral_value,
+ _variantField_25 = expression_type;
LinkedNodeBuilder.interpolationExpression({
LinkedNodeBuilder interpolationExpression_expression,
@@ -8715,6 +9015,8 @@
}
signature.addBool(this.compilationUnit_scriptTag != null);
this.compilationUnit_scriptTag?.collectApiSignature(signature);
+ signature.addInt(this.compilationUnit_languageVersionMajor ?? 0);
+ signature.addInt(this.compilationUnit_languageVersionMinor ?? 0);
signature.addInt(this.flags ?? 0);
signature.addString(this.name ?? '');
} else if (kind == idl.LinkedNodeKind.conditionalExpression) {
@@ -10245,6 +10547,9 @@
if (offset_variantField_3 != null) {
fbBuilder.addOffset(3, offset_variantField_3);
}
+ if (_variantField_16 != null && _variantField_16 != 0) {
+ fbBuilder.addUint32(16, _variantField_16);
+ }
if (offset_variantField_10 != null) {
fbBuilder.addOffset(10, offset_variantField_10);
}
@@ -10274,9 +10579,6 @@
if (_variantField_36 != null && _variantField_36 != 0) {
fbBuilder.addUint32(36, _variantField_36);
}
- if (_variantField_16 != null && _variantField_16 != 0) {
- fbBuilder.addUint32(16, _variantField_16);
- }
if (offset_variantField_30 != null) {
fbBuilder.addOffset(30, offset_variantField_30);
}
@@ -10352,6 +10654,7 @@
List<String> _variantField_33;
idl.LinkedNodeCommentType _variantField_29;
List<idl.LinkedNode> _variantField_3;
+ int _variantField_16;
idl.LinkedNode _variantField_10;
idl.LinkedNodeFormalParameterKind _variantField_26;
double _variantField_21;
@@ -10361,7 +10664,6 @@
int _flags;
String _variantField_1;
int _variantField_36;
- int _variantField_16;
String _variantField_30;
idl.LinkedNode _variantField_14;
idl.LinkedNodeKind _kind;
@@ -11927,6 +12229,14 @@
}
@override
+ int get compilationUnit_languageVersionMajor {
+ assert(kind == idl.LinkedNodeKind.compilationUnit);
+ _variantField_15 ??=
+ const fb.Uint32Reader().vTableGet(_bc, _bcOffset, 15, 0);
+ return _variantField_15;
+ }
+
+ @override
int get constructorName_element {
assert(kind == idl.LinkedNodeKind.constructorName);
_variantField_15 ??=
@@ -12242,6 +12552,22 @@
}
@override
+ int get compilationUnit_languageVersionMinor {
+ assert(kind == idl.LinkedNodeKind.compilationUnit);
+ _variantField_16 ??=
+ const fb.Uint32Reader().vTableGet(_bc, _bcOffset, 16, 0);
+ return _variantField_16;
+ }
+
+ @override
+ int get integerLiteral_value {
+ assert(kind == idl.LinkedNodeKind.integerLiteral);
+ _variantField_16 ??=
+ const fb.Uint32Reader().vTableGet(_bc, _bcOffset, 16, 0);
+ return _variantField_16;
+ }
+
+ @override
idl.LinkedNode get constructorDeclaration_returnType {
assert(kind == idl.LinkedNodeKind.constructorDeclaration);
_variantField_10 ??=
@@ -12393,14 +12719,6 @@
}
@override
- int get integerLiteral_value {
- assert(kind == idl.LinkedNodeKind.integerLiteral);
- _variantField_16 ??=
- const fb.Uint32Reader().vTableGet(_bc, _bcOffset, 16, 0);
- return _variantField_16;
- }
-
- @override
String get interpolationString_value {
assert(kind == idl.LinkedNodeKind.interpolationString);
_variantField_30 ??=
@@ -12828,11 +13146,19 @@
_result["compilationUnit_scriptTag"] =
compilationUnit_scriptTag.toJson();
}
+ if (compilationUnit_languageVersionMajor != 0) {
+ _result["compilationUnit_languageVersionMajor"] =
+ compilationUnit_languageVersionMajor;
+ }
if (compilationUnit_directives.isNotEmpty) {
_result["compilationUnit_directives"] = compilationUnit_directives
.map((_value) => _value.toJson())
.toList();
}
+ if (compilationUnit_languageVersionMinor != 0) {
+ _result["compilationUnit_languageVersionMinor"] =
+ compilationUnit_languageVersionMinor;
+ }
if (informativeId != 0) {
_result["informativeId"] = informativeId;
}
@@ -13504,12 +13830,12 @@
}
}
if (kind == idl.LinkedNodeKind.integerLiteral) {
- if (expression_type != null) {
- _result["expression_type"] = expression_type.toJson();
- }
if (integerLiteral_value != 0) {
_result["integerLiteral_value"] = integerLiteral_value;
}
+ if (expression_type != null) {
+ _result["expression_type"] = expression_type.toJson();
+ }
}
if (kind == idl.LinkedNodeKind.interpolationExpression) {
if (interpolationExpression_expression != null) {
@@ -14359,7 +14685,11 @@
return {
"compilationUnit_declarations": compilationUnit_declarations,
"compilationUnit_scriptTag": compilationUnit_scriptTag,
+ "compilationUnit_languageVersionMajor":
+ compilationUnit_languageVersionMajor,
"compilationUnit_directives": compilationUnit_directives,
+ "compilationUnit_languageVersionMinor":
+ compilationUnit_languageVersionMinor,
"flags": flags,
"informativeId": informativeId,
"kind": kind,
@@ -14867,9 +15197,9 @@
}
if (kind == idl.LinkedNodeKind.integerLiteral) {
return {
+ "integerLiteral_value": integerLiteral_value,
"expression_type": expression_type,
"flags": flags,
- "integerLiteral_value": integerLiteral_value,
"kind": kind,
"name": name,
};
@@ -19413,274 +19743,3 @@
@override
String toString() => convert.json.encode(toJson());
}
-
-class CiderUnlinkedUnitBuilder extends Object
- with _CiderUnlinkedUnitMixin
- implements idl.CiderUnlinkedUnit {
- List<int> _contentDigest;
- UnlinkedUnit2Builder _unlinkedUnit;
-
- @override
- List<int> get contentDigest => _contentDigest ??= <int>[];
-
- /// The hash signature of the contents of the file.
- set contentDigest(List<int> value) {
- assert(value == null || value.every((e) => e >= 0));
- this._contentDigest = value;
- }
-
- @override
- UnlinkedUnit2Builder get unlinkedUnit => _unlinkedUnit;
-
- /// Unlinked summary of the compilation unit.
- set unlinkedUnit(UnlinkedUnit2Builder value) {
- this._unlinkedUnit = value;
- }
-
- CiderUnlinkedUnitBuilder(
- {List<int> contentDigest, UnlinkedUnit2Builder unlinkedUnit})
- : _contentDigest = contentDigest,
- _unlinkedUnit = unlinkedUnit;
-
- /// Flush [informative] data recursively.
- void flushInformative() {
- _unlinkedUnit?.flushInformative();
- }
-
- /// Accumulate non-[informative] data into [signature].
- void collectApiSignature(api_sig.ApiSignature signature) {
- if (this._contentDigest == null) {
- signature.addInt(0);
- } else {
- signature.addInt(this._contentDigest.length);
- for (var x in this._contentDigest) {
- signature.addInt(x);
- }
- }
- signature.addBool(this._unlinkedUnit != null);
- this._unlinkedUnit?.collectApiSignature(signature);
- }
-
- List<int> toBuffer() {
- fb.Builder fbBuilder = fb.Builder();
- return fbBuilder.finish(finish(fbBuilder), "CUUN");
- }
-
- fb.Offset finish(fb.Builder fbBuilder) {
- fb.Offset offset_contentDigest;
- fb.Offset offset_unlinkedUnit;
- if (!(_contentDigest == null || _contentDigest.isEmpty)) {
- offset_contentDigest = fbBuilder.writeListUint32(_contentDigest);
- }
- if (_unlinkedUnit != null) {
- offset_unlinkedUnit = _unlinkedUnit.finish(fbBuilder);
- }
- fbBuilder.startTable();
- if (offset_contentDigest != null) {
- fbBuilder.addOffset(0, offset_contentDigest);
- }
- if (offset_unlinkedUnit != null) {
- fbBuilder.addOffset(1, offset_unlinkedUnit);
- }
- return fbBuilder.endTable();
- }
-}
-
-idl.CiderUnlinkedUnit readCiderUnlinkedUnit(List<int> buffer) {
- fb.BufferContext rootRef = fb.BufferContext.fromBytes(buffer);
- return const _CiderUnlinkedUnitReader().read(rootRef, 0);
-}
-
-class _CiderUnlinkedUnitReader extends fb.TableReader<_CiderUnlinkedUnitImpl> {
- const _CiderUnlinkedUnitReader();
-
- @override
- _CiderUnlinkedUnitImpl createObject(fb.BufferContext bc, int offset) =>
- _CiderUnlinkedUnitImpl(bc, offset);
-}
-
-class _CiderUnlinkedUnitImpl extends Object
- with _CiderUnlinkedUnitMixin
- implements idl.CiderUnlinkedUnit {
- final fb.BufferContext _bc;
- final int _bcOffset;
-
- _CiderUnlinkedUnitImpl(this._bc, this._bcOffset);
-
- List<int> _contentDigest;
- idl.UnlinkedUnit2 _unlinkedUnit;
-
- @override
- List<int> get contentDigest {
- _contentDigest ??=
- const fb.Uint32ListReader().vTableGet(_bc, _bcOffset, 0, const <int>[]);
- return _contentDigest;
- }
-
- @override
- idl.UnlinkedUnit2 get unlinkedUnit {
- _unlinkedUnit ??=
- const _UnlinkedUnit2Reader().vTableGet(_bc, _bcOffset, 1, null);
- return _unlinkedUnit;
- }
-}
-
-abstract class _CiderUnlinkedUnitMixin implements idl.CiderUnlinkedUnit {
- @override
- Map<String, Object> toJson() {
- Map<String, Object> _result = <String, Object>{};
- if (contentDigest.isNotEmpty) {
- _result["contentDigest"] = contentDigest;
- }
- if (unlinkedUnit != null) {
- _result["unlinkedUnit"] = unlinkedUnit.toJson();
- }
- return _result;
- }
-
- @override
- Map<String, Object> toMap() => {
- "contentDigest": contentDigest,
- "unlinkedUnit": unlinkedUnit,
- };
-
- @override
- String toString() => convert.json.encode(toJson());
-}
-
-class CiderLinkedLibraryCycleBuilder extends Object
- with _CiderLinkedLibraryCycleMixin
- implements idl.CiderLinkedLibraryCycle {
- List<int> _signature;
- LinkedNodeBundleBuilder _bundle;
-
- @override
- List<int> get signature => _signature ??= <int>[];
-
- /// The hash signature for this linked cycle. It depends of API signatures
- /// of all files in the cycle, and on the signatures of the transitive
- /// closure of the cycle dependencies.
- set signature(List<int> value) {
- assert(value == null || value.every((e) => e >= 0));
- this._signature = value;
- }
-
- @override
- LinkedNodeBundleBuilder get bundle => _bundle;
-
- set bundle(LinkedNodeBundleBuilder value) {
- this._bundle = value;
- }
-
- CiderLinkedLibraryCycleBuilder(
- {List<int> signature, LinkedNodeBundleBuilder bundle})
- : _signature = signature,
- _bundle = bundle;
-
- /// Flush [informative] data recursively.
- void flushInformative() {
- _bundle?.flushInformative();
- }
-
- /// Accumulate non-[informative] data into [signature].
- void collectApiSignature(api_sig.ApiSignature signature) {
- if (this._signature == null) {
- signature.addInt(0);
- } else {
- signature.addInt(this._signature.length);
- for (var x in this._signature) {
- signature.addInt(x);
- }
- }
- signature.addBool(this._bundle != null);
- this._bundle?.collectApiSignature(signature);
- }
-
- List<int> toBuffer() {
- fb.Builder fbBuilder = fb.Builder();
- return fbBuilder.finish(finish(fbBuilder), "CLNB");
- }
-
- fb.Offset finish(fb.Builder fbBuilder) {
- fb.Offset offset_signature;
- fb.Offset offset_bundle;
- if (!(_signature == null || _signature.isEmpty)) {
- offset_signature = fbBuilder.writeListUint32(_signature);
- }
- if (_bundle != null) {
- offset_bundle = _bundle.finish(fbBuilder);
- }
- fbBuilder.startTable();
- if (offset_signature != null) {
- fbBuilder.addOffset(0, offset_signature);
- }
- if (offset_bundle != null) {
- fbBuilder.addOffset(1, offset_bundle);
- }
- return fbBuilder.endTable();
- }
-}
-
-idl.CiderLinkedLibraryCycle readCiderLinkedLibraryCycle(List<int> buffer) {
- fb.BufferContext rootRef = fb.BufferContext.fromBytes(buffer);
- return const _CiderLinkedLibraryCycleReader().read(rootRef, 0);
-}
-
-class _CiderLinkedLibraryCycleReader
- extends fb.TableReader<_CiderLinkedLibraryCycleImpl> {
- const _CiderLinkedLibraryCycleReader();
-
- @override
- _CiderLinkedLibraryCycleImpl createObject(fb.BufferContext bc, int offset) =>
- _CiderLinkedLibraryCycleImpl(bc, offset);
-}
-
-class _CiderLinkedLibraryCycleImpl extends Object
- with _CiderLinkedLibraryCycleMixin
- implements idl.CiderLinkedLibraryCycle {
- final fb.BufferContext _bc;
- final int _bcOffset;
-
- _CiderLinkedLibraryCycleImpl(this._bc, this._bcOffset);
-
- List<int> _signature;
- idl.LinkedNodeBundle _bundle;
-
- @override
- List<int> get signature {
- _signature ??=
- const fb.Uint32ListReader().vTableGet(_bc, _bcOffset, 0, const <int>[]);
- return _signature;
- }
-
- @override
- idl.LinkedNodeBundle get bundle {
- _bundle ??=
- const _LinkedNodeBundleReader().vTableGet(_bc, _bcOffset, 1, null);
- return _bundle;
- }
-}
-
-abstract class _CiderLinkedLibraryCycleMixin
- implements idl.CiderLinkedLibraryCycle {
- @override
- Map<String, Object> toJson() {
- Map<String, Object> _result = <String, Object>{};
- if (signature.isNotEmpty) {
- _result["signature"] = signature;
- }
- if (bundle != null) {
- _result["bundle"] = bundle.toJson();
- }
- return _result;
- }
-
- @override
- Map<String, Object> toMap() => {
- "signature": signature,
- "bundle": bundle,
- };
-
- @override
- String toString() => convert.json.encode(toJson());
-}
diff --git a/pkg/analyzer/lib/src/summary/format.fbs b/pkg/analyzer/lib/src/summary/format.fbs
index f0745b5..073c2c3 100644
--- a/pkg/analyzer/lib/src/summary/format.fbs
+++ b/pkg/analyzer/lib/src/summary/format.fbs
@@ -1012,6 +1012,27 @@
shows:[string] (id: 0);
}
+/// Information about linked libraries, a group of libraries that form
+/// a library cycle.
+table CiderLinkedLibraryCycle {
+ bundle:LinkedNodeBundle (id: 1);
+
+ /// The hash signature for this linked cycle. It depends of API signatures
+ /// of all files in the cycle, and on the signatures of the transitive
+ /// closure of the cycle dependencies.
+ signature:[uint] (id: 0);
+}
+
+/// Information about a compilation unit, contains the content hash
+/// and unlinked summary.
+table CiderUnlinkedUnit {
+ /// The hash signature of the contents of the file.
+ contentDigest:[uint] (id: 0);
+
+ /// Unlinked summary of the compilation unit.
+ unlinkedUnit:UnlinkedUnit2 (id: 1);
+}
+
table DiagnosticMessage {
/// The absolute and normalized path of the file associated with this message.
filePath:string (id: 0);
@@ -1075,6 +1096,9 @@
variantField_3:[LinkedNode] (id: 3);
+ /// The minor component of the actual language version (not just override).
+ variantField_16:uint (id: 16);
+
variantField_10:LinkedNode (id: 10);
variantField_26:LinkedNodeFormalParameterKind (id: 26);
@@ -1093,8 +1117,6 @@
variantField_36:uint (id: 36);
- variantField_16:uint (id: 16);
-
variantField_30:string (id: 30);
variantField_14:LinkedNode (id: 14);
@@ -1315,27 +1337,6 @@
parts:[string] (id: 4);
}
-/// Information about a compilation unit, contains the content hash
-/// and unlinked summary.
-table CiderUnlinkedUnit {
- /// The hash signature of the contents of the file.
- contentDigest:[uint] (id: 0);
-
- /// Unlinked summary of the compilation unit.
- unlinkedUnit:UnlinkedUnit2 (id: 1);
-}
-
-/// Information about linked libraries, a group of libraries that form
-/// a library cycle.
-table CiderLinkedLibraryCycle {
- /// The hash signature for this linked cycle. It depends of API signatures
- /// of all files in the cycle, and on the signatures of the transitive
- /// closure of the cycle dependencies.
- signature:[uint] (id: 0);
-
- bundle:LinkedNodeBundle (id: 1);
-}
-
root_type PackageBundle;
file_identifier "PBdl";
diff --git a/pkg/analyzer/lib/src/summary/idl.dart b/pkg/analyzer/lib/src/summary/idl.dart
index 9e54f9a..6c505f2 100644
--- a/pkg/analyzer/lib/src/summary/idl.dart
+++ b/pkg/analyzer/lib/src/summary/idl.dart
@@ -448,6 +448,39 @@
List<String> get shows;
}
+/// Information about linked libraries, a group of libraries that form
+/// a library cycle.
+@TopLevel('CLNB')
+abstract class CiderLinkedLibraryCycle extends base.SummaryClass {
+ factory CiderLinkedLibraryCycle.fromBuffer(List<int> buffer) =>
+ generated.readCiderLinkedLibraryCycle(buffer);
+
+ @Id(1)
+ LinkedNodeBundle get bundle;
+
+ /// The hash signature for this linked cycle. It depends of API signatures
+ /// of all files in the cycle, and on the signatures of the transitive
+ /// closure of the cycle dependencies.
+ @Id(0)
+ List<int> get signature;
+}
+
+/// Information about a compilation unit, contains the content hash
+/// and unlinked summary.
+@TopLevel('CUUN')
+abstract class CiderUnlinkedUnit extends base.SummaryClass {
+ factory CiderUnlinkedUnit.fromBuffer(List<int> buffer) =>
+ generated.readCiderUnlinkedUnit(buffer);
+
+ /// The hash signature of the contents of the file.
+ @Id(0)
+ List<int> get contentDigest;
+
+ /// Unlinked summary of the compilation unit.
+ @Id(1)
+ UnlinkedUnit2 get unlinkedUnit;
+}
+
abstract class DiagnosticMessage extends base.SummaryClass {
/// The absolute and normalized path of the file associated with this message.
@Id(0)
@@ -801,6 +834,14 @@
@VariantId(3, variant: LinkedNodeKind.compilationUnit)
List<LinkedNode> get compilationUnit_directives;
+ /// The major component of the actual language version (not just override).
+ @VariantId(15, variant: LinkedNodeKind.compilationUnit)
+ int get compilationUnit_languageVersionMajor;
+
+ /// The minor component of the actual language version (not just override).
+ @VariantId(16, variant: LinkedNodeKind.compilationUnit)
+ int get compilationUnit_languageVersionMinor;
+
@VariantId(6, variant: LinkedNodeKind.compilationUnit)
LinkedNode get compilationUnit_scriptTag;
@@ -2202,36 +2243,3 @@
@Id(4)
List<String> get parts;
}
-
-/// Information about a compilation unit, contains the content hash
-/// and unlinked summary.
-@TopLevel('CUUN')
-abstract class CiderUnlinkedUnit extends base.SummaryClass {
- factory CiderUnlinkedUnit.fromBuffer(List<int> buffer) =>
- generated.readCiderUnlinkedUnit(buffer);
-
- /// The hash signature of the contents of the file.
- @Id(0)
- List<int> get contentDigest;
-
- /// Unlinked summary of the compilation unit.
- @Id(1)
- UnlinkedUnit2 get unlinkedUnit;
-}
-
-/// Information about linked libraries, a group of libraries that form
-/// a library cycle.
-@TopLevel('CLNB')
-abstract class CiderLinkedLibraryCycle extends base.SummaryClass {
- factory CiderLinkedLibraryCycle.fromBuffer(List<int> buffer) =>
- generated.readCiderLinkedLibraryCycle(buffer);
-
- /// The hash signature for this linked cycle. It depends of API signatures
- /// of all files in the cycle, and on the signatures of the transitive
- /// closure of the cycle dependencies.
- @Id(0)
- List<int> get signature;
-
- @Id(1)
- LinkedNodeBundle get bundle;
-}
diff --git a/pkg/analyzer/lib/src/summary2/ast_binary_reader.dart b/pkg/analyzer/lib/src/summary2/ast_binary_reader.dart
index 7b5a767..09fd0b0 100644
--- a/pkg/analyzer/lib/src/summary2/ast_binary_reader.dart
+++ b/pkg/analyzer/lib/src/summary2/ast_binary_reader.dart
@@ -352,13 +352,16 @@
}
CompilationUnit _read_compilationUnit(LinkedNode data) {
- return astFactory.compilationUnit(
- beginToken: null,
- scriptTag: _readNode(data.compilationUnit_scriptTag),
- directives: _readNodeList(data.compilationUnit_directives),
- declarations: _readNodeList(data.compilationUnit_declarations),
- endToken: null,
- featureSet: null);
+ var node = astFactory.compilationUnit(
+ beginToken: null,
+ scriptTag: _readNode(data.compilationUnit_scriptTag),
+ directives: _readNodeList(data.compilationUnit_directives),
+ declarations: _readNodeList(data.compilationUnit_declarations),
+ endToken: null,
+ featureSet: null,
+ );
+ LazyCompilationUnit(node, data);
+ return node;
}
ConditionalExpression _read_conditionalExpression(LinkedNode data) {
diff --git a/pkg/analyzer/lib/src/summary2/ast_binary_writer.dart b/pkg/analyzer/lib/src/summary2/ast_binary_writer.dart
index eeb0d76..4d0c8bf 100644
--- a/pkg/analyzer/lib/src/summary2/ast_binary_writer.dart
+++ b/pkg/analyzer/lib/src/summary2/ast_binary_writer.dart
@@ -282,9 +282,12 @@
@override
LinkedNodeBuilder visitCompilationUnit(CompilationUnit node) {
+ var nodeImpl = node as CompilationUnitImpl;
var builder = LinkedNodeBuilder.compilationUnit(
compilationUnit_declarations: _writeNodeList(node.declarations),
compilationUnit_directives: _writeNodeList(node.directives),
+ compilationUnit_languageVersionMajor: nodeImpl.languageVersionMajor,
+ compilationUnit_languageVersionMinor: nodeImpl.languageVersionMinor,
compilationUnit_scriptTag: node.scriptTag?.accept(this),
informativeId: getInformativeId(node),
);
diff --git a/pkg/analyzer/lib/src/summary2/lazy_ast.dart b/pkg/analyzer/lib/src/summary2/lazy_ast.dart
index 2ab0887..9d54a9c 100644
--- a/pkg/analyzer/lib/src/summary2/lazy_ast.dart
+++ b/pkg/analyzer/lib/src/summary2/lazy_ast.dart
@@ -380,36 +380,28 @@
final LinkedNode data;
- LazyCompilationUnit(this.data);
+ LazyCompilationUnit(CompilationUnit node, this.data) {
+ node.setProperty(_key, this);
+ }
static LazyCompilationUnit get(CompilationUnit node) {
return node.getProperty(_key);
}
- static int getCodeLength(
- LinkedUnitContext context,
- CompilationUnit node,
- ) {
+ static int getLanguageVersionMajor(CompilationUnit node) {
var lazy = get(node);
if (lazy != null) {
- return context.getInformativeData(lazy.data)?.codeLength ?? 0;
+ return lazy.data.compilationUnit_languageVersionMajor;
}
- return node.length;
+ return node.languageVersionToken.major;
}
- static int getCodeOffset(
- LinkedUnitContext context,
- CompilationUnit node,
- ) {
+ static int getLanguageVersionMinor(CompilationUnit node) {
var lazy = get(node);
if (lazy != null) {
- return context.getInformativeData(lazy.data)?.codeOffset ?? 0;
+ return lazy.data.compilationUnit_languageVersionMinor;
}
- return node.offset;
- }
-
- static void setData(CompilationUnit node, LinkedNode data) {
- node.setProperty(_key, LazyCompilationUnit(data));
+ return node.languageVersionToken.minor;
}
}
diff --git a/pkg/analyzer/lib/src/summary2/linked_element_factory.dart b/pkg/analyzer/lib/src/summary2/linked_element_factory.dart
index 199633a..4d4d3a1 100644
--- a/pkg/analyzer/lib/src/summary2/linked_element_factory.dart
+++ b/pkg/analyzer/lib/src/summary2/linked_element_factory.dart
@@ -58,6 +58,15 @@
var exportedReferences = exportsOfLibrary('$uri');
for (var exportedReference in exportedReferences) {
var element = elementOfReference(exportedReference);
+ // TODO(scheglov) Remove after https://github.com/dart-lang/sdk/issues/41212
+ if (element == null) {
+ throw StateError(
+ '[No element]'
+ '[uri: $uri]'
+ '[exportedReferences: $exportedReferences]'
+ '[exportedReference: $exportedReference]',
+ );
+ }
exportedNames[element.name] = element;
}
diff --git a/pkg/analyzer/lib/src/summary2/linked_unit_context.dart b/pkg/analyzer/lib/src/summary2/linked_unit_context.dart
index 27a49e9..c15876f 100644
--- a/pkg/analyzer/lib/src/summary2/linked_unit_context.dart
+++ b/pkg/analyzer/lib/src/summary2/linked_unit_context.dart
@@ -446,6 +446,14 @@
}
}
+ int getLanguageVersionMajor(CompilationUnit node) {
+ return LazyCompilationUnit.getLanguageVersionMajor(node);
+ }
+
+ int getLanguageVersionMinor(CompilationUnit node) {
+ return LazyCompilationUnit.getLanguageVersionMinor(node);
+ }
+
Comment getLibraryDocumentationComment(CompilationUnit unit) {
for (var directive in unit.directives) {
if (directive is LibraryDirective) {
diff --git a/pkg/analyzer/lib/src/task/strong_mode.dart b/pkg/analyzer/lib/src/task/strong_mode.dart
index b6f42fa..6035e5e 100644
--- a/pkg/analyzer/lib/src/task/strong_mode.dart
+++ b/pkg/analyzer/lib/src/task/strong_mode.dart
@@ -10,6 +10,7 @@
import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
import 'package:analyzer/src/dart/element/type.dart';
import 'package:analyzer/src/dart/element/type_algebra.dart';
+import 'package:analyzer/src/generated/type_system.dart';
import 'package:analyzer/src/summary/format.dart';
import 'package:analyzer/src/summary/idl.dart';
import 'package:analyzer/src/summary2/lazy_ast.dart';
@@ -22,6 +23,7 @@
final InheritanceManager3 inheritance;
final Set<ClassElement> elementsBeingInferred = HashSet<ClassElement>();
+ TypeSystemImpl typeSystem;
bool isNonNullableByDefault;
InterfaceType interfaceType;
@@ -37,7 +39,8 @@
* compilation [unit].
*/
void inferCompilationUnit(CompilationUnitElement unit) {
- isNonNullableByDefault = unit.library.isNonNullableByDefault;
+ typeSystem = unit.library.typeSystem;
+ isNonNullableByDefault = typeSystem.isNonNullableByDefault;
_inferClasses(unit.mixins);
_inferClasses(unit.types);
}
@@ -136,15 +139,18 @@
*/
DartType _computeParameterType(ParameterElement parameter, int index,
List<FunctionType> overriddenTypes) {
- DartType parameterType;
- int length = overriddenTypes.length;
- for (int i = 0; i < length; i++) {
+ var typesMerger = _OverriddenTypesMerger(typeSystem);
+
+ for (var overriddenType in overriddenTypes) {
ParameterElement matchingParameter = _getCorrespondingParameter(
- parameter, index, overriddenTypes[i].parameters);
+ parameter,
+ index,
+ overriddenType.parameters,
+ );
DartType type = matchingParameter?.type ?? _dynamicType;
- if (parameterType == null) {
- parameterType = type;
- } else if (parameterType != type) {
+ typesMerger.update(type);
+
+ if (typesMerger.hasError) {
if (parameter is ParameterElementImpl && parameter.linkedNode != null) {
LazyAst.setTypeInferenceError(
parameter.linkedNode,
@@ -156,7 +162,8 @@
return _dynamicType;
}
}
- return parameterType ?? _dynamicType;
+
+ return typesMerger.result ?? _dynamicType;
}
/**
@@ -168,18 +175,17 @@
* want to be smarter about it.
*/
DartType _computeReturnType(Iterable<DartType> overriddenReturnTypes) {
- DartType returnType;
+ var typesMerger = _OverriddenTypesMerger(typeSystem);
+
for (DartType type in overriddenReturnTypes) {
- if (type == null) {
- type = _dynamicType;
- }
- if (returnType == null) {
- returnType = type;
- } else if (returnType != type) {
+ type ??= _dynamicType;
+ typesMerger.update(type);
+ if (typesMerger.hasError) {
return _dynamicType;
}
}
- return returnType ?? _dynamicType;
+
+ return typesMerger.result ?? _dynamicType;
}
/**
@@ -560,3 +566,53 @@
_FieldOverrideInferenceResult(this.isCovariant, this.type, this.isError);
}
+
+/// Helper for merging types from several overridden executables, according
+/// to legacy or NNBD rules.
+class _OverriddenTypesMerger {
+ final TypeSystemImpl _typeSystem;
+
+ bool hasError = false;
+
+ DartType _legacyResult;
+
+ DartType _notNormalized;
+ DartType _currentMerge;
+
+ _OverriddenTypesMerger(this._typeSystem);
+
+ DartType get result {
+ if (_typeSystem.isNonNullableByDefault) {
+ return _currentMerge ?? _notNormalized;
+ } else {
+ return _legacyResult;
+ }
+ }
+
+ void update(DartType type) {
+ if (hasError) {
+ // Stop updating it.
+ } else if (_typeSystem.isNonNullableByDefault) {
+ if (_currentMerge == null) {
+ if (_notNormalized == null) {
+ _notNormalized = type;
+ return;
+ } else {
+ _currentMerge = _typeSystem.normalize(_notNormalized);
+ }
+ }
+ var normType = _typeSystem.normalize(type);
+ try {
+ _currentMerge = _typeSystem.topMerge(_currentMerge, normType);
+ } catch (_) {
+ hasError = true;
+ }
+ } else {
+ if (_legacyResult == null) {
+ _legacyResult = type;
+ } else if (_legacyResult != type) {
+ hasError = true;
+ }
+ }
+ }
+}
diff --git a/pkg/analyzer/test/generated/invalid_code_test.dart b/pkg/analyzer/test/generated/invalid_code_test.dart
index db7160f..b4f00d8 100644
--- a/pkg/analyzer/test/generated/invalid_code_test.dart
+++ b/pkg/analyzer/test/generated/invalid_code_test.dart
@@ -75,6 +75,14 @@
''');
}
+ test_fieldFormalParameter_annotation_localFunction() async {
+ await _assertCanBeAnalyzed(r'''
+void main() {
+ void foo(@deprecated this.bar) {}
+}
+''');
+ }
+
test_fuzz_01() async {
await _assertCanBeAnalyzed(r'''
typedef F = void Function(bool, int a(double b));
diff --git a/pkg/analyzer/test/generated/parser_fasta_test.dart b/pkg/analyzer/test/generated/parser_fasta_test.dart
index e39ef3c..ba70d51 100644
--- a/pkg/analyzer/test/generated/parser_fasta_test.dart
+++ b/pkg/analyzer/test/generated/parser_fasta_test.dart
@@ -149,6 +149,7 @@
var unit = parseCompilationUnit('class{const():super.{n', errors: [
expectedError(ParserErrorCode.MISSING_IDENTIFIER, 5, 1),
expectedError(ParserErrorCode.MISSING_IDENTIFIER, 11, 1),
+ expectedError(ParserErrorCode.INVALID_CONSTRUCTOR_NAME, 11, 1),
expectedError(ParserErrorCode.MISSING_IDENTIFIER, 20, 1),
expectedError(ParserErrorCode.EXPECTED_TOKEN, 20, 1),
expectedError(ParserErrorCode.CONST_CONSTRUCTOR_WITH_BODY, 20, 1),
diff --git a/pkg/analyzer/test/generated/parser_test.dart b/pkg/analyzer/test/generated/parser_test.dart
index 13bbfd1..705447b 100644
--- a/pkg/analyzer/test/generated/parser_test.dart
+++ b/pkg/analyzer/test/generated/parser_test.dart
@@ -946,7 +946,13 @@
createParser('static int get C => 0;');
ClassMember member = parser.parseClassMember('C');
expect(member, isNotNull);
- assertNoErrors();
+ if (usingFastaParser) {
+ listener.assertErrors([
+ expectedError(ParserErrorCode.MEMBER_WITH_CLASS_NAME, 15, 1),
+ ]);
+ } else {
+ assertNoErrors();
+ }
expect(member, isMethodDeclaration);
MethodDeclaration method = member;
expect(method.documentationComment, isNull);
@@ -1212,7 +1218,13 @@
createParser('static void set C(_) {}');
ClassMember member = parser.parseClassMember('C');
expect(member, isNotNull);
- assertNoErrors();
+ if (usingFastaParser) {
+ listener.assertErrors([
+ expectedError(ParserErrorCode.MEMBER_WITH_CLASS_NAME, 16, 1),
+ ]);
+ } else {
+ assertNoErrors();
+ }
expect(member, isMethodDeclaration);
MethodDeclaration method = member;
expect(method.documentationComment, isNull);
@@ -1678,21 +1690,21 @@
void test_parseGetter_identifier_colon_issue_36961() {
createParser('get a:');
- MethodDeclaration method = parser.parseClassMember('C');
- expect(method, isNotNull);
+ ConstructorDeclaration constructor = parser.parseClassMember('C');
+ expect(constructor, isNotNull);
listener.assertErrors([
+ expectedError(ParserErrorCode.GETTER_CONSTRUCTOR, 0, 3),
+ expectedError(ParserErrorCode.MISSING_METHOD_PARAMETERS, 4, 1),
+ expectedError(ParserErrorCode.INVALID_CONSTRUCTOR_NAME, 4, 1),
expectedError(ParserErrorCode.MISSING_INITIALIZER, 5, 1),
expectedError(ParserErrorCode.MISSING_FUNCTION_BODY, 6, 0),
]);
- expect(method.body, isNotNull);
- expect(method.documentationComment, isNull);
- expect(method.externalKeyword, isNull);
- expect(method.modifierKeyword, isNull);
- expect(method.name, isNotNull);
- expect(method.operatorKeyword, isNull);
- expect(method.parameters, isNull);
- expect(method.propertyKeyword, isNotNull);
- expect(method.returnType, isNull);
+ expect(constructor.body, isNotNull);
+ expect(constructor.documentationComment, isNull);
+ expect(constructor.externalKeyword, isNull);
+ expect(constructor.name, isNull);
+ expect(constructor.parameters, isNotNull);
+ expect(constructor.returnType, isNotNull);
}
void test_parseGetter_nonStatic() {
@@ -2652,8 +2664,9 @@
createParser('C C() {}');
ClassMember member = parser.parseClassMember('C');
expectNotNullIfNoErrors(member);
- listener.assertErrors(
- [expectedError(ParserErrorCode.CONSTRUCTOR_WITH_RETURN_TYPE, 0, 1)]);
+ listener.assertErrors([
+ expectedError(ParserErrorCode.CONSTRUCTOR_WITH_RETURN_TYPE, 0, 1),
+ ]);
}
void test_constructorWithReturnType_var() {
@@ -11258,9 +11271,8 @@
final unit = parseCompilationUnit('class C { get C.named => null; }',
errors: usingFastaParser
? [
- expectedError(ParserErrorCode.MISSING_FUNCTION_BODY, 15, 1),
- expectedError(ParserErrorCode.EXPECTED_CLASS_MEMBER, 15, 1),
- expectedError(ParserErrorCode.MISSING_METHOD_PARAMETERS, 16, 5),
+ expectedError(ParserErrorCode.GETTER_CONSTRUCTOR, 10, 3),
+ expectedError(ParserErrorCode.MISSING_METHOD_PARAMETERS, 14, 1),
]
: [
expectedError(
@@ -11275,10 +11287,16 @@
expectedError(ParserErrorCode.UNEXPECTED_TOKEN, 29, 1),
]);
ClassDeclaration declaration = unit.declarations[0];
- MethodDeclaration method = declaration.members[0];
- expect(method.name.name, 'C');
- expect(method.isGetter, isTrue);
- expect(method.parameters, isNull);
+ if (usingFastaParser) {
+ ConstructorDeclaration method = declaration.members[0];
+ expect(method.name.name, 'named');
+ expect(method.parameters, isNotNull);
+ } else {
+ MethodDeclaration method = declaration.members[0];
+ expect(method.name.name, 'C');
+ expect(method.isGetter, isTrue);
+ expect(method.parameters, isNull);
+ }
}
void test_issue_34610_initializers() {
@@ -11361,10 +11379,8 @@
final unit = parseCompilationUnit('class C { set C.named => null; }',
errors: usingFastaParser
? [
+ expectedError(ParserErrorCode.SETTER_CONSTRUCTOR, 10, 3),
expectedError(ParserErrorCode.MISSING_METHOD_PARAMETERS, 14, 1),
- expectedError(ParserErrorCode.MISSING_FUNCTION_BODY, 15, 1),
- expectedError(ParserErrorCode.EXPECTED_CLASS_MEMBER, 15, 1),
- expectedError(ParserErrorCode.MISSING_METHOD_PARAMETERS, 16, 5),
]
: [
expectedError(ParserErrorCode.EXPECTED_TOKEN, 15, 1),
@@ -11382,11 +11398,18 @@
expectedError(ParserErrorCode.UNEXPECTED_TOKEN, 29, 1),
]);
ClassDeclaration declaration = unit.declarations[0];
- MethodDeclaration method = declaration.members[0];
- expect(method.name.name, 'C');
- expect(method.isSetter, isTrue);
- expect(method.parameters, isNotNull);
- expect(method.parameters.parameters, hasLength(usingFastaParser ? 0 : 1));
+ if (usingFastaParser) {
+ ConstructorDeclaration method = declaration.members[0];
+ expect(method.name.name, 'named');
+ expect(method.parameters, isNotNull);
+ expect(method.parameters.parameters, hasLength(0));
+ } else {
+ MethodDeclaration method = declaration.members[0];
+ expect(method.name.name, 'C');
+ expect(method.isSetter, isTrue);
+ expect(method.parameters, isNotNull);
+ expect(method.parameters.parameters, hasLength(1));
+ }
}
void test_keywordInPlaceOfIdentifier() {
diff --git a/pkg/analyzer/test/src/dart/analysis/index_test.dart b/pkg/analyzer/test/src/dart/analysis/index_test.dart
index 12ddb58..07c19df 100644
--- a/pkg/analyzer/test/src/dart/analysis/index_test.dart
+++ b/pkg/analyzer/test/src/dart/analysis/index_test.dart
@@ -138,17 +138,6 @@
..isAncestorOf('M5 on M2');
}
- test_isExtendedBy_ClassDeclaration() async {
- await _indexTestUnit('''
-class A {} // 1
-class B extends A {} // 2
-''');
- ClassElement elementA = findElement('A');
- assertThat(elementA)
- ..isExtendedAt('A {} // 2', false)
- ..isReferencedAt('A {} // 2', false);
- }
-
test_isExtendedBy_ClassDeclaration_isQualified() async {
newFile('$testProject/lib.dart', content: '''
class A {}
@@ -929,6 +918,24 @@
// No exceptions.
}
+ test_isReferencedBy_ParameterElement_multiplyDefined_generic() async {
+ newFile('/test/lib/a.dart', content: r'''
+void foo<T>({T a}) {}
+''');
+ newFile('/test/lib/b.dart', content: r'''
+void foo<T>({T a}) {}
+''');
+ await _indexTestUnit(r"""
+import 'a.dart';
+import 'b.dart';
+
+void main() {
+ foo(a: 0);
+}
+""");
+ // No exceptions.
+ }
+
test_isReferencedBy_ParameterElement_named_ofConstructor_genericClass() async {
await _indexTestUnit('''
class A<T> {
diff --git a/pkg/analyzer/test/src/dart/element/inheritance_manager3_test.dart b/pkg/analyzer/test/src/dart/element/inheritance_manager3_test.dart
index f925825..dc308ff 100644
--- a/pkg/analyzer/test/src/dart/element/inheritance_manager3_test.dart
+++ b/pkg/analyzer/test/src/dart/element/inheritance_manager3_test.dart
@@ -4,6 +4,7 @@
import 'package:analyzer/dart/analysis/features.dart';
import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/null_safety_understanding_flag.dart';
import 'package:analyzer/dart/element/nullability_suffix.dart';
import 'package:analyzer/dart/element/type.dart';
import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
@@ -61,7 +62,7 @@
_assertGetInherited(
className: 'X',
name: 'foo',
- expected: 'J.foo: void Function()',
+ expected: 'I.foo: void Function()',
);
}
@@ -413,7 +414,7 @@
abstract class A implements I, J {}
''');
_assertInheritedMap('A', r'''
-J.bar: void Function()
+I.bar: void Function()
''');
}
@@ -448,7 +449,7 @@
abstract class A implements I, J {}
''');
_assertInheritedMap('A', r'''
-J.foo: int Function()
+I.foo: int Function()
''');
}
@@ -465,7 +466,7 @@
abstract class A implements I, J {}
''');
_assertInheritedMap('A', r'''
-J.foo: void Function()
+I.foo: void Function()
''');
}
@@ -1053,6 +1054,31 @@
@override
bool get typeToStringWithNullability => true;
+ test_getInheritedMap_topMerge_method() async {
+ newFile('/test/lib/a.dart', content: r'''
+// @dart = 2.6
+class A {
+ void foo({int a}) {}
+}
+''');
+
+ await resolveTestCode('''
+import 'a.dart';
+
+class B {
+ void foo({required int? a}) {}
+}
+
+class C implements A, B {
+ void foo({int? a}) {}
+}
+''');
+
+ _assertInheritedMap('C', r'''
+B.foo: void Function({required int a})
+''');
+ }
+
test_getMember_optIn_inheritsOptIn() async {
newFile('/test/lib/a.dart', content: r'''
class A {
@@ -1102,6 +1128,66 @@
);
}
+ test_getMember_optIn_topMerge_getter() async {
+ await resolveTestCode('''
+class A {
+ dynamic get foo => 0;
+}
+
+class B {
+ Object? get foo => 0;
+}
+
+class X extends A implements B {}
+''');
+
+ _assertGetMember(
+ className: 'X',
+ name: 'foo',
+ expected: 'B.foo: Object? Function()',
+ );
+ }
+
+ test_getMember_optIn_topMerge_method() async {
+ await resolveTestCode('''
+class A {
+ Object? foo(dynamic x) {}
+}
+
+class B {
+ dynamic foo(Object? x) {}
+}
+
+class X extends A implements B {}
+''');
+
+ _assertGetMember(
+ className: 'X',
+ name: 'foo',
+ expected: 'X.foo: Object? Function(Object?)',
+ );
+ }
+
+ test_getMember_optIn_topMerge_setter() async {
+ await resolveTestCode('''
+class A {
+ set foo(dynamic _) {}
+}
+
+class B {
+ set foo(Object? _) {}
+}
+
+class X extends A implements B {}
+''');
+
+ _assertGetMember(
+ className: 'X',
+ name: 'foo=',
+ expected: 'B.foo=: void Function(Object?)',
+ );
+ }
+
test_getMember_optOut_inheritsOptIn() async {
newFile('/test/lib/a.dart', content: r'''
class A {
@@ -1204,14 +1290,17 @@
}) {
var interfaceType = _classInterfaceType(className);
- var memberType = manager.getMember(
- interfaceType,
- Name(null, name),
- concrete: concrete,
- forSuper: forSuper,
- );
+ ExecutableElement member;
+ NullSafetyUnderstandingFlag.enableNullSafetyTypes(() {
+ member = manager.getMember(
+ interfaceType,
+ Name(null, name),
+ concrete: concrete,
+ forSuper: forSuper,
+ );
+ });
- _assertExecutable(memberType, expected);
+ _assertExecutable(member, expected);
}
void _assertInheritedConcreteMap(String className, String expected) {
diff --git a/pkg/analyzer/test/src/dart/resolution/class_test.dart b/pkg/analyzer/test/src/dart/resolution/class_test.dart
index 9d2f341..a74c799 100644
--- a/pkg/analyzer/test/src/dart/resolution/class_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/class_test.dart
@@ -2,6 +2,7 @@
// 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.
+import 'package:analyzer/src/dart/error/syntactic_errors.dart';
import 'package:analyzer/src/error/codes.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -461,7 +462,17 @@
int get C => null;
}
''', [
- error(CompileTimeErrorCode.MEMBER_WITH_CLASS_NAME, 20, 1),
+ error(ParserErrorCode.MEMBER_WITH_CLASS_NAME, 20, 1),
+ ]);
+ }
+
+ test_error_memberWithClassName_field() async {
+ await assertErrorsInCode(r'''
+class C {
+ int C = 42;
+}
+''', [
+ error(ParserErrorCode.MEMBER_WITH_CLASS_NAME, 16, 1),
]);
}
@@ -471,7 +482,7 @@
static int get C => null;
}
''', [
- error(CompileTimeErrorCode.MEMBER_WITH_CLASS_NAME, 27, 1),
+ error(ParserErrorCode.MEMBER_WITH_CLASS_NAME, 27, 1),
]);
var method = findNode.methodDeclaration('C =>');
@@ -486,7 +497,7 @@
set C(_) {}
}
''', [
- error(CompileTimeErrorCode.MEMBER_WITH_CLASS_NAME, 16, 1),
+ error(ParserErrorCode.MEMBER_WITH_CLASS_NAME, 16, 1),
]);
}
@@ -496,7 +507,7 @@
static set C(_) {}
}
''', [
- error(CompileTimeErrorCode.MEMBER_WITH_CLASS_NAME, 23, 1),
+ error(ParserErrorCode.MEMBER_WITH_CLASS_NAME, 23, 1),
]);
var method = findNode.methodDeclaration('C(_)');
diff --git a/pkg/analyzer/test/src/dart/resolution/instance_member_inference_class_test.dart b/pkg/analyzer/test/src/dart/resolution/instance_member_inference_class_test.dart
index c506fc6..f11aa35 100644
--- a/pkg/analyzer/test/src/dart/resolution/instance_member_inference_class_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/instance_member_inference_class_test.dart
@@ -2,19 +2,21 @@
// 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.
+import 'package:analyzer/dart/analysis/features.dart';
+import 'package:analyzer/src/generated/engine.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
import 'driver_resolution.dart';
main() {
defineReflectiveSuite(() {
- defineReflectiveTests(InstanceMemberInferenceClassDriverResolutionTest);
+ defineReflectiveTests(InstanceMemberInferenceClassTest);
+ defineReflectiveTests(InstanceMemberInferenceClassWithNullSafetyTest);
});
}
@reflectiveTest
-class InstanceMemberInferenceClassDriverResolutionTest
- extends DriverResolutionTest {
+class InstanceMemberInferenceClassTest extends DriverResolutionTest {
test_invalid_inheritanceCycle() async {
await resolveTestCode('''
class A extends C {}
@@ -254,3 +256,51 @@
assertType(foo.returnType, 'T');
}
}
+
+@reflectiveTest
+class InstanceMemberInferenceClassWithNullSafetyTest
+ extends InstanceMemberInferenceClassTest {
+ @override
+ AnalysisOptionsImpl get analysisOptions => AnalysisOptionsImpl()
+ ..contextFeatures = FeatureSet.forTesting(
+ sdkVersion: '2.3.0', additionalFeatures: [Feature.non_nullable]);
+
+ @override
+ bool get typeToStringWithNullability => true;
+
+ test_method_parameter_multiple_different_merge() async {
+ await resolveTestCode('''
+class A {
+ void foo(Object? p) {}
+}
+
+class B {
+ void foo(dynamic p) {}
+}
+
+class C implements A, B {
+ void foo(p) {}
+}
+''');
+ var p = findElement.method('foo', of: 'C').parameters[0];
+ assertType(p.type, 'Object?');
+ }
+
+ test_method_return_multiple_different_merge() async {
+ await resolveTestCode('''
+class A {
+ Object? foo() => throw 0;
+}
+
+class B {
+ dynamic foo() => throw 0;
+}
+
+class C implements A, B {
+ foo() => throw 0;
+}
+''');
+ var foo = findElement.method('foo', of: 'C');
+ assertType(foo.returnType, 'Object?');
+ }
+}
diff --git a/pkg/analyzer/test/src/dart/resolution/library_element_test.dart b/pkg/analyzer/test/src/dart/resolution/library_element_test.dart
new file mode 100644
index 0000000..29a98ec
--- /dev/null
+++ b/pkg/analyzer/test/src/dart/resolution/library_element_test.dart
@@ -0,0 +1,77 @@
+// Copyright (c) 2020, 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.
+
+import 'package:analyzer/src/context/packages.dart';
+import 'package:analyzer/src/dart/analysis/experiments.dart';
+import 'package:test/test.dart';
+import 'package:test_reflective_loader/test_reflective_loader.dart';
+
+import 'driver_resolution.dart';
+
+main() {
+ defineReflectiveSuite(() {
+ defineReflectiveTests(LibraryElementTest);
+ });
+}
+
+@reflectiveTest
+class LibraryElementTest extends DriverResolutionTest {
+ test_languageVersion() async {
+ newFile('/test/.dart_tool/package_config.json', content: '''
+{
+ "configVersion": 2,
+ "packages": [
+ {
+ "name": "test",
+ "rootUri": "../",
+ "packageUri": "lib/",
+ "languageVersion": "2.7"
+ },
+ {
+ "name": "aaa",
+ "rootUri": "${toUriStr('/aaa')}",
+ "packageUri": "lib/"
+ }
+ ]
+}
+''');
+ driver.configure(
+ packages: findPackagesFrom(
+ resourceProvider,
+ getFolder('/test'),
+ ),
+ );
+
+ newFile('/test/lib/a.dart', content: r'''
+class A {}
+''');
+
+ newFile('/test/lib/b.dart', content: r'''
+// @dart = 2.6
+class B {}
+''');
+
+ newFile('/aaa/lib/c.dart', content: r'''
+class C {}
+''');
+
+ await _assertLanguageVersion('package:test/a.dart', 2, 7);
+ await _assertLanguageVersion('package:test/b.dart', 2, 6);
+ await _assertLanguageVersion(
+ 'package:aaa/c.dart',
+ ExperimentStatus.currentVersion.major,
+ ExperimentStatus.currentVersion.minor,
+ );
+ }
+
+ Future<void> _assertLanguageVersion(
+ String uriStr,
+ int major,
+ int minor,
+ ) async {
+ var element = await driver.getLibraryByUri(uriStr);
+ expect(element.languageVersionMajor, major);
+ expect(element.languageVersionMinor, minor);
+ }
+}
diff --git a/pkg/analyzer/test/src/dart/resolution/mixin_test.dart b/pkg/analyzer/test/src/dart/resolution/mixin_test.dart
index f3bb225..c897c26 100644
--- a/pkg/analyzer/test/src/dart/resolution/mixin_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/mixin_test.dart
@@ -369,7 +369,7 @@
int get M => 0;
}
''', [
- error(CompileTimeErrorCode.MEMBER_WITH_CLASS_NAME, 20, 1),
+ error(ParserErrorCode.MEMBER_WITH_CLASS_NAME, 20, 1),
]);
}
@@ -379,7 +379,7 @@
static int get M => 0;
}
''', [
- error(CompileTimeErrorCode.MEMBER_WITH_CLASS_NAME, 27, 1),
+ error(ParserErrorCode.MEMBER_WITH_CLASS_NAME, 27, 1),
]);
}
@@ -389,7 +389,7 @@
void set M(_) {}
}
''', [
- error(CompileTimeErrorCode.MEMBER_WITH_CLASS_NAME, 21, 1),
+ error(ParserErrorCode.MEMBER_WITH_CLASS_NAME, 21, 1),
]);
}
@@ -399,7 +399,7 @@
static void set M(_) {}
}
''', [
- error(CompileTimeErrorCode.MEMBER_WITH_CLASS_NAME, 28, 1),
+ error(ParserErrorCode.MEMBER_WITH_CLASS_NAME, 28, 1),
]);
}
diff --git a/pkg/analyzer/test/src/dart/resolution/test_all.dart b/pkg/analyzer/test/src/dart/resolution/test_all.dart
index cc7c7b9..d1251c4 100644
--- a/pkg/analyzer/test/src/dart/resolution/test_all.dart
+++ b/pkg/analyzer/test/src/dart/resolution/test_all.dart
@@ -35,6 +35,7 @@
import 'instance_member_inference_mixin_test.dart'
as instance_member_inference_mixin;
import 'language_version_test.dart' as language_version;
+import 'library_element_test.dart' as library_element;
import 'local_function_test.dart' as local_function;
import 'local_variable_test.dart' as local_variable;
import 'metadata_test.dart' as metadata;
@@ -83,6 +84,7 @@
instance_member_inference_class.main();
instance_member_inference_mixin.main();
language_version.main();
+ library_element.main();
local_function.main();
local_variable.main();
metadata.main();
diff --git a/pkg/analyzer/test/src/diagnostics/invalid_constructor_name_test.dart b/pkg/analyzer/test/src/diagnostics/invalid_constructor_name_test.dart
index a76de53..ba7337a 100644
--- a/pkg/analyzer/test/src/diagnostics/invalid_constructor_name_test.dart
+++ b/pkg/analyzer/test/src/diagnostics/invalid_constructor_name_test.dart
@@ -2,7 +2,7 @@
// 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.
-import 'package:analyzer/src/error/codes.dart';
+import 'package:analyzer/src/dart/error/syntactic_errors.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
import '../dart/resolution/driver_resolution.dart';
@@ -22,7 +22,7 @@
}
class B {}
''', [
- error(CompileTimeErrorCode.INVALID_CONSTRUCTOR_NAME, 12, 1),
+ error(ParserErrorCode.INVALID_CONSTRUCTOR_NAME, 12, 1),
]);
}
@@ -32,7 +32,7 @@
B() : super();
}
''', [
- error(CompileTimeErrorCode.INVALID_CONSTRUCTOR_NAME, 12, 1),
+ error(ParserErrorCode.INVALID_CONSTRUCTOR_NAME, 12, 1),
]);
}
}
diff --git a/pkg/analyzer/test/src/diagnostics/member_with_class_name_test.dart b/pkg/analyzer/test/src/diagnostics/member_with_class_name_test.dart
index c868e38..3558cc0 100644
--- a/pkg/analyzer/test/src/diagnostics/member_with_class_name_test.dart
+++ b/pkg/analyzer/test/src/diagnostics/member_with_class_name_test.dart
@@ -2,7 +2,7 @@
// 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.
-import 'package:analyzer/src/error/codes.dart';
+import 'package:analyzer/src/dart/error/syntactic_errors.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
import '../dart/resolution/driver_resolution.dart';
@@ -21,7 +21,7 @@
int A = 0;
}
''', [
- error(CompileTimeErrorCode.MEMBER_WITH_CLASS_NAME, 16, 1),
+ error(ParserErrorCode.MEMBER_WITH_CLASS_NAME, 16, 1),
]);
}
@@ -31,7 +31,7 @@
int z, A, b = 0;
}
''', [
- error(CompileTimeErrorCode.MEMBER_WITH_CLASS_NAME, 19, 1),
+ error(ParserErrorCode.MEMBER_WITH_CLASS_NAME, 19, 1),
]);
}
@@ -41,7 +41,7 @@
get A => 0;
}
''', [
- error(CompileTimeErrorCode.MEMBER_WITH_CLASS_NAME, 16, 1),
+ error(ParserErrorCode.MEMBER_WITH_CLASS_NAME, 16, 1),
]);
}
diff --git a/pkg/analyzer/test/src/diagnostics/super_in_extension_test.dart b/pkg/analyzer/test/src/diagnostics/super_in_extension_test.dart
index 6371a3a..84652ac 100644
--- a/pkg/analyzer/test/src/diagnostics/super_in_extension_test.dart
+++ b/pkg/analyzer/test/src/diagnostics/super_in_extension_test.dart
@@ -69,10 +69,10 @@
test_method_inGetter() async {
await assertErrorsInCode('''
extension E on int {
- int get displayTest => super.toString();
+ String get displayText => super.toString();
}
''', [
- error(CompileTimeErrorCode.SUPER_IN_EXTENSION, 46, 5),
+ error(CompileTimeErrorCode.SUPER_IN_EXTENSION, 49, 5),
]);
}
diff --git a/pkg/analyzer/test/src/diagnostics/super_in_invalid_context_test.dart b/pkg/analyzer/test/src/diagnostics/super_in_invalid_context_test.dart
index 5ea4287..561613b 100644
--- a/pkg/analyzer/test/src/diagnostics/super_in_invalid_context_test.dart
+++ b/pkg/analyzer/test/src/diagnostics/super_in_invalid_context_test.dart
@@ -77,6 +77,14 @@
''', [
error(CompileTimeErrorCode.SUPER_IN_INVALID_CONTEXT, 70, 5),
]);
+
+ assertMethodInvocation2(
+ findNode.methodInvocation('super.m()'),
+ element: null,
+ typeArgumentTypes: [],
+ invokeType: 'dynamic',
+ type: 'dynamic',
+ );
}
test_staticVariableInitializer() async {
@@ -90,6 +98,12 @@
''', [
error(CompileTimeErrorCode.SUPER_IN_INVALID_CONTEXT, 69, 5),
]);
+
+ assertPropertyAccess2(
+ findNode.propertyAccess('super.a'),
+ element: null,
+ type: 'dynamic',
+ );
}
test_topLevelFunction() async {
diff --git a/pkg/analyzer/test/src/fasta/ast_builder_test.dart b/pkg/analyzer/test/src/fasta/ast_builder_test.dart
index 4e1c656..7d2d005 100644
--- a/pkg/analyzer/test/src/fasta/ast_builder_test.dart
+++ b/pkg/analyzer/test/src/fasta/ast_builder_test.dart
@@ -3,6 +3,7 @@
// BSD-style license that can be found in the LICENSE file.
import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/src/dart/error/syntactic_errors.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -39,7 +40,9 @@
class A {
B() : super();
}
-''');
+''', errors: [
+ expectedError(ParserErrorCode.INVALID_CONSTRUCTOR_NAME, 12, 1),
+ ]);
expect(unit, isNotNull);
expect(unit.declarations, hasLength(1));
ClassDeclaration declaration = unit.declarations[0];
@@ -55,7 +58,9 @@
class A {
get A => 0;
}
-''');
+''', errors: [
+ expectedError(ParserErrorCode.MEMBER_WITH_CLASS_NAME, 16, 1),
+ ]);
expect(unit, isNotNull);
expect(unit.declarations, hasLength(1));
ClassDeclaration declaration = unit.declarations[0];
diff --git a/pkg/analyzer/tool/messages/generate.dart b/pkg/analyzer/tool/messages/generate.dart
index 68b7802..b38db34 100644
--- a/pkg/analyzer/tool/messages/generate.dart
+++ b/pkg/analyzer/tool/messages/generate.dart
@@ -135,7 +135,7 @@
for (Map entry in translatedEntries) {
final name = nameForEntry(entry);
final errorCode = name[1];
- if (!syntacticErrorsSource.contains('_$errorCode')) {
+ if (!syntacticErrorsSource.contains(' _$errorCode')) {
if (publicCount == 0) {
print('');
print('The following ParserErrorCodes should be updated'
diff --git a/pkg/analyzer/tool/update_id_tests.dart b/pkg/analyzer/tool/update_id_tests.dart
new file mode 100644
index 0000000..2f1b93a
--- /dev/null
+++ b/pkg/analyzer/tool/update_id_tests.dart
@@ -0,0 +1,20 @@
+// Copyright (c) 2020, 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.
+
+import 'package:_fe_analyzer_shared/src/testing/id_testing.dart' as id;
+
+const List<String> idTests = <String>[
+ 'pkg/analyzer/test/id_tests/assigned_variables_test.dart',
+ 'pkg/analyzer/test/id_tests/constant_test.dart',
+ 'pkg/analyzer/test/id_tests/definite_assignment_test.dart',
+ 'pkg/analyzer/test/id_tests/definite_unassignment_test.dart',
+ 'pkg/analyzer/test/id_tests/inheritance_test.dart',
+ 'pkg/analyzer/test/id_tests/nullability_test.dart',
+ 'pkg/analyzer/test/id_tests/reachability_test.dart',
+ 'pkg/analyzer/test/id_tests/type_promotion_test.dart',
+];
+
+main() async {
+ await id.updateAllTests(idTests);
+}
diff --git a/pkg/analyzer_plugin/analysis_options.yaml b/pkg/analyzer_plugin/analysis_options.yaml
index 7e21576..42406ef 100644
--- a/pkg/analyzer_plugin/analysis_options.yaml
+++ b/pkg/analyzer_plugin/analysis_options.yaml
@@ -26,7 +26,7 @@
- library_prefixes
- no_duplicate_case_values
- null_closures
- #- omit_local_variable_types # 1759
+ - omit_local_variable_types
- prefer_adjacent_string_concatenation
- prefer_collection_literals
- prefer_conditional_assignment
diff --git a/pkg/analyzer_plugin/lib/plugin/assist_mixin.dart b/pkg/analyzer_plugin/lib/plugin/assist_mixin.dart
index 6a9bcd5..b006c26 100644
--- a/pkg/analyzer_plugin/lib/plugin/assist_mixin.dart
+++ b/pkg/analyzer_plugin/lib/plugin/assist_mixin.dart
@@ -4,14 +4,12 @@
import 'dart:async';
-import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/src/dart/analysis/driver.dart';
import 'package:analyzer_plugin/plugin/plugin.dart';
import 'package:analyzer_plugin/protocol/protocol.dart';
import 'package:analyzer_plugin/protocol/protocol_generated.dart';
import 'package:analyzer_plugin/src/utilities/assist/assist.dart';
import 'package:analyzer_plugin/utilities/assist/assist.dart';
-import 'package:analyzer_plugin/utilities/generator.dart';
/// A mixin that can be used when creating a subclass of [ServerPlugin] to
/// provide most of the implementation for handling assist requests.
@@ -34,11 +32,10 @@
EditGetAssistsParams parameters) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- String path = parameters.file;
- AssistRequest request = await getAssistRequest(parameters);
- AssistGenerator generator = AssistGenerator(getAssistContributors(path));
- GeneratorResult<EditGetAssistsResult> result =
- generator.generateAssistsResponse(request);
+ var path = parameters.file;
+ var request = await getAssistRequest(parameters);
+ var generator = AssistGenerator(getAssistContributors(path));
+ var result = generator.generateAssistsResponse(request);
result.sendNotifications(channel);
return result.result;
}
@@ -57,8 +54,8 @@
EditGetAssistsParams parameters) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- String path = parameters.file;
- ResolvedUnitResult result = await getResolvedUnitResult(path);
+ var path = parameters.file;
+ var result = await getResolvedUnitResult(path);
return DartAssistRequestImpl(
resourceProvider, parameters.offset, parameters.length, result);
}
diff --git a/pkg/analyzer_plugin/lib/plugin/completion_mixin.dart b/pkg/analyzer_plugin/lib/plugin/completion_mixin.dart
index 241f511..b8667fd 100644
--- a/pkg/analyzer_plugin/lib/plugin/completion_mixin.dart
+++ b/pkg/analyzer_plugin/lib/plugin/completion_mixin.dart
@@ -4,14 +4,12 @@
import 'dart:async';
-import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/src/dart/analysis/driver.dart';
import 'package:analyzer_plugin/plugin/plugin.dart';
import 'package:analyzer_plugin/protocol/protocol.dart';
import 'package:analyzer_plugin/protocol/protocol_generated.dart';
import 'package:analyzer_plugin/src/utilities/completion/completion_core.dart';
import 'package:analyzer_plugin/utilities/completion/completion_core.dart';
-import 'package:analyzer_plugin/utilities/generator.dart';
/// A mixin that can be used when creating a subclass of [ServerPlugin] to
/// provide most of the implementation for handling code completion requests.
@@ -35,12 +33,10 @@
CompletionGetSuggestionsParams parameters) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- String path = parameters.file;
- CompletionRequest request = await getCompletionRequest(parameters);
- CompletionGenerator generator =
- CompletionGenerator(getCompletionContributors(path));
- GeneratorResult<CompletionGetSuggestionsResult> result =
- await generator.generateCompletionResponse(request);
+ var path = parameters.file;
+ var request = await getCompletionRequest(parameters);
+ var generator = CompletionGenerator(getCompletionContributors(path));
+ var result = await generator.generateCompletionResponse(request);
result.sendNotifications(channel);
return result.result;
}
@@ -60,7 +56,7 @@
CompletionGetSuggestionsParams parameters) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- ResolvedUnitResult result = await getResolvedUnitResult(parameters.file);
+ var result = await getResolvedUnitResult(parameters.file);
return DartCompletionRequestImpl(
resourceProvider, parameters.offset, result);
}
diff --git a/pkg/analyzer_plugin/lib/plugin/fix_mixin.dart b/pkg/analyzer_plugin/lib/plugin/fix_mixin.dart
index 517d8cd..0ef562c 100644
--- a/pkg/analyzer_plugin/lib/plugin/fix_mixin.dart
+++ b/pkg/analyzer_plugin/lib/plugin/fix_mixin.dart
@@ -7,13 +7,11 @@
import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/error/error.dart';
import 'package:analyzer/src/dart/analysis/driver.dart';
-import 'package:analyzer/src/generated/source.dart';
import 'package:analyzer_plugin/plugin/plugin.dart';
import 'package:analyzer_plugin/protocol/protocol.dart';
import 'package:analyzer_plugin/protocol/protocol_generated.dart';
import 'package:analyzer_plugin/src/utilities/fixes/fixes.dart';
import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
-import 'package:analyzer_plugin/utilities/generator.dart';
/// A mixin that can be used when creating a subclass of [ServerPlugin] and
/// mixing in [FixesMixin]. This implements the creation of the fixes request
@@ -27,18 +25,18 @@
Future<FixesRequest> getFixesRequest(EditGetFixesParams parameters) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- String path = parameters.file;
- int offset = parameters.offset;
- ResolvedUnitResult result = await getResolvedUnitResult(path);
+ var path = parameters.file;
+ var offset = parameters.offset;
+ var result = await getResolvedUnitResult(path);
return DartFixesRequestImpl(
resourceProvider, offset, _getErrors(offset, result), result);
}
List<AnalysisError> _getErrors(int offset, ResolvedUnitResult result) {
- LineInfo lineInfo = result.lineInfo;
- int offsetLine = lineInfo.getLocation(offset).lineNumber;
+ var lineInfo = result.lineInfo;
+ var offsetLine = lineInfo.getLocation(offset).lineNumber;
return result.errors.where((AnalysisError error) {
- int errorLine = lineInfo.getLocation(error.offset).lineNumber;
+ var errorLine = lineInfo.getLocation(error.offset).lineNumber;
return errorLine == offsetLine;
}).toList();
}
@@ -65,11 +63,10 @@
EditGetFixesParams parameters) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- String path = parameters.file;
- FixesRequest request = await getFixesRequest(parameters);
- FixGenerator generator = FixGenerator(getFixContributors(path));
- GeneratorResult<EditGetFixesResult> result =
- generator.generateFixesResponse(request);
+ var path = parameters.file;
+ var request = await getFixesRequest(parameters);
+ var generator = FixGenerator(getFixContributors(path));
+ var result = generator.generateFixesResponse(request);
result.sendNotifications(channel);
return result.result;
}
diff --git a/pkg/analyzer_plugin/lib/plugin/folding_mixin.dart b/pkg/analyzer_plugin/lib/plugin/folding_mixin.dart
index 0f9dfe79..9a46c18 100644
--- a/pkg/analyzer_plugin/lib/plugin/folding_mixin.dart
+++ b/pkg/analyzer_plugin/lib/plugin/folding_mixin.dart
@@ -4,13 +4,11 @@
import 'dart:async';
-import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/src/dart/analysis/driver.dart';
import 'package:analyzer_plugin/plugin/plugin.dart';
import 'package:analyzer_plugin/protocol/protocol.dart';
import 'package:analyzer_plugin/src/utilities/folding/folding.dart';
import 'package:analyzer_plugin/utilities/folding/folding.dart';
-import 'package:analyzer_plugin/utilities/generator.dart';
/// A mixin that can be used when creating a subclass of [ServerPlugin] and
/// mixing in [FoldingMixin]. This implements the creation of the folding
@@ -25,7 +23,7 @@
Future<FoldingRequest> getFoldingRequest(String path) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- ResolvedUnitResult result = await getResolvedUnitResult(path);
+ var result = await getResolvedUnitResult(path);
return DartFoldingRequestImpl(resourceProvider, result);
}
}
@@ -51,11 +49,9 @@
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
try {
- FoldingRequest request = await getFoldingRequest(path);
- FoldingGenerator generator =
- FoldingGenerator(getFoldingContributors(path));
- GeneratorResult generatorResult =
- generator.generateFoldingNotification(request);
+ var request = await getFoldingRequest(path);
+ var generator = FoldingGenerator(getFoldingContributors(path));
+ var generatorResult = generator.generateFoldingNotification(request);
generatorResult.sendNotifications(channel);
} on RequestFailure {
// If we couldn't analyze the file, then don't send a notification.
diff --git a/pkg/analyzer_plugin/lib/plugin/highlights_mixin.dart b/pkg/analyzer_plugin/lib/plugin/highlights_mixin.dart
index e417e50..b7ace88 100644
--- a/pkg/analyzer_plugin/lib/plugin/highlights_mixin.dart
+++ b/pkg/analyzer_plugin/lib/plugin/highlights_mixin.dart
@@ -4,12 +4,10 @@
import 'dart:async';
-import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/src/dart/analysis/driver.dart';
import 'package:analyzer_plugin/plugin/plugin.dart';
import 'package:analyzer_plugin/protocol/protocol.dart';
import 'package:analyzer_plugin/src/utilities/highlights/highlights.dart';
-import 'package:analyzer_plugin/utilities/generator.dart';
import 'package:analyzer_plugin/utilities/highlights/highlights.dart';
/// A mixin that can be used when creating a subclass of [ServerPlugin] and
@@ -25,7 +23,7 @@
Future<HighlightsRequest> getHighlightsRequest(String path) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- ResolvedUnitResult result = await getResolvedUnitResult(path);
+ var result = await getResolvedUnitResult(path);
return DartHighlightsRequestImpl(resourceProvider, result);
}
}
@@ -51,11 +49,9 @@
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
try {
- HighlightsRequest request = await getHighlightsRequest(path);
- HighlightsGenerator generator =
- HighlightsGenerator(getHighlightsContributors(path));
- GeneratorResult generatorResult =
- generator.generateHighlightsNotification(request);
+ var request = await getHighlightsRequest(path);
+ var generator = HighlightsGenerator(getHighlightsContributors(path));
+ var generatorResult = generator.generateHighlightsNotification(request);
generatorResult.sendNotifications(channel);
} on RequestFailure {
// If we couldn't analyze the file, then don't send a notification.
diff --git a/pkg/analyzer_plugin/lib/plugin/kythe_mixin.dart b/pkg/analyzer_plugin/lib/plugin/kythe_mixin.dart
index 3bfcf27..9a4841a 100644
--- a/pkg/analyzer_plugin/lib/plugin/kythe_mixin.dart
+++ b/pkg/analyzer_plugin/lib/plugin/kythe_mixin.dart
@@ -4,13 +4,11 @@
import 'dart:async';
-import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/src/dart/analysis/driver.dart';
import 'package:analyzer_plugin/plugin/plugin.dart';
import 'package:analyzer_plugin/protocol/protocol.dart';
import 'package:analyzer_plugin/protocol/protocol_generated.dart';
import 'package:analyzer_plugin/src/utilities/kythe/entries.dart';
-import 'package:analyzer_plugin/utilities/generator.dart';
import 'package:analyzer_plugin/utilities/kythe/entries.dart';
/// A mixin that can be used when creating a subclass of [ServerPlugin] and
@@ -27,8 +25,8 @@
KytheGetKytheEntriesParams parameters) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- String path = parameters.file;
- ResolvedUnitResult result = await getResolvedUnitResult(path);
+ var path = parameters.file;
+ var result = await getResolvedUnitResult(path);
return DartEntryRequestImpl(resourceProvider, result);
}
}
@@ -54,11 +52,10 @@
KytheGetKytheEntriesParams parameters) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- String path = parameters.file;
- EntryRequest request = await getEntryRequest(parameters);
- EntryGenerator generator = EntryGenerator(getEntryContributors(path));
- GeneratorResult<KytheGetKytheEntriesResult> result =
- generator.generateGetEntriesResponse(request);
+ var path = parameters.file;
+ var request = await getEntryRequest(parameters);
+ var generator = EntryGenerator(getEntryContributors(path));
+ var result = generator.generateGetEntriesResponse(request);
result.sendNotifications(channel);
return result.result;
}
diff --git a/pkg/analyzer_plugin/lib/plugin/navigation_mixin.dart b/pkg/analyzer_plugin/lib/plugin/navigation_mixin.dart
index 3554257..0dfdfcc 100644
--- a/pkg/analyzer_plugin/lib/plugin/navigation_mixin.dart
+++ b/pkg/analyzer_plugin/lib/plugin/navigation_mixin.dart
@@ -4,13 +4,11 @@
import 'dart:async';
-import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/src/dart/analysis/driver.dart';
import 'package:analyzer_plugin/plugin/plugin.dart';
import 'package:analyzer_plugin/protocol/protocol.dart';
import 'package:analyzer_plugin/protocol/protocol_generated.dart';
import 'package:analyzer_plugin/src/utilities/navigation/navigation.dart';
-import 'package:analyzer_plugin/utilities/generator.dart';
import 'package:analyzer_plugin/utilities/navigation/navigation.dart';
/// A mixin that can be used when creating a subclass of [ServerPlugin] and
@@ -27,10 +25,10 @@
AnalysisGetNavigationParams parameters) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- String path = parameters.file;
- ResolvedUnitResult result = await getResolvedUnitResult(path);
- int offset = parameters.offset;
- int length = parameters.length;
+ var path = parameters.file;
+ var result = await getResolvedUnitResult(path);
+ var offset = parameters.offset;
+ var length = parameters.length;
if (offset < 0 && length < 0) {
offset = 0;
length = result.content.length;
@@ -61,12 +59,10 @@
AnalysisGetNavigationParams parameters) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- String path = parameters.file;
- NavigationRequest request = await getNavigationRequest(parameters);
- NavigationGenerator generator =
- NavigationGenerator(getNavigationContributors(path));
- GeneratorResult<AnalysisGetNavigationResult> result =
- generator.generateNavigationResponse(request);
+ var path = parameters.file;
+ var request = await getNavigationRequest(parameters);
+ var generator = NavigationGenerator(getNavigationContributors(path));
+ var result = generator.generateNavigationResponse(request);
result.sendNotifications(channel);
return result.result;
}
@@ -78,12 +74,10 @@
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
try {
- NavigationRequest request =
+ var request =
await getNavigationRequest(AnalysisGetNavigationParams(path, -1, -1));
- NavigationGenerator generator =
- NavigationGenerator(getNavigationContributors(path));
- GeneratorResult generatorResult =
- generator.generateNavigationNotification(request);
+ var generator = NavigationGenerator(getNavigationContributors(path));
+ var generatorResult = generator.generateNavigationNotification(request);
generatorResult.sendNotifications(channel);
} on RequestFailure {
// If we couldn't analyze the file, then don't send a notification.
diff --git a/pkg/analyzer_plugin/lib/plugin/occurrences_mixin.dart b/pkg/analyzer_plugin/lib/plugin/occurrences_mixin.dart
index 7ba06a5..3a087e3 100644
--- a/pkg/analyzer_plugin/lib/plugin/occurrences_mixin.dart
+++ b/pkg/analyzer_plugin/lib/plugin/occurrences_mixin.dart
@@ -4,12 +4,10 @@
import 'dart:async';
-import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/src/dart/analysis/driver.dart';
import 'package:analyzer_plugin/plugin/plugin.dart';
import 'package:analyzer_plugin/protocol/protocol.dart';
import 'package:analyzer_plugin/src/utilities/occurrences/occurrences.dart';
-import 'package:analyzer_plugin/utilities/generator.dart';
import 'package:analyzer_plugin/utilities/occurrences/occurrences.dart';
/// A mixin that can be used when creating a subclass of [ServerPlugin] and
@@ -25,7 +23,7 @@
Future<OccurrencesRequest> getOccurrencesRequest(String path) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- ResolvedUnitResult result = await getResolvedUnitResult(path);
+ var result = await getResolvedUnitResult(path);
return DartOccurrencesRequestImpl(resourceProvider, result);
}
}
@@ -51,11 +49,9 @@
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
try {
- OccurrencesRequest request = await getOccurrencesRequest(path);
- OccurrencesGenerator generator =
- OccurrencesGenerator(getOccurrencesContributors(path));
- GeneratorResult generatorResult =
- generator.generateOccurrencesNotification(request);
+ var request = await getOccurrencesRequest(path);
+ var generator = OccurrencesGenerator(getOccurrencesContributors(path));
+ var generatorResult = generator.generateOccurrencesNotification(request);
generatorResult.sendNotifications(channel);
} on RequestFailure {
// If we couldn't analyze the file, then don't send a notification.
diff --git a/pkg/analyzer_plugin/lib/plugin/outline_mixin.dart b/pkg/analyzer_plugin/lib/plugin/outline_mixin.dart
index dca5924..bab4dd3 100644
--- a/pkg/analyzer_plugin/lib/plugin/outline_mixin.dart
+++ b/pkg/analyzer_plugin/lib/plugin/outline_mixin.dart
@@ -4,12 +4,10 @@
import 'dart:async';
-import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/src/dart/analysis/driver.dart';
import 'package:analyzer_plugin/plugin/plugin.dart';
import 'package:analyzer_plugin/protocol/protocol.dart';
import 'package:analyzer_plugin/src/utilities/outline/outline.dart';
-import 'package:analyzer_plugin/utilities/generator.dart';
import 'package:analyzer_plugin/utilities/outline/outline.dart';
/// A mixin that can be used when creating a subclass of [ServerPlugin] and
@@ -25,7 +23,7 @@
Future<OutlineRequest> getOutlineRequest(String path) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- ResolvedUnitResult result = await getResolvedUnitResult(path);
+ var result = await getResolvedUnitResult(path);
return DartOutlineRequestImpl(resourceProvider, result);
}
}
@@ -51,11 +49,9 @@
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
try {
- OutlineRequest request = await getOutlineRequest(path);
- OutlineGenerator generator =
- OutlineGenerator(getOutlineContributors(path));
- GeneratorResult generatorResult =
- generator.generateOutlineNotification(request);
+ var request = await getOutlineRequest(path);
+ var generator = OutlineGenerator(getOutlineContributors(path));
+ var generatorResult = generator.generateOutlineNotification(request);
generatorResult.sendNotifications(channel);
} on RequestFailure {
// If we couldn't analyze the file, then don't send a notification.
diff --git a/pkg/analyzer_plugin/lib/plugin/plugin.dart b/pkg/analyzer_plugin/lib/plugin/plugin.dart
index 53cb122..6147731 100644
--- a/pkg/analyzer_plugin/lib/plugin/plugin.dart
+++ b/pkg/analyzer_plugin/lib/plugin/plugin.dart
@@ -22,7 +22,6 @@
import 'package:analyzer_plugin/src/protocol/protocol_internal.dart';
import 'package:analyzer_plugin/src/utilities/null_string_sink.dart';
import 'package:analyzer_plugin/utilities/subscriptions/subscription_manager.dart';
-import 'package:path/src/context.dart';
import 'package:pub_semver/pub_semver.dart';
/// The abstract superclass of any class implementing a plugin for the analysis
@@ -108,7 +107,7 @@
/// Return the context root containing the file at the given [filePath].
ContextRoot contextRootContaining(String filePath) {
- Context pathContext = resourceProvider.pathContext;
+ var pathContext = resourceProvider.pathContext;
/// Return `true` if the given [child] is either the same as or within the
/// given [parent].
@@ -119,8 +118,8 @@
/// Return `true` if the given context [root] contains the target [file].
bool ownsFile(ContextRoot root) {
if (isOrWithin(root.root, filePath)) {
- List<String> excludedPaths = root.exclude;
- for (String excludedPath in excludedPaths) {
+ var excludedPaths = root.exclude;
+ for (var excludedPath in excludedPaths) {
if (isOrWithin(excludedPath, filePath)) {
return false;
}
@@ -130,7 +129,7 @@
return false;
}
- for (ContextRoot root in driverMap.keys) {
+ for (var root in driverMap.keys) {
if (ownsFile(root)) {
return root;
}
@@ -144,7 +143,7 @@
/// Return the driver being used to analyze the file with the given [path].
AnalysisDriverGeneric driverForPath(String path) {
- ContextRoot contextRoot = contextRootContaining(path);
+ var contextRoot = contextRootContaining(path);
if (contextRoot == null) {
return null;
}
@@ -158,15 +157,14 @@
Future<ResolvedUnitResult> getResolvedUnitResult(String path) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- AnalysisDriverGeneric driver = driverForPath(path);
+ var driver = driverForPath(path);
if (driver is! AnalysisDriver) {
// Return an error from the request.
throw RequestFailure(
RequestErrorFactory.pluginError('Failed to analyze $path', null));
}
- ResolvedUnitResult result =
- await (driver as AnalysisDriver).getResult(path);
- ResultState state = result.state;
+ var result = await (driver as AnalysisDriver).getResult(path);
+ var state = result.state;
if (state != ResultState.VALID) {
// Return an error from the request.
throw RequestFailure(
@@ -201,7 +199,7 @@
AnalysisHandleWatchEventsParams parameters) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- for (WatchEvent event in parameters.events) {
+ for (var event in parameters.events) {
switch (event.type) {
case WatchEventType.ADD:
// TODO(brianwilkerson) Handle the event.
@@ -227,13 +225,13 @@
AnalysisSetContextRootsParams parameters) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- List<ContextRoot> contextRoots = parameters.roots;
- List<ContextRoot> oldRoots = driverMap.keys.toList();
- for (ContextRoot contextRoot in contextRoots) {
+ var contextRoots = parameters.roots;
+ var oldRoots = driverMap.keys.toList();
+ for (var contextRoot in contextRoots) {
if (!oldRoots.remove(contextRoot)) {
// The context is new, so we create a driver for it. Creating the driver
// has the side-effect of adding it to the analysis driver scheduler.
- AnalysisDriverGeneric driver = createAnalysisDriver(contextRoot);
+ var driver = createAnalysisDriver(contextRoot);
driverMap[contextRoot] = driver;
_addFilesToDriver(
driver,
@@ -241,9 +239,9 @@
contextRoot.exclude);
}
}
- for (ContextRoot contextRoot in oldRoots) {
+ for (var contextRoot in oldRoots) {
// The context has been removed, so we remove its driver.
- AnalysisDriverGeneric driver = driverMap.remove(contextRoot);
+ var driver = driverMap.remove(contextRoot);
// The `dispose` method has the side-effect of removing the driver from
// the analysis driver scheduler.
driver.dispose();
@@ -258,14 +256,13 @@
AnalysisSetPriorityFilesParams parameters) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- List<String> files = parameters.files;
- Map<AnalysisDriverGeneric, List<String>> filesByDriver =
- <AnalysisDriverGeneric, List<String>>{};
- for (String file in files) {
- ContextRoot contextRoot = contextRootContaining(file);
+ var files = parameters.files;
+ var filesByDriver = <AnalysisDriverGeneric, List<String>>{};
+ for (var file in files) {
+ var contextRoot = contextRootContaining(file);
if (contextRoot != null) {
// TODO(brianwilkerson) Which driver should we use if there is no context root?
- AnalysisDriverGeneric driver = driverMap[contextRoot];
+ var driver = driverMap[contextRoot];
filesByDriver.putIfAbsent(driver, () => <String>[]).add(file);
}
}
@@ -284,9 +281,8 @@
AnalysisSetSubscriptionsParams parameters) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- Map<AnalysisService, List<String>> subscriptions = parameters.subscriptions;
- Map<String, List<AnalysisService>> newSubscriptions =
- subscriptionManager.setSubscriptions(subscriptions);
+ var subscriptions = parameters.subscriptions;
+ var newSubscriptions = subscriptionManager.setSubscriptions(subscriptions);
sendNotificationsForSubscriptions(newSubscriptions);
return AnalysisSetSubscriptionsResult();
}
@@ -305,7 +301,7 @@
if (overlay is AddContentOverlay) {
fileContentOverlay[filePath] = overlay.content;
} else if (overlay is ChangeContentOverlay) {
- String oldContents = fileContentOverlay[filePath];
+ var oldContents = fileContentOverlay[filePath];
String newContents;
if (oldContents == null) {
// The server should only send a ChangeContentOverlay if there is
@@ -408,10 +404,10 @@
PluginVersionCheckParams parameters) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- String byteStorePath = parameters.byteStorePath;
- String sdkPath = parameters.sdkPath;
- String versionString = parameters.version;
- Version serverVersion = Version.parse(versionString);
+ var byteStorePath = parameters.byteStorePath;
+ var sdkPath = parameters.sdkPath;
+ var versionString = parameters.version;
+ var serverVersion = Version.parse(versionString);
_byteStore = MemoryCachingByteStore(
FileByteStore(byteStorePath,
tempNameSuffix: DateTime.now().millisecondsSinceEpoch.toString()),
@@ -461,7 +457,7 @@
/// This is a convenience method that subclasses can use to send notifications
/// after analysis has been performed on a file.
void sendNotificationsForFile(String path) {
- for (AnalysisService service in subscriptionManager.servicesForFile(path)) {
+ for (var service in subscriptionManager.servicesForFile(path)) {
_sendNotificationForFile(path, service);
}
}
@@ -477,7 +473,7 @@
void sendNotificationsForSubscriptions(
Map<String, List<AnalysisService>> subscriptions) {
subscriptions.forEach((String path, List<AnalysisService> services) {
- for (AnalysisService service in services) {
+ for (var service in services) {
_sendNotificationForFile(path, service);
}
});
@@ -505,7 +501,7 @@
/// list of [excluded] resources to the given [driver].
void _addFilesToDriver(
AnalysisDriverGeneric driver, Resource resource, List<String> excluded) {
- String path = resource.path;
+ var path = resource.path;
if (excluded.contains(path)) {
return;
}
@@ -513,7 +509,7 @@
driver.addFile(path);
} else if (resource is Folder) {
try {
- for (Resource child in resource.getChildren()) {
+ for (var child in resource.getChildren()) {
_addFilesToDriver(driver, child, excluded);
}
} on FileSystemException {
@@ -600,8 +596,8 @@
Future<void> _onRequest(Request request) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- int requestTime = DateTime.now().millisecondsSinceEpoch;
- String id = request.id;
+ var requestTime = DateTime.now().millisecondsSinceEpoch;
+ var id = request.id;
Response response;
try {
response = await _getResponse(request, requestTime);
diff --git a/pkg/analyzer_plugin/lib/protocol/protocol.dart b/pkg/analyzer_plugin/lib/protocol/protocol.dart
index 9329032..e661567 100644
--- a/pkg/analyzer_plugin/lib/protocol/protocol.dart
+++ b/pkg/analyzer_plugin/lib/protocol/protocol.dart
@@ -46,7 +46,7 @@
/// Return a table representing the structure of the Json object that will be
/// sent to the client to represent this response.
Map<String, Object> toJson() {
- Map<String, Object> jsonObject = {};
+ var jsonObject = <String, Object>{};
jsonObject[EVENT] = event;
if (params != null) {
jsonObject[PARAMS] = params;
@@ -146,7 +146,7 @@
/// Return a table representing the structure of the Json object that will be
/// sent to the server to represent this response.
Map<String, Object> toJson() {
- Map<String, Object> jsonObject = <String, Object>{};
+ var jsonObject = <String, Object>{};
jsonObject[ID] = id;
jsonObject[METHOD] = method;
if (params.isNotEmpty) {
@@ -165,11 +165,11 @@
if (second == null) {
return false;
}
- int length = first.length;
+ var length = first.length;
if (length != second.length) {
return false;
}
- for (int i = 0; i < length; i++) {
+ for (var i = 0; i < length; i++) {
if (!_equalObjects(first[i], second[i])) {
return false;
}
@@ -344,7 +344,7 @@
/// Return a table representing the structure of the Json object that will be
/// sent to the client to represent this response.
Map<String, Object> toJson() {
- Map<String, Object> jsonObject = <String, Object>{};
+ var jsonObject = <String, Object>{};
jsonObject[ID] = id;
if (error != null) {
jsonObject[ERROR] = error.toJson();
diff --git a/pkg/analyzer_plugin/lib/protocol/protocol_common.dart b/pkg/analyzer_plugin/lib/protocol/protocol_common.dart
index d63209a..732bb90 100644
--- a/pkg/analyzer_plugin/lib/protocol/protocol_common.dart
+++ b/pkg/analyzer_plugin/lib/protocol/protocol_common.dart
@@ -1445,7 +1445,7 @@
bool isStatic = false,
bool isPrivate = false,
bool isDeprecated = false}) {
- int flags = 0;
+ var flags = 0;
if (isAbstract) flags |= FLAG_ABSTRACT;
if (isConst) flags |= FLAG_CONST;
if (isFinal) flags |= FLAG_FINAL;
diff --git a/pkg/analyzer_plugin/lib/src/channel/isolate_channel.dart b/pkg/analyzer_plugin/lib/src/channel/isolate_channel.dart
index 4fcf2c3..664e448 100644
--- a/pkg/analyzer_plugin/lib/src/channel/isolate_channel.dart
+++ b/pkg/analyzer_plugin/lib/src/channel/isolate_channel.dart
@@ -95,8 +95,8 @@
void listen(void Function(Request request) onRequest,
{Function onError, void Function() onDone}) {
void onData(data) {
- Map<String, Object> requestMap = data as Map<String, Object>;
- Request request = Request.fromJson(requestMap);
+ var requestMap = data as Map<String, Object>;
+ var request = Request.fromJson(requestMap);
if (request != null) {
onRequest(request);
}
@@ -111,13 +111,13 @@
@override
void sendNotification(Notification notification) {
- Map<String, Object> json = notification.toJson();
+ var json = notification.toJson();
_sendPort.send(json);
}
@override
void sendResponse(Response response) {
- Map<String, Object> json = response.toJson();
+ var json = response.toJson();
_sendPort.send(json);
}
}
@@ -216,18 +216,18 @@
close();
return null;
}
- Completer<void> channelReady = Completer<void>();
+ var channelReady = Completer<void>();
_receivePort.listen((dynamic input) {
if (input is SendPort) {
_sendPort = input;
channelReady.complete(null);
} else if (input is Map) {
if (input.containsKey('id')) {
- String encodedInput = json.encode(input);
+ var encodedInput = json.encode(input);
instrumentationService.logPluginResponse(pluginId, encodedInput);
onResponse(Response.fromJson(input));
} else if (input.containsKey('event')) {
- String encodedInput = json.encode(input);
+ var encodedInput = json.encode(input);
instrumentationService.logPluginNotification(pluginId, encodedInput);
onNotification(Notification.fromJson(input));
}
@@ -239,8 +239,8 @@
@override
void sendRequest(Request request) {
if (_sendPort != null) {
- Map<String, Object> jsonData = request.toJson();
- String encodedRequest = json.encode(jsonData);
+ var jsonData = request.toJson();
+ var encodedRequest = json.encode(jsonData);
instrumentationService.logPluginRequest(pluginId, encodedRequest);
_sendPort.send(jsonData);
}
diff --git a/pkg/analyzer_plugin/lib/src/driver.dart b/pkg/analyzer_plugin/lib/src/driver.dart
index bb22862..d327ddf 100644
--- a/pkg/analyzer_plugin/lib/src/driver.dart
+++ b/pkg/analyzer_plugin/lib/src/driver.dart
@@ -21,7 +21,7 @@
@override
void start(SendPort sendPort) {
- PluginIsolateChannel channel = PluginIsolateChannel(sendPort);
+ var channel = PluginIsolateChannel(sendPort);
plugin.start(channel);
}
}
diff --git a/pkg/analyzer_plugin/lib/src/protocol/protocol_internal.dart b/pkg/analyzer_plugin/lib/src/protocol/protocol_internal.dart
index 0d17248..a1d5445 100644
--- a/pkg/analyzer_plugin/lib/src/protocol/protocol_internal.dart
+++ b/pkg/analyzer_plugin/lib/src/protocol/protocol_internal.dart
@@ -20,8 +20,8 @@
/// Adds the given [sourceEdit] to the list in [sourceFileEdit].
void addEditForSource(SourceFileEdit sourceFileEdit, SourceEdit sourceEdit) {
- List<SourceEdit> edits = sourceFileEdit.edits;
- int index = 0;
+ var edits = sourceFileEdit.edits;
+ var index = 0;
while (index < edits.length && edits[index].offset > sourceEdit.offset) {
index++;
}
@@ -31,7 +31,7 @@
/// Adds [edit] to the [FileEdit] for the given [file].
void addEditToSourceChange(
SourceChange change, String file, int fileStamp, SourceEdit edit) {
- SourceFileEdit fileEdit = change.getFileEdit(file);
+ var fileEdit = change.getFileEdit(file);
if (fileEdit == null) {
fileEdit = SourceFileEdit(file, fileStamp);
change.addFileEdit(fileEdit);
@@ -60,7 +60,7 @@
/// Returns the [FileEdit] for the given [file], maybe `null`.
SourceFileEdit getChangeFileEdit(SourceChange change, String file) {
- for (SourceFileEdit fileEdit in change.edits) {
+ for (var fileEdit in change.edits) {
if (fileEdit.file == file) {
return fileEdit;
}
@@ -81,7 +81,7 @@
if (listA.length != listB.length) {
return false;
}
- for (int i = 0; i < listA.length; i++) {
+ for (var i = 0; i < listA.length; i++) {
if (!itemEqual(listA[i], listB[i])) {
return false;
}
@@ -161,7 +161,7 @@
/// Create a [RefactoringFeedback] corresponding the given [kind].
RefactoringFeedback refactoringFeedbackFromJson(
JsonDecoder jsonDecoder, String jsonPath, Object json, Map feedbackJson) {
- RefactoringKind kind = jsonDecoder.refactoringKind;
+ var kind = jsonDecoder.refactoringKind;
if (kind == RefactoringKind.EXTRACT_LOCAL_VARIABLE) {
return ExtractLocalVariableFeedback.fromJson(jsonDecoder, jsonPath, json);
}
@@ -242,7 +242,7 @@
} else if (json is int) {
return json.toDouble();
} else if (json is String) {
- double value = double.tryParse(json);
+ var value = double.tryParse(json);
if (value == null) {
throw mismatch(jsonPath, 'double', json);
}
@@ -257,7 +257,7 @@
if (json is int) {
return json;
} else if (json is String) {
- int value = int.tryParse(json);
+ var value = int.tryParse(json);
if (value == null) {
throw mismatch(jsonPath, 'int', json);
}
@@ -275,8 +275,8 @@
if (json == null) {
return <E>[];
} else if (json is List) {
- List<E> result = <E>[];
- for (int i = 0; i < json.length; i++) {
+ var result = <E>[];
+ for (var i = 0; i < json.length; i++) {
result.add(decoder('$jsonPath[$i]', json[i]));
}
return result;
@@ -293,7 +293,7 @@
if (jsonData == null) {
return {};
} else if (jsonData is Map) {
- Map<K, V> result = <K, V>{};
+ var result = <K, V>{};
jsonData.forEach((key, value) {
K decodedKey;
if (keyDecoder != null) {
@@ -332,7 +332,7 @@
throw missingKey(jsonPath, field);
}
var disambiguatorPath = '$jsonPath[${json.encode(field)}]';
- String disambiguator = decodeString(disambiguatorPath, jsonData[field]);
+ var disambiguator = decodeString(disambiguatorPath, jsonData[field]);
if (!decoders.containsKey(disambiguator)) {
throw mismatch(
disambiguatorPath, 'One of: ${decoders.keys.toList()}', jsonData);
@@ -368,7 +368,7 @@
@override
dynamic mismatch(String jsonPath, String expected, [Object actual]) {
- StringBuffer buffer = StringBuffer();
+ var buffer = StringBuffer();
buffer.write('Expected to be ');
buffer.write(expected);
if (actual != null) {
@@ -403,7 +403,7 @@
@override
dynamic mismatch(String jsonPath, String expected, [Object actual]) {
- StringBuffer buffer = StringBuffer();
+ var buffer = StringBuffer();
buffer.write('Expected ');
buffer.write(expected);
if (actual != null) {
diff --git a/pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_core.dart b/pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_core.dart
index d0d746b..eea528e 100644
--- a/pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_core.dart
+++ b/pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_core.dart
@@ -42,7 +42,7 @@
@override
SourceChange get sourceChange {
- final SourceChange change = SourceChange('');
+ var change = SourceChange('');
for (var builder in _fileEditBuilders.values) {
if (builder.hasEdits) {
change.addFileEdit(builder.fileEdit);
@@ -61,7 +61,7 @@
@override
Future<void> addFileEdit(
String path, void Function(FileEditBuilder builder) buildFileEdit) async {
- FileEditBuilderImpl builder = _fileEditBuilders[path];
+ var builder = _fileEditBuilders[path];
if (builder == null) {
builder = await createFileEditBuilder(path);
if (builder != null) {
@@ -84,7 +84,7 @@
/// Return the linked edit group with the given [groupName], creating it if it
/// did not already exist.
LinkedEditGroup getLinkedEditGroup(String groupName) {
- LinkedEditGroup group = _linkedEditGroups[groupName];
+ var group = _linkedEditGroups[groupName];
if (group == null) {
group = LinkedEditGroup.empty();
_linkedEditGroups[groupName] = group;
@@ -111,8 +111,8 @@
}
}
- for (LinkedEditGroup group in _linkedEditGroups.values) {
- for (Position position in group.positions) {
+ for (var group in _linkedEditGroups.values) {
+ for (var position in group.positions) {
_updatePosition(position);
}
}
@@ -157,20 +157,19 @@
@override
void addLinkedEdit(String groupName,
void Function(LinkedEditBuilder builder) buildLinkedEdit) {
- LinkedEditBuilderImpl builder = createLinkedEditBuilder();
- int start = offset + _buffer.length;
+ var builder = createLinkedEditBuilder();
+ var start = offset + _buffer.length;
try {
buildLinkedEdit(builder);
} finally {
- int end = offset + _buffer.length;
- int length = end - start;
+ var end = offset + _buffer.length;
+ var length = end - start;
if (length != 0) {
- Position position = Position(fileEditBuilder.fileEdit.file, start);
+ var position = Position(fileEditBuilder.fileEdit.file, start);
fileEditBuilder.changeBuilder._lockedPositions.add(position);
- LinkedEditGroup group =
- fileEditBuilder.changeBuilder.getLinkedEditGroup(groupName);
+ var group = fileEditBuilder.changeBuilder.getLinkedEditGroup(groupName);
group.addPosition(position, length);
- for (LinkedEditSuggestion suggestion in builder.suggestions) {
+ for (var suggestion in builder.suggestions) {
group.addSuggestion(suggestion);
}
}
@@ -183,7 +182,7 @@
addLinkedEdit(groupName, (LinkedEditBuilder builder) {
builder.write(text);
if (kind != null && suggestions != null) {
- for (String suggestion in suggestions) {
+ for (var suggestion in suggestions) {
builder.addSuggestion(kind, suggestion);
}
} else if (kind != null || suggestions != null) {
@@ -199,9 +198,9 @@
@override
void selectAll(void Function() writer) {
- int rangeOffset = _buffer.length;
+ var rangeOffset = _buffer.length;
writer();
- int rangeLength = _buffer.length - rangeOffset;
+ var rangeLength = _buffer.length - rangeOffset;
_selectionRange = SourceRange(offset + rangeOffset, rangeLength);
}
@@ -249,14 +248,14 @@
@override
void addDeletion(SourceRange range) {
if (range.length > 0) {
- EditBuilderImpl builder = createEditBuilder(range.offset, range.length);
+ var builder = createEditBuilder(range.offset, range.length);
_addEditBuilder(builder);
}
}
@override
void addInsertion(int offset, void Function(EditBuilder builder) buildEdit) {
- EditBuilderImpl builder = createEditBuilder(offset, 0);
+ var builder = createEditBuilder(offset, 0);
try {
buildEdit(builder);
} finally {
@@ -266,8 +265,8 @@
@override
void addLinkedPosition(SourceRange range, String groupName) {
- LinkedEditGroup group = changeBuilder.getLinkedEditGroup(groupName);
- Position position =
+ var group = changeBuilder.getLinkedEditGroup(groupName);
+ var position =
Position(fileEdit.file, range.offset + _deltaToOffset(range.offset));
group.addPosition(position, range.length);
}
@@ -275,7 +274,7 @@
@override
void addReplacement(
SourceRange range, void Function(EditBuilder builder) buildEdit) {
- EditBuilderImpl builder = createEditBuilder(range.offset, range.length);
+ var builder = createEditBuilder(range.offset, range.length);
try {
buildEdit(builder);
} finally {
@@ -285,7 +284,7 @@
@override
void addSimpleInsertion(int offset, String text) {
- EditBuilderImpl builder = createEditBuilder(offset, 0);
+ var builder = createEditBuilder(offset, 0);
try {
builder.write(text);
} finally {
@@ -295,7 +294,7 @@
@override
void addSimpleReplacement(SourceRange range, String text) {
- EditBuilderImpl builder = createEditBuilder(range.offset, range.length);
+ var builder = createEditBuilder(range.offset, range.length);
try {
builder.write(text);
} finally {
@@ -334,7 +333,7 @@
/// current file.
void _addEdit(SourceEdit edit) {
fileEdit.add(edit);
- int delta = _editDelta(edit);
+ var delta = _editDelta(edit);
changeBuilder._updatePositions(
edit.offset + math.max<int>(0, delta), delta);
changeBuilder._lockedPositions.clear();
@@ -343,17 +342,16 @@
/// Add the edit from the given [builder] to the edits associates with the
/// current file.
void _addEditBuilder(EditBuilderImpl builder) {
- SourceEdit edit = builder.sourceEdit;
+ var edit = builder.sourceEdit;
_addEdit(edit);
_captureSelection(builder, edit);
}
/// Capture the selection offset if one was set.
void _captureSelection(EditBuilderImpl builder, SourceEdit edit) {
- SourceRange range = builder._selectionRange;
+ var range = builder._selectionRange;
if (range != null) {
- Position position =
- Position(fileEdit.file, range.offset + _deltaToEdit(edit));
+ var position = Position(fileEdit.file, range.offset + _deltaToEdit(edit));
changeBuilder.setSelection(position);
changeBuilder._setSelectionRange(range);
}
@@ -365,8 +363,8 @@
/// edit before the applied edits will be at `offset + _deltaToOffset(offset)`
/// after the edits.
int _deltaToEdit(SourceEdit targetEdit) {
- int delta = 0;
- for (SourceEdit edit in fileEdit.edits) {
+ var delta = 0;
+ for (var edit in fileEdit.edits) {
if (edit.offset < targetEdit.offset) {
delta += _editDelta(edit);
}
@@ -380,8 +378,8 @@
/// applied edits will be at `offset + _deltaToOffset(offset)` after the
/// edits.
int _deltaToOffset(int offset) {
- int delta = 0;
- for (SourceEdit edit in fileEdit.edits) {
+ var delta = 0;
+ for (var edit in fileEdit.edits) {
if (edit.offset <= offset) {
delta += _editDelta(edit);
}
diff --git a/pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_dart.dart b/pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_dart.dart
index 6501af7..69beb48 100644
--- a/pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_dart.dart
+++ b/pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_dart.dart
@@ -44,7 +44,7 @@
String path, void Function(DartFileEditBuilder builder) buildFileEdit,
{ImportPrefixGenerator importPrefixGenerator}) {
return super.addFileEdit(path, (builder) {
- DartFileEditBuilderImpl dartBuilder = builder as DartFileEditBuilderImpl;
+ var dartBuilder = builder as DartFileEditBuilderImpl;
dartBuilder.importPrefixGenerator = importPrefixGenerator;
buildFileEdit(dartBuilder);
});
@@ -60,16 +60,15 @@
}
var session = workspace.getSession(path);
- ResolvedUnitResult result = await session.getResolvedUnit(path);
- ResultState state = result?.state ?? ResultState.INVALID_FILE_TYPE;
+ var result = await session.getResolvedUnit(path);
+ var state = result?.state ?? ResultState.INVALID_FILE_TYPE;
if (state == ResultState.INVALID_FILE_TYPE) {
throw AnalysisException('Cannot analyze "$path"');
}
- int timeStamp = state == ResultState.VALID ? 0 : -1;
+ var timeStamp = state == ResultState.VALID ? 0 : -1;
- CompilationUnitElement declaredUnit = result.unit.declaredElement;
- CompilationUnitElement libraryUnit =
- declaredUnit.library.definingCompilationUnit;
+ var declaredUnit = result.unit.declaredElement;
+ var libraryUnit = declaredUnit.library.definingCompilationUnit;
DartFileEditBuilderImpl libraryEditBuilder;
if (libraryUnit != declaredUnit) {
@@ -199,7 +198,7 @@
} else if (argumentList != null) {
writeParametersMatchingArguments(argumentList);
} else if (fieldNames != null) {
- for (int i = 0; i < fieldNames.length; i++) {
+ for (var i = 0; i < fieldNames.length; i++) {
if (i > 0) {
write(', ');
}
@@ -234,7 +233,7 @@
write(Keyword.STATIC.lexeme);
write(' ');
}
- bool typeRequired = true;
+ var typeRequired = true;
if (isConst) {
write(Keyword.CONST.lexeme);
write(' ');
@@ -341,7 +340,7 @@
String nameGroupName,
DartType type,
String typeGroupName}) {
- bool typeRequired = true;
+ var typeRequired = true;
if (isConst) {
write(Keyword.CONST.lexeme);
typeRequired = false;
@@ -410,15 +409,15 @@
}
}
- String prefix = getIndent(1);
- String prefix2 = getIndent(2);
- ElementKind elementKind = element.kind;
+ var prefix = getIndent(1);
+ var prefix2 = getIndent(2);
+ var elementKind = element.kind;
- bool isGetter = elementKind == ElementKind.GETTER;
- bool isSetter = elementKind == ElementKind.SETTER;
- bool isMethod = elementKind == ElementKind.METHOD;
- bool isOperator = isMethod && (element as MethodElement).isOperator;
- String memberName = element.displayName;
+ var isGetter = elementKind == ElementKind.GETTER;
+ var isSetter = elementKind == ElementKind.SETTER;
+ var isMethod = elementKind == ElementKind.METHOD;
+ var isOperator = isMethod && (element as MethodElement).isOperator;
+ var memberName = element.displayName;
// @override
writeln('@override');
@@ -430,8 +429,8 @@
}
// return type
- DartType returnType = element.returnType;
- bool typeWritten = writeType(returnType,
+ var returnType = element.returnType;
+ var typeWritten = writeType(returnType,
groupName: returnTypeGroupName, methodBeingCopied: element);
if (typeWritten) {
write(' ');
@@ -470,7 +469,7 @@
}
displayTextBuffer?.write(' => …');
} else {
- List<ParameterElement> parameters = element.parameters;
+ var parameters = element.parameters;
withCarbonCopyBuffer(() {
writeTypeParameters(element.type.typeFormals,
methodBeingCopied: element);
@@ -562,7 +561,7 @@
}
if (type != null) {
- bool hasType = writeType();
+ var hasType = writeType();
if (name.isNotEmpty) {
if (hasType) {
write(' ');
@@ -578,7 +577,7 @@
void writeParameterMatchingArgument(
Expression argument, int index, Set<String> usedNames) {
// append type name
- DartType type = argument.staticType;
+ var type = argument.staticType;
if (type == null || type.isBottom || type.isDartCoreNull) {
type = DynamicTypeImpl.instance;
}
@@ -589,9 +588,9 @@
if (argument is NamedExpression) {
write(argument.name.label.name);
} else {
- List<String> suggestions =
+ var suggestions =
_getParameterNameSuggestions(usedNames, type, argument, index);
- String favorite = suggestions[0];
+ var favorite = suggestions[0];
usedNames.add(favorite);
addSimpleLinkedEdit('PARAM$index', favorite,
kind: LinkedEditSuggestionKind.PARAMETER, suggestions: suggestions);
@@ -602,7 +601,7 @@
void writeParameters(Iterable<ParameterElement> parameters,
{ExecutableElement methodBeingCopied}) {
var parameterNames = <String>{};
- for (int i = 0; i < parameters.length; i++) {
+ for (var i = 0; i < parameters.length; i++) {
var name = parameters.elementAt(i).name;
if (name.isNotEmpty) {
parameterNames.add(name);
@@ -610,10 +609,10 @@
}
write('(');
- bool sawNamed = false;
- bool sawPositional = false;
- for (int i = 0; i < parameters.length; i++) {
- ParameterElement parameter = parameters.elementAt(i);
+ var sawNamed = false;
+ var sawPositional = false;
+ for (var i = 0; i < parameters.length; i++) {
+ var parameter = parameters.elementAt(i);
if (i > 0) {
write(', ');
}
@@ -641,7 +640,7 @@
type: parameter.type,
typeGroupName: 'TYPE$i');
// default value
- String defaultCode = parameter.defaultValueCode;
+ var defaultCode = parameter.defaultValueCode;
if (defaultCode != null) {
write(' = ');
write(defaultCode);
@@ -661,11 +660,11 @@
void writeParametersMatchingArguments(ArgumentList argumentList) {
// TODO(brianwilkerson) Handle the case when there are required parameters
// after named parameters.
- Set<String> usedNames = <String>{};
+ var usedNames = <String>{};
List<Expression> arguments = argumentList.arguments;
- bool hasNamedParameters = false;
- for (int i = 0; i < arguments.length; i++) {
- Expression argument = arguments[i];
+ var hasNamedParameters = false;
+ for (var i = 0; i < arguments.length; i++) {
+ var argument = arguments[i];
if (i > 0) {
write(', ');
}
@@ -729,7 +728,7 @@
String groupName,
ExecutableElement methodBeingCopied,
bool required = false}) {
- bool wroteType = false;
+ var wroteType = false;
if (type != null && !type.isDynamic) {
if (groupName != null) {
addLinkedEdit(groupName, (LinkedEditBuilder builder) {
@@ -764,8 +763,8 @@
{ExecutableElement methodBeingCopied}) {
if (typeParameters.isNotEmpty) {
write('<');
- bool isFirst = true;
- for (TypeParameterElement typeParameter in typeParameters) {
+ var isFirst = true;
+ for (var typeParameter in typeParameters) {
if (!isFirst) {
write(', ');
}
@@ -781,8 +780,8 @@
if (types == null || types.isEmpty) {
return;
}
- bool first = true;
- for (DartType type in types) {
+ var first = true;
+ for (var type in types) {
if (first) {
if (prefix != null) {
write(prefix);
@@ -798,11 +797,11 @@
/// Adds [toAdd] items which are not excluded.
void _addAll(
Set<String> excluded, Set<String> result, Iterable<String> toAdd) {
- for (String item in toAdd) {
+ for (var item in toAdd) {
// add name based on "item", but not "excluded"
- for (int suffix = 1;; suffix++) {
+ for (var suffix = 1;; suffix++) {
// prepare name, just "item" or "item2", "item3", etc
- String name = item;
+ var name = item;
if (suffix > 1) {
name += suffix.toString();
}
@@ -819,7 +818,7 @@
void _addSingleCharacterName(
Set<String> excluded, Set<String> result, int c) {
while (c < $z) {
- String name = String.fromCharCode(c);
+ var name = String.fromCharCode(c);
// may be done
if (!excluded.contains(name)) {
result.add(name);
@@ -838,7 +837,7 @@
type.getDisplayString(withNullability: false),
);
_addSuperTypeProposals(builder, type.superclass, alreadyAdded);
- for (InterfaceType interfaceType in type.interfaces) {
+ for (var interfaceType in type.interfaces) {
_addSuperTypeProposals(builder, interfaceType, alreadyAdded);
}
}
@@ -868,13 +867,13 @@
String _getBaseNameFromLocationInParent(Expression expression) {
// value in named expression
if (expression.parent is NamedExpression) {
- NamedExpression namedExpression = expression.parent as NamedExpression;
+ var namedExpression = expression.parent as NamedExpression;
if (namedExpression.expression == expression) {
return namedExpression.name.label.name;
}
}
// positional argument
- ParameterElement parameter = expression.staticParameterElement;
+ var parameter = expression.staticParameterElement;
if (parameter != null) {
return parameter.displayName;
}
@@ -895,17 +894,17 @@
} else if (expression is MethodInvocation) {
name = expression.methodName.name;
} else if (expression is InstanceCreationExpression) {
- ConstructorName constructorName = expression.constructorName;
- TypeName typeName = constructorName.type;
+ var constructorName = expression.constructorName;
+ var typeName = constructorName.type;
if (typeName != null) {
- Identifier typeNameIdentifier = typeName.name;
+ var typeNameIdentifier = typeName.name;
// new ClassName()
if (typeNameIdentifier is SimpleIdentifier) {
return typeNameIdentifier.name;
}
// new prefix.name();
if (typeNameIdentifier is PrefixedIdentifier) {
- PrefixedIdentifier prefixed = typeNameIdentifier;
+ var prefixed = typeNameIdentifier;
// new prefix.ClassName()
if (prefixed.prefix.staticElement is PrefixElement) {
return prefixed.identifier.name;
@@ -924,8 +923,8 @@
}
// strip known prefixes
if (name != null) {
- for (int i = 0; i < _KNOWN_METHOD_NAME_PREFIXES.length; i++) {
- String prefix = _KNOWN_METHOD_NAME_PREFIXES[i];
+ for (var i = 0; i < _KNOWN_METHOD_NAME_PREFIXES.length; i++) {
+ var prefix = _KNOWN_METHOD_NAME_PREFIXES[i];
if (name.startsWith(prefix)) {
if (name == prefix) {
return null;
@@ -941,12 +940,12 @@
/// Returns all variants of names by removing leading words one by one.
List<String> _getCamelWordCombinations(String name) {
- List<String> result = [];
- List<String> parts = getCamelWords(name);
- for (int i = 0; i < parts.length; i++) {
- String s1 = parts[i].toLowerCase();
- String s2 = parts.skip(i + 1).join();
- String suggestion = '$s1$s2';
+ var result = <String>[];
+ var parts = getCamelWords(name);
+ for (var i = 0; i < parts.length; i++) {
+ var s1 = parts[i].toLowerCase();
+ var s2 = parts.skip(i + 1).join();
+ var suggestion = '$s1$s2';
result.add(suggestion);
}
return result;
@@ -960,7 +959,7 @@
/// best name.
List<String> _getParameterNameSuggestions(
Set<String> usedNames, DartType type, Expression expression, int index) {
- List<String> suggestions =
+ var suggestions =
_getVariableNameSuggestionsForExpression(type, expression, usedNames);
if (suggestions.isNotEmpty) {
return suggestions;
@@ -973,17 +972,15 @@
/// expression assigned.
List<String> _getVariableNameSuggestionsForExpression(DartType expectedType,
Expression assignedExpression, Set<String> excluded) {
- Set<String> res = {};
+ var res = <String>{};
// use expression
if (assignedExpression != null) {
- String nameFromExpression =
- _getBaseNameFromExpression(assignedExpression);
+ var nameFromExpression = _getBaseNameFromExpression(assignedExpression);
if (nameFromExpression != null) {
nameFromExpression = removeStart(nameFromExpression, '_');
_addAll(excluded, res, _getCamelWordCombinations(nameFromExpression));
}
- String nameFromParent =
- _getBaseNameFromLocationInParent(assignedExpression);
+ var nameFromParent = _getBaseNameFromLocationInParent(assignedExpression);
if (nameFromParent != null) {
_addAll(excluded, res, _getCamelWordCombinations(nameFromParent));
}
@@ -1011,10 +1008,10 @@
/// that is locally visible. Otherwise, return `null`.
DartType _getVisibleType(DartType type,
{ExecutableElement methodBeingCopied}) {
- Element element = type.element;
+ var element = type.element;
if (type is TypeParameterType) {
_initializeEnclosingElements();
- Element enclosing = element.enclosingElement;
+ var enclosing = element.enclosingElement;
while (enclosing is GenericFunctionTypeElement ||
enclosing is ParameterElement) {
enclosing = enclosing.enclosingElement;
@@ -1038,7 +1035,7 @@
/// Initialize the [_enclosingClass] and [_enclosingExecutable].
void _initializeEnclosingElements() {
if (!_hasEnclosingElementsInitialized) {
- _EnclosingElementFinder finder = _EnclosingElementFinder();
+ var finder = _EnclosingElementFinder();
finder.find(dartFileEditBuilder.resolvedUnit.unit, offset);
_enclosingClass = finder.enclosingClass;
_enclosingExecutable = finder.enclosingExecutable;
@@ -1065,15 +1062,15 @@
return;
}
- ImportElement import = dartFileEditBuilder._getImportElement(element);
+ var import = dartFileEditBuilder._getImportElement(element);
if (import != null) {
if (import.prefix != null) {
write(import.prefix.displayName);
write('.');
}
} else {
- Uri library = element.library.source.uri;
- _LibraryToImport import = dartFileEditBuilder._importLibrary(library);
+ var library = element.library.source.uri;
+ var import = dartFileEditBuilder._importLibrary(library);
if (import.prefix != null) {
write(import.prefix);
write('.');
@@ -1087,7 +1084,7 @@
write(isOperator ? ' ' : '.');
write(memberName);
write(isOperator ? ' ' : '(');
- for (int i = 0; i < parameters.length; i++) {
+ for (var i = 0; i < parameters.length; i++) {
if (i > 0) {
write(', ');
}
@@ -1111,7 +1108,7 @@
return false;
}
- Element element = type.element;
+ var element = type.element;
// The type `void` does not have an element.
if (type is VoidType) {
@@ -1142,7 +1139,7 @@
_writeLibraryReference(element);
// Write the simple name.
- String name = element.displayName;
+ var name = element.displayName;
write(name);
if (type.nullabilitySuffix == NullabilitySuffix.question) {
write('?');
@@ -1150,11 +1147,11 @@
// Write type arguments.
if (type is ParameterizedType) {
- List<DartType> arguments = type.typeArguments;
+ var arguments = type.typeArguments;
// Check if has arguments.
- bool hasArguments = false;
- bool allArgumentsVisible = true;
- for (DartType argument in arguments) {
+ var hasArguments = false;
+ var allArgumentsVisible = true;
+ for (var argument in arguments) {
hasArguments = hasArguments || !argument.isDynamic;
allArgumentsVisible = allArgumentsVisible &&
_getVisibleType(argument, methodBeingCopied: methodBeingCopied) !=
@@ -1163,8 +1160,8 @@
// Write type arguments only if they are useful.
if (hasArguments && allArgumentsVisible) {
write('<');
- for (int i = 0; i < arguments.length; i++) {
- DartType argument = arguments[i];
+ for (var i = 0; i < arguments.length; i++) {
+ var argument = arguments[i];
if (i != 0) {
write(', ');
}
@@ -1325,7 +1322,7 @@
//
// Check whether the type needs to be replaced.
//
- DartType type = typeAnnotation?.type;
+ var type = typeAnnotation?.type;
if (type == null || type.isDynamic || type.isDartAsyncFuture) {
return;
}
@@ -1342,9 +1339,9 @@
void _addLibraryImports(Iterable<_LibraryToImport> imports) {
// Prepare information about existing imports.
LibraryDirective libraryDirective;
- List<ImportDirective> importDirectives = <ImportDirective>[];
+ var importDirectives = <ImportDirective>[];
PartDirective partDirective;
- for (Directive directive in resolvedUnit.unit.directives) {
+ for (var directive in resolvedUnit.unit.directives) {
if (directive is LibraryDirective) {
libraryDirective = directive;
} else if (directive is ImportDirective) {
@@ -1355,7 +1352,7 @@
}
// Sort imports by URIs.
- List<_LibraryToImport> importList = imports.toList();
+ var importList = imports.toList();
importList.sort((a, b) => a.uriText.compareTo(b.uriText));
void writeImport(EditBuilder builder, _LibraryToImport import) {
@@ -1372,18 +1369,18 @@
// Insert imports: between existing imports.
if (importDirectives.isNotEmpty) {
for (var import in importList) {
- bool isDart = import.uriText.startsWith('dart:');
- bool isPackage = import.uriText.startsWith('package:');
- bool inserted = false;
+ var isDart = import.uriText.startsWith('dart:');
+ var isPackage = import.uriText.startsWith('package:');
+ var inserted = false;
void insert(
{ImportDirective prev,
ImportDirective next,
bool trailingNewLine = false}) {
- LineInfo lineInfo = resolvedUnit.lineInfo;
+ var lineInfo = resolvedUnit.lineInfo;
if (prev != null) {
- int offset = prev.end;
- int line = lineInfo.getLocation(offset).lineNumber;
+ var offset = prev.end;
+ var line = lineInfo.getLocation(offset).lineNumber;
Token comment = prev.endToken.next.precedingComments;
while (comment != null) {
if (lineInfo.getLocation(comment.offset).lineNumber == line) {
@@ -1396,7 +1393,7 @@
writeImport(builder, import);
});
} else {
- int offset = next.offset;
+ var offset = next.offset;
addInsertion(offset, (EditBuilder builder) {
writeImport(builder, import);
builder.writeln();
@@ -1411,16 +1408,16 @@
ImportDirective lastExisting;
ImportDirective lastExistingDart;
ImportDirective lastExistingPackage;
- bool isLastExistingDart = false;
- bool isLastExistingPackage = false;
- for (ImportDirective existingImport in importDirectives) {
- String existingUri = existingImport.uriContent;
+ var isLastExistingDart = false;
+ var isLastExistingPackage = false;
+ for (var existingImport in importDirectives) {
+ var existingUri = existingImport.uriContent;
- bool isExistingDart = existingUri.startsWith('dart:');
- bool isExistingPackage = existingUri.startsWith('package:');
- bool isExistingRelative = !existingUri.contains(':');
+ var isExistingDart = existingUri.startsWith('dart:');
+ var isExistingPackage = existingUri.startsWith('package:');
+ var isExistingRelative = !existingUri.contains(':');
- bool isNewBeforeExisting = import.uriText.compareTo(existingUri) < 0;
+ var isNewBeforeExisting = import.uriText.compareTo(existingUri) < 0;
if (isDart) {
if (!isExistingDart || isNewBeforeExisting) {
@@ -1478,7 +1475,7 @@
addInsertion(libraryDirective.end, (EditBuilder builder) {
builder.writeln();
builder.writeln();
- for (int i = 0; i < importList.length; i++) {
+ for (var i = 0; i < importList.length; i++) {
var import = importList[i];
writeImport(builder, import);
if (i != importList.length - 1) {
@@ -1492,7 +1489,7 @@
// Insert imports: before a part directive.
if (partDirective != null) {
addInsertion(partDirective.offset, (EditBuilder builder) {
- for (int i = 0; i < importList.length; i++) {
+ for (var i = 0; i < importList.length; i++) {
var import = importList[i];
writeImport(builder, import);
builder.writeln();
@@ -1504,7 +1501,7 @@
// If still at the beginning of the file, add before the first declaration.
int offset;
- bool insertEmptyLineAfter = false;
+ var insertEmptyLineAfter = false;
if (resolvedUnit.unit.declarations.isNotEmpty) {
offset = resolvedUnit.unit.declarations.first.offset;
insertEmptyLineAfter = true;
@@ -1512,7 +1509,7 @@
offset = resolvedUnit.unit.end;
}
addInsertion(offset, (EditBuilder builder) {
- for (int i = 0; i < importList.length; i++) {
+ for (var i = 0; i < importList.length; i++) {
var import = importList[i];
writeImport(builder, import);
builder.writeln();
@@ -1527,8 +1524,8 @@
/// target library, or `null` if the element was not imported, such as when
/// the element is declared in the same library.
ImportElement _getImportElement(Element element) {
- for (ImportElement import in resolvedUnit.libraryElement.imports) {
- Map<String, Element> definedNames = import.namespace.definedNames;
+ for (var import in resolvedUnit.libraryElement.imports) {
+ var definedNames = import.namespace.definedNames;
if (definedNames.containsValue(element)) {
return import;
}
@@ -1540,10 +1537,10 @@
String _getLibraryUriText(Uri uri) {
if (uri.scheme == 'file') {
var pathContext = resolvedUnit.session.resourceProvider.pathContext;
- String whatPath = pathContext.fromUri(uri);
- String libraryPath = resolvedUnit.libraryElement.source.fullName;
- String libraryFolder = pathContext.dirname(libraryPath);
- String relativeFile = pathContext.relative(whatPath, from: libraryFolder);
+ var whatPath = pathContext.fromUri(uri);
+ var libraryPath = resolvedUnit.libraryElement.source.fullName;
+ var libraryFolder = pathContext.dirname(libraryPath);
+ var relativeFile = pathContext.relative(whatPath, from: libraryFolder);
return pathContext.split(relativeFile).join('/');
}
return uri.toString();
@@ -1553,8 +1550,8 @@
_LibraryToImport _importLibrary(Uri uri) {
var import = (libraryChangeBuilder ?? this).librariesToImport[uri];
if (import == null) {
- String uriText = _getLibraryUriText(uri);
- String prefix =
+ var uriText = _getLibraryUriText(uri);
+ var prefix =
importPrefixGenerator != null ? importPrefixGenerator(uri) : null;
import = _LibraryToImport(uriText, prefix);
(libraryChangeBuilder ?? this).librariesToImport[uri] = import;
@@ -1627,7 +1624,7 @@
type.getDisplayString(withNullability: false),
);
_addSuperTypesAsSuggestions(type.superclass, alreadyAdded);
- for (InterfaceType interfaceType in type.interfaces) {
+ for (var interfaceType in type.interfaces) {
_addSuperTypesAsSuggestions(interfaceType, alreadyAdded);
}
}
@@ -1649,7 +1646,7 @@
_EnclosingElementFinder();
void find(AstNode target, int offset) {
- AstNode node = NodeLocator2(offset).searchWithin(target);
+ var node = NodeLocator2(offset).searchWithin(target);
while (node != null) {
if (node is ClassDeclaration) {
enclosingClass = node.declaredElement;
diff --git a/pkg/analyzer_plugin/lib/src/utilities/completion/completion_target.dart b/pkg/analyzer_plugin/lib/src/utilities/completion/completion_target.dart
index 47f36cd..4e80d11 100644
--- a/pkg/analyzer_plugin/lib/src/utilities/completion/completion_target.dart
+++ b/pkg/analyzer_plugin/lib/src/utilities/completion/completion_target.dart
@@ -139,14 +139,14 @@
// step in the process we know exactly which child node we need to proceed
// to.
entryPoint ??= compilationUnit;
- AstNode containingNode = entryPoint;
+ var containingNode = entryPoint;
outerLoop:
while (true) {
if (containingNode is Comment) {
// Comments are handled specially: we descend into any CommentReference
// child node that contains the cursor offset.
- Comment comment = containingNode as Comment;
- for (CommentReference commentReference in comment.references) {
+ var comment = containingNode as Comment;
+ for (var commentReference in comment.references) {
if (commentReference.offset <= offset &&
offset <= commentReference.end) {
containingNode = commentReference;
@@ -158,7 +158,7 @@
if (entity is Token) {
if (_isCandidateToken(containingNode, entity, offset)) {
// Try to replace with a comment token.
- Token commentToken = _getContainingCommentToken(entity, offset);
+ var commentToken = _getContainingCommentToken(entity, offset);
if (commentToken != null) {
return CompletionTarget._(
compilationUnit, offset, containingNode, commentToken, true);
@@ -182,13 +182,13 @@
// If the node is a candidate target, then we are done.
if (_isCandidateNode(entity, offset)) {
// Check to see if the offset is in a preceding comment
- Token commentToken =
+ var commentToken =
_getContainingCommentToken(entity.beginToken, offset);
if (commentToken != null) {
// If the preceding comment is dartdoc token, then update
// the containing node to be the dartdoc comment.
// Otherwise completion is not required.
- Comment docComment =
+ var docComment =
_getContainingDocComment(containingNode, commentToken);
if (docComment != null) {
return CompletionTarget._(
@@ -272,7 +272,7 @@
/// For example, `..d^` and `..^d` are considered a cascade
/// from a completion standpoint, but `.^.d` is not.
bool get isCascade {
- AstNode node = containingNode;
+ var node = containingNode;
if (node is PropertyAccess) {
return node.isCascaded && offset > node.operator.offset + 1;
}
@@ -302,7 +302,7 @@
bool isKeywordOrIdentifier(Token token) =>
token.type.isKeyword || token.type == TokenType.IDENTIFIER;
- Token token = droppedToken ??
+ var token = droppedToken ??
(entity is AstNode ? (entity as AstNode).beginToken : entity as Token);
if (token != null && requestOffset < token.offset) {
token = containingNode.findPrevious(token);
@@ -321,14 +321,13 @@
}
}
if (token is StringToken) {
- SimpleStringLiteral uri =
- astFactory.simpleStringLiteral(token, token.lexeme);
- Keyword keyword = containingNode.findPrevious(token)?.keyword;
+ var uri = astFactory.simpleStringLiteral(token, token.lexeme);
+ var keyword = containingNode.findPrevious(token)?.keyword;
if (keyword == Keyword.IMPORT ||
keyword == Keyword.EXPORT ||
keyword == Keyword.PART) {
- int start = uri.contentsOffset;
- int end = uri.contentsEnd;
+ var start = uri.contentsOffset;
+ var end = uri.contentsEnd;
if (start <= requestOffset && requestOffset <= end) {
// Replacement range for import URI
return SourceRange(start, end - start);
@@ -343,7 +342,7 @@
bool isDoubleOrIntLiteral() {
var entity = this.entity;
if (entity is Token) {
- TokenType previousTokenType = containingNode.findPrevious(entity)?.type;
+ var previousTokenType = containingNode.findPrevious(entity)?.type;
return previousTokenType == TokenType.DOUBLE ||
previousTokenType == TokenType.INT;
}
@@ -389,8 +388,8 @@
argList = argList.parent;
}
if (argList is ArgumentList) {
- NodeList<Expression> args = argList.arguments;
- for (int index = 0; index < args.length; ++index) {
+ var args = argList.arguments;
+ for (var index = 0; index < args.length; ++index) {
if (entity == args[index]) {
return index;
}
@@ -400,7 +399,7 @@
}
if (entity == argList.rightParenthesis) {
// Parser ignores trailing commas
- Token previous = containingNode.findPrevious(argList.rightParenthesis);
+ var previous = containingNode.findPrevious(argList.rightParenthesis);
if (previous?.lexeme == ',') {
return args.length;
}
@@ -483,7 +482,7 @@
/// Determine if the given token is part of the given node's dart doc.
static Comment _getContainingDocComment(AstNode node, Token token) {
if (node is AnnotatedNode) {
- Comment docComment = node.documentationComment;
+ var docComment = node.documentationComment;
if (docComment != null && docComment.tokens.contains(token)) {
return docComment;
}
@@ -520,7 +519,7 @@
static bool _isCandidateNode(AstNode node, int offset) {
// If the node's first token is a keyword or identifier, then the node is a
// candidate entity if its first token is.
- Token beginToken = node.beginToken;
+ var beginToken = node.beginToken;
if (beginToken.type.isKeyword || beginToken.type == TokenType.IDENTIFIER) {
return _isCandidateToken(node, beginToken, offset);
}
@@ -553,7 +552,7 @@
}
// If the current token is synthetic, then check the previous token
// because it may have been dropped from the parse tree
- Token previous = node.findPrevious(token);
+ var previous = node.findPrevious(token);
if (previous == null) {
// support dangling expression completion, where previous may be null.
return false;
diff --git a/pkg/analyzer_plugin/lib/src/utilities/completion/element_suggestion_builder.dart b/pkg/analyzer_plugin/lib/src/utilities/completion/element_suggestion_builder.dart
index 0623323..298c5b5 100644
--- a/pkg/analyzer_plugin/lib/src/utilities/completion/element_suggestion_builder.dart
+++ b/pkg/analyzer_plugin/lib/src/utilities/completion/element_suggestion_builder.dart
@@ -40,7 +40,7 @@
return;
}
}
- String completion = element.displayName;
+ var completion = element.displayName;
if (prefix != null && prefix.isNotEmpty) {
if (completion == null || completion.isEmpty) {
completion = prefix;
@@ -51,8 +51,8 @@
if (completion == null || completion.isEmpty) {
return;
}
- SuggestionBuilderImpl builder = SuggestionBuilderImpl(resourceProvider);
- CompletionSuggestion suggestion = builder.forElement(element,
+ var builder = SuggestionBuilderImpl(resourceProvider);
+ var suggestion = builder.forElement(element,
completion: completion, kind: kind, relevance: relevance);
if (suggestion != null) {
if (element.isSynthetic && element is PropertyAccessorElement) {
@@ -65,16 +65,14 @@
cacheKey = cacheKey.substring(0, cacheKey.length - 1);
}
if (cacheKey != null) {
- CompletionSuggestion existingSuggestion = _syntheticMap[cacheKey];
+ var existingSuggestion = _syntheticMap[cacheKey];
// Pair getter/setter by updating the existing suggestion
if (existingSuggestion != null) {
- CompletionSuggestion getter =
- element.isGetter ? suggestion : existingSuggestion;
- protocol.ElementKind elemKind =
- element.enclosingElement is ClassElement
- ? protocol.ElementKind.FIELD
- : protocol.ElementKind.TOP_LEVEL_VARIABLE;
+ var getter = element.isGetter ? suggestion : existingSuggestion;
+ var elemKind = element.enclosingElement is ClassElement
+ ? protocol.ElementKind.FIELD
+ : protocol.ElementKind.TOP_LEVEL_VARIABLE;
existingSuggestion.element = protocol.Element(
elemKind,
existingSuggestion.element.name,
diff --git a/pkg/analyzer_plugin/lib/src/utilities/completion/optype.dart b/pkg/analyzer_plugin/lib/src/utilities/completion/optype.dart
index 61368d5..4ce976b 100644
--- a/pkg/analyzer_plugin/lib/src/utilities/completion/optype.dart
+++ b/pkg/analyzer_plugin/lib/src/utilities/completion/optype.dart
@@ -87,7 +87,7 @@
/// Determine the suggestions that should be made based upon the given
/// [CompletionTarget] and [offset].
factory OpType.forCompletion(CompletionTarget target, int offset) {
- OpType optype = OpType._();
+ var optype = OpType._();
// Don't suggest anything right after double or integer literals.
if (target.isDoubleOrIntLiteral()) {
@@ -116,7 +116,7 @@
// If a value should be suggested, suggest also constructors.
if (optype.includeReturnValueSuggestions) {
// Careful: in angular plugin, `target.unit` may be null!
- CompilationUnitElement unitElement = target.unit?.declaredElement;
+ var unitElement = target.unit?.declaredElement;
if (unitElement != null) {
optype.includeConstructorSuggestions = true;
}
@@ -148,8 +148,8 @@
/// Try to determine the required context type, and configure filters.
void _computeRequiredTypeAndFilters(CompletionTarget target) {
- Object entity = target.entity;
- AstNode node = target.containingNode;
+ var entity = target.entity;
+ var node = target.containingNode;
if (node is InstanceCreationExpression &&
node.keyword != null &&
@@ -169,7 +169,7 @@
} else if (node is NamedExpression && node.expression == entity) {
_requiredType = node.staticParameterElement?.type;
} else if (node is SwitchCase && node.expression == entity) {
- AstNode parent = node.parent;
+ var parent = node.parent;
if (parent is SwitchStatement) {
_requiredType = parent.expression?.staticType;
}
@@ -215,7 +215,7 @@
return node.statements.isNotEmpty ? node.statements.last : null;
}
if (entity is Statement) {
- int index = node.statements.indexOf(entity);
+ var index = node.statements.indexOf(entity);
if (index > 0) {
return node.statements[index - 1];
}
@@ -252,11 +252,11 @@
@override
void visitArgumentList(ArgumentList node) {
- AstNode parent = node.parent;
+ var parent = node.parent;
List<ParameterElement> parameters;
if (parent is InstanceCreationExpression) {
Element constructor;
- SimpleIdentifier name = parent.constructorName?.name;
+ var name = parent.constructorName?.name;
if (name != null) {
constructor = name.staticElement;
} else {
@@ -272,7 +272,7 @@
optype.includeNamedArgumentSuggestions = true;
}
} else if (parent is InvocationExpression) {
- Expression function = parent.function;
+ var function = parent.function;
if (function is SimpleIdentifier) {
var elem = function.staticElement;
if (elem is FunctionTypedElement) {
@@ -291,7 +291,7 @@
index = 0;
} else if (entity == node.rightParenthesis) {
// Parser ignores trailing commas
- Token previous = node.findPrevious(node.rightParenthesis);
+ var previous = node.findPrevious(node.rightParenthesis);
if (previous?.lexeme == ',') {
index = node.arguments.length;
} else {
@@ -301,7 +301,7 @@
index = node.arguments.indexOf(entity as Expression);
}
if (0 <= index && index < parameters.length) {
- ParameterElement param = parameters[index];
+ var param = parameters[index];
if (param?.isNamed == true) {
optype.includeNamedArgumentSuggestions = true;
return;
@@ -317,7 +317,7 @@
if (identical(entity, node.type)) {
optype.includeTypeNameSuggestions = true;
optype.typeNameSuggestionsFilter = (DartType dartType, int relevance) {
- DartType staticType = node.expression.staticType;
+ var staticType = node.expression.staticType;
if (staticType != null &&
(staticType.isDynamic ||
(optype._isSubtypeOf(dartType, staticType) &&
@@ -372,7 +372,7 @@
@override
void visitBlock(Block node) {
- Statement prevStmt = OpType.getPreviousStatement(node, entity);
+ var prevStmt = OpType.getPreviousStatement(node, entity);
if (prevStmt is TryStatement) {
if (prevStmt.catchClauses.isEmpty && prevStmt.finallyBlock == null) {
return;
@@ -451,9 +451,9 @@
// some PrefixedIdentifier nodes are transformed into
// ConstructorName nodes during the resolution process.
if (identical(entity, node.name)) {
- TypeName type = node.type;
+ var type = node.type;
if (type != null) {
- Identifier prefix = type.name;
+ var prefix = type.name;
if (prefix != null) {
optype.includeConstructorSuggestions = true;
optype.isPrefixed = true;
@@ -513,7 +513,7 @@
// Given f[], the parser drops the [] from the expression statement
// but the [] token is the CompletionTarget entity
if (entity is Token) {
- Token token = entity as Token;
+ var token = entity as Token;
if (token.lexeme == '[]' && offset == token.offset + 1) {
optype.includeReturnValueSuggestions = true;
optype.includeTypeNameSuggestions = true;
@@ -600,9 +600,9 @@
void visitFormalParameterList(FormalParameterList node) {
dynamic entity = this.entity;
if (entity is Token) {
- Token previous = node.findPrevious(entity);
+ var previous = node.findPrevious(entity);
if (previous != null) {
- TokenType type = previous.type;
+ var type = previous.type;
if (type == TokenType.OPEN_PAREN || type == TokenType.COMMA) {
optype.includeTypeNameSuggestions = true;
}
@@ -755,7 +755,7 @@
if (identical(entity, node.type)) {
optype.includeTypeNameSuggestions = true;
optype.typeNameSuggestionsFilter = (DartType dartType, int relevance) {
- DartType staticType = node.expression.staticType;
+ var staticType = node.expression.staticType;
if (staticType != null &&
(staticType.isDynamic ||
(optype._isSubtypeOf(dartType, staticType) &&
@@ -786,7 +786,7 @@
@override
void visitMethodInvocation(MethodInvocation node) {
- bool isThis = node.target is ThisExpression;
+ var isThis = node.target is ThisExpression;
if (identical(entity, node.operator) && offset > node.operator.offset) {
// The cursor is between the two dots of a ".." token, so we need to
// generate the completions we would generate after a "." token.
@@ -822,12 +822,12 @@
optype.includeTypeNameSuggestions = true;
// Check for named parameters in constructor calls.
- AstNode grandparent = node.parent.parent;
+ var grandparent = node.parent.parent;
if (grandparent is ConstructorReferenceNode) {
- ConstructorElement element = grandparent.staticElement;
+ var element = grandparent.staticElement;
if (element != null) {
- List<ParameterElement> parameters = element.parameters;
- ParameterElement parameterElement = parameters.firstWhere((e) {
+ var parameters = element.parameters;
+ var parameterElement = parameters.firstWhere((e) {
if (e is DefaultFieldFormalParameterElementImpl) {
return e.field?.name == node.name.label?.name;
}
@@ -915,7 +915,7 @@
// then don't suggest anything
return;
}
- bool isThis = node.target is ThisExpression;
+ var isThis = node.target is ThisExpression;
if (identical(entity, node.operator) && offset > node.operator.offset) {
// The cursor is between the two dots of a ".." token, so we need to
// generate the completions we would generate after a "." token.
@@ -973,10 +973,26 @@
}
// If "(Type name^)", then include parameter names.
- if (type != null && name.offset <= offset && offset <= name.end) {
+ if (type != null &&
+ name != null &&
+ name.offset <= offset &&
+ offset <= name.end) {
optype.includeVarNameSuggestions = true;
return;
}
+
+ if (_isParameterOfGenericFunctionType(node) && type != null) {
+ // If "Function(^ Type)", then include types.
+ if (offset < type.offset) {
+ optype.includeTypeNameSuggestions = true;
+ return;
+ }
+ // If "Function(Type ^)", then include parameter names.
+ if (name == null && type.end < offset) {
+ optype.includeVarNameSuggestions = true;
+ return;
+ }
+ }
}
@override
@@ -1026,7 +1042,7 @@
}
}
if (entity is SwitchMember && entity != node.members.first) {
- SwitchMember member = entity as SwitchMember;
+ var member = entity as SwitchMember;
if (offset <= member.offset) {
optype.includeReturnValueSuggestions = true;
optype.includeTypeNameSuggestions = true;
@@ -1044,7 +1060,7 @@
@override
void visitTopLevelVariableDeclaration(TopLevelVariableDeclaration node) {
if (entity is Token) {
- Token token = entity as Token;
+ var token = entity as Token;
if (token.isSynthetic || token.lexeme == ';') {
optype.includeVarNameSuggestions = true;
}
@@ -1053,8 +1069,8 @@
@override
void visitTypeArgumentList(TypeArgumentList node) {
- NodeList<TypeAnnotation> arguments = node.arguments;
- for (TypeAnnotation type in arguments) {
+ var arguments = node.arguments;
+ for (var type in arguments) {
if (identical(entity, type)) {
optype.includeTypeNameSuggestions = true;
break;
@@ -1128,9 +1144,9 @@
}
bool _isEntityPrevTokenSynthetic() {
- Object entity = this.entity;
+ var entity = this.entity;
if (entity is AstNode) {
- Token previous = entity.findPrevious(entity.beginToken);
+ var previous = entity.findPrevious(entity.beginToken);
if (previous?.isSynthetic ?? false) {
return true;
}
@@ -1149,4 +1165,13 @@
}
return null;
}
+
+ static bool _isParameterOfGenericFunctionType(FormalParameter node) {
+ var parameterList = node.parent;
+ if (parameterList is DefaultFormalParameter) {
+ parameterList = parameterList.parent;
+ }
+ return parameterList is FormalParameterList &&
+ parameterList.parent is GenericFunctionType;
+ }
}
diff --git a/pkg/analyzer_plugin/lib/src/utilities/completion/suggestion_builder.dart b/pkg/analyzer_plugin/lib/src/utilities/completion/suggestion_builder.dart
index 27a22ee..71b5b58 100644
--- a/pkg/analyzer_plugin/lib/src/utilities/completion/suggestion_builder.dart
+++ b/pkg/analyzer_plugin/lib/src/utilities/completion/suggestion_builder.dart
@@ -3,7 +3,6 @@
// BSD-style license that can be found in the LICENSE file.
import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/dart/element/type.dart';
import 'package:analyzer/file_system/file_system.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart'
hide Element, ElementKind;
@@ -31,30 +30,30 @@
Iterable<ParameterElement> requiredParams,
Iterable<ParameterElement> namedParams) {
// Copied from analysis_server/lib/src/services/completion/dart/suggestion_builder.dart
- StringBuffer buffer = StringBuffer();
- List<int> ranges = <int>[];
+ var buffer = StringBuffer();
+ var ranges = <int>[];
int offset;
- for (ParameterElement param in requiredParams) {
+ for (var param in requiredParams) {
if (buffer.isNotEmpty) {
buffer.write(', ');
}
offset = buffer.length;
- String name = param.name;
+ var name = param.name;
buffer.write(name);
ranges.addAll([offset, name.length]);
}
- for (ParameterElement param in namedParams) {
+ for (var param in namedParams) {
if (param.hasRequired) {
if (buffer.isNotEmpty) {
buffer.write(', ');
}
- String name = param.name;
+ var name = param.name;
buffer.write('$name: ');
offset = buffer.length;
- String defaultValue = 'null'; // originally _getDefaultValue(param)
+ var defaultValue = 'null'; // originally _getDefaultValue(param)
buffer.write(defaultValue);
ranges.addAll([offset, defaultValue.length]);
}
@@ -80,8 +79,8 @@
return null;
}
completion ??= element.displayName;
- bool isDeprecated = element.hasDeprecated;
- CompletionSuggestion suggestion = CompletionSuggestion(
+ var isDeprecated = element.hasDeprecated;
+ var suggestion = CompletionSuggestion(
kind,
isDeprecated ? DART_RELEVANCE_LOW : relevance,
completion,
@@ -91,12 +90,12 @@
false);
// Attach docs.
- String doc = removeDartDocDelimiters(element.documentationComment);
+ var doc = removeDartDocDelimiters(element.documentationComment);
suggestion.docComplete = doc;
suggestion.docSummary = getDartDocSummary(doc);
suggestion.element = converter.convertElement(element);
- Element enclosingElement = element.enclosingElement;
+ var enclosingElement = element.enclosingElement;
if (enclosingElement is ClassElement) {
suggestion.declaringType = enclosingElement.displayName;
}
@@ -107,18 +106,18 @@
.toList();
suggestion.parameterTypes =
element.parameters.map((ParameterElement parameter) {
- DartType paramType = parameter.type;
+ var paramType = parameter.type;
// Gracefully degrade if type not resolved yet
return paramType != null
? paramType.getDisplayString(withNullability: false)
: 'var';
}).toList();
- Iterable<ParameterElement> requiredParameters = element.parameters
+ var requiredParameters = element.parameters
.where((ParameterElement param) => param.isRequiredPositional);
suggestion.requiredParameterCount = requiredParameters.length;
- Iterable<ParameterElement> namedParameters =
+ var namedParameters =
element.parameters.where((ParameterElement param) => param.isNamed);
suggestion.hasNamedParameters = namedParameters.isNotEmpty;
@@ -137,7 +136,7 @@
return element.returnType?.getDisplayString(withNullability: false);
}
} else if (element is VariableElement) {
- DartType type = element.type;
+ var type = element.type;
return type != null
? type.getDisplayString(withNullability: false)
: 'dynamic';
diff --git a/pkg/analyzer_plugin/lib/src/utilities/documentation.dart b/pkg/analyzer_plugin/lib/src/utilities/documentation.dart
index 6e40a28..50299be 100644
--- a/pkg/analyzer_plugin/lib/src/utilities/documentation.dart
+++ b/pkg/analyzer_plugin/lib/src/utilities/documentation.dart
@@ -8,10 +8,10 @@
if (string == null) {
return null;
}
- List<String> lines = string.split('\n');
- StringBuffer buffer = StringBuffer();
- bool firstLine = true;
- for (String line in lines) {
+ var lines = string.split('\n');
+ var buffer = StringBuffer();
+ var firstLine = true;
+ for (var line in lines) {
if (buffer.length != 0 && line.isEmpty) {
return buffer.toString();
}
@@ -39,10 +39,10 @@
}
string = string.trim();
// remove leading '* ' and '/// '
- List<String> lines = string.split('\n');
- StringBuffer buffer = StringBuffer();
- bool firstLine = true;
- for (String line in lines) {
+ var lines = string.split('\n');
+ var buffer = StringBuffer();
+ var firstLine = true;
+ for (var line in lines) {
line = line.trim();
if (line.startsWith('*')) {
line = line.substring(1);
diff --git a/pkg/analyzer_plugin/lib/src/utilities/fixes/fixes.dart b/pkg/analyzer_plugin/lib/src/utilities/fixes/fixes.dart
index d89466b..7641cbb 100644
--- a/pkg/analyzer_plugin/lib/src/utilities/fixes/fixes.dart
+++ b/pkg/analyzer_plugin/lib/src/utilities/fixes/fixes.dart
@@ -36,9 +36,9 @@
/// Return the fixes that have been collected up to this point.
List<AnalysisErrorFixes> get fixes {
- List<AnalysisErrorFixes> fixes = <AnalysisErrorFixes>[];
- AnalyzerConverter converter = AnalyzerConverter();
- for (AnalysisError error in fixMap.keys) {
+ var fixes = <AnalysisErrorFixes>[];
+ var converter = AnalyzerConverter();
+ for (var error in fixMap.keys) {
fixes.add(AnalysisErrorFixes(converter.convertAnalysisError(error),
fixes: fixMap[error]));
}
diff --git a/pkg/analyzer_plugin/lib/src/utilities/navigation/navigation.dart b/pkg/analyzer_plugin/lib/src/utilities/navigation/navigation.dart
index d27f58f..cb9dadd 100644
--- a/pkg/analyzer_plugin/lib/src/utilities/navigation/navigation.dart
+++ b/pkg/analyzer_plugin/lib/src/utilities/navigation/navigation.dart
@@ -55,17 +55,16 @@
@override
void addRegion(
int offset, int length, ElementKind targetKind, Location targetLocation) {
- SourceRange range = SourceRange(offset, length);
+ var range = SourceRange(offset, length);
// add new target
- List<int> targets = regionMap.putIfAbsent(range, () => <int>[]);
- int targetIndex = _addTarget(targetKind, targetLocation);
+ var targets = regionMap.putIfAbsent(range, () => <int>[]);
+ var targetIndex = _addTarget(targetKind, targetLocation);
targets.add(targetIndex);
}
void createRegions() {
regionMap.forEach((range, targets) {
- NavigationRegion region =
- NavigationRegion(range.offset, range.length, targets);
+ var region = NavigationRegion(range.offset, range.length, targets);
regions.add(region);
});
regions.sort((NavigationRegion first, NavigationRegion second) {
@@ -74,7 +73,7 @@
}
int _addFile(String file) {
- int index = fileMap[file];
+ var index = fileMap[file];
if (index == null) {
index = files.length;
files.add(file);
@@ -85,18 +84,13 @@
int _addTarget(ElementKind kind, Location location) {
var pair = Pair<ElementKind, Location>(kind, location);
- int index = targetMap[pair];
+ var index = targetMap[pair];
if (index == null) {
- String file = location.file;
- int fileIndex = _addFile(file);
+ var file = location.file;
+ var fileIndex = _addFile(file);
index = targets.length;
- NavigationTarget target = NavigationTarget(
- kind,
- fileIndex,
- location.offset,
- location.length,
- location.startLine,
- location.startColumn);
+ var target = NavigationTarget(kind, fileIndex, location.offset,
+ location.length, location.startLine, location.startColumn);
targets.add(target);
targetMap[pair] = index;
}
diff --git a/pkg/analyzer_plugin/lib/src/utilities/occurrences/occurrences.dart b/pkg/analyzer_plugin/lib/src/utilities/occurrences/occurrences.dart
index 297e1df..f436774 100644
--- a/pkg/analyzer_plugin/lib/src/utilities/occurrences/occurrences.dart
+++ b/pkg/analyzer_plugin/lib/src/utilities/occurrences/occurrences.dart
@@ -33,7 +33,7 @@
/// Return the list of occurrences that have been collected.
List<Occurrences> get occurrences {
- List<Occurrences> occurrences = <Occurrences>[];
+ var occurrences = <Occurrences>[];
occurrenceLocations.forEach((Element element, List<int> offsets) {
offsets.sort();
occurrences.add(Occurrences(element, offsets, element.name.length));
diff --git a/pkg/analyzer_plugin/lib/src/utilities/outline/outline.dart b/pkg/analyzer_plugin/lib/src/utilities/outline/outline.dart
index ee8338a6..284f140 100644
--- a/pkg/analyzer_plugin/lib/src/utilities/outline/outline.dart
+++ b/pkg/analyzer_plugin/lib/src/utilities/outline/outline.dart
@@ -39,11 +39,11 @@
@override
void startElement(Element element, int offset, int length) {
- Outline outline = Outline(element, offset, length, offset, length);
+ var outline = Outline(element, offset, length, offset, length);
if (outlineStack.isEmpty) {
outlines.add(outline);
} else {
- List<Outline> children = outlineStack.last.children;
+ var children = outlineStack.last.children;
if (children == null) {
children = <Outline>[];
outlineStack.last.children = children;
diff --git a/pkg/analyzer_plugin/lib/src/utilities/string_utilities.dart b/pkg/analyzer_plugin/lib/src/utilities/string_utilities.dart
index e1b8369..32b6807 100644
--- a/pkg/analyzer_plugin/lib/src/utilities/string_utilities.dart
+++ b/pkg/analyzer_plugin/lib/src/utilities/string_utilities.dart
@@ -13,12 +13,12 @@
if (string == null || string.isEmpty) {
return const <String>[];
}
- List<String> parts = <String>[];
- bool wasLowerCase = false;
- bool wasUpperCase = false;
- int wordStart = 0;
- for (int i = 0; i < string.length; i++) {
- int c = string.codeUnitAt(i);
+ var parts = <String>[];
+ var wasLowerCase = false;
+ var wasUpperCase = false;
+ var wordStart = 0;
+ for (var i = 0; i < string.length; i++) {
+ var c = string.codeUnitAt(i);
var newLowerCase = isLowerCase(c);
var newUpperCase = isUpperCase(c);
// myWord
diff --git a/pkg/analyzer_plugin/lib/src/utilities/visitors/local_declaration_visitor.dart b/pkg/analyzer_plugin/lib/src/utilities/visitors/local_declaration_visitor.dart
index 7ad7727..8a56b73 100644
--- a/pkg/analyzer_plugin/lib/src/utilities/visitors/local_declaration_visitor.dart
+++ b/pkg/analyzer_plugin/lib/src/utilities/visitors/local_declaration_visitor.dart
@@ -78,7 +78,7 @@
@override
void visitCatchClause(CatchClause node) {
- SimpleIdentifier param = node.exceptionParameter;
+ var param = node.exceptionParameter;
if (param != null) {
declaredParam(param, node.exceptionType);
}
@@ -149,10 +149,10 @@
void visitForStatement(ForStatement node) {
var forLoopParts = node.forLoopParts;
if (forLoopParts is ForEachPartsWithDeclaration) {
- DeclaredIdentifier loopVariable = forLoopParts.loopVariable;
+ var loopVariable = forLoopParts.loopVariable;
declaredLocalVar(loopVariable.identifier, loopVariable.type);
} else if (forLoopParts is ForPartsWithDeclarations) {
- VariableDeclarationList varList = forLoopParts.variables;
+ var varList = forLoopParts.variables;
if (varList != null) {
varList.variables.forEach((VariableDeclaration varDecl) {
declaredLocalVar(varDecl.name, varList.type);
@@ -181,7 +181,7 @@
@override
void visitLabeledStatement(LabeledStatement node) {
- for (Label label in node.labels) {
+ for (var label in node.labels) {
declaredLabel(label, false);
}
visitNode(node);
@@ -219,8 +219,8 @@
@override
void visitSwitchStatement(SwitchStatement node) {
- for (SwitchMember member in node.members) {
- for (Label label in member.labels) {
+ for (var member in node.members) {
+ for (var label in member.labels) {
declaredLabel(label, true);
}
}
@@ -228,7 +228,7 @@
}
void _visitClassOrMixinMembers(ClassOrMixinDeclaration node) {
- for (ClassMember member in node.members) {
+ for (var member in node.members) {
if (member is FieldDeclaration) {
member.fields.variables.forEach((VariableDeclaration varDecl) {
declaredField(member, varDecl);
@@ -257,30 +257,30 @@
} else if (normalParam is SimpleFormalParameter) {
type = normalParam.type;
}
- SimpleIdentifier name = param.identifier;
+ var name = param.identifier;
declaredParam(name, type);
});
}
}
void _visitStatements(NodeList<Statement> statements) {
- for (Statement stmt in statements) {
+ for (var stmt in statements) {
if (stmt.offset < offset) {
if (stmt is VariableDeclarationStatement) {
- VariableDeclarationList varList = stmt.variables;
+ var varList = stmt.variables;
if (varList != null) {
- for (VariableDeclaration varDecl in varList.variables) {
+ for (var varDecl in varList.variables) {
if (varDecl.end < offset) {
declaredLocalVar(varDecl.name, varList.type);
}
}
}
} else if (stmt is FunctionDeclarationStatement) {
- FunctionDeclaration declaration = stmt.functionDeclaration;
+ var declaration = stmt.functionDeclaration;
if (declaration != null && declaration.offset < offset) {
- SimpleIdentifier id = declaration.name;
+ var id = declaration.name;
if (id != null) {
- String name = id.name;
+ var name = id.name;
if (name != null && name.isNotEmpty) {
declaredFunction(declaration);
_visitTypeParameters(
diff --git a/pkg/analyzer_plugin/lib/utilities/analyzer_converter.dart b/pkg/analyzer_plugin/lib/utilities/analyzer_converter.dart
index 701f320..d44469e 100644
--- a/pkg/analyzer_plugin/lib/utilities/analyzer_converter.dart
+++ b/pkg/analyzer_plugin/lib/utilities/analyzer_converter.dart
@@ -27,13 +27,13 @@
/// is provided, then it will override the severity defined by the error.
plugin.AnalysisError convertAnalysisError(analyzer.AnalysisError error,
{analyzer.LineInfo lineInfo, analyzer.ErrorSeverity severity}) {
- analyzer.ErrorCode errorCode = error.errorCode;
+ var errorCode = error.errorCode;
severity ??= errorCode.errorSeverity;
- int offset = error.offset;
- int startLine = -1;
- int startColumn = -1;
+ var offset = error.offset;
+ var startLine = -1;
+ var startColumn = -1;
if (lineInfo != null) {
- analyzer.CharacterLocation lineLocation =
+ var lineLocation =
lineInfo.getLocation(offset) as analyzer.CharacterLocation;
if (lineLocation != null) {
startLine = lineLocation.lineNumber;
@@ -68,12 +68,11 @@
List<analyzer.AnalysisError> errors,
{analyzer.LineInfo lineInfo,
analyzer.AnalysisOptions options}) {
- List<plugin.AnalysisError> serverErrors = <plugin.AnalysisError>[];
- for (analyzer.AnalysisError error in errors) {
- analyzer.ErrorProcessor processor =
- analyzer.ErrorProcessor.getProcessor(options, error);
+ var serverErrors = <plugin.AnalysisError>[];
+ for (var error in errors) {
+ var processor = analyzer.ErrorProcessor.getProcessor(options, error);
if (processor != null) {
- analyzer.ErrorSeverity severity = processor.severity;
+ var severity = processor.severity;
// Errors with null severity are filtered out.
if (severity != null) {
// Specified severities override.
@@ -93,13 +92,13 @@
plugin.DiagnosticMessage convertDiagnosticMessage(
analyzer.DiagnosticMessage message,
{analyzer.LineInfo lineInfo}) {
- String file = message.filePath;
- int offset = message.offset;
- int length = message.length;
- int startLine = -1;
- int startColumn = -1;
+ var file = message.filePath;
+ var offset = message.offset;
+ var length = message.length;
+ var startLine = -1;
+ var startColumn = -1;
if (lineInfo != null) {
- analyzer.CharacterLocation lineLocation =
+ var lineLocation =
lineInfo.getLocation(offset) as analyzer.CharacterLocation;
if (lineLocation != null) {
startLine = lineLocation.lineNumber;
@@ -113,7 +112,7 @@
/// Convert the given [element] from the 'analyzer' package to an element
/// defined by the plugin API.
plugin.Element convertElement(analyzer.Element element) {
- plugin.ElementKind kind = _convertElementToElementKind(element);
+ var kind = _convertElementToElementKind(element);
return plugin.Element(
kind,
element.displayName,
@@ -225,11 +224,11 @@
} else {
return null;
}
- StringBuffer buffer = StringBuffer();
- String closeOptionalString = '';
+ var buffer = StringBuffer();
+ var closeOptionalString = '';
buffer.write('(');
- for (int i = 0; i < parameters.length; i++) {
- analyzer.ParameterElement parameter = parameters[i];
+ for (var i = 0; i < parameters.length; i++) {
+ var parameter = parameters[i];
if (i > 0) {
buffer.write(', ');
}
@@ -258,7 +257,7 @@
}
return element.returnType?.getDisplayString(withNullability: false);
} else if (element is analyzer.VariableElement) {
- analyzer.DartType type = element.type;
+ var type = element.type;
return type != null
? type.getDisplayString(withNullability: false)
: 'dynamic';
@@ -273,8 +272,7 @@
/// [element], or `null` if the element does not have type parameters.
String _getTypeParametersString(analyzer.Element element) {
if (element is analyzer.TypeParameterizedElement) {
- List<analyzer.TypeParameterElement> typeParameters =
- element.typeParameters;
+ var typeParameters = element.typeParameters;
if (typeParameters == null || typeParameters.isEmpty) {
return null;
}
@@ -346,12 +344,12 @@
/// [range].
plugin.Location _locationForArgs(
analyzer.CompilationUnitElement unitElement, analyzer.SourceRange range) {
- int startLine = 0;
- int startColumn = 0;
+ var startLine = 0;
+ var startColumn = 0;
try {
- analyzer.LineInfo lineInfo = unitElement.lineInfo;
+ var lineInfo = unitElement.lineInfo;
if (lineInfo != null) {
- analyzer.CharacterLocation offsetLocation =
+ var offsetLocation =
lineInfo.getLocation(range.offset) as analyzer.CharacterLocation;
startLine = offsetLocation.lineNumber;
startColumn = offsetLocation.columnNumber;
@@ -368,15 +366,15 @@
if (element == null || element.source == null) {
return null;
}
- int offset = element.nameOffset;
- int length = element.nameLength;
+ var offset = element.nameOffset;
+ var length = element.nameLength;
if (element is analyzer.CompilationUnitElement ||
(element is analyzer.LibraryElement && offset < 0)) {
offset = 0;
length = 0;
}
- analyzer.CompilationUnitElement unitElement = _getUnitElement(element);
- analyzer.SourceRange range = analyzer.SourceRange(offset, length);
+ var unitElement = _getUnitElement(element);
+ var range = analyzer.SourceRange(offset, length);
return _locationForArgs(unitElement, range);
}
}
diff --git a/pkg/analyzer_plugin/lib/utilities/assist/assist.dart b/pkg/analyzer_plugin/lib/utilities/assist/assist.dart
index e292559..00dedd3 100644
--- a/pkg/analyzer_plugin/lib/utilities/assist/assist.dart
+++ b/pkg/analyzer_plugin/lib/utilities/assist/assist.dart
@@ -43,9 +43,9 @@
/// also create a non-fatal 'plugin.error' notification.
GeneratorResult<EditGetAssistsResult> generateAssistsResponse(
AssistRequest request) {
- List<Notification> notifications = <Notification>[];
- AssistCollectorImpl collector = AssistCollectorImpl();
- for (AssistContributor contributor in contributors) {
+ var notifications = <Notification>[];
+ var collector = AssistCollectorImpl();
+ for (var contributor in contributors) {
try {
contributor.computeAssists(request, collector);
} catch (exception, stackTrace) {
@@ -54,7 +54,7 @@
.toNotification());
}
}
- EditGetAssistsResult result = EditGetAssistsResult(collector.assists);
+ var result = EditGetAssistsResult(collector.assists);
return GeneratorResult(result, notifications);
}
}
diff --git a/pkg/analyzer_plugin/lib/utilities/assist/assist_contributor_mixin.dart b/pkg/analyzer_plugin/lib/utilities/assist/assist_contributor_mixin.dart
index 6a1db63..cbd2fcc 100644
--- a/pkg/analyzer_plugin/lib/utilities/assist/assist_contributor_mixin.dart
+++ b/pkg/analyzer_plugin/lib/utilities/assist/assist_contributor_mixin.dart
@@ -3,7 +3,6 @@
// BSD-style license that can be found in the LICENSE file.
import 'package:analyzer/src/generated/java_core.dart';
-import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:analyzer_plugin/protocol/protocol_generated.dart';
import 'package:analyzer_plugin/utilities/assist/assist.dart';
import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
@@ -22,7 +21,7 @@
/// assist. If the message has parameters, then use the list of [args] to
/// populate the message.
void addAssist(AssistKind kind, ChangeBuilder builder, {List<Object> args}) {
- SourceChange change = builder.sourceChange;
+ var change = builder.sourceChange;
if (change.edits.isEmpty) {
return;
}
diff --git a/pkg/analyzer_plugin/lib/utilities/completion/completion_core.dart b/pkg/analyzer_plugin/lib/utilities/completion/completion_core.dart
index eb141a5..2defc81 100644
--- a/pkg/analyzer_plugin/lib/utilities/completion/completion_core.dart
+++ b/pkg/analyzer_plugin/lib/utilities/completion/completion_core.dart
@@ -76,10 +76,10 @@
generateCompletionResponse(CompletionRequest request) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- List<Notification> notifications = <Notification>[];
- CompletionCollectorImpl collector = CompletionCollectorImpl();
+ var notifications = <Notification>[];
+ var collector = CompletionCollectorImpl();
try {
- for (CompletionContributor contributor in contributors) {
+ for (var contributor in contributors) {
request.checkAborted();
try {
await contributor.computeSuggestions(request, collector);
@@ -95,7 +95,7 @@
collector.offset ??= request.offset;
collector.length ??= 0;
- CompletionGetSuggestionsResult result = CompletionGetSuggestionsResult(
+ var result = CompletionGetSuggestionsResult(
collector.offset, collector.length, collector.suggestions);
return GeneratorResult(result, notifications);
}
diff --git a/pkg/analyzer_plugin/lib/utilities/completion/inherited_reference_contributor.dart b/pkg/analyzer_plugin/lib/utilities/completion/inherited_reference_contributor.dart
index 764e342..3a76d3f 100644
--- a/pkg/analyzer_plugin/lib/utilities/completion/inherited_reference_contributor.dart
+++ b/pkg/analyzer_plugin/lib/utilities/completion/inherited_reference_contributor.dart
@@ -38,13 +38,13 @@
DartCompletionRequest request, CompletionCollector collector) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- CompletionTarget target =
+ var target =
CompletionTarget.forOffset(request.result.unit, request.offset);
- OpType optype = OpType.forCompletion(target, request.offset);
+ var optype = OpType.forCompletion(target, request.offset);
if (!optype.includeIdentifiers) {
return;
}
- ClassDeclaration classDecl = _enclosingClass(target);
+ var classDecl = _enclosingClass(target);
if (classDecl == null || classDecl.declaredElement == null) {
return;
}
@@ -72,7 +72,7 @@
return;
}
if (classElement == null) {
- ClassDeclaration classDecl = _enclosingClass(target);
+ var classDecl = _enclosingClass(target);
if (classDecl == null || classDecl.declaredElement == null) {
return;
}
@@ -86,7 +86,7 @@
void _addSuggestionsForType(InterfaceType type, OpType optype,
{bool isFunctionalArgument = false}) {
if (!isFunctionalArgument) {
- for (PropertyAccessorElement elem in type.accessors) {
+ for (var elem in type.accessors) {
if (elem.isGetter) {
if (optype.includeReturnValueSuggestions) {
addSuggestion(elem);
@@ -98,7 +98,7 @@
}
}
}
- for (MethodElement elem in type.methods) {
+ for (var elem in type.methods) {
if (elem.returnType == null) {
addSuggestion(elem);
} else if (!elem.returnType.isVoid) {
@@ -116,7 +116,7 @@
void _computeSuggestionsForClass2(CompletionCollector collector,
CompletionTarget target, ClassElement classElement, OpType optype,
{bool skipChildClass = true}) {
- bool isFunctionalArgument = target.isFunctionalArgument();
+ var isFunctionalArgument = target.isFunctionalArgument();
kind = isFunctionalArgument
? CompletionSuggestionKind.IDENTIFIER
: CompletionSuggestionKind.INVOCATION;
@@ -126,11 +126,11 @@
isFunctionalArgument: isFunctionalArgument);
}
- for (InterfaceType type in classElement.allSupertypes) {
+ for (var type in classElement.allSupertypes) {
_addSuggestionsForType(type, optype,
isFunctionalArgument: isFunctionalArgument);
}
- for (CompletionSuggestion suggestion in suggestions) {
+ for (var suggestion in suggestions) {
collector.addSuggestion(suggestion);
}
}
@@ -138,7 +138,7 @@
/// Return the class containing the target or `null` if the target is in a
/// static method or field or not in a class.
ClassDeclaration _enclosingClass(CompletionTarget target) {
- AstNode node = target.containingNode;
+ var node = target.containingNode;
while (node != null) {
if (node is ClassDeclaration) {
return node;
diff --git a/pkg/analyzer_plugin/lib/utilities/completion/relevance.dart b/pkg/analyzer_plugin/lib/utilities/completion/relevance.dart
index 4eb87d5..21655d7 100644
--- a/pkg/analyzer_plugin/lib/utilities/completion/relevance.dart
+++ b/pkg/analyzer_plugin/lib/utilities/completion/relevance.dart
@@ -47,6 +47,9 @@
/// function-typed parameter in an argument list.
static const int closure = 900;
+ /// The relevance used when suggesting a constructor.
+ static const int constructor = 900;
+
/// The relevance used when suggesting a field as a field formal parameter.
static const int fieldFormalParameter = 1000;
@@ -77,4 +80,7 @@
/// The relevance used when suggesting a named argument corresponding to a
/// named parameter that is required.
static const int requiredNamedArgument = 950;
+
+ /// The relevance used when suggesting a type parameter.
+ static const int typeParameter = 900;
}
diff --git a/pkg/analyzer_plugin/lib/utilities/completion/type_member_contributor.dart b/pkg/analyzer_plugin/lib/utilities/completion/type_member_contributor.dart
index 8bbcbde..2d8c195 100644
--- a/pkg/analyzer_plugin/lib/utilities/completion/type_member_contributor.dart
+++ b/pkg/analyzer_plugin/lib/utilities/completion/type_member_contributor.dart
@@ -29,7 +29,7 @@
DartCompletionRequest request, CompletionCollector collector) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- LibraryElement containingLibrary = request.result.libraryElement;
+ var containingLibrary = request.result.libraryElement;
// Gracefully degrade if the library element is not resolved
// e.g. detached part file or source change
if (containingLibrary == null) {
@@ -37,7 +37,7 @@
}
// Recompute the target since resolution may have changed it
- Expression expression = _computeDotTarget(request, null);
+ var expression = _computeDotTarget(request, null);
if (expression == null || expression.isSynthetic) {
return;
}
@@ -49,7 +49,7 @@
CompletionCollector collector, AstNode entryPoint) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- LibraryElement containingLibrary = request.result.libraryElement;
+ var containingLibrary = request.result.libraryElement;
// Gracefully degrade if the library element is not resolved
// e.g. detached part file or source change
if (containingLibrary == null) {
@@ -57,7 +57,7 @@
}
// Recompute the target since resolution may have changed it
- Expression expression = _computeDotTarget(request, entryPoint);
+ var expression = _computeDotTarget(request, entryPoint);
if (expression == null || expression.isSynthetic) {
return;
}
@@ -67,10 +67,9 @@
/// Update the completion [target] and [dotTarget] based on the given [unit].
Expression _computeDotTarget(
DartCompletionRequest request, AstNode entryPoint) {
- CompletionTarget target = CompletionTarget.forOffset(
- request.result.unit, request.offset,
+ var target = CompletionTarget.forOffset(request.result.unit, request.offset,
entryPoint: entryPoint);
- AstNode node = target.containingNode;
+ var node = target.containingNode;
if (node is MethodInvocation) {
if (identical(node.methodName, target.entity)) {
return node.realTarget;
@@ -99,7 +98,7 @@
LibraryElement containingLibrary,
Expression expression) {
if (expression is Identifier) {
- Element element = expression.staticElement;
+ var element = expression.staticElement;
if (element is ClassElement) {
// Suggestions provided by StaticMemberContributor
return;
@@ -111,12 +110,12 @@
}
// Determine the target expression's type
- DartType type = expression.staticType;
+ var type = expression.staticType;
if (type == null || type.isDynamic) {
// If the expression does not provide a good type
// then attempt to get a better type from the element
if (expression is Identifier) {
- Element elem = expression.staticElement;
+ var elem = expression.staticElement;
if (elem is FunctionTypedElement) {
type = elem.returnType;
} else if (elem is ParameterElement) {
@@ -128,8 +127,7 @@
expression is SimpleIdentifier) {
// If the element does not provide a good type
// then attempt to get a better type from a local declaration
- _LocalBestTypeVisitor visitor =
- _LocalBestTypeVisitor(expression.name, request.offset);
+ var visitor = _LocalBestTypeVisitor(expression.name, request.offset);
if (visitor.visit(expression) && visitor.typeFound != null) {
type = visitor.typeFound;
}
@@ -142,10 +140,10 @@
type = (type as InterfaceType).superclass;
// Determine the name of the containing method because
// the most likely completion is a super expression with same name
- MethodDeclaration containingMethod =
+ var containingMethod =
expression.thisOrAncestorOfType<MethodDeclaration>();
if (containingMethod != null) {
- SimpleIdentifier id = containingMethod.name;
+ var id = containingMethod.name;
if (id != null) {
containingMethodName = id.name;
}
@@ -158,7 +156,7 @@
// Build the suggestions
if (type is InterfaceType) {
- _SuggestionBuilder builder = _SuggestionBuilder(
+ var builder = _SuggestionBuilder(
request.resourceProvider, collector, containingLibrary);
builder.buildSuggestions(type, containingMethodName);
}
@@ -208,7 +206,7 @@
@override
void declaredFunction(FunctionDeclaration declaration) {
if (declaration.name.name == targetName) {
- TypeAnnotation typeName = declaration.returnType;
+ var typeName = declaration.returnType;
if (typeName != null) {
typeFound = typeName.type;
}
@@ -219,7 +217,7 @@
@override
void declaredFunctionTypeAlias(FunctionTypeAlias declaration) {
if (declaration.name.name == targetName) {
- TypeAnnotation typeName = declaration.returnType;
+ var typeName = declaration.returnType;
if (typeName != null) {
typeFound = typeName.type;
}
@@ -230,7 +228,7 @@
@override
void declaredGenericTypeAlias(GenericTypeAlias declaration) {
if (declaration.name.name == targetName) {
- TypeAnnotation typeName = declaration.functionType?.returnType;
+ var typeName = declaration.functionType?.returnType;
if (typeName != null) {
typeFound = typeName.type;
}
@@ -258,7 +256,7 @@
@override
void declaredMethod(MethodDeclaration declaration) {
if (declaration.name.name == targetName) {
- TypeAnnotation typeName = declaration.returnType;
+ var typeName = declaration.returnType;
if (typeName != null) {
typeFound = typeName.type;
}
@@ -342,9 +340,9 @@
// completions. If multiple elements are found that complete to the same
// identifier, addSuggestion will discard all but the first (with a few
// exceptions to handle getter/setter pairs).
- List<InterfaceType> types = _getTypeOrdering(type);
- for (InterfaceType targetType in types) {
- for (MethodElement method in targetType.methods) {
+ var types = _getTypeOrdering(type);
+ for (var targetType in types) {
+ for (var method in targetType.methods) {
// Exclude static methods when completion on an instance
if (!method.isStatic) {
// Boost the relevance of a super expression
@@ -355,7 +353,7 @@
: null);
}
}
- for (PropertyAccessorElement propertyAccessor in targetType.accessors) {
+ for (var propertyAccessor in targetType.accessors) {
if (!propertyAccessor.isStatic) {
if (propertyAccessor.isSynthetic) {
// Avoid visiting a field twice
@@ -368,7 +366,7 @@
}
}
}
- for (CompletionSuggestion suggestion in suggestions) {
+ for (var suggestion in suggestions) {
collector.addSuggestion(suggestion);
}
}
@@ -382,7 +380,7 @@
return;
}
}
- String identifier = element.displayName;
+ var identifier = element.displayName;
if (relevance == null) {
// Decrease relevance of suggestions starting with $
@@ -394,7 +392,7 @@
}
}
- int alreadyGenerated = _completionTypesGenerated.putIfAbsent(
+ var alreadyGenerated = _completionTypesGenerated.putIfAbsent(
identifier, () => _COMPLETION_TYPE_NONE);
if (element is MethodElement) {
// Anything shadows a method.
@@ -430,8 +428,7 @@
assert(false);
return;
}
- CompletionSuggestion suggestion =
- builder.forElement(element, relevance: relevance);
+ var suggestion = builder.forElement(element, relevance: relevance);
if (suggestion != null) {
_suggestionMap[suggestion.completion] = suggestion;
}
@@ -450,11 +447,11 @@
// We short-circuit loops in the class hierarchy by keeping track of the
// classes seen (not the interfaces) so that we won't be fooled by nonsense
// like "class C<T> extends C<List<T>> {}"
- List<InterfaceType> result = <InterfaceType>[];
+ var result = <InterfaceType>[];
Set<ClassElement> classesSeen = HashSet<ClassElement>();
- List<InterfaceType> typesToVisit = <InterfaceType>[type];
+ var typesToVisit = <InterfaceType>[type];
while (typesToVisit.isNotEmpty) {
- InterfaceType nextType = typesToVisit.removeLast();
+ var nextType = typesToVisit.removeLast();
if (!classesSeen.add(nextType.element)) {
// Class had already been seen, so ignore this type.
continue;
diff --git a/pkg/analyzer_plugin/lib/utilities/fixes/fix_contributor_mixin.dart b/pkg/analyzer_plugin/lib/utilities/fixes/fix_contributor_mixin.dart
index b45f3cb..7f01aca 100644
--- a/pkg/analyzer_plugin/lib/utilities/fixes/fix_contributor_mixin.dart
+++ b/pkg/analyzer_plugin/lib/utilities/fixes/fix_contributor_mixin.dart
@@ -4,8 +4,6 @@
import 'package:analyzer/error/error.dart';
import 'package:analyzer/src/generated/java_core.dart';
-import 'package:analyzer_plugin/protocol/protocol_common.dart'
- hide AnalysisError;
import 'package:analyzer_plugin/protocol/protocol_generated.dart';
import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
@@ -28,7 +26,7 @@
/// [args] to populate the message.
void addFix(AnalysisError error, FixKind kind, ChangeBuilder builder,
{List<Object> args}) {
- SourceChange change = builder.sourceChange;
+ var change = builder.sourceChange;
if (change.edits.isEmpty) {
return;
}
@@ -42,7 +40,7 @@
this.request = request;
this.collector = collector;
try {
- for (AnalysisError error in request.errorsToFix) {
+ for (var error in request.errorsToFix) {
computeFixesForError(error);
}
} finally {
diff --git a/pkg/analyzer_plugin/lib/utilities/fixes/fixes.dart b/pkg/analyzer_plugin/lib/utilities/fixes/fixes.dart
index 4818c5e..ac3c5fe 100644
--- a/pkg/analyzer_plugin/lib/utilities/fixes/fixes.dart
+++ b/pkg/analyzer_plugin/lib/utilities/fixes/fixes.dart
@@ -66,9 +66,9 @@
/// also create a non-fatal 'plugin.error' notification.
GeneratorResult<EditGetFixesResult> generateFixesResponse(
FixesRequest request) {
- List<Notification> notifications = <Notification>[];
- FixCollectorImpl collector = FixCollectorImpl();
- for (FixContributor contributor in contributors) {
+ var notifications = <Notification>[];
+ var collector = FixCollectorImpl();
+ for (var contributor in contributors) {
try {
contributor.computeFixes(request, collector);
} catch (exception, stackTrace) {
@@ -77,7 +77,7 @@
.toNotification());
}
}
- EditGetFixesResult result = EditGetFixesResult(collector.fixes);
+ var result = EditGetFixesResult(collector.fixes);
return GeneratorResult(result, notifications);
}
}
diff --git a/pkg/analyzer_plugin/lib/utilities/folding/folding.dart b/pkg/analyzer_plugin/lib/utilities/folding/folding.dart
index 203475b..3b5bd51 100644
--- a/pkg/analyzer_plugin/lib/utilities/folding/folding.dart
+++ b/pkg/analyzer_plugin/lib/utilities/folding/folding.dart
@@ -57,9 +57,9 @@
/// Create an 'analysis.folding' notification. If any of the contributors
/// throws an exception, also create a non-fatal 'plugin.error' notification.
GeneratorResult generateFoldingNotification(FoldingRequest request) {
- List<Notification> notifications = <Notification>[];
- FoldingCollectorImpl collector = FoldingCollectorImpl();
- for (FoldingContributor contributor in contributors) {
+ var notifications = <Notification>[];
+ var collector = FoldingCollectorImpl();
+ for (var contributor in contributors) {
try {
contributor.computeFolding(request, collector);
} catch (exception, stackTrace) {
diff --git a/pkg/analyzer_plugin/lib/utilities/highlights/highlights.dart b/pkg/analyzer_plugin/lib/utilities/highlights/highlights.dart
index 3a3235a..8d3f309 100644
--- a/pkg/analyzer_plugin/lib/utilities/highlights/highlights.dart
+++ b/pkg/analyzer_plugin/lib/utilities/highlights/highlights.dart
@@ -57,9 +57,9 @@
/// Create an 'analysis.highlights' notification. If any of the contributors
/// throws an exception, also create a non-fatal 'plugin.error' notification.
GeneratorResult generateHighlightsNotification(HighlightsRequest request) {
- List<Notification> notifications = <Notification>[];
- HighlightsCollectorImpl collector = HighlightsCollectorImpl();
- for (HighlightsContributor contributor in contributors) {
+ var notifications = <Notification>[];
+ var collector = HighlightsCollectorImpl();
+ for (var contributor in contributors) {
try {
contributor.computeHighlights(request, collector);
} catch (exception, stackTrace) {
diff --git a/pkg/analyzer_plugin/lib/utilities/kythe/entries.dart b/pkg/analyzer_plugin/lib/utilities/kythe/entries.dart
index d0bac58..1cd649b 100644
--- a/pkg/analyzer_plugin/lib/utilities/kythe/entries.dart
+++ b/pkg/analyzer_plugin/lib/utilities/kythe/entries.dart
@@ -52,9 +52,9 @@
/// non-fatal 'plugin.error' notification.
GeneratorResult<KytheGetKytheEntriesResult> generateGetEntriesResponse(
EntryRequest request) {
- List<Notification> notifications = <Notification>[];
- EntryCollectorImpl collector = EntryCollectorImpl();
- for (EntryContributor contributor in contributors) {
+ var notifications = <Notification>[];
+ var collector = EntryCollectorImpl();
+ for (var contributor in contributors) {
try {
contributor.computeEntries(request, collector);
} catch (exception, stackTrace) {
@@ -63,8 +63,7 @@
.toNotification());
}
}
- KytheGetKytheEntriesResult result =
- KytheGetKytheEntriesResult(collector.entries, collector.files);
+ var result = KytheGetKytheEntriesResult(collector.entries, collector.files);
return GeneratorResult(result, notifications);
}
}
diff --git a/pkg/analyzer_plugin/lib/utilities/navigation/navigation.dart b/pkg/analyzer_plugin/lib/utilities/navigation/navigation.dart
index bc01318..cd93264 100644
--- a/pkg/analyzer_plugin/lib/utilities/navigation/navigation.dart
+++ b/pkg/analyzer_plugin/lib/utilities/navigation/navigation.dart
@@ -62,9 +62,9 @@
/// specified by the given [request]. If any of the contributors throws an
/// exception, also create a non-fatal 'plugin.error' notification.
GeneratorResult generateNavigationNotification(NavigationRequest request) {
- List<Notification> notifications = <Notification>[];
- NavigationCollectorImpl collector = NavigationCollectorImpl();
- for (NavigationContributor contributor in contributors) {
+ var notifications = <Notification>[];
+ var collector = NavigationCollectorImpl();
+ for (var contributor in contributors) {
try {
contributor.computeNavigation(request, collector);
} catch (exception, stackTrace) {
@@ -85,9 +85,9 @@
/// exception, also create a non-fatal 'plugin.error' notification.
GeneratorResult<AnalysisGetNavigationResult> generateNavigationResponse(
NavigationRequest request) {
- List<Notification> notifications = <Notification>[];
- NavigationCollectorImpl collector = NavigationCollectorImpl();
- for (NavigationContributor contributor in contributors) {
+ var notifications = <Notification>[];
+ var collector = NavigationCollectorImpl();
+ for (var contributor in contributors) {
try {
contributor.computeNavigation(request, collector);
} catch (exception, stackTrace) {
@@ -97,7 +97,7 @@
}
}
collector.createRegions();
- AnalysisGetNavigationResult result = AnalysisGetNavigationResult(
+ var result = AnalysisGetNavigationResult(
collector.files, collector.targets, collector.regions);
return GeneratorResult(result, notifications);
}
diff --git a/pkg/analyzer_plugin/lib/utilities/occurrences/occurrences.dart b/pkg/analyzer_plugin/lib/utilities/occurrences/occurrences.dart
index 6b1c4b3..9d0fc58 100644
--- a/pkg/analyzer_plugin/lib/utilities/occurrences/occurrences.dart
+++ b/pkg/analyzer_plugin/lib/utilities/occurrences/occurrences.dart
@@ -52,9 +52,9 @@
/// Create an 'analysis.occurrences' notification. If any of the contributors
/// throws an exception, also create a non-fatal 'plugin.error' notification.
GeneratorResult generateOccurrencesNotification(OccurrencesRequest request) {
- List<Notification> notifications = <Notification>[];
- OccurrencesCollectorImpl collector = OccurrencesCollectorImpl();
- for (OccurrencesContributor contributor in contributors) {
+ var notifications = <Notification>[];
+ var collector = OccurrencesCollectorImpl();
+ for (var contributor in contributors) {
try {
contributor.computeOccurrences(request, collector);
} catch (exception, stackTrace) {
diff --git a/pkg/analyzer_plugin/lib/utilities/outline/outline.dart b/pkg/analyzer_plugin/lib/utilities/outline/outline.dart
index c204080..d9477da 100644
--- a/pkg/analyzer_plugin/lib/utilities/outline/outline.dart
+++ b/pkg/analyzer_plugin/lib/utilities/outline/outline.dart
@@ -58,9 +58,9 @@
/// Create an 'analysis.outline' notification. If any of the contributors
/// throws an exception, also create a non-fatal 'plugin.error' notification.
GeneratorResult generateOutlineNotification(OutlineRequest request) {
- List<Notification> notifications = <Notification>[];
- OutlineCollectorImpl collector = OutlineCollectorImpl();
- for (OutlineContributor contributor in contributors) {
+ var notifications = <Notification>[];
+ var collector = OutlineCollectorImpl();
+ for (var contributor in contributors) {
try {
contributor.computeOutline(request, collector);
} catch (exception, stackTrace) {
diff --git a/pkg/analyzer_plugin/lib/utilities/range_factory.dart b/pkg/analyzer_plugin/lib/utilities/range_factory.dart
index 6512ccc..1ef5dbc 100644
--- a/pkg/analyzer_plugin/lib/utilities/range_factory.dart
+++ b/pkg/analyzer_plugin/lib/utilities/range_factory.dart
@@ -23,8 +23,8 @@
/// Return a source range that starts at the end of [leftEntity] and ends at
/// the end of [rightEntity].
SourceRange endEnd(SyntacticEntity leftEntity, SyntacticEntity rightEntity) {
- int offset = leftEntity.end;
- int length = rightEntity.end - offset;
+ var offset = leftEntity.end;
+ var length = rightEntity.end - offset;
return SourceRange(offset, length);
}
@@ -38,8 +38,8 @@
/// the start of [rightEntity].
SourceRange endStart(
SyntacticEntity leftEntity, SyntacticEntity rightEntity) {
- int offset = leftEntity.end;
- int length = rightEntity.offset - offset;
+ var offset = leftEntity.end;
+ var length = rightEntity.offset - offset;
return SourceRange(offset, length);
}
@@ -88,8 +88,8 @@
/// the end of [rightEntity].
SourceRange startEnd(
SyntacticEntity leftEntity, SyntacticEntity rightEntity) {
- int offset = leftEntity.offset;
- int length = rightEntity.end - offset;
+ var offset = leftEntity.offset;
+ var length = rightEntity.end - offset;
return SourceRange(offset, length);
}
@@ -102,7 +102,7 @@
/// Return a source range that starts at the given [startOffset] and ends at
/// the given [endOffset].
SourceRange startOffsetEndOffset(int startOffset, int endOffset) {
- int length = endOffset - startOffset;
+ var length = endOffset - startOffset;
return SourceRange(startOffset, length);
}
@@ -110,8 +110,8 @@
/// the start of [rightEntity].
SourceRange startStart(
SyntacticEntity leftEntity, SyntacticEntity rightEntity) {
- int offset = leftEntity.offset;
- int length = rightEntity.offset - offset;
+ var offset = leftEntity.offset;
+ var length = rightEntity.offset - offset;
return SourceRange(offset, length);
}
diff --git a/pkg/analyzer_plugin/lib/utilities/subscriptions/subscription_manager.dart b/pkg/analyzer_plugin/lib/utilities/subscriptions/subscription_manager.dart
index 27df387..22b0fec 100644
--- a/pkg/analyzer_plugin/lib/utilities/subscriptions/subscription_manager.dart
+++ b/pkg/analyzer_plugin/lib/utilities/subscriptions/subscription_manager.dart
@@ -20,14 +20,14 @@
if (_subscriptions == null) {
return false;
}
- List<String> files = _subscriptions[service];
+ var files = _subscriptions[service];
return files != null && files.contains(filePath);
}
/// Return a list of the services for which the file with the given [filePath]
/// has been subscribed.
List<AnalysisService> servicesForFile(String filePath) {
- List<AnalysisService> services = <AnalysisService>[];
+ var services = <AnalysisService>[];
if (_subscriptions != null) {
_subscriptions.forEach((AnalysisService service, List<String> files) {
if (files.contains(filePath)) {
@@ -46,13 +46,12 @@
/// the list of services that were added for that file.
Map<String, List<AnalysisService>> setSubscriptions(
Map<AnalysisService, List<String>> subscriptions) {
- Map<String, List<AnalysisService>> newSubscriptions =
- <String, List<AnalysisService>>{};
+ var newSubscriptions = <String, List<AnalysisService>>{};
if (_subscriptions == null) {
// This is the first time subscriptions have been set, so all of the
// subscriptions are new.
subscriptions.forEach((AnalysisService service, List<String> paths) {
- for (String path in paths) {
+ for (var path in paths) {
newSubscriptions
.putIfAbsent(path, () => <AnalysisService>[])
.add(service);
@@ -62,8 +61,8 @@
// The subscriptions have been changed, to we need to compute the
// difference.
subscriptions.forEach((AnalysisService service, List<String> paths) {
- List<String> oldPaths = _subscriptions[service];
- for (String path in paths) {
+ var oldPaths = _subscriptions[service];
+ for (var path in paths) {
if (!oldPaths.contains(path)) {
newSubscriptions
.putIfAbsent(path, () => <AnalysisService>[])
diff --git a/pkg/analyzer_plugin/test/integration/support/integration_test_methods.dart b/pkg/analyzer_plugin/test/integration/support/integration_test_methods.dart
index f0aecc3..7bc81f3 100644
--- a/pkg/analyzer_plugin/test/integration/support/integration_test_methods.dart
+++ b/pkg/analyzer_plugin/test/integration/support/integration_test_methods.dart
@@ -9,13 +9,13 @@
/// Convenience methods for running integration tests.
import 'dart:async';
+import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:analyzer_plugin/protocol/protocol_generated.dart';
import 'package:analyzer_plugin/src/protocol/protocol_internal.dart';
import 'package:test/test.dart';
import 'integration_tests.dart';
import 'protocol_matchers.dart';
-import 'package:analyzer_plugin/protocol/protocol_common.dart';
/// Convenience methods for running integration tests.
abstract class IntegrationTestMixin {
@@ -76,7 +76,7 @@
var params =
PluginVersionCheckParams(byteStorePath, sdkPath, version).toJson();
var result = await server.send('plugin.versionCheck', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return PluginVersionCheckResult.fromJson(decoder, 'result', result);
}
@@ -168,7 +168,7 @@
String file, int offset, int length) async {
var params = AnalysisGetNavigationParams(file, offset, length).toJson();
var result = await server.send('analysis.getNavigation', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return AnalysisGetNavigationResult.fromJson(decoder, 'result', result);
}
@@ -465,7 +465,7 @@
String file, int offset) async {
var params = CompletionGetSuggestionsParams(file, offset).toJson();
var result = await server.send('completion.getSuggestions', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return CompletionGetSuggestionsResult.fromJson(decoder, 'result', result);
}
@@ -497,7 +497,7 @@
String file, int offset, int length) async {
var params = EditGetAssistsParams(file, offset, length).toJson();
var result = await server.send('edit.getAssists', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return EditGetAssistsResult.fromJson(decoder, 'result', result);
}
@@ -533,7 +533,7 @@
var params =
EditGetAvailableRefactoringsParams(file, offset, length).toJson();
var result = await server.send('edit.getAvailableRefactorings', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return EditGetAvailableRefactoringsResult.fromJson(
decoder, 'result', result);
}
@@ -559,7 +559,7 @@
Future<EditGetFixesResult> sendEditGetFixes(String file, int offset) async {
var params = EditGetFixesParams(file, offset).toJson();
var result = await server.send('edit.getFixes', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return EditGetFixesResult.fromJson(decoder, 'result', result);
}
@@ -648,7 +648,7 @@
options: options)
.toJson();
var result = await server.send('edit.getRefactoring', params);
- ResponseDecoder decoder = ResponseDecoder(kind);
+ var decoder = ResponseDecoder(kind);
return EditGetRefactoringResult.fromJson(decoder, 'result', result);
}
@@ -678,7 +678,7 @@
String file) async {
var params = KytheGetKytheEntriesParams(file).toJson();
var result = await server.send('kythe.getKytheEntries', params);
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
return KytheGetKytheEntriesResult.fromJson(decoder, 'result', result);
}
@@ -707,7 +707,7 @@
/// Dispatch the notification named [event], and containing parameters
/// [params], to the appropriate stream.
void dispatchNotification(String event, params) {
- ResponseDecoder decoder = ResponseDecoder(null);
+ var decoder = ResponseDecoder(null);
switch (event) {
case 'plugin.error':
outOfTestExpect(params, isPluginErrorParams);
diff --git a/pkg/analyzer_plugin/test/integration/support/integration_tests.dart b/pkg/analyzer_plugin/test/integration/support/integration_tests.dart
index 5d03ac8..3d3391c 100644
--- a/pkg/analyzer_plugin/test/integration/support/integration_tests.dart
+++ b/pkg/analyzer_plugin/test/integration/support/integration_tests.dart
@@ -140,7 +140,7 @@
onAnalysisErrors.listen((AnalysisErrorsParams params) {
currentAnalysisErrors[params.file] = params.errors;
});
- Completer serverConnected = Completer();
+ var serverConnected = Completer();
// TODO(brianwilkerson) Implement this.
// onServerConnected.listen((_) {
// outOfTestExpect(serverConnected.isCompleted, isFalse);
@@ -184,7 +184,7 @@
/// then also enable [SERVER_STATUS] notifications so that [analysisFinished]
/// can be used.
Future standardAnalysisSetup({bool subscribeStatus = true}) {
- List<Future> futures = <Future>[];
+ var futures = <Future>[];
// TODO(brianwilkerson) Implement this.
// if (subscribeStatus) {
// futures.add(sendServerSetSubscriptions([ServerService.STATUS]));
@@ -218,7 +218,7 @@
/// Return a normalized path to the file (with symbolic links resolved).
String writeFile(String pathname, String contents) {
Directory(dirname(pathname)).createSync(recursive: true);
- File file = File(pathname);
+ var file = File(pathname);
file.writeAsStringSync(contents);
return file.resolveSymbolicLinksSync();
}
@@ -400,7 +400,7 @@
return;
}
_debuggingStdio = true;
- for (String line in _recordedStdio) {
+ for (var line in _recordedStdio) {
print(line);
}
}
@@ -409,7 +409,7 @@
/// upward to the 'test' dir, and then going up one more directory.
String findRoot(String pathname) {
while (!['benchmark', 'test'].contains(basename(pathname))) {
- String parent = dirname(pathname);
+ var parent = dirname(pathname);
if (parent.length >= pathname.length) {
throw Exception("Can't find root directory");
}
@@ -440,7 +440,7 @@
.transform(LineSplitter())
.listen((String line) {
lastCommunicationTime = currentElapseTime;
- String trimmedLine = line.trim();
+ var trimmedLine = line.trim();
if (trimmedLine.startsWith('Observatory listening on ')) {
return;
}
@@ -453,11 +453,11 @@
return;
}
outOfTestExpect(message, isMap);
- Map messageAsMap = message as Map;
+ var messageAsMap = message as Map;
if (messageAsMap.containsKey('id')) {
outOfTestExpect(messageAsMap['id'], isString);
- String id = message['id'] as String;
- Completer completer = _pendingCommands[id];
+ var id = message['id'] as String;
+ var completer = _pendingCommands[id];
if (completer == null) {
fail('Unexpected response from server: id=$id');
} else {
@@ -489,7 +489,7 @@
.transform((Utf8Codec()).decoder)
.transform(LineSplitter())
.listen((String line) {
- String trimmedLine = line.trim();
+ var trimmedLine = line.trim();
_recordStdio('ERR: $trimmedLine');
_badDataFromServer('Message received on stderr', silent: true);
});
@@ -502,17 +502,14 @@
/// field from the response. If the server acknowledges the command with an
/// error response, the future will be completed with an error.
Future send(String method, Map<String, dynamic> params) {
- String id = '${_nextId++}';
- Map<String, dynamic> command = <String, dynamic>{
- 'id': id,
- 'method': method
- };
+ var id = '${_nextId++}';
+ var command = <String, dynamic>{'id': id, 'method': method};
if (params != null) {
command['params'] = params;
}
- Completer completer = Completer();
+ var completer = Completer();
_pendingCommands[id] = completer;
- String line = json.encode(command);
+ var line = json.encode(command);
_recordStdio('SEND: $line');
_process.stdin.add(utf8.encoder.convert('$line\n'));
return completer.future;
@@ -534,11 +531,11 @@
throw Exception('Process already started');
}
_time.start();
- String dartBinary = Platform.executable;
- String rootDir =
+ var dartBinary = Platform.executable;
+ var rootDir =
findRoot(Platform.script.toFilePath(windows: Platform.isWindows));
- String serverPath = normalize(join(rootDir, 'bin', 'server.dart'));
- List<String> arguments = [];
+ var serverPath = normalize(join(rootDir, 'bin', 'server.dart'));
+ var arguments = <String>[];
//
// Add VM arguments.
//
@@ -614,7 +611,7 @@
/// Record a message that was exchanged with the server, and print it out if
/// [debugStdio] has been called.
void _recordStdio(String line) {
- double elapsedTime = currentElapseTime;
+ var elapsedTime = currentElapseTime;
line = '$elapsedTime: $line';
if (_debuggingStdio) {
print(line);
@@ -721,7 +718,7 @@
@override
Description describe(Description description) {
- for (int i = 0; i < choiceMatchers.length; i++) {
+ for (var i = 0; i < choiceMatchers.length; i++) {
if (i != 0) {
if (choiceMatchers.length == 2) {
description = description.add(' or ');
@@ -739,8 +736,8 @@
@override
bool matches(item, Map matchState) {
- for (Matcher choiceMatcher in choiceMatchers) {
- Map subState = {};
+ for (var choiceMatcher in choiceMatchers) {
+ var subState = {};
if (choiceMatcher.matches(item, subState)) {
return true;
}
@@ -763,14 +760,14 @@
Matcher matcher,
List<MismatchDescriber> mismatches,
Description Function(Description description) describeSubstructure) {
- Map subState = {};
+ var subState = {};
if (!matcher.matches(item, subState)) {
mismatches.add((Description mismatchDescription) {
mismatchDescription = mismatchDescription.add('contains malformed ');
mismatchDescription = describeSubstructure(mismatchDescription);
mismatchDescription =
mismatchDescription.add(' (should be ').addDescriptionOf(matcher);
- String subDescription = matcher
+ var subDescription = matcher
.describeMismatch(item, StringDescription(), subState, false)
.toString();
if (subDescription.isNotEmpty) {
@@ -785,11 +782,10 @@
@override
Description describeMismatch(
item, Description mismatchDescription, Map matchState, bool verbose) {
- List<MismatchDescriber> mismatches =
- matchState['mismatches'] as List<MismatchDescriber>;
+ var mismatches = matchState['mismatches'] as List<MismatchDescriber>;
if (mismatches != null) {
- for (int i = 0; i < mismatches.length; i++) {
- MismatchDescriber mismatch = mismatches[i];
+ for (var i = 0; i < mismatches.length; i++) {
+ var mismatch = mismatches[i];
if (i > 0) {
if (mismatches.length == 2) {
mismatchDescription = mismatchDescription.add(' and ');
@@ -810,7 +806,7 @@
@override
bool matches(item, Map matchState) {
- List<MismatchDescriber> mismatches = <MismatchDescriber>[];
+ var mismatches = <MismatchDescriber>[];
populateMismatches(item, mismatches);
if (mismatches.isEmpty) {
return true;
diff --git a/pkg/analyzer_plugin/test/plugin/assist_mixin_test.dart b/pkg/analyzer_plugin/test/plugin/assist_mixin_test.dart
index cb6bfc8..ea37ec5 100644
--- a/pkg/analyzer_plugin/test/plugin/assist_mixin_test.dart
+++ b/pkg/analyzer_plugin/test/plugin/assist_mixin_test.dart
@@ -44,7 +44,7 @@
await plugin.handleAnalysisSetContextRoots(
AnalysisSetContextRootsParams([contextRoot1]));
- EditGetAssistsResult result = await plugin
+ var result = await plugin
.handleEditGetAssists(EditGetAssistsParams(filePath1, 10, 0));
expect(result, isNotNull);
expect(result.assists, hasLength(3));
@@ -58,7 +58,7 @@
@override
void computeAssists(AssistRequest request, AssistCollector collector) {
- for (PrioritizedSourceChange change in changes) {
+ for (var change in changes) {
collector.addAssist(change);
}
}
diff --git a/pkg/analyzer_plugin/test/plugin/completion_mixin_test.dart b/pkg/analyzer_plugin/test/plugin/completion_mixin_test.dart
index 33f2bec..13dcb82 100644
--- a/pkg/analyzer_plugin/test/plugin/completion_mixin_test.dart
+++ b/pkg/analyzer_plugin/test/plugin/completion_mixin_test.dart
@@ -44,9 +44,8 @@
await plugin.handleAnalysisSetContextRoots(
AnalysisSetContextRootsParams([contextRoot1]));
- CompletionGetSuggestionsResult result =
- await plugin.handleCompletionGetSuggestions(
- CompletionGetSuggestionsParams(filePath1, 13));
+ var result = await plugin.handleCompletionGetSuggestions(
+ CompletionGetSuggestionsParams(filePath1, 13));
expect(result, isNotNull);
expect(result.results, hasLength(3));
}
@@ -64,7 +63,7 @@
collector.offset = 1;
collector.length = 2;
}
- for (CompletionSuggestion suggestion in suggestions) {
+ for (var suggestion in suggestions) {
collector.addSuggestion(suggestion);
}
}
diff --git a/pkg/analyzer_plugin/test/plugin/fix_mixin_test.dart b/pkg/analyzer_plugin/test/plugin/fix_mixin_test.dart
index 9138f9e..8e35430 100644
--- a/pkg/analyzer_plugin/test/plugin/fix_mixin_test.dart
+++ b/pkg/analyzer_plugin/test/plugin/fix_mixin_test.dart
@@ -48,10 +48,10 @@
await plugin.handleAnalysisSetContextRoots(
AnalysisSetContextRootsParams([contextRoot1]));
- EditGetFixesResult result =
+ var result =
await plugin.handleEditGetFixes(EditGetFixesParams(filePath1, 13));
expect(result, isNotNull);
- List<AnalysisErrorFixes> fixes = result.fixes;
+ var fixes = result.fixes;
expect(fixes, hasLength(1));
expect(fixes[0].fixes, hasLength(3));
}
@@ -64,7 +64,7 @@
@override
void computeFixes(FixesRequest request, FixCollector collector) {
- for (PrioritizedSourceChange change in changes) {
+ for (var change in changes) {
collector.addFix(request.errorsToFix[0], change);
}
}
@@ -89,8 +89,8 @@
@override
Future<FixesRequest> getFixesRequest(EditGetFixesParams parameters) async {
- int offset = parameters.offset;
- AnalysisError error = AnalysisError(
+ var offset = parameters.offset;
+ var error = AnalysisError(
MockSource(), 0, 0, CompileTimeErrorCode.AWAIT_IN_WRONG_CONTEXT);
var result =
MockResolvedUnitResult(lineInfo: LineInfo([0, 20]), errors: [error]);
diff --git a/pkg/analyzer_plugin/test/plugin/folding_mixin_test.dart b/pkg/analyzer_plugin/test/plugin/folding_mixin_test.dart
index fc5879c..0b2f063 100644
--- a/pkg/analyzer_plugin/test/plugin/folding_mixin_test.dart
+++ b/pkg/analyzer_plugin/test/plugin/folding_mixin_test.dart
@@ -45,13 +45,12 @@
await plugin.handleAnalysisSetContextRoots(
AnalysisSetContextRootsParams([contextRoot1]));
- Completer<void> notificationReceived = Completer<void>();
+ var notificationReceived = Completer<void>();
channel.listen(null, onNotification: (Notification notification) {
expect(notification, isNotNull);
- AnalysisFoldingParams params =
- AnalysisFoldingParams.fromNotification(notification);
+ var params = AnalysisFoldingParams.fromNotification(notification);
expect(params.file, filePath1);
- List<FoldingRegion> regions = params.regions;
+ var regions = params.regions;
expect(regions, hasLength(7));
notificationReceived.complete();
});
@@ -67,7 +66,7 @@
@override
void computeFolding(FoldingRequest request, FoldingCollector collector) {
- for (int i = 0; i < regionCount; i++) {
+ for (var i = 0; i < regionCount; i++) {
collector.addRegion(i * 20, 10, FoldingKind.FILE_HEADER);
}
}
diff --git a/pkg/analyzer_plugin/test/plugin/highlights_mixin_test.dart b/pkg/analyzer_plugin/test/plugin/highlights_mixin_test.dart
index 708df39..98e39d5 100644
--- a/pkg/analyzer_plugin/test/plugin/highlights_mixin_test.dart
+++ b/pkg/analyzer_plugin/test/plugin/highlights_mixin_test.dart
@@ -45,11 +45,10 @@
await plugin.handleAnalysisSetContextRoots(
AnalysisSetContextRootsParams([contextRoot1]));
- Completer<void> notificationReceived = Completer<void>();
+ var notificationReceived = Completer<void>();
channel.listen(null, onNotification: (Notification notification) {
expect(notification, isNotNull);
- AnalysisHighlightsParams params =
- AnalysisHighlightsParams.fromNotification(notification);
+ var params = AnalysisHighlightsParams.fromNotification(notification);
expect(params.file, filePath1);
expect(params.regions, hasLength(5));
notificationReceived.complete();
@@ -67,7 +66,7 @@
@override
void computeHighlights(
HighlightsRequest request, HighlightsCollector collector) {
- for (int i = 0; i < elementCount; i++) {
+ for (var i = 0; i < elementCount; i++) {
collector.addRegion(i, 20, HighlightRegionType.METHOD_DECLARATION);
}
}
diff --git a/pkg/analyzer_plugin/test/plugin/kythe_mixin_test.dart b/pkg/analyzer_plugin/test/plugin/kythe_mixin_test.dart
index 2ebb6fa..f6b211f 100644
--- a/pkg/analyzer_plugin/test/plugin/kythe_mixin_test.dart
+++ b/pkg/analyzer_plugin/test/plugin/kythe_mixin_test.dart
@@ -44,7 +44,7 @@
await plugin.handleAnalysisSetContextRoots(
AnalysisSetContextRootsParams([contextRoot1]));
- KytheGetKytheEntriesResult result = await plugin
+ var result = await plugin
.handleKytheGetKytheEntries(KytheGetKytheEntriesParams(filePath1));
expect(result, isNotNull);
expect(result.entries, hasLength(3));
@@ -58,7 +58,7 @@
@override
void computeEntries(EntryRequest request, EntryCollector collector) {
- for (KytheEntry entry in entries) {
+ for (var entry in entries) {
collector.addEntry(entry);
}
}
@@ -74,7 +74,7 @@
@override
List<EntryContributor> getEntryContributors(String path) {
- KytheVName vName = KytheVName('', '', '', '', '');
+ var vName = KytheVName('', '', '', '', '');
return <EntryContributor>[
_TestEntryContributor(<KytheEntry>[
KytheEntry(vName, '', target: vName),
diff --git a/pkg/analyzer_plugin/test/plugin/mocks.dart b/pkg/analyzer_plugin/test/plugin/mocks.dart
index 93409de..8f18c06 100644
--- a/pkg/analyzer_plugin/test/plugin/mocks.dart
+++ b/pkg/analyzer_plugin/test/plugin/mocks.dart
@@ -112,9 +112,9 @@
if (_onRequest == null) {
fail('Unexpected invocation of sendNotification');
}
- String id = (idCounter++).toString();
- Request request = params.toRequest(id);
- Completer<Response> completer = Completer<Response>();
+ var id = (idCounter++).toString();
+ var request = params.toRequest(id);
+ var completer = Completer<Response>();
completers[request.id] = completer;
_onRequest(request);
return completer.future;
@@ -125,7 +125,7 @@
if (_closed) {
throw StateError('Sent a response to a closed channel');
}
- Completer<Response> completer = completers.remove(response.id);
+ var completer = completers.remove(response.id);
completer.complete(response);
}
}
diff --git a/pkg/analyzer_plugin/test/plugin/navigation_mixin_test.dart b/pkg/analyzer_plugin/test/plugin/navigation_mixin_test.dart
index 51107a6..9763b14 100644
--- a/pkg/analyzer_plugin/test/plugin/navigation_mixin_test.dart
+++ b/pkg/analyzer_plugin/test/plugin/navigation_mixin_test.dart
@@ -45,9 +45,8 @@
await plugin.handleAnalysisSetContextRoots(
AnalysisSetContextRootsParams([contextRoot1]));
- AnalysisGetNavigationResult result =
- await plugin.handleAnalysisGetNavigation(
- AnalysisGetNavigationParams(filePath1, 1, 2));
+ var result = await plugin.handleAnalysisGetNavigation(
+ AnalysisGetNavigationParams(filePath1, 1, 2));
expect(result, isNotNull);
expect(result.files, hasLength(1));
expect(result.targets, hasLength(1));
@@ -58,11 +57,10 @@
await plugin.handleAnalysisSetContextRoots(
AnalysisSetContextRootsParams([contextRoot1]));
- Completer<void> notificationReceived = Completer<void>();
+ var notificationReceived = Completer<void>();
channel.listen(null, onNotification: (Notification notification) {
expect(notification, isNotNull);
- AnalysisNavigationParams params =
- AnalysisNavigationParams.fromNotification(notification);
+ var params = AnalysisNavigationParams.fromNotification(notification);
expect(params.files, hasLength(1));
expect(params.targets, hasLength(1));
expect(params.regions, hasLength(2));
@@ -81,7 +79,7 @@
@override
void computeNavigation(
NavigationRequest request, NavigationCollector collector) {
- for (int i = 0; i < regionCount; i++) {
+ for (var i = 0; i < regionCount; i++) {
collector.addRegion(i, 5, ElementKind.METHOD, Location('a', 5, 5, 1, 5));
}
}
diff --git a/pkg/analyzer_plugin/test/plugin/occurrences_mixin_test.dart b/pkg/analyzer_plugin/test/plugin/occurrences_mixin_test.dart
index cc88fbb..e0159c1 100644
--- a/pkg/analyzer_plugin/test/plugin/occurrences_mixin_test.dart
+++ b/pkg/analyzer_plugin/test/plugin/occurrences_mixin_test.dart
@@ -45,17 +45,16 @@
await plugin.handleAnalysisSetContextRoots(
AnalysisSetContextRootsParams([contextRoot1]));
- Completer<void> notificationReceived = Completer<void>();
+ var notificationReceived = Completer<void>();
channel.listen(null, onNotification: (Notification notification) {
expect(notification, isNotNull);
- AnalysisOccurrencesParams params =
- AnalysisOccurrencesParams.fromNotification(notification);
+ var params = AnalysisOccurrencesParams.fromNotification(notification);
expect(params.file, filePath1);
- List<Occurrences> occurrenceList = params.occurrences;
+ var occurrenceList = params.occurrences;
expect(occurrenceList, hasLength(3));
void validate(String elementName, List<int> expectedOffsets) {
- for (Occurrences occurrences in occurrenceList) {
+ for (var occurrences in occurrenceList) {
if (occurrences.element.name == elementName) {
expect(occurrences.offsets, expectedOffsets);
expect(occurrences.length, elementName.length);
@@ -84,7 +83,7 @@
void computeOccurrences(
OccurrencesRequest request, OccurrencesCollector collector) {
elements.forEach((element, offsets) {
- for (int offset in offsets) {
+ for (var offset in offsets) {
collector.addOccurrence(element, offset);
}
});
@@ -97,9 +96,9 @@
@override
List<OccurrencesContributor> getOccurrencesContributors(String path) {
- Element element1 = Element(ElementKind.METHOD, 'method', 0);
- Element element2 = Element(ElementKind.CLASS, 'C', 0);
- Element element3 = Element(ElementKind.LOCAL_VARIABLE, 'local', 0);
+ var element1 = Element(ElementKind.METHOD, 'method', 0);
+ var element2 = Element(ElementKind.CLASS, 'C', 0);
+ var element3 = Element(ElementKind.LOCAL_VARIABLE, 'local', 0);
return <OccurrencesContributor>[
_TestOccurrencesContributor({
element1: [10, 30],
diff --git a/pkg/analyzer_plugin/test/plugin/outline_mixin_test.dart b/pkg/analyzer_plugin/test/plugin/outline_mixin_test.dart
index bdf0fc5..f3510165 100644
--- a/pkg/analyzer_plugin/test/plugin/outline_mixin_test.dart
+++ b/pkg/analyzer_plugin/test/plugin/outline_mixin_test.dart
@@ -45,11 +45,10 @@
await plugin.handleAnalysisSetContextRoots(
AnalysisSetContextRootsParams([contextRoot1]));
- Completer<void> notificationReceived = Completer<void>();
+ var notificationReceived = Completer<void>();
channel.listen(null, onNotification: (Notification notification) {
expect(notification, isNotNull);
- AnalysisOutlineParams params =
- AnalysisOutlineParams.fromNotification(notification);
+ var params = AnalysisOutlineParams.fromNotification(notification);
expect(params.file, filePath1);
expect(params.outline, hasLength(3));
notificationReceived.complete();
@@ -66,7 +65,7 @@
@override
void computeOutline(OutlineRequest request, OutlineCollector collector) {
- for (int i = 0; i < elementCount; i++) {
+ for (var i = 0; i < elementCount; i++) {
collector.startElement(Element(ElementKind.METHOD, 'm$i', 0), 20 * i, 20);
collector.endElement();
}
diff --git a/pkg/analyzer_plugin/test/plugin/plugin_test.dart b/pkg/analyzer_plugin/test/plugin/plugin_test.dart
index 939f971..0826036 100644
--- a/pkg/analyzer_plugin/test/plugin/plugin_test.dart
+++ b/pkg/analyzer_plugin/test/plugin/plugin_test.dart
@@ -82,7 +82,7 @@
var result = await plugin.handleAnalysisSetContextRoots(
AnalysisSetContextRootsParams([contextRoot1]));
expect(result, isNotNull);
- AnalysisDriverGeneric driver = _getDriver(contextRoot1);
+ var driver = _getDriver(contextRoot1);
expect(driver, isNotNull);
expect((driver as MockAnalysisDriver).addedFiles, hasLength(1));
}
@@ -101,7 +101,7 @@
AnalysisSetContextRootsParams([contextRoot1]));
expect(plugin.subscriptionManager.servicesForFile(filePath1), isEmpty);
- AnalysisSetSubscriptionsResult result = await plugin
+ var result = await plugin
.handleAnalysisSetSubscriptions(AnalysisSetSubscriptionsParams({
AnalysisService.OUTLINE: [filePath1]
}));
@@ -159,9 +159,8 @@
await plugin.handleAnalysisSetContextRoots(
AnalysisSetContextRootsParams([contextRoot1]));
- CompletionGetSuggestionsResult result =
- await plugin.handleCompletionGetSuggestions(
- CompletionGetSuggestionsParams(filePath1, 12));
+ var result = await plugin.handleCompletionGetSuggestions(
+ CompletionGetSuggestionsParams(filePath1, 12));
expect(result, isNotNull);
}
@@ -169,7 +168,7 @@
await plugin.handleAnalysisSetContextRoots(
AnalysisSetContextRootsParams([contextRoot1]));
- EditGetAssistsResult result = await plugin
+ var result = await plugin
.handleEditGetAssists(EditGetAssistsParams(filePath1, 10, 0));
expect(result, isNotNull);
}
@@ -178,9 +177,8 @@
await plugin.handleAnalysisSetContextRoots(
AnalysisSetContextRootsParams([contextRoot1]));
- EditGetAvailableRefactoringsResult result =
- await plugin.handleEditGetAvailableRefactorings(
- EditGetAvailableRefactoringsParams(filePath1, 10, 0));
+ var result = await plugin.handleEditGetAvailableRefactorings(
+ EditGetAvailableRefactoringsParams(filePath1, 10, 0));
expect(result, isNotNull);
}
@@ -188,7 +186,7 @@
await plugin.handleAnalysisSetContextRoots(
AnalysisSetContextRootsParams([contextRoot1]));
- EditGetFixesResult result =
+ var result =
await plugin.handleEditGetFixes(EditGetFixesParams(filePath1, 13));
expect(result, isNotNull);
}
@@ -198,9 +196,8 @@
await plugin.handleAnalysisSetContextRoots(
AnalysisSetContextRootsParams([contextRoot1]));
- EditGetRefactoringResult result = await plugin.handleEditGetRefactoring(
- EditGetRefactoringParams(
- RefactoringKind.RENAME, filePath1, 7, 0, false));
+ var result = await plugin.handleEditGetRefactoring(EditGetRefactoringParams(
+ RefactoringKind.RENAME, filePath1, 7, 0, false));
expect(result, isNotNull);
}
@@ -210,7 +207,7 @@
}
Future<void> test_handlePluginVersionCheck() async {
- PluginVersionCheckResult result = await plugin.handlePluginVersionCheck(
+ var result = await plugin.handlePluginVersionCheck(
PluginVersionCheckParams('byteStorePath', 'sdkPath', '0.1.0'));
expect(result, isNotNull);
expect(result.interestingFiles, ['*.dart']);
@@ -247,7 +244,7 @@
var result = await channel
.sendRequest(AnalysisSetContextRootsParams([contextRoot1]));
expect(result, isNotNull);
- AnalysisDriverGeneric driver = _getDriver(contextRoot1);
+ var driver = _getDriver(contextRoot1);
expect(driver, isNotNull);
expect((driver as MockAnalysisDriver).addedFiles, hasLength(1));
}
@@ -333,8 +330,7 @@
Future<void> test_onRequest_pluginVersionCheck() async {
var response = (await channel.sendRequest(
PluginVersionCheckParams('byteStorePath', 'sdkPath', '0.1.0')));
- PluginVersionCheckResult result =
- PluginVersionCheckResult.fromResponse(response);
+ var result = PluginVersionCheckResult.fromResponse(response);
expect(result, isNotNull);
expect(result.interestingFiles, ['*.dart']);
expect(result.isCompatible, isTrue);
@@ -343,31 +339,30 @@
}
void test_sendNotificationsForFile() {
- AnalysisService service1 = AnalysisService.FOLDING;
- AnalysisService service2 = AnalysisService.NAVIGATION;
- AnalysisService service3 = AnalysisService.OUTLINE;
+ var service1 = AnalysisService.FOLDING;
+ var service2 = AnalysisService.NAVIGATION;
+ var service3 = AnalysisService.OUTLINE;
plugin.subscriptionManager.setSubscriptions({
service1: [filePath1, filePath2],
service2: [filePath1],
service3: [filePath2]
});
plugin.sendNotificationsForFile(filePath1);
- Map<String, List<AnalysisService>> notifications = plugin.sentNotifications;
+ var notifications = plugin.sentNotifications;
expect(notifications, hasLength(1));
- List<AnalysisService> services = notifications[filePath1];
+ var services = notifications[filePath1];
expect(services, unorderedEquals([service1, service2]));
}
void test_sendNotificationsForSubscriptions() {
- Map<String, List<AnalysisService>> subscriptions =
- <String, List<AnalysisService>>{};
+ var subscriptions = <String, List<AnalysisService>>{};
plugin.sendNotificationsForSubscriptions(subscriptions);
- Map<String, List<AnalysisService>> notifications = plugin.sentNotifications;
+ var notifications = plugin.sentNotifications;
expect(notifications, hasLength(subscriptions.length));
- for (String path in subscriptions.keys) {
- List<AnalysisService> subscribedServices = subscriptions[path];
- List<AnalysisService> notifiedServices = notifications[path];
+ for (var path in subscriptions.keys) {
+ var subscribedServices = subscriptions[path];
+ var notifiedServices = notifications[path];
expect(notifiedServices, isNotNull,
reason: 'Not notified for file $path');
expect(notifiedServices, unorderedEquals(subscribedServices),
@@ -376,7 +371,7 @@
}
AnalysisDriverGeneric _getDriver(ContextRoot targetRoot) {
- for (ContextRoot root in plugin.driverMap.keys) {
+ for (var root in plugin.driverMap.keys) {
if (root.root == targetRoot.root) {
return plugin.driverMap[root];
}
diff --git a/pkg/analyzer_plugin/test/src/channel/isolate_channel_test.dart b/pkg/analyzer_plugin/test/src/channel/isolate_channel_test.dart
index 3094193..5db397a 100644
--- a/pkg/analyzer_plugin/test/src/channel/isolate_channel_test.dart
+++ b/pkg/analyzer_plugin/test/src/channel/isolate_channel_test.dart
@@ -38,7 +38,7 @@
@failingTest
Future<void> test_close() async {
- bool done = false;
+ var done = false;
channel.listen((Request request) {}, onDone: () {
done = true;
});
@@ -50,7 +50,7 @@
}
Future<void> test_listen() async {
- Request sentRequest = PluginShutdownParams().toRequest('5');
+ var sentRequest = PluginShutdownParams().toRequest('5');
Request receivedRequest;
channel.listen((Request request) {
receivedRequest = request;
@@ -61,15 +61,14 @@
}
void test_sendNotification() {
- Notification notification =
- PluginErrorParams(false, '', '').toNotification();
+ var notification = PluginErrorParams(false, '', '').toNotification();
channel.sendNotification(notification);
expect(sendPort.sentMessages, hasLength(1));
expect(sendPort.sentMessages[0], notification.toJson());
}
void test_sendResponse() {
- Response response = PluginShutdownResult().toResponse('3', 1);
+ var response = PluginShutdownResult().toResponse('3', 1);
channel.sendResponse(response);
expect(sendPort.sentMessages, hasLength(1));
expect(sendPort.sentMessages[0], response.toJson());
diff --git a/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_core_test.dart b/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_core_test.dart
index f4dd95c..866a7a2 100644
--- a/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_core_test.dart
+++ b/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_core_test.dart
@@ -21,34 +21,33 @@
@reflectiveTest
class ChangeBuilderImplTest {
Future<void> test_createFileEditBuilder() async {
- ChangeBuilderImpl builder = ChangeBuilderImpl();
- String path = '/test.dart';
- FileEditBuilderImpl fileEditBuilder =
- await builder.createFileEditBuilder(path);
+ var builder = ChangeBuilderImpl();
+ var path = '/test.dart';
+ var fileEditBuilder = await builder.createFileEditBuilder(path);
expect(fileEditBuilder, const TypeMatcher<FileEditBuilder>());
- SourceFileEdit fileEdit = fileEditBuilder.fileEdit;
+ var fileEdit = fileEditBuilder.fileEdit;
expect(fileEdit.file, path);
}
void test_getLinkedEditGroup() {
- ChangeBuilderImpl builder = ChangeBuilderImpl();
- LinkedEditGroup group = builder.getLinkedEditGroup('a');
+ var builder = ChangeBuilderImpl();
+ var group = builder.getLinkedEditGroup('a');
expect(identical(builder.getLinkedEditGroup('b'), group), isFalse);
expect(identical(builder.getLinkedEditGroup('a'), group), isTrue);
}
void test_setSelection() {
- Position position = Position('test.dart', 3);
- ChangeBuilderImpl builder = ChangeBuilderImpl();
+ var position = Position('test.dart', 3);
+ var builder = ChangeBuilderImpl();
builder.setSelection(position);
expect(builder.sourceChange.selection, position);
}
void test_sourceChange_emptyEdit() async {
- ChangeBuilderImpl builder = ChangeBuilderImpl();
- String path = '/test.dart';
+ var builder = ChangeBuilderImpl();
+ var path = '/test.dart';
await builder.addFileEdit(path, (FileEditBuilder builder) {});
- SourceChange sourceChange = builder.sourceChange;
+ var sourceChange = builder.sourceChange;
expect(sourceChange, isNotNull);
expect(sourceChange.edits, isEmpty);
expect(sourceChange.linkedEditGroups, isEmpty);
@@ -57,8 +56,8 @@
}
void test_sourceChange_noEdits() {
- ChangeBuilderImpl builder = ChangeBuilderImpl();
- SourceChange sourceChange = builder.sourceChange;
+ var builder = ChangeBuilderImpl();
+ var sourceChange = builder.sourceChange;
expect(sourceChange, isNotNull);
expect(sourceChange.edits, isEmpty);
expect(sourceChange.linkedEditGroups, isEmpty);
@@ -67,13 +66,13 @@
}
Future<void> test_sourceChange_oneChange() async {
- ChangeBuilderImpl builder = ChangeBuilderImpl();
- String path = '/test.dart';
+ var builder = ChangeBuilderImpl();
+ var path = '/test.dart';
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addSimpleInsertion(0, '_');
});
builder.getLinkedEditGroup('a');
- SourceChange sourceChange = builder.sourceChange;
+ var sourceChange = builder.sourceChange;
expect(sourceChange, isNotNull);
expect(sourceChange.edits, hasLength(1));
expect(sourceChange.linkedEditGroups, hasLength(1));
@@ -87,58 +86,58 @@
String path = '/test.dart';
Future<void> test_addLinkedEdit() async {
- ChangeBuilderImpl builder = ChangeBuilderImpl();
- int offset = 10;
- String text = 'content';
+ var builder = ChangeBuilderImpl();
+ var offset = 10;
+ var text = 'content';
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(10, (EditBuilder builder) {
builder.addLinkedEdit('a', (LinkedEditBuilder builder) {
builder.write(text);
});
- SourceEdit sourceEdit = (builder as EditBuilderImpl).sourceEdit;
+ var sourceEdit = (builder as EditBuilderImpl).sourceEdit;
expect(sourceEdit.replacement, text);
});
});
- SourceChange sourceChange = builder.sourceChange;
+ var sourceChange = builder.sourceChange;
expect(sourceChange, isNotNull);
- List<LinkedEditGroup> groups = sourceChange.linkedEditGroups;
+ var groups = sourceChange.linkedEditGroups;
expect(groups, hasLength(1));
- LinkedEditGroup group = groups[0];
+ var group = groups[0];
expect(group, isNotNull);
expect(group.length, text.length);
- List<Position> positions = group.positions;
+ var positions = group.positions;
expect(positions, hasLength(1));
expect(positions[0].offset, offset);
}
Future<void> test_addSimpleLinkedEdit() async {
- ChangeBuilderImpl builder = ChangeBuilderImpl();
- int offset = 10;
- String text = 'content';
+ var builder = ChangeBuilderImpl();
+ var offset = 10;
+ var text = 'content';
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(10, (EditBuilder builder) {
builder.addSimpleLinkedEdit('a', text);
- SourceEdit sourceEdit = (builder as EditBuilderImpl).sourceEdit;
+ var sourceEdit = (builder as EditBuilderImpl).sourceEdit;
expect(sourceEdit.replacement, text);
});
});
- SourceChange sourceChange = builder.sourceChange;
+ var sourceChange = builder.sourceChange;
expect(sourceChange, isNotNull);
- List<LinkedEditGroup> groups = sourceChange.linkedEditGroups;
+ var groups = sourceChange.linkedEditGroups;
expect(groups, hasLength(1));
- LinkedEditGroup group = groups[0];
+ var group = groups[0];
expect(group, isNotNull);
expect(group.length, text.length);
- List<Position> positions = group.positions;
+ var positions = group.positions;
expect(positions, hasLength(1));
expect(positions[0].offset, offset);
}
Future<void> test_createLinkedEditBuilder() async {
- ChangeBuilderImpl builder = ChangeBuilderImpl();
+ var builder = ChangeBuilderImpl();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(10, (EditBuilder builder) {
- LinkedEditBuilderImpl linkBuilder =
+ var linkBuilder =
(builder as EditBuilderImpl).createLinkedEditBuilder();
expect(linkBuilder, const TypeMatcher<LinkedEditBuilder>());
});
@@ -146,7 +145,7 @@
}
Future<void> test_selectHere() async {
- ChangeBuilderImpl builder = ChangeBuilderImpl();
+ var builder = ChangeBuilderImpl();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(10, (EditBuilder builder) {
builder.selectHere();
@@ -156,27 +155,27 @@
}
Future<void> test_write() async {
- ChangeBuilderImpl builder = ChangeBuilderImpl();
- int offset = 10;
- String text = 'write';
+ var builder = ChangeBuilderImpl();
+ var offset = 10;
+ var text = 'write';
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(offset, (EditBuilder builder) {
builder.write(text);
});
});
- SourceChange sourceChange = builder.sourceChange;
+ var sourceChange = builder.sourceChange;
expect(sourceChange, isNotNull);
- List<SourceFileEdit> fileEdits = sourceChange.edits;
+ var fileEdits = sourceChange.edits;
expect(fileEdits, hasLength(1));
- SourceFileEdit fileEdit = fileEdits[0];
+ var fileEdit = fileEdits[0];
expect(fileEdit, isNotNull);
expect(fileEdit.file, path);
- List<SourceEdit> edits = fileEdit.edits;
+ var edits = fileEdit.edits;
expect(edits, hasLength(1));
- SourceEdit edit = edits[0];
+ var edit = edits[0];
expect(edit, isNotNull);
expect(edit.offset, offset);
expect(edit.length, 0);
@@ -184,9 +183,9 @@
}
Future<void> test_writeln_withoutText() async {
- ChangeBuilderImpl builder = ChangeBuilderImpl();
- int offset = 52;
- int length = 12;
+ var builder = ChangeBuilderImpl();
+ var offset = 52;
+ var length = 12;
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addReplacement(SourceRange(offset, length),
(EditBuilder builder) {
@@ -194,18 +193,18 @@
});
});
- SourceChange sourceChange = builder.sourceChange;
+ var sourceChange = builder.sourceChange;
expect(sourceChange, isNotNull);
- List<SourceFileEdit> fileEdits = sourceChange.edits;
+ var fileEdits = sourceChange.edits;
expect(fileEdits, hasLength(1));
- SourceFileEdit fileEdit = fileEdits[0];
+ var fileEdit = fileEdits[0];
expect(fileEdit, isNotNull);
expect(fileEdit.file, path);
- List<SourceEdit> edits = fileEdit.edits;
+ var edits = fileEdit.edits;
expect(edits, hasLength(1));
- SourceEdit edit = edits[0];
+ var edit = edits[0];
expect(edit, isNotNull);
expect(edit.offset, offset);
expect(edit.length, length);
@@ -213,10 +212,10 @@
}
Future<void> test_writeln_withText() async {
- ChangeBuilderImpl builder = ChangeBuilderImpl();
- int offset = 52;
- int length = 12;
- String text = 'writeln';
+ var builder = ChangeBuilderImpl();
+ var offset = 52;
+ var length = 12;
+ var text = 'writeln';
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addReplacement(SourceRange(offset, length),
(EditBuilder builder) {
@@ -224,18 +223,18 @@
});
});
- SourceChange sourceChange = builder.sourceChange;
+ var sourceChange = builder.sourceChange;
expect(sourceChange, isNotNull);
- List<SourceFileEdit> fileEdits = sourceChange.edits;
+ var fileEdits = sourceChange.edits;
expect(fileEdits, hasLength(1));
- SourceFileEdit fileEdit = fileEdits[0];
+ var fileEdit = fileEdits[0];
expect(fileEdit, isNotNull);
expect(fileEdit.file, path);
- List<SourceEdit> edits = fileEdit.edits;
+ var edits = fileEdit.edits;
expect(edits, hasLength(1));
- SourceEdit edit = edits[0];
+ var edit = edits[0];
expect(edit, isNotNull);
expect(edit.offset, offset);
expect(edit.length, length);
@@ -249,13 +248,13 @@
String path = '/test.dart';
Future<void> test_addDeletion() async {
- int offset = 23;
- int length = 7;
- ChangeBuilderImpl builder = ChangeBuilderImpl();
+ var offset = 23;
+ var length = 7;
+ var builder = ChangeBuilderImpl();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addDeletion(SourceRange(offset, length));
});
- List<SourceEdit> edits = builder.sourceChange.edits[0].edits;
+ var edits = builder.sourceChange.edits[0].edits;
expect(edits, hasLength(1));
expect(edits[0].offset, offset);
expect(edits[0].length, length);
@@ -263,7 +262,7 @@
}
Future<void> test_addInsertion() async {
- ChangeBuilderImpl builder = ChangeBuilderImpl();
+ var builder = ChangeBuilderImpl();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(10, (EditBuilder builder) {
expect(builder, isNotNull);
@@ -272,23 +271,23 @@
}
Future<void> test_addLinkedPosition() async {
- ChangeBuilderImpl builder = ChangeBuilderImpl();
- String groupName = 'a';
+ var builder = ChangeBuilderImpl();
+ var groupName = 'a';
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addLinkedPosition(SourceRange(3, 6), groupName);
});
- LinkedEditGroup group = builder.getLinkedEditGroup(groupName);
- List<Position> positions = group.positions;
+ var group = builder.getLinkedEditGroup(groupName);
+ var positions = group.positions;
expect(positions, hasLength(1));
- Position position = positions[0];
+ var position = positions[0];
expect(position.file, path);
expect(position.offset, 3);
expect(group.length, 6);
}
Future<void> test_addReplacement() async {
- ChangeBuilderImpl builder = ChangeBuilderImpl();
+ var builder = ChangeBuilderImpl();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addReplacement(SourceRange(4, 5), (EditBuilder builder) {
expect(builder, isNotNull);
@@ -297,13 +296,13 @@
}
Future<void> test_addSimpleInsertion() async {
- int offset = 23;
- String text = 'xyz';
- ChangeBuilderImpl builder = ChangeBuilderImpl();
+ var offset = 23;
+ var text = 'xyz';
+ var builder = ChangeBuilderImpl();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addSimpleInsertion(offset, text);
});
- List<SourceEdit> edits = builder.sourceChange.edits[0].edits;
+ var edits = builder.sourceChange.edits[0].edits;
expect(edits, hasLength(1));
expect(edits[0].offset, offset);
expect(edits[0].length, 0);
@@ -311,14 +310,14 @@
}
Future<void> test_addSimpleReplacement() async {
- int offset = 23;
- int length = 7;
- String text = 'xyz';
- ChangeBuilderImpl builder = ChangeBuilderImpl();
+ var offset = 23;
+ var length = 7;
+ var text = 'xyz';
+ var builder = ChangeBuilderImpl();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addSimpleReplacement(SourceRange(offset, length), text);
});
- List<SourceEdit> edits = builder.sourceChange.edits[0].edits;
+ var edits = builder.sourceChange.edits[0].edits;
expect(edits, hasLength(1));
expect(edits[0].offset, offset);
expect(edits[0].length, length);
@@ -326,14 +325,14 @@
}
Future<void> test_createEditBuilder() async {
- ChangeBuilderImpl builder = ChangeBuilderImpl();
+ var builder = ChangeBuilderImpl();
await builder.addFileEdit(path, (FileEditBuilder builder) {
- int offset = 4;
- int length = 5;
- EditBuilderImpl editBuilder =
+ var offset = 4;
+ var length = 5;
+ var editBuilder =
(builder as FileEditBuilderImpl).createEditBuilder(offset, length);
expect(editBuilder, const TypeMatcher<EditBuilder>());
- SourceEdit sourceEdit = editBuilder.sourceEdit;
+ var sourceEdit = editBuilder.sourceEdit;
expect(sourceEdit.length, length);
expect(sourceEdit.offset, offset);
expect(sourceEdit.replacement, isEmpty);
@@ -346,8 +345,8 @@
String path = '/test.dart';
Future<void> test_addSuggestion() async {
- String groupName = 'a';
- ChangeBuilderImpl builder = ChangeBuilderImpl();
+ var groupName = 'a';
+ var builder = ChangeBuilderImpl();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(10, (EditBuilder builder) {
builder.addLinkedEdit(groupName, (LinkedEditBuilder builder) {
@@ -357,13 +356,13 @@
});
});
- LinkedEditGroup group = builder.getLinkedEditGroup(groupName);
+ var group = builder.getLinkedEditGroup(groupName);
expect(group.suggestions, hasLength(1));
}
Future<void> test_addSuggestion_zeroLength() async {
- String groupName = 'a';
- ChangeBuilderImpl builder = ChangeBuilderImpl();
+ var groupName = 'a';
+ var builder = ChangeBuilderImpl();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(10, (EditBuilder builder) {
builder.addLinkedEdit(groupName, (LinkedEditBuilder builder) {
@@ -376,8 +375,8 @@
}
Future<void> test_addSuggestions() async {
- String groupName = 'a';
- ChangeBuilderImpl builder = ChangeBuilderImpl();
+ var groupName = 'a';
+ var builder = ChangeBuilderImpl();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(10, (EditBuilder builder) {
builder.addLinkedEdit(groupName, (LinkedEditBuilder builder) {
@@ -387,7 +386,7 @@
});
});
- LinkedEditGroup group = builder.getLinkedEditGroup(groupName);
+ var group = builder.getLinkedEditGroup(groupName);
expect(group.suggestions, hasLength(2));
}
}
diff --git a/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_dart_test.dart b/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_dart_test.dart
index 4d9e76f..6be5479 100644
--- a/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_dart_test.dart
+++ b/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_dart_test.dart
@@ -4,7 +4,6 @@
import 'dart:async';
-import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/dart/element/nullability_suffix.dart';
@@ -37,13 +36,12 @@
class DartChangeBuilderImplTest extends AbstractContextTest
with DartChangeBuilderMixin {
Future<void> test_createFileEditBuilder() async {
- String path = convertPath('/home/test/lib/test.dart');
+ var path = convertPath('/home/test/lib/test.dart');
addSource(path, 'library test;');
- DartChangeBuilderImpl builder = newBuilder();
- DartFileEditBuilderImpl fileEditBuilder =
- await builder.createFileEditBuilder(path);
+ var builder = newBuilder();
+ var fileEditBuilder = await builder.createFileEditBuilder(path);
expect(fileEditBuilder, const TypeMatcher<DartFileEditBuilder>());
- SourceFileEdit fileEdit = fileEditBuilder.fileEdit;
+ var fileEdit = fileEditBuilder.fileEdit;
expect(fileEdit.file, path);
}
}
@@ -52,42 +50,42 @@
class DartEditBuilderImplTest extends AbstractContextTest
with DartChangeBuilderMixin {
Future<void> test_writeClassDeclaration_interfaces() async {
- String path = convertPath('/home/test/lib/test.dart');
+ var path = convertPath('/home/test/lib/test.dart');
addSource(path, 'class A {}');
DartType typeA = await _getType(path, 'A');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(0, (EditBuilder builder) {
(builder as DartEditBuilder)
.writeClassDeclaration('C', interfaces: [typeA]);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(
edit.replacement, equalsIgnoringWhitespace('class C implements A { }'));
}
Future<void> test_writeClassDeclaration_isAbstract() async {
- String path = convertPath('/home/test/lib/test.dart');
+ var path = convertPath('/home/test/lib/test.dart');
addSource(path, '');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(0, (EditBuilder builder) {
(builder as DartEditBuilder)
.writeClassDeclaration('C', isAbstract: true);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('abstract class C { }'));
}
Future<void> test_writeClassDeclaration_memberWriter() async {
- String path = convertPath('/home/test/lib/test.dart');
+ var path = convertPath('/home/test/lib/test.dart');
addSource(path, '');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(0, (EditBuilder builder) {
(builder as DartEditBuilder).writeClassDeclaration('C',
@@ -96,95 +94,93 @@
});
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('class C { /**/}'));
}
Future<void> test_writeClassDeclaration_mixins_noSuperclass() async {
- String path = convertPath('/home/test/lib/test.dart');
+ var path = convertPath('/home/test/lib/test.dart');
addSource(path, 'class A {}');
DartType typeA = await _getType(path, 'A');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(0, (EditBuilder builder) {
(builder as DartEditBuilder)
.writeClassDeclaration('C', mixins: [typeA]);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement,
equalsIgnoringWhitespace('class C extends Object with A { }'));
}
Future<void> test_writeClassDeclaration_mixins_superclass() async {
- String path = convertPath('/home/test/lib/test.dart');
+ var path = convertPath('/home/test/lib/test.dart');
addSource(path, 'class A {} class B {}');
DartType typeA = await _getType(path, 'A');
DartType typeB = await _getType(path, 'B');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(0, (EditBuilder builder) {
(builder as DartEditBuilder)
.writeClassDeclaration('C', mixins: [typeB], superclass: typeA);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement,
equalsIgnoringWhitespace('class C extends A with B { }'));
}
Future<void> test_writeClassDeclaration_nameGroupName() async {
- String path = convertPath('/home/test/lib/test.dart');
+ var path = convertPath('/home/test/lib/test.dart');
addSource(path, '');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(0, (EditBuilder builder) {
(builder as DartEditBuilder)
.writeClassDeclaration('C', nameGroupName: 'name');
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('class C { }'));
- List<LinkedEditGroup> linkedEditGroups =
- builder.sourceChange.linkedEditGroups;
+ var linkedEditGroups = builder.sourceChange.linkedEditGroups;
expect(linkedEditGroups, hasLength(1));
- LinkedEditGroup group = linkedEditGroups[0];
+ var group = linkedEditGroups[0];
expect(group.length, 1);
expect(group.positions, hasLength(1));
}
Future<void> test_writeClassDeclaration_superclass() async {
- String path = convertPath('/home/test/lib/test.dart');
+ var path = convertPath('/home/test/lib/test.dart');
addSource(path, 'class B {}');
DartType typeB = await _getType(path, 'B');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(0, (EditBuilder builder) {
(builder as DartEditBuilder).writeClassDeclaration('C',
superclass: typeB, superclassGroupName: 'superclass');
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('class C extends B { }'));
- List<LinkedEditGroup> linkedEditGroups =
- builder.sourceChange.linkedEditGroups;
+ var linkedEditGroups = builder.sourceChange.linkedEditGroups;
expect(linkedEditGroups, hasLength(1));
- LinkedEditGroup group = linkedEditGroups[0];
+ var group = linkedEditGroups[0];
expect(group.length, 1);
expect(group.positions, hasLength(1));
}
Future<void> test_writeConstructorDeclaration_bodyWriter() async {
- String path = convertPath('/home/test/lib/test.dart');
+ var path = convertPath('/home/test/lib/test.dart');
addSource(path, 'class C {}');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (DartFileEditBuilder builder) {
builder.addInsertion(9, (DartEditBuilder builder) {
builder.writeConstructorDeclaration('A', bodyWriter: () {
@@ -192,12 +188,12 @@
});
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('A() { print(42); }'));
}
Future<void> test_writeConstructorDeclaration_fieldNames() async {
- String path = convertPath('/home/test/lib/test.dart');
+ var path = convertPath('/home/test/lib/test.dart');
addSource(path, r'''
class C {
final int a;
@@ -205,21 +201,21 @@
}
''');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (DartFileEditBuilder builder) {
builder.addInsertion(42, (DartEditBuilder builder) {
builder.writeConstructorDeclaration('A', fieldNames: ['a', 'bb']);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('A(this.a, this.bb);'));
}
Future<void> test_writeConstructorDeclaration_initializerWriter() async {
- String path = convertPath('/home/test/lib/test.dart');
+ var path = convertPath('/home/test/lib/test.dart');
addSource(path, 'class C {}');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (DartFileEditBuilder builder) {
builder.addInsertion(9, (DartEditBuilder builder) {
builder.writeConstructorDeclaration('A', initializerWriter: () {
@@ -227,15 +223,15 @@
});
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('A() : super();'));
}
Future<void> test_writeConstructorDeclaration_parameterWriter() async {
- String path = convertPath('/home/test/lib/test.dart');
+ var path = convertPath('/home/test/lib/test.dart');
addSource(path, 'class C {}');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (DartFileEditBuilder builder) {
builder.addInsertion(9, (DartEditBuilder builder) {
builder.writeConstructorDeclaration('A', parameterWriter: () {
@@ -243,16 +239,16 @@
});
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('A(int a, {this.b});'));
}
Future<void> test_writeFieldDeclaration_initializerWriter() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {}';
addSource(path, content);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder).writeFieldDeclaration('f',
@@ -261,163 +257,161 @@
});
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('var f = e;'));
}
Future<void> test_writeFieldDeclaration_isConst() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {}';
addSource(path, content);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder).writeFieldDeclaration('f', isConst: true);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('const f;'));
}
Future<void> test_writeFieldDeclaration_isConst_isFinal() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {}';
addSource(path, content);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder)
.writeFieldDeclaration('f', isConst: true, isFinal: true);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('const f;'));
}
Future<void> test_writeFieldDeclaration_isConst_type() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {}';
addSource(path, content);
DartType typeA = await _getType(path, 'A');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder)
.writeFieldDeclaration('f', isConst: true, type: typeA);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('const A f;'));
}
Future<void> test_writeFieldDeclaration_isFinal() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {}';
addSource(path, content);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder).writeFieldDeclaration('f', isFinal: true);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('final f;'));
}
Future<void> test_writeFieldDeclaration_isFinal_type() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {}';
addSource(path, content);
DartType typeA = await _getType(path, 'A');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder)
.writeFieldDeclaration('f', isFinal: true, type: typeA);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('final A f;'));
}
Future<void> test_writeFieldDeclaration_isStatic() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {}';
addSource(path, content);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder).writeFieldDeclaration('f', isStatic: true);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('static var f;'));
}
Future<void> test_writeFieldDeclaration_nameGroupName() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {}';
addSource(path, content);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder)
.writeFieldDeclaration('f', nameGroupName: 'name');
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('var f;'));
- List<LinkedEditGroup> linkedEditGroups =
- builder.sourceChange.linkedEditGroups;
+ var linkedEditGroups = builder.sourceChange.linkedEditGroups;
expect(linkedEditGroups, hasLength(1));
- LinkedEditGroup group = linkedEditGroups[0];
+ var group = linkedEditGroups[0];
expect(group.length, 1);
expect(group.positions, hasLength(1));
- Position position = group.positions[0];
+ var position = group.positions[0];
expect(position.offset, equals(13));
}
Future<void> test_writeFieldDeclaration_type_typeGroupName() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {} class B {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {} class B {}';
addSource(path, content);
DartType typeA = await _getType(path, 'A');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder)
.writeFieldDeclaration('f', type: typeA, typeGroupName: 'type');
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('A f;'));
- List<LinkedEditGroup> linkedEditGroups =
- builder.sourceChange.linkedEditGroups;
+ var linkedEditGroups = builder.sourceChange.linkedEditGroups;
expect(linkedEditGroups, hasLength(1));
- LinkedEditGroup group = linkedEditGroups[0];
+ var group = linkedEditGroups[0];
expect(group.length, 1);
expect(group.positions, hasLength(1));
- Position position = group.positions[0];
+ var position = group.positions[0];
expect(position.offset, equals(20));
}
Future<void>
test_writeFunctionDeclaration_noReturnType_noParams_body() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = '';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = '';
addSource(path, content);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(0, (EditBuilder builder) {
(builder as DartEditBuilder).writeFunctionDeclaration('fib',
@@ -426,41 +420,40 @@
});
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('fib() { ... }'));
}
Future<void>
test_writeFunctionDeclaration_noReturnType_noParams_noBody() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = '';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = '';
addSource(path, content);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(0, (EditBuilder builder) {
(builder as DartEditBuilder)
.writeFunctionDeclaration('fib', nameGroupName: 'name');
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('fib() {}'));
- List<LinkedEditGroup> linkedEditGroups =
- builder.sourceChange.linkedEditGroups;
+ var linkedEditGroups = builder.sourceChange.linkedEditGroups;
expect(linkedEditGroups, hasLength(1));
- LinkedEditGroup group = linkedEditGroups[0];
+ var group = linkedEditGroups[0];
expect(group.length, 3);
expect(group.positions, hasLength(1));
}
Future<void>
test_writeFunctionDeclaration_noReturnType_params_noBody() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = '';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = '';
addSource(path, content);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(0, (EditBuilder builder) {
(builder as DartEditBuilder).writeFunctionDeclaration('fib',
@@ -469,42 +462,41 @@
});
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('fib(p, q, r) {}'));
}
Future<void>
test_writeFunctionDeclaration_returnType_noParams_noBody() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {}';
addSource(path, content);
DartType typeA = await _getType(path, 'A');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(0, (EditBuilder builder) {
(builder as DartEditBuilder).writeFunctionDeclaration('fib',
returnType: typeA, returnTypeGroupName: 'type');
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('A fib() => null;'));
- List<LinkedEditGroup> linkedEditGroups =
- builder.sourceChange.linkedEditGroups;
+ var linkedEditGroups = builder.sourceChange.linkedEditGroups;
expect(linkedEditGroups, hasLength(1));
- LinkedEditGroup group = linkedEditGroups[0];
+ var group = linkedEditGroups[0];
expect(group.length, 1);
expect(group.positions, hasLength(1));
}
Future<void> test_writeGetterDeclaration_bodyWriter() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {}';
addSource(path, content);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder).writeGetterDeclaration('g',
@@ -513,87 +505,85 @@
});
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('get g {}'));
}
Future<void> test_writeGetterDeclaration_isStatic() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {}';
addSource(path, content);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder)
.writeGetterDeclaration('g', isStatic: true);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('static get g => null;'));
}
Future<void> test_writeGetterDeclaration_nameGroupName() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {}';
addSource(path, content);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder)
.writeGetterDeclaration('g', nameGroupName: 'name');
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('get g => null;'));
- List<LinkedEditGroup> linkedEditGroups =
- builder.sourceChange.linkedEditGroups;
+ var linkedEditGroups = builder.sourceChange.linkedEditGroups;
expect(linkedEditGroups, hasLength(1));
- LinkedEditGroup group = linkedEditGroups[0];
+ var group = linkedEditGroups[0];
expect(group.length, 1);
expect(group.positions, hasLength(1));
- Position position = group.positions[0];
+ var position = group.positions[0];
expect(position.offset, equals(13));
}
Future<void> test_writeGetterDeclaration_returnType() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {} class B {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {} class B {}';
addSource(path, content);
DartType typeA = await _getType(path, 'A');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder).writeGetterDeclaration('g',
returnType: typeA, returnTypeGroupName: 'returnType');
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('A get g => null;'));
- List<LinkedEditGroup> linkedEditGroups =
- builder.sourceChange.linkedEditGroups;
+ var linkedEditGroups = builder.sourceChange.linkedEditGroups;
expect(linkedEditGroups, hasLength(1));
- LinkedEditGroup group = linkedEditGroups[0];
+ var group = linkedEditGroups[0];
expect(group.length, 1);
expect(group.positions, hasLength(1));
- Position position = group.positions[0];
+ var position = group.positions[0];
expect(position.offset, equals(20));
}
Future<void> test_writeLocalVariableDeclaration_noType_initializer() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = '''
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = '''
void f() {
}''';
addSource(path, content);
await driver.getResult(path);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(11, (EditBuilder builder) {
(builder as DartEditBuilder).writeLocalVariableDeclaration('foo',
@@ -602,92 +592,91 @@
});
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('var foo = null;'));
}
Future<void> test_writeLocalVariableDeclaration_noType_noInitializer() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = '''
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = '''
void f() {
}''';
addSource(path, content);
await driver.getResult(path);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(11, (EditBuilder builder) {
(builder as DartEditBuilder)
.writeLocalVariableDeclaration('foo', nameGroupName: 'name');
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('var foo;'));
- List<LinkedEditGroup> linkedEditGroups =
- builder.sourceChange.linkedEditGroups;
+ var linkedEditGroups = builder.sourceChange.linkedEditGroups;
expect(linkedEditGroups, hasLength(1));
- LinkedEditGroup group = linkedEditGroups[0];
+ var group = linkedEditGroups[0];
expect(group.length, 3);
expect(group.positions, hasLength(1));
}
Future<void>
test_writeLocalVariableDeclaration_noType_noInitializer_const() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = '''
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = '''
void f() {
}''';
addSource(path, content);
await driver.getResult(path);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(11, (EditBuilder builder) {
(builder as DartEditBuilder)
.writeLocalVariableDeclaration('foo', isConst: true);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('const foo;'));
}
Future<void>
test_writeLocalVariableDeclaration_noType_noInitializer_final() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = '''
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = '''
void f() {
}''';
addSource(path, content);
await driver.getResult(path);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(11, (EditBuilder builder) {
(builder as DartEditBuilder)
.writeLocalVariableDeclaration('foo', isFinal: true);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('final foo;'));
}
Future<void> test_writeLocalVariableDeclaration_type_initializer() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = '''
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = '''
void f() {
}
class MyClass {}''';
addSource(path, content);
- CompilationUnit unit = (await driver.getResult(path))?.unit;
+ var unit = (await driver.getResult(path))?.unit;
- ClassDeclaration A = unit.declarations[1] as ClassDeclaration;
+ var A = unit.declarations[1] as ClassDeclaration;
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(11, (EditBuilder builder) {
(builder as DartEditBuilder).writeLocalVariableDeclaration(
@@ -702,23 +691,23 @@
);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('MyClass foo = null;'));
}
Future<void> test_writeLocalVariableDeclaration_type_noInitializer() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = '''
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = '''
void f() {
}
class MyClass {}''';
addSource(path, content);
- CompilationUnit unit = (await driver.getResult(path))?.unit;
+ var unit = (await driver.getResult(path))?.unit;
- ClassDeclaration A = unit.declarations[1] as ClassDeclaration;
+ var A = unit.declarations[1] as ClassDeclaration;
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(11, (EditBuilder builder) {
(builder as DartEditBuilder).writeLocalVariableDeclaration(
@@ -731,31 +720,30 @@
);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('MyClass foo;'));
- List<LinkedEditGroup> linkedEditGroups =
- builder.sourceChange.linkedEditGroups;
+ var linkedEditGroups = builder.sourceChange.linkedEditGroups;
expect(linkedEditGroups, hasLength(1));
- LinkedEditGroup group = linkedEditGroups[0];
+ var group = linkedEditGroups[0];
expect(group.length, 7);
expect(group.positions, hasLength(1));
}
Future<void>
test_writeLocalVariableDeclaration_type_noInitializer_final() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = '''
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = '''
void f() {
}
class MyClass {}''';
addSource(path, content);
- CompilationUnit unit = (await driver.getResult(path))?.unit;
+ var unit = (await driver.getResult(path))?.unit;
- ClassDeclaration A = unit.declarations[1] as ClassDeclaration;
+ var A = unit.declarations[1] as ClassDeclaration;
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(11, (EditBuilder builder) {
(builder as DartEditBuilder).writeLocalVariableDeclaration(
@@ -769,58 +757,57 @@
);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('final MyClass foo;'));
- List<LinkedEditGroup> linkedEditGroups =
- builder.sourceChange.linkedEditGroups;
+ var linkedEditGroups = builder.sourceChange.linkedEditGroups;
expect(linkedEditGroups, hasLength(1));
- LinkedEditGroup group = linkedEditGroups[0];
+ var group = linkedEditGroups[0];
expect(group.length, 7);
expect(group.positions, hasLength(1));
}
Future<void> test_writeMixinDeclaration_interfaces() async {
- String path = convertPath('/home/test/lib/test.dart');
+ var path = convertPath('/home/test/lib/test.dart');
addSource(path, 'class A {}');
DartType typeA = await _getType(path, 'A');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(0, (EditBuilder builder) {
(builder as DartEditBuilder)
.writeMixinDeclaration('M', interfaces: [typeA]);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(
edit.replacement, equalsIgnoringWhitespace('mixin M implements A { }'));
}
Future<void>
test_writeMixinDeclaration_interfacesAndSuperclassConstraints() async {
- String path = convertPath('/home/test/lib/test.dart');
+ var path = convertPath('/home/test/lib/test.dart');
addSource(path, 'class A {} class B {}');
DartType typeA = await _getType(path, 'A');
DartType typeB = await _getType(path, 'B');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(0, (EditBuilder builder) {
(builder as DartEditBuilder).writeMixinDeclaration('M',
interfaces: [typeA], superclassConstraints: [typeB]);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement,
equalsIgnoringWhitespace('mixin M on B implements A { }'));
}
Future<void> test_writeMixinDeclaration_memberWriter() async {
- String path = convertPath('/home/test/lib/test.dart');
+ var path = convertPath('/home/test/lib/test.dart');
addSource(path, '');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(0, (EditBuilder builder) {
(builder as DartEditBuilder).writeMixinDeclaration('M',
@@ -829,82 +816,81 @@
});
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('mixin M { /**/}'));
}
Future<void> test_writeMixinDeclaration_nameGroupName() async {
- String path = convertPath('/home/test/lib/test.dart');
+ var path = convertPath('/home/test/lib/test.dart');
addSource(path, '');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(0, (EditBuilder builder) {
(builder as DartEditBuilder)
.writeMixinDeclaration('M', nameGroupName: 'name');
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('mixin M { }'));
- List<LinkedEditGroup> linkedEditGroups =
- builder.sourceChange.linkedEditGroups;
+ var linkedEditGroups = builder.sourceChange.linkedEditGroups;
expect(linkedEditGroups, hasLength(1));
- LinkedEditGroup group = linkedEditGroups[0];
+ var group = linkedEditGroups[0];
expect(group.length, 1);
expect(group.positions, hasLength(1));
}
Future<void> test_writeMixinDeclaration_superclassConstraints() async {
- String path = convertPath('/home/test/lib/test.dart');
+ var path = convertPath('/home/test/lib/test.dart');
addSource(path, 'class A {}');
DartType typeA = await _getType(path, 'A');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(0, (EditBuilder builder) {
(builder as DartEditBuilder)
.writeMixinDeclaration('M', superclassConstraints: [typeA]);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('mixin M on A { }'));
}
Future<void> test_writeParameter() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {}';
addSource(path, content);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder).writeParameter('a');
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('a'));
}
Future<void> test_writeParameter_type() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {}';
addSource(path, content);
DartType typeA = await _getType(path, 'A');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder).writeParameter('a', type: typeA);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('A a'));
}
Future<void> test_writeParameterMatchingArgument() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = r'''
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = r'''
f() {}
g() {
f(new A());
@@ -912,148 +898,142 @@
class A {}
''';
addSource(path, content);
- CompilationUnit unit = (await driver.getResult(path))?.unit;
- FunctionDeclaration g = unit.declarations[1] as FunctionDeclaration;
- BlockFunctionBody body = g.functionExpression.body as BlockFunctionBody;
- ExpressionStatement statement =
- body.block.statements[0] as ExpressionStatement;
- MethodInvocation invocation = statement.expression as MethodInvocation;
- Expression argument = invocation.argumentList.arguments[0];
+ var unit = (await driver.getResult(path))?.unit;
+ var g = unit.declarations[1] as FunctionDeclaration;
+ var body = g.functionExpression.body as BlockFunctionBody;
+ var statement = body.block.statements[0] as ExpressionStatement;
+ var invocation = statement.expression as MethodInvocation;
+ var argument = invocation.argumentList.arguments[0];
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(2, (EditBuilder builder) {
(builder as DartEditBuilder)
.writeParameterMatchingArgument(argument, 0, <String>{});
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('A a'));
}
Future<void> test_writeParameters_named() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'f(int a, {bool b = false, String c}) {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'f(int a, {bool b = false, String c}) {}';
addSource(path, content);
- CompilationUnit unit = (await driver.getResult(path))?.unit;
- FunctionDeclaration f = unit.declarations[0] as FunctionDeclaration;
- FormalParameterList parameters = f.functionExpression.parameters;
- Iterable<ParameterElement> elements =
- parameters.parameters.map((p) => p.declaredElement);
+ var unit = (await driver.getResult(path))?.unit;
+ var f = unit.declarations[0] as FunctionDeclaration;
+ var parameters = f.functionExpression.parameters;
+ var elements = parameters.parameters.map((p) => p.declaredElement);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder).writeParameters(elements);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement,
equalsIgnoringWhitespace('(int a, {bool b = false, String c})'));
}
Future<void> test_writeParameters_positional() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'f(int a, [bool b = false, String c]) {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'f(int a, [bool b = false, String c]) {}';
addSource(path, content);
- CompilationUnit unit = (await driver.getResult(path))?.unit;
- FunctionDeclaration f = unit.declarations[0] as FunctionDeclaration;
- FormalParameterList parameters = f.functionExpression.parameters;
- Iterable<ParameterElement> elements =
- parameters.parameters.map((p) => p.declaredElement);
+ var unit = (await driver.getResult(path))?.unit;
+ var f = unit.declarations[0] as FunctionDeclaration;
+ var parameters = f.functionExpression.parameters;
+ var elements = parameters.parameters.map((p) => p.declaredElement);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder).writeParameters(elements);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement,
equalsIgnoringWhitespace('(int a, [bool b = false, String c])'));
}
Future<void> test_writeParameters_required() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'f(int i, String s) {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'f(int i, String s) {}';
addSource(path, content);
- CompilationUnit unit = (await driver.getResult(path))?.unit;
- FunctionDeclaration f = unit.declarations[0] as FunctionDeclaration;
- FormalParameterList parameters = f.functionExpression.parameters;
- Iterable<ParameterElement> elements =
- parameters.parameters.map((p) => p.declaredElement);
+ var unit = (await driver.getResult(path))?.unit;
+ var f = unit.declarations[0] as FunctionDeclaration;
+ var parameters = f.functionExpression.parameters;
+ var elements = parameters.parameters.map((p) => p.declaredElement);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder).writeParameters(elements);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('(int i, String s)'));
}
Future<void> test_writeParametersMatchingArguments_named() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = '''
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = '''
f(int i, String s) {
g(s, index: i);
}''';
addSource(path, content);
- CompilationUnit unit = (await driver.getResult(path))?.unit;
- FunctionDeclaration f = unit.declarations[0] as FunctionDeclaration;
- BlockFunctionBody body = f.functionExpression.body as BlockFunctionBody;
- ExpressionStatement statement =
- body.block.statements[0] as ExpressionStatement;
- MethodInvocation invocation = statement.expression as MethodInvocation;
+ var unit = (await driver.getResult(path))?.unit;
+ var f = unit.declarations[0] as FunctionDeclaration;
+ var body = f.functionExpression.body as BlockFunctionBody;
+ var statement = body.block.statements[0] as ExpressionStatement;
+ var invocation = statement.expression as MethodInvocation;
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder)
.writeParametersMatchingArguments(invocation.argumentList);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('String s, {int index}'));
}
Future<void> test_writeParametersMatchingArguments_required() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = '''
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = '''
f(int i, String s) {
g(s, i);
}''';
addSource(path, content);
- CompilationUnit unit = (await driver.getResult(path))?.unit;
- FunctionDeclaration f = unit.declarations[0] as FunctionDeclaration;
- BlockFunctionBody body = f.functionExpression.body as BlockFunctionBody;
- ExpressionStatement statement =
- body.block.statements[0] as ExpressionStatement;
- MethodInvocation invocation = statement.expression as MethodInvocation;
+ var unit = (await driver.getResult(path))?.unit;
+ var f = unit.declarations[0] as FunctionDeclaration;
+ var body = f.functionExpression.body as BlockFunctionBody;
+ var statement = body.block.statements[0] as ExpressionStatement;
+ var invocation = statement.expression as MethodInvocation;
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder)
.writeParametersMatchingArguments(invocation.argumentList);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('String s, int i'));
}
Future<void> test_writeReference_method() async {
- String aPath = convertPath('/a.dart');
+ var aPath = convertPath('/a.dart');
addSource(aPath, r'''
class A {
void foo() {}
}
''');
- String path = convertPath('/home/test/lib/test.dart');
- String content = r'''
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = r'''
import 'a.dart';
''';
addSource(path, content);
@@ -1061,88 +1041,88 @@
var aElement = await _getClassElement(aPath, 'A');
var fooElement = aElement.methods[0];
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (DartFileEditBuilder builder) {
builder.addInsertion(content.length - 1, (DartEditBuilder builder) {
builder.writeReference(fooElement);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('foo'));
}
Future<void> test_writeReference_topLevel_hasImport_noPrefix() async {
- String aPath = convertPath('/home/test/lib/a.dart');
+ var aPath = convertPath('/home/test/lib/a.dart');
addSource(aPath, 'const a = 42;');
- String path = convertPath('/home/test/lib/test.dart');
- String content = r'''
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = r'''
import 'a.dart';
''';
addSource(path, content);
var aElement = await _getTopLevelAccessorElement(aPath, 'a');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (DartFileEditBuilder builder) {
builder.addInsertion(content.length - 1, (DartEditBuilder builder) {
builder.writeReference(aElement);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('a'));
}
Future<void> test_writeReference_topLevel_hasImport_prefix() async {
- String aPath = convertPath('/home/test/lib/a.dart');
+ var aPath = convertPath('/home/test/lib/a.dart');
addSource(aPath, 'const a = 42;');
- String path = convertPath('/home/test/lib/test.dart');
- String content = r'''
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = r'''
import 'a.dart' as p;
''';
addSource(path, content);
var aElement = await _getTopLevelAccessorElement(aPath, 'a');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (DartFileEditBuilder builder) {
builder.addInsertion(content.length - 1, (DartEditBuilder builder) {
builder.writeReference(aElement);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('p.a'));
}
Future<void> test_writeReference_topLevel_noImport() async {
- String aPath = convertPath('/home/test/bin/a.dart');
+ var aPath = convertPath('/home/test/bin/a.dart');
addSource(aPath, 'const a = 42;');
- String path = convertPath('/home/test/bin/test.dart');
- String content = '';
+ var path = convertPath('/home/test/bin/test.dart');
+ var content = '';
addSource(path, content);
var aElement = await _getTopLevelAccessorElement(aPath, 'a');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (DartFileEditBuilder builder) {
builder.addInsertion(content.length - 1, (DartEditBuilder builder) {
builder.writeReference(aElement);
});
});
- List<SourceEdit> edits = getEdits(builder);
+ var edits = getEdits(builder);
expect(edits, hasLength(2));
expect(edits[0].replacement, equalsIgnoringWhitespace("import 'a.dart';"));
expect(edits[1].replacement, equalsIgnoringWhitespace('a'));
}
Future<void> test_writeSetterDeclaration_bodyWriter() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {}';
addSource(path, content);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder).writeSetterDeclaration('s',
@@ -1151,91 +1131,89 @@
});
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('set s(s) {/* TODO */}'));
}
Future<void> test_writeSetterDeclaration_isStatic() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {}';
addSource(path, content);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder)
.writeSetterDeclaration('s', isStatic: true);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('static set s(s) {}'));
}
Future<void> test_writeSetterDeclaration_nameGroupName() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {}';
addSource(path, content);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder)
.writeSetterDeclaration('s', nameGroupName: 'name');
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('set s(s) {}'));
- List<LinkedEditGroup> linkedEditGroups =
- builder.sourceChange.linkedEditGroups;
+ var linkedEditGroups = builder.sourceChange.linkedEditGroups;
expect(linkedEditGroups, hasLength(1));
- LinkedEditGroup group = linkedEditGroups[0];
+ var group = linkedEditGroups[0];
expect(group.length, 1);
expect(group.positions, hasLength(1));
- Position position = group.positions[0];
+ var position = group.positions[0];
expect(position.offset, equals(13));
}
Future<void> test_writeSetterDeclaration_parameterType() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {} class B {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {} class B {}';
addSource(path, content);
DartType typeA = await _getType(path, 'A');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder).writeSetterDeclaration('s',
parameterType: typeA, parameterTypeGroupName: 'returnType');
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('set s(A s) {}'));
- List<LinkedEditGroup> linkedEditGroups =
- builder.sourceChange.linkedEditGroups;
+ var linkedEditGroups = builder.sourceChange.linkedEditGroups;
expect(linkedEditGroups, hasLength(1));
- LinkedEditGroup group = linkedEditGroups[0];
+ var group = linkedEditGroups[0];
expect(group.length, 1);
expect(group.positions, hasLength(1));
- Position position = group.positions[0];
+ var position = group.positions[0];
expect(position.offset, equals(26));
}
Future<void> test_writeType_dynamic() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {}';
addSource(path, content);
- CompilationUnit unit = (await driver.getResult(path))?.unit;
+ var unit = (await driver.getResult(path))?.unit;
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
var typeProvider = unit.declaredElement.library.typeProvider;
(builder as DartEditBuilder).writeType(typeProvider.dynamicType);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace(''));
}
@@ -1264,68 +1242,65 @@
}
Future<void> test_writeType_genericType() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {} class B<E> {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {} class B<E> {}';
addSource(path, content);
- InterfaceType typeA = await _getType(path, 'A');
- InterfaceType typeBofA = await _getType(path, 'B', typeArguments: [typeA]);
+ var typeA = await _getType(path, 'A');
+ var typeBofA = await _getType(path, 'B', typeArguments: [typeA]);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder).writeType(typeBofA);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('B<A>'));
}
Future<void> test_writeType_groupName() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {} class B extends A {} class C extends B {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {} class B extends A {} class C extends B {}';
addSource(path, content);
DartType typeC = await _getType(path, 'C');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder).writeType(typeC, groupName: 'type');
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('C'));
- List<LinkedEditGroup> linkedEditGroups =
- builder.sourceChange.linkedEditGroups;
+ var linkedEditGroups = builder.sourceChange.linkedEditGroups;
expect(linkedEditGroups, hasLength(1));
- LinkedEditGroup group = linkedEditGroups[0];
+ var group = linkedEditGroups[0];
expect(group, isNotNull);
}
Future<void> test_writeType_groupName_addSupertypeProposals() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {} class B extends A {} class C extends B {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {} class B extends A {} class C extends B {}';
addSource(path, content);
DartType typeC = await _getType(path, 'C');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder)
.writeType(typeC, addSupertypeProposals: true, groupName: 'type');
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('C'));
- List<LinkedEditGroup> linkedEditGroups =
- builder.sourceChange.linkedEditGroups;
+ var linkedEditGroups = builder.sourceChange.linkedEditGroups;
expect(linkedEditGroups, hasLength(1));
- LinkedEditGroup group = linkedEditGroups[0];
- List<LinkedEditSuggestion> suggestions = group.suggestions;
+ var group = linkedEditGroups[0];
+ var suggestions = group.suggestions;
expect(suggestions, hasLength(4));
- Iterable<String> values =
- suggestions.map((LinkedEditSuggestion suggestion) {
+ var values = suggestions.map((LinkedEditSuggestion suggestion) {
expect(suggestion.kind, LinkedEditSuggestionKind.TYPE);
return suggestion.value;
});
@@ -1336,8 +1311,8 @@
}
Future<void> test_writeType_groupName_invalidType() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A<T> {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A<T> {}';
addSource(path, content);
var classA = await _getClassElement(path, 'A');
@@ -1365,23 +1340,23 @@
}
Future<void> test_writeType_null() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {}';
addSource(path, content);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder).writeType(null);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace(''));
}
Future<void> test_writeType_prefixGenerator() async {
- String aPath = convertPath('/home/test/lib/a.dart');
- String bPath = convertPath('/home/test/lib/b.dart');
+ var aPath = convertPath('/home/test/lib/a.dart');
+ var bPath = convertPath('/home/test/lib/b.dart');
addSource(aPath, r'''
class A1 {}
@@ -1391,15 +1366,15 @@
class B {}
''');
- String path = convertPath('/home/test/lib/test.dart');
- String content = '';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = '';
addSource(path, content);
- ClassElement a1 = await _getClassElement(aPath, 'A1');
- ClassElement a2 = await _getClassElement(aPath, 'A2');
- ClassElement b = await _getClassElement(bPath, 'B');
+ var a1 = await _getClassElement(aPath, 'A1');
+ var a2 = await _getClassElement(aPath, 'A2');
+ var b = await _getClassElement(bPath, 'B');
- int nextPrefixIndex = 0;
+ var nextPrefixIndex = 0;
String prefixGenerator(_) {
return '_prefix${nextPrefixIndex++}';
}
@@ -1426,7 +1401,7 @@
builder.write(' b;');
});
}, importPrefixGenerator: prefixGenerator);
- List<SourceEdit> edits = getEdits(builder);
+ var edits = getEdits(builder);
expect(edits, hasLength(2));
expect(
edits[0].replacement,
@@ -1439,12 +1414,12 @@
}
Future<void> test_writeType_required_dynamic() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {}';
addSource(path, content);
- CompilationUnit unit = (await driver.getResult(path))?.unit;
+ var unit = (await driver.getResult(path))?.unit;
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
var typeProvider = unit.declaredElement.library.typeProvider;
@@ -1452,54 +1427,54 @@
.writeType(typeProvider.dynamicType, required: true);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('var'));
}
Future<void> test_writeType_required_notNull() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {}';
addSource(path, content);
DartType typeA = await _getType(path, 'A');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder).writeType(typeA, required: true);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('A'));
}
Future<void> test_writeType_required_null() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {}';
addSource(path, content);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder).writeType(null, required: true);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('var'));
}
Future<void> test_writeType_simpleType() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {}';
addSource(path, content);
DartType typeA = await _getType(path, 'A');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder).writeType(typeA);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('A'));
}
@@ -1513,73 +1488,73 @@
}
Future<void> test_writeTypes_empty() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {}';
addSource(path, content);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilderImpl).writeTypes([]);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, isEmpty);
}
Future<void> test_writeTypes_noPrefix() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {} class B {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {} class B {}';
addSource(path, content);
DartType typeA = await _getType(path, 'A');
DartType typeB = await _getType(path, 'B');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilderImpl).writeTypes([typeA, typeB]);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('A, B'));
}
Future<void> test_writeTypes_null() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {}';
addSource(path, content);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilderImpl).writeTypes(null);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, isEmpty);
}
Future<void> test_writeTypes_prefix() async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = 'class A {} class B {}';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = 'class A {} class B {}';
addSource(path, content);
DartType typeA = await _getType(path, 'A');
DartType typeB = await _getType(path, 'B');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilderImpl)
.writeTypes([typeA, typeB], prefix: 'implements ');
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('implements A, B'));
}
Future<void> _assertWriteType(String typeCode, {String declarations}) async {
- String path = convertPath('/home/test/lib/test.dart');
- String content = (declarations ?? '') + '$typeCode v;';
+ var path = convertPath('/home/test/lib/test.dart');
+ var content = (declarations ?? '') + '$typeCode v;';
addSource(path, content);
var f = await _getTopLevelAccessorElement(path, 'v');
@@ -1590,18 +1565,18 @@
builder.writeType(f.returnType);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, typeCode);
}
Future<ClassElement> _getClassElement(String path, String name) async {
- UnitElementResult result = await driver.getUnitElement(path);
+ var result = await driver.getUnitElement(path);
return result.element.getType(name);
}
Future<PropertyAccessorElement> _getTopLevelAccessorElement(
String path, String name) async {
- UnitElementResult result = await driver.getUnitElement(path);
+ var result = await driver.getUnitElement(path);
return result.element.accessors.firstWhere((v) => v.name == name);
}
@@ -1610,7 +1585,7 @@
String name, {
List<DartType> typeArguments = const [],
}) async {
- ClassElement classElement = await _getClassElement(path, name);
+ var classElement = await _getClassElement(path, name);
return classElement.instantiate(
typeArguments: typeArguments,
nullabilitySuffix: NullabilitySuffix.star,
@@ -1622,53 +1597,53 @@
class DartFileEditBuilderImplTest extends AbstractContextTest
with DartChangeBuilderMixin {
Future<void> test_convertFunctionFromSyncToAsync_closure() async {
- String path = convertPath('/home/test/lib/test.dart');
+ var path = convertPath('/home/test/lib/test.dart');
addSource(path, '''var f = () {}''');
var resolvedUnit = await driver.getResult(path);
var findNode = FindNode(resolvedUnit.content, resolvedUnit.unit);
var body = findNode.functionBody('{}');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
(builder as DartFileEditBuilder)
.convertFunctionFromSyncToAsync(body, resolvedUnit.typeProvider);
});
- List<SourceEdit> edits = getEdits(builder);
+ var edits = getEdits(builder);
expect(edits, hasLength(1));
expect(edits[0].replacement, equalsIgnoringWhitespace('async'));
}
Future<void> test_convertFunctionFromSyncToAsync_topLevelFunction() async {
- String path = convertPath('/home/test/lib/test.dart');
+ var path = convertPath('/home/test/lib/test.dart');
addSource(path, 'String f() {}');
var resolvedUnit = await driver.getResult(path);
var findNode = FindNode(resolvedUnit.content, resolvedUnit.unit);
var body = findNode.functionBody('{}');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
(builder as DartFileEditBuilder)
.convertFunctionFromSyncToAsync(body, resolvedUnit.typeProvider);
});
- List<SourceEdit> edits = getEdits(builder);
+ var edits = getEdits(builder);
expect(edits, hasLength(2));
expect(edits[0].replacement, equalsIgnoringWhitespace('async'));
expect(edits[1].replacement, equalsIgnoringWhitespace('Future<String>'));
}
Future<void> test_createEditBuilder() async {
- String path = convertPath('/home/test/lib/test.dart');
+ var path = convertPath('/home/test/lib/test.dart');
addSource(path, 'library test;');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
- int offset = 4;
- int length = 5;
- DartEditBuilderImpl editBuilder = (builder as DartFileEditBuilderImpl)
+ var offset = 4;
+ var length = 5;
+ var editBuilder = (builder as DartFileEditBuilderImpl)
.createEditBuilder(offset, length);
expect(editBuilder, const TypeMatcher<DartEditBuilder>());
- SourceEdit sourceEdit = editBuilder.sourceEdit;
+ var sourceEdit = editBuilder.sourceEdit;
expect(sourceEdit.length, length);
expect(sourceEdit.offset, offset);
expect(sourceEdit.replacement, isEmpty);
@@ -1771,19 +1746,19 @@
}
Future<void> test_replaceTypeWithFuture() async {
- String path = convertPath('/home/test/lib/test.dart');
+ var path = convertPath('/home/test/lib/test.dart');
addSource(path, 'String f() {}');
var resolvedUnit = await driver.getResult(path);
var findNode = FindNode(resolvedUnit.content, resolvedUnit.unit);
var type = findNode.typeAnnotation('String');
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
(builder as DartFileEditBuilder)
.replaceTypeWithFuture(type, resolvedUnit.typeProvider);
});
- List<SourceEdit> edits = getEdits(builder);
+ var edits = getEdits(builder);
expect(edits, hasLength(1));
expect(edits[0].replacement, equalsIgnoringWhitespace('Future<String>'));
}
@@ -1792,22 +1767,22 @@
@reflectiveTest
class DartLinkedEditBuilderImplTest extends AbstractContextTest {
Future<void> test_addSuperTypesAsSuggestions() async {
- String path = convertPath('/home/test/lib/test.dart');
+ var path = convertPath('/home/test/lib/test.dart');
addSource(path, '''
class A {}
class B extends A {}
class C extends B {}
''');
- CompilationUnit unit = (await driver.getResult(path))?.unit;
- ClassDeclaration classC = unit.declarations[2] as ClassDeclaration;
- DartLinkedEditBuilderImpl builder = DartLinkedEditBuilderImpl(null);
+ var unit = (await driver.getResult(path))?.unit;
+ var classC = unit.declarations[2] as ClassDeclaration;
+ var builder = DartLinkedEditBuilderImpl(null);
builder.addSuperTypesAsSuggestions(
classC.declaredElement.instantiate(
typeArguments: [],
nullabilitySuffix: NullabilitySuffix.star,
),
);
- List<LinkedEditSuggestion> suggestions = builder.suggestions;
+ var suggestions = builder.suggestions;
expect(suggestions, hasLength(4));
expect(suggestions.map((s) => s.value),
unorderedEquals(['Object', 'A', 'B', 'C']));
@@ -2259,9 +2234,9 @@
List<String> uriList,
String expectedCode,
}) async {
- String path = convertPath('/home/test/lib/test.dart');
+ var path = convertPath('/home/test/lib/test.dart');
addSource(path, initialCode);
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (DartFileEditBuilder builder) {
for (var i = 0; i < uriList.length; ++i) {
var uri = Uri.parse(uriList[i]);
@@ -2269,9 +2244,9 @@
}
});
- String resultCode = initialCode;
- List<SourceEdit> edits = getEdits(builder);
- for (SourceEdit edit in edits) {
+ var resultCode = initialCode;
+ var edits = getEdits(builder);
+ for (var edit in edits) {
resultCode = edit.apply(resultCode);
}
expect(resultCode, expectedCode);
@@ -2814,7 +2789,7 @@
String targetMixinName,
bool invokeSuper = false,
}) async {
- String path = convertPath('/home/test/lib/test.dart');
+ var path = convertPath('/home/test/lib/test.dart');
addSource(path, content);
ClassElement targetElement;
@@ -2841,9 +2816,9 @@
Name(null, nameToOverride),
);
- StringBuffer displayBuffer = displayText != null ? StringBuffer() : null;
+ var displayBuffer = displayText != null ? StringBuffer() : null;
- DartChangeBuilderImpl builder = newBuilder();
+ var builder = newBuilder();
await builder.addFileEdit(path, (FileEditBuilder builder) {
builder.addInsertion(content.length - 2, (EditBuilder builder) {
(builder as DartEditBuilder).writeOverride(
@@ -2853,7 +2828,7 @@
);
});
});
- SourceEdit edit = getEdit(builder);
+ var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace(expected));
expect(displayBuffer?.toString(), displayText);
if (selection != null) {
diff --git a/pkg/analyzer_plugin/test/src/utilities/change_builder/dart/dart_change_builder_mixin.dart b/pkg/analyzer_plugin/test/src/utilities/change_builder/dart/dart_change_builder_mixin.dart
index 79383b8..91e9152 100644
--- a/pkg/analyzer_plugin/test/src/utilities/change_builder/dart/dart_change_builder_mixin.dart
+++ b/pkg/analyzer_plugin/test/src/utilities/change_builder/dart/dart_change_builder_mixin.dart
@@ -11,19 +11,19 @@
mixin DartChangeBuilderMixin implements AbstractContextTest {
SourceEdit getEdit(DartChangeBuilder builder) {
- List<SourceEdit> edits = getEdits(builder);
+ var edits = getEdits(builder);
expect(edits, hasLength(1));
return edits[0];
}
List<SourceEdit> getEdits(DartChangeBuilder builder) {
- SourceChange sourceChange = builder.sourceChange;
+ var sourceChange = builder.sourceChange;
expect(sourceChange, isNotNull);
- List<SourceFileEdit> fileEdits = sourceChange.edits;
+ var fileEdits = sourceChange.edits;
expect(fileEdits, hasLength(1));
- SourceFileEdit fileEdit = fileEdits[0];
+ var fileEdit = fileEdits[0];
expect(fileEdit, isNotNull);
return fileEdit.edits;
}
diff --git a/pkg/analyzer_plugin/test/src/utilities/completion/completion_target_test.dart b/pkg/analyzer_plugin/test/src/utilities/completion/completion_target_test.dart
index 380166e..dd47e63 100644
--- a/pkg/analyzer_plugin/test/src/utilities/completion/completion_target_test.dart
+++ b/pkg/analyzer_plugin/test/src/utilities/completion/completion_target_test.dart
@@ -968,7 +968,7 @@
offset = content.indexOf('^');
expect(offset, isNot(equals(-1)), reason: 'missing ^');
- int nextOffset = content.indexOf('^', offset + 1);
+ var nextOffset = content.indexOf('^', offset + 1);
expect(nextOffset, equals(-1), reason: 'too many ^');
content = content.substring(0, offset) + content.substring(offset + 1);
diff --git a/pkg/analyzer_plugin/test/src/utilities/completion/optype_test.dart b/pkg/analyzer_plugin/test/src/utilities/completion/optype_test.dart
index 581775c..6223a2c 100644
--- a/pkg/analyzer_plugin/test/src/utilities/completion/optype_test.dart
+++ b/pkg/analyzer_plugin/test/src/utilities/completion/optype_test.dart
@@ -4,7 +4,6 @@
import 'dart:async';
-import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/src/dart/analysis/experiments.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:analyzer_plugin/src/utilities/completion/completion_target.dart';
@@ -1908,6 +1907,31 @@
await assertOpType(typeNames: true);
}
+ Future<void> test_SimpleFormalParameter_functionType_name() async {
+ addTestSource('void Function(int ^) v;');
+ await assertOpType(typeNames: false, varNames: true);
+ }
+
+ Future<void> test_SimpleFormalParameter_functionType_name_named() async {
+ addTestSource('void Function({int ^}) v;');
+ await assertOpType(typeNames: false, varNames: true);
+ }
+
+ Future<void> test_SimpleFormalParameter_functionType_name_optional() async {
+ addTestSource('void Function([int ^]) v;');
+ await assertOpType(typeNames: false, varNames: true);
+ }
+
+ Future<void> test_SimpleFormalParameter_functionType_type_withName() async {
+ addTestSource('void Function(Str^ name) v;');
+ await assertOpType(typeNames: true, varNames: false);
+ }
+
+ Future<void> test_SimpleFormalParameter_functionType_type_withName2() async {
+ addTestSource('void Function(^ name) v;');
+ await assertOpType(typeNames: true, varNames: false);
+ }
+
Future<void> test_SimpleFormalParameter_name_typed() async {
addTestSource('f(String ^, int b) {}');
await assertOpType(typeNames: false, varNames: true);
@@ -2114,7 +2138,7 @@
void addTestSource(String content) {
completionOffset = content.indexOf('^');
expect(completionOffset, isNot(equals(-1)), reason: 'missing ^');
- int nextOffset = content.indexOf('^', completionOffset + 1);
+ var nextOffset = content.indexOf('^', completionOffset + 1);
expect(nextOffset, equals(-1), reason: 'too many ^');
content = content.substring(0, completionOffset) +
content.substring(completionOffset + 1);
@@ -2134,9 +2158,9 @@
bool voidReturn = false,
CompletionSuggestionKind kind =
CompletionSuggestionKind.INVOCATION}) async {
- ResolvedUnitResult resolvedUnit = await driver.getResult(testPath);
+ var resolvedUnit = await driver.getResult(testPath);
- CompletionTarget completionTarget =
+ var completionTarget =
CompletionTarget.forOffset(resolvedUnit.unit, completionOffset);
visitor = OpType.forCompletion(completionTarget, completionOffset);
diff --git a/pkg/analyzer_plugin/test/src/utilities/navigation/navigation_test.dart b/pkg/analyzer_plugin/test/src/utilities/navigation/navigation_test.dart
index c49d270..de76c3c 100644
--- a/pkg/analyzer_plugin/test/src/utilities/navigation/navigation_test.dart
+++ b/pkg/analyzer_plugin/test/src/utilities/navigation/navigation_test.dart
@@ -17,42 +17,42 @@
void test_createRegions_multiple() {
// Two files, each with two targets.
- String fileA = 'a.dart';
- int targetOffsetA1 = 1;
- int targetLengthA1 = 2;
- int targetStartLineA1 = 3;
- int targetStartColumnA1 = 4;
- ElementKind targetKindA1 = ElementKind.CLASS;
- Location targetLocationA1 = Location(fileA, targetOffsetA1, targetLengthA1,
+ var fileA = 'a.dart';
+ var targetOffsetA1 = 1;
+ var targetLengthA1 = 2;
+ var targetStartLineA1 = 3;
+ var targetStartColumnA1 = 4;
+ var targetKindA1 = ElementKind.CLASS;
+ var targetLocationA1 = Location(fileA, targetOffsetA1, targetLengthA1,
targetStartLineA1, targetStartColumnA1);
- int targetOffsetA2 = 5;
- int targetLengthA2 = 6;
- int targetStartLineA2 = 7;
- int targetStartColumnA2 = 8;
- ElementKind targetKindA2 = ElementKind.FUNCTION;
- Location targetLocationA2 = Location(fileA, targetOffsetA2, targetLengthA2,
+ var targetOffsetA2 = 5;
+ var targetLengthA2 = 6;
+ var targetStartLineA2 = 7;
+ var targetStartColumnA2 = 8;
+ var targetKindA2 = ElementKind.FUNCTION;
+ var targetLocationA2 = Location(fileA, targetOffsetA2, targetLengthA2,
targetStartLineA2, targetStartColumnA2);
- String fileB = 'b.dart';
- int targetOffsetB1 = 9;
- int targetLengthB1 = 10;
- int targetStartLineB1 = 11;
- int targetStartColumnB1 = 12;
- ElementKind targetKindB1 = ElementKind.ENUM;
- Location targetLocationB1 = Location(fileB, targetOffsetB1, targetLengthB1,
+ var fileB = 'b.dart';
+ var targetOffsetB1 = 9;
+ var targetLengthB1 = 10;
+ var targetStartLineB1 = 11;
+ var targetStartColumnB1 = 12;
+ var targetKindB1 = ElementKind.ENUM;
+ var targetLocationB1 = Location(fileB, targetOffsetB1, targetLengthB1,
targetStartLineB1, targetStartColumnB1);
- int targetOffsetB2 = 13;
- int targetLengthB2 = 14;
- int targetStartLineB2 = 15;
- int targetStartColumnB2 = 16;
- ElementKind targetKindB2 = ElementKind.METHOD;
- Location targetLocationB2 = Location(fileB, targetOffsetB2, targetLengthB2,
+ var targetOffsetB2 = 13;
+ var targetLengthB2 = 14;
+ var targetStartLineB2 = 15;
+ var targetStartColumnB2 = 16;
+ var targetKindB2 = ElementKind.METHOD;
+ var targetLocationB2 = Location(fileB, targetOffsetB2, targetLengthB2,
targetStartLineB2, targetStartColumnB2);
// Six regions targeting a1, b1, a2, b1, a1, b2
- List<int> regionOffsets = [17, 18, 19, 20, 21, 22];
- List<int> regionLengths = [23, 24, 25, 26, 27, 28];
- List<ElementKind> targetKinds = [
+ var regionOffsets = <int>[17, 18, 19, 20, 21, 22];
+ var regionLengths = <int>[23, 24, 25, 26, 27, 28];
+ var targetKinds = <ElementKind>[
targetKindA1,
targetKindB1,
targetKindA2,
@@ -60,7 +60,7 @@
targetKindA1,
targetKindB2
];
- List<Location> targetLocations = [
+ var targetLocations = <Location>[
targetLocationA1,
targetLocationB1,
targetLocationA2,
@@ -68,7 +68,7 @@
targetLocationA1,
targetLocationB2
];
- for (int i = 0; i < 6; i++) {
+ for (var i = 0; i < 6; i++) {
collector.addRegion(regionOffsets[i], regionLengths[i], targetKinds[i],
targetLocations[i]);
}
@@ -103,15 +103,15 @@
}
void test_createRegions_single() {
- int regionOffset = 13;
- int regionLength = 7;
- ElementKind targetKind = ElementKind.CLASS;
- String targetFile = 'c.dart';
- int targetOffset = 17;
- int targetLength = 1;
- int targetStartLine = 5;
- int targetStartColumn = 1;
- Location targetLocation = Location(targetFile, targetOffset, targetLength,
+ var regionOffset = 13;
+ var regionLength = 7;
+ var targetKind = ElementKind.CLASS;
+ var targetFile = 'c.dart';
+ var targetOffset = 17;
+ var targetLength = 1;
+ var targetStartLine = 5;
+ var targetStartColumn = 1;
+ var targetLocation = Location(targetFile, targetOffset, targetLength,
targetStartLine, targetStartColumn);
collector.addRegion(regionOffset, regionLength, targetKind, targetLocation);
collector.createRegions();
diff --git a/pkg/analyzer_plugin/test/src/utilities/string_utilities_test.dart b/pkg/analyzer_plugin/test/src/utilities/string_utilities_test.dart
index cb99ba9..486ece6 100644
--- a/pkg/analyzer_plugin/test/src/utilities/string_utilities_test.dart
+++ b/pkg/analyzer_plugin/test/src/utilities/string_utilities_test.dart
@@ -29,10 +29,10 @@
}
void test_isLowerCase() {
- for (int c in 'abcdefghijklmnopqrstuvwxyz'.codeUnits) {
+ for (var c in 'abcdefghijklmnopqrstuvwxyz'.codeUnits) {
expect(isLowerCase(c), isTrue);
}
- for (int c in 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.codeUnits) {
+ for (var c in 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.codeUnits) {
expect(isLowerCase(c), isFalse);
}
expect(isLowerCase(' '.codeUnitAt(0)), isFalse);
@@ -40,10 +40,10 @@
}
void test_isUpperCase() {
- for (int c in 'abcdefghijklmnopqrstuvwxyz'.codeUnits) {
+ for (var c in 'abcdefghijklmnopqrstuvwxyz'.codeUnits) {
expect(isUpperCase(c), isFalse);
}
- for (int c in 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.codeUnits) {
+ for (var c in 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.codeUnits) {
expect(isUpperCase(c), isTrue);
}
expect(isUpperCase(' '.codeUnitAt(0)), isFalse);
diff --git a/pkg/analyzer_plugin/test/src/utilities/visitors/local_declaration_visitor_test.dart b/pkg/analyzer_plugin/test/src/utilities/visitors/local_declaration_visitor_test.dart
index 80c31da..56d45a7 100644
--- a/pkg/analyzer_plugin/test/src/utilities/visitors/local_declaration_visitor_test.dart
+++ b/pkg/analyzer_plugin/test/src/utilities/visitors/local_declaration_visitor_test.dart
@@ -21,17 +21,17 @@
}
void test_visitForEachStatement() {
- CompilationUnit unit = parseCompilationUnit('''
+ var unit = parseCompilationUnit('''
class MyClass {}
f(List<MyClass> list) {
for(x in list) {}
}
''');
- NodeList<CompilationUnitMember> declarations = unit.declarations;
+ var declarations = unit.declarations;
expect(declarations, hasLength(2));
- FunctionDeclaration f = declarations[1] as FunctionDeclaration;
+ var f = declarations[1] as FunctionDeclaration;
expect(f, isNotNull);
- BlockFunctionBody body = f.functionExpression.body as BlockFunctionBody;
+ var body = f.functionExpression.body as BlockFunctionBody;
var statement = body.block.statements[0] as ForStatement;
expect(statement.forLoopParts, const TypeMatcher<ForEachParts>());
statement.accept(TestVisitor(statement.offset));
diff --git a/pkg/analyzer_plugin/test/support/abstract_context.dart b/pkg/analyzer_plugin/test/support/abstract_context.dart
index fc4e0bc..373c7d0 100644
--- a/pkg/analyzer_plugin/test/support/abstract_context.dart
+++ b/pkg/analyzer_plugin/test/support/abstract_context.dart
@@ -73,8 +73,8 @@
}
Source addSource(String path, String content, [Uri uri]) {
- File file = newFile(path, content: content);
- Source source = file.createSource(uri);
+ var file = newFile(path, content: content);
+ var source = file.createSource(uri);
driver.addFile(file.path);
driver.changeFile(file.path);
return source;
diff --git a/pkg/analyzer_plugin/test/support/abstract_single_unit.dart b/pkg/analyzer_plugin/test/support/abstract_single_unit.dart
index 1404863..4e9efdb 100644
--- a/pkg/analyzer_plugin/test/support/abstract_single_unit.dart
+++ b/pkg/analyzer_plugin/test/support/abstract_single_unit.dart
@@ -46,7 +46,7 @@
}
AstNode findNodeAtOffset(int offset, [Predicate<AstNode> predicate]) {
- AstNode result = NodeLocator(offset).searchWithin(testUnit);
+ var result = NodeLocator(offset).searchWithin(testUnit);
if (result != null && predicate != null) {
result = result.thisOrAncestorMatching(predicate);
}
@@ -54,13 +54,13 @@
}
AstNode findNodeAtString(String search, [Predicate<AstNode> predicate]) {
- int offset = findOffset(search);
+ var offset = findOffset(search);
return findNodeAtOffset(offset, predicate);
}
Element findNodeElementAtString(String search,
[Predicate<AstNode> predicate]) {
- AstNode node = findNodeAtString(search, predicate);
+ var node = findNodeAtString(search, predicate);
if (node == null) {
return null;
}
@@ -68,15 +68,15 @@
}
int findOffset(String search) {
- int offset = testCode.indexOf(search);
+ var offset = testCode.indexOf(search);
expect(offset, isNonNegative, reason: "Not found '$search' in\n$testCode");
return offset;
}
int getLeadingIdentifierLength(String search) {
- int length = 0;
+ var length = 0;
while (length < search.length) {
- int c = search.codeUnitAt(length);
+ var c = search.codeUnitAt(length);
if (c >= 'a'.codeUnitAt(0) && c <= 'z'.codeUnitAt(0)) {
length++;
continue;
diff --git a/pkg/analyzer_plugin/test/test_all.dart b/pkg/analyzer_plugin/test/test_all.dart
index 4e58423..1284126 100644
--- a/pkg/analyzer_plugin/test/test_all.dart
+++ b/pkg/analyzer_plugin/test/test_all.dart
@@ -8,6 +8,7 @@
import 'plugin/test_all.dart' as plugin;
import 'src/test_all.dart' as src;
import 'utilities/test_all.dart' as utilities;
+import 'verify_sorted_test.dart' as verify_sorted;
import 'verify_tests_test.dart' as verify_tests;
void main() {
@@ -16,6 +17,7 @@
src.main();
utilities.main();
verify_tests.main();
+ verify_sorted.main();
defineReflectiveSuite(() {
defineReflectiveTests(SpecTest);
}, name: 'spec');
diff --git a/pkg/analyzer_plugin/test/utilities/analyzer_converter_test.dart b/pkg/analyzer_plugin/test/utilities/analyzer_converter_test.dart
index a268944..b22629a 100644
--- a/pkg/analyzer_plugin/test/utilities/analyzer_converter_test.dart
+++ b/pkg/analyzer_plugin/test/utilities/analyzer_converter_test.dart
@@ -39,9 +39,9 @@
{analyzer.ErrorSeverity severity,
int startColumn = -1,
int startLine = -1}) {
- analyzer.ErrorCode errorCode = analyzerError.errorCode;
+ var errorCode = analyzerError.errorCode;
expect(pluginError, isNotNull);
- plugin.Location location = pluginError.location;
+ var location = pluginError.location;
expect(pluginError.code, errorCode.name.toLowerCase());
expect(pluginError.correction, errorCode.correction);
expect(location, isNotNull);
@@ -57,7 +57,7 @@
}
analyzer.AnalysisError createError(int offset, {String contextMessage}) {
- List<analyzer.DiagnosticMessageImpl> contextMessages = [];
+ var contextMessages = <analyzer.DiagnosticMessageImpl>[];
if (contextMessage != null) {
contextMessages.add(analyzer.DiagnosticMessageImpl(
filePath: source.fullName,
@@ -82,27 +82,24 @@
}
void test_convertAnalysisError_contextMessages() {
- analyzer.AnalysisError analyzerError =
- createError(13, contextMessage: 'here');
- analyzer.LineInfo lineInfo = analyzer.LineInfo([0, 10, 20]);
- analyzer.ErrorSeverity severity = analyzer.ErrorSeverity.WARNING;
+ var analyzerError = createError(13, contextMessage: 'here');
+ var lineInfo = analyzer.LineInfo([0, 10, 20]);
+ var severity = analyzer.ErrorSeverity.WARNING;
- plugin.AnalysisError pluginError = converter.convertAnalysisError(
- analyzerError,
- lineInfo: lineInfo,
- severity: severity);
+ var pluginError = converter.convertAnalysisError(analyzerError,
+ lineInfo: lineInfo, severity: severity);
assertError(pluginError, analyzerError,
startColumn: 4, startLine: 2, severity: severity);
expect(pluginError.contextMessages, hasLength(1));
- plugin.DiagnosticMessage message = pluginError.contextMessages[0];
+ var message = pluginError.contextMessages[0];
expect(message.message, 'here');
expect(message.location.offset, 53);
expect(message.location.length, 7);
}
void test_convertAnalysisError_lineInfo_noSeverity() {
- analyzer.AnalysisError analyzerError = createError(13);
- analyzer.LineInfo lineInfo = analyzer.LineInfo([0, 10, 20]);
+ var analyzerError = createError(13);
+ var lineInfo = analyzer.LineInfo([0, 10, 20]);
assertError(
converter.convertAnalysisError(analyzerError, lineInfo: lineInfo),
@@ -112,9 +109,9 @@
}
void test_convertAnalysisError_lineInfo_severity() {
- analyzer.AnalysisError analyzerError = createError(13);
- analyzer.LineInfo lineInfo = analyzer.LineInfo([0, 10, 20]);
- analyzer.ErrorSeverity severity = analyzer.ErrorSeverity.WARNING;
+ var analyzerError = createError(13);
+ var lineInfo = analyzer.LineInfo([0, 10, 20]);
+ var severity = analyzer.ErrorSeverity.WARNING;
assertError(
converter.convertAnalysisError(analyzerError,
@@ -126,14 +123,14 @@
}
void test_convertAnalysisError_noLineInfo_noSeverity() {
- analyzer.AnalysisError analyzerError = createError(11);
+ var analyzerError = createError(11);
assertError(converter.convertAnalysisError(analyzerError), analyzerError);
}
void test_convertAnalysisError_noLineInfo_severity() {
- analyzer.AnalysisError analyzerError = createError(11);
- analyzer.ErrorSeverity severity = analyzer.ErrorSeverity.WARNING;
+ var analyzerError = createError(11);
+ var severity = analyzer.ErrorSeverity.WARNING;
assertError(
converter.convertAnalysisError(analyzerError, severity: severity),
@@ -142,13 +139,13 @@
}
void test_convertAnalysisErrors_lineInfo_noOptions() {
- List<analyzer.AnalysisError> analyzerErrors = <analyzer.AnalysisError>[
+ var analyzerErrors = <analyzer.AnalysisError>[
createError(13),
createError(25)
];
- analyzer.LineInfo lineInfo = analyzer.LineInfo([0, 10, 20]);
+ var lineInfo = analyzer.LineInfo([0, 10, 20]);
- List<plugin.AnalysisError> pluginErrors =
+ var pluginErrors =
converter.convertAnalysisErrors(analyzerErrors, lineInfo: lineInfo);
expect(pluginErrors, hasLength(analyzerErrors.length));
assertError(pluginErrors[0], analyzerErrors[0],
@@ -158,21 +155,19 @@
}
void test_convertAnalysisErrors_lineInfo_options() {
- List<analyzer.AnalysisError> analyzerErrors = <analyzer.AnalysisError>[
+ var analyzerErrors = <analyzer.AnalysisError>[
createError(13),
createError(25)
];
- analyzer.LineInfo lineInfo = analyzer.LineInfo([0, 10, 20]);
- analyzer.ErrorSeverity severity = analyzer.ErrorSeverity.WARNING;
- analyzer.AnalysisOptionsImpl options = analyzer.AnalysisOptionsImpl();
+ var lineInfo = analyzer.LineInfo([0, 10, 20]);
+ var severity = analyzer.ErrorSeverity.WARNING;
+ var options = analyzer.AnalysisOptionsImpl();
options.errorProcessors = [
analyzer.ErrorProcessor(analyzerErrors[0].errorCode.name, severity)
];
- List<plugin.AnalysisError> pluginErrors = converter.convertAnalysisErrors(
- analyzerErrors,
- lineInfo: lineInfo,
- options: options);
+ var pluginErrors = converter.convertAnalysisErrors(analyzerErrors,
+ lineInfo: lineInfo, options: options);
expect(pluginErrors, hasLength(analyzerErrors.length));
assertError(pluginErrors[0], analyzerErrors[0],
startColumn: 4, startLine: 2, severity: severity);
@@ -181,30 +176,29 @@
}
void test_convertAnalysisErrors_noLineInfo_noOptions() {
- List<analyzer.AnalysisError> analyzerErrors = <analyzer.AnalysisError>[
+ var analyzerErrors = <analyzer.AnalysisError>[
createError(11),
createError(25)
];
- List<plugin.AnalysisError> pluginErrors =
- converter.convertAnalysisErrors(analyzerErrors);
+ var pluginErrors = converter.convertAnalysisErrors(analyzerErrors);
expect(pluginErrors, hasLength(analyzerErrors.length));
assertError(pluginErrors[0], analyzerErrors[0]);
assertError(pluginErrors[1], analyzerErrors[1]);
}
void test_convertAnalysisErrors_noLineInfo_options() {
- List<analyzer.AnalysisError> analyzerErrors = <analyzer.AnalysisError>[
+ var analyzerErrors = <analyzer.AnalysisError>[
createError(13),
createError(25)
];
- analyzer.ErrorSeverity severity = analyzer.ErrorSeverity.WARNING;
- analyzer.AnalysisOptionsImpl options = analyzer.AnalysisOptionsImpl();
+ var severity = analyzer.ErrorSeverity.WARNING;
+ var options = analyzer.AnalysisOptionsImpl();
options.errorProcessors = [
analyzer.ErrorProcessor(analyzerErrors[0].errorCode.name, severity)
];
- List<plugin.AnalysisError> pluginErrors =
+ var pluginErrors =
converter.convertAnalysisErrors(analyzerErrors, options: options);
expect(pluginErrors, hasLength(analyzerErrors.length));
assertError(pluginErrors[0], analyzerErrors[0], severity: severity);
@@ -212,21 +206,21 @@
}
Future<void> test_convertElement_class() async {
- analyzer.Source source = addSource(testFile, '''
+ var source = addSource(testFile, '''
@deprecated
abstract class _A {}
class B<K, V> {}''');
- analyzer.CompilationUnit unit = await resolveLibraryUnit(source);
+ var unit = await resolveLibraryUnit(source);
{
- analyzer.ClassElement engineElement =
+ var engineElement =
findElementInUnit(unit, '_A') as analyzer.ClassElement;
// create notification Element
- plugin.Element element = converter.convertElement(engineElement);
+ var element = converter.convertElement(engineElement);
expect(element.kind, plugin.ElementKind.CLASS);
expect(element.name, '_A');
expect(element.typeParameters, isNull);
{
- plugin.Location location = element.location;
+ var location = element.location;
expect(location.file, testFile);
expect(location.offset, 27);
expect(location.length, '_A'.length);
@@ -241,10 +235,9 @@
plugin.Element.FLAG_PRIVATE);
}
{
- analyzer.ClassElement engineElement =
- findElementInUnit(unit, 'B') as analyzer.ClassElement;
+ var engineElement = findElementInUnit(unit, 'B') as analyzer.ClassElement;
// create notification Element
- plugin.Element element = converter.convertElement(engineElement);
+ var element = converter.convertElement(engineElement);
expect(element.kind, plugin.ElementKind.CLASS);
expect(element.name, 'B');
expect(element.typeParameters, '<K, V>');
@@ -253,20 +246,20 @@
}
Future<void> test_convertElement_constructor() async {
- analyzer.Source source = addSource(testFile, '''
+ var source = addSource(testFile, '''
class A {
const A.myConstructor(int a, [String b]);
}''');
- analyzer.CompilationUnit unit = await resolveLibraryUnit(source);
- analyzer.ConstructorElement engineElement =
+ var unit = await resolveLibraryUnit(source);
+ var engineElement =
findElementInUnit(unit, 'myConstructor') as analyzer.ConstructorElement;
// create notification Element
- plugin.Element element = converter.convertElement(engineElement);
+ var element = converter.convertElement(engineElement);
expect(element.kind, plugin.ElementKind.CONSTRUCTOR);
expect(element.name, 'myConstructor');
expect(element.typeParameters, isNull);
{
- plugin.Location location = element.location;
+ var location = element.location;
expect(location.file, testFile);
expect(location.offset, 20);
expect(location.length, 'myConstructor'.length);
@@ -281,7 +274,7 @@
void test_convertElement_dynamic() {
var engineElement = analyzer.DynamicElementImpl.instance;
// create notification Element
- plugin.Element element = converter.convertElement(engineElement);
+ var element = converter.convertElement(engineElement);
expect(element.kind, plugin.ElementKind.UNKNOWN);
expect(element.name, 'dynamic');
expect(element.location, isNull);
@@ -291,22 +284,22 @@
}
Future<void> test_convertElement_enum() async {
- analyzer.Source source = addSource(testFile, '''
+ var source = addSource(testFile, '''
@deprecated
enum _E1 { one, two }
enum E2 { three, four }''');
- analyzer.CompilationUnit unit = await resolveLibraryUnit(source);
+ var unit = await resolveLibraryUnit(source);
{
- analyzer.ClassElement engineElement =
+ var engineElement =
findElementInUnit(unit, '_E1') as analyzer.ClassElement;
expect(engineElement.hasDeprecated, isTrue);
// create notification Element
- plugin.Element element = converter.convertElement(engineElement);
+ var element = converter.convertElement(engineElement);
expect(element.kind, plugin.ElementKind.ENUM);
expect(element.name, '_E1');
expect(element.typeParameters, isNull);
{
- plugin.Location location = element.location;
+ var location = element.location;
expect(location.file, testFile);
expect(location.offset, 17);
expect(location.length, '_E1'.length);
@@ -320,10 +313,10 @@
plugin.Element.FLAG_PRIVATE);
}
{
- analyzer.ClassElement engineElement =
+ var engineElement =
findElementInUnit(unit, 'E2') as analyzer.ClassElement;
// create notification Element
- plugin.Element element = converter.convertElement(engineElement);
+ var element = converter.convertElement(engineElement);
expect(element.kind, plugin.ElementKind.ENUM);
expect(element.name, 'E2');
expect(element.typeParameters, isNull);
@@ -332,20 +325,20 @@
}
Future<void> test_convertElement_enumConstant() async {
- analyzer.Source source = addSource(testFile, '''
+ var source = addSource(testFile, '''
@deprecated
enum _E1 { one, two }
enum E2 { three, four }''');
- analyzer.CompilationUnit unit = await resolveLibraryUnit(source);
+ var unit = await resolveLibraryUnit(source);
{
- analyzer.FieldElement engineElement =
+ var engineElement =
findElementInUnit(unit, 'one') as analyzer.FieldElement;
// create notification Element
- plugin.Element element = converter.convertElement(engineElement);
+ var element = converter.convertElement(engineElement);
expect(element.kind, plugin.ElementKind.ENUM_CONSTANT);
expect(element.name, 'one');
{
- plugin.Location location = element.location;
+ var location = element.location;
expect(location.file, testFile);
expect(location.offset, 23);
expect(location.length, 'one'.length);
@@ -363,14 +356,14 @@
plugin.Element.FLAG_CONST | plugin.Element.FLAG_STATIC);
}
{
- analyzer.FieldElement engineElement =
+ var engineElement =
findElementInUnit(unit, 'three') as analyzer.FieldElement;
// create notification Element
- plugin.Element element = converter.convertElement(engineElement);
+ var element = converter.convertElement(engineElement);
expect(element.kind, plugin.ElementKind.ENUM_CONSTANT);
expect(element.name, 'three');
{
- plugin.Location location = element.location;
+ var location = element.location;
expect(location.file, testFile);
expect(location.offset, 44);
expect(location.length, 'three'.length);
@@ -383,14 +376,13 @@
plugin.Element.FLAG_CONST | plugin.Element.FLAG_STATIC);
}
{
- analyzer.FieldElement engineElement =
- unit.declaredElement.enums[1].getField('index');
+ var engineElement = unit.declaredElement.enums[1].getField('index');
// create notification Element
- plugin.Element element = converter.convertElement(engineElement);
+ var element = converter.convertElement(engineElement);
expect(element.kind, plugin.ElementKind.FIELD);
expect(element.name, 'index');
{
- plugin.Location location = element.location;
+ var location = element.location;
expect(location.file, testFile);
expect(location.offset, -1);
expect(location.length, 'index'.length);
@@ -402,15 +394,14 @@
expect(element.flags, plugin.Element.FLAG_FINAL);
}
{
- analyzer.FieldElement engineElement =
- unit.declaredElement.enums[1].getField('values');
+ var engineElement = unit.declaredElement.enums[1].getField('values');
// create notification Element
- plugin.Element element = converter.convertElement(engineElement);
+ var element = converter.convertElement(engineElement);
expect(element.kind, plugin.ElementKind.FIELD);
expect(element.name, 'values');
{
- plugin.Location location = element.location;
+ var location = element.location;
expect(location.file, testFile);
expect(location.offset, -1);
expect(location.length, 'values'.length);
@@ -425,19 +416,19 @@
}
Future<void> test_convertElement_field() async {
- analyzer.Source source = addSource(testFile, '''
+ var source = addSource(testFile, '''
class A {
static const myField = 42;
}''');
- analyzer.CompilationUnit unit = await resolveLibraryUnit(source);
- analyzer.FieldElement engineElement =
+ var unit = await resolveLibraryUnit(source);
+ var engineElement =
findElementInUnit(unit, 'myField') as analyzer.FieldElement;
// create notification Element
- plugin.Element element = converter.convertElement(engineElement);
+ var element = converter.convertElement(engineElement);
expect(element.kind, plugin.ElementKind.FIELD);
expect(element.name, 'myField');
{
- plugin.Location location = element.location;
+ var location = element.location;
expect(location.file, testFile);
expect(location.offset, 25);
expect(location.length, 'myField'.length);
@@ -451,19 +442,19 @@
}
Future<void> test_convertElement_functionTypeAlias() async {
- analyzer.Source source = addSource(testFile, '''
+ var source = addSource(testFile, '''
typedef int F<T>(String x);
''');
- analyzer.CompilationUnit unit = await resolveLibraryUnit(source);
- analyzer.FunctionTypeAliasElement engineElement =
+ var unit = await resolveLibraryUnit(source);
+ var engineElement =
findElementInUnit(unit, 'F') as analyzer.FunctionTypeAliasElement;
// create notification Element
- plugin.Element element = converter.convertElement(engineElement);
+ var element = converter.convertElement(engineElement);
expect(element.kind, plugin.ElementKind.FUNCTION_TYPE_ALIAS);
expect(element.name, 'F');
expect(element.typeParameters, '<T>');
{
- plugin.Location location = element.location;
+ var location = element.location;
expect(location.file, testFile);
expect(location.offset, 12);
expect(location.length, 'F'.length);
@@ -476,19 +467,19 @@
}
Future<void> test_convertElement_genericTypeAlias_function() async {
- analyzer.Source source = addSource(testFile, '''
+ var source = addSource(testFile, '''
typedef F<T> = int Function(String x);
''');
- analyzer.CompilationUnit unit = await resolveLibraryUnit(source);
- analyzer.FunctionTypeAliasElement engineElement =
+ var unit = await resolveLibraryUnit(source);
+ var engineElement =
findElementInUnit(unit, 'F') as analyzer.FunctionTypeAliasElement;
// create notification Element
- plugin.Element element = converter.convertElement(engineElement);
+ var element = converter.convertElement(engineElement);
expect(element.kind, plugin.ElementKind.FUNCTION_TYPE_ALIAS);
expect(element.name, 'F');
expect(element.typeParameters, '<T>');
{
- plugin.Location location = element.location;
+ var location = element.location;
expect(location.file, testFile);
expect(location.offset, 8);
expect(location.length, 'F'.length);
@@ -501,20 +492,20 @@
}
Future<void> test_convertElement_getter() async {
- analyzer.Source source = addSource(testFile, '''
+ var source = addSource(testFile, '''
class A {
String get myGetter => 42;
}''');
- analyzer.CompilationUnit unit = await resolveLibraryUnit(source);
- analyzer.PropertyAccessorElement engineElement =
+ var unit = await resolveLibraryUnit(source);
+ var engineElement =
findElementInUnit(unit, 'myGetter', analyzer.ElementKind.GETTER)
as analyzer.PropertyAccessorElement;
// create notification Element
- plugin.Element element = converter.convertElement(engineElement);
+ var element = converter.convertElement(engineElement);
expect(element.kind, plugin.ElementKind.GETTER);
expect(element.name, 'myGetter');
{
- plugin.Location location = element.location;
+ var location = element.location;
expect(location.file, testFile);
expect(location.offset, 23);
expect(location.length, 'myGetter'.length);
@@ -527,21 +518,21 @@
}
Future<void> test_convertElement_method() async {
- analyzer.Source source = addSource(testFile, '''
+ var source = addSource(testFile, '''
class A {
static List<String> myMethod(int a, {String b, int c}) {
return null;
}
}''');
- analyzer.CompilationUnit unit = await resolveLibraryUnit(source);
- analyzer.MethodElement engineElement =
+ var unit = await resolveLibraryUnit(source);
+ var engineElement =
findElementInUnit(unit, 'myMethod') as analyzer.MethodElement;
// create notification Element
- plugin.Element element = converter.convertElement(engineElement);
+ var element = converter.convertElement(engineElement);
expect(element.kind, plugin.ElementKind.METHOD);
expect(element.name, 'myMethod');
{
- plugin.Location location = element.location;
+ var location = element.location;
expect(location.file, testFile);
expect(location.offset, 32);
expect(location.length, 'myGetter'.length);
@@ -554,20 +545,20 @@
}
Future<void> test_convertElement_setter() async {
- analyzer.Source source = addSource(testFile, '''
+ var source = addSource(testFile, '''
class A {
set mySetter(String x) {}
}''');
- analyzer.CompilationUnit unit = await resolveLibraryUnit(source);
- analyzer.PropertyAccessorElement engineElement =
+ var unit = await resolveLibraryUnit(source);
+ var engineElement =
findElementInUnit(unit, 'mySetter', analyzer.ElementKind.SETTER)
as analyzer.PropertyAccessorElement;
// create notification Element
- plugin.Element element = converter.convertElement(engineElement);
+ var element = converter.convertElement(engineElement);
expect(element.kind, plugin.ElementKind.SETTER);
expect(element.name, 'mySetter');
{
- plugin.Location location = element.location;
+ var location = element.location;
expect(location.file, testFile);
expect(location.offset, 16);
expect(location.length, 'mySetter'.length);
@@ -615,7 +606,7 @@
}
void test_convertErrorSeverity() {
- for (analyzer.ErrorSeverity severity in analyzer.ErrorSeverity.values) {
+ for (var severity in analyzer.ErrorSeverity.values) {
if (severity != analyzer.ErrorSeverity.NONE) {
expect(converter.convertErrorSeverity(severity), isNotNull,
reason: severity.name);
@@ -624,28 +615,28 @@
}
void test_convertErrorType() {
- for (analyzer.ErrorType type in analyzer.ErrorType.values) {
+ for (var type in analyzer.ErrorType.values) {
expect(converter.convertErrorType(type), isNotNull, reason: type.name);
}
}
Future<void> test_fromElement_LABEL() async {
- analyzer.Source source = addSource(testFile, '''
+ var source = addSource(testFile, '''
main() {
myLabel:
while (true) {
break myLabel;
}
}''');
- analyzer.CompilationUnit unit = await resolveLibraryUnit(source);
- analyzer.LabelElement engineElement =
+ var unit = await resolveLibraryUnit(source);
+ var engineElement =
findElementInUnit(unit, 'myLabel') as analyzer.LabelElement;
// create notification Element
- plugin.Element element = converter.convertElement(engineElement);
+ var element = converter.convertElement(engineElement);
expect(element.kind, plugin.ElementKind.LABEL);
expect(element.name, 'myLabel');
{
- plugin.Location location = element.location;
+ var location = element.location;
expect(location.file, testFile);
expect(location.offset, 9);
expect(location.length, 'myLabel'.length);
diff --git a/pkg/analyzer_plugin/test/utilities/completion/completion_contributor_util.dart b/pkg/analyzer_plugin/test/utilities/completion/completion_contributor_util.dart
index a71d2f7..f780177 100644
--- a/pkg/analyzer_plugin/test/utilities/completion/completion_contributor_util.dart
+++ b/pkg/analyzer_plugin/test/utilities/completion/completion_contributor_util.dart
@@ -4,7 +4,6 @@
import 'dart:async';
-import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/src/generated/source.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:analyzer_plugin/src/utilities/completion/completion_core.dart';
@@ -16,8 +15,8 @@
import '../../support/abstract_context.dart';
int suggestionComparator(CompletionSuggestion s1, CompletionSuggestion s2) {
- String c1 = s1.completion.toLowerCase();
- String c2 = s2.completion.toLowerCase();
+ var c1 = s1.completion.toLowerCase();
+ var c2 = s2.completion.toLowerCase();
return c1.compareTo(c2);
}
@@ -43,7 +42,7 @@
expect(completionOffset, isNull, reason: 'Call addTestUnit exactly once');
completionOffset = content.indexOf('^');
expect(completionOffset, isNot(equals(-1)), reason: 'missing ^');
- int nextOffset = content.indexOf('^', completionOffset + 1);
+ var nextOffset = content.indexOf('^', completionOffset + 1);
expect(nextOffset, equals(-1), reason: 'too many ^');
content = content.substring(0, completionOffset) +
content.substring(completionOffset + 1);
@@ -73,7 +72,7 @@
}
return;
}
- CompletionSuggestion suggestion = suggestions.firstWhere(
+ var suggestion = suggestions.firstWhere(
(CompletionSuggestion cs) => cs.kind == kind,
orElse: () => null);
if (suggestion != null) {
@@ -82,7 +81,7 @@
}
void assertNotSuggested(String completion) {
- CompletionSuggestion suggestion = suggestions.firstWhere(
+ var suggestion = suggestions.firstWhere(
(CompletionSuggestion cs) => cs.completion == completion,
orElse: () => null);
if (suggestion != null) {
@@ -103,7 +102,7 @@
String paramType,
String defaultArgListString = _UNCHECKED,
List<int> defaultArgumentListTextRanges}) {
- CompletionSuggestion cs =
+ var cs =
getSuggest(completion: completion, csKind: csKind, elemKind: elemKind);
if (cs == null) {
failedCompletion('expected $completion $csKind $elemKind', suggestions);
@@ -154,13 +153,13 @@
String elemFile,
String elemName,
int elemOffset}) {
- CompletionSuggestion cs = assertSuggest(name,
+ var cs = assertSuggest(name,
csKind: kind,
relevance: relevance,
isDeprecated: isDeprecated,
elemFile: elemFile,
elemOffset: elemOffset);
- Element element = cs.element;
+ var element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(ElementKind.CLASS));
expect(element.name, equals(elemName ?? name));
@@ -173,9 +172,8 @@
CompletionSuggestion assertSuggestClassTypeAlias(String name,
{int relevance = DART_RELEVANCE_DEFAULT,
CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION}) {
- CompletionSuggestion cs =
- assertSuggest(name, csKind: kind, relevance: relevance);
- Element element = cs.element;
+ var cs = assertSuggest(name, csKind: kind, relevance: relevance);
+ var element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(ElementKind.CLASS_TYPE_ALIAS));
expect(element.name, equals(name));
@@ -190,23 +188,22 @@
int elemOffset,
String defaultArgListString = _UNCHECKED,
List<int> defaultArgumentListTextRanges}) {
- CompletionSuggestion cs = assertSuggest(name,
+ var cs = assertSuggest(name,
relevance: relevance,
elemOffset: elemOffset,
defaultArgListString: defaultArgListString,
defaultArgumentListTextRanges: defaultArgumentListTextRanges);
- Element element = cs.element;
+ var element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(ElementKind.CONSTRUCTOR));
- int index = name.indexOf('.');
+ var index = name.indexOf('.');
expect(element.name, index >= 0 ? name.substring(index + 1) : '');
return cs;
}
CompletionSuggestion assertSuggestEnum(String completion,
{bool isDeprecated = false}) {
- CompletionSuggestion suggestion =
- assertSuggest(completion, isDeprecated: isDeprecated);
+ var suggestion = assertSuggest(completion, isDeprecated: isDeprecated);
expect(suggestion.isDeprecated, isDeprecated);
expect(suggestion.element.kind, ElementKind.ENUM);
return suggestion;
@@ -214,7 +211,7 @@
CompletionSuggestion assertSuggestEnumConst(String completion,
{int relevance = DART_RELEVANCE_DEFAULT, bool isDeprecated = false}) {
- CompletionSuggestion suggestion = assertSuggest(completion,
+ var suggestion = assertSuggest(completion,
relevance: relevance, isDeprecated: isDeprecated);
expect(suggestion.completion, completion);
expect(suggestion.isDeprecated, isDeprecated);
@@ -226,14 +223,14 @@
{int relevance = DART_RELEVANCE_DEFAULT,
CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION,
bool isDeprecated = false}) {
- CompletionSuggestion cs = assertSuggest(name,
+ var cs = assertSuggest(name,
csKind: kind,
relevance: relevance,
elemKind: ElementKind.FIELD,
isDeprecated: isDeprecated);
// The returnType represents the type of a field
expect(cs.returnType, type ?? 'dynamic');
- Element element = cs.element;
+ var element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(ElementKind.FIELD));
expect(element.name, equals(name));
@@ -250,7 +247,7 @@
int relevance = DART_RELEVANCE_DEFAULT,
String defaultArgListString = _UNCHECKED,
List<int> defaultArgumentListTextRanges}) {
- CompletionSuggestion cs = assertSuggest(name,
+ var cs = assertSuggest(name,
csKind: kind,
relevance: relevance,
isDeprecated: isDeprecated,
@@ -261,12 +258,12 @@
} else if (isNullExpectedReturnTypeConsideredDynamic) {
expect(cs.returnType, 'dynamic');
}
- Element element = cs.element;
+ var element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(ElementKind.FUNCTION));
expect(element.name, equals(name));
expect(element.isDeprecated, equals(isDeprecated));
- String param = element.parameters;
+ var param = element.parameters;
expect(param, isNotNull);
expect(param[0], equals('('));
expect(param[param.length - 1], equals(')'));
@@ -284,7 +281,7 @@
{bool isDeprecated = false,
int relevance = DART_RELEVANCE_DEFAULT,
CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION}) {
- CompletionSuggestion cs = assertSuggest(name,
+ var cs = assertSuggest(name,
csKind: kind, relevance: relevance, isDeprecated: isDeprecated);
if (returnType != null) {
expect(cs.returnType, returnType);
@@ -293,7 +290,7 @@
} else {
expect(cs.returnType, isNull);
}
- Element element = cs.element;
+ var element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(ElementKind.FUNCTION_TYPE_ALIAS));
expect(element.name, equals(name));
@@ -313,13 +310,13 @@
{int relevance = DART_RELEVANCE_DEFAULT,
CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION,
bool isDeprecated = false}) {
- CompletionSuggestion cs = assertSuggest(name,
+ var cs = assertSuggest(name,
csKind: kind,
relevance: relevance,
elemKind: ElementKind.GETTER,
isDeprecated: isDeprecated);
expect(cs.returnType, returnType ?? 'dynamic');
- Element element = cs.element;
+ var element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(ElementKind.GETTER));
expect(element.name, equals(name));
@@ -336,7 +333,7 @@
bool isDeprecated = false,
String defaultArgListString = _UNCHECKED,
List<int> defaultArgumentListTextRanges}) {
- CompletionSuggestion cs = assertSuggest(name,
+ var cs = assertSuggest(name,
csKind: kind,
relevance: relevance,
isDeprecated: isDeprecated,
@@ -344,11 +341,11 @@
defaultArgumentListTextRanges: defaultArgumentListTextRanges);
expect(cs.declaringType, equals(declaringType));
expect(cs.returnType, returnType ?? 'dynamic');
- Element element = cs.element;
+ var element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(ElementKind.METHOD));
expect(element.name, equals(name));
- String param = element.parameters;
+ var param = element.parameters;
expect(param, isNotNull);
expect(param[0], equals('('));
expect(param[param.length - 1], equals(')'));
@@ -361,7 +358,7 @@
{int relevance = DART_RELEVANCE_DEFAULT,
CompletionSuggestionKind kind = CompletionSuggestionKind.IDENTIFIER,
bool isDeprecated = false}) {
- CompletionSuggestion cs = assertSuggest(name,
+ var cs = assertSuggest(name,
csKind: kind, relevance: relevance, isDeprecated: isDeprecated);
expect(cs.completion, equals(name));
expect(cs.element, isNull);
@@ -372,9 +369,9 @@
CompletionSuggestion assertSuggestSetter(String name,
{int relevance = DART_RELEVANCE_DEFAULT,
CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION}) {
- CompletionSuggestion cs = assertSuggest(name,
+ var cs = assertSuggest(name,
csKind: kind, relevance: relevance, elemKind: ElementKind.SETTER);
- Element element = cs.element;
+ var element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(ElementKind.SETTER));
expect(element.name, equals(name));
@@ -391,14 +388,13 @@
CompletionSuggestion assertSuggestTopLevelVar(String name, String returnType,
{int relevance = DART_RELEVANCE_DEFAULT,
CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION}) {
- CompletionSuggestion cs =
- assertSuggest(name, csKind: kind, relevance: relevance);
+ var cs = assertSuggest(name, csKind: kind, relevance: relevance);
if (returnType != null) {
expect(cs.returnType, returnType);
} else if (isNullExpectedReturnTypeConsideredDynamic) {
expect(cs.returnType, 'dynamic');
}
- Element element = cs.element;
+ var element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(ElementKind.TOP_LEVEL_VARIABLE));
expect(element.name, equals(name));
@@ -417,19 +413,19 @@
}
Future computeSuggestions() async {
- ResolvedUnitResult result = await driver.getResult(testFile);
+ var result = await driver.getResult(testFile);
testSource = result.unit.declaredElement.source;
request =
DartCompletionRequestImpl(resourceProvider, completionOffset, result);
- CompletionTarget target =
+ var target =
CompletionTarget.forOffset(request.result.unit, request.offset);
var range = target.computeReplacementRange(request.offset);
replacementOffset = range.offset;
replacementLength = range.length;
// Request completions
- CompletionCollectorImpl collector = CompletionCollectorImpl();
+ var collector = CompletionCollectorImpl();
await contributor.computeSuggestions(request, collector);
suggestions = collector.suggestions;
expect(suggestions, isNotNull, reason: 'expected suggestions');
@@ -439,7 +435,7 @@
void failedCompletion(String message,
[Iterable<CompletionSuggestion> completions]) {
- StringBuffer sb = StringBuffer(message);
+ var sb = StringBuffer(message);
if (completions != null) {
sb.write('\n found');
completions.toList()
@@ -465,7 +461,7 @@
return;
}
if (elemKind != null) {
- Element element = s.element;
+ var element = s.element;
if (element == null || elemKind != element.kind) {
return;
}
diff --git a/pkg/analyzer_plugin/test/utilities/completion/inherited_reference_contributor_test.dart b/pkg/analyzer_plugin/test/utilities/completion/inherited_reference_contributor_test.dart
index 7a6c17d..927b5b3 100644
--- a/pkg/analyzer_plugin/test/utilities/completion/inherited_reference_contributor_test.dart
+++ b/pkg/analyzer_plugin/test/utilities/completion/inherited_reference_contributor_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:analyzer_plugin/utilities/completion/completion_core.dart';
import 'package:analyzer_plugin/utilities/completion/inherited_reference_contributor.dart';
import 'package:test/test.dart';
@@ -190,7 +189,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'A', 'void');
+ var suggestion = assertSuggestMethod('m', 'A', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -210,7 +209,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'A', 'void');
+ var suggestion = assertSuggestMethod('m', 'A', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -233,7 +232,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'A', 'void');
+ var suggestion = assertSuggestMethod('m', 'A', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -254,7 +253,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'A', 'void');
+ var suggestion = assertSuggestMethod('m', 'A', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -277,7 +276,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'A', 'void');
+ var suggestion = assertSuggestMethod('m', 'A', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -297,7 +296,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'A', 'void');
+ var suggestion = assertSuggestMethod('m', 'A', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -320,7 +319,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'A', 'void');
+ var suggestion = assertSuggestMethod('m', 'A', 'void');
expect(suggestion.parameterNames, isEmpty);
expect(suggestion.parameterTypes, isEmpty);
expect(suggestion.requiredParameterCount, 0);
@@ -337,7 +336,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'A', 'void');
+ var suggestion = assertSuggestMethod('m', 'A', 'void');
expect(suggestion.parameterNames, isEmpty);
expect(suggestion.parameterTypes, isEmpty);
expect(suggestion.requiredParameterCount, 0);
@@ -357,7 +356,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'A', 'void');
+ var suggestion = assertSuggestMethod('m', 'A', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -377,7 +376,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'A', 'void');
+ var suggestion = assertSuggestMethod('m', 'A', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -400,7 +399,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'A', 'void');
+ var suggestion = assertSuggestMethod('m', 'A', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -445,7 +444,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestField('x', 'int');
+ var suggestion = assertSuggestField('x', 'int');
assertHasNoParameterInfo(suggestion);
}
@@ -462,7 +461,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestGetter('x', 'int');
+ var suggestion = assertSuggestGetter('x', 'int');
assertHasNoParameterInfo(suggestion);
}
@@ -479,7 +478,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestSetter('x');
+ var suggestion = assertSuggestSetter('x');
assertHasNoParameterInfo(suggestion);
}
diff --git a/pkg/analyzer_plugin/test/utilities/completion/type_member_contributor_test.dart b/pkg/analyzer_plugin/test/utilities/completion/type_member_contributor_test.dart
index f33fcc0..de0ff2c 100644
--- a/pkg/analyzer_plugin/test/utilities/completion/type_member_contributor_test.dart
+++ b/pkg/analyzer_plugin/test/utilities/completion/type_member_contributor_test.dart
@@ -39,7 +39,7 @@
}
''');
await computeSuggestions();
- List<CompletionSuggestion> suggestionsForX = suggestions
+ var suggestionsForX = suggestions
.where((CompletionSuggestion s) => s.completion == 'x')
.toList();
expect(suggestionsForX, hasLength(1));
@@ -2046,7 +2046,7 @@
}
''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'C', 'int');
+ var suggestion = assertSuggestMethod('m', 'C', 'int');
expect(suggestion.parameterTypes[0], 'int');
expect(suggestion.element.returnType, 'int');
expect(suggestion.element.parameters, '(int t)');
@@ -2065,7 +2065,7 @@
// TODO(paulberry): modify assertSuggestSetter so that we can pass 'int'
// as a parmeter to it, and it will check the appropriate field in
// the suggestion object.
- CompletionSuggestion suggestion = assertSuggestSetter('t');
+ var suggestion = assertSuggestSetter('t');
expect(suggestion.element.parameters, '(int value)');
}
@@ -2586,7 +2586,7 @@
}
void main() {new C().^}''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'C', 'void');
+ var suggestion = assertSuggestMethod('m', 'C', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -2603,7 +2603,7 @@
}
void main() {new C().^}''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'C', 'void');
+ var suggestion = assertSuggestMethod('m', 'C', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -2620,7 +2620,7 @@
}
void main() {new C().^}''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'C', 'void');
+ var suggestion = assertSuggestMethod('m', 'C', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -2637,7 +2637,7 @@
}
void main() {new C().^}''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'C', 'void');
+ var suggestion = assertSuggestMethod('m', 'C', 'void');
expect(suggestion.parameterNames, isEmpty);
expect(suggestion.parameterTypes, isEmpty);
expect(suggestion.requiredParameterCount, 0);
@@ -2651,7 +2651,7 @@
}
void main() {new C().^}''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'C', 'void');
+ var suggestion = assertSuggestMethod('m', 'C', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -2668,7 +2668,7 @@
}
void main() {new C().^}''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestMethod('m', 'C', 'void');
+ var suggestion = assertSuggestMethod('m', 'C', 'void');
expect(suggestion.parameterNames, hasLength(2));
expect(suggestion.parameterNames[0], 'x');
expect(suggestion.parameterTypes[0], 'dynamic');
@@ -2934,7 +2934,7 @@
}
void main() {new C().^}''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestField('x', 'int');
+ var suggestion = assertSuggestField('x', 'int');
assertHasNoParameterInfo(suggestion);
}
@@ -2945,7 +2945,7 @@
}
void main() {int y = new C().^}''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestGetter('x', 'int');
+ var suggestion = assertSuggestGetter('x', 'int');
assertHasNoParameterInfo(suggestion);
}
@@ -2956,7 +2956,7 @@
}
void main() {int y = new C().^}''');
await computeSuggestions();
- CompletionSuggestion suggestion = assertSuggestSetter('x');
+ var suggestion = assertSuggestSetter('x');
assertHasNoParameterInfo(suggestion);
}
diff --git a/pkg/analyzer_plugin/test/utilities/navigation_test.dart b/pkg/analyzer_plugin/test/utilities/navigation_test.dart
index f704fa7..05dfda8 100644
--- a/pkg/analyzer_plugin/test/utilities/navigation_test.dart
+++ b/pkg/analyzer_plugin/test/utilities/navigation_test.dart
@@ -5,7 +5,6 @@
import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart';
import 'package:analyzer_plugin/src/utilities/navigation/navigation.dart';
-import 'package:analyzer_plugin/utilities/generator.dart';
import 'package:analyzer_plugin/utilities/navigation/navigation.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -21,19 +20,19 @@
ResolvedUnitResult resolvedUnit = MockResolvedUnitResult(path: 'a.dart');
void test_none() {
- NavigationGenerator generator = NavigationGenerator([]);
+ var generator = NavigationGenerator([]);
NavigationRequest request =
DartNavigationRequestImpl(resourceProvider, 0, 100, resolvedUnit);
- GeneratorResult result = generator.generateNavigationNotification(request);
+ var result = generator.generateNavigationNotification(request);
expect(result.notifications, hasLength(1));
}
void test_normal() {
- TestContributor contributor = TestContributor();
- NavigationGenerator generator = NavigationGenerator([contributor]);
+ var contributor = TestContributor();
+ var generator = NavigationGenerator([contributor]);
NavigationRequest request =
DartNavigationRequestImpl(resourceProvider, 0, 100, resolvedUnit);
- GeneratorResult result = generator.generateNavigationNotification(request);
+ var result = generator.generateNavigationNotification(request);
expect(result.notifications, hasLength(1));
expect(contributor.count, 1);
}
@@ -42,15 +41,15 @@
/// throws an error and that an error in one contributor doesn't prevent other
/// contributors from being called.
void test_withException() {
- TestContributor contributor1 = TestContributor();
- TestContributor contributor2 = TestContributor(throwException: true);
- TestContributor contributor3 = TestContributor();
- TestContributor contributor4 = TestContributor(throwException: true);
- NavigationGenerator generator = NavigationGenerator(
+ var contributor1 = TestContributor();
+ var contributor2 = TestContributor(throwException: true);
+ var contributor3 = TestContributor();
+ var contributor4 = TestContributor(throwException: true);
+ var generator = NavigationGenerator(
[contributor1, contributor2, contributor3, contributor4]);
NavigationRequest request =
DartNavigationRequestImpl(resourceProvider, 0, 100, resolvedUnit);
- GeneratorResult result = generator.generateNavigationNotification(request);
+ var result = generator.generateNavigationNotification(request);
expect(result.notifications, hasLength(3));
expect(
result.notifications.where(
diff --git a/pkg/analyzer_plugin/test/utilities/range_factory_test.dart b/pkg/analyzer_plugin/test/utilities/range_factory_test.dart
index 71b6ab1..8648555 100644
--- a/pkg/analyzer_plugin/test/utilities/range_factory_test.dart
+++ b/pkg/analyzer_plugin/test/utilities/range_factory_test.dart
@@ -3,7 +3,6 @@
// BSD-style license that can be found in the LICENSE file.
import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/error/error.dart';
import 'package:analyzer/src/generated/parser.dart';
import 'package:analyzer/src/generated/source.dart';
@@ -23,56 +22,50 @@
class SourceRangesTest extends AbstractSingleUnitTest {
Future<void> test_elementName() async {
await resolveTestUnit('class ABC {}');
- Element element = findElement('ABC');
+ var element = findElement('ABC');
expect(range.elementName(element), SourceRange(6, 3));
}
Future<void> test_endEnd() async {
await resolveTestUnit('main() {}');
- FunctionDeclaration mainFunction =
- testUnit.declarations[0] as FunctionDeclaration;
- SimpleIdentifier mainName = mainFunction.name;
- FunctionBody mainBody = mainFunction.functionExpression.body;
+ var mainFunction = testUnit.declarations[0] as FunctionDeclaration;
+ var mainName = mainFunction.name;
+ var mainBody = mainFunction.functionExpression.body;
expect(range.endEnd(mainName, mainBody), SourceRange(4, 5));
}
Future<void> test_endLength() async {
await resolveTestUnit('main() {}');
- FunctionDeclaration mainFunction =
- testUnit.declarations[0] as FunctionDeclaration;
- SimpleIdentifier mainName = mainFunction.name;
+ var mainFunction = testUnit.declarations[0] as FunctionDeclaration;
+ var mainName = mainFunction.name;
expect(range.endLength(mainName, 3), SourceRange(4, 3));
}
Future<void> test_endStart() async {
await resolveTestUnit('main() {}');
- FunctionDeclaration mainFunction =
- testUnit.declarations[0] as FunctionDeclaration;
- SimpleIdentifier mainName = mainFunction.name;
- FunctionBody mainBody = mainFunction.functionExpression.body;
+ var mainFunction = testUnit.declarations[0] as FunctionDeclaration;
+ var mainName = mainFunction.name;
+ var mainBody = mainFunction.functionExpression.body;
expect(range.endStart(mainName, mainBody), SourceRange(4, 3));
}
void test_error() {
- AnalysisError error =
- AnalysisError(null, 10, 5, ParserErrorCode.CONST_CLASS, []);
+ var error = AnalysisError(null, 10, 5, ParserErrorCode.CONST_CLASS, []);
expect(range.error(error), SourceRange(10, 5));
}
Future<void> test_node() async {
await resolveTestUnit('main() {}');
- FunctionDeclaration mainFunction =
- testUnit.declarations[0] as FunctionDeclaration;
- SimpleIdentifier mainName = mainFunction.name;
+ var mainFunction = testUnit.declarations[0] as FunctionDeclaration;
+ var mainName = mainFunction.name;
expect(range.node(mainName), SourceRange(0, 4));
}
Future<void> test_nodes() async {
await resolveTestUnit(' main() {}');
- FunctionDeclaration mainFunction =
- testUnit.declarations[0] as FunctionDeclaration;
- SimpleIdentifier mainName = mainFunction.name;
- FunctionBody mainBody = mainFunction.functionExpression.body;
+ var mainFunction = testUnit.declarations[0] as FunctionDeclaration;
+ var mainName = mainFunction.name;
+ var mainBody = mainFunction.functionExpression.body;
expect(range.nodes([mainName, mainBody]), SourceRange(1, 9));
}
@@ -87,18 +80,16 @@
Future<void> test_startEnd_nodeNode() async {
await resolveTestUnit(' main() {}');
- FunctionDeclaration mainFunction =
- testUnit.declarations[0] as FunctionDeclaration;
- SimpleIdentifier mainName = mainFunction.name;
- FunctionBody mainBody = mainFunction.functionExpression.body;
+ var mainFunction = testUnit.declarations[0] as FunctionDeclaration;
+ var mainName = mainFunction.name;
+ var mainBody = mainFunction.functionExpression.body;
expect(range.startEnd(mainName, mainBody), SourceRange(1, 9));
}
Future<void> test_startLength_node() async {
await resolveTestUnit(' main() {}');
- FunctionDeclaration mainFunction =
- testUnit.declarations[0] as FunctionDeclaration;
- SimpleIdentifier mainName = mainFunction.name;
+ var mainFunction = testUnit.declarations[0] as FunctionDeclaration;
+ var mainName = mainFunction.name;
expect(range.startLength(mainName, 10), SourceRange(1, 10));
}
@@ -108,18 +99,16 @@
Future<void> test_startStart_nodeNode() async {
await resolveTestUnit('main() {}');
- FunctionDeclaration mainFunction =
- testUnit.declarations[0] as FunctionDeclaration;
- SimpleIdentifier mainName = mainFunction.name;
- FunctionBody mainBody = mainFunction.functionExpression.body;
+ var mainFunction = testUnit.declarations[0] as FunctionDeclaration;
+ var mainName = mainFunction.name;
+ var mainBody = mainFunction.functionExpression.body;
expect(range.startStart(mainName, mainBody), SourceRange(0, 7));
}
Future<void> test_token() async {
await resolveTestUnit(' main() {}');
- FunctionDeclaration mainFunction =
- testUnit.declarations[0] as FunctionDeclaration;
- SimpleIdentifier mainName = mainFunction.name;
+ var mainFunction = testUnit.declarations[0] as FunctionDeclaration;
+ var mainName = mainFunction.name;
expect(range.token(mainName.beginToken), SourceRange(1, 4));
}
}
diff --git a/pkg/analyzer_plugin/test/utilities/subscriptions/subscription_manager_test.dart b/pkg/analyzer_plugin/test/utilities/subscriptions/subscription_manager_test.dart
index 2e39e8b..389d699 100644
--- a/pkg/analyzer_plugin/test/utilities/subscriptions/subscription_manager_test.dart
+++ b/pkg/analyzer_plugin/test/utilities/subscriptions/subscription_manager_test.dart
@@ -48,8 +48,7 @@
//
// Set the initial set of subscriptions.
//
- Map<String, List<AnalysisService>> newSubscriptions =
- manager.setSubscriptions({
+ var newSubscriptions = manager.setSubscriptions({
AnalysisService.HIGHLIGHTS: [fooPath, barPath],
AnalysisService.NAVIGATION: [fooPath]
});
diff --git a/pkg/analyzer_plugin/test/utils/package_root.dart b/pkg/analyzer_plugin/test/utils/package_root.dart
index 98c24ba..8ef4cfc 100644
--- a/pkg/analyzer_plugin/test/utils/package_root.dart
+++ b/pkg/analyzer_plugin/test/utils/package_root.dart
@@ -11,18 +11,18 @@
String get packageRoot {
// If the package root directory is specified on the command line using
// -DpkgRoot=..., use it.
- String pkgRootVar = bool.hasEnvironment('pkgRoot')
+ var pkgRootVar = bool.hasEnvironment('pkgRoot')
? const String.fromEnvironment('pkgRoot')
: null;
if (pkgRootVar != null) {
- String path = pathos.join(Directory.current.path, pkgRootVar);
+ var path = pathos.join(Directory.current.path, pkgRootVar);
if (!path.endsWith(pathos.separator)) path += pathos.separator;
return path;
}
// Otherwise try to guess based on the script path.
- String scriptPath = pathos.fromUri(Platform.script);
- List<String> parts = pathos.split(scriptPath);
- int pkgIndex = parts.indexOf('pkg');
+ var scriptPath = pathos.fromUri(Platform.script);
+ var parts = pathos.split(scriptPath);
+ var pkgIndex = parts.indexOf('pkg');
if (pkgIndex != -1) {
return pathos.joinAll(parts.sublist(0, pkgIndex + 1)) + pathos.separator;
}
diff --git a/pkg/analyzer_plugin/test/verify_sorted_test.dart b/pkg/analyzer_plugin/test/verify_sorted_test.dart
new file mode 100644
index 0000000..617246b
--- /dev/null
+++ b/pkg/analyzer_plugin/test/verify_sorted_test.dart
@@ -0,0 +1,81 @@
+// Copyright (c) 2019, 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.
+
+import 'dart:io';
+
+import 'package:analysis_server/src/services/correction/sort_members.dart';
+import 'package:analyzer/dart/analysis/analysis_context_collection.dart';
+import 'package:analyzer/dart/analysis/results.dart';
+import 'package:analyzer/dart/analysis/session.dart';
+import 'package:analyzer/file_system/file_system.dart';
+import 'package:analyzer/file_system/physical_file_system.dart';
+import 'package:test/test.dart';
+
+import 'utils/package_root.dart';
+
+void main() {
+ var provider = PhysicalResourceProvider.INSTANCE;
+ var normalizedRoot = provider.pathContext.normalize(packageRoot);
+ var packagePath =
+ provider.pathContext.join(normalizedRoot, 'analyzer_plugin');
+ // TODO(brianwilkerson) Fix the generator to sort the generated files and
+ // remove these exclusions.
+ var generatedFilePaths = [
+ provider.pathContext
+ .join(packagePath, 'lib', 'protocol', 'protocol_common.dart'),
+ provider.pathContext
+ .join(packagePath, 'lib', 'protocol', 'protocol_generated.dart'),
+ provider.pathContext.join(packagePath, 'test', 'integration', 'support',
+ 'integration_test_methods.dart'),
+ provider.pathContext.join(packagePath, 'test', 'integration', 'support',
+ 'protocol_matchers.dart'),
+ ];
+
+ var collection = AnalysisContextCollection(
+ includedPaths: <String>[packagePath],
+ excludedPaths: generatedFilePaths,
+ resourceProvider: provider);
+ var contexts = collection.contexts;
+ if (contexts.length != 1) {
+ fail('The directory $packagePath contains multiple analysis contexts.');
+ }
+
+ buildTestsIn(contexts[0].currentSession, packagePath, generatedFilePaths,
+ provider.getFolder(packagePath));
+}
+
+void buildTestsIn(AnalysisSession session, String testDirPath,
+ List<String> generatedFilePaths, Folder directory) {
+ var pathContext = session.resourceProvider.pathContext;
+ var children = directory.getChildren();
+ children.sort((first, second) => first.shortName.compareTo(second.shortName));
+ for (var child in children) {
+ if (child is Folder) {
+ buildTestsIn(session, testDirPath, generatedFilePaths, child);
+ } else if (child is File && child.shortName.endsWith('.dart')) {
+ var path = child.path;
+ if (generatedFilePaths.contains(path)) {
+ continue;
+ }
+ var relativePath = pathContext.relative(path, from: testDirPath);
+ test(relativePath, () {
+ var result = session.getParsedUnit(path);
+ if (result.state != ResultState.VALID) {
+ fail('Could not parse $path');
+ }
+ var code = result.content;
+ var unit = result.unit;
+ var errors = result.errors;
+ if (errors.isNotEmpty) {
+ fail('Errors found when parsing $path');
+ }
+ var sorter = MemberSorter(code, unit);
+ var edits = sorter.sort();
+ if (edits.isNotEmpty) {
+ fail('Unsorted file $path');
+ }
+ });
+ }
+ }
+}
diff --git a/pkg/analyzer_plugin/test/verify_tests_test.dart b/pkg/analyzer_plugin/test/verify_tests_test.dart
index 7dabc4f..2a05ff6 100644
--- a/pkg/analyzer_plugin/test/verify_tests_test.dart
+++ b/pkg/analyzer_plugin/test/verify_tests_test.dart
@@ -2,7 +2,6 @@
// 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.
-import 'package:analyzer/dart/analysis/analysis_context.dart';
import 'package:analyzer/dart/analysis/analysis_context_collection.dart';
import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/dart/analysis/session.dart';
@@ -15,15 +14,15 @@
import 'utils/package_root.dart' as package_root;
void main() {
- PhysicalResourceProvider provider = PhysicalResourceProvider.INSTANCE;
- String packageRoot = provider.pathContext.normalize(package_root.packageRoot);
- String analysisServerPath =
+ var provider = PhysicalResourceProvider.INSTANCE;
+ var packageRoot = provider.pathContext.normalize(package_root.packageRoot);
+ var analysisServerPath =
provider.pathContext.join(packageRoot, 'analyzer_plugin');
- String testDirPath = provider.pathContext.join(analysisServerPath, 'test');
+ var testDirPath = provider.pathContext.join(analysisServerPath, 'test');
- AnalysisContextCollection collection = AnalysisContextCollection(
+ var collection = AnalysisContextCollection(
includedPaths: <String>[testDirPath], resourceProvider: provider);
- List<AnalysisContext> contexts = collection.contexts;
+ var contexts = collection.contexts;
if (contexts.length != 1) {
fail('The test directory contains multiple analysis contexts.');
}
@@ -34,11 +33,11 @@
void buildTestsIn(
AnalysisSession session, String testDirPath, Folder directory) {
- List<String> testFileNames = [];
+ var testFileNames = <String>[];
File testAllFile;
- List<Resource> children = directory.getChildren();
+ var children = directory.getChildren();
children.sort((first, second) => first.shortName.compareTo(second.shortName));
- for (Resource child in children) {
+ for (var child in children) {
if (child is Folder) {
if (child.shortName == 'integration') {
continue;
@@ -47,7 +46,7 @@
}
buildTestsIn(session, testDirPath, child);
} else if (child is File) {
- String name = child.shortName;
+ var name = child.shortName;
if (name == 'test_all.dart') {
testAllFile = child;
} else if (name.endsWith('_test.dart')) {
@@ -55,7 +54,7 @@
}
}
}
- String relativePath = path.relative(directory.path, from: testDirPath);
+ var relativePath = path.relative(directory.path, from: testDirPath);
test(relativePath, () {
if (testFileNames.isEmpty) {
return;
@@ -63,18 +62,18 @@
if (testAllFile == null) {
fail('Missing "test_all.dart" in $relativePath');
}
- ParsedUnitResult result = session.getParsedUnit(testAllFile.path);
+ var result = session.getParsedUnit(testAllFile.path);
if (result.state != ResultState.VALID) {
fail('Could not parse ${testAllFile.path}');
}
- List<String> importedFiles = [];
+ var importedFiles = <String>[];
for (var directive in result.unit.directives) {
if (directive is ImportDirective) {
importedFiles.add(directive.uri.stringValue);
}
}
- List<String> missingFiles = [];
- for (String testFileName in testFileNames) {
+ var missingFiles = <String>[];
+ for (var testFileName in testFileNames) {
if (!importedFiles.contains(testFileName)) {
missingFiles.add(testFileName);
}
diff --git a/pkg/analyzer_plugin/tool/spec/api.dart b/pkg/analyzer_plugin/tool/spec/api.dart
index e96e3ce..6b4508a 100644
--- a/pkg/analyzer_plugin/tool/spec/api.dart
+++ b/pkg/analyzer_plugin/tool/spec/api.dart
@@ -185,7 +185,7 @@
/// Get the full type of the notification object, including the common "id"
/// and "error" fields.
TypeDecl get notificationType {
- List<TypeObjectField> fields = [
+ var fields = <TypeObjectField>[
TypeObjectField('event', TypeReference('String', null), null,
value: '$domainName.$event')
];
@@ -253,7 +253,7 @@
/// Get the full type of the request object, including the common "id" and
/// "method" fields.
TypeDecl get requestType {
- List<TypeObjectField> fields = [
+ var fields = <TypeObjectField>[
TypeObjectField('id', TypeReference('String', null), null),
TypeObjectField('method', TypeReference('String', null), null,
value: '$domainName.$method')
@@ -267,7 +267,7 @@
/// Get the full type of the response object, including the common "id" and
/// "error" fields.
TypeDecl get responseType {
- List<TypeObjectField> fields = [
+ var fields = <TypeObjectField>[
TypeObjectField('id', TypeReference('String', null), null),
TypeObjectField('error', TypeReference('RequestError', null), null,
optional: true)
@@ -362,7 +362,7 @@
/// Return the field with the given [name], or null if there is no such field.
TypeObjectField getField(String name) {
- for (TypeObjectField field in fields) {
+ for (var field in fields) {
if (field.name == name) {
return field;
}
diff --git a/pkg/analyzer_plugin/tool/spec/check_all_test.dart b/pkg/analyzer_plugin/tool/spec/check_all_test.dart
index f228a3a..2d4f184 100644
--- a/pkg/analyzer_plugin/tool/spec/check_all_test.dart
+++ b/pkg/analyzer_plugin/tool/spec/check_all_test.dart
@@ -12,10 +12,10 @@
/// Check that all targets have been code generated. If they haven't tell the
/// user to run generate_all.dart.
Future<void> main() async {
- String script = Platform.script.toFilePath(windows: Platform.isWindows);
- List<String> components = split(script);
- int index = components.indexOf('analyzer_plugin');
- String pkgPath = joinAll(components.sublist(0, index + 1));
+ var script = Platform.script.toFilePath(windows: Platform.isWindows);
+ var components = split(script);
+ var index = components.indexOf('analyzer_plugin');
+ var pkgPath = joinAll(components.sublist(0, index + 1));
await GeneratedContent.checkAll(
pkgPath, join(pkgPath, 'tool', 'spec', 'generate_all.dart'), allTargets);
}
diff --git a/pkg/analyzer_plugin/tool/spec/codegen_dart.dart b/pkg/analyzer_plugin/tool/spec/codegen_dart.dart
index 3bb993d..9dacf99 100644
--- a/pkg/analyzer_plugin/tool/spec/codegen_dart.dart
+++ b/pkg/analyzer_plugin/tool/spec/codegen_dart.dart
@@ -17,15 +17,15 @@
/// Convert the given [TypeDecl] to a Dart type.
String dartType(TypeDecl type) {
if (type is TypeReference) {
- String typeName = type.typeName;
- TypeDefinition referencedDefinition = api.types[typeName];
+ var typeName = type.typeName;
+ var referencedDefinition = api.types[typeName];
if (_typeRenames.containsKey(typeName)) {
return _typeRenames[typeName];
}
if (referencedDefinition == null) {
return typeName;
}
- TypeDecl referencedType = referencedDefinition.type;
+ var referencedType = referencedDefinition.type;
if (referencedType is TypeObject || referencedType is TypeEnum) {
return typeName;
}
diff --git a/pkg/analyzer_plugin/tool/spec/codegen_dart_protocol.dart b/pkg/analyzer_plugin/tool/spec/codegen_dart_protocol.dart
index 7b76e20..93c58c0 100644
--- a/pkg/analyzer_plugin/tool/spec/codegen_dart_protocol.dart
+++ b/pkg/analyzer_plugin/tool/spec/codegen_dart_protocol.dart
@@ -28,7 +28,7 @@
GeneratedFile target(bool responseRequiresRequestTime) {
return GeneratedFile('lib/protocol/protocol_generated.dart',
(String pkgPath) async {
- CodegenProtocolVisitor visitor = CodegenProtocolVisitor(
+ var visitor = CodegenProtocolVisitor(
path.basename(pkgPath), responseRequiresRequestTime, readApi(pkgPath));
return visitor.collectCode(visitor.visitApi);
});
@@ -87,22 +87,21 @@
/// Compute the code necessary to compare two objects for equality.
String compareEqualsCode(TypeDecl type, String thisVar, String otherVar) {
- TypeDecl resolvedType = resolveTypeReferenceChain(type);
+ var resolvedType = resolveTypeReferenceChain(type);
if (resolvedType is TypeReference ||
resolvedType is TypeEnum ||
resolvedType is TypeObject ||
resolvedType is TypeUnion) {
return '$thisVar == $otherVar';
} else if (resolvedType is TypeList) {
- String itemTypeName = dartType(resolvedType.itemType);
- String subComparison = compareEqualsCode(resolvedType.itemType, 'a', 'b');
- String closure = '($itemTypeName a, $itemTypeName b) => $subComparison';
+ var itemTypeName = dartType(resolvedType.itemType);
+ var subComparison = compareEqualsCode(resolvedType.itemType, 'a', 'b');
+ var closure = '($itemTypeName a, $itemTypeName b) => $subComparison';
return 'listEqual($thisVar, $otherVar, $closure)';
} else if (resolvedType is TypeMap) {
- String valueTypeName = dartType(resolvedType.valueType);
- String subComparison =
- compareEqualsCode(resolvedType.valueType, 'a', 'b');
- String closure = '($valueTypeName a, $valueTypeName b) => $subComparison';
+ var valueTypeName = dartType(resolvedType.valueType);
+ var subComparison = compareEqualsCode(resolvedType.valueType, 'a', 'b');
+ var closure = '($valueTypeName a, $valueTypeName b) => $subComparison';
return 'mapEqual($thisVar, $otherVar, $closure)';
}
throw Exception("Don't know how to compare for equality: $resolvedType");
@@ -110,9 +109,9 @@
/// Translate each of the given [types] implied by the API to a class.
void emitClasses(List<ImpliedType> types) {
- for (ImpliedType impliedType in types) {
- TypeDecl type = impliedType.type;
- String dartTypeName = capitalize(impliedType.camelName);
+ for (var impliedType in types) {
+ var type = impliedType.type;
+ var dartTypeName = capitalize(impliedType.camelName);
if (type == null) {
writeln();
emitEmptyObjectClass(dartTypeName, impliedType);
@@ -140,7 +139,7 @@
// Name of the constructor to create.
String constructorName;
// Extra arguments for the constructor.
- List<String> extraArgs = <String>[];
+ var extraArgs = <String>[];
switch (impliedType.kind) {
case 'requestParams':
inputType = 'Request';
@@ -175,11 +174,11 @@
default:
return false;
}
- List<String> args = ['$inputType $inputName'];
+ var args = <String>['$inputType $inputName'];
args.addAll(extraArgs);
writeln('factory $className.$constructorName(${args.join(', ')}) {');
indent(() {
- String fieldNameString =
+ var fieldNameString =
literalString(fieldName.replaceFirst(RegExp('^_'), ''));
if (className == 'EditGetRefactoringParams') {
writeln('var params = $className.fromJson(');
@@ -265,11 +264,11 @@
if (emitSpecialStaticMembers(className)) {
writeln();
}
- for (TypeEnumValue value in type.values) {
+ for (var value in type.values) {
docComment(toHtmlVisitor.collectHtml(() {
toHtmlVisitor.translateHtml(value.html);
}));
- String valueString = literalString(value.value);
+ var valueString = literalString(value.value);
writeln(
'static const $className ${value.value} = $className._($valueString);');
writeln();
@@ -281,8 +280,8 @@
write('> VALUES = <');
write(className);
write('>[');
- bool first = true;
- for (TypeEnumValue value in type.values) {
+ var first = true;
+ for (var value in type.values) {
if (first) {
first = false;
} else {
@@ -325,8 +324,8 @@
indent(() {
writeln('switch (name) {');
indent(() {
- for (TypeEnumValue value in type.values) {
- String valueString = literalString(value.value);
+ for (var value in type.values) {
+ var valueString = literalString(value.value);
writeln('case $valueString:');
indent(() {
writeln('return ${value.value};');
@@ -358,7 +357,7 @@
writeln('}');
});
writeln('}');
- String humanReadableNameString =
+ var humanReadableNameString =
literalString(impliedType.humanReadableName);
writeln(
'throw jsonDecoder.mismatch(jsonPath, $humanReadableNameString, json);');
@@ -373,7 +372,7 @@
writeln("import 'package:$packageName/protocol/protocol.dart';");
writeln(
"import 'package:$packageName/src/protocol/protocol_internal.dart';");
- for (String uri in api.types.importUris) {
+ for (var uri in api.types.importUris) {
write("import '");
write(uri);
writeln("';");
@@ -410,14 +409,14 @@
if (emitSpecialStaticMembers(className)) {
writeln();
}
- for (TypeObjectField field in type.fields) {
+ for (var field in type.fields) {
if (field.value != null) {
continue;
}
writeln('${dartType(field.type)} _${field.name};');
writeln();
}
- for (TypeObjectField field in type.fields) {
+ for (var field in type.fields) {
if (field.value != null) {
continue;
}
@@ -478,21 +477,21 @@
/// Emit the constructor for an object class.
void emitObjectConstructor(TypeObject type, String className) {
- List<String> args = <String>[];
- List<String> optionalArgs = <String>[];
- List<CodegenCallback> extraInitCode = <CodegenCallback>[];
- for (TypeObjectField field in type.fields) {
+ var args = <String>[];
+ var optionalArgs = <String>[];
+ var extraInitCode = <CodegenCallback>[];
+ for (var field in type.fields) {
if (field.value != null) {
continue;
}
- String arg = '${dartType(field.type)} ${field.name}';
- String setValueFromArg = 'this.${field.name} = ${field.name};';
+ var arg = '${dartType(field.type)} ${field.name}';
+ var setValueFromArg = 'this.${field.name} = ${field.name};';
if (isOptionalConstructorArg(className, field)) {
optionalArgs.add(arg);
if (!field.optional) {
// Optional constructor arg, but non-optional field. If no arg is
// given, the constructor should populate with the empty list.
- TypeDecl fieldType = field.type;
+ var fieldType = field.type;
if (fieldType is TypeList) {
extraInitCode.add(() {
writeln('if (${field.name} == null) {');
@@ -530,7 +529,7 @@
} else {
writeln(' {');
indent(() {
- for (CodegenCallback callback in extraInitCode) {
+ for (var callback in extraInitCode) {
callback();
}
});
@@ -547,7 +546,7 @@
indent(() {
var comparisons = <String>[];
if (type != null) {
- for (TypeObjectField field in type.fields) {
+ for (var field in type.fields) {
if (field.value != null) {
continue;
}
@@ -558,7 +557,7 @@
if (comparisons.isEmpty) {
writeln('return true;');
} else {
- String concatenated = comparisons.join(' &&\n ');
+ var concatenated = comparisons.join(' &&\n ');
writeln('return $concatenated;');
}
});
@@ -571,8 +570,7 @@
/// Emit the method for decoding an object from JSON.
void emitObjectFromJsonConstructor(
String className, TypeObject type, ImpliedType impliedType) {
- String humanReadableNameString =
- literalString(impliedType.humanReadableName);
+ var humanReadableNameString = literalString(impliedType.humanReadableName);
if (className == 'RefactoringFeedback') {
writeln('factory RefactoringFeedback.fromJson(JsonDecoder jsonDecoder, '
'String jsonPath, Object json, Map responseJson) {');
@@ -599,14 +597,14 @@
writeln('json ??= {};');
writeln('if (json is Map) {');
indent(() {
- List<String> args = <String>[];
- List<String> optionalArgs = <String>[];
- for (TypeObjectField field in type.fields) {
- String fieldNameString = literalString(field.name);
- String fieldAccessor = 'json[$fieldNameString]';
- String jsonPath = 'jsonPath + ${literalString('.${field.name}')}';
+ var args = <String>[];
+ var optionalArgs = <String>[];
+ for (var field in type.fields) {
+ var fieldNameString = literalString(field.name);
+ var fieldAccessor = 'json[$fieldNameString]';
+ var jsonPath = 'jsonPath + ${literalString('.${field.name}')}';
if (field.value != null) {
- String valueString = literalString(field.value as String);
+ var valueString = literalString(field.value as String);
writeln('if ($fieldAccessor != $valueString) {');
indent(() {
writeln(
@@ -620,12 +618,12 @@
} else {
args.add(field.name);
}
- TypeDecl fieldType = field.type;
- String fieldDartType = dartType(fieldType);
+ var fieldType = field.type;
+ var fieldDartType = dartType(fieldType);
writeln('$fieldDartType ${field.name};');
writeln('if (json.containsKey($fieldNameString)) {');
indent(() {
- String fromJson =
+ var fromJson =
fromJsonCode(fieldType).asSnippet(jsonPath, fieldAccessor);
writeln('${field.name} = $fromJson;');
});
@@ -663,7 +661,7 @@
writeln('return ${className.hashCode};');
} else {
writeln('var hash = 0;');
- for (TypeObjectField field in type.fields) {
+ for (var field in type.fields) {
String valueToCombine;
if (field.value != null) {
valueToCombine = field.value.hashCode.toString();
@@ -706,8 +704,8 @@
bool emitSpecialGetters(String className) {
switch (className) {
case 'Element':
- for (String name in specialElementFlags.keys) {
- String flag = 'FLAG_${name.toUpperCase()}';
+ for (var name in specialElementFlags.keys) {
+ var flag = 'FLAG_${name.toUpperCase()}';
writeln(
'bool get ${camelJoin(['is', name])} => (flags & $flag) != 0;');
}
@@ -791,11 +789,11 @@
bool emitSpecialStaticMembers(String className) {
switch (className) {
case 'Element':
- List<String> makeFlagsArgs = <String>[];
- List<String> makeFlagsStatements = <String>[];
+ var makeFlagsArgs = <String>[];
+ var makeFlagsStatements = <String>[];
specialElementFlags.forEach((String name, String value) {
- String flag = 'FLAG_${name.toUpperCase()}';
- String camelName = camelJoin(['is', name]);
+ var flag = 'FLAG_${name.toUpperCase()}';
+ var camelName = camelJoin(['is', name]);
writeln('static const int $flag = $value;');
makeFlagsArgs.add('bool $camelName = false');
makeFlagsStatements.add('if ($camelName) flags |= $flag;');
@@ -803,8 +801,8 @@
writeln();
writeln('static int makeFlags({${makeFlagsArgs.join(', ')}}) {');
indent(() {
- writeln('int flags = 0;');
- for (String statement in makeFlagsStatements) {
+ writeln('var flags = 0;');
+ for (var statement in makeFlagsStatements) {
writeln(statement);
}
writeln('return flags;');
@@ -831,15 +829,15 @@
writeln('Map<String, dynamic> toJson() {');
indent(() {
writeln('var result = <String, dynamic>{};');
- for (TypeObjectField field in type.fields) {
- String fieldNameString = literalString(field.name);
+ for (var field in type.fields) {
+ var fieldNameString = literalString(field.name);
if (field.value != null) {
writeln(
'result[$fieldNameString] = ${literalString(field.value as String)};');
continue;
}
- String fieldToJson = toJsonCode(field.type).asSnippet(field.name);
- String populateField = 'result[$fieldNameString] = $fieldToJson;';
+ var fieldToJson = toJsonCode(field.type).asSnippet(field.name);
+ var populateField = 'result[$fieldNameString] = $fieldToJson;';
if (field.optional) {
writeln('if (${field.name} != null) {');
indent(() {
@@ -861,9 +859,9 @@
if (impliedType.kind == 'notificationParams') {
writeln('Notification toNotification() {');
indent(() {
- String eventString =
+ var eventString =
literalString((impliedType.apiNode as Notification).longEvent);
- String jsonPart = impliedType.type != null ? 'toJson()' : 'null';
+ var jsonPart = impliedType.type != null ? 'toJson()' : 'null';
writeln('return Notification($eventString, $jsonPart);');
});
writeln('}');
@@ -879,9 +877,9 @@
writeln('@override');
writeln('Request toRequest(String id) {');
indent(() {
- String methodString =
+ var methodString =
literalString((impliedType.apiNode as Request).longMethod);
- String jsonPart = impliedType.type != null ? 'toJson()' : 'null';
+ var jsonPart = impliedType.type != null ? 'toJson()' : 'null';
writeln('return Request(id, $methodString, $jsonPart);');
});
writeln('}');
@@ -901,7 +899,7 @@
writeln('Response toResponse(String id) {');
}
indent(() {
- String jsonPart = impliedType.type != null ? 'toJson()' : 'null';
+ var jsonPart = impliedType.type != null ? 'toJson()' : 'null';
if (responseRequiresRequestTime) {
writeln('return Response(id, requestTime, result: $jsonPart);');
} else {
@@ -917,12 +915,12 @@
/// Compute the code necessary to translate [type] from JSON.
FromJsonCode fromJsonCode(TypeDecl type) {
if (type is TypeReference) {
- TypeDefinition referencedDefinition = api.types[type.typeName];
+ var referencedDefinition = api.types[type.typeName];
if (referencedDefinition != null) {
- TypeDecl referencedType = referencedDefinition.type;
+ var referencedType = referencedDefinition.type;
if (referencedType is TypeObject || referencedType is TypeEnum) {
return FromJsonSnippet((String jsonPath, String json) {
- String typeName = dartType(type);
+ var typeName = dartType(type);
if (typeName == 'RefactoringFeedback') {
return '$typeName.fromJson(jsonDecoder, $jsonPath, $json, json)';
} else if (typeName == 'RefactoringOptions') {
@@ -956,12 +954,12 @@
} else {
keyCode = FromJsonIdentity();
}
- FromJsonCode valueCode = fromJsonCode(type.valueType);
+ var valueCode = fromJsonCode(type.valueType);
if (keyCode.isIdentity && valueCode.isIdentity) {
return FromJsonFunction('jsonDecoder.decodeMap');
} else {
return FromJsonSnippet((String jsonPath, String json) {
- StringBuffer result = StringBuffer();
+ var result = StringBuffer();
result.write('jsonDecoder.decodeMap($jsonPath, $json');
if (!keyCode.isIdentity) {
result.write(', keyDecoder: ${keyCode.asClosure}');
@@ -974,7 +972,7 @@
});
}
} else if (type is TypeList) {
- FromJsonCode itemCode = fromJsonCode(type.itemType);
+ var itemCode = fromJsonCode(type.itemType);
if (itemCode.isIdentity) {
return FromJsonFunction('jsonDecoder.decodeList');
} else {
@@ -982,11 +980,11 @@
'jsonDecoder.decodeList($jsonPath, $json, ${itemCode.asClosure})');
}
} else if (type is TypeUnion) {
- List<String> decoders = <String>[];
- for (TypeDecl choice in type.choices) {
- TypeDecl resolvedChoice = resolveTypeReferenceChain(choice);
+ var decoders = <String>[];
+ for (var choice in type.choices) {
+ var resolvedChoice = resolveTypeReferenceChain(choice);
if (resolvedChoice is TypeObject) {
- TypeObjectField field = resolvedChoice.getField(type.field);
+ var field = resolvedChoice.getField(type.field);
if (field == null) {
throw Exception(
'Each choice in the union needs a field named ${type.field}');
@@ -995,7 +993,7 @@
throw Exception(
'Each choice in the union needs a constant value for the field ${type.field}');
}
- String closure = fromJsonCode(choice).asClosure;
+ var closure = fromJsonCode(choice).asClosure;
decoders.add('${literalString(field.value as String)}: $closure');
} else {
throw Exception('Union types must be unions of objects.');
@@ -1010,8 +1008,8 @@
/// Return a list of the classes to be emitted.
List<ImpliedType> getClassesToEmit() {
- List<ImpliedType> types = impliedTypes.values.where((ImpliedType type) {
- ApiNode node = type.apiNode;
+ var types = impliedTypes.values.where((ImpliedType type) {
+ var node = type.apiNode;
return !(node is TypeDefinition && node.isExternal);
}).toList();
types.sort((first, second) =>
@@ -1024,7 +1022,7 @@
if (field.optional) {
return true;
}
- List<String> forceOptional = _optionalConstructorArguments[className];
+ var forceOptional = _optionalConstructorArguments[className];
if (forceOptional != null && forceOptional.contains(field.name)) {
return true;
}
@@ -1044,11 +1042,11 @@
/// Compute the code necessary to convert [type] to JSON.
ToJsonCode toJsonCode(TypeDecl type) {
- TypeDecl resolvedType = resolveTypeReferenceChain(type);
+ var resolvedType = resolveTypeReferenceChain(type);
if (resolvedType is TypeReference) {
return ToJsonIdentity(dartType(type));
} else if (resolvedType is TypeList) {
- ToJsonCode itemCode = toJsonCode(resolvedType.itemType);
+ var itemCode = toJsonCode(resolvedType.itemType);
if (itemCode.isIdentity) {
return ToJsonIdentity(dartType(type));
} else {
@@ -1062,12 +1060,12 @@
} else {
keyCode = ToJsonIdentity(dartType(resolvedType.keyType));
}
- ToJsonCode valueCode = toJsonCode(resolvedType.valueType);
+ var valueCode = toJsonCode(resolvedType.valueType);
if (keyCode.isIdentity && valueCode.isIdentity) {
return ToJsonIdentity(dartType(resolvedType));
} else {
return ToJsonSnippet(dartType(type), (String value) {
- StringBuffer result = StringBuffer();
+ var result = StringBuffer();
result.write('mapMap($value');
if (!keyCode.isIdentity) {
result.write(', keyCallback: ${keyCode.asClosure}');
@@ -1080,7 +1078,7 @@
});
}
} else if (resolvedType is TypeUnion) {
- for (TypeDecl choice in resolvedType.choices) {
+ for (var choice in resolvedType.choices) {
if (resolveTypeReferenceChain(choice) is! TypeObject) {
throw Exception('Union types must be unions of objects');
}
diff --git a/pkg/analyzer_plugin/tool/spec/codegen_inttest_methods.dart b/pkg/analyzer_plugin/tool/spec/codegen_inttest_methods.dart
index 710dc62..add730b 100644
--- a/pkg/analyzer_plugin/tool/spec/codegen_inttest_methods.dart
+++ b/pkg/analyzer_plugin/tool/spec/codegen_inttest_methods.dart
@@ -14,7 +14,7 @@
final GeneratedFile target =
GeneratedFile('test/integration/support/integration_test_methods.dart',
(String pkgPath) async {
- CodegenInttestMethodsVisitor visitor =
+ var visitor =
CodegenInttestMethodsVisitor(path.basename(pkgPath), readApi(pkgPath));
return visitor.collectCode(visitor.visitApi);
});
@@ -87,6 +87,11 @@
writeln('/// Convenience methods for running integration tests.');
writeln("import 'dart:async';");
writeln();
+ for (var uri in api.types.importUris) {
+ write("import '");
+ write(uri);
+ writeln("';");
+ }
writeln("import 'package:$packageName/protocol/protocol_generated.dart';");
writeln(
"import 'package:$packageName/src/protocol/protocol_internal.dart';");
@@ -94,11 +99,6 @@
writeln();
writeln("import 'integration_tests.dart';");
writeln("import 'protocol_matchers.dart';");
- for (String uri in api.types.importUris) {
- write("import '");
- write(uri);
- writeln("';");
- }
writeln();
writeln('/// Convenience methods for running integration tests.');
writeln('abstract class IntegrationTestMixin {');
@@ -123,7 +123,7 @@
}));
writeln('void dispatchNotification(String event, params) {');
indent(() {
- writeln('ResponseDecoder decoder = ResponseDecoder(null);');
+ writeln('var decoder = ResponseDecoder(null);');
writeln('switch (event) {');
indent(() {
write(notificationSwitchContents.join());
@@ -142,9 +142,9 @@
@override
void visitNotification(Notification notification) {
- String streamName =
+ var streamName =
camelJoin(['on', notification.domainName, notification.event]);
- String className = camelJoin(
+ var className = camelJoin(
[notification.domainName, notification.event, 'params'],
doCapitalize: true);
writeln();
@@ -165,7 +165,7 @@
notificationSwitchContents.add(collectCode(() {
writeln("case '${notification.longEvent}':");
indent(() {
- String paramsValidator = camelJoin(
+ var paramsValidator = camelJoin(
['is', notification.domainName, notification.event, 'params']);
writeln('outOfTestExpect(params, $paramsValidator);');
String constructorCall;
@@ -182,11 +182,11 @@
@override
void visitRequest(Request request) {
- String methodName = camelJoin(['send', request.domainName, request.method]);
- List<String> args = <String>[];
- List<String> optionalArgs = <String>[];
+ var methodName = camelJoin(['send', request.domainName, request.method]);
+ var args = <String>[];
+ var optionalArgs = <String>[];
if (request.params != null) {
- for (TypeObjectField field in request.params.fields) {
+ for (var field in request.params.fields) {
if (field.optional) {
optionalArgs.add(formatArgument(field));
} else {
@@ -217,15 +217,15 @@
}
writeln('$futureClass $methodName(${args.join(', ')}) async {');
indent(() {
- String requestClass = camelJoin(
+ var requestClass = camelJoin(
[request.domainName, request.method, 'params'],
doCapitalize: true);
- String paramsVar = 'null';
+ var paramsVar = 'null';
if (request.params != null) {
paramsVar = 'params';
- List<String> args = <String>[];
- List<String> optionalArgs = <String>[];
- for (TypeObjectField field in request.params.fields) {
+ var args = <String>[];
+ var optionalArgs = <String>[];
+ for (var field in request.params.fields) {
if (field.optional) {
optionalArgs.add('${field.name}: ${field.name}');
} else {
@@ -235,14 +235,14 @@
args.addAll(optionalArgs);
writeln('var params = $requestClass(${args.join(', ')}).toJson();');
}
- String methodJson = "'${request.longMethod}'";
+ var methodJson = "'${request.longMethod}'";
writeln('var result = await server.send($methodJson, $paramsVar);');
if (request.result != null) {
- String kind = 'null';
+ var kind = 'null';
if (requestClass == 'EditGetRefactoringParams') {
kind = 'kind';
}
- writeln('ResponseDecoder decoder = ResponseDecoder($kind);');
+ writeln('var decoder = ResponseDecoder($kind);');
writeln("return $resultClass.fromJson(decoder, 'result', result);");
} else {
writeln('outOfTestExpect(result, isNull);');
diff --git a/pkg/analyzer_plugin/tool/spec/codegen_matchers.dart b/pkg/analyzer_plugin/tool/spec/codegen_matchers.dart
index ccae715..00110bc 100644
--- a/pkg/analyzer_plugin/tool/spec/codegen_matchers.dart
+++ b/pkg/analyzer_plugin/tool/spec/codegen_matchers.dart
@@ -12,7 +12,7 @@
final GeneratedFile target = GeneratedFile(
'test/integration/support/protocol_matchers.dart', (String pkgPath) async {
- CodegenMatchersVisitor visitor = CodegenMatchersVisitor(readApi(pkgPath));
+ var visitor = CodegenMatchersVisitor(readApi(pkgPath));
return visitor.collectCode(visitor.visitApi);
});
@@ -67,8 +67,8 @@
}
writeln('{');
indent(() {
- bool commaNeeded = false;
- for (TypeObjectField field in fields) {
+ var commaNeeded = false;
+ for (var field in fields) {
if (commaNeeded) {
writeln(',');
}
@@ -94,10 +94,10 @@
writeln();
writeln("import 'integration_tests.dart';");
writeln();
- List<ImpliedType> impliedTypes = computeImpliedTypes(api).values.toList();
+ var impliedTypes = computeImpliedTypes(api).values.toList();
impliedTypes.sort((ImpliedType first, ImpliedType second) =>
first.camelName.compareTo(second.camelName));
- for (ImpliedType impliedType in impliedTypes) {
+ for (var impliedType in impliedTypes) {
makeMatcher(impliedType);
}
}
@@ -106,8 +106,8 @@
void visitTypeEnum(TypeEnum typeEnum) {
writeln("MatchesEnum('$context', [");
indent(() {
- bool commaNeeded = false;
- for (TypeEnumValue value in typeEnum.values) {
+ var commaNeeded = false;
+ for (var value in typeEnum.values) {
if (commaNeeded) {
writeln(',');
}
@@ -140,10 +140,10 @@
writeln('LazyMatcher(() => MatchesJsonObject(');
indent(() {
write("'$context', ");
- Iterable<TypeObjectField> requiredFields =
+ var requiredFields =
typeObject.fields.where((TypeObjectField field) => !field.optional);
outputObjectFields(requiredFields);
- List<TypeObjectField> optionalFields = typeObject.fields
+ var optionalFields = typeObject.fields
.where((TypeObjectField field) => field.optional)
.toList();
if (optionalFields.isNotEmpty) {
@@ -156,7 +156,7 @@
@override
void visitTypeReference(TypeReference typeReference) {
- String typeName = typeReference.typeName;
+ var typeName = typeReference.typeName;
if (typeName == 'long') {
typeName = 'int';
}
@@ -165,9 +165,9 @@
@override
void visitTypeUnion(TypeUnion typeUnion) {
- bool commaNeeded = false;
+ var commaNeeded = false;
write('isOneOf([');
- for (TypeDecl choice in typeUnion.choices) {
+ for (var choice in typeUnion.choices) {
if (commaNeeded) {
write(', ');
}
diff --git a/pkg/analyzer_plugin/tool/spec/codegen_protocol_common.dart b/pkg/analyzer_plugin/tool/spec/codegen_protocol_common.dart
index 480d1df..ae017a6 100644
--- a/pkg/analyzer_plugin/tool/spec/codegen_protocol_common.dart
+++ b/pkg/analyzer_plugin/tool/spec/codegen_protocol_common.dart
@@ -12,10 +12,8 @@
GeneratedFile target(bool responseRequiresRequestTime) =>
GeneratedFile('lib/protocol/protocol_common.dart', (String pkgPath) async {
- CodegenCommonVisitor visitor = CodegenCommonVisitor(
- path.basename(pkgPath),
- responseRequiresRequestTime,
- readApi(pkgPath));
+ var visitor = CodegenCommonVisitor(path.basename(pkgPath),
+ responseRequiresRequestTime, readApi(pkgPath));
return visitor.collectCode(visitor.visitApi);
});
@@ -41,8 +39,8 @@
@override
List<ImpliedType> getClassesToEmit() {
- List<ImpliedType> types = impliedTypes.values.where((ImpliedType type) {
- ApiNode node = type.apiNode;
+ var types = impliedTypes.values.where((ImpliedType type) {
+ var node = type.apiNode;
return node is TypeDefinition && node.isExternal;
}).toList();
types.sort((first, second) =>
diff --git a/pkg/analyzer_plugin/tool/spec/codegen_protocol_constants.dart b/pkg/analyzer_plugin/tool/spec/codegen_protocol_constants.dart
index b41db53..2c6718f 100644
--- a/pkg/analyzer_plugin/tool/spec/codegen_protocol_constants.dart
+++ b/pkg/analyzer_plugin/tool/spec/codegen_protocol_constants.dart
@@ -10,7 +10,7 @@
final GeneratedFile target = GeneratedFile(
'lib/protocol/protocol_constants.dart', (String pkgPath) async {
- CodegenVisitor visitor = CodegenVisitor(readApi(pkgPath));
+ var visitor = CodegenVisitor(readApi(pkgPath));
return visitor.collectCode(visitor.visitApi);
});
@@ -27,11 +27,11 @@
/// Generate all of the constants associates with the [api].
void generateConstants() {
- _ConstantVisitor visitor = _ConstantVisitor(api);
+ var visitor = _ConstantVisitor(api);
visitor.visitApi();
- List<_Constant> constants = visitor.constants;
+ var constants = visitor.constants;
constants.sort((first, second) => first.name.compareTo(second.name));
- for (_Constant constant in constants) {
+ for (var constant in constants) {
generateContant(constant);
}
}
@@ -75,24 +75,24 @@
@override
void visitNotification(Notification notification) {
- String domainName = notification.domainName;
- String event = notification.event;
+ var domainName = notification.domainName;
+ var event = notification.event;
- String constantName = _generateName(domainName, 'notification', event);
+ var constantName = _generateName(domainName, 'notification', event);
constants.add(_Constant(constantName, "'$domainName.$event'"));
_addFieldConstants(constantName, notification.params);
}
@override
void visitRequest(Request request) {
- String domainName = request.domainName;
- String method = request.method;
+ var domainName = request.domainName;
+ var method = request.method;
- String requestConstantName = _generateName(domainName, 'request', method);
+ var requestConstantName = _generateName(domainName, 'request', method);
constants.add(_Constant(requestConstantName, "'$domainName.$method'"));
_addFieldConstants(requestConstantName, request.params);
- String responseConstantName = _generateName(domainName, 'response', method);
+ var responseConstantName = _generateName(domainName, 'response', method);
_addFieldConstants(responseConstantName, request.result);
}
@@ -104,11 +104,11 @@
return;
}
type.fields.forEach((TypeObjectField field) {
- String name = field.name;
- List<String> components = <String>[];
+ var name = field.name;
+ var components = <String>[];
components.add(parentName);
components.addAll(_split(name));
- String fieldConstantName = _fromComponents(components);
+ var fieldConstantName = _fromComponents(components);
constants.add(_Constant(fieldConstantName, "'$name'"));
});
}
@@ -120,7 +120,7 @@
/// Generate a name from the [domainName], [kind] and [name] components.
String _generateName(String domainName, String kind, String name) {
- List<String> components = <String>[];
+ var components = <String>[];
components.addAll(_split(domainName));
components.add(kind);
components.addAll(_split(name));
@@ -130,10 +130,10 @@
/// Return the components of the given [string] that are indicated by an upper
/// case letter.
Iterable<String> _split(String first) {
- RegExp regExp = RegExp('[A-Z]');
- List<String> components = <String>[];
- int start = 1;
- int index = first.indexOf(regExp, start);
+ var regExp = RegExp('[A-Z]');
+ var components = <String>[];
+ var start = 1;
+ var index = first.indexOf(regExp, start);
while (index >= 0) {
components.add(first.substring(start - 1, index));
start = index + 1;
diff --git a/pkg/analyzer_plugin/tool/spec/from_html.dart b/pkg/analyzer_plugin/tool/spec/from_html.dart
index 6d959c2..86d0ebb 100644
--- a/pkg/analyzer_plugin/tool/spec/from_html.dart
+++ b/pkg/analyzer_plugin/tool/spec/from_html.dart
@@ -15,8 +15,7 @@
/// Read the API description from the file 'plugin_spec.html'. [pkgPath] is the
/// path to the current package.
Api readApi(String pkgPath) {
- ApiReader reader =
- ApiReader(join(pkgPath, 'tool', 'spec', 'plugin_spec.html'));
+ var reader = ApiReader(join(pkgPath, 'tool', 'spec', 'plugin_spec.html'));
return reader.readApi();
}
@@ -74,8 +73,8 @@
/// Child elements of <api> can occur in any order.
Api apiFromHtml(dom.Element html) {
Api api;
- List<String> versions = <String>[];
- List<Domain> domains = <Domain>[];
+ var versions = <String>[];
+ var domains = <Domain>[];
Types types;
Refactorings refactorings;
recurse(html, 'api', {
@@ -108,7 +107,7 @@
void checkAttributes(
dom.Element element, List<String> requiredAttributes, String context,
{List<String> optionalAttributes = const []}) {
- Set<String> attributesFound = <String>{};
+ var attributesFound = <String>{};
element.attributes.forEach((name, value) {
if (!requiredAttributes.contains(name) &&
!optionalAttributes.contains(name)) {
@@ -117,7 +116,7 @@
}
attributesFound.add(name as String);
});
- for (String expectedAttribute in requiredAttributes) {
+ for (var expectedAttribute in requiredAttributes) {
if (!attributesFound.contains(expectedAttribute)) {
throw Exception(
'$context: ${element.localName} must contain attribute $expectedAttribute');
@@ -144,13 +143,13 @@
/// Child elements can occur in any order.
Domain domainFromHtml(dom.Element html) {
checkName(html, 'domain');
- String name = html.attributes['name'];
- String context = name ?? 'domain';
- bool experimental = html.attributes['experimental'] == 'true';
+ var name = html.attributes['name'];
+ var context = name ?? 'domain';
+ var experimental = html.attributes['experimental'] == 'true';
checkAttributes(html, ['name'], context,
optionalAttributes: ['experimental']);
- List<Request> requests = <Request>[];
- List<Notification> notifications = <Notification>[];
+ var requests = <Request>[];
+ var notifications = <Notification>[];
recurse(html, context, {
'request': (dom.Element child) {
requests.add(requestFromHtml(child, context));
@@ -164,7 +163,7 @@
}
dom.Element getAncestor(dom.Element html, String name, String context) {
- dom.Element ancestor = html.parent;
+ var ancestor = html.parent;
while (ancestor != null) {
if (ancestor.localName == name) {
return ancestor;
@@ -187,9 +186,9 @@
///
/// Child elements can occur in any order.
Notification notificationFromHtml(dom.Element html, String context) {
- String domainName = getAncestor(html, 'domain', context).attributes['name'];
+ var domainName = getAncestor(html, 'domain', context).attributes['name'];
checkName(html, 'notification', context);
- String event = html.attributes['event'];
+ var event = html.attributes['event'];
context = '$context.${event ?? 'event'}';
checkAttributes(html, ['event'], context);
TypeObject params;
@@ -204,7 +203,7 @@
/// Create a single of [TypeDecl] corresponding to the type defined inside the
/// given HTML element.
TypeDecl processContentsAsType(dom.Element html, String context) {
- List<TypeDecl> types = processContentsAsTypes(html, context);
+ var types = processContentsAsTypes(html, context);
if (types.length != 1) {
throw Exception('$context: Exactly one type must be specified');
}
@@ -239,7 +238,7 @@
/// TYPE <!-- zero or more -->
/// </union>
List<TypeDecl> processContentsAsTypes(dom.Element html, String context) {
- List<TypeDecl> types = <TypeDecl>[];
+ var types = <TypeDecl>[];
recurse(html, context, {
'object': (dom.Element child) {
types.add(typeObjectFromHtml(child, context));
@@ -283,7 +282,7 @@
},
'union': (dom.Element child) {
checkAttributes(child, ['field'], context);
- String field = child.attributes['field'];
+ var field = child.attributes['field'];
types.add(
TypeUnion(processContentsAsTypes(child, context), field, child));
}
@@ -293,21 +292,21 @@
/// Read the API description from file with the given [filePath].
Api readApi() {
- String htmlContents = File(filePath).readAsStringSync();
- dom.Document document = parser.parse(htmlContents);
- dom.Element htmlElement = document.children
+ var htmlContents = File(filePath).readAsStringSync();
+ var document = parser.parse(htmlContents);
+ var htmlElement = document.children
.singleWhere((element) => element.localName.toLowerCase() == 'html');
return apiFromHtml(htmlElement);
}
void recurse(dom.Element parent, String context,
Map<String, ElementProcessor> elementProcessors) {
- for (String key in elementProcessors.keys) {
+ for (var key in elementProcessors.keys) {
if (!specialElements.contains(key)) {
throw Exception('$context: $key is not a special element');
}
}
- for (dom.Node node in parent.nodes) {
+ for (var node in parent.nodes) {
if (node is dom.Element) {
if (elementProcessors.containsKey(node.localName)) {
elementProcessors[node.localName](node);
@@ -333,8 +332,8 @@
/// Child elements can occur in any order.
Refactoring refactoringFromHtml(dom.Element html) {
checkName(html, 'refactoring');
- String kind = html.attributes['kind'];
- String context = kind ?? 'refactoring';
+ var kind = html.attributes['kind'];
+ var context = kind ?? 'refactoring';
checkAttributes(html, ['kind'], context);
TypeObject feedback;
TypeObject options;
@@ -356,9 +355,9 @@
/// </refactorings>
Refactorings refactoringsFromHtml(dom.Element html) {
checkName(html, 'refactorings');
- String context = 'refactorings';
+ var context = 'refactorings';
checkAttributes(html, [], context);
- List<Refactoring> refactorings = <Refactoring>[];
+ var refactorings = <Refactoring>[];
recurse(html, context, {
'refactoring': (dom.Element child) {
refactorings.add(refactoringFromHtml(child));
@@ -381,14 +380,14 @@
///
/// Child elements can occur in any order.
Request requestFromHtml(dom.Element html, String context) {
- String domainName = getAncestor(html, 'domain', context).attributes['name'];
+ var domainName = getAncestor(html, 'domain', context).attributes['name'];
checkName(html, 'request', context);
- String method = html.attributes['method'];
+ var method = html.attributes['method'];
context = '$context.${method ?? 'method'}';
checkAttributes(html, ['method'], context,
optionalAttributes: ['experimental', 'deprecated']);
- bool experimental = html.attributes['experimental'] == 'true';
- bool deprecated = html.attributes['deprecated'] == 'true';
+ var experimental = html.attributes['experimental'] == 'true';
+ var deprecated = html.attributes['deprecated'] == 'true';
TypeObject params;
TypeObject result;
recurse(html, context, {
@@ -414,13 +413,13 @@
/// Child elements can occur in any order.
TypeDefinition typeDefinitionFromHtml(dom.Element html) {
checkName(html, 'type');
- String name = html.attributes['name'];
- String context = name ?? 'type';
+ var name = html.attributes['name'];
+ var context = name ?? 'type';
checkAttributes(html, ['name'], context,
optionalAttributes: ['experimental', 'deprecated']);
- TypeDecl type = processContentsAsType(html, context);
- bool experimental = html.attributes['experimental'] == 'true';
- bool deprecated = html.attributes['deprecated'] == 'true';
+ var type = processContentsAsType(html, context);
+ var experimental = html.attributes['experimental'] == 'true';
+ var deprecated = html.attributes['deprecated'] == 'true';
return TypeDefinition(name, type, html,
experimental: experimental, deprecated: deprecated);
}
@@ -429,7 +428,7 @@
TypeEnum typeEnumFromHtml(dom.Element html, String context) {
checkName(html, 'enum', context);
checkAttributes(html, [], context);
- List<TypeEnumValue> values = <TypeEnumValue>[];
+ var values = <TypeEnumValue>[];
recurse(html, context, {
'value': (dom.Element child) {
values.add(typeEnumValueFromHtml(child, context));
@@ -450,11 +449,11 @@
TypeEnumValue typeEnumValueFromHtml(dom.Element html, String context) {
checkName(html, 'value', context);
checkAttributes(html, [], context, optionalAttributes: ['deprecated']);
- bool deprecated = html.attributes['deprecated'] == 'true';
- List<String> values = <String>[];
+ var deprecated = html.attributes['deprecated'] == 'true';
+ var values = <String>[];
recurse(html, context, {
'code': (dom.Element child) {
- String text = innerText(child).trim();
+ var text = innerText(child).trim();
values.add(text);
}
});
@@ -479,13 +478,13 @@
/// Child elements can occur in any order.
TypeObjectField typeObjectFieldFromHtml(dom.Element html, String context) {
checkName(html, 'field', context);
- String name = html.attributes['name'];
+ var name = html.attributes['name'];
context = '$context.${name ?? 'field'}';
checkAttributes(html, ['name'], context,
optionalAttributes: ['optional', 'value', 'deprecated']);
- bool deprecated = html.attributes['deprecated'] == 'true';
- bool optional = false;
- String optionalString = html.attributes['optional'];
+ var deprecated = html.attributes['deprecated'] == 'true';
+ var optional = false;
+ var optionalString = html.attributes['optional'];
if (optionalString != null) {
switch (optionalString) {
case 'true':
@@ -499,8 +498,8 @@
'$context: field contains invalid "optional" attribute: "$optionalString"');
}
}
- String value = html.attributes['value'];
- TypeDecl type = processContentsAsType(html, context);
+ var value = html.attributes['value'];
+ var type = processContentsAsType(html, context);
return TypeObjectField(name, type, html,
optional: optional, value: value, deprecated: deprecated);
}
@@ -508,13 +507,13 @@
/// Create a [TypeObject] from an HTML description.
TypeObject typeObjectFromHtml(dom.Element html, String context) {
checkAttributes(html, [], context, optionalAttributes: ['experimental']);
- List<TypeObjectField> fields = <TypeObjectField>[];
+ var fields = <TypeObjectField>[];
recurse(html, context, {
'field': (dom.Element child) {
fields.add(typeObjectFieldFromHtml(child, context));
}
});
- bool experimental = html.attributes['experimental'] == 'true';
+ var experimental = html.attributes['experimental'] == 'true';
return TypeObject(fields, html, experimental: experimental);
}
@@ -525,36 +524,36 @@
/// </types>
Types typesFromHtml(dom.Element html) {
checkName(html, 'types');
- String context = 'types';
+ var context = 'types';
checkAttributes(html, [], context);
- List<String> importUris = <String>[];
- Map<String, TypeDefinition> typeMap = <String, TypeDefinition>{};
- List<dom.Element> childElements = <dom.Element>[];
+ var importUris = <String>[];
+ var typeMap = <String, TypeDefinition>{};
+ var childElements = <dom.Element>[];
recurse(html, context, {
'include': (dom.Element child) {
- String importUri = child.attributes['import'];
+ var importUri = child.attributes['import'];
if (importUri != null) {
importUris.add(importUri);
}
- String relativePath = child.attributes['path'];
- String path = normalize(join(dirname(filePath), relativePath));
- ApiReader reader = ApiReader(path);
- Api api = reader.readApi();
- for (TypeDefinition typeDefinition in api.types) {
+ var relativePath = child.attributes['path'];
+ var path = normalize(join(dirname(filePath), relativePath));
+ var reader = ApiReader(path);
+ var api = reader.readApi();
+ for (var typeDefinition in api.types) {
typeDefinition.isExternal = true;
childElements.add(typeDefinition.html);
typeMap[typeDefinition.name] = typeDefinition;
}
},
'type': (dom.Element child) {
- TypeDefinition typeDefinition = typeDefinitionFromHtml(child);
+ var typeDefinition = typeDefinitionFromHtml(child);
typeMap[typeDefinition.name] = typeDefinition;
}
});
- for (dom.Element element in childElements) {
+ for (var element in childElements) {
html.append(element);
}
- Types types = Types(typeMap, html);
+ var types = Types(typeMap, html);
types.importUris.addAll(importUris);
return types;
}
diff --git a/pkg/analyzer_plugin/tool/spec/generate_all.dart b/pkg/analyzer_plugin/tool/spec/generate_all.dart
index 68452ca..4083370 100644
--- a/pkg/analyzer_plugin/tool/spec/generate_all.dart
+++ b/pkg/analyzer_plugin/tool/spec/generate_all.dart
@@ -16,14 +16,14 @@
/// Generate all targets.
Future<void> main() async {
- String script = Platform.script.toFilePath(windows: Platform.isWindows);
- String pkgPath = normalize(join(dirname(script), '..', '..'));
+ var script = Platform.script.toFilePath(windows: Platform.isWindows);
+ var pkgPath = normalize(join(dirname(script), '..', '..'));
await GeneratedContent.generateAll(pkgPath, allTargets);
}
/// Get a list of all generated targets.
List<GeneratedContent> get allTargets {
- List<GeneratedContent> targets = <GeneratedContent>[];
+ var targets = <GeneratedContent>[];
targets.add(codegen_dart_protocol.target(true));
targets.add(codegen_inttest_methods.target);
targets.add(codegen_matchers.target);
diff --git a/pkg/analyzer_plugin/tool/spec/implied_types.dart b/pkg/analyzer_plugin/tool/spec/implied_types.dart
index caa1ad5..0eb3e4b 100644
--- a/pkg/analyzer_plugin/tool/spec/implied_types.dart
+++ b/pkg/analyzer_plugin/tool/spec/implied_types.dart
@@ -8,7 +8,7 @@
import 'api.dart';
Map<String, ImpliedType> computeImpliedTypes(Api api) {
- _ImpliedTypesVisitor visitor = _ImpliedTypesVisitor(api);
+ var visitor = _ImpliedTypesVisitor(api);
visitor.visitApi();
return visitor.impliedTypes;
}
@@ -41,13 +41,13 @@
void storeType(String name, String nameSuffix, TypeDecl type, String kind,
ApiNode apiNode) {
- String humanReadableName = name;
- List<String> camelNameParts = name.split('.');
+ var humanReadableName = name;
+ var camelNameParts = name.split('.');
if (nameSuffix != null) {
humanReadableName += ' $nameSuffix';
camelNameParts.add(nameSuffix);
}
- String camelName = camelJoin(camelNameParts);
+ var camelName = camelJoin(camelNameParts);
impliedTypes[camelName] =
ImpliedType(camelName, humanReadableName, type, kind, apiNode);
}
@@ -60,7 +60,7 @@
@override
void visitRefactoring(Refactoring refactoring) {
- String camelKind = camelJoin(refactoring.kind.toLowerCase().split('_'));
+ var camelKind = camelJoin(refactoring.kind.toLowerCase().split('_'));
storeType(camelKind, 'feedback', refactoring.feedback,
'refactoringFeedback', refactoring);
storeType(camelKind, 'options', refactoring.options, 'refactoringOptions',
diff --git a/pkg/analyzer_plugin/tool/spec/to_html.dart b/pkg/analyzer_plugin/tool/spec/to_html.dart
index 1983af6..115b3ec 100644
--- a/pkg/analyzer_plugin/tool/spec/to_html.dart
+++ b/pkg/analyzer_plugin/tool/spec/to_html.dart
@@ -125,10 +125,10 @@
final GeneratedFile target =
GeneratedFile('doc/api.html', (String pkgPath) async {
- ToHtmlVisitor visitor = ToHtmlVisitor(readApi(pkgPath));
- dom.Document document = dom.Document();
+ var visitor = ToHtmlVisitor(readApi(pkgPath));
+ var document = dom.Document();
document.append(dom.DocumentType('html', null, null));
- for (dom.Node node in visitor.collectHtml(visitor.visitApi)) {
+ for (var node in visitor.collectHtml(visitor.visitApi)) {
document.append(node);
}
return document.outerHtml;
@@ -349,7 +349,7 @@
});
ul(() {
- for (Request request in domain.requests) {
+ for (var request in domain.requests) {
if (request.experimental) continue;
li(() {
@@ -372,7 +372,7 @@
link('types', () => write('\u2191'));
write(')');
});
- List<String> sortedTypes = types.toList();
+ var sortedTypes = types.toList();
sortedTypes.sort();
element('div', {'class': 'subindex'}, () {
element('ul', {}, () {
@@ -385,7 +385,7 @@
void javadocParams(TypeObject typeObject) {
if (typeObject != null) {
- for (TypeObjectField field in typeObject.fields) {
+ for (var field in typeObject.fields) {
hangingIndent(() {
write('@param ${field.name} ');
translateHtml(field.html, squashParagraphs: true);
@@ -402,9 +402,9 @@
/// If [typeForBolding] is supplied, then fields in this type are shown in
/// boldface.
void showType(String shortDesc, TypeDecl type, [TypeObject typeForBolding]) {
- Set<String> fieldsToBold = <String>{};
+ var fieldsToBold = <String>{};
if (typeForBolding != null) {
- for (TypeObjectField field in typeForBolding.fields) {
+ for (var field in typeForBolding.fields) {
fieldsToBold.add(field.name);
}
}
@@ -412,7 +412,7 @@
if (shortDesc != null) {
write('$shortDesc: ');
}
- TypeVisitor typeVisitor = TypeVisitor(api, fieldsToBold: fieldsToBold);
+ var typeVisitor = TypeVisitor(api, fieldsToBold: fieldsToBold);
addAll(typeVisitor.collectHtml(() {
typeVisitor.visitTypeDecl(type);
}));
@@ -422,7 +422,7 @@
/// Copy the contents of the given HTML element, translating the special
/// elements that define the API appropriately.
void translateHtml(dom.Element html, {bool squashParagraphs = false}) {
- for (dom.Node node in html.nodes) {
+ for (var node in html.nodes) {
if (node is dom.Element) {
if (squashParagraphs && node.localName == 'p') {
translateHtml(node, squashParagraphs: squashParagraphs);
@@ -472,7 +472,7 @@
}
}
} else if (node is dom.Text) {
- String text = node.text;
+ var text = node.text;
write(text);
}
}
@@ -480,8 +480,7 @@
@override
void visitApi() {
- Iterable<TypeDefinition> apiTypes =
- api.types.where((TypeDefinition td) => !td.experimental);
+ var apiTypes = api.types.where((TypeDefinition td) => !td.experimental);
definedTypes = apiTypes.map((TypeDefinition td) => td.name).toSet();
html(() {
@@ -588,7 +587,7 @@
: 'typeDefinition', () {
anchor('type_${typeDefinition.name}', () {
write('${typeDefinition.name}: ');
- TypeVisitor typeVisitor = TypeVisitor(api, short: true);
+ var typeVisitor = TypeVisitor(api, short: true);
addAll(typeVisitor.collectHtml(() {
typeVisitor.visitTypeDecl(typeDefinition.type);
}));
@@ -609,8 +608,8 @@
@override
void visitTypeEnumValue(TypeEnumValue typeEnumValue) {
- bool isDocumented = false;
- for (dom.Node node in typeEnumValue.html.nodes) {
+ var isDocumented = false;
+ for (var node in typeEnumValue.html.nodes) {
if ((node is dom.Element && node.localName != 'code') ||
(node is dom.Text && node.text.trim().isNotEmpty)) {
isDocumented = true;
@@ -659,7 +658,7 @@
write(' = ${json.encode(typeObjectField.value)}');
} else {
write(': ');
- TypeVisitor typeVisitor = TypeVisitor(api, short: true);
+ var typeVisitor = TypeVisitor(api, short: true);
addAll(typeVisitor.collectHtml(() {
typeVisitor.visitTypeDecl(typeObjectField.type);
}));
@@ -681,7 +680,7 @@
void visitTypes(Types types) {
translateHtml(types.html);
dl(() {
- List<TypeDefinition> sortedTypes = types.toList();
+ var sortedTypes = types.toList();
sortedTypes.sort((TypeDefinition first, TypeDefinition second) =>
first.name.compareTo(second.name));
sortedTypes.forEach(visitTypeDefinition);
@@ -718,7 +717,7 @@
}
writeln('enum {');
indent(() {
- for (TypeEnumValue value in typeEnum.values) {
+ for (var value in typeEnum.values) {
writeln(value.value);
}
});
@@ -749,7 +748,7 @@
}
writeln('{');
indent(() {
- for (TypeObjectField field in typeObject.fields) {
+ for (var field in typeObject.fields) {
write('"');
if (fieldsToBold != null && fieldsToBold.contains(field.name)) {
b(() {
@@ -778,7 +777,7 @@
@override
void visitTypeReference(TypeReference typeReference) {
- String displayName = typeReference.typeName;
+ var displayName = typeReference.typeName;
if (api.types.containsKey(typeReference.typeName)) {
link('type_${typeReference.typeName}', () {
write(displayName);
@@ -790,8 +789,8 @@
@override
void visitTypeUnion(TypeUnion typeUnion) {
- bool verticalBarNeeded = false;
- for (TypeDecl choice in typeUnion.choices) {
+ var verticalBarNeeded = false;
+ for (var choice in typeUnion.choices) {
if (verticalBarNeeded) {
write(' | ');
}
diff --git a/pkg/compiler/lib/compiler.dart b/pkg/compiler/lib/compiler.dart
index 3da6d59..63cad0a 100644
--- a/pkg/compiler/lib/compiler.dart
+++ b/pkg/compiler/lib/compiler.dart
@@ -89,12 +89,8 @@
/// to the compiled script. This behavior will be removed in the future
/// as the compiler may create multiple files to support lazy loading
/// of libraries.
-Future<CompilationResult> compile(
- Uri script,
- Uri librariesSpecificationUri,
- Uri packageRoot,
- CompilerInputProvider inputProvider,
- DiagnosticHandler handler,
+Future<CompilationResult> compile(Uri script, Uri librariesSpecificationUri,
+ CompilerInputProvider inputProvider, DiagnosticHandler handler,
[List<String> options = const [],
CompilerOutputProvider outputProvider,
Map<String, String> environment = const {},
@@ -102,7 +98,6 @@
CompilerOptions compilerOptions = CompilerOptions.parse(options,
librariesSpecificationUri: librariesSpecificationUri)
..entryPoint = script
- ..packageRoot = packageRoot
..packageConfig = packageConfig
..environment = environment;
diff --git a/pkg/compiler/lib/src/common_elements.dart b/pkg/compiler/lib/src/common_elements.dart
index 980e484..925f3d8 100644
--- a/pkg/compiler/lib/src/common_elements.dart
+++ b/pkg/compiler/lib/src/common_elements.dart
@@ -508,8 +508,12 @@
FunctionEntity get rtiAddErasedTypesMethod;
FunctionEntity get rtiAddTypeParameterVariancesMethod;
+ FunctionEntity get installSpecializedIsTest;
+ FunctionEntity get installSpecializedAsCheck;
FunctionEntity get generalIsTestImplementation;
FunctionEntity get generalAsCheckImplementation;
+ FunctionEntity get generalNullableIsTestImplementation;
+ FunctionEntity get generalNullableAsCheckImplementation;
FunctionEntity get specializedIsObject;
FunctionEntity get specializedAsObject;
@@ -1948,18 +1952,38 @@
_rtiAddTypeParameterVariancesMethod ??=
_findClassMember(_rtiUniverseClass, 'addTypeParameterVariances');
+ @override
+ FunctionEntity get installSpecializedIsTest =>
+ _findRtiFunction('_installSpecializedIsTest');
+
+ @override
+ FunctionEntity get installSpecializedAsCheck =>
+ _findRtiFunction('_installSpecializedAsCheck');
+
FunctionEntity _generalIsTestImplementation;
@override
FunctionEntity get generalIsTestImplementation =>
_generalIsTestImplementation ??=
_findRtiFunction('_generalIsTestImplementation');
+ FunctionEntity _generalNullableIsTestImplementation;
+ @override
+ FunctionEntity get generalNullableIsTestImplementation =>
+ _generalNullableIsTestImplementation ??=
+ _findRtiFunction('_generalNullableIsTestImplementation');
+
FunctionEntity _generalAsCheckImplementation;
@override
FunctionEntity get generalAsCheckImplementation =>
_generalAsCheckImplementation ??=
_findRtiFunction('_generalAsCheckImplementation');
+ FunctionEntity _generalNullableAsCheckImplementation;
+ @override
+ FunctionEntity get generalNullableAsCheckImplementation =>
+ _generalNullableAsCheckImplementation ??=
+ _findRtiFunction('_generalNullableAsCheckImplementation');
+
FunctionEntity _specializedIsObject;
@override
FunctionEntity get specializedIsObject =>
diff --git a/pkg/compiler/lib/src/dart2js.dart b/pkg/compiler/lib/src/dart2js.dart
index e4953b3..276c347 100644
--- a/pkg/compiler/lib/src/dart2js.dart
+++ b/pkg/compiler/lib/src/dart2js.dart
@@ -113,7 +113,6 @@
int codegenShards;
List<String> bazelPaths;
Uri packageConfig = null;
- Uri packageRoot = null;
List<String> options = new List<String>();
bool wantHelp = false;
bool wantVersion = false;
@@ -145,10 +144,6 @@
Uri.base.resolve(extractPath(argument, isDirectory: false));
}
- void setPackageRoot(String argument) {
- packageRoot = Uri.base.resolve(extractPath(argument));
- }
-
void setPackageConfig(String argument) {
packageConfig = Uri.base.resolve(extractPath(argument, isDirectory: false));
}
@@ -434,7 +429,6 @@
new OptionHandler(Flags.trustJSInteropTypeAnnotations, passThrough),
new OptionHandler(r'--help|/\?|/h', (_) => wantHelp = true),
new OptionHandler('--packages=.+', setPackageConfig),
- new OptionHandler('--package-root=.+|-p.+', setPackageRoot),
new OptionHandler(Flags.noSourceMaps, passThrough),
new OptionHandler(Option.resolutionInput, ignoreOption),
new OptionHandler(Option.bazelPaths, setBazelPaths),
@@ -570,10 +564,6 @@
"checked mode.");
}
- if (packageRoot != null && packageConfig != null) {
- helpAndFail("Cannot specify both '--package-root' and '--packages.");
- }
-
String scriptName = arguments[0];
switch (writeStrategy) {
@@ -773,7 +763,6 @@
onError: (String message) => fail(message),
onWarning: (String message) => print(message))
..entryPoint = script
- ..packageRoot = packageRoot
..packageConfig = packageConfig
..environment = environment
..kernelInitializedCompilerState = kernelInitializedCompilerState
diff --git a/pkg/compiler/lib/src/ir/closure.dart b/pkg/compiler/lib/src/ir/closure.dart
index 336b148..3546f5c 100644
--- a/pkg/compiler/lib/src/ir/closure.dart
+++ b/pkg/compiler/lib/src/ir/closure.dart
@@ -412,9 +412,12 @@
}
@override
- String toString() =>
- 'TypeVariableTypeWithContext(type=$type,context=$context,'
- 'kind=$kind,typeDeclaration=$typeDeclaration)';
+ String toString() => 'TypeVariableTypeWithContext(${toStringInternal()})';
+
+ @override
+ String toStringInternal() =>
+ 'type=${type.toStringInternal()},context=${context.toStringInternal()},'
+ 'kind=$kind,typeDeclaration=${typeDeclaration.toStringInternal()}';
@override
String leakingDebugToString() => ir.debugNodeToString(this);
diff --git a/pkg/compiler/lib/src/ir/constants.dart b/pkg/compiler/lib/src/ir/constants.dart
index 768b8e1..a3d259a 100644
--- a/pkg/compiler/lib/src/ir/constants.dart
+++ b/pkg/compiler/lib/src/ir/constants.dart
@@ -199,5 +199,8 @@
}
@override
- String toString() => 'ConstantReference(constant=$constant)';
+ String toString() => 'ConstantReference(${toStringInternal()})';
+
+ @override
+ String toStringInternal() => 'constant=${constant.toStringInternal()}';
}
diff --git a/pkg/compiler/lib/src/js_backend/backend_impact.dart b/pkg/compiler/lib/src/js_backend/backend_impact.dart
index ffa56a2..7d50038 100644
--- a/pkg/compiler/lib/src/js_backend/backend_impact.dart
+++ b/pkg/compiler/lib/src/js_backend/backend_impact.dart
@@ -810,8 +810,14 @@
_commonElements.simpleInstanceType,
_commonElements.rtiEvalMethod,
_commonElements.rtiBindMethod,
+ _commonElements.installSpecializedIsTest,
_commonElements.generalIsTestImplementation,
_commonElements.generalAsCheckImplementation,
+ if (_options.useNullSafety) ...[
+ _commonElements.installSpecializedAsCheck,
+ _commonElements.generalNullableIsTestImplementation,
+ _commonElements.generalNullableAsCheckImplementation,
+ ],
// Specialized checks.
_commonElements.specializedIsBool,
_commonElements.specializedAsBoolNullable,
diff --git a/pkg/compiler/lib/src/js_backend/namer.dart b/pkg/compiler/lib/src/js_backend/namer.dart
index 9144014..d73344b 100644
--- a/pkg/compiler/lib/src/js_backend/namer.dart
+++ b/pkg/compiler/lib/src/js_backend/namer.dart
@@ -2599,6 +2599,8 @@
return runtimeTypeName(_commonElements.jsJavaScriptFunctionClass);
case JsGetName.FUTURE_CLASS_TYPE_NAME:
return runtimeTypeName(_commonElements.futureClass);
+ case JsGetName.RTI_FIELD_AS:
+ return instanceFieldPropertyName(_commonElements.rtiAsField);
case JsGetName.RTI_FIELD_IS:
return instanceFieldPropertyName(_commonElements.rtiIsField);
default:
diff --git a/pkg/compiler/lib/src/js_emitter/startup_emitter/fragment_emitter.dart b/pkg/compiler/lib/src/js_emitter/startup_emitter/fragment_emitter.dart
index b8767b2..edc5c05 100644
--- a/pkg/compiler/lib/src/js_emitter/startup_emitter/fragment_emitter.dart
+++ b/pkg/compiler/lib/src/js_emitter/startup_emitter/fragment_emitter.dart
@@ -1914,8 +1914,8 @@
if (program.typeToInterceptorMap != null) {
// This property is assigned later.
// Initialize property to avoid map transitions.
- globals.add(new js.Property(
- js.string(TYPE_TO_INTERCEPTOR_MAP), js.LiteralNull()));
+ globals.add(
+ js.Property(js.string(TYPE_TO_INTERCEPTOR_MAP), js.LiteralNull()));
}
if (_options.useNewRti) {
@@ -1929,17 +1929,17 @@
// therefore unused in this emitter.
// TODO(johnniwinther): Remove the need for adding an empty list of
// mangled names.
- globals.add(new js.Property(
- js.string(MANGLED_NAMES), new js.ObjectInitializer(<js.Property>[])));
+ globals.add(js.Property(
+ js.string(MANGLED_NAMES), js.ObjectInitializer(<js.Property>[])));
globals.add(emitGetTypeFromName());
globals.addAll(emitMetadata(program));
if (program.needsNativeSupport) {
- globals.add(new js.Property(
- js.string(INTERCEPTORS_BY_TAG), new js.LiteralNull()));
- globals.add(new js.Property(js.string(LEAF_TAGS), new js.LiteralNull()));
+ globals
+ .add(js.Property(js.string(INTERCEPTORS_BY_TAG), js.LiteralNull()));
+ globals.add(js.Property(js.string(LEAF_TAGS), js.LiteralNull()));
}
globals.add(js.Property(
@@ -1951,7 +1951,8 @@
r' : "$ti"')
: js.js(r'Symbol("$ti")')));
- js.ObjectInitializer globalsObject = js.ObjectInitializer(globals);
+ js.ObjectInitializer globalsObject =
+ js.ObjectInitializer(globals, isOneLiner: false);
return js.js.statement('var init = #;', globalsObject);
}
diff --git a/pkg/compiler/lib/src/options.dart b/pkg/compiler/lib/src/options.dart
index aa2af76..11f838f 100644
--- a/pkg/compiler/lib/src/options.dart
+++ b/pkg/compiler/lib/src/options.dart
@@ -42,11 +42,6 @@
/// The entry point of the application that is being compiled.
Uri entryPoint;
- /// Package root location.
- ///
- /// If not null then [packageConfig] should be null.
- Uri packageRoot;
-
/// Location of the package configuration file.
///
/// If not null then [packageRoot] should be null.
@@ -492,13 +487,6 @@
throw new ArgumentError(
"[librariesSpecificationUri] should be a file: $librariesSpecificationUri");
}
- if (packageRoot != null && packageConfig != null) {
- throw new ArgumentError("Only one of [packageRoot] or [packageConfig] "
- "may be given.");
- }
- if (packageRoot != null && !packageRoot.path.endsWith("/")) {
- throw new ArgumentError("[packageRoot] must end with a /");
- }
if (platformBinaries == null &&
equalMaps(languageExperiments, fe.defaultExperimentalFlags)) {
throw new ArgumentError("Missing required ${Flags.platformBinaries}");
diff --git a/pkg/compiler/tool/update_id_tests.dart b/pkg/compiler/tool/update_id_tests.dart
new file mode 100644
index 0000000..db62688
--- /dev/null
+++ b/pkg/compiler/tool/update_id_tests.dart
@@ -0,0 +1,33 @@
+// Copyright (c) 2020, 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.
+
+import 'package:_fe_analyzer_shared/src/testing/id_testing.dart' as id;
+
+const List<String> idTests = <String>[
+ 'tests/compiler/dart2js/model/cfe_constant_test.dart',
+ 'tests/compiler/dart2js/annotations/annotations_test.dart',
+ 'tests/compiler/dart2js/closure/closure_test.dart',
+ 'tests/compiler/dart2js/codegen/model_test.dart',
+ 'tests/compiler/dart2js/deferred_loading/deferred_loading_test.dart',
+ 'tests/compiler/dart2js/field_analysis/jfield_analysis_test.dart',
+ 'tests/compiler/dart2js/field_analysis/kfield_analysis_test.dart',
+ 'tests/compiler/dart2js/impact/impact_test.dart',
+ 'tests/compiler/dart2js/inference/callers_test.dart',
+ 'tests/compiler/dart2js/inference/inference_test_helper.dart',
+ 'tests/compiler/dart2js/inference/inference_data_test.dart',
+ 'tests/compiler/dart2js/inference/side_effects_test.dart',
+ 'tests/compiler/dart2js/inlining/inlining_test.dart',
+ 'tests/compiler/dart2js/jumps/jump_test.dart',
+ 'tests/compiler/dart2js/member_usage/member_usage_test.dart',
+ 'tests/compiler/dart2js/optimization/optimization_test.dart',
+ 'tests/compiler/dart2js/rti/rti_need_test_helper.dart',
+ 'tests/compiler/dart2js/rti/rti_emission_test.dart',
+ 'tests/compiler/dart2js/static_type/static_type_test.dart',
+ 'tests/compiler/dart2js/static_type/type_promotion_test.dart',
+ 'tests/compiler/dart2js/equivalence/id_testing_test.dart',
+];
+
+main() async {
+ await id.updateAllTests(idTests);
+}
diff --git a/pkg/dart_internal/pubspec.yaml b/pkg/dart_internal/pubspec.yaml
index 26c9202..16c322e 100644
--- a/pkg/dart_internal/pubspec.yaml
+++ b/pkg/dart_internal/pubspec.yaml
@@ -1,5 +1,5 @@
name: dart_internal
-version: 0.1.8
+version: 0.1.9
author: "Dart Team <misc@dartlang.org>"
homepage: http://www.dartlang.org
description: >
@@ -16,4 +16,4 @@
environment:
# Restrict the upper bound so that we can remove support for this in a later
# version of the SDK without it being a breaking change.
- sdk: ">=2.0.0-dev.12.0 <2.8.0"
+ sdk: ">=2.0.0-dev.12.0 <2.9.0"
diff --git a/pkg/dartdev/lib/src/commands/test.dart b/pkg/dartdev/lib/src/commands/test.dart
index 278cc91..d56cd11 100644
--- a/pkg/dartdev/lib/src/commands/test.dart
+++ b/pkg/dartdev/lib/src/commands/test.dart
@@ -17,6 +17,29 @@
final ArgParser argParser = ArgParser.allowAnything();
@override
+ void printUsage() {
+ final command = sdk.pub;
+ final args = ['run', 'test', '--help'];
+
+ log.trace('$command ${args.join(' ')}');
+
+ final result = Process.runSync(command, args);
+ if (result.stderr.isNotEmpty) {
+ stderr.write(result.stderr);
+ }
+ if (result.stdout.isNotEmpty) {
+ stdout.write(result.stdout);
+ }
+
+ // "Could not find package "test". Did you forget to add a dependency?"
+ if (result.exitCode == 65 && project.hasPackageConfigFile) {
+ if (!project.packageConfig.hasDependency('test')) {
+ _printPackageTestInstructions();
+ }
+ }
+ }
+
+ @override
FutureOr<int> run() async {
final command = sdk.pub;
final args = argResults.arguments.toList();
diff --git a/pkg/dartdev/test/commands/analyze_test.dart b/pkg/dartdev/test/commands/analyze_test.dart
index ba4d0b5..c8d5b3d 100644
--- a/pkg/dartdev/test/commands/analyze_test.dart
+++ b/pkg/dartdev/test/commands/analyze_test.dart
@@ -15,15 +15,20 @@
const String _analyzeUsageText =
'Usage: dart analyze [arguments] [<directory>]';
-const String _warningDartCodeSnippet = '''
- enum E { e1, e2 }
- void f(E e) {
- switch (e) {
- case E.e1:
- break;
- }
- }
- ''';
+const String _unusedImportCodeSnippet = '''
+import 'dart:convert';
+
+void main() {
+ print('hello world');
+}
+''';
+
+const String _unusedImportAnalysisOptions = '''
+analyzer:
+ errors:
+ # Increase the severity of several hints.
+ unused_import: warning
+''';
void defineAnalyze() {
TestProject p;
@@ -103,34 +108,34 @@
});
test('warning --fatal-warnings', () {
- p = project(mainSrc: _warningDartCodeSnippet);
+ p = project(
+ mainSrc: _unusedImportCodeSnippet,
+ analysisOptions: _unusedImportAnalysisOptions);
var result = p.runSync('analyze', ['--fatal-warnings', p.dirPath]);
- //TODO(jwren) Once http://dartbug.com/40768 is resolved, this assertion
- // should be exitCode == 2, not greater than 0:
- expect(result.exitCode, greaterThan(0));
+ expect(result.exitCode, equals(2));
expect(result.stderr, isEmpty);
expect(result.stdout, contains('1 issue found.'));
});
test('warning implicit --fatal-warnings', () {
- p = project(mainSrc: _warningDartCodeSnippet);
+ p = project(
+ mainSrc: _unusedImportCodeSnippet,
+ analysisOptions: _unusedImportAnalysisOptions);
var result = p.runSync('analyze', [p.dirPath]);
- //TODO(jwren) Once http://dartbug.com/40768 is resolved, this assertion
- // should be exitCode == 2, not greater than 0:
- expect(result.exitCode, greaterThan(0));
+ expect(result.exitCode, equals(2));
expect(result.stderr, isEmpty);
expect(result.stdout, contains('1 issue found.'));
});
test('warning --no-fatal-warnings', () {
- p = project(mainSrc: _warningDartCodeSnippet);
+ p = project(
+ mainSrc: _unusedImportCodeSnippet,
+ analysisOptions: _unusedImportAnalysisOptions);
var result = p.runSync('analyze', ['--no-fatal-warnings', p.dirPath]);
- //TODO(jwren) Once http://dartbug.com/40768 is resolved, this assertion
- // should be exitCode == 0:
- // expect(result.exitCode, 0);
+ expect(result.exitCode, 0);
expect(result.stderr, isEmpty);
expect(result.stdout, contains('1 issue found.'));
});
diff --git a/pkg/dartdev/test/commands/help_test.dart b/pkg/dartdev/test/commands/help_test.dart
index cfc6e77..204e4a0 100644
--- a/pkg/dartdev/test/commands/help_test.dart
+++ b/pkg/dartdev/test/commands/help_test.dart
@@ -20,15 +20,14 @@
/// Commands not tested by the following loop.
List<String> _commandsNotTested = <String>[
'help', // `dart help help` is redundant
- 'test' // TODO(jwren) not yet implemented, dartbug.com/41041
];
DartdevRunner([]).commands.forEach((String commandKey, Command command) {
if (!_commandsNotTested.contains(commandKey)) {
test('(help $commandKey == $commandKey --help)', () {
p = project();
var result = p.runSync('help', [commandKey]);
-
var verbHelpResult = p.runSync(commandKey, ['--help']);
+
expect(result.stdout, contains(verbHelpResult.stdout));
expect(result.stderr, contains(verbHelpResult.stderr));
});
diff --git a/pkg/dartdev/test/utils.dart b/pkg/dartdev/test/utils.dart
index 2a354ea..24db6fa 100644
--- a/pkg/dartdev/test/utils.dart
+++ b/pkg/dartdev/test/utils.dart
@@ -9,7 +9,9 @@
Timeout defaultTimeout = Timeout(Duration(seconds: 15));
-TestProject project({String mainSrc}) => TestProject(mainSrc: mainSrc);
+TestProject project({String mainSrc, String analysisOptions}) {
+ return TestProject(mainSrc: mainSrc, analysisOptions: analysisOptions);
+}
class TestProject {
static String get defaultProjectName => 'dartdev_temp';
@@ -22,12 +24,15 @@
String get relativeFilePath => 'lib/main.dart';
- TestProject({String mainSrc}) {
+ TestProject({String mainSrc, String analysisOptions}) {
dir = Directory.systemTemp.createTempSync('dartdev');
+ file('pubspec.yaml', 'name: $name\ndev_dependencies:\n test: any\n');
+ if (analysisOptions != null) {
+ file('analysis_options.yaml', analysisOptions);
+ }
if (mainSrc != null) {
file(relativeFilePath, mainSrc);
}
- file('pubspec.yaml', 'name: $name\ndev_dependencies:\n test: any\n');
}
void file(String name, String contents) {
diff --git a/pkg/dds/test/smoke_test.dart b/pkg/dds/test/smoke_test.dart
index cc266fc..6e6c1ed 100644
--- a/pkg/dds/test/smoke_test.dart
+++ b/pkg/dds/test/smoke_test.dart
@@ -21,9 +21,16 @@
'--observe=0',
'--pause-isolates-on-start',
'--write-service-info=$serviceInfoUri',
- script,
+ ...Platform.executableArguments,
+ Platform.script.resolve(script).toString(),
];
final process = await Process.start(executable, arguments);
+ process.stdout
+ .transform(utf8.decoder)
+ .listen((line) => print('TESTEE OUT: $line'));
+ process.stderr
+ .transform(utf8.decoder)
+ .listen((line) => print('TESTEE ERR: $line'));
while ((await serviceInfoFile.length()) <= 5) {
await Future.delayed(const Duration(milliseconds: 50));
}
diff --git a/pkg/dev_compiler/lib/src/kernel/compiler.dart b/pkg/dev_compiler/lib/src/kernel/compiler.dart
index 99d4bc6..b297574 100644
--- a/pkg/dev_compiler/lib/src/kernel/compiler.dart
+++ b/pkg/dev_compiler/lib/src/kernel/compiler.dart
@@ -479,9 +479,6 @@
// We only need to export main as it is the only method part of the
// publicly exposed JS API for a library.
- // TODO(jacobr): add a library level annotation indicating that all
- // contents of a library need to be exposed to JS.
- // https://github.com/dart-lang/sdk/issues/26368
var node = export.node;
if (node is Procedure && node.name.name == 'main') {
diff --git a/pkg/front_end/lib/src/api_prototype/language_version.dart b/pkg/front_end/lib/src/api_prototype/language_version.dart
new file mode 100644
index 0000000..4b566d6
--- /dev/null
+++ b/pkg/front_end/lib/src/api_prototype/language_version.dart
@@ -0,0 +1,130 @@
+// Copyright (c) 2020, 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.
+
+import 'dart:typed_data' show Uint8List;
+
+import 'package:_fe_analyzer_shared/src/scanner/scanner.dart'
+ show LanguageVersionToken, Scanner, ScannerConfiguration, scan;
+
+import 'package:package_config/package_config.dart'
+ show InvalidLanguageVersion, Package;
+
+import '../base/processed_options.dart' show ProcessedOptions;
+
+import '../fasta/compiler_context.dart' show CompilerContext;
+
+import '../fasta/uri_translator.dart' show UriTranslator;
+
+import 'compiler_options.dart' show CompilerOptions;
+
+import 'file_system.dart' show FileSystem, FileSystemException;
+
+/// Gets the language version for a specific URI.
+///
+/// Note that this returning some language version, doesn't mean there aren't
+/// errors associated with the language version specified (e.g. that the file
+/// specifies a language version that's too high).
+///
+/// The language version returned is valid though.
+Future<LanguageVersionForUri> languageVersionForUri(
+ Uri uri, CompilerOptions options) async {
+ return await CompilerContext.runWithOptions(
+ new ProcessedOptions(options: options, inputs: [uri]), (context) async {
+ // Get largest valid version / default version.
+ String currentSdkVersion = context.options.currentSdkVersion;
+ bool good = false;
+ int currentSdkVersionMajor;
+ int currentSdkVersionMinor;
+ if (currentSdkVersion != null) {
+ List<String> dotSeparatedParts = currentSdkVersion.split(".");
+ if (dotSeparatedParts.length >= 2) {
+ currentSdkVersionMajor = int.tryParse(dotSeparatedParts[0]);
+ currentSdkVersionMinor = int.tryParse(dotSeparatedParts[1]);
+ good = true;
+ }
+ }
+ if (!good) {
+ throw new StateError("Unparsable sdk version given: $currentSdkVersion");
+ }
+
+ // Get file uri.
+ UriTranslator uriTranslator = await context.options.getUriTranslator();
+ Uri fileUri;
+ Package package;
+ if (uri.scheme == "package") {
+ fileUri = uriTranslator.translate(uri);
+ package = uriTranslator.getPackage(uri);
+ } else {
+ fileUri = uri;
+ package = uriTranslator.packages.packageOf(uri);
+ }
+
+ // Check file content for @dart annotation.
+ int major;
+ int minor;
+ if (fileUri != null) {
+ List<int> rawBytes;
+ try {
+ FileSystem fileSystem = context.options.fileSystem;
+ rawBytes = await fileSystem.entityForUri(fileUri).readAsBytes();
+ } on FileSystemException catch (_) {
+ rawBytes = null;
+ }
+ if (rawBytes != null) {
+ Uint8List zeroTerminatedBytes = new Uint8List(rawBytes.length + 1);
+ zeroTerminatedBytes.setRange(0, rawBytes.length, rawBytes);
+
+ scan(zeroTerminatedBytes,
+ includeComments: false,
+ configuration: new ScannerConfiguration(), languageVersionChanged:
+ (Scanner scanner, LanguageVersionToken version) {
+ if (major != null || minor != null) return;
+ major = version.major;
+ minor = version.minor;
+ });
+ }
+ }
+
+ if (major != null && minor != null) {
+ // Verify OK.
+ if (major > currentSdkVersionMajor ||
+ (major == currentSdkVersionMajor && minor > currentSdkVersionMinor)) {
+ major = null;
+ minor = null;
+ }
+ }
+ if (major != null && minor != null) {
+ // The file decided. Return result.
+ return new LanguageVersionForUri(major, minor);
+ }
+
+ // Check package.
+ if (package != null &&
+ package.languageVersion != null &&
+ package.languageVersion is! InvalidLanguageVersion) {
+ major = package.languageVersion.major;
+ minor = package.languageVersion.minor;
+ if (major > currentSdkVersionMajor ||
+ (major == currentSdkVersionMajor && minor > currentSdkVersionMinor)) {
+ major = null;
+ minor = null;
+ }
+ }
+ if (major != null && minor != null) {
+ // The package decided. Return result.
+ return new LanguageVersionForUri(major, minor);
+ }
+
+ // Return default.
+ return new LanguageVersionForUri(
+ currentSdkVersionMajor, currentSdkVersionMinor);
+ });
+}
+
+class LanguageVersionForUri {
+ final int major;
+ final int minor;
+
+ LanguageVersionForUri(this.major, this.minor);
+}
diff --git a/pkg/front_end/lib/src/base/instrumentation.dart b/pkg/front_end/lib/src/base/instrumentation.dart
index a1e2443..8cf7170 100644
--- a/pkg/front_end/lib/src/base/instrumentation.dart
+++ b/pkg/front_end/lib/src/base/instrumentation.dart
@@ -3,6 +3,7 @@
// BSD-style license that can be found in the LICENSE file.
import 'package:kernel/ast.dart' show DartType, Member;
+import 'package:kernel/src/text_util.dart';
/// Convert '→' to '->' because '→' doesn't show up in some terminals.
/// Remove prefixes that are used very often in tests.
@@ -42,7 +43,8 @@
InstrumentationValueForMember(this.member);
@override
- String toString() => _shortenInstrumentationString(member.toString());
+ String toString() => _shortenInstrumentationString(
+ qualifiedMemberNameToString(member, includeLibraryName: true));
}
/// Instance of [InstrumentationValue] describing a [DartType].
diff --git a/pkg/front_end/lib/src/fasta/builder/class_builder.dart b/pkg/front_end/lib/src/fasta/builder/class_builder.dart
index f591155..cebb845 100644
--- a/pkg/front_end/lib/src/fasta/builder/class_builder.dart
+++ b/pkg/front_end/lib/src/fasta/builder/class_builder.dart
@@ -679,7 +679,7 @@
TypeDeclarationBuilder decl = superClassType.declaration;
if (decl is TypeAliasBuilder) {
TypeAliasBuilder aliasBuilder = decl;
- decl = aliasBuilder.unaliasDeclaration;
+ decl = aliasBuilder.unaliasDeclaration(superClassType.arguments);
}
// TODO(eernst): Should gather 'restricted supertype' checks in one place,
// e.g., dynamic/int/String/Null and more are checked elsewhere.
@@ -705,7 +705,7 @@
int charOffset = -1; // TODO(ahe): Get offset from type.
TypeDeclarationBuilder typeDeclaration = type.declaration;
TypeDeclarationBuilder decl = typeDeclaration is TypeAliasBuilder
- ? typeDeclaration.unaliasDeclaration
+ ? typeDeclaration.unaliasDeclaration(type.arguments)
: typeDeclaration;
if (decl is ClassBuilder) {
ClassBuilder interface = decl;
@@ -1989,7 +1989,7 @@
if (builder is ClassBuilder) return builder;
if (builder is TypeAliasBuilder) {
TypeDeclarationBuilder declarationBuilder =
- builder.unaliasDeclaration;
+ builder.unaliasDeclaration(supertype.arguments);
if (declarationBuilder is ClassBuilder) return declarationBuilder;
}
}
diff --git a/pkg/front_end/lib/src/fasta/builder/constructor_reference_builder.dart b/pkg/front_end/lib/src/fasta/builder/constructor_reference_builder.dart
index 0f589ac..eb66bc8 100644
--- a/pkg/front_end/lib/src/fasta/builder/constructor_reference_builder.dart
+++ b/pkg/front_end/lib/src/fasta/builder/constructor_reference_builder.dart
@@ -49,7 +49,7 @@
declaration = scope.lookup(prefix, charOffset, fileUri);
if (declaration is TypeAliasBuilder) {
TypeAliasBuilder aliasBuilder = declaration;
- declaration = aliasBuilder.unaliasDeclaration;
+ declaration = aliasBuilder.unaliasDeclaration(typeArguments);
}
if (declaration is PrefixBuilder) {
PrefixBuilder prefix = declaration;
diff --git a/pkg/front_end/lib/src/fasta/builder/library_builder.dart b/pkg/front_end/lib/src/fasta/builder/library_builder.dart
index a9c325a..e176173 100644
--- a/pkg/front_end/lib/src/fasta/builder/library_builder.dart
+++ b/pkg/front_end/lib/src/fasta/builder/library_builder.dart
@@ -337,7 +337,10 @@
.lookup(className, -1, null);
if (cls is TypeAliasBuilder) {
TypeAliasBuilder aliasBuilder = cls;
- cls = aliasBuilder.unaliasDeclaration;
+ // No type arguments are available, but this method is only called in
+ // order to find constructors of specific non-generic classes (errors),
+ // so we can pass the empty list.
+ cls = aliasBuilder.unaliasDeclaration(const <TypeBuilder>[]);
}
if (cls is ClassBuilder) {
// TODO(ahe): This code is similar to code in `endNewExpression` in
diff --git a/pkg/front_end/lib/src/fasta/builder/named_type_builder.dart b/pkg/front_end/lib/src/fasta/builder/named_type_builder.dart
index 620deab..55531dc 100644
--- a/pkg/front_end/lib/src/fasta/builder/named_type_builder.dart
+++ b/pkg/front_end/lib/src/fasta/builder/named_type_builder.dart
@@ -11,6 +11,7 @@
Class,
DartType,
Extension,
+ InterfaceType,
InvalidType,
Supertype,
TreeNode,
@@ -269,10 +270,10 @@
}
return declaration.buildSupertype(library, arguments);
} else if (declaration is TypeAliasBuilder) {
- TypeDeclarationBuilder declarationBuilder =
- declaration.unaliasDeclaration;
- if (declarationBuilder is ClassBuilder) {
- return declarationBuilder.buildSupertype(library, arguments);
+ DartType type =
+ declaration.buildType(library, library.nonNullableBuilder, arguments);
+ if (type is InterfaceType) {
+ return new Supertype(type.classNode, type.typeArguments);
}
} else if (declaration is InvalidTypeDeclarationBuilder) {
library.addProblem(
@@ -289,12 +290,14 @@
Supertype buildMixedInType(
LibraryBuilder library, int charOffset, Uri fileUri) {
TypeDeclarationBuilder declaration = this.declaration;
- if (declaration is TypeAliasBuilder) {
- TypeAliasBuilder aliasBuilder = declaration;
- declaration = aliasBuilder.unaliasDeclaration;
- }
if (declaration is ClassBuilder) {
return declaration.buildMixedInType(library, arguments);
+ } else if (declaration is TypeAliasBuilder) {
+ DartType type =
+ declaration.buildType(library, library.nonNullableBuilder, arguments);
+ if (type is InterfaceType) {
+ return new Supertype(type.classNode, type.typeArguments);
+ }
} else if (declaration is InvalidTypeDeclarationBuilder) {
library.addProblem(
declaration.message.messageObject,
@@ -303,9 +306,8 @@
declaration.message.uri,
severity: Severity.error);
return null;
- } else {
- return handleInvalidSupertype(library, charOffset, fileUri);
}
+ return handleInvalidSupertype(library, charOffset, fileUri);
}
TypeBuilder subst(Map<TypeVariableBuilder, TypeBuilder> substitution) {
diff --git a/pkg/front_end/lib/src/fasta/builder/type_alias_builder.dart b/pkg/front_end/lib/src/fasta/builder/type_alias_builder.dart
index 6cc686b..a852f46 100644
--- a/pkg/front_end/lib/src/fasta/builder/type_alias_builder.dart
+++ b/pkg/front_end/lib/src/fasta/builder/type_alias_builder.dart
@@ -22,7 +22,12 @@
import 'package:kernel/src/future_or.dart';
import '../fasta_codes.dart'
- show noLength, templateCyclicTypedef, templateTypeArgumentMismatch;
+ show
+ noLength,
+ templateCyclicTypedef,
+ templateTypeArgumentMismatch,
+ messageTypedefTypeVariableNotConstructor,
+ messageTypedefTypeVariableNotConstructorCause;
import '../problems.dart' show unhandled;
@@ -66,6 +71,8 @@
LibraryBuilder get parent => super.parent;
+ LibraryBuilder get library => super.parent;
+
// TODO(CFE TEAM): Some of this is a temporary workaround.
List<TypeVariableBuilder> get typeVariables => _typeVariables;
int varianceAt(int index) => typeVariables[index].parameter.variance;
@@ -176,7 +183,9 @@
Nullability nullability, List<DartType> arguments) {
DartType thisType = buildThisType(library);
if (const DynamicType() == thisType) return thisType;
- DartType result = thisType.withNullability(nullability);
+ Nullability adjustedNullability =
+ isNullAlias ? Nullability.nullable : nullability;
+ DartType result = thisType.withNullability(adjustedNullability);
if (typedef.typeParameters.isEmpty && arguments == null) return result;
Map<TypeParameter, DartType> substitution = <TypeParameter, DartType>{};
for (int i = 0; i < typedef.typeParameters.length; i++) {
@@ -261,11 +270,32 @@
buildTypeArguments(library, arguments));
}
- /// Returns the [TypeDeclarationBuilder] for the aliased type.
+ TypeDeclarationBuilder _cachedUnaliasedDeclaration;
+
+ /// Returns the [TypeDeclarationBuilder] for the type aliased by `this`,
+ /// based on the given [typeArguments]. It expands type aliases repeatedly
+ /// until it encounters a builder which is not a [TypeAliasBuilder].
///
- /// That is, it recursively looks up `type.declaration` and returns the first
- /// one which is not a `TypeAliasBuilder`, or the last one if none exist.
- TypeDeclarationBuilder get unaliasDeclaration {
+ /// If [isInvocation] is false: In this case it is required that
+ /// `typeArguments.length == typeVariables.length`. The [typeArguments] are
+ /// threaded through the expansion if needed, and the resulting declaration
+ /// is returned.
+ ///
+ /// If [isInvocation] is true: In this case [typeArguments] are ignored, but
+ /// [invocationCharOffset] and [invocationFileUri] must be non-null. If `this`
+ /// type alias expands in one or more steps to a builder which is not a
+ /// [TypeAliasBuilder] nor a [TypeVariableBuilder] then that builder is
+ /// returned. If this type alias is cyclic or expands to an invalid type or
+ /// a type that does not have a declaration (say, a function type) then `this`
+ /// is returned (when the type was invalid: with `thisType` set to
+ /// `const InvalidType()`). If `this` type alias expands to a
+ /// [TypeVariableBuilder] then the type alias cannot be used in a constructor
+ /// invocation. Then an error is emitted and `this` is returned.
+ TypeDeclarationBuilder unaliasDeclaration(List<TypeBuilder> typeArguments,
+ {bool isInvocation = false,
+ int invocationCharOffset,
+ Uri invocationFileUri}) {
+ if (_cachedUnaliasedDeclaration != null) return _cachedUnaliasedDeclaration;
Set<TypeDeclarationBuilder> builders = {this};
TypeDeclarationBuilder current = this;
while (current is TypeAliasBuilder) {
@@ -274,11 +304,215 @@
if (next != null) {
current = next;
} else {
- return this;
+ // `currentAliasBuilder`'s right hand side is not a [NamedTypeBuilder].
+ // There is no ultimate declaration, so unaliasing is a no-op.
+ return _cachedUnaliasedDeclaration = this;
}
- if (builders.contains(current)) return this;
+ if (builders.contains(current)) {
+ // Cyclic type alias.
+ currentAliasBuilder.library.addProblem(
+ templateCyclicTypedef.withArguments(this.name),
+ charOffset,
+ noLength,
+ fileUri);
+ // Ensure that it is not reported again.
+ thisType = const InvalidType();
+ return _cachedUnaliasedDeclaration = this;
+ }
+ if (current is TypeVariableBuilder) {
+ // Encountered `typedef F<..X..> = X`, must repeat the computation,
+ // tracing type variables at each step. We repeat everything because
+ // that kind of type alias is expected to be rare. We cannot save it in
+ // `_cachedUnaliasedDeclaration` because it changes from call to call
+ // with type aliases of this kind. Note that every `aliasBuilder.type`
+ // up to this point is a [NamedTypeBuilder], because only they can have
+ // a non-null `type`. However, a constructor invocation is not admitted.
+ if (isInvocation) {
+ library.addProblem(messageTypedefTypeVariableNotConstructor,
+ invocationCharOffset, noLength, invocationFileUri,
+ context: [
+ messageTypedefTypeVariableNotConstructorCause.withLocation(
+ current.fileUri, current.charOffset, noLength),
+ ]);
+ return this;
+ }
+ return _unaliasDeclaration(typeArguments);
+ }
}
- return current;
+ return _cachedUnaliasedDeclaration = current;
+ }
+
+ // Helper method with same purpose as [unaliasDeclaration], for a hard case.
+ //
+ // It is required that `typeArguments.length == typeVariables.length`, and
+ // [typeArguments] are considered to be passed as actual type arguments to
+ // [this]. It is also required that the sequence traversed by following
+ // `.type.declaration` starting from `this` in a finite number of steps
+ // reaches a `TypeVariableBuilder`. So this method does not check for cycles,
+ // nor for other types than `NamedTypeBuilder` and `TypeVariableBuilder`
+ // after each step over a `.type.declaration`.
+ //
+ // Returns `this` if an error is encountered.
+ //
+ // This method more expensive than [unaliasDeclaration], but it will handle
+ // the case where a sequence of type aliases F_1 .. F_k is such that F_i
+ // has a right hand side which is F_{i+1}, possibly applied to some type
+ // arguments, for all i in 1 .. k-1, and the right hand side of F_k is a type
+ // variable. In this case, the unaliased declaration must be obtained from
+ // the type argument, which is the reason why we must trace them.
+ TypeDeclarationBuilder _unaliasDeclaration(List<TypeBuilder> typeArguments) {
+ TypeDeclarationBuilder currentDeclarationBuilder = this;
+ TypeAliasBuilder previousAliasBuilder = null;
+ List<TypeBuilder> currentTypeArguments = typeArguments;
+ while (currentDeclarationBuilder is TypeAliasBuilder) {
+ TypeAliasBuilder currentAliasBuilder = currentDeclarationBuilder;
+ TypeBuilder nextTypeBuilder = currentAliasBuilder.type;
+ if (nextTypeBuilder is NamedTypeBuilder) {
+ Map<TypeVariableBuilder, TypeBuilder> substitution = {};
+ int index = 0;
+ if (currentTypeArguments == null || currentTypeArguments.isEmpty) {
+ if (currentAliasBuilder.typeVariables != null) {
+ List<TypeBuilder> defaultTypeArguments =
+ new List<TypeBuilder>.filled(
+ currentAliasBuilder.typeVariables.length, null,
+ growable: true);
+ for (int i = 0; i < defaultTypeArguments.length; ++i) {
+ defaultTypeArguments[i] =
+ currentAliasBuilder.typeVariables[i].defaultType;
+ }
+ currentTypeArguments = defaultTypeArguments;
+ } else {
+ currentTypeArguments = <TypeBuilder>[];
+ }
+ }
+ if ((currentAliasBuilder.typeVariables?.length ?? 0) !=
+ currentTypeArguments.length) {
+ if (previousAliasBuilder != null) {
+ previousAliasBuilder.library.addProblem(
+ templateTypeArgumentMismatch.withArguments(
+ currentAliasBuilder.typeVariables?.length ?? 0),
+ previousAliasBuilder.charOffset,
+ noLength,
+ previousAliasBuilder.fileUri);
+ previousAliasBuilder.thisType = const InvalidType();
+ return this;
+ } else {
+ // This implies that `currentAliasBuilder` is [this], and the call
+ // violated the precondition.
+ return unhandled("$this: Wrong number of type arguments",
+ "_unaliasDeclaration", -1, null);
+ }
+ }
+ for (TypeVariableBuilder typeVariableBuilder
+ in currentAliasBuilder.typeVariables ?? []) {
+ substitution[typeVariableBuilder] = currentTypeArguments[index];
+ ++index;
+ }
+ TypeDeclarationBuilder nextDeclarationBuilder =
+ nextTypeBuilder.declaration;
+ TypeBuilder substitutedBuilder = nextTypeBuilder.subst(substitution);
+ if (nextDeclarationBuilder is TypeVariableBuilder) {
+ // We have reached the end of the type alias chain which yields a
+ // type argument, which may become a type alias, possibly with its
+ // own similar chain. We do not simply continue the iteration here,
+ // though: We must call `unaliasDeclaration` because it can be
+ // cyclic; we want to do it as well, because the result could be
+ // cached.
+ if (substitutedBuilder is NamedTypeBuilder) {
+ TypeDeclarationBuilder declarationBuilder =
+ substitutedBuilder.declaration;
+ if (declarationBuilder is TypeAliasBuilder) {
+ return declarationBuilder
+ .unaliasDeclaration(substitutedBuilder.arguments);
+ }
+ return declarationBuilder;
+ }
+ // This can be null, e.g, `substitutedBuilder is FunctionTypeBuilder`
+ return substitutedBuilder.declaration;
+ }
+ // Not yet at the end of the chain, more named builders to come.
+ NamedTypeBuilder namedBuilder = substitutedBuilder;
+ currentDeclarationBuilder = namedBuilder.declaration;
+ currentTypeArguments = namedBuilder.arguments;
+ previousAliasBuilder = currentAliasBuilder;
+ } else {
+ // Violation of requirement that we only step through
+ // `NamedTypeBuilder`s ending in a `TypeVariableBuilder`.
+ return null;
+ }
+ }
+ return currentDeclarationBuilder;
+ }
+
+ /// Compute type arguments passed to [ClassBuilder] from unaliasDeclaration.
+ /// This method does not check for cycles and may only be called if an
+ /// invocation of `this.unaliasDeclaration(typeArguments)` has returned a
+ /// [ClassBuilder].
+ ///
+ /// The parameter [typeArguments] would typically be obtained from a
+ /// [NamedTypeBuilder] whose `declaration` is `this`. It must be non-null.
+ ///
+ /// Returns `null` if an error occurred.
+ ///
+ /// The method substitutes through the chain of type aliases denoted by
+ /// [this], such that the returned [TypeBuilder]s are appropriate type
+ /// arguments for passing to the [ClassBuilder] which is the end of the
+ /// unaliasing chain.
+ List<TypeBuilder> unaliasTypeArguments(List<TypeBuilder> typeArguments) {
+ TypeDeclarationBuilder currentDeclarationBuilder = this;
+ List<TypeBuilder> currentTypeArguments = typeArguments;
+ while (currentDeclarationBuilder is TypeAliasBuilder) {
+ TypeAliasBuilder currentAliasBuilder = currentDeclarationBuilder;
+ TypeBuilder nextTypeBuilder = currentAliasBuilder.type;
+ assert(nextTypeBuilder is NamedTypeBuilder);
+ NamedTypeBuilder namedNextTypeBuilder = nextTypeBuilder;
+ Map<TypeVariableBuilder, TypeBuilder> substitution = {};
+ int index = 0;
+ if (currentTypeArguments == null || currentTypeArguments.isEmpty) {
+ if (currentAliasBuilder.typeVariables != null) {
+ List<TypeBuilder> defaultTypeArguments = new List<TypeBuilder>.filled(
+ currentAliasBuilder.typeVariables.length, null,
+ growable: true);
+ for (int i = 0; i < defaultTypeArguments.length; ++i) {
+ defaultTypeArguments[i] =
+ currentAliasBuilder.typeVariables[i].defaultType;
+ }
+ currentTypeArguments = defaultTypeArguments;
+ } else {
+ currentTypeArguments = <TypeBuilder>[];
+ }
+ }
+ assert((currentAliasBuilder.typeVariables?.length ?? 0) ==
+ currentTypeArguments.length);
+ for (TypeVariableBuilder typeVariableBuilder
+ in currentAliasBuilder.typeVariables ?? []) {
+ substitution[typeVariableBuilder] = currentTypeArguments[index];
+ ++index;
+ }
+ TypeDeclarationBuilder nextDeclarationBuilder =
+ namedNextTypeBuilder.declaration;
+ TypeBuilder substitutedBuilder = nextTypeBuilder.subst(substitution);
+ if (nextDeclarationBuilder is TypeVariableBuilder) {
+ // We have reached the end of the type alias chain which yields a
+ // type argument, which may become a type alias, possibly with its
+ // own similar chain.
+ assert(substitutedBuilder is NamedTypeBuilder);
+ NamedTypeBuilder namedSubstitutedBuilder = substitutedBuilder;
+ TypeDeclarationBuilder declarationBuilder =
+ namedSubstitutedBuilder.declaration;
+ if (declarationBuilder is TypeAliasBuilder) {
+ return declarationBuilder
+ .unaliasTypeArguments(namedSubstitutedBuilder.arguments);
+ }
+ assert(declarationBuilder is ClassBuilder);
+ return namedSubstitutedBuilder.arguments ?? [];
+ }
+ // Not yet at the end of the chain, more named builders to come.
+ NamedTypeBuilder namedBuilder = substitutedBuilder;
+ currentDeclarationBuilder = namedBuilder.declaration;
+ currentTypeArguments = namedBuilder.arguments ?? [];
+ }
+ return currentTypeArguments;
}
}
diff --git a/pkg/front_end/lib/src/fasta/dill/dill_member_builder.dart b/pkg/front_end/lib/src/fasta/dill/dill_member_builder.dart
index 8afca33..5e8589c 100644
--- a/pkg/front_end/lib/src/fasta/dill/dill_member_builder.dart
+++ b/pkg/front_end/lib/src/fasta/dill/dill_member_builder.dart
@@ -162,6 +162,14 @@
memberBuilder.kind == ProcedureKind.Setter;
@override
+ bool get isSynthesized {
+ Member member = memberBuilder.member;
+ return member is Procedure &&
+ (member.isMemberSignature ||
+ (member.isForwardingStub && !member.isForwardingSemiStub));
+ }
+
+ @override
bool get isFunction => !isProperty;
@override
diff --git a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
index 2c97d0b..e32f0fc 100644
--- a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
@@ -845,7 +845,13 @@
assert(!inInitializer);
Object node = pop();
List<Initializer> initializers;
- if (node is Initializer) {
+
+ final ModifierBuilder member = this.member;
+ if (!(member is ConstructorBuilder && !member.isExternal)) {
+ // Initializer not allowed. An error will (hopefully) have been created
+ // already.
+ initializers = <Initializer>[];
+ } else if (node is Initializer) {
initializers = <Initializer>[node];
} else if (node is Generator) {
initializers = node.buildFieldInitializer(initializedFields);
@@ -866,14 +872,6 @@
}
_initializers ??= <Initializer>[];
_initializers.addAll(initializers);
- final ModifierBuilder member = this.member;
- if (!(member is ConstructorBuilder && !member.isExternal)) {
- addProblem(
- fasta.templateInitializerOutsideConstructor
- .withArguments(member.name),
- token.charOffset,
- member.name.length);
- }
}
DartType _computeReturnTypeContext(MemberBuilder member) {
@@ -1327,8 +1325,14 @@
ReturnStatementImpl fakeReturn = new ReturnStatementImpl(true, expression);
- typeInferrer?.inferFunctionBody(
+ Statement inferredStatement = typeInferrer?.inferFunctionBody(
this, fileOffset, const DynamicType(), AsyncMarker.Sync, fakeReturn);
+ assert(
+ fakeReturn == inferredStatement,
+ "Previously implicit assumption about inferFunctionBody "
+ "not returning anything different.");
+ libraryBuilder.loader.transformPostInference(fakeReturn,
+ transformSetLiterals, transformCollections, libraryBuilder.library);
return fakeReturn.expression;
}
@@ -4109,7 +4113,7 @@
void endImplicitCreationExpression(Token token) {
debugEvent("ImplicitCreationExpression");
_buildConstructorReferenceInvocation(
- token, token.offset, Constness.implicit);
+ token.next, token.offset, Constness.implicit);
}
@override
@@ -4144,7 +4148,96 @@
if (type is TypeAliasBuilder) {
errorName = debugName(type.name, name);
TypeAliasBuilder aliasBuilder = type;
- type = aliasBuilder.unaliasDeclaration;
+ List<TypeBuilder> typeArgumentBuilders = null;
+ if (typeArguments != null) {
+ typeArgumentBuilders = <TypeBuilder>[];
+ for (UnresolvedType unresolvedType in typeArguments) {
+ typeArgumentBuilders.add(unresolvedType?.builder);
+ }
+ }
+ int numberOfTypeParameters = aliasBuilder.typeVariables?.length ?? 0;
+ int numberOfTypeArguments = typeArgumentBuilders?.length ?? 0;
+ if (typeArgumentBuilders != null &&
+ numberOfTypeParameters != numberOfTypeArguments) {
+ // TODO(eernst): Use position of type arguments, not nameToken.
+ return evaluateArgumentsBefore(
+ arguments,
+ buildProblem(
+ fasta.templateTypeArgumentMismatch
+ .withArguments(numberOfTypeParameters),
+ nameToken.charOffset,
+ nameToken.length));
+ }
+ if (typeArgumentBuilders == null) {
+ if (aliasBuilder.typeVariables?.isEmpty ?? true) {
+ typeArgumentBuilders = [];
+ } else {
+ // No type arguments provided to alias, but it is generic.
+ typeArgumentBuilders = new List<TypeBuilder>.filled(
+ aliasBuilder.typeVariables.length, null,
+ growable: true);
+ for (int i = 0; i < typeArgumentBuilders.length; ++i) {
+ // TODO(eernst): We must use inferred types, for now use defaults.
+ typeArgumentBuilders[i] = aliasBuilder.typeVariables[i].defaultType;
+ }
+ }
+ }
+ type = aliasBuilder.unaliasDeclaration(typeArgumentBuilders);
+ if (type is ClassBuilder) {
+ if (typeArguments != null) {
+ int numberOfTypeParameters = aliasBuilder.typeVariables?.length ?? 0;
+ if (numberOfTypeParameters != typeArgumentBuilders.length) {
+ // TODO(eernst): Use position of type arguments, not nameToken.
+ return evaluateArgumentsBefore(
+ arguments,
+ buildProblem(
+ fasta.templateTypeArgumentMismatch
+ .withArguments(numberOfTypeParameters),
+ nameToken.charOffset,
+ nameToken.length));
+ }
+ List<TypeBuilder> unaliasedTypeArgumentBuilders =
+ aliasBuilder.unaliasTypeArguments(typeArgumentBuilders);
+ if (unaliasedTypeArgumentBuilders == null) {
+ // TODO(eernst): This is a wrong number of type arguments,
+ // occurring indirectly (in an alias of an alias, etc.).
+ return evaluateArgumentsBefore(
+ arguments,
+ buildProblem(
+ fasta.templateTypeArgumentMismatch
+ .withArguments(numberOfTypeParameters),
+ nameToken.charOffset,
+ nameToken.length,
+ suppressMessage: true));
+ }
+ if (unaliasedTypeArgumentBuilders.isEmpty) {
+ forest.argumentsSetTypeArguments(arguments, []);
+ } else {
+ List<DartType> dartTypeArguments = [];
+ if (typeArguments != null) {
+ for (UnresolvedType unresolvedType in typeArguments) {
+ dartTypeArguments
+ .add(unresolvedType.builder?.build(libraryBuilder));
+ }
+ }
+ forest.argumentsSetTypeArguments(arguments, dartTypeArguments);
+ }
+ } else {
+ if (type.typeVariables?.isEmpty ?? true) {
+ forest.argumentsSetTypeArguments(arguments, []);
+ } else {
+ // No type arguments provided to unaliased class, use defaults.
+ List<DartType> result = new List<DartType>.filled(
+ type.typeVariables.length, null,
+ growable: true);
+ for (int i = 0; i < result.length; ++i) {
+ result[i] =
+ type.typeVariables[i].defaultType?.build(type.library);
+ }
+ forest.argumentsSetTypeArguments(arguments, result);
+ }
+ }
+ }
}
if (type is ClassBuilder) {
if (type is EnumBuilder) {
diff --git a/pkg/front_end/lib/src/fasta/kernel/class_hierarchy_builder.dart b/pkg/front_end/lib/src/fasta/kernel/class_hierarchy_builder.dart
index a3df7ab..c080b03 100644
--- a/pkg/front_end/lib/src/fasta/kernel/class_hierarchy_builder.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/class_hierarchy_builder.dart
@@ -1462,16 +1462,18 @@
Scope scope = classBuilder.scope;
if (classBuilder.isMixinApplication) {
- TypeDeclarationBuilder mixin =
- classBuilder.mixedInTypeBuilder.declaration;
+ TypeBuilder mixedInTypeBuilder = classBuilder.mixedInTypeBuilder;
+ TypeDeclarationBuilder mixin = mixedInTypeBuilder.declaration;
inferMixinApplication();
while (mixin.isNamedMixinApplication) {
ClassBuilder named = mixin;
- mixin = named.mixedInTypeBuilder.declaration;
+ mixedInTypeBuilder = named.mixedInTypeBuilder;
+ mixin = mixedInTypeBuilder.declaration;
}
if (mixin is TypeAliasBuilder) {
TypeAliasBuilder aliasBuilder = mixin;
- mixin = aliasBuilder.unaliasDeclaration;
+ NamedTypeBuilder namedBuilder = mixedInTypeBuilder;
+ mixin = aliasBuilder.unaliasDeclaration(namedBuilder.arguments);
}
if (mixin is ClassBuilder) {
scope = mixin.scope.computeMixinScope();
@@ -1771,8 +1773,11 @@
// [declaredMember] is a method declared in [cls]. This means it
// defines the interface of this class regardless if its abstract.
- registerOverrideDependency(declaredMember, extendedMember.abstract);
- registerOverrideCheck(declaredMember, extendedMember.abstract);
+ if (!declaredMember.isSynthesized) {
+ registerOverrideDependency(
+ declaredMember, extendedMember.abstract);
+ registerOverrideCheck(declaredMember, extendedMember.abstract);
+ }
if (declaredMember.isAbstract) {
if (extendedMember.isAbstract) {
@@ -2134,24 +2139,26 @@
}
List<TypeBuilder> computeDefaultTypeArguments(TypeBuilder type) {
- TypeDeclarationBuilder cls = type.declaration;
- if (cls is TypeAliasBuilder) {
- TypeAliasBuilder aliasBuilder = cls;
- cls = aliasBuilder.unaliasDeclaration;
- }
- if (cls is ClassBuilder) {
- List<TypeBuilder> result =
- new List<TypeBuilder>(cls.typeVariables.length);
- for (int i = 0; i < result.length; ++i) {
- TypeVariableBuilder tv = cls.typeVariables[i];
- result[i] = tv.defaultType ??
- cls.library.loader.computeTypeBuilder(tv.parameter.defaultType);
- }
- return result;
+ TypeDeclarationBuilder decl = type.declaration;
+ List<TypeVariableBuilder> typeVariables;
+ LibraryBuilder library;
+ if (decl is TypeAliasBuilder) {
+ typeVariables = decl.typeVariables;
+ library = decl.library;
+ } else if (decl is ClassBuilder) {
+ typeVariables = decl.typeVariables;
+ library = decl.library;
} else {
- return unhandled("${cls.runtimeType}", "$cls", classBuilder.charOffset,
+ return unhandled("${decl.runtimeType}", "$decl", classBuilder.charOffset,
classBuilder.fileUri);
}
+ List<TypeBuilder> result = new List<TypeBuilder>(typeVariables.length);
+ for (int i = 0; i < result.length; ++i) {
+ TypeVariableBuilder tv = typeVariables[i];
+ result[i] = tv.defaultType ??
+ library.loader.computeTypeBuilder(tv.parameter.defaultType);
+ }
+ return result;
}
void addInterface(List<Supertype> interfaces, List<Supertype> superclasses,
@@ -3360,7 +3367,8 @@
Builder declaration = type.declaration;
if (declaration is TypeAliasBuilder) {
TypeAliasBuilder aliasBuilder = declaration;
- declaration = aliasBuilder.unaliasDeclaration;
+ NamedTypeBuilder namedBuilder = type;
+ declaration = aliasBuilder.unaliasDeclaration(namedBuilder.arguments);
}
return declaration is ClassBuilder ? declaration : null;
}
diff --git a/pkg/front_end/lib/src/fasta/kernel/collections.dart b/pkg/front_end/lib/src/fasta/kernel/collections.dart
index 5f142ad..ce75ae0 100644
--- a/pkg/front_end/lib/src/fasta/kernel/collections.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/collections.dart
@@ -102,7 +102,12 @@
@override
String toString() {
- return "SpreadElement()";
+ return "SpreadElement(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -163,7 +168,12 @@
@override
String toString() {
- return "IfElement()";
+ return "IfElement(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -220,7 +230,12 @@
@override
String toString() {
- return "ForElement()";
+ return "ForElement(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -304,7 +319,12 @@
@override
String toString() {
- return "ForInElement()";
+ return "ForInElement(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -363,7 +383,12 @@
@override
String toString() {
- return "SpreadMapEntry()";
+ return "SpreadMapEntry(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -404,7 +429,12 @@
@override
String toString() {
- return "IfMapEntry()";
+ return "IfMapEntry(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -446,7 +476,12 @@
@override
String toString() {
- return "ForMapEntry()";
+ return "ForMapEntry(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -515,7 +550,12 @@
@override
String toString() {
- return "ForInMapEntry()";
+ return "ForInMapEntry(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
diff --git a/pkg/front_end/lib/src/fasta/kernel/expression_generator.dart b/pkg/front_end/lib/src/fasta/kernel/expression_generator.dart
index 02bcfc4..19bcd1f 100644
--- a/pkg/front_end/lib/src/fasta/kernel/expression_generator.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/expression_generator.dart
@@ -3018,7 +3018,10 @@
TypeDeclarationBuilder declarationBuilder = declaration;
if (declarationBuilder is TypeAliasBuilder) {
TypeAliasBuilder aliasBuilder = declarationBuilder;
- declarationBuilder = aliasBuilder.unaliasDeclaration;
+ declarationBuilder = aliasBuilder.unaliasDeclaration(null,
+ isInvocation: true,
+ invocationCharOffset: this.fileOffset,
+ invocationFileUri: _uri);
}
if (declarationBuilder is DeclarationBuilder) {
DeclarationBuilder declaration = declarationBuilder;
diff --git a/pkg/front_end/lib/src/fasta/kernel/forest.dart b/pkg/front_end/lib/src/fasta/kernel/forest.dart
index 51a5f21..3716eac 100644
--- a/pkg/front_end/lib/src/fasta/kernel/forest.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/forest.dart
@@ -757,6 +757,11 @@
@override
String toString() {
- return "_VariablesDeclaration()";
+ return "_VariablesDeclaration(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
diff --git a/pkg/front_end/lib/src/fasta/kernel/forwarding_node.dart b/pkg/front_end/lib/src/fasta/kernel/forwarding_node.dart
index 8e68472..66897dc 100644
--- a/pkg/front_end/lib/src/fasta/kernel/forwarding_node.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/forwarding_node.dart
@@ -412,7 +412,8 @@
superclass, procedure.name, kind == ProcedureKind.Setter);
if (superTarget == null) return;
if (superTarget is Procedure && superTarget.isForwardingStub) {
- superTarget = _getForwardingStubSuperTarget(superTarget);
+ Procedure superProcedure = superTarget;
+ superTarget = superProcedure.forwardingStubSuperTarget;
}
procedure.isAbstract = false;
if (!procedure.isForwardingStub) {
@@ -533,21 +534,6 @@
return candidate.getMember(hierarchy);
}
- static Member _getForwardingStubSuperTarget(Procedure forwardingStub) {
- // TODO(paulberry): when dartbug.com/31562 is fixed, this should become
- // easier.
- ReturnStatement body = forwardingStub.function.body;
- Expression expression = body.expression;
- if (expression is SuperMethodInvocation) {
- return expression.interfaceTarget;
- } else if (expression is SuperPropertySet) {
- return expression.interfaceTarget;
- } else {
- return unhandled('${expression.runtimeType}',
- '_getForwardingStubSuperTarget', -1, null);
- }
- }
-
Substitution _substitutionFor(
List<TypeParameter> stubTypeParameters, Member candidate, Class class_) {
Substitution substitution = Substitution.fromInterfaceType(
diff --git a/pkg/front_end/lib/src/fasta/kernel/implicit_field_type.dart b/pkg/front_end/lib/src/fasta/kernel/implicit_field_type.dart
index f0c3651..a8e6079 100644
--- a/pkg/front_end/lib/src/fasta/kernel/implicit_field_type.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/implicit_field_type.dart
@@ -174,5 +174,8 @@
}
@override
- String toString() => 'ImplicitFieldType($fieldBuilder)';
+ String toString() => 'ImplicitFieldType(${toStringInternal()})';
+
+ @override
+ String toStringInternal() => '$fieldBuilder';
}
diff --git a/pkg/front_end/lib/src/fasta/kernel/implicit_type_argument.dart b/pkg/front_end/lib/src/fasta/kernel/implicit_type_argument.dart
index 1f0d6cc..14960a6 100644
--- a/pkg/front_end/lib/src/fasta/kernel/implicit_type_argument.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/implicit_type_argument.dart
@@ -46,6 +46,11 @@
@override
String toString() {
- return "ImplicitTypeArgument()";
+ return "ImplicitTypeArgument(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
diff --git a/pkg/front_end/lib/src/fasta/kernel/internal_ast.dart b/pkg/front_end/lib/src/fasta/kernel/internal_ast.dart
index f74b9ed..0d21e59 100644
--- a/pkg/front_end/lib/src/fasta/kernel/internal_ast.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/internal_ast.dart
@@ -275,7 +275,12 @@
@override
String toString() {
- return "ForInStatementWithSynthesizedVariable()";
+ return "ForInStatementWithSynthesizedVariable(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -317,7 +322,12 @@
@override
String toString() {
- return "TryStatement()";
+ return "TryStatement(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -332,7 +342,12 @@
@override
String toString() {
- return "SwitchCaseImpl()";
+ return "SwitchCaseImpl(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -346,7 +361,12 @@
@override
String toString() {
- return "BreakStatementImpl()";
+ return "BreakStatementImpl(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -478,7 +498,13 @@
@override
String toString() {
- return "ArgumentsImpl()";
+ return "ArgumentsImpl(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ // TODO(jensj): Make (much) better.
+ return "";
}
}
@@ -545,7 +571,12 @@
@override
String toString() {
- return "Cascade()";
+ return "Cascade(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -589,7 +620,12 @@
@override
String toString() {
- return "DeferredCheck()";
+ return "DeferredCheck(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -621,7 +657,12 @@
@override
String toString() {
- return "FactoryConstructorInvocationJudgment()";
+ return "FactoryConstructorInvocationJudgment(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -640,7 +681,12 @@
@override
String toString() {
- return "FunctionDeclarationImpl()";
+ return "FunctionDeclarationImpl(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -661,7 +707,12 @@
@override
String toString() {
- return "InvalidSuperInitializerJudgment()";
+ return "InvalidSuperInitializerJudgment(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -709,7 +760,12 @@
@override
String toString() {
- return "IfNullExpression()";
+ return "IfNullExpression(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -762,7 +818,12 @@
@override
String toString() {
- return "IntJudgment()";
+ return "IntJudgment(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -796,7 +857,12 @@
@override
String toString() {
- return "ShadowLargeIntLiteral()";
+ return "ShadowLargeIntLiteral(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -812,7 +878,12 @@
@override
String toString() {
- return "ShadowInvalidInitializer()";
+ return "ShadowInvalidInitializer(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -835,7 +906,12 @@
@override
String toString() {
- return "ShadowInvalidFieldInitializer()";
+ return "ShadowInvalidFieldInitializer(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -878,7 +954,12 @@
@override
String toString() {
- return "ExpressionInvocation()";
+ return "ExpressionInvocation(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -904,7 +985,12 @@
@override
String toString() {
- return "NamedFunctionExpressionJudgment()";
+ return "NamedFunctionExpressionJudgment(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -956,7 +1042,12 @@
@override
String toString() {
- return "NullAwareMethodInvocation()";
+ return "NullAwareMethodInvocation(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -1008,7 +1099,12 @@
@override
String toString() {
- return "NullAwarePropertyGet()";
+ return "NullAwarePropertyGet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -1060,7 +1156,12 @@
@override
String toString() {
- return "NullAwarePropertySet()";
+ return "NullAwarePropertySet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -1073,7 +1174,12 @@
@override
String toString() {
- return "ReturnStatementImpl()";
+ return "ReturnStatementImpl(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -1264,7 +1370,12 @@
@override
String toString() {
- return "VariableGetImpl()";
+ return "VariableGetImpl(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -1276,7 +1387,12 @@
@override
String toString() {
- return "LoadLibraryImpl()";
+ return "LoadLibraryImpl(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -1314,7 +1430,12 @@
@override
String toString() {
- return "LoadLibraryTearOff()";
+ return "LoadLibraryTearOff(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -1383,7 +1504,12 @@
@override
String toString() {
- return "IfNullPropertySet()";
+ return "IfNullPropertySet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -1443,7 +1569,12 @@
@override
String toString() {
- return "IfNullSet()";
+ return "IfNullSet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -1565,7 +1696,12 @@
@override
String toString() {
- return "CompoundExtensionSet()";
+ return "CompoundExtensionSet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -1654,7 +1790,12 @@
@override
String toString() {
- return "CompoundPropertySet()";
+ return "CompoundPropertySet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -1719,7 +1860,12 @@
@override
String toString() {
- return "PropertyPostIncDec()";
+ return "PropertyPostIncDec(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -1772,7 +1918,12 @@
@override
String toString() {
- return "LocalPostIncDec()";
+ return "LocalPostIncDec(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -1825,7 +1976,12 @@
@override
String toString() {
- return "StaticPostIncDec()";
+ return "StaticPostIncDec(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -1878,7 +2034,12 @@
@override
String toString() {
- return "SuperPostIncDec()";
+ return "SuperPostIncDec(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -1924,7 +2085,12 @@
@override
String toString() {
- return "IndexGet()";
+ return "IndexGet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -1998,7 +2164,12 @@
@override
String toString() {
- return "IndexSet()";
+ return "IndexSet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -2059,7 +2230,12 @@
@override
String toString() {
- return "SuperIndexSet()";
+ return "SuperIndexSet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -2144,7 +2320,12 @@
@override
String toString() {
- return "ExtensionIndexSet()";
+ return "ExtensionIndexSet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -2246,7 +2427,12 @@
@override
String toString() {
- return "IfNullIndexSet()";
+ return "IfNullIndexSet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -2333,7 +2519,12 @@
@override
String toString() {
- return "IfNullSuperIndexSet()";
+ return "IfNullSuperIndexSet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -2446,7 +2637,12 @@
@override
String toString() {
- return "IfNullExtensionIndexSet()";
+ return "IfNullExtensionIndexSet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -2544,7 +2740,12 @@
@override
String toString() {
- return "CompoundIndexSet()";
+ return "CompoundIndexSet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -2656,7 +2857,12 @@
@override
String toString() {
- return "NullAwareCompoundSet()";
+ return "NullAwareCompoundSet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -2743,7 +2949,12 @@
@override
String toString() {
- return "NullAwareIfNullSet()";
+ return "NullAwareIfNullSet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -2834,7 +3045,12 @@
@override
String toString() {
- return "CompoundSuperIndexSet()";
+ return "CompoundSuperIndexSet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -2962,7 +3178,12 @@
@override
String toString() {
- return "CompoundExtensionIndexSet()";
+ return "CompoundExtensionIndexSet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -3049,7 +3270,12 @@
@override
String toString() {
- return "ExtensionSet()";
+ return "ExtensionSet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -3100,7 +3326,12 @@
@override
String toString() {
- return "NullAwareExtension()";
+ return "NullAwareExtension(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -3120,7 +3351,12 @@
@override
String toString() {
- return "PropertySetImpl()";
+ return "PropertySetImpl(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -3171,7 +3407,12 @@
@override
String toString() {
- return "ExtensionTearOff()";
+ return "ExtensionTearOff(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -3216,7 +3457,12 @@
@override
String toString() {
- return "EqualsExpression()";
+ return "EqualsExpression(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -3260,7 +3506,12 @@
@override
String toString() {
- return "BinaryExpression()";
+ return "BinaryExpression(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -3297,7 +3548,12 @@
@override
String toString() {
- return "UnaryExpression()";
+ return "UnaryExpression(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -3333,7 +3589,12 @@
@override
String toString() {
- return "ParenthesizedExpression()";
+ return "ParenthesizedExpression(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
diff --git a/pkg/front_end/lib/src/fasta/kernel/kernel_target.dart b/pkg/front_end/lib/src/fasta/kernel/kernel_target.dart
index 4544f76..7b2b43a 100644
--- a/pkg/front_end/lib/src/fasta/kernel/kernel_target.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/kernel_target.dart
@@ -527,7 +527,8 @@
}
if (supertype is TypeAliasBuilder) {
TypeAliasBuilder aliasBuilder = supertype;
- supertype = aliasBuilder.unaliasDeclaration;
+ NamedTypeBuilder namedBuilder = type;
+ supertype = aliasBuilder.unaliasDeclaration(namedBuilder.arguments);
}
if (supertype is SourceClassBuilder && supertype.isMixinApplication) {
installForwardingConstructors(supertype);
diff --git a/pkg/front_end/lib/src/fasta/kernel/redirecting_factory_body.dart b/pkg/front_end/lib/src/fasta/kernel/redirecting_factory_body.dart
index ed0ca4a9..35757bd 100644
--- a/pkg/front_end/lib/src/fasta/kernel/redirecting_factory_body.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/redirecting_factory_body.dart
@@ -132,7 +132,12 @@
@override
String toString() {
- return "RedirectingFactoryBody()";
+ return "RedirectingFactoryBody(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
diff --git a/pkg/front_end/lib/src/fasta/source/diet_listener.dart b/pkg/front_end/lib/src/fasta/source/diet_listener.dart
index d293e88..b5f17b8 100644
--- a/pkg/front_end/lib/src/fasta/source/diet_listener.dart
+++ b/pkg/front_end/lib/src/fasta/source/diet_listener.dart
@@ -128,10 +128,7 @@
_currentClass = _currentDeclaration = null;
} else {
_currentDeclaration = builder;
- TypeDeclarationBuilder unaliasedBuilder =
- builder is TypeAliasBuilder ? builder.unaliasDeclaration : builder;
- _currentClass =
- unaliasedBuilder is ClassBuilder ? unaliasedBuilder : null;
+ _currentClass = builder is ClassBuilder ? builder : null;
}
}
diff --git a/pkg/front_end/lib/src/fasta/source/outline_builder.dart b/pkg/front_end/lib/src/fasta/source/outline_builder.dart
index 90341d9..04a3998 100644
--- a/pkg/front_end/lib/src/fasta/source/outline_builder.dart
+++ b/pkg/front_end/lib/src/fasta/source/outline_builder.dart
@@ -930,6 +930,42 @@
@override
void endClassMethod(Token getOrSet, Token beginToken, Token beginParam,
Token beginInitializers, Token endToken) {
+ _endClassMethod(
+ getOrSet, beginToken, beginParam, beginInitializers, endToken, false);
+ }
+
+ void endClassConstructor(Token getOrSet, Token beginToken, Token beginParam,
+ Token beginInitializers, Token endToken) {
+ _endClassMethod(
+ getOrSet, beginToken, beginParam, beginInitializers, endToken, true);
+ }
+
+ void endMixinMethod(Token getOrSet, Token beginToken, Token beginParam,
+ Token beginInitializers, Token endToken) {
+ _endClassMethod(
+ getOrSet, beginToken, beginParam, beginInitializers, endToken, false);
+ }
+
+ void endExtensionMethod(Token getOrSet, Token beginToken, Token beginParam,
+ Token beginInitializers, Token endToken) {
+ _endClassMethod(
+ getOrSet, beginToken, beginParam, beginInitializers, endToken, false);
+ }
+
+ void endMixinConstructor(Token getOrSet, Token beginToken, Token beginParam,
+ Token beginInitializers, Token endToken) {
+ _endClassMethod(
+ getOrSet, beginToken, beginParam, beginInitializers, endToken, true);
+ }
+
+ void endExtensionConstructor(Token getOrSet, Token beginToken,
+ Token beginParam, Token beginInitializers, Token endToken) {
+ _endClassMethod(
+ getOrSet, beginToken, beginParam, beginInitializers, endToken, true);
+ }
+
+ void _endClassMethod(Token getOrSet, Token beginToken, Token beginParam,
+ Token beginInitializers, Token endToken, bool isConstructor) {
assert(checkState(beginToken, [ValueKinds.MethodBody]));
debugEvent("Method");
MethodBody bodyKind = pop();
@@ -1043,10 +1079,10 @@
return;
}
- String constructorName = kind == ProcedureKind.Getter ||
- kind == ProcedureKind.Setter
- ? null
- : libraryBuilder.computeAndValidateConstructorName(name, charOffset);
+ String constructorName = isConstructor
+ ? (libraryBuilder.computeAndValidateConstructorName(name, charOffset) ??
+ name)
+ : null;
if (constructorName == null &&
(modifiers & staticMask) == 0 &&
libraryBuilder.currentTypeParameterScopeBuilder.kind ==
diff --git a/pkg/front_end/lib/src/fasta/source/source_class_builder.dart b/pkg/front_end/lib/src/fasta/source/source_class_builder.dart
index a2f46e2..bc7ee5e 100644
--- a/pkg/front_end/lib/src/fasta/source/source_class_builder.dart
+++ b/pkg/front_end/lib/src/fasta/source/source_class_builder.dart
@@ -397,14 +397,17 @@
return count;
}
- List<Builder> computeDirectSupertypes(ClassBuilder objectClass) {
- final List<Builder> result = <Builder>[];
+ List<TypeDeclarationBuilder> computeDirectSupertypes(
+ ClassBuilder objectClass) {
+ final List<TypeDeclarationBuilder> result = <TypeDeclarationBuilder>[];
final TypeBuilder supertype = this.supertypeBuilder;
if (supertype != null) {
TypeDeclarationBuilder declarationBuilder = supertype.declaration;
if (declarationBuilder is TypeAliasBuilder) {
TypeAliasBuilder aliasBuilder = declarationBuilder;
- declarationBuilder = aliasBuilder.unaliasDeclaration;
+ NamedTypeBuilder namedBuilder = supertype;
+ declarationBuilder =
+ aliasBuilder.unaliasDeclaration(namedBuilder.arguments);
}
result.add(declarationBuilder);
} else if (objectClass != this) {
@@ -417,17 +420,22 @@
TypeDeclarationBuilder declarationBuilder = interface.declaration;
if (declarationBuilder is TypeAliasBuilder) {
TypeAliasBuilder aliasBuilder = declarationBuilder;
- declarationBuilder = aliasBuilder.unaliasDeclaration;
+ NamedTypeBuilder namedBuilder = interface;
+ declarationBuilder =
+ aliasBuilder.unaliasDeclaration(namedBuilder.arguments);
}
result.add(declarationBuilder);
}
}
- final TypeBuilder mixedInType = this.mixedInTypeBuilder;
- if (mixedInType != null) {
- TypeDeclarationBuilder declarationBuilder = mixedInType.declaration;
+ final TypeBuilder mixedInTypeBuilder = this.mixedInTypeBuilder;
+ if (mixedInTypeBuilder != null) {
+ TypeDeclarationBuilder declarationBuilder =
+ mixedInTypeBuilder.declaration;
if (declarationBuilder is TypeAliasBuilder) {
TypeAliasBuilder aliasBuilder = declarationBuilder;
- declarationBuilder = aliasBuilder.unaliasDeclaration;
+ NamedTypeBuilder namedBuilder = mixedInTypeBuilder;
+ declarationBuilder =
+ aliasBuilder.unaliasDeclaration(namedBuilder.arguments);
}
result.add(declarationBuilder);
}
diff --git a/pkg/front_end/lib/src/fasta/source/source_library_builder.dart b/pkg/front_end/lib/src/fasta/source/source_library_builder.dart
index 78381f8..923c081 100644
--- a/pkg/front_end/lib/src/fasta/source/source_library_builder.dart
+++ b/pkg/front_end/lib/src/fasta/source/source_library_builder.dart
@@ -422,8 +422,17 @@
if (major == null || minor == null) {
addPostponedProblem(
messageLanguageVersionInvalidInDotPackages, offset, length, fileUri);
- _languageVersion =
- new InvalidLanguageVersion(fileUri, offset, length, explicit);
+ if (_languageVersion is ImplicitLanguageVersion) {
+ _languageVersion = new InvalidLanguageVersion(
+ fileUri,
+ offset,
+ length,
+ explicit,
+ loader.target.currentSdkVersionMajor,
+ loader.target.currentSdkVersionMinor);
+ library.setLanguageVersion(
+ _languageVersion.major, _languageVersion.minor);
+ }
return;
}
@@ -439,8 +448,17 @@
offset,
length,
fileUri);
- _languageVersion =
- new InvalidLanguageVersion(fileUri, offset, length, explicit);
+ if (_languageVersion is ImplicitLanguageVersion) {
+ _languageVersion = new InvalidLanguageVersion(
+ fileUri,
+ offset,
+ length,
+ explicit,
+ loader.target.currentSdkVersionMajor,
+ loader.target.currentSdkVersionMinor);
+ library.setLanguageVersion(
+ _languageVersion.major, _languageVersion.minor);
+ }
return;
}
@@ -801,13 +819,6 @@
if (existing.isSetter && other.isGetter) return false;
} else {
if (next is ClassBuilder && !next.isMixinApplication) return true;
- if (next is TypeAliasBuilder) {
- TypeDeclarationBuilder aliasedBuilder = next.unaliasDeclaration;
- if (aliasedBuilder is ClassBuilder &&
- !aliasedBuilder.isMixinApplication) {
- return true;
- }
- }
}
if (existing is ClassBuilder && other is ClassBuilder) {
// We allow multiple mixin applications with the same name. An
@@ -3761,15 +3772,11 @@
final int charOffset;
final int charCount;
final bool isExplicit;
+ final int major;
+ final int minor;
- InvalidLanguageVersion(
- this.fileUri, this.charOffset, this.charCount, this.isExplicit);
-
- @override
- int get major => kernel.defaultLanguageVersionMajor;
-
- @override
- int get minor => kernel.defaultLanguageVersionMinor;
+ InvalidLanguageVersion(this.fileUri, this.charOffset, this.charCount,
+ this.isExplicit, this.major, this.minor);
@override
bool get valid => false;
diff --git a/pkg/front_end/lib/src/fasta/source/source_loader.dart b/pkg/front_end/lib/src/fasta/source/source_loader.dart
index 3c85eb6..776f399 100644
--- a/pkg/front_end/lib/src/fasta/source/source_loader.dart
+++ b/pkg/front_end/lib/src/fasta/source/source_loader.dart
@@ -675,7 +675,7 @@
workList = <SourceClassBuilder>[];
for (int i = 0; i < previousWorkList.length; i++) {
SourceClassBuilder cls = previousWorkList[i];
- List<Builder> directSupertypes =
+ List<TypeDeclarationBuilder> directSupertypes =
cls.computeDirectSupertypes(objectClass);
bool allSupertypesProcessed = true;
for (int i = 0; i < directSupertypes.length; i++) {
@@ -740,15 +740,13 @@
}
}
- void checkClassSupertypes(SourceClassBuilder cls,
- List<Builder> directSupertypes, Set<ClassBuilder> blackListedClasses) {
+ void checkClassSupertypes(
+ SourceClassBuilder cls,
+ List<TypeDeclarationBuilder> directSupertypes,
+ Set<ClassBuilder> blackListedClasses) {
// Check that the direct supertypes aren't black-listed or enums.
for (int i = 0; i < directSupertypes.length; i++) {
- Builder supertype = directSupertypes[i];
- if (supertype is TypeAliasBuilder) {
- TypeAliasBuilder aliasBuilder = supertype;
- supertype = aliasBuilder.unaliasDeclaration;
- }
+ TypeDeclarationBuilder supertype = directSupertypes[i];
if (supertype is EnumBuilder) {
cls.addProblem(templateExtendingEnum.withArguments(supertype.name),
cls.charOffset, noLength);
@@ -763,14 +761,15 @@
}
// Check that the mixed-in type can be used as a mixin.
- final TypeBuilder mixedInType = cls.mixedInTypeBuilder;
- if (mixedInType != null) {
+ final TypeBuilder mixedInTypeBuilder = cls.mixedInTypeBuilder;
+ if (mixedInTypeBuilder != null) {
bool isClassBuilder = false;
- if (mixedInType is NamedTypeBuilder) {
- TypeDeclarationBuilder builder = mixedInType.declaration;
+ if (mixedInTypeBuilder is NamedTypeBuilder) {
+ TypeDeclarationBuilder builder = mixedInTypeBuilder.declaration;
if (builder is TypeAliasBuilder) {
TypeAliasBuilder aliasBuilder = builder;
- builder = aliasBuilder.unaliasDeclaration;
+ NamedTypeBuilder namedBuilder = mixedInTypeBuilder;
+ builder = aliasBuilder.unaliasDeclaration(namedBuilder.arguments);
}
if (builder is ClassBuilder) {
isClassBuilder = true;
@@ -781,7 +780,8 @@
// TODO(ahe): Either we need to check this for superclass and
// interfaces, or this shouldn't be necessary (or handled elsewhere).
cls.addProblem(
- templateIllegalMixin.withArguments(mixedInType.fullNameForErrors),
+ templateIllegalMixin
+ .withArguments(mixedInTypeBuilder.fullNameForErrors),
cls.charOffset,
noLength);
}
diff --git a/pkg/front_end/lib/src/fasta/type_inference/standard_bounds.dart b/pkg/front_end/lib/src/fasta/type_inference/standard_bounds.dart
index 8a94bac..8e1c904 100644
--- a/pkg/front_end/lib/src/fasta/type_inference/standard_bounds.dart
+++ b/pkg/front_end/lib/src/fasta/type_inference/standard_bounds.dart
@@ -420,6 +420,55 @@
intersectNullabilities(type1.nullability, type2.nullability));
}
+ // See https://github.com/dart-lang/sdk/issues/37439#issuecomment-519654959.
+ if (type1 is InterfaceType && type1.classNode == coreTypes.futureOrClass) {
+ if (type2 is InterfaceType) {
+ if (type2.classNode == coreTypes.futureOrClass) {
+ // GLB(FutureOr<A>, FutureOr<B>) == FutureOr<GLB(A, B)>
+ DartType argument = getStandardLowerBound(
+ type1.typeArguments[0], type2.typeArguments[0], clientLibrary);
+ return new InterfaceType(coreTypes.futureOrClass,
+ argument.nullability, <DartType>[argument]);
+ }
+ if (type2.classNode == coreTypes.futureClass) {
+ // GLB(FutureOr<A>, Future<B>) == Future<GLB(A, B)>
+ return new InterfaceType(
+ coreTypes.futureClass,
+ intersectNullabilities(
+ computeNullabilityOfFutureOr(type1, coreTypes.futureOrClass),
+ type2.nullability),
+ <DartType>[
+ getStandardLowerBound(type1.typeArguments[0],
+ type2.typeArguments[0], clientLibrary)
+ ]);
+ }
+ }
+ // GLB(FutureOr<A>, B) == GLB(A, B)
+ return getStandardLowerBound(
+ type1.typeArguments[0], type2, clientLibrary);
+ }
+ // The if-statement below handles the following rule:
+ // GLB(A, FutureOr<B>) == GLB(FutureOr<B>, A)
+ // It's broken down into sub-cases instead of making a recursive call to
+ // avoid making the checks that were already made above. Note that at this
+ // point it's not possible for type1 to be a FutureOr.
+ if (type2 is InterfaceType && type2.classNode == coreTypes.futureOrClass) {
+ if (type1 is InterfaceType && type1.classNode == coreTypes.futureClass) {
+ // GLB(Future<A>, FutureOr<B>) == Future<GLB(B, A)>
+ return new InterfaceType(
+ coreTypes.futureClass,
+ intersectNullabilities(type1.nullability,
+ computeNullabilityOfFutureOr(type2, coreTypes.futureOrClass)),
+ <DartType>[
+ getStandardLowerBound(
+ type2.typeArguments[0], type1.typeArguments[0], clientLibrary)
+ ]);
+ }
+ // GLB(A, FutureOr<B>) == GLB(B, A)
+ return getStandardLowerBound(
+ type2.typeArguments[0], type1, clientLibrary);
+ }
+
// DOWN(T1, T2) = Never otherwise.
return new NeverType(
intersectNullabilities(type1.nullability, type2.nullability));
diff --git a/pkg/front_end/lib/src/fasta/type_inference/type_inferrer.dart b/pkg/front_end/lib/src/fasta/type_inference/type_inferrer.dart
index 9a328fc..2010a5b 100644
--- a/pkg/front_end/lib/src/fasta/type_inference/type_inferrer.dart
+++ b/pkg/front_end/lib/src/fasta/type_inference/type_inferrer.dart
@@ -25,6 +25,8 @@
import 'package:kernel/src/future_or.dart';
+import 'package:kernel/src/legacy_erasure.dart';
+
import '../../base/instrumentation.dart'
show
Instrumentation,
@@ -251,6 +253,17 @@
return true;
}
+ void _updateInferredUnwrappedReturnOrYieldType(
+ TypeInferrerImpl inferrer, DartType unwrappedType) {
+ if (_inferredUnwrappedReturnOrYieldType == null) {
+ _inferredUnwrappedReturnOrYieldType = unwrappedType;
+ } else {
+ _inferredUnwrappedReturnOrYieldType = inferrer.typeSchemaEnvironment
+ .getStandardUpperBound(_inferredUnwrappedReturnOrYieldType,
+ unwrappedType, inferrer.library.library);
+ }
+ }
+
/// Updates the inferred return type based on the presence of a return
/// statement returning the given [type].
void handleReturn(TypeInferrerImpl inferrer, ReturnStatement statement,
@@ -287,20 +300,12 @@
if (isAsync) {
unwrappedType = inferrer.typeSchemaEnvironment.unfutureType(type);
}
- if (_inferredUnwrappedReturnOrYieldType == null) {
- _inferredUnwrappedReturnOrYieldType = unwrappedType;
- } else {
- _inferredUnwrappedReturnOrYieldType = inferrer.typeSchemaEnvironment
- .getStandardUpperBound(_inferredUnwrappedReturnOrYieldType,
- unwrappedType, inferrer.library.library);
- }
- return;
- }
-
- // If we are not inferring a type we can immediately check that the return
- // is valid.
- if (checkValidReturn(inferrer, declaredReturnType, statement, type) &&
+ _updateInferredUnwrappedReturnOrYieldType(inferrer, unwrappedType);
+ } else if (checkValidReturn(
+ inferrer, declaredReturnType, statement, type) &&
statement.expression != null) {
+ // If we are not inferring a type we can immediately check that the return
+ // is valid.
Expression expression = inferrer.ensureAssignable(
returnOrYieldContext, type, statement.expression,
fileOffset: statement.fileOffset,
@@ -338,29 +343,41 @@
: inferrer.coreTypes.iterableClass) ??
type;
}
- if (_inferredUnwrappedReturnOrYieldType == null) {
- _inferredUnwrappedReturnOrYieldType = unwrappedType;
- } else {
- _inferredUnwrappedReturnOrYieldType = inferrer.typeSchemaEnvironment
- .getStandardUpperBound(_inferredUnwrappedReturnOrYieldType,
- unwrappedType, inferrer.library.library);
- }
+ _updateInferredUnwrappedReturnOrYieldType(inferrer, unwrappedType);
}
}
- DartType inferReturnType(TypeInferrerImpl inferrer) {
+ DartType inferReturnType(TypeInferrerImpl inferrer,
+ {bool hasImplicitReturn}) {
assert(_needToInferReturnType);
- DartType inferredType =
- inferrer.inferReturnType(_inferredUnwrappedReturnOrYieldType);
- if (!inferrer.typeSchemaEnvironment.isSubtypeOf(inferredType,
- returnOrYieldContext, SubtypeCheckMode.withNullabilities)) {
- // If the inferred return type isn't a subtype of the context, we use the
- // context.
- inferredType = greatestClosure(returnOrYieldContext, inferrer.bottomType);
+ assert(hasImplicitReturn != null);
+ DartType inferredType;
+ if (_inferredUnwrappedReturnOrYieldType != null) {
+ // Use the types seen from the explicit return statements.
+ inferredType = _inferredUnwrappedReturnOrYieldType;
+ } else if (hasImplicitReturn) {
+ // No explicit returns we have an implicit `return null`.
+ inferredType = inferrer.typeSchemaEnvironment.nullType;
+ } else {
+ // No explicit return and the function doesn't complete normally; that is,
+ // it throws.
+ if (inferrer.isNonNullableByDefault) {
+ inferredType = new NeverType(inferrer.library.nonNullable);
+ } else {
+ inferredType = inferrer.typeSchemaEnvironment.nullType;
+ }
}
inferredType = _wrapAsyncOrGenerator(
inferrer, inferredType, inferrer.library.nonNullable);
+
+ if (!inferrer.typeSchemaEnvironment.isSubtypeOf(inferredType,
+ returnOrYieldContext, SubtypeCheckMode.withNullabilities)) {
+ // If the inferred return type isn't a subtype of the context, we use the
+ // context.
+ inferredType = greatestClosure(declaredReturnType, inferrer.bottomType);
+ }
+
for (int i = 0; i < returnStatements.length; ++i) {
checkValidReturn(inferrer, inferredType, returnStatements[i],
returnExpressionTypes[i]);
@@ -2162,7 +2179,9 @@
inferredTypes = new List<DartType>.filled(
calleeTypeParameters.length, const UnknownType());
typeSchemaEnvironment.inferGenericFunctionOrType(
- returnType ?? calleeType.returnType,
+ isNonNullableByDefault
+ ? returnType ?? calleeType.returnType
+ : legacyErasure(coreTypes, returnType ?? calleeType.returnType),
calleeTypeParameters,
null,
null,
@@ -2198,7 +2217,9 @@
} else {
ExpressionInferenceResult result = inferExpression(
arguments.positional[position],
- inferredFormalType,
+ isNonNullableByDefault
+ ? inferredFormalType
+ : legacyErasure(coreTypes, inferredFormalType),
inferenceNeeded ||
isOverloadedArithmeticOperator ||
typeChecksNeeded);
@@ -2224,7 +2245,9 @@
: formalType;
ExpressionInferenceResult result = inferExpression(
namedArgument.value,
- inferredFormalType,
+ isNonNullableByDefault
+ ? inferredFormalType
+ : legacyErasure(coreTypes, inferredFormalType),
inferenceNeeded ||
isOverloadedArithmeticOperator ||
typeChecksNeeded);
@@ -2559,7 +2582,8 @@
// or `void` if `B’` contains no `return` expressions.
DartType inferredReturnType;
if (needToSetReturnType) {
- inferredReturnType = closureContext.inferReturnType(this);
+ inferredReturnType = closureContext.inferReturnType(this,
+ hasImplicitReturn: flowAnalysis.isReachable);
}
// Then the result of inference is `<T0, ..., Tn>(R0 x0, ..., Rn xn) B` with
@@ -3294,11 +3318,6 @@
return new ExpressionInferenceResult(inferredType, expression);
}
- /// Modifies a type as appropriate when inferring a closure return type.
- DartType inferReturnType(DartType returnType) {
- return returnType ?? typeSchemaEnvironment.nullType;
- }
-
/// Performs type inference on the given [statement].
///
/// Derived classes should override this method with logic that dispatches on
diff --git a/pkg/front_end/lib/src/fasta/type_inference/type_schema.dart b/pkg/front_end/lib/src/fasta/type_inference/type_schema.dart
index 48410b5..94ac593 100644
--- a/pkg/front_end/lib/src/fasta/type_inference/type_schema.dart
+++ b/pkg/front_end/lib/src/fasta/type_inference/type_schema.dart
@@ -89,7 +89,12 @@
@override
String toString() {
- return "UnknownType()";
+ return "UnknownType(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
diff --git a/pkg/front_end/lib/src/testing/id_testing_helper.dart b/pkg/front_end/lib/src/testing/id_testing_helper.dart
index b106164..6f15e0b 100644
--- a/pkg/front_end/lib/src/testing/id_testing_helper.dart
+++ b/pkg/front_end/lib/src/testing/id_testing_helper.dart
@@ -61,6 +61,9 @@
/// Called before testing to setup flags needed for data collection.
void setup() {}
+ // Called to allow for (awaited) inspection of the compilation result.
+ Future<void> inspectComponent(Component component) async {}
+
/// Function that computes a data mapping for [member].
///
/// Fills [actualMap] with the data.
@@ -116,6 +119,9 @@
/// Returns the [DataInterpreter] used to check the actual data with the
/// expected data.
DataInterpreter<T> get dataValidator;
+
+ /// Returns `true` if data should be collected for member signatures.
+ bool get includeMemberSignatures => false;
}
class CfeCompiledData<T> extends CompiledData<T> {
@@ -347,6 +353,12 @@
}
void processMember(Member member, Map<Id, ActualData<T>> actualMap) {
+ if (!dataComputer.includeMemberSignatures && member is Procedure) {
+ if (member.isMemberSignature ||
+ (member.isForwardingStub && !member.isForwardingSemiStub)) {
+ return;
+ }
+ }
if (member.enclosingClass != null) {
if (member.enclosingClass.isEnum) {
if (member is Constructor ||
@@ -380,6 +392,8 @@
library.importUri.scheme == 'package');
}
+ await dataComputer.inspectComponent(component);
+
for (Library library in component.libraries) {
if (excludeLibrary(library) &&
!testData.memorySourceFiles.containsKey(library.fileUri.path)) {
diff --git a/pkg/front_end/messages.status b/pkg/front_end/messages.status
index 3c0f84e..7f5e3f8 100644
--- a/pkg/front_end/messages.status
+++ b/pkg/front_end/messages.status
@@ -446,8 +446,6 @@
ListLiteralTooManyTypeArguments/example: Fail
LoadLibraryTakesNoArguments/example: Fail
MapLiteralTypeArgumentMismatch/example: Fail
-MemberWithSameNameAsClass/analyzerCode: Fail
-MemberWithSameNameAsClass/example: Fail
MetadataTypeArguments/example: Fail
MethodNotFound/example: Fail
MissingArgumentList/analyzerCode: Fail
@@ -668,6 +666,8 @@
TypedefNotFunction/example: Fail
TypedefNotType/example: Fail # Feature not yet enabled by default.
TypedefNullableType/analyzerCode: Fail
+TypedefTypeVariableNotConstructor/analyzerCode: Fail # Feature not yet enabled by default.
+TypedefTypeVariableNotConstructor/example: Fail # Feature not yet enabled by default.
UnexpectedToken/part_wrapped_script1: Fail
UnexpectedToken/script1: Fail
UnmatchedToken/part_wrapped_script1: Fail
diff --git a/pkg/front_end/messages.yaml b/pkg/front_end/messages.yaml
index 9625838..a8a30c3 100644
--- a/pkg/front_end/messages.yaml
+++ b/pkg/front_end/messages.yaml
@@ -736,10 +736,6 @@
template: "'#name' isn't an instance field of this class."
analyzerCode: INITIALIZER_FOR_STATIC_FIELD
-InitializerOutsideConstructor:
- template: "Only constructors can have initializers, and '#name' is not a constructor."
- analyzerCode: INITIALIZER_OUTSIDE_CONSTRUCTOR
-
MoreThanOneSuperOrThisInitializer:
template: "Can't have more than one 'super' or 'this' initializer."
analyzerCode: SUPER_IN_REDIRECTING_CONSTRUCTOR
@@ -841,6 +837,22 @@
- "class C { static C() {} }"
- "class C { static C.m() {} }"
+GetterConstructor:
+ index: 103
+ template: "Constructors can't be a getter."
+ tip: "Try removing 'get'."
+ analyzerCode: ParserErrorCode.GETTER_CONSTRUCTOR
+ script:
+ - "class C { get C.m() {} }"
+
+SetterConstructor:
+ index: 104
+ template: "Constructors can't be a setter."
+ tip: "Try removing 'set'."
+ analyzerCode: ParserErrorCode.SETTER_CONSTRUCTOR
+ script:
+ - "class C { set C.m(x) {} }"
+
StaticOperator:
index: 17
template: "Operators can't be static."
@@ -1335,6 +1347,7 @@
analyzerCode: ParserErrorCode.CONSTRUCTOR_WITH_RETURN_TYPE
script:
- "class C { int C() {} }"
+ - "class C { void C.m() {} }"
ConstructorWithTypeParameters:
index: 99
@@ -1357,7 +1370,8 @@
ConstructorWithWrongName:
template: "The name of a constructor must match the name of the enclosing class."
- analyzerCode: INVALID_CONSTRUCTOR_NAME
+ analyzerCode: ParserErrorCode.INVALID_CONSTRUCTOR_NAME
+ index: 102
script:
- "class A { B.foo() {} }"
- "class A { factory B() => null; }"
@@ -2166,6 +2180,14 @@
- "class C {foo() native {}}"
- "class C {foo() native 'bar' {}}"
+ExternalConstructorWithInitializer:
+ index: 106
+ template: "An external constructor can't have any initializers."
+ analyzerCode: ParserErrorCode.EXTERNAL_CONSTRUCTOR_WITH_INITIALIZER
+ script:
+ - "class C { int x; external C() : x = 1; }"
+ - "class C { int x; external C.foo() : x = 1; }"
+
ExternalTypedef:
index: 76
template: "Typedefs can't be declared to be 'external'."
@@ -2196,6 +2218,13 @@
template: "Can't create typedef from non-type."
analyzerCode: INVALID_TYPE_IN_TYPEDEF
+TypedefTypeVariableNotConstructor:
+ template: "Can't use a typedef denoting a type variable as a constructor, nor for a static member access."
+
+TypedefTypeVariableNotConstructorCause:
+ template: "This is the type variable ultimately denoted."
+ severity: CONTEXT
+
TypedefNullableType:
template: "Can't create typedef from nullable type."
configuration: nnbd-strong
@@ -2503,6 +2532,16 @@
MemberWithSameNameAsClass:
template: "A class member can't have the same name as the enclosing class."
+ tip: "Try renaming the member."
+ analyzerCode: ParserErrorCode.MEMBER_WITH_CLASS_NAME
+ index: 105
+ script:
+ - "class C { get C {} }"
+ - "class C { get C => 42; }"
+ - "class C { set C(x) {} }"
+ - "class C { set C(x) => 42; }"
+ - "class C { int C; }"
+ - "class C { int A, B, C, D, E; }"
EnumConstantSameNameAsEnclosing:
template: "Name of enum constant '#name' can't be the same as the enum's own name."
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart
new file mode 100644
index 0000000..18fd65a
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart
@@ -0,0 +1,41 @@
+class Foo {
+ foo.x() {
+ // Not OK.
+ }
+ foo.x() : initializer = true {
+ // Not OK.
+ }
+ foo() : initializer = true {
+ // Not OK.
+ }
+ get Foo => 0;
+ get Foo {
+ return 0;
+ }
+ get Foo.X => 0;
+ get Foo.X {
+ return 0;
+ }
+ get Foo : bla = null => 0;
+ get Foo.X : bla = null {
+ return 0;
+ }
+ set Foo => 0;
+ set Foo {
+ return 0;
+ }
+ set Foo.X => 0;
+ set Foo.X {
+ return 0;
+ }
+ set Foo : bla = null => 0;
+ set Foo.X : bla = null {
+ return 0;
+ }
+ external Foo() : bla = null;
+ external Foo.X() : bla = null {
+ return 0;
+ }
+ int Foo;
+ int A, Foo, B;
+}
\ No newline at end of file
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.expect
new file mode 100644
index 0000000..7bcc233
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.expect
@@ -0,0 +1,556 @@
+Problems reported:
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:2:3: The name of a constructor must match the name of the enclosing class.
+ foo.x() {
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:5:3: The name of a constructor must match the name of the enclosing class.
+ foo.x() : initializer = true {
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:8:3: The name of a constructor must match the name of the enclosing class.
+ foo() : initializer = true {
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:11:7: A class member can't have the same name as the enclosing class.
+ get Foo => 0;
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:12:7: A class member can't have the same name as the enclosing class.
+ get Foo {
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:15:7: A method declaration needs an explicit list of parameters.
+ get Foo.X => 0;
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:15:3: Constructors can't be a getter.
+ get Foo.X => 0;
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:16:7: A method declaration needs an explicit list of parameters.
+ get Foo.X {
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:16:3: Constructors can't be a getter.
+ get Foo.X {
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:19:7: A method declaration needs an explicit list of parameters.
+ get Foo : bla = null => 0;
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:19:3: Constructors can't be a getter.
+ get Foo : bla = null => 0;
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:20:7: A method declaration needs an explicit list of parameters.
+ get Foo.X : bla = null {
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:20:3: Constructors can't be a getter.
+ get Foo.X : bla = null {
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:23:7: A method declaration needs an explicit list of parameters.
+ set Foo => 0;
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:23:7: A class member can't have the same name as the enclosing class.
+ set Foo => 0;
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:24:7: A method declaration needs an explicit list of parameters.
+ set Foo {
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:24:7: A class member can't have the same name as the enclosing class.
+ set Foo {
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:27:7: A method declaration needs an explicit list of parameters.
+ set Foo.X => 0;
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:27:3: Constructors can't be a setter.
+ set Foo.X => 0;
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:28:7: A method declaration needs an explicit list of parameters.
+ set Foo.X {
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:28:3: Constructors can't be a setter.
+ set Foo.X {
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:31:7: A method declaration needs an explicit list of parameters.
+ set Foo : bla = null => 0;
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:31:3: Constructors can't be a setter.
+ set Foo : bla = null => 0;
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:32:7: A method declaration needs an explicit list of parameters.
+ set Foo.X : bla = null {
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:32:3: Constructors can't be a setter.
+ set Foo.X : bla = null {
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:35:18: An external constructor can't have any initializers.
+ external Foo() : bla = null;
+ ^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:36:33: An external or native method can't have a body.
+ external Foo.X() : bla = null {
+ ^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:36:20: An external constructor can't have any initializers.
+ external Foo.X() : bla = null {
+ ^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:39:7: A class member can't have the same name as the enclosing class.
+ int Foo;
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_general.crash:40:10: A class member can't have the same name as the enclosing class.
+ int A, Foo, B;
+ ^^^
+
+beginCompilationUnit(class)
+ beginMetadataStar(class)
+ endMetadataStar(0)
+ beginClassOrNamedMixinApplicationPrelude(class)
+ handleIdentifier(Foo, classOrMixinDeclaration)
+ handleNoTypeVariables({)
+ beginClassDeclaration(class, null, Foo)
+ handleNoType(Foo)
+ handleClassExtends(null)
+ handleClassNoWithClause()
+ handleClassOrMixinImplements(null, 0)
+ handleClassHeader(class, class, null)
+ beginClassOrMixinBody(DeclarationKind.Class, {)
+ beginMetadataStar(foo)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, null, foo)
+ handleNoType({)
+ handleIdentifier(foo, methodDeclaration)
+ handleIdentifier(x, methodDeclarationContinuation)
+ handleQualified(.)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ handleNoInitializers()
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(ConstructorWithWrongName, foo, foo)
+ endClassConstructor(null, foo, (, null, })
+ endMember()
+ beginMetadataStar(foo)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, null, foo)
+ handleNoType(})
+ handleIdentifier(foo, methodDeclaration)
+ handleIdentifier(x, methodDeclarationContinuation)
+ handleQualified(.)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(initializer)
+ handleIdentifier(initializer, expression)
+ handleNoTypeArguments(=)
+ handleNoArguments(=)
+ handleSend(initializer, =)
+ handleLiteralBool(true)
+ handleAssignmentExpression(=)
+ endInitializer({)
+ endInitializers(1, :, {)
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(ConstructorWithWrongName, foo, foo)
+ endClassConstructor(null, foo, (, :, })
+ endMember()
+ beginMetadataStar(foo)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, null, foo)
+ handleNoType(})
+ handleIdentifier(foo, methodDeclaration)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(initializer)
+ handleIdentifier(initializer, expression)
+ handleNoTypeArguments(=)
+ handleNoArguments(=)
+ handleSend(initializer, =)
+ handleLiteralBool(true)
+ handleAssignmentExpression(=)
+ endInitializer({)
+ endInitializers(1, :, {)
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(ConstructorWithWrongName, foo, foo)
+ endClassConstructor(null, foo, (, :, })
+ endMember()
+ beginMetadataStar(get)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, get, Foo)
+ handleNoType(})
+ handleIdentifier(Foo, methodDeclaration)
+ handleNoTypeVariables(=>)
+ handleNoFormalParameters(=>, MemberKind.NonStaticMethod)
+ handleNoInitializers()
+ handleAsyncModifier(null, null)
+ handleLiteralInt(0)
+ handleExpressionFunctionBody(=>, ;)
+ handleRecoverableError(MemberWithSameNameAsClass, Foo, Foo)
+ endClassMethod(get, get, =>, null, ;)
+ endMember()
+ beginMetadataStar(get)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, get, Foo)
+ handleNoType(;)
+ handleIdentifier(Foo, methodDeclaration)
+ handleNoTypeVariables({)
+ handleNoFormalParameters({, MemberKind.NonStaticMethod)
+ handleNoInitializers()
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ beginReturnStatement(return)
+ handleLiteralInt(0)
+ endReturnStatement(true, return, ;)
+ endBlockFunctionBody(1, {, })
+ handleRecoverableError(MemberWithSameNameAsClass, Foo, Foo)
+ endClassMethod(get, get, {, null, })
+ endMember()
+ beginMetadataStar(get)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, get, Foo)
+ handleNoType(})
+ handleIdentifier(Foo, methodDeclaration)
+ handleIdentifier(X, methodDeclarationContinuation)
+ handleQualified(.)
+ handleNoTypeVariables(=>)
+ handleRecoverableError(MissingMethodParameters, Foo, Foo)
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ handleNoInitializers()
+ handleAsyncModifier(null, null)
+ handleLiteralInt(0)
+ handleExpressionFunctionBody(=>, ;)
+ handleRecoverableError(GetterConstructor, get, get)
+ endClassConstructor(get, get, (, null, ;)
+ endMember()
+ beginMetadataStar(get)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, get, Foo)
+ handleNoType(;)
+ handleIdentifier(Foo, methodDeclaration)
+ handleIdentifier(X, methodDeclarationContinuation)
+ handleQualified(.)
+ handleNoTypeVariables({)
+ handleRecoverableError(MissingMethodParameters, Foo, Foo)
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ handleNoInitializers()
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ beginReturnStatement(return)
+ handleLiteralInt(0)
+ endReturnStatement(true, return, ;)
+ endBlockFunctionBody(1, {, })
+ handleRecoverableError(GetterConstructor, get, get)
+ endClassConstructor(get, get, (, null, })
+ endMember()
+ beginMetadataStar(get)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, get, Foo)
+ handleNoType(})
+ handleIdentifier(Foo, methodDeclaration)
+ handleNoTypeVariables(:)
+ handleRecoverableError(MissingMethodParameters, Foo, Foo)
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(bla)
+ handleIdentifier(bla, expression)
+ handleNoTypeArguments(=)
+ handleNoArguments(=)
+ handleSend(bla, =)
+ handleLiteralNull(null)
+ handleAssignmentExpression(=)
+ endInitializer(=>)
+ endInitializers(1, :, =>)
+ handleAsyncModifier(null, null)
+ handleLiteralInt(0)
+ handleExpressionFunctionBody(=>, ;)
+ handleRecoverableError(GetterConstructor, get, get)
+ endClassConstructor(get, get, (, :, ;)
+ endMember()
+ beginMetadataStar(get)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, get, Foo)
+ handleNoType(;)
+ handleIdentifier(Foo, methodDeclaration)
+ handleIdentifier(X, methodDeclarationContinuation)
+ handleQualified(.)
+ handleNoTypeVariables(:)
+ handleRecoverableError(MissingMethodParameters, Foo, Foo)
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(bla)
+ handleIdentifier(bla, expression)
+ handleNoTypeArguments(=)
+ handleNoArguments(=)
+ handleSend(bla, =)
+ handleLiteralNull(null)
+ handleAssignmentExpression(=)
+ endInitializer({)
+ endInitializers(1, :, {)
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ beginReturnStatement(return)
+ handleLiteralInt(0)
+ endReturnStatement(true, return, ;)
+ endBlockFunctionBody(1, {, })
+ handleRecoverableError(GetterConstructor, get, get)
+ endClassConstructor(get, get, (, :, })
+ endMember()
+ beginMetadataStar(set)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, set, Foo)
+ handleNoType(})
+ handleIdentifier(Foo, methodDeclaration)
+ handleNoTypeVariables(=>)
+ handleRecoverableError(MissingMethodParameters, Foo, Foo)
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ handleNoInitializers()
+ handleAsyncModifier(null, null)
+ handleLiteralInt(0)
+ handleExpressionFunctionBody(=>, ;)
+ handleRecoverableError(MemberWithSameNameAsClass, Foo, Foo)
+ endClassMethod(set, set, (, null, ;)
+ endMember()
+ beginMetadataStar(set)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, set, Foo)
+ handleNoType(;)
+ handleIdentifier(Foo, methodDeclaration)
+ handleNoTypeVariables({)
+ handleRecoverableError(MissingMethodParameters, Foo, Foo)
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ handleNoInitializers()
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ beginReturnStatement(return)
+ handleLiteralInt(0)
+ endReturnStatement(true, return, ;)
+ endBlockFunctionBody(1, {, })
+ handleRecoverableError(MemberWithSameNameAsClass, Foo, Foo)
+ endClassMethod(set, set, (, null, })
+ endMember()
+ beginMetadataStar(set)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, set, Foo)
+ handleNoType(})
+ handleIdentifier(Foo, methodDeclaration)
+ handleIdentifier(X, methodDeclarationContinuation)
+ handleQualified(.)
+ handleNoTypeVariables(=>)
+ handleRecoverableError(MissingMethodParameters, Foo, Foo)
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ handleNoInitializers()
+ handleAsyncModifier(null, null)
+ handleLiteralInt(0)
+ handleExpressionFunctionBody(=>, ;)
+ handleRecoverableError(SetterConstructor, set, set)
+ endClassConstructor(set, set, (, null, ;)
+ endMember()
+ beginMetadataStar(set)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, set, Foo)
+ handleNoType(;)
+ handleIdentifier(Foo, methodDeclaration)
+ handleIdentifier(X, methodDeclarationContinuation)
+ handleQualified(.)
+ handleNoTypeVariables({)
+ handleRecoverableError(MissingMethodParameters, Foo, Foo)
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ handleNoInitializers()
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ beginReturnStatement(return)
+ handleLiteralInt(0)
+ endReturnStatement(true, return, ;)
+ endBlockFunctionBody(1, {, })
+ handleRecoverableError(SetterConstructor, set, set)
+ endClassConstructor(set, set, (, null, })
+ endMember()
+ beginMetadataStar(set)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, set, Foo)
+ handleNoType(})
+ handleIdentifier(Foo, methodDeclaration)
+ handleNoTypeVariables(:)
+ handleRecoverableError(MissingMethodParameters, Foo, Foo)
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(bla)
+ handleIdentifier(bla, expression)
+ handleNoTypeArguments(=)
+ handleNoArguments(=)
+ handleSend(bla, =)
+ handleLiteralNull(null)
+ handleAssignmentExpression(=)
+ endInitializer(=>)
+ endInitializers(1, :, =>)
+ handleAsyncModifier(null, null)
+ handleLiteralInt(0)
+ handleExpressionFunctionBody(=>, ;)
+ handleRecoverableError(SetterConstructor, set, set)
+ endClassConstructor(set, set, (, :, ;)
+ endMember()
+ beginMetadataStar(set)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, set, Foo)
+ handleNoType(;)
+ handleIdentifier(Foo, methodDeclaration)
+ handleIdentifier(X, methodDeclarationContinuation)
+ handleQualified(.)
+ handleNoTypeVariables(:)
+ handleRecoverableError(MissingMethodParameters, Foo, Foo)
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(bla)
+ handleIdentifier(bla, expression)
+ handleNoTypeArguments(=)
+ handleNoArguments(=)
+ handleSend(bla, =)
+ handleLiteralNull(null)
+ handleAssignmentExpression(=)
+ endInitializer({)
+ endInitializers(1, :, {)
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ beginReturnStatement(return)
+ handleLiteralInt(0)
+ endReturnStatement(true, return, ;)
+ endBlockFunctionBody(1, {, })
+ handleRecoverableError(SetterConstructor, set, set)
+ endClassConstructor(set, set, (, :, })
+ endMember()
+ beginMetadataStar(external)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(external, null, null, null, null, Foo)
+ handleNoType(external)
+ handleIdentifier(Foo, methodDeclaration)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(bla)
+ handleIdentifier(bla, expression)
+ handleNoTypeArguments(=)
+ handleNoArguments(=)
+ handleSend(bla, =)
+ handleLiteralNull(null)
+ handleAssignmentExpression(=)
+ endInitializer(;)
+ endInitializers(1, :, ;)
+ handleAsyncModifier(null, null)
+ handleEmptyFunctionBody(;)
+ handleRecoverableError(ExternalConstructorWithInitializer, :, :)
+ endClassConstructor(null, external, (, :, ;)
+ endMember()
+ beginMetadataStar(external)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(external, null, null, null, null, Foo)
+ handleNoType(external)
+ handleIdentifier(Foo, methodDeclaration)
+ handleIdentifier(X, methodDeclarationContinuation)
+ handleQualified(.)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(bla)
+ handleIdentifier(bla, expression)
+ handleNoTypeArguments(=)
+ handleNoArguments(=)
+ handleSend(bla, =)
+ handleLiteralNull(null)
+ handleAssignmentExpression(=)
+ endInitializer({)
+ endInitializers(1, :, {)
+ handleAsyncModifier(null, null)
+ handleRecoverableError(ExternalMethodWithBody, {, {)
+ beginBlockFunctionBody({)
+ beginReturnStatement(return)
+ handleLiteralInt(0)
+ endReturnStatement(true, return, ;)
+ endBlockFunctionBody(1, {, })
+ handleRecoverableError(ExternalConstructorWithInitializer, :, :)
+ endClassConstructor(null, external, (, :, })
+ endMember()
+ beginMetadataStar(int)
+ endMetadataStar(0)
+ beginMember()
+ handleIdentifier(int, typeReference)
+ handleNoTypeArguments(Foo)
+ handleType(int, null)
+ handleIdentifier(Foo, fieldDeclaration)
+ handleRecoverableError(MemberWithSameNameAsClass, Foo, Foo)
+ handleNoFieldInitializer(;)
+ endClassFields(null, null, null, null, 1, int, ;)
+ endMember()
+ beginMetadataStar(int)
+ endMetadataStar(0)
+ beginMember()
+ handleIdentifier(int, typeReference)
+ handleNoTypeArguments(A)
+ handleType(int, null)
+ handleIdentifier(A, fieldDeclaration)
+ handleNoFieldInitializer(,)
+ handleIdentifier(Foo, fieldDeclaration)
+ handleRecoverableError(MemberWithSameNameAsClass, Foo, Foo)
+ handleNoFieldInitializer(,)
+ handleIdentifier(B, fieldDeclaration)
+ handleNoFieldInitializer(;)
+ endClassFields(null, null, null, null, 3, int, ;)
+ endMember()
+ endClassOrMixinBody(DeclarationKind.Class, 19, {, })
+endClassDeclaration(class, })
+endTopLevelDeclaration()
+endCompilationUnit(1, )
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.intertwined.expect
new file mode 100644
index 0000000..f353af0
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.intertwined.expect
@@ -0,0 +1,1031 @@
+parseUnit(class)
+ skipErrorTokens(class)
+ listener: beginCompilationUnit(class)
+ syntheticPreviousToken(class)
+ parseTopLevelDeclarationImpl(, Instance of 'DirectiveContext')
+ parseMetadataStar()
+ listener: beginMetadataStar(class)
+ listener: endMetadataStar(0)
+ parseTopLevelKeywordDeclaration(, class, Instance of 'DirectiveContext')
+ parseClassDeclarationModifiers(, class)
+ parseClassOrNamedMixinApplication(null, class)
+ listener: beginClassOrNamedMixinApplicationPrelude(class)
+ ensureIdentifier(class, classOrMixinDeclaration)
+ listener: handleIdentifier(Foo, classOrMixinDeclaration)
+ listener: handleNoTypeVariables({)
+ listener: beginClassDeclaration(class, null, Foo)
+ parseClass(Foo, class, class, Foo)
+ parseClassHeaderOpt(Foo, class, class)
+ parseClassExtendsOpt(Foo)
+ listener: handleNoType(Foo)
+ listener: handleClassExtends(null)
+ parseWithClauseOpt(Foo)
+ listener: handleClassNoWithClause()
+ parseClassOrMixinImplementsOpt(Foo)
+ listener: handleClassOrMixinImplements(null, 0)
+ listener: handleClassHeader(class, class, null)
+ parseClassOrMixinOrExtensionBody(Foo, DeclarationKind.Class, Foo)
+ listener: beginClassOrMixinBody(DeclarationKind.Class, {)
+ notEofOrValue(}, foo)
+ parseClassOrMixinOrExtensionMemberImpl({, DeclarationKind.Class, Foo)
+ parseMetadataStar({)
+ listener: beginMetadataStar(foo)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod({, null, null, null, null, null, {, Instance of 'NoType', null, foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, null, foo)
+ listener: handleNoType({)
+ ensureIdentifier({, methodDeclaration)
+ listener: handleIdentifier(foo, methodDeclaration)
+ parseQualifiedRestOpt(foo, methodDeclarationContinuation)
+ parseQualifiedRest(foo, methodDeclarationContinuation)
+ ensureIdentifier(., methodDeclarationContinuation)
+ listener: handleIdentifier(x, methodDeclarationContinuation)
+ listener: handleQualified(.)
+ parseMethodTypeVar(x)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(x, foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(x, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ listener: handleNoInitializers()
+ parseAsyncModifierOpt())
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(), false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(foo, ConstructorWithWrongName)
+ listener: handleRecoverableError(ConstructorWithWrongName, foo, foo)
+ listener: endClassConstructor(null, foo, (, null, })
+ listener: endMember()
+ notEofOrValue(}, foo)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(foo)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', null, foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, null, foo)
+ listener: handleNoType(})
+ ensureIdentifier(}, methodDeclaration)
+ listener: handleIdentifier(foo, methodDeclaration)
+ parseQualifiedRestOpt(foo, methodDeclarationContinuation)
+ parseQualifiedRest(foo, methodDeclarationContinuation)
+ ensureIdentifier(., methodDeclarationContinuation)
+ listener: handleIdentifier(x, methodDeclarationContinuation)
+ listener: handleQualified(.)
+ parseMethodTypeVar(x)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(x, foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(x, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(initializer)
+ parseInitializerExpressionRest(:)
+ parseExpression(:)
+ parsePrecedenceExpression(:, 1, true)
+ parseUnaryExpression(:, true)
+ parsePrimary(:, expression)
+ parseSendOrFunctionLiteral(:, expression)
+ parseSend(:, expression)
+ ensureIdentifier(:, expression)
+ listener: handleIdentifier(initializer, expression)
+ listener: handleNoTypeArguments(=)
+ parseArgumentsOpt(initializer)
+ listener: handleNoArguments(=)
+ listener: handleSend(initializer, =)
+ parsePrecedenceExpression(=, 1, true)
+ parseUnaryExpression(=, true)
+ parsePrimary(=, expression)
+ parseLiteralBool(=)
+ listener: handleLiteralBool(true)
+ listener: handleAssignmentExpression(=)
+ listener: endInitializer({)
+ listener: endInitializers(1, :, {)
+ parseAsyncModifierOpt(true)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(true, false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(foo, ConstructorWithWrongName)
+ listener: handleRecoverableError(ConstructorWithWrongName, foo, foo)
+ listener: endClassConstructor(null, foo, (, :, })
+ listener: endMember()
+ notEofOrValue(}, foo)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(foo)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', null, foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, null, foo)
+ listener: handleNoType(})
+ ensureIdentifier(}, methodDeclaration)
+ listener: handleIdentifier(foo, methodDeclaration)
+ parseQualifiedRestOpt(foo, methodDeclarationContinuation)
+ parseMethodTypeVar(foo)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(foo, foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(foo, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(initializer)
+ parseInitializerExpressionRest(:)
+ parseExpression(:)
+ parsePrecedenceExpression(:, 1, true)
+ parseUnaryExpression(:, true)
+ parsePrimary(:, expression)
+ parseSendOrFunctionLiteral(:, expression)
+ parseSend(:, expression)
+ ensureIdentifier(:, expression)
+ listener: handleIdentifier(initializer, expression)
+ listener: handleNoTypeArguments(=)
+ parseArgumentsOpt(initializer)
+ listener: handleNoArguments(=)
+ listener: handleSend(initializer, =)
+ parsePrecedenceExpression(=, 1, true)
+ parseUnaryExpression(=, true)
+ parsePrimary(=, expression)
+ parseLiteralBool(=)
+ listener: handleLiteralBool(true)
+ listener: handleAssignmentExpression(=)
+ listener: endInitializer({)
+ listener: endInitializers(1, :, {)
+ parseAsyncModifierOpt(true)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(true, false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(foo, ConstructorWithWrongName)
+ listener: handleRecoverableError(ConstructorWithWrongName, foo, foo)
+ listener: endClassConstructor(null, foo, (, :, })
+ listener: endMember()
+ notEofOrValue(}, get)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(get)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, get, Foo)
+ listener: handleNoType(})
+ ensureIdentifier(get, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ listener: handleNoTypeVariables(=>)
+ parseGetterOrFormalParameters(Foo, Foo, true, MemberKind.NonStaticMethod)
+ listener: handleNoFormalParameters(=>, MemberKind.NonStaticMethod)
+ parseInitializersOpt(Foo)
+ listener: handleNoInitializers()
+ parseAsyncModifierOpt(Foo)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(Foo, false, true)
+ parseExpressionFunctionBody(=>, false)
+ parseExpression(=>)
+ parsePrecedenceExpression(=>, 1, true)
+ parseUnaryExpression(=>, true)
+ parsePrimary(=>, expression)
+ parseLiteralInt(=>)
+ listener: handleLiteralInt(0)
+ ensureSemicolon(0)
+ listener: handleExpressionFunctionBody(=>, ;)
+ inGenerator()
+ reportRecoverableError(Foo, MemberWithSameNameAsClass)
+ listener: handleRecoverableError(MemberWithSameNameAsClass, Foo, Foo)
+ listener: endClassMethod(get, get, =>, null, ;)
+ listener: endMember()
+ notEofOrValue(}, get)
+ parseClassOrMixinOrExtensionMemberImpl(;, DeclarationKind.Class, Foo)
+ parseMetadataStar(;)
+ listener: beginMetadataStar(get)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(;, null, null, null, null, null, ;, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, get, Foo)
+ listener: handleNoType(;)
+ ensureIdentifier(get, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ listener: handleNoTypeVariables({)
+ parseGetterOrFormalParameters(Foo, Foo, true, MemberKind.NonStaticMethod)
+ listener: handleNoFormalParameters({, MemberKind.NonStaticMethod)
+ parseInitializersOpt(Foo)
+ listener: handleNoInitializers()
+ parseAsyncModifierOpt(Foo)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(Foo, false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, return)
+ parseStatement({)
+ parseStatementX({)
+ parseReturnStatement({)
+ listener: beginReturnStatement(return)
+ parseExpression(return)
+ parsePrecedenceExpression(return, 1, true)
+ parseUnaryExpression(return, true)
+ parsePrimary(return, expression)
+ parseLiteralInt(return)
+ listener: handleLiteralInt(0)
+ ensureSemicolon(0)
+ listener: endReturnStatement(true, return, ;)
+ inGenerator()
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(1, {, })
+ reportRecoverableError(Foo, MemberWithSameNameAsClass)
+ listener: handleRecoverableError(MemberWithSameNameAsClass, Foo, Foo)
+ listener: endClassMethod(get, get, {, null, })
+ listener: endMember()
+ notEofOrValue(}, get)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(get)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, get, Foo)
+ listener: handleNoType(})
+ ensureIdentifier(get, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ parseQualifiedRest(Foo, methodDeclarationContinuation)
+ ensureIdentifier(., methodDeclarationContinuation)
+ listener: handleIdentifier(X, methodDeclarationContinuation)
+ listener: handleQualified(.)
+ listener: handleNoTypeVariables(=>)
+ parseGetterOrFormalParameters(X, Foo, false, MemberKind.NonStaticMethod)
+ missingParameterMessage(MemberKind.NonStaticMethod)
+ reportRecoverableError(Foo, MissingMethodParameters)
+ listener: handleRecoverableError(MissingMethodParameters, Foo, Foo)
+ rewriter()
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ listener: handleNoInitializers()
+ parseAsyncModifierOpt())
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(), false, true)
+ parseExpressionFunctionBody(=>, false)
+ parseExpression(=>)
+ parsePrecedenceExpression(=>, 1, true)
+ parseUnaryExpression(=>, true)
+ parsePrimary(=>, expression)
+ parseLiteralInt(=>)
+ listener: handleLiteralInt(0)
+ ensureSemicolon(0)
+ listener: handleExpressionFunctionBody(=>, ;)
+ inGenerator()
+ reportRecoverableError(get, GetterConstructor)
+ listener: handleRecoverableError(GetterConstructor, get, get)
+ listener: endClassConstructor(get, get, (, null, ;)
+ listener: endMember()
+ notEofOrValue(}, get)
+ parseClassOrMixinOrExtensionMemberImpl(;, DeclarationKind.Class, Foo)
+ parseMetadataStar(;)
+ listener: beginMetadataStar(get)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(;, null, null, null, null, null, ;, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, get, Foo)
+ listener: handleNoType(;)
+ ensureIdentifier(get, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ parseQualifiedRest(Foo, methodDeclarationContinuation)
+ ensureIdentifier(., methodDeclarationContinuation)
+ listener: handleIdentifier(X, methodDeclarationContinuation)
+ listener: handleQualified(.)
+ listener: handleNoTypeVariables({)
+ parseGetterOrFormalParameters(X, Foo, false, MemberKind.NonStaticMethod)
+ missingParameterMessage(MemberKind.NonStaticMethod)
+ reportRecoverableError(Foo, MissingMethodParameters)
+ listener: handleRecoverableError(MissingMethodParameters, Foo, Foo)
+ rewriter()
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ listener: handleNoInitializers()
+ parseAsyncModifierOpt())
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(), false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, return)
+ parseStatement({)
+ parseStatementX({)
+ parseReturnStatement({)
+ listener: beginReturnStatement(return)
+ parseExpression(return)
+ parsePrecedenceExpression(return, 1, true)
+ parseUnaryExpression(return, true)
+ parsePrimary(return, expression)
+ parseLiteralInt(return)
+ listener: handleLiteralInt(0)
+ ensureSemicolon(0)
+ listener: endReturnStatement(true, return, ;)
+ inGenerator()
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(1, {, })
+ reportRecoverableError(get, GetterConstructor)
+ listener: handleRecoverableError(GetterConstructor, get, get)
+ listener: endClassConstructor(get, get, (, null, })
+ listener: endMember()
+ notEofOrValue(}, get)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(get)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, get, Foo)
+ listener: handleNoType(})
+ ensureIdentifier(get, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ listener: handleNoTypeVariables(:)
+ parseGetterOrFormalParameters(Foo, Foo, false, MemberKind.NonStaticMethod)
+ missingParameterMessage(MemberKind.NonStaticMethod)
+ reportRecoverableError(Foo, MissingMethodParameters)
+ listener: handleRecoverableError(MissingMethodParameters, Foo, Foo)
+ rewriter()
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(bla)
+ parseInitializerExpressionRest(:)
+ parseExpression(:)
+ parsePrecedenceExpression(:, 1, true)
+ parseUnaryExpression(:, true)
+ parsePrimary(:, expression)
+ parseSendOrFunctionLiteral(:, expression)
+ parseSend(:, expression)
+ ensureIdentifier(:, expression)
+ listener: handleIdentifier(bla, expression)
+ listener: handleNoTypeArguments(=)
+ parseArgumentsOpt(bla)
+ listener: handleNoArguments(=)
+ listener: handleSend(bla, =)
+ parsePrecedenceExpression(=, 1, true)
+ parseUnaryExpression(=, true)
+ parsePrimary(=, expression)
+ parseLiteralNull(=)
+ listener: handleLiteralNull(null)
+ listener: handleAssignmentExpression(=)
+ listener: endInitializer(=>)
+ listener: endInitializers(1, :, =>)
+ parseAsyncModifierOpt(null)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(null, false, true)
+ parseExpressionFunctionBody(=>, false)
+ parseExpression(=>)
+ parsePrecedenceExpression(=>, 1, true)
+ parseUnaryExpression(=>, true)
+ parsePrimary(=>, expression)
+ parseLiteralInt(=>)
+ listener: handleLiteralInt(0)
+ ensureSemicolon(0)
+ listener: handleExpressionFunctionBody(=>, ;)
+ inGenerator()
+ reportRecoverableError(get, GetterConstructor)
+ listener: handleRecoverableError(GetterConstructor, get, get)
+ listener: endClassConstructor(get, get, (, :, ;)
+ listener: endMember()
+ notEofOrValue(}, get)
+ parseClassOrMixinOrExtensionMemberImpl(;, DeclarationKind.Class, Foo)
+ parseMetadataStar(;)
+ listener: beginMetadataStar(get)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(;, null, null, null, null, null, ;, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, get, Foo)
+ listener: handleNoType(;)
+ ensureIdentifier(get, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ parseQualifiedRest(Foo, methodDeclarationContinuation)
+ ensureIdentifier(., methodDeclarationContinuation)
+ listener: handleIdentifier(X, methodDeclarationContinuation)
+ listener: handleQualified(.)
+ listener: handleNoTypeVariables(:)
+ parseGetterOrFormalParameters(X, Foo, false, MemberKind.NonStaticMethod)
+ missingParameterMessage(MemberKind.NonStaticMethod)
+ reportRecoverableError(Foo, MissingMethodParameters)
+ listener: handleRecoverableError(MissingMethodParameters, Foo, Foo)
+ rewriter()
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(bla)
+ parseInitializerExpressionRest(:)
+ parseExpression(:)
+ parsePrecedenceExpression(:, 1, true)
+ parseUnaryExpression(:, true)
+ parsePrimary(:, expression)
+ parseSendOrFunctionLiteral(:, expression)
+ parseSend(:, expression)
+ ensureIdentifier(:, expression)
+ listener: handleIdentifier(bla, expression)
+ listener: handleNoTypeArguments(=)
+ parseArgumentsOpt(bla)
+ listener: handleNoArguments(=)
+ listener: handleSend(bla, =)
+ parsePrecedenceExpression(=, 1, true)
+ parseUnaryExpression(=, true)
+ parsePrimary(=, expression)
+ parseLiteralNull(=)
+ listener: handleLiteralNull(null)
+ listener: handleAssignmentExpression(=)
+ listener: endInitializer({)
+ listener: endInitializers(1, :, {)
+ parseAsyncModifierOpt(null)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(null, false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, return)
+ parseStatement({)
+ parseStatementX({)
+ parseReturnStatement({)
+ listener: beginReturnStatement(return)
+ parseExpression(return)
+ parsePrecedenceExpression(return, 1, true)
+ parseUnaryExpression(return, true)
+ parsePrimary(return, expression)
+ parseLiteralInt(return)
+ listener: handleLiteralInt(0)
+ ensureSemicolon(0)
+ listener: endReturnStatement(true, return, ;)
+ inGenerator()
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(1, {, })
+ reportRecoverableError(get, GetterConstructor)
+ listener: handleRecoverableError(GetterConstructor, get, get)
+ listener: endClassConstructor(get, get, (, :, })
+ listener: endMember()
+ notEofOrValue(}, set)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(set)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, set, Foo)
+ listener: handleNoType(})
+ ensureIdentifier(set, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ listener: handleNoTypeVariables(=>)
+ parseGetterOrFormalParameters(Foo, Foo, false, MemberKind.NonStaticMethod)
+ missingParameterMessage(MemberKind.NonStaticMethod)
+ reportRecoverableError(Foo, MissingMethodParameters)
+ listener: handleRecoverableError(MissingMethodParameters, Foo, Foo)
+ rewriter()
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ listener: handleNoInitializers()
+ parseAsyncModifierOpt())
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(), false, true)
+ parseExpressionFunctionBody(=>, false)
+ parseExpression(=>)
+ parsePrecedenceExpression(=>, 1, true)
+ parseUnaryExpression(=>, true)
+ parsePrimary(=>, expression)
+ parseLiteralInt(=>)
+ listener: handleLiteralInt(0)
+ ensureSemicolon(0)
+ listener: handleExpressionFunctionBody(=>, ;)
+ inGenerator()
+ reportRecoverableError(Foo, MemberWithSameNameAsClass)
+ listener: handleRecoverableError(MemberWithSameNameAsClass, Foo, Foo)
+ listener: endClassMethod(set, set, (, null, ;)
+ listener: endMember()
+ notEofOrValue(}, set)
+ parseClassOrMixinOrExtensionMemberImpl(;, DeclarationKind.Class, Foo)
+ parseMetadataStar(;)
+ listener: beginMetadataStar(set)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(;, null, null, null, null, null, ;, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, set, Foo)
+ listener: handleNoType(;)
+ ensureIdentifier(set, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ listener: handleNoTypeVariables({)
+ parseGetterOrFormalParameters(Foo, Foo, false, MemberKind.NonStaticMethod)
+ missingParameterMessage(MemberKind.NonStaticMethod)
+ reportRecoverableError(Foo, MissingMethodParameters)
+ listener: handleRecoverableError(MissingMethodParameters, Foo, Foo)
+ rewriter()
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ listener: handleNoInitializers()
+ parseAsyncModifierOpt())
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(), false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, return)
+ parseStatement({)
+ parseStatementX({)
+ parseReturnStatement({)
+ listener: beginReturnStatement(return)
+ parseExpression(return)
+ parsePrecedenceExpression(return, 1, true)
+ parseUnaryExpression(return, true)
+ parsePrimary(return, expression)
+ parseLiteralInt(return)
+ listener: handleLiteralInt(0)
+ ensureSemicolon(0)
+ listener: endReturnStatement(true, return, ;)
+ inGenerator()
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(1, {, })
+ reportRecoverableError(Foo, MemberWithSameNameAsClass)
+ listener: handleRecoverableError(MemberWithSameNameAsClass, Foo, Foo)
+ listener: endClassMethod(set, set, (, null, })
+ listener: endMember()
+ notEofOrValue(}, set)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(set)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, set, Foo)
+ listener: handleNoType(})
+ ensureIdentifier(set, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ parseQualifiedRest(Foo, methodDeclarationContinuation)
+ ensureIdentifier(., methodDeclarationContinuation)
+ listener: handleIdentifier(X, methodDeclarationContinuation)
+ listener: handleQualified(.)
+ listener: handleNoTypeVariables(=>)
+ parseGetterOrFormalParameters(X, Foo, false, MemberKind.NonStaticMethod)
+ missingParameterMessage(MemberKind.NonStaticMethod)
+ reportRecoverableError(Foo, MissingMethodParameters)
+ listener: handleRecoverableError(MissingMethodParameters, Foo, Foo)
+ rewriter()
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ listener: handleNoInitializers()
+ parseAsyncModifierOpt())
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(), false, true)
+ parseExpressionFunctionBody(=>, false)
+ parseExpression(=>)
+ parsePrecedenceExpression(=>, 1, true)
+ parseUnaryExpression(=>, true)
+ parsePrimary(=>, expression)
+ parseLiteralInt(=>)
+ listener: handleLiteralInt(0)
+ ensureSemicolon(0)
+ listener: handleExpressionFunctionBody(=>, ;)
+ inGenerator()
+ reportRecoverableError(set, SetterConstructor)
+ listener: handleRecoverableError(SetterConstructor, set, set)
+ listener: endClassConstructor(set, set, (, null, ;)
+ listener: endMember()
+ notEofOrValue(}, set)
+ parseClassOrMixinOrExtensionMemberImpl(;, DeclarationKind.Class, Foo)
+ parseMetadataStar(;)
+ listener: beginMetadataStar(set)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(;, null, null, null, null, null, ;, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, set, Foo)
+ listener: handleNoType(;)
+ ensureIdentifier(set, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ parseQualifiedRest(Foo, methodDeclarationContinuation)
+ ensureIdentifier(., methodDeclarationContinuation)
+ listener: handleIdentifier(X, methodDeclarationContinuation)
+ listener: handleQualified(.)
+ listener: handleNoTypeVariables({)
+ parseGetterOrFormalParameters(X, Foo, false, MemberKind.NonStaticMethod)
+ missingParameterMessage(MemberKind.NonStaticMethod)
+ reportRecoverableError(Foo, MissingMethodParameters)
+ listener: handleRecoverableError(MissingMethodParameters, Foo, Foo)
+ rewriter()
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ listener: handleNoInitializers()
+ parseAsyncModifierOpt())
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(), false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, return)
+ parseStatement({)
+ parseStatementX({)
+ parseReturnStatement({)
+ listener: beginReturnStatement(return)
+ parseExpression(return)
+ parsePrecedenceExpression(return, 1, true)
+ parseUnaryExpression(return, true)
+ parsePrimary(return, expression)
+ parseLiteralInt(return)
+ listener: handleLiteralInt(0)
+ ensureSemicolon(0)
+ listener: endReturnStatement(true, return, ;)
+ inGenerator()
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(1, {, })
+ reportRecoverableError(set, SetterConstructor)
+ listener: handleRecoverableError(SetterConstructor, set, set)
+ listener: endClassConstructor(set, set, (, null, })
+ listener: endMember()
+ notEofOrValue(}, set)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(set)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, set, Foo)
+ listener: handleNoType(})
+ ensureIdentifier(set, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ listener: handleNoTypeVariables(:)
+ parseGetterOrFormalParameters(Foo, Foo, false, MemberKind.NonStaticMethod)
+ missingParameterMessage(MemberKind.NonStaticMethod)
+ reportRecoverableError(Foo, MissingMethodParameters)
+ listener: handleRecoverableError(MissingMethodParameters, Foo, Foo)
+ rewriter()
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(bla)
+ parseInitializerExpressionRest(:)
+ parseExpression(:)
+ parsePrecedenceExpression(:, 1, true)
+ parseUnaryExpression(:, true)
+ parsePrimary(:, expression)
+ parseSendOrFunctionLiteral(:, expression)
+ parseSend(:, expression)
+ ensureIdentifier(:, expression)
+ listener: handleIdentifier(bla, expression)
+ listener: handleNoTypeArguments(=)
+ parseArgumentsOpt(bla)
+ listener: handleNoArguments(=)
+ listener: handleSend(bla, =)
+ parsePrecedenceExpression(=, 1, true)
+ parseUnaryExpression(=, true)
+ parsePrimary(=, expression)
+ parseLiteralNull(=)
+ listener: handleLiteralNull(null)
+ listener: handleAssignmentExpression(=)
+ listener: endInitializer(=>)
+ listener: endInitializers(1, :, =>)
+ parseAsyncModifierOpt(null)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(null, false, true)
+ parseExpressionFunctionBody(=>, false)
+ parseExpression(=>)
+ parsePrecedenceExpression(=>, 1, true)
+ parseUnaryExpression(=>, true)
+ parsePrimary(=>, expression)
+ parseLiteralInt(=>)
+ listener: handleLiteralInt(0)
+ ensureSemicolon(0)
+ listener: handleExpressionFunctionBody(=>, ;)
+ inGenerator()
+ reportRecoverableError(set, SetterConstructor)
+ listener: handleRecoverableError(SetterConstructor, set, set)
+ listener: endClassConstructor(set, set, (, :, ;)
+ listener: endMember()
+ notEofOrValue(}, set)
+ parseClassOrMixinOrExtensionMemberImpl(;, DeclarationKind.Class, Foo)
+ parseMetadataStar(;)
+ listener: beginMetadataStar(set)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(;, null, null, null, null, null, ;, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, set, Foo)
+ listener: handleNoType(;)
+ ensureIdentifier(set, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ parseQualifiedRest(Foo, methodDeclarationContinuation)
+ ensureIdentifier(., methodDeclarationContinuation)
+ listener: handleIdentifier(X, methodDeclarationContinuation)
+ listener: handleQualified(.)
+ listener: handleNoTypeVariables(:)
+ parseGetterOrFormalParameters(X, Foo, false, MemberKind.NonStaticMethod)
+ missingParameterMessage(MemberKind.NonStaticMethod)
+ reportRecoverableError(Foo, MissingMethodParameters)
+ listener: handleRecoverableError(MissingMethodParameters, Foo, Foo)
+ rewriter()
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(bla)
+ parseInitializerExpressionRest(:)
+ parseExpression(:)
+ parsePrecedenceExpression(:, 1, true)
+ parseUnaryExpression(:, true)
+ parsePrimary(:, expression)
+ parseSendOrFunctionLiteral(:, expression)
+ parseSend(:, expression)
+ ensureIdentifier(:, expression)
+ listener: handleIdentifier(bla, expression)
+ listener: handleNoTypeArguments(=)
+ parseArgumentsOpt(bla)
+ listener: handleNoArguments(=)
+ listener: handleSend(bla, =)
+ parsePrecedenceExpression(=, 1, true)
+ parseUnaryExpression(=, true)
+ parsePrimary(=, expression)
+ parseLiteralNull(=)
+ listener: handleLiteralNull(null)
+ listener: handleAssignmentExpression(=)
+ listener: endInitializer({)
+ listener: endInitializers(1, :, {)
+ parseAsyncModifierOpt(null)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(null, false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, return)
+ parseStatement({)
+ parseStatementX({)
+ parseReturnStatement({)
+ listener: beginReturnStatement(return)
+ parseExpression(return)
+ parsePrecedenceExpression(return, 1, true)
+ parseUnaryExpression(return, true)
+ parsePrimary(return, expression)
+ parseLiteralInt(return)
+ listener: handleLiteralInt(0)
+ ensureSemicolon(0)
+ listener: endReturnStatement(true, return, ;)
+ inGenerator()
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(1, {, })
+ reportRecoverableError(set, SetterConstructor)
+ listener: handleRecoverableError(SetterConstructor, set, set)
+ listener: endClassConstructor(set, set, (, :, })
+ listener: endMember()
+ notEofOrValue(}, external)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(external)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, external, null, null, null, null, external, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(external, null, null, null, null, Foo)
+ listener: handleNoType(external)
+ ensureIdentifier(external, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ parseMethodTypeVar(Foo)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(Foo, Foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(Foo, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(bla)
+ parseInitializerExpressionRest(:)
+ parseExpression(:)
+ parsePrecedenceExpression(:, 1, true)
+ parseUnaryExpression(:, true)
+ parsePrimary(:, expression)
+ parseSendOrFunctionLiteral(:, expression)
+ parseSend(:, expression)
+ ensureIdentifier(:, expression)
+ listener: handleIdentifier(bla, expression)
+ listener: handleNoTypeArguments(=)
+ parseArgumentsOpt(bla)
+ listener: handleNoArguments(=)
+ listener: handleSend(bla, =)
+ parsePrecedenceExpression(=, 1, true)
+ parseUnaryExpression(=, true)
+ parsePrimary(=, expression)
+ parseLiteralNull(=)
+ listener: handleLiteralNull(null)
+ listener: handleAssignmentExpression(=)
+ listener: endInitializer(;)
+ listener: endInitializers(1, :, ;)
+ parseAsyncModifierOpt(null)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(null, false, true)
+ listener: handleEmptyFunctionBody(;)
+ reportRecoverableError(:, ExternalConstructorWithInitializer)
+ listener: handleRecoverableError(ExternalConstructorWithInitializer, :, :)
+ listener: endClassConstructor(null, external, (, :, ;)
+ listener: endMember()
+ notEofOrValue(}, external)
+ parseClassOrMixinOrExtensionMemberImpl(;, DeclarationKind.Class, Foo)
+ parseMetadataStar(;)
+ listener: beginMetadataStar(external)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(;, external, null, null, null, null, external, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(external, null, null, null, null, Foo)
+ listener: handleNoType(external)
+ ensureIdentifier(external, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ parseQualifiedRest(Foo, methodDeclarationContinuation)
+ ensureIdentifier(., methodDeclarationContinuation)
+ listener: handleIdentifier(X, methodDeclarationContinuation)
+ listener: handleQualified(.)
+ parseMethodTypeVar(X)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(X, Foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(X, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(bla)
+ parseInitializerExpressionRest(:)
+ parseExpression(:)
+ parsePrecedenceExpression(:, 1, true)
+ parseUnaryExpression(:, true)
+ parsePrimary(:, expression)
+ parseSendOrFunctionLiteral(:, expression)
+ parseSend(:, expression)
+ ensureIdentifier(:, expression)
+ listener: handleIdentifier(bla, expression)
+ listener: handleNoTypeArguments(=)
+ parseArgumentsOpt(bla)
+ listener: handleNoArguments(=)
+ listener: handleSend(bla, =)
+ parsePrecedenceExpression(=, 1, true)
+ parseUnaryExpression(=, true)
+ parsePrimary(=, expression)
+ parseLiteralNull(=)
+ listener: handleLiteralNull(null)
+ listener: handleAssignmentExpression(=)
+ listener: endInitializer({)
+ listener: endInitializers(1, :, {)
+ parseAsyncModifierOpt(null)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ reportRecoverableError({, ExternalMethodWithBody)
+ listener: handleRecoverableError(ExternalMethodWithBody, {, {)
+ inPlainSync()
+ parseFunctionBody(null, false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, return)
+ parseStatement({)
+ parseStatementX({)
+ parseReturnStatement({)
+ listener: beginReturnStatement(return)
+ parseExpression(return)
+ parsePrecedenceExpression(return, 1, true)
+ parseUnaryExpression(return, true)
+ parsePrimary(return, expression)
+ parseLiteralInt(return)
+ listener: handleLiteralInt(0)
+ ensureSemicolon(0)
+ listener: endReturnStatement(true, return, ;)
+ inGenerator()
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(1, {, })
+ reportRecoverableError(:, ExternalConstructorWithInitializer)
+ listener: handleRecoverableError(ExternalConstructorWithInitializer, :, :)
+ listener: endClassConstructor(null, external, (, :, })
+ listener: endMember()
+ notEofOrValue(}, int)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(int)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseFields(}, null, null, null, null, null, }, Instance of 'SimpleType', Foo, DeclarationKind.Class, Foo)
+ listener: handleIdentifier(int, typeReference)
+ listener: handleNoTypeArguments(Foo)
+ listener: handleType(int, null)
+ ensureIdentifier(int, fieldDeclaration)
+ listener: handleIdentifier(Foo, fieldDeclaration)
+ parseFieldInitializerOpt(Foo, Foo, null, null, DeclarationKind.Class, Foo)
+ reportRecoverableError(Foo, MemberWithSameNameAsClass)
+ listener: handleRecoverableError(MemberWithSameNameAsClass, Foo, Foo)
+ listener: handleNoFieldInitializer(;)
+ listener: endClassFields(null, null, null, null, 1, int, ;)
+ listener: endMember()
+ notEofOrValue(}, int)
+ parseClassOrMixinOrExtensionMemberImpl(;, DeclarationKind.Class, Foo)
+ parseMetadataStar(;)
+ listener: beginMetadataStar(int)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', A, DeclarationKind.Class, Foo)
+ listener: handleIdentifier(int, typeReference)
+ listener: handleNoTypeArguments(A)
+ listener: handleType(int, null)
+ ensureIdentifier(int, fieldDeclaration)
+ listener: handleIdentifier(A, fieldDeclaration)
+ parseFieldInitializerOpt(A, A, null, null, DeclarationKind.Class, Foo)
+ listener: handleNoFieldInitializer(,)
+ ensureIdentifier(,, fieldDeclaration)
+ listener: handleIdentifier(Foo, fieldDeclaration)
+ parseFieldInitializerOpt(Foo, Foo, null, null, DeclarationKind.Class, Foo)
+ reportRecoverableError(Foo, MemberWithSameNameAsClass)
+ listener: handleRecoverableError(MemberWithSameNameAsClass, Foo, Foo)
+ listener: handleNoFieldInitializer(,)
+ ensureIdentifier(,, fieldDeclaration)
+ listener: handleIdentifier(B, fieldDeclaration)
+ parseFieldInitializerOpt(B, B, null, null, DeclarationKind.Class, Foo)
+ listener: handleNoFieldInitializer(;)
+ listener: endClassFields(null, null, null, null, 3, int, ;)
+ listener: endMember()
+ notEofOrValue(}, })
+ listener: endClassOrMixinBody(DeclarationKind.Class, 19, {, })
+ listener: endClassDeclaration(class, })
+ listener: endTopLevelDeclaration()
+ reportAllErrorTokens(class)
+ listener: endCompilationUnit(1, )
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.parser.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.parser.expect
new file mode 100644
index 0000000..10ef70a
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.parser.expect
@@ -0,0 +1,85 @@
+NOTICE: Stream was rewritten by parser!
+
+class Foo {
+foo.x() {
+
+}
+foo.x() : initializer = true {
+
+}
+foo() : initializer = true {
+
+}
+get Foo => 0;
+get Foo {
+return 0;
+}
+get Foo.X ()=> 0;
+get Foo.X (){
+return 0;
+}
+get Foo (): bla = null => 0;
+get Foo.X (): bla = null {
+return 0;
+}
+set Foo ()=> 0;
+set Foo (){
+return 0;
+}
+set Foo.X ()=> 0;
+set Foo.X (){
+return 0;
+}
+set Foo (): bla = null => 0;
+set Foo.X (): bla = null {
+return 0;
+}
+external Foo() : bla = null;
+external Foo.X() : bla = null {
+return 0;
+}
+int Foo;
+int A, Foo, B;
+}
+
+class[KeywordToken] Foo[StringToken] {[BeginToken]
+foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+foo[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+get[KeywordToken] Foo[StringToken] =>[SimpleToken] 0[StringToken];[SimpleToken]
+get[KeywordToken] Foo[StringToken] {[BeginToken]
+return[KeywordToken] 0[StringToken];[SimpleToken]
+}[SimpleToken]
+get[KeywordToken] Foo[StringToken].[SimpleToken]X[StringToken] ([SyntheticBeginToken])[SyntheticToken]=>[SimpleToken] 0[StringToken];[SimpleToken]
+get[KeywordToken] Foo[StringToken].[SimpleToken]X[StringToken] ([SyntheticBeginToken])[SyntheticToken]{[BeginToken]
+return[KeywordToken] 0[StringToken];[SimpleToken]
+}[SimpleToken]
+get[KeywordToken] Foo[StringToken] ([SyntheticBeginToken])[SyntheticToken]:[SimpleToken] bla[StringToken] =[SimpleToken] null[KeywordToken] =>[SimpleToken] 0[StringToken];[SimpleToken]
+get[KeywordToken] Foo[StringToken].[SimpleToken]X[StringToken] ([SyntheticBeginToken])[SyntheticToken]:[SimpleToken] bla[StringToken] =[SimpleToken] null[KeywordToken] {[BeginToken]
+return[KeywordToken] 0[StringToken];[SimpleToken]
+}[SimpleToken]
+set[KeywordToken] Foo[StringToken] ([SyntheticBeginToken])[SyntheticToken]=>[SimpleToken] 0[StringToken];[SimpleToken]
+set[KeywordToken] Foo[StringToken] ([SyntheticBeginToken])[SyntheticToken]{[BeginToken]
+return[KeywordToken] 0[StringToken];[SimpleToken]
+}[SimpleToken]
+set[KeywordToken] Foo[StringToken].[SimpleToken]X[StringToken] ([SyntheticBeginToken])[SyntheticToken]=>[SimpleToken] 0[StringToken];[SimpleToken]
+set[KeywordToken] Foo[StringToken].[SimpleToken]X[StringToken] ([SyntheticBeginToken])[SyntheticToken]{[BeginToken]
+return[KeywordToken] 0[StringToken];[SimpleToken]
+}[SimpleToken]
+set[KeywordToken] Foo[StringToken] ([SyntheticBeginToken])[SyntheticToken]:[SimpleToken] bla[StringToken] =[SimpleToken] null[KeywordToken] =>[SimpleToken] 0[StringToken];[SimpleToken]
+set[KeywordToken] Foo[StringToken].[SimpleToken]X[StringToken] ([SyntheticBeginToken])[SyntheticToken]:[SimpleToken] bla[StringToken] =[SimpleToken] null[KeywordToken] {[BeginToken]
+return[KeywordToken] 0[StringToken];[SimpleToken]
+}[SimpleToken]
+external[KeywordToken] Foo[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] bla[StringToken] =[SimpleToken] null[KeywordToken];[SimpleToken]
+external[KeywordToken] Foo[StringToken].[SimpleToken]X[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] bla[StringToken] =[SimpleToken] null[KeywordToken] {[BeginToken]
+return[KeywordToken] 0[StringToken];[SimpleToken]
+}[SimpleToken]
+int[StringToken] Foo[StringToken];[SimpleToken]
+int[StringToken] A[StringToken],[SimpleToken] Foo[StringToken],[SimpleToken] B[StringToken];[SimpleToken]
+}[SimpleToken][SimpleToken]
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.scanner.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.scanner.expect
new file mode 100644
index 0000000..6e25ad3
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.scanner.expect
@@ -0,0 +1,83 @@
+class Foo {
+foo.x() {
+
+}
+foo.x() : initializer = true {
+
+}
+foo() : initializer = true {
+
+}
+get Foo => 0;
+get Foo {
+return 0;
+}
+get Foo.X => 0;
+get Foo.X {
+return 0;
+}
+get Foo : bla = null => 0;
+get Foo.X : bla = null {
+return 0;
+}
+set Foo => 0;
+set Foo {
+return 0;
+}
+set Foo.X => 0;
+set Foo.X {
+return 0;
+}
+set Foo : bla = null => 0;
+set Foo.X : bla = null {
+return 0;
+}
+external Foo() : bla = null;
+external Foo.X() : bla = null {
+return 0;
+}
+int Foo;
+int A, Foo, B;
+}
+
+class[KeywordToken] Foo[StringToken] {[BeginToken]
+foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+foo[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+get[KeywordToken] Foo[StringToken] =>[SimpleToken] 0[StringToken];[SimpleToken]
+get[KeywordToken] Foo[StringToken] {[BeginToken]
+return[KeywordToken] 0[StringToken];[SimpleToken]
+}[SimpleToken]
+get[KeywordToken] Foo[StringToken].[SimpleToken]X[StringToken] =>[SimpleToken] 0[StringToken];[SimpleToken]
+get[KeywordToken] Foo[StringToken].[SimpleToken]X[StringToken] {[BeginToken]
+return[KeywordToken] 0[StringToken];[SimpleToken]
+}[SimpleToken]
+get[KeywordToken] Foo[StringToken] :[SimpleToken] bla[StringToken] =[SimpleToken] null[KeywordToken] =>[SimpleToken] 0[StringToken];[SimpleToken]
+get[KeywordToken] Foo[StringToken].[SimpleToken]X[StringToken] :[SimpleToken] bla[StringToken] =[SimpleToken] null[KeywordToken] {[BeginToken]
+return[KeywordToken] 0[StringToken];[SimpleToken]
+}[SimpleToken]
+set[KeywordToken] Foo[StringToken] =>[SimpleToken] 0[StringToken];[SimpleToken]
+set[KeywordToken] Foo[StringToken] {[BeginToken]
+return[KeywordToken] 0[StringToken];[SimpleToken]
+}[SimpleToken]
+set[KeywordToken] Foo[StringToken].[SimpleToken]X[StringToken] =>[SimpleToken] 0[StringToken];[SimpleToken]
+set[KeywordToken] Foo[StringToken].[SimpleToken]X[StringToken] {[BeginToken]
+return[KeywordToken] 0[StringToken];[SimpleToken]
+}[SimpleToken]
+set[KeywordToken] Foo[StringToken] :[SimpleToken] bla[StringToken] =[SimpleToken] null[KeywordToken] =>[SimpleToken] 0[StringToken];[SimpleToken]
+set[KeywordToken] Foo[StringToken].[SimpleToken]X[StringToken] :[SimpleToken] bla[StringToken] =[SimpleToken] null[KeywordToken] {[BeginToken]
+return[KeywordToken] 0[StringToken];[SimpleToken]
+}[SimpleToken]
+external[KeywordToken] Foo[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] bla[StringToken] =[SimpleToken] null[KeywordToken];[SimpleToken]
+external[KeywordToken] Foo[StringToken].[SimpleToken]X[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] bla[StringToken] =[SimpleToken] null[KeywordToken] {[BeginToken]
+return[KeywordToken] 0[StringToken];[SimpleToken]
+}[SimpleToken]
+int[StringToken] Foo[StringToken];[SimpleToken]
+int[StringToken] A[StringToken],[SimpleToken] Foo[StringToken],[SimpleToken] B[StringToken];[SimpleToken]
+}[SimpleToken][SimpleToken]
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart
new file mode 100644
index 0000000..9025e56
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart
@@ -0,0 +1,11 @@
+class Foo {
+ get foo.x() {
+ // Not OK.
+ }
+ get foo.x() : initializer = true {
+ // Not OK.
+ }
+ get foo() : initializer = true {
+ // Not OK.
+ }
+}
\ No newline at end of file
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.expect
new file mode 100644
index 0000000..d876a54
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.expect
@@ -0,0 +1,121 @@
+Problems reported:
+
+parser/error_recovery/constructor_recovery_bad_name_get.crash:2:7: The name of a constructor must match the name of the enclosing class.
+ get foo.x() {
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_get.crash:2:3: Constructors can't be a getter.
+ get foo.x() {
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_get.crash:5:7: The name of a constructor must match the name of the enclosing class.
+ get foo.x() : initializer = true {
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_get.crash:5:3: Constructors can't be a getter.
+ get foo.x() : initializer = true {
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_get.crash:8:10: A getter can't have formal parameters.
+ get foo() : initializer = true {
+ ^
+
+parser/error_recovery/constructor_recovery_bad_name_get.crash:8:7: The name of a constructor must match the name of the enclosing class.
+ get foo() : initializer = true {
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_get.crash:8:3: Constructors can't be a getter.
+ get foo() : initializer = true {
+ ^^^
+
+beginCompilationUnit(class)
+ beginMetadataStar(class)
+ endMetadataStar(0)
+ beginClassOrNamedMixinApplicationPrelude(class)
+ handleIdentifier(Foo, classOrMixinDeclaration)
+ handleNoTypeVariables({)
+ beginClassDeclaration(class, null, Foo)
+ handleNoType(Foo)
+ handleClassExtends(null)
+ handleClassNoWithClause()
+ handleClassOrMixinImplements(null, 0)
+ handleClassHeader(class, class, null)
+ beginClassOrMixinBody(DeclarationKind.Class, {)
+ beginMetadataStar(get)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, get, foo)
+ handleNoType({)
+ handleIdentifier(foo, methodDeclaration)
+ handleIdentifier(x, methodDeclarationContinuation)
+ handleQualified(.)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ handleNoInitializers()
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(ConstructorWithWrongName, foo, foo)
+ handleRecoverableError(GetterConstructor, get, get)
+ endClassConstructor(get, get, (, null, })
+ endMember()
+ beginMetadataStar(get)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, get, foo)
+ handleNoType(})
+ handleIdentifier(foo, methodDeclaration)
+ handleIdentifier(x, methodDeclarationContinuation)
+ handleQualified(.)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(initializer)
+ handleIdentifier(initializer, expression)
+ handleNoTypeArguments(=)
+ handleNoArguments(=)
+ handleSend(initializer, =)
+ handleLiteralBool(true)
+ handleAssignmentExpression(=)
+ endInitializer({)
+ endInitializers(1, :, {)
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(ConstructorWithWrongName, foo, foo)
+ handleRecoverableError(GetterConstructor, get, get)
+ endClassConstructor(get, get, (, :, })
+ endMember()
+ beginMetadataStar(get)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, get, foo)
+ handleNoType(})
+ handleIdentifier(foo, methodDeclaration)
+ handleNoTypeVariables(()
+ handleRecoverableError(GetterWithFormals, (, ()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(initializer)
+ handleIdentifier(initializer, expression)
+ handleNoTypeArguments(=)
+ handleNoArguments(=)
+ handleSend(initializer, =)
+ handleLiteralBool(true)
+ handleAssignmentExpression(=)
+ endInitializer({)
+ endInitializers(1, :, {)
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(ConstructorWithWrongName, foo, foo)
+ handleRecoverableError(GetterConstructor, get, get)
+ endClassConstructor(get, get, (, :, })
+ endMember()
+ endClassOrMixinBody(DeclarationKind.Class, 3, {, })
+ endClassDeclaration(class, })
+ endTopLevelDeclaration()
+endCompilationUnit(1, )
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.intertwined.expect
new file mode 100644
index 0000000..7ca18b9
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.intertwined.expect
@@ -0,0 +1,197 @@
+parseUnit(class)
+ skipErrorTokens(class)
+ listener: beginCompilationUnit(class)
+ syntheticPreviousToken(class)
+ parseTopLevelDeclarationImpl(, Instance of 'DirectiveContext')
+ parseMetadataStar()
+ listener: beginMetadataStar(class)
+ listener: endMetadataStar(0)
+ parseTopLevelKeywordDeclaration(, class, Instance of 'DirectiveContext')
+ parseClassDeclarationModifiers(, class)
+ parseClassOrNamedMixinApplication(null, class)
+ listener: beginClassOrNamedMixinApplicationPrelude(class)
+ ensureIdentifier(class, classOrMixinDeclaration)
+ listener: handleIdentifier(Foo, classOrMixinDeclaration)
+ listener: handleNoTypeVariables({)
+ listener: beginClassDeclaration(class, null, Foo)
+ parseClass(Foo, class, class, Foo)
+ parseClassHeaderOpt(Foo, class, class)
+ parseClassExtendsOpt(Foo)
+ listener: handleNoType(Foo)
+ listener: handleClassExtends(null)
+ parseWithClauseOpt(Foo)
+ listener: handleClassNoWithClause()
+ parseClassOrMixinImplementsOpt(Foo)
+ listener: handleClassOrMixinImplements(null, 0)
+ listener: handleClassHeader(class, class, null)
+ parseClassOrMixinOrExtensionBody(Foo, DeclarationKind.Class, Foo)
+ listener: beginClassOrMixinBody(DeclarationKind.Class, {)
+ notEofOrValue(}, get)
+ parseClassOrMixinOrExtensionMemberImpl({, DeclarationKind.Class, Foo)
+ parseMetadataStar({)
+ listener: beginMetadataStar(get)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod({, null, null, null, null, null, {, Instance of 'NoType', get, foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, get, foo)
+ listener: handleNoType({)
+ ensureIdentifier(get, methodDeclaration)
+ listener: handleIdentifier(foo, methodDeclaration)
+ parseQualifiedRestOpt(foo, methodDeclarationContinuation)
+ parseQualifiedRest(foo, methodDeclarationContinuation)
+ ensureIdentifier(., methodDeclarationContinuation)
+ listener: handleIdentifier(x, methodDeclarationContinuation)
+ listener: handleQualified(.)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(x, foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(x, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ listener: handleNoInitializers()
+ parseAsyncModifierOpt())
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(), false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(foo, ConstructorWithWrongName)
+ listener: handleRecoverableError(ConstructorWithWrongName, foo, foo)
+ reportRecoverableError(get, GetterConstructor)
+ listener: handleRecoverableError(GetterConstructor, get, get)
+ listener: endClassConstructor(get, get, (, null, })
+ listener: endMember()
+ notEofOrValue(}, get)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(get)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', get, foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, get, foo)
+ listener: handleNoType(})
+ ensureIdentifier(get, methodDeclaration)
+ listener: handleIdentifier(foo, methodDeclaration)
+ parseQualifiedRestOpt(foo, methodDeclarationContinuation)
+ parseQualifiedRest(foo, methodDeclarationContinuation)
+ ensureIdentifier(., methodDeclarationContinuation)
+ listener: handleIdentifier(x, methodDeclarationContinuation)
+ listener: handleQualified(.)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(x, foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(x, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(initializer)
+ parseInitializerExpressionRest(:)
+ parseExpression(:)
+ parsePrecedenceExpression(:, 1, true)
+ parseUnaryExpression(:, true)
+ parsePrimary(:, expression)
+ parseSendOrFunctionLiteral(:, expression)
+ parseSend(:, expression)
+ ensureIdentifier(:, expression)
+ listener: handleIdentifier(initializer, expression)
+ listener: handleNoTypeArguments(=)
+ parseArgumentsOpt(initializer)
+ listener: handleNoArguments(=)
+ listener: handleSend(initializer, =)
+ parsePrecedenceExpression(=, 1, true)
+ parseUnaryExpression(=, true)
+ parsePrimary(=, expression)
+ parseLiteralBool(=)
+ listener: handleLiteralBool(true)
+ listener: handleAssignmentExpression(=)
+ listener: endInitializer({)
+ listener: endInitializers(1, :, {)
+ parseAsyncModifierOpt(true)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(true, false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(foo, ConstructorWithWrongName)
+ listener: handleRecoverableError(ConstructorWithWrongName, foo, foo)
+ reportRecoverableError(get, GetterConstructor)
+ listener: handleRecoverableError(GetterConstructor, get, get)
+ listener: endClassConstructor(get, get, (, :, })
+ listener: endMember()
+ notEofOrValue(}, get)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(get)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', get, foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, get, foo)
+ listener: handleNoType(})
+ ensureIdentifier(get, methodDeclaration)
+ listener: handleIdentifier(foo, methodDeclaration)
+ parseQualifiedRestOpt(foo, methodDeclarationContinuation)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(foo, foo, true, MemberKind.NonStaticMethod)
+ reportRecoverableError((, GetterWithFormals)
+ listener: handleRecoverableError(GetterWithFormals, (, ()
+ parseFormalParameters(foo, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(initializer)
+ parseInitializerExpressionRest(:)
+ parseExpression(:)
+ parsePrecedenceExpression(:, 1, true)
+ parseUnaryExpression(:, true)
+ parsePrimary(:, expression)
+ parseSendOrFunctionLiteral(:, expression)
+ parseSend(:, expression)
+ ensureIdentifier(:, expression)
+ listener: handleIdentifier(initializer, expression)
+ listener: handleNoTypeArguments(=)
+ parseArgumentsOpt(initializer)
+ listener: handleNoArguments(=)
+ listener: handleSend(initializer, =)
+ parsePrecedenceExpression(=, 1, true)
+ parseUnaryExpression(=, true)
+ parsePrimary(=, expression)
+ parseLiteralBool(=)
+ listener: handleLiteralBool(true)
+ listener: handleAssignmentExpression(=)
+ listener: endInitializer({)
+ listener: endInitializers(1, :, {)
+ parseAsyncModifierOpt(true)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(true, false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(foo, ConstructorWithWrongName)
+ listener: handleRecoverableError(ConstructorWithWrongName, foo, foo)
+ reportRecoverableError(get, GetterConstructor)
+ listener: handleRecoverableError(GetterConstructor, get, get)
+ listener: endClassConstructor(get, get, (, :, })
+ listener: endMember()
+ notEofOrValue(}, })
+ listener: endClassOrMixinBody(DeclarationKind.Class, 3, {, })
+ listener: endClassDeclaration(class, })
+ listener: endTopLevelDeclaration()
+ reportAllErrorTokens(class)
+ listener: endCompilationUnit(1, )
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.parser.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.parser.expect
new file mode 100644
index 0000000..145f5d6
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.parser.expect
@@ -0,0 +1,23 @@
+class Foo {
+get foo.x() {
+
+}
+get foo.x() : initializer = true {
+
+}
+get foo() : initializer = true {
+
+}
+}
+
+class[KeywordToken] Foo[StringToken] {[BeginToken]
+get[KeywordToken] foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+get[KeywordToken] foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+get[KeywordToken] foo[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+}[SimpleToken][SimpleToken]
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.scanner.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.scanner.expect
new file mode 100644
index 0000000..145f5d6
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.scanner.expect
@@ -0,0 +1,23 @@
+class Foo {
+get foo.x() {
+
+}
+get foo.x() : initializer = true {
+
+}
+get foo() : initializer = true {
+
+}
+}
+
+class[KeywordToken] Foo[StringToken] {[BeginToken]
+get[KeywordToken] foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+get[KeywordToken] foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+get[KeywordToken] foo[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+}[SimpleToken][SimpleToken]
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart
new file mode 100644
index 0000000..2c827a6
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart
@@ -0,0 +1,11 @@
+class Foo {
+ void foo.x() {
+ // Not OK.
+ }
+ void foo.x() : initializer = true {
+ // Not OK.
+ }
+ void foo() : initializer = true {
+ // Not OK.
+ }
+}
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.expect
new file mode 100644
index 0000000..2939c3c
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.expect
@@ -0,0 +1,116 @@
+Problems reported:
+
+parser/error_recovery/constructor_recovery_bad_name_return_type.crash:2:8: The name of a constructor must match the name of the enclosing class.
+ void foo.x() {
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_return_type.crash:2:3: Constructors can't have a return type.
+ void foo.x() {
+ ^^^^
+
+parser/error_recovery/constructor_recovery_bad_name_return_type.crash:5:8: The name of a constructor must match the name of the enclosing class.
+ void foo.x() : initializer = true {
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_return_type.crash:5:3: Constructors can't have a return type.
+ void foo.x() : initializer = true {
+ ^^^^
+
+parser/error_recovery/constructor_recovery_bad_name_return_type.crash:8:8: The name of a constructor must match the name of the enclosing class.
+ void foo() : initializer = true {
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_return_type.crash:8:3: Constructors can't have a return type.
+ void foo() : initializer = true {
+ ^^^^
+
+beginCompilationUnit(class)
+ beginMetadataStar(class)
+ endMetadataStar(0)
+ beginClassOrNamedMixinApplicationPrelude(class)
+ handleIdentifier(Foo, classOrMixinDeclaration)
+ handleNoTypeVariables({)
+ beginClassDeclaration(class, null, Foo)
+ handleNoType(Foo)
+ handleClassExtends(null)
+ handleClassNoWithClause()
+ handleClassOrMixinImplements(null, 0)
+ handleClassHeader(class, class, null)
+ beginClassOrMixinBody(DeclarationKind.Class, {)
+ beginMetadataStar(void)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, null, foo)
+ handleVoidKeyword(void)
+ handleIdentifier(foo, methodDeclaration)
+ handleIdentifier(x, methodDeclarationContinuation)
+ handleQualified(.)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ handleNoInitializers()
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(ConstructorWithWrongName, foo, foo)
+ handleRecoverableError(ConstructorWithReturnType, void, void)
+ endClassConstructor(null, void, (, null, })
+ endMember()
+ beginMetadataStar(void)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, null, foo)
+ handleVoidKeyword(void)
+ handleIdentifier(foo, methodDeclaration)
+ handleIdentifier(x, methodDeclarationContinuation)
+ handleQualified(.)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(initializer)
+ handleIdentifier(initializer, expression)
+ handleNoTypeArguments(=)
+ handleNoArguments(=)
+ handleSend(initializer, =)
+ handleLiteralBool(true)
+ handleAssignmentExpression(=)
+ endInitializer({)
+ endInitializers(1, :, {)
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(ConstructorWithWrongName, foo, foo)
+ handleRecoverableError(ConstructorWithReturnType, void, void)
+ endClassConstructor(null, void, (, :, })
+ endMember()
+ beginMetadataStar(void)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, null, foo)
+ handleVoidKeyword(void)
+ handleIdentifier(foo, methodDeclaration)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(initializer)
+ handleIdentifier(initializer, expression)
+ handleNoTypeArguments(=)
+ handleNoArguments(=)
+ handleSend(initializer, =)
+ handleLiteralBool(true)
+ handleAssignmentExpression(=)
+ endInitializer({)
+ endInitializers(1, :, {)
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(ConstructorWithWrongName, foo, foo)
+ handleRecoverableError(ConstructorWithReturnType, void, void)
+ endClassConstructor(null, void, (, :, })
+ endMember()
+ endClassOrMixinBody(DeclarationKind.Class, 3, {, })
+ endClassDeclaration(class, })
+ endTopLevelDeclaration()
+endCompilationUnit(1, )
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.intertwined.expect
new file mode 100644
index 0000000..752ba9a
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.intertwined.expect
@@ -0,0 +1,195 @@
+parseUnit(class)
+ skipErrorTokens(class)
+ listener: beginCompilationUnit(class)
+ syntheticPreviousToken(class)
+ parseTopLevelDeclarationImpl(, Instance of 'DirectiveContext')
+ parseMetadataStar()
+ listener: beginMetadataStar(class)
+ listener: endMetadataStar(0)
+ parseTopLevelKeywordDeclaration(, class, Instance of 'DirectiveContext')
+ parseClassDeclarationModifiers(, class)
+ parseClassOrNamedMixinApplication(null, class)
+ listener: beginClassOrNamedMixinApplicationPrelude(class)
+ ensureIdentifier(class, classOrMixinDeclaration)
+ listener: handleIdentifier(Foo, classOrMixinDeclaration)
+ listener: handleNoTypeVariables({)
+ listener: beginClassDeclaration(class, null, Foo)
+ parseClass(Foo, class, class, Foo)
+ parseClassHeaderOpt(Foo, class, class)
+ parseClassExtendsOpt(Foo)
+ listener: handleNoType(Foo)
+ listener: handleClassExtends(null)
+ parseWithClauseOpt(Foo)
+ listener: handleClassNoWithClause()
+ parseClassOrMixinImplementsOpt(Foo)
+ listener: handleClassOrMixinImplements(null, 0)
+ listener: handleClassHeader(class, class, null)
+ parseClassOrMixinOrExtensionBody(Foo, DeclarationKind.Class, Foo)
+ listener: beginClassOrMixinBody(DeclarationKind.Class, {)
+ notEofOrValue(}, void)
+ parseClassOrMixinOrExtensionMemberImpl({, DeclarationKind.Class, Foo)
+ parseMetadataStar({)
+ listener: beginMetadataStar(void)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod({, null, null, null, null, null, {, Instance of 'VoidType', null, foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, null, foo)
+ listener: handleVoidKeyword(void)
+ ensureIdentifier(void, methodDeclaration)
+ listener: handleIdentifier(foo, methodDeclaration)
+ parseQualifiedRestOpt(foo, methodDeclarationContinuation)
+ parseQualifiedRest(foo, methodDeclarationContinuation)
+ ensureIdentifier(., methodDeclarationContinuation)
+ listener: handleIdentifier(x, methodDeclarationContinuation)
+ listener: handleQualified(.)
+ parseMethodTypeVar(x)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(x, foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(x, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ listener: handleNoInitializers()
+ parseAsyncModifierOpt())
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(), false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(foo, ConstructorWithWrongName)
+ listener: handleRecoverableError(ConstructorWithWrongName, foo, foo)
+ reportRecoverableError(void, ConstructorWithReturnType)
+ listener: handleRecoverableError(ConstructorWithReturnType, void, void)
+ listener: endClassConstructor(null, void, (, null, })
+ listener: endMember()
+ notEofOrValue(}, void)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(void)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'VoidType', null, foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, null, foo)
+ listener: handleVoidKeyword(void)
+ ensureIdentifier(void, methodDeclaration)
+ listener: handleIdentifier(foo, methodDeclaration)
+ parseQualifiedRestOpt(foo, methodDeclarationContinuation)
+ parseQualifiedRest(foo, methodDeclarationContinuation)
+ ensureIdentifier(., methodDeclarationContinuation)
+ listener: handleIdentifier(x, methodDeclarationContinuation)
+ listener: handleQualified(.)
+ parseMethodTypeVar(x)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(x, foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(x, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(initializer)
+ parseInitializerExpressionRest(:)
+ parseExpression(:)
+ parsePrecedenceExpression(:, 1, true)
+ parseUnaryExpression(:, true)
+ parsePrimary(:, expression)
+ parseSendOrFunctionLiteral(:, expression)
+ parseSend(:, expression)
+ ensureIdentifier(:, expression)
+ listener: handleIdentifier(initializer, expression)
+ listener: handleNoTypeArguments(=)
+ parseArgumentsOpt(initializer)
+ listener: handleNoArguments(=)
+ listener: handleSend(initializer, =)
+ parsePrecedenceExpression(=, 1, true)
+ parseUnaryExpression(=, true)
+ parsePrimary(=, expression)
+ parseLiteralBool(=)
+ listener: handleLiteralBool(true)
+ listener: handleAssignmentExpression(=)
+ listener: endInitializer({)
+ listener: endInitializers(1, :, {)
+ parseAsyncModifierOpt(true)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(true, false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(foo, ConstructorWithWrongName)
+ listener: handleRecoverableError(ConstructorWithWrongName, foo, foo)
+ reportRecoverableError(void, ConstructorWithReturnType)
+ listener: handleRecoverableError(ConstructorWithReturnType, void, void)
+ listener: endClassConstructor(null, void, (, :, })
+ listener: endMember()
+ notEofOrValue(}, void)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(void)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'VoidType', null, foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, null, foo)
+ listener: handleVoidKeyword(void)
+ ensureIdentifier(void, methodDeclaration)
+ listener: handleIdentifier(foo, methodDeclaration)
+ parseQualifiedRestOpt(foo, methodDeclarationContinuation)
+ parseMethodTypeVar(foo)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(foo, foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(foo, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(initializer)
+ parseInitializerExpressionRest(:)
+ parseExpression(:)
+ parsePrecedenceExpression(:, 1, true)
+ parseUnaryExpression(:, true)
+ parsePrimary(:, expression)
+ parseSendOrFunctionLiteral(:, expression)
+ parseSend(:, expression)
+ ensureIdentifier(:, expression)
+ listener: handleIdentifier(initializer, expression)
+ listener: handleNoTypeArguments(=)
+ parseArgumentsOpt(initializer)
+ listener: handleNoArguments(=)
+ listener: handleSend(initializer, =)
+ parsePrecedenceExpression(=, 1, true)
+ parseUnaryExpression(=, true)
+ parsePrimary(=, expression)
+ parseLiteralBool(=)
+ listener: handleLiteralBool(true)
+ listener: handleAssignmentExpression(=)
+ listener: endInitializer({)
+ listener: endInitializers(1, :, {)
+ parseAsyncModifierOpt(true)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(true, false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(foo, ConstructorWithWrongName)
+ listener: handleRecoverableError(ConstructorWithWrongName, foo, foo)
+ reportRecoverableError(void, ConstructorWithReturnType)
+ listener: handleRecoverableError(ConstructorWithReturnType, void, void)
+ listener: endClassConstructor(null, void, (, :, })
+ listener: endMember()
+ notEofOrValue(}, })
+ listener: endClassOrMixinBody(DeclarationKind.Class, 3, {, })
+ listener: endClassDeclaration(class, })
+ listener: endTopLevelDeclaration()
+ reportAllErrorTokens(class)
+ listener: endCompilationUnit(1, )
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.parser.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.parser.expect
new file mode 100644
index 0000000..82c59fc
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.parser.expect
@@ -0,0 +1,25 @@
+class Foo {
+void foo.x() {
+
+}
+void foo.x() : initializer = true {
+
+}
+void foo() : initializer = true {
+
+}
+}
+
+
+class[KeywordToken] Foo[StringToken] {[BeginToken]
+void[KeywordToken] foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+void[KeywordToken] foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+void[KeywordToken] foo[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+}[SimpleToken]
+[SimpleToken]
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.scanner.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.scanner.expect
new file mode 100644
index 0000000..82c59fc
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.scanner.expect
@@ -0,0 +1,25 @@
+class Foo {
+void foo.x() {
+
+}
+void foo.x() : initializer = true {
+
+}
+void foo() : initializer = true {
+
+}
+}
+
+
+class[KeywordToken] Foo[StringToken] {[BeginToken]
+void[KeywordToken] foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+void[KeywordToken] foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+void[KeywordToken] foo[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+}[SimpleToken]
+[SimpleToken]
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart
new file mode 100644
index 0000000..4ecd30e
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart
@@ -0,0 +1,11 @@
+class Foo {
+ set foo.x() {
+ // Not OK.
+ }
+ set foo.x() : initializer = true {
+ // Not OK.
+ }
+ set foo() : initializer = true {
+ // Not OK.
+ }
+}
\ No newline at end of file
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.expect
new file mode 100644
index 0000000..a6c7f4b
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.expect
@@ -0,0 +1,116 @@
+Problems reported:
+
+parser/error_recovery/constructor_recovery_bad_name_set.crash:2:7: The name of a constructor must match the name of the enclosing class.
+ set foo.x() {
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_set.crash:2:3: Constructors can't be a setter.
+ set foo.x() {
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_set.crash:5:7: The name of a constructor must match the name of the enclosing class.
+ set foo.x() : initializer = true {
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_set.crash:5:3: Constructors can't be a setter.
+ set foo.x() : initializer = true {
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_set.crash:8:7: The name of a constructor must match the name of the enclosing class.
+ set foo() : initializer = true {
+ ^^^
+
+parser/error_recovery/constructor_recovery_bad_name_set.crash:8:3: Constructors can't be a setter.
+ set foo() : initializer = true {
+ ^^^
+
+beginCompilationUnit(class)
+ beginMetadataStar(class)
+ endMetadataStar(0)
+ beginClassOrNamedMixinApplicationPrelude(class)
+ handleIdentifier(Foo, classOrMixinDeclaration)
+ handleNoTypeVariables({)
+ beginClassDeclaration(class, null, Foo)
+ handleNoType(Foo)
+ handleClassExtends(null)
+ handleClassNoWithClause()
+ handleClassOrMixinImplements(null, 0)
+ handleClassHeader(class, class, null)
+ beginClassOrMixinBody(DeclarationKind.Class, {)
+ beginMetadataStar(set)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, set, foo)
+ handleNoType({)
+ handleIdentifier(foo, methodDeclaration)
+ handleIdentifier(x, methodDeclarationContinuation)
+ handleQualified(.)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ handleNoInitializers()
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(ConstructorWithWrongName, foo, foo)
+ handleRecoverableError(SetterConstructor, set, set)
+ endClassConstructor(set, set, (, null, })
+ endMember()
+ beginMetadataStar(set)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, set, foo)
+ handleNoType(})
+ handleIdentifier(foo, methodDeclaration)
+ handleIdentifier(x, methodDeclarationContinuation)
+ handleQualified(.)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(initializer)
+ handleIdentifier(initializer, expression)
+ handleNoTypeArguments(=)
+ handleNoArguments(=)
+ handleSend(initializer, =)
+ handleLiteralBool(true)
+ handleAssignmentExpression(=)
+ endInitializer({)
+ endInitializers(1, :, {)
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(ConstructorWithWrongName, foo, foo)
+ handleRecoverableError(SetterConstructor, set, set)
+ endClassConstructor(set, set, (, :, })
+ endMember()
+ beginMetadataStar(set)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, set, foo)
+ handleNoType(})
+ handleIdentifier(foo, methodDeclaration)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(initializer)
+ handleIdentifier(initializer, expression)
+ handleNoTypeArguments(=)
+ handleNoArguments(=)
+ handleSend(initializer, =)
+ handleLiteralBool(true)
+ handleAssignmentExpression(=)
+ endInitializer({)
+ endInitializers(1, :, {)
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(ConstructorWithWrongName, foo, foo)
+ handleRecoverableError(SetterConstructor, set, set)
+ endClassConstructor(set, set, (, :, })
+ endMember()
+ endClassOrMixinBody(DeclarationKind.Class, 3, {, })
+ endClassDeclaration(class, })
+ endTopLevelDeclaration()
+endCompilationUnit(1, )
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.intertwined.expect
new file mode 100644
index 0000000..83b3721
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.intertwined.expect
@@ -0,0 +1,195 @@
+parseUnit(class)
+ skipErrorTokens(class)
+ listener: beginCompilationUnit(class)
+ syntheticPreviousToken(class)
+ parseTopLevelDeclarationImpl(, Instance of 'DirectiveContext')
+ parseMetadataStar()
+ listener: beginMetadataStar(class)
+ listener: endMetadataStar(0)
+ parseTopLevelKeywordDeclaration(, class, Instance of 'DirectiveContext')
+ parseClassDeclarationModifiers(, class)
+ parseClassOrNamedMixinApplication(null, class)
+ listener: beginClassOrNamedMixinApplicationPrelude(class)
+ ensureIdentifier(class, classOrMixinDeclaration)
+ listener: handleIdentifier(Foo, classOrMixinDeclaration)
+ listener: handleNoTypeVariables({)
+ listener: beginClassDeclaration(class, null, Foo)
+ parseClass(Foo, class, class, Foo)
+ parseClassHeaderOpt(Foo, class, class)
+ parseClassExtendsOpt(Foo)
+ listener: handleNoType(Foo)
+ listener: handleClassExtends(null)
+ parseWithClauseOpt(Foo)
+ listener: handleClassNoWithClause()
+ parseClassOrMixinImplementsOpt(Foo)
+ listener: handleClassOrMixinImplements(null, 0)
+ listener: handleClassHeader(class, class, null)
+ parseClassOrMixinOrExtensionBody(Foo, DeclarationKind.Class, Foo)
+ listener: beginClassOrMixinBody(DeclarationKind.Class, {)
+ notEofOrValue(}, set)
+ parseClassOrMixinOrExtensionMemberImpl({, DeclarationKind.Class, Foo)
+ parseMetadataStar({)
+ listener: beginMetadataStar(set)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod({, null, null, null, null, null, {, Instance of 'NoType', set, foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, set, foo)
+ listener: handleNoType({)
+ ensureIdentifier(set, methodDeclaration)
+ listener: handleIdentifier(foo, methodDeclaration)
+ parseQualifiedRestOpt(foo, methodDeclarationContinuation)
+ parseQualifiedRest(foo, methodDeclarationContinuation)
+ ensureIdentifier(., methodDeclarationContinuation)
+ listener: handleIdentifier(x, methodDeclarationContinuation)
+ listener: handleQualified(.)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(x, foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(x, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ listener: handleNoInitializers()
+ parseAsyncModifierOpt())
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(), false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(foo, ConstructorWithWrongName)
+ listener: handleRecoverableError(ConstructorWithWrongName, foo, foo)
+ reportRecoverableError(set, SetterConstructor)
+ listener: handleRecoverableError(SetterConstructor, set, set)
+ listener: endClassConstructor(set, set, (, null, })
+ listener: endMember()
+ notEofOrValue(}, set)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(set)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', set, foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, set, foo)
+ listener: handleNoType(})
+ ensureIdentifier(set, methodDeclaration)
+ listener: handleIdentifier(foo, methodDeclaration)
+ parseQualifiedRestOpt(foo, methodDeclarationContinuation)
+ parseQualifiedRest(foo, methodDeclarationContinuation)
+ ensureIdentifier(., methodDeclarationContinuation)
+ listener: handleIdentifier(x, methodDeclarationContinuation)
+ listener: handleQualified(.)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(x, foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(x, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(initializer)
+ parseInitializerExpressionRest(:)
+ parseExpression(:)
+ parsePrecedenceExpression(:, 1, true)
+ parseUnaryExpression(:, true)
+ parsePrimary(:, expression)
+ parseSendOrFunctionLiteral(:, expression)
+ parseSend(:, expression)
+ ensureIdentifier(:, expression)
+ listener: handleIdentifier(initializer, expression)
+ listener: handleNoTypeArguments(=)
+ parseArgumentsOpt(initializer)
+ listener: handleNoArguments(=)
+ listener: handleSend(initializer, =)
+ parsePrecedenceExpression(=, 1, true)
+ parseUnaryExpression(=, true)
+ parsePrimary(=, expression)
+ parseLiteralBool(=)
+ listener: handleLiteralBool(true)
+ listener: handleAssignmentExpression(=)
+ listener: endInitializer({)
+ listener: endInitializers(1, :, {)
+ parseAsyncModifierOpt(true)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(true, false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(foo, ConstructorWithWrongName)
+ listener: handleRecoverableError(ConstructorWithWrongName, foo, foo)
+ reportRecoverableError(set, SetterConstructor)
+ listener: handleRecoverableError(SetterConstructor, set, set)
+ listener: endClassConstructor(set, set, (, :, })
+ listener: endMember()
+ notEofOrValue(}, set)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(set)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', set, foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, set, foo)
+ listener: handleNoType(})
+ ensureIdentifier(set, methodDeclaration)
+ listener: handleIdentifier(foo, methodDeclaration)
+ parseQualifiedRestOpt(foo, methodDeclarationContinuation)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(foo, foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(foo, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(initializer)
+ parseInitializerExpressionRest(:)
+ parseExpression(:)
+ parsePrecedenceExpression(:, 1, true)
+ parseUnaryExpression(:, true)
+ parsePrimary(:, expression)
+ parseSendOrFunctionLiteral(:, expression)
+ parseSend(:, expression)
+ ensureIdentifier(:, expression)
+ listener: handleIdentifier(initializer, expression)
+ listener: handleNoTypeArguments(=)
+ parseArgumentsOpt(initializer)
+ listener: handleNoArguments(=)
+ listener: handleSend(initializer, =)
+ parsePrecedenceExpression(=, 1, true)
+ parseUnaryExpression(=, true)
+ parsePrimary(=, expression)
+ parseLiteralBool(=)
+ listener: handleLiteralBool(true)
+ listener: handleAssignmentExpression(=)
+ listener: endInitializer({)
+ listener: endInitializers(1, :, {)
+ parseAsyncModifierOpt(true)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(true, false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(foo, ConstructorWithWrongName)
+ listener: handleRecoverableError(ConstructorWithWrongName, foo, foo)
+ reportRecoverableError(set, SetterConstructor)
+ listener: handleRecoverableError(SetterConstructor, set, set)
+ listener: endClassConstructor(set, set, (, :, })
+ listener: endMember()
+ notEofOrValue(}, })
+ listener: endClassOrMixinBody(DeclarationKind.Class, 3, {, })
+ listener: endClassDeclaration(class, })
+ listener: endTopLevelDeclaration()
+ reportAllErrorTokens(class)
+ listener: endCompilationUnit(1, )
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.parser.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.parser.expect
new file mode 100644
index 0000000..b228455
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.parser.expect
@@ -0,0 +1,23 @@
+class Foo {
+set foo.x() {
+
+}
+set foo.x() : initializer = true {
+
+}
+set foo() : initializer = true {
+
+}
+}
+
+class[KeywordToken] Foo[StringToken] {[BeginToken]
+set[KeywordToken] foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+set[KeywordToken] foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+set[KeywordToken] foo[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+}[SimpleToken][SimpleToken]
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.scanner.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.scanner.expect
new file mode 100644
index 0000000..b228455
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.scanner.expect
@@ -0,0 +1,23 @@
+class Foo {
+set foo.x() {
+
+}
+set foo.x() : initializer = true {
+
+}
+set foo() : initializer = true {
+
+}
+}
+
+class[KeywordToken] Foo[StringToken] {[BeginToken]
+set[KeywordToken] foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+set[KeywordToken] foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+set[KeywordToken] foo[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+}[SimpleToken][SimpleToken]
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart
new file mode 100644
index 0000000..5921c10
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart
@@ -0,0 +1,14 @@
+class Foo {
+ get Foo() {
+ // Not OK.
+ }
+ get Foo() : initializer = true {
+ // Not OK.
+ }
+ get Foo.x() {
+ // Not OK.
+ }
+ get Foo.x() : initializer = true {
+ // Not OK.
+ }
+}
\ No newline at end of file
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.expect
new file mode 100644
index 0000000..32c5c13
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.expect
@@ -0,0 +1,131 @@
+Problems reported:
+
+parser/error_recovery/constructor_recovery_get:2:10: A getter can't have formal parameters.
+ get Foo() {
+ ^
+
+parser/error_recovery/constructor_recovery_get:2:7: A class member can't have the same name as the enclosing class.
+ get Foo() {
+ ^^^
+
+parser/error_recovery/constructor_recovery_get:5:10: A getter can't have formal parameters.
+ get Foo() : initializer = true {
+ ^
+
+parser/error_recovery/constructor_recovery_get:5:3: Constructors can't be a getter.
+ get Foo() : initializer = true {
+ ^^^
+
+parser/error_recovery/constructor_recovery_get:8:3: Constructors can't be a getter.
+ get Foo.x() {
+ ^^^
+
+parser/error_recovery/constructor_recovery_get:11:3: Constructors can't be a getter.
+ get Foo.x() : initializer = true {
+ ^^^
+
+beginCompilationUnit(class)
+ beginMetadataStar(class)
+ endMetadataStar(0)
+ beginClassOrNamedMixinApplicationPrelude(class)
+ handleIdentifier(Foo, classOrMixinDeclaration)
+ handleNoTypeVariables({)
+ beginClassDeclaration(class, null, Foo)
+ handleNoType(Foo)
+ handleClassExtends(null)
+ handleClassNoWithClause()
+ handleClassOrMixinImplements(null, 0)
+ handleClassHeader(class, class, null)
+ beginClassOrMixinBody(DeclarationKind.Class, {)
+ beginMetadataStar(get)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, get, Foo)
+ handleNoType({)
+ handleIdentifier(Foo, methodDeclaration)
+ handleNoTypeVariables(()
+ handleRecoverableError(GetterWithFormals, (, ()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ handleNoInitializers()
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(MemberWithSameNameAsClass, Foo, Foo)
+ endClassMethod(get, get, (, null, })
+ endMember()
+ beginMetadataStar(get)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, get, Foo)
+ handleNoType(})
+ handleIdentifier(Foo, methodDeclaration)
+ handleNoTypeVariables(()
+ handleRecoverableError(GetterWithFormals, (, ()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(initializer)
+ handleIdentifier(initializer, expression)
+ handleNoTypeArguments(=)
+ handleNoArguments(=)
+ handleSend(initializer, =)
+ handleLiteralBool(true)
+ handleAssignmentExpression(=)
+ endInitializer({)
+ endInitializers(1, :, {)
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(GetterConstructor, get, get)
+ endClassConstructor(get, get, (, :, })
+ endMember()
+ beginMetadataStar(get)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, get, Foo)
+ handleNoType(})
+ handleIdentifier(Foo, methodDeclaration)
+ handleIdentifier(x, methodDeclarationContinuation)
+ handleQualified(.)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ handleNoInitializers()
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(GetterConstructor, get, get)
+ endClassConstructor(get, get, (, null, })
+ endMember()
+ beginMetadataStar(get)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, get, Foo)
+ handleNoType(})
+ handleIdentifier(Foo, methodDeclaration)
+ handleIdentifier(x, methodDeclarationContinuation)
+ handleQualified(.)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(initializer)
+ handleIdentifier(initializer, expression)
+ handleNoTypeArguments(=)
+ handleNoArguments(=)
+ handleSend(initializer, =)
+ handleLiteralBool(true)
+ handleAssignmentExpression(=)
+ endInitializer({)
+ endInitializers(1, :, {)
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(GetterConstructor, get, get)
+ endClassConstructor(get, get, (, :, })
+ endMember()
+ endClassOrMixinBody(DeclarationKind.Class, 4, {, })
+ endClassDeclaration(class, })
+ endTopLevelDeclaration()
+endCompilationUnit(1, )
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.intertwined.expect
new file mode 100644
index 0000000..a584715
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.intertwined.expect
@@ -0,0 +1,226 @@
+parseUnit(class)
+ skipErrorTokens(class)
+ listener: beginCompilationUnit(class)
+ syntheticPreviousToken(class)
+ parseTopLevelDeclarationImpl(, Instance of 'DirectiveContext')
+ parseMetadataStar()
+ listener: beginMetadataStar(class)
+ listener: endMetadataStar(0)
+ parseTopLevelKeywordDeclaration(, class, Instance of 'DirectiveContext')
+ parseClassDeclarationModifiers(, class)
+ parseClassOrNamedMixinApplication(null, class)
+ listener: beginClassOrNamedMixinApplicationPrelude(class)
+ ensureIdentifier(class, classOrMixinDeclaration)
+ listener: handleIdentifier(Foo, classOrMixinDeclaration)
+ listener: handleNoTypeVariables({)
+ listener: beginClassDeclaration(class, null, Foo)
+ parseClass(Foo, class, class, Foo)
+ parseClassHeaderOpt(Foo, class, class)
+ parseClassExtendsOpt(Foo)
+ listener: handleNoType(Foo)
+ listener: handleClassExtends(null)
+ parseWithClauseOpt(Foo)
+ listener: handleClassNoWithClause()
+ parseClassOrMixinImplementsOpt(Foo)
+ listener: handleClassOrMixinImplements(null, 0)
+ listener: handleClassHeader(class, class, null)
+ parseClassOrMixinOrExtensionBody(Foo, DeclarationKind.Class, Foo)
+ listener: beginClassOrMixinBody(DeclarationKind.Class, {)
+ notEofOrValue(}, get)
+ parseClassOrMixinOrExtensionMemberImpl({, DeclarationKind.Class, Foo)
+ parseMetadataStar({)
+ listener: beginMetadataStar(get)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod({, null, null, null, null, null, {, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, get, Foo)
+ listener: handleNoType({)
+ ensureIdentifier(get, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(Foo, Foo, true, MemberKind.NonStaticMethod)
+ reportRecoverableError((, GetterWithFormals)
+ listener: handleRecoverableError(GetterWithFormals, (, ()
+ parseFormalParameters(Foo, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ listener: handleNoInitializers()
+ parseAsyncModifierOpt())
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(), false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(Foo, MemberWithSameNameAsClass)
+ listener: handleRecoverableError(MemberWithSameNameAsClass, Foo, Foo)
+ listener: endClassMethod(get, get, (, null, })
+ listener: endMember()
+ notEofOrValue(}, get)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(get)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, get, Foo)
+ listener: handleNoType(})
+ ensureIdentifier(get, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(Foo, Foo, true, MemberKind.NonStaticMethod)
+ reportRecoverableError((, GetterWithFormals)
+ listener: handleRecoverableError(GetterWithFormals, (, ()
+ parseFormalParameters(Foo, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(initializer)
+ parseInitializerExpressionRest(:)
+ parseExpression(:)
+ parsePrecedenceExpression(:, 1, true)
+ parseUnaryExpression(:, true)
+ parsePrimary(:, expression)
+ parseSendOrFunctionLiteral(:, expression)
+ parseSend(:, expression)
+ ensureIdentifier(:, expression)
+ listener: handleIdentifier(initializer, expression)
+ listener: handleNoTypeArguments(=)
+ parseArgumentsOpt(initializer)
+ listener: handleNoArguments(=)
+ listener: handleSend(initializer, =)
+ parsePrecedenceExpression(=, 1, true)
+ parseUnaryExpression(=, true)
+ parsePrimary(=, expression)
+ parseLiteralBool(=)
+ listener: handleLiteralBool(true)
+ listener: handleAssignmentExpression(=)
+ listener: endInitializer({)
+ listener: endInitializers(1, :, {)
+ parseAsyncModifierOpt(true)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(true, false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(get, GetterConstructor)
+ listener: handleRecoverableError(GetterConstructor, get, get)
+ listener: endClassConstructor(get, get, (, :, })
+ listener: endMember()
+ notEofOrValue(}, get)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(get)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, get, Foo)
+ listener: handleNoType(})
+ ensureIdentifier(get, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ parseQualifiedRest(Foo, methodDeclarationContinuation)
+ ensureIdentifier(., methodDeclarationContinuation)
+ listener: handleIdentifier(x, methodDeclarationContinuation)
+ listener: handleQualified(.)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(x, Foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(x, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ listener: handleNoInitializers()
+ parseAsyncModifierOpt())
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(), false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(get, GetterConstructor)
+ listener: handleRecoverableError(GetterConstructor, get, get)
+ listener: endClassConstructor(get, get, (, null, })
+ listener: endMember()
+ notEofOrValue(}, get)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(get)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, get, Foo)
+ listener: handleNoType(})
+ ensureIdentifier(get, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ parseQualifiedRest(Foo, methodDeclarationContinuation)
+ ensureIdentifier(., methodDeclarationContinuation)
+ listener: handleIdentifier(x, methodDeclarationContinuation)
+ listener: handleQualified(.)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(x, Foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(x, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(initializer)
+ parseInitializerExpressionRest(:)
+ parseExpression(:)
+ parsePrecedenceExpression(:, 1, true)
+ parseUnaryExpression(:, true)
+ parsePrimary(:, expression)
+ parseSendOrFunctionLiteral(:, expression)
+ parseSend(:, expression)
+ ensureIdentifier(:, expression)
+ listener: handleIdentifier(initializer, expression)
+ listener: handleNoTypeArguments(=)
+ parseArgumentsOpt(initializer)
+ listener: handleNoArguments(=)
+ listener: handleSend(initializer, =)
+ parsePrecedenceExpression(=, 1, true)
+ parseUnaryExpression(=, true)
+ parsePrimary(=, expression)
+ parseLiteralBool(=)
+ listener: handleLiteralBool(true)
+ listener: handleAssignmentExpression(=)
+ listener: endInitializer({)
+ listener: endInitializers(1, :, {)
+ parseAsyncModifierOpt(true)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(true, false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(get, GetterConstructor)
+ listener: handleRecoverableError(GetterConstructor, get, get)
+ listener: endClassConstructor(get, get, (, :, })
+ listener: endMember()
+ notEofOrValue(}, })
+ listener: endClassOrMixinBody(DeclarationKind.Class, 4, {, })
+ listener: endClassDeclaration(class, })
+ listener: endTopLevelDeclaration()
+ reportAllErrorTokens(class)
+ listener: endCompilationUnit(1, )
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.parser.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.parser.expect
new file mode 100644
index 0000000..2ad1c7b
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.parser.expect
@@ -0,0 +1,29 @@
+class Foo {
+get Foo() {
+
+}
+get Foo() : initializer = true {
+
+}
+get Foo.x() {
+
+}
+get Foo.x() : initializer = true {
+
+}
+}
+
+class[KeywordToken] Foo[StringToken] {[BeginToken]
+get[KeywordToken] Foo[StringToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+get[KeywordToken] Foo[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+get[KeywordToken] Foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+get[KeywordToken] Foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+}[SimpleToken][SimpleToken]
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.scanner.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.scanner.expect
new file mode 100644
index 0000000..2ad1c7b
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.scanner.expect
@@ -0,0 +1,29 @@
+class Foo {
+get Foo() {
+
+}
+get Foo() : initializer = true {
+
+}
+get Foo.x() {
+
+}
+get Foo.x() : initializer = true {
+
+}
+}
+
+class[KeywordToken] Foo[StringToken] {[BeginToken]
+get[KeywordToken] Foo[StringToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+get[KeywordToken] Foo[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+get[KeywordToken] Foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+get[KeywordToken] Foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+}[SimpleToken][SimpleToken]
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart
new file mode 100644
index 0000000..6a532a0
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart
@@ -0,0 +1,14 @@
+class Foo {
+ Foo() {
+ // OK.
+ }
+ Foo() : initializer = true {
+ // OK.
+ }
+ Foo.x() {
+ // OK.
+ }
+ Foo.x() : initializer = true {
+ // OK.
+ }
+}
\ No newline at end of file
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.expect
new file mode 100644
index 0000000..6993a8e
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.expect
@@ -0,0 +1,99 @@
+beginCompilationUnit(class)
+ beginMetadataStar(class)
+ endMetadataStar(0)
+ beginClassOrNamedMixinApplicationPrelude(class)
+ handleIdentifier(Foo, classOrMixinDeclaration)
+ handleNoTypeVariables({)
+ beginClassDeclaration(class, null, Foo)
+ handleNoType(Foo)
+ handleClassExtends(null)
+ handleClassNoWithClause()
+ handleClassOrMixinImplements(null, 0)
+ handleClassHeader(class, class, null)
+ beginClassOrMixinBody(DeclarationKind.Class, {)
+ beginMetadataStar(Foo)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, null, Foo)
+ handleNoType({)
+ handleIdentifier(Foo, methodDeclaration)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ handleNoInitializers()
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ endClassConstructor(null, Foo, (, null, })
+ endMember()
+ beginMetadataStar(Foo)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, null, Foo)
+ handleNoType(})
+ handleIdentifier(Foo, methodDeclaration)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(initializer)
+ handleIdentifier(initializer, expression)
+ handleNoTypeArguments(=)
+ handleNoArguments(=)
+ handleSend(initializer, =)
+ handleLiteralBool(true)
+ handleAssignmentExpression(=)
+ endInitializer({)
+ endInitializers(1, :, {)
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ endClassConstructor(null, Foo, (, :, })
+ endMember()
+ beginMetadataStar(Foo)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, null, Foo)
+ handleNoType(})
+ handleIdentifier(Foo, methodDeclaration)
+ handleIdentifier(x, methodDeclarationContinuation)
+ handleQualified(.)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ handleNoInitializers()
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ endClassConstructor(null, Foo, (, null, })
+ endMember()
+ beginMetadataStar(Foo)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, null, Foo)
+ handleNoType(})
+ handleIdentifier(Foo, methodDeclaration)
+ handleIdentifier(x, methodDeclarationContinuation)
+ handleQualified(.)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(initializer)
+ handleIdentifier(initializer, expression)
+ handleNoTypeArguments(=)
+ handleNoArguments(=)
+ handleSend(initializer, =)
+ handleLiteralBool(true)
+ handleAssignmentExpression(=)
+ endInitializer({)
+ endInitializers(1, :, {)
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ endClassConstructor(null, Foo, (, :, })
+ endMember()
+ endClassOrMixinBody(DeclarationKind.Class, 4, {, })
+ endClassDeclaration(class, })
+ endTopLevelDeclaration()
+endCompilationUnit(1, )
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.intertwined.expect
new file mode 100644
index 0000000..14837ca
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.intertwined.expect
@@ -0,0 +1,214 @@
+parseUnit(class)
+ skipErrorTokens(class)
+ listener: beginCompilationUnit(class)
+ syntheticPreviousToken(class)
+ parseTopLevelDeclarationImpl(, Instance of 'DirectiveContext')
+ parseMetadataStar()
+ listener: beginMetadataStar(class)
+ listener: endMetadataStar(0)
+ parseTopLevelKeywordDeclaration(, class, Instance of 'DirectiveContext')
+ parseClassDeclarationModifiers(, class)
+ parseClassOrNamedMixinApplication(null, class)
+ listener: beginClassOrNamedMixinApplicationPrelude(class)
+ ensureIdentifier(class, classOrMixinDeclaration)
+ listener: handleIdentifier(Foo, classOrMixinDeclaration)
+ listener: handleNoTypeVariables({)
+ listener: beginClassDeclaration(class, null, Foo)
+ parseClass(Foo, class, class, Foo)
+ parseClassHeaderOpt(Foo, class, class)
+ parseClassExtendsOpt(Foo)
+ listener: handleNoType(Foo)
+ listener: handleClassExtends(null)
+ parseWithClauseOpt(Foo)
+ listener: handleClassNoWithClause()
+ parseClassOrMixinImplementsOpt(Foo)
+ listener: handleClassOrMixinImplements(null, 0)
+ listener: handleClassHeader(class, class, null)
+ parseClassOrMixinOrExtensionBody(Foo, DeclarationKind.Class, Foo)
+ listener: beginClassOrMixinBody(DeclarationKind.Class, {)
+ notEofOrValue(}, Foo)
+ parseClassOrMixinOrExtensionMemberImpl({, DeclarationKind.Class, Foo)
+ parseMetadataStar({)
+ listener: beginMetadataStar(Foo)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod({, null, null, null, null, null, {, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, null, Foo)
+ listener: handleNoType({)
+ ensureIdentifier({, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ parseMethodTypeVar(Foo)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(Foo, Foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(Foo, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ listener: handleNoInitializers()
+ parseAsyncModifierOpt())
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(), false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ listener: endClassConstructor(null, Foo, (, null, })
+ listener: endMember()
+ notEofOrValue(}, Foo)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(Foo)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, null, Foo)
+ listener: handleNoType(})
+ ensureIdentifier(}, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ parseMethodTypeVar(Foo)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(Foo, Foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(Foo, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(initializer)
+ parseInitializerExpressionRest(:)
+ parseExpression(:)
+ parsePrecedenceExpression(:, 1, true)
+ parseUnaryExpression(:, true)
+ parsePrimary(:, expression)
+ parseSendOrFunctionLiteral(:, expression)
+ parseSend(:, expression)
+ ensureIdentifier(:, expression)
+ listener: handleIdentifier(initializer, expression)
+ listener: handleNoTypeArguments(=)
+ parseArgumentsOpt(initializer)
+ listener: handleNoArguments(=)
+ listener: handleSend(initializer, =)
+ parsePrecedenceExpression(=, 1, true)
+ parseUnaryExpression(=, true)
+ parsePrimary(=, expression)
+ parseLiteralBool(=)
+ listener: handleLiteralBool(true)
+ listener: handleAssignmentExpression(=)
+ listener: endInitializer({)
+ listener: endInitializers(1, :, {)
+ parseAsyncModifierOpt(true)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(true, false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ listener: endClassConstructor(null, Foo, (, :, })
+ listener: endMember()
+ notEofOrValue(}, Foo)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(Foo)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, null, Foo)
+ listener: handleNoType(})
+ ensureIdentifier(}, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ parseQualifiedRest(Foo, methodDeclarationContinuation)
+ ensureIdentifier(., methodDeclarationContinuation)
+ listener: handleIdentifier(x, methodDeclarationContinuation)
+ listener: handleQualified(.)
+ parseMethodTypeVar(x)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(x, Foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(x, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ listener: handleNoInitializers()
+ parseAsyncModifierOpt())
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(), false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ listener: endClassConstructor(null, Foo, (, null, })
+ listener: endMember()
+ notEofOrValue(}, Foo)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(Foo)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, null, Foo)
+ listener: handleNoType(})
+ ensureIdentifier(}, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ parseQualifiedRest(Foo, methodDeclarationContinuation)
+ ensureIdentifier(., methodDeclarationContinuation)
+ listener: handleIdentifier(x, methodDeclarationContinuation)
+ listener: handleQualified(.)
+ parseMethodTypeVar(x)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(x, Foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(x, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(initializer)
+ parseInitializerExpressionRest(:)
+ parseExpression(:)
+ parsePrecedenceExpression(:, 1, true)
+ parseUnaryExpression(:, true)
+ parsePrimary(:, expression)
+ parseSendOrFunctionLiteral(:, expression)
+ parseSend(:, expression)
+ ensureIdentifier(:, expression)
+ listener: handleIdentifier(initializer, expression)
+ listener: handleNoTypeArguments(=)
+ parseArgumentsOpt(initializer)
+ listener: handleNoArguments(=)
+ listener: handleSend(initializer, =)
+ parsePrecedenceExpression(=, 1, true)
+ parseUnaryExpression(=, true)
+ parsePrimary(=, expression)
+ parseLiteralBool(=)
+ listener: handleLiteralBool(true)
+ listener: handleAssignmentExpression(=)
+ listener: endInitializer({)
+ listener: endInitializers(1, :, {)
+ parseAsyncModifierOpt(true)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(true, false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ listener: endClassConstructor(null, Foo, (, :, })
+ listener: endMember()
+ notEofOrValue(}, })
+ listener: endClassOrMixinBody(DeclarationKind.Class, 4, {, })
+ listener: endClassDeclaration(class, })
+ listener: endTopLevelDeclaration()
+ reportAllErrorTokens(class)
+ listener: endCompilationUnit(1, )
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.parser.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.parser.expect
new file mode 100644
index 0000000..55b24fd
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.parser.expect
@@ -0,0 +1,29 @@
+class Foo {
+Foo() {
+
+}
+Foo() : initializer = true {
+
+}
+Foo.x() {
+
+}
+Foo.x() : initializer = true {
+
+}
+}
+
+class[KeywordToken] Foo[StringToken] {[BeginToken]
+Foo[StringToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+Foo[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+Foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+Foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+}[SimpleToken][SimpleToken]
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.scanner.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.scanner.expect
new file mode 100644
index 0000000..55b24fd
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.scanner.expect
@@ -0,0 +1,29 @@
+class Foo {
+Foo() {
+
+}
+Foo() : initializer = true {
+
+}
+Foo.x() {
+
+}
+Foo.x() : initializer = true {
+
+}
+}
+
+class[KeywordToken] Foo[StringToken] {[BeginToken]
+Foo[StringToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+Foo[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+Foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+Foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+}[SimpleToken][SimpleToken]
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart
new file mode 100644
index 0000000..44d5847
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart
@@ -0,0 +1,14 @@
+class Foo {
+ Foo() / : super() {
+ // Not OK.
+ }
+ Foo()./ : super() {
+ // Not OK.
+ }
+ foo() / : super() {
+ // Not OK.
+ }
+ foo()./ : super() {
+ // Not OK.
+ }
+}
\ No newline at end of file
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.expect
new file mode 100644
index 0000000..a000871
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.expect
@@ -0,0 +1,267 @@
+Problems reported:
+
+parser/error_recovery/constructor_recovery_operator.crash:2:9: Expected a function body, but got '/'.
+ Foo() / : super() {
+ ^
+
+parser/error_recovery/constructor_recovery_operator.crash:2:9: Operator declarations must be preceded by the keyword 'operator'.
+ Foo() / : super() {
+ ^
+
+parser/error_recovery/constructor_recovery_operator.crash:2:9: A method declaration needs an explicit list of parameters.
+ Foo() / : super() {
+ ^
+
+parser/error_recovery/constructor_recovery_operator.crash:2:9: The name of a constructor must match the name of the enclosing class.
+ Foo() / : super() {
+ ^
+
+parser/error_recovery/constructor_recovery_operator.crash:5:8: Expected a function body, but got '.'.
+ Foo()./ : super() {
+ ^
+
+parser/error_recovery/constructor_recovery_operator.crash:5:8: Expected a class member, but got '.'.
+ Foo()./ : super() {
+ ^
+
+parser/error_recovery/constructor_recovery_operator.crash:5:9: Operator declarations must be preceded by the keyword 'operator'.
+ Foo()./ : super() {
+ ^
+
+parser/error_recovery/constructor_recovery_operator.crash:5:9: A method declaration needs an explicit list of parameters.
+ Foo()./ : super() {
+ ^
+
+parser/error_recovery/constructor_recovery_operator.crash:5:9: The name of a constructor must match the name of the enclosing class.
+ Foo()./ : super() {
+ ^
+
+parser/error_recovery/constructor_recovery_operator.crash:8:9: Expected a function body, but got '/'.
+ foo() / : super() {
+ ^
+
+parser/error_recovery/constructor_recovery_operator.crash:8:9: Operator declarations must be preceded by the keyword 'operator'.
+ foo() / : super() {
+ ^
+
+parser/error_recovery/constructor_recovery_operator.crash:8:9: A method declaration needs an explicit list of parameters.
+ foo() / : super() {
+ ^
+
+parser/error_recovery/constructor_recovery_operator.crash:8:9: The name of a constructor must match the name of the enclosing class.
+ foo() / : super() {
+ ^
+
+parser/error_recovery/constructor_recovery_operator.crash:11:8: Expected a function body, but got '.'.
+ foo()./ : super() {
+ ^
+
+parser/error_recovery/constructor_recovery_operator.crash:11:8: Expected a class member, but got '.'.
+ foo()./ : super() {
+ ^
+
+parser/error_recovery/constructor_recovery_operator.crash:11:9: Operator declarations must be preceded by the keyword 'operator'.
+ foo()./ : super() {
+ ^
+
+parser/error_recovery/constructor_recovery_operator.crash:11:9: A method declaration needs an explicit list of parameters.
+ foo()./ : super() {
+ ^
+
+parser/error_recovery/constructor_recovery_operator.crash:11:9: The name of a constructor must match the name of the enclosing class.
+ foo()./ : super() {
+ ^
+
+beginCompilationUnit(class)
+ beginMetadataStar(class)
+ endMetadataStar(0)
+ beginClassOrNamedMixinApplicationPrelude(class)
+ handleIdentifier(Foo, classOrMixinDeclaration)
+ handleNoTypeVariables({)
+ beginClassDeclaration(class, null, Foo)
+ handleNoType(Foo)
+ handleClassExtends(null)
+ handleClassNoWithClause()
+ handleClassOrMixinImplements(null, 0)
+ handleClassHeader(class, class, null)
+ beginClassOrMixinBody(DeclarationKind.Class, {)
+ beginMetadataStar(Foo)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, null, Foo)
+ handleNoType({)
+ handleIdentifier(Foo, methodDeclaration)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ handleNoInitializers()
+ handleAsyncModifier(null, null)
+ handleRecoverableError(Message[ExpectedFunctionBody, Expected a function body, but got '/'., null, {token: /}], /, /)
+ handleInvalidFunctionBody({)
+ endClassConstructor(null, Foo, (, null, })
+ endMember()
+ beginMetadataStar(/)
+ endMetadataStar(0)
+ beginMember()
+ handleRecoverableError(MissingOperatorKeyword, /, /)
+ beginMethod(null, null, null, null, null, operator)
+ handleNoType(})
+ handleOperatorName(operator, /)
+ handleNoTypeVariables(:)
+ handleRecoverableError(MissingMethodParameters, /, /)
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(super)
+ handleSuperExpression(super, expression)
+ handleNoTypeArguments(()
+ beginArguments(()
+ endArguments(0, (, ))
+ handleSend(super, {)
+ endInitializer({)
+ endInitializers(1, :, {)
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(ConstructorWithWrongName, /, /)
+ endClassConstructor(null, operator, (, :, })
+ endMember()
+ beginMetadataStar(Foo)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, null, Foo)
+ handleNoType(})
+ handleIdentifier(Foo, methodDeclaration)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ handleNoInitializers()
+ handleAsyncModifier(null, null)
+ handleRecoverableError(Message[ExpectedFunctionBody, Expected a function body, but got '.'., null, {token: .}], ., .)
+ handleInvalidFunctionBody({)
+ endClassConstructor(null, Foo, (, null, })
+ endMember()
+ beginMetadataStar(.)
+ endMetadataStar(0)
+ beginMember()
+ handleRecoverableError(Message[ExpectedClassMember, Expected a class member, but got '.'., null, {token: .}], ., .)
+ handleInvalidMember(.)
+ endMember()
+ beginMetadataStar(/)
+ endMetadataStar(0)
+ beginMember()
+ handleRecoverableError(MissingOperatorKeyword, /, /)
+ beginMethod(null, null, null, null, null, operator)
+ handleNoType(.)
+ handleOperatorName(operator, /)
+ handleNoTypeVariables(:)
+ handleRecoverableError(MissingMethodParameters, /, /)
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(super)
+ handleSuperExpression(super, expression)
+ handleNoTypeArguments(()
+ beginArguments(()
+ endArguments(0, (, ))
+ handleSend(super, {)
+ endInitializer({)
+ endInitializers(1, :, {)
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(ConstructorWithWrongName, /, /)
+ endClassConstructor(null, operator, (, :, })
+ endMember()
+ beginMetadataStar(foo)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, null, foo)
+ handleNoType(})
+ handleIdentifier(foo, methodDeclaration)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ handleNoInitializers()
+ handleAsyncModifier(null, null)
+ handleRecoverableError(Message[ExpectedFunctionBody, Expected a function body, but got '/'., null, {token: /}], /, /)
+ handleInvalidFunctionBody({)
+ endClassMethod(null, foo, (, null, })
+ endMember()
+ beginMetadataStar(/)
+ endMetadataStar(0)
+ beginMember()
+ handleRecoverableError(MissingOperatorKeyword, /, /)
+ beginMethod(null, null, null, null, null, operator)
+ handleNoType(})
+ handleOperatorName(operator, /)
+ handleNoTypeVariables(:)
+ handleRecoverableError(MissingMethodParameters, /, /)
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(super)
+ handleSuperExpression(super, expression)
+ handleNoTypeArguments(()
+ beginArguments(()
+ endArguments(0, (, ))
+ handleSend(super, {)
+ endInitializer({)
+ endInitializers(1, :, {)
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(ConstructorWithWrongName, /, /)
+ endClassConstructor(null, operator, (, :, })
+ endMember()
+ beginMetadataStar(foo)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, null, foo)
+ handleNoType(})
+ handleIdentifier(foo, methodDeclaration)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ handleNoInitializers()
+ handleAsyncModifier(null, null)
+ handleRecoverableError(Message[ExpectedFunctionBody, Expected a function body, but got '.'., null, {token: .}], ., .)
+ handleInvalidFunctionBody({)
+ endClassMethod(null, foo, (, null, })
+ endMember()
+ beginMetadataStar(.)
+ endMetadataStar(0)
+ beginMember()
+ handleRecoverableError(Message[ExpectedClassMember, Expected a class member, but got '.'., null, {token: .}], ., .)
+ handleInvalidMember(.)
+ endMember()
+ beginMetadataStar(/)
+ endMetadataStar(0)
+ beginMember()
+ handleRecoverableError(MissingOperatorKeyword, /, /)
+ beginMethod(null, null, null, null, null, operator)
+ handleNoType(.)
+ handleOperatorName(operator, /)
+ handleNoTypeVariables(:)
+ handleRecoverableError(MissingMethodParameters, /, /)
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(super)
+ handleSuperExpression(super, expression)
+ handleNoTypeArguments(()
+ beginArguments(()
+ endArguments(0, (, ))
+ handleSend(super, {)
+ endInitializer({)
+ endInitializers(1, :, {)
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(ConstructorWithWrongName, /, /)
+ endClassConstructor(null, operator, (, :, })
+ endMember()
+ endClassOrMixinBody(DeclarationKind.Class, 10, {, })
+ endClassDeclaration(class, })
+ endTopLevelDeclaration()
+endCompilationUnit(1, )
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.intertwined.expect
new file mode 100644
index 0000000..1a0d2d1
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.intertwined.expect
@@ -0,0 +1,432 @@
+parseUnit(class)
+ skipErrorTokens(class)
+ listener: beginCompilationUnit(class)
+ syntheticPreviousToken(class)
+ parseTopLevelDeclarationImpl(, Instance of 'DirectiveContext')
+ parseMetadataStar()
+ listener: beginMetadataStar(class)
+ listener: endMetadataStar(0)
+ parseTopLevelKeywordDeclaration(, class, Instance of 'DirectiveContext')
+ parseClassDeclarationModifiers(, class)
+ parseClassOrNamedMixinApplication(null, class)
+ listener: beginClassOrNamedMixinApplicationPrelude(class)
+ ensureIdentifier(class, classOrMixinDeclaration)
+ listener: handleIdentifier(Foo, classOrMixinDeclaration)
+ listener: handleNoTypeVariables({)
+ listener: beginClassDeclaration(class, null, Foo)
+ parseClass(Foo, class, class, Foo)
+ parseClassHeaderOpt(Foo, class, class)
+ parseClassExtendsOpt(Foo)
+ listener: handleNoType(Foo)
+ listener: handleClassExtends(null)
+ parseWithClauseOpt(Foo)
+ listener: handleClassNoWithClause()
+ parseClassOrMixinImplementsOpt(Foo)
+ listener: handleClassOrMixinImplements(null, 0)
+ listener: handleClassHeader(class, class, null)
+ parseClassOrMixinOrExtensionBody(Foo, DeclarationKind.Class, Foo)
+ listener: beginClassOrMixinBody(DeclarationKind.Class, {)
+ notEofOrValue(}, Foo)
+ parseClassOrMixinOrExtensionMemberImpl({, DeclarationKind.Class, Foo)
+ parseMetadataStar({)
+ listener: beginMetadataStar(Foo)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod({, null, null, null, null, null, {, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, null, Foo)
+ listener: handleNoType({)
+ ensureIdentifier({, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ parseMethodTypeVar(Foo)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(Foo, Foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(Foo, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ listener: handleNoInitializers()
+ parseAsyncModifierOpt())
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(), false, true)
+ ensureBlock(), Instance of 'Template<(Token) => Message>', null)
+ reportRecoverableError(/, Message[ExpectedFunctionBody, Expected a function body, but got '/'., null, {token: /}])
+ listener: handleRecoverableError(Message[ExpectedFunctionBody, Expected a function body, but got '/'., null, {token: /}], /, /)
+ insertBlock())
+ rewriter()
+ rewriter()
+ listener: handleInvalidFunctionBody({)
+ listener: endClassConstructor(null, Foo, (, null, })
+ listener: endMember()
+ notEofOrValue(}, /)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(/)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ recoverFromInvalidMember(}, }, null, null, null, null, null, }, Instance of 'NoType', null, DeclarationKind.Class, Foo)
+ parseInvalidOperatorDeclaration(}, null, null, null, null, null, }, DeclarationKind.Class, Foo)
+ reportRecoverableError(/, MissingOperatorKeyword)
+ listener: handleRecoverableError(MissingOperatorKeyword, /, /)
+ rewriter()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', null, operator, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, null, operator)
+ listener: handleNoType(})
+ parseOperatorName(})
+ listener: handleOperatorName(operator, /)
+ parseMethodTypeVar(/)
+ listener: handleNoTypeVariables(:)
+ parseGetterOrFormalParameters(/, operator, false, MemberKind.NonStaticMethod)
+ missingParameterMessage(MemberKind.NonStaticMethod)
+ reportRecoverableError(/, MissingMethodParameters)
+ listener: handleRecoverableError(MissingMethodParameters, /, /)
+ rewriter()
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(super)
+ parseSuperInitializerExpression(:)
+ parseInitializerExpressionRest(:)
+ parseExpression(:)
+ parsePrecedenceExpression(:, 1, true)
+ parseUnaryExpression(:, true)
+ parsePrimary(:, expression)
+ parseSuperExpression(:, expression)
+ listener: handleSuperExpression(super, expression)
+ listener: handleNoTypeArguments(()
+ parseArguments(super)
+ parseArgumentsRest(()
+ listener: beginArguments(()
+ listener: endArguments(0, (, ))
+ listener: handleSend(super, {)
+ listener: endInitializer({)
+ listener: endInitializers(1, :, {)
+ parseAsyncModifierOpt())
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(), false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(operator, ConstructorWithWrongName)
+ listener: handleRecoverableError(ConstructorWithWrongName, /, /)
+ listener: endClassConstructor(null, operator, (, :, })
+ listener: endMember()
+ notEofOrValue(}, Foo)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(Foo)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, null, Foo)
+ listener: handleNoType(})
+ ensureIdentifier(}, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ parseMethodTypeVar(Foo)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(Foo, Foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(Foo, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ listener: handleNoInitializers()
+ parseAsyncModifierOpt())
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(), false, true)
+ ensureBlock(), Instance of 'Template<(Token) => Message>', null)
+ reportRecoverableError(., Message[ExpectedFunctionBody, Expected a function body, but got '.'., null, {token: .}])
+ listener: handleRecoverableError(Message[ExpectedFunctionBody, Expected a function body, but got '.'., null, {token: .}], ., .)
+ insertBlock())
+ rewriter()
+ rewriter()
+ listener: handleInvalidFunctionBody({)
+ listener: endClassConstructor(null, Foo, (, null, })
+ listener: endMember()
+ notEofOrValue(}, .)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(.)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ recoverFromInvalidMember(}, }, null, null, null, null, null, }, Instance of 'NoType', null, DeclarationKind.Class, Foo)
+ reportRecoverableErrorWithToken(., Instance of 'Template<(Token) => Message>')
+ listener: handleRecoverableError(Message[ExpectedClassMember, Expected a class member, but got '.'., null, {token: .}], ., .)
+ listener: handleInvalidMember(.)
+ listener: endMember()
+ notEofOrValue(}, /)
+ parseClassOrMixinOrExtensionMemberImpl(., DeclarationKind.Class, Foo)
+ parseMetadataStar(.)
+ listener: beginMetadataStar(/)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ recoverFromInvalidMember(., ., null, null, null, null, null, ., Instance of 'NoType', null, DeclarationKind.Class, Foo)
+ parseInvalidOperatorDeclaration(., null, null, null, null, null, ., DeclarationKind.Class, Foo)
+ reportRecoverableError(/, MissingOperatorKeyword)
+ listener: handleRecoverableError(MissingOperatorKeyword, /, /)
+ rewriter()
+ parseMethod(., null, null, null, null, null, ., Instance of 'NoType', null, operator, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, null, operator)
+ listener: handleNoType(.)
+ parseOperatorName(.)
+ listener: handleOperatorName(operator, /)
+ parseMethodTypeVar(/)
+ listener: handleNoTypeVariables(:)
+ parseGetterOrFormalParameters(/, operator, false, MemberKind.NonStaticMethod)
+ missingParameterMessage(MemberKind.NonStaticMethod)
+ reportRecoverableError(/, MissingMethodParameters)
+ listener: handleRecoverableError(MissingMethodParameters, /, /)
+ rewriter()
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(super)
+ parseSuperInitializerExpression(:)
+ parseInitializerExpressionRest(:)
+ parseExpression(:)
+ parsePrecedenceExpression(:, 1, true)
+ parseUnaryExpression(:, true)
+ parsePrimary(:, expression)
+ parseSuperExpression(:, expression)
+ listener: handleSuperExpression(super, expression)
+ listener: handleNoTypeArguments(()
+ parseArguments(super)
+ parseArgumentsRest(()
+ listener: beginArguments(()
+ listener: endArguments(0, (, ))
+ listener: handleSend(super, {)
+ listener: endInitializer({)
+ listener: endInitializers(1, :, {)
+ parseAsyncModifierOpt())
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(), false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(operator, ConstructorWithWrongName)
+ listener: handleRecoverableError(ConstructorWithWrongName, /, /)
+ listener: endClassConstructor(null, operator, (, :, })
+ listener: endMember()
+ notEofOrValue(}, foo)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(foo)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', null, foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, null, foo)
+ listener: handleNoType(})
+ ensureIdentifier(}, methodDeclaration)
+ listener: handleIdentifier(foo, methodDeclaration)
+ parseQualifiedRestOpt(foo, methodDeclarationContinuation)
+ parseMethodTypeVar(foo)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(foo, foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(foo, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ listener: handleNoInitializers()
+ parseAsyncModifierOpt())
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(), false, true)
+ ensureBlock(), Instance of 'Template<(Token) => Message>', null)
+ reportRecoverableError(/, Message[ExpectedFunctionBody, Expected a function body, but got '/'., null, {token: /}])
+ listener: handleRecoverableError(Message[ExpectedFunctionBody, Expected a function body, but got '/'., null, {token: /}], /, /)
+ insertBlock())
+ rewriter()
+ rewriter()
+ listener: handleInvalidFunctionBody({)
+ listener: endClassMethod(null, foo, (, null, })
+ listener: endMember()
+ notEofOrValue(}, /)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(/)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ recoverFromInvalidMember(}, }, null, null, null, null, null, }, Instance of 'NoType', null, DeclarationKind.Class, Foo)
+ parseInvalidOperatorDeclaration(}, null, null, null, null, null, }, DeclarationKind.Class, Foo)
+ reportRecoverableError(/, MissingOperatorKeyword)
+ listener: handleRecoverableError(MissingOperatorKeyword, /, /)
+ rewriter()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', null, operator, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, null, operator)
+ listener: handleNoType(})
+ parseOperatorName(})
+ listener: handleOperatorName(operator, /)
+ parseMethodTypeVar(/)
+ listener: handleNoTypeVariables(:)
+ parseGetterOrFormalParameters(/, operator, false, MemberKind.NonStaticMethod)
+ missingParameterMessage(MemberKind.NonStaticMethod)
+ reportRecoverableError(/, MissingMethodParameters)
+ listener: handleRecoverableError(MissingMethodParameters, /, /)
+ rewriter()
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(super)
+ parseSuperInitializerExpression(:)
+ parseInitializerExpressionRest(:)
+ parseExpression(:)
+ parsePrecedenceExpression(:, 1, true)
+ parseUnaryExpression(:, true)
+ parsePrimary(:, expression)
+ parseSuperExpression(:, expression)
+ listener: handleSuperExpression(super, expression)
+ listener: handleNoTypeArguments(()
+ parseArguments(super)
+ parseArgumentsRest(()
+ listener: beginArguments(()
+ listener: endArguments(0, (, ))
+ listener: handleSend(super, {)
+ listener: endInitializer({)
+ listener: endInitializers(1, :, {)
+ parseAsyncModifierOpt())
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(), false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(operator, ConstructorWithWrongName)
+ listener: handleRecoverableError(ConstructorWithWrongName, /, /)
+ listener: endClassConstructor(null, operator, (, :, })
+ listener: endMember()
+ notEofOrValue(}, foo)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(foo)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', null, foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, null, foo)
+ listener: handleNoType(})
+ ensureIdentifier(}, methodDeclaration)
+ listener: handleIdentifier(foo, methodDeclaration)
+ parseQualifiedRestOpt(foo, methodDeclarationContinuation)
+ parseMethodTypeVar(foo)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(foo, foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(foo, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ listener: handleNoInitializers()
+ parseAsyncModifierOpt())
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(), false, true)
+ ensureBlock(), Instance of 'Template<(Token) => Message>', null)
+ reportRecoverableError(., Message[ExpectedFunctionBody, Expected a function body, but got '.'., null, {token: .}])
+ listener: handleRecoverableError(Message[ExpectedFunctionBody, Expected a function body, but got '.'., null, {token: .}], ., .)
+ insertBlock())
+ rewriter()
+ rewriter()
+ listener: handleInvalidFunctionBody({)
+ listener: endClassMethod(null, foo, (, null, })
+ listener: endMember()
+ notEofOrValue(}, .)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(.)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ recoverFromInvalidMember(}, }, null, null, null, null, null, }, Instance of 'NoType', null, DeclarationKind.Class, Foo)
+ reportRecoverableErrorWithToken(., Instance of 'Template<(Token) => Message>')
+ listener: handleRecoverableError(Message[ExpectedClassMember, Expected a class member, but got '.'., null, {token: .}], ., .)
+ listener: handleInvalidMember(.)
+ listener: endMember()
+ notEofOrValue(}, /)
+ parseClassOrMixinOrExtensionMemberImpl(., DeclarationKind.Class, Foo)
+ parseMetadataStar(.)
+ listener: beginMetadataStar(/)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ recoverFromInvalidMember(., ., null, null, null, null, null, ., Instance of 'NoType', null, DeclarationKind.Class, Foo)
+ parseInvalidOperatorDeclaration(., null, null, null, null, null, ., DeclarationKind.Class, Foo)
+ reportRecoverableError(/, MissingOperatorKeyword)
+ listener: handleRecoverableError(MissingOperatorKeyword, /, /)
+ rewriter()
+ parseMethod(., null, null, null, null, null, ., Instance of 'NoType', null, operator, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, null, operator)
+ listener: handleNoType(.)
+ parseOperatorName(.)
+ listener: handleOperatorName(operator, /)
+ parseMethodTypeVar(/)
+ listener: handleNoTypeVariables(:)
+ parseGetterOrFormalParameters(/, operator, false, MemberKind.NonStaticMethod)
+ missingParameterMessage(MemberKind.NonStaticMethod)
+ reportRecoverableError(/, MissingMethodParameters)
+ listener: handleRecoverableError(MissingMethodParameters, /, /)
+ rewriter()
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(super)
+ parseSuperInitializerExpression(:)
+ parseInitializerExpressionRest(:)
+ parseExpression(:)
+ parsePrecedenceExpression(:, 1, true)
+ parseUnaryExpression(:, true)
+ parsePrimary(:, expression)
+ parseSuperExpression(:, expression)
+ listener: handleSuperExpression(super, expression)
+ listener: handleNoTypeArguments(()
+ parseArguments(super)
+ parseArgumentsRest(()
+ listener: beginArguments(()
+ listener: endArguments(0, (, ))
+ listener: handleSend(super, {)
+ listener: endInitializer({)
+ listener: endInitializers(1, :, {)
+ parseAsyncModifierOpt())
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(), false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(operator, ConstructorWithWrongName)
+ listener: handleRecoverableError(ConstructorWithWrongName, /, /)
+ listener: endClassConstructor(null, operator, (, :, })
+ listener: endMember()
+ notEofOrValue(}, })
+ listener: endClassOrMixinBody(DeclarationKind.Class, 10, {, })
+ listener: endClassDeclaration(class, })
+ listener: endTopLevelDeclaration()
+ reportAllErrorTokens(class)
+ listener: endCompilationUnit(1, )
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.parser.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.parser.expect
new file mode 100644
index 0000000..06d9d05
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.parser.expect
@@ -0,0 +1,31 @@
+NOTICE: Stream was rewritten by parser!
+
+class Foo {
+Foo() {}operator/ (): super() {
+
+}
+Foo(){}.operator/ (): super() {
+
+}
+foo() {}operator/ (): super() {
+
+}
+foo(){}.operator/ (): super() {
+
+}
+}
+
+class[KeywordToken] Foo[StringToken] {[BeginToken]
+Foo[StringToken]([BeginToken])[SimpleToken] {[SyntheticBeginToken]}[SyntheticToken]operator[SyntheticKeywordToken]/[SimpleToken] ([SyntheticBeginToken])[SyntheticToken]:[SimpleToken] super[KeywordToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+Foo[StringToken]([BeginToken])[SimpleToken]{[SyntheticBeginToken]}[SyntheticToken].[SimpleToken]operator[SyntheticKeywordToken]/[SimpleToken] ([SyntheticBeginToken])[SyntheticToken]:[SimpleToken] super[KeywordToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+foo[StringToken]([BeginToken])[SimpleToken] {[SyntheticBeginToken]}[SyntheticToken]operator[SyntheticKeywordToken]/[SimpleToken] ([SyntheticBeginToken])[SyntheticToken]:[SimpleToken] super[KeywordToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+foo[StringToken]([BeginToken])[SimpleToken]{[SyntheticBeginToken]}[SyntheticToken].[SimpleToken]operator[SyntheticKeywordToken]/[SimpleToken] ([SyntheticBeginToken])[SyntheticToken]:[SimpleToken] super[KeywordToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+}[SimpleToken][SimpleToken]
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.scanner.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.scanner.expect
new file mode 100644
index 0000000..24aae93
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.scanner.expect
@@ -0,0 +1,29 @@
+class Foo {
+Foo() / : super() {
+
+}
+Foo()./ : super() {
+
+}
+foo() / : super() {
+
+}
+foo()./ : super() {
+
+}
+}
+
+class[KeywordToken] Foo[StringToken] {[BeginToken]
+Foo[StringToken]([BeginToken])[SimpleToken] /[SimpleToken] :[SimpleToken] super[KeywordToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+Foo[StringToken]([BeginToken])[SimpleToken].[SimpleToken]/[SimpleToken] :[SimpleToken] super[KeywordToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+foo[StringToken]([BeginToken])[SimpleToken] /[SimpleToken] :[SimpleToken] super[KeywordToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+foo[StringToken]([BeginToken])[SimpleToken].[SimpleToken]/[SimpleToken] :[SimpleToken] super[KeywordToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+}[SimpleToken][SimpleToken]
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart
new file mode 100644
index 0000000..fd9a67c
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart
@@ -0,0 +1,14 @@
+class Foo {
+ void Foo() {
+ // Not OK.
+ }
+ void Foo() : initializer = true {
+ // Not OK.
+ }
+ void Foo.x() {
+ // Not OK.
+ }
+ void Foo.x() : initializer = true {
+ // Not OK.
+ }
+}
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.expect
new file mode 100644
index 0000000..e78442d
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.expect
@@ -0,0 +1,121 @@
+Problems reported:
+
+parser/error_recovery/constructor_recovery_return_type:2:3: Constructors can't have a return type.
+ void Foo() {
+ ^^^^
+
+parser/error_recovery/constructor_recovery_return_type:5:3: Constructors can't have a return type.
+ void Foo() : initializer = true {
+ ^^^^
+
+parser/error_recovery/constructor_recovery_return_type:8:3: Constructors can't have a return type.
+ void Foo.x() {
+ ^^^^
+
+parser/error_recovery/constructor_recovery_return_type:11:3: Constructors can't have a return type.
+ void Foo.x() : initializer = true {
+ ^^^^
+
+beginCompilationUnit(class)
+ beginMetadataStar(class)
+ endMetadataStar(0)
+ beginClassOrNamedMixinApplicationPrelude(class)
+ handleIdentifier(Foo, classOrMixinDeclaration)
+ handleNoTypeVariables({)
+ beginClassDeclaration(class, null, Foo)
+ handleNoType(Foo)
+ handleClassExtends(null)
+ handleClassNoWithClause()
+ handleClassOrMixinImplements(null, 0)
+ handleClassHeader(class, class, null)
+ beginClassOrMixinBody(DeclarationKind.Class, {)
+ beginMetadataStar(void)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, null, Foo)
+ handleVoidKeyword(void)
+ handleIdentifier(Foo, methodDeclaration)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ handleNoInitializers()
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(ConstructorWithReturnType, void, void)
+ endClassConstructor(null, void, (, null, })
+ endMember()
+ beginMetadataStar(void)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, null, Foo)
+ handleVoidKeyword(void)
+ handleIdentifier(Foo, methodDeclaration)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(initializer)
+ handleIdentifier(initializer, expression)
+ handleNoTypeArguments(=)
+ handleNoArguments(=)
+ handleSend(initializer, =)
+ handleLiteralBool(true)
+ handleAssignmentExpression(=)
+ endInitializer({)
+ endInitializers(1, :, {)
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(ConstructorWithReturnType, void, void)
+ endClassConstructor(null, void, (, :, })
+ endMember()
+ beginMetadataStar(void)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, null, Foo)
+ handleVoidKeyword(void)
+ handleIdentifier(Foo, methodDeclaration)
+ handleIdentifier(x, methodDeclarationContinuation)
+ handleQualified(.)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ handleNoInitializers()
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(ConstructorWithReturnType, void, void)
+ endClassConstructor(null, void, (, null, })
+ endMember()
+ beginMetadataStar(void)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, null, Foo)
+ handleVoidKeyword(void)
+ handleIdentifier(Foo, methodDeclaration)
+ handleIdentifier(x, methodDeclarationContinuation)
+ handleQualified(.)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(initializer)
+ handleIdentifier(initializer, expression)
+ handleNoTypeArguments(=)
+ handleNoArguments(=)
+ handleSend(initializer, =)
+ handleLiteralBool(true)
+ handleAssignmentExpression(=)
+ endInitializer({)
+ endInitializers(1, :, {)
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(ConstructorWithReturnType, void, void)
+ endClassConstructor(null, void, (, :, })
+ endMember()
+ endClassOrMixinBody(DeclarationKind.Class, 4, {, })
+ endClassDeclaration(class, })
+ endTopLevelDeclaration()
+endCompilationUnit(1, )
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.intertwined.expect
new file mode 100644
index 0000000..95de9da
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.intertwined.expect
@@ -0,0 +1,222 @@
+parseUnit(class)
+ skipErrorTokens(class)
+ listener: beginCompilationUnit(class)
+ syntheticPreviousToken(class)
+ parseTopLevelDeclarationImpl(, Instance of 'DirectiveContext')
+ parseMetadataStar()
+ listener: beginMetadataStar(class)
+ listener: endMetadataStar(0)
+ parseTopLevelKeywordDeclaration(, class, Instance of 'DirectiveContext')
+ parseClassDeclarationModifiers(, class)
+ parseClassOrNamedMixinApplication(null, class)
+ listener: beginClassOrNamedMixinApplicationPrelude(class)
+ ensureIdentifier(class, classOrMixinDeclaration)
+ listener: handleIdentifier(Foo, classOrMixinDeclaration)
+ listener: handleNoTypeVariables({)
+ listener: beginClassDeclaration(class, null, Foo)
+ parseClass(Foo, class, class, Foo)
+ parseClassHeaderOpt(Foo, class, class)
+ parseClassExtendsOpt(Foo)
+ listener: handleNoType(Foo)
+ listener: handleClassExtends(null)
+ parseWithClauseOpt(Foo)
+ listener: handleClassNoWithClause()
+ parseClassOrMixinImplementsOpt(Foo)
+ listener: handleClassOrMixinImplements(null, 0)
+ listener: handleClassHeader(class, class, null)
+ parseClassOrMixinOrExtensionBody(Foo, DeclarationKind.Class, Foo)
+ listener: beginClassOrMixinBody(DeclarationKind.Class, {)
+ notEofOrValue(}, void)
+ parseClassOrMixinOrExtensionMemberImpl({, DeclarationKind.Class, Foo)
+ parseMetadataStar({)
+ listener: beginMetadataStar(void)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod({, null, null, null, null, null, {, Instance of 'VoidType', null, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, null, Foo)
+ listener: handleVoidKeyword(void)
+ ensureIdentifier(void, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ parseMethodTypeVar(Foo)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(Foo, Foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(Foo, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ listener: handleNoInitializers()
+ parseAsyncModifierOpt())
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(), false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(void, ConstructorWithReturnType)
+ listener: handleRecoverableError(ConstructorWithReturnType, void, void)
+ listener: endClassConstructor(null, void, (, null, })
+ listener: endMember()
+ notEofOrValue(}, void)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(void)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'VoidType', null, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, null, Foo)
+ listener: handleVoidKeyword(void)
+ ensureIdentifier(void, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ parseMethodTypeVar(Foo)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(Foo, Foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(Foo, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(initializer)
+ parseInitializerExpressionRest(:)
+ parseExpression(:)
+ parsePrecedenceExpression(:, 1, true)
+ parseUnaryExpression(:, true)
+ parsePrimary(:, expression)
+ parseSendOrFunctionLiteral(:, expression)
+ parseSend(:, expression)
+ ensureIdentifier(:, expression)
+ listener: handleIdentifier(initializer, expression)
+ listener: handleNoTypeArguments(=)
+ parseArgumentsOpt(initializer)
+ listener: handleNoArguments(=)
+ listener: handleSend(initializer, =)
+ parsePrecedenceExpression(=, 1, true)
+ parseUnaryExpression(=, true)
+ parsePrimary(=, expression)
+ parseLiteralBool(=)
+ listener: handleLiteralBool(true)
+ listener: handleAssignmentExpression(=)
+ listener: endInitializer({)
+ listener: endInitializers(1, :, {)
+ parseAsyncModifierOpt(true)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(true, false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(void, ConstructorWithReturnType)
+ listener: handleRecoverableError(ConstructorWithReturnType, void, void)
+ listener: endClassConstructor(null, void, (, :, })
+ listener: endMember()
+ notEofOrValue(}, void)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(void)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'VoidType', null, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, null, Foo)
+ listener: handleVoidKeyword(void)
+ ensureIdentifier(void, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ parseQualifiedRest(Foo, methodDeclarationContinuation)
+ ensureIdentifier(., methodDeclarationContinuation)
+ listener: handleIdentifier(x, methodDeclarationContinuation)
+ listener: handleQualified(.)
+ parseMethodTypeVar(x)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(x, Foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(x, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ listener: handleNoInitializers()
+ parseAsyncModifierOpt())
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(), false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(void, ConstructorWithReturnType)
+ listener: handleRecoverableError(ConstructorWithReturnType, void, void)
+ listener: endClassConstructor(null, void, (, null, })
+ listener: endMember()
+ notEofOrValue(}, void)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(void)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'VoidType', null, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, null, Foo)
+ listener: handleVoidKeyword(void)
+ ensureIdentifier(void, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ parseQualifiedRest(Foo, methodDeclarationContinuation)
+ ensureIdentifier(., methodDeclarationContinuation)
+ listener: handleIdentifier(x, methodDeclarationContinuation)
+ listener: handleQualified(.)
+ parseMethodTypeVar(x)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(x, Foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(x, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(initializer)
+ parseInitializerExpressionRest(:)
+ parseExpression(:)
+ parsePrecedenceExpression(:, 1, true)
+ parseUnaryExpression(:, true)
+ parsePrimary(:, expression)
+ parseSendOrFunctionLiteral(:, expression)
+ parseSend(:, expression)
+ ensureIdentifier(:, expression)
+ listener: handleIdentifier(initializer, expression)
+ listener: handleNoTypeArguments(=)
+ parseArgumentsOpt(initializer)
+ listener: handleNoArguments(=)
+ listener: handleSend(initializer, =)
+ parsePrecedenceExpression(=, 1, true)
+ parseUnaryExpression(=, true)
+ parsePrimary(=, expression)
+ parseLiteralBool(=)
+ listener: handleLiteralBool(true)
+ listener: handleAssignmentExpression(=)
+ listener: endInitializer({)
+ listener: endInitializers(1, :, {)
+ parseAsyncModifierOpt(true)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(true, false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(void, ConstructorWithReturnType)
+ listener: handleRecoverableError(ConstructorWithReturnType, void, void)
+ listener: endClassConstructor(null, void, (, :, })
+ listener: endMember()
+ notEofOrValue(}, })
+ listener: endClassOrMixinBody(DeclarationKind.Class, 4, {, })
+ listener: endClassDeclaration(class, })
+ listener: endTopLevelDeclaration()
+ reportAllErrorTokens(class)
+ listener: endCompilationUnit(1, )
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.parser.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.parser.expect
new file mode 100644
index 0000000..3e724af
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.parser.expect
@@ -0,0 +1,31 @@
+class Foo {
+void Foo() {
+
+}
+void Foo() : initializer = true {
+
+}
+void Foo.x() {
+
+}
+void Foo.x() : initializer = true {
+
+}
+}
+
+
+class[KeywordToken] Foo[StringToken] {[BeginToken]
+void[KeywordToken] Foo[StringToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+void[KeywordToken] Foo[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+void[KeywordToken] Foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+void[KeywordToken] Foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+}[SimpleToken]
+[SimpleToken]
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.scanner.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.scanner.expect
new file mode 100644
index 0000000..3e724af
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.scanner.expect
@@ -0,0 +1,31 @@
+class Foo {
+void Foo() {
+
+}
+void Foo() : initializer = true {
+
+}
+void Foo.x() {
+
+}
+void Foo.x() : initializer = true {
+
+}
+}
+
+
+class[KeywordToken] Foo[StringToken] {[BeginToken]
+void[KeywordToken] Foo[StringToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+void[KeywordToken] Foo[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+void[KeywordToken] Foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+void[KeywordToken] Foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+}[SimpleToken]
+[SimpleToken]
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart
new file mode 100644
index 0000000..6f5b73e
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart
@@ -0,0 +1,14 @@
+class Foo {
+ set Foo() {
+ // Not OK.
+ }
+ set Foo() : initializer = true {
+ // Not OK.
+ }
+ set Foo.x() {
+ // Not OK.
+ }
+ set Foo.x() : initializer = true {
+ // Not OK.
+ }
+}
\ No newline at end of file
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.expect
new file mode 100644
index 0000000..4240ac2
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.expect
@@ -0,0 +1,121 @@
+Problems reported:
+
+parser/error_recovery/constructor_recovery_set:2:7: A class member can't have the same name as the enclosing class.
+ set Foo() {
+ ^^^
+
+parser/error_recovery/constructor_recovery_set:5:3: Constructors can't be a setter.
+ set Foo() : initializer = true {
+ ^^^
+
+parser/error_recovery/constructor_recovery_set:8:3: Constructors can't be a setter.
+ set Foo.x() {
+ ^^^
+
+parser/error_recovery/constructor_recovery_set:11:3: Constructors can't be a setter.
+ set Foo.x() : initializer = true {
+ ^^^
+
+beginCompilationUnit(class)
+ beginMetadataStar(class)
+ endMetadataStar(0)
+ beginClassOrNamedMixinApplicationPrelude(class)
+ handleIdentifier(Foo, classOrMixinDeclaration)
+ handleNoTypeVariables({)
+ beginClassDeclaration(class, null, Foo)
+ handleNoType(Foo)
+ handleClassExtends(null)
+ handleClassNoWithClause()
+ handleClassOrMixinImplements(null, 0)
+ handleClassHeader(class, class, null)
+ beginClassOrMixinBody(DeclarationKind.Class, {)
+ beginMetadataStar(set)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, set, Foo)
+ handleNoType({)
+ handleIdentifier(Foo, methodDeclaration)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ handleNoInitializers()
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(MemberWithSameNameAsClass, Foo, Foo)
+ endClassMethod(set, set, (, null, })
+ endMember()
+ beginMetadataStar(set)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, set, Foo)
+ handleNoType(})
+ handleIdentifier(Foo, methodDeclaration)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(initializer)
+ handleIdentifier(initializer, expression)
+ handleNoTypeArguments(=)
+ handleNoArguments(=)
+ handleSend(initializer, =)
+ handleLiteralBool(true)
+ handleAssignmentExpression(=)
+ endInitializer({)
+ endInitializers(1, :, {)
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(SetterConstructor, set, set)
+ endClassConstructor(set, set, (, :, })
+ endMember()
+ beginMetadataStar(set)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, set, Foo)
+ handleNoType(})
+ handleIdentifier(Foo, methodDeclaration)
+ handleIdentifier(x, methodDeclarationContinuation)
+ handleQualified(.)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ handleNoInitializers()
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(SetterConstructor, set, set)
+ endClassConstructor(set, set, (, null, })
+ endMember()
+ beginMetadataStar(set)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, set, Foo)
+ handleNoType(})
+ handleIdentifier(Foo, methodDeclaration)
+ handleIdentifier(x, methodDeclarationContinuation)
+ handleQualified(.)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(initializer)
+ handleIdentifier(initializer, expression)
+ handleNoTypeArguments(=)
+ handleNoArguments(=)
+ handleSend(initializer, =)
+ handleLiteralBool(true)
+ handleAssignmentExpression(=)
+ endInitializer({)
+ endInitializers(1, :, {)
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(SetterConstructor, set, set)
+ endClassConstructor(set, set, (, :, })
+ endMember()
+ endClassOrMixinBody(DeclarationKind.Class, 4, {, })
+ endClassDeclaration(class, })
+ endTopLevelDeclaration()
+endCompilationUnit(1, )
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.intertwined.expect
new file mode 100644
index 0000000..2d6459a
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.intertwined.expect
@@ -0,0 +1,222 @@
+parseUnit(class)
+ skipErrorTokens(class)
+ listener: beginCompilationUnit(class)
+ syntheticPreviousToken(class)
+ parseTopLevelDeclarationImpl(, Instance of 'DirectiveContext')
+ parseMetadataStar()
+ listener: beginMetadataStar(class)
+ listener: endMetadataStar(0)
+ parseTopLevelKeywordDeclaration(, class, Instance of 'DirectiveContext')
+ parseClassDeclarationModifiers(, class)
+ parseClassOrNamedMixinApplication(null, class)
+ listener: beginClassOrNamedMixinApplicationPrelude(class)
+ ensureIdentifier(class, classOrMixinDeclaration)
+ listener: handleIdentifier(Foo, classOrMixinDeclaration)
+ listener: handleNoTypeVariables({)
+ listener: beginClassDeclaration(class, null, Foo)
+ parseClass(Foo, class, class, Foo)
+ parseClassHeaderOpt(Foo, class, class)
+ parseClassExtendsOpt(Foo)
+ listener: handleNoType(Foo)
+ listener: handleClassExtends(null)
+ parseWithClauseOpt(Foo)
+ listener: handleClassNoWithClause()
+ parseClassOrMixinImplementsOpt(Foo)
+ listener: handleClassOrMixinImplements(null, 0)
+ listener: handleClassHeader(class, class, null)
+ parseClassOrMixinOrExtensionBody(Foo, DeclarationKind.Class, Foo)
+ listener: beginClassOrMixinBody(DeclarationKind.Class, {)
+ notEofOrValue(}, set)
+ parseClassOrMixinOrExtensionMemberImpl({, DeclarationKind.Class, Foo)
+ parseMetadataStar({)
+ listener: beginMetadataStar(set)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod({, null, null, null, null, null, {, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, set, Foo)
+ listener: handleNoType({)
+ ensureIdentifier(set, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(Foo, Foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(Foo, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ listener: handleNoInitializers()
+ parseAsyncModifierOpt())
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(), false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(Foo, MemberWithSameNameAsClass)
+ listener: handleRecoverableError(MemberWithSameNameAsClass, Foo, Foo)
+ listener: endClassMethod(set, set, (, null, })
+ listener: endMember()
+ notEofOrValue(}, set)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(set)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, set, Foo)
+ listener: handleNoType(})
+ ensureIdentifier(set, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(Foo, Foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(Foo, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(initializer)
+ parseInitializerExpressionRest(:)
+ parseExpression(:)
+ parsePrecedenceExpression(:, 1, true)
+ parseUnaryExpression(:, true)
+ parsePrimary(:, expression)
+ parseSendOrFunctionLiteral(:, expression)
+ parseSend(:, expression)
+ ensureIdentifier(:, expression)
+ listener: handleIdentifier(initializer, expression)
+ listener: handleNoTypeArguments(=)
+ parseArgumentsOpt(initializer)
+ listener: handleNoArguments(=)
+ listener: handleSend(initializer, =)
+ parsePrecedenceExpression(=, 1, true)
+ parseUnaryExpression(=, true)
+ parsePrimary(=, expression)
+ parseLiteralBool(=)
+ listener: handleLiteralBool(true)
+ listener: handleAssignmentExpression(=)
+ listener: endInitializer({)
+ listener: endInitializers(1, :, {)
+ parseAsyncModifierOpt(true)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(true, false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(set, SetterConstructor)
+ listener: handleRecoverableError(SetterConstructor, set, set)
+ listener: endClassConstructor(set, set, (, :, })
+ listener: endMember()
+ notEofOrValue(}, set)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(set)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, set, Foo)
+ listener: handleNoType(})
+ ensureIdentifier(set, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ parseQualifiedRest(Foo, methodDeclarationContinuation)
+ ensureIdentifier(., methodDeclarationContinuation)
+ listener: handleIdentifier(x, methodDeclarationContinuation)
+ listener: handleQualified(.)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(x, Foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(x, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ listener: handleNoInitializers()
+ parseAsyncModifierOpt())
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(), false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(set, SetterConstructor)
+ listener: handleRecoverableError(SetterConstructor, set, set)
+ listener: endClassConstructor(set, set, (, null, })
+ listener: endMember()
+ notEofOrValue(}, set)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, Foo)
+ parseMetadataStar(})
+ listener: beginMetadataStar(set)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo)
+ listener: beginMethod(null, null, null, null, set, Foo)
+ listener: handleNoType(})
+ ensureIdentifier(set, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ parseQualifiedRest(Foo, methodDeclarationContinuation)
+ ensureIdentifier(., methodDeclarationContinuation)
+ listener: handleIdentifier(x, methodDeclarationContinuation)
+ listener: handleQualified(.)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(x, Foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(x, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(initializer)
+ parseInitializerExpressionRest(:)
+ parseExpression(:)
+ parsePrecedenceExpression(:, 1, true)
+ parseUnaryExpression(:, true)
+ parsePrimary(:, expression)
+ parseSendOrFunctionLiteral(:, expression)
+ parseSend(:, expression)
+ ensureIdentifier(:, expression)
+ listener: handleIdentifier(initializer, expression)
+ listener: handleNoTypeArguments(=)
+ parseArgumentsOpt(initializer)
+ listener: handleNoArguments(=)
+ listener: handleSend(initializer, =)
+ parsePrecedenceExpression(=, 1, true)
+ parseUnaryExpression(=, true)
+ parsePrimary(=, expression)
+ parseLiteralBool(=)
+ listener: handleLiteralBool(true)
+ listener: handleAssignmentExpression(=)
+ listener: endInitializer({)
+ listener: endInitializers(1, :, {)
+ parseAsyncModifierOpt(true)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(true, false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(set, SetterConstructor)
+ listener: handleRecoverableError(SetterConstructor, set, set)
+ listener: endClassConstructor(set, set, (, :, })
+ listener: endMember()
+ notEofOrValue(}, })
+ listener: endClassOrMixinBody(DeclarationKind.Class, 4, {, })
+ listener: endClassDeclaration(class, })
+ listener: endTopLevelDeclaration()
+ reportAllErrorTokens(class)
+ listener: endCompilationUnit(1, )
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.parser.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.parser.expect
new file mode 100644
index 0000000..1a44a88
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.parser.expect
@@ -0,0 +1,29 @@
+class Foo {
+set Foo() {
+
+}
+set Foo() : initializer = true {
+
+}
+set Foo.x() {
+
+}
+set Foo.x() : initializer = true {
+
+}
+}
+
+class[KeywordToken] Foo[StringToken] {[BeginToken]
+set[KeywordToken] Foo[StringToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+set[KeywordToken] Foo[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+set[KeywordToken] Foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+set[KeywordToken] Foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+}[SimpleToken][SimpleToken]
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.scanner.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.scanner.expect
new file mode 100644
index 0000000..1a44a88
--- /dev/null
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.scanner.expect
@@ -0,0 +1,29 @@
+class Foo {
+set Foo() {
+
+}
+set Foo() : initializer = true {
+
+}
+set Foo.x() {
+
+}
+set Foo.x() : initializer = true {
+
+}
+}
+
+class[KeywordToken] Foo[StringToken] {[BeginToken]
+set[KeywordToken] Foo[StringToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+set[KeywordToken] Foo[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+set[KeywordToken] Foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] {[BeginToken]
+
+}[SimpleToken]
+set[KeywordToken] Foo[StringToken].[SimpleToken]x[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] initializer[StringToken] =[SimpleToken] true[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+}[SimpleToken][SimpleToken]
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_39202.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_39202.crash_dart.intertwined.expect
index 7698ac7..d73d799 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_39202.crash_dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_39202.crash_dart.intertwined.expect
@@ -74,7 +74,7 @@
listener: endMetadataStar(0)
parseTopLevelMemberImpl(;)
listener: beginTopLevelMember(b)
- parseFields(;, null, null, null, null, null, ;, Instance of 'ComplexTypeInfo', $, DeclarationKind.TopLevel)
+ parseFields(;, null, null, null, null, null, ;, Instance of 'ComplexTypeInfo', $, DeclarationKind.TopLevel, null)
ensureIdentifier(;, typeReference)
listener: handleIdentifier(b, typeReference)
listener: beginTypeArguments(<)
@@ -91,7 +91,7 @@
listener: handleRecoverableError(Message[ExpectedIdentifier, Expected an identifier, but got ''., null, {token: }], , )
rewriter()
listener: handleIdentifier(, topLevelVariableDeclaration)
- parseFieldInitializerOpt(, , null, null, DeclarationKind.TopLevel)
+ parseFieldInitializerOpt(, , null, null, DeclarationKind.TopLevel, null)
listener: handleNoFieldInitializer()
ensureSemicolon()
reportRecoverableError(, Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}])
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_39230.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_39230.crash_dart.expect
index eabc61b..1c9e85a 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_39230.crash_dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_39230.crash_dart.expect
@@ -12,6 +12,10 @@
/
^
+parser/error_recovery/issue_39230.crash:3:5: The name of a constructor must match the name of the enclosing class.
+ /
+ ^
+
beginCompilationUnit(class)
beginMetadataStar(class)
endMetadataStar(0)
@@ -62,7 +66,8 @@
endInitializers(1, :, ;)
handleAsyncModifier(null, null)
handleEmptyFunctionBody(;)
- endClassMethod(null, operator, (, :, ;)
+ handleRecoverableError(ConstructorWithWrongName, /, /)
+ endClassConstructor(null, operator, (, :, ;)
endMember()
endClassOrMixinBody(DeclarationKind.Class, 2, {, })
endClassDeclaration(class, })
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_39230.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_39230.crash_dart.intertwined.expect
index 1712509..739d7ab 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_39230.crash_dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_39230.crash_dart.intertwined.expect
@@ -114,7 +114,9 @@
inPlainSync()
parseFunctionBody(), false, true)
listener: handleEmptyFunctionBody(;)
- listener: endClassMethod(null, operator, (, :, ;)
+ reportRecoverableError(operator, ConstructorWithWrongName)
+ listener: handleRecoverableError(ConstructorWithWrongName, /, /)
+ listener: endClassConstructor(null, operator, (, :, ;)
listener: endMember()
notEofOrValue(}, })
listener: endClassOrMixinBody(DeclarationKind.Class, 2, {, })
diff --git a/pkg/front_end/parser_testcases/general/issue_41121.dart b/pkg/front_end/parser_testcases/general/issue_41121.dart
new file mode 100644
index 0000000..7f884e8
--- /dev/null
+++ b/pkg/front_end/parser_testcases/general/issue_41121.dart
@@ -0,0 +1,35 @@
+class ConfigurationService {
+ Configuration _configuration;
+
+ ConfigurationService(Configuration configuration)
+ : assert(configuration != null),
+ _configuration = configuration {
+ // Above is OK in the constructor.
+ }
+
+ void set configuration(Configuration configuration)
+ : assert(configuration != null),
+ _configuration = configuration {
+ // Above is NOT OK in a non-constructor.
+ }
+
+ Configuration get configuration
+ : assert(_configuration != null),
+ _configuration = _configuration.foo {
+ // Above is NOT OK in a non-constructor.
+ return _configuration;
+ }
+
+ void method() : _configuration = null {
+ // Above is NOT OK in a non-constructor.
+ }
+
+ Foo() : _configuration = null {
+ // Misnamed constructor.
+ // Expect and error for that, but then initializers are OK.
+ }
+}
+
+class Configuration {
+ Configuration get foo => this;
+}
diff --git a/pkg/front_end/parser_testcases/general/issue_41121.dart.expect b/pkg/front_end/parser_testcases/general/issue_41121.dart.expect
new file mode 100644
index 0000000..fbe9696
--- /dev/null
+++ b/pkg/front_end/parser_testcases/general/issue_41121.dart.expect
@@ -0,0 +1,303 @@
+Problems reported:
+
+parser/general/issue_41121:10:12: The name of a constructor must match the name of the enclosing class.
+ void set configuration(Configuration configuration)
+ ^^^^^^^^^^^^^
+
+parser/general/issue_41121:10:8: Constructors can't be a setter.
+ void set configuration(Configuration configuration)
+ ^^^
+
+parser/general/issue_41121:10:3: Constructors can't have a return type.
+ void set configuration(Configuration configuration)
+ ^^^^
+
+parser/general/issue_41121:16:21: A method declaration needs an explicit list of parameters.
+ Configuration get configuration
+ ^^^^^^^^^^^^^
+
+parser/general/issue_41121:16:21: The name of a constructor must match the name of the enclosing class.
+ Configuration get configuration
+ ^^^^^^^^^^^^^
+
+parser/general/issue_41121:16:17: Constructors can't be a getter.
+ Configuration get configuration
+ ^^^
+
+parser/general/issue_41121:16:3: Constructors can't have a return type.
+ Configuration get configuration
+ ^^^^^^^^^^^^^
+
+parser/general/issue_41121:23:8: The name of a constructor must match the name of the enclosing class.
+ void method() : _configuration = null {
+ ^^^^^^
+
+parser/general/issue_41121:23:3: Constructors can't have a return type.
+ void method() : _configuration = null {
+ ^^^^
+
+parser/general/issue_41121:27:3: The name of a constructor must match the name of the enclosing class.
+ Foo() : _configuration = null {
+ ^^^
+
+beginCompilationUnit(class)
+ beginMetadataStar(class)
+ endMetadataStar(0)
+ beginClassOrNamedMixinApplicationPrelude(class)
+ handleIdentifier(ConfigurationService, classOrMixinDeclaration)
+ handleNoTypeVariables({)
+ beginClassDeclaration(class, null, ConfigurationService)
+ handleNoType(ConfigurationService)
+ handleClassExtends(null)
+ handleClassNoWithClause()
+ handleClassOrMixinImplements(null, 0)
+ handleClassHeader(class, class, null)
+ beginClassOrMixinBody(DeclarationKind.Class, {)
+ beginMetadataStar(Configuration)
+ endMetadataStar(0)
+ beginMember()
+ handleIdentifier(Configuration, typeReference)
+ handleNoTypeArguments(_configuration)
+ handleType(Configuration, null)
+ handleIdentifier(_configuration, fieldDeclaration)
+ handleNoFieldInitializer(;)
+ endClassFields(null, null, null, null, 1, Configuration, ;)
+ endMember()
+ beginMetadataStar(ConfigurationService)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, null, ConfigurationService)
+ handleNoType(;)
+ handleIdentifier(ConfigurationService, methodDeclaration)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ beginMetadataStar(Configuration)
+ endMetadataStar(0)
+ beginFormalParameter(Configuration, MemberKind.NonStaticMethod, null, null, null)
+ handleIdentifier(Configuration, typeReference)
+ handleNoTypeArguments(configuration)
+ handleType(Configuration, null)
+ handleIdentifier(configuration, formalParameterDeclaration)
+ handleFormalParameterWithoutValue())
+ endFormalParameter(null, null, configuration, null, null, FormalParameterKind.mandatory, MemberKind.NonStaticMethod)
+ endFormalParameters(1, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(assert)
+ beginAssert(assert, Assert.Initializer)
+ handleIdentifier(configuration, expression)
+ handleNoTypeArguments(!=)
+ handleNoArguments(!=)
+ handleSend(configuration, !=)
+ beginBinaryExpression(!=)
+ handleLiteralNull(null)
+ endBinaryExpression(!=)
+ endAssert(assert, Assert.Initializer, (, null, ,)
+ endInitializer(,)
+ beginInitializer(_configuration)
+ handleIdentifier(_configuration, expression)
+ handleNoTypeArguments(=)
+ handleNoArguments(=)
+ handleSend(_configuration, =)
+ handleIdentifier(configuration, expression)
+ handleNoTypeArguments({)
+ handleNoArguments({)
+ handleSend(configuration, {)
+ handleAssignmentExpression(=)
+ endInitializer({)
+ endInitializers(2, :, {)
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ endClassConstructor(null, ConfigurationService, (, :, })
+ endMember()
+ beginMetadataStar(void)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, set, configuration)
+ handleVoidKeyword(void)
+ handleIdentifier(configuration, methodDeclaration)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ beginMetadataStar(Configuration)
+ endMetadataStar(0)
+ beginFormalParameter(Configuration, MemberKind.NonStaticMethod, null, null, null)
+ handleIdentifier(Configuration, typeReference)
+ handleNoTypeArguments(configuration)
+ handleType(Configuration, null)
+ handleIdentifier(configuration, formalParameterDeclaration)
+ handleFormalParameterWithoutValue())
+ endFormalParameter(null, null, configuration, null, null, FormalParameterKind.mandatory, MemberKind.NonStaticMethod)
+ endFormalParameters(1, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(assert)
+ beginAssert(assert, Assert.Initializer)
+ handleIdentifier(configuration, expression)
+ handleNoTypeArguments(!=)
+ handleNoArguments(!=)
+ handleSend(configuration, !=)
+ beginBinaryExpression(!=)
+ handleLiteralNull(null)
+ endBinaryExpression(!=)
+ endAssert(assert, Assert.Initializer, (, null, ,)
+ endInitializer(,)
+ beginInitializer(_configuration)
+ handleIdentifier(_configuration, expression)
+ handleNoTypeArguments(=)
+ handleNoArguments(=)
+ handleSend(_configuration, =)
+ handleIdentifier(configuration, expression)
+ handleNoTypeArguments({)
+ handleNoArguments({)
+ handleSend(configuration, {)
+ handleAssignmentExpression(=)
+ endInitializer({)
+ endInitializers(2, :, {)
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(ConstructorWithWrongName, configuration, configuration)
+ handleRecoverableError(SetterConstructor, set, set)
+ handleRecoverableError(ConstructorWithReturnType, void, void)
+ endClassConstructor(set, void, (, :, })
+ endMember()
+ beginMetadataStar(Configuration)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, get, configuration)
+ handleIdentifier(Configuration, typeReference)
+ handleNoTypeArguments(get)
+ handleType(Configuration, null)
+ handleIdentifier(configuration, methodDeclaration)
+ handleNoTypeVariables(:)
+ handleRecoverableError(MissingMethodParameters, configuration, configuration)
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(assert)
+ beginAssert(assert, Assert.Initializer)
+ handleIdentifier(_configuration, expression)
+ handleNoTypeArguments(!=)
+ handleNoArguments(!=)
+ handleSend(_configuration, !=)
+ beginBinaryExpression(!=)
+ handleLiteralNull(null)
+ endBinaryExpression(!=)
+ endAssert(assert, Assert.Initializer, (, null, ,)
+ endInitializer(,)
+ beginInitializer(_configuration)
+ handleIdentifier(_configuration, expression)
+ handleNoTypeArguments(=)
+ handleNoArguments(=)
+ handleSend(_configuration, =)
+ handleIdentifier(_configuration, expression)
+ handleNoTypeArguments(.)
+ handleNoArguments(.)
+ handleSend(_configuration, .)
+ handleIdentifier(foo, expressionContinuation)
+ handleNoTypeArguments({)
+ handleNoArguments({)
+ handleSend(foo, {)
+ endBinaryExpression(.)
+ handleAssignmentExpression(=)
+ endInitializer({)
+ endInitializers(2, :, {)
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ beginReturnStatement(return)
+ handleIdentifier(_configuration, expression)
+ handleNoTypeArguments(;)
+ handleNoArguments(;)
+ handleSend(_configuration, ;)
+ endReturnStatement(true, return, ;)
+ endBlockFunctionBody(1, {, })
+ handleRecoverableError(ConstructorWithWrongName, configuration, configuration)
+ handleRecoverableError(GetterConstructor, get, get)
+ handleRecoverableError(ConstructorWithReturnType, Configuration, Configuration)
+ endClassConstructor(get, Configuration, (, :, })
+ endMember()
+ beginMetadataStar(void)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, null, method)
+ handleVoidKeyword(void)
+ handleIdentifier(method, methodDeclaration)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(_configuration)
+ handleIdentifier(_configuration, expression)
+ handleNoTypeArguments(=)
+ handleNoArguments(=)
+ handleSend(_configuration, =)
+ handleLiteralNull(null)
+ handleAssignmentExpression(=)
+ endInitializer({)
+ endInitializers(1, :, {)
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(ConstructorWithWrongName, method, method)
+ handleRecoverableError(ConstructorWithReturnType, void, void)
+ endClassConstructor(null, void, (, :, })
+ endMember()
+ beginMetadataStar(Foo)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, null, Foo)
+ handleNoType(})
+ handleIdentifier(Foo, methodDeclaration)
+ handleNoTypeVariables(()
+ beginFormalParameters((, MemberKind.NonStaticMethod)
+ endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ beginInitializers(:)
+ beginInitializer(_configuration)
+ handleIdentifier(_configuration, expression)
+ handleNoTypeArguments(=)
+ handleNoArguments(=)
+ handleSend(_configuration, =)
+ handleLiteralNull(null)
+ handleAssignmentExpression(=)
+ endInitializer({)
+ endInitializers(1, :, {)
+ handleAsyncModifier(null, null)
+ beginBlockFunctionBody({)
+ endBlockFunctionBody(0, {, })
+ handleRecoverableError(ConstructorWithWrongName, Foo, Foo)
+ endClassConstructor(null, Foo, (, :, })
+ endMember()
+ endClassOrMixinBody(DeclarationKind.Class, 6, {, })
+ endClassDeclaration(class, })
+endTopLevelDeclaration(class)
+beginMetadataStar(class)
+endMetadataStar(0)
+beginClassOrNamedMixinApplicationPrelude(class)
+ handleIdentifier(Configuration, classOrMixinDeclaration)
+ handleNoTypeVariables({)
+ beginClassDeclaration(class, null, Configuration)
+ handleNoType(Configuration)
+ handleClassExtends(null)
+ handleClassNoWithClause()
+ handleClassOrMixinImplements(null, 0)
+ handleClassHeader(class, class, null)
+ beginClassOrMixinBody(DeclarationKind.Class, {)
+ beginMetadataStar(Configuration)
+ endMetadataStar(0)
+ beginMember()
+ beginMethod(null, null, null, null, get, foo)
+ handleIdentifier(Configuration, typeReference)
+ handleNoTypeArguments(get)
+ handleType(Configuration, null)
+ handleIdentifier(foo, methodDeclaration)
+ handleNoTypeVariables(=>)
+ handleNoFormalParameters(=>, MemberKind.NonStaticMethod)
+ handleNoInitializers()
+ handleAsyncModifier(null, null)
+ handleThisExpression(this, expression)
+ handleExpressionFunctionBody(=>, ;)
+ endClassMethod(get, Configuration, =>, null, ;)
+ endMember()
+ endClassOrMixinBody(DeclarationKind.Class, 1, {, })
+ endClassDeclaration(class, })
+endTopLevelDeclaration()
+endCompilationUnit(2, )
diff --git a/pkg/front_end/parser_testcases/general/issue_41121.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/issue_41121.dart.intertwined.expect
new file mode 100644
index 0000000..896f82c
--- /dev/null
+++ b/pkg/front_end/parser_testcases/general/issue_41121.dart.intertwined.expect
@@ -0,0 +1,560 @@
+parseUnit(class)
+ skipErrorTokens(class)
+ listener: beginCompilationUnit(class)
+ syntheticPreviousToken(class)
+ parseTopLevelDeclarationImpl(, Instance of 'DirectiveContext')
+ parseMetadataStar()
+ listener: beginMetadataStar(class)
+ listener: endMetadataStar(0)
+ parseTopLevelKeywordDeclaration(, class, Instance of 'DirectiveContext')
+ parseClassDeclarationModifiers(, class)
+ parseClassOrNamedMixinApplication(null, class)
+ listener: beginClassOrNamedMixinApplicationPrelude(class)
+ ensureIdentifier(class, classOrMixinDeclaration)
+ listener: handleIdentifier(ConfigurationService, classOrMixinDeclaration)
+ listener: handleNoTypeVariables({)
+ listener: beginClassDeclaration(class, null, ConfigurationService)
+ parseClass(ConfigurationService, class, class, ConfigurationService)
+ parseClassHeaderOpt(ConfigurationService, class, class)
+ parseClassExtendsOpt(ConfigurationService)
+ listener: handleNoType(ConfigurationService)
+ listener: handleClassExtends(null)
+ parseWithClauseOpt(ConfigurationService)
+ listener: handleClassNoWithClause()
+ parseClassOrMixinImplementsOpt(ConfigurationService)
+ listener: handleClassOrMixinImplements(null, 0)
+ listener: handleClassHeader(class, class, null)
+ parseClassOrMixinOrExtensionBody(ConfigurationService, DeclarationKind.Class, ConfigurationService)
+ listener: beginClassOrMixinBody(DeclarationKind.Class, {)
+ notEofOrValue(}, Configuration)
+ parseClassOrMixinOrExtensionMemberImpl({, DeclarationKind.Class, ConfigurationService)
+ parseMetadataStar({)
+ listener: beginMetadataStar(Configuration)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseFields({, null, null, null, null, null, {, Instance of 'SimpleType', _configuration, DeclarationKind.Class, ConfigurationService)
+ listener: handleIdentifier(Configuration, typeReference)
+ listener: handleNoTypeArguments(_configuration)
+ listener: handleType(Configuration, null)
+ ensureIdentifier(Configuration, fieldDeclaration)
+ listener: handleIdentifier(_configuration, fieldDeclaration)
+ parseFieldInitializerOpt(_configuration, _configuration, null, null, DeclarationKind.Class, ConfigurationService)
+ listener: handleNoFieldInitializer(;)
+ listener: endClassFields(null, null, null, null, 1, Configuration, ;)
+ listener: endMember()
+ notEofOrValue(}, ConfigurationService)
+ parseClassOrMixinOrExtensionMemberImpl(;, DeclarationKind.Class, ConfigurationService)
+ parseMetadataStar(;)
+ listener: beginMetadataStar(ConfigurationService)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(;, null, null, null, null, null, ;, Instance of 'NoType', null, ConfigurationService, DeclarationKind.Class, ConfigurationService)
+ listener: beginMethod(null, null, null, null, null, ConfigurationService)
+ listener: handleNoType(;)
+ ensureIdentifier(;, methodDeclaration)
+ listener: handleIdentifier(ConfigurationService, methodDeclaration)
+ parseQualifiedRestOpt(ConfigurationService, methodDeclarationContinuation)
+ parseMethodTypeVar(ConfigurationService)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(ConfigurationService, ConfigurationService, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(ConfigurationService, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ parseFormalParameter((, FormalParameterKind.mandatory, MemberKind.NonStaticMethod)
+ parseMetadataStar(()
+ listener: beginMetadataStar(Configuration)
+ listener: endMetadataStar(0)
+ listener: beginFormalParameter(Configuration, MemberKind.NonStaticMethod, null, null, null)
+ listener: handleIdentifier(Configuration, typeReference)
+ listener: handleNoTypeArguments(configuration)
+ listener: handleType(Configuration, null)
+ ensureIdentifier(Configuration, formalParameterDeclaration)
+ listener: handleIdentifier(configuration, formalParameterDeclaration)
+ listener: handleFormalParameterWithoutValue())
+ listener: endFormalParameter(null, null, configuration, null, null, FormalParameterKind.mandatory, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(1, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(assert)
+ parseAssert(:, Assert.Initializer)
+ listener: beginAssert(assert, Assert.Initializer)
+ parseExpression(()
+ parsePrecedenceExpression((, 1, true)
+ parseUnaryExpression((, true)
+ parsePrimary((, expression)
+ parseSendOrFunctionLiteral((, expression)
+ parseSend((, expression)
+ ensureIdentifier((, expression)
+ listener: handleIdentifier(configuration, expression)
+ listener: handleNoTypeArguments(!=)
+ parseArgumentsOpt(configuration)
+ listener: handleNoArguments(!=)
+ listener: handleSend(configuration, !=)
+ listener: beginBinaryExpression(!=)
+ parsePrecedenceExpression(!=, 8, true)
+ parseUnaryExpression(!=, true)
+ parsePrimary(!=, expression)
+ parseLiteralNull(!=)
+ listener: handleLiteralNull(null)
+ listener: endBinaryExpression(!=)
+ listener: endAssert(assert, Assert.Initializer, (, null, ,)
+ listener: endInitializer(,)
+ parseInitializer(,)
+ listener: beginInitializer(_configuration)
+ parseInitializerExpressionRest(,)
+ parseExpression(,)
+ parsePrecedenceExpression(,, 1, true)
+ parseUnaryExpression(,, true)
+ parsePrimary(,, expression)
+ parseSendOrFunctionLiteral(,, expression)
+ parseSend(,, expression)
+ ensureIdentifier(,, expression)
+ listener: handleIdentifier(_configuration, expression)
+ listener: handleNoTypeArguments(=)
+ parseArgumentsOpt(_configuration)
+ listener: handleNoArguments(=)
+ listener: handleSend(_configuration, =)
+ parsePrecedenceExpression(=, 1, true)
+ parseUnaryExpression(=, true)
+ parsePrimary(=, expression)
+ parseSendOrFunctionLiteral(=, expression)
+ parseSend(=, expression)
+ ensureIdentifier(=, expression)
+ listener: handleIdentifier(configuration, expression)
+ listener: handleNoTypeArguments({)
+ parseArgumentsOpt(configuration)
+ listener: handleNoArguments({)
+ listener: handleSend(configuration, {)
+ listener: handleAssignmentExpression(=)
+ listener: endInitializer({)
+ listener: endInitializers(2, :, {)
+ parseAsyncModifierOpt(configuration)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(configuration, false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ listener: endClassConstructor(null, ConfigurationService, (, :, })
+ listener: endMember()
+ notEofOrValue(}, void)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, ConfigurationService)
+ parseMetadataStar(})
+ listener: beginMetadataStar(void)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'VoidType', set, configuration, DeclarationKind.Class, ConfigurationService)
+ listener: beginMethod(null, null, null, null, set, configuration)
+ listener: handleVoidKeyword(void)
+ ensureIdentifier(set, methodDeclaration)
+ listener: handleIdentifier(configuration, methodDeclaration)
+ parseQualifiedRestOpt(configuration, methodDeclarationContinuation)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(configuration, configuration, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(configuration, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ parseFormalParameter((, FormalParameterKind.mandatory, MemberKind.NonStaticMethod)
+ parseMetadataStar(()
+ listener: beginMetadataStar(Configuration)
+ listener: endMetadataStar(0)
+ listener: beginFormalParameter(Configuration, MemberKind.NonStaticMethod, null, null, null)
+ listener: handleIdentifier(Configuration, typeReference)
+ listener: handleNoTypeArguments(configuration)
+ listener: handleType(Configuration, null)
+ ensureIdentifier(Configuration, formalParameterDeclaration)
+ listener: handleIdentifier(configuration, formalParameterDeclaration)
+ listener: handleFormalParameterWithoutValue())
+ listener: endFormalParameter(null, null, configuration, null, null, FormalParameterKind.mandatory, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(1, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(assert)
+ parseAssert(:, Assert.Initializer)
+ listener: beginAssert(assert, Assert.Initializer)
+ parseExpression(()
+ parsePrecedenceExpression((, 1, true)
+ parseUnaryExpression((, true)
+ parsePrimary((, expression)
+ parseSendOrFunctionLiteral((, expression)
+ parseSend((, expression)
+ ensureIdentifier((, expression)
+ listener: handleIdentifier(configuration, expression)
+ listener: handleNoTypeArguments(!=)
+ parseArgumentsOpt(configuration)
+ listener: handleNoArguments(!=)
+ listener: handleSend(configuration, !=)
+ listener: beginBinaryExpression(!=)
+ parsePrecedenceExpression(!=, 8, true)
+ parseUnaryExpression(!=, true)
+ parsePrimary(!=, expression)
+ parseLiteralNull(!=)
+ listener: handleLiteralNull(null)
+ listener: endBinaryExpression(!=)
+ listener: endAssert(assert, Assert.Initializer, (, null, ,)
+ listener: endInitializer(,)
+ parseInitializer(,)
+ listener: beginInitializer(_configuration)
+ parseInitializerExpressionRest(,)
+ parseExpression(,)
+ parsePrecedenceExpression(,, 1, true)
+ parseUnaryExpression(,, true)
+ parsePrimary(,, expression)
+ parseSendOrFunctionLiteral(,, expression)
+ parseSend(,, expression)
+ ensureIdentifier(,, expression)
+ listener: handleIdentifier(_configuration, expression)
+ listener: handleNoTypeArguments(=)
+ parseArgumentsOpt(_configuration)
+ listener: handleNoArguments(=)
+ listener: handleSend(_configuration, =)
+ parsePrecedenceExpression(=, 1, true)
+ parseUnaryExpression(=, true)
+ parsePrimary(=, expression)
+ parseSendOrFunctionLiteral(=, expression)
+ parseSend(=, expression)
+ ensureIdentifier(=, expression)
+ listener: handleIdentifier(configuration, expression)
+ listener: handleNoTypeArguments({)
+ parseArgumentsOpt(configuration)
+ listener: handleNoArguments({)
+ listener: handleSend(configuration, {)
+ listener: handleAssignmentExpression(=)
+ listener: endInitializer({)
+ listener: endInitializers(2, :, {)
+ parseAsyncModifierOpt(configuration)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(configuration, false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(configuration, ConstructorWithWrongName)
+ listener: handleRecoverableError(ConstructorWithWrongName, configuration, configuration)
+ reportRecoverableError(set, SetterConstructor)
+ listener: handleRecoverableError(SetterConstructor, set, set)
+ reportRecoverableError(void, ConstructorWithReturnType)
+ listener: handleRecoverableError(ConstructorWithReturnType, void, void)
+ listener: endClassConstructor(set, void, (, :, })
+ listener: endMember()
+ notEofOrValue(}, Configuration)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, ConfigurationService)
+ parseMetadataStar(})
+ listener: beginMetadataStar(Configuration)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', get, configuration, DeclarationKind.Class, ConfigurationService)
+ listener: beginMethod(null, null, null, null, get, configuration)
+ listener: handleIdentifier(Configuration, typeReference)
+ listener: handleNoTypeArguments(get)
+ listener: handleType(Configuration, null)
+ ensureIdentifier(get, methodDeclaration)
+ listener: handleIdentifier(configuration, methodDeclaration)
+ parseQualifiedRestOpt(configuration, methodDeclarationContinuation)
+ listener: handleNoTypeVariables(:)
+ parseGetterOrFormalParameters(configuration, configuration, false, MemberKind.NonStaticMethod)
+ missingParameterMessage(MemberKind.NonStaticMethod)
+ reportRecoverableError(configuration, MissingMethodParameters)
+ listener: handleRecoverableError(MissingMethodParameters, configuration, configuration)
+ rewriter()
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(assert)
+ parseAssert(:, Assert.Initializer)
+ listener: beginAssert(assert, Assert.Initializer)
+ parseExpression(()
+ parsePrecedenceExpression((, 1, true)
+ parseUnaryExpression((, true)
+ parsePrimary((, expression)
+ parseSendOrFunctionLiteral((, expression)
+ parseSend((, expression)
+ ensureIdentifier((, expression)
+ listener: handleIdentifier(_configuration, expression)
+ listener: handleNoTypeArguments(!=)
+ parseArgumentsOpt(_configuration)
+ listener: handleNoArguments(!=)
+ listener: handleSend(_configuration, !=)
+ listener: beginBinaryExpression(!=)
+ parsePrecedenceExpression(!=, 8, true)
+ parseUnaryExpression(!=, true)
+ parsePrimary(!=, expression)
+ parseLiteralNull(!=)
+ listener: handleLiteralNull(null)
+ listener: endBinaryExpression(!=)
+ listener: endAssert(assert, Assert.Initializer, (, null, ,)
+ listener: endInitializer(,)
+ parseInitializer(,)
+ listener: beginInitializer(_configuration)
+ parseInitializerExpressionRest(,)
+ parseExpression(,)
+ parsePrecedenceExpression(,, 1, true)
+ parseUnaryExpression(,, true)
+ parsePrimary(,, expression)
+ parseSendOrFunctionLiteral(,, expression)
+ parseSend(,, expression)
+ ensureIdentifier(,, expression)
+ listener: handleIdentifier(_configuration, expression)
+ listener: handleNoTypeArguments(=)
+ parseArgumentsOpt(_configuration)
+ listener: handleNoArguments(=)
+ listener: handleSend(_configuration, =)
+ parsePrecedenceExpression(=, 1, true)
+ parseUnaryExpression(=, true)
+ parsePrimary(=, expression)
+ parseSendOrFunctionLiteral(=, expression)
+ parseSend(=, expression)
+ ensureIdentifier(=, expression)
+ listener: handleIdentifier(_configuration, expression)
+ listener: handleNoTypeArguments(.)
+ parseArgumentsOpt(_configuration)
+ listener: handleNoArguments(.)
+ listener: handleSend(_configuration, .)
+ parsePrimary(., expressionContinuation)
+ parseSendOrFunctionLiteral(., expressionContinuation)
+ parseSend(., expressionContinuation)
+ ensureIdentifier(., expressionContinuation)
+ listener: handleIdentifier(foo, expressionContinuation)
+ listener: handleNoTypeArguments({)
+ parseArgumentsOpt(foo)
+ listener: handleNoArguments({)
+ listener: handleSend(foo, {)
+ listener: endBinaryExpression(.)
+ listener: handleAssignmentExpression(=)
+ listener: endInitializer({)
+ listener: endInitializers(2, :, {)
+ parseAsyncModifierOpt(foo)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(foo, false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, return)
+ parseStatement({)
+ parseStatementX({)
+ parseReturnStatement({)
+ listener: beginReturnStatement(return)
+ parseExpression(return)
+ parsePrecedenceExpression(return, 1, true)
+ parseUnaryExpression(return, true)
+ parsePrimary(return, expression)
+ parseSendOrFunctionLiteral(return, expression)
+ parseSend(return, expression)
+ ensureIdentifier(return, expression)
+ listener: handleIdentifier(_configuration, expression)
+ listener: handleNoTypeArguments(;)
+ parseArgumentsOpt(_configuration)
+ listener: handleNoArguments(;)
+ listener: handleSend(_configuration, ;)
+ ensureSemicolon(_configuration)
+ listener: endReturnStatement(true, return, ;)
+ inGenerator()
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(1, {, })
+ reportRecoverableError(configuration, ConstructorWithWrongName)
+ listener: handleRecoverableError(ConstructorWithWrongName, configuration, configuration)
+ reportRecoverableError(get, GetterConstructor)
+ listener: handleRecoverableError(GetterConstructor, get, get)
+ reportRecoverableError(Configuration, ConstructorWithReturnType)
+ listener: handleRecoverableError(ConstructorWithReturnType, Configuration, Configuration)
+ listener: endClassConstructor(get, Configuration, (, :, })
+ listener: endMember()
+ notEofOrValue(}, void)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, ConfigurationService)
+ parseMetadataStar(})
+ listener: beginMetadataStar(void)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'VoidType', null, method, DeclarationKind.Class, ConfigurationService)
+ listener: beginMethod(null, null, null, null, null, method)
+ listener: handleVoidKeyword(void)
+ ensureIdentifier(void, methodDeclaration)
+ listener: handleIdentifier(method, methodDeclaration)
+ parseQualifiedRestOpt(method, methodDeclarationContinuation)
+ parseMethodTypeVar(method)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(method, method, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(method, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(_configuration)
+ parseInitializerExpressionRest(:)
+ parseExpression(:)
+ parsePrecedenceExpression(:, 1, true)
+ parseUnaryExpression(:, true)
+ parsePrimary(:, expression)
+ parseSendOrFunctionLiteral(:, expression)
+ parseSend(:, expression)
+ ensureIdentifier(:, expression)
+ listener: handleIdentifier(_configuration, expression)
+ listener: handleNoTypeArguments(=)
+ parseArgumentsOpt(_configuration)
+ listener: handleNoArguments(=)
+ listener: handleSend(_configuration, =)
+ parsePrecedenceExpression(=, 1, true)
+ parseUnaryExpression(=, true)
+ parsePrimary(=, expression)
+ parseLiteralNull(=)
+ listener: handleLiteralNull(null)
+ listener: handleAssignmentExpression(=)
+ listener: endInitializer({)
+ listener: endInitializers(1, :, {)
+ parseAsyncModifierOpt(null)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(null, false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(method, ConstructorWithWrongName)
+ listener: handleRecoverableError(ConstructorWithWrongName, method, method)
+ reportRecoverableError(void, ConstructorWithReturnType)
+ listener: handleRecoverableError(ConstructorWithReturnType, void, void)
+ listener: endClassConstructor(null, void, (, :, })
+ listener: endMember()
+ notEofOrValue(}, Foo)
+ parseClassOrMixinOrExtensionMemberImpl(}, DeclarationKind.Class, ConfigurationService)
+ parseMetadataStar(})
+ listener: beginMetadataStar(Foo)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', null, Foo, DeclarationKind.Class, ConfigurationService)
+ listener: beginMethod(null, null, null, null, null, Foo)
+ listener: handleNoType(})
+ ensureIdentifier(}, methodDeclaration)
+ listener: handleIdentifier(Foo, methodDeclaration)
+ parseQualifiedRestOpt(Foo, methodDeclarationContinuation)
+ parseMethodTypeVar(Foo)
+ listener: handleNoTypeVariables(()
+ parseGetterOrFormalParameters(Foo, Foo, false, MemberKind.NonStaticMethod)
+ parseFormalParameters(Foo, MemberKind.NonStaticMethod)
+ parseFormalParametersRest((, MemberKind.NonStaticMethod)
+ listener: beginFormalParameters((, MemberKind.NonStaticMethod)
+ listener: endFormalParameters(0, (, ), MemberKind.NonStaticMethod)
+ parseInitializersOpt())
+ parseInitializers(:)
+ listener: beginInitializers(:)
+ parseInitializer(:)
+ listener: beginInitializer(_configuration)
+ parseInitializerExpressionRest(:)
+ parseExpression(:)
+ parsePrecedenceExpression(:, 1, true)
+ parseUnaryExpression(:, true)
+ parsePrimary(:, expression)
+ parseSendOrFunctionLiteral(:, expression)
+ parseSend(:, expression)
+ ensureIdentifier(:, expression)
+ listener: handleIdentifier(_configuration, expression)
+ listener: handleNoTypeArguments(=)
+ parseArgumentsOpt(_configuration)
+ listener: handleNoArguments(=)
+ listener: handleSend(_configuration, =)
+ parsePrecedenceExpression(=, 1, true)
+ parseUnaryExpression(=, true)
+ parsePrimary(=, expression)
+ parseLiteralNull(=)
+ listener: handleLiteralNull(null)
+ listener: handleAssignmentExpression(=)
+ listener: endInitializer({)
+ listener: endInitializers(1, :, {)
+ parseAsyncModifierOpt(null)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(null, false, true)
+ listener: beginBlockFunctionBody({)
+ notEofOrValue(}, })
+ listener: endBlockFunctionBody(0, {, })
+ reportRecoverableError(Foo, ConstructorWithWrongName)
+ listener: handleRecoverableError(ConstructorWithWrongName, Foo, Foo)
+ listener: endClassConstructor(null, Foo, (, :, })
+ listener: endMember()
+ notEofOrValue(}, })
+ listener: endClassOrMixinBody(DeclarationKind.Class, 6, {, })
+ listener: endClassDeclaration(class, })
+ listener: endTopLevelDeclaration(class)
+ parseTopLevelDeclarationImpl(}, Instance of 'DirectiveContext')
+ parseMetadataStar(})
+ listener: beginMetadataStar(class)
+ listener: endMetadataStar(0)
+ parseTopLevelKeywordDeclaration(}, class, Instance of 'DirectiveContext')
+ parseClassDeclarationModifiers(}, class)
+ parseClassOrNamedMixinApplication(null, class)
+ listener: beginClassOrNamedMixinApplicationPrelude(class)
+ ensureIdentifier(class, classOrMixinDeclaration)
+ listener: handleIdentifier(Configuration, classOrMixinDeclaration)
+ listener: handleNoTypeVariables({)
+ listener: beginClassDeclaration(class, null, Configuration)
+ parseClass(Configuration, class, class, Configuration)
+ parseClassHeaderOpt(Configuration, class, class)
+ parseClassExtendsOpt(Configuration)
+ listener: handleNoType(Configuration)
+ listener: handleClassExtends(null)
+ parseWithClauseOpt(Configuration)
+ listener: handleClassNoWithClause()
+ parseClassOrMixinImplementsOpt(Configuration)
+ listener: handleClassOrMixinImplements(null, 0)
+ listener: handleClassHeader(class, class, null)
+ parseClassOrMixinOrExtensionBody(Configuration, DeclarationKind.Class, Configuration)
+ listener: beginClassOrMixinBody(DeclarationKind.Class, {)
+ notEofOrValue(}, Configuration)
+ parseClassOrMixinOrExtensionMemberImpl({, DeclarationKind.Class, Configuration)
+ parseMetadataStar({)
+ listener: beginMetadataStar(Configuration)
+ listener: endMetadataStar(0)
+ listener: beginMember()
+ parseMethod({, null, null, null, null, null, {, Instance of 'SimpleType', get, foo, DeclarationKind.Class, Configuration)
+ listener: beginMethod(null, null, null, null, get, foo)
+ listener: handleIdentifier(Configuration, typeReference)
+ listener: handleNoTypeArguments(get)
+ listener: handleType(Configuration, null)
+ ensureIdentifier(get, methodDeclaration)
+ listener: handleIdentifier(foo, methodDeclaration)
+ parseQualifiedRestOpt(foo, methodDeclarationContinuation)
+ listener: handleNoTypeVariables(=>)
+ parseGetterOrFormalParameters(foo, foo, true, MemberKind.NonStaticMethod)
+ listener: handleNoFormalParameters(=>, MemberKind.NonStaticMethod)
+ parseInitializersOpt(foo)
+ listener: handleNoInitializers()
+ parseAsyncModifierOpt(foo)
+ listener: handleAsyncModifier(null, null)
+ inPlainSync()
+ inPlainSync()
+ inPlainSync()
+ parseFunctionBody(foo, false, true)
+ parseExpressionFunctionBody(=>, false)
+ parseExpression(=>)
+ parsePrecedenceExpression(=>, 1, true)
+ parseUnaryExpression(=>, true)
+ parsePrimary(=>, expression)
+ parseThisExpression(=>, expression)
+ listener: handleThisExpression(this, expression)
+ ensureSemicolon(this)
+ listener: handleExpressionFunctionBody(=>, ;)
+ inGenerator()
+ listener: endClassMethod(get, Configuration, =>, null, ;)
+ listener: endMember()
+ notEofOrValue(}, })
+ listener: endClassOrMixinBody(DeclarationKind.Class, 1, {, })
+ listener: endClassDeclaration(class, })
+ listener: endTopLevelDeclaration()
+ reportAllErrorTokens(class)
+ listener: endCompilationUnit(2, )
diff --git a/pkg/front_end/parser_testcases/general/issue_41121.dart.parser.expect b/pkg/front_end/parser_testcases/general/issue_41121.dart.parser.expect
new file mode 100644
index 0000000..cad6281
--- /dev/null
+++ b/pkg/front_end/parser_testcases/general/issue_41121.dart.parser.expect
@@ -0,0 +1,75 @@
+NOTICE: Stream was rewritten by parser!
+
+class ConfigurationService {
+Configuration _configuration;
+
+ConfigurationService(Configuration configuration)
+: assert(configuration != null),
+_configuration = configuration {
+
+}
+
+void set configuration(Configuration configuration)
+: assert(configuration != null),
+_configuration = configuration {
+
+}
+
+Configuration get configuration
+(): assert(_configuration != null),
+_configuration = _configuration.foo {
+
+return _configuration;
+}
+
+void method() : _configuration = null {
+
+}
+
+Foo() : _configuration = null {
+
+
+}
+}
+
+class Configuration {
+Configuration get foo => this;
+}
+
+
+class[KeywordToken] ConfigurationService[StringToken] {[BeginToken]
+Configuration[StringToken] _configuration[StringToken];[SimpleToken]
+
+ConfigurationService[StringToken]([BeginToken]Configuration[StringToken] configuration[StringToken])[SimpleToken]
+:[SimpleToken] assert[KeywordToken]([BeginToken]configuration[StringToken] !=[SimpleToken] null[KeywordToken])[SimpleToken],[SimpleToken]
+_configuration[StringToken] =[SimpleToken] configuration[StringToken] {[BeginToken]
+
+}[SimpleToken]
+
+void[KeywordToken] set[KeywordToken] configuration[StringToken]([BeginToken]Configuration[StringToken] configuration[StringToken])[SimpleToken]
+:[SimpleToken] assert[KeywordToken]([BeginToken]configuration[StringToken] !=[SimpleToken] null[KeywordToken])[SimpleToken],[SimpleToken]
+_configuration[StringToken] =[SimpleToken] configuration[StringToken] {[BeginToken]
+
+}[SimpleToken]
+
+Configuration[StringToken] get[KeywordToken] configuration[StringToken]
+([SyntheticBeginToken])[SyntheticToken]:[SimpleToken] assert[KeywordToken]([BeginToken]_configuration[StringToken] !=[SimpleToken] null[KeywordToken])[SimpleToken],[SimpleToken]
+_configuration[StringToken] =[SimpleToken] _configuration[StringToken].[SimpleToken]foo[StringToken] {[BeginToken]
+
+return[KeywordToken] _configuration[StringToken];[SimpleToken]
+}[SimpleToken]
+
+void[KeywordToken] method[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] _configuration[StringToken] =[SimpleToken] null[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+
+Foo[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] _configuration[StringToken] =[SimpleToken] null[KeywordToken] {[BeginToken]
+
+
+}[SimpleToken]
+}[SimpleToken]
+
+class[KeywordToken] Configuration[StringToken] {[BeginToken]
+Configuration[StringToken] get[KeywordToken] foo[StringToken] =>[SimpleToken] this[KeywordToken];[SimpleToken]
+}[SimpleToken]
+[SimpleToken]
diff --git a/pkg/front_end/parser_testcases/general/issue_41121.dart.scanner.expect b/pkg/front_end/parser_testcases/general/issue_41121.dart.scanner.expect
new file mode 100644
index 0000000..059f705
--- /dev/null
+++ b/pkg/front_end/parser_testcases/general/issue_41121.dart.scanner.expect
@@ -0,0 +1,73 @@
+class ConfigurationService {
+Configuration _configuration;
+
+ConfigurationService(Configuration configuration)
+: assert(configuration != null),
+_configuration = configuration {
+
+}
+
+void set configuration(Configuration configuration)
+: assert(configuration != null),
+_configuration = configuration {
+
+}
+
+Configuration get configuration
+: assert(_configuration != null),
+_configuration = _configuration.foo {
+
+return _configuration;
+}
+
+void method() : _configuration = null {
+
+}
+
+Foo() : _configuration = null {
+
+
+}
+}
+
+class Configuration {
+Configuration get foo => this;
+}
+
+
+class[KeywordToken] ConfigurationService[StringToken] {[BeginToken]
+Configuration[StringToken] _configuration[StringToken];[SimpleToken]
+
+ConfigurationService[StringToken]([BeginToken]Configuration[StringToken] configuration[StringToken])[SimpleToken]
+:[SimpleToken] assert[KeywordToken]([BeginToken]configuration[StringToken] !=[SimpleToken] null[KeywordToken])[SimpleToken],[SimpleToken]
+_configuration[StringToken] =[SimpleToken] configuration[StringToken] {[BeginToken]
+
+}[SimpleToken]
+
+void[KeywordToken] set[KeywordToken] configuration[StringToken]([BeginToken]Configuration[StringToken] configuration[StringToken])[SimpleToken]
+:[SimpleToken] assert[KeywordToken]([BeginToken]configuration[StringToken] !=[SimpleToken] null[KeywordToken])[SimpleToken],[SimpleToken]
+_configuration[StringToken] =[SimpleToken] configuration[StringToken] {[BeginToken]
+
+}[SimpleToken]
+
+Configuration[StringToken] get[KeywordToken] configuration[StringToken]
+:[SimpleToken] assert[KeywordToken]([BeginToken]_configuration[StringToken] !=[SimpleToken] null[KeywordToken])[SimpleToken],[SimpleToken]
+_configuration[StringToken] =[SimpleToken] _configuration[StringToken].[SimpleToken]foo[StringToken] {[BeginToken]
+
+return[KeywordToken] _configuration[StringToken];[SimpleToken]
+}[SimpleToken]
+
+void[KeywordToken] method[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] _configuration[StringToken] =[SimpleToken] null[KeywordToken] {[BeginToken]
+
+}[SimpleToken]
+
+Foo[StringToken]([BeginToken])[SimpleToken] :[SimpleToken] _configuration[StringToken] =[SimpleToken] null[KeywordToken] {[BeginToken]
+
+
+}[SimpleToken]
+}[SimpleToken]
+
+class[KeywordToken] Configuration[StringToken] {[BeginToken]
+Configuration[StringToken] get[KeywordToken] foo[StringToken] =>[SimpleToken] this[KeywordToken];[SimpleToken]
+}[SimpleToken]
+[SimpleToken]
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39858.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_39858.dart.intertwined.expect
index ac34652..2361dfa 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_39858.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_39858.dart.intertwined.expect
@@ -32,13 +32,13 @@
listener: beginMetadataStar(late)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields({, null, null, null, late, null, late, Instance of 'NoType', x1, DeclarationKind.Class)
+ parseFields({, null, null, null, late, null, late, Instance of 'NoType', x1, DeclarationKind.Class, X)
reportRecoverableError(x1, MissingConstFinalVarOrType)
listener: handleRecoverableError(MissingConstFinalVarOrType, x1, x1)
listener: handleNoType(late)
ensureIdentifier(late, fieldDeclaration)
listener: handleIdentifier(x1, fieldDeclaration)
- parseFieldInitializerOpt(x1, x1, late, null, DeclarationKind.Class)
+ parseFieldInitializerOpt(x1, x1, late, null, DeclarationKind.Class, X)
listener: handleNoFieldInitializer(;)
listener: endClassFields(null, null, late, null, 1, late, ;)
listener: endMember()
@@ -48,13 +48,13 @@
listener: beginMetadataStar(static)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields(;, null, static, null, late, null, late, Instance of 'NoType', x2, DeclarationKind.Class)
+ parseFields(;, null, static, null, late, null, late, Instance of 'NoType', x2, DeclarationKind.Class, X)
reportRecoverableError(x2, MissingConstFinalVarOrType)
listener: handleRecoverableError(MissingConstFinalVarOrType, x2, x2)
listener: handleNoType(late)
ensureIdentifier(late, fieldDeclaration)
listener: handleIdentifier(x2, fieldDeclaration)
- parseFieldInitializerOpt(x2, x2, late, null, DeclarationKind.Class)
+ parseFieldInitializerOpt(x2, x2, late, null, DeclarationKind.Class, X)
listener: handleNoFieldInitializer(;)
listener: endClassFields(static, null, late, null, 1, static, ;)
listener: endMember()
@@ -64,13 +64,13 @@
listener: beginMetadataStar(covariant)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields(;, null, null, covariant, late, null, late, Instance of 'NoType', x3, DeclarationKind.Class)
+ parseFields(;, null, null, covariant, late, null, late, Instance of 'NoType', x3, DeclarationKind.Class, X)
reportRecoverableError(x3, MissingConstFinalVarOrType)
listener: handleRecoverableError(MissingConstFinalVarOrType, x3, x3)
listener: handleNoType(late)
ensureIdentifier(late, fieldDeclaration)
listener: handleIdentifier(x3, fieldDeclaration)
- parseFieldInitializerOpt(x3, x3, late, null, DeclarationKind.Class)
+ parseFieldInitializerOpt(x3, x3, late, null, DeclarationKind.Class, X)
listener: handleNoFieldInitializer(;)
listener: endClassFields(null, covariant, late, null, 1, covariant, ;)
listener: endMember()
@@ -80,13 +80,13 @@
listener: beginMetadataStar(late)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields(;, null, null, null, late, null, late, Instance of 'NoType', x4, DeclarationKind.Class)
+ parseFields(;, null, null, null, late, null, late, Instance of 'NoType', x4, DeclarationKind.Class, X)
reportRecoverableError(x4, MissingConstFinalVarOrType)
listener: handleRecoverableError(MissingConstFinalVarOrType, x4, x4)
listener: handleNoType(late)
ensureIdentifier(late, fieldDeclaration)
listener: handleIdentifier(x4, fieldDeclaration)
- parseFieldInitializerOpt(x4, x4, late, null, DeclarationKind.Class)
+ parseFieldInitializerOpt(x4, x4, late, null, DeclarationKind.Class, X)
listener: beginFieldInitializer(=)
parseExpression(=)
parsePrecedenceExpression(=, 1, true)
@@ -103,13 +103,13 @@
listener: beginMetadataStar(static)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields(;, null, static, null, late, null, late, Instance of 'NoType', x5, DeclarationKind.Class)
+ parseFields(;, null, static, null, late, null, late, Instance of 'NoType', x5, DeclarationKind.Class, X)
reportRecoverableError(x5, MissingConstFinalVarOrType)
listener: handleRecoverableError(MissingConstFinalVarOrType, x5, x5)
listener: handleNoType(late)
ensureIdentifier(late, fieldDeclaration)
listener: handleIdentifier(x5, fieldDeclaration)
- parseFieldInitializerOpt(x5, x5, late, null, DeclarationKind.Class)
+ parseFieldInitializerOpt(x5, x5, late, null, DeclarationKind.Class, X)
listener: beginFieldInitializer(=)
parseExpression(=)
parsePrecedenceExpression(=, 1, true)
@@ -126,13 +126,13 @@
listener: beginMetadataStar(covariant)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields(;, null, null, covariant, late, null, late, Instance of 'NoType', x6, DeclarationKind.Class)
+ parseFields(;, null, null, covariant, late, null, late, Instance of 'NoType', x6, DeclarationKind.Class, X)
reportRecoverableError(x6, MissingConstFinalVarOrType)
listener: handleRecoverableError(MissingConstFinalVarOrType, x6, x6)
listener: handleNoType(late)
ensureIdentifier(late, fieldDeclaration)
listener: handleIdentifier(x6, fieldDeclaration)
- parseFieldInitializerOpt(x6, x6, late, null, DeclarationKind.Class)
+ parseFieldInitializerOpt(x6, x6, late, null, DeclarationKind.Class, X)
listener: beginFieldInitializer(=)
parseExpression(=)
parsePrecedenceExpression(=, 1, true)
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39858_prime1.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_39858_prime1.dart.intertwined.expect
index f0ecb2d..b1d726d 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_39858_prime1.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_39858_prime1.dart.intertwined.expect
@@ -32,11 +32,11 @@
listener: beginMetadataStar(var)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields({, null, null, null, null, var, var, Instance of 'NoType', x1, DeclarationKind.Class)
+ parseFields({, null, null, null, null, var, var, Instance of 'NoType', x1, DeclarationKind.Class, X)
listener: handleNoType(var)
ensureIdentifier(var, fieldDeclaration)
listener: handleIdentifier(x1, fieldDeclaration)
- parseFieldInitializerOpt(x1, x1, null, var, DeclarationKind.Class)
+ parseFieldInitializerOpt(x1, x1, null, var, DeclarationKind.Class, X)
listener: handleNoFieldInitializer(;)
listener: endClassFields(null, null, null, var, 1, var, ;)
listener: endMember()
@@ -46,11 +46,11 @@
listener: beginMetadataStar(static)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields(;, null, static, null, null, var, var, Instance of 'NoType', x2, DeclarationKind.Class)
+ parseFields(;, null, static, null, null, var, var, Instance of 'NoType', x2, DeclarationKind.Class, X)
listener: handleNoType(var)
ensureIdentifier(var, fieldDeclaration)
listener: handleIdentifier(x2, fieldDeclaration)
- parseFieldInitializerOpt(x2, x2, null, var, DeclarationKind.Class)
+ parseFieldInitializerOpt(x2, x2, null, var, DeclarationKind.Class, X)
listener: handleNoFieldInitializer(;)
listener: endClassFields(static, null, null, var, 1, static, ;)
listener: endMember()
@@ -60,11 +60,11 @@
listener: beginMetadataStar(covariant)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields(;, null, null, covariant, null, var, var, Instance of 'NoType', x3, DeclarationKind.Class)
+ parseFields(;, null, null, covariant, null, var, var, Instance of 'NoType', x3, DeclarationKind.Class, X)
listener: handleNoType(var)
ensureIdentifier(var, fieldDeclaration)
listener: handleIdentifier(x3, fieldDeclaration)
- parseFieldInitializerOpt(x3, x3, null, var, DeclarationKind.Class)
+ parseFieldInitializerOpt(x3, x3, null, var, DeclarationKind.Class, X)
listener: handleNoFieldInitializer(;)
listener: endClassFields(null, covariant, null, var, 1, covariant, ;)
listener: endMember()
@@ -74,11 +74,11 @@
listener: beginMetadataStar(var)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields(;, null, null, null, null, var, var, Instance of 'NoType', x4, DeclarationKind.Class)
+ parseFields(;, null, null, null, null, var, var, Instance of 'NoType', x4, DeclarationKind.Class, X)
listener: handleNoType(var)
ensureIdentifier(var, fieldDeclaration)
listener: handleIdentifier(x4, fieldDeclaration)
- parseFieldInitializerOpt(x4, x4, null, var, DeclarationKind.Class)
+ parseFieldInitializerOpt(x4, x4, null, var, DeclarationKind.Class, X)
listener: beginFieldInitializer(=)
parseExpression(=)
parsePrecedenceExpression(=, 1, true)
@@ -95,11 +95,11 @@
listener: beginMetadataStar(static)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields(;, null, static, null, null, var, var, Instance of 'NoType', x5, DeclarationKind.Class)
+ parseFields(;, null, static, null, null, var, var, Instance of 'NoType', x5, DeclarationKind.Class, X)
listener: handleNoType(var)
ensureIdentifier(var, fieldDeclaration)
listener: handleIdentifier(x5, fieldDeclaration)
- parseFieldInitializerOpt(x5, x5, null, var, DeclarationKind.Class)
+ parseFieldInitializerOpt(x5, x5, null, var, DeclarationKind.Class, X)
listener: beginFieldInitializer(=)
parseExpression(=)
parsePrecedenceExpression(=, 1, true)
@@ -116,11 +116,11 @@
listener: beginMetadataStar(covariant)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields(;, null, null, covariant, null, var, var, Instance of 'NoType', x6, DeclarationKind.Class)
+ parseFields(;, null, null, covariant, null, var, var, Instance of 'NoType', x6, DeclarationKind.Class, X)
listener: handleNoType(var)
ensureIdentifier(var, fieldDeclaration)
listener: handleIdentifier(x6, fieldDeclaration)
- parseFieldInitializerOpt(x6, x6, null, var, DeclarationKind.Class)
+ parseFieldInitializerOpt(x6, x6, null, var, DeclarationKind.Class, X)
listener: beginFieldInitializer(=)
parseExpression(=)
parsePrecedenceExpression(=, 1, true)
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40805_01.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40805_01.dart.intertwined.expect
index e09779d..b514254 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_40805_01.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_40805_01.dart.intertwined.expect
@@ -32,13 +32,13 @@
listener: beginMetadataStar(covariant)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields({, null, null, covariant, late, final, final, Instance of 'SimpleType', x, DeclarationKind.Class)
+ parseFields({, null, null, covariant, late, final, final, Instance of 'SimpleType', x, DeclarationKind.Class, C)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(x)
listener: handleType(int, null)
ensureIdentifier(int, fieldDeclaration)
listener: handleIdentifier(x, fieldDeclaration)
- parseFieldInitializerOpt(x, x, late, final, DeclarationKind.Class)
+ parseFieldInitializerOpt(x, x, late, final, DeclarationKind.Class, C)
listener: handleNoFieldInitializer(;)
listener: endClassFields(null, covariant, late, final, 1, covariant, ;)
listener: endMember()
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40805_02.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40805_02.dart.intertwined.expect
index b833c54..0c9581c 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_40805_02.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_40805_02.dart.intertwined.expect
@@ -32,7 +32,7 @@
listener: beginMetadataStar(covariant)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields({, null, null, covariant, late, final, final, Instance of 'SimpleType', x, DeclarationKind.Class)
+ parseFields({, null, null, covariant, late, final, final, Instance of 'SimpleType', x, DeclarationKind.Class, C)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(x)
listener: handleType(int, null)
@@ -40,7 +40,7 @@
listener: handleIdentifier(x, fieldDeclaration)
reportRecoverableError(covariant, FinalAndCovariantLateWithInitializer)
listener: handleRecoverableError(FinalAndCovariantLateWithInitializer, covariant, covariant)
- parseFieldInitializerOpt(x, x, late, final, DeclarationKind.Class)
+ parseFieldInitializerOpt(x, x, late, final, DeclarationKind.Class, C)
listener: beginFieldInitializer(=)
parseExpression(=)
parsePrecedenceExpression(=, 1, true)
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40805_03.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40805_03.dart.intertwined.expect
index b7677f5..6c521ab 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_40805_03.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_40805_03.dart.intertwined.expect
@@ -32,7 +32,7 @@
listener: beginMetadataStar(covariant)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields({, null, null, covariant, null, final, final, Instance of 'SimpleType', x, DeclarationKind.Class)
+ parseFields({, null, null, covariant, null, final, final, Instance of 'SimpleType', x, DeclarationKind.Class, C)
reportRecoverableError(covariant, FinalAndCovariant)
listener: handleRecoverableError(FinalAndCovariant, covariant, covariant)
listener: handleIdentifier(int, typeReference)
@@ -40,7 +40,7 @@
listener: handleType(int, null)
ensureIdentifier(int, fieldDeclaration)
listener: handleIdentifier(x, fieldDeclaration)
- parseFieldInitializerOpt(x, x, null, final, DeclarationKind.Class)
+ parseFieldInitializerOpt(x, x, null, final, DeclarationKind.Class, C)
listener: beginFieldInitializer(=)
parseExpression(=)
parsePrecedenceExpression(=, 1, true)
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40834_01.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40834_01.dart.intertwined.expect
index 24e750e..12268f2 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_40834_01.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_40834_01.dart.intertwined.expect
@@ -32,13 +32,13 @@
listener: beginMetadataStar(String)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields({, null, null, null, null, null, {, Instance of 'SimpleNullableType', x, DeclarationKind.Class)
+ parseFields({, null, null, null, null, null, {, Instance of 'SimpleNullableType', x, DeclarationKind.Class, Foo)
listener: handleIdentifier(String, typeReference)
listener: handleNoTypeArguments(?)
listener: handleType(String, ?)
ensureIdentifier(?, fieldDeclaration)
listener: handleIdentifier(x, fieldDeclaration)
- parseFieldInitializerOpt(x, x, null, null, DeclarationKind.Class)
+ parseFieldInitializerOpt(x, x, null, null, DeclarationKind.Class, Foo)
listener: handleNoFieldInitializer(;)
listener: endClassFields(null, null, null, null, 1, String, ;)
listener: endMember()
@@ -48,13 +48,13 @@
listener: beginMetadataStar(int)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', y, DeclarationKind.Class)
+ parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', y, DeclarationKind.Class, Foo)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(y)
listener: handleType(int, null)
ensureIdentifier(int, fieldDeclaration)
listener: handleIdentifier(y, fieldDeclaration)
- parseFieldInitializerOpt(y, y, null, null, DeclarationKind.Class)
+ parseFieldInitializerOpt(y, y, null, null, DeclarationKind.Class, Foo)
listener: handleNoFieldInitializer(;)
listener: endClassFields(null, null, null, null, 1, int, ;)
listener: endMember()
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40834_02.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40834_02.dart.intertwined.expect
index 66be97c..a584066 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_40834_02.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_40834_02.dart.intertwined.expect
@@ -32,13 +32,13 @@
listener: beginMetadataStar(String)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields({, null, null, null, null, null, {, Instance of 'SimpleNullableType', x, DeclarationKind.Class)
+ parseFields({, null, null, null, null, null, {, Instance of 'SimpleNullableType', x, DeclarationKind.Class, Foo)
listener: handleIdentifier(String, typeReference)
listener: handleNoTypeArguments(?)
listener: handleType(String, ?)
ensureIdentifier(?, fieldDeclaration)
listener: handleIdentifier(x, fieldDeclaration)
- parseFieldInitializerOpt(x, x, null, null, DeclarationKind.Class)
+ parseFieldInitializerOpt(x, x, null, null, DeclarationKind.Class, Foo)
listener: handleNoFieldInitializer(;)
listener: endClassFields(null, null, null, null, 1, String, ;)
listener: endMember()
@@ -48,13 +48,13 @@
listener: beginMetadataStar(int)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', y, DeclarationKind.Class)
+ parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', y, DeclarationKind.Class, Foo)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(y)
listener: handleType(int, null)
ensureIdentifier(int, fieldDeclaration)
listener: handleIdentifier(y, fieldDeclaration)
- parseFieldInitializerOpt(y, y, null, null, DeclarationKind.Class)
+ parseFieldInitializerOpt(y, y, null, null, DeclarationKind.Class, Foo)
listener: handleNoFieldInitializer(;)
listener: endClassFields(null, null, null, null, 1, int, ;)
listener: endMember()
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40834_03.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40834_03.dart.intertwined.expect
index 51ac84e..883e69d 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_40834_03.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_40834_03.dart.intertwined.expect
@@ -32,13 +32,13 @@
listener: beginMetadataStar(String)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields({, null, null, null, null, null, {, Instance of 'SimpleNullableType', x, DeclarationKind.Class)
+ parseFields({, null, null, null, null, null, {, Instance of 'SimpleNullableType', x, DeclarationKind.Class, Foo)
listener: handleIdentifier(String, typeReference)
listener: handleNoTypeArguments(?)
listener: handleType(String, ?)
ensureIdentifier(?, fieldDeclaration)
listener: handleIdentifier(x, fieldDeclaration)
- parseFieldInitializerOpt(x, x, null, null, DeclarationKind.Class)
+ parseFieldInitializerOpt(x, x, null, null, DeclarationKind.Class, Foo)
listener: handleNoFieldInitializer(;)
listener: endClassFields(null, null, null, null, 1, String, ;)
listener: endMember()
@@ -48,13 +48,13 @@
listener: beginMetadataStar(int)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', y, DeclarationKind.Class)
+ parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', y, DeclarationKind.Class, Foo)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(y)
listener: handleType(int, null)
ensureIdentifier(int, fieldDeclaration)
listener: handleIdentifier(y, fieldDeclaration)
- parseFieldInitializerOpt(y, y, null, null, DeclarationKind.Class)
+ parseFieldInitializerOpt(y, y, null, null, DeclarationKind.Class, Foo)
listener: handleNoFieldInitializer(;)
listener: endClassFields(null, null, null, null, 1, int, ;)
listener: endMember()
diff --git a/pkg/front_end/parser_testcases/nnbd/late_member.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/late_member.dart.intertwined.expect
index d385dd5..f46dc4c 100644
--- a/pkg/front_end/parser_testcases/nnbd/late_member.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/late_member.dart.intertwined.expect
@@ -430,13 +430,13 @@
listener: beginMetadataStar(int)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields({, null, null, null, null, null, {, Instance of 'SimpleType', late, DeclarationKind.Class)
+ parseFields({, null, null, null, null, null, {, Instance of 'SimpleType', late, DeclarationKind.Class, Y)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(late)
listener: handleType(int, null)
ensureIdentifier(int, fieldDeclaration)
listener: handleIdentifier(late, fieldDeclaration)
- parseFieldInitializerOpt(late, late, null, null, DeclarationKind.Class)
+ parseFieldInitializerOpt(late, late, null, null, DeclarationKind.Class, Y)
listener: beginFieldInitializer(=)
parseExpression(=)
parsePrecedenceExpression(=, 1, true)
diff --git a/pkg/front_end/parser_testcases/nnbd/late_modifier.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/late_modifier.dart.intertwined.expect
index 15d91f6..b9a8365 100644
--- a/pkg/front_end/parser_testcases/nnbd/late_modifier.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/late_modifier.dart.intertwined.expect
@@ -478,13 +478,13 @@
listener: beginMetadataStar(int)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields({, null, null, null, null, null, {, Instance of 'SimpleType', late, DeclarationKind.Class)
+ parseFields({, null, null, null, null, null, {, Instance of 'SimpleType', late, DeclarationKind.Class, Y)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(late)
listener: handleType(int, null)
ensureIdentifier(int, fieldDeclaration)
listener: handleIdentifier(late, fieldDeclaration)
- parseFieldInitializerOpt(late, late, null, null, DeclarationKind.Class)
+ parseFieldInitializerOpt(late, late, null, null, DeclarationKind.Class, Y)
listener: beginFieldInitializer(=)
parseExpression(=)
parsePrecedenceExpression(=, 1, true)
diff --git a/pkg/front_end/parser_testcases/nnbd/required_member.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/required_member.dart.intertwined.expect
index 37936b9..dcfdb41 100644
--- a/pkg/front_end/parser_testcases/nnbd/required_member.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/required_member.dart.intertwined.expect
@@ -430,13 +430,13 @@
listener: beginMetadataStar(int)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields({, null, null, null, null, null, {, Instance of 'SimpleType', required, DeclarationKind.Class)
+ parseFields({, null, null, null, null, null, {, Instance of 'SimpleType', required, DeclarationKind.Class, Y)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(required)
listener: handleType(int, null)
ensureIdentifier(int, fieldDeclaration)
listener: handleIdentifier(required, fieldDeclaration)
- parseFieldInitializerOpt(required, required, null, null, DeclarationKind.Class)
+ parseFieldInitializerOpt(required, required, null, null, DeclarationKind.Class, Y)
listener: beginFieldInitializer(=)
parseExpression(=)
parsePrecedenceExpression(=, 1, true)
diff --git a/pkg/front_end/parser_testcases/nnbd/required_modifier.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/required_modifier.dart.intertwined.expect
index 831a9fa..7375567 100644
--- a/pkg/front_end/parser_testcases/nnbd/required_modifier.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/required_modifier.dart.intertwined.expect
@@ -446,13 +446,13 @@
listener: beginMetadataStar(int)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields({, null, null, null, null, null, {, Instance of 'SimpleType', required, DeclarationKind.Class)
+ parseFields({, null, null, null, null, null, {, Instance of 'SimpleType', required, DeclarationKind.Class, Y)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(required)
listener: handleType(int, null)
ensureIdentifier(int, fieldDeclaration)
listener: handleIdentifier(required, fieldDeclaration)
- parseFieldInitializerOpt(required, required, null, null, DeclarationKind.Class)
+ parseFieldInitializerOpt(required, required, null, null, DeclarationKind.Class, Y)
listener: beginFieldInitializer(=)
parseExpression(=)
parsePrecedenceExpression(=, 1, true)
diff --git a/pkg/front_end/parser_testcases/non-nnbd/issue_40267_conditional_4.dart.intertwined.expect b/pkg/front_end/parser_testcases/non-nnbd/issue_40267_conditional_4.dart.intertwined.expect
index 1f6b298..f1cf95c 100644
--- a/pkg/front_end/parser_testcases/non-nnbd/issue_40267_conditional_4.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/non-nnbd/issue_40267_conditional_4.dart.intertwined.expect
@@ -8,27 +8,27 @@
listener: endMetadataStar(0)
parseTopLevelMemberImpl()
listener: beginTopLevelMember(var)
- parseFields(, null, null, null, null, var, var, Instance of 'NoType', a, DeclarationKind.TopLevel)
+ parseFields(, null, null, null, null, var, var, Instance of 'NoType', a, DeclarationKind.TopLevel, null)
listener: handleNoType(var)
ensureIdentifier(var, topLevelVariableDeclaration)
listener: handleIdentifier(a, topLevelVariableDeclaration)
- parseFieldInitializerOpt(a, a, null, var, DeclarationKind.TopLevel)
+ parseFieldInitializerOpt(a, a, null, var, DeclarationKind.TopLevel, null)
listener: handleNoFieldInitializer(,)
ensureIdentifier(,, topLevelVariableDeclaration)
listener: handleIdentifier(b, topLevelVariableDeclaration)
- parseFieldInitializerOpt(b, b, null, var, DeclarationKind.TopLevel)
+ parseFieldInitializerOpt(b, b, null, var, DeclarationKind.TopLevel, null)
listener: handleNoFieldInitializer(,)
ensureIdentifier(,, topLevelVariableDeclaration)
listener: handleIdentifier(c, topLevelVariableDeclaration)
- parseFieldInitializerOpt(c, c, null, var, DeclarationKind.TopLevel)
+ parseFieldInitializerOpt(c, c, null, var, DeclarationKind.TopLevel, null)
listener: handleNoFieldInitializer(,)
ensureIdentifier(,, topLevelVariableDeclaration)
listener: handleIdentifier(d, topLevelVariableDeclaration)
- parseFieldInitializerOpt(d, d, null, var, DeclarationKind.TopLevel)
+ parseFieldInitializerOpt(d, d, null, var, DeclarationKind.TopLevel, null)
listener: handleNoFieldInitializer(,)
ensureIdentifier(,, topLevelVariableDeclaration)
listener: handleIdentifier(e, topLevelVariableDeclaration)
- parseFieldInitializerOpt(e, e, null, var, DeclarationKind.TopLevel)
+ parseFieldInitializerOpt(e, e, null, var, DeclarationKind.TopLevel, null)
listener: handleNoFieldInitializer(;)
listener: endTopLevelFields(null, null, null, var, 5, var, ;)
listener: endTopLevelDeclaration(List)
diff --git a/pkg/front_end/parser_testcases/non-nnbd/issue_40288.dart.intertwined.expect b/pkg/front_end/parser_testcases/non-nnbd/issue_40288.dart.intertwined.expect
index ceb712e..3e711e5 100644
--- a/pkg/front_end/parser_testcases/non-nnbd/issue_40288.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/non-nnbd/issue_40288.dart.intertwined.expect
@@ -39,6 +39,7 @@
listener: handleType(int, null)
ensureIdentifier(get, methodDeclaration)
listener: handleIdentifier(g, methodDeclaration)
+ parseQualifiedRestOpt(g, methodDeclarationContinuation)
listener: handleNoTypeVariables(=>)
parseGetterOrFormalParameters(g, g, true, MemberKind.NonStaticMethod)
listener: handleNoFormalParameters(=>, MemberKind.NonStaticMethod)
@@ -103,6 +104,7 @@
listener: handleType(int, null)
ensureIdentifier(get, methodDeclaration)
listener: handleIdentifier(g, methodDeclaration)
+ parseQualifiedRestOpt(g, methodDeclarationContinuation)
listener: handleNoTypeVariables(=>)
parseGetterOrFormalParameters(g, g, true, MemberKind.NonStaticMethod)
listener: handleNoFormalParameters(=>, MemberKind.NonStaticMethod)
@@ -160,13 +162,13 @@
listener: beginMetadataStar(late)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields({, null, null, null, null, null, {, Instance of 'SimpleType', l, DeclarationKind.Class)
+ parseFields({, null, null, null, null, null, {, Instance of 'SimpleType', l, DeclarationKind.Class, C)
listener: handleIdentifier(late, typeReference)
listener: handleNoTypeArguments(l)
listener: handleType(late, null)
ensureIdentifier(late, fieldDeclaration)
listener: handleIdentifier(l, fieldDeclaration)
- parseFieldInitializerOpt(l, l, null, null, DeclarationKind.Class)
+ parseFieldInitializerOpt(l, l, null, null, DeclarationKind.Class, C)
listener: beginFieldInitializer(=)
parseExpression(=)
parsePrecedenceExpression(=, 1, true)
@@ -193,13 +195,13 @@
listener: beginMetadataStar(required)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', r, DeclarationKind.Class)
+ parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', r, DeclarationKind.Class, C)
listener: handleIdentifier(required, typeReference)
listener: handleNoTypeArguments(r)
listener: handleType(required, null)
ensureIdentifier(required, fieldDeclaration)
listener: handleIdentifier(r, fieldDeclaration)
- parseFieldInitializerOpt(r, r, null, null, DeclarationKind.Class)
+ parseFieldInitializerOpt(r, r, null, null, DeclarationKind.Class, C)
listener: beginFieldInitializer(=)
parseExpression(=)
parsePrecedenceExpression(=, 1, true)
diff --git a/pkg/front_end/parser_testcases/non-nnbd/issue_40288_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/non-nnbd/issue_40288_prime.dart.intertwined.expect
index 319b1ae..6ae5c3c 100644
--- a/pkg/front_end/parser_testcases/non-nnbd/issue_40288_prime.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/non-nnbd/issue_40288_prime.dart.intertwined.expect
@@ -39,6 +39,7 @@
listener: handleType(int, null)
ensureIdentifier(get, methodDeclaration)
listener: handleIdentifier(g, methodDeclaration)
+ parseQualifiedRestOpt(g, methodDeclarationContinuation)
listener: handleNoTypeVariables(=>)
parseGetterOrFormalParameters(g, g, true, MemberKind.NonStaticMethod)
listener: handleNoFormalParameters(=>, MemberKind.NonStaticMethod)
@@ -103,6 +104,7 @@
listener: handleType(int, null)
ensureIdentifier(get, methodDeclaration)
listener: handleIdentifier(g, methodDeclaration)
+ parseQualifiedRestOpt(g, methodDeclarationContinuation)
listener: handleNoTypeVariables(=>)
parseGetterOrFormalParameters(g, g, true, MemberKind.NonStaticMethod)
listener: handleNoFormalParameters(=>, MemberKind.NonStaticMethod)
@@ -160,13 +162,13 @@
listener: beginMetadataStar(Xlate)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields({, null, null, null, null, null, {, Instance of 'SimpleType', l, DeclarationKind.Class)
+ parseFields({, null, null, null, null, null, {, Instance of 'SimpleType', l, DeclarationKind.Class, C)
listener: handleIdentifier(Xlate, typeReference)
listener: handleNoTypeArguments(l)
listener: handleType(Xlate, null)
ensureIdentifier(Xlate, fieldDeclaration)
listener: handleIdentifier(l, fieldDeclaration)
- parseFieldInitializerOpt(l, l, null, null, DeclarationKind.Class)
+ parseFieldInitializerOpt(l, l, null, null, DeclarationKind.Class, C)
listener: beginFieldInitializer(=)
parseExpression(=)
parsePrecedenceExpression(=, 1, true)
@@ -193,13 +195,13 @@
listener: beginMetadataStar(Xrequired)
listener: endMetadataStar(0)
listener: beginMember()
- parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', r, DeclarationKind.Class)
+ parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', r, DeclarationKind.Class, C)
listener: handleIdentifier(Xrequired, typeReference)
listener: handleNoTypeArguments(r)
listener: handleType(Xrequired, null)
ensureIdentifier(Xrequired, fieldDeclaration)
listener: handleIdentifier(r, fieldDeclaration)
- parseFieldInitializerOpt(r, r, null, null, DeclarationKind.Class)
+ parseFieldInitializerOpt(r, r, null, null, DeclarationKind.Class, C)
listener: beginFieldInitializer(=)
parseExpression(=)
parsePrecedenceExpression(=, 1, true)
diff --git a/pkg/front_end/test/ast_nodes_has_to_string_test.dart b/pkg/front_end/test/ast_nodes_has_to_string_test.dart
new file mode 100644
index 0000000..efab92a0
--- /dev/null
+++ b/pkg/front_end/test/ast_nodes_has_to_string_test.dart
@@ -0,0 +1,189 @@
+import 'dart:io' show File, Platform, stdin, exitCode;
+
+import 'package:front_end/src/api_prototype/compiler_options.dart';
+import 'package:kernel/ast.dart';
+import 'package:kernel/class_hierarchy.dart';
+
+import 'incremental_load_from_dill_suite.dart' as helper;
+
+main(List<String> args) async {
+ exitCode = 1;
+ Map<Uri, List<Class>> classMap = {};
+ Map<Uri, List<Class>> classMapWithOne = {};
+ Component c;
+ int toGo = 0;
+ ClassHierarchy classHierarchy;
+ Class memberClass;
+ Class primitiveConstantClass;
+
+ {
+ Uri input = Platform.script.resolve("../tool/_fasta/compile.dart");
+ CompilerOptions options = helper.getOptions(targetName: "VM");
+ helper.TestIncrementalCompiler compiler =
+ new helper.TestIncrementalCompiler(
+ options,
+ input,
+ /*Uri initializeFrom*/ null,
+ /*bool outlineOnly*/ true);
+ c = await compiler.computeDelta();
+ classHierarchy = compiler.getClassHierarchy();
+ List<Library> libraries = c.libraries
+ .where((Library lib) =>
+ (lib.importUri.toString() == "package:kernel/ast.dart"))
+ .toList();
+ Library astLibrary = libraries.single;
+ List<Class> classes =
+ astLibrary.classes.where((Class c) => c.name == "Node").toList();
+ Class nodeClass = classes.single;
+ classes =
+ astLibrary.classes.where((Class c) => c.name == "Member").toList();
+ memberClass = classes.single;
+ classes = astLibrary.classes
+ .where((Class c) => c.name == "PrimitiveConstant")
+ .toList();
+ primitiveConstantClass = classes.single;
+
+ for (Library library in c.libraries) {
+ for (Class c in library.classes) {
+ if (c.isAbstract) continue;
+ if (classHierarchy.isSubtypeOf(c, nodeClass)) {
+ List<Member> toStringList = classHierarchy
+ .getInterfaceMembers(c)
+ .where((Member m) =>
+ !m.isAbstract &&
+ m.name.name == "toString" &&
+ m.enclosingLibrary.importUri.scheme != "dart")
+ .toList();
+ if (toStringList.length > 1) throw "What?";
+ if (toStringList.length == 1) {
+ classMapWithOne[c.fileUri] ??= new List<Class>();
+ classMapWithOne[c.fileUri].add(c);
+ continue;
+ }
+ toGo++;
+
+ classMap[c.fileUri] ??= new List<Class>();
+ classMap[c.fileUri].add(c);
+ }
+ }
+ }
+ }
+ if (toGo == 0) {
+ print("OK");
+ exitCode = 0;
+ } else {
+ print("Missing toString() on $toGo classes!");
+
+ if (args.length == 1 && args.single == "--interactive") {
+ for (Uri uri in classMap.keys) {
+ List<Class> classes = classMap[uri];
+ print("Would you like to update ${classes.length} classes in ${uri}?"
+ " (y/n)");
+ if (stdin.readLineSync() != "y") {
+ print("Skipping $uri");
+ continue;
+ }
+ print("Continuing on $uri");
+ classes.sort((Class a, Class b) {
+ return a.fileEndOffset - b.fileEndOffset;
+ });
+ File f = new File.fromUri(uri);
+ String src = f.readAsStringSync();
+ StringBuffer newSrc = new StringBuffer();
+ int from = 0;
+ for (Class c in classes) {
+ String innerContent = "";
+ if (classHierarchy.isSubtypeOf(c, memberClass)) {
+ innerContent = "\$name";
+ } else if (classHierarchy.isSubtypeOf(c, primitiveConstantClass)) {
+ innerContent = "\$value";
+ }
+ int to = c.fileEndOffset;
+ newSrc.write(src.substring(from, to));
+ // We're just before the final "}".
+ newSrc.write("""
+
+ @override
+ String toString() {
+ return "${c.name}(\${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "${innerContent}";
+ }
+""");
+ from = to;
+ }
+ newSrc.write(src.substring(from));
+ f.writeAsStringSync(newSrc.toString());
+ }
+ }
+ }
+
+ if (args.length == 1 && args.single == "--interactive") {
+ for (Uri uri in classMapWithOne.keys) {
+ List<Class> classes = classMapWithOne[uri];
+ print("Would you like to update toString for ${classes.length} "
+ "classes in ${uri}? (y/n)");
+ if (stdin.readLineSync() != "y") {
+ print("Skipping $uri");
+ continue;
+ }
+ print("Continuing on $uri");
+ classes.sort((Class a, Class b) {
+ return a.fileEndOffset - b.fileEndOffset;
+ });
+ File f = new File.fromUri(uri);
+ String src = f.readAsStringSync();
+ StringBuffer newSrc = new StringBuffer();
+ int from = 0;
+ for (Class c in classes) {
+ String innerContent = "()";
+ if (classHierarchy.isSubtypeOf(c, memberClass)) {
+ innerContent = r"($name)";
+ } else if (classHierarchy.isSubtypeOf(c, primitiveConstantClass)) {
+ innerContent = r"($value)";
+ }
+
+ List<Member> toStringList = classHierarchy
+ .getInterfaceMembers(c)
+ .where((Member m) =>
+ !m.isAbstract &&
+ m.name.name == "toString" &&
+ m.enclosingLibrary.importUri.scheme != "dart")
+ .toList();
+ Member toString = toStringList.single;
+ if (toString.fileUri != uri) continue;
+ int end = toString.fileEndOffset + 1;
+ String existing = src.substring(toString.fileOffset, end).trim();
+ if (!existing.contains('return "${c.name}${innerContent}";')) {
+ continue;
+ }
+
+ innerContent = "";
+ if (classHierarchy.isSubtypeOf(c, memberClass)) {
+ innerContent = "\$name";
+ } else if (classHierarchy.isSubtypeOf(c, primitiveConstantClass)) {
+ innerContent = "\$value";
+ }
+
+ int to = toString.fileOffset;
+ newSrc.write(src.substring(from, to));
+ // We're just before the final "}".
+ newSrc.write("""
+toString() {
+ return "${c.name}(\${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "${innerContent}";
+ }""");
+ from = toString.fileEndOffset + 1;
+ }
+ newSrc.write(src.substring(from));
+ f.writeAsStringSync(newSrc.toString());
+ }
+ }
+}
diff --git a/pkg/front_end/test/language_versioning/language_versioning_test.dart b/pkg/front_end/test/language_versioning/language_versioning_test.dart
index 66b3e37..fca5c65 100644
--- a/pkg/front_end/test/language_versioning/language_versioning_test.dart
+++ b/pkg/front_end/test/language_versioning/language_versioning_test.dart
@@ -8,6 +8,7 @@
show DataInterpreter, StringDataInterpreter, runTests;
import 'package:_fe_analyzer_shared/src/testing/id_testing.dart';
import 'package:front_end/src/api_prototype/compiler_options.dart';
+import 'package:front_end/src/api_prototype/language_version.dart' as lv;
import 'package:front_end/src/fasta/messages.dart' show FormattedMessage;
import 'package:front_end/src/testing/id_testing_helper.dart'
show
@@ -18,7 +19,8 @@
createUriForFileName,
onFailure,
runTestFor;
-import 'package:kernel/ast.dart' show Library;
+
+import 'package:kernel/ast.dart' show Component, Library;
main(List<String> args) async {
// Fix default/max major and minor version so we can test it.
@@ -38,12 +40,16 @@
]);
}
+// Ugly hack.
+CompilerOptions stashedOptions;
+
class TestConfigWithLanguageVersion extends TestConfig {
TestConfigWithLanguageVersion(String marker, String name)
: super(marker, name);
@override
void customizeCompilerOptions(CompilerOptions options, TestData testData) {
+ stashedOptions = options;
options.currentSdkVersion = "2.8";
File f = new File.fromUri(testData.testFileUri.resolve("test.options"));
@@ -67,6 +73,27 @@
class LanguageVersioningDataComputer extends DataComputer<String> {
const LanguageVersioningDataComputer();
+ Future<void> inspectComponent(Component component) async {
+ for (Library library in component.libraries) {
+ if (library.importUri.scheme == "dart") continue;
+ lv.LanguageVersionForUri lvFile =
+ await lv.languageVersionForUri(library.fileUri, stashedOptions);
+ lv.LanguageVersionForUri lvImportUri =
+ await lv.languageVersionForUri(library.importUri, stashedOptions);
+ if ((lvFile.major != lvImportUri.major ||
+ lvFile.major != library.languageVersionMajor) ||
+ (lvFile.minor != lvImportUri.minor ||
+ lvFile.minor != library.languageVersionMinor)) {
+ throw """
+Language version disagreement:
+Library: ${library.languageVersionMajor}.${library.languageVersionMinor}
+Language version API (file URI): ${lvFile.major}.${lvFile.minor}
+Language version API (import URI): ${lvImportUri.major}.${lvImportUri.minor}
+""";
+ }
+ }
+ }
+
void computeLibraryData(
TestConfig config,
InternalCompilerResult compilerResult,
@@ -96,9 +123,9 @@
@override
String computeLibraryValue(Id id, Library library) {
- StringBuffer sb = new StringBuffer();
- sb.write('languageVersion='
- '${library.languageVersionMajor}.${library.languageVersionMinor}');
- return sb.toString();
+ return "languageVersion="
+ "${library.languageVersionMajor}"
+ "."
+ "${library.languageVersionMinor}";
}
}
diff --git a/pkg/front_end/test/parser_suite.dart b/pkg/front_end/test/parser_suite.dart
index 8defcdc..ce28c25 100644
--- a/pkg/front_end/test/parser_suite.dart
+++ b/pkg/front_end/test/parser_suite.dart
@@ -66,7 +66,7 @@
Future<Context> createContext(
Chain suite, Map<String, String> environment) async {
return new Context(suite.name, environment["updateExpectations"] == "true",
- environment["trace"] == "true");
+ environment["trace"] == "true", environment["annotateLines"] == "true");
}
ScannerConfiguration scannerConfiguration = new ScannerConfiguration(
@@ -82,9 +82,11 @@
class Context extends ChainContext with MatchContext {
final bool updateExpectations;
final bool addTrace;
+ final bool annotateLines;
final String suiteName;
- Context(this.suiteName, this.updateExpectations, this.addTrace);
+ Context(this.suiteName, this.updateExpectations, this.addTrace,
+ this.annotateLines);
final List<Step> steps = const <Step>[
const TokenStep(true, ".scanner.expect"),
@@ -122,7 +124,7 @@
ParserTestListenerWithMessageFormatting parserTestListener =
new ParserTestListenerWithMessageFormatting(
- context.addTrace, source, shortName);
+ context.addTrace, context.annotateLines, source, shortName);
Parser parser = new Parser(parserTestListener);
parser.parseUnit(firstToken);
@@ -144,14 +146,22 @@
Future<Result<TestDescription>> run(
TestDescription description, Context context) {
- Token firstToken = scanUri(description.uri, description.shortName);
+ List<int> lineStarts = new List<int>();
+ Token firstToken =
+ scanUri(description.uri, description.shortName, lineStarts: lineStarts);
if (firstToken == null) {
return Future.value(crash(description, StackTrace.current));
}
+ File f = new File.fromUri(description.uri);
+ List<int> rawBytes = f.readAsBytesSync();
+ Source source =
+ new Source(lineStarts, rawBytes, description.uri, description.uri);
+
ParserTestListenerForIntertwined parserTestListener =
- new ParserTestListenerForIntertwined(context.addTrace);
+ new ParserTestListenerForIntertwined(
+ context.addTrace, context.annotateLines, source);
TestParser parser = new TestParser(parserTestListener, context.addTrace);
parserTestListener.parser = parser;
parser.sb = parserTestListener.sb;
@@ -296,14 +306,31 @@
}
class ParserTestListenerWithMessageFormatting extends ParserTestListener {
+ final bool annotateLines;
final Source source;
final String shortName;
final List<String> errors = new List<String>();
+ Location latestSeenLocation;
ParserTestListenerWithMessageFormatting(
- bool trace, this.source, this.shortName)
+ bool trace, this.annotateLines, this.source, this.shortName)
: super(trace);
+ void seen(Token token) {
+ if (!annotateLines) return;
+ if (token == null) return;
+ if (source == null) return;
+ if (offsetForToken(token) < 0) return;
+ Location location =
+ source.getLocation(source.fileUri, offsetForToken(token));
+ if (latestSeenLocation == null || location.line > latestSeenLocation.line) {
+ latestSeenLocation = location;
+ String sourceLine = source.getTextLine(location.line);
+ doPrint("");
+ doPrint("// Line ${location.line}: $sourceLine");
+ }
+ }
+
void handleRecoverableError(
Message message, Token startToken, Token endToken) {
if (source != null) {
@@ -329,12 +356,18 @@
extends ParserTestListenerWithMessageFormatting {
TestParser parser;
- ParserTestListenerForIntertwined(bool trace) : super(trace, null, null);
+ ParserTestListenerForIntertwined(
+ bool trace, bool annotateLines, Source source)
+ : super(trace, annotateLines, source, null);
void doPrint(String s) {
int prevIndent = super.indent;
super.indent = parser.indent;
- super.doPrint("listener: " + s);
+ if (s.trim() == "") {
+ super.doPrint("");
+ } else {
+ super.doPrint("listener: " + s);
+ }
super.indent = prevIndent;
}
}
diff --git a/pkg/front_end/test/parser_test_listener.dart b/pkg/front_end/test/parser_test_listener.dart
index 7845720..25cf6c1 100644
--- a/pkg/front_end/test/parser_test_listener.dart
+++ b/pkg/front_end/test/parser_test_listener.dart
@@ -41,11 +41,17 @@
}
void doPrint(String s) {
- String traceString = "";
- if (trace) traceString = " (${createTrace()})";
- sb.writeln((" " * indent) + s + traceString);
+ String outString = s;
+ if (trace) outString += " (${createTrace()})";
+ if (outString != "") {
+ sb.writeln((" " * indent) + outString);
+ } else {
+ sb.writeln("");
+ }
}
+ void seen(Token token) {}
+
Uri get uri => null;
void logEvent(String name) {
@@ -57,32 +63,42 @@
}
void beginArguments(Token token) {
+ seen(token);
doPrint('beginArguments(' '$token)');
indent++;
}
void endArguments(int count, Token beginToken, Token endToken) {
indent--;
+ seen(beginToken);
+ seen(endToken);
doPrint('endArguments(' '$count, ' '$beginToken, ' '$endToken)');
}
void handleAsyncModifier(Token asyncToken, Token starToken) {
+ seen(asyncToken);
+ seen(starToken);
doPrint('handleAsyncModifier(' '$asyncToken, ' '$starToken)');
}
void beginAwaitExpression(Token token) {
+ seen(token);
doPrint('beginAwaitExpression(' '$token)');
indent++;
}
void endAwaitExpression(Token beginToken, Token endToken) {
indent--;
+ seen(beginToken);
+ seen(endToken);
doPrint('endAwaitExpression(' '$beginToken, ' '$endToken)');
}
void endInvalidAwaitExpression(
Token beginToken, Token endToken, MessageCode errorCode) {
indent--;
+ seen(beginToken);
+ seen(endToken);
doPrint('endInvalidAwaitExpression('
'$beginToken, '
'$endToken, '
@@ -92,6 +108,9 @@
void endInvalidYieldStatement(Token beginToken, Token starToken,
Token endToken, MessageCode errorCode) {
indent--;
+ seen(beginToken);
+ seen(starToken);
+ seen(endToken);
doPrint('endInvalidYieldStatement('
'$beginToken, '
'$starToken, '
@@ -100,6 +119,7 @@
}
void beginBlock(Token token, BlockKind blockKind) {
+ seen(token);
doPrint('beginBlock(' '$token, ' '$blockKind)');
indent++;
}
@@ -107,14 +127,18 @@
void endBlock(
int count, Token beginToken, Token endToken, BlockKind blockKind) {
indent--;
+ seen(beginToken);
+ seen(endToken);
doPrint('endBlock(' '$count, ' '$beginToken, ' '$endToken, ' '$blockKind)');
}
void handleInvalidTopLevelBlock(Token token) {
+ seen(token);
doPrint('handleInvalidTopLevelBlock(' '$token)');
}
void beginCascade(Token token) {
+ seen(token);
doPrint('beginCascade(' '$token)');
indent++;
}
@@ -125,16 +149,19 @@
}
void beginCaseExpression(Token caseKeyword) {
+ seen(caseKeyword);
doPrint('beginCaseExpression(' '$caseKeyword)');
indent++;
}
void endCaseExpression(Token colon) {
indent--;
+ seen(colon);
doPrint('endCaseExpression(' '$colon)');
}
void beginClassOrMixinBody(DeclarationKind kind, Token token) {
+ seen(token);
doPrint('beginClassOrMixinBody(' '$kind, ' '$token)');
indent++;
}
@@ -142,6 +169,8 @@
void endClassOrMixinBody(
DeclarationKind kind, int memberCount, Token beginToken, Token endToken) {
indent--;
+ seen(beginToken);
+ seen(endToken);
doPrint('endClassOrMixinBody('
'$kind, '
'$memberCount, '
@@ -150,27 +179,36 @@
}
void beginClassOrNamedMixinApplicationPrelude(Token token) {
+ seen(token);
doPrint('beginClassOrNamedMixinApplicationPrelude(' '$token)');
indent++;
}
void beginClassDeclaration(Token begin, Token abstractToken, Token name) {
+ seen(begin);
+ seen(abstractToken);
+ seen(name);
doPrint('beginClassDeclaration(' '$begin, ' '$abstractToken, ' '$name)');
indent++;
}
void handleClassExtends(Token extendsKeyword) {
+ seen(extendsKeyword);
doPrint('handleClassExtends(' '$extendsKeyword)');
}
void handleClassOrMixinImplements(
Token implementsKeyword, int interfacesCount) {
+ seen(implementsKeyword);
doPrint('handleClassOrMixinImplements('
'$implementsKeyword, '
'$interfacesCount)');
}
void handleClassHeader(Token begin, Token classKeyword, Token nativeToken) {
+ seen(begin);
+ seen(classKeyword);
+ seen(nativeToken);
doPrint('handleClassHeader(' '$begin, ' '$classKeyword, ' '$nativeToken)');
}
@@ -180,19 +218,25 @@
void endClassDeclaration(Token beginToken, Token endToken) {
indent--;
+ seen(beginToken);
+ seen(endToken);
doPrint('endClassDeclaration(' '$beginToken, ' '$endToken)');
}
void beginMixinDeclaration(Token mixinKeyword, Token name) {
+ seen(mixinKeyword);
+ seen(name);
doPrint('beginMixinDeclaration(' '$mixinKeyword, ' '$name)');
indent++;
}
void handleMixinOn(Token onKeyword, int typeCount) {
+ seen(onKeyword);
doPrint('handleMixinOn(' '$onKeyword, ' '$typeCount)');
}
void handleMixinHeader(Token mixinKeyword) {
+ seen(mixinKeyword);
doPrint('handleMixinHeader(' '$mixinKeyword)');
}
@@ -202,15 +246,20 @@
void endMixinDeclaration(Token mixinKeyword, Token endToken) {
indent--;
+ seen(mixinKeyword);
+ seen(endToken);
doPrint('endMixinDeclaration(' '$mixinKeyword, ' '$endToken)');
}
void beginExtensionDeclarationPrelude(Token extensionKeyword) {
+ seen(extensionKeyword);
doPrint('beginExtensionDeclarationPrelude(' '$extensionKeyword)');
indent++;
}
void beginExtensionDeclaration(Token extensionKeyword, Token name) {
+ seen(extensionKeyword);
+ seen(name);
doPrint('beginExtensionDeclaration(' '$extensionKeyword, ' '$name)');
indent++;
}
@@ -218,6 +267,9 @@
void endExtensionDeclaration(
Token extensionKeyword, Token onKeyword, Token token) {
indent--;
+ seen(extensionKeyword);
+ seen(onKeyword);
+ seen(token);
doPrint('endExtensionDeclaration('
'$extensionKeyword, '
'$onKeyword, '
@@ -225,6 +277,7 @@
}
void beginCombinators(Token token) {
+ seen(token);
doPrint('beginCombinators(' '$token)');
indent++;
}
@@ -235,6 +288,7 @@
}
void beginCompilationUnit(Token token) {
+ seen(token);
doPrint('beginCompilationUnit(' '$token)');
indent++;
}
@@ -245,20 +299,24 @@
void endCompilationUnit(int count, Token token) {
indent--;
+ seen(token);
doPrint('endCompilationUnit(' '$count, ' '$token)');
}
void beginConstLiteral(Token token) {
+ seen(token);
doPrint('beginConstLiteral(' '$token)');
indent++;
}
void endConstLiteral(Token token) {
indent--;
+ seen(token);
doPrint('endConstLiteral(' '$token)');
}
void beginConstructorReference(Token start) {
+ seen(start);
doPrint('beginConstructorReference(' '$start)');
indent++;
}
@@ -266,6 +324,9 @@
void endConstructorReference(
Token start, Token periodBeforeName, Token endToken) {
indent--;
+ seen(start);
+ seen(periodBeforeName);
+ seen(endToken);
doPrint('endConstructorReference('
'$start, '
'$periodBeforeName, '
@@ -273,6 +334,7 @@
}
void beginDoWhileStatement(Token token) {
+ seen(token);
doPrint('beginDoWhileStatement(' '$token)');
indent++;
}
@@ -280,60 +342,78 @@
void endDoWhileStatement(
Token doKeyword, Token whileKeyword, Token endToken) {
indent--;
+ seen(doKeyword);
+ seen(whileKeyword);
+ seen(endToken);
doPrint(
'endDoWhileStatement(' '$doKeyword, ' '$whileKeyword, ' '$endToken)');
}
void beginDoWhileStatementBody(Token token) {
+ seen(token);
doPrint('beginDoWhileStatementBody(' '$token)');
indent++;
}
void endDoWhileStatementBody(Token token) {
indent--;
+ seen(token);
doPrint('endDoWhileStatementBody(' '$token)');
}
void beginWhileStatementBody(Token token) {
+ seen(token);
doPrint('beginWhileStatementBody(' '$token)');
indent++;
}
void endWhileStatementBody(Token token) {
indent--;
+ seen(token);
doPrint('endWhileStatementBody(' '$token)');
}
void beginEnum(Token enumKeyword) {
+ seen(enumKeyword);
doPrint('beginEnum(' '$enumKeyword)');
indent++;
}
void endEnum(Token enumKeyword, Token leftBrace, int count) {
indent--;
+ seen(enumKeyword);
+ seen(leftBrace);
doPrint('endEnum(' '$enumKeyword, ' '$leftBrace, ' '$count)');
}
void beginExport(Token token) {
+ seen(token);
doPrint('beginExport(' '$token)');
indent++;
}
void endExport(Token exportKeyword, Token semicolon) {
indent--;
+ seen(exportKeyword);
+ seen(semicolon);
doPrint('endExport(' '$exportKeyword, ' '$semicolon)');
}
void handleExtraneousExpression(Token token, Message message) {
+ seen(token);
doPrint('handleExtraneousExpression(' '$token, ' '$message)');
}
void handleExpressionStatement(Token token) {
+ seen(token);
doPrint('handleExpressionStatement(' '$token)');
}
void beginFactoryMethod(
Token lastConsumed, Token externalToken, Token constToken) {
+ seen(lastConsumed);
+ seen(externalToken);
+ seen(constToken);
doPrint('beginFactoryMethod('
'$lastConsumed, '
'$externalToken, '
@@ -344,6 +424,9 @@
void endClassFactoryMethod(
Token beginToken, Token factoryKeyword, Token endToken) {
indent--;
+ seen(beginToken);
+ seen(factoryKeyword);
+ seen(endToken);
doPrint('endClassFactoryMethod('
'$beginToken, '
'$factoryKeyword, '
@@ -353,6 +436,9 @@
void endMixinFactoryMethod(
Token beginToken, Token factoryKeyword, Token endToken) {
indent--;
+ seen(beginToken);
+ seen(factoryKeyword);
+ seen(endToken);
doPrint('endMixinFactoryMethod('
'$beginToken, '
'$factoryKeyword, '
@@ -362,6 +448,9 @@
void endExtensionFactoryMethod(
Token beginToken, Token factoryKeyword, Token endToken) {
indent--;
+ seen(beginToken);
+ seen(factoryKeyword);
+ seen(endToken);
doPrint('endExtensionFactoryMethod('
'$beginToken, '
'$factoryKeyword, '
@@ -370,6 +459,10 @@
void beginFormalParameter(Token token, MemberKind kind, Token requiredToken,
Token covariantToken, Token varFinalOrConst) {
+ seen(token);
+ seen(requiredToken);
+ seen(covariantToken);
+ seen(varFinalOrConst);
doPrint('beginFormalParameter('
'$token, '
'$kind, '
@@ -388,6 +481,11 @@
FormalParameterKind kind,
MemberKind memberKind) {
indent--;
+ seen(thisKeyword);
+ seen(periodAfterThis);
+ seen(nameToken);
+ seen(initializerStart);
+ seen(initializerEnd);
doPrint('endFormalParameter('
'$thisKeyword, '
'$periodAfterThis, '
@@ -399,10 +497,12 @@
}
void handleNoFormalParameters(Token token, MemberKind kind) {
+ seen(token);
doPrint('handleNoFormalParameters(' '$token, ' '$kind)');
}
void beginFormalParameters(Token token, MemberKind kind) {
+ seen(token);
doPrint('beginFormalParameters(' '$token, ' '$kind)');
indent++;
}
@@ -410,6 +510,8 @@
void endFormalParameters(
int count, Token beginToken, Token endToken, MemberKind kind) {
indent--;
+ seen(beginToken);
+ seen(endToken);
doPrint('endFormalParameters('
'$count, '
'$beginToken, '
@@ -420,6 +522,12 @@
void endClassFields(Token staticToken, Token covariantToken, Token lateToken,
Token varFinalOrConst, int count, Token beginToken, Token endToken) {
indent--;
+ seen(staticToken);
+ seen(covariantToken);
+ seen(lateToken);
+ seen(varFinalOrConst);
+ seen(beginToken);
+ seen(endToken);
doPrint('endClassFields('
'$staticToken, '
'$covariantToken, '
@@ -433,6 +541,12 @@
void endMixinFields(Token staticToken, Token covariantToken, Token lateToken,
Token varFinalOrConst, int count, Token beginToken, Token endToken) {
indent--;
+ seen(staticToken);
+ seen(covariantToken);
+ seen(lateToken);
+ seen(varFinalOrConst);
+ seen(beginToken);
+ seen(endToken);
doPrint('endMixinFields('
'$staticToken, '
'$covariantToken, '
@@ -452,6 +566,12 @@
Token beginToken,
Token endToken) {
indent--;
+ seen(staticToken);
+ seen(covariantToken);
+ seen(lateToken);
+ seen(varFinalOrConst);
+ seen(beginToken);
+ seen(endToken);
doPrint('endExtensionFields('
'$staticToken, '
'$covariantToken, '
@@ -463,25 +583,32 @@
}
void handleForInitializerEmptyStatement(Token token) {
+ seen(token);
doPrint('handleForInitializerEmptyStatement(' '$token)');
}
void handleForInitializerExpressionStatement(Token token, bool forIn) {
+ seen(token);
doPrint('handleForInitializerExpressionStatement(' '$token, ' '$forIn)');
}
void handleForInitializerLocalVariableDeclaration(Token token, bool forIn) {
+ seen(token);
doPrint(
'handleForInitializerLocalVariableDeclaration(' '$token, ' '$forIn)');
}
void beginForStatement(Token token) {
+ seen(token);
doPrint('beginForStatement(' '$token)');
indent++;
}
void handleForLoopParts(Token forKeyword, Token leftParen,
Token leftSeparator, int updateExpressionCount) {
+ seen(forKeyword);
+ seen(leftParen);
+ seen(leftSeparator);
doPrint('handleForLoopParts('
'$forKeyword, '
'$leftParen, '
@@ -491,21 +618,28 @@
void endForStatement(Token endToken) {
indent--;
+ seen(endToken);
doPrint('endForStatement(' '$endToken)');
}
void beginForStatementBody(Token token) {
+ seen(token);
doPrint('beginForStatementBody(' '$token)');
indent++;
}
void endForStatementBody(Token token) {
indent--;
+ seen(token);
doPrint('endForStatementBody(' '$token)');
}
void handleForInLoopParts(Token awaitToken, Token forToken,
Token leftParenthesis, Token inKeyword) {
+ seen(awaitToken);
+ seen(forToken);
+ seen(leftParenthesis);
+ seen(inKeyword);
doPrint('handleForInLoopParts('
'$awaitToken, '
'$forToken, '
@@ -515,78 +649,96 @@
void endForIn(Token endToken) {
indent--;
+ seen(endToken);
doPrint('endForIn(' '$endToken)');
}
void beginForInExpression(Token token) {
+ seen(token);
doPrint('beginForInExpression(' '$token)');
indent++;
}
void endForInExpression(Token token) {
indent--;
+ seen(token);
doPrint('endForInExpression(' '$token)');
}
void beginForInBody(Token token) {
+ seen(token);
doPrint('beginForInBody(' '$token)');
indent++;
}
void endForInBody(Token token) {
indent--;
+ seen(token);
doPrint('endForInBody(' '$token)');
}
void beginNamedFunctionExpression(Token token) {
+ seen(token);
doPrint('beginNamedFunctionExpression(' '$token)');
indent++;
}
void endNamedFunctionExpression(Token endToken) {
indent--;
+ seen(endToken);
doPrint('endNamedFunctionExpression(' '$endToken)');
}
void beginLocalFunctionDeclaration(Token token) {
+ seen(token);
doPrint('beginLocalFunctionDeclaration(' '$token)');
indent++;
}
void endLocalFunctionDeclaration(Token endToken) {
indent--;
+ seen(endToken);
doPrint('endLocalFunctionDeclaration(' '$endToken)');
}
void beginBlockFunctionBody(Token token) {
+ seen(token);
doPrint('beginBlockFunctionBody(' '$token)');
indent++;
}
void endBlockFunctionBody(int count, Token beginToken, Token endToken) {
indent--;
+ seen(beginToken);
+ seen(endToken);
doPrint('endBlockFunctionBody(' '$count, ' '$beginToken, ' '$endToken)');
}
void handleNoFunctionBody(Token token) {
+ seen(token);
doPrint('handleNoFunctionBody(' '$token)');
}
void handleFunctionBodySkipped(Token token, bool isExpressionBody) {
+ seen(token);
doPrint('handleFunctionBodySkipped(' '$token, ' '$isExpressionBody)');
}
void beginFunctionName(Token token) {
+ seen(token);
doPrint('beginFunctionName(' '$token)');
indent++;
}
void endFunctionName(Token beginToken, Token token) {
indent--;
+ seen(beginToken);
+ seen(token);
doPrint('endFunctionName(' '$beginToken, ' '$token)');
}
void beginFunctionTypeAlias(Token token) {
+ seen(token);
doPrint('beginFunctionTypeAlias(' '$token)');
indent++;
}
@@ -594,11 +746,15 @@
void endFunctionTypeAlias(
Token typedefKeyword, Token equals, Token endToken) {
indent--;
+ seen(typedefKeyword);
+ seen(equals);
+ seen(endToken);
doPrint(
'endFunctionTypeAlias(' '$typedefKeyword, ' '$equals, ' '$endToken)');
}
void handleClassWithClause(Token withKeyword) {
+ seen(withKeyword);
doPrint('handleClassWithClause(' '$withKeyword)');
}
@@ -608,18 +764,27 @@
void beginNamedMixinApplication(
Token begin, Token abstractToken, Token name) {
+ seen(begin);
+ seen(abstractToken);
+ seen(name);
doPrint(
'beginNamedMixinApplication(' '$begin, ' '$abstractToken, ' '$name)');
indent++;
}
void handleNamedMixinApplicationWithClause(Token withKeyword) {
+ seen(withKeyword);
doPrint('handleNamedMixinApplicationWithClause(' '$withKeyword)');
}
void endNamedMixinApplication(Token begin, Token classKeyword, Token equals,
Token implementsKeyword, Token endToken) {
indent--;
+ seen(begin);
+ seen(classKeyword);
+ seen(equals);
+ seen(implementsKeyword);
+ seen(endToken);
doPrint('endNamedMixinApplication('
'$begin, '
'$classKeyword, '
@@ -629,12 +794,14 @@
}
void beginHide(Token hideKeyword) {
+ seen(hideKeyword);
doPrint('beginHide(' '$hideKeyword)');
indent++;
}
void endHide(Token hideKeyword) {
indent--;
+ seen(hideKeyword);
doPrint('endHide(' '$hideKeyword)');
}
@@ -643,6 +810,7 @@
}
void beginTypeList(Token token) {
+ seen(token);
doPrint('beginTypeList(' '$token)');
indent++;
}
@@ -653,54 +821,68 @@
}
void beginIfStatement(Token token) {
+ seen(token);
doPrint('beginIfStatement(' '$token)');
indent++;
}
void endIfStatement(Token ifToken, Token elseToken) {
indent--;
+ seen(ifToken);
+ seen(elseToken);
doPrint('endIfStatement(' '$ifToken, ' '$elseToken)');
}
void beginThenStatement(Token token) {
+ seen(token);
doPrint('beginThenStatement(' '$token)');
indent++;
}
void endThenStatement(Token token) {
indent--;
+ seen(token);
doPrint('endThenStatement(' '$token)');
}
void beginElseStatement(Token token) {
+ seen(token);
doPrint('beginElseStatement(' '$token)');
indent++;
}
void endElseStatement(Token token) {
indent--;
+ seen(token);
doPrint('endElseStatement(' '$token)');
}
void beginImport(Token importKeyword) {
+ seen(importKeyword);
doPrint('beginImport(' '$importKeyword)');
indent++;
}
void handleImportPrefix(Token deferredKeyword, Token asKeyword) {
+ seen(deferredKeyword);
+ seen(asKeyword);
doPrint('handleImportPrefix(' '$deferredKeyword, ' '$asKeyword)');
}
void endImport(Token importKeyword, Token semicolon) {
indent--;
+ seen(importKeyword);
+ seen(semicolon);
doPrint('endImport(' '$importKeyword, ' '$semicolon)');
}
void handleRecoverImport(Token semicolon) {
+ seen(semicolon);
doPrint('handleRecoverImport(' '$semicolon)');
}
void beginConditionalUris(Token token) {
+ seen(token);
doPrint('beginConditionalUris(' '$token)');
indent++;
}
@@ -711,84 +893,105 @@
}
void beginConditionalUri(Token ifKeyword) {
+ seen(ifKeyword);
doPrint('beginConditionalUri(' '$ifKeyword)');
indent++;
}
void endConditionalUri(Token ifKeyword, Token leftParen, Token equalSign) {
indent--;
+ seen(ifKeyword);
+ seen(leftParen);
+ seen(equalSign);
doPrint('endConditionalUri(' '$ifKeyword, ' '$leftParen, ' '$equalSign)');
}
void handleDottedName(int count, Token firstIdentifier) {
+ seen(firstIdentifier);
doPrint('handleDottedName(' '$count, ' '$firstIdentifier)');
}
void beginImplicitCreationExpression(Token token) {
+ seen(token);
doPrint('beginImplicitCreationExpression(' '$token)');
indent++;
}
void endImplicitCreationExpression(Token token) {
indent--;
+ seen(token);
doPrint('endImplicitCreationExpression(' '$token)');
}
void beginInitializedIdentifier(Token token) {
+ seen(token);
doPrint('beginInitializedIdentifier(' '$token)');
indent++;
}
void endInitializedIdentifier(Token nameToken) {
indent--;
+ seen(nameToken);
doPrint('endInitializedIdentifier(' '$nameToken)');
}
void beginFieldInitializer(Token token) {
+ seen(token);
doPrint('beginFieldInitializer(' '$token)');
indent++;
}
void endFieldInitializer(Token assignment, Token token) {
indent--;
+ seen(assignment);
+ seen(token);
doPrint('endFieldInitializer(' '$assignment, ' '$token)');
}
void handleNoFieldInitializer(Token token) {
+ seen(token);
doPrint('handleNoFieldInitializer(' '$token)');
}
void beginVariableInitializer(Token token) {
+ seen(token);
doPrint('beginVariableInitializer(' '$token)');
indent++;
}
void endVariableInitializer(Token assignmentOperator) {
indent--;
+ seen(assignmentOperator);
doPrint('endVariableInitializer(' '$assignmentOperator)');
}
void handleNoVariableInitializer(Token token) {
+ seen(token);
doPrint('handleNoVariableInitializer(' '$token)');
}
void beginInitializer(Token token) {
+ seen(token);
doPrint('beginInitializer(' '$token)');
indent++;
}
void endInitializer(Token token) {
indent--;
+ seen(token);
doPrint('endInitializer(' '$token)');
}
void beginInitializers(Token token) {
+ seen(token);
doPrint('beginInitializers(' '$token)');
indent++;
}
void endInitializers(int count, Token beginToken, Token endToken) {
indent--;
+ seen(beginToken);
+ seen(endToken);
doPrint('endInitializers(' '$count, ' '$beginToken, ' '$endToken)');
}
@@ -797,22 +1000,27 @@
}
void handleInvalidExpression(Token token) {
+ seen(token);
doPrint('handleInvalidExpression(' '$token)');
}
void handleInvalidFunctionBody(Token token) {
+ seen(token);
doPrint('handleInvalidFunctionBody(' '$token)');
}
void handleInvalidTypeReference(Token token) {
+ seen(token);
doPrint('handleInvalidTypeReference(' '$token)');
}
void handleLabel(Token token) {
+ seen(token);
doPrint('handleLabel(' '$token)');
}
void beginLabeledStatement(Token token, int labelCount) {
+ seen(token);
doPrint('beginLabeledStatement(' '$token, ' '$labelCount)');
indent++;
}
@@ -823,34 +1031,44 @@
}
void beginLibraryName(Token token) {
+ seen(token);
doPrint('beginLibraryName(' '$token)');
indent++;
}
void endLibraryName(Token libraryKeyword, Token semicolon) {
indent--;
+ seen(libraryKeyword);
+ seen(semicolon);
doPrint('endLibraryName(' '$libraryKeyword, ' '$semicolon)');
}
void handleLiteralMapEntry(Token colon, Token endToken) {
+ seen(colon);
+ seen(endToken);
doPrint('handleLiteralMapEntry(' '$colon, ' '$endToken)');
}
void beginLiteralString(Token token) {
+ seen(token);
doPrint('beginLiteralString(' '$token)');
indent++;
}
void handleInterpolationExpression(Token leftBracket, Token rightBracket) {
+ seen(leftBracket);
+ seen(rightBracket);
doPrint('handleInterpolationExpression(' '$leftBracket, ' '$rightBracket)');
}
void endLiteralString(int interpolationCount, Token endToken) {
indent--;
+ seen(endToken);
doPrint('endLiteralString(' '$interpolationCount, ' '$endToken)');
}
void handleStringJuxtaposition(Token startToken, int literalCount) {
+ seen(startToken);
doPrint('handleStringJuxtaposition(' '$startToken, ' '$literalCount)');
}
@@ -860,6 +1078,7 @@
}
void handleInvalidMember(Token endToken) {
+ seen(endToken);
doPrint('handleInvalidMember(' '$endToken)');
}
@@ -870,6 +1089,12 @@
void beginMethod(Token externalToken, Token staticToken, Token covariantToken,
Token varFinalOrConst, Token getOrSet, Token name) {
+ seen(externalToken);
+ seen(staticToken);
+ seen(covariantToken);
+ seen(varFinalOrConst);
+ seen(getOrSet);
+ seen(name);
doPrint('beginMethod('
'$externalToken, '
'$staticToken, '
@@ -883,6 +1108,11 @@
void endClassMethod(Token getOrSet, Token beginToken, Token beginParam,
Token beginInitializers, Token endToken) {
indent--;
+ seen(getOrSet);
+ seen(beginToken);
+ seen(beginParam);
+ seen(beginInitializers);
+ seen(endToken);
doPrint('endClassMethod('
'$getOrSet, '
'$beginToken, '
@@ -894,6 +1124,11 @@
void endMixinMethod(Token getOrSet, Token beginToken, Token beginParam,
Token beginInitializers, Token endToken) {
indent--;
+ seen(getOrSet);
+ seen(beginToken);
+ seen(beginParam);
+ seen(beginInitializers);
+ seen(endToken);
doPrint('endMixinMethod('
'$getOrSet, '
'$beginToken, '
@@ -905,6 +1140,11 @@
void endExtensionMethod(Token getOrSet, Token beginToken, Token beginParam,
Token beginInitializers, Token endToken) {
indent--;
+ seen(getOrSet);
+ seen(beginToken);
+ seen(beginParam);
+ seen(beginInitializers);
+ seen(endToken);
doPrint('endExtensionMethod('
'$getOrSet, '
'$beginToken, '
@@ -916,6 +1156,11 @@
void endClassConstructor(Token getOrSet, Token beginToken, Token beginParam,
Token beginInitializers, Token endToken) {
indent--;
+ seen(getOrSet);
+ seen(beginToken);
+ seen(beginParam);
+ seen(beginInitializers);
+ seen(endToken);
doPrint('endClassConstructor('
'$getOrSet, '
'$beginToken, '
@@ -927,6 +1172,11 @@
void endMixinConstructor(Token getOrSet, Token beginToken, Token beginParam,
Token beginInitializers, Token endToken) {
indent--;
+ seen(getOrSet);
+ seen(beginToken);
+ seen(beginParam);
+ seen(beginInitializers);
+ seen(endToken);
doPrint('endMixinConstructor('
'$getOrSet, '
'$beginToken, '
@@ -938,6 +1188,11 @@
void endExtensionConstructor(Token getOrSet, Token beginToken,
Token beginParam, Token beginInitializers, Token endToken) {
indent--;
+ seen(getOrSet);
+ seen(beginToken);
+ seen(beginParam);
+ seen(beginInitializers);
+ seen(endToken);
doPrint('endExtensionConstructor('
'$getOrSet, '
'$beginToken, '
@@ -947,6 +1202,7 @@
}
void beginMetadataStar(Token token) {
+ seen(token);
doPrint('beginMetadataStar(' '$token)');
indent++;
}
@@ -957,16 +1213,21 @@
}
void beginMetadata(Token token) {
+ seen(token);
doPrint('beginMetadata(' '$token)');
indent++;
}
void endMetadata(Token beginToken, Token periodBeforeName, Token endToken) {
indent--;
+ seen(beginToken);
+ seen(periodBeforeName);
+ seen(endToken);
doPrint('endMetadata(' '$beginToken, ' '$periodBeforeName, ' '$endToken)');
}
void beginOptionalFormalParameters(Token token) {
+ seen(token);
doPrint('beginOptionalFormalParameters(' '$token)');
indent++;
}
@@ -974,21 +1235,27 @@
void endOptionalFormalParameters(
int count, Token beginToken, Token endToken) {
indent--;
+ seen(beginToken);
+ seen(endToken);
doPrint(
'endOptionalFormalParameters(' '$count, ' '$beginToken, ' '$endToken)');
}
void beginPart(Token token) {
+ seen(token);
doPrint('beginPart(' '$token)');
indent++;
}
void endPart(Token partKeyword, Token semicolon) {
indent--;
+ seen(partKeyword);
+ seen(semicolon);
doPrint('endPart(' '$partKeyword, ' '$semicolon)');
}
void beginPartOf(Token token) {
+ seen(token);
doPrint('beginPartOf(' '$token)');
indent++;
}
@@ -996,6 +1263,9 @@
void endPartOf(
Token partKeyword, Token ofKeyword, Token semicolon, bool hasName) {
indent--;
+ seen(partKeyword);
+ seen(ofKeyword);
+ seen(semicolon);
doPrint('endPartOf('
'$partKeyword, '
'$ofKeyword, '
@@ -1004,115 +1274,150 @@
}
void beginRedirectingFactoryBody(Token token) {
+ seen(token);
doPrint('beginRedirectingFactoryBody(' '$token)');
indent++;
}
void endRedirectingFactoryBody(Token beginToken, Token endToken) {
indent--;
+ seen(beginToken);
+ seen(endToken);
doPrint('endRedirectingFactoryBody(' '$beginToken, ' '$endToken)');
}
void beginReturnStatement(Token token) {
+ seen(token);
doPrint('beginReturnStatement(' '$token)');
indent++;
}
void handleNativeFunctionBody(Token nativeToken, Token semicolon) {
+ seen(nativeToken);
+ seen(semicolon);
doPrint('handleNativeFunctionBody(' '$nativeToken, ' '$semicolon)');
}
void handleNativeFunctionBodyIgnored(Token nativeToken, Token semicolon) {
+ seen(nativeToken);
+ seen(semicolon);
doPrint('handleNativeFunctionBodyIgnored(' '$nativeToken, ' '$semicolon)');
}
void handleNativeFunctionBodySkipped(Token nativeToken, Token semicolon) {
+ seen(nativeToken);
+ seen(semicolon);
doPrint('handleNativeFunctionBodySkipped(' '$nativeToken, ' '$semicolon)');
}
void handleEmptyFunctionBody(Token semicolon) {
+ seen(semicolon);
doPrint('handleEmptyFunctionBody(' '$semicolon)');
}
void handleExpressionFunctionBody(Token arrowToken, Token endToken) {
+ seen(arrowToken);
+ seen(endToken);
doPrint('handleExpressionFunctionBody(' '$arrowToken, ' '$endToken)');
}
void endReturnStatement(
bool hasExpression, Token beginToken, Token endToken) {
indent--;
+ seen(beginToken);
+ seen(endToken);
doPrint(
'endReturnStatement(' '$hasExpression, ' '$beginToken, ' '$endToken)');
}
void handleSend(Token beginToken, Token endToken) {
+ seen(beginToken);
+ seen(endToken);
doPrint('handleSend(' '$beginToken, ' '$endToken)');
}
void beginShow(Token showKeyword) {
+ seen(showKeyword);
doPrint('beginShow(' '$showKeyword)');
indent++;
}
void endShow(Token showKeyword) {
indent--;
+ seen(showKeyword);
doPrint('endShow(' '$showKeyword)');
}
void beginSwitchStatement(Token token) {
+ seen(token);
doPrint('beginSwitchStatement(' '$token)');
indent++;
}
void endSwitchStatement(Token switchKeyword, Token endToken) {
indent--;
+ seen(switchKeyword);
+ seen(endToken);
doPrint('endSwitchStatement(' '$switchKeyword, ' '$endToken)');
}
void beginSwitchBlock(Token token) {
+ seen(token);
doPrint('beginSwitchBlock(' '$token)');
indent++;
}
void endSwitchBlock(int caseCount, Token beginToken, Token endToken) {
indent--;
+ seen(beginToken);
+ seen(endToken);
doPrint('endSwitchBlock(' '$caseCount, ' '$beginToken, ' '$endToken)');
}
void beginLiteralSymbol(Token token) {
+ seen(token);
doPrint('beginLiteralSymbol(' '$token)');
indent++;
}
void endLiteralSymbol(Token hashToken, int identifierCount) {
indent--;
+ seen(hashToken);
doPrint('endLiteralSymbol(' '$hashToken, ' '$identifierCount)');
}
void handleThrowExpression(Token throwToken, Token endToken) {
+ seen(throwToken);
+ seen(endToken);
doPrint('handleThrowExpression(' '$throwToken, ' '$endToken)');
}
void beginRethrowStatement(Token token) {
+ seen(token);
doPrint('beginRethrowStatement(' '$token)');
indent++;
}
void endRethrowStatement(Token rethrowToken, Token endToken) {
indent--;
+ seen(rethrowToken);
+ seen(endToken);
doPrint('endRethrowStatement(' '$rethrowToken, ' '$endToken)');
}
void endTopLevelDeclaration(Token token) {
indent--;
+ seen(token);
doPrint('endTopLevelDeclaration(' '$token)');
}
void handleInvalidTopLevelDeclaration(Token endToken) {
+ seen(endToken);
doPrint('handleInvalidTopLevelDeclaration(' '$endToken)');
}
void beginTopLevelMember(Token token) {
+ seen(token);
doPrint('beginTopLevelMember(' '$token)');
indent++;
}
@@ -1126,6 +1431,12 @@
Token beginToken,
Token endToken) {
indent--;
+ seen(staticToken);
+ seen(covariantToken);
+ seen(lateToken);
+ seen(varFinalOrConst);
+ seen(beginToken);
+ seen(endToken);
doPrint('endTopLevelFields('
'$staticToken, '
'$covariantToken, '
@@ -1137,100 +1448,133 @@
}
void beginTopLevelMethod(Token lastConsumed, Token externalToken) {
+ seen(lastConsumed);
+ seen(externalToken);
doPrint('beginTopLevelMethod(' '$lastConsumed, ' '$externalToken)');
indent++;
}
void endTopLevelMethod(Token beginToken, Token getOrSet, Token endToken) {
indent--;
+ seen(beginToken);
+ seen(getOrSet);
+ seen(endToken);
doPrint('endTopLevelMethod(' '$beginToken, ' '$getOrSet, ' '$endToken)');
}
void beginTryStatement(Token token) {
+ seen(token);
doPrint('beginTryStatement(' '$token)');
indent++;
}
void handleCaseMatch(Token caseKeyword, Token colon) {
+ seen(caseKeyword);
+ seen(colon);
doPrint('handleCaseMatch(' '$caseKeyword, ' '$colon)');
}
void beginCatchClause(Token token) {
+ seen(token);
doPrint('beginCatchClause(' '$token)');
indent++;
}
void endCatchClause(Token token) {
indent--;
+ seen(token);
doPrint('endCatchClause(' '$token)');
}
void handleCatchBlock(Token onKeyword, Token catchKeyword, Token comma) {
+ seen(onKeyword);
+ seen(catchKeyword);
+ seen(comma);
doPrint('handleCatchBlock(' '$onKeyword, ' '$catchKeyword, ' '$comma)');
}
void handleFinallyBlock(Token finallyKeyword) {
+ seen(finallyKeyword);
doPrint('handleFinallyBlock(' '$finallyKeyword)');
}
void endTryStatement(int catchCount, Token tryKeyword, Token finallyKeyword) {
indent--;
+ seen(tryKeyword);
+ seen(finallyKeyword);
doPrint(
'endTryStatement(' '$catchCount, ' '$tryKeyword, ' '$finallyKeyword)');
}
void handleType(Token beginToken, Token questionMark) {
+ seen(beginToken);
+ seen(questionMark);
doPrint('handleType(' '$beginToken, ' '$questionMark)');
}
void handleNonNullAssertExpression(Token bang) {
+ seen(bang);
doPrint('handleNonNullAssertExpression(' '$bang)');
}
void handleNoName(Token token) {
+ seen(token);
doPrint('handleNoName(' '$token)');
}
void beginFunctionType(Token beginToken) {
+ seen(beginToken);
doPrint('beginFunctionType(' '$beginToken)');
indent++;
}
void endFunctionType(Token functionToken, Token questionMark) {
indent--;
+ seen(functionToken);
+ seen(questionMark);
doPrint('endFunctionType(' '$functionToken, ' '$questionMark)');
}
void beginTypeArguments(Token token) {
+ seen(token);
doPrint('beginTypeArguments(' '$token)');
indent++;
}
void endTypeArguments(int count, Token beginToken, Token endToken) {
indent--;
+ seen(beginToken);
+ seen(endToken);
doPrint('endTypeArguments(' '$count, ' '$beginToken, ' '$endToken)');
}
void handleInvalidTypeArguments(Token token) {
+ seen(token);
doPrint('handleInvalidTypeArguments(' '$token)');
}
void handleNoTypeArguments(Token token) {
+ seen(token);
doPrint('handleNoTypeArguments(' '$token)');
}
void beginTypeVariable(Token token) {
+ seen(token);
doPrint('beginTypeVariable(' '$token)');
indent++;
}
void handleTypeVariablesDefined(Token token, int count) {
+ seen(token);
doPrint('handleTypeVariablesDefined(' '$token, ' '$count)');
}
void endTypeVariable(
Token token, int index, Token extendsOrSuper, Token variance) {
indent--;
+ seen(token);
+ seen(extendsOrSuper);
+ seen(variance);
doPrint('endTypeVariable('
'$token, '
'$index, '
@@ -1239,31 +1583,41 @@
}
void beginTypeVariables(Token token) {
+ seen(token);
doPrint('beginTypeVariables(' '$token)');
indent++;
}
void endTypeVariables(Token beginToken, Token endToken) {
indent--;
+ seen(beginToken);
+ seen(endToken);
doPrint('endTypeVariables(' '$beginToken, ' '$endToken)');
}
void reportVarianceModifierNotEnabled(Token variance) {
+ seen(variance);
doPrint('reportVarianceModifierNotEnabled(' '$variance)');
}
void beginFunctionExpression(Token token) {
+ seen(token);
doPrint('beginFunctionExpression(' '$token)');
indent++;
}
void endFunctionExpression(Token beginToken, Token token) {
indent--;
+ seen(beginToken);
+ seen(token);
doPrint('endFunctionExpression(' '$beginToken, ' '$token)');
}
void beginVariablesDeclaration(
Token token, Token lateToken, Token varFinalOrConst) {
+ seen(token);
+ seen(lateToken);
+ seen(varFinalOrConst);
doPrint('beginVariablesDeclaration('
'$token, '
'$lateToken, '
@@ -1273,36 +1627,45 @@
void endVariablesDeclaration(int count, Token endToken) {
indent--;
+ seen(endToken);
doPrint('endVariablesDeclaration(' '$count, ' '$endToken)');
}
void beginWhileStatement(Token token) {
+ seen(token);
doPrint('beginWhileStatement(' '$token)');
indent++;
}
void endWhileStatement(Token whileKeyword, Token endToken) {
indent--;
+ seen(whileKeyword);
+ seen(endToken);
doPrint('endWhileStatement(' '$whileKeyword, ' '$endToken)');
}
void handleAsOperator(Token operator) {
+ seen(operator);
doPrint('handleAsOperator(' '$operator)');
}
void handleAssignmentExpression(Token token) {
+ seen(token);
doPrint('handleAssignmentExpression(' '$token)');
}
void beginBinaryExpression(Token token) {
+ seen(token);
doPrint('beginBinaryExpression(' '$token)');
}
void endBinaryExpression(Token token) {
+ seen(token);
doPrint('endBinaryExpression(' '$token)');
}
void beginConditionalExpression(Token question) {
+ seen(question);
doPrint('beginConditionalExpression(' '$question)');
indent++;
}
@@ -1313,78 +1676,99 @@
void endConditionalExpression(Token question, Token colon) {
indent--;
+ seen(question);
+ seen(colon);
doPrint('endConditionalExpression(' '$question, ' '$colon)');
}
void beginConstExpression(Token constKeyword) {
+ seen(constKeyword);
doPrint('beginConstExpression(' '$constKeyword)');
indent++;
}
void endConstExpression(Token token) {
indent--;
+ seen(token);
doPrint('endConstExpression(' '$token)');
}
void beginForControlFlow(Token awaitToken, Token forToken) {
+ seen(awaitToken);
+ seen(forToken);
doPrint('beginForControlFlow(' '$awaitToken, ' '$forToken)');
indent++;
}
void endForControlFlow(Token token) {
indent--;
+ seen(token);
doPrint('endForControlFlow(' '$token)');
}
void endForInControlFlow(Token token) {
indent--;
+ seen(token);
doPrint('endForInControlFlow(' '$token)');
}
void beginIfControlFlow(Token ifToken) {
+ seen(ifToken);
doPrint('beginIfControlFlow(' '$ifToken)');
indent++;
}
void beginThenControlFlow(Token token) {
+ seen(token);
doPrint('beginThenControlFlow(' '$token)');
indent++;
}
void handleElseControlFlow(Token elseToken) {
+ seen(elseToken);
doPrint('handleElseControlFlow(' '$elseToken)');
}
void endIfControlFlow(Token token) {
indent--;
+ seen(token);
doPrint('endIfControlFlow(' '$token)');
}
void endIfElseControlFlow(Token token) {
indent--;
+ seen(token);
doPrint('endIfElseControlFlow(' '$token)');
}
void handleSpreadExpression(Token spreadToken) {
+ seen(spreadToken);
doPrint('handleSpreadExpression(' '$spreadToken)');
}
void beginFunctionTypedFormalParameter(Token token) {
+ seen(token);
doPrint('beginFunctionTypedFormalParameter(' '$token)');
indent++;
}
void endFunctionTypedFormalParameter(Token nameToken, Token question) {
indent--;
+ seen(nameToken);
+ seen(question);
doPrint('endFunctionTypedFormalParameter(' '$nameToken, ' '$question)');
}
void handleIdentifier(Token token, IdentifierContext context) {
+ seen(token);
doPrint('handleIdentifier(' '$token, ' '$context)');
}
void handleIndexedExpression(
Token question, Token openSquareBracket, Token closeSquareBracket) {
+ seen(question);
+ seen(openSquareBracket);
+ seen(closeSquareBracket);
doPrint('handleIndexedExpression('
'$question, '
'$openSquareBracket, '
@@ -1392,21 +1776,28 @@
}
void handleIsOperator(Token isOperator, Token not) {
+ seen(isOperator);
+ seen(not);
doPrint('handleIsOperator(' '$isOperator, ' '$not)');
}
void handleLiteralBool(Token token) {
+ seen(token);
doPrint('handleLiteralBool(' '$token)');
}
void handleBreakStatement(
bool hasTarget, Token breakKeyword, Token endToken) {
+ seen(breakKeyword);
+ seen(endToken);
doPrint(
'handleBreakStatement(' '$hasTarget, ' '$breakKeyword, ' '$endToken)');
}
void handleContinueStatement(
bool hasTarget, Token continueKeyword, Token endToken) {
+ seen(continueKeyword);
+ seen(endToken);
doPrint('handleContinueStatement('
'$hasTarget, '
'$continueKeyword, '
@@ -1414,10 +1805,12 @@
}
void handleEmptyStatement(Token token) {
+ seen(token);
doPrint('handleEmptyStatement(' '$token)');
}
void beginAssert(Token assertKeyword, Assert kind) {
+ seen(assertKeyword);
doPrint('beginAssert(' '$assertKeyword, ' '$kind)');
indent++;
}
@@ -1425,6 +1818,10 @@
void endAssert(Token assertKeyword, Assert kind, Token leftParenthesis,
Token commaToken, Token semicolonToken) {
indent--;
+ seen(assertKeyword);
+ seen(leftParenthesis);
+ seen(commaToken);
+ seen(semicolonToken);
doPrint('endAssert('
'$assertKeyword, '
'$kind, '
@@ -1434,15 +1831,20 @@
}
void handleLiteralDouble(Token token) {
+ seen(token);
doPrint('handleLiteralDouble(' '$token)');
}
void handleLiteralInt(Token token) {
+ seen(token);
doPrint('handleLiteralInt(' '$token)');
}
void handleLiteralList(
int count, Token leftBracket, Token constKeyword, Token rightBracket) {
+ seen(leftBracket);
+ seen(constKeyword);
+ seen(rightBracket);
doPrint('handleLiteralList('
'$count, '
'$leftBracket, '
@@ -1457,6 +1859,9 @@
Token rightBrace,
bool hasSetEntry,
) {
+ seen(leftBrace);
+ seen(constKeyword);
+ seen(rightBrace);
doPrint('handleLiteralSetOrMap('
'$count, '
'$leftBrace, '
@@ -1466,81 +1871,102 @@
}
void handleLiteralNull(Token token) {
+ seen(token);
doPrint('handleLiteralNull(' '$token)');
}
void handleNativeClause(Token nativeToken, bool hasName) {
+ seen(nativeToken);
doPrint('handleNativeClause(' '$nativeToken, ' '$hasName)');
}
void handleNamedArgument(Token colon) {
+ seen(colon);
doPrint('handleNamedArgument(' '$colon)');
}
void beginNewExpression(Token token) {
+ seen(token);
doPrint('beginNewExpression(' '$token)');
indent++;
}
void endNewExpression(Token token) {
indent--;
+ seen(token);
doPrint('endNewExpression(' '$token)');
}
void handleNoArguments(Token token) {
+ seen(token);
doPrint('handleNoArguments(' '$token)');
}
void handleNoConstructorReferenceContinuationAfterTypeArguments(Token token) {
+ seen(token);
doPrint('handleNoConstructorReferenceContinuationAfterTypeArguments('
'$token)');
}
void handleNoType(Token lastConsumed) {
+ seen(lastConsumed);
doPrint('handleNoType(' '$lastConsumed)');
}
void handleNoTypeVariables(Token token) {
+ seen(token);
doPrint('handleNoTypeVariables(' '$token)');
}
void handleOperator(Token token) {
+ seen(token);
doPrint('handleOperator(' '$token)');
}
void handleSymbolVoid(Token token) {
+ seen(token);
doPrint('handleSymbolVoid(' '$token)');
}
void handleOperatorName(Token operatorKeyword, Token token) {
+ seen(operatorKeyword);
+ seen(token);
doPrint('handleOperatorName(' '$operatorKeyword, ' '$token)');
}
void handleInvalidOperatorName(Token operatorKeyword, Token token) {
+ seen(operatorKeyword);
+ seen(token);
doPrint('handleInvalidOperatorName(' '$operatorKeyword, ' '$token)');
}
void handleParenthesizedCondition(Token token) {
+ seen(token);
doPrint('handleParenthesizedCondition(' '$token)');
}
void handleParenthesizedExpression(Token token) {
+ seen(token);
doPrint('handleParenthesizedExpression(' '$token)');
}
void handleQualified(Token period) {
+ seen(period);
doPrint('handleQualified(' '$period)');
}
void handleStringPart(Token token) {
+ seen(token);
doPrint('handleStringPart(' '$token)');
}
void handleSuperExpression(Token token, IdentifierContext context) {
+ seen(token);
doPrint('handleSuperExpression(' '$token, ' '$context)');
}
void beginSwitchCase(int labelCount, int expressionCount, Token firstToken) {
+ seen(firstToken);
doPrint(
'beginSwitchCase(' '$labelCount, ' '$expressionCount, ' '$firstToken)');
indent++;
@@ -1555,6 +1981,10 @@
Token firstToken,
Token endToken) {
indent--;
+ seen(defaultKeyword);
+ seen(colonAfterDefault);
+ seen(firstToken);
+ seen(endToken);
doPrint('endSwitchCase('
'$labelCount, '
'$expressionCount, '
@@ -1566,18 +1996,22 @@
}
void handleThisExpression(Token token, IdentifierContext context) {
+ seen(token);
doPrint('handleThisExpression(' '$token, ' '$context)');
}
void handleUnaryPostfixAssignmentExpression(Token token) {
+ seen(token);
doPrint('handleUnaryPostfixAssignmentExpression(' '$token)');
}
void handleUnaryPrefixExpression(Token token) {
+ seen(token);
doPrint('handleUnaryPrefixExpression(' '$token)');
}
void handleUnaryPrefixAssignmentExpression(Token token) {
+ seen(token);
doPrint('handleUnaryPrefixAssignmentExpression(' '$token)');
}
@@ -1592,33 +2026,44 @@
}
void handleValuedFormalParameter(Token equals, Token token) {
+ seen(equals);
+ seen(token);
doPrint('handleValuedFormalParameter(' '$equals, ' '$token)');
}
void handleFormalParameterWithoutValue(Token token) {
+ seen(token);
doPrint('handleFormalParameterWithoutValue(' '$token)');
}
void handleVoidKeyword(Token token) {
+ seen(token);
doPrint('handleVoidKeyword(' '$token)');
}
void handleVoidKeywordWithTypeArguments(Token token) {
+ seen(token);
doPrint('handleVoidKeywordWithTypeArguments(' '$token)');
}
void beginYieldStatement(Token token) {
+ seen(token);
doPrint('beginYieldStatement(' '$token)');
indent++;
}
void endYieldStatement(Token yieldToken, Token starToken, Token endToken) {
indent--;
+ seen(yieldToken);
+ seen(starToken);
+ seen(endToken);
doPrint('endYieldStatement(' '$yieldToken, ' '$starToken, ' '$endToken)');
}
void handleRecoverableError(
Message message, Token startToken, Token endToken) {
+ seen(startToken);
+ seen(endToken);
doPrint(
'handleRecoverableError(' '$message, ' '$startToken, ' '$endToken)');
}
@@ -1629,6 +2074,7 @@
void handleUnescapeError(
Message message, Token location, int stringOffset, int length) {
+ seen(location);
doPrint('handleUnescapeError('
'$message, '
'$location, '
@@ -1637,10 +2083,12 @@
}
void handleInvalidStatement(Token token, Message message) {
+ seen(token);
doPrint('handleInvalidStatement(' '$token, ' '$message)');
}
void handleScript(Token token) {
+ seen(token);
doPrint('handleScript(' '$token)');
}
@@ -1655,6 +2103,10 @@
void handleCommentReference(
Token newKeyword, Token prefix, Token period, Token token) {
+ seen(newKeyword);
+ seen(prefix);
+ seen(period);
+ seen(token);
doPrint('handleCommentReference('
'$newKeyword, '
'$prefix, '
diff --git a/pkg/front_end/test/parser_test_listener_creator.dart b/pkg/front_end/test/parser_test_listener_creator.dart
index 9af5112..42692f6 100644
--- a/pkg/front_end/test/parser_test_listener_creator.dart
+++ b/pkg/front_end/test/parser_test_listener_creator.dart
@@ -81,10 +81,17 @@
}
void doPrint(String s) {
- String traceString = "";
- if (trace) traceString = " (${createTrace()})";
- sb.writeln((" " * indent) + s + traceString);
+ String outString = s;
+ if (trace) outString += " (${createTrace()})";
+ if (outString != "") {
+ sb.writeln((" " * indent) + outString);
+ } else {
+ sb.writeln("");
+ }
}
+
+ void seen(Token token) {}
+
""");
ParserCreatorListener listener = new ParserCreatorListener();
@@ -106,7 +113,9 @@
class ParserCreatorListener extends Listener {
bool insideListenerClass = false;
String currentMethodName;
+ String latestSeenParameterTypeToken;
List<String> parameters = <String>[];
+ List<String> parameterTypes = <String>[];
void beginClassDeclaration(Token begin, Token abstractToken, Token name) {
if (name.lexeme == "Listener") insideListenerClass = true;
@@ -152,6 +161,11 @@
currentMethodName.startsWith("end")) {
out.write("indent--;\n ");
}
+ for (int i = 0; i < parameterTypes.length; i++) {
+ if (parameterTypes[i] == "Token") {
+ out.write("seen(${parameters[i]});");
+ }
+ }
out.write("doPrint('$currentMethodName(");
String separator = "";
for (int i = 0; i < parameters.length; i++) {
@@ -172,9 +186,19 @@
out.write("\n\n");
}
parameters.clear();
+ parameterTypes.clear();
currentMethodName = null;
}
+ @override
+ void handleNoType(Token lastConsumed) {
+ latestSeenParameterTypeToken = null;
+ }
+
+ void handleType(Token beginToken, Token questionMark) {
+ latestSeenParameterTypeToken = beginToken.lexeme;
+ }
+
void endFormalParameter(
Token thisKeyword,
Token periodAfterThis,
@@ -184,5 +208,6 @@
FormalParameterKind kind,
MemberKind memberKind) {
parameters.add(nameToken.lexeme);
+ parameterTypes.add(latestSeenParameterTypeToken);
}
}
diff --git a/pkg/front_end/test/parser_test_parser.dart b/pkg/front_end/test/parser_test_parser.dart
index e916571..bef4e6a 100644
--- a/pkg/front_end/test/parser_test_parser.dart
+++ b/pkg/front_end/test/parser_test_parser.dart
@@ -689,7 +689,8 @@
Token beforeType,
TypeInfo typeInfo,
Token name,
- DeclarationKind kind) {
+ DeclarationKind kind,
+ String enclosingDeclarationName) {
doPrint('parseFields('
'$beforeStart, '
'$externalToken, '
@@ -700,7 +701,8 @@
'$beforeType, '
'$typeInfo, '
'$name, '
- '$kind)');
+ '$kind, '
+ '$enclosingDeclarationName)');
indent++;
var result = super.parseFields(
beforeStart,
@@ -712,7 +714,8 @@
beforeType,
typeInfo,
name,
- kind);
+ kind,
+ enclosingDeclarationName);
indent--;
return result;
}
@@ -741,17 +744,23 @@
return result;
}
- Token parseFieldInitializerOpt(Token token, Token name, Token lateToken,
- Token varFinalOrConst, DeclarationKind kind) {
+ Token parseFieldInitializerOpt(
+ Token token,
+ Token name,
+ Token lateToken,
+ Token varFinalOrConst,
+ DeclarationKind kind,
+ String enclosingDeclarationName) {
doPrint('parseFieldInitializerOpt('
'$token, '
'$name, '
'$lateToken, '
'$varFinalOrConst, '
- '$kind)');
+ '$kind, '
+ '$enclosingDeclarationName)');
indent++;
- var result = super.parseFieldInitializerOpt(
- token, name, lateToken, varFinalOrConst, kind);
+ var result = super.parseFieldInitializerOpt(token, name, lateToken,
+ varFinalOrConst, kind, enclosingDeclarationName);
indent--;
return result;
}
diff --git a/pkg/front_end/test/patching/patching_test.dart b/pkg/front_end/test/patching/patching_test.dart
index 389a779..3e4a103 100644
--- a/pkg/front_end/test/patching/patching_test.dart
+++ b/pkg/front_end/test/patching/patching_test.dart
@@ -139,6 +139,12 @@
});
for (Member m in clsBuilder.actualCls.members) {
+ if (m is Procedure &&
+ (m.isMemberSignature ||
+ (m.isForwardingStub && !m.isForwardingSemiStub))) {
+ // Don't include member signatures.
+ continue;
+ }
String name = m.name.name;
if (m is Constructor) {
name = '${m.enclosingClass.name}.${name}';
diff --git a/pkg/front_end/test/spell_checking_list_code.txt b/pkg/front_end/test/spell_checking_list_code.txt
index a604ce3..26b64c8 100644
--- a/pkg/front_end/test/spell_checking_list_code.txt
+++ b/pkg/front_end/test/spell_checking_list_code.txt
@@ -66,6 +66,7 @@
attributes
automagically
auxiliary
+awaited
awaiting
b
b0i
@@ -76,6 +77,7 @@
b2i
b2m
backping
+badly
bang
bar
basically
@@ -197,6 +199,7 @@
concat
concatenate
concerned
+conciser
cond
condensed
config
@@ -297,6 +300,7 @@
dispatched
divided
dmitryas
+dupdate
doc
docs
dom
@@ -331,6 +335,7 @@
en
enforce
enforced
+enforces
enumerates
env
eof
@@ -453,6 +458,7 @@
hit
hoc
hoisted
+hopefully
href
html
http
@@ -490,6 +496,8 @@
initializations
initializer's
insertion
+inspect
+inspection
inspector
inspired
inst
@@ -808,6 +816,7 @@
reach
react
realign
+realise
reassigned
rebind
rebuild
diff --git a/pkg/front_end/test/spell_checking_list_common.txt b/pkg/front_end/test/spell_checking_list_common.txt
index c71b67c..87d9f28 100644
--- a/pkg/front_end/test/spell_checking_list_common.txt
+++ b/pkg/front_end/test/spell_checking_list_common.txt
@@ -71,6 +71,8 @@
adjacent
adjust
adjusted
+admit
+admitted
adopt
advance
advanced
@@ -1052,7 +1054,9 @@
exited
exits
expand
+expands
expanding
+expansion
expect
expectation
expectations
@@ -2402,6 +2406,7 @@
rename
renamed
renaming
+repeat
repeated
repeatedly
repetitions
@@ -2809,6 +2814,7 @@
suffixes
suggested
suitable
+suites
summaries
summarize
summarizes
@@ -2920,6 +2926,7 @@
this
those
though
+threaded
three
threshold
threw
@@ -3023,9 +3030,12 @@
types
typically
typing
+ultimate
+ultimately
unable
unalias
unaliased
+unaliasing
unambiguous
unary
unassignable
diff --git a/pkg/front_end/test/spell_checking_list_tests.txt b/pkg/front_end/test/spell_checking_list_tests.txt
index 1f0db0c..46fad1f 100644
--- a/pkg/front_end/test/spell_checking_list_tests.txt
+++ b/pkg/front_end/test/spell_checking_list_tests.txt
@@ -144,6 +144,7 @@
dinteractive
dirname
disagree
+disagreement
disallowed
disconnect
discovering
@@ -270,6 +271,7 @@
ioo
isolate
isolates
+issue41210b
iter
joo
jumped
@@ -333,6 +335,7 @@
micro
minutes
mismatched
+misnamed
miss
misspelled
mistake
@@ -454,6 +457,7 @@
sqrt
squared
sssp
+stashed
stat
stats
std
@@ -502,6 +506,7 @@
typeargs
typeparam
typeparambounds
+ugly
unassignment
unawaited
unbreak
diff --git a/pkg/front_end/test/static_types/data/greatest_lower_bound_for_future_or.dart b/pkg/front_end/test/static_types/data/greatest_lower_bound_for_future_or.dart
index 28d998d..3a48961 100644
--- a/pkg/front_end/test/static_types/data/greatest_lower_bound_for_future_or.dart
+++ b/pkg/front_end/test/static_types/data/greatest_lower_bound_for_future_or.dart
@@ -28,9 +28,9 @@
// Type of the expression is GLB(FutureOr<T>, Foo) = T.
/*invoke: void*/ context(
- /*cfe.invoke: T*/ /*cfe:nnbd.invoke: Never*/ expr
+ /*cfe.invoke: T*/ /*cfe:nnbd.invoke: T!*/ expr
/*cfe.<T>*/
- /*cfe:nnbd.<Never>*/ ());
+ /*cfe:nnbd.<T!>*/ ());
}
// -----------------------------------------------------------------------------
@@ -45,9 +45,9 @@
// Type of the expression is GLB(FutureOr<T>, Future<Foo>) = Future<T>.
/*invoke: void*/ context(
/*cfe.invoke: Future<T>*/
- /*cfe:nnbd.invoke: Never*/ expr
+ /*cfe:nnbd.invoke: Future<T!>!*/ expr
/*cfe.<Future<T>>*/
- /*cfe:nnbd.<Never>*/ ());
+ /*cfe:nnbd.<Future<T!>!>*/ ());
}
// -----------------------------------------------------------------------------
@@ -97,9 +97,9 @@
// = FutureOr<Future<T>>.
/*invoke: void*/ context(
/*cfe.invoke: FutureOr<Future<T>>*/
- /*cfe:nnbd.invoke: Never*/ expr
+ /*cfe:nnbd.invoke: FutureOr<Future<T!>!>!*/ expr
/*cfe.<FutureOr<Future<T>>>*/
- /*cfe:nnbd.<Never>*/ ());
+ /*cfe:nnbd.<FutureOr<Future<T!>!>!>*/ ());
}
// -----------------------------------------------------------------------------
diff --git a/pkg/front_end/testcases/expression/main.dart b/pkg/front_end/testcases/expression/main.dart
index 0b61f5d..bdf80a9 100644
--- a/pkg/front_end/testcases/expression/main.dart
+++ b/pkg/front_end/testcases/expression/main.dart
@@ -6,6 +6,8 @@
import 'dart:io' show File, Process, exit;
+List<String> listOfStrings = ["hello"];
+
int doitstat(int x) => x + 1;
int _privateToplevel(int x) => x + 1;
diff --git a/pkg/front_end/testcases/expression/set_literal.expression.yaml b/pkg/front_end/testcases/expression/set_literal.expression.yaml
new file mode 100644
index 0000000..7354c65
--- /dev/null
+++ b/pkg/front_end/testcases/expression/set_literal.expression.yaml
@@ -0,0 +1,9 @@
+# Copyright (c) 2020, 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.
+
+entry_point: "main.dart"
+definitions: []
+position: "main.dart"
+expression: |
+ {"a"}
diff --git a/pkg/front_end/testcases/expression/set_literal.expression.yaml.expect b/pkg/front_end/testcases/expression/set_literal.expression.yaml.expect
new file mode 100644
index 0000000..c2c42bc
--- /dev/null
+++ b/pkg/front_end/testcases/expression/set_literal.expression.yaml.expect
@@ -0,0 +1,4 @@
+Errors: {
+}
+method /* from org-dartlang-debug:synthetic_debug_expression */ debugExpr() → dynamic
+ return let final dart.core::Set<dart.core::String*>* #t1 = dart.collection::LinkedHashSet::•<dart.core::String*>() in let final dynamic #t2 = #t1.{dart.core::Set::add}("a") in #t1;
diff --git a/pkg/front_end/testcases/expression/spread_element.expression.yaml b/pkg/front_end/testcases/expression/spread_element.expression.yaml
new file mode 100644
index 0000000..3583851
--- /dev/null
+++ b/pkg/front_end/testcases/expression/spread_element.expression.yaml
@@ -0,0 +1,9 @@
+# Copyright (c) 2020, 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.
+
+entry_point: "main.dart"
+definitions: []
+position: "main.dart"
+expression: |
+ [...listOfStrings]
diff --git a/pkg/front_end/testcases/expression/spread_element.expression.yaml.expect b/pkg/front_end/testcases/expression/spread_element.expression.yaml.expect
new file mode 100644
index 0000000..522353c
--- /dev/null
+++ b/pkg/front_end/testcases/expression/spread_element.expression.yaml.expect
@@ -0,0 +1,13 @@
+Errors: {
+}
+method /* from org-dartlang-debug:synthetic_debug_expression */ debugExpr() → dynamic
+ return block {
+ final dart.core::List<dart.core::String*>* #t1 = <dart.core::String*>[];
+ {
+ dart.core::Iterator<dart.core::String*>* :sync-for-iterator = dart._internal::unsafeCast<dart.core::Iterable<dart.core::String*>*>(main::listOfStrings).{dart.core::Iterable::iterator};
+ for (; :sync-for-iterator.{dart.core::Iterator::moveNext}(); ) {
+ final dart.core::String* #t2 = :sync-for-iterator.{dart.core::Iterator::current};
+ #t1.{dart.core::List::add}(#t2);
+ }
+ }
+ } =>#t1;
diff --git a/pkg/front_end/testcases/general/argument_mismatch.dart b/pkg/front_end/testcases/general/argument_mismatch.dart
index 7cce446..ec2894e 100644
--- a/pkg/front_end/testcases/general/argument_mismatch.dart
+++ b/pkg/front_end/testcases/general/argument_mismatch.dart
@@ -5,7 +5,7 @@
foo() {}
test() {
- /*@warning=MethodNotFound*/ foo(null);
+ foo(null);
}
main() {}
diff --git a/pkg/front_end/testcases/general/argument_mismatch.dart.strong.expect b/pkg/front_end/testcases/general/argument_mismatch.dart.strong.expect
index f165ac6..b0d5171 100644
--- a/pkg/front_end/testcases/general/argument_mismatch.dart.strong.expect
+++ b/pkg/front_end/testcases/general/argument_mismatch.dart.strong.expect
@@ -1,9 +1,22 @@
library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general/argument_mismatch.dart:8:6: Error: Too many positional arguments: 0 allowed, but 1 found.
+// Try removing the extra positional arguments.
+// foo(null);
+// ^
+// pkg/front_end/testcases/general/argument_mismatch.dart:5:1: Context: Found this candidate, but the arguments don't match.
+// foo() {}
+// ^^^
+//
import self as self;
-import "dart:core" as core;
static method foo() → dynamic {}
static method test() → dynamic {
- throw new core::NoSuchMethodError::withInvocation(null, new core::_InvocationMirror::_withType(#foo, 32, const <dynamic>[], <dynamic>[null].toList(growable: false), core::Map::unmodifiable<dynamic, dynamic>(const <dynamic, dynamic>{})));
+ invalid-expression "pkg/front_end/testcases/general/argument_mismatch.dart:8:6: Error: Too many positional arguments: 0 allowed, but 1 found.
+Try removing the extra positional arguments.
+ foo(null);
+ ^";
}
static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general/argument_mismatch.dart.strong.transformed.expect b/pkg/front_end/testcases/general/argument_mismatch.dart.strong.transformed.expect
new file mode 100644
index 0000000..b0d5171
--- /dev/null
+++ b/pkg/front_end/testcases/general/argument_mismatch.dart.strong.transformed.expect
@@ -0,0 +1,22 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general/argument_mismatch.dart:8:6: Error: Too many positional arguments: 0 allowed, but 1 found.
+// Try removing the extra positional arguments.
+// foo(null);
+// ^
+// pkg/front_end/testcases/general/argument_mismatch.dart:5:1: Context: Found this candidate, but the arguments don't match.
+// foo() {}
+// ^^^
+//
+import self as self;
+
+static method foo() → dynamic {}
+static method test() → dynamic {
+ invalid-expression "pkg/front_end/testcases/general/argument_mismatch.dart:8:6: Error: Too many positional arguments: 0 allowed, but 1 found.
+Try removing the extra positional arguments.
+ foo(null);
+ ^";
+}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general/bug32629.dart b/pkg/front_end/testcases/general/bug32629.dart
index fc0492f..95bb9e2 100644
--- a/pkg/front_end/testcases/general/bug32629.dart
+++ b/pkg/front_end/testcases/general/bug32629.dart
@@ -12,6 +12,8 @@
void foo<S>(Reducer<S> v) {}
-void main() {
- foo<String>(new /*@error=InvalidAssignment*/ A());
+void test() {
+ foo<String>(new A());
}
+
+main() {}
diff --git a/pkg/front_end/testcases/general/bug32629.dart.outline.expect b/pkg/front_end/testcases/general/bug32629.dart.outline.expect
index 4c03145..8c3ca39 100644
--- a/pkg/front_end/testcases/general/bug32629.dart.outline.expect
+++ b/pkg/front_end/testcases/general/bug32629.dart.outline.expect
@@ -11,5 +11,7 @@
}
static method foo<S extends core::Object* = dynamic>((self::foo::S*, dynamic) →* self::foo::S* v) → void
;
-static method main() → void
+static method test() → void
+ ;
+static method main() → dynamic
;
diff --git a/pkg/front_end/testcases/general/bug32629.dart.strong.expect b/pkg/front_end/testcases/general/bug32629.dart.strong.expect
index 0258b41..f258183 100644
--- a/pkg/front_end/testcases/general/bug32629.dart.strong.expect
+++ b/pkg/front_end/testcases/general/bug32629.dart.strong.expect
@@ -1,20 +1,27 @@
library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general/bug32629.dart:16:19: Error: The argument type 'dynamic Function(dynamic, dynamic)' can't be assigned to the parameter type 'String Function(String, dynamic)'.
+// foo<String>(new A());
+// ^
+//
import self as self;
import "dart:core" as core;
-typedef Reducer<S extends core::Object> = (S, dynamic) → S;
+typedef Reducer<invariant S extends core::Object* = dynamic> = (S*, dynamic) →* S*;
class A extends core::Object {
- synthetic constructor •() → void
+ synthetic constructor •() → self::A*
: super core::Object::•()
;
method call(dynamic a, dynamic b) → dynamic {
return a;
}
}
-static method foo<S extends core::Object>((self::foo::S, dynamic) → self::foo::S v) → void {}
-static method main() → void {
- self::foo<core::String>(let final dynamic #t1 = let final self::A #t2 = new self::A::•() in #t2.==(null) ?{(dynamic, dynamic) → dynamic} null : #t2.{self::A::call} in let dynamic _ = null in invalid-expression "pkg/front_end/testcases/bug32629.dart:18:47: Error: A value of type '(dynamic, dynamic) \u8594 dynamic' can't be assigned to a variable of type '(dart.core::String, dynamic) \u8594 dart.core::String'.
-Try changing the type of the left hand side, or casting the right hand side to '(dart.core::String, dynamic) \u8594 dart.core::String'.
- foo<String>(new /*@error=InvalidAssignment*/A());
- ^");
+static method foo<S extends core::Object* = dynamic>((self::foo::S*, dynamic) →* self::foo::S* v) → void {}
+static method test() → void {
+ self::foo<core::String*>(let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general/bug32629.dart:16:19: Error: The argument type 'dynamic Function(dynamic, dynamic)' can't be assigned to the parameter type 'String Function(String, dynamic)'.
+ foo<String>(new A());
+ ^" in (let final self::A* #t2 = new self::A::•() in #t2.==(null) ?{(dynamic, dynamic) →* dynamic} null : #t2.{self::A::call}) as{TypeError} (core::String*, dynamic) →* core::String*);
}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general/bug32629.dart.strong.transformed.expect b/pkg/front_end/testcases/general/bug32629.dart.strong.transformed.expect
index b6f7b796..f258183 100644
--- a/pkg/front_end/testcases/general/bug32629.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/bug32629.dart.strong.transformed.expect
@@ -1,20 +1,27 @@
library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general/bug32629.dart:16:19: Error: The argument type 'dynamic Function(dynamic, dynamic)' can't be assigned to the parameter type 'String Function(String, dynamic)'.
+// foo<String>(new A());
+// ^
+//
import self as self;
import "dart:core" as core;
-typedef Reducer<S extends core::Object> = (S, dynamic) → S;
+typedef Reducer<invariant S extends core::Object* = dynamic> = (S*, dynamic) →* S*;
class A extends core::Object {
- synthetic constructor •() → void
+ synthetic constructor •() → self::A*
: super core::Object::•()
;
method call(dynamic a, dynamic b) → dynamic {
return a;
}
}
-static method foo<S extends core::Object>((self::foo::S, dynamic) → self::foo::S v) → void {}
-static method main() → void {
- self::foo<core::String>(let final (dynamic, dynamic) → dynamic #t1 = let final self::A #t2 = new self::A::•() in #t2.==(null) ?{(dynamic, dynamic) → dynamic} null : #t2.{self::A::call} in let<BottomType> _ = null in invalid-expression "pkg/front_end/testcases/bug32629.dart:18:47: Error: A value of type '(dynamic, dynamic) \u8594 dynamic' can't be assigned to a variable of type '(dart.core::String, dynamic) \u8594 dart.core::String'.
-Try changing the type of the left hand side, or casting the right hand side to '(dart.core::String, dynamic) \u8594 dart.core::String'.
- foo<String>(new /*@error=InvalidAssignment*/A());
- ^");
+static method foo<S extends core::Object* = dynamic>((self::foo::S*, dynamic) →* self::foo::S* v) → void {}
+static method test() → void {
+ self::foo<core::String*>(let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general/bug32629.dart:16:19: Error: The argument type 'dynamic Function(dynamic, dynamic)' can't be assigned to the parameter type 'String Function(String, dynamic)'.
+ foo<String>(new A());
+ ^" in (let final self::A* #t2 = new self::A::•() in #t2.==(null) ?{(dynamic, dynamic) →* dynamic} null : #t2.{self::A::call}) as{TypeError} (core::String*, dynamic) →* core::String*);
}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general/dynamic_and_void.dart b/pkg/front_end/testcases/general/dynamic_and_void.dart
index f6b345c..225849b 100644
--- a/pkg/front_end/testcases/general/dynamic_and_void.dart
+++ b/pkg/front_end/testcases/general/dynamic_and_void.dart
@@ -7,7 +7,7 @@
import 'dart:core' show int;
-/*@warning=TypeNotFound*/ dynamic testDynamic() => 0;
+dynamic testDynamic() => 0;
void testVoid() {}
main() {}
diff --git a/pkg/front_end/testcases/general/dynamic_and_void.dart.outline.expect b/pkg/front_end/testcases/general/dynamic_and_void.dart.outline.expect
index 9583c9b..948418a 100644
--- a/pkg/front_end/testcases/general/dynamic_and_void.dart.outline.expect
+++ b/pkg/front_end/testcases/general/dynamic_and_void.dart.outline.expect
@@ -2,9 +2,9 @@
//
// Problems in library:
//
-// pkg/front_end/testcases/general/dynamic_and_void.dart:10:27: Error: Type 'dynamic' not found.
-// /*@warning=TypeNotFound*/ dynamic testDynamic() => 0;
-// ^^^^^^^
+// pkg/front_end/testcases/general/dynamic_and_void.dart:10:1: Error: Type 'dynamic' not found.
+// dynamic testDynamic() => 0;
+// ^^^^^^^
//
import self as self;
diff --git a/pkg/front_end/testcases/general/dynamic_and_void.dart.strong.expect b/pkg/front_end/testcases/general/dynamic_and_void.dart.strong.expect
index 5a9ee9e..6211e60 100644
--- a/pkg/front_end/testcases/general/dynamic_and_void.dart.strong.expect
+++ b/pkg/front_end/testcases/general/dynamic_and_void.dart.strong.expect
@@ -1,7 +1,16 @@
library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general/dynamic_and_void.dart:10:1: Error: Type 'dynamic' not found.
+// dynamic testDynamic() => 0;
+// ^^^^^^^
+//
import self as self;
+import "dart:core";
+
static method testDynamic() → invalid-type
- return let final dynamic #t1 = 0 in let dynamic _ = null in invalid-expression "pkg/front_end/testcases/dynamic_and_void.dart:12:52: Error: A value of type 'dart.core::int' can't be assigned to a variable of type 'invalid-type'.\nTry changing the type of the left hand side, or casting the right hand side to 'invalid-type'.\n/*@warning=TypeNotFound*/ dynamic testDynamic() => 0;\n ^";
+ return 0 as{TypeError} invalid-type;
static method testVoid() → void {}
static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general/dynamic_and_void.dart.strong.transformed.expect b/pkg/front_end/testcases/general/dynamic_and_void.dart.strong.transformed.expect
new file mode 100644
index 0000000..6211e60
--- /dev/null
+++ b/pkg/front_end/testcases/general/dynamic_and_void.dart.strong.transformed.expect
@@ -0,0 +1,16 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general/dynamic_and_void.dart:10:1: Error: Type 'dynamic' not found.
+// dynamic testDynamic() => 0;
+// ^^^^^^^
+//
+import self as self;
+
+import "dart:core";
+
+static method testDynamic() → invalid-type
+ return 0 as{TypeError} invalid-type;
+static method testVoid() → void {}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general/issue41210a.dart b/pkg/front_end/testcases/general/issue41210a.dart
new file mode 100644
index 0000000..7f16a06
--- /dev/null
+++ b/pkg/front_end/testcases/general/issue41210a.dart
@@ -0,0 +1,29 @@
+// Copyright (c) 2020, 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.
+
+abstract class Interface {
+ String method(num i);
+}
+
+abstract class Interface2 {
+ String method(covariant int i);
+}
+
+mixin A implements Interface {
+ String method(num i, {String s = "hello"}) => s;
+}
+
+abstract class B implements Interface {
+ String method(num i);
+}
+
+class C with A, B {} // error
+
+abstract class D implements Interface, Interface2 {}
+
+class E with A, D {} // ok
+
+main() {
+ print(C().method(0));
+}
diff --git a/pkg/front_end/testcases/general/issue41210a.dart.outline.expect b/pkg/front_end/testcases/general/issue41210a.dart.outline.expect
new file mode 100644
index 0000000..aee4934
--- /dev/null
+++ b/pkg/front_end/testcases/general/issue41210a.dart.outline.expect
@@ -0,0 +1,77 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general/issue41210a.dart:21:7: Error: Applying the mixin 'B' to 'Object with A' introduces an erroneous override of 'method'.
+// class C with A, B {} // error
+// ^
+// pkg/front_end/testcases/general/issue41210a.dart:18:10: Context: The method 'B.method' has fewer named arguments than those of overridden method 'A.method'.
+// String method(num i);
+// ^
+// pkg/front_end/testcases/general/issue41210a.dart:14:10: Context: This is the overridden method ('method').
+// String method(num i, {String s = "hello"}) => s;
+// ^
+//
+import self as self;
+import "dart:core" as core;
+
+abstract class Interface extends core::Object {
+ synthetic constructor •() → self::Interface*
+ ;
+ abstract method method(core::num* i) → core::String*;
+}
+abstract class Interface2 extends core::Object {
+ synthetic constructor •() → self::Interface2*
+ ;
+ abstract method method(covariant core::int* i) → core::String*;
+}
+abstract class A extends core::Object implements self::Interface /*isMixinDeclaration*/ {
+ method method(core::num* i, {core::String* s = "hello"}) → core::String*
+ ;
+}
+abstract class B extends core::Object implements self::Interface {
+ synthetic constructor •() → self::B*
+ ;
+ abstract method method(core::num* i) → core::String*;
+}
+abstract class _C&Object&A = core::Object with self::A /*isAnonymousMixin,hasConstConstructor*/ {
+ const synthetic constructor •() → self::_C&Object&A*
+ : super core::Object::•()
+ ;
+}
+abstract class _C&Object&A&B = self::_C&Object&A with self::B /*isAnonymousMixin,hasConstConstructor*/ {
+ const synthetic constructor •() → self::_C&Object&A&B*
+ : super self::_C&Object&A::•()
+ ;
+ abstract forwarding-stub method method(core::num* i, {core::String* s}) → core::String*;
+}
+class C extends self::_C&Object&A&B {
+ synthetic constructor •() → self::C*
+ ;
+ abstract forwarding-stub method method(core::num* i, {core::String* s}) → core::String*;
+}
+abstract class D extends core::Object implements self::Interface, self::Interface2 {
+ synthetic constructor •() → self::D*
+ ;
+ abstract forwarding-stub method method(covariant core::num* i) → core::String*;
+}
+abstract class _E&Object&A = core::Object with self::A /*isAnonymousMixin,hasConstConstructor*/ {
+ const synthetic constructor •() → self::_E&Object&A*
+ : super core::Object::•()
+ ;
+}
+abstract class _E&Object&A&D = self::_E&Object&A with self::D /*isAnonymousMixin,hasConstConstructor*/ {
+ const synthetic constructor •() → self::_E&Object&A&D*
+ : super self::_E&Object&A::•()
+ ;
+ forwarding-stub method method(covariant core::num* i, {core::String* s}) → core::String*
+ return super.{self::A::method}(i, s: s);
+}
+class E extends self::_E&Object&A&D {
+ synthetic constructor •() → self::E*
+ ;
+ forwarding-stub method method(covariant core::num* i, {core::String* s}) → core::String*
+ return super.{self::A::method}(i, s: s);
+}
+static method main() → dynamic
+ ;
diff --git a/pkg/front_end/testcases/general/issue41210a.dart.strong.expect b/pkg/front_end/testcases/general/issue41210a.dart.strong.expect
new file mode 100644
index 0000000..c8758f4
--- /dev/null
+++ b/pkg/front_end/testcases/general/issue41210a.dart.strong.expect
@@ -0,0 +1,88 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general/issue41210a.dart:21:7: Error: Applying the mixin 'B' to 'Object with A' introduces an erroneous override of 'method'.
+// class C with A, B {} // error
+// ^
+// pkg/front_end/testcases/general/issue41210a.dart:18:10: Context: The method 'B.method' has fewer named arguments than those of overridden method 'A.method'.
+// String method(num i);
+// ^
+// pkg/front_end/testcases/general/issue41210a.dart:14:10: Context: This is the overridden method ('method').
+// String method(num i, {String s = "hello"}) => s;
+// ^
+//
+import self as self;
+import "dart:core" as core;
+
+abstract class Interface extends core::Object {
+ synthetic constructor •() → self::Interface*
+ : super core::Object::•()
+ ;
+ abstract method method(core::num* i) → core::String*;
+}
+abstract class Interface2 extends core::Object {
+ synthetic constructor •() → self::Interface2*
+ : super core::Object::•()
+ ;
+ abstract method method(covariant core::int* i) → core::String*;
+}
+abstract class A extends core::Object implements self::Interface /*isMixinDeclaration*/ {
+ method method(core::num* i, {core::String* s = #C1}) → core::String*
+ return s;
+}
+abstract class B extends core::Object implements self::Interface {
+ synthetic constructor •() → self::B*
+ : super core::Object::•()
+ ;
+ abstract method method(core::num* i) → core::String*;
+}
+abstract class _C&Object&A = core::Object with self::A /*isAnonymousMixin,hasConstConstructor*/ {
+ const synthetic constructor •() → self::_C&Object&A*
+ : super core::Object::•()
+ ;
+}
+abstract class _C&Object&A&B = self::_C&Object&A with self::B /*isAnonymousMixin,hasConstConstructor*/ {
+ const synthetic constructor •() → self::_C&Object&A&B*
+ : super self::_C&Object&A::•()
+ ;
+ abstract forwarding-stub method method(core::num* i, {core::String* s = #C1}) → core::String*;
+}
+class C extends self::_C&Object&A&B {
+ synthetic constructor •() → self::C*
+ : super self::_C&Object&A&B::•()
+ ;
+ abstract forwarding-stub method method(core::num* i, {core::String* s = #C1}) → core::String*;
+}
+abstract class D extends core::Object implements self::Interface, self::Interface2 {
+ synthetic constructor •() → self::D*
+ : super core::Object::•()
+ ;
+ abstract forwarding-stub method method(covariant core::num* i) → core::String*;
+}
+abstract class _E&Object&A = core::Object with self::A /*isAnonymousMixin,hasConstConstructor*/ {
+ const synthetic constructor •() → self::_E&Object&A*
+ : super core::Object::•()
+ ;
+}
+abstract class _E&Object&A&D = self::_E&Object&A with self::D /*isAnonymousMixin,hasConstConstructor*/ {
+ const synthetic constructor •() → self::_E&Object&A&D*
+ : super self::_E&Object&A::•()
+ ;
+ forwarding-stub method method(covariant core::num* i, {core::String* s = #C1}) → core::String*
+ return super.{self::A::method}(i, s: s);
+}
+class E extends self::_E&Object&A&D {
+ synthetic constructor •() → self::E*
+ : super self::_E&Object&A&D::•()
+ ;
+ forwarding-stub method method(covariant core::num* i, {core::String* s = #C1}) → core::String*
+ return super.{self::A::method}(i, s: s);
+}
+static method main() → dynamic {
+ core::print(new self::C::•().{self::C::method}(0));
+}
+
+constants {
+ #C1 = "hello"
+}
diff --git a/pkg/front_end/testcases/general/issue41210b/issue41210.dart b/pkg/front_end/testcases/general/issue41210b/issue41210.dart
new file mode 100644
index 0000000..01f7b3b
--- /dev/null
+++ b/pkg/front_end/testcases/general/issue41210b/issue41210.dart
@@ -0,0 +1,13 @@
+// Copyright (c) 2020, 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.
+
+import 'issue41210_lib.dart';
+
+class C with A, B {} // error
+
+class E with A, D {} // ok
+
+main() {
+ print(C().method(0));
+}
diff --git a/pkg/front_end/testcases/general/issue41210b/issue41210_lib.dart b/pkg/front_end/testcases/general/issue41210b/issue41210_lib.dart
new file mode 100644
index 0000000..61a4823
--- /dev/null
+++ b/pkg/front_end/testcases/general/issue41210b/issue41210_lib.dart
@@ -0,0 +1,21 @@
+// Copyright (c) 2020, 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.
+
+abstract class Interface {
+ String method(num i);
+}
+
+abstract class Interface2 {
+ String method(covariant int i);
+}
+
+mixin A implements Interface {
+ String method(num i, {String s = "hello"}) => s;
+}
+
+abstract class B implements Interface {
+ String method(num i);
+}
+
+abstract class D implements Interface, Interface2 {}
diff --git a/pkg/front_end/testcases/general/issue41210b/issue41210_lib.dart.outline.expect b/pkg/front_end/testcases/general/issue41210b/issue41210_lib.dart.outline.expect
new file mode 100644
index 0000000..c7a2391
--- /dev/null
+++ b/pkg/front_end/testcases/general/issue41210b/issue41210_lib.dart.outline.expect
@@ -0,0 +1,83 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general/issue41210b/issue41210.dart:7:7: Error: Applying the mixin 'B' to 'Object with A' introduces an erroneous override of 'method'.
+// class C with A, B {} // error
+// ^
+// pkg/front_end/testcases/general/issue41210b/issue41210_lib.dart:18:10: Context: The method 'B.method' has fewer named arguments than those of overridden method 'A.method'.
+// String method(num i);
+// ^
+// pkg/front_end/testcases/general/issue41210b/issue41210_lib.dart:14:10: Context: This is the overridden method ('method').
+// String method(num i, {String s = "hello"}) => s;
+// ^
+//
+import self as self;
+import "dart:core" as core;
+import "issue41210_lib.dart" as iss;
+
+import "org-dartlang-testcase:///issue41210_lib.dart";
+
+abstract class _C&Object&A = core::Object with iss::A /*isAnonymousMixin,hasConstConstructor*/ {
+ const synthetic constructor •() → self::_C&Object&A*
+ : super core::Object::•()
+ ;
+}
+abstract class _C&Object&A&B = self::_C&Object&A with iss::B /*isAnonymousMixin,hasConstConstructor*/ {
+ const synthetic constructor •() → self::_C&Object&A&B*
+ : super self::_C&Object&A::•()
+ ;
+ abstract forwarding-stub method method(core::num* i, {core::String* s}) → core::String*;
+}
+class C extends self::_C&Object&A&B {
+ synthetic constructor •() → self::C*
+ ;
+ abstract forwarding-stub method method(core::num* i, {core::String* s}) → core::String*;
+}
+abstract class _E&Object&A = core::Object with iss::A /*isAnonymousMixin,hasConstConstructor*/ {
+ const synthetic constructor •() → self::_E&Object&A*
+ : super core::Object::•()
+ ;
+}
+abstract class _E&Object&A&D = self::_E&Object&A with iss::D /*isAnonymousMixin,hasConstConstructor*/ {
+ const synthetic constructor •() → self::_E&Object&A&D*
+ : super self::_E&Object&A::•()
+ ;
+ abstract forwarding-stub method method(covariant core::num* i, {core::String* s}) → core::String*;
+}
+class E extends self::_E&Object&A&D {
+ synthetic constructor •() → self::E*
+ ;
+ abstract forwarding-stub method method(covariant core::num* i, {core::String* s}) → core::String*;
+}
+static method main() → dynamic
+ ;
+
+library;
+import self as iss;
+import "dart:core" as core;
+
+abstract class Interface extends core::Object {
+ synthetic constructor •() → iss::Interface*
+ ;
+ abstract method method(core::num* i) → core::String*;
+}
+abstract class Interface2 extends core::Object {
+ synthetic constructor •() → iss::Interface2*
+ ;
+ abstract method method(covariant core::int* i) → core::String*;
+}
+abstract class A extends core::Object implements iss::Interface /*isMixinDeclaration*/ {
+ method method(core::num* i, {core::String* s = "hello"}) → core::String*
+ ;
+}
+abstract class B extends core::Object implements iss::Interface {
+ synthetic constructor •() → iss::B*
+ ;
+ abstract method method(core::num* i) → core::String*;
+}
+abstract class D extends core::Object implements iss::Interface, iss::Interface2 {
+ synthetic constructor •() → iss::D*
+ ;
+ abstract forwarding-stub method method(covariant core::num* i) → core::String*;
+}
diff --git a/pkg/front_end/testcases/general/issue41210b/issue41210_lib.dart.strong.expect b/pkg/front_end/testcases/general/issue41210b/issue41210_lib.dart.strong.expect
new file mode 100644
index 0000000..2bd5392
--- /dev/null
+++ b/pkg/front_end/testcases/general/issue41210b/issue41210_lib.dart.strong.expect
@@ -0,0 +1,94 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general/issue41210b/issue41210.dart:7:7: Error: Applying the mixin 'B' to 'Object with A' introduces an erroneous override of 'method'.
+// class C with A, B {} // error
+// ^
+// pkg/front_end/testcases/general/issue41210b/issue41210_lib.dart:18:10: Context: The method 'B.method' has fewer named arguments than those of overridden method 'A.method'.
+// String method(num i);
+// ^
+// pkg/front_end/testcases/general/issue41210b/issue41210_lib.dart:14:10: Context: This is the overridden method ('method').
+// String method(num i, {String s = "hello"}) => s;
+// ^
+//
+import self as self;
+import "dart:core" as core;
+import "issue41210_lib.dart" as iss;
+
+import "org-dartlang-testcase:///issue41210_lib.dart";
+
+abstract class _C&Object&A = core::Object with iss::A /*isAnonymousMixin,hasConstConstructor*/ {
+ const synthetic constructor •() → self::_C&Object&A*
+ : super core::Object::•()
+ ;
+}
+abstract class _C&Object&A&B = self::_C&Object&A with iss::B /*isAnonymousMixin,hasConstConstructor*/ {
+ const synthetic constructor •() → self::_C&Object&A&B*
+ : super self::_C&Object&A::•()
+ ;
+ abstract forwarding-stub method method(core::num* i, {core::String* s = #C1}) → core::String*;
+}
+class C extends self::_C&Object&A&B {
+ synthetic constructor •() → self::C*
+ : super self::_C&Object&A&B::•()
+ ;
+ abstract forwarding-stub method method(core::num* i, {core::String* s = #C1}) → core::String*;
+}
+abstract class _E&Object&A = core::Object with iss::A /*isAnonymousMixin,hasConstConstructor*/ {
+ const synthetic constructor •() → self::_E&Object&A*
+ : super core::Object::•()
+ ;
+}
+abstract class _E&Object&A&D = self::_E&Object&A with iss::D /*isAnonymousMixin,hasConstConstructor*/ {
+ const synthetic constructor •() → self::_E&Object&A&D*
+ : super self::_E&Object&A::•()
+ ;
+ abstract forwarding-stub method method(covariant core::num* i, {core::String* s = #C1}) → core::String*;
+}
+class E extends self::_E&Object&A&D {
+ synthetic constructor •() → self::E*
+ : super self::_E&Object&A&D::•()
+ ;
+ abstract forwarding-stub method method(covariant core::num* i, {core::String* s = #C1}) → core::String*;
+}
+static method main() → dynamic {
+ core::print(new self::C::•().{self::C::method}(0));
+}
+
+library;
+import self as iss;
+import "dart:core" as core;
+
+abstract class Interface extends core::Object {
+ synthetic constructor •() → iss::Interface*
+ : super core::Object::•()
+ ;
+ abstract method method(core::num* i) → core::String*;
+}
+abstract class Interface2 extends core::Object {
+ synthetic constructor •() → iss::Interface2*
+ : super core::Object::•()
+ ;
+ abstract method method(covariant core::int* i) → core::String*;
+}
+abstract class A extends core::Object implements iss::Interface /*isMixinDeclaration*/ {
+ method method(core::num* i, {core::String* s = #C1}) → core::String*
+ return s;
+}
+abstract class B extends core::Object implements iss::Interface {
+ synthetic constructor •() → iss::B*
+ : super core::Object::•()
+ ;
+ abstract method method(core::num* i) → core::String*;
+}
+abstract class D extends core::Object implements iss::Interface, iss::Interface2 {
+ synthetic constructor •() → iss::D*
+ : super core::Object::•()
+ ;
+ abstract forwarding-stub method method(covariant core::num* i) → core::String*;
+}
+
+constants {
+ #C1 = "hello"
+}
diff --git a/pkg/front_end/testcases/general/issue41210b/link.options b/pkg/front_end/testcases/general/issue41210b/link.options
new file mode 100644
index 0000000..09aef2a
--- /dev/null
+++ b/pkg/front_end/testcases/general/issue41210b/link.options
@@ -0,0 +1 @@
+issue41210_lib.dart
\ No newline at end of file
diff --git a/pkg/front_end/testcases/general/warn_unresolved_sends.dart b/pkg/front_end/testcases/general/warn_unresolved_sends.dart
index 9591e28..ba78add 100644
--- a/pkg/front_end/testcases/general/warn_unresolved_sends.dart
+++ b/pkg/front_end/testcases/general/warn_unresolved_sends.dart
@@ -45,13 +45,13 @@
getterOnly;
getterOnly = 0;
- this. /*@warning=GetterNotFound*/ missingField;
- this. /*@warning=SetterNotFound*/ missingField = 0;
- this. /*@warning=MethodNotFound*/ missingMethod();
+ this.missingField;
+ this.missingField = 0;
+ this.missingMethod();
- /*@warning=GetterNotFound*/ missingField;
- /*@warning=SetterNotFound*/ missingField = 0;
- /*@warning=MethodNotFound*/ missingMethod();
+ missingField;
+ missingField = 0;
+ missingMethod();
}
}
@@ -60,6 +60,4 @@
void missingMethod() {}
}
-main() {
- new E().test();
-}
+main() {}
diff --git a/pkg/front_end/testcases/general/warn_unresolved_sends.dart.strong.expect b/pkg/front_end/testcases/general/warn_unresolved_sends.dart.strong.expect
index df689b5..a61ca7f 100644
--- a/pkg/front_end/testcases/general/warn_unresolved_sends.dart.strong.expect
+++ b/pkg/front_end/testcases/general/warn_unresolved_sends.dart.strong.expect
@@ -1,10 +1,49 @@
library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:48:10: Error: The getter 'missingField' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
+// this.missingField;
+// ^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:49:10: Error: The setter 'missingField' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
+// this.missingField = 0;
+// ^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:50:10: Error: The method 'missingMethod' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
+// this.missingMethod();
+// ^^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:52:5: Error: The getter 'missingField' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
+// missingField;
+// ^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:53:5: Error: The setter 'missingField' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
+// missingField = 0;
+// ^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:54:5: Error: The method 'missingMethod' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
+// missingMethod();
+// ^^^^^^^^^^^^^
+//
import self as self;
import "dart:core" as core;
class C extends core::Object {
field dynamic superField = null;
- synthetic constructor •() → void
+ synthetic constructor •() → self::C*
: super core::Object::•()
;
method superMethod() → dynamic {}
@@ -17,7 +56,7 @@
}
class D extends self::C {
field dynamic field = null;
- synthetic constructor •() → void
+ synthetic constructor •() → self::D*
: super self::C::•()
;
set setterOnly(dynamic _) → void {}
@@ -45,21 +84,43 @@
this.{self::D::setterOnly} = 0;
this.{self::D::getterOnly};
this.{self::C::getterOnly} = 0;
- let final dynamic #t1 = this in let dynamic _ = null in invalid-expression "pkg/front_end/testcases/warn_unresolved_sends.dart:49:39: Error: The getter 'missingField' isn't defined for the class '#lib1::D'.\nTry correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.\n this. /*@warning=GetterNotFound*/ missingField;\n ^";
- let final dynamic #t2 = this in let dynamic _ = null in invalid-expression "pkg/front_end/testcases/warn_unresolved_sends.dart:50:39: Error: The setter 'missingField' isn't defined for the class '#lib1::D'.\nTry correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.\n this. /*@warning=SetterNotFound*/ missingField = 0;\n ^";
- let final dynamic #t3 = this in let dynamic _ = null in invalid-expression "pkg/front_end/testcases/warn_unresolved_sends.dart:51:39: Error: The method 'missingMethod' isn't defined for the class '#lib1::D'.\nTry correcting the name to the name of an existing method, or defining a method named 'missingMethod'.\n this. /*@warning=MethodNotFound*/ missingMethod();\n ^";
- let final dynamic #t4 = this in let dynamic _ = null in invalid-expression "pkg/front_end/testcases/warn_unresolved_sends.dart:53:33: Error: The getter 'missingField' isn't defined for the class '#lib1::D'.\nTry correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.\n /*@warning=GetterNotFound*/ missingField;\n ^";
- let final dynamic #t5 = this in let dynamic _ = null in invalid-expression "pkg/front_end/testcases/warn_unresolved_sends.dart:54:33: Error: The setter 'missingField' isn't defined for the class '#lib1::D'.\nTry correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.\n /*@warning=SetterNotFound*/ missingField = 0;\n ^";
- let final dynamic #t6 = this in let dynamic _ = null in invalid-expression "pkg/front_end/testcases/warn_unresolved_sends.dart:55:33: Error: The method 'missingMethod' isn't defined for the class '#lib1::D'.\nTry correcting the name to the name of an existing method, or defining a method named 'missingMethod'.\n /*@warning=MethodNotFound*/ missingMethod();\n ^";
+ invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:48:10: Error: The getter 'missingField' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
+ this.missingField;
+ ^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:49:10: Error: The setter 'missingField' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
+ this.missingField = 0;
+ ^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:50:10: Error: The method 'missingMethod' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
+ this.missingMethod();
+ ^^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:52:5: Error: The getter 'missingField' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
+ missingField;
+ ^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:53:5: Error: The setter 'missingField' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
+ missingField = 0;
+ ^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:54:5: Error: The method 'missingMethod' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
+ missingMethod();
+ ^^^^^^^^^^^^^";
}
}
class E extends self::D {
field dynamic missingField = null;
- synthetic constructor •() → void
+ synthetic constructor •() → self::E*
: super self::D::•()
;
method missingMethod() → void {}
}
-static method main() → dynamic {
- new self::E::•().{self::D::test}();
-}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general/warn_unresolved_sends.dart.strong.transformed.expect b/pkg/front_end/testcases/general/warn_unresolved_sends.dart.strong.transformed.expect
new file mode 100644
index 0000000..a61ca7f
--- /dev/null
+++ b/pkg/front_end/testcases/general/warn_unresolved_sends.dart.strong.transformed.expect
@@ -0,0 +1,126 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:48:10: Error: The getter 'missingField' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
+// this.missingField;
+// ^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:49:10: Error: The setter 'missingField' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
+// this.missingField = 0;
+// ^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:50:10: Error: The method 'missingMethod' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
+// this.missingMethod();
+// ^^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:52:5: Error: The getter 'missingField' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
+// missingField;
+// ^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:53:5: Error: The setter 'missingField' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
+// missingField = 0;
+// ^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general/warn_unresolved_sends.dart:54:5: Error: The method 'missingMethod' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
+// missingMethod();
+// ^^^^^^^^^^^^^
+//
+import self as self;
+import "dart:core" as core;
+
+class C extends core::Object {
+ field dynamic superField = null;
+ synthetic constructor •() → self::C*
+ : super core::Object::•()
+ ;
+ method superMethod() → dynamic {}
+ get setterOnly() → dynamic
+ return null;
+ set setterOnly(dynamic _) → void {}
+ get getterOnly() → dynamic
+ return null;
+ set getterOnly(dynamic _) → void {}
+}
+class D extends self::C {
+ field dynamic field = null;
+ synthetic constructor •() → self::D*
+ : super self::C::•()
+ ;
+ set setterOnly(dynamic _) → void {}
+ get getterOnly() → dynamic
+ return null;
+ method method() → dynamic {}
+ method test() → void {
+ this.{self::D::field};
+ this.{self::C::superField};
+ this.{self::D::field} = 0;
+ this.{self::C::superField} = 0;
+ this.{self::D::method}();
+ this.{self::C::superMethod}();
+ this.{self::C::setterOnly};
+ this.{self::D::setterOnly} = 0;
+ this.{self::D::getterOnly};
+ this.{self::C::getterOnly} = 0;
+ this.{self::D::field};
+ this.{self::C::superField};
+ this.{self::D::field} = 0;
+ this.{self::C::superField} = 0;
+ this.{self::D::method}();
+ this.{self::C::superMethod}();
+ this.{self::C::setterOnly};
+ this.{self::D::setterOnly} = 0;
+ this.{self::D::getterOnly};
+ this.{self::C::getterOnly} = 0;
+ invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:48:10: Error: The getter 'missingField' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
+ this.missingField;
+ ^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:49:10: Error: The setter 'missingField' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
+ this.missingField = 0;
+ ^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:50:10: Error: The method 'missingMethod' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
+ this.missingMethod();
+ ^^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:52:5: Error: The getter 'missingField' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
+ missingField;
+ ^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:53:5: Error: The setter 'missingField' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
+ missingField = 0;
+ ^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general/warn_unresolved_sends.dart:54:5: Error: The method 'missingMethod' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
+ missingMethod();
+ ^^^^^^^^^^^^^";
+ }
+}
+class E extends self::D {
+ field dynamic missingField = null;
+ synthetic constructor •() → self::E*
+ : super self::D::•()
+ ;
+ method missingMethod() → void {}
+}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart b/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart
index 62456d1..4af4b88 100644
--- a/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart
+++ b/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart
@@ -7,7 +7,7 @@
foo() {}
test() {
- /*@warning=MethodNotFound*/ foo(null);
+ foo(null);
}
main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.strong.expect b/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.strong.expect
index f165ac6..a408458 100644
--- a/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.strong.expect
+++ b/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.strong.expect
@@ -1,9 +1,22 @@
library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart:10:6: Error: Too many positional arguments: 0 allowed, but 1 found.
+// Try removing the extra positional arguments.
+// foo(null);
+// ^
+// pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart:7:1: Context: Found this candidate, but the arguments don't match.
+// foo() {}
+// ^^^
+//
import self as self;
-import "dart:core" as core;
static method foo() → dynamic {}
static method test() → dynamic {
- throw new core::NoSuchMethodError::withInvocation(null, new core::_InvocationMirror::_withType(#foo, 32, const <dynamic>[], <dynamic>[null].toList(growable: false), core::Map::unmodifiable<dynamic, dynamic>(const <dynamic, dynamic>{})));
+ invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart:10:6: Error: Too many positional arguments: 0 allowed, but 1 found.
+Try removing the extra positional arguments.
+ foo(null);
+ ^";
}
static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.strong.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.strong.transformed.expect
new file mode 100644
index 0000000..a408458
--- /dev/null
+++ b/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.strong.transformed.expect
@@ -0,0 +1,22 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart:10:6: Error: Too many positional arguments: 0 allowed, but 1 found.
+// Try removing the extra positional arguments.
+// foo(null);
+// ^
+// pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart:7:1: Context: Found this candidate, but the arguments don't match.
+// foo() {}
+// ^^^
+//
+import self as self;
+
+static method foo() → dynamic {}
+static method test() → dynamic {
+ invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart:10:6: Error: Too many positional arguments: 0 allowed, but 1 found.
+Try removing the extra positional arguments.
+ foo(null);
+ ^";
+}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.weak.expect
index f165ac6..a408458 100644
--- a/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.weak.expect
+++ b/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.weak.expect
@@ -1,9 +1,22 @@
library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart:10:6: Error: Too many positional arguments: 0 allowed, but 1 found.
+// Try removing the extra positional arguments.
+// foo(null);
+// ^
+// pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart:7:1: Context: Found this candidate, but the arguments don't match.
+// foo() {}
+// ^^^
+//
import self as self;
-import "dart:core" as core;
static method foo() → dynamic {}
static method test() → dynamic {
- throw new core::NoSuchMethodError::withInvocation(null, new core::_InvocationMirror::_withType(#foo, 32, const <dynamic>[], <dynamic>[null].toList(growable: false), core::Map::unmodifiable<dynamic, dynamic>(const <dynamic, dynamic>{})));
+ invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart:10:6: Error: Too many positional arguments: 0 allowed, but 1 found.
+Try removing the extra positional arguments.
+ foo(null);
+ ^";
}
static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.weak.transformed.expect
new file mode 100644
index 0000000..a408458
--- /dev/null
+++ b/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.weak.transformed.expect
@@ -0,0 +1,22 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart:10:6: Error: Too many positional arguments: 0 allowed, but 1 found.
+// Try removing the extra positional arguments.
+// foo(null);
+// ^
+// pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart:7:1: Context: Found this candidate, but the arguments don't match.
+// foo() {}
+// ^^^
+//
+import self as self;
+
+static method foo() → dynamic {}
+static method test() → dynamic {
+ invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart:10:6: Error: Too many positional arguments: 0 allowed, but 1 found.
+Try removing the extra positional arguments.
+ foo(null);
+ ^";
+}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart b/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart
index 385578c..e0e9698 100644
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart
+++ b/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart
@@ -14,6 +14,8 @@
void foo<S>(Reducer<S> v) {}
-void main() {
- foo<String>(new /*@error=InvalidAssignment*/ A());
+void test() {
+ foo<String>(new A());
}
+
+main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.outline.expect
index 4c03145..8c3ca39 100644
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.outline.expect
+++ b/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.outline.expect
@@ -11,5 +11,7 @@
}
static method foo<S extends core::Object* = dynamic>((self::foo::S*, dynamic) →* self::foo::S* v) → void
;
-static method main() → void
+static method test() → void
+ ;
+static method main() → dynamic
;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.strong.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.strong.expect
index 0258b41..c7e55b8 100644
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.strong.expect
+++ b/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.strong.expect
@@ -1,20 +1,27 @@
library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart:18:19: Error: The argument type 'dynamic Function(dynamic, dynamic)' can't be assigned to the parameter type 'String Function(String, dynamic)'.
+// foo<String>(new A());
+// ^
+//
import self as self;
import "dart:core" as core;
-typedef Reducer<S extends core::Object> = (S, dynamic) → S;
+typedef Reducer<invariant S extends core::Object* = dynamic> = (S*, dynamic) →* S*;
class A extends core::Object {
- synthetic constructor •() → void
+ synthetic constructor •() → self::A*
: super core::Object::•()
;
method call(dynamic a, dynamic b) → dynamic {
return a;
}
}
-static method foo<S extends core::Object>((self::foo::S, dynamic) → self::foo::S v) → void {}
-static method main() → void {
- self::foo<core::String>(let final dynamic #t1 = let final self::A #t2 = new self::A::•() in #t2.==(null) ?{(dynamic, dynamic) → dynamic} null : #t2.{self::A::call} in let dynamic _ = null in invalid-expression "pkg/front_end/testcases/bug32629.dart:18:47: Error: A value of type '(dynamic, dynamic) \u8594 dynamic' can't be assigned to a variable of type '(dart.core::String, dynamic) \u8594 dart.core::String'.
-Try changing the type of the left hand side, or casting the right hand side to '(dart.core::String, dynamic) \u8594 dart.core::String'.
- foo<String>(new /*@error=InvalidAssignment*/A());
- ^");
+static method foo<S extends core::Object* = dynamic>((self::foo::S*, dynamic) →* self::foo::S* v) → void {}
+static method test() → void {
+ self::foo<core::String*>(let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart:18:19: Error: The argument type 'dynamic Function(dynamic, dynamic)' can't be assigned to the parameter type 'String Function(String, dynamic)'.
+ foo<String>(new A());
+ ^" in (let final self::A* #t2 = new self::A::•() in #t2.==(null) ?{(dynamic, dynamic) →* dynamic} null : #t2.{self::A::call}) as{TypeError} (core::String*, dynamic) →* core::String*);
}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.strong.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.strong.transformed.expect
index b6f7b796..c7e55b8 100644
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.strong.transformed.expect
@@ -1,20 +1,27 @@
library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart:18:19: Error: The argument type 'dynamic Function(dynamic, dynamic)' can't be assigned to the parameter type 'String Function(String, dynamic)'.
+// foo<String>(new A());
+// ^
+//
import self as self;
import "dart:core" as core;
-typedef Reducer<S extends core::Object> = (S, dynamic) → S;
+typedef Reducer<invariant S extends core::Object* = dynamic> = (S*, dynamic) →* S*;
class A extends core::Object {
- synthetic constructor •() → void
+ synthetic constructor •() → self::A*
: super core::Object::•()
;
method call(dynamic a, dynamic b) → dynamic {
return a;
}
}
-static method foo<S extends core::Object>((self::foo::S, dynamic) → self::foo::S v) → void {}
-static method main() → void {
- self::foo<core::String>(let final (dynamic, dynamic) → dynamic #t1 = let final self::A #t2 = new self::A::•() in #t2.==(null) ?{(dynamic, dynamic) → dynamic} null : #t2.{self::A::call} in let<BottomType> _ = null in invalid-expression "pkg/front_end/testcases/bug32629.dart:18:47: Error: A value of type '(dynamic, dynamic) \u8594 dynamic' can't be assigned to a variable of type '(dart.core::String, dynamic) \u8594 dart.core::String'.
-Try changing the type of the left hand side, or casting the right hand side to '(dart.core::String, dynamic) \u8594 dart.core::String'.
- foo<String>(new /*@error=InvalidAssignment*/A());
- ^");
+static method foo<S extends core::Object* = dynamic>((self::foo::S*, dynamic) →* self::foo::S* v) → void {}
+static method test() → void {
+ self::foo<core::String*>(let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart:18:19: Error: The argument type 'dynamic Function(dynamic, dynamic)' can't be assigned to the parameter type 'String Function(String, dynamic)'.
+ foo<String>(new A());
+ ^" in (let final self::A* #t2 = new self::A::•() in #t2.==(null) ?{(dynamic, dynamic) →* dynamic} null : #t2.{self::A::call}) as{TypeError} (core::String*, dynamic) →* core::String*);
}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.weak.expect
index 0258b41..c7e55b8 100644
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.weak.expect
+++ b/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.weak.expect
@@ -1,20 +1,27 @@
library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart:18:19: Error: The argument type 'dynamic Function(dynamic, dynamic)' can't be assigned to the parameter type 'String Function(String, dynamic)'.
+// foo<String>(new A());
+// ^
+//
import self as self;
import "dart:core" as core;
-typedef Reducer<S extends core::Object> = (S, dynamic) → S;
+typedef Reducer<invariant S extends core::Object* = dynamic> = (S*, dynamic) →* S*;
class A extends core::Object {
- synthetic constructor •() → void
+ synthetic constructor •() → self::A*
: super core::Object::•()
;
method call(dynamic a, dynamic b) → dynamic {
return a;
}
}
-static method foo<S extends core::Object>((self::foo::S, dynamic) → self::foo::S v) → void {}
-static method main() → void {
- self::foo<core::String>(let final dynamic #t1 = let final self::A #t2 = new self::A::•() in #t2.==(null) ?{(dynamic, dynamic) → dynamic} null : #t2.{self::A::call} in let dynamic _ = null in invalid-expression "pkg/front_end/testcases/bug32629.dart:18:47: Error: A value of type '(dynamic, dynamic) \u8594 dynamic' can't be assigned to a variable of type '(dart.core::String, dynamic) \u8594 dart.core::String'.
-Try changing the type of the left hand side, or casting the right hand side to '(dart.core::String, dynamic) \u8594 dart.core::String'.
- foo<String>(new /*@error=InvalidAssignment*/A());
- ^");
+static method foo<S extends core::Object* = dynamic>((self::foo::S*, dynamic) →* self::foo::S* v) → void {}
+static method test() → void {
+ self::foo<core::String*>(let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart:18:19: Error: The argument type 'dynamic Function(dynamic, dynamic)' can't be assigned to the parameter type 'String Function(String, dynamic)'.
+ foo<String>(new A());
+ ^" in (let final self::A* #t2 = new self::A::•() in #t2.==(null) ?{(dynamic, dynamic) →* dynamic} null : #t2.{self::A::call}) as{TypeError} (core::String*, dynamic) →* core::String*);
}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.weak.transformed.expect
index b6f7b796..c7e55b8 100644
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.weak.transformed.expect
@@ -1,20 +1,27 @@
library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart:18:19: Error: The argument type 'dynamic Function(dynamic, dynamic)' can't be assigned to the parameter type 'String Function(String, dynamic)'.
+// foo<String>(new A());
+// ^
+//
import self as self;
import "dart:core" as core;
-typedef Reducer<S extends core::Object> = (S, dynamic) → S;
+typedef Reducer<invariant S extends core::Object* = dynamic> = (S*, dynamic) →* S*;
class A extends core::Object {
- synthetic constructor •() → void
+ synthetic constructor •() → self::A*
: super core::Object::•()
;
method call(dynamic a, dynamic b) → dynamic {
return a;
}
}
-static method foo<S extends core::Object>((self::foo::S, dynamic) → self::foo::S v) → void {}
-static method main() → void {
- self::foo<core::String>(let final (dynamic, dynamic) → dynamic #t1 = let final self::A #t2 = new self::A::•() in #t2.==(null) ?{(dynamic, dynamic) → dynamic} null : #t2.{self::A::call} in let<BottomType> _ = null in invalid-expression "pkg/front_end/testcases/bug32629.dart:18:47: Error: A value of type '(dynamic, dynamic) \u8594 dynamic' can't be assigned to a variable of type '(dart.core::String, dynamic) \u8594 dart.core::String'.
-Try changing the type of the left hand side, or casting the right hand side to '(dart.core::String, dynamic) \u8594 dart.core::String'.
- foo<String>(new /*@error=InvalidAssignment*/A());
- ^");
+static method foo<S extends core::Object* = dynamic>((self::foo::S*, dynamic) →* self::foo::S* v) → void {}
+static method test() → void {
+ self::foo<core::String*>(let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart:18:19: Error: The argument type 'dynamic Function(dynamic, dynamic)' can't be assigned to the parameter type 'String Function(String, dynamic)'.
+ foo<String>(new A());
+ ^" in (let final self::A* #t2 = new self::A::•() in #t2.==(null) ?{(dynamic, dynamic) →* dynamic} null : #t2.{self::A::call}) as{TypeError} (core::String*, dynamic) →* core::String*);
}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart b/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart
index 61cec8b..e77f929 100644
--- a/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart
+++ b/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart
@@ -9,7 +9,7 @@
import 'dart:core' show int;
-/*@warning=TypeNotFound*/ dynamic testDynamic() => 0;
+dynamic testDynamic() => 0;
void testVoid() {}
main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.outline.expect
index b831a29..3c0928e 100644
--- a/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.outline.expect
+++ b/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.outline.expect
@@ -2,9 +2,9 @@
//
// Problems in library:
//
-// pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart:12:27: Error: Type 'dynamic' not found.
-// /*@warning=TypeNotFound*/ dynamic testDynamic() => 0;
-// ^^^^^^^
+// pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart:12:1: Error: Type 'dynamic' not found.
+// dynamic testDynamic() => 0;
+// ^^^^^^^
//
import self as self;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.strong.expect b/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.strong.expect
index 5a9ee9e..0e3241e 100644
--- a/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.strong.expect
+++ b/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.strong.expect
@@ -1,7 +1,16 @@
library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart:12:1: Error: Type 'dynamic' not found.
+// dynamic testDynamic() => 0;
+// ^^^^^^^
+//
import self as self;
+import "dart:core";
+
static method testDynamic() → invalid-type
- return let final dynamic #t1 = 0 in let dynamic _ = null in invalid-expression "pkg/front_end/testcases/dynamic_and_void.dart:12:52: Error: A value of type 'dart.core::int' can't be assigned to a variable of type 'invalid-type'.\nTry changing the type of the left hand side, or casting the right hand side to 'invalid-type'.\n/*@warning=TypeNotFound*/ dynamic testDynamic() => 0;\n ^";
+ return 0 as{TypeError} invalid-type;
static method testVoid() → void {}
static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.strong.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.strong.transformed.expect
new file mode 100644
index 0000000..0e3241e
--- /dev/null
+++ b/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.strong.transformed.expect
@@ -0,0 +1,16 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart:12:1: Error: Type 'dynamic' not found.
+// dynamic testDynamic() => 0;
+// ^^^^^^^
+//
+import self as self;
+
+import "dart:core";
+
+static method testDynamic() → invalid-type
+ return 0 as{TypeError} invalid-type;
+static method testVoid() → void {}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.weak.expect
index 5a9ee9e..0e3241e 100644
--- a/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.weak.expect
+++ b/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.weak.expect
@@ -1,7 +1,16 @@
library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart:12:1: Error: Type 'dynamic' not found.
+// dynamic testDynamic() => 0;
+// ^^^^^^^
+//
import self as self;
+import "dart:core";
+
static method testDynamic() → invalid-type
- return let final dynamic #t1 = 0 in let dynamic _ = null in invalid-expression "pkg/front_end/testcases/dynamic_and_void.dart:12:52: Error: A value of type 'dart.core::int' can't be assigned to a variable of type 'invalid-type'.\nTry changing the type of the left hand side, or casting the right hand side to 'invalid-type'.\n/*@warning=TypeNotFound*/ dynamic testDynamic() => 0;\n ^";
+ return 0 as{TypeError} invalid-type;
static method testVoid() → void {}
static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.weak.transformed.expect
new file mode 100644
index 0000000..0e3241e
--- /dev/null
+++ b/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.weak.transformed.expect
@@ -0,0 +1,16 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart:12:1: Error: Type 'dynamic' not found.
+// dynamic testDynamic() => 0;
+// ^^^^^^^
+//
+import self as self;
+
+import "dart:core";
+
+static method testDynamic() → invalid-type
+ return 0 as{TypeError} invalid-type;
+static method testVoid() → void {}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart b/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart
index 70089ca..f97c551 100644
--- a/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart
+++ b/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart
@@ -47,13 +47,13 @@
getterOnly;
getterOnly = 0;
- this. /*@warning=GetterNotFound*/ missingField;
- this. /*@warning=SetterNotFound*/ missingField = 0;
- this. /*@warning=MethodNotFound*/ missingMethod();
+ this.missingField;
+ this.missingField = 0;
+ this.missingMethod();
- /*@warning=GetterNotFound*/ missingField;
- /*@warning=SetterNotFound*/ missingField = 0;
- /*@warning=MethodNotFound*/ missingMethod();
+ missingField;
+ missingField = 0;
+ missingMethod();
}
}
@@ -62,6 +62,4 @@
void missingMethod() {}
}
-main() {
- new E().test();
-}
+main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.strong.expect b/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.strong.expect
index df689b5..cf6e6d4 100644
--- a/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.strong.expect
+++ b/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.strong.expect
@@ -1,10 +1,49 @@
library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:50:10: Error: The getter 'missingField' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
+// this.missingField;
+// ^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:51:10: Error: The setter 'missingField' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
+// this.missingField = 0;
+// ^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:52:10: Error: The method 'missingMethod' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
+// this.missingMethod();
+// ^^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:54:5: Error: The getter 'missingField' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
+// missingField;
+// ^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:55:5: Error: The setter 'missingField' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
+// missingField = 0;
+// ^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:56:5: Error: The method 'missingMethod' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
+// missingMethod();
+// ^^^^^^^^^^^^^
+//
import self as self;
import "dart:core" as core;
class C extends core::Object {
field dynamic superField = null;
- synthetic constructor •() → void
+ synthetic constructor •() → self::C*
: super core::Object::•()
;
method superMethod() → dynamic {}
@@ -17,7 +56,7 @@
}
class D extends self::C {
field dynamic field = null;
- synthetic constructor •() → void
+ synthetic constructor •() → self::D*
: super self::C::•()
;
set setterOnly(dynamic _) → void {}
@@ -45,21 +84,43 @@
this.{self::D::setterOnly} = 0;
this.{self::D::getterOnly};
this.{self::C::getterOnly} = 0;
- let final dynamic #t1 = this in let dynamic _ = null in invalid-expression "pkg/front_end/testcases/warn_unresolved_sends.dart:49:39: Error: The getter 'missingField' isn't defined for the class '#lib1::D'.\nTry correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.\n this. /*@warning=GetterNotFound*/ missingField;\n ^";
- let final dynamic #t2 = this in let dynamic _ = null in invalid-expression "pkg/front_end/testcases/warn_unresolved_sends.dart:50:39: Error: The setter 'missingField' isn't defined for the class '#lib1::D'.\nTry correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.\n this. /*@warning=SetterNotFound*/ missingField = 0;\n ^";
- let final dynamic #t3 = this in let dynamic _ = null in invalid-expression "pkg/front_end/testcases/warn_unresolved_sends.dart:51:39: Error: The method 'missingMethod' isn't defined for the class '#lib1::D'.\nTry correcting the name to the name of an existing method, or defining a method named 'missingMethod'.\n this. /*@warning=MethodNotFound*/ missingMethod();\n ^";
- let final dynamic #t4 = this in let dynamic _ = null in invalid-expression "pkg/front_end/testcases/warn_unresolved_sends.dart:53:33: Error: The getter 'missingField' isn't defined for the class '#lib1::D'.\nTry correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.\n /*@warning=GetterNotFound*/ missingField;\n ^";
- let final dynamic #t5 = this in let dynamic _ = null in invalid-expression "pkg/front_end/testcases/warn_unresolved_sends.dart:54:33: Error: The setter 'missingField' isn't defined for the class '#lib1::D'.\nTry correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.\n /*@warning=SetterNotFound*/ missingField = 0;\n ^";
- let final dynamic #t6 = this in let dynamic _ = null in invalid-expression "pkg/front_end/testcases/warn_unresolved_sends.dart:55:33: Error: The method 'missingMethod' isn't defined for the class '#lib1::D'.\nTry correcting the name to the name of an existing method, or defining a method named 'missingMethod'.\n /*@warning=MethodNotFound*/ missingMethod();\n ^";
+ invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:50:10: Error: The getter 'missingField' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
+ this.missingField;
+ ^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:51:10: Error: The setter 'missingField' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
+ this.missingField = 0;
+ ^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:52:10: Error: The method 'missingMethod' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
+ this.missingMethod();
+ ^^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:54:5: Error: The getter 'missingField' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
+ missingField;
+ ^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:55:5: Error: The setter 'missingField' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
+ missingField = 0;
+ ^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:56:5: Error: The method 'missingMethod' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
+ missingMethod();
+ ^^^^^^^^^^^^^";
}
}
class E extends self::D {
field dynamic missingField = null;
- synthetic constructor •() → void
+ synthetic constructor •() → self::E*
: super self::D::•()
;
method missingMethod() → void {}
}
-static method main() → dynamic {
- new self::E::•().{self::D::test}();
-}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.strong.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.strong.transformed.expect
new file mode 100644
index 0000000..cf6e6d4
--- /dev/null
+++ b/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.strong.transformed.expect
@@ -0,0 +1,126 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:50:10: Error: The getter 'missingField' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
+// this.missingField;
+// ^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:51:10: Error: The setter 'missingField' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
+// this.missingField = 0;
+// ^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:52:10: Error: The method 'missingMethod' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
+// this.missingMethod();
+// ^^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:54:5: Error: The getter 'missingField' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
+// missingField;
+// ^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:55:5: Error: The setter 'missingField' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
+// missingField = 0;
+// ^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:56:5: Error: The method 'missingMethod' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
+// missingMethod();
+// ^^^^^^^^^^^^^
+//
+import self as self;
+import "dart:core" as core;
+
+class C extends core::Object {
+ field dynamic superField = null;
+ synthetic constructor •() → self::C*
+ : super core::Object::•()
+ ;
+ method superMethod() → dynamic {}
+ get setterOnly() → dynamic
+ return null;
+ set setterOnly(dynamic _) → void {}
+ get getterOnly() → dynamic
+ return null;
+ set getterOnly(dynamic _) → void {}
+}
+class D extends self::C {
+ field dynamic field = null;
+ synthetic constructor •() → self::D*
+ : super self::C::•()
+ ;
+ set setterOnly(dynamic _) → void {}
+ get getterOnly() → dynamic
+ return null;
+ method method() → dynamic {}
+ method test() → void {
+ this.{self::D::field};
+ this.{self::C::superField};
+ this.{self::D::field} = 0;
+ this.{self::C::superField} = 0;
+ this.{self::D::method}();
+ this.{self::C::superMethod}();
+ this.{self::C::setterOnly};
+ this.{self::D::setterOnly} = 0;
+ this.{self::D::getterOnly};
+ this.{self::C::getterOnly} = 0;
+ this.{self::D::field};
+ this.{self::C::superField};
+ this.{self::D::field} = 0;
+ this.{self::C::superField} = 0;
+ this.{self::D::method}();
+ this.{self::C::superMethod}();
+ this.{self::C::setterOnly};
+ this.{self::D::setterOnly} = 0;
+ this.{self::D::getterOnly};
+ this.{self::C::getterOnly} = 0;
+ invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:50:10: Error: The getter 'missingField' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
+ this.missingField;
+ ^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:51:10: Error: The setter 'missingField' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
+ this.missingField = 0;
+ ^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:52:10: Error: The method 'missingMethod' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
+ this.missingMethod();
+ ^^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:54:5: Error: The getter 'missingField' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
+ missingField;
+ ^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:55:5: Error: The setter 'missingField' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
+ missingField = 0;
+ ^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:56:5: Error: The method 'missingMethod' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
+ missingMethod();
+ ^^^^^^^^^^^^^";
+ }
+}
+class E extends self::D {
+ field dynamic missingField = null;
+ synthetic constructor •() → self::E*
+ : super self::D::•()
+ ;
+ method missingMethod() → void {}
+}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.weak.expect
index df689b5..cf6e6d4 100644
--- a/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.weak.expect
+++ b/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.weak.expect
@@ -1,10 +1,49 @@
library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:50:10: Error: The getter 'missingField' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
+// this.missingField;
+// ^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:51:10: Error: The setter 'missingField' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
+// this.missingField = 0;
+// ^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:52:10: Error: The method 'missingMethod' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
+// this.missingMethod();
+// ^^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:54:5: Error: The getter 'missingField' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
+// missingField;
+// ^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:55:5: Error: The setter 'missingField' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
+// missingField = 0;
+// ^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:56:5: Error: The method 'missingMethod' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
+// missingMethod();
+// ^^^^^^^^^^^^^
+//
import self as self;
import "dart:core" as core;
class C extends core::Object {
field dynamic superField = null;
- synthetic constructor •() → void
+ synthetic constructor •() → self::C*
: super core::Object::•()
;
method superMethod() → dynamic {}
@@ -17,7 +56,7 @@
}
class D extends self::C {
field dynamic field = null;
- synthetic constructor •() → void
+ synthetic constructor •() → self::D*
: super self::C::•()
;
set setterOnly(dynamic _) → void {}
@@ -45,21 +84,43 @@
this.{self::D::setterOnly} = 0;
this.{self::D::getterOnly};
this.{self::C::getterOnly} = 0;
- let final dynamic #t1 = this in let dynamic _ = null in invalid-expression "pkg/front_end/testcases/warn_unresolved_sends.dart:49:39: Error: The getter 'missingField' isn't defined for the class '#lib1::D'.\nTry correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.\n this. /*@warning=GetterNotFound*/ missingField;\n ^";
- let final dynamic #t2 = this in let dynamic _ = null in invalid-expression "pkg/front_end/testcases/warn_unresolved_sends.dart:50:39: Error: The setter 'missingField' isn't defined for the class '#lib1::D'.\nTry correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.\n this. /*@warning=SetterNotFound*/ missingField = 0;\n ^";
- let final dynamic #t3 = this in let dynamic _ = null in invalid-expression "pkg/front_end/testcases/warn_unresolved_sends.dart:51:39: Error: The method 'missingMethod' isn't defined for the class '#lib1::D'.\nTry correcting the name to the name of an existing method, or defining a method named 'missingMethod'.\n this. /*@warning=MethodNotFound*/ missingMethod();\n ^";
- let final dynamic #t4 = this in let dynamic _ = null in invalid-expression "pkg/front_end/testcases/warn_unresolved_sends.dart:53:33: Error: The getter 'missingField' isn't defined for the class '#lib1::D'.\nTry correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.\n /*@warning=GetterNotFound*/ missingField;\n ^";
- let final dynamic #t5 = this in let dynamic _ = null in invalid-expression "pkg/front_end/testcases/warn_unresolved_sends.dart:54:33: Error: The setter 'missingField' isn't defined for the class '#lib1::D'.\nTry correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.\n /*@warning=SetterNotFound*/ missingField = 0;\n ^";
- let final dynamic #t6 = this in let dynamic _ = null in invalid-expression "pkg/front_end/testcases/warn_unresolved_sends.dart:55:33: Error: The method 'missingMethod' isn't defined for the class '#lib1::D'.\nTry correcting the name to the name of an existing method, or defining a method named 'missingMethod'.\n /*@warning=MethodNotFound*/ missingMethod();\n ^";
+ invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:50:10: Error: The getter 'missingField' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
+ this.missingField;
+ ^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:51:10: Error: The setter 'missingField' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
+ this.missingField = 0;
+ ^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:52:10: Error: The method 'missingMethod' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
+ this.missingMethod();
+ ^^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:54:5: Error: The getter 'missingField' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
+ missingField;
+ ^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:55:5: Error: The setter 'missingField' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
+ missingField = 0;
+ ^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:56:5: Error: The method 'missingMethod' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
+ missingMethod();
+ ^^^^^^^^^^^^^";
}
}
class E extends self::D {
field dynamic missingField = null;
- synthetic constructor •() → void
+ synthetic constructor •() → self::E*
: super self::D::•()
;
method missingMethod() → void {}
}
-static method main() → dynamic {
- new self::E::•().{self::D::test}();
-}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.weak.transformed.expect
new file mode 100644
index 0000000..cf6e6d4
--- /dev/null
+++ b/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.weak.transformed.expect
@@ -0,0 +1,126 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:50:10: Error: The getter 'missingField' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
+// this.missingField;
+// ^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:51:10: Error: The setter 'missingField' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
+// this.missingField = 0;
+// ^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:52:10: Error: The method 'missingMethod' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
+// this.missingMethod();
+// ^^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:54:5: Error: The getter 'missingField' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
+// missingField;
+// ^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:55:5: Error: The setter 'missingField' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
+// missingField = 0;
+// ^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:56:5: Error: The method 'missingMethod' isn't defined for the class 'D'.
+// - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+// Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
+// missingMethod();
+// ^^^^^^^^^^^^^
+//
+import self as self;
+import "dart:core" as core;
+
+class C extends core::Object {
+ field dynamic superField = null;
+ synthetic constructor •() → self::C*
+ : super core::Object::•()
+ ;
+ method superMethod() → dynamic {}
+ get setterOnly() → dynamic
+ return null;
+ set setterOnly(dynamic _) → void {}
+ get getterOnly() → dynamic
+ return null;
+ set getterOnly(dynamic _) → void {}
+}
+class D extends self::C {
+ field dynamic field = null;
+ synthetic constructor •() → self::D*
+ : super self::C::•()
+ ;
+ set setterOnly(dynamic _) → void {}
+ get getterOnly() → dynamic
+ return null;
+ method method() → dynamic {}
+ method test() → void {
+ this.{self::D::field};
+ this.{self::C::superField};
+ this.{self::D::field} = 0;
+ this.{self::C::superField} = 0;
+ this.{self::D::method}();
+ this.{self::C::superMethod}();
+ this.{self::C::setterOnly};
+ this.{self::D::setterOnly} = 0;
+ this.{self::D::getterOnly};
+ this.{self::C::getterOnly} = 0;
+ this.{self::D::field};
+ this.{self::C::superField};
+ this.{self::D::field} = 0;
+ this.{self::C::superField} = 0;
+ this.{self::D::method}();
+ this.{self::C::superMethod}();
+ this.{self::C::setterOnly};
+ this.{self::D::setterOnly} = 0;
+ this.{self::D::getterOnly};
+ this.{self::C::getterOnly} = 0;
+ invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:50:10: Error: The getter 'missingField' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
+ this.missingField;
+ ^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:51:10: Error: The setter 'missingField' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
+ this.missingField = 0;
+ ^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:52:10: Error: The method 'missingMethod' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
+ this.missingMethod();
+ ^^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:54:5: Error: The getter 'missingField' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
+ missingField;
+ ^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:55:5: Error: The setter 'missingField' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
+ missingField = 0;
+ ^^^^^^^^^^^^";
+ invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:56:5: Error: The method 'missingMethod' isn't defined for the class 'D'.
+ - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
+Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
+ missingMethod();
+ ^^^^^^^^^^^^^";
+ }
+}
+class E extends self::D {
+ field dynamic missingField = null;
+ synthetic constructor •() → self::E*
+ : super self::D::•()
+ ;
+ method missingMethod() → void {}
+}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/inference/abstract_class_instantiation.dart b/pkg/front_end/testcases/inference/abstract_class_instantiation.dart
index f09570b..45b534d 100644
--- a/pkg/front_end/testcases/inference/abstract_class_instantiation.dart
+++ b/pkg/front_end/testcases/inference/abstract_class_instantiation.dart
@@ -12,9 +12,9 @@
}
void test() {
- var /*@type=C*/ x = new C();
- var /*@type=D<int>*/ y = new /*@typeArgs=int*/ D(1);
- D<List<int>> z = new /*@typeArgs=List<int>*/ D(/*@typeArgs=int*/ []);
+ var /*@type=dynamic*/ x = new C();
+ var /*@type=dynamic*/ y = new D(1);
+ D<List<int>> z = new D(/*@typeArgs=dynamic*/ []);
}
main() {}
diff --git a/pkg/front_end/testcases/inference/abstract_class_instantiation.dart.strong.expect b/pkg/front_end/testcases/inference/abstract_class_instantiation.dart.strong.expect
new file mode 100644
index 0000000..2958eaf
--- /dev/null
+++ b/pkg/front_end/testcases/inference/abstract_class_instantiation.dart.strong.expect
@@ -0,0 +1,35 @@
+library test;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/inference/abstract_class_instantiation.dart:15:33: Error: The class 'C' is abstract and can't be instantiated.
+// var /*@type=dynamic*/ x = new C();
+// ^
+//
+// pkg/front_end/testcases/inference/abstract_class_instantiation.dart:16:33: Error: The class 'D' is abstract and can't be instantiated.
+// var /*@type=dynamic*/ y = new D(1);
+// ^
+//
+// pkg/front_end/testcases/inference/abstract_class_instantiation.dart:17:24: Error: The class 'D' is abstract and can't be instantiated.
+// D<List<int>> z = new D(/*@typeArgs=dynamic*/ []);
+// ^
+//
+import self as self;
+import "dart:core" as core;
+
+abstract class C extends core::Object {
+ synthetic constructor •() → self::C*
+ : super core::Object::•()
+ ;
+}
+abstract class D<T extends core::Object* = dynamic> extends core::Object {
+ constructor •(self::D::T* t) → self::D<self::D::T*>*
+ : super core::Object::•()
+ ;
+}
+static method test() → void {
+ dynamic x = throw new core::AbstractClassInstantiationError::•("C");
+ dynamic y = let final core::Object* #t1 = 1 in throw new core::AbstractClassInstantiationError::•("D");
+ self::D<core::List<core::int*>*>* z = let final core::Object* #t2 = <dynamic>[] in throw new core::AbstractClassInstantiationError::•("D");
+}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/inference/abstract_class_instantiation.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/abstract_class_instantiation.dart.strong.transformed.expect
new file mode 100644
index 0000000..2958eaf
--- /dev/null
+++ b/pkg/front_end/testcases/inference/abstract_class_instantiation.dart.strong.transformed.expect
@@ -0,0 +1,35 @@
+library test;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/inference/abstract_class_instantiation.dart:15:33: Error: The class 'C' is abstract and can't be instantiated.
+// var /*@type=dynamic*/ x = new C();
+// ^
+//
+// pkg/front_end/testcases/inference/abstract_class_instantiation.dart:16:33: Error: The class 'D' is abstract and can't be instantiated.
+// var /*@type=dynamic*/ y = new D(1);
+// ^
+//
+// pkg/front_end/testcases/inference/abstract_class_instantiation.dart:17:24: Error: The class 'D' is abstract and can't be instantiated.
+// D<List<int>> z = new D(/*@typeArgs=dynamic*/ []);
+// ^
+//
+import self as self;
+import "dart:core" as core;
+
+abstract class C extends core::Object {
+ synthetic constructor •() → self::C*
+ : super core::Object::•()
+ ;
+}
+abstract class D<T extends core::Object* = dynamic> extends core::Object {
+ constructor •(self::D::T* t) → self::D<self::D::T*>*
+ : super core::Object::•()
+ ;
+}
+static method test() → void {
+ dynamic x = throw new core::AbstractClassInstantiationError::•("C");
+ dynamic y = let final core::Object* #t1 = 1 in throw new core::AbstractClassInstantiationError::•("D");
+ self::D<core::List<core::int*>*>* z = let final core::Object* #t2 = <dynamic>[] in throw new core::AbstractClassInstantiationError::•("D");
+}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/inference/constructors_too_many_positional_arguments.dart b/pkg/front_end/testcases/inference/constructors_too_many_positional_arguments.dart
index 2f393df..49f7a59 100644
--- a/pkg/front_end/testcases/inference/constructors_too_many_positional_arguments.dart
+++ b/pkg/front_end/testcases/inference/constructors_too_many_positional_arguments.dart
@@ -7,7 +7,8 @@
class A<T> {}
-main() {
- var /*@type=A<dynamic>*/ a =
- new /*@typeArgs=dynamic*/ A /*error:EXTRA_POSITIONAL_ARGUMENTS*/ (42);
+test() {
+ var /*@type=dynamic*/ a = new A /*error:EXTRA_POSITIONAL_ARGUMENTS*/ (42);
}
+
+main() {}
diff --git a/pkg/front_end/testcases/inference/constructors_too_many_positional_arguments.dart.outline.expect b/pkg/front_end/testcases/inference/constructors_too_many_positional_arguments.dart.outline.expect
index 38f29cd..8ebfc73 100644
--- a/pkg/front_end/testcases/inference/constructors_too_many_positional_arguments.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/constructors_too_many_positional_arguments.dart.outline.expect
@@ -6,5 +6,7 @@
synthetic constructor •() → self::A<self::A::T*>*
;
}
+static method test() → dynamic
+ ;
static method main() → dynamic
;
diff --git a/pkg/front_end/testcases/inference/constructors_too_many_positional_arguments.dart.strong.expect b/pkg/front_end/testcases/inference/constructors_too_many_positional_arguments.dart.strong.expect
new file mode 100644
index 0000000..891a659
--- /dev/null
+++ b/pkg/front_end/testcases/inference/constructors_too_many_positional_arguments.dart.strong.expect
@@ -0,0 +1,27 @@
+library test;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/inference/constructors_too_many_positional_arguments.dart:11:72: Error: Too many positional arguments: 0 allowed, but 1 found.
+// Try removing the extra positional arguments.
+// var /*@type=dynamic*/ a = new A /*error:EXTRA_POSITIONAL_ARGUMENTS*/ (42);
+// ^
+// pkg/front_end/testcases/inference/constructors_too_many_positional_arguments.dart:8:7: Context: The class 'A' has a constructor that takes no arguments.
+// class A<T> {}
+// ^
+//
+import self as self;
+import "dart:core" as core;
+
+class A<T extends core::Object* = dynamic> extends core::Object {
+ synthetic constructor •() → self::A<self::A::T*>*
+ : super core::Object::•()
+ ;
+}
+static method test() → dynamic {
+ dynamic a = invalid-expression "pkg/front_end/testcases/inference/constructors_too_many_positional_arguments.dart:11:72: Error: Too many positional arguments: 0 allowed, but 1 found.
+Try removing the extra positional arguments.
+ var /*@type=dynamic*/ a = new A /*error:EXTRA_POSITIONAL_ARGUMENTS*/ (42);
+ ^";
+}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/inference/constructors_too_many_positional_arguments.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/constructors_too_many_positional_arguments.dart.strong.transformed.expect
new file mode 100644
index 0000000..891a659
--- /dev/null
+++ b/pkg/front_end/testcases/inference/constructors_too_many_positional_arguments.dart.strong.transformed.expect
@@ -0,0 +1,27 @@
+library test;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/inference/constructors_too_many_positional_arguments.dart:11:72: Error: Too many positional arguments: 0 allowed, but 1 found.
+// Try removing the extra positional arguments.
+// var /*@type=dynamic*/ a = new A /*error:EXTRA_POSITIONAL_ARGUMENTS*/ (42);
+// ^
+// pkg/front_end/testcases/inference/constructors_too_many_positional_arguments.dart:8:7: Context: The class 'A' has a constructor that takes no arguments.
+// class A<T> {}
+// ^
+//
+import self as self;
+import "dart:core" as core;
+
+class A<T extends core::Object* = dynamic> extends core::Object {
+ synthetic constructor •() → self::A<self::A::T*>*
+ : super core::Object::•()
+ ;
+}
+static method test() → dynamic {
+ dynamic a = invalid-expression "pkg/front_end/testcases/inference/constructors_too_many_positional_arguments.dart:11:72: Error: Too many positional arguments: 0 allowed, but 1 found.
+Try removing the extra positional arguments.
+ var /*@type=dynamic*/ a = new A /*error:EXTRA_POSITIONAL_ARGUMENTS*/ (42);
+ ^";
+}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable.dart b/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable.dart
index a5ecbcb..8051cfe 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable.dart
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable.dart
@@ -9,14 +9,14 @@
const Foo(List<String> l);
}
-class C<@Foo(/*@typeArgs=String*/ const []) T> {}
+class C<@Foo(const []) T> {}
-typedef void F<@Foo(/*@typeArgs=String*/ const []) T>();
+typedef void F<@Foo(const []) T>();
-void f<@Foo(/*@typeArgs=String*/ const []) T>() {}
+void f<@Foo(const []) T>() {}
class D {
- void m<@Foo(/*@typeArgs=String*/ const []) T>() {}
+ void m<@Foo(const []) T>() {}
}
main() {}
diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable.dart.strong.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable.dart.strong.expect
new file mode 100644
index 0000000..11bef7d
--- /dev/null
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable.dart.strong.expect
@@ -0,0 +1,23 @@
+library test;
+import self as self;
+import "dart:core" as core;
+
+typedef F<unrelated T extends core::Object* = dynamic> = () →* void;
+class Foo extends core::Object /*hasConstConstructor*/ {
+ const constructor •(core::List<core::String*>* l) → self::Foo*
+ : super core::Object::•()
+ ;
+}
+class C<T extends core::Object* = dynamic> extends core::Object {
+ synthetic constructor •() → self::C<self::C::T*>*
+ : super core::Object::•()
+ ;
+}
+class D extends core::Object {
+ synthetic constructor •() → self::D*
+ : super core::Object::•()
+ ;
+ method m<T extends core::Object* = dynamic>() → void {}
+}
+static method f<T extends core::Object* = dynamic>() → void {}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable.dart.strong.transformed.expect
new file mode 100644
index 0000000..11bef7d
--- /dev/null
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable.dart.strong.transformed.expect
@@ -0,0 +1,23 @@
+library test;
+import self as self;
+import "dart:core" as core;
+
+typedef F<unrelated T extends core::Object* = dynamic> = () →* void;
+class Foo extends core::Object /*hasConstConstructor*/ {
+ const constructor •(core::List<core::String*>* l) → self::Foo*
+ : super core::Object::•()
+ ;
+}
+class C<T extends core::Object* = dynamic> extends core::Object {
+ synthetic constructor •() → self::C<self::C::T*>*
+ : super core::Object::•()
+ ;
+}
+class D extends core::Object {
+ synthetic constructor •() → self::D*
+ : super core::Object::•()
+ ;
+ method m<T extends core::Object* = dynamic>() → void {}
+}
+static method f<T extends core::Object* = dynamic>() → void {}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/inference/downwards_inference_on_function_of_t_using_the_t.dart b/pkg/front_end/testcases/inference/downwards_inference_on_function_of_t_using_the_t.dart
index acb151f..3f570b4 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_on_function_of_t_using_the_t.dart
+++ b/pkg/front_end/testcases/inference/downwards_inference_on_function_of_t_using_the_t.dart
@@ -8,18 +8,18 @@
void main() {
{
T f<T>(T x) => null;
- var /*@type=<T extends Object>(main::f::T) -> main::f::T*/ v1 = f;
- v1 = <S> /*@returnType=main::::S*/ (/*@type=main::::S*/ x) => x;
+ var /*@type=<T extends Object* = dynamic>(T*) ->* T**/ v1 = f;
+ v1 = <S> /*@returnType=S**/ (/*@type=S**/ x) => x;
}
{
List<T> f<T>(T x) => null;
- var /*@type=<T extends Object>(main::f::T) -> List<main::f::T>*/ v2 = f;
- v2 = <S> /*@returnType=List<main::::S>*/
- (/*@type=main::::S*/ x) => /*@typeArgs=main::::S*/ [x];
- Iterable<int> r = /*@typeArgs=int*/ v2(42);
- Iterable<String> s = /*@typeArgs=String*/ v2('hello');
- Iterable<List<int>> t = /*@typeArgs=List<int>*/ v2(<int>[]);
- Iterable<num> u = /*@typeArgs=num*/ v2(42);
+ var /*@type=<T extends Object* = dynamic>(T*) ->* List<T*>**/ v2 = f;
+ v2 = <S> /*@returnType=List<S*>**/
+ (/*@type=S**/ x) => /*@typeArgs=S**/ [x];
+ Iterable<int> r = v2 /*@typeArgs=int**/ (42);
+ Iterable<String> s = v2 /*@typeArgs=String**/ ('hello');
+ Iterable<List<int>> t = v2 /*@typeArgs=List<int*>**/ (<int>[]);
+ Iterable<num> u = v2 /*@typeArgs=num**/ (42);
Iterable<num> v = v2<num>(42);
}
}
diff --git a/pkg/front_end/testcases/inference/downwards_inference_on_function_of_t_using_the_t.dart.strong.expect b/pkg/front_end/testcases/inference/downwards_inference_on_function_of_t_using_the_t.dart.strong.expect
new file mode 100644
index 0000000..3231434
--- /dev/null
+++ b/pkg/front_end/testcases/inference/downwards_inference_on_function_of_t_using_the_t.dart.strong.expect
@@ -0,0 +1,23 @@
+library test;
+import self as self;
+import "dart:core" as core;
+
+static method main() → void {
+ {
+ function f<T extends core::Object* = dynamic>(T* x) → T*
+ return null;
+ <T extends core::Object* = dynamic>(T*) →* T* v1 = f;
+ v1 = <S extends core::Object* = dynamic>(S* x) → S* => x;
+ }
+ {
+ function f<T extends core::Object* = dynamic>(T* x) → core::List<T*>*
+ return null;
+ <T extends core::Object* = dynamic>(T*) →* core::List<T*>* v2 = f;
+ v2 = <S extends core::Object* = dynamic>(S* x) → core::List<S*>* => <S*>[x];
+ core::Iterable<core::int*>* r = v2.call<core::int*>(42);
+ core::Iterable<core::String*>* s = v2.call<core::String*>("hello");
+ core::Iterable<core::List<core::int*>*>* t = v2.call<core::List<core::int*>*>(<core::int*>[]);
+ core::Iterable<core::num*>* u = v2.call<core::num*>(42);
+ core::Iterable<core::num*>* v = v2.call<core::num*>(42);
+ }
+}
diff --git a/pkg/front_end/testcases/inference/downwards_inference_on_function_of_t_using_the_t.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/downwards_inference_on_function_of_t_using_the_t.dart.strong.transformed.expect
new file mode 100644
index 0000000..3231434
--- /dev/null
+++ b/pkg/front_end/testcases/inference/downwards_inference_on_function_of_t_using_the_t.dart.strong.transformed.expect
@@ -0,0 +1,23 @@
+library test;
+import self as self;
+import "dart:core" as core;
+
+static method main() → void {
+ {
+ function f<T extends core::Object* = dynamic>(T* x) → T*
+ return null;
+ <T extends core::Object* = dynamic>(T*) →* T* v1 = f;
+ v1 = <S extends core::Object* = dynamic>(S* x) → S* => x;
+ }
+ {
+ function f<T extends core::Object* = dynamic>(T* x) → core::List<T*>*
+ return null;
+ <T extends core::Object* = dynamic>(T*) →* core::List<T*>* v2 = f;
+ v2 = <S extends core::Object* = dynamic>(S* x) → core::List<S*>* => <S*>[x];
+ core::Iterable<core::int*>* r = v2.call<core::int*>(42);
+ core::Iterable<core::String*>* s = v2.call<core::String*>("hello");
+ core::Iterable<core::List<core::int*>*>* t = v2.call<core::List<core::int*>*>(<core::int*>[]);
+ core::Iterable<core::num*>* u = v2.call<core::num*>(42);
+ core::Iterable<core::num*>* v = v2.call<core::num*>(42);
+ }
+}
diff --git a/pkg/front_end/testcases/inference/future_then_explicit_future.dart b/pkg/front_end/testcases/inference/future_then_explicit_future.dart
index 8db3f562..96f37e4 100644
--- a/pkg/front_end/testcases/inference/future_then_explicit_future.dart
+++ b/pkg/front_end/testcases/inference/future_then_explicit_future.dart
@@ -9,17 +9,19 @@
m1() {
Future<int> f;
- var /*@type=Future<List<int>>*/ x = f. /*@target=Future::then*/ then<
+ var /*@type=Future<Future<List<int*>*>*>**/ x = f. /*@target=Future::then*/ then<
Future<List<int>>>(
/*error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/
- /*@returnType=List<dynamic>*/ (/*@type=int*/ x) => /*@typeArgs=dynamic*/ []);
+ /*@returnType=FutureOr<Future<List<int*>*>*>**/ (/*@type=int**/ x) => /*@typeArgs=dynamic*/ []);
Future<List<int>> y = x;
}
m2() {
Future<int> f;
- var /*@type=Future<List<int>>*/ x =
- f. /*@target=Future::then*/ then<List<int>>(
- /*@returnType=List<int>*/ (/*@type=int*/ x) => /*@typeArgs=int*/ []);
+ var /*@type=Future<List<int*>*>**/ x = f. /*@target=Future::then*/ then<
+ List<int>>(
+ /*@returnType=List<int*>**/ (/*@type=int**/ x) => /*@typeArgs=int**/ []);
Future<List<int>> y = x;
}
+
+main() {}
diff --git a/pkg/front_end/testcases/inference/future_then_explicit_future.dart.outline.expect b/pkg/front_end/testcases/inference/future_then_explicit_future.dart.outline.expect
index 2d680ba..9513bdf 100644
--- a/pkg/front_end/testcases/inference/future_then_explicit_future.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_then_explicit_future.dart.outline.expect
@@ -7,3 +7,5 @@
;
static method m2() → dynamic
;
+static method main() → dynamic
+ ;
diff --git a/pkg/front_end/testcases/inference/future_then_explicit_future.dart.strong.expect b/pkg/front_end/testcases/inference/future_then_explicit_future.dart.strong.expect
new file mode 100644
index 0000000..14fac01
--- /dev/null
+++ b/pkg/front_end/testcases/inference/future_then_explicit_future.dart.strong.expect
@@ -0,0 +1,43 @@
+library test;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/inference/future_then_explicit_future.dart:15:99: Error: A value of type 'List<dynamic>' can't be assigned to a variable of type 'FutureOr<Future<List<int>>>'.
+// - 'List' is from 'dart:core'.
+// - 'FutureOr' is from 'dart:async'.
+// - 'Future' is from 'dart:async'.
+// /*@returnType=FutureOr<Future<List<int*>*>*>**/ (/*@type=int**/ x) => /*@typeArgs=dynamic*/ []);
+// ^
+//
+// pkg/front_end/testcases/inference/future_then_explicit_future.dart:16:25: Error: A value of type 'Future<Future<List<int>>>' can't be assigned to a variable of type 'Future<List<int>>'.
+// - 'Future' is from 'dart:async'.
+// - 'List' is from 'dart:core'.
+// Future<List<int>> y = x;
+// ^
+//
+import self as self;
+import "dart:async" as asy;
+import "dart:core" as core;
+
+import "dart:async";
+
+static method m1() → dynamic {
+ asy::Future<core::int*>* f;
+ asy::Future<asy::Future<core::List<core::int*>*>*>* x = f.{asy::Future::then}<asy::Future<core::List<core::int*>*>*>((core::int* x) → asy::FutureOr<asy::Future<core::List<core::int*>*>*>* => let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/inference/future_then_explicit_future.dart:15:99: Error: A value of type 'List<dynamic>' can't be assigned to a variable of type 'FutureOr<Future<List<int>>>'.
+ - 'List' is from 'dart:core'.
+ - 'FutureOr' is from 'dart:async'.
+ - 'Future' is from 'dart:async'.
+ /*@returnType=FutureOr<Future<List<int*>*>*>**/ (/*@type=int**/ x) => /*@typeArgs=dynamic*/ []);
+ ^" in <dynamic>[] as{TypeError} asy::FutureOr<asy::Future<core::List<core::int*>*>*>*);
+ asy::Future<core::List<core::int*>*>* y = let final<BottomType> #t2 = invalid-expression "pkg/front_end/testcases/inference/future_then_explicit_future.dart:16:25: Error: A value of type 'Future<Future<List<int>>>' can't be assigned to a variable of type 'Future<List<int>>'.
+ - 'Future' is from 'dart:async'.
+ - 'List' is from 'dart:core'.
+ Future<List<int>> y = x;
+ ^" in x as{TypeError} asy::Future<core::List<core::int*>*>*;
+}
+static method m2() → dynamic {
+ asy::Future<core::int*>* f;
+ asy::Future<core::List<core::int*>*>* x = f.{asy::Future::then}<core::List<core::int*>*>((core::int* x) → core::List<core::int*>* => <core::int*>[]);
+ asy::Future<core::List<core::int*>*>* y = x;
+}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/inference/future_then_explicit_future.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_then_explicit_future.dart.strong.transformed.expect
new file mode 100644
index 0000000..14fac01
--- /dev/null
+++ b/pkg/front_end/testcases/inference/future_then_explicit_future.dart.strong.transformed.expect
@@ -0,0 +1,43 @@
+library test;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/inference/future_then_explicit_future.dart:15:99: Error: A value of type 'List<dynamic>' can't be assigned to a variable of type 'FutureOr<Future<List<int>>>'.
+// - 'List' is from 'dart:core'.
+// - 'FutureOr' is from 'dart:async'.
+// - 'Future' is from 'dart:async'.
+// /*@returnType=FutureOr<Future<List<int*>*>*>**/ (/*@type=int**/ x) => /*@typeArgs=dynamic*/ []);
+// ^
+//
+// pkg/front_end/testcases/inference/future_then_explicit_future.dart:16:25: Error: A value of type 'Future<Future<List<int>>>' can't be assigned to a variable of type 'Future<List<int>>'.
+// - 'Future' is from 'dart:async'.
+// - 'List' is from 'dart:core'.
+// Future<List<int>> y = x;
+// ^
+//
+import self as self;
+import "dart:async" as asy;
+import "dart:core" as core;
+
+import "dart:async";
+
+static method m1() → dynamic {
+ asy::Future<core::int*>* f;
+ asy::Future<asy::Future<core::List<core::int*>*>*>* x = f.{asy::Future::then}<asy::Future<core::List<core::int*>*>*>((core::int* x) → asy::FutureOr<asy::Future<core::List<core::int*>*>*>* => let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/inference/future_then_explicit_future.dart:15:99: Error: A value of type 'List<dynamic>' can't be assigned to a variable of type 'FutureOr<Future<List<int>>>'.
+ - 'List' is from 'dart:core'.
+ - 'FutureOr' is from 'dart:async'.
+ - 'Future' is from 'dart:async'.
+ /*@returnType=FutureOr<Future<List<int*>*>*>**/ (/*@type=int**/ x) => /*@typeArgs=dynamic*/ []);
+ ^" in <dynamic>[] as{TypeError} asy::FutureOr<asy::Future<core::List<core::int*>*>*>*);
+ asy::Future<core::List<core::int*>*>* y = let final<BottomType> #t2 = invalid-expression "pkg/front_end/testcases/inference/future_then_explicit_future.dart:16:25: Error: A value of type 'Future<Future<List<int>>>' can't be assigned to a variable of type 'Future<List<int>>'.
+ - 'Future' is from 'dart:async'.
+ - 'List' is from 'dart:core'.
+ Future<List<int>> y = x;
+ ^" in x as{TypeError} asy::Future<core::List<core::int*>*>*;
+}
+static method m2() → dynamic {
+ asy::Future<core::int*>* f;
+ asy::Future<core::List<core::int*>*>* x = f.{asy::Future::then}<core::List<core::int*>*>((core::int* x) → core::List<core::int*>* => <core::int*>[]);
+ asy::Future<core::List<core::int*>*>* y = x;
+}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/inference/generic_functions_return_typedef.dart b/pkg/front_end/testcases/inference/generic_functions_return_typedef.dart
index 5341fd1..e24cb09 100644
--- a/pkg/front_end/testcases/inference/generic_functions_return_typedef.dart
+++ b/pkg/front_end/testcases/inference/generic_functions_return_typedef.dart
@@ -9,8 +9,8 @@
main() {
ToValue<T> f<T>(T x) => null;
- var /*@type=(int) -> void*/ x = f<int>(42);
- var /*@type=(int) -> void*/ y = /*@typeArgs=int*/ f(42);
+ var /*@type=(int*) ->* void*/ x = f<int>(42);
+ var /*@type=(int*) ->* void*/ y = f /*@typeArgs=int**/ (42);
ToValue<int> takesInt = x;
takesInt = y;
}
diff --git a/pkg/front_end/testcases/inference/generic_functions_return_typedef.dart.strong.expect b/pkg/front_end/testcases/inference/generic_functions_return_typedef.dart.strong.expect
new file mode 100644
index 0000000..1f60cfe
--- /dev/null
+++ b/pkg/front_end/testcases/inference/generic_functions_return_typedef.dart.strong.expect
@@ -0,0 +1,13 @@
+library test;
+import self as self;
+import "dart:core" as core;
+
+typedef ToValue<contravariant T extends core::Object* = dynamic> = (T*) →* void;
+static method main() → dynamic {
+ function f<T extends core::Object* = dynamic>(T* x) → (T*) →* void
+ return null;
+ (core::int*) →* void x = f.call<core::int*>(42);
+ (core::int*) →* void y = f.call<core::int*>(42);
+ (core::int*) →* void takesInt = x;
+ takesInt = y;
+}
diff --git a/pkg/front_end/testcases/inference/generic_functions_return_typedef.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/generic_functions_return_typedef.dart.strong.transformed.expect
new file mode 100644
index 0000000..1f60cfe
--- /dev/null
+++ b/pkg/front_end/testcases/inference/generic_functions_return_typedef.dart.strong.transformed.expect
@@ -0,0 +1,13 @@
+library test;
+import self as self;
+import "dart:core" as core;
+
+typedef ToValue<contravariant T extends core::Object* = dynamic> = (T*) →* void;
+static method main() → dynamic {
+ function f<T extends core::Object* = dynamic>(T* x) → (T*) →* void
+ return null;
+ (core::int*) →* void x = f.call<core::int*>(42);
+ (core::int*) →* void y = f.call<core::int*>(42);
+ (core::int*) →* void takesInt = x;
+ takesInt = y;
+}
diff --git a/pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart b/pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart
index 3390040..a4a66ca 100644
--- a/pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart
+++ b/pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart
@@ -5,11 +5,14 @@
/*@testedFeatures=inference*/
library test;
-/*error:IMPORT_INTERNAL_LIBRARY*/ import 'dart:_foreign_helper' show JS;
+// TODO(johnniwinther): Support testing of internal libraries.
+import 'dart:_foreign_helper' show JS; // error
-main() {
- String x = /*error:INVALID_ASSIGNMENT*/ JS('int', '42');
- var /*@type=String*/ y = JS('String', '"hello"');
+test() {
+ String x = JS('int', '42'); // error
+ var /*@type=dynamic*/ y = JS<String>('String', '"hello"');
y = "world";
- y = /*error:INVALID_ASSIGNMENT*/ 42;
+ y = 42; // error
}
+
+main() {}
diff --git a/pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart.outline.expect b/pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart.outline.expect
index bc9e0ea..f23adfb 100644
--- a/pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart.outline.expect
@@ -2,13 +2,15 @@
//
// Problems in library:
//
-// pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart:8:42: Error: Can't access platform private library.
-// /*error:IMPORT_INTERNAL_LIBRARY*/ import 'dart:_foreign_helper' show JS;
-// ^
+// pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart:9:8: Error: Can't access platform private library.
+// import 'dart:_foreign_helper' show JS; // error
+// ^
//
import self as self;
import "dart:_foreign_helper";
+static method test() → dynamic
+ ;
static method main() → dynamic
;
diff --git a/pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart.strong.expect b/pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart.strong.expect
new file mode 100644
index 0000000..7b69eef
--- /dev/null
+++ b/pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart.strong.expect
@@ -0,0 +1,32 @@
+library test;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart:9:8: Error: Can't access platform private library.
+// import 'dart:_foreign_helper' show JS; // error
+// ^
+//
+// pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart:12:14: Error: Method not found: 'JS'.
+// String x = JS('int', '42'); // error
+// ^^
+//
+// pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart:13:29: Error: Method not found: 'JS'.
+// var /*@type=dynamic*/ y = JS<String>('String', '"hello"');
+// ^^
+//
+import self as self;
+import "dart:core" as core;
+
+import "dart:_foreign_helper";
+
+static method test() → dynamic {
+ core::String* x = invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart:12:14: Error: Method not found: 'JS'.
+ String x = JS('int', '42'); // error
+ ^^" as{TypeError,ForDynamic} core::String*;
+ dynamic y = invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart:13:29: Error: Method not found: 'JS'.
+ var /*@type=dynamic*/ y = JS<String>('String', '\"hello\"');
+ ^^";
+ y = "world";
+ y = 42;
+}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart.strong.transformed.expect
new file mode 100644
index 0000000..7b69eef
--- /dev/null
+++ b/pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart.strong.transformed.expect
@@ -0,0 +1,32 @@
+library test;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart:9:8: Error: Can't access platform private library.
+// import 'dart:_foreign_helper' show JS; // error
+// ^
+//
+// pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart:12:14: Error: Method not found: 'JS'.
+// String x = JS('int', '42'); // error
+// ^^
+//
+// pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart:13:29: Error: Method not found: 'JS'.
+// var /*@type=dynamic*/ y = JS<String>('String', '"hello"');
+// ^^
+//
+import self as self;
+import "dart:core" as core;
+
+import "dart:_foreign_helper";
+
+static method test() → dynamic {
+ core::String* x = invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart:12:14: Error: Method not found: 'JS'.
+ String x = JS('int', '42'); // error
+ ^^" as{TypeError,ForDynamic} core::String*;
+ dynamic y = invalid-expression "pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart:13:29: Error: Method not found: 'JS'.
+ var /*@type=dynamic*/ y = JS<String>('String', '\"hello\"');
+ ^^";
+ y = "world";
+ y = 42;
+}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1.dart b/pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1.dart
index 59c1da41..4bcd55c 100644
--- a/pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1.dart
+++ b/pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1.dart
@@ -6,7 +6,7 @@
library test;
List<T> f<T>(T g()) => <T>[g()];
-var v = (f<dynamic>)(() {
+var v = (f<dynamic>)(/*@returnType=int**/() {
return 1;
});
diff --git a/pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1.dart.outline.expect b/pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1.dart.outline.expect
index 1f7e3c2..fc2eda8 100644
--- a/pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1.dart.outline.expect
@@ -4,11 +4,11 @@
//
// pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1.dart:9:19: Error: A comparison expression can't be an operand of another comparison expression.
// Try putting parentheses around one of the comparisons.
-// var v = (f<dynamic>)(() {
+// var v = (f<dynamic>)(/*@returnType=int**/() {
// ^
//
// pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1.dart:9:20: Error: Expected an identifier, but got ')'.
-// var v = (f<dynamic>)(() {
+// var v = (f<dynamic>)(/*@returnType=int**/() {
// ^
//
import self as self;
diff --git a/pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1.dart.strong.expect b/pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1.dart.strong.expect
new file mode 100644
index 0000000..a9f015e
--- /dev/null
+++ b/pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1.dart.strong.expect
@@ -0,0 +1,34 @@
+library test;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1.dart:9:19: Error: A comparison expression can't be an operand of another comparison expression.
+// Try putting parentheses around one of the comparisons.
+// var v = (f<dynamic>)(/*@returnType=int**/() {
+// ^
+//
+// pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1.dart:9:20: Error: Expected an identifier, but got ')'.
+// var v = (f<dynamic>)(/*@returnType=int**/() {
+// ^
+//
+// pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1.dart:9:11: Error: The operator '<' isn't defined for the class 'List<T> Function<T>(T Function())'.
+// - 'List' is from 'dart:core'.
+// Try correcting the operator to an existing operator, or defining a '<' operator.
+// var v = (f<dynamic>)(/*@returnType=int**/() {
+// ^
+//
+import self as self;
+import "dart:core" as core;
+
+static field dynamic v = invalid-expression "pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1.dart:9:11: Error: The operator '<' isn't defined for the class 'List<T> Function<T>(T Function())'.
+ - 'List' is from 'dart:core'.
+Try correcting the operator to an existing operator, or defining a '<' operator.
+var v = (f<dynamic>)(/*@returnType=int**/() {
+ ^".>(invalid-expression "pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1.dart:9:20: Error: This couldn't be parsed.
+var v = (f<dynamic>)(/*@returnType=int**/() {
+ ^").call(() → core::int* {
+ return 1;
+});
+static method f<T extends core::Object* = dynamic>(() →* self::f::T* g) → core::List<self::f::T*>*
+ return <self::f::T*>[g.call()];
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1.dart.strong.transformed.expect
new file mode 100644
index 0000000..a9f015e
--- /dev/null
+++ b/pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1.dart.strong.transformed.expect
@@ -0,0 +1,34 @@
+library test;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1.dart:9:19: Error: A comparison expression can't be an operand of another comparison expression.
+// Try putting parentheses around one of the comparisons.
+// var v = (f<dynamic>)(/*@returnType=int**/() {
+// ^
+//
+// pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1.dart:9:20: Error: Expected an identifier, but got ')'.
+// var v = (f<dynamic>)(/*@returnType=int**/() {
+// ^
+//
+// pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1.dart:9:11: Error: The operator '<' isn't defined for the class 'List<T> Function<T>(T Function())'.
+// - 'List' is from 'dart:core'.
+// Try correcting the operator to an existing operator, or defining a '<' operator.
+// var v = (f<dynamic>)(/*@returnType=int**/() {
+// ^
+//
+import self as self;
+import "dart:core" as core;
+
+static field dynamic v = invalid-expression "pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1.dart:9:11: Error: The operator '<' isn't defined for the class 'List<T> Function<T>(T Function())'.
+ - 'List' is from 'dart:core'.
+Try correcting the operator to an existing operator, or defining a '<' operator.
+var v = (f<dynamic>)(/*@returnType=int**/() {
+ ^".>(invalid-expression "pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1.dart:9:20: Error: This couldn't be parsed.
+var v = (f<dynamic>)(/*@returnType=int**/() {
+ ^").call(() → core::int* {
+ return 1;
+});
+static method f<T extends core::Object* = dynamic>(() →* self::f::T* g) → core::List<self::f::T*>*
+ return <self::f::T*>[g.call()];
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1.dart b/pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1.dart
index b24960b..03149d0 100644
--- a/pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1.dart
+++ b/pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1.dart
@@ -6,7 +6,7 @@
library test;
List<T> f<T>(T g()) => <T>[g()];
-var v = (f<int>)(() {
+var v = (f<int>)(/*@returnType=int**/() {
return 1;
});
diff --git a/pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1.dart.outline.expect b/pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1.dart.outline.expect
index 973e1f4..767988c 100644
--- a/pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1.dart.outline.expect
@@ -4,11 +4,11 @@
//
// pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1.dart:9:15: Error: A comparison expression can't be an operand of another comparison expression.
// Try putting parentheses around one of the comparisons.
-// var v = (f<int>)(() {
+// var v = (f<int>)(/*@returnType=int**/() {
// ^
//
// pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1.dart:9:16: Error: Expected an identifier, but got ')'.
-// var v = (f<int>)(() {
+// var v = (f<int>)(/*@returnType=int**/() {
// ^
//
import self as self;
diff --git a/pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1.dart.strong.expect b/pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1.dart.strong.expect
new file mode 100644
index 0000000..e7e43df
--- /dev/null
+++ b/pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1.dart.strong.expect
@@ -0,0 +1,34 @@
+library test;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1.dart:9:15: Error: A comparison expression can't be an operand of another comparison expression.
+// Try putting parentheses around one of the comparisons.
+// var v = (f<int>)(/*@returnType=int**/() {
+// ^
+//
+// pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1.dart:9:16: Error: Expected an identifier, but got ')'.
+// var v = (f<int>)(/*@returnType=int**/() {
+// ^
+//
+// pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1.dart:9:11: Error: The operator '<' isn't defined for the class 'List<T> Function<T>(T Function())'.
+// - 'List' is from 'dart:core'.
+// Try correcting the operator to an existing operator, or defining a '<' operator.
+// var v = (f<int>)(/*@returnType=int**/() {
+// ^
+//
+import self as self;
+import "dart:core" as core;
+
+static field dynamic v = invalid-expression "pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1.dart:9:11: Error: The operator '<' isn't defined for the class 'List<T> Function<T>(T Function())'.
+ - 'List' is from 'dart:core'.
+Try correcting the operator to an existing operator, or defining a '<' operator.
+var v = (f<int>)(/*@returnType=int**/() {
+ ^".>(invalid-expression "pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1.dart:9:16: Error: This couldn't be parsed.
+var v = (f<int>)(/*@returnType=int**/() {
+ ^").call(() → core::int* {
+ return 1;
+});
+static method f<T extends core::Object* = dynamic>(() →* self::f::T* g) → core::List<self::f::T*>*
+ return <self::f::T*>[g.call()];
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1.dart.strong.transformed.expect
new file mode 100644
index 0000000..e7e43df
--- /dev/null
+++ b/pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1.dart.strong.transformed.expect
@@ -0,0 +1,34 @@
+library test;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1.dart:9:15: Error: A comparison expression can't be an operand of another comparison expression.
+// Try putting parentheses around one of the comparisons.
+// var v = (f<int>)(/*@returnType=int**/() {
+// ^
+//
+// pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1.dart:9:16: Error: Expected an identifier, but got ')'.
+// var v = (f<int>)(/*@returnType=int**/() {
+// ^
+//
+// pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1.dart:9:11: Error: The operator '<' isn't defined for the class 'List<T> Function<T>(T Function())'.
+// - 'List' is from 'dart:core'.
+// Try correcting the operator to an existing operator, or defining a '<' operator.
+// var v = (f<int>)(/*@returnType=int**/() {
+// ^
+//
+import self as self;
+import "dart:core" as core;
+
+static field dynamic v = invalid-expression "pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1.dart:9:11: Error: The operator '<' isn't defined for the class 'List<T> Function<T>(T Function())'.
+ - 'List' is from 'dart:core'.
+Try correcting the operator to an existing operator, or defining a '<' operator.
+var v = (f<int>)(/*@returnType=int**/() {
+ ^".>(invalid-expression "pkg/front_end/testcases/inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1.dart:9:16: Error: This couldn't be parsed.
+var v = (f<int>)(/*@returnType=int**/() {
+ ^").call(() → core::int* {
+ return 1;
+});
+static method f<T extends core::Object* = dynamic>(() →* self::f::T* g) → core::List<self::f::T*>*
+ return <self::f::T*>[g.call()];
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/nnbd/issue41156.dart b/pkg/front_end/testcases/nnbd/issue41156.dart
new file mode 100644
index 0000000..b5e3ee3
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue41156.dart
@@ -0,0 +1,79 @@
+// Copyright (c) 2020, 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.
+
+Never throwing() => throw '';
+
+void main() {
+ String Function(int) x1 = (int v) => throw v; /* ok */
+ String Function(int) x2 = (int v) /* ok */ {
+ throw v;
+ };
+ String Function(int) x3 = (int v) /* ok */ {
+ return throw v;
+ };
+ String Function(int) x4 = (int v) => throwing(); /* ok */
+ String Function(int) x5 = (int v) /* ok */ {
+ throwing();
+ };
+ String Function(int) x6 = (int v) /* ok */ {
+ return throwing();
+ };
+ Future<String> Function(int) y1 = (int v) async => throw v; /* ok */
+ Future<String> Function(int) y2 = (int v) async /* ok */ {
+ throw v;
+ };
+ Future<String> Function(int) y3 = (int v) async /* ok */ {
+ return throw v;
+ };
+ Future<String> Function(int) y4 = (int v) async => throwing(); /* ok */
+ Future<String> Function(int) y5 = (int v) async /* ok */ {
+ throwing();
+ };
+ Future<String> Function(int) y6 = (int v) async /* ok */ {
+ return throwing();
+ };
+}
+
+void errors() async {
+ String Function(int) x2 = (int v) /* error */ {
+ try {
+ throw v;
+ } catch (_) {}
+ };
+ String Function(int) x3 = (int v) /* error */ {
+ try {
+ return throw v;
+ } catch (_) {}
+ };
+ String Function(int) x5 = (int v) /* error */ {
+ try {
+ throwing();
+ } catch (_) {}
+ };
+ String Function(int) x6 = (int v) /* error */ {
+ try {
+ return throwing();
+ } catch (_) {}
+ };
+ Future<String> Function(int) y2 = (int v) async /* error */ {
+ try {
+ throw v;
+ } catch (_) {}
+ };
+ Future<String> Function(int) y3 = (int v) async /* error */ {
+ try {
+ return throw v;
+ } catch (_) {}
+ };
+ Future<String> Function(int) y5 = (int v) async /* error */ {
+ try {
+ throwing();
+ } catch (_) {}
+ };
+ Future<String> Function(int) y6 = (int v) async /* error */ {
+ try {
+ return throwing();
+ } catch (_) {}
+ };
+}
diff --git a/pkg/front_end/testcases/nnbd/issue41156.dart.outline.expect b/pkg/front_end/testcases/nnbd/issue41156.dart.outline.expect
new file mode 100644
index 0000000..29bd99f
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue41156.dart.outline.expect
@@ -0,0 +1,9 @@
+library /*isNonNullableByDefault*/;
+import self as self;
+
+static method throwing() → Never
+ ;
+static method main() → void
+ ;
+static method errors() → void
+ ;
diff --git a/pkg/front_end/testcases/nnbd/issue41156.dart.strong.expect b/pkg/front_end/testcases/nnbd/issue41156.dart.strong.expect
new file mode 100644
index 0000000..d977afe
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue41156.dart.strong.expect
@@ -0,0 +1,154 @@
+library /*isNonNullableByDefault*/;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:39:29: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+// String Function(int) x2 = (int v) /* error */ {
+// ^
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:44:29: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+// String Function(int) x3 = (int v) /* error */ {
+// ^
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:49:29: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+// String Function(int) x5 = (int v) /* error */ {
+// ^
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:54:29: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+// String Function(int) x6 = (int v) /* error */ {
+// ^
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:59:37: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+// Future<String> Function(int) y2 = (int v) async /* error */ {
+// ^
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:64:37: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+// Future<String> Function(int) y3 = (int v) async /* error */ {
+// ^
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:69:37: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+// Future<String> Function(int) y5 = (int v) async /* error */ {
+// ^
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:74:37: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+// Future<String> Function(int) y6 = (int v) async /* error */ {
+// ^
+//
+import self as self;
+import "dart:core" as core;
+import "dart:async" as asy;
+
+static method throwing() → Never
+ return throw "";
+static method main() → void {
+ (core::int) → core::String x1 = (core::int v) → Never => throw v;
+ (core::int) → core::String x2 = (core::int v) → Never {
+ throw v;
+ };
+ (core::int) → core::String x3 = (core::int v) → Never {
+ return throw v;
+ };
+ (core::int) → core::String x4 = (core::int v) → Never => self::throwing();
+ (core::int) → core::String x5 = (core::int v) → Never {
+ self::throwing();
+ };
+ (core::int) → core::String x6 = (core::int v) → Never {
+ return self::throwing();
+ };
+ (core::int) → asy::Future<core::String> y1 = (core::int v) → asy::Future<Never> async => throw v;
+ (core::int) → asy::Future<core::String> y2 = (core::int v) → asy::Future<Never> async {
+ throw v;
+ };
+ (core::int) → asy::Future<core::String> y3 = (core::int v) → asy::Future<Never> async {
+ return throw v;
+ };
+ (core::int) → asy::Future<core::String> y4 = (core::int v) → asy::Future<Never> async => self::throwing();
+ (core::int) → asy::Future<core::String> y5 = (core::int v) → asy::Future<Never> async {
+ self::throwing();
+ };
+ (core::int) → asy::Future<core::String> y6 = (core::int v) → asy::Future<Never> async {
+ return self::throwing();
+ };
+}
+static method errors() → void async {
+ (core::int) → core::String x2 = (core::int v) → core::String {
+ try {
+ throw v;
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ return let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:39:29: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+ String Function(int) x2 = (int v) /* error */ {
+ ^" in null;
+ };
+ (core::int) → core::String x3 = (core::int v) → Never {
+ try {
+ return throw v;
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ return let final<BottomType> #t2 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:44:29: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+ String Function(int) x3 = (int v) /* error */ {
+ ^" in null;
+ };
+ (core::int) → core::String x5 = (core::int v) → core::String {
+ try {
+ self::throwing();
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ return let final<BottomType> #t3 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:49:29: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+ String Function(int) x5 = (int v) /* error */ {
+ ^" in null;
+ };
+ (core::int) → core::String x6 = (core::int v) → Never {
+ try {
+ return self::throwing();
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ return let final<BottomType> #t4 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:54:29: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+ String Function(int) x6 = (int v) /* error */ {
+ ^" in null;
+ };
+ (core::int) → asy::Future<core::String> y2 = (core::int v) → asy::Future<core::String> async {
+ try {
+ throw v;
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ return let final<BottomType> #t5 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:59:37: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+ Future<String> Function(int) y2 = (int v) async /* error */ {
+ ^" in null;
+ };
+ (core::int) → asy::Future<core::String> y3 = (core::int v) → asy::Future<Never> async {
+ try {
+ return throw v;
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ return let final<BottomType> #t6 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:64:37: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+ Future<String> Function(int) y3 = (int v) async /* error */ {
+ ^" in null;
+ };
+ (core::int) → asy::Future<core::String> y5 = (core::int v) → asy::Future<core::String> async {
+ try {
+ self::throwing();
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ return let final<BottomType> #t7 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:69:37: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+ Future<String> Function(int) y5 = (int v) async /* error */ {
+ ^" in null;
+ };
+ (core::int) → asy::Future<core::String> y6 = (core::int v) → asy::Future<Never> async {
+ try {
+ return self::throwing();
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ return let final<BottomType> #t8 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:74:37: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+ Future<String> Function(int) y6 = (int v) async /* error */ {
+ ^" in null;
+ };
+}
diff --git a/pkg/front_end/testcases/nnbd/issue41156.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/issue41156.dart.strong.transformed.expect
new file mode 100644
index 0000000..b79d082
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue41156.dart.strong.transformed.expect
@@ -0,0 +1,421 @@
+library /*isNonNullableByDefault*/;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:39:29: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+// String Function(int) x2 = (int v) /* error */ {
+// ^
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:44:29: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+// String Function(int) x3 = (int v) /* error */ {
+// ^
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:49:29: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+// String Function(int) x5 = (int v) /* error */ {
+// ^
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:54:29: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+// String Function(int) x6 = (int v) /* error */ {
+// ^
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:59:37: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+// Future<String> Function(int) y2 = (int v) async /* error */ {
+// ^
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:64:37: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+// Future<String> Function(int) y3 = (int v) async /* error */ {
+// ^
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:69:37: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+// Future<String> Function(int) y5 = (int v) async /* error */ {
+// ^
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:74:37: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+// Future<String> Function(int) y6 = (int v) async /* error */ {
+// ^
+//
+import self as self;
+import "dart:core" as core;
+import "dart:async" as asy;
+
+static method throwing() → Never
+ return throw "";
+static method main() → void {
+ (core::int) → core::String x1 = (core::int v) → Never => throw v;
+ (core::int) → core::String x2 = (core::int v) → Never {
+ throw v;
+ };
+ (core::int) → core::String x3 = (core::int v) → Never {
+ return throw v;
+ };
+ (core::int) → core::String x4 = (core::int v) → Never => self::throwing();
+ (core::int) → core::String x5 = (core::int v) → Never {
+ self::throwing();
+ };
+ (core::int) → core::String x6 = (core::int v) → Never {
+ return self::throwing();
+ };
+ (core::int) → asy::Future<core::String> y1 = (core::int v) → asy::Future<Never> /* originally async */ {
+ final asy::_AsyncAwaitCompleter<Never> :async_completer = new asy::_AsyncAwaitCompleter::•<Never>();
+ asy::FutureOr<Never>? :return_value;
+ dynamic :async_stack_trace;
+ dynamic :async_op_then;
+ dynamic :async_op_error;
+ core::int :await_jump_var = 0;
+ dynamic :await_ctx_var;
+ function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding
+ try {
+ #L1:
+ {
+ :return_value = throw v;
+ break #L1;
+ }
+ asy::_completeOnAsyncReturn(:async_completer, :return_value);
+ return;
+ }
+ on dynamic catch(dynamic :exception, dynamic :stack_trace) {
+ :async_completer.{asy::Completer::completeError}(:exception, :stack_trace);
+ }
+ :async_stack_trace = asy::_asyncStackTraceHelper(:async_op);
+ :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
+ :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
+ :async_completer.start(:async_op);
+ return :async_completer.{asy::Completer::future};
+ };
+ (core::int) → asy::Future<core::String> y2 = (core::int v) → asy::Future<Never> /* originally async */ {
+ final asy::_AsyncAwaitCompleter<Never> :async_completer = new asy::_AsyncAwaitCompleter::•<Never>();
+ asy::FutureOr<Never>? :return_value;
+ dynamic :async_stack_trace;
+ dynamic :async_op_then;
+ dynamic :async_op_error;
+ core::int :await_jump_var = 0;
+ dynamic :await_ctx_var;
+ function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding
+ try {
+ #L2:
+ {
+ throw v;
+ }
+ asy::_completeOnAsyncReturn(:async_completer, :return_value);
+ return;
+ }
+ on dynamic catch(dynamic :exception, dynamic :stack_trace) {
+ :async_completer.{asy::Completer::completeError}(:exception, :stack_trace);
+ }
+ :async_stack_trace = asy::_asyncStackTraceHelper(:async_op);
+ :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
+ :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
+ :async_completer.start(:async_op);
+ return :async_completer.{asy::Completer::future};
+ };
+ (core::int) → asy::Future<core::String> y3 = (core::int v) → asy::Future<Never> /* originally async */ {
+ final asy::_AsyncAwaitCompleter<Never> :async_completer = new asy::_AsyncAwaitCompleter::•<Never>();
+ asy::FutureOr<Never>? :return_value;
+ dynamic :async_stack_trace;
+ dynamic :async_op_then;
+ dynamic :async_op_error;
+ core::int :await_jump_var = 0;
+ dynamic :await_ctx_var;
+ function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding
+ try {
+ #L3:
+ {
+ :return_value = throw v;
+ break #L3;
+ }
+ asy::_completeOnAsyncReturn(:async_completer, :return_value);
+ return;
+ }
+ on dynamic catch(dynamic :exception, dynamic :stack_trace) {
+ :async_completer.{asy::Completer::completeError}(:exception, :stack_trace);
+ }
+ :async_stack_trace = asy::_asyncStackTraceHelper(:async_op);
+ :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
+ :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
+ :async_completer.start(:async_op);
+ return :async_completer.{asy::Completer::future};
+ };
+ (core::int) → asy::Future<core::String> y4 = (core::int v) → asy::Future<Never> /* originally async */ {
+ final asy::_AsyncAwaitCompleter<Never> :async_completer = new asy::_AsyncAwaitCompleter::•<Never>();
+ asy::FutureOr<Never>? :return_value;
+ dynamic :async_stack_trace;
+ dynamic :async_op_then;
+ dynamic :async_op_error;
+ core::int :await_jump_var = 0;
+ dynamic :await_ctx_var;
+ function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding
+ try {
+ #L4:
+ {
+ :return_value = self::throwing();
+ break #L4;
+ }
+ asy::_completeOnAsyncReturn(:async_completer, :return_value);
+ return;
+ }
+ on dynamic catch(dynamic :exception, dynamic :stack_trace) {
+ :async_completer.{asy::Completer::completeError}(:exception, :stack_trace);
+ }
+ :async_stack_trace = asy::_asyncStackTraceHelper(:async_op);
+ :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
+ :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
+ :async_completer.start(:async_op);
+ return :async_completer.{asy::Completer::future};
+ };
+ (core::int) → asy::Future<core::String> y5 = (core::int v) → asy::Future<Never> /* originally async */ {
+ final asy::_AsyncAwaitCompleter<Never> :async_completer = new asy::_AsyncAwaitCompleter::•<Never>();
+ asy::FutureOr<Never>? :return_value;
+ dynamic :async_stack_trace;
+ dynamic :async_op_then;
+ dynamic :async_op_error;
+ core::int :await_jump_var = 0;
+ dynamic :await_ctx_var;
+ function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding
+ try {
+ #L5:
+ {
+ self::throwing();
+ }
+ asy::_completeOnAsyncReturn(:async_completer, :return_value);
+ return;
+ }
+ on dynamic catch(dynamic :exception, dynamic :stack_trace) {
+ :async_completer.{asy::Completer::completeError}(:exception, :stack_trace);
+ }
+ :async_stack_trace = asy::_asyncStackTraceHelper(:async_op);
+ :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
+ :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
+ :async_completer.start(:async_op);
+ return :async_completer.{asy::Completer::future};
+ };
+ (core::int) → asy::Future<core::String> y6 = (core::int v) → asy::Future<Never> /* originally async */ {
+ final asy::_AsyncAwaitCompleter<Never> :async_completer = new asy::_AsyncAwaitCompleter::•<Never>();
+ asy::FutureOr<Never>? :return_value;
+ dynamic :async_stack_trace;
+ dynamic :async_op_then;
+ dynamic :async_op_error;
+ core::int :await_jump_var = 0;
+ dynamic :await_ctx_var;
+ function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding
+ try {
+ #L6:
+ {
+ :return_value = self::throwing();
+ break #L6;
+ }
+ asy::_completeOnAsyncReturn(:async_completer, :return_value);
+ return;
+ }
+ on dynamic catch(dynamic :exception, dynamic :stack_trace) {
+ :async_completer.{asy::Completer::completeError}(:exception, :stack_trace);
+ }
+ :async_stack_trace = asy::_asyncStackTraceHelper(:async_op);
+ :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
+ :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
+ :async_completer.start(:async_op);
+ return :async_completer.{asy::Completer::future};
+ };
+}
+static method errors() → void /* originally async */ {
+ final asy::_AsyncAwaitCompleter<dynamic> :async_completer = new asy::_AsyncAwaitCompleter::•<dynamic>();
+ asy::FutureOr<dynamic>? :return_value;
+ dynamic :async_stack_trace;
+ dynamic :async_op_then;
+ dynamic :async_op_error;
+ core::int :await_jump_var = 0;
+ dynamic :await_ctx_var;
+ function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding
+ try {
+ #L7:
+ {
+ (core::int) → core::String x2 = (core::int v) → core::String {
+ try {
+ throw v;
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ return let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:39:29: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+ String Function(int) x2 = (int v) /* error */ {
+ ^" in null;
+ };
+ (core::int) → core::String x3 = (core::int v) → Never {
+ try {
+ return throw v;
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ return let final<BottomType> #t2 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:44:29: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+ String Function(int) x3 = (int v) /* error */ {
+ ^" in null;
+ };
+ (core::int) → core::String x5 = (core::int v) → core::String {
+ try {
+ self::throwing();
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ return let final<BottomType> #t3 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:49:29: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+ String Function(int) x5 = (int v) /* error */ {
+ ^" in null;
+ };
+ (core::int) → core::String x6 = (core::int v) → Never {
+ try {
+ return self::throwing();
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ return let final<BottomType> #t4 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:54:29: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+ String Function(int) x6 = (int v) /* error */ {
+ ^" in null;
+ };
+ (core::int) → asy::Future<core::String> y2 = (core::int v) → asy::Future<core::String> /* originally async */ {
+ final asy::_AsyncAwaitCompleter<core::String> :async_completer = new asy::_AsyncAwaitCompleter::•<core::String>();
+ asy::FutureOr<core::String>? :return_value;
+ dynamic :async_stack_trace;
+ dynamic :async_op_then;
+ dynamic :async_op_error;
+ core::int :await_jump_var = 0;
+ dynamic :await_ctx_var;
+ function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding
+ try {
+ #L8:
+ {
+ try {
+ throw v;
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ :return_value = let final<BottomType> #t5 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:59:37: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+ Future<String> Function(int) y2 = (int v) async /* error */ {
+ ^" in null;
+ break #L8;
+ }
+ asy::_completeOnAsyncReturn(:async_completer, :return_value);
+ return;
+ }
+ on dynamic catch(dynamic :exception, dynamic :stack_trace) {
+ :async_completer.{asy::Completer::completeError}(:exception, :stack_trace);
+ }
+ :async_stack_trace = asy::_asyncStackTraceHelper(:async_op);
+ :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
+ :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
+ :async_completer.start(:async_op);
+ return :async_completer.{asy::Completer::future};
+ };
+ (core::int) → asy::Future<core::String> y3 = (core::int v) → asy::Future<Never> /* originally async */ {
+ final asy::_AsyncAwaitCompleter<Never> :async_completer = new asy::_AsyncAwaitCompleter::•<Never>();
+ asy::FutureOr<Never>? :return_value;
+ dynamic :async_stack_trace;
+ dynamic :async_op_then;
+ dynamic :async_op_error;
+ core::int :await_jump_var = 0;
+ dynamic :await_ctx_var;
+ function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding
+ try {
+ #L9:
+ {
+ try {
+ :return_value = throw v;
+ break #L9;
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ :return_value = let final<BottomType> #t6 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:64:37: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+ Future<String> Function(int) y3 = (int v) async /* error */ {
+ ^" in null;
+ break #L9;
+ }
+ asy::_completeOnAsyncReturn(:async_completer, :return_value);
+ return;
+ }
+ on dynamic catch(dynamic :exception, dynamic :stack_trace) {
+ :async_completer.{asy::Completer::completeError}(:exception, :stack_trace);
+ }
+ :async_stack_trace = asy::_asyncStackTraceHelper(:async_op);
+ :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
+ :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
+ :async_completer.start(:async_op);
+ return :async_completer.{asy::Completer::future};
+ };
+ (core::int) → asy::Future<core::String> y5 = (core::int v) → asy::Future<core::String> /* originally async */ {
+ final asy::_AsyncAwaitCompleter<core::String> :async_completer = new asy::_AsyncAwaitCompleter::•<core::String>();
+ asy::FutureOr<core::String>? :return_value;
+ dynamic :async_stack_trace;
+ dynamic :async_op_then;
+ dynamic :async_op_error;
+ core::int :await_jump_var = 0;
+ dynamic :await_ctx_var;
+ function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding
+ try {
+ #L10:
+ {
+ try {
+ self::throwing();
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ :return_value = let final<BottomType> #t7 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:69:37: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+ Future<String> Function(int) y5 = (int v) async /* error */ {
+ ^" in null;
+ break #L10;
+ }
+ asy::_completeOnAsyncReturn(:async_completer, :return_value);
+ return;
+ }
+ on dynamic catch(dynamic :exception, dynamic :stack_trace) {
+ :async_completer.{asy::Completer::completeError}(:exception, :stack_trace);
+ }
+ :async_stack_trace = asy::_asyncStackTraceHelper(:async_op);
+ :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
+ :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
+ :async_completer.start(:async_op);
+ return :async_completer.{asy::Completer::future};
+ };
+ (core::int) → asy::Future<core::String> y6 = (core::int v) → asy::Future<Never> /* originally async */ {
+ final asy::_AsyncAwaitCompleter<Never> :async_completer = new asy::_AsyncAwaitCompleter::•<Never>();
+ asy::FutureOr<Never>? :return_value;
+ dynamic :async_stack_trace;
+ dynamic :async_op_then;
+ dynamic :async_op_error;
+ core::int :await_jump_var = 0;
+ dynamic :await_ctx_var;
+ function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding
+ try {
+ #L11:
+ {
+ try {
+ :return_value = self::throwing();
+ break #L11;
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ :return_value = let final<BottomType> #t8 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:74:37: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+ Future<String> Function(int) y6 = (int v) async /* error */ {
+ ^" in null;
+ break #L11;
+ }
+ asy::_completeOnAsyncReturn(:async_completer, :return_value);
+ return;
+ }
+ on dynamic catch(dynamic :exception, dynamic :stack_trace) {
+ :async_completer.{asy::Completer::completeError}(:exception, :stack_trace);
+ }
+ :async_stack_trace = asy::_asyncStackTraceHelper(:async_op);
+ :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
+ :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
+ :async_completer.start(:async_op);
+ return :async_completer.{asy::Completer::future};
+ };
+ }
+ asy::_completeOnAsyncReturn(:async_completer, :return_value);
+ return;
+ }
+ on dynamic catch(dynamic :exception, dynamic :stack_trace) {
+ :async_completer.{asy::Completer::completeError}(:exception, :stack_trace);
+ }
+ :async_stack_trace = asy::_asyncStackTraceHelper(:async_op);
+ :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
+ :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
+ :async_completer.start(:async_op);
+ return :async_completer.{asy::Completer::future};
+}
diff --git a/pkg/front_end/testcases/nnbd/issue41156.dart.weak.expect b/pkg/front_end/testcases/nnbd/issue41156.dart.weak.expect
new file mode 100644
index 0000000..d977afe
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue41156.dart.weak.expect
@@ -0,0 +1,154 @@
+library /*isNonNullableByDefault*/;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:39:29: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+// String Function(int) x2 = (int v) /* error */ {
+// ^
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:44:29: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+// String Function(int) x3 = (int v) /* error */ {
+// ^
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:49:29: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+// String Function(int) x5 = (int v) /* error */ {
+// ^
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:54:29: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+// String Function(int) x6 = (int v) /* error */ {
+// ^
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:59:37: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+// Future<String> Function(int) y2 = (int v) async /* error */ {
+// ^
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:64:37: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+// Future<String> Function(int) y3 = (int v) async /* error */ {
+// ^
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:69:37: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+// Future<String> Function(int) y5 = (int v) async /* error */ {
+// ^
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:74:37: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+// Future<String> Function(int) y6 = (int v) async /* error */ {
+// ^
+//
+import self as self;
+import "dart:core" as core;
+import "dart:async" as asy;
+
+static method throwing() → Never
+ return throw "";
+static method main() → void {
+ (core::int) → core::String x1 = (core::int v) → Never => throw v;
+ (core::int) → core::String x2 = (core::int v) → Never {
+ throw v;
+ };
+ (core::int) → core::String x3 = (core::int v) → Never {
+ return throw v;
+ };
+ (core::int) → core::String x4 = (core::int v) → Never => self::throwing();
+ (core::int) → core::String x5 = (core::int v) → Never {
+ self::throwing();
+ };
+ (core::int) → core::String x6 = (core::int v) → Never {
+ return self::throwing();
+ };
+ (core::int) → asy::Future<core::String> y1 = (core::int v) → asy::Future<Never> async => throw v;
+ (core::int) → asy::Future<core::String> y2 = (core::int v) → asy::Future<Never> async {
+ throw v;
+ };
+ (core::int) → asy::Future<core::String> y3 = (core::int v) → asy::Future<Never> async {
+ return throw v;
+ };
+ (core::int) → asy::Future<core::String> y4 = (core::int v) → asy::Future<Never> async => self::throwing();
+ (core::int) → asy::Future<core::String> y5 = (core::int v) → asy::Future<Never> async {
+ self::throwing();
+ };
+ (core::int) → asy::Future<core::String> y6 = (core::int v) → asy::Future<Never> async {
+ return self::throwing();
+ };
+}
+static method errors() → void async {
+ (core::int) → core::String x2 = (core::int v) → core::String {
+ try {
+ throw v;
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ return let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:39:29: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+ String Function(int) x2 = (int v) /* error */ {
+ ^" in null;
+ };
+ (core::int) → core::String x3 = (core::int v) → Never {
+ try {
+ return throw v;
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ return let final<BottomType> #t2 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:44:29: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+ String Function(int) x3 = (int v) /* error */ {
+ ^" in null;
+ };
+ (core::int) → core::String x5 = (core::int v) → core::String {
+ try {
+ self::throwing();
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ return let final<BottomType> #t3 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:49:29: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+ String Function(int) x5 = (int v) /* error */ {
+ ^" in null;
+ };
+ (core::int) → core::String x6 = (core::int v) → Never {
+ try {
+ return self::throwing();
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ return let final<BottomType> #t4 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:54:29: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+ String Function(int) x6 = (int v) /* error */ {
+ ^" in null;
+ };
+ (core::int) → asy::Future<core::String> y2 = (core::int v) → asy::Future<core::String> async {
+ try {
+ throw v;
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ return let final<BottomType> #t5 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:59:37: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+ Future<String> Function(int) y2 = (int v) async /* error */ {
+ ^" in null;
+ };
+ (core::int) → asy::Future<core::String> y3 = (core::int v) → asy::Future<Never> async {
+ try {
+ return throw v;
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ return let final<BottomType> #t6 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:64:37: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+ Future<String> Function(int) y3 = (int v) async /* error */ {
+ ^" in null;
+ };
+ (core::int) → asy::Future<core::String> y5 = (core::int v) → asy::Future<core::String> async {
+ try {
+ self::throwing();
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ return let final<BottomType> #t7 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:69:37: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+ Future<String> Function(int) y5 = (int v) async /* error */ {
+ ^" in null;
+ };
+ (core::int) → asy::Future<core::String> y6 = (core::int v) → asy::Future<Never> async {
+ try {
+ return self::throwing();
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ return let final<BottomType> #t8 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:74:37: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+ Future<String> Function(int) y6 = (int v) async /* error */ {
+ ^" in null;
+ };
+}
diff --git a/pkg/front_end/testcases/nnbd/issue41156.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/issue41156.dart.weak.transformed.expect
new file mode 100644
index 0000000..b79d082
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue41156.dart.weak.transformed.expect
@@ -0,0 +1,421 @@
+library /*isNonNullableByDefault*/;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:39:29: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+// String Function(int) x2 = (int v) /* error */ {
+// ^
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:44:29: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+// String Function(int) x3 = (int v) /* error */ {
+// ^
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:49:29: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+// String Function(int) x5 = (int v) /* error */ {
+// ^
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:54:29: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+// String Function(int) x6 = (int v) /* error */ {
+// ^
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:59:37: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+// Future<String> Function(int) y2 = (int v) async /* error */ {
+// ^
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:64:37: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+// Future<String> Function(int) y3 = (int v) async /* error */ {
+// ^
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:69:37: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+// Future<String> Function(int) y5 = (int v) async /* error */ {
+// ^
+//
+// pkg/front_end/testcases/nnbd/issue41156.dart:74:37: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+// Future<String> Function(int) y6 = (int v) async /* error */ {
+// ^
+//
+import self as self;
+import "dart:core" as core;
+import "dart:async" as asy;
+
+static method throwing() → Never
+ return throw "";
+static method main() → void {
+ (core::int) → core::String x1 = (core::int v) → Never => throw v;
+ (core::int) → core::String x2 = (core::int v) → Never {
+ throw v;
+ };
+ (core::int) → core::String x3 = (core::int v) → Never {
+ return throw v;
+ };
+ (core::int) → core::String x4 = (core::int v) → Never => self::throwing();
+ (core::int) → core::String x5 = (core::int v) → Never {
+ self::throwing();
+ };
+ (core::int) → core::String x6 = (core::int v) → Never {
+ return self::throwing();
+ };
+ (core::int) → asy::Future<core::String> y1 = (core::int v) → asy::Future<Never> /* originally async */ {
+ final asy::_AsyncAwaitCompleter<Never> :async_completer = new asy::_AsyncAwaitCompleter::•<Never>();
+ asy::FutureOr<Never>? :return_value;
+ dynamic :async_stack_trace;
+ dynamic :async_op_then;
+ dynamic :async_op_error;
+ core::int :await_jump_var = 0;
+ dynamic :await_ctx_var;
+ function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding
+ try {
+ #L1:
+ {
+ :return_value = throw v;
+ break #L1;
+ }
+ asy::_completeOnAsyncReturn(:async_completer, :return_value);
+ return;
+ }
+ on dynamic catch(dynamic :exception, dynamic :stack_trace) {
+ :async_completer.{asy::Completer::completeError}(:exception, :stack_trace);
+ }
+ :async_stack_trace = asy::_asyncStackTraceHelper(:async_op);
+ :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
+ :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
+ :async_completer.start(:async_op);
+ return :async_completer.{asy::Completer::future};
+ };
+ (core::int) → asy::Future<core::String> y2 = (core::int v) → asy::Future<Never> /* originally async */ {
+ final asy::_AsyncAwaitCompleter<Never> :async_completer = new asy::_AsyncAwaitCompleter::•<Never>();
+ asy::FutureOr<Never>? :return_value;
+ dynamic :async_stack_trace;
+ dynamic :async_op_then;
+ dynamic :async_op_error;
+ core::int :await_jump_var = 0;
+ dynamic :await_ctx_var;
+ function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding
+ try {
+ #L2:
+ {
+ throw v;
+ }
+ asy::_completeOnAsyncReturn(:async_completer, :return_value);
+ return;
+ }
+ on dynamic catch(dynamic :exception, dynamic :stack_trace) {
+ :async_completer.{asy::Completer::completeError}(:exception, :stack_trace);
+ }
+ :async_stack_trace = asy::_asyncStackTraceHelper(:async_op);
+ :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
+ :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
+ :async_completer.start(:async_op);
+ return :async_completer.{asy::Completer::future};
+ };
+ (core::int) → asy::Future<core::String> y3 = (core::int v) → asy::Future<Never> /* originally async */ {
+ final asy::_AsyncAwaitCompleter<Never> :async_completer = new asy::_AsyncAwaitCompleter::•<Never>();
+ asy::FutureOr<Never>? :return_value;
+ dynamic :async_stack_trace;
+ dynamic :async_op_then;
+ dynamic :async_op_error;
+ core::int :await_jump_var = 0;
+ dynamic :await_ctx_var;
+ function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding
+ try {
+ #L3:
+ {
+ :return_value = throw v;
+ break #L3;
+ }
+ asy::_completeOnAsyncReturn(:async_completer, :return_value);
+ return;
+ }
+ on dynamic catch(dynamic :exception, dynamic :stack_trace) {
+ :async_completer.{asy::Completer::completeError}(:exception, :stack_trace);
+ }
+ :async_stack_trace = asy::_asyncStackTraceHelper(:async_op);
+ :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
+ :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
+ :async_completer.start(:async_op);
+ return :async_completer.{asy::Completer::future};
+ };
+ (core::int) → asy::Future<core::String> y4 = (core::int v) → asy::Future<Never> /* originally async */ {
+ final asy::_AsyncAwaitCompleter<Never> :async_completer = new asy::_AsyncAwaitCompleter::•<Never>();
+ asy::FutureOr<Never>? :return_value;
+ dynamic :async_stack_trace;
+ dynamic :async_op_then;
+ dynamic :async_op_error;
+ core::int :await_jump_var = 0;
+ dynamic :await_ctx_var;
+ function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding
+ try {
+ #L4:
+ {
+ :return_value = self::throwing();
+ break #L4;
+ }
+ asy::_completeOnAsyncReturn(:async_completer, :return_value);
+ return;
+ }
+ on dynamic catch(dynamic :exception, dynamic :stack_trace) {
+ :async_completer.{asy::Completer::completeError}(:exception, :stack_trace);
+ }
+ :async_stack_trace = asy::_asyncStackTraceHelper(:async_op);
+ :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
+ :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
+ :async_completer.start(:async_op);
+ return :async_completer.{asy::Completer::future};
+ };
+ (core::int) → asy::Future<core::String> y5 = (core::int v) → asy::Future<Never> /* originally async */ {
+ final asy::_AsyncAwaitCompleter<Never> :async_completer = new asy::_AsyncAwaitCompleter::•<Never>();
+ asy::FutureOr<Never>? :return_value;
+ dynamic :async_stack_trace;
+ dynamic :async_op_then;
+ dynamic :async_op_error;
+ core::int :await_jump_var = 0;
+ dynamic :await_ctx_var;
+ function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding
+ try {
+ #L5:
+ {
+ self::throwing();
+ }
+ asy::_completeOnAsyncReturn(:async_completer, :return_value);
+ return;
+ }
+ on dynamic catch(dynamic :exception, dynamic :stack_trace) {
+ :async_completer.{asy::Completer::completeError}(:exception, :stack_trace);
+ }
+ :async_stack_trace = asy::_asyncStackTraceHelper(:async_op);
+ :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
+ :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
+ :async_completer.start(:async_op);
+ return :async_completer.{asy::Completer::future};
+ };
+ (core::int) → asy::Future<core::String> y6 = (core::int v) → asy::Future<Never> /* originally async */ {
+ final asy::_AsyncAwaitCompleter<Never> :async_completer = new asy::_AsyncAwaitCompleter::•<Never>();
+ asy::FutureOr<Never>? :return_value;
+ dynamic :async_stack_trace;
+ dynamic :async_op_then;
+ dynamic :async_op_error;
+ core::int :await_jump_var = 0;
+ dynamic :await_ctx_var;
+ function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding
+ try {
+ #L6:
+ {
+ :return_value = self::throwing();
+ break #L6;
+ }
+ asy::_completeOnAsyncReturn(:async_completer, :return_value);
+ return;
+ }
+ on dynamic catch(dynamic :exception, dynamic :stack_trace) {
+ :async_completer.{asy::Completer::completeError}(:exception, :stack_trace);
+ }
+ :async_stack_trace = asy::_asyncStackTraceHelper(:async_op);
+ :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
+ :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
+ :async_completer.start(:async_op);
+ return :async_completer.{asy::Completer::future};
+ };
+}
+static method errors() → void /* originally async */ {
+ final asy::_AsyncAwaitCompleter<dynamic> :async_completer = new asy::_AsyncAwaitCompleter::•<dynamic>();
+ asy::FutureOr<dynamic>? :return_value;
+ dynamic :async_stack_trace;
+ dynamic :async_op_then;
+ dynamic :async_op_error;
+ core::int :await_jump_var = 0;
+ dynamic :await_ctx_var;
+ function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding
+ try {
+ #L7:
+ {
+ (core::int) → core::String x2 = (core::int v) → core::String {
+ try {
+ throw v;
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ return let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:39:29: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+ String Function(int) x2 = (int v) /* error */ {
+ ^" in null;
+ };
+ (core::int) → core::String x3 = (core::int v) → Never {
+ try {
+ return throw v;
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ return let final<BottomType> #t2 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:44:29: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+ String Function(int) x3 = (int v) /* error */ {
+ ^" in null;
+ };
+ (core::int) → core::String x5 = (core::int v) → core::String {
+ try {
+ self::throwing();
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ return let final<BottomType> #t3 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:49:29: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+ String Function(int) x5 = (int v) /* error */ {
+ ^" in null;
+ };
+ (core::int) → core::String x6 = (core::int v) → Never {
+ try {
+ return self::throwing();
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ return let final<BottomType> #t4 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:54:29: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+ String Function(int) x6 = (int v) /* error */ {
+ ^" in null;
+ };
+ (core::int) → asy::Future<core::String> y2 = (core::int v) → asy::Future<core::String> /* originally async */ {
+ final asy::_AsyncAwaitCompleter<core::String> :async_completer = new asy::_AsyncAwaitCompleter::•<core::String>();
+ asy::FutureOr<core::String>? :return_value;
+ dynamic :async_stack_trace;
+ dynamic :async_op_then;
+ dynamic :async_op_error;
+ core::int :await_jump_var = 0;
+ dynamic :await_ctx_var;
+ function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding
+ try {
+ #L8:
+ {
+ try {
+ throw v;
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ :return_value = let final<BottomType> #t5 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:59:37: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+ Future<String> Function(int) y2 = (int v) async /* error */ {
+ ^" in null;
+ break #L8;
+ }
+ asy::_completeOnAsyncReturn(:async_completer, :return_value);
+ return;
+ }
+ on dynamic catch(dynamic :exception, dynamic :stack_trace) {
+ :async_completer.{asy::Completer::completeError}(:exception, :stack_trace);
+ }
+ :async_stack_trace = asy::_asyncStackTraceHelper(:async_op);
+ :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
+ :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
+ :async_completer.start(:async_op);
+ return :async_completer.{asy::Completer::future};
+ };
+ (core::int) → asy::Future<core::String> y3 = (core::int v) → asy::Future<Never> /* originally async */ {
+ final asy::_AsyncAwaitCompleter<Never> :async_completer = new asy::_AsyncAwaitCompleter::•<Never>();
+ asy::FutureOr<Never>? :return_value;
+ dynamic :async_stack_trace;
+ dynamic :async_op_then;
+ dynamic :async_op_error;
+ core::int :await_jump_var = 0;
+ dynamic :await_ctx_var;
+ function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding
+ try {
+ #L9:
+ {
+ try {
+ :return_value = throw v;
+ break #L9;
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ :return_value = let final<BottomType> #t6 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:64:37: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+ Future<String> Function(int) y3 = (int v) async /* error */ {
+ ^" in null;
+ break #L9;
+ }
+ asy::_completeOnAsyncReturn(:async_completer, :return_value);
+ return;
+ }
+ on dynamic catch(dynamic :exception, dynamic :stack_trace) {
+ :async_completer.{asy::Completer::completeError}(:exception, :stack_trace);
+ }
+ :async_stack_trace = asy::_asyncStackTraceHelper(:async_op);
+ :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
+ :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
+ :async_completer.start(:async_op);
+ return :async_completer.{asy::Completer::future};
+ };
+ (core::int) → asy::Future<core::String> y5 = (core::int v) → asy::Future<core::String> /* originally async */ {
+ final asy::_AsyncAwaitCompleter<core::String> :async_completer = new asy::_AsyncAwaitCompleter::•<core::String>();
+ asy::FutureOr<core::String>? :return_value;
+ dynamic :async_stack_trace;
+ dynamic :async_op_then;
+ dynamic :async_op_error;
+ core::int :await_jump_var = 0;
+ dynamic :await_ctx_var;
+ function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding
+ try {
+ #L10:
+ {
+ try {
+ self::throwing();
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ :return_value = let final<BottomType> #t7 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:69:37: Error: A non-null value must be returned since the return type 'String' doesn't allow null.
+ Future<String> Function(int) y5 = (int v) async /* error */ {
+ ^" in null;
+ break #L10;
+ }
+ asy::_completeOnAsyncReturn(:async_completer, :return_value);
+ return;
+ }
+ on dynamic catch(dynamic :exception, dynamic :stack_trace) {
+ :async_completer.{asy::Completer::completeError}(:exception, :stack_trace);
+ }
+ :async_stack_trace = asy::_asyncStackTraceHelper(:async_op);
+ :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
+ :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
+ :async_completer.start(:async_op);
+ return :async_completer.{asy::Completer::future};
+ };
+ (core::int) → asy::Future<core::String> y6 = (core::int v) → asy::Future<Never> /* originally async */ {
+ final asy::_AsyncAwaitCompleter<Never> :async_completer = new asy::_AsyncAwaitCompleter::•<Never>();
+ asy::FutureOr<Never>? :return_value;
+ dynamic :async_stack_trace;
+ dynamic :async_op_then;
+ dynamic :async_op_error;
+ core::int :await_jump_var = 0;
+ dynamic :await_ctx_var;
+ function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding
+ try {
+ #L11:
+ {
+ try {
+ :return_value = self::throwing();
+ break #L11;
+ }
+ on dynamic catch(final dynamic _) {
+ }
+ :return_value = let final<BottomType> #t8 = invalid-expression "pkg/front_end/testcases/nnbd/issue41156.dart:74:37: Error: A non-null value must be returned since the return type 'Never' doesn't allow null.
+ Future<String> Function(int) y6 = (int v) async /* error */ {
+ ^" in null;
+ break #L11;
+ }
+ asy::_completeOnAsyncReturn(:async_completer, :return_value);
+ return;
+ }
+ on dynamic catch(dynamic :exception, dynamic :stack_trace) {
+ :async_completer.{asy::Completer::completeError}(:exception, :stack_trace);
+ }
+ :async_stack_trace = asy::_asyncStackTraceHelper(:async_op);
+ :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
+ :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
+ :async_completer.start(:async_op);
+ return :async_completer.{asy::Completer::future};
+ };
+ }
+ asy::_completeOnAsyncReturn(:async_completer, :return_value);
+ return;
+ }
+ on dynamic catch(dynamic :exception, dynamic :stack_trace) {
+ :async_completer.{asy::Completer::completeError}(:exception, :stack_trace);
+ }
+ :async_stack_trace = asy::_asyncStackTraceHelper(:async_op);
+ :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
+ :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
+ :async_completer.start(:async_op);
+ return :async_completer.{asy::Completer::future};
+}
diff --git a/pkg/front_end/testcases/nnbd/issue41180.dart b/pkg/front_end/testcases/nnbd/issue41180.dart
new file mode 100644
index 0000000..d1df0bf
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue41180.dart
@@ -0,0 +1,24 @@
+// Copyright (c) 2020, 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.
+
+// @dart = 2.5
+
+import 'issue41180_lib.dart';
+
+class D<Y> {
+ C<Y> method() => new C<Y>(() => null);
+}
+
+void main() {
+ foo(() => null);
+ bar = () => null;
+ new D<int>().method();
+ findKey(new Map<String, String>('foo', 'bar'), 'bar');
+}
+
+void findKey(Map<String, dynamic> m, dynamic search) {
+ print(m.entries
+ .singleWhere((entry) => entry.value == search, orElse: () => null)
+ ?.key);
+}
diff --git a/pkg/front_end/testcases/nnbd/issue41180.dart.outline.expect b/pkg/front_end/testcases/nnbd/issue41180.dart.outline.expect
new file mode 100644
index 0000000..0c6b290
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue41180.dart.outline.expect
@@ -0,0 +1,45 @@
+library;
+import self as self;
+import "dart:core" as core;
+import "issue41180_lib.dart" as iss;
+
+import "org-dartlang-testcase:///issue41180_lib.dart";
+
+class D<Y extends core::Object* = dynamic> extends core::Object {
+ synthetic constructor •() → self::D<self::D::Y*>*
+ ;
+ method method() → iss::C<self::D::Y*>*
+ ;
+}
+static method main() → void
+ ;
+static method findKey(iss::Map<core::String*, dynamic>* m, dynamic search) → void
+ ;
+
+library /*isNonNullableByDefault*/;
+import self as iss;
+import "dart:core" as core;
+
+class C<X extends core::Object? = dynamic> extends core::Object {
+ constructor •(() → iss::Map<core::String, core::String> f) → iss::C<iss::C::X%>
+ ;
+}
+class Map<K extends core::Object? = dynamic, V extends core::Object? = dynamic> extends core::Object {
+ final field iss::Map::K% key;
+ final field iss::Map::V% value;
+ constructor •(iss::Map::K% key, iss::Map::V% value) → iss::Map<iss::Map::K%, iss::Map::V%>
+ ;
+ get entries() → iss::Iterable<core::MapEntry<iss::Map::K%, iss::Map::V%>>
+ ;
+}
+class Iterable<E extends core::Object? = dynamic> extends core::Object {
+ final field iss::Iterable::E% element;
+ constructor •(iss::Iterable::E% element) → iss::Iterable<iss::Iterable::E%>
+ ;
+ method singleWhere((iss::Iterable::E%) → core::bool test, {generic-covariant-impl () →? iss::Iterable::E% orElse}) → iss::Iterable::E%
+ ;
+}
+static method foo(() → iss::Map<core::String, core::String> f) → void
+ ;
+static set bar(() → iss::Map<core::String, core::String> f) → void
+ ;
diff --git a/pkg/front_end/testcases/nnbd/issue41180.dart.strong.expect b/pkg/front_end/testcases/nnbd/issue41180.dart.strong.expect
new file mode 100644
index 0000000..00276526
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue41180.dart.strong.expect
@@ -0,0 +1,67 @@
+library;
+import self as self;
+import "dart:core" as core;
+import "issue41180_lib.dart" as iss;
+
+import "org-dartlang-testcase:///issue41180_lib.dart";
+
+class D<Y extends core::Object* = dynamic> extends core::Object {
+ synthetic constructor •() → self::D<self::D::Y*>*
+ : super core::Object::•()
+ ;
+ method method() → iss::C<self::D::Y*>*
+ return new iss::C::•<self::D::Y*>(() → core::Null? => null);
+}
+static method main() → void {
+ iss::foo(() → core::Null? => null);
+ iss::bar = () → iss::Map<core::String*, core::String*>* => null;
+ new self::D::•<core::int*>().{self::D::method}();
+ self::findKey(new iss::Map::•<core::String*, core::String*>("foo", "bar"), "bar");
+}
+static method findKey(iss::Map<core::String*, dynamic>* m, dynamic search) → void {
+ core::print(let final core::MapEntry<core::String*, dynamic>* #t1 = m.{iss::Map::entries}.{iss::Iterable::singleWhere}((core::MapEntry<core::String*, dynamic>* entry) → core::bool* => entry.{core::MapEntry::value}.{core::Object::==}(search), orElse: () → core::Null? => null) in #t1.{core::Object::==}(null) ?{core::String*} null : #t1.{core::MapEntry::key});
+}
+
+library /*isNonNullableByDefault*/;
+import self as iss;
+import "dart:core" as core;
+
+class C<X extends core::Object? = dynamic> extends core::Object {
+ constructor •(() → iss::Map<core::String, core::String> f) → iss::C<iss::C::X%>
+ : super core::Object::•() {
+ core::print(f.{core::Object::runtimeType});
+ }
+}
+class Map<K extends core::Object? = dynamic, V extends core::Object? = dynamic> extends core::Object {
+ final field iss::Map::K% key;
+ final field iss::Map::V% value;
+ constructor •(iss::Map::K% key, iss::Map::V% value) → iss::Map<iss::Map::K%, iss::Map::V%>
+ : iss::Map::key = key, iss::Map::value = value, super core::Object::•()
+ ;
+ get entries() → iss::Iterable<core::MapEntry<iss::Map::K%, iss::Map::V%>>
+ return new iss::Iterable::•<core::MapEntry<iss::Map::K%, iss::Map::V%>>(new core::MapEntry::_<iss::Map::K*, iss::Map::V*>(this.{iss::Map::key}, this.{iss::Map::value}));
+}
+class Iterable<E extends core::Object? = dynamic> extends core::Object {
+ final field iss::Iterable::E% element;
+ constructor •(iss::Iterable::E% element) → iss::Iterable<iss::Iterable::E%>
+ : iss::Iterable::element = element, super core::Object::•()
+ ;
+ method singleWhere((iss::Iterable::E%) → core::bool test, {generic-covariant-impl () →? iss::Iterable::E% orElse = #C1}) → iss::Iterable::E% {
+ if(test.call(this.{iss::Iterable::element})) {
+ return this.{iss::Iterable::element};
+ }
+ if(!orElse.{core::Object::==}(null))
+ return orElse{() → iss::Iterable::E%}.call();
+ throw "error";
+ }
+}
+static method foo(() → iss::Map<core::String, core::String> f) → void {
+ core::print(f.{core::Object::runtimeType});
+}
+static set bar(() → iss::Map<core::String, core::String> f) → void {
+ core::print(f.{core::Object::runtimeType});
+}
+
+constants {
+ #C1 = null
+}
diff --git a/pkg/front_end/testcases/nnbd/issue41180.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/issue41180.dart.strong.transformed.expect
new file mode 100644
index 0000000..00276526
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue41180.dart.strong.transformed.expect
@@ -0,0 +1,67 @@
+library;
+import self as self;
+import "dart:core" as core;
+import "issue41180_lib.dart" as iss;
+
+import "org-dartlang-testcase:///issue41180_lib.dart";
+
+class D<Y extends core::Object* = dynamic> extends core::Object {
+ synthetic constructor •() → self::D<self::D::Y*>*
+ : super core::Object::•()
+ ;
+ method method() → iss::C<self::D::Y*>*
+ return new iss::C::•<self::D::Y*>(() → core::Null? => null);
+}
+static method main() → void {
+ iss::foo(() → core::Null? => null);
+ iss::bar = () → iss::Map<core::String*, core::String*>* => null;
+ new self::D::•<core::int*>().{self::D::method}();
+ self::findKey(new iss::Map::•<core::String*, core::String*>("foo", "bar"), "bar");
+}
+static method findKey(iss::Map<core::String*, dynamic>* m, dynamic search) → void {
+ core::print(let final core::MapEntry<core::String*, dynamic>* #t1 = m.{iss::Map::entries}.{iss::Iterable::singleWhere}((core::MapEntry<core::String*, dynamic>* entry) → core::bool* => entry.{core::MapEntry::value}.{core::Object::==}(search), orElse: () → core::Null? => null) in #t1.{core::Object::==}(null) ?{core::String*} null : #t1.{core::MapEntry::key});
+}
+
+library /*isNonNullableByDefault*/;
+import self as iss;
+import "dart:core" as core;
+
+class C<X extends core::Object? = dynamic> extends core::Object {
+ constructor •(() → iss::Map<core::String, core::String> f) → iss::C<iss::C::X%>
+ : super core::Object::•() {
+ core::print(f.{core::Object::runtimeType});
+ }
+}
+class Map<K extends core::Object? = dynamic, V extends core::Object? = dynamic> extends core::Object {
+ final field iss::Map::K% key;
+ final field iss::Map::V% value;
+ constructor •(iss::Map::K% key, iss::Map::V% value) → iss::Map<iss::Map::K%, iss::Map::V%>
+ : iss::Map::key = key, iss::Map::value = value, super core::Object::•()
+ ;
+ get entries() → iss::Iterable<core::MapEntry<iss::Map::K%, iss::Map::V%>>
+ return new iss::Iterable::•<core::MapEntry<iss::Map::K%, iss::Map::V%>>(new core::MapEntry::_<iss::Map::K*, iss::Map::V*>(this.{iss::Map::key}, this.{iss::Map::value}));
+}
+class Iterable<E extends core::Object? = dynamic> extends core::Object {
+ final field iss::Iterable::E% element;
+ constructor •(iss::Iterable::E% element) → iss::Iterable<iss::Iterable::E%>
+ : iss::Iterable::element = element, super core::Object::•()
+ ;
+ method singleWhere((iss::Iterable::E%) → core::bool test, {generic-covariant-impl () →? iss::Iterable::E% orElse = #C1}) → iss::Iterable::E% {
+ if(test.call(this.{iss::Iterable::element})) {
+ return this.{iss::Iterable::element};
+ }
+ if(!orElse.{core::Object::==}(null))
+ return orElse{() → iss::Iterable::E%}.call();
+ throw "error";
+ }
+}
+static method foo(() → iss::Map<core::String, core::String> f) → void {
+ core::print(f.{core::Object::runtimeType});
+}
+static set bar(() → iss::Map<core::String, core::String> f) → void {
+ core::print(f.{core::Object::runtimeType});
+}
+
+constants {
+ #C1 = null
+}
diff --git a/pkg/front_end/testcases/nnbd/issue41180.dart.weak.expect b/pkg/front_end/testcases/nnbd/issue41180.dart.weak.expect
new file mode 100644
index 0000000..00276526
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue41180.dart.weak.expect
@@ -0,0 +1,67 @@
+library;
+import self as self;
+import "dart:core" as core;
+import "issue41180_lib.dart" as iss;
+
+import "org-dartlang-testcase:///issue41180_lib.dart";
+
+class D<Y extends core::Object* = dynamic> extends core::Object {
+ synthetic constructor •() → self::D<self::D::Y*>*
+ : super core::Object::•()
+ ;
+ method method() → iss::C<self::D::Y*>*
+ return new iss::C::•<self::D::Y*>(() → core::Null? => null);
+}
+static method main() → void {
+ iss::foo(() → core::Null? => null);
+ iss::bar = () → iss::Map<core::String*, core::String*>* => null;
+ new self::D::•<core::int*>().{self::D::method}();
+ self::findKey(new iss::Map::•<core::String*, core::String*>("foo", "bar"), "bar");
+}
+static method findKey(iss::Map<core::String*, dynamic>* m, dynamic search) → void {
+ core::print(let final core::MapEntry<core::String*, dynamic>* #t1 = m.{iss::Map::entries}.{iss::Iterable::singleWhere}((core::MapEntry<core::String*, dynamic>* entry) → core::bool* => entry.{core::MapEntry::value}.{core::Object::==}(search), orElse: () → core::Null? => null) in #t1.{core::Object::==}(null) ?{core::String*} null : #t1.{core::MapEntry::key});
+}
+
+library /*isNonNullableByDefault*/;
+import self as iss;
+import "dart:core" as core;
+
+class C<X extends core::Object? = dynamic> extends core::Object {
+ constructor •(() → iss::Map<core::String, core::String> f) → iss::C<iss::C::X%>
+ : super core::Object::•() {
+ core::print(f.{core::Object::runtimeType});
+ }
+}
+class Map<K extends core::Object? = dynamic, V extends core::Object? = dynamic> extends core::Object {
+ final field iss::Map::K% key;
+ final field iss::Map::V% value;
+ constructor •(iss::Map::K% key, iss::Map::V% value) → iss::Map<iss::Map::K%, iss::Map::V%>
+ : iss::Map::key = key, iss::Map::value = value, super core::Object::•()
+ ;
+ get entries() → iss::Iterable<core::MapEntry<iss::Map::K%, iss::Map::V%>>
+ return new iss::Iterable::•<core::MapEntry<iss::Map::K%, iss::Map::V%>>(new core::MapEntry::_<iss::Map::K*, iss::Map::V*>(this.{iss::Map::key}, this.{iss::Map::value}));
+}
+class Iterable<E extends core::Object? = dynamic> extends core::Object {
+ final field iss::Iterable::E% element;
+ constructor •(iss::Iterable::E% element) → iss::Iterable<iss::Iterable::E%>
+ : iss::Iterable::element = element, super core::Object::•()
+ ;
+ method singleWhere((iss::Iterable::E%) → core::bool test, {generic-covariant-impl () →? iss::Iterable::E% orElse = #C1}) → iss::Iterable::E% {
+ if(test.call(this.{iss::Iterable::element})) {
+ return this.{iss::Iterable::element};
+ }
+ if(!orElse.{core::Object::==}(null))
+ return orElse{() → iss::Iterable::E%}.call();
+ throw "error";
+ }
+}
+static method foo(() → iss::Map<core::String, core::String> f) → void {
+ core::print(f.{core::Object::runtimeType});
+}
+static set bar(() → iss::Map<core::String, core::String> f) → void {
+ core::print(f.{core::Object::runtimeType});
+}
+
+constants {
+ #C1 = null
+}
diff --git a/pkg/front_end/testcases/nnbd/issue41180.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/issue41180.dart.weak.transformed.expect
new file mode 100644
index 0000000..00276526
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue41180.dart.weak.transformed.expect
@@ -0,0 +1,67 @@
+library;
+import self as self;
+import "dart:core" as core;
+import "issue41180_lib.dart" as iss;
+
+import "org-dartlang-testcase:///issue41180_lib.dart";
+
+class D<Y extends core::Object* = dynamic> extends core::Object {
+ synthetic constructor •() → self::D<self::D::Y*>*
+ : super core::Object::•()
+ ;
+ method method() → iss::C<self::D::Y*>*
+ return new iss::C::•<self::D::Y*>(() → core::Null? => null);
+}
+static method main() → void {
+ iss::foo(() → core::Null? => null);
+ iss::bar = () → iss::Map<core::String*, core::String*>* => null;
+ new self::D::•<core::int*>().{self::D::method}();
+ self::findKey(new iss::Map::•<core::String*, core::String*>("foo", "bar"), "bar");
+}
+static method findKey(iss::Map<core::String*, dynamic>* m, dynamic search) → void {
+ core::print(let final core::MapEntry<core::String*, dynamic>* #t1 = m.{iss::Map::entries}.{iss::Iterable::singleWhere}((core::MapEntry<core::String*, dynamic>* entry) → core::bool* => entry.{core::MapEntry::value}.{core::Object::==}(search), orElse: () → core::Null? => null) in #t1.{core::Object::==}(null) ?{core::String*} null : #t1.{core::MapEntry::key});
+}
+
+library /*isNonNullableByDefault*/;
+import self as iss;
+import "dart:core" as core;
+
+class C<X extends core::Object? = dynamic> extends core::Object {
+ constructor •(() → iss::Map<core::String, core::String> f) → iss::C<iss::C::X%>
+ : super core::Object::•() {
+ core::print(f.{core::Object::runtimeType});
+ }
+}
+class Map<K extends core::Object? = dynamic, V extends core::Object? = dynamic> extends core::Object {
+ final field iss::Map::K% key;
+ final field iss::Map::V% value;
+ constructor •(iss::Map::K% key, iss::Map::V% value) → iss::Map<iss::Map::K%, iss::Map::V%>
+ : iss::Map::key = key, iss::Map::value = value, super core::Object::•()
+ ;
+ get entries() → iss::Iterable<core::MapEntry<iss::Map::K%, iss::Map::V%>>
+ return new iss::Iterable::•<core::MapEntry<iss::Map::K%, iss::Map::V%>>(new core::MapEntry::_<iss::Map::K*, iss::Map::V*>(this.{iss::Map::key}, this.{iss::Map::value}));
+}
+class Iterable<E extends core::Object? = dynamic> extends core::Object {
+ final field iss::Iterable::E% element;
+ constructor •(iss::Iterable::E% element) → iss::Iterable<iss::Iterable::E%>
+ : iss::Iterable::element = element, super core::Object::•()
+ ;
+ method singleWhere((iss::Iterable::E%) → core::bool test, {generic-covariant-impl () →? iss::Iterable::E% orElse = #C1}) → iss::Iterable::E% {
+ if(test.call(this.{iss::Iterable::element})) {
+ return this.{iss::Iterable::element};
+ }
+ if(!orElse.{core::Object::==}(null))
+ return orElse{() → iss::Iterable::E%}.call();
+ throw "error";
+ }
+}
+static method foo(() → iss::Map<core::String, core::String> f) → void {
+ core::print(f.{core::Object::runtimeType});
+}
+static set bar(() → iss::Map<core::String, core::String> f) → void {
+ core::print(f.{core::Object::runtimeType});
+}
+
+constants {
+ #C1 = null
+}
diff --git a/pkg/front_end/testcases/nnbd/issue41180_lib.dart b/pkg/front_end/testcases/nnbd/issue41180_lib.dart
new file mode 100644
index 0000000..a7a16aa
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue41180_lib.dart
@@ -0,0 +1,41 @@
+// Copyright (c) 2020, 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.
+
+class C<X> {
+ C(Map<String, String> Function() f) {
+ print(f.runtimeType);
+ }
+}
+
+void foo(Map<String, String> Function() f) {
+ print(f.runtimeType);
+}
+
+void set bar(Map<String, String> Function() f) {
+ print(f.runtimeType);
+}
+
+class Map<K, V> {
+ final K key;
+ final V value;
+
+ Map(this.key, this.value);
+
+ Iterable<MapEntry<K, V>> get entries =>
+ new Iterable<MapEntry<K, V>>(new MapEntry<K, V>(key, value));
+}
+
+class Iterable<E> {
+ final E element;
+
+ Iterable(this.element);
+
+ E singleWhere(bool test(E element), {E orElse()?}) {
+ if (test(element)) {
+ return element;
+ }
+ if (orElse != null) return orElse();
+ throw 'error';
+ }
+}
diff --git a/pkg/front_end/testcases/nnbd/issue41210a/issue41210.dart b/pkg/front_end/testcases/nnbd/issue41210a/issue41210.dart
new file mode 100644
index 0000000..384a53c
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue41210a/issue41210.dart
@@ -0,0 +1,13 @@
+// Copyright (c) 2020, 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.
+
+// @dart=2.6
+
+import 'issue41210_lib1.dart';
+
+class C with A, B {} // ok
+
+main() {
+ print(C().method());
+}
diff --git a/pkg/front_end/testcases/nnbd/issue41210a/issue41210_lib1.dart b/pkg/front_end/testcases/nnbd/issue41210a/issue41210_lib1.dart
new file mode 100644
index 0000000..d9553df
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue41210a/issue41210_lib1.dart
@@ -0,0 +1,15 @@
+// Copyright (c) 2020, 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.
+
+// @dart=2.6
+
+import 'issue41210_lib2.dart';
+
+mixin A implements Interface {
+ String method({String s = "hello"}) => s;
+}
+
+abstract class B implements Interface {}
+
+void main() {}
diff --git a/pkg/front_end/testcases/nnbd/issue41210a/issue41210_lib1.dart.outline.expect b/pkg/front_end/testcases/nnbd/issue41210a/issue41210_lib1.dart.outline.expect
new file mode 100644
index 0000000..2640497
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue41210a/issue41210_lib1.dart.outline.expect
@@ -0,0 +1,54 @@
+library;
+import self as self;
+import "dart:core" as core;
+import "issue41210_lib1.dart" as iss;
+
+import "org-dartlang-testcase:///issue41210_lib1.dart";
+
+abstract class _C&Object&A = core::Object with iss::A /*isAnonymousMixin,hasConstConstructor*/ {
+ const synthetic constructor •() → self::_C&Object&A*
+ : super core::Object::•()
+ ;
+}
+abstract class _C&Object&A&B = self::_C&Object&A with iss::B /*isAnonymousMixin,hasConstConstructor*/ {
+ const synthetic constructor •() → self::_C&Object&A&B*
+ : super self::_C&Object&A::•()
+ ;
+ abstract forwarding-stub method method({core::String* s}) → core::String*;
+}
+class C extends self::_C&Object&A&B {
+ synthetic constructor •() → self::C*
+ ;
+ abstract forwarding-stub method method({core::String* s}) → core::String*;
+}
+static method main() → dynamic
+ ;
+
+library;
+import self as iss;
+import "dart:core" as core;
+import "issue41210_lib2.dart" as iss2;
+
+import "org-dartlang-testcase:///issue41210_lib2.dart";
+
+abstract class A extends core::Object implements iss2::Interface /*isMixinDeclaration*/ {
+ method method({core::String* s = "hello"}) → core::String*
+ ;
+}
+abstract class B extends core::Object implements iss2::Interface {
+ synthetic constructor •() → iss::B*
+ ;
+ abstract member-signature method method() → core::String*;
+}
+static method main() → void
+ ;
+
+library /*isNonNullableByDefault*/;
+import self as iss2;
+import "dart:core" as core;
+
+abstract class Interface extends core::Object {
+ synthetic constructor •() → iss2::Interface
+ ;
+ abstract method method() → core::String;
+}
diff --git a/pkg/front_end/testcases/nnbd/issue41210a/issue41210_lib1.dart.strong.expect b/pkg/front_end/testcases/nnbd/issue41210a/issue41210_lib1.dart.strong.expect
new file mode 100644
index 0000000..a447e57
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue41210a/issue41210_lib1.dart.strong.expect
@@ -0,0 +1,61 @@
+library;
+import self as self;
+import "dart:core" as core;
+import "issue41210_lib1.dart" as iss;
+
+import "org-dartlang-testcase:///issue41210_lib1.dart";
+
+abstract class _C&Object&A = core::Object with iss::A /*isAnonymousMixin,hasConstConstructor*/ {
+ const synthetic constructor •() → self::_C&Object&A*
+ : super core::Object::•()
+ ;
+}
+abstract class _C&Object&A&B = self::_C&Object&A with iss::B /*isAnonymousMixin,hasConstConstructor*/ {
+ const synthetic constructor •() → self::_C&Object&A&B*
+ : super self::_C&Object&A::•()
+ ;
+ abstract forwarding-stub method method({core::String* s = #C1}) → core::String*;
+}
+class C extends self::_C&Object&A&B {
+ synthetic constructor •() → self::C*
+ : super self::_C&Object&A&B::•()
+ ;
+ abstract forwarding-stub method method({core::String* s = #C1}) → core::String*;
+}
+static method main() → dynamic {
+ core::print(new self::C::•().{self::C::method}());
+}
+
+library;
+import self as iss;
+import "dart:core" as core;
+import "issue41210_lib2.dart" as iss2;
+
+import "org-dartlang-testcase:///issue41210_lib2.dart";
+
+abstract class A extends core::Object implements iss2::Interface /*isMixinDeclaration*/ {
+ method method({core::String* s = #C1}) → core::String*
+ return s;
+}
+abstract class B extends core::Object implements iss2::Interface {
+ synthetic constructor •() → iss::B*
+ : super core::Object::•()
+ ;
+ abstract member-signature method method() → core::String*;
+}
+static method main() → void {}
+
+library /*isNonNullableByDefault*/;
+import self as iss2;
+import "dart:core" as core;
+
+abstract class Interface extends core::Object {
+ synthetic constructor •() → iss2::Interface
+ : super core::Object::•()
+ ;
+ abstract method method() → core::String;
+}
+
+constants {
+ #C1 = "hello"
+}
diff --git a/pkg/front_end/testcases/nnbd/issue41210a/issue41210_lib1.dart.weak.expect b/pkg/front_end/testcases/nnbd/issue41210a/issue41210_lib1.dart.weak.expect
new file mode 100644
index 0000000..a447e57
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue41210a/issue41210_lib1.dart.weak.expect
@@ -0,0 +1,61 @@
+library;
+import self as self;
+import "dart:core" as core;
+import "issue41210_lib1.dart" as iss;
+
+import "org-dartlang-testcase:///issue41210_lib1.dart";
+
+abstract class _C&Object&A = core::Object with iss::A /*isAnonymousMixin,hasConstConstructor*/ {
+ const synthetic constructor •() → self::_C&Object&A*
+ : super core::Object::•()
+ ;
+}
+abstract class _C&Object&A&B = self::_C&Object&A with iss::B /*isAnonymousMixin,hasConstConstructor*/ {
+ const synthetic constructor •() → self::_C&Object&A&B*
+ : super self::_C&Object&A::•()
+ ;
+ abstract forwarding-stub method method({core::String* s = #C1}) → core::String*;
+}
+class C extends self::_C&Object&A&B {
+ synthetic constructor •() → self::C*
+ : super self::_C&Object&A&B::•()
+ ;
+ abstract forwarding-stub method method({core::String* s = #C1}) → core::String*;
+}
+static method main() → dynamic {
+ core::print(new self::C::•().{self::C::method}());
+}
+
+library;
+import self as iss;
+import "dart:core" as core;
+import "issue41210_lib2.dart" as iss2;
+
+import "org-dartlang-testcase:///issue41210_lib2.dart";
+
+abstract class A extends core::Object implements iss2::Interface /*isMixinDeclaration*/ {
+ method method({core::String* s = #C1}) → core::String*
+ return s;
+}
+abstract class B extends core::Object implements iss2::Interface {
+ synthetic constructor •() → iss::B*
+ : super core::Object::•()
+ ;
+ abstract member-signature method method() → core::String*;
+}
+static method main() → void {}
+
+library /*isNonNullableByDefault*/;
+import self as iss2;
+import "dart:core" as core;
+
+abstract class Interface extends core::Object {
+ synthetic constructor •() → iss2::Interface
+ : super core::Object::•()
+ ;
+ abstract method method() → core::String;
+}
+
+constants {
+ #C1 = "hello"
+}
diff --git a/pkg/front_end/testcases/nnbd/issue41210a/issue41210_lib2.dart b/pkg/front_end/testcases/nnbd/issue41210a/issue41210_lib2.dart
new file mode 100644
index 0000000..3f2afd0
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue41210a/issue41210_lib2.dart
@@ -0,0 +1,7 @@
+// Copyright (c) 2020, 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.
+
+abstract class Interface {
+ String method();
+}
diff --git a/pkg/front_end/testcases/nnbd/issue41210a/link.options b/pkg/front_end/testcases/nnbd/issue41210a/link.options
new file mode 100644
index 0000000..184abb1
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue41210a/link.options
@@ -0,0 +1,2 @@
+issue41210_lib1.dart
+issue41210_lib2.dart
diff --git a/pkg/front_end/testcases/nnbd/issue41210b.dart b/pkg/front_end/testcases/nnbd/issue41210b.dart
new file mode 100644
index 0000000..29a66fc
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue41210b.dart
@@ -0,0 +1,13 @@
+// Copyright (c) 2020, 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.
+
+// @dart=2.6
+
+import 'issue41210b_lib1.dart';
+
+class C with A, B {} // ok
+
+main() {
+ print(C().method());
+}
diff --git a/pkg/front_end/testcases/nnbd/issue41210b.dart.outline.expect b/pkg/front_end/testcases/nnbd/issue41210b.dart.outline.expect
new file mode 100644
index 0000000..b3bea87
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue41210b.dart.outline.expect
@@ -0,0 +1,52 @@
+library;
+import self as self;
+import "dart:core" as core;
+import "issue41210b_lib1.dart" as iss;
+
+import "org-dartlang-testcase:///issue41210b_lib1.dart";
+
+abstract class _C&Object&A = core::Object with iss::A /*isAnonymousMixin,hasConstConstructor*/ {
+ const synthetic constructor •() → self::_C&Object&A*
+ : super core::Object::•()
+ ;
+}
+abstract class _C&Object&A&B = self::_C&Object&A with iss::B /*isAnonymousMixin,hasConstConstructor*/ {
+ const synthetic constructor •() → self::_C&Object&A&B*
+ : super self::_C&Object&A::•()
+ ;
+}
+class C extends self::_C&Object&A&B {
+ synthetic constructor •() → self::C*
+ ;
+}
+static method main() → dynamic
+ ;
+
+library;
+import self as iss;
+import "dart:core" as core;
+import "issue41210b_lib2.dart" as iss2;
+
+import "org-dartlang-testcase:///issue41210b_lib2.dart";
+
+abstract class A extends core::Object implements iss2::Interface /*isMixinDeclaration*/ {
+ method method({core::String* s = "hello"}) → core::String*
+ ;
+}
+abstract class B extends core::Object implements iss2::Interface {
+ synthetic constructor •() → iss::B*
+ ;
+ abstract member-signature method method() → core::String*;
+}
+static method main() → void
+ ;
+
+library /*isNonNullableByDefault*/;
+import self as iss2;
+import "dart:core" as core;
+
+abstract class Interface extends core::Object {
+ synthetic constructor •() → iss2::Interface
+ ;
+ abstract method method() → core::String;
+}
diff --git a/pkg/front_end/testcases/nnbd/issue41210b.dart.strong.expect b/pkg/front_end/testcases/nnbd/issue41210b.dart.strong.expect
new file mode 100644
index 0000000..3679eca
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue41210b.dart.strong.expect
@@ -0,0 +1,59 @@
+library;
+import self as self;
+import "dart:core" as core;
+import "issue41210b_lib1.dart" as iss;
+
+import "org-dartlang-testcase:///issue41210b_lib1.dart";
+
+abstract class _C&Object&A = core::Object with iss::A /*isAnonymousMixin,hasConstConstructor*/ {
+ const synthetic constructor •() → self::_C&Object&A*
+ : super core::Object::•()
+ ;
+}
+abstract class _C&Object&A&B = self::_C&Object&A with iss::B /*isAnonymousMixin,hasConstConstructor*/ {
+ const synthetic constructor •() → self::_C&Object&A&B*
+ : super self::_C&Object&A::•()
+ ;
+}
+class C extends self::_C&Object&A&B {
+ synthetic constructor •() → self::C*
+ : super self::_C&Object&A&B::•()
+ ;
+}
+static method main() → dynamic {
+ core::print(new self::C::•().{iss::A::method}());
+}
+
+library;
+import self as iss;
+import "dart:core" as core;
+import "issue41210b_lib2.dart" as iss2;
+
+import "org-dartlang-testcase:///issue41210b_lib2.dart";
+
+abstract class A extends core::Object implements iss2::Interface /*isMixinDeclaration*/ {
+ method method({core::String* s = #C1}) → core::String*
+ return s;
+}
+abstract class B extends core::Object implements iss2::Interface {
+ synthetic constructor •() → iss::B*
+ : super core::Object::•()
+ ;
+ abstract member-signature method method() → core::String*;
+}
+static method main() → void {}
+
+library /*isNonNullableByDefault*/;
+import self as iss2;
+import "dart:core" as core;
+
+abstract class Interface extends core::Object {
+ synthetic constructor •() → iss2::Interface
+ : super core::Object::•()
+ ;
+ abstract method method() → core::String;
+}
+
+constants {
+ #C1 = "hello"
+}
diff --git a/pkg/front_end/testcases/nnbd/issue41210b.dart.weak.expect b/pkg/front_end/testcases/nnbd/issue41210b.dart.weak.expect
new file mode 100644
index 0000000..3679eca
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue41210b.dart.weak.expect
@@ -0,0 +1,59 @@
+library;
+import self as self;
+import "dart:core" as core;
+import "issue41210b_lib1.dart" as iss;
+
+import "org-dartlang-testcase:///issue41210b_lib1.dart";
+
+abstract class _C&Object&A = core::Object with iss::A /*isAnonymousMixin,hasConstConstructor*/ {
+ const synthetic constructor •() → self::_C&Object&A*
+ : super core::Object::•()
+ ;
+}
+abstract class _C&Object&A&B = self::_C&Object&A with iss::B /*isAnonymousMixin,hasConstConstructor*/ {
+ const synthetic constructor •() → self::_C&Object&A&B*
+ : super self::_C&Object&A::•()
+ ;
+}
+class C extends self::_C&Object&A&B {
+ synthetic constructor •() → self::C*
+ : super self::_C&Object&A&B::•()
+ ;
+}
+static method main() → dynamic {
+ core::print(new self::C::•().{iss::A::method}());
+}
+
+library;
+import self as iss;
+import "dart:core" as core;
+import "issue41210b_lib2.dart" as iss2;
+
+import "org-dartlang-testcase:///issue41210b_lib2.dart";
+
+abstract class A extends core::Object implements iss2::Interface /*isMixinDeclaration*/ {
+ method method({core::String* s = #C1}) → core::String*
+ return s;
+}
+abstract class B extends core::Object implements iss2::Interface {
+ synthetic constructor •() → iss::B*
+ : super core::Object::•()
+ ;
+ abstract member-signature method method() → core::String*;
+}
+static method main() → void {}
+
+library /*isNonNullableByDefault*/;
+import self as iss2;
+import "dart:core" as core;
+
+abstract class Interface extends core::Object {
+ synthetic constructor •() → iss2::Interface
+ : super core::Object::•()
+ ;
+ abstract method method() → core::String;
+}
+
+constants {
+ #C1 = "hello"
+}
diff --git a/pkg/front_end/testcases/nnbd/issue41210b_lib1.dart b/pkg/front_end/testcases/nnbd/issue41210b_lib1.dart
new file mode 100644
index 0000000..97b5964
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue41210b_lib1.dart
@@ -0,0 +1,15 @@
+// Copyright (c) 2020, 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.
+
+// @dart=2.6
+
+import 'issue41210b_lib2.dart';
+
+mixin A implements Interface {
+ String method({String s = "hello"}) => s;
+}
+
+abstract class B implements Interface {}
+
+void main() {}
diff --git a/pkg/front_end/testcases/nnbd/issue41210b_lib2.dart b/pkg/front_end/testcases/nnbd/issue41210b_lib2.dart
new file mode 100644
index 0000000..3f2afd0
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue41210b_lib2.dart
@@ -0,0 +1,7 @@
+// Copyright (c) 2020, 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.
+
+abstract class Interface {
+ String method();
+}
diff --git a/pkg/front_end/testcases/outline.status b/pkg/front_end/testcases/outline.status
index 47a606d..6d3a0e2 100644
--- a/pkg/front_end/testcases/outline.status
+++ b/pkg/front_end/testcases/outline.status
@@ -7,6 +7,9 @@
general/bug30695: TypeCheckError
general/infer_field_from_multiple: TypeCheckError
general/invalid_operator: TypeCheckError
+general/issue41210a: TypeCheckError
+general/issue41210b/issue41210: TypeCheckError
+
general/mixin_application_override: TypeCheckError
general/override_check_accessor_after_inference: TypeCheckError
general/override_check_accessor_basic: TypeCheckError
@@ -46,6 +49,8 @@
nnbd/messages_with_types_opt_in: TypeCheckError
nnbd/messages_with_types_opt_out: TypeCheckError
nnbd/never_opt_out: TypeCheckError
+nnbd/issue41210a/issue41210: TypeCheckError
+nnbd/issue41210b: TypeCheckError
rasta/native_is_illegal: Pass # Issue 29763
diff --git a/pkg/front_end/testcases/regress/issue_29944.dart.outline.expect b/pkg/front_end/testcases/regress/issue_29944.dart.outline.expect
index 9533487..6de1960 100644
--- a/pkg/front_end/testcases/regress/issue_29944.dart.outline.expect
+++ b/pkg/front_end/testcases/regress/issue_29944.dart.outline.expect
@@ -3,6 +3,7 @@
// Problems in library:
//
// pkg/front_end/testcases/regress/issue_29944.dart:7:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
// var C;
// ^
//
diff --git a/pkg/front_end/testcases/regress/issue_29944.dart.strong.expect b/pkg/front_end/testcases/regress/issue_29944.dart.strong.expect
index 5cb1717..99d9e6f 100644
--- a/pkg/front_end/testcases/regress/issue_29944.dart.strong.expect
+++ b/pkg/front_end/testcases/regress/issue_29944.dart.strong.expect
@@ -3,6 +3,7 @@
// Problems in library:
//
// pkg/front_end/testcases/regress/issue_29944.dart:7:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
// var C;
// ^
//
diff --git a/pkg/front_end/testcases/regress/issue_29944.dart.strong.transformed.expect b/pkg/front_end/testcases/regress/issue_29944.dart.strong.transformed.expect
index 5cb1717..99d9e6f 100644
--- a/pkg/front_end/testcases/regress/issue_29944.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_29944.dart.strong.transformed.expect
@@ -3,6 +3,7 @@
// Problems in library:
//
// pkg/front_end/testcases/regress/issue_29944.dart:7:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
// var C;
// ^
//
diff --git a/pkg/front_end/testcases/regress/issue_30834.dart.outline.expect b/pkg/front_end/testcases/regress/issue_30834.dart.outline.expect
index 6935294..1566383 100644
--- a/pkg/front_end/testcases/regress/issue_30834.dart.outline.expect
+++ b/pkg/front_end/testcases/regress/issue_30834.dart.outline.expect
@@ -3,6 +3,7 @@
// Problems in library:
//
// pkg/front_end/testcases/regress/issue_30834.dart:6:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
// set A(v) {}
// ^
//
diff --git a/pkg/front_end/testcases/regress/issue_30834.dart.strong.expect b/pkg/front_end/testcases/regress/issue_30834.dart.strong.expect
index 615c5f3..6efef30 100644
--- a/pkg/front_end/testcases/regress/issue_30834.dart.strong.expect
+++ b/pkg/front_end/testcases/regress/issue_30834.dart.strong.expect
@@ -3,6 +3,7 @@
// Problems in library:
//
// pkg/front_end/testcases/regress/issue_30834.dart:6:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
// set A(v) {}
// ^
//
diff --git a/pkg/front_end/testcases/regress/issue_30834.dart.strong.transformed.expect b/pkg/front_end/testcases/regress/issue_30834.dart.strong.transformed.expect
index 615c5f3..6efef30 100644
--- a/pkg/front_end/testcases/regress/issue_30834.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_30834.dart.strong.transformed.expect
@@ -3,6 +3,7 @@
// Problems in library:
//
// pkg/front_end/testcases/regress/issue_30834.dart:6:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
// set A(v) {}
// ^
//
diff --git a/pkg/front_end/testcases/regress/issue_30981.dart.outline.expect b/pkg/front_end/testcases/regress/issue_30981.dart.outline.expect
index 0168eb6..adaf7d7 100644
--- a/pkg/front_end/testcases/regress/issue_30981.dart.outline.expect
+++ b/pkg/front_end/testcases/regress/issue_30981.dart.outline.expect
@@ -3,6 +3,7 @@
// Problems in library:
//
// pkg/front_end/testcases/regress/issue_30981.dart:6:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
// get A {
// ^
//
diff --git a/pkg/front_end/testcases/regress/issue_30981.dart.strong.expect b/pkg/front_end/testcases/regress/issue_30981.dart.strong.expect
index c31c737..610489b 100644
--- a/pkg/front_end/testcases/regress/issue_30981.dart.strong.expect
+++ b/pkg/front_end/testcases/regress/issue_30981.dart.strong.expect
@@ -3,6 +3,7 @@
// Problems in library:
//
// pkg/front_end/testcases/regress/issue_30981.dart:6:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
// get A {
// ^
//
diff --git a/pkg/front_end/testcases/regress/issue_30981.dart.strong.transformed.expect b/pkg/front_end/testcases/regress/issue_30981.dart.strong.transformed.expect
index c31c737..610489b 100644
--- a/pkg/front_end/testcases/regress/issue_30981.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_30981.dart.strong.transformed.expect
@@ -3,6 +3,7 @@
// Problems in library:
//
// pkg/front_end/testcases/regress/issue_30981.dart:6:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
// get A {
// ^
//
diff --git a/pkg/front_end/testcases/regress/issue_34225.dart.outline.expect b/pkg/front_end/testcases/regress/issue_34225.dart.outline.expect
index 68a215f..2daa8a2 100644
--- a/pkg/front_end/testcases/regress/issue_34225.dart.outline.expect
+++ b/pkg/front_end/testcases/regress/issue_34225.dart.outline.expect
@@ -3,10 +3,12 @@
// Problems in library:
//
// pkg/front_end/testcases/regress/issue_34225.dart:6:14: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
// static set C(v) {} //# 01: compile-time error
// ^
//
// pkg/front_end/testcases/regress/issue_34225.dart:10:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
// set D(v) {} //# 02: compile-time error
// ^
//
diff --git a/pkg/front_end/testcases/regress/issue_34225.dart.strong.expect b/pkg/front_end/testcases/regress/issue_34225.dart.strong.expect
index 413bd07..edd1d2b 100644
--- a/pkg/front_end/testcases/regress/issue_34225.dart.strong.expect
+++ b/pkg/front_end/testcases/regress/issue_34225.dart.strong.expect
@@ -3,10 +3,12 @@
// Problems in library:
//
// pkg/front_end/testcases/regress/issue_34225.dart:6:14: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
// static set C(v) {} //# 01: compile-time error
// ^
//
// pkg/front_end/testcases/regress/issue_34225.dart:10:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
// set D(v) {} //# 02: compile-time error
// ^
//
diff --git a/pkg/front_end/testcases/regress/issue_34225.dart.strong.transformed.expect b/pkg/front_end/testcases/regress/issue_34225.dart.strong.transformed.expect
index 413bd07..edd1d2b 100644
--- a/pkg/front_end/testcases/regress/issue_34225.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_34225.dart.strong.transformed.expect
@@ -3,10 +3,12 @@
// Problems in library:
//
// pkg/front_end/testcases/regress/issue_34225.dart:6:14: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
// static set C(v) {} //# 01: compile-time error
// ^
//
// pkg/front_end/testcases/regress/issue_34225.dart:10:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
// set D(v) {} //# 02: compile-time error
// ^
//
diff --git a/pkg/front_end/testcases/regress/issue_34610.dart b/pkg/front_end/testcases/regress/issue_34610.dart
index 09f61fa..da9d50a 100644
--- a/pkg/front_end/testcases/regress/issue_34610.dart
+++ b/pkg/front_end/testcases/regress/issue_34610.dart
@@ -9,7 +9,12 @@
class C { C.named => null; get bar => 1; }
main() {
- print(new A().bar);
+ try {
+ print(new A.named().bar);
+ throw 'expected exception';
+ } catch (e) {
+ // Expected Error: Constructors can't have a return type.
+ }
print(new B.named().bar);
try {
print(new C.named().bar);
diff --git a/pkg/front_end/testcases/regress/issue_34610.dart.outline.expect b/pkg/front_end/testcases/regress/issue_34610.dart.outline.expect
index 9315b49..f82941f 100644
--- a/pkg/front_end/testcases/regress/issue_34610.dart.outline.expect
+++ b/pkg/front_end/testcases/regress/issue_34610.dart.outline.expect
@@ -2,22 +2,15 @@
//
// Problems in library:
//
-// pkg/front_end/testcases/regress/issue_34610.dart:5:16: Error: Expected '{' before this.
-// class A { get A.named => null; get bar => 1; }
-// ^
-//
-// pkg/front_end/testcases/regress/issue_34610.dart:5:15: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/regress/issue_34610.dart:5:15: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
// class A { get A.named => null; get bar => 1; }
// ^
//
-// pkg/front_end/testcases/regress/issue_34610.dart:5:16: Error: Expected a class member, but got '.'.
+// pkg/front_end/testcases/regress/issue_34610.dart:5:11: Error: Constructors can't be a getter.
+// Try removing 'get'.
// class A { get A.named => null; get bar => 1; }
-// ^
-//
-// pkg/front_end/testcases/regress/issue_34610.dart:5:17: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
-// class A { get A.named => null; get bar => 1; }
-// ^^^^^
+// ^^^
//
// pkg/front_end/testcases/regress/issue_34610.dart:7:11: Error: A method declaration needs an explicit list of parameters.
// Try adding a parameter list to the method declaration.
@@ -33,11 +26,7 @@
import "dart:core" as core;
class A extends core::Object {
- synthetic constructor •() → self::A*
- ;
- get A() → dynamic
- ;
- method named() → dynamic
+ constructor named() → self::A*
;
get bar() → dynamic
;
diff --git a/pkg/front_end/testcases/regress/issue_34610.dart.strong.expect b/pkg/front_end/testcases/regress/issue_34610.dart.strong.expect
index 5ab44b7..833bf07 100644
--- a/pkg/front_end/testcases/regress/issue_34610.dart.strong.expect
+++ b/pkg/front_end/testcases/regress/issue_34610.dart.strong.expect
@@ -2,22 +2,15 @@
//
// Problems in library:
//
-// pkg/front_end/testcases/regress/issue_34610.dart:5:16: Error: Expected '{' before this.
-// class A { get A.named => null; get bar => 1; }
-// ^
-//
-// pkg/front_end/testcases/regress/issue_34610.dart:5:15: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/regress/issue_34610.dart:5:15: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
// class A { get A.named => null; get bar => 1; }
// ^
//
-// pkg/front_end/testcases/regress/issue_34610.dart:5:16: Error: Expected a class member, but got '.'.
+// pkg/front_end/testcases/regress/issue_34610.dart:5:11: Error: Constructors can't be a getter.
+// Try removing 'get'.
// class A { get A.named => null; get bar => 1; }
-// ^
-//
-// pkg/front_end/testcases/regress/issue_34610.dart:5:17: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
-// class A { get A.named => null; get bar => 1; }
-// ^^^^^
+// ^^^
//
// pkg/front_end/testcases/regress/issue_34610.dart:7:11: Error: A method declaration needs an explicit list of parameters.
// Try adding a parameter list to the method declaration.
@@ -29,6 +22,11 @@
// class C { C.named => null; get bar => 1; }
// ^
//
+// pkg/front_end/testcases/regress/issue_34610.dart:5:26: Error: Constructors can't have a return type.
+// Try removing the return type.
+// class A { get A.named => null; get bar => 1; }
+// ^
+//
// pkg/front_end/testcases/regress/issue_34610.dart:9:22: Error: Constructors can't have a return type.
// Try removing the return type.
// class C { C.named => null; get bar => 1; }
@@ -38,12 +36,12 @@
import "dart:core" as core;
class A extends core::Object {
- synthetic constructor •() → self::A*
+ constructor named() → self::A*
: super core::Object::•()
- ;
- get A() → dynamic {}
- method named() → dynamic
- return null;
+ invalid-expression "pkg/front_end/testcases/regress/issue_34610.dart:5:26: Error: Constructors can't have a return type.
+Try removing the return type.
+class A { get A.named => null; get bar => 1; }
+ ^";
get bar() → dynamic
return 1;
}
@@ -65,7 +63,12 @@
return 1;
}
static method main() → dynamic {
- core::print(new self::A::•().{self::A::bar});
+ try {
+ core::print(new self::A::named().{self::A::bar});
+ throw "expected exception";
+ }
+ on dynamic catch(final dynamic e) {
+ }
core::print(new self::B::named().{self::B::bar});
try {
core::print(new self::C::named().{self::C::bar});
diff --git a/pkg/front_end/testcases/regress/issue_34610.dart.strong.transformed.expect b/pkg/front_end/testcases/regress/issue_34610.dart.strong.transformed.expect
index 5ab44b7..833bf07 100644
--- a/pkg/front_end/testcases/regress/issue_34610.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_34610.dart.strong.transformed.expect
@@ -2,22 +2,15 @@
//
// Problems in library:
//
-// pkg/front_end/testcases/regress/issue_34610.dart:5:16: Error: Expected '{' before this.
-// class A { get A.named => null; get bar => 1; }
-// ^
-//
-// pkg/front_end/testcases/regress/issue_34610.dart:5:15: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/regress/issue_34610.dart:5:15: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
// class A { get A.named => null; get bar => 1; }
// ^
//
-// pkg/front_end/testcases/regress/issue_34610.dart:5:16: Error: Expected a class member, but got '.'.
+// pkg/front_end/testcases/regress/issue_34610.dart:5:11: Error: Constructors can't be a getter.
+// Try removing 'get'.
// class A { get A.named => null; get bar => 1; }
-// ^
-//
-// pkg/front_end/testcases/regress/issue_34610.dart:5:17: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
-// class A { get A.named => null; get bar => 1; }
-// ^^^^^
+// ^^^
//
// pkg/front_end/testcases/regress/issue_34610.dart:7:11: Error: A method declaration needs an explicit list of parameters.
// Try adding a parameter list to the method declaration.
@@ -29,6 +22,11 @@
// class C { C.named => null; get bar => 1; }
// ^
//
+// pkg/front_end/testcases/regress/issue_34610.dart:5:26: Error: Constructors can't have a return type.
+// Try removing the return type.
+// class A { get A.named => null; get bar => 1; }
+// ^
+//
// pkg/front_end/testcases/regress/issue_34610.dart:9:22: Error: Constructors can't have a return type.
// Try removing the return type.
// class C { C.named => null; get bar => 1; }
@@ -38,12 +36,12 @@
import "dart:core" as core;
class A extends core::Object {
- synthetic constructor •() → self::A*
+ constructor named() → self::A*
: super core::Object::•()
- ;
- get A() → dynamic {}
- method named() → dynamic
- return null;
+ invalid-expression "pkg/front_end/testcases/regress/issue_34610.dart:5:26: Error: Constructors can't have a return type.
+Try removing the return type.
+class A { get A.named => null; get bar => 1; }
+ ^";
get bar() → dynamic
return 1;
}
@@ -65,7 +63,12 @@
return 1;
}
static method main() → dynamic {
- core::print(new self::A::•().{self::A::bar});
+ try {
+ core::print(new self::A::named().{self::A::bar});
+ throw "expected exception";
+ }
+ on dynamic catch(final dynamic e) {
+ }
core::print(new self::B::named().{self::B::bar});
try {
core::print(new self::C::named().{self::C::bar});
diff --git a/pkg/front_end/testcases/strong.status b/pkg/front_end/testcases/strong.status
index 2ef9e79..61f29c9e 100644
--- a/pkg/front_end/testcases/strong.status
+++ b/pkg/front_end/testcases/strong.status
@@ -15,12 +15,10 @@
general/abstract_members: TypeCheckError
general/accessors: RuntimeError
general/ambiguous_exports: RuntimeError # Expected, this file exports two main methods.
-general/argument_mismatch: InstrumentationMismatch # Test assumes Dart 1.0 semantics
general/await_in_non_async: RuntimeError # Expected.
general/bug21938: TypeCheckError
general/bug30695: TypeCheckError
general/bug31124: RuntimeError # Test has no main method (and we shouldn't add one).
-general/bug32629: InstrumentationMismatch # Test has an intentional error
general/call: TypeCheckError
general/candidate_found: TypeCheckError
general/cascade: RuntimeError
@@ -28,7 +26,6 @@
general/covariant_generic: RuntimeError
general/duplicated_declarations: TypeCheckError
general/duplicated_field_initializer: RuntimeError
-general/dynamic_and_void: InstrumentationMismatch # Test assumes Dart 1.0 semantics
general/error_locations/error_location_01: RuntimeError
general/error_locations/error_location_02: RuntimeError
general/error_locations/error_location_03: RuntimeError
@@ -44,6 +41,8 @@
general/issue38938: RuntimeError # no main and compile time errors.
general/issue38944: RuntimeError # no main and compile time errors.
general/issue38961: RuntimeError # no main and compile time errors.
+general/issue41210a: TypeCheckError
+general/issue41210b/issue41210: TypeCheckError
general/micro: RuntimeError
general/mixin_application_override: ExpectationFileMismatch # Too many errors.
general/mixin_application_override: TypeCheckError
@@ -65,16 +64,13 @@
general/type_variable_bound_access: TypeCheckError
general/unsound_promotion: TypeCheckError
general/void_methods: RuntimeError
-general/warn_unresolved_sends: InstrumentationMismatch # Test assumes Dart 1.0 semantics
general_nnbd_opt_out/abstract_members: TypeCheckError
general_nnbd_opt_out/accessors: RuntimeError
general_nnbd_opt_out/ambiguous_exports: RuntimeError # Expected, this file exports two main methods.
-general_nnbd_opt_out/argument_mismatch: InstrumentationMismatch # Test assumes Dart 1.0 semantics
general_nnbd_opt_out/await_in_non_async: RuntimeError # Expected.
general_nnbd_opt_out/bug21938: TypeCheckError
general_nnbd_opt_out/bug30695: TypeCheckError
general_nnbd_opt_out/bug31124: RuntimeError # Test has no main method (and we shouldn't add one).
-general_nnbd_opt_out/bug32629: InstrumentationMismatch # Test has an intentional error
general_nnbd_opt_out/call: TypeCheckError
general_nnbd_opt_out/candidate_found: TypeCheckError
general_nnbd_opt_out/cascade: RuntimeError
@@ -82,7 +78,6 @@
general_nnbd_opt_out/covariant_generic: RuntimeError
general_nnbd_opt_out/duplicated_declarations: TypeCheckError
general_nnbd_opt_out/duplicated_field_initializer: RuntimeError
-general_nnbd_opt_out/dynamic_and_void: InstrumentationMismatch # Test assumes Dart 1.0 semantics
general_nnbd_opt_out/error_locations/error_location_01: RuntimeError
general_nnbd_opt_out/error_locations/error_location_02: RuntimeError
general_nnbd_opt_out/error_locations/error_location_03: RuntimeError
@@ -117,24 +112,15 @@
general_nnbd_opt_out/type_variable_bound_access: TypeCheckError
general_nnbd_opt_out/unsound_promotion: TypeCheckError
general_nnbd_opt_out/void_methods: RuntimeError
-general_nnbd_opt_out/warn_unresolved_sends: InstrumentationMismatch # Test assumes Dart 1.0 semantics
-inference/abstract_class_instantiation: InstrumentationMismatch # Issue #30040
inference/constructors_infer_from_arguments_argument_not_assignable: TypeCheckError
-inference/constructors_too_many_positional_arguments: InstrumentationMismatch # Issue #30040
inference/do_not_infer_overridden_fields_that_explicitly_say_dynamic_infer: TypeCheckError
-inference/downwards_inference_annotations_type_variable: InstrumentationMismatch # Issue 28981
inference/downwards_inference_for_each: RuntimeError # Issue #36382
-inference/downwards_inference_on_function_of_t_using_the_t: InstrumentationMismatch # Issue #29798
inference/downwards_inference_on_list_literals_infer_downwards: RuntimeError
-inference/future_then_explicit_future: InstrumentationMismatch # Issue #30040
inference/future_then_upwards: RuntimeError
inference/future_then_upwards_2: RuntimeError
-inference/generic_functions_return_typedef: InstrumentationMismatch # Issue #29798
inference/generic_methods_correctly_recognize_generic_upper_bound: TypeCheckError
inference/generic_methods_do_not_infer_invalid_override_of_generic_method: TypeCheckError
inference/generic_methods_handle_override_of_non_generic_with_generic: TypeCheckError
-inference/generic_methods_infer_js_builtin: InstrumentationMismatch # Issue #30029
-inference/infer_method_missing_params: ExpectationFileMismatch # Not supposed to be able to infer types if supertypes disagree on number of parameters. An error may be missing as C.f and B.f are not compatible at all.
inference/infer_method_missing_params: TypeCheckError
inference/infer_type_regardless_of_declaration_order_or_cycles: RuntimeError
inference/infer_types_on_generic_instantiations_4: RuntimeError
@@ -146,8 +132,6 @@
inference/mixin_inference_unification_1: TypeCheckError
inference/mixin_inference_unification_2: TypeCheckError
inference/override_equals: RuntimeError
-inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1: InstrumentationMismatch # Issue #25824
-inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1: InstrumentationMismatch # Issue #25824
inference_new/infer_assign_to_index_super_upwards: TypeCheckError
inference_new/infer_assign_to_index_this_upwards: TypeCheckError
inference_new/infer_assign_to_index_upwards: TypeCheckError
@@ -156,6 +140,9 @@
instantiate_to_bound/non_simple_class_parametrized_typedef_cycle: RuntimeError # Expected
instantiate_to_bound/non_simple_generic_function_in_bound_regress: RuntimeError # Expected
nnbd/inheritance_from_opt_in: TypeCheckError
+nnbd/issue41180: RuntimeError # Strong mode runtime checking fails due to mixed strong mode.
+nnbd/issue41210a/issue41210: TypeCheckError
+nnbd/issue41210b: TypeCheckError
nnbd/messages_with_types_opt_in: TypeCheckError
nnbd/messages_with_types_opt_out: TypeCheckError
nnbd/never_opt_out: TypeCheckError
diff --git a/pkg/front_end/testcases/text_serialization.status b/pkg/front_end/testcases/text_serialization.status
index 5dc34b0..9e2e2bb 100644
--- a/pkg/front_end/testcases/text_serialization.status
+++ b/pkg/front_end/testcases/text_serialization.status
@@ -92,7 +92,7 @@
general/annotation_typedef_formals_resolution: TextSerializationFailure # Was: Pass
general/annotation_variable_declaration: TextSerializationFailure # Was: Pass
general/argument: TextSerializationFailure # Was: Pass
-general/argument_mismatch: InstrumentationMismatch # Test assumes Dart 1.0 semantics
+general/argument_mismatch: TextSerializationFailure
general/arithmetic: TextSerializationFailure # Was: Pass
general/arrow_function: TextSerializationFailure # Was: Pass
general/assign_to_initializing_formal: TextSerializationFailure
@@ -112,7 +112,7 @@
general/bug32414a: TextSerializationFailure # Was: Pass
general/bug32414b: TextSerializationFailure # Was: Pass
general/bug32426: TextSerializationFailure # Was: Pass
-general/bug32629: InstrumentationMismatch # Test has an intentional error
+general/bug32629: TextSerializationFailure
general/bug32866: TextSerializationFailure # Was: Pass
general/bug33099: TextSerializationFailure # Was: Pass
general/bug33196: TextSerializationFailure # Was: Pass
@@ -168,7 +168,7 @@
general/duplicated_declarations_part: TextSerializationFailure # Was: Pass
general/duplicated_field_initializer: TextSerializationFailure # Was: RuntimeError
general/duplicated_named_args_3: TextSerializationFailure # Was: Pass
-general/dynamic_and_void: InstrumentationMismatch # Test assumes Dart 1.0 semantics
+general/dynamic_and_void: TextSerializationFailure
general/error_locations/error_location_01: TextSerializationFailure
general/error_locations/error_location_02: TextSerializationFailure
general/error_locations/error_location_03: TextSerializationFailure
@@ -250,6 +250,8 @@
general/issue40662: TextSerializationFailure
general/issue40744: TextSerializationFailure
general/issue41070: TextSerializationFailure
+general/issue41210a: TypeCheckError
+general/issue41210b/issue41210: TypeCheckError
general/literals: TextSerializationFailure # Was: Pass
general/local_generic_function: TextSerializationFailure # Was: Pass
general/long_chain_of_typedefs: TextSerializationFailure
@@ -372,7 +374,7 @@
general/var_as_type_name: TextSerializationFailure # Was: Pass
general/vm_type_ops: TextSerializationFailure
general/void_methods: TextSerializationFailure
-general/warn_unresolved_sends: InstrumentationMismatch # Test assumes Dart 1.0 semantics
+general/warn_unresolved_sends: TextSerializationFailure
general/well_boundness_checks_in_outline: TextSerializationFailure
general/with_dependencies/abstract_members_from_dill/main: TextSerializationFailure
general/with_dependencies/extension_from_dill/extension_from_dill: TextSerializationFailure
@@ -390,7 +392,7 @@
general_nnbd_opt_out/annotation_typedef_formals_resolution: TextSerializationFailure # Was: Pass
general_nnbd_opt_out/annotation_variable_declaration: TextSerializationFailure # Was: Pass
general_nnbd_opt_out/argument: TextSerializationFailure # Was: Pass
-general_nnbd_opt_out/argument_mismatch: InstrumentationMismatch # Test assumes Dart 1.0 semantics
+general_nnbd_opt_out/argument_mismatch: TextSerializationFailure
general_nnbd_opt_out/arithmetic: TextSerializationFailure # Was: Pass
general_nnbd_opt_out/arrow_function: TextSerializationFailure # Was: Pass
general_nnbd_opt_out/assign_to_initializing_formal: TextSerializationFailure
@@ -410,7 +412,7 @@
general_nnbd_opt_out/bug32414a: TextSerializationFailure # Was: Pass
general_nnbd_opt_out/bug32414b: TextSerializationFailure # Was: Pass
general_nnbd_opt_out/bug32426: TextSerializationFailure # Was: Pass
-general_nnbd_opt_out/bug32629: InstrumentationMismatch # Test has an intentional error
+general_nnbd_opt_out/bug32629: TextSerializationFailure
general_nnbd_opt_out/bug32866: TextSerializationFailure # Was: Pass
general_nnbd_opt_out/bug33099: TextSerializationFailure # Was: Pass
general_nnbd_opt_out/bug33196: TextSerializationFailure # Was: Pass
@@ -465,7 +467,7 @@
general_nnbd_opt_out/duplicated_declarations_part: TextSerializationFailure # Was: Pass
general_nnbd_opt_out/duplicated_field_initializer: TextSerializationFailure # Was: RuntimeError
general_nnbd_opt_out/duplicated_named_args_3: TextSerializationFailure # Was: Pass
-general_nnbd_opt_out/dynamic_and_void: InstrumentationMismatch # Test assumes Dart 1.0 semantics
+general_nnbd_opt_out/dynamic_and_void: TextSerializationFailure
general_nnbd_opt_out/error_locations/error_location_01: TextSerializationFailure
general_nnbd_opt_out/error_locations/error_location_02: TextSerializationFailure
general_nnbd_opt_out/error_locations/error_location_03: TextSerializationFailure
@@ -644,10 +646,10 @@
general_nnbd_opt_out/unused_methods: TextSerializationFailure # Was: Pass
general_nnbd_opt_out/var_as_type_name: TextSerializationFailure # Was: Pass
general_nnbd_opt_out/void_methods: TextSerializationFailure
-general_nnbd_opt_out/warn_unresolved_sends: InstrumentationMismatch # Test assumes Dart 1.0 semantics
+general_nnbd_opt_out/warn_unresolved_sends: TextSerializationFailure
implicit_getter_calls/getter_call: TextSerializationFailure
implicit_getter_calls/this_field_call: TextSerializationFailure
-inference/abstract_class_instantiation: InstrumentationMismatch # Issue #30040
+inference/abstract_class_instantiation: TextSerializationFailure
inference/assert: TextSerializationFailure # Was: Pass
inference/assert_initializer: TextSerializationFailure # Was: Pass
inference/assign_local: TextSerializationFailure # Was: Pass
@@ -704,7 +706,7 @@
inference/constructors_infer_from_arguments_argument_not_assignable: TypeCheckError
inference/constructors_infer_from_arguments_const: TextSerializationFailure # Was: Pass
inference/constructors_infer_from_arguments_const_with_upper_bound: TextSerializationFailure # Was: Pass
-inference/constructors_infer_from_arguments_downwards_from_constructor: TextSerializationFailure # Was: Pass
+inference/constructors_infer_from_arguments_downwards_from_constructor: TextSerializationFailure
inference/constructors_infer_from_arguments_factory: TextSerializationFailure # Was: Pass
inference/constructors_infer_from_arguments_factory_calls_constructor: TextSerializationFailure # Was: Pass
inference/constructors_infer_from_arguments_named: TextSerializationFailure # Was: Pass
@@ -714,7 +716,7 @@
inference/constructors_infer_from_arguments_redirecting_factory_to_factory: TextSerializationFailure # Was: Pass
inference/constructors_inference_f_bounded: TextSerializationFailure # Was: Pass
inference/constructors_reverse_type_parameters: TextSerializationFailure # Was: Pass
-inference/constructors_too_many_positional_arguments: InstrumentationMismatch # Issue #30040
+inference/constructors_too_many_positional_arguments: TextSerializationFailure
inference/do_not_infer_overridden_fields_that_explicitly_say_dynamic_infer: TypeCheckError
inference/dont_infer_field_type_when_initializer_is_null: TextSerializationFailure # Was: Pass
inference/dont_infer_type_on_dynamic: TextSerializationFailure # Was: Pass
@@ -729,7 +731,7 @@
inference/downwards_inference_annotations_locals_referring_to_locals: TextSerializationFailure # Was: Pass
inference/downwards_inference_annotations_parameter: TextSerializationFailure # Was: Pass
inference/downwards_inference_annotations_parameter_local: TextSerializationFailure # Was: Pass
-inference/downwards_inference_annotations_type_variable: InstrumentationMismatch # Issue 28981
+inference/downwards_inference_annotations_type_variable: TextSerializationFailure
inference/downwards_inference_annotations_type_variable_local: TextSerializationFailure # Was: Pass
inference/downwards_inference_annotations_typedef: TextSerializationFailure # Was: Pass
inference/downwards_inference_assignment_statements: TextSerializationFailure # Was: Pass
@@ -741,7 +743,7 @@
inference/downwards_inference_on_constructor_arguments_infer_downwards: TextSerializationFailure # Was: Pass
inference/downwards_inference_on_function_arguments_infer_downwards: TextSerializationFailure # Was: Pass
inference/downwards_inference_on_function_expressions: TextSerializationFailure # Was: Pass
-inference/downwards_inference_on_function_of_t_using_the_t: InstrumentationMismatch # Issue #29798
+inference/downwards_inference_on_function_of_t_using_the_t: TextSerializationFailure
inference/downwards_inference_on_generic_constructor_arguments_empty_list: TextSerializationFailure # Was: Pass
inference/downwards_inference_on_generic_constructor_arguments_infer_downwards: TextSerializationFailure # Was: Pass
inference/downwards_inference_on_generic_function_expressions: TextSerializationFailure # Was: Pass
@@ -776,7 +778,7 @@
inference/future_then_conditional_5: TextSerializationFailure # Was: Pass
inference/future_then_conditional_6: TextSerializationFailure # Was: Pass
inference/future_then_downwards_method_target: TextSerializationFailure # Was: Pass
-inference/future_then_explicit_future: InstrumentationMismatch # Issue #30040
+inference/future_then_explicit_future: TextSerializationFailure
inference/future_then_ifNull: TextSerializationFailure # Was: Pass
inference/future_then_upwards: TextSerializationFailure # Was: RuntimeError
inference/future_then_upwards_2: TextSerializationFailure # Was: RuntimeError
@@ -792,7 +794,7 @@
inference/future_union_downwards_generic_method_with_generic_return: TextSerializationFailure # Was: Pass
inference/future_union_upwards_generic_methods: TextSerializationFailure # Was: Pass
inference/generator_closure: TextSerializationFailure # Was: Pass
-inference/generic_functions_return_typedef: InstrumentationMismatch # Issue #29798
+inference/generic_functions_return_typedef: TextSerializationFailure
inference/generic_methods_basic_downward_inference: TextSerializationFailure # Was: Pass
inference/generic_methods_correctly_recognize_generic_upper_bound: TypeCheckError
inference/generic_methods_dart_math_min_max: TextSerializationFailure # Was: Pass
@@ -805,7 +807,7 @@
inference/generic_methods_infer_generic_function_return_type: TextSerializationFailure # Was: Pass
inference/generic_methods_infer_generic_instantiation: TextSerializationFailure # Was: Pass
inference/generic_methods_infer_generic_method_type: TextSerializationFailure # Was: Pass
-inference/generic_methods_infer_js_builtin: InstrumentationMismatch # Issue #30029
+inference/generic_methods_infer_js_builtin: TextSerializationFailure
inference/generic_methods_inference_error: TextSerializationFailure # Was: Pass
inference/generic_methods_iterable_and_future: TextSerializationFailure # Was: Pass
inference/generic_methods_nested_generic_instantiation: TextSerializationFailure # Was: Pass
@@ -1067,12 +1069,10 @@
inference/unsafe_block_closure_inference_constructor_call_implicit_type_param: TextSerializationFailure # Was: Pass
inference/unsafe_block_closure_inference_constructor_call_no_type_param: TextSerializationFailure # Was: Pass
inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param: TextSerializationFailure # Was: Pass
-inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1: InstrumentationMismatch # Issue #25824
-inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr2: InstrumentationMismatch # Issue #25824
+inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1: TextSerializationFailure
inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr2: TextSerializationFailure
inference/unsafe_block_closure_inference_function_call_explicit_type_param: TextSerializationFailure # Was: Pass
-inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1: InstrumentationMismatch # Issue #25824
-inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr2: InstrumentationMismatch # Issue #25824
+inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1: TextSerializationFailure
inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr2: TextSerializationFailure
inference/unsafe_block_closure_inference_function_call_implicit_type_param: TextSerializationFailure # Was: Pass
inference/unsafe_block_closure_inference_function_call_implicit_type_param_via_expr: TextSerializationFailure # Was: Pass
@@ -1296,6 +1296,10 @@
nnbd/issue40805: TextSerializationFailure
nnbd/issue41102: TextSerializationFailure
nnbd/issue41103: TextSerializationFailure
+nnbd/issue41156: TextSerializationFailure
+nnbd/issue41180: TextSerializationFailure
+nnbd/issue41210a/issue41210: TypeCheckError
+nnbd/issue41210b: TypeCheckError
nnbd/issue_39286: TextSerializationFailure
nnbd/issue_39286_2: TextSerializationFailure
nnbd/late: TextSerializationFailure
diff --git a/pkg/front_end/testcases/weak.status b/pkg/front_end/testcases/weak.status
index 76ab3a5..4a52efa 100644
--- a/pkg/front_end/testcases/weak.status
+++ b/pkg/front_end/testcases/weak.status
@@ -13,12 +13,10 @@
general_nnbd_opt_out/abstract_members: TypeCheckError
general_nnbd_opt_out/accessors: RuntimeError
general_nnbd_opt_out/ambiguous_exports: RuntimeError # Expected, this file exports two main methods.
-general_nnbd_opt_out/argument_mismatch: InstrumentationMismatch # Test assumes Dart 1.0 semantics
general_nnbd_opt_out/await_in_non_async: RuntimeError # Expected.
general_nnbd_opt_out/bug21938: TypeCheckError
general_nnbd_opt_out/bug30695: TypeCheckError
general_nnbd_opt_out/bug31124: RuntimeError # Test has no main method (and we shouldn't add one).
-general_nnbd_opt_out/bug32629: InstrumentationMismatch # Test has an intentional error
general_nnbd_opt_out/call: TypeCheckError
general_nnbd_opt_out/candidate_found: TypeCheckError
general_nnbd_opt_out/cascade: RuntimeError
@@ -26,7 +24,6 @@
general_nnbd_opt_out/covariant_generic: RuntimeError
general_nnbd_opt_out/duplicated_declarations: TypeCheckError
general_nnbd_opt_out/duplicated_field_initializer: RuntimeError
-general_nnbd_opt_out/dynamic_and_void: InstrumentationMismatch # Test assumes Dart 1.0 semantics
general_nnbd_opt_out/error_locations/error_location_01: RuntimeError
general_nnbd_opt_out/error_locations/error_location_02: RuntimeError
general_nnbd_opt_out/error_locations/error_location_03: RuntimeError
@@ -61,8 +58,9 @@
general_nnbd_opt_out/type_variable_bound_access: TypeCheckError
general_nnbd_opt_out/unsound_promotion: TypeCheckError
general_nnbd_opt_out/void_methods: RuntimeError
-general_nnbd_opt_out/warn_unresolved_sends: InstrumentationMismatch # Test assumes Dart 1.0 semantics
nnbd/inheritance_from_opt_in: TypeCheckError
nnbd/messages_with_types_opt_in: TypeCheckError
nnbd/messages_with_types_opt_out: TypeCheckError
-nnbd/never_opt_out: TypeCheckError
\ No newline at end of file
+nnbd/never_opt_out: TypeCheckError
+nnbd/issue41210a/issue41210: TypeCheckError
+nnbd/issue41210b: TypeCheckError
diff --git a/pkg/front_end/tool/update_all.dart b/pkg/front_end/tool/update_all.dart
new file mode 100644
index 0000000..a4ff797
--- /dev/null
+++ b/pkg/front_end/tool/update_all.dart
@@ -0,0 +1,31 @@
+// Copyright (c) 2020, 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.
+
+import 'package:_fe_analyzer_shared/src/testing/id_testing.dart' as id;
+import 'update_expectations.dart' as expectations;
+
+const List<String> idTests = <String>[
+ 'pkg/front_end/test/covariance_check/covariance_check_test.dart',
+ 'pkg/front_end/test/extensions/extensions_test.dart',
+ 'pkg/front_end/test/id_testing/id_testing_test.dart',
+ 'pkg/front_end/test/id_tests/assigned_variables_test.dart',
+ 'pkg/front_end/test/id_tests/constant_test.dart',
+ 'pkg/front_end/test/id_tests/definite_assignment_test.dart',
+ 'pkg/front_end/test/id_tests/definite_unassignment_test.dart',
+ 'pkg/front_end/test/id_tests/inheritance_test.dart',
+ 'pkg/front_end/test/id_tests/nullability_test.dart',
+ 'pkg/front_end/test/id_tests/reachability_test.dart',
+ 'pkg/front_end/test/id_tests/type_promotion_test.dart',
+ 'pkg/front_end/test/language_versioning/language_versioning_test.dart',
+ 'pkg/front_end/test/patching/patching_test.dart',
+ 'pkg/front_end/test/static_types/static_type_test.dart',
+];
+
+main() async {
+ // Update all tests based on expectation files.
+ await expectations.main(const <String>[]);
+
+ // Update all id-tests.
+ await id.updateAllTests(idTests);
+}
diff --git a/pkg/front_end/tool/update_expectations.dart b/pkg/front_end/tool/update_expectations.dart
new file mode 100644
index 0000000..6cf4c83
--- /dev/null
+++ b/pkg/front_end/tool/update_expectations.dart
@@ -0,0 +1,66 @@
+// Copyright (c) 2020, 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.
+
+import 'fasta.dart' as fasta;
+
+const List<String> standardSuites = <String>[
+ 'strong',
+ 'outline',
+ 'weak',
+ 'text_serialization',
+];
+
+const List<String> specialSuites = <String>[
+ 'expression',
+ 'incremental_load_from_dill',
+];
+
+Future<void> runStandardSuites([List<String> args]) async {
+ // Assert that 'strong' is the first suite - we use the assumption below.
+ assert(standardSuites.first == 'strong', "Suite 'strong' most be the first.");
+ bool first = true;
+ for (String suite in standardSuites) {
+ List<String> tests = args == null
+ ? [suite]
+ : args.map((String arg) => '${suite}/$arg').toList();
+ await fasta.main([
+ 'testing',
+ ...tests,
+ // Only update comments in the first suite. Note that this only works
+ // if the first compilation is a full compilation, i.e. not outline,
+ // because comments are generated during body building and inference.
+ if (first)
+ '-DupdateComments=true',
+ '-DupdateExpectations=true'
+ ]);
+ first = false;
+ }
+}
+
+main(List<String> args) async {
+ if (args.isEmpty) {
+ await runStandardSuites();
+ for (String suite in specialSuites) {
+ await fasta.main(['testing', suite, '-DupdateExpectations=true']);
+ }
+ } else {
+ List<String> standardTests = <String>[];
+ for (String arg in args) {
+ bool isSpecial = false;
+ for (String suite in specialSuites) {
+ if (arg.startsWith('$suite/')) {
+ await fasta.main(['testing', arg, '-DupdateExpectations=true']);
+ isSpecial = true;
+ break;
+ }
+ }
+ if (!isSpecial) {
+ standardTests.add(arg);
+ }
+ }
+ if (standardTests.isNotEmpty) {
+ await runStandardSuites(args);
+ }
+ }
+}
diff --git a/pkg/frontend_server/lib/frontend_server.dart b/pkg/frontend_server/lib/frontend_server.dart
index 3cfa8b2..17ea976 100644
--- a/pkg/frontend_server/lib/frontend_server.dart
+++ b/pkg/frontend_server/lib/frontend_server.dart
@@ -451,6 +451,7 @@
compilerOptions.target = createFrontEndTarget(
options['target'],
trackWidgetCreation: options['track-widget-creation'],
+ nullSafety: options['null-safety'],
);
if (compilerOptions.target == null) {
print('Failed to create front-end target ${options['target']}.');
diff --git a/pkg/kernel/lib/ast.dart b/pkg/kernel/lib/ast.dart
index 3cce979..846cd93 100644
--- a/pkg/kernel/lib/ast.dart
+++ b/pkg/kernel/lib/ast.dart
@@ -81,77 +81,14 @@
import 'type_algebra.dart';
import 'type_environment.dart';
import 'src/assumptions.dart';
+import 'src/text_util.dart';
-String _debugNullability(Nullability nullability) {
- switch (nullability) {
- case Nullability.legacy:
- return '*';
- case Nullability.nullable:
- return '?';
- case Nullability.undetermined:
- return '%';
- case Nullability.nonNullable:
- return '';
- }
- throw "Unknown Nullability: $nullability";
-}
+/// Set this `true` to use fully qualified names in types for debugging.
+const bool _verboseTypeToString = false;
-String _debugLibraryName(Library node) {
- return node == null ? 'null' : node.name ?? 'library ${node.importUri}';
-}
-
-String _debugQualifiedClassName(Class node) {
- return _debugLibraryName(node.enclosingLibrary) +
- '::' +
- _debugClassName(node);
-}
-
-String _debugClassName(Class node) {
- return node == null
- ? 'null'
- : node.name ?? 'null-named class ${node.runtimeType} ${node.hashCode}';
-}
-
-String _debugQualifiedMemberName(Member node) {
- if (node.enclosingClass != null) {
- return _debugQualifiedClassName(node.enclosingClass) +
- '::' +
- _debugMemberName(node);
- } else {
- return _debugLibraryName(node.enclosingLibrary) +
- '::' +
- _debugMemberName(node);
- }
-}
-
-String _debugMemberName(Member node) {
- return node.name?.name ??
- "null-named member ${node.runtimeType} ${node.hashCode}";
-}
-
-String _debugVariableDeclarationName(VariableDeclaration node) {
- return node.name ??
- "null-named VariableDeclaration ${node.runtimeType} ${node.hashCode}";
-}
-
-String _debugQualifiedTypeParameterName(TypeParameter node) {
- if (node.parent is Class) {
- return _debugQualifiedClassName(node.parent) +
- '::' +
- _debugTypeParameterName(node);
- }
- if (node.parent is Member) {
- return _debugQualifiedMemberName(node.parent) +
- '::' +
- _debugTypeParameterName(node);
- }
- return _debugTypeParameterName(node);
-}
-
-String _debugTypeParameterName(TypeParameter node) {
- return node.name ??
- "null-named TypeParameter ${node.runtimeType} ${node.hashCode}";
-}
+/// Set this `true` to use fully qualified names in classes, extensions,
+/// typedefs and members for debugging.
+const bool _verboseMemberToString = false;
/// Any type of node in the IR.
abstract class Node {
@@ -170,6 +107,17 @@
/// Returns the textual representation of this node for use in debugging.
///
+ /// [toStringInternal] should only be used for debugging, but should not leak.
+ ///
+ /// The data is generally bare-bones, but can easily be updated for your
+ /// specific debugging needs.
+ ///
+ /// This method is called internally by toString methods to create conciser
+ /// textual representations.
+ String toStringInternal();
+
+ /// Returns the textual representation of this node for use in debugging.
+ ///
/// Note that this adds some nodes to a static map to ensure consistent
/// naming, but that it thus also leaks memory. [leakingDebugToString] should
/// thus only be used for debugging and short-running test tools.
@@ -324,11 +272,15 @@
}
String toString() {
+ return "Reference to ${toStringInternal()}";
+ }
+
+ String toStringInternal() {
if (canonicalName != null) {
- return 'Reference to $canonicalName';
+ return '${canonicalName.toStringInternal()}';
}
if (node != null) {
- return 'Reference to $node';
+ return node.toStringInternal();
}
return 'Unbound reference';
}
@@ -685,7 +637,8 @@
/// Returns a possibly synthesized name for this library, consistent with
/// the names across all [toString] calls.
- String toString() => _debugLibraryName(this);
+ String toString() => libraryNameToString(this);
+ String toStringInternal() => libraryNameToString(this);
Location _getLocationInEnclosingFile(int offset) {
return _getLocationInComponent(enclosingComponent, fileUri, offset);
@@ -771,7 +724,12 @@
@override
String toString() {
- return "LibraryDependency()";
+ return "LibraryDependency(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -804,7 +762,12 @@
@override
String toString() {
- return "LibraryPart()";
+ return "LibraryPart(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -833,7 +796,12 @@
@override
String toString() {
- return "Combinator()";
+ return "Combinator(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -905,7 +873,13 @@
@override
String toString() {
- return "Typedef()";
+ return "Typedef(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return qualifiedTypedefNameToString(this,
+ includeLibraryName: _verboseMemberToString);
}
}
@@ -1418,7 +1392,14 @@
/// Returns a possibly synthesized name for this class, consistent with
/// the names used across all [toString] calls.
- String toString() => _debugQualifiedClassName(this);
+ // TODO(johnniwinther): Remove test dependencies on Class.toString();
+ @override
+ String toString() =>
+ qualifiedClassNameToString(this, includeLibraryName: true);
+
+ @override
+ String toStringInternal() => qualifiedClassNameToString(this,
+ includeLibraryName: _verboseMemberToString);
visitChildren(Visitor v) {
visitList(annotations, v);
@@ -1519,7 +1500,13 @@
@override
String toString() {
- return "Extension()";
+ return "Extension(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return qualifiedExtensionNameToString(this,
+ includeLibraryName: _verboseMemberToString);
}
}
@@ -1681,7 +1668,12 @@
/// Returns a possibly synthesized name for this member, consistent with
/// the names used across all [toString] calls.
- String toString() => _debugQualifiedMemberName(this);
+ @override
+ String toString() => toStringInternal();
+
+ @override
+ String toStringInternal() => qualifiedMemberNameToString(this,
+ includeLibraryName: _verboseMemberToString);
void addAnnotation(Expression node) {
if (annotations.isEmpty) {
@@ -2460,7 +2452,12 @@
@override
String toString() {
- return "InvalidInitializer()";
+ return "InvalidInitializer(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -2506,7 +2503,12 @@
@override
String toString() {
- return "FieldInitializer()";
+ return "FieldInitializer(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -2553,7 +2555,12 @@
@override
String toString() {
- return "SuperInitializer()";
+ return "SuperInitializer(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -2596,7 +2603,12 @@
@override
String toString() {
- return "RedirectingInitializer()";
+ return "RedirectingInitializer(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -2626,7 +2638,12 @@
@override
String toString() {
- return "LocalInitializer()";
+ return "LocalInitializer(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -2650,7 +2667,12 @@
@override
String toString() {
- return "AssertInitializer()";
+ return "AssertInitializer(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -2804,7 +2826,12 @@
@override
String toString() {
- return "FunctionNode()";
+ return "FunctionNode(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -2935,7 +2962,12 @@
@override
String toString() {
- return "InvalidExpression()";
+ return "InvalidExpression(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -2966,7 +2998,12 @@
@override
String toString() {
- return "VariableGet()";
+ return "VariableGet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -3001,7 +3038,12 @@
@override
String toString() {
- return "VariableSet()";
+ return "VariableSet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -3066,7 +3108,12 @@
@override
String toString() {
- return "PropertyGet($receiver.$name)";
+ return "PropertyGet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "${receiver.toStringInternal()}.${name.toStringInternal()}";
}
}
@@ -3126,7 +3173,12 @@
@override
String toString() {
- return "PropertySet()";
+ return "PropertySet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -3173,7 +3225,12 @@
@override
String toString() {
- return "DirectPropertyGet()";
+ return "DirectPropertyGet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -3226,7 +3283,12 @@
@override
String toString() {
- return "DirectPropertySet()";
+ return "DirectPropertySet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -3292,7 +3354,12 @@
@override
String toString() {
- return "DirectMethodInvocation()";
+ return "DirectMethodInvocation(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -3345,7 +3412,12 @@
@override
String toString() {
- return "SuperPropertyGet()";
+ return "SuperPropertyGet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -3396,7 +3468,12 @@
@override
String toString() {
- return "SuperPropertySet()";
+ return "SuperPropertySet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -3429,7 +3506,12 @@
@override
String toString() {
- return "StaticGet()";
+ return "StaticGet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -3475,7 +3557,12 @@
@override
String toString() {
- return "StaticSet()";
+ return "StaticSet(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -3527,7 +3614,13 @@
@override
String toString() {
- return "Arguments()";
+ return "Arguments(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ // TODO(jensj): Make (much) better.
+ return "";
}
}
@@ -3555,7 +3648,12 @@
@override
String toString() {
- return "NamedExpression()";
+ return "NamedExpression(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -3689,7 +3787,12 @@
@override
String toString() {
- return "MethodInvocation()";
+ return "MethodInvocation(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -3749,7 +3852,12 @@
@override
String toString() {
- return "SuperMethodInvocation()";
+ return "SuperMethodInvocation(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -3805,7 +3913,13 @@
@override
String toString() {
- return "StaticInvocation($targetReference, $arguments)";
+ return "StaticInvocation(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "${targetReference.toStringInternal()}, "
+ "${arguments.toStringInternal()}";
}
}
@@ -3877,7 +3991,12 @@
@override
String toString() {
- return "ConstructorInvocation()";
+ return "ConstructorInvocation(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -3915,7 +4034,12 @@
@override
String toString() {
- return "Instantiation()";
+ return "Instantiation(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -3949,7 +4073,12 @@
@override
String toString() {
- return "Not()";
+ return "Not(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -3989,7 +4118,12 @@
@override
String toString() {
- return "LogicalExpression()";
+ return "LogicalExpression(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -4042,7 +4176,14 @@
@override
String toString() {
- return "ConditionalExpression($condition ? $then : $otherwise)";
+ return "ConditionalExpression(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "${condition.toStringInternal()} ? "
+ "${then.toStringInternal()} : "
+ "${otherwise.toStringInternal()}";
}
}
@@ -4077,7 +4218,12 @@
@override
String toString() {
- return "StringConcatenation()";
+ return "StringConcatenation(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -4116,7 +4262,12 @@
@override
String toString() {
- return "ListConcatenation()";
+ return "ListConcatenation(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -4158,7 +4309,12 @@
@override
String toString() {
- return "SetConcatenation()";
+ return "SetConcatenation(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -4206,7 +4362,12 @@
@override
String toString() {
- return "MapConcatenation()";
+ return "MapConcatenation(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -4270,7 +4431,12 @@
@override
String toString() {
- return "InstanceCreation()";
+ return "InstanceCreation(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -4312,7 +4478,12 @@
@override
String toString() {
- return "FileUriExpression()";
+ return "FileUriExpression(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -4364,7 +4535,12 @@
@override
String toString() {
- return "IsExpression()";
+ return "IsExpression(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -4461,7 +4637,12 @@
@override
String toString() {
- return "AsExpression($operand as $type)";
+ return "AsExpression(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "${operand.toStringInternal()} as ${type.toStringInternal()}";
}
}
@@ -4500,7 +4681,12 @@
@override
String toString() {
- return "NullCheck()";
+ return "NullCheck(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -4526,7 +4712,12 @@
@override
String toString() {
- return "StringLiteral($value)";
+ return "StringLiteral(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "$value";
}
}
@@ -4548,7 +4739,12 @@
@override
String toString() {
- return "IntLiteral($value)";
+ return "IntLiteral(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "$value";
}
}
@@ -4566,7 +4762,12 @@
@override
String toString() {
- return "DoubleLiteral($value)";
+ return "DoubleLiteral(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "$value";
}
}
@@ -4584,7 +4785,12 @@
@override
String toString() {
- return "BoolLiteral($value)";
+ return "BoolLiteral(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "$value";
}
}
@@ -4600,7 +4806,12 @@
@override
String toString() {
- return "NullLiteral()";
+ return "NullLiteral(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "null";
}
}
@@ -4621,7 +4832,12 @@
@override
String toString() {
- return "SymbolLiteral(#$value)";
+ return "SymbolLiteral(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "#$value";
}
}
@@ -4647,7 +4863,12 @@
@override
String toString() {
- return "TypeLiteral($type)";
+ return "TypeLiteral(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "${type.toStringInternal()}";
}
}
@@ -4663,7 +4884,12 @@
@override
String toString() {
- return "ThisExpression()";
+ return "ThisExpression(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -4682,7 +4908,12 @@
@override
String toString() {
- return "Rethrow()";
+ return "Rethrow(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -4714,7 +4945,12 @@
@override
String toString() {
- return "Throw()";
+ return "Throw(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -4749,7 +4985,12 @@
@override
String toString() {
- return "ListLiteral()";
+ return "ListLiteral(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -4784,7 +5025,12 @@
@override
String toString() {
- return "SetLiteral()";
+ return "SetLiteral(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -4826,7 +5072,12 @@
@override
String toString() {
- return "MapLiteral()";
+ return "MapLiteral(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -4859,7 +5110,12 @@
@override
String toString() {
- return "MapEntry()";
+ return "MapEntry(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -4892,7 +5148,12 @@
@override
String toString() {
- return "AwaitExpression()";
+ return "AwaitExpression(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -4932,7 +5193,12 @@
@override
String toString() {
- return "FunctionExpression()";
+ return "FunctionExpression(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -4962,7 +5228,12 @@
@override
String toString() {
- return "ConstantExpression()";
+ return "ConstantExpression(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -5000,7 +5271,12 @@
@override
String toString() {
- return "Let()";
+ return "Let(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -5038,7 +5314,12 @@
@override
String toString() {
- return "BlockExpression()";
+ return "BlockExpression(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -5074,7 +5355,12 @@
@override
String toString() {
- return "LoadLibrary()";
+ return "LoadLibrary(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -5098,7 +5384,12 @@
@override
String toString() {
- return "CheckLibraryIsLoaded()";
+ return "CheckLibraryIsLoaded(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -5135,7 +5426,12 @@
@override
String toString() {
- return "ExpressionStatement()";
+ return "ExpressionStatement(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -5169,7 +5465,12 @@
@override
String toString() {
- return "Block()";
+ return "Block(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -5209,7 +5510,12 @@
@override
String toString() {
- return "AssertBlock()";
+ return "AssertBlock(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -5223,7 +5529,12 @@
@override
String toString() {
- return "EmptyStatement()";
+ return "EmptyStatement(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -5269,7 +5580,12 @@
@override
String toString() {
- return "AssertStatement()";
+ return "AssertStatement(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -5302,7 +5618,12 @@
@override
String toString() {
- return "LabeledStatement()";
+ return "LabeledStatement(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -5340,7 +5661,12 @@
@override
String toString() {
- return "BreakStatement()";
+ return "BreakStatement(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -5375,7 +5701,12 @@
@override
String toString() {
- return "WhileStatement()";
+ return "WhileStatement(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -5410,7 +5741,12 @@
@override
String toString() {
- return "DoStatement()";
+ return "DoStatement(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -5453,7 +5789,12 @@
@override
String toString() {
- return "ForStatement()";
+ return "ForStatement(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -5503,7 +5844,12 @@
@override
String toString() {
- return "ForInStatement()";
+ return "ForInStatement(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -5539,7 +5885,12 @@
@override
String toString() {
- return "SwitchStatement()";
+ return "SwitchStatement(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -5588,7 +5939,12 @@
@override
String toString() {
- return "SwitchCase()";
+ return "SwitchCase(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -5607,7 +5963,12 @@
@override
String toString() {
- return "ContinueSwitchStatement()";
+ return "ContinueSwitchStatement(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -5649,7 +6010,12 @@
@override
String toString() {
- return "IfStatement()";
+ return "IfStatement(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -5677,7 +6043,12 @@
@override
String toString() {
- return "ReturnStatement()";
+ return "ReturnStatement(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -5710,7 +6081,12 @@
@override
String toString() {
- return "TryCatch()";
+ return "TryCatch(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -5755,7 +6131,12 @@
@override
String toString() {
- return "Catch()";
+ return "Catch(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -5790,7 +6171,12 @@
@override
String toString() {
- return "TryFinally()";
+ return "TryFinally(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -5839,7 +6225,12 @@
@override
String toString() {
- return "YieldStatement()";
+ return "YieldStatement(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -6040,7 +6431,13 @@
/// Returns a possibly synthesized name for this variable, consistent with
/// the names used across all [toString] calls.
- String toString() => _debugVariableDeclarationName(this);
+ String toString() {
+ return "VariableDeclaration(${toStringInternal()})";
+ }
+
+ String toStringInternal() {
+ return name ?? "null-named VariableDeclaration (${hashCode})";
+ }
}
/// Declaration a local function.
@@ -6077,7 +6474,12 @@
@override
String toString() {
- return "FunctionDeclaration()";
+ return "FunctionDeclaration(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -6143,7 +6545,8 @@
: this.libraryName = libraryName,
super._internal(_computeHashCode(name, libraryName), name);
- String toString() => library != null ? '$library::$name' : name;
+ String toString() => toStringInternal();
+ String toStringInternal() => library != null ? '$library::$name' : name;
Library get library => libraryName.asLibrary;
@@ -6162,7 +6565,8 @@
_PublicName(String name) : super._internal(name.hashCode, name);
- String toString() => name;
+ String toString() => toStringInternal();
+ String toStringInternal() => name;
}
// ------------------------------------------------------------------------
@@ -6298,6 +6702,11 @@
@override
String toString() {
+ return "InvalidType(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
return "invalid-type";
}
}
@@ -6332,6 +6741,11 @@
@override
String toString() {
+ return "DynamicType(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
return "dynamic";
}
}
@@ -6366,6 +6780,11 @@
@override
String toString() {
+ return "VoidType(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
return "void";
}
}
@@ -6405,7 +6824,12 @@
@override
String toString() {
- return "NeverType()";
+ return "NeverType(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -6439,6 +6863,11 @@
@override
String toString() {
+ return "BottomType(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
return "<BottomType>";
}
}
@@ -6528,7 +6957,29 @@
@override
String toString() {
- return "InterfaceType($className${_debugNullability(nullability)})";
+ return "InterfaceType(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ StringBuffer sb = new StringBuffer();
+ if (_verboseTypeToString) {
+ sb.write(className.toStringInternal());
+ } else {
+ sb.write(classNode.name);
+ }
+ if (typeArguments.isNotEmpty) {
+ sb.write("<");
+ String comma = "";
+ for (DartType typeArgument in typeArguments) {
+ sb.write(comma);
+ sb.write(typeArgument.toStringInternal());
+ comma = ", ";
+ }
+ sb.write(">");
+ }
+ sb.write(nullabilityToString(nullability));
+ return sb.toString();
}
}
@@ -6703,7 +7154,48 @@
@override
String toString() {
- return "FunctionType()";
+ return "FunctionType(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ StringBuffer sb = new StringBuffer();
+ sb.write(returnType.toStringInternal());
+ sb.write(" Function");
+ if (typeParameters.isNotEmpty) {
+ sb.write("<");
+ String comma = "";
+ for (TypeParameter typeParameter in typeParameters) {
+ sb.write(comma);
+ sb.write(typeParameter.toStringInternal());
+ comma = ", ";
+ }
+ sb.write(">");
+ }
+
+ sb.write("(");
+ for (int i = 0; i < positionalParameters.length; i++) {
+ if (i > 0) sb.write(", ");
+ if (i == requiredParameterCount) sb.write("[");
+ sb.write(positionalParameters[i].toStringInternal());
+ }
+ if (requiredParameterCount < positionalParameters.length) sb.write("]");
+
+ if (namedParameters.isNotEmpty) {
+ if (positionalParameters.isNotEmpty) {
+ sb.write(", ");
+ }
+ sb.write("{");
+ for (int i = 0; i < namedParameters.length; i++) {
+ if (i > 0) sb.write(", ");
+ sb.write(namedParameters[i].toStringInternal());
+ }
+ sb.write("}");
+ }
+ sb.write(")");
+ sb.write(nullabilityToString(nullability));
+
+ return sb.toString();
}
}
@@ -6796,7 +7288,24 @@
@override
String toString() {
- return "TypedefType()";
+ return "TypedefType(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ StringBuffer sb = new StringBuffer();
+ sb.write(typedefNode.toStringInternal());
+ if (typeArguments.isNotEmpty) {
+ sb.write("<");
+ String comma = "";
+ for (DartType typeArgument in typeArguments) {
+ sb.write(comma);
+ sb.write(typeArgument.toStringInternal());
+ comma = ", ";
+ }
+ sb.write(">");
+ }
+ return sb.toString();
}
}
@@ -6839,7 +7348,15 @@
@override
String toString() {
- return "NamedType()";
+ return "NamedType(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ StringBuffer sb = new StringBuffer();
+ if (isRequired) sb.write("required ");
+ sb.write("$name: ${type.toStringInternal()}");
+ return sb.toString();
}
}
@@ -7114,7 +7631,32 @@
@override
String toString() {
- return "TypeParameterType()";
+ return "TypeParameterType(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ StringBuffer sb = new StringBuffer();
+ sb.write(qualifiedTypeParameterNameToString(parameter,
+ includeLibraryName: _verboseTypeToString));
+ sb.write(nullabilityToString(typeParameterTypeNullability));
+ if (promotedBound != null) {
+ sb.write(" & ");
+ sb.write(promotedBound.toStringInternal());
+ sb.write(" /* '");
+ sb.write(nullabilityToString(typeParameterTypeNullability));
+ sb.write("' & '");
+ if (promotedBound is InvalidType) {
+ sb.write(nullabilityToString(Nullability.undetermined));
+ } else {
+ sb.write(nullabilityToString(promotedBound.nullability));
+ }
+ sb.write("' = '");
+ sb.write(nullabilityToString(nullability));
+ sb.write("' */");
+ }
+
+ return sb.toString();
}
}
@@ -7317,7 +7859,14 @@
/// Returns a possibly synthesized name for this type parameter, consistent
/// with the names used across all [toString] calls.
- String toString() => _debugQualifiedTypeParameterName(this);
+ String toString() {
+ return "TypeParameter(${toStringInternal()})";
+ }
+
+ String toStringInternal() {
+ return qualifiedTypeParameterNameToString(this,
+ includeLibraryName: _verboseMemberToString);
+ }
bool get isFunctionTypeTypeParameter => parent == null;
}
@@ -7368,7 +7917,12 @@
@override
String toString() {
- return "Supertype()";
+ return "Supertype(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -7409,7 +7963,8 @@
PrimitiveConstant(this.value);
- String toString() => '$value';
+ String toString() => toStringInternal();
+ String toStringInternal() => '$value';
int get hashCode => value.hashCode;
@@ -7491,7 +8046,9 @@
R accept<R>(ConstantVisitor<R> v) => v.visitSymbolConstant(this);
R acceptReference<R>(Visitor<R> v) => v.visitSymbolConstantReference(this);
- String toString() {
+ String toString() => toStringInternal();
+
+ String toStringInternal() {
return libraryReference != null
? '#${libraryReference.asLibrary.importUri}::$name'
: '#$name';
@@ -7528,7 +8085,10 @@
R accept<R>(ConstantVisitor<R> v) => v.visitMapConstant(this);
R acceptReference<R>(Visitor<R> v) => v.visitMapConstantReference(this);
- String toString() => '${this.runtimeType}<$keyType, $valueType>($entries)';
+ String toString() => toStringInternal();
+ String toStringInternal() {
+ return '${this.runtimeType}<$keyType, $valueType>($entries)';
+ }
int _cachedHashCode;
int get hashCode {
@@ -7552,7 +8112,8 @@
final Constant value;
ConstantMapEntry(this.key, this.value);
- String toString() => '$key: $value';
+ String toString() => toStringInternal();
+ String toStringInternal() => '$key: $value';
int get hashCode => _Hash.hash2(key, value);
@@ -7576,7 +8137,10 @@
R accept<R>(ConstantVisitor<R> v) => v.visitListConstant(this);
R acceptReference<R>(Visitor<R> v) => v.visitListConstantReference(this);
- String toString() => '${this.runtimeType}<$typeArgument>($entries)';
+ String toString() => toStringInternal();
+ String toStringInternal() {
+ return '${runtimeType}<${typeArgument.toStringInternal()}>($entries)';
+ }
int _cachedHashCode;
int get hashCode {
@@ -7610,7 +8174,10 @@
R accept<R>(ConstantVisitor<R> v) => v.visitSetConstant(this);
R acceptReference<R>(Visitor<R> v) => v.visitSetConstantReference(this);
- String toString() => '${this.runtimeType}<$typeArgument>($entries)';
+ String toString() => toStringInternal();
+ String toStringInternal() {
+ return '${runtimeType}<${typeArgument.toStringInternal()}>($entries)';
+ }
int _cachedHashCode;
int get hashCode {
@@ -7651,12 +8218,13 @@
R accept<R>(ConstantVisitor<R> v) => v.visitInstanceConstant(this);
R acceptReference<R>(Visitor<R> v) => v.visitInstanceConstantReference(this);
- String toString() {
+ String toString() => toStringInternal();
+ String toStringInternal() {
final sb = new StringBuffer();
sb.write('${classReference.asClass}');
if (!classReference.asClass.typeParameters.isEmpty) {
sb.write('<');
- sb.write(typeArguments.map((type) => type.toString()).join(', '));
+ sb.write(typeArguments.map((type) => type.toStringInternal()).join(', '));
sb.write('>');
}
sb.write(' {');
@@ -7703,8 +8271,10 @@
R acceptReference<R>(Visitor<R> v) =>
v.visitPartialInstantiationConstantReference(this);
- String toString() {
- return '${runtimeType}(${tearOffConstant.procedure}<${types.join(', ')}>)';
+ String toString() => toStringInternal();
+ String toStringInternal() {
+ return '${runtimeType}(${tearOffConstant.procedure}<'
+ '${types.map((t) => t.toStringInternal()).join(', ')}>)';
}
int get hashCode => _Hash.combineFinish(
@@ -7745,7 +8315,8 @@
R accept<R>(ConstantVisitor<R> v) => v.visitTearOffConstant(this);
R acceptReference<R>(Visitor<R> v) => v.visitTearOffConstantReference(this);
- String toString() {
+ String toString() => toStringInternal();
+ String toStringInternal() {
return '${runtimeType}(${procedure})';
}
@@ -7774,7 +8345,8 @@
R acceptReference<R>(Visitor<R> v) =>
v.visitTypeLiteralConstantReference(this);
- String toString() => '${runtimeType}(${type})';
+ String toString() => toStringInternal();
+ String toStringInternal() => '${runtimeType}(${type})';
int get hashCode => type.hashCode;
@@ -7809,7 +8381,12 @@
@override
String toString() {
- return "UnevaluatedConstant()";
+ return "UnevaluatedConstant(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
@@ -7952,7 +8529,12 @@
@override
String toString() {
- return "Component()";
+ return "Component(${toStringInternal()})";
+ }
+
+ @override
+ String toStringInternal() {
+ return "";
}
}
diff --git a/pkg/kernel/lib/canonical_name.dart b/pkg/kernel/lib/canonical_name.dart
index 71a42bf..c7e7067 100644
--- a/pkg/kernel/lib/canonical_name.dart
+++ b/pkg/kernel/lib/canonical_name.dart
@@ -200,6 +200,11 @@
}
String toString() => _parent == null ? 'root' : '$parent::$name';
+ String toStringInternal() {
+ if (isRoot) return "";
+ if (parent.isRoot) return "$name";
+ return "${parent.toStringInternal()}::$name";
+ }
Reference getReference() {
return reference ??= (new Reference()..canonicalName = this);
diff --git a/pkg/kernel/lib/src/text_util.dart b/pkg/kernel/lib/src/text_util.dart
new file mode 100644
index 0000000..28e7717
--- /dev/null
+++ b/pkg/kernel/lib/src/text_util.dart
@@ -0,0 +1,123 @@
+// Copyright (c) 2020, 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.
+
+import '../ast.dart';
+
+String nullabilityToString(Nullability nullability) {
+ switch (nullability) {
+ case Nullability.legacy:
+ return '*';
+ case Nullability.nullable:
+ return '?';
+ case Nullability.undetermined:
+ return '%';
+ case Nullability.nonNullable:
+ return '';
+ }
+ throw "Unknown Nullability: $nullability";
+}
+
+String libraryNameToString(Library node) {
+ return node == null ? 'null' : node.name ?? 'library ${node.importUri}';
+}
+
+String qualifiedClassNameToString(Class node,
+ {bool includeLibraryName: false}) {
+ if (includeLibraryName) {
+ return libraryNameToString(node.enclosingLibrary) +
+ '::' +
+ classNameToString(node);
+ } else {
+ return classNameToString(node);
+ }
+}
+
+String classNameToString(Class node) {
+ return node == null
+ ? 'null'
+ : node.name ?? 'null-named class ${node.runtimeType} ${node.hashCode}';
+}
+
+String qualifiedExtensionNameToString(Extension node,
+ {bool includeLibraryName: false}) {
+ if (includeLibraryName) {
+ return libraryNameToString(node.enclosingLibrary) +
+ '::' +
+ extensionNameToString(node);
+ } else {
+ return extensionNameToString(node);
+ }
+}
+
+String extensionNameToString(Extension node) {
+ return node == null
+ ? 'null'
+ : node.name ??
+ 'null-named extension ${node.runtimeType} ${node.hashCode}';
+}
+
+String qualifiedTypedefNameToString(Typedef node,
+ {bool includeLibraryName: false}) {
+ if (includeLibraryName) {
+ return libraryNameToString(node.enclosingLibrary) +
+ '::' +
+ typedefNameToString(node);
+ } else {
+ return typedefNameToString(node);
+ }
+}
+
+String typedefNameToString(Typedef node) {
+ return node == null
+ ? 'null'
+ : node.name ?? 'null-named typedef ${node.runtimeType} ${node.hashCode}';
+}
+
+String qualifiedMemberNameToString(Member node,
+ {bool includeLibraryName: false}) {
+ if (node.enclosingClass != null) {
+ return qualifiedClassNameToString(node.enclosingClass,
+ includeLibraryName: includeLibraryName) +
+ '::' +
+ memberNameToString(node);
+ } else if (includeLibraryName) {
+ return libraryNameToString(node.enclosingLibrary) +
+ '::' +
+ memberNameToString(node);
+ } else {
+ return memberNameToString(node);
+ }
+}
+
+String memberNameToString(Member node) {
+ return node.name?.name ??
+ "null-named member ${node.runtimeType} ${node.hashCode}";
+}
+
+String qualifiedTypeParameterNameToString(TypeParameter node,
+ {bool includeLibraryName: false}) {
+ TreeNode parent = node.parent;
+ if (parent is Class) {
+ return qualifiedClassNameToString(parent,
+ includeLibraryName: includeLibraryName) +
+ '::' +
+ typeParameterNameToString(node);
+ } else if (parent is Extension) {
+ return qualifiedExtensionNameToString(parent,
+ includeLibraryName: includeLibraryName) +
+ '::' +
+ typeParameterNameToString(node);
+ } else if (parent is Member) {
+ return qualifiedMemberNameToString(parent,
+ includeLibraryName: includeLibraryName) +
+ '::' +
+ typeParameterNameToString(node);
+ }
+ return typeParameterNameToString(node);
+}
+
+String typeParameterNameToString(TypeParameter node) {
+ return node.name ??
+ "null-named TypeParameter ${node.runtimeType} ${node.hashCode}";
+}
diff --git a/pkg/kernel/test/class_hierarchy_test.dart b/pkg/kernel/test/class_hierarchy_test.dart
index c8bcf2e..17c380a 100644
--- a/pkg/kernel/test/class_hierarchy_test.dart
+++ b/pkg/kernel/test/class_hierarchy_test.dart
@@ -9,6 +9,7 @@
import "package:kernel/core_types.dart";
import "package:kernel/testing/mock_sdk_component.dart";
import "package:kernel/text/ast_to_text.dart";
+import "package:kernel/src/text_util.dart";
main() {
new ClosedWorldClassHierarchyTest().test_applyTreeChanges();
@@ -1226,8 +1227,12 @@
void callback(
Member declaredMember, Member interfaceMember, bool isSetter) {
var suffix = isSetter ? '=' : '';
- String declaredName = '$declaredMember$suffix';
- String interfaceName = '$interfaceMember$suffix';
+ String declaredName =
+ '${qualifiedMemberNameToString(declaredMember, includeLibraryName: true)}'
+ '$suffix';
+ String interfaceName =
+ '${qualifiedMemberNameToString(interfaceMember, includeLibraryName: true)}'
+ '$suffix';
var desc = '$declaredName overrides $interfaceName';
overrideDescriptions.add(desc);
}
diff --git a/pkg/kernel/test/verify_test.dart b/pkg/kernel/test/verify_test.dart
index a128818..3219f11 100644
--- a/pkg/kernel/test/verify_test.dart
+++ b/pkg/kernel/test/verify_test.dart
@@ -28,7 +28,7 @@
test.addNode(VariableGet(node));
return node;
},
- (Node node) => matches("Variable '$node' used out of scope\\."),
+ (Node node) => "Variable '$node' used out of scope.",
);
negative1Test(
'VariableSet out of scope',
@@ -37,7 +37,7 @@
test.addNode(VariableSet(variable, new NullLiteral()));
return variable;
},
- (Node node) => matches("Variable '$node' used out of scope\\."),
+ (Node node) => "Variable '$node' used out of scope.",
);
negative1Test(
'Variable block scope',
@@ -49,7 +49,7 @@
]));
return variable;
},
- (Node node) => matches("Variable '$node' used out of scope\\."),
+ (Node node) => "Variable '$node' used out of scope.",
);
negative1Test(
'Variable let scope',
@@ -61,7 +61,7 @@
new VariableGet(variable)));
return variable;
},
- (Node node) => matches("Variable '$node' used out of scope\\."),
+ (Node node) => "Variable '$node' used out of scope.",
);
negative1Test(
'Variable redeclared',
@@ -70,7 +70,7 @@
test.addNode(Block([variable, variable]));
return variable;
},
- (Node node) => matches("Variable '$node' declared more than once\\."),
+ (Node node) => "Variable '$node' declared more than once.",
);
negative1Test(
'Member redeclared',
@@ -105,7 +105,7 @@
typeParameters: [parameter, parameter]));
return parameter;
},
- (Node node) => matches("Type parameter '$node' redeclared\\."),
+ (Node node) => "Type parameter '$node' redeclared.",
);
negative1Test(
'Member type parameter redeclared',
@@ -119,7 +119,7 @@
return parameter;
},
- (Node node) => matches("Type parameter '$node' redeclared\\."),
+ (Node node) => "Type parameter '$node' redeclared.",
);
negative2Test(
'Type parameter out of scope',
@@ -130,8 +130,8 @@
return [parameter, null];
},
(Node node, Node parent) =>
- matches("Type parameter '$node' referenced out of scope,"
- " parent is: '$parent'\\."),
+ "Type parameter '$node' referenced out of scope,"
+ " parent is: '$parent'.",
);
negative2Test(
'Class type parameter from another class',
diff --git a/pkg/nnbd_migration/lib/src/edge_builder.dart b/pkg/nnbd_migration/lib/src/edge_builder.dart
index 25aebf8..a27693a 100644
--- a/pkg/nnbd_migration/lib/src/edge_builder.dart
+++ b/pkg/nnbd_migration/lib/src/edge_builder.dart
@@ -689,7 +689,7 @@
var fieldType = _variables.decoratedElementType(field);
var origin = FieldFormalParameterOrigin(source, node);
if (node.type == null) {
- _linkDecoratedTypes(parameterType, fieldType, origin, isUnion: true);
+ _linkDecoratedTypes(parameterType, fieldType, origin, isUnion: false);
} else {
node.type.accept(this);
_checkAssignment(origin,
diff --git a/pkg/nnbd_migration/test/api_test.dart b/pkg/nnbd_migration/test/api_test.dart
index 32badb1..6702f9a 100644
--- a/pkg/nnbd_migration/test/api_test.dart
+++ b/pkg/nnbd_migration/test/api_test.dart
@@ -4446,6 +4446,30 @@
await _checkSingleFileChanges(content, expected);
}
+ Future<void>
+ test_requiredness_does_not_propagate_between_field_formal_params() async {
+ addMetaPackage();
+ var content = '''
+import 'package:meta/meta.dart';
+class C {
+ final bool x;
+ C.one({this.x});
+ C.two({@required this.x}) : assert(x != null);
+}
+test() => C.one();
+''';
+ var expected = '''
+import 'package:meta/meta.dart';
+class C {
+ final bool? x;
+ C.one({this.x});
+ C.two({required this.x}) : assert(x != null);
+}
+test() => C.one();
+''';
+ await _checkSingleFileChanges(content, expected);
+ }
+
Future<void> test_setter_overrides_implicit_setter() async {
var content = '''
class A {
diff --git a/pkg/nnbd_migration/test/edge_builder_test.dart b/pkg/nnbd_migration/test/edge_builder_test.dart
index 5f8f5f6..b529b8c 100644
--- a/pkg/nnbd_migration/test/edge_builder_test.dart
+++ b/pkg/nnbd_migration/test/edge_builder_test.dart
@@ -2876,8 +2876,9 @@
''');
var decoratedConstructorParamType =
decoratedConstructorDeclaration('named').positionalParameters[0];
- assertUnion(decoratedConstructorParamType.node,
- decoratedTypeAnnotation('int i').node);
+ assertEdge(decoratedConstructorParamType.node,
+ decoratedTypeAnnotation('int i').node,
+ hard: true);
}
Future<void> test_for_each_element_with_declaration() async {
diff --git a/pkg/nnbd_migration/test/instrumentation_test.dart b/pkg/nnbd_migration/test/instrumentation_test.dart
index 3f20a56..d9d01f1 100644
--- a/pkg/nnbd_migration/test/instrumentation_test.dart
+++ b/pkg/nnbd_migration/test/instrumentation_test.dart
@@ -691,32 +691,6 @@
expect(matchingEdges.single.isHard, false);
}
- Future<void> test_graphEdge_union() async {
- await analyze('''
-class C {
- int i;
- C(this.i); /*constructor*/
-}
-''');
- var fieldNode = explicitTypeNullability[findNode.typeAnnotation('int')];
- var formalParamNode =
- implicitType[findNode.fieldFormalParameter('i); /*constructor*/')].node;
- var matchingEdges = edges
- .where((e) =>
- e.sourceNode == fieldNode && e.destinationNode == formalParamNode)
- .toList();
- expect(matchingEdges, hasLength(1));
- expect(matchingEdges.single.isUnion, true);
- expect(matchingEdges.single.isHard, true);
- matchingEdges = edges
- .where((e) =>
- e.sourceNode == formalParamNode && e.destinationNode == fieldNode)
- .toList();
- expect(matchingEdges, hasLength(1));
- expect(matchingEdges.single.isUnion, true);
- expect(matchingEdges.single.isHard, true);
- }
-
Future<void> test_immutableNode_always() async {
await analyze('''
int x = null;
diff --git a/pkg/smith/lib/builder.dart b/pkg/smith/lib/builder.dart
index 9d72e6b..17b2e4e 100644
--- a/pkg/smith/lib/builder.dart
+++ b/pkg/smith/lib/builder.dart
@@ -9,14 +9,13 @@
///
/// Each step on a builder runs a script the with provided arguments. If the
/// script is 'tools/test.py' (which is the default if no script is given in
-/// the test matrix), the step is called a 'test step'. Test steps must include
-/// the '--named_configuration' (for short '-n') option to select the named
-/// [Configuration] to test.
+/// the test matrix), or `testRunner == true`, the step is called a 'test
+/// step'. Test steps must include the '--named_configuration' (for short
+/// '-n') option to select the named [Configuration] to test.
///
-/// Test steps and steps with `isTestRunner == true` are expected to produce
-/// test results that are collected during the run of the builder and checked
-/// against the expected results to determine the success or failure of the
-/// build.
+/// Test steps are expected to produce test results that are collected during
+/// the run of the builder and checked against the expected results to determine
+/// the success or failure of the build.
class Step {
final String name;
final String script;
@@ -33,7 +32,7 @@
static const testScriptName = "tools/test.py";
- bool get isTestStep => script == testScriptName;
+ bool get isTestStep => script == testScriptName || isTestRunner;
/// Create a [Step] from the 'step template' [map], values for supported
/// variables [configuration], and the list of supported named configurations.
@@ -44,7 +43,8 @@
.toList();
var testedConfigurations = <Configuration>[];
var script = map["script"] as String ?? testScriptName;
- if (script == testScriptName) {
+ var isTestRunner = map["testRunner"] as bool ?? false;
+ if (script == testScriptName || isTestRunner) {
// TODO(karlklose): replace with argument parser that can handle all
// arguments to test.py.
for (var argument in arguments) {
@@ -80,7 +80,7 @@
<String, String>{...?map["environment"]},
map["fileset"] as String,
map["shards"] as int,
- map["testRunner"] as bool ?? false,
+ isTestRunner,
testedConfigurations.isEmpty ? null : testedConfigurations.single);
}
}
diff --git a/pkg/smith/test/builder_test.dart b/pkg/smith/test/builder_test.dart
index d7d671a..d3be362 100644
--- a/pkg/smith/test/builder_test.dart
+++ b/pkg/smith/test/builder_test.dart
@@ -31,6 +31,16 @@
expect(step.isTestStep, isTrue);
expect(step.testedConfiguration.name, "foo-x64-none-debug-d8-linux");
});
+ test("custom test runner step", () {
+ var step = Step.parse({
+ "name": "foo",
+ "script": "foo.py",
+ "testRunner": true,
+ "arguments": ["-nfoo-x64-none-debug-d8-linux"]
+ }, {}, configurations);
+ expect(step.isTestStep, isTrue);
+ expect(step.testedConfiguration.name, "foo-x64-none-debug-d8-linux");
+ });
test("implicit test step", () {
var step = Step.parse({
"name": "foo",
diff --git a/pkg/test_runner/lib/src/compiler_configuration.dart b/pkg/test_runner/lib/src/compiler_configuration.dart
index 2d051df..9b2e6ba 100644
--- a/pkg/test_runner/lib/src/compiler_configuration.dart
+++ b/pkg/test_runner/lib/src/compiler_configuration.dart
@@ -591,6 +591,8 @@
bool get _isSimArm => _configuration.architecture == Architecture.simarm;
+ bool get _isSimArm64 => _configuration.architecture == Architecture.simarm64;
+
bool get _isArmX64 => _configuration.architecture == Architecture.arm_x64;
bool get _isArm64 => _configuration.architecture == Architecture.arm64;
@@ -688,10 +690,12 @@
}
} else if (_configuration.builderTag == "crossword") {
exec = "${buildDir}_X64/gen_snapshot";
- } else if (_configuration.useQemu) {
+ } else if (_isArm && _configuration.useQemu) {
// DebugXARM --> DebugSIMARM_X64
final simBuildDir = buildDir.replaceAll("XARM", "SIMARM_X64");
exec = "$simBuildDir/gen_snapshot";
+ } else if (_isArm64 && _configuration.useQemu) {
+ exec = "$buildDir/clang_x64/gen_snapshot";
} else {
exec = "$buildDir/gen_snapshot";
}
@@ -736,8 +740,10 @@
"$host-x86_64/bin/$abiTriple-gcc";
shared = '-shared';
} else if (Platform.isLinux) {
- if (_isSimArm || _configuration.useQemu) {
+ if (_isSimArm || (_isArm && _configuration.useQemu)) {
cc = 'arm-linux-gnueabihf-gcc';
+ } else if (_isSimArm64 || (_isArm64 && _configuration.useQemu)) {
+ cc = 'aarch64-linux-gnu-gcc';
} else {
cc = 'gcc';
}
diff --git a/pkg/test_runner/lib/src/runtime_configuration.dart b/pkg/test_runner/lib/src/runtime_configuration.dart
index 1bb10ab..7fe448c 100644
--- a/pkg/test_runner/lib/src/runtime_configuration.dart
+++ b/pkg/test_runner/lib/src/runtime_configuration.dart
@@ -211,6 +211,20 @@
}
}
+class QemuConfig {
+ static const all = <Architecture, QemuConfig>{
+ Architecture.arm:
+ QemuConfig('qemu-arm', ['-L', '/usr/arm-linux-gnueabihf/']),
+ Architecture.arm64:
+ QemuConfig('qemu-aarch64', ['-L', '/usr/aarch64-linux-gnu/']),
+ };
+
+ final String executable;
+ final List<String> arguments;
+
+ const QemuConfig(this.executable, this.arguments);
+}
+
/// Common runtime configuration for runtimes based on the Dart VM.
class DartVmRuntimeConfiguration extends RuntimeConfiguration {
DartVmRuntimeConfiguration() : super._subclass();
@@ -272,8 +286,10 @@
executable = dartVmExecutableFileName;
}
if (_configuration.useQemu) {
- arguments.insertAll(0, ['-L', '/usr/arm-linux-gnueabihf/', executable]);
- executable = 'qemu-arm';
+ final config = QemuConfig.all[_configuration.architecture];
+ arguments.insert(0, executable);
+ arguments.insertAll(0, config.arguments);
+ executable = config.executable;
}
return [VMCommand(executable, arguments, environmentOverrides)];
}
@@ -298,8 +314,10 @@
var executable = dartPrecompiledBinaryFileName;
if (_configuration.useQemu) {
- arguments.insertAll(0, ['-L', '/usr/arm-linux-gnueabihf/', executable]);
- executable = 'qemu-arm';
+ final config = QemuConfig.all[_configuration.architecture];
+ arguments.insert(0, executable);
+ arguments.insertAll(0, config.arguments);
+ executable = config.executable;
}
return [VMCommand(executable, arguments, environmentOverrides)];
diff --git a/pkg/vm/lib/bytecode/gen_bytecode.dart b/pkg/vm/lib/bytecode/gen_bytecode.dart
index 6e9b063..60fd7d8 100644
--- a/pkg/vm/lib/bytecode/gen_bytecode.dart
+++ b/pkg/vm/lib/bytecode/gen_bytecode.dart
@@ -632,10 +632,11 @@
if (field.isExtensionMember) {
flags |= FieldDeclaration.isExtensionMemberFlag;
}
- // In NNBD libraries, static fields act like late fields
- // regardless of whether they're marked late.
+ // In NNBD libraries, static fields with initializers are implicitly late.
if (field.isLate ||
- (field.isStatic && field.enclosingLibrary.isNonNullableByDefault)) {
+ (field.isStatic &&
+ field.initializer != null &&
+ field.isNonNullableByDefault)) {
flags |= FieldDeclaration.isLateFlag;
}
int position = TreeNode.noOffset;
diff --git a/pkg/vm/lib/kernel_front_end.dart b/pkg/vm/lib/kernel_front_end.dart
index 1db09a1..e9bb876 100644
--- a/pkg/vm/lib/kernel_front_end.dart
+++ b/pkg/vm/lib/kernel_front_end.dart
@@ -193,7 +193,7 @@
aot: aot,
)..parseCommandLineFlags(options['bytecode-options']);
- final target = createFrontEndTarget(targetName);
+ final target = createFrontEndTarget(targetName, nullSafety: nullSafety);
if (target == null) {
print('Failed to create front-end target $targetName.');
return badUsageExitCode;
@@ -528,12 +528,12 @@
/// Create front-end target with given name.
Target createFrontEndTarget(String targetName,
- {bool trackWidgetCreation = false}) {
+ {bool trackWidgetCreation = false, bool nullSafety = false}) {
// Make sure VM-specific targets are available.
installAdditionalTargets();
- final TargetFlags targetFlags =
- new TargetFlags(trackWidgetCreation: trackWidgetCreation);
+ final TargetFlags targetFlags = new TargetFlags(
+ trackWidgetCreation: trackWidgetCreation, enableNullSafety: nullSafety);
return getTarget(targetName, targetFlags);
}
diff --git a/pkg/vm/lib/target/vm.dart b/pkg/vm/lib/target/vm.dart
index 483da65..c7cdbc3 100644
--- a/pkg/vm/lib/target/vm.dart
+++ b/pkg/vm/lib/target/vm.dart
@@ -385,7 +385,8 @@
// purposes.
bool allowPlatformPrivateLibraryAccess(Uri importer, Uri imported) =>
super.allowPlatformPrivateLibraryAccess(importer, imported) ||
- importer.path.contains('runtime/tests/vm/dart');
+ importer.path.contains('runtime/tests/vm/dart') ||
+ importer.path.contains('test-lib');
// TODO(sigmund,ahe): limit this to `dart-ext` libraries only (see
// https://github.com/dart-lang/sdk/issues/29763).
diff --git a/pkg/vm/lib/transformations/type_flow/analysis.dart b/pkg/vm/lib/transformations/type_flow/analysis.dart
index 1850641..651e5f5 100644
--- a/pkg/vm/lib/transformations/type_flow/analysis.dart
+++ b/pkg/vm/lib/transformations/type_flow/analysis.dart
@@ -948,8 +948,9 @@
final cached = useCache ? cachedFlattenedTypeArgs[klass] : null;
if (cached != null) return cached;
- final flattenedTypeArguments = List<DartType>.from(klass.typeParameters
- .map((t) => new TypeParameterType(t, Nullability.legacy)));
+ final flattenedTypeArguments = List<DartType>.from(klass.typeParameters.map(
+ (t) => new TypeParameterType(
+ t, TypeParameterType.computeNullabilityFromBound(t))));
for (final Supertype intf in hierarchy.genericSupertypesOf(klass)) {
int offset = findOverlap(flattenedTypeArguments, intf.typeArguments);
@@ -1022,10 +1023,10 @@
<DynamicSelector, _DynamicTargetSet>{};
_ClassHierarchyCache(this._typeFlowAnalysis, this.hierarchy,
- this.genericInterfacesInfo, this.environment)
+ this.genericInterfacesInfo, this.environment, bool nullSafety)
: objectNoSuchMethod = hierarchy.getDispatchTarget(
environment.coreTypes.objectClass, noSuchMethodName),
- super(environment.coreTypes) {
+ super(environment.coreTypes, nullSafety) {
assertx(objectNoSuchMethod != null);
}
@@ -1044,6 +1045,7 @@
ConcreteType addAllocatedClass(Class cl) {
assertx(!cl.isAbstract);
+ assertx(cl != coreTypes.futureOrClass);
assertx(!_sealed);
final _TFClassImpl classImpl = getTFClass(cl);
@@ -1339,8 +1341,8 @@
: annotationMatcher =
matcher ?? new ConstantPragmaAnnotationParser(coreTypes) {
nativeCodeOracle = new NativeCodeOracle(libraryIndex, annotationMatcher);
- hierarchyCache = new _ClassHierarchyCache(
- this, hierarchy, _genericInterfacesInfo, environment);
+ hierarchyCache = new _ClassHierarchyCache(this, hierarchy,
+ _genericInterfacesInfo, environment, target.flags.enableNullSafety);
summaryCollector = new SummaryCollector(target, environment, hierarchy,
this, hierarchyCache, nativeCodeOracle, hierarchyCache);
_invocationsCache = new _InvocationsCache(this);
diff --git a/pkg/vm/lib/transformations/type_flow/native_code.dart b/pkg/vm/lib/transformations/type_flow/native_code.dart
index 18f0a87..14336a1 100644
--- a/pkg/vm/lib/transformations/type_flow/native_code.dart
+++ b/pkg/vm/lib/transformations/type_flow/native_code.dart
@@ -221,7 +221,8 @@
returnType = translator.instantiateConcreteType(
returnType,
member.function.typeParameters
- .map((t) => TypeParameterType(t, Nullability.legacy))
+ .map((t) => TypeParameterType(
+ t, TypeParameterType.computeNullabilityFromBound(t)))
.toList());
}
continue;
diff --git a/pkg/vm/lib/transformations/type_flow/summary.dart b/pkg/vm/lib/transformations/type_flow/summary.dart
index 3d190a6..17f01c6 100644
--- a/pkg/vm/lib/transformations/type_flow/summary.dart
+++ b/pkg/vm/lib/transformations/type_flow/summary.dart
@@ -320,14 +320,16 @@
final Class referenceClass;
final int paramIndex;
+ final Nullability nullability;
- Extract(this.arg, this.referenceClass, this.paramIndex);
+ Extract(this.arg, this.referenceClass, this.paramIndex, this.nullability);
@override
void accept(StatementVisitor visitor) => visitor.visitExtract(this);
@override
- String dump() => "$label = _Extract ($arg[$referenceClass/$paramIndex])";
+ String dump() =>
+ "$label = _Extract ($arg[$referenceClass/$paramIndex]${nullability.suffix})";
@override
Type apply(List<Type> computedTypes, TypeHierarchy typeHierarchy,
@@ -341,10 +343,31 @@
} else {
final interfaceOffset = typeHierarchy.genericInterfaceOffsetFor(
c.cls.classNode, referenceClass);
- final extract = c.typeArgs[interfaceOffset + paramIndex];
- assertx(extract is AnyType || extract is RuntimeType);
- if (extractedType == null || extract == extractedType) {
- extractedType = extract;
+ final typeArg = c.typeArgs[interfaceOffset + paramIndex];
+ Type extracted = typeArg;
+ if (typeArg is RuntimeType) {
+ final argNullability = typeArg.nullability;
+ if (argNullability != nullability) {
+ // Apply nullability of type parameter type.
+ Nullability result;
+ if (argNullability == Nullability.nullable ||
+ nullability == Nullability.nullable) {
+ result = Nullability.nullable;
+ } else if (argNullability == Nullability.legacy ||
+ nullability == Nullability.legacy) {
+ result = Nullability.legacy;
+ } else {
+ result = Nullability.nonNullable;
+ }
+ if (argNullability != result) {
+ extracted = typeArg.withNullability(result);
+ }
+ }
+ } else {
+ assertx(typeArg is AnyType);
+ }
+ if (extractedType == null || extracted == extractedType) {
+ extractedType = extracted;
} else {
extractedType = const AnyType();
}
@@ -404,16 +427,18 @@
// missing ("AnyType").
class CreateRuntimeType extends Statement {
final Class klass;
+ final Nullability nullability;
final List<TypeExpr> flattenedTypeArgs;
- CreateRuntimeType(this.klass, this.flattenedTypeArgs);
+ CreateRuntimeType(this.klass, this.nullability, this.flattenedTypeArgs);
@override
void accept(StatementVisitor visitor) => visitor.visitCreateRuntimeType(this);
@override
String dump() => "$label = _CreateRuntimeType ($klass @ "
- "${flattenedTypeArgs.take(klass.typeParameters.length)})";
+ "${flattenedTypeArgs.take(klass.typeParameters.length)}"
+ "${nullability.suffix})";
@override
Type apply(List<Type> computedTypes, TypeHierarchy typeHierarchy,
@@ -425,7 +450,7 @@
if (computed is AnyType) return const AnyType();
types[i] = computed;
}
- return new RuntimeType(new InterfaceType(klass, Nullability.legacy), types);
+ return new RuntimeType(new InterfaceType(klass, nullability), types);
}
}
diff --git a/pkg/vm/lib/transformations/type_flow/summary_collector.dart b/pkg/vm/lib/transformations/type_flow/summary_collector.dart
index a6edc90..f0cf458 100644
--- a/pkg/vm/lib/transformations/type_flow/summary_collector.dart
+++ b/pkg/vm/lib/transformations/type_flow/summary_collector.dart
@@ -344,7 +344,19 @@
final savedNumVariablesAtFunctionEntry = numVariablesAtFunctionEntry;
numVariablesAtFunctionEntry = numVariables;
- node.function.accept(this);
+ final function = node.function;
+ function.accept(this);
+
+ if (function.asyncMarker == AsyncMarker.SyncYielding) {
+ // Mark parameters of synthetic async_op closures as captured
+ // to make sure their updates at yield points are taken into account.
+ for (var v in function.positionalParameters) {
+ _captureVariable(v);
+ }
+ for (var v in function.namedParameters) {
+ _captureVariable(v);
+ }
+ }
activeStatements = savedActiveStatements;
numVariablesAtActiveStatements = savedNumVariablesAtActiveStatements;
@@ -354,10 +366,14 @@
bool _isDeclaredBefore(int variableIndex, int entryDeclarationCounter) =>
variableIndex < entryDeclarationCounter;
+ void _captureVariable(VariableDeclaration variable) {
+ (captured ??= <VariableDeclaration>{}).add(variable);
+ }
+
void _useVariable(VariableDeclaration variable, bool isVarAssignment) {
final index = varIndex[variable];
if (_isDeclaredBefore(index, numVariablesAtFunctionEntry)) {
- (captured ??= <VariableDeclaration>{}).add(variable);
+ _captureVariable(variable);
return;
}
if (isVarAssignment && activeStatements != null) {
@@ -2239,11 +2255,11 @@
if (createRuntimeType) {
return new RuntimeType(
- new InterfaceType(type.classNode, Nullability.legacy),
+ new InterfaceType(type.classNode, type.nullability),
new List<RuntimeType>.from(flattenedTypeExprs));
} else {
- final instantiate =
- new CreateRuntimeType(type.classNode, flattenedTypeExprs);
+ final instantiate = new CreateRuntimeType(
+ type.classNode, type.nullability, flattenedTypeExprs);
summary.add(instantiate);
return instantiate;
}
@@ -2258,8 +2274,14 @@
if (type.parameter.parent is! Class) return const AnyType();
final interfaceClass = type.parameter.parent as Class;
assertx(receiver != null);
+ // Undetermined nullability is equivalent to nonNullable when
+ // instantiating type parameter, so convert it right away.
+ Nullability nullability = type.nullability;
+ if (nullability == Nullability.undetermined) {
+ nullability = Nullability.nonNullable;
+ }
final extract = new Extract(receiver, interfaceClass,
- interfaceClass.typeParameters.indexOf(type.parameter));
+ interfaceClass.typeParameters.indexOf(type.parameter), nullability);
summary.add(extract);
return extract;
}
diff --git a/pkg/vm/lib/transformations/type_flow/types.dart b/pkg/vm/lib/transformations/type_flow/types.dart
index 54aa2fe..771f18c 100644
--- a/pkg/vm/lib/transformations/type_flow/types.dart
+++ b/pkg/vm/lib/transformations/type_flow/types.dart
@@ -60,15 +60,18 @@
abstract class TypesBuilder {
final CoreTypes coreTypes;
+ final bool nullSafety;
- TypesBuilder(this.coreTypes);
+ TypesBuilder(this.coreTypes, this.nullSafety);
/// Return [TFClass] corresponding to the given [classNode].
TFClass getTFClass(Class classNode);
/// Create a Type which corresponds to a set of instances constrained by
/// Dart type annotation [dartType].
- Type fromStaticType(DartType type, bool isNullable) {
+ /// [canBeNull] can be set to false to further constrain the resulting
+ /// type if value cannot be null.
+ Type fromStaticType(DartType type, bool canBeNull) {
Type result;
if (type is InterfaceType) {
final cls = type.classNode;
@@ -90,12 +93,15 @@
if (bound is TypeParameterType) {
result = const AnyType();
} else {
- return fromStaticType(bound, isNullable);
+ return fromStaticType(bound, canBeNull);
}
} else {
throw 'Unexpected type ${type.runtimeType} $type';
}
- if (isNullable) {
+ if (nullSafety && type.nullability == Nullability.nonNullable) {
+ canBeNull = false;
+ }
+ if (canBeNull) {
result = new Type.nullable(result);
}
return result;
@@ -109,7 +115,8 @@
/// Abstract interface to type hierarchy information used by types.
abstract class TypeHierarchy extends TypesBuilder
implements GenericInterfacesInfo {
- TypeHierarchy(CoreTypes coreTypes) : super(coreTypes);
+ TypeHierarchy(CoreTypes coreTypes, bool nullSafety)
+ : super(coreTypes, nullSafety);
/// Test if [sub] is a subtype of [sup].
bool isSubtype(Class sub, Class sup);
@@ -239,8 +246,13 @@
bool isSubtypeOf(TypeHierarchy typeHierarchy, Class cls) =>
baseType.isSubtypeOf(typeHierarchy, cls);
- bool isSubtypeOfRuntimeType(TypeHierarchy typeHierarchy, RuntimeType other) =>
- baseType.isSubtypeOfRuntimeType(typeHierarchy, other);
+ bool isSubtypeOfRuntimeType(TypeHierarchy typeHierarchy, RuntimeType other) {
+ if (typeHierarchy.nullSafety &&
+ other.nullability == Nullability.nonNullable) {
+ return false;
+ }
+ return baseType.isSubtypeOfRuntimeType(typeHierarchy, other);
+ }
@override
int get order => TypeOrder.Nullable.index;
@@ -652,9 +664,9 @@
if (rhs.typeArguments.isEmpty) return true;
if (rhs.classNode == typeHierarchy.coreTypes.futureOrClass) {
+ assertx(cls.classNode != typeHierarchy.coreTypes.futureOrClass);
if (typeHierarchy.isSubtype(
- cls.classNode, typeHierarchy.coreTypes.futureClass) ||
- cls.classNode == typeHierarchy.coreTypes.futureOrClass) {
+ cls.classNode, typeHierarchy.coreTypes.futureClass)) {
final RuntimeType lhs =
typeArgs == null ? RuntimeType(DynamicType(), null) : typeArgs[0];
return lhs.isSubtypeOfRuntimeType(
@@ -884,18 +896,24 @@
int get order => TypeOrder.RuntimeType.index;
+ Nullability get nullability => _type.nullability;
+
+ RuntimeType withNullability(Nullability n) =>
+ RuntimeType(_type.withNullability(n), typeArgs);
+
DartType get representedTypeRaw => _type;
DartType get representedType {
- if (_type is InterfaceType && typeArgs != null) {
- final klass = (_type as InterfaceType).classNode;
+ final type = _type;
+ if (type is InterfaceType && typeArgs != null) {
+ final klass = type.classNode;
final typeArguments = typeArgs
.take(klass.typeParameters.length)
.map((pt) => pt.representedType)
.toList();
- return new InterfaceType(klass, Nullability.legacy, typeArguments);
+ return new InterfaceType(klass, type.nullability, typeArguments);
} else {
- return _type;
+ return type;
}
}
@@ -926,10 +944,11 @@
final head = _type is InterfaceType
? "${(_type as InterfaceType).classNode}"
: "$_type";
- if (numImmediateTypeArgs == 0) return head;
- final typeArgsStrs =
- typeArgs.take(numImmediateTypeArgs).map((t) => "$t").join(", ");
- return "_TS {$head<$typeArgsStrs>}";
+ final typeArgsStrs = (numImmediateTypeArgs == 0)
+ ? ""
+ : "<${typeArgs.take(numImmediateTypeArgs).map((t) => "$t").join(", ")}>";
+ final nullability = _type.nullability.suffix;
+ return "$head$typeArgsStrs$nullability";
}
@override
@@ -967,6 +986,11 @@
bool isSubtypeOfRuntimeType(
TypeHierarchy typeHierarchy, RuntimeType runtimeType) {
final rhs = runtimeType._type;
+ if (typeHierarchy.nullSafety &&
+ _type.nullability == Nullability.nullable &&
+ rhs.nullability == Nullability.nonNullable) {
+ return false;
+ }
if (rhs is DynamicType ||
rhs is VoidType ||
_type is BottomType ||
diff --git a/pkg/vm/lib/transformations/type_flow/utils.dart b/pkg/vm/lib/transformations/type_flow/utils.dart
index 379c1ed..1bd903f 100644
--- a/pkg/vm/lib/transformations/type_flow/utils.dart
+++ b/pkg/vm/lib/transformations/type_flow/utils.dart
@@ -11,9 +11,10 @@
Class,
Constructor,
DartType,
- Procedure,
FunctionNode,
Member,
+ Nullability,
+ Procedure,
VariableDeclaration;
const bool kPrintTrace =
@@ -256,3 +257,14 @@
}
return list.length;
}
+
+const nullabilitySuffix = {
+ Nullability.legacy: '*',
+ Nullability.nullable: '?',
+ Nullability.undetermined: '',
+ Nullability.nonNullable: '',
+};
+
+extension NullabilitySuffix on Nullability {
+ String get suffix => nullabilitySuffix[this];
+}
diff --git a/pkg/vm/test/common_test_utils.dart b/pkg/vm/test/common_test_utils.dart
index 5473874..4a7fb0c 100644
--- a/pkg/vm/test/common_test_utils.dart
+++ b/pkg/vm/test/common_test_utils.dart
@@ -10,7 +10,9 @@
CompilerOptions,
DiagnosticMessage,
computePlatformBinariesLocation,
- kernelForProgram;
+ kernelForProgram,
+ parseExperimentalArguments,
+ parseExperimentalFlags;
import 'package:kernel/ast.dart';
import 'package:kernel/text/ast_to_text.dart' show Printer;
import 'package:kernel/binary/ast_to_binary.dart' show BinaryPrinter;
@@ -35,6 +37,7 @@
Future<Component> compileTestCaseToKernelProgram(Uri sourceUri,
{Target target,
bool enableSuperMixins = false,
+ List<String> experimentalFlags,
Map<String, String> environmentDefines}) async {
final platformKernel =
computePlatformBinariesLocation().resolve('vm_platform_strong.dill');
@@ -45,6 +48,11 @@
..target = target
..additionalDills = <Uri>[platformKernel]
..environmentDefines = environmentDefines
+ ..experimentalFlags =
+ parseExperimentalFlags(parseExperimentalArguments(experimentalFlags),
+ onError: (String message) {
+ throw message;
+ })
..onDiagnostic = (DiagnosticMessage message) {
fail("Compilation error: ${message.plainTextFormatted.join('\n')}");
};
diff --git a/pkg/vm/test/transformations/type_flow/summary_collector_test.dart b/pkg/vm/test/transformations/type_flow/summary_collector_test.dart
index d7cc554..69c5cb3 100644
--- a/pkg/vm/test/transformations/type_flow/summary_collector_test.dart
+++ b/pkg/vm/test/transformations/type_flow/summary_collector_test.dart
@@ -26,7 +26,8 @@
final Map<Class, TFClass> _classes = <Class, TFClass>{};
int _classIdCounter = 0;
- FakeTypesBuilder(CoreTypes coreTypes) : super(coreTypes);
+ FakeTypesBuilder(CoreTypes coreTypes)
+ : super(coreTypes, /*nullSafety=*/ false);
@override
TFClass getTFClass(Class c) =>
diff --git a/pkg/vm/test/transformations/type_flow/transformer_test.dart b/pkg/vm/test/transformations/type_flow/transformer_test.dart
index 29a5606..123bc44 100644
--- a/pkg/vm/test/transformations/type_flow/transformer_test.dart
+++ b/pkg/vm/test/transformations/type_flow/transformer_test.dart
@@ -18,10 +18,12 @@
final String pkgVmDir = Platform.script.resolve('../../..').toFilePath();
-runTestCase(Uri source) async {
- final target = new TestingVmTarget(new TargetFlags());
- Component component =
- await compileTestCaseToKernelProgram(source, target: target);
+runTestCase(
+ Uri source, List<String> experimentalFlags, bool enableNullSafety) async {
+ final target =
+ new TestingVmTarget(new TargetFlags(enableNullSafety: enableNullSafety));
+ Component component = await compileTestCaseToKernelProgram(source,
+ target: target, experimentalFlags: experimentalFlags);
final coreTypes = new CoreTypes(component);
@@ -43,8 +45,15 @@
for (var entry in testCasesDir
.listSync(recursive: true, followLinks: false)
.reversed) {
- if (entry.path.endsWith(".dart")) {
- test(entry.path, () => runTestCase(entry.uri));
+ if (entry.path.endsWith('.dart')) {
+ final bool enableNullSafety = entry.path.endsWith('_nnbd_strong.dart');
+ final bool enableNNBD =
+ enableNullSafety || entry.path.endsWith('_nnbd.dart');
+ final List<String> experimentalFlags = [
+ if (enableNNBD) 'non-nullable',
+ ];
+ test(entry.path,
+ () => runTestCase(entry.uri, experimentalFlags, enableNullSafety));
}
}
});
diff --git a/pkg/vm/test/transformations/type_flow/types_test.dart b/pkg/vm/test/transformations/type_flow/types_test.dart
index ec6e530..27c288d 100644
--- a/pkg/vm/test/transformations/type_flow/types_test.dart
+++ b/pkg/vm/test/transformations/type_flow/types_test.dart
@@ -17,7 +17,7 @@
int classIdCounter = 0;
TestTypeHierarchy(CoreTypes coreTypes, this.subtypes, this.specializations)
- : super(coreTypes);
+ : super(coreTypes, /*nullSafety=*/ false);
@override
bool isSubtype(Class sub, Class sup) {
diff --git a/pkg/vm/testcases/bytecode/asserts.dart.expect b/pkg/vm/testcases/bytecode/asserts.dart.expect
index 4149a93..e8170f0 100644
--- a/pkg/vm/testcases/bytecode/asserts.dart.expect
+++ b/pkg/vm/testcases/bytecode/asserts.dart.expect
@@ -90,7 +90,7 @@
assert(condition);
}
static method test2(() →* dart.core::bool* condition, () →* dart.core::String* message) → void {
- assert([@vm.call-site-attributes.metadata=receiverType:FunctionType()] condition.call(), [@vm.call-site-attributes.metadata=receiverType:FunctionType()] message.call());
+ assert([@vm.call-site-attributes.metadata=receiverType:FunctionType(bool* Function()*)] condition.call(), [@vm.call-site-attributes.metadata=receiverType:FunctionType(String* Function()*)] message.call());
}
static method main() → dynamic {}
}
diff --git a/pkg/vm/testcases/bytecode/bootstrapping.dart.expect b/pkg/vm/testcases/bytecode/bootstrapping.dart.expect
index b06373c..6f5d2ad 100644
--- a/pkg/vm/testcases/bytecode/bootstrapping.dart.expect
+++ b/pkg/vm/testcases/bytecode/bootstrapping.dart.expect
@@ -710,7 +710,7 @@
}
static get platformScript() → dynamic {
if(#lib::VMLibraryHooks::_cachedScript.{dart.core::Object::==}(null) && !#lib::VMLibraryHooks::_computeScriptUri.{dart.core::Object::==}(null)) {
- #lib::VMLibraryHooks::_cachedScript = [@vm.call-site-attributes.metadata=receiverType:dynamic] #lib::VMLibraryHooks::_computeScriptUri.call();
+ #lib::VMLibraryHooks::_cachedScript = [@vm.call-site-attributes.metadata=receiverType:DynamicType(dynamic)] #lib::VMLibraryHooks::_computeScriptUri.call();
}
return #lib::VMLibraryHooks::_cachedScript;
}
diff --git a/pkg/vm/testcases/bytecode/closures.dart.expect b/pkg/vm/testcases/bytecode/closures.dart.expect
index fd792c7..de90a1d 100644
--- a/pkg/vm/testcases/bytecode/closures.dart.expect
+++ b/pkg/vm/testcases/bytecode/closures.dart.expect
@@ -1770,13 +1770,13 @@
dart.core::print(<dart.core::Type*>[#lib::A::T1*, #lib::A::T2*, #lib::A::foo::T3*, #lib::A::foo::T4*, T5*, T6*, T7*, T8*]);
#lib::callWithArgs<#lib::A::T1*, #lib::A::T2*, #lib::A::foo::T3*, #lib::A::foo::T4*, T5*, T6*, T7*, T8*>();
};
- [@vm.call-site-attributes.metadata=receiverType:FunctionType()] nested3.call();
+ [@vm.call-site-attributes.metadata=receiverType:FunctionType(Null? Function()*)] nested3.call();
}
- [@vm.call-site-attributes.metadata=receiverType:FunctionType()] nested2.call<#lib::C7*, #lib::C8*>();
- [@vm.call-site-attributes.metadata=receiverType:FunctionType()] nested2.call<dart.core::List<#lib::C7*>*, dart.core::List<#lib::C8*>*>();
+ [@vm.call-site-attributes.metadata=receiverType:FunctionType(void Function<T7, T8>()*)] nested2.call<#lib::C7*, #lib::C8*>();
+ [@vm.call-site-attributes.metadata=receiverType:FunctionType(void Function<T7, T8>()*)] nested2.call<dart.core::List<#lib::C7*>*, dart.core::List<#lib::C8*>*>();
}
- [@vm.call-site-attributes.metadata=receiverType:FunctionType()] nested1.call<#lib::C5*, #lib::C6*>();
- [@vm.call-site-attributes.metadata=receiverType:FunctionType()] nested1.call<dart.core::List<#lib::C5*>*, dart.core::List<#lib::C6*>*>();
+ [@vm.call-site-attributes.metadata=receiverType:FunctionType(void Function<T5, T6>()*)] nested1.call<#lib::C5*, #lib::C6*>();
+ [@vm.call-site-attributes.metadata=receiverType:FunctionType(void Function<T5, T6>()*)] nested1.call<dart.core::List<#lib::C5*>*, dart.core::List<#lib::C6*>*>();
}
}
class B extends dart.core::Object {
@@ -1798,12 +1798,12 @@
z = x.{dart.core::num::+}(2);
w = this.{#lib::B::foo}.{dart.core::num::+}(y);
}
- [@vm.call-site-attributes.metadata=receiverType:FunctionType()] closure2.call();
+ [@vm.call-site-attributes.metadata=receiverType:FunctionType(void Function()*)] closure2.call();
dart.core::print(w);
}
};
- [@vm.call-site-attributes.metadata=receiverType:FunctionType()] closure1.call(10);
- [@vm.call-site-attributes.metadata=receiverType:FunctionType()] closure1.call(11);
+ [@vm.call-site-attributes.metadata=receiverType:FunctionType(Null? Function(int*)*)] closure1.call(10);
+ [@vm.call-site-attributes.metadata=receiverType:FunctionType(Null? Function(int*)*)] closure1.call(11);
dart.core::print(y);
dart.core::print(z);
}
@@ -1814,7 +1814,7 @@
() →* dart.core::Null? closure3 = () → dart.core::Null? {
this.{#lib::B::foo} = x;
};
- [@vm.call-site-attributes.metadata=receiverType:FunctionType()] closure3.call();
+ [@vm.call-site-attributes.metadata=receiverType:FunctionType(Null? Function()*)] closure3.call();
}
}
}
@@ -1827,8 +1827,8 @@
dart.core::List<dart.core::Function*>* getI = <dart.core::Function*>[];
dart.core::List<dart.core::Function*>* setI = <dart.core::Function*>[];
for (dart.core::int* i = 0; i.{dart.core::num::<}(10); i = i.{dart.core::num::+}(1)) {
- [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Reference to root::dart:core::List*)] getI.{dart.core::List::add}(() → dart.core::int* => i.{dart.core::num::+}(delta));
- [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Reference to root::dart:core::List*)] setI.{dart.core::List::add}((dart.core::int* ii) → dart.core::Null? {
+ [@vm.call-site-attributes.metadata=receiverType:InterfaceType(List<Function*>*)] getI.{dart.core::List::add}(() → dart.core::int* => i.{dart.core::num::+}(delta));
+ [@vm.call-site-attributes.metadata=receiverType:InterfaceType(List<Function*>*)] setI.{dart.core::List::add}((dart.core::int* ii) → dart.core::Null? {
i = ii.{dart.core::num::+}(delta);
});
}
@@ -1842,7 +1842,7 @@
() →* dart.core::Null? inc = () → dart.core::Null? {
i = i.{dart.core::num::+}(1);
};
- [@vm.call-site-attributes.metadata=receiverType:FunctionType()] inc.call();
+ [@vm.call-site-attributes.metadata=receiverType:FunctionType(Null? Function()*)] inc.call();
dart.core::print(i);
}
}
@@ -1859,7 +1859,7 @@
method bar() → dynamic {
return () → dart.core::Null? {
function inner() → dart.core::Null? {}
- [@vm.call-site-attributes.metadata=receiverType:FunctionType()] inner.call();
+ [@vm.call-site-attributes.metadata=receiverType:FunctionType(Null? Function()*)] inner.call();
};
}
}
@@ -1873,18 +1873,18 @@
abstract method evalArg2() → dart.core::int*;
abstract method getE() → #lib::E*;
method testCallThroughGetter1() → dart.core::int*
- return let final dart.core::int* #t1 = this.{#lib::E::evalArg1}() in let final dart.core::int* #t2 = this.{#lib::E::evalArg2}() in [@vm.call-site-attributes.metadata=receiverType:FunctionType()] this.{#lib::E::foo1}.call(#t1, #t2);
+ return let final dart.core::int* #t1 = this.{#lib::E::evalArg1}() in let final dart.core::int* #t2 = this.{#lib::E::evalArg2}() in [@vm.call-site-attributes.metadata=receiverType:FunctionType(int* Function(int*, int*)*)] this.{#lib::E::foo1}.call(#t1, #t2);
method testCallThroughGetter2() → dart.core::int*
- return let final dart.core::int* #t3 = this.{#lib::E::evalArg1}() in let final dart.core::int* #t4 = this.{#lib::E::evalArg2}() in [@vm.call-site-attributes.metadata=receiverType:FunctionType()] this.{#lib::E::foo2}.call<dart.core::int*>(#t3, #t4);
+ return let final dart.core::int* #t3 = this.{#lib::E::evalArg1}() in let final dart.core::int* #t4 = this.{#lib::E::evalArg2}() in [@vm.call-site-attributes.metadata=receiverType:FunctionType(int* Function<T>(T*, T*)*)] this.{#lib::E::foo2}.call<dart.core::int*>(#t3, #t4);
method testCallThroughGetter3() → dart.core::int*
- return let final #lib::E* #t5 = this.{#lib::E::getE}() in let final dart.core::int* #t6 = this.{#lib::E::evalArg1}() in let final dart.core::int* #t7 = this.{#lib::E::evalArg2}() in [@vm.call-site-attributes.metadata=receiverType:FunctionType()] #t5.{#lib::E::foo2}.call<dart.core::int*>(#t6, #t7);
+ return let final #lib::E* #t5 = this.{#lib::E::getE}() in let final dart.core::int* #t6 = this.{#lib::E::evalArg1}() in let final dart.core::int* #t7 = this.{#lib::E::evalArg2}() in [@vm.call-site-attributes.metadata=receiverType:FunctionType(int* Function<T>(T*, T*)*)] #t5.{#lib::E::foo2}.call<dart.core::int*>(#t6, #t7);
}
static method simpleClosure() → dart.core::int* {
dart.core::int* x = 5;
(dart.core::int*) →* dart.core::Null? inc = (dart.core::int* y) → dart.core::Null? {
x = x.{dart.core::num::+}(y);
};
- [@vm.call-site-attributes.metadata=receiverType:FunctionType()] inc.call(3);
+ [@vm.call-site-attributes.metadata=receiverType:FunctionType(Null? Function(int*)*)] inc.call(3);
return x;
}
static method callWithArgs<T1 extends dart.core::Object* = dynamic, T2 extends dart.core::Object* = dynamic, T3 extends dart.core::Object* = dynamic, T4 extends dart.core::Object* = dynamic, T5 extends dart.core::Object* = dynamic, T6 extends dart.core::Object* = dynamic, T7 extends dart.core::Object* = dynamic, T8 extends dart.core::Object* = dynamic>() → void {
diff --git a/pkg/vm/testcases/bytecode/super_calls.dart.expect b/pkg/vm/testcases/bytecode/super_calls.dart.expect
index 7d346c0..d872423 100644
--- a/pkg/vm/testcases/bytecode/super_calls.dart.expect
+++ b/pkg/vm/testcases/bytecode/super_calls.dart.expect
@@ -494,7 +494,7 @@
method testSuperGet() → dynamic
return super.{#lib::Base1::bar};
method testSuperCallViaGetter() → dynamic
- return [@vm.call-site-attributes.metadata=receiverType:dynamic] super.{#lib::Base1::bar}.call<dart.core::int*>("param");
+ return [@vm.call-site-attributes.metadata=receiverType:DynamicType(dynamic)] super.{#lib::Base1::bar}.call<dart.core::int*>("param");
method testSuperSet() → dynamic {
super.{#lib::Base1::bazz} = 3;
}
@@ -518,7 +518,7 @@
method testSuperGet() → dynamic
return super.{#lib::Base2::bar};
method testSuperCallViaGetter() → dynamic
- return [@vm.call-site-attributes.metadata=receiverType:dynamic] super.{#lib::Base2::bar}.call<dart.core::int*>("param");
+ return [@vm.call-site-attributes.metadata=receiverType:DynamicType(dynamic)] super.{#lib::Base2::bar}.call<dart.core::int*>("param");
method testSuperSet() → dynamic {
super.{#lib::Base2::bazz} = 3;
}
diff --git a/pkg/vm/testcases/bytecode/try_blocks.dart.expect b/pkg/vm/testcases/bytecode/try_blocks.dart.expect
index 1d0580f..b7543da 100644
--- a/pkg/vm/testcases/bytecode/try_blocks.dart.expect
+++ b/pkg/vm/testcases/bytecode/try_blocks.dart.expect
@@ -1033,7 +1033,7 @@
y = 3;
}
}
- [@vm.call-site-attributes.metadata=receiverType:FunctionType()] foo.call();
+ [@vm.call-site-attributes.metadata=receiverType:FunctionType(void Function()*)] foo.call();
dart.core::print(y);
}
on dynamic catch(final dynamic e, final dart.core::StackTrace* st) {
@@ -1099,7 +1099,7 @@
dart.core::print(x);
dart.core::print(y);
}
- [@vm.call-site-attributes.metadata=receiverType:FunctionType()] foo.call();
+ [@vm.call-site-attributes.metadata=receiverType:FunctionType(void Function()*)] foo.call();
continue #L4;
}
finally {
@@ -1143,7 +1143,7 @@
}
finally {
dart.core::print(x);
- [@vm.call-site-attributes.metadata=receiverType:dynamic] y.call();
+ [@vm.call-site-attributes.metadata=receiverType:DynamicType(dynamic)] y.call();
}
}
static method testTryCatchFinally() → dynamic {
diff --git a/pkg/vm/testcases/bytecode/type_ops.dart.expect b/pkg/vm/testcases/bytecode/type_ops.dart.expect
index 1293a71..8c81f4d 100644
--- a/pkg/vm/testcases/bytecode/type_ops.dart.expect
+++ b/pkg/vm/testcases/bytecode/type_ops.dart.expect
@@ -706,7 +706,7 @@
if(y is #lib::C<dynamic, #lib::D::Q*, dart.core::List<#lib::D::P*>*>*) {
dart.core::print("22");
}
- [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Reference to #lib::D*)] this.{#lib::D::foo} = y as{TypeError,ForDynamic} dart.core::Map<#lib::D::P*, #lib::D::Q*>*;
+ [@vm.call-site-attributes.metadata=receiverType:InterfaceType(D<D::P*, D::Q*>*)] this.{#lib::D::foo} = y as{TypeError,ForDynamic} dart.core::Map<#lib::D::P*, #lib::D::Q*>*;
}
method foo3<T1 extends dart.core::Object* = dynamic, T2 extends dart.core::Object* = dynamic>(dynamic z) → dynamic {
if(z is #lib::A<#lib::D::foo3::T1*>*) {
diff --git a/pkg/vm/testcases/transformations/type_flow/summary_collector/bool_expressions.dart.expect b/pkg/vm/testcases/transformations/type_flow/summary_collector/bool_expressions.dart.expect
index 80c11a9..5981906 100644
--- a/pkg/vm/testcases/transformations/type_flow/summary_collector/bool_expressions.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/summary_collector/bool_expressions.dart.expect
@@ -1,28 +1,28 @@
------------- #lib::foo ------------
+------------ foo ------------
RESULT: _T {}?
------------- #lib::bar ------------
+------------ bar ------------
RESULT: _T {}?
------------- #lib::bool_expressions ------------
-t0* = _Call direct [#lib::foo] ()
-t1 = _TypeCheck (t0 against dart.core::bool) (for AsExpression(StaticInvocation(Reference to #lib::foo, ArgumentsImpl()) as InterfaceType(Reference to root::dart:core::bool*)))
-t2* = _Call direct [#lib::bar] ()
-t3* = _Call [dart.core::num::+] (_T (dart.core::int)+, _T (dart.core::_Smi, 1))
-i_0 = _Join [InterfaceType(Reference to root::dart:core::int*)] (_T (dart.core::_Smi, 0), t3)
-t5* = _Call [dart.core::num::<] (i_0, _T (dart.core::_Smi, 10))
-t6* = _Call direct [#lib::bar] ()
-t7* = _Call direct [#lib::foo] ()
-t8 = _Join [dynamic] (_T (dart.core::bool, true), t7)
-t9 = _TypeCheck (t8 against dart.core::bool) (for AsExpression(ConditionalExpression(VariableGetImpl() ? BoolLiteral(true) : StaticInvocation(Reference to #lib::foo, ArgumentsImpl())) as InterfaceType(Reference to root::dart:core::bool*)))
-t10* = _Call direct [#lib::bar] ()
-t11* = _Call direct [#lib::bar] ()
-t12* = _Call direct [#lib::foo] ()
-t13 = _TypeCheck (t12 against dart.core::bool) (for AsExpression(StaticInvocation(Reference to #lib::foo, ArgumentsImpl()) as InterfaceType(Reference to root::dart:core::bool*)))
-t14* = _Call direct [#lib::foo] ()
-t15 = _TypeCheck (t14 against dart.core::bool) (for AsExpression(StaticInvocation(Reference to #lib::foo, ArgumentsImpl()) as InterfaceType(Reference to root::dart:core::bool*)))
-y_0 = _Join [InterfaceType(Reference to root::dart:core::bool*)] (_T (dart.core::bool), _T (dart.core::bool, true))
+------------ bool_expressions ------------
+t0* = _Call direct [foo] ()
+t1 = _TypeCheck (t0 against dart.core::bool*) (for AsExpression(foo, as bool*))
+t2* = _Call direct [bar] ()
+t3* = _Call [num::+] (_T (dart.core::int)+, _T (dart.core::_Smi, 1))
+i_0 = _Join [InterfaceType(int*)] (_T (dart.core::_Smi, 0), t3)
+t5* = _Call [num::<] (i_0, _T (dart.core::_Smi, 10))
+t6* = _Call direct [bar] ()
+t7* = _Call direct [foo] ()
+t8 = _Join [DynamicType(dynamic)] (_T (dart.core::bool, true), t7)
+t9 = _TypeCheck (t8 against dart.core::bool*) (for AsExpression( ? true : foo, as bool*))
+t10* = _Call direct [bar] ()
+t11* = _Call direct [bar] ()
+t12* = _Call direct [foo] ()
+t13 = _TypeCheck (t12 against dart.core::bool*) (for AsExpression(foo, as bool*))
+t14* = _Call direct [foo] ()
+t15 = _TypeCheck (t14 against dart.core::bool*) (for AsExpression(foo, as bool*))
+y_0 = _Join [InterfaceType(bool*)] (_T (dart.core::bool), _T (dart.core::bool, true))
RESULT: _T {}?
------------- #lib::main ------------
+------------ main ------------
RESULT: _T {}?
diff --git a/pkg/vm/testcases/transformations/type_flow/summary_collector/calls.dart.expect b/pkg/vm/testcases/transformations/type_flow/summary_collector/calls.dart.expect
index 721f2bd..ab5df37 100644
--- a/pkg/vm/testcases/transformations/type_flow/summary_collector/calls.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/summary_collector/calls.dart.expect
@@ -1,56 +1,56 @@
------------- #lib::A:: ------------
+------------ A:: ------------
%this = _Parameter #0 [_T (#lib::A)+]
-t1 = _Call direct [dart.core::Object::] (%this)
+t1 = _Call direct [Object::] (%this)
RESULT: _T {}?
------------- #lib::A::foo1 ------------
+------------ A::foo1 ------------
%this = _Parameter #0 [_T (#lib::A)+]
%x = _Parameter #1 [_T (dart.core::Object)+?]
RESULT: _T {}?
------------- #lib::B:: ------------
+------------ B:: ------------
%this = _Parameter #0 [_T (#lib::B)+]
-t1 = _Call direct [dart.core::Object::] (%this)
+t1 = _Call direct [Object::] (%this)
RESULT: _T {}?
------------- #lib::B::bar1 ------------
+------------ B::bar1 ------------
%this = _Parameter #0 [_T (#lib::B)+]
%arg = _Parameter #1 [_T (dart.core::Object)+?]
RESULT: _T {}?
------------- #lib::B::bar2 ------------
+------------ B::bar2 ------------
%this = _Parameter #0 [_T (#lib::B)+]
RESULT: _T {}?
------------- #lib::B::bar3 ------------
+------------ B::bar3 ------------
%this = _Parameter #0 [_T (#lib::B)+]
%y = _Parameter #1 [_T (dart.core::int)+?]
RESULT: _T {}?
------------- #lib::B::bar4 ------------
+------------ B::bar4 ------------
%this = _Parameter #0 [_T (#lib::B)+]
RESULT: _T {}?
------------- #lib::C:: ------------
+------------ C:: ------------
%this = _Parameter #0 [_T (#lib::C)+]
-t1 = _Call direct [dart.core::Object::] (%this)
+t1 = _Call direct [Object::] (%this)
RESULT: _T {}?
------------- #lib::C::interfaceCalls ------------
+------------ C::interfaceCalls ------------
%this = _Parameter #0 [_T (#lib::C)+]
%aa = _Parameter #1 [_T (#lib::A)+?]
%a2 = _Parameter #2 [_T (dart.core::Object)+?]
%a3 = _Parameter #3 [_T (dart.core::Object)+?]
%a4 = _Parameter #4 [_T (dart.core::Object)+?]
-t5 = _Call direct [#lib::B::] (_T (#lib::B))
-t6 = _Call [#lib::A::foo1] (%aa, _T (#lib::B))
+t5 = _Call direct [B::] (_T (#lib::B))
+t6 = _Call [A::foo1] (%aa, _T (#lib::B))
t7 = _Narrow (%aa to _T ANY)
-t8* = _Call get [#lib::A::foo2] (t7)
-t9 = _TypeCheck (t8 against dart.core::int) (for AsExpression(PropertyGet(VariableGetImpl().foo2) as InterfaceType(Reference to root::dart:core::int*)))
-t10 = _Call set [#lib::A::foo3] (t7, t9)
-t11* = _Call get [#lib::A::foo1] (t7)
-t12* = _Call get [#lib::A::foo2] (t7)
+t8* = _Call get [A::foo2] (t7)
+t9 = _TypeCheck (t8 against dart.core::int*) (for AsExpression(.foo2 as int*))
+t10 = _Call set [A::foo3] (t7, t9)
+t11* = _Call get [A::foo1] (t7)
+t12* = _Call get [A::foo2] (t7)
t13* = _Call dynamic [call] (t12, %a2, %a3, t11)
RESULT: t13
------------- #lib::C::dynamicCalls ------------
+------------ C::dynamicCalls ------------
%this = _Parameter #0 [_T (#lib::C)+]
%aa = _Parameter #1 [_T ANY?]
%a2 = _Parameter #2 [_T (dart.core::Object)+?]
%a3 = _Parameter #3 [_T (dart.core::Object)+?]
%a4 = _Parameter #4 [_T (dart.core::Object)+?]
-t5 = _Call direct [#lib::B::] (_T (#lib::B))
+t5 = _Call direct [B::] (_T (#lib::B))
t6 = _Call dynamic [foo1] (%aa, _T (#lib::B))
t7 = _Narrow (%aa to _T ANY)
t8* = _Call dynamic get [foo2] (t7)
@@ -58,23 +58,23 @@
t10* = _Call dynamic get [foo1] (t7)
t11* = _Call dynamic [foo2] (t7, %a2, %a3, t10)
RESULT: t11
------------- #lib::D:: ------------
+------------ D:: ------------
%this = _Parameter #0 [_T (#lib::D)+]
-t1 = _Call direct [#lib::B::] (%this)
+t1 = _Call direct [B::] (%this)
RESULT: _T {}?
------------- #lib::D::superCalls ------------
+------------ D::superCalls ------------
%this = _Parameter #0 [_T (#lib::D)+]
%a1 = _Parameter #1 [_T (dart.core::Object)+?]
%a2 = _Parameter #2 [_T (dart.core::Object)+?]
%a3 = _Parameter #3 [_T (dart.core::Object)+?]
%a4 = _Parameter #4 [_T (dart.core::Object)+?]
-t5 = _Call direct [#lib::B::bar1] (%this, %a1)
-t6* = _Call direct get [#lib::B::bar4] (%this)
-t7 = _Call direct set [#lib::B::bar3] (%this, t6)
-t8* = _Call direct get [#lib::B::bar2] (%this)
-t9* = _Call direct get [#lib::B::bar1] (%this)
+t5 = _Call direct [B::bar1] (%this, %a1)
+t6* = _Call direct get [B::bar4] (%this)
+t7 = _Call direct set [B::bar3] (%this, t6)
+t8* = _Call direct get [B::bar2] (%this)
+t9* = _Call direct get [B::bar1] (%this)
t10* = _Call dynamic [call] (t8, %a2, %a3, t9)
RESULT: t10
------------- #lib::main ------------
+------------ main ------------
RESULT: _T {}?
diff --git a/pkg/vm/testcases/transformations/type_flow/summary_collector/class_generics_basic.dart.expect b/pkg/vm/testcases/transformations/type_flow/summary_collector/class_generics_basic.dart.expect
index 45a84b6..d64dfc3 100644
--- a/pkg/vm/testcases/transformations/type_flow/summary_collector/class_generics_basic.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/summary_collector/class_generics_basic.dart.expect
@@ -1,108 +1,108 @@
------------- #lib::C:: ------------
+------------ C:: ------------
%this = _Parameter #0 [_T (#lib::C)+]
-t1 = _Call direct [dart.core::Object::] (%this)
+t1 = _Call direct [Object::] (%this)
RESULT: _T {}?
------------- #lib::C::foo ------------
+------------ C::foo ------------
%this = _Parameter #0 [_T (#lib::C)+]
-t1 = _Extract (%this[#lib::C/0])
+t1 = _Extract (%this[#lib::C/0]*)
t2 = _CreateConcreteType (#lib::D @ (t1))
-t3 = _Call direct [#lib::D::] (t2)
+t3 = _Call direct [D::] (t2)
RESULT: t2
------------- #lib::C::id1 ------------
+------------ C::id1 ------------
%this = _Parameter #0 [_T (#lib::C)+]
%x = _Parameter #1
-t2 = _Extract (%this[#lib::C/0])
-t3 = _TypeCheck (%x against t2) (for x)
+t2 = _Extract (%this[#lib::C/0]*)
+t3 = _TypeCheck (%x against t2) (for VariableDeclaration(x))
RESULT: t3
------------- #lib::C::id2 ------------
+------------ C::id2 ------------
%this = _Parameter #0 [_T (#lib::C)+]
%x = _Parameter #1
-t2 = _Extract (%this[#lib::C/0])
-t3 = _TypeCheck (%x against t2) (for x)
+t2 = _Extract (%this[#lib::C/0]*)
+t3 = _TypeCheck (%x against t2) (for VariableDeclaration(x))
RESULT: t3
------------- #lib::D:: ------------
+------------ D:: ------------
%this = _Parameter #0 [_T (#lib::D)+]
-t1 = _Call direct [dart.core::Object::] (%this)
+t1 = _Call direct [Object::] (%this)
RESULT: _T {}?
------------- #lib::E:: ------------
+------------ E:: ------------
%this = _Parameter #0 [_T (#lib::E)+]
-t1 = _Call direct [#lib::C::] (%this)
+t1 = _Call direct [C::] (%this)
RESULT: _T {}?
------------- #lib::E::foo ------------
+------------ E::foo ------------
%this = _Parameter #0 [_T (#lib::E)+]
-t1* = _Call direct [#lib::C::foo] (%this)
+t1* = _Call direct [C::foo] (%this)
RESULT: t1
------------- #lib::E::bar ------------
+------------ E::bar ------------
%this = _Parameter #0 [_T (#lib::E)+]
-t1 = _Extract (%this[#lib::E/0])
+t1 = _Extract (%this[#lib::E/0]*)
t2 = _CreateConcreteType (#lib::D @ (t1))
-t3 = _Call direct [#lib::D::] (t2)
+t3 = _Call direct [D::] (t2)
RESULT: t2
------------- #lib::E::baz ------------
+------------ E::baz ------------
%this = _Parameter #0 [_T (#lib::E)+]
-t1 = _Extract (%this[#lib::E/1])
+t1 = _Extract (%this[#lib::E/1]*)
t2 = _CreateConcreteType (#lib::D @ (t1))
-t3 = _Call direct [#lib::D::] (t2)
+t3 = _Call direct [D::] (t2)
RESULT: t2
------------- #lib::X:: ------------
+------------ X:: ------------
%this = _Parameter #0 [_T (#lib::X)+]
-t1 = _Call direct [dart.core::Object::] (%this)
+t1 = _Call direct [Object::] (%this)
RESULT: _T {}?
------------- #lib::Y:: ------------
+------------ Y:: ------------
%this = _Parameter #0 [_T (#lib::Y)+]
-t1 = _Call direct [#lib::X::] (%this)
+t1 = _Call direct [X::] (%this)
RESULT: _T {}?
------------- #lib::Z:: ------------
+------------ Z:: ------------
%this = _Parameter #0 [_T (#lib::Z)+]
-t1 = _Call direct [#lib::X::] (%this)
+t1 = _Call direct [X::] (%this)
RESULT: _T {}?
------------- #lib::I:: ------------
+------------ I:: ------------
%this = _Parameter #0 [_T (#lib::I)+]
-t1 = _Call direct [dart.core::Object::] (%this)
+t1 = _Call direct [Object::] (%this)
RESULT: _T {}?
------------- #lib::J:: ------------
+------------ J:: ------------
%this = _Parameter #0 [_T (#lib::J)+]
-t1 = _Call direct [#lib::I::] (%this)
+t1 = _Call direct [I::] (%this)
RESULT: _T {}?
------------- #lib::K:: ------------
+------------ K:: ------------
%this = _Parameter #0 [_T (#lib::K)+]
-t1 = _Call direct [dart.core::Object::] (%this)
+t1 = _Call direct [Object::] (%this)
RESULT: _T {}?
------------- #lib::C2:: ------------
+------------ C2:: ------------
%this = _Parameter #0 [_T (#lib::C2)+]
-t1 = _Call direct [dart.core::Object::] (%this)
+t1 = _Call direct [Object::] (%this)
RESULT: _T {}?
------------- #lib::C2::id3 ------------
+------------ C2::id3 ------------
%this = _Parameter #0 [_T (#lib::C2)+]
%x = _Parameter #1
-t2 = _Extract (%this[#lib::C2/0])
-t3 = _CreateRuntimeType (dart.core::Comparable @ (t2))
-t4 = _TypeCheck (%x against t3) (for x)
+t2 = _Extract (%this[#lib::C2/0]*)
+t3 = _CreateRuntimeType (dart.core::Comparable @ (t2)*)
+t4 = _TypeCheck (%x against t3) (for VariableDeclaration(x))
RESULT: t4
------------- #lib::C2::id4 ------------
+------------ C2::id4 ------------
%this = _Parameter #0 [_T (#lib::C2)+]
%x = _Parameter #1
-t2 = _Extract (%this[#lib::C2/0])
-t3 = _CreateRuntimeType (#lib::I @ (t2))
-t4 = _CreateRuntimeType (#lib::K @ (t3))
-t5 = _TypeCheck (%x against t4) (for x)
+t2 = _Extract (%this[#lib::C2/0]*)
+t3 = _CreateRuntimeType (#lib::I @ (t2)*)
+t4 = _CreateRuntimeType (#lib::K @ (t3)*)
+t5 = _TypeCheck (%x against t4) (for VariableDeclaration(x))
RESULT: t5
------------- #lib::main ------------
-t0 = _Call direct [#lib::C::] (_T (#lib::C<dart.core::int>))
-t1 = _Call [#lib::C::foo] (_T (#lib::C<dart.core::int>))
-t2 = _Call direct [#lib::E::] (_T (#lib::E<dart.core::int, dart.core::String>))
-t3 = _Call [#lib::E::foo] (_T (#lib::E<dart.core::int, dart.core::String>))
-t4 = _Call direct [#lib::E::] (_T (#lib::E<dart.core::int, dart.core::String>))
-t5 = _Call [#lib::E::bar] (_T (#lib::E<dart.core::int, dart.core::String>))
-t6 = _Call direct [#lib::E::] (_T (#lib::E<dart.core::int, dart.core::String>))
-t7* = _Call [#lib::E::baz] (_T (#lib::E<dart.core::int, dart.core::String>))
-t8 = _Call direct [#lib::C::] (_T (#lib::C<#lib::Y>))
-t9 = _Call direct [#lib::Y::] (_T (#lib::Y))
-t10 = _Call [#lib::C::id1] (_T (#lib::C<#lib::Y>), _T (#lib::Y))
-t11 = _Call direct [#lib::Z::] (_T (#lib::Z))
-t12 = _Call [#lib::C::id2] (_T (#lib::C<#lib::Y>), _T (#lib::Z))
-t13 = _Call direct [#lib::C2::] (_T (#lib::C2<dart.core::num>))
-t14 = _Call [#lib::C2::id3] (_T (#lib::C2<dart.core::num>), _T (dart.core::_Double, 3.0))
-t15 = _Call direct [#lib::K::] (_T (#lib::K<#lib::J>))
-t16 = _Call [#lib::C2::id4] (_T (#lib::C2<dart.core::num>), _T (#lib::K<#lib::J>))
+------------ main ------------
+t0 = _Call direct [C::] (_T (#lib::C<dart.core::int*>))
+t1 = _Call [C::foo] (_T (#lib::C<dart.core::int*>))
+t2 = _Call direct [E::] (_T (#lib::E<dart.core::int*, dart.core::String*>))
+t3 = _Call [E::foo] (_T (#lib::E<dart.core::int*, dart.core::String*>))
+t4 = _Call direct [E::] (_T (#lib::E<dart.core::int*, dart.core::String*>))
+t5 = _Call [E::bar] (_T (#lib::E<dart.core::int*, dart.core::String*>))
+t6 = _Call direct [E::] (_T (#lib::E<dart.core::int*, dart.core::String*>))
+t7* = _Call [E::baz] (_T (#lib::E<dart.core::int*, dart.core::String*>))
+t8 = _Call direct [C::] (_T (#lib::C<#lib::Y*>))
+t9 = _Call direct [Y::] (_T (#lib::Y))
+t10 = _Call [C::id1] (_T (#lib::C<#lib::Y*>), _T (#lib::Y))
+t11 = _Call direct [Z::] (_T (#lib::Z))
+t12 = _Call [C::id2] (_T (#lib::C<#lib::Y*>), _T (#lib::Z))
+t13 = _Call direct [C2::] (_T (#lib::C2<dart.core::num*>))
+t14 = _Call [C2::id3] (_T (#lib::C2<dart.core::num*>), _T (dart.core::_Double, 3.0))
+t15 = _Call direct [K::] (_T (#lib::K<#lib::J*>))
+t16 = _Call [C2::id4] (_T (#lib::C2<dart.core::num*>), _T (#lib::K<#lib::J*>))
RESULT: t7
diff --git a/pkg/vm/testcases/transformations/type_flow/summary_collector/class_generics_case1.dart.expect b/pkg/vm/testcases/transformations/type_flow/summary_collector/class_generics_case1.dart.expect
index f92bee4..67839f0 100644
--- a/pkg/vm/testcases/transformations/type_flow/summary_collector/class_generics_case1.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/summary_collector/class_generics_case1.dart.expect
@@ -1,44 +1,44 @@
------------- #lib::Element:: ------------
+------------ Element:: ------------
%this = _Parameter #0 [_T (#lib::Element)+]
-t1 = _Call direct [dart.core::Object::] (%this)
+t1 = _Call direct [Object::] (%this)
RESULT: _T {}?
------------- #lib::MockHashMap:: ------------
+------------ MockHashMap:: ------------
%K = _Parameter #0
%V = _Parameter #1
t2 = _CreateConcreteType (#lib::_NotRealHashMap @ (%K, %V))
-t3 = _Call direct [#lib::_NotRealHashMap::] (t2)
+t3 = _Call direct [_NotRealHashMap::] (t2)
RESULT: t2
------------- #lib::_NotRealHashMap:: ------------
+------------ _NotRealHashMap:: ------------
%this = _Parameter #0 [_T (#lib::_NotRealHashMap)+]
-t1 = _Call direct [dart.core::Object::] (%this)
+t1 = _Call direct [Object::] (%this)
RESULT: _T {}?
------------- #lib::_NotRealHashMap::setEntry ------------
+------------ _NotRealHashMap::setEntry ------------
%this = _Parameter #0 [_T (#lib::_NotRealHashMap)+]
%key = _Parameter #1
%value = _Parameter #2
-t3 = _Extract (%this[#lib::_NotRealHashMap/0])
-t4 = _TypeCheck (%key against t3) (for key)
-t5 = _Extract (%this[#lib::_NotRealHashMap/1])
-t6 = _TypeCheck (%value against t5) (for value)
+t3 = _Extract (%this[#lib::_NotRealHashMap/0]*)
+t4 = _TypeCheck (%key against t3) (for VariableDeclaration(key))
+t5 = _Extract (%this[#lib::_NotRealHashMap/1]*)
+t6 = _TypeCheck (%value against t5) (for VariableDeclaration(value))
RESULT: _T {}?
------------- #lib::InheritedElement:: ------------
+------------ InheritedElement:: ------------
%this = _Parameter #0 [_T (#lib::InheritedElement)+]
-t1 = _Call direct [#lib::Element::] (%this)
+t1 = _Call direct [Element::] (%this)
RESULT: _T {}?
------------- #lib::InheritedElement::setDependencies ------------
+------------ InheritedElement::setDependencies ------------
%this = _Parameter #0 [_T (#lib::InheritedElement)+]
%dependent = _Parameter #1 [_T (#lib::Element)+?]
%value = _Parameter #2 [_T (dart.core::Object)+?]
-t3* = _Call virtual get [#lib::InheritedElement::_dependents] (%this)
-t4 = _Call [#lib::MockHashMap::setEntry] (t3, %dependent, %value)
+t3* = _Call virtual get [InheritedElement::_dependents] (%this)
+t4 = _Call [MockHashMap::setEntry] (t3, %dependent, %value)
RESULT: _T {}?
------------- #lib::InheritedElement::_dependents ------------
+------------ InheritedElement::_dependents ------------
%this = _Parameter #0 [_T (#lib::InheritedElement)+]
-t1* = _Call direct [#lib::MockHashMap::] (#lib::Element, dart.core::Object)
+t1* = _Call direct [MockHashMap::] (#lib::Element*, dart.core::Object*)
RESULT: t1
------------- #lib::main ------------
-t0 = _Call direct [#lib::InheritedElement::] (_T (#lib::InheritedElement))
-t1 = _Call [#lib::InheritedElement::setDependencies] (_T (#lib::InheritedElement), _T (#lib::InheritedElement), _T (dart.core::_Smi, 0))
-t2 = _Call direct [#lib::Element::] (_T (#lib::Element))
-t3 = _Call [#lib::InheritedElement::setDependencies] (_T (#lib::InheritedElement), _T (#lib::Element), _T {}?)
+------------ main ------------
+t0 = _Call direct [InheritedElement::] (_T (#lib::InheritedElement))
+t1 = _Call [InheritedElement::setDependencies] (_T (#lib::InheritedElement), _T (#lib::InheritedElement), _T (dart.core::_Smi, 0))
+t2 = _Call direct [Element::] (_T (#lib::Element))
+t3 = _Call [InheritedElement::setDependencies] (_T (#lib::InheritedElement), _T (#lib::Element), _T {}?)
RESULT: _T {}?
diff --git a/pkg/vm/testcases/transformations/type_flow/summary_collector/constants.dart.expect b/pkg/vm/testcases/transformations/type_flow/summary_collector/constants.dart.expect
index b471e61..bf8b008 100644
--- a/pkg/vm/testcases/transformations/type_flow/summary_collector/constants.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/summary_collector/constants.dart.expect
@@ -1,26 +1,26 @@
------------- #lib::smiLiteral ------------
+------------ smiLiteral ------------
RESULT: _T (dart.core::_Smi, 42)
------------- #lib::intLiteral ------------
+------------ intLiteral ------------
RESULT: _T (dart.core::int)+
------------- #lib::strLiteral ------------
+------------ strLiteral ------------
RESULT: _T (dart.core::_OneByteString, abc)
------------- #lib::indexingIntoConstantList1 ------------
+------------ indexingIntoConstantList1 ------------
%i = _Parameter #0 [_T (dart.core::int)+?]
-t1 = _Join [InterfaceType(Reference to root::dart:core::int*)] (_T (dart.core::_Smi, 1), _T (dart.core::_Smi, 2), _T (dart.core::_Smi, 3))
+t1 = _Join [InterfaceType(int*)] (_T (dart.core::_Smi, 1), _T (dart.core::_Smi, 2), _T (dart.core::_Smi, 3))
RESULT: t1
------------- #lib::indexingIntoConstantList2 ------------
+------------ indexingIntoConstantList2 ------------
%i = _Parameter #0 [_T (dart.core::int)+?]
-t1 = _Join [InterfaceType(Reference to root::dart:core::Object*)] (_T (dart.core::_OneByteString, hi), _T (dart.core::_Smi, 33), _T {}?, _T (dart.core::_Smi, -5))
+t1 = _Join [InterfaceType(Object*)] (_T (dart.core::_OneByteString, hi), _T (dart.core::_Smi, 33), _T {}?, _T (dart.core::_Smi, -5))
RESULT: t1
------------- #lib::main ------------
+------------ main ------------
RESULT: _T {}?
------------- #lib::_constList1 ------------
+------------ _constList1 ------------
-RESULT: _T (dart.core::_ImmutableList, ListConstant<InterfaceType(Reference to root::dart:core::int*)>([1, 2, 3]))
------------- #lib::_constList2 ------------
+RESULT: _T (dart.core::_ImmutableList, ListConstant<int*>([1, 2, 3]))
+------------ _constList2 ------------
-RESULT: _T (dart.core::_ImmutableList, ListConstant<InterfaceType(Reference to root::dart:core::Object*)>([hi, 33, null, -5]))
+RESULT: _T (dart.core::_ImmutableList, ListConstant<Object*>([hi, 33, null, -5]))
diff --git a/pkg/vm/testcases/transformations/type_flow/summary_collector/control_flow.dart.expect b/pkg/vm/testcases/transformations/type_flow/summary_collector/control_flow.dart.expect
index 460c362..b13924f 100644
--- a/pkg/vm/testcases/transformations/type_flow/summary_collector/control_flow.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/summary_collector/control_flow.dart.expect
@@ -1,281 +1,281 @@
------------- #lib::C1:: ------------
+------------ C1:: ------------
%this = _Parameter #0 [_T (#lib::C1)+]
-t1 = _Call direct [dart.core::Object::] (%this)
+t1 = _Call direct [Object::] (%this)
RESULT: _T {}?
------------- #lib::C2:: ------------
+------------ C2:: ------------
%this = _Parameter #0 [_T (#lib::C2)+]
-t1 = _Call direct [dart.core::Object::] (%this)
+t1 = _Call direct [Object::] (%this)
RESULT: _T {}?
------------- #lib::C3:: ------------
+------------ C3:: ------------
%this = _Parameter #0 [_T (#lib::C3)+]
-t1 = _Call direct [dart.core::Object::] (%this)
+t1 = _Call direct [Object::] (%this)
RESULT: _T {}?
------------- #lib::C4:: ------------
+------------ C4:: ------------
%this = _Parameter #0 [_T (#lib::C4)+]
-t1 = _Call direct [dart.core::Object::] (%this)
+t1 = _Call direct [Object::] (%this)
RESULT: _T {}?
------------- #lib::TestEnum:: ------------
+------------ TestEnum:: ------------
%this = _Parameter #0 [_T (#lib::TestEnum)+]
%index = _Parameter #1 [_T (dart.core::int)+?]
%_name = _Parameter #2 [_T (dart.core::String)+?]
-t3 = _Call direct set [#lib::TestEnum::index] (%this, %index)
-t4 = _Call direct set [#lib::TestEnum::_name] (%this, %_name)
-t5 = _Call direct [dart.core::Object::] (%this)
+t3 = _Call direct set [TestEnum::index] (%this, %index)
+t4 = _Call direct set [TestEnum::_name] (%this, %_name)
+t5 = _Call direct [Object::] (%this)
RESULT: _T {}?
------------- #lib::TestEnum::toString ------------
+------------ TestEnum::toString ------------
%this = _Parameter #0 [_T (#lib::TestEnum)+]
-t1* = _Call direct get [#lib::TestEnum::_name] (%this)
+t1* = _Call direct get [TestEnum::_name] (%this)
RESULT: t1
------------- #lib::TestEnum::values ------------
+------------ TestEnum::values ------------
-RESULT: _T (dart.core::_ImmutableList, ListConstant<InterfaceType(Reference to #lib::TestEnum*)>([#lib::TestEnum {index: 0, #lib::_name: TestEnum.v1, }, #lib::TestEnum {index: 1, #lib::_name: TestEnum.v2, }]))
------------- #lib::TestEnum::v1 ------------
+RESULT: _T (dart.core::_ImmutableList, ListConstant<TestEnum*>([#lib::TestEnum {index: 0, #lib::_name: TestEnum.v1, }, #lib::TestEnum {index: 1, #lib::_name: TestEnum.v2, }]))
+------------ TestEnum::v1 ------------
RESULT: _T (#lib::TestEnum, #lib::TestEnum {index: 0, #lib::_name: TestEnum.v1, })
------------- #lib::TestEnum::v2 ------------
+------------ TestEnum::v2 ------------
RESULT: _T (#lib::TestEnum, #lib::TestEnum {index: 1, #lib::_name: TestEnum.v2, })
------------- #lib::foo ------------
+------------ foo ------------
%x = _Parameter #0 [_T ANY?]
RESULT: _T {}?
------------- #lib::bar ------------
+------------ bar ------------
%x = _Parameter #0 [_T ANY?]
RESULT: _T {}?
------------- #lib::baz ------------
+------------ baz ------------
%x = _Parameter #0 [_T ANY?]
RESULT: _T {}?
------------- #lib::sequence ------------
-t0 = _Call direct [#lib::C1::] (_T (#lib::C1))
-t1 = _Call direct [#lib::C2::] (_T (#lib::C2))
-t2 = _Call direct [#lib::C3::] (_T (#lib::C3))
+------------ sequence ------------
+t0 = _Call direct [C1::] (_T (#lib::C1))
+t1 = _Call direct [C2::] (_T (#lib::C2))
+t2 = _Call direct [C3::] (_T (#lib::C3))
RESULT: _T (#lib::C3)
------------- #lib::if1 ------------
+------------ if1 ------------
%cond = _Parameter #0 [_T (dart.core::bool)+?]
-t1 = _Call direct [#lib::C1::] (_T (#lib::C1))
-t2 = _Call direct [#lib::C2::] (_T (#lib::C2))
-t3 = _Call direct [#lib::foo] (_T (#lib::C2))
-x_0 = _Join [dynamic] (_T (#lib::C2), _T (#lib::C1))
+t1 = _Call direct [C1::] (_T (#lib::C1))
+t2 = _Call direct [C2::] (_T (#lib::C2))
+t3 = _Call direct [foo] (_T (#lib::C2))
+x_0 = _Join [DynamicType(dynamic)] (_T (#lib::C2), _T (#lib::C1))
RESULT: x_0
------------- #lib::if2 ------------
+------------ if2 ------------
%cond1 = _Parameter #0 [_T (dart.core::bool)+?]
%cond2 = _Parameter #1 [_T (dart.core::bool)+?]
-t2 = _Call direct [#lib::C1::] (_T (#lib::C1))
-t3 = _Call direct [#lib::foo] (_T (#lib::C1))
-t4 = _Call direct [#lib::C2::] (_T (#lib::C2))
-t5 = _Call direct [#lib::bar] (_T (#lib::C2))
-x_0 = _Join [dynamic] (_T (#lib::C1), _T (#lib::C2))
+t2 = _Call direct [C1::] (_T (#lib::C1))
+t3 = _Call direct [foo] (_T (#lib::C1))
+t4 = _Call direct [C2::] (_T (#lib::C2))
+t5 = _Call direct [bar] (_T (#lib::C2))
+x_0 = _Join [DynamicType(dynamic)] (_T (#lib::C1), _T (#lib::C2))
RESULT: x_0
------------- #lib::if3 ------------
+------------ if3 ------------
%cond1 = _Parameter #0 [_T (dart.core::bool)+?]
%cond2 = _Parameter #1 [_T (dart.core::bool)+?]
-t2 = _Call direct [#lib::C1::] (_T (#lib::C1))
-t3 = _Call direct [#lib::C2::] (_T (#lib::C2))
-t4* = _Call direct [#lib::foo] (_T (#lib::C2))
-t5 = _TypeCheck (t4 against dart.core::bool) (for AsExpression(StaticInvocation(Reference to #lib::foo, ArgumentsImpl()) as InterfaceType(Reference to root::dart:core::bool*)))
-t6 = _Call direct [#lib::C3::] (_T (#lib::C3))
-t7* = _Call direct [#lib::foo] (_T (#lib::C3))
-t8 = _TypeCheck (t7 against dart.core::bool) (for AsExpression(StaticInvocation(Reference to #lib::foo, ArgumentsImpl()) as InterfaceType(Reference to root::dart:core::bool*)))
-x_0 = _Join [dynamic] (_T (#lib::C2), _T (#lib::C3))
-t10 = _Call direct [#lib::bar] (x_0)
+t2 = _Call direct [C1::] (_T (#lib::C1))
+t3 = _Call direct [C2::] (_T (#lib::C2))
+t4* = _Call direct [foo] (_T (#lib::C2))
+t5 = _TypeCheck (t4 against dart.core::bool*) (for AsExpression(foo, as bool*))
+t6 = _Call direct [C3::] (_T (#lib::C3))
+t7* = _Call direct [foo] (_T (#lib::C3))
+t8 = _TypeCheck (t7 against dart.core::bool*) (for AsExpression(foo, as bool*))
+x_0 = _Join [DynamicType(dynamic)] (_T (#lib::C2), _T (#lib::C3))
+t10 = _Call direct [bar] (x_0)
RESULT: x_0
------------- #lib::if4 ------------
-t0 = _Call direct [#lib::C1::] (_T (#lib::C1))
-t1 = _Call direct [#lib::C2::] (_T (#lib::C2))
-t2* = _Call direct [#lib::foo] (_T (#lib::C2))
-t3 = _TypeCheck (t2 against dart.core::bool) (for AsExpression(StaticInvocation(Reference to #lib::foo, ArgumentsImpl()) as InterfaceType(Reference to root::dart:core::bool*)))
-t4 = _Call direct [#lib::C3::] (_T (#lib::C3))
-t5* = _Call direct [#lib::foo] (_T (#lib::C3))
-t6 = _TypeCheck (t5 against dart.core::bool) (for AsExpression(StaticInvocation(Reference to #lib::foo, ArgumentsImpl()) as InterfaceType(Reference to root::dart:core::bool*)))
-t7 = _Call direct [#lib::bar] (_T (#lib::C3))
-x_0 = _Join [dynamic] (_T (#lib::C2), _T (#lib::C3))
+------------ if4 ------------
+t0 = _Call direct [C1::] (_T (#lib::C1))
+t1 = _Call direct [C2::] (_T (#lib::C2))
+t2* = _Call direct [foo] (_T (#lib::C2))
+t3 = _TypeCheck (t2 against dart.core::bool*) (for AsExpression(foo, as bool*))
+t4 = _Call direct [C3::] (_T (#lib::C3))
+t5* = _Call direct [foo] (_T (#lib::C3))
+t6 = _TypeCheck (t5 against dart.core::bool*) (for AsExpression(foo, as bool*))
+t7 = _Call direct [bar] (_T (#lib::C3))
+x_0 = _Join [DynamicType(dynamic)] (_T (#lib::C2), _T (#lib::C3))
RESULT: x_0
------------- #lib::if5 ------------
+------------ if5 ------------
%cond = _Parameter #0 [_T (dart.core::bool)+?]
-t1 = _Call direct [#lib::C1::] (_T (#lib::C1))
-t2 = _Call direct [#lib::C2::] (_T (#lib::C2))
-t3 = _Call direct [#lib::foo] (_T (#lib::C1))
+t1 = _Call direct [C1::] (_T (#lib::C1))
+t2 = _Call direct [C2::] (_T (#lib::C2))
+t3 = _Call direct [foo] (_T (#lib::C1))
RESULT: _T {}?
------------- #lib::if6a ------------
+------------ if6a ------------
%x = _Parameter #0 [_T (dart.core::bool)+?]
-t1 = _Call direct [#lib::foo] (_T (dart.core::bool, true))
-t2 = _Call direct [#lib::bar] (_T (dart.core::bool, false))
-x_0 = _Join [InterfaceType(Reference to root::dart:core::bool*)] (_T (dart.core::bool, true), _T (dart.core::bool, false))
-t4 = _Call direct [#lib::baz] (x_0)
+t1 = _Call direct [foo] (_T (dart.core::bool, true))
+t2 = _Call direct [bar] (_T (dart.core::bool, false))
+x_0 = _Join [InterfaceType(bool*)] (_T (dart.core::bool, true), _T (dart.core::bool, false))
+t4 = _Call direct [baz] (x_0)
RESULT: _T {}?
------------- #lib::if6b ------------
+------------ if6b ------------
%x = _Parameter #0 [_T ANY?]
-t1 = _TypeCheck (%x against dart.core::bool) (for AsExpression(VariableGetImpl() as InterfaceType(Reference to root::dart:core::bool*)))
-t2 = _Call direct [#lib::foo] (_T (dart.core::bool, true))
-t3 = _Call direct [#lib::bar] (_T (dart.core::bool, false))
-x_0 = _Join [dynamic] (_T (dart.core::bool, true), _T (dart.core::bool, false))
-t5 = _Call direct [#lib::baz] (x_0)
+t1 = _TypeCheck (%x against dart.core::bool*) (for AsExpression( as bool*))
+t2 = _Call direct [foo] (_T (dart.core::bool, true))
+t3 = _Call direct [bar] (_T (dart.core::bool, false))
+x_0 = _Join [DynamicType(dynamic)] (_T (dart.core::bool, true), _T (dart.core::bool, false))
+t5 = _Call direct [baz] (x_0)
RESULT: _T {}?
------------- #lib::if7 ------------
+------------ if7 ------------
%x = _Parameter #0 [_T (dart.core::int)+?]
%y = _Parameter #1 [_T (dart.core::String)+?]
%z = _Parameter #2 [_T ANY?]
-t3* = _Call [dart.core::num::==] (%x, _T (dart.core::_Smi, 5))
-t4* = _Call [dart.core::String::==] (%y, _T (dart.core::_OneByteString, hi))
-t5* = _Call [dart.core::Object::==] (%z, _T {}?)
-t6 = _Call direct [#lib::foo] (_T (dart.core::_Smi, 5))
-t7 = _Call direct [#lib::foo] (_T (dart.core::_OneByteString, hi))
+t3* = _Call [num::==] (%x, _T (dart.core::_Smi, 5))
+t4* = _Call [String::==] (%y, _T (dart.core::_OneByteString, hi))
+t5* = _Call [Object::==] (%z, _T {}?)
+t6 = _Call direct [foo] (_T (dart.core::_Smi, 5))
+t7 = _Call direct [foo] (_T (dart.core::_OneByteString, hi))
t8 = _Narrow (%z to _T ANY)
-t9 = _Call direct [#lib::foo] (t8)
+t9 = _Call direct [foo] (t8)
RESULT: _T {}?
------------- #lib::if8 ------------
+------------ if8 ------------
%x = _Parameter #0 [_T ANY?]
t1 = _Narrow (%x to _T (dart.core::String)+)
-t2 = _Call direct [#lib::foo] (t1)
+t2 = _Call direct [foo] (t1)
RESULT: _T {}?
------------- #lib::if9 ------------
+------------ if9 ------------
%x = _Parameter #0 [_T (#lib::TestEnum)+?]
-t1* = _Call [dart.core::Object::==] (%x, _T (#lib::TestEnum, #lib::TestEnum {index: 0, #lib::_name: TestEnum.v1, }))
-t2 = _Call direct [#lib::foo] (_T (#lib::TestEnum, #lib::TestEnum {index: 0, #lib::_name: TestEnum.v1, }))
+t1* = _Call [Object::==] (%x, _T (#lib::TestEnum, #lib::TestEnum {index: 0, #lib::_name: TestEnum.v1, }))
+t2 = _Call direct [foo] (_T (#lib::TestEnum, #lib::TestEnum {index: 0, #lib::_name: TestEnum.v1, }))
RESULT: _T {}?
------------- #lib::conditional1 ------------
+------------ conditional1 ------------
%cond1 = _Parameter #0 [_T (dart.core::bool)+?]
%cond2 = _Parameter #1 [_T (dart.core::bool)+?]
-t2 = _Call direct [#lib::C1::] (_T (#lib::C1))
-t3 = _Call direct [#lib::C2::] (_T (#lib::C2))
-t4* = _Call direct [#lib::foo] (_T (#lib::C2))
-t5 = _TypeCheck (t4 against dart.core::bool) (for AsExpression(StaticInvocation(Reference to #lib::foo, ArgumentsImpl()) as InterfaceType(Reference to root::dart:core::bool*)))
-t6 = _Call direct [#lib::C3::] (_T (#lib::C3))
-t7 = _Call direct [#lib::C4::] (_T (#lib::C4))
-x_0 = _Join [dynamic] (_T (#lib::C3), _T (#lib::C4))
-t9 = _Call direct [#lib::foo] (x_0)
-t10 = _Join [InterfaceType(Reference to root::dart:core::Object*)] (_T (#lib::C3), _T (#lib::C4))
+t2 = _Call direct [C1::] (_T (#lib::C1))
+t3 = _Call direct [C2::] (_T (#lib::C2))
+t4* = _Call direct [foo] (_T (#lib::C2))
+t5 = _TypeCheck (t4 against dart.core::bool*) (for AsExpression(foo, as bool*))
+t6 = _Call direct [C3::] (_T (#lib::C3))
+t7 = _Call direct [C4::] (_T (#lib::C4))
+x_0 = _Join [DynamicType(dynamic)] (_T (#lib::C3), _T (#lib::C4))
+t9 = _Call direct [foo] (x_0)
+t10 = _Join [InterfaceType(Object*)] (_T (#lib::C3), _T (#lib::C4))
t11 = _Narrow (t10 to _T (dart.core::Object)+?)
-t12 = _Call direct [#lib::bar] (t11)
+t12 = _Call direct [bar] (t11)
RESULT: _T {}?
------------- #lib::conditional2 ------------
+------------ conditional2 ------------
%cond1 = _Parameter #0 [_T (dart.core::bool)+?]
%cond2 = _Parameter #1 [_T (dart.core::bool)+?]
-t2 = _Call direct [#lib::C1::] (_T (#lib::C1))
-t3 = _Call direct [#lib::C2::] (_T (#lib::C2))
-t4* = _Call direct [#lib::foo] (_T (#lib::C2))
-t5 = _TypeCheck (t4 against dart.core::bool) (for AsExpression(StaticInvocation(Reference to #lib::foo, ArgumentsImpl()) as InterfaceType(Reference to root::dart:core::bool*)))
-t6 = _Call direct [#lib::C3::] (_T (#lib::C3))
-t7 = _Call direct [#lib::C4::] (_T (#lib::C4))
-t8* = _Call direct [#lib::foo] (_T (dart.core::_GrowableList<#lib::C4>))
-t9 = _Call direct [#lib::foo] (_T (#lib::C3))
-t10 = _Join [dynamic] (_T (#lib::C3), t8)
-t11 = _Call direct [#lib::bar] (t10)
+t2 = _Call direct [C1::] (_T (#lib::C1))
+t3 = _Call direct [C2::] (_T (#lib::C2))
+t4* = _Call direct [foo] (_T (#lib::C2))
+t5 = _TypeCheck (t4 against dart.core::bool*) (for AsExpression(foo, as bool*))
+t6 = _Call direct [C3::] (_T (#lib::C3))
+t7 = _Call direct [C4::] (_T (#lib::C4))
+t8* = _Call direct [foo] (_T (dart.core::_GrowableList<#lib::C4*>))
+t9 = _Call direct [foo] (_T (#lib::C3))
+t10 = _Join [DynamicType(dynamic)] (_T (#lib::C3), t8)
+t11 = _Call direct [bar] (t10)
RESULT: _T {}?
------------- #lib::loop1 ------------
-t0 = _Call direct [#lib::C1::] (_T (#lib::C1))
-x_0 = _Join [dynamic] (_T (#lib::C1), _T (#lib::C2))
-t2* = _Call direct [#lib::foo] (x_0)
-t3 = _TypeCheck (t2 against dart.core::bool) (for AsExpression(StaticInvocation(Reference to #lib::foo, ArgumentsImpl()) as InterfaceType(Reference to root::dart:core::bool*)))
-t4 = _Call direct [#lib::C2::] (_T (#lib::C2))
-t5 = _Call direct [#lib::bar] (x_0)
+------------ loop1 ------------
+t0 = _Call direct [C1::] (_T (#lib::C1))
+x_0 = _Join [DynamicType(dynamic)] (_T (#lib::C1), _T (#lib::C2))
+t2* = _Call direct [foo] (x_0)
+t3 = _TypeCheck (t2 against dart.core::bool*) (for AsExpression(foo, as bool*))
+t4 = _Call direct [C2::] (_T (#lib::C2))
+t5 = _Call direct [bar] (x_0)
RESULT: x_0
------------- #lib::loop2 ------------
-t0 = _Call direct [#lib::C1::] (_T (#lib::C1))
-x_0 = _Join [dynamic] (_T (#lib::C1), _T (#lib::C3))
-t2 = _Call direct [#lib::foo] (x_0)
-t3 = _Call direct [#lib::C2::] (_T (#lib::C2))
-t4 = _Call direct [#lib::bar] (_T (#lib::C2))
-t5 = _Call direct [#lib::C3::] (_T (#lib::C3))
-t6* = _Call direct [#lib::bar] (_T (#lib::C3))
-t7 = _TypeCheck (t6 against dart.core::bool) (for AsExpression(StaticInvocation(Reference to #lib::bar, ArgumentsImpl()) as InterfaceType(Reference to root::dart:core::bool*)))
+------------ loop2 ------------
+t0 = _Call direct [C1::] (_T (#lib::C1))
+x_0 = _Join [DynamicType(dynamic)] (_T (#lib::C1), _T (#lib::C3))
+t2 = _Call direct [foo] (x_0)
+t3 = _Call direct [C2::] (_T (#lib::C2))
+t4 = _Call direct [bar] (_T (#lib::C2))
+t5 = _Call direct [C3::] (_T (#lib::C3))
+t6* = _Call direct [bar] (_T (#lib::C3))
+t7 = _TypeCheck (t6 against dart.core::bool*) (for AsExpression(bar, as bool*))
RESULT: _T (#lib::C3)
------------- #lib::loop3 ------------
-t0 = _Call direct [#lib::C1::] (_T (#lib::C1))
-t1 = _Call direct [#lib::C2::] (_T (#lib::C2))
-t2* = _Call direct [#lib::foo] (_T (#lib::C2))
-t3 = _TypeCheck (t2 against dart.core::bool) (for AsExpression(StaticInvocation(Reference to #lib::foo, ArgumentsImpl()) as InterfaceType(Reference to root::dart:core::bool*)))
-t4 = _Call direct [#lib::C3::] (_T (#lib::C3))
-t5 = _Call direct [#lib::bar] (_T (#lib::C2))
+------------ loop3 ------------
+t0 = _Call direct [C1::] (_T (#lib::C1))
+t1 = _Call direct [C2::] (_T (#lib::C2))
+t2* = _Call direct [foo] (_T (#lib::C2))
+t3 = _TypeCheck (t2 against dart.core::bool*) (for AsExpression(foo, as bool*))
+t4 = _Call direct [C3::] (_T (#lib::C3))
+t5 = _Call direct [bar] (_T (#lib::C2))
RESULT: _T (#lib::C2)
------------- #lib::loop4 ------------
-t0 = _Call direct [#lib::C1::] (_T (#lib::C1))
-t1 = _Call direct [#lib::C2::] (_T (#lib::C2))
-t2 = _Call direct [#lib::foo] (_T (#lib::C2))
-t3* = _Call direct [dart._internal::unsafeCast] (_T (dart.core::_GrowableList<dynamic>))
-t4* = _Call get [dart.core::Iterable::iterator] (t3)
-t5* = _Call [dart.core::Iterator::moveNext] (t4)
+------------ loop4 ------------
+t0 = _Call direct [C1::] (_T (#lib::C1))
+t1 = _Call direct [C2::] (_T (#lib::C2))
+t2 = _Call direct [foo] (_T (#lib::C2))
+t3* = _Call direct [unsafeCast] (_T (dart.core::_GrowableList<DynamicType(dynamic)?>))
+t4* = _Call get [Iterable::iterator] (t3)
+t5* = _Call [Iterator::moveNext] (t4)
t6 = _Narrow (t4 to _T ANY)
-t7 = _Call get [dart.core::Iterator::current] (t6)
-x_0 = _Join [dynamic] (_T (#lib::C2), _T (#lib::C3))
-t9 = _Call direct [#lib::foo] (x_0)
-t10 = _Call direct [#lib::C3::] (_T (#lib::C3))
+t7 = _Call get [Iterator::current] (t6)
+x_0 = _Join [DynamicType(dynamic)] (_T (#lib::C2), _T (#lib::C3))
+t9 = _Call direct [foo] (x_0)
+t10 = _Call direct [C3::] (_T (#lib::C3))
RESULT: x_0
------------- #lib::loop5 ------------
-t0 = _Call direct [#lib::C1::] (_T (#lib::C1))
-x_0 = _Join [dynamic] (_T (#lib::C1), _T (#lib::C3))
-t2* = _Call direct [#lib::foo] (x_0)
-t3 = _TypeCheck (t2 against dart.core::bool) (for AsExpression(StaticInvocation(Reference to #lib::foo, ArgumentsImpl()) as InterfaceType(Reference to root::dart:core::bool*)))
-t4 = _Call direct [#lib::C2::] (_T (#lib::C2))
-t5* = _Call direct [#lib::bar] (_T (#lib::C2))
-t6 = _TypeCheck (t5 against dart.core::bool) (for AsExpression(StaticInvocation(Reference to #lib::bar, ArgumentsImpl()) as InterfaceType(Reference to root::dart:core::bool*)))
-t7 = _Call direct [#lib::C3::] (_T (#lib::C3))
-x_1 = _Join [dynamic] (x_0, _T (#lib::C2))
+------------ loop5 ------------
+t0 = _Call direct [C1::] (_T (#lib::C1))
+x_0 = _Join [DynamicType(dynamic)] (_T (#lib::C1), _T (#lib::C3))
+t2* = _Call direct [foo] (x_0)
+t3 = _TypeCheck (t2 against dart.core::bool*) (for AsExpression(foo, as bool*))
+t4 = _Call direct [C2::] (_T (#lib::C2))
+t5* = _Call direct [bar] (_T (#lib::C2))
+t6 = _TypeCheck (t5 against dart.core::bool*) (for AsExpression(bar, as bool*))
+t7 = _Call direct [C3::] (_T (#lib::C3))
+x_1 = _Join [DynamicType(dynamic)] (x_0, _T (#lib::C2))
RESULT: x_1
------------- #lib::loop6 ------------
-t0 = _Call direct [#lib::C1::] (_T (#lib::C1))
-x_1 = _Join [dynamic] (_T (#lib::C3), _T (#lib::C2))
-x_0 = _Join [dynamic] (_T (#lib::C1), x_1)
-t3* = _Call direct [#lib::foo] (x_0)
-t4 = _TypeCheck (t3 against dart.core::bool) (for AsExpression(StaticInvocation(Reference to #lib::foo, ArgumentsImpl()) as InterfaceType(Reference to root::dart:core::bool*)))
-t5 = _Call direct [#lib::C2::] (_T (#lib::C2))
-t6* = _Call direct [#lib::bar] (_T (#lib::C2))
-t7 = _TypeCheck (t6 against dart.core::bool) (for AsExpression(StaticInvocation(Reference to #lib::bar, ArgumentsImpl()) as InterfaceType(Reference to root::dart:core::bool*)))
-t8 = _Call direct [#lib::C3::] (_T (#lib::C3))
+------------ loop6 ------------
+t0 = _Call direct [C1::] (_T (#lib::C1))
+x_1 = _Join [DynamicType(dynamic)] (_T (#lib::C3), _T (#lib::C2))
+x_0 = _Join [DynamicType(dynamic)] (_T (#lib::C1), x_1)
+t3* = _Call direct [foo] (x_0)
+t4 = _TypeCheck (t3 against dart.core::bool*) (for AsExpression(foo, as bool*))
+t5 = _Call direct [C2::] (_T (#lib::C2))
+t6* = _Call direct [bar] (_T (#lib::C2))
+t7 = _TypeCheck (t6 against dart.core::bool*) (for AsExpression(bar, as bool*))
+t8 = _Call direct [C3::] (_T (#lib::C3))
RESULT: x_0
------------- #lib::try1 ------------
-t0 = _Call direct [#lib::C1::] (_T (#lib::C1))
-t1 = _Call direct [#lib::C2::] (_T (#lib::C2))
-x_0 = _Join [dynamic] (_T (#lib::C1), _T (#lib::C2), _T (#lib::C3))
-t3 = _Call direct [#lib::foo] (x_0)
-t4 = _Call direct [#lib::C3::] (_T (#lib::C3))
-t5 = _Call direct [#lib::bar] (x_0)
-t6 = _Call direct [#lib::C4::] (_T (#lib::C4))
+------------ try1 ------------
+t0 = _Call direct [C1::] (_T (#lib::C1))
+t1 = _Call direct [C2::] (_T (#lib::C2))
+x_0 = _Join [DynamicType(dynamic)] (_T (#lib::C1), _T (#lib::C2), _T (#lib::C3))
+t3 = _Call direct [foo] (x_0)
+t4 = _Call direct [C3::] (_T (#lib::C3))
+t5 = _Call direct [bar] (x_0)
+t6 = _Call direct [C4::] (_T (#lib::C4))
RESULT: _T (#lib::C4)
------------- #lib::closure1 ------------
-t0 = _Call direct [#lib::C1::] (_T (#lib::C1))
-x_0 = _Join [dynamic] (_T (#lib::C1), _T (#lib::C2))
-t2 = _Call direct [#lib::foo] (x_0)
-t3 = _Call direct [#lib::bar] (x_0)
-t4 = _Call direct [#lib::foo] (_T ANY?)
-t5 = _Call direct [#lib::C2::] (_T (#lib::C2))
+------------ closure1 ------------
+t0 = _Call direct [C1::] (_T (#lib::C1))
+x_0 = _Join [DynamicType(dynamic)] (_T (#lib::C1), _T (#lib::C2))
+t2 = _Call direct [foo] (x_0)
+t3 = _Call direct [bar] (x_0)
+t4 = _Call direct [foo] (_T ANY?)
+t5 = _Call direct [C2::] (_T (#lib::C2))
RESULT: _T {}?
------------- #lib::closure2 ------------
-t0 = _Call direct [#lib::C1::] (_T (#lib::C1))
-x_0 = _Join [dynamic] (_T (#lib::C1), _T (#lib::C2))
-t2 = _Call direct [#lib::foo] (x_0)
-t3 = _Call direct [#lib::C2::] (_T (#lib::C2))
-t4 = _Call direct [#lib::foo] (_T ANY?)
+------------ closure2 ------------
+t0 = _Call direct [C1::] (_T (#lib::C1))
+x_0 = _Join [DynamicType(dynamic)] (_T (#lib::C1), _T (#lib::C2))
+t2 = _Call direct [foo] (x_0)
+t3 = _Call direct [C2::] (_T (#lib::C2))
+t4 = _Call direct [foo] (_T ANY?)
RESULT: x_0
------------- #lib::switch1 ------------
+------------ switch1 ------------
%selector = _Parameter #0 [_T (dart.core::int)+?]
-t1 = _Call direct [#lib::C1::] (_T (#lib::C1))
-t2 = _Call direct [#lib::C2::] (_T (#lib::C2))
-t3 = _Call direct [#lib::C3::] (_T (#lib::C3))
-x_2 = _Join [dynamic] (_T (#lib::C3), _T (#lib::C1))
-x_3 = _Join [dynamic] (x_2, _T (#lib::C2))
+t1 = _Call direct [C1::] (_T (#lib::C1))
+t2 = _Call direct [C2::] (_T (#lib::C2))
+t3 = _Call direct [C3::] (_T (#lib::C3))
+x_2 = _Join [DynamicType(dynamic)] (_T (#lib::C3), _T (#lib::C1))
+x_3 = _Join [DynamicType(dynamic)] (x_2, _T (#lib::C2))
RESULT: x_3
------------- #lib::switch2 ------------
+------------ switch2 ------------
%selector = _Parameter #0 [_T (dart.core::int)+?]
-t1 = _Call direct [#lib::C1::] (_T (#lib::C1))
-t2 = _Call direct [#lib::C2::] (_T (#lib::C2))
-t3 = _Call direct [#lib::C3::] (_T (#lib::C3))
-x_2 = _Join [dynamic] (_T (#lib::C3), _T (#lib::C2))
+t1 = _Call direct [C1::] (_T (#lib::C1))
+t2 = _Call direct [C2::] (_T (#lib::C2))
+t3 = _Call direct [C3::] (_T (#lib::C3))
+x_2 = _Join [DynamicType(dynamic)] (_T (#lib::C3), _T (#lib::C2))
RESULT: x_2
------------- #lib::switch3 ------------
+------------ switch3 ------------
%selector = _Parameter #0 [_T (dart.core::int)+?]
-t1 = _Call direct [#lib::C1::] (_T (#lib::C1))
-t2 = _Call direct [#lib::C2::] (_T (#lib::C2))
-x_1 = _Join [dynamic] (_T (#lib::C1), _T (#lib::C2))
-t4 = _Call direct [#lib::foo] (x_1)
-t5 = _Call direct [#lib::C3::] (_T (#lib::C3))
-x_2 = _Join [dynamic] (_T (#lib::C1), _T (#lib::C3))
+t1 = _Call direct [C1::] (_T (#lib::C1))
+t2 = _Call direct [C2::] (_T (#lib::C2))
+x_1 = _Join [DynamicType(dynamic)] (_T (#lib::C1), _T (#lib::C2))
+t4 = _Call direct [foo] (x_1)
+t5 = _Call direct [C3::] (_T (#lib::C3))
+x_2 = _Join [DynamicType(dynamic)] (_T (#lib::C1), _T (#lib::C3))
RESULT: x_2
------------- #lib::cast1 ------------
+------------ cast1 ------------
%x = _Parameter #0 [_T ANY?]
-t1 = _TypeCheck (%x against #lib::C1) (for AsExpression(VariableGetImpl() as InterfaceType(Reference to #lib::C1*)))
-t2 = _Call direct [#lib::foo] (t1)
-t3 = _Call direct [#lib::bar] (t1)
+t1 = _TypeCheck (%x against #lib::C1*) (for AsExpression( as C1*))
+t2 = _Call direct [foo] (t1)
+t3 = _Call direct [bar] (t1)
RESULT: _T {}?
------------- #lib::main ------------
+------------ main ------------
RESULT: _T {}?
diff --git a/pkg/vm/testcases/transformations/type_flow/summary_collector/hello.dart.expect b/pkg/vm/testcases/transformations/type_flow/summary_collector/hello.dart.expect
index 504cd3b..c7ac584 100644
--- a/pkg/vm/testcases/transformations/type_flow/summary_collector/hello.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/summary_collector/hello.dart.expect
@@ -1,4 +1,4 @@
------------- #lib::main ------------
+------------ main ------------
%args = _Parameter #0 [_T (dart.core::List)+?]
-t1 = _Call direct [dart.core::print] (_T (dart.core::_OneByteString, Hello, world!))
+t1 = _Call direct [print] (_T (dart.core::_OneByteString, Hello, world!))
RESULT: _T {}?
diff --git a/pkg/vm/testcases/transformations/type_flow/summary_collector/implicit_return_null.dart.expect b/pkg/vm/testcases/transformations/type_flow/summary_collector/implicit_return_null.dart.expect
index ec16190..5e1a025 100644
--- a/pkg/vm/testcases/transformations/type_flow/summary_collector/implicit_return_null.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/summary_collector/implicit_return_null.dart.expect
@@ -1,133 +1,133 @@
------------- #lib::T:: ------------
+------------ T:: ------------
%this = _Parameter #0 [_T (#lib::T)+]
-t1 = _Call direct [dart.core::Object::] (%this)
+t1 = _Call direct [Object::] (%this)
RESULT: _T {}?
------------- #lib::empty1 ------------
+------------ empty1 ------------
RESULT: _T {}?
------------- #lib::empty2 ------------
+------------ empty2 ------------
RESULT: _T {}?
------------- #lib::empty3 ------------
+------------ empty3 ------------
RESULT: _T {}?
------------- #lib::empty4 ------------
+------------ empty4 ------------
RESULT: _T {}?
------------- #lib::return1 ------------
-t0 = _Call direct [#lib::T::] (_T (#lib::T))
+------------ return1 ------------
+t0 = _Call direct [T::] (_T (#lib::T))
RESULT: _T (#lib::T)
------------- #lib::return2 ------------
+------------ return2 ------------
%i = _Parameter #0 [_T (dart.core::int)+?]
-t1* = _Call [dart.core::num::-] (%i, _T (dart.core::_Smi, 1))
-t2* = _Call direct [#lib::return2] (t1)
+t1* = _Call [num::-] (%i, _T (dart.core::_Smi, 1))
+t2* = _Call direct [return2] (t1)
RESULT: t2
------------- #lib::return3 ------------
-t0 = _Call direct [#lib::T::] (_T (#lib::T))
+------------ return3 ------------
+t0 = _Call direct [T::] (_T (#lib::T))
RESULT: _T (#lib::T)
------------- #lib::return4 ------------
+------------ return4 ------------
RESULT: _T {}?
------------- #lib::expr1 ------------
-t0 = _Call direct [#lib::T::] (_T (#lib::T))
+------------ expr1 ------------
+t0 = _Call direct [T::] (_T (#lib::T))
RESULT: _T {}?
------------- #lib::expr2 ------------
+------------ expr2 ------------
%c = _Parameter #0 [_T (dart.core::bool)+?]
-t1 = _Call direct [#lib::T::] (_T (#lib::T))
-t2 = _Call direct [#lib::T::] (_T (#lib::T))
-%result = _Join [dynamic] (_T (#lib::T), _T {}?)
+t1 = _Call direct [T::] (_T (#lib::T))
+t2 = _Call direct [T::] (_T (#lib::T))
+%result = _Join [DynamicType(dynamic)] (_T (#lib::T), _T {}?)
RESULT: %result
------------- #lib::expr3 ------------
+------------ expr3 ------------
%c = _Parameter #0 [_T (dart.core::bool)+?]
%x = _Parameter #1 [_T (dart.core::Object)+?]
-t2 = _Call direct [#lib::T::] (_T (#lib::T))
-t3 = _Call [dart.core::Object::toString] (%x)
-%result = _Join [dynamic] (_T (#lib::T), _T {}?)
+t2 = _Call direct [T::] (_T (#lib::T))
+t3 = _Call [Object::toString] (%x)
+%result = _Join [DynamicType(dynamic)] (_T (#lib::T), _T {}?)
RESULT: %result
------------- #lib::throw1 ------------
+------------ throw1 ------------
%c = _Parameter #0 [_T (dart.core::bool)+?]
%x = _Parameter #1 [_T (dart.core::Object)+?]
RESULT: _T {}
------------- #lib::throw2 ------------
+------------ throw2 ------------
%c = _Parameter #0 [_T (dart.core::bool)+?]
%x = _Parameter #1 [_T (dart.core::Object)+?]
-t2 = _Call direct [#lib::T::] (_T (#lib::T))
+t2 = _Call direct [T::] (_T (#lib::T))
RESULT: _T (#lib::T)
------------- #lib::loop1 ------------
+------------ loop1 ------------
%c = _Parameter #0 [_T (dart.core::bool)+?]
%x = _Parameter #1 [_T (dart.core::Object)+?]
RESULT: _T {}?
------------- #lib::loop2 ------------
+------------ loop2 ------------
%c = _Parameter #0 [_T (dart.core::bool)+?]
%x = _Parameter #1 [_T (dart.core::Object)+?]
-t2 = _Call direct [#lib::T::] (_T (#lib::T))
-%result = _Join [dynamic] (_T (#lib::T), _T {}?)
+t2 = _Call direct [T::] (_T (#lib::T))
+%result = _Join [DynamicType(dynamic)] (_T (#lib::T), _T {}?)
RESULT: %result
------------- #lib::loop3 ------------
+------------ loop3 ------------
%c = _Parameter #0 [_T (dart.core::bool)+?]
%x = _Parameter #1 [_T (dart.core::Object)+?]
-t2 = _Call direct [#lib::T::] (_T (#lib::T))
-%result = _Join [dynamic] (_T (#lib::T), _T {}?)
+t2 = _Call direct [T::] (_T (#lib::T))
+%result = _Join [DynamicType(dynamic)] (_T (#lib::T), _T {}?)
RESULT: %result
------------- #lib::switch_ ------------
+------------ switch_ ------------
%c = _Parameter #0 [_T (dart.core::bool)+?]
%i = _Parameter #1 [_T (dart.core::int)+?]
-t2 = _Call direct [#lib::T::] (_T (#lib::T))
-%result = _Join [dynamic] (_T (#lib::T), _T {}?)
+t2 = _Call direct [T::] (_T (#lib::T))
+%result = _Join [DynamicType(dynamic)] (_T (#lib::T), _T {}?)
RESULT: %result
------------- #lib::if1 ------------
+------------ if1 ------------
%c = _Parameter #0 [_T (dart.core::bool)+?]
-t1 = _Call direct [#lib::T::] (_T (#lib::T))
+t1 = _Call direct [T::] (_T (#lib::T))
RESULT: _T (#lib::T)
------------- #lib::if2 ------------
+------------ if2 ------------
%c = _Parameter #0 [_T (dart.core::bool)+?]
-t1 = _Call direct [#lib::T::] (_T (#lib::T))
-%result = _Join [dynamic] (_T (#lib::T), _T {}?)
+t1 = _Call direct [T::] (_T (#lib::T))
+%result = _Join [DynamicType(dynamic)] (_T (#lib::T), _T {}?)
RESULT: %result
------------- #lib::if3 ------------
+------------ if3 ------------
%c = _Parameter #0 [_T (dart.core::bool)+?]
RESULT: _T {}?
------------- #lib::if4 ------------
+------------ if4 ------------
%c = _Parameter #0 [_T (dart.core::bool)+?]
RESULT: _T {}?
------------- #lib::if5 ------------
+------------ if5 ------------
%c = _Parameter #0 [_T (dart.core::bool)+?]
-t1* = _Call direct [#lib::if5] (_T (dart.core::bool, true))
-t2* = _Call direct [#lib::if5] (_T (dart.core::bool))
-%result = _Join [void] (t1, t2, _T {}?)
+t1* = _Call direct [if5] (_T (dart.core::bool, true))
+t2* = _Call direct [if5] (_T (dart.core::bool))
+%result = _Join [VoidType(void)] (t1, t2, _T {}?)
RESULT: %result
------------- #lib::label1 ------------
+------------ label1 ------------
%c = _Parameter #0 [_T (dart.core::bool)+?]
-t1 = _Call direct [#lib::T::] (_T (#lib::T))
-%result = _Join [dynamic] (_T (#lib::T), _T {}?)
+t1 = _Call direct [T::] (_T (#lib::T))
+%result = _Join [DynamicType(dynamic)] (_T (#lib::T), _T {}?)
RESULT: %result
------------- #lib::try1 ------------
+------------ try1 ------------
%c = _Parameter #0 [_T (dart.core::bool)+?]
-t1 = _Call direct [#lib::T::] (_T (#lib::T))
-%result = _Join [dynamic] (_T (#lib::T), _T {}?)
+t1 = _Call direct [T::] (_T (#lib::T))
+%result = _Join [DynamicType(dynamic)] (_T (#lib::T), _T {}?)
RESULT: %result
------------- #lib::try2 ------------
-t0 = _Call direct [#lib::T::] (_T (#lib::T))
-%result = _Join [dynamic] (_T (#lib::T), _T {}?)
+------------ try2 ------------
+t0 = _Call direct [T::] (_T (#lib::T))
+%result = _Join [DynamicType(dynamic)] (_T (#lib::T), _T {}?)
RESULT: %result
------------- #lib::try3 ------------
-t0 = _Call direct [#lib::T::] (_T (#lib::T))
+------------ try3 ------------
+t0 = _Call direct [T::] (_T (#lib::T))
RESULT: _T (#lib::T)
------------- #lib::try4 ------------
+------------ try4 ------------
%c = _Parameter #0 [_T (dart.core::bool)+?]
-t1 = _Call direct [#lib::T::] (_T (#lib::T))
-%result = _Join [dynamic] (_T (#lib::T), _T {}?)
+t1 = _Call direct [T::] (_T (#lib::T))
+%result = _Join [DynamicType(dynamic)] (_T (#lib::T), _T {}?)
RESULT: %result
------------- #lib::try5 ------------
-t0 = _Call direct [#lib::T::] (_T (#lib::T))
+------------ try5 ------------
+t0 = _Call direct [T::] (_T (#lib::T))
RESULT: _T (#lib::T)
------------- #lib::try6 ------------
-t0 = _Call direct [#lib::T::] (_T (#lib::T))
+------------ try6 ------------
+t0 = _Call direct [T::] (_T (#lib::T))
RESULT: _T (#lib::T)
------------- #lib::try7 ------------
+------------ try7 ------------
%c = _Parameter #0 [_T (dart.core::bool)+?]
-t1 = _Call direct [#lib::T::] (_T (#lib::T))
+t1 = _Call direct [T::] (_T (#lib::T))
RESULT: _T (#lib::T)
------------- #lib::main ------------
+------------ main ------------
RESULT: _T {}?
diff --git a/pkg/vm/testcases/transformations/type_flow/summary_collector/params.dart.expect b/pkg/vm/testcases/transformations/type_flow/summary_collector/params.dart.expect
index 02d140f..9de3345 100644
--- a/pkg/vm/testcases/transformations/type_flow/summary_collector/params.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/summary_collector/params.dart.expect
@@ -1,4 +1,4 @@
------------- #lib::t1 ------------
+------------ t1 ------------
%a1 = _Parameter #0 [_T ANY?]
%a2 = _Parameter #1 [_T ANY?]
%a3 = _Parameter #2 [_T ANY?]
@@ -8,7 +8,7 @@
t6* = _Call dynamic [foo3] (%a3)
t7* = _Call dynamic [+] (t5, t6)
RESULT: t7
------------- #lib::t2 ------------
+------------ t2 ------------
%a3 = _Parameter #0 [_T ANY?]
%a2 = _Parameter #1 [_T ANY?]
%a1 = _Parameter #2 [_T ANY?]
@@ -18,7 +18,7 @@
t6* = _Call dynamic [foo3] (%a3)
t7* = _Call dynamic [+] (t5, t6)
RESULT: t7
------------- #lib::t3 ------------
+------------ t3 ------------
%a1 = _Parameter #0 [_T ANY?]
%a2 = _Parameter #1 [_T ANY?]
%a3 = _Parameter #2 [_T ANY?]
@@ -37,7 +37,7 @@
t15* = _Call dynamic [foo6] (%a6)
t16* = _Call dynamic [+] (t14, t15)
RESULT: t16
------------- #lib::t4 ------------
+------------ t4 ------------
%a1 = _Parameter #0 [_T ANY?]
%a2 = _Parameter #1 [_T ANY?]
%a3 = _Parameter #2 [_T ANY?]
@@ -56,7 +56,7 @@
t15* = _Call dynamic [foo6] (%a6)
t16* = _Call dynamic [+] (t14, t15)
RESULT: t16
------------- #lib::t5 ------------
+------------ t5 ------------
%a1 = _Parameter #0 [_T ANY?]
%a2 = _Parameter #1 [_T ANY?]
%a3 = _Parameter #2 [_T ANY?]
@@ -75,7 +75,7 @@
t15* = _Call dynamic [foo6] (%a6)
t16* = _Call dynamic [+] (t14, t15)
RESULT: t16
------------- #lib::t6 ------------
+------------ t6 ------------
%a1 = _Parameter #0 [_T ANY?]
%a2 = _Parameter #1 [_T ANY?]
%a3 = _Parameter #2 [_T ANY?]
@@ -94,7 +94,7 @@
t15* = _Call dynamic [foo6] (%a6)
t16* = _Call dynamic [+] (t14, t15)
RESULT: t16
------------- #lib::t7 ------------
+------------ t7 ------------
%a1 = _Parameter #0 [_T ANY?]
%a2 = _Parameter #1 [_T ANY?]
%a3 = _Parameter #2 [_T ANY?]
@@ -113,7 +113,7 @@
t15* = _Call dynamic [foo6] (%a6)
t16* = _Call dynamic [+] (t14, t15)
RESULT: t16
------------- #lib::calls ------------
+------------ calls ------------
%x1 = _Parameter #0 [_T ANY?]
%x2 = _Parameter #1 [_T ANY?]
%x3 = _Parameter #2 [_T ANY?]
@@ -123,19 +123,19 @@
%x7 = _Parameter #6 [_T ANY?]
%x8 = _Parameter #7 [_T ANY?]
%x9 = _Parameter #8 [_T ANY?]
-t9 = _Call direct [#lib::t1] (%x1, %x2, %x3)
-t10 = _Call direct [#lib::t2] (%x1, %x2, %x3)
-t11 = _Call direct [#lib::t3] (%x1, %x2, %x3)
-t12 = _Call direct [#lib::t3] (%x1, %x2, %x3, %x4)
-t13 = _Call direct [#lib::t4] (%x1, %x2, %x3, %x4, %x5)
-t14 = _Call direct [#lib::t5] (%x1, %x2, %x3)
-t15 = _Call direct [#lib::t5] (%x1, %x2, %x3, a4: %x4)
-t16 = _Call direct [#lib::t5] (%x1, %x2, %x3, a5: %x4)
-t17 = _Call direct [#lib::t5] (%x1, %x2, %x3, a5: %x5, a6: %x4)
-t18 = _Call direct [#lib::t6] (%x1, %x2, %x3, a4: %x4, a6: %x5)
-t19 = _Call direct [#lib::t6] (%x1, %x2, %x3, a4: %x4, a5: %x5, a6: %x6)
-t20 = _Call direct [#lib::t7] (%x1, %x2, %x3, a4: %x4, a5: %x6, a6: %x5)
+t9 = _Call direct [t1] (%x1, %x2, %x3)
+t10 = _Call direct [t2] (%x1, %x2, %x3)
+t11 = _Call direct [t3] (%x1, %x2, %x3)
+t12 = _Call direct [t3] (%x1, %x2, %x3, %x4)
+t13 = _Call direct [t4] (%x1, %x2, %x3, %x4, %x5)
+t14 = _Call direct [t5] (%x1, %x2, %x3)
+t15 = _Call direct [t5] (%x1, %x2, %x3, a4: %x4)
+t16 = _Call direct [t5] (%x1, %x2, %x3, a5: %x4)
+t17 = _Call direct [t5] (%x1, %x2, %x3, a5: %x5, a6: %x4)
+t18 = _Call direct [t6] (%x1, %x2, %x3, a4: %x4, a6: %x5)
+t19 = _Call direct [t6] (%x1, %x2, %x3, a4: %x4, a5: %x5, a6: %x6)
+t20 = _Call direct [t7] (%x1, %x2, %x3, a4: %x4, a5: %x6, a6: %x5)
RESULT: _T {}?
------------- #lib::main ------------
+------------ main ------------
RESULT: _T {}?
diff --git a/pkg/vm/testcases/transformations/type_flow/summary_collector/setter_result.dart.expect b/pkg/vm/testcases/transformations/type_flow/summary_collector/setter_result.dart.expect
index e79a010..f2ab39c 100644
--- a/pkg/vm/testcases/transformations/type_flow/summary_collector/setter_result.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/summary_collector/setter_result.dart.expect
@@ -1,53 +1,53 @@
------------- #lib::T:: ------------
+------------ T:: ------------
%this = _Parameter #0 [_T (#lib::T)+]
-t1 = _Call direct [dart.core::Object::] (%this)
+t1 = _Call direct [Object::] (%this)
RESULT: _T {}?
------------- #lib::A:: ------------
+------------ A:: ------------
%this = _Parameter #0 [_T (#lib::A)+]
-t1 = _Call direct [dart.core::Object::] (%this)
+t1 = _Call direct [Object::] (%this)
RESULT: _T {}?
------------- #lib::A::foo ------------
+------------ A::foo ------------
%this = _Parameter #0 [_T (#lib::A)+]
RESULT: _T {}?
------------- #lib::B:: ------------
+------------ B:: ------------
%this = _Parameter #0 [_T (#lib::B)+]
-t1 = _Call direct [#lib::A::] (%this)
+t1 = _Call direct [A::] (%this)
RESULT: _T {}?
------------- #lib::B::foo ------------
+------------ B::foo ------------
%this = _Parameter #0 [_T (#lib::B)+]
%x = _Parameter #1 [_T ANY?]
RESULT: _T {}?
------------- #lib::B::testPropertySet ------------
+------------ B::testPropertySet ------------
%this = _Parameter #0 [_T (#lib::B)+]
%x = _Parameter #1 [_T ANY?]
-t2 = _Call virtual set [#lib::B::foo] (%this, %x)
-t3 = _Call direct [#lib::use] (%x)
+t2 = _Call virtual set [B::foo] (%this, %x)
+t3 = _Call direct [use] (%x)
RESULT: _T {}?
------------- #lib::B::testDynamicPropertySet ------------
+------------ B::testDynamicPropertySet ------------
%this = _Parameter #0 [_T (#lib::B)+]
%x = _Parameter #1 [_T ANY?]
%y = _Parameter #2 [_T ANY?]
t3 = _Call dynamic set [foo] (%x, %y)
-t4 = _Call direct [#lib::use] (%y)
+t4 = _Call direct [use] (%y)
RESULT: _T {}?
------------- #lib::B::testSuperPropertySet ------------
+------------ B::testSuperPropertySet ------------
%this = _Parameter #0 [_T (#lib::B)+]
%x = _Parameter #1 [_T ANY?]
-t2 = _Call direct set [#lib::A::foo] (%this, %x)
-t3 = _Call direct [#lib::use] (%x)
+t2 = _Call direct set [A::foo] (%this, %x)
+t3 = _Call direct [use] (%x)
RESULT: _T {}?
------------- #lib::B::testStaticPropertySet ------------
+------------ B::testStaticPropertySet ------------
%this = _Parameter #0 [_T (#lib::B)+]
%x = _Parameter #1 [_T ANY?]
-t2 = _Call direct set [#lib::B::bar] (%x)
-t3 = _Call direct [#lib::use] (%x)
+t2 = _Call direct set [B::bar] (%x)
+t3 = _Call direct [use] (%x)
RESULT: _T {}?
------------- #lib::B::bar ------------
+------------ B::bar ------------
RESULT: _T {}?
------------- #lib::use ------------
+------------ use ------------
%x = _Parameter #0 [_T ANY?]
RESULT: _T {}?
------------- #lib::main ------------
+------------ main ------------
RESULT: _T {}?
diff --git a/pkg/vm/testcases/transformations/type_flow/summary_collector/vars.dart.expect b/pkg/vm/testcases/transformations/type_flow/summary_collector/vars.dart.expect
index c6281be..c1d9b3f 100644
--- a/pkg/vm/testcases/transformations/type_flow/summary_collector/vars.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/summary_collector/vars.dart.expect
@@ -1,45 +1,45 @@
------------- #lib::A:: ------------
+------------ A:: ------------
%this = _Parameter #0 [_T (#lib::A)+]
-t1 = _Call direct [dart.core::Object::] (%this)
+t1 = _Call direct [Object::] (%this)
RESULT: _T {}?
------------- #lib::B:: ------------
+------------ B:: ------------
%this = _Parameter #0 [_T (#lib::B)+]
-t1 = _Call direct [dart.core::Object::] (%this)
+t1 = _Call direct [Object::] (%this)
RESULT: _T {}?
------------- #lib::foo ------------
+------------ foo ------------
%a1 = _Parameter #0 [_T (dart.core::Object)+?]
%a2 = _Parameter #1 [_T (dart.core::Object)+?]
-t2* = _Call direct get [#lib::someStatic] ()
-t3 = _Call direct [#lib::A::] (_T (#lib::A))
-a1_0 = _Join [InterfaceType(Reference to root::dart:core::Object*)] (_T (#lib::A), %a1)
-t5 = _Call direct [#lib::bar] (a1_0, _T (dart.core::_Smi, 42))
-t6 = _Call direct [#lib::B::] (_T (#lib::B))
-t7* = _Call [dart.core::Object::==] (_T (#lib::B), %a2)
-t8 = _Join [InterfaceType(Reference to root::dart:core::Object*)] (_T (#lib::B), %a2)
+t2* = _Call direct get [someStatic] ()
+t3 = _Call direct [A::] (_T (#lib::A))
+a1_0 = _Join [InterfaceType(Object*)] (_T (#lib::A), %a1)
+t5 = _Call direct [bar] (a1_0, _T (dart.core::_Smi, 42))
+t6 = _Call direct [B::] (_T (#lib::B))
+t7* = _Call [Object::==] (_T (#lib::B), %a2)
+t8 = _Join [InterfaceType(Object*)] (_T (#lib::B), %a2)
t9 = _Narrow (t8 to _T (dart.core::Object)+?)
RESULT: t9
------------- #lib::bar ------------
+------------ bar ------------
%a1 = _Parameter #0 [_T (dart.core::Object)+?]
%a2 = _Parameter #1 [_T (dart.core::int)+?]
t2 = _Narrow (%a1 to _T (dart.core::int)+)
-t3* = _Call [dart.core::num::+] (t2, %a2)
-t4* = _Call [dart.core::num::*] (t3, _T (dart.core::_Smi, 3))
-t5* = _Call [dart.core::int::unary-] (_T (dart.core::_Smi, 1))
-%result = _Join [InterfaceType(Reference to root::dart:core::int*)] (t4, t5)
+t3* = _Call [num::+] (t2, %a2)
+t4* = _Call [num::*] (t3, _T (dart.core::_Smi, 3))
+t5* = _Call [int::unary-] (_T (dart.core::_Smi, 1))
+%result = _Join [InterfaceType(int*)] (t4, t5)
RESULT: %result
------------- #lib::loop1 ------------
+------------ loop1 ------------
%a1 = _Parameter #0 [_T (dart.core::Object)+?]
%a2 = _Parameter #1 [_T (dart.core::Object)+?]
-t2 = _Call direct [#lib::loop1] (%a1, %a1)
+t2 = _Call direct [loop1] (%a1, %a1)
RESULT: %a2
------------- #lib::loop2 ------------
+------------ loop2 ------------
%x = _Parameter #0 [_T (dart.core::int)+?]
-t1* = _Call [dart.core::num::+] (_T (dart.core::int)+, _T (dart.core::_Smi, 1))
-i_0 = _Join [InterfaceType(Reference to root::dart:core::int*)] (_T (dart.core::_Smi, 0), t1)
-t3* = _Call [dart.core::num::<] (i_0, _T (dart.core::_Smi, 5))
-t4* = _Call [dart.core::num::+] (_T (dart.core::int)+?, _T (dart.core::_Smi, 10))
-x_0 = _Join [InterfaceType(Reference to root::dart:core::int*)] (%x, t4)
+t1* = _Call [num::+] (_T (dart.core::int)+, _T (dart.core::_Smi, 1))
+i_0 = _Join [InterfaceType(int*)] (_T (dart.core::_Smi, 0), t1)
+t3* = _Call [num::<] (i_0, _T (dart.core::_Smi, 5))
+t4* = _Call [num::+] (_T (dart.core::int)+?, _T (dart.core::_Smi, 10))
+x_0 = _Join [InterfaceType(int*)] (%x, t4)
RESULT: x_0
------------- #lib::main ------------
+------------ main ------------
RESULT: _T {}?
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/annotation.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/annotation.dart.expect
index 19cfe54..fca9065 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/annotation.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/annotation.dart.expect
@@ -30,11 +30,11 @@
}
[@vm.unboxing-info.metadata=(b)->i]static method foo([@vm.inferred-type.metadata=dart.core::Null? (value: null)] (core::List<core::int*>*) →* void a) → core::int* {
@#C9 core::int* x = 2;
- return [@vm.direct-call.metadata=dart.core::_IntegerImplementation::+] [@vm.inferred-type.metadata=int (skip check)] x.{core::num::+}(2);
+ return [@vm.direct-call.metadata=_IntegerImplementation::+] [@vm.inferred-type.metadata=int (skip check)] x.{core::num::+}(2);
}
@#C11
static method main(core::List<core::String*>* args) → dynamic {
self::A::staticMethod();
- [@vm.direct-call.metadata=#lib::B::instanceMethod] [@vm.inferred-type.metadata=!? (skip check)] new self::B::•().{self::B::instanceMethod}();
+ [@vm.direct-call.metadata=B::instanceMethod] [@vm.inferred-type.metadata=!? (skip check)] new self::B::•().{self::B::instanceMethod}();
self::foo(null);
}
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/bench_is_prime.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/bench_is_prime.dart.expect
index cc7e808..2dcdcb8 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/bench_is_prime.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/bench_is_prime.dart.expect
@@ -4,19 +4,19 @@
import "dart:_internal" as _in;
[@vm.unboxing-info.metadata=(i)->b]static method isPrime([@vm.inferred-type.metadata=int] dynamic n) → core::bool* {
- if(_in::unsafeCast<core::bool*>([@vm.direct-call.metadata=dart.core::_IntegerImplementation::<] [@vm.inferred-type.metadata=dart.core::bool] n.<(2)))
+ if(_in::unsafeCast<core::bool*>([@vm.direct-call.metadata=_IntegerImplementation::<] [@vm.inferred-type.metadata=dart.core::bool] n.<(2)))
return false;
- for (core::int* i = 2; [@vm.direct-call.metadata=dart.core::_IntegerImplementation::<=] [@vm.inferred-type.metadata=dart.core::bool (skip check)] [@vm.direct-call.metadata=dart.core::_IntegerImplementation::*] [@vm.inferred-type.metadata=int (skip check)] i.{core::num::*}(i).{core::num::<=}(_in::unsafeCast<core::num*>(n)); i = [@vm.direct-call.metadata=dart.core::_IntegerImplementation::+] [@vm.inferred-type.metadata=int (skip check)] i.{core::num::+}(1)) {
- if([@vm.direct-call.metadata=dart.core::_IntegerImplementation::==] [@vm.inferred-type.metadata=dart.core::bool (skip check)] [@vm.direct-call.metadata=dart.core::_IntegerImplementation::%] [@vm.inferred-type.metadata=int] n.%(i).{core::Object::==}(0))
+ for (core::int* i = 2; [@vm.direct-call.metadata=_IntegerImplementation::<=] [@vm.inferred-type.metadata=dart.core::bool (skip check)] [@vm.direct-call.metadata=_IntegerImplementation::*] [@vm.inferred-type.metadata=int (skip check)] i.{core::num::*}(i).{core::num::<=}(_in::unsafeCast<core::num*>(n)); i = [@vm.direct-call.metadata=_IntegerImplementation::+] [@vm.inferred-type.metadata=int (skip check)] i.{core::num::+}(1)) {
+ if([@vm.direct-call.metadata=_IntegerImplementation::==] [@vm.inferred-type.metadata=dart.core::bool (skip check)] [@vm.direct-call.metadata=_IntegerImplementation::%] [@vm.inferred-type.metadata=int] n.%(i).{core::Object::==}(0))
return false;
}
return true;
}
[@vm.unboxing-info.metadata=(i)->b]static method nThPrimeNumber([@vm.inferred-type.metadata=dart.core::_Smi (value: 50000)] core::int* n) → core::int* {
core::int* counter = 0;
- for (core::int* i = 1; ; i = [@vm.direct-call.metadata=dart.core::_IntegerImplementation::+??] [@vm.inferred-type.metadata=int (skip check)] i.{core::num::+}(1)) {
+ for (core::int* i = 1; ; i = [@vm.direct-call.metadata=_IntegerImplementation::+??] [@vm.inferred-type.metadata=int (skip check)] i.{core::num::+}(1)) {
if([@vm.inferred-type.metadata=dart.core::bool] self::isPrime(i))
- counter = [@vm.direct-call.metadata=dart.core::_IntegerImplementation::+??] [@vm.inferred-type.metadata=int (skip check)] counter.{core::num::+}(1);
+ counter = [@vm.direct-call.metadata=_IntegerImplementation::+??] [@vm.inferred-type.metadata=int (skip check)] counter.{core::num::+}(1);
if([@vm.inferred-type.metadata=dart.core::bool] counter.{core::num::==}(n)) {
return i;
}
@@ -30,10 +30,10 @@
}
}
static method main(core::List<core::String*>* args) → dynamic {
- core::Stopwatch* timer = let final core::Stopwatch* #t1 = new core::Stopwatch::•() in let final void #t2 = [@vm.direct-call.metadata=dart.core::Stopwatch::start] [@vm.inferred-type.metadata=!? (skip check)] #t1.{core::Stopwatch::start}() in #t1;
- for (core::int* i = 0; [@vm.direct-call.metadata=dart.core::_IntegerImplementation::<] [@vm.inferred-type.metadata=dart.core::bool (skip check)] i.{core::num::<}(100); i = [@vm.direct-call.metadata=dart.core::_IntegerImplementation::+] [@vm.inferred-type.metadata=int (skip check)] i.{core::num::+}(1)) {
+ core::Stopwatch* timer = let final core::Stopwatch* #t1 = new core::Stopwatch::•() in let final void #t2 = [@vm.direct-call.metadata=Stopwatch::start] [@vm.inferred-type.metadata=!? (skip check)] #t1.{core::Stopwatch::start}() in #t1;
+ for (core::int* i = 0; [@vm.direct-call.metadata=_IntegerImplementation::<] [@vm.inferred-type.metadata=dart.core::bool (skip check)] i.{core::num::<}(100); i = [@vm.direct-call.metadata=_IntegerImplementation::+] [@vm.inferred-type.metadata=int (skip check)] i.{core::num::+}(1)) {
self::run();
}
- [@vm.direct-call.metadata=dart.core::Stopwatch::stop] [@vm.inferred-type.metadata=!? (skip check)] timer.{core::Stopwatch::stop}();
- core::print("Elapsed ${[@vm.direct-call.metadata=dart.core::Stopwatch::elapsedMilliseconds] timer.{core::Stopwatch::elapsedMilliseconds}}ms");
+ [@vm.direct-call.metadata=Stopwatch::stop] [@vm.inferred-type.metadata=!? (skip check)] timer.{core::Stopwatch::stop}();
+ core::print("Elapsed ${[@vm.direct-call.metadata=Stopwatch::elapsedMilliseconds] timer.{core::Stopwatch::elapsedMilliseconds}}ms");
}
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/bench_vector.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/bench_vector.dart.expect
index 509b16a..9ae4ab1 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/bench_vector.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/bench_vector.dart.expect
@@ -13,24 +13,24 @@
: self::_Vector::_offset = 0, self::_Vector::_length = size, self::_Vector::_elements = [@vm.inferred-type.metadata=dart.typed_data::_Float64List] typ::Float64List::•(size), super core::Object::•()
;
[@vm.procedure-attributes.metadata=getterCalledDynamically:false,hasTearOffUses:false,methodOrSetterSelectorId:1] [@vm.unboxing-info.metadata=(b)->d] operator []([@vm.inferred-type.metadata=!] core::int* i) → core::double*
- return [@vm.direct-call.metadata=dart.typed_data::_Float64List::[]] [@vm.inferred-type.metadata=dart.core::_Double (skip check)] [@vm.direct-call.metadata=#lib::_Vector::_elements] [@vm.inferred-type.metadata=dart.typed_data::_Float64List] this.{self::_Vector::_elements}.{core::List::[]}([@vm.direct-call.metadata=dart.core::_IntegerImplementation::+] [@vm.inferred-type.metadata=int (skip check)] i.{core::num::+}([@vm.direct-call.metadata=#lib::_Vector::_offset] [@vm.inferred-type.metadata=dart.core::_Smi (value: 0)] this.{self::_Vector::_offset}));
+ return [@vm.direct-call.metadata=_Float64List::[]] [@vm.inferred-type.metadata=dart.core::_Double (skip check)] [@vm.direct-call.metadata=_Vector::_elements] [@vm.inferred-type.metadata=dart.typed_data::_Float64List] this.{self::_Vector::_elements}.{core::List::[]}([@vm.direct-call.metadata=_IntegerImplementation::+] [@vm.inferred-type.metadata=int (skip check)] i.{core::num::+}([@vm.direct-call.metadata=_Vector::_offset] [@vm.inferred-type.metadata=dart.core::_Smi (value: 0)] this.{self::_Vector::_offset}));
[@vm.procedure-attributes.metadata=getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:2] operator []=([@vm.inferred-type.metadata=dart.core::_OneByteString] core::int* i, core::double* value) → void {
- let dynamic #t1 = [@vm.direct-call.metadata=#lib::_Vector::_elements] [@vm.inferred-type.metadata=dart.typed_data::_Float64List] this.{self::_Vector::_elements} in let dynamic #t2 = i in let dynamic #t3 = [@vm.direct-call.metadata=#lib::_Vector::_offset] [@vm.inferred-type.metadata=dart.core::_Smi (value: 0)] this.{self::_Vector::_offset} in throw "Attempt to execute code removed by Dart AOT compiler (TFA)";
+ let dynamic #t1 = [@vm.direct-call.metadata=_Vector::_elements] [@vm.inferred-type.metadata=dart.typed_data::_Float64List] this.{self::_Vector::_elements} in let dynamic #t2 = i in let dynamic #t3 = [@vm.direct-call.metadata=_Vector::_offset] [@vm.inferred-type.metadata=dart.core::_Smi (value: 0)] this.{self::_Vector::_offset} in throw "Attempt to execute code removed by Dart AOT compiler (TFA)";
}
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3] [@vm.unboxing-info.metadata=(b)->d] operator *([@vm.inferred-type.metadata=#lib::_Vector?] self::_Vector* a) → core::double* {
core::double* result = 0.0;
- for (core::int* i = 0; [@vm.direct-call.metadata=dart.core::_IntegerImplementation::<] [@vm.inferred-type.metadata=dart.core::bool (skip check)] i.{core::num::<}([@vm.direct-call.metadata=#lib::_Vector::_length] [@vm.inferred-type.metadata=dart.core::_Smi (value: 10)] this.{self::_Vector::_length}); i = [@vm.direct-call.metadata=dart.core::_IntegerImplementation::+] [@vm.inferred-type.metadata=int (skip check)] i.{core::num::+}(1))
- result = [@vm.direct-call.metadata=dart.core::_Double::+??] [@vm.inferred-type.metadata=dart.core::_Double (skip check)] result.{core::double::+}([@vm.direct-call.metadata=dart.core::_Double::*] [@vm.inferred-type.metadata=dart.core::_Double (skip check)] [@vm.direct-call.metadata=#lib::_Vector::[]] [@vm.inferred-type.metadata=dart.core::_Double (skip check)] this.{self::_Vector::[]}(i).{core::double::*}([@vm.direct-call.metadata=#lib::_Vector::[]??] [@vm.inferred-type.metadata=dart.core::_Double (skip check)] a.{self::_Vector::[]}(i)));
+ for (core::int* i = 0; [@vm.direct-call.metadata=_IntegerImplementation::<] [@vm.inferred-type.metadata=dart.core::bool (skip check)] i.{core::num::<}([@vm.direct-call.metadata=_Vector::_length] [@vm.inferred-type.metadata=dart.core::_Smi (value: 10)] this.{self::_Vector::_length}); i = [@vm.direct-call.metadata=_IntegerImplementation::+] [@vm.inferred-type.metadata=int (skip check)] i.{core::num::+}(1))
+ result = [@vm.direct-call.metadata=_Double::+??] [@vm.inferred-type.metadata=dart.core::_Double (skip check)] result.{core::double::+}([@vm.direct-call.metadata=_Double::*] [@vm.inferred-type.metadata=dart.core::_Double (skip check)] [@vm.direct-call.metadata=_Vector::[]] [@vm.inferred-type.metadata=dart.core::_Double (skip check)] this.{self::_Vector::[]}(i).{core::double::*}([@vm.direct-call.metadata=_Vector::[]??] [@vm.inferred-type.metadata=dart.core::_Double (skip check)] a.{self::_Vector::[]}(i)));
return result;
}
}
[@vm.inferred-type.metadata=#lib::_Vector?]static field self::_Vector* v = new self::_Vector::•(10);
[@vm.inferred-type.metadata=dart.core::_Double?]static field core::double* x = 0.0;
static method main(core::List<core::String*>* args) → dynamic {
- core::Stopwatch* timer = let final core::Stopwatch* #t4 = new core::Stopwatch::•() in let final void #t5 = [@vm.direct-call.metadata=dart.core::Stopwatch::start] [@vm.inferred-type.metadata=!? (skip check)] #t4.{core::Stopwatch::start}() in #t4;
- for (core::int* i = 0; [@vm.direct-call.metadata=dart.core::_IntegerImplementation::<] [@vm.inferred-type.metadata=dart.core::bool (skip check)] i.{core::num::<}(100000000); i = [@vm.direct-call.metadata=dart.core::_IntegerImplementation::+] [@vm.inferred-type.metadata=int (skip check)] i.{core::num::+}(1)) {
- self::x = [@vm.direct-call.metadata=dart.core::_Double::+??] [@vm.inferred-type.metadata=dart.core::_Double (skip check)] [@vm.inferred-type.metadata=dart.core::_Double?] self::x.{core::double::+}([@vm.direct-call.metadata=#lib::_Vector::*??] [@vm.inferred-type.metadata=dart.core::_Double (skip check)] [@vm.inferred-type.metadata=#lib::_Vector?] self::v.{self::_Vector::*}([@vm.inferred-type.metadata=#lib::_Vector?] self::v));
+ core::Stopwatch* timer = let final core::Stopwatch* #t4 = new core::Stopwatch::•() in let final void #t5 = [@vm.direct-call.metadata=Stopwatch::start] [@vm.inferred-type.metadata=!? (skip check)] #t4.{core::Stopwatch::start}() in #t4;
+ for (core::int* i = 0; [@vm.direct-call.metadata=_IntegerImplementation::<] [@vm.inferred-type.metadata=dart.core::bool (skip check)] i.{core::num::<}(100000000); i = [@vm.direct-call.metadata=_IntegerImplementation::+] [@vm.inferred-type.metadata=int (skip check)] i.{core::num::+}(1)) {
+ self::x = [@vm.direct-call.metadata=_Double::+??] [@vm.inferred-type.metadata=dart.core::_Double (skip check)] [@vm.inferred-type.metadata=dart.core::_Double?] self::x.{core::double::+}([@vm.direct-call.metadata=_Vector::*??] [@vm.inferred-type.metadata=dart.core::_Double (skip check)] [@vm.inferred-type.metadata=#lib::_Vector?] self::v.{self::_Vector::*}([@vm.inferred-type.metadata=#lib::_Vector?] self::v));
}
- [@vm.direct-call.metadata=dart.core::Stopwatch::stop] [@vm.inferred-type.metadata=!? (skip check)] timer.{core::Stopwatch::stop}();
- core::print("Elapsed ${[@vm.direct-call.metadata=dart.core::Stopwatch::elapsedMilliseconds] timer.{core::Stopwatch::elapsedMilliseconds}}ms, result ${self::x}");
+ [@vm.direct-call.metadata=Stopwatch::stop] [@vm.inferred-type.metadata=!? (skip check)] timer.{core::Stopwatch::stop}();
+ core::print("Elapsed ${[@vm.direct-call.metadata=Stopwatch::elapsedMilliseconds] timer.{core::Stopwatch::elapsedMilliseconds}}ms, result ${self::x}");
}
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/class_generics_basic.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/class_generics_basic.dart.expect
index 6188f8a..7598d3f 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/class_generics_basic.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/class_generics_basic.dart.expect
@@ -23,7 +23,7 @@
: super self::C::•()
;
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:1,getterSelectorId:2] method foo() → dynamic
- return [@vm.inferred-type.metadata=#lib::D<InterfaceType(Reference to root::dart:core::String*)>] super.{self::C::foo}();
+ return [@vm.inferred-type.metadata=#lib::D<InterfaceType(String*)>] super.{self::C::foo}();
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:7,getterSelectorId:8] method bar() → dynamic
return new self::D::•<self::E::S*>();
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:9,getterSelectorId:10] method baz() → dynamic
@@ -59,18 +59,18 @@
;
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:11,getterSelectorId:12] method id3([@vm.inferred-type.metadata=dart.core::_Double (skip check) (value: 3.0)] generic-covariant-impl core::Comparable<self::C2::T*>* x) → dynamic
return x;
-[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:13,getterSelectorId:14] method id4([@vm.inferred-type.metadata=#lib::K<InterfaceType(Reference to #lib::J*)> (skip check)] generic-covariant-impl self::K<self::I<self::C2::T*>*>* x) → dynamic
+[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:13,getterSelectorId:14] method id4([@vm.inferred-type.metadata=#lib::K<InterfaceType(J*)> (skip check)] generic-covariant-impl self::K<self::I<self::C2::T*>*>* x) → dynamic
return x;
}
static method main() → dynamic {
- core::print([@vm.direct-call.metadata=#lib::C::foo] [@vm.inferred-type.metadata=#lib::D<InterfaceType(Reference to root::dart:core::int*)> (skip check)] new self::C::•<core::int*>().{self::C::foo}());
- core::print([@vm.direct-call.metadata=#lib::E::foo] [@vm.inferred-type.metadata=#lib::D<InterfaceType(Reference to root::dart:core::String*)> (skip check)] new self::E::•<core::int*, core::String*>().{self::E::foo}());
- core::print([@vm.direct-call.metadata=#lib::E::bar] [@vm.inferred-type.metadata=#lib::D<InterfaceType(Reference to root::dart:core::int*)> (skip check)] new self::E::•<core::int*, core::String*>().{self::E::bar}());
- core::print([@vm.direct-call.metadata=#lib::E::baz] [@vm.inferred-type.metadata=#lib::D<InterfaceType(Reference to root::dart:core::String*)> (skip check)] new self::E::•<core::int*, core::String*>().{self::E::baz}());
+ core::print([@vm.direct-call.metadata=C::foo] [@vm.inferred-type.metadata=#lib::D<InterfaceType(int*)> (skip check)] new self::C::•<core::int*>().{self::C::foo}());
+ core::print([@vm.direct-call.metadata=E::foo] [@vm.inferred-type.metadata=#lib::D<InterfaceType(String*)> (skip check)] new self::E::•<core::int*, core::String*>().{self::E::foo}());
+ core::print([@vm.direct-call.metadata=E::bar] [@vm.inferred-type.metadata=#lib::D<InterfaceType(int*)> (skip check)] new self::E::•<core::int*, core::String*>().{self::E::bar}());
+ core::print([@vm.direct-call.metadata=E::baz] [@vm.inferred-type.metadata=#lib::D<InterfaceType(String*)> (skip check)] new self::E::•<core::int*, core::String*>().{self::E::baz}());
self::C<self::X*>* c = new self::C::•<self::Y*>();
- [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Reference to #lib::C*)] [@vm.direct-call.metadata=#lib::C::id1] [@vm.inferred-type.metadata=!? (skip check)] c.{self::C::id1}(new self::Y::•());
- [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Reference to #lib::C*)] [@vm.direct-call.metadata=#lib::C::id2] c.{self::C::id2}(new self::Z::•());
+ [@vm.call-site-attributes.metadata=receiverType:InterfaceType(C<X*>*)] [@vm.direct-call.metadata=C::id1] [@vm.inferred-type.metadata=!? (skip check)] c.{self::C::id1}(new self::Y::•());
+ [@vm.call-site-attributes.metadata=receiverType:InterfaceType(C<X*>*)] [@vm.direct-call.metadata=C::id2] c.{self::C::id2}(new self::Z::•());
self::C2<core::num*>* c2 = new self::C2::•<core::num*>();
- [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Reference to #lib::C2*)] [@vm.direct-call.metadata=#lib::C2::id3] [@vm.inferred-type.metadata=!? (skip check)] c2.{self::C2::id3}(3.0);
- [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Reference to #lib::C2*)] [@vm.direct-call.metadata=#lib::C2::id4] [@vm.inferred-type.metadata=!? (skip check)] c2.{self::C2::id4}(new self::K::•<self::J*>());
+ [@vm.call-site-attributes.metadata=receiverType:InterfaceType(C2<num*>*)] [@vm.direct-call.metadata=C2::id3] [@vm.inferred-type.metadata=!? (skip check)] c2.{self::C2::id3}(3.0);
+ [@vm.call-site-attributes.metadata=receiverType:InterfaceType(C2<num*>*)] [@vm.direct-call.metadata=C2::id4] [@vm.inferred-type.metadata=!? (skip check)] c2.{self::C2::id4}(new self::K::•<self::J*>());
}
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/class_generics_case1.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/class_generics_case1.dart.expect
index 701445c..ae04116 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/class_generics_case1.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/class_generics_case1.dart.expect
@@ -10,16 +10,16 @@
;
}
class InheritedElement extends self::Element {
-[@vm.inferred-type.metadata=dart.collection::_InternalLinkedHashMap<InterfaceType(Reference to #lib::Element*), InterfaceType(Reference to root::dart:core::Object*)>] [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3,getterSelectorId:4] final field core::Map<self::Element*, core::Object*>* _dependents = <self::Element*, core::Object*>{};
+[@vm.inferred-type.metadata=dart.collection::_InternalLinkedHashMap<InterfaceType(Element*), InterfaceType(Object*)>] [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3,getterSelectorId:4] final field core::Map<self::Element*, core::Object*>* _dependents = <self::Element*, core::Object*>{};
synthetic constructor •() → self::InheritedElement*
: super self::Element::•()
;
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:1,getterSelectorId:2] method setDependencies([@vm.inferred-type.metadata=!] self::Element* dependent, [@vm.inferred-type.metadata=dart.core::_Smi?] core::Object* value) → void {
- [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Reference to root::dart:core::Map*)] [@vm.direct-call.metadata=dart.collection::__InternalLinkedHashMap&_HashVMBase&MapMixin&_LinkedHashMapMixin::[]=] [@vm.inferred-type.metadata=!? (skip check)] [@vm.direct-call.metadata=#lib::InheritedElement::_dependents] [@vm.inferred-type.metadata=dart.collection::_InternalLinkedHashMap<InterfaceType(Reference to #lib::Element*), InterfaceType(Reference to root::dart:core::Object*)>] this.{self::InheritedElement::_dependents}.{core::Map::[]=}(dependent, value);
+ [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Map<Element*, Object*>*)] [@vm.direct-call.metadata=__InternalLinkedHashMap&_HashVMBase&MapMixin&_LinkedHashMapMixin::[]=] [@vm.inferred-type.metadata=!? (skip check)] [@vm.direct-call.metadata=InheritedElement::_dependents] [@vm.inferred-type.metadata=dart.collection::_InternalLinkedHashMap<InterfaceType(Element*), InterfaceType(Object*)>] this.{self::InheritedElement::_dependents}.{core::Map::[]=}(dependent, value);
}
}
static method main() → dynamic {
self::InheritedElement* ie = new self::InheritedElement::•();
- [@vm.direct-call.metadata=#lib::InheritedElement::setDependencies] [@vm.inferred-type.metadata=!? (skip check)] ie.{self::InheritedElement::setDependencies}(ie, 0);
- [@vm.direct-call.metadata=#lib::InheritedElement::setDependencies] [@vm.inferred-type.metadata=!? (skip check)] ie.{self::InheritedElement::setDependencies}(new self::Element::•(), null);
+ [@vm.direct-call.metadata=InheritedElement::setDependencies] [@vm.inferred-type.metadata=!? (skip check)] ie.{self::InheritedElement::setDependencies}(ie, 0);
+ [@vm.direct-call.metadata=InheritedElement::setDependencies] [@vm.inferred-type.metadata=!? (skip check)] ie.{self::InheritedElement::setDependencies}(new self::Element::•(), null);
}
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/const_prop.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/const_prop.dart.expect
index 9f278403..a06f14d 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/const_prop.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/const_prop.dart.expect
@@ -33,8 +33,8 @@
core::print([@vm.inferred-type.metadata=dart.core::_Double (value: 100.0)] self::getD);
}
static method testStrings([@vm.inferred-type.metadata=#lib::A] self::A* a0, [@vm.inferred-type.metadata=dart.core::_OneByteString (value: bazz)] core::String* a1) → void {
- core::print([@vm.direct-call.metadata=#lib::A::foo] [@vm.inferred-type.metadata=dart.core::_OneByteString (value: foo)] a0.{self::A::foo});
- core::print([@vm.direct-call.metadata=#lib::A::getBar] [@vm.inferred-type.metadata=dart.core::_OneByteString (skip check) (value: bar)] a0.{self::A::getBar}());
+ core::print([@vm.direct-call.metadata=A::foo] [@vm.inferred-type.metadata=dart.core::_OneByteString (value: foo)] a0.{self::A::foo});
+ core::print([@vm.direct-call.metadata=A::getBar] [@vm.inferred-type.metadata=dart.core::_OneByteString (skip check) (value: bar)] a0.{self::A::getBar}());
core::print(a1);
}
static method testPassEnum([@vm.inferred-type.metadata=#lib::B (value: #lib::B {index: 1, #lib::_name: B.b2, })] self::B* arg) → void {
@@ -45,7 +45,7 @@
}
static method getList() → dynamic
return #C6;
-static method testList([@vm.inferred-type.metadata=dart.core::_ImmutableList (value: ListConstant<InterfaceType(Reference to root::dart:core::int*)>([1, 2, 3]))] dynamic arg1, [[@vm.inferred-type.metadata=dart.core::_ImmutableList (value: ListConstant<InterfaceType(Reference to root::dart:core::int*)>([4, 5]))] dynamic arg2 = #C9]) → void {
+static method testList([@vm.inferred-type.metadata=dart.core::_ImmutableList (value: ListConstant<int*>([1, 2, 3]))] dynamic arg1, [[@vm.inferred-type.metadata=dart.core::_ImmutableList (value: ListConstant<int*>([4, 5]))] dynamic arg2 = #C9]) → void {
core::print(arg1);
core::print(arg2);
}
@@ -56,5 +56,5 @@
self::testDouble(3.14);
self::testStrings(new self::A::•(), "bazz");
self::testPassEnum(#C11);
- self::testList([@vm.inferred-type.metadata=dart.core::_ImmutableList (value: ListConstant<InterfaceType(Reference to root::dart:core::int*)>([1, 2, 3]))] self::getList());
+ self::testList([@vm.inferred-type.metadata=dart.core::_ImmutableList (value: ListConstant<int*>([1, 2, 3]))] self::getList());
}
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/devirt.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/devirt.dart.expect
index e683026..50a1095 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/devirt.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/devirt.dart.expect
@@ -40,16 +40,16 @@
[@vm.inferred-type.metadata=!? (skip check)] aa.{self::A::foo}();
}
static method callerA2([@vm.inferred-type.metadata=#lib::B] self::A* aa) → void {
- [@vm.direct-call.metadata=#lib::B::foo] [@vm.inferred-type.metadata=!? (skip check)] aa.{self::A::foo}();
+ [@vm.direct-call.metadata=B::foo] [@vm.inferred-type.metadata=!? (skip check)] aa.{self::A::foo}();
}
static method callerA3([@vm.inferred-type.metadata=#lib::C] self::A* aa) → void {
- [@vm.direct-call.metadata=#lib::C::foo] [@vm.inferred-type.metadata=!? (skip check)] aa.{self::A::foo}();
+ [@vm.direct-call.metadata=C::foo] [@vm.inferred-type.metadata=!? (skip check)] aa.{self::A::foo}();
}
static method callerA4([@vm.inferred-type.metadata=#lib::D?] self::A* aa) → void {
- [@vm.direct-call.metadata=#lib::C::foo??] [@vm.inferred-type.metadata=!? (skip check)] aa.{self::A::foo}();
+ [@vm.direct-call.metadata=C::foo??] [@vm.inferred-type.metadata=!? (skip check)] aa.{self::A::foo}();
}
static method callerE1([@vm.inferred-type.metadata=dart.core::_OneByteString (value: abc)] dynamic x) → void {
- [@vm.direct-call.metadata=dart.core::_StringBase::toString] [@vm.inferred-type.metadata=!? (skip check) (receiver not int)] x.{core::Object::toString}();
+ [@vm.direct-call.metadata=_StringBase::toString] [@vm.inferred-type.metadata=!? (skip check) (receiver not int)] x.{core::Object::toString}();
}
static method callerE2([@vm.inferred-type.metadata=#lib::E?] dynamic x) → void {
[@vm.inferred-type.metadata=!? (receiver not int)] x.{core::Object::toString}();
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/dynamic_list_access.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/dynamic_list_access.dart.expect
index c2edab0..311cf20 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/dynamic_list_access.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/dynamic_list_access.dart.expect
@@ -3,6 +3,6 @@
import "dart:core" as core;
static method main() → dynamic {
- dynamic x = [@vm.inferred-type.metadata=dart.core::_List<InterfaceType(Reference to root::dart:core::int*)>] core::_List::•<core::int*>(10);
- [@vm.direct-call.metadata=dart.core::_IntegerImplementation::+??] [@vm.direct-call.metadata=dart.core::_List::[]] [@vm.inferred-type.metadata=int? (receiver not int)] x.[](0).+(10);
+ dynamic x = [@vm.inferred-type.metadata=dart.core::_List<InterfaceType(int*)>] core::_List::•<core::int*>(10);
+ [@vm.direct-call.metadata=_IntegerImplementation::+??] [@vm.direct-call.metadata=_List::[]] [@vm.inferred-type.metadata=int? (receiver not int)] x.[](0).+(10);
}
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/future.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/future.dart.expect
index 406725b..a5252eb 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/future.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/future.dart.expect
@@ -10,26 +10,26 @@
: super core::Object::•()
;
[@vm.procedure-attributes.metadata=getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:1,getterSelectorId:2] method test2c([@vm.inferred-type.metadata=dart.core::_Smi (skip check) (value: 3)] generic-covariant-impl asy::FutureOr<self::C::T*>* x) → void {}
-[@vm.procedure-attributes.metadata=getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3,getterSelectorId:4] method test3c([@vm.inferred-type.metadata=dart.async::_Future<InterfaceType(Reference to root::dart:core::int*)> (skip check)] generic-covariant-impl asy::Future<self::C::T*>* x) → void {}
-[@vm.procedure-attributes.metadata=getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:5,getterSelectorId:6] method test4c([@vm.inferred-type.metadata=dart.async::_Future<InterfaceType(Reference to root::dart:core::int*)> (skip check)] generic-covariant-impl asy::FutureOr<self::C::T*>* x) → void {}
-[@vm.procedure-attributes.metadata=getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:7,getterSelectorId:8] method test2r([@vm.inferred-type.metadata=#lib::C<InterfaceType(Reference to root::dart:core::int*)> (skip check)] generic-covariant-impl self::C<asy::FutureOr<self::C::T*>*>* x) → void {}
-[@vm.procedure-attributes.metadata=getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:9,getterSelectorId:10] method test3r([@vm.inferred-type.metadata=#lib::C<InterfaceType(Reference to root::dart:async::Future*)> (skip check)] generic-covariant-impl self::C<asy::Future<self::C::T*>*>* x) → void {}
-[@vm.procedure-attributes.metadata=getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:11,getterSelectorId:12] method test4r([@vm.inferred-type.metadata=#lib::C<InterfaceType(Reference to root::dart:async::Future*)> (skip check)] generic-covariant-impl self::C<asy::FutureOr<self::C::T*>*>* x) → void {}
-[@vm.procedure-attributes.metadata=getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:13,getterSelectorId:14] method test5r([@vm.inferred-type.metadata=#lib::C<InterfaceType(Reference to root::dart:async::FutureOr*)>] generic-covariant-impl self::C<asy::Future<self::C::T*>*>* x) → void {}
-[@vm.procedure-attributes.metadata=getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:15,getterSelectorId:16] method test6r([@vm.inferred-type.metadata=#lib::C<InterfaceType(Reference to root::dart:async::FutureOr*)> (skip check)] generic-covariant-impl self::C<asy::FutureOr<self::C::T*>*>* x) → void {}
-[@vm.procedure-attributes.metadata=getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:17,getterSelectorId:18] method test7r([@vm.inferred-type.metadata=#lib::C<InterfaceType(Reference to root::dart:async::FutureOr*)>] generic-covariant-impl self::C<self::C::T*>* x) → void {}
-[@vm.procedure-attributes.metadata=getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:19,getterSelectorId:20] method test8r([@vm.inferred-type.metadata=#lib::C<InterfaceType(Reference to root::dart:async::Future*)>] generic-covariant-impl self::C<self::C::T*>* x) → void {}
+[@vm.procedure-attributes.metadata=getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3,getterSelectorId:4] method test3c([@vm.inferred-type.metadata=dart.async::_Future<InterfaceType(int*)> (skip check)] generic-covariant-impl asy::Future<self::C::T*>* x) → void {}
+[@vm.procedure-attributes.metadata=getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:5,getterSelectorId:6] method test4c([@vm.inferred-type.metadata=dart.async::_Future<InterfaceType(int*)> (skip check)] generic-covariant-impl asy::FutureOr<self::C::T*>* x) → void {}
+[@vm.procedure-attributes.metadata=getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:7,getterSelectorId:8] method test2r([@vm.inferred-type.metadata=#lib::C<InterfaceType(int*)> (skip check)] generic-covariant-impl self::C<asy::FutureOr<self::C::T*>*>* x) → void {}
+[@vm.procedure-attributes.metadata=getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:9,getterSelectorId:10] method test3r([@vm.inferred-type.metadata=#lib::C<InterfaceType(Future<int*>*)> (skip check)] generic-covariant-impl self::C<asy::Future<self::C::T*>*>* x) → void {}
+[@vm.procedure-attributes.metadata=getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:11,getterSelectorId:12] method test4r([@vm.inferred-type.metadata=#lib::C<InterfaceType(Future<int*>*)> (skip check)] generic-covariant-impl self::C<asy::FutureOr<self::C::T*>*>* x) → void {}
+[@vm.procedure-attributes.metadata=getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:13,getterSelectorId:14] method test5r([@vm.inferred-type.metadata=#lib::C<InterfaceType(FutureOr<int*>*)>] generic-covariant-impl self::C<asy::Future<self::C::T*>*>* x) → void {}
+[@vm.procedure-attributes.metadata=getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:15,getterSelectorId:16] method test6r([@vm.inferred-type.metadata=#lib::C<InterfaceType(FutureOr<int*>*)> (skip check)] generic-covariant-impl self::C<asy::FutureOr<self::C::T*>*>* x) → void {}
+[@vm.procedure-attributes.metadata=getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:17,getterSelectorId:18] method test7r([@vm.inferred-type.metadata=#lib::C<InterfaceType(FutureOr<int*>*)>] generic-covariant-impl self::C<self::C::T*>* x) → void {}
+[@vm.procedure-attributes.metadata=getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:19,getterSelectorId:20] method test8r([@vm.inferred-type.metadata=#lib::C<InterfaceType(Future<int*>*)>] generic-covariant-impl self::C<self::C::T*>* x) → void {}
}
static method main() → dynamic {
dynamic c = new self::C::•<core::int*>();
- [@vm.direct-call.metadata=#lib::C::test2c] [@vm.inferred-type.metadata=!? (receiver not int)] c.test2c(3);
- [@vm.direct-call.metadata=#lib::C::test3c] [@vm.inferred-type.metadata=!? (receiver not int)] c.test3c([@vm.inferred-type.metadata=dart.async::_Future<InterfaceType(Reference to root::dart:core::int*)>] asy::Future::value<core::int*>(3));
- [@vm.direct-call.metadata=#lib::C::test4c] [@vm.inferred-type.metadata=!? (receiver not int)] c.test4c([@vm.inferred-type.metadata=dart.async::_Future<InterfaceType(Reference to root::dart:core::int*)>] asy::Future::value<core::int*>(3));
- [@vm.direct-call.metadata=#lib::C::test2r] [@vm.inferred-type.metadata=!? (receiver not int)] c.test2r(new self::C::•<core::int*>());
- [@vm.direct-call.metadata=#lib::C::test3r] [@vm.inferred-type.metadata=!? (receiver not int)] c.test3r(new self::C::•<asy::Future<core::int*>*>());
- [@vm.direct-call.metadata=#lib::C::test4r] [@vm.inferred-type.metadata=!? (receiver not int)] c.test4r(new self::C::•<asy::Future<core::int*>*>());
- [@vm.direct-call.metadata=#lib::C::test5r] [@vm.inferred-type.metadata=!? (receiver not int)] c.test5r(new self::C::•<asy::FutureOr<core::int*>*>());
- [@vm.direct-call.metadata=#lib::C::test6r] [@vm.inferred-type.metadata=!? (receiver not int)] c.test6r(new self::C::•<asy::FutureOr<core::int*>*>());
- [@vm.direct-call.metadata=#lib::C::test7r] [@vm.inferred-type.metadata=!? (receiver not int)] c.test7r(new self::C::•<asy::FutureOr<core::int*>*>());
- [@vm.direct-call.metadata=#lib::C::test8r] [@vm.inferred-type.metadata=!? (receiver not int)] c.test8r(new self::C::•<asy::Future<core::int*>*>());
+ [@vm.direct-call.metadata=C::test2c] [@vm.inferred-type.metadata=!? (receiver not int)] c.test2c(3);
+ [@vm.direct-call.metadata=C::test3c] [@vm.inferred-type.metadata=!? (receiver not int)] c.test3c([@vm.inferred-type.metadata=dart.async::_Future<InterfaceType(int*)>] asy::Future::value<core::int*>(3));
+ [@vm.direct-call.metadata=C::test4c] [@vm.inferred-type.metadata=!? (receiver not int)] c.test4c([@vm.inferred-type.metadata=dart.async::_Future<InterfaceType(int*)>] asy::Future::value<core::int*>(3));
+ [@vm.direct-call.metadata=C::test2r] [@vm.inferred-type.metadata=!? (receiver not int)] c.test2r(new self::C::•<core::int*>());
+ [@vm.direct-call.metadata=C::test3r] [@vm.inferred-type.metadata=!? (receiver not int)] c.test3r(new self::C::•<asy::Future<core::int*>*>());
+ [@vm.direct-call.metadata=C::test4r] [@vm.inferred-type.metadata=!? (receiver not int)] c.test4r(new self::C::•<asy::Future<core::int*>*>());
+ [@vm.direct-call.metadata=C::test5r] [@vm.inferred-type.metadata=!? (receiver not int)] c.test5r(new self::C::•<asy::FutureOr<core::int*>*>());
+ [@vm.direct-call.metadata=C::test6r] [@vm.inferred-type.metadata=!? (receiver not int)] c.test6r(new self::C::•<asy::FutureOr<core::int*>*>());
+ [@vm.direct-call.metadata=C::test7r] [@vm.inferred-type.metadata=!? (receiver not int)] c.test7r(new self::C::•<asy::FutureOr<core::int*>*>());
+ [@vm.direct-call.metadata=C::test8r] [@vm.inferred-type.metadata=!? (receiver not int)] c.test8r(new self::C::•<asy::Future<core::int*>*>());
}
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/future_or.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/future_or.dart.expect
index f97cfd3..c052dce 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/future_or.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/future_or.dart.expect
@@ -16,11 +16,11 @@
;
}
[@vm.inferred-type.metadata=dart.core::Null? (value: null)]static field core::Function* unknown;
-static method foo1_a1([@vm.inferred-type.metadata=dart.async::_Future<InterfaceType(Reference to #lib::B*)>] dynamic x) → void {}
+static method foo1_a1([@vm.inferred-type.metadata=dart.async::_Future<InterfaceType(B*)>] dynamic x) → void {}
static method foo1_a2([@vm.inferred-type.metadata=#lib::B] dynamic x) → void {}
-static method foo1_a3([@vm.inferred-type.metadata=dart.async::_Future<InterfaceType(Reference to #lib::B*)>] dynamic x) → void {}
+static method foo1_a3([@vm.inferred-type.metadata=dart.async::_Future<InterfaceType(B*)>] dynamic x) → void {}
static method foo1_a4([@vm.inferred-type.metadata=#lib::B] dynamic x) → void {}
-static method foo1([@vm.inferred-type.metadata=dart.async::_Future<InterfaceType(Reference to #lib::B*)>] asy::Future<self::A*>* a1, [@vm.inferred-type.metadata=#lib::B] self::A* a2, [@vm.inferred-type.metadata=dart.async::_Future<InterfaceType(Reference to #lib::B*)>] asy::FutureOr<self::A*>* a3, [@vm.inferred-type.metadata=#lib::B] asy::FutureOr<self::A*>* a4) → void {
+static method foo1([@vm.inferred-type.metadata=dart.async::_Future<InterfaceType(B*)>] asy::Future<self::A*>* a1, [@vm.inferred-type.metadata=#lib::B] self::A* a2, [@vm.inferred-type.metadata=dart.async::_Future<InterfaceType(B*)>] asy::FutureOr<self::A*>* a3, [@vm.inferred-type.metadata=#lib::B] asy::FutureOr<self::A*>* a4) → void {
self::foo1_a1(a1);
self::foo1_a2(a2);
self::foo1_a3(a3);
@@ -37,8 +37,8 @@
self::foo2_a4(a4);
}
static method getDynamic() → dynamic
- return [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Reference to root::dart:core::Function*)] self::unknown.call();
+ return [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Function*)] self::unknown.call();
static method main(core::List<core::String*>* args) → dynamic {
- self::foo1([@vm.inferred-type.metadata=dart.async::_Future<InterfaceType(Reference to #lib::B*)>] asy::Future::value<self::B*>(new self::B::•()), new self::B::•(), [@vm.inferred-type.metadata=dart.async::_Future<InterfaceType(Reference to #lib::B*)>] asy::Future::value<self::B*>(new self::B::•()), new self::B::•());
+ self::foo1([@vm.inferred-type.metadata=dart.async::_Future<InterfaceType(B*)>] asy::Future::value<self::B*>(new self::B::•()), new self::B::•(), [@vm.inferred-type.metadata=dart.async::_Future<InterfaceType(B*)>] asy::Future::value<self::B*>(new self::B::•()), new self::B::•());
self::foo2(self::getDynamic() as{TypeError,ForDynamic} asy::Future<self::A*>*, self::getDynamic() as{TypeError,ForDynamic} self::A*, self::getDynamic() as{TypeError,ForDynamic} asy::FutureOr<self::A*>*, self::getDynamic() as{TypeError,ForDynamic} asy::FutureOr<self::A*>*);
}
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_cycle.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_cycle.dart.expect
index 5226932..31fb99c 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_cycle.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_cycle.dart.expect
@@ -53,7 +53,7 @@
: self::StreamView::_stream = stream, super self::Stream::•()
;
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasTearOffUses:false,methodOrSetterSelectorId:1,getterSelectorId:2] method foobar([@vm.inferred-type.metadata=dart.core::Null? (value: null)] (dynamic) →* void onData, {[@vm.inferred-type.metadata=dart.core::Null? (value: null)] core::Function* onError = #C1}) → self::StreamSubscription* {
- return [@vm.direct-call.metadata=#lib::StreamView::_stream] [@vm.inferred-type.metadata=!] this.{self::StreamView::_stream}.{self::Stream::foobar}(onData, onError: onError);
+ return [@vm.direct-call.metadata=StreamView::_stream] [@vm.inferred-type.metadata=!] this.{self::StreamView::_stream}.{self::Stream::foobar}(onData, onError: onError);
}
}
class ByteStream extends self::StreamView {
@@ -82,32 +82,32 @@
}
static method round1({[@vm.inferred-type.metadata=dart.core::Null? (value: null)] (dynamic) →* void onData = #C1}) → void {
self::ByteStream* x = new self::ByteStream::•(new self::ByteStream::•(new self::_GeneratedStreamImpl::•()));
- [@vm.direct-call.metadata=#lib::ByteStream::super_foobar1] [@vm.inferred-type.metadata=!? (skip check)] x.{self::ByteStream::super_foobar1}(onData);
+ [@vm.direct-call.metadata=ByteStream::super_foobar1] [@vm.inferred-type.metadata=!? (skip check)] x.{self::ByteStream::super_foobar1}(onData);
}
static method round2({[@vm.inferred-type.metadata=dart.core::Null? (value: null)] (dynamic) →* void onData = #C1, [@vm.inferred-type.metadata=dart.core::Null? (value: null)] core::Function* onError = #C1}) → void {
new self::_ControllerStream::•();
self::Stream* x = new self::_GeneratedStreamImpl::•();
x = new self::ByteStream::•(x);
- [@vm.direct-call.metadata=#lib::StreamView::foobar] [@vm.inferred-type.metadata=!? (skip check)] x.{self::Stream::foobar}(onData, onError: onError);
+ [@vm.direct-call.metadata=StreamView::foobar] [@vm.inferred-type.metadata=!? (skip check)] x.{self::Stream::foobar}(onData, onError: onError);
}
static method round3({[@vm.inferred-type.metadata=dart.core::Null? (value: null)] (dynamic) →* void onData = #C1, [@vm.inferred-type.metadata=dart.core::Null? (value: null)] core::Function* onError = #C1}) → void {
self::Stream* x = new self::_GeneratedStreamImpl::•();
x = new self::ByteStream::•(x);
x = new self::_ControllerStream::•();
- [@vm.direct-call.metadata=#lib::_StreamImpl::foobar] [@vm.inferred-type.metadata=!? (skip check)] x.{self::Stream::foobar}(onData, onError: onError);
+ [@vm.direct-call.metadata=_StreamImpl::foobar] [@vm.inferred-type.metadata=!? (skip check)] x.{self::Stream::foobar}(onData, onError: onError);
}
static method round4({[@vm.inferred-type.metadata=dart.core::Null? (value: null)] (dynamic) →* void onData = #C1}) → void {
self::ByteStream* x = new self::ByteStream::•(new self::_ControllerStream::•());
- self::Stream* y = [@vm.direct-call.metadata=#lib::ByteStream::super_stream] [@vm.inferred-type.metadata=!] x.{self::ByteStream::super_stream};
- self::Stream* z = [@vm.direct-call.metadata=#lib::StreamView::_stream] [@vm.inferred-type.metadata=!] x.{self::StreamView::_stream};
- if([@vm.direct-call.metadata=dart.core::Object::==] [@vm.inferred-type.metadata=dart.core::bool (skip check) (receiver not int)] y.{core::Object::==}(z)) {
- [@vm.direct-call.metadata=#lib::ByteStream::super_foobar2] [@vm.inferred-type.metadata=!? (skip check)] x.{self::ByteStream::super_foobar2}(onData);
+ self::Stream* y = [@vm.direct-call.metadata=ByteStream::super_stream] [@vm.inferred-type.metadata=!] x.{self::ByteStream::super_stream};
+ self::Stream* z = [@vm.direct-call.metadata=StreamView::_stream] [@vm.inferred-type.metadata=!] x.{self::StreamView::_stream};
+ if([@vm.direct-call.metadata=Object::==] [@vm.inferred-type.metadata=dart.core::bool (skip check) (receiver not int)] y.{core::Object::==}(z)) {
+ [@vm.direct-call.metadata=ByteStream::super_foobar2] [@vm.inferred-type.metadata=!? (skip check)] x.{self::ByteStream::super_foobar2}(onData);
}
}
static method round5() → void {
self::ByteStream* x = new self::ByteStream::•(new self::_GeneratedStreamImpl::•());
new self::_HandleErrorStream::•();
- [@vm.direct-call.metadata=#lib::ByteStream::super_foobar3] [@vm.inferred-type.metadata=!? (skip check)] x.{self::ByteStream::super_foobar3}();
+ [@vm.direct-call.metadata=ByteStream::super_foobar3] [@vm.inferred-type.metadata=!? (skip check)] x.{self::ByteStream::super_foobar3}();
}
static method main(core::List<core::String*>* args) → dynamic {
new self::_GeneratedStreamImpl::•();
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_field_initializer.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_field_initializer.dart.expect
index 975ada1..cd7fc10 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_field_initializer.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_field_initializer.dart.expect
@@ -34,11 +34,11 @@
: super core::Object::•()
;
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3,getterSelectorId:4] method barL1() → dynamic
- return [@vm.direct-call.metadata=#lib::DeepCaller1::barL2] [@vm.inferred-type.metadata=!? (skip check)] this.{self::DeepCaller1::barL2}();
+ return [@vm.direct-call.metadata=DeepCaller1::barL2] [@vm.inferred-type.metadata=!? (skip check)] this.{self::DeepCaller1::barL2}();
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:5,getterSelectorId:6] method barL2() → dynamic
- return [@vm.direct-call.metadata=#lib::DeepCaller1::barL3] [@vm.inferred-type.metadata=!? (skip check)] this.{self::DeepCaller1::barL3}();
+ return [@vm.direct-call.metadata=DeepCaller1::barL3] [@vm.inferred-type.metadata=!? (skip check)] this.{self::DeepCaller1::barL3}();
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:7,getterSelectorId:8] method barL3() → dynamic
- return [@vm.direct-call.metadata=#lib::DeepCaller1::barL4] [@vm.inferred-type.metadata=!? (skip check)] this.{self::DeepCaller1::barL4}();
+ return [@vm.direct-call.metadata=DeepCaller1::barL4] [@vm.inferred-type.metadata=!? (skip check)] this.{self::DeepCaller1::barL4}();
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:9,getterSelectorId:10] method barL4() → dynamic
return self::field1;
}
@@ -53,26 +53,26 @@
: super core::Object::•()
;
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3,getterSelectorId:4] method barL1([@vm.inferred-type.metadata=#lib::D] self::D* dd) → dynamic
- return [@vm.direct-call.metadata=#lib::DeepCaller2::barL2] [@vm.inferred-type.metadata=! (skip check)] this.{self::DeepCaller2::barL2}(dd);
+ return [@vm.direct-call.metadata=DeepCaller2::barL2] [@vm.inferred-type.metadata=! (skip check)] this.{self::DeepCaller2::barL2}(dd);
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:5,getterSelectorId:6] method barL2([@vm.inferred-type.metadata=#lib::D] self::D* dd) → dynamic
- return [@vm.direct-call.metadata=#lib::DeepCaller2::barL3] [@vm.inferred-type.metadata=! (skip check)] this.{self::DeepCaller2::barL3}(dd);
+ return [@vm.direct-call.metadata=DeepCaller2::barL3] [@vm.inferred-type.metadata=! (skip check)] this.{self::DeepCaller2::barL3}(dd);
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:7,getterSelectorId:8] method barL3([@vm.inferred-type.metadata=#lib::D] self::D* dd) → dynamic
- return [@vm.direct-call.metadata=#lib::DeepCaller2::barL4] [@vm.inferred-type.metadata=! (skip check)] this.{self::DeepCaller2::barL4}(dd);
+ return [@vm.direct-call.metadata=DeepCaller2::barL4] [@vm.inferred-type.metadata=! (skip check)] this.{self::DeepCaller2::barL4}(dd);
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:9,getterSelectorId:10] method barL4([@vm.inferred-type.metadata=#lib::D] self::D* dd) → dynamic
- return [@vm.direct-call.metadata=#lib::D::field2] [@vm.inferred-type.metadata=!] dd.{self::D::field2};
+ return [@vm.direct-call.metadata=D::field2] [@vm.inferred-type.metadata=!] dd.{self::D::field2};
}
[@vm.inferred-type.metadata=dart.core::Null? (value: null)]static field core::Function* unknown;
static field core::Object* field1 = [@vm.inferred-type.metadata=!] self::getValue();
static method getDynamic() → dynamic
- return [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Reference to root::dart:core::Function*)] self::unknown.call();
+ return [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Function*)] self::unknown.call();
static method getValue() → core::Object* {
self::A* aa = self::getDynamic() as{TypeError,ForDynamic} self::A*;
return [@vm.inferred-type.metadata=!] aa.{self::A::foo}();
}
static method use1([@vm.inferred-type.metadata=#lib::DeepCaller1] self::DeepCaller1* x) → dynamic
- return [@vm.direct-call.metadata=#lib::DeepCaller1::barL1] [@vm.inferred-type.metadata=!? (skip check)] x.{self::DeepCaller1::barL1}();
+ return [@vm.direct-call.metadata=DeepCaller1::barL1] [@vm.inferred-type.metadata=!? (skip check)] x.{self::DeepCaller1::barL1}();
static method use2([@vm.inferred-type.metadata=#lib::DeepCaller2] self::DeepCaller2* x) → dynamic
- return [@vm.direct-call.metadata=#lib::DeepCaller2::barL1] [@vm.inferred-type.metadata=! (skip check)] x.{self::DeepCaller2::barL1}(new self::D::•());
+ return [@vm.direct-call.metadata=DeepCaller2::barL1] [@vm.inferred-type.metadata=! (skip check)] x.{self::DeepCaller2::barL1}(new self::D::•());
static method createC() → dynamic {
new self::C::•();
}
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_new_class1.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_new_class1.dart.expect
index 5685ec8..afe3fb1 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_new_class1.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_new_class1.dart.expect
@@ -25,15 +25,15 @@
: super core::Object::•()
;
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3,getterSelectorId:4] method bar([@vm.inferred-type.metadata=#lib::B?] self::A* aa) → dynamic
- return [@vm.direct-call.metadata=#lib::B::foo??] [@vm.inferred-type.metadata=#lib::T1 (skip check)] aa.{self::A::foo}();
+ return [@vm.direct-call.metadata=B::foo??] [@vm.inferred-type.metadata=#lib::T1 (skip check)] aa.{self::A::foo}();
}
[@vm.inferred-type.metadata=dart.core::Null? (value: null)]static field core::Function* unknown;
static method use1([@vm.inferred-type.metadata=#lib::Intermediate] self::Intermediate* i, [@vm.inferred-type.metadata=#lib::B?] self::A* aa) → dynamic
- return [@vm.direct-call.metadata=#lib::Intermediate::bar] [@vm.inferred-type.metadata=#lib::T1 (skip check)] i.{self::Intermediate::bar}(aa);
+ return [@vm.direct-call.metadata=Intermediate::bar] [@vm.inferred-type.metadata=#lib::T1 (skip check)] i.{self::Intermediate::bar}(aa);
static method use2([@vm.inferred-type.metadata=#lib::Intermediate] self::Intermediate* i, [@vm.inferred-type.metadata=#lib::B?] self::A* aa) → dynamic
- return [@vm.direct-call.metadata=#lib::Intermediate::bar] [@vm.inferred-type.metadata=#lib::T1 (skip check)] i.{self::Intermediate::bar}(aa);
+ return [@vm.direct-call.metadata=Intermediate::bar] [@vm.inferred-type.metadata=#lib::T1 (skip check)] i.{self::Intermediate::bar}(aa);
static method getDynamic() → dynamic
- return [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Reference to root::dart:core::Function*)] self::unknown.call();
+ return [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Function*)] self::unknown.call();
static method allocateB() → dynamic {
new self::B::•();
}
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_new_class2.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_new_class2.dart.expect
index 1718427..9f0d0f1 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_new_class2.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_new_class2.dart.expect
@@ -53,13 +53,13 @@
}
[@vm.inferred-type.metadata=dart.core::Null? (value: null)]static field core::Function* unknown;
static method use1([@vm.inferred-type.metadata=#lib::Intermediate] self::Intermediate* i, self::A* aa) → dynamic
- return [@vm.direct-call.metadata=#lib::Intermediate::bar] [@vm.inferred-type.metadata=! (skip check)] i.{self::Intermediate::bar}(aa);
+ return [@vm.direct-call.metadata=Intermediate::bar] [@vm.inferred-type.metadata=! (skip check)] i.{self::Intermediate::bar}(aa);
static method use2([@vm.inferred-type.metadata=#lib::Intermediate] self::Intermediate* i, self::A* aa) → dynamic
- return [@vm.direct-call.metadata=#lib::Intermediate::bar] [@vm.inferred-type.metadata=! (skip check)] i.{self::Intermediate::bar}(aa);
+ return [@vm.direct-call.metadata=Intermediate::bar] [@vm.inferred-type.metadata=! (skip check)] i.{self::Intermediate::bar}(aa);
static method use3([@vm.inferred-type.metadata=#lib::Intermediate] self::Intermediate* i, self::A* aa) → dynamic
- return [@vm.direct-call.metadata=#lib::Intermediate::bar] [@vm.inferred-type.metadata=! (skip check)] i.{self::Intermediate::bar}(aa);
+ return [@vm.direct-call.metadata=Intermediate::bar] [@vm.inferred-type.metadata=! (skip check)] i.{self::Intermediate::bar}(aa);
static method getDynamic() → dynamic
- return [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Reference to root::dart:core::Function*)] self::unknown.call();
+ return [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Function*)] self::unknown.call();
static method allocateB() → dynamic {
new self::B::•();
}
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_new_dynamic_target.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_new_dynamic_target.dart.expect
index 9321536..5af2ba3 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_new_dynamic_target.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_new_dynamic_target.dart.expect
@@ -49,7 +49,7 @@
static method use_bazz(dynamic x) → dynamic
return [@vm.inferred-type.metadata=#lib::T3] x.bazz();
static method getDynamic() → dynamic
- return [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Reference to root::dart:core::Function*)] self::unknown.call();
+ return [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Function*)] self::unknown.call();
static method allocateA() → dynamic {
new self::A::•();
}
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_set_field.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_set_field.dart.expect
index c4aba2f..2caaaea 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_set_field.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_set_field.dart.expect
@@ -24,36 +24,36 @@
: super core::Object::•()
;
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:5,getterSelectorId:6] method barL1([@vm.inferred-type.metadata=#lib::A?] self::A* aa) → dynamic
- return [@vm.direct-call.metadata=#lib::DeepCaller1::barL2] [@vm.inferred-type.metadata=#lib::T1 (skip check)] this.{self::DeepCaller1::barL2}(aa);
+ return [@vm.direct-call.metadata=DeepCaller1::barL2] [@vm.inferred-type.metadata=#lib::T1 (skip check)] this.{self::DeepCaller1::barL2}(aa);
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:7,getterSelectorId:8] method barL2([@vm.inferred-type.metadata=#lib::A?] self::A* aa) → dynamic
- return [@vm.direct-call.metadata=#lib::DeepCaller1::barL3] [@vm.inferred-type.metadata=#lib::T1 (skip check)] this.{self::DeepCaller1::barL3}(aa);
+ return [@vm.direct-call.metadata=DeepCaller1::barL3] [@vm.inferred-type.metadata=#lib::T1 (skip check)] this.{self::DeepCaller1::barL3}(aa);
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:9,getterSelectorId:10] method barL3([@vm.inferred-type.metadata=#lib::A?] self::A* aa) → dynamic
- return [@vm.direct-call.metadata=#lib::DeepCaller1::barL4] [@vm.inferred-type.metadata=#lib::T1 (skip check)] this.{self::DeepCaller1::barL4}(aa);
+ return [@vm.direct-call.metadata=DeepCaller1::barL4] [@vm.inferred-type.metadata=#lib::T1 (skip check)] this.{self::DeepCaller1::barL4}(aa);
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:11,getterSelectorId:12] method barL4([@vm.inferred-type.metadata=#lib::A?] self::A* aa) → dynamic
- return [@vm.direct-call.metadata=#lib::A::field1??] [@vm.inferred-type.metadata=#lib::T1] aa.{self::A::field1};
+ return [@vm.direct-call.metadata=A::field1??] [@vm.inferred-type.metadata=#lib::T1] aa.{self::A::field1};
}
class DeepCaller2 extends core::Object {
synthetic constructor •() → self::DeepCaller2*
: super core::Object::•()
;
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:5,getterSelectorId:6] method barL1([@vm.inferred-type.metadata=#lib::A?] self::A* aa) → dynamic
- return [@vm.direct-call.metadata=#lib::DeepCaller2::barL2] [@vm.inferred-type.metadata=! (skip check)] this.{self::DeepCaller2::barL2}(aa);
+ return [@vm.direct-call.metadata=DeepCaller2::barL2] [@vm.inferred-type.metadata=! (skip check)] this.{self::DeepCaller2::barL2}(aa);
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:7,getterSelectorId:8] method barL2([@vm.inferred-type.metadata=#lib::A?] self::A* aa) → dynamic
- return [@vm.direct-call.metadata=#lib::DeepCaller2::barL3] [@vm.inferred-type.metadata=! (skip check)] this.{self::DeepCaller2::barL3}(aa);
+ return [@vm.direct-call.metadata=DeepCaller2::barL3] [@vm.inferred-type.metadata=! (skip check)] this.{self::DeepCaller2::barL3}(aa);
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:9,getterSelectorId:10] method barL3([@vm.inferred-type.metadata=#lib::A?] self::A* aa) → dynamic
- return [@vm.direct-call.metadata=#lib::DeepCaller2::barL4] [@vm.inferred-type.metadata=! (skip check)] this.{self::DeepCaller2::barL4}(aa);
+ return [@vm.direct-call.metadata=DeepCaller2::barL4] [@vm.inferred-type.metadata=! (skip check)] this.{self::DeepCaller2::barL4}(aa);
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:11,getterSelectorId:12] method barL4([@vm.inferred-type.metadata=#lib::A?] self::A* aa) → dynamic
- return [@vm.direct-call.metadata=#lib::A::field2??] [@vm.inferred-type.metadata=!] aa.{self::A::field2};
+ return [@vm.direct-call.metadata=A::field2??] [@vm.inferred-type.metadata=!] aa.{self::A::field2};
}
[@vm.inferred-type.metadata=dart.core::Null? (value: null)]static field core::Function* unknown;
static method use1([@vm.inferred-type.metadata=#lib::DeepCaller1] self::DeepCaller1* x, [@vm.inferred-type.metadata=#lib::A?] self::A* aa) → dynamic
- return [@vm.direct-call.metadata=#lib::DeepCaller1::barL1] [@vm.inferred-type.metadata=#lib::T1 (skip check)] x.{self::DeepCaller1::barL1}(aa);
+ return [@vm.direct-call.metadata=DeepCaller1::barL1] [@vm.inferred-type.metadata=#lib::T1 (skip check)] x.{self::DeepCaller1::barL1}(aa);
static method use2([@vm.inferred-type.metadata=#lib::DeepCaller2] self::DeepCaller2* x, [@vm.inferred-type.metadata=#lib::A?] self::A* aa) → dynamic
- return [@vm.direct-call.metadata=#lib::DeepCaller2::barL1] [@vm.inferred-type.metadata=! (skip check)] x.{self::DeepCaller2::barL1}(aa);
+ return [@vm.direct-call.metadata=DeepCaller2::barL1] [@vm.inferred-type.metadata=! (skip check)] x.{self::DeepCaller2::barL1}(aa);
static method getDynamic() → dynamic
- return [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Reference to root::dart:core::Function*)] self::unknown.call();
+ return [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Function*)] self::unknown.call();
static method setField2([@vm.inferred-type.metadata=#lib::A] self::A* aa, [@vm.inferred-type.metadata=#lib::T2] dynamic value) → void {
- [@vm.direct-call.metadata=#lib::A::field2] [@vm.inferred-type.metadata=!? (skip check)] aa.{self::A::field2} = value;
+ [@vm.direct-call.metadata=A::field2] [@vm.inferred-type.metadata=!? (skip check)] aa.{self::A::field2} = value;
}
static method main(core::List<core::String*>* args) → dynamic {
new self::A::•();
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_set_field2.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_set_field2.dart.expect
index fdbf579..8b5b231 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_set_field2.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_set_field2.dart.expect
@@ -28,8 +28,8 @@
: self::Q::result = result, super core::Object::•()
;
}
-static method foo1([@vm.inferred-type.metadata=dart.core::_GrowableList<InterfaceType(Reference to #lib::T1*)>] core::List<self::T1*>* list) → dynamic {
- [@vm.direct-call.metadata=#lib::T3::run] [@vm.inferred-type.metadata=!? (skip check)] [@vm.direct-call.metadata=#lib::T1::go??] [@vm.inferred-type.metadata=#lib::T3 (skip check)] [@vm.direct-call.metadata=#lib::Q::result??] [@vm.direct-call.metadata=dart._internal::ListIterable::first] [@vm.inferred-type.metadata=#lib::Q?] [@vm.direct-call.metadata=dart.collection::_ListBase&Object&ListMixin::map] [@vm.inferred-type.metadata=dart._internal::MappedListIterable<InterfaceType(Reference to #lib::T1*), ?> (skip check)] list.{core::Iterable::map}<self::Q<self::T1*>*>((self::T1* t1) → self::Q<self::T1*>* => new self::Q::•<self::T1*>(t1)).{core::Iterable::first}.{self::Q::result}.{self::T1::go}().{self::T3::run}();
+static method foo1([@vm.inferred-type.metadata=dart.core::_GrowableList<InterfaceType(T1*)>] core::List<self::T1*>* list) → dynamic {
+ [@vm.direct-call.metadata=T3::run] [@vm.inferred-type.metadata=!? (skip check)] [@vm.direct-call.metadata=T1::go??] [@vm.inferred-type.metadata=#lib::T3 (skip check)] [@vm.direct-call.metadata=Q::result??] [@vm.direct-call.metadata=ListIterable::first] [@vm.inferred-type.metadata=#lib::Q?] [@vm.direct-call.metadata=_ListBase&Object&ListMixin::map] [@vm.inferred-type.metadata=dart._internal::MappedListIterable<InterfaceType(T1*), ?> (skip check)] list.{core::Iterable::map}<self::Q<self::T1*>*>((self::T1* t1) → self::Q<self::T1*>* => new self::Q::•<self::T1*>(t1)).{core::Iterable::first}.{self::Q::result}.{self::T1::go}().{self::T3::run}();
}
static method foo2NewValue() → self::Q<dynamic>*
return new self::Q::•<self::T2*>(new self::T2::•());
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_while_processing.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_while_processing.dart.expect
index 3390a91..40d6b7d 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_while_processing.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_while_processing.dart.expect
@@ -23,18 +23,18 @@
: self::Point::x = x, super core::Object::•()
;
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3,getterSelectorId:4] method newPoint1() → self::Point*
- return new self::Point::•([@vm.direct-call.metadata=#lib::Point::x] [@vm.inferred-type.metadata=!] this.{self::Point::x});
+ return new self::Point::•([@vm.direct-call.metadata=Point::x] [@vm.inferred-type.metadata=!] this.{self::Point::x});
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:5,getterSelectorId:6] method newPoint2() → self::Point*
- return new self::Point::•([@vm.direct-call.metadata=#lib::Point::x] [@vm.inferred-type.metadata=!] this.{self::Point::x});
+ return new self::Point::•([@vm.direct-call.metadata=Point::x] [@vm.inferred-type.metadata=!] this.{self::Point::x});
}
static method getX([@vm.inferred-type.metadata=#lib::Point] dynamic point) → dynamic {
- [@vm.direct-call.metadata=#lib::Point::x] [@vm.inferred-type.metadata=!? (receiver not int)] point.x;
+ [@vm.direct-call.metadata=Point::x] [@vm.inferred-type.metadata=!? (receiver not int)] point.x;
}
static method main() → dynamic {
self::Point* a = new self::Point::•(new self::T1::•());
- core::print([@vm.direct-call.metadata=#lib::Point::x] [@vm.inferred-type.metadata=!] a.{self::Point::x});
+ core::print([@vm.direct-call.metadata=Point::x] [@vm.inferred-type.metadata=!] a.{self::Point::x});
self::Point* c = new self::Point::•(new self::T2::•());
- [@vm.direct-call.metadata=#lib::Point::x] [@vm.inferred-type.metadata=!] c.{self::Point::x}.{self::I::foo}();
- self::getX([@vm.direct-call.metadata=#lib::Point::newPoint1] [@vm.inferred-type.metadata=#lib::Point (skip check)] a.{self::Point::newPoint1}());
- self::getX([@vm.direct-call.metadata=#lib::Point::newPoint2] [@vm.inferred-type.metadata=#lib::Point (skip check)] a.{self::Point::newPoint2}());
+ [@vm.direct-call.metadata=Point::x] [@vm.inferred-type.metadata=!] c.{self::Point::x}.{self::I::foo}();
+ self::getX([@vm.direct-call.metadata=Point::newPoint1] [@vm.inferred-type.metadata=#lib::Point (skip check)] a.{self::Point::newPoint1}());
+ self::getX([@vm.direct-call.metadata=Point::newPoint2] [@vm.inferred-type.metadata=#lib::Point (skip check)] a.{self::Point::newPoint2}());
}
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/named_params_shaking_test.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/named_params_shaking_test.dart.expect
index 1fa6312..7ed0d87 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/named_params_shaking_test.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/named_params_shaking_test.dart.expect
@@ -18,14 +18,14 @@
[@vm.inferred-type.metadata=int] [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:1,getterSelectorId:2] field core::int* x;
constructor •() → self::TestNamedOrderSub*
: self::TestNamedOrderSub::x = [@vm.inferred-type.metadata=int] self::dec(), dynamic #arg0 = [@vm.inferred-type.metadata=int] self::inc(), dynamic #arg1 = [@vm.inferred-type.metadata=int] self::inc(), dynamic #arg2 = [@vm.inferred-type.metadata=int] self::inc(), dynamic #arg3 = [@vm.inferred-type.metadata=int] self::dec(), super self::TestNamedOrderBase::•(#arg0, #arg3, #arg2, #arg1) {
- exp::Expect::equals([@vm.direct-call.metadata=#lib::TestNamedOrderSub::x] [@vm.inferred-type.metadata=int] this.{self::TestNamedOrderSub::x}, 0);
+ exp::Expect::equals([@vm.direct-call.metadata=TestNamedOrderSub::x] [@vm.inferred-type.metadata=int] this.{self::TestNamedOrderSub::x}, 0);
}
}
[@vm.inferred-type.metadata=int?]static field core::int* global = 0;
[@vm.unboxing-info.metadata=()->i]static method inc() → core::int*
- return self::global = [@vm.direct-call.metadata=dart.core::_IntegerImplementation::+??] [@vm.inferred-type.metadata=int (skip check)] [@vm.inferred-type.metadata=int?] self::global.{core::num::+}(1);
+ return self::global = [@vm.direct-call.metadata=_IntegerImplementation::+??] [@vm.inferred-type.metadata=int (skip check)] [@vm.inferred-type.metadata=int?] self::global.{core::num::+}(1);
[@vm.unboxing-info.metadata=()->i]static method dec() → core::int*
- return self::global = [@vm.inferred-type.metadata=int] math::max<core::int*>(0, self::global = [@vm.direct-call.metadata=dart.core::_IntegerImplementation::-??] [@vm.inferred-type.metadata=int (skip check)] [@vm.inferred-type.metadata=int?] self::global.{core::num::-}(1));
+ return self::global = [@vm.inferred-type.metadata=int] math::max<core::int*>(0, self::global = [@vm.direct-call.metadata=_IntegerImplementation::-??] [@vm.inferred-type.metadata=int (skip check)] [@vm.inferred-type.metadata=int?] self::global.{core::num::-}(1));
[@vm.unboxing-info.metadata=(i)->b]static method testNamedOrder([@vm.inferred-type.metadata=int] core::int* w, [@vm.inferred-type.metadata=int] core::int* x, [@vm.inferred-type.metadata=int] core::int* y, [@vm.inferred-type.metadata=int] core::int* z) → void {
exp::Expect::equals(w, 1);
exp::Expect::equals(z, 2);
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/no_such_method.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/no_such_method.dart.expect
index 52f7c57..3bc87ba 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/no_such_method.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/no_such_method.dart.expect
@@ -49,11 +49,11 @@
return new self::T1::•();
}
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,hasTearOffUses:false,getterSelectorId:3] no-such-method-forwarder get bar() → dynamic
- return _in::unsafeCast<dynamic>([@vm.direct-call.metadata=#lib::B::noSuchMethod] [@vm.inferred-type.metadata=#lib::T1 (skip check)] this.{self::B::noSuchMethod}(new core::_InvocationMirror::_withType(#C2, 1, #C3, #C4, [@vm.inferred-type.metadata=dart.collection::UnmodifiableMapView<InterfaceType(Reference to root::dart:core::Symbol*), dynamic>] core::Map::unmodifiable<core::Symbol*, dynamic>(#C5))));
+ return _in::unsafeCast<dynamic>([@vm.direct-call.metadata=B::noSuchMethod] [@vm.inferred-type.metadata=#lib::T1 (skip check)] this.{self::B::noSuchMethod}(new core::_InvocationMirror::_withType(#C2, 1, #C3, #C4, [@vm.inferred-type.metadata=dart.collection::UnmodifiableMapView<InterfaceType(Symbol*), DynamicType(dynamic)>] core::Map::unmodifiable<core::Symbol*, dynamic>(#C5))));
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:1,getterSelectorId:2] no-such-method-forwarder method foo() → dynamic
- return _in::unsafeCast<dynamic>([@vm.direct-call.metadata=#lib::B::noSuchMethod] [@vm.inferred-type.metadata=#lib::T1 (skip check)] this.{self::B::noSuchMethod}(new core::_InvocationMirror::_withType(#C6, 0, #C3, #C4, [@vm.inferred-type.metadata=dart.collection::UnmodifiableMapView<InterfaceType(Reference to root::dart:core::Symbol*), dynamic>] core::Map::unmodifiable<core::Symbol*, dynamic>(#C5))));
+ return _in::unsafeCast<dynamic>([@vm.direct-call.metadata=B::noSuchMethod] [@vm.inferred-type.metadata=#lib::T1 (skip check)] this.{self::B::noSuchMethod}(new core::_InvocationMirror::_withType(#C6, 0, #C3, #C4, [@vm.inferred-type.metadata=dart.collection::UnmodifiableMapView<InterfaceType(Symbol*), DynamicType(dynamic)>] core::Map::unmodifiable<core::Symbol*, dynamic>(#C5))));
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:4,getterSelectorId:5] no-such-method-forwarder method bazz([@vm.inferred-type.metadata=dart.core::_Smi (value: 1)] dynamic a1, [@vm.inferred-type.metadata=dart.core::_Smi (value: 2)] dynamic a2, [@vm.inferred-type.metadata=dart.core::_Smi (value: 3)] dynamic a3, [[@vm.inferred-type.metadata=dart.core::_Smi (value: 4)] dynamic a4 = #C1, [@vm.inferred-type.metadata=dart.core::Null? (value: null)] dynamic a5 = #C1]) → dynamic
- return _in::unsafeCast<dynamic>([@vm.direct-call.metadata=#lib::B::noSuchMethod] [@vm.inferred-type.metadata=#lib::T1 (skip check)] this.{self::B::noSuchMethod}(new core::_InvocationMirror::_withType(#C7, 0, #C3, core::List::unmodifiable<dynamic>(<dynamic>[a1, a2, a3, a4, a5]), [@vm.inferred-type.metadata=dart.collection::UnmodifiableMapView<InterfaceType(Reference to root::dart:core::Symbol*), dynamic>] core::Map::unmodifiable<core::Symbol*, dynamic>(#C5))));
+ return _in::unsafeCast<dynamic>([@vm.direct-call.metadata=B::noSuchMethod] [@vm.inferred-type.metadata=#lib::T1 (skip check)] this.{self::B::noSuchMethod}(new core::_InvocationMirror::_withType(#C7, 0, #C3, core::List::unmodifiable<dynamic>(<dynamic>[a1, a2, a3, a4, a5]), [@vm.inferred-type.metadata=dart.collection::UnmodifiableMapView<InterfaceType(Symbol*), DynamicType(dynamic)>] core::Map::unmodifiable<core::Symbol*, dynamic>(#C5))));
}
abstract class C extends core::Object {
synthetic constructor •() → self::C*
@@ -68,11 +68,11 @@
: super self::C::•()
;
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,hasTearOffUses:false,getterSelectorId:3] no-such-method-forwarder get bar() → dynamic
- return _in::unsafeCast<dynamic>([@vm.direct-call.metadata=#lib::C::noSuchMethod] [@vm.inferred-type.metadata=#lib::T2 (skip check)] this.{self::C::noSuchMethod}(new core::_InvocationMirror::_withType(#C2, 1, #C3, #C4, [@vm.inferred-type.metadata=dart.collection::UnmodifiableMapView<InterfaceType(Reference to root::dart:core::Symbol*), dynamic>] core::Map::unmodifiable<core::Symbol*, dynamic>(#C5))));
+ return _in::unsafeCast<dynamic>([@vm.direct-call.metadata=C::noSuchMethod] [@vm.inferred-type.metadata=#lib::T2 (skip check)] this.{self::C::noSuchMethod}(new core::_InvocationMirror::_withType(#C2, 1, #C3, #C4, [@vm.inferred-type.metadata=dart.collection::UnmodifiableMapView<InterfaceType(Symbol*), DynamicType(dynamic)>] core::Map::unmodifiable<core::Symbol*, dynamic>(#C5))));
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:1,getterSelectorId:2] no-such-method-forwarder method foo() → dynamic
- return _in::unsafeCast<dynamic>([@vm.direct-call.metadata=#lib::C::noSuchMethod] [@vm.inferred-type.metadata=#lib::T2 (skip check)] this.{self::C::noSuchMethod}(new core::_InvocationMirror::_withType(#C6, 0, #C3, #C4, [@vm.inferred-type.metadata=dart.collection::UnmodifiableMapView<InterfaceType(Reference to root::dart:core::Symbol*), dynamic>] core::Map::unmodifiable<core::Symbol*, dynamic>(#C5))));
+ return _in::unsafeCast<dynamic>([@vm.direct-call.metadata=C::noSuchMethod] [@vm.inferred-type.metadata=#lib::T2 (skip check)] this.{self::C::noSuchMethod}(new core::_InvocationMirror::_withType(#C6, 0, #C3, #C4, [@vm.inferred-type.metadata=dart.collection::UnmodifiableMapView<InterfaceType(Symbol*), DynamicType(dynamic)>] core::Map::unmodifiable<core::Symbol*, dynamic>(#C5))));
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:4,getterSelectorId:5] no-such-method-forwarder method bazz([@vm.inferred-type.metadata=dart.core::_Smi (value: 1)] dynamic a1, [@vm.inferred-type.metadata=dart.core::_Smi (value: 2)] dynamic a2, [@vm.inferred-type.metadata=dart.core::_Smi (value: 3)] dynamic a3, [[@vm.inferred-type.metadata=dart.core::_Smi (value: 4)] dynamic a4 = #C1, [@vm.inferred-type.metadata=dart.core::Null? (value: null)] dynamic a5 = #C1]) → dynamic
- return _in::unsafeCast<dynamic>([@vm.direct-call.metadata=#lib::C::noSuchMethod] [@vm.inferred-type.metadata=#lib::T2 (skip check)] this.{self::C::noSuchMethod}(new core::_InvocationMirror::_withType(#C7, 0, #C3, core::List::unmodifiable<dynamic>(<dynamic>[a1, a2, a3, a4, a5]), [@vm.inferred-type.metadata=dart.collection::UnmodifiableMapView<InterfaceType(Reference to root::dart:core::Symbol*), dynamic>] core::Map::unmodifiable<core::Symbol*, dynamic>(#C5))));
+ return _in::unsafeCast<dynamic>([@vm.direct-call.metadata=C::noSuchMethod] [@vm.inferred-type.metadata=#lib::T2 (skip check)] this.{self::C::noSuchMethod}(new core::_InvocationMirror::_withType(#C7, 0, #C3, core::List::unmodifiable<dynamic>(<dynamic>[a1, a2, a3, a4, a5]), [@vm.inferred-type.metadata=dart.collection::UnmodifiableMapView<InterfaceType(Symbol*), DynamicType(dynamic)>] core::Map::unmodifiable<core::Symbol*, dynamic>(#C5))));
}
class E extends core::Object implements self::A {
synthetic constructor •() → self::E*
@@ -82,7 +82,7 @@
return new self::T4::•();
}
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,hasTearOffUses:false,getterSelectorId:3] no-such-method-forwarder get bar() → dynamic
- return _in::unsafeCast<dynamic>([@vm.direct-call.metadata=#lib::E::noSuchMethod] [@vm.inferred-type.metadata=#lib::T4 (skip check)] this.{self::E::noSuchMethod}(new core::_InvocationMirror::_withType(#C2, 1, #C3, #C4, [@vm.inferred-type.metadata=dart.collection::UnmodifiableMapView<InterfaceType(Reference to root::dart:core::Symbol*), dynamic>] core::Map::unmodifiable<core::Symbol*, dynamic>(#C5))));
+ return _in::unsafeCast<dynamic>([@vm.direct-call.metadata=E::noSuchMethod] [@vm.inferred-type.metadata=#lib::T4 (skip check)] this.{self::E::noSuchMethod}(new core::_InvocationMirror::_withType(#C2, 1, #C3, #C4, [@vm.inferred-type.metadata=dart.collection::UnmodifiableMapView<InterfaceType(Symbol*), DynamicType(dynamic)>] core::Map::unmodifiable<core::Symbol*, dynamic>(#C5))));
}
class F extends core::Object {
synthetic constructor •() → self::F*
@@ -114,14 +114,14 @@
[@vm.inferred-type.metadata=#lib::D?]static field self::A* dd = new self::D::•();
[@vm.inferred-type.metadata=dart.core::Null? (value: null)]static field core::Function* unknown;
static method getDynamic() → dynamic
- return [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Reference to root::dart:core::Function*)] self::unknown.call();
+ return [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Function*)] self::unknown.call();
static method main(core::List<core::String*>* args) → dynamic {
- core::print([@vm.direct-call.metadata=#lib::B::foo??] [@vm.inferred-type.metadata=#lib::T1 (skip check)] [@vm.inferred-type.metadata=#lib::B?] self::bb.{self::A::foo}());
- core::print([@vm.direct-call.metadata=#lib::B::bar??] [@vm.inferred-type.metadata=#lib::T1] [@vm.inferred-type.metadata=#lib::B?] self::bb.{self::A::bar});
- core::print([@vm.direct-call.metadata=#lib::B::bazz??] [@vm.inferred-type.metadata=#lib::T1 (skip check)] [@vm.inferred-type.metadata=#lib::B?] self::bb.{self::A::bazz}(1, 2, 3, 4));
- core::print([@vm.direct-call.metadata=#lib::D::foo??] [@vm.inferred-type.metadata=#lib::T2 (skip check)] [@vm.inferred-type.metadata=#lib::D?] self::dd.{self::A::foo}());
- core::print([@vm.direct-call.metadata=#lib::D::bar??] [@vm.inferred-type.metadata=#lib::T2] [@vm.inferred-type.metadata=#lib::D?] self::dd.{self::A::bar});
- core::print([@vm.direct-call.metadata=#lib::D::bazz??] [@vm.inferred-type.metadata=#lib::T2 (skip check)] [@vm.inferred-type.metadata=#lib::D?] self::dd.{self::A::bazz}(1, 2, 3, 4));
+ core::print([@vm.direct-call.metadata=B::foo??] [@vm.inferred-type.metadata=#lib::T1 (skip check)] [@vm.inferred-type.metadata=#lib::B?] self::bb.{self::A::foo}());
+ core::print([@vm.direct-call.metadata=B::bar??] [@vm.inferred-type.metadata=#lib::T1] [@vm.inferred-type.metadata=#lib::B?] self::bb.{self::A::bar});
+ core::print([@vm.direct-call.metadata=B::bazz??] [@vm.inferred-type.metadata=#lib::T1 (skip check)] [@vm.inferred-type.metadata=#lib::B?] self::bb.{self::A::bazz}(1, 2, 3, 4));
+ core::print([@vm.direct-call.metadata=D::foo??] [@vm.inferred-type.metadata=#lib::T2 (skip check)] [@vm.inferred-type.metadata=#lib::D?] self::dd.{self::A::foo}());
+ core::print([@vm.direct-call.metadata=D::bar??] [@vm.inferred-type.metadata=#lib::T2] [@vm.inferred-type.metadata=#lib::D?] self::dd.{self::A::bar});
+ core::print([@vm.direct-call.metadata=D::bazz??] [@vm.inferred-type.metadata=#lib::T2 (skip check)] [@vm.inferred-type.metadata=#lib::D?] self::dd.{self::A::bazz}(1, 2, 3, 4));
new self::E::•();
self::A* xx = self::getDynamic() as{TypeError,ForDynamic} self::A*;
core::print([@vm.inferred-type.metadata=!] xx.{self::A::bar});
@@ -131,6 +131,6 @@
dynamic gg = new self::G::•();
core::print([@vm.inferred-type.metadata=#lib::T5 (receiver not int)] gg.noSuchMethod(null, null));
dynamic hh = new self::H::•();
- core::print([@vm.direct-call.metadata=#lib::H::foo] [@vm.inferred-type.metadata=#lib::T6 (receiver not int)] hh.foo(right: 2, left: 1));
+ core::print([@vm.direct-call.metadata=H::foo] [@vm.inferred-type.metadata=#lib::T6 (receiver not int)] hh.foo(right: 2, left: 1));
core::print([@vm.inferred-type.metadata=#lib::T7 (receiver not int)] hh.foo(left: 1, top: 2));
}
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/param_types_before_strong_mode_checks.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/param_types_before_strong_mode_checks.dart.expect
index 3a1361a..ad4d6c9 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/param_types_before_strong_mode_checks.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/param_types_before_strong_mode_checks.dart.expect
@@ -19,7 +19,7 @@
: super core::Object::•()
;
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,methodOrSetterSelectorId:3,getterSelectorId:4] method method1(self::T0* t0) → void {
- [@vm.direct-call.metadata=#lib::T2::foo??] [@vm.inferred-type.metadata=!? (skip check)] t0.{self::T0::foo}();
+ [@vm.direct-call.metadata=T2::foo??] [@vm.inferred-type.metadata=!? (skip check)] t0.{self::T0::foo}();
}
}
abstract class B extends core::Object {
@@ -30,7 +30,7 @@
: super core::Object::•()
;
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:5,getterSelectorId:6] method method2(covariant self::T0* t0) → void {
- [@vm.direct-call.metadata=#lib::T2::foo??] [@vm.inferred-type.metadata=!? (skip check)] t0.{self::T0::foo}();
+ [@vm.direct-call.metadata=T2::foo??] [@vm.inferred-type.metadata=!? (skip check)] t0.{self::T0::foo}();
}
}
class D extends core::Object {
@@ -38,26 +38,26 @@
: super core::Object::•()
;
[@vm.procedure-attributes.metadata=getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:7,getterSelectorId:8] method method3(self::T0* t0) → void {
- [@vm.direct-call.metadata=#lib::T2::foo??] [@vm.inferred-type.metadata=!? (skip check)] t0.{self::T0::foo}();
+ [@vm.direct-call.metadata=T2::foo??] [@vm.inferred-type.metadata=!? (skip check)] t0.{self::T0::foo}();
}
}
[@vm.inferred-type.metadata=dart.core::Null? (value: null)]static field core::Function* unknown;
static method func1([@vm.inferred-type.metadata=#lib::T2?] self::T0* t0) → void {
- [@vm.direct-call.metadata=#lib::T2::foo??] [@vm.inferred-type.metadata=!? (skip check)] t0.{self::T0::foo}();
+ [@vm.direct-call.metadata=T2::foo??] [@vm.inferred-type.metadata=!? (skip check)] t0.{self::T0::foo}();
}
static method func2(self::T0* t0) → void {
- [@vm.direct-call.metadata=#lib::T2::foo??] [@vm.inferred-type.metadata=!? (skip check)] t0.{self::T0::foo}();
+ [@vm.direct-call.metadata=T2::foo??] [@vm.inferred-type.metadata=!? (skip check)] t0.{self::T0::foo}();
}
static method getDynamic() → dynamic
- return [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Reference to root::dart:core::Function*)] self::unknown.call();
+ return [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Function*)] self::unknown.call();
static method use(dynamic x) → dynamic
- return [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Reference to root::dart:core::Function*)] self::unknown.call(x);
+ return [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Function*)] self::unknown.call(x);
static method main(core::List<core::String*>* args) → dynamic {
self::func1(self::getDynamic() as{TypeError,ForDynamic} self::T0*);
self::use(#C1);
self::use(new self::A::•().{self::A::method1});
self::B* bb = self::getDynamic() as{TypeError,ForDynamic} self::B*;
- [@vm.direct-call.metadata=#lib::C::method2??] [@vm.inferred-type.metadata=!? (skip check)] bb.{self::B::method2}(self::getDynamic());
+ [@vm.direct-call.metadata=C::method2??] [@vm.inferred-type.metadata=!? (skip check)] bb.{self::B::method2}(self::getDynamic());
self::getDynamic().method3(self::getDynamic());
new self::T2::•();
new self::A::•();
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/regress_37455.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/regress_37455.dart.expect
index 471beff..f29e5b1 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/regress_37455.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/regress_37455.dart.expect
@@ -3,29 +3,29 @@
import "dart:core" as core;
class A extends core::Object {
-[@vm.inferred-type.metadata=dart.core::_GrowableList<dynamic>] [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3,getterSelectorId:4] final field core::List<dynamic>* afield;
- constructor •([@vm.inferred-type.metadata=dart.core::_GrowableList<dynamic>] core::List<dynamic>* afield) → self::A*
+[@vm.inferred-type.metadata=dart.core::_GrowableList<DynamicType(dynamic)>] [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3,getterSelectorId:4] final field core::List<dynamic>* afield;
+ constructor •([@vm.inferred-type.metadata=dart.core::_GrowableList<DynamicType(dynamic)>] core::List<dynamic>* afield) → self::A*
: self::A::afield = afield, super core::Object::•()
;
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:1,getterSelectorId:2] method toString() → core::String*
- return [@vm.direct-call.metadata=dart.core::_GrowableList::toString] [@vm.inferred-type.metadata=!? (skip check) (receiver not int)] [@vm.direct-call.metadata=#lib::A::afield] [@vm.inferred-type.metadata=dart.core::_GrowableList<dynamic>] this.{self::A::afield}.{core::Object::toString}();
+ return [@vm.direct-call.metadata=_GrowableList::toString] [@vm.inferred-type.metadata=!? (skip check) (receiver not int)] [@vm.direct-call.metadata=A::afield] [@vm.inferred-type.metadata=dart.core::_GrowableList<DynamicType(dynamic)>] this.{self::A::afield}.{core::Object::toString}();
}
class B extends core::Object {
synthetic constructor •() → self::B*
: super core::Object::•()
;
-[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasTearOffUses:false,methodOrSetterSelectorId:5,getterSelectorId:6] method _foo([@vm.inferred-type.metadata=dart._internal::ListIterator<InterfaceType(Reference to root::dart:core::int*)>] core::Iterator<core::int*>* iter) → core::List<dynamic>* {
+[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasTearOffUses:false,methodOrSetterSelectorId:5,getterSelectorId:6] method _foo([@vm.inferred-type.metadata=dart._internal::ListIterator<InterfaceType(int*)>] core::Iterator<core::int*>* iter) → core::List<dynamic>* {
core::List<dynamic>* result = <dynamic>[];
- while ([@vm.direct-call.metadata=dart._internal::ListIterator::moveNext] [@vm.inferred-type.metadata=dart.core::bool (skip check)] iter.{core::Iterator::moveNext}()) {
- if([@vm.direct-call.metadata=dart.core::_IntegerImplementation::<??] [@vm.inferred-type.metadata=dart.core::bool (skip check)] [@vm.direct-call.metadata=dart._internal::ListIterator::current] [@vm.inferred-type.metadata=int?] iter.{core::Iterator::current}.{core::num::<}(0)) {
+ while ([@vm.direct-call.metadata=ListIterator::moveNext] [@vm.inferred-type.metadata=dart.core::bool (skip check)] iter.{core::Iterator::moveNext}()) {
+ if([@vm.direct-call.metadata=_IntegerImplementation::<??] [@vm.inferred-type.metadata=dart.core::bool (skip check)] [@vm.direct-call.metadata=ListIterator::current] [@vm.inferred-type.metadata=int?] iter.{core::Iterator::current}.{core::num::<}(0)) {
return result;
}
- [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Reference to root::dart:core::List*)] [@vm.direct-call.metadata=dart.core::_GrowableList::add] [@vm.inferred-type.metadata=!? (skip check)] result.{core::List::add}(new self::A::•([@vm.direct-call.metadata=#lib::B::_foo] [@vm.inferred-type.metadata=dart.core::_GrowableList<dynamic> (skip check)] this.{self::B::_foo}(iter)));
+ [@vm.call-site-attributes.metadata=receiverType:InterfaceType(List<dynamic>*)] [@vm.direct-call.metadata=_GrowableList::add] [@vm.inferred-type.metadata=!? (skip check)] result.{core::List::add}(new self::A::•([@vm.direct-call.metadata=B::_foo] [@vm.inferred-type.metadata=dart.core::_GrowableList<DynamicType(dynamic)> (skip check)] this.{self::B::_foo}(iter)));
}
return result;
}
}
static method main() → void {
- core::List<dynamic>* list = [@vm.direct-call.metadata=#lib::B::_foo] [@vm.inferred-type.metadata=dart.core::_GrowableList<dynamic> (skip check)] new self::B::•().{self::B::_foo}([@vm.direct-call.metadata=dart.core::_GrowableList::iterator] [@vm.inferred-type.metadata=dart._internal::ListIterator<InterfaceType(Reference to root::dart:core::int*)>]<core::int*>[1, 2, 3].{core::Iterable::iterator});
+ core::List<dynamic>* list = [@vm.direct-call.metadata=B::_foo] [@vm.inferred-type.metadata=dart.core::_GrowableList<DynamicType(dynamic)> (skip check)] new self::B::•().{self::B::_foo}([@vm.direct-call.metadata=_GrowableList::iterator] [@vm.inferred-type.metadata=dart._internal::ListIterator<InterfaceType(int*)>]<core::int*>[1, 2, 3].{core::Iterable::iterator});
core::print(list);
}
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/regress_37719.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/regress_37719.dart.expect
index bb1f31d..4ff5384 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/regress_37719.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/regress_37719.dart.expect
@@ -2,7 +2,7 @@
import self as self;
import "dart:core" as core;
-[@vm.unboxing-info.metadata=(b)->i]static method foo([@vm.inferred-type.metadata=dart.core::_GrowableList<InterfaceType(Reference to root::dart:core::int*)>] core::List<core::int*>* x) → dynamic
- return [@vm.direct-call.metadata=dart.core::_IntegerImplementation::+] [@vm.inferred-type.metadata=int (skip check)] 1.{core::num::+}([@vm.direct-call.metadata=dart.core::_GrowableList::[]] [@vm.inferred-type.metadata=int? (skip check)] x.{core::List::[]}(0));
+[@vm.unboxing-info.metadata=(b)->i]static method foo([@vm.inferred-type.metadata=dart.core::_GrowableList<InterfaceType(int*)>] core::List<core::int*>* x) → dynamic
+ return [@vm.direct-call.metadata=_IntegerImplementation::+] [@vm.inferred-type.metadata=int (skip check)] 1.{core::num::+}([@vm.direct-call.metadata=_GrowableList::[]] [@vm.inferred-type.metadata=int? (skip check)] x.{core::List::[]}(0));
static method main() → dynamic
return [@vm.inferred-type.metadata=dart.core::Null? (value: null)] core::print([@vm.inferred-type.metadata=int] self::foo(<core::int*>[1]));
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/regress_flutter16182.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/regress_flutter16182.dart.expect
index 3b00d52..b39b249 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/regress_flutter16182.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/regress_flutter16182.dart.expect
@@ -20,7 +20,7 @@
: super core::Object::•()
;
[@vm.procedure-attributes.metadata=getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3,getterSelectorId:4] method call([dynamic a1 = #C1, dynamic a2 = #C1, dynamic a3 = #C1, [@vm.inferred-type.metadata=dart.core::_Smi?] dynamic a4 = #C1, [@vm.inferred-type.metadata=#lib::T1?] dynamic a5 = #C1]) → void {
- [@vm.direct-call.metadata=#lib::A1::foo] [@vm.inferred-type.metadata=!? (skip check)] this.{self::A1::foo} = _in::unsafeCast<self::T1*>(a5);
+ [@vm.direct-call.metadata=A1::foo] [@vm.inferred-type.metadata=!? (skip check)] this.{self::A1::foo} = _in::unsafeCast<self::T1*>(a5);
}
}
class B1 extends core::Object {
@@ -43,7 +43,7 @@
: super core::Object::•()
;
[@vm.procedure-attributes.metadata=getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3,getterSelectorId:4] method call([dynamic a1 = #C1, dynamic a2 = #C1, dynamic a3 = #C1, [@vm.inferred-type.metadata=dart.core::_Smi?] dynamic a4 = #C1, [@vm.inferred-type.metadata=dart.core::_Smi?] dynamic a5 = #C1, [@vm.inferred-type.metadata=#lib::T2?] dynamic a6 = #C1]) → void {
- [@vm.direct-call.metadata=#lib::A2::foo] [@vm.inferred-type.metadata=!? (skip check)] this.{self::A2::foo} = a6;
+ [@vm.direct-call.metadata=A2::foo] [@vm.inferred-type.metadata=!? (skip check)] this.{self::A2::foo} = a6;
}
}
abstract class B2Base extends core::Object {
@@ -52,14 +52,14 @@
: super core::Object::•()
;
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,hasTearOffUses:false,getterSelectorId:11] get aa2() → dynamic
- return [@vm.direct-call.metadata=#lib::B2Base::_aa] [@vm.inferred-type.metadata=#lib::A2] this.{self::B2Base::_aa};
+ return [@vm.direct-call.metadata=B2Base::_aa] [@vm.inferred-type.metadata=#lib::A2] this.{self::B2Base::_aa};
}
class B2 extends self::B2Base {
synthetic constructor •() → self::B2*
: super self::B2Base::•()
;
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:14,getterSelectorId:15] method doSuperCall() → void {
- [@vm.call-site-attributes.metadata=receiverType:dynamic] [@vm.direct-call.metadata=#lib::A2::call] [@vm.inferred-type.metadata=!? (receiver not int)] [@vm.inferred-type.metadata=#lib::A2] super.{self::B2Base::aa2}.call(1, 2, 3, 4, 5, new self::T2::•());
+ [@vm.call-site-attributes.metadata=receiverType:DynamicType(dynamic)] [@vm.direct-call.metadata=A2::call] [@vm.inferred-type.metadata=!? (receiver not int)] [@vm.inferred-type.metadata=#lib::A2] super.{self::B2Base::aa2}.call(1, 2, 3, 4, 5, new self::T2::•());
}
}
class T3 extends core::Object {
@@ -76,7 +76,7 @@
: super core::Object::•()
;
[@vm.procedure-attributes.metadata=getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3,getterSelectorId:4] method call([dynamic a1 = #C1, dynamic a2 = #C1, dynamic a3 = #C1, [@vm.inferred-type.metadata=dart.core::_Smi?] dynamic a4 = #C1, [@vm.inferred-type.metadata=dart.core::_Smi?] dynamic a5 = #C1, [@vm.inferred-type.metadata=dart.core::_Smi?] dynamic a6 = #C1, [@vm.inferred-type.metadata=#lib::T3?] dynamic a7 = #C1]) → void {
- [@vm.direct-call.metadata=#lib::A3::foo] [@vm.inferred-type.metadata=!? (skip check)] this.{self::A3::foo} = a7;
+ [@vm.direct-call.metadata=A3::foo] [@vm.inferred-type.metadata=!? (skip check)] this.{self::A3::foo} = a7;
}
}
class B3 extends core::Object {
@@ -99,7 +99,7 @@
: super core::Object::•()
;
[@vm.procedure-attributes.metadata=getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3,getterSelectorId:4] method call([dynamic a1 = #C1, dynamic a2 = #C1, dynamic a3 = #C1, [@vm.inferred-type.metadata=dart.core::_Smi?] dynamic a4 = #C1, [@vm.inferred-type.metadata=dart.core::_Smi?] dynamic a5 = #C1, [@vm.inferred-type.metadata=dart.core::_Smi?] dynamic a6 = #C1, [@vm.inferred-type.metadata=dart.core::_Smi?] dynamic a7 = #C1, [@vm.inferred-type.metadata=#lib::T4?] dynamic a8 = #C1]) → void {
- [@vm.direct-call.metadata=#lib::A4::foo] [@vm.inferred-type.metadata=!? (skip check)] this.{self::A4::foo} = a8;
+ [@vm.direct-call.metadata=A4::foo] [@vm.inferred-type.metadata=!? (skip check)] this.{self::A4::foo} = a8;
}
}
class B4 extends core::Object {
@@ -108,7 +108,7 @@
: super core::Object::•()
;
[@vm.procedure-attributes.metadata=hasThisUses:false,hasTearOffUses:false,getterSelectorId:22] get aa4() → dynamic
- return [@vm.direct-call.metadata=#lib::B4::_aa] [@vm.inferred-type.metadata=#lib::A4] this.{self::B4::_aa};
+ return [@vm.direct-call.metadata=B4::_aa] [@vm.inferred-type.metadata=#lib::A4] this.{self::B4::_aa};
}
[@vm.inferred-type.metadata=dart.core::bool?]static field core::bool* ok;
[@vm.inferred-type.metadata=#lib::B3?]static field dynamic bb3 = new self::B3::•();
@@ -117,32 +117,32 @@
[@vm.inferred-type.metadata=dart.core::_Closure?]static field core::Function* unknown4 = () → dynamic => self::bb4;
static method test1() → void {
self::B1* bb = new self::B1::•();
- let final self::B1* #t1 = bb in let final core::int* #t2 = 1 in let final core::int* #t3 = 2 in let final core::int* #t4 = 3 in let final core::int* #t5 = 4 in let final self::T1* #t6 = new self::T1::•() in [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Reference to #lib::A1*)] [@vm.direct-call.metadata=#lib::A1::call] [@vm.inferred-type.metadata=!? (skip check)] [@vm.direct-call.metadata=#lib::B1::aa1] [@vm.inferred-type.metadata=#lib::A1] #t1.{self::B1::aa1}.{self::A1::call}(#t2, #t3, #t4, #t5, #t6);
+ let final self::B1* #t1 = bb in let final core::int* #t2 = 1 in let final core::int* #t3 = 2 in let final core::int* #t4 = 3 in let final core::int* #t5 = 4 in let final self::T1* #t6 = new self::T1::•() in [@vm.call-site-attributes.metadata=receiverType:InterfaceType(A1*)] [@vm.direct-call.metadata=A1::call] [@vm.inferred-type.metadata=!? (skip check)] [@vm.direct-call.metadata=B1::aa1] [@vm.inferred-type.metadata=#lib::A1] #t1.{self::B1::aa1}.{self::A1::call}(#t2, #t3, #t4, #t5, #t6);
self::ok = false;
- [@vm.direct-call.metadata=#lib::T1::doTest1??] [@vm.inferred-type.metadata=!? (skip check)] [@vm.direct-call.metadata=#lib::A1::foo] [@vm.inferred-type.metadata=#lib::T1?] [@vm.direct-call.metadata=#lib::B1::aa1] [@vm.inferred-type.metadata=#lib::A1] bb.{self::B1::aa1}.{self::A1::foo}.{self::T1::doTest1}();
+ [@vm.direct-call.metadata=T1::doTest1??] [@vm.inferred-type.metadata=!? (skip check)] [@vm.direct-call.metadata=A1::foo] [@vm.inferred-type.metadata=#lib::T1?] [@vm.direct-call.metadata=B1::aa1] [@vm.inferred-type.metadata=#lib::A1] bb.{self::B1::aa1}.{self::A1::foo}.{self::T1::doTest1}();
exp::Expect::isTrue([@vm.inferred-type.metadata=dart.core::bool?] self::ok);
}
static method test2() → void {
self::B2* bb = new self::B2::•();
- [@vm.direct-call.metadata=#lib::B2::doSuperCall] [@vm.inferred-type.metadata=!? (skip check)] bb.{self::B2::doSuperCall}();
+ [@vm.direct-call.metadata=B2::doSuperCall] [@vm.inferred-type.metadata=!? (skip check)] bb.{self::B2::doSuperCall}();
self::ok = false;
- [@vm.direct-call.metadata=#lib::T2::doTest2??] [@vm.inferred-type.metadata=!? (receiver not int)] [@vm.direct-call.metadata=#lib::A2::foo] [@vm.inferred-type.metadata=#lib::T2? (receiver not int)] [@vm.direct-call.metadata=#lib::B2Base::aa2] [@vm.inferred-type.metadata=#lib::A2] bb.{self::B2Base::aa2}.foo.doTest2();
+ [@vm.direct-call.metadata=T2::doTest2??] [@vm.inferred-type.metadata=!? (receiver not int)] [@vm.direct-call.metadata=A2::foo] [@vm.inferred-type.metadata=#lib::T2? (receiver not int)] [@vm.direct-call.metadata=B2Base::aa2] [@vm.inferred-type.metadata=#lib::A2] bb.{self::B2Base::aa2}.foo.doTest2();
exp::Expect::isTrue([@vm.inferred-type.metadata=dart.core::bool?] self::ok);
}
static method getDynamic3() → dynamic
- return [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Reference to root::dart:core::Function*)] self::unknown3.call();
+ return [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Function*)] self::unknown3.call();
static method test3() → void {
self::getDynamic3().aa3(1, 2, 3, 4, 5, 6, new self::T3::•());
self::ok = false;
- [@vm.direct-call.metadata=#lib::T3::doTest3??] [@vm.inferred-type.metadata=!? (receiver not int)] [@vm.direct-call.metadata=#lib::A3::foo] [@vm.inferred-type.metadata=#lib::T3? (receiver not int)] [@vm.direct-call.metadata=#lib::B3::aa3??] [@vm.inferred-type.metadata=#lib::A3 (receiver not int)] [@vm.inferred-type.metadata=#lib::B3?] self::bb3.aa3.foo.doTest3();
+ [@vm.direct-call.metadata=T3::doTest3??] [@vm.inferred-type.metadata=!? (receiver not int)] [@vm.direct-call.metadata=A3::foo] [@vm.inferred-type.metadata=#lib::T3? (receiver not int)] [@vm.direct-call.metadata=B3::aa3??] [@vm.inferred-type.metadata=#lib::A3 (receiver not int)] [@vm.inferred-type.metadata=#lib::B3?] self::bb3.aa3.foo.doTest3();
exp::Expect::isTrue([@vm.inferred-type.metadata=dart.core::bool?] self::ok);
}
static method getDynamic4() → dynamic
- return [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Reference to root::dart:core::Function*)] self::unknown4.call();
+ return [@vm.call-site-attributes.metadata=receiverType:InterfaceType(Function*)] self::unknown4.call();
static method test4() → void {
self::getDynamic4().aa4(1, 2, 3, 4, 5, 6, 7, new self::T4::•());
self::ok = false;
- [@vm.direct-call.metadata=#lib::T4::doTest4??] [@vm.inferred-type.metadata=!? (receiver not int)] [@vm.direct-call.metadata=#lib::A4::foo] [@vm.inferred-type.metadata=#lib::T4? (receiver not int)] [@vm.inferred-type.metadata=#lib::A4] self::getDynamic4().aa4.foo.doTest4();
+ [@vm.direct-call.metadata=T4::doTest4??] [@vm.inferred-type.metadata=!? (receiver not int)] [@vm.direct-call.metadata=A4::foo] [@vm.inferred-type.metadata=#lib::T4? (receiver not int)] [@vm.inferred-type.metadata=#lib::A4] self::getDynamic4().aa4.foo.doTest4();
exp::Expect::isTrue([@vm.inferred-type.metadata=dart.core::bool?] self::ok);
}
static method main() → void {
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/tear_off_dynamic_method.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/tear_off_dynamic_method.dart.expect
index f2aa9f5..e232d6b 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/tear_off_dynamic_method.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/tear_off_dynamic_method.dart.expect
@@ -12,18 +12,18 @@
: super self::A::•()
;
[@vm.procedure-attributes.metadata=hasThisUses:false,methodOrSetterSelectorId:1,getterSelectorId:2] method foo() → core::int*
- return [@vm.direct-call.metadata=dart.core::_IntegerImplementation::+] [@vm.inferred-type.metadata=! (skip check)] 1.{core::num::+}([@vm.direct-call.metadata=#lib::B::foo] [@vm.inferred-type.metadata=!? (receiver not int)] [@vm.inferred-type.metadata=#lib::B] self::knownResult().foo() as{TypeError,ForDynamic} core::num*) as{TypeError} core::int*;
+ return [@vm.direct-call.metadata=_IntegerImplementation::+] [@vm.inferred-type.metadata=! (skip check)] 1.{core::num::+}([@vm.direct-call.metadata=B::foo] [@vm.inferred-type.metadata=!? (receiver not int)] [@vm.inferred-type.metadata=#lib::B] self::knownResult().foo() as{TypeError,ForDynamic} core::num*) as{TypeError} core::int*;
}
class TearOffDynamicMethod extends core::Object {
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3,getterSelectorId:4] field dynamic bazz;
constructor •(dynamic arg) → self::TearOffDynamicMethod*
: self::TearOffDynamicMethod::bazz = arg.foo, super core::Object::•() {
- [@vm.call-site-attributes.metadata=receiverType:dynamic] [@vm.direct-call.metadata=#lib::TearOffDynamicMethod::bazz] this.{self::TearOffDynamicMethod::bazz}.call();
+ [@vm.call-site-attributes.metadata=receiverType:DynamicType(dynamic)] [@vm.direct-call.metadata=TearOffDynamicMethod::bazz] this.{self::TearOffDynamicMethod::bazz}.call();
}
}
static method knownResult() → dynamic
return new self::B::•();
static method main(core::List<core::String*>* args) → dynamic {
core::Function* closure = () → self::B* => new self::B::•();
- new self::TearOffDynamicMethod::•([@vm.call-site-attributes.metadata=receiverType:InterfaceType(Reference to root::dart:core::Function*)] closure.call());
+ new self::TearOffDynamicMethod::•([@vm.call-site-attributes.metadata=receiverType:InterfaceType(Function*)] closure.call());
}
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/tear_off_interface_method.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/tear_off_interface_method.dart.expect
index 48d30e5..868f6f8 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/tear_off_interface_method.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/tear_off_interface_method.dart.expect
@@ -14,7 +14,7 @@
: super self::A::•()
;
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,methodOrSetterSelectorId:1,getterSelectorId:2] method foo() → core::int*
- return _in::unsafeCast<core::int*>([@vm.direct-call.metadata=dart.core::_IntegerImplementation::+] [@vm.inferred-type.metadata=int (skip check)] 1.{core::num::+}(_in::unsafeCast<core::num*>([@vm.direct-call.metadata=#lib::B::bar] [@vm.inferred-type.metadata=dart.core::_Smi (value: 3) (receiver not int)] [@vm.inferred-type.metadata=#lib::B] self::knownResult().bar())));
+ return _in::unsafeCast<core::int*>([@vm.direct-call.metadata=_IntegerImplementation::+] [@vm.inferred-type.metadata=int (skip check)] 1.{core::num::+}(_in::unsafeCast<core::num*>([@vm.direct-call.metadata=B::bar] [@vm.inferred-type.metadata=dart.core::_Smi (value: 3) (receiver not int)] [@vm.inferred-type.metadata=#lib::B] self::knownResult().bar())));
[@vm.procedure-attributes.metadata=getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3,getterSelectorId:4] method bar() → core::int*
return 3;
}
@@ -27,5 +27,5 @@
static method knownResult() → dynamic
return new self::B::•();
static method main(core::List<core::String*>* args) → dynamic {
- [@vm.call-site-attributes.metadata=receiverType:dynamic] [@vm.direct-call.metadata=#lib::TearOffInterfaceMethod::bazz] new self::TearOffInterfaceMethod::•(new self::B::•()).{self::TearOffInterfaceMethod::bazz}.call();
+ [@vm.call-site-attributes.metadata=receiverType:DynamicType(dynamic)] [@vm.direct-call.metadata=TearOffInterfaceMethod::bazz] new self::TearOffInterfaceMethod::•(new self::B::•()).{self::TearOffInterfaceMethod::bazz}.call();
}
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/tear_off_super_method.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/tear_off_super_method.dart.expect
index 557d8ea..894ccaa 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/tear_off_super_method.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/tear_off_super_method.dart.expect
@@ -14,28 +14,28 @@
: super self::A::•()
;
[@vm.procedure-attributes.metadata=getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:1,getterSelectorId:2] method foo() → core::int*
- return _in::unsafeCast<core::int*>([@vm.direct-call.metadata=dart.core::_IntegerImplementation::+] [@vm.inferred-type.metadata=int (skip check)] 1.{core::num::+}(_in::unsafeCast<core::num*>([@vm.direct-call.metadata=#lib::B::foo] [@vm.inferred-type.metadata=int? (receiver not int)] [@vm.inferred-type.metadata=#lib::B] self::knownResult().foo())));
+ return _in::unsafeCast<core::int*>([@vm.direct-call.metadata=_IntegerImplementation::+] [@vm.inferred-type.metadata=int (skip check)] 1.{core::num::+}(_in::unsafeCast<core::num*>([@vm.direct-call.metadata=B::foo] [@vm.inferred-type.metadata=int? (receiver not int)] [@vm.inferred-type.metadata=#lib::B] self::knownResult().foo())));
}
abstract class Base extends core::Object {
synthetic constructor •() → self::Base*
: super core::Object::•()
;
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,methodOrSetterSelectorId:1,getterSelectorId:2] method foo() → core::int*
- return _in::unsafeCast<core::int*>([@vm.direct-call.metadata=dart.core::_IntegerImplementation::+] [@vm.inferred-type.metadata=int (skip check)] 3.{core::num::+}(_in::unsafeCast<core::num*>([@vm.direct-call.metadata=#lib::B::foo] [@vm.inferred-type.metadata=int? (receiver not int)] [@vm.inferred-type.metadata=#lib::B] self::knownResult().foo())));
+ return _in::unsafeCast<core::int*>([@vm.direct-call.metadata=_IntegerImplementation::+] [@vm.inferred-type.metadata=int (skip check)] 3.{core::num::+}(_in::unsafeCast<core::num*>([@vm.direct-call.metadata=B::foo] [@vm.inferred-type.metadata=int? (receiver not int)] [@vm.inferred-type.metadata=#lib::B] self::knownResult().foo())));
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3,getterSelectorId:4] method doCall(dynamic x) → core::int*
- return [@vm.call-site-attributes.metadata=receiverType:dynamic] x.call() as{TypeError,ForDynamic} core::int*;
+ return [@vm.call-site-attributes.metadata=receiverType:DynamicType(dynamic)] x.call() as{TypeError,ForDynamic} core::int*;
}
class TearOffSuperMethod extends self::Base {
synthetic constructor •() → self::TearOffSuperMethod*
: super self::Base::•()
;
[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:5,getterSelectorId:6] method bar() → core::int*
- return [@vm.direct-call.metadata=#lib::Base::doCall] [@vm.inferred-type.metadata=int? (skip check)] this.{self::Base::doCall}(super.{self::Base::foo});
+ return [@vm.direct-call.metadata=Base::doCall] [@vm.inferred-type.metadata=int? (skip check)] this.{self::Base::doCall}(super.{self::Base::foo});
}
[@vm.inferred-type.metadata=#lib::B?]static field self::A* aa = new self::B::•();
static method knownResult() → dynamic
return new self::B::•();
static method main(core::List<core::String*>* args) → dynamic {
- [@vm.direct-call.metadata=#lib::TearOffSuperMethod::bar] [@vm.inferred-type.metadata=!? (skip check)] new self::TearOffSuperMethod::•().{self::TearOffSuperMethod::bar}();
- [@vm.direct-call.metadata=#lib::B::foo??] [@vm.inferred-type.metadata=!? (skip check)] [@vm.inferred-type.metadata=#lib::B?] self::aa.{self::A::foo}();
+ [@vm.direct-call.metadata=TearOffSuperMethod::bar] [@vm.inferred-type.metadata=!? (skip check)] new self::TearOffSuperMethod::•().{self::TearOffSuperMethod::bar}();
+ [@vm.direct-call.metadata=B::foo??] [@vm.inferred-type.metadata=!? (skip check)] [@vm.inferred-type.metadata=#lib::B?] self::aa.{self::A::foo}();
}
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/type_cast_elimination.dart b/pkg/vm/testcases/transformations/type_flow/transformer/type_cast_elimination.dart
new file mode 100644
index 0000000..b0d6f0f
--- /dev/null
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/type_cast_elimination.dart
@@ -0,0 +1,40 @@
+// Copyright (c) 2020, 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.
+
+// Tests elimination of type casts.
+
+class A<T> {}
+
+class B<T> extends A<T> {
+ testT1(x) => x as T;
+ testT2negative(x) => x as T;
+ testAOfT1(x) => x as A<T>;
+ testAOfT2negative(x) => x as A<T>;
+}
+
+testInt1(x) => x as int;
+testInt2(x) => x as int;
+testDynamic(x) => x as dynamic;
+testObject(x) => x as Object;
+testBOfInt(x) => x as B<int>;
+testAOfInt(x) => x as A<int>;
+testAOfNum(x) => x as A<num>;
+testAOfAOfB1(x) => x as A<A<B>>;
+testAOfAOfB2negative(x) => x as A<A<B>>;
+
+void main() {
+ testInt1(42);
+ testInt2(null);
+ testDynamic('hi');
+ testObject('bye');
+ testBOfInt(new B<int>());
+ testAOfInt(new B<int>());
+ testAOfNum(new B<int>());
+ testAOfAOfB1(new A<A<B>>());
+ testAOfAOfB2negative(new A<A<A>>());
+ new B<int>().testT1(42);
+ new B<A<int>>().testT2negative(new A<String>());
+ new B<A<int>>().testAOfT1(new A<A<int>>());
+ new B<A<int>>().testAOfT2negative(new A<A<num>>());
+}
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/type_cast_elimination.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/type_cast_elimination.dart.expect
new file mode 100644
index 0000000..043ff26
--- /dev/null
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/type_cast_elimination.dart.expect
@@ -0,0 +1,56 @@
+library #lib;
+import self as self;
+import "dart:core" as core;
+import "dart:_internal" as _in;
+
+class A<T extends core::Object* = dynamic> extends core::Object {
+ synthetic constructor •() → self::A<self::A::T*>*
+ : super core::Object::•()
+ ;
+}
+class B<T extends core::Object* = dynamic> extends self::A<self::B::T*> {
+ synthetic constructor •() → self::B<self::B::T*>*
+ : super self::A::•()
+ ;
+[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:1,getterSelectorId:2] method testT1([@vm.inferred-type.metadata=dart.core::_Smi (value: 42)] dynamic x) → dynamic
+ return _in::unsafeCast<self::B::T*>(x);
+[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3,getterSelectorId:4] method testT2negative([@vm.inferred-type.metadata=#lib::A<InterfaceType(String*)>] dynamic x) → dynamic
+ return x as self::B::T*;
+[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:5,getterSelectorId:6] method testAOfT1([@vm.inferred-type.metadata=#lib::A<InterfaceType(A<int*>*)>] dynamic x) → dynamic
+ return _in::unsafeCast<self::A<self::B::T*>*>(x);
+[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:7,getterSelectorId:8] method testAOfT2negative([@vm.inferred-type.metadata=#lib::A<InterfaceType(A<num*>*)>] dynamic x) → dynamic
+ return x as self::A<self::B::T*>*;
+}
+[@vm.unboxing-info.metadata=(i)->i]static method testInt1([@vm.inferred-type.metadata=dart.core::_Smi (value: 42)] dynamic x) → dynamic
+ return _in::unsafeCast<core::int*>(x);
+static method testInt2([@vm.inferred-type.metadata=dart.core::Null? (value: null)] dynamic x) → dynamic
+ return _in::unsafeCast<core::int*>(x);
+static method testDynamic([@vm.inferred-type.metadata=dart.core::_OneByteString (value: hi)] dynamic x) → dynamic
+ return _in::unsafeCast<dynamic>(x);
+static method testObject([@vm.inferred-type.metadata=dart.core::_OneByteString (value: bye)] dynamic x) → dynamic
+ return _in::unsafeCast<core::Object*>(x);
+static method testBOfInt([@vm.inferred-type.metadata=#lib::B<InterfaceType(int*)>] dynamic x) → dynamic
+ return _in::unsafeCast<self::B<core::int*>*>(x);
+static method testAOfInt([@vm.inferred-type.metadata=#lib::B<InterfaceType(int*)>] dynamic x) → dynamic
+ return _in::unsafeCast<self::A<core::int*>*>(x);
+static method testAOfNum([@vm.inferred-type.metadata=#lib::B<InterfaceType(int*)>] dynamic x) → dynamic
+ return _in::unsafeCast<self::A<core::num*>*>(x);
+static method testAOfAOfB1([@vm.inferred-type.metadata=#lib::A<InterfaceType(A<B<dynamic>*>*)>] dynamic x) → dynamic
+ return _in::unsafeCast<self::A<self::A<self::B<dynamic>*>*>*>(x);
+static method testAOfAOfB2negative([@vm.inferred-type.metadata=#lib::A<InterfaceType(A<A<dynamic>*>*)>] dynamic x) → dynamic
+ return x as self::A<self::A<self::B<dynamic>*>*>*;
+static method main() → void {
+ self::testInt1(42);
+ self::testInt2(null);
+ self::testDynamic("hi");
+ self::testObject("bye");
+ self::testBOfInt(new self::B::•<core::int*>());
+ self::testAOfInt(new self::B::•<core::int*>());
+ self::testAOfNum(new self::B::•<core::int*>());
+ self::testAOfAOfB1(new self::A::•<self::A<self::B<dynamic>*>*>());
+ self::testAOfAOfB2negative(new self::A::•<self::A<self::A<dynamic>*>*>());
+ [@vm.direct-call.metadata=B::testT1] [@vm.inferred-type.metadata=!? (skip check)] new self::B::•<core::int*>().{self::B::testT1}(42);
+ [@vm.direct-call.metadata=B::testT2negative] [@vm.inferred-type.metadata=!? (skip check)] new self::B::•<self::A<core::int*>*>().{self::B::testT2negative}(new self::A::•<core::String*>());
+ [@vm.direct-call.metadata=B::testAOfT1] [@vm.inferred-type.metadata=!? (skip check)] new self::B::•<self::A<core::int*>*>().{self::B::testAOfT1}(new self::A::•<self::A<core::int*>*>());
+ [@vm.direct-call.metadata=B::testAOfT2negative] [@vm.inferred-type.metadata=!? (skip check)] new self::B::•<self::A<core::int*>*>().{self::B::testAOfT2negative}(new self::A::•<self::A<core::num*>*>());
+}
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/type_cast_elimination_nnbd.dart b/pkg/vm/testcases/transformations/type_flow/transformer/type_cast_elimination_nnbd.dart
new file mode 100644
index 0000000..4fd9f27
--- /dev/null
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/type_cast_elimination_nnbd.dart
@@ -0,0 +1,53 @@
+// Copyright (c) 2020, 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.
+
+// Tests elimination of type casts.
+// This test requires non-nullable experiment.
+
+// @dart = 2.8
+
+class A<T> {}
+
+class B<T> extends A<T> {
+ testT1(x) => x as T;
+ testT2(x) => x as T;
+ testT3(x) => x as T;
+ testNullableT1(x) => x as T?;
+ testNullableT2(x) => x as T?;
+}
+
+testInt1(x) => x as int;
+testInt2(x) => x as int;
+testNullableInt1(x) => x as int?;
+testNullableInt2(x) => x as int?;
+testDynamic(x) => x as dynamic;
+testObject(x) => x as Object;
+testNullableObject(x) => x as Object?;
+testAOfNum1(x) => x as A<num>;
+testAOfNum2(x) => x as A<num>;
+testAOfNum3(x) => x as A<num>;
+testAOfNullableNum(x) => x as A<num?>;
+testNullableAOfNum(x) => x as A<num>?;
+testNullableAOfNullableNum(x) => x as A<num?>?;
+
+void main() {
+ testInt1(42);
+ testInt2(null);
+ testNullableInt1(42);
+ testNullableInt2(null);
+ testDynamic('hi');
+ testObject(null);
+ testNullableObject(null);
+ testAOfNum1(new B<int>());
+ testAOfNum2(new B<int?>());
+ testAOfNum3(null);
+ testAOfNullableNum(new B<int?>());
+ testNullableAOfNum(null);
+ testNullableAOfNullableNum(new B<int?>());
+ new B<int>().testT1(42);
+ new B<int>().testT2(null);
+ new B<int?>().testT3(null);
+ new B<int>().testNullableT1(42);
+ new B<int>().testNullableT2(null);
+}
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/type_cast_elimination_nnbd.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/type_cast_elimination_nnbd.dart.expect
new file mode 100644
index 0000000..fa9c724
--- /dev/null
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/type_cast_elimination_nnbd.dart.expect
@@ -0,0 +1,71 @@
+library #lib /*isNonNullableByDefault*/;
+import self as self;
+import "dart:core" as core;
+import "dart:_internal" as _in;
+
+abstract class A<T extends core::Object? = dynamic> extends core::Object {
+ synthetic constructor •() → self::A<self::A::T%>
+ : super core::Object::•()
+ ;
+}
+class B<T extends core::Object? = dynamic> extends self::A<self::B::T%> {
+ synthetic constructor •() → self::B<self::B::T%>
+ : super self::A::•()
+ ;
+[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:1,getterSelectorId:2] method testT1([@vm.inferred-type.metadata=dart.core::_Smi (value: 42)] dynamic x) → dynamic
+ return _in::unsafeCast<self::B::T%>(x);
+[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3,getterSelectorId:4] method testT2([@vm.inferred-type.metadata=dart.core::Null? (value: null)] dynamic x) → dynamic
+ return _in::unsafeCast<self::B::T%>(x);
+[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:5,getterSelectorId:6] method testT3([@vm.inferred-type.metadata=dart.core::Null? (value: null)] dynamic x) → dynamic
+ return _in::unsafeCast<self::B::T%>(x);
+[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:7,getterSelectorId:8] method testNullableT1([@vm.inferred-type.metadata=dart.core::_Smi (value: 42)] dynamic x) → dynamic
+ return _in::unsafeCast<self::B::T?>(x);
+[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:9,getterSelectorId:10] method testNullableT2([@vm.inferred-type.metadata=dart.core::Null? (value: null)] dynamic x) → dynamic
+ return _in::unsafeCast<self::B::T?>(x);
+}
+[@vm.unboxing-info.metadata=(i)->i]static method testInt1([@vm.inferred-type.metadata=dart.core::_Smi (value: 42)] dynamic x) → dynamic
+ return _in::unsafeCast<core::int>(x);
+static method testInt2([@vm.inferred-type.metadata=dart.core::Null? (value: null)] dynamic x) → dynamic
+ return _in::unsafeCast<core::int>(x);
+[@vm.unboxing-info.metadata=(i)->i]static method testNullableInt1([@vm.inferred-type.metadata=dart.core::_Smi (value: 42)] dynamic x) → dynamic
+ return _in::unsafeCast<core::int?>(x);
+static method testNullableInt2([@vm.inferred-type.metadata=dart.core::Null? (value: null)] dynamic x) → dynamic
+ return _in::unsafeCast<core::int?>(x);
+static method testDynamic([@vm.inferred-type.metadata=dart.core::_OneByteString (value: hi)] dynamic x) → dynamic
+ return _in::unsafeCast<dynamic>(x);
+static method testObject([@vm.inferred-type.metadata=dart.core::Null? (value: null)] dynamic x) → dynamic
+ return _in::unsafeCast<core::Object>(x);
+static method testNullableObject([@vm.inferred-type.metadata=dart.core::Null? (value: null)] dynamic x) → dynamic
+ return _in::unsafeCast<core::Object?>(x);
+static method testAOfNum1([@vm.inferred-type.metadata=#lib::B<InterfaceType(int)>] dynamic x) → dynamic
+ return _in::unsafeCast<self::A<core::num>>(x);
+static method testAOfNum2([@vm.inferred-type.metadata=#lib::B<InterfaceType(int?)>] dynamic x) → dynamic
+ return _in::unsafeCast<self::A<core::num>>(x);
+static method testAOfNum3([@vm.inferred-type.metadata=dart.core::Null? (value: null)] dynamic x) → dynamic
+ return _in::unsafeCast<self::A<core::num>>(x);
+static method testAOfNullableNum([@vm.inferred-type.metadata=#lib::B<InterfaceType(int?)>] dynamic x) → dynamic
+ return _in::unsafeCast<self::A<core::num?>>(x);
+static method testNullableAOfNum([@vm.inferred-type.metadata=dart.core::Null? (value: null)] dynamic x) → dynamic
+ return _in::unsafeCast<self::A<core::num>?>(x);
+static method testNullableAOfNullableNum([@vm.inferred-type.metadata=#lib::B<InterfaceType(int?)>] dynamic x) → dynamic
+ return _in::unsafeCast<self::A<core::num?>?>(x);
+static method main() → void {
+ self::testInt1(42);
+ self::testInt2(null);
+ self::testNullableInt1(42);
+ self::testNullableInt2(null);
+ self::testDynamic("hi");
+ self::testObject(null);
+ self::testNullableObject(null);
+ self::testAOfNum1(new self::B::•<core::int>());
+ self::testAOfNum2(new self::B::•<core::int?>());
+ self::testAOfNum3(null);
+ self::testAOfNullableNum(new self::B::•<core::int?>());
+ self::testNullableAOfNum(null);
+ self::testNullableAOfNullableNum(new self::B::•<core::int?>());
+ [@vm.direct-call.metadata=B::testT1] [@vm.inferred-type.metadata=!? (skip check)] new self::B::•<core::int>().{self::B::testT1}(42);
+ [@vm.direct-call.metadata=B::testT2] [@vm.inferred-type.metadata=!? (skip check)] new self::B::•<core::int>().{self::B::testT2}(null);
+ [@vm.direct-call.metadata=B::testT3] [@vm.inferred-type.metadata=!? (skip check)] new self::B::•<core::int?>().{self::B::testT3}(null);
+ [@vm.direct-call.metadata=B::testNullableT1] [@vm.inferred-type.metadata=!? (skip check)] new self::B::•<core::int>().{self::B::testNullableT1}(42);
+ [@vm.direct-call.metadata=B::testNullableT2] [@vm.inferred-type.metadata=!? (skip check)] new self::B::•<core::int>().{self::B::testNullableT2}(null);
+}
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/type_cast_elimination_nnbd_strong.dart b/pkg/vm/testcases/transformations/type_flow/transformer/type_cast_elimination_nnbd_strong.dart
new file mode 100644
index 0000000..8855bf4
--- /dev/null
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/type_cast_elimination_nnbd_strong.dart
@@ -0,0 +1,55 @@
+// Copyright (c) 2020, 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.
+
+// Tests elimination of type casts.
+// This test requires non-nullable experiment and NNBD strong mode.
+
+// @dart = 2.8
+
+class A<T> {}
+
+class B<T> extends A<T> {
+ testT1(x) => x as T;
+ testT2negative(x) => x as T;
+ testT3(x) => x as T;
+ testNullableT1(x) => x as T?;
+ testNullableT2(x) => x as T?;
+}
+
+testInt1(x) => x as int;
+testInt2negative(x) => x as int;
+testNullableInt1(x) => x as int?;
+testNullableInt2(x) => x as int?;
+testDynamic(x) => x as dynamic;
+testObjectNegative(x) => x as Object;
+testNullableObject(x) => x as Object?;
+testAOfNum1(x) => x as A<num>;
+testAOfNum2negative(x) => x as A<num>;
+testAOfNum3negative(x) => x as A<num>;
+testAOfNullableNum(x) => x as A<num?>;
+testNullableAOfNum(x) => x as A<num>?;
+testNullableAOfNumNegative(x) => x as A<num>?;
+testNullableAOfNullableNum(x) => x as A<num?>?;
+
+void main() {
+ testInt1(42);
+ testInt2negative(null);
+ testNullableInt1(42);
+ testNullableInt2(null);
+ testDynamic('hi');
+ testObjectNegative(null);
+ testNullableObject(null);
+ testAOfNum1(new B<int>());
+ testAOfNum2negative(new B<int?>());
+ testAOfNum3negative(null);
+ testAOfNullableNum(new B<int?>());
+ testNullableAOfNum(null);
+ testNullableAOfNumNegative(new B<int?>());
+ testNullableAOfNullableNum(new B<int?>());
+ new B<int>().testT1(42);
+ new B<int>().testT2negative(null);
+ new B<int?>().testT3(null);
+ new B<int>().testNullableT1(42);
+ new B<int>().testNullableT2(null);
+}
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/type_cast_elimination_nnbd_strong.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/type_cast_elimination_nnbd_strong.dart.expect
new file mode 100644
index 0000000..30e95fb
--- /dev/null
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/type_cast_elimination_nnbd_strong.dart.expect
@@ -0,0 +1,74 @@
+library #lib /*isNonNullableByDefault*/;
+import self as self;
+import "dart:core" as core;
+import "dart:_internal" as _in;
+
+abstract class A<T extends core::Object? = dynamic> extends core::Object {
+ synthetic constructor •() → self::A<self::A::T%>
+ : super core::Object::•()
+ ;
+}
+class B<T extends core::Object? = dynamic> extends self::A<self::B::T%> {
+ synthetic constructor •() → self::B<self::B::T%>
+ : super self::A::•()
+ ;
+[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:1,getterSelectorId:2] method testT1([@vm.inferred-type.metadata=dart.core::_Smi (value: 42)] dynamic x) → dynamic
+ return _in::unsafeCast<self::B::T%>(x);
+[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3,getterSelectorId:4] method testT2negative([@vm.inferred-type.metadata=dart.core::Null? (value: null)] dynamic x) → dynamic
+ return x as{ForNonNullableByDefault} self::B::T%;
+[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:5,getterSelectorId:6] method testT3([@vm.inferred-type.metadata=dart.core::Null? (value: null)] dynamic x) → dynamic
+ return _in::unsafeCast<self::B::T%>(x);
+[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:7,getterSelectorId:8] method testNullableT1([@vm.inferred-type.metadata=dart.core::_Smi (value: 42)] dynamic x) → dynamic
+ return _in::unsafeCast<self::B::T?>(x);
+[@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:9,getterSelectorId:10] method testNullableT2([@vm.inferred-type.metadata=dart.core::Null? (value: null)] dynamic x) → dynamic
+ return _in::unsafeCast<self::B::T?>(x);
+}
+[@vm.unboxing-info.metadata=(i)->i]static method testInt1([@vm.inferred-type.metadata=dart.core::_Smi (value: 42)] dynamic x) → dynamic
+ return _in::unsafeCast<core::int>(x);
+static method testInt2negative([@vm.inferred-type.metadata=dart.core::Null? (value: null)] dynamic x) → dynamic
+ return x as{ForNonNullableByDefault} core::int;
+[@vm.unboxing-info.metadata=(i)->i]static method testNullableInt1([@vm.inferred-type.metadata=dart.core::_Smi (value: 42)] dynamic x) → dynamic
+ return _in::unsafeCast<core::int?>(x);
+static method testNullableInt2([@vm.inferred-type.metadata=dart.core::Null? (value: null)] dynamic x) → dynamic
+ return _in::unsafeCast<core::int?>(x);
+static method testDynamic([@vm.inferred-type.metadata=dart.core::_OneByteString (value: hi)] dynamic x) → dynamic
+ return _in::unsafeCast<dynamic>(x);
+static method testObjectNegative([@vm.inferred-type.metadata=dart.core::Null? (value: null)] dynamic x) → dynamic
+ return x as{ForNonNullableByDefault} core::Object;
+static method testNullableObject([@vm.inferred-type.metadata=dart.core::Null? (value: null)] dynamic x) → dynamic
+ return _in::unsafeCast<core::Object?>(x);
+static method testAOfNum1([@vm.inferred-type.metadata=#lib::B<InterfaceType(int)>] dynamic x) → dynamic
+ return _in::unsafeCast<self::A<core::num>>(x);
+static method testAOfNum2negative([@vm.inferred-type.metadata=#lib::B<InterfaceType(int?)>] dynamic x) → dynamic
+ return x as{ForNonNullableByDefault} self::A<core::num>;
+static method testAOfNum3negative([@vm.inferred-type.metadata=dart.core::Null? (value: null)] dynamic x) → dynamic
+ return x as{ForNonNullableByDefault} self::A<core::num>;
+static method testAOfNullableNum([@vm.inferred-type.metadata=#lib::B<InterfaceType(int?)>] dynamic x) → dynamic
+ return _in::unsafeCast<self::A<core::num?>>(x);
+static method testNullableAOfNum([@vm.inferred-type.metadata=dart.core::Null? (value: null)] dynamic x) → dynamic
+ return _in::unsafeCast<self::A<core::num>?>(x);
+static method testNullableAOfNumNegative([@vm.inferred-type.metadata=#lib::B<InterfaceType(int?)>] dynamic x) → dynamic
+ return x as{ForNonNullableByDefault} self::A<core::num>?;
+static method testNullableAOfNullableNum([@vm.inferred-type.metadata=#lib::B<InterfaceType(int?)>] dynamic x) → dynamic
+ return _in::unsafeCast<self::A<core::num?>?>(x);
+static method main() → void {
+ self::testInt1(42);
+ self::testInt2negative(null);
+ self::testNullableInt1(42);
+ self::testNullableInt2(null);
+ self::testDynamic("hi");
+ self::testObjectNegative(null);
+ self::testNullableObject(null);
+ self::testAOfNum1(new self::B::•<core::int>());
+ self::testAOfNum2negative(new self::B::•<core::int?>());
+ self::testAOfNum3negative(null);
+ self::testAOfNullableNum(new self::B::•<core::int?>());
+ self::testNullableAOfNum(null);
+ self::testNullableAOfNumNegative(new self::B::•<core::int?>());
+ self::testNullableAOfNullableNum(new self::B::•<core::int?>());
+ [@vm.direct-call.metadata=B::testT1] [@vm.inferred-type.metadata=!? (skip check)] new self::B::•<core::int>().{self::B::testT1}(42);
+ [@vm.direct-call.metadata=B::testT2negative] [@vm.inferred-type.metadata=!? (skip check)] new self::B::•<core::int>().{self::B::testT2negative}(null);
+ [@vm.direct-call.metadata=B::testT3] [@vm.inferred-type.metadata=!? (skip check)] new self::B::•<core::int?>().{self::B::testT3}(null);
+ [@vm.direct-call.metadata=B::testNullableT1] [@vm.inferred-type.metadata=!? (skip check)] new self::B::•<core::int>().{self::B::testNullableT1}(42);
+ [@vm.direct-call.metadata=B::testNullableT2] [@vm.inferred-type.metadata=!? (skip check)] new self::B::•<core::int>().{self::B::testNullableT2}(null);
+}
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/unboxed_instance_fields.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/unboxed_instance_fields.dart.expect
index c1061c9..4fb58cc 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/unboxed_instance_fields.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/unboxed_instance_fields.dart.expect
@@ -21,31 +21,31 @@
: self::A::unboxedSmi = unboxedSmi, self::A::unboxedInt = unboxedInt, self::A::unboxedDouble = unboxedDouble, self::A::boxedNullableInt = boxedNullableInt, self::A::boxedNullableDouble = boxedNullableDouble, self::A::boxedNonNullableIntOrDouble = boxedNonNullableIntOrDouble, self::A::boxedNullableIntOrDouble = boxedNullableIntOrDouble, self::A::boxedNullableX = boxedNullableX, self::A::boxedX = boxedX, super core::Object::•()
;
}
-[@vm.inferred-type.metadata=dart.core::bool?]static final field core::bool* kTrue = [@vm.direct-call.metadata=dart.core::_IntegerImplementation::==] [@vm.inferred-type.metadata=dart.core::bool (skip check)] [@vm.inferred-type.metadata=int] core::int::parse("1").{core::num::==}(1) ?{core::bool*} true : false;
-[@vm.inferred-type.metadata=dart.core::bool?]static final field core::bool* kFalse = [@vm.direct-call.metadata=dart.core::_IntegerImplementation::==] [@vm.inferred-type.metadata=dart.core::bool (skip check)] [@vm.inferred-type.metadata=int] core::int::parse("1").{core::num::==}(2) ?{core::bool*} true : false;
+[@vm.inferred-type.metadata=dart.core::bool?]static final field core::bool* kTrue = [@vm.direct-call.metadata=_IntegerImplementation::==] [@vm.inferred-type.metadata=dart.core::bool (skip check)] [@vm.inferred-type.metadata=int] core::int::parse("1").{core::num::==}(1) ?{core::bool*} true : false;
+[@vm.inferred-type.metadata=dart.core::bool?]static final field core::bool* kFalse = [@vm.direct-call.metadata=_IntegerImplementation::==] [@vm.inferred-type.metadata=dart.core::bool (skip check)] [@vm.inferred-type.metadata=int] core::int::parse("1").{core::num::==}(2) ?{core::bool*} true : false;
static get mint() → core::int*
return -6144092014192636707;
static get smiOrMint() → core::int*
return [@vm.inferred-type.metadata=dart.core::bool?] self::kTrue ?{core::int*} 1 : [@vm.inferred-type.metadata=int] self::mint;
static method main() → dynamic {
final self::A* a = new self::A::•([@vm.inferred-type.metadata=dart.core::bool?] self::kTrue ?{core::int*} 1 : 2, [@vm.inferred-type.metadata=dart.core::bool?] self::kTrue ?{core::int*} [@vm.inferred-type.metadata=int] self::smiOrMint : 2, [@vm.inferred-type.metadata=dart.core::bool?] self::kTrue ?{core::double*} 1.1 : 2.2, [@vm.inferred-type.metadata=dart.core::bool?] self::kTrue ?{core::int*} [@vm.inferred-type.metadata=int] self::smiOrMint : null, [@vm.inferred-type.metadata=dart.core::bool?] self::kTrue ?{core::double*} 1.1 : null, [@vm.inferred-type.metadata=dart.core::bool?] self::kTrue ?{core::num*} [@vm.inferred-type.metadata=int] self::smiOrMint : 1.1, [@vm.inferred-type.metadata=dart.core::bool?] self::kTrue ?{core::num*} [@vm.inferred-type.metadata=dart.core::bool?] self::kFalse ?{core::num*} [@vm.inferred-type.metadata=int] self::smiOrMint : 1.1 : null, [@vm.inferred-type.metadata=dart.core::bool?] self::kTrue ?{self::X*} new self::X::•() : null, new self::X::•());
- [@vm.direct-call.metadata=#lib::A::unboxedSmi] [@vm.inferred-type.metadata=!? (skip check)] a.{self::A::unboxedSmi} = [@vm.inferred-type.metadata=dart.core::bool?] self::kTrue ?{core::int*} 1 : 2;
- [@vm.direct-call.metadata=#lib::A::unboxedInt] [@vm.inferred-type.metadata=!? (skip check)] a.{self::A::unboxedInt} = [@vm.inferred-type.metadata=dart.core::bool?] self::kTrue ?{core::int*} [@vm.inferred-type.metadata=int] self::smiOrMint : 2;
- [@vm.direct-call.metadata=#lib::A::unboxedDouble] [@vm.inferred-type.metadata=!? (skip check)] a.{self::A::unboxedDouble} = [@vm.inferred-type.metadata=dart.core::bool?] self::kTrue ?{core::double*} 1.1 : 2.2;
- [@vm.direct-call.metadata=#lib::A::boxedNullableInt] [@vm.inferred-type.metadata=!? (skip check)] a.{self::A::boxedNullableInt} = [@vm.inferred-type.metadata=dart.core::bool?] self::kTrue ?{core::int*} [@vm.inferred-type.metadata=int] self::smiOrMint : null;
- [@vm.direct-call.metadata=#lib::A::boxedNullableDouble] [@vm.inferred-type.metadata=!? (skip check)] a.{self::A::boxedNullableDouble} = [@vm.inferred-type.metadata=dart.core::bool?] self::kTrue ?{core::double*} 1.1 : null;
- [@vm.direct-call.metadata=#lib::A::boxedNonNullableIntOrDouble] [@vm.inferred-type.metadata=!? (skip check)] a.{self::A::boxedNonNullableIntOrDouble} = [@vm.inferred-type.metadata=dart.core::bool?] self::kTrue ?{core::num*} [@vm.inferred-type.metadata=int] self::smiOrMint : 1.1;
- [@vm.direct-call.metadata=#lib::A::boxedNullableIntOrDouble] [@vm.inferred-type.metadata=!? (skip check)] a.{self::A::boxedNullableIntOrDouble} = [@vm.inferred-type.metadata=dart.core::bool?] self::kTrue ?{core::num*} [@vm.inferred-type.metadata=dart.core::bool?] self::kFalse ?{core::num*} [@vm.inferred-type.metadata=int] self::smiOrMint : 1.1 : null;
- [@vm.direct-call.metadata=#lib::A::boxedNullableX] [@vm.inferred-type.metadata=!? (skip check)] a.{self::A::boxedNullableX} = [@vm.inferred-type.metadata=dart.core::bool?] self::kTrue ?{self::X*} new self::X::•() : null;
- [@vm.direct-call.metadata=#lib::A::boxedX] [@vm.inferred-type.metadata=!? (skip check)] a.{self::A::boxedX} = new self::X::•();
- self::use([@vm.direct-call.metadata=#lib::A::unboxedSmi] [@vm.inferred-type.metadata=dart.core::_Smi] a.{self::A::unboxedSmi});
- self::use([@vm.direct-call.metadata=#lib::A::unboxedInt] [@vm.inferred-type.metadata=int] a.{self::A::unboxedInt});
- self::use([@vm.direct-call.metadata=#lib::A::unboxedDouble] [@vm.inferred-type.metadata=dart.core::_Double] a.{self::A::unboxedDouble});
- self::use([@vm.direct-call.metadata=#lib::A::boxedNullableInt] [@vm.inferred-type.metadata=int?] a.{self::A::boxedNullableInt});
- self::use([@vm.direct-call.metadata=#lib::A::boxedNullableDouble] [@vm.inferred-type.metadata=dart.core::_Double?] a.{self::A::boxedNullableDouble});
- self::use([@vm.direct-call.metadata=#lib::A::boxedNonNullableIntOrDouble] [@vm.inferred-type.metadata=!] a.{self::A::boxedNonNullableIntOrDouble});
- self::use([@vm.direct-call.metadata=#lib::A::boxedNullableIntOrDouble] a.{self::A::boxedNullableIntOrDouble});
- self::use([@vm.direct-call.metadata=#lib::A::boxedNullableX] [@vm.inferred-type.metadata=#lib::X?] a.{self::A::boxedNullableX});
- self::use([@vm.direct-call.metadata=#lib::A::boxedX] [@vm.inferred-type.metadata=#lib::X] a.{self::A::boxedX});
+ [@vm.direct-call.metadata=A::unboxedSmi] [@vm.inferred-type.metadata=!? (skip check)] a.{self::A::unboxedSmi} = [@vm.inferred-type.metadata=dart.core::bool?] self::kTrue ?{core::int*} 1 : 2;
+ [@vm.direct-call.metadata=A::unboxedInt] [@vm.inferred-type.metadata=!? (skip check)] a.{self::A::unboxedInt} = [@vm.inferred-type.metadata=dart.core::bool?] self::kTrue ?{core::int*} [@vm.inferred-type.metadata=int] self::smiOrMint : 2;
+ [@vm.direct-call.metadata=A::unboxedDouble] [@vm.inferred-type.metadata=!? (skip check)] a.{self::A::unboxedDouble} = [@vm.inferred-type.metadata=dart.core::bool?] self::kTrue ?{core::double*} 1.1 : 2.2;
+ [@vm.direct-call.metadata=A::boxedNullableInt] [@vm.inferred-type.metadata=!? (skip check)] a.{self::A::boxedNullableInt} = [@vm.inferred-type.metadata=dart.core::bool?] self::kTrue ?{core::int*} [@vm.inferred-type.metadata=int] self::smiOrMint : null;
+ [@vm.direct-call.metadata=A::boxedNullableDouble] [@vm.inferred-type.metadata=!? (skip check)] a.{self::A::boxedNullableDouble} = [@vm.inferred-type.metadata=dart.core::bool?] self::kTrue ?{core::double*} 1.1 : null;
+ [@vm.direct-call.metadata=A::boxedNonNullableIntOrDouble] [@vm.inferred-type.metadata=!? (skip check)] a.{self::A::boxedNonNullableIntOrDouble} = [@vm.inferred-type.metadata=dart.core::bool?] self::kTrue ?{core::num*} [@vm.inferred-type.metadata=int] self::smiOrMint : 1.1;
+ [@vm.direct-call.metadata=A::boxedNullableIntOrDouble] [@vm.inferred-type.metadata=!? (skip check)] a.{self::A::boxedNullableIntOrDouble} = [@vm.inferred-type.metadata=dart.core::bool?] self::kTrue ?{core::num*} [@vm.inferred-type.metadata=dart.core::bool?] self::kFalse ?{core::num*} [@vm.inferred-type.metadata=int] self::smiOrMint : 1.1 : null;
+ [@vm.direct-call.metadata=A::boxedNullableX] [@vm.inferred-type.metadata=!? (skip check)] a.{self::A::boxedNullableX} = [@vm.inferred-type.metadata=dart.core::bool?] self::kTrue ?{self::X*} new self::X::•() : null;
+ [@vm.direct-call.metadata=A::boxedX] [@vm.inferred-type.metadata=!? (skip check)] a.{self::A::boxedX} = new self::X::•();
+ self::use([@vm.direct-call.metadata=A::unboxedSmi] [@vm.inferred-type.metadata=dart.core::_Smi] a.{self::A::unboxedSmi});
+ self::use([@vm.direct-call.metadata=A::unboxedInt] [@vm.inferred-type.metadata=int] a.{self::A::unboxedInt});
+ self::use([@vm.direct-call.metadata=A::unboxedDouble] [@vm.inferred-type.metadata=dart.core::_Double] a.{self::A::unboxedDouble});
+ self::use([@vm.direct-call.metadata=A::boxedNullableInt] [@vm.inferred-type.metadata=int?] a.{self::A::boxedNullableInt});
+ self::use([@vm.direct-call.metadata=A::boxedNullableDouble] [@vm.inferred-type.metadata=dart.core::_Double?] a.{self::A::boxedNullableDouble});
+ self::use([@vm.direct-call.metadata=A::boxedNonNullableIntOrDouble] [@vm.inferred-type.metadata=!] a.{self::A::boxedNonNullableIntOrDouble});
+ self::use([@vm.direct-call.metadata=A::boxedNullableIntOrDouble] a.{self::A::boxedNullableIntOrDouble});
+ self::use([@vm.direct-call.metadata=A::boxedNullableX] [@vm.inferred-type.metadata=#lib::X?] a.{self::A::boxedNullableX});
+ self::use([@vm.direct-call.metadata=A::boxedX] [@vm.inferred-type.metadata=#lib::X] a.{self::A::boxedX});
}
static method use(dynamic object) → void {}
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/unboxed_instance_method.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/unboxed_instance_method.dart.expect
index e57a95f..458b82d 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/unboxed_instance_method.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/unboxed_instance_method.dart.expect
@@ -95,23 +95,23 @@
return -6144092014192636707;
static method main() → dynamic {
final core::List<core::Object*>* values = <core::Object*>[new self::Impl1::•(), new self::BaseImpl2::•(), new self::SubImpl3::•()];
- final self::Impl1* a = [@vm.direct-call.metadata=dart.core::_GrowableList::[]] [@vm.inferred-type.metadata=!? (skip check)] values.{core::List::[]}([@vm.inferred-type.metadata=int] core::int::parse("0")) as self::Impl1*;
- final self::BaseImpl2* b = [@vm.direct-call.metadata=dart.core::_GrowableList::[]] [@vm.inferred-type.metadata=!? (skip check)] values.{core::List::[]}([@vm.inferred-type.metadata=int] core::int::parse("1")) as self::BaseImpl2*;
- final self::SubImpl3* c = [@vm.direct-call.metadata=dart.core::_GrowableList::[]] [@vm.inferred-type.metadata=!? (skip check)] values.{core::List::[]}([@vm.inferred-type.metadata=int] core::int::parse("2")) as self::SubImpl3*;
- final self::Interface* d = [@vm.direct-call.metadata=dart.core::_GrowableList::[]] [@vm.inferred-type.metadata=!? (skip check)] values.{core::List::[]}([@vm.inferred-type.metadata=int] core::int::parse("2")) as self::Interface*;
- [@vm.direct-call.metadata=#lib::Impl1::takePositional??] [@vm.inferred-type.metadata=!? (skip check)] a.{self::Impl1::takePositional}(1, 1, 1.1, null, null, 1, null, null, new self::X::•());
+ final self::Impl1* a = [@vm.direct-call.metadata=_GrowableList::[]] [@vm.inferred-type.metadata=!? (skip check)] values.{core::List::[]}([@vm.inferred-type.metadata=int] core::int::parse("0")) as self::Impl1*;
+ final self::BaseImpl2* b = [@vm.direct-call.metadata=_GrowableList::[]] [@vm.inferred-type.metadata=!? (skip check)] values.{core::List::[]}([@vm.inferred-type.metadata=int] core::int::parse("1")) as self::BaseImpl2*;
+ final self::SubImpl3* c = [@vm.direct-call.metadata=_GrowableList::[]] [@vm.inferred-type.metadata=!? (skip check)] values.{core::List::[]}([@vm.inferred-type.metadata=int] core::int::parse("2")) as self::SubImpl3*;
+ final self::Interface* d = [@vm.direct-call.metadata=_GrowableList::[]] [@vm.inferred-type.metadata=!? (skip check)] values.{core::List::[]}([@vm.inferred-type.metadata=int] core::int::parse("2")) as self::Interface*;
+ [@vm.direct-call.metadata=Impl1::takePositional??] [@vm.inferred-type.metadata=!? (skip check)] a.{self::Impl1::takePositional}(1, 1, 1.1, null, null, 1, null, null, new self::X::•());
b.{self::BaseImpl2::takePositional}(2, 2, 2.2, 2, 2.2, 2.2, 2, new self::X::•(), new self::X::•());
- [@vm.direct-call.metadata=#lib::SubImpl3::takePositional??] [@vm.inferred-type.metadata=!? (skip check)] c.{self::SubImpl3::takePositional}(3, [@vm.inferred-type.metadata=int] self::mint, 3.3, [@vm.inferred-type.metadata=int] self::mint, 3.3, 3.3, 3.3, new self::X::•(), new self::X::•());
+ [@vm.direct-call.metadata=SubImpl3::takePositional??] [@vm.inferred-type.metadata=!? (skip check)] c.{self::SubImpl3::takePositional}(3, [@vm.inferred-type.metadata=int] self::mint, 3.3, [@vm.inferred-type.metadata=int] self::mint, 3.3, 3.3, 3.3, new self::X::•(), new self::X::•());
d.{self::Interface::takePositional}(3, [@vm.inferred-type.metadata=int] self::mint, 3.3, [@vm.inferred-type.metadata=int] self::mint, 3.3, 3.3, 3.3, new self::X::•(), new self::X::•());
- self::use([@vm.direct-call.metadata=#lib::Impl1::returnUnboxedSmi] [@vm.inferred-type.metadata=dart.core::_Smi (skip check) (value: 1)] a.{self::Impl1::returnUnboxedSmi}(null));
- self::use([@vm.direct-call.metadata=#lib::Impl1::returnUnboxedInt] [@vm.inferred-type.metadata=dart.core::_Smi (skip check) (value: 1)] a.{self::Impl1::returnUnboxedInt}(null));
- self::use([@vm.direct-call.metadata=#lib::Impl1::returnUnboxedDouble] [@vm.inferred-type.metadata=dart.core::_Double (skip check) (value: 1.1)] a.{self::Impl1::returnUnboxedDouble}(null));
- self::use([@vm.direct-call.metadata=#lib::Impl1::returnBoxedNullableInt] [@vm.inferred-type.metadata=dart.core::Null? (skip check) (value: null)] a.{self::Impl1::returnBoxedNullableInt}(null));
- self::use([@vm.direct-call.metadata=#lib::Impl1::returnBoxedNullableDouble] [@vm.inferred-type.metadata=dart.core::Null? (skip check) (value: null)] a.{self::Impl1::returnBoxedNullableDouble}(null));
- self::use([@vm.direct-call.metadata=#lib::Impl1::returnBoxedIntOrDouble] [@vm.inferred-type.metadata=dart.core::_Smi (skip check) (value: 1)] a.{self::Impl1::returnBoxedIntOrDouble}(null));
- self::use([@vm.direct-call.metadata=#lib::Impl1::returnBoxedNullableIntOrDouble] [@vm.inferred-type.metadata=dart.core::Null? (skip check) (value: null)] a.{self::Impl1::returnBoxedNullableIntOrDouble}(null));
- self::use([@vm.direct-call.metadata=#lib::Impl1::returnBoxedNullableX] [@vm.inferred-type.metadata=dart.core::Null? (skip check) (value: null)] a.{self::Impl1::returnBoxedNullableX}(null));
- self::use([@vm.direct-call.metadata=#lib::Impl1::returnBoxedX] [@vm.inferred-type.metadata=#lib::X (skip check)] a.{self::Impl1::returnBoxedX}(null));
+ self::use([@vm.direct-call.metadata=Impl1::returnUnboxedSmi] [@vm.inferred-type.metadata=dart.core::_Smi (skip check) (value: 1)] a.{self::Impl1::returnUnboxedSmi}(null));
+ self::use([@vm.direct-call.metadata=Impl1::returnUnboxedInt] [@vm.inferred-type.metadata=dart.core::_Smi (skip check) (value: 1)] a.{self::Impl1::returnUnboxedInt}(null));
+ self::use([@vm.direct-call.metadata=Impl1::returnUnboxedDouble] [@vm.inferred-type.metadata=dart.core::_Double (skip check) (value: 1.1)] a.{self::Impl1::returnUnboxedDouble}(null));
+ self::use([@vm.direct-call.metadata=Impl1::returnBoxedNullableInt] [@vm.inferred-type.metadata=dart.core::Null? (skip check) (value: null)] a.{self::Impl1::returnBoxedNullableInt}(null));
+ self::use([@vm.direct-call.metadata=Impl1::returnBoxedNullableDouble] [@vm.inferred-type.metadata=dart.core::Null? (skip check) (value: null)] a.{self::Impl1::returnBoxedNullableDouble}(null));
+ self::use([@vm.direct-call.metadata=Impl1::returnBoxedIntOrDouble] [@vm.inferred-type.metadata=dart.core::_Smi (skip check) (value: 1)] a.{self::Impl1::returnBoxedIntOrDouble}(null));
+ self::use([@vm.direct-call.metadata=Impl1::returnBoxedNullableIntOrDouble] [@vm.inferred-type.metadata=dart.core::Null? (skip check) (value: null)] a.{self::Impl1::returnBoxedNullableIntOrDouble}(null));
+ self::use([@vm.direct-call.metadata=Impl1::returnBoxedNullableX] [@vm.inferred-type.metadata=dart.core::Null? (skip check) (value: null)] a.{self::Impl1::returnBoxedNullableX}(null));
+ self::use([@vm.direct-call.metadata=Impl1::returnBoxedX] [@vm.inferred-type.metadata=#lib::X (skip check)] a.{self::Impl1::returnBoxedX}(null));
self::use([@vm.inferred-type.metadata=dart.core::_Smi] b.{self::BaseImpl2::returnUnboxedSmi}(null));
self::use([@vm.inferred-type.metadata=int] b.{self::BaseImpl2::returnUnboxedInt}(null));
self::use([@vm.inferred-type.metadata=dart.core::_Double] b.{self::BaseImpl2::returnUnboxedDouble}(null));
@@ -121,15 +121,15 @@
self::use([@vm.inferred-type.metadata=!] b.{self::BaseImpl2::returnBoxedNullableIntOrDouble}(null));
self::use([@vm.inferred-type.metadata=#lib::X] b.{self::BaseImpl2::returnBoxedNullableX}(null));
self::use([@vm.inferred-type.metadata=#lib::X] b.{self::BaseImpl2::returnBoxedX}(null));
- self::use([@vm.direct-call.metadata=#lib::SubImpl3::returnUnboxedSmi] [@vm.inferred-type.metadata=dart.core::_Smi (skip check) (value: 3)] c.{self::SubImpl3::returnUnboxedSmi}(null));
- self::use([@vm.direct-call.metadata=#lib::SubImpl3::returnUnboxedInt] [@vm.inferred-type.metadata=int (skip check)] c.{self::SubImpl3::returnUnboxedInt}(null));
- self::use([@vm.direct-call.metadata=#lib::SubImpl3::returnUnboxedDouble] [@vm.inferred-type.metadata=dart.core::_Double (skip check) (value: 3.3)] c.{self::SubImpl3::returnUnboxedDouble}(null));
- self::use([@vm.direct-call.metadata=#lib::SubImpl3::returnBoxedNullableInt] [@vm.inferred-type.metadata=int (skip check)] c.{self::SubImpl3::returnBoxedNullableInt}(null));
- self::use([@vm.direct-call.metadata=#lib::SubImpl3::returnBoxedNullableDouble] [@vm.inferred-type.metadata=dart.core::_Double (skip check) (value: 3.3)] c.{self::SubImpl3::returnBoxedNullableDouble}(null));
- self::use([@vm.direct-call.metadata=#lib::SubImpl3::returnBoxedIntOrDouble] [@vm.inferred-type.metadata=dart.core::_Double (skip check) (value: 3.3)] c.{self::SubImpl3::returnBoxedIntOrDouble}(null));
- self::use([@vm.direct-call.metadata=#lib::SubImpl3::returnBoxedNullableIntOrDouble] [@vm.inferred-type.metadata=dart.core::_Double (skip check) (value: 3.3)] c.{self::SubImpl3::returnBoxedNullableIntOrDouble}(null));
- self::use([@vm.direct-call.metadata=#lib::SubImpl3::returnBoxedNullableX] [@vm.inferred-type.metadata=#lib::X (skip check)] c.{self::SubImpl3::returnBoxedNullableX}(null));
- self::use([@vm.direct-call.metadata=#lib::SubImpl3::returnBoxedX] [@vm.inferred-type.metadata=#lib::X (skip check)] c.{self::SubImpl3::returnBoxedX}(null));
+ self::use([@vm.direct-call.metadata=SubImpl3::returnUnboxedSmi] [@vm.inferred-type.metadata=dart.core::_Smi (skip check) (value: 3)] c.{self::SubImpl3::returnUnboxedSmi}(null));
+ self::use([@vm.direct-call.metadata=SubImpl3::returnUnboxedInt] [@vm.inferred-type.metadata=int (skip check)] c.{self::SubImpl3::returnUnboxedInt}(null));
+ self::use([@vm.direct-call.metadata=SubImpl3::returnUnboxedDouble] [@vm.inferred-type.metadata=dart.core::_Double (skip check) (value: 3.3)] c.{self::SubImpl3::returnUnboxedDouble}(null));
+ self::use([@vm.direct-call.metadata=SubImpl3::returnBoxedNullableInt] [@vm.inferred-type.metadata=int (skip check)] c.{self::SubImpl3::returnBoxedNullableInt}(null));
+ self::use([@vm.direct-call.metadata=SubImpl3::returnBoxedNullableDouble] [@vm.inferred-type.metadata=dart.core::_Double (skip check) (value: 3.3)] c.{self::SubImpl3::returnBoxedNullableDouble}(null));
+ self::use([@vm.direct-call.metadata=SubImpl3::returnBoxedIntOrDouble] [@vm.inferred-type.metadata=dart.core::_Double (skip check) (value: 3.3)] c.{self::SubImpl3::returnBoxedIntOrDouble}(null));
+ self::use([@vm.direct-call.metadata=SubImpl3::returnBoxedNullableIntOrDouble] [@vm.inferred-type.metadata=dart.core::_Double (skip check) (value: 3.3)] c.{self::SubImpl3::returnBoxedNullableIntOrDouble}(null));
+ self::use([@vm.direct-call.metadata=SubImpl3::returnBoxedNullableX] [@vm.inferred-type.metadata=#lib::X (skip check)] c.{self::SubImpl3::returnBoxedNullableX}(null));
+ self::use([@vm.direct-call.metadata=SubImpl3::returnBoxedX] [@vm.inferred-type.metadata=#lib::X (skip check)] c.{self::SubImpl3::returnBoxedX}(null));
self::use([@vm.inferred-type.metadata=dart.core::_Smi] d.{self::Interface::returnUnboxedSmi}(null));
self::use([@vm.inferred-type.metadata=int] d.{self::Interface::returnUnboxedInt}(null));
self::use([@vm.inferred-type.metadata=dart.core::_Double] d.{self::Interface::returnUnboxedDouble}(null));
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/unboxed_instance_method_tearoff.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/unboxed_instance_method_tearoff.dart.expect
index b08779a..e0c5315 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/unboxed_instance_method_tearoff.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/unboxed_instance_method_tearoff.dart.expect
@@ -95,23 +95,23 @@
return -6144092014192636707;
static method main() → dynamic {
final core::List<core::Object*>* values = <core::Object*>[new self::Impl1::•(), new self::BaseImpl2::•(), new self::SubImpl3::•()];
- final self::Impl1* a = [@vm.direct-call.metadata=dart.core::_GrowableList::[]] [@vm.inferred-type.metadata=!? (skip check)] values.{core::List::[]}([@vm.inferred-type.metadata=int] core::int::parse("0")) as self::Impl1*;
- final self::BaseImpl2* b = [@vm.direct-call.metadata=dart.core::_GrowableList::[]] [@vm.inferred-type.metadata=!? (skip check)] values.{core::List::[]}([@vm.inferred-type.metadata=int] core::int::parse("1")) as self::BaseImpl2*;
- final self::SubImpl3* c = [@vm.direct-call.metadata=dart.core::_GrowableList::[]] [@vm.inferred-type.metadata=!? (skip check)] values.{core::List::[]}([@vm.inferred-type.metadata=int] core::int::parse("2")) as self::SubImpl3*;
- final self::Interface* d = [@vm.direct-call.metadata=dart.core::_GrowableList::[]] [@vm.inferred-type.metadata=!? (skip check)] values.{core::List::[]}([@vm.inferred-type.metadata=int] core::int::parse("2")) as self::Interface*;
- [@vm.direct-call.metadata=#lib::Impl1::takePositional??] [@vm.inferred-type.metadata=!? (skip check)] a.{self::Impl1::takePositional}(1, 1, 1.1, null, null, 1, null, null, new self::X::•());
+ final self::Impl1* a = [@vm.direct-call.metadata=_GrowableList::[]] [@vm.inferred-type.metadata=!? (skip check)] values.{core::List::[]}([@vm.inferred-type.metadata=int] core::int::parse("0")) as self::Impl1*;
+ final self::BaseImpl2* b = [@vm.direct-call.metadata=_GrowableList::[]] [@vm.inferred-type.metadata=!? (skip check)] values.{core::List::[]}([@vm.inferred-type.metadata=int] core::int::parse("1")) as self::BaseImpl2*;
+ final self::SubImpl3* c = [@vm.direct-call.metadata=_GrowableList::[]] [@vm.inferred-type.metadata=!? (skip check)] values.{core::List::[]}([@vm.inferred-type.metadata=int] core::int::parse("2")) as self::SubImpl3*;
+ final self::Interface* d = [@vm.direct-call.metadata=_GrowableList::[]] [@vm.inferred-type.metadata=!? (skip check)] values.{core::List::[]}([@vm.inferred-type.metadata=int] core::int::parse("2")) as self::Interface*;
+ [@vm.direct-call.metadata=Impl1::takePositional??] [@vm.inferred-type.metadata=!? (skip check)] a.{self::Impl1::takePositional}(1, 1, 1.1, null, null, 1, null, null, new self::X::•());
b.{self::BaseImpl2::takePositional}(2, 2, 2.2, 2, 2.2, 2.2, 2, new self::X::•(), new self::X::•());
- [@vm.direct-call.metadata=#lib::SubImpl3::takePositional??] [@vm.inferred-type.metadata=!? (skip check)] c.{self::SubImpl3::takePositional}(3, [@vm.inferred-type.metadata=int] self::mint, 3.3, [@vm.inferred-type.metadata=int] self::mint, 3.3, 3.3, 3.3, new self::X::•(), new self::X::•());
+ [@vm.direct-call.metadata=SubImpl3::takePositional??] [@vm.inferred-type.metadata=!? (skip check)] c.{self::SubImpl3::takePositional}(3, [@vm.inferred-type.metadata=int] self::mint, 3.3, [@vm.inferred-type.metadata=int] self::mint, 3.3, 3.3, 3.3, new self::X::•(), new self::X::•());
d.{self::Interface::takePositional}(3, [@vm.inferred-type.metadata=int] self::mint, 3.3, [@vm.inferred-type.metadata=int] self::mint, 3.3, 3.3, 3.3, new self::X::•(), new self::X::•());
- self::use([@vm.direct-call.metadata=#lib::Impl1::returnUnboxedSmi] [@vm.inferred-type.metadata=dart.core::_Smi (skip check) (value: 1)] a.{self::Impl1::returnUnboxedSmi}(null));
- self::use([@vm.direct-call.metadata=#lib::Impl1::returnUnboxedInt] [@vm.inferred-type.metadata=dart.core::_Smi (skip check) (value: 1)] a.{self::Impl1::returnUnboxedInt}(null));
- self::use([@vm.direct-call.metadata=#lib::Impl1::returnUnboxedDouble] [@vm.inferred-type.metadata=dart.core::_Double (skip check) (value: 1.1)] a.{self::Impl1::returnUnboxedDouble}(null));
- self::use([@vm.direct-call.metadata=#lib::Impl1::returnBoxedNullableInt] [@vm.inferred-type.metadata=dart.core::Null? (skip check) (value: null)] a.{self::Impl1::returnBoxedNullableInt}(null));
- self::use([@vm.direct-call.metadata=#lib::Impl1::returnBoxedNullableDouble] [@vm.inferred-type.metadata=dart.core::Null? (skip check) (value: null)] a.{self::Impl1::returnBoxedNullableDouble}(null));
- self::use([@vm.direct-call.metadata=#lib::Impl1::returnBoxedIntOrDouble] [@vm.inferred-type.metadata=dart.core::_Smi (skip check) (value: 1)] a.{self::Impl1::returnBoxedIntOrDouble}(null));
- self::use([@vm.direct-call.metadata=#lib::Impl1::returnBoxedNullableIntOrDouble] [@vm.inferred-type.metadata=dart.core::Null? (skip check) (value: null)] a.{self::Impl1::returnBoxedNullableIntOrDouble}(null));
- self::use([@vm.direct-call.metadata=#lib::Impl1::returnBoxedNullableX] [@vm.inferred-type.metadata=dart.core::Null? (skip check) (value: null)] a.{self::Impl1::returnBoxedNullableX}(null));
- self::use([@vm.direct-call.metadata=#lib::Impl1::returnBoxedX] [@vm.inferred-type.metadata=#lib::X (skip check)] a.{self::Impl1::returnBoxedX}(null));
+ self::use([@vm.direct-call.metadata=Impl1::returnUnboxedSmi] [@vm.inferred-type.metadata=dart.core::_Smi (skip check) (value: 1)] a.{self::Impl1::returnUnboxedSmi}(null));
+ self::use([@vm.direct-call.metadata=Impl1::returnUnboxedInt] [@vm.inferred-type.metadata=dart.core::_Smi (skip check) (value: 1)] a.{self::Impl1::returnUnboxedInt}(null));
+ self::use([@vm.direct-call.metadata=Impl1::returnUnboxedDouble] [@vm.inferred-type.metadata=dart.core::_Double (skip check) (value: 1.1)] a.{self::Impl1::returnUnboxedDouble}(null));
+ self::use([@vm.direct-call.metadata=Impl1::returnBoxedNullableInt] [@vm.inferred-type.metadata=dart.core::Null? (skip check) (value: null)] a.{self::Impl1::returnBoxedNullableInt}(null));
+ self::use([@vm.direct-call.metadata=Impl1::returnBoxedNullableDouble] [@vm.inferred-type.metadata=dart.core::Null? (skip check) (value: null)] a.{self::Impl1::returnBoxedNullableDouble}(null));
+ self::use([@vm.direct-call.metadata=Impl1::returnBoxedIntOrDouble] [@vm.inferred-type.metadata=dart.core::_Smi (skip check) (value: 1)] a.{self::Impl1::returnBoxedIntOrDouble}(null));
+ self::use([@vm.direct-call.metadata=Impl1::returnBoxedNullableIntOrDouble] [@vm.inferred-type.metadata=dart.core::Null? (skip check) (value: null)] a.{self::Impl1::returnBoxedNullableIntOrDouble}(null));
+ self::use([@vm.direct-call.metadata=Impl1::returnBoxedNullableX] [@vm.inferred-type.metadata=dart.core::Null? (skip check) (value: null)] a.{self::Impl1::returnBoxedNullableX}(null));
+ self::use([@vm.direct-call.metadata=Impl1::returnBoxedX] [@vm.inferred-type.metadata=#lib::X (skip check)] a.{self::Impl1::returnBoxedX}(null));
self::use([@vm.inferred-type.metadata=dart.core::_Smi] b.{self::BaseImpl2::returnUnboxedSmi}(null));
self::use([@vm.inferred-type.metadata=int] b.{self::BaseImpl2::returnUnboxedInt}(null));
self::use([@vm.inferred-type.metadata=dart.core::_Double] b.{self::BaseImpl2::returnUnboxedDouble}(null));
@@ -121,15 +121,15 @@
self::use([@vm.inferred-type.metadata=!] b.{self::BaseImpl2::returnBoxedNullableIntOrDouble}(null));
self::use([@vm.inferred-type.metadata=#lib::X] b.{self::BaseImpl2::returnBoxedNullableX}(null));
self::use([@vm.inferred-type.metadata=#lib::X] b.{self::BaseImpl2::returnBoxedX}(null));
- self::use([@vm.direct-call.metadata=#lib::SubImpl3::returnUnboxedSmi] [@vm.inferred-type.metadata=dart.core::_Smi (skip check) (value: 3)] c.{self::SubImpl3::returnUnboxedSmi}(null));
- self::use([@vm.direct-call.metadata=#lib::SubImpl3::returnUnboxedInt] [@vm.inferred-type.metadata=int (skip check)] c.{self::SubImpl3::returnUnboxedInt}(null));
- self::use([@vm.direct-call.metadata=#lib::SubImpl3::returnUnboxedDouble] [@vm.inferred-type.metadata=dart.core::_Double (skip check) (value: 3.3)] c.{self::SubImpl3::returnUnboxedDouble}(null));
- self::use([@vm.direct-call.metadata=#lib::SubImpl3::returnBoxedNullableInt] [@vm.inferred-type.metadata=int (skip check)] c.{self::SubImpl3::returnBoxedNullableInt}(null));
- self::use([@vm.direct-call.metadata=#lib::SubImpl3::returnBoxedNullableDouble] [@vm.inferred-type.metadata=dart.core::_Double (skip check) (value: 3.3)] c.{self::SubImpl3::returnBoxedNullableDouble}(null));
- self::use([@vm.direct-call.metadata=#lib::SubImpl3::returnBoxedIntOrDouble] [@vm.inferred-type.metadata=dart.core::_Double (skip check) (value: 3.3)] c.{self::SubImpl3::returnBoxedIntOrDouble}(null));
- self::use([@vm.direct-call.metadata=#lib::SubImpl3::returnBoxedNullableIntOrDouble] [@vm.inferred-type.metadata=dart.core::_Double (skip check) (value: 3.3)] c.{self::SubImpl3::returnBoxedNullableIntOrDouble}(null));
- self::use([@vm.direct-call.metadata=#lib::SubImpl3::returnBoxedNullableX] [@vm.inferred-type.metadata=#lib::X (skip check)] c.{self::SubImpl3::returnBoxedNullableX}(null));
- self::use([@vm.direct-call.metadata=#lib::SubImpl3::returnBoxedX] [@vm.inferred-type.metadata=#lib::X (skip check)] c.{self::SubImpl3::returnBoxedX}(null));
+ self::use([@vm.direct-call.metadata=SubImpl3::returnUnboxedSmi] [@vm.inferred-type.metadata=dart.core::_Smi (skip check) (value: 3)] c.{self::SubImpl3::returnUnboxedSmi}(null));
+ self::use([@vm.direct-call.metadata=SubImpl3::returnUnboxedInt] [@vm.inferred-type.metadata=int (skip check)] c.{self::SubImpl3::returnUnboxedInt}(null));
+ self::use([@vm.direct-call.metadata=SubImpl3::returnUnboxedDouble] [@vm.inferred-type.metadata=dart.core::_Double (skip check) (value: 3.3)] c.{self::SubImpl3::returnUnboxedDouble}(null));
+ self::use([@vm.direct-call.metadata=SubImpl3::returnBoxedNullableInt] [@vm.inferred-type.metadata=int (skip check)] c.{self::SubImpl3::returnBoxedNullableInt}(null));
+ self::use([@vm.direct-call.metadata=SubImpl3::returnBoxedNullableDouble] [@vm.inferred-type.metadata=dart.core::_Double (skip check) (value: 3.3)] c.{self::SubImpl3::returnBoxedNullableDouble}(null));
+ self::use([@vm.direct-call.metadata=SubImpl3::returnBoxedIntOrDouble] [@vm.inferred-type.metadata=dart.core::_Double (skip check) (value: 3.3)] c.{self::SubImpl3::returnBoxedIntOrDouble}(null));
+ self::use([@vm.direct-call.metadata=SubImpl3::returnBoxedNullableIntOrDouble] [@vm.inferred-type.metadata=dart.core::_Double (skip check) (value: 3.3)] c.{self::SubImpl3::returnBoxedNullableIntOrDouble}(null));
+ self::use([@vm.direct-call.metadata=SubImpl3::returnBoxedNullableX] [@vm.inferred-type.metadata=#lib::X (skip check)] c.{self::SubImpl3::returnBoxedNullableX}(null));
+ self::use([@vm.direct-call.metadata=SubImpl3::returnBoxedX] [@vm.inferred-type.metadata=#lib::X (skip check)] c.{self::SubImpl3::returnBoxedX}(null));
self::use([@vm.inferred-type.metadata=dart.core::_Smi] d.{self::Interface::returnUnboxedSmi}(null));
self::use([@vm.inferred-type.metadata=int] d.{self::Interface::returnUnboxedInt}(null));
self::use([@vm.inferred-type.metadata=dart.core::_Double] d.{self::Interface::returnUnboxedDouble}(null));
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/unboxed_static_method.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/unboxed_static_method.dart.expect
index 3b27f22..bfc8f13 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/unboxed_static_method.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/unboxed_static_method.dart.expect
@@ -7,8 +7,8 @@
: super core::Object::•()
;
}
-[@vm.inferred-type.metadata=dart.core::bool?]static final field core::bool* kTrue = [@vm.direct-call.metadata=dart.core::_IntegerImplementation::==] [@vm.inferred-type.metadata=dart.core::bool (skip check)] [@vm.inferred-type.metadata=int] core::int::parse("1").{core::num::==}(1) ?{core::bool*} true : false;
-[@vm.inferred-type.metadata=dart.core::bool?]static final field core::bool* kFalse = [@vm.direct-call.metadata=dart.core::_IntegerImplementation::==] [@vm.inferred-type.metadata=dart.core::bool (skip check)] [@vm.inferred-type.metadata=int] core::int::parse("1").{core::num::==}(2) ?{core::bool*} true : false;
+[@vm.inferred-type.metadata=dart.core::bool?]static final field core::bool* kTrue = [@vm.direct-call.metadata=_IntegerImplementation::==] [@vm.inferred-type.metadata=dart.core::bool (skip check)] [@vm.inferred-type.metadata=int] core::int::parse("1").{core::num::==}(1) ?{core::bool*} true : false;
+[@vm.inferred-type.metadata=dart.core::bool?]static final field core::bool* kFalse = [@vm.direct-call.metadata=_IntegerImplementation::==] [@vm.inferred-type.metadata=dart.core::bool (skip check)] [@vm.inferred-type.metadata=int] core::int::parse("1").{core::num::==}(2) ?{core::bool*} true : false;
static get mint() → core::int*
return -6144092014192636707;
static get smiOrMint() → core::int*
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/unboxed_static_method_tearoff.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/unboxed_static_method_tearoff.dart.expect
index f0401b1..e2ab8a5 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/unboxed_static_method_tearoff.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/unboxed_static_method_tearoff.dart.expect
@@ -7,8 +7,8 @@
: super core::Object::•()
;
}
-[@vm.inferred-type.metadata=dart.core::bool?]static final field core::bool* kTrue = [@vm.direct-call.metadata=dart.core::_IntegerImplementation::==] [@vm.inferred-type.metadata=dart.core::bool (skip check)] [@vm.inferred-type.metadata=int] core::int::parse("1").{core::num::==}(1) ?{core::bool*} true : false;
-[@vm.inferred-type.metadata=dart.core::bool?]static final field core::bool* kFalse = [@vm.direct-call.metadata=dart.core::_IntegerImplementation::==] [@vm.inferred-type.metadata=dart.core::bool (skip check)] [@vm.inferred-type.metadata=int] core::int::parse("1").{core::num::==}(2) ?{core::bool*} true : false;
+[@vm.inferred-type.metadata=dart.core::bool?]static final field core::bool* kTrue = [@vm.direct-call.metadata=_IntegerImplementation::==] [@vm.inferred-type.metadata=dart.core::bool (skip check)] [@vm.inferred-type.metadata=int] core::int::parse("1").{core::num::==}(1) ?{core::bool*} true : false;
+[@vm.inferred-type.metadata=dart.core::bool?]static final field core::bool* kFalse = [@vm.direct-call.metadata=_IntegerImplementation::==] [@vm.inferred-type.metadata=dart.core::bool (skip check)] [@vm.inferred-type.metadata=int] core::int::parse("1").{core::num::==}(2) ?{core::bool*} true : false;
static get mint() → core::int*
return -6144092014192636707;
static get smiOrMint() → core::int*
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/write_only_field.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/write_only_field.dart.expect
index e02c5ea..079f6e9 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/write_only_field.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/write_only_field.dart.expect
@@ -19,5 +19,5 @@
[@vm.inferred-type.metadata=dart.core::Null? (value: null)]static field self::A* field = throw "Attempt to execute code removed by Dart AOT compiler (TFA)";
static method main() → void {
self::field = null;
- [@vm.direct-call.metadata=#lib::C::instanceField] [@vm.inferred-type.metadata=!? (skip check)] new self::C::•().{self::C::instanceField} = null;
+ [@vm.direct-call.metadata=C::instanceField] [@vm.inferred-type.metadata=!? (skip check)] new self::C::•().{self::C::instanceField} = null;
}
diff --git a/pkg/vm/tool/precompiler2 b/pkg/vm/tool/precompiler2
index 4998476..326a854 100755
--- a/pkg/vm/tool/precompiler2
+++ b/pkg/vm/tool/precompiler2
@@ -26,14 +26,14 @@
PACKAGES="$arg"
;;
--enable-asserts | \
+ --null-safety | \
+ --no-null-safety | \
--enable-experiment=*)
GEN_KERNEL_OPTIONS+=("$arg")
OPTIONS+=("$arg")
;;
--tfa | \
--no-tfa | \
- --null-safety | \
- --no-null-safety | \
--gen-bytecode | \
--no-gen-bytecode | \
-D* )
diff --git a/runtime/bin/dartdev_utils.cc b/runtime/bin/dartdev_utils.cc
index 2fa4ca7..4708e1e 100644
--- a/runtime/bin/dartdev_utils.cc
+++ b/runtime/bin/dartdev_utils.cc
@@ -14,10 +14,13 @@
namespace dart {
namespace bin {
+// TODO(bkonyi): re-enable after 2.8 release.
+const bool kDartDevEnabled = false;
+
bool DartDevUtils::ShouldParseCommand(const char* script_uri) {
// If script_uri is not a file path or of a known URI scheme, we can assume
// that this is a DartDev command.
- return (!File::ExistsUri(nullptr, script_uri) &&
+ return (kDartDevEnabled && !File::ExistsUri(nullptr, script_uri) &&
(strncmp(script_uri, "http://", 7) != 0) &&
(strncmp(script_uri, "https://", 8) != 0) &&
(strncmp(script_uri, "file://", 7) != 0) &&
diff --git a/runtime/bin/eventhandler_win.cc b/runtime/bin/eventhandler_win.cc
index 4187405..0de689a 100644
--- a/runtime/bin/eventhandler_win.cc
+++ b/runtime/bin/eventhandler_win.cc
@@ -208,7 +208,7 @@
// Currently only one outstanding read at the time.
ASSERT(pending_read_ == buffer);
ASSERT(data_ready_ == NULL);
- if (!IsClosing() && !buffer->IsEmpty()) {
+ if (!IsClosing()) {
data_ready_ = pending_read_;
} else {
OverlappedBuffer::DisposeBuffer(buffer);
@@ -611,10 +611,13 @@
if (data_ready_ == NULL) {
return 0;
}
- ASSERT(!data_ready_->IsEmpty());
return data_ready_->GetRemainingLength();
}
+bool Handle::DataReady() {
+ return data_ready_ != NULL;
+}
+
intptr_t Handle::Read(void* buffer, intptr_t num_bytes) {
MonitorLocker ml(&monitor_);
if (data_ready_ == NULL) {
diff --git a/runtime/bin/eventhandler_win.h b/runtime/bin/eventhandler_win.h
index bbd2179..67c8c5b 100644
--- a/runtime/bin/eventhandler_win.h
+++ b/runtime/bin/eventhandler_win.h
@@ -172,6 +172,7 @@
// Socket interface exposing normal socket operations.
intptr_t Available();
+ bool DataReady();
intptr_t Read(void* buffer, intptr_t num_bytes);
intptr_t RecvFrom(void* buffer,
intptr_t num_bytes,
diff --git a/runtime/bin/io_natives.cc b/runtime/bin/io_natives.cc
index 155d415..6ee986d 100644
--- a/runtime/bin/io_natives.cc
+++ b/runtime/bin/io_natives.cc
@@ -134,6 +134,7 @@
V(ServerSocket_CreateUnixDomainBindListen, 5) \
V(SocketBase_IsBindError, 2) \
V(Socket_Available, 1) \
+ V(Socket_AvailableDatagram, 1) \
V(Socket_CreateBindConnect, 5) \
V(Socket_CreateUnixDomainBindConnect, 4) \
V(Socket_CreateBindDatagram, 6) \
diff --git a/runtime/bin/socket.cc b/runtime/bin/socket.cc
index 036d9f3..46bcef0 100644
--- a/runtime/bin/socket.cc
+++ b/runtime/bin/socket.cc
@@ -557,7 +557,7 @@
}
// Datagram data read. Copy into buffer of the exact size,
- ASSERT(bytes_read > 0);
+ ASSERT(bytes_read >= 0);
uint8_t* data_buffer = NULL;
Dart_Handle data = IOBuffer::Allocate(bytes_read, &data_buffer);
if (Dart_IsNull(data)) {
@@ -569,6 +569,11 @@
ASSERT(data_buffer != NULL);
memmove(data_buffer, recv_buffer, bytes_read);
+ // Memory Sanitizer complains addr not being initialized, which is done
+ // through RecvFrom().
+ // Issue: https://github.com/google/sanitizers/issues/1201
+ MSAN_UNPOISON(&addr, sizeof(RawAddr));
+
// Get the port and clear it in the sockaddr structure.
int port = SocketAddress::GetAddrPort(addr);
// TODO(21403): Add checks for AF_UNIX, if unix domain sockets
@@ -1200,6 +1205,18 @@
}
}
+void FUNCTION_NAME(Socket_AvailableDatagram)(Dart_NativeArguments args) {
+ const int kReceiveBufferLen = 1;
+ Socket* socket =
+ Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
+ ASSERT(socket != NULL);
+ // Ensure that a receive buffer for peeking the UDP socket exists.
+ uint8_t recv_buffer[kReceiveBufferLen];
+ bool available = SocketBase::AvailableDatagram(socket->fd(), recv_buffer,
+ kReceiveBufferLen);
+ Dart_SetBooleanReturnValue(args, available);
+}
+
static void NormalSocketFinalizer(void* isolate_data,
Dart_WeakPersistentHandle handle,
void* data) {
diff --git a/runtime/bin/socket_base.h b/runtime/bin/socket_base.h
index 8af4c59..bf9405e 100644
--- a/runtime/bin/socket_base.h
+++ b/runtime/bin/socket_base.h
@@ -185,6 +185,7 @@
intptr_t num_bytes,
RawAddr* addr,
SocketOpKind sync);
+ static bool AvailableDatagram(intptr_t fd, void* buffer, intptr_t num_bytes);
// Returns true if the given error-number is because the system was not able
// to bind the socket to a specific IP.
static bool IsBindError(intptr_t error_number);
diff --git a/runtime/bin/socket_base_android.cc b/runtime/bin/socket_base_android.cc
index 6cea30d..9085f14 100644
--- a/runtime/bin/socket_base_android.cc
+++ b/runtime/bin/socket_base_android.cc
@@ -98,6 +98,15 @@
return read_bytes;
}
+bool SocketBase::AvailableDatagram(intptr_t fd,
+ void* buffer,
+ intptr_t num_bytes) {
+ ASSERT(fd >= 0);
+ ssize_t read_bytes =
+ TEMP_FAILURE_RETRY(recvfrom(fd, buffer, num_bytes, MSG_PEEK, NULL, NULL));
+ return read_bytes >= 0;
+}
+
intptr_t SocketBase::Write(intptr_t fd,
const void* buffer,
intptr_t num_bytes,
diff --git a/runtime/bin/socket_base_fuchsia.cc b/runtime/bin/socket_base_fuchsia.cc
index d956dd0..b76b6c6 100644
--- a/runtime/bin/socket_base_fuchsia.cc
+++ b/runtime/bin/socket_base_fuchsia.cc
@@ -137,6 +137,12 @@
return -1;
}
+bool SocketBase::AvailableDatagram(intptr_t fd,
+ void* buffer,
+ intptr_t num_bytes) {
+ return false;
+}
+
intptr_t SocketBase::Write(intptr_t fd,
const void* buffer,
intptr_t num_bytes,
diff --git a/runtime/bin/socket_base_linux.cc b/runtime/bin/socket_base_linux.cc
index fb1e555..8734aa6 100644
--- a/runtime/bin/socket_base_linux.cc
+++ b/runtime/bin/socket_base_linux.cc
@@ -98,6 +98,15 @@
return read_bytes;
}
+bool SocketBase::AvailableDatagram(intptr_t fd,
+ void* buffer,
+ intptr_t num_bytes) {
+ ASSERT(fd >= 0);
+ ssize_t read_bytes =
+ TEMP_FAILURE_RETRY(recvfrom(fd, buffer, num_bytes, MSG_PEEK, NULL, NULL));
+ return read_bytes >= 0;
+}
+
intptr_t SocketBase::Write(intptr_t fd,
const void* buffer,
intptr_t num_bytes,
diff --git a/runtime/bin/socket_base_macos.cc b/runtime/bin/socket_base_macos.cc
index e8bea83..74bf924 100644
--- a/runtime/bin/socket_base_macos.cc
+++ b/runtime/bin/socket_base_macos.cc
@@ -97,6 +97,15 @@
return read_bytes;
}
+bool SocketBase::AvailableDatagram(intptr_t fd,
+ void* buffer,
+ intptr_t num_bytes) {
+ ASSERT(fd >= 0);
+ ssize_t read_bytes =
+ TEMP_FAILURE_RETRY(recvfrom(fd, buffer, num_bytes, MSG_PEEK, NULL, NULL));
+ return read_bytes >= 0;
+}
+
intptr_t SocketBase::Write(intptr_t fd,
const void* buffer,
intptr_t num_bytes,
diff --git a/runtime/bin/socket_base_win.cc b/runtime/bin/socket_base_win.cc
index 4ce3fc0..f3a2756 100644
--- a/runtime/bin/socket_base_win.cc
+++ b/runtime/bin/socket_base_win.cc
@@ -91,6 +91,13 @@
return handle->RecvFrom(buffer, num_bytes, &addr->addr, addr_len);
}
+bool SocketBase::AvailableDatagram(intptr_t fd,
+ void* buffer,
+ intptr_t num_bytes) {
+ ClientSocket* client_socket = reinterpret_cast<ClientSocket*>(fd);
+ return client_socket->DataReady();
+}
+
intptr_t SocketBase::Write(intptr_t fd,
const void* buffer,
intptr_t num_bytes,
diff --git a/runtime/lib/object.cc b/runtime/lib/object.cc
index acdaddc..a41c8fa 100644
--- a/runtime/lib/object.cc
+++ b/runtime/lib/object.cc
@@ -209,6 +209,10 @@
return arguments->NativeArgAt(0);
}
+DEFINE_NATIVE_ENTRY(Internal_reachabilityFence, 0, 1) {
+ return Object::null();
+}
+
static bool ExtractInterfaceTypeArgs(Zone* zone,
const Class& instance_cls,
const TypeArguments& instance_type_args,
diff --git a/runtime/observatory/.packages b/runtime/observatory/.packages
index 8521bd7..29f9ce2 100644
--- a/runtime/observatory/.packages
+++ b/runtime/observatory/.packages
@@ -21,7 +21,6 @@
http_parser:../../third_party/pkg/http_parser/lib
matcher:../../third_party/pkg/matcher/lib
package_config:../../third_party/pkg_tested/package_config/lib
-package_resolver:../../third_party/pkg_tested/package_resolver/lib
pedantic:../../third_party/pkg/pedantic/lib
pool:../../third_party/pkg/pool/lib
pub_semver:../../third_party/pkg/pub_semver/lib
diff --git a/runtime/observatory/tests/service/service_kernel.status b/runtime/observatory/tests/service/service_kernel.status
index 2c2be97..0d3d961 100644
--- a/runtime/observatory/tests/service/service_kernel.status
+++ b/runtime/observatory/tests/service/service_kernel.status
@@ -199,6 +199,10 @@
[ $compiler == dartkb && ($builder_tag == bytecode_interpreter || $builder_tag == bytecode_mixed) ]
*: Skip # There are still timeouts in the interpreter and mixed modes which cause infra timeouts.
+[ $mode == debug && $system == windows ]
+debugger_location_second_test: Skip, Timeout
+debugger_location_test: Skip, Timeout
+
[ $mode == debug && ($compiler == dartk || $compiler == dartkb) ]
isolate_lifecycle_test: Skip # Flaky.
pause_idle_isolate_test: Skip # Flaky
diff --git a/runtime/vm/bootstrap_natives.h b/runtime/vm/bootstrap_natives.h
index 3bbc59d..8f3b762 100644
--- a/runtime/vm/bootstrap_natives.h
+++ b/runtime/vm/bootstrap_natives.h
@@ -330,6 +330,7 @@
V(GrowableList_setLength, 2) \
V(GrowableList_setData, 2) \
V(Internal_unsafeCast, 1) \
+ V(Internal_reachabilityFence, 1) \
V(Internal_makeListFixedLength, 1) \
V(Internal_makeFixedListUnmodifiable, 1) \
V(Internal_inquireIs64Bit, 0) \
diff --git a/runtime/vm/class_id.h b/runtime/vm/class_id.h
index 6089b5e..a5d003c 100644
--- a/runtime/vm/class_id.h
+++ b/runtime/vm/class_id.h
@@ -83,7 +83,8 @@
V(LinkedHashMap) \
V(FutureOr) \
V(UserTag) \
- V(TransferableTypedData)
+ V(TransferableTypedData) \
+ V(WeakSerializationReference)
#define CLASS_LIST_ARRAYS(V) \
V(Array) \
diff --git a/runtime/vm/clustered_snapshot.cc b/runtime/vm/clustered_snapshot.cc
index cf1f9e4..063d5dd 100644
--- a/runtime/vm/clustered_snapshot.cc
+++ b/runtime/vm/clustered_snapshot.cc
@@ -16,6 +16,7 @@
#include "vm/dart.h"
#include "vm/dispatch_table.h"
#include "vm/flag_list.h"
+#include "vm/growable_array.h"
#include "vm/heap/heap.h"
#include "vm/image_snapshot.h"
#include "vm/native_entry.h"
@@ -1948,6 +1949,152 @@
}
};
+#if defined(DART_PRECOMPILER)
+class WeakSerializationReferenceSerializationCluster
+ : public SerializationCluster {
+ public:
+ WeakSerializationReferenceSerializationCluster(Zone* zone, Heap* heap)
+ : SerializationCluster("WeakSerializationReference"),
+ heap_(ASSERT_NOTNULL(heap)),
+ objects_(zone, 0),
+ canonical_wsrs_(zone, 0),
+ canonical_wsr_map_(zone) {}
+ ~WeakSerializationReferenceSerializationCluster() {}
+
+ void Trace(Serializer* s, RawObject* object) {
+ ASSERT(s->kind() == Snapshot::kFullAOT);
+ // Make sure we don't trace again after choosing canonical WSRs.
+ ASSERT(!have_canonicalized_wsrs_);
+
+ auto const ref = WeakSerializationReference::RawCast(object);
+ objects_.Add(ref);
+ // We do _not_ push the target, since this is not a strong reference.
+ }
+
+ void WriteAlloc(Serializer* s) {
+ ASSERT(s->kind() == Snapshot::kFullAOT);
+ ASSERT(have_canonicalized_wsrs_);
+
+ s->WriteCid(kWeakSerializationReferenceCid);
+ s->WriteUnsigned(WrittenCount());
+
+ // Set up references for those objects that will be written.
+ for (auto const ref : canonical_wsrs_) {
+ s->AssignRef(ref);
+ }
+
+ // In precompiled mode, set the object ID of each non-canonical WSR to
+ // its canonical counterpart's object ID. This ensures that any reference to
+ // it is serialized as a reference to the canonicalized one.
+ for (auto const ref : objects_) {
+ ASSERT(Serializer::IsReachableReference(heap_->GetObjectId(ref)));
+ if (ShouldDrop(ref)) {
+ // For dropped references, reset their ID to be the unreachable
+ // reference value, so WriteRefId retrieves the target ID instead.
+ heap_->SetObjectId(ref, Serializer::kUnreachableReference);
+ continue;
+ }
+ // Skip if we've already allocated a reference (this is a canonical WSR).
+ if (Serializer::IsAllocatedReference(heap_->GetObjectId(ref))) continue;
+ auto const target_cid = WeakSerializationReference::TargetClassIdOf(ref);
+ ASSERT(canonical_wsr_map_.HasKey(target_cid));
+ auto const canonical_index = canonical_wsr_map_.Lookup(target_cid) - 1;
+ auto const canonical_wsr = objects_[canonical_index];
+ // Set the object ID of this non-canonical WSR to the same as its
+ // canonical WSR entry, so we'll reference the canonical WSR when
+ // serializing references to this object.
+ auto const canonical_heap_id = heap_->GetObjectId(canonical_wsr);
+ ASSERT(Serializer::IsAllocatedReference(canonical_heap_id));
+ heap_->SetObjectId(ref, canonical_heap_id);
+ }
+ }
+
+ void WriteFill(Serializer* s) {
+ ASSERT(s->kind() == Snapshot::kFullAOT);
+ for (auto const ref : canonical_wsrs_) {
+ AutoTraceObject(ref);
+
+ // In precompiled mode, we drop the reference to the target and only
+ // keep the class ID.
+ s->WriteCid(WeakSerializationReference::TargetClassIdOf(ref));
+ }
+ }
+
+ // Picks a WSR for each target class ID to be canonical. Should only be run
+ // after all objects have been traced.
+ void CanonicalizeReferences() {
+ ASSERT(!have_canonicalized_wsrs_);
+ for (intptr_t i = 0; i < objects_.length(); i++) {
+ auto const ref = objects_[i];
+ if (ShouldDrop(ref)) continue;
+ auto const target_cid = WeakSerializationReference::TargetClassIdOf(ref);
+ if (canonical_wsr_map_.HasKey(target_cid)) continue;
+ canonical_wsr_map_.Insert(target_cid, i + 1);
+ canonical_wsrs_.Add(ref);
+ }
+ have_canonicalized_wsrs_ = true;
+ }
+
+ intptr_t WrittenCount() const {
+ ASSERT(have_canonicalized_wsrs_);
+ return canonical_wsrs_.length();
+ }
+
+ intptr_t DroppedCount() const { return TotalCount() - WrittenCount(); }
+
+ intptr_t TotalCount() const { return objects_.length(); }
+
+ private:
+ // Returns whether a WSR should be dropped due to its target being reachable
+ // via strong references. WSRs only wrap heap objects, so we can just retrieve
+ // the object ID from the heap directly.
+ bool ShouldDrop(RawWeakSerializationReference* ref) const {
+ auto const target = WeakSerializationReference::TargetOf(ref);
+ return Serializer::IsAllocatedReference(heap_->GetObjectId(target));
+ }
+
+ Heap* const heap_;
+ GrowableArray<RawWeakSerializationReference*> objects_;
+ GrowableArray<RawWeakSerializationReference*> canonical_wsrs_;
+ IntMap<intptr_t> canonical_wsr_map_;
+ bool have_canonicalized_wsrs_ = false;
+};
+#endif
+
+#if defined(DART_PRECOMPILED_RUNTIME)
+class WeakSerializationReferenceDeserializationCluster
+ : public DeserializationCluster {
+ public:
+ WeakSerializationReferenceDeserializationCluster() {}
+ ~WeakSerializationReferenceDeserializationCluster() {}
+
+ void ReadAlloc(Deserializer* d) {
+ start_index_ = d->next_index();
+ PageSpace* old_space = d->heap()->old_space();
+ const intptr_t count = d->ReadUnsigned();
+
+ for (intptr_t i = 0; i < count; i++) {
+ auto ref = AllocateUninitialized(
+ old_space, WeakSerializationReference::InstanceSize());
+ d->AssignRef(ref);
+ }
+
+ stop_index_ = d->next_index();
+ }
+
+ void ReadFill(Deserializer* d) {
+ for (intptr_t id = start_index_; id < stop_index_; id++) {
+ auto const ref =
+ reinterpret_cast<RawWeakSerializationReference*>(d->Ref(id));
+ Deserializer::InitializeHeader(
+ ref, kWeakSerializationReferenceCid,
+ WeakSerializationReference::InstanceSize());
+ ref->ptr()->cid_ = d->ReadCid();
+ }
+ }
+};
+#endif
+
#if !defined(DART_PRECOMPILED_RUNTIME)
class PcDescriptorsSerializationCluster : public SerializationCluster {
public:
@@ -4557,7 +4704,7 @@
id = smi_ids_.Lookup(Smi::RawCast(obj))->id_;
cid = Smi::kClassId;
}
- ASSERT(id != 0);
+ ASSERT(IsAllocatedReference(id));
const char* name_str = nullptr;
if (name != nullptr) {
@@ -4576,7 +4723,7 @@
void Serializer::TraceEndWritingObject() {
if (profile_writer_ != nullptr) {
- ASSERT(object_currently_writing_.id_ != 0);
+ ASSERT(IsAllocatedReference(object_currently_writing_.id_));
profile_writer_->AttributeBytesTo(
{V8SnapshotProfileWriter::kSnapshot, object_currently_writing_.id_},
stream_.Position() - object_currently_writing_.stream_start_);
@@ -4714,6 +4861,12 @@
return new (Z) OneByteStringSerializationCluster();
case kTwoByteStringCid:
return new (Z) TwoByteStringSerializationCluster();
+ case kWeakSerializationReferenceCid:
+#if defined(DART_PRECOMPILER)
+ ASSERT(kind_ == Snapshot::kFullAOT);
+ return new (Z)
+ WeakSerializationReferenceSerializationCluster(zone_, heap_);
+#endif
default:
break;
}
@@ -4742,7 +4895,7 @@
// course, the space taken for the reference is profiled.
if (profile_writer_ != nullptr && offset >= 0) {
// Instructions cannot be roots.
- ASSERT(object_currently_writing_.id_ != 0);
+ ASSERT(IsAllocatedReference(object_currently_writing_.id_));
auto offset_space = vm_ ? V8SnapshotProfileWriter::kVmText
: V8SnapshotProfileWriter::kIsolateText;
V8SnapshotProfileWriter::ObjectId to_object = {
@@ -4793,7 +4946,7 @@
void Serializer::TraceDataOffset(uint32_t offset) {
if (profile_writer_ != nullptr) {
// ROData cannot be roots.
- ASSERT(object_currently_writing_.id_ != 0);
+ ASSERT(IsAllocatedReference(object_currently_writing_.id_));
auto offset_space = vm_ ? V8SnapshotProfileWriter::kVmData
: V8SnapshotProfileWriter::kIsolateData;
V8SnapshotProfileWriter::ObjectId from_object = {
@@ -4824,7 +4977,7 @@
if (smi_ids_.Lookup(smi) == NULL) {
SmiObjectIdPair pair;
pair.smi_ = smi;
- pair.id_ = 1;
+ pair.id_ = kUnallocatedReference;
smi_ids_.Insert(pair);
stack_.Add(object);
num_written_objects_++;
@@ -4842,7 +4995,7 @@
#endif // !DART_PRECOMPILED_RUNTIME
intptr_t id = heap_->GetObjectId(object);
- if (id == 0) {
+ if (id == kUnreachableReference) {
// When discovering the transitive closure of objects reachable from the
// roots we do not trace references, e.g. inside [RawCode], to
// [RawInstructions], since [RawInstructions] doesn't contain any references
@@ -4852,8 +5005,8 @@
"Instructions should only be reachable from Code");
}
- heap_->SetObjectId(object, 1);
- ASSERT(heap_->GetObjectId(object) != 0);
+ heap_->SetObjectId(object, kUnallocatedReference);
+ ASSERT(IsReachableReference(heap_->GetObjectId(object)));
stack_.Add(object);
num_written_objects_++;
#if defined(SNAPSHOT_BACKTRACE)
@@ -5001,6 +5154,20 @@
}
}
+#if defined(DART_PRECOMPILER)
+ // Before we finalize the count of written objects, pick canonical versions
+ // of WSR objects that will be serialized and then remove any non-serialized
+ // or non-canonical WSR objects from that count.
+ if (auto const cluster =
+ reinterpret_cast<WeakSerializationReferenceSerializationCluster*>(
+ clusters_by_cid_[kWeakSerializationReferenceCid])) {
+ cluster->CanonicalizeReferences();
+ auto const dropped_count = cluster->DroppedCount();
+ ASSERT(dropped_count == 0 || kind() == Snapshot::kFullAOT);
+ num_written_objects_ -= dropped_count;
+ }
+#endif
+
intptr_t num_objects = num_base_objects_ + num_written_objects_;
#if defined(ARCH_IS_64_BIT)
if (!Utils::IsInt(32, num_objects)) {
@@ -5084,7 +5251,7 @@
const intptr_t first_code_id =
WriteRefId(code_cluster->discovered_objects()->At(0));
// The first object in the code cluster must have its reference ID allocated.
- ASSERT(first_code_id != 0 && first_code_id != WriteRefId(Code::null()));
+ ASSERT(IsAllocatedReference(first_code_id));
// If instructions can be deduped, the code order table in the deserializer
// may not contain all Code objects in the snapshot. Thus, we write the ID
@@ -5144,7 +5311,7 @@
// the code object and emit that.
auto const object_id = WriteRefId(code);
// Make sure that this code object has an allocated reference ID.
- ASSERT(object_id != 0 && object_id != WriteRefId(Code::null()));
+ ASSERT(IsAllocatedReference(object_id));
// Use the index in the code cluster, not in the snapshot..
auto const encoded = kDispatchTableIndexBase + (object_id - first_code_id);
ASSERT(encoded <= compiler::target::kWordMax);
@@ -5569,6 +5736,10 @@
return new (Z) OneByteStringDeserializationCluster();
case kTwoByteStringCid:
return new (Z) TwoByteStringDeserializationCluster();
+ case kWeakSerializationReferenceCid:
+#if defined(DART_PRECOMPILED_RUNTIME)
+ return new (Z) WeakSerializationReferenceDeserializationCluster();
+#endif
default:
break;
}
diff --git a/runtime/vm/clustered_snapshot.h b/runtime/vm/clustered_snapshot.h
index 510a4da..791c1cf 100644
--- a/runtime/vm/clustered_snapshot.h
+++ b/runtime/vm/clustered_snapshot.h
@@ -139,6 +139,23 @@
V8SnapshotProfileWriter* profile_writer = nullptr);
~Serializer();
+ // Reference value for objects that either are not reachable from the roots or
+ // should never have a reference in the snapshot (because they are dropped,
+ // for example). Should be the default value for Heap::GetObjectId.
+ static const intptr_t kUnreachableReference = 0;
+
+ static constexpr bool IsReachableReference(intptr_t ref) {
+ return ref != kUnreachableReference;
+ }
+
+ // Reference value for traced objects that have not been allocated their final
+ // reference ID.
+ static const intptr_t kUnallocatedReference = -1;
+
+ static constexpr bool IsAllocatedReference(intptr_t ref) {
+ return IsReachableReference(ref) && ref != kUnallocatedReference;
+ }
+
intptr_t WriteVMSnapshot(const Array& symbols);
void WriteIsolateSnapshot(intptr_t num_base_objects,
ObjectStore* object_store);
@@ -165,7 +182,7 @@
}
intptr_t AssignRef(RawObject* object) {
- ASSERT(next_ref_index_ != 0);
+ ASSERT(IsAllocatedReference(next_ref_index_));
if (object->IsHeapObject()) {
// The object id weak table holds image offsets for Instructions instead
// of ref indices.
@@ -176,7 +193,7 @@
RawSmi* smi = Smi::RawCast(object);
SmiObjectIdPair* existing_pair = smi_ids_.Lookup(smi);
if (existing_pair != NULL) {
- ASSERT(existing_pair->id_ == 1);
+ ASSERT(existing_pair->id_ == kUnallocatedReference);
existing_pair->id_ = next_ref_index_;
} else {
SmiObjectIdPair new_pair;
@@ -363,32 +380,41 @@
private:
static const char* ReadOnlyObjectType(intptr_t cid);
+ // Returns the reference ID for the object. Fails for objects that have not
+ // been allocated a reference ID yet, so should be used only after all
+ // WriteAlloc calls.
intptr_t WriteRefId(RawObject* object) {
- intptr_t id = 0;
if (!object->IsHeapObject()) {
RawSmi* smi = Smi::RawCast(object);
- id = smi_ids_.Lookup(smi)->id_;
- if (id == 0) {
- FATAL("Missing ref");
- }
- } else {
- // The object id weak table holds image offsets for Instructions instead
- // of ref indices.
- ASSERT(!object->IsInstructions());
- id = heap_->GetObjectId(object);
- if (id == 0) {
- if (object->IsCode() && !Snapshot::IncludesCode(kind_)) {
- return WriteRefId(Object::null());
- }
-#if !defined(DART_PRECOMPILED_RUNTIME)
- if (object->IsBytecode() && !Snapshot::IncludesBytecode(kind_)) {
- return WriteRefId(Object::null());
- }
-#endif // !DART_PRECOMPILED_RUNTIME
- FATAL("Missing ref");
- }
+ auto const id = smi_ids_.Lookup(smi)->id_;
+ if (IsAllocatedReference(id)) return id;
+ FATAL("Missing ref");
}
- return id;
+ // The object id weak table holds image offsets for Instructions instead
+ // of ref indices.
+ ASSERT(!object->IsInstructions());
+ auto const id = heap_->GetObjectId(object);
+ if (IsAllocatedReference(id)) return id;
+ if (object->IsWeakSerializationReference()) {
+ // If a reachable WSR has an object ID of 0, then its target was marked
+ // for serialization due to reachable strong references and the WSR will
+ // be dropped instead. Thus, we change the reference to the WSR to a
+ // direct reference to the serialized target.
+ auto const ref = WeakSerializationReference::RawCast(object);
+ auto const target = WeakSerializationReference::TargetOf(ref);
+ auto const target_id = heap_->GetObjectId(target);
+ ASSERT(IsAllocatedReference(target_id));
+ return target_id;
+ }
+ if (object->IsCode() && !Snapshot::IncludesCode(kind_)) {
+ return WriteRefId(Object::null());
+ }
+#if !defined(DART_PRECOMPILED_RUNTIME)
+ if (object->IsBytecode() && !Snapshot::IncludesBytecode(kind_)) {
+ return WriteRefId(Object::null());
+ }
+#endif // !DART_PRECOMPILED_RUNTIME
+ FATAL("Missing ref");
}
Heap* heap_;
diff --git a/runtime/vm/compiler/aot/precompiler.cc b/runtime/vm/compiler/aot/precompiler.cc
index 6b899bb..2bf294a 100644
--- a/runtime/vm/compiler/aot/precompiler.cc
+++ b/runtime/vm/compiler/aot/precompiler.cc
@@ -167,7 +167,8 @@
GrowableObjectArray::Handle(GrowableObjectArray::New())),
pending_static_fields_to_retain_(),
sent_selectors_(),
- enqueued_functions_(
+ seen_functions_(HashTables::New<FunctionSet>(/*initial_capacity=*/1024)),
+ possibly_retained_functions_(
HashTables::New<FunctionSet>(/*initial_capacity=*/1024)),
fields_to_retain_(),
functions_to_retain_(
@@ -186,7 +187,8 @@
Precompiler::~Precompiler() {
// We have to call Release() in DEBUG mode.
- enqueued_functions_.Release();
+ seen_functions_.Release();
+ possibly_retained_functions_.Release();
functions_to_retain_.Release();
ASSERT(Precompiler::singleton_ == this);
@@ -417,6 +419,26 @@
// to add new entries after this point.
delete dispatch_table_generator_;
dispatch_table_generator_ = nullptr;
+ if (!FLAG_retain_dispatched_functions && FLAG_trace_precompiler) {
+ FunctionSet printed(
+ HashTables::New<FunctionSet>(/*initial_capacity=*/1024));
+ auto& code = Code::Handle(Z);
+ auto& function = Function::Handle(Z);
+ for (intptr_t i = 0; i < entries.Length(); i++) {
+ code = Code::RawCast(entries.At(i));
+ if (code.IsNull()) continue;
+ if (!code.IsFunctionCode()) continue;
+ function = code.function();
+ ASSERT(!function.IsNull());
+ if (printed.ContainsKey(function)) continue;
+ if (functions_to_retain_.ContainsKey(function)) continue;
+ THR_Print(
+ "Dispatch table references code for function to drop: %s\n",
+ function.ToLibNamePrefixedQualifiedCString());
+ printed.Insert(function);
+ }
+ printed.Release();
+ }
}
DropFunctions();
@@ -452,10 +474,16 @@
DropClasses();
DropLibraries();
- BindStaticCalls();
- DedupUnlinkedCalls();
Obfuscate();
+#if defined(DEBUG)
+ const auto& non_visited =
+ Function::Handle(Z, FindUnvisitedRetainedFunction());
+ if (!non_visited.IsNull()) {
+ FATAL1("Code visitor would miss the code for function \"%s\"\n",
+ non_visited.ToFullyQualifiedCString());
+ }
+#endif
ProgramVisitor::Dedup();
zone_ = NULL;
@@ -1057,10 +1085,44 @@
return parsed_function->function().raw();
}
-void Precompiler::AddFunction(const Function& function) {
- if (enqueued_functions_.ContainsKey(function)) return;
+bool Precompiler::MustRetainFunction(const Function& function) {
+ // There are some cases where we must retain, even if there are no directly
+ // observable need for function objects at runtime. Here, we check for cases
+ // where the function is not marked with the vm:entry-point pragma, which also
+ // forces retention:
+ //
+ // * Native functions (for LinkNativeCall)
+ // * Selector matches a symbol used in Resolver::ResolveDynamic calls
+ // in dart_entry.cc or dart_api_impl.cc.
+ // * _Closure.call (used in async stack handling)
+ if (function.is_native()) return true;
- enqueued_functions_.Insert(function);
+ // Resolver::ResolveDynamic uses.
+ const auto& selector = String::Handle(Z, function.name());
+ if (selector.raw() == Symbols::toString().raw()) return true;
+ if (selector.raw() == Symbols::AssignIndexToken().raw()) return true;
+ if (selector.raw() == Symbols::IndexToken().raw()) return true;
+ if (selector.raw() == Symbols::hashCode().raw()) return true;
+ if (selector.raw() == Symbols::NoSuchMethod().raw()) return true;
+ if (selector.raw() == Symbols::EqualOperator().raw()) return true;
+
+ // Use the same check for _Closure.call as in stack_trace.{h|cc}.
+ if (selector.raw() == Symbols::Call().raw()) {
+ const auto& name = String::Handle(Z, function.QualifiedScrubbedName());
+ if (name.Equals(Symbols::_ClosureCall())) return true;
+ }
+
+ return false;
+}
+
+void Precompiler::AddFunction(const Function& function, bool retain) {
+ if (possibly_retained_functions_.ContainsKey(function)) return;
+ if (retain || MustRetainFunction(function)) {
+ possibly_retained_functions_.Insert(function);
+ }
+
+ if (seen_functions_.ContainsKey(function)) return;
+ seen_functions_.Insert(function);
pending_functions_.Add(function);
changed_ = true;
}
@@ -1286,9 +1348,12 @@
// if (function.HasCode()) continue;
selector = function.name();
- if (IsSent(selector) || IsHitByTableSelector(function)) {
+ if (IsSent(selector)) {
AddFunction(function);
}
+ if (IsHitByTableSelector(function)) {
+ AddFunction(function, FLAG_retain_dispatched_functions);
+ }
bool found_metadata = false;
kernel::ProcedureAttributesMetadata metadata;
@@ -1472,7 +1537,7 @@
functions = cls.functions();
for (intptr_t j = 0; j < functions.Length(); j++) {
function ^= functions.At(j);
- bool retain = enqueued_functions_.ContainsKey(function);
+ bool retain = possibly_retained_functions_.ContainsKey(function);
if (!retain && function.HasImplicitClosureFunction()) {
// It can happen that all uses of an implicit closure inline their
// target function, leaving the target function uncompiled. Keep
@@ -1492,7 +1557,7 @@
closures = isolate()->object_store()->closure_functions();
for (intptr_t j = 0; j < closures.Length(); j++) {
function ^= closures.At(j);
- bool retain = enqueued_functions_.ContainsKey(function);
+ bool retain = possibly_retained_functions_.ContainsKey(function);
if (retain) {
AddTypesOf(function);
@@ -1516,6 +1581,8 @@
Class& cls = Class::Handle(Z);
Array& functions = Array::Handle(Z);
Function& function = Function::Handle(Z);
+ Code& code = Code::Handle(Z);
+ Object& owner = Object::Handle(Z);
GrowableObjectArray& retained_functions = GrowableObjectArray::Handle(Z);
GrowableObjectArray& closures = GrowableObjectArray::Handle(Z);
@@ -1534,6 +1601,15 @@
if (retain) {
retained_functions.Add(function);
} else {
+ if (function.HasCode()) {
+ code = function.CurrentCode();
+ function.ClearCode();
+ // Wrap the owner of the code object in case the code object will be
+ // serialized but the function object will not.
+ owner = code.owner();
+ owner = WeakSerializationReference::Wrap(Z, owner);
+ code.set_owner(owner);
+ }
dropped_function_count_++;
if (FLAG_trace_precompiler) {
THR_Print("Dropping function %s\n",
@@ -1560,6 +1636,15 @@
if (retain) {
retained_functions.Add(function);
} else {
+ if (function.HasCode()) {
+ code = function.CurrentCode();
+ function.ClearCode();
+ // Wrap the owner of the code object in case the code object will be
+ // serialized but the function object will not.
+ owner = code.owner();
+ owner = WeakSerializationReference::Wrap(Z, owner);
+ code.set_owner(owner);
+ }
dropped_function_count_++;
if (FLAG_trace_precompiler) {
THR_Print("Dropping function %s\n",
@@ -2075,179 +2160,50 @@
libraries_ = retained_libraries.raw();
}
-void Precompiler::BindStaticCalls() {
- class BindAOTStaticCallsVisitor : public FunctionVisitor {
+// Traits for the HashTable template.
+struct CodeKeyTraits {
+ static uint32_t Hash(const Object& key) { return Code::Cast(key).Size(); }
+ static const char* Name() { return "CodeKeyTraits"; }
+ static bool IsMatch(const Object& x, const Object& y) {
+ return x.raw() == y.raw();
+ }
+ static bool ReportStats() { return false; }
+};
+
+typedef UnorderedHashSet<CodeKeyTraits> CodeSet;
+
+#if defined(DEBUG)
+RawFunction* Precompiler::FindUnvisitedRetainedFunction() {
+ class CodeChecker : public CodeVisitor {
public:
- explicit BindAOTStaticCallsVisitor(Zone* zone)
- : code_(Code::Handle(zone)),
- table_(Array::Handle(zone)),
- kind_and_offset_(Smi::Handle(zone)),
- target_(Object::Handle(zone)),
- target_code_(Code::Handle(zone)) {}
+ CodeChecker()
+ : visited_code_(HashTables::New<CodeSet>(/*initial_capacity=*/1024)) {}
+ ~CodeChecker() { visited_code_.Release(); }
- void Visit(const Function& function) {
- if (!function.HasCode()) {
- return;
- }
+ const CodeSet& visited() const { return visited_code_; }
- code_ = function.CurrentCode();
- table_ = code_.static_calls_target_table();
- StaticCallsTable static_calls(table_);
- bool only_call_via_code = true;
- for (auto& view : static_calls) {
- kind_and_offset_ = view.Get<Code::kSCallTableKindAndOffset>();
- auto kind = Code::KindField::decode(kind_and_offset_.Value());
- auto pc_offset = Code::OffsetField::decode(kind_and_offset_.Value());
- if (kind == Code::kCallViaCode) {
- target_ = view.Get<Code::kSCallTableFunctionTarget>();
- if (target_.IsNull()) {
- target_ = view.Get<Code::kSCallTableCodeTarget>();
- ASSERT(!Code::Cast(target_).IsFunctionCode());
- // Allocation stub or AllocateContext or AllocateArray or ...
- } else {
- // Static calls initially call the CallStaticFunction stub because
- // their target might not be compiled yet. After tree shaking, all
- // static call targets are compiled.
- // Cf. runtime entry PatchStaticCall called from CallStaticFunction
- // stub.
- auto& fun = Function::Cast(target_);
- ASSERT(fun.HasCode());
- target_code_ = fun.CurrentCode();
- uword pc = pc_offset + code_.PayloadStart();
- CodePatcher::PatchStaticCallAt(pc, code_, target_code_);
- }
- } else {
- ASSERT(kind == Code::kPcRelativeCall);
- only_call_via_code = false;
- }
- }
-
- // We won't patch static calls anymore, so drop the static call table to
- // save space.
- if (only_call_via_code) {
- code_.set_static_calls_target_table(Object::empty_array());
- }
- }
+ void Visit(const Code& code) { visited_code_.Insert(code); }
private:
- Code& code_;
- Array& table_;
- Smi& kind_and_offset_;
- Object& target_;
- Code& target_code_;
+ CodeSet visited_code_;
};
- BindAOTStaticCallsVisitor visitor(Z);
+ CodeChecker visitor;
+ ProgramVisitor::VisitCode(&visitor);
+ const CodeSet& visited = visitor.visited();
- // We need both iterations to ensure we visit all the functions that might end
- // up in the snapshot. The ProgramVisitor will miss closures from duplicated
- // finally clauses, and not all functions are compiled through the
- // tree-shaker's queue
- ProgramVisitor::VisitFunctions(&visitor);
- FunctionSet::Iterator it(&enqueued_functions_);
- Function& handle = Function::Handle();
+ FunctionSet::Iterator it(&functions_to_retain_);
+ Function& function = Function::Handle(Z);
+ Code& code = Code::Handle(Z);
while (it.MoveNext()) {
- handle ^= enqueued_functions_.GetKey(it.Current());
- visitor.Visit(handle);
+ function ^= functions_to_retain_.GetKey(it.Current());
+ if (!function.HasCode()) continue;
+ code = function.CurrentCode();
+ if (!visited.ContainsKey(code)) return function.raw();
}
+ return Function::null();
}
-
-DECLARE_FLAG(charp, write_v8_snapshot_profile_to);
-
-void Precompiler::DedupUnlinkedCalls() {
- class UnlinkedCallDeduper {
- public:
- explicit UnlinkedCallDeduper(Zone* zone)
- : zone_(zone),
- entry_(Object::Handle(zone)),
- unlinked_(UnlinkedCall::Handle(zone)),
- canonical_unlinked_calls_() {}
-
- void DedupPool(const ObjectPool& pool) {
- for (intptr_t i = 0; i < pool.Length(); i++) {
- if (pool.TypeAt(i) != ObjectPool::EntryType::kTaggedObject) {
- continue;
- }
- entry_ = pool.ObjectAt(i);
- if (entry_.IsUnlinkedCall()) {
- unlinked_ ^= entry_.raw();
- unlinked_ = DedupUnlinkedCall(unlinked_);
- pool.SetObjectAt(i, unlinked_);
- }
- }
- }
-
- RawUnlinkedCall* DedupUnlinkedCall(const UnlinkedCall& unlinked) {
- const UnlinkedCall* canonical_unlinked =
- canonical_unlinked_calls_.LookupValue(&unlinked);
- if (canonical_unlinked == NULL) {
- canonical_unlinked_calls_.Insert(
- &UnlinkedCall::ZoneHandle(zone_, unlinked.raw()));
- return unlinked.raw();
- } else {
- return canonical_unlinked->raw();
- }
- }
-
- private:
- Zone* zone_;
- Object& entry_;
- UnlinkedCall& unlinked_;
- UnlinkedCallSet canonical_unlinked_calls_;
- };
-
- class DedupUnlinkedCallsVisitor : public FunctionVisitor {
- public:
- DedupUnlinkedCallsVisitor(UnlinkedCallDeduper* deduper, Zone* zone)
- : deduper_(*deduper),
- code_(Code::Handle(zone)),
- pool_(ObjectPool::Handle(zone)) {}
-
- void Visit(const Function& function) {
- if (!function.HasCode()) {
- return;
- }
- code_ = function.CurrentCode();
- pool_ = code_.object_pool();
- deduper_.DedupPool(pool_);
- }
-
- private:
- UnlinkedCallDeduper& deduper_;
- Code& code_;
- ObjectPool& pool_;
- };
-
- UnlinkedCallDeduper deduper(Z);
- auto& gop = ObjectPool::Handle(I->object_store()->global_object_pool());
- ASSERT(gop.IsNull() != FLAG_use_bare_instructions);
- if (FLAG_use_bare_instructions) {
- deduper.DedupPool(gop);
- }
-
- // Note: in bare instructions mode we can still have object pools attached
- // to code objects and these pools need to be deduplicated.
- // We use these pools to carry information about references between code
- // objects and other objects in the snapshots (these references are otherwise
- // implicit and go through global object pool). This information is needed
- // to produce more informative snapshot profile.
- if (!FLAG_use_bare_instructions ||
- FLAG_write_v8_snapshot_profile_to != nullptr) {
- DedupUnlinkedCallsVisitor visitor(&deduper, Z);
-
- // We need both iterations to ensure we visit all the functions that might
- // end up in the snapshot. The ProgramVisitor will miss closures from
- // duplicated finally clauses, and not all functions are compiled through
- // the tree-shaker's queue
- ProgramVisitor::VisitFunctions(&visitor);
- FunctionSet::Iterator it(&enqueued_functions_);
- Function& current = Function::Handle();
- while (it.MoveNext()) {
- current ^= enqueued_functions_.GetKey(it.Current());
- visitor.Visit(current);
- }
- }
-}
+#endif
void Precompiler::Obfuscate() {
if (!I->obfuscate()) {
diff --git a/runtime/vm/compiler/aot/precompiler.h b/runtime/vm/compiler/aot/precompiler.h
index 57041cb..36a600d 100644
--- a/runtime/vm/compiler/aot/precompiler.h
+++ b/runtime/vm/compiler/aot/precompiler.h
@@ -70,26 +70,6 @@
typedef DirectChainedHashMap<SymbolKeyValueTrait> SymbolSet;
-class UnlinkedCallKeyValueTrait {
- public:
- // Typedefs needed for the DirectChainedHashMap template.
- typedef const UnlinkedCall* Key;
- typedef const UnlinkedCall* Value;
- typedef const UnlinkedCall* Pair;
-
- static Key KeyOf(Pair kv) { return kv; }
-
- static Value ValueOf(Pair kv) { return kv; }
-
- static inline intptr_t Hashcode(Key key) { return key->Hashcode(); }
-
- static inline bool IsKeyEqual(Pair pair, Key key) {
- return pair->Equals(*key);
- }
-};
-
-typedef DirectChainedHashMap<UnlinkedCallKeyValueTrait> UnlinkedCallSet;
-
// Traits for the HashTable template.
struct FunctionKeyTraits {
static uint32_t Hash(const Object& key) { return Function::Cast(key).Hash(); }
@@ -263,11 +243,12 @@
void AddConstObject(const class Instance& instance);
void AddClosureCall(const Array& arguments_descriptor);
void AddField(const Field& field);
- void AddFunction(const Function& function);
+ void AddFunction(const Function& function, bool retain = true);
void AddInstantiatedClass(const Class& cls);
void AddSelector(const String& selector);
bool IsSent(const String& selector);
bool IsHitByTableSelector(const Function& function);
+ bool MustRetainFunction(const Function& function);
void ProcessFunction(const Function& function);
void CheckForNewDynamicFunctions();
@@ -286,13 +267,7 @@
void DropClasses();
void DropLibraries();
- // Remove the indirection of the CallStaticFunction stub from all static call
- // sites now that Code is available for all call targets. Allows for dropping
- // the static call table from each Code object.
- void BindStaticCalls();
- // Deduplicate the UnlinkedCall objects in all ObjectPools to reduce snapshot
- // size.
- void DedupUnlinkedCalls();
+ DEBUG_ONLY(RawFunction* FindUnvisitedRetainedFunction());
void Obfuscate();
@@ -332,7 +307,8 @@
const GrowableObjectArray& pending_functions_;
FieldSet pending_static_fields_to_retain_;
SymbolSet sent_selectors_;
- FunctionSet enqueued_functions_;
+ FunctionSet seen_functions_;
+ FunctionSet possibly_retained_functions_;
FieldSet fields_to_retain_;
FunctionSet functions_to_retain_;
ClassSet classes_to_retain_;
diff --git a/runtime/vm/compiler/backend/constant_propagator.cc b/runtime/vm/compiler/backend/constant_propagator.cc
index 87e9008..42382a8 100644
--- a/runtime/vm/compiler/backend/constant_propagator.cc
+++ b/runtime/vm/compiler/backend/constant_propagator.cc
@@ -350,6 +350,10 @@
}
}
+void ConstantPropagator::VisitReachabilityFence(ReachabilityFenceInstr* instr) {
+ // Nothing to do.
+}
+
void ConstantPropagator::VisitCheckArrayBound(CheckArrayBoundInstr* instr) {
// Don't propagate constants through check, since it would eliminate
// the data dependence between the bound check and the load/store.
diff --git a/runtime/vm/compiler/backend/il.cc b/runtime/vm/compiler/backend/il.cc
index ff57ae3..823b48b 100644
--- a/runtime/vm/compiler/backend/il.cc
+++ b/runtime/vm/compiler/backend/il.cc
@@ -4064,6 +4064,21 @@
UNREACHABLE();
}
+LocationSummary* ReachabilityFenceInstr::MakeLocationSummary(
+ Zone* zone,
+ bool optimizing) const {
+ LocationSummary* summary = new (zone)
+ LocationSummary(zone, 1, 0, LocationSummary::ContainsCall::kNoCall);
+ // Keep the parameter alive and reachable, in any location.
+ summary->set_in(0, Location::Any());
+ return summary;
+}
+
+void ReachabilityFenceInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
+ // No native code, but we rely on the parameter being passed in here so that
+ // it stays alive and reachable.
+}
+
LocationSummary* ParameterInstr::MakeLocationSummary(Zone* zone,
bool optimizing) const {
UNREACHABLE();
diff --git a/runtime/vm/compiler/backend/il.h b/runtime/vm/compiler/backend/il.h
index 66105c7..1139d7c 100644
--- a/runtime/vm/compiler/backend/il.h
+++ b/runtime/vm/compiler/backend/il.h
@@ -367,6 +367,7 @@
M(CatchBlockEntry, kNoGC) \
M(Phi, kNoGC) \
M(Redefinition, kNoGC) \
+ M(ReachabilityFence, kNoGC) \
M(Parameter, kNoGC) \
M(NativeParameter, kNoGC) \
M(LoadIndexedUnsafe, kNoGC) \
@@ -3296,6 +3297,26 @@
DISALLOW_COPY_AND_ASSIGN(RedefinitionInstr);
};
+// Keeps the value alive til after this point.
+//
+// The fence cannot be moved.
+class ReachabilityFenceInstr : public TemplateInstruction<1, NoThrow> {
+ public:
+ explicit ReachabilityFenceInstr(Value* value) { SetInputAt(0, value); }
+
+ DECLARE_INSTRUCTION(ReachabilityFence)
+
+ Value* value() const { return inputs_[0]; }
+
+ virtual bool ComputeCanDeoptimize() const { return false; }
+ virtual bool HasUnknownSideEffects() const { return false; }
+
+ PRINT_OPERANDS_TO_SUPPORT
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(ReachabilityFenceInstr);
+};
+
class ConstraintInstr : public TemplateDefinition<1, NoThrow> {
public:
ConstraintInstr(Value* value, Range* constraint)
diff --git a/runtime/vm/compiler/backend/il_printer.cc b/runtime/vm/compiler/backend/il_printer.cc
index d63d92b..7903b2e 100644
--- a/runtime/vm/compiler/backend/il_printer.cc
+++ b/runtime/vm/compiler/backend/il_printer.cc
@@ -374,6 +374,10 @@
}
}
+void ReachabilityFenceInstr::PrintOperandsTo(BufferFormatter* f) const {
+ value()->PrintTo(f);
+}
+
void Value::PrintTo(BufferFormatter* f) const {
PrintUse(f, *definition());
diff --git a/runtime/vm/compiler/backend/reachability_fence_test.cc b/runtime/vm/compiler/backend/reachability_fence_test.cc
new file mode 100644
index 0000000..782bc02
--- /dev/null
+++ b/runtime/vm/compiler/backend/reachability_fence_test.cc
@@ -0,0 +1,205 @@
+// Copyright (c) 2020, 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.
+
+#include <vector>
+
+#include "vm/compiler/backend/il.h"
+#include "vm/compiler/backend/il_printer.h"
+#include "vm/compiler/backend/il_test_helper.h"
+#include "vm/compiler/call_specializer.h"
+#include "vm/compiler/compiler_pass.h"
+#include "vm/object.h"
+#include "vm/unit_test.h"
+
+namespace dart {
+
+ISOLATE_UNIT_TEST_CASE(ReachabilityFence_Simple) {
+ const char* kScript =
+ R"(
+ import 'dart:_internal' show reachabilityFence;
+
+ int someGlobal = 0;
+
+ class A {
+ int a;
+ }
+
+ void someFunction(int arg) {
+ someGlobal += arg;
+ }
+
+ main() {
+ final object = A()..a = 10;
+ someFunction(object.a);
+ reachabilityFence(object);
+ }
+ )";
+
+ const auto& root_library = Library::Handle(LoadTestScript(kScript));
+
+ Invoke(root_library, "main");
+
+ const auto& function = Function::Handle(GetFunction(root_library, "main"));
+ TestPipeline pipeline(function, CompilerPass::kJIT);
+ FlowGraph* flow_graph = pipeline.RunPasses({});
+ ASSERT(flow_graph != nullptr);
+
+ auto entry = flow_graph->graph_entry()->normal_entry();
+ EXPECT(entry != nullptr);
+
+ // v2 <- AllocateObject(A <not-aliased>) T{A}
+ // ...
+ // [use field of object v2]
+ // ReachabilityFence(v2)
+ AllocateObjectInstr* allocate_object = nullptr;
+ ReachabilityFenceInstr* fence = nullptr;
+
+ ILMatcher cursor(flow_graph, entry);
+ RELEASE_ASSERT(cursor.TryMatch({
+ kMoveGlob,
+ // Allocate the object.
+ {kMatchAndMoveAllocateObject, &allocate_object},
+ kMoveGlob,
+ // The call.
+ kMatchAndMoveStoreStaticField,
+ // The fence should not be moved before the call.
+ {kMatchAndMoveReachabilityFence, &fence},
+ }));
+
+ EXPECT(fence->value()->definition() == allocate_object);
+}
+
+ISOLATE_UNIT_TEST_CASE(ReachabilityFence_Loop) {
+ const char* kScript =
+ R"(
+ import 'dart:_internal' show reachabilityFence;
+
+ int someGlobal = 0;
+
+ class A {
+ int a;
+ }
+
+ @pragma('vm:never-inline')
+ A makeSomeA() {
+ return A()..a = 10;
+ }
+
+ void someFunction(int arg) {
+ someGlobal += arg;
+ }
+
+ main() {
+ final object = makeSomeA();
+ for(int i = 0; i < 100000; i++) {
+ someFunction(object.a);
+ reachabilityFence(object);
+ }
+ }
+ )";
+
+ const auto& root_library = Library::Handle(LoadTestScript(kScript));
+
+ Invoke(root_library, "main");
+
+ const auto& function = Function::Handle(GetFunction(root_library, "main"));
+ TestPipeline pipeline(function, CompilerPass::kJIT);
+ FlowGraph* flow_graph = pipeline.RunPasses({});
+ ASSERT(flow_graph != nullptr);
+
+ auto entry = flow_graph->graph_entry()->normal_entry();
+ EXPECT(entry != nullptr);
+
+ StaticCallInstr* object = nullptr;
+ LoadFieldInstr* field_load = nullptr;
+ ReachabilityFenceInstr* fence = nullptr;
+
+ ILMatcher cursor(flow_graph, entry);
+ RELEASE_ASSERT(cursor.TryMatch(
+ {
+ // Get the object from some method
+ {kMatchAndMoveStaticCall, &object},
+ // Load the field outside the loop.
+ {kMatchAndMoveLoadField, &field_load},
+ // Go into the loop.
+ kMatchAndMoveBranchTrue,
+ // The fence should not be moved outside of the loop.
+ {kMatchAndMoveReachabilityFence, &fence},
+ },
+ /*insert_before=*/kMoveGlob));
+
+ EXPECT(field_load->instance()->definition() == object);
+ EXPECT(fence->value()->definition() == object);
+}
+
+ISOLATE_UNIT_TEST_CASE(ReachabilityFence_NoCanonicalize) {
+ const char* kScript =
+ R"(
+ import 'dart:_internal' show reachabilityFence;
+
+ int someGlobal = 0;
+
+ class A {
+ int a;
+ }
+
+ @pragma('vm:never-inline')
+ A makeSomeA() {
+ return A()..a = 10;
+ }
+
+ void someFunction(int arg) {
+ someGlobal += arg;
+ }
+
+ main() {
+ final object = makeSomeA();
+ reachabilityFence(object);
+ for(int i = 0; i < 100000; i++) {
+ someFunction(object.a);
+ reachabilityFence(object);
+ }
+ reachabilityFence(object);
+ reachabilityFence(object);
+ }
+ )";
+
+ const auto& root_library = Library::Handle(LoadTestScript(kScript));
+
+ Invoke(root_library, "main");
+
+ const auto& function = Function::Handle(GetFunction(root_library, "main"));
+ TestPipeline pipeline(function, CompilerPass::kJIT);
+ FlowGraph* flow_graph = pipeline.RunPasses({});
+ ASSERT(flow_graph != nullptr);
+
+ auto entry = flow_graph->graph_entry()->normal_entry();
+ EXPECT(entry != nullptr);
+
+ StaticCallInstr* object = nullptr;
+ ReachabilityFenceInstr* fence1 = nullptr;
+ ReachabilityFenceInstr* fence2 = nullptr;
+ ReachabilityFenceInstr* fence3 = nullptr;
+ ReachabilityFenceInstr* fence4 = nullptr;
+
+ ILMatcher cursor(flow_graph, entry);
+ RELEASE_ASSERT(cursor.TryMatch(
+ {
+ {kMatchAndMoveStaticCall, &object},
+ {kMatchAndMoveReachabilityFence, &fence1},
+ kMatchAndMoveBranchTrue,
+ {kMatchAndMoveReachabilityFence, &fence2},
+ kMatchAndMoveBranchFalse,
+ {kMatchAndMoveReachabilityFence, &fence3},
+ {kMatchAndMoveReachabilityFence, &fence4},
+ },
+ /*insert_before=*/kMoveGlob));
+
+ EXPECT(fence1->value()->definition() == object);
+ EXPECT(fence2->value()->definition() == object);
+ EXPECT(fence3->value()->definition() == object);
+ EXPECT(fence4->value()->definition() == object);
+}
+
+} // namespace dart
diff --git a/runtime/vm/compiler/backend/redundancy_elimination.cc b/runtime/vm/compiler/backend/redundancy_elimination.cc
index b2eb8d5..0559662 100644
--- a/runtime/vm/compiler/backend/redundancy_elimination.cc
+++ b/runtime/vm/compiler/backend/redundancy_elimination.cc
@@ -3690,7 +3690,7 @@
ASSERT(current->GetBlock() == block);
if (MayHaveVisibleEffect(current) || current->CanDeoptimize() ||
current == block->last_instruction() || current->IsMaterializeObject() ||
- current->IsCheckStackOverflow()) {
+ current->IsCheckStackOverflow() || current->IsReachabilityFence()) {
return false;
}
return true;
diff --git a/runtime/vm/compiler/backend/slot.cc b/runtime/vm/compiler/backend/slot.cc
index 3f13a8c..43d3989 100644
--- a/runtime/vm/compiler/backend/slot.cc
+++ b/runtime/vm/compiler/backend/slot.cc
@@ -160,12 +160,13 @@
const Slot& Slot::GetContextVariableSlotFor(Thread* thread,
const LocalVariable& variable) {
ASSERT(variable.is_captured());
- return SlotCache::Instance(thread).Canonicalize(Slot(
- Kind::kCapturedVariable,
- IsImmutableBit::encode(variable.is_final()) | IsNullableBit::encode(true),
- kDynamicCid,
- compiler::target::Context::variable_offset(variable.index().value()),
- &variable.name(), &variable.type()));
+ return SlotCache::Instance(thread).Canonicalize(
+ Slot(Kind::kCapturedVariable,
+ IsImmutableBit::encode(variable.is_final() && !variable.is_late()) |
+ IsNullableBit::encode(true),
+ kDynamicCid,
+ compiler::target::Context::variable_offset(variable.index().value()),
+ &variable.name(), &variable.type()));
}
const Slot& Slot::GetTypeArgumentsIndexSlot(Thread* thread, intptr_t index) {
@@ -230,7 +231,8 @@
const Slot& slot = SlotCache::Instance(thread).Canonicalize(Slot(
Kind::kDartField,
- IsImmutableBit::encode(field.is_final() || field.is_const()) |
+ IsImmutableBit::encode((field.is_final() && !field.is_late()) ||
+ field.is_const()) |
IsNullableBit::encode(is_nullable) |
IsGuardedBit::encode(used_guarded_state),
nullable_cid, compiler::target::Field::OffsetOf(field), &field, &type));
diff --git a/runtime/vm/compiler/call_specializer.cc b/runtime/vm/compiler/call_specializer.cc
index 9a353cc..e074143 100644
--- a/runtime/vm/compiler/call_specializer.cc
+++ b/runtime/vm/compiler/call_specializer.cc
@@ -1225,12 +1225,13 @@
// subtype of the tested type, replace 'receiver is type' with
// - 'receiver == null' if type is Null or Never*,
// - 'receiver != null' otherwise.
- if (type.IsNullType() || type.IsNeverType() ||
+ if (type.IsNullType() || (type.IsNeverType() && type.IsLegacy()) ||
left_value->Type()->IsSubtypeOf(type)) {
Definition* replacement = new (Z) StrictCompareInstr(
call->token_pos(),
- (type.IsNullType() || type.IsNeverType()) ? Token::kEQ_STRICT
- : Token::kNE_STRICT,
+ (type.IsNullType() || (type.IsNeverType() && type.IsLegacy()))
+ ? Token::kEQ_STRICT
+ : Token::kNE_STRICT,
left_value->CopyWithType(Z),
new (Z) Value(flow_graph()->constant_null()),
/* number_check = */ false, DeoptId::kNone);
diff --git a/runtime/vm/compiler/compiler_sources.gni b/runtime/vm/compiler/compiler_sources.gni
index 8cf2d6c..9af4666 100644
--- a/runtime/vm/compiler/compiler_sources.gni
+++ b/runtime/vm/compiler/compiler_sources.gni
@@ -185,6 +185,7 @@
"backend/locations_helpers_test.cc",
"backend/loops_test.cc",
"backend/range_analysis_test.cc",
+ "backend/reachability_fence_test.cc",
"backend/redundancy_elimination_test.cc",
"backend/sexpression_test.cc",
"backend/slot_test.cc",
diff --git a/runtime/vm/compiler/frontend/base_flow_graph_builder.cc b/runtime/vm/compiler/frontend/base_flow_graph_builder.cc
index da73826..c306430 100644
--- a/runtime/vm/compiler/frontend/base_flow_graph_builder.cc
+++ b/runtime/vm/compiler/frontend/base_flow_graph_builder.cc
@@ -555,6 +555,12 @@
return Fragment(redefinition);
}
+Fragment BaseFlowGraphBuilder::ReachabilityFence() {
+ Fragment instructions;
+ instructions <<= new (Z) ReachabilityFenceInstr(Pop());
+ return instructions;
+}
+
Fragment BaseFlowGraphBuilder::StoreStaticField(TokenPosition position,
const Field& field) {
return Fragment(
diff --git a/runtime/vm/compiler/frontend/base_flow_graph_builder.h b/runtime/vm/compiler/frontend/base_flow_graph_builder.h
index 4046087..8fed8b0 100644
--- a/runtime/vm/compiler/frontend/base_flow_graph_builder.h
+++ b/runtime/vm/compiler/frontend/base_flow_graph_builder.h
@@ -198,6 +198,7 @@
StoreInstanceFieldInstr::Kind::kOther);
Fragment LoadStaticField(const Field& field);
Fragment RedefinitionWithType(const AbstractType& type);
+ Fragment ReachabilityFence();
Fragment StoreStaticField(TokenPosition position, const Field& field);
Fragment StoreIndexed(classid_t class_id);
// Takes a [class_id] valid for StoreIndexed.
diff --git a/runtime/vm/compiler/frontend/kernel_to_il.cc b/runtime/vm/compiler/frontend/kernel_to_il.cc
index dadcf40..375dc2f 100644
--- a/runtime/vm/compiler/frontend/kernel_to_il.cc
+++ b/runtime/vm/compiler/frontend/kernel_to_il.cc
@@ -904,6 +904,7 @@
case MethodRecognizer::kLinkedHashMap_getDeletedKeys:
case MethodRecognizer::kLinkedHashMap_setDeletedKeys:
case MethodRecognizer::kFfiAbi:
+ case MethodRecognizer::kReachabilityFence:
return true;
case MethodRecognizer::kAsyncStackTraceHelper:
return !FLAG_causal_async_stacks;
@@ -1187,6 +1188,12 @@
ASSERT(!FLAG_causal_async_stacks);
body += NullConstant();
break;
+ case MethodRecognizer::kReachabilityFence:
+ ASSERT(function.NumParameters() == 1);
+ body += LoadLocal(parsed_function_->RawParameterVariable(0));
+ body += ReachabilityFence();
+ body += NullConstant();
+ break;
case MethodRecognizer::kFfiAbi:
ASSERT(function.NumParameters() == 0);
body += IntConstant(static_cast<int64_t>(compiler::ffi::TargetAbi()));
@@ -2886,6 +2893,9 @@
}
FlowGraph* FlowGraphBuilder::BuildGraphOfFfiNative(const Function& function) {
+ const intptr_t kClosureParameterOffset = 0;
+ const intptr_t kFirstArgumentParameterOffset = kClosureParameterOffset + 1;
+
graph_entry_ =
new (Z) GraphEntryInstr(*parsed_function_, Compiler::kNoOSRDeoptId);
@@ -2907,13 +2917,15 @@
// Unbox and push the arguments.
for (intptr_t i = 0; i < marshaller.num_args(); i++) {
- body += LoadLocal(parsed_function_->ParameterVariable(i + 1));
+ body += LoadLocal(
+ parsed_function_->ParameterVariable(kFirstArgumentParameterOffset + i));
body += FfiConvertArgumentToNative(marshaller, i);
}
// Push the function pointer, which is stored (as Pointer object) in the
// first slot of the context.
- body += LoadLocal(parsed_function_->ParameterVariable(0));
+ body +=
+ LoadLocal(parsed_function_->ParameterVariable(kClosureParameterOffset));
body += LoadNativeField(Slot::Closure_context());
body += LoadNativeField(Slot::GetContextVariableSlotFor(
thread_, *MakeImplicitClosureScope(
@@ -2925,6 +2937,14 @@
body += ConvertUntaggedToUnboxed(kUnboxedFfiIntPtr);
body += FfiCall(marshaller);
+ for (intptr_t i = 0; i < marshaller.num_args(); i++) {
+ if (marshaller.IsPointer(i)) {
+ body += LoadLocal(parsed_function_->ParameterVariable(
+ kFirstArgumentParameterOffset + i));
+ body += ReachabilityFence();
+ }
+ }
+
body += FfiConvertArgumentToDart(marshaller, compiler::ffi::kResultIndex);
body += Return(TokenPosition::kNoSource);
diff --git a/runtime/vm/compiler/recognized_methods_list.h b/runtime/vm/compiler/recognized_methods_list.h
index 4d90982..2fd4cd7 100644
--- a/runtime/vm/compiler/recognized_methods_list.h
+++ b/runtime/vm/compiler/recognized_methods_list.h
@@ -171,6 +171,7 @@
V(::, _storePointer, FfiStorePointer, 0x3c7143a8) \
V(::, _fromAddress, FfiFromAddress, 0x612a64d5) \
V(Pointer, get:address, FfiGetAddress, 0x29a505a1) \
+ V(::, reachabilityFence, ReachabilityFence, 0x0) \
// List of intrinsics:
// (class-name, function-name, intrinsification method, fingerprint).
diff --git a/runtime/vm/compiler/runtime_api.cc b/runtime/vm/compiler/runtime_api.cc
index d529937..0fe7674 100644
--- a/runtime/vm/compiler/runtime_api.cc
+++ b/runtime/vm/compiler/runtime_api.cc
@@ -674,6 +674,10 @@
return TranslateOffsetInWords(dart::Pointer::NextFieldOffset());
}
+word WeakSerializationReference::NextFieldOffset() {
+ return -kWordSize;
+}
+
word ObjectPool::NextFieldOffset() {
return -kWordSize;
}
diff --git a/runtime/vm/compiler/runtime_api.h b/runtime/vm/compiler/runtime_api.h
index 26b811c..1ac43ce 100644
--- a/runtime/vm/compiler/runtime_api.h
+++ b/runtime/vm/compiler/runtime_api.h
@@ -1121,6 +1121,12 @@
static word NextFieldOffset();
};
+class WeakSerializationReference : public AllStatic {
+ public:
+ static word InstanceSize();
+ static word NextFieldOffset();
+};
+
class SubtypeTestCache : public AllStatic {
public:
static word cache_offset();
diff --git a/runtime/vm/compiler/runtime_offsets_extracted.h b/runtime/vm/compiler/runtime_offsets_extracted.h
index 311c4d3..c825f44 100644
--- a/runtime/vm/compiler/runtime_offsets_extracted.h
+++ b/runtime/vm/compiler/runtime_offsets_extracted.h
@@ -479,6 +479,8 @@
static constexpr dart::compiler::target::word UnwindError_InstanceSize = 12;
static constexpr dart::compiler::target::word UserTag_InstanceSize = 12;
static constexpr dart::compiler::target::word WeakProperty_InstanceSize = 16;
+static constexpr dart::compiler::target::word
+ WeakSerializationReference_InstanceSize = 8;
#endif // defined(TARGET_ARCH_ARM)
#if defined(TARGET_ARCH_X64)
@@ -950,6 +952,8 @@
static constexpr dart::compiler::target::word UnwindError_InstanceSize = 24;
static constexpr dart::compiler::target::word UserTag_InstanceSize = 24;
static constexpr dart::compiler::target::word WeakProperty_InstanceSize = 32;
+static constexpr dart::compiler::target::word
+ WeakSerializationReference_InstanceSize = 16;
#endif // defined(TARGET_ARCH_X64)
#if defined(TARGET_ARCH_IA32)
@@ -1411,6 +1415,8 @@
static constexpr dart::compiler::target::word UnwindError_InstanceSize = 12;
static constexpr dart::compiler::target::word UserTag_InstanceSize = 12;
static constexpr dart::compiler::target::word WeakProperty_InstanceSize = 16;
+static constexpr dart::compiler::target::word
+ WeakSerializationReference_InstanceSize = 8;
#endif // defined(TARGET_ARCH_IA32)
#if defined(TARGET_ARCH_ARM64)
@@ -1883,6 +1889,8 @@
static constexpr dart::compiler::target::word UnwindError_InstanceSize = 24;
static constexpr dart::compiler::target::word UserTag_InstanceSize = 24;
static constexpr dart::compiler::target::word WeakProperty_InstanceSize = 32;
+static constexpr dart::compiler::target::word
+ WeakSerializationReference_InstanceSize = 16;
#endif // defined(TARGET_ARCH_ARM64)
#else // !defined(PRODUCT)
@@ -2343,6 +2351,8 @@
static constexpr dart::compiler::target::word UnwindError_InstanceSize = 12;
static constexpr dart::compiler::target::word UserTag_InstanceSize = 12;
static constexpr dart::compiler::target::word WeakProperty_InstanceSize = 16;
+static constexpr dart::compiler::target::word
+ WeakSerializationReference_InstanceSize = 8;
#endif // defined(TARGET_ARCH_ARM)
#if defined(TARGET_ARCH_X64)
@@ -2808,6 +2818,8 @@
static constexpr dart::compiler::target::word UnwindError_InstanceSize = 24;
static constexpr dart::compiler::target::word UserTag_InstanceSize = 24;
static constexpr dart::compiler::target::word WeakProperty_InstanceSize = 32;
+static constexpr dart::compiler::target::word
+ WeakSerializationReference_InstanceSize = 16;
#endif // defined(TARGET_ARCH_X64)
#if defined(TARGET_ARCH_IA32)
@@ -3263,6 +3275,8 @@
static constexpr dart::compiler::target::word UnwindError_InstanceSize = 12;
static constexpr dart::compiler::target::word UserTag_InstanceSize = 12;
static constexpr dart::compiler::target::word WeakProperty_InstanceSize = 16;
+static constexpr dart::compiler::target::word
+ WeakSerializationReference_InstanceSize = 8;
#endif // defined(TARGET_ARCH_IA32)
#if defined(TARGET_ARCH_ARM64)
@@ -3729,6 +3743,8 @@
static constexpr dart::compiler::target::word UnwindError_InstanceSize = 24;
static constexpr dart::compiler::target::word UserTag_InstanceSize = 24;
static constexpr dart::compiler::target::word WeakProperty_InstanceSize = 32;
+static constexpr dart::compiler::target::word
+ WeakSerializationReference_InstanceSize = 16;
#endif // defined(TARGET_ARCH_ARM64)
#endif // !defined(PRODUCT)
@@ -4243,6 +4259,8 @@
static constexpr dart::compiler::target::word AOT_UserTag_InstanceSize = 12;
static constexpr dart::compiler::target::word AOT_WeakProperty_InstanceSize =
16;
+static constexpr dart::compiler::target::word
+ AOT_WeakSerializationReference_InstanceSize = 8;
#endif // defined(TARGET_ARCH_ARM)
#if defined(TARGET_ARCH_X64)
@@ -4756,6 +4774,8 @@
static constexpr dart::compiler::target::word AOT_UserTag_InstanceSize = 24;
static constexpr dart::compiler::target::word AOT_WeakProperty_InstanceSize =
32;
+static constexpr dart::compiler::target::word
+ AOT_WeakSerializationReference_InstanceSize = 12;
#endif // defined(TARGET_ARCH_X64)
#if defined(TARGET_ARCH_IA32)
@@ -5273,6 +5293,8 @@
static constexpr dart::compiler::target::word AOT_UserTag_InstanceSize = 24;
static constexpr dart::compiler::target::word AOT_WeakProperty_InstanceSize =
32;
+static constexpr dart::compiler::target::word
+ AOT_WeakSerializationReference_InstanceSize = 12;
#endif // defined(TARGET_ARCH_ARM64)
#else // !defined(PRODUCT)
@@ -5778,6 +5800,8 @@
static constexpr dart::compiler::target::word AOT_UserTag_InstanceSize = 12;
static constexpr dart::compiler::target::word AOT_WeakProperty_InstanceSize =
16;
+static constexpr dart::compiler::target::word
+ AOT_WeakSerializationReference_InstanceSize = 8;
#endif // defined(TARGET_ARCH_ARM)
#if defined(TARGET_ARCH_X64)
@@ -6284,6 +6308,8 @@
static constexpr dart::compiler::target::word AOT_UserTag_InstanceSize = 24;
static constexpr dart::compiler::target::word AOT_WeakProperty_InstanceSize =
32;
+static constexpr dart::compiler::target::word
+ AOT_WeakSerializationReference_InstanceSize = 12;
#endif // defined(TARGET_ARCH_X64)
#if defined(TARGET_ARCH_IA32)
@@ -6794,6 +6820,8 @@
static constexpr dart::compiler::target::word AOT_UserTag_InstanceSize = 24;
static constexpr dart::compiler::target::word AOT_WeakProperty_InstanceSize =
32;
+static constexpr dart::compiler::target::word
+ AOT_WeakSerializationReference_InstanceSize = 12;
#endif // defined(TARGET_ARCH_ARM64)
#endif // !defined(PRODUCT)
diff --git a/runtime/vm/compiler/runtime_offsets_list.h b/runtime/vm/compiler/runtime_offsets_list.h
index 3c16243..0ec3d1f 100644
--- a/runtime/vm/compiler/runtime_offsets_list.h
+++ b/runtime/vm/compiler/runtime_offsets_list.h
@@ -338,6 +338,8 @@
SIZEOF(UnlinkedCall, InstanceSize, RawUnlinkedCall) \
SIZEOF(UnwindError, InstanceSize, RawUnwindError) \
SIZEOF(UserTag, InstanceSize, RawUserTag) \
- SIZEOF(WeakProperty, InstanceSize, RawWeakProperty)
+ SIZEOF(WeakProperty, InstanceSize, RawWeakProperty) \
+ SIZEOF(WeakSerializationReference, InstanceSize, \
+ RawWeakSerializationReference)
#endif // RUNTIME_VM_COMPILER_RUNTIME_OFFSETS_LIST_H_
diff --git a/runtime/vm/exceptions.cc b/runtime/vm/exceptions.cc
index 19533b1..6ed1a09 100644
--- a/runtime/vm/exceptions.cc
+++ b/runtime/vm/exceptions.cc
@@ -893,7 +893,11 @@
StackFrame* caller_frame = iterator->NextFrame();
ASSERT(caller_frame != NULL && caller_frame->IsDartFrame());
const Function& caller = Function::Handle(caller_frame->LookupDartFunction());
+#if defined(DART_PRECOMPILED_RUNTIME)
+ if (caller.IsNull()) return Script::null();
+#else
ASSERT(!caller.IsNull());
+#endif
return caller.script();
}
@@ -930,14 +934,15 @@
DartFrameIterator iterator(thread,
StackFrameIterator::kNoCrossThreadIteration);
const Script& script = Script::Handle(zone, GetCallerScript(&iterator));
+ const String& url = String::Handle(
+ zone, script.IsNull() ? Symbols::OptimizedOut().raw() : script.url());
intptr_t line = -1;
intptr_t column = -1;
- ASSERT(!script.IsNull());
- if (location.IsReal()) {
+ if (!script.IsNull() && location.IsReal()) {
script.GetTokenLocation(location, &line, &column);
}
// Initialize '_url', '_line', and '_column' arguments.
- args.SetAt(0, String::Handle(zone, script.url()));
+ args.SetAt(0, url);
args.SetAt(1, Smi::Handle(zone, Smi::New(line)));
args.SetAt(2, Smi::Handle(zone, Smi::New(column)));
diff --git a/runtime/vm/flag_list.h b/runtime/vm/flag_list.h
index 6f09151..310aa8a 100644
--- a/runtime/vm/flag_list.h
+++ b/runtime/vm/flag_list.h
@@ -192,6 +192,9 @@
P(null_safety, bool, false, \
"Respect the nullability of types in casts and instance checks.") \
P(use_table_dispatch, bool, true, "Enable dispatch table based calls.") \
+ P(retain_dispatched_functions, bool, !USING_PRODUCT, \
+ "Serialize function objects for code in the dispatch table even if " \
+ "not needed in the precompiled runtime") \
P(enable_isolate_groups, bool, false, "Enable isolate group support.") \
P(show_invisible_frames, bool, false, \
"Show invisible frames in stack traces.") \
diff --git a/runtime/vm/image_snapshot.cc b/runtime/vm/image_snapshot.cc
index 3ae1578..e61fd02 100644
--- a/runtime/vm/image_snapshot.cc
+++ b/runtime/vm/image_snapshot.cc
@@ -591,7 +591,13 @@
name = NameOfStubIsolateSpecificStub(store_, code);
ASSERT(name != nullptr);
return OS::SCreate(zone_, "%s_%s", prefix, name);
- } else if (owner_.IsClass()) {
+ }
+ // The weak reference to the Code's owner should never have been removed via
+ // an intermediate serialization, since WSRs are only introduced during
+ // precompilation.
+ owner_ = WeakSerializationReference::Unwrap(owner_);
+ ASSERT(!owner_.IsNull());
+ if (owner_.IsClass()) {
string_ = Class::Cast(owner_).Name();
const char* name = string_.ToCString();
EnsureAssemblerIdentifier(const_cast<char*>(name));
diff --git a/runtime/vm/kernel_loader.cc b/runtime/vm/kernel_loader.cc
index 98e5421..0b07be9 100644
--- a/runtime/vm/kernel_loader.cc
+++ b/runtime/vm/kernel_loader.cc
@@ -1221,9 +1221,7 @@
// Only instance fields could be covariant.
ASSERT(!field_helper.IsCovariant() &&
!field_helper.IsGenericCovariantImpl());
- // In NNBD libraries, static fields act like late fields
- // regardless of whether they're marked late.
- const bool is_late = field_helper.IsLate() || library.is_nnbd();
+ const bool is_late = field_helper.IsLate();
const bool is_extension_member = field_helper.IsExtensionMember();
const Field& field = Field::Handle(
Z, Field::NewTopLevel(name, is_final, field_helper.IsConst(), is_late,
@@ -1236,6 +1234,11 @@
field.SetFieldType(type);
ReadInferredType(field, field_offset + library_kernel_offset_);
CheckForInitializer(field);
+ // In NNBD libraries, static fields with initializers are
+ // implicitly late.
+ if (field.has_initializer() && library.is_nnbd()) {
+ field.set_is_late(true);
+ }
field_helper.SetJustRead(FieldHelper::kType);
field_helper.ReadUntilExcluding(FieldHelper::kInitializer);
intptr_t field_initializer_offset = helper_.ReaderOffset();
@@ -1579,10 +1582,7 @@
// In the VM all const fields are implicitly final whereas in Kernel they
// are not final because they are not explicitly declared that way.
const bool is_final = field_helper.IsConst() || field_helper.IsFinal();
- // In NNBD libraries, static fields act like late fields
- // regardless of whether they're marked late.
- const bool is_late = field_helper.IsLate() ||
- (field_helper.IsStatic() && library.is_nnbd());
+ const bool is_late = field_helper.IsLate();
const bool is_extension_member = field_helper.IsExtensionMember();
Field& field = Field::Handle(
Z, Field::New(name, field_helper.IsStatic(), is_final,
@@ -1597,6 +1597,12 @@
field.set_is_extension_member(is_extension_member);
ReadInferredType(field, field_offset + library_kernel_offset_);
CheckForInitializer(field);
+ // In NNBD libraries, static fields with initializers are
+ // implicitly late.
+ if (field_helper.IsStatic() && field.has_initializer() &&
+ library.is_nnbd()) {
+ field.set_is_late(true);
+ }
field_helper.ReadUntilExcluding(FieldHelper::kInitializer);
intptr_t field_initializer_offset = helper_.ReaderOffset();
field_helper.ReadUntilExcluding(FieldHelper::kEnd);
diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
index d2044b8..b51f1c1 100644
--- a/runtime/vm/object.cc
+++ b/runtime/vm/object.cc
@@ -181,6 +181,8 @@
RawClass* Object::unhandled_exception_class_ =
reinterpret_cast<RawClass*>(RAW_NULL);
RawClass* Object::unwind_error_class_ = reinterpret_cast<RawClass*>(RAW_NULL);
+RawClass* Object::weak_serialization_reference_class_ =
+ reinterpret_cast<RawClass*>(RAW_NULL);
const double MegamorphicCache::kLoadFactor = 0.50;
@@ -857,6 +859,10 @@
cls = Class::New<UnwindError, RTN::UnwindError>(isolate);
unwind_error_class_ = cls.raw();
+ cls = Class::New<WeakSerializationReference, RTN::WeakSerializationReference>(
+ isolate);
+ weak_serialization_reference_class_ = cls.raw();
+
ASSERT(class_class() != null_);
// Pre-allocate classes in the vm isolate so that we can for example create a
@@ -11941,9 +11947,12 @@
}
void Library::InitResolvedNamesCache() const {
- ASSERT(Thread::Current()->IsMutatorThread());
- StorePointer(&raw_ptr()->resolved_names_,
- HashTables::New<ResolvedNamesMap>(64));
+ Thread* thread = Thread::Current();
+ ASSERT(thread->IsMutatorThread());
+ REUSABLE_FUNCTION_HANDLESCOPE(thread);
+ Array& cache = thread->ArrayHandle();
+ cache = HashTables::New<ResolvedNamesMap>(64);
+ StorePointer(&raw_ptr()->resolved_names_, cache.raw());
}
void Library::ClearResolvedNamesCache() const {
@@ -11952,8 +11961,12 @@
}
void Library::InitExportedNamesCache() const {
- StorePointer(&raw_ptr()->exported_names_,
- HashTables::New<ResolvedNamesMap>(16));
+ Thread* thread = Thread::Current();
+ ASSERT(thread->IsMutatorThread());
+ REUSABLE_FUNCTION_HANDLESCOPE(thread);
+ Array& cache = thread->ArrayHandle();
+ cache = HashTables::New<ResolvedNamesMap>(16);
+ StorePointer(&raw_ptr()->exported_names_, cache.raw());
}
void Library::ClearExportedNamesCache() const {
@@ -11961,9 +11974,14 @@
}
void Library::InitClassDictionary() const {
+ Thread* thread = Thread::Current();
+ ASSERT(thread->IsMutatorThread());
+ REUSABLE_FUNCTION_HANDLESCOPE(thread);
+ Array& dictionary = thread->ArrayHandle();
// TODO(iposva): Find reasonable initial size.
const int kInitialElementCount = 16;
- StorePointer(&raw_ptr()->dictionary_, NewDictionary(kInitialElementCount));
+ dictionary = NewDictionary(kInitialElementCount);
+ StorePointer(&raw_ptr()->dictionary_, dictionary.raw());
}
void Library::InitImportList() const {
@@ -11999,9 +12017,9 @@
result.StorePointer(&result.raw_ptr()->metadata_,
GrowableObjectArray::New(4, Heap::kOld));
result.StorePointer(&result.raw_ptr()->toplevel_class_, Class::null());
- result.StorePointer(
- &result.raw_ptr()->used_scripts_,
+ const GrowableObjectArray& scripts = GrowableObjectArray::Handle(zone,
GrowableObjectArray::New(Object::empty_array(), Heap::kOld));
+ result.StorePointer(&result.raw_ptr()->used_scripts_, scripts.raw());
result.StorePointer(&result.raw_ptr()->imports_, Object::empty_array().raw());
result.StorePointer(&result.raw_ptr()->exports_, Object::empty_array().raw());
result.StorePointer(&result.raw_ptr()->loaded_scripts_, Array::null());
@@ -15149,7 +15167,11 @@
intptr_t num_args_tested,
RebindRule rebind_rule,
const AbstractType& receivers_static_type) {
+#if !defined(DART_PRECOMPILED_RUNTIME)
+ // We should only have null owners in the precompiled runtime, if the
+ // owning function for a Code object was optimized out.
ASSERT(!owner.IsNull());
+#endif
ASSERT(!target_name.IsNull());
ASSERT(!arguments_descriptor.IsNull());
ASSERT(Object::icdata_class() != Class::null());
@@ -15264,6 +15286,40 @@
}
#endif
+const char* WeakSerializationReference::ToCString() const {
+#if defined(DART_PRECOMPILED_RUNTIME)
+ return Symbols::OptimizedOut().ToCString();
+#else
+ return Object::Handle(target()).ToCString();
+#endif
+}
+
+#if defined(DART_PRECOMPILER)
+bool WeakSerializationReference::CanWrap(const Object& object) {
+ // Currently we do not wrap the null object (which cannot be dropped from
+ // snapshots), non-heap objects, and WSRs (as there is no point in deeply
+ // nesting them). We also only wrap objects in the precompiler.
+ return FLAG_precompiled_mode && !object.IsNull() &&
+ object.raw()->IsHeapObject() && !object.IsWeakSerializationReference();
+}
+
+RawObject* WeakSerializationReference::Wrap(Zone* zone, const Object& target) {
+ if (!CanWrap(target)) return target.raw();
+ ASSERT(Object::weak_serialization_reference_class() != Class::null());
+ WeakSerializationReference& result = WeakSerializationReference::Handle(zone);
+ {
+ RawObject* raw = Object::Allocate(
+ WeakSerializationReference::kClassId,
+ WeakSerializationReference::InstanceSize(), Heap::kOld);
+ NoSafepointScope no_safepoint;
+
+ result ^= raw;
+ result.StorePointer(&result.raw_ptr()->target_, target.raw());
+ }
+ return result.raw();
+}
+#endif
+
Code::Comments& Code::Comments::New(intptr_t count) {
Comments* comments;
if (count < 0 || count > (kIntptrMax / kNumberOfEntries)) {
@@ -15352,6 +15408,16 @@
return var_descriptors();
}
+void Code::set_owner(const Object& owner) const {
+#if defined(DEBUG)
+ const auto& unwrapped_owner =
+ Object::Handle(WeakSerializationReference::Unwrap(owner));
+ ASSERT(unwrapped_owner.IsFunction() || unwrapped_owner.IsClass() ||
+ unwrapped_owner.IsAbstractType());
+#endif
+ StorePointer(&raw_ptr()->owner_, owner.raw());
+}
+
void Code::set_state_bits(intptr_t bits) const {
StoreNonPointer(&raw_ptr()->state_bits_, bits);
}
@@ -15817,12 +15883,13 @@
#if !defined(PRODUCT)
ASSERT(!Thread::Current()->IsAtSafepoint());
if (CodeObservers::AreActive()) {
- const Object& owner = Object::Handle(code.owner());
- if (owner.IsFunction()) {
- NotifyCodeObservers(Function::Cast(owner), code, optimized);
- } else {
- NotifyCodeObservers(code.Name(), code, optimized);
+ if (code.IsFunctionCode()) {
+ const auto& function = Function::Handle(code.function());
+ if (!function.IsNull()) {
+ return NotifyCodeObservers(function, code, optimized);
+ }
}
+ NotifyCodeObservers(code.Name(), code, optimized);
}
#endif
}
@@ -15948,15 +16015,17 @@
const char* Code::Name() const {
Zone* zone = Thread::Current()->zone();
- const Object& obj = Object::Handle(zone, owner());
- if (obj.IsNull()) {
+ if (IsStubCode()) {
// Regular stub.
const char* name = StubCode::NameOfStub(EntryPoint());
if (name == NULL) {
return "[unknown stub]"; // Not yet recorded.
}
return zone->PrintToString("[Stub] %s", name);
- } else if (obj.IsClass()) {
+ }
+ const auto& obj =
+ Object::Handle(zone, WeakSerializationReference::UnwrapIfTarget(owner()));
+ if (obj.IsClass()) {
// Allocation stub.
String& cls_name = String::Handle(zone, Class::Cast(obj).ScrubbedName());
ASSERT(!cls_name.IsNull());
@@ -15966,11 +16035,14 @@
return zone->PrintToString("[Stub] Type Test %s",
AbstractType::Cast(obj).ToCString());
} else {
- ASSERT(obj.IsFunction());
+ ASSERT(IsFunctionCode());
// Dart function.
const char* opt = is_optimized() ? "[Optimized]" : "[Unoptimized]";
const char* function_name =
- String::Handle(zone, Function::Cast(obj).UserVisibleName()).ToCString();
+ obj.IsFunction()
+ ? String::Handle(zone, Function::Cast(obj).UserVisibleName())
+ .ToCString()
+ : WeakSerializationReference::Cast(obj).ToCString();
return zone->PrintToString("%s %s", opt, function_name);
}
}
@@ -15988,22 +16060,23 @@
}
bool Code::IsStubCode() const {
+ // We should _not_ unwrap any possible WSRs here, as the null value is never
+ // wrapped by a WSR.
return owner() == Object::null();
}
bool Code::IsAllocationStubCode() const {
- const Object& obj = Object::Handle(owner());
- return obj.IsClass();
+ return OwnerClassId() == kClassCid;
}
bool Code::IsTypeTestStubCode() const {
- const Object& obj = Object::Handle(owner());
- return obj.IsAbstractType();
+ auto const cid = OwnerClassId();
+ return cid == kAbstractTypeCid || cid == kTypeCid || cid == kTypeRefCid ||
+ cid == kTypeParameterCid;
}
bool Code::IsFunctionCode() const {
- const Object& obj = Object::Handle(owner());
- return obj.IsFunction();
+ return OwnerClassId() == kFunctionCid;
}
void Code::DisableDartCode() const {
@@ -23323,48 +23396,64 @@
const Function& function,
TokenPosition token_pos,
intptr_t frame_index) {
- const Script& script = Script::Handle(zone, function.script());
- const String& function_name =
- String::Handle(zone, function.QualifiedUserVisibleName());
- const String& url = String::Handle(
- zone, script.IsNull() ? String::New("Kernel") : script.url());
+ auto& script = Script::Handle(zone);
+ const char* function_name;
+ const char* url;
+
+ if (!function.IsNull()) {
+ script = function.script();
+ auto& handle = String::Handle(zone, function.QualifiedUserVisibleName());
+ function_name = handle.ToCString();
+ handle = script.IsNull() ? String::New("Kernel") : script.url();
+ url = handle.ToCString();
+ } else {
+ function_name = Symbols::OptimizedOut().ToCString();
+ url = function_name;
+ }
// If the URI starts with "data:application/dart;" this is a URI encoded
// script so we shouldn't print the entire URI because it could be very long.
- const char* url_string = url.ToCString();
- if (strstr(url_string, "data:application/dart;") == url_string) {
- url_string = "<data:application/dart>";
+ if (strstr(url, "data:application/dart;") == url) {
+ url = "<data:application/dart>";
}
intptr_t line = -1;
intptr_t column = -1;
if (FLAG_precompiled_mode) {
line = token_pos.value();
- } else {
- if (!script.IsNull() && token_pos.IsSourcePosition()) {
- script.GetTokenLocation(token_pos.SourcePosition(), &line, &column);
- }
+ } else if (!script.IsNull() && token_pos.IsSourcePosition()) {
+ script.GetTokenLocation(token_pos.SourcePosition(), &line, &column);
}
- if (column >= 0) {
- buffer->Printf("#%-6" Pd " %s (%s:%" Pd ":%" Pd ")\n", frame_index,
- function_name.ToCString(), url_string, line, column);
- } else if (line >= 0) {
- buffer->Printf("#%-6" Pd " %s (%s:%" Pd ")\n", frame_index,
- function_name.ToCString(), url_string, line);
- } else {
- buffer->Printf("#%-6" Pd " %s (%s)\n", frame_index,
- function_name.ToCString(), url_string);
+ buffer->Printf("#%-6" Pd " %s (%s", frame_index, function_name, url);
+ if (line >= 0) {
+ buffer->Printf(":%" Pd "", line);
+ if (column >= 0) {
+ buffer->Printf(":%" Pd "", column);
+ }
}
+ buffer->Printf(")\n");
+}
+
+static inline bool ShouldPrintFrame(const Function& function) {
+ // TODO(dartbug.com/41052): Currently, we print frames where the function
+ // object was optimized out in the precompiled runtime, even if the original
+ // function was not visible. We may want to either elide such frames, or
+ // instead store additional information in the WSR that allows us to determine
+ // the original visibility.
+#if defined(DART_PRECOMPILED_RUNTIME)
+ if (function.IsNull()) return true;
+#endif
+ return FLAG_show_invisible_frames || function.is_visible();
}
const char* StackTrace::ToDartCString(const StackTrace& stack_trace_in) {
- Zone* zone = Thread::Current()->zone();
- StackTrace& stack_trace = StackTrace::Handle(zone, stack_trace_in.raw());
- Function& function = Function::Handle(zone);
- Object& code_object = Object::Handle(zone);
- Code& code = Code::Handle(zone);
- Bytecode& bytecode = Bytecode::Handle(zone);
+ auto const zone = Thread::Current()->zone();
+ auto& stack_trace = StackTrace::Handle(zone, stack_trace_in.raw());
+ auto& function = Function::Handle(zone);
+ auto& code_object = Object::Handle(zone);
+ auto& code = Code::Handle(zone);
+ auto& bytecode = Bytecode::Handle(zone);
GrowableArray<const Function*> inlined_functions;
GrowableArray<TokenPosition> inlined_token_positions;
@@ -23399,20 +23488,19 @@
pc_offset, &inlined_functions, &inlined_token_positions);
ASSERT(inlined_functions.length() >= 1);
for (intptr_t j = inlined_functions.length() - 1; j >= 0; j--) {
- if (inlined_functions[j]->is_visible() ||
- FLAG_show_invisible_frames) {
- PrintStackTraceFrame(zone, &buffer, *inlined_functions[j],
- inlined_token_positions[j], frame_index);
+ const auto& inlined = *inlined_functions[j];
+ auto const pos = inlined_token_positions[j];
+ if (ShouldPrintFrame(inlined)) {
+ PrintStackTraceFrame(zone, &buffer, inlined, pos, frame_index);
frame_index++;
}
}
} else {
function = code.function();
- if (function.is_visible() || FLAG_show_invisible_frames) {
+ if (ShouldPrintFrame(function)) {
uword pc = code.PayloadStart() + pc_offset;
- const TokenPosition token_pos = code.GetTokenIndexOfPC(pc);
- PrintStackTraceFrame(zone, &buffer, function, token_pos,
- frame_index);
+ auto const pos = code.GetTokenIndexOfPC(pc);
+ PrintStackTraceFrame(zone, &buffer, function, pos, frame_index);
frame_index++;
}
}
@@ -23420,11 +23508,10 @@
ASSERT(code_object.IsBytecode());
bytecode ^= code_object.raw();
function = bytecode.function();
- if (function.is_visible() || FLAG_show_invisible_frames) {
+ if (ShouldPrintFrame(function)) {
uword pc = bytecode.PayloadStart() + pc_offset;
- const TokenPosition token_pos = bytecode.GetTokenIndexOfPC(pc);
- PrintStackTraceFrame(zone, &buffer, function, token_pos,
- frame_index);
+ auto const pos = bytecode.GetTokenIndexOfPC(pc);
+ PrintStackTraceFrame(zone, &buffer, function, pos, frame_index);
frame_index++;
}
}
diff --git a/runtime/vm/object.h b/runtime/vm/object.h
index 3da041d..f6f53bb 100644
--- a/runtime/vm/object.h
+++ b/runtime/vm/object.h
@@ -519,6 +519,9 @@
return megamorphic_cache_class_;
}
static RawClass* subtypetestcache_class() { return subtypetestcache_class_; }
+ static RawClass* weak_serialization_reference_class() {
+ return weak_serialization_reference_class_;
+ }
// Initialize the VM isolate.
static void InitNull(Isolate* isolate);
@@ -795,6 +798,8 @@
static RawClass* language_error_class_; // Class of LanguageError.
static RawClass* unhandled_exception_class_; // Class of UnhandledException.
static RawClass* unwind_error_class_; // Class of UnwindError.
+ // Class of WeakSerializationReference.
+ static RawClass* weak_serialization_reference_class_;
#define DECLARE_SHARED_READONLY_HANDLE(Type, name) static Type* name##_;
SHARED_READONLY_HANDLES_LIST(DECLARE_SHARED_READONLY_HANDLE)
@@ -5719,6 +5724,117 @@
friend class Object;
};
+// A WeakSerializationReference (WSR) denotes a type of weak reference to a
+// target object. In particular, objects that can only be reached from roots via
+// WSR edges during serialization of AOT snapshots should not be serialized. Of
+// course, the target object may still be serialized if there are paths to the
+// object from the roots that do not go through one of these objects, in which
+// case the WSR is discarded in favor of a direct reference during serialization
+// to avoid runtime overhead.
+//
+// Note: Some objects cannot be dropped during AOT serialization, and thus
+// Wrap() may return the original object in some cases. The CanWrap()
+// function returns false if Wrap() will return the original object.
+// In particular, the null object will never be wrapped, so receiving
+// Object::null() from target() means the WSR represents a dropped target.
+//
+// Unfortunately a WSR is not a proxy for the original object, so if WSRs may
+// appear as field contents (currently only possible for RawObject* fields),
+// then code that accesses that field must handle the case where an WSR has
+// been introduced. Before serialization, Unwrap can be used to take a
+// Object reference or RawObject pointer and remove any WSR wrapping before use.
+// After deserialization, any WSRs no longer contain a pointer to the target,
+// but instead contain only the class ID of the original target.
+//
+// Current uses of WSRs:
+// * Code::owner_
+class WeakSerializationReference : public Object {
+ public:
+ RawObject* target() const { return TargetOf(raw()); }
+ static RawObject* TargetOf(const RawWeakSerializationReference* raw) {
+#if defined(DART_PRECOMPILED_RUNTIME)
+ // WSRs in the precompiled runtime only contain some remaining info about
+ // their old target, not a reference to the target itself..
+ return Object::null();
+#else
+ // Outside the precompiled runtime, they should always have a target.
+ ASSERT(raw->ptr()->target_ != Object::null());
+ return raw->ptr()->target_;
+#endif
+ }
+
+ classid_t TargetClassId() const { return TargetClassIdOf(raw()); }
+ static classid_t TargetClassIdOf(const RawWeakSerializationReference* raw) {
+#if defined(DART_PRECOMPILED_RUNTIME)
+ // No new instances of WSRs are created in the precompiled runtime, so
+ // this instance came from deserialization and thus must be the empty WSR.
+ return raw->ptr()->cid_;
+#else
+ return TargetOf(raw)->GetClassId();
+#endif
+ }
+
+ static RawObject* Unwrap(const Object& obj) { return Unwrap(obj.raw()); }
+ // Gets the underlying object from a WSR, or the original object if it is
+ // not one. Notably, Unwrap(Wrap(r)) == r for all raw objects r, whether
+ // CanWrap(r) or not. However, this will not hold if a serialization and
+ // deserialization step is put between the two calls.
+ static RawObject* Unwrap(RawObject* obj) {
+ if (!obj->IsWeakSerializationReference()) return obj;
+ return TargetOf(reinterpret_cast<RawWeakSerializationReference*>(obj));
+ }
+
+ // An Unwrap that only unwraps if there's a valid target, otherwise the
+ // WSR is returned. Useful for cases where we want to call Object methods
+ // like ToCString() on whatever non-null object we can get.
+ static RawObject* UnwrapIfTarget(const Object& obj) {
+ return UnwrapIfTarget(obj.raw());
+ }
+ static RawObject* UnwrapIfTarget(RawObject* raw) {
+#if defined(DART_PRECOMPILED_RUNTIME)
+ // In the precompiled runtime, WSRs never have a target so we always return
+ // the argument.
+ return raw;
+#else
+ if (!raw->IsWeakSerializationReference()) return raw;
+ // Otherwise, they always do.
+ return TargetOf(WeakSerializationReference::RawCast(raw));
+#endif
+ }
+
+ static classid_t UnwrappedClassIdOf(const Object& obj) {
+ return UnwrappedClassIdOf(obj.raw());
+ }
+ // Gets the class ID of the underlying object from a WSR, or the class ID of
+ // the object if it is not one.
+ //
+ // UnwrappedClassOf(Wrap(r)) == UnwrappedClassOf(r) for all raw objects r,
+ // whether CanWrap(r) or not. Unlike Unwrap, this is still true even if
+ // there is a serialization and deserialization step between the two calls,
+ // since that information is saved in the serialized WSR.
+ static classid_t UnwrappedClassIdOf(RawObject* obj) {
+ if (!obj->IsWeakSerializationReference()) return obj->GetClassId();
+ return TargetClassIdOf(WeakSerializationReference::RawCast(obj));
+ }
+
+ static intptr_t InstanceSize() {
+ return RoundedAllocationSize(sizeof(RawWeakSerializationReference));
+ }
+
+#if defined(DART_PRECOMPILER)
+ // Returns true if a new WSR would be created when calling Wrap.
+ static bool CanWrap(const Object& object);
+
+ // This returns RawObject*, not RawWeakSerializationReference*, because
+ // target.raw() is returned when CanWrap(target) is false.
+ static RawObject* Wrap(Zone* zone, const Object& target);
+#endif
+
+ private:
+ FINAL_HEAP_OBJECT_IMPLEMENTATION(WeakSerializationReference, Object);
+ friend class Class;
+};
+
class Code : public Object {
public:
// When dual mapping, this returns the executable view.
@@ -6068,13 +6184,17 @@
// everybody use owner(). Currently this function is misused - even
// while generating the snapshot.
RawFunction* function() const {
- return reinterpret_cast<RawFunction*>(raw_ptr()->owner_);
+ ASSERT(IsFunctionCode());
+ return Function::RawCast(
+ WeakSerializationReference::Unwrap(raw_ptr()->owner_));
}
RawObject* owner() const { return raw_ptr()->owner_; }
- void set_owner(const Object& owner) const {
- ASSERT(owner.IsFunction() || owner.IsClass() || owner.IsAbstractType());
- StorePointer(&raw_ptr()->owner_, owner.raw());
+ void set_owner(const Object& owner) const;
+
+ classid_t OwnerClassId() const { return OwnerClassIdOf(raw()); }
+ static classid_t OwnerClassIdOf(RawCode* raw) {
+ return WeakSerializationReference::UnwrappedClassIdOf(raw->ptr()->owner_);
}
static intptr_t owner_offset() { return OFFSET_OF(RawCode, owner_); }
diff --git a/runtime/vm/object_service.cc b/runtime/vm/object_service.cc
index 02058e0..638876c 100644
--- a/runtime/vm/object_service.cc
+++ b/runtime/vm/object_service.cc
@@ -663,6 +663,16 @@
Object::PrintJSONImpl(stream, ref);
}
+void WeakSerializationReference::PrintJSONImpl(JSONStream* stream,
+ bool ref) const {
+ JSONObject jsobj(stream);
+ AddCommonObjectProperties(&jsobj, "Object", ref);
+ jsobj.AddServiceId(*this);
+ if (ref) return;
+ auto& obj = Object::Handle(target());
+ jsobj.AddProperty("target", obj);
+}
+
void ObjectPool::PrintJSONImpl(JSONStream* stream, bool ref) const {
JSONObject jsobj(stream);
AddCommonObjectProperties(&jsobj, "Object", ref);
diff --git a/runtime/vm/profiler_service.cc b/runtime/vm/profiler_service.cc
index 08770d8..7fe9b39 100644
--- a/runtime/vm/profiler_service.cc
+++ b/runtime/vm/profiler_service.cc
@@ -650,6 +650,7 @@
uword dso_offset = start() - dso_base;
Utils::SNPrint(&buff[0], kBuffSize - 1, "[Native] %s+0x%" Px, dso_name,
dso_offset);
+ NativeSymbolResolver::FreeSymbolName(dso_name);
} else {
Utils::SNPrint(&buff[0], kBuffSize - 1, "[Native] %" Px, start());
}
diff --git a/runtime/vm/program_visitor.cc b/runtime/vm/program_visitor.cc
index 1b6305a..d8b80fc 100644
--- a/runtime/vm/program_visitor.cc
+++ b/runtime/vm/program_visitor.cc
@@ -101,72 +101,195 @@
Function& function = Function::Handle(zone);
const GrowableObjectArray& closures = GrowableObjectArray::Handle(
zone, isolate->object_store()->closure_functions());
+ ASSERT(!closures.IsNull());
for (intptr_t i = 0; i < closures.Length(); i++) {
function ^= closures.At(i);
visitor->Visit(function);
ASSERT(!function.HasImplicitClosureFunction());
}
+
+ const auto& global_object_pool = ObjectPool::Handle(
+ zone, isolate->object_store()->global_object_pool());
+ if (!global_object_pool.IsNull()) {
+ auto& object = Object::Handle(zone);
+ for (intptr_t i = 0; i < global_object_pool.Length(); i++) {
+ auto const type = global_object_pool.TypeAt(i);
+ if (type != ObjectPool::EntryType::kTaggedObject) continue;
+ object = global_object_pool.ObjectAt(i);
+ if (!object.IsFunction()) continue;
+ visitor->Visit(Function::Cast(object));
+ }
+ }
+}
+
+class FunctionCodeVisitor : public FunctionVisitor {
+ public:
+ FunctionCodeVisitor(Zone* zone, CodeVisitor* visitor)
+ : visitor_(visitor), code_(Code::Handle(zone)) {}
+
+ void Visit(const Function& function) {
+ if (!function.HasCode()) return;
+ code_ = function.CurrentCode();
+ visitor_->Visit(code_);
+ }
+
+ private:
+ CodeVisitor* const visitor_;
+ Code& code_;
+};
+
+void ProgramVisitor::VisitCode(CodeVisitor* visitor) {
+ Thread* thread = Thread::Current();
+ Isolate* isolate = thread->isolate();
+ Zone* zone = thread->zone();
+
+ FunctionCodeVisitor function_visitor(zone, visitor);
+ VisitFunctions(&function_visitor);
+
+ const auto& dispatch_table_entries = Array::Handle(
+ zone, isolate->object_store()->dispatch_table_code_entries());
+ if (!dispatch_table_entries.IsNull()) {
+ auto& code = Code::Handle(zone);
+ for (intptr_t i = 0; i < dispatch_table_entries.Length(); i++) {
+ code = Code::RawCast(dispatch_table_entries.At(i));
+ if (code.IsNull()) continue;
+ visitor->Visit(code);
+ }
+ }
}
#if !defined(DART_PRECOMPILED_RUNTIME)
-void ProgramVisitor::BindStaticCalls() {
- if (FLAG_precompiled_mode) {
- return;
+// A base class for deduplication of objects. T is the type of canonical objects
+// being stored, whereas S is a trait appropriate for a DirectChainedHashMap
+// based set containing those canonical objects.
+template <typename T, typename S>
+class Dedupper : public ValueObject {
+ public:
+ explicit Dedupper(Zone* zone) : zone_(zone), canonical_objects_(zone) {}
+ virtual ~Dedupper() {}
+
+ void AddVMBaseObjects() {
+ const auto& object_table = Object::vm_isolate_snapshot_object_table();
+ auto& obj = Object::Handle(zone_);
+ for (intptr_t i = 0; i < object_table.Length(); i++) {
+ obj = object_table.At(i);
+ if (!ShouldAdd(obj)) continue;
+ AddCanonical(T::Cast(obj));
+ }
}
- class BindJITStaticCallsVisitor : public FunctionVisitor {
+ protected:
+ // Predicate for objects of type T. Must be overridden for class hierarchies
+ // like Instance and AbstractType, as it defaults to class ID comparison.
+ virtual bool IsCorrectType(const Object& obj) const {
+ return obj.GetClassId() == T::kClassId;
+ }
+
+ // Predicate for choosing Ts to canonicalize.
+ virtual bool CanCanonicalize(const T& t) const { return true; }
+
+ // Predicate for objects that are okay to add to the canonical hash set.
+ // Override IsCorrectType and/or CanCanonicalize to change the behavior.
+ bool ShouldAdd(const Object& obj) const {
+ return !obj.IsNull() && IsCorrectType(obj) && CanCanonicalize(T::Cast(obj));
+ }
+
+ void AddCanonical(const T& obj) {
+ if (!ShouldAdd(obj)) return;
+ ASSERT(!canonical_objects_.HasKey(&obj));
+ canonical_objects_.Insert(&T::ZoneHandle(zone_, obj.raw()));
+ }
+
+ typename T::RawObjectType* Dedup(const T& obj) {
+ if (ShouldAdd(obj)) {
+ if (auto const canonical = canonical_objects_.LookupValue(&obj)) {
+ return canonical->raw();
+ }
+ AddCanonical(obj);
+ }
+ return obj.raw();
+ }
+
+ Zone* const zone_;
+ DirectChainedHashMap<S> canonical_objects_;
+};
+
+void ProgramVisitor::BindStaticCalls() {
+ class BindStaticCallsVisitor : public CodeVisitor {
public:
- explicit BindJITStaticCallsVisitor(Zone* zone)
- : code_(Code::Handle(zone)),
- table_(Array::Handle(zone)),
+ explicit BindStaticCallsVisitor(Zone* zone)
+ : table_(Array::Handle(zone)),
kind_and_offset_(Smi::Handle(zone)),
target_(Object::Handle(zone)),
target_code_(Code::Handle(zone)) {}
- void Visit(const Function& function) {
- if (!function.HasCode()) {
- return;
- }
- code_ = function.CurrentCode();
- table_ = code_.static_calls_target_table();
+ void Visit(const Code& code) {
+ table_ = code.static_calls_target_table();
StaticCallsTable static_calls(table_);
+ // We can only remove the target table in precompiled mode, since more
+ // calls may be added later otherwise.
+ bool only_call_via_code = FLAG_precompiled_mode;
for (const auto& view : static_calls) {
kind_and_offset_ = view.Get<Code::kSCallTableKindAndOffset>();
- Code::CallKind kind = Code::KindField::decode(kind_and_offset_.Value());
+ auto const kind = Code::KindField::decode(kind_and_offset_.Value());
if (kind != Code::kCallViaCode) {
+ ASSERT(!FLAG_precompiled_mode || kind == Code::kPcRelativeCall);
+ only_call_via_code = false;
continue;
}
- int32_t pc_offset = Code::OffsetField::decode(kind_and_offset_.Value());
+
target_ = view.Get<Code::kSCallTableFunctionTarget>();
if (target_.IsNull()) {
target_ = view.Get<Code::kSCallTableCodeTarget>();
ASSERT(!Code::Cast(target_).IsFunctionCode());
// Allocation stub or AllocateContext or AllocateArray or ...
- } else {
- const Function& target_func = Function::Cast(target_);
- if (target_func.HasCode()) {
- target_code_ = target_func.CurrentCode();
- } else {
- target_code_ = StubCode::CallStaticFunction().raw();
- }
- uword pc = pc_offset + code_.PayloadStart();
- CodePatcher::PatchStaticCallAt(pc, code_, target_code_);
+ continue;
}
+
+ auto const pc_offset =
+ Code::OffsetField::decode(kind_and_offset_.Value());
+ const uword pc = pc_offset + code.PayloadStart();
+
+ // In JIT mode, static calls initially call the CallStaticFunction stub
+ // because their target might not be compiled yet. If the target has
+ // been compiled by this point, we patch the call to call the target
+ // directly.
+ //
+ // In precompiled mode, the binder runs after tree shaking, during which
+ // all targets have been compiled, and so the binder replace all static
+ // calls with direct calls to the target.
+ //
+ // Cf. runtime entry PatchStaticCall called from CallStaticFunction
+ // stub.
+ const auto& fun = Function::Cast(target_);
+ ASSERT(!FLAG_precompiled_mode || fun.HasCode());
+ target_code_ = fun.HasCode() ? fun.CurrentCode()
+ : StubCode::CallStaticFunction().raw();
+ CodePatcher::PatchStaticCallAt(pc, code, target_code_);
+ }
+
+ if (only_call_via_code) {
+ ASSERT(FLAG_precompiled_mode);
+ // In precompiled mode, the Dart runtime won't patch static calls
+ // anymore, so drop the static call table to save space.
+ code.set_static_calls_target_table(Object::empty_array());
}
}
private:
- Code& code_;
Array& table_;
Smi& kind_and_offset_;
Object& target_;
Code& target_code_;
};
- BindJITStaticCallsVisitor visitor(Thread::Current()->zone());
- ProgramVisitor::VisitFunctions(&visitor);
+ auto const zone = Thread::Current()->zone();
+ BindStaticCallsVisitor visitor(zone);
+ ProgramVisitor::VisitCode(&visitor);
}
+DECLARE_FLAG(charp, write_v8_snapshot_profile_to);
+
void ProgramVisitor::ShareMegamorphicBuckets() {
Thread* thread = Thread::Current();
Isolate* isolate = thread->isolate();
@@ -301,19 +424,15 @@
typedef DirectChainedHashMap<StackMapEntryKeyIntValueTrait> StackMapEntryIntMap;
-typedef DirectChainedHashMap<PointerKeyValueTrait<const CompressedStackMaps>>
- CompressedStackMapsSet;
-
void ProgramVisitor::NormalizeAndDedupCompressedStackMaps() {
// Walks all the CSMs in Code objects and collects their entry information
// for consolidation.
- class CollectStackMapEntriesVisitor : public FunctionVisitor {
+ class CollectStackMapEntriesVisitor : public CodeVisitor {
public:
CollectStackMapEntriesVisitor(Zone* zone,
const CompressedStackMaps& global_table)
: zone_(zone),
old_global_table_(global_table),
- code_(Code::Handle(zone)),
compressed_stackmaps_(CompressedStackMaps::Handle(zone)),
collected_entries_(zone, 2),
entry_indices_(zone),
@@ -321,10 +440,8 @@
ASSERT(old_global_table_.IsNull() || old_global_table_.IsGlobalTable());
}
- void Visit(const Function& function) {
- if (!function.HasCode()) return;
- code_ = function.CurrentCode();
- compressed_stackmaps_ = code_.compressed_stackmaps();
+ void Visit(const Code& code) {
+ compressed_stackmaps_ = code.compressed_stackmaps();
CompressedStackMapsIterator it(compressed_stackmaps_, old_global_table_);
while (it.MoveNext()) {
it.EnsureFullyLoadedEntry();
@@ -371,7 +488,6 @@
Zone* const zone_;
const CompressedStackMaps& old_global_table_;
- Code& code_;
CompressedStackMaps& compressed_stackmaps_;
GrowableArray<StackMapEntry*> collected_entries_;
StackMapEntryIntMap entry_indices_;
@@ -384,22 +500,37 @@
// new global table created during stack map collection, and non-normalized
// for CSMs that either have inlined entry information or whose entries are
// references to the _old_ global table in the object store, if any.
- class NormalizeAndDedupCompressedStackMapsVisitor : public FunctionVisitor {
+ class NormalizeAndDedupCompressedStackMapsVisitor
+ : public CodeVisitor,
+ public Dedupper<CompressedStackMaps,
+ PointerKeyValueTrait<const CompressedStackMaps>> {
public:
NormalizeAndDedupCompressedStackMapsVisitor(
Zone* zone,
const CompressedStackMaps& global_table,
const StackMapEntryIntMap& entry_offsets)
- : zone_(zone),
+ : Dedupper(zone),
old_global_table_(global_table),
entry_offsets_(entry_offsets),
- canonical_compressed_stackmaps_set_(),
- code_(Code::Handle(zone)),
- compressed_stackmaps_(CompressedStackMaps::Handle(zone)),
- current_normalized_maps_(CompressedStackMaps::Handle(zone)) {
+ maps_(CompressedStackMaps::Handle(zone)) {
ASSERT(old_global_table_.IsNull() || old_global_table_.IsGlobalTable());
}
+ void Visit(const Code& code) {
+ maps_ = code.compressed_stackmaps();
+ if (maps_.IsNull()) return;
+ // First check is to make sure [maps] hasn't already been normalized,
+ // since any normalized map already has a canonical entry in the set.
+ if (auto const canonical = canonical_objects_.LookupValue(&maps_)) {
+ maps_ = canonical->raw();
+ } else {
+ maps_ = NormalizeEntries(maps_);
+ maps_ = Dedup(maps_);
+ }
+ code.set_compressed_stackmaps(maps_);
+ }
+
+ private:
// Creates a normalized CSM from the given non-normalized CSM.
RawCompressedStackMaps* NormalizeEntries(const CompressedStackMaps& maps) {
GrowableArray<uint8_t> new_payload;
@@ -417,45 +548,9 @@
return CompressedStackMaps::NewUsingTable(new_payload);
}
- RawCompressedStackMaps* NormalizeAndDedupCompressedStackMaps(
- const CompressedStackMaps& maps) {
- ASSERT(!maps.IsNull());
- // First check is to make sure [maps] hasn't already been normalized,
- // since any normalized map already has a canonical entry in the set.
- auto canonical_maps =
- canonical_compressed_stackmaps_set_.LookupValue(&maps);
- if (canonical_maps != nullptr) return canonical_maps->raw();
- current_normalized_maps_ = NormalizeEntries(compressed_stackmaps_);
- // Use the canonical entry for the newly normalized CSM, if one exists.
- canonical_maps = canonical_compressed_stackmaps_set_.LookupValue(
- ¤t_normalized_maps_);
- if (canonical_maps != nullptr) return canonical_maps->raw();
- canonical_compressed_stackmaps_set_.Insert(
- &CompressedStackMaps::ZoneHandle(zone_,
- current_normalized_maps_.raw()));
- return current_normalized_maps_.raw();
- }
-
- void Visit(const Function& function) {
- if (!function.HasCode()) return;
- code_ = function.CurrentCode();
- compressed_stackmaps_ = code_.compressed_stackmaps();
- // We represent empty CSMs as the null value, and thus those don't need to
- // be normalized or deduped.
- if (compressed_stackmaps_.IsNull()) return;
- compressed_stackmaps_ =
- NormalizeAndDedupCompressedStackMaps(compressed_stackmaps_);
- code_.set_compressed_stackmaps(compressed_stackmaps_);
- }
-
- private:
- Zone* const zone_;
const CompressedStackMaps& old_global_table_;
const StackMapEntryIntMap& entry_offsets_;
- CompressedStackMapsSet canonical_compressed_stackmaps_set_;
- Code& code_;
- CompressedStackMaps& compressed_stackmaps_;
- CompressedStackMaps& current_normalized_maps_;
+ CompressedStackMaps& maps_;
};
// The stack map deduplication happens in two phases:
@@ -477,7 +572,7 @@
const auto& old_global_table = CompressedStackMaps::Handle(
zone, object_store->canonicalized_stack_map_entries());
CollectStackMapEntriesVisitor collect_visitor(zone, old_global_table);
- ProgramVisitor::VisitFunctions(&collect_visitor);
+ ProgramVisitor::VisitCode(&collect_visitor);
// We retrieve the new offsets for CSM entries by creating the new global
// table now. We go ahead and put it in place, as we already have a handle
@@ -489,7 +584,7 @@
NormalizeAndDedupCompressedStackMapsVisitor dedup_visitor(
zone, old_global_table, entry_offsets);
- ProgramVisitor::VisitFunctions(&dedup_visitor);
+ ProgramVisitor::VisitCode(&dedup_visitor);
}
class PcDescriptorsKeyValueTrait {
@@ -510,74 +605,47 @@
}
};
-typedef DirectChainedHashMap<PcDescriptorsKeyValueTrait> PcDescriptorsSet;
-
void ProgramVisitor::DedupPcDescriptors() {
- class DedupPcDescriptorsVisitor : public FunctionVisitor {
+ class DedupPcDescriptorsVisitor
+ : public CodeVisitor,
+ public Dedupper<PcDescriptors, PcDescriptorsKeyValueTrait>,
+ public FunctionVisitor {
public:
explicit DedupPcDescriptorsVisitor(Zone* zone)
- : zone_(zone),
- canonical_pc_descriptors_(),
+ : Dedupper(zone),
bytecode_(Bytecode::Handle(zone)),
- code_(Code::Handle(zone)),
pc_descriptor_(PcDescriptors::Handle(zone)) {}
- void AddPcDescriptor(const PcDescriptors& pc_descriptor) {
- canonical_pc_descriptors_.Insert(
- &PcDescriptors::ZoneHandle(zone_, pc_descriptor.raw()));
+ void Visit(const Code& code) {
+ pc_descriptor_ = code.pc_descriptors();
+ pc_descriptor_ = Dedup(pc_descriptor_);
+ code.set_pc_descriptors(pc_descriptor_);
}
void Visit(const Function& function) {
bytecode_ = function.bytecode();
- if (!bytecode_.IsNull() && !bytecode_.InVMIsolateHeap()) {
- pc_descriptor_ = bytecode_.pc_descriptors();
- if (!pc_descriptor_.IsNull()) {
- pc_descriptor_ = DedupPcDescriptor(pc_descriptor_);
- bytecode_.set_pc_descriptors(pc_descriptor_);
- }
- }
- if (!function.HasCode()) {
- return;
- }
- code_ = function.CurrentCode();
- pc_descriptor_ = code_.pc_descriptors();
- if (pc_descriptor_.IsNull()) return;
- pc_descriptor_ = DedupPcDescriptor(pc_descriptor_);
- code_.set_pc_descriptors(pc_descriptor_);
- }
-
- RawPcDescriptors* DedupPcDescriptor(const PcDescriptors& pc_descriptor) {
- const PcDescriptors* canonical_pc_descriptor =
- canonical_pc_descriptors_.LookupValue(&pc_descriptor);
- if (canonical_pc_descriptor == NULL) {
- AddPcDescriptor(pc_descriptor);
- return pc_descriptor.raw();
- } else {
- return canonical_pc_descriptor->raw();
- }
+ if (bytecode_.IsNull()) return;
+ if (bytecode_.InVMIsolateHeap()) return;
+ pc_descriptor_ = bytecode_.pc_descriptors();
+ pc_descriptor_ = Dedup(pc_descriptor_);
+ bytecode_.set_pc_descriptors(pc_descriptor_);
}
private:
- Zone* zone_;
- PcDescriptorsSet canonical_pc_descriptors_;
Bytecode& bytecode_;
- Code& code_;
PcDescriptors& pc_descriptor_;
};
- DedupPcDescriptorsVisitor visitor(Thread::Current()->zone());
+ auto const zone = Thread::Current()->zone();
+ DedupPcDescriptorsVisitor visitor(zone);
if (Snapshot::IncludesCode(Dart::vm_snapshot_kind())) {
// Prefer existing objects in the VM isolate.
- const Array& object_table = Object::vm_isolate_snapshot_object_table();
- Object& object = Object::Handle();
- for (intptr_t i = 0; i < object_table.Length(); i++) {
- object = object_table.At(i);
- if (object.IsPcDescriptors()) {
- visitor.AddPcDescriptor(PcDescriptors::Cast(object));
- }
- }
+ visitor.AddVMBaseObjects();
}
+ // The function iteration handles the bytecode only, leaving code-related
+ // work for the code iteration.
ProgramVisitor::VisitFunctions(&visitor);
+ ProgramVisitor::VisitCode(&visitor);
}
class TypedDataKeyValueTrait {
@@ -598,55 +666,41 @@
}
};
-typedef DirectChainedHashMap<TypedDataKeyValueTrait> TypedDataSet;
+class TypedDataDedupper : public Dedupper<TypedData, TypedDataKeyValueTrait> {
+ public:
+ explicit TypedDataDedupper(Zone* zone) : Dedupper(zone) {}
+
+ private:
+ bool IsCorrectType(const Object& obj) const { return obj.IsTypedData(); }
+};
void ProgramVisitor::DedupDeoptEntries() {
- class DedupDeoptEntriesVisitor : public FunctionVisitor {
+ class DedupDeoptEntriesVisitor : public CodeVisitor,
+ public TypedDataDedupper {
public:
explicit DedupDeoptEntriesVisitor(Zone* zone)
- : zone_(zone),
- canonical_deopt_entries_(),
- code_(Code::Handle(zone)),
+ : TypedDataDedupper(zone),
deopt_table_(Array::Handle(zone)),
deopt_entry_(TypedData::Handle(zone)),
offset_(Smi::Handle(zone)),
reason_and_flags_(Smi::Handle(zone)) {}
- void Visit(const Function& function) {
- if (!function.HasCode()) {
- return;
- }
- code_ = function.CurrentCode();
- deopt_table_ = code_.deopt_info_array();
+ void Visit(const Code& code) {
+ deopt_table_ = code.deopt_info_array();
if (deopt_table_.IsNull()) return;
intptr_t length = DeoptTable::GetLength(deopt_table_);
for (intptr_t i = 0; i < length; i++) {
DeoptTable::GetEntry(deopt_table_, i, &offset_, &deopt_entry_,
&reason_and_flags_);
ASSERT(!deopt_entry_.IsNull());
- deopt_entry_ = DedupDeoptEntry(deopt_entry_);
+ deopt_entry_ = Dedup(deopt_entry_);
ASSERT(!deopt_entry_.IsNull());
DeoptTable::SetEntry(deopt_table_, i, offset_, deopt_entry_,
reason_and_flags_);
}
}
- RawTypedData* DedupDeoptEntry(const TypedData& deopt_entry) {
- const TypedData* canonical_deopt_entry =
- canonical_deopt_entries_.LookupValue(&deopt_entry);
- if (canonical_deopt_entry == NULL) {
- canonical_deopt_entries_.Insert(
- &TypedData::ZoneHandle(zone_, deopt_entry.raw()));
- return deopt_entry.raw();
- } else {
- return canonical_deopt_entry->raw();
- }
- }
-
private:
- Zone* zone_;
- TypedDataSet canonical_deopt_entries_;
- Code& code_;
Array& deopt_table_;
TypedData& deopt_entry_;
Smi& offset_;
@@ -654,56 +708,107 @@
};
DedupDeoptEntriesVisitor visitor(Thread::Current()->zone());
- ProgramVisitor::VisitFunctions(&visitor);
+ ProgramVisitor::VisitCode(&visitor);
}
#if defined(DART_PRECOMPILER)
void ProgramVisitor::DedupCatchEntryMovesMaps() {
- if (!FLAG_precompiled_mode) {
- return;
- }
- class DedupCatchEntryMovesMapsVisitor : public FunctionVisitor {
+ class DedupCatchEntryMovesMapsVisitor : public CodeVisitor,
+ public TypedDataDedupper {
public:
explicit DedupCatchEntryMovesMapsVisitor(Zone* zone)
- : zone_(zone),
- canonical_catch_entry_moves_maps_(),
- code_(Code::Handle(zone)),
+ : TypedDataDedupper(zone),
catch_entry_moves_maps_(TypedData::Handle(zone)) {}
- void Visit(const Function& function) {
- if (!function.HasCode()) {
- return;
- }
- code_ = function.CurrentCode();
- catch_entry_moves_maps_ = code_.catch_entry_moves_maps();
- catch_entry_moves_maps_ =
- DedupCatchEntryMovesMaps(catch_entry_moves_maps_);
- code_.set_catch_entry_moves_maps(catch_entry_moves_maps_);
- }
-
- RawTypedData* DedupCatchEntryMovesMaps(
- const TypedData& catch_entry_moves_maps) {
- const TypedData* canonical_catch_entry_moves_maps =
- canonical_catch_entry_moves_maps_.LookupValue(
- &catch_entry_moves_maps);
- if (canonical_catch_entry_moves_maps == NULL) {
- canonical_catch_entry_moves_maps_.Insert(
- &TypedData::ZoneHandle(zone_, catch_entry_moves_maps.raw()));
- return catch_entry_moves_maps.raw();
- } else {
- return canonical_catch_entry_moves_maps->raw();
- }
+ void Visit(const Code& code) {
+ catch_entry_moves_maps_ = code.catch_entry_moves_maps();
+ catch_entry_moves_maps_ = Dedup(catch_entry_moves_maps_);
+ code.set_catch_entry_moves_maps(catch_entry_moves_maps_);
}
private:
- Zone* zone_;
- TypedDataSet canonical_catch_entry_moves_maps_;
- Code& code_;
TypedData& catch_entry_moves_maps_;
};
+ if (!FLAG_precompiled_mode) return;
DedupCatchEntryMovesMapsVisitor visitor(Thread::Current()->zone());
- ProgramVisitor::VisitFunctions(&visitor);
+ ProgramVisitor::VisitCode(&visitor);
+}
+
+class UnlinkedCallKeyValueTrait {
+ public:
+ // Typedefs needed for the DirectChainedHashMap template.
+ typedef const UnlinkedCall* Key;
+ typedef const UnlinkedCall* Value;
+ typedef const UnlinkedCall* Pair;
+
+ static Key KeyOf(Pair kv) { return kv; }
+
+ static Value ValueOf(Pair kv) { return kv; }
+
+ static inline intptr_t Hashcode(Key key) { return key->Hashcode(); }
+
+ static inline bool IsKeyEqual(Pair pair, Key key) {
+ return pair->Equals(*key);
+ }
+};
+
+void ProgramVisitor::DedupUnlinkedCalls() {
+ class DedupUnlinkedCallsVisitor
+ : public CodeVisitor,
+ public Dedupper<UnlinkedCall, UnlinkedCallKeyValueTrait> {
+ public:
+ explicit DedupUnlinkedCallsVisitor(Zone* zone)
+ : Dedupper(zone),
+ entry_(Object::Handle(zone)),
+ pool_(ObjectPool::Handle(zone)) {}
+
+ void DedupPool(const ObjectPool& pool) {
+ if (pool.IsNull()) return;
+ for (intptr_t i = 0; i < pool.Length(); i++) {
+ if (pool.TypeAt(i) != ObjectPool::EntryType::kTaggedObject) {
+ continue;
+ }
+ entry_ = pool.ObjectAt(i);
+ if (!entry_.IsUnlinkedCall()) continue;
+ entry_ = Dedup(UnlinkedCall::Cast(entry_));
+ pool.SetObjectAt(i, entry_);
+ }
+ }
+
+ void Visit(const Code& code) {
+ pool_ = code.object_pool();
+ DedupPool(pool_);
+ }
+
+ private:
+ Object& entry_;
+ ObjectPool& pool_;
+ };
+
+ if (!FLAG_precompiled_mode) return;
+
+ auto const t = Thread::Current();
+ auto Z = t->zone();
+ auto const I = t->isolate();
+
+ DedupUnlinkedCallsVisitor deduper(Z);
+ auto& gop = ObjectPool::Handle(Z, I->object_store()->global_object_pool());
+ ASSERT_EQUAL(gop.IsNull(), !FLAG_use_bare_instructions);
+ if (FLAG_use_bare_instructions) {
+ deduper.DedupPool(gop);
+ }
+
+ // Note: in bare instructions mode we can still have object pools attached
+ // to code objects and these pools need to be deduplicated.
+ // We use these pools to carry information about references between code
+ // objects and other objects in the snapshots (these references are otherwise
+ // implicit and go through global object pool). This information is needed
+ // to produce more informative snapshot profile.
+ if (!FLAG_use_bare_instructions ||
+ FLAG_write_v8_snapshot_profile_to != nullptr) {
+ VisitCode(&deduper);
+ }
}
#endif // !defined(DART_PRECOMPILER)
@@ -718,71 +823,42 @@
static Value ValueOf(Pair kv) { return kv; }
- static inline intptr_t Hashcode(Key key) { return key->Length(); }
+ static inline intptr_t Hashcode(Key key) {
+ ASSERT(!key->IsNull());
+ return key->Length();
+ }
static inline bool IsKeyEqual(Pair pair, Key key) {
+ ASSERT(!pair->IsNull() && !key->IsNull());
return pair->Equals(*key);
}
};
-typedef DirectChainedHashMap<CodeSourceMapKeyValueTrait> CodeSourceMapSet;
-
void ProgramVisitor::DedupCodeSourceMaps() {
- class DedupCodeSourceMapsVisitor : public FunctionVisitor {
+ class DedupCodeSourceMapsVisitor
+ : public CodeVisitor,
+ public Dedupper<CodeSourceMap, CodeSourceMapKeyValueTrait> {
public:
explicit DedupCodeSourceMapsVisitor(Zone* zone)
- : zone_(zone),
- canonical_code_source_maps_(),
- code_(Code::Handle(zone)),
- code_source_map_(CodeSourceMap::Handle(zone)) {}
+ : Dedupper(zone), code_source_map_(CodeSourceMap::Handle(zone)) {}
- void AddCodeSourceMap(const CodeSourceMap& code_source_map) {
- canonical_code_source_maps_.Insert(
- &CodeSourceMap::ZoneHandle(zone_, code_source_map.raw()));
- }
-
- void Visit(const Function& function) {
- if (!function.HasCode()) {
- return;
- }
- code_ = function.CurrentCode();
- code_source_map_ = code_.code_source_map();
- ASSERT(!code_source_map_.IsNull());
- code_source_map_ = DedupCodeSourceMap(code_source_map_);
- code_.set_code_source_map(code_source_map_);
- }
-
- RawCodeSourceMap* DedupCodeSourceMap(const CodeSourceMap& code_source_map) {
- const CodeSourceMap* canonical_code_source_map =
- canonical_code_source_maps_.LookupValue(&code_source_map);
- if (canonical_code_source_map == NULL) {
- AddCodeSourceMap(code_source_map);
- return code_source_map.raw();
- } else {
- return canonical_code_source_map->raw();
- }
+ void Visit(const Code& code) {
+ code_source_map_ = code.code_source_map();
+ code_source_map_ = Dedup(code_source_map_);
+ code.set_code_source_map(code_source_map_);
}
private:
- Zone* zone_;
- CodeSourceMapSet canonical_code_source_maps_;
- Code& code_;
CodeSourceMap& code_source_map_;
};
- DedupCodeSourceMapsVisitor visitor(Thread::Current()->zone());
+ auto const zone = Thread::Current()->zone();
+ DedupCodeSourceMapsVisitor visitor(zone);
if (Snapshot::IncludesCode(Dart::vm_snapshot_kind())) {
// Prefer existing objects in the VM isolate.
- const Array& object_table = Object::vm_isolate_snapshot_object_table();
- Object& object = Object::Handle();
- for (intptr_t i = 0; i < object_table.Length(); i++) {
- object = object_table.At(i);
- if (object.IsCodeSourceMap()) {
- visitor.AddCodeSourceMap(CodeSourceMap::Cast(object));
- }
- }
+ visitor.AddVMBaseObjects();
}
- ProgramVisitor::VisitFunctions(&visitor);
+ ProgramVisitor::VisitCode(&visitor);
}
class ArrayKeyValueTrait {
@@ -796,113 +872,98 @@
static Value ValueOf(Pair kv) { return kv; }
- static inline intptr_t Hashcode(Key key) { return key->Length(); }
+ static inline intptr_t Hashcode(Key key) {
+ ASSERT(!key->IsNull());
+ return key->Length();
+ }
static inline bool IsKeyEqual(Pair pair, Key key) {
- if (pair->Length() != key->Length()) {
- return false;
- }
+ ASSERT(!pair->IsNull() && !key->IsNull());
+ if (pair->Length() != key->Length()) return false;
for (intptr_t i = 0; i < pair->Length(); i++) {
- if (pair->At(i) != key->At(i)) {
- return false;
- }
+ if (pair->At(i) != key->At(i)) return false;
}
return true;
}
};
-typedef DirectChainedHashMap<ArrayKeyValueTrait> ArraySet;
-
void ProgramVisitor::DedupLists() {
- class DedupListsVisitor : public FunctionVisitor {
+ class DedupListsVisitor : public CodeVisitor,
+ public Dedupper<Array, ArrayKeyValueTrait>,
+ public FunctionVisitor {
public:
explicit DedupListsVisitor(Zone* zone)
- : zone_(zone),
- canonical_lists_(),
- code_(Code::Handle(zone)),
- list_(Array::Handle(zone)) {}
+ : Dedupper(zone),
+ list_(Array::Handle(zone)),
+ function_(Function::Handle(zone)) {}
- void Visit(const Function& function) {
- code_ = function.CurrentCode();
- if (!code_.IsNull()) {
- list_ = code_.inlined_id_to_function();
- if (!list_.IsNull()) {
- list_ = DedupList(list_);
- code_.set_inlined_id_to_function(list_);
- }
- list_ = code_.deopt_info_array();
- if (!list_.IsNull()) {
- list_ = DedupList(list_);
- code_.set_deopt_info_array(list_);
- }
- list_ = code_.static_calls_target_table();
- if (!list_.IsNull()) {
- list_ = DedupList(list_);
- code_.set_static_calls_target_table(list_);
- }
- }
+ void Visit(const Code& code) {
+ list_ = code.inlined_id_to_function();
+ list_ = Dedup(list_);
+ code.set_inlined_id_to_function(list_);
- list_ = function.parameter_types();
- if (!list_.IsNull()) {
- // Preserve parameter types in the JIT. Needed in case of recompilation
- // in checked mode, or if available to mirrors, or for copied types to
- // lazily generated tear offs.
- if (FLAG_precompiled_mode) {
- if (!function.IsSignatureFunction() &&
- !function.IsClosureFunction() &&
- (function.name() != Symbols::Call().raw()) &&
- !list_.InVMIsolateHeap()) {
- // Parameter types not needed for function type tests.
- for (intptr_t i = 0; i < list_.Length(); i++) {
- list_.SetAt(i, Object::dynamic_type());
- }
- }
- }
- list_ = DedupList(list_);
- function.set_parameter_types(list_);
- }
+ list_ = code.deopt_info_array();
+ list_ = Dedup(list_);
+ code.set_deopt_info_array(list_);
- list_ = function.parameter_names();
- if (!list_.IsNull()) {
- // Preserve parameter names in case of recompilation for the JIT.
- if (FLAG_precompiled_mode) {
- if (!function.HasOptionalNamedParameters() &&
- !list_.InVMIsolateHeap()) {
- // Parameter names not needed for resolution.
- ASSERT(list_.Length() == function.NumParameters());
- for (intptr_t i = 0; i < list_.Length(); i++) {
- list_.SetAt(i, Symbols::OptimizedOut());
- }
- }
- }
- list_ = DedupList(list_);
- function.set_parameter_names(list_);
- }
+ list_ = code.static_calls_target_table();
+ list_ = Dedup(list_);
+ code.set_static_calls_target_table(list_);
}
- RawArray* DedupList(const Array& list) {
- if (list.InVMIsolateHeap()) {
- // Avoid using read-only VM objects for de-duplication.
- return list.raw();
- }
- const Array* canonical_list = canonical_lists_.LookupValue(&list);
- if (canonical_list == NULL) {
- canonical_lists_.Insert(&Array::ZoneHandle(zone_, list.raw()));
- return list.raw();
- } else {
- return canonical_list->raw();
- }
+ void Visit(const Function& function) {
+ list_ = PrepareParameterTypes(function);
+ list_ = Dedup(list_);
+ function.set_parameter_types(list_);
+
+ list_ = PrepareParameterNames(function);
+ list_ = Dedup(list_);
+ function.set_parameter_names(list_);
}
private:
- Zone* zone_;
- ArraySet canonical_lists_;
- Code& code_;
+ bool IsCorrectType(const Object& obj) const { return obj.IsArray(); }
+
+ RawArray* PrepareParameterTypes(const Function& function) {
+ list_ = function.parameter_types();
+ // Preserve parameter types in the JIT. Needed in case of recompilation
+ // in checked mode, or if available to mirrors, or for copied types to
+ // lazily generated tear offs. Also avoid attempting to change read-only
+ // VM objects for de-duplication.
+ if (FLAG_precompiled_mode && !list_.IsNull() &&
+ !list_.InVMIsolateHeap() && !function.IsSignatureFunction() &&
+ !function.IsClosureFunction() && !function.IsFfiTrampoline() &&
+ function.name() != Symbols::Call().raw()) {
+ // Parameter types not needed for function type tests.
+ for (intptr_t i = 0; i < list_.Length(); i++) {
+ list_.SetAt(i, Object::dynamic_type());
+ }
+ }
+ return list_.raw();
+ }
+
+ RawArray* PrepareParameterNames(const Function& function) {
+ list_ = function.parameter_names();
+ // Preserve parameter names in case of recompilation for the JIT. Also
+ // avoid attempting to change read-only VM objects for de-duplication.
+ if (FLAG_precompiled_mode && !list_.IsNull() &&
+ !list_.InVMIsolateHeap() && !function.HasOptionalNamedParameters()) {
+ // Parameter names not needed for resolution.
+ ASSERT(list_.Length() == function.NumParameters());
+ for (intptr_t i = 0; i < list_.Length(); i++) {
+ list_.SetAt(i, Symbols::OptimizedOut());
+ }
+ }
+ return list_.raw();
+ }
+
Array& list_;
+ Function& function_;
};
DedupListsVisitor visitor(Thread::Current()->zone());
ProgramVisitor::VisitFunctions(&visitor);
+ ProgramVisitor::VisitCode(&visitor);
}
// Traits for comparing two [Instructions] objects for equality, which is
@@ -929,8 +990,6 @@
}
};
-typedef DirectChainedHashMap<InstructionsKeyValueTrait> InstructionsSet;
-
// Traits for comparing two [Code] objects for equality.
//
// The instruction deduplication naturally causes us to have a one-to-many
@@ -987,56 +1046,39 @@
return Instructions::Equals(pair->instructions(), key->instructions());
}
};
-
-typedef DirectChainedHashMap<CodeKeyValueTrait> CodeSet;
#endif // defined(DART_PRECOMPILER)
void ProgramVisitor::DedupInstructions() {
- class DedupInstructionsVisitor : public FunctionVisitor,
- public ObjectVisitor {
+ class DedupInstructionsVisitor
+ : public CodeVisitor,
+ public Dedupper<Instructions, InstructionsKeyValueTrait>,
+ public ObjectVisitor {
public:
explicit DedupInstructionsVisitor(Zone* zone)
- : zone_(zone),
- canonical_instructions_set_(),
- code_(Code::Handle(zone)),
+ : Dedupper(zone),
+ function_(Function::Handle(zone)),
instructions_(Instructions::Handle(zone)) {}
void VisitObject(RawObject* obj) {
- if (obj->IsInstructions()) {
- canonical_instructions_set_.Insert(
- &Instructions::ZoneHandle(zone_, Instructions::RawCast(obj)));
- }
+ if (!obj->IsInstructions()) return;
+ instructions_ = Instructions::RawCast(obj);
+ AddCanonical(instructions_);
}
- void Visit(const Function& function) {
- if (!function.HasCode()) {
- return;
- }
- code_ = function.CurrentCode();
- instructions_ = code_.instructions();
- instructions_ = DedupOneInstructions(instructions_);
- code_.SetActiveInstructions(instructions_,
- code_.UncheckedEntryPointOffset());
- code_.set_instructions(instructions_);
- function.SetInstructions(code_); // Update cached entry point.
- }
-
- RawInstructions* DedupOneInstructions(const Instructions& instructions) {
- const Instructions* canonical_instructions =
- canonical_instructions_set_.LookupValue(&instructions);
- if (canonical_instructions == NULL) {
- canonical_instructions_set_.Insert(
- &Instructions::ZoneHandle(zone_, instructions.raw()));
- return instructions.raw();
- } else {
- return canonical_instructions->raw();
- }
+ void Visit(const Code& code) {
+ instructions_ = code.instructions();
+ instructions_ = Dedup(instructions_);
+ code.SetActiveInstructions(instructions_,
+ code.UncheckedEntryPointOffset());
+ code.set_instructions(instructions_);
+ if (!code.IsFunctionCode()) return;
+ function_ = code.function();
+ if (function_.IsNull()) return;
+ function_.SetInstructions(code); // Update cached entry point.
}
private:
- Zone* zone_;
- InstructionsSet canonical_instructions_set_;
- Code& code_;
+ Function& function_;
Instructions& instructions_;
};
@@ -1045,60 +1087,51 @@
// Prefer existing objects in the VM isolate.
Dart::vm_isolate()->heap()->VisitObjectsImagePages(&visitor);
}
- ProgramVisitor::VisitFunctions(&visitor);
+ ProgramVisitor::VisitCode(&visitor);
}
void ProgramVisitor::DedupInstructionsWithSameMetadata() {
#if defined(DART_PRECOMPILER)
- class DedupInstructionsWithSameMetadataVisitor : public FunctionVisitor,
- public ObjectVisitor {
+ class DedupInstructionsWithSameMetadataVisitor
+ : public CodeVisitor,
+ public Dedupper<Code, CodeKeyValueTrait>,
+ public ObjectVisitor {
public:
explicit DedupInstructionsWithSameMetadataVisitor(Zone* zone)
- : zone_(zone),
- canonical_set_(),
- code_(Code::Handle(zone)),
+ : Dedupper(zone),
+ canonical_(Code::Handle(zone)),
+ function_(Function::Handle(zone)),
instructions_(Instructions::Handle(zone)) {}
void VisitObject(RawObject* obj) {
- if (obj->IsCode()) {
- const auto code = Code::RawCast(obj);
- if (Code::IsDisabled(code)) return;
- canonical_set_.Insert(&Code::ZoneHandle(zone_, code));
- }
+ if (!obj->IsCode()) return;
+ canonical_ = Code::RawCast(obj);
+ AddCanonical(canonical_);
}
- void Visit(const Function& function) {
- if (!function.HasCode() || Code::IsDisabled(function.CurrentCode())) {
- return;
- }
- code_ = function.CurrentCode();
- instructions_ = DedupOneInstructions(function, code_);
- code_.SetActiveInstructions(instructions_,
- code_.UncheckedEntryPointOffset());
- code_.set_instructions(instructions_);
- function.SetInstructions(code_); // Update cached entry point.
- }
-
- RawInstructions* DedupOneInstructions(const Function& function,
- const Code& code) {
- const Code* canonical = canonical_set_.LookupValue(&code);
- if (canonical == nullptr) {
- canonical_set_.Insert(&Code::ZoneHandle(zone_, code.raw()));
- return code.instructions();
- } else {
- return canonical->instructions();
- }
+ void Visit(const Code& code) {
+ if (code.IsDisabled()) return;
+ canonical_ = Dedup(code);
+ instructions_ = canonical_.instructions();
+ code.SetActiveInstructions(instructions_,
+ code.UncheckedEntryPointOffset());
+ code.set_instructions(instructions_);
+ if (!code.IsFunctionCode()) return;
+ function_ = code.function();
+ if (function_.IsNull()) return;
+ function_.SetInstructions(code); // Update cached entry point.
}
private:
- Zone* zone_;
- CodeSet canonical_set_;
- Code& code_;
+ bool CanCanonicalize(const Code& code) const { return !code.IsDisabled(); }
+
+ Code& canonical_;
+ Function& function_;
Instructions& instructions_;
};
DedupInstructionsWithSameMetadataVisitor visitor(Thread::Current()->zone());
- ProgramVisitor::VisitFunctions(&visitor);
+ ProgramVisitor::VisitCode(&visitor);
#endif // defined(DART_PRECOMPILER)
}
#endif // !defined(DART_PRECOMPILED_RUNTIME)
@@ -1116,6 +1149,7 @@
NOT_IN_PRECOMPILED(DedupDeoptEntries());
#if defined(DART_PRECOMPILER)
DedupCatchEntryMovesMaps();
+ DedupUnlinkedCalls();
#endif
DedupCodeSourceMaps();
DedupLists();
diff --git a/runtime/vm/program_visitor.h b/runtime/vm/program_visitor.h
index e66f6a6..7c7cf0e 100644
--- a/runtime/vm/program_visitor.h
+++ b/runtime/vm/program_visitor.h
@@ -9,8 +9,9 @@
namespace dart {
-class Function;
class Class;
+class Code;
+class Function;
template <typename T>
class Visitor : public ValueObject {
@@ -19,11 +20,19 @@
virtual void Visit(const T& obj) = 0;
};
-typedef Visitor<Function> FunctionVisitor;
-typedef Visitor<Class> ClassVisitor;
+using ClassVisitor = Visitor<Class>;
+using CodeVisitor = Visitor<Code>;
+using FunctionVisitor = Visitor<Function>;
class ProgramVisitor : public AllStatic {
public:
+ // Currently visits the following code objects:
+ // * Code objects for functions (visited via VisitFunctions) where HasCode()
+ // is true.
+ // * Code objects for entries in the dispatch table (if applicable).
+ //
+ // Notably, it does not visit any stubs not reachable via these routes.
+ static void VisitCode(CodeVisitor* visitor);
static void VisitFunctions(FunctionVisitor* visitor);
static void VisitClasses(ClassVisitor* visitor);
@@ -38,6 +47,7 @@
static void DedupDeoptEntries();
#if defined(DART_PRECOMPILER)
static void DedupCatchEntryMovesMaps();
+ static void DedupUnlinkedCalls();
#endif
static void DedupCodeSourceMaps();
static void DedupLists();
diff --git a/runtime/vm/raw_object.cc b/runtime/vm/raw_object.cc
index 9cf9ab3..2519af7 100644
--- a/runtime/vm/raw_object.cc
+++ b/runtime/vm/raw_object.cc
@@ -222,6 +222,10 @@
instance_size = element->HeapSize();
break;
}
+ case kWeakSerializationReferenceCid: {
+ instance_size = WeakSerializationReference::InstanceSize();
+ break;
+ }
default: {
// Get the (constant) instance size out of the class object.
// TODO(koda): Add Size(ClassTable*) interface to allow caching in loops.
@@ -579,6 +583,11 @@
UNREACHABLE_VISITOR(FutureOr)
// Smi has no heap representation.
UNREACHABLE_VISITOR(Smi)
+#if defined(DART_PRECOMPILED_RUNTIME)
+NULL_VISITOR(WeakSerializationReference)
+#else
+REGULAR_VISITOR(WeakSerializationReference)
+#endif
bool RawCode::ContainsPC(const RawObject* raw_obj, uword pc) {
if (!raw_obj->IsCode()) return false;
diff --git a/runtime/vm/raw_object.h b/runtime/vm/raw_object.h
index 6bcd99f..10566c2 100644
--- a/runtime/vm/raw_object.h
+++ b/runtime/vm/raw_object.h
@@ -1471,6 +1471,19 @@
}
};
+class RawWeakSerializationReference : public RawObject {
+ RAW_HEAP_OBJECT_IMPLEMENTATION(WeakSerializationReference);
+
+#if defined(DART_PRECOMPILED_RUNTIME)
+ VISIT_NOTHING();
+ classid_t cid_;
+#else
+ VISIT_FROM(RawObject*, target_);
+ RawObject* target_;
+ VISIT_TO(RawObject*, target_);
+#endif
+};
+
class RawCode : public RawObject {
RAW_HEAP_OBJECT_IMPLEMENTATION(Code);
diff --git a/runtime/vm/raw_object_fields.cc b/runtime/vm/raw_object_fields.cc
index 0576ad0..f68c4a2 100644
--- a/runtime/vm/raw_object_fields.cc
+++ b/runtime/vm/raw_object_fields.cc
@@ -206,7 +206,7 @@
F(TypedDataView, offset_in_bytes_) \
F(FutureOr, type_arguments_)
-#define AOT_CLASSES_AND_FIELDS(F)
+#define AOT_CLASSES_AND_FIELDS(F) F(WeakSerializationReference, cid_)
#define JIT_CLASSES_AND_FIELDS(F) \
F(Code, active_instructions_) \
@@ -216,7 +216,8 @@
F(Function, bytecode_) \
F(Function, unoptimized_code_) \
F(Field, saved_initial_value_) \
- F(Field, type_test_cache_)
+ F(Field, type_test_cache_) \
+ F(WeakSerializationReference, target_)
OffsetsTable::OffsetsTable(Zone* zone) : cached_offsets_(zone) {
for (intptr_t i = 0; offsets_table[i].class_id != -1; ++i) {
diff --git a/runtime/vm/raw_object_snapshot.cc b/runtime/vm/raw_object_snapshot.cc
index df261cd..0f2d0c8 100644
--- a/runtime/vm/raw_object_snapshot.cc
+++ b/runtime/vm/raw_object_snapshot.cc
@@ -563,6 +563,7 @@
MESSAGE_SNAPSHOT_UNREACHABLE(MonomorphicSmiableCall);
MESSAGE_SNAPSHOT_UNREACHABLE(UnwindError);
MESSAGE_SNAPSHOT_UNREACHABLE(FutureOr);
+MESSAGE_SNAPSHOT_UNREACHABLE(WeakSerializationReference);
MESSAGE_SNAPSHOT_ILLEGAL(DynamicLibrary);
MESSAGE_SNAPSHOT_ILLEGAL(MirrorReference);
diff --git a/runtime/vm/snapshot.h b/runtime/vm/snapshot.h
index e38f4bf..b890b0b 100644
--- a/runtime/vm/snapshot.h
+++ b/runtime/vm/snapshot.h
@@ -456,6 +456,7 @@
friend class TypeRef;
friend class UnhandledException;
friend class WeakProperty;
+ friend class WeakSerializationReference;
DISALLOW_COPY_AND_ASSIGN(SnapshotReader);
};
@@ -740,6 +741,7 @@
friend class RawTypeRef;
friend class RawTypedDataView;
friend class RawUserTag;
+ friend class RawWeakSerializationReference;
friend class SnapshotWriterVisitor;
friend class WriteInlinedObjectVisitor;
DISALLOW_COPY_AND_ASSIGN(SnapshotWriter);
diff --git a/runtime/vm/stack_frame.cc b/runtime/vm/stack_frame.cc
index 9527073..a795a0c 100644
--- a/runtime/vm/stack_frame.cc
+++ b/runtime/vm/stack_frame.cc
@@ -138,7 +138,7 @@
auto rct = isolate->reverse_pc_lookup_cache();
code = rct->Lookup(pc(), /*is_return_address=*/true);
- const intptr_t cid = code.owner()->GetClassId();
+ auto const cid = code.OwnerClassId();
ASSERT(cid == kNullCid || cid == kClassCid || cid == kFunctionCid);
return cid == kFunctionCid;
}
@@ -153,7 +153,7 @@
auto rct = isolate->reverse_pc_lookup_cache();
code = rct->Lookup(pc(), /*is_return_address=*/true);
- const intptr_t cid = code.owner()->GetClassId();
+ auto const cid = code.OwnerClassId();
ASSERT(cid == kNullCid || cid == kClassCid || cid == kFunctionCid);
return cid == kNullCid || cid == kClassCid;
}
@@ -178,7 +178,7 @@
RawCode* code = GetCodeObject(needed_for_gc);
ASSERT(code != Object::null());
- const intptr_t cid = code->ptr()->owner_->GetClassId();
+ auto const cid = Code::OwnerClassIdOf(code);
ASSERT(cid == kNullCid || cid == kClassCid || cid == kFunctionCid);
return cid == kNullCid || cid == kClassCid;
}
@@ -198,19 +198,16 @@
}
const Code& code = Code::Handle(zone, LookupDartCode());
ASSERT(!code.IsNull());
- const Object& owner = Object::Handle(zone, code.owner());
+ const auto& owner = Object::Handle(
+ zone, WeakSerializationReference::UnwrapIfTarget(code.owner()));
ASSERT(!owner.IsNull());
- if (owner.IsFunction()) {
- const char* opt = code.is_optimized() ? "*" : "";
- const Function& function = Function::Cast(owner);
- return zone->PrintToString(
- "[%-8s : sp(%#" Px ") fp(%#" Px ") pc(%#" Px ") %s%s ]", GetName(),
- sp(), fp(), pc(), opt, function.ToFullyQualifiedCString());
- } else {
- return zone->PrintToString(
- "[%-8s : sp(%#" Px ") fp(%#" Px ") pc(%#" Px ") %s ]", GetName(),
- sp(), fp(), pc(), owner.ToCString());
- }
+ auto const opt = code.IsFunctionCode() && code.is_optimized() ? "*" : "";
+ auto const owner_name =
+ owner.IsFunction() ? Function::Cast(owner).ToFullyQualifiedCString()
+ : owner.ToCString();
+ return zone->PrintToString("[%-8s : sp(%#" Px ") fp(%#" Px ") pc(%#" Px
+ ") %s%s ]",
+ GetName(), sp(), fp(), pc(), opt, owner_name);
} else {
return zone->PrintToString("[%-8s : sp(%#" Px ") fp(%#" Px ") pc(%#" Px
")]",
@@ -411,8 +408,7 @@
}
RawCode* code = GetCodeObject();
- if ((code != Code::null()) &&
- (code->ptr()->owner_->GetClassId() == kFunctionCid)) {
+ if ((code != Code::null()) && Code::OwnerClassIdOf(code) == kFunctionCid) {
return code;
}
return Code::null();
diff --git a/runtime/vm/stack_trace.cc b/runtime/vm/stack_trace.cc
index 837817b..7643a8c 100644
--- a/runtime/vm/stack_trace.cc
+++ b/runtime/vm/stack_trace.cc
@@ -413,7 +413,8 @@
// Either continue the loop (sync-async case) or find all await'ers and
// return.
- if (function.IsAsyncClosure() || function.IsAsyncGenClosure()) {
+ if (!function.IsNull() &&
+ (function.IsAsyncClosure() || function.IsAsyncGenClosure())) {
if (has_async != nullptr) {
*has_async = true;
}
@@ -509,13 +510,11 @@
if (frame->is_interpreted()) {
bytecode = frame->LookupDartBytecode();
function = bytecode.function();
- if (function.IsNull()) {
- continue;
- }
} else {
code = frame->LookupDartCode();
function = code.function();
}
+ if (function.IsNull()) continue;
if (sync_async_gap_frames > 0) {
function_name = function.QualifiedScrubbedName();
if (!CheckAndSkipAsync(&sync_async_gap_frames, function_name)) {
diff --git a/runtime/vm/stack_trace.h b/runtime/vm/stack_trace.h
index d40784a..56743e3 100644
--- a/runtime/vm/stack_trace.h
+++ b/runtime/vm/stack_trace.h
@@ -90,10 +90,15 @@
static bool CheckAndSkipAsync(int* skip_sync_async_frames_count,
const String& function_name) {
ASSERT(*skip_sync_async_frames_count > 0);
+ // Make sure any function objects for methods used here are marked for
+ // retention by the precompiler, even if otherwise not needed at runtime.
+ //
+ // _AsyncAwaitCompleter.start is marked with the vm:entry-point pragma.
if (function_name.Equals(Symbols::_AsyncAwaitCompleterStart())) {
*skip_sync_async_frames_count = 0;
return true;
}
+ // _Closure.call is explicitly checked in Precompiler::MustRetainFunction.
if (function_name.Equals(Symbols::_ClosureCall()) &&
*skip_sync_async_frames_count == 2) {
(*skip_sync_async_frames_count)--;
diff --git a/runtime/vm/thread_interrupter.h b/runtime/vm/thread_interrupter.h
index 65706da..954a174 100644
--- a/runtime/vm/thread_interrupter.h
+++ b/runtime/vm/thread_interrupter.h
@@ -48,7 +48,7 @@
}
new_value = old_value + 1;
} while (!sample_buffer_lock_.compare_exchange_weak(
- old_value, new_value, std::memory_order_relaxed));
+ old_value, new_value, std::memory_order_acquire));
entered_lock_ = true;
}
@@ -138,7 +138,7 @@
ASSERT(old_value < 0);
new_value = old_value + 1;
} while (!sample_buffer_lock_.compare_exchange_weak(
- old_value, new_value, std::memory_order_relaxed));
+ old_value, new_value, std::memory_order_release));
}
friend class ThreadInterrupterVisitIsolates;
diff --git a/sdk/lib/_http/http_headers.dart b/sdk/lib/_http/http_headers.dart
index e271935..23cd58e 100644
--- a/sdk/lib/_http/http_headers.dart
+++ b/sdk/lib/_http/http_headers.dart
@@ -824,6 +824,7 @@
_value = parseValue();
skipWS();
if (done()) return;
+ if (s[index] == valueSeparator) return;
maybeExpect(parameterSeparator);
parseParameters();
}
diff --git a/sdk/lib/_http/http_impl.dart b/sdk/lib/_http/http_impl.dart
index 761c12e..7101ca9 100644
--- a/sdk/lib/_http/http_impl.dart
+++ b/sdk/lib/_http/http_impl.dart
@@ -1748,6 +1748,10 @@
_currentUri = uri;
// Start with pausing the parser.
_subscription.pause();
+ if (method == "CONNECT") {
+ // Parser will ignore Content-Length or Transfer-Encoding header
+ _httpParser.connectMethod = true;
+ }
_ProxyCredentials proxyCreds; // Credentials used to authorize proxy.
_SiteCredentials creds; // Credentials used to authorize this request.
var outgoing = new _HttpOutgoing(_socket);
diff --git a/sdk/lib/_http/http_parser.dart b/sdk/lib/_http/http_parser.dart
index 6153ffa..74582d7 100644
--- a/sdk/lib/_http/http_parser.dart
+++ b/sdk/lib/_http/http_parser.dart
@@ -262,6 +262,7 @@
int _remainingContent = -1;
bool _contentLength = false;
bool _transferEncoding = false;
+ bool connectMethod = false;
_HttpHeaders _headers;
@@ -340,6 +341,19 @@
// parsing and return. This will be in case of either an upgrade
// request or a request or response with an empty body.
bool _headersEnd() {
+ // If method is CONNECT, response parser should ignore any Content-Length or
+ // Transfer-Encoding header fields in a successful response.
+ // [RFC 7231](https://tools.ietf.org/html/rfc7231#section-4.3.6)
+ if (!_requestParser &&
+ _statusCode >= 200 &&
+ _statusCode < 300 &&
+ connectMethod) {
+ _transferLength = -1;
+ _headers.chunkedTransferEncoding = false;
+ _chunked = false;
+ _headers.removeAll(HttpHeaders.contentLengthHeader);
+ _headers.removeAll(HttpHeaders.transferEncodingHeader);
+ }
_headers._mutable = false;
_transferLength = _headers.contentLength;
diff --git a/sdk/lib/_internal/js_dev_runtime/private/js_array.dart b/sdk/lib/_internal/js_dev_runtime/private/js_array.dart
index 2d33e74..913053b 100644
--- a/sdk/lib/_internal/js_dev_runtime/private/js_array.dart
+++ b/sdk/lib/_internal/js_dev_runtime/private/js_array.dart
@@ -158,7 +158,7 @@
for (int i = 0; i < end; i++) {
// TODO(22407): Improve bounds check elimination to allow this JS code to
// be replaced by indexing.
- E element = JS('-dynamic', '#[#]', this, i);
+ var element = JS<E>('', '#[#]', this, i);
// !test() ensures bool conversion in checked mode.
if (!test(element) == removeMatching) {
retained.add(element);
@@ -201,7 +201,7 @@
for (int i = 0; i < end; i++) {
// TODO(22407): Improve bounds check elimination to allow this JS code to
// be replaced by indexing.
- var/*=E*/ element = JS('', '#[#]', this, i);
+ var element = JS<E>('', '#[#]', this, i);
f(element);
if (this.length != end) throw ConcurrentModificationError(this);
}
@@ -243,7 +243,7 @@
for (int i = 1; i < length; i++) {
// TODO(22407): Improve bounds check elimination to allow this JS code to
// be replaced by indexing.
- var/*=E*/ element = JS('', '#[#]', this, i);
+ var element = JS<E>('', '#[#]', this, i);
value = combine(value, element);
if (length != this.length) throw ConcurrentModificationError(this);
}
@@ -256,7 +256,7 @@
for (int i = 0; i < length; i++) {
// TODO(22407): Improve bounds check elimination to allow this JS code to
// be replaced by indexing.
- var/*=E*/ element = JS('', '#[#]', this, i);
+ var element = JS<E>('', '#[#]', this, i);
value = combine(value, element);
if (this.length != length) throw ConcurrentModificationError(this);
}
@@ -268,7 +268,7 @@
for (int i = 0; i < end; ++i) {
// TODO(22407): Improve bounds check elimination to allow this JS code to
// be replaced by indexing.
- var/*=E*/ element = JS('', '#[#]', this, i);
+ var element = JS<E>('', '#[#]', this, i);
if (test(element)) return element;
if (this.length != end) throw ConcurrentModificationError(this);
}
@@ -281,7 +281,7 @@
for (int i = length - 1; i >= 0; i--) {
// TODO(22407): Improve bounds check elimination to allow this JS code to
// be replaced by indexing.
- var/*=E*/ element = JS('', '#[#]', this, i);
+ var element = JS<E>('', '#[#]', this, i);
if (test(element)) return element;
if (length != this.length) {
throw ConcurrentModificationError(this);
@@ -298,7 +298,7 @@
for (int i = 0; i < length; i++) {
// TODO(22407): Improve bounds check elimination to allow this JS code to
// be replaced by indexing.
- E element = JS('-dynamic', '#[#]', this, i);
+ var element = JS<E>('', '#[#]', this, i);
if (test(element)) {
if (matchFound) {
throw IterableElementError.tooMany();
@@ -394,12 +394,12 @@
// Use JS to avoid bounds check (the bounds check elimination
// optimzation is too weak). The 'E' type annotation is a store type
// check - we can't rely on iterable, it could be List<dynamic>.
- E element = otherList[otherStart + i];
+ var element = otherList[otherStart + i];
JS('', '#[#] = #', this, start + i, element);
}
} else {
for (int i = 0; i < length; i++) {
- E element = otherList[otherStart + i];
+ var element = otherList[otherStart + i];
JS('', '#[#] = #', this, start + i, element);
}
}
@@ -448,7 +448,7 @@
for (int i = 0; i < end; i++) {
// TODO(22407): Improve bounds check elimination to allow this JS code to
// be replaced by indexing.
- var/*=E*/ element = JS('', '#[#]', this, i);
+ var element = JS<E>('', '#[#]', this, i);
if (test(element)) return true;
if (this.length != end) throw ConcurrentModificationError(this);
}
@@ -460,7 +460,7 @@
for (int i = 0; i < end; i++) {
// TODO(22407): Improve bounds check elimination to allow this JS code to
// be replaced by indexing.
- E element = JS('-dynamic', '#[#]', this, i);
+ var element = JS<E>('', '#[#]', this, i);
if (!test(element)) return false;
if (this.length != end) throw ConcurrentModificationError(this);
}
@@ -526,7 +526,7 @@
bool contains(Object other) {
var length = this.length;
for (int i = 0; i < length; i++) {
- E element = JS('Null', '#[#]', this, i);
+ var element = JS<E>('', '#[#]', this, i);
if (element == other) return true;
}
return false;
@@ -576,7 +576,7 @@
JS<int>('!', '#', index) < 0) {
throw diagnoseIndexError(this, index);
}
- return JS('var', '#[#]', this, index);
+ return JS<E>('', '#[#]', this, index);
}
void operator []=(int index, E value) {
diff --git a/sdk/lib/_internal/js_runtime/lib/shared/embedded_names.dart b/sdk/lib/_internal/js_runtime/lib/shared/embedded_names.dart
index 24c2a08..c927bea 100644
--- a/sdk/lib/_internal/js_runtime/lib/shared/embedded_names.dart
+++ b/sdk/lib/_internal/js_runtime/lib/shared/embedded_names.dart
@@ -340,6 +340,9 @@
/// String representation of the type of the JavaScriptFunction class.
JS_FUNCTION_CLASS_TYPE_NAME,
+ /// Property name for Rti._as field.
+ RTI_FIELD_AS,
+
/// Property name for Rti._is field.
RTI_FIELD_IS,
}
diff --git a/sdk/lib/_internal/vm/bin/socket_patch.dart b/sdk/lib/_internal/vm/bin/socket_patch.dart
index 3fe415d..e50d821 100644
--- a/sdk/lib/_internal/vm/bin/socket_patch.dart
+++ b/sdk/lib/_internal/vm/bin/socket_patch.dart
@@ -425,12 +425,18 @@
// Holds the address used to connect or bind the socket.
InternetAddress localAddress;
- // The number of available bytes to read.
+ // The size of data that is ready to be read, for TCP sockets.
+ // This might be out-of-date when Read is called.
+ // The number of pending connections, for Listening sockets.
int available = 0;
+ // Only used for UDP sockets.
+ bool _availableDatagram = false;
+
// The number of incoming connnections for Listening socket.
int connections = 0;
+ // The count of received event from eventhandler.
int tokens = 0;
bool sendReadEvents = false;
@@ -801,6 +807,7 @@
var list;
if (count != null) {
list = nativeRead(count);
+ available = nativeAvailable();
} else {
// If count is null, read as many bytes as possible.
// Loop here to ensure bytes that arrived while this read was
@@ -833,7 +840,6 @@
_SocketProfile.collectStatistic(
nativeGetSocketId(), _SocketProfileType.readBytes, list?.length);
}
- available = nativeAvailable();
return list;
} catch (e) {
reportError(e, StackTrace.current, "Read failed");
@@ -845,11 +851,6 @@
try {
Datagram result = nativeRecvFrom();
if (result != null) {
- // Read the next available. Available is only for the next datagram, not
- // the sum of all datagrams pending, so we need to call after each
- // receive. If available becomes > 0, the _NativeSocket will continue to
- // emit read events.
- available = nativeAvailable();
if (resourceInfo != null) {
resourceInfo.totalRead += result.data.length;
}
@@ -861,6 +862,7 @@
_SocketProfile.collectStatistic(nativeGetSocketId(),
_SocketProfileType.readBytes, result?.data?.length);
}
+ _availableDatagram = nativeAvailableDatagram();
return result;
} catch (e) {
reportError(e, StackTrace.current, "Receive failed");
@@ -1001,7 +1003,7 @@
readEventIssued = false;
if (isClosing) return;
if (!sendReadEvents) return;
- if (available == 0) {
+ if (stopRead()) {
if (isClosedRead && !closedReadEventSent) {
if (isClosedWrite) close();
var handler = eventHandlers[closedEvent];
@@ -1021,6 +1023,14 @@
scheduleMicrotask(issue);
}
+ bool stopRead() {
+ if (isUdp) {
+ return !_availableDatagram;
+ } else {
+ return available == 0;
+ }
+ }
+
void issueWriteEvent({bool delayed: true}) {
if (writeEventIssued) return;
if (!writeAvailable) return;
@@ -1068,7 +1078,11 @@
if (isListening) {
connections++;
} else {
- available = nativeAvailable();
+ if (isUdp) {
+ _availableDatagram = nativeAvailableDatagram();
+ } else {
+ available = nativeAvailable();
+ }
issueReadEvent();
continue;
}
@@ -1327,6 +1341,7 @@
void nativeSetSocketId(int id, int typeFlags) native "Socket_SetSocketId";
int nativeAvailable() native "Socket_Available";
+ bool nativeAvailableDatagram() native "Socket_AvailableDatagram";
Uint8List nativeRead(int len) native "Socket_Read";
Datagram nativeRecvFrom() native "Socket_RecvFrom";
int nativeWrite(List<int> buffer, int offset, int bytes)
diff --git a/sdk/lib/_internal/vm/lib/async_patch.dart b/sdk/lib/_internal/vm/lib/async_patch.dart
index 9d730ab..7d62432 100644
--- a/sdk/lib/_internal/vm/lib/async_patch.dart
+++ b/sdk/lib/_internal/vm/lib/async_patch.dart
@@ -25,8 +25,10 @@
@pragma("vm:entry-point")
bool isSync;
+ @pragma("vm:entry-point")
_AsyncAwaitCompleter() : isSync = false;
+ @pragma("vm:entry-point")
void complete([FutureOr<T> value]) {
if (!isSync || value is Future<T>) {
_future._asyncComplete(value);
@@ -44,6 +46,7 @@
}
}
+ @pragma("vm:entry-point")
void start(f) {
f();
isSync = true;
diff --git a/sdk/lib/_internal/vm/lib/convert_patch.dart b/sdk/lib/_internal/vm/lib/convert_patch.dart
index d2c5f45..f1e46cf 100644
--- a/sdk/lib/_internal/vm/lib/convert_patch.dart
+++ b/sdk/lib/_internal/vm/lib/convert_patch.dart
@@ -18,7 +18,7 @@
// JSON conversion.
@patch
-_parseJson(String source, reviver(key, value)) {
+dynamic _parseJson(String source, reviver(key, value)) {
_BuildJsonListener listener;
if (reviver == null) {
listener = new _BuildJsonListener();
@@ -99,7 +99,7 @@
*
* Must only be called when the entire input has been parsed.
*/
- get result;
+ dynamic get result;
}
/**
@@ -118,11 +118,11 @@
*/
List stack = [];
/** The current [Map] or [List] being built. */
- var currentContainer;
+ dynamic currentContainer;
/** The most recently read property key. */
String key;
/** The most recently read value. */
- var value;
+ dynamic value;
/** Pushes the currently active container (and key, if a [Map]). */
void pushContainer() {
@@ -188,7 +188,7 @@
}
/** Read out the final result of parsing a JSON string. */
- get result {
+ dynamic get result {
assert(currentContainer == null);
return value;
}
@@ -209,7 +209,7 @@
super.propertyValue();
}
- get result {
+ dynamic get result {
return reviver(null, value);
}
}
@@ -456,7 +456,7 @@
*
* May contain a string buffer while parsing strings.
*/
- var buffer = null;
+ dynamic buffer = null;
_ChunkedJsonParser(this.listener);
@@ -519,7 +519,7 @@
* The parser is closed by calling [close] or calling [addSourceChunk] with
* `true` as second (`isLast`) argument.
*/
- Object get result {
+ dynamic get result {
return listener.result;
}
diff --git a/sdk/lib/_internal/vm/lib/errors_patch.dart b/sdk/lib/_internal/vm/lib/errors_patch.dart
index c96e920..c29f052 100644
--- a/sdk/lib/_internal/vm/lib/errors_patch.dart
+++ b/sdk/lib/_internal/vm/lib/errors_patch.dart
@@ -86,6 +86,7 @@
@pragma("vm:entry-point")
_TypeError._create(this._url, this._line, this._column, this._message);
+ @pragma("vm:entry-point", "call")
static _throwNew(int location, Object src_value, _Type dst_type,
String dst_name) native "TypeError_throwNew";
diff --git a/sdk/lib/_internal/vm/lib/ffi_struct_patch.dart b/sdk/lib/_internal/vm/lib/ffi_struct_patch.dart
new file mode 100644
index 0000000..d3545f0
--- /dev/null
+++ b/sdk/lib/_internal/vm/lib/ffi_struct_patch.dart
@@ -0,0 +1,14 @@
+// Copyright (c) 2020, 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.
+
+// @dart = 2.6
+
+// All imports must be in all FFI patch files to not depend on the order
+// the patches are applied.
+import "dart:_internal" show patch;
+import 'dart:typed_data';
+import 'dart:isolate';
+
+@pragma("vm:entry-point")
+abstract class Struct extends NativeType {}
diff --git a/sdk/lib/_internal/vm/lib/internal_patch.dart b/sdk/lib/_internal/vm/lib/internal_patch.dart
index 9a6cdb4..515ad8b 100644
--- a/sdk/lib/_internal/vm/lib/internal_patch.dart
+++ b/sdk/lib/_internal/vm/lib/internal_patch.dart
@@ -124,3 +124,9 @@
//
// Important: this is unsafe and must be used with care.
T unsafeCast<T>(Object v) native "Internal_unsafeCast";
+
+// This function can be used to keep an object alive til that point.
+//
+// This is implemented by a recognized method, but in bytecode through a native.
+@pragma('vm:prefer-inline')
+void reachabilityFence(Object object) native "Internal_reachabilityFence";
diff --git a/sdk/lib/async/zone.dart b/sdk/lib/async/zone.dart
index fa77273..e200ad0 100644
--- a/sdk/lib/async/zone.dart
+++ b/sdk/lib/async/zone.dart
@@ -70,6 +70,42 @@
const _ZoneFunction(this.zone, this.function);
}
+class _RunNullaryZoneFunction {
+ final _Zone zone;
+ final RunHandler function;
+ const _RunNullaryZoneFunction(this.zone, this.function);
+}
+
+class _RunUnaryZoneFunction {
+ final _Zone zone;
+ final RunUnaryHandler function;
+ const _RunUnaryZoneFunction(this.zone, this.function);
+}
+
+class _RunBinaryZoneFunction {
+ final _Zone zone;
+ final RunBinaryHandler function;
+ const _RunBinaryZoneFunction(this.zone, this.function);
+}
+
+class _RegisterNullaryZoneFunction {
+ final _Zone zone;
+ final RegisterCallbackHandler function;
+ const _RegisterNullaryZoneFunction(this.zone, this.function);
+}
+
+class _RegisterUnaryZoneFunction {
+ final _Zone zone;
+ final RegisterUnaryCallbackHandler function;
+ const _RegisterUnaryZoneFunction(this.zone, this.function);
+}
+
+class _RegisterBinaryZoneFunction {
+ final _Zone zone;
+ final RegisterBinaryCallbackHandler function;
+ const _RegisterBinaryZoneFunction(this.zone, this.function);
+}
+
/**
* This class provides the specification for a forked zone.
*
@@ -820,12 +856,12 @@
// TODO(floitsch): the types of the `_ZoneFunction`s should have a type for
// all fields.
- _ZoneFunction<Function> get _run;
- _ZoneFunction<Function> get _runUnary;
- _ZoneFunction<Function> get _runBinary;
- _ZoneFunction<Function> get _registerCallback;
- _ZoneFunction<Function> get _registerUnaryCallback;
- _ZoneFunction<Function> get _registerBinaryCallback;
+ _RunNullaryZoneFunction get _run;
+ _RunUnaryZoneFunction get _runUnary;
+ _RunBinaryZoneFunction get _runBinary;
+ _RegisterNullaryZoneFunction get _registerCallback;
+ _RegisterUnaryZoneFunction get _registerUnaryCallback;
+ _RegisterBinaryZoneFunction get _registerBinaryCallback;
_ZoneFunction<ErrorCallbackHandler> get _errorCallback;
_ZoneFunction<ScheduleMicrotaskHandler> get _scheduleMicrotask;
_ZoneFunction<CreateTimerHandler> get _createTimer;
@@ -848,12 +884,12 @@
// inheritable zone functions.
// TODO(floitsch): the types of the `_ZoneFunction`s should have a type for
// all fields.
- _ZoneFunction<Function> _run;
- _ZoneFunction<Function> _runUnary;
- _ZoneFunction<Function> _runBinary;
- _ZoneFunction<Function> _registerCallback;
- _ZoneFunction<Function> _registerUnaryCallback;
- _ZoneFunction<Function> _registerBinaryCallback;
+ _RunNullaryZoneFunction _run;
+ _RunUnaryZoneFunction _runUnary;
+ _RunBinaryZoneFunction _runBinary;
+ _RegisterNullaryZoneFunction _registerCallback;
+ _RegisterUnaryZoneFunction _registerUnaryCallback;
+ _RegisterBinaryZoneFunction _registerBinaryCallback;
_ZoneFunction<ErrorCallbackHandler> _errorCallback;
_ZoneFunction<ScheduleMicrotaskHandler> _scheduleMicrotask;
_ZoneFunction<CreateTimerHandler> _createTimer;
@@ -884,22 +920,23 @@
// specification, so it will never try to access the (null) parent.
// All other zones have a non-null parent.
_run = (specification.run != null)
- ? new _ZoneFunction<Function>(this, specification.run)
+ ? new _RunNullaryZoneFunction(this, specification.run)
: parent._run;
_runUnary = (specification.runUnary != null)
- ? new _ZoneFunction<Function>(this, specification.runUnary)
+ ? new _RunUnaryZoneFunction(this, specification.runUnary)
: parent._runUnary;
_runBinary = (specification.runBinary != null)
- ? new _ZoneFunction<Function>(this, specification.runBinary)
+ ? new _RunBinaryZoneFunction(this, specification.runBinary)
: parent._runBinary;
_registerCallback = (specification.registerCallback != null)
- ? new _ZoneFunction<Function>(this, specification.registerCallback)
+ ? new _RegisterNullaryZoneFunction(this, specification.registerCallback)
: parent._registerCallback;
_registerUnaryCallback = (specification.registerUnaryCallback != null)
- ? new _ZoneFunction<Function>(this, specification.registerUnaryCallback)
+ ? new _RegisterUnaryZoneFunction(
+ this, specification.registerUnaryCallback)
: parent._registerUnaryCallback;
_registerBinaryCallback = (specification.registerBinaryCallback != null)
- ? new _ZoneFunction<Function>(
+ ? new _RegisterBinaryZoneFunction(
this, specification.registerBinaryCallback)
: parent._registerBinaryCallback;
_errorCallback = (specification.errorCallback != null)
@@ -1262,18 +1299,18 @@
class _RootZone extends _Zone {
const _RootZone();
- _ZoneFunction<Function> get _run =>
- const _ZoneFunction<Function>(_rootZone, _rootRun);
- _ZoneFunction<Function> get _runUnary =>
- const _ZoneFunction<Function>(_rootZone, _rootRunUnary);
- _ZoneFunction<Function> get _runBinary =>
- const _ZoneFunction<Function>(_rootZone, _rootRunBinary);
- _ZoneFunction<Function> get _registerCallback =>
- const _ZoneFunction<Function>(_rootZone, _rootRegisterCallback);
- _ZoneFunction<Function> get _registerUnaryCallback =>
- const _ZoneFunction<Function>(_rootZone, _rootRegisterUnaryCallback);
- _ZoneFunction<Function> get _registerBinaryCallback =>
- const _ZoneFunction<Function>(_rootZone, _rootRegisterBinaryCallback);
+ _RunNullaryZoneFunction get _run =>
+ const _RunNullaryZoneFunction(_rootZone, _rootRun);
+ _RunUnaryZoneFunction get _runUnary =>
+ const _RunUnaryZoneFunction(_rootZone, _rootRunUnary);
+ _RunBinaryZoneFunction get _runBinary =>
+ const _RunBinaryZoneFunction(_rootZone, _rootRunBinary);
+ _RegisterNullaryZoneFunction get _registerCallback =>
+ const _RegisterNullaryZoneFunction(_rootZone, _rootRegisterCallback);
+ _RegisterUnaryZoneFunction get _registerUnaryCallback =>
+ const _RegisterUnaryZoneFunction(_rootZone, _rootRegisterUnaryCallback);
+ _RegisterBinaryZoneFunction get _registerBinaryCallback =>
+ const _RegisterBinaryZoneFunction(_rootZone, _rootRegisterBinaryCallback);
_ZoneFunction<ErrorCallbackHandler> get _errorCallback =>
const _ZoneFunction<ErrorCallbackHandler>(_rootZone, _rootErrorCallback);
_ZoneFunction<ScheduleMicrotaskHandler> get _scheduleMicrotask =>
diff --git a/sdk/lib/convert/json.dart b/sdk/lib/convert/json.dart
index 1fa356d..5aa14b2 100644
--- a/sdk/lib/convert/json.dart
+++ b/sdk/lib/convert/json.dart
@@ -514,7 +514,7 @@
}
// Internal optimized JSON parsing implementation.
-external _parseJson(String source, reviver(key, value));
+external dynamic _parseJson(String source, reviver(key, value));
// Implementation of encoder/stringifier.
diff --git a/sdk/lib/libraries.json b/sdk/lib/libraries.json
index 54dbc0d..312ed14 100644
--- a/sdk/lib/libraries.json
+++ b/sdk/lib/libraries.json
@@ -87,7 +87,8 @@
"patches": [
"_internal/vm/lib/ffi_patch.dart",
"_internal/vm/lib/ffi_dynamic_library_patch.dart",
- "_internal/vm/lib/ffi_native_type_patch.dart"
+ "_internal/vm/lib/ffi_native_type_patch.dart",
+ "_internal/vm/lib/ffi_struct_patch.dart"
]
},
"wasm": {
diff --git a/sdk/lib/libraries.yaml b/sdk/lib/libraries.yaml
index 8944e12..81a5f51 100644
--- a/sdk/lib/libraries.yaml
+++ b/sdk/lib/libraries.yaml
@@ -93,6 +93,7 @@
- "_internal/vm/lib/ffi_patch.dart"
- "_internal/vm/lib/ffi_dynamic_library_patch.dart"
- "_internal/vm/lib/ffi_native_type_patch.dart"
+ - "_internal/vm/lib/ffi_struct_patch.dart"
wasm:
uri: "wasm/wasm.dart"
diff --git a/sdk_nnbd/lib/_http/http_headers.dart b/sdk_nnbd/lib/_http/http_headers.dart
index db3d7aa..98ddbf5 100644
--- a/sdk_nnbd/lib/_http/http_headers.dart
+++ b/sdk_nnbd/lib/_http/http_headers.dart
@@ -841,6 +841,7 @@
_value = parseValue();
skipWS();
if (done()) return;
+ if (s[index] == valueSeparator) return;
maybeExpect(parameterSeparator);
parseParameters();
}
diff --git a/sdk_nnbd/lib/_http/http_impl.dart b/sdk_nnbd/lib/_http/http_impl.dart
index aeacfa3..2c50285 100644
--- a/sdk_nnbd/lib/_http/http_impl.dart
+++ b/sdk_nnbd/lib/_http/http_impl.dart
@@ -1746,6 +1746,10 @@
_currentUri = uri;
// Start with pausing the parser.
_subscription!.pause();
+ if (method == "CONNECT") {
+ // Parser will ignore Content-Length or Transfer-Encoding header
+ _httpParser.connectMethod = true;
+ }
_ProxyCredentials? proxyCreds; // Credentials used to authorize proxy.
_SiteCredentials? creds; // Credentials used to authorize this request.
var outgoing = new _HttpOutgoing(_socket);
diff --git a/sdk_nnbd/lib/_http/http_parser.dart b/sdk_nnbd/lib/_http/http_parser.dart
index 36a8a1a..96891a1 100644
--- a/sdk_nnbd/lib/_http/http_parser.dart
+++ b/sdk_nnbd/lib/_http/http_parser.dart
@@ -259,6 +259,7 @@
int _remainingContent = -1;
bool _contentLength = false;
bool _transferEncoding = false;
+ bool connectMethod = false;
_HttpHeaders? _headers;
@@ -336,6 +337,19 @@
// request or a request or response with an empty body.
bool _headersEnd() {
var headers = _headers!;
+ // If method is CONNECT, response parser should ignore any Content-Length or
+ // Transfer-Encoding header fields in a successful response.
+ // [RFC 7231](https://tools.ietf.org/html/rfc7231#section-4.3.6)
+ if (!_requestParser &&
+ _statusCode >= 200 &&
+ _statusCode < 300 &&
+ connectMethod) {
+ _transferLength = -1;
+ headers.chunkedTransferEncoding = false;
+ _chunked = false;
+ headers.removeAll(HttpHeaders.contentLengthHeader);
+ headers.removeAll(HttpHeaders.transferEncodingHeader);
+ }
headers._mutable = false;
_transferLength = headers.contentLength;
diff --git a/sdk_nnbd/lib/_internal/js_dev_runtime/private/ddc_runtime/types.dart b/sdk_nnbd/lib/_internal/js_dev_runtime/private/ddc_runtime/types.dart
index d71922a..6bd3820 100644
--- a/sdk_nnbd/lib/_internal/js_dev_runtime/private/ddc_runtime/types.dart
+++ b/sdk_nnbd/lib/_internal/js_dev_runtime/private/ddc_runtime/types.dart
@@ -298,7 +298,7 @@
return type;
}
if (_equalType(type, Never)) return unwrapType(Null);
- return NullableType(type);
+ return NullableType(JS<Type>('!', '#', type));
}
/// Returns a legacy (star, *) version of [type].
diff --git a/sdk_nnbd/lib/_internal/js_dev_runtime/private/js_array.dart b/sdk_nnbd/lib/_internal/js_dev_runtime/private/js_array.dart
index 028ed06..c92b73d 100644
--- a/sdk_nnbd/lib/_internal/js_dev_runtime/private/js_array.dart
+++ b/sdk_nnbd/lib/_internal/js_dev_runtime/private/js_array.dart
@@ -154,7 +154,7 @@
List retained = [];
int end = this.length;
for (int i = 0; i < end; i++) {
- var element = JS<E>('-dynamic', '#[#]', this, i);
+ var element = JS<E>('', '#[#]', this, i);
// !test() ensures bool conversion in checked mode.
if (!test(element) == removeMatching) {
retained.add(element);
@@ -282,7 +282,7 @@
E? match = null;
bool matchFound = false;
for (int i = 0; i < length; i++) {
- var element = JS<E>('-dynamic', '#[#]', this, i);
+ var element = JS<E>('', '#[#]', this, i);
if (test(element)) {
if (matchFound) {
throw IterableElementError.tooMany();
@@ -378,12 +378,12 @@
// Use JS to avoid bounds check (the bounds check elimination
// optimzation is too weak). The 'E' type annotation is a store type
// check - we can't rely on iterable, it could be List<dynamic>.
- E element = otherList[otherStart + i];
+ var element = otherList[otherStart + i];
JS('', '#[#] = #', this, start + i, element);
}
} else {
for (int i = 0; i < length; i++) {
- E element = otherList[otherStart + i];
+ var element = otherList[otherStart + i];
JS('', '#[#] = #', this, start + i, element);
}
}
@@ -440,7 +440,7 @@
bool every(bool Function(E) test) {
int end = this.length;
for (int i = 0; i < end; i++) {
- var element = JS<E>('-dynamic', '#[#]', this, i);
+ var element = JS<E>('', '#[#]', this, i);
if (!test(element)) return false;
if (this.length != end) throw ConcurrentModificationError(this);
}
@@ -507,7 +507,7 @@
bool contains(Object? other) {
var length = this.length;
for (int i = 0; i < length; i++) {
- E element = JS('Null', '#[#]', this, i);
+ var element = JS<E>('', '#[#]', this, i);
if (element == other) return true;
}
return false;
diff --git a/sdk_nnbd/lib/_internal/js_runtime/lib/rti.dart b/sdk_nnbd/lib/_internal/js_runtime/lib/rti.dart
index a3494f2..276dd77 100644
--- a/sdk_nnbd/lib/_internal/js_runtime/lib/rti.dart
+++ b/sdk_nnbd/lib/_internal/js_runtime/lib/rti.dart
@@ -67,6 +67,12 @@
}
@pragma('dart2js:tryInline')
+ static bool _asCheck(Rti rti, object) {
+ return JS(
+ 'bool', '#.#(#)', rti, JS_GET_NAME(JsGetName.RTI_FIELD_AS), object);
+ }
+
+ @pragma('dart2js:tryInline')
static bool _isCheck(Rti rti, object) {
return JS(
'bool', '#.#(#)', rti, JS_GET_NAME(JsGetName.RTI_FIELD_IS), object);
@@ -820,38 +826,94 @@
// method. The Rti object is 'this'.
Rti testRti = _castToRti(JS('', 'this'));
- var isFn = RAW_DART_FUNCTION_REF(_generalIsTestImplementation);
-
if (isObjectType(testRti)) {
- isFn = RAW_DART_FUNCTION_REF(_isObject);
- Rti._setAsCheckFunction(testRti, RAW_DART_FUNCTION_REF(_asObject));
- } else if (isTopType(testRti)) {
- isFn = RAW_DART_FUNCTION_REF(_isTop);
- var asFn = RAW_DART_FUNCTION_REF(_asTop);
- Rti._setAsCheckFunction(testRti, asFn);
- } else if (_Utils.isIdentical(testRti, TYPE_REF<int>())) {
+ return _finishIsFn(testRti, object, RAW_DART_FUNCTION_REF(_isObject));
+ }
+ if (isTopType(testRti)) {
+ return _finishIsFn(testRti, object, RAW_DART_FUNCTION_REF(_isTop));
+ }
+
+ // `o is T*` generally behaves like `o is T`.
+ // The exeptions are `Object*` (handled above) and `Never*`
+ //
+ // `null is Never` --> `false`
+ // `null is Never*` --> `true`
+ Rti unstarred = Rti._getKind(testRti) == Rti.kindStar
+ ? Rti._getStarArgument(testRti)
+ : testRti;
+
+ var isFn = _simpleSpecializedIsTest(unstarred);
+ if (isFn != null) {
+ return _finishIsFn(testRti, object, isFn);
+ }
+
+ if (Rti._getKind(unstarred) == Rti.kindInterface) {
+ String name = Rti._getInterfaceName(unstarred);
+ var arguments = Rti._getInterfaceTypeArguments(unstarred);
+ // This recognizes interface types instantiated with Top, which includes the
+ // common case of interfaces that have no type parameters.
+ // TODO(sra): Can we easily recognize other interface types instantiated to
+ // bounds?
+ if (JS('bool', '#.every(#)', arguments, RAW_DART_FUNCTION_REF(isTopType))) {
+ String propertyName =
+ '${JS_GET_NAME(JsGetName.OPERATOR_IS_PREFIX)}${name}';
+ Rti._setSpecializedTestResource(testRti, propertyName);
+ return _finishIsFn(
+ testRti, object, RAW_DART_FUNCTION_REF(_isTestViaProperty));
+ }
+ // fall through to general implementation.
+ } else if (Rti._getKind(testRti) == Rti.kindQuestion) {
+ return _finishIsFn(testRti, object,
+ RAW_DART_FUNCTION_REF(_generalNullableIsTestImplementation));
+ }
+ return _finishIsFn(
+ testRti, object, RAW_DART_FUNCTION_REF(_generalIsTestImplementation));
+}
+
+@pragma('dart2js:noInline') // Slightly smaller code.
+bool _finishIsFn(Rti testRti, object, isFn) {
+ Rti._setIsTestFunction(testRti, isFn);
+ return Rti._isCheck(testRti, object);
+}
+
+Object? _simpleSpecializedIsTest(Rti testRti) {
+ // Note: We must not match `Never` below.
+ var isFn = null;
+ if (_Utils.isIdentical(testRti, TYPE_REF<int>())) {
isFn = RAW_DART_FUNCTION_REF(_isInt);
- } else if (_Utils.isIdentical(testRti, TYPE_REF<double>())) {
- isFn = RAW_DART_FUNCTION_REF(_isNum);
- } else if (_Utils.isIdentical(testRti, TYPE_REF<num>())) {
+ } else if (_Utils.isIdentical(testRti, TYPE_REF<double>()) ||
+ _Utils.isIdentical(testRti, TYPE_REF<num>())) {
isFn = RAW_DART_FUNCTION_REF(_isNum);
} else if (_Utils.isIdentical(testRti, TYPE_REF<String>())) {
isFn = RAW_DART_FUNCTION_REF(_isString);
} else if (_Utils.isIdentical(testRti, TYPE_REF<bool>())) {
isFn = RAW_DART_FUNCTION_REF(_isBool);
- } else if (Rti._getKind(testRti) == Rti.kindInterface) {
- String name = Rti._getInterfaceName(testRti);
- var arguments = Rti._getInterfaceTypeArguments(testRti);
- if (JS('bool', '#.every(#)', arguments, RAW_DART_FUNCTION_REF(isTopType))) {
- String propertyName =
- '${JS_GET_NAME(JsGetName.OPERATOR_IS_PREFIX)}${name}';
- Rti._setSpecializedTestResource(testRti, propertyName);
- isFn = RAW_DART_FUNCTION_REF(_isTestViaProperty);
+ }
+ return isFn;
+}
+
+/// Called from generated code.
+///
+/// The first time this default `_as` method is called, it replaces itself with
+/// a specialized version.
+bool _installSpecializedAsCheck(object) {
+ // This static method is installed on an Rti object as a JavaScript instance
+ // method. The Rti object is 'this'.
+ Rti testRti = _castToRti(JS('', 'this'));
+
+ var asFn = RAW_DART_FUNCTION_REF(_generalAsCheckImplementation);
+ if (isTopType(testRti)) {
+ asFn = RAW_DART_FUNCTION_REF(_asTop);
+ } else if (isObjectType(testRti)) {
+ asFn = RAW_DART_FUNCTION_REF(_asObject);
+ } else {
+ if (JS_GET_FLAG('LEGACY') || isNullable(testRti)) {
+ asFn = RAW_DART_FUNCTION_REF(_generalNullableAsCheckImplementation);
}
}
- Rti._setIsTestFunction(testRti, isFn);
- return Rti._isCheck(testRti, object);
+ Rti._setAsCheckFunction(testRti, asFn);
+ return Rti._asCheck(testRti, object);
}
bool _nullIs(Rti testRti) {
@@ -874,6 +936,21 @@
return isSubtype(_theUniverse(), objectRti, testRti);
}
+/// Specialized test for `x is T1` where `T1` has the form `T2?`. Test is
+/// compositional, calling `T2._is(object)`, so if `T2` has a specialized
+/// version, the composed test will be fast (but not quite as fast as a
+/// single-step specialization).
+///
+/// Called from generated code.
+bool _generalNullableIsTestImplementation(object) {
+ if (object == null) return true;
+ // This static method is installed on an Rti object as a JavaScript instance
+ // method. The Rti object is 'this'.
+ Rti testRti = _castToRti(JS('', 'this'));
+ Rti baseRti = Rti._getQuestionArgument(testRti);
+ return Rti._isCheck(baseRti, object);
+}
+
/// Called from generated code.
bool _isTestViaProperty(object) {
// This static method is installed on an Rti object as a JavaScript instance
@@ -895,6 +972,7 @@
return JS('bool', '!!#[#]', interceptor, tag);
}
+/// General unspecialized 'as' check that works for any type.
/// Called from generated code.
_generalAsCheckImplementation(object) {
// This static method is installed on an Rti object as a JavaScript instance
@@ -905,7 +983,21 @@
} else {
if (Rti._isCheck(testRti, object)) return object;
}
+ _failedAsCheck(object, testRti);
+}
+/// General 'as' check for types that accept `null`.
+/// Called from generated code.
+_generalNullableAsCheckImplementation(object) {
+ // This static method is installed on an Rti object as a JavaScript instance
+ // method. The Rti object is 'this'.
+ Rti testRti = _castToRti(JS('', 'this'));
+ if (object == null) return object;
+ if (Rti._isCheck(testRti, object)) return object;
+ _failedAsCheck(object, testRti);
+}
+
+void _failedAsCheck(object, Rti testRti) {
Rti objectRti = instanceOrFunctionType(object, testRti);
String message =
_Error.compose(object, objectRti, _rtiToString(testRti, null));
@@ -1513,7 +1605,7 @@
// Set up methods to perform type tests. The general as-check methods use
// the is-test method. The is-test method on first use overwrites itself,
// and possibly the as-check methods, with a specialized version.
- var asFn = RAW_DART_FUNCTION_REF(_generalAsCheckImplementation);
+ var asFn = RAW_DART_FUNCTION_REF(_installSpecializedAsCheck);
var isFn = RAW_DART_FUNCTION_REF(_installSpecializedIsTest);
Rti._setAsCheckFunction(rti, asFn);
Rti._setIsTestFunction(rti, isFn);
diff --git a/sdk_nnbd/lib/_internal/js_runtime/lib/shared/embedded_names.dart b/sdk_nnbd/lib/_internal/js_runtime/lib/shared/embedded_names.dart
index 4ec4fc2..31b46c5f 100644
--- a/sdk_nnbd/lib/_internal/js_runtime/lib/shared/embedded_names.dart
+++ b/sdk_nnbd/lib/_internal/js_runtime/lib/shared/embedded_names.dart
@@ -338,6 +338,9 @@
/// String representation of the type of the JavaScriptFunction class.
JS_FUNCTION_CLASS_TYPE_NAME,
+ /// Property name for Rti._as field.
+ RTI_FIELD_AS,
+
/// Property name for Rti._is field.
RTI_FIELD_IS,
}
diff --git a/sdk_nnbd/lib/_internal/vm/bin/socket_patch.dart b/sdk_nnbd/lib/_internal/vm/bin/socket_patch.dart
index 8a954e8..8ef06ed 100644
--- a/sdk_nnbd/lib/_internal/vm/bin/socket_patch.dart
+++ b/sdk_nnbd/lib/_internal/vm/bin/socket_patch.dart
@@ -427,12 +427,18 @@
// Holds the address used to connect or bind the socket.
late InternetAddress localAddress;
- // The number of available bytes to read.
+ // The size of data that is ready to be read, for TCP sockets.
+ // This might be out-of-date when Read is called.
+ // The number of pending connections, for Listening sockets.
int available = 0;
+ // Only used for UDP sockets.
+ bool _availableDatagram = false;
+
// The number of incoming connnections for Listening socket.
int connections = 0;
+ // The count of received event from eventhandler.
int tokens = 0;
bool sendReadEvents = false;
@@ -802,6 +808,7 @@
Uint8List? list;
if (count != null) {
list = nativeRead(count);
+ available = nativeAvailable();
} else {
// If count is null, read as many bytes as possible.
// Loop here to ensure bytes that arrived while this read was
@@ -839,7 +846,6 @@
_SocketProfile.collectStatistic(
nativeGetSocketId(), _SocketProfileType.readBytes, list?.length);
}
- available = nativeAvailable();
return list;
} catch (e) {
reportError(e, StackTrace.current, "Read failed");
@@ -850,30 +856,23 @@
Datagram? receive() {
if (isClosing || isClosed) return null;
try {
- Datagram? datagram = nativeRecvFrom();
- final resourceInformation = resourceInfo;
- assert(resourceInformation != null ||
- isPipe ||
- isInternal ||
- isInternalSignal);
- if (datagram != null) {
- // Read the next available. Available is only for the next datagram, not
- // the sum of all datagrams pending, so we need to call after each
- // receive. If available becomes > 0, the _NativeSocket will continue to
- // emit read events.
- available = nativeAvailable();
+ Datagram? result = nativeRecvFrom();
+ if (result != null) {
+ final resourceInformation = resourceInfo;
if (resourceInformation != null) {
- resourceInformation.totalRead += datagram.data.length;
+ resourceInformation.totalRead += result.data.length;
}
}
+ final resourceInformation = resourceInfo;
if (resourceInformation != null) {
resourceInformation.didRead();
}
if (!const bool.fromEnvironment("dart.vm.product")) {
_SocketProfile.collectStatistic(nativeGetSocketId(),
- _SocketProfileType.readBytes, datagram?.data.length);
+ _SocketProfileType.readBytes, result?.data.length);
}
- return datagram;
+ _availableDatagram = nativeAvailableDatagram();
+ return result;
} catch (e) {
reportError(e, StackTrace.current, "Receive failed");
return null;
@@ -1023,7 +1022,7 @@
readEventIssued = false;
if (isClosing) return;
if (!sendReadEvents) return;
- if (available == 0) {
+ if (stopRead()) {
if (isClosedRead && !closedReadEventSent) {
if (isClosedWrite) close();
var handler = eventHandlers[closedEvent];
@@ -1043,6 +1042,14 @@
scheduleMicrotask(issue);
}
+ bool stopRead() {
+ if (isUdp) {
+ return !_availableDatagram;
+ } else {
+ return available == 0;
+ }
+ }
+
void issueWriteEvent({bool delayed: true}) {
if (writeEventIssued) return;
if (!writeAvailable) return;
@@ -1090,7 +1097,11 @@
if (isListening) {
connections++;
} else {
- available = nativeAvailable();
+ if (isUdp) {
+ _availableDatagram = nativeAvailableDatagram();
+ } else {
+ available = nativeAvailable();
+ }
issueReadEvent();
continue;
}
@@ -1356,6 +1367,7 @@
void nativeSetSocketId(int id, int typeFlags) native "Socket_SetSocketId";
int nativeAvailable() native "Socket_Available";
+ bool nativeAvailableDatagram() native "Socket_AvailableDatagram";
Uint8List? nativeRead(int len) native "Socket_Read";
Datagram? nativeRecvFrom() native "Socket_RecvFrom";
int nativeWrite(List<int> buffer, int offset, int bytes)
diff --git a/sdk_nnbd/lib/_internal/vm/lib/async_patch.dart b/sdk_nnbd/lib/_internal/vm/lib/async_patch.dart
index 1de3219..a03c772 100644
--- a/sdk_nnbd/lib/_internal/vm/lib/async_patch.dart
+++ b/sdk_nnbd/lib/_internal/vm/lib/async_patch.dart
@@ -23,8 +23,10 @@
@pragma("vm:entry-point")
bool isSync;
+ @pragma("vm:entry-point")
_AsyncAwaitCompleter() : isSync = false;
+ @pragma("vm:entry-point")
void complete([FutureOr<T>? value]) {
if (!isSync || value is Future<T>) {
_future._asyncComplete(value as FutureOr<T>);
@@ -42,6 +44,7 @@
}
}
+ @pragma("vm:entry-point")
void start(f) {
f();
isSync = true;
diff --git a/sdk_nnbd/lib/_internal/vm/lib/convert_patch.dart b/sdk_nnbd/lib/_internal/vm/lib/convert_patch.dart
index 4780200..374221c 100644
--- a/sdk_nnbd/lib/_internal/vm/lib/convert_patch.dart
+++ b/sdk_nnbd/lib/_internal/vm/lib/convert_patch.dart
@@ -16,7 +16,7 @@
// JSON conversion.
@patch
-_parseJson(
+dynamic _parseJson(
String source, Object? Function(Object? key, Object? value)? reviver) {
_BuildJsonListener listener;
if (reviver == null) {
@@ -98,7 +98,7 @@
*
* Must only be called when the entire input has been parsed.
*/
- get result;
+ dynamic get result;
}
/**
@@ -117,11 +117,11 @@
*/
final List<Object?> stack = [];
/** The current [Map] or [List] being built. */
- var currentContainer;
+ dynamic currentContainer;
/** The most recently read property key. */
String key = '';
/** The most recently read value. */
- var value;
+ dynamic value;
/** Pushes the currently active container (and key, if a [Map]). */
void pushContainer() {
@@ -188,7 +188,7 @@
}
/** Read out the final result of parsing a JSON string. */
- get result {
+ dynamic get result {
assert(currentContainer == null);
return value;
}
@@ -209,7 +209,7 @@
super.propertyValue();
}
- get result {
+ dynamic get result {
return reviver(null, value);
}
}
@@ -456,7 +456,7 @@
*
* May contain a string buffer while parsing strings.
*/
- var buffer = null;
+ dynamic buffer = null;
_ChunkedJsonParser(this.listener);
diff --git a/sdk_nnbd/lib/_internal/vm/lib/errors_patch.dart b/sdk_nnbd/lib/_internal/vm/lib/errors_patch.dart
index 12960b5..4060970 100644
--- a/sdk_nnbd/lib/_internal/vm/lib/errors_patch.dart
+++ b/sdk_nnbd/lib/_internal/vm/lib/errors_patch.dart
@@ -85,6 +85,7 @@
@pragma("vm:entry-point")
_TypeError._create(this._url, this._line, this._column, this._message);
+ @pragma("vm:entry-point", "call")
static _throwNew(int location, Object srcValue, _Type dstType, String dstName)
native "TypeError_throwNew";
diff --git a/sdk_nnbd/lib/_internal/vm/lib/ffi_struct_patch.dart b/sdk_nnbd/lib/_internal/vm/lib/ffi_struct_patch.dart
new file mode 100644
index 0000000..8fad967
--- /dev/null
+++ b/sdk_nnbd/lib/_internal/vm/lib/ffi_struct_patch.dart
@@ -0,0 +1,12 @@
+// Copyright (c) 2020, 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.
+
+// All imports must be in all FFI patch files to not depend on the order
+// the patches are applied.
+import "dart:_internal" show patch;
+import 'dart:typed_data';
+import 'dart:isolate';
+
+@pragma("vm:entry-point")
+abstract class Struct extends NativeType {}
diff --git a/sdk_nnbd/lib/_internal/vm/lib/internal_patch.dart b/sdk_nnbd/lib/_internal/vm/lib/internal_patch.dart
index 927ef2f..ddb3992 100644
--- a/sdk_nnbd/lib/_internal/vm/lib/internal_patch.dart
+++ b/sdk_nnbd/lib/_internal/vm/lib/internal_patch.dart
@@ -122,3 +122,9 @@
//
// Important: this is unsafe and must be used with care.
T unsafeCast<T>(Object? v) native "Internal_unsafeCast";
+
+// This function can be used to keep an object alive til that point.
+//
+// This is implemented by a recognized method, but in bytecode through a native.
+@pragma('vm:prefer-inline')
+void reachabilityFence(Object object) native "Internal_reachabilityFence";
diff --git a/sdk_nnbd/lib/async/zone.dart b/sdk_nnbd/lib/async/zone.dart
index 3c50e19..b4e3994 100644
--- a/sdk_nnbd/lib/async/zone.dart
+++ b/sdk_nnbd/lib/async/zone.dart
@@ -69,6 +69,42 @@
const _ZoneFunction(this.zone, this.function);
}
+class _RunNullaryZoneFunction {
+ final _Zone zone;
+ final RunHandler function;
+ const _RunNullaryZoneFunction(this.zone, this.function);
+}
+
+class _RunUnaryZoneFunction {
+ final _Zone zone;
+ final RunUnaryHandler function;
+ const _RunUnaryZoneFunction(this.zone, this.function);
+}
+
+class _RunBinaryZoneFunction {
+ final _Zone zone;
+ final RunBinaryHandler function;
+ const _RunBinaryZoneFunction(this.zone, this.function);
+}
+
+class _RegisterNullaryZoneFunction {
+ final _Zone zone;
+ final RegisterCallbackHandler function;
+ const _RegisterNullaryZoneFunction(this.zone, this.function);
+}
+
+class _RegisterUnaryZoneFunction {
+ final _Zone zone;
+ final RegisterUnaryCallbackHandler function;
+ const _RegisterUnaryZoneFunction(this.zone, this.function);
+}
+
+class _RegisterBinaryZoneFunction {
+ final _Zone zone;
+ final RegisterBinaryCallbackHandler function;
+ const _RegisterBinaryZoneFunction(this.zone, this.function);
+}
+
/**
* This class provides the specification for a forked zone.
*
@@ -814,12 +850,12 @@
// TODO(floitsch): the types of the `_ZoneFunction`s should have a type for
// all fields.
- _ZoneFunction<Function> get _run;
- _ZoneFunction<Function> get _runUnary;
- _ZoneFunction<Function> get _runBinary;
- _ZoneFunction<Function> get _registerCallback;
- _ZoneFunction<Function> get _registerUnaryCallback;
- _ZoneFunction<Function> get _registerBinaryCallback;
+ _RunNullaryZoneFunction get _run;
+ _RunUnaryZoneFunction get _runUnary;
+ _RunBinaryZoneFunction get _runBinary;
+ _RegisterNullaryZoneFunction get _registerCallback;
+ _RegisterUnaryZoneFunction get _registerUnaryCallback;
+ _RegisterBinaryZoneFunction get _registerBinaryCallback;
_ZoneFunction<ErrorCallbackHandler> get _errorCallback;
_ZoneFunction<ScheduleMicrotaskHandler> get _scheduleMicrotask;
_ZoneFunction<CreateTimerHandler> get _createTimer;
@@ -844,12 +880,12 @@
// inheritable zone functions.
// TODO(floitsch): the types of the `_ZoneFunction`s should have a type for
// all fields, but we can't use generic function types as type arguments.
- _ZoneFunction<Function> _run;
- _ZoneFunction<Function> _runUnary;
- _ZoneFunction<Function> _runBinary;
- _ZoneFunction<Function> _registerCallback;
- _ZoneFunction<Function> _registerUnaryCallback;
- _ZoneFunction<Function> _registerBinaryCallback;
+ _RunNullaryZoneFunction _run;
+ _RunUnaryZoneFunction _runUnary;
+ _RunBinaryZoneFunction _runBinary;
+ _RegisterNullaryZoneFunction _registerCallback;
+ _RegisterUnaryZoneFunction _registerUnaryCallback;
+ _RegisterBinaryZoneFunction _registerBinaryCallback;
_ZoneFunction<ErrorCallbackHandler> _errorCallback;
_ZoneFunction<ScheduleMicrotaskHandler> _scheduleMicrotask;
_ZoneFunction<CreateTimerHandler> _createTimer;
@@ -891,29 +927,29 @@
// All other zones have a non-null parent.
var run = specification.run;
if (run != null) {
- _run = _ZoneFunction<Function>(this, run);
+ _run = _RunNullaryZoneFunction(this, run);
}
var runUnary = specification.runUnary;
if (runUnary != null) {
- _runUnary = _ZoneFunction<Function>(this, runUnary);
+ _runUnary = _RunUnaryZoneFunction(this, runUnary);
}
var runBinary = specification.runBinary;
if (runBinary != null) {
- _runBinary = _ZoneFunction<Function>(this, runBinary);
+ _runBinary = _RunBinaryZoneFunction(this, runBinary);
}
var registerCallback = specification.registerCallback;
if (registerCallback != null) {
- _registerCallback = _ZoneFunction<Function>(this, registerCallback);
+ _registerCallback = _RegisterNullaryZoneFunction(this, registerCallback);
}
var registerUnaryCallback = specification.registerUnaryCallback;
if (registerUnaryCallback != null) {
_registerUnaryCallback =
- _ZoneFunction<Function>(this, registerUnaryCallback);
+ _RegisterUnaryZoneFunction(this, registerUnaryCallback);
}
var registerBinaryCallback = specification.registerBinaryCallback;
if (registerBinaryCallback != null) {
_registerBinaryCallback =
- _ZoneFunction<Function>(this, registerBinaryCallback);
+ _RegisterBinaryZoneFunction(this, registerBinaryCallback);
}
var errorCallback = specification.errorCallback;
if (errorCallback != null) {
@@ -1274,18 +1310,18 @@
class _RootZone extends _Zone {
const _RootZone();
- _ZoneFunction<Function> get _run =>
- const _ZoneFunction<Function>(_rootZone, _rootRun);
- _ZoneFunction<Function> get _runUnary =>
- const _ZoneFunction<Function>(_rootZone, _rootRunUnary);
- _ZoneFunction<Function> get _runBinary =>
- const _ZoneFunction<Function>(_rootZone, _rootRunBinary);
- _ZoneFunction<Function> get _registerCallback =>
- const _ZoneFunction<Function>(_rootZone, _rootRegisterCallback);
- _ZoneFunction<Function> get _registerUnaryCallback =>
- const _ZoneFunction<Function>(_rootZone, _rootRegisterUnaryCallback);
- _ZoneFunction<Function> get _registerBinaryCallback =>
- const _ZoneFunction<Function>(_rootZone, _rootRegisterBinaryCallback);
+ _RunNullaryZoneFunction get _run =>
+ const _RunNullaryZoneFunction(_rootZone, _rootRun);
+ _RunUnaryZoneFunction get _runUnary =>
+ const _RunUnaryZoneFunction(_rootZone, _rootRunUnary);
+ _RunBinaryZoneFunction get _runBinary =>
+ const _RunBinaryZoneFunction(_rootZone, _rootRunBinary);
+ _RegisterNullaryZoneFunction get _registerCallback =>
+ const _RegisterNullaryZoneFunction(_rootZone, _rootRegisterCallback);
+ _RegisterUnaryZoneFunction get _registerUnaryCallback =>
+ const _RegisterUnaryZoneFunction(_rootZone, _rootRegisterUnaryCallback);
+ _RegisterBinaryZoneFunction get _registerBinaryCallback =>
+ const _RegisterBinaryZoneFunction(_rootZone, _rootRegisterBinaryCallback);
_ZoneFunction<ErrorCallbackHandler> get _errorCallback =>
const _ZoneFunction<ErrorCallbackHandler>(_rootZone, _rootErrorCallback);
_ZoneFunction<ScheduleMicrotaskHandler> get _scheduleMicrotask =>
diff --git a/sdk_nnbd/lib/convert/json.dart b/sdk_nnbd/lib/convert/json.dart
index 9528602..e932223 100644
--- a/sdk_nnbd/lib/convert/json.dart
+++ b/sdk_nnbd/lib/convert/json.dart
@@ -514,7 +514,7 @@
}
// Internal optimized JSON parsing implementation.
-external _parseJson(String source, reviver(key, value)?);
+external dynamic _parseJson(String source, reviver(key, value)?);
// Implementation of encoder/stringifier.
diff --git a/sdk_nnbd/lib/html/dart2js/html_dart2js.dart b/sdk_nnbd/lib/html/dart2js/html_dart2js.dart
index f8ed144..c8d19df 100644
--- a/sdk_nnbd/lib/html/dart2js/html_dart2js.dart
+++ b/sdk_nnbd/lib/html/dart2js/html_dart2js.dart
@@ -13476,7 +13476,7 @@
* from W3C.
*/
@SupportedBrowser(SupportedBrowser.CHROME, '25')
- ShadowRoot get shadowRoot =>
+ ShadowRoot? get shadowRoot =>
JS('ShadowRoot|Null', '#.shadowRoot || #.webkitShadowRoot', this, this);
/**
@@ -22913,13 +22913,13 @@
_ChildNodeListLazy(this._this);
Node get first {
- Node result = JS('Node|Null', '#.firstChild', _this);
+ Node? result = JS('Node|Null', '#.firstChild', _this);
if (result == null) throw new StateError("No elements");
return result;
}
Node get last {
- Node result = JS('Node|Null', '#.lastChild', _this);
+ Node? result = JS('Node|Null', '#.lastChild', _this);
if (result == null) throw new StateError("No elements");
return result;
}
@@ -22928,7 +22928,7 @@
int l = this.length;
if (l == 0) throw new StateError("No elements");
if (l > 1) throw new StateError("More than one element");
- return JS('Node|Null', '#.firstChild', _this);
+ return JS('Node|Null', '#.firstChild', _this)!;
}
void add(Node value) {
@@ -31939,10 +31939,10 @@
*/
Document get document => JS('Document', '#.document', this);
- WindowBase _open2(url, name) =>
+ WindowBase? _open2(url, name) =>
JS('Window|Null', '#.open(#,#)', this, url, name);
- WindowBase _open3(url, name, options) =>
+ WindowBase? _open3(url, name, options) =>
JS('Window|Null', '#.open(#,#,#)', this, url, name, options);
/**
@@ -32064,7 +32064,7 @@
@SupportedBrowser(SupportedBrowser.CHROME, '23.0')
@SupportedBrowser(SupportedBrowser.FIREFOX, '15.0')
@SupportedBrowser(SupportedBrowser.IE, '10.0')
- IdbFactory get indexedDB => JS(
+ IdbFactory? get indexedDB => JS(
'IdbFactory|Null', // If not supported, returns null.
'#.indexedDB || #.webkitIndexedDB || #.mozIndexedDB',
this,
@@ -39907,7 +39907,7 @@
return e;
}
-EventTarget _convertDartToNative_EventTarget(e) {
+EventTarget? _convertDartToNative_EventTarget(e) {
if (e is _DOMWindowCrossFrame) {
return e._window;
} else {
@@ -40521,7 +40521,7 @@
* browser. If false, using these types will generate a runtime
* error.
*/
- static final supportsTypedData = JS('bool', '!!(window.ArrayBuffer)');
+ static final bool supportsTypedData = JS('bool', '!!(window.ArrayBuffer)');
/**
* Returns true if SIMD types in dart:typed_data types are supported
diff --git a/sdk_nnbd/lib/libraries.json b/sdk_nnbd/lib/libraries.json
index 4960b8b..d94a4c6 100644
--- a/sdk_nnbd/lib/libraries.json
+++ b/sdk_nnbd/lib/libraries.json
@@ -87,7 +87,8 @@
"patches": [
"_internal/vm/lib/ffi_patch.dart",
"_internal/vm/lib/ffi_dynamic_library_patch.dart",
- "_internal/vm/lib/ffi_native_type_patch.dart"
+ "_internal/vm/lib/ffi_native_type_patch.dart",
+ "_internal/vm/lib/ffi_struct_patch.dart"
]
},
"wasm": {
diff --git a/sdk_nnbd/lib/libraries.yaml b/sdk_nnbd/lib/libraries.yaml
index b37041a..bd36740 100644
--- a/sdk_nnbd/lib/libraries.yaml
+++ b/sdk_nnbd/lib/libraries.yaml
@@ -93,6 +93,7 @@
- "_internal/vm/lib/ffi_patch.dart"
- "_internal/vm/lib/ffi_dynamic_library_patch.dart"
- "_internal/vm/lib/ffi_native_type_patch.dart"
+ - "_internal/vm/lib/ffi_struct_patch.dart"
wasm:
uri: "wasm/wasm.dart"
diff --git a/tests/compiler/dart2js/end_to_end/async_compiler_input_provider_test.dart b/tests/compiler/dart2js/end_to_end/async_compiler_input_provider_test.dart
index 404b675..c9a6b53 100644
--- a/tests/compiler/dart2js/end_to_end/async_compiler_input_provider_test.dart
+++ b/tests/compiler/dart2js/end_to_end/async_compiler_input_provider_test.dart
@@ -49,13 +49,11 @@
// Find the path to sdk/ in the repo relative to this script.
Uri librariesSpec = Uri.base.resolve('sdk/lib/libraries.json');
- Uri packageRoot = Uri.base.resolve('packages/');
var platformDir =
Uri.parse(nativeToUriPath(Platform.resolvedExecutable)).resolve('.');
asyncTest(() => compiler.compile(
entrypoint,
librariesSpec,
- packageRoot,
provideInput,
handleDiagnostic,
['--platform-binaries=${platformDir}']).then((code) {
diff --git a/tests/compiler/dart2js/helpers/memory_compiler.dart b/tests/compiler/dart2js/helpers/memory_compiler.dart
index fb7a7da..761eb23 100644
--- a/tests/compiler/dart2js/helpers/memory_compiler.dart
+++ b/tests/compiler/dart2js/helpers/memory_compiler.dart
@@ -73,7 +73,6 @@
List<String> options: const <String>[],
bool showDiagnostics: true,
Uri librariesSpecificationUri,
- Uri packageRoot,
Uri packageConfig,
void beforeRun(CompilerImpl compiler)}) async {
if (entryPoint == null) {
@@ -87,7 +86,6 @@
options: options,
showDiagnostics: showDiagnostics,
librariesSpecificationUri: librariesSpecificationUri,
- packageRoot: packageRoot,
packageConfig: packageConfig);
if (beforeRun != null) {
beforeRun(compiler);
@@ -107,12 +105,11 @@
List<String> options: const <String>[],
bool showDiagnostics: true,
Uri librariesSpecificationUri,
- Uri packageRoot,
Uri packageConfig}) {
retainDataForTesting = true;
librariesSpecificationUri ??= Uri.base.resolve('sdk/lib/libraries.json');
- if (packageRoot == null && packageConfig == null) {
+ if (packageConfig == null) {
if (Platform.packageConfig != null) {
packageConfig = Uri.base.resolve(Platform.packageConfig);
} else {
@@ -135,7 +132,6 @@
CompilerOptions compilerOptions = CompilerOptions.parse(options,
librariesSpecificationUri: librariesSpecificationUri)
..entryPoint = entryPoint
- ..packageRoot = packageRoot
..environment = {}
..packageConfig = packageConfig;
compilerOptions.kernelInitializedCompilerState =
diff --git a/tests/compiler/dart2js/impact/data/as.dart b/tests/compiler/dart2js/impact/data/as.dart
index 059a86a..efe5dd4 100644
--- a/tests/compiler/dart2js/impact/data/as.dart
+++ b/tests/compiler/dart2js/impact/data/as.dart
@@ -11,14 +11,14 @@
promoted(null);
}
-/*member: explicitAs:dynamic=[String.length],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,param:String]*/
+/*member: explicitAs:dynamic=[String.length],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,param:String]*/
explicitAs(String i) {
i.length;
// ignore: unnecessary_cast
return i as String;
}
-/*member: implicitAs:dynamic=[String.length],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,param:String]*/
+/*member: implicitAs:dynamic=[String.length],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,param:String]*/
String implicitAs(String i) {
dynamic j = i;
i.length;
@@ -26,7 +26,7 @@
return j;
}
-/*member: promoted:dynamic=[String.length],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,is:String]*/
+/*member: promoted:dynamic=[String.length],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,is:String]*/
String promoted(dynamic i) {
if (i is! String) return null;
i.length;
diff --git a/tests/compiler/dart2js/impact/data/async.dart b/tests/compiler/dart2js/impact/data/async.dart
index 2cc6b7d..c4f1a10 100644
--- a/tests/compiler/dart2js/impact/data/async.dart
+++ b/tests/compiler/dart2js/impact/data/async.dart
@@ -219,13 +219,13 @@
return () async* {};
}
-/*member: testAsyncForIn:dynamic=[_StreamIterator.cancel(0),_StreamIterator.current,_StreamIterator.moveNext(0)],static=[Rti._bind(1),Rti._eval(1),StreamIterator.(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_asyncAwait(2),_asyncRethrow(2),_asyncReturn(2),_asyncStartSync(2),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),_makeAsyncAwaitCompleter<dynamic>(0),_wrapJsFunctionForAsync(1),findType(1),instanceType(1)],type=[impl:Stream<dynamic>,inst:Closure,inst:JSBool,inst:JSNull,inst:Null]*/
+/*member: testAsyncForIn:dynamic=[_StreamIterator.cancel(0),_StreamIterator.current,_StreamIterator.moveNext(0)],static=[Rti._bind(1),Rti._eval(1),StreamIterator.(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_asyncAwait(2),_asyncRethrow(2),_asyncReturn(2),_asyncStartSync(2),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),_makeAsyncAwaitCompleter<dynamic>(0),_wrapJsFunctionForAsync(1),findType(1),instanceType(1)],type=[impl:Stream<dynamic>,inst:Closure,inst:JSBool,inst:JSNull,inst:Null]*/
testAsyncForIn(o) async {
// ignore: UNUSED_LOCAL_VARIABLE
await for (var e in o) {}
}
-/*member: testAsyncForInTyped:dynamic=[_StreamIterator.cancel(0),_StreamIterator.current,_StreamIterator.moveNext(0)],static=[Rti._bind(1),Rti._eval(1),StreamIterator.(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_asyncAwait(2),_asyncRethrow(2),_asyncReturn(2),_asyncStartSync(2),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),_makeAsyncAwaitCompleter<dynamic>(0),_wrapJsFunctionForAsync(1),findType(1),instanceType(1)],type=[impl:Stream<dynamic>,impl:int,inst:Closure,inst:JSBool,inst:JSNull,inst:Null]*/
+/*member: testAsyncForInTyped:dynamic=[_StreamIterator.cancel(0),_StreamIterator.current,_StreamIterator.moveNext(0)],static=[Rti._bind(1),Rti._eval(1),StreamIterator.(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_asyncAwait(2),_asyncRethrow(2),_asyncReturn(2),_asyncStartSync(2),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),_makeAsyncAwaitCompleter<dynamic>(0),_wrapJsFunctionForAsync(1),findType(1),instanceType(1)],type=[impl:Stream<dynamic>,impl:int,inst:Closure,inst:JSBool,inst:JSNull,inst:Null]*/
testAsyncForInTyped(o) async {
// ignore: UNUSED_LOCAL_VARIABLE
await for (int e in o) {}
diff --git a/tests/compiler/dart2js/impact/data/classes.dart b/tests/compiler/dart2js/impact/data/classes.dart
index 09be0cd..4ba507b 100644
--- a/tests/compiler/dart2js/impact/data/classes.dart
+++ b/tests/compiler/dart2js/impact/data/classes.dart
@@ -139,7 +139,7 @@
testForwardingConstructor() => new ForwardingConstructorClass(null);
class ForwardingConstructorTypedSuperClass {
- /*member: ForwardingConstructorTypedSuperClass.:static=[Object.(0),Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,param:int]*/
+ /*member: ForwardingConstructorTypedSuperClass.:static=[Object.(0),Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,param:int]*/
ForwardingConstructorTypedSuperClass(int arg);
}
@@ -153,7 +153,7 @@
testForwardingConstructorTyped() => new ForwardingConstructorTypedClass(null);
class ForwardingConstructorGenericSuperClass<T> {
- /*member: ForwardingConstructorGenericSuperClass.:static=[Object.(0),Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),checkSubtypeOfRuntimeType(2),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSUnmodifiableArray<dynamic>,param:ForwardingConstructorGenericSuperClass.T]*/
+ /*member: ForwardingConstructorGenericSuperClass.:static=[Object.(0),Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),checkSubtypeOfRuntimeType(2),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSUnmodifiableArray<dynamic>,param:ForwardingConstructorGenericSuperClass.T]*/
ForwardingConstructorGenericSuperClass(T arg);
}
@@ -183,7 +183,7 @@
*/
testEnum() => Enum.A;
-/*member: staticGenericMethod:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),checkSubtypeOfRuntimeType(2),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSUnmodifiableArray<dynamic>,inst:List<staticGenericMethod.T>,param:Object,param:staticGenericMethod.T]*/
+/*member: staticGenericMethod:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),checkSubtypeOfRuntimeType(2),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSUnmodifiableArray<dynamic>,inst:List<staticGenericMethod.T>,param:Object,param:staticGenericMethod.T]*/
List<T> staticGenericMethod<T>(T arg) => [arg];
/*member: testStaticGenericMethod:
@@ -230,7 +230,7 @@
class GenericClass<X, Y> {
const GenericClass.generative();
- /*member: GenericClass.genericMethod:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),checkSubtypeOfRuntimeType(2),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,inst:Map<GenericClass.X,genericMethod.T>,param:Object,param:genericMethod.T]*/
+ /*member: GenericClass.genericMethod:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),checkSubtypeOfRuntimeType(2),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,inst:Map<GenericClass.X,genericMethod.T>,param:Object,param:genericMethod.T]*/
Map<X, T> genericMethod<T>(T arg) => {null: arg};
}
diff --git a/tests/compiler/dart2js/impact/data/constants/lib.dart b/tests/compiler/dart2js/impact/data/constants/lib.dart
index 1eeb5d1..3f0a149 100644
--- a/tests/compiler/dart2js/impact/data/constants/lib.dart
+++ b/tests/compiler/dart2js/impact/data/constants/lib.dart
@@ -44,7 +44,7 @@
const typeLiteralField = String;
-/*member: id:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),checkSubtypeOfRuntimeType(2),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSUnmodifiableArray<dynamic>,param:Object,param:id.T]*/
+/*member: id:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),checkSubtypeOfRuntimeType(2),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSUnmodifiableArray<dynamic>,param:Object,param:id.T]*/
T id<T>(T t) => t;
const int Function(int) _instantiation = id;
diff --git a/tests/compiler/dart2js/impact/data/constructors.dart b/tests/compiler/dart2js/impact/data/constructors.dart
index c3262ba..3ffff0b 100644
--- a/tests/compiler/dart2js/impact/data/constructors.dart
+++ b/tests/compiler/dart2js/impact/data/constructors.dart
@@ -154,7 +154,7 @@
/*member: GenericClass.generative:static=[Object.(0)]*/
const GenericClass.generative();
- /*member: GenericClass.fact:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Object]*/
+ /*member: GenericClass.fact:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Object]*/
factory GenericClass.fact() => null;
const factory GenericClass.redirect() = GenericClass<X, Y>.generative;
diff --git a/tests/compiler/dart2js/impact/data/effectively_final.dart b/tests/compiler/dart2js/impact/data/effectively_final.dart
index 9384140..d2677d7 100644
--- a/tests/compiler/dart2js/impact/data/effectively_final.dart
+++ b/tests/compiler/dart2js/impact/data/effectively_final.dart
@@ -69,7 +69,7 @@
/*member: _method1:type=[inst:JSNull]*/
num _method1() => null;
-/*member: effectivelyFinalPromoted:dynamic=[int.+,num.+],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),_method1(0),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSDouble,inst:JSInt,inst:JSNumber,inst:JSPositiveInt,inst:JSUInt31,inst:JSUInt32,is:int]*/
+/*member: effectivelyFinalPromoted:dynamic=[int.+,num.+],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),_method1(0),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSDouble,inst:JSInt,inst:JSNumber,inst:JSPositiveInt,inst:JSUInt31,inst:JSUInt32,is:int]*/
effectivelyFinalPromoted() {
dynamic c = _method1();
c + 0;
@@ -81,7 +81,7 @@
/*member: _method2:type=[inst:JSNull]*/
String _method2() => null;
-/*member: effectivelyFinalPromotedInvalid:dynamic=[String.+,int.+],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),_method2(0),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSDouble,inst:JSInt,inst:JSNumber,inst:JSPositiveInt,inst:JSString,inst:JSUInt31,inst:JSUInt32,is:int]*/
+/*member: effectivelyFinalPromotedInvalid:dynamic=[String.+,int.+],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),_method2(0),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSDouble,inst:JSInt,inst:JSNumber,inst:JSPositiveInt,inst:JSString,inst:JSUInt31,inst:JSUInt32,is:int]*/
effectivelyFinalPromotedInvalid() {
dynamic c = _method2();
c + '';
diff --git a/tests/compiler/dart2js/impact/data/expressions.dart b/tests/compiler/dart2js/impact/data/expressions.dart
index c15c49c..3f2ef46 100644
--- a/tests/compiler/dart2js/impact/data/expressions.dart
+++ b/tests/compiler/dart2js/impact/data/expressions.dart
@@ -107,58 +107,58 @@
*/
testPreDec(o) => --o;
-/*member: testIs:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,is:Class]*/
+/*member: testIs:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,is:Class]*/
testIs() => null is Class;
-/*member: testIsGeneric:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,is:GenericClass<int,String>]*/
+/*member: testIsGeneric:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,is:GenericClass<int,String>]*/
testIsGeneric() => null is GenericClass<int, String>;
-/*member: testIsGenericRaw:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,is:GenericClass<dynamic,dynamic>]*/
+/*member: testIsGenericRaw:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,is:GenericClass<dynamic,dynamic>]*/
testIsGenericRaw() => null is GenericClass;
-/*member: testIsGenericDynamic:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,is:GenericClass<dynamic,dynamic>]*/
+/*member: testIsGenericDynamic:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,is:GenericClass<dynamic,dynamic>]*/
testIsGenericDynamic() => null is GenericClass<dynamic, dynamic>;
-/*member: testIsNot:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,is:Class]*/
+/*member: testIsNot:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,is:Class]*/
testIsNot() => null is! Class;
-/*member: testIsNotGeneric:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,is:GenericClass<int,String>]*/
+/*member: testIsNotGeneric:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,is:GenericClass<int,String>]*/
testIsNotGeneric() => null is! GenericClass<int, String>;
-/*member: testIsNotGenericRaw:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,is:GenericClass<dynamic,dynamic>]*/
+/*member: testIsNotGenericRaw:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,is:GenericClass<dynamic,dynamic>]*/
testIsNotGenericRaw() => null is! GenericClass;
-/*member: testIsNotGenericDynamic:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,is:GenericClass<dynamic,dynamic>]*/
+/*member: testIsNotGenericDynamic:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,is:GenericClass<dynamic,dynamic>]*/
testIsNotGenericDynamic() => null is! GenericClass<dynamic, dynamic>;
-/*member: testIsTypedef:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,is:dynamic Function()]*/
+/*member: testIsTypedef:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,is:dynamic Function()]*/
testIsTypedef() => null is Typedef;
-/*member: testIsTypedefGeneric:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,is:int Function(String)]*/
+/*member: testIsTypedefGeneric:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,is:int Function(String)]*/
testIsTypedefGeneric() => null is GenericTypedef<int, String>;
-/*member: testIsTypedefGenericRaw:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,is:dynamic Function(dynamic)]*/
+/*member: testIsTypedefGenericRaw:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,is:dynamic Function(dynamic)]*/
testIsTypedefGenericRaw() => null is GenericTypedef;
-/*member: testIsTypedefGenericDynamic:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,is:dynamic Function(dynamic)]*/
+/*member: testIsTypedefGenericDynamic:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,is:dynamic Function(dynamic)]*/
testIsTypedefGenericDynamic() => null is GenericTypedef<dynamic, dynamic>;
-/*member: testIsTypedefDeep:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,is:List<int Function(dynamic Function(dynamic))>]*/
+/*member: testIsTypedefDeep:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,is:List<int Function(dynamic Function(dynamic))>]*/
testIsTypedefDeep() => null is List<GenericTypedef<int, GenericTypedef>>;
-/*member: testAs:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1),throwRuntimeError(1)],type=[as:Class,inst:Closure,inst:JSBool]*/
+/*member: testAs:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1),throwRuntimeError(1)],type=[as:Class,inst:Closure,inst:JSBool]*/
// ignore: UNNECESSARY_CAST
testAs(dynamic o) => o as Class;
-/*member: testAsGeneric:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2),throwRuntimeError(1)],type=[as:GenericClass<int,String>,inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSUnmodifiableArray<dynamic>]*/
+/*member: testAsGeneric:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2),throwRuntimeError(1)],type=[as:GenericClass<int,String>,inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSUnmodifiableArray<dynamic>]*/
// ignore: UNNECESSARY_CAST
testAsGeneric(dynamic o) => o as GenericClass<int, String>;
-/*member: testAsGenericRaw:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1),throwRuntimeError(1)],type=[as:GenericClass<dynamic,dynamic>,inst:Closure,inst:JSBool]*/
+/*member: testAsGenericRaw:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1),throwRuntimeError(1)],type=[as:GenericClass<dynamic,dynamic>,inst:Closure,inst:JSBool]*/
// ignore: UNNECESSARY_CAST
testAsGenericRaw(dynamic o) => o as GenericClass;
-/*member: testAsGenericDynamic:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1),throwRuntimeError(1)],type=[as:GenericClass<dynamic,dynamic>,inst:Closure,inst:JSBool]*/
+/*member: testAsGenericDynamic:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1),throwRuntimeError(1)],type=[as:GenericClass<dynamic,dynamic>,inst:Closure,inst:JSBool]*/
// ignore: UNNECESSARY_CAST
testAsGenericDynamic(dynamic o) => o as GenericClass<dynamic, dynamic>;
@@ -170,7 +170,7 @@
/*member: testIfNotNull:dynamic=[Object.==,foo],type=[inst:JSNull]*/
testIfNotNull(o) => o?.foo;
-/*member: testTypedIfNotNull:dynamic=[Class.==,Class.field],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class]*/
+/*member: testTypedIfNotNull:dynamic=[Class.==,Class.field],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class]*/
testTypedIfNotNull(Class o) => o?.field;
/*member: testIfNotNullSet:dynamic=[Object.==,foo=],type=[inst:JSBool,inst:JSNull]*/
diff --git a/tests/compiler/dart2js/impact/data/extract_type_arguments.dart b/tests/compiler/dart2js/impact/data/extract_type_arguments.dart
index 3c9b8f3..dcdb613 100644
--- a/tests/compiler/dart2js/impact/data/extract_type_arguments.dart
+++ b/tests/compiler/dart2js/impact/data/extract_type_arguments.dart
@@ -14,10 +14,10 @@
/*member: C.:static=[Object.(0)]*/
class C implements A<int>, B<String, bool> {}
-/*member: testA:dynamic=[call<A.T>(0)],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),extractTypeArguments<A<dynamic>>(2),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[impl:A<dynamic>,impl:Function,inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSUnmodifiableArray<dynamic>,is:A<A.T>]*/
+/*member: testA:dynamic=[call<A.T>(0)],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),extractTypeArguments<A<dynamic>>(2),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[impl:A<dynamic>,impl:Function,inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSUnmodifiableArray<dynamic>,is:A<A.T>]*/
testA(c, f) => extractTypeArguments<A>(c, f);
-/*member: testB:dynamic=[call<B.S,B.U>(0)],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),extractTypeArguments<B<dynamic,dynamic>>(2),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[impl:B<dynamic,dynamic>,impl:Function,inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSUnmodifiableArray<dynamic>,is:B<B.S,B.U>]*/
+/*member: testB:dynamic=[call<B.S,B.U>(0)],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),extractTypeArguments<B<dynamic,dynamic>>(2),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[impl:B<dynamic,dynamic>,impl:Function,inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSUnmodifiableArray<dynamic>,is:B<B.S,B.U>]*/
testB(c, f) => extractTypeArguments<B>(c, f);
/*member: main:static=[C.(0),testA(2),testB(2)],type=[inst:JSNull]*/
diff --git a/tests/compiler/dart2js/impact/data/initializers.dart b/tests/compiler/dart2js/impact/data/initializers.dart
index 631eb49..755036c 100644
--- a/tests/compiler/dart2js/impact/data/initializers.dart
+++ b/tests/compiler/dart2js/impact/data/initializers.dart
@@ -30,10 +30,10 @@
testGenericClass();
}
-/*member: testDefaultValuesPositional:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,param:bool]*/
+/*member: testDefaultValuesPositional:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,param:bool]*/
testDefaultValuesPositional([bool value = false]) {}
-/*member: testDefaultValuesNamed:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,param:bool]*/
+/*member: testDefaultValuesNamed:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,param:bool]*/
testDefaultValuesNamed({bool value: false}) {}
class ClassFieldInitializer1 {
@@ -86,7 +86,7 @@
/*member: ClassInstanceFieldWithInitializer.:static=[Object.(0)]*/
class ClassInstanceFieldWithInitializer {
- /*member: ClassInstanceFieldWithInitializer.field:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,param:bool]*/
+ /*member: ClassInstanceFieldWithInitializer.field:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,param:bool]*/
var field = false;
}
@@ -95,7 +95,7 @@
/*member: ClassInstanceFieldTyped.:static=[Object.(0)]*/
class ClassInstanceFieldTyped {
- /*member: ClassInstanceFieldTyped.field:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:int]*/
+ /*member: ClassInstanceFieldTyped.field:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:int]*/
int field;
}
@@ -122,7 +122,7 @@
testSuperInitializer() => new ClassSuperInitializer();
class ClassGeneric<T> {
- /*member: ClassGeneric.:static=[Object.(0),Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),checkSubtypeOfRuntimeType(2),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSUnmodifiableArray<dynamic>,param:ClassGeneric.T]*/
+ /*member: ClassGeneric.:static=[Object.(0),Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),checkSubtypeOfRuntimeType(2),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSUnmodifiableArray<dynamic>,param:ClassGeneric.T]*/
ClassGeneric(T arg);
}
diff --git a/tests/compiler/dart2js/impact/data/injected_cast.dart b/tests/compiler/dart2js/impact/data/injected_cast.dart
index a1ced47..08fb66f 100644
--- a/tests/compiler/dart2js/impact/data/injected_cast.dart
+++ b/tests/compiler/dart2js/impact/data/injected_cast.dart
@@ -16,11 +16,11 @@
/*member: Class1.:static=[Object.(0)]*/
class Class1 {
- /*member: Class1.field1:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:A]*/
+ /*member: Class1.field1:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:A]*/
A field1;
}
-/*member: method1:dynamic=[Class1.field1=],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[impl:A,inst:Closure,inst:JSBool,is:Class1]*/
+/*member: method1:dynamic=[Class1.field1=],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[impl:A,inst:Closure,inst:JSBool,is:Class1]*/
method1(dynamic o, dynamic value) {
if (o is! Class1) return;
o.field1 = value;
@@ -50,11 +50,11 @@
/*member: Class3.:static=[Object.(0)]*/
class Class3 {
- /*member: Class3.method3:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:A,param:B,param:C]*/
+ /*member: Class3.method3:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:A,param:B,param:C]*/
method3(A a, [B b, C c]) {}
}
-/*member: method3:dynamic=[Class3.method3(3)],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[impl:A,impl:C,inst:Closure,inst:JSBool,is:Class3,param:B]*/
+/*member: method3:dynamic=[Class3.method3(3)],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[impl:A,impl:C,inst:Closure,inst:JSBool,is:Class3,param:B]*/
method3(dynamic o, dynamic a, B b, dynamic c) {
if (o is! Class3) return;
o.method3(a, b, c);
@@ -62,11 +62,11 @@
/*member: Class4.:static=[Object.(0)]*/
class Class4 {
- /*member: Class4.method4:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:A,param:B,param:C]*/
+ /*member: Class4.method4:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:A,param:B,param:C]*/
method4(A a, {B b, C c}) {}
}
-/*member: method4:dynamic=[Class4.method4(1,b,c)],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[impl:A,impl:C,inst:Closure,inst:JSBool,is:Class4,param:B]*/
+/*member: method4:dynamic=[Class4.method4(1,b,c)],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[impl:A,impl:C,inst:Closure,inst:JSBool,is:Class4,param:B]*/
method4(dynamic o, dynamic a, B b, dynamic c) {
if (o is! Class4) return;
o.method4(a, c: c, b: b);
@@ -144,7 +144,7 @@
A Function(A) get f => null;
}
-/*member: method7:dynamic=[Class7.f(1),call(1)],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[impl:A,inst:Closure,inst:JSBool,is:Class7]*/
+/*member: method7:dynamic=[Class7.f(1),call(1)],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[impl:A,inst:Closure,inst:JSBool,is:Class7]*/
method7(dynamic o, dynamic a) {
if (o is! Class7) return;
o.f(a);
@@ -172,7 +172,7 @@
return g.method(iterable);
}
-/*member: method9:dynamic=[G.field=],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[impl:int,inst:Closure,inst:JSBool,inst:JSNull,is:G,param:num]*/
+/*member: method9:dynamic=[G.field=],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[impl:int,inst:Closure,inst:JSBool,inst:JSNull,is:G,param:num]*/
method9(dynamic g, num value) {
if (g is! G) return null;
return g.field = value;
diff --git a/tests/compiler/dart2js/impact/data/invokes.dart b/tests/compiler/dart2js/impact/data/invokes.dart
index 2e93818..41ca532 100644
--- a/tests/compiler/dart2js/impact/data/invokes.dart
+++ b/tests/compiler/dart2js/impact/data/invokes.dart
@@ -117,13 +117,13 @@
topLevelFunction3(15, c: 16, b: 17);
}
-/*member: topLevelFunction1Typed:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,param:int]*/
+/*member: topLevelFunction1Typed:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,param:int]*/
void topLevelFunction1Typed(int a) {}
-/*member: topLevelFunction2Typed:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:String,param:double,param:num]*/
+/*member: topLevelFunction2Typed:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:String,param:double,param:num]*/
int topLevelFunction2Typed(String a, [num b, double c]) => null;
-/*member: topLevelFunction3Typed:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,param:List<int>,param:Map<String,bool>,param:bool]*/
+/*member: topLevelFunction3Typed:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,param:List<int>,param:Map<String,bool>,param:bool]*/
double topLevelFunction3Typed(bool a, {List<int> b, Map<String, bool> c}) {
return null;
}
@@ -164,16 +164,16 @@
topLevelFunction3Typed(false, c: {'16': false}, b: [17]);
}
-/*member: topLevelFunctionTyped1:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSUnmodifiableArray<dynamic>,param:void Function(num)]*/
+/*member: topLevelFunctionTyped1:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSUnmodifiableArray<dynamic>,param:void Function(num)]*/
topLevelFunctionTyped1(void a(num b)) {}
-/*member: topLevelFunctionTyped2:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSUnmodifiableArray<dynamic>,param:void Function(num,[String])]*/
+/*member: topLevelFunctionTyped2:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSUnmodifiableArray<dynamic>,param:void Function(num,[String])]*/
topLevelFunctionTyped2(void a(num b, [String c])) {}
-/*member: topLevelFunctionTyped3:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSUnmodifiableArray<dynamic>,param:void Function(num,{String c,int d})]*/
+/*member: topLevelFunctionTyped3:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSUnmodifiableArray<dynamic>,param:void Function(num,{String c,int d})]*/
topLevelFunctionTyped3(void a(num b, {String c, int d})) {}
-/*member: topLevelFunctionTyped4:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSUnmodifiableArray<dynamic>,param:void Function(num,{int c,String d})]*/
+/*member: topLevelFunctionTyped4:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSUnmodifiableArray<dynamic>,param:void Function(num,{int c,String d})]*/
topLevelFunctionTyped4(void a(num b, {String d, int c})) {}
/*member: testTopLevelFunctionTyped:
@@ -212,7 +212,7 @@
/*member: testTopLevelSetterSet:static=[set:topLevelSetter],type=[inst:JSNull]*/
testTopLevelSetterSet() => topLevelSetter = null;
-/*member: topLevelSetterTyped=:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,param:int]*/
+/*member: topLevelSetterTyped=:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,param:int]*/
void set topLevelSetterTyped(int value) {}
/*member: testTopLevelSetterSetTyped:static=[set:topLevelSetterTyped],type=[inst:JSNull]*/
@@ -241,25 +241,25 @@
/*member: testTopLevelFieldFinal:static=[topLevelFieldFinal]*/
testTopLevelFieldFinal() => topLevelFieldFinal;
-/*member: topLevelFieldTyped:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:int]*/
+/*member: topLevelFieldTyped:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:int]*/
int topLevelFieldTyped;
/*member: testTopLevelFieldTyped:static=[topLevelFieldTyped]*/
testTopLevelFieldTyped() => topLevelFieldTyped;
-/*member: topLevelFieldGeneric1:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:GenericClass<dynamic,dynamic>]*/
+/*member: topLevelFieldGeneric1:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:GenericClass<dynamic,dynamic>]*/
GenericClass topLevelFieldGeneric1;
/*member: testTopLevelFieldGeneric1:static=[topLevelFieldGeneric1]*/
testTopLevelFieldGeneric1() => topLevelFieldGeneric1;
-/*member: topLevelFieldGeneric2:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:GenericClass<dynamic,dynamic>]*/
+/*member: topLevelFieldGeneric2:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:GenericClass<dynamic,dynamic>]*/
GenericClass<dynamic, dynamic> topLevelFieldGeneric2;
/*member: testTopLevelFieldGeneric2:static=[topLevelFieldGeneric2]*/
testTopLevelFieldGeneric2() => topLevelFieldGeneric2;
-/*member: topLevelFieldGeneric3:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,param:GenericClass<int,String>]*/
+/*member: topLevelFieldGeneric3:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,param:GenericClass<int,String>]*/
GenericClass<int, String> topLevelFieldGeneric3;
/*member: testTopLevelFieldGeneric3:static=[topLevelFieldGeneric3]*/
@@ -384,7 +384,7 @@
localFunction() {}
}
-/*member: testLocalFunctionTyped:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),computeSignature(3),def:localFunction,findType(1),getRuntimeTypeArguments(3),getRuntimeTypeInfo(1),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:Function,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,param:String]*/
+/*member: testLocalFunctionTyped:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),computeSignature(3),def:localFunction,findType(1),getRuntimeTypeArguments(3),getRuntimeTypeInfo(1),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:Function,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,param:String]*/
testLocalFunctionTyped() {
// ignore: UNUSED_ELEMENT
int localFunction(String a) => null;
diff --git a/tests/compiler/dart2js/impact/data/jsinterop.dart b/tests/compiler/dart2js/impact/data/jsinterop.dart
index efddfaa..98f8cee 100644
--- a/tests/compiler/dart2js/impact/data/jsinterop.dart
+++ b/tests/compiler/dart2js/impact/data/jsinterop.dart
@@ -61,7 +61,7 @@
/*member: GenericClass.:static=[JavaScriptObject.(0)]*/
@JS()
class GenericClass<T> {
- /*member: GenericClass.method:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,param:void Function(GenericClass.T)]*/
+ /*member: GenericClass.method:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,param:void Function(GenericClass.T)]*/
external GenericClass method([Callback<T> callback]);
}
diff --git a/tests/compiler/dart2js/impact/data/jsinterop_setter1.dart b/tests/compiler/dart2js/impact/data/jsinterop_setter1.dart
index d60cd83..18db4e3 100644
--- a/tests/compiler/dart2js/impact/data/jsinterop_setter1.dart
+++ b/tests/compiler/dart2js/impact/data/jsinterop_setter1.dart
@@ -11,11 +11,11 @@
import 'package:js/js.dart';
-/*member: foo=:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,native:ApplicationCacheErrorEvent,native:DomError,native:DomException,native:ErrorEvent,native:MediaError,native:NavigatorUserMediaError,native:OverconstrainedError,native:PositionError,native:SensorErrorEvent,native:SpeechRecognitionError,native:SqlError,param:Function]*/
+/*member: foo=:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,native:ApplicationCacheErrorEvent,native:DomError,native:DomException,native:ErrorEvent,native:MediaError,native:NavigatorUserMediaError,native:OverconstrainedError,native:PositionError,native:SensorErrorEvent,native:SpeechRecognitionError,native:SqlError,param:Function]*/
@JS()
external set foo(Function f);
-/*member: _doStuff:dynamic=[File.==,File.name],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),defineProperty(3),findType(1),instanceType(1),print(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,inst:JSString,param:File,param:String]*/
+/*member: _doStuff:dynamic=[File.==,File.name],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),defineProperty(3),findType(1),instanceType(1),print(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,inst:JSString,param:File,param:String]*/
void _doStuff(String name, File file) {
if (file == null) {
print('OK');
diff --git a/tests/compiler/dart2js/impact/data/jsinterop_setter2.dart b/tests/compiler/dart2js/impact/data/jsinterop_setter2.dart
index 2d7eb7f..ebd83d7 100644
--- a/tests/compiler/dart2js/impact/data/jsinterop_setter2.dart
+++ b/tests/compiler/dart2js/impact/data/jsinterop_setter2.dart
@@ -11,11 +11,11 @@
import 'package:js/js.dart';
-/*member: foo=:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSUnmodifiableArray<dynamic>,native:ApplicationCacheErrorEvent,native:DomError,native:DomException,native:ErrorEvent,native:File,native:MediaError,native:NavigatorUserMediaError,native:OverconstrainedError,native:PositionError,native:SensorErrorEvent,native:SpeechRecognitionError,native:SqlError,param:void Function(String,File)]*/
+/*member: foo=:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSUnmodifiableArray<dynamic>,native:ApplicationCacheErrorEvent,native:DomError,native:DomException,native:ErrorEvent,native:File,native:MediaError,native:NavigatorUserMediaError,native:OverconstrainedError,native:PositionError,native:SensorErrorEvent,native:SpeechRecognitionError,native:SqlError,param:void Function(String,File)]*/
@JS()
external set foo(void Function(String, File) f);
-/*member: _doStuff:dynamic=[File.==,File.name],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),defineProperty(3),findType(1),instanceType(1),print(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,inst:JSString,param:File,param:String]*/
+/*member: _doStuff:dynamic=[File.==,File.name],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),defineProperty(3),findType(1),instanceType(1),print(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,inst:JSString,param:File,param:String]*/
void _doStuff(String name, File file) {
if (file == null) {
print('OK');
diff --git a/tests/compiler/dart2js/impact/data/native.dart b/tests/compiler/dart2js/impact/data/native.dart
index ecbaf89..f700202 100644
--- a/tests/compiler/dart2js/impact/data/native.dart
+++ b/tests/compiler/dart2js/impact/data/native.dart
@@ -58,7 +58,7 @@
@Native("NativeClass")
class NativeClass {
- /*member: NativeClass.field:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,native:JSExtendableArray<JSExtendableArray.E>,native:Object,native:String,native:bool,native:double,native:int,param:Object]*/
+ /*member: NativeClass.field:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,native:JSExtendableArray<JSExtendableArray.E>,native:Object,native:String,native:bool,native:double,native:int,param:Object]*/
@annotation_Creates_SerializedScriptValue
final Object field;
@@ -67,5 +67,5 @@
}
}
-/*member: testNativeField:dynamic=[NativeClass.field],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),defineProperty(3),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,param:NativeClass]*/
+/*member: testNativeField:dynamic=[NativeClass.field],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),defineProperty(3),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,param:NativeClass]*/
testNativeField(NativeClass c) => c.field;
diff --git a/tests/compiler/dart2js/impact/data/promotion.dart b/tests/compiler/dart2js/impact/data/promotion.dart
index 69a6b93..04fec9f 100644
--- a/tests/compiler/dart2js/impact/data/promotion.dart
+++ b/tests/compiler/dart2js/impact/data/promotion.dart
@@ -39,17 +39,17 @@
dynamicToNoSuchMethodTearOff(null);
}
-/*member: positiveTyped:dynamic=[SubClass.method(0)],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,is:SubClass,param:Class]*/
+/*member: positiveTyped:dynamic=[SubClass.method(0)],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,is:SubClass,param:Class]*/
positiveTyped(Class cls) {
if (cls is SubClass) cls.method();
}
-/*member: positiveDynamic:dynamic=[SubClass.method(0)],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,is:SubClass]*/
+/*member: positiveDynamic:dynamic=[SubClass.method(0)],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,is:SubClass]*/
positiveDynamic(dynamic cls) {
if (cls is SubClass) cls.method();
}
-/*member: negativeDynamic:dynamic=[SubClass.method(0)],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,is:SubClass]*/
+/*member: negativeDynamic:dynamic=[SubClass.method(0)],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,is:SubClass]*/
negativeDynamic(dynamic cls) {
if (cls is! SubClass) return;
cls.method();
diff --git a/tests/compiler/dart2js/impact/data/runtime_type.dart b/tests/compiler/dart2js/impact/data/runtime_type.dart
index 204aadf..9efa562 100644
--- a/tests/compiler/dart2js/impact/data/runtime_type.dart
+++ b/tests/compiler/dart2js/impact/data/runtime_type.dart
@@ -62,88 +62,88 @@
/*member: Class4.:static=[Object.(0)]*/
class Class4 {}
-/*member: toString1:dynamic=[Class2.runtimeType,toString(0)],runtimeType=[string:Class2<int>],static=[Rti._bind(1),Rti._eval(1),S(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSString,inst:JSUnmodifiableArray<dynamic>,param:Class2<int>]*/
+/*member: toString1:dynamic=[Class2.runtimeType,toString(0)],runtimeType=[string:Class2<int>],static=[Rti._bind(1),Rti._eval(1),S(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSString,inst:JSUnmodifiableArray<dynamic>,param:Class2<int>]*/
toString1(Class2<int> c) => '${c.runtimeType}';
-/*member: toString2:dynamic=[Class2.==,Class2.runtimeType,toString(0)],runtimeType=[string:Class2<int>],static=[Rti._bind(1),Rti._eval(1),S(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSString,inst:JSUnmodifiableArray<dynamic>,param:Class2<int>]*/
+/*member: toString2:dynamic=[Class2.==,Class2.runtimeType,toString(0)],runtimeType=[string:Class2<int>],static=[Rti._bind(1),Rti._eval(1),S(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSString,inst:JSUnmodifiableArray<dynamic>,param:Class2<int>]*/
toString2(Class2<int> c) => '${c?.runtimeType}';
-/*member: toString3:dynamic=[Class2.runtimeType,Type.toString(0)],runtimeType=[string:Class2<int>],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSUnmodifiableArray<dynamic>,param:Class2<int>]*/
+/*member: toString3:dynamic=[Class2.runtimeType,Type.toString(0)],runtimeType=[string:Class2<int>],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSUnmodifiableArray<dynamic>,param:Class2<int>]*/
toString3(Class2<int> c) => c.runtimeType.toString();
-/*member: toString4:dynamic=[Class2.runtimeType,Type.==,Type.toString(0)],runtimeType=[string:Class2<int>],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,param:Class2<int>]*/
+/*member: toString4:dynamic=[Class2.runtimeType,Type.==,Type.toString(0)],runtimeType=[string:Class2<int>],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,param:Class2<int>]*/
toString4(Class2<int> c) => c.runtimeType?.toString();
-/*member: toString5:dynamic=[Class2.==,Class2.runtimeType,Type.==,Type.toString(0)],runtimeType=[string:Class2<int>],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,param:Class2<int>]*/
+/*member: toString5:dynamic=[Class2.==,Class2.runtimeType,Type.==,Type.toString(0)],runtimeType=[string:Class2<int>],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,param:Class2<int>]*/
toString5(Class2<int> c) => c?.runtimeType?.toString();
-/*member: toString6:dynamic=[Class2.==,Class2.runtimeType,Type.toString(0)],runtimeType=[string:Class2<int>],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,param:Class2<int>]*/
+/*member: toString6:dynamic=[Class2.==,Class2.runtimeType,Type.toString(0)],runtimeType=[string:Class2<int>],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,param:Class2<int>]*/
toString6(Class2<int> c) => c?.runtimeType.toString();
-/*member: unknown:dynamic=[Class2.runtimeType],runtimeType=[unknown:Class2<int>],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSUnmodifiableArray<dynamic>,param:Class2<int>]*/
+/*member: unknown:dynamic=[Class2.runtimeType],runtimeType=[unknown:Class2<int>],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSUnmodifiableArray<dynamic>,param:Class2<int>]*/
unknown(Class2<int> c) => c.runtimeType;
-/*member: equals1:dynamic=[Class1a.==,Class1a.runtimeType,Class1d.==,Class1d.runtimeType,Type.==],runtimeType=[equals:Class1a<int>/Class1d<int>],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,param:Class1a<int>,param:Class1d<int>]*/
+/*member: equals1:dynamic=[Class1a.==,Class1a.runtimeType,Class1d.==,Class1d.runtimeType,Type.==],runtimeType=[equals:Class1a<int>/Class1d<int>],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkSubtype(4),findType(1),getRuntimeTypeArgument(3),getRuntimeTypeArgumentIntercepted(4),getRuntimeTypeInfo(1),getTypeArgumentByIndex(2),instanceType(1),setRuntimeTypeInfo(2)],type=[inst:Closure,inst:JSArray<dynamic>,inst:JSBool,inst:JSExtendableArray<dynamic>,inst:JSFixedArray<dynamic>,inst:JSMutableArray<dynamic>,inst:JSNull,inst:JSUnmodifiableArray<dynamic>,param:Class1a<int>,param:Class1d<int>]*/
equals1(Class1a<int> a, Class1d<int> b) => a?.runtimeType == b?.runtimeType;
-/*member: almostEquals1:dynamic=[Class3.runtimeType,Type.==],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3]*/
+/*member: almostEquals1:dynamic=[Class3.runtimeType,Type.==],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3]*/
almostEquals1(Class3 a) => a.runtimeType == null;
-/*member: almostEquals2:dynamic=[Class3.==,Class3.runtimeType,Type.==],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3]*/
+/*member: almostEquals2:dynamic=[Class3.==,Class3.runtimeType,Type.==],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3]*/
almostEquals2(Class3 a) => a?.runtimeType == null;
-/*member: almostEquals3:dynamic=[Class3.runtimeType,Null.==],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3]*/
+/*member: almostEquals3:dynamic=[Class3.runtimeType,Null.==],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3]*/
almostEquals3(Class3 a) => null == a.runtimeType;
-/*member: almostEquals4:dynamic=[Class3.==,Class3.runtimeType,Null.==],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3]*/
+/*member: almostEquals4:dynamic=[Class3.==,Class3.runtimeType,Null.==],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3]*/
almostEquals4(Class3 a) => null == a?.runtimeType;
-/*member: almostEquals5:dynamic=[Class3.field,Class3.runtimeType,Type.==],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,param:Class3]*/
+/*member: almostEquals5:dynamic=[Class3.field,Class3.runtimeType,Type.==],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,param:Class3]*/
almostEquals5(Class3 a) => a.runtimeType == a.field;
-/*member: almostEquals6:dynamic=[Class3.==,Class3.field,Class3.runtimeType,Type.==],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3]*/
+/*member: almostEquals6:dynamic=[Class3.==,Class3.field,Class3.runtimeType,Type.==],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3]*/
almostEquals6(Class3 a) => a?.runtimeType == a.field;
-/*member: almostEquals7:dynamic=[Class3.==,Class3.field,Class3.runtimeType,Type.==],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3]*/
+/*member: almostEquals7:dynamic=[Class3.==,Class3.field,Class3.runtimeType,Type.==],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3]*/
almostEquals7(Class3 a) => a.runtimeType == a?.field;
-/*member: almostEquals8:dynamic=[Class3.==,Class3.field,Class3.runtimeType,Type.==],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3]*/
+/*member: almostEquals8:dynamic=[Class3.==,Class3.field,Class3.runtimeType,Type.==],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3]*/
almostEquals8(Class3 a) => a?.runtimeType == a?.field;
-/*member: almostEquals9:dynamic=[Class3.field,Class3.runtimeType,Object.==],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,param:Class3]*/
+/*member: almostEquals9:dynamic=[Class3.field,Class3.runtimeType,Object.==],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,param:Class3]*/
almostEquals9(Class3 a) => a.field == a.runtimeType;
-/*member: almostEquals10:dynamic=[Class3.==,Class3.field,Class3.runtimeType,Object.==],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3]*/
+/*member: almostEquals10:dynamic=[Class3.==,Class3.field,Class3.runtimeType,Object.==],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3]*/
almostEquals10(Class3 a) => a?.field == a.runtimeType;
-/*member: almostEquals11:dynamic=[Class3.==,Class3.field,Class3.runtimeType,Object.==],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3]*/
+/*member: almostEquals11:dynamic=[Class3.==,Class3.field,Class3.runtimeType,Object.==],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3]*/
almostEquals11(Class3 a) => a.field == a?.runtimeType;
-/*member: almostEquals12:dynamic=[Class3.==,Class3.field,Class3.runtimeType,Object.==],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3]*/
+/*member: almostEquals12:dynamic=[Class3.==,Class3.field,Class3.runtimeType,Object.==],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3]*/
almostEquals12(Class3 a) => a?.field == a?.runtimeType;
-/*member: almostToString1:dynamic=[Class3.runtimeType,Type.toString],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,param:Class3]*/
+/*member: almostToString1:dynamic=[Class3.runtimeType,Type.toString],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,param:Class3]*/
almostToString1(Class3 a) => a.runtimeType.toString;
-/*member: almostToString2:dynamic=[Class3.==,Class3.runtimeType,Type.==,Type.toString],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3]*/
+/*member: almostToString2:dynamic=[Class3.==,Class3.runtimeType,Type.==,Type.toString],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3]*/
almostToString2(Class3 a) => a?.runtimeType?.toString;
-/*member: almostToString3:dynamic=[Class3.runtimeType,Type.noSuchMethod(1)],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3]*/
+/*member: almostToString3:dynamic=[Class3.runtimeType,Type.noSuchMethod(1)],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3]*/
almostToString3(Class3 a) => a.runtimeType.noSuchMethod(null);
-/*member: almostToString4:dynamic=[Class3.==,Class3.runtimeType,Type.noSuchMethod(1)],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3]*/
+/*member: almostToString4:dynamic=[Class3.==,Class3.runtimeType,Type.noSuchMethod(1)],runtimeType=[unknown:Class3],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3]*/
almostToString4(Class3 a) => a?.runtimeType.noSuchMethod(null);
-/*member: notEquals1:dynamic=[Class3.runtimeType,Class4.runtimeType,Type.==],runtimeType=[equals:Class3/Class4],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,param:Class3,param:Class4]*/
+/*member: notEquals1:dynamic=[Class3.runtimeType,Class4.runtimeType,Type.==],runtimeType=[equals:Class3/Class4],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,param:Class3,param:Class4]*/
notEquals1(Class3 a, Class4 b) => a.runtimeType != b.runtimeType;
-/*member: notEquals2:dynamic=[Class3.==,Class3.runtimeType,Class4.runtimeType,Type.==],runtimeType=[equals:Class3/Class4],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3,param:Class4]*/
+/*member: notEquals2:dynamic=[Class3.==,Class3.runtimeType,Class4.runtimeType,Type.==],runtimeType=[equals:Class3/Class4],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3,param:Class4]*/
notEquals2(Class3 a, Class4 b) => a?.runtimeType != b.runtimeType;
-/*member: notEquals3:dynamic=[Class3.runtimeType,Class4.==,Class4.runtimeType,Type.==],runtimeType=[equals:Class3/Class4],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3,param:Class4]*/
+/*member: notEquals3:dynamic=[Class3.runtimeType,Class4.==,Class4.runtimeType,Type.==],runtimeType=[equals:Class3/Class4],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3,param:Class4]*/
notEquals3(Class3 a, Class4 b) => a.runtimeType != b?.runtimeType;
-/*member: notEquals4:dynamic=[Class3.==,Class3.runtimeType,Class4.==,Class4.runtimeType,Type.==],runtimeType=[equals:Class3/Class4],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3,param:Class4]*/
+/*member: notEquals4:dynamic=[Class3.==,Class3.runtimeType,Class4.==,Class4.runtimeType,Type.==],runtimeType=[equals:Class3/Class4],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1)],type=[inst:Closure,inst:JSBool,inst:JSNull,param:Class3,param:Class4]*/
notEquals4(Class3 a, Class4 b) => a?.runtimeType != b?.runtimeType;
/*member: main:dynamic=[exact:Class1a.==],static=[Class1a.(0),Class1b.(0),Class1c.(0),Class1d.(0),Class2.(0),Class3.(0),Class4.(0),almostEquals1(1),almostEquals10(1),almostEquals11(1),almostEquals12(1),almostEquals2(1),almostEquals3(1),almostEquals4(1),almostEquals5(1),almostEquals6(1),almostEquals7(1),almostEquals8(1),almostEquals9(1),almostToString1(1),almostToString2(1),almostToString3(1),almostToString4(1),checkTypeBound(4),equals1(2),notEquals1(2),notEquals2(2),notEquals3(2),notEquals4(2),print(1),throwTypeError(1),toString1(1),toString2(1),toString3(1),toString4(1),toString5(1),toString6(1),unknown(1)]*/
diff --git a/tests/compiler/dart2js/impact/data/statements.dart b/tests/compiler/dart2js/impact/data/statements.dart
index f5b41a2..57bb512a 100644
--- a/tests/compiler/dart2js/impact/data/statements.dart
+++ b/tests/compiler/dart2js/impact/data/statements.dart
@@ -67,13 +67,13 @@
return 1;
}
-/*member: testForIn:dynamic=[Iterator.current,Iterator.iterator,Iterator.moveNext(0)],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkConcurrentModificationError(2),findType(1),instanceType(1)],type=[impl:Iterable<dynamic>,inst:Closure,inst:JSBool,inst:JSNull,inst:Null]*/
+/*member: testForIn:dynamic=[Iterator.current,Iterator.iterator,Iterator.moveNext(0)],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkConcurrentModificationError(2),findType(1),instanceType(1)],type=[impl:Iterable<dynamic>,inst:Closure,inst:JSBool,inst:JSNull,inst:Null]*/
testForIn(o) {
// ignore: UNUSED_LOCAL_VARIABLE
for (var e in o) {}
}
-/*member: testForInTyped:dynamic=[Iterator.current,Iterator.iterator,Iterator.moveNext(0)],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkConcurrentModificationError(2),findType(1),instanceType(1)],type=[impl:Iterable<dynamic>,impl:int,inst:Closure,inst:JSBool,inst:JSNull,inst:Null]*/
+/*member: testForInTyped:dynamic=[Iterator.current,Iterator.iterator,Iterator.moveNext(0)],static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),checkConcurrentModificationError(2),findType(1),instanceType(1)],type=[impl:Iterable<dynamic>,impl:int,inst:Closure,inst:JSBool,inst:JSNull,inst:Null]*/
testForInTyped(o) {
// ignore: UNUSED_LOCAL_VARIABLE
for (int e in o) {}
@@ -89,7 +89,7 @@
try {} catch (e) {}
}
-/*member: testTryCatchOn:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1),unwrapException(1)],type=[catch:String,inst:Closure,inst:JSBool,inst:PlainJavaScriptObject,inst:UnknownJavaScriptObject]*/
+/*member: testTryCatchOn:static=[Rti._bind(1),Rti._eval(1),_arrayInstanceType(1),_asBoolNullable(1),_asDoubleNullable(1),_asIntNullable(1),_asNumNullable(1),_asObject(1),_asStringNullable(1),_asTop(1),_generalAsCheckImplementation(1),_generalIsTestImplementation(1),_installSpecializedIsTest(1),_instanceType(1),_isBool(1),_isInt(1),_isNum(1),_isObject(1),_isString(1),_isTop(1),findType(1),instanceType(1),unwrapException(1)],type=[catch:String,inst:Closure,inst:JSBool,inst:PlainJavaScriptObject,inst:UnknownJavaScriptObject]*/
testTryCatchOn() {
// ignore: UNUSED_CATCH_CLAUSE
try {} on String catch (e) {}
diff --git a/tests/compiler/dart2js_extra/dummy_compiler_test.dart b/tests/compiler/dart2js_extra/dummy_compiler_test.dart
index 0505deb..1f66dca 100644
--- a/tests/compiler/dart2js_extra/dummy_compiler_test.dart
+++ b/tests/compiler/dart2js_extra/dummy_compiler_test.dart
@@ -58,12 +58,8 @@
main() {
asyncStart();
- Future<CompilationResult> result = compile(
- new Uri(scheme: 'main'),
- new Uri(scheme: 'lib', path: '/'),
- new Uri(scheme: 'package', path: '/'),
- provider,
- handler);
+ Future<CompilationResult> result = compile(new Uri(scheme: 'main'),
+ new Uri(scheme: 'lib', path: '/'), provider, handler);
result.then((CompilationResult result) {
if (!result.isSuccess) {
throw 'Compilation failed';
diff --git a/tests/corelib/from_environment_default_value_test.dart b/tests/corelib/from_environment_default_value_test.dart
new file mode 100644
index 0000000..c95d000
--- /dev/null
+++ b/tests/corelib/from_environment_default_value_test.dart
@@ -0,0 +1,20 @@
+// Copyright (c) 2020, 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.
+
+import "package:expect/expect.dart";
+
+main() {
+ // Verify that the default value is as expected.
+ Expect.equals(false, const bool.fromEnvironment('UNDEFINED_NAME'));
+ Expect.equals(0, const int.fromEnvironment('UNDEFINED_NAME'));
+ Expect.equals('', const String.fromEnvironment('UNDEFINED_NAME'));
+
+ // Verify that `defaultValue` is used when passed, not the default values.
+ Expect.equals(
+ true, const bool.fromEnvironment('UNDEFINED_NAME', defaultValue: true));
+ Expect.equals(
+ 1, const int.fromEnvironment('UNDEFINED_NAME', defaultValue: 1));
+ Expect.equals('qux',
+ const String.fromEnvironment('UNDEFINED_NAME', defaultValue: 'qux'));
+}
diff --git a/tests/corelib/linked_hash_map_test.dart b/tests/corelib/linked_hash_map_test.dart
index 1cbca3b..d0422d0 100644
--- a/tests/corelib/linked_hash_map_test.dart
+++ b/tests/corelib/linked_hash_map_test.dart
@@ -17,8 +17,8 @@
map["d"] = 4;
map["e"] = 5;
- List<String?> keys = new List<String?>(5);
- List<int?> values = new List<int?>(5);
+ List<String?> keys = new List<String?>.filled(5, null);
+ List<int?> values = new List<int?>.filled(5, null);
int index = 0;
diff --git a/tests/corelib/list_as_map_test.dart b/tests/corelib/list_as_map_test.dart
index fcbd12e..27c67d1 100644
--- a/tests/corelib/list_as_map_test.dart
+++ b/tests/corelib/list_as_map_test.dart
@@ -85,11 +85,11 @@
main() {
testConstAsMap(const [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
testAsMap([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
- List list = new List(10);
+ List list = new List.filled(10, null);
for (int i = 0; i < 10; i++) list[i] = i + 1;
testFixedAsMap(list);
testConstAsMap(const []);
testAsMap([]);
- testFixedAsMap(new List(0));
+ testFixedAsMap(new List.empty());
}
diff --git a/tests/corelib/list_contains_argument_order_test.dart b/tests/corelib/list_contains_argument_order_test.dart
index bed7e20..e3c7656 100644
--- a/tests/corelib/list_contains_argument_order_test.dart
+++ b/tests/corelib/list_contains_argument_order_test.dart
@@ -14,6 +14,7 @@
class B {
bool operator ==(Object other) {
Expect.fail("Bad equality order.");
+ return false;
}
}
@@ -25,7 +26,6 @@
var iterables = <dynamic>[
<A>[new A()],
new List<A>.filled(1, new A()),
- new List<A>()..add(new A()),
const <A>[const A()],
new Set()..add(new A()),
(new Map()..[new A()] = 0).keys,
diff --git a/tests/corelib/list_fixed_test.dart b/tests/corelib/list_fixed_test.dart
index 06193c5..f88967e 100644
--- a/tests/corelib/list_fixed_test.dart
+++ b/tests/corelib/list_fixed_test.dart
@@ -7,7 +7,7 @@
main() {
var a;
- a = new List(42);
+ a = new List<int?>.filled(42, null);
Expect.equals(42, a.length);
Expect.throwsUnsupportedError(() => a.add(499));
Expect.equals(42, a.length);
diff --git a/tests/corelib/list_for_each_test.dart b/tests/corelib/list_for_each_test.dart
index b59a2d7..d908f32 100644
--- a/tests/corelib/list_for_each_test.dart
+++ b/tests/corelib/list_for_each_test.dart
@@ -35,10 +35,10 @@
}
main() {
- List fixedLengthList = new List(10);
+ List fixedLengthList = new List.filled(10, null);
for (int i = 0; i < 10; i++) fixedLengthList[i] = i + 1;
- List growableList = new List();
+ List growableList = [];
growableList.length = 10;
for (int i = 0; i < 10; i++) growableList[i] = i + 1;
diff --git a/tests/corelib/list_growable_test.dart b/tests/corelib/list_growable_test.dart
index df59f03..6a6399b 100644
--- a/tests/corelib/list_growable_test.dart
+++ b/tests/corelib/list_growable_test.dart
@@ -6,7 +6,7 @@
main() {
var a;
- a = new List();
+ a = [];
a.add(499);
Expect.equals(1, a.length);
Expect.equals(499, a[0]);
@@ -14,7 +14,7 @@
Expect.equals(0, a.length);
Expect.throwsRangeError(() => a[0]);
- a = new List(42).toList();
+ a = new List<int?>.filled(42, null).toList();
Expect.equals(42, a.length);
a.add(499);
Expect.equals(43, a.length);
@@ -24,7 +24,7 @@
Expect.equals(0, a.length);
Expect.throwsRangeError(() => a[0]);
- a = new List<int?>(42).toList();
+ a = new List<int?>.filled(42, null).toList();
Expect.equals(42, a.length);
a.add(499);
Expect.equals(43, a.length);
diff --git a/tests/corelib/list_index_of_test.dart b/tests/corelib/list_index_of_test.dart
index 0020b52..0c5aa33 100644
--- a/tests/corelib/list_index_of_test.dart
+++ b/tests/corelib/list_index_of_test.dart
@@ -5,8 +5,8 @@
import "package:expect/expect.dart";
main() {
- test(new List<int?>(5));
- var l = new List<int?>();
+ test(new List<int?>.filled(5, null));
+ var l = <int?>[];
l.length = 5;
test(l);
}
diff --git a/tests/corelib/list_insert_test.dart b/tests/corelib/list_insert_test.dart
index cd29c4e..dca19dd 100644
--- a/tests/corelib/list_insert_test.dart
+++ b/tests/corelib/list_insert_test.dart
@@ -46,7 +46,7 @@
testModifiableList(new MyList([0, 1, 2, 3, 4]));
// Fixed size list.
- var l2 = new List(5);
+ var l2 = new List<int?>.filled(5, null);
for (var i = 0; i < 5; i++) l2[i] = i;
Expect.throwsUnsupportedError(() => l2.insert(2, 5), "fixed-length");
diff --git a/tests/corelib/list_iterators_test.dart b/tests/corelib/list_iterators_test.dart
index edc6282..c82fafb 100644
--- a/tests/corelib/list_iterators_test.dart
+++ b/tests/corelib/list_iterators_test.dart
@@ -18,10 +18,9 @@
static testMain() {
checkListIterator([]);
checkListIterator([1, 2]);
- checkListIterator(new List(0));
- checkListIterator(new List(10));
- checkListIterator(new List());
- List g = new List();
+ checkListIterator(new List.empty());
+ checkListIterator(new List.filled(10, null));
+ List g = [];
g.addAll([1, 2, 3]);
checkListIterator(g);
diff --git a/tests/corelib/list_set_range_test.dart b/tests/corelib/list_set_range_test.dart
index 399b6ae..fcc56d6 100644
--- a/tests/corelib/list_set_range_test.dart
+++ b/tests/corelib/list_set_range_test.dart
@@ -77,7 +77,7 @@
}
void testNonExtendableList() {
- var list = new List<int?>(6);
+ var list = new List<int?>.filled(6, null);
Expect.listEquals([null, null, null, null, null, null], list);
list.setRange(0, 3, [1, 2, 3, 4]);
list.setRange(3, 6, [1, 2, 3, 4]);
diff --git a/tests/corelib/list_to_string2_test.dart b/tests/corelib/list_to_string2_test.dart
index d46e9d5..280d8a8 100644
--- a/tests/corelib/list_to_string2_test.dart
+++ b/tests/corelib/list_to_string2_test.dart
@@ -8,7 +8,7 @@
List list = [1, 2];
list.add(list);
- List list2 = new List(4);
+ List list2 = new List.filled(4, null);
list2[0] = 1;
list2[1] = 2;
list2[2] = list2;
diff --git a/tests/corelib/range_error_test.dart b/tests/corelib/range_error_test.dart
index 154c754..341c6a7 100644
--- a/tests/corelib/range_error_test.dart
+++ b/tests/corelib/range_error_test.dart
@@ -22,14 +22,9 @@
testListRead(list, -1);
testListRead(list, 1);
- list = new List(1);
+ list = new List.filled(1, null);
testListRead(list, -1);
testListRead(list, 1);
-
- list = new List();
- testListRead(list, -1);
- testListRead(list, 0);
- testListRead(list, 1);
}
void testWrite() {
@@ -41,14 +36,9 @@
testListWrite(list, -1);
testListWrite(list, 1);
- list = new List(1);
+ list = new List.filled(1, null);
testListWrite(list, -1);
testListWrite(list, 1);
-
- list = new List();
- testListWrite(list, -1);
- testListWrite(list, 0);
- testListWrite(list, 1);
}
void testToString() {
diff --git a/tests/corelib/stacktrace_fromstring_test.dart b/tests/corelib/stacktrace_fromstring_test.dart
index b42aba3..17dae68 100644
--- a/tests/corelib/stacktrace_fromstring_test.dart
+++ b/tests/corelib/stacktrace_fromstring_test.dart
@@ -27,7 +27,7 @@
asyncStart();
var c = new Completer();
c.completeError(0, stringTrace);
- c.future.then((v) {
+ c.future.then<Null>((v) {
throw "Unexpected value: $v";
}, onError: (e, s) {
Expect.equals(string, s.toString());
diff --git a/tests/corelib/string_base_vm_test.dart b/tests/corelib/string_base_vm_test.dart
index d0641d6..9d49f4a 100644
--- a/tests/corelib/string_base_vm_test.dart
+++ b/tests/corelib/string_base_vm_test.dart
@@ -27,8 +27,8 @@
static testCreation() {
String s = "Hello";
- List<int> a = new List.filled(s.length, -1);
- List<int> ga = new List();
+ List<int> a = new List<int>.filled(s.length, -1);
+ List<int> ga = [];
bool exception_caught = false;
for (int i = 0; i < a.length; i++) {
a[i] = s.codeUnitAt(i);
diff --git a/tests/corelib/string_from_list_test.dart b/tests/corelib/string_from_list_test.dart
index bd59715..212f824 100644
--- a/tests/corelib/string_from_list_test.dart
+++ b/tests/corelib/string_from_list_test.dart
@@ -13,7 +13,6 @@
Expect.equals("Ærø", new String.fromCharCodes(const [0xc6, 0x72, 0xf8]));
Expect.equals("\u{1234}", new String.fromCharCodes([0x1234]));
Expect.equals("\u{12345}*", new String.fromCharCodes([0x12345, 42]));
- Expect.equals("", new String.fromCharCodes(new List()));
{
var a = <int>[];
a.add(65);
diff --git a/tests/corelib_2/from_environment_default_value_test.dart b/tests/corelib_2/from_environment_default_value_test.dart
new file mode 100644
index 0000000..c95d000
--- /dev/null
+++ b/tests/corelib_2/from_environment_default_value_test.dart
@@ -0,0 +1,20 @@
+// Copyright (c) 2020, 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.
+
+import "package:expect/expect.dart";
+
+main() {
+ // Verify that the default value is as expected.
+ Expect.equals(false, const bool.fromEnvironment('UNDEFINED_NAME'));
+ Expect.equals(0, const int.fromEnvironment('UNDEFINED_NAME'));
+ Expect.equals('', const String.fromEnvironment('UNDEFINED_NAME'));
+
+ // Verify that `defaultValue` is used when passed, not the default values.
+ Expect.equals(
+ true, const bool.fromEnvironment('UNDEFINED_NAME', defaultValue: true));
+ Expect.equals(
+ 1, const int.fromEnvironment('UNDEFINED_NAME', defaultValue: 1));
+ Expect.equals('qux',
+ const String.fromEnvironment('UNDEFINED_NAME', defaultValue: 'qux'));
+}
diff --git a/tests/language/canonicalize/const2_test.dart b/tests/language/canonicalize/const2_test.dart
new file mode 100644
index 0000000..fbad2cd
--- /dev/null
+++ b/tests/language/canonicalize/const2_test.dart
@@ -0,0 +1,11 @@
+// Copyright (c) 2011, 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.
+
+import "package:expect/expect.dart";
+
+// Check that compile-time constants are correctly canonicalized.
+
+main() {
+ Expect.isFalse(identical(const <num>[1, 2], const <num>[1.0, 2.0]));
+}
diff --git a/tests/language/canonicalize/const3_test.dart b/tests/language/canonicalize/const3_test.dart
new file mode 100644
index 0000000..7b70824
--- /dev/null
+++ b/tests/language/canonicalize/const3_test.dart
@@ -0,0 +1,31 @@
+// Copyright (c) 2013, 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.
+//
+// Check proper canonicalization (fields must be canonicalized as well).
+
+import "package:expect/expect.dart";
+
+main() {
+ Expect.isFalse(identical(new Duration(days: 1), new Duration(days: 1)));
+ Expect.isTrue(identical(const Duration(days: 2), const Duration(days: 2)));
+ Expect.isTrue(identical(const B(3.0), const B(3.0)));
+ Expect.isTrue(identical(const F(main), const F(main)));
+}
+
+class A {
+ final a;
+ const A(v) : a = v + 3.4;
+}
+
+class B extends A {
+ final b;
+ const B(v)
+ : b = v + 1.0,
+ super(v);
+}
+
+class F {
+ final f;
+ const F(v) : f = v;
+}
diff --git a/tests/language/canonicalize/const_test.dart b/tests/language/canonicalize/const_test.dart
new file mode 100644
index 0000000..d759f94
--- /dev/null
+++ b/tests/language/canonicalize/const_test.dart
@@ -0,0 +1,44 @@
+// Copyright (c) 2011, 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.
+// Check that initializers of static const fields are compile time constants.
+
+import "package:expect/expect.dart";
+
+class CanonicalConstTest {
+ static const A = const C1();
+ static const B = const C2();
+
+ static testMain() {
+ Expect.identical(null, null);
+ Expect.isFalse(identical(null, 0));
+ Expect.identical(1, 1);
+ Expect.isFalse(identical(1, 2));
+ Expect.identical(true, true);
+ Expect.identical("so", "so");
+ Expect.identical(const Object(), const Object());
+ Expect.isFalse(identical(const Object(), const C1()));
+ Expect.identical(const C1(), const C1());
+ Expect.identical(A, const C1());
+ Expect.isFalse(identical(const C1(), const C2()));
+ Expect.identical(B, const C2());
+ Expect.isFalse(identical(const [2, 1], const [1, 2]));
+ Expect.identical(const <int>[1, 2], const <int>[1, 2]);
+ Expect.identical(const <Object>[1, 2], const <Object>[1, 2]);
+ Expect.isFalse(identical(const <int>[1, 2], const <double>[1.0, 2.0]));
+ Expect.identical(const {"a": 1, "b": 2}, const {"a": 1, "b": 2});
+ Expect.isFalse(identical(const {"a": 1, "b": 2}, const {"a": 2, "b": 2}));
+ }
+}
+
+class C1 {
+ const C1();
+}
+
+class C2 extends C1 {
+ const C2() : super();
+}
+
+main() {
+ CanonicalConstTest.testMain();
+}
diff --git a/tests/language/canonicalize/hashing_memoize_array_test.dart b/tests/language/canonicalize/hashing_memoize_array_test.dart
new file mode 100644
index 0000000..7e07ba5
--- /dev/null
+++ b/tests/language/canonicalize/hashing_memoize_array_test.dart
@@ -0,0 +1,218 @@
+// Copyright (c) 2019, 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.
+
+// If canonicalization uses deep structural hashing without memoizing, this
+// will exhibit superlinear time.
+
+const list1_0 = <Object?>[null, null];
+const list1_1 = <Object?>[list1_0, list1_0];
+const list1_2 = <Object?>[list1_1, list1_1];
+const list1_3 = <Object?>[list1_2, list1_2];
+const list1_4 = <Object?>[list1_3, list1_3];
+const list1_5 = <Object?>[list1_4, list1_4];
+const list1_6 = <Object?>[list1_5, list1_5];
+const list1_7 = <Object?>[list1_6, list1_6];
+const list1_8 = <Object?>[list1_7, list1_7];
+const list1_9 = <Object?>[list1_8, list1_8];
+const list1_10 = <Object?>[list1_9, list1_9];
+const list1_11 = <Object?>[list1_10, list1_10];
+const list1_12 = <Object?>[list1_11, list1_11];
+const list1_13 = <Object?>[list1_12, list1_12];
+const list1_14 = <Object?>[list1_13, list1_13];
+const list1_15 = <Object?>[list1_14, list1_14];
+const list1_16 = <Object?>[list1_15, list1_15];
+const list1_17 = <Object?>[list1_16, list1_16];
+const list1_18 = <Object?>[list1_17, list1_17];
+const list1_19 = <Object?>[list1_18, list1_18];
+const list1_20 = <Object?>[list1_19, list1_19];
+const list1_21 = <Object?>[list1_20, list1_20];
+const list1_22 = <Object?>[list1_21, list1_21];
+const list1_23 = <Object?>[list1_22, list1_22];
+const list1_24 = <Object?>[list1_23, list1_23];
+const list1_25 = <Object?>[list1_24, list1_24];
+const list1_26 = <Object?>[list1_25, list1_25];
+const list1_27 = <Object?>[list1_26, list1_26];
+const list1_28 = <Object?>[list1_27, list1_27];
+const list1_29 = <Object?>[list1_28, list1_28];
+const list1_30 = <Object?>[list1_29, list1_29];
+const list1_31 = <Object?>[list1_30, list1_30];
+const list1_32 = <Object?>[list1_31, list1_31];
+const list1_33 = <Object?>[list1_32, list1_32];
+const list1_34 = <Object?>[list1_33, list1_33];
+const list1_35 = <Object?>[list1_34, list1_34];
+const list1_36 = <Object?>[list1_35, list1_35];
+const list1_37 = <Object?>[list1_36, list1_36];
+const list1_38 = <Object?>[list1_37, list1_37];
+const list1_39 = <Object?>[list1_38, list1_38];
+const list1_40 = <Object?>[list1_39, list1_39];
+const list1_41 = <Object?>[list1_40, list1_40];
+const list1_42 = <Object?>[list1_41, list1_41];
+const list1_43 = <Object?>[list1_42, list1_42];
+const list1_44 = <Object?>[list1_43, list1_43];
+const list1_45 = <Object?>[list1_44, list1_44];
+const list1_46 = <Object?>[list1_45, list1_45];
+const list1_47 = <Object?>[list1_46, list1_46];
+const list1_48 = <Object?>[list1_47, list1_47];
+const list1_49 = <Object?>[list1_48, list1_48];
+const list1_50 = <Object?>[list1_49, list1_49];
+const list1_51 = <Object?>[list1_50, list1_50];
+const list1_52 = <Object?>[list1_51, list1_51];
+const list1_53 = <Object?>[list1_52, list1_52];
+const list1_54 = <Object?>[list1_53, list1_53];
+const list1_55 = <Object?>[list1_54, list1_54];
+const list1_56 = <Object?>[list1_55, list1_55];
+const list1_57 = <Object?>[list1_56, list1_56];
+const list1_58 = <Object?>[list1_57, list1_57];
+const list1_59 = <Object?>[list1_58, list1_58];
+const list1_60 = <Object?>[list1_59, list1_59];
+const list1_61 = <Object?>[list1_60, list1_60];
+const list1_62 = <Object?>[list1_61, list1_61];
+const list1_63 = <Object?>[list1_62, list1_62];
+const list1_64 = <Object?>[list1_63, list1_63];
+const list1_65 = <Object?>[list1_64, list1_64];
+const list1_66 = <Object?>[list1_65, list1_65];
+const list1_67 = <Object?>[list1_66, list1_66];
+const list1_68 = <Object?>[list1_67, list1_67];
+const list1_69 = <Object?>[list1_68, list1_68];
+const list1_70 = <Object?>[list1_69, list1_69];
+const list1_71 = <Object?>[list1_70, list1_70];
+const list1_72 = <Object?>[list1_71, list1_71];
+const list1_73 = <Object?>[list1_72, list1_72];
+const list1_74 = <Object?>[list1_73, list1_73];
+const list1_75 = <Object?>[list1_74, list1_74];
+const list1_76 = <Object?>[list1_75, list1_75];
+const list1_77 = <Object?>[list1_76, list1_76];
+const list1_78 = <Object?>[list1_77, list1_77];
+const list1_79 = <Object?>[list1_78, list1_78];
+const list1_80 = <Object?>[list1_79, list1_79];
+const list1_81 = <Object?>[list1_80, list1_80];
+const list1_82 = <Object?>[list1_81, list1_81];
+const list1_83 = <Object?>[list1_82, list1_82];
+const list1_84 = <Object?>[list1_83, list1_83];
+const list1_85 = <Object?>[list1_84, list1_84];
+const list1_86 = <Object?>[list1_85, list1_85];
+const list1_87 = <Object?>[list1_86, list1_86];
+const list1_88 = <Object?>[list1_87, list1_87];
+const list1_89 = <Object?>[list1_88, list1_88];
+const list1_90 = <Object?>[list1_89, list1_89];
+const list1_91 = <Object?>[list1_90, list1_90];
+const list1_92 = <Object?>[list1_91, list1_91];
+const list1_93 = <Object?>[list1_92, list1_92];
+const list1_94 = <Object?>[list1_93, list1_93];
+const list1_95 = <Object?>[list1_94, list1_94];
+const list1_96 = <Object?>[list1_95, list1_95];
+const list1_97 = <Object?>[list1_96, list1_96];
+const list1_98 = <Object?>[list1_97, list1_97];
+const list1_99 = <Object?>[list1_98, list1_98];
+
+const list2_0 = <Object?>[null, null];
+const list2_1 = <Object?>[list2_0, list2_0];
+const list2_2 = <Object?>[list2_1, list2_1];
+const list2_3 = <Object?>[list2_2, list2_2];
+const list2_4 = <Object?>[list2_3, list2_3];
+const list2_5 = <Object?>[list2_4, list2_4];
+const list2_6 = <Object?>[list2_5, list2_5];
+const list2_7 = <Object?>[list2_6, list2_6];
+const list2_8 = <Object?>[list2_7, list2_7];
+const list2_9 = <Object?>[list2_8, list2_8];
+const list2_10 = <Object?>[list2_9, list2_9];
+const list2_11 = <Object?>[list2_10, list2_10];
+const list2_12 = <Object?>[list2_11, list2_11];
+const list2_13 = <Object?>[list2_12, list2_12];
+const list2_14 = <Object?>[list2_13, list2_13];
+const list2_15 = <Object?>[list2_14, list2_14];
+const list2_16 = <Object?>[list2_15, list2_15];
+const list2_17 = <Object?>[list2_16, list2_16];
+const list2_18 = <Object?>[list2_17, list2_17];
+const list2_19 = <Object?>[list2_18, list2_18];
+const list2_20 = <Object?>[list2_19, list2_19];
+const list2_21 = <Object?>[list2_20, list2_20];
+const list2_22 = <Object?>[list2_21, list2_21];
+const list2_23 = <Object?>[list2_22, list2_22];
+const list2_24 = <Object?>[list2_23, list2_23];
+const list2_25 = <Object?>[list2_24, list2_24];
+const list2_26 = <Object?>[list2_25, list2_25];
+const list2_27 = <Object?>[list2_26, list2_26];
+const list2_28 = <Object?>[list2_27, list2_27];
+const list2_29 = <Object?>[list2_28, list2_28];
+const list2_30 = <Object?>[list2_29, list2_29];
+const list2_31 = <Object?>[list2_30, list2_30];
+const list2_32 = <Object?>[list2_31, list2_31];
+const list2_33 = <Object?>[list2_32, list2_32];
+const list2_34 = <Object?>[list2_33, list2_33];
+const list2_35 = <Object?>[list2_34, list2_34];
+const list2_36 = <Object?>[list2_35, list2_35];
+const list2_37 = <Object?>[list2_36, list2_36];
+const list2_38 = <Object?>[list2_37, list2_37];
+const list2_39 = <Object?>[list2_38, list2_38];
+const list2_40 = <Object?>[list2_39, list2_39];
+const list2_41 = <Object?>[list2_40, list2_40];
+const list2_42 = <Object?>[list2_41, list2_41];
+const list2_43 = <Object?>[list2_42, list2_42];
+const list2_44 = <Object?>[list2_43, list2_43];
+const list2_45 = <Object?>[list2_44, list2_44];
+const list2_46 = <Object?>[list2_45, list2_45];
+const list2_47 = <Object?>[list2_46, list2_46];
+const list2_48 = <Object?>[list2_47, list2_47];
+const list2_49 = <Object?>[list2_48, list2_48];
+const list2_50 = <Object?>[list2_49, list2_49];
+const list2_51 = <Object?>[list2_50, list2_50];
+const list2_52 = <Object?>[list2_51, list2_51];
+const list2_53 = <Object?>[list2_52, list2_52];
+const list2_54 = <Object?>[list2_53, list2_53];
+const list2_55 = <Object?>[list2_54, list2_54];
+const list2_56 = <Object?>[list2_55, list2_55];
+const list2_57 = <Object?>[list2_56, list2_56];
+const list2_58 = <Object?>[list2_57, list2_57];
+const list2_59 = <Object?>[list2_58, list2_58];
+const list2_60 = <Object?>[list2_59, list2_59];
+const list2_61 = <Object?>[list2_60, list2_60];
+const list2_62 = <Object?>[list2_61, list2_61];
+const list2_63 = <Object?>[list2_62, list2_62];
+const list2_64 = <Object?>[list2_63, list2_63];
+const list2_65 = <Object?>[list2_64, list2_64];
+const list2_66 = <Object?>[list2_65, list2_65];
+const list2_67 = <Object?>[list2_66, list2_66];
+const list2_68 = <Object?>[list2_67, list2_67];
+const list2_69 = <Object?>[list2_68, list2_68];
+const list2_70 = <Object?>[list2_69, list2_69];
+const list2_71 = <Object?>[list2_70, list2_70];
+const list2_72 = <Object?>[list2_71, list2_71];
+const list2_73 = <Object?>[list2_72, list2_72];
+const list2_74 = <Object?>[list2_73, list2_73];
+const list2_75 = <Object?>[list2_74, list2_74];
+const list2_76 = <Object?>[list2_75, list2_75];
+const list2_77 = <Object?>[list2_76, list2_76];
+const list2_78 = <Object?>[list2_77, list2_77];
+const list2_79 = <Object?>[list2_78, list2_78];
+const list2_80 = <Object?>[list2_79, list2_79];
+const list2_81 = <Object?>[list2_80, list2_80];
+const list2_82 = <Object?>[list2_81, list2_81];
+const list2_83 = <Object?>[list2_82, list2_82];
+const list2_84 = <Object?>[list2_83, list2_83];
+const list2_85 = <Object?>[list2_84, list2_84];
+const list2_86 = <Object?>[list2_85, list2_85];
+const list2_87 = <Object?>[list2_86, list2_86];
+const list2_88 = <Object?>[list2_87, list2_87];
+const list2_89 = <Object?>[list2_88, list2_88];
+const list2_90 = <Object?>[list2_89, list2_89];
+const list2_91 = <Object?>[list2_90, list2_90];
+const list2_92 = <Object?>[list2_91, list2_91];
+const list2_93 = <Object?>[list2_92, list2_92];
+const list2_94 = <Object?>[list2_93, list2_93];
+const list2_95 = <Object?>[list2_94, list2_94];
+const list2_96 = <Object?>[list2_95, list2_95];
+const list2_97 = <Object?>[list2_96, list2_96];
+const list2_98 = <Object?>[list2_97, list2_97];
+const list2_99 = <Object?>[list2_98, list2_98];
+
+confuse(x) {
+ try { throw x; } catch (e) { return e; }
+}
+
+main() {
+ if (!identical(confuse(list1_99), confuse(list2_99))) {
+ throw new Exception("list1_99 !== list2_99");
+ }
+}
diff --git a/tests/language/canonicalize/hashing_memoize_instance_test.dart b/tests/language/canonicalize/hashing_memoize_instance_test.dart
new file mode 100644
index 0000000..d855ba6
--- /dev/null
+++ b/tests/language/canonicalize/hashing_memoize_instance_test.dart
@@ -0,0 +1,224 @@
+// Copyright (c) 2019, 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.
+
+// If canonicalization uses deep structural hashing without memoizing, this
+// will exhibit superlinear time.
+
+class Box {
+ final Object? content1;
+ final Object? content2;
+ const Box(this.content1, this.content2);
+}
+
+const box1_0 = Box(null, null);
+const box1_1 = Box(box1_0, box1_0);
+const box1_2 = Box(box1_1, box1_1);
+const box1_3 = Box(box1_2, box1_2);
+const box1_4 = Box(box1_3, box1_3);
+const box1_5 = Box(box1_4, box1_4);
+const box1_6 = Box(box1_5, box1_5);
+const box1_7 = Box(box1_6, box1_6);
+const box1_8 = Box(box1_7, box1_7);
+const box1_9 = Box(box1_8, box1_8);
+const box1_10 = Box(box1_9, box1_9);
+const box1_11 = Box(box1_10, box1_10);
+const box1_12 = Box(box1_11, box1_11);
+const box1_13 = Box(box1_12, box1_12);
+const box1_14 = Box(box1_13, box1_13);
+const box1_15 = Box(box1_14, box1_14);
+const box1_16 = Box(box1_15, box1_15);
+const box1_17 = Box(box1_16, box1_16);
+const box1_18 = Box(box1_17, box1_17);
+const box1_19 = Box(box1_18, box1_18);
+const box1_20 = Box(box1_19, box1_19);
+const box1_21 = Box(box1_20, box1_20);
+const box1_22 = Box(box1_21, box1_21);
+const box1_23 = Box(box1_22, box1_22);
+const box1_24 = Box(box1_23, box1_23);
+const box1_25 = Box(box1_24, box1_24);
+const box1_26 = Box(box1_25, box1_25);
+const box1_27 = Box(box1_26, box1_26);
+const box1_28 = Box(box1_27, box1_27);
+const box1_29 = Box(box1_28, box1_28);
+const box1_30 = Box(box1_29, box1_29);
+const box1_31 = Box(box1_30, box1_30);
+const box1_32 = Box(box1_31, box1_31);
+const box1_33 = Box(box1_32, box1_32);
+const box1_34 = Box(box1_33, box1_33);
+const box1_35 = Box(box1_34, box1_34);
+const box1_36 = Box(box1_35, box1_35);
+const box1_37 = Box(box1_36, box1_36);
+const box1_38 = Box(box1_37, box1_37);
+const box1_39 = Box(box1_38, box1_38);
+const box1_40 = Box(box1_39, box1_39);
+const box1_41 = Box(box1_40, box1_40);
+const box1_42 = Box(box1_41, box1_41);
+const box1_43 = Box(box1_42, box1_42);
+const box1_44 = Box(box1_43, box1_43);
+const box1_45 = Box(box1_44, box1_44);
+const box1_46 = Box(box1_45, box1_45);
+const box1_47 = Box(box1_46, box1_46);
+const box1_48 = Box(box1_47, box1_47);
+const box1_49 = Box(box1_48, box1_48);
+const box1_50 = Box(box1_49, box1_49);
+const box1_51 = Box(box1_50, box1_50);
+const box1_52 = Box(box1_51, box1_51);
+const box1_53 = Box(box1_52, box1_52);
+const box1_54 = Box(box1_53, box1_53);
+const box1_55 = Box(box1_54, box1_54);
+const box1_56 = Box(box1_55, box1_55);
+const box1_57 = Box(box1_56, box1_56);
+const box1_58 = Box(box1_57, box1_57);
+const box1_59 = Box(box1_58, box1_58);
+const box1_60 = Box(box1_59, box1_59);
+const box1_61 = Box(box1_60, box1_60);
+const box1_62 = Box(box1_61, box1_61);
+const box1_63 = Box(box1_62, box1_62);
+const box1_64 = Box(box1_63, box1_63);
+const box1_65 = Box(box1_64, box1_64);
+const box1_66 = Box(box1_65, box1_65);
+const box1_67 = Box(box1_66, box1_66);
+const box1_68 = Box(box1_67, box1_67);
+const box1_69 = Box(box1_68, box1_68);
+const box1_70 = Box(box1_69, box1_69);
+const box1_71 = Box(box1_70, box1_70);
+const box1_72 = Box(box1_71, box1_71);
+const box1_73 = Box(box1_72, box1_72);
+const box1_74 = Box(box1_73, box1_73);
+const box1_75 = Box(box1_74, box1_74);
+const box1_76 = Box(box1_75, box1_75);
+const box1_77 = Box(box1_76, box1_76);
+const box1_78 = Box(box1_77, box1_77);
+const box1_79 = Box(box1_78, box1_78);
+const box1_80 = Box(box1_79, box1_79);
+const box1_81 = Box(box1_80, box1_80);
+const box1_82 = Box(box1_81, box1_81);
+const box1_83 = Box(box1_82, box1_82);
+const box1_84 = Box(box1_83, box1_83);
+const box1_85 = Box(box1_84, box1_84);
+const box1_86 = Box(box1_85, box1_85);
+const box1_87 = Box(box1_86, box1_86);
+const box1_88 = Box(box1_87, box1_87);
+const box1_89 = Box(box1_88, box1_88);
+const box1_90 = Box(box1_89, box1_89);
+const box1_91 = Box(box1_90, box1_90);
+const box1_92 = Box(box1_91, box1_91);
+const box1_93 = Box(box1_92, box1_92);
+const box1_94 = Box(box1_93, box1_93);
+const box1_95 = Box(box1_94, box1_94);
+const box1_96 = Box(box1_95, box1_95);
+const box1_97 = Box(box1_96, box1_96);
+const box1_98 = Box(box1_97, box1_97);
+const box1_99 = Box(box1_98, box1_98);
+
+const box2_0 = Box(null, null);
+const box2_1 = Box(box2_0, box2_0);
+const box2_2 = Box(box2_1, box2_1);
+const box2_3 = Box(box2_2, box2_2);
+const box2_4 = Box(box2_3, box2_3);
+const box2_5 = Box(box2_4, box2_4);
+const box2_6 = Box(box2_5, box2_5);
+const box2_7 = Box(box2_6, box2_6);
+const box2_8 = Box(box2_7, box2_7);
+const box2_9 = Box(box2_8, box2_8);
+const box2_10 = Box(box2_9, box2_9);
+const box2_11 = Box(box2_10, box2_10);
+const box2_12 = Box(box2_11, box2_11);
+const box2_13 = Box(box2_12, box2_12);
+const box2_14 = Box(box2_13, box2_13);
+const box2_15 = Box(box2_14, box2_14);
+const box2_16 = Box(box2_15, box2_15);
+const box2_17 = Box(box2_16, box2_16);
+const box2_18 = Box(box2_17, box2_17);
+const box2_19 = Box(box2_18, box2_18);
+const box2_20 = Box(box2_19, box2_19);
+const box2_21 = Box(box2_20, box2_20);
+const box2_22 = Box(box2_21, box2_21);
+const box2_23 = Box(box2_22, box2_22);
+const box2_24 = Box(box2_23, box2_23);
+const box2_25 = Box(box2_24, box2_24);
+const box2_26 = Box(box2_25, box2_25);
+const box2_27 = Box(box2_26, box2_26);
+const box2_28 = Box(box2_27, box2_27);
+const box2_29 = Box(box2_28, box2_28);
+const box2_30 = Box(box2_29, box2_29);
+const box2_31 = Box(box2_30, box2_30);
+const box2_32 = Box(box2_31, box2_31);
+const box2_33 = Box(box2_32, box2_32);
+const box2_34 = Box(box2_33, box2_33);
+const box2_35 = Box(box2_34, box2_34);
+const box2_36 = Box(box2_35, box2_35);
+const box2_37 = Box(box2_36, box2_36);
+const box2_38 = Box(box2_37, box2_37);
+const box2_39 = Box(box2_38, box2_38);
+const box2_40 = Box(box2_39, box2_39);
+const box2_41 = Box(box2_40, box2_40);
+const box2_42 = Box(box2_41, box2_41);
+const box2_43 = Box(box2_42, box2_42);
+const box2_44 = Box(box2_43, box2_43);
+const box2_45 = Box(box2_44, box2_44);
+const box2_46 = Box(box2_45, box2_45);
+const box2_47 = Box(box2_46, box2_46);
+const box2_48 = Box(box2_47, box2_47);
+const box2_49 = Box(box2_48, box2_48);
+const box2_50 = Box(box2_49, box2_49);
+const box2_51 = Box(box2_50, box2_50);
+const box2_52 = Box(box2_51, box2_51);
+const box2_53 = Box(box2_52, box2_52);
+const box2_54 = Box(box2_53, box2_53);
+const box2_55 = Box(box2_54, box2_54);
+const box2_56 = Box(box2_55, box2_55);
+const box2_57 = Box(box2_56, box2_56);
+const box2_58 = Box(box2_57, box2_57);
+const box2_59 = Box(box2_58, box2_58);
+const box2_60 = Box(box2_59, box2_59);
+const box2_61 = Box(box2_60, box2_60);
+const box2_62 = Box(box2_61, box2_61);
+const box2_63 = Box(box2_62, box2_62);
+const box2_64 = Box(box2_63, box2_63);
+const box2_65 = Box(box2_64, box2_64);
+const box2_66 = Box(box2_65, box2_65);
+const box2_67 = Box(box2_66, box2_66);
+const box2_68 = Box(box2_67, box2_67);
+const box2_69 = Box(box2_68, box2_68);
+const box2_70 = Box(box2_69, box2_69);
+const box2_71 = Box(box2_70, box2_70);
+const box2_72 = Box(box2_71, box2_71);
+const box2_73 = Box(box2_72, box2_72);
+const box2_74 = Box(box2_73, box2_73);
+const box2_75 = Box(box2_74, box2_74);
+const box2_76 = Box(box2_75, box2_75);
+const box2_77 = Box(box2_76, box2_76);
+const box2_78 = Box(box2_77, box2_77);
+const box2_79 = Box(box2_78, box2_78);
+const box2_80 = Box(box2_79, box2_79);
+const box2_81 = Box(box2_80, box2_80);
+const box2_82 = Box(box2_81, box2_81);
+const box2_83 = Box(box2_82, box2_82);
+const box2_84 = Box(box2_83, box2_83);
+const box2_85 = Box(box2_84, box2_84);
+const box2_86 = Box(box2_85, box2_85);
+const box2_87 = Box(box2_86, box2_86);
+const box2_88 = Box(box2_87, box2_87);
+const box2_89 = Box(box2_88, box2_88);
+const box2_90 = Box(box2_89, box2_89);
+const box2_91 = Box(box2_90, box2_90);
+const box2_92 = Box(box2_91, box2_91);
+const box2_93 = Box(box2_92, box2_92);
+const box2_94 = Box(box2_93, box2_93);
+const box2_95 = Box(box2_94, box2_94);
+const box2_96 = Box(box2_95, box2_95);
+const box2_97 = Box(box2_96, box2_96);
+const box2_98 = Box(box2_97, box2_97);
+const box2_99 = Box(box2_98, box2_98);
+
+confuse(x) {
+ try { throw x; } catch (e) { return e; }
+}
+
+main() {
+ if (!identical(confuse(box1_99), confuse(box2_99))) {
+ throw new Exception("box1_99 !== box2_99");
+ }
+}
diff --git a/tests/language/canonicalize/hashing_shallow_collision_array_test.dart b/tests/language/canonicalize/hashing_shallow_collision_array_test.dart
new file mode 100644
index 0000000..e094e06
--- /dev/null
+++ b/tests/language/canonicalize/hashing_shallow_collision_array_test.dart
@@ -0,0 +1,20024 @@
+// Copyright (c) 2019, 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.
+
+// If canonicialization hashes with only a field's cid, this will exhibit
+// quadratic time.
+
+// 10,000 elements.
+const list1 = [
+[[0]],
+[[1]],
+[[2]],
+[[3]],
+[[4]],
+[[5]],
+[[6]],
+[[7]],
+[[8]],
+[[9]],
+[[10]],
+[[11]],
+[[12]],
+[[13]],
+[[14]],
+[[15]],
+[[16]],
+[[17]],
+[[18]],
+[[19]],
+[[20]],
+[[21]],
+[[22]],
+[[23]],
+[[24]],
+[[25]],
+[[26]],
+[[27]],
+[[28]],
+[[29]],
+[[30]],
+[[31]],
+[[32]],
+[[33]],
+[[34]],
+[[35]],
+[[36]],
+[[37]],
+[[38]],
+[[39]],
+[[40]],
+[[41]],
+[[42]],
+[[43]],
+[[44]],
+[[45]],
+[[46]],
+[[47]],
+[[48]],
+[[49]],
+[[50]],
+[[51]],
+[[52]],
+[[53]],
+[[54]],
+[[55]],
+[[56]],
+[[57]],
+[[58]],
+[[59]],
+[[60]],
+[[61]],
+[[62]],
+[[63]],
+[[64]],
+[[65]],
+[[66]],
+[[67]],
+[[68]],
+[[69]],
+[[70]],
+[[71]],
+[[72]],
+[[73]],
+[[74]],
+[[75]],
+[[76]],
+[[77]],
+[[78]],
+[[79]],
+[[80]],
+[[81]],
+[[82]],
+[[83]],
+[[84]],
+[[85]],
+[[86]],
+[[87]],
+[[88]],
+[[89]],
+[[90]],
+[[91]],
+[[92]],
+[[93]],
+[[94]],
+[[95]],
+[[96]],
+[[97]],
+[[98]],
+[[99]],
+[[100]],
+[[101]],
+[[102]],
+[[103]],
+[[104]],
+[[105]],
+[[106]],
+[[107]],
+[[108]],
+[[109]],
+[[110]],
+[[111]],
+[[112]],
+[[113]],
+[[114]],
+[[115]],
+[[116]],
+[[117]],
+[[118]],
+[[119]],
+[[120]],
+[[121]],
+[[122]],
+[[123]],
+[[124]],
+[[125]],
+[[126]],
+[[127]],
+[[128]],
+[[129]],
+[[130]],
+[[131]],
+[[132]],
+[[133]],
+[[134]],
+[[135]],
+[[136]],
+[[137]],
+[[138]],
+[[139]],
+[[140]],
+[[141]],
+[[142]],
+[[143]],
+[[144]],
+[[145]],
+[[146]],
+[[147]],
+[[148]],
+[[149]],
+[[150]],
+[[151]],
+[[152]],
+[[153]],
+[[154]],
+[[155]],
+[[156]],
+[[157]],
+[[158]],
+[[159]],
+[[160]],
+[[161]],
+[[162]],
+[[163]],
+[[164]],
+[[165]],
+[[166]],
+[[167]],
+[[168]],
+[[169]],
+[[170]],
+[[171]],
+[[172]],
+[[173]],
+[[174]],
+[[175]],
+[[176]],
+[[177]],
+[[178]],
+[[179]],
+[[180]],
+[[181]],
+[[182]],
+[[183]],
+[[184]],
+[[185]],
+[[186]],
+[[187]],
+[[188]],
+[[189]],
+[[190]],
+[[191]],
+[[192]],
+[[193]],
+[[194]],
+[[195]],
+[[196]],
+[[197]],
+[[198]],
+[[199]],
+[[200]],
+[[201]],
+[[202]],
+[[203]],
+[[204]],
+[[205]],
+[[206]],
+[[207]],
+[[208]],
+[[209]],
+[[210]],
+[[211]],
+[[212]],
+[[213]],
+[[214]],
+[[215]],
+[[216]],
+[[217]],
+[[218]],
+[[219]],
+[[220]],
+[[221]],
+[[222]],
+[[223]],
+[[224]],
+[[225]],
+[[226]],
+[[227]],
+[[228]],
+[[229]],
+[[230]],
+[[231]],
+[[232]],
+[[233]],
+[[234]],
+[[235]],
+[[236]],
+[[237]],
+[[238]],
+[[239]],
+[[240]],
+[[241]],
+[[242]],
+[[243]],
+[[244]],
+[[245]],
+[[246]],
+[[247]],
+[[248]],
+[[249]],
+[[250]],
+[[251]],
+[[252]],
+[[253]],
+[[254]],
+[[255]],
+[[256]],
+[[257]],
+[[258]],
+[[259]],
+[[260]],
+[[261]],
+[[262]],
+[[263]],
+[[264]],
+[[265]],
+[[266]],
+[[267]],
+[[268]],
+[[269]],
+[[270]],
+[[271]],
+[[272]],
+[[273]],
+[[274]],
+[[275]],
+[[276]],
+[[277]],
+[[278]],
+[[279]],
+[[280]],
+[[281]],
+[[282]],
+[[283]],
+[[284]],
+[[285]],
+[[286]],
+[[287]],
+[[288]],
+[[289]],
+[[290]],
+[[291]],
+[[292]],
+[[293]],
+[[294]],
+[[295]],
+[[296]],
+[[297]],
+[[298]],
+[[299]],
+[[300]],
+[[301]],
+[[302]],
+[[303]],
+[[304]],
+[[305]],
+[[306]],
+[[307]],
+[[308]],
+[[309]],
+[[310]],
+[[311]],
+[[312]],
+[[313]],
+[[314]],
+[[315]],
+[[316]],
+[[317]],
+[[318]],
+[[319]],
+[[320]],
+[[321]],
+[[322]],
+[[323]],
+[[324]],
+[[325]],
+[[326]],
+[[327]],
+[[328]],
+[[329]],
+[[330]],
+[[331]],
+[[332]],
+[[333]],
+[[334]],
+[[335]],
+[[336]],
+[[337]],
+[[338]],
+[[339]],
+[[340]],
+[[341]],
+[[342]],
+[[343]],
+[[344]],
+[[345]],
+[[346]],
+[[347]],
+[[348]],
+[[349]],
+[[350]],
+[[351]],
+[[352]],
+[[353]],
+[[354]],
+[[355]],
+[[356]],
+[[357]],
+[[358]],
+[[359]],
+[[360]],
+[[361]],
+[[362]],
+[[363]],
+[[364]],
+[[365]],
+[[366]],
+[[367]],
+[[368]],
+[[369]],
+[[370]],
+[[371]],
+[[372]],
+[[373]],
+[[374]],
+[[375]],
+[[376]],
+[[377]],
+[[378]],
+[[379]],
+[[380]],
+[[381]],
+[[382]],
+[[383]],
+[[384]],
+[[385]],
+[[386]],
+[[387]],
+[[388]],
+[[389]],
+[[390]],
+[[391]],
+[[392]],
+[[393]],
+[[394]],
+[[395]],
+[[396]],
+[[397]],
+[[398]],
+[[399]],
+[[400]],
+[[401]],
+[[402]],
+[[403]],
+[[404]],
+[[405]],
+[[406]],
+[[407]],
+[[408]],
+[[409]],
+[[410]],
+[[411]],
+[[412]],
+[[413]],
+[[414]],
+[[415]],
+[[416]],
+[[417]],
+[[418]],
+[[419]],
+[[420]],
+[[421]],
+[[422]],
+[[423]],
+[[424]],
+[[425]],
+[[426]],
+[[427]],
+[[428]],
+[[429]],
+[[430]],
+[[431]],
+[[432]],
+[[433]],
+[[434]],
+[[435]],
+[[436]],
+[[437]],
+[[438]],
+[[439]],
+[[440]],
+[[441]],
+[[442]],
+[[443]],
+[[444]],
+[[445]],
+[[446]],
+[[447]],
+[[448]],
+[[449]],
+[[450]],
+[[451]],
+[[452]],
+[[453]],
+[[454]],
+[[455]],
+[[456]],
+[[457]],
+[[458]],
+[[459]],
+[[460]],
+[[461]],
+[[462]],
+[[463]],
+[[464]],
+[[465]],
+[[466]],
+[[467]],
+[[468]],
+[[469]],
+[[470]],
+[[471]],
+[[472]],
+[[473]],
+[[474]],
+[[475]],
+[[476]],
+[[477]],
+[[478]],
+[[479]],
+[[480]],
+[[481]],
+[[482]],
+[[483]],
+[[484]],
+[[485]],
+[[486]],
+[[487]],
+[[488]],
+[[489]],
+[[490]],
+[[491]],
+[[492]],
+[[493]],
+[[494]],
+[[495]],
+[[496]],
+[[497]],
+[[498]],
+[[499]],
+[[500]],
+[[501]],
+[[502]],
+[[503]],
+[[504]],
+[[505]],
+[[506]],
+[[507]],
+[[508]],
+[[509]],
+[[510]],
+[[511]],
+[[512]],
+[[513]],
+[[514]],
+[[515]],
+[[516]],
+[[517]],
+[[518]],
+[[519]],
+[[520]],
+[[521]],
+[[522]],
+[[523]],
+[[524]],
+[[525]],
+[[526]],
+[[527]],
+[[528]],
+[[529]],
+[[530]],
+[[531]],
+[[532]],
+[[533]],
+[[534]],
+[[535]],
+[[536]],
+[[537]],
+[[538]],
+[[539]],
+[[540]],
+[[541]],
+[[542]],
+[[543]],
+[[544]],
+[[545]],
+[[546]],
+[[547]],
+[[548]],
+[[549]],
+[[550]],
+[[551]],
+[[552]],
+[[553]],
+[[554]],
+[[555]],
+[[556]],
+[[557]],
+[[558]],
+[[559]],
+[[560]],
+[[561]],
+[[562]],
+[[563]],
+[[564]],
+[[565]],
+[[566]],
+[[567]],
+[[568]],
+[[569]],
+[[570]],
+[[571]],
+[[572]],
+[[573]],
+[[574]],
+[[575]],
+[[576]],
+[[577]],
+[[578]],
+[[579]],
+[[580]],
+[[581]],
+[[582]],
+[[583]],
+[[584]],
+[[585]],
+[[586]],
+[[587]],
+[[588]],
+[[589]],
+[[590]],
+[[591]],
+[[592]],
+[[593]],
+[[594]],
+[[595]],
+[[596]],
+[[597]],
+[[598]],
+[[599]],
+[[600]],
+[[601]],
+[[602]],
+[[603]],
+[[604]],
+[[605]],
+[[606]],
+[[607]],
+[[608]],
+[[609]],
+[[610]],
+[[611]],
+[[612]],
+[[613]],
+[[614]],
+[[615]],
+[[616]],
+[[617]],
+[[618]],
+[[619]],
+[[620]],
+[[621]],
+[[622]],
+[[623]],
+[[624]],
+[[625]],
+[[626]],
+[[627]],
+[[628]],
+[[629]],
+[[630]],
+[[631]],
+[[632]],
+[[633]],
+[[634]],
+[[635]],
+[[636]],
+[[637]],
+[[638]],
+[[639]],
+[[640]],
+[[641]],
+[[642]],
+[[643]],
+[[644]],
+[[645]],
+[[646]],
+[[647]],
+[[648]],
+[[649]],
+[[650]],
+[[651]],
+[[652]],
+[[653]],
+[[654]],
+[[655]],
+[[656]],
+[[657]],
+[[658]],
+[[659]],
+[[660]],
+[[661]],
+[[662]],
+[[663]],
+[[664]],
+[[665]],
+[[666]],
+[[667]],
+[[668]],
+[[669]],
+[[670]],
+[[671]],
+[[672]],
+[[673]],
+[[674]],
+[[675]],
+[[676]],
+[[677]],
+[[678]],
+[[679]],
+[[680]],
+[[681]],
+[[682]],
+[[683]],
+[[684]],
+[[685]],
+[[686]],
+[[687]],
+[[688]],
+[[689]],
+[[690]],
+[[691]],
+[[692]],
+[[693]],
+[[694]],
+[[695]],
+[[696]],
+[[697]],
+[[698]],
+[[699]],
+[[700]],
+[[701]],
+[[702]],
+[[703]],
+[[704]],
+[[705]],
+[[706]],
+[[707]],
+[[708]],
+[[709]],
+[[710]],
+[[711]],
+[[712]],
+[[713]],
+[[714]],
+[[715]],
+[[716]],
+[[717]],
+[[718]],
+[[719]],
+[[720]],
+[[721]],
+[[722]],
+[[723]],
+[[724]],
+[[725]],
+[[726]],
+[[727]],
+[[728]],
+[[729]],
+[[730]],
+[[731]],
+[[732]],
+[[733]],
+[[734]],
+[[735]],
+[[736]],
+[[737]],
+[[738]],
+[[739]],
+[[740]],
+[[741]],
+[[742]],
+[[743]],
+[[744]],
+[[745]],
+[[746]],
+[[747]],
+[[748]],
+[[749]],
+[[750]],
+[[751]],
+[[752]],
+[[753]],
+[[754]],
+[[755]],
+[[756]],
+[[757]],
+[[758]],
+[[759]],
+[[760]],
+[[761]],
+[[762]],
+[[763]],
+[[764]],
+[[765]],
+[[766]],
+[[767]],
+[[768]],
+[[769]],
+[[770]],
+[[771]],
+[[772]],
+[[773]],
+[[774]],
+[[775]],
+[[776]],
+[[777]],
+[[778]],
+[[779]],
+[[780]],
+[[781]],
+[[782]],
+[[783]],
+[[784]],
+[[785]],
+[[786]],
+[[787]],
+[[788]],
+[[789]],
+[[790]],
+[[791]],
+[[792]],
+[[793]],
+[[794]],
+[[795]],
+[[796]],
+[[797]],
+[[798]],
+[[799]],
+[[800]],
+[[801]],
+[[802]],
+[[803]],
+[[804]],
+[[805]],
+[[806]],
+[[807]],
+[[808]],
+[[809]],
+[[810]],
+[[811]],
+[[812]],
+[[813]],
+[[814]],
+[[815]],
+[[816]],
+[[817]],
+[[818]],
+[[819]],
+[[820]],
+[[821]],
+[[822]],
+[[823]],
+[[824]],
+[[825]],
+[[826]],
+[[827]],
+[[828]],
+[[829]],
+[[830]],
+[[831]],
+[[832]],
+[[833]],
+[[834]],
+[[835]],
+[[836]],
+[[837]],
+[[838]],
+[[839]],
+[[840]],
+[[841]],
+[[842]],
+[[843]],
+[[844]],
+[[845]],
+[[846]],
+[[847]],
+[[848]],
+[[849]],
+[[850]],
+[[851]],
+[[852]],
+[[853]],
+[[854]],
+[[855]],
+[[856]],
+[[857]],
+[[858]],
+[[859]],
+[[860]],
+[[861]],
+[[862]],
+[[863]],
+[[864]],
+[[865]],
+[[866]],
+[[867]],
+[[868]],
+[[869]],
+[[870]],
+[[871]],
+[[872]],
+[[873]],
+[[874]],
+[[875]],
+[[876]],
+[[877]],
+[[878]],
+[[879]],
+[[880]],
+[[881]],
+[[882]],
+[[883]],
+[[884]],
+[[885]],
+[[886]],
+[[887]],
+[[888]],
+[[889]],
+[[890]],
+[[891]],
+[[892]],
+[[893]],
+[[894]],
+[[895]],
+[[896]],
+[[897]],
+[[898]],
+[[899]],
+[[900]],
+[[901]],
+[[902]],
+[[903]],
+[[904]],
+[[905]],
+[[906]],
+[[907]],
+[[908]],
+[[909]],
+[[910]],
+[[911]],
+[[912]],
+[[913]],
+[[914]],
+[[915]],
+[[916]],
+[[917]],
+[[918]],
+[[919]],
+[[920]],
+[[921]],
+[[922]],
+[[923]],
+[[924]],
+[[925]],
+[[926]],
+[[927]],
+[[928]],
+[[929]],
+[[930]],
+[[931]],
+[[932]],
+[[933]],
+[[934]],
+[[935]],
+[[936]],
+[[937]],
+[[938]],
+[[939]],
+[[940]],
+[[941]],
+[[942]],
+[[943]],
+[[944]],
+[[945]],
+[[946]],
+[[947]],
+[[948]],
+[[949]],
+[[950]],
+[[951]],
+[[952]],
+[[953]],
+[[954]],
+[[955]],
+[[956]],
+[[957]],
+[[958]],
+[[959]],
+[[960]],
+[[961]],
+[[962]],
+[[963]],
+[[964]],
+[[965]],
+[[966]],
+[[967]],
+[[968]],
+[[969]],
+[[970]],
+[[971]],
+[[972]],
+[[973]],
+[[974]],
+[[975]],
+[[976]],
+[[977]],
+[[978]],
+[[979]],
+[[980]],
+[[981]],
+[[982]],
+[[983]],
+[[984]],
+[[985]],
+[[986]],
+[[987]],
+[[988]],
+[[989]],
+[[990]],
+[[991]],
+[[992]],
+[[993]],
+[[994]],
+[[995]],
+[[996]],
+[[997]],
+[[998]],
+[[999]],
+[[1000]],
+[[1001]],
+[[1002]],
+[[1003]],
+[[1004]],
+[[1005]],
+[[1006]],
+[[1007]],
+[[1008]],
+[[1009]],
+[[1010]],
+[[1011]],
+[[1012]],
+[[1013]],
+[[1014]],
+[[1015]],
+[[1016]],
+[[1017]],
+[[1018]],
+[[1019]],
+[[1020]],
+[[1021]],
+[[1022]],
+[[1023]],
+[[1024]],
+[[1025]],
+[[1026]],
+[[1027]],
+[[1028]],
+[[1029]],
+[[1030]],
+[[1031]],
+[[1032]],
+[[1033]],
+[[1034]],
+[[1035]],
+[[1036]],
+[[1037]],
+[[1038]],
+[[1039]],
+[[1040]],
+[[1041]],
+[[1042]],
+[[1043]],
+[[1044]],
+[[1045]],
+[[1046]],
+[[1047]],
+[[1048]],
+[[1049]],
+[[1050]],
+[[1051]],
+[[1052]],
+[[1053]],
+[[1054]],
+[[1055]],
+[[1056]],
+[[1057]],
+[[1058]],
+[[1059]],
+[[1060]],
+[[1061]],
+[[1062]],
+[[1063]],
+[[1064]],
+[[1065]],
+[[1066]],
+[[1067]],
+[[1068]],
+[[1069]],
+[[1070]],
+[[1071]],
+[[1072]],
+[[1073]],
+[[1074]],
+[[1075]],
+[[1076]],
+[[1077]],
+[[1078]],
+[[1079]],
+[[1080]],
+[[1081]],
+[[1082]],
+[[1083]],
+[[1084]],
+[[1085]],
+[[1086]],
+[[1087]],
+[[1088]],
+[[1089]],
+[[1090]],
+[[1091]],
+[[1092]],
+[[1093]],
+[[1094]],
+[[1095]],
+[[1096]],
+[[1097]],
+[[1098]],
+[[1099]],
+[[1100]],
+[[1101]],
+[[1102]],
+[[1103]],
+[[1104]],
+[[1105]],
+[[1106]],
+[[1107]],
+[[1108]],
+[[1109]],
+[[1110]],
+[[1111]],
+[[1112]],
+[[1113]],
+[[1114]],
+[[1115]],
+[[1116]],
+[[1117]],
+[[1118]],
+[[1119]],
+[[1120]],
+[[1121]],
+[[1122]],
+[[1123]],
+[[1124]],
+[[1125]],
+[[1126]],
+[[1127]],
+[[1128]],
+[[1129]],
+[[1130]],
+[[1131]],
+[[1132]],
+[[1133]],
+[[1134]],
+[[1135]],
+[[1136]],
+[[1137]],
+[[1138]],
+[[1139]],
+[[1140]],
+[[1141]],
+[[1142]],
+[[1143]],
+[[1144]],
+[[1145]],
+[[1146]],
+[[1147]],
+[[1148]],
+[[1149]],
+[[1150]],
+[[1151]],
+[[1152]],
+[[1153]],
+[[1154]],
+[[1155]],
+[[1156]],
+[[1157]],
+[[1158]],
+[[1159]],
+[[1160]],
+[[1161]],
+[[1162]],
+[[1163]],
+[[1164]],
+[[1165]],
+[[1166]],
+[[1167]],
+[[1168]],
+[[1169]],
+[[1170]],
+[[1171]],
+[[1172]],
+[[1173]],
+[[1174]],
+[[1175]],
+[[1176]],
+[[1177]],
+[[1178]],
+[[1179]],
+[[1180]],
+[[1181]],
+[[1182]],
+[[1183]],
+[[1184]],
+[[1185]],
+[[1186]],
+[[1187]],
+[[1188]],
+[[1189]],
+[[1190]],
+[[1191]],
+[[1192]],
+[[1193]],
+[[1194]],
+[[1195]],
+[[1196]],
+[[1197]],
+[[1198]],
+[[1199]],
+[[1200]],
+[[1201]],
+[[1202]],
+[[1203]],
+[[1204]],
+[[1205]],
+[[1206]],
+[[1207]],
+[[1208]],
+[[1209]],
+[[1210]],
+[[1211]],
+[[1212]],
+[[1213]],
+[[1214]],
+[[1215]],
+[[1216]],
+[[1217]],
+[[1218]],
+[[1219]],
+[[1220]],
+[[1221]],
+[[1222]],
+[[1223]],
+[[1224]],
+[[1225]],
+[[1226]],
+[[1227]],
+[[1228]],
+[[1229]],
+[[1230]],
+[[1231]],
+[[1232]],
+[[1233]],
+[[1234]],
+[[1235]],
+[[1236]],
+[[1237]],
+[[1238]],
+[[1239]],
+[[1240]],
+[[1241]],
+[[1242]],
+[[1243]],
+[[1244]],
+[[1245]],
+[[1246]],
+[[1247]],
+[[1248]],
+[[1249]],
+[[1250]],
+[[1251]],
+[[1252]],
+[[1253]],
+[[1254]],
+[[1255]],
+[[1256]],
+[[1257]],
+[[1258]],
+[[1259]],
+[[1260]],
+[[1261]],
+[[1262]],
+[[1263]],
+[[1264]],
+[[1265]],
+[[1266]],
+[[1267]],
+[[1268]],
+[[1269]],
+[[1270]],
+[[1271]],
+[[1272]],
+[[1273]],
+[[1274]],
+[[1275]],
+[[1276]],
+[[1277]],
+[[1278]],
+[[1279]],
+[[1280]],
+[[1281]],
+[[1282]],
+[[1283]],
+[[1284]],
+[[1285]],
+[[1286]],
+[[1287]],
+[[1288]],
+[[1289]],
+[[1290]],
+[[1291]],
+[[1292]],
+[[1293]],
+[[1294]],
+[[1295]],
+[[1296]],
+[[1297]],
+[[1298]],
+[[1299]],
+[[1300]],
+[[1301]],
+[[1302]],
+[[1303]],
+[[1304]],
+[[1305]],
+[[1306]],
+[[1307]],
+[[1308]],
+[[1309]],
+[[1310]],
+[[1311]],
+[[1312]],
+[[1313]],
+[[1314]],
+[[1315]],
+[[1316]],
+[[1317]],
+[[1318]],
+[[1319]],
+[[1320]],
+[[1321]],
+[[1322]],
+[[1323]],
+[[1324]],
+[[1325]],
+[[1326]],
+[[1327]],
+[[1328]],
+[[1329]],
+[[1330]],
+[[1331]],
+[[1332]],
+[[1333]],
+[[1334]],
+[[1335]],
+[[1336]],
+[[1337]],
+[[1338]],
+[[1339]],
+[[1340]],
+[[1341]],
+[[1342]],
+[[1343]],
+[[1344]],
+[[1345]],
+[[1346]],
+[[1347]],
+[[1348]],
+[[1349]],
+[[1350]],
+[[1351]],
+[[1352]],
+[[1353]],
+[[1354]],
+[[1355]],
+[[1356]],
+[[1357]],
+[[1358]],
+[[1359]],
+[[1360]],
+[[1361]],
+[[1362]],
+[[1363]],
+[[1364]],
+[[1365]],
+[[1366]],
+[[1367]],
+[[1368]],
+[[1369]],
+[[1370]],
+[[1371]],
+[[1372]],
+[[1373]],
+[[1374]],
+[[1375]],
+[[1376]],
+[[1377]],
+[[1378]],
+[[1379]],
+[[1380]],
+[[1381]],
+[[1382]],
+[[1383]],
+[[1384]],
+[[1385]],
+[[1386]],
+[[1387]],
+[[1388]],
+[[1389]],
+[[1390]],
+[[1391]],
+[[1392]],
+[[1393]],
+[[1394]],
+[[1395]],
+[[1396]],
+[[1397]],
+[[1398]],
+[[1399]],
+[[1400]],
+[[1401]],
+[[1402]],
+[[1403]],
+[[1404]],
+[[1405]],
+[[1406]],
+[[1407]],
+[[1408]],
+[[1409]],
+[[1410]],
+[[1411]],
+[[1412]],
+[[1413]],
+[[1414]],
+[[1415]],
+[[1416]],
+[[1417]],
+[[1418]],
+[[1419]],
+[[1420]],
+[[1421]],
+[[1422]],
+[[1423]],
+[[1424]],
+[[1425]],
+[[1426]],
+[[1427]],
+[[1428]],
+[[1429]],
+[[1430]],
+[[1431]],
+[[1432]],
+[[1433]],
+[[1434]],
+[[1435]],
+[[1436]],
+[[1437]],
+[[1438]],
+[[1439]],
+[[1440]],
+[[1441]],
+[[1442]],
+[[1443]],
+[[1444]],
+[[1445]],
+[[1446]],
+[[1447]],
+[[1448]],
+[[1449]],
+[[1450]],
+[[1451]],
+[[1452]],
+[[1453]],
+[[1454]],
+[[1455]],
+[[1456]],
+[[1457]],
+[[1458]],
+[[1459]],
+[[1460]],
+[[1461]],
+[[1462]],
+[[1463]],
+[[1464]],
+[[1465]],
+[[1466]],
+[[1467]],
+[[1468]],
+[[1469]],
+[[1470]],
+[[1471]],
+[[1472]],
+[[1473]],
+[[1474]],
+[[1475]],
+[[1476]],
+[[1477]],
+[[1478]],
+[[1479]],
+[[1480]],
+[[1481]],
+[[1482]],
+[[1483]],
+[[1484]],
+[[1485]],
+[[1486]],
+[[1487]],
+[[1488]],
+[[1489]],
+[[1490]],
+[[1491]],
+[[1492]],
+[[1493]],
+[[1494]],
+[[1495]],
+[[1496]],
+[[1497]],
+[[1498]],
+[[1499]],
+[[1500]],
+[[1501]],
+[[1502]],
+[[1503]],
+[[1504]],
+[[1505]],
+[[1506]],
+[[1507]],
+[[1508]],
+[[1509]],
+[[1510]],
+[[1511]],
+[[1512]],
+[[1513]],
+[[1514]],
+[[1515]],
+[[1516]],
+[[1517]],
+[[1518]],
+[[1519]],
+[[1520]],
+[[1521]],
+[[1522]],
+[[1523]],
+[[1524]],
+[[1525]],
+[[1526]],
+[[1527]],
+[[1528]],
+[[1529]],
+[[1530]],
+[[1531]],
+[[1532]],
+[[1533]],
+[[1534]],
+[[1535]],
+[[1536]],
+[[1537]],
+[[1538]],
+[[1539]],
+[[1540]],
+[[1541]],
+[[1542]],
+[[1543]],
+[[1544]],
+[[1545]],
+[[1546]],
+[[1547]],
+[[1548]],
+[[1549]],
+[[1550]],
+[[1551]],
+[[1552]],
+[[1553]],
+[[1554]],
+[[1555]],
+[[1556]],
+[[1557]],
+[[1558]],
+[[1559]],
+[[1560]],
+[[1561]],
+[[1562]],
+[[1563]],
+[[1564]],
+[[1565]],
+[[1566]],
+[[1567]],
+[[1568]],
+[[1569]],
+[[1570]],
+[[1571]],
+[[1572]],
+[[1573]],
+[[1574]],
+[[1575]],
+[[1576]],
+[[1577]],
+[[1578]],
+[[1579]],
+[[1580]],
+[[1581]],
+[[1582]],
+[[1583]],
+[[1584]],
+[[1585]],
+[[1586]],
+[[1587]],
+[[1588]],
+[[1589]],
+[[1590]],
+[[1591]],
+[[1592]],
+[[1593]],
+[[1594]],
+[[1595]],
+[[1596]],
+[[1597]],
+[[1598]],
+[[1599]],
+[[1600]],
+[[1601]],
+[[1602]],
+[[1603]],
+[[1604]],
+[[1605]],
+[[1606]],
+[[1607]],
+[[1608]],
+[[1609]],
+[[1610]],
+[[1611]],
+[[1612]],
+[[1613]],
+[[1614]],
+[[1615]],
+[[1616]],
+[[1617]],
+[[1618]],
+[[1619]],
+[[1620]],
+[[1621]],
+[[1622]],
+[[1623]],
+[[1624]],
+[[1625]],
+[[1626]],
+[[1627]],
+[[1628]],
+[[1629]],
+[[1630]],
+[[1631]],
+[[1632]],
+[[1633]],
+[[1634]],
+[[1635]],
+[[1636]],
+[[1637]],
+[[1638]],
+[[1639]],
+[[1640]],
+[[1641]],
+[[1642]],
+[[1643]],
+[[1644]],
+[[1645]],
+[[1646]],
+[[1647]],
+[[1648]],
+[[1649]],
+[[1650]],
+[[1651]],
+[[1652]],
+[[1653]],
+[[1654]],
+[[1655]],
+[[1656]],
+[[1657]],
+[[1658]],
+[[1659]],
+[[1660]],
+[[1661]],
+[[1662]],
+[[1663]],
+[[1664]],
+[[1665]],
+[[1666]],
+[[1667]],
+[[1668]],
+[[1669]],
+[[1670]],
+[[1671]],
+[[1672]],
+[[1673]],
+[[1674]],
+[[1675]],
+[[1676]],
+[[1677]],
+[[1678]],
+[[1679]],
+[[1680]],
+[[1681]],
+[[1682]],
+[[1683]],
+[[1684]],
+[[1685]],
+[[1686]],
+[[1687]],
+[[1688]],
+[[1689]],
+[[1690]],
+[[1691]],
+[[1692]],
+[[1693]],
+[[1694]],
+[[1695]],
+[[1696]],
+[[1697]],
+[[1698]],
+[[1699]],
+[[1700]],
+[[1701]],
+[[1702]],
+[[1703]],
+[[1704]],
+[[1705]],
+[[1706]],
+[[1707]],
+[[1708]],
+[[1709]],
+[[1710]],
+[[1711]],
+[[1712]],
+[[1713]],
+[[1714]],
+[[1715]],
+[[1716]],
+[[1717]],
+[[1718]],
+[[1719]],
+[[1720]],
+[[1721]],
+[[1722]],
+[[1723]],
+[[1724]],
+[[1725]],
+[[1726]],
+[[1727]],
+[[1728]],
+[[1729]],
+[[1730]],
+[[1731]],
+[[1732]],
+[[1733]],
+[[1734]],
+[[1735]],
+[[1736]],
+[[1737]],
+[[1738]],
+[[1739]],
+[[1740]],
+[[1741]],
+[[1742]],
+[[1743]],
+[[1744]],
+[[1745]],
+[[1746]],
+[[1747]],
+[[1748]],
+[[1749]],
+[[1750]],
+[[1751]],
+[[1752]],
+[[1753]],
+[[1754]],
+[[1755]],
+[[1756]],
+[[1757]],
+[[1758]],
+[[1759]],
+[[1760]],
+[[1761]],
+[[1762]],
+[[1763]],
+[[1764]],
+[[1765]],
+[[1766]],
+[[1767]],
+[[1768]],
+[[1769]],
+[[1770]],
+[[1771]],
+[[1772]],
+[[1773]],
+[[1774]],
+[[1775]],
+[[1776]],
+[[1777]],
+[[1778]],
+[[1779]],
+[[1780]],
+[[1781]],
+[[1782]],
+[[1783]],
+[[1784]],
+[[1785]],
+[[1786]],
+[[1787]],
+[[1788]],
+[[1789]],
+[[1790]],
+[[1791]],
+[[1792]],
+[[1793]],
+[[1794]],
+[[1795]],
+[[1796]],
+[[1797]],
+[[1798]],
+[[1799]],
+[[1800]],
+[[1801]],
+[[1802]],
+[[1803]],
+[[1804]],
+[[1805]],
+[[1806]],
+[[1807]],
+[[1808]],
+[[1809]],
+[[1810]],
+[[1811]],
+[[1812]],
+[[1813]],
+[[1814]],
+[[1815]],
+[[1816]],
+[[1817]],
+[[1818]],
+[[1819]],
+[[1820]],
+[[1821]],
+[[1822]],
+[[1823]],
+[[1824]],
+[[1825]],
+[[1826]],
+[[1827]],
+[[1828]],
+[[1829]],
+[[1830]],
+[[1831]],
+[[1832]],
+[[1833]],
+[[1834]],
+[[1835]],
+[[1836]],
+[[1837]],
+[[1838]],
+[[1839]],
+[[1840]],
+[[1841]],
+[[1842]],
+[[1843]],
+[[1844]],
+[[1845]],
+[[1846]],
+[[1847]],
+[[1848]],
+[[1849]],
+[[1850]],
+[[1851]],
+[[1852]],
+[[1853]],
+[[1854]],
+[[1855]],
+[[1856]],
+[[1857]],
+[[1858]],
+[[1859]],
+[[1860]],
+[[1861]],
+[[1862]],
+[[1863]],
+[[1864]],
+[[1865]],
+[[1866]],
+[[1867]],
+[[1868]],
+[[1869]],
+[[1870]],
+[[1871]],
+[[1872]],
+[[1873]],
+[[1874]],
+[[1875]],
+[[1876]],
+[[1877]],
+[[1878]],
+[[1879]],
+[[1880]],
+[[1881]],
+[[1882]],
+[[1883]],
+[[1884]],
+[[1885]],
+[[1886]],
+[[1887]],
+[[1888]],
+[[1889]],
+[[1890]],
+[[1891]],
+[[1892]],
+[[1893]],
+[[1894]],
+[[1895]],
+[[1896]],
+[[1897]],
+[[1898]],
+[[1899]],
+[[1900]],
+[[1901]],
+[[1902]],
+[[1903]],
+[[1904]],
+[[1905]],
+[[1906]],
+[[1907]],
+[[1908]],
+[[1909]],
+[[1910]],
+[[1911]],
+[[1912]],
+[[1913]],
+[[1914]],
+[[1915]],
+[[1916]],
+[[1917]],
+[[1918]],
+[[1919]],
+[[1920]],
+[[1921]],
+[[1922]],
+[[1923]],
+[[1924]],
+[[1925]],
+[[1926]],
+[[1927]],
+[[1928]],
+[[1929]],
+[[1930]],
+[[1931]],
+[[1932]],
+[[1933]],
+[[1934]],
+[[1935]],
+[[1936]],
+[[1937]],
+[[1938]],
+[[1939]],
+[[1940]],
+[[1941]],
+[[1942]],
+[[1943]],
+[[1944]],
+[[1945]],
+[[1946]],
+[[1947]],
+[[1948]],
+[[1949]],
+[[1950]],
+[[1951]],
+[[1952]],
+[[1953]],
+[[1954]],
+[[1955]],
+[[1956]],
+[[1957]],
+[[1958]],
+[[1959]],
+[[1960]],
+[[1961]],
+[[1962]],
+[[1963]],
+[[1964]],
+[[1965]],
+[[1966]],
+[[1967]],
+[[1968]],
+[[1969]],
+[[1970]],
+[[1971]],
+[[1972]],
+[[1973]],
+[[1974]],
+[[1975]],
+[[1976]],
+[[1977]],
+[[1978]],
+[[1979]],
+[[1980]],
+[[1981]],
+[[1982]],
+[[1983]],
+[[1984]],
+[[1985]],
+[[1986]],
+[[1987]],
+[[1988]],
+[[1989]],
+[[1990]],
+[[1991]],
+[[1992]],
+[[1993]],
+[[1994]],
+[[1995]],
+[[1996]],
+[[1997]],
+[[1998]],
+[[1999]],
+[[2000]],
+[[2001]],
+[[2002]],
+[[2003]],
+[[2004]],
+[[2005]],
+[[2006]],
+[[2007]],
+[[2008]],
+[[2009]],
+[[2010]],
+[[2011]],
+[[2012]],
+[[2013]],
+[[2014]],
+[[2015]],
+[[2016]],
+[[2017]],
+[[2018]],
+[[2019]],
+[[2020]],
+[[2021]],
+[[2022]],
+[[2023]],
+[[2024]],
+[[2025]],
+[[2026]],
+[[2027]],
+[[2028]],
+[[2029]],
+[[2030]],
+[[2031]],
+[[2032]],
+[[2033]],
+[[2034]],
+[[2035]],
+[[2036]],
+[[2037]],
+[[2038]],
+[[2039]],
+[[2040]],
+[[2041]],
+[[2042]],
+[[2043]],
+[[2044]],
+[[2045]],
+[[2046]],
+[[2047]],
+[[2048]],
+[[2049]],
+[[2050]],
+[[2051]],
+[[2052]],
+[[2053]],
+[[2054]],
+[[2055]],
+[[2056]],
+[[2057]],
+[[2058]],
+[[2059]],
+[[2060]],
+[[2061]],
+[[2062]],
+[[2063]],
+[[2064]],
+[[2065]],
+[[2066]],
+[[2067]],
+[[2068]],
+[[2069]],
+[[2070]],
+[[2071]],
+[[2072]],
+[[2073]],
+[[2074]],
+[[2075]],
+[[2076]],
+[[2077]],
+[[2078]],
+[[2079]],
+[[2080]],
+[[2081]],
+[[2082]],
+[[2083]],
+[[2084]],
+[[2085]],
+[[2086]],
+[[2087]],
+[[2088]],
+[[2089]],
+[[2090]],
+[[2091]],
+[[2092]],
+[[2093]],
+[[2094]],
+[[2095]],
+[[2096]],
+[[2097]],
+[[2098]],
+[[2099]],
+[[2100]],
+[[2101]],
+[[2102]],
+[[2103]],
+[[2104]],
+[[2105]],
+[[2106]],
+[[2107]],
+[[2108]],
+[[2109]],
+[[2110]],
+[[2111]],
+[[2112]],
+[[2113]],
+[[2114]],
+[[2115]],
+[[2116]],
+[[2117]],
+[[2118]],
+[[2119]],
+[[2120]],
+[[2121]],
+[[2122]],
+[[2123]],
+[[2124]],
+[[2125]],
+[[2126]],
+[[2127]],
+[[2128]],
+[[2129]],
+[[2130]],
+[[2131]],
+[[2132]],
+[[2133]],
+[[2134]],
+[[2135]],
+[[2136]],
+[[2137]],
+[[2138]],
+[[2139]],
+[[2140]],
+[[2141]],
+[[2142]],
+[[2143]],
+[[2144]],
+[[2145]],
+[[2146]],
+[[2147]],
+[[2148]],
+[[2149]],
+[[2150]],
+[[2151]],
+[[2152]],
+[[2153]],
+[[2154]],
+[[2155]],
+[[2156]],
+[[2157]],
+[[2158]],
+[[2159]],
+[[2160]],
+[[2161]],
+[[2162]],
+[[2163]],
+[[2164]],
+[[2165]],
+[[2166]],
+[[2167]],
+[[2168]],
+[[2169]],
+[[2170]],
+[[2171]],
+[[2172]],
+[[2173]],
+[[2174]],
+[[2175]],
+[[2176]],
+[[2177]],
+[[2178]],
+[[2179]],
+[[2180]],
+[[2181]],
+[[2182]],
+[[2183]],
+[[2184]],
+[[2185]],
+[[2186]],
+[[2187]],
+[[2188]],
+[[2189]],
+[[2190]],
+[[2191]],
+[[2192]],
+[[2193]],
+[[2194]],
+[[2195]],
+[[2196]],
+[[2197]],
+[[2198]],
+[[2199]],
+[[2200]],
+[[2201]],
+[[2202]],
+[[2203]],
+[[2204]],
+[[2205]],
+[[2206]],
+[[2207]],
+[[2208]],
+[[2209]],
+[[2210]],
+[[2211]],
+[[2212]],
+[[2213]],
+[[2214]],
+[[2215]],
+[[2216]],
+[[2217]],
+[[2218]],
+[[2219]],
+[[2220]],
+[[2221]],
+[[2222]],
+[[2223]],
+[[2224]],
+[[2225]],
+[[2226]],
+[[2227]],
+[[2228]],
+[[2229]],
+[[2230]],
+[[2231]],
+[[2232]],
+[[2233]],
+[[2234]],
+[[2235]],
+[[2236]],
+[[2237]],
+[[2238]],
+[[2239]],
+[[2240]],
+[[2241]],
+[[2242]],
+[[2243]],
+[[2244]],
+[[2245]],
+[[2246]],
+[[2247]],
+[[2248]],
+[[2249]],
+[[2250]],
+[[2251]],
+[[2252]],
+[[2253]],
+[[2254]],
+[[2255]],
+[[2256]],
+[[2257]],
+[[2258]],
+[[2259]],
+[[2260]],
+[[2261]],
+[[2262]],
+[[2263]],
+[[2264]],
+[[2265]],
+[[2266]],
+[[2267]],
+[[2268]],
+[[2269]],
+[[2270]],
+[[2271]],
+[[2272]],
+[[2273]],
+[[2274]],
+[[2275]],
+[[2276]],
+[[2277]],
+[[2278]],
+[[2279]],
+[[2280]],
+[[2281]],
+[[2282]],
+[[2283]],
+[[2284]],
+[[2285]],
+[[2286]],
+[[2287]],
+[[2288]],
+[[2289]],
+[[2290]],
+[[2291]],
+[[2292]],
+[[2293]],
+[[2294]],
+[[2295]],
+[[2296]],
+[[2297]],
+[[2298]],
+[[2299]],
+[[2300]],
+[[2301]],
+[[2302]],
+[[2303]],
+[[2304]],
+[[2305]],
+[[2306]],
+[[2307]],
+[[2308]],
+[[2309]],
+[[2310]],
+[[2311]],
+[[2312]],
+[[2313]],
+[[2314]],
+[[2315]],
+[[2316]],
+[[2317]],
+[[2318]],
+[[2319]],
+[[2320]],
+[[2321]],
+[[2322]],
+[[2323]],
+[[2324]],
+[[2325]],
+[[2326]],
+[[2327]],
+[[2328]],
+[[2329]],
+[[2330]],
+[[2331]],
+[[2332]],
+[[2333]],
+[[2334]],
+[[2335]],
+[[2336]],
+[[2337]],
+[[2338]],
+[[2339]],
+[[2340]],
+[[2341]],
+[[2342]],
+[[2343]],
+[[2344]],
+[[2345]],
+[[2346]],
+[[2347]],
+[[2348]],
+[[2349]],
+[[2350]],
+[[2351]],
+[[2352]],
+[[2353]],
+[[2354]],
+[[2355]],
+[[2356]],
+[[2357]],
+[[2358]],
+[[2359]],
+[[2360]],
+[[2361]],
+[[2362]],
+[[2363]],
+[[2364]],
+[[2365]],
+[[2366]],
+[[2367]],
+[[2368]],
+[[2369]],
+[[2370]],
+[[2371]],
+[[2372]],
+[[2373]],
+[[2374]],
+[[2375]],
+[[2376]],
+[[2377]],
+[[2378]],
+[[2379]],
+[[2380]],
+[[2381]],
+[[2382]],
+[[2383]],
+[[2384]],
+[[2385]],
+[[2386]],
+[[2387]],
+[[2388]],
+[[2389]],
+[[2390]],
+[[2391]],
+[[2392]],
+[[2393]],
+[[2394]],
+[[2395]],
+[[2396]],
+[[2397]],
+[[2398]],
+[[2399]],
+[[2400]],
+[[2401]],
+[[2402]],
+[[2403]],
+[[2404]],
+[[2405]],
+[[2406]],
+[[2407]],
+[[2408]],
+[[2409]],
+[[2410]],
+[[2411]],
+[[2412]],
+[[2413]],
+[[2414]],
+[[2415]],
+[[2416]],
+[[2417]],
+[[2418]],
+[[2419]],
+[[2420]],
+[[2421]],
+[[2422]],
+[[2423]],
+[[2424]],
+[[2425]],
+[[2426]],
+[[2427]],
+[[2428]],
+[[2429]],
+[[2430]],
+[[2431]],
+[[2432]],
+[[2433]],
+[[2434]],
+[[2435]],
+[[2436]],
+[[2437]],
+[[2438]],
+[[2439]],
+[[2440]],
+[[2441]],
+[[2442]],
+[[2443]],
+[[2444]],
+[[2445]],
+[[2446]],
+[[2447]],
+[[2448]],
+[[2449]],
+[[2450]],
+[[2451]],
+[[2452]],
+[[2453]],
+[[2454]],
+[[2455]],
+[[2456]],
+[[2457]],
+[[2458]],
+[[2459]],
+[[2460]],
+[[2461]],
+[[2462]],
+[[2463]],
+[[2464]],
+[[2465]],
+[[2466]],
+[[2467]],
+[[2468]],
+[[2469]],
+[[2470]],
+[[2471]],
+[[2472]],
+[[2473]],
+[[2474]],
+[[2475]],
+[[2476]],
+[[2477]],
+[[2478]],
+[[2479]],
+[[2480]],
+[[2481]],
+[[2482]],
+[[2483]],
+[[2484]],
+[[2485]],
+[[2486]],
+[[2487]],
+[[2488]],
+[[2489]],
+[[2490]],
+[[2491]],
+[[2492]],
+[[2493]],
+[[2494]],
+[[2495]],
+[[2496]],
+[[2497]],
+[[2498]],
+[[2499]],
+[[2500]],
+[[2501]],
+[[2502]],
+[[2503]],
+[[2504]],
+[[2505]],
+[[2506]],
+[[2507]],
+[[2508]],
+[[2509]],
+[[2510]],
+[[2511]],
+[[2512]],
+[[2513]],
+[[2514]],
+[[2515]],
+[[2516]],
+[[2517]],
+[[2518]],
+[[2519]],
+[[2520]],
+[[2521]],
+[[2522]],
+[[2523]],
+[[2524]],
+[[2525]],
+[[2526]],
+[[2527]],
+[[2528]],
+[[2529]],
+[[2530]],
+[[2531]],
+[[2532]],
+[[2533]],
+[[2534]],
+[[2535]],
+[[2536]],
+[[2537]],
+[[2538]],
+[[2539]],
+[[2540]],
+[[2541]],
+[[2542]],
+[[2543]],
+[[2544]],
+[[2545]],
+[[2546]],
+[[2547]],
+[[2548]],
+[[2549]],
+[[2550]],
+[[2551]],
+[[2552]],
+[[2553]],
+[[2554]],
+[[2555]],
+[[2556]],
+[[2557]],
+[[2558]],
+[[2559]],
+[[2560]],
+[[2561]],
+[[2562]],
+[[2563]],
+[[2564]],
+[[2565]],
+[[2566]],
+[[2567]],
+[[2568]],
+[[2569]],
+[[2570]],
+[[2571]],
+[[2572]],
+[[2573]],
+[[2574]],
+[[2575]],
+[[2576]],
+[[2577]],
+[[2578]],
+[[2579]],
+[[2580]],
+[[2581]],
+[[2582]],
+[[2583]],
+[[2584]],
+[[2585]],
+[[2586]],
+[[2587]],
+[[2588]],
+[[2589]],
+[[2590]],
+[[2591]],
+[[2592]],
+[[2593]],
+[[2594]],
+[[2595]],
+[[2596]],
+[[2597]],
+[[2598]],
+[[2599]],
+[[2600]],
+[[2601]],
+[[2602]],
+[[2603]],
+[[2604]],
+[[2605]],
+[[2606]],
+[[2607]],
+[[2608]],
+[[2609]],
+[[2610]],
+[[2611]],
+[[2612]],
+[[2613]],
+[[2614]],
+[[2615]],
+[[2616]],
+[[2617]],
+[[2618]],
+[[2619]],
+[[2620]],
+[[2621]],
+[[2622]],
+[[2623]],
+[[2624]],
+[[2625]],
+[[2626]],
+[[2627]],
+[[2628]],
+[[2629]],
+[[2630]],
+[[2631]],
+[[2632]],
+[[2633]],
+[[2634]],
+[[2635]],
+[[2636]],
+[[2637]],
+[[2638]],
+[[2639]],
+[[2640]],
+[[2641]],
+[[2642]],
+[[2643]],
+[[2644]],
+[[2645]],
+[[2646]],
+[[2647]],
+[[2648]],
+[[2649]],
+[[2650]],
+[[2651]],
+[[2652]],
+[[2653]],
+[[2654]],
+[[2655]],
+[[2656]],
+[[2657]],
+[[2658]],
+[[2659]],
+[[2660]],
+[[2661]],
+[[2662]],
+[[2663]],
+[[2664]],
+[[2665]],
+[[2666]],
+[[2667]],
+[[2668]],
+[[2669]],
+[[2670]],
+[[2671]],
+[[2672]],
+[[2673]],
+[[2674]],
+[[2675]],
+[[2676]],
+[[2677]],
+[[2678]],
+[[2679]],
+[[2680]],
+[[2681]],
+[[2682]],
+[[2683]],
+[[2684]],
+[[2685]],
+[[2686]],
+[[2687]],
+[[2688]],
+[[2689]],
+[[2690]],
+[[2691]],
+[[2692]],
+[[2693]],
+[[2694]],
+[[2695]],
+[[2696]],
+[[2697]],
+[[2698]],
+[[2699]],
+[[2700]],
+[[2701]],
+[[2702]],
+[[2703]],
+[[2704]],
+[[2705]],
+[[2706]],
+[[2707]],
+[[2708]],
+[[2709]],
+[[2710]],
+[[2711]],
+[[2712]],
+[[2713]],
+[[2714]],
+[[2715]],
+[[2716]],
+[[2717]],
+[[2718]],
+[[2719]],
+[[2720]],
+[[2721]],
+[[2722]],
+[[2723]],
+[[2724]],
+[[2725]],
+[[2726]],
+[[2727]],
+[[2728]],
+[[2729]],
+[[2730]],
+[[2731]],
+[[2732]],
+[[2733]],
+[[2734]],
+[[2735]],
+[[2736]],
+[[2737]],
+[[2738]],
+[[2739]],
+[[2740]],
+[[2741]],
+[[2742]],
+[[2743]],
+[[2744]],
+[[2745]],
+[[2746]],
+[[2747]],
+[[2748]],
+[[2749]],
+[[2750]],
+[[2751]],
+[[2752]],
+[[2753]],
+[[2754]],
+[[2755]],
+[[2756]],
+[[2757]],
+[[2758]],
+[[2759]],
+[[2760]],
+[[2761]],
+[[2762]],
+[[2763]],
+[[2764]],
+[[2765]],
+[[2766]],
+[[2767]],
+[[2768]],
+[[2769]],
+[[2770]],
+[[2771]],
+[[2772]],
+[[2773]],
+[[2774]],
+[[2775]],
+[[2776]],
+[[2777]],
+[[2778]],
+[[2779]],
+[[2780]],
+[[2781]],
+[[2782]],
+[[2783]],
+[[2784]],
+[[2785]],
+[[2786]],
+[[2787]],
+[[2788]],
+[[2789]],
+[[2790]],
+[[2791]],
+[[2792]],
+[[2793]],
+[[2794]],
+[[2795]],
+[[2796]],
+[[2797]],
+[[2798]],
+[[2799]],
+[[2800]],
+[[2801]],
+[[2802]],
+[[2803]],
+[[2804]],
+[[2805]],
+[[2806]],
+[[2807]],
+[[2808]],
+[[2809]],
+[[2810]],
+[[2811]],
+[[2812]],
+[[2813]],
+[[2814]],
+[[2815]],
+[[2816]],
+[[2817]],
+[[2818]],
+[[2819]],
+[[2820]],
+[[2821]],
+[[2822]],
+[[2823]],
+[[2824]],
+[[2825]],
+[[2826]],
+[[2827]],
+[[2828]],
+[[2829]],
+[[2830]],
+[[2831]],
+[[2832]],
+[[2833]],
+[[2834]],
+[[2835]],
+[[2836]],
+[[2837]],
+[[2838]],
+[[2839]],
+[[2840]],
+[[2841]],
+[[2842]],
+[[2843]],
+[[2844]],
+[[2845]],
+[[2846]],
+[[2847]],
+[[2848]],
+[[2849]],
+[[2850]],
+[[2851]],
+[[2852]],
+[[2853]],
+[[2854]],
+[[2855]],
+[[2856]],
+[[2857]],
+[[2858]],
+[[2859]],
+[[2860]],
+[[2861]],
+[[2862]],
+[[2863]],
+[[2864]],
+[[2865]],
+[[2866]],
+[[2867]],
+[[2868]],
+[[2869]],
+[[2870]],
+[[2871]],
+[[2872]],
+[[2873]],
+[[2874]],
+[[2875]],
+[[2876]],
+[[2877]],
+[[2878]],
+[[2879]],
+[[2880]],
+[[2881]],
+[[2882]],
+[[2883]],
+[[2884]],
+[[2885]],
+[[2886]],
+[[2887]],
+[[2888]],
+[[2889]],
+[[2890]],
+[[2891]],
+[[2892]],
+[[2893]],
+[[2894]],
+[[2895]],
+[[2896]],
+[[2897]],
+[[2898]],
+[[2899]],
+[[2900]],
+[[2901]],
+[[2902]],
+[[2903]],
+[[2904]],
+[[2905]],
+[[2906]],
+[[2907]],
+[[2908]],
+[[2909]],
+[[2910]],
+[[2911]],
+[[2912]],
+[[2913]],
+[[2914]],
+[[2915]],
+[[2916]],
+[[2917]],
+[[2918]],
+[[2919]],
+[[2920]],
+[[2921]],
+[[2922]],
+[[2923]],
+[[2924]],
+[[2925]],
+[[2926]],
+[[2927]],
+[[2928]],
+[[2929]],
+[[2930]],
+[[2931]],
+[[2932]],
+[[2933]],
+[[2934]],
+[[2935]],
+[[2936]],
+[[2937]],
+[[2938]],
+[[2939]],
+[[2940]],
+[[2941]],
+[[2942]],
+[[2943]],
+[[2944]],
+[[2945]],
+[[2946]],
+[[2947]],
+[[2948]],
+[[2949]],
+[[2950]],
+[[2951]],
+[[2952]],
+[[2953]],
+[[2954]],
+[[2955]],
+[[2956]],
+[[2957]],
+[[2958]],
+[[2959]],
+[[2960]],
+[[2961]],
+[[2962]],
+[[2963]],
+[[2964]],
+[[2965]],
+[[2966]],
+[[2967]],
+[[2968]],
+[[2969]],
+[[2970]],
+[[2971]],
+[[2972]],
+[[2973]],
+[[2974]],
+[[2975]],
+[[2976]],
+[[2977]],
+[[2978]],
+[[2979]],
+[[2980]],
+[[2981]],
+[[2982]],
+[[2983]],
+[[2984]],
+[[2985]],
+[[2986]],
+[[2987]],
+[[2988]],
+[[2989]],
+[[2990]],
+[[2991]],
+[[2992]],
+[[2993]],
+[[2994]],
+[[2995]],
+[[2996]],
+[[2997]],
+[[2998]],
+[[2999]],
+[[3000]],
+[[3001]],
+[[3002]],
+[[3003]],
+[[3004]],
+[[3005]],
+[[3006]],
+[[3007]],
+[[3008]],
+[[3009]],
+[[3010]],
+[[3011]],
+[[3012]],
+[[3013]],
+[[3014]],
+[[3015]],
+[[3016]],
+[[3017]],
+[[3018]],
+[[3019]],
+[[3020]],
+[[3021]],
+[[3022]],
+[[3023]],
+[[3024]],
+[[3025]],
+[[3026]],
+[[3027]],
+[[3028]],
+[[3029]],
+[[3030]],
+[[3031]],
+[[3032]],
+[[3033]],
+[[3034]],
+[[3035]],
+[[3036]],
+[[3037]],
+[[3038]],
+[[3039]],
+[[3040]],
+[[3041]],
+[[3042]],
+[[3043]],
+[[3044]],
+[[3045]],
+[[3046]],
+[[3047]],
+[[3048]],
+[[3049]],
+[[3050]],
+[[3051]],
+[[3052]],
+[[3053]],
+[[3054]],
+[[3055]],
+[[3056]],
+[[3057]],
+[[3058]],
+[[3059]],
+[[3060]],
+[[3061]],
+[[3062]],
+[[3063]],
+[[3064]],
+[[3065]],
+[[3066]],
+[[3067]],
+[[3068]],
+[[3069]],
+[[3070]],
+[[3071]],
+[[3072]],
+[[3073]],
+[[3074]],
+[[3075]],
+[[3076]],
+[[3077]],
+[[3078]],
+[[3079]],
+[[3080]],
+[[3081]],
+[[3082]],
+[[3083]],
+[[3084]],
+[[3085]],
+[[3086]],
+[[3087]],
+[[3088]],
+[[3089]],
+[[3090]],
+[[3091]],
+[[3092]],
+[[3093]],
+[[3094]],
+[[3095]],
+[[3096]],
+[[3097]],
+[[3098]],
+[[3099]],
+[[3100]],
+[[3101]],
+[[3102]],
+[[3103]],
+[[3104]],
+[[3105]],
+[[3106]],
+[[3107]],
+[[3108]],
+[[3109]],
+[[3110]],
+[[3111]],
+[[3112]],
+[[3113]],
+[[3114]],
+[[3115]],
+[[3116]],
+[[3117]],
+[[3118]],
+[[3119]],
+[[3120]],
+[[3121]],
+[[3122]],
+[[3123]],
+[[3124]],
+[[3125]],
+[[3126]],
+[[3127]],
+[[3128]],
+[[3129]],
+[[3130]],
+[[3131]],
+[[3132]],
+[[3133]],
+[[3134]],
+[[3135]],
+[[3136]],
+[[3137]],
+[[3138]],
+[[3139]],
+[[3140]],
+[[3141]],
+[[3142]],
+[[3143]],
+[[3144]],
+[[3145]],
+[[3146]],
+[[3147]],
+[[3148]],
+[[3149]],
+[[3150]],
+[[3151]],
+[[3152]],
+[[3153]],
+[[3154]],
+[[3155]],
+[[3156]],
+[[3157]],
+[[3158]],
+[[3159]],
+[[3160]],
+[[3161]],
+[[3162]],
+[[3163]],
+[[3164]],
+[[3165]],
+[[3166]],
+[[3167]],
+[[3168]],
+[[3169]],
+[[3170]],
+[[3171]],
+[[3172]],
+[[3173]],
+[[3174]],
+[[3175]],
+[[3176]],
+[[3177]],
+[[3178]],
+[[3179]],
+[[3180]],
+[[3181]],
+[[3182]],
+[[3183]],
+[[3184]],
+[[3185]],
+[[3186]],
+[[3187]],
+[[3188]],
+[[3189]],
+[[3190]],
+[[3191]],
+[[3192]],
+[[3193]],
+[[3194]],
+[[3195]],
+[[3196]],
+[[3197]],
+[[3198]],
+[[3199]],
+[[3200]],
+[[3201]],
+[[3202]],
+[[3203]],
+[[3204]],
+[[3205]],
+[[3206]],
+[[3207]],
+[[3208]],
+[[3209]],
+[[3210]],
+[[3211]],
+[[3212]],
+[[3213]],
+[[3214]],
+[[3215]],
+[[3216]],
+[[3217]],
+[[3218]],
+[[3219]],
+[[3220]],
+[[3221]],
+[[3222]],
+[[3223]],
+[[3224]],
+[[3225]],
+[[3226]],
+[[3227]],
+[[3228]],
+[[3229]],
+[[3230]],
+[[3231]],
+[[3232]],
+[[3233]],
+[[3234]],
+[[3235]],
+[[3236]],
+[[3237]],
+[[3238]],
+[[3239]],
+[[3240]],
+[[3241]],
+[[3242]],
+[[3243]],
+[[3244]],
+[[3245]],
+[[3246]],
+[[3247]],
+[[3248]],
+[[3249]],
+[[3250]],
+[[3251]],
+[[3252]],
+[[3253]],
+[[3254]],
+[[3255]],
+[[3256]],
+[[3257]],
+[[3258]],
+[[3259]],
+[[3260]],
+[[3261]],
+[[3262]],
+[[3263]],
+[[3264]],
+[[3265]],
+[[3266]],
+[[3267]],
+[[3268]],
+[[3269]],
+[[3270]],
+[[3271]],
+[[3272]],
+[[3273]],
+[[3274]],
+[[3275]],
+[[3276]],
+[[3277]],
+[[3278]],
+[[3279]],
+[[3280]],
+[[3281]],
+[[3282]],
+[[3283]],
+[[3284]],
+[[3285]],
+[[3286]],
+[[3287]],
+[[3288]],
+[[3289]],
+[[3290]],
+[[3291]],
+[[3292]],
+[[3293]],
+[[3294]],
+[[3295]],
+[[3296]],
+[[3297]],
+[[3298]],
+[[3299]],
+[[3300]],
+[[3301]],
+[[3302]],
+[[3303]],
+[[3304]],
+[[3305]],
+[[3306]],
+[[3307]],
+[[3308]],
+[[3309]],
+[[3310]],
+[[3311]],
+[[3312]],
+[[3313]],
+[[3314]],
+[[3315]],
+[[3316]],
+[[3317]],
+[[3318]],
+[[3319]],
+[[3320]],
+[[3321]],
+[[3322]],
+[[3323]],
+[[3324]],
+[[3325]],
+[[3326]],
+[[3327]],
+[[3328]],
+[[3329]],
+[[3330]],
+[[3331]],
+[[3332]],
+[[3333]],
+[[3334]],
+[[3335]],
+[[3336]],
+[[3337]],
+[[3338]],
+[[3339]],
+[[3340]],
+[[3341]],
+[[3342]],
+[[3343]],
+[[3344]],
+[[3345]],
+[[3346]],
+[[3347]],
+[[3348]],
+[[3349]],
+[[3350]],
+[[3351]],
+[[3352]],
+[[3353]],
+[[3354]],
+[[3355]],
+[[3356]],
+[[3357]],
+[[3358]],
+[[3359]],
+[[3360]],
+[[3361]],
+[[3362]],
+[[3363]],
+[[3364]],
+[[3365]],
+[[3366]],
+[[3367]],
+[[3368]],
+[[3369]],
+[[3370]],
+[[3371]],
+[[3372]],
+[[3373]],
+[[3374]],
+[[3375]],
+[[3376]],
+[[3377]],
+[[3378]],
+[[3379]],
+[[3380]],
+[[3381]],
+[[3382]],
+[[3383]],
+[[3384]],
+[[3385]],
+[[3386]],
+[[3387]],
+[[3388]],
+[[3389]],
+[[3390]],
+[[3391]],
+[[3392]],
+[[3393]],
+[[3394]],
+[[3395]],
+[[3396]],
+[[3397]],
+[[3398]],
+[[3399]],
+[[3400]],
+[[3401]],
+[[3402]],
+[[3403]],
+[[3404]],
+[[3405]],
+[[3406]],
+[[3407]],
+[[3408]],
+[[3409]],
+[[3410]],
+[[3411]],
+[[3412]],
+[[3413]],
+[[3414]],
+[[3415]],
+[[3416]],
+[[3417]],
+[[3418]],
+[[3419]],
+[[3420]],
+[[3421]],
+[[3422]],
+[[3423]],
+[[3424]],
+[[3425]],
+[[3426]],
+[[3427]],
+[[3428]],
+[[3429]],
+[[3430]],
+[[3431]],
+[[3432]],
+[[3433]],
+[[3434]],
+[[3435]],
+[[3436]],
+[[3437]],
+[[3438]],
+[[3439]],
+[[3440]],
+[[3441]],
+[[3442]],
+[[3443]],
+[[3444]],
+[[3445]],
+[[3446]],
+[[3447]],
+[[3448]],
+[[3449]],
+[[3450]],
+[[3451]],
+[[3452]],
+[[3453]],
+[[3454]],
+[[3455]],
+[[3456]],
+[[3457]],
+[[3458]],
+[[3459]],
+[[3460]],
+[[3461]],
+[[3462]],
+[[3463]],
+[[3464]],
+[[3465]],
+[[3466]],
+[[3467]],
+[[3468]],
+[[3469]],
+[[3470]],
+[[3471]],
+[[3472]],
+[[3473]],
+[[3474]],
+[[3475]],
+[[3476]],
+[[3477]],
+[[3478]],
+[[3479]],
+[[3480]],
+[[3481]],
+[[3482]],
+[[3483]],
+[[3484]],
+[[3485]],
+[[3486]],
+[[3487]],
+[[3488]],
+[[3489]],
+[[3490]],
+[[3491]],
+[[3492]],
+[[3493]],
+[[3494]],
+[[3495]],
+[[3496]],
+[[3497]],
+[[3498]],
+[[3499]],
+[[3500]],
+[[3501]],
+[[3502]],
+[[3503]],
+[[3504]],
+[[3505]],
+[[3506]],
+[[3507]],
+[[3508]],
+[[3509]],
+[[3510]],
+[[3511]],
+[[3512]],
+[[3513]],
+[[3514]],
+[[3515]],
+[[3516]],
+[[3517]],
+[[3518]],
+[[3519]],
+[[3520]],
+[[3521]],
+[[3522]],
+[[3523]],
+[[3524]],
+[[3525]],
+[[3526]],
+[[3527]],
+[[3528]],
+[[3529]],
+[[3530]],
+[[3531]],
+[[3532]],
+[[3533]],
+[[3534]],
+[[3535]],
+[[3536]],
+[[3537]],
+[[3538]],
+[[3539]],
+[[3540]],
+[[3541]],
+[[3542]],
+[[3543]],
+[[3544]],
+[[3545]],
+[[3546]],
+[[3547]],
+[[3548]],
+[[3549]],
+[[3550]],
+[[3551]],
+[[3552]],
+[[3553]],
+[[3554]],
+[[3555]],
+[[3556]],
+[[3557]],
+[[3558]],
+[[3559]],
+[[3560]],
+[[3561]],
+[[3562]],
+[[3563]],
+[[3564]],
+[[3565]],
+[[3566]],
+[[3567]],
+[[3568]],
+[[3569]],
+[[3570]],
+[[3571]],
+[[3572]],
+[[3573]],
+[[3574]],
+[[3575]],
+[[3576]],
+[[3577]],
+[[3578]],
+[[3579]],
+[[3580]],
+[[3581]],
+[[3582]],
+[[3583]],
+[[3584]],
+[[3585]],
+[[3586]],
+[[3587]],
+[[3588]],
+[[3589]],
+[[3590]],
+[[3591]],
+[[3592]],
+[[3593]],
+[[3594]],
+[[3595]],
+[[3596]],
+[[3597]],
+[[3598]],
+[[3599]],
+[[3600]],
+[[3601]],
+[[3602]],
+[[3603]],
+[[3604]],
+[[3605]],
+[[3606]],
+[[3607]],
+[[3608]],
+[[3609]],
+[[3610]],
+[[3611]],
+[[3612]],
+[[3613]],
+[[3614]],
+[[3615]],
+[[3616]],
+[[3617]],
+[[3618]],
+[[3619]],
+[[3620]],
+[[3621]],
+[[3622]],
+[[3623]],
+[[3624]],
+[[3625]],
+[[3626]],
+[[3627]],
+[[3628]],
+[[3629]],
+[[3630]],
+[[3631]],
+[[3632]],
+[[3633]],
+[[3634]],
+[[3635]],
+[[3636]],
+[[3637]],
+[[3638]],
+[[3639]],
+[[3640]],
+[[3641]],
+[[3642]],
+[[3643]],
+[[3644]],
+[[3645]],
+[[3646]],
+[[3647]],
+[[3648]],
+[[3649]],
+[[3650]],
+[[3651]],
+[[3652]],
+[[3653]],
+[[3654]],
+[[3655]],
+[[3656]],
+[[3657]],
+[[3658]],
+[[3659]],
+[[3660]],
+[[3661]],
+[[3662]],
+[[3663]],
+[[3664]],
+[[3665]],
+[[3666]],
+[[3667]],
+[[3668]],
+[[3669]],
+[[3670]],
+[[3671]],
+[[3672]],
+[[3673]],
+[[3674]],
+[[3675]],
+[[3676]],
+[[3677]],
+[[3678]],
+[[3679]],
+[[3680]],
+[[3681]],
+[[3682]],
+[[3683]],
+[[3684]],
+[[3685]],
+[[3686]],
+[[3687]],
+[[3688]],
+[[3689]],
+[[3690]],
+[[3691]],
+[[3692]],
+[[3693]],
+[[3694]],
+[[3695]],
+[[3696]],
+[[3697]],
+[[3698]],
+[[3699]],
+[[3700]],
+[[3701]],
+[[3702]],
+[[3703]],
+[[3704]],
+[[3705]],
+[[3706]],
+[[3707]],
+[[3708]],
+[[3709]],
+[[3710]],
+[[3711]],
+[[3712]],
+[[3713]],
+[[3714]],
+[[3715]],
+[[3716]],
+[[3717]],
+[[3718]],
+[[3719]],
+[[3720]],
+[[3721]],
+[[3722]],
+[[3723]],
+[[3724]],
+[[3725]],
+[[3726]],
+[[3727]],
+[[3728]],
+[[3729]],
+[[3730]],
+[[3731]],
+[[3732]],
+[[3733]],
+[[3734]],
+[[3735]],
+[[3736]],
+[[3737]],
+[[3738]],
+[[3739]],
+[[3740]],
+[[3741]],
+[[3742]],
+[[3743]],
+[[3744]],
+[[3745]],
+[[3746]],
+[[3747]],
+[[3748]],
+[[3749]],
+[[3750]],
+[[3751]],
+[[3752]],
+[[3753]],
+[[3754]],
+[[3755]],
+[[3756]],
+[[3757]],
+[[3758]],
+[[3759]],
+[[3760]],
+[[3761]],
+[[3762]],
+[[3763]],
+[[3764]],
+[[3765]],
+[[3766]],
+[[3767]],
+[[3768]],
+[[3769]],
+[[3770]],
+[[3771]],
+[[3772]],
+[[3773]],
+[[3774]],
+[[3775]],
+[[3776]],
+[[3777]],
+[[3778]],
+[[3779]],
+[[3780]],
+[[3781]],
+[[3782]],
+[[3783]],
+[[3784]],
+[[3785]],
+[[3786]],
+[[3787]],
+[[3788]],
+[[3789]],
+[[3790]],
+[[3791]],
+[[3792]],
+[[3793]],
+[[3794]],
+[[3795]],
+[[3796]],
+[[3797]],
+[[3798]],
+[[3799]],
+[[3800]],
+[[3801]],
+[[3802]],
+[[3803]],
+[[3804]],
+[[3805]],
+[[3806]],
+[[3807]],
+[[3808]],
+[[3809]],
+[[3810]],
+[[3811]],
+[[3812]],
+[[3813]],
+[[3814]],
+[[3815]],
+[[3816]],
+[[3817]],
+[[3818]],
+[[3819]],
+[[3820]],
+[[3821]],
+[[3822]],
+[[3823]],
+[[3824]],
+[[3825]],
+[[3826]],
+[[3827]],
+[[3828]],
+[[3829]],
+[[3830]],
+[[3831]],
+[[3832]],
+[[3833]],
+[[3834]],
+[[3835]],
+[[3836]],
+[[3837]],
+[[3838]],
+[[3839]],
+[[3840]],
+[[3841]],
+[[3842]],
+[[3843]],
+[[3844]],
+[[3845]],
+[[3846]],
+[[3847]],
+[[3848]],
+[[3849]],
+[[3850]],
+[[3851]],
+[[3852]],
+[[3853]],
+[[3854]],
+[[3855]],
+[[3856]],
+[[3857]],
+[[3858]],
+[[3859]],
+[[3860]],
+[[3861]],
+[[3862]],
+[[3863]],
+[[3864]],
+[[3865]],
+[[3866]],
+[[3867]],
+[[3868]],
+[[3869]],
+[[3870]],
+[[3871]],
+[[3872]],
+[[3873]],
+[[3874]],
+[[3875]],
+[[3876]],
+[[3877]],
+[[3878]],
+[[3879]],
+[[3880]],
+[[3881]],
+[[3882]],
+[[3883]],
+[[3884]],
+[[3885]],
+[[3886]],
+[[3887]],
+[[3888]],
+[[3889]],
+[[3890]],
+[[3891]],
+[[3892]],
+[[3893]],
+[[3894]],
+[[3895]],
+[[3896]],
+[[3897]],
+[[3898]],
+[[3899]],
+[[3900]],
+[[3901]],
+[[3902]],
+[[3903]],
+[[3904]],
+[[3905]],
+[[3906]],
+[[3907]],
+[[3908]],
+[[3909]],
+[[3910]],
+[[3911]],
+[[3912]],
+[[3913]],
+[[3914]],
+[[3915]],
+[[3916]],
+[[3917]],
+[[3918]],
+[[3919]],
+[[3920]],
+[[3921]],
+[[3922]],
+[[3923]],
+[[3924]],
+[[3925]],
+[[3926]],
+[[3927]],
+[[3928]],
+[[3929]],
+[[3930]],
+[[3931]],
+[[3932]],
+[[3933]],
+[[3934]],
+[[3935]],
+[[3936]],
+[[3937]],
+[[3938]],
+[[3939]],
+[[3940]],
+[[3941]],
+[[3942]],
+[[3943]],
+[[3944]],
+[[3945]],
+[[3946]],
+[[3947]],
+[[3948]],
+[[3949]],
+[[3950]],
+[[3951]],
+[[3952]],
+[[3953]],
+[[3954]],
+[[3955]],
+[[3956]],
+[[3957]],
+[[3958]],
+[[3959]],
+[[3960]],
+[[3961]],
+[[3962]],
+[[3963]],
+[[3964]],
+[[3965]],
+[[3966]],
+[[3967]],
+[[3968]],
+[[3969]],
+[[3970]],
+[[3971]],
+[[3972]],
+[[3973]],
+[[3974]],
+[[3975]],
+[[3976]],
+[[3977]],
+[[3978]],
+[[3979]],
+[[3980]],
+[[3981]],
+[[3982]],
+[[3983]],
+[[3984]],
+[[3985]],
+[[3986]],
+[[3987]],
+[[3988]],
+[[3989]],
+[[3990]],
+[[3991]],
+[[3992]],
+[[3993]],
+[[3994]],
+[[3995]],
+[[3996]],
+[[3997]],
+[[3998]],
+[[3999]],
+[[4000]],
+[[4001]],
+[[4002]],
+[[4003]],
+[[4004]],
+[[4005]],
+[[4006]],
+[[4007]],
+[[4008]],
+[[4009]],
+[[4010]],
+[[4011]],
+[[4012]],
+[[4013]],
+[[4014]],
+[[4015]],
+[[4016]],
+[[4017]],
+[[4018]],
+[[4019]],
+[[4020]],
+[[4021]],
+[[4022]],
+[[4023]],
+[[4024]],
+[[4025]],
+[[4026]],
+[[4027]],
+[[4028]],
+[[4029]],
+[[4030]],
+[[4031]],
+[[4032]],
+[[4033]],
+[[4034]],
+[[4035]],
+[[4036]],
+[[4037]],
+[[4038]],
+[[4039]],
+[[4040]],
+[[4041]],
+[[4042]],
+[[4043]],
+[[4044]],
+[[4045]],
+[[4046]],
+[[4047]],
+[[4048]],
+[[4049]],
+[[4050]],
+[[4051]],
+[[4052]],
+[[4053]],
+[[4054]],
+[[4055]],
+[[4056]],
+[[4057]],
+[[4058]],
+[[4059]],
+[[4060]],
+[[4061]],
+[[4062]],
+[[4063]],
+[[4064]],
+[[4065]],
+[[4066]],
+[[4067]],
+[[4068]],
+[[4069]],
+[[4070]],
+[[4071]],
+[[4072]],
+[[4073]],
+[[4074]],
+[[4075]],
+[[4076]],
+[[4077]],
+[[4078]],
+[[4079]],
+[[4080]],
+[[4081]],
+[[4082]],
+[[4083]],
+[[4084]],
+[[4085]],
+[[4086]],
+[[4087]],
+[[4088]],
+[[4089]],
+[[4090]],
+[[4091]],
+[[4092]],
+[[4093]],
+[[4094]],
+[[4095]],
+[[4096]],
+[[4097]],
+[[4098]],
+[[4099]],
+[[4100]],
+[[4101]],
+[[4102]],
+[[4103]],
+[[4104]],
+[[4105]],
+[[4106]],
+[[4107]],
+[[4108]],
+[[4109]],
+[[4110]],
+[[4111]],
+[[4112]],
+[[4113]],
+[[4114]],
+[[4115]],
+[[4116]],
+[[4117]],
+[[4118]],
+[[4119]],
+[[4120]],
+[[4121]],
+[[4122]],
+[[4123]],
+[[4124]],
+[[4125]],
+[[4126]],
+[[4127]],
+[[4128]],
+[[4129]],
+[[4130]],
+[[4131]],
+[[4132]],
+[[4133]],
+[[4134]],
+[[4135]],
+[[4136]],
+[[4137]],
+[[4138]],
+[[4139]],
+[[4140]],
+[[4141]],
+[[4142]],
+[[4143]],
+[[4144]],
+[[4145]],
+[[4146]],
+[[4147]],
+[[4148]],
+[[4149]],
+[[4150]],
+[[4151]],
+[[4152]],
+[[4153]],
+[[4154]],
+[[4155]],
+[[4156]],
+[[4157]],
+[[4158]],
+[[4159]],
+[[4160]],
+[[4161]],
+[[4162]],
+[[4163]],
+[[4164]],
+[[4165]],
+[[4166]],
+[[4167]],
+[[4168]],
+[[4169]],
+[[4170]],
+[[4171]],
+[[4172]],
+[[4173]],
+[[4174]],
+[[4175]],
+[[4176]],
+[[4177]],
+[[4178]],
+[[4179]],
+[[4180]],
+[[4181]],
+[[4182]],
+[[4183]],
+[[4184]],
+[[4185]],
+[[4186]],
+[[4187]],
+[[4188]],
+[[4189]],
+[[4190]],
+[[4191]],
+[[4192]],
+[[4193]],
+[[4194]],
+[[4195]],
+[[4196]],
+[[4197]],
+[[4198]],
+[[4199]],
+[[4200]],
+[[4201]],
+[[4202]],
+[[4203]],
+[[4204]],
+[[4205]],
+[[4206]],
+[[4207]],
+[[4208]],
+[[4209]],
+[[4210]],
+[[4211]],
+[[4212]],
+[[4213]],
+[[4214]],
+[[4215]],
+[[4216]],
+[[4217]],
+[[4218]],
+[[4219]],
+[[4220]],
+[[4221]],
+[[4222]],
+[[4223]],
+[[4224]],
+[[4225]],
+[[4226]],
+[[4227]],
+[[4228]],
+[[4229]],
+[[4230]],
+[[4231]],
+[[4232]],
+[[4233]],
+[[4234]],
+[[4235]],
+[[4236]],
+[[4237]],
+[[4238]],
+[[4239]],
+[[4240]],
+[[4241]],
+[[4242]],
+[[4243]],
+[[4244]],
+[[4245]],
+[[4246]],
+[[4247]],
+[[4248]],
+[[4249]],
+[[4250]],
+[[4251]],
+[[4252]],
+[[4253]],
+[[4254]],
+[[4255]],
+[[4256]],
+[[4257]],
+[[4258]],
+[[4259]],
+[[4260]],
+[[4261]],
+[[4262]],
+[[4263]],
+[[4264]],
+[[4265]],
+[[4266]],
+[[4267]],
+[[4268]],
+[[4269]],
+[[4270]],
+[[4271]],
+[[4272]],
+[[4273]],
+[[4274]],
+[[4275]],
+[[4276]],
+[[4277]],
+[[4278]],
+[[4279]],
+[[4280]],
+[[4281]],
+[[4282]],
+[[4283]],
+[[4284]],
+[[4285]],
+[[4286]],
+[[4287]],
+[[4288]],
+[[4289]],
+[[4290]],
+[[4291]],
+[[4292]],
+[[4293]],
+[[4294]],
+[[4295]],
+[[4296]],
+[[4297]],
+[[4298]],
+[[4299]],
+[[4300]],
+[[4301]],
+[[4302]],
+[[4303]],
+[[4304]],
+[[4305]],
+[[4306]],
+[[4307]],
+[[4308]],
+[[4309]],
+[[4310]],
+[[4311]],
+[[4312]],
+[[4313]],
+[[4314]],
+[[4315]],
+[[4316]],
+[[4317]],
+[[4318]],
+[[4319]],
+[[4320]],
+[[4321]],
+[[4322]],
+[[4323]],
+[[4324]],
+[[4325]],
+[[4326]],
+[[4327]],
+[[4328]],
+[[4329]],
+[[4330]],
+[[4331]],
+[[4332]],
+[[4333]],
+[[4334]],
+[[4335]],
+[[4336]],
+[[4337]],
+[[4338]],
+[[4339]],
+[[4340]],
+[[4341]],
+[[4342]],
+[[4343]],
+[[4344]],
+[[4345]],
+[[4346]],
+[[4347]],
+[[4348]],
+[[4349]],
+[[4350]],
+[[4351]],
+[[4352]],
+[[4353]],
+[[4354]],
+[[4355]],
+[[4356]],
+[[4357]],
+[[4358]],
+[[4359]],
+[[4360]],
+[[4361]],
+[[4362]],
+[[4363]],
+[[4364]],
+[[4365]],
+[[4366]],
+[[4367]],
+[[4368]],
+[[4369]],
+[[4370]],
+[[4371]],
+[[4372]],
+[[4373]],
+[[4374]],
+[[4375]],
+[[4376]],
+[[4377]],
+[[4378]],
+[[4379]],
+[[4380]],
+[[4381]],
+[[4382]],
+[[4383]],
+[[4384]],
+[[4385]],
+[[4386]],
+[[4387]],
+[[4388]],
+[[4389]],
+[[4390]],
+[[4391]],
+[[4392]],
+[[4393]],
+[[4394]],
+[[4395]],
+[[4396]],
+[[4397]],
+[[4398]],
+[[4399]],
+[[4400]],
+[[4401]],
+[[4402]],
+[[4403]],
+[[4404]],
+[[4405]],
+[[4406]],
+[[4407]],
+[[4408]],
+[[4409]],
+[[4410]],
+[[4411]],
+[[4412]],
+[[4413]],
+[[4414]],
+[[4415]],
+[[4416]],
+[[4417]],
+[[4418]],
+[[4419]],
+[[4420]],
+[[4421]],
+[[4422]],
+[[4423]],
+[[4424]],
+[[4425]],
+[[4426]],
+[[4427]],
+[[4428]],
+[[4429]],
+[[4430]],
+[[4431]],
+[[4432]],
+[[4433]],
+[[4434]],
+[[4435]],
+[[4436]],
+[[4437]],
+[[4438]],
+[[4439]],
+[[4440]],
+[[4441]],
+[[4442]],
+[[4443]],
+[[4444]],
+[[4445]],
+[[4446]],
+[[4447]],
+[[4448]],
+[[4449]],
+[[4450]],
+[[4451]],
+[[4452]],
+[[4453]],
+[[4454]],
+[[4455]],
+[[4456]],
+[[4457]],
+[[4458]],
+[[4459]],
+[[4460]],
+[[4461]],
+[[4462]],
+[[4463]],
+[[4464]],
+[[4465]],
+[[4466]],
+[[4467]],
+[[4468]],
+[[4469]],
+[[4470]],
+[[4471]],
+[[4472]],
+[[4473]],
+[[4474]],
+[[4475]],
+[[4476]],
+[[4477]],
+[[4478]],
+[[4479]],
+[[4480]],
+[[4481]],
+[[4482]],
+[[4483]],
+[[4484]],
+[[4485]],
+[[4486]],
+[[4487]],
+[[4488]],
+[[4489]],
+[[4490]],
+[[4491]],
+[[4492]],
+[[4493]],
+[[4494]],
+[[4495]],
+[[4496]],
+[[4497]],
+[[4498]],
+[[4499]],
+[[4500]],
+[[4501]],
+[[4502]],
+[[4503]],
+[[4504]],
+[[4505]],
+[[4506]],
+[[4507]],
+[[4508]],
+[[4509]],
+[[4510]],
+[[4511]],
+[[4512]],
+[[4513]],
+[[4514]],
+[[4515]],
+[[4516]],
+[[4517]],
+[[4518]],
+[[4519]],
+[[4520]],
+[[4521]],
+[[4522]],
+[[4523]],
+[[4524]],
+[[4525]],
+[[4526]],
+[[4527]],
+[[4528]],
+[[4529]],
+[[4530]],
+[[4531]],
+[[4532]],
+[[4533]],
+[[4534]],
+[[4535]],
+[[4536]],
+[[4537]],
+[[4538]],
+[[4539]],
+[[4540]],
+[[4541]],
+[[4542]],
+[[4543]],
+[[4544]],
+[[4545]],
+[[4546]],
+[[4547]],
+[[4548]],
+[[4549]],
+[[4550]],
+[[4551]],
+[[4552]],
+[[4553]],
+[[4554]],
+[[4555]],
+[[4556]],
+[[4557]],
+[[4558]],
+[[4559]],
+[[4560]],
+[[4561]],
+[[4562]],
+[[4563]],
+[[4564]],
+[[4565]],
+[[4566]],
+[[4567]],
+[[4568]],
+[[4569]],
+[[4570]],
+[[4571]],
+[[4572]],
+[[4573]],
+[[4574]],
+[[4575]],
+[[4576]],
+[[4577]],
+[[4578]],
+[[4579]],
+[[4580]],
+[[4581]],
+[[4582]],
+[[4583]],
+[[4584]],
+[[4585]],
+[[4586]],
+[[4587]],
+[[4588]],
+[[4589]],
+[[4590]],
+[[4591]],
+[[4592]],
+[[4593]],
+[[4594]],
+[[4595]],
+[[4596]],
+[[4597]],
+[[4598]],
+[[4599]],
+[[4600]],
+[[4601]],
+[[4602]],
+[[4603]],
+[[4604]],
+[[4605]],
+[[4606]],
+[[4607]],
+[[4608]],
+[[4609]],
+[[4610]],
+[[4611]],
+[[4612]],
+[[4613]],
+[[4614]],
+[[4615]],
+[[4616]],
+[[4617]],
+[[4618]],
+[[4619]],
+[[4620]],
+[[4621]],
+[[4622]],
+[[4623]],
+[[4624]],
+[[4625]],
+[[4626]],
+[[4627]],
+[[4628]],
+[[4629]],
+[[4630]],
+[[4631]],
+[[4632]],
+[[4633]],
+[[4634]],
+[[4635]],
+[[4636]],
+[[4637]],
+[[4638]],
+[[4639]],
+[[4640]],
+[[4641]],
+[[4642]],
+[[4643]],
+[[4644]],
+[[4645]],
+[[4646]],
+[[4647]],
+[[4648]],
+[[4649]],
+[[4650]],
+[[4651]],
+[[4652]],
+[[4653]],
+[[4654]],
+[[4655]],
+[[4656]],
+[[4657]],
+[[4658]],
+[[4659]],
+[[4660]],
+[[4661]],
+[[4662]],
+[[4663]],
+[[4664]],
+[[4665]],
+[[4666]],
+[[4667]],
+[[4668]],
+[[4669]],
+[[4670]],
+[[4671]],
+[[4672]],
+[[4673]],
+[[4674]],
+[[4675]],
+[[4676]],
+[[4677]],
+[[4678]],
+[[4679]],
+[[4680]],
+[[4681]],
+[[4682]],
+[[4683]],
+[[4684]],
+[[4685]],
+[[4686]],
+[[4687]],
+[[4688]],
+[[4689]],
+[[4690]],
+[[4691]],
+[[4692]],
+[[4693]],
+[[4694]],
+[[4695]],
+[[4696]],
+[[4697]],
+[[4698]],
+[[4699]],
+[[4700]],
+[[4701]],
+[[4702]],
+[[4703]],
+[[4704]],
+[[4705]],
+[[4706]],
+[[4707]],
+[[4708]],
+[[4709]],
+[[4710]],
+[[4711]],
+[[4712]],
+[[4713]],
+[[4714]],
+[[4715]],
+[[4716]],
+[[4717]],
+[[4718]],
+[[4719]],
+[[4720]],
+[[4721]],
+[[4722]],
+[[4723]],
+[[4724]],
+[[4725]],
+[[4726]],
+[[4727]],
+[[4728]],
+[[4729]],
+[[4730]],
+[[4731]],
+[[4732]],
+[[4733]],
+[[4734]],
+[[4735]],
+[[4736]],
+[[4737]],
+[[4738]],
+[[4739]],
+[[4740]],
+[[4741]],
+[[4742]],
+[[4743]],
+[[4744]],
+[[4745]],
+[[4746]],
+[[4747]],
+[[4748]],
+[[4749]],
+[[4750]],
+[[4751]],
+[[4752]],
+[[4753]],
+[[4754]],
+[[4755]],
+[[4756]],
+[[4757]],
+[[4758]],
+[[4759]],
+[[4760]],
+[[4761]],
+[[4762]],
+[[4763]],
+[[4764]],
+[[4765]],
+[[4766]],
+[[4767]],
+[[4768]],
+[[4769]],
+[[4770]],
+[[4771]],
+[[4772]],
+[[4773]],
+[[4774]],
+[[4775]],
+[[4776]],
+[[4777]],
+[[4778]],
+[[4779]],
+[[4780]],
+[[4781]],
+[[4782]],
+[[4783]],
+[[4784]],
+[[4785]],
+[[4786]],
+[[4787]],
+[[4788]],
+[[4789]],
+[[4790]],
+[[4791]],
+[[4792]],
+[[4793]],
+[[4794]],
+[[4795]],
+[[4796]],
+[[4797]],
+[[4798]],
+[[4799]],
+[[4800]],
+[[4801]],
+[[4802]],
+[[4803]],
+[[4804]],
+[[4805]],
+[[4806]],
+[[4807]],
+[[4808]],
+[[4809]],
+[[4810]],
+[[4811]],
+[[4812]],
+[[4813]],
+[[4814]],
+[[4815]],
+[[4816]],
+[[4817]],
+[[4818]],
+[[4819]],
+[[4820]],
+[[4821]],
+[[4822]],
+[[4823]],
+[[4824]],
+[[4825]],
+[[4826]],
+[[4827]],
+[[4828]],
+[[4829]],
+[[4830]],
+[[4831]],
+[[4832]],
+[[4833]],
+[[4834]],
+[[4835]],
+[[4836]],
+[[4837]],
+[[4838]],
+[[4839]],
+[[4840]],
+[[4841]],
+[[4842]],
+[[4843]],
+[[4844]],
+[[4845]],
+[[4846]],
+[[4847]],
+[[4848]],
+[[4849]],
+[[4850]],
+[[4851]],
+[[4852]],
+[[4853]],
+[[4854]],
+[[4855]],
+[[4856]],
+[[4857]],
+[[4858]],
+[[4859]],
+[[4860]],
+[[4861]],
+[[4862]],
+[[4863]],
+[[4864]],
+[[4865]],
+[[4866]],
+[[4867]],
+[[4868]],
+[[4869]],
+[[4870]],
+[[4871]],
+[[4872]],
+[[4873]],
+[[4874]],
+[[4875]],
+[[4876]],
+[[4877]],
+[[4878]],
+[[4879]],
+[[4880]],
+[[4881]],
+[[4882]],
+[[4883]],
+[[4884]],
+[[4885]],
+[[4886]],
+[[4887]],
+[[4888]],
+[[4889]],
+[[4890]],
+[[4891]],
+[[4892]],
+[[4893]],
+[[4894]],
+[[4895]],
+[[4896]],
+[[4897]],
+[[4898]],
+[[4899]],
+[[4900]],
+[[4901]],
+[[4902]],
+[[4903]],
+[[4904]],
+[[4905]],
+[[4906]],
+[[4907]],
+[[4908]],
+[[4909]],
+[[4910]],
+[[4911]],
+[[4912]],
+[[4913]],
+[[4914]],
+[[4915]],
+[[4916]],
+[[4917]],
+[[4918]],
+[[4919]],
+[[4920]],
+[[4921]],
+[[4922]],
+[[4923]],
+[[4924]],
+[[4925]],
+[[4926]],
+[[4927]],
+[[4928]],
+[[4929]],
+[[4930]],
+[[4931]],
+[[4932]],
+[[4933]],
+[[4934]],
+[[4935]],
+[[4936]],
+[[4937]],
+[[4938]],
+[[4939]],
+[[4940]],
+[[4941]],
+[[4942]],
+[[4943]],
+[[4944]],
+[[4945]],
+[[4946]],
+[[4947]],
+[[4948]],
+[[4949]],
+[[4950]],
+[[4951]],
+[[4952]],
+[[4953]],
+[[4954]],
+[[4955]],
+[[4956]],
+[[4957]],
+[[4958]],
+[[4959]],
+[[4960]],
+[[4961]],
+[[4962]],
+[[4963]],
+[[4964]],
+[[4965]],
+[[4966]],
+[[4967]],
+[[4968]],
+[[4969]],
+[[4970]],
+[[4971]],
+[[4972]],
+[[4973]],
+[[4974]],
+[[4975]],
+[[4976]],
+[[4977]],
+[[4978]],
+[[4979]],
+[[4980]],
+[[4981]],
+[[4982]],
+[[4983]],
+[[4984]],
+[[4985]],
+[[4986]],
+[[4987]],
+[[4988]],
+[[4989]],
+[[4990]],
+[[4991]],
+[[4992]],
+[[4993]],
+[[4994]],
+[[4995]],
+[[4996]],
+[[4997]],
+[[4998]],
+[[4999]],
+[[5000]],
+[[5001]],
+[[5002]],
+[[5003]],
+[[5004]],
+[[5005]],
+[[5006]],
+[[5007]],
+[[5008]],
+[[5009]],
+[[5010]],
+[[5011]],
+[[5012]],
+[[5013]],
+[[5014]],
+[[5015]],
+[[5016]],
+[[5017]],
+[[5018]],
+[[5019]],
+[[5020]],
+[[5021]],
+[[5022]],
+[[5023]],
+[[5024]],
+[[5025]],
+[[5026]],
+[[5027]],
+[[5028]],
+[[5029]],
+[[5030]],
+[[5031]],
+[[5032]],
+[[5033]],
+[[5034]],
+[[5035]],
+[[5036]],
+[[5037]],
+[[5038]],
+[[5039]],
+[[5040]],
+[[5041]],
+[[5042]],
+[[5043]],
+[[5044]],
+[[5045]],
+[[5046]],
+[[5047]],
+[[5048]],
+[[5049]],
+[[5050]],
+[[5051]],
+[[5052]],
+[[5053]],
+[[5054]],
+[[5055]],
+[[5056]],
+[[5057]],
+[[5058]],
+[[5059]],
+[[5060]],
+[[5061]],
+[[5062]],
+[[5063]],
+[[5064]],
+[[5065]],
+[[5066]],
+[[5067]],
+[[5068]],
+[[5069]],
+[[5070]],
+[[5071]],
+[[5072]],
+[[5073]],
+[[5074]],
+[[5075]],
+[[5076]],
+[[5077]],
+[[5078]],
+[[5079]],
+[[5080]],
+[[5081]],
+[[5082]],
+[[5083]],
+[[5084]],
+[[5085]],
+[[5086]],
+[[5087]],
+[[5088]],
+[[5089]],
+[[5090]],
+[[5091]],
+[[5092]],
+[[5093]],
+[[5094]],
+[[5095]],
+[[5096]],
+[[5097]],
+[[5098]],
+[[5099]],
+[[5100]],
+[[5101]],
+[[5102]],
+[[5103]],
+[[5104]],
+[[5105]],
+[[5106]],
+[[5107]],
+[[5108]],
+[[5109]],
+[[5110]],
+[[5111]],
+[[5112]],
+[[5113]],
+[[5114]],
+[[5115]],
+[[5116]],
+[[5117]],
+[[5118]],
+[[5119]],
+[[5120]],
+[[5121]],
+[[5122]],
+[[5123]],
+[[5124]],
+[[5125]],
+[[5126]],
+[[5127]],
+[[5128]],
+[[5129]],
+[[5130]],
+[[5131]],
+[[5132]],
+[[5133]],
+[[5134]],
+[[5135]],
+[[5136]],
+[[5137]],
+[[5138]],
+[[5139]],
+[[5140]],
+[[5141]],
+[[5142]],
+[[5143]],
+[[5144]],
+[[5145]],
+[[5146]],
+[[5147]],
+[[5148]],
+[[5149]],
+[[5150]],
+[[5151]],
+[[5152]],
+[[5153]],
+[[5154]],
+[[5155]],
+[[5156]],
+[[5157]],
+[[5158]],
+[[5159]],
+[[5160]],
+[[5161]],
+[[5162]],
+[[5163]],
+[[5164]],
+[[5165]],
+[[5166]],
+[[5167]],
+[[5168]],
+[[5169]],
+[[5170]],
+[[5171]],
+[[5172]],
+[[5173]],
+[[5174]],
+[[5175]],
+[[5176]],
+[[5177]],
+[[5178]],
+[[5179]],
+[[5180]],
+[[5181]],
+[[5182]],
+[[5183]],
+[[5184]],
+[[5185]],
+[[5186]],
+[[5187]],
+[[5188]],
+[[5189]],
+[[5190]],
+[[5191]],
+[[5192]],
+[[5193]],
+[[5194]],
+[[5195]],
+[[5196]],
+[[5197]],
+[[5198]],
+[[5199]],
+[[5200]],
+[[5201]],
+[[5202]],
+[[5203]],
+[[5204]],
+[[5205]],
+[[5206]],
+[[5207]],
+[[5208]],
+[[5209]],
+[[5210]],
+[[5211]],
+[[5212]],
+[[5213]],
+[[5214]],
+[[5215]],
+[[5216]],
+[[5217]],
+[[5218]],
+[[5219]],
+[[5220]],
+[[5221]],
+[[5222]],
+[[5223]],
+[[5224]],
+[[5225]],
+[[5226]],
+[[5227]],
+[[5228]],
+[[5229]],
+[[5230]],
+[[5231]],
+[[5232]],
+[[5233]],
+[[5234]],
+[[5235]],
+[[5236]],
+[[5237]],
+[[5238]],
+[[5239]],
+[[5240]],
+[[5241]],
+[[5242]],
+[[5243]],
+[[5244]],
+[[5245]],
+[[5246]],
+[[5247]],
+[[5248]],
+[[5249]],
+[[5250]],
+[[5251]],
+[[5252]],
+[[5253]],
+[[5254]],
+[[5255]],
+[[5256]],
+[[5257]],
+[[5258]],
+[[5259]],
+[[5260]],
+[[5261]],
+[[5262]],
+[[5263]],
+[[5264]],
+[[5265]],
+[[5266]],
+[[5267]],
+[[5268]],
+[[5269]],
+[[5270]],
+[[5271]],
+[[5272]],
+[[5273]],
+[[5274]],
+[[5275]],
+[[5276]],
+[[5277]],
+[[5278]],
+[[5279]],
+[[5280]],
+[[5281]],
+[[5282]],
+[[5283]],
+[[5284]],
+[[5285]],
+[[5286]],
+[[5287]],
+[[5288]],
+[[5289]],
+[[5290]],
+[[5291]],
+[[5292]],
+[[5293]],
+[[5294]],
+[[5295]],
+[[5296]],
+[[5297]],
+[[5298]],
+[[5299]],
+[[5300]],
+[[5301]],
+[[5302]],
+[[5303]],
+[[5304]],
+[[5305]],
+[[5306]],
+[[5307]],
+[[5308]],
+[[5309]],
+[[5310]],
+[[5311]],
+[[5312]],
+[[5313]],
+[[5314]],
+[[5315]],
+[[5316]],
+[[5317]],
+[[5318]],
+[[5319]],
+[[5320]],
+[[5321]],
+[[5322]],
+[[5323]],
+[[5324]],
+[[5325]],
+[[5326]],
+[[5327]],
+[[5328]],
+[[5329]],
+[[5330]],
+[[5331]],
+[[5332]],
+[[5333]],
+[[5334]],
+[[5335]],
+[[5336]],
+[[5337]],
+[[5338]],
+[[5339]],
+[[5340]],
+[[5341]],
+[[5342]],
+[[5343]],
+[[5344]],
+[[5345]],
+[[5346]],
+[[5347]],
+[[5348]],
+[[5349]],
+[[5350]],
+[[5351]],
+[[5352]],
+[[5353]],
+[[5354]],
+[[5355]],
+[[5356]],
+[[5357]],
+[[5358]],
+[[5359]],
+[[5360]],
+[[5361]],
+[[5362]],
+[[5363]],
+[[5364]],
+[[5365]],
+[[5366]],
+[[5367]],
+[[5368]],
+[[5369]],
+[[5370]],
+[[5371]],
+[[5372]],
+[[5373]],
+[[5374]],
+[[5375]],
+[[5376]],
+[[5377]],
+[[5378]],
+[[5379]],
+[[5380]],
+[[5381]],
+[[5382]],
+[[5383]],
+[[5384]],
+[[5385]],
+[[5386]],
+[[5387]],
+[[5388]],
+[[5389]],
+[[5390]],
+[[5391]],
+[[5392]],
+[[5393]],
+[[5394]],
+[[5395]],
+[[5396]],
+[[5397]],
+[[5398]],
+[[5399]],
+[[5400]],
+[[5401]],
+[[5402]],
+[[5403]],
+[[5404]],
+[[5405]],
+[[5406]],
+[[5407]],
+[[5408]],
+[[5409]],
+[[5410]],
+[[5411]],
+[[5412]],
+[[5413]],
+[[5414]],
+[[5415]],
+[[5416]],
+[[5417]],
+[[5418]],
+[[5419]],
+[[5420]],
+[[5421]],
+[[5422]],
+[[5423]],
+[[5424]],
+[[5425]],
+[[5426]],
+[[5427]],
+[[5428]],
+[[5429]],
+[[5430]],
+[[5431]],
+[[5432]],
+[[5433]],
+[[5434]],
+[[5435]],
+[[5436]],
+[[5437]],
+[[5438]],
+[[5439]],
+[[5440]],
+[[5441]],
+[[5442]],
+[[5443]],
+[[5444]],
+[[5445]],
+[[5446]],
+[[5447]],
+[[5448]],
+[[5449]],
+[[5450]],
+[[5451]],
+[[5452]],
+[[5453]],
+[[5454]],
+[[5455]],
+[[5456]],
+[[5457]],
+[[5458]],
+[[5459]],
+[[5460]],
+[[5461]],
+[[5462]],
+[[5463]],
+[[5464]],
+[[5465]],
+[[5466]],
+[[5467]],
+[[5468]],
+[[5469]],
+[[5470]],
+[[5471]],
+[[5472]],
+[[5473]],
+[[5474]],
+[[5475]],
+[[5476]],
+[[5477]],
+[[5478]],
+[[5479]],
+[[5480]],
+[[5481]],
+[[5482]],
+[[5483]],
+[[5484]],
+[[5485]],
+[[5486]],
+[[5487]],
+[[5488]],
+[[5489]],
+[[5490]],
+[[5491]],
+[[5492]],
+[[5493]],
+[[5494]],
+[[5495]],
+[[5496]],
+[[5497]],
+[[5498]],
+[[5499]],
+[[5500]],
+[[5501]],
+[[5502]],
+[[5503]],
+[[5504]],
+[[5505]],
+[[5506]],
+[[5507]],
+[[5508]],
+[[5509]],
+[[5510]],
+[[5511]],
+[[5512]],
+[[5513]],
+[[5514]],
+[[5515]],
+[[5516]],
+[[5517]],
+[[5518]],
+[[5519]],
+[[5520]],
+[[5521]],
+[[5522]],
+[[5523]],
+[[5524]],
+[[5525]],
+[[5526]],
+[[5527]],
+[[5528]],
+[[5529]],
+[[5530]],
+[[5531]],
+[[5532]],
+[[5533]],
+[[5534]],
+[[5535]],
+[[5536]],
+[[5537]],
+[[5538]],
+[[5539]],
+[[5540]],
+[[5541]],
+[[5542]],
+[[5543]],
+[[5544]],
+[[5545]],
+[[5546]],
+[[5547]],
+[[5548]],
+[[5549]],
+[[5550]],
+[[5551]],
+[[5552]],
+[[5553]],
+[[5554]],
+[[5555]],
+[[5556]],
+[[5557]],
+[[5558]],
+[[5559]],
+[[5560]],
+[[5561]],
+[[5562]],
+[[5563]],
+[[5564]],
+[[5565]],
+[[5566]],
+[[5567]],
+[[5568]],
+[[5569]],
+[[5570]],
+[[5571]],
+[[5572]],
+[[5573]],
+[[5574]],
+[[5575]],
+[[5576]],
+[[5577]],
+[[5578]],
+[[5579]],
+[[5580]],
+[[5581]],
+[[5582]],
+[[5583]],
+[[5584]],
+[[5585]],
+[[5586]],
+[[5587]],
+[[5588]],
+[[5589]],
+[[5590]],
+[[5591]],
+[[5592]],
+[[5593]],
+[[5594]],
+[[5595]],
+[[5596]],
+[[5597]],
+[[5598]],
+[[5599]],
+[[5600]],
+[[5601]],
+[[5602]],
+[[5603]],
+[[5604]],
+[[5605]],
+[[5606]],
+[[5607]],
+[[5608]],
+[[5609]],
+[[5610]],
+[[5611]],
+[[5612]],
+[[5613]],
+[[5614]],
+[[5615]],
+[[5616]],
+[[5617]],
+[[5618]],
+[[5619]],
+[[5620]],
+[[5621]],
+[[5622]],
+[[5623]],
+[[5624]],
+[[5625]],
+[[5626]],
+[[5627]],
+[[5628]],
+[[5629]],
+[[5630]],
+[[5631]],
+[[5632]],
+[[5633]],
+[[5634]],
+[[5635]],
+[[5636]],
+[[5637]],
+[[5638]],
+[[5639]],
+[[5640]],
+[[5641]],
+[[5642]],
+[[5643]],
+[[5644]],
+[[5645]],
+[[5646]],
+[[5647]],
+[[5648]],
+[[5649]],
+[[5650]],
+[[5651]],
+[[5652]],
+[[5653]],
+[[5654]],
+[[5655]],
+[[5656]],
+[[5657]],
+[[5658]],
+[[5659]],
+[[5660]],
+[[5661]],
+[[5662]],
+[[5663]],
+[[5664]],
+[[5665]],
+[[5666]],
+[[5667]],
+[[5668]],
+[[5669]],
+[[5670]],
+[[5671]],
+[[5672]],
+[[5673]],
+[[5674]],
+[[5675]],
+[[5676]],
+[[5677]],
+[[5678]],
+[[5679]],
+[[5680]],
+[[5681]],
+[[5682]],
+[[5683]],
+[[5684]],
+[[5685]],
+[[5686]],
+[[5687]],
+[[5688]],
+[[5689]],
+[[5690]],
+[[5691]],
+[[5692]],
+[[5693]],
+[[5694]],
+[[5695]],
+[[5696]],
+[[5697]],
+[[5698]],
+[[5699]],
+[[5700]],
+[[5701]],
+[[5702]],
+[[5703]],
+[[5704]],
+[[5705]],
+[[5706]],
+[[5707]],
+[[5708]],
+[[5709]],
+[[5710]],
+[[5711]],
+[[5712]],
+[[5713]],
+[[5714]],
+[[5715]],
+[[5716]],
+[[5717]],
+[[5718]],
+[[5719]],
+[[5720]],
+[[5721]],
+[[5722]],
+[[5723]],
+[[5724]],
+[[5725]],
+[[5726]],
+[[5727]],
+[[5728]],
+[[5729]],
+[[5730]],
+[[5731]],
+[[5732]],
+[[5733]],
+[[5734]],
+[[5735]],
+[[5736]],
+[[5737]],
+[[5738]],
+[[5739]],
+[[5740]],
+[[5741]],
+[[5742]],
+[[5743]],
+[[5744]],
+[[5745]],
+[[5746]],
+[[5747]],
+[[5748]],
+[[5749]],
+[[5750]],
+[[5751]],
+[[5752]],
+[[5753]],
+[[5754]],
+[[5755]],
+[[5756]],
+[[5757]],
+[[5758]],
+[[5759]],
+[[5760]],
+[[5761]],
+[[5762]],
+[[5763]],
+[[5764]],
+[[5765]],
+[[5766]],
+[[5767]],
+[[5768]],
+[[5769]],
+[[5770]],
+[[5771]],
+[[5772]],
+[[5773]],
+[[5774]],
+[[5775]],
+[[5776]],
+[[5777]],
+[[5778]],
+[[5779]],
+[[5780]],
+[[5781]],
+[[5782]],
+[[5783]],
+[[5784]],
+[[5785]],
+[[5786]],
+[[5787]],
+[[5788]],
+[[5789]],
+[[5790]],
+[[5791]],
+[[5792]],
+[[5793]],
+[[5794]],
+[[5795]],
+[[5796]],
+[[5797]],
+[[5798]],
+[[5799]],
+[[5800]],
+[[5801]],
+[[5802]],
+[[5803]],
+[[5804]],
+[[5805]],
+[[5806]],
+[[5807]],
+[[5808]],
+[[5809]],
+[[5810]],
+[[5811]],
+[[5812]],
+[[5813]],
+[[5814]],
+[[5815]],
+[[5816]],
+[[5817]],
+[[5818]],
+[[5819]],
+[[5820]],
+[[5821]],
+[[5822]],
+[[5823]],
+[[5824]],
+[[5825]],
+[[5826]],
+[[5827]],
+[[5828]],
+[[5829]],
+[[5830]],
+[[5831]],
+[[5832]],
+[[5833]],
+[[5834]],
+[[5835]],
+[[5836]],
+[[5837]],
+[[5838]],
+[[5839]],
+[[5840]],
+[[5841]],
+[[5842]],
+[[5843]],
+[[5844]],
+[[5845]],
+[[5846]],
+[[5847]],
+[[5848]],
+[[5849]],
+[[5850]],
+[[5851]],
+[[5852]],
+[[5853]],
+[[5854]],
+[[5855]],
+[[5856]],
+[[5857]],
+[[5858]],
+[[5859]],
+[[5860]],
+[[5861]],
+[[5862]],
+[[5863]],
+[[5864]],
+[[5865]],
+[[5866]],
+[[5867]],
+[[5868]],
+[[5869]],
+[[5870]],
+[[5871]],
+[[5872]],
+[[5873]],
+[[5874]],
+[[5875]],
+[[5876]],
+[[5877]],
+[[5878]],
+[[5879]],
+[[5880]],
+[[5881]],
+[[5882]],
+[[5883]],
+[[5884]],
+[[5885]],
+[[5886]],
+[[5887]],
+[[5888]],
+[[5889]],
+[[5890]],
+[[5891]],
+[[5892]],
+[[5893]],
+[[5894]],
+[[5895]],
+[[5896]],
+[[5897]],
+[[5898]],
+[[5899]],
+[[5900]],
+[[5901]],
+[[5902]],
+[[5903]],
+[[5904]],
+[[5905]],
+[[5906]],
+[[5907]],
+[[5908]],
+[[5909]],
+[[5910]],
+[[5911]],
+[[5912]],
+[[5913]],
+[[5914]],
+[[5915]],
+[[5916]],
+[[5917]],
+[[5918]],
+[[5919]],
+[[5920]],
+[[5921]],
+[[5922]],
+[[5923]],
+[[5924]],
+[[5925]],
+[[5926]],
+[[5927]],
+[[5928]],
+[[5929]],
+[[5930]],
+[[5931]],
+[[5932]],
+[[5933]],
+[[5934]],
+[[5935]],
+[[5936]],
+[[5937]],
+[[5938]],
+[[5939]],
+[[5940]],
+[[5941]],
+[[5942]],
+[[5943]],
+[[5944]],
+[[5945]],
+[[5946]],
+[[5947]],
+[[5948]],
+[[5949]],
+[[5950]],
+[[5951]],
+[[5952]],
+[[5953]],
+[[5954]],
+[[5955]],
+[[5956]],
+[[5957]],
+[[5958]],
+[[5959]],
+[[5960]],
+[[5961]],
+[[5962]],
+[[5963]],
+[[5964]],
+[[5965]],
+[[5966]],
+[[5967]],
+[[5968]],
+[[5969]],
+[[5970]],
+[[5971]],
+[[5972]],
+[[5973]],
+[[5974]],
+[[5975]],
+[[5976]],
+[[5977]],
+[[5978]],
+[[5979]],
+[[5980]],
+[[5981]],
+[[5982]],
+[[5983]],
+[[5984]],
+[[5985]],
+[[5986]],
+[[5987]],
+[[5988]],
+[[5989]],
+[[5990]],
+[[5991]],
+[[5992]],
+[[5993]],
+[[5994]],
+[[5995]],
+[[5996]],
+[[5997]],
+[[5998]],
+[[5999]],
+[[6000]],
+[[6001]],
+[[6002]],
+[[6003]],
+[[6004]],
+[[6005]],
+[[6006]],
+[[6007]],
+[[6008]],
+[[6009]],
+[[6010]],
+[[6011]],
+[[6012]],
+[[6013]],
+[[6014]],
+[[6015]],
+[[6016]],
+[[6017]],
+[[6018]],
+[[6019]],
+[[6020]],
+[[6021]],
+[[6022]],
+[[6023]],
+[[6024]],
+[[6025]],
+[[6026]],
+[[6027]],
+[[6028]],
+[[6029]],
+[[6030]],
+[[6031]],
+[[6032]],
+[[6033]],
+[[6034]],
+[[6035]],
+[[6036]],
+[[6037]],
+[[6038]],
+[[6039]],
+[[6040]],
+[[6041]],
+[[6042]],
+[[6043]],
+[[6044]],
+[[6045]],
+[[6046]],
+[[6047]],
+[[6048]],
+[[6049]],
+[[6050]],
+[[6051]],
+[[6052]],
+[[6053]],
+[[6054]],
+[[6055]],
+[[6056]],
+[[6057]],
+[[6058]],
+[[6059]],
+[[6060]],
+[[6061]],
+[[6062]],
+[[6063]],
+[[6064]],
+[[6065]],
+[[6066]],
+[[6067]],
+[[6068]],
+[[6069]],
+[[6070]],
+[[6071]],
+[[6072]],
+[[6073]],
+[[6074]],
+[[6075]],
+[[6076]],
+[[6077]],
+[[6078]],
+[[6079]],
+[[6080]],
+[[6081]],
+[[6082]],
+[[6083]],
+[[6084]],
+[[6085]],
+[[6086]],
+[[6087]],
+[[6088]],
+[[6089]],
+[[6090]],
+[[6091]],
+[[6092]],
+[[6093]],
+[[6094]],
+[[6095]],
+[[6096]],
+[[6097]],
+[[6098]],
+[[6099]],
+[[6100]],
+[[6101]],
+[[6102]],
+[[6103]],
+[[6104]],
+[[6105]],
+[[6106]],
+[[6107]],
+[[6108]],
+[[6109]],
+[[6110]],
+[[6111]],
+[[6112]],
+[[6113]],
+[[6114]],
+[[6115]],
+[[6116]],
+[[6117]],
+[[6118]],
+[[6119]],
+[[6120]],
+[[6121]],
+[[6122]],
+[[6123]],
+[[6124]],
+[[6125]],
+[[6126]],
+[[6127]],
+[[6128]],
+[[6129]],
+[[6130]],
+[[6131]],
+[[6132]],
+[[6133]],
+[[6134]],
+[[6135]],
+[[6136]],
+[[6137]],
+[[6138]],
+[[6139]],
+[[6140]],
+[[6141]],
+[[6142]],
+[[6143]],
+[[6144]],
+[[6145]],
+[[6146]],
+[[6147]],
+[[6148]],
+[[6149]],
+[[6150]],
+[[6151]],
+[[6152]],
+[[6153]],
+[[6154]],
+[[6155]],
+[[6156]],
+[[6157]],
+[[6158]],
+[[6159]],
+[[6160]],
+[[6161]],
+[[6162]],
+[[6163]],
+[[6164]],
+[[6165]],
+[[6166]],
+[[6167]],
+[[6168]],
+[[6169]],
+[[6170]],
+[[6171]],
+[[6172]],
+[[6173]],
+[[6174]],
+[[6175]],
+[[6176]],
+[[6177]],
+[[6178]],
+[[6179]],
+[[6180]],
+[[6181]],
+[[6182]],
+[[6183]],
+[[6184]],
+[[6185]],
+[[6186]],
+[[6187]],
+[[6188]],
+[[6189]],
+[[6190]],
+[[6191]],
+[[6192]],
+[[6193]],
+[[6194]],
+[[6195]],
+[[6196]],
+[[6197]],
+[[6198]],
+[[6199]],
+[[6200]],
+[[6201]],
+[[6202]],
+[[6203]],
+[[6204]],
+[[6205]],
+[[6206]],
+[[6207]],
+[[6208]],
+[[6209]],
+[[6210]],
+[[6211]],
+[[6212]],
+[[6213]],
+[[6214]],
+[[6215]],
+[[6216]],
+[[6217]],
+[[6218]],
+[[6219]],
+[[6220]],
+[[6221]],
+[[6222]],
+[[6223]],
+[[6224]],
+[[6225]],
+[[6226]],
+[[6227]],
+[[6228]],
+[[6229]],
+[[6230]],
+[[6231]],
+[[6232]],
+[[6233]],
+[[6234]],
+[[6235]],
+[[6236]],
+[[6237]],
+[[6238]],
+[[6239]],
+[[6240]],
+[[6241]],
+[[6242]],
+[[6243]],
+[[6244]],
+[[6245]],
+[[6246]],
+[[6247]],
+[[6248]],
+[[6249]],
+[[6250]],
+[[6251]],
+[[6252]],
+[[6253]],
+[[6254]],
+[[6255]],
+[[6256]],
+[[6257]],
+[[6258]],
+[[6259]],
+[[6260]],
+[[6261]],
+[[6262]],
+[[6263]],
+[[6264]],
+[[6265]],
+[[6266]],
+[[6267]],
+[[6268]],
+[[6269]],
+[[6270]],
+[[6271]],
+[[6272]],
+[[6273]],
+[[6274]],
+[[6275]],
+[[6276]],
+[[6277]],
+[[6278]],
+[[6279]],
+[[6280]],
+[[6281]],
+[[6282]],
+[[6283]],
+[[6284]],
+[[6285]],
+[[6286]],
+[[6287]],
+[[6288]],
+[[6289]],
+[[6290]],
+[[6291]],
+[[6292]],
+[[6293]],
+[[6294]],
+[[6295]],
+[[6296]],
+[[6297]],
+[[6298]],
+[[6299]],
+[[6300]],
+[[6301]],
+[[6302]],
+[[6303]],
+[[6304]],
+[[6305]],
+[[6306]],
+[[6307]],
+[[6308]],
+[[6309]],
+[[6310]],
+[[6311]],
+[[6312]],
+[[6313]],
+[[6314]],
+[[6315]],
+[[6316]],
+[[6317]],
+[[6318]],
+[[6319]],
+[[6320]],
+[[6321]],
+[[6322]],
+[[6323]],
+[[6324]],
+[[6325]],
+[[6326]],
+[[6327]],
+[[6328]],
+[[6329]],
+[[6330]],
+[[6331]],
+[[6332]],
+[[6333]],
+[[6334]],
+[[6335]],
+[[6336]],
+[[6337]],
+[[6338]],
+[[6339]],
+[[6340]],
+[[6341]],
+[[6342]],
+[[6343]],
+[[6344]],
+[[6345]],
+[[6346]],
+[[6347]],
+[[6348]],
+[[6349]],
+[[6350]],
+[[6351]],
+[[6352]],
+[[6353]],
+[[6354]],
+[[6355]],
+[[6356]],
+[[6357]],
+[[6358]],
+[[6359]],
+[[6360]],
+[[6361]],
+[[6362]],
+[[6363]],
+[[6364]],
+[[6365]],
+[[6366]],
+[[6367]],
+[[6368]],
+[[6369]],
+[[6370]],
+[[6371]],
+[[6372]],
+[[6373]],
+[[6374]],
+[[6375]],
+[[6376]],
+[[6377]],
+[[6378]],
+[[6379]],
+[[6380]],
+[[6381]],
+[[6382]],
+[[6383]],
+[[6384]],
+[[6385]],
+[[6386]],
+[[6387]],
+[[6388]],
+[[6389]],
+[[6390]],
+[[6391]],
+[[6392]],
+[[6393]],
+[[6394]],
+[[6395]],
+[[6396]],
+[[6397]],
+[[6398]],
+[[6399]],
+[[6400]],
+[[6401]],
+[[6402]],
+[[6403]],
+[[6404]],
+[[6405]],
+[[6406]],
+[[6407]],
+[[6408]],
+[[6409]],
+[[6410]],
+[[6411]],
+[[6412]],
+[[6413]],
+[[6414]],
+[[6415]],
+[[6416]],
+[[6417]],
+[[6418]],
+[[6419]],
+[[6420]],
+[[6421]],
+[[6422]],
+[[6423]],
+[[6424]],
+[[6425]],
+[[6426]],
+[[6427]],
+[[6428]],
+[[6429]],
+[[6430]],
+[[6431]],
+[[6432]],
+[[6433]],
+[[6434]],
+[[6435]],
+[[6436]],
+[[6437]],
+[[6438]],
+[[6439]],
+[[6440]],
+[[6441]],
+[[6442]],
+[[6443]],
+[[6444]],
+[[6445]],
+[[6446]],
+[[6447]],
+[[6448]],
+[[6449]],
+[[6450]],
+[[6451]],
+[[6452]],
+[[6453]],
+[[6454]],
+[[6455]],
+[[6456]],
+[[6457]],
+[[6458]],
+[[6459]],
+[[6460]],
+[[6461]],
+[[6462]],
+[[6463]],
+[[6464]],
+[[6465]],
+[[6466]],
+[[6467]],
+[[6468]],
+[[6469]],
+[[6470]],
+[[6471]],
+[[6472]],
+[[6473]],
+[[6474]],
+[[6475]],
+[[6476]],
+[[6477]],
+[[6478]],
+[[6479]],
+[[6480]],
+[[6481]],
+[[6482]],
+[[6483]],
+[[6484]],
+[[6485]],
+[[6486]],
+[[6487]],
+[[6488]],
+[[6489]],
+[[6490]],
+[[6491]],
+[[6492]],
+[[6493]],
+[[6494]],
+[[6495]],
+[[6496]],
+[[6497]],
+[[6498]],
+[[6499]],
+[[6500]],
+[[6501]],
+[[6502]],
+[[6503]],
+[[6504]],
+[[6505]],
+[[6506]],
+[[6507]],
+[[6508]],
+[[6509]],
+[[6510]],
+[[6511]],
+[[6512]],
+[[6513]],
+[[6514]],
+[[6515]],
+[[6516]],
+[[6517]],
+[[6518]],
+[[6519]],
+[[6520]],
+[[6521]],
+[[6522]],
+[[6523]],
+[[6524]],
+[[6525]],
+[[6526]],
+[[6527]],
+[[6528]],
+[[6529]],
+[[6530]],
+[[6531]],
+[[6532]],
+[[6533]],
+[[6534]],
+[[6535]],
+[[6536]],
+[[6537]],
+[[6538]],
+[[6539]],
+[[6540]],
+[[6541]],
+[[6542]],
+[[6543]],
+[[6544]],
+[[6545]],
+[[6546]],
+[[6547]],
+[[6548]],
+[[6549]],
+[[6550]],
+[[6551]],
+[[6552]],
+[[6553]],
+[[6554]],
+[[6555]],
+[[6556]],
+[[6557]],
+[[6558]],
+[[6559]],
+[[6560]],
+[[6561]],
+[[6562]],
+[[6563]],
+[[6564]],
+[[6565]],
+[[6566]],
+[[6567]],
+[[6568]],
+[[6569]],
+[[6570]],
+[[6571]],
+[[6572]],
+[[6573]],
+[[6574]],
+[[6575]],
+[[6576]],
+[[6577]],
+[[6578]],
+[[6579]],
+[[6580]],
+[[6581]],
+[[6582]],
+[[6583]],
+[[6584]],
+[[6585]],
+[[6586]],
+[[6587]],
+[[6588]],
+[[6589]],
+[[6590]],
+[[6591]],
+[[6592]],
+[[6593]],
+[[6594]],
+[[6595]],
+[[6596]],
+[[6597]],
+[[6598]],
+[[6599]],
+[[6600]],
+[[6601]],
+[[6602]],
+[[6603]],
+[[6604]],
+[[6605]],
+[[6606]],
+[[6607]],
+[[6608]],
+[[6609]],
+[[6610]],
+[[6611]],
+[[6612]],
+[[6613]],
+[[6614]],
+[[6615]],
+[[6616]],
+[[6617]],
+[[6618]],
+[[6619]],
+[[6620]],
+[[6621]],
+[[6622]],
+[[6623]],
+[[6624]],
+[[6625]],
+[[6626]],
+[[6627]],
+[[6628]],
+[[6629]],
+[[6630]],
+[[6631]],
+[[6632]],
+[[6633]],
+[[6634]],
+[[6635]],
+[[6636]],
+[[6637]],
+[[6638]],
+[[6639]],
+[[6640]],
+[[6641]],
+[[6642]],
+[[6643]],
+[[6644]],
+[[6645]],
+[[6646]],
+[[6647]],
+[[6648]],
+[[6649]],
+[[6650]],
+[[6651]],
+[[6652]],
+[[6653]],
+[[6654]],
+[[6655]],
+[[6656]],
+[[6657]],
+[[6658]],
+[[6659]],
+[[6660]],
+[[6661]],
+[[6662]],
+[[6663]],
+[[6664]],
+[[6665]],
+[[6666]],
+[[6667]],
+[[6668]],
+[[6669]],
+[[6670]],
+[[6671]],
+[[6672]],
+[[6673]],
+[[6674]],
+[[6675]],
+[[6676]],
+[[6677]],
+[[6678]],
+[[6679]],
+[[6680]],
+[[6681]],
+[[6682]],
+[[6683]],
+[[6684]],
+[[6685]],
+[[6686]],
+[[6687]],
+[[6688]],
+[[6689]],
+[[6690]],
+[[6691]],
+[[6692]],
+[[6693]],
+[[6694]],
+[[6695]],
+[[6696]],
+[[6697]],
+[[6698]],
+[[6699]],
+[[6700]],
+[[6701]],
+[[6702]],
+[[6703]],
+[[6704]],
+[[6705]],
+[[6706]],
+[[6707]],
+[[6708]],
+[[6709]],
+[[6710]],
+[[6711]],
+[[6712]],
+[[6713]],
+[[6714]],
+[[6715]],
+[[6716]],
+[[6717]],
+[[6718]],
+[[6719]],
+[[6720]],
+[[6721]],
+[[6722]],
+[[6723]],
+[[6724]],
+[[6725]],
+[[6726]],
+[[6727]],
+[[6728]],
+[[6729]],
+[[6730]],
+[[6731]],
+[[6732]],
+[[6733]],
+[[6734]],
+[[6735]],
+[[6736]],
+[[6737]],
+[[6738]],
+[[6739]],
+[[6740]],
+[[6741]],
+[[6742]],
+[[6743]],
+[[6744]],
+[[6745]],
+[[6746]],
+[[6747]],
+[[6748]],
+[[6749]],
+[[6750]],
+[[6751]],
+[[6752]],
+[[6753]],
+[[6754]],
+[[6755]],
+[[6756]],
+[[6757]],
+[[6758]],
+[[6759]],
+[[6760]],
+[[6761]],
+[[6762]],
+[[6763]],
+[[6764]],
+[[6765]],
+[[6766]],
+[[6767]],
+[[6768]],
+[[6769]],
+[[6770]],
+[[6771]],
+[[6772]],
+[[6773]],
+[[6774]],
+[[6775]],
+[[6776]],
+[[6777]],
+[[6778]],
+[[6779]],
+[[6780]],
+[[6781]],
+[[6782]],
+[[6783]],
+[[6784]],
+[[6785]],
+[[6786]],
+[[6787]],
+[[6788]],
+[[6789]],
+[[6790]],
+[[6791]],
+[[6792]],
+[[6793]],
+[[6794]],
+[[6795]],
+[[6796]],
+[[6797]],
+[[6798]],
+[[6799]],
+[[6800]],
+[[6801]],
+[[6802]],
+[[6803]],
+[[6804]],
+[[6805]],
+[[6806]],
+[[6807]],
+[[6808]],
+[[6809]],
+[[6810]],
+[[6811]],
+[[6812]],
+[[6813]],
+[[6814]],
+[[6815]],
+[[6816]],
+[[6817]],
+[[6818]],
+[[6819]],
+[[6820]],
+[[6821]],
+[[6822]],
+[[6823]],
+[[6824]],
+[[6825]],
+[[6826]],
+[[6827]],
+[[6828]],
+[[6829]],
+[[6830]],
+[[6831]],
+[[6832]],
+[[6833]],
+[[6834]],
+[[6835]],
+[[6836]],
+[[6837]],
+[[6838]],
+[[6839]],
+[[6840]],
+[[6841]],
+[[6842]],
+[[6843]],
+[[6844]],
+[[6845]],
+[[6846]],
+[[6847]],
+[[6848]],
+[[6849]],
+[[6850]],
+[[6851]],
+[[6852]],
+[[6853]],
+[[6854]],
+[[6855]],
+[[6856]],
+[[6857]],
+[[6858]],
+[[6859]],
+[[6860]],
+[[6861]],
+[[6862]],
+[[6863]],
+[[6864]],
+[[6865]],
+[[6866]],
+[[6867]],
+[[6868]],
+[[6869]],
+[[6870]],
+[[6871]],
+[[6872]],
+[[6873]],
+[[6874]],
+[[6875]],
+[[6876]],
+[[6877]],
+[[6878]],
+[[6879]],
+[[6880]],
+[[6881]],
+[[6882]],
+[[6883]],
+[[6884]],
+[[6885]],
+[[6886]],
+[[6887]],
+[[6888]],
+[[6889]],
+[[6890]],
+[[6891]],
+[[6892]],
+[[6893]],
+[[6894]],
+[[6895]],
+[[6896]],
+[[6897]],
+[[6898]],
+[[6899]],
+[[6900]],
+[[6901]],
+[[6902]],
+[[6903]],
+[[6904]],
+[[6905]],
+[[6906]],
+[[6907]],
+[[6908]],
+[[6909]],
+[[6910]],
+[[6911]],
+[[6912]],
+[[6913]],
+[[6914]],
+[[6915]],
+[[6916]],
+[[6917]],
+[[6918]],
+[[6919]],
+[[6920]],
+[[6921]],
+[[6922]],
+[[6923]],
+[[6924]],
+[[6925]],
+[[6926]],
+[[6927]],
+[[6928]],
+[[6929]],
+[[6930]],
+[[6931]],
+[[6932]],
+[[6933]],
+[[6934]],
+[[6935]],
+[[6936]],
+[[6937]],
+[[6938]],
+[[6939]],
+[[6940]],
+[[6941]],
+[[6942]],
+[[6943]],
+[[6944]],
+[[6945]],
+[[6946]],
+[[6947]],
+[[6948]],
+[[6949]],
+[[6950]],
+[[6951]],
+[[6952]],
+[[6953]],
+[[6954]],
+[[6955]],
+[[6956]],
+[[6957]],
+[[6958]],
+[[6959]],
+[[6960]],
+[[6961]],
+[[6962]],
+[[6963]],
+[[6964]],
+[[6965]],
+[[6966]],
+[[6967]],
+[[6968]],
+[[6969]],
+[[6970]],
+[[6971]],
+[[6972]],
+[[6973]],
+[[6974]],
+[[6975]],
+[[6976]],
+[[6977]],
+[[6978]],
+[[6979]],
+[[6980]],
+[[6981]],
+[[6982]],
+[[6983]],
+[[6984]],
+[[6985]],
+[[6986]],
+[[6987]],
+[[6988]],
+[[6989]],
+[[6990]],
+[[6991]],
+[[6992]],
+[[6993]],
+[[6994]],
+[[6995]],
+[[6996]],
+[[6997]],
+[[6998]],
+[[6999]],
+[[7000]],
+[[7001]],
+[[7002]],
+[[7003]],
+[[7004]],
+[[7005]],
+[[7006]],
+[[7007]],
+[[7008]],
+[[7009]],
+[[7010]],
+[[7011]],
+[[7012]],
+[[7013]],
+[[7014]],
+[[7015]],
+[[7016]],
+[[7017]],
+[[7018]],
+[[7019]],
+[[7020]],
+[[7021]],
+[[7022]],
+[[7023]],
+[[7024]],
+[[7025]],
+[[7026]],
+[[7027]],
+[[7028]],
+[[7029]],
+[[7030]],
+[[7031]],
+[[7032]],
+[[7033]],
+[[7034]],
+[[7035]],
+[[7036]],
+[[7037]],
+[[7038]],
+[[7039]],
+[[7040]],
+[[7041]],
+[[7042]],
+[[7043]],
+[[7044]],
+[[7045]],
+[[7046]],
+[[7047]],
+[[7048]],
+[[7049]],
+[[7050]],
+[[7051]],
+[[7052]],
+[[7053]],
+[[7054]],
+[[7055]],
+[[7056]],
+[[7057]],
+[[7058]],
+[[7059]],
+[[7060]],
+[[7061]],
+[[7062]],
+[[7063]],
+[[7064]],
+[[7065]],
+[[7066]],
+[[7067]],
+[[7068]],
+[[7069]],
+[[7070]],
+[[7071]],
+[[7072]],
+[[7073]],
+[[7074]],
+[[7075]],
+[[7076]],
+[[7077]],
+[[7078]],
+[[7079]],
+[[7080]],
+[[7081]],
+[[7082]],
+[[7083]],
+[[7084]],
+[[7085]],
+[[7086]],
+[[7087]],
+[[7088]],
+[[7089]],
+[[7090]],
+[[7091]],
+[[7092]],
+[[7093]],
+[[7094]],
+[[7095]],
+[[7096]],
+[[7097]],
+[[7098]],
+[[7099]],
+[[7100]],
+[[7101]],
+[[7102]],
+[[7103]],
+[[7104]],
+[[7105]],
+[[7106]],
+[[7107]],
+[[7108]],
+[[7109]],
+[[7110]],
+[[7111]],
+[[7112]],
+[[7113]],
+[[7114]],
+[[7115]],
+[[7116]],
+[[7117]],
+[[7118]],
+[[7119]],
+[[7120]],
+[[7121]],
+[[7122]],
+[[7123]],
+[[7124]],
+[[7125]],
+[[7126]],
+[[7127]],
+[[7128]],
+[[7129]],
+[[7130]],
+[[7131]],
+[[7132]],
+[[7133]],
+[[7134]],
+[[7135]],
+[[7136]],
+[[7137]],
+[[7138]],
+[[7139]],
+[[7140]],
+[[7141]],
+[[7142]],
+[[7143]],
+[[7144]],
+[[7145]],
+[[7146]],
+[[7147]],
+[[7148]],
+[[7149]],
+[[7150]],
+[[7151]],
+[[7152]],
+[[7153]],
+[[7154]],
+[[7155]],
+[[7156]],
+[[7157]],
+[[7158]],
+[[7159]],
+[[7160]],
+[[7161]],
+[[7162]],
+[[7163]],
+[[7164]],
+[[7165]],
+[[7166]],
+[[7167]],
+[[7168]],
+[[7169]],
+[[7170]],
+[[7171]],
+[[7172]],
+[[7173]],
+[[7174]],
+[[7175]],
+[[7176]],
+[[7177]],
+[[7178]],
+[[7179]],
+[[7180]],
+[[7181]],
+[[7182]],
+[[7183]],
+[[7184]],
+[[7185]],
+[[7186]],
+[[7187]],
+[[7188]],
+[[7189]],
+[[7190]],
+[[7191]],
+[[7192]],
+[[7193]],
+[[7194]],
+[[7195]],
+[[7196]],
+[[7197]],
+[[7198]],
+[[7199]],
+[[7200]],
+[[7201]],
+[[7202]],
+[[7203]],
+[[7204]],
+[[7205]],
+[[7206]],
+[[7207]],
+[[7208]],
+[[7209]],
+[[7210]],
+[[7211]],
+[[7212]],
+[[7213]],
+[[7214]],
+[[7215]],
+[[7216]],
+[[7217]],
+[[7218]],
+[[7219]],
+[[7220]],
+[[7221]],
+[[7222]],
+[[7223]],
+[[7224]],
+[[7225]],
+[[7226]],
+[[7227]],
+[[7228]],
+[[7229]],
+[[7230]],
+[[7231]],
+[[7232]],
+[[7233]],
+[[7234]],
+[[7235]],
+[[7236]],
+[[7237]],
+[[7238]],
+[[7239]],
+[[7240]],
+[[7241]],
+[[7242]],
+[[7243]],
+[[7244]],
+[[7245]],
+[[7246]],
+[[7247]],
+[[7248]],
+[[7249]],
+[[7250]],
+[[7251]],
+[[7252]],
+[[7253]],
+[[7254]],
+[[7255]],
+[[7256]],
+[[7257]],
+[[7258]],
+[[7259]],
+[[7260]],
+[[7261]],
+[[7262]],
+[[7263]],
+[[7264]],
+[[7265]],
+[[7266]],
+[[7267]],
+[[7268]],
+[[7269]],
+[[7270]],
+[[7271]],
+[[7272]],
+[[7273]],
+[[7274]],
+[[7275]],
+[[7276]],
+[[7277]],
+[[7278]],
+[[7279]],
+[[7280]],
+[[7281]],
+[[7282]],
+[[7283]],
+[[7284]],
+[[7285]],
+[[7286]],
+[[7287]],
+[[7288]],
+[[7289]],
+[[7290]],
+[[7291]],
+[[7292]],
+[[7293]],
+[[7294]],
+[[7295]],
+[[7296]],
+[[7297]],
+[[7298]],
+[[7299]],
+[[7300]],
+[[7301]],
+[[7302]],
+[[7303]],
+[[7304]],
+[[7305]],
+[[7306]],
+[[7307]],
+[[7308]],
+[[7309]],
+[[7310]],
+[[7311]],
+[[7312]],
+[[7313]],
+[[7314]],
+[[7315]],
+[[7316]],
+[[7317]],
+[[7318]],
+[[7319]],
+[[7320]],
+[[7321]],
+[[7322]],
+[[7323]],
+[[7324]],
+[[7325]],
+[[7326]],
+[[7327]],
+[[7328]],
+[[7329]],
+[[7330]],
+[[7331]],
+[[7332]],
+[[7333]],
+[[7334]],
+[[7335]],
+[[7336]],
+[[7337]],
+[[7338]],
+[[7339]],
+[[7340]],
+[[7341]],
+[[7342]],
+[[7343]],
+[[7344]],
+[[7345]],
+[[7346]],
+[[7347]],
+[[7348]],
+[[7349]],
+[[7350]],
+[[7351]],
+[[7352]],
+[[7353]],
+[[7354]],
+[[7355]],
+[[7356]],
+[[7357]],
+[[7358]],
+[[7359]],
+[[7360]],
+[[7361]],
+[[7362]],
+[[7363]],
+[[7364]],
+[[7365]],
+[[7366]],
+[[7367]],
+[[7368]],
+[[7369]],
+[[7370]],
+[[7371]],
+[[7372]],
+[[7373]],
+[[7374]],
+[[7375]],
+[[7376]],
+[[7377]],
+[[7378]],
+[[7379]],
+[[7380]],
+[[7381]],
+[[7382]],
+[[7383]],
+[[7384]],
+[[7385]],
+[[7386]],
+[[7387]],
+[[7388]],
+[[7389]],
+[[7390]],
+[[7391]],
+[[7392]],
+[[7393]],
+[[7394]],
+[[7395]],
+[[7396]],
+[[7397]],
+[[7398]],
+[[7399]],
+[[7400]],
+[[7401]],
+[[7402]],
+[[7403]],
+[[7404]],
+[[7405]],
+[[7406]],
+[[7407]],
+[[7408]],
+[[7409]],
+[[7410]],
+[[7411]],
+[[7412]],
+[[7413]],
+[[7414]],
+[[7415]],
+[[7416]],
+[[7417]],
+[[7418]],
+[[7419]],
+[[7420]],
+[[7421]],
+[[7422]],
+[[7423]],
+[[7424]],
+[[7425]],
+[[7426]],
+[[7427]],
+[[7428]],
+[[7429]],
+[[7430]],
+[[7431]],
+[[7432]],
+[[7433]],
+[[7434]],
+[[7435]],
+[[7436]],
+[[7437]],
+[[7438]],
+[[7439]],
+[[7440]],
+[[7441]],
+[[7442]],
+[[7443]],
+[[7444]],
+[[7445]],
+[[7446]],
+[[7447]],
+[[7448]],
+[[7449]],
+[[7450]],
+[[7451]],
+[[7452]],
+[[7453]],
+[[7454]],
+[[7455]],
+[[7456]],
+[[7457]],
+[[7458]],
+[[7459]],
+[[7460]],
+[[7461]],
+[[7462]],
+[[7463]],
+[[7464]],
+[[7465]],
+[[7466]],
+[[7467]],
+[[7468]],
+[[7469]],
+[[7470]],
+[[7471]],
+[[7472]],
+[[7473]],
+[[7474]],
+[[7475]],
+[[7476]],
+[[7477]],
+[[7478]],
+[[7479]],
+[[7480]],
+[[7481]],
+[[7482]],
+[[7483]],
+[[7484]],
+[[7485]],
+[[7486]],
+[[7487]],
+[[7488]],
+[[7489]],
+[[7490]],
+[[7491]],
+[[7492]],
+[[7493]],
+[[7494]],
+[[7495]],
+[[7496]],
+[[7497]],
+[[7498]],
+[[7499]],
+[[7500]],
+[[7501]],
+[[7502]],
+[[7503]],
+[[7504]],
+[[7505]],
+[[7506]],
+[[7507]],
+[[7508]],
+[[7509]],
+[[7510]],
+[[7511]],
+[[7512]],
+[[7513]],
+[[7514]],
+[[7515]],
+[[7516]],
+[[7517]],
+[[7518]],
+[[7519]],
+[[7520]],
+[[7521]],
+[[7522]],
+[[7523]],
+[[7524]],
+[[7525]],
+[[7526]],
+[[7527]],
+[[7528]],
+[[7529]],
+[[7530]],
+[[7531]],
+[[7532]],
+[[7533]],
+[[7534]],
+[[7535]],
+[[7536]],
+[[7537]],
+[[7538]],
+[[7539]],
+[[7540]],
+[[7541]],
+[[7542]],
+[[7543]],
+[[7544]],
+[[7545]],
+[[7546]],
+[[7547]],
+[[7548]],
+[[7549]],
+[[7550]],
+[[7551]],
+[[7552]],
+[[7553]],
+[[7554]],
+[[7555]],
+[[7556]],
+[[7557]],
+[[7558]],
+[[7559]],
+[[7560]],
+[[7561]],
+[[7562]],
+[[7563]],
+[[7564]],
+[[7565]],
+[[7566]],
+[[7567]],
+[[7568]],
+[[7569]],
+[[7570]],
+[[7571]],
+[[7572]],
+[[7573]],
+[[7574]],
+[[7575]],
+[[7576]],
+[[7577]],
+[[7578]],
+[[7579]],
+[[7580]],
+[[7581]],
+[[7582]],
+[[7583]],
+[[7584]],
+[[7585]],
+[[7586]],
+[[7587]],
+[[7588]],
+[[7589]],
+[[7590]],
+[[7591]],
+[[7592]],
+[[7593]],
+[[7594]],
+[[7595]],
+[[7596]],
+[[7597]],
+[[7598]],
+[[7599]],
+[[7600]],
+[[7601]],
+[[7602]],
+[[7603]],
+[[7604]],
+[[7605]],
+[[7606]],
+[[7607]],
+[[7608]],
+[[7609]],
+[[7610]],
+[[7611]],
+[[7612]],
+[[7613]],
+[[7614]],
+[[7615]],
+[[7616]],
+[[7617]],
+[[7618]],
+[[7619]],
+[[7620]],
+[[7621]],
+[[7622]],
+[[7623]],
+[[7624]],
+[[7625]],
+[[7626]],
+[[7627]],
+[[7628]],
+[[7629]],
+[[7630]],
+[[7631]],
+[[7632]],
+[[7633]],
+[[7634]],
+[[7635]],
+[[7636]],
+[[7637]],
+[[7638]],
+[[7639]],
+[[7640]],
+[[7641]],
+[[7642]],
+[[7643]],
+[[7644]],
+[[7645]],
+[[7646]],
+[[7647]],
+[[7648]],
+[[7649]],
+[[7650]],
+[[7651]],
+[[7652]],
+[[7653]],
+[[7654]],
+[[7655]],
+[[7656]],
+[[7657]],
+[[7658]],
+[[7659]],
+[[7660]],
+[[7661]],
+[[7662]],
+[[7663]],
+[[7664]],
+[[7665]],
+[[7666]],
+[[7667]],
+[[7668]],
+[[7669]],
+[[7670]],
+[[7671]],
+[[7672]],
+[[7673]],
+[[7674]],
+[[7675]],
+[[7676]],
+[[7677]],
+[[7678]],
+[[7679]],
+[[7680]],
+[[7681]],
+[[7682]],
+[[7683]],
+[[7684]],
+[[7685]],
+[[7686]],
+[[7687]],
+[[7688]],
+[[7689]],
+[[7690]],
+[[7691]],
+[[7692]],
+[[7693]],
+[[7694]],
+[[7695]],
+[[7696]],
+[[7697]],
+[[7698]],
+[[7699]],
+[[7700]],
+[[7701]],
+[[7702]],
+[[7703]],
+[[7704]],
+[[7705]],
+[[7706]],
+[[7707]],
+[[7708]],
+[[7709]],
+[[7710]],
+[[7711]],
+[[7712]],
+[[7713]],
+[[7714]],
+[[7715]],
+[[7716]],
+[[7717]],
+[[7718]],
+[[7719]],
+[[7720]],
+[[7721]],
+[[7722]],
+[[7723]],
+[[7724]],
+[[7725]],
+[[7726]],
+[[7727]],
+[[7728]],
+[[7729]],
+[[7730]],
+[[7731]],
+[[7732]],
+[[7733]],
+[[7734]],
+[[7735]],
+[[7736]],
+[[7737]],
+[[7738]],
+[[7739]],
+[[7740]],
+[[7741]],
+[[7742]],
+[[7743]],
+[[7744]],
+[[7745]],
+[[7746]],
+[[7747]],
+[[7748]],
+[[7749]],
+[[7750]],
+[[7751]],
+[[7752]],
+[[7753]],
+[[7754]],
+[[7755]],
+[[7756]],
+[[7757]],
+[[7758]],
+[[7759]],
+[[7760]],
+[[7761]],
+[[7762]],
+[[7763]],
+[[7764]],
+[[7765]],
+[[7766]],
+[[7767]],
+[[7768]],
+[[7769]],
+[[7770]],
+[[7771]],
+[[7772]],
+[[7773]],
+[[7774]],
+[[7775]],
+[[7776]],
+[[7777]],
+[[7778]],
+[[7779]],
+[[7780]],
+[[7781]],
+[[7782]],
+[[7783]],
+[[7784]],
+[[7785]],
+[[7786]],
+[[7787]],
+[[7788]],
+[[7789]],
+[[7790]],
+[[7791]],
+[[7792]],
+[[7793]],
+[[7794]],
+[[7795]],
+[[7796]],
+[[7797]],
+[[7798]],
+[[7799]],
+[[7800]],
+[[7801]],
+[[7802]],
+[[7803]],
+[[7804]],
+[[7805]],
+[[7806]],
+[[7807]],
+[[7808]],
+[[7809]],
+[[7810]],
+[[7811]],
+[[7812]],
+[[7813]],
+[[7814]],
+[[7815]],
+[[7816]],
+[[7817]],
+[[7818]],
+[[7819]],
+[[7820]],
+[[7821]],
+[[7822]],
+[[7823]],
+[[7824]],
+[[7825]],
+[[7826]],
+[[7827]],
+[[7828]],
+[[7829]],
+[[7830]],
+[[7831]],
+[[7832]],
+[[7833]],
+[[7834]],
+[[7835]],
+[[7836]],
+[[7837]],
+[[7838]],
+[[7839]],
+[[7840]],
+[[7841]],
+[[7842]],
+[[7843]],
+[[7844]],
+[[7845]],
+[[7846]],
+[[7847]],
+[[7848]],
+[[7849]],
+[[7850]],
+[[7851]],
+[[7852]],
+[[7853]],
+[[7854]],
+[[7855]],
+[[7856]],
+[[7857]],
+[[7858]],
+[[7859]],
+[[7860]],
+[[7861]],
+[[7862]],
+[[7863]],
+[[7864]],
+[[7865]],
+[[7866]],
+[[7867]],
+[[7868]],
+[[7869]],
+[[7870]],
+[[7871]],
+[[7872]],
+[[7873]],
+[[7874]],
+[[7875]],
+[[7876]],
+[[7877]],
+[[7878]],
+[[7879]],
+[[7880]],
+[[7881]],
+[[7882]],
+[[7883]],
+[[7884]],
+[[7885]],
+[[7886]],
+[[7887]],
+[[7888]],
+[[7889]],
+[[7890]],
+[[7891]],
+[[7892]],
+[[7893]],
+[[7894]],
+[[7895]],
+[[7896]],
+[[7897]],
+[[7898]],
+[[7899]],
+[[7900]],
+[[7901]],
+[[7902]],
+[[7903]],
+[[7904]],
+[[7905]],
+[[7906]],
+[[7907]],
+[[7908]],
+[[7909]],
+[[7910]],
+[[7911]],
+[[7912]],
+[[7913]],
+[[7914]],
+[[7915]],
+[[7916]],
+[[7917]],
+[[7918]],
+[[7919]],
+[[7920]],
+[[7921]],
+[[7922]],
+[[7923]],
+[[7924]],
+[[7925]],
+[[7926]],
+[[7927]],
+[[7928]],
+[[7929]],
+[[7930]],
+[[7931]],
+[[7932]],
+[[7933]],
+[[7934]],
+[[7935]],
+[[7936]],
+[[7937]],
+[[7938]],
+[[7939]],
+[[7940]],
+[[7941]],
+[[7942]],
+[[7943]],
+[[7944]],
+[[7945]],
+[[7946]],
+[[7947]],
+[[7948]],
+[[7949]],
+[[7950]],
+[[7951]],
+[[7952]],
+[[7953]],
+[[7954]],
+[[7955]],
+[[7956]],
+[[7957]],
+[[7958]],
+[[7959]],
+[[7960]],
+[[7961]],
+[[7962]],
+[[7963]],
+[[7964]],
+[[7965]],
+[[7966]],
+[[7967]],
+[[7968]],
+[[7969]],
+[[7970]],
+[[7971]],
+[[7972]],
+[[7973]],
+[[7974]],
+[[7975]],
+[[7976]],
+[[7977]],
+[[7978]],
+[[7979]],
+[[7980]],
+[[7981]],
+[[7982]],
+[[7983]],
+[[7984]],
+[[7985]],
+[[7986]],
+[[7987]],
+[[7988]],
+[[7989]],
+[[7990]],
+[[7991]],
+[[7992]],
+[[7993]],
+[[7994]],
+[[7995]],
+[[7996]],
+[[7997]],
+[[7998]],
+[[7999]],
+[[8000]],
+[[8001]],
+[[8002]],
+[[8003]],
+[[8004]],
+[[8005]],
+[[8006]],
+[[8007]],
+[[8008]],
+[[8009]],
+[[8010]],
+[[8011]],
+[[8012]],
+[[8013]],
+[[8014]],
+[[8015]],
+[[8016]],
+[[8017]],
+[[8018]],
+[[8019]],
+[[8020]],
+[[8021]],
+[[8022]],
+[[8023]],
+[[8024]],
+[[8025]],
+[[8026]],
+[[8027]],
+[[8028]],
+[[8029]],
+[[8030]],
+[[8031]],
+[[8032]],
+[[8033]],
+[[8034]],
+[[8035]],
+[[8036]],
+[[8037]],
+[[8038]],
+[[8039]],
+[[8040]],
+[[8041]],
+[[8042]],
+[[8043]],
+[[8044]],
+[[8045]],
+[[8046]],
+[[8047]],
+[[8048]],
+[[8049]],
+[[8050]],
+[[8051]],
+[[8052]],
+[[8053]],
+[[8054]],
+[[8055]],
+[[8056]],
+[[8057]],
+[[8058]],
+[[8059]],
+[[8060]],
+[[8061]],
+[[8062]],
+[[8063]],
+[[8064]],
+[[8065]],
+[[8066]],
+[[8067]],
+[[8068]],
+[[8069]],
+[[8070]],
+[[8071]],
+[[8072]],
+[[8073]],
+[[8074]],
+[[8075]],
+[[8076]],
+[[8077]],
+[[8078]],
+[[8079]],
+[[8080]],
+[[8081]],
+[[8082]],
+[[8083]],
+[[8084]],
+[[8085]],
+[[8086]],
+[[8087]],
+[[8088]],
+[[8089]],
+[[8090]],
+[[8091]],
+[[8092]],
+[[8093]],
+[[8094]],
+[[8095]],
+[[8096]],
+[[8097]],
+[[8098]],
+[[8099]],
+[[8100]],
+[[8101]],
+[[8102]],
+[[8103]],
+[[8104]],
+[[8105]],
+[[8106]],
+[[8107]],
+[[8108]],
+[[8109]],
+[[8110]],
+[[8111]],
+[[8112]],
+[[8113]],
+[[8114]],
+[[8115]],
+[[8116]],
+[[8117]],
+[[8118]],
+[[8119]],
+[[8120]],
+[[8121]],
+[[8122]],
+[[8123]],
+[[8124]],
+[[8125]],
+[[8126]],
+[[8127]],
+[[8128]],
+[[8129]],
+[[8130]],
+[[8131]],
+[[8132]],
+[[8133]],
+[[8134]],
+[[8135]],
+[[8136]],
+[[8137]],
+[[8138]],
+[[8139]],
+[[8140]],
+[[8141]],
+[[8142]],
+[[8143]],
+[[8144]],
+[[8145]],
+[[8146]],
+[[8147]],
+[[8148]],
+[[8149]],
+[[8150]],
+[[8151]],
+[[8152]],
+[[8153]],
+[[8154]],
+[[8155]],
+[[8156]],
+[[8157]],
+[[8158]],
+[[8159]],
+[[8160]],
+[[8161]],
+[[8162]],
+[[8163]],
+[[8164]],
+[[8165]],
+[[8166]],
+[[8167]],
+[[8168]],
+[[8169]],
+[[8170]],
+[[8171]],
+[[8172]],
+[[8173]],
+[[8174]],
+[[8175]],
+[[8176]],
+[[8177]],
+[[8178]],
+[[8179]],
+[[8180]],
+[[8181]],
+[[8182]],
+[[8183]],
+[[8184]],
+[[8185]],
+[[8186]],
+[[8187]],
+[[8188]],
+[[8189]],
+[[8190]],
+[[8191]],
+[[8192]],
+[[8193]],
+[[8194]],
+[[8195]],
+[[8196]],
+[[8197]],
+[[8198]],
+[[8199]],
+[[8200]],
+[[8201]],
+[[8202]],
+[[8203]],
+[[8204]],
+[[8205]],
+[[8206]],
+[[8207]],
+[[8208]],
+[[8209]],
+[[8210]],
+[[8211]],
+[[8212]],
+[[8213]],
+[[8214]],
+[[8215]],
+[[8216]],
+[[8217]],
+[[8218]],
+[[8219]],
+[[8220]],
+[[8221]],
+[[8222]],
+[[8223]],
+[[8224]],
+[[8225]],
+[[8226]],
+[[8227]],
+[[8228]],
+[[8229]],
+[[8230]],
+[[8231]],
+[[8232]],
+[[8233]],
+[[8234]],
+[[8235]],
+[[8236]],
+[[8237]],
+[[8238]],
+[[8239]],
+[[8240]],
+[[8241]],
+[[8242]],
+[[8243]],
+[[8244]],
+[[8245]],
+[[8246]],
+[[8247]],
+[[8248]],
+[[8249]],
+[[8250]],
+[[8251]],
+[[8252]],
+[[8253]],
+[[8254]],
+[[8255]],
+[[8256]],
+[[8257]],
+[[8258]],
+[[8259]],
+[[8260]],
+[[8261]],
+[[8262]],
+[[8263]],
+[[8264]],
+[[8265]],
+[[8266]],
+[[8267]],
+[[8268]],
+[[8269]],
+[[8270]],
+[[8271]],
+[[8272]],
+[[8273]],
+[[8274]],
+[[8275]],
+[[8276]],
+[[8277]],
+[[8278]],
+[[8279]],
+[[8280]],
+[[8281]],
+[[8282]],
+[[8283]],
+[[8284]],
+[[8285]],
+[[8286]],
+[[8287]],
+[[8288]],
+[[8289]],
+[[8290]],
+[[8291]],
+[[8292]],
+[[8293]],
+[[8294]],
+[[8295]],
+[[8296]],
+[[8297]],
+[[8298]],
+[[8299]],
+[[8300]],
+[[8301]],
+[[8302]],
+[[8303]],
+[[8304]],
+[[8305]],
+[[8306]],
+[[8307]],
+[[8308]],
+[[8309]],
+[[8310]],
+[[8311]],
+[[8312]],
+[[8313]],
+[[8314]],
+[[8315]],
+[[8316]],
+[[8317]],
+[[8318]],
+[[8319]],
+[[8320]],
+[[8321]],
+[[8322]],
+[[8323]],
+[[8324]],
+[[8325]],
+[[8326]],
+[[8327]],
+[[8328]],
+[[8329]],
+[[8330]],
+[[8331]],
+[[8332]],
+[[8333]],
+[[8334]],
+[[8335]],
+[[8336]],
+[[8337]],
+[[8338]],
+[[8339]],
+[[8340]],
+[[8341]],
+[[8342]],
+[[8343]],
+[[8344]],
+[[8345]],
+[[8346]],
+[[8347]],
+[[8348]],
+[[8349]],
+[[8350]],
+[[8351]],
+[[8352]],
+[[8353]],
+[[8354]],
+[[8355]],
+[[8356]],
+[[8357]],
+[[8358]],
+[[8359]],
+[[8360]],
+[[8361]],
+[[8362]],
+[[8363]],
+[[8364]],
+[[8365]],
+[[8366]],
+[[8367]],
+[[8368]],
+[[8369]],
+[[8370]],
+[[8371]],
+[[8372]],
+[[8373]],
+[[8374]],
+[[8375]],
+[[8376]],
+[[8377]],
+[[8378]],
+[[8379]],
+[[8380]],
+[[8381]],
+[[8382]],
+[[8383]],
+[[8384]],
+[[8385]],
+[[8386]],
+[[8387]],
+[[8388]],
+[[8389]],
+[[8390]],
+[[8391]],
+[[8392]],
+[[8393]],
+[[8394]],
+[[8395]],
+[[8396]],
+[[8397]],
+[[8398]],
+[[8399]],
+[[8400]],
+[[8401]],
+[[8402]],
+[[8403]],
+[[8404]],
+[[8405]],
+[[8406]],
+[[8407]],
+[[8408]],
+[[8409]],
+[[8410]],
+[[8411]],
+[[8412]],
+[[8413]],
+[[8414]],
+[[8415]],
+[[8416]],
+[[8417]],
+[[8418]],
+[[8419]],
+[[8420]],
+[[8421]],
+[[8422]],
+[[8423]],
+[[8424]],
+[[8425]],
+[[8426]],
+[[8427]],
+[[8428]],
+[[8429]],
+[[8430]],
+[[8431]],
+[[8432]],
+[[8433]],
+[[8434]],
+[[8435]],
+[[8436]],
+[[8437]],
+[[8438]],
+[[8439]],
+[[8440]],
+[[8441]],
+[[8442]],
+[[8443]],
+[[8444]],
+[[8445]],
+[[8446]],
+[[8447]],
+[[8448]],
+[[8449]],
+[[8450]],
+[[8451]],
+[[8452]],
+[[8453]],
+[[8454]],
+[[8455]],
+[[8456]],
+[[8457]],
+[[8458]],
+[[8459]],
+[[8460]],
+[[8461]],
+[[8462]],
+[[8463]],
+[[8464]],
+[[8465]],
+[[8466]],
+[[8467]],
+[[8468]],
+[[8469]],
+[[8470]],
+[[8471]],
+[[8472]],
+[[8473]],
+[[8474]],
+[[8475]],
+[[8476]],
+[[8477]],
+[[8478]],
+[[8479]],
+[[8480]],
+[[8481]],
+[[8482]],
+[[8483]],
+[[8484]],
+[[8485]],
+[[8486]],
+[[8487]],
+[[8488]],
+[[8489]],
+[[8490]],
+[[8491]],
+[[8492]],
+[[8493]],
+[[8494]],
+[[8495]],
+[[8496]],
+[[8497]],
+[[8498]],
+[[8499]],
+[[8500]],
+[[8501]],
+[[8502]],
+[[8503]],
+[[8504]],
+[[8505]],
+[[8506]],
+[[8507]],
+[[8508]],
+[[8509]],
+[[8510]],
+[[8511]],
+[[8512]],
+[[8513]],
+[[8514]],
+[[8515]],
+[[8516]],
+[[8517]],
+[[8518]],
+[[8519]],
+[[8520]],
+[[8521]],
+[[8522]],
+[[8523]],
+[[8524]],
+[[8525]],
+[[8526]],
+[[8527]],
+[[8528]],
+[[8529]],
+[[8530]],
+[[8531]],
+[[8532]],
+[[8533]],
+[[8534]],
+[[8535]],
+[[8536]],
+[[8537]],
+[[8538]],
+[[8539]],
+[[8540]],
+[[8541]],
+[[8542]],
+[[8543]],
+[[8544]],
+[[8545]],
+[[8546]],
+[[8547]],
+[[8548]],
+[[8549]],
+[[8550]],
+[[8551]],
+[[8552]],
+[[8553]],
+[[8554]],
+[[8555]],
+[[8556]],
+[[8557]],
+[[8558]],
+[[8559]],
+[[8560]],
+[[8561]],
+[[8562]],
+[[8563]],
+[[8564]],
+[[8565]],
+[[8566]],
+[[8567]],
+[[8568]],
+[[8569]],
+[[8570]],
+[[8571]],
+[[8572]],
+[[8573]],
+[[8574]],
+[[8575]],
+[[8576]],
+[[8577]],
+[[8578]],
+[[8579]],
+[[8580]],
+[[8581]],
+[[8582]],
+[[8583]],
+[[8584]],
+[[8585]],
+[[8586]],
+[[8587]],
+[[8588]],
+[[8589]],
+[[8590]],
+[[8591]],
+[[8592]],
+[[8593]],
+[[8594]],
+[[8595]],
+[[8596]],
+[[8597]],
+[[8598]],
+[[8599]],
+[[8600]],
+[[8601]],
+[[8602]],
+[[8603]],
+[[8604]],
+[[8605]],
+[[8606]],
+[[8607]],
+[[8608]],
+[[8609]],
+[[8610]],
+[[8611]],
+[[8612]],
+[[8613]],
+[[8614]],
+[[8615]],
+[[8616]],
+[[8617]],
+[[8618]],
+[[8619]],
+[[8620]],
+[[8621]],
+[[8622]],
+[[8623]],
+[[8624]],
+[[8625]],
+[[8626]],
+[[8627]],
+[[8628]],
+[[8629]],
+[[8630]],
+[[8631]],
+[[8632]],
+[[8633]],
+[[8634]],
+[[8635]],
+[[8636]],
+[[8637]],
+[[8638]],
+[[8639]],
+[[8640]],
+[[8641]],
+[[8642]],
+[[8643]],
+[[8644]],
+[[8645]],
+[[8646]],
+[[8647]],
+[[8648]],
+[[8649]],
+[[8650]],
+[[8651]],
+[[8652]],
+[[8653]],
+[[8654]],
+[[8655]],
+[[8656]],
+[[8657]],
+[[8658]],
+[[8659]],
+[[8660]],
+[[8661]],
+[[8662]],
+[[8663]],
+[[8664]],
+[[8665]],
+[[8666]],
+[[8667]],
+[[8668]],
+[[8669]],
+[[8670]],
+[[8671]],
+[[8672]],
+[[8673]],
+[[8674]],
+[[8675]],
+[[8676]],
+[[8677]],
+[[8678]],
+[[8679]],
+[[8680]],
+[[8681]],
+[[8682]],
+[[8683]],
+[[8684]],
+[[8685]],
+[[8686]],
+[[8687]],
+[[8688]],
+[[8689]],
+[[8690]],
+[[8691]],
+[[8692]],
+[[8693]],
+[[8694]],
+[[8695]],
+[[8696]],
+[[8697]],
+[[8698]],
+[[8699]],
+[[8700]],
+[[8701]],
+[[8702]],
+[[8703]],
+[[8704]],
+[[8705]],
+[[8706]],
+[[8707]],
+[[8708]],
+[[8709]],
+[[8710]],
+[[8711]],
+[[8712]],
+[[8713]],
+[[8714]],
+[[8715]],
+[[8716]],
+[[8717]],
+[[8718]],
+[[8719]],
+[[8720]],
+[[8721]],
+[[8722]],
+[[8723]],
+[[8724]],
+[[8725]],
+[[8726]],
+[[8727]],
+[[8728]],
+[[8729]],
+[[8730]],
+[[8731]],
+[[8732]],
+[[8733]],
+[[8734]],
+[[8735]],
+[[8736]],
+[[8737]],
+[[8738]],
+[[8739]],
+[[8740]],
+[[8741]],
+[[8742]],
+[[8743]],
+[[8744]],
+[[8745]],
+[[8746]],
+[[8747]],
+[[8748]],
+[[8749]],
+[[8750]],
+[[8751]],
+[[8752]],
+[[8753]],
+[[8754]],
+[[8755]],
+[[8756]],
+[[8757]],
+[[8758]],
+[[8759]],
+[[8760]],
+[[8761]],
+[[8762]],
+[[8763]],
+[[8764]],
+[[8765]],
+[[8766]],
+[[8767]],
+[[8768]],
+[[8769]],
+[[8770]],
+[[8771]],
+[[8772]],
+[[8773]],
+[[8774]],
+[[8775]],
+[[8776]],
+[[8777]],
+[[8778]],
+[[8779]],
+[[8780]],
+[[8781]],
+[[8782]],
+[[8783]],
+[[8784]],
+[[8785]],
+[[8786]],
+[[8787]],
+[[8788]],
+[[8789]],
+[[8790]],
+[[8791]],
+[[8792]],
+[[8793]],
+[[8794]],
+[[8795]],
+[[8796]],
+[[8797]],
+[[8798]],
+[[8799]],
+[[8800]],
+[[8801]],
+[[8802]],
+[[8803]],
+[[8804]],
+[[8805]],
+[[8806]],
+[[8807]],
+[[8808]],
+[[8809]],
+[[8810]],
+[[8811]],
+[[8812]],
+[[8813]],
+[[8814]],
+[[8815]],
+[[8816]],
+[[8817]],
+[[8818]],
+[[8819]],
+[[8820]],
+[[8821]],
+[[8822]],
+[[8823]],
+[[8824]],
+[[8825]],
+[[8826]],
+[[8827]],
+[[8828]],
+[[8829]],
+[[8830]],
+[[8831]],
+[[8832]],
+[[8833]],
+[[8834]],
+[[8835]],
+[[8836]],
+[[8837]],
+[[8838]],
+[[8839]],
+[[8840]],
+[[8841]],
+[[8842]],
+[[8843]],
+[[8844]],
+[[8845]],
+[[8846]],
+[[8847]],
+[[8848]],
+[[8849]],
+[[8850]],
+[[8851]],
+[[8852]],
+[[8853]],
+[[8854]],
+[[8855]],
+[[8856]],
+[[8857]],
+[[8858]],
+[[8859]],
+[[8860]],
+[[8861]],
+[[8862]],
+[[8863]],
+[[8864]],
+[[8865]],
+[[8866]],
+[[8867]],
+[[8868]],
+[[8869]],
+[[8870]],
+[[8871]],
+[[8872]],
+[[8873]],
+[[8874]],
+[[8875]],
+[[8876]],
+[[8877]],
+[[8878]],
+[[8879]],
+[[8880]],
+[[8881]],
+[[8882]],
+[[8883]],
+[[8884]],
+[[8885]],
+[[8886]],
+[[8887]],
+[[8888]],
+[[8889]],
+[[8890]],
+[[8891]],
+[[8892]],
+[[8893]],
+[[8894]],
+[[8895]],
+[[8896]],
+[[8897]],
+[[8898]],
+[[8899]],
+[[8900]],
+[[8901]],
+[[8902]],
+[[8903]],
+[[8904]],
+[[8905]],
+[[8906]],
+[[8907]],
+[[8908]],
+[[8909]],
+[[8910]],
+[[8911]],
+[[8912]],
+[[8913]],
+[[8914]],
+[[8915]],
+[[8916]],
+[[8917]],
+[[8918]],
+[[8919]],
+[[8920]],
+[[8921]],
+[[8922]],
+[[8923]],
+[[8924]],
+[[8925]],
+[[8926]],
+[[8927]],
+[[8928]],
+[[8929]],
+[[8930]],
+[[8931]],
+[[8932]],
+[[8933]],
+[[8934]],
+[[8935]],
+[[8936]],
+[[8937]],
+[[8938]],
+[[8939]],
+[[8940]],
+[[8941]],
+[[8942]],
+[[8943]],
+[[8944]],
+[[8945]],
+[[8946]],
+[[8947]],
+[[8948]],
+[[8949]],
+[[8950]],
+[[8951]],
+[[8952]],
+[[8953]],
+[[8954]],
+[[8955]],
+[[8956]],
+[[8957]],
+[[8958]],
+[[8959]],
+[[8960]],
+[[8961]],
+[[8962]],
+[[8963]],
+[[8964]],
+[[8965]],
+[[8966]],
+[[8967]],
+[[8968]],
+[[8969]],
+[[8970]],
+[[8971]],
+[[8972]],
+[[8973]],
+[[8974]],
+[[8975]],
+[[8976]],
+[[8977]],
+[[8978]],
+[[8979]],
+[[8980]],
+[[8981]],
+[[8982]],
+[[8983]],
+[[8984]],
+[[8985]],
+[[8986]],
+[[8987]],
+[[8988]],
+[[8989]],
+[[8990]],
+[[8991]],
+[[8992]],
+[[8993]],
+[[8994]],
+[[8995]],
+[[8996]],
+[[8997]],
+[[8998]],
+[[8999]],
+[[9000]],
+[[9001]],
+[[9002]],
+[[9003]],
+[[9004]],
+[[9005]],
+[[9006]],
+[[9007]],
+[[9008]],
+[[9009]],
+[[9010]],
+[[9011]],
+[[9012]],
+[[9013]],
+[[9014]],
+[[9015]],
+[[9016]],
+[[9017]],
+[[9018]],
+[[9019]],
+[[9020]],
+[[9021]],
+[[9022]],
+[[9023]],
+[[9024]],
+[[9025]],
+[[9026]],
+[[9027]],
+[[9028]],
+[[9029]],
+[[9030]],
+[[9031]],
+[[9032]],
+[[9033]],
+[[9034]],
+[[9035]],
+[[9036]],
+[[9037]],
+[[9038]],
+[[9039]],
+[[9040]],
+[[9041]],
+[[9042]],
+[[9043]],
+[[9044]],
+[[9045]],
+[[9046]],
+[[9047]],
+[[9048]],
+[[9049]],
+[[9050]],
+[[9051]],
+[[9052]],
+[[9053]],
+[[9054]],
+[[9055]],
+[[9056]],
+[[9057]],
+[[9058]],
+[[9059]],
+[[9060]],
+[[9061]],
+[[9062]],
+[[9063]],
+[[9064]],
+[[9065]],
+[[9066]],
+[[9067]],
+[[9068]],
+[[9069]],
+[[9070]],
+[[9071]],
+[[9072]],
+[[9073]],
+[[9074]],
+[[9075]],
+[[9076]],
+[[9077]],
+[[9078]],
+[[9079]],
+[[9080]],
+[[9081]],
+[[9082]],
+[[9083]],
+[[9084]],
+[[9085]],
+[[9086]],
+[[9087]],
+[[9088]],
+[[9089]],
+[[9090]],
+[[9091]],
+[[9092]],
+[[9093]],
+[[9094]],
+[[9095]],
+[[9096]],
+[[9097]],
+[[9098]],
+[[9099]],
+[[9100]],
+[[9101]],
+[[9102]],
+[[9103]],
+[[9104]],
+[[9105]],
+[[9106]],
+[[9107]],
+[[9108]],
+[[9109]],
+[[9110]],
+[[9111]],
+[[9112]],
+[[9113]],
+[[9114]],
+[[9115]],
+[[9116]],
+[[9117]],
+[[9118]],
+[[9119]],
+[[9120]],
+[[9121]],
+[[9122]],
+[[9123]],
+[[9124]],
+[[9125]],
+[[9126]],
+[[9127]],
+[[9128]],
+[[9129]],
+[[9130]],
+[[9131]],
+[[9132]],
+[[9133]],
+[[9134]],
+[[9135]],
+[[9136]],
+[[9137]],
+[[9138]],
+[[9139]],
+[[9140]],
+[[9141]],
+[[9142]],
+[[9143]],
+[[9144]],
+[[9145]],
+[[9146]],
+[[9147]],
+[[9148]],
+[[9149]],
+[[9150]],
+[[9151]],
+[[9152]],
+[[9153]],
+[[9154]],
+[[9155]],
+[[9156]],
+[[9157]],
+[[9158]],
+[[9159]],
+[[9160]],
+[[9161]],
+[[9162]],
+[[9163]],
+[[9164]],
+[[9165]],
+[[9166]],
+[[9167]],
+[[9168]],
+[[9169]],
+[[9170]],
+[[9171]],
+[[9172]],
+[[9173]],
+[[9174]],
+[[9175]],
+[[9176]],
+[[9177]],
+[[9178]],
+[[9179]],
+[[9180]],
+[[9181]],
+[[9182]],
+[[9183]],
+[[9184]],
+[[9185]],
+[[9186]],
+[[9187]],
+[[9188]],
+[[9189]],
+[[9190]],
+[[9191]],
+[[9192]],
+[[9193]],
+[[9194]],
+[[9195]],
+[[9196]],
+[[9197]],
+[[9198]],
+[[9199]],
+[[9200]],
+[[9201]],
+[[9202]],
+[[9203]],
+[[9204]],
+[[9205]],
+[[9206]],
+[[9207]],
+[[9208]],
+[[9209]],
+[[9210]],
+[[9211]],
+[[9212]],
+[[9213]],
+[[9214]],
+[[9215]],
+[[9216]],
+[[9217]],
+[[9218]],
+[[9219]],
+[[9220]],
+[[9221]],
+[[9222]],
+[[9223]],
+[[9224]],
+[[9225]],
+[[9226]],
+[[9227]],
+[[9228]],
+[[9229]],
+[[9230]],
+[[9231]],
+[[9232]],
+[[9233]],
+[[9234]],
+[[9235]],
+[[9236]],
+[[9237]],
+[[9238]],
+[[9239]],
+[[9240]],
+[[9241]],
+[[9242]],
+[[9243]],
+[[9244]],
+[[9245]],
+[[9246]],
+[[9247]],
+[[9248]],
+[[9249]],
+[[9250]],
+[[9251]],
+[[9252]],
+[[9253]],
+[[9254]],
+[[9255]],
+[[9256]],
+[[9257]],
+[[9258]],
+[[9259]],
+[[9260]],
+[[9261]],
+[[9262]],
+[[9263]],
+[[9264]],
+[[9265]],
+[[9266]],
+[[9267]],
+[[9268]],
+[[9269]],
+[[9270]],
+[[9271]],
+[[9272]],
+[[9273]],
+[[9274]],
+[[9275]],
+[[9276]],
+[[9277]],
+[[9278]],
+[[9279]],
+[[9280]],
+[[9281]],
+[[9282]],
+[[9283]],
+[[9284]],
+[[9285]],
+[[9286]],
+[[9287]],
+[[9288]],
+[[9289]],
+[[9290]],
+[[9291]],
+[[9292]],
+[[9293]],
+[[9294]],
+[[9295]],
+[[9296]],
+[[9297]],
+[[9298]],
+[[9299]],
+[[9300]],
+[[9301]],
+[[9302]],
+[[9303]],
+[[9304]],
+[[9305]],
+[[9306]],
+[[9307]],
+[[9308]],
+[[9309]],
+[[9310]],
+[[9311]],
+[[9312]],
+[[9313]],
+[[9314]],
+[[9315]],
+[[9316]],
+[[9317]],
+[[9318]],
+[[9319]],
+[[9320]],
+[[9321]],
+[[9322]],
+[[9323]],
+[[9324]],
+[[9325]],
+[[9326]],
+[[9327]],
+[[9328]],
+[[9329]],
+[[9330]],
+[[9331]],
+[[9332]],
+[[9333]],
+[[9334]],
+[[9335]],
+[[9336]],
+[[9337]],
+[[9338]],
+[[9339]],
+[[9340]],
+[[9341]],
+[[9342]],
+[[9343]],
+[[9344]],
+[[9345]],
+[[9346]],
+[[9347]],
+[[9348]],
+[[9349]],
+[[9350]],
+[[9351]],
+[[9352]],
+[[9353]],
+[[9354]],
+[[9355]],
+[[9356]],
+[[9357]],
+[[9358]],
+[[9359]],
+[[9360]],
+[[9361]],
+[[9362]],
+[[9363]],
+[[9364]],
+[[9365]],
+[[9366]],
+[[9367]],
+[[9368]],
+[[9369]],
+[[9370]],
+[[9371]],
+[[9372]],
+[[9373]],
+[[9374]],
+[[9375]],
+[[9376]],
+[[9377]],
+[[9378]],
+[[9379]],
+[[9380]],
+[[9381]],
+[[9382]],
+[[9383]],
+[[9384]],
+[[9385]],
+[[9386]],
+[[9387]],
+[[9388]],
+[[9389]],
+[[9390]],
+[[9391]],
+[[9392]],
+[[9393]],
+[[9394]],
+[[9395]],
+[[9396]],
+[[9397]],
+[[9398]],
+[[9399]],
+[[9400]],
+[[9401]],
+[[9402]],
+[[9403]],
+[[9404]],
+[[9405]],
+[[9406]],
+[[9407]],
+[[9408]],
+[[9409]],
+[[9410]],
+[[9411]],
+[[9412]],
+[[9413]],
+[[9414]],
+[[9415]],
+[[9416]],
+[[9417]],
+[[9418]],
+[[9419]],
+[[9420]],
+[[9421]],
+[[9422]],
+[[9423]],
+[[9424]],
+[[9425]],
+[[9426]],
+[[9427]],
+[[9428]],
+[[9429]],
+[[9430]],
+[[9431]],
+[[9432]],
+[[9433]],
+[[9434]],
+[[9435]],
+[[9436]],
+[[9437]],
+[[9438]],
+[[9439]],
+[[9440]],
+[[9441]],
+[[9442]],
+[[9443]],
+[[9444]],
+[[9445]],
+[[9446]],
+[[9447]],
+[[9448]],
+[[9449]],
+[[9450]],
+[[9451]],
+[[9452]],
+[[9453]],
+[[9454]],
+[[9455]],
+[[9456]],
+[[9457]],
+[[9458]],
+[[9459]],
+[[9460]],
+[[9461]],
+[[9462]],
+[[9463]],
+[[9464]],
+[[9465]],
+[[9466]],
+[[9467]],
+[[9468]],
+[[9469]],
+[[9470]],
+[[9471]],
+[[9472]],
+[[9473]],
+[[9474]],
+[[9475]],
+[[9476]],
+[[9477]],
+[[9478]],
+[[9479]],
+[[9480]],
+[[9481]],
+[[9482]],
+[[9483]],
+[[9484]],
+[[9485]],
+[[9486]],
+[[9487]],
+[[9488]],
+[[9489]],
+[[9490]],
+[[9491]],
+[[9492]],
+[[9493]],
+[[9494]],
+[[9495]],
+[[9496]],
+[[9497]],
+[[9498]],
+[[9499]],
+[[9500]],
+[[9501]],
+[[9502]],
+[[9503]],
+[[9504]],
+[[9505]],
+[[9506]],
+[[9507]],
+[[9508]],
+[[9509]],
+[[9510]],
+[[9511]],
+[[9512]],
+[[9513]],
+[[9514]],
+[[9515]],
+[[9516]],
+[[9517]],
+[[9518]],
+[[9519]],
+[[9520]],
+[[9521]],
+[[9522]],
+[[9523]],
+[[9524]],
+[[9525]],
+[[9526]],
+[[9527]],
+[[9528]],
+[[9529]],
+[[9530]],
+[[9531]],
+[[9532]],
+[[9533]],
+[[9534]],
+[[9535]],
+[[9536]],
+[[9537]],
+[[9538]],
+[[9539]],
+[[9540]],
+[[9541]],
+[[9542]],
+[[9543]],
+[[9544]],
+[[9545]],
+[[9546]],
+[[9547]],
+[[9548]],
+[[9549]],
+[[9550]],
+[[9551]],
+[[9552]],
+[[9553]],
+[[9554]],
+[[9555]],
+[[9556]],
+[[9557]],
+[[9558]],
+[[9559]],
+[[9560]],
+[[9561]],
+[[9562]],
+[[9563]],
+[[9564]],
+[[9565]],
+[[9566]],
+[[9567]],
+[[9568]],
+[[9569]],
+[[9570]],
+[[9571]],
+[[9572]],
+[[9573]],
+[[9574]],
+[[9575]],
+[[9576]],
+[[9577]],
+[[9578]],
+[[9579]],
+[[9580]],
+[[9581]],
+[[9582]],
+[[9583]],
+[[9584]],
+[[9585]],
+[[9586]],
+[[9587]],
+[[9588]],
+[[9589]],
+[[9590]],
+[[9591]],
+[[9592]],
+[[9593]],
+[[9594]],
+[[9595]],
+[[9596]],
+[[9597]],
+[[9598]],
+[[9599]],
+[[9600]],
+[[9601]],
+[[9602]],
+[[9603]],
+[[9604]],
+[[9605]],
+[[9606]],
+[[9607]],
+[[9608]],
+[[9609]],
+[[9610]],
+[[9611]],
+[[9612]],
+[[9613]],
+[[9614]],
+[[9615]],
+[[9616]],
+[[9617]],
+[[9618]],
+[[9619]],
+[[9620]],
+[[9621]],
+[[9622]],
+[[9623]],
+[[9624]],
+[[9625]],
+[[9626]],
+[[9627]],
+[[9628]],
+[[9629]],
+[[9630]],
+[[9631]],
+[[9632]],
+[[9633]],
+[[9634]],
+[[9635]],
+[[9636]],
+[[9637]],
+[[9638]],
+[[9639]],
+[[9640]],
+[[9641]],
+[[9642]],
+[[9643]],
+[[9644]],
+[[9645]],
+[[9646]],
+[[9647]],
+[[9648]],
+[[9649]],
+[[9650]],
+[[9651]],
+[[9652]],
+[[9653]],
+[[9654]],
+[[9655]],
+[[9656]],
+[[9657]],
+[[9658]],
+[[9659]],
+[[9660]],
+[[9661]],
+[[9662]],
+[[9663]],
+[[9664]],
+[[9665]],
+[[9666]],
+[[9667]],
+[[9668]],
+[[9669]],
+[[9670]],
+[[9671]],
+[[9672]],
+[[9673]],
+[[9674]],
+[[9675]],
+[[9676]],
+[[9677]],
+[[9678]],
+[[9679]],
+[[9680]],
+[[9681]],
+[[9682]],
+[[9683]],
+[[9684]],
+[[9685]],
+[[9686]],
+[[9687]],
+[[9688]],
+[[9689]],
+[[9690]],
+[[9691]],
+[[9692]],
+[[9693]],
+[[9694]],
+[[9695]],
+[[9696]],
+[[9697]],
+[[9698]],
+[[9699]],
+[[9700]],
+[[9701]],
+[[9702]],
+[[9703]],
+[[9704]],
+[[9705]],
+[[9706]],
+[[9707]],
+[[9708]],
+[[9709]],
+[[9710]],
+[[9711]],
+[[9712]],
+[[9713]],
+[[9714]],
+[[9715]],
+[[9716]],
+[[9717]],
+[[9718]],
+[[9719]],
+[[9720]],
+[[9721]],
+[[9722]],
+[[9723]],
+[[9724]],
+[[9725]],
+[[9726]],
+[[9727]],
+[[9728]],
+[[9729]],
+[[9730]],
+[[9731]],
+[[9732]],
+[[9733]],
+[[9734]],
+[[9735]],
+[[9736]],
+[[9737]],
+[[9738]],
+[[9739]],
+[[9740]],
+[[9741]],
+[[9742]],
+[[9743]],
+[[9744]],
+[[9745]],
+[[9746]],
+[[9747]],
+[[9748]],
+[[9749]],
+[[9750]],
+[[9751]],
+[[9752]],
+[[9753]],
+[[9754]],
+[[9755]],
+[[9756]],
+[[9757]],
+[[9758]],
+[[9759]],
+[[9760]],
+[[9761]],
+[[9762]],
+[[9763]],
+[[9764]],
+[[9765]],
+[[9766]],
+[[9767]],
+[[9768]],
+[[9769]],
+[[9770]],
+[[9771]],
+[[9772]],
+[[9773]],
+[[9774]],
+[[9775]],
+[[9776]],
+[[9777]],
+[[9778]],
+[[9779]],
+[[9780]],
+[[9781]],
+[[9782]],
+[[9783]],
+[[9784]],
+[[9785]],
+[[9786]],
+[[9787]],
+[[9788]],
+[[9789]],
+[[9790]],
+[[9791]],
+[[9792]],
+[[9793]],
+[[9794]],
+[[9795]],
+[[9796]],
+[[9797]],
+[[9798]],
+[[9799]],
+[[9800]],
+[[9801]],
+[[9802]],
+[[9803]],
+[[9804]],
+[[9805]],
+[[9806]],
+[[9807]],
+[[9808]],
+[[9809]],
+[[9810]],
+[[9811]],
+[[9812]],
+[[9813]],
+[[9814]],
+[[9815]],
+[[9816]],
+[[9817]],
+[[9818]],
+[[9819]],
+[[9820]],
+[[9821]],
+[[9822]],
+[[9823]],
+[[9824]],
+[[9825]],
+[[9826]],
+[[9827]],
+[[9828]],
+[[9829]],
+[[9830]],
+[[9831]],
+[[9832]],
+[[9833]],
+[[9834]],
+[[9835]],
+[[9836]],
+[[9837]],
+[[9838]],
+[[9839]],
+[[9840]],
+[[9841]],
+[[9842]],
+[[9843]],
+[[9844]],
+[[9845]],
+[[9846]],
+[[9847]],
+[[9848]],
+[[9849]],
+[[9850]],
+[[9851]],
+[[9852]],
+[[9853]],
+[[9854]],
+[[9855]],
+[[9856]],
+[[9857]],
+[[9858]],
+[[9859]],
+[[9860]],
+[[9861]],
+[[9862]],
+[[9863]],
+[[9864]],
+[[9865]],
+[[9866]],
+[[9867]],
+[[9868]],
+[[9869]],
+[[9870]],
+[[9871]],
+[[9872]],
+[[9873]],
+[[9874]],
+[[9875]],
+[[9876]],
+[[9877]],
+[[9878]],
+[[9879]],
+[[9880]],
+[[9881]],
+[[9882]],
+[[9883]],
+[[9884]],
+[[9885]],
+[[9886]],
+[[9887]],
+[[9888]],
+[[9889]],
+[[9890]],
+[[9891]],
+[[9892]],
+[[9893]],
+[[9894]],
+[[9895]],
+[[9896]],
+[[9897]],
+[[9898]],
+[[9899]],
+[[9900]],
+[[9901]],
+[[9902]],
+[[9903]],
+[[9904]],
+[[9905]],
+[[9906]],
+[[9907]],
+[[9908]],
+[[9909]],
+[[9910]],
+[[9911]],
+[[9912]],
+[[9913]],
+[[9914]],
+[[9915]],
+[[9916]],
+[[9917]],
+[[9918]],
+[[9919]],
+[[9920]],
+[[9921]],
+[[9922]],
+[[9923]],
+[[9924]],
+[[9925]],
+[[9926]],
+[[9927]],
+[[9928]],
+[[9929]],
+[[9930]],
+[[9931]],
+[[9932]],
+[[9933]],
+[[9934]],
+[[9935]],
+[[9936]],
+[[9937]],
+[[9938]],
+[[9939]],
+[[9940]],
+[[9941]],
+[[9942]],
+[[9943]],
+[[9944]],
+[[9945]],
+[[9946]],
+[[9947]],
+[[9948]],
+[[9949]],
+[[9950]],
+[[9951]],
+[[9952]],
+[[9953]],
+[[9954]],
+[[9955]],
+[[9956]],
+[[9957]],
+[[9958]],
+[[9959]],
+[[9960]],
+[[9961]],
+[[9962]],
+[[9963]],
+[[9964]],
+[[9965]],
+[[9966]],
+[[9967]],
+[[9968]],
+[[9969]],
+[[9970]],
+[[9971]],
+[[9972]],
+[[9973]],
+[[9974]],
+[[9975]],
+[[9976]],
+[[9977]],
+[[9978]],
+[[9979]],
+[[9980]],
+[[9981]],
+[[9982]],
+[[9983]],
+[[9984]],
+[[9985]],
+[[9986]],
+[[9987]],
+[[9988]],
+[[9989]],
+[[9990]],
+[[9991]],
+[[9992]],
+[[9993]],
+[[9994]],
+[[9995]],
+[[9996]],
+[[9997]],
+[[9998]],
+[[9999]],
+];
+
+// 10,000 elements.
+const list2 = [
+[[0]],
+[[1]],
+[[2]],
+[[3]],
+[[4]],
+[[5]],
+[[6]],
+[[7]],
+[[8]],
+[[9]],
+[[10]],
+[[11]],
+[[12]],
+[[13]],
+[[14]],
+[[15]],
+[[16]],
+[[17]],
+[[18]],
+[[19]],
+[[20]],
+[[21]],
+[[22]],
+[[23]],
+[[24]],
+[[25]],
+[[26]],
+[[27]],
+[[28]],
+[[29]],
+[[30]],
+[[31]],
+[[32]],
+[[33]],
+[[34]],
+[[35]],
+[[36]],
+[[37]],
+[[38]],
+[[39]],
+[[40]],
+[[41]],
+[[42]],
+[[43]],
+[[44]],
+[[45]],
+[[46]],
+[[47]],
+[[48]],
+[[49]],
+[[50]],
+[[51]],
+[[52]],
+[[53]],
+[[54]],
+[[55]],
+[[56]],
+[[57]],
+[[58]],
+[[59]],
+[[60]],
+[[61]],
+[[62]],
+[[63]],
+[[64]],
+[[65]],
+[[66]],
+[[67]],
+[[68]],
+[[69]],
+[[70]],
+[[71]],
+[[72]],
+[[73]],
+[[74]],
+[[75]],
+[[76]],
+[[77]],
+[[78]],
+[[79]],
+[[80]],
+[[81]],
+[[82]],
+[[83]],
+[[84]],
+[[85]],
+[[86]],
+[[87]],
+[[88]],
+[[89]],
+[[90]],
+[[91]],
+[[92]],
+[[93]],
+[[94]],
+[[95]],
+[[96]],
+[[97]],
+[[98]],
+[[99]],
+[[100]],
+[[101]],
+[[102]],
+[[103]],
+[[104]],
+[[105]],
+[[106]],
+[[107]],
+[[108]],
+[[109]],
+[[110]],
+[[111]],
+[[112]],
+[[113]],
+[[114]],
+[[115]],
+[[116]],
+[[117]],
+[[118]],
+[[119]],
+[[120]],
+[[121]],
+[[122]],
+[[123]],
+[[124]],
+[[125]],
+[[126]],
+[[127]],
+[[128]],
+[[129]],
+[[130]],
+[[131]],
+[[132]],
+[[133]],
+[[134]],
+[[135]],
+[[136]],
+[[137]],
+[[138]],
+[[139]],
+[[140]],
+[[141]],
+[[142]],
+[[143]],
+[[144]],
+[[145]],
+[[146]],
+[[147]],
+[[148]],
+[[149]],
+[[150]],
+[[151]],
+[[152]],
+[[153]],
+[[154]],
+[[155]],
+[[156]],
+[[157]],
+[[158]],
+[[159]],
+[[160]],
+[[161]],
+[[162]],
+[[163]],
+[[164]],
+[[165]],
+[[166]],
+[[167]],
+[[168]],
+[[169]],
+[[170]],
+[[171]],
+[[172]],
+[[173]],
+[[174]],
+[[175]],
+[[176]],
+[[177]],
+[[178]],
+[[179]],
+[[180]],
+[[181]],
+[[182]],
+[[183]],
+[[184]],
+[[185]],
+[[186]],
+[[187]],
+[[188]],
+[[189]],
+[[190]],
+[[191]],
+[[192]],
+[[193]],
+[[194]],
+[[195]],
+[[196]],
+[[197]],
+[[198]],
+[[199]],
+[[200]],
+[[201]],
+[[202]],
+[[203]],
+[[204]],
+[[205]],
+[[206]],
+[[207]],
+[[208]],
+[[209]],
+[[210]],
+[[211]],
+[[212]],
+[[213]],
+[[214]],
+[[215]],
+[[216]],
+[[217]],
+[[218]],
+[[219]],
+[[220]],
+[[221]],
+[[222]],
+[[223]],
+[[224]],
+[[225]],
+[[226]],
+[[227]],
+[[228]],
+[[229]],
+[[230]],
+[[231]],
+[[232]],
+[[233]],
+[[234]],
+[[235]],
+[[236]],
+[[237]],
+[[238]],
+[[239]],
+[[240]],
+[[241]],
+[[242]],
+[[243]],
+[[244]],
+[[245]],
+[[246]],
+[[247]],
+[[248]],
+[[249]],
+[[250]],
+[[251]],
+[[252]],
+[[253]],
+[[254]],
+[[255]],
+[[256]],
+[[257]],
+[[258]],
+[[259]],
+[[260]],
+[[261]],
+[[262]],
+[[263]],
+[[264]],
+[[265]],
+[[266]],
+[[267]],
+[[268]],
+[[269]],
+[[270]],
+[[271]],
+[[272]],
+[[273]],
+[[274]],
+[[275]],
+[[276]],
+[[277]],
+[[278]],
+[[279]],
+[[280]],
+[[281]],
+[[282]],
+[[283]],
+[[284]],
+[[285]],
+[[286]],
+[[287]],
+[[288]],
+[[289]],
+[[290]],
+[[291]],
+[[292]],
+[[293]],
+[[294]],
+[[295]],
+[[296]],
+[[297]],
+[[298]],
+[[299]],
+[[300]],
+[[301]],
+[[302]],
+[[303]],
+[[304]],
+[[305]],
+[[306]],
+[[307]],
+[[308]],
+[[309]],
+[[310]],
+[[311]],
+[[312]],
+[[313]],
+[[314]],
+[[315]],
+[[316]],
+[[317]],
+[[318]],
+[[319]],
+[[320]],
+[[321]],
+[[322]],
+[[323]],
+[[324]],
+[[325]],
+[[326]],
+[[327]],
+[[328]],
+[[329]],
+[[330]],
+[[331]],
+[[332]],
+[[333]],
+[[334]],
+[[335]],
+[[336]],
+[[337]],
+[[338]],
+[[339]],
+[[340]],
+[[341]],
+[[342]],
+[[343]],
+[[344]],
+[[345]],
+[[346]],
+[[347]],
+[[348]],
+[[349]],
+[[350]],
+[[351]],
+[[352]],
+[[353]],
+[[354]],
+[[355]],
+[[356]],
+[[357]],
+[[358]],
+[[359]],
+[[360]],
+[[361]],
+[[362]],
+[[363]],
+[[364]],
+[[365]],
+[[366]],
+[[367]],
+[[368]],
+[[369]],
+[[370]],
+[[371]],
+[[372]],
+[[373]],
+[[374]],
+[[375]],
+[[376]],
+[[377]],
+[[378]],
+[[379]],
+[[380]],
+[[381]],
+[[382]],
+[[383]],
+[[384]],
+[[385]],
+[[386]],
+[[387]],
+[[388]],
+[[389]],
+[[390]],
+[[391]],
+[[392]],
+[[393]],
+[[394]],
+[[395]],
+[[396]],
+[[397]],
+[[398]],
+[[399]],
+[[400]],
+[[401]],
+[[402]],
+[[403]],
+[[404]],
+[[405]],
+[[406]],
+[[407]],
+[[408]],
+[[409]],
+[[410]],
+[[411]],
+[[412]],
+[[413]],
+[[414]],
+[[415]],
+[[416]],
+[[417]],
+[[418]],
+[[419]],
+[[420]],
+[[421]],
+[[422]],
+[[423]],
+[[424]],
+[[425]],
+[[426]],
+[[427]],
+[[428]],
+[[429]],
+[[430]],
+[[431]],
+[[432]],
+[[433]],
+[[434]],
+[[435]],
+[[436]],
+[[437]],
+[[438]],
+[[439]],
+[[440]],
+[[441]],
+[[442]],
+[[443]],
+[[444]],
+[[445]],
+[[446]],
+[[447]],
+[[448]],
+[[449]],
+[[450]],
+[[451]],
+[[452]],
+[[453]],
+[[454]],
+[[455]],
+[[456]],
+[[457]],
+[[458]],
+[[459]],
+[[460]],
+[[461]],
+[[462]],
+[[463]],
+[[464]],
+[[465]],
+[[466]],
+[[467]],
+[[468]],
+[[469]],
+[[470]],
+[[471]],
+[[472]],
+[[473]],
+[[474]],
+[[475]],
+[[476]],
+[[477]],
+[[478]],
+[[479]],
+[[480]],
+[[481]],
+[[482]],
+[[483]],
+[[484]],
+[[485]],
+[[486]],
+[[487]],
+[[488]],
+[[489]],
+[[490]],
+[[491]],
+[[492]],
+[[493]],
+[[494]],
+[[495]],
+[[496]],
+[[497]],
+[[498]],
+[[499]],
+[[500]],
+[[501]],
+[[502]],
+[[503]],
+[[504]],
+[[505]],
+[[506]],
+[[507]],
+[[508]],
+[[509]],
+[[510]],
+[[511]],
+[[512]],
+[[513]],
+[[514]],
+[[515]],
+[[516]],
+[[517]],
+[[518]],
+[[519]],
+[[520]],
+[[521]],
+[[522]],
+[[523]],
+[[524]],
+[[525]],
+[[526]],
+[[527]],
+[[528]],
+[[529]],
+[[530]],
+[[531]],
+[[532]],
+[[533]],
+[[534]],
+[[535]],
+[[536]],
+[[537]],
+[[538]],
+[[539]],
+[[540]],
+[[541]],
+[[542]],
+[[543]],
+[[544]],
+[[545]],
+[[546]],
+[[547]],
+[[548]],
+[[549]],
+[[550]],
+[[551]],
+[[552]],
+[[553]],
+[[554]],
+[[555]],
+[[556]],
+[[557]],
+[[558]],
+[[559]],
+[[560]],
+[[561]],
+[[562]],
+[[563]],
+[[564]],
+[[565]],
+[[566]],
+[[567]],
+[[568]],
+[[569]],
+[[570]],
+[[571]],
+[[572]],
+[[573]],
+[[574]],
+[[575]],
+[[576]],
+[[577]],
+[[578]],
+[[579]],
+[[580]],
+[[581]],
+[[582]],
+[[583]],
+[[584]],
+[[585]],
+[[586]],
+[[587]],
+[[588]],
+[[589]],
+[[590]],
+[[591]],
+[[592]],
+[[593]],
+[[594]],
+[[595]],
+[[596]],
+[[597]],
+[[598]],
+[[599]],
+[[600]],
+[[601]],
+[[602]],
+[[603]],
+[[604]],
+[[605]],
+[[606]],
+[[607]],
+[[608]],
+[[609]],
+[[610]],
+[[611]],
+[[612]],
+[[613]],
+[[614]],
+[[615]],
+[[616]],
+[[617]],
+[[618]],
+[[619]],
+[[620]],
+[[621]],
+[[622]],
+[[623]],
+[[624]],
+[[625]],
+[[626]],
+[[627]],
+[[628]],
+[[629]],
+[[630]],
+[[631]],
+[[632]],
+[[633]],
+[[634]],
+[[635]],
+[[636]],
+[[637]],
+[[638]],
+[[639]],
+[[640]],
+[[641]],
+[[642]],
+[[643]],
+[[644]],
+[[645]],
+[[646]],
+[[647]],
+[[648]],
+[[649]],
+[[650]],
+[[651]],
+[[652]],
+[[653]],
+[[654]],
+[[655]],
+[[656]],
+[[657]],
+[[658]],
+[[659]],
+[[660]],
+[[661]],
+[[662]],
+[[663]],
+[[664]],
+[[665]],
+[[666]],
+[[667]],
+[[668]],
+[[669]],
+[[670]],
+[[671]],
+[[672]],
+[[673]],
+[[674]],
+[[675]],
+[[676]],
+[[677]],
+[[678]],
+[[679]],
+[[680]],
+[[681]],
+[[682]],
+[[683]],
+[[684]],
+[[685]],
+[[686]],
+[[687]],
+[[688]],
+[[689]],
+[[690]],
+[[691]],
+[[692]],
+[[693]],
+[[694]],
+[[695]],
+[[696]],
+[[697]],
+[[698]],
+[[699]],
+[[700]],
+[[701]],
+[[702]],
+[[703]],
+[[704]],
+[[705]],
+[[706]],
+[[707]],
+[[708]],
+[[709]],
+[[710]],
+[[711]],
+[[712]],
+[[713]],
+[[714]],
+[[715]],
+[[716]],
+[[717]],
+[[718]],
+[[719]],
+[[720]],
+[[721]],
+[[722]],
+[[723]],
+[[724]],
+[[725]],
+[[726]],
+[[727]],
+[[728]],
+[[729]],
+[[730]],
+[[731]],
+[[732]],
+[[733]],
+[[734]],
+[[735]],
+[[736]],
+[[737]],
+[[738]],
+[[739]],
+[[740]],
+[[741]],
+[[742]],
+[[743]],
+[[744]],
+[[745]],
+[[746]],
+[[747]],
+[[748]],
+[[749]],
+[[750]],
+[[751]],
+[[752]],
+[[753]],
+[[754]],
+[[755]],
+[[756]],
+[[757]],
+[[758]],
+[[759]],
+[[760]],
+[[761]],
+[[762]],
+[[763]],
+[[764]],
+[[765]],
+[[766]],
+[[767]],
+[[768]],
+[[769]],
+[[770]],
+[[771]],
+[[772]],
+[[773]],
+[[774]],
+[[775]],
+[[776]],
+[[777]],
+[[778]],
+[[779]],
+[[780]],
+[[781]],
+[[782]],
+[[783]],
+[[784]],
+[[785]],
+[[786]],
+[[787]],
+[[788]],
+[[789]],
+[[790]],
+[[791]],
+[[792]],
+[[793]],
+[[794]],
+[[795]],
+[[796]],
+[[797]],
+[[798]],
+[[799]],
+[[800]],
+[[801]],
+[[802]],
+[[803]],
+[[804]],
+[[805]],
+[[806]],
+[[807]],
+[[808]],
+[[809]],
+[[810]],
+[[811]],
+[[812]],
+[[813]],
+[[814]],
+[[815]],
+[[816]],
+[[817]],
+[[818]],
+[[819]],
+[[820]],
+[[821]],
+[[822]],
+[[823]],
+[[824]],
+[[825]],
+[[826]],
+[[827]],
+[[828]],
+[[829]],
+[[830]],
+[[831]],
+[[832]],
+[[833]],
+[[834]],
+[[835]],
+[[836]],
+[[837]],
+[[838]],
+[[839]],
+[[840]],
+[[841]],
+[[842]],
+[[843]],
+[[844]],
+[[845]],
+[[846]],
+[[847]],
+[[848]],
+[[849]],
+[[850]],
+[[851]],
+[[852]],
+[[853]],
+[[854]],
+[[855]],
+[[856]],
+[[857]],
+[[858]],
+[[859]],
+[[860]],
+[[861]],
+[[862]],
+[[863]],
+[[864]],
+[[865]],
+[[866]],
+[[867]],
+[[868]],
+[[869]],
+[[870]],
+[[871]],
+[[872]],
+[[873]],
+[[874]],
+[[875]],
+[[876]],
+[[877]],
+[[878]],
+[[879]],
+[[880]],
+[[881]],
+[[882]],
+[[883]],
+[[884]],
+[[885]],
+[[886]],
+[[887]],
+[[888]],
+[[889]],
+[[890]],
+[[891]],
+[[892]],
+[[893]],
+[[894]],
+[[895]],
+[[896]],
+[[897]],
+[[898]],
+[[899]],
+[[900]],
+[[901]],
+[[902]],
+[[903]],
+[[904]],
+[[905]],
+[[906]],
+[[907]],
+[[908]],
+[[909]],
+[[910]],
+[[911]],
+[[912]],
+[[913]],
+[[914]],
+[[915]],
+[[916]],
+[[917]],
+[[918]],
+[[919]],
+[[920]],
+[[921]],
+[[922]],
+[[923]],
+[[924]],
+[[925]],
+[[926]],
+[[927]],
+[[928]],
+[[929]],
+[[930]],
+[[931]],
+[[932]],
+[[933]],
+[[934]],
+[[935]],
+[[936]],
+[[937]],
+[[938]],
+[[939]],
+[[940]],
+[[941]],
+[[942]],
+[[943]],
+[[944]],
+[[945]],
+[[946]],
+[[947]],
+[[948]],
+[[949]],
+[[950]],
+[[951]],
+[[952]],
+[[953]],
+[[954]],
+[[955]],
+[[956]],
+[[957]],
+[[958]],
+[[959]],
+[[960]],
+[[961]],
+[[962]],
+[[963]],
+[[964]],
+[[965]],
+[[966]],
+[[967]],
+[[968]],
+[[969]],
+[[970]],
+[[971]],
+[[972]],
+[[973]],
+[[974]],
+[[975]],
+[[976]],
+[[977]],
+[[978]],
+[[979]],
+[[980]],
+[[981]],
+[[982]],
+[[983]],
+[[984]],
+[[985]],
+[[986]],
+[[987]],
+[[988]],
+[[989]],
+[[990]],
+[[991]],
+[[992]],
+[[993]],
+[[994]],
+[[995]],
+[[996]],
+[[997]],
+[[998]],
+[[999]],
+[[1000]],
+[[1001]],
+[[1002]],
+[[1003]],
+[[1004]],
+[[1005]],
+[[1006]],
+[[1007]],
+[[1008]],
+[[1009]],
+[[1010]],
+[[1011]],
+[[1012]],
+[[1013]],
+[[1014]],
+[[1015]],
+[[1016]],
+[[1017]],
+[[1018]],
+[[1019]],
+[[1020]],
+[[1021]],
+[[1022]],
+[[1023]],
+[[1024]],
+[[1025]],
+[[1026]],
+[[1027]],
+[[1028]],
+[[1029]],
+[[1030]],
+[[1031]],
+[[1032]],
+[[1033]],
+[[1034]],
+[[1035]],
+[[1036]],
+[[1037]],
+[[1038]],
+[[1039]],
+[[1040]],
+[[1041]],
+[[1042]],
+[[1043]],
+[[1044]],
+[[1045]],
+[[1046]],
+[[1047]],
+[[1048]],
+[[1049]],
+[[1050]],
+[[1051]],
+[[1052]],
+[[1053]],
+[[1054]],
+[[1055]],
+[[1056]],
+[[1057]],
+[[1058]],
+[[1059]],
+[[1060]],
+[[1061]],
+[[1062]],
+[[1063]],
+[[1064]],
+[[1065]],
+[[1066]],
+[[1067]],
+[[1068]],
+[[1069]],
+[[1070]],
+[[1071]],
+[[1072]],
+[[1073]],
+[[1074]],
+[[1075]],
+[[1076]],
+[[1077]],
+[[1078]],
+[[1079]],
+[[1080]],
+[[1081]],
+[[1082]],
+[[1083]],
+[[1084]],
+[[1085]],
+[[1086]],
+[[1087]],
+[[1088]],
+[[1089]],
+[[1090]],
+[[1091]],
+[[1092]],
+[[1093]],
+[[1094]],
+[[1095]],
+[[1096]],
+[[1097]],
+[[1098]],
+[[1099]],
+[[1100]],
+[[1101]],
+[[1102]],
+[[1103]],
+[[1104]],
+[[1105]],
+[[1106]],
+[[1107]],
+[[1108]],
+[[1109]],
+[[1110]],
+[[1111]],
+[[1112]],
+[[1113]],
+[[1114]],
+[[1115]],
+[[1116]],
+[[1117]],
+[[1118]],
+[[1119]],
+[[1120]],
+[[1121]],
+[[1122]],
+[[1123]],
+[[1124]],
+[[1125]],
+[[1126]],
+[[1127]],
+[[1128]],
+[[1129]],
+[[1130]],
+[[1131]],
+[[1132]],
+[[1133]],
+[[1134]],
+[[1135]],
+[[1136]],
+[[1137]],
+[[1138]],
+[[1139]],
+[[1140]],
+[[1141]],
+[[1142]],
+[[1143]],
+[[1144]],
+[[1145]],
+[[1146]],
+[[1147]],
+[[1148]],
+[[1149]],
+[[1150]],
+[[1151]],
+[[1152]],
+[[1153]],
+[[1154]],
+[[1155]],
+[[1156]],
+[[1157]],
+[[1158]],
+[[1159]],
+[[1160]],
+[[1161]],
+[[1162]],
+[[1163]],
+[[1164]],
+[[1165]],
+[[1166]],
+[[1167]],
+[[1168]],
+[[1169]],
+[[1170]],
+[[1171]],
+[[1172]],
+[[1173]],
+[[1174]],
+[[1175]],
+[[1176]],
+[[1177]],
+[[1178]],
+[[1179]],
+[[1180]],
+[[1181]],
+[[1182]],
+[[1183]],
+[[1184]],
+[[1185]],
+[[1186]],
+[[1187]],
+[[1188]],
+[[1189]],
+[[1190]],
+[[1191]],
+[[1192]],
+[[1193]],
+[[1194]],
+[[1195]],
+[[1196]],
+[[1197]],
+[[1198]],
+[[1199]],
+[[1200]],
+[[1201]],
+[[1202]],
+[[1203]],
+[[1204]],
+[[1205]],
+[[1206]],
+[[1207]],
+[[1208]],
+[[1209]],
+[[1210]],
+[[1211]],
+[[1212]],
+[[1213]],
+[[1214]],
+[[1215]],
+[[1216]],
+[[1217]],
+[[1218]],
+[[1219]],
+[[1220]],
+[[1221]],
+[[1222]],
+[[1223]],
+[[1224]],
+[[1225]],
+[[1226]],
+[[1227]],
+[[1228]],
+[[1229]],
+[[1230]],
+[[1231]],
+[[1232]],
+[[1233]],
+[[1234]],
+[[1235]],
+[[1236]],
+[[1237]],
+[[1238]],
+[[1239]],
+[[1240]],
+[[1241]],
+[[1242]],
+[[1243]],
+[[1244]],
+[[1245]],
+[[1246]],
+[[1247]],
+[[1248]],
+[[1249]],
+[[1250]],
+[[1251]],
+[[1252]],
+[[1253]],
+[[1254]],
+[[1255]],
+[[1256]],
+[[1257]],
+[[1258]],
+[[1259]],
+[[1260]],
+[[1261]],
+[[1262]],
+[[1263]],
+[[1264]],
+[[1265]],
+[[1266]],
+[[1267]],
+[[1268]],
+[[1269]],
+[[1270]],
+[[1271]],
+[[1272]],
+[[1273]],
+[[1274]],
+[[1275]],
+[[1276]],
+[[1277]],
+[[1278]],
+[[1279]],
+[[1280]],
+[[1281]],
+[[1282]],
+[[1283]],
+[[1284]],
+[[1285]],
+[[1286]],
+[[1287]],
+[[1288]],
+[[1289]],
+[[1290]],
+[[1291]],
+[[1292]],
+[[1293]],
+[[1294]],
+[[1295]],
+[[1296]],
+[[1297]],
+[[1298]],
+[[1299]],
+[[1300]],
+[[1301]],
+[[1302]],
+[[1303]],
+[[1304]],
+[[1305]],
+[[1306]],
+[[1307]],
+[[1308]],
+[[1309]],
+[[1310]],
+[[1311]],
+[[1312]],
+[[1313]],
+[[1314]],
+[[1315]],
+[[1316]],
+[[1317]],
+[[1318]],
+[[1319]],
+[[1320]],
+[[1321]],
+[[1322]],
+[[1323]],
+[[1324]],
+[[1325]],
+[[1326]],
+[[1327]],
+[[1328]],
+[[1329]],
+[[1330]],
+[[1331]],
+[[1332]],
+[[1333]],
+[[1334]],
+[[1335]],
+[[1336]],
+[[1337]],
+[[1338]],
+[[1339]],
+[[1340]],
+[[1341]],
+[[1342]],
+[[1343]],
+[[1344]],
+[[1345]],
+[[1346]],
+[[1347]],
+[[1348]],
+[[1349]],
+[[1350]],
+[[1351]],
+[[1352]],
+[[1353]],
+[[1354]],
+[[1355]],
+[[1356]],
+[[1357]],
+[[1358]],
+[[1359]],
+[[1360]],
+[[1361]],
+[[1362]],
+[[1363]],
+[[1364]],
+[[1365]],
+[[1366]],
+[[1367]],
+[[1368]],
+[[1369]],
+[[1370]],
+[[1371]],
+[[1372]],
+[[1373]],
+[[1374]],
+[[1375]],
+[[1376]],
+[[1377]],
+[[1378]],
+[[1379]],
+[[1380]],
+[[1381]],
+[[1382]],
+[[1383]],
+[[1384]],
+[[1385]],
+[[1386]],
+[[1387]],
+[[1388]],
+[[1389]],
+[[1390]],
+[[1391]],
+[[1392]],
+[[1393]],
+[[1394]],
+[[1395]],
+[[1396]],
+[[1397]],
+[[1398]],
+[[1399]],
+[[1400]],
+[[1401]],
+[[1402]],
+[[1403]],
+[[1404]],
+[[1405]],
+[[1406]],
+[[1407]],
+[[1408]],
+[[1409]],
+[[1410]],
+[[1411]],
+[[1412]],
+[[1413]],
+[[1414]],
+[[1415]],
+[[1416]],
+[[1417]],
+[[1418]],
+[[1419]],
+[[1420]],
+[[1421]],
+[[1422]],
+[[1423]],
+[[1424]],
+[[1425]],
+[[1426]],
+[[1427]],
+[[1428]],
+[[1429]],
+[[1430]],
+[[1431]],
+[[1432]],
+[[1433]],
+[[1434]],
+[[1435]],
+[[1436]],
+[[1437]],
+[[1438]],
+[[1439]],
+[[1440]],
+[[1441]],
+[[1442]],
+[[1443]],
+[[1444]],
+[[1445]],
+[[1446]],
+[[1447]],
+[[1448]],
+[[1449]],
+[[1450]],
+[[1451]],
+[[1452]],
+[[1453]],
+[[1454]],
+[[1455]],
+[[1456]],
+[[1457]],
+[[1458]],
+[[1459]],
+[[1460]],
+[[1461]],
+[[1462]],
+[[1463]],
+[[1464]],
+[[1465]],
+[[1466]],
+[[1467]],
+[[1468]],
+[[1469]],
+[[1470]],
+[[1471]],
+[[1472]],
+[[1473]],
+[[1474]],
+[[1475]],
+[[1476]],
+[[1477]],
+[[1478]],
+[[1479]],
+[[1480]],
+[[1481]],
+[[1482]],
+[[1483]],
+[[1484]],
+[[1485]],
+[[1486]],
+[[1487]],
+[[1488]],
+[[1489]],
+[[1490]],
+[[1491]],
+[[1492]],
+[[1493]],
+[[1494]],
+[[1495]],
+[[1496]],
+[[1497]],
+[[1498]],
+[[1499]],
+[[1500]],
+[[1501]],
+[[1502]],
+[[1503]],
+[[1504]],
+[[1505]],
+[[1506]],
+[[1507]],
+[[1508]],
+[[1509]],
+[[1510]],
+[[1511]],
+[[1512]],
+[[1513]],
+[[1514]],
+[[1515]],
+[[1516]],
+[[1517]],
+[[1518]],
+[[1519]],
+[[1520]],
+[[1521]],
+[[1522]],
+[[1523]],
+[[1524]],
+[[1525]],
+[[1526]],
+[[1527]],
+[[1528]],
+[[1529]],
+[[1530]],
+[[1531]],
+[[1532]],
+[[1533]],
+[[1534]],
+[[1535]],
+[[1536]],
+[[1537]],
+[[1538]],
+[[1539]],
+[[1540]],
+[[1541]],
+[[1542]],
+[[1543]],
+[[1544]],
+[[1545]],
+[[1546]],
+[[1547]],
+[[1548]],
+[[1549]],
+[[1550]],
+[[1551]],
+[[1552]],
+[[1553]],
+[[1554]],
+[[1555]],
+[[1556]],
+[[1557]],
+[[1558]],
+[[1559]],
+[[1560]],
+[[1561]],
+[[1562]],
+[[1563]],
+[[1564]],
+[[1565]],
+[[1566]],
+[[1567]],
+[[1568]],
+[[1569]],
+[[1570]],
+[[1571]],
+[[1572]],
+[[1573]],
+[[1574]],
+[[1575]],
+[[1576]],
+[[1577]],
+[[1578]],
+[[1579]],
+[[1580]],
+[[1581]],
+[[1582]],
+[[1583]],
+[[1584]],
+[[1585]],
+[[1586]],
+[[1587]],
+[[1588]],
+[[1589]],
+[[1590]],
+[[1591]],
+[[1592]],
+[[1593]],
+[[1594]],
+[[1595]],
+[[1596]],
+[[1597]],
+[[1598]],
+[[1599]],
+[[1600]],
+[[1601]],
+[[1602]],
+[[1603]],
+[[1604]],
+[[1605]],
+[[1606]],
+[[1607]],
+[[1608]],
+[[1609]],
+[[1610]],
+[[1611]],
+[[1612]],
+[[1613]],
+[[1614]],
+[[1615]],
+[[1616]],
+[[1617]],
+[[1618]],
+[[1619]],
+[[1620]],
+[[1621]],
+[[1622]],
+[[1623]],
+[[1624]],
+[[1625]],
+[[1626]],
+[[1627]],
+[[1628]],
+[[1629]],
+[[1630]],
+[[1631]],
+[[1632]],
+[[1633]],
+[[1634]],
+[[1635]],
+[[1636]],
+[[1637]],
+[[1638]],
+[[1639]],
+[[1640]],
+[[1641]],
+[[1642]],
+[[1643]],
+[[1644]],
+[[1645]],
+[[1646]],
+[[1647]],
+[[1648]],
+[[1649]],
+[[1650]],
+[[1651]],
+[[1652]],
+[[1653]],
+[[1654]],
+[[1655]],
+[[1656]],
+[[1657]],
+[[1658]],
+[[1659]],
+[[1660]],
+[[1661]],
+[[1662]],
+[[1663]],
+[[1664]],
+[[1665]],
+[[1666]],
+[[1667]],
+[[1668]],
+[[1669]],
+[[1670]],
+[[1671]],
+[[1672]],
+[[1673]],
+[[1674]],
+[[1675]],
+[[1676]],
+[[1677]],
+[[1678]],
+[[1679]],
+[[1680]],
+[[1681]],
+[[1682]],
+[[1683]],
+[[1684]],
+[[1685]],
+[[1686]],
+[[1687]],
+[[1688]],
+[[1689]],
+[[1690]],
+[[1691]],
+[[1692]],
+[[1693]],
+[[1694]],
+[[1695]],
+[[1696]],
+[[1697]],
+[[1698]],
+[[1699]],
+[[1700]],
+[[1701]],
+[[1702]],
+[[1703]],
+[[1704]],
+[[1705]],
+[[1706]],
+[[1707]],
+[[1708]],
+[[1709]],
+[[1710]],
+[[1711]],
+[[1712]],
+[[1713]],
+[[1714]],
+[[1715]],
+[[1716]],
+[[1717]],
+[[1718]],
+[[1719]],
+[[1720]],
+[[1721]],
+[[1722]],
+[[1723]],
+[[1724]],
+[[1725]],
+[[1726]],
+[[1727]],
+[[1728]],
+[[1729]],
+[[1730]],
+[[1731]],
+[[1732]],
+[[1733]],
+[[1734]],
+[[1735]],
+[[1736]],
+[[1737]],
+[[1738]],
+[[1739]],
+[[1740]],
+[[1741]],
+[[1742]],
+[[1743]],
+[[1744]],
+[[1745]],
+[[1746]],
+[[1747]],
+[[1748]],
+[[1749]],
+[[1750]],
+[[1751]],
+[[1752]],
+[[1753]],
+[[1754]],
+[[1755]],
+[[1756]],
+[[1757]],
+[[1758]],
+[[1759]],
+[[1760]],
+[[1761]],
+[[1762]],
+[[1763]],
+[[1764]],
+[[1765]],
+[[1766]],
+[[1767]],
+[[1768]],
+[[1769]],
+[[1770]],
+[[1771]],
+[[1772]],
+[[1773]],
+[[1774]],
+[[1775]],
+[[1776]],
+[[1777]],
+[[1778]],
+[[1779]],
+[[1780]],
+[[1781]],
+[[1782]],
+[[1783]],
+[[1784]],
+[[1785]],
+[[1786]],
+[[1787]],
+[[1788]],
+[[1789]],
+[[1790]],
+[[1791]],
+[[1792]],
+[[1793]],
+[[1794]],
+[[1795]],
+[[1796]],
+[[1797]],
+[[1798]],
+[[1799]],
+[[1800]],
+[[1801]],
+[[1802]],
+[[1803]],
+[[1804]],
+[[1805]],
+[[1806]],
+[[1807]],
+[[1808]],
+[[1809]],
+[[1810]],
+[[1811]],
+[[1812]],
+[[1813]],
+[[1814]],
+[[1815]],
+[[1816]],
+[[1817]],
+[[1818]],
+[[1819]],
+[[1820]],
+[[1821]],
+[[1822]],
+[[1823]],
+[[1824]],
+[[1825]],
+[[1826]],
+[[1827]],
+[[1828]],
+[[1829]],
+[[1830]],
+[[1831]],
+[[1832]],
+[[1833]],
+[[1834]],
+[[1835]],
+[[1836]],
+[[1837]],
+[[1838]],
+[[1839]],
+[[1840]],
+[[1841]],
+[[1842]],
+[[1843]],
+[[1844]],
+[[1845]],
+[[1846]],
+[[1847]],
+[[1848]],
+[[1849]],
+[[1850]],
+[[1851]],
+[[1852]],
+[[1853]],
+[[1854]],
+[[1855]],
+[[1856]],
+[[1857]],
+[[1858]],
+[[1859]],
+[[1860]],
+[[1861]],
+[[1862]],
+[[1863]],
+[[1864]],
+[[1865]],
+[[1866]],
+[[1867]],
+[[1868]],
+[[1869]],
+[[1870]],
+[[1871]],
+[[1872]],
+[[1873]],
+[[1874]],
+[[1875]],
+[[1876]],
+[[1877]],
+[[1878]],
+[[1879]],
+[[1880]],
+[[1881]],
+[[1882]],
+[[1883]],
+[[1884]],
+[[1885]],
+[[1886]],
+[[1887]],
+[[1888]],
+[[1889]],
+[[1890]],
+[[1891]],
+[[1892]],
+[[1893]],
+[[1894]],
+[[1895]],
+[[1896]],
+[[1897]],
+[[1898]],
+[[1899]],
+[[1900]],
+[[1901]],
+[[1902]],
+[[1903]],
+[[1904]],
+[[1905]],
+[[1906]],
+[[1907]],
+[[1908]],
+[[1909]],
+[[1910]],
+[[1911]],
+[[1912]],
+[[1913]],
+[[1914]],
+[[1915]],
+[[1916]],
+[[1917]],
+[[1918]],
+[[1919]],
+[[1920]],
+[[1921]],
+[[1922]],
+[[1923]],
+[[1924]],
+[[1925]],
+[[1926]],
+[[1927]],
+[[1928]],
+[[1929]],
+[[1930]],
+[[1931]],
+[[1932]],
+[[1933]],
+[[1934]],
+[[1935]],
+[[1936]],
+[[1937]],
+[[1938]],
+[[1939]],
+[[1940]],
+[[1941]],
+[[1942]],
+[[1943]],
+[[1944]],
+[[1945]],
+[[1946]],
+[[1947]],
+[[1948]],
+[[1949]],
+[[1950]],
+[[1951]],
+[[1952]],
+[[1953]],
+[[1954]],
+[[1955]],
+[[1956]],
+[[1957]],
+[[1958]],
+[[1959]],
+[[1960]],
+[[1961]],
+[[1962]],
+[[1963]],
+[[1964]],
+[[1965]],
+[[1966]],
+[[1967]],
+[[1968]],
+[[1969]],
+[[1970]],
+[[1971]],
+[[1972]],
+[[1973]],
+[[1974]],
+[[1975]],
+[[1976]],
+[[1977]],
+[[1978]],
+[[1979]],
+[[1980]],
+[[1981]],
+[[1982]],
+[[1983]],
+[[1984]],
+[[1985]],
+[[1986]],
+[[1987]],
+[[1988]],
+[[1989]],
+[[1990]],
+[[1991]],
+[[1992]],
+[[1993]],
+[[1994]],
+[[1995]],
+[[1996]],
+[[1997]],
+[[1998]],
+[[1999]],
+[[2000]],
+[[2001]],
+[[2002]],
+[[2003]],
+[[2004]],
+[[2005]],
+[[2006]],
+[[2007]],
+[[2008]],
+[[2009]],
+[[2010]],
+[[2011]],
+[[2012]],
+[[2013]],
+[[2014]],
+[[2015]],
+[[2016]],
+[[2017]],
+[[2018]],
+[[2019]],
+[[2020]],
+[[2021]],
+[[2022]],
+[[2023]],
+[[2024]],
+[[2025]],
+[[2026]],
+[[2027]],
+[[2028]],
+[[2029]],
+[[2030]],
+[[2031]],
+[[2032]],
+[[2033]],
+[[2034]],
+[[2035]],
+[[2036]],
+[[2037]],
+[[2038]],
+[[2039]],
+[[2040]],
+[[2041]],
+[[2042]],
+[[2043]],
+[[2044]],
+[[2045]],
+[[2046]],
+[[2047]],
+[[2048]],
+[[2049]],
+[[2050]],
+[[2051]],
+[[2052]],
+[[2053]],
+[[2054]],
+[[2055]],
+[[2056]],
+[[2057]],
+[[2058]],
+[[2059]],
+[[2060]],
+[[2061]],
+[[2062]],
+[[2063]],
+[[2064]],
+[[2065]],
+[[2066]],
+[[2067]],
+[[2068]],
+[[2069]],
+[[2070]],
+[[2071]],
+[[2072]],
+[[2073]],
+[[2074]],
+[[2075]],
+[[2076]],
+[[2077]],
+[[2078]],
+[[2079]],
+[[2080]],
+[[2081]],
+[[2082]],
+[[2083]],
+[[2084]],
+[[2085]],
+[[2086]],
+[[2087]],
+[[2088]],
+[[2089]],
+[[2090]],
+[[2091]],
+[[2092]],
+[[2093]],
+[[2094]],
+[[2095]],
+[[2096]],
+[[2097]],
+[[2098]],
+[[2099]],
+[[2100]],
+[[2101]],
+[[2102]],
+[[2103]],
+[[2104]],
+[[2105]],
+[[2106]],
+[[2107]],
+[[2108]],
+[[2109]],
+[[2110]],
+[[2111]],
+[[2112]],
+[[2113]],
+[[2114]],
+[[2115]],
+[[2116]],
+[[2117]],
+[[2118]],
+[[2119]],
+[[2120]],
+[[2121]],
+[[2122]],
+[[2123]],
+[[2124]],
+[[2125]],
+[[2126]],
+[[2127]],
+[[2128]],
+[[2129]],
+[[2130]],
+[[2131]],
+[[2132]],
+[[2133]],
+[[2134]],
+[[2135]],
+[[2136]],
+[[2137]],
+[[2138]],
+[[2139]],
+[[2140]],
+[[2141]],
+[[2142]],
+[[2143]],
+[[2144]],
+[[2145]],
+[[2146]],
+[[2147]],
+[[2148]],
+[[2149]],
+[[2150]],
+[[2151]],
+[[2152]],
+[[2153]],
+[[2154]],
+[[2155]],
+[[2156]],
+[[2157]],
+[[2158]],
+[[2159]],
+[[2160]],
+[[2161]],
+[[2162]],
+[[2163]],
+[[2164]],
+[[2165]],
+[[2166]],
+[[2167]],
+[[2168]],
+[[2169]],
+[[2170]],
+[[2171]],
+[[2172]],
+[[2173]],
+[[2174]],
+[[2175]],
+[[2176]],
+[[2177]],
+[[2178]],
+[[2179]],
+[[2180]],
+[[2181]],
+[[2182]],
+[[2183]],
+[[2184]],
+[[2185]],
+[[2186]],
+[[2187]],
+[[2188]],
+[[2189]],
+[[2190]],
+[[2191]],
+[[2192]],
+[[2193]],
+[[2194]],
+[[2195]],
+[[2196]],
+[[2197]],
+[[2198]],
+[[2199]],
+[[2200]],
+[[2201]],
+[[2202]],
+[[2203]],
+[[2204]],
+[[2205]],
+[[2206]],
+[[2207]],
+[[2208]],
+[[2209]],
+[[2210]],
+[[2211]],
+[[2212]],
+[[2213]],
+[[2214]],
+[[2215]],
+[[2216]],
+[[2217]],
+[[2218]],
+[[2219]],
+[[2220]],
+[[2221]],
+[[2222]],
+[[2223]],
+[[2224]],
+[[2225]],
+[[2226]],
+[[2227]],
+[[2228]],
+[[2229]],
+[[2230]],
+[[2231]],
+[[2232]],
+[[2233]],
+[[2234]],
+[[2235]],
+[[2236]],
+[[2237]],
+[[2238]],
+[[2239]],
+[[2240]],
+[[2241]],
+[[2242]],
+[[2243]],
+[[2244]],
+[[2245]],
+[[2246]],
+[[2247]],
+[[2248]],
+[[2249]],
+[[2250]],
+[[2251]],
+[[2252]],
+[[2253]],
+[[2254]],
+[[2255]],
+[[2256]],
+[[2257]],
+[[2258]],
+[[2259]],
+[[2260]],
+[[2261]],
+[[2262]],
+[[2263]],
+[[2264]],
+[[2265]],
+[[2266]],
+[[2267]],
+[[2268]],
+[[2269]],
+[[2270]],
+[[2271]],
+[[2272]],
+[[2273]],
+[[2274]],
+[[2275]],
+[[2276]],
+[[2277]],
+[[2278]],
+[[2279]],
+[[2280]],
+[[2281]],
+[[2282]],
+[[2283]],
+[[2284]],
+[[2285]],
+[[2286]],
+[[2287]],
+[[2288]],
+[[2289]],
+[[2290]],
+[[2291]],
+[[2292]],
+[[2293]],
+[[2294]],
+[[2295]],
+[[2296]],
+[[2297]],
+[[2298]],
+[[2299]],
+[[2300]],
+[[2301]],
+[[2302]],
+[[2303]],
+[[2304]],
+[[2305]],
+[[2306]],
+[[2307]],
+[[2308]],
+[[2309]],
+[[2310]],
+[[2311]],
+[[2312]],
+[[2313]],
+[[2314]],
+[[2315]],
+[[2316]],
+[[2317]],
+[[2318]],
+[[2319]],
+[[2320]],
+[[2321]],
+[[2322]],
+[[2323]],
+[[2324]],
+[[2325]],
+[[2326]],
+[[2327]],
+[[2328]],
+[[2329]],
+[[2330]],
+[[2331]],
+[[2332]],
+[[2333]],
+[[2334]],
+[[2335]],
+[[2336]],
+[[2337]],
+[[2338]],
+[[2339]],
+[[2340]],
+[[2341]],
+[[2342]],
+[[2343]],
+[[2344]],
+[[2345]],
+[[2346]],
+[[2347]],
+[[2348]],
+[[2349]],
+[[2350]],
+[[2351]],
+[[2352]],
+[[2353]],
+[[2354]],
+[[2355]],
+[[2356]],
+[[2357]],
+[[2358]],
+[[2359]],
+[[2360]],
+[[2361]],
+[[2362]],
+[[2363]],
+[[2364]],
+[[2365]],
+[[2366]],
+[[2367]],
+[[2368]],
+[[2369]],
+[[2370]],
+[[2371]],
+[[2372]],
+[[2373]],
+[[2374]],
+[[2375]],
+[[2376]],
+[[2377]],
+[[2378]],
+[[2379]],
+[[2380]],
+[[2381]],
+[[2382]],
+[[2383]],
+[[2384]],
+[[2385]],
+[[2386]],
+[[2387]],
+[[2388]],
+[[2389]],
+[[2390]],
+[[2391]],
+[[2392]],
+[[2393]],
+[[2394]],
+[[2395]],
+[[2396]],
+[[2397]],
+[[2398]],
+[[2399]],
+[[2400]],
+[[2401]],
+[[2402]],
+[[2403]],
+[[2404]],
+[[2405]],
+[[2406]],
+[[2407]],
+[[2408]],
+[[2409]],
+[[2410]],
+[[2411]],
+[[2412]],
+[[2413]],
+[[2414]],
+[[2415]],
+[[2416]],
+[[2417]],
+[[2418]],
+[[2419]],
+[[2420]],
+[[2421]],
+[[2422]],
+[[2423]],
+[[2424]],
+[[2425]],
+[[2426]],
+[[2427]],
+[[2428]],
+[[2429]],
+[[2430]],
+[[2431]],
+[[2432]],
+[[2433]],
+[[2434]],
+[[2435]],
+[[2436]],
+[[2437]],
+[[2438]],
+[[2439]],
+[[2440]],
+[[2441]],
+[[2442]],
+[[2443]],
+[[2444]],
+[[2445]],
+[[2446]],
+[[2447]],
+[[2448]],
+[[2449]],
+[[2450]],
+[[2451]],
+[[2452]],
+[[2453]],
+[[2454]],
+[[2455]],
+[[2456]],
+[[2457]],
+[[2458]],
+[[2459]],
+[[2460]],
+[[2461]],
+[[2462]],
+[[2463]],
+[[2464]],
+[[2465]],
+[[2466]],
+[[2467]],
+[[2468]],
+[[2469]],
+[[2470]],
+[[2471]],
+[[2472]],
+[[2473]],
+[[2474]],
+[[2475]],
+[[2476]],
+[[2477]],
+[[2478]],
+[[2479]],
+[[2480]],
+[[2481]],
+[[2482]],
+[[2483]],
+[[2484]],
+[[2485]],
+[[2486]],
+[[2487]],
+[[2488]],
+[[2489]],
+[[2490]],
+[[2491]],
+[[2492]],
+[[2493]],
+[[2494]],
+[[2495]],
+[[2496]],
+[[2497]],
+[[2498]],
+[[2499]],
+[[2500]],
+[[2501]],
+[[2502]],
+[[2503]],
+[[2504]],
+[[2505]],
+[[2506]],
+[[2507]],
+[[2508]],
+[[2509]],
+[[2510]],
+[[2511]],
+[[2512]],
+[[2513]],
+[[2514]],
+[[2515]],
+[[2516]],
+[[2517]],
+[[2518]],
+[[2519]],
+[[2520]],
+[[2521]],
+[[2522]],
+[[2523]],
+[[2524]],
+[[2525]],
+[[2526]],
+[[2527]],
+[[2528]],
+[[2529]],
+[[2530]],
+[[2531]],
+[[2532]],
+[[2533]],
+[[2534]],
+[[2535]],
+[[2536]],
+[[2537]],
+[[2538]],
+[[2539]],
+[[2540]],
+[[2541]],
+[[2542]],
+[[2543]],
+[[2544]],
+[[2545]],
+[[2546]],
+[[2547]],
+[[2548]],
+[[2549]],
+[[2550]],
+[[2551]],
+[[2552]],
+[[2553]],
+[[2554]],
+[[2555]],
+[[2556]],
+[[2557]],
+[[2558]],
+[[2559]],
+[[2560]],
+[[2561]],
+[[2562]],
+[[2563]],
+[[2564]],
+[[2565]],
+[[2566]],
+[[2567]],
+[[2568]],
+[[2569]],
+[[2570]],
+[[2571]],
+[[2572]],
+[[2573]],
+[[2574]],
+[[2575]],
+[[2576]],
+[[2577]],
+[[2578]],
+[[2579]],
+[[2580]],
+[[2581]],
+[[2582]],
+[[2583]],
+[[2584]],
+[[2585]],
+[[2586]],
+[[2587]],
+[[2588]],
+[[2589]],
+[[2590]],
+[[2591]],
+[[2592]],
+[[2593]],
+[[2594]],
+[[2595]],
+[[2596]],
+[[2597]],
+[[2598]],
+[[2599]],
+[[2600]],
+[[2601]],
+[[2602]],
+[[2603]],
+[[2604]],
+[[2605]],
+[[2606]],
+[[2607]],
+[[2608]],
+[[2609]],
+[[2610]],
+[[2611]],
+[[2612]],
+[[2613]],
+[[2614]],
+[[2615]],
+[[2616]],
+[[2617]],
+[[2618]],
+[[2619]],
+[[2620]],
+[[2621]],
+[[2622]],
+[[2623]],
+[[2624]],
+[[2625]],
+[[2626]],
+[[2627]],
+[[2628]],
+[[2629]],
+[[2630]],
+[[2631]],
+[[2632]],
+[[2633]],
+[[2634]],
+[[2635]],
+[[2636]],
+[[2637]],
+[[2638]],
+[[2639]],
+[[2640]],
+[[2641]],
+[[2642]],
+[[2643]],
+[[2644]],
+[[2645]],
+[[2646]],
+[[2647]],
+[[2648]],
+[[2649]],
+[[2650]],
+[[2651]],
+[[2652]],
+[[2653]],
+[[2654]],
+[[2655]],
+[[2656]],
+[[2657]],
+[[2658]],
+[[2659]],
+[[2660]],
+[[2661]],
+[[2662]],
+[[2663]],
+[[2664]],
+[[2665]],
+[[2666]],
+[[2667]],
+[[2668]],
+[[2669]],
+[[2670]],
+[[2671]],
+[[2672]],
+[[2673]],
+[[2674]],
+[[2675]],
+[[2676]],
+[[2677]],
+[[2678]],
+[[2679]],
+[[2680]],
+[[2681]],
+[[2682]],
+[[2683]],
+[[2684]],
+[[2685]],
+[[2686]],
+[[2687]],
+[[2688]],
+[[2689]],
+[[2690]],
+[[2691]],
+[[2692]],
+[[2693]],
+[[2694]],
+[[2695]],
+[[2696]],
+[[2697]],
+[[2698]],
+[[2699]],
+[[2700]],
+[[2701]],
+[[2702]],
+[[2703]],
+[[2704]],
+[[2705]],
+[[2706]],
+[[2707]],
+[[2708]],
+[[2709]],
+[[2710]],
+[[2711]],
+[[2712]],
+[[2713]],
+[[2714]],
+[[2715]],
+[[2716]],
+[[2717]],
+[[2718]],
+[[2719]],
+[[2720]],
+[[2721]],
+[[2722]],
+[[2723]],
+[[2724]],
+[[2725]],
+[[2726]],
+[[2727]],
+[[2728]],
+[[2729]],
+[[2730]],
+[[2731]],
+[[2732]],
+[[2733]],
+[[2734]],
+[[2735]],
+[[2736]],
+[[2737]],
+[[2738]],
+[[2739]],
+[[2740]],
+[[2741]],
+[[2742]],
+[[2743]],
+[[2744]],
+[[2745]],
+[[2746]],
+[[2747]],
+[[2748]],
+[[2749]],
+[[2750]],
+[[2751]],
+[[2752]],
+[[2753]],
+[[2754]],
+[[2755]],
+[[2756]],
+[[2757]],
+[[2758]],
+[[2759]],
+[[2760]],
+[[2761]],
+[[2762]],
+[[2763]],
+[[2764]],
+[[2765]],
+[[2766]],
+[[2767]],
+[[2768]],
+[[2769]],
+[[2770]],
+[[2771]],
+[[2772]],
+[[2773]],
+[[2774]],
+[[2775]],
+[[2776]],
+[[2777]],
+[[2778]],
+[[2779]],
+[[2780]],
+[[2781]],
+[[2782]],
+[[2783]],
+[[2784]],
+[[2785]],
+[[2786]],
+[[2787]],
+[[2788]],
+[[2789]],
+[[2790]],
+[[2791]],
+[[2792]],
+[[2793]],
+[[2794]],
+[[2795]],
+[[2796]],
+[[2797]],
+[[2798]],
+[[2799]],
+[[2800]],
+[[2801]],
+[[2802]],
+[[2803]],
+[[2804]],
+[[2805]],
+[[2806]],
+[[2807]],
+[[2808]],
+[[2809]],
+[[2810]],
+[[2811]],
+[[2812]],
+[[2813]],
+[[2814]],
+[[2815]],
+[[2816]],
+[[2817]],
+[[2818]],
+[[2819]],
+[[2820]],
+[[2821]],
+[[2822]],
+[[2823]],
+[[2824]],
+[[2825]],
+[[2826]],
+[[2827]],
+[[2828]],
+[[2829]],
+[[2830]],
+[[2831]],
+[[2832]],
+[[2833]],
+[[2834]],
+[[2835]],
+[[2836]],
+[[2837]],
+[[2838]],
+[[2839]],
+[[2840]],
+[[2841]],
+[[2842]],
+[[2843]],
+[[2844]],
+[[2845]],
+[[2846]],
+[[2847]],
+[[2848]],
+[[2849]],
+[[2850]],
+[[2851]],
+[[2852]],
+[[2853]],
+[[2854]],
+[[2855]],
+[[2856]],
+[[2857]],
+[[2858]],
+[[2859]],
+[[2860]],
+[[2861]],
+[[2862]],
+[[2863]],
+[[2864]],
+[[2865]],
+[[2866]],
+[[2867]],
+[[2868]],
+[[2869]],
+[[2870]],
+[[2871]],
+[[2872]],
+[[2873]],
+[[2874]],
+[[2875]],
+[[2876]],
+[[2877]],
+[[2878]],
+[[2879]],
+[[2880]],
+[[2881]],
+[[2882]],
+[[2883]],
+[[2884]],
+[[2885]],
+[[2886]],
+[[2887]],
+[[2888]],
+[[2889]],
+[[2890]],
+[[2891]],
+[[2892]],
+[[2893]],
+[[2894]],
+[[2895]],
+[[2896]],
+[[2897]],
+[[2898]],
+[[2899]],
+[[2900]],
+[[2901]],
+[[2902]],
+[[2903]],
+[[2904]],
+[[2905]],
+[[2906]],
+[[2907]],
+[[2908]],
+[[2909]],
+[[2910]],
+[[2911]],
+[[2912]],
+[[2913]],
+[[2914]],
+[[2915]],
+[[2916]],
+[[2917]],
+[[2918]],
+[[2919]],
+[[2920]],
+[[2921]],
+[[2922]],
+[[2923]],
+[[2924]],
+[[2925]],
+[[2926]],
+[[2927]],
+[[2928]],
+[[2929]],
+[[2930]],
+[[2931]],
+[[2932]],
+[[2933]],
+[[2934]],
+[[2935]],
+[[2936]],
+[[2937]],
+[[2938]],
+[[2939]],
+[[2940]],
+[[2941]],
+[[2942]],
+[[2943]],
+[[2944]],
+[[2945]],
+[[2946]],
+[[2947]],
+[[2948]],
+[[2949]],
+[[2950]],
+[[2951]],
+[[2952]],
+[[2953]],
+[[2954]],
+[[2955]],
+[[2956]],
+[[2957]],
+[[2958]],
+[[2959]],
+[[2960]],
+[[2961]],
+[[2962]],
+[[2963]],
+[[2964]],
+[[2965]],
+[[2966]],
+[[2967]],
+[[2968]],
+[[2969]],
+[[2970]],
+[[2971]],
+[[2972]],
+[[2973]],
+[[2974]],
+[[2975]],
+[[2976]],
+[[2977]],
+[[2978]],
+[[2979]],
+[[2980]],
+[[2981]],
+[[2982]],
+[[2983]],
+[[2984]],
+[[2985]],
+[[2986]],
+[[2987]],
+[[2988]],
+[[2989]],
+[[2990]],
+[[2991]],
+[[2992]],
+[[2993]],
+[[2994]],
+[[2995]],
+[[2996]],
+[[2997]],
+[[2998]],
+[[2999]],
+[[3000]],
+[[3001]],
+[[3002]],
+[[3003]],
+[[3004]],
+[[3005]],
+[[3006]],
+[[3007]],
+[[3008]],
+[[3009]],
+[[3010]],
+[[3011]],
+[[3012]],
+[[3013]],
+[[3014]],
+[[3015]],
+[[3016]],
+[[3017]],
+[[3018]],
+[[3019]],
+[[3020]],
+[[3021]],
+[[3022]],
+[[3023]],
+[[3024]],
+[[3025]],
+[[3026]],
+[[3027]],
+[[3028]],
+[[3029]],
+[[3030]],
+[[3031]],
+[[3032]],
+[[3033]],
+[[3034]],
+[[3035]],
+[[3036]],
+[[3037]],
+[[3038]],
+[[3039]],
+[[3040]],
+[[3041]],
+[[3042]],
+[[3043]],
+[[3044]],
+[[3045]],
+[[3046]],
+[[3047]],
+[[3048]],
+[[3049]],
+[[3050]],
+[[3051]],
+[[3052]],
+[[3053]],
+[[3054]],
+[[3055]],
+[[3056]],
+[[3057]],
+[[3058]],
+[[3059]],
+[[3060]],
+[[3061]],
+[[3062]],
+[[3063]],
+[[3064]],
+[[3065]],
+[[3066]],
+[[3067]],
+[[3068]],
+[[3069]],
+[[3070]],
+[[3071]],
+[[3072]],
+[[3073]],
+[[3074]],
+[[3075]],
+[[3076]],
+[[3077]],
+[[3078]],
+[[3079]],
+[[3080]],
+[[3081]],
+[[3082]],
+[[3083]],
+[[3084]],
+[[3085]],
+[[3086]],
+[[3087]],
+[[3088]],
+[[3089]],
+[[3090]],
+[[3091]],
+[[3092]],
+[[3093]],
+[[3094]],
+[[3095]],
+[[3096]],
+[[3097]],
+[[3098]],
+[[3099]],
+[[3100]],
+[[3101]],
+[[3102]],
+[[3103]],
+[[3104]],
+[[3105]],
+[[3106]],
+[[3107]],
+[[3108]],
+[[3109]],
+[[3110]],
+[[3111]],
+[[3112]],
+[[3113]],
+[[3114]],
+[[3115]],
+[[3116]],
+[[3117]],
+[[3118]],
+[[3119]],
+[[3120]],
+[[3121]],
+[[3122]],
+[[3123]],
+[[3124]],
+[[3125]],
+[[3126]],
+[[3127]],
+[[3128]],
+[[3129]],
+[[3130]],
+[[3131]],
+[[3132]],
+[[3133]],
+[[3134]],
+[[3135]],
+[[3136]],
+[[3137]],
+[[3138]],
+[[3139]],
+[[3140]],
+[[3141]],
+[[3142]],
+[[3143]],
+[[3144]],
+[[3145]],
+[[3146]],
+[[3147]],
+[[3148]],
+[[3149]],
+[[3150]],
+[[3151]],
+[[3152]],
+[[3153]],
+[[3154]],
+[[3155]],
+[[3156]],
+[[3157]],
+[[3158]],
+[[3159]],
+[[3160]],
+[[3161]],
+[[3162]],
+[[3163]],
+[[3164]],
+[[3165]],
+[[3166]],
+[[3167]],
+[[3168]],
+[[3169]],
+[[3170]],
+[[3171]],
+[[3172]],
+[[3173]],
+[[3174]],
+[[3175]],
+[[3176]],
+[[3177]],
+[[3178]],
+[[3179]],
+[[3180]],
+[[3181]],
+[[3182]],
+[[3183]],
+[[3184]],
+[[3185]],
+[[3186]],
+[[3187]],
+[[3188]],
+[[3189]],
+[[3190]],
+[[3191]],
+[[3192]],
+[[3193]],
+[[3194]],
+[[3195]],
+[[3196]],
+[[3197]],
+[[3198]],
+[[3199]],
+[[3200]],
+[[3201]],
+[[3202]],
+[[3203]],
+[[3204]],
+[[3205]],
+[[3206]],
+[[3207]],
+[[3208]],
+[[3209]],
+[[3210]],
+[[3211]],
+[[3212]],
+[[3213]],
+[[3214]],
+[[3215]],
+[[3216]],
+[[3217]],
+[[3218]],
+[[3219]],
+[[3220]],
+[[3221]],
+[[3222]],
+[[3223]],
+[[3224]],
+[[3225]],
+[[3226]],
+[[3227]],
+[[3228]],
+[[3229]],
+[[3230]],
+[[3231]],
+[[3232]],
+[[3233]],
+[[3234]],
+[[3235]],
+[[3236]],
+[[3237]],
+[[3238]],
+[[3239]],
+[[3240]],
+[[3241]],
+[[3242]],
+[[3243]],
+[[3244]],
+[[3245]],
+[[3246]],
+[[3247]],
+[[3248]],
+[[3249]],
+[[3250]],
+[[3251]],
+[[3252]],
+[[3253]],
+[[3254]],
+[[3255]],
+[[3256]],
+[[3257]],
+[[3258]],
+[[3259]],
+[[3260]],
+[[3261]],
+[[3262]],
+[[3263]],
+[[3264]],
+[[3265]],
+[[3266]],
+[[3267]],
+[[3268]],
+[[3269]],
+[[3270]],
+[[3271]],
+[[3272]],
+[[3273]],
+[[3274]],
+[[3275]],
+[[3276]],
+[[3277]],
+[[3278]],
+[[3279]],
+[[3280]],
+[[3281]],
+[[3282]],
+[[3283]],
+[[3284]],
+[[3285]],
+[[3286]],
+[[3287]],
+[[3288]],
+[[3289]],
+[[3290]],
+[[3291]],
+[[3292]],
+[[3293]],
+[[3294]],
+[[3295]],
+[[3296]],
+[[3297]],
+[[3298]],
+[[3299]],
+[[3300]],
+[[3301]],
+[[3302]],
+[[3303]],
+[[3304]],
+[[3305]],
+[[3306]],
+[[3307]],
+[[3308]],
+[[3309]],
+[[3310]],
+[[3311]],
+[[3312]],
+[[3313]],
+[[3314]],
+[[3315]],
+[[3316]],
+[[3317]],
+[[3318]],
+[[3319]],
+[[3320]],
+[[3321]],
+[[3322]],
+[[3323]],
+[[3324]],
+[[3325]],
+[[3326]],
+[[3327]],
+[[3328]],
+[[3329]],
+[[3330]],
+[[3331]],
+[[3332]],
+[[3333]],
+[[3334]],
+[[3335]],
+[[3336]],
+[[3337]],
+[[3338]],
+[[3339]],
+[[3340]],
+[[3341]],
+[[3342]],
+[[3343]],
+[[3344]],
+[[3345]],
+[[3346]],
+[[3347]],
+[[3348]],
+[[3349]],
+[[3350]],
+[[3351]],
+[[3352]],
+[[3353]],
+[[3354]],
+[[3355]],
+[[3356]],
+[[3357]],
+[[3358]],
+[[3359]],
+[[3360]],
+[[3361]],
+[[3362]],
+[[3363]],
+[[3364]],
+[[3365]],
+[[3366]],
+[[3367]],
+[[3368]],
+[[3369]],
+[[3370]],
+[[3371]],
+[[3372]],
+[[3373]],
+[[3374]],
+[[3375]],
+[[3376]],
+[[3377]],
+[[3378]],
+[[3379]],
+[[3380]],
+[[3381]],
+[[3382]],
+[[3383]],
+[[3384]],
+[[3385]],
+[[3386]],
+[[3387]],
+[[3388]],
+[[3389]],
+[[3390]],
+[[3391]],
+[[3392]],
+[[3393]],
+[[3394]],
+[[3395]],
+[[3396]],
+[[3397]],
+[[3398]],
+[[3399]],
+[[3400]],
+[[3401]],
+[[3402]],
+[[3403]],
+[[3404]],
+[[3405]],
+[[3406]],
+[[3407]],
+[[3408]],
+[[3409]],
+[[3410]],
+[[3411]],
+[[3412]],
+[[3413]],
+[[3414]],
+[[3415]],
+[[3416]],
+[[3417]],
+[[3418]],
+[[3419]],
+[[3420]],
+[[3421]],
+[[3422]],
+[[3423]],
+[[3424]],
+[[3425]],
+[[3426]],
+[[3427]],
+[[3428]],
+[[3429]],
+[[3430]],
+[[3431]],
+[[3432]],
+[[3433]],
+[[3434]],
+[[3435]],
+[[3436]],
+[[3437]],
+[[3438]],
+[[3439]],
+[[3440]],
+[[3441]],
+[[3442]],
+[[3443]],
+[[3444]],
+[[3445]],
+[[3446]],
+[[3447]],
+[[3448]],
+[[3449]],
+[[3450]],
+[[3451]],
+[[3452]],
+[[3453]],
+[[3454]],
+[[3455]],
+[[3456]],
+[[3457]],
+[[3458]],
+[[3459]],
+[[3460]],
+[[3461]],
+[[3462]],
+[[3463]],
+[[3464]],
+[[3465]],
+[[3466]],
+[[3467]],
+[[3468]],
+[[3469]],
+[[3470]],
+[[3471]],
+[[3472]],
+[[3473]],
+[[3474]],
+[[3475]],
+[[3476]],
+[[3477]],
+[[3478]],
+[[3479]],
+[[3480]],
+[[3481]],
+[[3482]],
+[[3483]],
+[[3484]],
+[[3485]],
+[[3486]],
+[[3487]],
+[[3488]],
+[[3489]],
+[[3490]],
+[[3491]],
+[[3492]],
+[[3493]],
+[[3494]],
+[[3495]],
+[[3496]],
+[[3497]],
+[[3498]],
+[[3499]],
+[[3500]],
+[[3501]],
+[[3502]],
+[[3503]],
+[[3504]],
+[[3505]],
+[[3506]],
+[[3507]],
+[[3508]],
+[[3509]],
+[[3510]],
+[[3511]],
+[[3512]],
+[[3513]],
+[[3514]],
+[[3515]],
+[[3516]],
+[[3517]],
+[[3518]],
+[[3519]],
+[[3520]],
+[[3521]],
+[[3522]],
+[[3523]],
+[[3524]],
+[[3525]],
+[[3526]],
+[[3527]],
+[[3528]],
+[[3529]],
+[[3530]],
+[[3531]],
+[[3532]],
+[[3533]],
+[[3534]],
+[[3535]],
+[[3536]],
+[[3537]],
+[[3538]],
+[[3539]],
+[[3540]],
+[[3541]],
+[[3542]],
+[[3543]],
+[[3544]],
+[[3545]],
+[[3546]],
+[[3547]],
+[[3548]],
+[[3549]],
+[[3550]],
+[[3551]],
+[[3552]],
+[[3553]],
+[[3554]],
+[[3555]],
+[[3556]],
+[[3557]],
+[[3558]],
+[[3559]],
+[[3560]],
+[[3561]],
+[[3562]],
+[[3563]],
+[[3564]],
+[[3565]],
+[[3566]],
+[[3567]],
+[[3568]],
+[[3569]],
+[[3570]],
+[[3571]],
+[[3572]],
+[[3573]],
+[[3574]],
+[[3575]],
+[[3576]],
+[[3577]],
+[[3578]],
+[[3579]],
+[[3580]],
+[[3581]],
+[[3582]],
+[[3583]],
+[[3584]],
+[[3585]],
+[[3586]],
+[[3587]],
+[[3588]],
+[[3589]],
+[[3590]],
+[[3591]],
+[[3592]],
+[[3593]],
+[[3594]],
+[[3595]],
+[[3596]],
+[[3597]],
+[[3598]],
+[[3599]],
+[[3600]],
+[[3601]],
+[[3602]],
+[[3603]],
+[[3604]],
+[[3605]],
+[[3606]],
+[[3607]],
+[[3608]],
+[[3609]],
+[[3610]],
+[[3611]],
+[[3612]],
+[[3613]],
+[[3614]],
+[[3615]],
+[[3616]],
+[[3617]],
+[[3618]],
+[[3619]],
+[[3620]],
+[[3621]],
+[[3622]],
+[[3623]],
+[[3624]],
+[[3625]],
+[[3626]],
+[[3627]],
+[[3628]],
+[[3629]],
+[[3630]],
+[[3631]],
+[[3632]],
+[[3633]],
+[[3634]],
+[[3635]],
+[[3636]],
+[[3637]],
+[[3638]],
+[[3639]],
+[[3640]],
+[[3641]],
+[[3642]],
+[[3643]],
+[[3644]],
+[[3645]],
+[[3646]],
+[[3647]],
+[[3648]],
+[[3649]],
+[[3650]],
+[[3651]],
+[[3652]],
+[[3653]],
+[[3654]],
+[[3655]],
+[[3656]],
+[[3657]],
+[[3658]],
+[[3659]],
+[[3660]],
+[[3661]],
+[[3662]],
+[[3663]],
+[[3664]],
+[[3665]],
+[[3666]],
+[[3667]],
+[[3668]],
+[[3669]],
+[[3670]],
+[[3671]],
+[[3672]],
+[[3673]],
+[[3674]],
+[[3675]],
+[[3676]],
+[[3677]],
+[[3678]],
+[[3679]],
+[[3680]],
+[[3681]],
+[[3682]],
+[[3683]],
+[[3684]],
+[[3685]],
+[[3686]],
+[[3687]],
+[[3688]],
+[[3689]],
+[[3690]],
+[[3691]],
+[[3692]],
+[[3693]],
+[[3694]],
+[[3695]],
+[[3696]],
+[[3697]],
+[[3698]],
+[[3699]],
+[[3700]],
+[[3701]],
+[[3702]],
+[[3703]],
+[[3704]],
+[[3705]],
+[[3706]],
+[[3707]],
+[[3708]],
+[[3709]],
+[[3710]],
+[[3711]],
+[[3712]],
+[[3713]],
+[[3714]],
+[[3715]],
+[[3716]],
+[[3717]],
+[[3718]],
+[[3719]],
+[[3720]],
+[[3721]],
+[[3722]],
+[[3723]],
+[[3724]],
+[[3725]],
+[[3726]],
+[[3727]],
+[[3728]],
+[[3729]],
+[[3730]],
+[[3731]],
+[[3732]],
+[[3733]],
+[[3734]],
+[[3735]],
+[[3736]],
+[[3737]],
+[[3738]],
+[[3739]],
+[[3740]],
+[[3741]],
+[[3742]],
+[[3743]],
+[[3744]],
+[[3745]],
+[[3746]],
+[[3747]],
+[[3748]],
+[[3749]],
+[[3750]],
+[[3751]],
+[[3752]],
+[[3753]],
+[[3754]],
+[[3755]],
+[[3756]],
+[[3757]],
+[[3758]],
+[[3759]],
+[[3760]],
+[[3761]],
+[[3762]],
+[[3763]],
+[[3764]],
+[[3765]],
+[[3766]],
+[[3767]],
+[[3768]],
+[[3769]],
+[[3770]],
+[[3771]],
+[[3772]],
+[[3773]],
+[[3774]],
+[[3775]],
+[[3776]],
+[[3777]],
+[[3778]],
+[[3779]],
+[[3780]],
+[[3781]],
+[[3782]],
+[[3783]],
+[[3784]],
+[[3785]],
+[[3786]],
+[[3787]],
+[[3788]],
+[[3789]],
+[[3790]],
+[[3791]],
+[[3792]],
+[[3793]],
+[[3794]],
+[[3795]],
+[[3796]],
+[[3797]],
+[[3798]],
+[[3799]],
+[[3800]],
+[[3801]],
+[[3802]],
+[[3803]],
+[[3804]],
+[[3805]],
+[[3806]],
+[[3807]],
+[[3808]],
+[[3809]],
+[[3810]],
+[[3811]],
+[[3812]],
+[[3813]],
+[[3814]],
+[[3815]],
+[[3816]],
+[[3817]],
+[[3818]],
+[[3819]],
+[[3820]],
+[[3821]],
+[[3822]],
+[[3823]],
+[[3824]],
+[[3825]],
+[[3826]],
+[[3827]],
+[[3828]],
+[[3829]],
+[[3830]],
+[[3831]],
+[[3832]],
+[[3833]],
+[[3834]],
+[[3835]],
+[[3836]],
+[[3837]],
+[[3838]],
+[[3839]],
+[[3840]],
+[[3841]],
+[[3842]],
+[[3843]],
+[[3844]],
+[[3845]],
+[[3846]],
+[[3847]],
+[[3848]],
+[[3849]],
+[[3850]],
+[[3851]],
+[[3852]],
+[[3853]],
+[[3854]],
+[[3855]],
+[[3856]],
+[[3857]],
+[[3858]],
+[[3859]],
+[[3860]],
+[[3861]],
+[[3862]],
+[[3863]],
+[[3864]],
+[[3865]],
+[[3866]],
+[[3867]],
+[[3868]],
+[[3869]],
+[[3870]],
+[[3871]],
+[[3872]],
+[[3873]],
+[[3874]],
+[[3875]],
+[[3876]],
+[[3877]],
+[[3878]],
+[[3879]],
+[[3880]],
+[[3881]],
+[[3882]],
+[[3883]],
+[[3884]],
+[[3885]],
+[[3886]],
+[[3887]],
+[[3888]],
+[[3889]],
+[[3890]],
+[[3891]],
+[[3892]],
+[[3893]],
+[[3894]],
+[[3895]],
+[[3896]],
+[[3897]],
+[[3898]],
+[[3899]],
+[[3900]],
+[[3901]],
+[[3902]],
+[[3903]],
+[[3904]],
+[[3905]],
+[[3906]],
+[[3907]],
+[[3908]],
+[[3909]],
+[[3910]],
+[[3911]],
+[[3912]],
+[[3913]],
+[[3914]],
+[[3915]],
+[[3916]],
+[[3917]],
+[[3918]],
+[[3919]],
+[[3920]],
+[[3921]],
+[[3922]],
+[[3923]],
+[[3924]],
+[[3925]],
+[[3926]],
+[[3927]],
+[[3928]],
+[[3929]],
+[[3930]],
+[[3931]],
+[[3932]],
+[[3933]],
+[[3934]],
+[[3935]],
+[[3936]],
+[[3937]],
+[[3938]],
+[[3939]],
+[[3940]],
+[[3941]],
+[[3942]],
+[[3943]],
+[[3944]],
+[[3945]],
+[[3946]],
+[[3947]],
+[[3948]],
+[[3949]],
+[[3950]],
+[[3951]],
+[[3952]],
+[[3953]],
+[[3954]],
+[[3955]],
+[[3956]],
+[[3957]],
+[[3958]],
+[[3959]],
+[[3960]],
+[[3961]],
+[[3962]],
+[[3963]],
+[[3964]],
+[[3965]],
+[[3966]],
+[[3967]],
+[[3968]],
+[[3969]],
+[[3970]],
+[[3971]],
+[[3972]],
+[[3973]],
+[[3974]],
+[[3975]],
+[[3976]],
+[[3977]],
+[[3978]],
+[[3979]],
+[[3980]],
+[[3981]],
+[[3982]],
+[[3983]],
+[[3984]],
+[[3985]],
+[[3986]],
+[[3987]],
+[[3988]],
+[[3989]],
+[[3990]],
+[[3991]],
+[[3992]],
+[[3993]],
+[[3994]],
+[[3995]],
+[[3996]],
+[[3997]],
+[[3998]],
+[[3999]],
+[[4000]],
+[[4001]],
+[[4002]],
+[[4003]],
+[[4004]],
+[[4005]],
+[[4006]],
+[[4007]],
+[[4008]],
+[[4009]],
+[[4010]],
+[[4011]],
+[[4012]],
+[[4013]],
+[[4014]],
+[[4015]],
+[[4016]],
+[[4017]],
+[[4018]],
+[[4019]],
+[[4020]],
+[[4021]],
+[[4022]],
+[[4023]],
+[[4024]],
+[[4025]],
+[[4026]],
+[[4027]],
+[[4028]],
+[[4029]],
+[[4030]],
+[[4031]],
+[[4032]],
+[[4033]],
+[[4034]],
+[[4035]],
+[[4036]],
+[[4037]],
+[[4038]],
+[[4039]],
+[[4040]],
+[[4041]],
+[[4042]],
+[[4043]],
+[[4044]],
+[[4045]],
+[[4046]],
+[[4047]],
+[[4048]],
+[[4049]],
+[[4050]],
+[[4051]],
+[[4052]],
+[[4053]],
+[[4054]],
+[[4055]],
+[[4056]],
+[[4057]],
+[[4058]],
+[[4059]],
+[[4060]],
+[[4061]],
+[[4062]],
+[[4063]],
+[[4064]],
+[[4065]],
+[[4066]],
+[[4067]],
+[[4068]],
+[[4069]],
+[[4070]],
+[[4071]],
+[[4072]],
+[[4073]],
+[[4074]],
+[[4075]],
+[[4076]],
+[[4077]],
+[[4078]],
+[[4079]],
+[[4080]],
+[[4081]],
+[[4082]],
+[[4083]],
+[[4084]],
+[[4085]],
+[[4086]],
+[[4087]],
+[[4088]],
+[[4089]],
+[[4090]],
+[[4091]],
+[[4092]],
+[[4093]],
+[[4094]],
+[[4095]],
+[[4096]],
+[[4097]],
+[[4098]],
+[[4099]],
+[[4100]],
+[[4101]],
+[[4102]],
+[[4103]],
+[[4104]],
+[[4105]],
+[[4106]],
+[[4107]],
+[[4108]],
+[[4109]],
+[[4110]],
+[[4111]],
+[[4112]],
+[[4113]],
+[[4114]],
+[[4115]],
+[[4116]],
+[[4117]],
+[[4118]],
+[[4119]],
+[[4120]],
+[[4121]],
+[[4122]],
+[[4123]],
+[[4124]],
+[[4125]],
+[[4126]],
+[[4127]],
+[[4128]],
+[[4129]],
+[[4130]],
+[[4131]],
+[[4132]],
+[[4133]],
+[[4134]],
+[[4135]],
+[[4136]],
+[[4137]],
+[[4138]],
+[[4139]],
+[[4140]],
+[[4141]],
+[[4142]],
+[[4143]],
+[[4144]],
+[[4145]],
+[[4146]],
+[[4147]],
+[[4148]],
+[[4149]],
+[[4150]],
+[[4151]],
+[[4152]],
+[[4153]],
+[[4154]],
+[[4155]],
+[[4156]],
+[[4157]],
+[[4158]],
+[[4159]],
+[[4160]],
+[[4161]],
+[[4162]],
+[[4163]],
+[[4164]],
+[[4165]],
+[[4166]],
+[[4167]],
+[[4168]],
+[[4169]],
+[[4170]],
+[[4171]],
+[[4172]],
+[[4173]],
+[[4174]],
+[[4175]],
+[[4176]],
+[[4177]],
+[[4178]],
+[[4179]],
+[[4180]],
+[[4181]],
+[[4182]],
+[[4183]],
+[[4184]],
+[[4185]],
+[[4186]],
+[[4187]],
+[[4188]],
+[[4189]],
+[[4190]],
+[[4191]],
+[[4192]],
+[[4193]],
+[[4194]],
+[[4195]],
+[[4196]],
+[[4197]],
+[[4198]],
+[[4199]],
+[[4200]],
+[[4201]],
+[[4202]],
+[[4203]],
+[[4204]],
+[[4205]],
+[[4206]],
+[[4207]],
+[[4208]],
+[[4209]],
+[[4210]],
+[[4211]],
+[[4212]],
+[[4213]],
+[[4214]],
+[[4215]],
+[[4216]],
+[[4217]],
+[[4218]],
+[[4219]],
+[[4220]],
+[[4221]],
+[[4222]],
+[[4223]],
+[[4224]],
+[[4225]],
+[[4226]],
+[[4227]],
+[[4228]],
+[[4229]],
+[[4230]],
+[[4231]],
+[[4232]],
+[[4233]],
+[[4234]],
+[[4235]],
+[[4236]],
+[[4237]],
+[[4238]],
+[[4239]],
+[[4240]],
+[[4241]],
+[[4242]],
+[[4243]],
+[[4244]],
+[[4245]],
+[[4246]],
+[[4247]],
+[[4248]],
+[[4249]],
+[[4250]],
+[[4251]],
+[[4252]],
+[[4253]],
+[[4254]],
+[[4255]],
+[[4256]],
+[[4257]],
+[[4258]],
+[[4259]],
+[[4260]],
+[[4261]],
+[[4262]],
+[[4263]],
+[[4264]],
+[[4265]],
+[[4266]],
+[[4267]],
+[[4268]],
+[[4269]],
+[[4270]],
+[[4271]],
+[[4272]],
+[[4273]],
+[[4274]],
+[[4275]],
+[[4276]],
+[[4277]],
+[[4278]],
+[[4279]],
+[[4280]],
+[[4281]],
+[[4282]],
+[[4283]],
+[[4284]],
+[[4285]],
+[[4286]],
+[[4287]],
+[[4288]],
+[[4289]],
+[[4290]],
+[[4291]],
+[[4292]],
+[[4293]],
+[[4294]],
+[[4295]],
+[[4296]],
+[[4297]],
+[[4298]],
+[[4299]],
+[[4300]],
+[[4301]],
+[[4302]],
+[[4303]],
+[[4304]],
+[[4305]],
+[[4306]],
+[[4307]],
+[[4308]],
+[[4309]],
+[[4310]],
+[[4311]],
+[[4312]],
+[[4313]],
+[[4314]],
+[[4315]],
+[[4316]],
+[[4317]],
+[[4318]],
+[[4319]],
+[[4320]],
+[[4321]],
+[[4322]],
+[[4323]],
+[[4324]],
+[[4325]],
+[[4326]],
+[[4327]],
+[[4328]],
+[[4329]],
+[[4330]],
+[[4331]],
+[[4332]],
+[[4333]],
+[[4334]],
+[[4335]],
+[[4336]],
+[[4337]],
+[[4338]],
+[[4339]],
+[[4340]],
+[[4341]],
+[[4342]],
+[[4343]],
+[[4344]],
+[[4345]],
+[[4346]],
+[[4347]],
+[[4348]],
+[[4349]],
+[[4350]],
+[[4351]],
+[[4352]],
+[[4353]],
+[[4354]],
+[[4355]],
+[[4356]],
+[[4357]],
+[[4358]],
+[[4359]],
+[[4360]],
+[[4361]],
+[[4362]],
+[[4363]],
+[[4364]],
+[[4365]],
+[[4366]],
+[[4367]],
+[[4368]],
+[[4369]],
+[[4370]],
+[[4371]],
+[[4372]],
+[[4373]],
+[[4374]],
+[[4375]],
+[[4376]],
+[[4377]],
+[[4378]],
+[[4379]],
+[[4380]],
+[[4381]],
+[[4382]],
+[[4383]],
+[[4384]],
+[[4385]],
+[[4386]],
+[[4387]],
+[[4388]],
+[[4389]],
+[[4390]],
+[[4391]],
+[[4392]],
+[[4393]],
+[[4394]],
+[[4395]],
+[[4396]],
+[[4397]],
+[[4398]],
+[[4399]],
+[[4400]],
+[[4401]],
+[[4402]],
+[[4403]],
+[[4404]],
+[[4405]],
+[[4406]],
+[[4407]],
+[[4408]],
+[[4409]],
+[[4410]],
+[[4411]],
+[[4412]],
+[[4413]],
+[[4414]],
+[[4415]],
+[[4416]],
+[[4417]],
+[[4418]],
+[[4419]],
+[[4420]],
+[[4421]],
+[[4422]],
+[[4423]],
+[[4424]],
+[[4425]],
+[[4426]],
+[[4427]],
+[[4428]],
+[[4429]],
+[[4430]],
+[[4431]],
+[[4432]],
+[[4433]],
+[[4434]],
+[[4435]],
+[[4436]],
+[[4437]],
+[[4438]],
+[[4439]],
+[[4440]],
+[[4441]],
+[[4442]],
+[[4443]],
+[[4444]],
+[[4445]],
+[[4446]],
+[[4447]],
+[[4448]],
+[[4449]],
+[[4450]],
+[[4451]],
+[[4452]],
+[[4453]],
+[[4454]],
+[[4455]],
+[[4456]],
+[[4457]],
+[[4458]],
+[[4459]],
+[[4460]],
+[[4461]],
+[[4462]],
+[[4463]],
+[[4464]],
+[[4465]],
+[[4466]],
+[[4467]],
+[[4468]],
+[[4469]],
+[[4470]],
+[[4471]],
+[[4472]],
+[[4473]],
+[[4474]],
+[[4475]],
+[[4476]],
+[[4477]],
+[[4478]],
+[[4479]],
+[[4480]],
+[[4481]],
+[[4482]],
+[[4483]],
+[[4484]],
+[[4485]],
+[[4486]],
+[[4487]],
+[[4488]],
+[[4489]],
+[[4490]],
+[[4491]],
+[[4492]],
+[[4493]],
+[[4494]],
+[[4495]],
+[[4496]],
+[[4497]],
+[[4498]],
+[[4499]],
+[[4500]],
+[[4501]],
+[[4502]],
+[[4503]],
+[[4504]],
+[[4505]],
+[[4506]],
+[[4507]],
+[[4508]],
+[[4509]],
+[[4510]],
+[[4511]],
+[[4512]],
+[[4513]],
+[[4514]],
+[[4515]],
+[[4516]],
+[[4517]],
+[[4518]],
+[[4519]],
+[[4520]],
+[[4521]],
+[[4522]],
+[[4523]],
+[[4524]],
+[[4525]],
+[[4526]],
+[[4527]],
+[[4528]],
+[[4529]],
+[[4530]],
+[[4531]],
+[[4532]],
+[[4533]],
+[[4534]],
+[[4535]],
+[[4536]],
+[[4537]],
+[[4538]],
+[[4539]],
+[[4540]],
+[[4541]],
+[[4542]],
+[[4543]],
+[[4544]],
+[[4545]],
+[[4546]],
+[[4547]],
+[[4548]],
+[[4549]],
+[[4550]],
+[[4551]],
+[[4552]],
+[[4553]],
+[[4554]],
+[[4555]],
+[[4556]],
+[[4557]],
+[[4558]],
+[[4559]],
+[[4560]],
+[[4561]],
+[[4562]],
+[[4563]],
+[[4564]],
+[[4565]],
+[[4566]],
+[[4567]],
+[[4568]],
+[[4569]],
+[[4570]],
+[[4571]],
+[[4572]],
+[[4573]],
+[[4574]],
+[[4575]],
+[[4576]],
+[[4577]],
+[[4578]],
+[[4579]],
+[[4580]],
+[[4581]],
+[[4582]],
+[[4583]],
+[[4584]],
+[[4585]],
+[[4586]],
+[[4587]],
+[[4588]],
+[[4589]],
+[[4590]],
+[[4591]],
+[[4592]],
+[[4593]],
+[[4594]],
+[[4595]],
+[[4596]],
+[[4597]],
+[[4598]],
+[[4599]],
+[[4600]],
+[[4601]],
+[[4602]],
+[[4603]],
+[[4604]],
+[[4605]],
+[[4606]],
+[[4607]],
+[[4608]],
+[[4609]],
+[[4610]],
+[[4611]],
+[[4612]],
+[[4613]],
+[[4614]],
+[[4615]],
+[[4616]],
+[[4617]],
+[[4618]],
+[[4619]],
+[[4620]],
+[[4621]],
+[[4622]],
+[[4623]],
+[[4624]],
+[[4625]],
+[[4626]],
+[[4627]],
+[[4628]],
+[[4629]],
+[[4630]],
+[[4631]],
+[[4632]],
+[[4633]],
+[[4634]],
+[[4635]],
+[[4636]],
+[[4637]],
+[[4638]],
+[[4639]],
+[[4640]],
+[[4641]],
+[[4642]],
+[[4643]],
+[[4644]],
+[[4645]],
+[[4646]],
+[[4647]],
+[[4648]],
+[[4649]],
+[[4650]],
+[[4651]],
+[[4652]],
+[[4653]],
+[[4654]],
+[[4655]],
+[[4656]],
+[[4657]],
+[[4658]],
+[[4659]],
+[[4660]],
+[[4661]],
+[[4662]],
+[[4663]],
+[[4664]],
+[[4665]],
+[[4666]],
+[[4667]],
+[[4668]],
+[[4669]],
+[[4670]],
+[[4671]],
+[[4672]],
+[[4673]],
+[[4674]],
+[[4675]],
+[[4676]],
+[[4677]],
+[[4678]],
+[[4679]],
+[[4680]],
+[[4681]],
+[[4682]],
+[[4683]],
+[[4684]],
+[[4685]],
+[[4686]],
+[[4687]],
+[[4688]],
+[[4689]],
+[[4690]],
+[[4691]],
+[[4692]],
+[[4693]],
+[[4694]],
+[[4695]],
+[[4696]],
+[[4697]],
+[[4698]],
+[[4699]],
+[[4700]],
+[[4701]],
+[[4702]],
+[[4703]],
+[[4704]],
+[[4705]],
+[[4706]],
+[[4707]],
+[[4708]],
+[[4709]],
+[[4710]],
+[[4711]],
+[[4712]],
+[[4713]],
+[[4714]],
+[[4715]],
+[[4716]],
+[[4717]],
+[[4718]],
+[[4719]],
+[[4720]],
+[[4721]],
+[[4722]],
+[[4723]],
+[[4724]],
+[[4725]],
+[[4726]],
+[[4727]],
+[[4728]],
+[[4729]],
+[[4730]],
+[[4731]],
+[[4732]],
+[[4733]],
+[[4734]],
+[[4735]],
+[[4736]],
+[[4737]],
+[[4738]],
+[[4739]],
+[[4740]],
+[[4741]],
+[[4742]],
+[[4743]],
+[[4744]],
+[[4745]],
+[[4746]],
+[[4747]],
+[[4748]],
+[[4749]],
+[[4750]],
+[[4751]],
+[[4752]],
+[[4753]],
+[[4754]],
+[[4755]],
+[[4756]],
+[[4757]],
+[[4758]],
+[[4759]],
+[[4760]],
+[[4761]],
+[[4762]],
+[[4763]],
+[[4764]],
+[[4765]],
+[[4766]],
+[[4767]],
+[[4768]],
+[[4769]],
+[[4770]],
+[[4771]],
+[[4772]],
+[[4773]],
+[[4774]],
+[[4775]],
+[[4776]],
+[[4777]],
+[[4778]],
+[[4779]],
+[[4780]],
+[[4781]],
+[[4782]],
+[[4783]],
+[[4784]],
+[[4785]],
+[[4786]],
+[[4787]],
+[[4788]],
+[[4789]],
+[[4790]],
+[[4791]],
+[[4792]],
+[[4793]],
+[[4794]],
+[[4795]],
+[[4796]],
+[[4797]],
+[[4798]],
+[[4799]],
+[[4800]],
+[[4801]],
+[[4802]],
+[[4803]],
+[[4804]],
+[[4805]],
+[[4806]],
+[[4807]],
+[[4808]],
+[[4809]],
+[[4810]],
+[[4811]],
+[[4812]],
+[[4813]],
+[[4814]],
+[[4815]],
+[[4816]],
+[[4817]],
+[[4818]],
+[[4819]],
+[[4820]],
+[[4821]],
+[[4822]],
+[[4823]],
+[[4824]],
+[[4825]],
+[[4826]],
+[[4827]],
+[[4828]],
+[[4829]],
+[[4830]],
+[[4831]],
+[[4832]],
+[[4833]],
+[[4834]],
+[[4835]],
+[[4836]],
+[[4837]],
+[[4838]],
+[[4839]],
+[[4840]],
+[[4841]],
+[[4842]],
+[[4843]],
+[[4844]],
+[[4845]],
+[[4846]],
+[[4847]],
+[[4848]],
+[[4849]],
+[[4850]],
+[[4851]],
+[[4852]],
+[[4853]],
+[[4854]],
+[[4855]],
+[[4856]],
+[[4857]],
+[[4858]],
+[[4859]],
+[[4860]],
+[[4861]],
+[[4862]],
+[[4863]],
+[[4864]],
+[[4865]],
+[[4866]],
+[[4867]],
+[[4868]],
+[[4869]],
+[[4870]],
+[[4871]],
+[[4872]],
+[[4873]],
+[[4874]],
+[[4875]],
+[[4876]],
+[[4877]],
+[[4878]],
+[[4879]],
+[[4880]],
+[[4881]],
+[[4882]],
+[[4883]],
+[[4884]],
+[[4885]],
+[[4886]],
+[[4887]],
+[[4888]],
+[[4889]],
+[[4890]],
+[[4891]],
+[[4892]],
+[[4893]],
+[[4894]],
+[[4895]],
+[[4896]],
+[[4897]],
+[[4898]],
+[[4899]],
+[[4900]],
+[[4901]],
+[[4902]],
+[[4903]],
+[[4904]],
+[[4905]],
+[[4906]],
+[[4907]],
+[[4908]],
+[[4909]],
+[[4910]],
+[[4911]],
+[[4912]],
+[[4913]],
+[[4914]],
+[[4915]],
+[[4916]],
+[[4917]],
+[[4918]],
+[[4919]],
+[[4920]],
+[[4921]],
+[[4922]],
+[[4923]],
+[[4924]],
+[[4925]],
+[[4926]],
+[[4927]],
+[[4928]],
+[[4929]],
+[[4930]],
+[[4931]],
+[[4932]],
+[[4933]],
+[[4934]],
+[[4935]],
+[[4936]],
+[[4937]],
+[[4938]],
+[[4939]],
+[[4940]],
+[[4941]],
+[[4942]],
+[[4943]],
+[[4944]],
+[[4945]],
+[[4946]],
+[[4947]],
+[[4948]],
+[[4949]],
+[[4950]],
+[[4951]],
+[[4952]],
+[[4953]],
+[[4954]],
+[[4955]],
+[[4956]],
+[[4957]],
+[[4958]],
+[[4959]],
+[[4960]],
+[[4961]],
+[[4962]],
+[[4963]],
+[[4964]],
+[[4965]],
+[[4966]],
+[[4967]],
+[[4968]],
+[[4969]],
+[[4970]],
+[[4971]],
+[[4972]],
+[[4973]],
+[[4974]],
+[[4975]],
+[[4976]],
+[[4977]],
+[[4978]],
+[[4979]],
+[[4980]],
+[[4981]],
+[[4982]],
+[[4983]],
+[[4984]],
+[[4985]],
+[[4986]],
+[[4987]],
+[[4988]],
+[[4989]],
+[[4990]],
+[[4991]],
+[[4992]],
+[[4993]],
+[[4994]],
+[[4995]],
+[[4996]],
+[[4997]],
+[[4998]],
+[[4999]],
+[[5000]],
+[[5001]],
+[[5002]],
+[[5003]],
+[[5004]],
+[[5005]],
+[[5006]],
+[[5007]],
+[[5008]],
+[[5009]],
+[[5010]],
+[[5011]],
+[[5012]],
+[[5013]],
+[[5014]],
+[[5015]],
+[[5016]],
+[[5017]],
+[[5018]],
+[[5019]],
+[[5020]],
+[[5021]],
+[[5022]],
+[[5023]],
+[[5024]],
+[[5025]],
+[[5026]],
+[[5027]],
+[[5028]],
+[[5029]],
+[[5030]],
+[[5031]],
+[[5032]],
+[[5033]],
+[[5034]],
+[[5035]],
+[[5036]],
+[[5037]],
+[[5038]],
+[[5039]],
+[[5040]],
+[[5041]],
+[[5042]],
+[[5043]],
+[[5044]],
+[[5045]],
+[[5046]],
+[[5047]],
+[[5048]],
+[[5049]],
+[[5050]],
+[[5051]],
+[[5052]],
+[[5053]],
+[[5054]],
+[[5055]],
+[[5056]],
+[[5057]],
+[[5058]],
+[[5059]],
+[[5060]],
+[[5061]],
+[[5062]],
+[[5063]],
+[[5064]],
+[[5065]],
+[[5066]],
+[[5067]],
+[[5068]],
+[[5069]],
+[[5070]],
+[[5071]],
+[[5072]],
+[[5073]],
+[[5074]],
+[[5075]],
+[[5076]],
+[[5077]],
+[[5078]],
+[[5079]],
+[[5080]],
+[[5081]],
+[[5082]],
+[[5083]],
+[[5084]],
+[[5085]],
+[[5086]],
+[[5087]],
+[[5088]],
+[[5089]],
+[[5090]],
+[[5091]],
+[[5092]],
+[[5093]],
+[[5094]],
+[[5095]],
+[[5096]],
+[[5097]],
+[[5098]],
+[[5099]],
+[[5100]],
+[[5101]],
+[[5102]],
+[[5103]],
+[[5104]],
+[[5105]],
+[[5106]],
+[[5107]],
+[[5108]],
+[[5109]],
+[[5110]],
+[[5111]],
+[[5112]],
+[[5113]],
+[[5114]],
+[[5115]],
+[[5116]],
+[[5117]],
+[[5118]],
+[[5119]],
+[[5120]],
+[[5121]],
+[[5122]],
+[[5123]],
+[[5124]],
+[[5125]],
+[[5126]],
+[[5127]],
+[[5128]],
+[[5129]],
+[[5130]],
+[[5131]],
+[[5132]],
+[[5133]],
+[[5134]],
+[[5135]],
+[[5136]],
+[[5137]],
+[[5138]],
+[[5139]],
+[[5140]],
+[[5141]],
+[[5142]],
+[[5143]],
+[[5144]],
+[[5145]],
+[[5146]],
+[[5147]],
+[[5148]],
+[[5149]],
+[[5150]],
+[[5151]],
+[[5152]],
+[[5153]],
+[[5154]],
+[[5155]],
+[[5156]],
+[[5157]],
+[[5158]],
+[[5159]],
+[[5160]],
+[[5161]],
+[[5162]],
+[[5163]],
+[[5164]],
+[[5165]],
+[[5166]],
+[[5167]],
+[[5168]],
+[[5169]],
+[[5170]],
+[[5171]],
+[[5172]],
+[[5173]],
+[[5174]],
+[[5175]],
+[[5176]],
+[[5177]],
+[[5178]],
+[[5179]],
+[[5180]],
+[[5181]],
+[[5182]],
+[[5183]],
+[[5184]],
+[[5185]],
+[[5186]],
+[[5187]],
+[[5188]],
+[[5189]],
+[[5190]],
+[[5191]],
+[[5192]],
+[[5193]],
+[[5194]],
+[[5195]],
+[[5196]],
+[[5197]],
+[[5198]],
+[[5199]],
+[[5200]],
+[[5201]],
+[[5202]],
+[[5203]],
+[[5204]],
+[[5205]],
+[[5206]],
+[[5207]],
+[[5208]],
+[[5209]],
+[[5210]],
+[[5211]],
+[[5212]],
+[[5213]],
+[[5214]],
+[[5215]],
+[[5216]],
+[[5217]],
+[[5218]],
+[[5219]],
+[[5220]],
+[[5221]],
+[[5222]],
+[[5223]],
+[[5224]],
+[[5225]],
+[[5226]],
+[[5227]],
+[[5228]],
+[[5229]],
+[[5230]],
+[[5231]],
+[[5232]],
+[[5233]],
+[[5234]],
+[[5235]],
+[[5236]],
+[[5237]],
+[[5238]],
+[[5239]],
+[[5240]],
+[[5241]],
+[[5242]],
+[[5243]],
+[[5244]],
+[[5245]],
+[[5246]],
+[[5247]],
+[[5248]],
+[[5249]],
+[[5250]],
+[[5251]],
+[[5252]],
+[[5253]],
+[[5254]],
+[[5255]],
+[[5256]],
+[[5257]],
+[[5258]],
+[[5259]],
+[[5260]],
+[[5261]],
+[[5262]],
+[[5263]],
+[[5264]],
+[[5265]],
+[[5266]],
+[[5267]],
+[[5268]],
+[[5269]],
+[[5270]],
+[[5271]],
+[[5272]],
+[[5273]],
+[[5274]],
+[[5275]],
+[[5276]],
+[[5277]],
+[[5278]],
+[[5279]],
+[[5280]],
+[[5281]],
+[[5282]],
+[[5283]],
+[[5284]],
+[[5285]],
+[[5286]],
+[[5287]],
+[[5288]],
+[[5289]],
+[[5290]],
+[[5291]],
+[[5292]],
+[[5293]],
+[[5294]],
+[[5295]],
+[[5296]],
+[[5297]],
+[[5298]],
+[[5299]],
+[[5300]],
+[[5301]],
+[[5302]],
+[[5303]],
+[[5304]],
+[[5305]],
+[[5306]],
+[[5307]],
+[[5308]],
+[[5309]],
+[[5310]],
+[[5311]],
+[[5312]],
+[[5313]],
+[[5314]],
+[[5315]],
+[[5316]],
+[[5317]],
+[[5318]],
+[[5319]],
+[[5320]],
+[[5321]],
+[[5322]],
+[[5323]],
+[[5324]],
+[[5325]],
+[[5326]],
+[[5327]],
+[[5328]],
+[[5329]],
+[[5330]],
+[[5331]],
+[[5332]],
+[[5333]],
+[[5334]],
+[[5335]],
+[[5336]],
+[[5337]],
+[[5338]],
+[[5339]],
+[[5340]],
+[[5341]],
+[[5342]],
+[[5343]],
+[[5344]],
+[[5345]],
+[[5346]],
+[[5347]],
+[[5348]],
+[[5349]],
+[[5350]],
+[[5351]],
+[[5352]],
+[[5353]],
+[[5354]],
+[[5355]],
+[[5356]],
+[[5357]],
+[[5358]],
+[[5359]],
+[[5360]],
+[[5361]],
+[[5362]],
+[[5363]],
+[[5364]],
+[[5365]],
+[[5366]],
+[[5367]],
+[[5368]],
+[[5369]],
+[[5370]],
+[[5371]],
+[[5372]],
+[[5373]],
+[[5374]],
+[[5375]],
+[[5376]],
+[[5377]],
+[[5378]],
+[[5379]],
+[[5380]],
+[[5381]],
+[[5382]],
+[[5383]],
+[[5384]],
+[[5385]],
+[[5386]],
+[[5387]],
+[[5388]],
+[[5389]],
+[[5390]],
+[[5391]],
+[[5392]],
+[[5393]],
+[[5394]],
+[[5395]],
+[[5396]],
+[[5397]],
+[[5398]],
+[[5399]],
+[[5400]],
+[[5401]],
+[[5402]],
+[[5403]],
+[[5404]],
+[[5405]],
+[[5406]],
+[[5407]],
+[[5408]],
+[[5409]],
+[[5410]],
+[[5411]],
+[[5412]],
+[[5413]],
+[[5414]],
+[[5415]],
+[[5416]],
+[[5417]],
+[[5418]],
+[[5419]],
+[[5420]],
+[[5421]],
+[[5422]],
+[[5423]],
+[[5424]],
+[[5425]],
+[[5426]],
+[[5427]],
+[[5428]],
+[[5429]],
+[[5430]],
+[[5431]],
+[[5432]],
+[[5433]],
+[[5434]],
+[[5435]],
+[[5436]],
+[[5437]],
+[[5438]],
+[[5439]],
+[[5440]],
+[[5441]],
+[[5442]],
+[[5443]],
+[[5444]],
+[[5445]],
+[[5446]],
+[[5447]],
+[[5448]],
+[[5449]],
+[[5450]],
+[[5451]],
+[[5452]],
+[[5453]],
+[[5454]],
+[[5455]],
+[[5456]],
+[[5457]],
+[[5458]],
+[[5459]],
+[[5460]],
+[[5461]],
+[[5462]],
+[[5463]],
+[[5464]],
+[[5465]],
+[[5466]],
+[[5467]],
+[[5468]],
+[[5469]],
+[[5470]],
+[[5471]],
+[[5472]],
+[[5473]],
+[[5474]],
+[[5475]],
+[[5476]],
+[[5477]],
+[[5478]],
+[[5479]],
+[[5480]],
+[[5481]],
+[[5482]],
+[[5483]],
+[[5484]],
+[[5485]],
+[[5486]],
+[[5487]],
+[[5488]],
+[[5489]],
+[[5490]],
+[[5491]],
+[[5492]],
+[[5493]],
+[[5494]],
+[[5495]],
+[[5496]],
+[[5497]],
+[[5498]],
+[[5499]],
+[[5500]],
+[[5501]],
+[[5502]],
+[[5503]],
+[[5504]],
+[[5505]],
+[[5506]],
+[[5507]],
+[[5508]],
+[[5509]],
+[[5510]],
+[[5511]],
+[[5512]],
+[[5513]],
+[[5514]],
+[[5515]],
+[[5516]],
+[[5517]],
+[[5518]],
+[[5519]],
+[[5520]],
+[[5521]],
+[[5522]],
+[[5523]],
+[[5524]],
+[[5525]],
+[[5526]],
+[[5527]],
+[[5528]],
+[[5529]],
+[[5530]],
+[[5531]],
+[[5532]],
+[[5533]],
+[[5534]],
+[[5535]],
+[[5536]],
+[[5537]],
+[[5538]],
+[[5539]],
+[[5540]],
+[[5541]],
+[[5542]],
+[[5543]],
+[[5544]],
+[[5545]],
+[[5546]],
+[[5547]],
+[[5548]],
+[[5549]],
+[[5550]],
+[[5551]],
+[[5552]],
+[[5553]],
+[[5554]],
+[[5555]],
+[[5556]],
+[[5557]],
+[[5558]],
+[[5559]],
+[[5560]],
+[[5561]],
+[[5562]],
+[[5563]],
+[[5564]],
+[[5565]],
+[[5566]],
+[[5567]],
+[[5568]],
+[[5569]],
+[[5570]],
+[[5571]],
+[[5572]],
+[[5573]],
+[[5574]],
+[[5575]],
+[[5576]],
+[[5577]],
+[[5578]],
+[[5579]],
+[[5580]],
+[[5581]],
+[[5582]],
+[[5583]],
+[[5584]],
+[[5585]],
+[[5586]],
+[[5587]],
+[[5588]],
+[[5589]],
+[[5590]],
+[[5591]],
+[[5592]],
+[[5593]],
+[[5594]],
+[[5595]],
+[[5596]],
+[[5597]],
+[[5598]],
+[[5599]],
+[[5600]],
+[[5601]],
+[[5602]],
+[[5603]],
+[[5604]],
+[[5605]],
+[[5606]],
+[[5607]],
+[[5608]],
+[[5609]],
+[[5610]],
+[[5611]],
+[[5612]],
+[[5613]],
+[[5614]],
+[[5615]],
+[[5616]],
+[[5617]],
+[[5618]],
+[[5619]],
+[[5620]],
+[[5621]],
+[[5622]],
+[[5623]],
+[[5624]],
+[[5625]],
+[[5626]],
+[[5627]],
+[[5628]],
+[[5629]],
+[[5630]],
+[[5631]],
+[[5632]],
+[[5633]],
+[[5634]],
+[[5635]],
+[[5636]],
+[[5637]],
+[[5638]],
+[[5639]],
+[[5640]],
+[[5641]],
+[[5642]],
+[[5643]],
+[[5644]],
+[[5645]],
+[[5646]],
+[[5647]],
+[[5648]],
+[[5649]],
+[[5650]],
+[[5651]],
+[[5652]],
+[[5653]],
+[[5654]],
+[[5655]],
+[[5656]],
+[[5657]],
+[[5658]],
+[[5659]],
+[[5660]],
+[[5661]],
+[[5662]],
+[[5663]],
+[[5664]],
+[[5665]],
+[[5666]],
+[[5667]],
+[[5668]],
+[[5669]],
+[[5670]],
+[[5671]],
+[[5672]],
+[[5673]],
+[[5674]],
+[[5675]],
+[[5676]],
+[[5677]],
+[[5678]],
+[[5679]],
+[[5680]],
+[[5681]],
+[[5682]],
+[[5683]],
+[[5684]],
+[[5685]],
+[[5686]],
+[[5687]],
+[[5688]],
+[[5689]],
+[[5690]],
+[[5691]],
+[[5692]],
+[[5693]],
+[[5694]],
+[[5695]],
+[[5696]],
+[[5697]],
+[[5698]],
+[[5699]],
+[[5700]],
+[[5701]],
+[[5702]],
+[[5703]],
+[[5704]],
+[[5705]],
+[[5706]],
+[[5707]],
+[[5708]],
+[[5709]],
+[[5710]],
+[[5711]],
+[[5712]],
+[[5713]],
+[[5714]],
+[[5715]],
+[[5716]],
+[[5717]],
+[[5718]],
+[[5719]],
+[[5720]],
+[[5721]],
+[[5722]],
+[[5723]],
+[[5724]],
+[[5725]],
+[[5726]],
+[[5727]],
+[[5728]],
+[[5729]],
+[[5730]],
+[[5731]],
+[[5732]],
+[[5733]],
+[[5734]],
+[[5735]],
+[[5736]],
+[[5737]],
+[[5738]],
+[[5739]],
+[[5740]],
+[[5741]],
+[[5742]],
+[[5743]],
+[[5744]],
+[[5745]],
+[[5746]],
+[[5747]],
+[[5748]],
+[[5749]],
+[[5750]],
+[[5751]],
+[[5752]],
+[[5753]],
+[[5754]],
+[[5755]],
+[[5756]],
+[[5757]],
+[[5758]],
+[[5759]],
+[[5760]],
+[[5761]],
+[[5762]],
+[[5763]],
+[[5764]],
+[[5765]],
+[[5766]],
+[[5767]],
+[[5768]],
+[[5769]],
+[[5770]],
+[[5771]],
+[[5772]],
+[[5773]],
+[[5774]],
+[[5775]],
+[[5776]],
+[[5777]],
+[[5778]],
+[[5779]],
+[[5780]],
+[[5781]],
+[[5782]],
+[[5783]],
+[[5784]],
+[[5785]],
+[[5786]],
+[[5787]],
+[[5788]],
+[[5789]],
+[[5790]],
+[[5791]],
+[[5792]],
+[[5793]],
+[[5794]],
+[[5795]],
+[[5796]],
+[[5797]],
+[[5798]],
+[[5799]],
+[[5800]],
+[[5801]],
+[[5802]],
+[[5803]],
+[[5804]],
+[[5805]],
+[[5806]],
+[[5807]],
+[[5808]],
+[[5809]],
+[[5810]],
+[[5811]],
+[[5812]],
+[[5813]],
+[[5814]],
+[[5815]],
+[[5816]],
+[[5817]],
+[[5818]],
+[[5819]],
+[[5820]],
+[[5821]],
+[[5822]],
+[[5823]],
+[[5824]],
+[[5825]],
+[[5826]],
+[[5827]],
+[[5828]],
+[[5829]],
+[[5830]],
+[[5831]],
+[[5832]],
+[[5833]],
+[[5834]],
+[[5835]],
+[[5836]],
+[[5837]],
+[[5838]],
+[[5839]],
+[[5840]],
+[[5841]],
+[[5842]],
+[[5843]],
+[[5844]],
+[[5845]],
+[[5846]],
+[[5847]],
+[[5848]],
+[[5849]],
+[[5850]],
+[[5851]],
+[[5852]],
+[[5853]],
+[[5854]],
+[[5855]],
+[[5856]],
+[[5857]],
+[[5858]],
+[[5859]],
+[[5860]],
+[[5861]],
+[[5862]],
+[[5863]],
+[[5864]],
+[[5865]],
+[[5866]],
+[[5867]],
+[[5868]],
+[[5869]],
+[[5870]],
+[[5871]],
+[[5872]],
+[[5873]],
+[[5874]],
+[[5875]],
+[[5876]],
+[[5877]],
+[[5878]],
+[[5879]],
+[[5880]],
+[[5881]],
+[[5882]],
+[[5883]],
+[[5884]],
+[[5885]],
+[[5886]],
+[[5887]],
+[[5888]],
+[[5889]],
+[[5890]],
+[[5891]],
+[[5892]],
+[[5893]],
+[[5894]],
+[[5895]],
+[[5896]],
+[[5897]],
+[[5898]],
+[[5899]],
+[[5900]],
+[[5901]],
+[[5902]],
+[[5903]],
+[[5904]],
+[[5905]],
+[[5906]],
+[[5907]],
+[[5908]],
+[[5909]],
+[[5910]],
+[[5911]],
+[[5912]],
+[[5913]],
+[[5914]],
+[[5915]],
+[[5916]],
+[[5917]],
+[[5918]],
+[[5919]],
+[[5920]],
+[[5921]],
+[[5922]],
+[[5923]],
+[[5924]],
+[[5925]],
+[[5926]],
+[[5927]],
+[[5928]],
+[[5929]],
+[[5930]],
+[[5931]],
+[[5932]],
+[[5933]],
+[[5934]],
+[[5935]],
+[[5936]],
+[[5937]],
+[[5938]],
+[[5939]],
+[[5940]],
+[[5941]],
+[[5942]],
+[[5943]],
+[[5944]],
+[[5945]],
+[[5946]],
+[[5947]],
+[[5948]],
+[[5949]],
+[[5950]],
+[[5951]],
+[[5952]],
+[[5953]],
+[[5954]],
+[[5955]],
+[[5956]],
+[[5957]],
+[[5958]],
+[[5959]],
+[[5960]],
+[[5961]],
+[[5962]],
+[[5963]],
+[[5964]],
+[[5965]],
+[[5966]],
+[[5967]],
+[[5968]],
+[[5969]],
+[[5970]],
+[[5971]],
+[[5972]],
+[[5973]],
+[[5974]],
+[[5975]],
+[[5976]],
+[[5977]],
+[[5978]],
+[[5979]],
+[[5980]],
+[[5981]],
+[[5982]],
+[[5983]],
+[[5984]],
+[[5985]],
+[[5986]],
+[[5987]],
+[[5988]],
+[[5989]],
+[[5990]],
+[[5991]],
+[[5992]],
+[[5993]],
+[[5994]],
+[[5995]],
+[[5996]],
+[[5997]],
+[[5998]],
+[[5999]],
+[[6000]],
+[[6001]],
+[[6002]],
+[[6003]],
+[[6004]],
+[[6005]],
+[[6006]],
+[[6007]],
+[[6008]],
+[[6009]],
+[[6010]],
+[[6011]],
+[[6012]],
+[[6013]],
+[[6014]],
+[[6015]],
+[[6016]],
+[[6017]],
+[[6018]],
+[[6019]],
+[[6020]],
+[[6021]],
+[[6022]],
+[[6023]],
+[[6024]],
+[[6025]],
+[[6026]],
+[[6027]],
+[[6028]],
+[[6029]],
+[[6030]],
+[[6031]],
+[[6032]],
+[[6033]],
+[[6034]],
+[[6035]],
+[[6036]],
+[[6037]],
+[[6038]],
+[[6039]],
+[[6040]],
+[[6041]],
+[[6042]],
+[[6043]],
+[[6044]],
+[[6045]],
+[[6046]],
+[[6047]],
+[[6048]],
+[[6049]],
+[[6050]],
+[[6051]],
+[[6052]],
+[[6053]],
+[[6054]],
+[[6055]],
+[[6056]],
+[[6057]],
+[[6058]],
+[[6059]],
+[[6060]],
+[[6061]],
+[[6062]],
+[[6063]],
+[[6064]],
+[[6065]],
+[[6066]],
+[[6067]],
+[[6068]],
+[[6069]],
+[[6070]],
+[[6071]],
+[[6072]],
+[[6073]],
+[[6074]],
+[[6075]],
+[[6076]],
+[[6077]],
+[[6078]],
+[[6079]],
+[[6080]],
+[[6081]],
+[[6082]],
+[[6083]],
+[[6084]],
+[[6085]],
+[[6086]],
+[[6087]],
+[[6088]],
+[[6089]],
+[[6090]],
+[[6091]],
+[[6092]],
+[[6093]],
+[[6094]],
+[[6095]],
+[[6096]],
+[[6097]],
+[[6098]],
+[[6099]],
+[[6100]],
+[[6101]],
+[[6102]],
+[[6103]],
+[[6104]],
+[[6105]],
+[[6106]],
+[[6107]],
+[[6108]],
+[[6109]],
+[[6110]],
+[[6111]],
+[[6112]],
+[[6113]],
+[[6114]],
+[[6115]],
+[[6116]],
+[[6117]],
+[[6118]],
+[[6119]],
+[[6120]],
+[[6121]],
+[[6122]],
+[[6123]],
+[[6124]],
+[[6125]],
+[[6126]],
+[[6127]],
+[[6128]],
+[[6129]],
+[[6130]],
+[[6131]],
+[[6132]],
+[[6133]],
+[[6134]],
+[[6135]],
+[[6136]],
+[[6137]],
+[[6138]],
+[[6139]],
+[[6140]],
+[[6141]],
+[[6142]],
+[[6143]],
+[[6144]],
+[[6145]],
+[[6146]],
+[[6147]],
+[[6148]],
+[[6149]],
+[[6150]],
+[[6151]],
+[[6152]],
+[[6153]],
+[[6154]],
+[[6155]],
+[[6156]],
+[[6157]],
+[[6158]],
+[[6159]],
+[[6160]],
+[[6161]],
+[[6162]],
+[[6163]],
+[[6164]],
+[[6165]],
+[[6166]],
+[[6167]],
+[[6168]],
+[[6169]],
+[[6170]],
+[[6171]],
+[[6172]],
+[[6173]],
+[[6174]],
+[[6175]],
+[[6176]],
+[[6177]],
+[[6178]],
+[[6179]],
+[[6180]],
+[[6181]],
+[[6182]],
+[[6183]],
+[[6184]],
+[[6185]],
+[[6186]],
+[[6187]],
+[[6188]],
+[[6189]],
+[[6190]],
+[[6191]],
+[[6192]],
+[[6193]],
+[[6194]],
+[[6195]],
+[[6196]],
+[[6197]],
+[[6198]],
+[[6199]],
+[[6200]],
+[[6201]],
+[[6202]],
+[[6203]],
+[[6204]],
+[[6205]],
+[[6206]],
+[[6207]],
+[[6208]],
+[[6209]],
+[[6210]],
+[[6211]],
+[[6212]],
+[[6213]],
+[[6214]],
+[[6215]],
+[[6216]],
+[[6217]],
+[[6218]],
+[[6219]],
+[[6220]],
+[[6221]],
+[[6222]],
+[[6223]],
+[[6224]],
+[[6225]],
+[[6226]],
+[[6227]],
+[[6228]],
+[[6229]],
+[[6230]],
+[[6231]],
+[[6232]],
+[[6233]],
+[[6234]],
+[[6235]],
+[[6236]],
+[[6237]],
+[[6238]],
+[[6239]],
+[[6240]],
+[[6241]],
+[[6242]],
+[[6243]],
+[[6244]],
+[[6245]],
+[[6246]],
+[[6247]],
+[[6248]],
+[[6249]],
+[[6250]],
+[[6251]],
+[[6252]],
+[[6253]],
+[[6254]],
+[[6255]],
+[[6256]],
+[[6257]],
+[[6258]],
+[[6259]],
+[[6260]],
+[[6261]],
+[[6262]],
+[[6263]],
+[[6264]],
+[[6265]],
+[[6266]],
+[[6267]],
+[[6268]],
+[[6269]],
+[[6270]],
+[[6271]],
+[[6272]],
+[[6273]],
+[[6274]],
+[[6275]],
+[[6276]],
+[[6277]],
+[[6278]],
+[[6279]],
+[[6280]],
+[[6281]],
+[[6282]],
+[[6283]],
+[[6284]],
+[[6285]],
+[[6286]],
+[[6287]],
+[[6288]],
+[[6289]],
+[[6290]],
+[[6291]],
+[[6292]],
+[[6293]],
+[[6294]],
+[[6295]],
+[[6296]],
+[[6297]],
+[[6298]],
+[[6299]],
+[[6300]],
+[[6301]],
+[[6302]],
+[[6303]],
+[[6304]],
+[[6305]],
+[[6306]],
+[[6307]],
+[[6308]],
+[[6309]],
+[[6310]],
+[[6311]],
+[[6312]],
+[[6313]],
+[[6314]],
+[[6315]],
+[[6316]],
+[[6317]],
+[[6318]],
+[[6319]],
+[[6320]],
+[[6321]],
+[[6322]],
+[[6323]],
+[[6324]],
+[[6325]],
+[[6326]],
+[[6327]],
+[[6328]],
+[[6329]],
+[[6330]],
+[[6331]],
+[[6332]],
+[[6333]],
+[[6334]],
+[[6335]],
+[[6336]],
+[[6337]],
+[[6338]],
+[[6339]],
+[[6340]],
+[[6341]],
+[[6342]],
+[[6343]],
+[[6344]],
+[[6345]],
+[[6346]],
+[[6347]],
+[[6348]],
+[[6349]],
+[[6350]],
+[[6351]],
+[[6352]],
+[[6353]],
+[[6354]],
+[[6355]],
+[[6356]],
+[[6357]],
+[[6358]],
+[[6359]],
+[[6360]],
+[[6361]],
+[[6362]],
+[[6363]],
+[[6364]],
+[[6365]],
+[[6366]],
+[[6367]],
+[[6368]],
+[[6369]],
+[[6370]],
+[[6371]],
+[[6372]],
+[[6373]],
+[[6374]],
+[[6375]],
+[[6376]],
+[[6377]],
+[[6378]],
+[[6379]],
+[[6380]],
+[[6381]],
+[[6382]],
+[[6383]],
+[[6384]],
+[[6385]],
+[[6386]],
+[[6387]],
+[[6388]],
+[[6389]],
+[[6390]],
+[[6391]],
+[[6392]],
+[[6393]],
+[[6394]],
+[[6395]],
+[[6396]],
+[[6397]],
+[[6398]],
+[[6399]],
+[[6400]],
+[[6401]],
+[[6402]],
+[[6403]],
+[[6404]],
+[[6405]],
+[[6406]],
+[[6407]],
+[[6408]],
+[[6409]],
+[[6410]],
+[[6411]],
+[[6412]],
+[[6413]],
+[[6414]],
+[[6415]],
+[[6416]],
+[[6417]],
+[[6418]],
+[[6419]],
+[[6420]],
+[[6421]],
+[[6422]],
+[[6423]],
+[[6424]],
+[[6425]],
+[[6426]],
+[[6427]],
+[[6428]],
+[[6429]],
+[[6430]],
+[[6431]],
+[[6432]],
+[[6433]],
+[[6434]],
+[[6435]],
+[[6436]],
+[[6437]],
+[[6438]],
+[[6439]],
+[[6440]],
+[[6441]],
+[[6442]],
+[[6443]],
+[[6444]],
+[[6445]],
+[[6446]],
+[[6447]],
+[[6448]],
+[[6449]],
+[[6450]],
+[[6451]],
+[[6452]],
+[[6453]],
+[[6454]],
+[[6455]],
+[[6456]],
+[[6457]],
+[[6458]],
+[[6459]],
+[[6460]],
+[[6461]],
+[[6462]],
+[[6463]],
+[[6464]],
+[[6465]],
+[[6466]],
+[[6467]],
+[[6468]],
+[[6469]],
+[[6470]],
+[[6471]],
+[[6472]],
+[[6473]],
+[[6474]],
+[[6475]],
+[[6476]],
+[[6477]],
+[[6478]],
+[[6479]],
+[[6480]],
+[[6481]],
+[[6482]],
+[[6483]],
+[[6484]],
+[[6485]],
+[[6486]],
+[[6487]],
+[[6488]],
+[[6489]],
+[[6490]],
+[[6491]],
+[[6492]],
+[[6493]],
+[[6494]],
+[[6495]],
+[[6496]],
+[[6497]],
+[[6498]],
+[[6499]],
+[[6500]],
+[[6501]],
+[[6502]],
+[[6503]],
+[[6504]],
+[[6505]],
+[[6506]],
+[[6507]],
+[[6508]],
+[[6509]],
+[[6510]],
+[[6511]],
+[[6512]],
+[[6513]],
+[[6514]],
+[[6515]],
+[[6516]],
+[[6517]],
+[[6518]],
+[[6519]],
+[[6520]],
+[[6521]],
+[[6522]],
+[[6523]],
+[[6524]],
+[[6525]],
+[[6526]],
+[[6527]],
+[[6528]],
+[[6529]],
+[[6530]],
+[[6531]],
+[[6532]],
+[[6533]],
+[[6534]],
+[[6535]],
+[[6536]],
+[[6537]],
+[[6538]],
+[[6539]],
+[[6540]],
+[[6541]],
+[[6542]],
+[[6543]],
+[[6544]],
+[[6545]],
+[[6546]],
+[[6547]],
+[[6548]],
+[[6549]],
+[[6550]],
+[[6551]],
+[[6552]],
+[[6553]],
+[[6554]],
+[[6555]],
+[[6556]],
+[[6557]],
+[[6558]],
+[[6559]],
+[[6560]],
+[[6561]],
+[[6562]],
+[[6563]],
+[[6564]],
+[[6565]],
+[[6566]],
+[[6567]],
+[[6568]],
+[[6569]],
+[[6570]],
+[[6571]],
+[[6572]],
+[[6573]],
+[[6574]],
+[[6575]],
+[[6576]],
+[[6577]],
+[[6578]],
+[[6579]],
+[[6580]],
+[[6581]],
+[[6582]],
+[[6583]],
+[[6584]],
+[[6585]],
+[[6586]],
+[[6587]],
+[[6588]],
+[[6589]],
+[[6590]],
+[[6591]],
+[[6592]],
+[[6593]],
+[[6594]],
+[[6595]],
+[[6596]],
+[[6597]],
+[[6598]],
+[[6599]],
+[[6600]],
+[[6601]],
+[[6602]],
+[[6603]],
+[[6604]],
+[[6605]],
+[[6606]],
+[[6607]],
+[[6608]],
+[[6609]],
+[[6610]],
+[[6611]],
+[[6612]],
+[[6613]],
+[[6614]],
+[[6615]],
+[[6616]],
+[[6617]],
+[[6618]],
+[[6619]],
+[[6620]],
+[[6621]],
+[[6622]],
+[[6623]],
+[[6624]],
+[[6625]],
+[[6626]],
+[[6627]],
+[[6628]],
+[[6629]],
+[[6630]],
+[[6631]],
+[[6632]],
+[[6633]],
+[[6634]],
+[[6635]],
+[[6636]],
+[[6637]],
+[[6638]],
+[[6639]],
+[[6640]],
+[[6641]],
+[[6642]],
+[[6643]],
+[[6644]],
+[[6645]],
+[[6646]],
+[[6647]],
+[[6648]],
+[[6649]],
+[[6650]],
+[[6651]],
+[[6652]],
+[[6653]],
+[[6654]],
+[[6655]],
+[[6656]],
+[[6657]],
+[[6658]],
+[[6659]],
+[[6660]],
+[[6661]],
+[[6662]],
+[[6663]],
+[[6664]],
+[[6665]],
+[[6666]],
+[[6667]],
+[[6668]],
+[[6669]],
+[[6670]],
+[[6671]],
+[[6672]],
+[[6673]],
+[[6674]],
+[[6675]],
+[[6676]],
+[[6677]],
+[[6678]],
+[[6679]],
+[[6680]],
+[[6681]],
+[[6682]],
+[[6683]],
+[[6684]],
+[[6685]],
+[[6686]],
+[[6687]],
+[[6688]],
+[[6689]],
+[[6690]],
+[[6691]],
+[[6692]],
+[[6693]],
+[[6694]],
+[[6695]],
+[[6696]],
+[[6697]],
+[[6698]],
+[[6699]],
+[[6700]],
+[[6701]],
+[[6702]],
+[[6703]],
+[[6704]],
+[[6705]],
+[[6706]],
+[[6707]],
+[[6708]],
+[[6709]],
+[[6710]],
+[[6711]],
+[[6712]],
+[[6713]],
+[[6714]],
+[[6715]],
+[[6716]],
+[[6717]],
+[[6718]],
+[[6719]],
+[[6720]],
+[[6721]],
+[[6722]],
+[[6723]],
+[[6724]],
+[[6725]],
+[[6726]],
+[[6727]],
+[[6728]],
+[[6729]],
+[[6730]],
+[[6731]],
+[[6732]],
+[[6733]],
+[[6734]],
+[[6735]],
+[[6736]],
+[[6737]],
+[[6738]],
+[[6739]],
+[[6740]],
+[[6741]],
+[[6742]],
+[[6743]],
+[[6744]],
+[[6745]],
+[[6746]],
+[[6747]],
+[[6748]],
+[[6749]],
+[[6750]],
+[[6751]],
+[[6752]],
+[[6753]],
+[[6754]],
+[[6755]],
+[[6756]],
+[[6757]],
+[[6758]],
+[[6759]],
+[[6760]],
+[[6761]],
+[[6762]],
+[[6763]],
+[[6764]],
+[[6765]],
+[[6766]],
+[[6767]],
+[[6768]],
+[[6769]],
+[[6770]],
+[[6771]],
+[[6772]],
+[[6773]],
+[[6774]],
+[[6775]],
+[[6776]],
+[[6777]],
+[[6778]],
+[[6779]],
+[[6780]],
+[[6781]],
+[[6782]],
+[[6783]],
+[[6784]],
+[[6785]],
+[[6786]],
+[[6787]],
+[[6788]],
+[[6789]],
+[[6790]],
+[[6791]],
+[[6792]],
+[[6793]],
+[[6794]],
+[[6795]],
+[[6796]],
+[[6797]],
+[[6798]],
+[[6799]],
+[[6800]],
+[[6801]],
+[[6802]],
+[[6803]],
+[[6804]],
+[[6805]],
+[[6806]],
+[[6807]],
+[[6808]],
+[[6809]],
+[[6810]],
+[[6811]],
+[[6812]],
+[[6813]],
+[[6814]],
+[[6815]],
+[[6816]],
+[[6817]],
+[[6818]],
+[[6819]],
+[[6820]],
+[[6821]],
+[[6822]],
+[[6823]],
+[[6824]],
+[[6825]],
+[[6826]],
+[[6827]],
+[[6828]],
+[[6829]],
+[[6830]],
+[[6831]],
+[[6832]],
+[[6833]],
+[[6834]],
+[[6835]],
+[[6836]],
+[[6837]],
+[[6838]],
+[[6839]],
+[[6840]],
+[[6841]],
+[[6842]],
+[[6843]],
+[[6844]],
+[[6845]],
+[[6846]],
+[[6847]],
+[[6848]],
+[[6849]],
+[[6850]],
+[[6851]],
+[[6852]],
+[[6853]],
+[[6854]],
+[[6855]],
+[[6856]],
+[[6857]],
+[[6858]],
+[[6859]],
+[[6860]],
+[[6861]],
+[[6862]],
+[[6863]],
+[[6864]],
+[[6865]],
+[[6866]],
+[[6867]],
+[[6868]],
+[[6869]],
+[[6870]],
+[[6871]],
+[[6872]],
+[[6873]],
+[[6874]],
+[[6875]],
+[[6876]],
+[[6877]],
+[[6878]],
+[[6879]],
+[[6880]],
+[[6881]],
+[[6882]],
+[[6883]],
+[[6884]],
+[[6885]],
+[[6886]],
+[[6887]],
+[[6888]],
+[[6889]],
+[[6890]],
+[[6891]],
+[[6892]],
+[[6893]],
+[[6894]],
+[[6895]],
+[[6896]],
+[[6897]],
+[[6898]],
+[[6899]],
+[[6900]],
+[[6901]],
+[[6902]],
+[[6903]],
+[[6904]],
+[[6905]],
+[[6906]],
+[[6907]],
+[[6908]],
+[[6909]],
+[[6910]],
+[[6911]],
+[[6912]],
+[[6913]],
+[[6914]],
+[[6915]],
+[[6916]],
+[[6917]],
+[[6918]],
+[[6919]],
+[[6920]],
+[[6921]],
+[[6922]],
+[[6923]],
+[[6924]],
+[[6925]],
+[[6926]],
+[[6927]],
+[[6928]],
+[[6929]],
+[[6930]],
+[[6931]],
+[[6932]],
+[[6933]],
+[[6934]],
+[[6935]],
+[[6936]],
+[[6937]],
+[[6938]],
+[[6939]],
+[[6940]],
+[[6941]],
+[[6942]],
+[[6943]],
+[[6944]],
+[[6945]],
+[[6946]],
+[[6947]],
+[[6948]],
+[[6949]],
+[[6950]],
+[[6951]],
+[[6952]],
+[[6953]],
+[[6954]],
+[[6955]],
+[[6956]],
+[[6957]],
+[[6958]],
+[[6959]],
+[[6960]],
+[[6961]],
+[[6962]],
+[[6963]],
+[[6964]],
+[[6965]],
+[[6966]],
+[[6967]],
+[[6968]],
+[[6969]],
+[[6970]],
+[[6971]],
+[[6972]],
+[[6973]],
+[[6974]],
+[[6975]],
+[[6976]],
+[[6977]],
+[[6978]],
+[[6979]],
+[[6980]],
+[[6981]],
+[[6982]],
+[[6983]],
+[[6984]],
+[[6985]],
+[[6986]],
+[[6987]],
+[[6988]],
+[[6989]],
+[[6990]],
+[[6991]],
+[[6992]],
+[[6993]],
+[[6994]],
+[[6995]],
+[[6996]],
+[[6997]],
+[[6998]],
+[[6999]],
+[[7000]],
+[[7001]],
+[[7002]],
+[[7003]],
+[[7004]],
+[[7005]],
+[[7006]],
+[[7007]],
+[[7008]],
+[[7009]],
+[[7010]],
+[[7011]],
+[[7012]],
+[[7013]],
+[[7014]],
+[[7015]],
+[[7016]],
+[[7017]],
+[[7018]],
+[[7019]],
+[[7020]],
+[[7021]],
+[[7022]],
+[[7023]],
+[[7024]],
+[[7025]],
+[[7026]],
+[[7027]],
+[[7028]],
+[[7029]],
+[[7030]],
+[[7031]],
+[[7032]],
+[[7033]],
+[[7034]],
+[[7035]],
+[[7036]],
+[[7037]],
+[[7038]],
+[[7039]],
+[[7040]],
+[[7041]],
+[[7042]],
+[[7043]],
+[[7044]],
+[[7045]],
+[[7046]],
+[[7047]],
+[[7048]],
+[[7049]],
+[[7050]],
+[[7051]],
+[[7052]],
+[[7053]],
+[[7054]],
+[[7055]],
+[[7056]],
+[[7057]],
+[[7058]],
+[[7059]],
+[[7060]],
+[[7061]],
+[[7062]],
+[[7063]],
+[[7064]],
+[[7065]],
+[[7066]],
+[[7067]],
+[[7068]],
+[[7069]],
+[[7070]],
+[[7071]],
+[[7072]],
+[[7073]],
+[[7074]],
+[[7075]],
+[[7076]],
+[[7077]],
+[[7078]],
+[[7079]],
+[[7080]],
+[[7081]],
+[[7082]],
+[[7083]],
+[[7084]],
+[[7085]],
+[[7086]],
+[[7087]],
+[[7088]],
+[[7089]],
+[[7090]],
+[[7091]],
+[[7092]],
+[[7093]],
+[[7094]],
+[[7095]],
+[[7096]],
+[[7097]],
+[[7098]],
+[[7099]],
+[[7100]],
+[[7101]],
+[[7102]],
+[[7103]],
+[[7104]],
+[[7105]],
+[[7106]],
+[[7107]],
+[[7108]],
+[[7109]],
+[[7110]],
+[[7111]],
+[[7112]],
+[[7113]],
+[[7114]],
+[[7115]],
+[[7116]],
+[[7117]],
+[[7118]],
+[[7119]],
+[[7120]],
+[[7121]],
+[[7122]],
+[[7123]],
+[[7124]],
+[[7125]],
+[[7126]],
+[[7127]],
+[[7128]],
+[[7129]],
+[[7130]],
+[[7131]],
+[[7132]],
+[[7133]],
+[[7134]],
+[[7135]],
+[[7136]],
+[[7137]],
+[[7138]],
+[[7139]],
+[[7140]],
+[[7141]],
+[[7142]],
+[[7143]],
+[[7144]],
+[[7145]],
+[[7146]],
+[[7147]],
+[[7148]],
+[[7149]],
+[[7150]],
+[[7151]],
+[[7152]],
+[[7153]],
+[[7154]],
+[[7155]],
+[[7156]],
+[[7157]],
+[[7158]],
+[[7159]],
+[[7160]],
+[[7161]],
+[[7162]],
+[[7163]],
+[[7164]],
+[[7165]],
+[[7166]],
+[[7167]],
+[[7168]],
+[[7169]],
+[[7170]],
+[[7171]],
+[[7172]],
+[[7173]],
+[[7174]],
+[[7175]],
+[[7176]],
+[[7177]],
+[[7178]],
+[[7179]],
+[[7180]],
+[[7181]],
+[[7182]],
+[[7183]],
+[[7184]],
+[[7185]],
+[[7186]],
+[[7187]],
+[[7188]],
+[[7189]],
+[[7190]],
+[[7191]],
+[[7192]],
+[[7193]],
+[[7194]],
+[[7195]],
+[[7196]],
+[[7197]],
+[[7198]],
+[[7199]],
+[[7200]],
+[[7201]],
+[[7202]],
+[[7203]],
+[[7204]],
+[[7205]],
+[[7206]],
+[[7207]],
+[[7208]],
+[[7209]],
+[[7210]],
+[[7211]],
+[[7212]],
+[[7213]],
+[[7214]],
+[[7215]],
+[[7216]],
+[[7217]],
+[[7218]],
+[[7219]],
+[[7220]],
+[[7221]],
+[[7222]],
+[[7223]],
+[[7224]],
+[[7225]],
+[[7226]],
+[[7227]],
+[[7228]],
+[[7229]],
+[[7230]],
+[[7231]],
+[[7232]],
+[[7233]],
+[[7234]],
+[[7235]],
+[[7236]],
+[[7237]],
+[[7238]],
+[[7239]],
+[[7240]],
+[[7241]],
+[[7242]],
+[[7243]],
+[[7244]],
+[[7245]],
+[[7246]],
+[[7247]],
+[[7248]],
+[[7249]],
+[[7250]],
+[[7251]],
+[[7252]],
+[[7253]],
+[[7254]],
+[[7255]],
+[[7256]],
+[[7257]],
+[[7258]],
+[[7259]],
+[[7260]],
+[[7261]],
+[[7262]],
+[[7263]],
+[[7264]],
+[[7265]],
+[[7266]],
+[[7267]],
+[[7268]],
+[[7269]],
+[[7270]],
+[[7271]],
+[[7272]],
+[[7273]],
+[[7274]],
+[[7275]],
+[[7276]],
+[[7277]],
+[[7278]],
+[[7279]],
+[[7280]],
+[[7281]],
+[[7282]],
+[[7283]],
+[[7284]],
+[[7285]],
+[[7286]],
+[[7287]],
+[[7288]],
+[[7289]],
+[[7290]],
+[[7291]],
+[[7292]],
+[[7293]],
+[[7294]],
+[[7295]],
+[[7296]],
+[[7297]],
+[[7298]],
+[[7299]],
+[[7300]],
+[[7301]],
+[[7302]],
+[[7303]],
+[[7304]],
+[[7305]],
+[[7306]],
+[[7307]],
+[[7308]],
+[[7309]],
+[[7310]],
+[[7311]],
+[[7312]],
+[[7313]],
+[[7314]],
+[[7315]],
+[[7316]],
+[[7317]],
+[[7318]],
+[[7319]],
+[[7320]],
+[[7321]],
+[[7322]],
+[[7323]],
+[[7324]],
+[[7325]],
+[[7326]],
+[[7327]],
+[[7328]],
+[[7329]],
+[[7330]],
+[[7331]],
+[[7332]],
+[[7333]],
+[[7334]],
+[[7335]],
+[[7336]],
+[[7337]],
+[[7338]],
+[[7339]],
+[[7340]],
+[[7341]],
+[[7342]],
+[[7343]],
+[[7344]],
+[[7345]],
+[[7346]],
+[[7347]],
+[[7348]],
+[[7349]],
+[[7350]],
+[[7351]],
+[[7352]],
+[[7353]],
+[[7354]],
+[[7355]],
+[[7356]],
+[[7357]],
+[[7358]],
+[[7359]],
+[[7360]],
+[[7361]],
+[[7362]],
+[[7363]],
+[[7364]],
+[[7365]],
+[[7366]],
+[[7367]],
+[[7368]],
+[[7369]],
+[[7370]],
+[[7371]],
+[[7372]],
+[[7373]],
+[[7374]],
+[[7375]],
+[[7376]],
+[[7377]],
+[[7378]],
+[[7379]],
+[[7380]],
+[[7381]],
+[[7382]],
+[[7383]],
+[[7384]],
+[[7385]],
+[[7386]],
+[[7387]],
+[[7388]],
+[[7389]],
+[[7390]],
+[[7391]],
+[[7392]],
+[[7393]],
+[[7394]],
+[[7395]],
+[[7396]],
+[[7397]],
+[[7398]],
+[[7399]],
+[[7400]],
+[[7401]],
+[[7402]],
+[[7403]],
+[[7404]],
+[[7405]],
+[[7406]],
+[[7407]],
+[[7408]],
+[[7409]],
+[[7410]],
+[[7411]],
+[[7412]],
+[[7413]],
+[[7414]],
+[[7415]],
+[[7416]],
+[[7417]],
+[[7418]],
+[[7419]],
+[[7420]],
+[[7421]],
+[[7422]],
+[[7423]],
+[[7424]],
+[[7425]],
+[[7426]],
+[[7427]],
+[[7428]],
+[[7429]],
+[[7430]],
+[[7431]],
+[[7432]],
+[[7433]],
+[[7434]],
+[[7435]],
+[[7436]],
+[[7437]],
+[[7438]],
+[[7439]],
+[[7440]],
+[[7441]],
+[[7442]],
+[[7443]],
+[[7444]],
+[[7445]],
+[[7446]],
+[[7447]],
+[[7448]],
+[[7449]],
+[[7450]],
+[[7451]],
+[[7452]],
+[[7453]],
+[[7454]],
+[[7455]],
+[[7456]],
+[[7457]],
+[[7458]],
+[[7459]],
+[[7460]],
+[[7461]],
+[[7462]],
+[[7463]],
+[[7464]],
+[[7465]],
+[[7466]],
+[[7467]],
+[[7468]],
+[[7469]],
+[[7470]],
+[[7471]],
+[[7472]],
+[[7473]],
+[[7474]],
+[[7475]],
+[[7476]],
+[[7477]],
+[[7478]],
+[[7479]],
+[[7480]],
+[[7481]],
+[[7482]],
+[[7483]],
+[[7484]],
+[[7485]],
+[[7486]],
+[[7487]],
+[[7488]],
+[[7489]],
+[[7490]],
+[[7491]],
+[[7492]],
+[[7493]],
+[[7494]],
+[[7495]],
+[[7496]],
+[[7497]],
+[[7498]],
+[[7499]],
+[[7500]],
+[[7501]],
+[[7502]],
+[[7503]],
+[[7504]],
+[[7505]],
+[[7506]],
+[[7507]],
+[[7508]],
+[[7509]],
+[[7510]],
+[[7511]],
+[[7512]],
+[[7513]],
+[[7514]],
+[[7515]],
+[[7516]],
+[[7517]],
+[[7518]],
+[[7519]],
+[[7520]],
+[[7521]],
+[[7522]],
+[[7523]],
+[[7524]],
+[[7525]],
+[[7526]],
+[[7527]],
+[[7528]],
+[[7529]],
+[[7530]],
+[[7531]],
+[[7532]],
+[[7533]],
+[[7534]],
+[[7535]],
+[[7536]],
+[[7537]],
+[[7538]],
+[[7539]],
+[[7540]],
+[[7541]],
+[[7542]],
+[[7543]],
+[[7544]],
+[[7545]],
+[[7546]],
+[[7547]],
+[[7548]],
+[[7549]],
+[[7550]],
+[[7551]],
+[[7552]],
+[[7553]],
+[[7554]],
+[[7555]],
+[[7556]],
+[[7557]],
+[[7558]],
+[[7559]],
+[[7560]],
+[[7561]],
+[[7562]],
+[[7563]],
+[[7564]],
+[[7565]],
+[[7566]],
+[[7567]],
+[[7568]],
+[[7569]],
+[[7570]],
+[[7571]],
+[[7572]],
+[[7573]],
+[[7574]],
+[[7575]],
+[[7576]],
+[[7577]],
+[[7578]],
+[[7579]],
+[[7580]],
+[[7581]],
+[[7582]],
+[[7583]],
+[[7584]],
+[[7585]],
+[[7586]],
+[[7587]],
+[[7588]],
+[[7589]],
+[[7590]],
+[[7591]],
+[[7592]],
+[[7593]],
+[[7594]],
+[[7595]],
+[[7596]],
+[[7597]],
+[[7598]],
+[[7599]],
+[[7600]],
+[[7601]],
+[[7602]],
+[[7603]],
+[[7604]],
+[[7605]],
+[[7606]],
+[[7607]],
+[[7608]],
+[[7609]],
+[[7610]],
+[[7611]],
+[[7612]],
+[[7613]],
+[[7614]],
+[[7615]],
+[[7616]],
+[[7617]],
+[[7618]],
+[[7619]],
+[[7620]],
+[[7621]],
+[[7622]],
+[[7623]],
+[[7624]],
+[[7625]],
+[[7626]],
+[[7627]],
+[[7628]],
+[[7629]],
+[[7630]],
+[[7631]],
+[[7632]],
+[[7633]],
+[[7634]],
+[[7635]],
+[[7636]],
+[[7637]],
+[[7638]],
+[[7639]],
+[[7640]],
+[[7641]],
+[[7642]],
+[[7643]],
+[[7644]],
+[[7645]],
+[[7646]],
+[[7647]],
+[[7648]],
+[[7649]],
+[[7650]],
+[[7651]],
+[[7652]],
+[[7653]],
+[[7654]],
+[[7655]],
+[[7656]],
+[[7657]],
+[[7658]],
+[[7659]],
+[[7660]],
+[[7661]],
+[[7662]],
+[[7663]],
+[[7664]],
+[[7665]],
+[[7666]],
+[[7667]],
+[[7668]],
+[[7669]],
+[[7670]],
+[[7671]],
+[[7672]],
+[[7673]],
+[[7674]],
+[[7675]],
+[[7676]],
+[[7677]],
+[[7678]],
+[[7679]],
+[[7680]],
+[[7681]],
+[[7682]],
+[[7683]],
+[[7684]],
+[[7685]],
+[[7686]],
+[[7687]],
+[[7688]],
+[[7689]],
+[[7690]],
+[[7691]],
+[[7692]],
+[[7693]],
+[[7694]],
+[[7695]],
+[[7696]],
+[[7697]],
+[[7698]],
+[[7699]],
+[[7700]],
+[[7701]],
+[[7702]],
+[[7703]],
+[[7704]],
+[[7705]],
+[[7706]],
+[[7707]],
+[[7708]],
+[[7709]],
+[[7710]],
+[[7711]],
+[[7712]],
+[[7713]],
+[[7714]],
+[[7715]],
+[[7716]],
+[[7717]],
+[[7718]],
+[[7719]],
+[[7720]],
+[[7721]],
+[[7722]],
+[[7723]],
+[[7724]],
+[[7725]],
+[[7726]],
+[[7727]],
+[[7728]],
+[[7729]],
+[[7730]],
+[[7731]],
+[[7732]],
+[[7733]],
+[[7734]],
+[[7735]],
+[[7736]],
+[[7737]],
+[[7738]],
+[[7739]],
+[[7740]],
+[[7741]],
+[[7742]],
+[[7743]],
+[[7744]],
+[[7745]],
+[[7746]],
+[[7747]],
+[[7748]],
+[[7749]],
+[[7750]],
+[[7751]],
+[[7752]],
+[[7753]],
+[[7754]],
+[[7755]],
+[[7756]],
+[[7757]],
+[[7758]],
+[[7759]],
+[[7760]],
+[[7761]],
+[[7762]],
+[[7763]],
+[[7764]],
+[[7765]],
+[[7766]],
+[[7767]],
+[[7768]],
+[[7769]],
+[[7770]],
+[[7771]],
+[[7772]],
+[[7773]],
+[[7774]],
+[[7775]],
+[[7776]],
+[[7777]],
+[[7778]],
+[[7779]],
+[[7780]],
+[[7781]],
+[[7782]],
+[[7783]],
+[[7784]],
+[[7785]],
+[[7786]],
+[[7787]],
+[[7788]],
+[[7789]],
+[[7790]],
+[[7791]],
+[[7792]],
+[[7793]],
+[[7794]],
+[[7795]],
+[[7796]],
+[[7797]],
+[[7798]],
+[[7799]],
+[[7800]],
+[[7801]],
+[[7802]],
+[[7803]],
+[[7804]],
+[[7805]],
+[[7806]],
+[[7807]],
+[[7808]],
+[[7809]],
+[[7810]],
+[[7811]],
+[[7812]],
+[[7813]],
+[[7814]],
+[[7815]],
+[[7816]],
+[[7817]],
+[[7818]],
+[[7819]],
+[[7820]],
+[[7821]],
+[[7822]],
+[[7823]],
+[[7824]],
+[[7825]],
+[[7826]],
+[[7827]],
+[[7828]],
+[[7829]],
+[[7830]],
+[[7831]],
+[[7832]],
+[[7833]],
+[[7834]],
+[[7835]],
+[[7836]],
+[[7837]],
+[[7838]],
+[[7839]],
+[[7840]],
+[[7841]],
+[[7842]],
+[[7843]],
+[[7844]],
+[[7845]],
+[[7846]],
+[[7847]],
+[[7848]],
+[[7849]],
+[[7850]],
+[[7851]],
+[[7852]],
+[[7853]],
+[[7854]],
+[[7855]],
+[[7856]],
+[[7857]],
+[[7858]],
+[[7859]],
+[[7860]],
+[[7861]],
+[[7862]],
+[[7863]],
+[[7864]],
+[[7865]],
+[[7866]],
+[[7867]],
+[[7868]],
+[[7869]],
+[[7870]],
+[[7871]],
+[[7872]],
+[[7873]],
+[[7874]],
+[[7875]],
+[[7876]],
+[[7877]],
+[[7878]],
+[[7879]],
+[[7880]],
+[[7881]],
+[[7882]],
+[[7883]],
+[[7884]],
+[[7885]],
+[[7886]],
+[[7887]],
+[[7888]],
+[[7889]],
+[[7890]],
+[[7891]],
+[[7892]],
+[[7893]],
+[[7894]],
+[[7895]],
+[[7896]],
+[[7897]],
+[[7898]],
+[[7899]],
+[[7900]],
+[[7901]],
+[[7902]],
+[[7903]],
+[[7904]],
+[[7905]],
+[[7906]],
+[[7907]],
+[[7908]],
+[[7909]],
+[[7910]],
+[[7911]],
+[[7912]],
+[[7913]],
+[[7914]],
+[[7915]],
+[[7916]],
+[[7917]],
+[[7918]],
+[[7919]],
+[[7920]],
+[[7921]],
+[[7922]],
+[[7923]],
+[[7924]],
+[[7925]],
+[[7926]],
+[[7927]],
+[[7928]],
+[[7929]],
+[[7930]],
+[[7931]],
+[[7932]],
+[[7933]],
+[[7934]],
+[[7935]],
+[[7936]],
+[[7937]],
+[[7938]],
+[[7939]],
+[[7940]],
+[[7941]],
+[[7942]],
+[[7943]],
+[[7944]],
+[[7945]],
+[[7946]],
+[[7947]],
+[[7948]],
+[[7949]],
+[[7950]],
+[[7951]],
+[[7952]],
+[[7953]],
+[[7954]],
+[[7955]],
+[[7956]],
+[[7957]],
+[[7958]],
+[[7959]],
+[[7960]],
+[[7961]],
+[[7962]],
+[[7963]],
+[[7964]],
+[[7965]],
+[[7966]],
+[[7967]],
+[[7968]],
+[[7969]],
+[[7970]],
+[[7971]],
+[[7972]],
+[[7973]],
+[[7974]],
+[[7975]],
+[[7976]],
+[[7977]],
+[[7978]],
+[[7979]],
+[[7980]],
+[[7981]],
+[[7982]],
+[[7983]],
+[[7984]],
+[[7985]],
+[[7986]],
+[[7987]],
+[[7988]],
+[[7989]],
+[[7990]],
+[[7991]],
+[[7992]],
+[[7993]],
+[[7994]],
+[[7995]],
+[[7996]],
+[[7997]],
+[[7998]],
+[[7999]],
+[[8000]],
+[[8001]],
+[[8002]],
+[[8003]],
+[[8004]],
+[[8005]],
+[[8006]],
+[[8007]],
+[[8008]],
+[[8009]],
+[[8010]],
+[[8011]],
+[[8012]],
+[[8013]],
+[[8014]],
+[[8015]],
+[[8016]],
+[[8017]],
+[[8018]],
+[[8019]],
+[[8020]],
+[[8021]],
+[[8022]],
+[[8023]],
+[[8024]],
+[[8025]],
+[[8026]],
+[[8027]],
+[[8028]],
+[[8029]],
+[[8030]],
+[[8031]],
+[[8032]],
+[[8033]],
+[[8034]],
+[[8035]],
+[[8036]],
+[[8037]],
+[[8038]],
+[[8039]],
+[[8040]],
+[[8041]],
+[[8042]],
+[[8043]],
+[[8044]],
+[[8045]],
+[[8046]],
+[[8047]],
+[[8048]],
+[[8049]],
+[[8050]],
+[[8051]],
+[[8052]],
+[[8053]],
+[[8054]],
+[[8055]],
+[[8056]],
+[[8057]],
+[[8058]],
+[[8059]],
+[[8060]],
+[[8061]],
+[[8062]],
+[[8063]],
+[[8064]],
+[[8065]],
+[[8066]],
+[[8067]],
+[[8068]],
+[[8069]],
+[[8070]],
+[[8071]],
+[[8072]],
+[[8073]],
+[[8074]],
+[[8075]],
+[[8076]],
+[[8077]],
+[[8078]],
+[[8079]],
+[[8080]],
+[[8081]],
+[[8082]],
+[[8083]],
+[[8084]],
+[[8085]],
+[[8086]],
+[[8087]],
+[[8088]],
+[[8089]],
+[[8090]],
+[[8091]],
+[[8092]],
+[[8093]],
+[[8094]],
+[[8095]],
+[[8096]],
+[[8097]],
+[[8098]],
+[[8099]],
+[[8100]],
+[[8101]],
+[[8102]],
+[[8103]],
+[[8104]],
+[[8105]],
+[[8106]],
+[[8107]],
+[[8108]],
+[[8109]],
+[[8110]],
+[[8111]],
+[[8112]],
+[[8113]],
+[[8114]],
+[[8115]],
+[[8116]],
+[[8117]],
+[[8118]],
+[[8119]],
+[[8120]],
+[[8121]],
+[[8122]],
+[[8123]],
+[[8124]],
+[[8125]],
+[[8126]],
+[[8127]],
+[[8128]],
+[[8129]],
+[[8130]],
+[[8131]],
+[[8132]],
+[[8133]],
+[[8134]],
+[[8135]],
+[[8136]],
+[[8137]],
+[[8138]],
+[[8139]],
+[[8140]],
+[[8141]],
+[[8142]],
+[[8143]],
+[[8144]],
+[[8145]],
+[[8146]],
+[[8147]],
+[[8148]],
+[[8149]],
+[[8150]],
+[[8151]],
+[[8152]],
+[[8153]],
+[[8154]],
+[[8155]],
+[[8156]],
+[[8157]],
+[[8158]],
+[[8159]],
+[[8160]],
+[[8161]],
+[[8162]],
+[[8163]],
+[[8164]],
+[[8165]],
+[[8166]],
+[[8167]],
+[[8168]],
+[[8169]],
+[[8170]],
+[[8171]],
+[[8172]],
+[[8173]],
+[[8174]],
+[[8175]],
+[[8176]],
+[[8177]],
+[[8178]],
+[[8179]],
+[[8180]],
+[[8181]],
+[[8182]],
+[[8183]],
+[[8184]],
+[[8185]],
+[[8186]],
+[[8187]],
+[[8188]],
+[[8189]],
+[[8190]],
+[[8191]],
+[[8192]],
+[[8193]],
+[[8194]],
+[[8195]],
+[[8196]],
+[[8197]],
+[[8198]],
+[[8199]],
+[[8200]],
+[[8201]],
+[[8202]],
+[[8203]],
+[[8204]],
+[[8205]],
+[[8206]],
+[[8207]],
+[[8208]],
+[[8209]],
+[[8210]],
+[[8211]],
+[[8212]],
+[[8213]],
+[[8214]],
+[[8215]],
+[[8216]],
+[[8217]],
+[[8218]],
+[[8219]],
+[[8220]],
+[[8221]],
+[[8222]],
+[[8223]],
+[[8224]],
+[[8225]],
+[[8226]],
+[[8227]],
+[[8228]],
+[[8229]],
+[[8230]],
+[[8231]],
+[[8232]],
+[[8233]],
+[[8234]],
+[[8235]],
+[[8236]],
+[[8237]],
+[[8238]],
+[[8239]],
+[[8240]],
+[[8241]],
+[[8242]],
+[[8243]],
+[[8244]],
+[[8245]],
+[[8246]],
+[[8247]],
+[[8248]],
+[[8249]],
+[[8250]],
+[[8251]],
+[[8252]],
+[[8253]],
+[[8254]],
+[[8255]],
+[[8256]],
+[[8257]],
+[[8258]],
+[[8259]],
+[[8260]],
+[[8261]],
+[[8262]],
+[[8263]],
+[[8264]],
+[[8265]],
+[[8266]],
+[[8267]],
+[[8268]],
+[[8269]],
+[[8270]],
+[[8271]],
+[[8272]],
+[[8273]],
+[[8274]],
+[[8275]],
+[[8276]],
+[[8277]],
+[[8278]],
+[[8279]],
+[[8280]],
+[[8281]],
+[[8282]],
+[[8283]],
+[[8284]],
+[[8285]],
+[[8286]],
+[[8287]],
+[[8288]],
+[[8289]],
+[[8290]],
+[[8291]],
+[[8292]],
+[[8293]],
+[[8294]],
+[[8295]],
+[[8296]],
+[[8297]],
+[[8298]],
+[[8299]],
+[[8300]],
+[[8301]],
+[[8302]],
+[[8303]],
+[[8304]],
+[[8305]],
+[[8306]],
+[[8307]],
+[[8308]],
+[[8309]],
+[[8310]],
+[[8311]],
+[[8312]],
+[[8313]],
+[[8314]],
+[[8315]],
+[[8316]],
+[[8317]],
+[[8318]],
+[[8319]],
+[[8320]],
+[[8321]],
+[[8322]],
+[[8323]],
+[[8324]],
+[[8325]],
+[[8326]],
+[[8327]],
+[[8328]],
+[[8329]],
+[[8330]],
+[[8331]],
+[[8332]],
+[[8333]],
+[[8334]],
+[[8335]],
+[[8336]],
+[[8337]],
+[[8338]],
+[[8339]],
+[[8340]],
+[[8341]],
+[[8342]],
+[[8343]],
+[[8344]],
+[[8345]],
+[[8346]],
+[[8347]],
+[[8348]],
+[[8349]],
+[[8350]],
+[[8351]],
+[[8352]],
+[[8353]],
+[[8354]],
+[[8355]],
+[[8356]],
+[[8357]],
+[[8358]],
+[[8359]],
+[[8360]],
+[[8361]],
+[[8362]],
+[[8363]],
+[[8364]],
+[[8365]],
+[[8366]],
+[[8367]],
+[[8368]],
+[[8369]],
+[[8370]],
+[[8371]],
+[[8372]],
+[[8373]],
+[[8374]],
+[[8375]],
+[[8376]],
+[[8377]],
+[[8378]],
+[[8379]],
+[[8380]],
+[[8381]],
+[[8382]],
+[[8383]],
+[[8384]],
+[[8385]],
+[[8386]],
+[[8387]],
+[[8388]],
+[[8389]],
+[[8390]],
+[[8391]],
+[[8392]],
+[[8393]],
+[[8394]],
+[[8395]],
+[[8396]],
+[[8397]],
+[[8398]],
+[[8399]],
+[[8400]],
+[[8401]],
+[[8402]],
+[[8403]],
+[[8404]],
+[[8405]],
+[[8406]],
+[[8407]],
+[[8408]],
+[[8409]],
+[[8410]],
+[[8411]],
+[[8412]],
+[[8413]],
+[[8414]],
+[[8415]],
+[[8416]],
+[[8417]],
+[[8418]],
+[[8419]],
+[[8420]],
+[[8421]],
+[[8422]],
+[[8423]],
+[[8424]],
+[[8425]],
+[[8426]],
+[[8427]],
+[[8428]],
+[[8429]],
+[[8430]],
+[[8431]],
+[[8432]],
+[[8433]],
+[[8434]],
+[[8435]],
+[[8436]],
+[[8437]],
+[[8438]],
+[[8439]],
+[[8440]],
+[[8441]],
+[[8442]],
+[[8443]],
+[[8444]],
+[[8445]],
+[[8446]],
+[[8447]],
+[[8448]],
+[[8449]],
+[[8450]],
+[[8451]],
+[[8452]],
+[[8453]],
+[[8454]],
+[[8455]],
+[[8456]],
+[[8457]],
+[[8458]],
+[[8459]],
+[[8460]],
+[[8461]],
+[[8462]],
+[[8463]],
+[[8464]],
+[[8465]],
+[[8466]],
+[[8467]],
+[[8468]],
+[[8469]],
+[[8470]],
+[[8471]],
+[[8472]],
+[[8473]],
+[[8474]],
+[[8475]],
+[[8476]],
+[[8477]],
+[[8478]],
+[[8479]],
+[[8480]],
+[[8481]],
+[[8482]],
+[[8483]],
+[[8484]],
+[[8485]],
+[[8486]],
+[[8487]],
+[[8488]],
+[[8489]],
+[[8490]],
+[[8491]],
+[[8492]],
+[[8493]],
+[[8494]],
+[[8495]],
+[[8496]],
+[[8497]],
+[[8498]],
+[[8499]],
+[[8500]],
+[[8501]],
+[[8502]],
+[[8503]],
+[[8504]],
+[[8505]],
+[[8506]],
+[[8507]],
+[[8508]],
+[[8509]],
+[[8510]],
+[[8511]],
+[[8512]],
+[[8513]],
+[[8514]],
+[[8515]],
+[[8516]],
+[[8517]],
+[[8518]],
+[[8519]],
+[[8520]],
+[[8521]],
+[[8522]],
+[[8523]],
+[[8524]],
+[[8525]],
+[[8526]],
+[[8527]],
+[[8528]],
+[[8529]],
+[[8530]],
+[[8531]],
+[[8532]],
+[[8533]],
+[[8534]],
+[[8535]],
+[[8536]],
+[[8537]],
+[[8538]],
+[[8539]],
+[[8540]],
+[[8541]],
+[[8542]],
+[[8543]],
+[[8544]],
+[[8545]],
+[[8546]],
+[[8547]],
+[[8548]],
+[[8549]],
+[[8550]],
+[[8551]],
+[[8552]],
+[[8553]],
+[[8554]],
+[[8555]],
+[[8556]],
+[[8557]],
+[[8558]],
+[[8559]],
+[[8560]],
+[[8561]],
+[[8562]],
+[[8563]],
+[[8564]],
+[[8565]],
+[[8566]],
+[[8567]],
+[[8568]],
+[[8569]],
+[[8570]],
+[[8571]],
+[[8572]],
+[[8573]],
+[[8574]],
+[[8575]],
+[[8576]],
+[[8577]],
+[[8578]],
+[[8579]],
+[[8580]],
+[[8581]],
+[[8582]],
+[[8583]],
+[[8584]],
+[[8585]],
+[[8586]],
+[[8587]],
+[[8588]],
+[[8589]],
+[[8590]],
+[[8591]],
+[[8592]],
+[[8593]],
+[[8594]],
+[[8595]],
+[[8596]],
+[[8597]],
+[[8598]],
+[[8599]],
+[[8600]],
+[[8601]],
+[[8602]],
+[[8603]],
+[[8604]],
+[[8605]],
+[[8606]],
+[[8607]],
+[[8608]],
+[[8609]],
+[[8610]],
+[[8611]],
+[[8612]],
+[[8613]],
+[[8614]],
+[[8615]],
+[[8616]],
+[[8617]],
+[[8618]],
+[[8619]],
+[[8620]],
+[[8621]],
+[[8622]],
+[[8623]],
+[[8624]],
+[[8625]],
+[[8626]],
+[[8627]],
+[[8628]],
+[[8629]],
+[[8630]],
+[[8631]],
+[[8632]],
+[[8633]],
+[[8634]],
+[[8635]],
+[[8636]],
+[[8637]],
+[[8638]],
+[[8639]],
+[[8640]],
+[[8641]],
+[[8642]],
+[[8643]],
+[[8644]],
+[[8645]],
+[[8646]],
+[[8647]],
+[[8648]],
+[[8649]],
+[[8650]],
+[[8651]],
+[[8652]],
+[[8653]],
+[[8654]],
+[[8655]],
+[[8656]],
+[[8657]],
+[[8658]],
+[[8659]],
+[[8660]],
+[[8661]],
+[[8662]],
+[[8663]],
+[[8664]],
+[[8665]],
+[[8666]],
+[[8667]],
+[[8668]],
+[[8669]],
+[[8670]],
+[[8671]],
+[[8672]],
+[[8673]],
+[[8674]],
+[[8675]],
+[[8676]],
+[[8677]],
+[[8678]],
+[[8679]],
+[[8680]],
+[[8681]],
+[[8682]],
+[[8683]],
+[[8684]],
+[[8685]],
+[[8686]],
+[[8687]],
+[[8688]],
+[[8689]],
+[[8690]],
+[[8691]],
+[[8692]],
+[[8693]],
+[[8694]],
+[[8695]],
+[[8696]],
+[[8697]],
+[[8698]],
+[[8699]],
+[[8700]],
+[[8701]],
+[[8702]],
+[[8703]],
+[[8704]],
+[[8705]],
+[[8706]],
+[[8707]],
+[[8708]],
+[[8709]],
+[[8710]],
+[[8711]],
+[[8712]],
+[[8713]],
+[[8714]],
+[[8715]],
+[[8716]],
+[[8717]],
+[[8718]],
+[[8719]],
+[[8720]],
+[[8721]],
+[[8722]],
+[[8723]],
+[[8724]],
+[[8725]],
+[[8726]],
+[[8727]],
+[[8728]],
+[[8729]],
+[[8730]],
+[[8731]],
+[[8732]],
+[[8733]],
+[[8734]],
+[[8735]],
+[[8736]],
+[[8737]],
+[[8738]],
+[[8739]],
+[[8740]],
+[[8741]],
+[[8742]],
+[[8743]],
+[[8744]],
+[[8745]],
+[[8746]],
+[[8747]],
+[[8748]],
+[[8749]],
+[[8750]],
+[[8751]],
+[[8752]],
+[[8753]],
+[[8754]],
+[[8755]],
+[[8756]],
+[[8757]],
+[[8758]],
+[[8759]],
+[[8760]],
+[[8761]],
+[[8762]],
+[[8763]],
+[[8764]],
+[[8765]],
+[[8766]],
+[[8767]],
+[[8768]],
+[[8769]],
+[[8770]],
+[[8771]],
+[[8772]],
+[[8773]],
+[[8774]],
+[[8775]],
+[[8776]],
+[[8777]],
+[[8778]],
+[[8779]],
+[[8780]],
+[[8781]],
+[[8782]],
+[[8783]],
+[[8784]],
+[[8785]],
+[[8786]],
+[[8787]],
+[[8788]],
+[[8789]],
+[[8790]],
+[[8791]],
+[[8792]],
+[[8793]],
+[[8794]],
+[[8795]],
+[[8796]],
+[[8797]],
+[[8798]],
+[[8799]],
+[[8800]],
+[[8801]],
+[[8802]],
+[[8803]],
+[[8804]],
+[[8805]],
+[[8806]],
+[[8807]],
+[[8808]],
+[[8809]],
+[[8810]],
+[[8811]],
+[[8812]],
+[[8813]],
+[[8814]],
+[[8815]],
+[[8816]],
+[[8817]],
+[[8818]],
+[[8819]],
+[[8820]],
+[[8821]],
+[[8822]],
+[[8823]],
+[[8824]],
+[[8825]],
+[[8826]],
+[[8827]],
+[[8828]],
+[[8829]],
+[[8830]],
+[[8831]],
+[[8832]],
+[[8833]],
+[[8834]],
+[[8835]],
+[[8836]],
+[[8837]],
+[[8838]],
+[[8839]],
+[[8840]],
+[[8841]],
+[[8842]],
+[[8843]],
+[[8844]],
+[[8845]],
+[[8846]],
+[[8847]],
+[[8848]],
+[[8849]],
+[[8850]],
+[[8851]],
+[[8852]],
+[[8853]],
+[[8854]],
+[[8855]],
+[[8856]],
+[[8857]],
+[[8858]],
+[[8859]],
+[[8860]],
+[[8861]],
+[[8862]],
+[[8863]],
+[[8864]],
+[[8865]],
+[[8866]],
+[[8867]],
+[[8868]],
+[[8869]],
+[[8870]],
+[[8871]],
+[[8872]],
+[[8873]],
+[[8874]],
+[[8875]],
+[[8876]],
+[[8877]],
+[[8878]],
+[[8879]],
+[[8880]],
+[[8881]],
+[[8882]],
+[[8883]],
+[[8884]],
+[[8885]],
+[[8886]],
+[[8887]],
+[[8888]],
+[[8889]],
+[[8890]],
+[[8891]],
+[[8892]],
+[[8893]],
+[[8894]],
+[[8895]],
+[[8896]],
+[[8897]],
+[[8898]],
+[[8899]],
+[[8900]],
+[[8901]],
+[[8902]],
+[[8903]],
+[[8904]],
+[[8905]],
+[[8906]],
+[[8907]],
+[[8908]],
+[[8909]],
+[[8910]],
+[[8911]],
+[[8912]],
+[[8913]],
+[[8914]],
+[[8915]],
+[[8916]],
+[[8917]],
+[[8918]],
+[[8919]],
+[[8920]],
+[[8921]],
+[[8922]],
+[[8923]],
+[[8924]],
+[[8925]],
+[[8926]],
+[[8927]],
+[[8928]],
+[[8929]],
+[[8930]],
+[[8931]],
+[[8932]],
+[[8933]],
+[[8934]],
+[[8935]],
+[[8936]],
+[[8937]],
+[[8938]],
+[[8939]],
+[[8940]],
+[[8941]],
+[[8942]],
+[[8943]],
+[[8944]],
+[[8945]],
+[[8946]],
+[[8947]],
+[[8948]],
+[[8949]],
+[[8950]],
+[[8951]],
+[[8952]],
+[[8953]],
+[[8954]],
+[[8955]],
+[[8956]],
+[[8957]],
+[[8958]],
+[[8959]],
+[[8960]],
+[[8961]],
+[[8962]],
+[[8963]],
+[[8964]],
+[[8965]],
+[[8966]],
+[[8967]],
+[[8968]],
+[[8969]],
+[[8970]],
+[[8971]],
+[[8972]],
+[[8973]],
+[[8974]],
+[[8975]],
+[[8976]],
+[[8977]],
+[[8978]],
+[[8979]],
+[[8980]],
+[[8981]],
+[[8982]],
+[[8983]],
+[[8984]],
+[[8985]],
+[[8986]],
+[[8987]],
+[[8988]],
+[[8989]],
+[[8990]],
+[[8991]],
+[[8992]],
+[[8993]],
+[[8994]],
+[[8995]],
+[[8996]],
+[[8997]],
+[[8998]],
+[[8999]],
+[[9000]],
+[[9001]],
+[[9002]],
+[[9003]],
+[[9004]],
+[[9005]],
+[[9006]],
+[[9007]],
+[[9008]],
+[[9009]],
+[[9010]],
+[[9011]],
+[[9012]],
+[[9013]],
+[[9014]],
+[[9015]],
+[[9016]],
+[[9017]],
+[[9018]],
+[[9019]],
+[[9020]],
+[[9021]],
+[[9022]],
+[[9023]],
+[[9024]],
+[[9025]],
+[[9026]],
+[[9027]],
+[[9028]],
+[[9029]],
+[[9030]],
+[[9031]],
+[[9032]],
+[[9033]],
+[[9034]],
+[[9035]],
+[[9036]],
+[[9037]],
+[[9038]],
+[[9039]],
+[[9040]],
+[[9041]],
+[[9042]],
+[[9043]],
+[[9044]],
+[[9045]],
+[[9046]],
+[[9047]],
+[[9048]],
+[[9049]],
+[[9050]],
+[[9051]],
+[[9052]],
+[[9053]],
+[[9054]],
+[[9055]],
+[[9056]],
+[[9057]],
+[[9058]],
+[[9059]],
+[[9060]],
+[[9061]],
+[[9062]],
+[[9063]],
+[[9064]],
+[[9065]],
+[[9066]],
+[[9067]],
+[[9068]],
+[[9069]],
+[[9070]],
+[[9071]],
+[[9072]],
+[[9073]],
+[[9074]],
+[[9075]],
+[[9076]],
+[[9077]],
+[[9078]],
+[[9079]],
+[[9080]],
+[[9081]],
+[[9082]],
+[[9083]],
+[[9084]],
+[[9085]],
+[[9086]],
+[[9087]],
+[[9088]],
+[[9089]],
+[[9090]],
+[[9091]],
+[[9092]],
+[[9093]],
+[[9094]],
+[[9095]],
+[[9096]],
+[[9097]],
+[[9098]],
+[[9099]],
+[[9100]],
+[[9101]],
+[[9102]],
+[[9103]],
+[[9104]],
+[[9105]],
+[[9106]],
+[[9107]],
+[[9108]],
+[[9109]],
+[[9110]],
+[[9111]],
+[[9112]],
+[[9113]],
+[[9114]],
+[[9115]],
+[[9116]],
+[[9117]],
+[[9118]],
+[[9119]],
+[[9120]],
+[[9121]],
+[[9122]],
+[[9123]],
+[[9124]],
+[[9125]],
+[[9126]],
+[[9127]],
+[[9128]],
+[[9129]],
+[[9130]],
+[[9131]],
+[[9132]],
+[[9133]],
+[[9134]],
+[[9135]],
+[[9136]],
+[[9137]],
+[[9138]],
+[[9139]],
+[[9140]],
+[[9141]],
+[[9142]],
+[[9143]],
+[[9144]],
+[[9145]],
+[[9146]],
+[[9147]],
+[[9148]],
+[[9149]],
+[[9150]],
+[[9151]],
+[[9152]],
+[[9153]],
+[[9154]],
+[[9155]],
+[[9156]],
+[[9157]],
+[[9158]],
+[[9159]],
+[[9160]],
+[[9161]],
+[[9162]],
+[[9163]],
+[[9164]],
+[[9165]],
+[[9166]],
+[[9167]],
+[[9168]],
+[[9169]],
+[[9170]],
+[[9171]],
+[[9172]],
+[[9173]],
+[[9174]],
+[[9175]],
+[[9176]],
+[[9177]],
+[[9178]],
+[[9179]],
+[[9180]],
+[[9181]],
+[[9182]],
+[[9183]],
+[[9184]],
+[[9185]],
+[[9186]],
+[[9187]],
+[[9188]],
+[[9189]],
+[[9190]],
+[[9191]],
+[[9192]],
+[[9193]],
+[[9194]],
+[[9195]],
+[[9196]],
+[[9197]],
+[[9198]],
+[[9199]],
+[[9200]],
+[[9201]],
+[[9202]],
+[[9203]],
+[[9204]],
+[[9205]],
+[[9206]],
+[[9207]],
+[[9208]],
+[[9209]],
+[[9210]],
+[[9211]],
+[[9212]],
+[[9213]],
+[[9214]],
+[[9215]],
+[[9216]],
+[[9217]],
+[[9218]],
+[[9219]],
+[[9220]],
+[[9221]],
+[[9222]],
+[[9223]],
+[[9224]],
+[[9225]],
+[[9226]],
+[[9227]],
+[[9228]],
+[[9229]],
+[[9230]],
+[[9231]],
+[[9232]],
+[[9233]],
+[[9234]],
+[[9235]],
+[[9236]],
+[[9237]],
+[[9238]],
+[[9239]],
+[[9240]],
+[[9241]],
+[[9242]],
+[[9243]],
+[[9244]],
+[[9245]],
+[[9246]],
+[[9247]],
+[[9248]],
+[[9249]],
+[[9250]],
+[[9251]],
+[[9252]],
+[[9253]],
+[[9254]],
+[[9255]],
+[[9256]],
+[[9257]],
+[[9258]],
+[[9259]],
+[[9260]],
+[[9261]],
+[[9262]],
+[[9263]],
+[[9264]],
+[[9265]],
+[[9266]],
+[[9267]],
+[[9268]],
+[[9269]],
+[[9270]],
+[[9271]],
+[[9272]],
+[[9273]],
+[[9274]],
+[[9275]],
+[[9276]],
+[[9277]],
+[[9278]],
+[[9279]],
+[[9280]],
+[[9281]],
+[[9282]],
+[[9283]],
+[[9284]],
+[[9285]],
+[[9286]],
+[[9287]],
+[[9288]],
+[[9289]],
+[[9290]],
+[[9291]],
+[[9292]],
+[[9293]],
+[[9294]],
+[[9295]],
+[[9296]],
+[[9297]],
+[[9298]],
+[[9299]],
+[[9300]],
+[[9301]],
+[[9302]],
+[[9303]],
+[[9304]],
+[[9305]],
+[[9306]],
+[[9307]],
+[[9308]],
+[[9309]],
+[[9310]],
+[[9311]],
+[[9312]],
+[[9313]],
+[[9314]],
+[[9315]],
+[[9316]],
+[[9317]],
+[[9318]],
+[[9319]],
+[[9320]],
+[[9321]],
+[[9322]],
+[[9323]],
+[[9324]],
+[[9325]],
+[[9326]],
+[[9327]],
+[[9328]],
+[[9329]],
+[[9330]],
+[[9331]],
+[[9332]],
+[[9333]],
+[[9334]],
+[[9335]],
+[[9336]],
+[[9337]],
+[[9338]],
+[[9339]],
+[[9340]],
+[[9341]],
+[[9342]],
+[[9343]],
+[[9344]],
+[[9345]],
+[[9346]],
+[[9347]],
+[[9348]],
+[[9349]],
+[[9350]],
+[[9351]],
+[[9352]],
+[[9353]],
+[[9354]],
+[[9355]],
+[[9356]],
+[[9357]],
+[[9358]],
+[[9359]],
+[[9360]],
+[[9361]],
+[[9362]],
+[[9363]],
+[[9364]],
+[[9365]],
+[[9366]],
+[[9367]],
+[[9368]],
+[[9369]],
+[[9370]],
+[[9371]],
+[[9372]],
+[[9373]],
+[[9374]],
+[[9375]],
+[[9376]],
+[[9377]],
+[[9378]],
+[[9379]],
+[[9380]],
+[[9381]],
+[[9382]],
+[[9383]],
+[[9384]],
+[[9385]],
+[[9386]],
+[[9387]],
+[[9388]],
+[[9389]],
+[[9390]],
+[[9391]],
+[[9392]],
+[[9393]],
+[[9394]],
+[[9395]],
+[[9396]],
+[[9397]],
+[[9398]],
+[[9399]],
+[[9400]],
+[[9401]],
+[[9402]],
+[[9403]],
+[[9404]],
+[[9405]],
+[[9406]],
+[[9407]],
+[[9408]],
+[[9409]],
+[[9410]],
+[[9411]],
+[[9412]],
+[[9413]],
+[[9414]],
+[[9415]],
+[[9416]],
+[[9417]],
+[[9418]],
+[[9419]],
+[[9420]],
+[[9421]],
+[[9422]],
+[[9423]],
+[[9424]],
+[[9425]],
+[[9426]],
+[[9427]],
+[[9428]],
+[[9429]],
+[[9430]],
+[[9431]],
+[[9432]],
+[[9433]],
+[[9434]],
+[[9435]],
+[[9436]],
+[[9437]],
+[[9438]],
+[[9439]],
+[[9440]],
+[[9441]],
+[[9442]],
+[[9443]],
+[[9444]],
+[[9445]],
+[[9446]],
+[[9447]],
+[[9448]],
+[[9449]],
+[[9450]],
+[[9451]],
+[[9452]],
+[[9453]],
+[[9454]],
+[[9455]],
+[[9456]],
+[[9457]],
+[[9458]],
+[[9459]],
+[[9460]],
+[[9461]],
+[[9462]],
+[[9463]],
+[[9464]],
+[[9465]],
+[[9466]],
+[[9467]],
+[[9468]],
+[[9469]],
+[[9470]],
+[[9471]],
+[[9472]],
+[[9473]],
+[[9474]],
+[[9475]],
+[[9476]],
+[[9477]],
+[[9478]],
+[[9479]],
+[[9480]],
+[[9481]],
+[[9482]],
+[[9483]],
+[[9484]],
+[[9485]],
+[[9486]],
+[[9487]],
+[[9488]],
+[[9489]],
+[[9490]],
+[[9491]],
+[[9492]],
+[[9493]],
+[[9494]],
+[[9495]],
+[[9496]],
+[[9497]],
+[[9498]],
+[[9499]],
+[[9500]],
+[[9501]],
+[[9502]],
+[[9503]],
+[[9504]],
+[[9505]],
+[[9506]],
+[[9507]],
+[[9508]],
+[[9509]],
+[[9510]],
+[[9511]],
+[[9512]],
+[[9513]],
+[[9514]],
+[[9515]],
+[[9516]],
+[[9517]],
+[[9518]],
+[[9519]],
+[[9520]],
+[[9521]],
+[[9522]],
+[[9523]],
+[[9524]],
+[[9525]],
+[[9526]],
+[[9527]],
+[[9528]],
+[[9529]],
+[[9530]],
+[[9531]],
+[[9532]],
+[[9533]],
+[[9534]],
+[[9535]],
+[[9536]],
+[[9537]],
+[[9538]],
+[[9539]],
+[[9540]],
+[[9541]],
+[[9542]],
+[[9543]],
+[[9544]],
+[[9545]],
+[[9546]],
+[[9547]],
+[[9548]],
+[[9549]],
+[[9550]],
+[[9551]],
+[[9552]],
+[[9553]],
+[[9554]],
+[[9555]],
+[[9556]],
+[[9557]],
+[[9558]],
+[[9559]],
+[[9560]],
+[[9561]],
+[[9562]],
+[[9563]],
+[[9564]],
+[[9565]],
+[[9566]],
+[[9567]],
+[[9568]],
+[[9569]],
+[[9570]],
+[[9571]],
+[[9572]],
+[[9573]],
+[[9574]],
+[[9575]],
+[[9576]],
+[[9577]],
+[[9578]],
+[[9579]],
+[[9580]],
+[[9581]],
+[[9582]],
+[[9583]],
+[[9584]],
+[[9585]],
+[[9586]],
+[[9587]],
+[[9588]],
+[[9589]],
+[[9590]],
+[[9591]],
+[[9592]],
+[[9593]],
+[[9594]],
+[[9595]],
+[[9596]],
+[[9597]],
+[[9598]],
+[[9599]],
+[[9600]],
+[[9601]],
+[[9602]],
+[[9603]],
+[[9604]],
+[[9605]],
+[[9606]],
+[[9607]],
+[[9608]],
+[[9609]],
+[[9610]],
+[[9611]],
+[[9612]],
+[[9613]],
+[[9614]],
+[[9615]],
+[[9616]],
+[[9617]],
+[[9618]],
+[[9619]],
+[[9620]],
+[[9621]],
+[[9622]],
+[[9623]],
+[[9624]],
+[[9625]],
+[[9626]],
+[[9627]],
+[[9628]],
+[[9629]],
+[[9630]],
+[[9631]],
+[[9632]],
+[[9633]],
+[[9634]],
+[[9635]],
+[[9636]],
+[[9637]],
+[[9638]],
+[[9639]],
+[[9640]],
+[[9641]],
+[[9642]],
+[[9643]],
+[[9644]],
+[[9645]],
+[[9646]],
+[[9647]],
+[[9648]],
+[[9649]],
+[[9650]],
+[[9651]],
+[[9652]],
+[[9653]],
+[[9654]],
+[[9655]],
+[[9656]],
+[[9657]],
+[[9658]],
+[[9659]],
+[[9660]],
+[[9661]],
+[[9662]],
+[[9663]],
+[[9664]],
+[[9665]],
+[[9666]],
+[[9667]],
+[[9668]],
+[[9669]],
+[[9670]],
+[[9671]],
+[[9672]],
+[[9673]],
+[[9674]],
+[[9675]],
+[[9676]],
+[[9677]],
+[[9678]],
+[[9679]],
+[[9680]],
+[[9681]],
+[[9682]],
+[[9683]],
+[[9684]],
+[[9685]],
+[[9686]],
+[[9687]],
+[[9688]],
+[[9689]],
+[[9690]],
+[[9691]],
+[[9692]],
+[[9693]],
+[[9694]],
+[[9695]],
+[[9696]],
+[[9697]],
+[[9698]],
+[[9699]],
+[[9700]],
+[[9701]],
+[[9702]],
+[[9703]],
+[[9704]],
+[[9705]],
+[[9706]],
+[[9707]],
+[[9708]],
+[[9709]],
+[[9710]],
+[[9711]],
+[[9712]],
+[[9713]],
+[[9714]],
+[[9715]],
+[[9716]],
+[[9717]],
+[[9718]],
+[[9719]],
+[[9720]],
+[[9721]],
+[[9722]],
+[[9723]],
+[[9724]],
+[[9725]],
+[[9726]],
+[[9727]],
+[[9728]],
+[[9729]],
+[[9730]],
+[[9731]],
+[[9732]],
+[[9733]],
+[[9734]],
+[[9735]],
+[[9736]],
+[[9737]],
+[[9738]],
+[[9739]],
+[[9740]],
+[[9741]],
+[[9742]],
+[[9743]],
+[[9744]],
+[[9745]],
+[[9746]],
+[[9747]],
+[[9748]],
+[[9749]],
+[[9750]],
+[[9751]],
+[[9752]],
+[[9753]],
+[[9754]],
+[[9755]],
+[[9756]],
+[[9757]],
+[[9758]],
+[[9759]],
+[[9760]],
+[[9761]],
+[[9762]],
+[[9763]],
+[[9764]],
+[[9765]],
+[[9766]],
+[[9767]],
+[[9768]],
+[[9769]],
+[[9770]],
+[[9771]],
+[[9772]],
+[[9773]],
+[[9774]],
+[[9775]],
+[[9776]],
+[[9777]],
+[[9778]],
+[[9779]],
+[[9780]],
+[[9781]],
+[[9782]],
+[[9783]],
+[[9784]],
+[[9785]],
+[[9786]],
+[[9787]],
+[[9788]],
+[[9789]],
+[[9790]],
+[[9791]],
+[[9792]],
+[[9793]],
+[[9794]],
+[[9795]],
+[[9796]],
+[[9797]],
+[[9798]],
+[[9799]],
+[[9800]],
+[[9801]],
+[[9802]],
+[[9803]],
+[[9804]],
+[[9805]],
+[[9806]],
+[[9807]],
+[[9808]],
+[[9809]],
+[[9810]],
+[[9811]],
+[[9812]],
+[[9813]],
+[[9814]],
+[[9815]],
+[[9816]],
+[[9817]],
+[[9818]],
+[[9819]],
+[[9820]],
+[[9821]],
+[[9822]],
+[[9823]],
+[[9824]],
+[[9825]],
+[[9826]],
+[[9827]],
+[[9828]],
+[[9829]],
+[[9830]],
+[[9831]],
+[[9832]],
+[[9833]],
+[[9834]],
+[[9835]],
+[[9836]],
+[[9837]],
+[[9838]],
+[[9839]],
+[[9840]],
+[[9841]],
+[[9842]],
+[[9843]],
+[[9844]],
+[[9845]],
+[[9846]],
+[[9847]],
+[[9848]],
+[[9849]],
+[[9850]],
+[[9851]],
+[[9852]],
+[[9853]],
+[[9854]],
+[[9855]],
+[[9856]],
+[[9857]],
+[[9858]],
+[[9859]],
+[[9860]],
+[[9861]],
+[[9862]],
+[[9863]],
+[[9864]],
+[[9865]],
+[[9866]],
+[[9867]],
+[[9868]],
+[[9869]],
+[[9870]],
+[[9871]],
+[[9872]],
+[[9873]],
+[[9874]],
+[[9875]],
+[[9876]],
+[[9877]],
+[[9878]],
+[[9879]],
+[[9880]],
+[[9881]],
+[[9882]],
+[[9883]],
+[[9884]],
+[[9885]],
+[[9886]],
+[[9887]],
+[[9888]],
+[[9889]],
+[[9890]],
+[[9891]],
+[[9892]],
+[[9893]],
+[[9894]],
+[[9895]],
+[[9896]],
+[[9897]],
+[[9898]],
+[[9899]],
+[[9900]],
+[[9901]],
+[[9902]],
+[[9903]],
+[[9904]],
+[[9905]],
+[[9906]],
+[[9907]],
+[[9908]],
+[[9909]],
+[[9910]],
+[[9911]],
+[[9912]],
+[[9913]],
+[[9914]],
+[[9915]],
+[[9916]],
+[[9917]],
+[[9918]],
+[[9919]],
+[[9920]],
+[[9921]],
+[[9922]],
+[[9923]],
+[[9924]],
+[[9925]],
+[[9926]],
+[[9927]],
+[[9928]],
+[[9929]],
+[[9930]],
+[[9931]],
+[[9932]],
+[[9933]],
+[[9934]],
+[[9935]],
+[[9936]],
+[[9937]],
+[[9938]],
+[[9939]],
+[[9940]],
+[[9941]],
+[[9942]],
+[[9943]],
+[[9944]],
+[[9945]],
+[[9946]],
+[[9947]],
+[[9948]],
+[[9949]],
+[[9950]],
+[[9951]],
+[[9952]],
+[[9953]],
+[[9954]],
+[[9955]],
+[[9956]],
+[[9957]],
+[[9958]],
+[[9959]],
+[[9960]],
+[[9961]],
+[[9962]],
+[[9963]],
+[[9964]],
+[[9965]],
+[[9966]],
+[[9967]],
+[[9968]],
+[[9969]],
+[[9970]],
+[[9971]],
+[[9972]],
+[[9973]],
+[[9974]],
+[[9975]],
+[[9976]],
+[[9977]],
+[[9978]],
+[[9979]],
+[[9980]],
+[[9981]],
+[[9982]],
+[[9983]],
+[[9984]],
+[[9985]],
+[[9986]],
+[[9987]],
+[[9988]],
+[[9989]],
+[[9990]],
+[[9991]],
+[[9992]],
+[[9993]],
+[[9994]],
+[[9995]],
+[[9996]],
+[[9997]],
+[[9998]],
+[[9999]],
+];
+
+confuse(x) {
+ try { throw x; } catch (e) { return e; }
+}
+
+main() {
+ if (!identical(confuse(list1), confuse(list2))) {
+ throw new Exception("list1 !== list2");
+ }
+}
diff --git a/tests/language/canonicalize/hashing_shallow_collision_instance_2_test.dart b/tests/language/canonicalize/hashing_shallow_collision_instance_2_test.dart
new file mode 100644
index 0000000..621b68e
--- /dev/null
+++ b/tests/language/canonicalize/hashing_shallow_collision_instance_2_test.dart
@@ -0,0 +1,20034 @@
+// Copyright (c) 2019, 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.
+
+// If canonicialization hashes with only a field's cid, this will exhibit
+// quadratic time.
+
+class Box {
+ final Object a;
+ final Object b;
+ const Box(this.a, this.b);
+}
+
+// 10,000 elements.
+const list1 = [
+ Box(0, 0),
+ Box(1, 1),
+ Box(2, 2),
+ Box(3, 3),
+ Box(4, 4),
+ Box(5, 5),
+ Box(6, 6),
+ Box(7, 7),
+ Box(8, 8),
+ Box(9, 9),
+ Box(10, 10),
+ Box(11, 11),
+ Box(12, 12),
+ Box(13, 13),
+ Box(14, 14),
+ Box(15, 15),
+ Box(16, 16),
+ Box(17, 17),
+ Box(18, 18),
+ Box(19, 19),
+ Box(20, 20),
+ Box(21, 21),
+ Box(22, 22),
+ Box(23, 23),
+ Box(24, 24),
+ Box(25, 25),
+ Box(26, 26),
+ Box(27, 27),
+ Box(28, 28),
+ Box(29, 29),
+ Box(30, 30),
+ Box(31, 31),
+ Box(32, 32),
+ Box(33, 33),
+ Box(34, 34),
+ Box(35, 35),
+ Box(36, 36),
+ Box(37, 37),
+ Box(38, 38),
+ Box(39, 39),
+ Box(40, 40),
+ Box(41, 41),
+ Box(42, 42),
+ Box(43, 43),
+ Box(44, 44),
+ Box(45, 45),
+ Box(46, 46),
+ Box(47, 47),
+ Box(48, 48),
+ Box(49, 49),
+ Box(50, 50),
+ Box(51, 51),
+ Box(52, 52),
+ Box(53, 53),
+ Box(54, 54),
+ Box(55, 55),
+ Box(56, 56),
+ Box(57, 57),
+ Box(58, 58),
+ Box(59, 59),
+ Box(60, 60),
+ Box(61, 61),
+ Box(62, 62),
+ Box(63, 63),
+ Box(64, 64),
+ Box(65, 65),
+ Box(66, 66),
+ Box(67, 67),
+ Box(68, 68),
+ Box(69, 69),
+ Box(70, 70),
+ Box(71, 71),
+ Box(72, 72),
+ Box(73, 73),
+ Box(74, 74),
+ Box(75, 75),
+ Box(76, 76),
+ Box(77, 77),
+ Box(78, 78),
+ Box(79, 79),
+ Box(80, 80),
+ Box(81, 81),
+ Box(82, 82),
+ Box(83, 83),
+ Box(84, 84),
+ Box(85, 85),
+ Box(86, 86),
+ Box(87, 87),
+ Box(88, 88),
+ Box(89, 89),
+ Box(90, 90),
+ Box(91, 91),
+ Box(92, 92),
+ Box(93, 93),
+ Box(94, 94),
+ Box(95, 95),
+ Box(96, 96),
+ Box(97, 97),
+ Box(98, 98),
+ Box(99, 99),
+ Box(100, 100),
+ Box(101, 101),
+ Box(102, 102),
+ Box(103, 103),
+ Box(104, 104),
+ Box(105, 105),
+ Box(106, 106),
+ Box(107, 107),
+ Box(108, 108),
+ Box(109, 109),
+ Box(110, 110),
+ Box(111, 111),
+ Box(112, 112),
+ Box(113, 113),
+ Box(114, 114),
+ Box(115, 115),
+ Box(116, 116),
+ Box(117, 117),
+ Box(118, 118),
+ Box(119, 119),
+ Box(120, 120),
+ Box(121, 121),
+ Box(122, 122),
+ Box(123, 123),
+ Box(124, 124),
+ Box(125, 125),
+ Box(126, 126),
+ Box(127, 127),
+ Box(128, 128),
+ Box(129, 129),
+ Box(130, 130),
+ Box(131, 131),
+ Box(132, 132),
+ Box(133, 133),
+ Box(134, 134),
+ Box(135, 135),
+ Box(136, 136),
+ Box(137, 137),
+ Box(138, 138),
+ Box(139, 139),
+ Box(140, 140),
+ Box(141, 141),
+ Box(142, 142),
+ Box(143, 143),
+ Box(144, 144),
+ Box(145, 145),
+ Box(146, 146),
+ Box(147, 147),
+ Box(148, 148),
+ Box(149, 149),
+ Box(150, 150),
+ Box(151, 151),
+ Box(152, 152),
+ Box(153, 153),
+ Box(154, 154),
+ Box(155, 155),
+ Box(156, 156),
+ Box(157, 157),
+ Box(158, 158),
+ Box(159, 159),
+ Box(160, 160),
+ Box(161, 161),
+ Box(162, 162),
+ Box(163, 163),
+ Box(164, 164),
+ Box(165, 165),
+ Box(166, 166),
+ Box(167, 167),
+ Box(168, 168),
+ Box(169, 169),
+ Box(170, 170),
+ Box(171, 171),
+ Box(172, 172),
+ Box(173, 173),
+ Box(174, 174),
+ Box(175, 175),
+ Box(176, 176),
+ Box(177, 177),
+ Box(178, 178),
+ Box(179, 179),
+ Box(180, 180),
+ Box(181, 181),
+ Box(182, 182),
+ Box(183, 183),
+ Box(184, 184),
+ Box(185, 185),
+ Box(186, 186),
+ Box(187, 187),
+ Box(188, 188),
+ Box(189, 189),
+ Box(190, 190),
+ Box(191, 191),
+ Box(192, 192),
+ Box(193, 193),
+ Box(194, 194),
+ Box(195, 195),
+ Box(196, 196),
+ Box(197, 197),
+ Box(198, 198),
+ Box(199, 199),
+ Box(200, 200),
+ Box(201, 201),
+ Box(202, 202),
+ Box(203, 203),
+ Box(204, 204),
+ Box(205, 205),
+ Box(206, 206),
+ Box(207, 207),
+ Box(208, 208),
+ Box(209, 209),
+ Box(210, 210),
+ Box(211, 211),
+ Box(212, 212),
+ Box(213, 213),
+ Box(214, 214),
+ Box(215, 215),
+ Box(216, 216),
+ Box(217, 217),
+ Box(218, 218),
+ Box(219, 219),
+ Box(220, 220),
+ Box(221, 221),
+ Box(222, 222),
+ Box(223, 223),
+ Box(224, 224),
+ Box(225, 225),
+ Box(226, 226),
+ Box(227, 227),
+ Box(228, 228),
+ Box(229, 229),
+ Box(230, 230),
+ Box(231, 231),
+ Box(232, 232),
+ Box(233, 233),
+ Box(234, 234),
+ Box(235, 235),
+ Box(236, 236),
+ Box(237, 237),
+ Box(238, 238),
+ Box(239, 239),
+ Box(240, 240),
+ Box(241, 241),
+ Box(242, 242),
+ Box(243, 243),
+ Box(244, 244),
+ Box(245, 245),
+ Box(246, 246),
+ Box(247, 247),
+ Box(248, 248),
+ Box(249, 249),
+ Box(250, 250),
+ Box(251, 251),
+ Box(252, 252),
+ Box(253, 253),
+ Box(254, 254),
+ Box(255, 255),
+ Box(256, 256),
+ Box(257, 257),
+ Box(258, 258),
+ Box(259, 259),
+ Box(260, 260),
+ Box(261, 261),
+ Box(262, 262),
+ Box(263, 263),
+ Box(264, 264),
+ Box(265, 265),
+ Box(266, 266),
+ Box(267, 267),
+ Box(268, 268),
+ Box(269, 269),
+ Box(270, 270),
+ Box(271, 271),
+ Box(272, 272),
+ Box(273, 273),
+ Box(274, 274),
+ Box(275, 275),
+ Box(276, 276),
+ Box(277, 277),
+ Box(278, 278),
+ Box(279, 279),
+ Box(280, 280),
+ Box(281, 281),
+ Box(282, 282),
+ Box(283, 283),
+ Box(284, 284),
+ Box(285, 285),
+ Box(286, 286),
+ Box(287, 287),
+ Box(288, 288),
+ Box(289, 289),
+ Box(290, 290),
+ Box(291, 291),
+ Box(292, 292),
+ Box(293, 293),
+ Box(294, 294),
+ Box(295, 295),
+ Box(296, 296),
+ Box(297, 297),
+ Box(298, 298),
+ Box(299, 299),
+ Box(300, 300),
+ Box(301, 301),
+ Box(302, 302),
+ Box(303, 303),
+ Box(304, 304),
+ Box(305, 305),
+ Box(306, 306),
+ Box(307, 307),
+ Box(308, 308),
+ Box(309, 309),
+ Box(310, 310),
+ Box(311, 311),
+ Box(312, 312),
+ Box(313, 313),
+ Box(314, 314),
+ Box(315, 315),
+ Box(316, 316),
+ Box(317, 317),
+ Box(318, 318),
+ Box(319, 319),
+ Box(320, 320),
+ Box(321, 321),
+ Box(322, 322),
+ Box(323, 323),
+ Box(324, 324),
+ Box(325, 325),
+ Box(326, 326),
+ Box(327, 327),
+ Box(328, 328),
+ Box(329, 329),
+ Box(330, 330),
+ Box(331, 331),
+ Box(332, 332),
+ Box(333, 333),
+ Box(334, 334),
+ Box(335, 335),
+ Box(336, 336),
+ Box(337, 337),
+ Box(338, 338),
+ Box(339, 339),
+ Box(340, 340),
+ Box(341, 341),
+ Box(342, 342),
+ Box(343, 343),
+ Box(344, 344),
+ Box(345, 345),
+ Box(346, 346),
+ Box(347, 347),
+ Box(348, 348),
+ Box(349, 349),
+ Box(350, 350),
+ Box(351, 351),
+ Box(352, 352),
+ Box(353, 353),
+ Box(354, 354),
+ Box(355, 355),
+ Box(356, 356),
+ Box(357, 357),
+ Box(358, 358),
+ Box(359, 359),
+ Box(360, 360),
+ Box(361, 361),
+ Box(362, 362),
+ Box(363, 363),
+ Box(364, 364),
+ Box(365, 365),
+ Box(366, 366),
+ Box(367, 367),
+ Box(368, 368),
+ Box(369, 369),
+ Box(370, 370),
+ Box(371, 371),
+ Box(372, 372),
+ Box(373, 373),
+ Box(374, 374),
+ Box(375, 375),
+ Box(376, 376),
+ Box(377, 377),
+ Box(378, 378),
+ Box(379, 379),
+ Box(380, 380),
+ Box(381, 381),
+ Box(382, 382),
+ Box(383, 383),
+ Box(384, 384),
+ Box(385, 385),
+ Box(386, 386),
+ Box(387, 387),
+ Box(388, 388),
+ Box(389, 389),
+ Box(390, 390),
+ Box(391, 391),
+ Box(392, 392),
+ Box(393, 393),
+ Box(394, 394),
+ Box(395, 395),
+ Box(396, 396),
+ Box(397, 397),
+ Box(398, 398),
+ Box(399, 399),
+ Box(400, 400),
+ Box(401, 401),
+ Box(402, 402),
+ Box(403, 403),
+ Box(404, 404),
+ Box(405, 405),
+ Box(406, 406),
+ Box(407, 407),
+ Box(408, 408),
+ Box(409, 409),
+ Box(410, 410),
+ Box(411, 411),
+ Box(412, 412),
+ Box(413, 413),
+ Box(414, 414),
+ Box(415, 415),
+ Box(416, 416),
+ Box(417, 417),
+ Box(418, 418),
+ Box(419, 419),
+ Box(420, 420),
+ Box(421, 421),
+ Box(422, 422),
+ Box(423, 423),
+ Box(424, 424),
+ Box(425, 425),
+ Box(426, 426),
+ Box(427, 427),
+ Box(428, 428),
+ Box(429, 429),
+ Box(430, 430),
+ Box(431, 431),
+ Box(432, 432),
+ Box(433, 433),
+ Box(434, 434),
+ Box(435, 435),
+ Box(436, 436),
+ Box(437, 437),
+ Box(438, 438),
+ Box(439, 439),
+ Box(440, 440),
+ Box(441, 441),
+ Box(442, 442),
+ Box(443, 443),
+ Box(444, 444),
+ Box(445, 445),
+ Box(446, 446),
+ Box(447, 447),
+ Box(448, 448),
+ Box(449, 449),
+ Box(450, 450),
+ Box(451, 451),
+ Box(452, 452),
+ Box(453, 453),
+ Box(454, 454),
+ Box(455, 455),
+ Box(456, 456),
+ Box(457, 457),
+ Box(458, 458),
+ Box(459, 459),
+ Box(460, 460),
+ Box(461, 461),
+ Box(462, 462),
+ Box(463, 463),
+ Box(464, 464),
+ Box(465, 465),
+ Box(466, 466),
+ Box(467, 467),
+ Box(468, 468),
+ Box(469, 469),
+ Box(470, 470),
+ Box(471, 471),
+ Box(472, 472),
+ Box(473, 473),
+ Box(474, 474),
+ Box(475, 475),
+ Box(476, 476),
+ Box(477, 477),
+ Box(478, 478),
+ Box(479, 479),
+ Box(480, 480),
+ Box(481, 481),
+ Box(482, 482),
+ Box(483, 483),
+ Box(484, 484),
+ Box(485, 485),
+ Box(486, 486),
+ Box(487, 487),
+ Box(488, 488),
+ Box(489, 489),
+ Box(490, 490),
+ Box(491, 491),
+ Box(492, 492),
+ Box(493, 493),
+ Box(494, 494),
+ Box(495, 495),
+ Box(496, 496),
+ Box(497, 497),
+ Box(498, 498),
+ Box(499, 499),
+ Box(500, 500),
+ Box(501, 501),
+ Box(502, 502),
+ Box(503, 503),
+ Box(504, 504),
+ Box(505, 505),
+ Box(506, 506),
+ Box(507, 507),
+ Box(508, 508),
+ Box(509, 509),
+ Box(510, 510),
+ Box(511, 511),
+ Box(512, 512),
+ Box(513, 513),
+ Box(514, 514),
+ Box(515, 515),
+ Box(516, 516),
+ Box(517, 517),
+ Box(518, 518),
+ Box(519, 519),
+ Box(520, 520),
+ Box(521, 521),
+ Box(522, 522),
+ Box(523, 523),
+ Box(524, 524),
+ Box(525, 525),
+ Box(526, 526),
+ Box(527, 527),
+ Box(528, 528),
+ Box(529, 529),
+ Box(530, 530),
+ Box(531, 531),
+ Box(532, 532),
+ Box(533, 533),
+ Box(534, 534),
+ Box(535, 535),
+ Box(536, 536),
+ Box(537, 537),
+ Box(538, 538),
+ Box(539, 539),
+ Box(540, 540),
+ Box(541, 541),
+ Box(542, 542),
+ Box(543, 543),
+ Box(544, 544),
+ Box(545, 545),
+ Box(546, 546),
+ Box(547, 547),
+ Box(548, 548),
+ Box(549, 549),
+ Box(550, 550),
+ Box(551, 551),
+ Box(552, 552),
+ Box(553, 553),
+ Box(554, 554),
+ Box(555, 555),
+ Box(556, 556),
+ Box(557, 557),
+ Box(558, 558),
+ Box(559, 559),
+ Box(560, 560),
+ Box(561, 561),
+ Box(562, 562),
+ Box(563, 563),
+ Box(564, 564),
+ Box(565, 565),
+ Box(566, 566),
+ Box(567, 567),
+ Box(568, 568),
+ Box(569, 569),
+ Box(570, 570),
+ Box(571, 571),
+ Box(572, 572),
+ Box(573, 573),
+ Box(574, 574),
+ Box(575, 575),
+ Box(576, 576),
+ Box(577, 577),
+ Box(578, 578),
+ Box(579, 579),
+ Box(580, 580),
+ Box(581, 581),
+ Box(582, 582),
+ Box(583, 583),
+ Box(584, 584),
+ Box(585, 585),
+ Box(586, 586),
+ Box(587, 587),
+ Box(588, 588),
+ Box(589, 589),
+ Box(590, 590),
+ Box(591, 591),
+ Box(592, 592),
+ Box(593, 593),
+ Box(594, 594),
+ Box(595, 595),
+ Box(596, 596),
+ Box(597, 597),
+ Box(598, 598),
+ Box(599, 599),
+ Box(600, 600),
+ Box(601, 601),
+ Box(602, 602),
+ Box(603, 603),
+ Box(604, 604),
+ Box(605, 605),
+ Box(606, 606),
+ Box(607, 607),
+ Box(608, 608),
+ Box(609, 609),
+ Box(610, 610),
+ Box(611, 611),
+ Box(612, 612),
+ Box(613, 613),
+ Box(614, 614),
+ Box(615, 615),
+ Box(616, 616),
+ Box(617, 617),
+ Box(618, 618),
+ Box(619, 619),
+ Box(620, 620),
+ Box(621, 621),
+ Box(622, 622),
+ Box(623, 623),
+ Box(624, 624),
+ Box(625, 625),
+ Box(626, 626),
+ Box(627, 627),
+ Box(628, 628),
+ Box(629, 629),
+ Box(630, 630),
+ Box(631, 631),
+ Box(632, 632),
+ Box(633, 633),
+ Box(634, 634),
+ Box(635, 635),
+ Box(636, 636),
+ Box(637, 637),
+ Box(638, 638),
+ Box(639, 639),
+ Box(640, 640),
+ Box(641, 641),
+ Box(642, 642),
+ Box(643, 643),
+ Box(644, 644),
+ Box(645, 645),
+ Box(646, 646),
+ Box(647, 647),
+ Box(648, 648),
+ Box(649, 649),
+ Box(650, 650),
+ Box(651, 651),
+ Box(652, 652),
+ Box(653, 653),
+ Box(654, 654),
+ Box(655, 655),
+ Box(656, 656),
+ Box(657, 657),
+ Box(658, 658),
+ Box(659, 659),
+ Box(660, 660),
+ Box(661, 661),
+ Box(662, 662),
+ Box(663, 663),
+ Box(664, 664),
+ Box(665, 665),
+ Box(666, 666),
+ Box(667, 667),
+ Box(668, 668),
+ Box(669, 669),
+ Box(670, 670),
+ Box(671, 671),
+ Box(672, 672),
+ Box(673, 673),
+ Box(674, 674),
+ Box(675, 675),
+ Box(676, 676),
+ Box(677, 677),
+ Box(678, 678),
+ Box(679, 679),
+ Box(680, 680),
+ Box(681, 681),
+ Box(682, 682),
+ Box(683, 683),
+ Box(684, 684),
+ Box(685, 685),
+ Box(686, 686),
+ Box(687, 687),
+ Box(688, 688),
+ Box(689, 689),
+ Box(690, 690),
+ Box(691, 691),
+ Box(692, 692),
+ Box(693, 693),
+ Box(694, 694),
+ Box(695, 695),
+ Box(696, 696),
+ Box(697, 697),
+ Box(698, 698),
+ Box(699, 699),
+ Box(700, 700),
+ Box(701, 701),
+ Box(702, 702),
+ Box(703, 703),
+ Box(704, 704),
+ Box(705, 705),
+ Box(706, 706),
+ Box(707, 707),
+ Box(708, 708),
+ Box(709, 709),
+ Box(710, 710),
+ Box(711, 711),
+ Box(712, 712),
+ Box(713, 713),
+ Box(714, 714),
+ Box(715, 715),
+ Box(716, 716),
+ Box(717, 717),
+ Box(718, 718),
+ Box(719, 719),
+ Box(720, 720),
+ Box(721, 721),
+ Box(722, 722),
+ Box(723, 723),
+ Box(724, 724),
+ Box(725, 725),
+ Box(726, 726),
+ Box(727, 727),
+ Box(728, 728),
+ Box(729, 729),
+ Box(730, 730),
+ Box(731, 731),
+ Box(732, 732),
+ Box(733, 733),
+ Box(734, 734),
+ Box(735, 735),
+ Box(736, 736),
+ Box(737, 737),
+ Box(738, 738),
+ Box(739, 739),
+ Box(740, 740),
+ Box(741, 741),
+ Box(742, 742),
+ Box(743, 743),
+ Box(744, 744),
+ Box(745, 745),
+ Box(746, 746),
+ Box(747, 747),
+ Box(748, 748),
+ Box(749, 749),
+ Box(750, 750),
+ Box(751, 751),
+ Box(752, 752),
+ Box(753, 753),
+ Box(754, 754),
+ Box(755, 755),
+ Box(756, 756),
+ Box(757, 757),
+ Box(758, 758),
+ Box(759, 759),
+ Box(760, 760),
+ Box(761, 761),
+ Box(762, 762),
+ Box(763, 763),
+ Box(764, 764),
+ Box(765, 765),
+ Box(766, 766),
+ Box(767, 767),
+ Box(768, 768),
+ Box(769, 769),
+ Box(770, 770),
+ Box(771, 771),
+ Box(772, 772),
+ Box(773, 773),
+ Box(774, 774),
+ Box(775, 775),
+ Box(776, 776),
+ Box(777, 777),
+ Box(778, 778),
+ Box(779, 779),
+ Box(780, 780),
+ Box(781, 781),
+ Box(782, 782),
+ Box(783, 783),
+ Box(784, 784),
+ Box(785, 785),
+ Box(786, 786),
+ Box(787, 787),
+ Box(788, 788),
+ Box(789, 789),
+ Box(790, 790),
+ Box(791, 791),
+ Box(792, 792),
+ Box(793, 793),
+ Box(794, 794),
+ Box(795, 795),
+ Box(796, 796),
+ Box(797, 797),
+ Box(798, 798),
+ Box(799, 799),
+ Box(800, 800),
+ Box(801, 801),
+ Box(802, 802),
+ Box(803, 803),
+ Box(804, 804),
+ Box(805, 805),
+ Box(806, 806),
+ Box(807, 807),
+ Box(808, 808),
+ Box(809, 809),
+ Box(810, 810),
+ Box(811, 811),
+ Box(812, 812),
+ Box(813, 813),
+ Box(814, 814),
+ Box(815, 815),
+ Box(816, 816),
+ Box(817, 817),
+ Box(818, 818),
+ Box(819, 819),
+ Box(820, 820),
+ Box(821, 821),
+ Box(822, 822),
+ Box(823, 823),
+ Box(824, 824),
+ Box(825, 825),
+ Box(826, 826),
+ Box(827, 827),
+ Box(828, 828),
+ Box(829, 829),
+ Box(830, 830),
+ Box(831, 831),
+ Box(832, 832),
+ Box(833, 833),
+ Box(834, 834),
+ Box(835, 835),
+ Box(836, 836),
+ Box(837, 837),
+ Box(838, 838),
+ Box(839, 839),
+ Box(840, 840),
+ Box(841, 841),
+ Box(842, 842),
+ Box(843, 843),
+ Box(844, 844),
+ Box(845, 845),
+ Box(846, 846),
+ Box(847, 847),
+ Box(848, 848),
+ Box(849, 849),
+ Box(850, 850),
+ Box(851, 851),
+ Box(852, 852),
+ Box(853, 853),
+ Box(854, 854),
+ Box(855, 855),
+ Box(856, 856),
+ Box(857, 857),
+ Box(858, 858),
+ Box(859, 859),
+ Box(860, 860),
+ Box(861, 861),
+ Box(862, 862),
+ Box(863, 863),
+ Box(864, 864),
+ Box(865, 865),
+ Box(866, 866),
+ Box(867, 867),
+ Box(868, 868),
+ Box(869, 869),
+ Box(870, 870),
+ Box(871, 871),
+ Box(872, 872),
+ Box(873, 873),
+ Box(874, 874),
+ Box(875, 875),
+ Box(876, 876),
+ Box(877, 877),
+ Box(878, 878),
+ Box(879, 879),
+ Box(880, 880),
+ Box(881, 881),
+ Box(882, 882),
+ Box(883, 883),
+ Box(884, 884),
+ Box(885, 885),
+ Box(886, 886),
+ Box(887, 887),
+ Box(888, 888),
+ Box(889, 889),
+ Box(890, 890),
+ Box(891, 891),
+ Box(892, 892),
+ Box(893, 893),
+ Box(894, 894),
+ Box(895, 895),
+ Box(896, 896),
+ Box(897, 897),
+ Box(898, 898),
+ Box(899, 899),
+ Box(900, 900),
+ Box(901, 901),
+ Box(902, 902),
+ Box(903, 903),
+ Box(904, 904),
+ Box(905, 905),
+ Box(906, 906),
+ Box(907, 907),
+ Box(908, 908),
+ Box(909, 909),
+ Box(910, 910),
+ Box(911, 911),
+ Box(912, 912),
+ Box(913, 913),
+ Box(914, 914),
+ Box(915, 915),
+ Box(916, 916),
+ Box(917, 917),
+ Box(918, 918),
+ Box(919, 919),
+ Box(920, 920),
+ Box(921, 921),
+ Box(922, 922),
+ Box(923, 923),
+ Box(924, 924),
+ Box(925, 925),
+ Box(926, 926),
+ Box(927, 927),
+ Box(928, 928),
+ Box(929, 929),
+ Box(930, 930),
+ Box(931, 931),
+ Box(932, 932),
+ Box(933, 933),
+ Box(934, 934),
+ Box(935, 935),
+ Box(936, 936),
+ Box(937, 937),
+ Box(938, 938),
+ Box(939, 939),
+ Box(940, 940),
+ Box(941, 941),
+ Box(942, 942),
+ Box(943, 943),
+ Box(944, 944),
+ Box(945, 945),
+ Box(946, 946),
+ Box(947, 947),
+ Box(948, 948),
+ Box(949, 949),
+ Box(950, 950),
+ Box(951, 951),
+ Box(952, 952),
+ Box(953, 953),
+ Box(954, 954),
+ Box(955, 955),
+ Box(956, 956),
+ Box(957, 957),
+ Box(958, 958),
+ Box(959, 959),
+ Box(960, 960),
+ Box(961, 961),
+ Box(962, 962),
+ Box(963, 963),
+ Box(964, 964),
+ Box(965, 965),
+ Box(966, 966),
+ Box(967, 967),
+ Box(968, 968),
+ Box(969, 969),
+ Box(970, 970),
+ Box(971, 971),
+ Box(972, 972),
+ Box(973, 973),
+ Box(974, 974),
+ Box(975, 975),
+ Box(976, 976),
+ Box(977, 977),
+ Box(978, 978),
+ Box(979, 979),
+ Box(980, 980),
+ Box(981, 981),
+ Box(982, 982),
+ Box(983, 983),
+ Box(984, 984),
+ Box(985, 985),
+ Box(986, 986),
+ Box(987, 987),
+ Box(988, 988),
+ Box(989, 989),
+ Box(990, 990),
+ Box(991, 991),
+ Box(992, 992),
+ Box(993, 993),
+ Box(994, 994),
+ Box(995, 995),
+ Box(996, 996),
+ Box(997, 997),
+ Box(998, 998),
+ Box(999, 999),
+ Box(1000, 1000),
+ Box(1001, 1001),
+ Box(1002, 1002),
+ Box(1003, 1003),
+ Box(1004, 1004),
+ Box(1005, 1005),
+ Box(1006, 1006),
+ Box(1007, 1007),
+ Box(1008, 1008),
+ Box(1009, 1009),
+ Box(1010, 1010),
+ Box(1011, 1011),
+ Box(1012, 1012),
+ Box(1013, 1013),
+ Box(1014, 1014),
+ Box(1015, 1015),
+ Box(1016, 1016),
+ Box(1017, 1017),
+ Box(1018, 1018),
+ Box(1019, 1019),
+ Box(1020, 1020),
+ Box(1021, 1021),
+ Box(1022, 1022),
+ Box(1023, 1023),
+ Box(1024, 1024),
+ Box(1025, 1025),
+ Box(1026, 1026),
+ Box(1027, 1027),
+ Box(1028, 1028),
+ Box(1029, 1029),
+ Box(1030, 1030),
+ Box(1031, 1031),
+ Box(1032, 1032),
+ Box(1033, 1033),
+ Box(1034, 1034),
+ Box(1035, 1035),
+ Box(1036, 1036),
+ Box(1037, 1037),
+ Box(1038, 1038),
+ Box(1039, 1039),
+ Box(1040, 1040),
+ Box(1041, 1041),
+ Box(1042, 1042),
+ Box(1043, 1043),
+ Box(1044, 1044),
+ Box(1045, 1045),
+ Box(1046, 1046),
+ Box(1047, 1047),
+ Box(1048, 1048),
+ Box(1049, 1049),
+ Box(1050, 1050),
+ Box(1051, 1051),
+ Box(1052, 1052),
+ Box(1053, 1053),
+ Box(1054, 1054),
+ Box(1055, 1055),
+ Box(1056, 1056),
+ Box(1057, 1057),
+ Box(1058, 1058),
+ Box(1059, 1059),
+ Box(1060, 1060),
+ Box(1061, 1061),
+ Box(1062, 1062),
+ Box(1063, 1063),
+ Box(1064, 1064),
+ Box(1065, 1065),
+ Box(1066, 1066),
+ Box(1067, 1067),
+ Box(1068, 1068),
+ Box(1069, 1069),
+ Box(1070, 1070),
+ Box(1071, 1071),
+ Box(1072, 1072),
+ Box(1073, 1073),
+ Box(1074, 1074),
+ Box(1075, 1075),
+ Box(1076, 1076),
+ Box(1077, 1077),
+ Box(1078, 1078),
+ Box(1079, 1079),
+ Box(1080, 1080),
+ Box(1081, 1081),
+ Box(1082, 1082),
+ Box(1083, 1083),
+ Box(1084, 1084),
+ Box(1085, 1085),
+ Box(1086, 1086),
+ Box(1087, 1087),
+ Box(1088, 1088),
+ Box(1089, 1089),
+ Box(1090, 1090),
+ Box(1091, 1091),
+ Box(1092, 1092),
+ Box(1093, 1093),
+ Box(1094, 1094),
+ Box(1095, 1095),
+ Box(1096, 1096),
+ Box(1097, 1097),
+ Box(1098, 1098),
+ Box(1099, 1099),
+ Box(1100, 1100),
+ Box(1101, 1101),
+ Box(1102, 1102),
+ Box(1103, 1103),
+ Box(1104, 1104),
+ Box(1105, 1105),
+ Box(1106, 1106),
+ Box(1107, 1107),
+ Box(1108, 1108),
+ Box(1109, 1109),
+ Box(1110, 1110),
+ Box(1111, 1111),
+ Box(1112, 1112),
+ Box(1113, 1113),
+ Box(1114, 1114),
+ Box(1115, 1115),
+ Box(1116, 1116),
+ Box(1117, 1117),
+ Box(1118, 1118),
+ Box(1119, 1119),
+ Box(1120, 1120),
+ Box(1121, 1121),
+ Box(1122, 1122),
+ Box(1123, 1123),
+ Box(1124, 1124),
+ Box(1125, 1125),
+ Box(1126, 1126),
+ Box(1127, 1127),
+ Box(1128, 1128),
+ Box(1129, 1129),
+ Box(1130, 1130),
+ Box(1131, 1131),
+ Box(1132, 1132),
+ Box(1133, 1133),
+ Box(1134, 1134),
+ Box(1135, 1135),
+ Box(1136, 1136),
+ Box(1137, 1137),
+ Box(1138, 1138),
+ Box(1139, 1139),
+ Box(1140, 1140),
+ Box(1141, 1141),
+ Box(1142, 1142),
+ Box(1143, 1143),
+ Box(1144, 1144),
+ Box(1145, 1145),
+ Box(1146, 1146),
+ Box(1147, 1147),
+ Box(1148, 1148),
+ Box(1149, 1149),
+ Box(1150, 1150),
+ Box(1151, 1151),
+ Box(1152, 1152),
+ Box(1153, 1153),
+ Box(1154, 1154),
+ Box(1155, 1155),
+ Box(1156, 1156),
+ Box(1157, 1157),
+ Box(1158, 1158),
+ Box(1159, 1159),
+ Box(1160, 1160),
+ Box(1161, 1161),
+ Box(1162, 1162),
+ Box(1163, 1163),
+ Box(1164, 1164),
+ Box(1165, 1165),
+ Box(1166, 1166),
+ Box(1167, 1167),
+ Box(1168, 1168),
+ Box(1169, 1169),
+ Box(1170, 1170),
+ Box(1171, 1171),
+ Box(1172, 1172),
+ Box(1173, 1173),
+ Box(1174, 1174),
+ Box(1175, 1175),
+ Box(1176, 1176),
+ Box(1177, 1177),
+ Box(1178, 1178),
+ Box(1179, 1179),
+ Box(1180, 1180),
+ Box(1181, 1181),
+ Box(1182, 1182),
+ Box(1183, 1183),
+ Box(1184, 1184),
+ Box(1185, 1185),
+ Box(1186, 1186),
+ Box(1187, 1187),
+ Box(1188, 1188),
+ Box(1189, 1189),
+ Box(1190, 1190),
+ Box(1191, 1191),
+ Box(1192, 1192),
+ Box(1193, 1193),
+ Box(1194, 1194),
+ Box(1195, 1195),
+ Box(1196, 1196),
+ Box(1197, 1197),
+ Box(1198, 1198),
+ Box(1199, 1199),
+ Box(1200, 1200),
+ Box(1201, 1201),
+ Box(1202, 1202),
+ Box(1203, 1203),
+ Box(1204, 1204),
+ Box(1205, 1205),
+ Box(1206, 1206),
+ Box(1207, 1207),
+ Box(1208, 1208),
+ Box(1209, 1209),
+ Box(1210, 1210),
+ Box(1211, 1211),
+ Box(1212, 1212),
+ Box(1213, 1213),
+ Box(1214, 1214),
+ Box(1215, 1215),
+ Box(1216, 1216),
+ Box(1217, 1217),
+ Box(1218, 1218),
+ Box(1219, 1219),
+ Box(1220, 1220),
+ Box(1221, 1221),
+ Box(1222, 1222),
+ Box(1223, 1223),
+ Box(1224, 1224),
+ Box(1225, 1225),
+ Box(1226, 1226),
+ Box(1227, 1227),
+ Box(1228, 1228),
+ Box(1229, 1229),
+ Box(1230, 1230),
+ Box(1231, 1231),
+ Box(1232, 1232),
+ Box(1233, 1233),
+ Box(1234, 1234),
+ Box(1235, 1235),
+ Box(1236, 1236),
+ Box(1237, 1237),
+ Box(1238, 1238),
+ Box(1239, 1239),
+ Box(1240, 1240),
+ Box(1241, 1241),
+ Box(1242, 1242),
+ Box(1243, 1243),
+ Box(1244, 1244),
+ Box(1245, 1245),
+ Box(1246, 1246),
+ Box(1247, 1247),
+ Box(1248, 1248),
+ Box(1249, 1249),
+ Box(1250, 1250),
+ Box(1251, 1251),
+ Box(1252, 1252),
+ Box(1253, 1253),
+ Box(1254, 1254),
+ Box(1255, 1255),
+ Box(1256, 1256),
+ Box(1257, 1257),
+ Box(1258, 1258),
+ Box(1259, 1259),
+ Box(1260, 1260),
+ Box(1261, 1261),
+ Box(1262, 1262),
+ Box(1263, 1263),
+ Box(1264, 1264),
+ Box(1265, 1265),
+ Box(1266, 1266),
+ Box(1267, 1267),
+ Box(1268, 1268),
+ Box(1269, 1269),
+ Box(1270, 1270),
+ Box(1271, 1271),
+ Box(1272, 1272),
+ Box(1273, 1273),
+ Box(1274, 1274),
+ Box(1275, 1275),
+ Box(1276, 1276),
+ Box(1277, 1277),
+ Box(1278, 1278),
+ Box(1279, 1279),
+ Box(1280, 1280),
+ Box(1281, 1281),
+ Box(1282, 1282),
+ Box(1283, 1283),
+ Box(1284, 1284),
+ Box(1285, 1285),
+ Box(1286, 1286),
+ Box(1287, 1287),
+ Box(1288, 1288),
+ Box(1289, 1289),
+ Box(1290, 1290),
+ Box(1291, 1291),
+ Box(1292, 1292),
+ Box(1293, 1293),
+ Box(1294, 1294),
+ Box(1295, 1295),
+ Box(1296, 1296),
+ Box(1297, 1297),
+ Box(1298, 1298),
+ Box(1299, 1299),
+ Box(1300, 1300),
+ Box(1301, 1301),
+ Box(1302, 1302),
+ Box(1303, 1303),
+ Box(1304, 1304),
+ Box(1305, 1305),
+ Box(1306, 1306),
+ Box(1307, 1307),
+ Box(1308, 1308),
+ Box(1309, 1309),
+ Box(1310, 1310),
+ Box(1311, 1311),
+ Box(1312, 1312),
+ Box(1313, 1313),
+ Box(1314, 1314),
+ Box(1315, 1315),
+ Box(1316, 1316),
+ Box(1317, 1317),
+ Box(1318, 1318),
+ Box(1319, 1319),
+ Box(1320, 1320),
+ Box(1321, 1321),
+ Box(1322, 1322),
+ Box(1323, 1323),
+ Box(1324, 1324),
+ Box(1325, 1325),
+ Box(1326, 1326),
+ Box(1327, 1327),
+ Box(1328, 1328),
+ Box(1329, 1329),
+ Box(1330, 1330),
+ Box(1331, 1331),
+ Box(1332, 1332),
+ Box(1333, 1333),
+ Box(1334, 1334),
+ Box(1335, 1335),
+ Box(1336, 1336),
+ Box(1337, 1337),
+ Box(1338, 1338),
+ Box(1339, 1339),
+ Box(1340, 1340),
+ Box(1341, 1341),
+ Box(1342, 1342),
+ Box(1343, 1343),
+ Box(1344, 1344),
+ Box(1345, 1345),
+ Box(1346, 1346),
+ Box(1347, 1347),
+ Box(1348, 1348),
+ Box(1349, 1349),
+ Box(1350, 1350),
+ Box(1351, 1351),
+ Box(1352, 1352),
+ Box(1353, 1353),
+ Box(1354, 1354),
+ Box(1355, 1355),
+ Box(1356, 1356),
+ Box(1357, 1357),
+ Box(1358, 1358),
+ Box(1359, 1359),
+ Box(1360, 1360),
+ Box(1361, 1361),
+ Box(1362, 1362),
+ Box(1363, 1363),
+ Box(1364, 1364),
+ Box(1365, 1365),
+ Box(1366, 1366),
+ Box(1367, 1367),
+ Box(1368, 1368),
+ Box(1369, 1369),
+ Box(1370, 1370),
+ Box(1371, 1371),
+ Box(1372, 1372),
+ Box(1373, 1373),
+ Box(1374, 1374),
+ Box(1375, 1375),
+ Box(1376, 1376),
+ Box(1377, 1377),
+ Box(1378, 1378),
+ Box(1379, 1379),
+ Box(1380, 1380),
+ Box(1381, 1381),
+ Box(1382, 1382),
+ Box(1383, 1383),
+ Box(1384, 1384),
+ Box(1385, 1385),
+ Box(1386, 1386),
+ Box(1387, 1387),
+ Box(1388, 1388),
+ Box(1389, 1389),
+ Box(1390, 1390),
+ Box(1391, 1391),
+ Box(1392, 1392),
+ Box(1393, 1393),
+ Box(1394, 1394),
+ Box(1395, 1395),
+ Box(1396, 1396),
+ Box(1397, 1397),
+ Box(1398, 1398),
+ Box(1399, 1399),
+ Box(1400, 1400),
+ Box(1401, 1401),
+ Box(1402, 1402),
+ Box(1403, 1403),
+ Box(1404, 1404),
+ Box(1405, 1405),
+ Box(1406, 1406),
+ Box(1407, 1407),
+ Box(1408, 1408),
+ Box(1409, 1409),
+ Box(1410, 1410),
+ Box(1411, 1411),
+ Box(1412, 1412),
+ Box(1413, 1413),
+ Box(1414, 1414),
+ Box(1415, 1415),
+ Box(1416, 1416),
+ Box(1417, 1417),
+ Box(1418, 1418),
+ Box(1419, 1419),
+ Box(1420, 1420),
+ Box(1421, 1421),
+ Box(1422, 1422),
+ Box(1423, 1423),
+ Box(1424, 1424),
+ Box(1425, 1425),
+ Box(1426, 1426),
+ Box(1427, 1427),
+ Box(1428, 1428),
+ Box(1429, 1429),
+ Box(1430, 1430),
+ Box(1431, 1431),
+ Box(1432, 1432),
+ Box(1433, 1433),
+ Box(1434, 1434),
+ Box(1435, 1435),
+ Box(1436, 1436),
+ Box(1437, 1437),
+ Box(1438, 1438),
+ Box(1439, 1439),
+ Box(1440, 1440),
+ Box(1441, 1441),
+ Box(1442, 1442),
+ Box(1443, 1443),
+ Box(1444, 1444),
+ Box(1445, 1445),
+ Box(1446, 1446),
+ Box(1447, 1447),
+ Box(1448, 1448),
+ Box(1449, 1449),
+ Box(1450, 1450),
+ Box(1451, 1451),
+ Box(1452, 1452),
+ Box(1453, 1453),
+ Box(1454, 1454),
+ Box(1455, 1455),
+ Box(1456, 1456),
+ Box(1457, 1457),
+ Box(1458, 1458),
+ Box(1459, 1459),
+ Box(1460, 1460),
+ Box(1461, 1461),
+ Box(1462, 1462),
+ Box(1463, 1463),
+ Box(1464, 1464),
+ Box(1465, 1465),
+ Box(1466, 1466),
+ Box(1467, 1467),
+ Box(1468, 1468),
+ Box(1469, 1469),
+ Box(1470, 1470),
+ Box(1471, 1471),
+ Box(1472, 1472),
+ Box(1473, 1473),
+ Box(1474, 1474),
+ Box(1475, 1475),
+ Box(1476, 1476),
+ Box(1477, 1477),
+ Box(1478, 1478),
+ Box(1479, 1479),
+ Box(1480, 1480),
+ Box(1481, 1481),
+ Box(1482, 1482),
+ Box(1483, 1483),
+ Box(1484, 1484),
+ Box(1485, 1485),
+ Box(1486, 1486),
+ Box(1487, 1487),
+ Box(1488, 1488),
+ Box(1489, 1489),
+ Box(1490, 1490),
+ Box(1491, 1491),
+ Box(1492, 1492),
+ Box(1493, 1493),
+ Box(1494, 1494),
+ Box(1495, 1495),
+ Box(1496, 1496),
+ Box(1497, 1497),
+ Box(1498, 1498),
+ Box(1499, 1499),
+ Box(1500, 1500),
+ Box(1501, 1501),
+ Box(1502, 1502),
+ Box(1503, 1503),
+ Box(1504, 1504),
+ Box(1505, 1505),
+ Box(1506, 1506),
+ Box(1507, 1507),
+ Box(1508, 1508),
+ Box(1509, 1509),
+ Box(1510, 1510),
+ Box(1511, 1511),
+ Box(1512, 1512),
+ Box(1513, 1513),
+ Box(1514, 1514),
+ Box(1515, 1515),
+ Box(1516, 1516),
+ Box(1517, 1517),
+ Box(1518, 1518),
+ Box(1519, 1519),
+ Box(1520, 1520),
+ Box(1521, 1521),
+ Box(1522, 1522),
+ Box(1523, 1523),
+ Box(1524, 1524),
+ Box(1525, 1525),
+ Box(1526, 1526),
+ Box(1527, 1527),
+ Box(1528, 1528),
+ Box(1529, 1529),
+ Box(1530, 1530),
+ Box(1531, 1531),
+ Box(1532, 1532),
+ Box(1533, 1533),
+ Box(1534, 1534),
+ Box(1535, 1535),
+ Box(1536, 1536),
+ Box(1537, 1537),
+ Box(1538, 1538),
+ Box(1539, 1539),
+ Box(1540, 1540),
+ Box(1541, 1541),
+ Box(1542, 1542),
+ Box(1543, 1543),
+ Box(1544, 1544),
+ Box(1545, 1545),
+ Box(1546, 1546),
+ Box(1547, 1547),
+ Box(1548, 1548),
+ Box(1549, 1549),
+ Box(1550, 1550),
+ Box(1551, 1551),
+ Box(1552, 1552),
+ Box(1553, 1553),
+ Box(1554, 1554),
+ Box(1555, 1555),
+ Box(1556, 1556),
+ Box(1557, 1557),
+ Box(1558, 1558),
+ Box(1559, 1559),
+ Box(1560, 1560),
+ Box(1561, 1561),
+ Box(1562, 1562),
+ Box(1563, 1563),
+ Box(1564, 1564),
+ Box(1565, 1565),
+ Box(1566, 1566),
+ Box(1567, 1567),
+ Box(1568, 1568),
+ Box(1569, 1569),
+ Box(1570, 1570),
+ Box(1571, 1571),
+ Box(1572, 1572),
+ Box(1573, 1573),
+ Box(1574, 1574),
+ Box(1575, 1575),
+ Box(1576, 1576),
+ Box(1577, 1577),
+ Box(1578, 1578),
+ Box(1579, 1579),
+ Box(1580, 1580),
+ Box(1581, 1581),
+ Box(1582, 1582),
+ Box(1583, 1583),
+ Box(1584, 1584),
+ Box(1585, 1585),
+ Box(1586, 1586),
+ Box(1587, 1587),
+ Box(1588, 1588),
+ Box(1589, 1589),
+ Box(1590, 1590),
+ Box(1591, 1591),
+ Box(1592, 1592),
+ Box(1593, 1593),
+ Box(1594, 1594),
+ Box(1595, 1595),
+ Box(1596, 1596),
+ Box(1597, 1597),
+ Box(1598, 1598),
+ Box(1599, 1599),
+ Box(1600, 1600),
+ Box(1601, 1601),
+ Box(1602, 1602),
+ Box(1603, 1603),
+ Box(1604, 1604),
+ Box(1605, 1605),
+ Box(1606, 1606),
+ Box(1607, 1607),
+ Box(1608, 1608),
+ Box(1609, 1609),
+ Box(1610, 1610),
+ Box(1611, 1611),
+ Box(1612, 1612),
+ Box(1613, 1613),
+ Box(1614, 1614),
+ Box(1615, 1615),
+ Box(1616, 1616),
+ Box(1617, 1617),
+ Box(1618, 1618),
+ Box(1619, 1619),
+ Box(1620, 1620),
+ Box(1621, 1621),
+ Box(1622, 1622),
+ Box(1623, 1623),
+ Box(1624, 1624),
+ Box(1625, 1625),
+ Box(1626, 1626),
+ Box(1627, 1627),
+ Box(1628, 1628),
+ Box(1629, 1629),
+ Box(1630, 1630),
+ Box(1631, 1631),
+ Box(1632, 1632),
+ Box(1633, 1633),
+ Box(1634, 1634),
+ Box(1635, 1635),
+ Box(1636, 1636),
+ Box(1637, 1637),
+ Box(1638, 1638),
+ Box(1639, 1639),
+ Box(1640, 1640),
+ Box(1641, 1641),
+ Box(1642, 1642),
+ Box(1643, 1643),
+ Box(1644, 1644),
+ Box(1645, 1645),
+ Box(1646, 1646),
+ Box(1647, 1647),
+ Box(1648, 1648),
+ Box(1649, 1649),
+ Box(1650, 1650),
+ Box(1651, 1651),
+ Box(1652, 1652),
+ Box(1653, 1653),
+ Box(1654, 1654),
+ Box(1655, 1655),
+ Box(1656, 1656),
+ Box(1657, 1657),
+ Box(1658, 1658),
+ Box(1659, 1659),
+ Box(1660, 1660),
+ Box(1661, 1661),
+ Box(1662, 1662),
+ Box(1663, 1663),
+ Box(1664, 1664),
+ Box(1665, 1665),
+ Box(1666, 1666),
+ Box(1667, 1667),
+ Box(1668, 1668),
+ Box(1669, 1669),
+ Box(1670, 1670),
+ Box(1671, 1671),
+ Box(1672, 1672),
+ Box(1673, 1673),
+ Box(1674, 1674),
+ Box(1675, 1675),
+ Box(1676, 1676),
+ Box(1677, 1677),
+ Box(1678, 1678),
+ Box(1679, 1679),
+ Box(1680, 1680),
+ Box(1681, 1681),
+ Box(1682, 1682),
+ Box(1683, 1683),
+ Box(1684, 1684),
+ Box(1685, 1685),
+ Box(1686, 1686),
+ Box(1687, 1687),
+ Box(1688, 1688),
+ Box(1689, 1689),
+ Box(1690, 1690),
+ Box(1691, 1691),
+ Box(1692, 1692),
+ Box(1693, 1693),
+ Box(1694, 1694),
+ Box(1695, 1695),
+ Box(1696, 1696),
+ Box(1697, 1697),
+ Box(1698, 1698),
+ Box(1699, 1699),
+ Box(1700, 1700),
+ Box(1701, 1701),
+ Box(1702, 1702),
+ Box(1703, 1703),
+ Box(1704, 1704),
+ Box(1705, 1705),
+ Box(1706, 1706),
+ Box(1707, 1707),
+ Box(1708, 1708),
+ Box(1709, 1709),
+ Box(1710, 1710),
+ Box(1711, 1711),
+ Box(1712, 1712),
+ Box(1713, 1713),
+ Box(1714, 1714),
+ Box(1715, 1715),
+ Box(1716, 1716),
+ Box(1717, 1717),
+ Box(1718, 1718),
+ Box(1719, 1719),
+ Box(1720, 1720),
+ Box(1721, 1721),
+ Box(1722, 1722),
+ Box(1723, 1723),
+ Box(1724, 1724),
+ Box(1725, 1725),
+ Box(1726, 1726),
+ Box(1727, 1727),
+ Box(1728, 1728),
+ Box(1729, 1729),
+ Box(1730, 1730),
+ Box(1731, 1731),
+ Box(1732, 1732),
+ Box(1733, 1733),
+ Box(1734, 1734),
+ Box(1735, 1735),
+ Box(1736, 1736),
+ Box(1737, 1737),
+ Box(1738, 1738),
+ Box(1739, 1739),
+ Box(1740, 1740),
+ Box(1741, 1741),
+ Box(1742, 1742),
+ Box(1743, 1743),
+ Box(1744, 1744),
+ Box(1745, 1745),
+ Box(1746, 1746),
+ Box(1747, 1747),
+ Box(1748, 1748),
+ Box(1749, 1749),
+ Box(1750, 1750),
+ Box(1751, 1751),
+ Box(1752, 1752),
+ Box(1753, 1753),
+ Box(1754, 1754),
+ Box(1755, 1755),
+ Box(1756, 1756),
+ Box(1757, 1757),
+ Box(1758, 1758),
+ Box(1759, 1759),
+ Box(1760, 1760),
+ Box(1761, 1761),
+ Box(1762, 1762),
+ Box(1763, 1763),
+ Box(1764, 1764),
+ Box(1765, 1765),
+ Box(1766, 1766),
+ Box(1767, 1767),
+ Box(1768, 1768),
+ Box(1769, 1769),
+ Box(1770, 1770),
+ Box(1771, 1771),
+ Box(1772, 1772),
+ Box(1773, 1773),
+ Box(1774, 1774),
+ Box(1775, 1775),
+ Box(1776, 1776),
+ Box(1777, 1777),
+ Box(1778, 1778),
+ Box(1779, 1779),
+ Box(1780, 1780),
+ Box(1781, 1781),
+ Box(1782, 1782),
+ Box(1783, 1783),
+ Box(1784, 1784),
+ Box(1785, 1785),
+ Box(1786, 1786),
+ Box(1787, 1787),
+ Box(1788, 1788),
+ Box(1789, 1789),
+ Box(1790, 1790),
+ Box(1791, 1791),
+ Box(1792, 1792),
+ Box(1793, 1793),
+ Box(1794, 1794),
+ Box(1795, 1795),
+ Box(1796, 1796),
+ Box(1797, 1797),
+ Box(1798, 1798),
+ Box(1799, 1799),
+ Box(1800, 1800),
+ Box(1801, 1801),
+ Box(1802, 1802),
+ Box(1803, 1803),
+ Box(1804, 1804),
+ Box(1805, 1805),
+ Box(1806, 1806),
+ Box(1807, 1807),
+ Box(1808, 1808),
+ Box(1809, 1809),
+ Box(1810, 1810),
+ Box(1811, 1811),
+ Box(1812, 1812),
+ Box(1813, 1813),
+ Box(1814, 1814),
+ Box(1815, 1815),
+ Box(1816, 1816),
+ Box(1817, 1817),
+ Box(1818, 1818),
+ Box(1819, 1819),
+ Box(1820, 1820),
+ Box(1821, 1821),
+ Box(1822, 1822),
+ Box(1823, 1823),
+ Box(1824, 1824),
+ Box(1825, 1825),
+ Box(1826, 1826),
+ Box(1827, 1827),
+ Box(1828, 1828),
+ Box(1829, 1829),
+ Box(1830, 1830),
+ Box(1831, 1831),
+ Box(1832, 1832),
+ Box(1833, 1833),
+ Box(1834, 1834),
+ Box(1835, 1835),
+ Box(1836, 1836),
+ Box(1837, 1837),
+ Box(1838, 1838),
+ Box(1839, 1839),
+ Box(1840, 1840),
+ Box(1841, 1841),
+ Box(1842, 1842),
+ Box(1843, 1843),
+ Box(1844, 1844),
+ Box(1845, 1845),
+ Box(1846, 1846),
+ Box(1847, 1847),
+ Box(1848, 1848),
+ Box(1849, 1849),
+ Box(1850, 1850),
+ Box(1851, 1851),
+ Box(1852, 1852),
+ Box(1853, 1853),
+ Box(1854, 1854),
+ Box(1855, 1855),
+ Box(1856, 1856),
+ Box(1857, 1857),
+ Box(1858, 1858),
+ Box(1859, 1859),
+ Box(1860, 1860),
+ Box(1861, 1861),
+ Box(1862, 1862),
+ Box(1863, 1863),
+ Box(1864, 1864),
+ Box(1865, 1865),
+ Box(1866, 1866),
+ Box(1867, 1867),
+ Box(1868, 1868),
+ Box(1869, 1869),
+ Box(1870, 1870),
+ Box(1871, 1871),
+ Box(1872, 1872),
+ Box(1873, 1873),
+ Box(1874, 1874),
+ Box(1875, 1875),
+ Box(1876, 1876),
+ Box(1877, 1877),
+ Box(1878, 1878),
+ Box(1879, 1879),
+ Box(1880, 1880),
+ Box(1881, 1881),
+ Box(1882, 1882),
+ Box(1883, 1883),
+ Box(1884, 1884),
+ Box(1885, 1885),
+ Box(1886, 1886),
+ Box(1887, 1887),
+ Box(1888, 1888),
+ Box(1889, 1889),
+ Box(1890, 1890),
+ Box(1891, 1891),
+ Box(1892, 1892),
+ Box(1893, 1893),
+ Box(1894, 1894),
+ Box(1895, 1895),
+ Box(1896, 1896),
+ Box(1897, 1897),
+ Box(1898, 1898),
+ Box(1899, 1899),
+ Box(1900, 1900),
+ Box(1901, 1901),
+ Box(1902, 1902),
+ Box(1903, 1903),
+ Box(1904, 1904),
+ Box(1905, 1905),
+ Box(1906, 1906),
+ Box(1907, 1907),
+ Box(1908, 1908),
+ Box(1909, 1909),
+ Box(1910, 1910),
+ Box(1911, 1911),
+ Box(1912, 1912),
+ Box(1913, 1913),
+ Box(1914, 1914),
+ Box(1915, 1915),
+ Box(1916, 1916),
+ Box(1917, 1917),
+ Box(1918, 1918),
+ Box(1919, 1919),
+ Box(1920, 1920),
+ Box(1921, 1921),
+ Box(1922, 1922),
+ Box(1923, 1923),
+ Box(1924, 1924),
+ Box(1925, 1925),
+ Box(1926, 1926),
+ Box(1927, 1927),
+ Box(1928, 1928),
+ Box(1929, 1929),
+ Box(1930, 1930),
+ Box(1931, 1931),
+ Box(1932, 1932),
+ Box(1933, 1933),
+ Box(1934, 1934),
+ Box(1935, 1935),
+ Box(1936, 1936),
+ Box(1937, 1937),
+ Box(1938, 1938),
+ Box(1939, 1939),
+ Box(1940, 1940),
+ Box(1941, 1941),
+ Box(1942, 1942),
+ Box(1943, 1943),
+ Box(1944, 1944),
+ Box(1945, 1945),
+ Box(1946, 1946),
+ Box(1947, 1947),
+ Box(1948, 1948),
+ Box(1949, 1949),
+ Box(1950, 1950),
+ Box(1951, 1951),
+ Box(1952, 1952),
+ Box(1953, 1953),
+ Box(1954, 1954),
+ Box(1955, 1955),
+ Box(1956, 1956),
+ Box(1957, 1957),
+ Box(1958, 1958),
+ Box(1959, 1959),
+ Box(1960, 1960),
+ Box(1961, 1961),
+ Box(1962, 1962),
+ Box(1963, 1963),
+ Box(1964, 1964),
+ Box(1965, 1965),
+ Box(1966, 1966),
+ Box(1967, 1967),
+ Box(1968, 1968),
+ Box(1969, 1969),
+ Box(1970, 1970),
+ Box(1971, 1971),
+ Box(1972, 1972),
+ Box(1973, 1973),
+ Box(1974, 1974),
+ Box(1975, 1975),
+ Box(1976, 1976),
+ Box(1977, 1977),
+ Box(1978, 1978),
+ Box(1979, 1979),
+ Box(1980, 1980),
+ Box(1981, 1981),
+ Box(1982, 1982),
+ Box(1983, 1983),
+ Box(1984, 1984),
+ Box(1985, 1985),
+ Box(1986, 1986),
+ Box(1987, 1987),
+ Box(1988, 1988),
+ Box(1989, 1989),
+ Box(1990, 1990),
+ Box(1991, 1991),
+ Box(1992, 1992),
+ Box(1993, 1993),
+ Box(1994, 1994),
+ Box(1995, 1995),
+ Box(1996, 1996),
+ Box(1997, 1997),
+ Box(1998, 1998),
+ Box(1999, 1999),
+ Box(2000, 2000),
+ Box(2001, 2001),
+ Box(2002, 2002),
+ Box(2003, 2003),
+ Box(2004, 2004),
+ Box(2005, 2005),
+ Box(2006, 2006),
+ Box(2007, 2007),
+ Box(2008, 2008),
+ Box(2009, 2009),
+ Box(2010, 2010),
+ Box(2011, 2011),
+ Box(2012, 2012),
+ Box(2013, 2013),
+ Box(2014, 2014),
+ Box(2015, 2015),
+ Box(2016, 2016),
+ Box(2017, 2017),
+ Box(2018, 2018),
+ Box(2019, 2019),
+ Box(2020, 2020),
+ Box(2021, 2021),
+ Box(2022, 2022),
+ Box(2023, 2023),
+ Box(2024, 2024),
+ Box(2025, 2025),
+ Box(2026, 2026),
+ Box(2027, 2027),
+ Box(2028, 2028),
+ Box(2029, 2029),
+ Box(2030, 2030),
+ Box(2031, 2031),
+ Box(2032, 2032),
+ Box(2033, 2033),
+ Box(2034, 2034),
+ Box(2035, 2035),
+ Box(2036, 2036),
+ Box(2037, 2037),
+ Box(2038, 2038),
+ Box(2039, 2039),
+ Box(2040, 2040),
+ Box(2041, 2041),
+ Box(2042, 2042),
+ Box(2043, 2043),
+ Box(2044, 2044),
+ Box(2045, 2045),
+ Box(2046, 2046),
+ Box(2047, 2047),
+ Box(2048, 2048),
+ Box(2049, 2049),
+ Box(2050, 2050),
+ Box(2051, 2051),
+ Box(2052, 2052),
+ Box(2053, 2053),
+ Box(2054, 2054),
+ Box(2055, 2055),
+ Box(2056, 2056),
+ Box(2057, 2057),
+ Box(2058, 2058),
+ Box(2059, 2059),
+ Box(2060, 2060),
+ Box(2061, 2061),
+ Box(2062, 2062),
+ Box(2063, 2063),
+ Box(2064, 2064),
+ Box(2065, 2065),
+ Box(2066, 2066),
+ Box(2067, 2067),
+ Box(2068, 2068),
+ Box(2069, 2069),
+ Box(2070, 2070),
+ Box(2071, 2071),
+ Box(2072, 2072),
+ Box(2073, 2073),
+ Box(2074, 2074),
+ Box(2075, 2075),
+ Box(2076, 2076),
+ Box(2077, 2077),
+ Box(2078, 2078),
+ Box(2079, 2079),
+ Box(2080, 2080),
+ Box(2081, 2081),
+ Box(2082, 2082),
+ Box(2083, 2083),
+ Box(2084, 2084),
+ Box(2085, 2085),
+ Box(2086, 2086),
+ Box(2087, 2087),
+ Box(2088, 2088),
+ Box(2089, 2089),
+ Box(2090, 2090),
+ Box(2091, 2091),
+ Box(2092, 2092),
+ Box(2093, 2093),
+ Box(2094, 2094),
+ Box(2095, 2095),
+ Box(2096, 2096),
+ Box(2097, 2097),
+ Box(2098, 2098),
+ Box(2099, 2099),
+ Box(2100, 2100),
+ Box(2101, 2101),
+ Box(2102, 2102),
+ Box(2103, 2103),
+ Box(2104, 2104),
+ Box(2105, 2105),
+ Box(2106, 2106),
+ Box(2107, 2107),
+ Box(2108, 2108),
+ Box(2109, 2109),
+ Box(2110, 2110),
+ Box(2111, 2111),
+ Box(2112, 2112),
+ Box(2113, 2113),
+ Box(2114, 2114),
+ Box(2115, 2115),
+ Box(2116, 2116),
+ Box(2117, 2117),
+ Box(2118, 2118),
+ Box(2119, 2119),
+ Box(2120, 2120),
+ Box(2121, 2121),
+ Box(2122, 2122),
+ Box(2123, 2123),
+ Box(2124, 2124),
+ Box(2125, 2125),
+ Box(2126, 2126),
+ Box(2127, 2127),
+ Box(2128, 2128),
+ Box(2129, 2129),
+ Box(2130, 2130),
+ Box(2131, 2131),
+ Box(2132, 2132),
+ Box(2133, 2133),
+ Box(2134, 2134),
+ Box(2135, 2135),
+ Box(2136, 2136),
+ Box(2137, 2137),
+ Box(2138, 2138),
+ Box(2139, 2139),
+ Box(2140, 2140),
+ Box(2141, 2141),
+ Box(2142, 2142),
+ Box(2143, 2143),
+ Box(2144, 2144),
+ Box(2145, 2145),
+ Box(2146, 2146),
+ Box(2147, 2147),
+ Box(2148, 2148),
+ Box(2149, 2149),
+ Box(2150, 2150),
+ Box(2151, 2151),
+ Box(2152, 2152),
+ Box(2153, 2153),
+ Box(2154, 2154),
+ Box(2155, 2155),
+ Box(2156, 2156),
+ Box(2157, 2157),
+ Box(2158, 2158),
+ Box(2159, 2159),
+ Box(2160, 2160),
+ Box(2161, 2161),
+ Box(2162, 2162),
+ Box(2163, 2163),
+ Box(2164, 2164),
+ Box(2165, 2165),
+ Box(2166, 2166),
+ Box(2167, 2167),
+ Box(2168, 2168),
+ Box(2169, 2169),
+ Box(2170, 2170),
+ Box(2171, 2171),
+ Box(2172, 2172),
+ Box(2173, 2173),
+ Box(2174, 2174),
+ Box(2175, 2175),
+ Box(2176, 2176),
+ Box(2177, 2177),
+ Box(2178, 2178),
+ Box(2179, 2179),
+ Box(2180, 2180),
+ Box(2181, 2181),
+ Box(2182, 2182),
+ Box(2183, 2183),
+ Box(2184, 2184),
+ Box(2185, 2185),
+ Box(2186, 2186),
+ Box(2187, 2187),
+ Box(2188, 2188),
+ Box(2189, 2189),
+ Box(2190, 2190),
+ Box(2191, 2191),
+ Box(2192, 2192),
+ Box(2193, 2193),
+ Box(2194, 2194),
+ Box(2195, 2195),
+ Box(2196, 2196),
+ Box(2197, 2197),
+ Box(2198, 2198),
+ Box(2199, 2199),
+ Box(2200, 2200),
+ Box(2201, 2201),
+ Box(2202, 2202),
+ Box(2203, 2203),
+ Box(2204, 2204),
+ Box(2205, 2205),
+ Box(2206, 2206),
+ Box(2207, 2207),
+ Box(2208, 2208),
+ Box(2209, 2209),
+ Box(2210, 2210),
+ Box(2211, 2211),
+ Box(2212, 2212),
+ Box(2213, 2213),
+ Box(2214, 2214),
+ Box(2215, 2215),
+ Box(2216, 2216),
+ Box(2217, 2217),
+ Box(2218, 2218),
+ Box(2219, 2219),
+ Box(2220, 2220),
+ Box(2221, 2221),
+ Box(2222, 2222),
+ Box(2223, 2223),
+ Box(2224, 2224),
+ Box(2225, 2225),
+ Box(2226, 2226),
+ Box(2227, 2227),
+ Box(2228, 2228),
+ Box(2229, 2229),
+ Box(2230, 2230),
+ Box(2231, 2231),
+ Box(2232, 2232),
+ Box(2233, 2233),
+ Box(2234, 2234),
+ Box(2235, 2235),
+ Box(2236, 2236),
+ Box(2237, 2237),
+ Box(2238, 2238),
+ Box(2239, 2239),
+ Box(2240, 2240),
+ Box(2241, 2241),
+ Box(2242, 2242),
+ Box(2243, 2243),
+ Box(2244, 2244),
+ Box(2245, 2245),
+ Box(2246, 2246),
+ Box(2247, 2247),
+ Box(2248, 2248),
+ Box(2249, 2249),
+ Box(2250, 2250),
+ Box(2251, 2251),
+ Box(2252, 2252),
+ Box(2253, 2253),
+ Box(2254, 2254),
+ Box(2255, 2255),
+ Box(2256, 2256),
+ Box(2257, 2257),
+ Box(2258, 2258),
+ Box(2259, 2259),
+ Box(2260, 2260),
+ Box(2261, 2261),
+ Box(2262, 2262),
+ Box(2263, 2263),
+ Box(2264, 2264),
+ Box(2265, 2265),
+ Box(2266, 2266),
+ Box(2267, 2267),
+ Box(2268, 2268),
+ Box(2269, 2269),
+ Box(2270, 2270),
+ Box(2271, 2271),
+ Box(2272, 2272),
+ Box(2273, 2273),
+ Box(2274, 2274),
+ Box(2275, 2275),
+ Box(2276, 2276),
+ Box(2277, 2277),
+ Box(2278, 2278),
+ Box(2279, 2279),
+ Box(2280, 2280),
+ Box(2281, 2281),
+ Box(2282, 2282),
+ Box(2283, 2283),
+ Box(2284, 2284),
+ Box(2285, 2285),
+ Box(2286, 2286),
+ Box(2287, 2287),
+ Box(2288, 2288),
+ Box(2289, 2289),
+ Box(2290, 2290),
+ Box(2291, 2291),
+ Box(2292, 2292),
+ Box(2293, 2293),
+ Box(2294, 2294),
+ Box(2295, 2295),
+ Box(2296, 2296),
+ Box(2297, 2297),
+ Box(2298, 2298),
+ Box(2299, 2299),
+ Box(2300, 2300),
+ Box(2301, 2301),
+ Box(2302, 2302),
+ Box(2303, 2303),
+ Box(2304, 2304),
+ Box(2305, 2305),
+ Box(2306, 2306),
+ Box(2307, 2307),
+ Box(2308, 2308),
+ Box(2309, 2309),
+ Box(2310, 2310),
+ Box(2311, 2311),
+ Box(2312, 2312),
+ Box(2313, 2313),
+ Box(2314, 2314),
+ Box(2315, 2315),
+ Box(2316, 2316),
+ Box(2317, 2317),
+ Box(2318, 2318),
+ Box(2319, 2319),
+ Box(2320, 2320),
+ Box(2321, 2321),
+ Box(2322, 2322),
+ Box(2323, 2323),
+ Box(2324, 2324),
+ Box(2325, 2325),
+ Box(2326, 2326),
+ Box(2327, 2327),
+ Box(2328, 2328),
+ Box(2329, 2329),
+ Box(2330, 2330),
+ Box(2331, 2331),
+ Box(2332, 2332),
+ Box(2333, 2333),
+ Box(2334, 2334),
+ Box(2335, 2335),
+ Box(2336, 2336),
+ Box(2337, 2337),
+ Box(2338, 2338),
+ Box(2339, 2339),
+ Box(2340, 2340),
+ Box(2341, 2341),
+ Box(2342, 2342),
+ Box(2343, 2343),
+ Box(2344, 2344),
+ Box(2345, 2345),
+ Box(2346, 2346),
+ Box(2347, 2347),
+ Box(2348, 2348),
+ Box(2349, 2349),
+ Box(2350, 2350),
+ Box(2351, 2351),
+ Box(2352, 2352),
+ Box(2353, 2353),
+ Box(2354, 2354),
+ Box(2355, 2355),
+ Box(2356, 2356),
+ Box(2357, 2357),
+ Box(2358, 2358),
+ Box(2359, 2359),
+ Box(2360, 2360),
+ Box(2361, 2361),
+ Box(2362, 2362),
+ Box(2363, 2363),
+ Box(2364, 2364),
+ Box(2365, 2365),
+ Box(2366, 2366),
+ Box(2367, 2367),
+ Box(2368, 2368),
+ Box(2369, 2369),
+ Box(2370, 2370),
+ Box(2371, 2371),
+ Box(2372, 2372),
+ Box(2373, 2373),
+ Box(2374, 2374),
+ Box(2375, 2375),
+ Box(2376, 2376),
+ Box(2377, 2377),
+ Box(2378, 2378),
+ Box(2379, 2379),
+ Box(2380, 2380),
+ Box(2381, 2381),
+ Box(2382, 2382),
+ Box(2383, 2383),
+ Box(2384, 2384),
+ Box(2385, 2385),
+ Box(2386, 2386),
+ Box(2387, 2387),
+ Box(2388, 2388),
+ Box(2389, 2389),
+ Box(2390, 2390),
+ Box(2391, 2391),
+ Box(2392, 2392),
+ Box(2393, 2393),
+ Box(2394, 2394),
+ Box(2395, 2395),
+ Box(2396, 2396),
+ Box(2397, 2397),
+ Box(2398, 2398),
+ Box(2399, 2399),
+ Box(2400, 2400),
+ Box(2401, 2401),
+ Box(2402, 2402),
+ Box(2403, 2403),
+ Box(2404, 2404),
+ Box(2405, 2405),
+ Box(2406, 2406),
+ Box(2407, 2407),
+ Box(2408, 2408),
+ Box(2409, 2409),
+ Box(2410, 2410),
+ Box(2411, 2411),
+ Box(2412, 2412),
+ Box(2413, 2413),
+ Box(2414, 2414),
+ Box(2415, 2415),
+ Box(2416, 2416),
+ Box(2417, 2417),
+ Box(2418, 2418),
+ Box(2419, 2419),
+ Box(2420, 2420),
+ Box(2421, 2421),
+ Box(2422, 2422),
+ Box(2423, 2423),
+ Box(2424, 2424),
+ Box(2425, 2425),
+ Box(2426, 2426),
+ Box(2427, 2427),
+ Box(2428, 2428),
+ Box(2429, 2429),
+ Box(2430, 2430),
+ Box(2431, 2431),
+ Box(2432, 2432),
+ Box(2433, 2433),
+ Box(2434, 2434),
+ Box(2435, 2435),
+ Box(2436, 2436),
+ Box(2437, 2437),
+ Box(2438, 2438),
+ Box(2439, 2439),
+ Box(2440, 2440),
+ Box(2441, 2441),
+ Box(2442, 2442),
+ Box(2443, 2443),
+ Box(2444, 2444),
+ Box(2445, 2445),
+ Box(2446, 2446),
+ Box(2447, 2447),
+ Box(2448, 2448),
+ Box(2449, 2449),
+ Box(2450, 2450),
+ Box(2451, 2451),
+ Box(2452, 2452),
+ Box(2453, 2453),
+ Box(2454, 2454),
+ Box(2455, 2455),
+ Box(2456, 2456),
+ Box(2457, 2457),
+ Box(2458, 2458),
+ Box(2459, 2459),
+ Box(2460, 2460),
+ Box(2461, 2461),
+ Box(2462, 2462),
+ Box(2463, 2463),
+ Box(2464, 2464),
+ Box(2465, 2465),
+ Box(2466, 2466),
+ Box(2467, 2467),
+ Box(2468, 2468),
+ Box(2469, 2469),
+ Box(2470, 2470),
+ Box(2471, 2471),
+ Box(2472, 2472),
+ Box(2473, 2473),
+ Box(2474, 2474),
+ Box(2475, 2475),
+ Box(2476, 2476),
+ Box(2477, 2477),
+ Box(2478, 2478),
+ Box(2479, 2479),
+ Box(2480, 2480),
+ Box(2481, 2481),
+ Box(2482, 2482),
+ Box(2483, 2483),
+ Box(2484, 2484),
+ Box(2485, 2485),
+ Box(2486, 2486),
+ Box(2487, 2487),
+ Box(2488, 2488),
+ Box(2489, 2489),
+ Box(2490, 2490),
+ Box(2491, 2491),
+ Box(2492, 2492),
+ Box(2493, 2493),
+ Box(2494, 2494),
+ Box(2495, 2495),
+ Box(2496, 2496),
+ Box(2497, 2497),
+ Box(2498, 2498),
+ Box(2499, 2499),
+ Box(2500, 2500),
+ Box(2501, 2501),
+ Box(2502, 2502),
+ Box(2503, 2503),
+ Box(2504, 2504),
+ Box(2505, 2505),
+ Box(2506, 2506),
+ Box(2507, 2507),
+ Box(2508, 2508),
+ Box(2509, 2509),
+ Box(2510, 2510),
+ Box(2511, 2511),
+ Box(2512, 2512),
+ Box(2513, 2513),
+ Box(2514, 2514),
+ Box(2515, 2515),
+ Box(2516, 2516),
+ Box(2517, 2517),
+ Box(2518, 2518),
+ Box(2519, 2519),
+ Box(2520, 2520),
+ Box(2521, 2521),
+ Box(2522, 2522),
+ Box(2523, 2523),
+ Box(2524, 2524),
+ Box(2525, 2525),
+ Box(2526, 2526),
+ Box(2527, 2527),
+ Box(2528, 2528),
+ Box(2529, 2529),
+ Box(2530, 2530),
+ Box(2531, 2531),
+ Box(2532, 2532),
+ Box(2533, 2533),
+ Box(2534, 2534),
+ Box(2535, 2535),
+ Box(2536, 2536),
+ Box(2537, 2537),
+ Box(2538, 2538),
+ Box(2539, 2539),
+ Box(2540, 2540),
+ Box(2541, 2541),
+ Box(2542, 2542),
+ Box(2543, 2543),
+ Box(2544, 2544),
+ Box(2545, 2545),
+ Box(2546, 2546),
+ Box(2547, 2547),
+ Box(2548, 2548),
+ Box(2549, 2549),
+ Box(2550, 2550),
+ Box(2551, 2551),
+ Box(2552, 2552),
+ Box(2553, 2553),
+ Box(2554, 2554),
+ Box(2555, 2555),
+ Box(2556, 2556),
+ Box(2557, 2557),
+ Box(2558, 2558),
+ Box(2559, 2559),
+ Box(2560, 2560),
+ Box(2561, 2561),
+ Box(2562, 2562),
+ Box(2563, 2563),
+ Box(2564, 2564),
+ Box(2565, 2565),
+ Box(2566, 2566),
+ Box(2567, 2567),
+ Box(2568, 2568),
+ Box(2569, 2569),
+ Box(2570, 2570),
+ Box(2571, 2571),
+ Box(2572, 2572),
+ Box(2573, 2573),
+ Box(2574, 2574),
+ Box(2575, 2575),
+ Box(2576, 2576),
+ Box(2577, 2577),
+ Box(2578, 2578),
+ Box(2579, 2579),
+ Box(2580, 2580),
+ Box(2581, 2581),
+ Box(2582, 2582),
+ Box(2583, 2583),
+ Box(2584, 2584),
+ Box(2585, 2585),
+ Box(2586, 2586),
+ Box(2587, 2587),
+ Box(2588, 2588),
+ Box(2589, 2589),
+ Box(2590, 2590),
+ Box(2591, 2591),
+ Box(2592, 2592),
+ Box(2593, 2593),
+ Box(2594, 2594),
+ Box(2595, 2595),
+ Box(2596, 2596),
+ Box(2597, 2597),
+ Box(2598, 2598),
+ Box(2599, 2599),
+ Box(2600, 2600),
+ Box(2601, 2601),
+ Box(2602, 2602),
+ Box(2603, 2603),
+ Box(2604, 2604),
+ Box(2605, 2605),
+ Box(2606, 2606),
+ Box(2607, 2607),
+ Box(2608, 2608),
+ Box(2609, 2609),
+ Box(2610, 2610),
+ Box(2611, 2611),
+ Box(2612, 2612),
+ Box(2613, 2613),
+ Box(2614, 2614),
+ Box(2615, 2615),
+ Box(2616, 2616),
+ Box(2617, 2617),
+ Box(2618, 2618),
+ Box(2619, 2619),
+ Box(2620, 2620),
+ Box(2621, 2621),
+ Box(2622, 2622),
+ Box(2623, 2623),
+ Box(2624, 2624),
+ Box(2625, 2625),
+ Box(2626, 2626),
+ Box(2627, 2627),
+ Box(2628, 2628),
+ Box(2629, 2629),
+ Box(2630, 2630),
+ Box(2631, 2631),
+ Box(2632, 2632),
+ Box(2633, 2633),
+ Box(2634, 2634),
+ Box(2635, 2635),
+ Box(2636, 2636),
+ Box(2637, 2637),
+ Box(2638, 2638),
+ Box(2639, 2639),
+ Box(2640, 2640),
+ Box(2641, 2641),
+ Box(2642, 2642),
+ Box(2643, 2643),
+ Box(2644, 2644),
+ Box(2645, 2645),
+ Box(2646, 2646),
+ Box(2647, 2647),
+ Box(2648, 2648),
+ Box(2649, 2649),
+ Box(2650, 2650),
+ Box(2651, 2651),
+ Box(2652, 2652),
+ Box(2653, 2653),
+ Box(2654, 2654),
+ Box(2655, 2655),
+ Box(2656, 2656),
+ Box(2657, 2657),
+ Box(2658, 2658),
+ Box(2659, 2659),
+ Box(2660, 2660),
+ Box(2661, 2661),
+ Box(2662, 2662),
+ Box(2663, 2663),
+ Box(2664, 2664),
+ Box(2665, 2665),
+ Box(2666, 2666),
+ Box(2667, 2667),
+ Box(2668, 2668),
+ Box(2669, 2669),
+ Box(2670, 2670),
+ Box(2671, 2671),
+ Box(2672, 2672),
+ Box(2673, 2673),
+ Box(2674, 2674),
+ Box(2675, 2675),
+ Box(2676, 2676),
+ Box(2677, 2677),
+ Box(2678, 2678),
+ Box(2679, 2679),
+ Box(2680, 2680),
+ Box(2681, 2681),
+ Box(2682, 2682),
+ Box(2683, 2683),
+ Box(2684, 2684),
+ Box(2685, 2685),
+ Box(2686, 2686),
+ Box(2687, 2687),
+ Box(2688, 2688),
+ Box(2689, 2689),
+ Box(2690, 2690),
+ Box(2691, 2691),
+ Box(2692, 2692),
+ Box(2693, 2693),
+ Box(2694, 2694),
+ Box(2695, 2695),
+ Box(2696, 2696),
+ Box(2697, 2697),
+ Box(2698, 2698),
+ Box(2699, 2699),
+ Box(2700, 2700),
+ Box(2701, 2701),
+ Box(2702, 2702),
+ Box(2703, 2703),
+ Box(2704, 2704),
+ Box(2705, 2705),
+ Box(2706, 2706),
+ Box(2707, 2707),
+ Box(2708, 2708),
+ Box(2709, 2709),
+ Box(2710, 2710),
+ Box(2711, 2711),
+ Box(2712, 2712),
+ Box(2713, 2713),
+ Box(2714, 2714),
+ Box(2715, 2715),
+ Box(2716, 2716),
+ Box(2717, 2717),
+ Box(2718, 2718),
+ Box(2719, 2719),
+ Box(2720, 2720),
+ Box(2721, 2721),
+ Box(2722, 2722),
+ Box(2723, 2723),
+ Box(2724, 2724),
+ Box(2725, 2725),
+ Box(2726, 2726),
+ Box(2727, 2727),
+ Box(2728, 2728),
+ Box(2729, 2729),
+ Box(2730, 2730),
+ Box(2731, 2731),
+ Box(2732, 2732),
+ Box(2733, 2733),
+ Box(2734, 2734),
+ Box(2735, 2735),
+ Box(2736, 2736),
+ Box(2737, 2737),
+ Box(2738, 2738),
+ Box(2739, 2739),
+ Box(2740, 2740),
+ Box(2741, 2741),
+ Box(2742, 2742),
+ Box(2743, 2743),
+ Box(2744, 2744),
+ Box(2745, 2745),
+ Box(2746, 2746),
+ Box(2747, 2747),
+ Box(2748, 2748),
+ Box(2749, 2749),
+ Box(2750, 2750),
+ Box(2751, 2751),
+ Box(2752, 2752),
+ Box(2753, 2753),
+ Box(2754, 2754),
+ Box(2755, 2755),
+ Box(2756, 2756),
+ Box(2757, 2757),
+ Box(2758, 2758),
+ Box(2759, 2759),
+ Box(2760, 2760),
+ Box(2761, 2761),
+ Box(2762, 2762),
+ Box(2763, 2763),
+ Box(2764, 2764),
+ Box(2765, 2765),
+ Box(2766, 2766),
+ Box(2767, 2767),
+ Box(2768, 2768),
+ Box(2769, 2769),
+ Box(2770, 2770),
+ Box(2771, 2771),
+ Box(2772, 2772),
+ Box(2773, 2773),
+ Box(2774, 2774),
+ Box(2775, 2775),
+ Box(2776, 2776),
+ Box(2777, 2777),
+ Box(2778, 2778),
+ Box(2779, 2779),
+ Box(2780, 2780),
+ Box(2781, 2781),
+ Box(2782, 2782),
+ Box(2783, 2783),
+ Box(2784, 2784),
+ Box(2785, 2785),
+ Box(2786, 2786),
+ Box(2787, 2787),
+ Box(2788, 2788),
+ Box(2789, 2789),
+ Box(2790, 2790),
+ Box(2791, 2791),
+ Box(2792, 2792),
+ Box(2793, 2793),
+ Box(2794, 2794),
+ Box(2795, 2795),
+ Box(2796, 2796),
+ Box(2797, 2797),
+ Box(2798, 2798),
+ Box(2799, 2799),
+ Box(2800, 2800),
+ Box(2801, 2801),
+ Box(2802, 2802),
+ Box(2803, 2803),
+ Box(2804, 2804),
+ Box(2805, 2805),
+ Box(2806, 2806),
+ Box(2807, 2807),
+ Box(2808, 2808),
+ Box(2809, 2809),
+ Box(2810, 2810),
+ Box(2811, 2811),
+ Box(2812, 2812),
+ Box(2813, 2813),
+ Box(2814, 2814),
+ Box(2815, 2815),
+ Box(2816, 2816),
+ Box(2817, 2817),
+ Box(2818, 2818),
+ Box(2819, 2819),
+ Box(2820, 2820),
+ Box(2821, 2821),
+ Box(2822, 2822),
+ Box(2823, 2823),
+ Box(2824, 2824),
+ Box(2825, 2825),
+ Box(2826, 2826),
+ Box(2827, 2827),
+ Box(2828, 2828),
+ Box(2829, 2829),
+ Box(2830, 2830),
+ Box(2831, 2831),
+ Box(2832, 2832),
+ Box(2833, 2833),
+ Box(2834, 2834),
+ Box(2835, 2835),
+ Box(2836, 2836),
+ Box(2837, 2837),
+ Box(2838, 2838),
+ Box(2839, 2839),
+ Box(2840, 2840),
+ Box(2841, 2841),
+ Box(2842, 2842),
+ Box(2843, 2843),
+ Box(2844, 2844),
+ Box(2845, 2845),
+ Box(2846, 2846),
+ Box(2847, 2847),
+ Box(2848, 2848),
+ Box(2849, 2849),
+ Box(2850, 2850),
+ Box(2851, 2851),
+ Box(2852, 2852),
+ Box(2853, 2853),
+ Box(2854, 2854),
+ Box(2855, 2855),
+ Box(2856, 2856),
+ Box(2857, 2857),
+ Box(2858, 2858),
+ Box(2859, 2859),
+ Box(2860, 2860),
+ Box(2861, 2861),
+ Box(2862, 2862),
+ Box(2863, 2863),
+ Box(2864, 2864),
+ Box(2865, 2865),
+ Box(2866, 2866),
+ Box(2867, 2867),
+ Box(2868, 2868),
+ Box(2869, 2869),
+ Box(2870, 2870),
+ Box(2871, 2871),
+ Box(2872, 2872),
+ Box(2873, 2873),
+ Box(2874, 2874),
+ Box(2875, 2875),
+ Box(2876, 2876),
+ Box(2877, 2877),
+ Box(2878, 2878),
+ Box(2879, 2879),
+ Box(2880, 2880),
+ Box(2881, 2881),
+ Box(2882, 2882),
+ Box(2883, 2883),
+ Box(2884, 2884),
+ Box(2885, 2885),
+ Box(2886, 2886),
+ Box(2887, 2887),
+ Box(2888, 2888),
+ Box(2889, 2889),
+ Box(2890, 2890),
+ Box(2891, 2891),
+ Box(2892, 2892),
+ Box(2893, 2893),
+ Box(2894, 2894),
+ Box(2895, 2895),
+ Box(2896, 2896),
+ Box(2897, 2897),
+ Box(2898, 2898),
+ Box(2899, 2899),
+ Box(2900, 2900),
+ Box(2901, 2901),
+ Box(2902, 2902),
+ Box(2903, 2903),
+ Box(2904, 2904),
+ Box(2905, 2905),
+ Box(2906, 2906),
+ Box(2907, 2907),
+ Box(2908, 2908),
+ Box(2909, 2909),
+ Box(2910, 2910),
+ Box(2911, 2911),
+ Box(2912, 2912),
+ Box(2913, 2913),
+ Box(2914, 2914),
+ Box(2915, 2915),
+ Box(2916, 2916),
+ Box(2917, 2917),
+ Box(2918, 2918),
+ Box(2919, 2919),
+ Box(2920, 2920),
+ Box(2921, 2921),
+ Box(2922, 2922),
+ Box(2923, 2923),
+ Box(2924, 2924),
+ Box(2925, 2925),
+ Box(2926, 2926),
+ Box(2927, 2927),
+ Box(2928, 2928),
+ Box(2929, 2929),
+ Box(2930, 2930),
+ Box(2931, 2931),
+ Box(2932, 2932),
+ Box(2933, 2933),
+ Box(2934, 2934),
+ Box(2935, 2935),
+ Box(2936, 2936),
+ Box(2937, 2937),
+ Box(2938, 2938),
+ Box(2939, 2939),
+ Box(2940, 2940),
+ Box(2941, 2941),
+ Box(2942, 2942),
+ Box(2943, 2943),
+ Box(2944, 2944),
+ Box(2945, 2945),
+ Box(2946, 2946),
+ Box(2947, 2947),
+ Box(2948, 2948),
+ Box(2949, 2949),
+ Box(2950, 2950),
+ Box(2951, 2951),
+ Box(2952, 2952),
+ Box(2953, 2953),
+ Box(2954, 2954),
+ Box(2955, 2955),
+ Box(2956, 2956),
+ Box(2957, 2957),
+ Box(2958, 2958),
+ Box(2959, 2959),
+ Box(2960, 2960),
+ Box(2961, 2961),
+ Box(2962, 2962),
+ Box(2963, 2963),
+ Box(2964, 2964),
+ Box(2965, 2965),
+ Box(2966, 2966),
+ Box(2967, 2967),
+ Box(2968, 2968),
+ Box(2969, 2969),
+ Box(2970, 2970),
+ Box(2971, 2971),
+ Box(2972, 2972),
+ Box(2973, 2973),
+ Box(2974, 2974),
+ Box(2975, 2975),
+ Box(2976, 2976),
+ Box(2977, 2977),
+ Box(2978, 2978),
+ Box(2979, 2979),
+ Box(2980, 2980),
+ Box(2981, 2981),
+ Box(2982, 2982),
+ Box(2983, 2983),
+ Box(2984, 2984),
+ Box(2985, 2985),
+ Box(2986, 2986),
+ Box(2987, 2987),
+ Box(2988, 2988),
+ Box(2989, 2989),
+ Box(2990, 2990),
+ Box(2991, 2991),
+ Box(2992, 2992),
+ Box(2993, 2993),
+ Box(2994, 2994),
+ Box(2995, 2995),
+ Box(2996, 2996),
+ Box(2997, 2997),
+ Box(2998, 2998),
+ Box(2999, 2999),
+ Box(3000, 3000),
+ Box(3001, 3001),
+ Box(3002, 3002),
+ Box(3003, 3003),
+ Box(3004, 3004),
+ Box(3005, 3005),
+ Box(3006, 3006),
+ Box(3007, 3007),
+ Box(3008, 3008),
+ Box(3009, 3009),
+ Box(3010, 3010),
+ Box(3011, 3011),
+ Box(3012, 3012),
+ Box(3013, 3013),
+ Box(3014, 3014),
+ Box(3015, 3015),
+ Box(3016, 3016),
+ Box(3017, 3017),
+ Box(3018, 3018),
+ Box(3019, 3019),
+ Box(3020, 3020),
+ Box(3021, 3021),
+ Box(3022, 3022),
+ Box(3023, 3023),
+ Box(3024, 3024),
+ Box(3025, 3025),
+ Box(3026, 3026),
+ Box(3027, 3027),
+ Box(3028, 3028),
+ Box(3029, 3029),
+ Box(3030, 3030),
+ Box(3031, 3031),
+ Box(3032, 3032),
+ Box(3033, 3033),
+ Box(3034, 3034),
+ Box(3035, 3035),
+ Box(3036, 3036),
+ Box(3037, 3037),
+ Box(3038, 3038),
+ Box(3039, 3039),
+ Box(3040, 3040),
+ Box(3041, 3041),
+ Box(3042, 3042),
+ Box(3043, 3043),
+ Box(3044, 3044),
+ Box(3045, 3045),
+ Box(3046, 3046),
+ Box(3047, 3047),
+ Box(3048, 3048),
+ Box(3049, 3049),
+ Box(3050, 3050),
+ Box(3051, 3051),
+ Box(3052, 3052),
+ Box(3053, 3053),
+ Box(3054, 3054),
+ Box(3055, 3055),
+ Box(3056, 3056),
+ Box(3057, 3057),
+ Box(3058, 3058),
+ Box(3059, 3059),
+ Box(3060, 3060),
+ Box(3061, 3061),
+ Box(3062, 3062),
+ Box(3063, 3063),
+ Box(3064, 3064),
+ Box(3065, 3065),
+ Box(3066, 3066),
+ Box(3067, 3067),
+ Box(3068, 3068),
+ Box(3069, 3069),
+ Box(3070, 3070),
+ Box(3071, 3071),
+ Box(3072, 3072),
+ Box(3073, 3073),
+ Box(3074, 3074),
+ Box(3075, 3075),
+ Box(3076, 3076),
+ Box(3077, 3077),
+ Box(3078, 3078),
+ Box(3079, 3079),
+ Box(3080, 3080),
+ Box(3081, 3081),
+ Box(3082, 3082),
+ Box(3083, 3083),
+ Box(3084, 3084),
+ Box(3085, 3085),
+ Box(3086, 3086),
+ Box(3087, 3087),
+ Box(3088, 3088),
+ Box(3089, 3089),
+ Box(3090, 3090),
+ Box(3091, 3091),
+ Box(3092, 3092),
+ Box(3093, 3093),
+ Box(3094, 3094),
+ Box(3095, 3095),
+ Box(3096, 3096),
+ Box(3097, 3097),
+ Box(3098, 3098),
+ Box(3099, 3099),
+ Box(3100, 3100),
+ Box(3101, 3101),
+ Box(3102, 3102),
+ Box(3103, 3103),
+ Box(3104, 3104),
+ Box(3105, 3105),
+ Box(3106, 3106),
+ Box(3107, 3107),
+ Box(3108, 3108),
+ Box(3109, 3109),
+ Box(3110, 3110),
+ Box(3111, 3111),
+ Box(3112, 3112),
+ Box(3113, 3113),
+ Box(3114, 3114),
+ Box(3115, 3115),
+ Box(3116, 3116),
+ Box(3117, 3117),
+ Box(3118, 3118),
+ Box(3119, 3119),
+ Box(3120, 3120),
+ Box(3121, 3121),
+ Box(3122, 3122),
+ Box(3123, 3123),
+ Box(3124, 3124),
+ Box(3125, 3125),
+ Box(3126, 3126),
+ Box(3127, 3127),
+ Box(3128, 3128),
+ Box(3129, 3129),
+ Box(3130, 3130),
+ Box(3131, 3131),
+ Box(3132, 3132),
+ Box(3133, 3133),
+ Box(3134, 3134),
+ Box(3135, 3135),
+ Box(3136, 3136),
+ Box(3137, 3137),
+ Box(3138, 3138),
+ Box(3139, 3139),
+ Box(3140, 3140),
+ Box(3141, 3141),
+ Box(3142, 3142),
+ Box(3143, 3143),
+ Box(3144, 3144),
+ Box(3145, 3145),
+ Box(3146, 3146),
+ Box(3147, 3147),
+ Box(3148, 3148),
+ Box(3149, 3149),
+ Box(3150, 3150),
+ Box(3151, 3151),
+ Box(3152, 3152),
+ Box(3153, 3153),
+ Box(3154, 3154),
+ Box(3155, 3155),
+ Box(3156, 3156),
+ Box(3157, 3157),
+ Box(3158, 3158),
+ Box(3159, 3159),
+ Box(3160, 3160),
+ Box(3161, 3161),
+ Box(3162, 3162),
+ Box(3163, 3163),
+ Box(3164, 3164),
+ Box(3165, 3165),
+ Box(3166, 3166),
+ Box(3167, 3167),
+ Box(3168, 3168),
+ Box(3169, 3169),
+ Box(3170, 3170),
+ Box(3171, 3171),
+ Box(3172, 3172),
+ Box(3173, 3173),
+ Box(3174, 3174),
+ Box(3175, 3175),
+ Box(3176, 3176),
+ Box(3177, 3177),
+ Box(3178, 3178),
+ Box(3179, 3179),
+ Box(3180, 3180),
+ Box(3181, 3181),
+ Box(3182, 3182),
+ Box(3183, 3183),
+ Box(3184, 3184),
+ Box(3185, 3185),
+ Box(3186, 3186),
+ Box(3187, 3187),
+ Box(3188, 3188),
+ Box(3189, 3189),
+ Box(3190, 3190),
+ Box(3191, 3191),
+ Box(3192, 3192),
+ Box(3193, 3193),
+ Box(3194, 3194),
+ Box(3195, 3195),
+ Box(3196, 3196),
+ Box(3197, 3197),
+ Box(3198, 3198),
+ Box(3199, 3199),
+ Box(3200, 3200),
+ Box(3201, 3201),
+ Box(3202, 3202),
+ Box(3203, 3203),
+ Box(3204, 3204),
+ Box(3205, 3205),
+ Box(3206, 3206),
+ Box(3207, 3207),
+ Box(3208, 3208),
+ Box(3209, 3209),
+ Box(3210, 3210),
+ Box(3211, 3211),
+ Box(3212, 3212),
+ Box(3213, 3213),
+ Box(3214, 3214),
+ Box(3215, 3215),
+ Box(3216, 3216),
+ Box(3217, 3217),
+ Box(3218, 3218),
+ Box(3219, 3219),
+ Box(3220, 3220),
+ Box(3221, 3221),
+ Box(3222, 3222),
+ Box(3223, 3223),
+ Box(3224, 3224),
+ Box(3225, 3225),
+ Box(3226, 3226),
+ Box(3227, 3227),
+ Box(3228, 3228),
+ Box(3229, 3229),
+ Box(3230, 3230),
+ Box(3231, 3231),
+ Box(3232, 3232),
+ Box(3233, 3233),
+ Box(3234, 3234),
+ Box(3235, 3235),
+ Box(3236, 3236),
+ Box(3237, 3237),
+ Box(3238, 3238),
+ Box(3239, 3239),
+ Box(3240, 3240),
+ Box(3241, 3241),
+ Box(3242, 3242),
+ Box(3243, 3243),
+ Box(3244, 3244),
+ Box(3245, 3245),
+ Box(3246, 3246),
+ Box(3247, 3247),
+ Box(3248, 3248),
+ Box(3249, 3249),
+ Box(3250, 3250),
+ Box(3251, 3251),
+ Box(3252, 3252),
+ Box(3253, 3253),
+ Box(3254, 3254),
+ Box(3255, 3255),
+ Box(3256, 3256),
+ Box(3257, 3257),
+ Box(3258, 3258),
+ Box(3259, 3259),
+ Box(3260, 3260),
+ Box(3261, 3261),
+ Box(3262, 3262),
+ Box(3263, 3263),
+ Box(3264, 3264),
+ Box(3265, 3265),
+ Box(3266, 3266),
+ Box(3267, 3267),
+ Box(3268, 3268),
+ Box(3269, 3269),
+ Box(3270, 3270),
+ Box(3271, 3271),
+ Box(3272, 3272),
+ Box(3273, 3273),
+ Box(3274, 3274),
+ Box(3275, 3275),
+ Box(3276, 3276),
+ Box(3277, 3277),
+ Box(3278, 3278),
+ Box(3279, 3279),
+ Box(3280, 3280),
+ Box(3281, 3281),
+ Box(3282, 3282),
+ Box(3283, 3283),
+ Box(3284, 3284),
+ Box(3285, 3285),
+ Box(3286, 3286),
+ Box(3287, 3287),
+ Box(3288, 3288),
+ Box(3289, 3289),
+ Box(3290, 3290),
+ Box(3291, 3291),
+ Box(3292, 3292),
+ Box(3293, 3293),
+ Box(3294, 3294),
+ Box(3295, 3295),
+ Box(3296, 3296),
+ Box(3297, 3297),
+ Box(3298, 3298),
+ Box(3299, 3299),
+ Box(3300, 3300),
+ Box(3301, 3301),
+ Box(3302, 3302),
+ Box(3303, 3303),
+ Box(3304, 3304),
+ Box(3305, 3305),
+ Box(3306, 3306),
+ Box(3307, 3307),
+ Box(3308, 3308),
+ Box(3309, 3309),
+ Box(3310, 3310),
+ Box(3311, 3311),
+ Box(3312, 3312),
+ Box(3313, 3313),
+ Box(3314, 3314),
+ Box(3315, 3315),
+ Box(3316, 3316),
+ Box(3317, 3317),
+ Box(3318, 3318),
+ Box(3319, 3319),
+ Box(3320, 3320),
+ Box(3321, 3321),
+ Box(3322, 3322),
+ Box(3323, 3323),
+ Box(3324, 3324),
+ Box(3325, 3325),
+ Box(3326, 3326),
+ Box(3327, 3327),
+ Box(3328, 3328),
+ Box(3329, 3329),
+ Box(3330, 3330),
+ Box(3331, 3331),
+ Box(3332, 3332),
+ Box(3333, 3333),
+ Box(3334, 3334),
+ Box(3335, 3335),
+ Box(3336, 3336),
+ Box(3337, 3337),
+ Box(3338, 3338),
+ Box(3339, 3339),
+ Box(3340, 3340),
+ Box(3341, 3341),
+ Box(3342, 3342),
+ Box(3343, 3343),
+ Box(3344, 3344),
+ Box(3345, 3345),
+ Box(3346, 3346),
+ Box(3347, 3347),
+ Box(3348, 3348),
+ Box(3349, 3349),
+ Box(3350, 3350),
+ Box(3351, 3351),
+ Box(3352, 3352),
+ Box(3353, 3353),
+ Box(3354, 3354),
+ Box(3355, 3355),
+ Box(3356, 3356),
+ Box(3357, 3357),
+ Box(3358, 3358),
+ Box(3359, 3359),
+ Box(3360, 3360),
+ Box(3361, 3361),
+ Box(3362, 3362),
+ Box(3363, 3363),
+ Box(3364, 3364),
+ Box(3365, 3365),
+ Box(3366, 3366),
+ Box(3367, 3367),
+ Box(3368, 3368),
+ Box(3369, 3369),
+ Box(3370, 3370),
+ Box(3371, 3371),
+ Box(3372, 3372),
+ Box(3373, 3373),
+ Box(3374, 3374),
+ Box(3375, 3375),
+ Box(3376, 3376),
+ Box(3377, 3377),
+ Box(3378, 3378),
+ Box(3379, 3379),
+ Box(3380, 3380),
+ Box(3381, 3381),
+ Box(3382, 3382),
+ Box(3383, 3383),
+ Box(3384, 3384),
+ Box(3385, 3385),
+ Box(3386, 3386),
+ Box(3387, 3387),
+ Box(3388, 3388),
+ Box(3389, 3389),
+ Box(3390, 3390),
+ Box(3391, 3391),
+ Box(3392, 3392),
+ Box(3393, 3393),
+ Box(3394, 3394),
+ Box(3395, 3395),
+ Box(3396, 3396),
+ Box(3397, 3397),
+ Box(3398, 3398),
+ Box(3399, 3399),
+ Box(3400, 3400),
+ Box(3401, 3401),
+ Box(3402, 3402),
+ Box(3403, 3403),
+ Box(3404, 3404),
+ Box(3405, 3405),
+ Box(3406, 3406),
+ Box(3407, 3407),
+ Box(3408, 3408),
+ Box(3409, 3409),
+ Box(3410, 3410),
+ Box(3411, 3411),
+ Box(3412, 3412),
+ Box(3413, 3413),
+ Box(3414, 3414),
+ Box(3415, 3415),
+ Box(3416, 3416),
+ Box(3417, 3417),
+ Box(3418, 3418),
+ Box(3419, 3419),
+ Box(3420, 3420),
+ Box(3421, 3421),
+ Box(3422, 3422),
+ Box(3423, 3423),
+ Box(3424, 3424),
+ Box(3425, 3425),
+ Box(3426, 3426),
+ Box(3427, 3427),
+ Box(3428, 3428),
+ Box(3429, 3429),
+ Box(3430, 3430),
+ Box(3431, 3431),
+ Box(3432, 3432),
+ Box(3433, 3433),
+ Box(3434, 3434),
+ Box(3435, 3435),
+ Box(3436, 3436),
+ Box(3437, 3437),
+ Box(3438, 3438),
+ Box(3439, 3439),
+ Box(3440, 3440),
+ Box(3441, 3441),
+ Box(3442, 3442),
+ Box(3443, 3443),
+ Box(3444, 3444),
+ Box(3445, 3445),
+ Box(3446, 3446),
+ Box(3447, 3447),
+ Box(3448, 3448),
+ Box(3449, 3449),
+ Box(3450, 3450),
+ Box(3451, 3451),
+ Box(3452, 3452),
+ Box(3453, 3453),
+ Box(3454, 3454),
+ Box(3455, 3455),
+ Box(3456, 3456),
+ Box(3457, 3457),
+ Box(3458, 3458),
+ Box(3459, 3459),
+ Box(3460, 3460),
+ Box(3461, 3461),
+ Box(3462, 3462),
+ Box(3463, 3463),
+ Box(3464, 3464),
+ Box(3465, 3465),
+ Box(3466, 3466),
+ Box(3467, 3467),
+ Box(3468, 3468),
+ Box(3469, 3469),
+ Box(3470, 3470),
+ Box(3471, 3471),
+ Box(3472, 3472),
+ Box(3473, 3473),
+ Box(3474, 3474),
+ Box(3475, 3475),
+ Box(3476, 3476),
+ Box(3477, 3477),
+ Box(3478, 3478),
+ Box(3479, 3479),
+ Box(3480, 3480),
+ Box(3481, 3481),
+ Box(3482, 3482),
+ Box(3483, 3483),
+ Box(3484, 3484),
+ Box(3485, 3485),
+ Box(3486, 3486),
+ Box(3487, 3487),
+ Box(3488, 3488),
+ Box(3489, 3489),
+ Box(3490, 3490),
+ Box(3491, 3491),
+ Box(3492, 3492),
+ Box(3493, 3493),
+ Box(3494, 3494),
+ Box(3495, 3495),
+ Box(3496, 3496),
+ Box(3497, 3497),
+ Box(3498, 3498),
+ Box(3499, 3499),
+ Box(3500, 3500),
+ Box(3501, 3501),
+ Box(3502, 3502),
+ Box(3503, 3503),
+ Box(3504, 3504),
+ Box(3505, 3505),
+ Box(3506, 3506),
+ Box(3507, 3507),
+ Box(3508, 3508),
+ Box(3509, 3509),
+ Box(3510, 3510),
+ Box(3511, 3511),
+ Box(3512, 3512),
+ Box(3513, 3513),
+ Box(3514, 3514),
+ Box(3515, 3515),
+ Box(3516, 3516),
+ Box(3517, 3517),
+ Box(3518, 3518),
+ Box(3519, 3519),
+ Box(3520, 3520),
+ Box(3521, 3521),
+ Box(3522, 3522),
+ Box(3523, 3523),
+ Box(3524, 3524),
+ Box(3525, 3525),
+ Box(3526, 3526),
+ Box(3527, 3527),
+ Box(3528, 3528),
+ Box(3529, 3529),
+ Box(3530, 3530),
+ Box(3531, 3531),
+ Box(3532, 3532),
+ Box(3533, 3533),
+ Box(3534, 3534),
+ Box(3535, 3535),
+ Box(3536, 3536),
+ Box(3537, 3537),
+ Box(3538, 3538),
+ Box(3539, 3539),
+ Box(3540, 3540),
+ Box(3541, 3541),
+ Box(3542, 3542),
+ Box(3543, 3543),
+ Box(3544, 3544),
+ Box(3545, 3545),
+ Box(3546, 3546),
+ Box(3547, 3547),
+ Box(3548, 3548),
+ Box(3549, 3549),
+ Box(3550, 3550),
+ Box(3551, 3551),
+ Box(3552, 3552),
+ Box(3553, 3553),
+ Box(3554, 3554),
+ Box(3555, 3555),
+ Box(3556, 3556),
+ Box(3557, 3557),
+ Box(3558, 3558),
+ Box(3559, 3559),
+ Box(3560, 3560),
+ Box(3561, 3561),
+ Box(3562, 3562),
+ Box(3563, 3563),
+ Box(3564, 3564),
+ Box(3565, 3565),
+ Box(3566, 3566),
+ Box(3567, 3567),
+ Box(3568, 3568),
+ Box(3569, 3569),
+ Box(3570, 3570),
+ Box(3571, 3571),
+ Box(3572, 3572),
+ Box(3573, 3573),
+ Box(3574, 3574),
+ Box(3575, 3575),
+ Box(3576, 3576),
+ Box(3577, 3577),
+ Box(3578, 3578),
+ Box(3579, 3579),
+ Box(3580, 3580),
+ Box(3581, 3581),
+ Box(3582, 3582),
+ Box(3583, 3583),
+ Box(3584, 3584),
+ Box(3585, 3585),
+ Box(3586, 3586),
+ Box(3587, 3587),
+ Box(3588, 3588),
+ Box(3589, 3589),
+ Box(3590, 3590),
+ Box(3591, 3591),
+ Box(3592, 3592),
+ Box(3593, 3593),
+ Box(3594, 3594),
+ Box(3595, 3595),
+ Box(3596, 3596),
+ Box(3597, 3597),
+ Box(3598, 3598),
+ Box(3599, 3599),
+ Box(3600, 3600),
+ Box(3601, 3601),
+ Box(3602, 3602),
+ Box(3603, 3603),
+ Box(3604, 3604),
+ Box(3605, 3605),
+ Box(3606, 3606),
+ Box(3607, 3607),
+ Box(3608, 3608),
+ Box(3609, 3609),
+ Box(3610, 3610),
+ Box(3611, 3611),
+ Box(3612, 3612),
+ Box(3613, 3613),
+ Box(3614, 3614),
+ Box(3615, 3615),
+ Box(3616, 3616),
+ Box(3617, 3617),
+ Box(3618, 3618),
+ Box(3619, 3619),
+ Box(3620, 3620),
+ Box(3621, 3621),
+ Box(3622, 3622),
+ Box(3623, 3623),
+ Box(3624, 3624),
+ Box(3625, 3625),
+ Box(3626, 3626),
+ Box(3627, 3627),
+ Box(3628, 3628),
+ Box(3629, 3629),
+ Box(3630, 3630),
+ Box(3631, 3631),
+ Box(3632, 3632),
+ Box(3633, 3633),
+ Box(3634, 3634),
+ Box(3635, 3635),
+ Box(3636, 3636),
+ Box(3637, 3637),
+ Box(3638, 3638),
+ Box(3639, 3639),
+ Box(3640, 3640),
+ Box(3641, 3641),
+ Box(3642, 3642),
+ Box(3643, 3643),
+ Box(3644, 3644),
+ Box(3645, 3645),
+ Box(3646, 3646),
+ Box(3647, 3647),
+ Box(3648, 3648),
+ Box(3649, 3649),
+ Box(3650, 3650),
+ Box(3651, 3651),
+ Box(3652, 3652),
+ Box(3653, 3653),
+ Box(3654, 3654),
+ Box(3655, 3655),
+ Box(3656, 3656),
+ Box(3657, 3657),
+ Box(3658, 3658),
+ Box(3659, 3659),
+ Box(3660, 3660),
+ Box(3661, 3661),
+ Box(3662, 3662),
+ Box(3663, 3663),
+ Box(3664, 3664),
+ Box(3665, 3665),
+ Box(3666, 3666),
+ Box(3667, 3667),
+ Box(3668, 3668),
+ Box(3669, 3669),
+ Box(3670, 3670),
+ Box(3671, 3671),
+ Box(3672, 3672),
+ Box(3673, 3673),
+ Box(3674, 3674),
+ Box(3675, 3675),
+ Box(3676, 3676),
+ Box(3677, 3677),
+ Box(3678, 3678),
+ Box(3679, 3679),
+ Box(3680, 3680),
+ Box(3681, 3681),
+ Box(3682, 3682),
+ Box(3683, 3683),
+ Box(3684, 3684),
+ Box(3685, 3685),
+ Box(3686, 3686),
+ Box(3687, 3687),
+ Box(3688, 3688),
+ Box(3689, 3689),
+ Box(3690, 3690),
+ Box(3691, 3691),
+ Box(3692, 3692),
+ Box(3693, 3693),
+ Box(3694, 3694),
+ Box(3695, 3695),
+ Box(3696, 3696),
+ Box(3697, 3697),
+ Box(3698, 3698),
+ Box(3699, 3699),
+ Box(3700, 3700),
+ Box(3701, 3701),
+ Box(3702, 3702),
+ Box(3703, 3703),
+ Box(3704, 3704),
+ Box(3705, 3705),
+ Box(3706, 3706),
+ Box(3707, 3707),
+ Box(3708, 3708),
+ Box(3709, 3709),
+ Box(3710, 3710),
+ Box(3711, 3711),
+ Box(3712, 3712),
+ Box(3713, 3713),
+ Box(3714, 3714),
+ Box(3715, 3715),
+ Box(3716, 3716),
+ Box(3717, 3717),
+ Box(3718, 3718),
+ Box(3719, 3719),
+ Box(3720, 3720),
+ Box(3721, 3721),
+ Box(3722, 3722),
+ Box(3723, 3723),
+ Box(3724, 3724),
+ Box(3725, 3725),
+ Box(3726, 3726),
+ Box(3727, 3727),
+ Box(3728, 3728),
+ Box(3729, 3729),
+ Box(3730, 3730),
+ Box(3731, 3731),
+ Box(3732, 3732),
+ Box(3733, 3733),
+ Box(3734, 3734),
+ Box(3735, 3735),
+ Box(3736, 3736),
+ Box(3737, 3737),
+ Box(3738, 3738),
+ Box(3739, 3739),
+ Box(3740, 3740),
+ Box(3741, 3741),
+ Box(3742, 3742),
+ Box(3743, 3743),
+ Box(3744, 3744),
+ Box(3745, 3745),
+ Box(3746, 3746),
+ Box(3747, 3747),
+ Box(3748, 3748),
+ Box(3749, 3749),
+ Box(3750, 3750),
+ Box(3751, 3751),
+ Box(3752, 3752),
+ Box(3753, 3753),
+ Box(3754, 3754),
+ Box(3755, 3755),
+ Box(3756, 3756),
+ Box(3757, 3757),
+ Box(3758, 3758),
+ Box(3759, 3759),
+ Box(3760, 3760),
+ Box(3761, 3761),
+ Box(3762, 3762),
+ Box(3763, 3763),
+ Box(3764, 3764),
+ Box(3765, 3765),
+ Box(3766, 3766),
+ Box(3767, 3767),
+ Box(3768, 3768),
+ Box(3769, 3769),
+ Box(3770, 3770),
+ Box(3771, 3771),
+ Box(3772, 3772),
+ Box(3773, 3773),
+ Box(3774, 3774),
+ Box(3775, 3775),
+ Box(3776, 3776),
+ Box(3777, 3777),
+ Box(3778, 3778),
+ Box(3779, 3779),
+ Box(3780, 3780),
+ Box(3781, 3781),
+ Box(3782, 3782),
+ Box(3783, 3783),
+ Box(3784, 3784),
+ Box(3785, 3785),
+ Box(3786, 3786),
+ Box(3787, 3787),
+ Box(3788, 3788),
+ Box(3789, 3789),
+ Box(3790, 3790),
+ Box(3791, 3791),
+ Box(3792, 3792),
+ Box(3793, 3793),
+ Box(3794, 3794),
+ Box(3795, 3795),
+ Box(3796, 3796),
+ Box(3797, 3797),
+ Box(3798, 3798),
+ Box(3799, 3799),
+ Box(3800, 3800),
+ Box(3801, 3801),
+ Box(3802, 3802),
+ Box(3803, 3803),
+ Box(3804, 3804),
+ Box(3805, 3805),
+ Box(3806, 3806),
+ Box(3807, 3807),
+ Box(3808, 3808),
+ Box(3809, 3809),
+ Box(3810, 3810),
+ Box(3811, 3811),
+ Box(3812, 3812),
+ Box(3813, 3813),
+ Box(3814, 3814),
+ Box(3815, 3815),
+ Box(3816, 3816),
+ Box(3817, 3817),
+ Box(3818, 3818),
+ Box(3819, 3819),
+ Box(3820, 3820),
+ Box(3821, 3821),
+ Box(3822, 3822),
+ Box(3823, 3823),
+ Box(3824, 3824),
+ Box(3825, 3825),
+ Box(3826, 3826),
+ Box(3827, 3827),
+ Box(3828, 3828),
+ Box(3829, 3829),
+ Box(3830, 3830),
+ Box(3831, 3831),
+ Box(3832, 3832),
+ Box(3833, 3833),
+ Box(3834, 3834),
+ Box(3835, 3835),
+ Box(3836, 3836),
+ Box(3837, 3837),
+ Box(3838, 3838),
+ Box(3839, 3839),
+ Box(3840, 3840),
+ Box(3841, 3841),
+ Box(3842, 3842),
+ Box(3843, 3843),
+ Box(3844, 3844),
+ Box(3845, 3845),
+ Box(3846, 3846),
+ Box(3847, 3847),
+ Box(3848, 3848),
+ Box(3849, 3849),
+ Box(3850, 3850),
+ Box(3851, 3851),
+ Box(3852, 3852),
+ Box(3853, 3853),
+ Box(3854, 3854),
+ Box(3855, 3855),
+ Box(3856, 3856),
+ Box(3857, 3857),
+ Box(3858, 3858),
+ Box(3859, 3859),
+ Box(3860, 3860),
+ Box(3861, 3861),
+ Box(3862, 3862),
+ Box(3863, 3863),
+ Box(3864, 3864),
+ Box(3865, 3865),
+ Box(3866, 3866),
+ Box(3867, 3867),
+ Box(3868, 3868),
+ Box(3869, 3869),
+ Box(3870, 3870),
+ Box(3871, 3871),
+ Box(3872, 3872),
+ Box(3873, 3873),
+ Box(3874, 3874),
+ Box(3875, 3875),
+ Box(3876, 3876),
+ Box(3877, 3877),
+ Box(3878, 3878),
+ Box(3879, 3879),
+ Box(3880, 3880),
+ Box(3881, 3881),
+ Box(3882, 3882),
+ Box(3883, 3883),
+ Box(3884, 3884),
+ Box(3885, 3885),
+ Box(3886, 3886),
+ Box(3887, 3887),
+ Box(3888, 3888),
+ Box(3889, 3889),
+ Box(3890, 3890),
+ Box(3891, 3891),
+ Box(3892, 3892),
+ Box(3893, 3893),
+ Box(3894, 3894),
+ Box(3895, 3895),
+ Box(3896, 3896),
+ Box(3897, 3897),
+ Box(3898, 3898),
+ Box(3899, 3899),
+ Box(3900, 3900),
+ Box(3901, 3901),
+ Box(3902, 3902),
+ Box(3903, 3903),
+ Box(3904, 3904),
+ Box(3905, 3905),
+ Box(3906, 3906),
+ Box(3907, 3907),
+ Box(3908, 3908),
+ Box(3909, 3909),
+ Box(3910, 3910),
+ Box(3911, 3911),
+ Box(3912, 3912),
+ Box(3913, 3913),
+ Box(3914, 3914),
+ Box(3915, 3915),
+ Box(3916, 3916),
+ Box(3917, 3917),
+ Box(3918, 3918),
+ Box(3919, 3919),
+ Box(3920, 3920),
+ Box(3921, 3921),
+ Box(3922, 3922),
+ Box(3923, 3923),
+ Box(3924, 3924),
+ Box(3925, 3925),
+ Box(3926, 3926),
+ Box(3927, 3927),
+ Box(3928, 3928),
+ Box(3929, 3929),
+ Box(3930, 3930),
+ Box(3931, 3931),
+ Box(3932, 3932),
+ Box(3933, 3933),
+ Box(3934, 3934),
+ Box(3935, 3935),
+ Box(3936, 3936),
+ Box(3937, 3937),
+ Box(3938, 3938),
+ Box(3939, 3939),
+ Box(3940, 3940),
+ Box(3941, 3941),
+ Box(3942, 3942),
+ Box(3943, 3943),
+ Box(3944, 3944),
+ Box(3945, 3945),
+ Box(3946, 3946),
+ Box(3947, 3947),
+ Box(3948, 3948),
+ Box(3949, 3949),
+ Box(3950, 3950),
+ Box(3951, 3951),
+ Box(3952, 3952),
+ Box(3953, 3953),
+ Box(3954, 3954),
+ Box(3955, 3955),
+ Box(3956, 3956),
+ Box(3957, 3957),
+ Box(3958, 3958),
+ Box(3959, 3959),
+ Box(3960, 3960),
+ Box(3961, 3961),
+ Box(3962, 3962),
+ Box(3963, 3963),
+ Box(3964, 3964),
+ Box(3965, 3965),
+ Box(3966, 3966),
+ Box(3967, 3967),
+ Box(3968, 3968),
+ Box(3969, 3969),
+ Box(3970, 3970),
+ Box(3971, 3971),
+ Box(3972, 3972),
+ Box(3973, 3973),
+ Box(3974, 3974),
+ Box(3975, 3975),
+ Box(3976, 3976),
+ Box(3977, 3977),
+ Box(3978, 3978),
+ Box(3979, 3979),
+ Box(3980, 3980),
+ Box(3981, 3981),
+ Box(3982, 3982),
+ Box(3983, 3983),
+ Box(3984, 3984),
+ Box(3985, 3985),
+ Box(3986, 3986),
+ Box(3987, 3987),
+ Box(3988, 3988),
+ Box(3989, 3989),
+ Box(3990, 3990),
+ Box(3991, 3991),
+ Box(3992, 3992),
+ Box(3993, 3993),
+ Box(3994, 3994),
+ Box(3995, 3995),
+ Box(3996, 3996),
+ Box(3997, 3997),
+ Box(3998, 3998),
+ Box(3999, 3999),
+ Box(4000, 4000),
+ Box(4001, 4001),
+ Box(4002, 4002),
+ Box(4003, 4003),
+ Box(4004, 4004),
+ Box(4005, 4005),
+ Box(4006, 4006),
+ Box(4007, 4007),
+ Box(4008, 4008),
+ Box(4009, 4009),
+ Box(4010, 4010),
+ Box(4011, 4011),
+ Box(4012, 4012),
+ Box(4013, 4013),
+ Box(4014, 4014),
+ Box(4015, 4015),
+ Box(4016, 4016),
+ Box(4017, 4017),
+ Box(4018, 4018),
+ Box(4019, 4019),
+ Box(4020, 4020),
+ Box(4021, 4021),
+ Box(4022, 4022),
+ Box(4023, 4023),
+ Box(4024, 4024),
+ Box(4025, 4025),
+ Box(4026, 4026),
+ Box(4027, 4027),
+ Box(4028, 4028),
+ Box(4029, 4029),
+ Box(4030, 4030),
+ Box(4031, 4031),
+ Box(4032, 4032),
+ Box(4033, 4033),
+ Box(4034, 4034),
+ Box(4035, 4035),
+ Box(4036, 4036),
+ Box(4037, 4037),
+ Box(4038, 4038),
+ Box(4039, 4039),
+ Box(4040, 4040),
+ Box(4041, 4041),
+ Box(4042, 4042),
+ Box(4043, 4043),
+ Box(4044, 4044),
+ Box(4045, 4045),
+ Box(4046, 4046),
+ Box(4047, 4047),
+ Box(4048, 4048),
+ Box(4049, 4049),
+ Box(4050, 4050),
+ Box(4051, 4051),
+ Box(4052, 4052),
+ Box(4053, 4053),
+ Box(4054, 4054),
+ Box(4055, 4055),
+ Box(4056, 4056),
+ Box(4057, 4057),
+ Box(4058, 4058),
+ Box(4059, 4059),
+ Box(4060, 4060),
+ Box(4061, 4061),
+ Box(4062, 4062),
+ Box(4063, 4063),
+ Box(4064, 4064),
+ Box(4065, 4065),
+ Box(4066, 4066),
+ Box(4067, 4067),
+ Box(4068, 4068),
+ Box(4069, 4069),
+ Box(4070, 4070),
+ Box(4071, 4071),
+ Box(4072, 4072),
+ Box(4073, 4073),
+ Box(4074, 4074),
+ Box(4075, 4075),
+ Box(4076, 4076),
+ Box(4077, 4077),
+ Box(4078, 4078),
+ Box(4079, 4079),
+ Box(4080, 4080),
+ Box(4081, 4081),
+ Box(4082, 4082),
+ Box(4083, 4083),
+ Box(4084, 4084),
+ Box(4085, 4085),
+ Box(4086, 4086),
+ Box(4087, 4087),
+ Box(4088, 4088),
+ Box(4089, 4089),
+ Box(4090, 4090),
+ Box(4091, 4091),
+ Box(4092, 4092),
+ Box(4093, 4093),
+ Box(4094, 4094),
+ Box(4095, 4095),
+ Box(4096, 4096),
+ Box(4097, 4097),
+ Box(4098, 4098),
+ Box(4099, 4099),
+ Box(4100, 4100),
+ Box(4101, 4101),
+ Box(4102, 4102),
+ Box(4103, 4103),
+ Box(4104, 4104),
+ Box(4105, 4105),
+ Box(4106, 4106),
+ Box(4107, 4107),
+ Box(4108, 4108),
+ Box(4109, 4109),
+ Box(4110, 4110),
+ Box(4111, 4111),
+ Box(4112, 4112),
+ Box(4113, 4113),
+ Box(4114, 4114),
+ Box(4115, 4115),
+ Box(4116, 4116),
+ Box(4117, 4117),
+ Box(4118, 4118),
+ Box(4119, 4119),
+ Box(4120, 4120),
+ Box(4121, 4121),
+ Box(4122, 4122),
+ Box(4123, 4123),
+ Box(4124, 4124),
+ Box(4125, 4125),
+ Box(4126, 4126),
+ Box(4127, 4127),
+ Box(4128, 4128),
+ Box(4129, 4129),
+ Box(4130, 4130),
+ Box(4131, 4131),
+ Box(4132, 4132),
+ Box(4133, 4133),
+ Box(4134, 4134),
+ Box(4135, 4135),
+ Box(4136, 4136),
+ Box(4137, 4137),
+ Box(4138, 4138),
+ Box(4139, 4139),
+ Box(4140, 4140),
+ Box(4141, 4141),
+ Box(4142, 4142),
+ Box(4143, 4143),
+ Box(4144, 4144),
+ Box(4145, 4145),
+ Box(4146, 4146),
+ Box(4147, 4147),
+ Box(4148, 4148),
+ Box(4149, 4149),
+ Box(4150, 4150),
+ Box(4151, 4151),
+ Box(4152, 4152),
+ Box(4153, 4153),
+ Box(4154, 4154),
+ Box(4155, 4155),
+ Box(4156, 4156),
+ Box(4157, 4157),
+ Box(4158, 4158),
+ Box(4159, 4159),
+ Box(4160, 4160),
+ Box(4161, 4161),
+ Box(4162, 4162),
+ Box(4163, 4163),
+ Box(4164, 4164),
+ Box(4165, 4165),
+ Box(4166, 4166),
+ Box(4167, 4167),
+ Box(4168, 4168),
+ Box(4169, 4169),
+ Box(4170, 4170),
+ Box(4171, 4171),
+ Box(4172, 4172),
+ Box(4173, 4173),
+ Box(4174, 4174),
+ Box(4175, 4175),
+ Box(4176, 4176),
+ Box(4177, 4177),
+ Box(4178, 4178),
+ Box(4179, 4179),
+ Box(4180, 4180),
+ Box(4181, 4181),
+ Box(4182, 4182),
+ Box(4183, 4183),
+ Box(4184, 4184),
+ Box(4185, 4185),
+ Box(4186, 4186),
+ Box(4187, 4187),
+ Box(4188, 4188),
+ Box(4189, 4189),
+ Box(4190, 4190),
+ Box(4191, 4191),
+ Box(4192, 4192),
+ Box(4193, 4193),
+ Box(4194, 4194),
+ Box(4195, 4195),
+ Box(4196, 4196),
+ Box(4197, 4197),
+ Box(4198, 4198),
+ Box(4199, 4199),
+ Box(4200, 4200),
+ Box(4201, 4201),
+ Box(4202, 4202),
+ Box(4203, 4203),
+ Box(4204, 4204),
+ Box(4205, 4205),
+ Box(4206, 4206),
+ Box(4207, 4207),
+ Box(4208, 4208),
+ Box(4209, 4209),
+ Box(4210, 4210),
+ Box(4211, 4211),
+ Box(4212, 4212),
+ Box(4213, 4213),
+ Box(4214, 4214),
+ Box(4215, 4215),
+ Box(4216, 4216),
+ Box(4217, 4217),
+ Box(4218, 4218),
+ Box(4219, 4219),
+ Box(4220, 4220),
+ Box(4221, 4221),
+ Box(4222, 4222),
+ Box(4223, 4223),
+ Box(4224, 4224),
+ Box(4225, 4225),
+ Box(4226, 4226),
+ Box(4227, 4227),
+ Box(4228, 4228),
+ Box(4229, 4229),
+ Box(4230, 4230),
+ Box(4231, 4231),
+ Box(4232, 4232),
+ Box(4233, 4233),
+ Box(4234, 4234),
+ Box(4235, 4235),
+ Box(4236, 4236),
+ Box(4237, 4237),
+ Box(4238, 4238),
+ Box(4239, 4239),
+ Box(4240, 4240),
+ Box(4241, 4241),
+ Box(4242, 4242),
+ Box(4243, 4243),
+ Box(4244, 4244),
+ Box(4245, 4245),
+ Box(4246, 4246),
+ Box(4247, 4247),
+ Box(4248, 4248),
+ Box(4249, 4249),
+ Box(4250, 4250),
+ Box(4251, 4251),
+ Box(4252, 4252),
+ Box(4253, 4253),
+ Box(4254, 4254),
+ Box(4255, 4255),
+ Box(4256, 4256),
+ Box(4257, 4257),
+ Box(4258, 4258),
+ Box(4259, 4259),
+ Box(4260, 4260),
+ Box(4261, 4261),
+ Box(4262, 4262),
+ Box(4263, 4263),
+ Box(4264, 4264),
+ Box(4265, 4265),
+ Box(4266, 4266),
+ Box(4267, 4267),
+ Box(4268, 4268),
+ Box(4269, 4269),
+ Box(4270, 4270),
+ Box(4271, 4271),
+ Box(4272, 4272),
+ Box(4273, 4273),
+ Box(4274, 4274),
+ Box(4275, 4275),
+ Box(4276, 4276),
+ Box(4277, 4277),
+ Box(4278, 4278),
+ Box(4279, 4279),
+ Box(4280, 4280),
+ Box(4281, 4281),
+ Box(4282, 4282),
+ Box(4283, 4283),
+ Box(4284, 4284),
+ Box(4285, 4285),
+ Box(4286, 4286),
+ Box(4287, 4287),
+ Box(4288, 4288),
+ Box(4289, 4289),
+ Box(4290, 4290),
+ Box(4291, 4291),
+ Box(4292, 4292),
+ Box(4293, 4293),
+ Box(4294, 4294),
+ Box(4295, 4295),
+ Box(4296, 4296),
+ Box(4297, 4297),
+ Box(4298, 4298),
+ Box(4299, 4299),
+ Box(4300, 4300),
+ Box(4301, 4301),
+ Box(4302, 4302),
+ Box(4303, 4303),
+ Box(4304, 4304),
+ Box(4305, 4305),
+ Box(4306, 4306),
+ Box(4307, 4307),
+ Box(4308, 4308),
+ Box(4309, 4309),
+ Box(4310, 4310),
+ Box(4311, 4311),
+ Box(4312, 4312),
+ Box(4313, 4313),
+ Box(4314, 4314),
+ Box(4315, 4315),
+ Box(4316, 4316),
+ Box(4317, 4317),
+ Box(4318, 4318),
+ Box(4319, 4319),
+ Box(4320, 4320),
+ Box(4321, 4321),
+ Box(4322, 4322),
+ Box(4323, 4323),
+ Box(4324, 4324),
+ Box(4325, 4325),
+ Box(4326, 4326),
+ Box(4327, 4327),
+ Box(4328, 4328),
+ Box(4329, 4329),
+ Box(4330, 4330),
+ Box(4331, 4331),
+ Box(4332, 4332),
+ Box(4333, 4333),
+ Box(4334, 4334),
+ Box(4335, 4335),
+ Box(4336, 4336),
+ Box(4337, 4337),
+ Box(4338, 4338),
+ Box(4339, 4339),
+ Box(4340, 4340),
+ Box(4341, 4341),
+ Box(4342, 4342),
+ Box(4343, 4343),
+ Box(4344, 4344),
+ Box(4345, 4345),
+ Box(4346, 4346),
+ Box(4347, 4347),
+ Box(4348, 4348),
+ Box(4349, 4349),
+ Box(4350, 4350),
+ Box(4351, 4351),
+ Box(4352, 4352),
+ Box(4353, 4353),
+ Box(4354, 4354),
+ Box(4355, 4355),
+ Box(4356, 4356),
+ Box(4357, 4357),
+ Box(4358, 4358),
+ Box(4359, 4359),
+ Box(4360, 4360),
+ Box(4361, 4361),
+ Box(4362, 4362),
+ Box(4363, 4363),
+ Box(4364, 4364),
+ Box(4365, 4365),
+ Box(4366, 4366),
+ Box(4367, 4367),
+ Box(4368, 4368),
+ Box(4369, 4369),
+ Box(4370, 4370),
+ Box(4371, 4371),
+ Box(4372, 4372),
+ Box(4373, 4373),
+ Box(4374, 4374),
+ Box(4375, 4375),
+ Box(4376, 4376),
+ Box(4377, 4377),
+ Box(4378, 4378),
+ Box(4379, 4379),
+ Box(4380, 4380),
+ Box(4381, 4381),
+ Box(4382, 4382),
+ Box(4383, 4383),
+ Box(4384, 4384),
+ Box(4385, 4385),
+ Box(4386, 4386),
+ Box(4387, 4387),
+ Box(4388, 4388),
+ Box(4389, 4389),
+ Box(4390, 4390),
+ Box(4391, 4391),
+ Box(4392, 4392),
+ Box(4393, 4393),
+ Box(4394, 4394),
+ Box(4395, 4395),
+ Box(4396, 4396),
+ Box(4397, 4397),
+ Box(4398, 4398),
+ Box(4399, 4399),
+ Box(4400, 4400),
+ Box(4401, 4401),
+ Box(4402, 4402),
+ Box(4403, 4403),
+ Box(4404, 4404),
+ Box(4405, 4405),
+ Box(4406, 4406),
+ Box(4407, 4407),
+ Box(4408, 4408),
+ Box(4409, 4409),
+ Box(4410, 4410),
+ Box(4411, 4411),
+ Box(4412, 4412),
+ Box(4413, 4413),
+ Box(4414, 4414),
+ Box(4415, 4415),
+ Box(4416, 4416),
+ Box(4417, 4417),
+ Box(4418, 4418),
+ Box(4419, 4419),
+ Box(4420, 4420),
+ Box(4421, 4421),
+ Box(4422, 4422),
+ Box(4423, 4423),
+ Box(4424, 4424),
+ Box(4425, 4425),
+ Box(4426, 4426),
+ Box(4427, 4427),
+ Box(4428, 4428),
+ Box(4429, 4429),
+ Box(4430, 4430),
+ Box(4431, 4431),
+ Box(4432, 4432),
+ Box(4433, 4433),
+ Box(4434, 4434),
+ Box(4435, 4435),
+ Box(4436, 4436),
+ Box(4437, 4437),
+ Box(4438, 4438),
+ Box(4439, 4439),
+ Box(4440, 4440),
+ Box(4441, 4441),
+ Box(4442, 4442),
+ Box(4443, 4443),
+ Box(4444, 4444),
+ Box(4445, 4445),
+ Box(4446, 4446),
+ Box(4447, 4447),
+ Box(4448, 4448),
+ Box(4449, 4449),
+ Box(4450, 4450),
+ Box(4451, 4451),
+ Box(4452, 4452),
+ Box(4453, 4453),
+ Box(4454, 4454),
+ Box(4455, 4455),
+ Box(4456, 4456),
+ Box(4457, 4457),
+ Box(4458, 4458),
+ Box(4459, 4459),
+ Box(4460, 4460),
+ Box(4461, 4461),
+ Box(4462, 4462),
+ Box(4463, 4463),
+ Box(4464, 4464),
+ Box(4465, 4465),
+ Box(4466, 4466),
+ Box(4467, 4467),
+ Box(4468, 4468),
+ Box(4469, 4469),
+ Box(4470, 4470),
+ Box(4471, 4471),
+ Box(4472, 4472),
+ Box(4473, 4473),
+ Box(4474, 4474),
+ Box(4475, 4475),
+ Box(4476, 4476),
+ Box(4477, 4477),
+ Box(4478, 4478),
+ Box(4479, 4479),
+ Box(4480, 4480),
+ Box(4481, 4481),
+ Box(4482, 4482),
+ Box(4483, 4483),
+ Box(4484, 4484),
+ Box(4485, 4485),
+ Box(4486, 4486),
+ Box(4487, 4487),
+ Box(4488, 4488),
+ Box(4489, 4489),
+ Box(4490, 4490),
+ Box(4491, 4491),
+ Box(4492, 4492),
+ Box(4493, 4493),
+ Box(4494, 4494),
+ Box(4495, 4495),
+ Box(4496, 4496),
+ Box(4497, 4497),
+ Box(4498, 4498),
+ Box(4499, 4499),
+ Box(4500, 4500),
+ Box(4501, 4501),
+ Box(4502, 4502),
+ Box(4503, 4503),
+ Box(4504, 4504),
+ Box(4505, 4505),
+ Box(4506, 4506),
+ Box(4507, 4507),
+ Box(4508, 4508),
+ Box(4509, 4509),
+ Box(4510, 4510),
+ Box(4511, 4511),
+ Box(4512, 4512),
+ Box(4513, 4513),
+ Box(4514, 4514),
+ Box(4515, 4515),
+ Box(4516, 4516),
+ Box(4517, 4517),
+ Box(4518, 4518),
+ Box(4519, 4519),
+ Box(4520, 4520),
+ Box(4521, 4521),
+ Box(4522, 4522),
+ Box(4523, 4523),
+ Box(4524, 4524),
+ Box(4525, 4525),
+ Box(4526, 4526),
+ Box(4527, 4527),
+ Box(4528, 4528),
+ Box(4529, 4529),
+ Box(4530, 4530),
+ Box(4531, 4531),
+ Box(4532, 4532),
+ Box(4533, 4533),
+ Box(4534, 4534),
+ Box(4535, 4535),
+ Box(4536, 4536),
+ Box(4537, 4537),
+ Box(4538, 4538),
+ Box(4539, 4539),
+ Box(4540, 4540),
+ Box(4541, 4541),
+ Box(4542, 4542),
+ Box(4543, 4543),
+ Box(4544, 4544),
+ Box(4545, 4545),
+ Box(4546, 4546),
+ Box(4547, 4547),
+ Box(4548, 4548),
+ Box(4549, 4549),
+ Box(4550, 4550),
+ Box(4551, 4551),
+ Box(4552, 4552),
+ Box(4553, 4553),
+ Box(4554, 4554),
+ Box(4555, 4555),
+ Box(4556, 4556),
+ Box(4557, 4557),
+ Box(4558, 4558),
+ Box(4559, 4559),
+ Box(4560, 4560),
+ Box(4561, 4561),
+ Box(4562, 4562),
+ Box(4563, 4563),
+ Box(4564, 4564),
+ Box(4565, 4565),
+ Box(4566, 4566),
+ Box(4567, 4567),
+ Box(4568, 4568),
+ Box(4569, 4569),
+ Box(4570, 4570),
+ Box(4571, 4571),
+ Box(4572, 4572),
+ Box(4573, 4573),
+ Box(4574, 4574),
+ Box(4575, 4575),
+ Box(4576, 4576),
+ Box(4577, 4577),
+ Box(4578, 4578),
+ Box(4579, 4579),
+ Box(4580, 4580),
+ Box(4581, 4581),
+ Box(4582, 4582),
+ Box(4583, 4583),
+ Box(4584, 4584),
+ Box(4585, 4585),
+ Box(4586, 4586),
+ Box(4587, 4587),
+ Box(4588, 4588),
+ Box(4589, 4589),
+ Box(4590, 4590),
+ Box(4591, 4591),
+ Box(4592, 4592),
+ Box(4593, 4593),
+ Box(4594, 4594),
+ Box(4595, 4595),
+ Box(4596, 4596),
+ Box(4597, 4597),
+ Box(4598, 4598),
+ Box(4599, 4599),
+ Box(4600, 4600),
+ Box(4601, 4601),
+ Box(4602, 4602),
+ Box(4603, 4603),
+ Box(4604, 4604),
+ Box(4605, 4605),
+ Box(4606, 4606),
+ Box(4607, 4607),
+ Box(4608, 4608),
+ Box(4609, 4609),
+ Box(4610, 4610),
+ Box(4611, 4611),
+ Box(4612, 4612),
+ Box(4613, 4613),
+ Box(4614, 4614),
+ Box(4615, 4615),
+ Box(4616, 4616),
+ Box(4617, 4617),
+ Box(4618, 4618),
+ Box(4619, 4619),
+ Box(4620, 4620),
+ Box(4621, 4621),
+ Box(4622, 4622),
+ Box(4623, 4623),
+ Box(4624, 4624),
+ Box(4625, 4625),
+ Box(4626, 4626),
+ Box(4627, 4627),
+ Box(4628, 4628),
+ Box(4629, 4629),
+ Box(4630, 4630),
+ Box(4631, 4631),
+ Box(4632, 4632),
+ Box(4633, 4633),
+ Box(4634, 4634),
+ Box(4635, 4635),
+ Box(4636, 4636),
+ Box(4637, 4637),
+ Box(4638, 4638),
+ Box(4639, 4639),
+ Box(4640, 4640),
+ Box(4641, 4641),
+ Box(4642, 4642),
+ Box(4643, 4643),
+ Box(4644, 4644),
+ Box(4645, 4645),
+ Box(4646, 4646),
+ Box(4647, 4647),
+ Box(4648, 4648),
+ Box(4649, 4649),
+ Box(4650, 4650),
+ Box(4651, 4651),
+ Box(4652, 4652),
+ Box(4653, 4653),
+ Box(4654, 4654),
+ Box(4655, 4655),
+ Box(4656, 4656),
+ Box(4657, 4657),
+ Box(4658, 4658),
+ Box(4659, 4659),
+ Box(4660, 4660),
+ Box(4661, 4661),
+ Box(4662, 4662),
+ Box(4663, 4663),
+ Box(4664, 4664),
+ Box(4665, 4665),
+ Box(4666, 4666),
+ Box(4667, 4667),
+ Box(4668, 4668),
+ Box(4669, 4669),
+ Box(4670, 4670),
+ Box(4671, 4671),
+ Box(4672, 4672),
+ Box(4673, 4673),
+ Box(4674, 4674),
+ Box(4675, 4675),
+ Box(4676, 4676),
+ Box(4677, 4677),
+ Box(4678, 4678),
+ Box(4679, 4679),
+ Box(4680, 4680),
+ Box(4681, 4681),
+ Box(4682, 4682),
+ Box(4683, 4683),
+ Box(4684, 4684),
+ Box(4685, 4685),
+ Box(4686, 4686),
+ Box(4687, 4687),
+ Box(4688, 4688),
+ Box(4689, 4689),
+ Box(4690, 4690),
+ Box(4691, 4691),
+ Box(4692, 4692),
+ Box(4693, 4693),
+ Box(4694, 4694),
+ Box(4695, 4695),
+ Box(4696, 4696),
+ Box(4697, 4697),
+ Box(4698, 4698),
+ Box(4699, 4699),
+ Box(4700, 4700),
+ Box(4701, 4701),
+ Box(4702, 4702),
+ Box(4703, 4703),
+ Box(4704, 4704),
+ Box(4705, 4705),
+ Box(4706, 4706),
+ Box(4707, 4707),
+ Box(4708, 4708),
+ Box(4709, 4709),
+ Box(4710, 4710),
+ Box(4711, 4711),
+ Box(4712, 4712),
+ Box(4713, 4713),
+ Box(4714, 4714),
+ Box(4715, 4715),
+ Box(4716, 4716),
+ Box(4717, 4717),
+ Box(4718, 4718),
+ Box(4719, 4719),
+ Box(4720, 4720),
+ Box(4721, 4721),
+ Box(4722, 4722),
+ Box(4723, 4723),
+ Box(4724, 4724),
+ Box(4725, 4725),
+ Box(4726, 4726),
+ Box(4727, 4727),
+ Box(4728, 4728),
+ Box(4729, 4729),
+ Box(4730, 4730),
+ Box(4731, 4731),
+ Box(4732, 4732),
+ Box(4733, 4733),
+ Box(4734, 4734),
+ Box(4735, 4735),
+ Box(4736, 4736),
+ Box(4737, 4737),
+ Box(4738, 4738),
+ Box(4739, 4739),
+ Box(4740, 4740),
+ Box(4741, 4741),
+ Box(4742, 4742),
+ Box(4743, 4743),
+ Box(4744, 4744),
+ Box(4745, 4745),
+ Box(4746, 4746),
+ Box(4747, 4747),
+ Box(4748, 4748),
+ Box(4749, 4749),
+ Box(4750, 4750),
+ Box(4751, 4751),
+ Box(4752, 4752),
+ Box(4753, 4753),
+ Box(4754, 4754),
+ Box(4755, 4755),
+ Box(4756, 4756),
+ Box(4757, 4757),
+ Box(4758, 4758),
+ Box(4759, 4759),
+ Box(4760, 4760),
+ Box(4761, 4761),
+ Box(4762, 4762),
+ Box(4763, 4763),
+ Box(4764, 4764),
+ Box(4765, 4765),
+ Box(4766, 4766),
+ Box(4767, 4767),
+ Box(4768, 4768),
+ Box(4769, 4769),
+ Box(4770, 4770),
+ Box(4771, 4771),
+ Box(4772, 4772),
+ Box(4773, 4773),
+ Box(4774, 4774),
+ Box(4775, 4775),
+ Box(4776, 4776),
+ Box(4777, 4777),
+ Box(4778, 4778),
+ Box(4779, 4779),
+ Box(4780, 4780),
+ Box(4781, 4781),
+ Box(4782, 4782),
+ Box(4783, 4783),
+ Box(4784, 4784),
+ Box(4785, 4785),
+ Box(4786, 4786),
+ Box(4787, 4787),
+ Box(4788, 4788),
+ Box(4789, 4789),
+ Box(4790, 4790),
+ Box(4791, 4791),
+ Box(4792, 4792),
+ Box(4793, 4793),
+ Box(4794, 4794),
+ Box(4795, 4795),
+ Box(4796, 4796),
+ Box(4797, 4797),
+ Box(4798, 4798),
+ Box(4799, 4799),
+ Box(4800, 4800),
+ Box(4801, 4801),
+ Box(4802, 4802),
+ Box(4803, 4803),
+ Box(4804, 4804),
+ Box(4805, 4805),
+ Box(4806, 4806),
+ Box(4807, 4807),
+ Box(4808, 4808),
+ Box(4809, 4809),
+ Box(4810, 4810),
+ Box(4811, 4811),
+ Box(4812, 4812),
+ Box(4813, 4813),
+ Box(4814, 4814),
+ Box(4815, 4815),
+ Box(4816, 4816),
+ Box(4817, 4817),
+ Box(4818, 4818),
+ Box(4819, 4819),
+ Box(4820, 4820),
+ Box(4821, 4821),
+ Box(4822, 4822),
+ Box(4823, 4823),
+ Box(4824, 4824),
+ Box(4825, 4825),
+ Box(4826, 4826),
+ Box(4827, 4827),
+ Box(4828, 4828),
+ Box(4829, 4829),
+ Box(4830, 4830),
+ Box(4831, 4831),
+ Box(4832, 4832),
+ Box(4833, 4833),
+ Box(4834, 4834),
+ Box(4835, 4835),
+ Box(4836, 4836),
+ Box(4837, 4837),
+ Box(4838, 4838),
+ Box(4839, 4839),
+ Box(4840, 4840),
+ Box(4841, 4841),
+ Box(4842, 4842),
+ Box(4843, 4843),
+ Box(4844, 4844),
+ Box(4845, 4845),
+ Box(4846, 4846),
+ Box(4847, 4847),
+ Box(4848, 4848),
+ Box(4849, 4849),
+ Box(4850, 4850),
+ Box(4851, 4851),
+ Box(4852, 4852),
+ Box(4853, 4853),
+ Box(4854, 4854),
+ Box(4855, 4855),
+ Box(4856, 4856),
+ Box(4857, 4857),
+ Box(4858, 4858),
+ Box(4859, 4859),
+ Box(4860, 4860),
+ Box(4861, 4861),
+ Box(4862, 4862),
+ Box(4863, 4863),
+ Box(4864, 4864),
+ Box(4865, 4865),
+ Box(4866, 4866),
+ Box(4867, 4867),
+ Box(4868, 4868),
+ Box(4869, 4869),
+ Box(4870, 4870),
+ Box(4871, 4871),
+ Box(4872, 4872),
+ Box(4873, 4873),
+ Box(4874, 4874),
+ Box(4875, 4875),
+ Box(4876, 4876),
+ Box(4877, 4877),
+ Box(4878, 4878),
+ Box(4879, 4879),
+ Box(4880, 4880),
+ Box(4881, 4881),
+ Box(4882, 4882),
+ Box(4883, 4883),
+ Box(4884, 4884),
+ Box(4885, 4885),
+ Box(4886, 4886),
+ Box(4887, 4887),
+ Box(4888, 4888),
+ Box(4889, 4889),
+ Box(4890, 4890),
+ Box(4891, 4891),
+ Box(4892, 4892),
+ Box(4893, 4893),
+ Box(4894, 4894),
+ Box(4895, 4895),
+ Box(4896, 4896),
+ Box(4897, 4897),
+ Box(4898, 4898),
+ Box(4899, 4899),
+ Box(4900, 4900),
+ Box(4901, 4901),
+ Box(4902, 4902),
+ Box(4903, 4903),
+ Box(4904, 4904),
+ Box(4905, 4905),
+ Box(4906, 4906),
+ Box(4907, 4907),
+ Box(4908, 4908),
+ Box(4909, 4909),
+ Box(4910, 4910),
+ Box(4911, 4911),
+ Box(4912, 4912),
+ Box(4913, 4913),
+ Box(4914, 4914),
+ Box(4915, 4915),
+ Box(4916, 4916),
+ Box(4917, 4917),
+ Box(4918, 4918),
+ Box(4919, 4919),
+ Box(4920, 4920),
+ Box(4921, 4921),
+ Box(4922, 4922),
+ Box(4923, 4923),
+ Box(4924, 4924),
+ Box(4925, 4925),
+ Box(4926, 4926),
+ Box(4927, 4927),
+ Box(4928, 4928),
+ Box(4929, 4929),
+ Box(4930, 4930),
+ Box(4931, 4931),
+ Box(4932, 4932),
+ Box(4933, 4933),
+ Box(4934, 4934),
+ Box(4935, 4935),
+ Box(4936, 4936),
+ Box(4937, 4937),
+ Box(4938, 4938),
+ Box(4939, 4939),
+ Box(4940, 4940),
+ Box(4941, 4941),
+ Box(4942, 4942),
+ Box(4943, 4943),
+ Box(4944, 4944),
+ Box(4945, 4945),
+ Box(4946, 4946),
+ Box(4947, 4947),
+ Box(4948, 4948),
+ Box(4949, 4949),
+ Box(4950, 4950),
+ Box(4951, 4951),
+ Box(4952, 4952),
+ Box(4953, 4953),
+ Box(4954, 4954),
+ Box(4955, 4955),
+ Box(4956, 4956),
+ Box(4957, 4957),
+ Box(4958, 4958),
+ Box(4959, 4959),
+ Box(4960, 4960),
+ Box(4961, 4961),
+ Box(4962, 4962),
+ Box(4963, 4963),
+ Box(4964, 4964),
+ Box(4965, 4965),
+ Box(4966, 4966),
+ Box(4967, 4967),
+ Box(4968, 4968),
+ Box(4969, 4969),
+ Box(4970, 4970),
+ Box(4971, 4971),
+ Box(4972, 4972),
+ Box(4973, 4973),
+ Box(4974, 4974),
+ Box(4975, 4975),
+ Box(4976, 4976),
+ Box(4977, 4977),
+ Box(4978, 4978),
+ Box(4979, 4979),
+ Box(4980, 4980),
+ Box(4981, 4981),
+ Box(4982, 4982),
+ Box(4983, 4983),
+ Box(4984, 4984),
+ Box(4985, 4985),
+ Box(4986, 4986),
+ Box(4987, 4987),
+ Box(4988, 4988),
+ Box(4989, 4989),
+ Box(4990, 4990),
+ Box(4991, 4991),
+ Box(4992, 4992),
+ Box(4993, 4993),
+ Box(4994, 4994),
+ Box(4995, 4995),
+ Box(4996, 4996),
+ Box(4997, 4997),
+ Box(4998, 4998),
+ Box(4999, 4999),
+ Box(5000, 5000),
+ Box(5001, 5001),
+ Box(5002, 5002),
+ Box(5003, 5003),
+ Box(5004, 5004),
+ Box(5005, 5005),
+ Box(5006, 5006),
+ Box(5007, 5007),
+ Box(5008, 5008),
+ Box(5009, 5009),
+ Box(5010, 5010),
+ Box(5011, 5011),
+ Box(5012, 5012),
+ Box(5013, 5013),
+ Box(5014, 5014),
+ Box(5015, 5015),
+ Box(5016, 5016),
+ Box(5017, 5017),
+ Box(5018, 5018),
+ Box(5019, 5019),
+ Box(5020, 5020),
+ Box(5021, 5021),
+ Box(5022, 5022),
+ Box(5023, 5023),
+ Box(5024, 5024),
+ Box(5025, 5025),
+ Box(5026, 5026),
+ Box(5027, 5027),
+ Box(5028, 5028),
+ Box(5029, 5029),
+ Box(5030, 5030),
+ Box(5031, 5031),
+ Box(5032, 5032),
+ Box(5033, 5033),
+ Box(5034, 5034),
+ Box(5035, 5035),
+ Box(5036, 5036),
+ Box(5037, 5037),
+ Box(5038, 5038),
+ Box(5039, 5039),
+ Box(5040, 5040),
+ Box(5041, 5041),
+ Box(5042, 5042),
+ Box(5043, 5043),
+ Box(5044, 5044),
+ Box(5045, 5045),
+ Box(5046, 5046),
+ Box(5047, 5047),
+ Box(5048, 5048),
+ Box(5049, 5049),
+ Box(5050, 5050),
+ Box(5051, 5051),
+ Box(5052, 5052),
+ Box(5053, 5053),
+ Box(5054, 5054),
+ Box(5055, 5055),
+ Box(5056, 5056),
+ Box(5057, 5057),
+ Box(5058, 5058),
+ Box(5059, 5059),
+ Box(5060, 5060),
+ Box(5061, 5061),
+ Box(5062, 5062),
+ Box(5063, 5063),
+ Box(5064, 5064),
+ Box(5065, 5065),
+ Box(5066, 5066),
+ Box(5067, 5067),
+ Box(5068, 5068),
+ Box(5069, 5069),
+ Box(5070, 5070),
+ Box(5071, 5071),
+ Box(5072, 5072),
+ Box(5073, 5073),
+ Box(5074, 5074),
+ Box(5075, 5075),
+ Box(5076, 5076),
+ Box(5077, 5077),
+ Box(5078, 5078),
+ Box(5079, 5079),
+ Box(5080, 5080),
+ Box(5081, 5081),
+ Box(5082, 5082),
+ Box(5083, 5083),
+ Box(5084, 5084),
+ Box(5085, 5085),
+ Box(5086, 5086),
+ Box(5087, 5087),
+ Box(5088, 5088),
+ Box(5089, 5089),
+ Box(5090, 5090),
+ Box(5091, 5091),
+ Box(5092, 5092),
+ Box(5093, 5093),
+ Box(5094, 5094),
+ Box(5095, 5095),
+ Box(5096, 5096),
+ Box(5097, 5097),
+ Box(5098, 5098),
+ Box(5099, 5099),
+ Box(5100, 5100),
+ Box(5101, 5101),
+ Box(5102, 5102),
+ Box(5103, 5103),
+ Box(5104, 5104),
+ Box(5105, 5105),
+ Box(5106, 5106),
+ Box(5107, 5107),
+ Box(5108, 5108),
+ Box(5109, 5109),
+ Box(5110, 5110),
+ Box(5111, 5111),
+ Box(5112, 5112),
+ Box(5113, 5113),
+ Box(5114, 5114),
+ Box(5115, 5115),
+ Box(5116, 5116),
+ Box(5117, 5117),
+ Box(5118, 5118),
+ Box(5119, 5119),
+ Box(5120, 5120),
+ Box(5121, 5121),
+ Box(5122, 5122),
+ Box(5123, 5123),
+ Box(5124, 5124),
+ Box(5125, 5125),
+ Box(5126, 5126),
+ Box(5127, 5127),
+ Box(5128, 5128),
+ Box(5129, 5129),
+ Box(5130, 5130),
+ Box(5131, 5131),
+ Box(5132, 5132),
+ Box(5133, 5133),
+ Box(5134, 5134),
+ Box(5135, 5135),
+ Box(5136, 5136),
+ Box(5137, 5137),
+ Box(5138, 5138),
+ Box(5139, 5139),
+ Box(5140, 5140),
+ Box(5141, 5141),
+ Box(5142, 5142),
+ Box(5143, 5143),
+ Box(5144, 5144),
+ Box(5145, 5145),
+ Box(5146, 5146),
+ Box(5147, 5147),
+ Box(5148, 5148),
+ Box(5149, 5149),
+ Box(5150, 5150),
+ Box(5151, 5151),
+ Box(5152, 5152),
+ Box(5153, 5153),
+ Box(5154, 5154),
+ Box(5155, 5155),
+ Box(5156, 5156),
+ Box(5157, 5157),
+ Box(5158, 5158),
+ Box(5159, 5159),
+ Box(5160, 5160),
+ Box(5161, 5161),
+ Box(5162, 5162),
+ Box(5163, 5163),
+ Box(5164, 5164),
+ Box(5165, 5165),
+ Box(5166, 5166),
+ Box(5167, 5167),
+ Box(5168, 5168),
+ Box(5169, 5169),
+ Box(5170, 5170),
+ Box(5171, 5171),
+ Box(5172, 5172),
+ Box(5173, 5173),
+ Box(5174, 5174),
+ Box(5175, 5175),
+ Box(5176, 5176),
+ Box(5177, 5177),
+ Box(5178, 5178),
+ Box(5179, 5179),
+ Box(5180, 5180),
+ Box(5181, 5181),
+ Box(5182, 5182),
+ Box(5183, 5183),
+ Box(5184, 5184),
+ Box(5185, 5185),
+ Box(5186, 5186),
+ Box(5187, 5187),
+ Box(5188, 5188),
+ Box(5189, 5189),
+ Box(5190, 5190),
+ Box(5191, 5191),
+ Box(5192, 5192),
+ Box(5193, 5193),
+ Box(5194, 5194),
+ Box(5195, 5195),
+ Box(5196, 5196),
+ Box(5197, 5197),
+ Box(5198, 5198),
+ Box(5199, 5199),
+ Box(5200, 5200),
+ Box(5201, 5201),
+ Box(5202, 5202),
+ Box(5203, 5203),
+ Box(5204, 5204),
+ Box(5205, 5205),
+ Box(5206, 5206),
+ Box(5207, 5207),
+ Box(5208, 5208),
+ Box(5209, 5209),
+ Box(5210, 5210),
+ Box(5211, 5211),
+ Box(5212, 5212),
+ Box(5213, 5213),
+ Box(5214, 5214),
+ Box(5215, 5215),
+ Box(5216, 5216),
+ Box(5217, 5217),
+ Box(5218, 5218),
+ Box(5219, 5219),
+ Box(5220, 5220),
+ Box(5221, 5221),
+ Box(5222, 5222),
+ Box(5223, 5223),
+ Box(5224, 5224),
+ Box(5225, 5225),
+ Box(5226, 5226),
+ Box(5227, 5227),
+ Box(5228, 5228),
+ Box(5229, 5229),
+ Box(5230, 5230),
+ Box(5231, 5231),
+ Box(5232, 5232),
+ Box(5233, 5233),
+ Box(5234, 5234),
+ Box(5235, 5235),
+ Box(5236, 5236),
+ Box(5237, 5237),
+ Box(5238, 5238),
+ Box(5239, 5239),
+ Box(5240, 5240),
+ Box(5241, 5241),
+ Box(5242, 5242),
+ Box(5243, 5243),
+ Box(5244, 5244),
+ Box(5245, 5245),
+ Box(5246, 5246),
+ Box(5247, 5247),
+ Box(5248, 5248),
+ Box(5249, 5249),
+ Box(5250, 5250),
+ Box(5251, 5251),
+ Box(5252, 5252),
+ Box(5253, 5253),
+ Box(5254, 5254),
+ Box(5255, 5255),
+ Box(5256, 5256),
+ Box(5257, 5257),
+ Box(5258, 5258),
+ Box(5259, 5259),
+ Box(5260, 5260),
+ Box(5261, 5261),
+ Box(5262, 5262),
+ Box(5263, 5263),
+ Box(5264, 5264),
+ Box(5265, 5265),
+ Box(5266, 5266),
+ Box(5267, 5267),
+ Box(5268, 5268),
+ Box(5269, 5269),
+ Box(5270, 5270),
+ Box(5271, 5271),
+ Box(5272, 5272),
+ Box(5273, 5273),
+ Box(5274, 5274),
+ Box(5275, 5275),
+ Box(5276, 5276),
+ Box(5277, 5277),
+ Box(5278, 5278),
+ Box(5279, 5279),
+ Box(5280, 5280),
+ Box(5281, 5281),
+ Box(5282, 5282),
+ Box(5283, 5283),
+ Box(5284, 5284),
+ Box(5285, 5285),
+ Box(5286, 5286),
+ Box(5287, 5287),
+ Box(5288, 5288),
+ Box(5289, 5289),
+ Box(5290, 5290),
+ Box(5291, 5291),
+ Box(5292, 5292),
+ Box(5293, 5293),
+ Box(5294, 5294),
+ Box(5295, 5295),
+ Box(5296, 5296),
+ Box(5297, 5297),
+ Box(5298, 5298),
+ Box(5299, 5299),
+ Box(5300, 5300),
+ Box(5301, 5301),
+ Box(5302, 5302),
+ Box(5303, 5303),
+ Box(5304, 5304),
+ Box(5305, 5305),
+ Box(5306, 5306),
+ Box(5307, 5307),
+ Box(5308, 5308),
+ Box(5309, 5309),
+ Box(5310, 5310),
+ Box(5311, 5311),
+ Box(5312, 5312),
+ Box(5313, 5313),
+ Box(5314, 5314),
+ Box(5315, 5315),
+ Box(5316, 5316),
+ Box(5317, 5317),
+ Box(5318, 5318),
+ Box(5319, 5319),
+ Box(5320, 5320),
+ Box(5321, 5321),
+ Box(5322, 5322),
+ Box(5323, 5323),
+ Box(5324, 5324),
+ Box(5325, 5325),
+ Box(5326, 5326),
+ Box(5327, 5327),
+ Box(5328, 5328),
+ Box(5329, 5329),
+ Box(5330, 5330),
+ Box(5331, 5331),
+ Box(5332, 5332),
+ Box(5333, 5333),
+ Box(5334, 5334),
+ Box(5335, 5335),
+ Box(5336, 5336),
+ Box(5337, 5337),
+ Box(5338, 5338),
+ Box(5339, 5339),
+ Box(5340, 5340),
+ Box(5341, 5341),
+ Box(5342, 5342),
+ Box(5343, 5343),
+ Box(5344, 5344),
+ Box(5345, 5345),
+ Box(5346, 5346),
+ Box(5347, 5347),
+ Box(5348, 5348),
+ Box(5349, 5349),
+ Box(5350, 5350),
+ Box(5351, 5351),
+ Box(5352, 5352),
+ Box(5353, 5353),
+ Box(5354, 5354),
+ Box(5355, 5355),
+ Box(5356, 5356),
+ Box(5357, 5357),
+ Box(5358, 5358),
+ Box(5359, 5359),
+ Box(5360, 5360),
+ Box(5361, 5361),
+ Box(5362, 5362),
+ Box(5363, 5363),
+ Box(5364, 5364),
+ Box(5365, 5365),
+ Box(5366, 5366),
+ Box(5367, 5367),
+ Box(5368, 5368),
+ Box(5369, 5369),
+ Box(5370, 5370),
+ Box(5371, 5371),
+ Box(5372, 5372),
+ Box(5373, 5373),
+ Box(5374, 5374),
+ Box(5375, 5375),
+ Box(5376, 5376),
+ Box(5377, 5377),
+ Box(5378, 5378),
+ Box(5379, 5379),
+ Box(5380, 5380),
+ Box(5381, 5381),
+ Box(5382, 5382),
+ Box(5383, 5383),
+ Box(5384, 5384),
+ Box(5385, 5385),
+ Box(5386, 5386),
+ Box(5387, 5387),
+ Box(5388, 5388),
+ Box(5389, 5389),
+ Box(5390, 5390),
+ Box(5391, 5391),
+ Box(5392, 5392),
+ Box(5393, 5393),
+ Box(5394, 5394),
+ Box(5395, 5395),
+ Box(5396, 5396),
+ Box(5397, 5397),
+ Box(5398, 5398),
+ Box(5399, 5399),
+ Box(5400, 5400),
+ Box(5401, 5401),
+ Box(5402, 5402),
+ Box(5403, 5403),
+ Box(5404, 5404),
+ Box(5405, 5405),
+ Box(5406, 5406),
+ Box(5407, 5407),
+ Box(5408, 5408),
+ Box(5409, 5409),
+ Box(5410, 5410),
+ Box(5411, 5411),
+ Box(5412, 5412),
+ Box(5413, 5413),
+ Box(5414, 5414),
+ Box(5415, 5415),
+ Box(5416, 5416),
+ Box(5417, 5417),
+ Box(5418, 5418),
+ Box(5419, 5419),
+ Box(5420, 5420),
+ Box(5421, 5421),
+ Box(5422, 5422),
+ Box(5423, 5423),
+ Box(5424, 5424),
+ Box(5425, 5425),
+ Box(5426, 5426),
+ Box(5427, 5427),
+ Box(5428, 5428),
+ Box(5429, 5429),
+ Box(5430, 5430),
+ Box(5431, 5431),
+ Box(5432, 5432),
+ Box(5433, 5433),
+ Box(5434, 5434),
+ Box(5435, 5435),
+ Box(5436, 5436),
+ Box(5437, 5437),
+ Box(5438, 5438),
+ Box(5439, 5439),
+ Box(5440, 5440),
+ Box(5441, 5441),
+ Box(5442, 5442),
+ Box(5443, 5443),
+ Box(5444, 5444),
+ Box(5445, 5445),
+ Box(5446, 5446),
+ Box(5447, 5447),
+ Box(5448, 5448),
+ Box(5449, 5449),
+ Box(5450, 5450),
+ Box(5451, 5451),
+ Box(5452, 5452),
+ Box(5453, 5453),
+ Box(5454, 5454),
+ Box(5455, 5455),
+ Box(5456, 5456),
+ Box(5457, 5457),
+ Box(5458, 5458),
+ Box(5459, 5459),
+ Box(5460, 5460),
+ Box(5461, 5461),
+ Box(5462, 5462),
+ Box(5463, 5463),
+ Box(5464, 5464),
+ Box(5465, 5465),
+ Box(5466, 5466),
+ Box(5467, 5467),
+ Box(5468, 5468),
+ Box(5469, 5469),
+ Box(5470, 5470),
+ Box(5471, 5471),
+ Box(5472, 5472),
+ Box(5473, 5473),
+ Box(5474, 5474),
+ Box(5475, 5475),
+ Box(5476, 5476),
+ Box(5477, 5477),
+ Box(5478, 5478),
+ Box(5479, 5479),
+ Box(5480, 5480),
+ Box(5481, 5481),
+ Box(5482, 5482),
+ Box(5483, 5483),
+ Box(5484, 5484),
+ Box(5485, 5485),
+ Box(5486, 5486),
+ Box(5487, 5487),
+ Box(5488, 5488),
+ Box(5489, 5489),
+ Box(5490, 5490),
+ Box(5491, 5491),
+ Box(5492, 5492),
+ Box(5493, 5493),
+ Box(5494, 5494),
+ Box(5495, 5495),
+ Box(5496, 5496),
+ Box(5497, 5497),
+ Box(5498, 5498),
+ Box(5499, 5499),
+ Box(5500, 5500),
+ Box(5501, 5501),
+ Box(5502, 5502),
+ Box(5503, 5503),
+ Box(5504, 5504),
+ Box(5505, 5505),
+ Box(5506, 5506),
+ Box(5507, 5507),
+ Box(5508, 5508),
+ Box(5509, 5509),
+ Box(5510, 5510),
+ Box(5511, 5511),
+ Box(5512, 5512),
+ Box(5513, 5513),
+ Box(5514, 5514),
+ Box(5515, 5515),
+ Box(5516, 5516),
+ Box(5517, 5517),
+ Box(5518, 5518),
+ Box(5519, 5519),
+ Box(5520, 5520),
+ Box(5521, 5521),
+ Box(5522, 5522),
+ Box(5523, 5523),
+ Box(5524, 5524),
+ Box(5525, 5525),
+ Box(5526, 5526),
+ Box(5527, 5527),
+ Box(5528, 5528),
+ Box(5529, 5529),
+ Box(5530, 5530),
+ Box(5531, 5531),
+ Box(5532, 5532),
+ Box(5533, 5533),
+ Box(5534, 5534),
+ Box(5535, 5535),
+ Box(5536, 5536),
+ Box(5537, 5537),
+ Box(5538, 5538),
+ Box(5539, 5539),
+ Box(5540, 5540),
+ Box(5541, 5541),
+ Box(5542, 5542),
+ Box(5543, 5543),
+ Box(5544, 5544),
+ Box(5545, 5545),
+ Box(5546, 5546),
+ Box(5547, 5547),
+ Box(5548, 5548),
+ Box(5549, 5549),
+ Box(5550, 5550),
+ Box(5551, 5551),
+ Box(5552, 5552),
+ Box(5553, 5553),
+ Box(5554, 5554),
+ Box(5555, 5555),
+ Box(5556, 5556),
+ Box(5557, 5557),
+ Box(5558, 5558),
+ Box(5559, 5559),
+ Box(5560, 5560),
+ Box(5561, 5561),
+ Box(5562, 5562),
+ Box(5563, 5563),
+ Box(5564, 5564),
+ Box(5565, 5565),
+ Box(5566, 5566),
+ Box(5567, 5567),
+ Box(5568, 5568),
+ Box(5569, 5569),
+ Box(5570, 5570),
+ Box(5571, 5571),
+ Box(5572, 5572),
+ Box(5573, 5573),
+ Box(5574, 5574),
+ Box(5575, 5575),
+ Box(5576, 5576),
+ Box(5577, 5577),
+ Box(5578, 5578),
+ Box(5579, 5579),
+ Box(5580, 5580),
+ Box(5581, 5581),
+ Box(5582, 5582),
+ Box(5583, 5583),
+ Box(5584, 5584),
+ Box(5585, 5585),
+ Box(5586, 5586),
+ Box(5587, 5587),
+ Box(5588, 5588),
+ Box(5589, 5589),
+ Box(5590, 5590),
+ Box(5591, 5591),
+ Box(5592, 5592),
+ Box(5593, 5593),
+ Box(5594, 5594),
+ Box(5595, 5595),
+ Box(5596, 5596),
+ Box(5597, 5597),
+ Box(5598, 5598),
+ Box(5599, 5599),
+ Box(5600, 5600),
+ Box(5601, 5601),
+ Box(5602, 5602),
+ Box(5603, 5603),
+ Box(5604, 5604),
+ Box(5605, 5605),
+ Box(5606, 5606),
+ Box(5607, 5607),
+ Box(5608, 5608),
+ Box(5609, 5609),
+ Box(5610, 5610),
+ Box(5611, 5611),
+ Box(5612, 5612),
+ Box(5613, 5613),
+ Box(5614, 5614),
+ Box(5615, 5615),
+ Box(5616, 5616),
+ Box(5617, 5617),
+ Box(5618, 5618),
+ Box(5619, 5619),
+ Box(5620, 5620),
+ Box(5621, 5621),
+ Box(5622, 5622),
+ Box(5623, 5623),
+ Box(5624, 5624),
+ Box(5625, 5625),
+ Box(5626, 5626),
+ Box(5627, 5627),
+ Box(5628, 5628),
+ Box(5629, 5629),
+ Box(5630, 5630),
+ Box(5631, 5631),
+ Box(5632, 5632),
+ Box(5633, 5633),
+ Box(5634, 5634),
+ Box(5635, 5635),
+ Box(5636, 5636),
+ Box(5637, 5637),
+ Box(5638, 5638),
+ Box(5639, 5639),
+ Box(5640, 5640),
+ Box(5641, 5641),
+ Box(5642, 5642),
+ Box(5643, 5643),
+ Box(5644, 5644),
+ Box(5645, 5645),
+ Box(5646, 5646),
+ Box(5647, 5647),
+ Box(5648, 5648),
+ Box(5649, 5649),
+ Box(5650, 5650),
+ Box(5651, 5651),
+ Box(5652, 5652),
+ Box(5653, 5653),
+ Box(5654, 5654),
+ Box(5655, 5655),
+ Box(5656, 5656),
+ Box(5657, 5657),
+ Box(5658, 5658),
+ Box(5659, 5659),
+ Box(5660, 5660),
+ Box(5661, 5661),
+ Box(5662, 5662),
+ Box(5663, 5663),
+ Box(5664, 5664),
+ Box(5665, 5665),
+ Box(5666, 5666),
+ Box(5667, 5667),
+ Box(5668, 5668),
+ Box(5669, 5669),
+ Box(5670, 5670),
+ Box(5671, 5671),
+ Box(5672, 5672),
+ Box(5673, 5673),
+ Box(5674, 5674),
+ Box(5675, 5675),
+ Box(5676, 5676),
+ Box(5677, 5677),
+ Box(5678, 5678),
+ Box(5679, 5679),
+ Box(5680, 5680),
+ Box(5681, 5681),
+ Box(5682, 5682),
+ Box(5683, 5683),
+ Box(5684, 5684),
+ Box(5685, 5685),
+ Box(5686, 5686),
+ Box(5687, 5687),
+ Box(5688, 5688),
+ Box(5689, 5689),
+ Box(5690, 5690),
+ Box(5691, 5691),
+ Box(5692, 5692),
+ Box(5693, 5693),
+ Box(5694, 5694),
+ Box(5695, 5695),
+ Box(5696, 5696),
+ Box(5697, 5697),
+ Box(5698, 5698),
+ Box(5699, 5699),
+ Box(5700, 5700),
+ Box(5701, 5701),
+ Box(5702, 5702),
+ Box(5703, 5703),
+ Box(5704, 5704),
+ Box(5705, 5705),
+ Box(5706, 5706),
+ Box(5707, 5707),
+ Box(5708, 5708),
+ Box(5709, 5709),
+ Box(5710, 5710),
+ Box(5711, 5711),
+ Box(5712, 5712),
+ Box(5713, 5713),
+ Box(5714, 5714),
+ Box(5715, 5715),
+ Box(5716, 5716),
+ Box(5717, 5717),
+ Box(5718, 5718),
+ Box(5719, 5719),
+ Box(5720, 5720),
+ Box(5721, 5721),
+ Box(5722, 5722),
+ Box(5723, 5723),
+ Box(5724, 5724),
+ Box(5725, 5725),
+ Box(5726, 5726),
+ Box(5727, 5727),
+ Box(5728, 5728),
+ Box(5729, 5729),
+ Box(5730, 5730),
+ Box(5731, 5731),
+ Box(5732, 5732),
+ Box(5733, 5733),
+ Box(5734, 5734),
+ Box(5735, 5735),
+ Box(5736, 5736),
+ Box(5737, 5737),
+ Box(5738, 5738),
+ Box(5739, 5739),
+ Box(5740, 5740),
+ Box(5741, 5741),
+ Box(5742, 5742),
+ Box(5743, 5743),
+ Box(5744, 5744),
+ Box(5745, 5745),
+ Box(5746, 5746),
+ Box(5747, 5747),
+ Box(5748, 5748),
+ Box(5749, 5749),
+ Box(5750, 5750),
+ Box(5751, 5751),
+ Box(5752, 5752),
+ Box(5753, 5753),
+ Box(5754, 5754),
+ Box(5755, 5755),
+ Box(5756, 5756),
+ Box(5757, 5757),
+ Box(5758, 5758),
+ Box(5759, 5759),
+ Box(5760, 5760),
+ Box(5761, 5761),
+ Box(5762, 5762),
+ Box(5763, 5763),
+ Box(5764, 5764),
+ Box(5765, 5765),
+ Box(5766, 5766),
+ Box(5767, 5767),
+ Box(5768, 5768),
+ Box(5769, 5769),
+ Box(5770, 5770),
+ Box(5771, 5771),
+ Box(5772, 5772),
+ Box(5773, 5773),
+ Box(5774, 5774),
+ Box(5775, 5775),
+ Box(5776, 5776),
+ Box(5777, 5777),
+ Box(5778, 5778),
+ Box(5779, 5779),
+ Box(5780, 5780),
+ Box(5781, 5781),
+ Box(5782, 5782),
+ Box(5783, 5783),
+ Box(5784, 5784),
+ Box(5785, 5785),
+ Box(5786, 5786),
+ Box(5787, 5787),
+ Box(5788, 5788),
+ Box(5789, 5789),
+ Box(5790, 5790),
+ Box(5791, 5791),
+ Box(5792, 5792),
+ Box(5793, 5793),
+ Box(5794, 5794),
+ Box(5795, 5795),
+ Box(5796, 5796),
+ Box(5797, 5797),
+ Box(5798, 5798),
+ Box(5799, 5799),
+ Box(5800, 5800),
+ Box(5801, 5801),
+ Box(5802, 5802),
+ Box(5803, 5803),
+ Box(5804, 5804),
+ Box(5805, 5805),
+ Box(5806, 5806),
+ Box(5807, 5807),
+ Box(5808, 5808),
+ Box(5809, 5809),
+ Box(5810, 5810),
+ Box(5811, 5811),
+ Box(5812, 5812),
+ Box(5813, 5813),
+ Box(5814, 5814),
+ Box(5815, 5815),
+ Box(5816, 5816),
+ Box(5817, 5817),
+ Box(5818, 5818),
+ Box(5819, 5819),
+ Box(5820, 5820),
+ Box(5821, 5821),
+ Box(5822, 5822),
+ Box(5823, 5823),
+ Box(5824, 5824),
+ Box(5825, 5825),
+ Box(5826, 5826),
+ Box(5827, 5827),
+ Box(5828, 5828),
+ Box(5829, 5829),
+ Box(5830, 5830),
+ Box(5831, 5831),
+ Box(5832, 5832),
+ Box(5833, 5833),
+ Box(5834, 5834),
+ Box(5835, 5835),
+ Box(5836, 5836),
+ Box(5837, 5837),
+ Box(5838, 5838),
+ Box(5839, 5839),
+ Box(5840, 5840),
+ Box(5841, 5841),
+ Box(5842, 5842),
+ Box(5843, 5843),
+ Box(5844, 5844),
+ Box(5845, 5845),
+ Box(5846, 5846),
+ Box(5847, 5847),
+ Box(5848, 5848),
+ Box(5849, 5849),
+ Box(5850, 5850),
+ Box(5851, 5851),
+ Box(5852, 5852),
+ Box(5853, 5853),
+ Box(5854, 5854),
+ Box(5855, 5855),
+ Box(5856, 5856),
+ Box(5857, 5857),
+ Box(5858, 5858),
+ Box(5859, 5859),
+ Box(5860, 5860),
+ Box(5861, 5861),
+ Box(5862, 5862),
+ Box(5863, 5863),
+ Box(5864, 5864),
+ Box(5865, 5865),
+ Box(5866, 5866),
+ Box(5867, 5867),
+ Box(5868, 5868),
+ Box(5869, 5869),
+ Box(5870, 5870),
+ Box(5871, 5871),
+ Box(5872, 5872),
+ Box(5873, 5873),
+ Box(5874, 5874),
+ Box(5875, 5875),
+ Box(5876, 5876),
+ Box(5877, 5877),
+ Box(5878, 5878),
+ Box(5879, 5879),
+ Box(5880, 5880),
+ Box(5881, 5881),
+ Box(5882, 5882),
+ Box(5883, 5883),
+ Box(5884, 5884),
+ Box(5885, 5885),
+ Box(5886, 5886),
+ Box(5887, 5887),
+ Box(5888, 5888),
+ Box(5889, 5889),
+ Box(5890, 5890),
+ Box(5891, 5891),
+ Box(5892, 5892),
+ Box(5893, 5893),
+ Box(5894, 5894),
+ Box(5895, 5895),
+ Box(5896, 5896),
+ Box(5897, 5897),
+ Box(5898, 5898),
+ Box(5899, 5899),
+ Box(5900, 5900),
+ Box(5901, 5901),
+ Box(5902, 5902),
+ Box(5903, 5903),
+ Box(5904, 5904),
+ Box(5905, 5905),
+ Box(5906, 5906),
+ Box(5907, 5907),
+ Box(5908, 5908),
+ Box(5909, 5909),
+ Box(5910, 5910),
+ Box(5911, 5911),
+ Box(5912, 5912),
+ Box(5913, 5913),
+ Box(5914, 5914),
+ Box(5915, 5915),
+ Box(5916, 5916),
+ Box(5917, 5917),
+ Box(5918, 5918),
+ Box(5919, 5919),
+ Box(5920, 5920),
+ Box(5921, 5921),
+ Box(5922, 5922),
+ Box(5923, 5923),
+ Box(5924, 5924),
+ Box(5925, 5925),
+ Box(5926, 5926),
+ Box(5927, 5927),
+ Box(5928, 5928),
+ Box(5929, 5929),
+ Box(5930, 5930),
+ Box(5931, 5931),
+ Box(5932, 5932),
+ Box(5933, 5933),
+ Box(5934, 5934),
+ Box(5935, 5935),
+ Box(5936, 5936),
+ Box(5937, 5937),
+ Box(5938, 5938),
+ Box(5939, 5939),
+ Box(5940, 5940),
+ Box(5941, 5941),
+ Box(5942, 5942),
+ Box(5943, 5943),
+ Box(5944, 5944),
+ Box(5945, 5945),
+ Box(5946, 5946),
+ Box(5947, 5947),
+ Box(5948, 5948),
+ Box(5949, 5949),
+ Box(5950, 5950),
+ Box(5951, 5951),
+ Box(5952, 5952),
+ Box(5953, 5953),
+ Box(5954, 5954),
+ Box(5955, 5955),
+ Box(5956, 5956),
+ Box(5957, 5957),
+ Box(5958, 5958),
+ Box(5959, 5959),
+ Box(5960, 5960),
+ Box(5961, 5961),
+ Box(5962, 5962),
+ Box(5963, 5963),
+ Box(5964, 5964),
+ Box(5965, 5965),
+ Box(5966, 5966),
+ Box(5967, 5967),
+ Box(5968, 5968),
+ Box(5969, 5969),
+ Box(5970, 5970),
+ Box(5971, 5971),
+ Box(5972, 5972),
+ Box(5973, 5973),
+ Box(5974, 5974),
+ Box(5975, 5975),
+ Box(5976, 5976),
+ Box(5977, 5977),
+ Box(5978, 5978),
+ Box(5979, 5979),
+ Box(5980, 5980),
+ Box(5981, 5981),
+ Box(5982, 5982),
+ Box(5983, 5983),
+ Box(5984, 5984),
+ Box(5985, 5985),
+ Box(5986, 5986),
+ Box(5987, 5987),
+ Box(5988, 5988),
+ Box(5989, 5989),
+ Box(5990, 5990),
+ Box(5991, 5991),
+ Box(5992, 5992),
+ Box(5993, 5993),
+ Box(5994, 5994),
+ Box(5995, 5995),
+ Box(5996, 5996),
+ Box(5997, 5997),
+ Box(5998, 5998),
+ Box(5999, 5999),
+ Box(6000, 6000),
+ Box(6001, 6001),
+ Box(6002, 6002),
+ Box(6003, 6003),
+ Box(6004, 6004),
+ Box(6005, 6005),
+ Box(6006, 6006),
+ Box(6007, 6007),
+ Box(6008, 6008),
+ Box(6009, 6009),
+ Box(6010, 6010),
+ Box(6011, 6011),
+ Box(6012, 6012),
+ Box(6013, 6013),
+ Box(6014, 6014),
+ Box(6015, 6015),
+ Box(6016, 6016),
+ Box(6017, 6017),
+ Box(6018, 6018),
+ Box(6019, 6019),
+ Box(6020, 6020),
+ Box(6021, 6021),
+ Box(6022, 6022),
+ Box(6023, 6023),
+ Box(6024, 6024),
+ Box(6025, 6025),
+ Box(6026, 6026),
+ Box(6027, 6027),
+ Box(6028, 6028),
+ Box(6029, 6029),
+ Box(6030, 6030),
+ Box(6031, 6031),
+ Box(6032, 6032),
+ Box(6033, 6033),
+ Box(6034, 6034),
+ Box(6035, 6035),
+ Box(6036, 6036),
+ Box(6037, 6037),
+ Box(6038, 6038),
+ Box(6039, 6039),
+ Box(6040, 6040),
+ Box(6041, 6041),
+ Box(6042, 6042),
+ Box(6043, 6043),
+ Box(6044, 6044),
+ Box(6045, 6045),
+ Box(6046, 6046),
+ Box(6047, 6047),
+ Box(6048, 6048),
+ Box(6049, 6049),
+ Box(6050, 6050),
+ Box(6051, 6051),
+ Box(6052, 6052),
+ Box(6053, 6053),
+ Box(6054, 6054),
+ Box(6055, 6055),
+ Box(6056, 6056),
+ Box(6057, 6057),
+ Box(6058, 6058),
+ Box(6059, 6059),
+ Box(6060, 6060),
+ Box(6061, 6061),
+ Box(6062, 6062),
+ Box(6063, 6063),
+ Box(6064, 6064),
+ Box(6065, 6065),
+ Box(6066, 6066),
+ Box(6067, 6067),
+ Box(6068, 6068),
+ Box(6069, 6069),
+ Box(6070, 6070),
+ Box(6071, 6071),
+ Box(6072, 6072),
+ Box(6073, 6073),
+ Box(6074, 6074),
+ Box(6075, 6075),
+ Box(6076, 6076),
+ Box(6077, 6077),
+ Box(6078, 6078),
+ Box(6079, 6079),
+ Box(6080, 6080),
+ Box(6081, 6081),
+ Box(6082, 6082),
+ Box(6083, 6083),
+ Box(6084, 6084),
+ Box(6085, 6085),
+ Box(6086, 6086),
+ Box(6087, 6087),
+ Box(6088, 6088),
+ Box(6089, 6089),
+ Box(6090, 6090),
+ Box(6091, 6091),
+ Box(6092, 6092),
+ Box(6093, 6093),
+ Box(6094, 6094),
+ Box(6095, 6095),
+ Box(6096, 6096),
+ Box(6097, 6097),
+ Box(6098, 6098),
+ Box(6099, 6099),
+ Box(6100, 6100),
+ Box(6101, 6101),
+ Box(6102, 6102),
+ Box(6103, 6103),
+ Box(6104, 6104),
+ Box(6105, 6105),
+ Box(6106, 6106),
+ Box(6107, 6107),
+ Box(6108, 6108),
+ Box(6109, 6109),
+ Box(6110, 6110),
+ Box(6111, 6111),
+ Box(6112, 6112),
+ Box(6113, 6113),
+ Box(6114, 6114),
+ Box(6115, 6115),
+ Box(6116, 6116),
+ Box(6117, 6117),
+ Box(6118, 6118),
+ Box(6119, 6119),
+ Box(6120, 6120),
+ Box(6121, 6121),
+ Box(6122, 6122),
+ Box(6123, 6123),
+ Box(6124, 6124),
+ Box(6125, 6125),
+ Box(6126, 6126),
+ Box(6127, 6127),
+ Box(6128, 6128),
+ Box(6129, 6129),
+ Box(6130, 6130),
+ Box(6131, 6131),
+ Box(6132, 6132),
+ Box(6133, 6133),
+ Box(6134, 6134),
+ Box(6135, 6135),
+ Box(6136, 6136),
+ Box(6137, 6137),
+ Box(6138, 6138),
+ Box(6139, 6139),
+ Box(6140, 6140),
+ Box(6141, 6141),
+ Box(6142, 6142),
+ Box(6143, 6143),
+ Box(6144, 6144),
+ Box(6145, 6145),
+ Box(6146, 6146),
+ Box(6147, 6147),
+ Box(6148, 6148),
+ Box(6149, 6149),
+ Box(6150, 6150),
+ Box(6151, 6151),
+ Box(6152, 6152),
+ Box(6153, 6153),
+ Box(6154, 6154),
+ Box(6155, 6155),
+ Box(6156, 6156),
+ Box(6157, 6157),
+ Box(6158, 6158),
+ Box(6159, 6159),
+ Box(6160, 6160),
+ Box(6161, 6161),
+ Box(6162, 6162),
+ Box(6163, 6163),
+ Box(6164, 6164),
+ Box(6165, 6165),
+ Box(6166, 6166),
+ Box(6167, 6167),
+ Box(6168, 6168),
+ Box(6169, 6169),
+ Box(6170, 6170),
+ Box(6171, 6171),
+ Box(6172, 6172),
+ Box(6173, 6173),
+ Box(6174, 6174),
+ Box(6175, 6175),
+ Box(6176, 6176),
+ Box(6177, 6177),
+ Box(6178, 6178),
+ Box(6179, 6179),
+ Box(6180, 6180),
+ Box(6181, 6181),
+ Box(6182, 6182),
+ Box(6183, 6183),
+ Box(6184, 6184),
+ Box(6185, 6185),
+ Box(6186, 6186),
+ Box(6187, 6187),
+ Box(6188, 6188),
+ Box(6189, 6189),
+ Box(6190, 6190),
+ Box(6191, 6191),
+ Box(6192, 6192),
+ Box(6193, 6193),
+ Box(6194, 6194),
+ Box(6195, 6195),
+ Box(6196, 6196),
+ Box(6197, 6197),
+ Box(6198, 6198),
+ Box(6199, 6199),
+ Box(6200, 6200),
+ Box(6201, 6201),
+ Box(6202, 6202),
+ Box(6203, 6203),
+ Box(6204, 6204),
+ Box(6205, 6205),
+ Box(6206, 6206),
+ Box(6207, 6207),
+ Box(6208, 6208),
+ Box(6209, 6209),
+ Box(6210, 6210),
+ Box(6211, 6211),
+ Box(6212, 6212),
+ Box(6213, 6213),
+ Box(6214, 6214),
+ Box(6215, 6215),
+ Box(6216, 6216),
+ Box(6217, 6217),
+ Box(6218, 6218),
+ Box(6219, 6219),
+ Box(6220, 6220),
+ Box(6221, 6221),
+ Box(6222, 6222),
+ Box(6223, 6223),
+ Box(6224, 6224),
+ Box(6225, 6225),
+ Box(6226, 6226),
+ Box(6227, 6227),
+ Box(6228, 6228),
+ Box(6229, 6229),
+ Box(6230, 6230),
+ Box(6231, 6231),
+ Box(6232, 6232),
+ Box(6233, 6233),
+ Box(6234, 6234),
+ Box(6235, 6235),
+ Box(6236, 6236),
+ Box(6237, 6237),
+ Box(6238, 6238),
+ Box(6239, 6239),
+ Box(6240, 6240),
+ Box(6241, 6241),
+ Box(6242, 6242),
+ Box(6243, 6243),
+ Box(6244, 6244),
+ Box(6245, 6245),
+ Box(6246, 6246),
+ Box(6247, 6247),
+ Box(6248, 6248),
+ Box(6249, 6249),
+ Box(6250, 6250),
+ Box(6251, 6251),
+ Box(6252, 6252),
+ Box(6253, 6253),
+ Box(6254, 6254),
+ Box(6255, 6255),
+ Box(6256, 6256),
+ Box(6257, 6257),
+ Box(6258, 6258),
+ Box(6259, 6259),
+ Box(6260, 6260),
+ Box(6261, 6261),
+ Box(6262, 6262),
+ Box(6263, 6263),
+ Box(6264, 6264),
+ Box(6265, 6265),
+ Box(6266, 6266),
+ Box(6267, 6267),
+ Box(6268, 6268),
+ Box(6269, 6269),
+ Box(6270, 6270),
+ Box(6271, 6271),
+ Box(6272, 6272),
+ Box(6273, 6273),
+ Box(6274, 6274),
+ Box(6275, 6275),
+ Box(6276, 6276),
+ Box(6277, 6277),
+ Box(6278, 6278),
+ Box(6279, 6279),
+ Box(6280, 6280),
+ Box(6281, 6281),
+ Box(6282, 6282),
+ Box(6283, 6283),
+ Box(6284, 6284),
+ Box(6285, 6285),
+ Box(6286, 6286),
+ Box(6287, 6287),
+ Box(6288, 6288),
+ Box(6289, 6289),
+ Box(6290, 6290),
+ Box(6291, 6291),
+ Box(6292, 6292),
+ Box(6293, 6293),
+ Box(6294, 6294),
+ Box(6295, 6295),
+ Box(6296, 6296),
+ Box(6297, 6297),
+ Box(6298, 6298),
+ Box(6299, 6299),
+ Box(6300, 6300),
+ Box(6301, 6301),
+ Box(6302, 6302),
+ Box(6303, 6303),
+ Box(6304, 6304),
+ Box(6305, 6305),
+ Box(6306, 6306),
+ Box(6307, 6307),
+ Box(6308, 6308),
+ Box(6309, 6309),
+ Box(6310, 6310),
+ Box(6311, 6311),
+ Box(6312, 6312),
+ Box(6313, 6313),
+ Box(6314, 6314),
+ Box(6315, 6315),
+ Box(6316, 6316),
+ Box(6317, 6317),
+ Box(6318, 6318),
+ Box(6319, 6319),
+ Box(6320, 6320),
+ Box(6321, 6321),
+ Box(6322, 6322),
+ Box(6323, 6323),
+ Box(6324, 6324),
+ Box(6325, 6325),
+ Box(6326, 6326),
+ Box(6327, 6327),
+ Box(6328, 6328),
+ Box(6329, 6329),
+ Box(6330, 6330),
+ Box(6331, 6331),
+ Box(6332, 6332),
+ Box(6333, 6333),
+ Box(6334, 6334),
+ Box(6335, 6335),
+ Box(6336, 6336),
+ Box(6337, 6337),
+ Box(6338, 6338),
+ Box(6339, 6339),
+ Box(6340, 6340),
+ Box(6341, 6341),
+ Box(6342, 6342),
+ Box(6343, 6343),
+ Box(6344, 6344),
+ Box(6345, 6345),
+ Box(6346, 6346),
+ Box(6347, 6347),
+ Box(6348, 6348),
+ Box(6349, 6349),
+ Box(6350, 6350),
+ Box(6351, 6351),
+ Box(6352, 6352),
+ Box(6353, 6353),
+ Box(6354, 6354),
+ Box(6355, 6355),
+ Box(6356, 6356),
+ Box(6357, 6357),
+ Box(6358, 6358),
+ Box(6359, 6359),
+ Box(6360, 6360),
+ Box(6361, 6361),
+ Box(6362, 6362),
+ Box(6363, 6363),
+ Box(6364, 6364),
+ Box(6365, 6365),
+ Box(6366, 6366),
+ Box(6367, 6367),
+ Box(6368, 6368),
+ Box(6369, 6369),
+ Box(6370, 6370),
+ Box(6371, 6371),
+ Box(6372, 6372),
+ Box(6373, 6373),
+ Box(6374, 6374),
+ Box(6375, 6375),
+ Box(6376, 6376),
+ Box(6377, 6377),
+ Box(6378, 6378),
+ Box(6379, 6379),
+ Box(6380, 6380),
+ Box(6381, 6381),
+ Box(6382, 6382),
+ Box(6383, 6383),
+ Box(6384, 6384),
+ Box(6385, 6385),
+ Box(6386, 6386),
+ Box(6387, 6387),
+ Box(6388, 6388),
+ Box(6389, 6389),
+ Box(6390, 6390),
+ Box(6391, 6391),
+ Box(6392, 6392),
+ Box(6393, 6393),
+ Box(6394, 6394),
+ Box(6395, 6395),
+ Box(6396, 6396),
+ Box(6397, 6397),
+ Box(6398, 6398),
+ Box(6399, 6399),
+ Box(6400, 6400),
+ Box(6401, 6401),
+ Box(6402, 6402),
+ Box(6403, 6403),
+ Box(6404, 6404),
+ Box(6405, 6405),
+ Box(6406, 6406),
+ Box(6407, 6407),
+ Box(6408, 6408),
+ Box(6409, 6409),
+ Box(6410, 6410),
+ Box(6411, 6411),
+ Box(6412, 6412),
+ Box(6413, 6413),
+ Box(6414, 6414),
+ Box(6415, 6415),
+ Box(6416, 6416),
+ Box(6417, 6417),
+ Box(6418, 6418),
+ Box(6419, 6419),
+ Box(6420, 6420),
+ Box(6421, 6421),
+ Box(6422, 6422),
+ Box(6423, 6423),
+ Box(6424, 6424),
+ Box(6425, 6425),
+ Box(6426, 6426),
+ Box(6427, 6427),
+ Box(6428, 6428),
+ Box(6429, 6429),
+ Box(6430, 6430),
+ Box(6431, 6431),
+ Box(6432, 6432),
+ Box(6433, 6433),
+ Box(6434, 6434),
+ Box(6435, 6435),
+ Box(6436, 6436),
+ Box(6437, 6437),
+ Box(6438, 6438),
+ Box(6439, 6439),
+ Box(6440, 6440),
+ Box(6441, 6441),
+ Box(6442, 6442),
+ Box(6443, 6443),
+ Box(6444, 6444),
+ Box(6445, 6445),
+ Box(6446, 6446),
+ Box(6447, 6447),
+ Box(6448, 6448),
+ Box(6449, 6449),
+ Box(6450, 6450),
+ Box(6451, 6451),
+ Box(6452, 6452),
+ Box(6453, 6453),
+ Box(6454, 6454),
+ Box(6455, 6455),
+ Box(6456, 6456),
+ Box(6457, 6457),
+ Box(6458, 6458),
+ Box(6459, 6459),
+ Box(6460, 6460),
+ Box(6461, 6461),
+ Box(6462, 6462),
+ Box(6463, 6463),
+ Box(6464, 6464),
+ Box(6465, 6465),
+ Box(6466, 6466),
+ Box(6467, 6467),
+ Box(6468, 6468),
+ Box(6469, 6469),
+ Box(6470, 6470),
+ Box(6471, 6471),
+ Box(6472, 6472),
+ Box(6473, 6473),
+ Box(6474, 6474),
+ Box(6475, 6475),
+ Box(6476, 6476),
+ Box(6477, 6477),
+ Box(6478, 6478),
+ Box(6479, 6479),
+ Box(6480, 6480),
+ Box(6481, 6481),
+ Box(6482, 6482),
+ Box(6483, 6483),
+ Box(6484, 6484),
+ Box(6485, 6485),
+ Box(6486, 6486),
+ Box(6487, 6487),
+ Box(6488, 6488),
+ Box(6489, 6489),
+ Box(6490, 6490),
+ Box(6491, 6491),
+ Box(6492, 6492),
+ Box(6493, 6493),
+ Box(6494, 6494),
+ Box(6495, 6495),
+ Box(6496, 6496),
+ Box(6497, 6497),
+ Box(6498, 6498),
+ Box(6499, 6499),
+ Box(6500, 6500),
+ Box(6501, 6501),
+ Box(6502, 6502),
+ Box(6503, 6503),
+ Box(6504, 6504),
+ Box(6505, 6505),
+ Box(6506, 6506),
+ Box(6507, 6507),
+ Box(6508, 6508),
+ Box(6509, 6509),
+ Box(6510, 6510),
+ Box(6511, 6511),
+ Box(6512, 6512),
+ Box(6513, 6513),
+ Box(6514, 6514),
+ Box(6515, 6515),
+ Box(6516, 6516),
+ Box(6517, 6517),
+ Box(6518, 6518),
+ Box(6519, 6519),
+ Box(6520, 6520),
+ Box(6521, 6521),
+ Box(6522, 6522),
+ Box(6523, 6523),
+ Box(6524, 6524),
+ Box(6525, 6525),
+ Box(6526, 6526),
+ Box(6527, 6527),
+ Box(6528, 6528),
+ Box(6529, 6529),
+ Box(6530, 6530),
+ Box(6531, 6531),
+ Box(6532, 6532),
+ Box(6533, 6533),
+ Box(6534, 6534),
+ Box(6535, 6535),
+ Box(6536, 6536),
+ Box(6537, 6537),
+ Box(6538, 6538),
+ Box(6539, 6539),
+ Box(6540, 6540),
+ Box(6541, 6541),
+ Box(6542, 6542),
+ Box(6543, 6543),
+ Box(6544, 6544),
+ Box(6545, 6545),
+ Box(6546, 6546),
+ Box(6547, 6547),
+ Box(6548, 6548),
+ Box(6549, 6549),
+ Box(6550, 6550),
+ Box(6551, 6551),
+ Box(6552, 6552),
+ Box(6553, 6553),
+ Box(6554, 6554),
+ Box(6555, 6555),
+ Box(6556, 6556),
+ Box(6557, 6557),
+ Box(6558, 6558),
+ Box(6559, 6559),
+ Box(6560, 6560),
+ Box(6561, 6561),
+ Box(6562, 6562),
+ Box(6563, 6563),
+ Box(6564, 6564),
+ Box(6565, 6565),
+ Box(6566, 6566),
+ Box(6567, 6567),
+ Box(6568, 6568),
+ Box(6569, 6569),
+ Box(6570, 6570),
+ Box(6571, 6571),
+ Box(6572, 6572),
+ Box(6573, 6573),
+ Box(6574, 6574),
+ Box(6575, 6575),
+ Box(6576, 6576),
+ Box(6577, 6577),
+ Box(6578, 6578),
+ Box(6579, 6579),
+ Box(6580, 6580),
+ Box(6581, 6581),
+ Box(6582, 6582),
+ Box(6583, 6583),
+ Box(6584, 6584),
+ Box(6585, 6585),
+ Box(6586, 6586),
+ Box(6587, 6587),
+ Box(6588, 6588),
+ Box(6589, 6589),
+ Box(6590, 6590),
+ Box(6591, 6591),
+ Box(6592, 6592),
+ Box(6593, 6593),
+ Box(6594, 6594),
+ Box(6595, 6595),
+ Box(6596, 6596),
+ Box(6597, 6597),
+ Box(6598, 6598),
+ Box(6599, 6599),
+ Box(6600, 6600),
+ Box(6601, 6601),
+ Box(6602, 6602),
+ Box(6603, 6603),
+ Box(6604, 6604),
+ Box(6605, 6605),
+ Box(6606, 6606),
+ Box(6607, 6607),
+ Box(6608, 6608),
+ Box(6609, 6609),
+ Box(6610, 6610),
+ Box(6611, 6611),
+ Box(6612, 6612),
+ Box(6613, 6613),
+ Box(6614, 6614),
+ Box(6615, 6615),
+ Box(6616, 6616),
+ Box(6617, 6617),
+ Box(6618, 6618),
+ Box(6619, 6619),
+ Box(6620, 6620),
+ Box(6621, 6621),
+ Box(6622, 6622),
+ Box(6623, 6623),
+ Box(6624, 6624),
+ Box(6625, 6625),
+ Box(6626, 6626),
+ Box(6627, 6627),
+ Box(6628, 6628),
+ Box(6629, 6629),
+ Box(6630, 6630),
+ Box(6631, 6631),
+ Box(6632, 6632),
+ Box(6633, 6633),
+ Box(6634, 6634),
+ Box(6635, 6635),
+ Box(6636, 6636),
+ Box(6637, 6637),
+ Box(6638, 6638),
+ Box(6639, 6639),
+ Box(6640, 6640),
+ Box(6641, 6641),
+ Box(6642, 6642),
+ Box(6643, 6643),
+ Box(6644, 6644),
+ Box(6645, 6645),
+ Box(6646, 6646),
+ Box(6647, 6647),
+ Box(6648, 6648),
+ Box(6649, 6649),
+ Box(6650, 6650),
+ Box(6651, 6651),
+ Box(6652, 6652),
+ Box(6653, 6653),
+ Box(6654, 6654),
+ Box(6655, 6655),
+ Box(6656, 6656),
+ Box(6657, 6657),
+ Box(6658, 6658),
+ Box(6659, 6659),
+ Box(6660, 6660),
+ Box(6661, 6661),
+ Box(6662, 6662),
+ Box(6663, 6663),
+ Box(6664, 6664),
+ Box(6665, 6665),
+ Box(6666, 6666),
+ Box(6667, 6667),
+ Box(6668, 6668),
+ Box(6669, 6669),
+ Box(6670, 6670),
+ Box(6671, 6671),
+ Box(6672, 6672),
+ Box(6673, 6673),
+ Box(6674, 6674),
+ Box(6675, 6675),
+ Box(6676, 6676),
+ Box(6677, 6677),
+ Box(6678, 6678),
+ Box(6679, 6679),
+ Box(6680, 6680),
+ Box(6681, 6681),
+ Box(6682, 6682),
+ Box(6683, 6683),
+ Box(6684, 6684),
+ Box(6685, 6685),
+ Box(6686, 6686),
+ Box(6687, 6687),
+ Box(6688, 6688),
+ Box(6689, 6689),
+ Box(6690, 6690),
+ Box(6691, 6691),
+ Box(6692, 6692),
+ Box(6693, 6693),
+ Box(6694, 6694),
+ Box(6695, 6695),
+ Box(6696, 6696),
+ Box(6697, 6697),
+ Box(6698, 6698),
+ Box(6699, 6699),
+ Box(6700, 6700),
+ Box(6701, 6701),
+ Box(6702, 6702),
+ Box(6703, 6703),
+ Box(6704, 6704),
+ Box(6705, 6705),
+ Box(6706, 6706),
+ Box(6707, 6707),
+ Box(6708, 6708),
+ Box(6709, 6709),
+ Box(6710, 6710),
+ Box(6711, 6711),
+ Box(6712, 6712),
+ Box(6713, 6713),
+ Box(6714, 6714),
+ Box(6715, 6715),
+ Box(6716, 6716),
+ Box(6717, 6717),
+ Box(6718, 6718),
+ Box(6719, 6719),
+ Box(6720, 6720),
+ Box(6721, 6721),
+ Box(6722, 6722),
+ Box(6723, 6723),
+ Box(6724, 6724),
+ Box(6725, 6725),
+ Box(6726, 6726),
+ Box(6727, 6727),
+ Box(6728, 6728),
+ Box(6729, 6729),
+ Box(6730, 6730),
+ Box(6731, 6731),
+ Box(6732, 6732),
+ Box(6733, 6733),
+ Box(6734, 6734),
+ Box(6735, 6735),
+ Box(6736, 6736),
+ Box(6737, 6737),
+ Box(6738, 6738),
+ Box(6739, 6739),
+ Box(6740, 6740),
+ Box(6741, 6741),
+ Box(6742, 6742),
+ Box(6743, 6743),
+ Box(6744, 6744),
+ Box(6745, 6745),
+ Box(6746, 6746),
+ Box(6747, 6747),
+ Box(6748, 6748),
+ Box(6749, 6749),
+ Box(6750, 6750),
+ Box(6751, 6751),
+ Box(6752, 6752),
+ Box(6753, 6753),
+ Box(6754, 6754),
+ Box(6755, 6755),
+ Box(6756, 6756),
+ Box(6757, 6757),
+ Box(6758, 6758),
+ Box(6759, 6759),
+ Box(6760, 6760),
+ Box(6761, 6761),
+ Box(6762, 6762),
+ Box(6763, 6763),
+ Box(6764, 6764),
+ Box(6765, 6765),
+ Box(6766, 6766),
+ Box(6767, 6767),
+ Box(6768, 6768),
+ Box(6769, 6769),
+ Box(6770, 6770),
+ Box(6771, 6771),
+ Box(6772, 6772),
+ Box(6773, 6773),
+ Box(6774, 6774),
+ Box(6775, 6775),
+ Box(6776, 6776),
+ Box(6777, 6777),
+ Box(6778, 6778),
+ Box(6779, 6779),
+ Box(6780, 6780),
+ Box(6781, 6781),
+ Box(6782, 6782),
+ Box(6783, 6783),
+ Box(6784, 6784),
+ Box(6785, 6785),
+ Box(6786, 6786),
+ Box(6787, 6787),
+ Box(6788, 6788),
+ Box(6789, 6789),
+ Box(6790, 6790),
+ Box(6791, 6791),
+ Box(6792, 6792),
+ Box(6793, 6793),
+ Box(6794, 6794),
+ Box(6795, 6795),
+ Box(6796, 6796),
+ Box(6797, 6797),
+ Box(6798, 6798),
+ Box(6799, 6799),
+ Box(6800, 6800),
+ Box(6801, 6801),
+ Box(6802, 6802),
+ Box(6803, 6803),
+ Box(6804, 6804),
+ Box(6805, 6805),
+ Box(6806, 6806),
+ Box(6807, 6807),
+ Box(6808, 6808),
+ Box(6809, 6809),
+ Box(6810, 6810),
+ Box(6811, 6811),
+ Box(6812, 6812),
+ Box(6813, 6813),
+ Box(6814, 6814),
+ Box(6815, 6815),
+ Box(6816, 6816),
+ Box(6817, 6817),
+ Box(6818, 6818),
+ Box(6819, 6819),
+ Box(6820, 6820),
+ Box(6821, 6821),
+ Box(6822, 6822),
+ Box(6823, 6823),
+ Box(6824, 6824),
+ Box(6825, 6825),
+ Box(6826, 6826),
+ Box(6827, 6827),
+ Box(6828, 6828),
+ Box(6829, 6829),
+ Box(6830, 6830),
+ Box(6831, 6831),
+ Box(6832, 6832),
+ Box(6833, 6833),
+ Box(6834, 6834),
+ Box(6835, 6835),
+ Box(6836, 6836),
+ Box(6837, 6837),
+ Box(6838, 6838),
+ Box(6839, 6839),
+ Box(6840, 6840),
+ Box(6841, 6841),
+ Box(6842, 6842),
+ Box(6843, 6843),
+ Box(6844, 6844),
+ Box(6845, 6845),
+ Box(6846, 6846),
+ Box(6847, 6847),
+ Box(6848, 6848),
+ Box(6849, 6849),
+ Box(6850, 6850),
+ Box(6851, 6851),
+ Box(6852, 6852),
+ Box(6853, 6853),
+ Box(6854, 6854),
+ Box(6855, 6855),
+ Box(6856, 6856),
+ Box(6857, 6857),
+ Box(6858, 6858),
+ Box(6859, 6859),
+ Box(6860, 6860),
+ Box(6861, 6861),
+ Box(6862, 6862),
+ Box(6863, 6863),
+ Box(6864, 6864),
+ Box(6865, 6865),
+ Box(6866, 6866),
+ Box(6867, 6867),
+ Box(6868, 6868),
+ Box(6869, 6869),
+ Box(6870, 6870),
+ Box(6871, 6871),
+ Box(6872, 6872),
+ Box(6873, 6873),
+ Box(6874, 6874),
+ Box(6875, 6875),
+ Box(6876, 6876),
+ Box(6877, 6877),
+ Box(6878, 6878),
+ Box(6879, 6879),
+ Box(6880, 6880),
+ Box(6881, 6881),
+ Box(6882, 6882),
+ Box(6883, 6883),
+ Box(6884, 6884),
+ Box(6885, 6885),
+ Box(6886, 6886),
+ Box(6887, 6887),
+ Box(6888, 6888),
+ Box(6889, 6889),
+ Box(6890, 6890),
+ Box(6891, 6891),
+ Box(6892, 6892),
+ Box(6893, 6893),
+ Box(6894, 6894),
+ Box(6895, 6895),
+ Box(6896, 6896),
+ Box(6897, 6897),
+ Box(6898, 6898),
+ Box(6899, 6899),
+ Box(6900, 6900),
+ Box(6901, 6901),
+ Box(6902, 6902),
+ Box(6903, 6903),
+ Box(6904, 6904),
+ Box(6905, 6905),
+ Box(6906, 6906),
+ Box(6907, 6907),
+ Box(6908, 6908),
+ Box(6909, 6909),
+ Box(6910, 6910),
+ Box(6911, 6911),
+ Box(6912, 6912),
+ Box(6913, 6913),
+ Box(6914, 6914),
+ Box(6915, 6915),
+ Box(6916, 6916),
+ Box(6917, 6917),
+ Box(6918, 6918),
+ Box(6919, 6919),
+ Box(6920, 6920),
+ Box(6921, 6921),
+ Box(6922, 6922),
+ Box(6923, 6923),
+ Box(6924, 6924),
+ Box(6925, 6925),
+ Box(6926, 6926),
+ Box(6927, 6927),
+ Box(6928, 6928),
+ Box(6929, 6929),
+ Box(6930, 6930),
+ Box(6931, 6931),
+ Box(6932, 6932),
+ Box(6933, 6933),
+ Box(6934, 6934),
+ Box(6935, 6935),
+ Box(6936, 6936),
+ Box(6937, 6937),
+ Box(6938, 6938),
+ Box(6939, 6939),
+ Box(6940, 6940),
+ Box(6941, 6941),
+ Box(6942, 6942),
+ Box(6943, 6943),
+ Box(6944, 6944),
+ Box(6945, 6945),
+ Box(6946, 6946),
+ Box(6947, 6947),
+ Box(6948, 6948),
+ Box(6949, 6949),
+ Box(6950, 6950),
+ Box(6951, 6951),
+ Box(6952, 6952),
+ Box(6953, 6953),
+ Box(6954, 6954),
+ Box(6955, 6955),
+ Box(6956, 6956),
+ Box(6957, 6957),
+ Box(6958, 6958),
+ Box(6959, 6959),
+ Box(6960, 6960),
+ Box(6961, 6961),
+ Box(6962, 6962),
+ Box(6963, 6963),
+ Box(6964, 6964),
+ Box(6965, 6965),
+ Box(6966, 6966),
+ Box(6967, 6967),
+ Box(6968, 6968),
+ Box(6969, 6969),
+ Box(6970, 6970),
+ Box(6971, 6971),
+ Box(6972, 6972),
+ Box(6973, 6973),
+ Box(6974, 6974),
+ Box(6975, 6975),
+ Box(6976, 6976),
+ Box(6977, 6977),
+ Box(6978, 6978),
+ Box(6979, 6979),
+ Box(6980, 6980),
+ Box(6981, 6981),
+ Box(6982, 6982),
+ Box(6983, 6983),
+ Box(6984, 6984),
+ Box(6985, 6985),
+ Box(6986, 6986),
+ Box(6987, 6987),
+ Box(6988, 6988),
+ Box(6989, 6989),
+ Box(6990, 6990),
+ Box(6991, 6991),
+ Box(6992, 6992),
+ Box(6993, 6993),
+ Box(6994, 6994),
+ Box(6995, 6995),
+ Box(6996, 6996),
+ Box(6997, 6997),
+ Box(6998, 6998),
+ Box(6999, 6999),
+ Box(7000, 7000),
+ Box(7001, 7001),
+ Box(7002, 7002),
+ Box(7003, 7003),
+ Box(7004, 7004),
+ Box(7005, 7005),
+ Box(7006, 7006),
+ Box(7007, 7007),
+ Box(7008, 7008),
+ Box(7009, 7009),
+ Box(7010, 7010),
+ Box(7011, 7011),
+ Box(7012, 7012),
+ Box(7013, 7013),
+ Box(7014, 7014),
+ Box(7015, 7015),
+ Box(7016, 7016),
+ Box(7017, 7017),
+ Box(7018, 7018),
+ Box(7019, 7019),
+ Box(7020, 7020),
+ Box(7021, 7021),
+ Box(7022, 7022),
+ Box(7023, 7023),
+ Box(7024, 7024),
+ Box(7025, 7025),
+ Box(7026, 7026),
+ Box(7027, 7027),
+ Box(7028, 7028),
+ Box(7029, 7029),
+ Box(7030, 7030),
+ Box(7031, 7031),
+ Box(7032, 7032),
+ Box(7033, 7033),
+ Box(7034, 7034),
+ Box(7035, 7035),
+ Box(7036, 7036),
+ Box(7037, 7037),
+ Box(7038, 7038),
+ Box(7039, 7039),
+ Box(7040, 7040),
+ Box(7041, 7041),
+ Box(7042, 7042),
+ Box(7043, 7043),
+ Box(7044, 7044),
+ Box(7045, 7045),
+ Box(7046, 7046),
+ Box(7047, 7047),
+ Box(7048, 7048),
+ Box(7049, 7049),
+ Box(7050, 7050),
+ Box(7051, 7051),
+ Box(7052, 7052),
+ Box(7053, 7053),
+ Box(7054, 7054),
+ Box(7055, 7055),
+ Box(7056, 7056),
+ Box(7057, 7057),
+ Box(7058, 7058),
+ Box(7059, 7059),
+ Box(7060, 7060),
+ Box(7061, 7061),
+ Box(7062, 7062),
+ Box(7063, 7063),
+ Box(7064, 7064),
+ Box(7065, 7065),
+ Box(7066, 7066),
+ Box(7067, 7067),
+ Box(7068, 7068),
+ Box(7069, 7069),
+ Box(7070, 7070),
+ Box(7071, 7071),
+ Box(7072, 7072),
+ Box(7073, 7073),
+ Box(7074, 7074),
+ Box(7075, 7075),
+ Box(7076, 7076),
+ Box(7077, 7077),
+ Box(7078, 7078),
+ Box(7079, 7079),
+ Box(7080, 7080),
+ Box(7081, 7081),
+ Box(7082, 7082),
+ Box(7083, 7083),
+ Box(7084, 7084),
+ Box(7085, 7085),
+ Box(7086, 7086),
+ Box(7087, 7087),
+ Box(7088, 7088),
+ Box(7089, 7089),
+ Box(7090, 7090),
+ Box(7091, 7091),
+ Box(7092, 7092),
+ Box(7093, 7093),
+ Box(7094, 7094),
+ Box(7095, 7095),
+ Box(7096, 7096),
+ Box(7097, 7097),
+ Box(7098, 7098),
+ Box(7099, 7099),
+ Box(7100, 7100),
+ Box(7101, 7101),
+ Box(7102, 7102),
+ Box(7103, 7103),
+ Box(7104, 7104),
+ Box(7105, 7105),
+ Box(7106, 7106),
+ Box(7107, 7107),
+ Box(7108, 7108),
+ Box(7109, 7109),
+ Box(7110, 7110),
+ Box(7111, 7111),
+ Box(7112, 7112),
+ Box(7113, 7113),
+ Box(7114, 7114),
+ Box(7115, 7115),
+ Box(7116, 7116),
+ Box(7117, 7117),
+ Box(7118, 7118),
+ Box(7119, 7119),
+ Box(7120, 7120),
+ Box(7121, 7121),
+ Box(7122, 7122),
+ Box(7123, 7123),
+ Box(7124, 7124),
+ Box(7125, 7125),
+ Box(7126, 7126),
+ Box(7127, 7127),
+ Box(7128, 7128),
+ Box(7129, 7129),
+ Box(7130, 7130),
+ Box(7131, 7131),
+ Box(7132, 7132),
+ Box(7133, 7133),
+ Box(7134, 7134),
+ Box(7135, 7135),
+ Box(7136, 7136),
+ Box(7137, 7137),
+ Box(7138, 7138),
+ Box(7139, 7139),
+ Box(7140, 7140),
+ Box(7141, 7141),
+ Box(7142, 7142),
+ Box(7143, 7143),
+ Box(7144, 7144),
+ Box(7145, 7145),
+ Box(7146, 7146),
+ Box(7147, 7147),
+ Box(7148, 7148),
+ Box(7149, 7149),
+ Box(7150, 7150),
+ Box(7151, 7151),
+ Box(7152, 7152),
+ Box(7153, 7153),
+ Box(7154, 7154),
+ Box(7155, 7155),
+ Box(7156, 7156),
+ Box(7157, 7157),
+ Box(7158, 7158),
+ Box(7159, 7159),
+ Box(7160, 7160),
+ Box(7161, 7161),
+ Box(7162, 7162),
+ Box(7163, 7163),
+ Box(7164, 7164),
+ Box(7165, 7165),
+ Box(7166, 7166),
+ Box(7167, 7167),
+ Box(7168, 7168),
+ Box(7169, 7169),
+ Box(7170, 7170),
+ Box(7171, 7171),
+ Box(7172, 7172),
+ Box(7173, 7173),
+ Box(7174, 7174),
+ Box(7175, 7175),
+ Box(7176, 7176),
+ Box(7177, 7177),
+ Box(7178, 7178),
+ Box(7179, 7179),
+ Box(7180, 7180),
+ Box(7181, 7181),
+ Box(7182, 7182),
+ Box(7183, 7183),
+ Box(7184, 7184),
+ Box(7185, 7185),
+ Box(7186, 7186),
+ Box(7187, 7187),
+ Box(7188, 7188),
+ Box(7189, 7189),
+ Box(7190, 7190),
+ Box(7191, 7191),
+ Box(7192, 7192),
+ Box(7193, 7193),
+ Box(7194, 7194),
+ Box(7195, 7195),
+ Box(7196, 7196),
+ Box(7197, 7197),
+ Box(7198, 7198),
+ Box(7199, 7199),
+ Box(7200, 7200),
+ Box(7201, 7201),
+ Box(7202, 7202),
+ Box(7203, 7203),
+ Box(7204, 7204),
+ Box(7205, 7205),
+ Box(7206, 7206),
+ Box(7207, 7207),
+ Box(7208, 7208),
+ Box(7209, 7209),
+ Box(7210, 7210),
+ Box(7211, 7211),
+ Box(7212, 7212),
+ Box(7213, 7213),
+ Box(7214, 7214),
+ Box(7215, 7215),
+ Box(7216, 7216),
+ Box(7217, 7217),
+ Box(7218, 7218),
+ Box(7219, 7219),
+ Box(7220, 7220),
+ Box(7221, 7221),
+ Box(7222, 7222),
+ Box(7223, 7223),
+ Box(7224, 7224),
+ Box(7225, 7225),
+ Box(7226, 7226),
+ Box(7227, 7227),
+ Box(7228, 7228),
+ Box(7229, 7229),
+ Box(7230, 7230),
+ Box(7231, 7231),
+ Box(7232, 7232),
+ Box(7233, 7233),
+ Box(7234, 7234),
+ Box(7235, 7235),
+ Box(7236, 7236),
+ Box(7237, 7237),
+ Box(7238, 7238),
+ Box(7239, 7239),
+ Box(7240, 7240),
+ Box(7241, 7241),
+ Box(7242, 7242),
+ Box(7243, 7243),
+ Box(7244, 7244),
+ Box(7245, 7245),
+ Box(7246, 7246),
+ Box(7247, 7247),
+ Box(7248, 7248),
+ Box(7249, 7249),
+ Box(7250, 7250),
+ Box(7251, 7251),
+ Box(7252, 7252),
+ Box(7253, 7253),
+ Box(7254, 7254),
+ Box(7255, 7255),
+ Box(7256, 7256),
+ Box(7257, 7257),
+ Box(7258, 7258),
+ Box(7259, 7259),
+ Box(7260, 7260),
+ Box(7261, 7261),
+ Box(7262, 7262),
+ Box(7263, 7263),
+ Box(7264, 7264),
+ Box(7265, 7265),
+ Box(7266, 7266),
+ Box(7267, 7267),
+ Box(7268, 7268),
+ Box(7269, 7269),
+ Box(7270, 7270),
+ Box(7271, 7271),
+ Box(7272, 7272),
+ Box(7273, 7273),
+ Box(7274, 7274),
+ Box(7275, 7275),
+ Box(7276, 7276),
+ Box(7277, 7277),
+ Box(7278, 7278),
+ Box(7279, 7279),
+ Box(7280, 7280),
+ Box(7281, 7281),
+ Box(7282, 7282),
+ Box(7283, 7283),
+ Box(7284, 7284),
+ Box(7285, 7285),
+ Box(7286, 7286),
+ Box(7287, 7287),
+ Box(7288, 7288),
+ Box(7289, 7289),
+ Box(7290, 7290),
+ Box(7291, 7291),
+ Box(7292, 7292),
+ Box(7293, 7293),
+ Box(7294, 7294),
+ Box(7295, 7295),
+ Box(7296, 7296),
+ Box(7297, 7297),
+ Box(7298, 7298),
+ Box(7299, 7299),
+ Box(7300, 7300),
+ Box(7301, 7301),
+ Box(7302, 7302),
+ Box(7303, 7303),
+ Box(7304, 7304),
+ Box(7305, 7305),
+ Box(7306, 7306),
+ Box(7307, 7307),
+ Box(7308, 7308),
+ Box(7309, 7309),
+ Box(7310, 7310),
+ Box(7311, 7311),
+ Box(7312, 7312),
+ Box(7313, 7313),
+ Box(7314, 7314),
+ Box(7315, 7315),
+ Box(7316, 7316),
+ Box(7317, 7317),
+ Box(7318, 7318),
+ Box(7319, 7319),
+ Box(7320, 7320),
+ Box(7321, 7321),
+ Box(7322, 7322),
+ Box(7323, 7323),
+ Box(7324, 7324),
+ Box(7325, 7325),
+ Box(7326, 7326),
+ Box(7327, 7327),
+ Box(7328, 7328),
+ Box(7329, 7329),
+ Box(7330, 7330),
+ Box(7331, 7331),
+ Box(7332, 7332),
+ Box(7333, 7333),
+ Box(7334, 7334),
+ Box(7335, 7335),
+ Box(7336, 7336),
+ Box(7337, 7337),
+ Box(7338, 7338),
+ Box(7339, 7339),
+ Box(7340, 7340),
+ Box(7341, 7341),
+ Box(7342, 7342),
+ Box(7343, 7343),
+ Box(7344, 7344),
+ Box(7345, 7345),
+ Box(7346, 7346),
+ Box(7347, 7347),
+ Box(7348, 7348),
+ Box(7349, 7349),
+ Box(7350, 7350),
+ Box(7351, 7351),
+ Box(7352, 7352),
+ Box(7353, 7353),
+ Box(7354, 7354),
+ Box(7355, 7355),
+ Box(7356, 7356),
+ Box(7357, 7357),
+ Box(7358, 7358),
+ Box(7359, 7359),
+ Box(7360, 7360),
+ Box(7361, 7361),
+ Box(7362, 7362),
+ Box(7363, 7363),
+ Box(7364, 7364),
+ Box(7365, 7365),
+ Box(7366, 7366),
+ Box(7367, 7367),
+ Box(7368, 7368),
+ Box(7369, 7369),
+ Box(7370, 7370),
+ Box(7371, 7371),
+ Box(7372, 7372),
+ Box(7373, 7373),
+ Box(7374, 7374),
+ Box(7375, 7375),
+ Box(7376, 7376),
+ Box(7377, 7377),
+ Box(7378, 7378),
+ Box(7379, 7379),
+ Box(7380, 7380),
+ Box(7381, 7381),
+ Box(7382, 7382),
+ Box(7383, 7383),
+ Box(7384, 7384),
+ Box(7385, 7385),
+ Box(7386, 7386),
+ Box(7387, 7387),
+ Box(7388, 7388),
+ Box(7389, 7389),
+ Box(7390, 7390),
+ Box(7391, 7391),
+ Box(7392, 7392),
+ Box(7393, 7393),
+ Box(7394, 7394),
+ Box(7395, 7395),
+ Box(7396, 7396),
+ Box(7397, 7397),
+ Box(7398, 7398),
+ Box(7399, 7399),
+ Box(7400, 7400),
+ Box(7401, 7401),
+ Box(7402, 7402),
+ Box(7403, 7403),
+ Box(7404, 7404),
+ Box(7405, 7405),
+ Box(7406, 7406),
+ Box(7407, 7407),
+ Box(7408, 7408),
+ Box(7409, 7409),
+ Box(7410, 7410),
+ Box(7411, 7411),
+ Box(7412, 7412),
+ Box(7413, 7413),
+ Box(7414, 7414),
+ Box(7415, 7415),
+ Box(7416, 7416),
+ Box(7417, 7417),
+ Box(7418, 7418),
+ Box(7419, 7419),
+ Box(7420, 7420),
+ Box(7421, 7421),
+ Box(7422, 7422),
+ Box(7423, 7423),
+ Box(7424, 7424),
+ Box(7425, 7425),
+ Box(7426, 7426),
+ Box(7427, 7427),
+ Box(7428, 7428),
+ Box(7429, 7429),
+ Box(7430, 7430),
+ Box(7431, 7431),
+ Box(7432, 7432),
+ Box(7433, 7433),
+ Box(7434, 7434),
+ Box(7435, 7435),
+ Box(7436, 7436),
+ Box(7437, 7437),
+ Box(7438, 7438),
+ Box(7439, 7439),
+ Box(7440, 7440),
+ Box(7441, 7441),
+ Box(7442, 7442),
+ Box(7443, 7443),
+ Box(7444, 7444),
+ Box(7445, 7445),
+ Box(7446, 7446),
+ Box(7447, 7447),
+ Box(7448, 7448),
+ Box(7449, 7449),
+ Box(7450, 7450),
+ Box(7451, 7451),
+ Box(7452, 7452),
+ Box(7453, 7453),
+ Box(7454, 7454),
+ Box(7455, 7455),
+ Box(7456, 7456),
+ Box(7457, 7457),
+ Box(7458, 7458),
+ Box(7459, 7459),
+ Box(7460, 7460),
+ Box(7461, 7461),
+ Box(7462, 7462),
+ Box(7463, 7463),
+ Box(7464, 7464),
+ Box(7465, 7465),
+ Box(7466, 7466),
+ Box(7467, 7467),
+ Box(7468, 7468),
+ Box(7469, 7469),
+ Box(7470, 7470),
+ Box(7471, 7471),
+ Box(7472, 7472),
+ Box(7473, 7473),
+ Box(7474, 7474),
+ Box(7475, 7475),
+ Box(7476, 7476),
+ Box(7477, 7477),
+ Box(7478, 7478),
+ Box(7479, 7479),
+ Box(7480, 7480),
+ Box(7481, 7481),
+ Box(7482, 7482),
+ Box(7483, 7483),
+ Box(7484, 7484),
+ Box(7485, 7485),
+ Box(7486, 7486),
+ Box(7487, 7487),
+ Box(7488, 7488),
+ Box(7489, 7489),
+ Box(7490, 7490),
+ Box(7491, 7491),
+ Box(7492, 7492),
+ Box(7493, 7493),
+ Box(7494, 7494),
+ Box(7495, 7495),
+ Box(7496, 7496),
+ Box(7497, 7497),
+ Box(7498, 7498),
+ Box(7499, 7499),
+ Box(7500, 7500),
+ Box(7501, 7501),
+ Box(7502, 7502),
+ Box(7503, 7503),
+ Box(7504, 7504),
+ Box(7505, 7505),
+ Box(7506, 7506),
+ Box(7507, 7507),
+ Box(7508, 7508),
+ Box(7509, 7509),
+ Box(7510, 7510),
+ Box(7511, 7511),
+ Box(7512, 7512),
+ Box(7513, 7513),
+ Box(7514, 7514),
+ Box(7515, 7515),
+ Box(7516, 7516),
+ Box(7517, 7517),
+ Box(7518, 7518),
+ Box(7519, 7519),
+ Box(7520, 7520),
+ Box(7521, 7521),
+ Box(7522, 7522),
+ Box(7523, 7523),
+ Box(7524, 7524),
+ Box(7525, 7525),
+ Box(7526, 7526),
+ Box(7527, 7527),
+ Box(7528, 7528),
+ Box(7529, 7529),
+ Box(7530, 7530),
+ Box(7531, 7531),
+ Box(7532, 7532),
+ Box(7533, 7533),
+ Box(7534, 7534),
+ Box(7535, 7535),
+ Box(7536, 7536),
+ Box(7537, 7537),
+ Box(7538, 7538),
+ Box(7539, 7539),
+ Box(7540, 7540),
+ Box(7541, 7541),
+ Box(7542, 7542),
+ Box(7543, 7543),
+ Box(7544, 7544),
+ Box(7545, 7545),
+ Box(7546, 7546),
+ Box(7547, 7547),
+ Box(7548, 7548),
+ Box(7549, 7549),
+ Box(7550, 7550),
+ Box(7551, 7551),
+ Box(7552, 7552),
+ Box(7553, 7553),
+ Box(7554, 7554),
+ Box(7555, 7555),
+ Box(7556, 7556),
+ Box(7557, 7557),
+ Box(7558, 7558),
+ Box(7559, 7559),
+ Box(7560, 7560),
+ Box(7561, 7561),
+ Box(7562, 7562),
+ Box(7563, 7563),
+ Box(7564, 7564),
+ Box(7565, 7565),
+ Box(7566, 7566),
+ Box(7567, 7567),
+ Box(7568, 7568),
+ Box(7569, 7569),
+ Box(7570, 7570),
+ Box(7571, 7571),
+ Box(7572, 7572),
+ Box(7573, 7573),
+ Box(7574, 7574),
+ Box(7575, 7575),
+ Box(7576, 7576),
+ Box(7577, 7577),
+ Box(7578, 7578),
+ Box(7579, 7579),
+ Box(7580, 7580),
+ Box(7581, 7581),
+ Box(7582, 7582),
+ Box(7583, 7583),
+ Box(7584, 7584),
+ Box(7585, 7585),
+ Box(7586, 7586),
+ Box(7587, 7587),
+ Box(7588, 7588),
+ Box(7589, 7589),
+ Box(7590, 7590),
+ Box(7591, 7591),
+ Box(7592, 7592),
+ Box(7593, 7593),
+ Box(7594, 7594),
+ Box(7595, 7595),
+ Box(7596, 7596),
+ Box(7597, 7597),
+ Box(7598, 7598),
+ Box(7599, 7599),
+ Box(7600, 7600),
+ Box(7601, 7601),
+ Box(7602, 7602),
+ Box(7603, 7603),
+ Box(7604, 7604),
+ Box(7605, 7605),
+ Box(7606, 7606),
+ Box(7607, 7607),
+ Box(7608, 7608),
+ Box(7609, 7609),
+ Box(7610, 7610),
+ Box(7611, 7611),
+ Box(7612, 7612),
+ Box(7613, 7613),
+ Box(7614, 7614),
+ Box(7615, 7615),
+ Box(7616, 7616),
+ Box(7617, 7617),
+ Box(7618, 7618),
+ Box(7619, 7619),
+ Box(7620, 7620),
+ Box(7621, 7621),
+ Box(7622, 7622),
+ Box(7623, 7623),
+ Box(7624, 7624),
+ Box(7625, 7625),
+ Box(7626, 7626),
+ Box(7627, 7627),
+ Box(7628, 7628),
+ Box(7629, 7629),
+ Box(7630, 7630),
+ Box(7631, 7631),
+ Box(7632, 7632),
+ Box(7633, 7633),
+ Box(7634, 7634),
+ Box(7635, 7635),
+ Box(7636, 7636),
+ Box(7637, 7637),
+ Box(7638, 7638),
+ Box(7639, 7639),
+ Box(7640, 7640),
+ Box(7641, 7641),
+ Box(7642, 7642),
+ Box(7643, 7643),
+ Box(7644, 7644),
+ Box(7645, 7645),
+ Box(7646, 7646),
+ Box(7647, 7647),
+ Box(7648, 7648),
+ Box(7649, 7649),
+ Box(7650, 7650),
+ Box(7651, 7651),
+ Box(7652, 7652),
+ Box(7653, 7653),
+ Box(7654, 7654),
+ Box(7655, 7655),
+ Box(7656, 7656),
+ Box(7657, 7657),
+ Box(7658, 7658),
+ Box(7659, 7659),
+ Box(7660, 7660),
+ Box(7661, 7661),
+ Box(7662, 7662),
+ Box(7663, 7663),
+ Box(7664, 7664),
+ Box(7665, 7665),
+ Box(7666, 7666),
+ Box(7667, 7667),
+ Box(7668, 7668),
+ Box(7669, 7669),
+ Box(7670, 7670),
+ Box(7671, 7671),
+ Box(7672, 7672),
+ Box(7673, 7673),
+ Box(7674, 7674),
+ Box(7675, 7675),
+ Box(7676, 7676),
+ Box(7677, 7677),
+ Box(7678, 7678),
+ Box(7679, 7679),
+ Box(7680, 7680),
+ Box(7681, 7681),
+ Box(7682, 7682),
+ Box(7683, 7683),
+ Box(7684, 7684),
+ Box(7685, 7685),
+ Box(7686, 7686),
+ Box(7687, 7687),
+ Box(7688, 7688),
+ Box(7689, 7689),
+ Box(7690, 7690),
+ Box(7691, 7691),
+ Box(7692, 7692),
+ Box(7693, 7693),
+ Box(7694, 7694),
+ Box(7695, 7695),
+ Box(7696, 7696),
+ Box(7697, 7697),
+ Box(7698, 7698),
+ Box(7699, 7699),
+ Box(7700, 7700),
+ Box(7701, 7701),
+ Box(7702, 7702),
+ Box(7703, 7703),
+ Box(7704, 7704),
+ Box(7705, 7705),
+ Box(7706, 7706),
+ Box(7707, 7707),
+ Box(7708, 7708),
+ Box(7709, 7709),
+ Box(7710, 7710),
+ Box(7711, 7711),
+ Box(7712, 7712),
+ Box(7713, 7713),
+ Box(7714, 7714),
+ Box(7715, 7715),
+ Box(7716, 7716),
+ Box(7717, 7717),
+ Box(7718, 7718),
+ Box(7719, 7719),
+ Box(7720, 7720),
+ Box(7721, 7721),
+ Box(7722, 7722),
+ Box(7723, 7723),
+ Box(7724, 7724),
+ Box(7725, 7725),
+ Box(7726, 7726),
+ Box(7727, 7727),
+ Box(7728, 7728),
+ Box(7729, 7729),
+ Box(7730, 7730),
+ Box(7731, 7731),
+ Box(7732, 7732),
+ Box(7733, 7733),
+ Box(7734, 7734),
+ Box(7735, 7735),
+ Box(7736, 7736),
+ Box(7737, 7737),
+ Box(7738, 7738),
+ Box(7739, 7739),
+ Box(7740, 7740),
+ Box(7741, 7741),
+ Box(7742, 7742),
+ Box(7743, 7743),
+ Box(7744, 7744),
+ Box(7745, 7745),
+ Box(7746, 7746),
+ Box(7747, 7747),
+ Box(7748, 7748),
+ Box(7749, 7749),
+ Box(7750, 7750),
+ Box(7751, 7751),
+ Box(7752, 7752),
+ Box(7753, 7753),
+ Box(7754, 7754),
+ Box(7755, 7755),
+ Box(7756, 7756),
+ Box(7757, 7757),
+ Box(7758, 7758),
+ Box(7759, 7759),
+ Box(7760, 7760),
+ Box(7761, 7761),
+ Box(7762, 7762),
+ Box(7763, 7763),
+ Box(7764, 7764),
+ Box(7765, 7765),
+ Box(7766, 7766),
+ Box(7767, 7767),
+ Box(7768, 7768),
+ Box(7769, 7769),
+ Box(7770, 7770),
+ Box(7771, 7771),
+ Box(7772, 7772),
+ Box(7773, 7773),
+ Box(7774, 7774),
+ Box(7775, 7775),
+ Box(7776, 7776),
+ Box(7777, 7777),
+ Box(7778, 7778),
+ Box(7779, 7779),
+ Box(7780, 7780),
+ Box(7781, 7781),
+ Box(7782, 7782),
+ Box(7783, 7783),
+ Box(7784, 7784),
+ Box(7785, 7785),
+ Box(7786, 7786),
+ Box(7787, 7787),
+ Box(7788, 7788),
+ Box(7789, 7789),
+ Box(7790, 7790),
+ Box(7791, 7791),
+ Box(7792, 7792),
+ Box(7793, 7793),
+ Box(7794, 7794),
+ Box(7795, 7795),
+ Box(7796, 7796),
+ Box(7797, 7797),
+ Box(7798, 7798),
+ Box(7799, 7799),
+ Box(7800, 7800),
+ Box(7801, 7801),
+ Box(7802, 7802),
+ Box(7803, 7803),
+ Box(7804, 7804),
+ Box(7805, 7805),
+ Box(7806, 7806),
+ Box(7807, 7807),
+ Box(7808, 7808),
+ Box(7809, 7809),
+ Box(7810, 7810),
+ Box(7811, 7811),
+ Box(7812, 7812),
+ Box(7813, 7813),
+ Box(7814, 7814),
+ Box(7815, 7815),
+ Box(7816, 7816),
+ Box(7817, 7817),
+ Box(7818, 7818),
+ Box(7819, 7819),
+ Box(7820, 7820),
+ Box(7821, 7821),
+ Box(7822, 7822),
+ Box(7823, 7823),
+ Box(7824, 7824),
+ Box(7825, 7825),
+ Box(7826, 7826),
+ Box(7827, 7827),
+ Box(7828, 7828),
+ Box(7829, 7829),
+ Box(7830, 7830),
+ Box(7831, 7831),
+ Box(7832, 7832),
+ Box(7833, 7833),
+ Box(7834, 7834),
+ Box(7835, 7835),
+ Box(7836, 7836),
+ Box(7837, 7837),
+ Box(7838, 7838),
+ Box(7839, 7839),
+ Box(7840, 7840),
+ Box(7841, 7841),
+ Box(7842, 7842),
+ Box(7843, 7843),
+ Box(7844, 7844),
+ Box(7845, 7845),
+ Box(7846, 7846),
+ Box(7847, 7847),
+ Box(7848, 7848),
+ Box(7849, 7849),
+ Box(7850, 7850),
+ Box(7851, 7851),
+ Box(7852, 7852),
+ Box(7853, 7853),
+ Box(7854, 7854),
+ Box(7855, 7855),
+ Box(7856, 7856),
+ Box(7857, 7857),
+ Box(7858, 7858),
+ Box(7859, 7859),
+ Box(7860, 7860),
+ Box(7861, 7861),
+ Box(7862, 7862),
+ Box(7863, 7863),
+ Box(7864, 7864),
+ Box(7865, 7865),
+ Box(7866, 7866),
+ Box(7867, 7867),
+ Box(7868, 7868),
+ Box(7869, 7869),
+ Box(7870, 7870),
+ Box(7871, 7871),
+ Box(7872, 7872),
+ Box(7873, 7873),
+ Box(7874, 7874),
+ Box(7875, 7875),
+ Box(7876, 7876),
+ Box(7877, 7877),
+ Box(7878, 7878),
+ Box(7879, 7879),
+ Box(7880, 7880),
+ Box(7881, 7881),
+ Box(7882, 7882),
+ Box(7883, 7883),
+ Box(7884, 7884),
+ Box(7885, 7885),
+ Box(7886, 7886),
+ Box(7887, 7887),
+ Box(7888, 7888),
+ Box(7889, 7889),
+ Box(7890, 7890),
+ Box(7891, 7891),
+ Box(7892, 7892),
+ Box(7893, 7893),
+ Box(7894, 7894),
+ Box(7895, 7895),
+ Box(7896, 7896),
+ Box(7897, 7897),
+ Box(7898, 7898),
+ Box(7899, 7899),
+ Box(7900, 7900),
+ Box(7901, 7901),
+ Box(7902, 7902),
+ Box(7903, 7903),
+ Box(7904, 7904),
+ Box(7905, 7905),
+ Box(7906, 7906),
+ Box(7907, 7907),
+ Box(7908, 7908),
+ Box(7909, 7909),
+ Box(7910, 7910),
+ Box(7911, 7911),
+ Box(7912, 7912),
+ Box(7913, 7913),
+ Box(7914, 7914),
+ Box(7915, 7915),
+ Box(7916, 7916),
+ Box(7917, 7917),
+ Box(7918, 7918),
+ Box(7919, 7919),
+ Box(7920, 7920),
+ Box(7921, 7921),
+ Box(7922, 7922),
+ Box(7923, 7923),
+ Box(7924, 7924),
+ Box(7925, 7925),
+ Box(7926, 7926),
+ Box(7927, 7927),
+ Box(7928, 7928),
+ Box(7929, 7929),
+ Box(7930, 7930),
+ Box(7931, 7931),
+ Box(7932, 7932),
+ Box(7933, 7933),
+ Box(7934, 7934),
+ Box(7935, 7935),
+ Box(7936, 7936),
+ Box(7937, 7937),
+ Box(7938, 7938),
+ Box(7939, 7939),
+ Box(7940, 7940),
+ Box(7941, 7941),
+ Box(7942, 7942),
+ Box(7943, 7943),
+ Box(7944, 7944),
+ Box(7945, 7945),
+ Box(7946, 7946),
+ Box(7947, 7947),
+ Box(7948, 7948),
+ Box(7949, 7949),
+ Box(7950, 7950),
+ Box(7951, 7951),
+ Box(7952, 7952),
+ Box(7953, 7953),
+ Box(7954, 7954),
+ Box(7955, 7955),
+ Box(7956, 7956),
+ Box(7957, 7957),
+ Box(7958, 7958),
+ Box(7959, 7959),
+ Box(7960, 7960),
+ Box(7961, 7961),
+ Box(7962, 7962),
+ Box(7963, 7963),
+ Box(7964, 7964),
+ Box(7965, 7965),
+ Box(7966, 7966),
+ Box(7967, 7967),
+ Box(7968, 7968),
+ Box(7969, 7969),
+ Box(7970, 7970),
+ Box(7971, 7971),
+ Box(7972, 7972),
+ Box(7973, 7973),
+ Box(7974, 7974),
+ Box(7975, 7975),
+ Box(7976, 7976),
+ Box(7977, 7977),
+ Box(7978, 7978),
+ Box(7979, 7979),
+ Box(7980, 7980),
+ Box(7981, 7981),
+ Box(7982, 7982),
+ Box(7983, 7983),
+ Box(7984, 7984),
+ Box(7985, 7985),
+ Box(7986, 7986),
+ Box(7987, 7987),
+ Box(7988, 7988),
+ Box(7989, 7989),
+ Box(7990, 7990),
+ Box(7991, 7991),
+ Box(7992, 7992),
+ Box(7993, 7993),
+ Box(7994, 7994),
+ Box(7995, 7995),
+ Box(7996, 7996),
+ Box(7997, 7997),
+ Box(7998, 7998),
+ Box(7999, 7999),
+ Box(8000, 8000),
+ Box(8001, 8001),
+ Box(8002, 8002),
+ Box(8003, 8003),
+ Box(8004, 8004),
+ Box(8005, 8005),
+ Box(8006, 8006),
+ Box(8007, 8007),
+ Box(8008, 8008),
+ Box(8009, 8009),
+ Box(8010, 8010),
+ Box(8011, 8011),
+ Box(8012, 8012),
+ Box(8013, 8013),
+ Box(8014, 8014),
+ Box(8015, 8015),
+ Box(8016, 8016),
+ Box(8017, 8017),
+ Box(8018, 8018),
+ Box(8019, 8019),
+ Box(8020, 8020),
+ Box(8021, 8021),
+ Box(8022, 8022),
+ Box(8023, 8023),
+ Box(8024, 8024),
+ Box(8025, 8025),
+ Box(8026, 8026),
+ Box(8027, 8027),
+ Box(8028, 8028),
+ Box(8029, 8029),
+ Box(8030, 8030),
+ Box(8031, 8031),
+ Box(8032, 8032),
+ Box(8033, 8033),
+ Box(8034, 8034),
+ Box(8035, 8035),
+ Box(8036, 8036),
+ Box(8037, 8037),
+ Box(8038, 8038),
+ Box(8039, 8039),
+ Box(8040, 8040),
+ Box(8041, 8041),
+ Box(8042, 8042),
+ Box(8043, 8043),
+ Box(8044, 8044),
+ Box(8045, 8045),
+ Box(8046, 8046),
+ Box(8047, 8047),
+ Box(8048, 8048),
+ Box(8049, 8049),
+ Box(8050, 8050),
+ Box(8051, 8051),
+ Box(8052, 8052),
+ Box(8053, 8053),
+ Box(8054, 8054),
+ Box(8055, 8055),
+ Box(8056, 8056),
+ Box(8057, 8057),
+ Box(8058, 8058),
+ Box(8059, 8059),
+ Box(8060, 8060),
+ Box(8061, 8061),
+ Box(8062, 8062),
+ Box(8063, 8063),
+ Box(8064, 8064),
+ Box(8065, 8065),
+ Box(8066, 8066),
+ Box(8067, 8067),
+ Box(8068, 8068),
+ Box(8069, 8069),
+ Box(8070, 8070),
+ Box(8071, 8071),
+ Box(8072, 8072),
+ Box(8073, 8073),
+ Box(8074, 8074),
+ Box(8075, 8075),
+ Box(8076, 8076),
+ Box(8077, 8077),
+ Box(8078, 8078),
+ Box(8079, 8079),
+ Box(8080, 8080),
+ Box(8081, 8081),
+ Box(8082, 8082),
+ Box(8083, 8083),
+ Box(8084, 8084),
+ Box(8085, 8085),
+ Box(8086, 8086),
+ Box(8087, 8087),
+ Box(8088, 8088),
+ Box(8089, 8089),
+ Box(8090, 8090),
+ Box(8091, 8091),
+ Box(8092, 8092),
+ Box(8093, 8093),
+ Box(8094, 8094),
+ Box(8095, 8095),
+ Box(8096, 8096),
+ Box(8097, 8097),
+ Box(8098, 8098),
+ Box(8099, 8099),
+ Box(8100, 8100),
+ Box(8101, 8101),
+ Box(8102, 8102),
+ Box(8103, 8103),
+ Box(8104, 8104),
+ Box(8105, 8105),
+ Box(8106, 8106),
+ Box(8107, 8107),
+ Box(8108, 8108),
+ Box(8109, 8109),
+ Box(8110, 8110),
+ Box(8111, 8111),
+ Box(8112, 8112),
+ Box(8113, 8113),
+ Box(8114, 8114),
+ Box(8115, 8115),
+ Box(8116, 8116),
+ Box(8117, 8117),
+ Box(8118, 8118),
+ Box(8119, 8119),
+ Box(8120, 8120),
+ Box(8121, 8121),
+ Box(8122, 8122),
+ Box(8123, 8123),
+ Box(8124, 8124),
+ Box(8125, 8125),
+ Box(8126, 8126),
+ Box(8127, 8127),
+ Box(8128, 8128),
+ Box(8129, 8129),
+ Box(8130, 8130),
+ Box(8131, 8131),
+ Box(8132, 8132),
+ Box(8133, 8133),
+ Box(8134, 8134),
+ Box(8135, 8135),
+ Box(8136, 8136),
+ Box(8137, 8137),
+ Box(8138, 8138),
+ Box(8139, 8139),
+ Box(8140, 8140),
+ Box(8141, 8141),
+ Box(8142, 8142),
+ Box(8143, 8143),
+ Box(8144, 8144),
+ Box(8145, 8145),
+ Box(8146, 8146),
+ Box(8147, 8147),
+ Box(8148, 8148),
+ Box(8149, 8149),
+ Box(8150, 8150),
+ Box(8151, 8151),
+ Box(8152, 8152),
+ Box(8153, 8153),
+ Box(8154, 8154),
+ Box(8155, 8155),
+ Box(8156, 8156),
+ Box(8157, 8157),
+ Box(8158, 8158),
+ Box(8159, 8159),
+ Box(8160, 8160),
+ Box(8161, 8161),
+ Box(8162, 8162),
+ Box(8163, 8163),
+ Box(8164, 8164),
+ Box(8165, 8165),
+ Box(8166, 8166),
+ Box(8167, 8167),
+ Box(8168, 8168),
+ Box(8169, 8169),
+ Box(8170, 8170),
+ Box(8171, 8171),
+ Box(8172, 8172),
+ Box(8173, 8173),
+ Box(8174, 8174),
+ Box(8175, 8175),
+ Box(8176, 8176),
+ Box(8177, 8177),
+ Box(8178, 8178),
+ Box(8179, 8179),
+ Box(8180, 8180),
+ Box(8181, 8181),
+ Box(8182, 8182),
+ Box(8183, 8183),
+ Box(8184, 8184),
+ Box(8185, 8185),
+ Box(8186, 8186),
+ Box(8187, 8187),
+ Box(8188, 8188),
+ Box(8189, 8189),
+ Box(8190, 8190),
+ Box(8191, 8191),
+ Box(8192, 8192),
+ Box(8193, 8193),
+ Box(8194, 8194),
+ Box(8195, 8195),
+ Box(8196, 8196),
+ Box(8197, 8197),
+ Box(8198, 8198),
+ Box(8199, 8199),
+ Box(8200, 8200),
+ Box(8201, 8201),
+ Box(8202, 8202),
+ Box(8203, 8203),
+ Box(8204, 8204),
+ Box(8205, 8205),
+ Box(8206, 8206),
+ Box(8207, 8207),
+ Box(8208, 8208),
+ Box(8209, 8209),
+ Box(8210, 8210),
+ Box(8211, 8211),
+ Box(8212, 8212),
+ Box(8213, 8213),
+ Box(8214, 8214),
+ Box(8215, 8215),
+ Box(8216, 8216),
+ Box(8217, 8217),
+ Box(8218, 8218),
+ Box(8219, 8219),
+ Box(8220, 8220),
+ Box(8221, 8221),
+ Box(8222, 8222),
+ Box(8223, 8223),
+ Box(8224, 8224),
+ Box(8225, 8225),
+ Box(8226, 8226),
+ Box(8227, 8227),
+ Box(8228, 8228),
+ Box(8229, 8229),
+ Box(8230, 8230),
+ Box(8231, 8231),
+ Box(8232, 8232),
+ Box(8233, 8233),
+ Box(8234, 8234),
+ Box(8235, 8235),
+ Box(8236, 8236),
+ Box(8237, 8237),
+ Box(8238, 8238),
+ Box(8239, 8239),
+ Box(8240, 8240),
+ Box(8241, 8241),
+ Box(8242, 8242),
+ Box(8243, 8243),
+ Box(8244, 8244),
+ Box(8245, 8245),
+ Box(8246, 8246),
+ Box(8247, 8247),
+ Box(8248, 8248),
+ Box(8249, 8249),
+ Box(8250, 8250),
+ Box(8251, 8251),
+ Box(8252, 8252),
+ Box(8253, 8253),
+ Box(8254, 8254),
+ Box(8255, 8255),
+ Box(8256, 8256),
+ Box(8257, 8257),
+ Box(8258, 8258),
+ Box(8259, 8259),
+ Box(8260, 8260),
+ Box(8261, 8261),
+ Box(8262, 8262),
+ Box(8263, 8263),
+ Box(8264, 8264),
+ Box(8265, 8265),
+ Box(8266, 8266),
+ Box(8267, 8267),
+ Box(8268, 8268),
+ Box(8269, 8269),
+ Box(8270, 8270),
+ Box(8271, 8271),
+ Box(8272, 8272),
+ Box(8273, 8273),
+ Box(8274, 8274),
+ Box(8275, 8275),
+ Box(8276, 8276),
+ Box(8277, 8277),
+ Box(8278, 8278),
+ Box(8279, 8279),
+ Box(8280, 8280),
+ Box(8281, 8281),
+ Box(8282, 8282),
+ Box(8283, 8283),
+ Box(8284, 8284),
+ Box(8285, 8285),
+ Box(8286, 8286),
+ Box(8287, 8287),
+ Box(8288, 8288),
+ Box(8289, 8289),
+ Box(8290, 8290),
+ Box(8291, 8291),
+ Box(8292, 8292),
+ Box(8293, 8293),
+ Box(8294, 8294),
+ Box(8295, 8295),
+ Box(8296, 8296),
+ Box(8297, 8297),
+ Box(8298, 8298),
+ Box(8299, 8299),
+ Box(8300, 8300),
+ Box(8301, 8301),
+ Box(8302, 8302),
+ Box(8303, 8303),
+ Box(8304, 8304),
+ Box(8305, 8305),
+ Box(8306, 8306),
+ Box(8307, 8307),
+ Box(8308, 8308),
+ Box(8309, 8309),
+ Box(8310, 8310),
+ Box(8311, 8311),
+ Box(8312, 8312),
+ Box(8313, 8313),
+ Box(8314, 8314),
+ Box(8315, 8315),
+ Box(8316, 8316),
+ Box(8317, 8317),
+ Box(8318, 8318),
+ Box(8319, 8319),
+ Box(8320, 8320),
+ Box(8321, 8321),
+ Box(8322, 8322),
+ Box(8323, 8323),
+ Box(8324, 8324),
+ Box(8325, 8325),
+ Box(8326, 8326),
+ Box(8327, 8327),
+ Box(8328, 8328),
+ Box(8329, 8329),
+ Box(8330, 8330),
+ Box(8331, 8331),
+ Box(8332, 8332),
+ Box(8333, 8333),
+ Box(8334, 8334),
+ Box(8335, 8335),
+ Box(8336, 8336),
+ Box(8337, 8337),
+ Box(8338, 8338),
+ Box(8339, 8339),
+ Box(8340, 8340),
+ Box(8341, 8341),
+ Box(8342, 8342),
+ Box(8343, 8343),
+ Box(8344, 8344),
+ Box(8345, 8345),
+ Box(8346, 8346),
+ Box(8347, 8347),
+ Box(8348, 8348),
+ Box(8349, 8349),
+ Box(8350, 8350),
+ Box(8351, 8351),
+ Box(8352, 8352),
+ Box(8353, 8353),
+ Box(8354, 8354),
+ Box(8355, 8355),
+ Box(8356, 8356),
+ Box(8357, 8357),
+ Box(8358, 8358),
+ Box(8359, 8359),
+ Box(8360, 8360),
+ Box(8361, 8361),
+ Box(8362, 8362),
+ Box(8363, 8363),
+ Box(8364, 8364),
+ Box(8365, 8365),
+ Box(8366, 8366),
+ Box(8367, 8367),
+ Box(8368, 8368),
+ Box(8369, 8369),
+ Box(8370, 8370),
+ Box(8371, 8371),
+ Box(8372, 8372),
+ Box(8373, 8373),
+ Box(8374, 8374),
+ Box(8375, 8375),
+ Box(8376, 8376),
+ Box(8377, 8377),
+ Box(8378, 8378),
+ Box(8379, 8379),
+ Box(8380, 8380),
+ Box(8381, 8381),
+ Box(8382, 8382),
+ Box(8383, 8383),
+ Box(8384, 8384),
+ Box(8385, 8385),
+ Box(8386, 8386),
+ Box(8387, 8387),
+ Box(8388, 8388),
+ Box(8389, 8389),
+ Box(8390, 8390),
+ Box(8391, 8391),
+ Box(8392, 8392),
+ Box(8393, 8393),
+ Box(8394, 8394),
+ Box(8395, 8395),
+ Box(8396, 8396),
+ Box(8397, 8397),
+ Box(8398, 8398),
+ Box(8399, 8399),
+ Box(8400, 8400),
+ Box(8401, 8401),
+ Box(8402, 8402),
+ Box(8403, 8403),
+ Box(8404, 8404),
+ Box(8405, 8405),
+ Box(8406, 8406),
+ Box(8407, 8407),
+ Box(8408, 8408),
+ Box(8409, 8409),
+ Box(8410, 8410),
+ Box(8411, 8411),
+ Box(8412, 8412),
+ Box(8413, 8413),
+ Box(8414, 8414),
+ Box(8415, 8415),
+ Box(8416, 8416),
+ Box(8417, 8417),
+ Box(8418, 8418),
+ Box(8419, 8419),
+ Box(8420, 8420),
+ Box(8421, 8421),
+ Box(8422, 8422),
+ Box(8423, 8423),
+ Box(8424, 8424),
+ Box(8425, 8425),
+ Box(8426, 8426),
+ Box(8427, 8427),
+ Box(8428, 8428),
+ Box(8429, 8429),
+ Box(8430, 8430),
+ Box(8431, 8431),
+ Box(8432, 8432),
+ Box(8433, 8433),
+ Box(8434, 8434),
+ Box(8435, 8435),
+ Box(8436, 8436),
+ Box(8437, 8437),
+ Box(8438, 8438),
+ Box(8439, 8439),
+ Box(8440, 8440),
+ Box(8441, 8441),
+ Box(8442, 8442),
+ Box(8443, 8443),
+ Box(8444, 8444),
+ Box(8445, 8445),
+ Box(8446, 8446),
+ Box(8447, 8447),
+ Box(8448, 8448),
+ Box(8449, 8449),
+ Box(8450, 8450),
+ Box(8451, 8451),
+ Box(8452, 8452),
+ Box(8453, 8453),
+ Box(8454, 8454),
+ Box(8455, 8455),
+ Box(8456, 8456),
+ Box(8457, 8457),
+ Box(8458, 8458),
+ Box(8459, 8459),
+ Box(8460, 8460),
+ Box(8461, 8461),
+ Box(8462, 8462),
+ Box(8463, 8463),
+ Box(8464, 8464),
+ Box(8465, 8465),
+ Box(8466, 8466),
+ Box(8467, 8467),
+ Box(8468, 8468),
+ Box(8469, 8469),
+ Box(8470, 8470),
+ Box(8471, 8471),
+ Box(8472, 8472),
+ Box(8473, 8473),
+ Box(8474, 8474),
+ Box(8475, 8475),
+ Box(8476, 8476),
+ Box(8477, 8477),
+ Box(8478, 8478),
+ Box(8479, 8479),
+ Box(8480, 8480),
+ Box(8481, 8481),
+ Box(8482, 8482),
+ Box(8483, 8483),
+ Box(8484, 8484),
+ Box(8485, 8485),
+ Box(8486, 8486),
+ Box(8487, 8487),
+ Box(8488, 8488),
+ Box(8489, 8489),
+ Box(8490, 8490),
+ Box(8491, 8491),
+ Box(8492, 8492),
+ Box(8493, 8493),
+ Box(8494, 8494),
+ Box(8495, 8495),
+ Box(8496, 8496),
+ Box(8497, 8497),
+ Box(8498, 8498),
+ Box(8499, 8499),
+ Box(8500, 8500),
+ Box(8501, 8501),
+ Box(8502, 8502),
+ Box(8503, 8503),
+ Box(8504, 8504),
+ Box(8505, 8505),
+ Box(8506, 8506),
+ Box(8507, 8507),
+ Box(8508, 8508),
+ Box(8509, 8509),
+ Box(8510, 8510),
+ Box(8511, 8511),
+ Box(8512, 8512),
+ Box(8513, 8513),
+ Box(8514, 8514),
+ Box(8515, 8515),
+ Box(8516, 8516),
+ Box(8517, 8517),
+ Box(8518, 8518),
+ Box(8519, 8519),
+ Box(8520, 8520),
+ Box(8521, 8521),
+ Box(8522, 8522),
+ Box(8523, 8523),
+ Box(8524, 8524),
+ Box(8525, 8525),
+ Box(8526, 8526),
+ Box(8527, 8527),
+ Box(8528, 8528),
+ Box(8529, 8529),
+ Box(8530, 8530),
+ Box(8531, 8531),
+ Box(8532, 8532),
+ Box(8533, 8533),
+ Box(8534, 8534),
+ Box(8535, 8535),
+ Box(8536, 8536),
+ Box(8537, 8537),
+ Box(8538, 8538),
+ Box(8539, 8539),
+ Box(8540, 8540),
+ Box(8541, 8541),
+ Box(8542, 8542),
+ Box(8543, 8543),
+ Box(8544, 8544),
+ Box(8545, 8545),
+ Box(8546, 8546),
+ Box(8547, 8547),
+ Box(8548, 8548),
+ Box(8549, 8549),
+ Box(8550, 8550),
+ Box(8551, 8551),
+ Box(8552, 8552),
+ Box(8553, 8553),
+ Box(8554, 8554),
+ Box(8555, 8555),
+ Box(8556, 8556),
+ Box(8557, 8557),
+ Box(8558, 8558),
+ Box(8559, 8559),
+ Box(8560, 8560),
+ Box(8561, 8561),
+ Box(8562, 8562),
+ Box(8563, 8563),
+ Box(8564, 8564),
+ Box(8565, 8565),
+ Box(8566, 8566),
+ Box(8567, 8567),
+ Box(8568, 8568),
+ Box(8569, 8569),
+ Box(8570, 8570),
+ Box(8571, 8571),
+ Box(8572, 8572),
+ Box(8573, 8573),
+ Box(8574, 8574),
+ Box(8575, 8575),
+ Box(8576, 8576),
+ Box(8577, 8577),
+ Box(8578, 8578),
+ Box(8579, 8579),
+ Box(8580, 8580),
+ Box(8581, 8581),
+ Box(8582, 8582),
+ Box(8583, 8583),
+ Box(8584, 8584),
+ Box(8585, 8585),
+ Box(8586, 8586),
+ Box(8587, 8587),
+ Box(8588, 8588),
+ Box(8589, 8589),
+ Box(8590, 8590),
+ Box(8591, 8591),
+ Box(8592, 8592),
+ Box(8593, 8593),
+ Box(8594, 8594),
+ Box(8595, 8595),
+ Box(8596, 8596),
+ Box(8597, 8597),
+ Box(8598, 8598),
+ Box(8599, 8599),
+ Box(8600, 8600),
+ Box(8601, 8601),
+ Box(8602, 8602),
+ Box(8603, 8603),
+ Box(8604, 8604),
+ Box(8605, 8605),
+ Box(8606, 8606),
+ Box(8607, 8607),
+ Box(8608, 8608),
+ Box(8609, 8609),
+ Box(8610, 8610),
+ Box(8611, 8611),
+ Box(8612, 8612),
+ Box(8613, 8613),
+ Box(8614, 8614),
+ Box(8615, 8615),
+ Box(8616, 8616),
+ Box(8617, 8617),
+ Box(8618, 8618),
+ Box(8619, 8619),
+ Box(8620, 8620),
+ Box(8621, 8621),
+ Box(8622, 8622),
+ Box(8623, 8623),
+ Box(8624, 8624),
+ Box(8625, 8625),
+ Box(8626, 8626),
+ Box(8627, 8627),
+ Box(8628, 8628),
+ Box(8629, 8629),
+ Box(8630, 8630),
+ Box(8631, 8631),
+ Box(8632, 8632),
+ Box(8633, 8633),
+ Box(8634, 8634),
+ Box(8635, 8635),
+ Box(8636, 8636),
+ Box(8637, 8637),
+ Box(8638, 8638),
+ Box(8639, 8639),
+ Box(8640, 8640),
+ Box(8641, 8641),
+ Box(8642, 8642),
+ Box(8643, 8643),
+ Box(8644, 8644),
+ Box(8645, 8645),
+ Box(8646, 8646),
+ Box(8647, 8647),
+ Box(8648, 8648),
+ Box(8649, 8649),
+ Box(8650, 8650),
+ Box(8651, 8651),
+ Box(8652, 8652),
+ Box(8653, 8653),
+ Box(8654, 8654),
+ Box(8655, 8655),
+ Box(8656, 8656),
+ Box(8657, 8657),
+ Box(8658, 8658),
+ Box(8659, 8659),
+ Box(8660, 8660),
+ Box(8661, 8661),
+ Box(8662, 8662),
+ Box(8663, 8663),
+ Box(8664, 8664),
+ Box(8665, 8665),
+ Box(8666, 8666),
+ Box(8667, 8667),
+ Box(8668, 8668),
+ Box(8669, 8669),
+ Box(8670, 8670),
+ Box(8671, 8671),
+ Box(8672, 8672),
+ Box(8673, 8673),
+ Box(8674, 8674),
+ Box(8675, 8675),
+ Box(8676, 8676),
+ Box(8677, 8677),
+ Box(8678, 8678),
+ Box(8679, 8679),
+ Box(8680, 8680),
+ Box(8681, 8681),
+ Box(8682, 8682),
+ Box(8683, 8683),
+ Box(8684, 8684),
+ Box(8685, 8685),
+ Box(8686, 8686),
+ Box(8687, 8687),
+ Box(8688, 8688),
+ Box(8689, 8689),
+ Box(8690, 8690),
+ Box(8691, 8691),
+ Box(8692, 8692),
+ Box(8693, 8693),
+ Box(8694, 8694),
+ Box(8695, 8695),
+ Box(8696, 8696),
+ Box(8697, 8697),
+ Box(8698, 8698),
+ Box(8699, 8699),
+ Box(8700, 8700),
+ Box(8701, 8701),
+ Box(8702, 8702),
+ Box(8703, 8703),
+ Box(8704, 8704),
+ Box(8705, 8705),
+ Box(8706, 8706),
+ Box(8707, 8707),
+ Box(8708, 8708),
+ Box(8709, 8709),
+ Box(8710, 8710),
+ Box(8711, 8711),
+ Box(8712, 8712),
+ Box(8713, 8713),
+ Box(8714, 8714),
+ Box(8715, 8715),
+ Box(8716, 8716),
+ Box(8717, 8717),
+ Box(8718, 8718),
+ Box(8719, 8719),
+ Box(8720, 8720),
+ Box(8721, 8721),
+ Box(8722, 8722),
+ Box(8723, 8723),
+ Box(8724, 8724),
+ Box(8725, 8725),
+ Box(8726, 8726),
+ Box(8727, 8727),
+ Box(8728, 8728),
+ Box(8729, 8729),
+ Box(8730, 8730),
+ Box(8731, 8731),
+ Box(8732, 8732),
+ Box(8733, 8733),
+ Box(8734, 8734),
+ Box(8735, 8735),
+ Box(8736, 8736),
+ Box(8737, 8737),
+ Box(8738, 8738),
+ Box(8739, 8739),
+ Box(8740, 8740),
+ Box(8741, 8741),
+ Box(8742, 8742),
+ Box(8743, 8743),
+ Box(8744, 8744),
+ Box(8745, 8745),
+ Box(8746, 8746),
+ Box(8747, 8747),
+ Box(8748, 8748),
+ Box(8749, 8749),
+ Box(8750, 8750),
+ Box(8751, 8751),
+ Box(8752, 8752),
+ Box(8753, 8753),
+ Box(8754, 8754),
+ Box(8755, 8755),
+ Box(8756, 8756),
+ Box(8757, 8757),
+ Box(8758, 8758),
+ Box(8759, 8759),
+ Box(8760, 8760),
+ Box(8761, 8761),
+ Box(8762, 8762),
+ Box(8763, 8763),
+ Box(8764, 8764),
+ Box(8765, 8765),
+ Box(8766, 8766),
+ Box(8767, 8767),
+ Box(8768, 8768),
+ Box(8769, 8769),
+ Box(8770, 8770),
+ Box(8771, 8771),
+ Box(8772, 8772),
+ Box(8773, 8773),
+ Box(8774, 8774),
+ Box(8775, 8775),
+ Box(8776, 8776),
+ Box(8777, 8777),
+ Box(8778, 8778),
+ Box(8779, 8779),
+ Box(8780, 8780),
+ Box(8781, 8781),
+ Box(8782, 8782),
+ Box(8783, 8783),
+ Box(8784, 8784),
+ Box(8785, 8785),
+ Box(8786, 8786),
+ Box(8787, 8787),
+ Box(8788, 8788),
+ Box(8789, 8789),
+ Box(8790, 8790),
+ Box(8791, 8791),
+ Box(8792, 8792),
+ Box(8793, 8793),
+ Box(8794, 8794),
+ Box(8795, 8795),
+ Box(8796, 8796),
+ Box(8797, 8797),
+ Box(8798, 8798),
+ Box(8799, 8799),
+ Box(8800, 8800),
+ Box(8801, 8801),
+ Box(8802, 8802),
+ Box(8803, 8803),
+ Box(8804, 8804),
+ Box(8805, 8805),
+ Box(8806, 8806),
+ Box(8807, 8807),
+ Box(8808, 8808),
+ Box(8809, 8809),
+ Box(8810, 8810),
+ Box(8811, 8811),
+ Box(8812, 8812),
+ Box(8813, 8813),
+ Box(8814, 8814),
+ Box(8815, 8815),
+ Box(8816, 8816),
+ Box(8817, 8817),
+ Box(8818, 8818),
+ Box(8819, 8819),
+ Box(8820, 8820),
+ Box(8821, 8821),
+ Box(8822, 8822),
+ Box(8823, 8823),
+ Box(8824, 8824),
+ Box(8825, 8825),
+ Box(8826, 8826),
+ Box(8827, 8827),
+ Box(8828, 8828),
+ Box(8829, 8829),
+ Box(8830, 8830),
+ Box(8831, 8831),
+ Box(8832, 8832),
+ Box(8833, 8833),
+ Box(8834, 8834),
+ Box(8835, 8835),
+ Box(8836, 8836),
+ Box(8837, 8837),
+ Box(8838, 8838),
+ Box(8839, 8839),
+ Box(8840, 8840),
+ Box(8841, 8841),
+ Box(8842, 8842),
+ Box(8843, 8843),
+ Box(8844, 8844),
+ Box(8845, 8845),
+ Box(8846, 8846),
+ Box(8847, 8847),
+ Box(8848, 8848),
+ Box(8849, 8849),
+ Box(8850, 8850),
+ Box(8851, 8851),
+ Box(8852, 8852),
+ Box(8853, 8853),
+ Box(8854, 8854),
+ Box(8855, 8855),
+ Box(8856, 8856),
+ Box(8857, 8857),
+ Box(8858, 8858),
+ Box(8859, 8859),
+ Box(8860, 8860),
+ Box(8861, 8861),
+ Box(8862, 8862),
+ Box(8863, 8863),
+ Box(8864, 8864),
+ Box(8865, 8865),
+ Box(8866, 8866),
+ Box(8867, 8867),
+ Box(8868, 8868),
+ Box(8869, 8869),
+ Box(8870, 8870),
+ Box(8871, 8871),
+ Box(8872, 8872),
+ Box(8873, 8873),
+ Box(8874, 8874),
+ Box(8875, 8875),
+ Box(8876, 8876),
+ Box(8877, 8877),
+ Box(8878, 8878),
+ Box(8879, 8879),
+ Box(8880, 8880),
+ Box(8881, 8881),
+ Box(8882, 8882),
+ Box(8883, 8883),
+ Box(8884, 8884),
+ Box(8885, 8885),
+ Box(8886, 8886),
+ Box(8887, 8887),
+ Box(8888, 8888),
+ Box(8889, 8889),
+ Box(8890, 8890),
+ Box(8891, 8891),
+ Box(8892, 8892),
+ Box(8893, 8893),
+ Box(8894, 8894),
+ Box(8895, 8895),
+ Box(8896, 8896),
+ Box(8897, 8897),
+ Box(8898, 8898),
+ Box(8899, 8899),
+ Box(8900, 8900),
+ Box(8901, 8901),
+ Box(8902, 8902),
+ Box(8903, 8903),
+ Box(8904, 8904),
+ Box(8905, 8905),
+ Box(8906, 8906),
+ Box(8907, 8907),
+ Box(8908, 8908),
+ Box(8909, 8909),
+ Box(8910, 8910),
+ Box(8911, 8911),
+ Box(8912, 8912),
+ Box(8913, 8913),
+ Box(8914, 8914),
+ Box(8915, 8915),
+ Box(8916, 8916),
+ Box(8917, 8917),
+ Box(8918, 8918),
+ Box(8919, 8919),
+ Box(8920, 8920),
+ Box(8921, 8921),
+ Box(8922, 8922),
+ Box(8923, 8923),
+ Box(8924, 8924),
+ Box(8925, 8925),
+ Box(8926, 8926),
+ Box(8927, 8927),
+ Box(8928, 8928),
+ Box(8929, 8929),
+ Box(8930, 8930),
+ Box(8931, 8931),
+ Box(8932, 8932),
+ Box(8933, 8933),
+ Box(8934, 8934),
+ Box(8935, 8935),
+ Box(8936, 8936),
+ Box(8937, 8937),
+ Box(8938, 8938),
+ Box(8939, 8939),
+ Box(8940, 8940),
+ Box(8941, 8941),
+ Box(8942, 8942),
+ Box(8943, 8943),
+ Box(8944, 8944),
+ Box(8945, 8945),
+ Box(8946, 8946),
+ Box(8947, 8947),
+ Box(8948, 8948),
+ Box(8949, 8949),
+ Box(8950, 8950),
+ Box(8951, 8951),
+ Box(8952, 8952),
+ Box(8953, 8953),
+ Box(8954, 8954),
+ Box(8955, 8955),
+ Box(8956, 8956),
+ Box(8957, 8957),
+ Box(8958, 8958),
+ Box(8959, 8959),
+ Box(8960, 8960),
+ Box(8961, 8961),
+ Box(8962, 8962),
+ Box(8963, 8963),
+ Box(8964, 8964),
+ Box(8965, 8965),
+ Box(8966, 8966),
+ Box(8967, 8967),
+ Box(8968, 8968),
+ Box(8969, 8969),
+ Box(8970, 8970),
+ Box(8971, 8971),
+ Box(8972, 8972),
+ Box(8973, 8973),
+ Box(8974, 8974),
+ Box(8975, 8975),
+ Box(8976, 8976),
+ Box(8977, 8977),
+ Box(8978, 8978),
+ Box(8979, 8979),
+ Box(8980, 8980),
+ Box(8981, 8981),
+ Box(8982, 8982),
+ Box(8983, 8983),
+ Box(8984, 8984),
+ Box(8985, 8985),
+ Box(8986, 8986),
+ Box(8987, 8987),
+ Box(8988, 8988),
+ Box(8989, 8989),
+ Box(8990, 8990),
+ Box(8991, 8991),
+ Box(8992, 8992),
+ Box(8993, 8993),
+ Box(8994, 8994),
+ Box(8995, 8995),
+ Box(8996, 8996),
+ Box(8997, 8997),
+ Box(8998, 8998),
+ Box(8999, 8999),
+ Box(9000, 9000),
+ Box(9001, 9001),
+ Box(9002, 9002),
+ Box(9003, 9003),
+ Box(9004, 9004),
+ Box(9005, 9005),
+ Box(9006, 9006),
+ Box(9007, 9007),
+ Box(9008, 9008),
+ Box(9009, 9009),
+ Box(9010, 9010),
+ Box(9011, 9011),
+ Box(9012, 9012),
+ Box(9013, 9013),
+ Box(9014, 9014),
+ Box(9015, 9015),
+ Box(9016, 9016),
+ Box(9017, 9017),
+ Box(9018, 9018),
+ Box(9019, 9019),
+ Box(9020, 9020),
+ Box(9021, 9021),
+ Box(9022, 9022),
+ Box(9023, 9023),
+ Box(9024, 9024),
+ Box(9025, 9025),
+ Box(9026, 9026),
+ Box(9027, 9027),
+ Box(9028, 9028),
+ Box(9029, 9029),
+ Box(9030, 9030),
+ Box(9031, 9031),
+ Box(9032, 9032),
+ Box(9033, 9033),
+ Box(9034, 9034),
+ Box(9035, 9035),
+ Box(9036, 9036),
+ Box(9037, 9037),
+ Box(9038, 9038),
+ Box(9039, 9039),
+ Box(9040, 9040),
+ Box(9041, 9041),
+ Box(9042, 9042),
+ Box(9043, 9043),
+ Box(9044, 9044),
+ Box(9045, 9045),
+ Box(9046, 9046),
+ Box(9047, 9047),
+ Box(9048, 9048),
+ Box(9049, 9049),
+ Box(9050, 9050),
+ Box(9051, 9051),
+ Box(9052, 9052),
+ Box(9053, 9053),
+ Box(9054, 9054),
+ Box(9055, 9055),
+ Box(9056, 9056),
+ Box(9057, 9057),
+ Box(9058, 9058),
+ Box(9059, 9059),
+ Box(9060, 9060),
+ Box(9061, 9061),
+ Box(9062, 9062),
+ Box(9063, 9063),
+ Box(9064, 9064),
+ Box(9065, 9065),
+ Box(9066, 9066),
+ Box(9067, 9067),
+ Box(9068, 9068),
+ Box(9069, 9069),
+ Box(9070, 9070),
+ Box(9071, 9071),
+ Box(9072, 9072),
+ Box(9073, 9073),
+ Box(9074, 9074),
+ Box(9075, 9075),
+ Box(9076, 9076),
+ Box(9077, 9077),
+ Box(9078, 9078),
+ Box(9079, 9079),
+ Box(9080, 9080),
+ Box(9081, 9081),
+ Box(9082, 9082),
+ Box(9083, 9083),
+ Box(9084, 9084),
+ Box(9085, 9085),
+ Box(9086, 9086),
+ Box(9087, 9087),
+ Box(9088, 9088),
+ Box(9089, 9089),
+ Box(9090, 9090),
+ Box(9091, 9091),
+ Box(9092, 9092),
+ Box(9093, 9093),
+ Box(9094, 9094),
+ Box(9095, 9095),
+ Box(9096, 9096),
+ Box(9097, 9097),
+ Box(9098, 9098),
+ Box(9099, 9099),
+ Box(9100, 9100),
+ Box(9101, 9101),
+ Box(9102, 9102),
+ Box(9103, 9103),
+ Box(9104, 9104),
+ Box(9105, 9105),
+ Box(9106, 9106),
+ Box(9107, 9107),
+ Box(9108, 9108),
+ Box(9109, 9109),
+ Box(9110, 9110),
+ Box(9111, 9111),
+ Box(9112, 9112),
+ Box(9113, 9113),
+ Box(9114, 9114),
+ Box(9115, 9115),
+ Box(9116, 9116),
+ Box(9117, 9117),
+ Box(9118, 9118),
+ Box(9119, 9119),
+ Box(9120, 9120),
+ Box(9121, 9121),
+ Box(9122, 9122),
+ Box(9123, 9123),
+ Box(9124, 9124),
+ Box(9125, 9125),
+ Box(9126, 9126),
+ Box(9127, 9127),
+ Box(9128, 9128),
+ Box(9129, 9129),
+ Box(9130, 9130),
+ Box(9131, 9131),
+ Box(9132, 9132),
+ Box(9133, 9133),
+ Box(9134, 9134),
+ Box(9135, 9135),
+ Box(9136, 9136),
+ Box(9137, 9137),
+ Box(9138, 9138),
+ Box(9139, 9139),
+ Box(9140, 9140),
+ Box(9141, 9141),
+ Box(9142, 9142),
+ Box(9143, 9143),
+ Box(9144, 9144),
+ Box(9145, 9145),
+ Box(9146, 9146),
+ Box(9147, 9147),
+ Box(9148, 9148),
+ Box(9149, 9149),
+ Box(9150, 9150),
+ Box(9151, 9151),
+ Box(9152, 9152),
+ Box(9153, 9153),
+ Box(9154, 9154),
+ Box(9155, 9155),
+ Box(9156, 9156),
+ Box(9157, 9157),
+ Box(9158, 9158),
+ Box(9159, 9159),
+ Box(9160, 9160),
+ Box(9161, 9161),
+ Box(9162, 9162),
+ Box(9163, 9163),
+ Box(9164, 9164),
+ Box(9165, 9165),
+ Box(9166, 9166),
+ Box(9167, 9167),
+ Box(9168, 9168),
+ Box(9169, 9169),
+ Box(9170, 9170),
+ Box(9171, 9171),
+ Box(9172, 9172),
+ Box(9173, 9173),
+ Box(9174, 9174),
+ Box(9175, 9175),
+ Box(9176, 9176),
+ Box(9177, 9177),
+ Box(9178, 9178),
+ Box(9179, 9179),
+ Box(9180, 9180),
+ Box(9181, 9181),
+ Box(9182, 9182),
+ Box(9183, 9183),
+ Box(9184, 9184),
+ Box(9185, 9185),
+ Box(9186, 9186),
+ Box(9187, 9187),
+ Box(9188, 9188),
+ Box(9189, 9189),
+ Box(9190, 9190),
+ Box(9191, 9191),
+ Box(9192, 9192),
+ Box(9193, 9193),
+ Box(9194, 9194),
+ Box(9195, 9195),
+ Box(9196, 9196),
+ Box(9197, 9197),
+ Box(9198, 9198),
+ Box(9199, 9199),
+ Box(9200, 9200),
+ Box(9201, 9201),
+ Box(9202, 9202),
+ Box(9203, 9203),
+ Box(9204, 9204),
+ Box(9205, 9205),
+ Box(9206, 9206),
+ Box(9207, 9207),
+ Box(9208, 9208),
+ Box(9209, 9209),
+ Box(9210, 9210),
+ Box(9211, 9211),
+ Box(9212, 9212),
+ Box(9213, 9213),
+ Box(9214, 9214),
+ Box(9215, 9215),
+ Box(9216, 9216),
+ Box(9217, 9217),
+ Box(9218, 9218),
+ Box(9219, 9219),
+ Box(9220, 9220),
+ Box(9221, 9221),
+ Box(9222, 9222),
+ Box(9223, 9223),
+ Box(9224, 9224),
+ Box(9225, 9225),
+ Box(9226, 9226),
+ Box(9227, 9227),
+ Box(9228, 9228),
+ Box(9229, 9229),
+ Box(9230, 9230),
+ Box(9231, 9231),
+ Box(9232, 9232),
+ Box(9233, 9233),
+ Box(9234, 9234),
+ Box(9235, 9235),
+ Box(9236, 9236),
+ Box(9237, 9237),
+ Box(9238, 9238),
+ Box(9239, 9239),
+ Box(9240, 9240),
+ Box(9241, 9241),
+ Box(9242, 9242),
+ Box(9243, 9243),
+ Box(9244, 9244),
+ Box(9245, 9245),
+ Box(9246, 9246),
+ Box(9247, 9247),
+ Box(9248, 9248),
+ Box(9249, 9249),
+ Box(9250, 9250),
+ Box(9251, 9251),
+ Box(9252, 9252),
+ Box(9253, 9253),
+ Box(9254, 9254),
+ Box(9255, 9255),
+ Box(9256, 9256),
+ Box(9257, 9257),
+ Box(9258, 9258),
+ Box(9259, 9259),
+ Box(9260, 9260),
+ Box(9261, 9261),
+ Box(9262, 9262),
+ Box(9263, 9263),
+ Box(9264, 9264),
+ Box(9265, 9265),
+ Box(9266, 9266),
+ Box(9267, 9267),
+ Box(9268, 9268),
+ Box(9269, 9269),
+ Box(9270, 9270),
+ Box(9271, 9271),
+ Box(9272, 9272),
+ Box(9273, 9273),
+ Box(9274, 9274),
+ Box(9275, 9275),
+ Box(9276, 9276),
+ Box(9277, 9277),
+ Box(9278, 9278),
+ Box(9279, 9279),
+ Box(9280, 9280),
+ Box(9281, 9281),
+ Box(9282, 9282),
+ Box(9283, 9283),
+ Box(9284, 9284),
+ Box(9285, 9285),
+ Box(9286, 9286),
+ Box(9287, 9287),
+ Box(9288, 9288),
+ Box(9289, 9289),
+ Box(9290, 9290),
+ Box(9291, 9291),
+ Box(9292, 9292),
+ Box(9293, 9293),
+ Box(9294, 9294),
+ Box(9295, 9295),
+ Box(9296, 9296),
+ Box(9297, 9297),
+ Box(9298, 9298),
+ Box(9299, 9299),
+ Box(9300, 9300),
+ Box(9301, 9301),
+ Box(9302, 9302),
+ Box(9303, 9303),
+ Box(9304, 9304),
+ Box(9305, 9305),
+ Box(9306, 9306),
+ Box(9307, 9307),
+ Box(9308, 9308),
+ Box(9309, 9309),
+ Box(9310, 9310),
+ Box(9311, 9311),
+ Box(9312, 9312),
+ Box(9313, 9313),
+ Box(9314, 9314),
+ Box(9315, 9315),
+ Box(9316, 9316),
+ Box(9317, 9317),
+ Box(9318, 9318),
+ Box(9319, 9319),
+ Box(9320, 9320),
+ Box(9321, 9321),
+ Box(9322, 9322),
+ Box(9323, 9323),
+ Box(9324, 9324),
+ Box(9325, 9325),
+ Box(9326, 9326),
+ Box(9327, 9327),
+ Box(9328, 9328),
+ Box(9329, 9329),
+ Box(9330, 9330),
+ Box(9331, 9331),
+ Box(9332, 9332),
+ Box(9333, 9333),
+ Box(9334, 9334),
+ Box(9335, 9335),
+ Box(9336, 9336),
+ Box(9337, 9337),
+ Box(9338, 9338),
+ Box(9339, 9339),
+ Box(9340, 9340),
+ Box(9341, 9341),
+ Box(9342, 9342),
+ Box(9343, 9343),
+ Box(9344, 9344),
+ Box(9345, 9345),
+ Box(9346, 9346),
+ Box(9347, 9347),
+ Box(9348, 9348),
+ Box(9349, 9349),
+ Box(9350, 9350),
+ Box(9351, 9351),
+ Box(9352, 9352),
+ Box(9353, 9353),
+ Box(9354, 9354),
+ Box(9355, 9355),
+ Box(9356, 9356),
+ Box(9357, 9357),
+ Box(9358, 9358),
+ Box(9359, 9359),
+ Box(9360, 9360),
+ Box(9361, 9361),
+ Box(9362, 9362),
+ Box(9363, 9363),
+ Box(9364, 9364),
+ Box(9365, 9365),
+ Box(9366, 9366),
+ Box(9367, 9367),
+ Box(9368, 9368),
+ Box(9369, 9369),
+ Box(9370, 9370),
+ Box(9371, 9371),
+ Box(9372, 9372),
+ Box(9373, 9373),
+ Box(9374, 9374),
+ Box(9375, 9375),
+ Box(9376, 9376),
+ Box(9377, 9377),
+ Box(9378, 9378),
+ Box(9379, 9379),
+ Box(9380, 9380),
+ Box(9381, 9381),
+ Box(9382, 9382),
+ Box(9383, 9383),
+ Box(9384, 9384),
+ Box(9385, 9385),
+ Box(9386, 9386),
+ Box(9387, 9387),
+ Box(9388, 9388),
+ Box(9389, 9389),
+ Box(9390, 9390),
+ Box(9391, 9391),
+ Box(9392, 9392),
+ Box(9393, 9393),
+ Box(9394, 9394),
+ Box(9395, 9395),
+ Box(9396, 9396),
+ Box(9397, 9397),
+ Box(9398, 9398),
+ Box(9399, 9399),
+ Box(9400, 9400),
+ Box(9401, 9401),
+ Box(9402, 9402),
+ Box(9403, 9403),
+ Box(9404, 9404),
+ Box(9405, 9405),
+ Box(9406, 9406),
+ Box(9407, 9407),
+ Box(9408, 9408),
+ Box(9409, 9409),
+ Box(9410, 9410),
+ Box(9411, 9411),
+ Box(9412, 9412),
+ Box(9413, 9413),
+ Box(9414, 9414),
+ Box(9415, 9415),
+ Box(9416, 9416),
+ Box(9417, 9417),
+ Box(9418, 9418),
+ Box(9419, 9419),
+ Box(9420, 9420),
+ Box(9421, 9421),
+ Box(9422, 9422),
+ Box(9423, 9423),
+ Box(9424, 9424),
+ Box(9425, 9425),
+ Box(9426, 9426),
+ Box(9427, 9427),
+ Box(9428, 9428),
+ Box(9429, 9429),
+ Box(9430, 9430),
+ Box(9431, 9431),
+ Box(9432, 9432),
+ Box(9433, 9433),
+ Box(9434, 9434),
+ Box(9435, 9435),
+ Box(9436, 9436),
+ Box(9437, 9437),
+ Box(9438, 9438),
+ Box(9439, 9439),
+ Box(9440, 9440),
+ Box(9441, 9441),
+ Box(9442, 9442),
+ Box(9443, 9443),
+ Box(9444, 9444),
+ Box(9445, 9445),
+ Box(9446, 9446),
+ Box(9447, 9447),
+ Box(9448, 9448),
+ Box(9449, 9449),
+ Box(9450, 9450),
+ Box(9451, 9451),
+ Box(9452, 9452),
+ Box(9453, 9453),
+ Box(9454, 9454),
+ Box(9455, 9455),
+ Box(9456, 9456),
+ Box(9457, 9457),
+ Box(9458, 9458),
+ Box(9459, 9459),
+ Box(9460, 9460),
+ Box(9461, 9461),
+ Box(9462, 9462),
+ Box(9463, 9463),
+ Box(9464, 9464),
+ Box(9465, 9465),
+ Box(9466, 9466),
+ Box(9467, 9467),
+ Box(9468, 9468),
+ Box(9469, 9469),
+ Box(9470, 9470),
+ Box(9471, 9471),
+ Box(9472, 9472),
+ Box(9473, 9473),
+ Box(9474, 9474),
+ Box(9475, 9475),
+ Box(9476, 9476),
+ Box(9477, 9477),
+ Box(9478, 9478),
+ Box(9479, 9479),
+ Box(9480, 9480),
+ Box(9481, 9481),
+ Box(9482, 9482),
+ Box(9483, 9483),
+ Box(9484, 9484),
+ Box(9485, 9485),
+ Box(9486, 9486),
+ Box(9487, 9487),
+ Box(9488, 9488),
+ Box(9489, 9489),
+ Box(9490, 9490),
+ Box(9491, 9491),
+ Box(9492, 9492),
+ Box(9493, 9493),
+ Box(9494, 9494),
+ Box(9495, 9495),
+ Box(9496, 9496),
+ Box(9497, 9497),
+ Box(9498, 9498),
+ Box(9499, 9499),
+ Box(9500, 9500),
+ Box(9501, 9501),
+ Box(9502, 9502),
+ Box(9503, 9503),
+ Box(9504, 9504),
+ Box(9505, 9505),
+ Box(9506, 9506),
+ Box(9507, 9507),
+ Box(9508, 9508),
+ Box(9509, 9509),
+ Box(9510, 9510),
+ Box(9511, 9511),
+ Box(9512, 9512),
+ Box(9513, 9513),
+ Box(9514, 9514),
+ Box(9515, 9515),
+ Box(9516, 9516),
+ Box(9517, 9517),
+ Box(9518, 9518),
+ Box(9519, 9519),
+ Box(9520, 9520),
+ Box(9521, 9521),
+ Box(9522, 9522),
+ Box(9523, 9523),
+ Box(9524, 9524),
+ Box(9525, 9525),
+ Box(9526, 9526),
+ Box(9527, 9527),
+ Box(9528, 9528),
+ Box(9529, 9529),
+ Box(9530, 9530),
+ Box(9531, 9531),
+ Box(9532, 9532),
+ Box(9533, 9533),
+ Box(9534, 9534),
+ Box(9535, 9535),
+ Box(9536, 9536),
+ Box(9537, 9537),
+ Box(9538, 9538),
+ Box(9539, 9539),
+ Box(9540, 9540),
+ Box(9541, 9541),
+ Box(9542, 9542),
+ Box(9543, 9543),
+ Box(9544, 9544),
+ Box(9545, 9545),
+ Box(9546, 9546),
+ Box(9547, 9547),
+ Box(9548, 9548),
+ Box(9549, 9549),
+ Box(9550, 9550),
+ Box(9551, 9551),
+ Box(9552, 9552),
+ Box(9553, 9553),
+ Box(9554, 9554),
+ Box(9555, 9555),
+ Box(9556, 9556),
+ Box(9557, 9557),
+ Box(9558, 9558),
+ Box(9559, 9559),
+ Box(9560, 9560),
+ Box(9561, 9561),
+ Box(9562, 9562),
+ Box(9563, 9563),
+ Box(9564, 9564),
+ Box(9565, 9565),
+ Box(9566, 9566),
+ Box(9567, 9567),
+ Box(9568, 9568),
+ Box(9569, 9569),
+ Box(9570, 9570),
+ Box(9571, 9571),
+ Box(9572, 9572),
+ Box(9573, 9573),
+ Box(9574, 9574),
+ Box(9575, 9575),
+ Box(9576, 9576),
+ Box(9577, 9577),
+ Box(9578, 9578),
+ Box(9579, 9579),
+ Box(9580, 9580),
+ Box(9581, 9581),
+ Box(9582, 9582),
+ Box(9583, 9583),
+ Box(9584, 9584),
+ Box(9585, 9585),
+ Box(9586, 9586),
+ Box(9587, 9587),
+ Box(9588, 9588),
+ Box(9589, 9589),
+ Box(9590, 9590),
+ Box(9591, 9591),
+ Box(9592, 9592),
+ Box(9593, 9593),
+ Box(9594, 9594),
+ Box(9595, 9595),
+ Box(9596, 9596),
+ Box(9597, 9597),
+ Box(9598, 9598),
+ Box(9599, 9599),
+ Box(9600, 9600),
+ Box(9601, 9601),
+ Box(9602, 9602),
+ Box(9603, 9603),
+ Box(9604, 9604),
+ Box(9605, 9605),
+ Box(9606, 9606),
+ Box(9607, 9607),
+ Box(9608, 9608),
+ Box(9609, 9609),
+ Box(9610, 9610),
+ Box(9611, 9611),
+ Box(9612, 9612),
+ Box(9613, 9613),
+ Box(9614, 9614),
+ Box(9615, 9615),
+ Box(9616, 9616),
+ Box(9617, 9617),
+ Box(9618, 9618),
+ Box(9619, 9619),
+ Box(9620, 9620),
+ Box(9621, 9621),
+ Box(9622, 9622),
+ Box(9623, 9623),
+ Box(9624, 9624),
+ Box(9625, 9625),
+ Box(9626, 9626),
+ Box(9627, 9627),
+ Box(9628, 9628),
+ Box(9629, 9629),
+ Box(9630, 9630),
+ Box(9631, 9631),
+ Box(9632, 9632),
+ Box(9633, 9633),
+ Box(9634, 9634),
+ Box(9635, 9635),
+ Box(9636, 9636),
+ Box(9637, 9637),
+ Box(9638, 9638),
+ Box(9639, 9639),
+ Box(9640, 9640),
+ Box(9641, 9641),
+ Box(9642, 9642),
+ Box(9643, 9643),
+ Box(9644, 9644),
+ Box(9645, 9645),
+ Box(9646, 9646),
+ Box(9647, 9647),
+ Box(9648, 9648),
+ Box(9649, 9649),
+ Box(9650, 9650),
+ Box(9651, 9651),
+ Box(9652, 9652),
+ Box(9653, 9653),
+ Box(9654, 9654),
+ Box(9655, 9655),
+ Box(9656, 9656),
+ Box(9657, 9657),
+ Box(9658, 9658),
+ Box(9659, 9659),
+ Box(9660, 9660),
+ Box(9661, 9661),
+ Box(9662, 9662),
+ Box(9663, 9663),
+ Box(9664, 9664),
+ Box(9665, 9665),
+ Box(9666, 9666),
+ Box(9667, 9667),
+ Box(9668, 9668),
+ Box(9669, 9669),
+ Box(9670, 9670),
+ Box(9671, 9671),
+ Box(9672, 9672),
+ Box(9673, 9673),
+ Box(9674, 9674),
+ Box(9675, 9675),
+ Box(9676, 9676),
+ Box(9677, 9677),
+ Box(9678, 9678),
+ Box(9679, 9679),
+ Box(9680, 9680),
+ Box(9681, 9681),
+ Box(9682, 9682),
+ Box(9683, 9683),
+ Box(9684, 9684),
+ Box(9685, 9685),
+ Box(9686, 9686),
+ Box(9687, 9687),
+ Box(9688, 9688),
+ Box(9689, 9689),
+ Box(9690, 9690),
+ Box(9691, 9691),
+ Box(9692, 9692),
+ Box(9693, 9693),
+ Box(9694, 9694),
+ Box(9695, 9695),
+ Box(9696, 9696),
+ Box(9697, 9697),
+ Box(9698, 9698),
+ Box(9699, 9699),
+ Box(9700, 9700),
+ Box(9701, 9701),
+ Box(9702, 9702),
+ Box(9703, 9703),
+ Box(9704, 9704),
+ Box(9705, 9705),
+ Box(9706, 9706),
+ Box(9707, 9707),
+ Box(9708, 9708),
+ Box(9709, 9709),
+ Box(9710, 9710),
+ Box(9711, 9711),
+ Box(9712, 9712),
+ Box(9713, 9713),
+ Box(9714, 9714),
+ Box(9715, 9715),
+ Box(9716, 9716),
+ Box(9717, 9717),
+ Box(9718, 9718),
+ Box(9719, 9719),
+ Box(9720, 9720),
+ Box(9721, 9721),
+ Box(9722, 9722),
+ Box(9723, 9723),
+ Box(9724, 9724),
+ Box(9725, 9725),
+ Box(9726, 9726),
+ Box(9727, 9727),
+ Box(9728, 9728),
+ Box(9729, 9729),
+ Box(9730, 9730),
+ Box(9731, 9731),
+ Box(9732, 9732),
+ Box(9733, 9733),
+ Box(9734, 9734),
+ Box(9735, 9735),
+ Box(9736, 9736),
+ Box(9737, 9737),
+ Box(9738, 9738),
+ Box(9739, 9739),
+ Box(9740, 9740),
+ Box(9741, 9741),
+ Box(9742, 9742),
+ Box(9743, 9743),
+ Box(9744, 9744),
+ Box(9745, 9745),
+ Box(9746, 9746),
+ Box(9747, 9747),
+ Box(9748, 9748),
+ Box(9749, 9749),
+ Box(9750, 9750),
+ Box(9751, 9751),
+ Box(9752, 9752),
+ Box(9753, 9753),
+ Box(9754, 9754),
+ Box(9755, 9755),
+ Box(9756, 9756),
+ Box(9757, 9757),
+ Box(9758, 9758),
+ Box(9759, 9759),
+ Box(9760, 9760),
+ Box(9761, 9761),
+ Box(9762, 9762),
+ Box(9763, 9763),
+ Box(9764, 9764),
+ Box(9765, 9765),
+ Box(9766, 9766),
+ Box(9767, 9767),
+ Box(9768, 9768),
+ Box(9769, 9769),
+ Box(9770, 9770),
+ Box(9771, 9771),
+ Box(9772, 9772),
+ Box(9773, 9773),
+ Box(9774, 9774),
+ Box(9775, 9775),
+ Box(9776, 9776),
+ Box(9777, 9777),
+ Box(9778, 9778),
+ Box(9779, 9779),
+ Box(9780, 9780),
+ Box(9781, 9781),
+ Box(9782, 9782),
+ Box(9783, 9783),
+ Box(9784, 9784),
+ Box(9785, 9785),
+ Box(9786, 9786),
+ Box(9787, 9787),
+ Box(9788, 9788),
+ Box(9789, 9789),
+ Box(9790, 9790),
+ Box(9791, 9791),
+ Box(9792, 9792),
+ Box(9793, 9793),
+ Box(9794, 9794),
+ Box(9795, 9795),
+ Box(9796, 9796),
+ Box(9797, 9797),
+ Box(9798, 9798),
+ Box(9799, 9799),
+ Box(9800, 9800),
+ Box(9801, 9801),
+ Box(9802, 9802),
+ Box(9803, 9803),
+ Box(9804, 9804),
+ Box(9805, 9805),
+ Box(9806, 9806),
+ Box(9807, 9807),
+ Box(9808, 9808),
+ Box(9809, 9809),
+ Box(9810, 9810),
+ Box(9811, 9811),
+ Box(9812, 9812),
+ Box(9813, 9813),
+ Box(9814, 9814),
+ Box(9815, 9815),
+ Box(9816, 9816),
+ Box(9817, 9817),
+ Box(9818, 9818),
+ Box(9819, 9819),
+ Box(9820, 9820),
+ Box(9821, 9821),
+ Box(9822, 9822),
+ Box(9823, 9823),
+ Box(9824, 9824),
+ Box(9825, 9825),
+ Box(9826, 9826),
+ Box(9827, 9827),
+ Box(9828, 9828),
+ Box(9829, 9829),
+ Box(9830, 9830),
+ Box(9831, 9831),
+ Box(9832, 9832),
+ Box(9833, 9833),
+ Box(9834, 9834),
+ Box(9835, 9835),
+ Box(9836, 9836),
+ Box(9837, 9837),
+ Box(9838, 9838),
+ Box(9839, 9839),
+ Box(9840, 9840),
+ Box(9841, 9841),
+ Box(9842, 9842),
+ Box(9843, 9843),
+ Box(9844, 9844),
+ Box(9845, 9845),
+ Box(9846, 9846),
+ Box(9847, 9847),
+ Box(9848, 9848),
+ Box(9849, 9849),
+ Box(9850, 9850),
+ Box(9851, 9851),
+ Box(9852, 9852),
+ Box(9853, 9853),
+ Box(9854, 9854),
+ Box(9855, 9855),
+ Box(9856, 9856),
+ Box(9857, 9857),
+ Box(9858, 9858),
+ Box(9859, 9859),
+ Box(9860, 9860),
+ Box(9861, 9861),
+ Box(9862, 9862),
+ Box(9863, 9863),
+ Box(9864, 9864),
+ Box(9865, 9865),
+ Box(9866, 9866),
+ Box(9867, 9867),
+ Box(9868, 9868),
+ Box(9869, 9869),
+ Box(9870, 9870),
+ Box(9871, 9871),
+ Box(9872, 9872),
+ Box(9873, 9873),
+ Box(9874, 9874),
+ Box(9875, 9875),
+ Box(9876, 9876),
+ Box(9877, 9877),
+ Box(9878, 9878),
+ Box(9879, 9879),
+ Box(9880, 9880),
+ Box(9881, 9881),
+ Box(9882, 9882),
+ Box(9883, 9883),
+ Box(9884, 9884),
+ Box(9885, 9885),
+ Box(9886, 9886),
+ Box(9887, 9887),
+ Box(9888, 9888),
+ Box(9889, 9889),
+ Box(9890, 9890),
+ Box(9891, 9891),
+ Box(9892, 9892),
+ Box(9893, 9893),
+ Box(9894, 9894),
+ Box(9895, 9895),
+ Box(9896, 9896),
+ Box(9897, 9897),
+ Box(9898, 9898),
+ Box(9899, 9899),
+ Box(9900, 9900),
+ Box(9901, 9901),
+ Box(9902, 9902),
+ Box(9903, 9903),
+ Box(9904, 9904),
+ Box(9905, 9905),
+ Box(9906, 9906),
+ Box(9907, 9907),
+ Box(9908, 9908),
+ Box(9909, 9909),
+ Box(9910, 9910),
+ Box(9911, 9911),
+ Box(9912, 9912),
+ Box(9913, 9913),
+ Box(9914, 9914),
+ Box(9915, 9915),
+ Box(9916, 9916),
+ Box(9917, 9917),
+ Box(9918, 9918),
+ Box(9919, 9919),
+ Box(9920, 9920),
+ Box(9921, 9921),
+ Box(9922, 9922),
+ Box(9923, 9923),
+ Box(9924, 9924),
+ Box(9925, 9925),
+ Box(9926, 9926),
+ Box(9927, 9927),
+ Box(9928, 9928),
+ Box(9929, 9929),
+ Box(9930, 9930),
+ Box(9931, 9931),
+ Box(9932, 9932),
+ Box(9933, 9933),
+ Box(9934, 9934),
+ Box(9935, 9935),
+ Box(9936, 9936),
+ Box(9937, 9937),
+ Box(9938, 9938),
+ Box(9939, 9939),
+ Box(9940, 9940),
+ Box(9941, 9941),
+ Box(9942, 9942),
+ Box(9943, 9943),
+ Box(9944, 9944),
+ Box(9945, 9945),
+ Box(9946, 9946),
+ Box(9947, 9947),
+ Box(9948, 9948),
+ Box(9949, 9949),
+ Box(9950, 9950),
+ Box(9951, 9951),
+ Box(9952, 9952),
+ Box(9953, 9953),
+ Box(9954, 9954),
+ Box(9955, 9955),
+ Box(9956, 9956),
+ Box(9957, 9957),
+ Box(9958, 9958),
+ Box(9959, 9959),
+ Box(9960, 9960),
+ Box(9961, 9961),
+ Box(9962, 9962),
+ Box(9963, 9963),
+ Box(9964, 9964),
+ Box(9965, 9965),
+ Box(9966, 9966),
+ Box(9967, 9967),
+ Box(9968, 9968),
+ Box(9969, 9969),
+ Box(9970, 9970),
+ Box(9971, 9971),
+ Box(9972, 9972),
+ Box(9973, 9973),
+ Box(9974, 9974),
+ Box(9975, 9975),
+ Box(9976, 9976),
+ Box(9977, 9977),
+ Box(9978, 9978),
+ Box(9979, 9979),
+ Box(9980, 9980),
+ Box(9981, 9981),
+ Box(9982, 9982),
+ Box(9983, 9983),
+ Box(9984, 9984),
+ Box(9985, 9985),
+ Box(9986, 9986),
+ Box(9987, 9987),
+ Box(9988, 9988),
+ Box(9989, 9989),
+ Box(9990, 9990),
+ Box(9991, 9991),
+ Box(9992, 9992),
+ Box(9993, 9993),
+ Box(9994, 9994),
+ Box(9995, 9995),
+ Box(9996, 9996),
+ Box(9997, 9997),
+ Box(9998, 9998),
+ Box(9999, 9999),
+];
+
+// 10,000 elements.
+const list2 = [
+ Box(0, 0),
+ Box(1, 1),
+ Box(2, 2),
+ Box(3, 3),
+ Box(4, 4),
+ Box(5, 5),
+ Box(6, 6),
+ Box(7, 7),
+ Box(8, 8),
+ Box(9, 9),
+ Box(10, 10),
+ Box(11, 11),
+ Box(12, 12),
+ Box(13, 13),
+ Box(14, 14),
+ Box(15, 15),
+ Box(16, 16),
+ Box(17, 17),
+ Box(18, 18),
+ Box(19, 19),
+ Box(20, 20),
+ Box(21, 21),
+ Box(22, 22),
+ Box(23, 23),
+ Box(24, 24),
+ Box(25, 25),
+ Box(26, 26),
+ Box(27, 27),
+ Box(28, 28),
+ Box(29, 29),
+ Box(30, 30),
+ Box(31, 31),
+ Box(32, 32),
+ Box(33, 33),
+ Box(34, 34),
+ Box(35, 35),
+ Box(36, 36),
+ Box(37, 37),
+ Box(38, 38),
+ Box(39, 39),
+ Box(40, 40),
+ Box(41, 41),
+ Box(42, 42),
+ Box(43, 43),
+ Box(44, 44),
+ Box(45, 45),
+ Box(46, 46),
+ Box(47, 47),
+ Box(48, 48),
+ Box(49, 49),
+ Box(50, 50),
+ Box(51, 51),
+ Box(52, 52),
+ Box(53, 53),
+ Box(54, 54),
+ Box(55, 55),
+ Box(56, 56),
+ Box(57, 57),
+ Box(58, 58),
+ Box(59, 59),
+ Box(60, 60),
+ Box(61, 61),
+ Box(62, 62),
+ Box(63, 63),
+ Box(64, 64),
+ Box(65, 65),
+ Box(66, 66),
+ Box(67, 67),
+ Box(68, 68),
+ Box(69, 69),
+ Box(70, 70),
+ Box(71, 71),
+ Box(72, 72),
+ Box(73, 73),
+ Box(74, 74),
+ Box(75, 75),
+ Box(76, 76),
+ Box(77, 77),
+ Box(78, 78),
+ Box(79, 79),
+ Box(80, 80),
+ Box(81, 81),
+ Box(82, 82),
+ Box(83, 83),
+ Box(84, 84),
+ Box(85, 85),
+ Box(86, 86),
+ Box(87, 87),
+ Box(88, 88),
+ Box(89, 89),
+ Box(90, 90),
+ Box(91, 91),
+ Box(92, 92),
+ Box(93, 93),
+ Box(94, 94),
+ Box(95, 95),
+ Box(96, 96),
+ Box(97, 97),
+ Box(98, 98),
+ Box(99, 99),
+ Box(100, 100),
+ Box(101, 101),
+ Box(102, 102),
+ Box(103, 103),
+ Box(104, 104),
+ Box(105, 105),
+ Box(106, 106),
+ Box(107, 107),
+ Box(108, 108),
+ Box(109, 109),
+ Box(110, 110),
+ Box(111, 111),
+ Box(112, 112),
+ Box(113, 113),
+ Box(114, 114),
+ Box(115, 115),
+ Box(116, 116),
+ Box(117, 117),
+ Box(118, 118),
+ Box(119, 119),
+ Box(120, 120),
+ Box(121, 121),
+ Box(122, 122),
+ Box(123, 123),
+ Box(124, 124),
+ Box(125, 125),
+ Box(126, 126),
+ Box(127, 127),
+ Box(128, 128),
+ Box(129, 129),
+ Box(130, 130),
+ Box(131, 131),
+ Box(132, 132),
+ Box(133, 133),
+ Box(134, 134),
+ Box(135, 135),
+ Box(136, 136),
+ Box(137, 137),
+ Box(138, 138),
+ Box(139, 139),
+ Box(140, 140),
+ Box(141, 141),
+ Box(142, 142),
+ Box(143, 143),
+ Box(144, 144),
+ Box(145, 145),
+ Box(146, 146),
+ Box(147, 147),
+ Box(148, 148),
+ Box(149, 149),
+ Box(150, 150),
+ Box(151, 151),
+ Box(152, 152),
+ Box(153, 153),
+ Box(154, 154),
+ Box(155, 155),
+ Box(156, 156),
+ Box(157, 157),
+ Box(158, 158),
+ Box(159, 159),
+ Box(160, 160),
+ Box(161, 161),
+ Box(162, 162),
+ Box(163, 163),
+ Box(164, 164),
+ Box(165, 165),
+ Box(166, 166),
+ Box(167, 167),
+ Box(168, 168),
+ Box(169, 169),
+ Box(170, 170),
+ Box(171, 171),
+ Box(172, 172),
+ Box(173, 173),
+ Box(174, 174),
+ Box(175, 175),
+ Box(176, 176),
+ Box(177, 177),
+ Box(178, 178),
+ Box(179, 179),
+ Box(180, 180),
+ Box(181, 181),
+ Box(182, 182),
+ Box(183, 183),
+ Box(184, 184),
+ Box(185, 185),
+ Box(186, 186),
+ Box(187, 187),
+ Box(188, 188),
+ Box(189, 189),
+ Box(190, 190),
+ Box(191, 191),
+ Box(192, 192),
+ Box(193, 193),
+ Box(194, 194),
+ Box(195, 195),
+ Box(196, 196),
+ Box(197, 197),
+ Box(198, 198),
+ Box(199, 199),
+ Box(200, 200),
+ Box(201, 201),
+ Box(202, 202),
+ Box(203, 203),
+ Box(204, 204),
+ Box(205, 205),
+ Box(206, 206),
+ Box(207, 207),
+ Box(208, 208),
+ Box(209, 209),
+ Box(210, 210),
+ Box(211, 211),
+ Box(212, 212),
+ Box(213, 213),
+ Box(214, 214),
+ Box(215, 215),
+ Box(216, 216),
+ Box(217, 217),
+ Box(218, 218),
+ Box(219, 219),
+ Box(220, 220),
+ Box(221, 221),
+ Box(222, 222),
+ Box(223, 223),
+ Box(224, 224),
+ Box(225, 225),
+ Box(226, 226),
+ Box(227, 227),
+ Box(228, 228),
+ Box(229, 229),
+ Box(230, 230),
+ Box(231, 231),
+ Box(232, 232),
+ Box(233, 233),
+ Box(234, 234),
+ Box(235, 235),
+ Box(236, 236),
+ Box(237, 237),
+ Box(238, 238),
+ Box(239, 239),
+ Box(240, 240),
+ Box(241, 241),
+ Box(242, 242),
+ Box(243, 243),
+ Box(244, 244),
+ Box(245, 245),
+ Box(246, 246),
+ Box(247, 247),
+ Box(248, 248),
+ Box(249, 249),
+ Box(250, 250),
+ Box(251, 251),
+ Box(252, 252),
+ Box(253, 253),
+ Box(254, 254),
+ Box(255, 255),
+ Box(256, 256),
+ Box(257, 257),
+ Box(258, 258),
+ Box(259, 259),
+ Box(260, 260),
+ Box(261, 261),
+ Box(262, 262),
+ Box(263, 263),
+ Box(264, 264),
+ Box(265, 265),
+ Box(266, 266),
+ Box(267, 267),
+ Box(268, 268),
+ Box(269, 269),
+ Box(270, 270),
+ Box(271, 271),
+ Box(272, 272),
+ Box(273, 273),
+ Box(274, 274),
+ Box(275, 275),
+ Box(276, 276),
+ Box(277, 277),
+ Box(278, 278),
+ Box(279, 279),
+ Box(280, 280),
+ Box(281, 281),
+ Box(282, 282),
+ Box(283, 283),
+ Box(284, 284),
+ Box(285, 285),
+ Box(286, 286),
+ Box(287, 287),
+ Box(288, 288),
+ Box(289, 289),
+ Box(290, 290),
+ Box(291, 291),
+ Box(292, 292),
+ Box(293, 293),
+ Box(294, 294),
+ Box(295, 295),
+ Box(296, 296),
+ Box(297, 297),
+ Box(298, 298),
+ Box(299, 299),
+ Box(300, 300),
+ Box(301, 301),
+ Box(302, 302),
+ Box(303, 303),
+ Box(304, 304),
+ Box(305, 305),
+ Box(306, 306),
+ Box(307, 307),
+ Box(308, 308),
+ Box(309, 309),
+ Box(310, 310),
+ Box(311, 311),
+ Box(312, 312),
+ Box(313, 313),
+ Box(314, 314),
+ Box(315, 315),
+ Box(316, 316),
+ Box(317, 317),
+ Box(318, 318),
+ Box(319, 319),
+ Box(320, 320),
+ Box(321, 321),
+ Box(322, 322),
+ Box(323, 323),
+ Box(324, 324),
+ Box(325, 325),
+ Box(326, 326),
+ Box(327, 327),
+ Box(328, 328),
+ Box(329, 329),
+ Box(330, 330),
+ Box(331, 331),
+ Box(332, 332),
+ Box(333, 333),
+ Box(334, 334),
+ Box(335, 335),
+ Box(336, 336),
+ Box(337, 337),
+ Box(338, 338),
+ Box(339, 339),
+ Box(340, 340),
+ Box(341, 341),
+ Box(342, 342),
+ Box(343, 343),
+ Box(344, 344),
+ Box(345, 345),
+ Box(346, 346),
+ Box(347, 347),
+ Box(348, 348),
+ Box(349, 349),
+ Box(350, 350),
+ Box(351, 351),
+ Box(352, 352),
+ Box(353, 353),
+ Box(354, 354),
+ Box(355, 355),
+ Box(356, 356),
+ Box(357, 357),
+ Box(358, 358),
+ Box(359, 359),
+ Box(360, 360),
+ Box(361, 361),
+ Box(362, 362),
+ Box(363, 363),
+ Box(364, 364),
+ Box(365, 365),
+ Box(366, 366),
+ Box(367, 367),
+ Box(368, 368),
+ Box(369, 369),
+ Box(370, 370),
+ Box(371, 371),
+ Box(372, 372),
+ Box(373, 373),
+ Box(374, 374),
+ Box(375, 375),
+ Box(376, 376),
+ Box(377, 377),
+ Box(378, 378),
+ Box(379, 379),
+ Box(380, 380),
+ Box(381, 381),
+ Box(382, 382),
+ Box(383, 383),
+ Box(384, 384),
+ Box(385, 385),
+ Box(386, 386),
+ Box(387, 387),
+ Box(388, 388),
+ Box(389, 389),
+ Box(390, 390),
+ Box(391, 391),
+ Box(392, 392),
+ Box(393, 393),
+ Box(394, 394),
+ Box(395, 395),
+ Box(396, 396),
+ Box(397, 397),
+ Box(398, 398),
+ Box(399, 399),
+ Box(400, 400),
+ Box(401, 401),
+ Box(402, 402),
+ Box(403, 403),
+ Box(404, 404),
+ Box(405, 405),
+ Box(406, 406),
+ Box(407, 407),
+ Box(408, 408),
+ Box(409, 409),
+ Box(410, 410),
+ Box(411, 411),
+ Box(412, 412),
+ Box(413, 413),
+ Box(414, 414),
+ Box(415, 415),
+ Box(416, 416),
+ Box(417, 417),
+ Box(418, 418),
+ Box(419, 419),
+ Box(420, 420),
+ Box(421, 421),
+ Box(422, 422),
+ Box(423, 423),
+ Box(424, 424),
+ Box(425, 425),
+ Box(426, 426),
+ Box(427, 427),
+ Box(428, 428),
+ Box(429, 429),
+ Box(430, 430),
+ Box(431, 431),
+ Box(432, 432),
+ Box(433, 433),
+ Box(434, 434),
+ Box(435, 435),
+ Box(436, 436),
+ Box(437, 437),
+ Box(438, 438),
+ Box(439, 439),
+ Box(440, 440),
+ Box(441, 441),
+ Box(442, 442),
+ Box(443, 443),
+ Box(444, 444),
+ Box(445, 445),
+ Box(446, 446),
+ Box(447, 447),
+ Box(448, 448),
+ Box(449, 449),
+ Box(450, 450),
+ Box(451, 451),
+ Box(452, 452),
+ Box(453, 453),
+ Box(454, 454),
+ Box(455, 455),
+ Box(456, 456),
+ Box(457, 457),
+ Box(458, 458),
+ Box(459, 459),
+ Box(460, 460),
+ Box(461, 461),
+ Box(462, 462),
+ Box(463, 463),
+ Box(464, 464),
+ Box(465, 465),
+ Box(466, 466),
+ Box(467, 467),
+ Box(468, 468),
+ Box(469, 469),
+ Box(470, 470),
+ Box(471, 471),
+ Box(472, 472),
+ Box(473, 473),
+ Box(474, 474),
+ Box(475, 475),
+ Box(476, 476),
+ Box(477, 477),
+ Box(478, 478),
+ Box(479, 479),
+ Box(480, 480),
+ Box(481, 481),
+ Box(482, 482),
+ Box(483, 483),
+ Box(484, 484),
+ Box(485, 485),
+ Box(486, 486),
+ Box(487, 487),
+ Box(488, 488),
+ Box(489, 489),
+ Box(490, 490),
+ Box(491, 491),
+ Box(492, 492),
+ Box(493, 493),
+ Box(494, 494),
+ Box(495, 495),
+ Box(496, 496),
+ Box(497, 497),
+ Box(498, 498),
+ Box(499, 499),
+ Box(500, 500),
+ Box(501, 501),
+ Box(502, 502),
+ Box(503, 503),
+ Box(504, 504),
+ Box(505, 505),
+ Box(506, 506),
+ Box(507, 507),
+ Box(508, 508),
+ Box(509, 509),
+ Box(510, 510),
+ Box(511, 511),
+ Box(512, 512),
+ Box(513, 513),
+ Box(514, 514),
+ Box(515, 515),
+ Box(516, 516),
+ Box(517, 517),
+ Box(518, 518),
+ Box(519, 519),
+ Box(520, 520),
+ Box(521, 521),
+ Box(522, 522),
+ Box(523, 523),
+ Box(524, 524),
+ Box(525, 525),
+ Box(526, 526),
+ Box(527, 527),
+ Box(528, 528),
+ Box(529, 529),
+ Box(530, 530),
+ Box(531, 531),
+ Box(532, 532),
+ Box(533, 533),
+ Box(534, 534),
+ Box(535, 535),
+ Box(536, 536),
+ Box(537, 537),
+ Box(538, 538),
+ Box(539, 539),
+ Box(540, 540),
+ Box(541, 541),
+ Box(542, 542),
+ Box(543, 543),
+ Box(544, 544),
+ Box(545, 545),
+ Box(546, 546),
+ Box(547, 547),
+ Box(548, 548),
+ Box(549, 549),
+ Box(550, 550),
+ Box(551, 551),
+ Box(552, 552),
+ Box(553, 553),
+ Box(554, 554),
+ Box(555, 555),
+ Box(556, 556),
+ Box(557, 557),
+ Box(558, 558),
+ Box(559, 559),
+ Box(560, 560),
+ Box(561, 561),
+ Box(562, 562),
+ Box(563, 563),
+ Box(564, 564),
+ Box(565, 565),
+ Box(566, 566),
+ Box(567, 567),
+ Box(568, 568),
+ Box(569, 569),
+ Box(570, 570),
+ Box(571, 571),
+ Box(572, 572),
+ Box(573, 573),
+ Box(574, 574),
+ Box(575, 575),
+ Box(576, 576),
+ Box(577, 577),
+ Box(578, 578),
+ Box(579, 579),
+ Box(580, 580),
+ Box(581, 581),
+ Box(582, 582),
+ Box(583, 583),
+ Box(584, 584),
+ Box(585, 585),
+ Box(586, 586),
+ Box(587, 587),
+ Box(588, 588),
+ Box(589, 589),
+ Box(590, 590),
+ Box(591, 591),
+ Box(592, 592),
+ Box(593, 593),
+ Box(594, 594),
+ Box(595, 595),
+ Box(596, 596),
+ Box(597, 597),
+ Box(598, 598),
+ Box(599, 599),
+ Box(600, 600),
+ Box(601, 601),
+ Box(602, 602),
+ Box(603, 603),
+ Box(604, 604),
+ Box(605, 605),
+ Box(606, 606),
+ Box(607, 607),
+ Box(608, 608),
+ Box(609, 609),
+ Box(610, 610),
+ Box(611, 611),
+ Box(612, 612),
+ Box(613, 613),
+ Box(614, 614),
+ Box(615, 615),
+ Box(616, 616),
+ Box(617, 617),
+ Box(618, 618),
+ Box(619, 619),
+ Box(620, 620),
+ Box(621, 621),
+ Box(622, 622),
+ Box(623, 623),
+ Box(624, 624),
+ Box(625, 625),
+ Box(626, 626),
+ Box(627, 627),
+ Box(628, 628),
+ Box(629, 629),
+ Box(630, 630),
+ Box(631, 631),
+ Box(632, 632),
+ Box(633, 633),
+ Box(634, 634),
+ Box(635, 635),
+ Box(636, 636),
+ Box(637, 637),
+ Box(638, 638),
+ Box(639, 639),
+ Box(640, 640),
+ Box(641, 641),
+ Box(642, 642),
+ Box(643, 643),
+ Box(644, 644),
+ Box(645, 645),
+ Box(646, 646),
+ Box(647, 647),
+ Box(648, 648),
+ Box(649, 649),
+ Box(650, 650),
+ Box(651, 651),
+ Box(652, 652),
+ Box(653, 653),
+ Box(654, 654),
+ Box(655, 655),
+ Box(656, 656),
+ Box(657, 657),
+ Box(658, 658),
+ Box(659, 659),
+ Box(660, 660),
+ Box(661, 661),
+ Box(662, 662),
+ Box(663, 663),
+ Box(664, 664),
+ Box(665, 665),
+ Box(666, 666),
+ Box(667, 667),
+ Box(668, 668),
+ Box(669, 669),
+ Box(670, 670),
+ Box(671, 671),
+ Box(672, 672),
+ Box(673, 673),
+ Box(674, 674),
+ Box(675, 675),
+ Box(676, 676),
+ Box(677, 677),
+ Box(678, 678),
+ Box(679, 679),
+ Box(680, 680),
+ Box(681, 681),
+ Box(682, 682),
+ Box(683, 683),
+ Box(684, 684),
+ Box(685, 685),
+ Box(686, 686),
+ Box(687, 687),
+ Box(688, 688),
+ Box(689, 689),
+ Box(690, 690),
+ Box(691, 691),
+ Box(692, 692),
+ Box(693, 693),
+ Box(694, 694),
+ Box(695, 695),
+ Box(696, 696),
+ Box(697, 697),
+ Box(698, 698),
+ Box(699, 699),
+ Box(700, 700),
+ Box(701, 701),
+ Box(702, 702),
+ Box(703, 703),
+ Box(704, 704),
+ Box(705, 705),
+ Box(706, 706),
+ Box(707, 707),
+ Box(708, 708),
+ Box(709, 709),
+ Box(710, 710),
+ Box(711, 711),
+ Box(712, 712),
+ Box(713, 713),
+ Box(714, 714),
+ Box(715, 715),
+ Box(716, 716),
+ Box(717, 717),
+ Box(718, 718),
+ Box(719, 719),
+ Box(720, 720),
+ Box(721, 721),
+ Box(722, 722),
+ Box(723, 723),
+ Box(724, 724),
+ Box(725, 725),
+ Box(726, 726),
+ Box(727, 727),
+ Box(728, 728),
+ Box(729, 729),
+ Box(730, 730),
+ Box(731, 731),
+ Box(732, 732),
+ Box(733, 733),
+ Box(734, 734),
+ Box(735, 735),
+ Box(736, 736),
+ Box(737, 737),
+ Box(738, 738),
+ Box(739, 739),
+ Box(740, 740),
+ Box(741, 741),
+ Box(742, 742),
+ Box(743, 743),
+ Box(744, 744),
+ Box(745, 745),
+ Box(746, 746),
+ Box(747, 747),
+ Box(748, 748),
+ Box(749, 749),
+ Box(750, 750),
+ Box(751, 751),
+ Box(752, 752),
+ Box(753, 753),
+ Box(754, 754),
+ Box(755, 755),
+ Box(756, 756),
+ Box(757, 757),
+ Box(758, 758),
+ Box(759, 759),
+ Box(760, 760),
+ Box(761, 761),
+ Box(762, 762),
+ Box(763, 763),
+ Box(764, 764),
+ Box(765, 765),
+ Box(766, 766),
+ Box(767, 767),
+ Box(768, 768),
+ Box(769, 769),
+ Box(770, 770),
+ Box(771, 771),
+ Box(772, 772),
+ Box(773, 773),
+ Box(774, 774),
+ Box(775, 775),
+ Box(776, 776),
+ Box(777, 777),
+ Box(778, 778),
+ Box(779, 779),
+ Box(780, 780),
+ Box(781, 781),
+ Box(782, 782),
+ Box(783, 783),
+ Box(784, 784),
+ Box(785, 785),
+ Box(786, 786),
+ Box(787, 787),
+ Box(788, 788),
+ Box(789, 789),
+ Box(790, 790),
+ Box(791, 791),
+ Box(792, 792),
+ Box(793, 793),
+ Box(794, 794),
+ Box(795, 795),
+ Box(796, 796),
+ Box(797, 797),
+ Box(798, 798),
+ Box(799, 799),
+ Box(800, 800),
+ Box(801, 801),
+ Box(802, 802),
+ Box(803, 803),
+ Box(804, 804),
+ Box(805, 805),
+ Box(806, 806),
+ Box(807, 807),
+ Box(808, 808),
+ Box(809, 809),
+ Box(810, 810),
+ Box(811, 811),
+ Box(812, 812),
+ Box(813, 813),
+ Box(814, 814),
+ Box(815, 815),
+ Box(816, 816),
+ Box(817, 817),
+ Box(818, 818),
+ Box(819, 819),
+ Box(820, 820),
+ Box(821, 821),
+ Box(822, 822),
+ Box(823, 823),
+ Box(824, 824),
+ Box(825, 825),
+ Box(826, 826),
+ Box(827, 827),
+ Box(828, 828),
+ Box(829, 829),
+ Box(830, 830),
+ Box(831, 831),
+ Box(832, 832),
+ Box(833, 833),
+ Box(834, 834),
+ Box(835, 835),
+ Box(836, 836),
+ Box(837, 837),
+ Box(838, 838),
+ Box(839, 839),
+ Box(840, 840),
+ Box(841, 841),
+ Box(842, 842),
+ Box(843, 843),
+ Box(844, 844),
+ Box(845, 845),
+ Box(846, 846),
+ Box(847, 847),
+ Box(848, 848),
+ Box(849, 849),
+ Box(850, 850),
+ Box(851, 851),
+ Box(852, 852),
+ Box(853, 853),
+ Box(854, 854),
+ Box(855, 855),
+ Box(856, 856),
+ Box(857, 857),
+ Box(858, 858),
+ Box(859, 859),
+ Box(860, 860),
+ Box(861, 861),
+ Box(862, 862),
+ Box(863, 863),
+ Box(864, 864),
+ Box(865, 865),
+ Box(866, 866),
+ Box(867, 867),
+ Box(868, 868),
+ Box(869, 869),
+ Box(870, 870),
+ Box(871, 871),
+ Box(872, 872),
+ Box(873, 873),
+ Box(874, 874),
+ Box(875, 875),
+ Box(876, 876),
+ Box(877, 877),
+ Box(878, 878),
+ Box(879, 879),
+ Box(880, 880),
+ Box(881, 881),
+ Box(882, 882),
+ Box(883, 883),
+ Box(884, 884),
+ Box(885, 885),
+ Box(886, 886),
+ Box(887, 887),
+ Box(888, 888),
+ Box(889, 889),
+ Box(890, 890),
+ Box(891, 891),
+ Box(892, 892),
+ Box(893, 893),
+ Box(894, 894),
+ Box(895, 895),
+ Box(896, 896),
+ Box(897, 897),
+ Box(898, 898),
+ Box(899, 899),
+ Box(900, 900),
+ Box(901, 901),
+ Box(902, 902),
+ Box(903, 903),
+ Box(904, 904),
+ Box(905, 905),
+ Box(906, 906),
+ Box(907, 907),
+ Box(908, 908),
+ Box(909, 909),
+ Box(910, 910),
+ Box(911, 911),
+ Box(912, 912),
+ Box(913, 913),
+ Box(914, 914),
+ Box(915, 915),
+ Box(916, 916),
+ Box(917, 917),
+ Box(918, 918),
+ Box(919, 919),
+ Box(920, 920),
+ Box(921, 921),
+ Box(922, 922),
+ Box(923, 923),
+ Box(924, 924),
+ Box(925, 925),
+ Box(926, 926),
+ Box(927, 927),
+ Box(928, 928),
+ Box(929, 929),
+ Box(930, 930),
+ Box(931, 931),
+ Box(932, 932),
+ Box(933, 933),
+ Box(934, 934),
+ Box(935, 935),
+ Box(936, 936),
+ Box(937, 937),
+ Box(938, 938),
+ Box(939, 939),
+ Box(940, 940),
+ Box(941, 941),
+ Box(942, 942),
+ Box(943, 943),
+ Box(944, 944),
+ Box(945, 945),
+ Box(946, 946),
+ Box(947, 947),
+ Box(948, 948),
+ Box(949, 949),
+ Box(950, 950),
+ Box(951, 951),
+ Box(952, 952),
+ Box(953, 953),
+ Box(954, 954),
+ Box(955, 955),
+ Box(956, 956),
+ Box(957, 957),
+ Box(958, 958),
+ Box(959, 959),
+ Box(960, 960),
+ Box(961, 961),
+ Box(962, 962),
+ Box(963, 963),
+ Box(964, 964),
+ Box(965, 965),
+ Box(966, 966),
+ Box(967, 967),
+ Box(968, 968),
+ Box(969, 969),
+ Box(970, 970),
+ Box(971, 971),
+ Box(972, 972),
+ Box(973, 973),
+ Box(974, 974),
+ Box(975, 975),
+ Box(976, 976),
+ Box(977, 977),
+ Box(978, 978),
+ Box(979, 979),
+ Box(980, 980),
+ Box(981, 981),
+ Box(982, 982),
+ Box(983, 983),
+ Box(984, 984),
+ Box(985, 985),
+ Box(986, 986),
+ Box(987, 987),
+ Box(988, 988),
+ Box(989, 989),
+ Box(990, 990),
+ Box(991, 991),
+ Box(992, 992),
+ Box(993, 993),
+ Box(994, 994),
+ Box(995, 995),
+ Box(996, 996),
+ Box(997, 997),
+ Box(998, 998),
+ Box(999, 999),
+ Box(1000, 1000),
+ Box(1001, 1001),
+ Box(1002, 1002),
+ Box(1003, 1003),
+ Box(1004, 1004),
+ Box(1005, 1005),
+ Box(1006, 1006),
+ Box(1007, 1007),
+ Box(1008, 1008),
+ Box(1009, 1009),
+ Box(1010, 1010),
+ Box(1011, 1011),
+ Box(1012, 1012),
+ Box(1013, 1013),
+ Box(1014, 1014),
+ Box(1015, 1015),
+ Box(1016, 1016),
+ Box(1017, 1017),
+ Box(1018, 1018),
+ Box(1019, 1019),
+ Box(1020, 1020),
+ Box(1021, 1021),
+ Box(1022, 1022),
+ Box(1023, 1023),
+ Box(1024, 1024),
+ Box(1025, 1025),
+ Box(1026, 1026),
+ Box(1027, 1027),
+ Box(1028, 1028),
+ Box(1029, 1029),
+ Box(1030, 1030),
+ Box(1031, 1031),
+ Box(1032, 1032),
+ Box(1033, 1033),
+ Box(1034, 1034),
+ Box(1035, 1035),
+ Box(1036, 1036),
+ Box(1037, 1037),
+ Box(1038, 1038),
+ Box(1039, 1039),
+ Box(1040, 1040),
+ Box(1041, 1041),
+ Box(1042, 1042),
+ Box(1043, 1043),
+ Box(1044, 1044),
+ Box(1045, 1045),
+ Box(1046, 1046),
+ Box(1047, 1047),
+ Box(1048, 1048),
+ Box(1049, 1049),
+ Box(1050, 1050),
+ Box(1051, 1051),
+ Box(1052, 1052),
+ Box(1053, 1053),
+ Box(1054, 1054),
+ Box(1055, 1055),
+ Box(1056, 1056),
+ Box(1057, 1057),
+ Box(1058, 1058),
+ Box(1059, 1059),
+ Box(1060, 1060),
+ Box(1061, 1061),
+ Box(1062, 1062),
+ Box(1063, 1063),
+ Box(1064, 1064),
+ Box(1065, 1065),
+ Box(1066, 1066),
+ Box(1067, 1067),
+ Box(1068, 1068),
+ Box(1069, 1069),
+ Box(1070, 1070),
+ Box(1071, 1071),
+ Box(1072, 1072),
+ Box(1073, 1073),
+ Box(1074, 1074),
+ Box(1075, 1075),
+ Box(1076, 1076),
+ Box(1077, 1077),
+ Box(1078, 1078),
+ Box(1079, 1079),
+ Box(1080, 1080),
+ Box(1081, 1081),
+ Box(1082, 1082),
+ Box(1083, 1083),
+ Box(1084, 1084),
+ Box(1085, 1085),
+ Box(1086, 1086),
+ Box(1087, 1087),
+ Box(1088, 1088),
+ Box(1089, 1089),
+ Box(1090, 1090),
+ Box(1091, 1091),
+ Box(1092, 1092),
+ Box(1093, 1093),
+ Box(1094, 1094),
+ Box(1095, 1095),
+ Box(1096, 1096),
+ Box(1097, 1097),
+ Box(1098, 1098),
+ Box(1099, 1099),
+ Box(1100, 1100),
+ Box(1101, 1101),
+ Box(1102, 1102),
+ Box(1103, 1103),
+ Box(1104, 1104),
+ Box(1105, 1105),
+ Box(1106, 1106),
+ Box(1107, 1107),
+ Box(1108, 1108),
+ Box(1109, 1109),
+ Box(1110, 1110),
+ Box(1111, 1111),
+ Box(1112, 1112),
+ Box(1113, 1113),
+ Box(1114, 1114),
+ Box(1115, 1115),
+ Box(1116, 1116),
+ Box(1117, 1117),
+ Box(1118, 1118),
+ Box(1119, 1119),
+ Box(1120, 1120),
+ Box(1121, 1121),
+ Box(1122, 1122),
+ Box(1123, 1123),
+ Box(1124, 1124),
+ Box(1125, 1125),
+ Box(1126, 1126),
+ Box(1127, 1127),
+ Box(1128, 1128),
+ Box(1129, 1129),
+ Box(1130, 1130),
+ Box(1131, 1131),
+ Box(1132, 1132),
+ Box(1133, 1133),
+ Box(1134, 1134),
+ Box(1135, 1135),
+ Box(1136, 1136),
+ Box(1137, 1137),
+ Box(1138, 1138),
+ Box(1139, 1139),
+ Box(1140, 1140),
+ Box(1141, 1141),
+ Box(1142, 1142),
+ Box(1143, 1143),
+ Box(1144, 1144),
+ Box(1145, 1145),
+ Box(1146, 1146),
+ Box(1147, 1147),
+ Box(1148, 1148),
+ Box(1149, 1149),
+ Box(1150, 1150),
+ Box(1151, 1151),
+ Box(1152, 1152),
+ Box(1153, 1153),
+ Box(1154, 1154),
+ Box(1155, 1155),
+ Box(1156, 1156),
+ Box(1157, 1157),
+ Box(1158, 1158),
+ Box(1159, 1159),
+ Box(1160, 1160),
+ Box(1161, 1161),
+ Box(1162, 1162),
+ Box(1163, 1163),
+ Box(1164, 1164),
+ Box(1165, 1165),
+ Box(1166, 1166),
+ Box(1167, 1167),
+ Box(1168, 1168),
+ Box(1169, 1169),
+ Box(1170, 1170),
+ Box(1171, 1171),
+ Box(1172, 1172),
+ Box(1173, 1173),
+ Box(1174, 1174),
+ Box(1175, 1175),
+ Box(1176, 1176),
+ Box(1177, 1177),
+ Box(1178, 1178),
+ Box(1179, 1179),
+ Box(1180, 1180),
+ Box(1181, 1181),
+ Box(1182, 1182),
+ Box(1183, 1183),
+ Box(1184, 1184),
+ Box(1185, 1185),
+ Box(1186, 1186),
+ Box(1187, 1187),
+ Box(1188, 1188),
+ Box(1189, 1189),
+ Box(1190, 1190),
+ Box(1191, 1191),
+ Box(1192, 1192),
+ Box(1193, 1193),
+ Box(1194, 1194),
+ Box(1195, 1195),
+ Box(1196, 1196),
+ Box(1197, 1197),
+ Box(1198, 1198),
+ Box(1199, 1199),
+ Box(1200, 1200),
+ Box(1201, 1201),
+ Box(1202, 1202),
+ Box(1203, 1203),
+ Box(1204, 1204),
+ Box(1205, 1205),
+ Box(1206, 1206),
+ Box(1207, 1207),
+ Box(1208, 1208),
+ Box(1209, 1209),
+ Box(1210, 1210),
+ Box(1211, 1211),
+ Box(1212, 1212),
+ Box(1213, 1213),
+ Box(1214, 1214),
+ Box(1215, 1215),
+ Box(1216, 1216),
+ Box(1217, 1217),
+ Box(1218, 1218),
+ Box(1219, 1219),
+ Box(1220, 1220),
+ Box(1221, 1221),
+ Box(1222, 1222),
+ Box(1223, 1223),
+ Box(1224, 1224),
+ Box(1225, 1225),
+ Box(1226, 1226),
+ Box(1227, 1227),
+ Box(1228, 1228),
+ Box(1229, 1229),
+ Box(1230, 1230),
+ Box(1231, 1231),
+ Box(1232, 1232),
+ Box(1233, 1233),
+ Box(1234, 1234),
+ Box(1235, 1235),
+ Box(1236, 1236),
+ Box(1237, 1237),
+ Box(1238, 1238),
+ Box(1239, 1239),
+ Box(1240, 1240),
+ Box(1241, 1241),
+ Box(1242, 1242),
+ Box(1243, 1243),
+ Box(1244, 1244),
+ Box(1245, 1245),
+ Box(1246, 1246),
+ Box(1247, 1247),
+ Box(1248, 1248),
+ Box(1249, 1249),
+ Box(1250, 1250),
+ Box(1251, 1251),
+ Box(1252, 1252),
+ Box(1253, 1253),
+ Box(1254, 1254),
+ Box(1255, 1255),
+ Box(1256, 1256),
+ Box(1257, 1257),
+ Box(1258, 1258),
+ Box(1259, 1259),
+ Box(1260, 1260),
+ Box(1261, 1261),
+ Box(1262, 1262),
+ Box(1263, 1263),
+ Box(1264, 1264),
+ Box(1265, 1265),
+ Box(1266, 1266),
+ Box(1267, 1267),
+ Box(1268, 1268),
+ Box(1269, 1269),
+ Box(1270, 1270),
+ Box(1271, 1271),
+ Box(1272, 1272),
+ Box(1273, 1273),
+ Box(1274, 1274),
+ Box(1275, 1275),
+ Box(1276, 1276),
+ Box(1277, 1277),
+ Box(1278, 1278),
+ Box(1279, 1279),
+ Box(1280, 1280),
+ Box(1281, 1281),
+ Box(1282, 1282),
+ Box(1283, 1283),
+ Box(1284, 1284),
+ Box(1285, 1285),
+ Box(1286, 1286),
+ Box(1287, 1287),
+ Box(1288, 1288),
+ Box(1289, 1289),
+ Box(1290, 1290),
+ Box(1291, 1291),
+ Box(1292, 1292),
+ Box(1293, 1293),
+ Box(1294, 1294),
+ Box(1295, 1295),
+ Box(1296, 1296),
+ Box(1297, 1297),
+ Box(1298, 1298),
+ Box(1299, 1299),
+ Box(1300, 1300),
+ Box(1301, 1301),
+ Box(1302, 1302),
+ Box(1303, 1303),
+ Box(1304, 1304),
+ Box(1305, 1305),
+ Box(1306, 1306),
+ Box(1307, 1307),
+ Box(1308, 1308),
+ Box(1309, 1309),
+ Box(1310, 1310),
+ Box(1311, 1311),
+ Box(1312, 1312),
+ Box(1313, 1313),
+ Box(1314, 1314),
+ Box(1315, 1315),
+ Box(1316, 1316),
+ Box(1317, 1317),
+ Box(1318, 1318),
+ Box(1319, 1319),
+ Box(1320, 1320),
+ Box(1321, 1321),
+ Box(1322, 1322),
+ Box(1323, 1323),
+ Box(1324, 1324),
+ Box(1325, 1325),
+ Box(1326, 1326),
+ Box(1327, 1327),
+ Box(1328, 1328),
+ Box(1329, 1329),
+ Box(1330, 1330),
+ Box(1331, 1331),
+ Box(1332, 1332),
+ Box(1333, 1333),
+ Box(1334, 1334),
+ Box(1335, 1335),
+ Box(1336, 1336),
+ Box(1337, 1337),
+ Box(1338, 1338),
+ Box(1339, 1339),
+ Box(1340, 1340),
+ Box(1341, 1341),
+ Box(1342, 1342),
+ Box(1343, 1343),
+ Box(1344, 1344),
+ Box(1345, 1345),
+ Box(1346, 1346),
+ Box(1347, 1347),
+ Box(1348, 1348),
+ Box(1349, 1349),
+ Box(1350, 1350),
+ Box(1351, 1351),
+ Box(1352, 1352),
+ Box(1353, 1353),
+ Box(1354, 1354),
+ Box(1355, 1355),
+ Box(1356, 1356),
+ Box(1357, 1357),
+ Box(1358, 1358),
+ Box(1359, 1359),
+ Box(1360, 1360),
+ Box(1361, 1361),
+ Box(1362, 1362),
+ Box(1363, 1363),
+ Box(1364, 1364),
+ Box(1365, 1365),
+ Box(1366, 1366),
+ Box(1367, 1367),
+ Box(1368, 1368),
+ Box(1369, 1369),
+ Box(1370, 1370),
+ Box(1371, 1371),
+ Box(1372, 1372),
+ Box(1373, 1373),
+ Box(1374, 1374),
+ Box(1375, 1375),
+ Box(1376, 1376),
+ Box(1377, 1377),
+ Box(1378, 1378),
+ Box(1379, 1379),
+ Box(1380, 1380),
+ Box(1381, 1381),
+ Box(1382, 1382),
+ Box(1383, 1383),
+ Box(1384, 1384),
+ Box(1385, 1385),
+ Box(1386, 1386),
+ Box(1387, 1387),
+ Box(1388, 1388),
+ Box(1389, 1389),
+ Box(1390, 1390),
+ Box(1391, 1391),
+ Box(1392, 1392),
+ Box(1393, 1393),
+ Box(1394, 1394),
+ Box(1395, 1395),
+ Box(1396, 1396),
+ Box(1397, 1397),
+ Box(1398, 1398),
+ Box(1399, 1399),
+ Box(1400, 1400),
+ Box(1401, 1401),
+ Box(1402, 1402),
+ Box(1403, 1403),
+ Box(1404, 1404),
+ Box(1405, 1405),
+ Box(1406, 1406),
+ Box(1407, 1407),
+ Box(1408, 1408),
+ Box(1409, 1409),
+ Box(1410, 1410),
+ Box(1411, 1411),
+ Box(1412, 1412),
+ Box(1413, 1413),
+ Box(1414, 1414),
+ Box(1415, 1415),
+ Box(1416, 1416),
+ Box(1417, 1417),
+ Box(1418, 1418),
+ Box(1419, 1419),
+ Box(1420, 1420),
+ Box(1421, 1421),
+ Box(1422, 1422),
+ Box(1423, 1423),
+ Box(1424, 1424),
+ Box(1425, 1425),
+ Box(1426, 1426),
+ Box(1427, 1427),
+ Box(1428, 1428),
+ Box(1429, 1429),
+ Box(1430, 1430),
+ Box(1431, 1431),
+ Box(1432, 1432),
+ Box(1433, 1433),
+ Box(1434, 1434),
+ Box(1435, 1435),
+ Box(1436, 1436),
+ Box(1437, 1437),
+ Box(1438, 1438),
+ Box(1439, 1439),
+ Box(1440, 1440),
+ Box(1441, 1441),
+ Box(1442, 1442),
+ Box(1443, 1443),
+ Box(1444, 1444),
+ Box(1445, 1445),
+ Box(1446, 1446),
+ Box(1447, 1447),
+ Box(1448, 1448),
+ Box(1449, 1449),
+ Box(1450, 1450),
+ Box(1451, 1451),
+ Box(1452, 1452),
+ Box(1453, 1453),
+ Box(1454, 1454),
+ Box(1455, 1455),
+ Box(1456, 1456),
+ Box(1457, 1457),
+ Box(1458, 1458),
+ Box(1459, 1459),
+ Box(1460, 1460),
+ Box(1461, 1461),
+ Box(1462, 1462),
+ Box(1463, 1463),
+ Box(1464, 1464),
+ Box(1465, 1465),
+ Box(1466, 1466),
+ Box(1467, 1467),
+ Box(1468, 1468),
+ Box(1469, 1469),
+ Box(1470, 1470),
+ Box(1471, 1471),
+ Box(1472, 1472),
+ Box(1473, 1473),
+ Box(1474, 1474),
+ Box(1475, 1475),
+ Box(1476, 1476),
+ Box(1477, 1477),
+ Box(1478, 1478),
+ Box(1479, 1479),
+ Box(1480, 1480),
+ Box(1481, 1481),
+ Box(1482, 1482),
+ Box(1483, 1483),
+ Box(1484, 1484),
+ Box(1485, 1485),
+ Box(1486, 1486),
+ Box(1487, 1487),
+ Box(1488, 1488),
+ Box(1489, 1489),
+ Box(1490, 1490),
+ Box(1491, 1491),
+ Box(1492, 1492),
+ Box(1493, 1493),
+ Box(1494, 1494),
+ Box(1495, 1495),
+ Box(1496, 1496),
+ Box(1497, 1497),
+ Box(1498, 1498),
+ Box(1499, 1499),
+ Box(1500, 1500),
+ Box(1501, 1501),
+ Box(1502, 1502),
+ Box(1503, 1503),
+ Box(1504, 1504),
+ Box(1505, 1505),
+ Box(1506, 1506),
+ Box(1507, 1507),
+ Box(1508, 1508),
+ Box(1509, 1509),
+ Box(1510, 1510),
+ Box(1511, 1511),
+ Box(1512, 1512),
+ Box(1513, 1513),
+ Box(1514, 1514),
+ Box(1515, 1515),
+ Box(1516, 1516),
+ Box(1517, 1517),
+ Box(1518, 1518),
+ Box(1519, 1519),
+ Box(1520, 1520),
+ Box(1521, 1521),
+ Box(1522, 1522),
+ Box(1523, 1523),
+ Box(1524, 1524),
+ Box(1525, 1525),
+ Box(1526, 1526),
+ Box(1527, 1527),
+ Box(1528, 1528),
+ Box(1529, 1529),
+ Box(1530, 1530),
+ Box(1531, 1531),
+ Box(1532, 1532),
+ Box(1533, 1533),
+ Box(1534, 1534),
+ Box(1535, 1535),
+ Box(1536, 1536),
+ Box(1537, 1537),
+ Box(1538, 1538),
+ Box(1539, 1539),
+ Box(1540, 1540),
+ Box(1541, 1541),
+ Box(1542, 1542),
+ Box(1543, 1543),
+ Box(1544, 1544),
+ Box(1545, 1545),
+ Box(1546, 1546),
+ Box(1547, 1547),
+ Box(1548, 1548),
+ Box(1549, 1549),
+ Box(1550, 1550),
+ Box(1551, 1551),
+ Box(1552, 1552),
+ Box(1553, 1553),
+ Box(1554, 1554),
+ Box(1555, 1555),
+ Box(1556, 1556),
+ Box(1557, 1557),
+ Box(1558, 1558),
+ Box(1559, 1559),
+ Box(1560, 1560),
+ Box(1561, 1561),
+ Box(1562, 1562),
+ Box(1563, 1563),
+ Box(1564, 1564),
+ Box(1565, 1565),
+ Box(1566, 1566),
+ Box(1567, 1567),
+ Box(1568, 1568),
+ Box(1569, 1569),
+ Box(1570, 1570),
+ Box(1571, 1571),
+ Box(1572, 1572),
+ Box(1573, 1573),
+ Box(1574, 1574),
+ Box(1575, 1575),
+ Box(1576, 1576),
+ Box(1577, 1577),
+ Box(1578, 1578),
+ Box(1579, 1579),
+ Box(1580, 1580),
+ Box(1581, 1581),
+ Box(1582, 1582),
+ Box(1583, 1583),
+ Box(1584, 1584),
+ Box(1585, 1585),
+ Box(1586, 1586),
+ Box(1587, 1587),
+ Box(1588, 1588),
+ Box(1589, 1589),
+ Box(1590, 1590),
+ Box(1591, 1591),
+ Box(1592, 1592),
+ Box(1593, 1593),
+ Box(1594, 1594),
+ Box(1595, 1595),
+ Box(1596, 1596),
+ Box(1597, 1597),
+ Box(1598, 1598),
+ Box(1599, 1599),
+ Box(1600, 1600),
+ Box(1601, 1601),
+ Box(1602, 1602),
+ Box(1603, 1603),
+ Box(1604, 1604),
+ Box(1605, 1605),
+ Box(1606, 1606),
+ Box(1607, 1607),
+ Box(1608, 1608),
+ Box(1609, 1609),
+ Box(1610, 1610),
+ Box(1611, 1611),
+ Box(1612, 1612),
+ Box(1613, 1613),
+ Box(1614, 1614),
+ Box(1615, 1615),
+ Box(1616, 1616),
+ Box(1617, 1617),
+ Box(1618, 1618),
+ Box(1619, 1619),
+ Box(1620, 1620),
+ Box(1621, 1621),
+ Box(1622, 1622),
+ Box(1623, 1623),
+ Box(1624, 1624),
+ Box(1625, 1625),
+ Box(1626, 1626),
+ Box(1627, 1627),
+ Box(1628, 1628),
+ Box(1629, 1629),
+ Box(1630, 1630),
+ Box(1631, 1631),
+ Box(1632, 1632),
+ Box(1633, 1633),
+ Box(1634, 1634),
+ Box(1635, 1635),
+ Box(1636, 1636),
+ Box(1637, 1637),
+ Box(1638, 1638),
+ Box(1639, 1639),
+ Box(1640, 1640),
+ Box(1641, 1641),
+ Box(1642, 1642),
+ Box(1643, 1643),
+ Box(1644, 1644),
+ Box(1645, 1645),
+ Box(1646, 1646),
+ Box(1647, 1647),
+ Box(1648, 1648),
+ Box(1649, 1649),
+ Box(1650, 1650),
+ Box(1651, 1651),
+ Box(1652, 1652),
+ Box(1653, 1653),
+ Box(1654, 1654),
+ Box(1655, 1655),
+ Box(1656, 1656),
+ Box(1657, 1657),
+ Box(1658, 1658),
+ Box(1659, 1659),
+ Box(1660, 1660),
+ Box(1661, 1661),
+ Box(1662, 1662),
+ Box(1663, 1663),
+ Box(1664, 1664),
+ Box(1665, 1665),
+ Box(1666, 1666),
+ Box(1667, 1667),
+ Box(1668, 1668),
+ Box(1669, 1669),
+ Box(1670, 1670),
+ Box(1671, 1671),
+ Box(1672, 1672),
+ Box(1673, 1673),
+ Box(1674, 1674),
+ Box(1675, 1675),
+ Box(1676, 1676),
+ Box(1677, 1677),
+ Box(1678, 1678),
+ Box(1679, 1679),
+ Box(1680, 1680),
+ Box(1681, 1681),
+ Box(1682, 1682),
+ Box(1683, 1683),
+ Box(1684, 1684),
+ Box(1685, 1685),
+ Box(1686, 1686),
+ Box(1687, 1687),
+ Box(1688, 1688),
+ Box(1689, 1689),
+ Box(1690, 1690),
+ Box(1691, 1691),
+ Box(1692, 1692),
+ Box(1693, 1693),
+ Box(1694, 1694),
+ Box(1695, 1695),
+ Box(1696, 1696),
+ Box(1697, 1697),
+ Box(1698, 1698),
+ Box(1699, 1699),
+ Box(1700, 1700),
+ Box(1701, 1701),
+ Box(1702, 1702),
+ Box(1703, 1703),
+ Box(1704, 1704),
+ Box(1705, 1705),
+ Box(1706, 1706),
+ Box(1707, 1707),
+ Box(1708, 1708),
+ Box(1709, 1709),
+ Box(1710, 1710),
+ Box(1711, 1711),
+ Box(1712, 1712),
+ Box(1713, 1713),
+ Box(1714, 1714),
+ Box(1715, 1715),
+ Box(1716, 1716),
+ Box(1717, 1717),
+ Box(1718, 1718),
+ Box(1719, 1719),
+ Box(1720, 1720),
+ Box(1721, 1721),
+ Box(1722, 1722),
+ Box(1723, 1723),
+ Box(1724, 1724),
+ Box(1725, 1725),
+ Box(1726, 1726),
+ Box(1727, 1727),
+ Box(1728, 1728),
+ Box(1729, 1729),
+ Box(1730, 1730),
+ Box(1731, 1731),
+ Box(1732, 1732),
+ Box(1733, 1733),
+ Box(1734, 1734),
+ Box(1735, 1735),
+ Box(1736, 1736),
+ Box(1737, 1737),
+ Box(1738, 1738),
+ Box(1739, 1739),
+ Box(1740, 1740),
+ Box(1741, 1741),
+ Box(1742, 1742),
+ Box(1743, 1743),
+ Box(1744, 1744),
+ Box(1745, 1745),
+ Box(1746, 1746),
+ Box(1747, 1747),
+ Box(1748, 1748),
+ Box(1749, 1749),
+ Box(1750, 1750),
+ Box(1751, 1751),
+ Box(1752, 1752),
+ Box(1753, 1753),
+ Box(1754, 1754),
+ Box(1755, 1755),
+ Box(1756, 1756),
+ Box(1757, 1757),
+ Box(1758, 1758),
+ Box(1759, 1759),
+ Box(1760, 1760),
+ Box(1761, 1761),
+ Box(1762, 1762),
+ Box(1763, 1763),
+ Box(1764, 1764),
+ Box(1765, 1765),
+ Box(1766, 1766),
+ Box(1767, 1767),
+ Box(1768, 1768),
+ Box(1769, 1769),
+ Box(1770, 1770),
+ Box(1771, 1771),
+ Box(1772, 1772),
+ Box(1773, 1773),
+ Box(1774, 1774),
+ Box(1775, 1775),
+ Box(1776, 1776),
+ Box(1777, 1777),
+ Box(1778, 1778),
+ Box(1779, 1779),
+ Box(1780, 1780),
+ Box(1781, 1781),
+ Box(1782, 1782),
+ Box(1783, 1783),
+ Box(1784, 1784),
+ Box(1785, 1785),
+ Box(1786, 1786),
+ Box(1787, 1787),
+ Box(1788, 1788),
+ Box(1789, 1789),
+ Box(1790, 1790),
+ Box(1791, 1791),
+ Box(1792, 1792),
+ Box(1793, 1793),
+ Box(1794, 1794),
+ Box(1795, 1795),
+ Box(1796, 1796),
+ Box(1797, 1797),
+ Box(1798, 1798),
+ Box(1799, 1799),
+ Box(1800, 1800),
+ Box(1801, 1801),
+ Box(1802, 1802),
+ Box(1803, 1803),
+ Box(1804, 1804),
+ Box(1805, 1805),
+ Box(1806, 1806),
+ Box(1807, 1807),
+ Box(1808, 1808),
+ Box(1809, 1809),
+ Box(1810, 1810),
+ Box(1811, 1811),
+ Box(1812, 1812),
+ Box(1813, 1813),
+ Box(1814, 1814),
+ Box(1815, 1815),
+ Box(1816, 1816),
+ Box(1817, 1817),
+ Box(1818, 1818),
+ Box(1819, 1819),
+ Box(1820, 1820),
+ Box(1821, 1821),
+ Box(1822, 1822),
+ Box(1823, 1823),
+ Box(1824, 1824),
+ Box(1825, 1825),
+ Box(1826, 1826),
+ Box(1827, 1827),
+ Box(1828, 1828),
+ Box(1829, 1829),
+ Box(1830, 1830),
+ Box(1831, 1831),
+ Box(1832, 1832),
+ Box(1833, 1833),
+ Box(1834, 1834),
+ Box(1835, 1835),
+ Box(1836, 1836),
+ Box(1837, 1837),
+ Box(1838, 1838),
+ Box(1839, 1839),
+ Box(1840, 1840),
+ Box(1841, 1841),
+ Box(1842, 1842),
+ Box(1843, 1843),
+ Box(1844, 1844),
+ Box(1845, 1845),
+ Box(1846, 1846),
+ Box(1847, 1847),
+ Box(1848, 1848),
+ Box(1849, 1849),
+ Box(1850, 1850),
+ Box(1851, 1851),
+ Box(1852, 1852),
+ Box(1853, 1853),
+ Box(1854, 1854),
+ Box(1855, 1855),
+ Box(1856, 1856),
+ Box(1857, 1857),
+ Box(1858, 1858),
+ Box(1859, 1859),
+ Box(1860, 1860),
+ Box(1861, 1861),
+ Box(1862, 1862),
+ Box(1863, 1863),
+ Box(1864, 1864),
+ Box(1865, 1865),
+ Box(1866, 1866),
+ Box(1867, 1867),
+ Box(1868, 1868),
+ Box(1869, 1869),
+ Box(1870, 1870),
+ Box(1871, 1871),
+ Box(1872, 1872),
+ Box(1873, 1873),
+ Box(1874, 1874),
+ Box(1875, 1875),
+ Box(1876, 1876),
+ Box(1877, 1877),
+ Box(1878, 1878),
+ Box(1879, 1879),
+ Box(1880, 1880),
+ Box(1881, 1881),
+ Box(1882, 1882),
+ Box(1883, 1883),
+ Box(1884, 1884),
+ Box(1885, 1885),
+ Box(1886, 1886),
+ Box(1887, 1887),
+ Box(1888, 1888),
+ Box(1889, 1889),
+ Box(1890, 1890),
+ Box(1891, 1891),
+ Box(1892, 1892),
+ Box(1893, 1893),
+ Box(1894, 1894),
+ Box(1895, 1895),
+ Box(1896, 1896),
+ Box(1897, 1897),
+ Box(1898, 1898),
+ Box(1899, 1899),
+ Box(1900, 1900),
+ Box(1901, 1901),
+ Box(1902, 1902),
+ Box(1903, 1903),
+ Box(1904, 1904),
+ Box(1905, 1905),
+ Box(1906, 1906),
+ Box(1907, 1907),
+ Box(1908, 1908),
+ Box(1909, 1909),
+ Box(1910, 1910),
+ Box(1911, 1911),
+ Box(1912, 1912),
+ Box(1913, 1913),
+ Box(1914, 1914),
+ Box(1915, 1915),
+ Box(1916, 1916),
+ Box(1917, 1917),
+ Box(1918, 1918),
+ Box(1919, 1919),
+ Box(1920, 1920),
+ Box(1921, 1921),
+ Box(1922, 1922),
+ Box(1923, 1923),
+ Box(1924, 1924),
+ Box(1925, 1925),
+ Box(1926, 1926),
+ Box(1927, 1927),
+ Box(1928, 1928),
+ Box(1929, 1929),
+ Box(1930, 1930),
+ Box(1931, 1931),
+ Box(1932, 1932),
+ Box(1933, 1933),
+ Box(1934, 1934),
+ Box(1935, 1935),
+ Box(1936, 1936),
+ Box(1937, 1937),
+ Box(1938, 1938),
+ Box(1939, 1939),
+ Box(1940, 1940),
+ Box(1941, 1941),
+ Box(1942, 1942),
+ Box(1943, 1943),
+ Box(1944, 1944),
+ Box(1945, 1945),
+ Box(1946, 1946),
+ Box(1947, 1947),
+ Box(1948, 1948),
+ Box(1949, 1949),
+ Box(1950, 1950),
+ Box(1951, 1951),
+ Box(1952, 1952),
+ Box(1953, 1953),
+ Box(1954, 1954),
+ Box(1955, 1955),
+ Box(1956, 1956),
+ Box(1957, 1957),
+ Box(1958, 1958),
+ Box(1959, 1959),
+ Box(1960, 1960),
+ Box(1961, 1961),
+ Box(1962, 1962),
+ Box(1963, 1963),
+ Box(1964, 1964),
+ Box(1965, 1965),
+ Box(1966, 1966),
+ Box(1967, 1967),
+ Box(1968, 1968),
+ Box(1969, 1969),
+ Box(1970, 1970),
+ Box(1971, 1971),
+ Box(1972, 1972),
+ Box(1973, 1973),
+ Box(1974, 1974),
+ Box(1975, 1975),
+ Box(1976, 1976),
+ Box(1977, 1977),
+ Box(1978, 1978),
+ Box(1979, 1979),
+ Box(1980, 1980),
+ Box(1981, 1981),
+ Box(1982, 1982),
+ Box(1983, 1983),
+ Box(1984, 1984),
+ Box(1985, 1985),
+ Box(1986, 1986),
+ Box(1987, 1987),
+ Box(1988, 1988),
+ Box(1989, 1989),
+ Box(1990, 1990),
+ Box(1991, 1991),
+ Box(1992, 1992),
+ Box(1993, 1993),
+ Box(1994, 1994),
+ Box(1995, 1995),
+ Box(1996, 1996),
+ Box(1997, 1997),
+ Box(1998, 1998),
+ Box(1999, 1999),
+ Box(2000, 2000),
+ Box(2001, 2001),
+ Box(2002, 2002),
+ Box(2003, 2003),
+ Box(2004, 2004),
+ Box(2005, 2005),
+ Box(2006, 2006),
+ Box(2007, 2007),
+ Box(2008, 2008),
+ Box(2009, 2009),
+ Box(2010, 2010),
+ Box(2011, 2011),
+ Box(2012, 2012),
+ Box(2013, 2013),
+ Box(2014, 2014),
+ Box(2015, 2015),
+ Box(2016, 2016),
+ Box(2017, 2017),
+ Box(2018, 2018),
+ Box(2019, 2019),
+ Box(2020, 2020),
+ Box(2021, 2021),
+ Box(2022, 2022),
+ Box(2023, 2023),
+ Box(2024, 2024),
+ Box(2025, 2025),
+ Box(2026, 2026),
+ Box(2027, 2027),
+ Box(2028, 2028),
+ Box(2029, 2029),
+ Box(2030, 2030),
+ Box(2031, 2031),
+ Box(2032, 2032),
+ Box(2033, 2033),
+ Box(2034, 2034),
+ Box(2035, 2035),
+ Box(2036, 2036),
+ Box(2037, 2037),
+ Box(2038, 2038),
+ Box(2039, 2039),
+ Box(2040, 2040),
+ Box(2041, 2041),
+ Box(2042, 2042),
+ Box(2043, 2043),
+ Box(2044, 2044),
+ Box(2045, 2045),
+ Box(2046, 2046),
+ Box(2047, 2047),
+ Box(2048, 2048),
+ Box(2049, 2049),
+ Box(2050, 2050),
+ Box(2051, 2051),
+ Box(2052, 2052),
+ Box(2053, 2053),
+ Box(2054, 2054),
+ Box(2055, 2055),
+ Box(2056, 2056),
+ Box(2057, 2057),
+ Box(2058, 2058),
+ Box(2059, 2059),
+ Box(2060, 2060),
+ Box(2061, 2061),
+ Box(2062, 2062),
+ Box(2063, 2063),
+ Box(2064, 2064),
+ Box(2065, 2065),
+ Box(2066, 2066),
+ Box(2067, 2067),
+ Box(2068, 2068),
+ Box(2069, 2069),
+ Box(2070, 2070),
+ Box(2071, 2071),
+ Box(2072, 2072),
+ Box(2073, 2073),
+ Box(2074, 2074),
+ Box(2075, 2075),
+ Box(2076, 2076),
+ Box(2077, 2077),
+ Box(2078, 2078),
+ Box(2079, 2079),
+ Box(2080, 2080),
+ Box(2081, 2081),
+ Box(2082, 2082),
+ Box(2083, 2083),
+ Box(2084, 2084),
+ Box(2085, 2085),
+ Box(2086, 2086),
+ Box(2087, 2087),
+ Box(2088, 2088),
+ Box(2089, 2089),
+ Box(2090, 2090),
+ Box(2091, 2091),
+ Box(2092, 2092),
+ Box(2093, 2093),
+ Box(2094, 2094),
+ Box(2095, 2095),
+ Box(2096, 2096),
+ Box(2097, 2097),
+ Box(2098, 2098),
+ Box(2099, 2099),
+ Box(2100, 2100),
+ Box(2101, 2101),
+ Box(2102, 2102),
+ Box(2103, 2103),
+ Box(2104, 2104),
+ Box(2105, 2105),
+ Box(2106, 2106),
+ Box(2107, 2107),
+ Box(2108, 2108),
+ Box(2109, 2109),
+ Box(2110, 2110),
+ Box(2111, 2111),
+ Box(2112, 2112),
+ Box(2113, 2113),
+ Box(2114, 2114),
+ Box(2115, 2115),
+ Box(2116, 2116),
+ Box(2117, 2117),
+ Box(2118, 2118),
+ Box(2119, 2119),
+ Box(2120, 2120),
+ Box(2121, 2121),
+ Box(2122, 2122),
+ Box(2123, 2123),
+ Box(2124, 2124),
+ Box(2125, 2125),
+ Box(2126, 2126),
+ Box(2127, 2127),
+ Box(2128, 2128),
+ Box(2129, 2129),
+ Box(2130, 2130),
+ Box(2131, 2131),
+ Box(2132, 2132),
+ Box(2133, 2133),
+ Box(2134, 2134),
+ Box(2135, 2135),
+ Box(2136, 2136),
+ Box(2137, 2137),
+ Box(2138, 2138),
+ Box(2139, 2139),
+ Box(2140, 2140),
+ Box(2141, 2141),
+ Box(2142, 2142),
+ Box(2143, 2143),
+ Box(2144, 2144),
+ Box(2145, 2145),
+ Box(2146, 2146),
+ Box(2147, 2147),
+ Box(2148, 2148),
+ Box(2149, 2149),
+ Box(2150, 2150),
+ Box(2151, 2151),
+ Box(2152, 2152),
+ Box(2153, 2153),
+ Box(2154, 2154),
+ Box(2155, 2155),
+ Box(2156, 2156),
+ Box(2157, 2157),
+ Box(2158, 2158),
+ Box(2159, 2159),
+ Box(2160, 2160),
+ Box(2161, 2161),
+ Box(2162, 2162),
+ Box(2163, 2163),
+ Box(2164, 2164),
+ Box(2165, 2165),
+ Box(2166, 2166),
+ Box(2167, 2167),
+ Box(2168, 2168),
+ Box(2169, 2169),
+ Box(2170, 2170),
+ Box(2171, 2171),
+ Box(2172, 2172),
+ Box(2173, 2173),
+ Box(2174, 2174),
+ Box(2175, 2175),
+ Box(2176, 2176),
+ Box(2177, 2177),
+ Box(2178, 2178),
+ Box(2179, 2179),
+ Box(2180, 2180),
+ Box(2181, 2181),
+ Box(2182, 2182),
+ Box(2183, 2183),
+ Box(2184, 2184),
+ Box(2185, 2185),
+ Box(2186, 2186),
+ Box(2187, 2187),
+ Box(2188, 2188),
+ Box(2189, 2189),
+ Box(2190, 2190),
+ Box(2191, 2191),
+ Box(2192, 2192),
+ Box(2193, 2193),
+ Box(2194, 2194),
+ Box(2195, 2195),
+ Box(2196, 2196),
+ Box(2197, 2197),
+ Box(2198, 2198),
+ Box(2199, 2199),
+ Box(2200, 2200),
+ Box(2201, 2201),
+ Box(2202, 2202),
+ Box(2203, 2203),
+ Box(2204, 2204),
+ Box(2205, 2205),
+ Box(2206, 2206),
+ Box(2207, 2207),
+ Box(2208, 2208),
+ Box(2209, 2209),
+ Box(2210, 2210),
+ Box(2211, 2211),
+ Box(2212, 2212),
+ Box(2213, 2213),
+ Box(2214, 2214),
+ Box(2215, 2215),
+ Box(2216, 2216),
+ Box(2217, 2217),
+ Box(2218, 2218),
+ Box(2219, 2219),
+ Box(2220, 2220),
+ Box(2221, 2221),
+ Box(2222, 2222),
+ Box(2223, 2223),
+ Box(2224, 2224),
+ Box(2225, 2225),
+ Box(2226, 2226),
+ Box(2227, 2227),
+ Box(2228, 2228),
+ Box(2229, 2229),
+ Box(2230, 2230),
+ Box(2231, 2231),
+ Box(2232, 2232),
+ Box(2233, 2233),
+ Box(2234, 2234),
+ Box(2235, 2235),
+ Box(2236, 2236),
+ Box(2237, 2237),
+ Box(2238, 2238),
+ Box(2239, 2239),
+ Box(2240, 2240),
+ Box(2241, 2241),
+ Box(2242, 2242),
+ Box(2243, 2243),
+ Box(2244, 2244),
+ Box(2245, 2245),
+ Box(2246, 2246),
+ Box(2247, 2247),
+ Box(2248, 2248),
+ Box(2249, 2249),
+ Box(2250, 2250),
+ Box(2251, 2251),
+ Box(2252, 2252),
+ Box(2253, 2253),
+ Box(2254, 2254),
+ Box(2255, 2255),
+ Box(2256, 2256),
+ Box(2257, 2257),
+ Box(2258, 2258),
+ Box(2259, 2259),
+ Box(2260, 2260),
+ Box(2261, 2261),
+ Box(2262, 2262),
+ Box(2263, 2263),
+ Box(2264, 2264),
+ Box(2265, 2265),
+ Box(2266, 2266),
+ Box(2267, 2267),
+ Box(2268, 2268),
+ Box(2269, 2269),
+ Box(2270, 2270),
+ Box(2271, 2271),
+ Box(2272, 2272),
+ Box(2273, 2273),
+ Box(2274, 2274),
+ Box(2275, 2275),
+ Box(2276, 2276),
+ Box(2277, 2277),
+ Box(2278, 2278),
+ Box(2279, 2279),
+ Box(2280, 2280),
+ Box(2281, 2281),
+ Box(2282, 2282),
+ Box(2283, 2283),
+ Box(2284, 2284),
+ Box(2285, 2285),
+ Box(2286, 2286),
+ Box(2287, 2287),
+ Box(2288, 2288),
+ Box(2289, 2289),
+ Box(2290, 2290),
+ Box(2291, 2291),
+ Box(2292, 2292),
+ Box(2293, 2293),
+ Box(2294, 2294),
+ Box(2295, 2295),
+ Box(2296, 2296),
+ Box(2297, 2297),
+ Box(2298, 2298),
+ Box(2299, 2299),
+ Box(2300, 2300),
+ Box(2301, 2301),
+ Box(2302, 2302),
+ Box(2303, 2303),
+ Box(2304, 2304),
+ Box(2305, 2305),
+ Box(2306, 2306),
+ Box(2307, 2307),
+ Box(2308, 2308),
+ Box(2309, 2309),
+ Box(2310, 2310),
+ Box(2311, 2311),
+ Box(2312, 2312),
+ Box(2313, 2313),
+ Box(2314, 2314),
+ Box(2315, 2315),
+ Box(2316, 2316),
+ Box(2317, 2317),
+ Box(2318, 2318),
+ Box(2319, 2319),
+ Box(2320, 2320),
+ Box(2321, 2321),
+ Box(2322, 2322),
+ Box(2323, 2323),
+ Box(2324, 2324),
+ Box(2325, 2325),
+ Box(2326, 2326),
+ Box(2327, 2327),
+ Box(2328, 2328),
+ Box(2329, 2329),
+ Box(2330, 2330),
+ Box(2331, 2331),
+ Box(2332, 2332),
+ Box(2333, 2333),
+ Box(2334, 2334),
+ Box(2335, 2335),
+ Box(2336, 2336),
+ Box(2337, 2337),
+ Box(2338, 2338),
+ Box(2339, 2339),
+ Box(2340, 2340),
+ Box(2341, 2341),
+ Box(2342, 2342),
+ Box(2343, 2343),
+ Box(2344, 2344),
+ Box(2345, 2345),
+ Box(2346, 2346),
+ Box(2347, 2347),
+ Box(2348, 2348),
+ Box(2349, 2349),
+ Box(2350, 2350),
+ Box(2351, 2351),
+ Box(2352, 2352),
+ Box(2353, 2353),
+ Box(2354, 2354),
+ Box(2355, 2355),
+ Box(2356, 2356),
+ Box(2357, 2357),
+ Box(2358, 2358),
+ Box(2359, 2359),
+ Box(2360, 2360),
+ Box(2361, 2361),
+ Box(2362, 2362),
+ Box(2363, 2363),
+ Box(2364, 2364),
+ Box(2365, 2365),
+ Box(2366, 2366),
+ Box(2367, 2367),
+ Box(2368, 2368),
+ Box(2369, 2369),
+ Box(2370, 2370),
+ Box(2371, 2371),
+ Box(2372, 2372),
+ Box(2373, 2373),
+ Box(2374, 2374),
+ Box(2375, 2375),
+ Box(2376, 2376),
+ Box(2377, 2377),
+ Box(2378, 2378),
+ Box(2379, 2379),
+ Box(2380, 2380),
+ Box(2381, 2381),
+ Box(2382, 2382),
+ Box(2383, 2383),
+ Box(2384, 2384),
+ Box(2385, 2385),
+ Box(2386, 2386),
+ Box(2387, 2387),
+ Box(2388, 2388),
+ Box(2389, 2389),
+ Box(2390, 2390),
+ Box(2391, 2391),
+ Box(2392, 2392),
+ Box(2393, 2393),
+ Box(2394, 2394),
+ Box(2395, 2395),
+ Box(2396, 2396),
+ Box(2397, 2397),
+ Box(2398, 2398),
+ Box(2399, 2399),
+ Box(2400, 2400),
+ Box(2401, 2401),
+ Box(2402, 2402),
+ Box(2403, 2403),
+ Box(2404, 2404),
+ Box(2405, 2405),
+ Box(2406, 2406),
+ Box(2407, 2407),
+ Box(2408, 2408),
+ Box(2409, 2409),
+ Box(2410, 2410),
+ Box(2411, 2411),
+ Box(2412, 2412),
+ Box(2413, 2413),
+ Box(2414, 2414),
+ Box(2415, 2415),
+ Box(2416, 2416),
+ Box(2417, 2417),
+ Box(2418, 2418),
+ Box(2419, 2419),
+ Box(2420, 2420),
+ Box(2421, 2421),
+ Box(2422, 2422),
+ Box(2423, 2423),
+ Box(2424, 2424),
+ Box(2425, 2425),
+ Box(2426, 2426),
+ Box(2427, 2427),
+ Box(2428, 2428),
+ Box(2429, 2429),
+ Box(2430, 2430),
+ Box(2431, 2431),
+ Box(2432, 2432),
+ Box(2433, 2433),
+ Box(2434, 2434),
+ Box(2435, 2435),
+ Box(2436, 2436),
+ Box(2437, 2437),
+ Box(2438, 2438),
+ Box(2439, 2439),
+ Box(2440, 2440),
+ Box(2441, 2441),
+ Box(2442, 2442),
+ Box(2443, 2443),
+ Box(2444, 2444),
+ Box(2445, 2445),
+ Box(2446, 2446),
+ Box(2447, 2447),
+ Box(2448, 2448),
+ Box(2449, 2449),
+ Box(2450, 2450),
+ Box(2451, 2451),
+ Box(2452, 2452),
+ Box(2453, 2453),
+ Box(2454, 2454),
+ Box(2455, 2455),
+ Box(2456, 2456),
+ Box(2457, 2457),
+ Box(2458, 2458),
+ Box(2459, 2459),
+ Box(2460, 2460),
+ Box(2461, 2461),
+ Box(2462, 2462),
+ Box(2463, 2463),
+ Box(2464, 2464),
+ Box(2465, 2465),
+ Box(2466, 2466),
+ Box(2467, 2467),
+ Box(2468, 2468),
+ Box(2469, 2469),
+ Box(2470, 2470),
+ Box(2471, 2471),
+ Box(2472, 2472),
+ Box(2473, 2473),
+ Box(2474, 2474),
+ Box(2475, 2475),
+ Box(2476, 2476),
+ Box(2477, 2477),
+ Box(2478, 2478),
+ Box(2479, 2479),
+ Box(2480, 2480),
+ Box(2481, 2481),
+ Box(2482, 2482),
+ Box(2483, 2483),
+ Box(2484, 2484),
+ Box(2485, 2485),
+ Box(2486, 2486),
+ Box(2487, 2487),
+ Box(2488, 2488),
+ Box(2489, 2489),
+ Box(2490, 2490),
+ Box(2491, 2491),
+ Box(2492, 2492),
+ Box(2493, 2493),
+ Box(2494, 2494),
+ Box(2495, 2495),
+ Box(2496, 2496),
+ Box(2497, 2497),
+ Box(2498, 2498),
+ Box(2499, 2499),
+ Box(2500, 2500),
+ Box(2501, 2501),
+ Box(2502, 2502),
+ Box(2503, 2503),
+ Box(2504, 2504),
+ Box(2505, 2505),
+ Box(2506, 2506),
+ Box(2507, 2507),
+ Box(2508, 2508),
+ Box(2509, 2509),
+ Box(2510, 2510),
+ Box(2511, 2511),
+ Box(2512, 2512),
+ Box(2513, 2513),
+ Box(2514, 2514),
+ Box(2515, 2515),
+ Box(2516, 2516),
+ Box(2517, 2517),
+ Box(2518, 2518),
+ Box(2519, 2519),
+ Box(2520, 2520),
+ Box(2521, 2521),
+ Box(2522, 2522),
+ Box(2523, 2523),
+ Box(2524, 2524),
+ Box(2525, 2525),
+ Box(2526, 2526),
+ Box(2527, 2527),
+ Box(2528, 2528),
+ Box(2529, 2529),
+ Box(2530, 2530),
+ Box(2531, 2531),
+ Box(2532, 2532),
+ Box(2533, 2533),
+ Box(2534, 2534),
+ Box(2535, 2535),
+ Box(2536, 2536),
+ Box(2537, 2537),
+ Box(2538, 2538),
+ Box(2539, 2539),
+ Box(2540, 2540),
+ Box(2541, 2541),
+ Box(2542, 2542),
+ Box(2543, 2543),
+ Box(2544, 2544),
+ Box(2545, 2545),
+ Box(2546, 2546),
+ Box(2547, 2547),
+ Box(2548, 2548),
+ Box(2549, 2549),
+ Box(2550, 2550),
+ Box(2551, 2551),
+ Box(2552, 2552),
+ Box(2553, 2553),
+ Box(2554, 2554),
+ Box(2555, 2555),
+ Box(2556, 2556),
+ Box(2557, 2557),
+ Box(2558, 2558),
+ Box(2559, 2559),
+ Box(2560, 2560),
+ Box(2561, 2561),
+ Box(2562, 2562),
+ Box(2563, 2563),
+ Box(2564, 2564),
+ Box(2565, 2565),
+ Box(2566, 2566),
+ Box(2567, 2567),
+ Box(2568, 2568),
+ Box(2569, 2569),
+ Box(2570, 2570),
+ Box(2571, 2571),
+ Box(2572, 2572),
+ Box(2573, 2573),
+ Box(2574, 2574),
+ Box(2575, 2575),
+ Box(2576, 2576),
+ Box(2577, 2577),
+ Box(2578, 2578),
+ Box(2579, 2579),
+ Box(2580, 2580),
+ Box(2581, 2581),
+ Box(2582, 2582),
+ Box(2583, 2583),
+ Box(2584, 2584),
+ Box(2585, 2585),
+ Box(2586, 2586),
+ Box(2587, 2587),
+ Box(2588, 2588),
+ Box(2589, 2589),
+ Box(2590, 2590),
+ Box(2591, 2591),
+ Box(2592, 2592),
+ Box(2593, 2593),
+ Box(2594, 2594),
+ Box(2595, 2595),
+ Box(2596, 2596),
+ Box(2597, 2597),
+ Box(2598, 2598),
+ Box(2599, 2599),
+ Box(2600, 2600),
+ Box(2601, 2601),
+ Box(2602, 2602),
+ Box(2603, 2603),
+ Box(2604, 2604),
+ Box(2605, 2605),
+ Box(2606, 2606),
+ Box(2607, 2607),
+ Box(2608, 2608),
+ Box(2609, 2609),
+ Box(2610, 2610),
+ Box(2611, 2611),
+ Box(2612, 2612),
+ Box(2613, 2613),
+ Box(2614, 2614),
+ Box(2615, 2615),
+ Box(2616, 2616),
+ Box(2617, 2617),
+ Box(2618, 2618),
+ Box(2619, 2619),
+ Box(2620, 2620),
+ Box(2621, 2621),
+ Box(2622, 2622),
+ Box(2623, 2623),
+ Box(2624, 2624),
+ Box(2625, 2625),
+ Box(2626, 2626),
+ Box(2627, 2627),
+ Box(2628, 2628),
+ Box(2629, 2629),
+ Box(2630, 2630),
+ Box(2631, 2631),
+ Box(2632, 2632),
+ Box(2633, 2633),
+ Box(2634, 2634),
+ Box(2635, 2635),
+ Box(2636, 2636),
+ Box(2637, 2637),
+ Box(2638, 2638),
+ Box(2639, 2639),
+ Box(2640, 2640),
+ Box(2641, 2641),
+ Box(2642, 2642),
+ Box(2643, 2643),
+ Box(2644, 2644),
+ Box(2645, 2645),
+ Box(2646, 2646),
+ Box(2647, 2647),
+ Box(2648, 2648),
+ Box(2649, 2649),
+ Box(2650, 2650),
+ Box(2651, 2651),
+ Box(2652, 2652),
+ Box(2653, 2653),
+ Box(2654, 2654),
+ Box(2655, 2655),
+ Box(2656, 2656),
+ Box(2657, 2657),
+ Box(2658, 2658),
+ Box(2659, 2659),
+ Box(2660, 2660),
+ Box(2661, 2661),
+ Box(2662, 2662),
+ Box(2663, 2663),
+ Box(2664, 2664),
+ Box(2665, 2665),
+ Box(2666, 2666),
+ Box(2667, 2667),
+ Box(2668, 2668),
+ Box(2669, 2669),
+ Box(2670, 2670),
+ Box(2671, 2671),
+ Box(2672, 2672),
+ Box(2673, 2673),
+ Box(2674, 2674),
+ Box(2675, 2675),
+ Box(2676, 2676),
+ Box(2677, 2677),
+ Box(2678, 2678),
+ Box(2679, 2679),
+ Box(2680, 2680),
+ Box(2681, 2681),
+ Box(2682, 2682),
+ Box(2683, 2683),
+ Box(2684, 2684),
+ Box(2685, 2685),
+ Box(2686, 2686),
+ Box(2687, 2687),
+ Box(2688, 2688),
+ Box(2689, 2689),
+ Box(2690, 2690),
+ Box(2691, 2691),
+ Box(2692, 2692),
+ Box(2693, 2693),
+ Box(2694, 2694),
+ Box(2695, 2695),
+ Box(2696, 2696),
+ Box(2697, 2697),
+ Box(2698, 2698),
+ Box(2699, 2699),
+ Box(2700, 2700),
+ Box(2701, 2701),
+ Box(2702, 2702),
+ Box(2703, 2703),
+ Box(2704, 2704),
+ Box(2705, 2705),
+ Box(2706, 2706),
+ Box(2707, 2707),
+ Box(2708, 2708),
+ Box(2709, 2709),
+ Box(2710, 2710),
+ Box(2711, 2711),
+ Box(2712, 2712),
+ Box(2713, 2713),
+ Box(2714, 2714),
+ Box(2715, 2715),
+ Box(2716, 2716),
+ Box(2717, 2717),
+ Box(2718, 2718),
+ Box(2719, 2719),
+ Box(2720, 2720),
+ Box(2721, 2721),
+ Box(2722, 2722),
+ Box(2723, 2723),
+ Box(2724, 2724),
+ Box(2725, 2725),
+ Box(2726, 2726),
+ Box(2727, 2727),
+ Box(2728, 2728),
+ Box(2729, 2729),
+ Box(2730, 2730),
+ Box(2731, 2731),
+ Box(2732, 2732),
+ Box(2733, 2733),
+ Box(2734, 2734),
+ Box(2735, 2735),
+ Box(2736, 2736),
+ Box(2737, 2737),
+ Box(2738, 2738),
+ Box(2739, 2739),
+ Box(2740, 2740),
+ Box(2741, 2741),
+ Box(2742, 2742),
+ Box(2743, 2743),
+ Box(2744, 2744),
+ Box(2745, 2745),
+ Box(2746, 2746),
+ Box(2747, 2747),
+ Box(2748, 2748),
+ Box(2749, 2749),
+ Box(2750, 2750),
+ Box(2751, 2751),
+ Box(2752, 2752),
+ Box(2753, 2753),
+ Box(2754, 2754),
+ Box(2755, 2755),
+ Box(2756, 2756),
+ Box(2757, 2757),
+ Box(2758, 2758),
+ Box(2759, 2759),
+ Box(2760, 2760),
+ Box(2761, 2761),
+ Box(2762, 2762),
+ Box(2763, 2763),
+ Box(2764, 2764),
+ Box(2765, 2765),
+ Box(2766, 2766),
+ Box(2767, 2767),
+ Box(2768, 2768),
+ Box(2769, 2769),
+ Box(2770, 2770),
+ Box(2771, 2771),
+ Box(2772, 2772),
+ Box(2773, 2773),
+ Box(2774, 2774),
+ Box(2775, 2775),
+ Box(2776, 2776),
+ Box(2777, 2777),
+ Box(2778, 2778),
+ Box(2779, 2779),
+ Box(2780, 2780),
+ Box(2781, 2781),
+ Box(2782, 2782),
+ Box(2783, 2783),
+ Box(2784, 2784),
+ Box(2785, 2785),
+ Box(2786, 2786),
+ Box(2787, 2787),
+ Box(2788, 2788),
+ Box(2789, 2789),
+ Box(2790, 2790),
+ Box(2791, 2791),
+ Box(2792, 2792),
+ Box(2793, 2793),
+ Box(2794, 2794),
+ Box(2795, 2795),
+ Box(2796, 2796),
+ Box(2797, 2797),
+ Box(2798, 2798),
+ Box(2799, 2799),
+ Box(2800, 2800),
+ Box(2801, 2801),
+ Box(2802, 2802),
+ Box(2803, 2803),
+ Box(2804, 2804),
+ Box(2805, 2805),
+ Box(2806, 2806),
+ Box(2807, 2807),
+ Box(2808, 2808),
+ Box(2809, 2809),
+ Box(2810, 2810),
+ Box(2811, 2811),
+ Box(2812, 2812),
+ Box(2813, 2813),
+ Box(2814, 2814),
+ Box(2815, 2815),
+ Box(2816, 2816),
+ Box(2817, 2817),
+ Box(2818, 2818),
+ Box(2819, 2819),
+ Box(2820, 2820),
+ Box(2821, 2821),
+ Box(2822, 2822),
+ Box(2823, 2823),
+ Box(2824, 2824),
+ Box(2825, 2825),
+ Box(2826, 2826),
+ Box(2827, 2827),
+ Box(2828, 2828),
+ Box(2829, 2829),
+ Box(2830, 2830),
+ Box(2831, 2831),
+ Box(2832, 2832),
+ Box(2833, 2833),
+ Box(2834, 2834),
+ Box(2835, 2835),
+ Box(2836, 2836),
+ Box(2837, 2837),
+ Box(2838, 2838),
+ Box(2839, 2839),
+ Box(2840, 2840),
+ Box(2841, 2841),
+ Box(2842, 2842),
+ Box(2843, 2843),
+ Box(2844, 2844),
+ Box(2845, 2845),
+ Box(2846, 2846),
+ Box(2847, 2847),
+ Box(2848, 2848),
+ Box(2849, 2849),
+ Box(2850, 2850),
+ Box(2851, 2851),
+ Box(2852, 2852),
+ Box(2853, 2853),
+ Box(2854, 2854),
+ Box(2855, 2855),
+ Box(2856, 2856),
+ Box(2857, 2857),
+ Box(2858, 2858),
+ Box(2859, 2859),
+ Box(2860, 2860),
+ Box(2861, 2861),
+ Box(2862, 2862),
+ Box(2863, 2863),
+ Box(2864, 2864),
+ Box(2865, 2865),
+ Box(2866, 2866),
+ Box(2867, 2867),
+ Box(2868, 2868),
+ Box(2869, 2869),
+ Box(2870, 2870),
+ Box(2871, 2871),
+ Box(2872, 2872),
+ Box(2873, 2873),
+ Box(2874, 2874),
+ Box(2875, 2875),
+ Box(2876, 2876),
+ Box(2877, 2877),
+ Box(2878, 2878),
+ Box(2879, 2879),
+ Box(2880, 2880),
+ Box(2881, 2881),
+ Box(2882, 2882),
+ Box(2883, 2883),
+ Box(2884, 2884),
+ Box(2885, 2885),
+ Box(2886, 2886),
+ Box(2887, 2887),
+ Box(2888, 2888),
+ Box(2889, 2889),
+ Box(2890, 2890),
+ Box(2891, 2891),
+ Box(2892, 2892),
+ Box(2893, 2893),
+ Box(2894, 2894),
+ Box(2895, 2895),
+ Box(2896, 2896),
+ Box(2897, 2897),
+ Box(2898, 2898),
+ Box(2899, 2899),
+ Box(2900, 2900),
+ Box(2901, 2901),
+ Box(2902, 2902),
+ Box(2903, 2903),
+ Box(2904, 2904),
+ Box(2905, 2905),
+ Box(2906, 2906),
+ Box(2907, 2907),
+ Box(2908, 2908),
+ Box(2909, 2909),
+ Box(2910, 2910),
+ Box(2911, 2911),
+ Box(2912, 2912),
+ Box(2913, 2913),
+ Box(2914, 2914),
+ Box(2915, 2915),
+ Box(2916, 2916),
+ Box(2917, 2917),
+ Box(2918, 2918),
+ Box(2919, 2919),
+ Box(2920, 2920),
+ Box(2921, 2921),
+ Box(2922, 2922),
+ Box(2923, 2923),
+ Box(2924, 2924),
+ Box(2925, 2925),
+ Box(2926, 2926),
+ Box(2927, 2927),
+ Box(2928, 2928),
+ Box(2929, 2929),
+ Box(2930, 2930),
+ Box(2931, 2931),
+ Box(2932, 2932),
+ Box(2933, 2933),
+ Box(2934, 2934),
+ Box(2935, 2935),
+ Box(2936, 2936),
+ Box(2937, 2937),
+ Box(2938, 2938),
+ Box(2939, 2939),
+ Box(2940, 2940),
+ Box(2941, 2941),
+ Box(2942, 2942),
+ Box(2943, 2943),
+ Box(2944, 2944),
+ Box(2945, 2945),
+ Box(2946, 2946),
+ Box(2947, 2947),
+ Box(2948, 2948),
+ Box(2949, 2949),
+ Box(2950, 2950),
+ Box(2951, 2951),
+ Box(2952, 2952),
+ Box(2953, 2953),
+ Box(2954, 2954),
+ Box(2955, 2955),
+ Box(2956, 2956),
+ Box(2957, 2957),
+ Box(2958, 2958),
+ Box(2959, 2959),
+ Box(2960, 2960),
+ Box(2961, 2961),
+ Box(2962, 2962),
+ Box(2963, 2963),
+ Box(2964, 2964),
+ Box(2965, 2965),
+ Box(2966, 2966),
+ Box(2967, 2967),
+ Box(2968, 2968),
+ Box(2969, 2969),
+ Box(2970, 2970),
+ Box(2971, 2971),
+ Box(2972, 2972),
+ Box(2973, 2973),
+ Box(2974, 2974),
+ Box(2975, 2975),
+ Box(2976, 2976),
+ Box(2977, 2977),
+ Box(2978, 2978),
+ Box(2979, 2979),
+ Box(2980, 2980),
+ Box(2981, 2981),
+ Box(2982, 2982),
+ Box(2983, 2983),
+ Box(2984, 2984),
+ Box(2985, 2985),
+ Box(2986, 2986),
+ Box(2987, 2987),
+ Box(2988, 2988),
+ Box(2989, 2989),
+ Box(2990, 2990),
+ Box(2991, 2991),
+ Box(2992, 2992),
+ Box(2993, 2993),
+ Box(2994, 2994),
+ Box(2995, 2995),
+ Box(2996, 2996),
+ Box(2997, 2997),
+ Box(2998, 2998),
+ Box(2999, 2999),
+ Box(3000, 3000),
+ Box(3001, 3001),
+ Box(3002, 3002),
+ Box(3003, 3003),
+ Box(3004, 3004),
+ Box(3005, 3005),
+ Box(3006, 3006),
+ Box(3007, 3007),
+ Box(3008, 3008),
+ Box(3009, 3009),
+ Box(3010, 3010),
+ Box(3011, 3011),
+ Box(3012, 3012),
+ Box(3013, 3013),
+ Box(3014, 3014),
+ Box(3015, 3015),
+ Box(3016, 3016),
+ Box(3017, 3017),
+ Box(3018, 3018),
+ Box(3019, 3019),
+ Box(3020, 3020),
+ Box(3021, 3021),
+ Box(3022, 3022),
+ Box(3023, 3023),
+ Box(3024, 3024),
+ Box(3025, 3025),
+ Box(3026, 3026),
+ Box(3027, 3027),
+ Box(3028, 3028),
+ Box(3029, 3029),
+ Box(3030, 3030),
+ Box(3031, 3031),
+ Box(3032, 3032),
+ Box(3033, 3033),
+ Box(3034, 3034),
+ Box(3035, 3035),
+ Box(3036, 3036),
+ Box(3037, 3037),
+ Box(3038, 3038),
+ Box(3039, 3039),
+ Box(3040, 3040),
+ Box(3041, 3041),
+ Box(3042, 3042),
+ Box(3043, 3043),
+ Box(3044, 3044),
+ Box(3045, 3045),
+ Box(3046, 3046),
+ Box(3047, 3047),
+ Box(3048, 3048),
+ Box(3049, 3049),
+ Box(3050, 3050),
+ Box(3051, 3051),
+ Box(3052, 3052),
+ Box(3053, 3053),
+ Box(3054, 3054),
+ Box(3055, 3055),
+ Box(3056, 3056),
+ Box(3057, 3057),
+ Box(3058, 3058),
+ Box(3059, 3059),
+ Box(3060, 3060),
+ Box(3061, 3061),
+ Box(3062, 3062),
+ Box(3063, 3063),
+ Box(3064, 3064),
+ Box(3065, 3065),
+ Box(3066, 3066),
+ Box(3067, 3067),
+ Box(3068, 3068),
+ Box(3069, 3069),
+ Box(3070, 3070),
+ Box(3071, 3071),
+ Box(3072, 3072),
+ Box(3073, 3073),
+ Box(3074, 3074),
+ Box(3075, 3075),
+ Box(3076, 3076),
+ Box(3077, 3077),
+ Box(3078, 3078),
+ Box(3079, 3079),
+ Box(3080, 3080),
+ Box(3081, 3081),
+ Box(3082, 3082),
+ Box(3083, 3083),
+ Box(3084, 3084),
+ Box(3085, 3085),
+ Box(3086, 3086),
+ Box(3087, 3087),
+ Box(3088, 3088),
+ Box(3089, 3089),
+ Box(3090, 3090),
+ Box(3091, 3091),
+ Box(3092, 3092),
+ Box(3093, 3093),
+ Box(3094, 3094),
+ Box(3095, 3095),
+ Box(3096, 3096),
+ Box(3097, 3097),
+ Box(3098, 3098),
+ Box(3099, 3099),
+ Box(3100, 3100),
+ Box(3101, 3101),
+ Box(3102, 3102),
+ Box(3103, 3103),
+ Box(3104, 3104),
+ Box(3105, 3105),
+ Box(3106, 3106),
+ Box(3107, 3107),
+ Box(3108, 3108),
+ Box(3109, 3109),
+ Box(3110, 3110),
+ Box(3111, 3111),
+ Box(3112, 3112),
+ Box(3113, 3113),
+ Box(3114, 3114),
+ Box(3115, 3115),
+ Box(3116, 3116),
+ Box(3117, 3117),
+ Box(3118, 3118),
+ Box(3119, 3119),
+ Box(3120, 3120),
+ Box(3121, 3121),
+ Box(3122, 3122),
+ Box(3123, 3123),
+ Box(3124, 3124),
+ Box(3125, 3125),
+ Box(3126, 3126),
+ Box(3127, 3127),
+ Box(3128, 3128),
+ Box(3129, 3129),
+ Box(3130, 3130),
+ Box(3131, 3131),
+ Box(3132, 3132),
+ Box(3133, 3133),
+ Box(3134, 3134),
+ Box(3135, 3135),
+ Box(3136, 3136),
+ Box(3137, 3137),
+ Box(3138, 3138),
+ Box(3139, 3139),
+ Box(3140, 3140),
+ Box(3141, 3141),
+ Box(3142, 3142),
+ Box(3143, 3143),
+ Box(3144, 3144),
+ Box(3145, 3145),
+ Box(3146, 3146),
+ Box(3147, 3147),
+ Box(3148, 3148),
+ Box(3149, 3149),
+ Box(3150, 3150),
+ Box(3151, 3151),
+ Box(3152, 3152),
+ Box(3153, 3153),
+ Box(3154, 3154),
+ Box(3155, 3155),
+ Box(3156, 3156),
+ Box(3157, 3157),
+ Box(3158, 3158),
+ Box(3159, 3159),
+ Box(3160, 3160),
+ Box(3161, 3161),
+ Box(3162, 3162),
+ Box(3163, 3163),
+ Box(3164, 3164),
+ Box(3165, 3165),
+ Box(3166, 3166),
+ Box(3167, 3167),
+ Box(3168, 3168),
+ Box(3169, 3169),
+ Box(3170, 3170),
+ Box(3171, 3171),
+ Box(3172, 3172),
+ Box(3173, 3173),
+ Box(3174, 3174),
+ Box(3175, 3175),
+ Box(3176, 3176),
+ Box(3177, 3177),
+ Box(3178, 3178),
+ Box(3179, 3179),
+ Box(3180, 3180),
+ Box(3181, 3181),
+ Box(3182, 3182),
+ Box(3183, 3183),
+ Box(3184, 3184),
+ Box(3185, 3185),
+ Box(3186, 3186),
+ Box(3187, 3187),
+ Box(3188, 3188),
+ Box(3189, 3189),
+ Box(3190, 3190),
+ Box(3191, 3191),
+ Box(3192, 3192),
+ Box(3193, 3193),
+ Box(3194, 3194),
+ Box(3195, 3195),
+ Box(3196, 3196),
+ Box(3197, 3197),
+ Box(3198, 3198),
+ Box(3199, 3199),
+ Box(3200, 3200),
+ Box(3201, 3201),
+ Box(3202, 3202),
+ Box(3203, 3203),
+ Box(3204, 3204),
+ Box(3205, 3205),
+ Box(3206, 3206),
+ Box(3207, 3207),
+ Box(3208, 3208),
+ Box(3209, 3209),
+ Box(3210, 3210),
+ Box(3211, 3211),
+ Box(3212, 3212),
+ Box(3213, 3213),
+ Box(3214, 3214),
+ Box(3215, 3215),
+ Box(3216, 3216),
+ Box(3217, 3217),
+ Box(3218, 3218),
+ Box(3219, 3219),
+ Box(3220, 3220),
+ Box(3221, 3221),
+ Box(3222, 3222),
+ Box(3223, 3223),
+ Box(3224, 3224),
+ Box(3225, 3225),
+ Box(3226, 3226),
+ Box(3227, 3227),
+ Box(3228, 3228),
+ Box(3229, 3229),
+ Box(3230, 3230),
+ Box(3231, 3231),
+ Box(3232, 3232),
+ Box(3233, 3233),
+ Box(3234, 3234),
+ Box(3235, 3235),
+ Box(3236, 3236),
+ Box(3237, 3237),
+ Box(3238, 3238),
+ Box(3239, 3239),
+ Box(3240, 3240),
+ Box(3241, 3241),
+ Box(3242, 3242),
+ Box(3243, 3243),
+ Box(3244, 3244),
+ Box(3245, 3245),
+ Box(3246, 3246),
+ Box(3247, 3247),
+ Box(3248, 3248),
+ Box(3249, 3249),
+ Box(3250, 3250),
+ Box(3251, 3251),
+ Box(3252, 3252),
+ Box(3253, 3253),
+ Box(3254, 3254),
+ Box(3255, 3255),
+ Box(3256, 3256),
+ Box(3257, 3257),
+ Box(3258, 3258),
+ Box(3259, 3259),
+ Box(3260, 3260),
+ Box(3261, 3261),
+ Box(3262, 3262),
+ Box(3263, 3263),
+ Box(3264, 3264),
+ Box(3265, 3265),
+ Box(3266, 3266),
+ Box(3267, 3267),
+ Box(3268, 3268),
+ Box(3269, 3269),
+ Box(3270, 3270),
+ Box(3271, 3271),
+ Box(3272, 3272),
+ Box(3273, 3273),
+ Box(3274, 3274),
+ Box(3275, 3275),
+ Box(3276, 3276),
+ Box(3277, 3277),
+ Box(3278, 3278),
+ Box(3279, 3279),
+ Box(3280, 3280),
+ Box(3281, 3281),
+ Box(3282, 3282),
+ Box(3283, 3283),
+ Box(3284, 3284),
+ Box(3285, 3285),
+ Box(3286, 3286),
+ Box(3287, 3287),
+ Box(3288, 3288),
+ Box(3289, 3289),
+ Box(3290, 3290),
+ Box(3291, 3291),
+ Box(3292, 3292),
+ Box(3293, 3293),
+ Box(3294, 3294),
+ Box(3295, 3295),
+ Box(3296, 3296),
+ Box(3297, 3297),
+ Box(3298, 3298),
+ Box(3299, 3299),
+ Box(3300, 3300),
+ Box(3301, 3301),
+ Box(3302, 3302),
+ Box(3303, 3303),
+ Box(3304, 3304),
+ Box(3305, 3305),
+ Box(3306, 3306),
+ Box(3307, 3307),
+ Box(3308, 3308),
+ Box(3309, 3309),
+ Box(3310, 3310),
+ Box(3311, 3311),
+ Box(3312, 3312),
+ Box(3313, 3313),
+ Box(3314, 3314),
+ Box(3315, 3315),
+ Box(3316, 3316),
+ Box(3317, 3317),
+ Box(3318, 3318),
+ Box(3319, 3319),
+ Box(3320, 3320),
+ Box(3321, 3321),
+ Box(3322, 3322),
+ Box(3323, 3323),
+ Box(3324, 3324),
+ Box(3325, 3325),
+ Box(3326, 3326),
+ Box(3327, 3327),
+ Box(3328, 3328),
+ Box(3329, 3329),
+ Box(3330, 3330),
+ Box(3331, 3331),
+ Box(3332, 3332),
+ Box(3333, 3333),
+ Box(3334, 3334),
+ Box(3335, 3335),
+ Box(3336, 3336),
+ Box(3337, 3337),
+ Box(3338, 3338),
+ Box(3339, 3339),
+ Box(3340, 3340),
+ Box(3341, 3341),
+ Box(3342, 3342),
+ Box(3343, 3343),
+ Box(3344, 3344),
+ Box(3345, 3345),
+ Box(3346, 3346),
+ Box(3347, 3347),
+ Box(3348, 3348),
+ Box(3349, 3349),
+ Box(3350, 3350),
+ Box(3351, 3351),
+ Box(3352, 3352),
+ Box(3353, 3353),
+ Box(3354, 3354),
+ Box(3355, 3355),
+ Box(3356, 3356),
+ Box(3357, 3357),
+ Box(3358, 3358),
+ Box(3359, 3359),
+ Box(3360, 3360),
+ Box(3361, 3361),
+ Box(3362, 3362),
+ Box(3363, 3363),
+ Box(3364, 3364),
+ Box(3365, 3365),
+ Box(3366, 3366),
+ Box(3367, 3367),
+ Box(3368, 3368),
+ Box(3369, 3369),
+ Box(3370, 3370),
+ Box(3371, 3371),
+ Box(3372, 3372),
+ Box(3373, 3373),
+ Box(3374, 3374),
+ Box(3375, 3375),
+ Box(3376, 3376),
+ Box(3377, 3377),
+ Box(3378, 3378),
+ Box(3379, 3379),
+ Box(3380, 3380),
+ Box(3381, 3381),
+ Box(3382, 3382),
+ Box(3383, 3383),
+ Box(3384, 3384),
+ Box(3385, 3385),
+ Box(3386, 3386),
+ Box(3387, 3387),
+ Box(3388, 3388),
+ Box(3389, 3389),
+ Box(3390, 3390),
+ Box(3391, 3391),
+ Box(3392, 3392),
+ Box(3393, 3393),
+ Box(3394, 3394),
+ Box(3395, 3395),
+ Box(3396, 3396),
+ Box(3397, 3397),
+ Box(3398, 3398),
+ Box(3399, 3399),
+ Box(3400, 3400),
+ Box(3401, 3401),
+ Box(3402, 3402),
+ Box(3403, 3403),
+ Box(3404, 3404),
+ Box(3405, 3405),
+ Box(3406, 3406),
+ Box(3407, 3407),
+ Box(3408, 3408),
+ Box(3409, 3409),
+ Box(3410, 3410),
+ Box(3411, 3411),
+ Box(3412, 3412),
+ Box(3413, 3413),
+ Box(3414, 3414),
+ Box(3415, 3415),
+ Box(3416, 3416),
+ Box(3417, 3417),
+ Box(3418, 3418),
+ Box(3419, 3419),
+ Box(3420, 3420),
+ Box(3421, 3421),
+ Box(3422, 3422),
+ Box(3423, 3423),
+ Box(3424, 3424),
+ Box(3425, 3425),
+ Box(3426, 3426),
+ Box(3427, 3427),
+ Box(3428, 3428),
+ Box(3429, 3429),
+ Box(3430, 3430),
+ Box(3431, 3431),
+ Box(3432, 3432),
+ Box(3433, 3433),
+ Box(3434, 3434),
+ Box(3435, 3435),
+ Box(3436, 3436),
+ Box(3437, 3437),
+ Box(3438, 3438),
+ Box(3439, 3439),
+ Box(3440, 3440),
+ Box(3441, 3441),
+ Box(3442, 3442),
+ Box(3443, 3443),
+ Box(3444, 3444),
+ Box(3445, 3445),
+ Box(3446, 3446),
+ Box(3447, 3447),
+ Box(3448, 3448),
+ Box(3449, 3449),
+ Box(3450, 3450),
+ Box(3451, 3451),
+ Box(3452, 3452),
+ Box(3453, 3453),
+ Box(3454, 3454),
+ Box(3455, 3455),
+ Box(3456, 3456),
+ Box(3457, 3457),
+ Box(3458, 3458),
+ Box(3459, 3459),
+ Box(3460, 3460),
+ Box(3461, 3461),
+ Box(3462, 3462),
+ Box(3463, 3463),
+ Box(3464, 3464),
+ Box(3465, 3465),
+ Box(3466, 3466),
+ Box(3467, 3467),
+ Box(3468, 3468),
+ Box(3469, 3469),
+ Box(3470, 3470),
+ Box(3471, 3471),
+ Box(3472, 3472),
+ Box(3473, 3473),
+ Box(3474, 3474),
+ Box(3475, 3475),
+ Box(3476, 3476),
+ Box(3477, 3477),
+ Box(3478, 3478),
+ Box(3479, 3479),
+ Box(3480, 3480),
+ Box(3481, 3481),
+ Box(3482, 3482),
+ Box(3483, 3483),
+ Box(3484, 3484),
+ Box(3485, 3485),
+ Box(3486, 3486),
+ Box(3487, 3487),
+ Box(3488, 3488),
+ Box(3489, 3489),
+ Box(3490, 3490),
+ Box(3491, 3491),
+ Box(3492, 3492),
+ Box(3493, 3493),
+ Box(3494, 3494),
+ Box(3495, 3495),
+ Box(3496, 3496),
+ Box(3497, 3497),
+ Box(3498, 3498),
+ Box(3499, 3499),
+ Box(3500, 3500),
+ Box(3501, 3501),
+ Box(3502, 3502),
+ Box(3503, 3503),
+ Box(3504, 3504),
+ Box(3505, 3505),
+ Box(3506, 3506),
+ Box(3507, 3507),
+ Box(3508, 3508),
+ Box(3509, 3509),
+ Box(3510, 3510),
+ Box(3511, 3511),
+ Box(3512, 3512),
+ Box(3513, 3513),
+ Box(3514, 3514),
+ Box(3515, 3515),
+ Box(3516, 3516),
+ Box(3517, 3517),
+ Box(3518, 3518),
+ Box(3519, 3519),
+ Box(3520, 3520),
+ Box(3521, 3521),
+ Box(3522, 3522),
+ Box(3523, 3523),
+ Box(3524, 3524),
+ Box(3525, 3525),
+ Box(3526, 3526),
+ Box(3527, 3527),
+ Box(3528, 3528),
+ Box(3529, 3529),
+ Box(3530, 3530),
+ Box(3531, 3531),
+ Box(3532, 3532),
+ Box(3533, 3533),
+ Box(3534, 3534),
+ Box(3535, 3535),
+ Box(3536, 3536),
+ Box(3537, 3537),
+ Box(3538, 3538),
+ Box(3539, 3539),
+ Box(3540, 3540),
+ Box(3541, 3541),
+ Box(3542, 3542),
+ Box(3543, 3543),
+ Box(3544, 3544),
+ Box(3545, 3545),
+ Box(3546, 3546),
+ Box(3547, 3547),
+ Box(3548, 3548),
+ Box(3549, 3549),
+ Box(3550, 3550),
+ Box(3551, 3551),
+ Box(3552, 3552),
+ Box(3553, 3553),
+ Box(3554, 3554),
+ Box(3555, 3555),
+ Box(3556, 3556),
+ Box(3557, 3557),
+ Box(3558, 3558),
+ Box(3559, 3559),
+ Box(3560, 3560),
+ Box(3561, 3561),
+ Box(3562, 3562),
+ Box(3563, 3563),
+ Box(3564, 3564),
+ Box(3565, 3565),
+ Box(3566, 3566),
+ Box(3567, 3567),
+ Box(3568, 3568),
+ Box(3569, 3569),
+ Box(3570, 3570),
+ Box(3571, 3571),
+ Box(3572, 3572),
+ Box(3573, 3573),
+ Box(3574, 3574),
+ Box(3575, 3575),
+ Box(3576, 3576),
+ Box(3577, 3577),
+ Box(3578, 3578),
+ Box(3579, 3579),
+ Box(3580, 3580),
+ Box(3581, 3581),
+ Box(3582, 3582),
+ Box(3583, 3583),
+ Box(3584, 3584),
+ Box(3585, 3585),
+ Box(3586, 3586),
+ Box(3587, 3587),
+ Box(3588, 3588),
+ Box(3589, 3589),
+ Box(3590, 3590),
+ Box(3591, 3591),
+ Box(3592, 3592),
+ Box(3593, 3593),
+ Box(3594, 3594),
+ Box(3595, 3595),
+ Box(3596, 3596),
+ Box(3597, 3597),
+ Box(3598, 3598),
+ Box(3599, 3599),
+ Box(3600, 3600),
+ Box(3601, 3601),
+ Box(3602, 3602),
+ Box(3603, 3603),
+ Box(3604, 3604),
+ Box(3605, 3605),
+ Box(3606, 3606),
+ Box(3607, 3607),
+ Box(3608, 3608),
+ Box(3609, 3609),
+ Box(3610, 3610),
+ Box(3611, 3611),
+ Box(3612, 3612),
+ Box(3613, 3613),
+ Box(3614, 3614),
+ Box(3615, 3615),
+ Box(3616, 3616),
+ Box(3617, 3617),
+ Box(3618, 3618),
+ Box(3619, 3619),
+ Box(3620, 3620),
+ Box(3621, 3621),
+ Box(3622, 3622),
+ Box(3623, 3623),
+ Box(3624, 3624),
+ Box(3625, 3625),
+ Box(3626, 3626),
+ Box(3627, 3627),
+ Box(3628, 3628),
+ Box(3629, 3629),
+ Box(3630, 3630),
+ Box(3631, 3631),
+ Box(3632, 3632),
+ Box(3633, 3633),
+ Box(3634, 3634),
+ Box(3635, 3635),
+ Box(3636, 3636),
+ Box(3637, 3637),
+ Box(3638, 3638),
+ Box(3639, 3639),
+ Box(3640, 3640),
+ Box(3641, 3641),
+ Box(3642, 3642),
+ Box(3643, 3643),
+ Box(3644, 3644),
+ Box(3645, 3645),
+ Box(3646, 3646),
+ Box(3647, 3647),
+ Box(3648, 3648),
+ Box(3649, 3649),
+ Box(3650, 3650),
+ Box(3651, 3651),
+ Box(3652, 3652),
+ Box(3653, 3653),
+ Box(3654, 3654),
+ Box(3655, 3655),
+ Box(3656, 3656),
+ Box(3657, 3657),
+ Box(3658, 3658),
+ Box(3659, 3659),
+ Box(3660, 3660),
+ Box(3661, 3661),
+ Box(3662, 3662),
+ Box(3663, 3663),
+ Box(3664, 3664),
+ Box(3665, 3665),
+ Box(3666, 3666),
+ Box(3667, 3667),
+ Box(3668, 3668),
+ Box(3669, 3669),
+ Box(3670, 3670),
+ Box(3671, 3671),
+ Box(3672, 3672),
+ Box(3673, 3673),
+ Box(3674, 3674),
+ Box(3675, 3675),
+ Box(3676, 3676),
+ Box(3677, 3677),
+ Box(3678, 3678),
+ Box(3679, 3679),
+ Box(3680, 3680),
+ Box(3681, 3681),
+ Box(3682, 3682),
+ Box(3683, 3683),
+ Box(3684, 3684),
+ Box(3685, 3685),
+ Box(3686, 3686),
+ Box(3687, 3687),
+ Box(3688, 3688),
+ Box(3689, 3689),
+ Box(3690, 3690),
+ Box(3691, 3691),
+ Box(3692, 3692),
+ Box(3693, 3693),
+ Box(3694, 3694),
+ Box(3695, 3695),
+ Box(3696, 3696),
+ Box(3697, 3697),
+ Box(3698, 3698),
+ Box(3699, 3699),
+ Box(3700, 3700),
+ Box(3701, 3701),
+ Box(3702, 3702),
+ Box(3703, 3703),
+ Box(3704, 3704),
+ Box(3705, 3705),
+ Box(3706, 3706),
+ Box(3707, 3707),
+ Box(3708, 3708),
+ Box(3709, 3709),
+ Box(3710, 3710),
+ Box(3711, 3711),
+ Box(3712, 3712),
+ Box(3713, 3713),
+ Box(3714, 3714),
+ Box(3715, 3715),
+ Box(3716, 3716),
+ Box(3717, 3717),
+ Box(3718, 3718),
+ Box(3719, 3719),
+ Box(3720, 3720),
+ Box(3721, 3721),
+ Box(3722, 3722),
+ Box(3723, 3723),
+ Box(3724, 3724),
+ Box(3725, 3725),
+ Box(3726, 3726),
+ Box(3727, 3727),
+ Box(3728, 3728),
+ Box(3729, 3729),
+ Box(3730, 3730),
+ Box(3731, 3731),
+ Box(3732, 3732),
+ Box(3733, 3733),
+ Box(3734, 3734),
+ Box(3735, 3735),
+ Box(3736, 3736),
+ Box(3737, 3737),
+ Box(3738, 3738),
+ Box(3739, 3739),
+ Box(3740, 3740),
+ Box(3741, 3741),
+ Box(3742, 3742),
+ Box(3743, 3743),
+ Box(3744, 3744),
+ Box(3745, 3745),
+ Box(3746, 3746),
+ Box(3747, 3747),
+ Box(3748, 3748),
+ Box(3749, 3749),
+ Box(3750, 3750),
+ Box(3751, 3751),
+ Box(3752, 3752),
+ Box(3753, 3753),
+ Box(3754, 3754),
+ Box(3755, 3755),
+ Box(3756, 3756),
+ Box(3757, 3757),
+ Box(3758, 3758),
+ Box(3759, 3759),
+ Box(3760, 3760),
+ Box(3761, 3761),
+ Box(3762, 3762),
+ Box(3763, 3763),
+ Box(3764, 3764),
+ Box(3765, 3765),
+ Box(3766, 3766),
+ Box(3767, 3767),
+ Box(3768, 3768),
+ Box(3769, 3769),
+ Box(3770, 3770),
+ Box(3771, 3771),
+ Box(3772, 3772),
+ Box(3773, 3773),
+ Box(3774, 3774),
+ Box(3775, 3775),
+ Box(3776, 3776),
+ Box(3777, 3777),
+ Box(3778, 3778),
+ Box(3779, 3779),
+ Box(3780, 3780),
+ Box(3781, 3781),
+ Box(3782, 3782),
+ Box(3783, 3783),
+ Box(3784, 3784),
+ Box(3785, 3785),
+ Box(3786, 3786),
+ Box(3787, 3787),
+ Box(3788, 3788),
+ Box(3789, 3789),
+ Box(3790, 3790),
+ Box(3791, 3791),
+ Box(3792, 3792),
+ Box(3793, 3793),
+ Box(3794, 3794),
+ Box(3795, 3795),
+ Box(3796, 3796),
+ Box(3797, 3797),
+ Box(3798, 3798),
+ Box(3799, 3799),
+ Box(3800, 3800),
+ Box(3801, 3801),
+ Box(3802, 3802),
+ Box(3803, 3803),
+ Box(3804, 3804),
+ Box(3805, 3805),
+ Box(3806, 3806),
+ Box(3807, 3807),
+ Box(3808, 3808),
+ Box(3809, 3809),
+ Box(3810, 3810),
+ Box(3811, 3811),
+ Box(3812, 3812),
+ Box(3813, 3813),
+ Box(3814, 3814),
+ Box(3815, 3815),
+ Box(3816, 3816),
+ Box(3817, 3817),
+ Box(3818, 3818),
+ Box(3819, 3819),
+ Box(3820, 3820),
+ Box(3821, 3821),
+ Box(3822, 3822),
+ Box(3823, 3823),
+ Box(3824, 3824),
+ Box(3825, 3825),
+ Box(3826, 3826),
+ Box(3827, 3827),
+ Box(3828, 3828),
+ Box(3829, 3829),
+ Box(3830, 3830),
+ Box(3831, 3831),
+ Box(3832, 3832),
+ Box(3833, 3833),
+ Box(3834, 3834),
+ Box(3835, 3835),
+ Box(3836, 3836),
+ Box(3837, 3837),
+ Box(3838, 3838),
+ Box(3839, 3839),
+ Box(3840, 3840),
+ Box(3841, 3841),
+ Box(3842, 3842),
+ Box(3843, 3843),
+ Box(3844, 3844),
+ Box(3845, 3845),
+ Box(3846, 3846),
+ Box(3847, 3847),
+ Box(3848, 3848),
+ Box(3849, 3849),
+ Box(3850, 3850),
+ Box(3851, 3851),
+ Box(3852, 3852),
+ Box(3853, 3853),
+ Box(3854, 3854),
+ Box(3855, 3855),
+ Box(3856, 3856),
+ Box(3857, 3857),
+ Box(3858, 3858),
+ Box(3859, 3859),
+ Box(3860, 3860),
+ Box(3861, 3861),
+ Box(3862, 3862),
+ Box(3863, 3863),
+ Box(3864, 3864),
+ Box(3865, 3865),
+ Box(3866, 3866),
+ Box(3867, 3867),
+ Box(3868, 3868),
+ Box(3869, 3869),
+ Box(3870, 3870),
+ Box(3871, 3871),
+ Box(3872, 3872),
+ Box(3873, 3873),
+ Box(3874, 3874),
+ Box(3875, 3875),
+ Box(3876, 3876),
+ Box(3877, 3877),
+ Box(3878, 3878),
+ Box(3879, 3879),
+ Box(3880, 3880),
+ Box(3881, 3881),
+ Box(3882, 3882),
+ Box(3883, 3883),
+ Box(3884, 3884),
+ Box(3885, 3885),
+ Box(3886, 3886),
+ Box(3887, 3887),
+ Box(3888, 3888),
+ Box(3889, 3889),
+ Box(3890, 3890),
+ Box(3891, 3891),
+ Box(3892, 3892),
+ Box(3893, 3893),
+ Box(3894, 3894),
+ Box(3895, 3895),
+ Box(3896, 3896),
+ Box(3897, 3897),
+ Box(3898, 3898),
+ Box(3899, 3899),
+ Box(3900, 3900),
+ Box(3901, 3901),
+ Box(3902, 3902),
+ Box(3903, 3903),
+ Box(3904, 3904),
+ Box(3905, 3905),
+ Box(3906, 3906),
+ Box(3907, 3907),
+ Box(3908, 3908),
+ Box(3909, 3909),
+ Box(3910, 3910),
+ Box(3911, 3911),
+ Box(3912, 3912),
+ Box(3913, 3913),
+ Box(3914, 3914),
+ Box(3915, 3915),
+ Box(3916, 3916),
+ Box(3917, 3917),
+ Box(3918, 3918),
+ Box(3919, 3919),
+ Box(3920, 3920),
+ Box(3921, 3921),
+ Box(3922, 3922),
+ Box(3923, 3923),
+ Box(3924, 3924),
+ Box(3925, 3925),
+ Box(3926, 3926),
+ Box(3927, 3927),
+ Box(3928, 3928),
+ Box(3929, 3929),
+ Box(3930, 3930),
+ Box(3931, 3931),
+ Box(3932, 3932),
+ Box(3933, 3933),
+ Box(3934, 3934),
+ Box(3935, 3935),
+ Box(3936, 3936),
+ Box(3937, 3937),
+ Box(3938, 3938),
+ Box(3939, 3939),
+ Box(3940, 3940),
+ Box(3941, 3941),
+ Box(3942, 3942),
+ Box(3943, 3943),
+ Box(3944, 3944),
+ Box(3945, 3945),
+ Box(3946, 3946),
+ Box(3947, 3947),
+ Box(3948, 3948),
+ Box(3949, 3949),
+ Box(3950, 3950),
+ Box(3951, 3951),
+ Box(3952, 3952),
+ Box(3953, 3953),
+ Box(3954, 3954),
+ Box(3955, 3955),
+ Box(3956, 3956),
+ Box(3957, 3957),
+ Box(3958, 3958),
+ Box(3959, 3959),
+ Box(3960, 3960),
+ Box(3961, 3961),
+ Box(3962, 3962),
+ Box(3963, 3963),
+ Box(3964, 3964),
+ Box(3965, 3965),
+ Box(3966, 3966),
+ Box(3967, 3967),
+ Box(3968, 3968),
+ Box(3969, 3969),
+ Box(3970, 3970),
+ Box(3971, 3971),
+ Box(3972, 3972),
+ Box(3973, 3973),
+ Box(3974, 3974),
+ Box(3975, 3975),
+ Box(3976, 3976),
+ Box(3977, 3977),
+ Box(3978, 3978),
+ Box(3979, 3979),
+ Box(3980, 3980),
+ Box(3981, 3981),
+ Box(3982, 3982),
+ Box(3983, 3983),
+ Box(3984, 3984),
+ Box(3985, 3985),
+ Box(3986, 3986),
+ Box(3987, 3987),
+ Box(3988, 3988),
+ Box(3989, 3989),
+ Box(3990, 3990),
+ Box(3991, 3991),
+ Box(3992, 3992),
+ Box(3993, 3993),
+ Box(3994, 3994),
+ Box(3995, 3995),
+ Box(3996, 3996),
+ Box(3997, 3997),
+ Box(3998, 3998),
+ Box(3999, 3999),
+ Box(4000, 4000),
+ Box(4001, 4001),
+ Box(4002, 4002),
+ Box(4003, 4003),
+ Box(4004, 4004),
+ Box(4005, 4005),
+ Box(4006, 4006),
+ Box(4007, 4007),
+ Box(4008, 4008),
+ Box(4009, 4009),
+ Box(4010, 4010),
+ Box(4011, 4011),
+ Box(4012, 4012),
+ Box(4013, 4013),
+ Box(4014, 4014),
+ Box(4015, 4015),
+ Box(4016, 4016),
+ Box(4017, 4017),
+ Box(4018, 4018),
+ Box(4019, 4019),
+ Box(4020, 4020),
+ Box(4021, 4021),
+ Box(4022, 4022),
+ Box(4023, 4023),
+ Box(4024, 4024),
+ Box(4025, 4025),
+ Box(4026, 4026),
+ Box(4027, 4027),
+ Box(4028, 4028),
+ Box(4029, 4029),
+ Box(4030, 4030),
+ Box(4031, 4031),
+ Box(4032, 4032),
+ Box(4033, 4033),
+ Box(4034, 4034),
+ Box(4035, 4035),
+ Box(4036, 4036),
+ Box(4037, 4037),
+ Box(4038, 4038),
+ Box(4039, 4039),
+ Box(4040, 4040),
+ Box(4041, 4041),
+ Box(4042, 4042),
+ Box(4043, 4043),
+ Box(4044, 4044),
+ Box(4045, 4045),
+ Box(4046, 4046),
+ Box(4047, 4047),
+ Box(4048, 4048),
+ Box(4049, 4049),
+ Box(4050, 4050),
+ Box(4051, 4051),
+ Box(4052, 4052),
+ Box(4053, 4053),
+ Box(4054, 4054),
+ Box(4055, 4055),
+ Box(4056, 4056),
+ Box(4057, 4057),
+ Box(4058, 4058),
+ Box(4059, 4059),
+ Box(4060, 4060),
+ Box(4061, 4061),
+ Box(4062, 4062),
+ Box(4063, 4063),
+ Box(4064, 4064),
+ Box(4065, 4065),
+ Box(4066, 4066),
+ Box(4067, 4067),
+ Box(4068, 4068),
+ Box(4069, 4069),
+ Box(4070, 4070),
+ Box(4071, 4071),
+ Box(4072, 4072),
+ Box(4073, 4073),
+ Box(4074, 4074),
+ Box(4075, 4075),
+ Box(4076, 4076),
+ Box(4077, 4077),
+ Box(4078, 4078),
+ Box(4079, 4079),
+ Box(4080, 4080),
+ Box(4081, 4081),
+ Box(4082, 4082),
+ Box(4083, 4083),
+ Box(4084, 4084),
+ Box(4085, 4085),
+ Box(4086, 4086),
+ Box(4087, 4087),
+ Box(4088, 4088),
+ Box(4089, 4089),
+ Box(4090, 4090),
+ Box(4091, 4091),
+ Box(4092, 4092),
+ Box(4093, 4093),
+ Box(4094, 4094),
+ Box(4095, 4095),
+ Box(4096, 4096),
+ Box(4097, 4097),
+ Box(4098, 4098),
+ Box(4099, 4099),
+ Box(4100, 4100),
+ Box(4101, 4101),
+ Box(4102, 4102),
+ Box(4103, 4103),
+ Box(4104, 4104),
+ Box(4105, 4105),
+ Box(4106, 4106),
+ Box(4107, 4107),
+ Box(4108, 4108),
+ Box(4109, 4109),
+ Box(4110, 4110),
+ Box(4111, 4111),
+ Box(4112, 4112),
+ Box(4113, 4113),
+ Box(4114, 4114),
+ Box(4115, 4115),
+ Box(4116, 4116),
+ Box(4117, 4117),
+ Box(4118, 4118),
+ Box(4119, 4119),
+ Box(4120, 4120),
+ Box(4121, 4121),
+ Box(4122, 4122),
+ Box(4123, 4123),
+ Box(4124, 4124),
+ Box(4125, 4125),
+ Box(4126, 4126),
+ Box(4127, 4127),
+ Box(4128, 4128),
+ Box(4129, 4129),
+ Box(4130, 4130),
+ Box(4131, 4131),
+ Box(4132, 4132),
+ Box(4133, 4133),
+ Box(4134, 4134),
+ Box(4135, 4135),
+ Box(4136, 4136),
+ Box(4137, 4137),
+ Box(4138, 4138),
+ Box(4139, 4139),
+ Box(4140, 4140),
+ Box(4141, 4141),
+ Box(4142, 4142),
+ Box(4143, 4143),
+ Box(4144, 4144),
+ Box(4145, 4145),
+ Box(4146, 4146),
+ Box(4147, 4147),
+ Box(4148, 4148),
+ Box(4149, 4149),
+ Box(4150, 4150),
+ Box(4151, 4151),
+ Box(4152, 4152),
+ Box(4153, 4153),
+ Box(4154, 4154),
+ Box(4155, 4155),
+ Box(4156, 4156),
+ Box(4157, 4157),
+ Box(4158, 4158),
+ Box(4159, 4159),
+ Box(4160, 4160),
+ Box(4161, 4161),
+ Box(4162, 4162),
+ Box(4163, 4163),
+ Box(4164, 4164),
+ Box(4165, 4165),
+ Box(4166, 4166),
+ Box(4167, 4167),
+ Box(4168, 4168),
+ Box(4169, 4169),
+ Box(4170, 4170),
+ Box(4171, 4171),
+ Box(4172, 4172),
+ Box(4173, 4173),
+ Box(4174, 4174),
+ Box(4175, 4175),
+ Box(4176, 4176),
+ Box(4177, 4177),
+ Box(4178, 4178),
+ Box(4179, 4179),
+ Box(4180, 4180),
+ Box(4181, 4181),
+ Box(4182, 4182),
+ Box(4183, 4183),
+ Box(4184, 4184),
+ Box(4185, 4185),
+ Box(4186, 4186),
+ Box(4187, 4187),
+ Box(4188, 4188),
+ Box(4189, 4189),
+ Box(4190, 4190),
+ Box(4191, 4191),
+ Box(4192, 4192),
+ Box(4193, 4193),
+ Box(4194, 4194),
+ Box(4195, 4195),
+ Box(4196, 4196),
+ Box(4197, 4197),
+ Box(4198, 4198),
+ Box(4199, 4199),
+ Box(4200, 4200),
+ Box(4201, 4201),
+ Box(4202, 4202),
+ Box(4203, 4203),
+ Box(4204, 4204),
+ Box(4205, 4205),
+ Box(4206, 4206),
+ Box(4207, 4207),
+ Box(4208, 4208),
+ Box(4209, 4209),
+ Box(4210, 4210),
+ Box(4211, 4211),
+ Box(4212, 4212),
+ Box(4213, 4213),
+ Box(4214, 4214),
+ Box(4215, 4215),
+ Box(4216, 4216),
+ Box(4217, 4217),
+ Box(4218, 4218),
+ Box(4219, 4219),
+ Box(4220, 4220),
+ Box(4221, 4221),
+ Box(4222, 4222),
+ Box(4223, 4223),
+ Box(4224, 4224),
+ Box(4225, 4225),
+ Box(4226, 4226),
+ Box(4227, 4227),
+ Box(4228, 4228),
+ Box(4229, 4229),
+ Box(4230, 4230),
+ Box(4231, 4231),
+ Box(4232, 4232),
+ Box(4233, 4233),
+ Box(4234, 4234),
+ Box(4235, 4235),
+ Box(4236, 4236),
+ Box(4237, 4237),
+ Box(4238, 4238),
+ Box(4239, 4239),
+ Box(4240, 4240),
+ Box(4241, 4241),
+ Box(4242, 4242),
+ Box(4243, 4243),
+ Box(4244, 4244),
+ Box(4245, 4245),
+ Box(4246, 4246),
+ Box(4247, 4247),
+ Box(4248, 4248),
+ Box(4249, 4249),
+ Box(4250, 4250),
+ Box(4251, 4251),
+ Box(4252, 4252),
+ Box(4253, 4253),
+ Box(4254, 4254),
+ Box(4255, 4255),
+ Box(4256, 4256),
+ Box(4257, 4257),
+ Box(4258, 4258),
+ Box(4259, 4259),
+ Box(4260, 4260),
+ Box(4261, 4261),
+ Box(4262, 4262),
+ Box(4263, 4263),
+ Box(4264, 4264),
+ Box(4265, 4265),
+ Box(4266, 4266),
+ Box(4267, 4267),
+ Box(4268, 4268),
+ Box(4269, 4269),
+ Box(4270, 4270),
+ Box(4271, 4271),
+ Box(4272, 4272),
+ Box(4273, 4273),
+ Box(4274, 4274),
+ Box(4275, 4275),
+ Box(4276, 4276),
+ Box(4277, 4277),
+ Box(4278, 4278),
+ Box(4279, 4279),
+ Box(4280, 4280),
+ Box(4281, 4281),
+ Box(4282, 4282),
+ Box(4283, 4283),
+ Box(4284, 4284),
+ Box(4285, 4285),
+ Box(4286, 4286),
+ Box(4287, 4287),
+ Box(4288, 4288),
+ Box(4289, 4289),
+ Box(4290, 4290),
+ Box(4291, 4291),
+ Box(4292, 4292),
+ Box(4293, 4293),
+ Box(4294, 4294),
+ Box(4295, 4295),
+ Box(4296, 4296),
+ Box(4297, 4297),
+ Box(4298, 4298),
+ Box(4299, 4299),
+ Box(4300, 4300),
+ Box(4301, 4301),
+ Box(4302, 4302),
+ Box(4303, 4303),
+ Box(4304, 4304),
+ Box(4305, 4305),
+ Box(4306, 4306),
+ Box(4307, 4307),
+ Box(4308, 4308),
+ Box(4309, 4309),
+ Box(4310, 4310),
+ Box(4311, 4311),
+ Box(4312, 4312),
+ Box(4313, 4313),
+ Box(4314, 4314),
+ Box(4315, 4315),
+ Box(4316, 4316),
+ Box(4317, 4317),
+ Box(4318, 4318),
+ Box(4319, 4319),
+ Box(4320, 4320),
+ Box(4321, 4321),
+ Box(4322, 4322),
+ Box(4323, 4323),
+ Box(4324, 4324),
+ Box(4325, 4325),
+ Box(4326, 4326),
+ Box(4327, 4327),
+ Box(4328, 4328),
+ Box(4329, 4329),
+ Box(4330, 4330),
+ Box(4331, 4331),
+ Box(4332, 4332),
+ Box(4333, 4333),
+ Box(4334, 4334),
+ Box(4335, 4335),
+ Box(4336, 4336),
+ Box(4337, 4337),
+ Box(4338, 4338),
+ Box(4339, 4339),
+ Box(4340, 4340),
+ Box(4341, 4341),
+ Box(4342, 4342),
+ Box(4343, 4343),
+ Box(4344, 4344),
+ Box(4345, 4345),
+ Box(4346, 4346),
+ Box(4347, 4347),
+ Box(4348, 4348),
+ Box(4349, 4349),
+ Box(4350, 4350),
+ Box(4351, 4351),
+ Box(4352, 4352),
+ Box(4353, 4353),
+ Box(4354, 4354),
+ Box(4355, 4355),
+ Box(4356, 4356),
+ Box(4357, 4357),
+ Box(4358, 4358),
+ Box(4359, 4359),
+ Box(4360, 4360),
+ Box(4361, 4361),
+ Box(4362, 4362),
+ Box(4363, 4363),
+ Box(4364, 4364),
+ Box(4365, 4365),
+ Box(4366, 4366),
+ Box(4367, 4367),
+ Box(4368, 4368),
+ Box(4369, 4369),
+ Box(4370, 4370),
+ Box(4371, 4371),
+ Box(4372, 4372),
+ Box(4373, 4373),
+ Box(4374, 4374),
+ Box(4375, 4375),
+ Box(4376, 4376),
+ Box(4377, 4377),
+ Box(4378, 4378),
+ Box(4379, 4379),
+ Box(4380, 4380),
+ Box(4381, 4381),
+ Box(4382, 4382),
+ Box(4383, 4383),
+ Box(4384, 4384),
+ Box(4385, 4385),
+ Box(4386, 4386),
+ Box(4387, 4387),
+ Box(4388, 4388),
+ Box(4389, 4389),
+ Box(4390, 4390),
+ Box(4391, 4391),
+ Box(4392, 4392),
+ Box(4393, 4393),
+ Box(4394, 4394),
+ Box(4395, 4395),
+ Box(4396, 4396),
+ Box(4397, 4397),
+ Box(4398, 4398),
+ Box(4399, 4399),
+ Box(4400, 4400),
+ Box(4401, 4401),
+ Box(4402, 4402),
+ Box(4403, 4403),
+ Box(4404, 4404),
+ Box(4405, 4405),
+ Box(4406, 4406),
+ Box(4407, 4407),
+ Box(4408, 4408),
+ Box(4409, 4409),
+ Box(4410, 4410),
+ Box(4411, 4411),
+ Box(4412, 4412),
+ Box(4413, 4413),
+ Box(4414, 4414),
+ Box(4415, 4415),
+ Box(4416, 4416),
+ Box(4417, 4417),
+ Box(4418, 4418),
+ Box(4419, 4419),
+ Box(4420, 4420),
+ Box(4421, 4421),
+ Box(4422, 4422),
+ Box(4423, 4423),
+ Box(4424, 4424),
+ Box(4425, 4425),
+ Box(4426, 4426),
+ Box(4427, 4427),
+ Box(4428, 4428),
+ Box(4429, 4429),
+ Box(4430, 4430),
+ Box(4431, 4431),
+ Box(4432, 4432),
+ Box(4433, 4433),
+ Box(4434, 4434),
+ Box(4435, 4435),
+ Box(4436, 4436),
+ Box(4437, 4437),
+ Box(4438, 4438),
+ Box(4439, 4439),
+ Box(4440, 4440),
+ Box(4441, 4441),
+ Box(4442, 4442),
+ Box(4443, 4443),
+ Box(4444, 4444),
+ Box(4445, 4445),
+ Box(4446, 4446),
+ Box(4447, 4447),
+ Box(4448, 4448),
+ Box(4449, 4449),
+ Box(4450, 4450),
+ Box(4451, 4451),
+ Box(4452, 4452),
+ Box(4453, 4453),
+ Box(4454, 4454),
+ Box(4455, 4455),
+ Box(4456, 4456),
+ Box(4457, 4457),
+ Box(4458, 4458),
+ Box(4459, 4459),
+ Box(4460, 4460),
+ Box(4461, 4461),
+ Box(4462, 4462),
+ Box(4463, 4463),
+ Box(4464, 4464),
+ Box(4465, 4465),
+ Box(4466, 4466),
+ Box(4467, 4467),
+ Box(4468, 4468),
+ Box(4469, 4469),
+ Box(4470, 4470),
+ Box(4471, 4471),
+ Box(4472, 4472),
+ Box(4473, 4473),
+ Box(4474, 4474),
+ Box(4475, 4475),
+ Box(4476, 4476),
+ Box(4477, 4477),
+ Box(4478, 4478),
+ Box(4479, 4479),
+ Box(4480, 4480),
+ Box(4481, 4481),
+ Box(4482, 4482),
+ Box(4483, 4483),
+ Box(4484, 4484),
+ Box(4485, 4485),
+ Box(4486, 4486),
+ Box(4487, 4487),
+ Box(4488, 4488),
+ Box(4489, 4489),
+ Box(4490, 4490),
+ Box(4491, 4491),
+ Box(4492, 4492),
+ Box(4493, 4493),
+ Box(4494, 4494),
+ Box(4495, 4495),
+ Box(4496, 4496),
+ Box(4497, 4497),
+ Box(4498, 4498),
+ Box(4499, 4499),
+ Box(4500, 4500),
+ Box(4501, 4501),
+ Box(4502, 4502),
+ Box(4503, 4503),
+ Box(4504, 4504),
+ Box(4505, 4505),
+ Box(4506, 4506),
+ Box(4507, 4507),
+ Box(4508, 4508),
+ Box(4509, 4509),
+ Box(4510, 4510),
+ Box(4511, 4511),
+ Box(4512, 4512),
+ Box(4513, 4513),
+ Box(4514, 4514),
+ Box(4515, 4515),
+ Box(4516, 4516),
+ Box(4517, 4517),
+ Box(4518, 4518),
+ Box(4519, 4519),
+ Box(4520, 4520),
+ Box(4521, 4521),
+ Box(4522, 4522),
+ Box(4523, 4523),
+ Box(4524, 4524),
+ Box(4525, 4525),
+ Box(4526, 4526),
+ Box(4527, 4527),
+ Box(4528, 4528),
+ Box(4529, 4529),
+ Box(4530, 4530),
+ Box(4531, 4531),
+ Box(4532, 4532),
+ Box(4533, 4533),
+ Box(4534, 4534),
+ Box(4535, 4535),
+ Box(4536, 4536),
+ Box(4537, 4537),
+ Box(4538, 4538),
+ Box(4539, 4539),
+ Box(4540, 4540),
+ Box(4541, 4541),
+ Box(4542, 4542),
+ Box(4543, 4543),
+ Box(4544, 4544),
+ Box(4545, 4545),
+ Box(4546, 4546),
+ Box(4547, 4547),
+ Box(4548, 4548),
+ Box(4549, 4549),
+ Box(4550, 4550),
+ Box(4551, 4551),
+ Box(4552, 4552),
+ Box(4553, 4553),
+ Box(4554, 4554),
+ Box(4555, 4555),
+ Box(4556, 4556),
+ Box(4557, 4557),
+ Box(4558, 4558),
+ Box(4559, 4559),
+ Box(4560, 4560),
+ Box(4561, 4561),
+ Box(4562, 4562),
+ Box(4563, 4563),
+ Box(4564, 4564),
+ Box(4565, 4565),
+ Box(4566, 4566),
+ Box(4567, 4567),
+ Box(4568, 4568),
+ Box(4569, 4569),
+ Box(4570, 4570),
+ Box(4571, 4571),
+ Box(4572, 4572),
+ Box(4573, 4573),
+ Box(4574, 4574),
+ Box(4575, 4575),
+ Box(4576, 4576),
+ Box(4577, 4577),
+ Box(4578, 4578),
+ Box(4579, 4579),
+ Box(4580, 4580),
+ Box(4581, 4581),
+ Box(4582, 4582),
+ Box(4583, 4583),
+ Box(4584, 4584),
+ Box(4585, 4585),
+ Box(4586, 4586),
+ Box(4587, 4587),
+ Box(4588, 4588),
+ Box(4589, 4589),
+ Box(4590, 4590),
+ Box(4591, 4591),
+ Box(4592, 4592),
+ Box(4593, 4593),
+ Box(4594, 4594),
+ Box(4595, 4595),
+ Box(4596, 4596),
+ Box(4597, 4597),
+ Box(4598, 4598),
+ Box(4599, 4599),
+ Box(4600, 4600),
+ Box(4601, 4601),
+ Box(4602, 4602),
+ Box(4603, 4603),
+ Box(4604, 4604),
+ Box(4605, 4605),
+ Box(4606, 4606),
+ Box(4607, 4607),
+ Box(4608, 4608),
+ Box(4609, 4609),
+ Box(4610, 4610),
+ Box(4611, 4611),
+ Box(4612, 4612),
+ Box(4613, 4613),
+ Box(4614, 4614),
+ Box(4615, 4615),
+ Box(4616, 4616),
+ Box(4617, 4617),
+ Box(4618, 4618),
+ Box(4619, 4619),
+ Box(4620, 4620),
+ Box(4621, 4621),
+ Box(4622, 4622),
+ Box(4623, 4623),
+ Box(4624, 4624),
+ Box(4625, 4625),
+ Box(4626, 4626),
+ Box(4627, 4627),
+ Box(4628, 4628),
+ Box(4629, 4629),
+ Box(4630, 4630),
+ Box(4631, 4631),
+ Box(4632, 4632),
+ Box(4633, 4633),
+ Box(4634, 4634),
+ Box(4635, 4635),
+ Box(4636, 4636),
+ Box(4637, 4637),
+ Box(4638, 4638),
+ Box(4639, 4639),
+ Box(4640, 4640),
+ Box(4641, 4641),
+ Box(4642, 4642),
+ Box(4643, 4643),
+ Box(4644, 4644),
+ Box(4645, 4645),
+ Box(4646, 4646),
+ Box(4647, 4647),
+ Box(4648, 4648),
+ Box(4649, 4649),
+ Box(4650, 4650),
+ Box(4651, 4651),
+ Box(4652, 4652),
+ Box(4653, 4653),
+ Box(4654, 4654),
+ Box(4655, 4655),
+ Box(4656, 4656),
+ Box(4657, 4657),
+ Box(4658, 4658),
+ Box(4659, 4659),
+ Box(4660, 4660),
+ Box(4661, 4661),
+ Box(4662, 4662),
+ Box(4663, 4663),
+ Box(4664, 4664),
+ Box(4665, 4665),
+ Box(4666, 4666),
+ Box(4667, 4667),
+ Box(4668, 4668),
+ Box(4669, 4669),
+ Box(4670, 4670),
+ Box(4671, 4671),
+ Box(4672, 4672),
+ Box(4673, 4673),
+ Box(4674, 4674),
+ Box(4675, 4675),
+ Box(4676, 4676),
+ Box(4677, 4677),
+ Box(4678, 4678),
+ Box(4679, 4679),
+ Box(4680, 4680),
+ Box(4681, 4681),
+ Box(4682, 4682),
+ Box(4683, 4683),
+ Box(4684, 4684),
+ Box(4685, 4685),
+ Box(4686, 4686),
+ Box(4687, 4687),
+ Box(4688, 4688),
+ Box(4689, 4689),
+ Box(4690, 4690),
+ Box(4691, 4691),
+ Box(4692, 4692),
+ Box(4693, 4693),
+ Box(4694, 4694),
+ Box(4695, 4695),
+ Box(4696, 4696),
+ Box(4697, 4697),
+ Box(4698, 4698),
+ Box(4699, 4699),
+ Box(4700, 4700),
+ Box(4701, 4701),
+ Box(4702, 4702),
+ Box(4703, 4703),
+ Box(4704, 4704),
+ Box(4705, 4705),
+ Box(4706, 4706),
+ Box(4707, 4707),
+ Box(4708, 4708),
+ Box(4709, 4709),
+ Box(4710, 4710),
+ Box(4711, 4711),
+ Box(4712, 4712),
+ Box(4713, 4713),
+ Box(4714, 4714),
+ Box(4715, 4715),
+ Box(4716, 4716),
+ Box(4717, 4717),
+ Box(4718, 4718),
+ Box(4719, 4719),
+ Box(4720, 4720),
+ Box(4721, 4721),
+ Box(4722, 4722),
+ Box(4723, 4723),
+ Box(4724, 4724),
+ Box(4725, 4725),
+ Box(4726, 4726),
+ Box(4727, 4727),
+ Box(4728, 4728),
+ Box(4729, 4729),
+ Box(4730, 4730),
+ Box(4731, 4731),
+ Box(4732, 4732),
+ Box(4733, 4733),
+ Box(4734, 4734),
+ Box(4735, 4735),
+ Box(4736, 4736),
+ Box(4737, 4737),
+ Box(4738, 4738),
+ Box(4739, 4739),
+ Box(4740, 4740),
+ Box(4741, 4741),
+ Box(4742, 4742),
+ Box(4743, 4743),
+ Box(4744, 4744),
+ Box(4745, 4745),
+ Box(4746, 4746),
+ Box(4747, 4747),
+ Box(4748, 4748),
+ Box(4749, 4749),
+ Box(4750, 4750),
+ Box(4751, 4751),
+ Box(4752, 4752),
+ Box(4753, 4753),
+ Box(4754, 4754),
+ Box(4755, 4755),
+ Box(4756, 4756),
+ Box(4757, 4757),
+ Box(4758, 4758),
+ Box(4759, 4759),
+ Box(4760, 4760),
+ Box(4761, 4761),
+ Box(4762, 4762),
+ Box(4763, 4763),
+ Box(4764, 4764),
+ Box(4765, 4765),
+ Box(4766, 4766),
+ Box(4767, 4767),
+ Box(4768, 4768),
+ Box(4769, 4769),
+ Box(4770, 4770),
+ Box(4771, 4771),
+ Box(4772, 4772),
+ Box(4773, 4773),
+ Box(4774, 4774),
+ Box(4775, 4775),
+ Box(4776, 4776),
+ Box(4777, 4777),
+ Box(4778, 4778),
+ Box(4779, 4779),
+ Box(4780, 4780),
+ Box(4781, 4781),
+ Box(4782, 4782),
+ Box(4783, 4783),
+ Box(4784, 4784),
+ Box(4785, 4785),
+ Box(4786, 4786),
+ Box(4787, 4787),
+ Box(4788, 4788),
+ Box(4789, 4789),
+ Box(4790, 4790),
+ Box(4791, 4791),
+ Box(4792, 4792),
+ Box(4793, 4793),
+ Box(4794, 4794),
+ Box(4795, 4795),
+ Box(4796, 4796),
+ Box(4797, 4797),
+ Box(4798, 4798),
+ Box(4799, 4799),
+ Box(4800, 4800),
+ Box(4801, 4801),
+ Box(4802, 4802),
+ Box(4803, 4803),
+ Box(4804, 4804),
+ Box(4805, 4805),
+ Box(4806, 4806),
+ Box(4807, 4807),
+ Box(4808, 4808),
+ Box(4809, 4809),
+ Box(4810, 4810),
+ Box(4811, 4811),
+ Box(4812, 4812),
+ Box(4813, 4813),
+ Box(4814, 4814),
+ Box(4815, 4815),
+ Box(4816, 4816),
+ Box(4817, 4817),
+ Box(4818, 4818),
+ Box(4819, 4819),
+ Box(4820, 4820),
+ Box(4821, 4821),
+ Box(4822, 4822),
+ Box(4823, 4823),
+ Box(4824, 4824),
+ Box(4825, 4825),
+ Box(4826, 4826),
+ Box(4827, 4827),
+ Box(4828, 4828),
+ Box(4829, 4829),
+ Box(4830, 4830),
+ Box(4831, 4831),
+ Box(4832, 4832),
+ Box(4833, 4833),
+ Box(4834, 4834),
+ Box(4835, 4835),
+ Box(4836, 4836),
+ Box(4837, 4837),
+ Box(4838, 4838),
+ Box(4839, 4839),
+ Box(4840, 4840),
+ Box(4841, 4841),
+ Box(4842, 4842),
+ Box(4843, 4843),
+ Box(4844, 4844),
+ Box(4845, 4845),
+ Box(4846, 4846),
+ Box(4847, 4847),
+ Box(4848, 4848),
+ Box(4849, 4849),
+ Box(4850, 4850),
+ Box(4851, 4851),
+ Box(4852, 4852),
+ Box(4853, 4853),
+ Box(4854, 4854),
+ Box(4855, 4855),
+ Box(4856, 4856),
+ Box(4857, 4857),
+ Box(4858, 4858),
+ Box(4859, 4859),
+ Box(4860, 4860),
+ Box(4861, 4861),
+ Box(4862, 4862),
+ Box(4863, 4863),
+ Box(4864, 4864),
+ Box(4865, 4865),
+ Box(4866, 4866),
+ Box(4867, 4867),
+ Box(4868, 4868),
+ Box(4869, 4869),
+ Box(4870, 4870),
+ Box(4871, 4871),
+ Box(4872, 4872),
+ Box(4873, 4873),
+ Box(4874, 4874),
+ Box(4875, 4875),
+ Box(4876, 4876),
+ Box(4877, 4877),
+ Box(4878, 4878),
+ Box(4879, 4879),
+ Box(4880, 4880),
+ Box(4881, 4881),
+ Box(4882, 4882),
+ Box(4883, 4883),
+ Box(4884, 4884),
+ Box(4885, 4885),
+ Box(4886, 4886),
+ Box(4887, 4887),
+ Box(4888, 4888),
+ Box(4889, 4889),
+ Box(4890, 4890),
+ Box(4891, 4891),
+ Box(4892, 4892),
+ Box(4893, 4893),
+ Box(4894, 4894),
+ Box(4895, 4895),
+ Box(4896, 4896),
+ Box(4897, 4897),
+ Box(4898, 4898),
+ Box(4899, 4899),
+ Box(4900, 4900),
+ Box(4901, 4901),
+ Box(4902, 4902),
+ Box(4903, 4903),
+ Box(4904, 4904),
+ Box(4905, 4905),
+ Box(4906, 4906),
+ Box(4907, 4907),
+ Box(4908, 4908),
+ Box(4909, 4909),
+ Box(4910, 4910),
+ Box(4911, 4911),
+ Box(4912, 4912),
+ Box(4913, 4913),
+ Box(4914, 4914),
+ Box(4915, 4915),
+ Box(4916, 4916),
+ Box(4917, 4917),
+ Box(4918, 4918),
+ Box(4919, 4919),
+ Box(4920, 4920),
+ Box(4921, 4921),
+ Box(4922, 4922),
+ Box(4923, 4923),
+ Box(4924, 4924),
+ Box(4925, 4925),
+ Box(4926, 4926),
+ Box(4927, 4927),
+ Box(4928, 4928),
+ Box(4929, 4929),
+ Box(4930, 4930),
+ Box(4931, 4931),
+ Box(4932, 4932),
+ Box(4933, 4933),
+ Box(4934, 4934),
+ Box(4935, 4935),
+ Box(4936, 4936),
+ Box(4937, 4937),
+ Box(4938, 4938),
+ Box(4939, 4939),
+ Box(4940, 4940),
+ Box(4941, 4941),
+ Box(4942, 4942),
+ Box(4943, 4943),
+ Box(4944, 4944),
+ Box(4945, 4945),
+ Box(4946, 4946),
+ Box(4947, 4947),
+ Box(4948, 4948),
+ Box(4949, 4949),
+ Box(4950, 4950),
+ Box(4951, 4951),
+ Box(4952, 4952),
+ Box(4953, 4953),
+ Box(4954, 4954),
+ Box(4955, 4955),
+ Box(4956, 4956),
+ Box(4957, 4957),
+ Box(4958, 4958),
+ Box(4959, 4959),
+ Box(4960, 4960),
+ Box(4961, 4961),
+ Box(4962, 4962),
+ Box(4963, 4963),
+ Box(4964, 4964),
+ Box(4965, 4965),
+ Box(4966, 4966),
+ Box(4967, 4967),
+ Box(4968, 4968),
+ Box(4969, 4969),
+ Box(4970, 4970),
+ Box(4971, 4971),
+ Box(4972, 4972),
+ Box(4973, 4973),
+ Box(4974, 4974),
+ Box(4975, 4975),
+ Box(4976, 4976),
+ Box(4977, 4977),
+ Box(4978, 4978),
+ Box(4979, 4979),
+ Box(4980, 4980),
+ Box(4981, 4981),
+ Box(4982, 4982),
+ Box(4983, 4983),
+ Box(4984, 4984),
+ Box(4985, 4985),
+ Box(4986, 4986),
+ Box(4987, 4987),
+ Box(4988, 4988),
+ Box(4989, 4989),
+ Box(4990, 4990),
+ Box(4991, 4991),
+ Box(4992, 4992),
+ Box(4993, 4993),
+ Box(4994, 4994),
+ Box(4995, 4995),
+ Box(4996, 4996),
+ Box(4997, 4997),
+ Box(4998, 4998),
+ Box(4999, 4999),
+ Box(5000, 5000),
+ Box(5001, 5001),
+ Box(5002, 5002),
+ Box(5003, 5003),
+ Box(5004, 5004),
+ Box(5005, 5005),
+ Box(5006, 5006),
+ Box(5007, 5007),
+ Box(5008, 5008),
+ Box(5009, 5009),
+ Box(5010, 5010),
+ Box(5011, 5011),
+ Box(5012, 5012),
+ Box(5013, 5013),
+ Box(5014, 5014),
+ Box(5015, 5015),
+ Box(5016, 5016),
+ Box(5017, 5017),
+ Box(5018, 5018),
+ Box(5019, 5019),
+ Box(5020, 5020),
+ Box(5021, 5021),
+ Box(5022, 5022),
+ Box(5023, 5023),
+ Box(5024, 5024),
+ Box(5025, 5025),
+ Box(5026, 5026),
+ Box(5027, 5027),
+ Box(5028, 5028),
+ Box(5029, 5029),
+ Box(5030, 5030),
+ Box(5031, 5031),
+ Box(5032, 5032),
+ Box(5033, 5033),
+ Box(5034, 5034),
+ Box(5035, 5035),
+ Box(5036, 5036),
+ Box(5037, 5037),
+ Box(5038, 5038),
+ Box(5039, 5039),
+ Box(5040, 5040),
+ Box(5041, 5041),
+ Box(5042, 5042),
+ Box(5043, 5043),
+ Box(5044, 5044),
+ Box(5045, 5045),
+ Box(5046, 5046),
+ Box(5047, 5047),
+ Box(5048, 5048),
+ Box(5049, 5049),
+ Box(5050, 5050),
+ Box(5051, 5051),
+ Box(5052, 5052),
+ Box(5053, 5053),
+ Box(5054, 5054),
+ Box(5055, 5055),
+ Box(5056, 5056),
+ Box(5057, 5057),
+ Box(5058, 5058),
+ Box(5059, 5059),
+ Box(5060, 5060),
+ Box(5061, 5061),
+ Box(5062, 5062),
+ Box(5063, 5063),
+ Box(5064, 5064),
+ Box(5065, 5065),
+ Box(5066, 5066),
+ Box(5067, 5067),
+ Box(5068, 5068),
+ Box(5069, 5069),
+ Box(5070, 5070),
+ Box(5071, 5071),
+ Box(5072, 5072),
+ Box(5073, 5073),
+ Box(5074, 5074),
+ Box(5075, 5075),
+ Box(5076, 5076),
+ Box(5077, 5077),
+ Box(5078, 5078),
+ Box(5079, 5079),
+ Box(5080, 5080),
+ Box(5081, 5081),
+ Box(5082, 5082),
+ Box(5083, 5083),
+ Box(5084, 5084),
+ Box(5085, 5085),
+ Box(5086, 5086),
+ Box(5087, 5087),
+ Box(5088, 5088),
+ Box(5089, 5089),
+ Box(5090, 5090),
+ Box(5091, 5091),
+ Box(5092, 5092),
+ Box(5093, 5093),
+ Box(5094, 5094),
+ Box(5095, 5095),
+ Box(5096, 5096),
+ Box(5097, 5097),
+ Box(5098, 5098),
+ Box(5099, 5099),
+ Box(5100, 5100),
+ Box(5101, 5101),
+ Box(5102, 5102),
+ Box(5103, 5103),
+ Box(5104, 5104),
+ Box(5105, 5105),
+ Box(5106, 5106),
+ Box(5107, 5107),
+ Box(5108, 5108),
+ Box(5109, 5109),
+ Box(5110, 5110),
+ Box(5111, 5111),
+ Box(5112, 5112),
+ Box(5113, 5113),
+ Box(5114, 5114),
+ Box(5115, 5115),
+ Box(5116, 5116),
+ Box(5117, 5117),
+ Box(5118, 5118),
+ Box(5119, 5119),
+ Box(5120, 5120),
+ Box(5121, 5121),
+ Box(5122, 5122),
+ Box(5123, 5123),
+ Box(5124, 5124),
+ Box(5125, 5125),
+ Box(5126, 5126),
+ Box(5127, 5127),
+ Box(5128, 5128),
+ Box(5129, 5129),
+ Box(5130, 5130),
+ Box(5131, 5131),
+ Box(5132, 5132),
+ Box(5133, 5133),
+ Box(5134, 5134),
+ Box(5135, 5135),
+ Box(5136, 5136),
+ Box(5137, 5137),
+ Box(5138, 5138),
+ Box(5139, 5139),
+ Box(5140, 5140),
+ Box(5141, 5141),
+ Box(5142, 5142),
+ Box(5143, 5143),
+ Box(5144, 5144),
+ Box(5145, 5145),
+ Box(5146, 5146),
+ Box(5147, 5147),
+ Box(5148, 5148),
+ Box(5149, 5149),
+ Box(5150, 5150),
+ Box(5151, 5151),
+ Box(5152, 5152),
+ Box(5153, 5153),
+ Box(5154, 5154),
+ Box(5155, 5155),
+ Box(5156, 5156),
+ Box(5157, 5157),
+ Box(5158, 5158),
+ Box(5159, 5159),
+ Box(5160, 5160),
+ Box(5161, 5161),
+ Box(5162, 5162),
+ Box(5163, 5163),
+ Box(5164, 5164),
+ Box(5165, 5165),
+ Box(5166, 5166),
+ Box(5167, 5167),
+ Box(5168, 5168),
+ Box(5169, 5169),
+ Box(5170, 5170),
+ Box(5171, 5171),
+ Box(5172, 5172),
+ Box(5173, 5173),
+ Box(5174, 5174),
+ Box(5175, 5175),
+ Box(5176, 5176),
+ Box(5177, 5177),
+ Box(5178, 5178),
+ Box(5179, 5179),
+ Box(5180, 5180),
+ Box(5181, 5181),
+ Box(5182, 5182),
+ Box(5183, 5183),
+ Box(5184, 5184),
+ Box(5185, 5185),
+ Box(5186, 5186),
+ Box(5187, 5187),
+ Box(5188, 5188),
+ Box(5189, 5189),
+ Box(5190, 5190),
+ Box(5191, 5191),
+ Box(5192, 5192),
+ Box(5193, 5193),
+ Box(5194, 5194),
+ Box(5195, 5195),
+ Box(5196, 5196),
+ Box(5197, 5197),
+ Box(5198, 5198),
+ Box(5199, 5199),
+ Box(5200, 5200),
+ Box(5201, 5201),
+ Box(5202, 5202),
+ Box(5203, 5203),
+ Box(5204, 5204),
+ Box(5205, 5205),
+ Box(5206, 5206),
+ Box(5207, 5207),
+ Box(5208, 5208),
+ Box(5209, 5209),
+ Box(5210, 5210),
+ Box(5211, 5211),
+ Box(5212, 5212),
+ Box(5213, 5213),
+ Box(5214, 5214),
+ Box(5215, 5215),
+ Box(5216, 5216),
+ Box(5217, 5217),
+ Box(5218, 5218),
+ Box(5219, 5219),
+ Box(5220, 5220),
+ Box(5221, 5221),
+ Box(5222, 5222),
+ Box(5223, 5223),
+ Box(5224, 5224),
+ Box(5225, 5225),
+ Box(5226, 5226),
+ Box(5227, 5227),
+ Box(5228, 5228),
+ Box(5229, 5229),
+ Box(5230, 5230),
+ Box(5231, 5231),
+ Box(5232, 5232),
+ Box(5233, 5233),
+ Box(5234, 5234),
+ Box(5235, 5235),
+ Box(5236, 5236),
+ Box(5237, 5237),
+ Box(5238, 5238),
+ Box(5239, 5239),
+ Box(5240, 5240),
+ Box(5241, 5241),
+ Box(5242, 5242),
+ Box(5243, 5243),
+ Box(5244, 5244),
+ Box(5245, 5245),
+ Box(5246, 5246),
+ Box(5247, 5247),
+ Box(5248, 5248),
+ Box(5249, 5249),
+ Box(5250, 5250),
+ Box(5251, 5251),
+ Box(5252, 5252),
+ Box(5253, 5253),
+ Box(5254, 5254),
+ Box(5255, 5255),
+ Box(5256, 5256),
+ Box(5257, 5257),
+ Box(5258, 5258),
+ Box(5259, 5259),
+ Box(5260, 5260),
+ Box(5261, 5261),
+ Box(5262, 5262),
+ Box(5263, 5263),
+ Box(5264, 5264),
+ Box(5265, 5265),
+ Box(5266, 5266),
+ Box(5267, 5267),
+ Box(5268, 5268),
+ Box(5269, 5269),
+ Box(5270, 5270),
+ Box(5271, 5271),
+ Box(5272, 5272),
+ Box(5273, 5273),
+ Box(5274, 5274),
+ Box(5275, 5275),
+ Box(5276, 5276),
+ Box(5277, 5277),
+ Box(5278, 5278),
+ Box(5279, 5279),
+ Box(5280, 5280),
+ Box(5281, 5281),
+ Box(5282, 5282),
+ Box(5283, 5283),
+ Box(5284, 5284),
+ Box(5285, 5285),
+ Box(5286, 5286),
+ Box(5287, 5287),
+ Box(5288, 5288),
+ Box(5289, 5289),
+ Box(5290, 5290),
+ Box(5291, 5291),
+ Box(5292, 5292),
+ Box(5293, 5293),
+ Box(5294, 5294),
+ Box(5295, 5295),
+ Box(5296, 5296),
+ Box(5297, 5297),
+ Box(5298, 5298),
+ Box(5299, 5299),
+ Box(5300, 5300),
+ Box(5301, 5301),
+ Box(5302, 5302),
+ Box(5303, 5303),
+ Box(5304, 5304),
+ Box(5305, 5305),
+ Box(5306, 5306),
+ Box(5307, 5307),
+ Box(5308, 5308),
+ Box(5309, 5309),
+ Box(5310, 5310),
+ Box(5311, 5311),
+ Box(5312, 5312),
+ Box(5313, 5313),
+ Box(5314, 5314),
+ Box(5315, 5315),
+ Box(5316, 5316),
+ Box(5317, 5317),
+ Box(5318, 5318),
+ Box(5319, 5319),
+ Box(5320, 5320),
+ Box(5321, 5321),
+ Box(5322, 5322),
+ Box(5323, 5323),
+ Box(5324, 5324),
+ Box(5325, 5325),
+ Box(5326, 5326),
+ Box(5327, 5327),
+ Box(5328, 5328),
+ Box(5329, 5329),
+ Box(5330, 5330),
+ Box(5331, 5331),
+ Box(5332, 5332),
+ Box(5333, 5333),
+ Box(5334, 5334),
+ Box(5335, 5335),
+ Box(5336, 5336),
+ Box(5337, 5337),
+ Box(5338, 5338),
+ Box(5339, 5339),
+ Box(5340, 5340),
+ Box(5341, 5341),
+ Box(5342, 5342),
+ Box(5343, 5343),
+ Box(5344, 5344),
+ Box(5345, 5345),
+ Box(5346, 5346),
+ Box(5347, 5347),
+ Box(5348, 5348),
+ Box(5349, 5349),
+ Box(5350, 5350),
+ Box(5351, 5351),
+ Box(5352, 5352),
+ Box(5353, 5353),
+ Box(5354, 5354),
+ Box(5355, 5355),
+ Box(5356, 5356),
+ Box(5357, 5357),
+ Box(5358, 5358),
+ Box(5359, 5359),
+ Box(5360, 5360),
+ Box(5361, 5361),
+ Box(5362, 5362),
+ Box(5363, 5363),
+ Box(5364, 5364),
+ Box(5365, 5365),
+ Box(5366, 5366),
+ Box(5367, 5367),
+ Box(5368, 5368),
+ Box(5369, 5369),
+ Box(5370, 5370),
+ Box(5371, 5371),
+ Box(5372, 5372),
+ Box(5373, 5373),
+ Box(5374, 5374),
+ Box(5375, 5375),
+ Box(5376, 5376),
+ Box(5377, 5377),
+ Box(5378, 5378),
+ Box(5379, 5379),
+ Box(5380, 5380),
+ Box(5381, 5381),
+ Box(5382, 5382),
+ Box(5383, 5383),
+ Box(5384, 5384),
+ Box(5385, 5385),
+ Box(5386, 5386),
+ Box(5387, 5387),
+ Box(5388, 5388),
+ Box(5389, 5389),
+ Box(5390, 5390),
+ Box(5391, 5391),
+ Box(5392, 5392),
+ Box(5393, 5393),
+ Box(5394, 5394),
+ Box(5395, 5395),
+ Box(5396, 5396),
+ Box(5397, 5397),
+ Box(5398, 5398),
+ Box(5399, 5399),
+ Box(5400, 5400),
+ Box(5401, 5401),
+ Box(5402, 5402),
+ Box(5403, 5403),
+ Box(5404, 5404),
+ Box(5405, 5405),
+ Box(5406, 5406),
+ Box(5407, 5407),
+ Box(5408, 5408),
+ Box(5409, 5409),
+ Box(5410, 5410),
+ Box(5411, 5411),
+ Box(5412, 5412),
+ Box(5413, 5413),
+ Box(5414, 5414),
+ Box(5415, 5415),
+ Box(5416, 5416),
+ Box(5417, 5417),
+ Box(5418, 5418),
+ Box(5419, 5419),
+ Box(5420, 5420),
+ Box(5421, 5421),
+ Box(5422, 5422),
+ Box(5423, 5423),
+ Box(5424, 5424),
+ Box(5425, 5425),
+ Box(5426, 5426),
+ Box(5427, 5427),
+ Box(5428, 5428),
+ Box(5429, 5429),
+ Box(5430, 5430),
+ Box(5431, 5431),
+ Box(5432, 5432),
+ Box(5433, 5433),
+ Box(5434, 5434),
+ Box(5435, 5435),
+ Box(5436, 5436),
+ Box(5437, 5437),
+ Box(5438, 5438),
+ Box(5439, 5439),
+ Box(5440, 5440),
+ Box(5441, 5441),
+ Box(5442, 5442),
+ Box(5443, 5443),
+ Box(5444, 5444),
+ Box(5445, 5445),
+ Box(5446, 5446),
+ Box(5447, 5447),
+ Box(5448, 5448),
+ Box(5449, 5449),
+ Box(5450, 5450),
+ Box(5451, 5451),
+ Box(5452, 5452),
+ Box(5453, 5453),
+ Box(5454, 5454),
+ Box(5455, 5455),
+ Box(5456, 5456),
+ Box(5457, 5457),
+ Box(5458, 5458),
+ Box(5459, 5459),
+ Box(5460, 5460),
+ Box(5461, 5461),
+ Box(5462, 5462),
+ Box(5463, 5463),
+ Box(5464, 5464),
+ Box(5465, 5465),
+ Box(5466, 5466),
+ Box(5467, 5467),
+ Box(5468, 5468),
+ Box(5469, 5469),
+ Box(5470, 5470),
+ Box(5471, 5471),
+ Box(5472, 5472),
+ Box(5473, 5473),
+ Box(5474, 5474),
+ Box(5475, 5475),
+ Box(5476, 5476),
+ Box(5477, 5477),
+ Box(5478, 5478),
+ Box(5479, 5479),
+ Box(5480, 5480),
+ Box(5481, 5481),
+ Box(5482, 5482),
+ Box(5483, 5483),
+ Box(5484, 5484),
+ Box(5485, 5485),
+ Box(5486, 5486),
+ Box(5487, 5487),
+ Box(5488, 5488),
+ Box(5489, 5489),
+ Box(5490, 5490),
+ Box(5491, 5491),
+ Box(5492, 5492),
+ Box(5493, 5493),
+ Box(5494, 5494),
+ Box(5495, 5495),
+ Box(5496, 5496),
+ Box(5497, 5497),
+ Box(5498, 5498),
+ Box(5499, 5499),
+ Box(5500, 5500),
+ Box(5501, 5501),
+ Box(5502, 5502),
+ Box(5503, 5503),
+ Box(5504, 5504),
+ Box(5505, 5505),
+ Box(5506, 5506),
+ Box(5507, 5507),
+ Box(5508, 5508),
+ Box(5509, 5509),
+ Box(5510, 5510),
+ Box(5511, 5511),
+ Box(5512, 5512),
+ Box(5513, 5513),
+ Box(5514, 5514),
+ Box(5515, 5515),
+ Box(5516, 5516),
+ Box(5517, 5517),
+ Box(5518, 5518),
+ Box(5519, 5519),
+ Box(5520, 5520),
+ Box(5521, 5521),
+ Box(5522, 5522),
+ Box(5523, 5523),
+ Box(5524, 5524),
+ Box(5525, 5525),
+ Box(5526, 5526),
+ Box(5527, 5527),
+ Box(5528, 5528),
+ Box(5529, 5529),
+ Box(5530, 5530),
+ Box(5531, 5531),
+ Box(5532, 5532),
+ Box(5533, 5533),
+ Box(5534, 5534),
+ Box(5535, 5535),
+ Box(5536, 5536),
+ Box(5537, 5537),
+ Box(5538, 5538),
+ Box(5539, 5539),
+ Box(5540, 5540),
+ Box(5541, 5541),
+ Box(5542, 5542),
+ Box(5543, 5543),
+ Box(5544, 5544),
+ Box(5545, 5545),
+ Box(5546, 5546),
+ Box(5547, 5547),
+ Box(5548, 5548),
+ Box(5549, 5549),
+ Box(5550, 5550),
+ Box(5551, 5551),
+ Box(5552, 5552),
+ Box(5553, 5553),
+ Box(5554, 5554),
+ Box(5555, 5555),
+ Box(5556, 5556),
+ Box(5557, 5557),
+ Box(5558, 5558),
+ Box(5559, 5559),
+ Box(5560, 5560),
+ Box(5561, 5561),
+ Box(5562, 5562),
+ Box(5563, 5563),
+ Box(5564, 5564),
+ Box(5565, 5565),
+ Box(5566, 5566),
+ Box(5567, 5567),
+ Box(5568, 5568),
+ Box(5569, 5569),
+ Box(5570, 5570),
+ Box(5571, 5571),
+ Box(5572, 5572),
+ Box(5573, 5573),
+ Box(5574, 5574),
+ Box(5575, 5575),
+ Box(5576, 5576),
+ Box(5577, 5577),
+ Box(5578, 5578),
+ Box(5579, 5579),
+ Box(5580, 5580),
+ Box(5581, 5581),
+ Box(5582, 5582),
+ Box(5583, 5583),
+ Box(5584, 5584),
+ Box(5585, 5585),
+ Box(5586, 5586),
+ Box(5587, 5587),
+ Box(5588, 5588),
+ Box(5589, 5589),
+ Box(5590, 5590),
+ Box(5591, 5591),
+ Box(5592, 5592),
+ Box(5593, 5593),
+ Box(5594, 5594),
+ Box(5595, 5595),
+ Box(5596, 5596),
+ Box(5597, 5597),
+ Box(5598, 5598),
+ Box(5599, 5599),
+ Box(5600, 5600),
+ Box(5601, 5601),
+ Box(5602, 5602),
+ Box(5603, 5603),
+ Box(5604, 5604),
+ Box(5605, 5605),
+ Box(5606, 5606),
+ Box(5607, 5607),
+ Box(5608, 5608),
+ Box(5609, 5609),
+ Box(5610, 5610),
+ Box(5611, 5611),
+ Box(5612, 5612),
+ Box(5613, 5613),
+ Box(5614, 5614),
+ Box(5615, 5615),
+ Box(5616, 5616),
+ Box(5617, 5617),
+ Box(5618, 5618),
+ Box(5619, 5619),
+ Box(5620, 5620),
+ Box(5621, 5621),
+ Box(5622, 5622),
+ Box(5623, 5623),
+ Box(5624, 5624),
+ Box(5625, 5625),
+ Box(5626, 5626),
+ Box(5627, 5627),
+ Box(5628, 5628),
+ Box(5629, 5629),
+ Box(5630, 5630),
+ Box(5631, 5631),
+ Box(5632, 5632),
+ Box(5633, 5633),
+ Box(5634, 5634),
+ Box(5635, 5635),
+ Box(5636, 5636),
+ Box(5637, 5637),
+ Box(5638, 5638),
+ Box(5639, 5639),
+ Box(5640, 5640),
+ Box(5641, 5641),
+ Box(5642, 5642),
+ Box(5643, 5643),
+ Box(5644, 5644),
+ Box(5645, 5645),
+ Box(5646, 5646),
+ Box(5647, 5647),
+ Box(5648, 5648),
+ Box(5649, 5649),
+ Box(5650, 5650),
+ Box(5651, 5651),
+ Box(5652, 5652),
+ Box(5653, 5653),
+ Box(5654, 5654),
+ Box(5655, 5655),
+ Box(5656, 5656),
+ Box(5657, 5657),
+ Box(5658, 5658),
+ Box(5659, 5659),
+ Box(5660, 5660),
+ Box(5661, 5661),
+ Box(5662, 5662),
+ Box(5663, 5663),
+ Box(5664, 5664),
+ Box(5665, 5665),
+ Box(5666, 5666),
+ Box(5667, 5667),
+ Box(5668, 5668),
+ Box(5669, 5669),
+ Box(5670, 5670),
+ Box(5671, 5671),
+ Box(5672, 5672),
+ Box(5673, 5673),
+ Box(5674, 5674),
+ Box(5675, 5675),
+ Box(5676, 5676),
+ Box(5677, 5677),
+ Box(5678, 5678),
+ Box(5679, 5679),
+ Box(5680, 5680),
+ Box(5681, 5681),
+ Box(5682, 5682),
+ Box(5683, 5683),
+ Box(5684, 5684),
+ Box(5685, 5685),
+ Box(5686, 5686),
+ Box(5687, 5687),
+ Box(5688, 5688),
+ Box(5689, 5689),
+ Box(5690, 5690),
+ Box(5691, 5691),
+ Box(5692, 5692),
+ Box(5693, 5693),
+ Box(5694, 5694),
+ Box(5695, 5695),
+ Box(5696, 5696),
+ Box(5697, 5697),
+ Box(5698, 5698),
+ Box(5699, 5699),
+ Box(5700, 5700),
+ Box(5701, 5701),
+ Box(5702, 5702),
+ Box(5703, 5703),
+ Box(5704, 5704),
+ Box(5705, 5705),
+ Box(5706, 5706),
+ Box(5707, 5707),
+ Box(5708, 5708),
+ Box(5709, 5709),
+ Box(5710, 5710),
+ Box(5711, 5711),
+ Box(5712, 5712),
+ Box(5713, 5713),
+ Box(5714, 5714),
+ Box(5715, 5715),
+ Box(5716, 5716),
+ Box(5717, 5717),
+ Box(5718, 5718),
+ Box(5719, 5719),
+ Box(5720, 5720),
+ Box(5721, 5721),
+ Box(5722, 5722),
+ Box(5723, 5723),
+ Box(5724, 5724),
+ Box(5725, 5725),
+ Box(5726, 5726),
+ Box(5727, 5727),
+ Box(5728, 5728),
+ Box(5729, 5729),
+ Box(5730, 5730),
+ Box(5731, 5731),
+ Box(5732, 5732),
+ Box(5733, 5733),
+ Box(5734, 5734),
+ Box(5735, 5735),
+ Box(5736, 5736),
+ Box(5737, 5737),
+ Box(5738, 5738),
+ Box(5739, 5739),
+ Box(5740, 5740),
+ Box(5741, 5741),
+ Box(5742, 5742),
+ Box(5743, 5743),
+ Box(5744, 5744),
+ Box(5745, 5745),
+ Box(5746, 5746),
+ Box(5747, 5747),
+ Box(5748, 5748),
+ Box(5749, 5749),
+ Box(5750, 5750),
+ Box(5751, 5751),
+ Box(5752, 5752),
+ Box(5753, 5753),
+ Box(5754, 5754),
+ Box(5755, 5755),
+ Box(5756, 5756),
+ Box(5757, 5757),
+ Box(5758, 5758),
+ Box(5759, 5759),
+ Box(5760, 5760),
+ Box(5761, 5761),
+ Box(5762, 5762),
+ Box(5763, 5763),
+ Box(5764, 5764),
+ Box(5765, 5765),
+ Box(5766, 5766),
+ Box(5767, 5767),
+ Box(5768, 5768),
+ Box(5769, 5769),
+ Box(5770, 5770),
+ Box(5771, 5771),
+ Box(5772, 5772),
+ Box(5773, 5773),
+ Box(5774, 5774),
+ Box(5775, 5775),
+ Box(5776, 5776),
+ Box(5777, 5777),
+ Box(5778, 5778),
+ Box(5779, 5779),
+ Box(5780, 5780),
+ Box(5781, 5781),
+ Box(5782, 5782),
+ Box(5783, 5783),
+ Box(5784, 5784),
+ Box(5785, 5785),
+ Box(5786, 5786),
+ Box(5787, 5787),
+ Box(5788, 5788),
+ Box(5789, 5789),
+ Box(5790, 5790),
+ Box(5791, 5791),
+ Box(5792, 5792),
+ Box(5793, 5793),
+ Box(5794, 5794),
+ Box(5795, 5795),
+ Box(5796, 5796),
+ Box(5797, 5797),
+ Box(5798, 5798),
+ Box(5799, 5799),
+ Box(5800, 5800),
+ Box(5801, 5801),
+ Box(5802, 5802),
+ Box(5803, 5803),
+ Box(5804, 5804),
+ Box(5805, 5805),
+ Box(5806, 5806),
+ Box(5807, 5807),
+ Box(5808, 5808),
+ Box(5809, 5809),
+ Box(5810, 5810),
+ Box(5811, 5811),
+ Box(5812, 5812),
+ Box(5813, 5813),
+ Box(5814, 5814),
+ Box(5815, 5815),
+ Box(5816, 5816),
+ Box(5817, 5817),
+ Box(5818, 5818),
+ Box(5819, 5819),
+ Box(5820, 5820),
+ Box(5821, 5821),
+ Box(5822, 5822),
+ Box(5823, 5823),
+ Box(5824, 5824),
+ Box(5825, 5825),
+ Box(5826, 5826),
+ Box(5827, 5827),
+ Box(5828, 5828),
+ Box(5829, 5829),
+ Box(5830, 5830),
+ Box(5831, 5831),
+ Box(5832, 5832),
+ Box(5833, 5833),
+ Box(5834, 5834),
+ Box(5835, 5835),
+ Box(5836, 5836),
+ Box(5837, 5837),
+ Box(5838, 5838),
+ Box(5839, 5839),
+ Box(5840, 5840),
+ Box(5841, 5841),
+ Box(5842, 5842),
+ Box(5843, 5843),
+ Box(5844, 5844),
+ Box(5845, 5845),
+ Box(5846, 5846),
+ Box(5847, 5847),
+ Box(5848, 5848),
+ Box(5849, 5849),
+ Box(5850, 5850),
+ Box(5851, 5851),
+ Box(5852, 5852),
+ Box(5853, 5853),
+ Box(5854, 5854),
+ Box(5855, 5855),
+ Box(5856, 5856),
+ Box(5857, 5857),
+ Box(5858, 5858),
+ Box(5859, 5859),
+ Box(5860, 5860),
+ Box(5861, 5861),
+ Box(5862, 5862),
+ Box(5863, 5863),
+ Box(5864, 5864),
+ Box(5865, 5865),
+ Box(5866, 5866),
+ Box(5867, 5867),
+ Box(5868, 5868),
+ Box(5869, 5869),
+ Box(5870, 5870),
+ Box(5871, 5871),
+ Box(5872, 5872),
+ Box(5873, 5873),
+ Box(5874, 5874),
+ Box(5875, 5875),
+ Box(5876, 5876),
+ Box(5877, 5877),
+ Box(5878, 5878),
+ Box(5879, 5879),
+ Box(5880, 5880),
+ Box(5881, 5881),
+ Box(5882, 5882),
+ Box(5883, 5883),
+ Box(5884, 5884),
+ Box(5885, 5885),
+ Box(5886, 5886),
+ Box(5887, 5887),
+ Box(5888, 5888),
+ Box(5889, 5889),
+ Box(5890, 5890),
+ Box(5891, 5891),
+ Box(5892, 5892),
+ Box(5893, 5893),
+ Box(5894, 5894),
+ Box(5895, 5895),
+ Box(5896, 5896),
+ Box(5897, 5897),
+ Box(5898, 5898),
+ Box(5899, 5899),
+ Box(5900, 5900),
+ Box(5901, 5901),
+ Box(5902, 5902),
+ Box(5903, 5903),
+ Box(5904, 5904),
+ Box(5905, 5905),
+ Box(5906, 5906),
+ Box(5907, 5907),
+ Box(5908, 5908),
+ Box(5909, 5909),
+ Box(5910, 5910),
+ Box(5911, 5911),
+ Box(5912, 5912),
+ Box(5913, 5913),
+ Box(5914, 5914),
+ Box(5915, 5915),
+ Box(5916, 5916),
+ Box(5917, 5917),
+ Box(5918, 5918),
+ Box(5919, 5919),
+ Box(5920, 5920),
+ Box(5921, 5921),
+ Box(5922, 5922),
+ Box(5923, 5923),
+ Box(5924, 5924),
+ Box(5925, 5925),
+ Box(5926, 5926),
+ Box(5927, 5927),
+ Box(5928, 5928),
+ Box(5929, 5929),
+ Box(5930, 5930),
+ Box(5931, 5931),
+ Box(5932, 5932),
+ Box(5933, 5933),
+ Box(5934, 5934),
+ Box(5935, 5935),
+ Box(5936, 5936),
+ Box(5937, 5937),
+ Box(5938, 5938),
+ Box(5939, 5939),
+ Box(5940, 5940),
+ Box(5941, 5941),
+ Box(5942, 5942),
+ Box(5943, 5943),
+ Box(5944, 5944),
+ Box(5945, 5945),
+ Box(5946, 5946),
+ Box(5947, 5947),
+ Box(5948, 5948),
+ Box(5949, 5949),
+ Box(5950, 5950),
+ Box(5951, 5951),
+ Box(5952, 5952),
+ Box(5953, 5953),
+ Box(5954, 5954),
+ Box(5955, 5955),
+ Box(5956, 5956),
+ Box(5957, 5957),
+ Box(5958, 5958),
+ Box(5959, 5959),
+ Box(5960, 5960),
+ Box(5961, 5961),
+ Box(5962, 5962),
+ Box(5963, 5963),
+ Box(5964, 5964),
+ Box(5965, 5965),
+ Box(5966, 5966),
+ Box(5967, 5967),
+ Box(5968, 5968),
+ Box(5969, 5969),
+ Box(5970, 5970),
+ Box(5971, 5971),
+ Box(5972, 5972),
+ Box(5973, 5973),
+ Box(5974, 5974),
+ Box(5975, 5975),
+ Box(5976, 5976),
+ Box(5977, 5977),
+ Box(5978, 5978),
+ Box(5979, 5979),
+ Box(5980, 5980),
+ Box(5981, 5981),
+ Box(5982, 5982),
+ Box(5983, 5983),
+ Box(5984, 5984),
+ Box(5985, 5985),
+ Box(5986, 5986),
+ Box(5987, 5987),
+ Box(5988, 5988),
+ Box(5989, 5989),
+ Box(5990, 5990),
+ Box(5991, 5991),
+ Box(5992, 5992),
+ Box(5993, 5993),
+ Box(5994, 5994),
+ Box(5995, 5995),
+ Box(5996, 5996),
+ Box(5997, 5997),
+ Box(5998, 5998),
+ Box(5999, 5999),
+ Box(6000, 6000),
+ Box(6001, 6001),
+ Box(6002, 6002),
+ Box(6003, 6003),
+ Box(6004, 6004),
+ Box(6005, 6005),
+ Box(6006, 6006),
+ Box(6007, 6007),
+ Box(6008, 6008),
+ Box(6009, 6009),
+ Box(6010, 6010),
+ Box(6011, 6011),
+ Box(6012, 6012),
+ Box(6013, 6013),
+ Box(6014, 6014),
+ Box(6015, 6015),
+ Box(6016, 6016),
+ Box(6017, 6017),
+ Box(6018, 6018),
+ Box(6019, 6019),
+ Box(6020, 6020),
+ Box(6021, 6021),
+ Box(6022, 6022),
+ Box(6023, 6023),
+ Box(6024, 6024),
+ Box(6025, 6025),
+ Box(6026, 6026),
+ Box(6027, 6027),
+ Box(6028, 6028),
+ Box(6029, 6029),
+ Box(6030, 6030),
+ Box(6031, 6031),
+ Box(6032, 6032),
+ Box(6033, 6033),
+ Box(6034, 6034),
+ Box(6035, 6035),
+ Box(6036, 6036),
+ Box(6037, 6037),
+ Box(6038, 6038),
+ Box(6039, 6039),
+ Box(6040, 6040),
+ Box(6041, 6041),
+ Box(6042, 6042),
+ Box(6043, 6043),
+ Box(6044, 6044),
+ Box(6045, 6045),
+ Box(6046, 6046),
+ Box(6047, 6047),
+ Box(6048, 6048),
+ Box(6049, 6049),
+ Box(6050, 6050),
+ Box(6051, 6051),
+ Box(6052, 6052),
+ Box(6053, 6053),
+ Box(6054, 6054),
+ Box(6055, 6055),
+ Box(6056, 6056),
+ Box(6057, 6057),
+ Box(6058, 6058),
+ Box(6059, 6059),
+ Box(6060, 6060),
+ Box(6061, 6061),
+ Box(6062, 6062),
+ Box(6063, 6063),
+ Box(6064, 6064),
+ Box(6065, 6065),
+ Box(6066, 6066),
+ Box(6067, 6067),
+ Box(6068, 6068),
+ Box(6069, 6069),
+ Box(6070, 6070),
+ Box(6071, 6071),
+ Box(6072, 6072),
+ Box(6073, 6073),
+ Box(6074, 6074),
+ Box(6075, 6075),
+ Box(6076, 6076),
+ Box(6077, 6077),
+ Box(6078, 6078),
+ Box(6079, 6079),
+ Box(6080, 6080),
+ Box(6081, 6081),
+ Box(6082, 6082),
+ Box(6083, 6083),
+ Box(6084, 6084),
+ Box(6085, 6085),
+ Box(6086, 6086),
+ Box(6087, 6087),
+ Box(6088, 6088),
+ Box(6089, 6089),
+ Box(6090, 6090),
+ Box(6091, 6091),
+ Box(6092, 6092),
+ Box(6093, 6093),
+ Box(6094, 6094),
+ Box(6095, 6095),
+ Box(6096, 6096),
+ Box(6097, 6097),
+ Box(6098, 6098),
+ Box(6099, 6099),
+ Box(6100, 6100),
+ Box(6101, 6101),
+ Box(6102, 6102),
+ Box(6103, 6103),
+ Box(6104, 6104),
+ Box(6105, 6105),
+ Box(6106, 6106),
+ Box(6107, 6107),
+ Box(6108, 6108),
+ Box(6109, 6109),
+ Box(6110, 6110),
+ Box(6111, 6111),
+ Box(6112, 6112),
+ Box(6113, 6113),
+ Box(6114, 6114),
+ Box(6115, 6115),
+ Box(6116, 6116),
+ Box(6117, 6117),
+ Box(6118, 6118),
+ Box(6119, 6119),
+ Box(6120, 6120),
+ Box(6121, 6121),
+ Box(6122, 6122),
+ Box(6123, 6123),
+ Box(6124, 6124),
+ Box(6125, 6125),
+ Box(6126, 6126),
+ Box(6127, 6127),
+ Box(6128, 6128),
+ Box(6129, 6129),
+ Box(6130, 6130),
+ Box(6131, 6131),
+ Box(6132, 6132),
+ Box(6133, 6133),
+ Box(6134, 6134),
+ Box(6135, 6135),
+ Box(6136, 6136),
+ Box(6137, 6137),
+ Box(6138, 6138),
+ Box(6139, 6139),
+ Box(6140, 6140),
+ Box(6141, 6141),
+ Box(6142, 6142),
+ Box(6143, 6143),
+ Box(6144, 6144),
+ Box(6145, 6145),
+ Box(6146, 6146),
+ Box(6147, 6147),
+ Box(6148, 6148),
+ Box(6149, 6149),
+ Box(6150, 6150),
+ Box(6151, 6151),
+ Box(6152, 6152),
+ Box(6153, 6153),
+ Box(6154, 6154),
+ Box(6155, 6155),
+ Box(6156, 6156),
+ Box(6157, 6157),
+ Box(6158, 6158),
+ Box(6159, 6159),
+ Box(6160, 6160),
+ Box(6161, 6161),
+ Box(6162, 6162),
+ Box(6163, 6163),
+ Box(6164, 6164),
+ Box(6165, 6165),
+ Box(6166, 6166),
+ Box(6167, 6167),
+ Box(6168, 6168),
+ Box(6169, 6169),
+ Box(6170, 6170),
+ Box(6171, 6171),
+ Box(6172, 6172),
+ Box(6173, 6173),
+ Box(6174, 6174),
+ Box(6175, 6175),
+ Box(6176, 6176),
+ Box(6177, 6177),
+ Box(6178, 6178),
+ Box(6179, 6179),
+ Box(6180, 6180),
+ Box(6181, 6181),
+ Box(6182, 6182),
+ Box(6183, 6183),
+ Box(6184, 6184),
+ Box(6185, 6185),
+ Box(6186, 6186),
+ Box(6187, 6187),
+ Box(6188, 6188),
+ Box(6189, 6189),
+ Box(6190, 6190),
+ Box(6191, 6191),
+ Box(6192, 6192),
+ Box(6193, 6193),
+ Box(6194, 6194),
+ Box(6195, 6195),
+ Box(6196, 6196),
+ Box(6197, 6197),
+ Box(6198, 6198),
+ Box(6199, 6199),
+ Box(6200, 6200),
+ Box(6201, 6201),
+ Box(6202, 6202),
+ Box(6203, 6203),
+ Box(6204, 6204),
+ Box(6205, 6205),
+ Box(6206, 6206),
+ Box(6207, 6207),
+ Box(6208, 6208),
+ Box(6209, 6209),
+ Box(6210, 6210),
+ Box(6211, 6211),
+ Box(6212, 6212),
+ Box(6213, 6213),
+ Box(6214, 6214),
+ Box(6215, 6215),
+ Box(6216, 6216),
+ Box(6217, 6217),
+ Box(6218, 6218),
+ Box(6219, 6219),
+ Box(6220, 6220),
+ Box(6221, 6221),
+ Box(6222, 6222),
+ Box(6223, 6223),
+ Box(6224, 6224),
+ Box(6225, 6225),
+ Box(6226, 6226),
+ Box(6227, 6227),
+ Box(6228, 6228),
+ Box(6229, 6229),
+ Box(6230, 6230),
+ Box(6231, 6231),
+ Box(6232, 6232),
+ Box(6233, 6233),
+ Box(6234, 6234),
+ Box(6235, 6235),
+ Box(6236, 6236),
+ Box(6237, 6237),
+ Box(6238, 6238),
+ Box(6239, 6239),
+ Box(6240, 6240),
+ Box(6241, 6241),
+ Box(6242, 6242),
+ Box(6243, 6243),
+ Box(6244, 6244),
+ Box(6245, 6245),
+ Box(6246, 6246),
+ Box(6247, 6247),
+ Box(6248, 6248),
+ Box(6249, 6249),
+ Box(6250, 6250),
+ Box(6251, 6251),
+ Box(6252, 6252),
+ Box(6253, 6253),
+ Box(6254, 6254),
+ Box(6255, 6255),
+ Box(6256, 6256),
+ Box(6257, 6257),
+ Box(6258, 6258),
+ Box(6259, 6259),
+ Box(6260, 6260),
+ Box(6261, 6261),
+ Box(6262, 6262),
+ Box(6263, 6263),
+ Box(6264, 6264),
+ Box(6265, 6265),
+ Box(6266, 6266),
+ Box(6267, 6267),
+ Box(6268, 6268),
+ Box(6269, 6269),
+ Box(6270, 6270),
+ Box(6271, 6271),
+ Box(6272, 6272),
+ Box(6273, 6273),
+ Box(6274, 6274),
+ Box(6275, 6275),
+ Box(6276, 6276),
+ Box(6277, 6277),
+ Box(6278, 6278),
+ Box(6279, 6279),
+ Box(6280, 6280),
+ Box(6281, 6281),
+ Box(6282, 6282),
+ Box(6283, 6283),
+ Box(6284, 6284),
+ Box(6285, 6285),
+ Box(6286, 6286),
+ Box(6287, 6287),
+ Box(6288, 6288),
+ Box(6289, 6289),
+ Box(6290, 6290),
+ Box(6291, 6291),
+ Box(6292, 6292),
+ Box(6293, 6293),
+ Box(6294, 6294),
+ Box(6295, 6295),
+ Box(6296, 6296),
+ Box(6297, 6297),
+ Box(6298, 6298),
+ Box(6299, 6299),
+ Box(6300, 6300),
+ Box(6301, 6301),
+ Box(6302, 6302),
+ Box(6303, 6303),
+ Box(6304, 6304),
+ Box(6305, 6305),
+ Box(6306, 6306),
+ Box(6307, 6307),
+ Box(6308, 6308),
+ Box(6309, 6309),
+ Box(6310, 6310),
+ Box(6311, 6311),
+ Box(6312, 6312),
+ Box(6313, 6313),
+ Box(6314, 6314),
+ Box(6315, 6315),
+ Box(6316, 6316),
+ Box(6317, 6317),
+ Box(6318, 6318),
+ Box(6319, 6319),
+ Box(6320, 6320),
+ Box(6321, 6321),
+ Box(6322, 6322),
+ Box(6323, 6323),
+ Box(6324, 6324),
+ Box(6325, 6325),
+ Box(6326, 6326),
+ Box(6327, 6327),
+ Box(6328, 6328),
+ Box(6329, 6329),
+ Box(6330, 6330),
+ Box(6331, 6331),
+ Box(6332, 6332),
+ Box(6333, 6333),
+ Box(6334, 6334),
+ Box(6335, 6335),
+ Box(6336, 6336),
+ Box(6337, 6337),
+ Box(6338, 6338),
+ Box(6339, 6339),
+ Box(6340, 6340),
+ Box(6341, 6341),
+ Box(6342, 6342),
+ Box(6343, 6343),
+ Box(6344, 6344),
+ Box(6345, 6345),
+ Box(6346, 6346),
+ Box(6347, 6347),
+ Box(6348, 6348),
+ Box(6349, 6349),
+ Box(6350, 6350),
+ Box(6351, 6351),
+ Box(6352, 6352),
+ Box(6353, 6353),
+ Box(6354, 6354),
+ Box(6355, 6355),
+ Box(6356, 6356),
+ Box(6357, 6357),
+ Box(6358, 6358),
+ Box(6359, 6359),
+ Box(6360, 6360),
+ Box(6361, 6361),
+ Box(6362, 6362),
+ Box(6363, 6363),
+ Box(6364, 6364),
+ Box(6365, 6365),
+ Box(6366, 6366),
+ Box(6367, 6367),
+ Box(6368, 6368),
+ Box(6369, 6369),
+ Box(6370, 6370),
+ Box(6371, 6371),
+ Box(6372, 6372),
+ Box(6373, 6373),
+ Box(6374, 6374),
+ Box(6375, 6375),
+ Box(6376, 6376),
+ Box(6377, 6377),
+ Box(6378, 6378),
+ Box(6379, 6379),
+ Box(6380, 6380),
+ Box(6381, 6381),
+ Box(6382, 6382),
+ Box(6383, 6383),
+ Box(6384, 6384),
+ Box(6385, 6385),
+ Box(6386, 6386),
+ Box(6387, 6387),
+ Box(6388, 6388),
+ Box(6389, 6389),
+ Box(6390, 6390),
+ Box(6391, 6391),
+ Box(6392, 6392),
+ Box(6393, 6393),
+ Box(6394, 6394),
+ Box(6395, 6395),
+ Box(6396, 6396),
+ Box(6397, 6397),
+ Box(6398, 6398),
+ Box(6399, 6399),
+ Box(6400, 6400),
+ Box(6401, 6401),
+ Box(6402, 6402),
+ Box(6403, 6403),
+ Box(6404, 6404),
+ Box(6405, 6405),
+ Box(6406, 6406),
+ Box(6407, 6407),
+ Box(6408, 6408),
+ Box(6409, 6409),
+ Box(6410, 6410),
+ Box(6411, 6411),
+ Box(6412, 6412),
+ Box(6413, 6413),
+ Box(6414, 6414),
+ Box(6415, 6415),
+ Box(6416, 6416),
+ Box(6417, 6417),
+ Box(6418, 6418),
+ Box(6419, 6419),
+ Box(6420, 6420),
+ Box(6421, 6421),
+ Box(6422, 6422),
+ Box(6423, 6423),
+ Box(6424, 6424),
+ Box(6425, 6425),
+ Box(6426, 6426),
+ Box(6427, 6427),
+ Box(6428, 6428),
+ Box(6429, 6429),
+ Box(6430, 6430),
+ Box(6431, 6431),
+ Box(6432, 6432),
+ Box(6433, 6433),
+ Box(6434, 6434),
+ Box(6435, 6435),
+ Box(6436, 6436),
+ Box(6437, 6437),
+ Box(6438, 6438),
+ Box(6439, 6439),
+ Box(6440, 6440),
+ Box(6441, 6441),
+ Box(6442, 6442),
+ Box(6443, 6443),
+ Box(6444, 6444),
+ Box(6445, 6445),
+ Box(6446, 6446),
+ Box(6447, 6447),
+ Box(6448, 6448),
+ Box(6449, 6449),
+ Box(6450, 6450),
+ Box(6451, 6451),
+ Box(6452, 6452),
+ Box(6453, 6453),
+ Box(6454, 6454),
+ Box(6455, 6455),
+ Box(6456, 6456),
+ Box(6457, 6457),
+ Box(6458, 6458),
+ Box(6459, 6459),
+ Box(6460, 6460),
+ Box(6461, 6461),
+ Box(6462, 6462),
+ Box(6463, 6463),
+ Box(6464, 6464),
+ Box(6465, 6465),
+ Box(6466, 6466),
+ Box(6467, 6467),
+ Box(6468, 6468),
+ Box(6469, 6469),
+ Box(6470, 6470),
+ Box(6471, 6471),
+ Box(6472, 6472),
+ Box(6473, 6473),
+ Box(6474, 6474),
+ Box(6475, 6475),
+ Box(6476, 6476),
+ Box(6477, 6477),
+ Box(6478, 6478),
+ Box(6479, 6479),
+ Box(6480, 6480),
+ Box(6481, 6481),
+ Box(6482, 6482),
+ Box(6483, 6483),
+ Box(6484, 6484),
+ Box(6485, 6485),
+ Box(6486, 6486),
+ Box(6487, 6487),
+ Box(6488, 6488),
+ Box(6489, 6489),
+ Box(6490, 6490),
+ Box(6491, 6491),
+ Box(6492, 6492),
+ Box(6493, 6493),
+ Box(6494, 6494),
+ Box(6495, 6495),
+ Box(6496, 6496),
+ Box(6497, 6497),
+ Box(6498, 6498),
+ Box(6499, 6499),
+ Box(6500, 6500),
+ Box(6501, 6501),
+ Box(6502, 6502),
+ Box(6503, 6503),
+ Box(6504, 6504),
+ Box(6505, 6505),
+ Box(6506, 6506),
+ Box(6507, 6507),
+ Box(6508, 6508),
+ Box(6509, 6509),
+ Box(6510, 6510),
+ Box(6511, 6511),
+ Box(6512, 6512),
+ Box(6513, 6513),
+ Box(6514, 6514),
+ Box(6515, 6515),
+ Box(6516, 6516),
+ Box(6517, 6517),
+ Box(6518, 6518),
+ Box(6519, 6519),
+ Box(6520, 6520),
+ Box(6521, 6521),
+ Box(6522, 6522),
+ Box(6523, 6523),
+ Box(6524, 6524),
+ Box(6525, 6525),
+ Box(6526, 6526),
+ Box(6527, 6527),
+ Box(6528, 6528),
+ Box(6529, 6529),
+ Box(6530, 6530),
+ Box(6531, 6531),
+ Box(6532, 6532),
+ Box(6533, 6533),
+ Box(6534, 6534),
+ Box(6535, 6535),
+ Box(6536, 6536),
+ Box(6537, 6537),
+ Box(6538, 6538),
+ Box(6539, 6539),
+ Box(6540, 6540),
+ Box(6541, 6541),
+ Box(6542, 6542),
+ Box(6543, 6543),
+ Box(6544, 6544),
+ Box(6545, 6545),
+ Box(6546, 6546),
+ Box(6547, 6547),
+ Box(6548, 6548),
+ Box(6549, 6549),
+ Box(6550, 6550),
+ Box(6551, 6551),
+ Box(6552, 6552),
+ Box(6553, 6553),
+ Box(6554, 6554),
+ Box(6555, 6555),
+ Box(6556, 6556),
+ Box(6557, 6557),
+ Box(6558, 6558),
+ Box(6559, 6559),
+ Box(6560, 6560),
+ Box(6561, 6561),
+ Box(6562, 6562),
+ Box(6563, 6563),
+ Box(6564, 6564),
+ Box(6565, 6565),
+ Box(6566, 6566),
+ Box(6567, 6567),
+ Box(6568, 6568),
+ Box(6569, 6569),
+ Box(6570, 6570),
+ Box(6571, 6571),
+ Box(6572, 6572),
+ Box(6573, 6573),
+ Box(6574, 6574),
+ Box(6575, 6575),
+ Box(6576, 6576),
+ Box(6577, 6577),
+ Box(6578, 6578),
+ Box(6579, 6579),
+ Box(6580, 6580),
+ Box(6581, 6581),
+ Box(6582, 6582),
+ Box(6583, 6583),
+ Box(6584, 6584),
+ Box(6585, 6585),
+ Box(6586, 6586),
+ Box(6587, 6587),
+ Box(6588, 6588),
+ Box(6589, 6589),
+ Box(6590, 6590),
+ Box(6591, 6591),
+ Box(6592, 6592),
+ Box(6593, 6593),
+ Box(6594, 6594),
+ Box(6595, 6595),
+ Box(6596, 6596),
+ Box(6597, 6597),
+ Box(6598, 6598),
+ Box(6599, 6599),
+ Box(6600, 6600),
+ Box(6601, 6601),
+ Box(6602, 6602),
+ Box(6603, 6603),
+ Box(6604, 6604),
+ Box(6605, 6605),
+ Box(6606, 6606),
+ Box(6607, 6607),
+ Box(6608, 6608),
+ Box(6609, 6609),
+ Box(6610, 6610),
+ Box(6611, 6611),
+ Box(6612, 6612),
+ Box(6613, 6613),
+ Box(6614, 6614),
+ Box(6615, 6615),
+ Box(6616, 6616),
+ Box(6617, 6617),
+ Box(6618, 6618),
+ Box(6619, 6619),
+ Box(6620, 6620),
+ Box(6621, 6621),
+ Box(6622, 6622),
+ Box(6623, 6623),
+ Box(6624, 6624),
+ Box(6625, 6625),
+ Box(6626, 6626),
+ Box(6627, 6627),
+ Box(6628, 6628),
+ Box(6629, 6629),
+ Box(6630, 6630),
+ Box(6631, 6631),
+ Box(6632, 6632),
+ Box(6633, 6633),
+ Box(6634, 6634),
+ Box(6635, 6635),
+ Box(6636, 6636),
+ Box(6637, 6637),
+ Box(6638, 6638),
+ Box(6639, 6639),
+ Box(6640, 6640),
+ Box(6641, 6641),
+ Box(6642, 6642),
+ Box(6643, 6643),
+ Box(6644, 6644),
+ Box(6645, 6645),
+ Box(6646, 6646),
+ Box(6647, 6647),
+ Box(6648, 6648),
+ Box(6649, 6649),
+ Box(6650, 6650),
+ Box(6651, 6651),
+ Box(6652, 6652),
+ Box(6653, 6653),
+ Box(6654, 6654),
+ Box(6655, 6655),
+ Box(6656, 6656),
+ Box(6657, 6657),
+ Box(6658, 6658),
+ Box(6659, 6659),
+ Box(6660, 6660),
+ Box(6661, 6661),
+ Box(6662, 6662),
+ Box(6663, 6663),
+ Box(6664, 6664),
+ Box(6665, 6665),
+ Box(6666, 6666),
+ Box(6667, 6667),
+ Box(6668, 6668),
+ Box(6669, 6669),
+ Box(6670, 6670),
+ Box(6671, 6671),
+ Box(6672, 6672),
+ Box(6673, 6673),
+ Box(6674, 6674),
+ Box(6675, 6675),
+ Box(6676, 6676),
+ Box(6677, 6677),
+ Box(6678, 6678),
+ Box(6679, 6679),
+ Box(6680, 6680),
+ Box(6681, 6681),
+ Box(6682, 6682),
+ Box(6683, 6683),
+ Box(6684, 6684),
+ Box(6685, 6685),
+ Box(6686, 6686),
+ Box(6687, 6687),
+ Box(6688, 6688),
+ Box(6689, 6689),
+ Box(6690, 6690),
+ Box(6691, 6691),
+ Box(6692, 6692),
+ Box(6693, 6693),
+ Box(6694, 6694),
+ Box(6695, 6695),
+ Box(6696, 6696),
+ Box(6697, 6697),
+ Box(6698, 6698),
+ Box(6699, 6699),
+ Box(6700, 6700),
+ Box(6701, 6701),
+ Box(6702, 6702),
+ Box(6703, 6703),
+ Box(6704, 6704),
+ Box(6705, 6705),
+ Box(6706, 6706),
+ Box(6707, 6707),
+ Box(6708, 6708),
+ Box(6709, 6709),
+ Box(6710, 6710),
+ Box(6711, 6711),
+ Box(6712, 6712),
+ Box(6713, 6713),
+ Box(6714, 6714),
+ Box(6715, 6715),
+ Box(6716, 6716),
+ Box(6717, 6717),
+ Box(6718, 6718),
+ Box(6719, 6719),
+ Box(6720, 6720),
+ Box(6721, 6721),
+ Box(6722, 6722),
+ Box(6723, 6723),
+ Box(6724, 6724),
+ Box(6725, 6725),
+ Box(6726, 6726),
+ Box(6727, 6727),
+ Box(6728, 6728),
+ Box(6729, 6729),
+ Box(6730, 6730),
+ Box(6731, 6731),
+ Box(6732, 6732),
+ Box(6733, 6733),
+ Box(6734, 6734),
+ Box(6735, 6735),
+ Box(6736, 6736),
+ Box(6737, 6737),
+ Box(6738, 6738),
+ Box(6739, 6739),
+ Box(6740, 6740),
+ Box(6741, 6741),
+ Box(6742, 6742),
+ Box(6743, 6743),
+ Box(6744, 6744),
+ Box(6745, 6745),
+ Box(6746, 6746),
+ Box(6747, 6747),
+ Box(6748, 6748),
+ Box(6749, 6749),
+ Box(6750, 6750),
+ Box(6751, 6751),
+ Box(6752, 6752),
+ Box(6753, 6753),
+ Box(6754, 6754),
+ Box(6755, 6755),
+ Box(6756, 6756),
+ Box(6757, 6757),
+ Box(6758, 6758),
+ Box(6759, 6759),
+ Box(6760, 6760),
+ Box(6761, 6761),
+ Box(6762, 6762),
+ Box(6763, 6763),
+ Box(6764, 6764),
+ Box(6765, 6765),
+ Box(6766, 6766),
+ Box(6767, 6767),
+ Box(6768, 6768),
+ Box(6769, 6769),
+ Box(6770, 6770),
+ Box(6771, 6771),
+ Box(6772, 6772),
+ Box(6773, 6773),
+ Box(6774, 6774),
+ Box(6775, 6775),
+ Box(6776, 6776),
+ Box(6777, 6777),
+ Box(6778, 6778),
+ Box(6779, 6779),
+ Box(6780, 6780),
+ Box(6781, 6781),
+ Box(6782, 6782),
+ Box(6783, 6783),
+ Box(6784, 6784),
+ Box(6785, 6785),
+ Box(6786, 6786),
+ Box(6787, 6787),
+ Box(6788, 6788),
+ Box(6789, 6789),
+ Box(6790, 6790),
+ Box(6791, 6791),
+ Box(6792, 6792),
+ Box(6793, 6793),
+ Box(6794, 6794),
+ Box(6795, 6795),
+ Box(6796, 6796),
+ Box(6797, 6797),
+ Box(6798, 6798),
+ Box(6799, 6799),
+ Box(6800, 6800),
+ Box(6801, 6801),
+ Box(6802, 6802),
+ Box(6803, 6803),
+ Box(6804, 6804),
+ Box(6805, 6805),
+ Box(6806, 6806),
+ Box(6807, 6807),
+ Box(6808, 6808),
+ Box(6809, 6809),
+ Box(6810, 6810),
+ Box(6811, 6811),
+ Box(6812, 6812),
+ Box(6813, 6813),
+ Box(6814, 6814),
+ Box(6815, 6815),
+ Box(6816, 6816),
+ Box(6817, 6817),
+ Box(6818, 6818),
+ Box(6819, 6819),
+ Box(6820, 6820),
+ Box(6821, 6821),
+ Box(6822, 6822),
+ Box(6823, 6823),
+ Box(6824, 6824),
+ Box(6825, 6825),
+ Box(6826, 6826),
+ Box(6827, 6827),
+ Box(6828, 6828),
+ Box(6829, 6829),
+ Box(6830, 6830),
+ Box(6831, 6831),
+ Box(6832, 6832),
+ Box(6833, 6833),
+ Box(6834, 6834),
+ Box(6835, 6835),
+ Box(6836, 6836),
+ Box(6837, 6837),
+ Box(6838, 6838),
+ Box(6839, 6839),
+ Box(6840, 6840),
+ Box(6841, 6841),
+ Box(6842, 6842),
+ Box(6843, 6843),
+ Box(6844, 6844),
+ Box(6845, 6845),
+ Box(6846, 6846),
+ Box(6847, 6847),
+ Box(6848, 6848),
+ Box(6849, 6849),
+ Box(6850, 6850),
+ Box(6851, 6851),
+ Box(6852, 6852),
+ Box(6853, 6853),
+ Box(6854, 6854),
+ Box(6855, 6855),
+ Box(6856, 6856),
+ Box(6857, 6857),
+ Box(6858, 6858),
+ Box(6859, 6859),
+ Box(6860, 6860),
+ Box(6861, 6861),
+ Box(6862, 6862),
+ Box(6863, 6863),
+ Box(6864, 6864),
+ Box(6865, 6865),
+ Box(6866, 6866),
+ Box(6867, 6867),
+ Box(6868, 6868),
+ Box(6869, 6869),
+ Box(6870, 6870),
+ Box(6871, 6871),
+ Box(6872, 6872),
+ Box(6873, 6873),
+ Box(6874, 6874),
+ Box(6875, 6875),
+ Box(6876, 6876),
+ Box(6877, 6877),
+ Box(6878, 6878),
+ Box(6879, 6879),
+ Box(6880, 6880),
+ Box(6881, 6881),
+ Box(6882, 6882),
+ Box(6883, 6883),
+ Box(6884, 6884),
+ Box(6885, 6885),
+ Box(6886, 6886),
+ Box(6887, 6887),
+ Box(6888, 6888),
+ Box(6889, 6889),
+ Box(6890, 6890),
+ Box(6891, 6891),
+ Box(6892, 6892),
+ Box(6893, 6893),
+ Box(6894, 6894),
+ Box(6895, 6895),
+ Box(6896, 6896),
+ Box(6897, 6897),
+ Box(6898, 6898),
+ Box(6899, 6899),
+ Box(6900, 6900),
+ Box(6901, 6901),
+ Box(6902, 6902),
+ Box(6903, 6903),
+ Box(6904, 6904),
+ Box(6905, 6905),
+ Box(6906, 6906),
+ Box(6907, 6907),
+ Box(6908, 6908),
+ Box(6909, 6909),
+ Box(6910, 6910),
+ Box(6911, 6911),
+ Box(6912, 6912),
+ Box(6913, 6913),
+ Box(6914, 6914),
+ Box(6915, 6915),
+ Box(6916, 6916),
+ Box(6917, 6917),
+ Box(6918, 6918),
+ Box(6919, 6919),
+ Box(6920, 6920),
+ Box(6921, 6921),
+ Box(6922, 6922),
+ Box(6923, 6923),
+ Box(6924, 6924),
+ Box(6925, 6925),
+ Box(6926, 6926),
+ Box(6927, 6927),
+ Box(6928, 6928),
+ Box(6929, 6929),
+ Box(6930, 6930),
+ Box(6931, 6931),
+ Box(6932, 6932),
+ Box(6933, 6933),
+ Box(6934, 6934),
+ Box(6935, 6935),
+ Box(6936, 6936),
+ Box(6937, 6937),
+ Box(6938, 6938),
+ Box(6939, 6939),
+ Box(6940, 6940),
+ Box(6941, 6941),
+ Box(6942, 6942),
+ Box(6943, 6943),
+ Box(6944, 6944),
+ Box(6945, 6945),
+ Box(6946, 6946),
+ Box(6947, 6947),
+ Box(6948, 6948),
+ Box(6949, 6949),
+ Box(6950, 6950),
+ Box(6951, 6951),
+ Box(6952, 6952),
+ Box(6953, 6953),
+ Box(6954, 6954),
+ Box(6955, 6955),
+ Box(6956, 6956),
+ Box(6957, 6957),
+ Box(6958, 6958),
+ Box(6959, 6959),
+ Box(6960, 6960),
+ Box(6961, 6961),
+ Box(6962, 6962),
+ Box(6963, 6963),
+ Box(6964, 6964),
+ Box(6965, 6965),
+ Box(6966, 6966),
+ Box(6967, 6967),
+ Box(6968, 6968),
+ Box(6969, 6969),
+ Box(6970, 6970),
+ Box(6971, 6971),
+ Box(6972, 6972),
+ Box(6973, 6973),
+ Box(6974, 6974),
+ Box(6975, 6975),
+ Box(6976, 6976),
+ Box(6977, 6977),
+ Box(6978, 6978),
+ Box(6979, 6979),
+ Box(6980, 6980),
+ Box(6981, 6981),
+ Box(6982, 6982),
+ Box(6983, 6983),
+ Box(6984, 6984),
+ Box(6985, 6985),
+ Box(6986, 6986),
+ Box(6987, 6987),
+ Box(6988, 6988),
+ Box(6989, 6989),
+ Box(6990, 6990),
+ Box(6991, 6991),
+ Box(6992, 6992),
+ Box(6993, 6993),
+ Box(6994, 6994),
+ Box(6995, 6995),
+ Box(6996, 6996),
+ Box(6997, 6997),
+ Box(6998, 6998),
+ Box(6999, 6999),
+ Box(7000, 7000),
+ Box(7001, 7001),
+ Box(7002, 7002),
+ Box(7003, 7003),
+ Box(7004, 7004),
+ Box(7005, 7005),
+ Box(7006, 7006),
+ Box(7007, 7007),
+ Box(7008, 7008),
+ Box(7009, 7009),
+ Box(7010, 7010),
+ Box(7011, 7011),
+ Box(7012, 7012),
+ Box(7013, 7013),
+ Box(7014, 7014),
+ Box(7015, 7015),
+ Box(7016, 7016),
+ Box(7017, 7017),
+ Box(7018, 7018),
+ Box(7019, 7019),
+ Box(7020, 7020),
+ Box(7021, 7021),
+ Box(7022, 7022),
+ Box(7023, 7023),
+ Box(7024, 7024),
+ Box(7025, 7025),
+ Box(7026, 7026),
+ Box(7027, 7027),
+ Box(7028, 7028),
+ Box(7029, 7029),
+ Box(7030, 7030),
+ Box(7031, 7031),
+ Box(7032, 7032),
+ Box(7033, 7033),
+ Box(7034, 7034),
+ Box(7035, 7035),
+ Box(7036, 7036),
+ Box(7037, 7037),
+ Box(7038, 7038),
+ Box(7039, 7039),
+ Box(7040, 7040),
+ Box(7041, 7041),
+ Box(7042, 7042),
+ Box(7043, 7043),
+ Box(7044, 7044),
+ Box(7045, 7045),
+ Box(7046, 7046),
+ Box(7047, 7047),
+ Box(7048, 7048),
+ Box(7049, 7049),
+ Box(7050, 7050),
+ Box(7051, 7051),
+ Box(7052, 7052),
+ Box(7053, 7053),
+ Box(7054, 7054),
+ Box(7055, 7055),
+ Box(7056, 7056),
+ Box(7057, 7057),
+ Box(7058, 7058),
+ Box(7059, 7059),
+ Box(7060, 7060),
+ Box(7061, 7061),
+ Box(7062, 7062),
+ Box(7063, 7063),
+ Box(7064, 7064),
+ Box(7065, 7065),
+ Box(7066, 7066),
+ Box(7067, 7067),
+ Box(7068, 7068),
+ Box(7069, 7069),
+ Box(7070, 7070),
+ Box(7071, 7071),
+ Box(7072, 7072),
+ Box(7073, 7073),
+ Box(7074, 7074),
+ Box(7075, 7075),
+ Box(7076, 7076),
+ Box(7077, 7077),
+ Box(7078, 7078),
+ Box(7079, 7079),
+ Box(7080, 7080),
+ Box(7081, 7081),
+ Box(7082, 7082),
+ Box(7083, 7083),
+ Box(7084, 7084),
+ Box(7085, 7085),
+ Box(7086, 7086),
+ Box(7087, 7087),
+ Box(7088, 7088),
+ Box(7089, 7089),
+ Box(7090, 7090),
+ Box(7091, 7091),
+ Box(7092, 7092),
+ Box(7093, 7093),
+ Box(7094, 7094),
+ Box(7095, 7095),
+ Box(7096, 7096),
+ Box(7097, 7097),
+ Box(7098, 7098),
+ Box(7099, 7099),
+ Box(7100, 7100),
+ Box(7101, 7101),
+ Box(7102, 7102),
+ Box(7103, 7103),
+ Box(7104, 7104),
+ Box(7105, 7105),
+ Box(7106, 7106),
+ Box(7107, 7107),
+ Box(7108, 7108),
+ Box(7109, 7109),
+ Box(7110, 7110),
+ Box(7111, 7111),
+ Box(7112, 7112),
+ Box(7113, 7113),
+ Box(7114, 7114),
+ Box(7115, 7115),
+ Box(7116, 7116),
+ Box(7117, 7117),
+ Box(7118, 7118),
+ Box(7119, 7119),
+ Box(7120, 7120),
+ Box(7121, 7121),
+ Box(7122, 7122),
+ Box(7123, 7123),
+ Box(7124, 7124),
+ Box(7125, 7125),
+ Box(7126, 7126),
+ Box(7127, 7127),
+ Box(7128, 7128),
+ Box(7129, 7129),
+ Box(7130, 7130),
+ Box(7131, 7131),
+ Box(7132, 7132),
+ Box(7133, 7133),
+ Box(7134, 7134),
+ Box(7135, 7135),
+ Box(7136, 7136),
+ Box(7137, 7137),
+ Box(7138, 7138),
+ Box(7139, 7139),
+ Box(7140, 7140),
+ Box(7141, 7141),
+ Box(7142, 7142),
+ Box(7143, 7143),
+ Box(7144, 7144),
+ Box(7145, 7145),
+ Box(7146, 7146),
+ Box(7147, 7147),
+ Box(7148, 7148),
+ Box(7149, 7149),
+ Box(7150, 7150),
+ Box(7151, 7151),
+ Box(7152, 7152),
+ Box(7153, 7153),
+ Box(7154, 7154),
+ Box(7155, 7155),
+ Box(7156, 7156),
+ Box(7157, 7157),
+ Box(7158, 7158),
+ Box(7159, 7159),
+ Box(7160, 7160),
+ Box(7161, 7161),
+ Box(7162, 7162),
+ Box(7163, 7163),
+ Box(7164, 7164),
+ Box(7165, 7165),
+ Box(7166, 7166),
+ Box(7167, 7167),
+ Box(7168, 7168),
+ Box(7169, 7169),
+ Box(7170, 7170),
+ Box(7171, 7171),
+ Box(7172, 7172),
+ Box(7173, 7173),
+ Box(7174, 7174),
+ Box(7175, 7175),
+ Box(7176, 7176),
+ Box(7177, 7177),
+ Box(7178, 7178),
+ Box(7179, 7179),
+ Box(7180, 7180),
+ Box(7181, 7181),
+ Box(7182, 7182),
+ Box(7183, 7183),
+ Box(7184, 7184),
+ Box(7185, 7185),
+ Box(7186, 7186),
+ Box(7187, 7187),
+ Box(7188, 7188),
+ Box(7189, 7189),
+ Box(7190, 7190),
+ Box(7191, 7191),
+ Box(7192, 7192),
+ Box(7193, 7193),
+ Box(7194, 7194),
+ Box(7195, 7195),
+ Box(7196, 7196),
+ Box(7197, 7197),
+ Box(7198, 7198),
+ Box(7199, 7199),
+ Box(7200, 7200),
+ Box(7201, 7201),
+ Box(7202, 7202),
+ Box(7203, 7203),
+ Box(7204, 7204),
+ Box(7205, 7205),
+ Box(7206, 7206),
+ Box(7207, 7207),
+ Box(7208, 7208),
+ Box(7209, 7209),
+ Box(7210, 7210),
+ Box(7211, 7211),
+ Box(7212, 7212),
+ Box(7213, 7213),
+ Box(7214, 7214),
+ Box(7215, 7215),
+ Box(7216, 7216),
+ Box(7217, 7217),
+ Box(7218, 7218),
+ Box(7219, 7219),
+ Box(7220, 7220),
+ Box(7221, 7221),
+ Box(7222, 7222),
+ Box(7223, 7223),
+ Box(7224, 7224),
+ Box(7225, 7225),
+ Box(7226, 7226),
+ Box(7227, 7227),
+ Box(7228, 7228),
+ Box(7229, 7229),
+ Box(7230, 7230),
+ Box(7231, 7231),
+ Box(7232, 7232),
+ Box(7233, 7233),
+ Box(7234, 7234),
+ Box(7235, 7235),
+ Box(7236, 7236),
+ Box(7237, 7237),
+ Box(7238, 7238),
+ Box(7239, 7239),
+ Box(7240, 7240),
+ Box(7241, 7241),
+ Box(7242, 7242),
+ Box(7243, 7243),
+ Box(7244, 7244),
+ Box(7245, 7245),
+ Box(7246, 7246),
+ Box(7247, 7247),
+ Box(7248, 7248),
+ Box(7249, 7249),
+ Box(7250, 7250),
+ Box(7251, 7251),
+ Box(7252, 7252),
+ Box(7253, 7253),
+ Box(7254, 7254),
+ Box(7255, 7255),
+ Box(7256, 7256),
+ Box(7257, 7257),
+ Box(7258, 7258),
+ Box(7259, 7259),
+ Box(7260, 7260),
+ Box(7261, 7261),
+ Box(7262, 7262),
+ Box(7263, 7263),
+ Box(7264, 7264),
+ Box(7265, 7265),
+ Box(7266, 7266),
+ Box(7267, 7267),
+ Box(7268, 7268),
+ Box(7269, 7269),
+ Box(7270, 7270),
+ Box(7271, 7271),
+ Box(7272, 7272),
+ Box(7273, 7273),
+ Box(7274, 7274),
+ Box(7275, 7275),
+ Box(7276, 7276),
+ Box(7277, 7277),
+ Box(7278, 7278),
+ Box(7279, 7279),
+ Box(7280, 7280),
+ Box(7281, 7281),
+ Box(7282, 7282),
+ Box(7283, 7283),
+ Box(7284, 7284),
+ Box(7285, 7285),
+ Box(7286, 7286),
+ Box(7287, 7287),
+ Box(7288, 7288),
+ Box(7289, 7289),
+ Box(7290, 7290),
+ Box(7291, 7291),
+ Box(7292, 7292),
+ Box(7293, 7293),
+ Box(7294, 7294),
+ Box(7295, 7295),
+ Box(7296, 7296),
+ Box(7297, 7297),
+ Box(7298, 7298),
+ Box(7299, 7299),
+ Box(7300, 7300),
+ Box(7301, 7301),
+ Box(7302, 7302),
+ Box(7303, 7303),
+ Box(7304, 7304),
+ Box(7305, 7305),
+ Box(7306, 7306),
+ Box(7307, 7307),
+ Box(7308, 7308),
+ Box(7309, 7309),
+ Box(7310, 7310),
+ Box(7311, 7311),
+ Box(7312, 7312),
+ Box(7313, 7313),
+ Box(7314, 7314),
+ Box(7315, 7315),
+ Box(7316, 7316),
+ Box(7317, 7317),
+ Box(7318, 7318),
+ Box(7319, 7319),
+ Box(7320, 7320),
+ Box(7321, 7321),
+ Box(7322, 7322),
+ Box(7323, 7323),
+ Box(7324, 7324),
+ Box(7325, 7325),
+ Box(7326, 7326),
+ Box(7327, 7327),
+ Box(7328, 7328),
+ Box(7329, 7329),
+ Box(7330, 7330),
+ Box(7331, 7331),
+ Box(7332, 7332),
+ Box(7333, 7333),
+ Box(7334, 7334),
+ Box(7335, 7335),
+ Box(7336, 7336),
+ Box(7337, 7337),
+ Box(7338, 7338),
+ Box(7339, 7339),
+ Box(7340, 7340),
+ Box(7341, 7341),
+ Box(7342, 7342),
+ Box(7343, 7343),
+ Box(7344, 7344),
+ Box(7345, 7345),
+ Box(7346, 7346),
+ Box(7347, 7347),
+ Box(7348, 7348),
+ Box(7349, 7349),
+ Box(7350, 7350),
+ Box(7351, 7351),
+ Box(7352, 7352),
+ Box(7353, 7353),
+ Box(7354, 7354),
+ Box(7355, 7355),
+ Box(7356, 7356),
+ Box(7357, 7357),
+ Box(7358, 7358),
+ Box(7359, 7359),
+ Box(7360, 7360),
+ Box(7361, 7361),
+ Box(7362, 7362),
+ Box(7363, 7363),
+ Box(7364, 7364),
+ Box(7365, 7365),
+ Box(7366, 7366),
+ Box(7367, 7367),
+ Box(7368, 7368),
+ Box(7369, 7369),
+ Box(7370, 7370),
+ Box(7371, 7371),
+ Box(7372, 7372),
+ Box(7373, 7373),
+ Box(7374, 7374),
+ Box(7375, 7375),
+ Box(7376, 7376),
+ Box(7377, 7377),
+ Box(7378, 7378),
+ Box(7379, 7379),
+ Box(7380, 7380),
+ Box(7381, 7381),
+ Box(7382, 7382),
+ Box(7383, 7383),
+ Box(7384, 7384),
+ Box(7385, 7385),
+ Box(7386, 7386),
+ Box(7387, 7387),
+ Box(7388, 7388),
+ Box(7389, 7389),
+ Box(7390, 7390),
+ Box(7391, 7391),
+ Box(7392, 7392),
+ Box(7393, 7393),
+ Box(7394, 7394),
+ Box(7395, 7395),
+ Box(7396, 7396),
+ Box(7397, 7397),
+ Box(7398, 7398),
+ Box(7399, 7399),
+ Box(7400, 7400),
+ Box(7401, 7401),
+ Box(7402, 7402),
+ Box(7403, 7403),
+ Box(7404, 7404),
+ Box(7405, 7405),
+ Box(7406, 7406),
+ Box(7407, 7407),
+ Box(7408, 7408),
+ Box(7409, 7409),
+ Box(7410, 7410),
+ Box(7411, 7411),
+ Box(7412, 7412),
+ Box(7413, 7413),
+ Box(7414, 7414),
+ Box(7415, 7415),
+ Box(7416, 7416),
+ Box(7417, 7417),
+ Box(7418, 7418),
+ Box(7419, 7419),
+ Box(7420, 7420),
+ Box(7421, 7421),
+ Box(7422, 7422),
+ Box(7423, 7423),
+ Box(7424, 7424),
+ Box(7425, 7425),
+ Box(7426, 7426),
+ Box(7427, 7427),
+ Box(7428, 7428),
+ Box(7429, 7429),
+ Box(7430, 7430),
+ Box(7431, 7431),
+ Box(7432, 7432),
+ Box(7433, 7433),
+ Box(7434, 7434),
+ Box(7435, 7435),
+ Box(7436, 7436),
+ Box(7437, 7437),
+ Box(7438, 7438),
+ Box(7439, 7439),
+ Box(7440, 7440),
+ Box(7441, 7441),
+ Box(7442, 7442),
+ Box(7443, 7443),
+ Box(7444, 7444),
+ Box(7445, 7445),
+ Box(7446, 7446),
+ Box(7447, 7447),
+ Box(7448, 7448),
+ Box(7449, 7449),
+ Box(7450, 7450),
+ Box(7451, 7451),
+ Box(7452, 7452),
+ Box(7453, 7453),
+ Box(7454, 7454),
+ Box(7455, 7455),
+ Box(7456, 7456),
+ Box(7457, 7457),
+ Box(7458, 7458),
+ Box(7459, 7459),
+ Box(7460, 7460),
+ Box(7461, 7461),
+ Box(7462, 7462),
+ Box(7463, 7463),
+ Box(7464, 7464),
+ Box(7465, 7465),
+ Box(7466, 7466),
+ Box(7467, 7467),
+ Box(7468, 7468),
+ Box(7469, 7469),
+ Box(7470, 7470),
+ Box(7471, 7471),
+ Box(7472, 7472),
+ Box(7473, 7473),
+ Box(7474, 7474),
+ Box(7475, 7475),
+ Box(7476, 7476),
+ Box(7477, 7477),
+ Box(7478, 7478),
+ Box(7479, 7479),
+ Box(7480, 7480),
+ Box(7481, 7481),
+ Box(7482, 7482),
+ Box(7483, 7483),
+ Box(7484, 7484),
+ Box(7485, 7485),
+ Box(7486, 7486),
+ Box(7487, 7487),
+ Box(7488, 7488),
+ Box(7489, 7489),
+ Box(7490, 7490),
+ Box(7491, 7491),
+ Box(7492, 7492),
+ Box(7493, 7493),
+ Box(7494, 7494),
+ Box(7495, 7495),
+ Box(7496, 7496),
+ Box(7497, 7497),
+ Box(7498, 7498),
+ Box(7499, 7499),
+ Box(7500, 7500),
+ Box(7501, 7501),
+ Box(7502, 7502),
+ Box(7503, 7503),
+ Box(7504, 7504),
+ Box(7505, 7505),
+ Box(7506, 7506),
+ Box(7507, 7507),
+ Box(7508, 7508),
+ Box(7509, 7509),
+ Box(7510, 7510),
+ Box(7511, 7511),
+ Box(7512, 7512),
+ Box(7513, 7513),
+ Box(7514, 7514),
+ Box(7515, 7515),
+ Box(7516, 7516),
+ Box(7517, 7517),
+ Box(7518, 7518),
+ Box(7519, 7519),
+ Box(7520, 7520),
+ Box(7521, 7521),
+ Box(7522, 7522),
+ Box(7523, 7523),
+ Box(7524, 7524),
+ Box(7525, 7525),
+ Box(7526, 7526),
+ Box(7527, 7527),
+ Box(7528, 7528),
+ Box(7529, 7529),
+ Box(7530, 7530),
+ Box(7531, 7531),
+ Box(7532, 7532),
+ Box(7533, 7533),
+ Box(7534, 7534),
+ Box(7535, 7535),
+ Box(7536, 7536),
+ Box(7537, 7537),
+ Box(7538, 7538),
+ Box(7539, 7539),
+ Box(7540, 7540),
+ Box(7541, 7541),
+ Box(7542, 7542),
+ Box(7543, 7543),
+ Box(7544, 7544),
+ Box(7545, 7545),
+ Box(7546, 7546),
+ Box(7547, 7547),
+ Box(7548, 7548),
+ Box(7549, 7549),
+ Box(7550, 7550),
+ Box(7551, 7551),
+ Box(7552, 7552),
+ Box(7553, 7553),
+ Box(7554, 7554),
+ Box(7555, 7555),
+ Box(7556, 7556),
+ Box(7557, 7557),
+ Box(7558, 7558),
+ Box(7559, 7559),
+ Box(7560, 7560),
+ Box(7561, 7561),
+ Box(7562, 7562),
+ Box(7563, 7563),
+ Box(7564, 7564),
+ Box(7565, 7565),
+ Box(7566, 7566),
+ Box(7567, 7567),
+ Box(7568, 7568),
+ Box(7569, 7569),
+ Box(7570, 7570),
+ Box(7571, 7571),
+ Box(7572, 7572),
+ Box(7573, 7573),
+ Box(7574, 7574),
+ Box(7575, 7575),
+ Box(7576, 7576),
+ Box(7577, 7577),
+ Box(7578, 7578),
+ Box(7579, 7579),
+ Box(7580, 7580),
+ Box(7581, 7581),
+ Box(7582, 7582),
+ Box(7583, 7583),
+ Box(7584, 7584),
+ Box(7585, 7585),
+ Box(7586, 7586),
+ Box(7587, 7587),
+ Box(7588, 7588),
+ Box(7589, 7589),
+ Box(7590, 7590),
+ Box(7591, 7591),
+ Box(7592, 7592),
+ Box(7593, 7593),
+ Box(7594, 7594),
+ Box(7595, 7595),
+ Box(7596, 7596),
+ Box(7597, 7597),
+ Box(7598, 7598),
+ Box(7599, 7599),
+ Box(7600, 7600),
+ Box(7601, 7601),
+ Box(7602, 7602),
+ Box(7603, 7603),
+ Box(7604, 7604),
+ Box(7605, 7605),
+ Box(7606, 7606),
+ Box(7607, 7607),
+ Box(7608, 7608),
+ Box(7609, 7609),
+ Box(7610, 7610),
+ Box(7611, 7611),
+ Box(7612, 7612),
+ Box(7613, 7613),
+ Box(7614, 7614),
+ Box(7615, 7615),
+ Box(7616, 7616),
+ Box(7617, 7617),
+ Box(7618, 7618),
+ Box(7619, 7619),
+ Box(7620, 7620),
+ Box(7621, 7621),
+ Box(7622, 7622),
+ Box(7623, 7623),
+ Box(7624, 7624),
+ Box(7625, 7625),
+ Box(7626, 7626),
+ Box(7627, 7627),
+ Box(7628, 7628),
+ Box(7629, 7629),
+ Box(7630, 7630),
+ Box(7631, 7631),
+ Box(7632, 7632),
+ Box(7633, 7633),
+ Box(7634, 7634),
+ Box(7635, 7635),
+ Box(7636, 7636),
+ Box(7637, 7637),
+ Box(7638, 7638),
+ Box(7639, 7639),
+ Box(7640, 7640),
+ Box(7641, 7641),
+ Box(7642, 7642),
+ Box(7643, 7643),
+ Box(7644, 7644),
+ Box(7645, 7645),
+ Box(7646, 7646),
+ Box(7647, 7647),
+ Box(7648, 7648),
+ Box(7649, 7649),
+ Box(7650, 7650),
+ Box(7651, 7651),
+ Box(7652, 7652),
+ Box(7653, 7653),
+ Box(7654, 7654),
+ Box(7655, 7655),
+ Box(7656, 7656),
+ Box(7657, 7657),
+ Box(7658, 7658),
+ Box(7659, 7659),
+ Box(7660, 7660),
+ Box(7661, 7661),
+ Box(7662, 7662),
+ Box(7663, 7663),
+ Box(7664, 7664),
+ Box(7665, 7665),
+ Box(7666, 7666),
+ Box(7667, 7667),
+ Box(7668, 7668),
+ Box(7669, 7669),
+ Box(7670, 7670),
+ Box(7671, 7671),
+ Box(7672, 7672),
+ Box(7673, 7673),
+ Box(7674, 7674),
+ Box(7675, 7675),
+ Box(7676, 7676),
+ Box(7677, 7677),
+ Box(7678, 7678),
+ Box(7679, 7679),
+ Box(7680, 7680),
+ Box(7681, 7681),
+ Box(7682, 7682),
+ Box(7683, 7683),
+ Box(7684, 7684),
+ Box(7685, 7685),
+ Box(7686, 7686),
+ Box(7687, 7687),
+ Box(7688, 7688),
+ Box(7689, 7689),
+ Box(7690, 7690),
+ Box(7691, 7691),
+ Box(7692, 7692),
+ Box(7693, 7693),
+ Box(7694, 7694),
+ Box(7695, 7695),
+ Box(7696, 7696),
+ Box(7697, 7697),
+ Box(7698, 7698),
+ Box(7699, 7699),
+ Box(7700, 7700),
+ Box(7701, 7701),
+ Box(7702, 7702),
+ Box(7703, 7703),
+ Box(7704, 7704),
+ Box(7705, 7705),
+ Box(7706, 7706),
+ Box(7707, 7707),
+ Box(7708, 7708),
+ Box(7709, 7709),
+ Box(7710, 7710),
+ Box(7711, 7711),
+ Box(7712, 7712),
+ Box(7713, 7713),
+ Box(7714, 7714),
+ Box(7715, 7715),
+ Box(7716, 7716),
+ Box(7717, 7717),
+ Box(7718, 7718),
+ Box(7719, 7719),
+ Box(7720, 7720),
+ Box(7721, 7721),
+ Box(7722, 7722),
+ Box(7723, 7723),
+ Box(7724, 7724),
+ Box(7725, 7725),
+ Box(7726, 7726),
+ Box(7727, 7727),
+ Box(7728, 7728),
+ Box(7729, 7729),
+ Box(7730, 7730),
+ Box(7731, 7731),
+ Box(7732, 7732),
+ Box(7733, 7733),
+ Box(7734, 7734),
+ Box(7735, 7735),
+ Box(7736, 7736),
+ Box(7737, 7737),
+ Box(7738, 7738),
+ Box(7739, 7739),
+ Box(7740, 7740),
+ Box(7741, 7741),
+ Box(7742, 7742),
+ Box(7743, 7743),
+ Box(7744, 7744),
+ Box(7745, 7745),
+ Box(7746, 7746),
+ Box(7747, 7747),
+ Box(7748, 7748),
+ Box(7749, 7749),
+ Box(7750, 7750),
+ Box(7751, 7751),
+ Box(7752, 7752),
+ Box(7753, 7753),
+ Box(7754, 7754),
+ Box(7755, 7755),
+ Box(7756, 7756),
+ Box(7757, 7757),
+ Box(7758, 7758),
+ Box(7759, 7759),
+ Box(7760, 7760),
+ Box(7761, 7761),
+ Box(7762, 7762),
+ Box(7763, 7763),
+ Box(7764, 7764),
+ Box(7765, 7765),
+ Box(7766, 7766),
+ Box(7767, 7767),
+ Box(7768, 7768),
+ Box(7769, 7769),
+ Box(7770, 7770),
+ Box(7771, 7771),
+ Box(7772, 7772),
+ Box(7773, 7773),
+ Box(7774, 7774),
+ Box(7775, 7775),
+ Box(7776, 7776),
+ Box(7777, 7777),
+ Box(7778, 7778),
+ Box(7779, 7779),
+ Box(7780, 7780),
+ Box(7781, 7781),
+ Box(7782, 7782),
+ Box(7783, 7783),
+ Box(7784, 7784),
+ Box(7785, 7785),
+ Box(7786, 7786),
+ Box(7787, 7787),
+ Box(7788, 7788),
+ Box(7789, 7789),
+ Box(7790, 7790),
+ Box(7791, 7791),
+ Box(7792, 7792),
+ Box(7793, 7793),
+ Box(7794, 7794),
+ Box(7795, 7795),
+ Box(7796, 7796),
+ Box(7797, 7797),
+ Box(7798, 7798),
+ Box(7799, 7799),
+ Box(7800, 7800),
+ Box(7801, 7801),
+ Box(7802, 7802),
+ Box(7803, 7803),
+ Box(7804, 7804),
+ Box(7805, 7805),
+ Box(7806, 7806),
+ Box(7807, 7807),
+ Box(7808, 7808),
+ Box(7809, 7809),
+ Box(7810, 7810),
+ Box(7811, 7811),
+ Box(7812, 7812),
+ Box(7813, 7813),
+ Box(7814, 7814),
+ Box(7815, 7815),
+ Box(7816, 7816),
+ Box(7817, 7817),
+ Box(7818, 7818),
+ Box(7819, 7819),
+ Box(7820, 7820),
+ Box(7821, 7821),
+ Box(7822, 7822),
+ Box(7823, 7823),
+ Box(7824, 7824),
+ Box(7825, 7825),
+ Box(7826, 7826),
+ Box(7827, 7827),
+ Box(7828, 7828),
+ Box(7829, 7829),
+ Box(7830, 7830),
+ Box(7831, 7831),
+ Box(7832, 7832),
+ Box(7833, 7833),
+ Box(7834, 7834),
+ Box(7835, 7835),
+ Box(7836, 7836),
+ Box(7837, 7837),
+ Box(7838, 7838),
+ Box(7839, 7839),
+ Box(7840, 7840),
+ Box(7841, 7841),
+ Box(7842, 7842),
+ Box(7843, 7843),
+ Box(7844, 7844),
+ Box(7845, 7845),
+ Box(7846, 7846),
+ Box(7847, 7847),
+ Box(7848, 7848),
+ Box(7849, 7849),
+ Box(7850, 7850),
+ Box(7851, 7851),
+ Box(7852, 7852),
+ Box(7853, 7853),
+ Box(7854, 7854),
+ Box(7855, 7855),
+ Box(7856, 7856),
+ Box(7857, 7857),
+ Box(7858, 7858),
+ Box(7859, 7859),
+ Box(7860, 7860),
+ Box(7861, 7861),
+ Box(7862, 7862),
+ Box(7863, 7863),
+ Box(7864, 7864),
+ Box(7865, 7865),
+ Box(7866, 7866),
+ Box(7867, 7867),
+ Box(7868, 7868),
+ Box(7869, 7869),
+ Box(7870, 7870),
+ Box(7871, 7871),
+ Box(7872, 7872),
+ Box(7873, 7873),
+ Box(7874, 7874),
+ Box(7875, 7875),
+ Box(7876, 7876),
+ Box(7877, 7877),
+ Box(7878, 7878),
+ Box(7879, 7879),
+ Box(7880, 7880),
+ Box(7881, 7881),
+ Box(7882, 7882),
+ Box(7883, 7883),
+ Box(7884, 7884),
+ Box(7885, 7885),
+ Box(7886, 7886),
+ Box(7887, 7887),
+ Box(7888, 7888),
+ Box(7889, 7889),
+ Box(7890, 7890),
+ Box(7891, 7891),
+ Box(7892, 7892),
+ Box(7893, 7893),
+ Box(7894, 7894),
+ Box(7895, 7895),
+ Box(7896, 7896),
+ Box(7897, 7897),
+ Box(7898, 7898),
+ Box(7899, 7899),
+ Box(7900, 7900),
+ Box(7901, 7901),
+ Box(7902, 7902),
+ Box(7903, 7903),
+ Box(7904, 7904),
+ Box(7905, 7905),
+ Box(7906, 7906),
+ Box(7907, 7907),
+ Box(7908, 7908),
+ Box(7909, 7909),
+ Box(7910, 7910),
+ Box(7911, 7911),
+ Box(7912, 7912),
+ Box(7913, 7913),
+ Box(7914, 7914),
+ Box(7915, 7915),
+ Box(7916, 7916),
+ Box(7917, 7917),
+ Box(7918, 7918),
+ Box(7919, 7919),
+ Box(7920, 7920),
+ Box(7921, 7921),
+ Box(7922, 7922),
+ Box(7923, 7923),
+ Box(7924, 7924),
+ Box(7925, 7925),
+ Box(7926, 7926),
+ Box(7927, 7927),
+ Box(7928, 7928),
+ Box(7929, 7929),
+ Box(7930, 7930),
+ Box(7931, 7931),
+ Box(7932, 7932),
+ Box(7933, 7933),
+ Box(7934, 7934),
+ Box(7935, 7935),
+ Box(7936, 7936),
+ Box(7937, 7937),
+ Box(7938, 7938),
+ Box(7939, 7939),
+ Box(7940, 7940),
+ Box(7941, 7941),
+ Box(7942, 7942),
+ Box(7943, 7943),
+ Box(7944, 7944),
+ Box(7945, 7945),
+ Box(7946, 7946),
+ Box(7947, 7947),
+ Box(7948, 7948),
+ Box(7949, 7949),
+ Box(7950, 7950),
+ Box(7951, 7951),
+ Box(7952, 7952),
+ Box(7953, 7953),
+ Box(7954, 7954),
+ Box(7955, 7955),
+ Box(7956, 7956),
+ Box(7957, 7957),
+ Box(7958, 7958),
+ Box(7959, 7959),
+ Box(7960, 7960),
+ Box(7961, 7961),
+ Box(7962, 7962),
+ Box(7963, 7963),
+ Box(7964, 7964),
+ Box(7965, 7965),
+ Box(7966, 7966),
+ Box(7967, 7967),
+ Box(7968, 7968),
+ Box(7969, 7969),
+ Box(7970, 7970),
+ Box(7971, 7971),
+ Box(7972, 7972),
+ Box(7973, 7973),
+ Box(7974, 7974),
+ Box(7975, 7975),
+ Box(7976, 7976),
+ Box(7977, 7977),
+ Box(7978, 7978),
+ Box(7979, 7979),
+ Box(7980, 7980),
+ Box(7981, 7981),
+ Box(7982, 7982),
+ Box(7983, 7983),
+ Box(7984, 7984),
+ Box(7985, 7985),
+ Box(7986, 7986),
+ Box(7987, 7987),
+ Box(7988, 7988),
+ Box(7989, 7989),
+ Box(7990, 7990),
+ Box(7991, 7991),
+ Box(7992, 7992),
+ Box(7993, 7993),
+ Box(7994, 7994),
+ Box(7995, 7995),
+ Box(7996, 7996),
+ Box(7997, 7997),
+ Box(7998, 7998),
+ Box(7999, 7999),
+ Box(8000, 8000),
+ Box(8001, 8001),
+ Box(8002, 8002),
+ Box(8003, 8003),
+ Box(8004, 8004),
+ Box(8005, 8005),
+ Box(8006, 8006),
+ Box(8007, 8007),
+ Box(8008, 8008),
+ Box(8009, 8009),
+ Box(8010, 8010),
+ Box(8011, 8011),
+ Box(8012, 8012),
+ Box(8013, 8013),
+ Box(8014, 8014),
+ Box(8015, 8015),
+ Box(8016, 8016),
+ Box(8017, 8017),
+ Box(8018, 8018),
+ Box(8019, 8019),
+ Box(8020, 8020),
+ Box(8021, 8021),
+ Box(8022, 8022),
+ Box(8023, 8023),
+ Box(8024, 8024),
+ Box(8025, 8025),
+ Box(8026, 8026),
+ Box(8027, 8027),
+ Box(8028, 8028),
+ Box(8029, 8029),
+ Box(8030, 8030),
+ Box(8031, 8031),
+ Box(8032, 8032),
+ Box(8033, 8033),
+ Box(8034, 8034),
+ Box(8035, 8035),
+ Box(8036, 8036),
+ Box(8037, 8037),
+ Box(8038, 8038),
+ Box(8039, 8039),
+ Box(8040, 8040),
+ Box(8041, 8041),
+ Box(8042, 8042),
+ Box(8043, 8043),
+ Box(8044, 8044),
+ Box(8045, 8045),
+ Box(8046, 8046),
+ Box(8047, 8047),
+ Box(8048, 8048),
+ Box(8049, 8049),
+ Box(8050, 8050),
+ Box(8051, 8051),
+ Box(8052, 8052),
+ Box(8053, 8053),
+ Box(8054, 8054),
+ Box(8055, 8055),
+ Box(8056, 8056),
+ Box(8057, 8057),
+ Box(8058, 8058),
+ Box(8059, 8059),
+ Box(8060, 8060),
+ Box(8061, 8061),
+ Box(8062, 8062),
+ Box(8063, 8063),
+ Box(8064, 8064),
+ Box(8065, 8065),
+ Box(8066, 8066),
+ Box(8067, 8067),
+ Box(8068, 8068),
+ Box(8069, 8069),
+ Box(8070, 8070),
+ Box(8071, 8071),
+ Box(8072, 8072),
+ Box(8073, 8073),
+ Box(8074, 8074),
+ Box(8075, 8075),
+ Box(8076, 8076),
+ Box(8077, 8077),
+ Box(8078, 8078),
+ Box(8079, 8079),
+ Box(8080, 8080),
+ Box(8081, 8081),
+ Box(8082, 8082),
+ Box(8083, 8083),
+ Box(8084, 8084),
+ Box(8085, 8085),
+ Box(8086, 8086),
+ Box(8087, 8087),
+ Box(8088, 8088),
+ Box(8089, 8089),
+ Box(8090, 8090),
+ Box(8091, 8091),
+ Box(8092, 8092),
+ Box(8093, 8093),
+ Box(8094, 8094),
+ Box(8095, 8095),
+ Box(8096, 8096),
+ Box(8097, 8097),
+ Box(8098, 8098),
+ Box(8099, 8099),
+ Box(8100, 8100),
+ Box(8101, 8101),
+ Box(8102, 8102),
+ Box(8103, 8103),
+ Box(8104, 8104),
+ Box(8105, 8105),
+ Box(8106, 8106),
+ Box(8107, 8107),
+ Box(8108, 8108),
+ Box(8109, 8109),
+ Box(8110, 8110),
+ Box(8111, 8111),
+ Box(8112, 8112),
+ Box(8113, 8113),
+ Box(8114, 8114),
+ Box(8115, 8115),
+ Box(8116, 8116),
+ Box(8117, 8117),
+ Box(8118, 8118),
+ Box(8119, 8119),
+ Box(8120, 8120),
+ Box(8121, 8121),
+ Box(8122, 8122),
+ Box(8123, 8123),
+ Box(8124, 8124),
+ Box(8125, 8125),
+ Box(8126, 8126),
+ Box(8127, 8127),
+ Box(8128, 8128),
+ Box(8129, 8129),
+ Box(8130, 8130),
+ Box(8131, 8131),
+ Box(8132, 8132),
+ Box(8133, 8133),
+ Box(8134, 8134),
+ Box(8135, 8135),
+ Box(8136, 8136),
+ Box(8137, 8137),
+ Box(8138, 8138),
+ Box(8139, 8139),
+ Box(8140, 8140),
+ Box(8141, 8141),
+ Box(8142, 8142),
+ Box(8143, 8143),
+ Box(8144, 8144),
+ Box(8145, 8145),
+ Box(8146, 8146),
+ Box(8147, 8147),
+ Box(8148, 8148),
+ Box(8149, 8149),
+ Box(8150, 8150),
+ Box(8151, 8151),
+ Box(8152, 8152),
+ Box(8153, 8153),
+ Box(8154, 8154),
+ Box(8155, 8155),
+ Box(8156, 8156),
+ Box(8157, 8157),
+ Box(8158, 8158),
+ Box(8159, 8159),
+ Box(8160, 8160),
+ Box(8161, 8161),
+ Box(8162, 8162),
+ Box(8163, 8163),
+ Box(8164, 8164),
+ Box(8165, 8165),
+ Box(8166, 8166),
+ Box(8167, 8167),
+ Box(8168, 8168),
+ Box(8169, 8169),
+ Box(8170, 8170),
+ Box(8171, 8171),
+ Box(8172, 8172),
+ Box(8173, 8173),
+ Box(8174, 8174),
+ Box(8175, 8175),
+ Box(8176, 8176),
+ Box(8177, 8177),
+ Box(8178, 8178),
+ Box(8179, 8179),
+ Box(8180, 8180),
+ Box(8181, 8181),
+ Box(8182, 8182),
+ Box(8183, 8183),
+ Box(8184, 8184),
+ Box(8185, 8185),
+ Box(8186, 8186),
+ Box(8187, 8187),
+ Box(8188, 8188),
+ Box(8189, 8189),
+ Box(8190, 8190),
+ Box(8191, 8191),
+ Box(8192, 8192),
+ Box(8193, 8193),
+ Box(8194, 8194),
+ Box(8195, 8195),
+ Box(8196, 8196),
+ Box(8197, 8197),
+ Box(8198, 8198),
+ Box(8199, 8199),
+ Box(8200, 8200),
+ Box(8201, 8201),
+ Box(8202, 8202),
+ Box(8203, 8203),
+ Box(8204, 8204),
+ Box(8205, 8205),
+ Box(8206, 8206),
+ Box(8207, 8207),
+ Box(8208, 8208),
+ Box(8209, 8209),
+ Box(8210, 8210),
+ Box(8211, 8211),
+ Box(8212, 8212),
+ Box(8213, 8213),
+ Box(8214, 8214),
+ Box(8215, 8215),
+ Box(8216, 8216),
+ Box(8217, 8217),
+ Box(8218, 8218),
+ Box(8219, 8219),
+ Box(8220, 8220),
+ Box(8221, 8221),
+ Box(8222, 8222),
+ Box(8223, 8223),
+ Box(8224, 8224),
+ Box(8225, 8225),
+ Box(8226, 8226),
+ Box(8227, 8227),
+ Box(8228, 8228),
+ Box(8229, 8229),
+ Box(8230, 8230),
+ Box(8231, 8231),
+ Box(8232, 8232),
+ Box(8233, 8233),
+ Box(8234, 8234),
+ Box(8235, 8235),
+ Box(8236, 8236),
+ Box(8237, 8237),
+ Box(8238, 8238),
+ Box(8239, 8239),
+ Box(8240, 8240),
+ Box(8241, 8241),
+ Box(8242, 8242),
+ Box(8243, 8243),
+ Box(8244, 8244),
+ Box(8245, 8245),
+ Box(8246, 8246),
+ Box(8247, 8247),
+ Box(8248, 8248),
+ Box(8249, 8249),
+ Box(8250, 8250),
+ Box(8251, 8251),
+ Box(8252, 8252),
+ Box(8253, 8253),
+ Box(8254, 8254),
+ Box(8255, 8255),
+ Box(8256, 8256),
+ Box(8257, 8257),
+ Box(8258, 8258),
+ Box(8259, 8259),
+ Box(8260, 8260),
+ Box(8261, 8261),
+ Box(8262, 8262),
+ Box(8263, 8263),
+ Box(8264, 8264),
+ Box(8265, 8265),
+ Box(8266, 8266),
+ Box(8267, 8267),
+ Box(8268, 8268),
+ Box(8269, 8269),
+ Box(8270, 8270),
+ Box(8271, 8271),
+ Box(8272, 8272),
+ Box(8273, 8273),
+ Box(8274, 8274),
+ Box(8275, 8275),
+ Box(8276, 8276),
+ Box(8277, 8277),
+ Box(8278, 8278),
+ Box(8279, 8279),
+ Box(8280, 8280),
+ Box(8281, 8281),
+ Box(8282, 8282),
+ Box(8283, 8283),
+ Box(8284, 8284),
+ Box(8285, 8285),
+ Box(8286, 8286),
+ Box(8287, 8287),
+ Box(8288, 8288),
+ Box(8289, 8289),
+ Box(8290, 8290),
+ Box(8291, 8291),
+ Box(8292, 8292),
+ Box(8293, 8293),
+ Box(8294, 8294),
+ Box(8295, 8295),
+ Box(8296, 8296),
+ Box(8297, 8297),
+ Box(8298, 8298),
+ Box(8299, 8299),
+ Box(8300, 8300),
+ Box(8301, 8301),
+ Box(8302, 8302),
+ Box(8303, 8303),
+ Box(8304, 8304),
+ Box(8305, 8305),
+ Box(8306, 8306),
+ Box(8307, 8307),
+ Box(8308, 8308),
+ Box(8309, 8309),
+ Box(8310, 8310),
+ Box(8311, 8311),
+ Box(8312, 8312),
+ Box(8313, 8313),
+ Box(8314, 8314),
+ Box(8315, 8315),
+ Box(8316, 8316),
+ Box(8317, 8317),
+ Box(8318, 8318),
+ Box(8319, 8319),
+ Box(8320, 8320),
+ Box(8321, 8321),
+ Box(8322, 8322),
+ Box(8323, 8323),
+ Box(8324, 8324),
+ Box(8325, 8325),
+ Box(8326, 8326),
+ Box(8327, 8327),
+ Box(8328, 8328),
+ Box(8329, 8329),
+ Box(8330, 8330),
+ Box(8331, 8331),
+ Box(8332, 8332),
+ Box(8333, 8333),
+ Box(8334, 8334),
+ Box(8335, 8335),
+ Box(8336, 8336),
+ Box(8337, 8337),
+ Box(8338, 8338),
+ Box(8339, 8339),
+ Box(8340, 8340),
+ Box(8341, 8341),
+ Box(8342, 8342),
+ Box(8343, 8343),
+ Box(8344, 8344),
+ Box(8345, 8345),
+ Box(8346, 8346),
+ Box(8347, 8347),
+ Box(8348, 8348),
+ Box(8349, 8349),
+ Box(8350, 8350),
+ Box(8351, 8351),
+ Box(8352, 8352),
+ Box(8353, 8353),
+ Box(8354, 8354),
+ Box(8355, 8355),
+ Box(8356, 8356),
+ Box(8357, 8357),
+ Box(8358, 8358),
+ Box(8359, 8359),
+ Box(8360, 8360),
+ Box(8361, 8361),
+ Box(8362, 8362),
+ Box(8363, 8363),
+ Box(8364, 8364),
+ Box(8365, 8365),
+ Box(8366, 8366),
+ Box(8367, 8367),
+ Box(8368, 8368),
+ Box(8369, 8369),
+ Box(8370, 8370),
+ Box(8371, 8371),
+ Box(8372, 8372),
+ Box(8373, 8373),
+ Box(8374, 8374),
+ Box(8375, 8375),
+ Box(8376, 8376),
+ Box(8377, 8377),
+ Box(8378, 8378),
+ Box(8379, 8379),
+ Box(8380, 8380),
+ Box(8381, 8381),
+ Box(8382, 8382),
+ Box(8383, 8383),
+ Box(8384, 8384),
+ Box(8385, 8385),
+ Box(8386, 8386),
+ Box(8387, 8387),
+ Box(8388, 8388),
+ Box(8389, 8389),
+ Box(8390, 8390),
+ Box(8391, 8391),
+ Box(8392, 8392),
+ Box(8393, 8393),
+ Box(8394, 8394),
+ Box(8395, 8395),
+ Box(8396, 8396),
+ Box(8397, 8397),
+ Box(8398, 8398),
+ Box(8399, 8399),
+ Box(8400, 8400),
+ Box(8401, 8401),
+ Box(8402, 8402),
+ Box(8403, 8403),
+ Box(8404, 8404),
+ Box(8405, 8405),
+ Box(8406, 8406),
+ Box(8407, 8407),
+ Box(8408, 8408),
+ Box(8409, 8409),
+ Box(8410, 8410),
+ Box(8411, 8411),
+ Box(8412, 8412),
+ Box(8413, 8413),
+ Box(8414, 8414),
+ Box(8415, 8415),
+ Box(8416, 8416),
+ Box(8417, 8417),
+ Box(8418, 8418),
+ Box(8419, 8419),
+ Box(8420, 8420),
+ Box(8421, 8421),
+ Box(8422, 8422),
+ Box(8423, 8423),
+ Box(8424, 8424),
+ Box(8425, 8425),
+ Box(8426, 8426),
+ Box(8427, 8427),
+ Box(8428, 8428),
+ Box(8429, 8429),
+ Box(8430, 8430),
+ Box(8431, 8431),
+ Box(8432, 8432),
+ Box(8433, 8433),
+ Box(8434, 8434),
+ Box(8435, 8435),
+ Box(8436, 8436),
+ Box(8437, 8437),
+ Box(8438, 8438),
+ Box(8439, 8439),
+ Box(8440, 8440),
+ Box(8441, 8441),
+ Box(8442, 8442),
+ Box(8443, 8443),
+ Box(8444, 8444),
+ Box(8445, 8445),
+ Box(8446, 8446),
+ Box(8447, 8447),
+ Box(8448, 8448),
+ Box(8449, 8449),
+ Box(8450, 8450),
+ Box(8451, 8451),
+ Box(8452, 8452),
+ Box(8453, 8453),
+ Box(8454, 8454),
+ Box(8455, 8455),
+ Box(8456, 8456),
+ Box(8457, 8457),
+ Box(8458, 8458),
+ Box(8459, 8459),
+ Box(8460, 8460),
+ Box(8461, 8461),
+ Box(8462, 8462),
+ Box(8463, 8463),
+ Box(8464, 8464),
+ Box(8465, 8465),
+ Box(8466, 8466),
+ Box(8467, 8467),
+ Box(8468, 8468),
+ Box(8469, 8469),
+ Box(8470, 8470),
+ Box(8471, 8471),
+ Box(8472, 8472),
+ Box(8473, 8473),
+ Box(8474, 8474),
+ Box(8475, 8475),
+ Box(8476, 8476),
+ Box(8477, 8477),
+ Box(8478, 8478),
+ Box(8479, 8479),
+ Box(8480, 8480),
+ Box(8481, 8481),
+ Box(8482, 8482),
+ Box(8483, 8483),
+ Box(8484, 8484),
+ Box(8485, 8485),
+ Box(8486, 8486),
+ Box(8487, 8487),
+ Box(8488, 8488),
+ Box(8489, 8489),
+ Box(8490, 8490),
+ Box(8491, 8491),
+ Box(8492, 8492),
+ Box(8493, 8493),
+ Box(8494, 8494),
+ Box(8495, 8495),
+ Box(8496, 8496),
+ Box(8497, 8497),
+ Box(8498, 8498),
+ Box(8499, 8499),
+ Box(8500, 8500),
+ Box(8501, 8501),
+ Box(8502, 8502),
+ Box(8503, 8503),
+ Box(8504, 8504),
+ Box(8505, 8505),
+ Box(8506, 8506),
+ Box(8507, 8507),
+ Box(8508, 8508),
+ Box(8509, 8509),
+ Box(8510, 8510),
+ Box(8511, 8511),
+ Box(8512, 8512),
+ Box(8513, 8513),
+ Box(8514, 8514),
+ Box(8515, 8515),
+ Box(8516, 8516),
+ Box(8517, 8517),
+ Box(8518, 8518),
+ Box(8519, 8519),
+ Box(8520, 8520),
+ Box(8521, 8521),
+ Box(8522, 8522),
+ Box(8523, 8523),
+ Box(8524, 8524),
+ Box(8525, 8525),
+ Box(8526, 8526),
+ Box(8527, 8527),
+ Box(8528, 8528),
+ Box(8529, 8529),
+ Box(8530, 8530),
+ Box(8531, 8531),
+ Box(8532, 8532),
+ Box(8533, 8533),
+ Box(8534, 8534),
+ Box(8535, 8535),
+ Box(8536, 8536),
+ Box(8537, 8537),
+ Box(8538, 8538),
+ Box(8539, 8539),
+ Box(8540, 8540),
+ Box(8541, 8541),
+ Box(8542, 8542),
+ Box(8543, 8543),
+ Box(8544, 8544),
+ Box(8545, 8545),
+ Box(8546, 8546),
+ Box(8547, 8547),
+ Box(8548, 8548),
+ Box(8549, 8549),
+ Box(8550, 8550),
+ Box(8551, 8551),
+ Box(8552, 8552),
+ Box(8553, 8553),
+ Box(8554, 8554),
+ Box(8555, 8555),
+ Box(8556, 8556),
+ Box(8557, 8557),
+ Box(8558, 8558),
+ Box(8559, 8559),
+ Box(8560, 8560),
+ Box(8561, 8561),
+ Box(8562, 8562),
+ Box(8563, 8563),
+ Box(8564, 8564),
+ Box(8565, 8565),
+ Box(8566, 8566),
+ Box(8567, 8567),
+ Box(8568, 8568),
+ Box(8569, 8569),
+ Box(8570, 8570),
+ Box(8571, 8571),
+ Box(8572, 8572),
+ Box(8573, 8573),
+ Box(8574, 8574),
+ Box(8575, 8575),
+ Box(8576, 8576),
+ Box(8577, 8577),
+ Box(8578, 8578),
+ Box(8579, 8579),
+ Box(8580, 8580),
+ Box(8581, 8581),
+ Box(8582, 8582),
+ Box(8583, 8583),
+ Box(8584, 8584),
+ Box(8585, 8585),
+ Box(8586, 8586),
+ Box(8587, 8587),
+ Box(8588, 8588),
+ Box(8589, 8589),
+ Box(8590, 8590),
+ Box(8591, 8591),
+ Box(8592, 8592),
+ Box(8593, 8593),
+ Box(8594, 8594),
+ Box(8595, 8595),
+ Box(8596, 8596),
+ Box(8597, 8597),
+ Box(8598, 8598),
+ Box(8599, 8599),
+ Box(8600, 8600),
+ Box(8601, 8601),
+ Box(8602, 8602),
+ Box(8603, 8603),
+ Box(8604, 8604),
+ Box(8605, 8605),
+ Box(8606, 8606),
+ Box(8607, 8607),
+ Box(8608, 8608),
+ Box(8609, 8609),
+ Box(8610, 8610),
+ Box(8611, 8611),
+ Box(8612, 8612),
+ Box(8613, 8613),
+ Box(8614, 8614),
+ Box(8615, 8615),
+ Box(8616, 8616),
+ Box(8617, 8617),
+ Box(8618, 8618),
+ Box(8619, 8619),
+ Box(8620, 8620),
+ Box(8621, 8621),
+ Box(8622, 8622),
+ Box(8623, 8623),
+ Box(8624, 8624),
+ Box(8625, 8625),
+ Box(8626, 8626),
+ Box(8627, 8627),
+ Box(8628, 8628),
+ Box(8629, 8629),
+ Box(8630, 8630),
+ Box(8631, 8631),
+ Box(8632, 8632),
+ Box(8633, 8633),
+ Box(8634, 8634),
+ Box(8635, 8635),
+ Box(8636, 8636),
+ Box(8637, 8637),
+ Box(8638, 8638),
+ Box(8639, 8639),
+ Box(8640, 8640),
+ Box(8641, 8641),
+ Box(8642, 8642),
+ Box(8643, 8643),
+ Box(8644, 8644),
+ Box(8645, 8645),
+ Box(8646, 8646),
+ Box(8647, 8647),
+ Box(8648, 8648),
+ Box(8649, 8649),
+ Box(8650, 8650),
+ Box(8651, 8651),
+ Box(8652, 8652),
+ Box(8653, 8653),
+ Box(8654, 8654),
+ Box(8655, 8655),
+ Box(8656, 8656),
+ Box(8657, 8657),
+ Box(8658, 8658),
+ Box(8659, 8659),
+ Box(8660, 8660),
+ Box(8661, 8661),
+ Box(8662, 8662),
+ Box(8663, 8663),
+ Box(8664, 8664),
+ Box(8665, 8665),
+ Box(8666, 8666),
+ Box(8667, 8667),
+ Box(8668, 8668),
+ Box(8669, 8669),
+ Box(8670, 8670),
+ Box(8671, 8671),
+ Box(8672, 8672),
+ Box(8673, 8673),
+ Box(8674, 8674),
+ Box(8675, 8675),
+ Box(8676, 8676),
+ Box(8677, 8677),
+ Box(8678, 8678),
+ Box(8679, 8679),
+ Box(8680, 8680),
+ Box(8681, 8681),
+ Box(8682, 8682),
+ Box(8683, 8683),
+ Box(8684, 8684),
+ Box(8685, 8685),
+ Box(8686, 8686),
+ Box(8687, 8687),
+ Box(8688, 8688),
+ Box(8689, 8689),
+ Box(8690, 8690),
+ Box(8691, 8691),
+ Box(8692, 8692),
+ Box(8693, 8693),
+ Box(8694, 8694),
+ Box(8695, 8695),
+ Box(8696, 8696),
+ Box(8697, 8697),
+ Box(8698, 8698),
+ Box(8699, 8699),
+ Box(8700, 8700),
+ Box(8701, 8701),
+ Box(8702, 8702),
+ Box(8703, 8703),
+ Box(8704, 8704),
+ Box(8705, 8705),
+ Box(8706, 8706),
+ Box(8707, 8707),
+ Box(8708, 8708),
+ Box(8709, 8709),
+ Box(8710, 8710),
+ Box(8711, 8711),
+ Box(8712, 8712),
+ Box(8713, 8713),
+ Box(8714, 8714),
+ Box(8715, 8715),
+ Box(8716, 8716),
+ Box(8717, 8717),
+ Box(8718, 8718),
+ Box(8719, 8719),
+ Box(8720, 8720),
+ Box(8721, 8721),
+ Box(8722, 8722),
+ Box(8723, 8723),
+ Box(8724, 8724),
+ Box(8725, 8725),
+ Box(8726, 8726),
+ Box(8727, 8727),
+ Box(8728, 8728),
+ Box(8729, 8729),
+ Box(8730, 8730),
+ Box(8731, 8731),
+ Box(8732, 8732),
+ Box(8733, 8733),
+ Box(8734, 8734),
+ Box(8735, 8735),
+ Box(8736, 8736),
+ Box(8737, 8737),
+ Box(8738, 8738),
+ Box(8739, 8739),
+ Box(8740, 8740),
+ Box(8741, 8741),
+ Box(8742, 8742),
+ Box(8743, 8743),
+ Box(8744, 8744),
+ Box(8745, 8745),
+ Box(8746, 8746),
+ Box(8747, 8747),
+ Box(8748, 8748),
+ Box(8749, 8749),
+ Box(8750, 8750),
+ Box(8751, 8751),
+ Box(8752, 8752),
+ Box(8753, 8753),
+ Box(8754, 8754),
+ Box(8755, 8755),
+ Box(8756, 8756),
+ Box(8757, 8757),
+ Box(8758, 8758),
+ Box(8759, 8759),
+ Box(8760, 8760),
+ Box(8761, 8761),
+ Box(8762, 8762),
+ Box(8763, 8763),
+ Box(8764, 8764),
+ Box(8765, 8765),
+ Box(8766, 8766),
+ Box(8767, 8767),
+ Box(8768, 8768),
+ Box(8769, 8769),
+ Box(8770, 8770),
+ Box(8771, 8771),
+ Box(8772, 8772),
+ Box(8773, 8773),
+ Box(8774, 8774),
+ Box(8775, 8775),
+ Box(8776, 8776),
+ Box(8777, 8777),
+ Box(8778, 8778),
+ Box(8779, 8779),
+ Box(8780, 8780),
+ Box(8781, 8781),
+ Box(8782, 8782),
+ Box(8783, 8783),
+ Box(8784, 8784),
+ Box(8785, 8785),
+ Box(8786, 8786),
+ Box(8787, 8787),
+ Box(8788, 8788),
+ Box(8789, 8789),
+ Box(8790, 8790),
+ Box(8791, 8791),
+ Box(8792, 8792),
+ Box(8793, 8793),
+ Box(8794, 8794),
+ Box(8795, 8795),
+ Box(8796, 8796),
+ Box(8797, 8797),
+ Box(8798, 8798),
+ Box(8799, 8799),
+ Box(8800, 8800),
+ Box(8801, 8801),
+ Box(8802, 8802),
+ Box(8803, 8803),
+ Box(8804, 8804),
+ Box(8805, 8805),
+ Box(8806, 8806),
+ Box(8807, 8807),
+ Box(8808, 8808),
+ Box(8809, 8809),
+ Box(8810, 8810),
+ Box(8811, 8811),
+ Box(8812, 8812),
+ Box(8813, 8813),
+ Box(8814, 8814),
+ Box(8815, 8815),
+ Box(8816, 8816),
+ Box(8817, 8817),
+ Box(8818, 8818),
+ Box(8819, 8819),
+ Box(8820, 8820),
+ Box(8821, 8821),
+ Box(8822, 8822),
+ Box(8823, 8823),
+ Box(8824, 8824),
+ Box(8825, 8825),
+ Box(8826, 8826),
+ Box(8827, 8827),
+ Box(8828, 8828),
+ Box(8829, 8829),
+ Box(8830, 8830),
+ Box(8831, 8831),
+ Box(8832, 8832),
+ Box(8833, 8833),
+ Box(8834, 8834),
+ Box(8835, 8835),
+ Box(8836, 8836),
+ Box(8837, 8837),
+ Box(8838, 8838),
+ Box(8839, 8839),
+ Box(8840, 8840),
+ Box(8841, 8841),
+ Box(8842, 8842),
+ Box(8843, 8843),
+ Box(8844, 8844),
+ Box(8845, 8845),
+ Box(8846, 8846),
+ Box(8847, 8847),
+ Box(8848, 8848),
+ Box(8849, 8849),
+ Box(8850, 8850),
+ Box(8851, 8851),
+ Box(8852, 8852),
+ Box(8853, 8853),
+ Box(8854, 8854),
+ Box(8855, 8855),
+ Box(8856, 8856),
+ Box(8857, 8857),
+ Box(8858, 8858),
+ Box(8859, 8859),
+ Box(8860, 8860),
+ Box(8861, 8861),
+ Box(8862, 8862),
+ Box(8863, 8863),
+ Box(8864, 8864),
+ Box(8865, 8865),
+ Box(8866, 8866),
+ Box(8867, 8867),
+ Box(8868, 8868),
+ Box(8869, 8869),
+ Box(8870, 8870),
+ Box(8871, 8871),
+ Box(8872, 8872),
+ Box(8873, 8873),
+ Box(8874, 8874),
+ Box(8875, 8875),
+ Box(8876, 8876),
+ Box(8877, 8877),
+ Box(8878, 8878),
+ Box(8879, 8879),
+ Box(8880, 8880),
+ Box(8881, 8881),
+ Box(8882, 8882),
+ Box(8883, 8883),
+ Box(8884, 8884),
+ Box(8885, 8885),
+ Box(8886, 8886),
+ Box(8887, 8887),
+ Box(8888, 8888),
+ Box(8889, 8889),
+ Box(8890, 8890),
+ Box(8891, 8891),
+ Box(8892, 8892),
+ Box(8893, 8893),
+ Box(8894, 8894),
+ Box(8895, 8895),
+ Box(8896, 8896),
+ Box(8897, 8897),
+ Box(8898, 8898),
+ Box(8899, 8899),
+ Box(8900, 8900),
+ Box(8901, 8901),
+ Box(8902, 8902),
+ Box(8903, 8903),
+ Box(8904, 8904),
+ Box(8905, 8905),
+ Box(8906, 8906),
+ Box(8907, 8907),
+ Box(8908, 8908),
+ Box(8909, 8909),
+ Box(8910, 8910),
+ Box(8911, 8911),
+ Box(8912, 8912),
+ Box(8913, 8913),
+ Box(8914, 8914),
+ Box(8915, 8915),
+ Box(8916, 8916),
+ Box(8917, 8917),
+ Box(8918, 8918),
+ Box(8919, 8919),
+ Box(8920, 8920),
+ Box(8921, 8921),
+ Box(8922, 8922),
+ Box(8923, 8923),
+ Box(8924, 8924),
+ Box(8925, 8925),
+ Box(8926, 8926),
+ Box(8927, 8927),
+ Box(8928, 8928),
+ Box(8929, 8929),
+ Box(8930, 8930),
+ Box(8931, 8931),
+ Box(8932, 8932),
+ Box(8933, 8933),
+ Box(8934, 8934),
+ Box(8935, 8935),
+ Box(8936, 8936),
+ Box(8937, 8937),
+ Box(8938, 8938),
+ Box(8939, 8939),
+ Box(8940, 8940),
+ Box(8941, 8941),
+ Box(8942, 8942),
+ Box(8943, 8943),
+ Box(8944, 8944),
+ Box(8945, 8945),
+ Box(8946, 8946),
+ Box(8947, 8947),
+ Box(8948, 8948),
+ Box(8949, 8949),
+ Box(8950, 8950),
+ Box(8951, 8951),
+ Box(8952, 8952),
+ Box(8953, 8953),
+ Box(8954, 8954),
+ Box(8955, 8955),
+ Box(8956, 8956),
+ Box(8957, 8957),
+ Box(8958, 8958),
+ Box(8959, 8959),
+ Box(8960, 8960),
+ Box(8961, 8961),
+ Box(8962, 8962),
+ Box(8963, 8963),
+ Box(8964, 8964),
+ Box(8965, 8965),
+ Box(8966, 8966),
+ Box(8967, 8967),
+ Box(8968, 8968),
+ Box(8969, 8969),
+ Box(8970, 8970),
+ Box(8971, 8971),
+ Box(8972, 8972),
+ Box(8973, 8973),
+ Box(8974, 8974),
+ Box(8975, 8975),
+ Box(8976, 8976),
+ Box(8977, 8977),
+ Box(8978, 8978),
+ Box(8979, 8979),
+ Box(8980, 8980),
+ Box(8981, 8981),
+ Box(8982, 8982),
+ Box(8983, 8983),
+ Box(8984, 8984),
+ Box(8985, 8985),
+ Box(8986, 8986),
+ Box(8987, 8987),
+ Box(8988, 8988),
+ Box(8989, 8989),
+ Box(8990, 8990),
+ Box(8991, 8991),
+ Box(8992, 8992),
+ Box(8993, 8993),
+ Box(8994, 8994),
+ Box(8995, 8995),
+ Box(8996, 8996),
+ Box(8997, 8997),
+ Box(8998, 8998),
+ Box(8999, 8999),
+ Box(9000, 9000),
+ Box(9001, 9001),
+ Box(9002, 9002),
+ Box(9003, 9003),
+ Box(9004, 9004),
+ Box(9005, 9005),
+ Box(9006, 9006),
+ Box(9007, 9007),
+ Box(9008, 9008),
+ Box(9009, 9009),
+ Box(9010, 9010),
+ Box(9011, 9011),
+ Box(9012, 9012),
+ Box(9013, 9013),
+ Box(9014, 9014),
+ Box(9015, 9015),
+ Box(9016, 9016),
+ Box(9017, 9017),
+ Box(9018, 9018),
+ Box(9019, 9019),
+ Box(9020, 9020),
+ Box(9021, 9021),
+ Box(9022, 9022),
+ Box(9023, 9023),
+ Box(9024, 9024),
+ Box(9025, 9025),
+ Box(9026, 9026),
+ Box(9027, 9027),
+ Box(9028, 9028),
+ Box(9029, 9029),
+ Box(9030, 9030),
+ Box(9031, 9031),
+ Box(9032, 9032),
+ Box(9033, 9033),
+ Box(9034, 9034),
+ Box(9035, 9035),
+ Box(9036, 9036),
+ Box(9037, 9037),
+ Box(9038, 9038),
+ Box(9039, 9039),
+ Box(9040, 9040),
+ Box(9041, 9041),
+ Box(9042, 9042),
+ Box(9043, 9043),
+ Box(9044, 9044),
+ Box(9045, 9045),
+ Box(9046, 9046),
+ Box(9047, 9047),
+ Box(9048, 9048),
+ Box(9049, 9049),
+ Box(9050, 9050),
+ Box(9051, 9051),
+ Box(9052, 9052),
+ Box(9053, 9053),
+ Box(9054, 9054),
+ Box(9055, 9055),
+ Box(9056, 9056),
+ Box(9057, 9057),
+ Box(9058, 9058),
+ Box(9059, 9059),
+ Box(9060, 9060),
+ Box(9061, 9061),
+ Box(9062, 9062),
+ Box(9063, 9063),
+ Box(9064, 9064),
+ Box(9065, 9065),
+ Box(9066, 9066),
+ Box(9067, 9067),
+ Box(9068, 9068),
+ Box(9069, 9069),
+ Box(9070, 9070),
+ Box(9071, 9071),
+ Box(9072, 9072),
+ Box(9073, 9073),
+ Box(9074, 9074),
+ Box(9075, 9075),
+ Box(9076, 9076),
+ Box(9077, 9077),
+ Box(9078, 9078),
+ Box(9079, 9079),
+ Box(9080, 9080),
+ Box(9081, 9081),
+ Box(9082, 9082),
+ Box(9083, 9083),
+ Box(9084, 9084),
+ Box(9085, 9085),
+ Box(9086, 9086),
+ Box(9087, 9087),
+ Box(9088, 9088),
+ Box(9089, 9089),
+ Box(9090, 9090),
+ Box(9091, 9091),
+ Box(9092, 9092),
+ Box(9093, 9093),
+ Box(9094, 9094),
+ Box(9095, 9095),
+ Box(9096, 9096),
+ Box(9097, 9097),
+ Box(9098, 9098),
+ Box(9099, 9099),
+ Box(9100, 9100),
+ Box(9101, 9101),
+ Box(9102, 9102),
+ Box(9103, 9103),
+ Box(9104, 9104),
+ Box(9105, 9105),
+ Box(9106, 9106),
+ Box(9107, 9107),
+ Box(9108, 9108),
+ Box(9109, 9109),
+ Box(9110, 9110),
+ Box(9111, 9111),
+ Box(9112, 9112),
+ Box(9113, 9113),
+ Box(9114, 9114),
+ Box(9115, 9115),
+ Box(9116, 9116),
+ Box(9117, 9117),
+ Box(9118, 9118),
+ Box(9119, 9119),
+ Box(9120, 9120),
+ Box(9121, 9121),
+ Box(9122, 9122),
+ Box(9123, 9123),
+ Box(9124, 9124),
+ Box(9125, 9125),
+ Box(9126, 9126),
+ Box(9127, 9127),
+ Box(9128, 9128),
+ Box(9129, 9129),
+ Box(9130, 9130),
+ Box(9131, 9131),
+ Box(9132, 9132),
+ Box(9133, 9133),
+ Box(9134, 9134),
+ Box(9135, 9135),
+ Box(9136, 9136),
+ Box(9137, 9137),
+ Box(9138, 9138),
+ Box(9139, 9139),
+ Box(9140, 9140),
+ Box(9141, 9141),
+ Box(9142, 9142),
+ Box(9143, 9143),
+ Box(9144, 9144),
+ Box(9145, 9145),
+ Box(9146, 9146),
+ Box(9147, 9147),
+ Box(9148, 9148),
+ Box(9149, 9149),
+ Box(9150, 9150),
+ Box(9151, 9151),
+ Box(9152, 9152),
+ Box(9153, 9153),
+ Box(9154, 9154),
+ Box(9155, 9155),
+ Box(9156, 9156),
+ Box(9157, 9157),
+ Box(9158, 9158),
+ Box(9159, 9159),
+ Box(9160, 9160),
+ Box(9161, 9161),
+ Box(9162, 9162),
+ Box(9163, 9163),
+ Box(9164, 9164),
+ Box(9165, 9165),
+ Box(9166, 9166),
+ Box(9167, 9167),
+ Box(9168, 9168),
+ Box(9169, 9169),
+ Box(9170, 9170),
+ Box(9171, 9171),
+ Box(9172, 9172),
+ Box(9173, 9173),
+ Box(9174, 9174),
+ Box(9175, 9175),
+ Box(9176, 9176),
+ Box(9177, 9177),
+ Box(9178, 9178),
+ Box(9179, 9179),
+ Box(9180, 9180),
+ Box(9181, 9181),
+ Box(9182, 9182),
+ Box(9183, 9183),
+ Box(9184, 9184),
+ Box(9185, 9185),
+ Box(9186, 9186),
+ Box(9187, 9187),
+ Box(9188, 9188),
+ Box(9189, 9189),
+ Box(9190, 9190),
+ Box(9191, 9191),
+ Box(9192, 9192),
+ Box(9193, 9193),
+ Box(9194, 9194),
+ Box(9195, 9195),
+ Box(9196, 9196),
+ Box(9197, 9197),
+ Box(9198, 9198),
+ Box(9199, 9199),
+ Box(9200, 9200),
+ Box(9201, 9201),
+ Box(9202, 9202),
+ Box(9203, 9203),
+ Box(9204, 9204),
+ Box(9205, 9205),
+ Box(9206, 9206),
+ Box(9207, 9207),
+ Box(9208, 9208),
+ Box(9209, 9209),
+ Box(9210, 9210),
+ Box(9211, 9211),
+ Box(9212, 9212),
+ Box(9213, 9213),
+ Box(9214, 9214),
+ Box(9215, 9215),
+ Box(9216, 9216),
+ Box(9217, 9217),
+ Box(9218, 9218),
+ Box(9219, 9219),
+ Box(9220, 9220),
+ Box(9221, 9221),
+ Box(9222, 9222),
+ Box(9223, 9223),
+ Box(9224, 9224),
+ Box(9225, 9225),
+ Box(9226, 9226),
+ Box(9227, 9227),
+ Box(9228, 9228),
+ Box(9229, 9229),
+ Box(9230, 9230),
+ Box(9231, 9231),
+ Box(9232, 9232),
+ Box(9233, 9233),
+ Box(9234, 9234),
+ Box(9235, 9235),
+ Box(9236, 9236),
+ Box(9237, 9237),
+ Box(9238, 9238),
+ Box(9239, 9239),
+ Box(9240, 9240),
+ Box(9241, 9241),
+ Box(9242, 9242),
+ Box(9243, 9243),
+ Box(9244, 9244),
+ Box(9245, 9245),
+ Box(9246, 9246),
+ Box(9247, 9247),
+ Box(9248, 9248),
+ Box(9249, 9249),
+ Box(9250, 9250),
+ Box(9251, 9251),
+ Box(9252, 9252),
+ Box(9253, 9253),
+ Box(9254, 9254),
+ Box(9255, 9255),
+ Box(9256, 9256),
+ Box(9257, 9257),
+ Box(9258, 9258),
+ Box(9259, 9259),
+ Box(9260, 9260),
+ Box(9261, 9261),
+ Box(9262, 9262),
+ Box(9263, 9263),
+ Box(9264, 9264),
+ Box(9265, 9265),
+ Box(9266, 9266),
+ Box(9267, 9267),
+ Box(9268, 9268),
+ Box(9269, 9269),
+ Box(9270, 9270),
+ Box(9271, 9271),
+ Box(9272, 9272),
+ Box(9273, 9273),
+ Box(9274, 9274),
+ Box(9275, 9275),
+ Box(9276, 9276),
+ Box(9277, 9277),
+ Box(9278, 9278),
+ Box(9279, 9279),
+ Box(9280, 9280),
+ Box(9281, 9281),
+ Box(9282, 9282),
+ Box(9283, 9283),
+ Box(9284, 9284),
+ Box(9285, 9285),
+ Box(9286, 9286),
+ Box(9287, 9287),
+ Box(9288, 9288),
+ Box(9289, 9289),
+ Box(9290, 9290),
+ Box(9291, 9291),
+ Box(9292, 9292),
+ Box(9293, 9293),
+ Box(9294, 9294),
+ Box(9295, 9295),
+ Box(9296, 9296),
+ Box(9297, 9297),
+ Box(9298, 9298),
+ Box(9299, 9299),
+ Box(9300, 9300),
+ Box(9301, 9301),
+ Box(9302, 9302),
+ Box(9303, 9303),
+ Box(9304, 9304),
+ Box(9305, 9305),
+ Box(9306, 9306),
+ Box(9307, 9307),
+ Box(9308, 9308),
+ Box(9309, 9309),
+ Box(9310, 9310),
+ Box(9311, 9311),
+ Box(9312, 9312),
+ Box(9313, 9313),
+ Box(9314, 9314),
+ Box(9315, 9315),
+ Box(9316, 9316),
+ Box(9317, 9317),
+ Box(9318, 9318),
+ Box(9319, 9319),
+ Box(9320, 9320),
+ Box(9321, 9321),
+ Box(9322, 9322),
+ Box(9323, 9323),
+ Box(9324, 9324),
+ Box(9325, 9325),
+ Box(9326, 9326),
+ Box(9327, 9327),
+ Box(9328, 9328),
+ Box(9329, 9329),
+ Box(9330, 9330),
+ Box(9331, 9331),
+ Box(9332, 9332),
+ Box(9333, 9333),
+ Box(9334, 9334),
+ Box(9335, 9335),
+ Box(9336, 9336),
+ Box(9337, 9337),
+ Box(9338, 9338),
+ Box(9339, 9339),
+ Box(9340, 9340),
+ Box(9341, 9341),
+ Box(9342, 9342),
+ Box(9343, 9343),
+ Box(9344, 9344),
+ Box(9345, 9345),
+ Box(9346, 9346),
+ Box(9347, 9347),
+ Box(9348, 9348),
+ Box(9349, 9349),
+ Box(9350, 9350),
+ Box(9351, 9351),
+ Box(9352, 9352),
+ Box(9353, 9353),
+ Box(9354, 9354),
+ Box(9355, 9355),
+ Box(9356, 9356),
+ Box(9357, 9357),
+ Box(9358, 9358),
+ Box(9359, 9359),
+ Box(9360, 9360),
+ Box(9361, 9361),
+ Box(9362, 9362),
+ Box(9363, 9363),
+ Box(9364, 9364),
+ Box(9365, 9365),
+ Box(9366, 9366),
+ Box(9367, 9367),
+ Box(9368, 9368),
+ Box(9369, 9369),
+ Box(9370, 9370),
+ Box(9371, 9371),
+ Box(9372, 9372),
+ Box(9373, 9373),
+ Box(9374, 9374),
+ Box(9375, 9375),
+ Box(9376, 9376),
+ Box(9377, 9377),
+ Box(9378, 9378),
+ Box(9379, 9379),
+ Box(9380, 9380),
+ Box(9381, 9381),
+ Box(9382, 9382),
+ Box(9383, 9383),
+ Box(9384, 9384),
+ Box(9385, 9385),
+ Box(9386, 9386),
+ Box(9387, 9387),
+ Box(9388, 9388),
+ Box(9389, 9389),
+ Box(9390, 9390),
+ Box(9391, 9391),
+ Box(9392, 9392),
+ Box(9393, 9393),
+ Box(9394, 9394),
+ Box(9395, 9395),
+ Box(9396, 9396),
+ Box(9397, 9397),
+ Box(9398, 9398),
+ Box(9399, 9399),
+ Box(9400, 9400),
+ Box(9401, 9401),
+ Box(9402, 9402),
+ Box(9403, 9403),
+ Box(9404, 9404),
+ Box(9405, 9405),
+ Box(9406, 9406),
+ Box(9407, 9407),
+ Box(9408, 9408),
+ Box(9409, 9409),
+ Box(9410, 9410),
+ Box(9411, 9411),
+ Box(9412, 9412),
+ Box(9413, 9413),
+ Box(9414, 9414),
+ Box(9415, 9415),
+ Box(9416, 9416),
+ Box(9417, 9417),
+ Box(9418, 9418),
+ Box(9419, 9419),
+ Box(9420, 9420),
+ Box(9421, 9421),
+ Box(9422, 9422),
+ Box(9423, 9423),
+ Box(9424, 9424),
+ Box(9425, 9425),
+ Box(9426, 9426),
+ Box(9427, 9427),
+ Box(9428, 9428),
+ Box(9429, 9429),
+ Box(9430, 9430),
+ Box(9431, 9431),
+ Box(9432, 9432),
+ Box(9433, 9433),
+ Box(9434, 9434),
+ Box(9435, 9435),
+ Box(9436, 9436),
+ Box(9437, 9437),
+ Box(9438, 9438),
+ Box(9439, 9439),
+ Box(9440, 9440),
+ Box(9441, 9441),
+ Box(9442, 9442),
+ Box(9443, 9443),
+ Box(9444, 9444),
+ Box(9445, 9445),
+ Box(9446, 9446),
+ Box(9447, 9447),
+ Box(9448, 9448),
+ Box(9449, 9449),
+ Box(9450, 9450),
+ Box(9451, 9451),
+ Box(9452, 9452),
+ Box(9453, 9453),
+ Box(9454, 9454),
+ Box(9455, 9455),
+ Box(9456, 9456),
+ Box(9457, 9457),
+ Box(9458, 9458),
+ Box(9459, 9459),
+ Box(9460, 9460),
+ Box(9461, 9461),
+ Box(9462, 9462),
+ Box(9463, 9463),
+ Box(9464, 9464),
+ Box(9465, 9465),
+ Box(9466, 9466),
+ Box(9467, 9467),
+ Box(9468, 9468),
+ Box(9469, 9469),
+ Box(9470, 9470),
+ Box(9471, 9471),
+ Box(9472, 9472),
+ Box(9473, 9473),
+ Box(9474, 9474),
+ Box(9475, 9475),
+ Box(9476, 9476),
+ Box(9477, 9477),
+ Box(9478, 9478),
+ Box(9479, 9479),
+ Box(9480, 9480),
+ Box(9481, 9481),
+ Box(9482, 9482),
+ Box(9483, 9483),
+ Box(9484, 9484),
+ Box(9485, 9485),
+ Box(9486, 9486),
+ Box(9487, 9487),
+ Box(9488, 9488),
+ Box(9489, 9489),
+ Box(9490, 9490),
+ Box(9491, 9491),
+ Box(9492, 9492),
+ Box(9493, 9493),
+ Box(9494, 9494),
+ Box(9495, 9495),
+ Box(9496, 9496),
+ Box(9497, 9497),
+ Box(9498, 9498),
+ Box(9499, 9499),
+ Box(9500, 9500),
+ Box(9501, 9501),
+ Box(9502, 9502),
+ Box(9503, 9503),
+ Box(9504, 9504),
+ Box(9505, 9505),
+ Box(9506, 9506),
+ Box(9507, 9507),
+ Box(9508, 9508),
+ Box(9509, 9509),
+ Box(9510, 9510),
+ Box(9511, 9511),
+ Box(9512, 9512),
+ Box(9513, 9513),
+ Box(9514, 9514),
+ Box(9515, 9515),
+ Box(9516, 9516),
+ Box(9517, 9517),
+ Box(9518, 9518),
+ Box(9519, 9519),
+ Box(9520, 9520),
+ Box(9521, 9521),
+ Box(9522, 9522),
+ Box(9523, 9523),
+ Box(9524, 9524),
+ Box(9525, 9525),
+ Box(9526, 9526),
+ Box(9527, 9527),
+ Box(9528, 9528),
+ Box(9529, 9529),
+ Box(9530, 9530),
+ Box(9531, 9531),
+ Box(9532, 9532),
+ Box(9533, 9533),
+ Box(9534, 9534),
+ Box(9535, 9535),
+ Box(9536, 9536),
+ Box(9537, 9537),
+ Box(9538, 9538),
+ Box(9539, 9539),
+ Box(9540, 9540),
+ Box(9541, 9541),
+ Box(9542, 9542),
+ Box(9543, 9543),
+ Box(9544, 9544),
+ Box(9545, 9545),
+ Box(9546, 9546),
+ Box(9547, 9547),
+ Box(9548, 9548),
+ Box(9549, 9549),
+ Box(9550, 9550),
+ Box(9551, 9551),
+ Box(9552, 9552),
+ Box(9553, 9553),
+ Box(9554, 9554),
+ Box(9555, 9555),
+ Box(9556, 9556),
+ Box(9557, 9557),
+ Box(9558, 9558),
+ Box(9559, 9559),
+ Box(9560, 9560),
+ Box(9561, 9561),
+ Box(9562, 9562),
+ Box(9563, 9563),
+ Box(9564, 9564),
+ Box(9565, 9565),
+ Box(9566, 9566),
+ Box(9567, 9567),
+ Box(9568, 9568),
+ Box(9569, 9569),
+ Box(9570, 9570),
+ Box(9571, 9571),
+ Box(9572, 9572),
+ Box(9573, 9573),
+ Box(9574, 9574),
+ Box(9575, 9575),
+ Box(9576, 9576),
+ Box(9577, 9577),
+ Box(9578, 9578),
+ Box(9579, 9579),
+ Box(9580, 9580),
+ Box(9581, 9581),
+ Box(9582, 9582),
+ Box(9583, 9583),
+ Box(9584, 9584),
+ Box(9585, 9585),
+ Box(9586, 9586),
+ Box(9587, 9587),
+ Box(9588, 9588),
+ Box(9589, 9589),
+ Box(9590, 9590),
+ Box(9591, 9591),
+ Box(9592, 9592),
+ Box(9593, 9593),
+ Box(9594, 9594),
+ Box(9595, 9595),
+ Box(9596, 9596),
+ Box(9597, 9597),
+ Box(9598, 9598),
+ Box(9599, 9599),
+ Box(9600, 9600),
+ Box(9601, 9601),
+ Box(9602, 9602),
+ Box(9603, 9603),
+ Box(9604, 9604),
+ Box(9605, 9605),
+ Box(9606, 9606),
+ Box(9607, 9607),
+ Box(9608, 9608),
+ Box(9609, 9609),
+ Box(9610, 9610),
+ Box(9611, 9611),
+ Box(9612, 9612),
+ Box(9613, 9613),
+ Box(9614, 9614),
+ Box(9615, 9615),
+ Box(9616, 9616),
+ Box(9617, 9617),
+ Box(9618, 9618),
+ Box(9619, 9619),
+ Box(9620, 9620),
+ Box(9621, 9621),
+ Box(9622, 9622),
+ Box(9623, 9623),
+ Box(9624, 9624),
+ Box(9625, 9625),
+ Box(9626, 9626),
+ Box(9627, 9627),
+ Box(9628, 9628),
+ Box(9629, 9629),
+ Box(9630, 9630),
+ Box(9631, 9631),
+ Box(9632, 9632),
+ Box(9633, 9633),
+ Box(9634, 9634),
+ Box(9635, 9635),
+ Box(9636, 9636),
+ Box(9637, 9637),
+ Box(9638, 9638),
+ Box(9639, 9639),
+ Box(9640, 9640),
+ Box(9641, 9641),
+ Box(9642, 9642),
+ Box(9643, 9643),
+ Box(9644, 9644),
+ Box(9645, 9645),
+ Box(9646, 9646),
+ Box(9647, 9647),
+ Box(9648, 9648),
+ Box(9649, 9649),
+ Box(9650, 9650),
+ Box(9651, 9651),
+ Box(9652, 9652),
+ Box(9653, 9653),
+ Box(9654, 9654),
+ Box(9655, 9655),
+ Box(9656, 9656),
+ Box(9657, 9657),
+ Box(9658, 9658),
+ Box(9659, 9659),
+ Box(9660, 9660),
+ Box(9661, 9661),
+ Box(9662, 9662),
+ Box(9663, 9663),
+ Box(9664, 9664),
+ Box(9665, 9665),
+ Box(9666, 9666),
+ Box(9667, 9667),
+ Box(9668, 9668),
+ Box(9669, 9669),
+ Box(9670, 9670),
+ Box(9671, 9671),
+ Box(9672, 9672),
+ Box(9673, 9673),
+ Box(9674, 9674),
+ Box(9675, 9675),
+ Box(9676, 9676),
+ Box(9677, 9677),
+ Box(9678, 9678),
+ Box(9679, 9679),
+ Box(9680, 9680),
+ Box(9681, 9681),
+ Box(9682, 9682),
+ Box(9683, 9683),
+ Box(9684, 9684),
+ Box(9685, 9685),
+ Box(9686, 9686),
+ Box(9687, 9687),
+ Box(9688, 9688),
+ Box(9689, 9689),
+ Box(9690, 9690),
+ Box(9691, 9691),
+ Box(9692, 9692),
+ Box(9693, 9693),
+ Box(9694, 9694),
+ Box(9695, 9695),
+ Box(9696, 9696),
+ Box(9697, 9697),
+ Box(9698, 9698),
+ Box(9699, 9699),
+ Box(9700, 9700),
+ Box(9701, 9701),
+ Box(9702, 9702),
+ Box(9703, 9703),
+ Box(9704, 9704),
+ Box(9705, 9705),
+ Box(9706, 9706),
+ Box(9707, 9707),
+ Box(9708, 9708),
+ Box(9709, 9709),
+ Box(9710, 9710),
+ Box(9711, 9711),
+ Box(9712, 9712),
+ Box(9713, 9713),
+ Box(9714, 9714),
+ Box(9715, 9715),
+ Box(9716, 9716),
+ Box(9717, 9717),
+ Box(9718, 9718),
+ Box(9719, 9719),
+ Box(9720, 9720),
+ Box(9721, 9721),
+ Box(9722, 9722),
+ Box(9723, 9723),
+ Box(9724, 9724),
+ Box(9725, 9725),
+ Box(9726, 9726),
+ Box(9727, 9727),
+ Box(9728, 9728),
+ Box(9729, 9729),
+ Box(9730, 9730),
+ Box(9731, 9731),
+ Box(9732, 9732),
+ Box(9733, 9733),
+ Box(9734, 9734),
+ Box(9735, 9735),
+ Box(9736, 9736),
+ Box(9737, 9737),
+ Box(9738, 9738),
+ Box(9739, 9739),
+ Box(9740, 9740),
+ Box(9741, 9741),
+ Box(9742, 9742),
+ Box(9743, 9743),
+ Box(9744, 9744),
+ Box(9745, 9745),
+ Box(9746, 9746),
+ Box(9747, 9747),
+ Box(9748, 9748),
+ Box(9749, 9749),
+ Box(9750, 9750),
+ Box(9751, 9751),
+ Box(9752, 9752),
+ Box(9753, 9753),
+ Box(9754, 9754),
+ Box(9755, 9755),
+ Box(9756, 9756),
+ Box(9757, 9757),
+ Box(9758, 9758),
+ Box(9759, 9759),
+ Box(9760, 9760),
+ Box(9761, 9761),
+ Box(9762, 9762),
+ Box(9763, 9763),
+ Box(9764, 9764),
+ Box(9765, 9765),
+ Box(9766, 9766),
+ Box(9767, 9767),
+ Box(9768, 9768),
+ Box(9769, 9769),
+ Box(9770, 9770),
+ Box(9771, 9771),
+ Box(9772, 9772),
+ Box(9773, 9773),
+ Box(9774, 9774),
+ Box(9775, 9775),
+ Box(9776, 9776),
+ Box(9777, 9777),
+ Box(9778, 9778),
+ Box(9779, 9779),
+ Box(9780, 9780),
+ Box(9781, 9781),
+ Box(9782, 9782),
+ Box(9783, 9783),
+ Box(9784, 9784),
+ Box(9785, 9785),
+ Box(9786, 9786),
+ Box(9787, 9787),
+ Box(9788, 9788),
+ Box(9789, 9789),
+ Box(9790, 9790),
+ Box(9791, 9791),
+ Box(9792, 9792),
+ Box(9793, 9793),
+ Box(9794, 9794),
+ Box(9795, 9795),
+ Box(9796, 9796),
+ Box(9797, 9797),
+ Box(9798, 9798),
+ Box(9799, 9799),
+ Box(9800, 9800),
+ Box(9801, 9801),
+ Box(9802, 9802),
+ Box(9803, 9803),
+ Box(9804, 9804),
+ Box(9805, 9805),
+ Box(9806, 9806),
+ Box(9807, 9807),
+ Box(9808, 9808),
+ Box(9809, 9809),
+ Box(9810, 9810),
+ Box(9811, 9811),
+ Box(9812, 9812),
+ Box(9813, 9813),
+ Box(9814, 9814),
+ Box(9815, 9815),
+ Box(9816, 9816),
+ Box(9817, 9817),
+ Box(9818, 9818),
+ Box(9819, 9819),
+ Box(9820, 9820),
+ Box(9821, 9821),
+ Box(9822, 9822),
+ Box(9823, 9823),
+ Box(9824, 9824),
+ Box(9825, 9825),
+ Box(9826, 9826),
+ Box(9827, 9827),
+ Box(9828, 9828),
+ Box(9829, 9829),
+ Box(9830, 9830),
+ Box(9831, 9831),
+ Box(9832, 9832),
+ Box(9833, 9833),
+ Box(9834, 9834),
+ Box(9835, 9835),
+ Box(9836, 9836),
+ Box(9837, 9837),
+ Box(9838, 9838),
+ Box(9839, 9839),
+ Box(9840, 9840),
+ Box(9841, 9841),
+ Box(9842, 9842),
+ Box(9843, 9843),
+ Box(9844, 9844),
+ Box(9845, 9845),
+ Box(9846, 9846),
+ Box(9847, 9847),
+ Box(9848, 9848),
+ Box(9849, 9849),
+ Box(9850, 9850),
+ Box(9851, 9851),
+ Box(9852, 9852),
+ Box(9853, 9853),
+ Box(9854, 9854),
+ Box(9855, 9855),
+ Box(9856, 9856),
+ Box(9857, 9857),
+ Box(9858, 9858),
+ Box(9859, 9859),
+ Box(9860, 9860),
+ Box(9861, 9861),
+ Box(9862, 9862),
+ Box(9863, 9863),
+ Box(9864, 9864),
+ Box(9865, 9865),
+ Box(9866, 9866),
+ Box(9867, 9867),
+ Box(9868, 9868),
+ Box(9869, 9869),
+ Box(9870, 9870),
+ Box(9871, 9871),
+ Box(9872, 9872),
+ Box(9873, 9873),
+ Box(9874, 9874),
+ Box(9875, 9875),
+ Box(9876, 9876),
+ Box(9877, 9877),
+ Box(9878, 9878),
+ Box(9879, 9879),
+ Box(9880, 9880),
+ Box(9881, 9881),
+ Box(9882, 9882),
+ Box(9883, 9883),
+ Box(9884, 9884),
+ Box(9885, 9885),
+ Box(9886, 9886),
+ Box(9887, 9887),
+ Box(9888, 9888),
+ Box(9889, 9889),
+ Box(9890, 9890),
+ Box(9891, 9891),
+ Box(9892, 9892),
+ Box(9893, 9893),
+ Box(9894, 9894),
+ Box(9895, 9895),
+ Box(9896, 9896),
+ Box(9897, 9897),
+ Box(9898, 9898),
+ Box(9899, 9899),
+ Box(9900, 9900),
+ Box(9901, 9901),
+ Box(9902, 9902),
+ Box(9903, 9903),
+ Box(9904, 9904),
+ Box(9905, 9905),
+ Box(9906, 9906),
+ Box(9907, 9907),
+ Box(9908, 9908),
+ Box(9909, 9909),
+ Box(9910, 9910),
+ Box(9911, 9911),
+ Box(9912, 9912),
+ Box(9913, 9913),
+ Box(9914, 9914),
+ Box(9915, 9915),
+ Box(9916, 9916),
+ Box(9917, 9917),
+ Box(9918, 9918),
+ Box(9919, 9919),
+ Box(9920, 9920),
+ Box(9921, 9921),
+ Box(9922, 9922),
+ Box(9923, 9923),
+ Box(9924, 9924),
+ Box(9925, 9925),
+ Box(9926, 9926),
+ Box(9927, 9927),
+ Box(9928, 9928),
+ Box(9929, 9929),
+ Box(9930, 9930),
+ Box(9931, 9931),
+ Box(9932, 9932),
+ Box(9933, 9933),
+ Box(9934, 9934),
+ Box(9935, 9935),
+ Box(9936, 9936),
+ Box(9937, 9937),
+ Box(9938, 9938),
+ Box(9939, 9939),
+ Box(9940, 9940),
+ Box(9941, 9941),
+ Box(9942, 9942),
+ Box(9943, 9943),
+ Box(9944, 9944),
+ Box(9945, 9945),
+ Box(9946, 9946),
+ Box(9947, 9947),
+ Box(9948, 9948),
+ Box(9949, 9949),
+ Box(9950, 9950),
+ Box(9951, 9951),
+ Box(9952, 9952),
+ Box(9953, 9953),
+ Box(9954, 9954),
+ Box(9955, 9955),
+ Box(9956, 9956),
+ Box(9957, 9957),
+ Box(9958, 9958),
+ Box(9959, 9959),
+ Box(9960, 9960),
+ Box(9961, 9961),
+ Box(9962, 9962),
+ Box(9963, 9963),
+ Box(9964, 9964),
+ Box(9965, 9965),
+ Box(9966, 9966),
+ Box(9967, 9967),
+ Box(9968, 9968),
+ Box(9969, 9969),
+ Box(9970, 9970),
+ Box(9971, 9971),
+ Box(9972, 9972),
+ Box(9973, 9973),
+ Box(9974, 9974),
+ Box(9975, 9975),
+ Box(9976, 9976),
+ Box(9977, 9977),
+ Box(9978, 9978),
+ Box(9979, 9979),
+ Box(9980, 9980),
+ Box(9981, 9981),
+ Box(9982, 9982),
+ Box(9983, 9983),
+ Box(9984, 9984),
+ Box(9985, 9985),
+ Box(9986, 9986),
+ Box(9987, 9987),
+ Box(9988, 9988),
+ Box(9989, 9989),
+ Box(9990, 9990),
+ Box(9991, 9991),
+ Box(9992, 9992),
+ Box(9993, 9993),
+ Box(9994, 9994),
+ Box(9995, 9995),
+ Box(9996, 9996),
+ Box(9997, 9997),
+ Box(9998, 9998),
+ Box(9999, 9999),
+];
+
+confuse(x) {
+ try {
+ throw x;
+ } catch (e) {
+ return e;
+ }
+}
+
+main() {
+ if (!identical(confuse(list1), confuse(list2))) {
+ throw new Exception("list1 !== list2");
+ }
+}
diff --git a/tests/language/canonicalize/hashing_shallow_collision_instance_3_test.dart b/tests/language/canonicalize/hashing_shallow_collision_instance_3_test.dart
new file mode 100644
index 0000000..b806b6a
--- /dev/null
+++ b/tests/language/canonicalize/hashing_shallow_collision_instance_3_test.dart
@@ -0,0 +1,20034 @@
+// Copyright (c) 2019, 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.
+
+// If canonicialization hashes with only a field's cid, this will exhibit
+// quadratic time.
+
+class Box {
+ final Object a;
+ final Object b;
+ const Box(this.a, this.b);
+}
+
+// 10,000 elements.
+const list1 = [
+ Box(Box(0, 0), Box(0, 0)),
+ Box(Box(1, 1), Box(1, 1)),
+ Box(Box(2, 2), Box(2, 2)),
+ Box(Box(3, 3), Box(3, 3)),
+ Box(Box(4, 4), Box(4, 4)),
+ Box(Box(5, 5), Box(5, 5)),
+ Box(Box(6, 6), Box(6, 6)),
+ Box(Box(7, 7), Box(7, 7)),
+ Box(Box(8, 8), Box(8, 8)),
+ Box(Box(9, 9), Box(9, 9)),
+ Box(Box(10, 10), Box(10, 10)),
+ Box(Box(11, 11), Box(11, 11)),
+ Box(Box(12, 12), Box(12, 12)),
+ Box(Box(13, 13), Box(13, 13)),
+ Box(Box(14, 14), Box(14, 14)),
+ Box(Box(15, 15), Box(15, 15)),
+ Box(Box(16, 16), Box(16, 16)),
+ Box(Box(17, 17), Box(17, 17)),
+ Box(Box(18, 18), Box(18, 18)),
+ Box(Box(19, 19), Box(19, 19)),
+ Box(Box(20, 20), Box(20, 20)),
+ Box(Box(21, 21), Box(21, 21)),
+ Box(Box(22, 22), Box(22, 22)),
+ Box(Box(23, 23), Box(23, 23)),
+ Box(Box(24, 24), Box(24, 24)),
+ Box(Box(25, 25), Box(25, 25)),
+ Box(Box(26, 26), Box(26, 26)),
+ Box(Box(27, 27), Box(27, 27)),
+ Box(Box(28, 28), Box(28, 28)),
+ Box(Box(29, 29), Box(29, 29)),
+ Box(Box(30, 30), Box(30, 30)),
+ Box(Box(31, 31), Box(31, 31)),
+ Box(Box(32, 32), Box(32, 32)),
+ Box(Box(33, 33), Box(33, 33)),
+ Box(Box(34, 34), Box(34, 34)),
+ Box(Box(35, 35), Box(35, 35)),
+ Box(Box(36, 36), Box(36, 36)),
+ Box(Box(37, 37), Box(37, 37)),
+ Box(Box(38, 38), Box(38, 38)),
+ Box(Box(39, 39), Box(39, 39)),
+ Box(Box(40, 40), Box(40, 40)),
+ Box(Box(41, 41), Box(41, 41)),
+ Box(Box(42, 42), Box(42, 42)),
+ Box(Box(43, 43), Box(43, 43)),
+ Box(Box(44, 44), Box(44, 44)),
+ Box(Box(45, 45), Box(45, 45)),
+ Box(Box(46, 46), Box(46, 46)),
+ Box(Box(47, 47), Box(47, 47)),
+ Box(Box(48, 48), Box(48, 48)),
+ Box(Box(49, 49), Box(49, 49)),
+ Box(Box(50, 50), Box(50, 50)),
+ Box(Box(51, 51), Box(51, 51)),
+ Box(Box(52, 52), Box(52, 52)),
+ Box(Box(53, 53), Box(53, 53)),
+ Box(Box(54, 54), Box(54, 54)),
+ Box(Box(55, 55), Box(55, 55)),
+ Box(Box(56, 56), Box(56, 56)),
+ Box(Box(57, 57), Box(57, 57)),
+ Box(Box(58, 58), Box(58, 58)),
+ Box(Box(59, 59), Box(59, 59)),
+ Box(Box(60, 60), Box(60, 60)),
+ Box(Box(61, 61), Box(61, 61)),
+ Box(Box(62, 62), Box(62, 62)),
+ Box(Box(63, 63), Box(63, 63)),
+ Box(Box(64, 64), Box(64, 64)),
+ Box(Box(65, 65), Box(65, 65)),
+ Box(Box(66, 66), Box(66, 66)),
+ Box(Box(67, 67), Box(67, 67)),
+ Box(Box(68, 68), Box(68, 68)),
+ Box(Box(69, 69), Box(69, 69)),
+ Box(Box(70, 70), Box(70, 70)),
+ Box(Box(71, 71), Box(71, 71)),
+ Box(Box(72, 72), Box(72, 72)),
+ Box(Box(73, 73), Box(73, 73)),
+ Box(Box(74, 74), Box(74, 74)),
+ Box(Box(75, 75), Box(75, 75)),
+ Box(Box(76, 76), Box(76, 76)),
+ Box(Box(77, 77), Box(77, 77)),
+ Box(Box(78, 78), Box(78, 78)),
+ Box(Box(79, 79), Box(79, 79)),
+ Box(Box(80, 80), Box(80, 80)),
+ Box(Box(81, 81), Box(81, 81)),
+ Box(Box(82, 82), Box(82, 82)),
+ Box(Box(83, 83), Box(83, 83)),
+ Box(Box(84, 84), Box(84, 84)),
+ Box(Box(85, 85), Box(85, 85)),
+ Box(Box(86, 86), Box(86, 86)),
+ Box(Box(87, 87), Box(87, 87)),
+ Box(Box(88, 88), Box(88, 88)),
+ Box(Box(89, 89), Box(89, 89)),
+ Box(Box(90, 90), Box(90, 90)),
+ Box(Box(91, 91), Box(91, 91)),
+ Box(Box(92, 92), Box(92, 92)),
+ Box(Box(93, 93), Box(93, 93)),
+ Box(Box(94, 94), Box(94, 94)),
+ Box(Box(95, 95), Box(95, 95)),
+ Box(Box(96, 96), Box(96, 96)),
+ Box(Box(97, 97), Box(97, 97)),
+ Box(Box(98, 98), Box(98, 98)),
+ Box(Box(99, 99), Box(99, 99)),
+ Box(Box(100, 100), Box(100, 100)),
+ Box(Box(101, 101), Box(101, 101)),
+ Box(Box(102, 102), Box(102, 102)),
+ Box(Box(103, 103), Box(103, 103)),
+ Box(Box(104, 104), Box(104, 104)),
+ Box(Box(105, 105), Box(105, 105)),
+ Box(Box(106, 106), Box(106, 106)),
+ Box(Box(107, 107), Box(107, 107)),
+ Box(Box(108, 108), Box(108, 108)),
+ Box(Box(109, 109), Box(109, 109)),
+ Box(Box(110, 110), Box(110, 110)),
+ Box(Box(111, 111), Box(111, 111)),
+ Box(Box(112, 112), Box(112, 112)),
+ Box(Box(113, 113), Box(113, 113)),
+ Box(Box(114, 114), Box(114, 114)),
+ Box(Box(115, 115), Box(115, 115)),
+ Box(Box(116, 116), Box(116, 116)),
+ Box(Box(117, 117), Box(117, 117)),
+ Box(Box(118, 118), Box(118, 118)),
+ Box(Box(119, 119), Box(119, 119)),
+ Box(Box(120, 120), Box(120, 120)),
+ Box(Box(121, 121), Box(121, 121)),
+ Box(Box(122, 122), Box(122, 122)),
+ Box(Box(123, 123), Box(123, 123)),
+ Box(Box(124, 124), Box(124, 124)),
+ Box(Box(125, 125), Box(125, 125)),
+ Box(Box(126, 126), Box(126, 126)),
+ Box(Box(127, 127), Box(127, 127)),
+ Box(Box(128, 128), Box(128, 128)),
+ Box(Box(129, 129), Box(129, 129)),
+ Box(Box(130, 130), Box(130, 130)),
+ Box(Box(131, 131), Box(131, 131)),
+ Box(Box(132, 132), Box(132, 132)),
+ Box(Box(133, 133), Box(133, 133)),
+ Box(Box(134, 134), Box(134, 134)),
+ Box(Box(135, 135), Box(135, 135)),
+ Box(Box(136, 136), Box(136, 136)),
+ Box(Box(137, 137), Box(137, 137)),
+ Box(Box(138, 138), Box(138, 138)),
+ Box(Box(139, 139), Box(139, 139)),
+ Box(Box(140, 140), Box(140, 140)),
+ Box(Box(141, 141), Box(141, 141)),
+ Box(Box(142, 142), Box(142, 142)),
+ Box(Box(143, 143), Box(143, 143)),
+ Box(Box(144, 144), Box(144, 144)),
+ Box(Box(145, 145), Box(145, 145)),
+ Box(Box(146, 146), Box(146, 146)),
+ Box(Box(147, 147), Box(147, 147)),
+ Box(Box(148, 148), Box(148, 148)),
+ Box(Box(149, 149), Box(149, 149)),
+ Box(Box(150, 150), Box(150, 150)),
+ Box(Box(151, 151), Box(151, 151)),
+ Box(Box(152, 152), Box(152, 152)),
+ Box(Box(153, 153), Box(153, 153)),
+ Box(Box(154, 154), Box(154, 154)),
+ Box(Box(155, 155), Box(155, 155)),
+ Box(Box(156, 156), Box(156, 156)),
+ Box(Box(157, 157), Box(157, 157)),
+ Box(Box(158, 158), Box(158, 158)),
+ Box(Box(159, 159), Box(159, 159)),
+ Box(Box(160, 160), Box(160, 160)),
+ Box(Box(161, 161), Box(161, 161)),
+ Box(Box(162, 162), Box(162, 162)),
+ Box(Box(163, 163), Box(163, 163)),
+ Box(Box(164, 164), Box(164, 164)),
+ Box(Box(165, 165), Box(165, 165)),
+ Box(Box(166, 166), Box(166, 166)),
+ Box(Box(167, 167), Box(167, 167)),
+ Box(Box(168, 168), Box(168, 168)),
+ Box(Box(169, 169), Box(169, 169)),
+ Box(Box(170, 170), Box(170, 170)),
+ Box(Box(171, 171), Box(171, 171)),
+ Box(Box(172, 172), Box(172, 172)),
+ Box(Box(173, 173), Box(173, 173)),
+ Box(Box(174, 174), Box(174, 174)),
+ Box(Box(175, 175), Box(175, 175)),
+ Box(Box(176, 176), Box(176, 176)),
+ Box(Box(177, 177), Box(177, 177)),
+ Box(Box(178, 178), Box(178, 178)),
+ Box(Box(179, 179), Box(179, 179)),
+ Box(Box(180, 180), Box(180, 180)),
+ Box(Box(181, 181), Box(181, 181)),
+ Box(Box(182, 182), Box(182, 182)),
+ Box(Box(183, 183), Box(183, 183)),
+ Box(Box(184, 184), Box(184, 184)),
+ Box(Box(185, 185), Box(185, 185)),
+ Box(Box(186, 186), Box(186, 186)),
+ Box(Box(187, 187), Box(187, 187)),
+ Box(Box(188, 188), Box(188, 188)),
+ Box(Box(189, 189), Box(189, 189)),
+ Box(Box(190, 190), Box(190, 190)),
+ Box(Box(191, 191), Box(191, 191)),
+ Box(Box(192, 192), Box(192, 192)),
+ Box(Box(193, 193), Box(193, 193)),
+ Box(Box(194, 194), Box(194, 194)),
+ Box(Box(195, 195), Box(195, 195)),
+ Box(Box(196, 196), Box(196, 196)),
+ Box(Box(197, 197), Box(197, 197)),
+ Box(Box(198, 198), Box(198, 198)),
+ Box(Box(199, 199), Box(199, 199)),
+ Box(Box(200, 200), Box(200, 200)),
+ Box(Box(201, 201), Box(201, 201)),
+ Box(Box(202, 202), Box(202, 202)),
+ Box(Box(203, 203), Box(203, 203)),
+ Box(Box(204, 204), Box(204, 204)),
+ Box(Box(205, 205), Box(205, 205)),
+ Box(Box(206, 206), Box(206, 206)),
+ Box(Box(207, 207), Box(207, 207)),
+ Box(Box(208, 208), Box(208, 208)),
+ Box(Box(209, 209), Box(209, 209)),
+ Box(Box(210, 210), Box(210, 210)),
+ Box(Box(211, 211), Box(211, 211)),
+ Box(Box(212, 212), Box(212, 212)),
+ Box(Box(213, 213), Box(213, 213)),
+ Box(Box(214, 214), Box(214, 214)),
+ Box(Box(215, 215), Box(215, 215)),
+ Box(Box(216, 216), Box(216, 216)),
+ Box(Box(217, 217), Box(217, 217)),
+ Box(Box(218, 218), Box(218, 218)),
+ Box(Box(219, 219), Box(219, 219)),
+ Box(Box(220, 220), Box(220, 220)),
+ Box(Box(221, 221), Box(221, 221)),
+ Box(Box(222, 222), Box(222, 222)),
+ Box(Box(223, 223), Box(223, 223)),
+ Box(Box(224, 224), Box(224, 224)),
+ Box(Box(225, 225), Box(225, 225)),
+ Box(Box(226, 226), Box(226, 226)),
+ Box(Box(227, 227), Box(227, 227)),
+ Box(Box(228, 228), Box(228, 228)),
+ Box(Box(229, 229), Box(229, 229)),
+ Box(Box(230, 230), Box(230, 230)),
+ Box(Box(231, 231), Box(231, 231)),
+ Box(Box(232, 232), Box(232, 232)),
+ Box(Box(233, 233), Box(233, 233)),
+ Box(Box(234, 234), Box(234, 234)),
+ Box(Box(235, 235), Box(235, 235)),
+ Box(Box(236, 236), Box(236, 236)),
+ Box(Box(237, 237), Box(237, 237)),
+ Box(Box(238, 238), Box(238, 238)),
+ Box(Box(239, 239), Box(239, 239)),
+ Box(Box(240, 240), Box(240, 240)),
+ Box(Box(241, 241), Box(241, 241)),
+ Box(Box(242, 242), Box(242, 242)),
+ Box(Box(243, 243), Box(243, 243)),
+ Box(Box(244, 244), Box(244, 244)),
+ Box(Box(245, 245), Box(245, 245)),
+ Box(Box(246, 246), Box(246, 246)),
+ Box(Box(247, 247), Box(247, 247)),
+ Box(Box(248, 248), Box(248, 248)),
+ Box(Box(249, 249), Box(249, 249)),
+ Box(Box(250, 250), Box(250, 250)),
+ Box(Box(251, 251), Box(251, 251)),
+ Box(Box(252, 252), Box(252, 252)),
+ Box(Box(253, 253), Box(253, 253)),
+ Box(Box(254, 254), Box(254, 254)),
+ Box(Box(255, 255), Box(255, 255)),
+ Box(Box(256, 256), Box(256, 256)),
+ Box(Box(257, 257), Box(257, 257)),
+ Box(Box(258, 258), Box(258, 258)),
+ Box(Box(259, 259), Box(259, 259)),
+ Box(Box(260, 260), Box(260, 260)),
+ Box(Box(261, 261), Box(261, 261)),
+ Box(Box(262, 262), Box(262, 262)),
+ Box(Box(263, 263), Box(263, 263)),
+ Box(Box(264, 264), Box(264, 264)),
+ Box(Box(265, 265), Box(265, 265)),
+ Box(Box(266, 266), Box(266, 266)),
+ Box(Box(267, 267), Box(267, 267)),
+ Box(Box(268, 268), Box(268, 268)),
+ Box(Box(269, 269), Box(269, 269)),
+ Box(Box(270, 270), Box(270, 270)),
+ Box(Box(271, 271), Box(271, 271)),
+ Box(Box(272, 272), Box(272, 272)),
+ Box(Box(273, 273), Box(273, 273)),
+ Box(Box(274, 274), Box(274, 274)),
+ Box(Box(275, 275), Box(275, 275)),
+ Box(Box(276, 276), Box(276, 276)),
+ Box(Box(277, 277), Box(277, 277)),
+ Box(Box(278, 278), Box(278, 278)),
+ Box(Box(279, 279), Box(279, 279)),
+ Box(Box(280, 280), Box(280, 280)),
+ Box(Box(281, 281), Box(281, 281)),
+ Box(Box(282, 282), Box(282, 282)),
+ Box(Box(283, 283), Box(283, 283)),
+ Box(Box(284, 284), Box(284, 284)),
+ Box(Box(285, 285), Box(285, 285)),
+ Box(Box(286, 286), Box(286, 286)),
+ Box(Box(287, 287), Box(287, 287)),
+ Box(Box(288, 288), Box(288, 288)),
+ Box(Box(289, 289), Box(289, 289)),
+ Box(Box(290, 290), Box(290, 290)),
+ Box(Box(291, 291), Box(291, 291)),
+ Box(Box(292, 292), Box(292, 292)),
+ Box(Box(293, 293), Box(293, 293)),
+ Box(Box(294, 294), Box(294, 294)),
+ Box(Box(295, 295), Box(295, 295)),
+ Box(Box(296, 296), Box(296, 296)),
+ Box(Box(297, 297), Box(297, 297)),
+ Box(Box(298, 298), Box(298, 298)),
+ Box(Box(299, 299), Box(299, 299)),
+ Box(Box(300, 300), Box(300, 300)),
+ Box(Box(301, 301), Box(301, 301)),
+ Box(Box(302, 302), Box(302, 302)),
+ Box(Box(303, 303), Box(303, 303)),
+ Box(Box(304, 304), Box(304, 304)),
+ Box(Box(305, 305), Box(305, 305)),
+ Box(Box(306, 306), Box(306, 306)),
+ Box(Box(307, 307), Box(307, 307)),
+ Box(Box(308, 308), Box(308, 308)),
+ Box(Box(309, 309), Box(309, 309)),
+ Box(Box(310, 310), Box(310, 310)),
+ Box(Box(311, 311), Box(311, 311)),
+ Box(Box(312, 312), Box(312, 312)),
+ Box(Box(313, 313), Box(313, 313)),
+ Box(Box(314, 314), Box(314, 314)),
+ Box(Box(315, 315), Box(315, 315)),
+ Box(Box(316, 316), Box(316, 316)),
+ Box(Box(317, 317), Box(317, 317)),
+ Box(Box(318, 318), Box(318, 318)),
+ Box(Box(319, 319), Box(319, 319)),
+ Box(Box(320, 320), Box(320, 320)),
+ Box(Box(321, 321), Box(321, 321)),
+ Box(Box(322, 322), Box(322, 322)),
+ Box(Box(323, 323), Box(323, 323)),
+ Box(Box(324, 324), Box(324, 324)),
+ Box(Box(325, 325), Box(325, 325)),
+ Box(Box(326, 326), Box(326, 326)),
+ Box(Box(327, 327), Box(327, 327)),
+ Box(Box(328, 328), Box(328, 328)),
+ Box(Box(329, 329), Box(329, 329)),
+ Box(Box(330, 330), Box(330, 330)),
+ Box(Box(331, 331), Box(331, 331)),
+ Box(Box(332, 332), Box(332, 332)),
+ Box(Box(333, 333), Box(333, 333)),
+ Box(Box(334, 334), Box(334, 334)),
+ Box(Box(335, 335), Box(335, 335)),
+ Box(Box(336, 336), Box(336, 336)),
+ Box(Box(337, 337), Box(337, 337)),
+ Box(Box(338, 338), Box(338, 338)),
+ Box(Box(339, 339), Box(339, 339)),
+ Box(Box(340, 340), Box(340, 340)),
+ Box(Box(341, 341), Box(341, 341)),
+ Box(Box(342, 342), Box(342, 342)),
+ Box(Box(343, 343), Box(343, 343)),
+ Box(Box(344, 344), Box(344, 344)),
+ Box(Box(345, 345), Box(345, 345)),
+ Box(Box(346, 346), Box(346, 346)),
+ Box(Box(347, 347), Box(347, 347)),
+ Box(Box(348, 348), Box(348, 348)),
+ Box(Box(349, 349), Box(349, 349)),
+ Box(Box(350, 350), Box(350, 350)),
+ Box(Box(351, 351), Box(351, 351)),
+ Box(Box(352, 352), Box(352, 352)),
+ Box(Box(353, 353), Box(353, 353)),
+ Box(Box(354, 354), Box(354, 354)),
+ Box(Box(355, 355), Box(355, 355)),
+ Box(Box(356, 356), Box(356, 356)),
+ Box(Box(357, 357), Box(357, 357)),
+ Box(Box(358, 358), Box(358, 358)),
+ Box(Box(359, 359), Box(359, 359)),
+ Box(Box(360, 360), Box(360, 360)),
+ Box(Box(361, 361), Box(361, 361)),
+ Box(Box(362, 362), Box(362, 362)),
+ Box(Box(363, 363), Box(363, 363)),
+ Box(Box(364, 364), Box(364, 364)),
+ Box(Box(365, 365), Box(365, 365)),
+ Box(Box(366, 366), Box(366, 366)),
+ Box(Box(367, 367), Box(367, 367)),
+ Box(Box(368, 368), Box(368, 368)),
+ Box(Box(369, 369), Box(369, 369)),
+ Box(Box(370, 370), Box(370, 370)),
+ Box(Box(371, 371), Box(371, 371)),
+ Box(Box(372, 372), Box(372, 372)),
+ Box(Box(373, 373), Box(373, 373)),
+ Box(Box(374, 374), Box(374, 374)),
+ Box(Box(375, 375), Box(375, 375)),
+ Box(Box(376, 376), Box(376, 376)),
+ Box(Box(377, 377), Box(377, 377)),
+ Box(Box(378, 378), Box(378, 378)),
+ Box(Box(379, 379), Box(379, 379)),
+ Box(Box(380, 380), Box(380, 380)),
+ Box(Box(381, 381), Box(381, 381)),
+ Box(Box(382, 382), Box(382, 382)),
+ Box(Box(383, 383), Box(383, 383)),
+ Box(Box(384, 384), Box(384, 384)),
+ Box(Box(385, 385), Box(385, 385)),
+ Box(Box(386, 386), Box(386, 386)),
+ Box(Box(387, 387), Box(387, 387)),
+ Box(Box(388, 388), Box(388, 388)),
+ Box(Box(389, 389), Box(389, 389)),
+ Box(Box(390, 390), Box(390, 390)),
+ Box(Box(391, 391), Box(391, 391)),
+ Box(Box(392, 392), Box(392, 392)),
+ Box(Box(393, 393), Box(393, 393)),
+ Box(Box(394, 394), Box(394, 394)),
+ Box(Box(395, 395), Box(395, 395)),
+ Box(Box(396, 396), Box(396, 396)),
+ Box(Box(397, 397), Box(397, 397)),
+ Box(Box(398, 398), Box(398, 398)),
+ Box(Box(399, 399), Box(399, 399)),
+ Box(Box(400, 400), Box(400, 400)),
+ Box(Box(401, 401), Box(401, 401)),
+ Box(Box(402, 402), Box(402, 402)),
+ Box(Box(403, 403), Box(403, 403)),
+ Box(Box(404, 404), Box(404, 404)),
+ Box(Box(405, 405), Box(405, 405)),
+ Box(Box(406, 406), Box(406, 406)),
+ Box(Box(407, 407), Box(407, 407)),
+ Box(Box(408, 408), Box(408, 408)),
+ Box(Box(409, 409), Box(409, 409)),
+ Box(Box(410, 410), Box(410, 410)),
+ Box(Box(411, 411), Box(411, 411)),
+ Box(Box(412, 412), Box(412, 412)),
+ Box(Box(413, 413), Box(413, 413)),
+ Box(Box(414, 414), Box(414, 414)),
+ Box(Box(415, 415), Box(415, 415)),
+ Box(Box(416, 416), Box(416, 416)),
+ Box(Box(417, 417), Box(417, 417)),
+ Box(Box(418, 418), Box(418, 418)),
+ Box(Box(419, 419), Box(419, 419)),
+ Box(Box(420, 420), Box(420, 420)),
+ Box(Box(421, 421), Box(421, 421)),
+ Box(Box(422, 422), Box(422, 422)),
+ Box(Box(423, 423), Box(423, 423)),
+ Box(Box(424, 424), Box(424, 424)),
+ Box(Box(425, 425), Box(425, 425)),
+ Box(Box(426, 426), Box(426, 426)),
+ Box(Box(427, 427), Box(427, 427)),
+ Box(Box(428, 428), Box(428, 428)),
+ Box(Box(429, 429), Box(429, 429)),
+ Box(Box(430, 430), Box(430, 430)),
+ Box(Box(431, 431), Box(431, 431)),
+ Box(Box(432, 432), Box(432, 432)),
+ Box(Box(433, 433), Box(433, 433)),
+ Box(Box(434, 434), Box(434, 434)),
+ Box(Box(435, 435), Box(435, 435)),
+ Box(Box(436, 436), Box(436, 436)),
+ Box(Box(437, 437), Box(437, 437)),
+ Box(Box(438, 438), Box(438, 438)),
+ Box(Box(439, 439), Box(439, 439)),
+ Box(Box(440, 440), Box(440, 440)),
+ Box(Box(441, 441), Box(441, 441)),
+ Box(Box(442, 442), Box(442, 442)),
+ Box(Box(443, 443), Box(443, 443)),
+ Box(Box(444, 444), Box(444, 444)),
+ Box(Box(445, 445), Box(445, 445)),
+ Box(Box(446, 446), Box(446, 446)),
+ Box(Box(447, 447), Box(447, 447)),
+ Box(Box(448, 448), Box(448, 448)),
+ Box(Box(449, 449), Box(449, 449)),
+ Box(Box(450, 450), Box(450, 450)),
+ Box(Box(451, 451), Box(451, 451)),
+ Box(Box(452, 452), Box(452, 452)),
+ Box(Box(453, 453), Box(453, 453)),
+ Box(Box(454, 454), Box(454, 454)),
+ Box(Box(455, 455), Box(455, 455)),
+ Box(Box(456, 456), Box(456, 456)),
+ Box(Box(457, 457), Box(457, 457)),
+ Box(Box(458, 458), Box(458, 458)),
+ Box(Box(459, 459), Box(459, 459)),
+ Box(Box(460, 460), Box(460, 460)),
+ Box(Box(461, 461), Box(461, 461)),
+ Box(Box(462, 462), Box(462, 462)),
+ Box(Box(463, 463), Box(463, 463)),
+ Box(Box(464, 464), Box(464, 464)),
+ Box(Box(465, 465), Box(465, 465)),
+ Box(Box(466, 466), Box(466, 466)),
+ Box(Box(467, 467), Box(467, 467)),
+ Box(Box(468, 468), Box(468, 468)),
+ Box(Box(469, 469), Box(469, 469)),
+ Box(Box(470, 470), Box(470, 470)),
+ Box(Box(471, 471), Box(471, 471)),
+ Box(Box(472, 472), Box(472, 472)),
+ Box(Box(473, 473), Box(473, 473)),
+ Box(Box(474, 474), Box(474, 474)),
+ Box(Box(475, 475), Box(475, 475)),
+ Box(Box(476, 476), Box(476, 476)),
+ Box(Box(477, 477), Box(477, 477)),
+ Box(Box(478, 478), Box(478, 478)),
+ Box(Box(479, 479), Box(479, 479)),
+ Box(Box(480, 480), Box(480, 480)),
+ Box(Box(481, 481), Box(481, 481)),
+ Box(Box(482, 482), Box(482, 482)),
+ Box(Box(483, 483), Box(483, 483)),
+ Box(Box(484, 484), Box(484, 484)),
+ Box(Box(485, 485), Box(485, 485)),
+ Box(Box(486, 486), Box(486, 486)),
+ Box(Box(487, 487), Box(487, 487)),
+ Box(Box(488, 488), Box(488, 488)),
+ Box(Box(489, 489), Box(489, 489)),
+ Box(Box(490, 490), Box(490, 490)),
+ Box(Box(491, 491), Box(491, 491)),
+ Box(Box(492, 492), Box(492, 492)),
+ Box(Box(493, 493), Box(493, 493)),
+ Box(Box(494, 494), Box(494, 494)),
+ Box(Box(495, 495), Box(495, 495)),
+ Box(Box(496, 496), Box(496, 496)),
+ Box(Box(497, 497), Box(497, 497)),
+ Box(Box(498, 498), Box(498, 498)),
+ Box(Box(499, 499), Box(499, 499)),
+ Box(Box(500, 500), Box(500, 500)),
+ Box(Box(501, 501), Box(501, 501)),
+ Box(Box(502, 502), Box(502, 502)),
+ Box(Box(503, 503), Box(503, 503)),
+ Box(Box(504, 504), Box(504, 504)),
+ Box(Box(505, 505), Box(505, 505)),
+ Box(Box(506, 506), Box(506, 506)),
+ Box(Box(507, 507), Box(507, 507)),
+ Box(Box(508, 508), Box(508, 508)),
+ Box(Box(509, 509), Box(509, 509)),
+ Box(Box(510, 510), Box(510, 510)),
+ Box(Box(511, 511), Box(511, 511)),
+ Box(Box(512, 512), Box(512, 512)),
+ Box(Box(513, 513), Box(513, 513)),
+ Box(Box(514, 514), Box(514, 514)),
+ Box(Box(515, 515), Box(515, 515)),
+ Box(Box(516, 516), Box(516, 516)),
+ Box(Box(517, 517), Box(517, 517)),
+ Box(Box(518, 518), Box(518, 518)),
+ Box(Box(519, 519), Box(519, 519)),
+ Box(Box(520, 520), Box(520, 520)),
+ Box(Box(521, 521), Box(521, 521)),
+ Box(Box(522, 522), Box(522, 522)),
+ Box(Box(523, 523), Box(523, 523)),
+ Box(Box(524, 524), Box(524, 524)),
+ Box(Box(525, 525), Box(525, 525)),
+ Box(Box(526, 526), Box(526, 526)),
+ Box(Box(527, 527), Box(527, 527)),
+ Box(Box(528, 528), Box(528, 528)),
+ Box(Box(529, 529), Box(529, 529)),
+ Box(Box(530, 530), Box(530, 530)),
+ Box(Box(531, 531), Box(531, 531)),
+ Box(Box(532, 532), Box(532, 532)),
+ Box(Box(533, 533), Box(533, 533)),
+ Box(Box(534, 534), Box(534, 534)),
+ Box(Box(535, 535), Box(535, 535)),
+ Box(Box(536, 536), Box(536, 536)),
+ Box(Box(537, 537), Box(537, 537)),
+ Box(Box(538, 538), Box(538, 538)),
+ Box(Box(539, 539), Box(539, 539)),
+ Box(Box(540, 540), Box(540, 540)),
+ Box(Box(541, 541), Box(541, 541)),
+ Box(Box(542, 542), Box(542, 542)),
+ Box(Box(543, 543), Box(543, 543)),
+ Box(Box(544, 544), Box(544, 544)),
+ Box(Box(545, 545), Box(545, 545)),
+ Box(Box(546, 546), Box(546, 546)),
+ Box(Box(547, 547), Box(547, 547)),
+ Box(Box(548, 548), Box(548, 548)),
+ Box(Box(549, 549), Box(549, 549)),
+ Box(Box(550, 550), Box(550, 550)),
+ Box(Box(551, 551), Box(551, 551)),
+ Box(Box(552, 552), Box(552, 552)),
+ Box(Box(553, 553), Box(553, 553)),
+ Box(Box(554, 554), Box(554, 554)),
+ Box(Box(555, 555), Box(555, 555)),
+ Box(Box(556, 556), Box(556, 556)),
+ Box(Box(557, 557), Box(557, 557)),
+ Box(Box(558, 558), Box(558, 558)),
+ Box(Box(559, 559), Box(559, 559)),
+ Box(Box(560, 560), Box(560, 560)),
+ Box(Box(561, 561), Box(561, 561)),
+ Box(Box(562, 562), Box(562, 562)),
+ Box(Box(563, 563), Box(563, 563)),
+ Box(Box(564, 564), Box(564, 564)),
+ Box(Box(565, 565), Box(565, 565)),
+ Box(Box(566, 566), Box(566, 566)),
+ Box(Box(567, 567), Box(567, 567)),
+ Box(Box(568, 568), Box(568, 568)),
+ Box(Box(569, 569), Box(569, 569)),
+ Box(Box(570, 570), Box(570, 570)),
+ Box(Box(571, 571), Box(571, 571)),
+ Box(Box(572, 572), Box(572, 572)),
+ Box(Box(573, 573), Box(573, 573)),
+ Box(Box(574, 574), Box(574, 574)),
+ Box(Box(575, 575), Box(575, 575)),
+ Box(Box(576, 576), Box(576, 576)),
+ Box(Box(577, 577), Box(577, 577)),
+ Box(Box(578, 578), Box(578, 578)),
+ Box(Box(579, 579), Box(579, 579)),
+ Box(Box(580, 580), Box(580, 580)),
+ Box(Box(581, 581), Box(581, 581)),
+ Box(Box(582, 582), Box(582, 582)),
+ Box(Box(583, 583), Box(583, 583)),
+ Box(Box(584, 584), Box(584, 584)),
+ Box(Box(585, 585), Box(585, 585)),
+ Box(Box(586, 586), Box(586, 586)),
+ Box(Box(587, 587), Box(587, 587)),
+ Box(Box(588, 588), Box(588, 588)),
+ Box(Box(589, 589), Box(589, 589)),
+ Box(Box(590, 590), Box(590, 590)),
+ Box(Box(591, 591), Box(591, 591)),
+ Box(Box(592, 592), Box(592, 592)),
+ Box(Box(593, 593), Box(593, 593)),
+ Box(Box(594, 594), Box(594, 594)),
+ Box(Box(595, 595), Box(595, 595)),
+ Box(Box(596, 596), Box(596, 596)),
+ Box(Box(597, 597), Box(597, 597)),
+ Box(Box(598, 598), Box(598, 598)),
+ Box(Box(599, 599), Box(599, 599)),
+ Box(Box(600, 600), Box(600, 600)),
+ Box(Box(601, 601), Box(601, 601)),
+ Box(Box(602, 602), Box(602, 602)),
+ Box(Box(603, 603), Box(603, 603)),
+ Box(Box(604, 604), Box(604, 604)),
+ Box(Box(605, 605), Box(605, 605)),
+ Box(Box(606, 606), Box(606, 606)),
+ Box(Box(607, 607), Box(607, 607)),
+ Box(Box(608, 608), Box(608, 608)),
+ Box(Box(609, 609), Box(609, 609)),
+ Box(Box(610, 610), Box(610, 610)),
+ Box(Box(611, 611), Box(611, 611)),
+ Box(Box(612, 612), Box(612, 612)),
+ Box(Box(613, 613), Box(613, 613)),
+ Box(Box(614, 614), Box(614, 614)),
+ Box(Box(615, 615), Box(615, 615)),
+ Box(Box(616, 616), Box(616, 616)),
+ Box(Box(617, 617), Box(617, 617)),
+ Box(Box(618, 618), Box(618, 618)),
+ Box(Box(619, 619), Box(619, 619)),
+ Box(Box(620, 620), Box(620, 620)),
+ Box(Box(621, 621), Box(621, 621)),
+ Box(Box(622, 622), Box(622, 622)),
+ Box(Box(623, 623), Box(623, 623)),
+ Box(Box(624, 624), Box(624, 624)),
+ Box(Box(625, 625), Box(625, 625)),
+ Box(Box(626, 626), Box(626, 626)),
+ Box(Box(627, 627), Box(627, 627)),
+ Box(Box(628, 628), Box(628, 628)),
+ Box(Box(629, 629), Box(629, 629)),
+ Box(Box(630, 630), Box(630, 630)),
+ Box(Box(631, 631), Box(631, 631)),
+ Box(Box(632, 632), Box(632, 632)),
+ Box(Box(633, 633), Box(633, 633)),
+ Box(Box(634, 634), Box(634, 634)),
+ Box(Box(635, 635), Box(635, 635)),
+ Box(Box(636, 636), Box(636, 636)),
+ Box(Box(637, 637), Box(637, 637)),
+ Box(Box(638, 638), Box(638, 638)),
+ Box(Box(639, 639), Box(639, 639)),
+ Box(Box(640, 640), Box(640, 640)),
+ Box(Box(641, 641), Box(641, 641)),
+ Box(Box(642, 642), Box(642, 642)),
+ Box(Box(643, 643), Box(643, 643)),
+ Box(Box(644, 644), Box(644, 644)),
+ Box(Box(645, 645), Box(645, 645)),
+ Box(Box(646, 646), Box(646, 646)),
+ Box(Box(647, 647), Box(647, 647)),
+ Box(Box(648, 648), Box(648, 648)),
+ Box(Box(649, 649), Box(649, 649)),
+ Box(Box(650, 650), Box(650, 650)),
+ Box(Box(651, 651), Box(651, 651)),
+ Box(Box(652, 652), Box(652, 652)),
+ Box(Box(653, 653), Box(653, 653)),
+ Box(Box(654, 654), Box(654, 654)),
+ Box(Box(655, 655), Box(655, 655)),
+ Box(Box(656, 656), Box(656, 656)),
+ Box(Box(657, 657), Box(657, 657)),
+ Box(Box(658, 658), Box(658, 658)),
+ Box(Box(659, 659), Box(659, 659)),
+ Box(Box(660, 660), Box(660, 660)),
+ Box(Box(661, 661), Box(661, 661)),
+ Box(Box(662, 662), Box(662, 662)),
+ Box(Box(663, 663), Box(663, 663)),
+ Box(Box(664, 664), Box(664, 664)),
+ Box(Box(665, 665), Box(665, 665)),
+ Box(Box(666, 666), Box(666, 666)),
+ Box(Box(667, 667), Box(667, 667)),
+ Box(Box(668, 668), Box(668, 668)),
+ Box(Box(669, 669), Box(669, 669)),
+ Box(Box(670, 670), Box(670, 670)),
+ Box(Box(671, 671), Box(671, 671)),
+ Box(Box(672, 672), Box(672, 672)),
+ Box(Box(673, 673), Box(673, 673)),
+ Box(Box(674, 674), Box(674, 674)),
+ Box(Box(675, 675), Box(675, 675)),
+ Box(Box(676, 676), Box(676, 676)),
+ Box(Box(677, 677), Box(677, 677)),
+ Box(Box(678, 678), Box(678, 678)),
+ Box(Box(679, 679), Box(679, 679)),
+ Box(Box(680, 680), Box(680, 680)),
+ Box(Box(681, 681), Box(681, 681)),
+ Box(Box(682, 682), Box(682, 682)),
+ Box(Box(683, 683), Box(683, 683)),
+ Box(Box(684, 684), Box(684, 684)),
+ Box(Box(685, 685), Box(685, 685)),
+ Box(Box(686, 686), Box(686, 686)),
+ Box(Box(687, 687), Box(687, 687)),
+ Box(Box(688, 688), Box(688, 688)),
+ Box(Box(689, 689), Box(689, 689)),
+ Box(Box(690, 690), Box(690, 690)),
+ Box(Box(691, 691), Box(691, 691)),
+ Box(Box(692, 692), Box(692, 692)),
+ Box(Box(693, 693), Box(693, 693)),
+ Box(Box(694, 694), Box(694, 694)),
+ Box(Box(695, 695), Box(695, 695)),
+ Box(Box(696, 696), Box(696, 696)),
+ Box(Box(697, 697), Box(697, 697)),
+ Box(Box(698, 698), Box(698, 698)),
+ Box(Box(699, 699), Box(699, 699)),
+ Box(Box(700, 700), Box(700, 700)),
+ Box(Box(701, 701), Box(701, 701)),
+ Box(Box(702, 702), Box(702, 702)),
+ Box(Box(703, 703), Box(703, 703)),
+ Box(Box(704, 704), Box(704, 704)),
+ Box(Box(705, 705), Box(705, 705)),
+ Box(Box(706, 706), Box(706, 706)),
+ Box(Box(707, 707), Box(707, 707)),
+ Box(Box(708, 708), Box(708, 708)),
+ Box(Box(709, 709), Box(709, 709)),
+ Box(Box(710, 710), Box(710, 710)),
+ Box(Box(711, 711), Box(711, 711)),
+ Box(Box(712, 712), Box(712, 712)),
+ Box(Box(713, 713), Box(713, 713)),
+ Box(Box(714, 714), Box(714, 714)),
+ Box(Box(715, 715), Box(715, 715)),
+ Box(Box(716, 716), Box(716, 716)),
+ Box(Box(717, 717), Box(717, 717)),
+ Box(Box(718, 718), Box(718, 718)),
+ Box(Box(719, 719), Box(719, 719)),
+ Box(Box(720, 720), Box(720, 720)),
+ Box(Box(721, 721), Box(721, 721)),
+ Box(Box(722, 722), Box(722, 722)),
+ Box(Box(723, 723), Box(723, 723)),
+ Box(Box(724, 724), Box(724, 724)),
+ Box(Box(725, 725), Box(725, 725)),
+ Box(Box(726, 726), Box(726, 726)),
+ Box(Box(727, 727), Box(727, 727)),
+ Box(Box(728, 728), Box(728, 728)),
+ Box(Box(729, 729), Box(729, 729)),
+ Box(Box(730, 730), Box(730, 730)),
+ Box(Box(731, 731), Box(731, 731)),
+ Box(Box(732, 732), Box(732, 732)),
+ Box(Box(733, 733), Box(733, 733)),
+ Box(Box(734, 734), Box(734, 734)),
+ Box(Box(735, 735), Box(735, 735)),
+ Box(Box(736, 736), Box(736, 736)),
+ Box(Box(737, 737), Box(737, 737)),
+ Box(Box(738, 738), Box(738, 738)),
+ Box(Box(739, 739), Box(739, 739)),
+ Box(Box(740, 740), Box(740, 740)),
+ Box(Box(741, 741), Box(741, 741)),
+ Box(Box(742, 742), Box(742, 742)),
+ Box(Box(743, 743), Box(743, 743)),
+ Box(Box(744, 744), Box(744, 744)),
+ Box(Box(745, 745), Box(745, 745)),
+ Box(Box(746, 746), Box(746, 746)),
+ Box(Box(747, 747), Box(747, 747)),
+ Box(Box(748, 748), Box(748, 748)),
+ Box(Box(749, 749), Box(749, 749)),
+ Box(Box(750, 750), Box(750, 750)),
+ Box(Box(751, 751), Box(751, 751)),
+ Box(Box(752, 752), Box(752, 752)),
+ Box(Box(753, 753), Box(753, 753)),
+ Box(Box(754, 754), Box(754, 754)),
+ Box(Box(755, 755), Box(755, 755)),
+ Box(Box(756, 756), Box(756, 756)),
+ Box(Box(757, 757), Box(757, 757)),
+ Box(Box(758, 758), Box(758, 758)),
+ Box(Box(759, 759), Box(759, 759)),
+ Box(Box(760, 760), Box(760, 760)),
+ Box(Box(761, 761), Box(761, 761)),
+ Box(Box(762, 762), Box(762, 762)),
+ Box(Box(763, 763), Box(763, 763)),
+ Box(Box(764, 764), Box(764, 764)),
+ Box(Box(765, 765), Box(765, 765)),
+ Box(Box(766, 766), Box(766, 766)),
+ Box(Box(767, 767), Box(767, 767)),
+ Box(Box(768, 768), Box(768, 768)),
+ Box(Box(769, 769), Box(769, 769)),
+ Box(Box(770, 770), Box(770, 770)),
+ Box(Box(771, 771), Box(771, 771)),
+ Box(Box(772, 772), Box(772, 772)),
+ Box(Box(773, 773), Box(773, 773)),
+ Box(Box(774, 774), Box(774, 774)),
+ Box(Box(775, 775), Box(775, 775)),
+ Box(Box(776, 776), Box(776, 776)),
+ Box(Box(777, 777), Box(777, 777)),
+ Box(Box(778, 778), Box(778, 778)),
+ Box(Box(779, 779), Box(779, 779)),
+ Box(Box(780, 780), Box(780, 780)),
+ Box(Box(781, 781), Box(781, 781)),
+ Box(Box(782, 782), Box(782, 782)),
+ Box(Box(783, 783), Box(783, 783)),
+ Box(Box(784, 784), Box(784, 784)),
+ Box(Box(785, 785), Box(785, 785)),
+ Box(Box(786, 786), Box(786, 786)),
+ Box(Box(787, 787), Box(787, 787)),
+ Box(Box(788, 788), Box(788, 788)),
+ Box(Box(789, 789), Box(789, 789)),
+ Box(Box(790, 790), Box(790, 790)),
+ Box(Box(791, 791), Box(791, 791)),
+ Box(Box(792, 792), Box(792, 792)),
+ Box(Box(793, 793), Box(793, 793)),
+ Box(Box(794, 794), Box(794, 794)),
+ Box(Box(795, 795), Box(795, 795)),
+ Box(Box(796, 796), Box(796, 796)),
+ Box(Box(797, 797), Box(797, 797)),
+ Box(Box(798, 798), Box(798, 798)),
+ Box(Box(799, 799), Box(799, 799)),
+ Box(Box(800, 800), Box(800, 800)),
+ Box(Box(801, 801), Box(801, 801)),
+ Box(Box(802, 802), Box(802, 802)),
+ Box(Box(803, 803), Box(803, 803)),
+ Box(Box(804, 804), Box(804, 804)),
+ Box(Box(805, 805), Box(805, 805)),
+ Box(Box(806, 806), Box(806, 806)),
+ Box(Box(807, 807), Box(807, 807)),
+ Box(Box(808, 808), Box(808, 808)),
+ Box(Box(809, 809), Box(809, 809)),
+ Box(Box(810, 810), Box(810, 810)),
+ Box(Box(811, 811), Box(811, 811)),
+ Box(Box(812, 812), Box(812, 812)),
+ Box(Box(813, 813), Box(813, 813)),
+ Box(Box(814, 814), Box(814, 814)),
+ Box(Box(815, 815), Box(815, 815)),
+ Box(Box(816, 816), Box(816, 816)),
+ Box(Box(817, 817), Box(817, 817)),
+ Box(Box(818, 818), Box(818, 818)),
+ Box(Box(819, 819), Box(819, 819)),
+ Box(Box(820, 820), Box(820, 820)),
+ Box(Box(821, 821), Box(821, 821)),
+ Box(Box(822, 822), Box(822, 822)),
+ Box(Box(823, 823), Box(823, 823)),
+ Box(Box(824, 824), Box(824, 824)),
+ Box(Box(825, 825), Box(825, 825)),
+ Box(Box(826, 826), Box(826, 826)),
+ Box(Box(827, 827), Box(827, 827)),
+ Box(Box(828, 828), Box(828, 828)),
+ Box(Box(829, 829), Box(829, 829)),
+ Box(Box(830, 830), Box(830, 830)),
+ Box(Box(831, 831), Box(831, 831)),
+ Box(Box(832, 832), Box(832, 832)),
+ Box(Box(833, 833), Box(833, 833)),
+ Box(Box(834, 834), Box(834, 834)),
+ Box(Box(835, 835), Box(835, 835)),
+ Box(Box(836, 836), Box(836, 836)),
+ Box(Box(837, 837), Box(837, 837)),
+ Box(Box(838, 838), Box(838, 838)),
+ Box(Box(839, 839), Box(839, 839)),
+ Box(Box(840, 840), Box(840, 840)),
+ Box(Box(841, 841), Box(841, 841)),
+ Box(Box(842, 842), Box(842, 842)),
+ Box(Box(843, 843), Box(843, 843)),
+ Box(Box(844, 844), Box(844, 844)),
+ Box(Box(845, 845), Box(845, 845)),
+ Box(Box(846, 846), Box(846, 846)),
+ Box(Box(847, 847), Box(847, 847)),
+ Box(Box(848, 848), Box(848, 848)),
+ Box(Box(849, 849), Box(849, 849)),
+ Box(Box(850, 850), Box(850, 850)),
+ Box(Box(851, 851), Box(851, 851)),
+ Box(Box(852, 852), Box(852, 852)),
+ Box(Box(853, 853), Box(853, 853)),
+ Box(Box(854, 854), Box(854, 854)),
+ Box(Box(855, 855), Box(855, 855)),
+ Box(Box(856, 856), Box(856, 856)),
+ Box(Box(857, 857), Box(857, 857)),
+ Box(Box(858, 858), Box(858, 858)),
+ Box(Box(859, 859), Box(859, 859)),
+ Box(Box(860, 860), Box(860, 860)),
+ Box(Box(861, 861), Box(861, 861)),
+ Box(Box(862, 862), Box(862, 862)),
+ Box(Box(863, 863), Box(863, 863)),
+ Box(Box(864, 864), Box(864, 864)),
+ Box(Box(865, 865), Box(865, 865)),
+ Box(Box(866, 866), Box(866, 866)),
+ Box(Box(867, 867), Box(867, 867)),
+ Box(Box(868, 868), Box(868, 868)),
+ Box(Box(869, 869), Box(869, 869)),
+ Box(Box(870, 870), Box(870, 870)),
+ Box(Box(871, 871), Box(871, 871)),
+ Box(Box(872, 872), Box(872, 872)),
+ Box(Box(873, 873), Box(873, 873)),
+ Box(Box(874, 874), Box(874, 874)),
+ Box(Box(875, 875), Box(875, 875)),
+ Box(Box(876, 876), Box(876, 876)),
+ Box(Box(877, 877), Box(877, 877)),
+ Box(Box(878, 878), Box(878, 878)),
+ Box(Box(879, 879), Box(879, 879)),
+ Box(Box(880, 880), Box(880, 880)),
+ Box(Box(881, 881), Box(881, 881)),
+ Box(Box(882, 882), Box(882, 882)),
+ Box(Box(883, 883), Box(883, 883)),
+ Box(Box(884, 884), Box(884, 884)),
+ Box(Box(885, 885), Box(885, 885)),
+ Box(Box(886, 886), Box(886, 886)),
+ Box(Box(887, 887), Box(887, 887)),
+ Box(Box(888, 888), Box(888, 888)),
+ Box(Box(889, 889), Box(889, 889)),
+ Box(Box(890, 890), Box(890, 890)),
+ Box(Box(891, 891), Box(891, 891)),
+ Box(Box(892, 892), Box(892, 892)),
+ Box(Box(893, 893), Box(893, 893)),
+ Box(Box(894, 894), Box(894, 894)),
+ Box(Box(895, 895), Box(895, 895)),
+ Box(Box(896, 896), Box(896, 896)),
+ Box(Box(897, 897), Box(897, 897)),
+ Box(Box(898, 898), Box(898, 898)),
+ Box(Box(899, 899), Box(899, 899)),
+ Box(Box(900, 900), Box(900, 900)),
+ Box(Box(901, 901), Box(901, 901)),
+ Box(Box(902, 902), Box(902, 902)),
+ Box(Box(903, 903), Box(903, 903)),
+ Box(Box(904, 904), Box(904, 904)),
+ Box(Box(905, 905), Box(905, 905)),
+ Box(Box(906, 906), Box(906, 906)),
+ Box(Box(907, 907), Box(907, 907)),
+ Box(Box(908, 908), Box(908, 908)),
+ Box(Box(909, 909), Box(909, 909)),
+ Box(Box(910, 910), Box(910, 910)),
+ Box(Box(911, 911), Box(911, 911)),
+ Box(Box(912, 912), Box(912, 912)),
+ Box(Box(913, 913), Box(913, 913)),
+ Box(Box(914, 914), Box(914, 914)),
+ Box(Box(915, 915), Box(915, 915)),
+ Box(Box(916, 916), Box(916, 916)),
+ Box(Box(917, 917), Box(917, 917)),
+ Box(Box(918, 918), Box(918, 918)),
+ Box(Box(919, 919), Box(919, 919)),
+ Box(Box(920, 920), Box(920, 920)),
+ Box(Box(921, 921), Box(921, 921)),
+ Box(Box(922, 922), Box(922, 922)),
+ Box(Box(923, 923), Box(923, 923)),
+ Box(Box(924, 924), Box(924, 924)),
+ Box(Box(925, 925), Box(925, 925)),
+ Box(Box(926, 926), Box(926, 926)),
+ Box(Box(927, 927), Box(927, 927)),
+ Box(Box(928, 928), Box(928, 928)),
+ Box(Box(929, 929), Box(929, 929)),
+ Box(Box(930, 930), Box(930, 930)),
+ Box(Box(931, 931), Box(931, 931)),
+ Box(Box(932, 932), Box(932, 932)),
+ Box(Box(933, 933), Box(933, 933)),
+ Box(Box(934, 934), Box(934, 934)),
+ Box(Box(935, 935), Box(935, 935)),
+ Box(Box(936, 936), Box(936, 936)),
+ Box(Box(937, 937), Box(937, 937)),
+ Box(Box(938, 938), Box(938, 938)),
+ Box(Box(939, 939), Box(939, 939)),
+ Box(Box(940, 940), Box(940, 940)),
+ Box(Box(941, 941), Box(941, 941)),
+ Box(Box(942, 942), Box(942, 942)),
+ Box(Box(943, 943), Box(943, 943)),
+ Box(Box(944, 944), Box(944, 944)),
+ Box(Box(945, 945), Box(945, 945)),
+ Box(Box(946, 946), Box(946, 946)),
+ Box(Box(947, 947), Box(947, 947)),
+ Box(Box(948, 948), Box(948, 948)),
+ Box(Box(949, 949), Box(949, 949)),
+ Box(Box(950, 950), Box(950, 950)),
+ Box(Box(951, 951), Box(951, 951)),
+ Box(Box(952, 952), Box(952, 952)),
+ Box(Box(953, 953), Box(953, 953)),
+ Box(Box(954, 954), Box(954, 954)),
+ Box(Box(955, 955), Box(955, 955)),
+ Box(Box(956, 956), Box(956, 956)),
+ Box(Box(957, 957), Box(957, 957)),
+ Box(Box(958, 958), Box(958, 958)),
+ Box(Box(959, 959), Box(959, 959)),
+ Box(Box(960, 960), Box(960, 960)),
+ Box(Box(961, 961), Box(961, 961)),
+ Box(Box(962, 962), Box(962, 962)),
+ Box(Box(963, 963), Box(963, 963)),
+ Box(Box(964, 964), Box(964, 964)),
+ Box(Box(965, 965), Box(965, 965)),
+ Box(Box(966, 966), Box(966, 966)),
+ Box(Box(967, 967), Box(967, 967)),
+ Box(Box(968, 968), Box(968, 968)),
+ Box(Box(969, 969), Box(969, 969)),
+ Box(Box(970, 970), Box(970, 970)),
+ Box(Box(971, 971), Box(971, 971)),
+ Box(Box(972, 972), Box(972, 972)),
+ Box(Box(973, 973), Box(973, 973)),
+ Box(Box(974, 974), Box(974, 974)),
+ Box(Box(975, 975), Box(975, 975)),
+ Box(Box(976, 976), Box(976, 976)),
+ Box(Box(977, 977), Box(977, 977)),
+ Box(Box(978, 978), Box(978, 978)),
+ Box(Box(979, 979), Box(979, 979)),
+ Box(Box(980, 980), Box(980, 980)),
+ Box(Box(981, 981), Box(981, 981)),
+ Box(Box(982, 982), Box(982, 982)),
+ Box(Box(983, 983), Box(983, 983)),
+ Box(Box(984, 984), Box(984, 984)),
+ Box(Box(985, 985), Box(985, 985)),
+ Box(Box(986, 986), Box(986, 986)),
+ Box(Box(987, 987), Box(987, 987)),
+ Box(Box(988, 988), Box(988, 988)),
+ Box(Box(989, 989), Box(989, 989)),
+ Box(Box(990, 990), Box(990, 990)),
+ Box(Box(991, 991), Box(991, 991)),
+ Box(Box(992, 992), Box(992, 992)),
+ Box(Box(993, 993), Box(993, 993)),
+ Box(Box(994, 994), Box(994, 994)),
+ Box(Box(995, 995), Box(995, 995)),
+ Box(Box(996, 996), Box(996, 996)),
+ Box(Box(997, 997), Box(997, 997)),
+ Box(Box(998, 998), Box(998, 998)),
+ Box(Box(999, 999), Box(999, 999)),
+ Box(Box(1000, 1000), Box(1000, 1000)),
+ Box(Box(1001, 1001), Box(1001, 1001)),
+ Box(Box(1002, 1002), Box(1002, 1002)),
+ Box(Box(1003, 1003), Box(1003, 1003)),
+ Box(Box(1004, 1004), Box(1004, 1004)),
+ Box(Box(1005, 1005), Box(1005, 1005)),
+ Box(Box(1006, 1006), Box(1006, 1006)),
+ Box(Box(1007, 1007), Box(1007, 1007)),
+ Box(Box(1008, 1008), Box(1008, 1008)),
+ Box(Box(1009, 1009), Box(1009, 1009)),
+ Box(Box(1010, 1010), Box(1010, 1010)),
+ Box(Box(1011, 1011), Box(1011, 1011)),
+ Box(Box(1012, 1012), Box(1012, 1012)),
+ Box(Box(1013, 1013), Box(1013, 1013)),
+ Box(Box(1014, 1014), Box(1014, 1014)),
+ Box(Box(1015, 1015), Box(1015, 1015)),
+ Box(Box(1016, 1016), Box(1016, 1016)),
+ Box(Box(1017, 1017), Box(1017, 1017)),
+ Box(Box(1018, 1018), Box(1018, 1018)),
+ Box(Box(1019, 1019), Box(1019, 1019)),
+ Box(Box(1020, 1020), Box(1020, 1020)),
+ Box(Box(1021, 1021), Box(1021, 1021)),
+ Box(Box(1022, 1022), Box(1022, 1022)),
+ Box(Box(1023, 1023), Box(1023, 1023)),
+ Box(Box(1024, 1024), Box(1024, 1024)),
+ Box(Box(1025, 1025), Box(1025, 1025)),
+ Box(Box(1026, 1026), Box(1026, 1026)),
+ Box(Box(1027, 1027), Box(1027, 1027)),
+ Box(Box(1028, 1028), Box(1028, 1028)),
+ Box(Box(1029, 1029), Box(1029, 1029)),
+ Box(Box(1030, 1030), Box(1030, 1030)),
+ Box(Box(1031, 1031), Box(1031, 1031)),
+ Box(Box(1032, 1032), Box(1032, 1032)),
+ Box(Box(1033, 1033), Box(1033, 1033)),
+ Box(Box(1034, 1034), Box(1034, 1034)),
+ Box(Box(1035, 1035), Box(1035, 1035)),
+ Box(Box(1036, 1036), Box(1036, 1036)),
+ Box(Box(1037, 1037), Box(1037, 1037)),
+ Box(Box(1038, 1038), Box(1038, 1038)),
+ Box(Box(1039, 1039), Box(1039, 1039)),
+ Box(Box(1040, 1040), Box(1040, 1040)),
+ Box(Box(1041, 1041), Box(1041, 1041)),
+ Box(Box(1042, 1042), Box(1042, 1042)),
+ Box(Box(1043, 1043), Box(1043, 1043)),
+ Box(Box(1044, 1044), Box(1044, 1044)),
+ Box(Box(1045, 1045), Box(1045, 1045)),
+ Box(Box(1046, 1046), Box(1046, 1046)),
+ Box(Box(1047, 1047), Box(1047, 1047)),
+ Box(Box(1048, 1048), Box(1048, 1048)),
+ Box(Box(1049, 1049), Box(1049, 1049)),
+ Box(Box(1050, 1050), Box(1050, 1050)),
+ Box(Box(1051, 1051), Box(1051, 1051)),
+ Box(Box(1052, 1052), Box(1052, 1052)),
+ Box(Box(1053, 1053), Box(1053, 1053)),
+ Box(Box(1054, 1054), Box(1054, 1054)),
+ Box(Box(1055, 1055), Box(1055, 1055)),
+ Box(Box(1056, 1056), Box(1056, 1056)),
+ Box(Box(1057, 1057), Box(1057, 1057)),
+ Box(Box(1058, 1058), Box(1058, 1058)),
+ Box(Box(1059, 1059), Box(1059, 1059)),
+ Box(Box(1060, 1060), Box(1060, 1060)),
+ Box(Box(1061, 1061), Box(1061, 1061)),
+ Box(Box(1062, 1062), Box(1062, 1062)),
+ Box(Box(1063, 1063), Box(1063, 1063)),
+ Box(Box(1064, 1064), Box(1064, 1064)),
+ Box(Box(1065, 1065), Box(1065, 1065)),
+ Box(Box(1066, 1066), Box(1066, 1066)),
+ Box(Box(1067, 1067), Box(1067, 1067)),
+ Box(Box(1068, 1068), Box(1068, 1068)),
+ Box(Box(1069, 1069), Box(1069, 1069)),
+ Box(Box(1070, 1070), Box(1070, 1070)),
+ Box(Box(1071, 1071), Box(1071, 1071)),
+ Box(Box(1072, 1072), Box(1072, 1072)),
+ Box(Box(1073, 1073), Box(1073, 1073)),
+ Box(Box(1074, 1074), Box(1074, 1074)),
+ Box(Box(1075, 1075), Box(1075, 1075)),
+ Box(Box(1076, 1076), Box(1076, 1076)),
+ Box(Box(1077, 1077), Box(1077, 1077)),
+ Box(Box(1078, 1078), Box(1078, 1078)),
+ Box(Box(1079, 1079), Box(1079, 1079)),
+ Box(Box(1080, 1080), Box(1080, 1080)),
+ Box(Box(1081, 1081), Box(1081, 1081)),
+ Box(Box(1082, 1082), Box(1082, 1082)),
+ Box(Box(1083, 1083), Box(1083, 1083)),
+ Box(Box(1084, 1084), Box(1084, 1084)),
+ Box(Box(1085, 1085), Box(1085, 1085)),
+ Box(Box(1086, 1086), Box(1086, 1086)),
+ Box(Box(1087, 1087), Box(1087, 1087)),
+ Box(Box(1088, 1088), Box(1088, 1088)),
+ Box(Box(1089, 1089), Box(1089, 1089)),
+ Box(Box(1090, 1090), Box(1090, 1090)),
+ Box(Box(1091, 1091), Box(1091, 1091)),
+ Box(Box(1092, 1092), Box(1092, 1092)),
+ Box(Box(1093, 1093), Box(1093, 1093)),
+ Box(Box(1094, 1094), Box(1094, 1094)),
+ Box(Box(1095, 1095), Box(1095, 1095)),
+ Box(Box(1096, 1096), Box(1096, 1096)),
+ Box(Box(1097, 1097), Box(1097, 1097)),
+ Box(Box(1098, 1098), Box(1098, 1098)),
+ Box(Box(1099, 1099), Box(1099, 1099)),
+ Box(Box(1100, 1100), Box(1100, 1100)),
+ Box(Box(1101, 1101), Box(1101, 1101)),
+ Box(Box(1102, 1102), Box(1102, 1102)),
+ Box(Box(1103, 1103), Box(1103, 1103)),
+ Box(Box(1104, 1104), Box(1104, 1104)),
+ Box(Box(1105, 1105), Box(1105, 1105)),
+ Box(Box(1106, 1106), Box(1106, 1106)),
+ Box(Box(1107, 1107), Box(1107, 1107)),
+ Box(Box(1108, 1108), Box(1108, 1108)),
+ Box(Box(1109, 1109), Box(1109, 1109)),
+ Box(Box(1110, 1110), Box(1110, 1110)),
+ Box(Box(1111, 1111), Box(1111, 1111)),
+ Box(Box(1112, 1112), Box(1112, 1112)),
+ Box(Box(1113, 1113), Box(1113, 1113)),
+ Box(Box(1114, 1114), Box(1114, 1114)),
+ Box(Box(1115, 1115), Box(1115, 1115)),
+ Box(Box(1116, 1116), Box(1116, 1116)),
+ Box(Box(1117, 1117), Box(1117, 1117)),
+ Box(Box(1118, 1118), Box(1118, 1118)),
+ Box(Box(1119, 1119), Box(1119, 1119)),
+ Box(Box(1120, 1120), Box(1120, 1120)),
+ Box(Box(1121, 1121), Box(1121, 1121)),
+ Box(Box(1122, 1122), Box(1122, 1122)),
+ Box(Box(1123, 1123), Box(1123, 1123)),
+ Box(Box(1124, 1124), Box(1124, 1124)),
+ Box(Box(1125, 1125), Box(1125, 1125)),
+ Box(Box(1126, 1126), Box(1126, 1126)),
+ Box(Box(1127, 1127), Box(1127, 1127)),
+ Box(Box(1128, 1128), Box(1128, 1128)),
+ Box(Box(1129, 1129), Box(1129, 1129)),
+ Box(Box(1130, 1130), Box(1130, 1130)),
+ Box(Box(1131, 1131), Box(1131, 1131)),
+ Box(Box(1132, 1132), Box(1132, 1132)),
+ Box(Box(1133, 1133), Box(1133, 1133)),
+ Box(Box(1134, 1134), Box(1134, 1134)),
+ Box(Box(1135, 1135), Box(1135, 1135)),
+ Box(Box(1136, 1136), Box(1136, 1136)),
+ Box(Box(1137, 1137), Box(1137, 1137)),
+ Box(Box(1138, 1138), Box(1138, 1138)),
+ Box(Box(1139, 1139), Box(1139, 1139)),
+ Box(Box(1140, 1140), Box(1140, 1140)),
+ Box(Box(1141, 1141), Box(1141, 1141)),
+ Box(Box(1142, 1142), Box(1142, 1142)),
+ Box(Box(1143, 1143), Box(1143, 1143)),
+ Box(Box(1144, 1144), Box(1144, 1144)),
+ Box(Box(1145, 1145), Box(1145, 1145)),
+ Box(Box(1146, 1146), Box(1146, 1146)),
+ Box(Box(1147, 1147), Box(1147, 1147)),
+ Box(Box(1148, 1148), Box(1148, 1148)),
+ Box(Box(1149, 1149), Box(1149, 1149)),
+ Box(Box(1150, 1150), Box(1150, 1150)),
+ Box(Box(1151, 1151), Box(1151, 1151)),
+ Box(Box(1152, 1152), Box(1152, 1152)),
+ Box(Box(1153, 1153), Box(1153, 1153)),
+ Box(Box(1154, 1154), Box(1154, 1154)),
+ Box(Box(1155, 1155), Box(1155, 1155)),
+ Box(Box(1156, 1156), Box(1156, 1156)),
+ Box(Box(1157, 1157), Box(1157, 1157)),
+ Box(Box(1158, 1158), Box(1158, 1158)),
+ Box(Box(1159, 1159), Box(1159, 1159)),
+ Box(Box(1160, 1160), Box(1160, 1160)),
+ Box(Box(1161, 1161), Box(1161, 1161)),
+ Box(Box(1162, 1162), Box(1162, 1162)),
+ Box(Box(1163, 1163), Box(1163, 1163)),
+ Box(Box(1164, 1164), Box(1164, 1164)),
+ Box(Box(1165, 1165), Box(1165, 1165)),
+ Box(Box(1166, 1166), Box(1166, 1166)),
+ Box(Box(1167, 1167), Box(1167, 1167)),
+ Box(Box(1168, 1168), Box(1168, 1168)),
+ Box(Box(1169, 1169), Box(1169, 1169)),
+ Box(Box(1170, 1170), Box(1170, 1170)),
+ Box(Box(1171, 1171), Box(1171, 1171)),
+ Box(Box(1172, 1172), Box(1172, 1172)),
+ Box(Box(1173, 1173), Box(1173, 1173)),
+ Box(Box(1174, 1174), Box(1174, 1174)),
+ Box(Box(1175, 1175), Box(1175, 1175)),
+ Box(Box(1176, 1176), Box(1176, 1176)),
+ Box(Box(1177, 1177), Box(1177, 1177)),
+ Box(Box(1178, 1178), Box(1178, 1178)),
+ Box(Box(1179, 1179), Box(1179, 1179)),
+ Box(Box(1180, 1180), Box(1180, 1180)),
+ Box(Box(1181, 1181), Box(1181, 1181)),
+ Box(Box(1182, 1182), Box(1182, 1182)),
+ Box(Box(1183, 1183), Box(1183, 1183)),
+ Box(Box(1184, 1184), Box(1184, 1184)),
+ Box(Box(1185, 1185), Box(1185, 1185)),
+ Box(Box(1186, 1186), Box(1186, 1186)),
+ Box(Box(1187, 1187), Box(1187, 1187)),
+ Box(Box(1188, 1188), Box(1188, 1188)),
+ Box(Box(1189, 1189), Box(1189, 1189)),
+ Box(Box(1190, 1190), Box(1190, 1190)),
+ Box(Box(1191, 1191), Box(1191, 1191)),
+ Box(Box(1192, 1192), Box(1192, 1192)),
+ Box(Box(1193, 1193), Box(1193, 1193)),
+ Box(Box(1194, 1194), Box(1194, 1194)),
+ Box(Box(1195, 1195), Box(1195, 1195)),
+ Box(Box(1196, 1196), Box(1196, 1196)),
+ Box(Box(1197, 1197), Box(1197, 1197)),
+ Box(Box(1198, 1198), Box(1198, 1198)),
+ Box(Box(1199, 1199), Box(1199, 1199)),
+ Box(Box(1200, 1200), Box(1200, 1200)),
+ Box(Box(1201, 1201), Box(1201, 1201)),
+ Box(Box(1202, 1202), Box(1202, 1202)),
+ Box(Box(1203, 1203), Box(1203, 1203)),
+ Box(Box(1204, 1204), Box(1204, 1204)),
+ Box(Box(1205, 1205), Box(1205, 1205)),
+ Box(Box(1206, 1206), Box(1206, 1206)),
+ Box(Box(1207, 1207), Box(1207, 1207)),
+ Box(Box(1208, 1208), Box(1208, 1208)),
+ Box(Box(1209, 1209), Box(1209, 1209)),
+ Box(Box(1210, 1210), Box(1210, 1210)),
+ Box(Box(1211, 1211), Box(1211, 1211)),
+ Box(Box(1212, 1212), Box(1212, 1212)),
+ Box(Box(1213, 1213), Box(1213, 1213)),
+ Box(Box(1214, 1214), Box(1214, 1214)),
+ Box(Box(1215, 1215), Box(1215, 1215)),
+ Box(Box(1216, 1216), Box(1216, 1216)),
+ Box(Box(1217, 1217), Box(1217, 1217)),
+ Box(Box(1218, 1218), Box(1218, 1218)),
+ Box(Box(1219, 1219), Box(1219, 1219)),
+ Box(Box(1220, 1220), Box(1220, 1220)),
+ Box(Box(1221, 1221), Box(1221, 1221)),
+ Box(Box(1222, 1222), Box(1222, 1222)),
+ Box(Box(1223, 1223), Box(1223, 1223)),
+ Box(Box(1224, 1224), Box(1224, 1224)),
+ Box(Box(1225, 1225), Box(1225, 1225)),
+ Box(Box(1226, 1226), Box(1226, 1226)),
+ Box(Box(1227, 1227), Box(1227, 1227)),
+ Box(Box(1228, 1228), Box(1228, 1228)),
+ Box(Box(1229, 1229), Box(1229, 1229)),
+ Box(Box(1230, 1230), Box(1230, 1230)),
+ Box(Box(1231, 1231), Box(1231, 1231)),
+ Box(Box(1232, 1232), Box(1232, 1232)),
+ Box(Box(1233, 1233), Box(1233, 1233)),
+ Box(Box(1234, 1234), Box(1234, 1234)),
+ Box(Box(1235, 1235), Box(1235, 1235)),
+ Box(Box(1236, 1236), Box(1236, 1236)),
+ Box(Box(1237, 1237), Box(1237, 1237)),
+ Box(Box(1238, 1238), Box(1238, 1238)),
+ Box(Box(1239, 1239), Box(1239, 1239)),
+ Box(Box(1240, 1240), Box(1240, 1240)),
+ Box(Box(1241, 1241), Box(1241, 1241)),
+ Box(Box(1242, 1242), Box(1242, 1242)),
+ Box(Box(1243, 1243), Box(1243, 1243)),
+ Box(Box(1244, 1244), Box(1244, 1244)),
+ Box(Box(1245, 1245), Box(1245, 1245)),
+ Box(Box(1246, 1246), Box(1246, 1246)),
+ Box(Box(1247, 1247), Box(1247, 1247)),
+ Box(Box(1248, 1248), Box(1248, 1248)),
+ Box(Box(1249, 1249), Box(1249, 1249)),
+ Box(Box(1250, 1250), Box(1250, 1250)),
+ Box(Box(1251, 1251), Box(1251, 1251)),
+ Box(Box(1252, 1252), Box(1252, 1252)),
+ Box(Box(1253, 1253), Box(1253, 1253)),
+ Box(Box(1254, 1254), Box(1254, 1254)),
+ Box(Box(1255, 1255), Box(1255, 1255)),
+ Box(Box(1256, 1256), Box(1256, 1256)),
+ Box(Box(1257, 1257), Box(1257, 1257)),
+ Box(Box(1258, 1258), Box(1258, 1258)),
+ Box(Box(1259, 1259), Box(1259, 1259)),
+ Box(Box(1260, 1260), Box(1260, 1260)),
+ Box(Box(1261, 1261), Box(1261, 1261)),
+ Box(Box(1262, 1262), Box(1262, 1262)),
+ Box(Box(1263, 1263), Box(1263, 1263)),
+ Box(Box(1264, 1264), Box(1264, 1264)),
+ Box(Box(1265, 1265), Box(1265, 1265)),
+ Box(Box(1266, 1266), Box(1266, 1266)),
+ Box(Box(1267, 1267), Box(1267, 1267)),
+ Box(Box(1268, 1268), Box(1268, 1268)),
+ Box(Box(1269, 1269), Box(1269, 1269)),
+ Box(Box(1270, 1270), Box(1270, 1270)),
+ Box(Box(1271, 1271), Box(1271, 1271)),
+ Box(Box(1272, 1272), Box(1272, 1272)),
+ Box(Box(1273, 1273), Box(1273, 1273)),
+ Box(Box(1274, 1274), Box(1274, 1274)),
+ Box(Box(1275, 1275), Box(1275, 1275)),
+ Box(Box(1276, 1276), Box(1276, 1276)),
+ Box(Box(1277, 1277), Box(1277, 1277)),
+ Box(Box(1278, 1278), Box(1278, 1278)),
+ Box(Box(1279, 1279), Box(1279, 1279)),
+ Box(Box(1280, 1280), Box(1280, 1280)),
+ Box(Box(1281, 1281), Box(1281, 1281)),
+ Box(Box(1282, 1282), Box(1282, 1282)),
+ Box(Box(1283, 1283), Box(1283, 1283)),
+ Box(Box(1284, 1284), Box(1284, 1284)),
+ Box(Box(1285, 1285), Box(1285, 1285)),
+ Box(Box(1286, 1286), Box(1286, 1286)),
+ Box(Box(1287, 1287), Box(1287, 1287)),
+ Box(Box(1288, 1288), Box(1288, 1288)),
+ Box(Box(1289, 1289), Box(1289, 1289)),
+ Box(Box(1290, 1290), Box(1290, 1290)),
+ Box(Box(1291, 1291), Box(1291, 1291)),
+ Box(Box(1292, 1292), Box(1292, 1292)),
+ Box(Box(1293, 1293), Box(1293, 1293)),
+ Box(Box(1294, 1294), Box(1294, 1294)),
+ Box(Box(1295, 1295), Box(1295, 1295)),
+ Box(Box(1296, 1296), Box(1296, 1296)),
+ Box(Box(1297, 1297), Box(1297, 1297)),
+ Box(Box(1298, 1298), Box(1298, 1298)),
+ Box(Box(1299, 1299), Box(1299, 1299)),
+ Box(Box(1300, 1300), Box(1300, 1300)),
+ Box(Box(1301, 1301), Box(1301, 1301)),
+ Box(Box(1302, 1302), Box(1302, 1302)),
+ Box(Box(1303, 1303), Box(1303, 1303)),
+ Box(Box(1304, 1304), Box(1304, 1304)),
+ Box(Box(1305, 1305), Box(1305, 1305)),
+ Box(Box(1306, 1306), Box(1306, 1306)),
+ Box(Box(1307, 1307), Box(1307, 1307)),
+ Box(Box(1308, 1308), Box(1308, 1308)),
+ Box(Box(1309, 1309), Box(1309, 1309)),
+ Box(Box(1310, 1310), Box(1310, 1310)),
+ Box(Box(1311, 1311), Box(1311, 1311)),
+ Box(Box(1312, 1312), Box(1312, 1312)),
+ Box(Box(1313, 1313), Box(1313, 1313)),
+ Box(Box(1314, 1314), Box(1314, 1314)),
+ Box(Box(1315, 1315), Box(1315, 1315)),
+ Box(Box(1316, 1316), Box(1316, 1316)),
+ Box(Box(1317, 1317), Box(1317, 1317)),
+ Box(Box(1318, 1318), Box(1318, 1318)),
+ Box(Box(1319, 1319), Box(1319, 1319)),
+ Box(Box(1320, 1320), Box(1320, 1320)),
+ Box(Box(1321, 1321), Box(1321, 1321)),
+ Box(Box(1322, 1322), Box(1322, 1322)),
+ Box(Box(1323, 1323), Box(1323, 1323)),
+ Box(Box(1324, 1324), Box(1324, 1324)),
+ Box(Box(1325, 1325), Box(1325, 1325)),
+ Box(Box(1326, 1326), Box(1326, 1326)),
+ Box(Box(1327, 1327), Box(1327, 1327)),
+ Box(Box(1328, 1328), Box(1328, 1328)),
+ Box(Box(1329, 1329), Box(1329, 1329)),
+ Box(Box(1330, 1330), Box(1330, 1330)),
+ Box(Box(1331, 1331), Box(1331, 1331)),
+ Box(Box(1332, 1332), Box(1332, 1332)),
+ Box(Box(1333, 1333), Box(1333, 1333)),
+ Box(Box(1334, 1334), Box(1334, 1334)),
+ Box(Box(1335, 1335), Box(1335, 1335)),
+ Box(Box(1336, 1336), Box(1336, 1336)),
+ Box(Box(1337, 1337), Box(1337, 1337)),
+ Box(Box(1338, 1338), Box(1338, 1338)),
+ Box(Box(1339, 1339), Box(1339, 1339)),
+ Box(Box(1340, 1340), Box(1340, 1340)),
+ Box(Box(1341, 1341), Box(1341, 1341)),
+ Box(Box(1342, 1342), Box(1342, 1342)),
+ Box(Box(1343, 1343), Box(1343, 1343)),
+ Box(Box(1344, 1344), Box(1344, 1344)),
+ Box(Box(1345, 1345), Box(1345, 1345)),
+ Box(Box(1346, 1346), Box(1346, 1346)),
+ Box(Box(1347, 1347), Box(1347, 1347)),
+ Box(Box(1348, 1348), Box(1348, 1348)),
+ Box(Box(1349, 1349), Box(1349, 1349)),
+ Box(Box(1350, 1350), Box(1350, 1350)),
+ Box(Box(1351, 1351), Box(1351, 1351)),
+ Box(Box(1352, 1352), Box(1352, 1352)),
+ Box(Box(1353, 1353), Box(1353, 1353)),
+ Box(Box(1354, 1354), Box(1354, 1354)),
+ Box(Box(1355, 1355), Box(1355, 1355)),
+ Box(Box(1356, 1356), Box(1356, 1356)),
+ Box(Box(1357, 1357), Box(1357, 1357)),
+ Box(Box(1358, 1358), Box(1358, 1358)),
+ Box(Box(1359, 1359), Box(1359, 1359)),
+ Box(Box(1360, 1360), Box(1360, 1360)),
+ Box(Box(1361, 1361), Box(1361, 1361)),
+ Box(Box(1362, 1362), Box(1362, 1362)),
+ Box(Box(1363, 1363), Box(1363, 1363)),
+ Box(Box(1364, 1364), Box(1364, 1364)),
+ Box(Box(1365, 1365), Box(1365, 1365)),
+ Box(Box(1366, 1366), Box(1366, 1366)),
+ Box(Box(1367, 1367), Box(1367, 1367)),
+ Box(Box(1368, 1368), Box(1368, 1368)),
+ Box(Box(1369, 1369), Box(1369, 1369)),
+ Box(Box(1370, 1370), Box(1370, 1370)),
+ Box(Box(1371, 1371), Box(1371, 1371)),
+ Box(Box(1372, 1372), Box(1372, 1372)),
+ Box(Box(1373, 1373), Box(1373, 1373)),
+ Box(Box(1374, 1374), Box(1374, 1374)),
+ Box(Box(1375, 1375), Box(1375, 1375)),
+ Box(Box(1376, 1376), Box(1376, 1376)),
+ Box(Box(1377, 1377), Box(1377, 1377)),
+ Box(Box(1378, 1378), Box(1378, 1378)),
+ Box(Box(1379, 1379), Box(1379, 1379)),
+ Box(Box(1380, 1380), Box(1380, 1380)),
+ Box(Box(1381, 1381), Box(1381, 1381)),
+ Box(Box(1382, 1382), Box(1382, 1382)),
+ Box(Box(1383, 1383), Box(1383, 1383)),
+ Box(Box(1384, 1384), Box(1384, 1384)),
+ Box(Box(1385, 1385), Box(1385, 1385)),
+ Box(Box(1386, 1386), Box(1386, 1386)),
+ Box(Box(1387, 1387), Box(1387, 1387)),
+ Box(Box(1388, 1388), Box(1388, 1388)),
+ Box(Box(1389, 1389), Box(1389, 1389)),
+ Box(Box(1390, 1390), Box(1390, 1390)),
+ Box(Box(1391, 1391), Box(1391, 1391)),
+ Box(Box(1392, 1392), Box(1392, 1392)),
+ Box(Box(1393, 1393), Box(1393, 1393)),
+ Box(Box(1394, 1394), Box(1394, 1394)),
+ Box(Box(1395, 1395), Box(1395, 1395)),
+ Box(Box(1396, 1396), Box(1396, 1396)),
+ Box(Box(1397, 1397), Box(1397, 1397)),
+ Box(Box(1398, 1398), Box(1398, 1398)),
+ Box(Box(1399, 1399), Box(1399, 1399)),
+ Box(Box(1400, 1400), Box(1400, 1400)),
+ Box(Box(1401, 1401), Box(1401, 1401)),
+ Box(Box(1402, 1402), Box(1402, 1402)),
+ Box(Box(1403, 1403), Box(1403, 1403)),
+ Box(Box(1404, 1404), Box(1404, 1404)),
+ Box(Box(1405, 1405), Box(1405, 1405)),
+ Box(Box(1406, 1406), Box(1406, 1406)),
+ Box(Box(1407, 1407), Box(1407, 1407)),
+ Box(Box(1408, 1408), Box(1408, 1408)),
+ Box(Box(1409, 1409), Box(1409, 1409)),
+ Box(Box(1410, 1410), Box(1410, 1410)),
+ Box(Box(1411, 1411), Box(1411, 1411)),
+ Box(Box(1412, 1412), Box(1412, 1412)),
+ Box(Box(1413, 1413), Box(1413, 1413)),
+ Box(Box(1414, 1414), Box(1414, 1414)),
+ Box(Box(1415, 1415), Box(1415, 1415)),
+ Box(Box(1416, 1416), Box(1416, 1416)),
+ Box(Box(1417, 1417), Box(1417, 1417)),
+ Box(Box(1418, 1418), Box(1418, 1418)),
+ Box(Box(1419, 1419), Box(1419, 1419)),
+ Box(Box(1420, 1420), Box(1420, 1420)),
+ Box(Box(1421, 1421), Box(1421, 1421)),
+ Box(Box(1422, 1422), Box(1422, 1422)),
+ Box(Box(1423, 1423), Box(1423, 1423)),
+ Box(Box(1424, 1424), Box(1424, 1424)),
+ Box(Box(1425, 1425), Box(1425, 1425)),
+ Box(Box(1426, 1426), Box(1426, 1426)),
+ Box(Box(1427, 1427), Box(1427, 1427)),
+ Box(Box(1428, 1428), Box(1428, 1428)),
+ Box(Box(1429, 1429), Box(1429, 1429)),
+ Box(Box(1430, 1430), Box(1430, 1430)),
+ Box(Box(1431, 1431), Box(1431, 1431)),
+ Box(Box(1432, 1432), Box(1432, 1432)),
+ Box(Box(1433, 1433), Box(1433, 1433)),
+ Box(Box(1434, 1434), Box(1434, 1434)),
+ Box(Box(1435, 1435), Box(1435, 1435)),
+ Box(Box(1436, 1436), Box(1436, 1436)),
+ Box(Box(1437, 1437), Box(1437, 1437)),
+ Box(Box(1438, 1438), Box(1438, 1438)),
+ Box(Box(1439, 1439), Box(1439, 1439)),
+ Box(Box(1440, 1440), Box(1440, 1440)),
+ Box(Box(1441, 1441), Box(1441, 1441)),
+ Box(Box(1442, 1442), Box(1442, 1442)),
+ Box(Box(1443, 1443), Box(1443, 1443)),
+ Box(Box(1444, 1444), Box(1444, 1444)),
+ Box(Box(1445, 1445), Box(1445, 1445)),
+ Box(Box(1446, 1446), Box(1446, 1446)),
+ Box(Box(1447, 1447), Box(1447, 1447)),
+ Box(Box(1448, 1448), Box(1448, 1448)),
+ Box(Box(1449, 1449), Box(1449, 1449)),
+ Box(Box(1450, 1450), Box(1450, 1450)),
+ Box(Box(1451, 1451), Box(1451, 1451)),
+ Box(Box(1452, 1452), Box(1452, 1452)),
+ Box(Box(1453, 1453), Box(1453, 1453)),
+ Box(Box(1454, 1454), Box(1454, 1454)),
+ Box(Box(1455, 1455), Box(1455, 1455)),
+ Box(Box(1456, 1456), Box(1456, 1456)),
+ Box(Box(1457, 1457), Box(1457, 1457)),
+ Box(Box(1458, 1458), Box(1458, 1458)),
+ Box(Box(1459, 1459), Box(1459, 1459)),
+ Box(Box(1460, 1460), Box(1460, 1460)),
+ Box(Box(1461, 1461), Box(1461, 1461)),
+ Box(Box(1462, 1462), Box(1462, 1462)),
+ Box(Box(1463, 1463), Box(1463, 1463)),
+ Box(Box(1464, 1464), Box(1464, 1464)),
+ Box(Box(1465, 1465), Box(1465, 1465)),
+ Box(Box(1466, 1466), Box(1466, 1466)),
+ Box(Box(1467, 1467), Box(1467, 1467)),
+ Box(Box(1468, 1468), Box(1468, 1468)),
+ Box(Box(1469, 1469), Box(1469, 1469)),
+ Box(Box(1470, 1470), Box(1470, 1470)),
+ Box(Box(1471, 1471), Box(1471, 1471)),
+ Box(Box(1472, 1472), Box(1472, 1472)),
+ Box(Box(1473, 1473), Box(1473, 1473)),
+ Box(Box(1474, 1474), Box(1474, 1474)),
+ Box(Box(1475, 1475), Box(1475, 1475)),
+ Box(Box(1476, 1476), Box(1476, 1476)),
+ Box(Box(1477, 1477), Box(1477, 1477)),
+ Box(Box(1478, 1478), Box(1478, 1478)),
+ Box(Box(1479, 1479), Box(1479, 1479)),
+ Box(Box(1480, 1480), Box(1480, 1480)),
+ Box(Box(1481, 1481), Box(1481, 1481)),
+ Box(Box(1482, 1482), Box(1482, 1482)),
+ Box(Box(1483, 1483), Box(1483, 1483)),
+ Box(Box(1484, 1484), Box(1484, 1484)),
+ Box(Box(1485, 1485), Box(1485, 1485)),
+ Box(Box(1486, 1486), Box(1486, 1486)),
+ Box(Box(1487, 1487), Box(1487, 1487)),
+ Box(Box(1488, 1488), Box(1488, 1488)),
+ Box(Box(1489, 1489), Box(1489, 1489)),
+ Box(Box(1490, 1490), Box(1490, 1490)),
+ Box(Box(1491, 1491), Box(1491, 1491)),
+ Box(Box(1492, 1492), Box(1492, 1492)),
+ Box(Box(1493, 1493), Box(1493, 1493)),
+ Box(Box(1494, 1494), Box(1494, 1494)),
+ Box(Box(1495, 1495), Box(1495, 1495)),
+ Box(Box(1496, 1496), Box(1496, 1496)),
+ Box(Box(1497, 1497), Box(1497, 1497)),
+ Box(Box(1498, 1498), Box(1498, 1498)),
+ Box(Box(1499, 1499), Box(1499, 1499)),
+ Box(Box(1500, 1500), Box(1500, 1500)),
+ Box(Box(1501, 1501), Box(1501, 1501)),
+ Box(Box(1502, 1502), Box(1502, 1502)),
+ Box(Box(1503, 1503), Box(1503, 1503)),
+ Box(Box(1504, 1504), Box(1504, 1504)),
+ Box(Box(1505, 1505), Box(1505, 1505)),
+ Box(Box(1506, 1506), Box(1506, 1506)),
+ Box(Box(1507, 1507), Box(1507, 1507)),
+ Box(Box(1508, 1508), Box(1508, 1508)),
+ Box(Box(1509, 1509), Box(1509, 1509)),
+ Box(Box(1510, 1510), Box(1510, 1510)),
+ Box(Box(1511, 1511), Box(1511, 1511)),
+ Box(Box(1512, 1512), Box(1512, 1512)),
+ Box(Box(1513, 1513), Box(1513, 1513)),
+ Box(Box(1514, 1514), Box(1514, 1514)),
+ Box(Box(1515, 1515), Box(1515, 1515)),
+ Box(Box(1516, 1516), Box(1516, 1516)),
+ Box(Box(1517, 1517), Box(1517, 1517)),
+ Box(Box(1518, 1518), Box(1518, 1518)),
+ Box(Box(1519, 1519), Box(1519, 1519)),
+ Box(Box(1520, 1520), Box(1520, 1520)),
+ Box(Box(1521, 1521), Box(1521, 1521)),
+ Box(Box(1522, 1522), Box(1522, 1522)),
+ Box(Box(1523, 1523), Box(1523, 1523)),
+ Box(Box(1524, 1524), Box(1524, 1524)),
+ Box(Box(1525, 1525), Box(1525, 1525)),
+ Box(Box(1526, 1526), Box(1526, 1526)),
+ Box(Box(1527, 1527), Box(1527, 1527)),
+ Box(Box(1528, 1528), Box(1528, 1528)),
+ Box(Box(1529, 1529), Box(1529, 1529)),
+ Box(Box(1530, 1530), Box(1530, 1530)),
+ Box(Box(1531, 1531), Box(1531, 1531)),
+ Box(Box(1532, 1532), Box(1532, 1532)),
+ Box(Box(1533, 1533), Box(1533, 1533)),
+ Box(Box(1534, 1534), Box(1534, 1534)),
+ Box(Box(1535, 1535), Box(1535, 1535)),
+ Box(Box(1536, 1536), Box(1536, 1536)),
+ Box(Box(1537, 1537), Box(1537, 1537)),
+ Box(Box(1538, 1538), Box(1538, 1538)),
+ Box(Box(1539, 1539), Box(1539, 1539)),
+ Box(Box(1540, 1540), Box(1540, 1540)),
+ Box(Box(1541, 1541), Box(1541, 1541)),
+ Box(Box(1542, 1542), Box(1542, 1542)),
+ Box(Box(1543, 1543), Box(1543, 1543)),
+ Box(Box(1544, 1544), Box(1544, 1544)),
+ Box(Box(1545, 1545), Box(1545, 1545)),
+ Box(Box(1546, 1546), Box(1546, 1546)),
+ Box(Box(1547, 1547), Box(1547, 1547)),
+ Box(Box(1548, 1548), Box(1548, 1548)),
+ Box(Box(1549, 1549), Box(1549, 1549)),
+ Box(Box(1550, 1550), Box(1550, 1550)),
+ Box(Box(1551, 1551), Box(1551, 1551)),
+ Box(Box(1552, 1552), Box(1552, 1552)),
+ Box(Box(1553, 1553), Box(1553, 1553)),
+ Box(Box(1554, 1554), Box(1554, 1554)),
+ Box(Box(1555, 1555), Box(1555, 1555)),
+ Box(Box(1556, 1556), Box(1556, 1556)),
+ Box(Box(1557, 1557), Box(1557, 1557)),
+ Box(Box(1558, 1558), Box(1558, 1558)),
+ Box(Box(1559, 1559), Box(1559, 1559)),
+ Box(Box(1560, 1560), Box(1560, 1560)),
+ Box(Box(1561, 1561), Box(1561, 1561)),
+ Box(Box(1562, 1562), Box(1562, 1562)),
+ Box(Box(1563, 1563), Box(1563, 1563)),
+ Box(Box(1564, 1564), Box(1564, 1564)),
+ Box(Box(1565, 1565), Box(1565, 1565)),
+ Box(Box(1566, 1566), Box(1566, 1566)),
+ Box(Box(1567, 1567), Box(1567, 1567)),
+ Box(Box(1568, 1568), Box(1568, 1568)),
+ Box(Box(1569, 1569), Box(1569, 1569)),
+ Box(Box(1570, 1570), Box(1570, 1570)),
+ Box(Box(1571, 1571), Box(1571, 1571)),
+ Box(Box(1572, 1572), Box(1572, 1572)),
+ Box(Box(1573, 1573), Box(1573, 1573)),
+ Box(Box(1574, 1574), Box(1574, 1574)),
+ Box(Box(1575, 1575), Box(1575, 1575)),
+ Box(Box(1576, 1576), Box(1576, 1576)),
+ Box(Box(1577, 1577), Box(1577, 1577)),
+ Box(Box(1578, 1578), Box(1578, 1578)),
+ Box(Box(1579, 1579), Box(1579, 1579)),
+ Box(Box(1580, 1580), Box(1580, 1580)),
+ Box(Box(1581, 1581), Box(1581, 1581)),
+ Box(Box(1582, 1582), Box(1582, 1582)),
+ Box(Box(1583, 1583), Box(1583, 1583)),
+ Box(Box(1584, 1584), Box(1584, 1584)),
+ Box(Box(1585, 1585), Box(1585, 1585)),
+ Box(Box(1586, 1586), Box(1586, 1586)),
+ Box(Box(1587, 1587), Box(1587, 1587)),
+ Box(Box(1588, 1588), Box(1588, 1588)),
+ Box(Box(1589, 1589), Box(1589, 1589)),
+ Box(Box(1590, 1590), Box(1590, 1590)),
+ Box(Box(1591, 1591), Box(1591, 1591)),
+ Box(Box(1592, 1592), Box(1592, 1592)),
+ Box(Box(1593, 1593), Box(1593, 1593)),
+ Box(Box(1594, 1594), Box(1594, 1594)),
+ Box(Box(1595, 1595), Box(1595, 1595)),
+ Box(Box(1596, 1596), Box(1596, 1596)),
+ Box(Box(1597, 1597), Box(1597, 1597)),
+ Box(Box(1598, 1598), Box(1598, 1598)),
+ Box(Box(1599, 1599), Box(1599, 1599)),
+ Box(Box(1600, 1600), Box(1600, 1600)),
+ Box(Box(1601, 1601), Box(1601, 1601)),
+ Box(Box(1602, 1602), Box(1602, 1602)),
+ Box(Box(1603, 1603), Box(1603, 1603)),
+ Box(Box(1604, 1604), Box(1604, 1604)),
+ Box(Box(1605, 1605), Box(1605, 1605)),
+ Box(Box(1606, 1606), Box(1606, 1606)),
+ Box(Box(1607, 1607), Box(1607, 1607)),
+ Box(Box(1608, 1608), Box(1608, 1608)),
+ Box(Box(1609, 1609), Box(1609, 1609)),
+ Box(Box(1610, 1610), Box(1610, 1610)),
+ Box(Box(1611, 1611), Box(1611, 1611)),
+ Box(Box(1612, 1612), Box(1612, 1612)),
+ Box(Box(1613, 1613), Box(1613, 1613)),
+ Box(Box(1614, 1614), Box(1614, 1614)),
+ Box(Box(1615, 1615), Box(1615, 1615)),
+ Box(Box(1616, 1616), Box(1616, 1616)),
+ Box(Box(1617, 1617), Box(1617, 1617)),
+ Box(Box(1618, 1618), Box(1618, 1618)),
+ Box(Box(1619, 1619), Box(1619, 1619)),
+ Box(Box(1620, 1620), Box(1620, 1620)),
+ Box(Box(1621, 1621), Box(1621, 1621)),
+ Box(Box(1622, 1622), Box(1622, 1622)),
+ Box(Box(1623, 1623), Box(1623, 1623)),
+ Box(Box(1624, 1624), Box(1624, 1624)),
+ Box(Box(1625, 1625), Box(1625, 1625)),
+ Box(Box(1626, 1626), Box(1626, 1626)),
+ Box(Box(1627, 1627), Box(1627, 1627)),
+ Box(Box(1628, 1628), Box(1628, 1628)),
+ Box(Box(1629, 1629), Box(1629, 1629)),
+ Box(Box(1630, 1630), Box(1630, 1630)),
+ Box(Box(1631, 1631), Box(1631, 1631)),
+ Box(Box(1632, 1632), Box(1632, 1632)),
+ Box(Box(1633, 1633), Box(1633, 1633)),
+ Box(Box(1634, 1634), Box(1634, 1634)),
+ Box(Box(1635, 1635), Box(1635, 1635)),
+ Box(Box(1636, 1636), Box(1636, 1636)),
+ Box(Box(1637, 1637), Box(1637, 1637)),
+ Box(Box(1638, 1638), Box(1638, 1638)),
+ Box(Box(1639, 1639), Box(1639, 1639)),
+ Box(Box(1640, 1640), Box(1640, 1640)),
+ Box(Box(1641, 1641), Box(1641, 1641)),
+ Box(Box(1642, 1642), Box(1642, 1642)),
+ Box(Box(1643, 1643), Box(1643, 1643)),
+ Box(Box(1644, 1644), Box(1644, 1644)),
+ Box(Box(1645, 1645), Box(1645, 1645)),
+ Box(Box(1646, 1646), Box(1646, 1646)),
+ Box(Box(1647, 1647), Box(1647, 1647)),
+ Box(Box(1648, 1648), Box(1648, 1648)),
+ Box(Box(1649, 1649), Box(1649, 1649)),
+ Box(Box(1650, 1650), Box(1650, 1650)),
+ Box(Box(1651, 1651), Box(1651, 1651)),
+ Box(Box(1652, 1652), Box(1652, 1652)),
+ Box(Box(1653, 1653), Box(1653, 1653)),
+ Box(Box(1654, 1654), Box(1654, 1654)),
+ Box(Box(1655, 1655), Box(1655, 1655)),
+ Box(Box(1656, 1656), Box(1656, 1656)),
+ Box(Box(1657, 1657), Box(1657, 1657)),
+ Box(Box(1658, 1658), Box(1658, 1658)),
+ Box(Box(1659, 1659), Box(1659, 1659)),
+ Box(Box(1660, 1660), Box(1660, 1660)),
+ Box(Box(1661, 1661), Box(1661, 1661)),
+ Box(Box(1662, 1662), Box(1662, 1662)),
+ Box(Box(1663, 1663), Box(1663, 1663)),
+ Box(Box(1664, 1664), Box(1664, 1664)),
+ Box(Box(1665, 1665), Box(1665, 1665)),
+ Box(Box(1666, 1666), Box(1666, 1666)),
+ Box(Box(1667, 1667), Box(1667, 1667)),
+ Box(Box(1668, 1668), Box(1668, 1668)),
+ Box(Box(1669, 1669), Box(1669, 1669)),
+ Box(Box(1670, 1670), Box(1670, 1670)),
+ Box(Box(1671, 1671), Box(1671, 1671)),
+ Box(Box(1672, 1672), Box(1672, 1672)),
+ Box(Box(1673, 1673), Box(1673, 1673)),
+ Box(Box(1674, 1674), Box(1674, 1674)),
+ Box(Box(1675, 1675), Box(1675, 1675)),
+ Box(Box(1676, 1676), Box(1676, 1676)),
+ Box(Box(1677, 1677), Box(1677, 1677)),
+ Box(Box(1678, 1678), Box(1678, 1678)),
+ Box(Box(1679, 1679), Box(1679, 1679)),
+ Box(Box(1680, 1680), Box(1680, 1680)),
+ Box(Box(1681, 1681), Box(1681, 1681)),
+ Box(Box(1682, 1682), Box(1682, 1682)),
+ Box(Box(1683, 1683), Box(1683, 1683)),
+ Box(Box(1684, 1684), Box(1684, 1684)),
+ Box(Box(1685, 1685), Box(1685, 1685)),
+ Box(Box(1686, 1686), Box(1686, 1686)),
+ Box(Box(1687, 1687), Box(1687, 1687)),
+ Box(Box(1688, 1688), Box(1688, 1688)),
+ Box(Box(1689, 1689), Box(1689, 1689)),
+ Box(Box(1690, 1690), Box(1690, 1690)),
+ Box(Box(1691, 1691), Box(1691, 1691)),
+ Box(Box(1692, 1692), Box(1692, 1692)),
+ Box(Box(1693, 1693), Box(1693, 1693)),
+ Box(Box(1694, 1694), Box(1694, 1694)),
+ Box(Box(1695, 1695), Box(1695, 1695)),
+ Box(Box(1696, 1696), Box(1696, 1696)),
+ Box(Box(1697, 1697), Box(1697, 1697)),
+ Box(Box(1698, 1698), Box(1698, 1698)),
+ Box(Box(1699, 1699), Box(1699, 1699)),
+ Box(Box(1700, 1700), Box(1700, 1700)),
+ Box(Box(1701, 1701), Box(1701, 1701)),
+ Box(Box(1702, 1702), Box(1702, 1702)),
+ Box(Box(1703, 1703), Box(1703, 1703)),
+ Box(Box(1704, 1704), Box(1704, 1704)),
+ Box(Box(1705, 1705), Box(1705, 1705)),
+ Box(Box(1706, 1706), Box(1706, 1706)),
+ Box(Box(1707, 1707), Box(1707, 1707)),
+ Box(Box(1708, 1708), Box(1708, 1708)),
+ Box(Box(1709, 1709), Box(1709, 1709)),
+ Box(Box(1710, 1710), Box(1710, 1710)),
+ Box(Box(1711, 1711), Box(1711, 1711)),
+ Box(Box(1712, 1712), Box(1712, 1712)),
+ Box(Box(1713, 1713), Box(1713, 1713)),
+ Box(Box(1714, 1714), Box(1714, 1714)),
+ Box(Box(1715, 1715), Box(1715, 1715)),
+ Box(Box(1716, 1716), Box(1716, 1716)),
+ Box(Box(1717, 1717), Box(1717, 1717)),
+ Box(Box(1718, 1718), Box(1718, 1718)),
+ Box(Box(1719, 1719), Box(1719, 1719)),
+ Box(Box(1720, 1720), Box(1720, 1720)),
+ Box(Box(1721, 1721), Box(1721, 1721)),
+ Box(Box(1722, 1722), Box(1722, 1722)),
+ Box(Box(1723, 1723), Box(1723, 1723)),
+ Box(Box(1724, 1724), Box(1724, 1724)),
+ Box(Box(1725, 1725), Box(1725, 1725)),
+ Box(Box(1726, 1726), Box(1726, 1726)),
+ Box(Box(1727, 1727), Box(1727, 1727)),
+ Box(Box(1728, 1728), Box(1728, 1728)),
+ Box(Box(1729, 1729), Box(1729, 1729)),
+ Box(Box(1730, 1730), Box(1730, 1730)),
+ Box(Box(1731, 1731), Box(1731, 1731)),
+ Box(Box(1732, 1732), Box(1732, 1732)),
+ Box(Box(1733, 1733), Box(1733, 1733)),
+ Box(Box(1734, 1734), Box(1734, 1734)),
+ Box(Box(1735, 1735), Box(1735, 1735)),
+ Box(Box(1736, 1736), Box(1736, 1736)),
+ Box(Box(1737, 1737), Box(1737, 1737)),
+ Box(Box(1738, 1738), Box(1738, 1738)),
+ Box(Box(1739, 1739), Box(1739, 1739)),
+ Box(Box(1740, 1740), Box(1740, 1740)),
+ Box(Box(1741, 1741), Box(1741, 1741)),
+ Box(Box(1742, 1742), Box(1742, 1742)),
+ Box(Box(1743, 1743), Box(1743, 1743)),
+ Box(Box(1744, 1744), Box(1744, 1744)),
+ Box(Box(1745, 1745), Box(1745, 1745)),
+ Box(Box(1746, 1746), Box(1746, 1746)),
+ Box(Box(1747, 1747), Box(1747, 1747)),
+ Box(Box(1748, 1748), Box(1748, 1748)),
+ Box(Box(1749, 1749), Box(1749, 1749)),
+ Box(Box(1750, 1750), Box(1750, 1750)),
+ Box(Box(1751, 1751), Box(1751, 1751)),
+ Box(Box(1752, 1752), Box(1752, 1752)),
+ Box(Box(1753, 1753), Box(1753, 1753)),
+ Box(Box(1754, 1754), Box(1754, 1754)),
+ Box(Box(1755, 1755), Box(1755, 1755)),
+ Box(Box(1756, 1756), Box(1756, 1756)),
+ Box(Box(1757, 1757), Box(1757, 1757)),
+ Box(Box(1758, 1758), Box(1758, 1758)),
+ Box(Box(1759, 1759), Box(1759, 1759)),
+ Box(Box(1760, 1760), Box(1760, 1760)),
+ Box(Box(1761, 1761), Box(1761, 1761)),
+ Box(Box(1762, 1762), Box(1762, 1762)),
+ Box(Box(1763, 1763), Box(1763, 1763)),
+ Box(Box(1764, 1764), Box(1764, 1764)),
+ Box(Box(1765, 1765), Box(1765, 1765)),
+ Box(Box(1766, 1766), Box(1766, 1766)),
+ Box(Box(1767, 1767), Box(1767, 1767)),
+ Box(Box(1768, 1768), Box(1768, 1768)),
+ Box(Box(1769, 1769), Box(1769, 1769)),
+ Box(Box(1770, 1770), Box(1770, 1770)),
+ Box(Box(1771, 1771), Box(1771, 1771)),
+ Box(Box(1772, 1772), Box(1772, 1772)),
+ Box(Box(1773, 1773), Box(1773, 1773)),
+ Box(Box(1774, 1774), Box(1774, 1774)),
+ Box(Box(1775, 1775), Box(1775, 1775)),
+ Box(Box(1776, 1776), Box(1776, 1776)),
+ Box(Box(1777, 1777), Box(1777, 1777)),
+ Box(Box(1778, 1778), Box(1778, 1778)),
+ Box(Box(1779, 1779), Box(1779, 1779)),
+ Box(Box(1780, 1780), Box(1780, 1780)),
+ Box(Box(1781, 1781), Box(1781, 1781)),
+ Box(Box(1782, 1782), Box(1782, 1782)),
+ Box(Box(1783, 1783), Box(1783, 1783)),
+ Box(Box(1784, 1784), Box(1784, 1784)),
+ Box(Box(1785, 1785), Box(1785, 1785)),
+ Box(Box(1786, 1786), Box(1786, 1786)),
+ Box(Box(1787, 1787), Box(1787, 1787)),
+ Box(Box(1788, 1788), Box(1788, 1788)),
+ Box(Box(1789, 1789), Box(1789, 1789)),
+ Box(Box(1790, 1790), Box(1790, 1790)),
+ Box(Box(1791, 1791), Box(1791, 1791)),
+ Box(Box(1792, 1792), Box(1792, 1792)),
+ Box(Box(1793, 1793), Box(1793, 1793)),
+ Box(Box(1794, 1794), Box(1794, 1794)),
+ Box(Box(1795, 1795), Box(1795, 1795)),
+ Box(Box(1796, 1796), Box(1796, 1796)),
+ Box(Box(1797, 1797), Box(1797, 1797)),
+ Box(Box(1798, 1798), Box(1798, 1798)),
+ Box(Box(1799, 1799), Box(1799, 1799)),
+ Box(Box(1800, 1800), Box(1800, 1800)),
+ Box(Box(1801, 1801), Box(1801, 1801)),
+ Box(Box(1802, 1802), Box(1802, 1802)),
+ Box(Box(1803, 1803), Box(1803, 1803)),
+ Box(Box(1804, 1804), Box(1804, 1804)),
+ Box(Box(1805, 1805), Box(1805, 1805)),
+ Box(Box(1806, 1806), Box(1806, 1806)),
+ Box(Box(1807, 1807), Box(1807, 1807)),
+ Box(Box(1808, 1808), Box(1808, 1808)),
+ Box(Box(1809, 1809), Box(1809, 1809)),
+ Box(Box(1810, 1810), Box(1810, 1810)),
+ Box(Box(1811, 1811), Box(1811, 1811)),
+ Box(Box(1812, 1812), Box(1812, 1812)),
+ Box(Box(1813, 1813), Box(1813, 1813)),
+ Box(Box(1814, 1814), Box(1814, 1814)),
+ Box(Box(1815, 1815), Box(1815, 1815)),
+ Box(Box(1816, 1816), Box(1816, 1816)),
+ Box(Box(1817, 1817), Box(1817, 1817)),
+ Box(Box(1818, 1818), Box(1818, 1818)),
+ Box(Box(1819, 1819), Box(1819, 1819)),
+ Box(Box(1820, 1820), Box(1820, 1820)),
+ Box(Box(1821, 1821), Box(1821, 1821)),
+ Box(Box(1822, 1822), Box(1822, 1822)),
+ Box(Box(1823, 1823), Box(1823, 1823)),
+ Box(Box(1824, 1824), Box(1824, 1824)),
+ Box(Box(1825, 1825), Box(1825, 1825)),
+ Box(Box(1826, 1826), Box(1826, 1826)),
+ Box(Box(1827, 1827), Box(1827, 1827)),
+ Box(Box(1828, 1828), Box(1828, 1828)),
+ Box(Box(1829, 1829), Box(1829, 1829)),
+ Box(Box(1830, 1830), Box(1830, 1830)),
+ Box(Box(1831, 1831), Box(1831, 1831)),
+ Box(Box(1832, 1832), Box(1832, 1832)),
+ Box(Box(1833, 1833), Box(1833, 1833)),
+ Box(Box(1834, 1834), Box(1834, 1834)),
+ Box(Box(1835, 1835), Box(1835, 1835)),
+ Box(Box(1836, 1836), Box(1836, 1836)),
+ Box(Box(1837, 1837), Box(1837, 1837)),
+ Box(Box(1838, 1838), Box(1838, 1838)),
+ Box(Box(1839, 1839), Box(1839, 1839)),
+ Box(Box(1840, 1840), Box(1840, 1840)),
+ Box(Box(1841, 1841), Box(1841, 1841)),
+ Box(Box(1842, 1842), Box(1842, 1842)),
+ Box(Box(1843, 1843), Box(1843, 1843)),
+ Box(Box(1844, 1844), Box(1844, 1844)),
+ Box(Box(1845, 1845), Box(1845, 1845)),
+ Box(Box(1846, 1846), Box(1846, 1846)),
+ Box(Box(1847, 1847), Box(1847, 1847)),
+ Box(Box(1848, 1848), Box(1848, 1848)),
+ Box(Box(1849, 1849), Box(1849, 1849)),
+ Box(Box(1850, 1850), Box(1850, 1850)),
+ Box(Box(1851, 1851), Box(1851, 1851)),
+ Box(Box(1852, 1852), Box(1852, 1852)),
+ Box(Box(1853, 1853), Box(1853, 1853)),
+ Box(Box(1854, 1854), Box(1854, 1854)),
+ Box(Box(1855, 1855), Box(1855, 1855)),
+ Box(Box(1856, 1856), Box(1856, 1856)),
+ Box(Box(1857, 1857), Box(1857, 1857)),
+ Box(Box(1858, 1858), Box(1858, 1858)),
+ Box(Box(1859, 1859), Box(1859, 1859)),
+ Box(Box(1860, 1860), Box(1860, 1860)),
+ Box(Box(1861, 1861), Box(1861, 1861)),
+ Box(Box(1862, 1862), Box(1862, 1862)),
+ Box(Box(1863, 1863), Box(1863, 1863)),
+ Box(Box(1864, 1864), Box(1864, 1864)),
+ Box(Box(1865, 1865), Box(1865, 1865)),
+ Box(Box(1866, 1866), Box(1866, 1866)),
+ Box(Box(1867, 1867), Box(1867, 1867)),
+ Box(Box(1868, 1868), Box(1868, 1868)),
+ Box(Box(1869, 1869), Box(1869, 1869)),
+ Box(Box(1870, 1870), Box(1870, 1870)),
+ Box(Box(1871, 1871), Box(1871, 1871)),
+ Box(Box(1872, 1872), Box(1872, 1872)),
+ Box(Box(1873, 1873), Box(1873, 1873)),
+ Box(Box(1874, 1874), Box(1874, 1874)),
+ Box(Box(1875, 1875), Box(1875, 1875)),
+ Box(Box(1876, 1876), Box(1876, 1876)),
+ Box(Box(1877, 1877), Box(1877, 1877)),
+ Box(Box(1878, 1878), Box(1878, 1878)),
+ Box(Box(1879, 1879), Box(1879, 1879)),
+ Box(Box(1880, 1880), Box(1880, 1880)),
+ Box(Box(1881, 1881), Box(1881, 1881)),
+ Box(Box(1882, 1882), Box(1882, 1882)),
+ Box(Box(1883, 1883), Box(1883, 1883)),
+ Box(Box(1884, 1884), Box(1884, 1884)),
+ Box(Box(1885, 1885), Box(1885, 1885)),
+ Box(Box(1886, 1886), Box(1886, 1886)),
+ Box(Box(1887, 1887), Box(1887, 1887)),
+ Box(Box(1888, 1888), Box(1888, 1888)),
+ Box(Box(1889, 1889), Box(1889, 1889)),
+ Box(Box(1890, 1890), Box(1890, 1890)),
+ Box(Box(1891, 1891), Box(1891, 1891)),
+ Box(Box(1892, 1892), Box(1892, 1892)),
+ Box(Box(1893, 1893), Box(1893, 1893)),
+ Box(Box(1894, 1894), Box(1894, 1894)),
+ Box(Box(1895, 1895), Box(1895, 1895)),
+ Box(Box(1896, 1896), Box(1896, 1896)),
+ Box(Box(1897, 1897), Box(1897, 1897)),
+ Box(Box(1898, 1898), Box(1898, 1898)),
+ Box(Box(1899, 1899), Box(1899, 1899)),
+ Box(Box(1900, 1900), Box(1900, 1900)),
+ Box(Box(1901, 1901), Box(1901, 1901)),
+ Box(Box(1902, 1902), Box(1902, 1902)),
+ Box(Box(1903, 1903), Box(1903, 1903)),
+ Box(Box(1904, 1904), Box(1904, 1904)),
+ Box(Box(1905, 1905), Box(1905, 1905)),
+ Box(Box(1906, 1906), Box(1906, 1906)),
+ Box(Box(1907, 1907), Box(1907, 1907)),
+ Box(Box(1908, 1908), Box(1908, 1908)),
+ Box(Box(1909, 1909), Box(1909, 1909)),
+ Box(Box(1910, 1910), Box(1910, 1910)),
+ Box(Box(1911, 1911), Box(1911, 1911)),
+ Box(Box(1912, 1912), Box(1912, 1912)),
+ Box(Box(1913, 1913), Box(1913, 1913)),
+ Box(Box(1914, 1914), Box(1914, 1914)),
+ Box(Box(1915, 1915), Box(1915, 1915)),
+ Box(Box(1916, 1916), Box(1916, 1916)),
+ Box(Box(1917, 1917), Box(1917, 1917)),
+ Box(Box(1918, 1918), Box(1918, 1918)),
+ Box(Box(1919, 1919), Box(1919, 1919)),
+ Box(Box(1920, 1920), Box(1920, 1920)),
+ Box(Box(1921, 1921), Box(1921, 1921)),
+ Box(Box(1922, 1922), Box(1922, 1922)),
+ Box(Box(1923, 1923), Box(1923, 1923)),
+ Box(Box(1924, 1924), Box(1924, 1924)),
+ Box(Box(1925, 1925), Box(1925, 1925)),
+ Box(Box(1926, 1926), Box(1926, 1926)),
+ Box(Box(1927, 1927), Box(1927, 1927)),
+ Box(Box(1928, 1928), Box(1928, 1928)),
+ Box(Box(1929, 1929), Box(1929, 1929)),
+ Box(Box(1930, 1930), Box(1930, 1930)),
+ Box(Box(1931, 1931), Box(1931, 1931)),
+ Box(Box(1932, 1932), Box(1932, 1932)),
+ Box(Box(1933, 1933), Box(1933, 1933)),
+ Box(Box(1934, 1934), Box(1934, 1934)),
+ Box(Box(1935, 1935), Box(1935, 1935)),
+ Box(Box(1936, 1936), Box(1936, 1936)),
+ Box(Box(1937, 1937), Box(1937, 1937)),
+ Box(Box(1938, 1938), Box(1938, 1938)),
+ Box(Box(1939, 1939), Box(1939, 1939)),
+ Box(Box(1940, 1940), Box(1940, 1940)),
+ Box(Box(1941, 1941), Box(1941, 1941)),
+ Box(Box(1942, 1942), Box(1942, 1942)),
+ Box(Box(1943, 1943), Box(1943, 1943)),
+ Box(Box(1944, 1944), Box(1944, 1944)),
+ Box(Box(1945, 1945), Box(1945, 1945)),
+ Box(Box(1946, 1946), Box(1946, 1946)),
+ Box(Box(1947, 1947), Box(1947, 1947)),
+ Box(Box(1948, 1948), Box(1948, 1948)),
+ Box(Box(1949, 1949), Box(1949, 1949)),
+ Box(Box(1950, 1950), Box(1950, 1950)),
+ Box(Box(1951, 1951), Box(1951, 1951)),
+ Box(Box(1952, 1952), Box(1952, 1952)),
+ Box(Box(1953, 1953), Box(1953, 1953)),
+ Box(Box(1954, 1954), Box(1954, 1954)),
+ Box(Box(1955, 1955), Box(1955, 1955)),
+ Box(Box(1956, 1956), Box(1956, 1956)),
+ Box(Box(1957, 1957), Box(1957, 1957)),
+ Box(Box(1958, 1958), Box(1958, 1958)),
+ Box(Box(1959, 1959), Box(1959, 1959)),
+ Box(Box(1960, 1960), Box(1960, 1960)),
+ Box(Box(1961, 1961), Box(1961, 1961)),
+ Box(Box(1962, 1962), Box(1962, 1962)),
+ Box(Box(1963, 1963), Box(1963, 1963)),
+ Box(Box(1964, 1964), Box(1964, 1964)),
+ Box(Box(1965, 1965), Box(1965, 1965)),
+ Box(Box(1966, 1966), Box(1966, 1966)),
+ Box(Box(1967, 1967), Box(1967, 1967)),
+ Box(Box(1968, 1968), Box(1968, 1968)),
+ Box(Box(1969, 1969), Box(1969, 1969)),
+ Box(Box(1970, 1970), Box(1970, 1970)),
+ Box(Box(1971, 1971), Box(1971, 1971)),
+ Box(Box(1972, 1972), Box(1972, 1972)),
+ Box(Box(1973, 1973), Box(1973, 1973)),
+ Box(Box(1974, 1974), Box(1974, 1974)),
+ Box(Box(1975, 1975), Box(1975, 1975)),
+ Box(Box(1976, 1976), Box(1976, 1976)),
+ Box(Box(1977, 1977), Box(1977, 1977)),
+ Box(Box(1978, 1978), Box(1978, 1978)),
+ Box(Box(1979, 1979), Box(1979, 1979)),
+ Box(Box(1980, 1980), Box(1980, 1980)),
+ Box(Box(1981, 1981), Box(1981, 1981)),
+ Box(Box(1982, 1982), Box(1982, 1982)),
+ Box(Box(1983, 1983), Box(1983, 1983)),
+ Box(Box(1984, 1984), Box(1984, 1984)),
+ Box(Box(1985, 1985), Box(1985, 1985)),
+ Box(Box(1986, 1986), Box(1986, 1986)),
+ Box(Box(1987, 1987), Box(1987, 1987)),
+ Box(Box(1988, 1988), Box(1988, 1988)),
+ Box(Box(1989, 1989), Box(1989, 1989)),
+ Box(Box(1990, 1990), Box(1990, 1990)),
+ Box(Box(1991, 1991), Box(1991, 1991)),
+ Box(Box(1992, 1992), Box(1992, 1992)),
+ Box(Box(1993, 1993), Box(1993, 1993)),
+ Box(Box(1994, 1994), Box(1994, 1994)),
+ Box(Box(1995, 1995), Box(1995, 1995)),
+ Box(Box(1996, 1996), Box(1996, 1996)),
+ Box(Box(1997, 1997), Box(1997, 1997)),
+ Box(Box(1998, 1998), Box(1998, 1998)),
+ Box(Box(1999, 1999), Box(1999, 1999)),
+ Box(Box(2000, 2000), Box(2000, 2000)),
+ Box(Box(2001, 2001), Box(2001, 2001)),
+ Box(Box(2002, 2002), Box(2002, 2002)),
+ Box(Box(2003, 2003), Box(2003, 2003)),
+ Box(Box(2004, 2004), Box(2004, 2004)),
+ Box(Box(2005, 2005), Box(2005, 2005)),
+ Box(Box(2006, 2006), Box(2006, 2006)),
+ Box(Box(2007, 2007), Box(2007, 2007)),
+ Box(Box(2008, 2008), Box(2008, 2008)),
+ Box(Box(2009, 2009), Box(2009, 2009)),
+ Box(Box(2010, 2010), Box(2010, 2010)),
+ Box(Box(2011, 2011), Box(2011, 2011)),
+ Box(Box(2012, 2012), Box(2012, 2012)),
+ Box(Box(2013, 2013), Box(2013, 2013)),
+ Box(Box(2014, 2014), Box(2014, 2014)),
+ Box(Box(2015, 2015), Box(2015, 2015)),
+ Box(Box(2016, 2016), Box(2016, 2016)),
+ Box(Box(2017, 2017), Box(2017, 2017)),
+ Box(Box(2018, 2018), Box(2018, 2018)),
+ Box(Box(2019, 2019), Box(2019, 2019)),
+ Box(Box(2020, 2020), Box(2020, 2020)),
+ Box(Box(2021, 2021), Box(2021, 2021)),
+ Box(Box(2022, 2022), Box(2022, 2022)),
+ Box(Box(2023, 2023), Box(2023, 2023)),
+ Box(Box(2024, 2024), Box(2024, 2024)),
+ Box(Box(2025, 2025), Box(2025, 2025)),
+ Box(Box(2026, 2026), Box(2026, 2026)),
+ Box(Box(2027, 2027), Box(2027, 2027)),
+ Box(Box(2028, 2028), Box(2028, 2028)),
+ Box(Box(2029, 2029), Box(2029, 2029)),
+ Box(Box(2030, 2030), Box(2030, 2030)),
+ Box(Box(2031, 2031), Box(2031, 2031)),
+ Box(Box(2032, 2032), Box(2032, 2032)),
+ Box(Box(2033, 2033), Box(2033, 2033)),
+ Box(Box(2034, 2034), Box(2034, 2034)),
+ Box(Box(2035, 2035), Box(2035, 2035)),
+ Box(Box(2036, 2036), Box(2036, 2036)),
+ Box(Box(2037, 2037), Box(2037, 2037)),
+ Box(Box(2038, 2038), Box(2038, 2038)),
+ Box(Box(2039, 2039), Box(2039, 2039)),
+ Box(Box(2040, 2040), Box(2040, 2040)),
+ Box(Box(2041, 2041), Box(2041, 2041)),
+ Box(Box(2042, 2042), Box(2042, 2042)),
+ Box(Box(2043, 2043), Box(2043, 2043)),
+ Box(Box(2044, 2044), Box(2044, 2044)),
+ Box(Box(2045, 2045), Box(2045, 2045)),
+ Box(Box(2046, 2046), Box(2046, 2046)),
+ Box(Box(2047, 2047), Box(2047, 2047)),
+ Box(Box(2048, 2048), Box(2048, 2048)),
+ Box(Box(2049, 2049), Box(2049, 2049)),
+ Box(Box(2050, 2050), Box(2050, 2050)),
+ Box(Box(2051, 2051), Box(2051, 2051)),
+ Box(Box(2052, 2052), Box(2052, 2052)),
+ Box(Box(2053, 2053), Box(2053, 2053)),
+ Box(Box(2054, 2054), Box(2054, 2054)),
+ Box(Box(2055, 2055), Box(2055, 2055)),
+ Box(Box(2056, 2056), Box(2056, 2056)),
+ Box(Box(2057, 2057), Box(2057, 2057)),
+ Box(Box(2058, 2058), Box(2058, 2058)),
+ Box(Box(2059, 2059), Box(2059, 2059)),
+ Box(Box(2060, 2060), Box(2060, 2060)),
+ Box(Box(2061, 2061), Box(2061, 2061)),
+ Box(Box(2062, 2062), Box(2062, 2062)),
+ Box(Box(2063, 2063), Box(2063, 2063)),
+ Box(Box(2064, 2064), Box(2064, 2064)),
+ Box(Box(2065, 2065), Box(2065, 2065)),
+ Box(Box(2066, 2066), Box(2066, 2066)),
+ Box(Box(2067, 2067), Box(2067, 2067)),
+ Box(Box(2068, 2068), Box(2068, 2068)),
+ Box(Box(2069, 2069), Box(2069, 2069)),
+ Box(Box(2070, 2070), Box(2070, 2070)),
+ Box(Box(2071, 2071), Box(2071, 2071)),
+ Box(Box(2072, 2072), Box(2072, 2072)),
+ Box(Box(2073, 2073), Box(2073, 2073)),
+ Box(Box(2074, 2074), Box(2074, 2074)),
+ Box(Box(2075, 2075), Box(2075, 2075)),
+ Box(Box(2076, 2076), Box(2076, 2076)),
+ Box(Box(2077, 2077), Box(2077, 2077)),
+ Box(Box(2078, 2078), Box(2078, 2078)),
+ Box(Box(2079, 2079), Box(2079, 2079)),
+ Box(Box(2080, 2080), Box(2080, 2080)),
+ Box(Box(2081, 2081), Box(2081, 2081)),
+ Box(Box(2082, 2082), Box(2082, 2082)),
+ Box(Box(2083, 2083), Box(2083, 2083)),
+ Box(Box(2084, 2084), Box(2084, 2084)),
+ Box(Box(2085, 2085), Box(2085, 2085)),
+ Box(Box(2086, 2086), Box(2086, 2086)),
+ Box(Box(2087, 2087), Box(2087, 2087)),
+ Box(Box(2088, 2088), Box(2088, 2088)),
+ Box(Box(2089, 2089), Box(2089, 2089)),
+ Box(Box(2090, 2090), Box(2090, 2090)),
+ Box(Box(2091, 2091), Box(2091, 2091)),
+ Box(Box(2092, 2092), Box(2092, 2092)),
+ Box(Box(2093, 2093), Box(2093, 2093)),
+ Box(Box(2094, 2094), Box(2094, 2094)),
+ Box(Box(2095, 2095), Box(2095, 2095)),
+ Box(Box(2096, 2096), Box(2096, 2096)),
+ Box(Box(2097, 2097), Box(2097, 2097)),
+ Box(Box(2098, 2098), Box(2098, 2098)),
+ Box(Box(2099, 2099), Box(2099, 2099)),
+ Box(Box(2100, 2100), Box(2100, 2100)),
+ Box(Box(2101, 2101), Box(2101, 2101)),
+ Box(Box(2102, 2102), Box(2102, 2102)),
+ Box(Box(2103, 2103), Box(2103, 2103)),
+ Box(Box(2104, 2104), Box(2104, 2104)),
+ Box(Box(2105, 2105), Box(2105, 2105)),
+ Box(Box(2106, 2106), Box(2106, 2106)),
+ Box(Box(2107, 2107), Box(2107, 2107)),
+ Box(Box(2108, 2108), Box(2108, 2108)),
+ Box(Box(2109, 2109), Box(2109, 2109)),
+ Box(Box(2110, 2110), Box(2110, 2110)),
+ Box(Box(2111, 2111), Box(2111, 2111)),
+ Box(Box(2112, 2112), Box(2112, 2112)),
+ Box(Box(2113, 2113), Box(2113, 2113)),
+ Box(Box(2114, 2114), Box(2114, 2114)),
+ Box(Box(2115, 2115), Box(2115, 2115)),
+ Box(Box(2116, 2116), Box(2116, 2116)),
+ Box(Box(2117, 2117), Box(2117, 2117)),
+ Box(Box(2118, 2118), Box(2118, 2118)),
+ Box(Box(2119, 2119), Box(2119, 2119)),
+ Box(Box(2120, 2120), Box(2120, 2120)),
+ Box(Box(2121, 2121), Box(2121, 2121)),
+ Box(Box(2122, 2122), Box(2122, 2122)),
+ Box(Box(2123, 2123), Box(2123, 2123)),
+ Box(Box(2124, 2124), Box(2124, 2124)),
+ Box(Box(2125, 2125), Box(2125, 2125)),
+ Box(Box(2126, 2126), Box(2126, 2126)),
+ Box(Box(2127, 2127), Box(2127, 2127)),
+ Box(Box(2128, 2128), Box(2128, 2128)),
+ Box(Box(2129, 2129), Box(2129, 2129)),
+ Box(Box(2130, 2130), Box(2130, 2130)),
+ Box(Box(2131, 2131), Box(2131, 2131)),
+ Box(Box(2132, 2132), Box(2132, 2132)),
+ Box(Box(2133, 2133), Box(2133, 2133)),
+ Box(Box(2134, 2134), Box(2134, 2134)),
+ Box(Box(2135, 2135), Box(2135, 2135)),
+ Box(Box(2136, 2136), Box(2136, 2136)),
+ Box(Box(2137, 2137), Box(2137, 2137)),
+ Box(Box(2138, 2138), Box(2138, 2138)),
+ Box(Box(2139, 2139), Box(2139, 2139)),
+ Box(Box(2140, 2140), Box(2140, 2140)),
+ Box(Box(2141, 2141), Box(2141, 2141)),
+ Box(Box(2142, 2142), Box(2142, 2142)),
+ Box(Box(2143, 2143), Box(2143, 2143)),
+ Box(Box(2144, 2144), Box(2144, 2144)),
+ Box(Box(2145, 2145), Box(2145, 2145)),
+ Box(Box(2146, 2146), Box(2146, 2146)),
+ Box(Box(2147, 2147), Box(2147, 2147)),
+ Box(Box(2148, 2148), Box(2148, 2148)),
+ Box(Box(2149, 2149), Box(2149, 2149)),
+ Box(Box(2150, 2150), Box(2150, 2150)),
+ Box(Box(2151, 2151), Box(2151, 2151)),
+ Box(Box(2152, 2152), Box(2152, 2152)),
+ Box(Box(2153, 2153), Box(2153, 2153)),
+ Box(Box(2154, 2154), Box(2154, 2154)),
+ Box(Box(2155, 2155), Box(2155, 2155)),
+ Box(Box(2156, 2156), Box(2156, 2156)),
+ Box(Box(2157, 2157), Box(2157, 2157)),
+ Box(Box(2158, 2158), Box(2158, 2158)),
+ Box(Box(2159, 2159), Box(2159, 2159)),
+ Box(Box(2160, 2160), Box(2160, 2160)),
+ Box(Box(2161, 2161), Box(2161, 2161)),
+ Box(Box(2162, 2162), Box(2162, 2162)),
+ Box(Box(2163, 2163), Box(2163, 2163)),
+ Box(Box(2164, 2164), Box(2164, 2164)),
+ Box(Box(2165, 2165), Box(2165, 2165)),
+ Box(Box(2166, 2166), Box(2166, 2166)),
+ Box(Box(2167, 2167), Box(2167, 2167)),
+ Box(Box(2168, 2168), Box(2168, 2168)),
+ Box(Box(2169, 2169), Box(2169, 2169)),
+ Box(Box(2170, 2170), Box(2170, 2170)),
+ Box(Box(2171, 2171), Box(2171, 2171)),
+ Box(Box(2172, 2172), Box(2172, 2172)),
+ Box(Box(2173, 2173), Box(2173, 2173)),
+ Box(Box(2174, 2174), Box(2174, 2174)),
+ Box(Box(2175, 2175), Box(2175, 2175)),
+ Box(Box(2176, 2176), Box(2176, 2176)),
+ Box(Box(2177, 2177), Box(2177, 2177)),
+ Box(Box(2178, 2178), Box(2178, 2178)),
+ Box(Box(2179, 2179), Box(2179, 2179)),
+ Box(Box(2180, 2180), Box(2180, 2180)),
+ Box(Box(2181, 2181), Box(2181, 2181)),
+ Box(Box(2182, 2182), Box(2182, 2182)),
+ Box(Box(2183, 2183), Box(2183, 2183)),
+ Box(Box(2184, 2184), Box(2184, 2184)),
+ Box(Box(2185, 2185), Box(2185, 2185)),
+ Box(Box(2186, 2186), Box(2186, 2186)),
+ Box(Box(2187, 2187), Box(2187, 2187)),
+ Box(Box(2188, 2188), Box(2188, 2188)),
+ Box(Box(2189, 2189), Box(2189, 2189)),
+ Box(Box(2190, 2190), Box(2190, 2190)),
+ Box(Box(2191, 2191), Box(2191, 2191)),
+ Box(Box(2192, 2192), Box(2192, 2192)),
+ Box(Box(2193, 2193), Box(2193, 2193)),
+ Box(Box(2194, 2194), Box(2194, 2194)),
+ Box(Box(2195, 2195), Box(2195, 2195)),
+ Box(Box(2196, 2196), Box(2196, 2196)),
+ Box(Box(2197, 2197), Box(2197, 2197)),
+ Box(Box(2198, 2198), Box(2198, 2198)),
+ Box(Box(2199, 2199), Box(2199, 2199)),
+ Box(Box(2200, 2200), Box(2200, 2200)),
+ Box(Box(2201, 2201), Box(2201, 2201)),
+ Box(Box(2202, 2202), Box(2202, 2202)),
+ Box(Box(2203, 2203), Box(2203, 2203)),
+ Box(Box(2204, 2204), Box(2204, 2204)),
+ Box(Box(2205, 2205), Box(2205, 2205)),
+ Box(Box(2206, 2206), Box(2206, 2206)),
+ Box(Box(2207, 2207), Box(2207, 2207)),
+ Box(Box(2208, 2208), Box(2208, 2208)),
+ Box(Box(2209, 2209), Box(2209, 2209)),
+ Box(Box(2210, 2210), Box(2210, 2210)),
+ Box(Box(2211, 2211), Box(2211, 2211)),
+ Box(Box(2212, 2212), Box(2212, 2212)),
+ Box(Box(2213, 2213), Box(2213, 2213)),
+ Box(Box(2214, 2214), Box(2214, 2214)),
+ Box(Box(2215, 2215), Box(2215, 2215)),
+ Box(Box(2216, 2216), Box(2216, 2216)),
+ Box(Box(2217, 2217), Box(2217, 2217)),
+ Box(Box(2218, 2218), Box(2218, 2218)),
+ Box(Box(2219, 2219), Box(2219, 2219)),
+ Box(Box(2220, 2220), Box(2220, 2220)),
+ Box(Box(2221, 2221), Box(2221, 2221)),
+ Box(Box(2222, 2222), Box(2222, 2222)),
+ Box(Box(2223, 2223), Box(2223, 2223)),
+ Box(Box(2224, 2224), Box(2224, 2224)),
+ Box(Box(2225, 2225), Box(2225, 2225)),
+ Box(Box(2226, 2226), Box(2226, 2226)),
+ Box(Box(2227, 2227), Box(2227, 2227)),
+ Box(Box(2228, 2228), Box(2228, 2228)),
+ Box(Box(2229, 2229), Box(2229, 2229)),
+ Box(Box(2230, 2230), Box(2230, 2230)),
+ Box(Box(2231, 2231), Box(2231, 2231)),
+ Box(Box(2232, 2232), Box(2232, 2232)),
+ Box(Box(2233, 2233), Box(2233, 2233)),
+ Box(Box(2234, 2234), Box(2234, 2234)),
+ Box(Box(2235, 2235), Box(2235, 2235)),
+ Box(Box(2236, 2236), Box(2236, 2236)),
+ Box(Box(2237, 2237), Box(2237, 2237)),
+ Box(Box(2238, 2238), Box(2238, 2238)),
+ Box(Box(2239, 2239), Box(2239, 2239)),
+ Box(Box(2240, 2240), Box(2240, 2240)),
+ Box(Box(2241, 2241), Box(2241, 2241)),
+ Box(Box(2242, 2242), Box(2242, 2242)),
+ Box(Box(2243, 2243), Box(2243, 2243)),
+ Box(Box(2244, 2244), Box(2244, 2244)),
+ Box(Box(2245, 2245), Box(2245, 2245)),
+ Box(Box(2246, 2246), Box(2246, 2246)),
+ Box(Box(2247, 2247), Box(2247, 2247)),
+ Box(Box(2248, 2248), Box(2248, 2248)),
+ Box(Box(2249, 2249), Box(2249, 2249)),
+ Box(Box(2250, 2250), Box(2250, 2250)),
+ Box(Box(2251, 2251), Box(2251, 2251)),
+ Box(Box(2252, 2252), Box(2252, 2252)),
+ Box(Box(2253, 2253), Box(2253, 2253)),
+ Box(Box(2254, 2254), Box(2254, 2254)),
+ Box(Box(2255, 2255), Box(2255, 2255)),
+ Box(Box(2256, 2256), Box(2256, 2256)),
+ Box(Box(2257, 2257), Box(2257, 2257)),
+ Box(Box(2258, 2258), Box(2258, 2258)),
+ Box(Box(2259, 2259), Box(2259, 2259)),
+ Box(Box(2260, 2260), Box(2260, 2260)),
+ Box(Box(2261, 2261), Box(2261, 2261)),
+ Box(Box(2262, 2262), Box(2262, 2262)),
+ Box(Box(2263, 2263), Box(2263, 2263)),
+ Box(Box(2264, 2264), Box(2264, 2264)),
+ Box(Box(2265, 2265), Box(2265, 2265)),
+ Box(Box(2266, 2266), Box(2266, 2266)),
+ Box(Box(2267, 2267), Box(2267, 2267)),
+ Box(Box(2268, 2268), Box(2268, 2268)),
+ Box(Box(2269, 2269), Box(2269, 2269)),
+ Box(Box(2270, 2270), Box(2270, 2270)),
+ Box(Box(2271, 2271), Box(2271, 2271)),
+ Box(Box(2272, 2272), Box(2272, 2272)),
+ Box(Box(2273, 2273), Box(2273, 2273)),
+ Box(Box(2274, 2274), Box(2274, 2274)),
+ Box(Box(2275, 2275), Box(2275, 2275)),
+ Box(Box(2276, 2276), Box(2276, 2276)),
+ Box(Box(2277, 2277), Box(2277, 2277)),
+ Box(Box(2278, 2278), Box(2278, 2278)),
+ Box(Box(2279, 2279), Box(2279, 2279)),
+ Box(Box(2280, 2280), Box(2280, 2280)),
+ Box(Box(2281, 2281), Box(2281, 2281)),
+ Box(Box(2282, 2282), Box(2282, 2282)),
+ Box(Box(2283, 2283), Box(2283, 2283)),
+ Box(Box(2284, 2284), Box(2284, 2284)),
+ Box(Box(2285, 2285), Box(2285, 2285)),
+ Box(Box(2286, 2286), Box(2286, 2286)),
+ Box(Box(2287, 2287), Box(2287, 2287)),
+ Box(Box(2288, 2288), Box(2288, 2288)),
+ Box(Box(2289, 2289), Box(2289, 2289)),
+ Box(Box(2290, 2290), Box(2290, 2290)),
+ Box(Box(2291, 2291), Box(2291, 2291)),
+ Box(Box(2292, 2292), Box(2292, 2292)),
+ Box(Box(2293, 2293), Box(2293, 2293)),
+ Box(Box(2294, 2294), Box(2294, 2294)),
+ Box(Box(2295, 2295), Box(2295, 2295)),
+ Box(Box(2296, 2296), Box(2296, 2296)),
+ Box(Box(2297, 2297), Box(2297, 2297)),
+ Box(Box(2298, 2298), Box(2298, 2298)),
+ Box(Box(2299, 2299), Box(2299, 2299)),
+ Box(Box(2300, 2300), Box(2300, 2300)),
+ Box(Box(2301, 2301), Box(2301, 2301)),
+ Box(Box(2302, 2302), Box(2302, 2302)),
+ Box(Box(2303, 2303), Box(2303, 2303)),
+ Box(Box(2304, 2304), Box(2304, 2304)),
+ Box(Box(2305, 2305), Box(2305, 2305)),
+ Box(Box(2306, 2306), Box(2306, 2306)),
+ Box(Box(2307, 2307), Box(2307, 2307)),
+ Box(Box(2308, 2308), Box(2308, 2308)),
+ Box(Box(2309, 2309), Box(2309, 2309)),
+ Box(Box(2310, 2310), Box(2310, 2310)),
+ Box(Box(2311, 2311), Box(2311, 2311)),
+ Box(Box(2312, 2312), Box(2312, 2312)),
+ Box(Box(2313, 2313), Box(2313, 2313)),
+ Box(Box(2314, 2314), Box(2314, 2314)),
+ Box(Box(2315, 2315), Box(2315, 2315)),
+ Box(Box(2316, 2316), Box(2316, 2316)),
+ Box(Box(2317, 2317), Box(2317, 2317)),
+ Box(Box(2318, 2318), Box(2318, 2318)),
+ Box(Box(2319, 2319), Box(2319, 2319)),
+ Box(Box(2320, 2320), Box(2320, 2320)),
+ Box(Box(2321, 2321), Box(2321, 2321)),
+ Box(Box(2322, 2322), Box(2322, 2322)),
+ Box(Box(2323, 2323), Box(2323, 2323)),
+ Box(Box(2324, 2324), Box(2324, 2324)),
+ Box(Box(2325, 2325), Box(2325, 2325)),
+ Box(Box(2326, 2326), Box(2326, 2326)),
+ Box(Box(2327, 2327), Box(2327, 2327)),
+ Box(Box(2328, 2328), Box(2328, 2328)),
+ Box(Box(2329, 2329), Box(2329, 2329)),
+ Box(Box(2330, 2330), Box(2330, 2330)),
+ Box(Box(2331, 2331), Box(2331, 2331)),
+ Box(Box(2332, 2332), Box(2332, 2332)),
+ Box(Box(2333, 2333), Box(2333, 2333)),
+ Box(Box(2334, 2334), Box(2334, 2334)),
+ Box(Box(2335, 2335), Box(2335, 2335)),
+ Box(Box(2336, 2336), Box(2336, 2336)),
+ Box(Box(2337, 2337), Box(2337, 2337)),
+ Box(Box(2338, 2338), Box(2338, 2338)),
+ Box(Box(2339, 2339), Box(2339, 2339)),
+ Box(Box(2340, 2340), Box(2340, 2340)),
+ Box(Box(2341, 2341), Box(2341, 2341)),
+ Box(Box(2342, 2342), Box(2342, 2342)),
+ Box(Box(2343, 2343), Box(2343, 2343)),
+ Box(Box(2344, 2344), Box(2344, 2344)),
+ Box(Box(2345, 2345), Box(2345, 2345)),
+ Box(Box(2346, 2346), Box(2346, 2346)),
+ Box(Box(2347, 2347), Box(2347, 2347)),
+ Box(Box(2348, 2348), Box(2348, 2348)),
+ Box(Box(2349, 2349), Box(2349, 2349)),
+ Box(Box(2350, 2350), Box(2350, 2350)),
+ Box(Box(2351, 2351), Box(2351, 2351)),
+ Box(Box(2352, 2352), Box(2352, 2352)),
+ Box(Box(2353, 2353), Box(2353, 2353)),
+ Box(Box(2354, 2354), Box(2354, 2354)),
+ Box(Box(2355, 2355), Box(2355, 2355)),
+ Box(Box(2356, 2356), Box(2356, 2356)),
+ Box(Box(2357, 2357), Box(2357, 2357)),
+ Box(Box(2358, 2358), Box(2358, 2358)),
+ Box(Box(2359, 2359), Box(2359, 2359)),
+ Box(Box(2360, 2360), Box(2360, 2360)),
+ Box(Box(2361, 2361), Box(2361, 2361)),
+ Box(Box(2362, 2362), Box(2362, 2362)),
+ Box(Box(2363, 2363), Box(2363, 2363)),
+ Box(Box(2364, 2364), Box(2364, 2364)),
+ Box(Box(2365, 2365), Box(2365, 2365)),
+ Box(Box(2366, 2366), Box(2366, 2366)),
+ Box(Box(2367, 2367), Box(2367, 2367)),
+ Box(Box(2368, 2368), Box(2368, 2368)),
+ Box(Box(2369, 2369), Box(2369, 2369)),
+ Box(Box(2370, 2370), Box(2370, 2370)),
+ Box(Box(2371, 2371), Box(2371, 2371)),
+ Box(Box(2372, 2372), Box(2372, 2372)),
+ Box(Box(2373, 2373), Box(2373, 2373)),
+ Box(Box(2374, 2374), Box(2374, 2374)),
+ Box(Box(2375, 2375), Box(2375, 2375)),
+ Box(Box(2376, 2376), Box(2376, 2376)),
+ Box(Box(2377, 2377), Box(2377, 2377)),
+ Box(Box(2378, 2378), Box(2378, 2378)),
+ Box(Box(2379, 2379), Box(2379, 2379)),
+ Box(Box(2380, 2380), Box(2380, 2380)),
+ Box(Box(2381, 2381), Box(2381, 2381)),
+ Box(Box(2382, 2382), Box(2382, 2382)),
+ Box(Box(2383, 2383), Box(2383, 2383)),
+ Box(Box(2384, 2384), Box(2384, 2384)),
+ Box(Box(2385, 2385), Box(2385, 2385)),
+ Box(Box(2386, 2386), Box(2386, 2386)),
+ Box(Box(2387, 2387), Box(2387, 2387)),
+ Box(Box(2388, 2388), Box(2388, 2388)),
+ Box(Box(2389, 2389), Box(2389, 2389)),
+ Box(Box(2390, 2390), Box(2390, 2390)),
+ Box(Box(2391, 2391), Box(2391, 2391)),
+ Box(Box(2392, 2392), Box(2392, 2392)),
+ Box(Box(2393, 2393), Box(2393, 2393)),
+ Box(Box(2394, 2394), Box(2394, 2394)),
+ Box(Box(2395, 2395), Box(2395, 2395)),
+ Box(Box(2396, 2396), Box(2396, 2396)),
+ Box(Box(2397, 2397), Box(2397, 2397)),
+ Box(Box(2398, 2398), Box(2398, 2398)),
+ Box(Box(2399, 2399), Box(2399, 2399)),
+ Box(Box(2400, 2400), Box(2400, 2400)),
+ Box(Box(2401, 2401), Box(2401, 2401)),
+ Box(Box(2402, 2402), Box(2402, 2402)),
+ Box(Box(2403, 2403), Box(2403, 2403)),
+ Box(Box(2404, 2404), Box(2404, 2404)),
+ Box(Box(2405, 2405), Box(2405, 2405)),
+ Box(Box(2406, 2406), Box(2406, 2406)),
+ Box(Box(2407, 2407), Box(2407, 2407)),
+ Box(Box(2408, 2408), Box(2408, 2408)),
+ Box(Box(2409, 2409), Box(2409, 2409)),
+ Box(Box(2410, 2410), Box(2410, 2410)),
+ Box(Box(2411, 2411), Box(2411, 2411)),
+ Box(Box(2412, 2412), Box(2412, 2412)),
+ Box(Box(2413, 2413), Box(2413, 2413)),
+ Box(Box(2414, 2414), Box(2414, 2414)),
+ Box(Box(2415, 2415), Box(2415, 2415)),
+ Box(Box(2416, 2416), Box(2416, 2416)),
+ Box(Box(2417, 2417), Box(2417, 2417)),
+ Box(Box(2418, 2418), Box(2418, 2418)),
+ Box(Box(2419, 2419), Box(2419, 2419)),
+ Box(Box(2420, 2420), Box(2420, 2420)),
+ Box(Box(2421, 2421), Box(2421, 2421)),
+ Box(Box(2422, 2422), Box(2422, 2422)),
+ Box(Box(2423, 2423), Box(2423, 2423)),
+ Box(Box(2424, 2424), Box(2424, 2424)),
+ Box(Box(2425, 2425), Box(2425, 2425)),
+ Box(Box(2426, 2426), Box(2426, 2426)),
+ Box(Box(2427, 2427), Box(2427, 2427)),
+ Box(Box(2428, 2428), Box(2428, 2428)),
+ Box(Box(2429, 2429), Box(2429, 2429)),
+ Box(Box(2430, 2430), Box(2430, 2430)),
+ Box(Box(2431, 2431), Box(2431, 2431)),
+ Box(Box(2432, 2432), Box(2432, 2432)),
+ Box(Box(2433, 2433), Box(2433, 2433)),
+ Box(Box(2434, 2434), Box(2434, 2434)),
+ Box(Box(2435, 2435), Box(2435, 2435)),
+ Box(Box(2436, 2436), Box(2436, 2436)),
+ Box(Box(2437, 2437), Box(2437, 2437)),
+ Box(Box(2438, 2438), Box(2438, 2438)),
+ Box(Box(2439, 2439), Box(2439, 2439)),
+ Box(Box(2440, 2440), Box(2440, 2440)),
+ Box(Box(2441, 2441), Box(2441, 2441)),
+ Box(Box(2442, 2442), Box(2442, 2442)),
+ Box(Box(2443, 2443), Box(2443, 2443)),
+ Box(Box(2444, 2444), Box(2444, 2444)),
+ Box(Box(2445, 2445), Box(2445, 2445)),
+ Box(Box(2446, 2446), Box(2446, 2446)),
+ Box(Box(2447, 2447), Box(2447, 2447)),
+ Box(Box(2448, 2448), Box(2448, 2448)),
+ Box(Box(2449, 2449), Box(2449, 2449)),
+ Box(Box(2450, 2450), Box(2450, 2450)),
+ Box(Box(2451, 2451), Box(2451, 2451)),
+ Box(Box(2452, 2452), Box(2452, 2452)),
+ Box(Box(2453, 2453), Box(2453, 2453)),
+ Box(Box(2454, 2454), Box(2454, 2454)),
+ Box(Box(2455, 2455), Box(2455, 2455)),
+ Box(Box(2456, 2456), Box(2456, 2456)),
+ Box(Box(2457, 2457), Box(2457, 2457)),
+ Box(Box(2458, 2458), Box(2458, 2458)),
+ Box(Box(2459, 2459), Box(2459, 2459)),
+ Box(Box(2460, 2460), Box(2460, 2460)),
+ Box(Box(2461, 2461), Box(2461, 2461)),
+ Box(Box(2462, 2462), Box(2462, 2462)),
+ Box(Box(2463, 2463), Box(2463, 2463)),
+ Box(Box(2464, 2464), Box(2464, 2464)),
+ Box(Box(2465, 2465), Box(2465, 2465)),
+ Box(Box(2466, 2466), Box(2466, 2466)),
+ Box(Box(2467, 2467), Box(2467, 2467)),
+ Box(Box(2468, 2468), Box(2468, 2468)),
+ Box(Box(2469, 2469), Box(2469, 2469)),
+ Box(Box(2470, 2470), Box(2470, 2470)),
+ Box(Box(2471, 2471), Box(2471, 2471)),
+ Box(Box(2472, 2472), Box(2472, 2472)),
+ Box(Box(2473, 2473), Box(2473, 2473)),
+ Box(Box(2474, 2474), Box(2474, 2474)),
+ Box(Box(2475, 2475), Box(2475, 2475)),
+ Box(Box(2476, 2476), Box(2476, 2476)),
+ Box(Box(2477, 2477), Box(2477, 2477)),
+ Box(Box(2478, 2478), Box(2478, 2478)),
+ Box(Box(2479, 2479), Box(2479, 2479)),
+ Box(Box(2480, 2480), Box(2480, 2480)),
+ Box(Box(2481, 2481), Box(2481, 2481)),
+ Box(Box(2482, 2482), Box(2482, 2482)),
+ Box(Box(2483, 2483), Box(2483, 2483)),
+ Box(Box(2484, 2484), Box(2484, 2484)),
+ Box(Box(2485, 2485), Box(2485, 2485)),
+ Box(Box(2486, 2486), Box(2486, 2486)),
+ Box(Box(2487, 2487), Box(2487, 2487)),
+ Box(Box(2488, 2488), Box(2488, 2488)),
+ Box(Box(2489, 2489), Box(2489, 2489)),
+ Box(Box(2490, 2490), Box(2490, 2490)),
+ Box(Box(2491, 2491), Box(2491, 2491)),
+ Box(Box(2492, 2492), Box(2492, 2492)),
+ Box(Box(2493, 2493), Box(2493, 2493)),
+ Box(Box(2494, 2494), Box(2494, 2494)),
+ Box(Box(2495, 2495), Box(2495, 2495)),
+ Box(Box(2496, 2496), Box(2496, 2496)),
+ Box(Box(2497, 2497), Box(2497, 2497)),
+ Box(Box(2498, 2498), Box(2498, 2498)),
+ Box(Box(2499, 2499), Box(2499, 2499)),
+ Box(Box(2500, 2500), Box(2500, 2500)),
+ Box(Box(2501, 2501), Box(2501, 2501)),
+ Box(Box(2502, 2502), Box(2502, 2502)),
+ Box(Box(2503, 2503), Box(2503, 2503)),
+ Box(Box(2504, 2504), Box(2504, 2504)),
+ Box(Box(2505, 2505), Box(2505, 2505)),
+ Box(Box(2506, 2506), Box(2506, 2506)),
+ Box(Box(2507, 2507), Box(2507, 2507)),
+ Box(Box(2508, 2508), Box(2508, 2508)),
+ Box(Box(2509, 2509), Box(2509, 2509)),
+ Box(Box(2510, 2510), Box(2510, 2510)),
+ Box(Box(2511, 2511), Box(2511, 2511)),
+ Box(Box(2512, 2512), Box(2512, 2512)),
+ Box(Box(2513, 2513), Box(2513, 2513)),
+ Box(Box(2514, 2514), Box(2514, 2514)),
+ Box(Box(2515, 2515), Box(2515, 2515)),
+ Box(Box(2516, 2516), Box(2516, 2516)),
+ Box(Box(2517, 2517), Box(2517, 2517)),
+ Box(Box(2518, 2518), Box(2518, 2518)),
+ Box(Box(2519, 2519), Box(2519, 2519)),
+ Box(Box(2520, 2520), Box(2520, 2520)),
+ Box(Box(2521, 2521), Box(2521, 2521)),
+ Box(Box(2522, 2522), Box(2522, 2522)),
+ Box(Box(2523, 2523), Box(2523, 2523)),
+ Box(Box(2524, 2524), Box(2524, 2524)),
+ Box(Box(2525, 2525), Box(2525, 2525)),
+ Box(Box(2526, 2526), Box(2526, 2526)),
+ Box(Box(2527, 2527), Box(2527, 2527)),
+ Box(Box(2528, 2528), Box(2528, 2528)),
+ Box(Box(2529, 2529), Box(2529, 2529)),
+ Box(Box(2530, 2530), Box(2530, 2530)),
+ Box(Box(2531, 2531), Box(2531, 2531)),
+ Box(Box(2532, 2532), Box(2532, 2532)),
+ Box(Box(2533, 2533), Box(2533, 2533)),
+ Box(Box(2534, 2534), Box(2534, 2534)),
+ Box(Box(2535, 2535), Box(2535, 2535)),
+ Box(Box(2536, 2536), Box(2536, 2536)),
+ Box(Box(2537, 2537), Box(2537, 2537)),
+ Box(Box(2538, 2538), Box(2538, 2538)),
+ Box(Box(2539, 2539), Box(2539, 2539)),
+ Box(Box(2540, 2540), Box(2540, 2540)),
+ Box(Box(2541, 2541), Box(2541, 2541)),
+ Box(Box(2542, 2542), Box(2542, 2542)),
+ Box(Box(2543, 2543), Box(2543, 2543)),
+ Box(Box(2544, 2544), Box(2544, 2544)),
+ Box(Box(2545, 2545), Box(2545, 2545)),
+ Box(Box(2546, 2546), Box(2546, 2546)),
+ Box(Box(2547, 2547), Box(2547, 2547)),
+ Box(Box(2548, 2548), Box(2548, 2548)),
+ Box(Box(2549, 2549), Box(2549, 2549)),
+ Box(Box(2550, 2550), Box(2550, 2550)),
+ Box(Box(2551, 2551), Box(2551, 2551)),
+ Box(Box(2552, 2552), Box(2552, 2552)),
+ Box(Box(2553, 2553), Box(2553, 2553)),
+ Box(Box(2554, 2554), Box(2554, 2554)),
+ Box(Box(2555, 2555), Box(2555, 2555)),
+ Box(Box(2556, 2556), Box(2556, 2556)),
+ Box(Box(2557, 2557), Box(2557, 2557)),
+ Box(Box(2558, 2558), Box(2558, 2558)),
+ Box(Box(2559, 2559), Box(2559, 2559)),
+ Box(Box(2560, 2560), Box(2560, 2560)),
+ Box(Box(2561, 2561), Box(2561, 2561)),
+ Box(Box(2562, 2562), Box(2562, 2562)),
+ Box(Box(2563, 2563), Box(2563, 2563)),
+ Box(Box(2564, 2564), Box(2564, 2564)),
+ Box(Box(2565, 2565), Box(2565, 2565)),
+ Box(Box(2566, 2566), Box(2566, 2566)),
+ Box(Box(2567, 2567), Box(2567, 2567)),
+ Box(Box(2568, 2568), Box(2568, 2568)),
+ Box(Box(2569, 2569), Box(2569, 2569)),
+ Box(Box(2570, 2570), Box(2570, 2570)),
+ Box(Box(2571, 2571), Box(2571, 2571)),
+ Box(Box(2572, 2572), Box(2572, 2572)),
+ Box(Box(2573, 2573), Box(2573, 2573)),
+ Box(Box(2574, 2574), Box(2574, 2574)),
+ Box(Box(2575, 2575), Box(2575, 2575)),
+ Box(Box(2576, 2576), Box(2576, 2576)),
+ Box(Box(2577, 2577), Box(2577, 2577)),
+ Box(Box(2578, 2578), Box(2578, 2578)),
+ Box(Box(2579, 2579), Box(2579, 2579)),
+ Box(Box(2580, 2580), Box(2580, 2580)),
+ Box(Box(2581, 2581), Box(2581, 2581)),
+ Box(Box(2582, 2582), Box(2582, 2582)),
+ Box(Box(2583, 2583), Box(2583, 2583)),
+ Box(Box(2584, 2584), Box(2584, 2584)),
+ Box(Box(2585, 2585), Box(2585, 2585)),
+ Box(Box(2586, 2586), Box(2586, 2586)),
+ Box(Box(2587, 2587), Box(2587, 2587)),
+ Box(Box(2588, 2588), Box(2588, 2588)),
+ Box(Box(2589, 2589), Box(2589, 2589)),
+ Box(Box(2590, 2590), Box(2590, 2590)),
+ Box(Box(2591, 2591), Box(2591, 2591)),
+ Box(Box(2592, 2592), Box(2592, 2592)),
+ Box(Box(2593, 2593), Box(2593, 2593)),
+ Box(Box(2594, 2594), Box(2594, 2594)),
+ Box(Box(2595, 2595), Box(2595, 2595)),
+ Box(Box(2596, 2596), Box(2596, 2596)),
+ Box(Box(2597, 2597), Box(2597, 2597)),
+ Box(Box(2598, 2598), Box(2598, 2598)),
+ Box(Box(2599, 2599), Box(2599, 2599)),
+ Box(Box(2600, 2600), Box(2600, 2600)),
+ Box(Box(2601, 2601), Box(2601, 2601)),
+ Box(Box(2602, 2602), Box(2602, 2602)),
+ Box(Box(2603, 2603), Box(2603, 2603)),
+ Box(Box(2604, 2604), Box(2604, 2604)),
+ Box(Box(2605, 2605), Box(2605, 2605)),
+ Box(Box(2606, 2606), Box(2606, 2606)),
+ Box(Box(2607, 2607), Box(2607, 2607)),
+ Box(Box(2608, 2608), Box(2608, 2608)),
+ Box(Box(2609, 2609), Box(2609, 2609)),
+ Box(Box(2610, 2610), Box(2610, 2610)),
+ Box(Box(2611, 2611), Box(2611, 2611)),
+ Box(Box(2612, 2612), Box(2612, 2612)),
+ Box(Box(2613, 2613), Box(2613, 2613)),
+ Box(Box(2614, 2614), Box(2614, 2614)),
+ Box(Box(2615, 2615), Box(2615, 2615)),
+ Box(Box(2616, 2616), Box(2616, 2616)),
+ Box(Box(2617, 2617), Box(2617, 2617)),
+ Box(Box(2618, 2618), Box(2618, 2618)),
+ Box(Box(2619, 2619), Box(2619, 2619)),
+ Box(Box(2620, 2620), Box(2620, 2620)),
+ Box(Box(2621, 2621), Box(2621, 2621)),
+ Box(Box(2622, 2622), Box(2622, 2622)),
+ Box(Box(2623, 2623), Box(2623, 2623)),
+ Box(Box(2624, 2624), Box(2624, 2624)),
+ Box(Box(2625, 2625), Box(2625, 2625)),
+ Box(Box(2626, 2626), Box(2626, 2626)),
+ Box(Box(2627, 2627), Box(2627, 2627)),
+ Box(Box(2628, 2628), Box(2628, 2628)),
+ Box(Box(2629, 2629), Box(2629, 2629)),
+ Box(Box(2630, 2630), Box(2630, 2630)),
+ Box(Box(2631, 2631), Box(2631, 2631)),
+ Box(Box(2632, 2632), Box(2632, 2632)),
+ Box(Box(2633, 2633), Box(2633, 2633)),
+ Box(Box(2634, 2634), Box(2634, 2634)),
+ Box(Box(2635, 2635), Box(2635, 2635)),
+ Box(Box(2636, 2636), Box(2636, 2636)),
+ Box(Box(2637, 2637), Box(2637, 2637)),
+ Box(Box(2638, 2638), Box(2638, 2638)),
+ Box(Box(2639, 2639), Box(2639, 2639)),
+ Box(Box(2640, 2640), Box(2640, 2640)),
+ Box(Box(2641, 2641), Box(2641, 2641)),
+ Box(Box(2642, 2642), Box(2642, 2642)),
+ Box(Box(2643, 2643), Box(2643, 2643)),
+ Box(Box(2644, 2644), Box(2644, 2644)),
+ Box(Box(2645, 2645), Box(2645, 2645)),
+ Box(Box(2646, 2646), Box(2646, 2646)),
+ Box(Box(2647, 2647), Box(2647, 2647)),
+ Box(Box(2648, 2648), Box(2648, 2648)),
+ Box(Box(2649, 2649), Box(2649, 2649)),
+ Box(Box(2650, 2650), Box(2650, 2650)),
+ Box(Box(2651, 2651), Box(2651, 2651)),
+ Box(Box(2652, 2652), Box(2652, 2652)),
+ Box(Box(2653, 2653), Box(2653, 2653)),
+ Box(Box(2654, 2654), Box(2654, 2654)),
+ Box(Box(2655, 2655), Box(2655, 2655)),
+ Box(Box(2656, 2656), Box(2656, 2656)),
+ Box(Box(2657, 2657), Box(2657, 2657)),
+ Box(Box(2658, 2658), Box(2658, 2658)),
+ Box(Box(2659, 2659), Box(2659, 2659)),
+ Box(Box(2660, 2660), Box(2660, 2660)),
+ Box(Box(2661, 2661), Box(2661, 2661)),
+ Box(Box(2662, 2662), Box(2662, 2662)),
+ Box(Box(2663, 2663), Box(2663, 2663)),
+ Box(Box(2664, 2664), Box(2664, 2664)),
+ Box(Box(2665, 2665), Box(2665, 2665)),
+ Box(Box(2666, 2666), Box(2666, 2666)),
+ Box(Box(2667, 2667), Box(2667, 2667)),
+ Box(Box(2668, 2668), Box(2668, 2668)),
+ Box(Box(2669, 2669), Box(2669, 2669)),
+ Box(Box(2670, 2670), Box(2670, 2670)),
+ Box(Box(2671, 2671), Box(2671, 2671)),
+ Box(Box(2672, 2672), Box(2672, 2672)),
+ Box(Box(2673, 2673), Box(2673, 2673)),
+ Box(Box(2674, 2674), Box(2674, 2674)),
+ Box(Box(2675, 2675), Box(2675, 2675)),
+ Box(Box(2676, 2676), Box(2676, 2676)),
+ Box(Box(2677, 2677), Box(2677, 2677)),
+ Box(Box(2678, 2678), Box(2678, 2678)),
+ Box(Box(2679, 2679), Box(2679, 2679)),
+ Box(Box(2680, 2680), Box(2680, 2680)),
+ Box(Box(2681, 2681), Box(2681, 2681)),
+ Box(Box(2682, 2682), Box(2682, 2682)),
+ Box(Box(2683, 2683), Box(2683, 2683)),
+ Box(Box(2684, 2684), Box(2684, 2684)),
+ Box(Box(2685, 2685), Box(2685, 2685)),
+ Box(Box(2686, 2686), Box(2686, 2686)),
+ Box(Box(2687, 2687), Box(2687, 2687)),
+ Box(Box(2688, 2688), Box(2688, 2688)),
+ Box(Box(2689, 2689), Box(2689, 2689)),
+ Box(Box(2690, 2690), Box(2690, 2690)),
+ Box(Box(2691, 2691), Box(2691, 2691)),
+ Box(Box(2692, 2692), Box(2692, 2692)),
+ Box(Box(2693, 2693), Box(2693, 2693)),
+ Box(Box(2694, 2694), Box(2694, 2694)),
+ Box(Box(2695, 2695), Box(2695, 2695)),
+ Box(Box(2696, 2696), Box(2696, 2696)),
+ Box(Box(2697, 2697), Box(2697, 2697)),
+ Box(Box(2698, 2698), Box(2698, 2698)),
+ Box(Box(2699, 2699), Box(2699, 2699)),
+ Box(Box(2700, 2700), Box(2700, 2700)),
+ Box(Box(2701, 2701), Box(2701, 2701)),
+ Box(Box(2702, 2702), Box(2702, 2702)),
+ Box(Box(2703, 2703), Box(2703, 2703)),
+ Box(Box(2704, 2704), Box(2704, 2704)),
+ Box(Box(2705, 2705), Box(2705, 2705)),
+ Box(Box(2706, 2706), Box(2706, 2706)),
+ Box(Box(2707, 2707), Box(2707, 2707)),
+ Box(Box(2708, 2708), Box(2708, 2708)),
+ Box(Box(2709, 2709), Box(2709, 2709)),
+ Box(Box(2710, 2710), Box(2710, 2710)),
+ Box(Box(2711, 2711), Box(2711, 2711)),
+ Box(Box(2712, 2712), Box(2712, 2712)),
+ Box(Box(2713, 2713), Box(2713, 2713)),
+ Box(Box(2714, 2714), Box(2714, 2714)),
+ Box(Box(2715, 2715), Box(2715, 2715)),
+ Box(Box(2716, 2716), Box(2716, 2716)),
+ Box(Box(2717, 2717), Box(2717, 2717)),
+ Box(Box(2718, 2718), Box(2718, 2718)),
+ Box(Box(2719, 2719), Box(2719, 2719)),
+ Box(Box(2720, 2720), Box(2720, 2720)),
+ Box(Box(2721, 2721), Box(2721, 2721)),
+ Box(Box(2722, 2722), Box(2722, 2722)),
+ Box(Box(2723, 2723), Box(2723, 2723)),
+ Box(Box(2724, 2724), Box(2724, 2724)),
+ Box(Box(2725, 2725), Box(2725, 2725)),
+ Box(Box(2726, 2726), Box(2726, 2726)),
+ Box(Box(2727, 2727), Box(2727, 2727)),
+ Box(Box(2728, 2728), Box(2728, 2728)),
+ Box(Box(2729, 2729), Box(2729, 2729)),
+ Box(Box(2730, 2730), Box(2730, 2730)),
+ Box(Box(2731, 2731), Box(2731, 2731)),
+ Box(Box(2732, 2732), Box(2732, 2732)),
+ Box(Box(2733, 2733), Box(2733, 2733)),
+ Box(Box(2734, 2734), Box(2734, 2734)),
+ Box(Box(2735, 2735), Box(2735, 2735)),
+ Box(Box(2736, 2736), Box(2736, 2736)),
+ Box(Box(2737, 2737), Box(2737, 2737)),
+ Box(Box(2738, 2738), Box(2738, 2738)),
+ Box(Box(2739, 2739), Box(2739, 2739)),
+ Box(Box(2740, 2740), Box(2740, 2740)),
+ Box(Box(2741, 2741), Box(2741, 2741)),
+ Box(Box(2742, 2742), Box(2742, 2742)),
+ Box(Box(2743, 2743), Box(2743, 2743)),
+ Box(Box(2744, 2744), Box(2744, 2744)),
+ Box(Box(2745, 2745), Box(2745, 2745)),
+ Box(Box(2746, 2746), Box(2746, 2746)),
+ Box(Box(2747, 2747), Box(2747, 2747)),
+ Box(Box(2748, 2748), Box(2748, 2748)),
+ Box(Box(2749, 2749), Box(2749, 2749)),
+ Box(Box(2750, 2750), Box(2750, 2750)),
+ Box(Box(2751, 2751), Box(2751, 2751)),
+ Box(Box(2752, 2752), Box(2752, 2752)),
+ Box(Box(2753, 2753), Box(2753, 2753)),
+ Box(Box(2754, 2754), Box(2754, 2754)),
+ Box(Box(2755, 2755), Box(2755, 2755)),
+ Box(Box(2756, 2756), Box(2756, 2756)),
+ Box(Box(2757, 2757), Box(2757, 2757)),
+ Box(Box(2758, 2758), Box(2758, 2758)),
+ Box(Box(2759, 2759), Box(2759, 2759)),
+ Box(Box(2760, 2760), Box(2760, 2760)),
+ Box(Box(2761, 2761), Box(2761, 2761)),
+ Box(Box(2762, 2762), Box(2762, 2762)),
+ Box(Box(2763, 2763), Box(2763, 2763)),
+ Box(Box(2764, 2764), Box(2764, 2764)),
+ Box(Box(2765, 2765), Box(2765, 2765)),
+ Box(Box(2766, 2766), Box(2766, 2766)),
+ Box(Box(2767, 2767), Box(2767, 2767)),
+ Box(Box(2768, 2768), Box(2768, 2768)),
+ Box(Box(2769, 2769), Box(2769, 2769)),
+ Box(Box(2770, 2770), Box(2770, 2770)),
+ Box(Box(2771, 2771), Box(2771, 2771)),
+ Box(Box(2772, 2772), Box(2772, 2772)),
+ Box(Box(2773, 2773), Box(2773, 2773)),
+ Box(Box(2774, 2774), Box(2774, 2774)),
+ Box(Box(2775, 2775), Box(2775, 2775)),
+ Box(Box(2776, 2776), Box(2776, 2776)),
+ Box(Box(2777, 2777), Box(2777, 2777)),
+ Box(Box(2778, 2778), Box(2778, 2778)),
+ Box(Box(2779, 2779), Box(2779, 2779)),
+ Box(Box(2780, 2780), Box(2780, 2780)),
+ Box(Box(2781, 2781), Box(2781, 2781)),
+ Box(Box(2782, 2782), Box(2782, 2782)),
+ Box(Box(2783, 2783), Box(2783, 2783)),
+ Box(Box(2784, 2784), Box(2784, 2784)),
+ Box(Box(2785, 2785), Box(2785, 2785)),
+ Box(Box(2786, 2786), Box(2786, 2786)),
+ Box(Box(2787, 2787), Box(2787, 2787)),
+ Box(Box(2788, 2788), Box(2788, 2788)),
+ Box(Box(2789, 2789), Box(2789, 2789)),
+ Box(Box(2790, 2790), Box(2790, 2790)),
+ Box(Box(2791, 2791), Box(2791, 2791)),
+ Box(Box(2792, 2792), Box(2792, 2792)),
+ Box(Box(2793, 2793), Box(2793, 2793)),
+ Box(Box(2794, 2794), Box(2794, 2794)),
+ Box(Box(2795, 2795), Box(2795, 2795)),
+ Box(Box(2796, 2796), Box(2796, 2796)),
+ Box(Box(2797, 2797), Box(2797, 2797)),
+ Box(Box(2798, 2798), Box(2798, 2798)),
+ Box(Box(2799, 2799), Box(2799, 2799)),
+ Box(Box(2800, 2800), Box(2800, 2800)),
+ Box(Box(2801, 2801), Box(2801, 2801)),
+ Box(Box(2802, 2802), Box(2802, 2802)),
+ Box(Box(2803, 2803), Box(2803, 2803)),
+ Box(Box(2804, 2804), Box(2804, 2804)),
+ Box(Box(2805, 2805), Box(2805, 2805)),
+ Box(Box(2806, 2806), Box(2806, 2806)),
+ Box(Box(2807, 2807), Box(2807, 2807)),
+ Box(Box(2808, 2808), Box(2808, 2808)),
+ Box(Box(2809, 2809), Box(2809, 2809)),
+ Box(Box(2810, 2810), Box(2810, 2810)),
+ Box(Box(2811, 2811), Box(2811, 2811)),
+ Box(Box(2812, 2812), Box(2812, 2812)),
+ Box(Box(2813, 2813), Box(2813, 2813)),
+ Box(Box(2814, 2814), Box(2814, 2814)),
+ Box(Box(2815, 2815), Box(2815, 2815)),
+ Box(Box(2816, 2816), Box(2816, 2816)),
+ Box(Box(2817, 2817), Box(2817, 2817)),
+ Box(Box(2818, 2818), Box(2818, 2818)),
+ Box(Box(2819, 2819), Box(2819, 2819)),
+ Box(Box(2820, 2820), Box(2820, 2820)),
+ Box(Box(2821, 2821), Box(2821, 2821)),
+ Box(Box(2822, 2822), Box(2822, 2822)),
+ Box(Box(2823, 2823), Box(2823, 2823)),
+ Box(Box(2824, 2824), Box(2824, 2824)),
+ Box(Box(2825, 2825), Box(2825, 2825)),
+ Box(Box(2826, 2826), Box(2826, 2826)),
+ Box(Box(2827, 2827), Box(2827, 2827)),
+ Box(Box(2828, 2828), Box(2828, 2828)),
+ Box(Box(2829, 2829), Box(2829, 2829)),
+ Box(Box(2830, 2830), Box(2830, 2830)),
+ Box(Box(2831, 2831), Box(2831, 2831)),
+ Box(Box(2832, 2832), Box(2832, 2832)),
+ Box(Box(2833, 2833), Box(2833, 2833)),
+ Box(Box(2834, 2834), Box(2834, 2834)),
+ Box(Box(2835, 2835), Box(2835, 2835)),
+ Box(Box(2836, 2836), Box(2836, 2836)),
+ Box(Box(2837, 2837), Box(2837, 2837)),
+ Box(Box(2838, 2838), Box(2838, 2838)),
+ Box(Box(2839, 2839), Box(2839, 2839)),
+ Box(Box(2840, 2840), Box(2840, 2840)),
+ Box(Box(2841, 2841), Box(2841, 2841)),
+ Box(Box(2842, 2842), Box(2842, 2842)),
+ Box(Box(2843, 2843), Box(2843, 2843)),
+ Box(Box(2844, 2844), Box(2844, 2844)),
+ Box(Box(2845, 2845), Box(2845, 2845)),
+ Box(Box(2846, 2846), Box(2846, 2846)),
+ Box(Box(2847, 2847), Box(2847, 2847)),
+ Box(Box(2848, 2848), Box(2848, 2848)),
+ Box(Box(2849, 2849), Box(2849, 2849)),
+ Box(Box(2850, 2850), Box(2850, 2850)),
+ Box(Box(2851, 2851), Box(2851, 2851)),
+ Box(Box(2852, 2852), Box(2852, 2852)),
+ Box(Box(2853, 2853), Box(2853, 2853)),
+ Box(Box(2854, 2854), Box(2854, 2854)),
+ Box(Box(2855, 2855), Box(2855, 2855)),
+ Box(Box(2856, 2856), Box(2856, 2856)),
+ Box(Box(2857, 2857), Box(2857, 2857)),
+ Box(Box(2858, 2858), Box(2858, 2858)),
+ Box(Box(2859, 2859), Box(2859, 2859)),
+ Box(Box(2860, 2860), Box(2860, 2860)),
+ Box(Box(2861, 2861), Box(2861, 2861)),
+ Box(Box(2862, 2862), Box(2862, 2862)),
+ Box(Box(2863, 2863), Box(2863, 2863)),
+ Box(Box(2864, 2864), Box(2864, 2864)),
+ Box(Box(2865, 2865), Box(2865, 2865)),
+ Box(Box(2866, 2866), Box(2866, 2866)),
+ Box(Box(2867, 2867), Box(2867, 2867)),
+ Box(Box(2868, 2868), Box(2868, 2868)),
+ Box(Box(2869, 2869), Box(2869, 2869)),
+ Box(Box(2870, 2870), Box(2870, 2870)),
+ Box(Box(2871, 2871), Box(2871, 2871)),
+ Box(Box(2872, 2872), Box(2872, 2872)),
+ Box(Box(2873, 2873), Box(2873, 2873)),
+ Box(Box(2874, 2874), Box(2874, 2874)),
+ Box(Box(2875, 2875), Box(2875, 2875)),
+ Box(Box(2876, 2876), Box(2876, 2876)),
+ Box(Box(2877, 2877), Box(2877, 2877)),
+ Box(Box(2878, 2878), Box(2878, 2878)),
+ Box(Box(2879, 2879), Box(2879, 2879)),
+ Box(Box(2880, 2880), Box(2880, 2880)),
+ Box(Box(2881, 2881), Box(2881, 2881)),
+ Box(Box(2882, 2882), Box(2882, 2882)),
+ Box(Box(2883, 2883), Box(2883, 2883)),
+ Box(Box(2884, 2884), Box(2884, 2884)),
+ Box(Box(2885, 2885), Box(2885, 2885)),
+ Box(Box(2886, 2886), Box(2886, 2886)),
+ Box(Box(2887, 2887), Box(2887, 2887)),
+ Box(Box(2888, 2888), Box(2888, 2888)),
+ Box(Box(2889, 2889), Box(2889, 2889)),
+ Box(Box(2890, 2890), Box(2890, 2890)),
+ Box(Box(2891, 2891), Box(2891, 2891)),
+ Box(Box(2892, 2892), Box(2892, 2892)),
+ Box(Box(2893, 2893), Box(2893, 2893)),
+ Box(Box(2894, 2894), Box(2894, 2894)),
+ Box(Box(2895, 2895), Box(2895, 2895)),
+ Box(Box(2896, 2896), Box(2896, 2896)),
+ Box(Box(2897, 2897), Box(2897, 2897)),
+ Box(Box(2898, 2898), Box(2898, 2898)),
+ Box(Box(2899, 2899), Box(2899, 2899)),
+ Box(Box(2900, 2900), Box(2900, 2900)),
+ Box(Box(2901, 2901), Box(2901, 2901)),
+ Box(Box(2902, 2902), Box(2902, 2902)),
+ Box(Box(2903, 2903), Box(2903, 2903)),
+ Box(Box(2904, 2904), Box(2904, 2904)),
+ Box(Box(2905, 2905), Box(2905, 2905)),
+ Box(Box(2906, 2906), Box(2906, 2906)),
+ Box(Box(2907, 2907), Box(2907, 2907)),
+ Box(Box(2908, 2908), Box(2908, 2908)),
+ Box(Box(2909, 2909), Box(2909, 2909)),
+ Box(Box(2910, 2910), Box(2910, 2910)),
+ Box(Box(2911, 2911), Box(2911, 2911)),
+ Box(Box(2912, 2912), Box(2912, 2912)),
+ Box(Box(2913, 2913), Box(2913, 2913)),
+ Box(Box(2914, 2914), Box(2914, 2914)),
+ Box(Box(2915, 2915), Box(2915, 2915)),
+ Box(Box(2916, 2916), Box(2916, 2916)),
+ Box(Box(2917, 2917), Box(2917, 2917)),
+ Box(Box(2918, 2918), Box(2918, 2918)),
+ Box(Box(2919, 2919), Box(2919, 2919)),
+ Box(Box(2920, 2920), Box(2920, 2920)),
+ Box(Box(2921, 2921), Box(2921, 2921)),
+ Box(Box(2922, 2922), Box(2922, 2922)),
+ Box(Box(2923, 2923), Box(2923, 2923)),
+ Box(Box(2924, 2924), Box(2924, 2924)),
+ Box(Box(2925, 2925), Box(2925, 2925)),
+ Box(Box(2926, 2926), Box(2926, 2926)),
+ Box(Box(2927, 2927), Box(2927, 2927)),
+ Box(Box(2928, 2928), Box(2928, 2928)),
+ Box(Box(2929, 2929), Box(2929, 2929)),
+ Box(Box(2930, 2930), Box(2930, 2930)),
+ Box(Box(2931, 2931), Box(2931, 2931)),
+ Box(Box(2932, 2932), Box(2932, 2932)),
+ Box(Box(2933, 2933), Box(2933, 2933)),
+ Box(Box(2934, 2934), Box(2934, 2934)),
+ Box(Box(2935, 2935), Box(2935, 2935)),
+ Box(Box(2936, 2936), Box(2936, 2936)),
+ Box(Box(2937, 2937), Box(2937, 2937)),
+ Box(Box(2938, 2938), Box(2938, 2938)),
+ Box(Box(2939, 2939), Box(2939, 2939)),
+ Box(Box(2940, 2940), Box(2940, 2940)),
+ Box(Box(2941, 2941), Box(2941, 2941)),
+ Box(Box(2942, 2942), Box(2942, 2942)),
+ Box(Box(2943, 2943), Box(2943, 2943)),
+ Box(Box(2944, 2944), Box(2944, 2944)),
+ Box(Box(2945, 2945), Box(2945, 2945)),
+ Box(Box(2946, 2946), Box(2946, 2946)),
+ Box(Box(2947, 2947), Box(2947, 2947)),
+ Box(Box(2948, 2948), Box(2948, 2948)),
+ Box(Box(2949, 2949), Box(2949, 2949)),
+ Box(Box(2950, 2950), Box(2950, 2950)),
+ Box(Box(2951, 2951), Box(2951, 2951)),
+ Box(Box(2952, 2952), Box(2952, 2952)),
+ Box(Box(2953, 2953), Box(2953, 2953)),
+ Box(Box(2954, 2954), Box(2954, 2954)),
+ Box(Box(2955, 2955), Box(2955, 2955)),
+ Box(Box(2956, 2956), Box(2956, 2956)),
+ Box(Box(2957, 2957), Box(2957, 2957)),
+ Box(Box(2958, 2958), Box(2958, 2958)),
+ Box(Box(2959, 2959), Box(2959, 2959)),
+ Box(Box(2960, 2960), Box(2960, 2960)),
+ Box(Box(2961, 2961), Box(2961, 2961)),
+ Box(Box(2962, 2962), Box(2962, 2962)),
+ Box(Box(2963, 2963), Box(2963, 2963)),
+ Box(Box(2964, 2964), Box(2964, 2964)),
+ Box(Box(2965, 2965), Box(2965, 2965)),
+ Box(Box(2966, 2966), Box(2966, 2966)),
+ Box(Box(2967, 2967), Box(2967, 2967)),
+ Box(Box(2968, 2968), Box(2968, 2968)),
+ Box(Box(2969, 2969), Box(2969, 2969)),
+ Box(Box(2970, 2970), Box(2970, 2970)),
+ Box(Box(2971, 2971), Box(2971, 2971)),
+ Box(Box(2972, 2972), Box(2972, 2972)),
+ Box(Box(2973, 2973), Box(2973, 2973)),
+ Box(Box(2974, 2974), Box(2974, 2974)),
+ Box(Box(2975, 2975), Box(2975, 2975)),
+ Box(Box(2976, 2976), Box(2976, 2976)),
+ Box(Box(2977, 2977), Box(2977, 2977)),
+ Box(Box(2978, 2978), Box(2978, 2978)),
+ Box(Box(2979, 2979), Box(2979, 2979)),
+ Box(Box(2980, 2980), Box(2980, 2980)),
+ Box(Box(2981, 2981), Box(2981, 2981)),
+ Box(Box(2982, 2982), Box(2982, 2982)),
+ Box(Box(2983, 2983), Box(2983, 2983)),
+ Box(Box(2984, 2984), Box(2984, 2984)),
+ Box(Box(2985, 2985), Box(2985, 2985)),
+ Box(Box(2986, 2986), Box(2986, 2986)),
+ Box(Box(2987, 2987), Box(2987, 2987)),
+ Box(Box(2988, 2988), Box(2988, 2988)),
+ Box(Box(2989, 2989), Box(2989, 2989)),
+ Box(Box(2990, 2990), Box(2990, 2990)),
+ Box(Box(2991, 2991), Box(2991, 2991)),
+ Box(Box(2992, 2992), Box(2992, 2992)),
+ Box(Box(2993, 2993), Box(2993, 2993)),
+ Box(Box(2994, 2994), Box(2994, 2994)),
+ Box(Box(2995, 2995), Box(2995, 2995)),
+ Box(Box(2996, 2996), Box(2996, 2996)),
+ Box(Box(2997, 2997), Box(2997, 2997)),
+ Box(Box(2998, 2998), Box(2998, 2998)),
+ Box(Box(2999, 2999), Box(2999, 2999)),
+ Box(Box(3000, 3000), Box(3000, 3000)),
+ Box(Box(3001, 3001), Box(3001, 3001)),
+ Box(Box(3002, 3002), Box(3002, 3002)),
+ Box(Box(3003, 3003), Box(3003, 3003)),
+ Box(Box(3004, 3004), Box(3004, 3004)),
+ Box(Box(3005, 3005), Box(3005, 3005)),
+ Box(Box(3006, 3006), Box(3006, 3006)),
+ Box(Box(3007, 3007), Box(3007, 3007)),
+ Box(Box(3008, 3008), Box(3008, 3008)),
+ Box(Box(3009, 3009), Box(3009, 3009)),
+ Box(Box(3010, 3010), Box(3010, 3010)),
+ Box(Box(3011, 3011), Box(3011, 3011)),
+ Box(Box(3012, 3012), Box(3012, 3012)),
+ Box(Box(3013, 3013), Box(3013, 3013)),
+ Box(Box(3014, 3014), Box(3014, 3014)),
+ Box(Box(3015, 3015), Box(3015, 3015)),
+ Box(Box(3016, 3016), Box(3016, 3016)),
+ Box(Box(3017, 3017), Box(3017, 3017)),
+ Box(Box(3018, 3018), Box(3018, 3018)),
+ Box(Box(3019, 3019), Box(3019, 3019)),
+ Box(Box(3020, 3020), Box(3020, 3020)),
+ Box(Box(3021, 3021), Box(3021, 3021)),
+ Box(Box(3022, 3022), Box(3022, 3022)),
+ Box(Box(3023, 3023), Box(3023, 3023)),
+ Box(Box(3024, 3024), Box(3024, 3024)),
+ Box(Box(3025, 3025), Box(3025, 3025)),
+ Box(Box(3026, 3026), Box(3026, 3026)),
+ Box(Box(3027, 3027), Box(3027, 3027)),
+ Box(Box(3028, 3028), Box(3028, 3028)),
+ Box(Box(3029, 3029), Box(3029, 3029)),
+ Box(Box(3030, 3030), Box(3030, 3030)),
+ Box(Box(3031, 3031), Box(3031, 3031)),
+ Box(Box(3032, 3032), Box(3032, 3032)),
+ Box(Box(3033, 3033), Box(3033, 3033)),
+ Box(Box(3034, 3034), Box(3034, 3034)),
+ Box(Box(3035, 3035), Box(3035, 3035)),
+ Box(Box(3036, 3036), Box(3036, 3036)),
+ Box(Box(3037, 3037), Box(3037, 3037)),
+ Box(Box(3038, 3038), Box(3038, 3038)),
+ Box(Box(3039, 3039), Box(3039, 3039)),
+ Box(Box(3040, 3040), Box(3040, 3040)),
+ Box(Box(3041, 3041), Box(3041, 3041)),
+ Box(Box(3042, 3042), Box(3042, 3042)),
+ Box(Box(3043, 3043), Box(3043, 3043)),
+ Box(Box(3044, 3044), Box(3044, 3044)),
+ Box(Box(3045, 3045), Box(3045, 3045)),
+ Box(Box(3046, 3046), Box(3046, 3046)),
+ Box(Box(3047, 3047), Box(3047, 3047)),
+ Box(Box(3048, 3048), Box(3048, 3048)),
+ Box(Box(3049, 3049), Box(3049, 3049)),
+ Box(Box(3050, 3050), Box(3050, 3050)),
+ Box(Box(3051, 3051), Box(3051, 3051)),
+ Box(Box(3052, 3052), Box(3052, 3052)),
+ Box(Box(3053, 3053), Box(3053, 3053)),
+ Box(Box(3054, 3054), Box(3054, 3054)),
+ Box(Box(3055, 3055), Box(3055, 3055)),
+ Box(Box(3056, 3056), Box(3056, 3056)),
+ Box(Box(3057, 3057), Box(3057, 3057)),
+ Box(Box(3058, 3058), Box(3058, 3058)),
+ Box(Box(3059, 3059), Box(3059, 3059)),
+ Box(Box(3060, 3060), Box(3060, 3060)),
+ Box(Box(3061, 3061), Box(3061, 3061)),
+ Box(Box(3062, 3062), Box(3062, 3062)),
+ Box(Box(3063, 3063), Box(3063, 3063)),
+ Box(Box(3064, 3064), Box(3064, 3064)),
+ Box(Box(3065, 3065), Box(3065, 3065)),
+ Box(Box(3066, 3066), Box(3066, 3066)),
+ Box(Box(3067, 3067), Box(3067, 3067)),
+ Box(Box(3068, 3068), Box(3068, 3068)),
+ Box(Box(3069, 3069), Box(3069, 3069)),
+ Box(Box(3070, 3070), Box(3070, 3070)),
+ Box(Box(3071, 3071), Box(3071, 3071)),
+ Box(Box(3072, 3072), Box(3072, 3072)),
+ Box(Box(3073, 3073), Box(3073, 3073)),
+ Box(Box(3074, 3074), Box(3074, 3074)),
+ Box(Box(3075, 3075), Box(3075, 3075)),
+ Box(Box(3076, 3076), Box(3076, 3076)),
+ Box(Box(3077, 3077), Box(3077, 3077)),
+ Box(Box(3078, 3078), Box(3078, 3078)),
+ Box(Box(3079, 3079), Box(3079, 3079)),
+ Box(Box(3080, 3080), Box(3080, 3080)),
+ Box(Box(3081, 3081), Box(3081, 3081)),
+ Box(Box(3082, 3082), Box(3082, 3082)),
+ Box(Box(3083, 3083), Box(3083, 3083)),
+ Box(Box(3084, 3084), Box(3084, 3084)),
+ Box(Box(3085, 3085), Box(3085, 3085)),
+ Box(Box(3086, 3086), Box(3086, 3086)),
+ Box(Box(3087, 3087), Box(3087, 3087)),
+ Box(Box(3088, 3088), Box(3088, 3088)),
+ Box(Box(3089, 3089), Box(3089, 3089)),
+ Box(Box(3090, 3090), Box(3090, 3090)),
+ Box(Box(3091, 3091), Box(3091, 3091)),
+ Box(Box(3092, 3092), Box(3092, 3092)),
+ Box(Box(3093, 3093), Box(3093, 3093)),
+ Box(Box(3094, 3094), Box(3094, 3094)),
+ Box(Box(3095, 3095), Box(3095, 3095)),
+ Box(Box(3096, 3096), Box(3096, 3096)),
+ Box(Box(3097, 3097), Box(3097, 3097)),
+ Box(Box(3098, 3098), Box(3098, 3098)),
+ Box(Box(3099, 3099), Box(3099, 3099)),
+ Box(Box(3100, 3100), Box(3100, 3100)),
+ Box(Box(3101, 3101), Box(3101, 3101)),
+ Box(Box(3102, 3102), Box(3102, 3102)),
+ Box(Box(3103, 3103), Box(3103, 3103)),
+ Box(Box(3104, 3104), Box(3104, 3104)),
+ Box(Box(3105, 3105), Box(3105, 3105)),
+ Box(Box(3106, 3106), Box(3106, 3106)),
+ Box(Box(3107, 3107), Box(3107, 3107)),
+ Box(Box(3108, 3108), Box(3108, 3108)),
+ Box(Box(3109, 3109), Box(3109, 3109)),
+ Box(Box(3110, 3110), Box(3110, 3110)),
+ Box(Box(3111, 3111), Box(3111, 3111)),
+ Box(Box(3112, 3112), Box(3112, 3112)),
+ Box(Box(3113, 3113), Box(3113, 3113)),
+ Box(Box(3114, 3114), Box(3114, 3114)),
+ Box(Box(3115, 3115), Box(3115, 3115)),
+ Box(Box(3116, 3116), Box(3116, 3116)),
+ Box(Box(3117, 3117), Box(3117, 3117)),
+ Box(Box(3118, 3118), Box(3118, 3118)),
+ Box(Box(3119, 3119), Box(3119, 3119)),
+ Box(Box(3120, 3120), Box(3120, 3120)),
+ Box(Box(3121, 3121), Box(3121, 3121)),
+ Box(Box(3122, 3122), Box(3122, 3122)),
+ Box(Box(3123, 3123), Box(3123, 3123)),
+ Box(Box(3124, 3124), Box(3124, 3124)),
+ Box(Box(3125, 3125), Box(3125, 3125)),
+ Box(Box(3126, 3126), Box(3126, 3126)),
+ Box(Box(3127, 3127), Box(3127, 3127)),
+ Box(Box(3128, 3128), Box(3128, 3128)),
+ Box(Box(3129, 3129), Box(3129, 3129)),
+ Box(Box(3130, 3130), Box(3130, 3130)),
+ Box(Box(3131, 3131), Box(3131, 3131)),
+ Box(Box(3132, 3132), Box(3132, 3132)),
+ Box(Box(3133, 3133), Box(3133, 3133)),
+ Box(Box(3134, 3134), Box(3134, 3134)),
+ Box(Box(3135, 3135), Box(3135, 3135)),
+ Box(Box(3136, 3136), Box(3136, 3136)),
+ Box(Box(3137, 3137), Box(3137, 3137)),
+ Box(Box(3138, 3138), Box(3138, 3138)),
+ Box(Box(3139, 3139), Box(3139, 3139)),
+ Box(Box(3140, 3140), Box(3140, 3140)),
+ Box(Box(3141, 3141), Box(3141, 3141)),
+ Box(Box(3142, 3142), Box(3142, 3142)),
+ Box(Box(3143, 3143), Box(3143, 3143)),
+ Box(Box(3144, 3144), Box(3144, 3144)),
+ Box(Box(3145, 3145), Box(3145, 3145)),
+ Box(Box(3146, 3146), Box(3146, 3146)),
+ Box(Box(3147, 3147), Box(3147, 3147)),
+ Box(Box(3148, 3148), Box(3148, 3148)),
+ Box(Box(3149, 3149), Box(3149, 3149)),
+ Box(Box(3150, 3150), Box(3150, 3150)),
+ Box(Box(3151, 3151), Box(3151, 3151)),
+ Box(Box(3152, 3152), Box(3152, 3152)),
+ Box(Box(3153, 3153), Box(3153, 3153)),
+ Box(Box(3154, 3154), Box(3154, 3154)),
+ Box(Box(3155, 3155), Box(3155, 3155)),
+ Box(Box(3156, 3156), Box(3156, 3156)),
+ Box(Box(3157, 3157), Box(3157, 3157)),
+ Box(Box(3158, 3158), Box(3158, 3158)),
+ Box(Box(3159, 3159), Box(3159, 3159)),
+ Box(Box(3160, 3160), Box(3160, 3160)),
+ Box(Box(3161, 3161), Box(3161, 3161)),
+ Box(Box(3162, 3162), Box(3162, 3162)),
+ Box(Box(3163, 3163), Box(3163, 3163)),
+ Box(Box(3164, 3164), Box(3164, 3164)),
+ Box(Box(3165, 3165), Box(3165, 3165)),
+ Box(Box(3166, 3166), Box(3166, 3166)),
+ Box(Box(3167, 3167), Box(3167, 3167)),
+ Box(Box(3168, 3168), Box(3168, 3168)),
+ Box(Box(3169, 3169), Box(3169, 3169)),
+ Box(Box(3170, 3170), Box(3170, 3170)),
+ Box(Box(3171, 3171), Box(3171, 3171)),
+ Box(Box(3172, 3172), Box(3172, 3172)),
+ Box(Box(3173, 3173), Box(3173, 3173)),
+ Box(Box(3174, 3174), Box(3174, 3174)),
+ Box(Box(3175, 3175), Box(3175, 3175)),
+ Box(Box(3176, 3176), Box(3176, 3176)),
+ Box(Box(3177, 3177), Box(3177, 3177)),
+ Box(Box(3178, 3178), Box(3178, 3178)),
+ Box(Box(3179, 3179), Box(3179, 3179)),
+ Box(Box(3180, 3180), Box(3180, 3180)),
+ Box(Box(3181, 3181), Box(3181, 3181)),
+ Box(Box(3182, 3182), Box(3182, 3182)),
+ Box(Box(3183, 3183), Box(3183, 3183)),
+ Box(Box(3184, 3184), Box(3184, 3184)),
+ Box(Box(3185, 3185), Box(3185, 3185)),
+ Box(Box(3186, 3186), Box(3186, 3186)),
+ Box(Box(3187, 3187), Box(3187, 3187)),
+ Box(Box(3188, 3188), Box(3188, 3188)),
+ Box(Box(3189, 3189), Box(3189, 3189)),
+ Box(Box(3190, 3190), Box(3190, 3190)),
+ Box(Box(3191, 3191), Box(3191, 3191)),
+ Box(Box(3192, 3192), Box(3192, 3192)),
+ Box(Box(3193, 3193), Box(3193, 3193)),
+ Box(Box(3194, 3194), Box(3194, 3194)),
+ Box(Box(3195, 3195), Box(3195, 3195)),
+ Box(Box(3196, 3196), Box(3196, 3196)),
+ Box(Box(3197, 3197), Box(3197, 3197)),
+ Box(Box(3198, 3198), Box(3198, 3198)),
+ Box(Box(3199, 3199), Box(3199, 3199)),
+ Box(Box(3200, 3200), Box(3200, 3200)),
+ Box(Box(3201, 3201), Box(3201, 3201)),
+ Box(Box(3202, 3202), Box(3202, 3202)),
+ Box(Box(3203, 3203), Box(3203, 3203)),
+ Box(Box(3204, 3204), Box(3204, 3204)),
+ Box(Box(3205, 3205), Box(3205, 3205)),
+ Box(Box(3206, 3206), Box(3206, 3206)),
+ Box(Box(3207, 3207), Box(3207, 3207)),
+ Box(Box(3208, 3208), Box(3208, 3208)),
+ Box(Box(3209, 3209), Box(3209, 3209)),
+ Box(Box(3210, 3210), Box(3210, 3210)),
+ Box(Box(3211, 3211), Box(3211, 3211)),
+ Box(Box(3212, 3212), Box(3212, 3212)),
+ Box(Box(3213, 3213), Box(3213, 3213)),
+ Box(Box(3214, 3214), Box(3214, 3214)),
+ Box(Box(3215, 3215), Box(3215, 3215)),
+ Box(Box(3216, 3216), Box(3216, 3216)),
+ Box(Box(3217, 3217), Box(3217, 3217)),
+ Box(Box(3218, 3218), Box(3218, 3218)),
+ Box(Box(3219, 3219), Box(3219, 3219)),
+ Box(Box(3220, 3220), Box(3220, 3220)),
+ Box(Box(3221, 3221), Box(3221, 3221)),
+ Box(Box(3222, 3222), Box(3222, 3222)),
+ Box(Box(3223, 3223), Box(3223, 3223)),
+ Box(Box(3224, 3224), Box(3224, 3224)),
+ Box(Box(3225, 3225), Box(3225, 3225)),
+ Box(Box(3226, 3226), Box(3226, 3226)),
+ Box(Box(3227, 3227), Box(3227, 3227)),
+ Box(Box(3228, 3228), Box(3228, 3228)),
+ Box(Box(3229, 3229), Box(3229, 3229)),
+ Box(Box(3230, 3230), Box(3230, 3230)),
+ Box(Box(3231, 3231), Box(3231, 3231)),
+ Box(Box(3232, 3232), Box(3232, 3232)),
+ Box(Box(3233, 3233), Box(3233, 3233)),
+ Box(Box(3234, 3234), Box(3234, 3234)),
+ Box(Box(3235, 3235), Box(3235, 3235)),
+ Box(Box(3236, 3236), Box(3236, 3236)),
+ Box(Box(3237, 3237), Box(3237, 3237)),
+ Box(Box(3238, 3238), Box(3238, 3238)),
+ Box(Box(3239, 3239), Box(3239, 3239)),
+ Box(Box(3240, 3240), Box(3240, 3240)),
+ Box(Box(3241, 3241), Box(3241, 3241)),
+ Box(Box(3242, 3242), Box(3242, 3242)),
+ Box(Box(3243, 3243), Box(3243, 3243)),
+ Box(Box(3244, 3244), Box(3244, 3244)),
+ Box(Box(3245, 3245), Box(3245, 3245)),
+ Box(Box(3246, 3246), Box(3246, 3246)),
+ Box(Box(3247, 3247), Box(3247, 3247)),
+ Box(Box(3248, 3248), Box(3248, 3248)),
+ Box(Box(3249, 3249), Box(3249, 3249)),
+ Box(Box(3250, 3250), Box(3250, 3250)),
+ Box(Box(3251, 3251), Box(3251, 3251)),
+ Box(Box(3252, 3252), Box(3252, 3252)),
+ Box(Box(3253, 3253), Box(3253, 3253)),
+ Box(Box(3254, 3254), Box(3254, 3254)),
+ Box(Box(3255, 3255), Box(3255, 3255)),
+ Box(Box(3256, 3256), Box(3256, 3256)),
+ Box(Box(3257, 3257), Box(3257, 3257)),
+ Box(Box(3258, 3258), Box(3258, 3258)),
+ Box(Box(3259, 3259), Box(3259, 3259)),
+ Box(Box(3260, 3260), Box(3260, 3260)),
+ Box(Box(3261, 3261), Box(3261, 3261)),
+ Box(Box(3262, 3262), Box(3262, 3262)),
+ Box(Box(3263, 3263), Box(3263, 3263)),
+ Box(Box(3264, 3264), Box(3264, 3264)),
+ Box(Box(3265, 3265), Box(3265, 3265)),
+ Box(Box(3266, 3266), Box(3266, 3266)),
+ Box(Box(3267, 3267), Box(3267, 3267)),
+ Box(Box(3268, 3268), Box(3268, 3268)),
+ Box(Box(3269, 3269), Box(3269, 3269)),
+ Box(Box(3270, 3270), Box(3270, 3270)),
+ Box(Box(3271, 3271), Box(3271, 3271)),
+ Box(Box(3272, 3272), Box(3272, 3272)),
+ Box(Box(3273, 3273), Box(3273, 3273)),
+ Box(Box(3274, 3274), Box(3274, 3274)),
+ Box(Box(3275, 3275), Box(3275, 3275)),
+ Box(Box(3276, 3276), Box(3276, 3276)),
+ Box(Box(3277, 3277), Box(3277, 3277)),
+ Box(Box(3278, 3278), Box(3278, 3278)),
+ Box(Box(3279, 3279), Box(3279, 3279)),
+ Box(Box(3280, 3280), Box(3280, 3280)),
+ Box(Box(3281, 3281), Box(3281, 3281)),
+ Box(Box(3282, 3282), Box(3282, 3282)),
+ Box(Box(3283, 3283), Box(3283, 3283)),
+ Box(Box(3284, 3284), Box(3284, 3284)),
+ Box(Box(3285, 3285), Box(3285, 3285)),
+ Box(Box(3286, 3286), Box(3286, 3286)),
+ Box(Box(3287, 3287), Box(3287, 3287)),
+ Box(Box(3288, 3288), Box(3288, 3288)),
+ Box(Box(3289, 3289), Box(3289, 3289)),
+ Box(Box(3290, 3290), Box(3290, 3290)),
+ Box(Box(3291, 3291), Box(3291, 3291)),
+ Box(Box(3292, 3292), Box(3292, 3292)),
+ Box(Box(3293, 3293), Box(3293, 3293)),
+ Box(Box(3294, 3294), Box(3294, 3294)),
+ Box(Box(3295, 3295), Box(3295, 3295)),
+ Box(Box(3296, 3296), Box(3296, 3296)),
+ Box(Box(3297, 3297), Box(3297, 3297)),
+ Box(Box(3298, 3298), Box(3298, 3298)),
+ Box(Box(3299, 3299), Box(3299, 3299)),
+ Box(Box(3300, 3300), Box(3300, 3300)),
+ Box(Box(3301, 3301), Box(3301, 3301)),
+ Box(Box(3302, 3302), Box(3302, 3302)),
+ Box(Box(3303, 3303), Box(3303, 3303)),
+ Box(Box(3304, 3304), Box(3304, 3304)),
+ Box(Box(3305, 3305), Box(3305, 3305)),
+ Box(Box(3306, 3306), Box(3306, 3306)),
+ Box(Box(3307, 3307), Box(3307, 3307)),
+ Box(Box(3308, 3308), Box(3308, 3308)),
+ Box(Box(3309, 3309), Box(3309, 3309)),
+ Box(Box(3310, 3310), Box(3310, 3310)),
+ Box(Box(3311, 3311), Box(3311, 3311)),
+ Box(Box(3312, 3312), Box(3312, 3312)),
+ Box(Box(3313, 3313), Box(3313, 3313)),
+ Box(Box(3314, 3314), Box(3314, 3314)),
+ Box(Box(3315, 3315), Box(3315, 3315)),
+ Box(Box(3316, 3316), Box(3316, 3316)),
+ Box(Box(3317, 3317), Box(3317, 3317)),
+ Box(Box(3318, 3318), Box(3318, 3318)),
+ Box(Box(3319, 3319), Box(3319, 3319)),
+ Box(Box(3320, 3320), Box(3320, 3320)),
+ Box(Box(3321, 3321), Box(3321, 3321)),
+ Box(Box(3322, 3322), Box(3322, 3322)),
+ Box(Box(3323, 3323), Box(3323, 3323)),
+ Box(Box(3324, 3324), Box(3324, 3324)),
+ Box(Box(3325, 3325), Box(3325, 3325)),
+ Box(Box(3326, 3326), Box(3326, 3326)),
+ Box(Box(3327, 3327), Box(3327, 3327)),
+ Box(Box(3328, 3328), Box(3328, 3328)),
+ Box(Box(3329, 3329), Box(3329, 3329)),
+ Box(Box(3330, 3330), Box(3330, 3330)),
+ Box(Box(3331, 3331), Box(3331, 3331)),
+ Box(Box(3332, 3332), Box(3332, 3332)),
+ Box(Box(3333, 3333), Box(3333, 3333)),
+ Box(Box(3334, 3334), Box(3334, 3334)),
+ Box(Box(3335, 3335), Box(3335, 3335)),
+ Box(Box(3336, 3336), Box(3336, 3336)),
+ Box(Box(3337, 3337), Box(3337, 3337)),
+ Box(Box(3338, 3338), Box(3338, 3338)),
+ Box(Box(3339, 3339), Box(3339, 3339)),
+ Box(Box(3340, 3340), Box(3340, 3340)),
+ Box(Box(3341, 3341), Box(3341, 3341)),
+ Box(Box(3342, 3342), Box(3342, 3342)),
+ Box(Box(3343, 3343), Box(3343, 3343)),
+ Box(Box(3344, 3344), Box(3344, 3344)),
+ Box(Box(3345, 3345), Box(3345, 3345)),
+ Box(Box(3346, 3346), Box(3346, 3346)),
+ Box(Box(3347, 3347), Box(3347, 3347)),
+ Box(Box(3348, 3348), Box(3348, 3348)),
+ Box(Box(3349, 3349), Box(3349, 3349)),
+ Box(Box(3350, 3350), Box(3350, 3350)),
+ Box(Box(3351, 3351), Box(3351, 3351)),
+ Box(Box(3352, 3352), Box(3352, 3352)),
+ Box(Box(3353, 3353), Box(3353, 3353)),
+ Box(Box(3354, 3354), Box(3354, 3354)),
+ Box(Box(3355, 3355), Box(3355, 3355)),
+ Box(Box(3356, 3356), Box(3356, 3356)),
+ Box(Box(3357, 3357), Box(3357, 3357)),
+ Box(Box(3358, 3358), Box(3358, 3358)),
+ Box(Box(3359, 3359), Box(3359, 3359)),
+ Box(Box(3360, 3360), Box(3360, 3360)),
+ Box(Box(3361, 3361), Box(3361, 3361)),
+ Box(Box(3362, 3362), Box(3362, 3362)),
+ Box(Box(3363, 3363), Box(3363, 3363)),
+ Box(Box(3364, 3364), Box(3364, 3364)),
+ Box(Box(3365, 3365), Box(3365, 3365)),
+ Box(Box(3366, 3366), Box(3366, 3366)),
+ Box(Box(3367, 3367), Box(3367, 3367)),
+ Box(Box(3368, 3368), Box(3368, 3368)),
+ Box(Box(3369, 3369), Box(3369, 3369)),
+ Box(Box(3370, 3370), Box(3370, 3370)),
+ Box(Box(3371, 3371), Box(3371, 3371)),
+ Box(Box(3372, 3372), Box(3372, 3372)),
+ Box(Box(3373, 3373), Box(3373, 3373)),
+ Box(Box(3374, 3374), Box(3374, 3374)),
+ Box(Box(3375, 3375), Box(3375, 3375)),
+ Box(Box(3376, 3376), Box(3376, 3376)),
+ Box(Box(3377, 3377), Box(3377, 3377)),
+ Box(Box(3378, 3378), Box(3378, 3378)),
+ Box(Box(3379, 3379), Box(3379, 3379)),
+ Box(Box(3380, 3380), Box(3380, 3380)),
+ Box(Box(3381, 3381), Box(3381, 3381)),
+ Box(Box(3382, 3382), Box(3382, 3382)),
+ Box(Box(3383, 3383), Box(3383, 3383)),
+ Box(Box(3384, 3384), Box(3384, 3384)),
+ Box(Box(3385, 3385), Box(3385, 3385)),
+ Box(Box(3386, 3386), Box(3386, 3386)),
+ Box(Box(3387, 3387), Box(3387, 3387)),
+ Box(Box(3388, 3388), Box(3388, 3388)),
+ Box(Box(3389, 3389), Box(3389, 3389)),
+ Box(Box(3390, 3390), Box(3390, 3390)),
+ Box(Box(3391, 3391), Box(3391, 3391)),
+ Box(Box(3392, 3392), Box(3392, 3392)),
+ Box(Box(3393, 3393), Box(3393, 3393)),
+ Box(Box(3394, 3394), Box(3394, 3394)),
+ Box(Box(3395, 3395), Box(3395, 3395)),
+ Box(Box(3396, 3396), Box(3396, 3396)),
+ Box(Box(3397, 3397), Box(3397, 3397)),
+ Box(Box(3398, 3398), Box(3398, 3398)),
+ Box(Box(3399, 3399), Box(3399, 3399)),
+ Box(Box(3400, 3400), Box(3400, 3400)),
+ Box(Box(3401, 3401), Box(3401, 3401)),
+ Box(Box(3402, 3402), Box(3402, 3402)),
+ Box(Box(3403, 3403), Box(3403, 3403)),
+ Box(Box(3404, 3404), Box(3404, 3404)),
+ Box(Box(3405, 3405), Box(3405, 3405)),
+ Box(Box(3406, 3406), Box(3406, 3406)),
+ Box(Box(3407, 3407), Box(3407, 3407)),
+ Box(Box(3408, 3408), Box(3408, 3408)),
+ Box(Box(3409, 3409), Box(3409, 3409)),
+ Box(Box(3410, 3410), Box(3410, 3410)),
+ Box(Box(3411, 3411), Box(3411, 3411)),
+ Box(Box(3412, 3412), Box(3412, 3412)),
+ Box(Box(3413, 3413), Box(3413, 3413)),
+ Box(Box(3414, 3414), Box(3414, 3414)),
+ Box(Box(3415, 3415), Box(3415, 3415)),
+ Box(Box(3416, 3416), Box(3416, 3416)),
+ Box(Box(3417, 3417), Box(3417, 3417)),
+ Box(Box(3418, 3418), Box(3418, 3418)),
+ Box(Box(3419, 3419), Box(3419, 3419)),
+ Box(Box(3420, 3420), Box(3420, 3420)),
+ Box(Box(3421, 3421), Box(3421, 3421)),
+ Box(Box(3422, 3422), Box(3422, 3422)),
+ Box(Box(3423, 3423), Box(3423, 3423)),
+ Box(Box(3424, 3424), Box(3424, 3424)),
+ Box(Box(3425, 3425), Box(3425, 3425)),
+ Box(Box(3426, 3426), Box(3426, 3426)),
+ Box(Box(3427, 3427), Box(3427, 3427)),
+ Box(Box(3428, 3428), Box(3428, 3428)),
+ Box(Box(3429, 3429), Box(3429, 3429)),
+ Box(Box(3430, 3430), Box(3430, 3430)),
+ Box(Box(3431, 3431), Box(3431, 3431)),
+ Box(Box(3432, 3432), Box(3432, 3432)),
+ Box(Box(3433, 3433), Box(3433, 3433)),
+ Box(Box(3434, 3434), Box(3434, 3434)),
+ Box(Box(3435, 3435), Box(3435, 3435)),
+ Box(Box(3436, 3436), Box(3436, 3436)),
+ Box(Box(3437, 3437), Box(3437, 3437)),
+ Box(Box(3438, 3438), Box(3438, 3438)),
+ Box(Box(3439, 3439), Box(3439, 3439)),
+ Box(Box(3440, 3440), Box(3440, 3440)),
+ Box(Box(3441, 3441), Box(3441, 3441)),
+ Box(Box(3442, 3442), Box(3442, 3442)),
+ Box(Box(3443, 3443), Box(3443, 3443)),
+ Box(Box(3444, 3444), Box(3444, 3444)),
+ Box(Box(3445, 3445), Box(3445, 3445)),
+ Box(Box(3446, 3446), Box(3446, 3446)),
+ Box(Box(3447, 3447), Box(3447, 3447)),
+ Box(Box(3448, 3448), Box(3448, 3448)),
+ Box(Box(3449, 3449), Box(3449, 3449)),
+ Box(Box(3450, 3450), Box(3450, 3450)),
+ Box(Box(3451, 3451), Box(3451, 3451)),
+ Box(Box(3452, 3452), Box(3452, 3452)),
+ Box(Box(3453, 3453), Box(3453, 3453)),
+ Box(Box(3454, 3454), Box(3454, 3454)),
+ Box(Box(3455, 3455), Box(3455, 3455)),
+ Box(Box(3456, 3456), Box(3456, 3456)),
+ Box(Box(3457, 3457), Box(3457, 3457)),
+ Box(Box(3458, 3458), Box(3458, 3458)),
+ Box(Box(3459, 3459), Box(3459, 3459)),
+ Box(Box(3460, 3460), Box(3460, 3460)),
+ Box(Box(3461, 3461), Box(3461, 3461)),
+ Box(Box(3462, 3462), Box(3462, 3462)),
+ Box(Box(3463, 3463), Box(3463, 3463)),
+ Box(Box(3464, 3464), Box(3464, 3464)),
+ Box(Box(3465, 3465), Box(3465, 3465)),
+ Box(Box(3466, 3466), Box(3466, 3466)),
+ Box(Box(3467, 3467), Box(3467, 3467)),
+ Box(Box(3468, 3468), Box(3468, 3468)),
+ Box(Box(3469, 3469), Box(3469, 3469)),
+ Box(Box(3470, 3470), Box(3470, 3470)),
+ Box(Box(3471, 3471), Box(3471, 3471)),
+ Box(Box(3472, 3472), Box(3472, 3472)),
+ Box(Box(3473, 3473), Box(3473, 3473)),
+ Box(Box(3474, 3474), Box(3474, 3474)),
+ Box(Box(3475, 3475), Box(3475, 3475)),
+ Box(Box(3476, 3476), Box(3476, 3476)),
+ Box(Box(3477, 3477), Box(3477, 3477)),
+ Box(Box(3478, 3478), Box(3478, 3478)),
+ Box(Box(3479, 3479), Box(3479, 3479)),
+ Box(Box(3480, 3480), Box(3480, 3480)),
+ Box(Box(3481, 3481), Box(3481, 3481)),
+ Box(Box(3482, 3482), Box(3482, 3482)),
+ Box(Box(3483, 3483), Box(3483, 3483)),
+ Box(Box(3484, 3484), Box(3484, 3484)),
+ Box(Box(3485, 3485), Box(3485, 3485)),
+ Box(Box(3486, 3486), Box(3486, 3486)),
+ Box(Box(3487, 3487), Box(3487, 3487)),
+ Box(Box(3488, 3488), Box(3488, 3488)),
+ Box(Box(3489, 3489), Box(3489, 3489)),
+ Box(Box(3490, 3490), Box(3490, 3490)),
+ Box(Box(3491, 3491), Box(3491, 3491)),
+ Box(Box(3492, 3492), Box(3492, 3492)),
+ Box(Box(3493, 3493), Box(3493, 3493)),
+ Box(Box(3494, 3494), Box(3494, 3494)),
+ Box(Box(3495, 3495), Box(3495, 3495)),
+ Box(Box(3496, 3496), Box(3496, 3496)),
+ Box(Box(3497, 3497), Box(3497, 3497)),
+ Box(Box(3498, 3498), Box(3498, 3498)),
+ Box(Box(3499, 3499), Box(3499, 3499)),
+ Box(Box(3500, 3500), Box(3500, 3500)),
+ Box(Box(3501, 3501), Box(3501, 3501)),
+ Box(Box(3502, 3502), Box(3502, 3502)),
+ Box(Box(3503, 3503), Box(3503, 3503)),
+ Box(Box(3504, 3504), Box(3504, 3504)),
+ Box(Box(3505, 3505), Box(3505, 3505)),
+ Box(Box(3506, 3506), Box(3506, 3506)),
+ Box(Box(3507, 3507), Box(3507, 3507)),
+ Box(Box(3508, 3508), Box(3508, 3508)),
+ Box(Box(3509, 3509), Box(3509, 3509)),
+ Box(Box(3510, 3510), Box(3510, 3510)),
+ Box(Box(3511, 3511), Box(3511, 3511)),
+ Box(Box(3512, 3512), Box(3512, 3512)),
+ Box(Box(3513, 3513), Box(3513, 3513)),
+ Box(Box(3514, 3514), Box(3514, 3514)),
+ Box(Box(3515, 3515), Box(3515, 3515)),
+ Box(Box(3516, 3516), Box(3516, 3516)),
+ Box(Box(3517, 3517), Box(3517, 3517)),
+ Box(Box(3518, 3518), Box(3518, 3518)),
+ Box(Box(3519, 3519), Box(3519, 3519)),
+ Box(Box(3520, 3520), Box(3520, 3520)),
+ Box(Box(3521, 3521), Box(3521, 3521)),
+ Box(Box(3522, 3522), Box(3522, 3522)),
+ Box(Box(3523, 3523), Box(3523, 3523)),
+ Box(Box(3524, 3524), Box(3524, 3524)),
+ Box(Box(3525, 3525), Box(3525, 3525)),
+ Box(Box(3526, 3526), Box(3526, 3526)),
+ Box(Box(3527, 3527), Box(3527, 3527)),
+ Box(Box(3528, 3528), Box(3528, 3528)),
+ Box(Box(3529, 3529), Box(3529, 3529)),
+ Box(Box(3530, 3530), Box(3530, 3530)),
+ Box(Box(3531, 3531), Box(3531, 3531)),
+ Box(Box(3532, 3532), Box(3532, 3532)),
+ Box(Box(3533, 3533), Box(3533, 3533)),
+ Box(Box(3534, 3534), Box(3534, 3534)),
+ Box(Box(3535, 3535), Box(3535, 3535)),
+ Box(Box(3536, 3536), Box(3536, 3536)),
+ Box(Box(3537, 3537), Box(3537, 3537)),
+ Box(Box(3538, 3538), Box(3538, 3538)),
+ Box(Box(3539, 3539), Box(3539, 3539)),
+ Box(Box(3540, 3540), Box(3540, 3540)),
+ Box(Box(3541, 3541), Box(3541, 3541)),
+ Box(Box(3542, 3542), Box(3542, 3542)),
+ Box(Box(3543, 3543), Box(3543, 3543)),
+ Box(Box(3544, 3544), Box(3544, 3544)),
+ Box(Box(3545, 3545), Box(3545, 3545)),
+ Box(Box(3546, 3546), Box(3546, 3546)),
+ Box(Box(3547, 3547), Box(3547, 3547)),
+ Box(Box(3548, 3548), Box(3548, 3548)),
+ Box(Box(3549, 3549), Box(3549, 3549)),
+ Box(Box(3550, 3550), Box(3550, 3550)),
+ Box(Box(3551, 3551), Box(3551, 3551)),
+ Box(Box(3552, 3552), Box(3552, 3552)),
+ Box(Box(3553, 3553), Box(3553, 3553)),
+ Box(Box(3554, 3554), Box(3554, 3554)),
+ Box(Box(3555, 3555), Box(3555, 3555)),
+ Box(Box(3556, 3556), Box(3556, 3556)),
+ Box(Box(3557, 3557), Box(3557, 3557)),
+ Box(Box(3558, 3558), Box(3558, 3558)),
+ Box(Box(3559, 3559), Box(3559, 3559)),
+ Box(Box(3560, 3560), Box(3560, 3560)),
+ Box(Box(3561, 3561), Box(3561, 3561)),
+ Box(Box(3562, 3562), Box(3562, 3562)),
+ Box(Box(3563, 3563), Box(3563, 3563)),
+ Box(Box(3564, 3564), Box(3564, 3564)),
+ Box(Box(3565, 3565), Box(3565, 3565)),
+ Box(Box(3566, 3566), Box(3566, 3566)),
+ Box(Box(3567, 3567), Box(3567, 3567)),
+ Box(Box(3568, 3568), Box(3568, 3568)),
+ Box(Box(3569, 3569), Box(3569, 3569)),
+ Box(Box(3570, 3570), Box(3570, 3570)),
+ Box(Box(3571, 3571), Box(3571, 3571)),
+ Box(Box(3572, 3572), Box(3572, 3572)),
+ Box(Box(3573, 3573), Box(3573, 3573)),
+ Box(Box(3574, 3574), Box(3574, 3574)),
+ Box(Box(3575, 3575), Box(3575, 3575)),
+ Box(Box(3576, 3576), Box(3576, 3576)),
+ Box(Box(3577, 3577), Box(3577, 3577)),
+ Box(Box(3578, 3578), Box(3578, 3578)),
+ Box(Box(3579, 3579), Box(3579, 3579)),
+ Box(Box(3580, 3580), Box(3580, 3580)),
+ Box(Box(3581, 3581), Box(3581, 3581)),
+ Box(Box(3582, 3582), Box(3582, 3582)),
+ Box(Box(3583, 3583), Box(3583, 3583)),
+ Box(Box(3584, 3584), Box(3584, 3584)),
+ Box(Box(3585, 3585), Box(3585, 3585)),
+ Box(Box(3586, 3586), Box(3586, 3586)),
+ Box(Box(3587, 3587), Box(3587, 3587)),
+ Box(Box(3588, 3588), Box(3588, 3588)),
+ Box(Box(3589, 3589), Box(3589, 3589)),
+ Box(Box(3590, 3590), Box(3590, 3590)),
+ Box(Box(3591, 3591), Box(3591, 3591)),
+ Box(Box(3592, 3592), Box(3592, 3592)),
+ Box(Box(3593, 3593), Box(3593, 3593)),
+ Box(Box(3594, 3594), Box(3594, 3594)),
+ Box(Box(3595, 3595), Box(3595, 3595)),
+ Box(Box(3596, 3596), Box(3596, 3596)),
+ Box(Box(3597, 3597), Box(3597, 3597)),
+ Box(Box(3598, 3598), Box(3598, 3598)),
+ Box(Box(3599, 3599), Box(3599, 3599)),
+ Box(Box(3600, 3600), Box(3600, 3600)),
+ Box(Box(3601, 3601), Box(3601, 3601)),
+ Box(Box(3602, 3602), Box(3602, 3602)),
+ Box(Box(3603, 3603), Box(3603, 3603)),
+ Box(Box(3604, 3604), Box(3604, 3604)),
+ Box(Box(3605, 3605), Box(3605, 3605)),
+ Box(Box(3606, 3606), Box(3606, 3606)),
+ Box(Box(3607, 3607), Box(3607, 3607)),
+ Box(Box(3608, 3608), Box(3608, 3608)),
+ Box(Box(3609, 3609), Box(3609, 3609)),
+ Box(Box(3610, 3610), Box(3610, 3610)),
+ Box(Box(3611, 3611), Box(3611, 3611)),
+ Box(Box(3612, 3612), Box(3612, 3612)),
+ Box(Box(3613, 3613), Box(3613, 3613)),
+ Box(Box(3614, 3614), Box(3614, 3614)),
+ Box(Box(3615, 3615), Box(3615, 3615)),
+ Box(Box(3616, 3616), Box(3616, 3616)),
+ Box(Box(3617, 3617), Box(3617, 3617)),
+ Box(Box(3618, 3618), Box(3618, 3618)),
+ Box(Box(3619, 3619), Box(3619, 3619)),
+ Box(Box(3620, 3620), Box(3620, 3620)),
+ Box(Box(3621, 3621), Box(3621, 3621)),
+ Box(Box(3622, 3622), Box(3622, 3622)),
+ Box(Box(3623, 3623), Box(3623, 3623)),
+ Box(Box(3624, 3624), Box(3624, 3624)),
+ Box(Box(3625, 3625), Box(3625, 3625)),
+ Box(Box(3626, 3626), Box(3626, 3626)),
+ Box(Box(3627, 3627), Box(3627, 3627)),
+ Box(Box(3628, 3628), Box(3628, 3628)),
+ Box(Box(3629, 3629), Box(3629, 3629)),
+ Box(Box(3630, 3630), Box(3630, 3630)),
+ Box(Box(3631, 3631), Box(3631, 3631)),
+ Box(Box(3632, 3632), Box(3632, 3632)),
+ Box(Box(3633, 3633), Box(3633, 3633)),
+ Box(Box(3634, 3634), Box(3634, 3634)),
+ Box(Box(3635, 3635), Box(3635, 3635)),
+ Box(Box(3636, 3636), Box(3636, 3636)),
+ Box(Box(3637, 3637), Box(3637, 3637)),
+ Box(Box(3638, 3638), Box(3638, 3638)),
+ Box(Box(3639, 3639), Box(3639, 3639)),
+ Box(Box(3640, 3640), Box(3640, 3640)),
+ Box(Box(3641, 3641), Box(3641, 3641)),
+ Box(Box(3642, 3642), Box(3642, 3642)),
+ Box(Box(3643, 3643), Box(3643, 3643)),
+ Box(Box(3644, 3644), Box(3644, 3644)),
+ Box(Box(3645, 3645), Box(3645, 3645)),
+ Box(Box(3646, 3646), Box(3646, 3646)),
+ Box(Box(3647, 3647), Box(3647, 3647)),
+ Box(Box(3648, 3648), Box(3648, 3648)),
+ Box(Box(3649, 3649), Box(3649, 3649)),
+ Box(Box(3650, 3650), Box(3650, 3650)),
+ Box(Box(3651, 3651), Box(3651, 3651)),
+ Box(Box(3652, 3652), Box(3652, 3652)),
+ Box(Box(3653, 3653), Box(3653, 3653)),
+ Box(Box(3654, 3654), Box(3654, 3654)),
+ Box(Box(3655, 3655), Box(3655, 3655)),
+ Box(Box(3656, 3656), Box(3656, 3656)),
+ Box(Box(3657, 3657), Box(3657, 3657)),
+ Box(Box(3658, 3658), Box(3658, 3658)),
+ Box(Box(3659, 3659), Box(3659, 3659)),
+ Box(Box(3660, 3660), Box(3660, 3660)),
+ Box(Box(3661, 3661), Box(3661, 3661)),
+ Box(Box(3662, 3662), Box(3662, 3662)),
+ Box(Box(3663, 3663), Box(3663, 3663)),
+ Box(Box(3664, 3664), Box(3664, 3664)),
+ Box(Box(3665, 3665), Box(3665, 3665)),
+ Box(Box(3666, 3666), Box(3666, 3666)),
+ Box(Box(3667, 3667), Box(3667, 3667)),
+ Box(Box(3668, 3668), Box(3668, 3668)),
+ Box(Box(3669, 3669), Box(3669, 3669)),
+ Box(Box(3670, 3670), Box(3670, 3670)),
+ Box(Box(3671, 3671), Box(3671, 3671)),
+ Box(Box(3672, 3672), Box(3672, 3672)),
+ Box(Box(3673, 3673), Box(3673, 3673)),
+ Box(Box(3674, 3674), Box(3674, 3674)),
+ Box(Box(3675, 3675), Box(3675, 3675)),
+ Box(Box(3676, 3676), Box(3676, 3676)),
+ Box(Box(3677, 3677), Box(3677, 3677)),
+ Box(Box(3678, 3678), Box(3678, 3678)),
+ Box(Box(3679, 3679), Box(3679, 3679)),
+ Box(Box(3680, 3680), Box(3680, 3680)),
+ Box(Box(3681, 3681), Box(3681, 3681)),
+ Box(Box(3682, 3682), Box(3682, 3682)),
+ Box(Box(3683, 3683), Box(3683, 3683)),
+ Box(Box(3684, 3684), Box(3684, 3684)),
+ Box(Box(3685, 3685), Box(3685, 3685)),
+ Box(Box(3686, 3686), Box(3686, 3686)),
+ Box(Box(3687, 3687), Box(3687, 3687)),
+ Box(Box(3688, 3688), Box(3688, 3688)),
+ Box(Box(3689, 3689), Box(3689, 3689)),
+ Box(Box(3690, 3690), Box(3690, 3690)),
+ Box(Box(3691, 3691), Box(3691, 3691)),
+ Box(Box(3692, 3692), Box(3692, 3692)),
+ Box(Box(3693, 3693), Box(3693, 3693)),
+ Box(Box(3694, 3694), Box(3694, 3694)),
+ Box(Box(3695, 3695), Box(3695, 3695)),
+ Box(Box(3696, 3696), Box(3696, 3696)),
+ Box(Box(3697, 3697), Box(3697, 3697)),
+ Box(Box(3698, 3698), Box(3698, 3698)),
+ Box(Box(3699, 3699), Box(3699, 3699)),
+ Box(Box(3700, 3700), Box(3700, 3700)),
+ Box(Box(3701, 3701), Box(3701, 3701)),
+ Box(Box(3702, 3702), Box(3702, 3702)),
+ Box(Box(3703, 3703), Box(3703, 3703)),
+ Box(Box(3704, 3704), Box(3704, 3704)),
+ Box(Box(3705, 3705), Box(3705, 3705)),
+ Box(Box(3706, 3706), Box(3706, 3706)),
+ Box(Box(3707, 3707), Box(3707, 3707)),
+ Box(Box(3708, 3708), Box(3708, 3708)),
+ Box(Box(3709, 3709), Box(3709, 3709)),
+ Box(Box(3710, 3710), Box(3710, 3710)),
+ Box(Box(3711, 3711), Box(3711, 3711)),
+ Box(Box(3712, 3712), Box(3712, 3712)),
+ Box(Box(3713, 3713), Box(3713, 3713)),
+ Box(Box(3714, 3714), Box(3714, 3714)),
+ Box(Box(3715, 3715), Box(3715, 3715)),
+ Box(Box(3716, 3716), Box(3716, 3716)),
+ Box(Box(3717, 3717), Box(3717, 3717)),
+ Box(Box(3718, 3718), Box(3718, 3718)),
+ Box(Box(3719, 3719), Box(3719, 3719)),
+ Box(Box(3720, 3720), Box(3720, 3720)),
+ Box(Box(3721, 3721), Box(3721, 3721)),
+ Box(Box(3722, 3722), Box(3722, 3722)),
+ Box(Box(3723, 3723), Box(3723, 3723)),
+ Box(Box(3724, 3724), Box(3724, 3724)),
+ Box(Box(3725, 3725), Box(3725, 3725)),
+ Box(Box(3726, 3726), Box(3726, 3726)),
+ Box(Box(3727, 3727), Box(3727, 3727)),
+ Box(Box(3728, 3728), Box(3728, 3728)),
+ Box(Box(3729, 3729), Box(3729, 3729)),
+ Box(Box(3730, 3730), Box(3730, 3730)),
+ Box(Box(3731, 3731), Box(3731, 3731)),
+ Box(Box(3732, 3732), Box(3732, 3732)),
+ Box(Box(3733, 3733), Box(3733, 3733)),
+ Box(Box(3734, 3734), Box(3734, 3734)),
+ Box(Box(3735, 3735), Box(3735, 3735)),
+ Box(Box(3736, 3736), Box(3736, 3736)),
+ Box(Box(3737, 3737), Box(3737, 3737)),
+ Box(Box(3738, 3738), Box(3738, 3738)),
+ Box(Box(3739, 3739), Box(3739, 3739)),
+ Box(Box(3740, 3740), Box(3740, 3740)),
+ Box(Box(3741, 3741), Box(3741, 3741)),
+ Box(Box(3742, 3742), Box(3742, 3742)),
+ Box(Box(3743, 3743), Box(3743, 3743)),
+ Box(Box(3744, 3744), Box(3744, 3744)),
+ Box(Box(3745, 3745), Box(3745, 3745)),
+ Box(Box(3746, 3746), Box(3746, 3746)),
+ Box(Box(3747, 3747), Box(3747, 3747)),
+ Box(Box(3748, 3748), Box(3748, 3748)),
+ Box(Box(3749, 3749), Box(3749, 3749)),
+ Box(Box(3750, 3750), Box(3750, 3750)),
+ Box(Box(3751, 3751), Box(3751, 3751)),
+ Box(Box(3752, 3752), Box(3752, 3752)),
+ Box(Box(3753, 3753), Box(3753, 3753)),
+ Box(Box(3754, 3754), Box(3754, 3754)),
+ Box(Box(3755, 3755), Box(3755, 3755)),
+ Box(Box(3756, 3756), Box(3756, 3756)),
+ Box(Box(3757, 3757), Box(3757, 3757)),
+ Box(Box(3758, 3758), Box(3758, 3758)),
+ Box(Box(3759, 3759), Box(3759, 3759)),
+ Box(Box(3760, 3760), Box(3760, 3760)),
+ Box(Box(3761, 3761), Box(3761, 3761)),
+ Box(Box(3762, 3762), Box(3762, 3762)),
+ Box(Box(3763, 3763), Box(3763, 3763)),
+ Box(Box(3764, 3764), Box(3764, 3764)),
+ Box(Box(3765, 3765), Box(3765, 3765)),
+ Box(Box(3766, 3766), Box(3766, 3766)),
+ Box(Box(3767, 3767), Box(3767, 3767)),
+ Box(Box(3768, 3768), Box(3768, 3768)),
+ Box(Box(3769, 3769), Box(3769, 3769)),
+ Box(Box(3770, 3770), Box(3770, 3770)),
+ Box(Box(3771, 3771), Box(3771, 3771)),
+ Box(Box(3772, 3772), Box(3772, 3772)),
+ Box(Box(3773, 3773), Box(3773, 3773)),
+ Box(Box(3774, 3774), Box(3774, 3774)),
+ Box(Box(3775, 3775), Box(3775, 3775)),
+ Box(Box(3776, 3776), Box(3776, 3776)),
+ Box(Box(3777, 3777), Box(3777, 3777)),
+ Box(Box(3778, 3778), Box(3778, 3778)),
+ Box(Box(3779, 3779), Box(3779, 3779)),
+ Box(Box(3780, 3780), Box(3780, 3780)),
+ Box(Box(3781, 3781), Box(3781, 3781)),
+ Box(Box(3782, 3782), Box(3782, 3782)),
+ Box(Box(3783, 3783), Box(3783, 3783)),
+ Box(Box(3784, 3784), Box(3784, 3784)),
+ Box(Box(3785, 3785), Box(3785, 3785)),
+ Box(Box(3786, 3786), Box(3786, 3786)),
+ Box(Box(3787, 3787), Box(3787, 3787)),
+ Box(Box(3788, 3788), Box(3788, 3788)),
+ Box(Box(3789, 3789), Box(3789, 3789)),
+ Box(Box(3790, 3790), Box(3790, 3790)),
+ Box(Box(3791, 3791), Box(3791, 3791)),
+ Box(Box(3792, 3792), Box(3792, 3792)),
+ Box(Box(3793, 3793), Box(3793, 3793)),
+ Box(Box(3794, 3794), Box(3794, 3794)),
+ Box(Box(3795, 3795), Box(3795, 3795)),
+ Box(Box(3796, 3796), Box(3796, 3796)),
+ Box(Box(3797, 3797), Box(3797, 3797)),
+ Box(Box(3798, 3798), Box(3798, 3798)),
+ Box(Box(3799, 3799), Box(3799, 3799)),
+ Box(Box(3800, 3800), Box(3800, 3800)),
+ Box(Box(3801, 3801), Box(3801, 3801)),
+ Box(Box(3802, 3802), Box(3802, 3802)),
+ Box(Box(3803, 3803), Box(3803, 3803)),
+ Box(Box(3804, 3804), Box(3804, 3804)),
+ Box(Box(3805, 3805), Box(3805, 3805)),
+ Box(Box(3806, 3806), Box(3806, 3806)),
+ Box(Box(3807, 3807), Box(3807, 3807)),
+ Box(Box(3808, 3808), Box(3808, 3808)),
+ Box(Box(3809, 3809), Box(3809, 3809)),
+ Box(Box(3810, 3810), Box(3810, 3810)),
+ Box(Box(3811, 3811), Box(3811, 3811)),
+ Box(Box(3812, 3812), Box(3812, 3812)),
+ Box(Box(3813, 3813), Box(3813, 3813)),
+ Box(Box(3814, 3814), Box(3814, 3814)),
+ Box(Box(3815, 3815), Box(3815, 3815)),
+ Box(Box(3816, 3816), Box(3816, 3816)),
+ Box(Box(3817, 3817), Box(3817, 3817)),
+ Box(Box(3818, 3818), Box(3818, 3818)),
+ Box(Box(3819, 3819), Box(3819, 3819)),
+ Box(Box(3820, 3820), Box(3820, 3820)),
+ Box(Box(3821, 3821), Box(3821, 3821)),
+ Box(Box(3822, 3822), Box(3822, 3822)),
+ Box(Box(3823, 3823), Box(3823, 3823)),
+ Box(Box(3824, 3824), Box(3824, 3824)),
+ Box(Box(3825, 3825), Box(3825, 3825)),
+ Box(Box(3826, 3826), Box(3826, 3826)),
+ Box(Box(3827, 3827), Box(3827, 3827)),
+ Box(Box(3828, 3828), Box(3828, 3828)),
+ Box(Box(3829, 3829), Box(3829, 3829)),
+ Box(Box(3830, 3830), Box(3830, 3830)),
+ Box(Box(3831, 3831), Box(3831, 3831)),
+ Box(Box(3832, 3832), Box(3832, 3832)),
+ Box(Box(3833, 3833), Box(3833, 3833)),
+ Box(Box(3834, 3834), Box(3834, 3834)),
+ Box(Box(3835, 3835), Box(3835, 3835)),
+ Box(Box(3836, 3836), Box(3836, 3836)),
+ Box(Box(3837, 3837), Box(3837, 3837)),
+ Box(Box(3838, 3838), Box(3838, 3838)),
+ Box(Box(3839, 3839), Box(3839, 3839)),
+ Box(Box(3840, 3840), Box(3840, 3840)),
+ Box(Box(3841, 3841), Box(3841, 3841)),
+ Box(Box(3842, 3842), Box(3842, 3842)),
+ Box(Box(3843, 3843), Box(3843, 3843)),
+ Box(Box(3844, 3844), Box(3844, 3844)),
+ Box(Box(3845, 3845), Box(3845, 3845)),
+ Box(Box(3846, 3846), Box(3846, 3846)),
+ Box(Box(3847, 3847), Box(3847, 3847)),
+ Box(Box(3848, 3848), Box(3848, 3848)),
+ Box(Box(3849, 3849), Box(3849, 3849)),
+ Box(Box(3850, 3850), Box(3850, 3850)),
+ Box(Box(3851, 3851), Box(3851, 3851)),
+ Box(Box(3852, 3852), Box(3852, 3852)),
+ Box(Box(3853, 3853), Box(3853, 3853)),
+ Box(Box(3854, 3854), Box(3854, 3854)),
+ Box(Box(3855, 3855), Box(3855, 3855)),
+ Box(Box(3856, 3856), Box(3856, 3856)),
+ Box(Box(3857, 3857), Box(3857, 3857)),
+ Box(Box(3858, 3858), Box(3858, 3858)),
+ Box(Box(3859, 3859), Box(3859, 3859)),
+ Box(Box(3860, 3860), Box(3860, 3860)),
+ Box(Box(3861, 3861), Box(3861, 3861)),
+ Box(Box(3862, 3862), Box(3862, 3862)),
+ Box(Box(3863, 3863), Box(3863, 3863)),
+ Box(Box(3864, 3864), Box(3864, 3864)),
+ Box(Box(3865, 3865), Box(3865, 3865)),
+ Box(Box(3866, 3866), Box(3866, 3866)),
+ Box(Box(3867, 3867), Box(3867, 3867)),
+ Box(Box(3868, 3868), Box(3868, 3868)),
+ Box(Box(3869, 3869), Box(3869, 3869)),
+ Box(Box(3870, 3870), Box(3870, 3870)),
+ Box(Box(3871, 3871), Box(3871, 3871)),
+ Box(Box(3872, 3872), Box(3872, 3872)),
+ Box(Box(3873, 3873), Box(3873, 3873)),
+ Box(Box(3874, 3874), Box(3874, 3874)),
+ Box(Box(3875, 3875), Box(3875, 3875)),
+ Box(Box(3876, 3876), Box(3876, 3876)),
+ Box(Box(3877, 3877), Box(3877, 3877)),
+ Box(Box(3878, 3878), Box(3878, 3878)),
+ Box(Box(3879, 3879), Box(3879, 3879)),
+ Box(Box(3880, 3880), Box(3880, 3880)),
+ Box(Box(3881, 3881), Box(3881, 3881)),
+ Box(Box(3882, 3882), Box(3882, 3882)),
+ Box(Box(3883, 3883), Box(3883, 3883)),
+ Box(Box(3884, 3884), Box(3884, 3884)),
+ Box(Box(3885, 3885), Box(3885, 3885)),
+ Box(Box(3886, 3886), Box(3886, 3886)),
+ Box(Box(3887, 3887), Box(3887, 3887)),
+ Box(Box(3888, 3888), Box(3888, 3888)),
+ Box(Box(3889, 3889), Box(3889, 3889)),
+ Box(Box(3890, 3890), Box(3890, 3890)),
+ Box(Box(3891, 3891), Box(3891, 3891)),
+ Box(Box(3892, 3892), Box(3892, 3892)),
+ Box(Box(3893, 3893), Box(3893, 3893)),
+ Box(Box(3894, 3894), Box(3894, 3894)),
+ Box(Box(3895, 3895), Box(3895, 3895)),
+ Box(Box(3896, 3896), Box(3896, 3896)),
+ Box(Box(3897, 3897), Box(3897, 3897)),
+ Box(Box(3898, 3898), Box(3898, 3898)),
+ Box(Box(3899, 3899), Box(3899, 3899)),
+ Box(Box(3900, 3900), Box(3900, 3900)),
+ Box(Box(3901, 3901), Box(3901, 3901)),
+ Box(Box(3902, 3902), Box(3902, 3902)),
+ Box(Box(3903, 3903), Box(3903, 3903)),
+ Box(Box(3904, 3904), Box(3904, 3904)),
+ Box(Box(3905, 3905), Box(3905, 3905)),
+ Box(Box(3906, 3906), Box(3906, 3906)),
+ Box(Box(3907, 3907), Box(3907, 3907)),
+ Box(Box(3908, 3908), Box(3908, 3908)),
+ Box(Box(3909, 3909), Box(3909, 3909)),
+ Box(Box(3910, 3910), Box(3910, 3910)),
+ Box(Box(3911, 3911), Box(3911, 3911)),
+ Box(Box(3912, 3912), Box(3912, 3912)),
+ Box(Box(3913, 3913), Box(3913, 3913)),
+ Box(Box(3914, 3914), Box(3914, 3914)),
+ Box(Box(3915, 3915), Box(3915, 3915)),
+ Box(Box(3916, 3916), Box(3916, 3916)),
+ Box(Box(3917, 3917), Box(3917, 3917)),
+ Box(Box(3918, 3918), Box(3918, 3918)),
+ Box(Box(3919, 3919), Box(3919, 3919)),
+ Box(Box(3920, 3920), Box(3920, 3920)),
+ Box(Box(3921, 3921), Box(3921, 3921)),
+ Box(Box(3922, 3922), Box(3922, 3922)),
+ Box(Box(3923, 3923), Box(3923, 3923)),
+ Box(Box(3924, 3924), Box(3924, 3924)),
+ Box(Box(3925, 3925), Box(3925, 3925)),
+ Box(Box(3926, 3926), Box(3926, 3926)),
+ Box(Box(3927, 3927), Box(3927, 3927)),
+ Box(Box(3928, 3928), Box(3928, 3928)),
+ Box(Box(3929, 3929), Box(3929, 3929)),
+ Box(Box(3930, 3930), Box(3930, 3930)),
+ Box(Box(3931, 3931), Box(3931, 3931)),
+ Box(Box(3932, 3932), Box(3932, 3932)),
+ Box(Box(3933, 3933), Box(3933, 3933)),
+ Box(Box(3934, 3934), Box(3934, 3934)),
+ Box(Box(3935, 3935), Box(3935, 3935)),
+ Box(Box(3936, 3936), Box(3936, 3936)),
+ Box(Box(3937, 3937), Box(3937, 3937)),
+ Box(Box(3938, 3938), Box(3938, 3938)),
+ Box(Box(3939, 3939), Box(3939, 3939)),
+ Box(Box(3940, 3940), Box(3940, 3940)),
+ Box(Box(3941, 3941), Box(3941, 3941)),
+ Box(Box(3942, 3942), Box(3942, 3942)),
+ Box(Box(3943, 3943), Box(3943, 3943)),
+ Box(Box(3944, 3944), Box(3944, 3944)),
+ Box(Box(3945, 3945), Box(3945, 3945)),
+ Box(Box(3946, 3946), Box(3946, 3946)),
+ Box(Box(3947, 3947), Box(3947, 3947)),
+ Box(Box(3948, 3948), Box(3948, 3948)),
+ Box(Box(3949, 3949), Box(3949, 3949)),
+ Box(Box(3950, 3950), Box(3950, 3950)),
+ Box(Box(3951, 3951), Box(3951, 3951)),
+ Box(Box(3952, 3952), Box(3952, 3952)),
+ Box(Box(3953, 3953), Box(3953, 3953)),
+ Box(Box(3954, 3954), Box(3954, 3954)),
+ Box(Box(3955, 3955), Box(3955, 3955)),
+ Box(Box(3956, 3956), Box(3956, 3956)),
+ Box(Box(3957, 3957), Box(3957, 3957)),
+ Box(Box(3958, 3958), Box(3958, 3958)),
+ Box(Box(3959, 3959), Box(3959, 3959)),
+ Box(Box(3960, 3960), Box(3960, 3960)),
+ Box(Box(3961, 3961), Box(3961, 3961)),
+ Box(Box(3962, 3962), Box(3962, 3962)),
+ Box(Box(3963, 3963), Box(3963, 3963)),
+ Box(Box(3964, 3964), Box(3964, 3964)),
+ Box(Box(3965, 3965), Box(3965, 3965)),
+ Box(Box(3966, 3966), Box(3966, 3966)),
+ Box(Box(3967, 3967), Box(3967, 3967)),
+ Box(Box(3968, 3968), Box(3968, 3968)),
+ Box(Box(3969, 3969), Box(3969, 3969)),
+ Box(Box(3970, 3970), Box(3970, 3970)),
+ Box(Box(3971, 3971), Box(3971, 3971)),
+ Box(Box(3972, 3972), Box(3972, 3972)),
+ Box(Box(3973, 3973), Box(3973, 3973)),
+ Box(Box(3974, 3974), Box(3974, 3974)),
+ Box(Box(3975, 3975), Box(3975, 3975)),
+ Box(Box(3976, 3976), Box(3976, 3976)),
+ Box(Box(3977, 3977), Box(3977, 3977)),
+ Box(Box(3978, 3978), Box(3978, 3978)),
+ Box(Box(3979, 3979), Box(3979, 3979)),
+ Box(Box(3980, 3980), Box(3980, 3980)),
+ Box(Box(3981, 3981), Box(3981, 3981)),
+ Box(Box(3982, 3982), Box(3982, 3982)),
+ Box(Box(3983, 3983), Box(3983, 3983)),
+ Box(Box(3984, 3984), Box(3984, 3984)),
+ Box(Box(3985, 3985), Box(3985, 3985)),
+ Box(Box(3986, 3986), Box(3986, 3986)),
+ Box(Box(3987, 3987), Box(3987, 3987)),
+ Box(Box(3988, 3988), Box(3988, 3988)),
+ Box(Box(3989, 3989), Box(3989, 3989)),
+ Box(Box(3990, 3990), Box(3990, 3990)),
+ Box(Box(3991, 3991), Box(3991, 3991)),
+ Box(Box(3992, 3992), Box(3992, 3992)),
+ Box(Box(3993, 3993), Box(3993, 3993)),
+ Box(Box(3994, 3994), Box(3994, 3994)),
+ Box(Box(3995, 3995), Box(3995, 3995)),
+ Box(Box(3996, 3996), Box(3996, 3996)),
+ Box(Box(3997, 3997), Box(3997, 3997)),
+ Box(Box(3998, 3998), Box(3998, 3998)),
+ Box(Box(3999, 3999), Box(3999, 3999)),
+ Box(Box(4000, 4000), Box(4000, 4000)),
+ Box(Box(4001, 4001), Box(4001, 4001)),
+ Box(Box(4002, 4002), Box(4002, 4002)),
+ Box(Box(4003, 4003), Box(4003, 4003)),
+ Box(Box(4004, 4004), Box(4004, 4004)),
+ Box(Box(4005, 4005), Box(4005, 4005)),
+ Box(Box(4006, 4006), Box(4006, 4006)),
+ Box(Box(4007, 4007), Box(4007, 4007)),
+ Box(Box(4008, 4008), Box(4008, 4008)),
+ Box(Box(4009, 4009), Box(4009, 4009)),
+ Box(Box(4010, 4010), Box(4010, 4010)),
+ Box(Box(4011, 4011), Box(4011, 4011)),
+ Box(Box(4012, 4012), Box(4012, 4012)),
+ Box(Box(4013, 4013), Box(4013, 4013)),
+ Box(Box(4014, 4014), Box(4014, 4014)),
+ Box(Box(4015, 4015), Box(4015, 4015)),
+ Box(Box(4016, 4016), Box(4016, 4016)),
+ Box(Box(4017, 4017), Box(4017, 4017)),
+ Box(Box(4018, 4018), Box(4018, 4018)),
+ Box(Box(4019, 4019), Box(4019, 4019)),
+ Box(Box(4020, 4020), Box(4020, 4020)),
+ Box(Box(4021, 4021), Box(4021, 4021)),
+ Box(Box(4022, 4022), Box(4022, 4022)),
+ Box(Box(4023, 4023), Box(4023, 4023)),
+ Box(Box(4024, 4024), Box(4024, 4024)),
+ Box(Box(4025, 4025), Box(4025, 4025)),
+ Box(Box(4026, 4026), Box(4026, 4026)),
+ Box(Box(4027, 4027), Box(4027, 4027)),
+ Box(Box(4028, 4028), Box(4028, 4028)),
+ Box(Box(4029, 4029), Box(4029, 4029)),
+ Box(Box(4030, 4030), Box(4030, 4030)),
+ Box(Box(4031, 4031), Box(4031, 4031)),
+ Box(Box(4032, 4032), Box(4032, 4032)),
+ Box(Box(4033, 4033), Box(4033, 4033)),
+ Box(Box(4034, 4034), Box(4034, 4034)),
+ Box(Box(4035, 4035), Box(4035, 4035)),
+ Box(Box(4036, 4036), Box(4036, 4036)),
+ Box(Box(4037, 4037), Box(4037, 4037)),
+ Box(Box(4038, 4038), Box(4038, 4038)),
+ Box(Box(4039, 4039), Box(4039, 4039)),
+ Box(Box(4040, 4040), Box(4040, 4040)),
+ Box(Box(4041, 4041), Box(4041, 4041)),
+ Box(Box(4042, 4042), Box(4042, 4042)),
+ Box(Box(4043, 4043), Box(4043, 4043)),
+ Box(Box(4044, 4044), Box(4044, 4044)),
+ Box(Box(4045, 4045), Box(4045, 4045)),
+ Box(Box(4046, 4046), Box(4046, 4046)),
+ Box(Box(4047, 4047), Box(4047, 4047)),
+ Box(Box(4048, 4048), Box(4048, 4048)),
+ Box(Box(4049, 4049), Box(4049, 4049)),
+ Box(Box(4050, 4050), Box(4050, 4050)),
+ Box(Box(4051, 4051), Box(4051, 4051)),
+ Box(Box(4052, 4052), Box(4052, 4052)),
+ Box(Box(4053, 4053), Box(4053, 4053)),
+ Box(Box(4054, 4054), Box(4054, 4054)),
+ Box(Box(4055, 4055), Box(4055, 4055)),
+ Box(Box(4056, 4056), Box(4056, 4056)),
+ Box(Box(4057, 4057), Box(4057, 4057)),
+ Box(Box(4058, 4058), Box(4058, 4058)),
+ Box(Box(4059, 4059), Box(4059, 4059)),
+ Box(Box(4060, 4060), Box(4060, 4060)),
+ Box(Box(4061, 4061), Box(4061, 4061)),
+ Box(Box(4062, 4062), Box(4062, 4062)),
+ Box(Box(4063, 4063), Box(4063, 4063)),
+ Box(Box(4064, 4064), Box(4064, 4064)),
+ Box(Box(4065, 4065), Box(4065, 4065)),
+ Box(Box(4066, 4066), Box(4066, 4066)),
+ Box(Box(4067, 4067), Box(4067, 4067)),
+ Box(Box(4068, 4068), Box(4068, 4068)),
+ Box(Box(4069, 4069), Box(4069, 4069)),
+ Box(Box(4070, 4070), Box(4070, 4070)),
+ Box(Box(4071, 4071), Box(4071, 4071)),
+ Box(Box(4072, 4072), Box(4072, 4072)),
+ Box(Box(4073, 4073), Box(4073, 4073)),
+ Box(Box(4074, 4074), Box(4074, 4074)),
+ Box(Box(4075, 4075), Box(4075, 4075)),
+ Box(Box(4076, 4076), Box(4076, 4076)),
+ Box(Box(4077, 4077), Box(4077, 4077)),
+ Box(Box(4078, 4078), Box(4078, 4078)),
+ Box(Box(4079, 4079), Box(4079, 4079)),
+ Box(Box(4080, 4080), Box(4080, 4080)),
+ Box(Box(4081, 4081), Box(4081, 4081)),
+ Box(Box(4082, 4082), Box(4082, 4082)),
+ Box(Box(4083, 4083), Box(4083, 4083)),
+ Box(Box(4084, 4084), Box(4084, 4084)),
+ Box(Box(4085, 4085), Box(4085, 4085)),
+ Box(Box(4086, 4086), Box(4086, 4086)),
+ Box(Box(4087, 4087), Box(4087, 4087)),
+ Box(Box(4088, 4088), Box(4088, 4088)),
+ Box(Box(4089, 4089), Box(4089, 4089)),
+ Box(Box(4090, 4090), Box(4090, 4090)),
+ Box(Box(4091, 4091), Box(4091, 4091)),
+ Box(Box(4092, 4092), Box(4092, 4092)),
+ Box(Box(4093, 4093), Box(4093, 4093)),
+ Box(Box(4094, 4094), Box(4094, 4094)),
+ Box(Box(4095, 4095), Box(4095, 4095)),
+ Box(Box(4096, 4096), Box(4096, 4096)),
+ Box(Box(4097, 4097), Box(4097, 4097)),
+ Box(Box(4098, 4098), Box(4098, 4098)),
+ Box(Box(4099, 4099), Box(4099, 4099)),
+ Box(Box(4100, 4100), Box(4100, 4100)),
+ Box(Box(4101, 4101), Box(4101, 4101)),
+ Box(Box(4102, 4102), Box(4102, 4102)),
+ Box(Box(4103, 4103), Box(4103, 4103)),
+ Box(Box(4104, 4104), Box(4104, 4104)),
+ Box(Box(4105, 4105), Box(4105, 4105)),
+ Box(Box(4106, 4106), Box(4106, 4106)),
+ Box(Box(4107, 4107), Box(4107, 4107)),
+ Box(Box(4108, 4108), Box(4108, 4108)),
+ Box(Box(4109, 4109), Box(4109, 4109)),
+ Box(Box(4110, 4110), Box(4110, 4110)),
+ Box(Box(4111, 4111), Box(4111, 4111)),
+ Box(Box(4112, 4112), Box(4112, 4112)),
+ Box(Box(4113, 4113), Box(4113, 4113)),
+ Box(Box(4114, 4114), Box(4114, 4114)),
+ Box(Box(4115, 4115), Box(4115, 4115)),
+ Box(Box(4116, 4116), Box(4116, 4116)),
+ Box(Box(4117, 4117), Box(4117, 4117)),
+ Box(Box(4118, 4118), Box(4118, 4118)),
+ Box(Box(4119, 4119), Box(4119, 4119)),
+ Box(Box(4120, 4120), Box(4120, 4120)),
+ Box(Box(4121, 4121), Box(4121, 4121)),
+ Box(Box(4122, 4122), Box(4122, 4122)),
+ Box(Box(4123, 4123), Box(4123, 4123)),
+ Box(Box(4124, 4124), Box(4124, 4124)),
+ Box(Box(4125, 4125), Box(4125, 4125)),
+ Box(Box(4126, 4126), Box(4126, 4126)),
+ Box(Box(4127, 4127), Box(4127, 4127)),
+ Box(Box(4128, 4128), Box(4128, 4128)),
+ Box(Box(4129, 4129), Box(4129, 4129)),
+ Box(Box(4130, 4130), Box(4130, 4130)),
+ Box(Box(4131, 4131), Box(4131, 4131)),
+ Box(Box(4132, 4132), Box(4132, 4132)),
+ Box(Box(4133, 4133), Box(4133, 4133)),
+ Box(Box(4134, 4134), Box(4134, 4134)),
+ Box(Box(4135, 4135), Box(4135, 4135)),
+ Box(Box(4136, 4136), Box(4136, 4136)),
+ Box(Box(4137, 4137), Box(4137, 4137)),
+ Box(Box(4138, 4138), Box(4138, 4138)),
+ Box(Box(4139, 4139), Box(4139, 4139)),
+ Box(Box(4140, 4140), Box(4140, 4140)),
+ Box(Box(4141, 4141), Box(4141, 4141)),
+ Box(Box(4142, 4142), Box(4142, 4142)),
+ Box(Box(4143, 4143), Box(4143, 4143)),
+ Box(Box(4144, 4144), Box(4144, 4144)),
+ Box(Box(4145, 4145), Box(4145, 4145)),
+ Box(Box(4146, 4146), Box(4146, 4146)),
+ Box(Box(4147, 4147), Box(4147, 4147)),
+ Box(Box(4148, 4148), Box(4148, 4148)),
+ Box(Box(4149, 4149), Box(4149, 4149)),
+ Box(Box(4150, 4150), Box(4150, 4150)),
+ Box(Box(4151, 4151), Box(4151, 4151)),
+ Box(Box(4152, 4152), Box(4152, 4152)),
+ Box(Box(4153, 4153), Box(4153, 4153)),
+ Box(Box(4154, 4154), Box(4154, 4154)),
+ Box(Box(4155, 4155), Box(4155, 4155)),
+ Box(Box(4156, 4156), Box(4156, 4156)),
+ Box(Box(4157, 4157), Box(4157, 4157)),
+ Box(Box(4158, 4158), Box(4158, 4158)),
+ Box(Box(4159, 4159), Box(4159, 4159)),
+ Box(Box(4160, 4160), Box(4160, 4160)),
+ Box(Box(4161, 4161), Box(4161, 4161)),
+ Box(Box(4162, 4162), Box(4162, 4162)),
+ Box(Box(4163, 4163), Box(4163, 4163)),
+ Box(Box(4164, 4164), Box(4164, 4164)),
+ Box(Box(4165, 4165), Box(4165, 4165)),
+ Box(Box(4166, 4166), Box(4166, 4166)),
+ Box(Box(4167, 4167), Box(4167, 4167)),
+ Box(Box(4168, 4168), Box(4168, 4168)),
+ Box(Box(4169, 4169), Box(4169, 4169)),
+ Box(Box(4170, 4170), Box(4170, 4170)),
+ Box(Box(4171, 4171), Box(4171, 4171)),
+ Box(Box(4172, 4172), Box(4172, 4172)),
+ Box(Box(4173, 4173), Box(4173, 4173)),
+ Box(Box(4174, 4174), Box(4174, 4174)),
+ Box(Box(4175, 4175), Box(4175, 4175)),
+ Box(Box(4176, 4176), Box(4176, 4176)),
+ Box(Box(4177, 4177), Box(4177, 4177)),
+ Box(Box(4178, 4178), Box(4178, 4178)),
+ Box(Box(4179, 4179), Box(4179, 4179)),
+ Box(Box(4180, 4180), Box(4180, 4180)),
+ Box(Box(4181, 4181), Box(4181, 4181)),
+ Box(Box(4182, 4182), Box(4182, 4182)),
+ Box(Box(4183, 4183), Box(4183, 4183)),
+ Box(Box(4184, 4184), Box(4184, 4184)),
+ Box(Box(4185, 4185), Box(4185, 4185)),
+ Box(Box(4186, 4186), Box(4186, 4186)),
+ Box(Box(4187, 4187), Box(4187, 4187)),
+ Box(Box(4188, 4188), Box(4188, 4188)),
+ Box(Box(4189, 4189), Box(4189, 4189)),
+ Box(Box(4190, 4190), Box(4190, 4190)),
+ Box(Box(4191, 4191), Box(4191, 4191)),
+ Box(Box(4192, 4192), Box(4192, 4192)),
+ Box(Box(4193, 4193), Box(4193, 4193)),
+ Box(Box(4194, 4194), Box(4194, 4194)),
+ Box(Box(4195, 4195), Box(4195, 4195)),
+ Box(Box(4196, 4196), Box(4196, 4196)),
+ Box(Box(4197, 4197), Box(4197, 4197)),
+ Box(Box(4198, 4198), Box(4198, 4198)),
+ Box(Box(4199, 4199), Box(4199, 4199)),
+ Box(Box(4200, 4200), Box(4200, 4200)),
+ Box(Box(4201, 4201), Box(4201, 4201)),
+ Box(Box(4202, 4202), Box(4202, 4202)),
+ Box(Box(4203, 4203), Box(4203, 4203)),
+ Box(Box(4204, 4204), Box(4204, 4204)),
+ Box(Box(4205, 4205), Box(4205, 4205)),
+ Box(Box(4206, 4206), Box(4206, 4206)),
+ Box(Box(4207, 4207), Box(4207, 4207)),
+ Box(Box(4208, 4208), Box(4208, 4208)),
+ Box(Box(4209, 4209), Box(4209, 4209)),
+ Box(Box(4210, 4210), Box(4210, 4210)),
+ Box(Box(4211, 4211), Box(4211, 4211)),
+ Box(Box(4212, 4212), Box(4212, 4212)),
+ Box(Box(4213, 4213), Box(4213, 4213)),
+ Box(Box(4214, 4214), Box(4214, 4214)),
+ Box(Box(4215, 4215), Box(4215, 4215)),
+ Box(Box(4216, 4216), Box(4216, 4216)),
+ Box(Box(4217, 4217), Box(4217, 4217)),
+ Box(Box(4218, 4218), Box(4218, 4218)),
+ Box(Box(4219, 4219), Box(4219, 4219)),
+ Box(Box(4220, 4220), Box(4220, 4220)),
+ Box(Box(4221, 4221), Box(4221, 4221)),
+ Box(Box(4222, 4222), Box(4222, 4222)),
+ Box(Box(4223, 4223), Box(4223, 4223)),
+ Box(Box(4224, 4224), Box(4224, 4224)),
+ Box(Box(4225, 4225), Box(4225, 4225)),
+ Box(Box(4226, 4226), Box(4226, 4226)),
+ Box(Box(4227, 4227), Box(4227, 4227)),
+ Box(Box(4228, 4228), Box(4228, 4228)),
+ Box(Box(4229, 4229), Box(4229, 4229)),
+ Box(Box(4230, 4230), Box(4230, 4230)),
+ Box(Box(4231, 4231), Box(4231, 4231)),
+ Box(Box(4232, 4232), Box(4232, 4232)),
+ Box(Box(4233, 4233), Box(4233, 4233)),
+ Box(Box(4234, 4234), Box(4234, 4234)),
+ Box(Box(4235, 4235), Box(4235, 4235)),
+ Box(Box(4236, 4236), Box(4236, 4236)),
+ Box(Box(4237, 4237), Box(4237, 4237)),
+ Box(Box(4238, 4238), Box(4238, 4238)),
+ Box(Box(4239, 4239), Box(4239, 4239)),
+ Box(Box(4240, 4240), Box(4240, 4240)),
+ Box(Box(4241, 4241), Box(4241, 4241)),
+ Box(Box(4242, 4242), Box(4242, 4242)),
+ Box(Box(4243, 4243), Box(4243, 4243)),
+ Box(Box(4244, 4244), Box(4244, 4244)),
+ Box(Box(4245, 4245), Box(4245, 4245)),
+ Box(Box(4246, 4246), Box(4246, 4246)),
+ Box(Box(4247, 4247), Box(4247, 4247)),
+ Box(Box(4248, 4248), Box(4248, 4248)),
+ Box(Box(4249, 4249), Box(4249, 4249)),
+ Box(Box(4250, 4250), Box(4250, 4250)),
+ Box(Box(4251, 4251), Box(4251, 4251)),
+ Box(Box(4252, 4252), Box(4252, 4252)),
+ Box(Box(4253, 4253), Box(4253, 4253)),
+ Box(Box(4254, 4254), Box(4254, 4254)),
+ Box(Box(4255, 4255), Box(4255, 4255)),
+ Box(Box(4256, 4256), Box(4256, 4256)),
+ Box(Box(4257, 4257), Box(4257, 4257)),
+ Box(Box(4258, 4258), Box(4258, 4258)),
+ Box(Box(4259, 4259), Box(4259, 4259)),
+ Box(Box(4260, 4260), Box(4260, 4260)),
+ Box(Box(4261, 4261), Box(4261, 4261)),
+ Box(Box(4262, 4262), Box(4262, 4262)),
+ Box(Box(4263, 4263), Box(4263, 4263)),
+ Box(Box(4264, 4264), Box(4264, 4264)),
+ Box(Box(4265, 4265), Box(4265, 4265)),
+ Box(Box(4266, 4266), Box(4266, 4266)),
+ Box(Box(4267, 4267), Box(4267, 4267)),
+ Box(Box(4268, 4268), Box(4268, 4268)),
+ Box(Box(4269, 4269), Box(4269, 4269)),
+ Box(Box(4270, 4270), Box(4270, 4270)),
+ Box(Box(4271, 4271), Box(4271, 4271)),
+ Box(Box(4272, 4272), Box(4272, 4272)),
+ Box(Box(4273, 4273), Box(4273, 4273)),
+ Box(Box(4274, 4274), Box(4274, 4274)),
+ Box(Box(4275, 4275), Box(4275, 4275)),
+ Box(Box(4276, 4276), Box(4276, 4276)),
+ Box(Box(4277, 4277), Box(4277, 4277)),
+ Box(Box(4278, 4278), Box(4278, 4278)),
+ Box(Box(4279, 4279), Box(4279, 4279)),
+ Box(Box(4280, 4280), Box(4280, 4280)),
+ Box(Box(4281, 4281), Box(4281, 4281)),
+ Box(Box(4282, 4282), Box(4282, 4282)),
+ Box(Box(4283, 4283), Box(4283, 4283)),
+ Box(Box(4284, 4284), Box(4284, 4284)),
+ Box(Box(4285, 4285), Box(4285, 4285)),
+ Box(Box(4286, 4286), Box(4286, 4286)),
+ Box(Box(4287, 4287), Box(4287, 4287)),
+ Box(Box(4288, 4288), Box(4288, 4288)),
+ Box(Box(4289, 4289), Box(4289, 4289)),
+ Box(Box(4290, 4290), Box(4290, 4290)),
+ Box(Box(4291, 4291), Box(4291, 4291)),
+ Box(Box(4292, 4292), Box(4292, 4292)),
+ Box(Box(4293, 4293), Box(4293, 4293)),
+ Box(Box(4294, 4294), Box(4294, 4294)),
+ Box(Box(4295, 4295), Box(4295, 4295)),
+ Box(Box(4296, 4296), Box(4296, 4296)),
+ Box(Box(4297, 4297), Box(4297, 4297)),
+ Box(Box(4298, 4298), Box(4298, 4298)),
+ Box(Box(4299, 4299), Box(4299, 4299)),
+ Box(Box(4300, 4300), Box(4300, 4300)),
+ Box(Box(4301, 4301), Box(4301, 4301)),
+ Box(Box(4302, 4302), Box(4302, 4302)),
+ Box(Box(4303, 4303), Box(4303, 4303)),
+ Box(Box(4304, 4304), Box(4304, 4304)),
+ Box(Box(4305, 4305), Box(4305, 4305)),
+ Box(Box(4306, 4306), Box(4306, 4306)),
+ Box(Box(4307, 4307), Box(4307, 4307)),
+ Box(Box(4308, 4308), Box(4308, 4308)),
+ Box(Box(4309, 4309), Box(4309, 4309)),
+ Box(Box(4310, 4310), Box(4310, 4310)),
+ Box(Box(4311, 4311), Box(4311, 4311)),
+ Box(Box(4312, 4312), Box(4312, 4312)),
+ Box(Box(4313, 4313), Box(4313, 4313)),
+ Box(Box(4314, 4314), Box(4314, 4314)),
+ Box(Box(4315, 4315), Box(4315, 4315)),
+ Box(Box(4316, 4316), Box(4316, 4316)),
+ Box(Box(4317, 4317), Box(4317, 4317)),
+ Box(Box(4318, 4318), Box(4318, 4318)),
+ Box(Box(4319, 4319), Box(4319, 4319)),
+ Box(Box(4320, 4320), Box(4320, 4320)),
+ Box(Box(4321, 4321), Box(4321, 4321)),
+ Box(Box(4322, 4322), Box(4322, 4322)),
+ Box(Box(4323, 4323), Box(4323, 4323)),
+ Box(Box(4324, 4324), Box(4324, 4324)),
+ Box(Box(4325, 4325), Box(4325, 4325)),
+ Box(Box(4326, 4326), Box(4326, 4326)),
+ Box(Box(4327, 4327), Box(4327, 4327)),
+ Box(Box(4328, 4328), Box(4328, 4328)),
+ Box(Box(4329, 4329), Box(4329, 4329)),
+ Box(Box(4330, 4330), Box(4330, 4330)),
+ Box(Box(4331, 4331), Box(4331, 4331)),
+ Box(Box(4332, 4332), Box(4332, 4332)),
+ Box(Box(4333, 4333), Box(4333, 4333)),
+ Box(Box(4334, 4334), Box(4334, 4334)),
+ Box(Box(4335, 4335), Box(4335, 4335)),
+ Box(Box(4336, 4336), Box(4336, 4336)),
+ Box(Box(4337, 4337), Box(4337, 4337)),
+ Box(Box(4338, 4338), Box(4338, 4338)),
+ Box(Box(4339, 4339), Box(4339, 4339)),
+ Box(Box(4340, 4340), Box(4340, 4340)),
+ Box(Box(4341, 4341), Box(4341, 4341)),
+ Box(Box(4342, 4342), Box(4342, 4342)),
+ Box(Box(4343, 4343), Box(4343, 4343)),
+ Box(Box(4344, 4344), Box(4344, 4344)),
+ Box(Box(4345, 4345), Box(4345, 4345)),
+ Box(Box(4346, 4346), Box(4346, 4346)),
+ Box(Box(4347, 4347), Box(4347, 4347)),
+ Box(Box(4348, 4348), Box(4348, 4348)),
+ Box(Box(4349, 4349), Box(4349, 4349)),
+ Box(Box(4350, 4350), Box(4350, 4350)),
+ Box(Box(4351, 4351), Box(4351, 4351)),
+ Box(Box(4352, 4352), Box(4352, 4352)),
+ Box(Box(4353, 4353), Box(4353, 4353)),
+ Box(Box(4354, 4354), Box(4354, 4354)),
+ Box(Box(4355, 4355), Box(4355, 4355)),
+ Box(Box(4356, 4356), Box(4356, 4356)),
+ Box(Box(4357, 4357), Box(4357, 4357)),
+ Box(Box(4358, 4358), Box(4358, 4358)),
+ Box(Box(4359, 4359), Box(4359, 4359)),
+ Box(Box(4360, 4360), Box(4360, 4360)),
+ Box(Box(4361, 4361), Box(4361, 4361)),
+ Box(Box(4362, 4362), Box(4362, 4362)),
+ Box(Box(4363, 4363), Box(4363, 4363)),
+ Box(Box(4364, 4364), Box(4364, 4364)),
+ Box(Box(4365, 4365), Box(4365, 4365)),
+ Box(Box(4366, 4366), Box(4366, 4366)),
+ Box(Box(4367, 4367), Box(4367, 4367)),
+ Box(Box(4368, 4368), Box(4368, 4368)),
+ Box(Box(4369, 4369), Box(4369, 4369)),
+ Box(Box(4370, 4370), Box(4370, 4370)),
+ Box(Box(4371, 4371), Box(4371, 4371)),
+ Box(Box(4372, 4372), Box(4372, 4372)),
+ Box(Box(4373, 4373), Box(4373, 4373)),
+ Box(Box(4374, 4374), Box(4374, 4374)),
+ Box(Box(4375, 4375), Box(4375, 4375)),
+ Box(Box(4376, 4376), Box(4376, 4376)),
+ Box(Box(4377, 4377), Box(4377, 4377)),
+ Box(Box(4378, 4378), Box(4378, 4378)),
+ Box(Box(4379, 4379), Box(4379, 4379)),
+ Box(Box(4380, 4380), Box(4380, 4380)),
+ Box(Box(4381, 4381), Box(4381, 4381)),
+ Box(Box(4382, 4382), Box(4382, 4382)),
+ Box(Box(4383, 4383), Box(4383, 4383)),
+ Box(Box(4384, 4384), Box(4384, 4384)),
+ Box(Box(4385, 4385), Box(4385, 4385)),
+ Box(Box(4386, 4386), Box(4386, 4386)),
+ Box(Box(4387, 4387), Box(4387, 4387)),
+ Box(Box(4388, 4388), Box(4388, 4388)),
+ Box(Box(4389, 4389), Box(4389, 4389)),
+ Box(Box(4390, 4390), Box(4390, 4390)),
+ Box(Box(4391, 4391), Box(4391, 4391)),
+ Box(Box(4392, 4392), Box(4392, 4392)),
+ Box(Box(4393, 4393), Box(4393, 4393)),
+ Box(Box(4394, 4394), Box(4394, 4394)),
+ Box(Box(4395, 4395), Box(4395, 4395)),
+ Box(Box(4396, 4396), Box(4396, 4396)),
+ Box(Box(4397, 4397), Box(4397, 4397)),
+ Box(Box(4398, 4398), Box(4398, 4398)),
+ Box(Box(4399, 4399), Box(4399, 4399)),
+ Box(Box(4400, 4400), Box(4400, 4400)),
+ Box(Box(4401, 4401), Box(4401, 4401)),
+ Box(Box(4402, 4402), Box(4402, 4402)),
+ Box(Box(4403, 4403), Box(4403, 4403)),
+ Box(Box(4404, 4404), Box(4404, 4404)),
+ Box(Box(4405, 4405), Box(4405, 4405)),
+ Box(Box(4406, 4406), Box(4406, 4406)),
+ Box(Box(4407, 4407), Box(4407, 4407)),
+ Box(Box(4408, 4408), Box(4408, 4408)),
+ Box(Box(4409, 4409), Box(4409, 4409)),
+ Box(Box(4410, 4410), Box(4410, 4410)),
+ Box(Box(4411, 4411), Box(4411, 4411)),
+ Box(Box(4412, 4412), Box(4412, 4412)),
+ Box(Box(4413, 4413), Box(4413, 4413)),
+ Box(Box(4414, 4414), Box(4414, 4414)),
+ Box(Box(4415, 4415), Box(4415, 4415)),
+ Box(Box(4416, 4416), Box(4416, 4416)),
+ Box(Box(4417, 4417), Box(4417, 4417)),
+ Box(Box(4418, 4418), Box(4418, 4418)),
+ Box(Box(4419, 4419), Box(4419, 4419)),
+ Box(Box(4420, 4420), Box(4420, 4420)),
+ Box(Box(4421, 4421), Box(4421, 4421)),
+ Box(Box(4422, 4422), Box(4422, 4422)),
+ Box(Box(4423, 4423), Box(4423, 4423)),
+ Box(Box(4424, 4424), Box(4424, 4424)),
+ Box(Box(4425, 4425), Box(4425, 4425)),
+ Box(Box(4426, 4426), Box(4426, 4426)),
+ Box(Box(4427, 4427), Box(4427, 4427)),
+ Box(Box(4428, 4428), Box(4428, 4428)),
+ Box(Box(4429, 4429), Box(4429, 4429)),
+ Box(Box(4430, 4430), Box(4430, 4430)),
+ Box(Box(4431, 4431), Box(4431, 4431)),
+ Box(Box(4432, 4432), Box(4432, 4432)),
+ Box(Box(4433, 4433), Box(4433, 4433)),
+ Box(Box(4434, 4434), Box(4434, 4434)),
+ Box(Box(4435, 4435), Box(4435, 4435)),
+ Box(Box(4436, 4436), Box(4436, 4436)),
+ Box(Box(4437, 4437), Box(4437, 4437)),
+ Box(Box(4438, 4438), Box(4438, 4438)),
+ Box(Box(4439, 4439), Box(4439, 4439)),
+ Box(Box(4440, 4440), Box(4440, 4440)),
+ Box(Box(4441, 4441), Box(4441, 4441)),
+ Box(Box(4442, 4442), Box(4442, 4442)),
+ Box(Box(4443, 4443), Box(4443, 4443)),
+ Box(Box(4444, 4444), Box(4444, 4444)),
+ Box(Box(4445, 4445), Box(4445, 4445)),
+ Box(Box(4446, 4446), Box(4446, 4446)),
+ Box(Box(4447, 4447), Box(4447, 4447)),
+ Box(Box(4448, 4448), Box(4448, 4448)),
+ Box(Box(4449, 4449), Box(4449, 4449)),
+ Box(Box(4450, 4450), Box(4450, 4450)),
+ Box(Box(4451, 4451), Box(4451, 4451)),
+ Box(Box(4452, 4452), Box(4452, 4452)),
+ Box(Box(4453, 4453), Box(4453, 4453)),
+ Box(Box(4454, 4454), Box(4454, 4454)),
+ Box(Box(4455, 4455), Box(4455, 4455)),
+ Box(Box(4456, 4456), Box(4456, 4456)),
+ Box(Box(4457, 4457), Box(4457, 4457)),
+ Box(Box(4458, 4458), Box(4458, 4458)),
+ Box(Box(4459, 4459), Box(4459, 4459)),
+ Box(Box(4460, 4460), Box(4460, 4460)),
+ Box(Box(4461, 4461), Box(4461, 4461)),
+ Box(Box(4462, 4462), Box(4462, 4462)),
+ Box(Box(4463, 4463), Box(4463, 4463)),
+ Box(Box(4464, 4464), Box(4464, 4464)),
+ Box(Box(4465, 4465), Box(4465, 4465)),
+ Box(Box(4466, 4466), Box(4466, 4466)),
+ Box(Box(4467, 4467), Box(4467, 4467)),
+ Box(Box(4468, 4468), Box(4468, 4468)),
+ Box(Box(4469, 4469), Box(4469, 4469)),
+ Box(Box(4470, 4470), Box(4470, 4470)),
+ Box(Box(4471, 4471), Box(4471, 4471)),
+ Box(Box(4472, 4472), Box(4472, 4472)),
+ Box(Box(4473, 4473), Box(4473, 4473)),
+ Box(Box(4474, 4474), Box(4474, 4474)),
+ Box(Box(4475, 4475), Box(4475, 4475)),
+ Box(Box(4476, 4476), Box(4476, 4476)),
+ Box(Box(4477, 4477), Box(4477, 4477)),
+ Box(Box(4478, 4478), Box(4478, 4478)),
+ Box(Box(4479, 4479), Box(4479, 4479)),
+ Box(Box(4480, 4480), Box(4480, 4480)),
+ Box(Box(4481, 4481), Box(4481, 4481)),
+ Box(Box(4482, 4482), Box(4482, 4482)),
+ Box(Box(4483, 4483), Box(4483, 4483)),
+ Box(Box(4484, 4484), Box(4484, 4484)),
+ Box(Box(4485, 4485), Box(4485, 4485)),
+ Box(Box(4486, 4486), Box(4486, 4486)),
+ Box(Box(4487, 4487), Box(4487, 4487)),
+ Box(Box(4488, 4488), Box(4488, 4488)),
+ Box(Box(4489, 4489), Box(4489, 4489)),
+ Box(Box(4490, 4490), Box(4490, 4490)),
+ Box(Box(4491, 4491), Box(4491, 4491)),
+ Box(Box(4492, 4492), Box(4492, 4492)),
+ Box(Box(4493, 4493), Box(4493, 4493)),
+ Box(Box(4494, 4494), Box(4494, 4494)),
+ Box(Box(4495, 4495), Box(4495, 4495)),
+ Box(Box(4496, 4496), Box(4496, 4496)),
+ Box(Box(4497, 4497), Box(4497, 4497)),
+ Box(Box(4498, 4498), Box(4498, 4498)),
+ Box(Box(4499, 4499), Box(4499, 4499)),
+ Box(Box(4500, 4500), Box(4500, 4500)),
+ Box(Box(4501, 4501), Box(4501, 4501)),
+ Box(Box(4502, 4502), Box(4502, 4502)),
+ Box(Box(4503, 4503), Box(4503, 4503)),
+ Box(Box(4504, 4504), Box(4504, 4504)),
+ Box(Box(4505, 4505), Box(4505, 4505)),
+ Box(Box(4506, 4506), Box(4506, 4506)),
+ Box(Box(4507, 4507), Box(4507, 4507)),
+ Box(Box(4508, 4508), Box(4508, 4508)),
+ Box(Box(4509, 4509), Box(4509, 4509)),
+ Box(Box(4510, 4510), Box(4510, 4510)),
+ Box(Box(4511, 4511), Box(4511, 4511)),
+ Box(Box(4512, 4512), Box(4512, 4512)),
+ Box(Box(4513, 4513), Box(4513, 4513)),
+ Box(Box(4514, 4514), Box(4514, 4514)),
+ Box(Box(4515, 4515), Box(4515, 4515)),
+ Box(Box(4516, 4516), Box(4516, 4516)),
+ Box(Box(4517, 4517), Box(4517, 4517)),
+ Box(Box(4518, 4518), Box(4518, 4518)),
+ Box(Box(4519, 4519), Box(4519, 4519)),
+ Box(Box(4520, 4520), Box(4520, 4520)),
+ Box(Box(4521, 4521), Box(4521, 4521)),
+ Box(Box(4522, 4522), Box(4522, 4522)),
+ Box(Box(4523, 4523), Box(4523, 4523)),
+ Box(Box(4524, 4524), Box(4524, 4524)),
+ Box(Box(4525, 4525), Box(4525, 4525)),
+ Box(Box(4526, 4526), Box(4526, 4526)),
+ Box(Box(4527, 4527), Box(4527, 4527)),
+ Box(Box(4528, 4528), Box(4528, 4528)),
+ Box(Box(4529, 4529), Box(4529, 4529)),
+ Box(Box(4530, 4530), Box(4530, 4530)),
+ Box(Box(4531, 4531), Box(4531, 4531)),
+ Box(Box(4532, 4532), Box(4532, 4532)),
+ Box(Box(4533, 4533), Box(4533, 4533)),
+ Box(Box(4534, 4534), Box(4534, 4534)),
+ Box(Box(4535, 4535), Box(4535, 4535)),
+ Box(Box(4536, 4536), Box(4536, 4536)),
+ Box(Box(4537, 4537), Box(4537, 4537)),
+ Box(Box(4538, 4538), Box(4538, 4538)),
+ Box(Box(4539, 4539), Box(4539, 4539)),
+ Box(Box(4540, 4540), Box(4540, 4540)),
+ Box(Box(4541, 4541), Box(4541, 4541)),
+ Box(Box(4542, 4542), Box(4542, 4542)),
+ Box(Box(4543, 4543), Box(4543, 4543)),
+ Box(Box(4544, 4544), Box(4544, 4544)),
+ Box(Box(4545, 4545), Box(4545, 4545)),
+ Box(Box(4546, 4546), Box(4546, 4546)),
+ Box(Box(4547, 4547), Box(4547, 4547)),
+ Box(Box(4548, 4548), Box(4548, 4548)),
+ Box(Box(4549, 4549), Box(4549, 4549)),
+ Box(Box(4550, 4550), Box(4550, 4550)),
+ Box(Box(4551, 4551), Box(4551, 4551)),
+ Box(Box(4552, 4552), Box(4552, 4552)),
+ Box(Box(4553, 4553), Box(4553, 4553)),
+ Box(Box(4554, 4554), Box(4554, 4554)),
+ Box(Box(4555, 4555), Box(4555, 4555)),
+ Box(Box(4556, 4556), Box(4556, 4556)),
+ Box(Box(4557, 4557), Box(4557, 4557)),
+ Box(Box(4558, 4558), Box(4558, 4558)),
+ Box(Box(4559, 4559), Box(4559, 4559)),
+ Box(Box(4560, 4560), Box(4560, 4560)),
+ Box(Box(4561, 4561), Box(4561, 4561)),
+ Box(Box(4562, 4562), Box(4562, 4562)),
+ Box(Box(4563, 4563), Box(4563, 4563)),
+ Box(Box(4564, 4564), Box(4564, 4564)),
+ Box(Box(4565, 4565), Box(4565, 4565)),
+ Box(Box(4566, 4566), Box(4566, 4566)),
+ Box(Box(4567, 4567), Box(4567, 4567)),
+ Box(Box(4568, 4568), Box(4568, 4568)),
+ Box(Box(4569, 4569), Box(4569, 4569)),
+ Box(Box(4570, 4570), Box(4570, 4570)),
+ Box(Box(4571, 4571), Box(4571, 4571)),
+ Box(Box(4572, 4572), Box(4572, 4572)),
+ Box(Box(4573, 4573), Box(4573, 4573)),
+ Box(Box(4574, 4574), Box(4574, 4574)),
+ Box(Box(4575, 4575), Box(4575, 4575)),
+ Box(Box(4576, 4576), Box(4576, 4576)),
+ Box(Box(4577, 4577), Box(4577, 4577)),
+ Box(Box(4578, 4578), Box(4578, 4578)),
+ Box(Box(4579, 4579), Box(4579, 4579)),
+ Box(Box(4580, 4580), Box(4580, 4580)),
+ Box(Box(4581, 4581), Box(4581, 4581)),
+ Box(Box(4582, 4582), Box(4582, 4582)),
+ Box(Box(4583, 4583), Box(4583, 4583)),
+ Box(Box(4584, 4584), Box(4584, 4584)),
+ Box(Box(4585, 4585), Box(4585, 4585)),
+ Box(Box(4586, 4586), Box(4586, 4586)),
+ Box(Box(4587, 4587), Box(4587, 4587)),
+ Box(Box(4588, 4588), Box(4588, 4588)),
+ Box(Box(4589, 4589), Box(4589, 4589)),
+ Box(Box(4590, 4590), Box(4590, 4590)),
+ Box(Box(4591, 4591), Box(4591, 4591)),
+ Box(Box(4592, 4592), Box(4592, 4592)),
+ Box(Box(4593, 4593), Box(4593, 4593)),
+ Box(Box(4594, 4594), Box(4594, 4594)),
+ Box(Box(4595, 4595), Box(4595, 4595)),
+ Box(Box(4596, 4596), Box(4596, 4596)),
+ Box(Box(4597, 4597), Box(4597, 4597)),
+ Box(Box(4598, 4598), Box(4598, 4598)),
+ Box(Box(4599, 4599), Box(4599, 4599)),
+ Box(Box(4600, 4600), Box(4600, 4600)),
+ Box(Box(4601, 4601), Box(4601, 4601)),
+ Box(Box(4602, 4602), Box(4602, 4602)),
+ Box(Box(4603, 4603), Box(4603, 4603)),
+ Box(Box(4604, 4604), Box(4604, 4604)),
+ Box(Box(4605, 4605), Box(4605, 4605)),
+ Box(Box(4606, 4606), Box(4606, 4606)),
+ Box(Box(4607, 4607), Box(4607, 4607)),
+ Box(Box(4608, 4608), Box(4608, 4608)),
+ Box(Box(4609, 4609), Box(4609, 4609)),
+ Box(Box(4610, 4610), Box(4610, 4610)),
+ Box(Box(4611, 4611), Box(4611, 4611)),
+ Box(Box(4612, 4612), Box(4612, 4612)),
+ Box(Box(4613, 4613), Box(4613, 4613)),
+ Box(Box(4614, 4614), Box(4614, 4614)),
+ Box(Box(4615, 4615), Box(4615, 4615)),
+ Box(Box(4616, 4616), Box(4616, 4616)),
+ Box(Box(4617, 4617), Box(4617, 4617)),
+ Box(Box(4618, 4618), Box(4618, 4618)),
+ Box(Box(4619, 4619), Box(4619, 4619)),
+ Box(Box(4620, 4620), Box(4620, 4620)),
+ Box(Box(4621, 4621), Box(4621, 4621)),
+ Box(Box(4622, 4622), Box(4622, 4622)),
+ Box(Box(4623, 4623), Box(4623, 4623)),
+ Box(Box(4624, 4624), Box(4624, 4624)),
+ Box(Box(4625, 4625), Box(4625, 4625)),
+ Box(Box(4626, 4626), Box(4626, 4626)),
+ Box(Box(4627, 4627), Box(4627, 4627)),
+ Box(Box(4628, 4628), Box(4628, 4628)),
+ Box(Box(4629, 4629), Box(4629, 4629)),
+ Box(Box(4630, 4630), Box(4630, 4630)),
+ Box(Box(4631, 4631), Box(4631, 4631)),
+ Box(Box(4632, 4632), Box(4632, 4632)),
+ Box(Box(4633, 4633), Box(4633, 4633)),
+ Box(Box(4634, 4634), Box(4634, 4634)),
+ Box(Box(4635, 4635), Box(4635, 4635)),
+ Box(Box(4636, 4636), Box(4636, 4636)),
+ Box(Box(4637, 4637), Box(4637, 4637)),
+ Box(Box(4638, 4638), Box(4638, 4638)),
+ Box(Box(4639, 4639), Box(4639, 4639)),
+ Box(Box(4640, 4640), Box(4640, 4640)),
+ Box(Box(4641, 4641), Box(4641, 4641)),
+ Box(Box(4642, 4642), Box(4642, 4642)),
+ Box(Box(4643, 4643), Box(4643, 4643)),
+ Box(Box(4644, 4644), Box(4644, 4644)),
+ Box(Box(4645, 4645), Box(4645, 4645)),
+ Box(Box(4646, 4646), Box(4646, 4646)),
+ Box(Box(4647, 4647), Box(4647, 4647)),
+ Box(Box(4648, 4648), Box(4648, 4648)),
+ Box(Box(4649, 4649), Box(4649, 4649)),
+ Box(Box(4650, 4650), Box(4650, 4650)),
+ Box(Box(4651, 4651), Box(4651, 4651)),
+ Box(Box(4652, 4652), Box(4652, 4652)),
+ Box(Box(4653, 4653), Box(4653, 4653)),
+ Box(Box(4654, 4654), Box(4654, 4654)),
+ Box(Box(4655, 4655), Box(4655, 4655)),
+ Box(Box(4656, 4656), Box(4656, 4656)),
+ Box(Box(4657, 4657), Box(4657, 4657)),
+ Box(Box(4658, 4658), Box(4658, 4658)),
+ Box(Box(4659, 4659), Box(4659, 4659)),
+ Box(Box(4660, 4660), Box(4660, 4660)),
+ Box(Box(4661, 4661), Box(4661, 4661)),
+ Box(Box(4662, 4662), Box(4662, 4662)),
+ Box(Box(4663, 4663), Box(4663, 4663)),
+ Box(Box(4664, 4664), Box(4664, 4664)),
+ Box(Box(4665, 4665), Box(4665, 4665)),
+ Box(Box(4666, 4666), Box(4666, 4666)),
+ Box(Box(4667, 4667), Box(4667, 4667)),
+ Box(Box(4668, 4668), Box(4668, 4668)),
+ Box(Box(4669, 4669), Box(4669, 4669)),
+ Box(Box(4670, 4670), Box(4670, 4670)),
+ Box(Box(4671, 4671), Box(4671, 4671)),
+ Box(Box(4672, 4672), Box(4672, 4672)),
+ Box(Box(4673, 4673), Box(4673, 4673)),
+ Box(Box(4674, 4674), Box(4674, 4674)),
+ Box(Box(4675, 4675), Box(4675, 4675)),
+ Box(Box(4676, 4676), Box(4676, 4676)),
+ Box(Box(4677, 4677), Box(4677, 4677)),
+ Box(Box(4678, 4678), Box(4678, 4678)),
+ Box(Box(4679, 4679), Box(4679, 4679)),
+ Box(Box(4680, 4680), Box(4680, 4680)),
+ Box(Box(4681, 4681), Box(4681, 4681)),
+ Box(Box(4682, 4682), Box(4682, 4682)),
+ Box(Box(4683, 4683), Box(4683, 4683)),
+ Box(Box(4684, 4684), Box(4684, 4684)),
+ Box(Box(4685, 4685), Box(4685, 4685)),
+ Box(Box(4686, 4686), Box(4686, 4686)),
+ Box(Box(4687, 4687), Box(4687, 4687)),
+ Box(Box(4688, 4688), Box(4688, 4688)),
+ Box(Box(4689, 4689), Box(4689, 4689)),
+ Box(Box(4690, 4690), Box(4690, 4690)),
+ Box(Box(4691, 4691), Box(4691, 4691)),
+ Box(Box(4692, 4692), Box(4692, 4692)),
+ Box(Box(4693, 4693), Box(4693, 4693)),
+ Box(Box(4694, 4694), Box(4694, 4694)),
+ Box(Box(4695, 4695), Box(4695, 4695)),
+ Box(Box(4696, 4696), Box(4696, 4696)),
+ Box(Box(4697, 4697), Box(4697, 4697)),
+ Box(Box(4698, 4698), Box(4698, 4698)),
+ Box(Box(4699, 4699), Box(4699, 4699)),
+ Box(Box(4700, 4700), Box(4700, 4700)),
+ Box(Box(4701, 4701), Box(4701, 4701)),
+ Box(Box(4702, 4702), Box(4702, 4702)),
+ Box(Box(4703, 4703), Box(4703, 4703)),
+ Box(Box(4704, 4704), Box(4704, 4704)),
+ Box(Box(4705, 4705), Box(4705, 4705)),
+ Box(Box(4706, 4706), Box(4706, 4706)),
+ Box(Box(4707, 4707), Box(4707, 4707)),
+ Box(Box(4708, 4708), Box(4708, 4708)),
+ Box(Box(4709, 4709), Box(4709, 4709)),
+ Box(Box(4710, 4710), Box(4710, 4710)),
+ Box(Box(4711, 4711), Box(4711, 4711)),
+ Box(Box(4712, 4712), Box(4712, 4712)),
+ Box(Box(4713, 4713), Box(4713, 4713)),
+ Box(Box(4714, 4714), Box(4714, 4714)),
+ Box(Box(4715, 4715), Box(4715, 4715)),
+ Box(Box(4716, 4716), Box(4716, 4716)),
+ Box(Box(4717, 4717), Box(4717, 4717)),
+ Box(Box(4718, 4718), Box(4718, 4718)),
+ Box(Box(4719, 4719), Box(4719, 4719)),
+ Box(Box(4720, 4720), Box(4720, 4720)),
+ Box(Box(4721, 4721), Box(4721, 4721)),
+ Box(Box(4722, 4722), Box(4722, 4722)),
+ Box(Box(4723, 4723), Box(4723, 4723)),
+ Box(Box(4724, 4724), Box(4724, 4724)),
+ Box(Box(4725, 4725), Box(4725, 4725)),
+ Box(Box(4726, 4726), Box(4726, 4726)),
+ Box(Box(4727, 4727), Box(4727, 4727)),
+ Box(Box(4728, 4728), Box(4728, 4728)),
+ Box(Box(4729, 4729), Box(4729, 4729)),
+ Box(Box(4730, 4730), Box(4730, 4730)),
+ Box(Box(4731, 4731), Box(4731, 4731)),
+ Box(Box(4732, 4732), Box(4732, 4732)),
+ Box(Box(4733, 4733), Box(4733, 4733)),
+ Box(Box(4734, 4734), Box(4734, 4734)),
+ Box(Box(4735, 4735), Box(4735, 4735)),
+ Box(Box(4736, 4736), Box(4736, 4736)),
+ Box(Box(4737, 4737), Box(4737, 4737)),
+ Box(Box(4738, 4738), Box(4738, 4738)),
+ Box(Box(4739, 4739), Box(4739, 4739)),
+ Box(Box(4740, 4740), Box(4740, 4740)),
+ Box(Box(4741, 4741), Box(4741, 4741)),
+ Box(Box(4742, 4742), Box(4742, 4742)),
+ Box(Box(4743, 4743), Box(4743, 4743)),
+ Box(Box(4744, 4744), Box(4744, 4744)),
+ Box(Box(4745, 4745), Box(4745, 4745)),
+ Box(Box(4746, 4746), Box(4746, 4746)),
+ Box(Box(4747, 4747), Box(4747, 4747)),
+ Box(Box(4748, 4748), Box(4748, 4748)),
+ Box(Box(4749, 4749), Box(4749, 4749)),
+ Box(Box(4750, 4750), Box(4750, 4750)),
+ Box(Box(4751, 4751), Box(4751, 4751)),
+ Box(Box(4752, 4752), Box(4752, 4752)),
+ Box(Box(4753, 4753), Box(4753, 4753)),
+ Box(Box(4754, 4754), Box(4754, 4754)),
+ Box(Box(4755, 4755), Box(4755, 4755)),
+ Box(Box(4756, 4756), Box(4756, 4756)),
+ Box(Box(4757, 4757), Box(4757, 4757)),
+ Box(Box(4758, 4758), Box(4758, 4758)),
+ Box(Box(4759, 4759), Box(4759, 4759)),
+ Box(Box(4760, 4760), Box(4760, 4760)),
+ Box(Box(4761, 4761), Box(4761, 4761)),
+ Box(Box(4762, 4762), Box(4762, 4762)),
+ Box(Box(4763, 4763), Box(4763, 4763)),
+ Box(Box(4764, 4764), Box(4764, 4764)),
+ Box(Box(4765, 4765), Box(4765, 4765)),
+ Box(Box(4766, 4766), Box(4766, 4766)),
+ Box(Box(4767, 4767), Box(4767, 4767)),
+ Box(Box(4768, 4768), Box(4768, 4768)),
+ Box(Box(4769, 4769), Box(4769, 4769)),
+ Box(Box(4770, 4770), Box(4770, 4770)),
+ Box(Box(4771, 4771), Box(4771, 4771)),
+ Box(Box(4772, 4772), Box(4772, 4772)),
+ Box(Box(4773, 4773), Box(4773, 4773)),
+ Box(Box(4774, 4774), Box(4774, 4774)),
+ Box(Box(4775, 4775), Box(4775, 4775)),
+ Box(Box(4776, 4776), Box(4776, 4776)),
+ Box(Box(4777, 4777), Box(4777, 4777)),
+ Box(Box(4778, 4778), Box(4778, 4778)),
+ Box(Box(4779, 4779), Box(4779, 4779)),
+ Box(Box(4780, 4780), Box(4780, 4780)),
+ Box(Box(4781, 4781), Box(4781, 4781)),
+ Box(Box(4782, 4782), Box(4782, 4782)),
+ Box(Box(4783, 4783), Box(4783, 4783)),
+ Box(Box(4784, 4784), Box(4784, 4784)),
+ Box(Box(4785, 4785), Box(4785, 4785)),
+ Box(Box(4786, 4786), Box(4786, 4786)),
+ Box(Box(4787, 4787), Box(4787, 4787)),
+ Box(Box(4788, 4788), Box(4788, 4788)),
+ Box(Box(4789, 4789), Box(4789, 4789)),
+ Box(Box(4790, 4790), Box(4790, 4790)),
+ Box(Box(4791, 4791), Box(4791, 4791)),
+ Box(Box(4792, 4792), Box(4792, 4792)),
+ Box(Box(4793, 4793), Box(4793, 4793)),
+ Box(Box(4794, 4794), Box(4794, 4794)),
+ Box(Box(4795, 4795), Box(4795, 4795)),
+ Box(Box(4796, 4796), Box(4796, 4796)),
+ Box(Box(4797, 4797), Box(4797, 4797)),
+ Box(Box(4798, 4798), Box(4798, 4798)),
+ Box(Box(4799, 4799), Box(4799, 4799)),
+ Box(Box(4800, 4800), Box(4800, 4800)),
+ Box(Box(4801, 4801), Box(4801, 4801)),
+ Box(Box(4802, 4802), Box(4802, 4802)),
+ Box(Box(4803, 4803), Box(4803, 4803)),
+ Box(Box(4804, 4804), Box(4804, 4804)),
+ Box(Box(4805, 4805), Box(4805, 4805)),
+ Box(Box(4806, 4806), Box(4806, 4806)),
+ Box(Box(4807, 4807), Box(4807, 4807)),
+ Box(Box(4808, 4808), Box(4808, 4808)),
+ Box(Box(4809, 4809), Box(4809, 4809)),
+ Box(Box(4810, 4810), Box(4810, 4810)),
+ Box(Box(4811, 4811), Box(4811, 4811)),
+ Box(Box(4812, 4812), Box(4812, 4812)),
+ Box(Box(4813, 4813), Box(4813, 4813)),
+ Box(Box(4814, 4814), Box(4814, 4814)),
+ Box(Box(4815, 4815), Box(4815, 4815)),
+ Box(Box(4816, 4816), Box(4816, 4816)),
+ Box(Box(4817, 4817), Box(4817, 4817)),
+ Box(Box(4818, 4818), Box(4818, 4818)),
+ Box(Box(4819, 4819), Box(4819, 4819)),
+ Box(Box(4820, 4820), Box(4820, 4820)),
+ Box(Box(4821, 4821), Box(4821, 4821)),
+ Box(Box(4822, 4822), Box(4822, 4822)),
+ Box(Box(4823, 4823), Box(4823, 4823)),
+ Box(Box(4824, 4824), Box(4824, 4824)),
+ Box(Box(4825, 4825), Box(4825, 4825)),
+ Box(Box(4826, 4826), Box(4826, 4826)),
+ Box(Box(4827, 4827), Box(4827, 4827)),
+ Box(Box(4828, 4828), Box(4828, 4828)),
+ Box(Box(4829, 4829), Box(4829, 4829)),
+ Box(Box(4830, 4830), Box(4830, 4830)),
+ Box(Box(4831, 4831), Box(4831, 4831)),
+ Box(Box(4832, 4832), Box(4832, 4832)),
+ Box(Box(4833, 4833), Box(4833, 4833)),
+ Box(Box(4834, 4834), Box(4834, 4834)),
+ Box(Box(4835, 4835), Box(4835, 4835)),
+ Box(Box(4836, 4836), Box(4836, 4836)),
+ Box(Box(4837, 4837), Box(4837, 4837)),
+ Box(Box(4838, 4838), Box(4838, 4838)),
+ Box(Box(4839, 4839), Box(4839, 4839)),
+ Box(Box(4840, 4840), Box(4840, 4840)),
+ Box(Box(4841, 4841), Box(4841, 4841)),
+ Box(Box(4842, 4842), Box(4842, 4842)),
+ Box(Box(4843, 4843), Box(4843, 4843)),
+ Box(Box(4844, 4844), Box(4844, 4844)),
+ Box(Box(4845, 4845), Box(4845, 4845)),
+ Box(Box(4846, 4846), Box(4846, 4846)),
+ Box(Box(4847, 4847), Box(4847, 4847)),
+ Box(Box(4848, 4848), Box(4848, 4848)),
+ Box(Box(4849, 4849), Box(4849, 4849)),
+ Box(Box(4850, 4850), Box(4850, 4850)),
+ Box(Box(4851, 4851), Box(4851, 4851)),
+ Box(Box(4852, 4852), Box(4852, 4852)),
+ Box(Box(4853, 4853), Box(4853, 4853)),
+ Box(Box(4854, 4854), Box(4854, 4854)),
+ Box(Box(4855, 4855), Box(4855, 4855)),
+ Box(Box(4856, 4856), Box(4856, 4856)),
+ Box(Box(4857, 4857), Box(4857, 4857)),
+ Box(Box(4858, 4858), Box(4858, 4858)),
+ Box(Box(4859, 4859), Box(4859, 4859)),
+ Box(Box(4860, 4860), Box(4860, 4860)),
+ Box(Box(4861, 4861), Box(4861, 4861)),
+ Box(Box(4862, 4862), Box(4862, 4862)),
+ Box(Box(4863, 4863), Box(4863, 4863)),
+ Box(Box(4864, 4864), Box(4864, 4864)),
+ Box(Box(4865, 4865), Box(4865, 4865)),
+ Box(Box(4866, 4866), Box(4866, 4866)),
+ Box(Box(4867, 4867), Box(4867, 4867)),
+ Box(Box(4868, 4868), Box(4868, 4868)),
+ Box(Box(4869, 4869), Box(4869, 4869)),
+ Box(Box(4870, 4870), Box(4870, 4870)),
+ Box(Box(4871, 4871), Box(4871, 4871)),
+ Box(Box(4872, 4872), Box(4872, 4872)),
+ Box(Box(4873, 4873), Box(4873, 4873)),
+ Box(Box(4874, 4874), Box(4874, 4874)),
+ Box(Box(4875, 4875), Box(4875, 4875)),
+ Box(Box(4876, 4876), Box(4876, 4876)),
+ Box(Box(4877, 4877), Box(4877, 4877)),
+ Box(Box(4878, 4878), Box(4878, 4878)),
+ Box(Box(4879, 4879), Box(4879, 4879)),
+ Box(Box(4880, 4880), Box(4880, 4880)),
+ Box(Box(4881, 4881), Box(4881, 4881)),
+ Box(Box(4882, 4882), Box(4882, 4882)),
+ Box(Box(4883, 4883), Box(4883, 4883)),
+ Box(Box(4884, 4884), Box(4884, 4884)),
+ Box(Box(4885, 4885), Box(4885, 4885)),
+ Box(Box(4886, 4886), Box(4886, 4886)),
+ Box(Box(4887, 4887), Box(4887, 4887)),
+ Box(Box(4888, 4888), Box(4888, 4888)),
+ Box(Box(4889, 4889), Box(4889, 4889)),
+ Box(Box(4890, 4890), Box(4890, 4890)),
+ Box(Box(4891, 4891), Box(4891, 4891)),
+ Box(Box(4892, 4892), Box(4892, 4892)),
+ Box(Box(4893, 4893), Box(4893, 4893)),
+ Box(Box(4894, 4894), Box(4894, 4894)),
+ Box(Box(4895, 4895), Box(4895, 4895)),
+ Box(Box(4896, 4896), Box(4896, 4896)),
+ Box(Box(4897, 4897), Box(4897, 4897)),
+ Box(Box(4898, 4898), Box(4898, 4898)),
+ Box(Box(4899, 4899), Box(4899, 4899)),
+ Box(Box(4900, 4900), Box(4900, 4900)),
+ Box(Box(4901, 4901), Box(4901, 4901)),
+ Box(Box(4902, 4902), Box(4902, 4902)),
+ Box(Box(4903, 4903), Box(4903, 4903)),
+ Box(Box(4904, 4904), Box(4904, 4904)),
+ Box(Box(4905, 4905), Box(4905, 4905)),
+ Box(Box(4906, 4906), Box(4906, 4906)),
+ Box(Box(4907, 4907), Box(4907, 4907)),
+ Box(Box(4908, 4908), Box(4908, 4908)),
+ Box(Box(4909, 4909), Box(4909, 4909)),
+ Box(Box(4910, 4910), Box(4910, 4910)),
+ Box(Box(4911, 4911), Box(4911, 4911)),
+ Box(Box(4912, 4912), Box(4912, 4912)),
+ Box(Box(4913, 4913), Box(4913, 4913)),
+ Box(Box(4914, 4914), Box(4914, 4914)),
+ Box(Box(4915, 4915), Box(4915, 4915)),
+ Box(Box(4916, 4916), Box(4916, 4916)),
+ Box(Box(4917, 4917), Box(4917, 4917)),
+ Box(Box(4918, 4918), Box(4918, 4918)),
+ Box(Box(4919, 4919), Box(4919, 4919)),
+ Box(Box(4920, 4920), Box(4920, 4920)),
+ Box(Box(4921, 4921), Box(4921, 4921)),
+ Box(Box(4922, 4922), Box(4922, 4922)),
+ Box(Box(4923, 4923), Box(4923, 4923)),
+ Box(Box(4924, 4924), Box(4924, 4924)),
+ Box(Box(4925, 4925), Box(4925, 4925)),
+ Box(Box(4926, 4926), Box(4926, 4926)),
+ Box(Box(4927, 4927), Box(4927, 4927)),
+ Box(Box(4928, 4928), Box(4928, 4928)),
+ Box(Box(4929, 4929), Box(4929, 4929)),
+ Box(Box(4930, 4930), Box(4930, 4930)),
+ Box(Box(4931, 4931), Box(4931, 4931)),
+ Box(Box(4932, 4932), Box(4932, 4932)),
+ Box(Box(4933, 4933), Box(4933, 4933)),
+ Box(Box(4934, 4934), Box(4934, 4934)),
+ Box(Box(4935, 4935), Box(4935, 4935)),
+ Box(Box(4936, 4936), Box(4936, 4936)),
+ Box(Box(4937, 4937), Box(4937, 4937)),
+ Box(Box(4938, 4938), Box(4938, 4938)),
+ Box(Box(4939, 4939), Box(4939, 4939)),
+ Box(Box(4940, 4940), Box(4940, 4940)),
+ Box(Box(4941, 4941), Box(4941, 4941)),
+ Box(Box(4942, 4942), Box(4942, 4942)),
+ Box(Box(4943, 4943), Box(4943, 4943)),
+ Box(Box(4944, 4944), Box(4944, 4944)),
+ Box(Box(4945, 4945), Box(4945, 4945)),
+ Box(Box(4946, 4946), Box(4946, 4946)),
+ Box(Box(4947, 4947), Box(4947, 4947)),
+ Box(Box(4948, 4948), Box(4948, 4948)),
+ Box(Box(4949, 4949), Box(4949, 4949)),
+ Box(Box(4950, 4950), Box(4950, 4950)),
+ Box(Box(4951, 4951), Box(4951, 4951)),
+ Box(Box(4952, 4952), Box(4952, 4952)),
+ Box(Box(4953, 4953), Box(4953, 4953)),
+ Box(Box(4954, 4954), Box(4954, 4954)),
+ Box(Box(4955, 4955), Box(4955, 4955)),
+ Box(Box(4956, 4956), Box(4956, 4956)),
+ Box(Box(4957, 4957), Box(4957, 4957)),
+ Box(Box(4958, 4958), Box(4958, 4958)),
+ Box(Box(4959, 4959), Box(4959, 4959)),
+ Box(Box(4960, 4960), Box(4960, 4960)),
+ Box(Box(4961, 4961), Box(4961, 4961)),
+ Box(Box(4962, 4962), Box(4962, 4962)),
+ Box(Box(4963, 4963), Box(4963, 4963)),
+ Box(Box(4964, 4964), Box(4964, 4964)),
+ Box(Box(4965, 4965), Box(4965, 4965)),
+ Box(Box(4966, 4966), Box(4966, 4966)),
+ Box(Box(4967, 4967), Box(4967, 4967)),
+ Box(Box(4968, 4968), Box(4968, 4968)),
+ Box(Box(4969, 4969), Box(4969, 4969)),
+ Box(Box(4970, 4970), Box(4970, 4970)),
+ Box(Box(4971, 4971), Box(4971, 4971)),
+ Box(Box(4972, 4972), Box(4972, 4972)),
+ Box(Box(4973, 4973), Box(4973, 4973)),
+ Box(Box(4974, 4974), Box(4974, 4974)),
+ Box(Box(4975, 4975), Box(4975, 4975)),
+ Box(Box(4976, 4976), Box(4976, 4976)),
+ Box(Box(4977, 4977), Box(4977, 4977)),
+ Box(Box(4978, 4978), Box(4978, 4978)),
+ Box(Box(4979, 4979), Box(4979, 4979)),
+ Box(Box(4980, 4980), Box(4980, 4980)),
+ Box(Box(4981, 4981), Box(4981, 4981)),
+ Box(Box(4982, 4982), Box(4982, 4982)),
+ Box(Box(4983, 4983), Box(4983, 4983)),
+ Box(Box(4984, 4984), Box(4984, 4984)),
+ Box(Box(4985, 4985), Box(4985, 4985)),
+ Box(Box(4986, 4986), Box(4986, 4986)),
+ Box(Box(4987, 4987), Box(4987, 4987)),
+ Box(Box(4988, 4988), Box(4988, 4988)),
+ Box(Box(4989, 4989), Box(4989, 4989)),
+ Box(Box(4990, 4990), Box(4990, 4990)),
+ Box(Box(4991, 4991), Box(4991, 4991)),
+ Box(Box(4992, 4992), Box(4992, 4992)),
+ Box(Box(4993, 4993), Box(4993, 4993)),
+ Box(Box(4994, 4994), Box(4994, 4994)),
+ Box(Box(4995, 4995), Box(4995, 4995)),
+ Box(Box(4996, 4996), Box(4996, 4996)),
+ Box(Box(4997, 4997), Box(4997, 4997)),
+ Box(Box(4998, 4998), Box(4998, 4998)),
+ Box(Box(4999, 4999), Box(4999, 4999)),
+ Box(Box(5000, 5000), Box(5000, 5000)),
+ Box(Box(5001, 5001), Box(5001, 5001)),
+ Box(Box(5002, 5002), Box(5002, 5002)),
+ Box(Box(5003, 5003), Box(5003, 5003)),
+ Box(Box(5004, 5004), Box(5004, 5004)),
+ Box(Box(5005, 5005), Box(5005, 5005)),
+ Box(Box(5006, 5006), Box(5006, 5006)),
+ Box(Box(5007, 5007), Box(5007, 5007)),
+ Box(Box(5008, 5008), Box(5008, 5008)),
+ Box(Box(5009, 5009), Box(5009, 5009)),
+ Box(Box(5010, 5010), Box(5010, 5010)),
+ Box(Box(5011, 5011), Box(5011, 5011)),
+ Box(Box(5012, 5012), Box(5012, 5012)),
+ Box(Box(5013, 5013), Box(5013, 5013)),
+ Box(Box(5014, 5014), Box(5014, 5014)),
+ Box(Box(5015, 5015), Box(5015, 5015)),
+ Box(Box(5016, 5016), Box(5016, 5016)),
+ Box(Box(5017, 5017), Box(5017, 5017)),
+ Box(Box(5018, 5018), Box(5018, 5018)),
+ Box(Box(5019, 5019), Box(5019, 5019)),
+ Box(Box(5020, 5020), Box(5020, 5020)),
+ Box(Box(5021, 5021), Box(5021, 5021)),
+ Box(Box(5022, 5022), Box(5022, 5022)),
+ Box(Box(5023, 5023), Box(5023, 5023)),
+ Box(Box(5024, 5024), Box(5024, 5024)),
+ Box(Box(5025, 5025), Box(5025, 5025)),
+ Box(Box(5026, 5026), Box(5026, 5026)),
+ Box(Box(5027, 5027), Box(5027, 5027)),
+ Box(Box(5028, 5028), Box(5028, 5028)),
+ Box(Box(5029, 5029), Box(5029, 5029)),
+ Box(Box(5030, 5030), Box(5030, 5030)),
+ Box(Box(5031, 5031), Box(5031, 5031)),
+ Box(Box(5032, 5032), Box(5032, 5032)),
+ Box(Box(5033, 5033), Box(5033, 5033)),
+ Box(Box(5034, 5034), Box(5034, 5034)),
+ Box(Box(5035, 5035), Box(5035, 5035)),
+ Box(Box(5036, 5036), Box(5036, 5036)),
+ Box(Box(5037, 5037), Box(5037, 5037)),
+ Box(Box(5038, 5038), Box(5038, 5038)),
+ Box(Box(5039, 5039), Box(5039, 5039)),
+ Box(Box(5040, 5040), Box(5040, 5040)),
+ Box(Box(5041, 5041), Box(5041, 5041)),
+ Box(Box(5042, 5042), Box(5042, 5042)),
+ Box(Box(5043, 5043), Box(5043, 5043)),
+ Box(Box(5044, 5044), Box(5044, 5044)),
+ Box(Box(5045, 5045), Box(5045, 5045)),
+ Box(Box(5046, 5046), Box(5046, 5046)),
+ Box(Box(5047, 5047), Box(5047, 5047)),
+ Box(Box(5048, 5048), Box(5048, 5048)),
+ Box(Box(5049, 5049), Box(5049, 5049)),
+ Box(Box(5050, 5050), Box(5050, 5050)),
+ Box(Box(5051, 5051), Box(5051, 5051)),
+ Box(Box(5052, 5052), Box(5052, 5052)),
+ Box(Box(5053, 5053), Box(5053, 5053)),
+ Box(Box(5054, 5054), Box(5054, 5054)),
+ Box(Box(5055, 5055), Box(5055, 5055)),
+ Box(Box(5056, 5056), Box(5056, 5056)),
+ Box(Box(5057, 5057), Box(5057, 5057)),
+ Box(Box(5058, 5058), Box(5058, 5058)),
+ Box(Box(5059, 5059), Box(5059, 5059)),
+ Box(Box(5060, 5060), Box(5060, 5060)),
+ Box(Box(5061, 5061), Box(5061, 5061)),
+ Box(Box(5062, 5062), Box(5062, 5062)),
+ Box(Box(5063, 5063), Box(5063, 5063)),
+ Box(Box(5064, 5064), Box(5064, 5064)),
+ Box(Box(5065, 5065), Box(5065, 5065)),
+ Box(Box(5066, 5066), Box(5066, 5066)),
+ Box(Box(5067, 5067), Box(5067, 5067)),
+ Box(Box(5068, 5068), Box(5068, 5068)),
+ Box(Box(5069, 5069), Box(5069, 5069)),
+ Box(Box(5070, 5070), Box(5070, 5070)),
+ Box(Box(5071, 5071), Box(5071, 5071)),
+ Box(Box(5072, 5072), Box(5072, 5072)),
+ Box(Box(5073, 5073), Box(5073, 5073)),
+ Box(Box(5074, 5074), Box(5074, 5074)),
+ Box(Box(5075, 5075), Box(5075, 5075)),
+ Box(Box(5076, 5076), Box(5076, 5076)),
+ Box(Box(5077, 5077), Box(5077, 5077)),
+ Box(Box(5078, 5078), Box(5078, 5078)),
+ Box(Box(5079, 5079), Box(5079, 5079)),
+ Box(Box(5080, 5080), Box(5080, 5080)),
+ Box(Box(5081, 5081), Box(5081, 5081)),
+ Box(Box(5082, 5082), Box(5082, 5082)),
+ Box(Box(5083, 5083), Box(5083, 5083)),
+ Box(Box(5084, 5084), Box(5084, 5084)),
+ Box(Box(5085, 5085), Box(5085, 5085)),
+ Box(Box(5086, 5086), Box(5086, 5086)),
+ Box(Box(5087, 5087), Box(5087, 5087)),
+ Box(Box(5088, 5088), Box(5088, 5088)),
+ Box(Box(5089, 5089), Box(5089, 5089)),
+ Box(Box(5090, 5090), Box(5090, 5090)),
+ Box(Box(5091, 5091), Box(5091, 5091)),
+ Box(Box(5092, 5092), Box(5092, 5092)),
+ Box(Box(5093, 5093), Box(5093, 5093)),
+ Box(Box(5094, 5094), Box(5094, 5094)),
+ Box(Box(5095, 5095), Box(5095, 5095)),
+ Box(Box(5096, 5096), Box(5096, 5096)),
+ Box(Box(5097, 5097), Box(5097, 5097)),
+ Box(Box(5098, 5098), Box(5098, 5098)),
+ Box(Box(5099, 5099), Box(5099, 5099)),
+ Box(Box(5100, 5100), Box(5100, 5100)),
+ Box(Box(5101, 5101), Box(5101, 5101)),
+ Box(Box(5102, 5102), Box(5102, 5102)),
+ Box(Box(5103, 5103), Box(5103, 5103)),
+ Box(Box(5104, 5104), Box(5104, 5104)),
+ Box(Box(5105, 5105), Box(5105, 5105)),
+ Box(Box(5106, 5106), Box(5106, 5106)),
+ Box(Box(5107, 5107), Box(5107, 5107)),
+ Box(Box(5108, 5108), Box(5108, 5108)),
+ Box(Box(5109, 5109), Box(5109, 5109)),
+ Box(Box(5110, 5110), Box(5110, 5110)),
+ Box(Box(5111, 5111), Box(5111, 5111)),
+ Box(Box(5112, 5112), Box(5112, 5112)),
+ Box(Box(5113, 5113), Box(5113, 5113)),
+ Box(Box(5114, 5114), Box(5114, 5114)),
+ Box(Box(5115, 5115), Box(5115, 5115)),
+ Box(Box(5116, 5116), Box(5116, 5116)),
+ Box(Box(5117, 5117), Box(5117, 5117)),
+ Box(Box(5118, 5118), Box(5118, 5118)),
+ Box(Box(5119, 5119), Box(5119, 5119)),
+ Box(Box(5120, 5120), Box(5120, 5120)),
+ Box(Box(5121, 5121), Box(5121, 5121)),
+ Box(Box(5122, 5122), Box(5122, 5122)),
+ Box(Box(5123, 5123), Box(5123, 5123)),
+ Box(Box(5124, 5124), Box(5124, 5124)),
+ Box(Box(5125, 5125), Box(5125, 5125)),
+ Box(Box(5126, 5126), Box(5126, 5126)),
+ Box(Box(5127, 5127), Box(5127, 5127)),
+ Box(Box(5128, 5128), Box(5128, 5128)),
+ Box(Box(5129, 5129), Box(5129, 5129)),
+ Box(Box(5130, 5130), Box(5130, 5130)),
+ Box(Box(5131, 5131), Box(5131, 5131)),
+ Box(Box(5132, 5132), Box(5132, 5132)),
+ Box(Box(5133, 5133), Box(5133, 5133)),
+ Box(Box(5134, 5134), Box(5134, 5134)),
+ Box(Box(5135, 5135), Box(5135, 5135)),
+ Box(Box(5136, 5136), Box(5136, 5136)),
+ Box(Box(5137, 5137), Box(5137, 5137)),
+ Box(Box(5138, 5138), Box(5138, 5138)),
+ Box(Box(5139, 5139), Box(5139, 5139)),
+ Box(Box(5140, 5140), Box(5140, 5140)),
+ Box(Box(5141, 5141), Box(5141, 5141)),
+ Box(Box(5142, 5142), Box(5142, 5142)),
+ Box(Box(5143, 5143), Box(5143, 5143)),
+ Box(Box(5144, 5144), Box(5144, 5144)),
+ Box(Box(5145, 5145), Box(5145, 5145)),
+ Box(Box(5146, 5146), Box(5146, 5146)),
+ Box(Box(5147, 5147), Box(5147, 5147)),
+ Box(Box(5148, 5148), Box(5148, 5148)),
+ Box(Box(5149, 5149), Box(5149, 5149)),
+ Box(Box(5150, 5150), Box(5150, 5150)),
+ Box(Box(5151, 5151), Box(5151, 5151)),
+ Box(Box(5152, 5152), Box(5152, 5152)),
+ Box(Box(5153, 5153), Box(5153, 5153)),
+ Box(Box(5154, 5154), Box(5154, 5154)),
+ Box(Box(5155, 5155), Box(5155, 5155)),
+ Box(Box(5156, 5156), Box(5156, 5156)),
+ Box(Box(5157, 5157), Box(5157, 5157)),
+ Box(Box(5158, 5158), Box(5158, 5158)),
+ Box(Box(5159, 5159), Box(5159, 5159)),
+ Box(Box(5160, 5160), Box(5160, 5160)),
+ Box(Box(5161, 5161), Box(5161, 5161)),
+ Box(Box(5162, 5162), Box(5162, 5162)),
+ Box(Box(5163, 5163), Box(5163, 5163)),
+ Box(Box(5164, 5164), Box(5164, 5164)),
+ Box(Box(5165, 5165), Box(5165, 5165)),
+ Box(Box(5166, 5166), Box(5166, 5166)),
+ Box(Box(5167, 5167), Box(5167, 5167)),
+ Box(Box(5168, 5168), Box(5168, 5168)),
+ Box(Box(5169, 5169), Box(5169, 5169)),
+ Box(Box(5170, 5170), Box(5170, 5170)),
+ Box(Box(5171, 5171), Box(5171, 5171)),
+ Box(Box(5172, 5172), Box(5172, 5172)),
+ Box(Box(5173, 5173), Box(5173, 5173)),
+ Box(Box(5174, 5174), Box(5174, 5174)),
+ Box(Box(5175, 5175), Box(5175, 5175)),
+ Box(Box(5176, 5176), Box(5176, 5176)),
+ Box(Box(5177, 5177), Box(5177, 5177)),
+ Box(Box(5178, 5178), Box(5178, 5178)),
+ Box(Box(5179, 5179), Box(5179, 5179)),
+ Box(Box(5180, 5180), Box(5180, 5180)),
+ Box(Box(5181, 5181), Box(5181, 5181)),
+ Box(Box(5182, 5182), Box(5182, 5182)),
+ Box(Box(5183, 5183), Box(5183, 5183)),
+ Box(Box(5184, 5184), Box(5184, 5184)),
+ Box(Box(5185, 5185), Box(5185, 5185)),
+ Box(Box(5186, 5186), Box(5186, 5186)),
+ Box(Box(5187, 5187), Box(5187, 5187)),
+ Box(Box(5188, 5188), Box(5188, 5188)),
+ Box(Box(5189, 5189), Box(5189, 5189)),
+ Box(Box(5190, 5190), Box(5190, 5190)),
+ Box(Box(5191, 5191), Box(5191, 5191)),
+ Box(Box(5192, 5192), Box(5192, 5192)),
+ Box(Box(5193, 5193), Box(5193, 5193)),
+ Box(Box(5194, 5194), Box(5194, 5194)),
+ Box(Box(5195, 5195), Box(5195, 5195)),
+ Box(Box(5196, 5196), Box(5196, 5196)),
+ Box(Box(5197, 5197), Box(5197, 5197)),
+ Box(Box(5198, 5198), Box(5198, 5198)),
+ Box(Box(5199, 5199), Box(5199, 5199)),
+ Box(Box(5200, 5200), Box(5200, 5200)),
+ Box(Box(5201, 5201), Box(5201, 5201)),
+ Box(Box(5202, 5202), Box(5202, 5202)),
+ Box(Box(5203, 5203), Box(5203, 5203)),
+ Box(Box(5204, 5204), Box(5204, 5204)),
+ Box(Box(5205, 5205), Box(5205, 5205)),
+ Box(Box(5206, 5206), Box(5206, 5206)),
+ Box(Box(5207, 5207), Box(5207, 5207)),
+ Box(Box(5208, 5208), Box(5208, 5208)),
+ Box(Box(5209, 5209), Box(5209, 5209)),
+ Box(Box(5210, 5210), Box(5210, 5210)),
+ Box(Box(5211, 5211), Box(5211, 5211)),
+ Box(Box(5212, 5212), Box(5212, 5212)),
+ Box(Box(5213, 5213), Box(5213, 5213)),
+ Box(Box(5214, 5214), Box(5214, 5214)),
+ Box(Box(5215, 5215), Box(5215, 5215)),
+ Box(Box(5216, 5216), Box(5216, 5216)),
+ Box(Box(5217, 5217), Box(5217, 5217)),
+ Box(Box(5218, 5218), Box(5218, 5218)),
+ Box(Box(5219, 5219), Box(5219, 5219)),
+ Box(Box(5220, 5220), Box(5220, 5220)),
+ Box(Box(5221, 5221), Box(5221, 5221)),
+ Box(Box(5222, 5222), Box(5222, 5222)),
+ Box(Box(5223, 5223), Box(5223, 5223)),
+ Box(Box(5224, 5224), Box(5224, 5224)),
+ Box(Box(5225, 5225), Box(5225, 5225)),
+ Box(Box(5226, 5226), Box(5226, 5226)),
+ Box(Box(5227, 5227), Box(5227, 5227)),
+ Box(Box(5228, 5228), Box(5228, 5228)),
+ Box(Box(5229, 5229), Box(5229, 5229)),
+ Box(Box(5230, 5230), Box(5230, 5230)),
+ Box(Box(5231, 5231), Box(5231, 5231)),
+ Box(Box(5232, 5232), Box(5232, 5232)),
+ Box(Box(5233, 5233), Box(5233, 5233)),
+ Box(Box(5234, 5234), Box(5234, 5234)),
+ Box(Box(5235, 5235), Box(5235, 5235)),
+ Box(Box(5236, 5236), Box(5236, 5236)),
+ Box(Box(5237, 5237), Box(5237, 5237)),
+ Box(Box(5238, 5238), Box(5238, 5238)),
+ Box(Box(5239, 5239), Box(5239, 5239)),
+ Box(Box(5240, 5240), Box(5240, 5240)),
+ Box(Box(5241, 5241), Box(5241, 5241)),
+ Box(Box(5242, 5242), Box(5242, 5242)),
+ Box(Box(5243, 5243), Box(5243, 5243)),
+ Box(Box(5244, 5244), Box(5244, 5244)),
+ Box(Box(5245, 5245), Box(5245, 5245)),
+ Box(Box(5246, 5246), Box(5246, 5246)),
+ Box(Box(5247, 5247), Box(5247, 5247)),
+ Box(Box(5248, 5248), Box(5248, 5248)),
+ Box(Box(5249, 5249), Box(5249, 5249)),
+ Box(Box(5250, 5250), Box(5250, 5250)),
+ Box(Box(5251, 5251), Box(5251, 5251)),
+ Box(Box(5252, 5252), Box(5252, 5252)),
+ Box(Box(5253, 5253), Box(5253, 5253)),
+ Box(Box(5254, 5254), Box(5254, 5254)),
+ Box(Box(5255, 5255), Box(5255, 5255)),
+ Box(Box(5256, 5256), Box(5256, 5256)),
+ Box(Box(5257, 5257), Box(5257, 5257)),
+ Box(Box(5258, 5258), Box(5258, 5258)),
+ Box(Box(5259, 5259), Box(5259, 5259)),
+ Box(Box(5260, 5260), Box(5260, 5260)),
+ Box(Box(5261, 5261), Box(5261, 5261)),
+ Box(Box(5262, 5262), Box(5262, 5262)),
+ Box(Box(5263, 5263), Box(5263, 5263)),
+ Box(Box(5264, 5264), Box(5264, 5264)),
+ Box(Box(5265, 5265), Box(5265, 5265)),
+ Box(Box(5266, 5266), Box(5266, 5266)),
+ Box(Box(5267, 5267), Box(5267, 5267)),
+ Box(Box(5268, 5268), Box(5268, 5268)),
+ Box(Box(5269, 5269), Box(5269, 5269)),
+ Box(Box(5270, 5270), Box(5270, 5270)),
+ Box(Box(5271, 5271), Box(5271, 5271)),
+ Box(Box(5272, 5272), Box(5272, 5272)),
+ Box(Box(5273, 5273), Box(5273, 5273)),
+ Box(Box(5274, 5274), Box(5274, 5274)),
+ Box(Box(5275, 5275), Box(5275, 5275)),
+ Box(Box(5276, 5276), Box(5276, 5276)),
+ Box(Box(5277, 5277), Box(5277, 5277)),
+ Box(Box(5278, 5278), Box(5278, 5278)),
+ Box(Box(5279, 5279), Box(5279, 5279)),
+ Box(Box(5280, 5280), Box(5280, 5280)),
+ Box(Box(5281, 5281), Box(5281, 5281)),
+ Box(Box(5282, 5282), Box(5282, 5282)),
+ Box(Box(5283, 5283), Box(5283, 5283)),
+ Box(Box(5284, 5284), Box(5284, 5284)),
+ Box(Box(5285, 5285), Box(5285, 5285)),
+ Box(Box(5286, 5286), Box(5286, 5286)),
+ Box(Box(5287, 5287), Box(5287, 5287)),
+ Box(Box(5288, 5288), Box(5288, 5288)),
+ Box(Box(5289, 5289), Box(5289, 5289)),
+ Box(Box(5290, 5290), Box(5290, 5290)),
+ Box(Box(5291, 5291), Box(5291, 5291)),
+ Box(Box(5292, 5292), Box(5292, 5292)),
+ Box(Box(5293, 5293), Box(5293, 5293)),
+ Box(Box(5294, 5294), Box(5294, 5294)),
+ Box(Box(5295, 5295), Box(5295, 5295)),
+ Box(Box(5296, 5296), Box(5296, 5296)),
+ Box(Box(5297, 5297), Box(5297, 5297)),
+ Box(Box(5298, 5298), Box(5298, 5298)),
+ Box(Box(5299, 5299), Box(5299, 5299)),
+ Box(Box(5300, 5300), Box(5300, 5300)),
+ Box(Box(5301, 5301), Box(5301, 5301)),
+ Box(Box(5302, 5302), Box(5302, 5302)),
+ Box(Box(5303, 5303), Box(5303, 5303)),
+ Box(Box(5304, 5304), Box(5304, 5304)),
+ Box(Box(5305, 5305), Box(5305, 5305)),
+ Box(Box(5306, 5306), Box(5306, 5306)),
+ Box(Box(5307, 5307), Box(5307, 5307)),
+ Box(Box(5308, 5308), Box(5308, 5308)),
+ Box(Box(5309, 5309), Box(5309, 5309)),
+ Box(Box(5310, 5310), Box(5310, 5310)),
+ Box(Box(5311, 5311), Box(5311, 5311)),
+ Box(Box(5312, 5312), Box(5312, 5312)),
+ Box(Box(5313, 5313), Box(5313, 5313)),
+ Box(Box(5314, 5314), Box(5314, 5314)),
+ Box(Box(5315, 5315), Box(5315, 5315)),
+ Box(Box(5316, 5316), Box(5316, 5316)),
+ Box(Box(5317, 5317), Box(5317, 5317)),
+ Box(Box(5318, 5318), Box(5318, 5318)),
+ Box(Box(5319, 5319), Box(5319, 5319)),
+ Box(Box(5320, 5320), Box(5320, 5320)),
+ Box(Box(5321, 5321), Box(5321, 5321)),
+ Box(Box(5322, 5322), Box(5322, 5322)),
+ Box(Box(5323, 5323), Box(5323, 5323)),
+ Box(Box(5324, 5324), Box(5324, 5324)),
+ Box(Box(5325, 5325), Box(5325, 5325)),
+ Box(Box(5326, 5326), Box(5326, 5326)),
+ Box(Box(5327, 5327), Box(5327, 5327)),
+ Box(Box(5328, 5328), Box(5328, 5328)),
+ Box(Box(5329, 5329), Box(5329, 5329)),
+ Box(Box(5330, 5330), Box(5330, 5330)),
+ Box(Box(5331, 5331), Box(5331, 5331)),
+ Box(Box(5332, 5332), Box(5332, 5332)),
+ Box(Box(5333, 5333), Box(5333, 5333)),
+ Box(Box(5334, 5334), Box(5334, 5334)),
+ Box(Box(5335, 5335), Box(5335, 5335)),
+ Box(Box(5336, 5336), Box(5336, 5336)),
+ Box(Box(5337, 5337), Box(5337, 5337)),
+ Box(Box(5338, 5338), Box(5338, 5338)),
+ Box(Box(5339, 5339), Box(5339, 5339)),
+ Box(Box(5340, 5340), Box(5340, 5340)),
+ Box(Box(5341, 5341), Box(5341, 5341)),
+ Box(Box(5342, 5342), Box(5342, 5342)),
+ Box(Box(5343, 5343), Box(5343, 5343)),
+ Box(Box(5344, 5344), Box(5344, 5344)),
+ Box(Box(5345, 5345), Box(5345, 5345)),
+ Box(Box(5346, 5346), Box(5346, 5346)),
+ Box(Box(5347, 5347), Box(5347, 5347)),
+ Box(Box(5348, 5348), Box(5348, 5348)),
+ Box(Box(5349, 5349), Box(5349, 5349)),
+ Box(Box(5350, 5350), Box(5350, 5350)),
+ Box(Box(5351, 5351), Box(5351, 5351)),
+ Box(Box(5352, 5352), Box(5352, 5352)),
+ Box(Box(5353, 5353), Box(5353, 5353)),
+ Box(Box(5354, 5354), Box(5354, 5354)),
+ Box(Box(5355, 5355), Box(5355, 5355)),
+ Box(Box(5356, 5356), Box(5356, 5356)),
+ Box(Box(5357, 5357), Box(5357, 5357)),
+ Box(Box(5358, 5358), Box(5358, 5358)),
+ Box(Box(5359, 5359), Box(5359, 5359)),
+ Box(Box(5360, 5360), Box(5360, 5360)),
+ Box(Box(5361, 5361), Box(5361, 5361)),
+ Box(Box(5362, 5362), Box(5362, 5362)),
+ Box(Box(5363, 5363), Box(5363, 5363)),
+ Box(Box(5364, 5364), Box(5364, 5364)),
+ Box(Box(5365, 5365), Box(5365, 5365)),
+ Box(Box(5366, 5366), Box(5366, 5366)),
+ Box(Box(5367, 5367), Box(5367, 5367)),
+ Box(Box(5368, 5368), Box(5368, 5368)),
+ Box(Box(5369, 5369), Box(5369, 5369)),
+ Box(Box(5370, 5370), Box(5370, 5370)),
+ Box(Box(5371, 5371), Box(5371, 5371)),
+ Box(Box(5372, 5372), Box(5372, 5372)),
+ Box(Box(5373, 5373), Box(5373, 5373)),
+ Box(Box(5374, 5374), Box(5374, 5374)),
+ Box(Box(5375, 5375), Box(5375, 5375)),
+ Box(Box(5376, 5376), Box(5376, 5376)),
+ Box(Box(5377, 5377), Box(5377, 5377)),
+ Box(Box(5378, 5378), Box(5378, 5378)),
+ Box(Box(5379, 5379), Box(5379, 5379)),
+ Box(Box(5380, 5380), Box(5380, 5380)),
+ Box(Box(5381, 5381), Box(5381, 5381)),
+ Box(Box(5382, 5382), Box(5382, 5382)),
+ Box(Box(5383, 5383), Box(5383, 5383)),
+ Box(Box(5384, 5384), Box(5384, 5384)),
+ Box(Box(5385, 5385), Box(5385, 5385)),
+ Box(Box(5386, 5386), Box(5386, 5386)),
+ Box(Box(5387, 5387), Box(5387, 5387)),
+ Box(Box(5388, 5388), Box(5388, 5388)),
+ Box(Box(5389, 5389), Box(5389, 5389)),
+ Box(Box(5390, 5390), Box(5390, 5390)),
+ Box(Box(5391, 5391), Box(5391, 5391)),
+ Box(Box(5392, 5392), Box(5392, 5392)),
+ Box(Box(5393, 5393), Box(5393, 5393)),
+ Box(Box(5394, 5394), Box(5394, 5394)),
+ Box(Box(5395, 5395), Box(5395, 5395)),
+ Box(Box(5396, 5396), Box(5396, 5396)),
+ Box(Box(5397, 5397), Box(5397, 5397)),
+ Box(Box(5398, 5398), Box(5398, 5398)),
+ Box(Box(5399, 5399), Box(5399, 5399)),
+ Box(Box(5400, 5400), Box(5400, 5400)),
+ Box(Box(5401, 5401), Box(5401, 5401)),
+ Box(Box(5402, 5402), Box(5402, 5402)),
+ Box(Box(5403, 5403), Box(5403, 5403)),
+ Box(Box(5404, 5404), Box(5404, 5404)),
+ Box(Box(5405, 5405), Box(5405, 5405)),
+ Box(Box(5406, 5406), Box(5406, 5406)),
+ Box(Box(5407, 5407), Box(5407, 5407)),
+ Box(Box(5408, 5408), Box(5408, 5408)),
+ Box(Box(5409, 5409), Box(5409, 5409)),
+ Box(Box(5410, 5410), Box(5410, 5410)),
+ Box(Box(5411, 5411), Box(5411, 5411)),
+ Box(Box(5412, 5412), Box(5412, 5412)),
+ Box(Box(5413, 5413), Box(5413, 5413)),
+ Box(Box(5414, 5414), Box(5414, 5414)),
+ Box(Box(5415, 5415), Box(5415, 5415)),
+ Box(Box(5416, 5416), Box(5416, 5416)),
+ Box(Box(5417, 5417), Box(5417, 5417)),
+ Box(Box(5418, 5418), Box(5418, 5418)),
+ Box(Box(5419, 5419), Box(5419, 5419)),
+ Box(Box(5420, 5420), Box(5420, 5420)),
+ Box(Box(5421, 5421), Box(5421, 5421)),
+ Box(Box(5422, 5422), Box(5422, 5422)),
+ Box(Box(5423, 5423), Box(5423, 5423)),
+ Box(Box(5424, 5424), Box(5424, 5424)),
+ Box(Box(5425, 5425), Box(5425, 5425)),
+ Box(Box(5426, 5426), Box(5426, 5426)),
+ Box(Box(5427, 5427), Box(5427, 5427)),
+ Box(Box(5428, 5428), Box(5428, 5428)),
+ Box(Box(5429, 5429), Box(5429, 5429)),
+ Box(Box(5430, 5430), Box(5430, 5430)),
+ Box(Box(5431, 5431), Box(5431, 5431)),
+ Box(Box(5432, 5432), Box(5432, 5432)),
+ Box(Box(5433, 5433), Box(5433, 5433)),
+ Box(Box(5434, 5434), Box(5434, 5434)),
+ Box(Box(5435, 5435), Box(5435, 5435)),
+ Box(Box(5436, 5436), Box(5436, 5436)),
+ Box(Box(5437, 5437), Box(5437, 5437)),
+ Box(Box(5438, 5438), Box(5438, 5438)),
+ Box(Box(5439, 5439), Box(5439, 5439)),
+ Box(Box(5440, 5440), Box(5440, 5440)),
+ Box(Box(5441, 5441), Box(5441, 5441)),
+ Box(Box(5442, 5442), Box(5442, 5442)),
+ Box(Box(5443, 5443), Box(5443, 5443)),
+ Box(Box(5444, 5444), Box(5444, 5444)),
+ Box(Box(5445, 5445), Box(5445, 5445)),
+ Box(Box(5446, 5446), Box(5446, 5446)),
+ Box(Box(5447, 5447), Box(5447, 5447)),
+ Box(Box(5448, 5448), Box(5448, 5448)),
+ Box(Box(5449, 5449), Box(5449, 5449)),
+ Box(Box(5450, 5450), Box(5450, 5450)),
+ Box(Box(5451, 5451), Box(5451, 5451)),
+ Box(Box(5452, 5452), Box(5452, 5452)),
+ Box(Box(5453, 5453), Box(5453, 5453)),
+ Box(Box(5454, 5454), Box(5454, 5454)),
+ Box(Box(5455, 5455), Box(5455, 5455)),
+ Box(Box(5456, 5456), Box(5456, 5456)),
+ Box(Box(5457, 5457), Box(5457, 5457)),
+ Box(Box(5458, 5458), Box(5458, 5458)),
+ Box(Box(5459, 5459), Box(5459, 5459)),
+ Box(Box(5460, 5460), Box(5460, 5460)),
+ Box(Box(5461, 5461), Box(5461, 5461)),
+ Box(Box(5462, 5462), Box(5462, 5462)),
+ Box(Box(5463, 5463), Box(5463, 5463)),
+ Box(Box(5464, 5464), Box(5464, 5464)),
+ Box(Box(5465, 5465), Box(5465, 5465)),
+ Box(Box(5466, 5466), Box(5466, 5466)),
+ Box(Box(5467, 5467), Box(5467, 5467)),
+ Box(Box(5468, 5468), Box(5468, 5468)),
+ Box(Box(5469, 5469), Box(5469, 5469)),
+ Box(Box(5470, 5470), Box(5470, 5470)),
+ Box(Box(5471, 5471), Box(5471, 5471)),
+ Box(Box(5472, 5472), Box(5472, 5472)),
+ Box(Box(5473, 5473), Box(5473, 5473)),
+ Box(Box(5474, 5474), Box(5474, 5474)),
+ Box(Box(5475, 5475), Box(5475, 5475)),
+ Box(Box(5476, 5476), Box(5476, 5476)),
+ Box(Box(5477, 5477), Box(5477, 5477)),
+ Box(Box(5478, 5478), Box(5478, 5478)),
+ Box(Box(5479, 5479), Box(5479, 5479)),
+ Box(Box(5480, 5480), Box(5480, 5480)),
+ Box(Box(5481, 5481), Box(5481, 5481)),
+ Box(Box(5482, 5482), Box(5482, 5482)),
+ Box(Box(5483, 5483), Box(5483, 5483)),
+ Box(Box(5484, 5484), Box(5484, 5484)),
+ Box(Box(5485, 5485), Box(5485, 5485)),
+ Box(Box(5486, 5486), Box(5486, 5486)),
+ Box(Box(5487, 5487), Box(5487, 5487)),
+ Box(Box(5488, 5488), Box(5488, 5488)),
+ Box(Box(5489, 5489), Box(5489, 5489)),
+ Box(Box(5490, 5490), Box(5490, 5490)),
+ Box(Box(5491, 5491), Box(5491, 5491)),
+ Box(Box(5492, 5492), Box(5492, 5492)),
+ Box(Box(5493, 5493), Box(5493, 5493)),
+ Box(Box(5494, 5494), Box(5494, 5494)),
+ Box(Box(5495, 5495), Box(5495, 5495)),
+ Box(Box(5496, 5496), Box(5496, 5496)),
+ Box(Box(5497, 5497), Box(5497, 5497)),
+ Box(Box(5498, 5498), Box(5498, 5498)),
+ Box(Box(5499, 5499), Box(5499, 5499)),
+ Box(Box(5500, 5500), Box(5500, 5500)),
+ Box(Box(5501, 5501), Box(5501, 5501)),
+ Box(Box(5502, 5502), Box(5502, 5502)),
+ Box(Box(5503, 5503), Box(5503, 5503)),
+ Box(Box(5504, 5504), Box(5504, 5504)),
+ Box(Box(5505, 5505), Box(5505, 5505)),
+ Box(Box(5506, 5506), Box(5506, 5506)),
+ Box(Box(5507, 5507), Box(5507, 5507)),
+ Box(Box(5508, 5508), Box(5508, 5508)),
+ Box(Box(5509, 5509), Box(5509, 5509)),
+ Box(Box(5510, 5510), Box(5510, 5510)),
+ Box(Box(5511, 5511), Box(5511, 5511)),
+ Box(Box(5512, 5512), Box(5512, 5512)),
+ Box(Box(5513, 5513), Box(5513, 5513)),
+ Box(Box(5514, 5514), Box(5514, 5514)),
+ Box(Box(5515, 5515), Box(5515, 5515)),
+ Box(Box(5516, 5516), Box(5516, 5516)),
+ Box(Box(5517, 5517), Box(5517, 5517)),
+ Box(Box(5518, 5518), Box(5518, 5518)),
+ Box(Box(5519, 5519), Box(5519, 5519)),
+ Box(Box(5520, 5520), Box(5520, 5520)),
+ Box(Box(5521, 5521), Box(5521, 5521)),
+ Box(Box(5522, 5522), Box(5522, 5522)),
+ Box(Box(5523, 5523), Box(5523, 5523)),
+ Box(Box(5524, 5524), Box(5524, 5524)),
+ Box(Box(5525, 5525), Box(5525, 5525)),
+ Box(Box(5526, 5526), Box(5526, 5526)),
+ Box(Box(5527, 5527), Box(5527, 5527)),
+ Box(Box(5528, 5528), Box(5528, 5528)),
+ Box(Box(5529, 5529), Box(5529, 5529)),
+ Box(Box(5530, 5530), Box(5530, 5530)),
+ Box(Box(5531, 5531), Box(5531, 5531)),
+ Box(Box(5532, 5532), Box(5532, 5532)),
+ Box(Box(5533, 5533), Box(5533, 5533)),
+ Box(Box(5534, 5534), Box(5534, 5534)),
+ Box(Box(5535, 5535), Box(5535, 5535)),
+ Box(Box(5536, 5536), Box(5536, 5536)),
+ Box(Box(5537, 5537), Box(5537, 5537)),
+ Box(Box(5538, 5538), Box(5538, 5538)),
+ Box(Box(5539, 5539), Box(5539, 5539)),
+ Box(Box(5540, 5540), Box(5540, 5540)),
+ Box(Box(5541, 5541), Box(5541, 5541)),
+ Box(Box(5542, 5542), Box(5542, 5542)),
+ Box(Box(5543, 5543), Box(5543, 5543)),
+ Box(Box(5544, 5544), Box(5544, 5544)),
+ Box(Box(5545, 5545), Box(5545, 5545)),
+ Box(Box(5546, 5546), Box(5546, 5546)),
+ Box(Box(5547, 5547), Box(5547, 5547)),
+ Box(Box(5548, 5548), Box(5548, 5548)),
+ Box(Box(5549, 5549), Box(5549, 5549)),
+ Box(Box(5550, 5550), Box(5550, 5550)),
+ Box(Box(5551, 5551), Box(5551, 5551)),
+ Box(Box(5552, 5552), Box(5552, 5552)),
+ Box(Box(5553, 5553), Box(5553, 5553)),
+ Box(Box(5554, 5554), Box(5554, 5554)),
+ Box(Box(5555, 5555), Box(5555, 5555)),
+ Box(Box(5556, 5556), Box(5556, 5556)),
+ Box(Box(5557, 5557), Box(5557, 5557)),
+ Box(Box(5558, 5558), Box(5558, 5558)),
+ Box(Box(5559, 5559), Box(5559, 5559)),
+ Box(Box(5560, 5560), Box(5560, 5560)),
+ Box(Box(5561, 5561), Box(5561, 5561)),
+ Box(Box(5562, 5562), Box(5562, 5562)),
+ Box(Box(5563, 5563), Box(5563, 5563)),
+ Box(Box(5564, 5564), Box(5564, 5564)),
+ Box(Box(5565, 5565), Box(5565, 5565)),
+ Box(Box(5566, 5566), Box(5566, 5566)),
+ Box(Box(5567, 5567), Box(5567, 5567)),
+ Box(Box(5568, 5568), Box(5568, 5568)),
+ Box(Box(5569, 5569), Box(5569, 5569)),
+ Box(Box(5570, 5570), Box(5570, 5570)),
+ Box(Box(5571, 5571), Box(5571, 5571)),
+ Box(Box(5572, 5572), Box(5572, 5572)),
+ Box(Box(5573, 5573), Box(5573, 5573)),
+ Box(Box(5574, 5574), Box(5574, 5574)),
+ Box(Box(5575, 5575), Box(5575, 5575)),
+ Box(Box(5576, 5576), Box(5576, 5576)),
+ Box(Box(5577, 5577), Box(5577, 5577)),
+ Box(Box(5578, 5578), Box(5578, 5578)),
+ Box(Box(5579, 5579), Box(5579, 5579)),
+ Box(Box(5580, 5580), Box(5580, 5580)),
+ Box(Box(5581, 5581), Box(5581, 5581)),
+ Box(Box(5582, 5582), Box(5582, 5582)),
+ Box(Box(5583, 5583), Box(5583, 5583)),
+ Box(Box(5584, 5584), Box(5584, 5584)),
+ Box(Box(5585, 5585), Box(5585, 5585)),
+ Box(Box(5586, 5586), Box(5586, 5586)),
+ Box(Box(5587, 5587), Box(5587, 5587)),
+ Box(Box(5588, 5588), Box(5588, 5588)),
+ Box(Box(5589, 5589), Box(5589, 5589)),
+ Box(Box(5590, 5590), Box(5590, 5590)),
+ Box(Box(5591, 5591), Box(5591, 5591)),
+ Box(Box(5592, 5592), Box(5592, 5592)),
+ Box(Box(5593, 5593), Box(5593, 5593)),
+ Box(Box(5594, 5594), Box(5594, 5594)),
+ Box(Box(5595, 5595), Box(5595, 5595)),
+ Box(Box(5596, 5596), Box(5596, 5596)),
+ Box(Box(5597, 5597), Box(5597, 5597)),
+ Box(Box(5598, 5598), Box(5598, 5598)),
+ Box(Box(5599, 5599), Box(5599, 5599)),
+ Box(Box(5600, 5600), Box(5600, 5600)),
+ Box(Box(5601, 5601), Box(5601, 5601)),
+ Box(Box(5602, 5602), Box(5602, 5602)),
+ Box(Box(5603, 5603), Box(5603, 5603)),
+ Box(Box(5604, 5604), Box(5604, 5604)),
+ Box(Box(5605, 5605), Box(5605, 5605)),
+ Box(Box(5606, 5606), Box(5606, 5606)),
+ Box(Box(5607, 5607), Box(5607, 5607)),
+ Box(Box(5608, 5608), Box(5608, 5608)),
+ Box(Box(5609, 5609), Box(5609, 5609)),
+ Box(Box(5610, 5610), Box(5610, 5610)),
+ Box(Box(5611, 5611), Box(5611, 5611)),
+ Box(Box(5612, 5612), Box(5612, 5612)),
+ Box(Box(5613, 5613), Box(5613, 5613)),
+ Box(Box(5614, 5614), Box(5614, 5614)),
+ Box(Box(5615, 5615), Box(5615, 5615)),
+ Box(Box(5616, 5616), Box(5616, 5616)),
+ Box(Box(5617, 5617), Box(5617, 5617)),
+ Box(Box(5618, 5618), Box(5618, 5618)),
+ Box(Box(5619, 5619), Box(5619, 5619)),
+ Box(Box(5620, 5620), Box(5620, 5620)),
+ Box(Box(5621, 5621), Box(5621, 5621)),
+ Box(Box(5622, 5622), Box(5622, 5622)),
+ Box(Box(5623, 5623), Box(5623, 5623)),
+ Box(Box(5624, 5624), Box(5624, 5624)),
+ Box(Box(5625, 5625), Box(5625, 5625)),
+ Box(Box(5626, 5626), Box(5626, 5626)),
+ Box(Box(5627, 5627), Box(5627, 5627)),
+ Box(Box(5628, 5628), Box(5628, 5628)),
+ Box(Box(5629, 5629), Box(5629, 5629)),
+ Box(Box(5630, 5630), Box(5630, 5630)),
+ Box(Box(5631, 5631), Box(5631, 5631)),
+ Box(Box(5632, 5632), Box(5632, 5632)),
+ Box(Box(5633, 5633), Box(5633, 5633)),
+ Box(Box(5634, 5634), Box(5634, 5634)),
+ Box(Box(5635, 5635), Box(5635, 5635)),
+ Box(Box(5636, 5636), Box(5636, 5636)),
+ Box(Box(5637, 5637), Box(5637, 5637)),
+ Box(Box(5638, 5638), Box(5638, 5638)),
+ Box(Box(5639, 5639), Box(5639, 5639)),
+ Box(Box(5640, 5640), Box(5640, 5640)),
+ Box(Box(5641, 5641), Box(5641, 5641)),
+ Box(Box(5642, 5642), Box(5642, 5642)),
+ Box(Box(5643, 5643), Box(5643, 5643)),
+ Box(Box(5644, 5644), Box(5644, 5644)),
+ Box(Box(5645, 5645), Box(5645, 5645)),
+ Box(Box(5646, 5646), Box(5646, 5646)),
+ Box(Box(5647, 5647), Box(5647, 5647)),
+ Box(Box(5648, 5648), Box(5648, 5648)),
+ Box(Box(5649, 5649), Box(5649, 5649)),
+ Box(Box(5650, 5650), Box(5650, 5650)),
+ Box(Box(5651, 5651), Box(5651, 5651)),
+ Box(Box(5652, 5652), Box(5652, 5652)),
+ Box(Box(5653, 5653), Box(5653, 5653)),
+ Box(Box(5654, 5654), Box(5654, 5654)),
+ Box(Box(5655, 5655), Box(5655, 5655)),
+ Box(Box(5656, 5656), Box(5656, 5656)),
+ Box(Box(5657, 5657), Box(5657, 5657)),
+ Box(Box(5658, 5658), Box(5658, 5658)),
+ Box(Box(5659, 5659), Box(5659, 5659)),
+ Box(Box(5660, 5660), Box(5660, 5660)),
+ Box(Box(5661, 5661), Box(5661, 5661)),
+ Box(Box(5662, 5662), Box(5662, 5662)),
+ Box(Box(5663, 5663), Box(5663, 5663)),
+ Box(Box(5664, 5664), Box(5664, 5664)),
+ Box(Box(5665, 5665), Box(5665, 5665)),
+ Box(Box(5666, 5666), Box(5666, 5666)),
+ Box(Box(5667, 5667), Box(5667, 5667)),
+ Box(Box(5668, 5668), Box(5668, 5668)),
+ Box(Box(5669, 5669), Box(5669, 5669)),
+ Box(Box(5670, 5670), Box(5670, 5670)),
+ Box(Box(5671, 5671), Box(5671, 5671)),
+ Box(Box(5672, 5672), Box(5672, 5672)),
+ Box(Box(5673, 5673), Box(5673, 5673)),
+ Box(Box(5674, 5674), Box(5674, 5674)),
+ Box(Box(5675, 5675), Box(5675, 5675)),
+ Box(Box(5676, 5676), Box(5676, 5676)),
+ Box(Box(5677, 5677), Box(5677, 5677)),
+ Box(Box(5678, 5678), Box(5678, 5678)),
+ Box(Box(5679, 5679), Box(5679, 5679)),
+ Box(Box(5680, 5680), Box(5680, 5680)),
+ Box(Box(5681, 5681), Box(5681, 5681)),
+ Box(Box(5682, 5682), Box(5682, 5682)),
+ Box(Box(5683, 5683), Box(5683, 5683)),
+ Box(Box(5684, 5684), Box(5684, 5684)),
+ Box(Box(5685, 5685), Box(5685, 5685)),
+ Box(Box(5686, 5686), Box(5686, 5686)),
+ Box(Box(5687, 5687), Box(5687, 5687)),
+ Box(Box(5688, 5688), Box(5688, 5688)),
+ Box(Box(5689, 5689), Box(5689, 5689)),
+ Box(Box(5690, 5690), Box(5690, 5690)),
+ Box(Box(5691, 5691), Box(5691, 5691)),
+ Box(Box(5692, 5692), Box(5692, 5692)),
+ Box(Box(5693, 5693), Box(5693, 5693)),
+ Box(Box(5694, 5694), Box(5694, 5694)),
+ Box(Box(5695, 5695), Box(5695, 5695)),
+ Box(Box(5696, 5696), Box(5696, 5696)),
+ Box(Box(5697, 5697), Box(5697, 5697)),
+ Box(Box(5698, 5698), Box(5698, 5698)),
+ Box(Box(5699, 5699), Box(5699, 5699)),
+ Box(Box(5700, 5700), Box(5700, 5700)),
+ Box(Box(5701, 5701), Box(5701, 5701)),
+ Box(Box(5702, 5702), Box(5702, 5702)),
+ Box(Box(5703, 5703), Box(5703, 5703)),
+ Box(Box(5704, 5704), Box(5704, 5704)),
+ Box(Box(5705, 5705), Box(5705, 5705)),
+ Box(Box(5706, 5706), Box(5706, 5706)),
+ Box(Box(5707, 5707), Box(5707, 5707)),
+ Box(Box(5708, 5708), Box(5708, 5708)),
+ Box(Box(5709, 5709), Box(5709, 5709)),
+ Box(Box(5710, 5710), Box(5710, 5710)),
+ Box(Box(5711, 5711), Box(5711, 5711)),
+ Box(Box(5712, 5712), Box(5712, 5712)),
+ Box(Box(5713, 5713), Box(5713, 5713)),
+ Box(Box(5714, 5714), Box(5714, 5714)),
+ Box(Box(5715, 5715), Box(5715, 5715)),
+ Box(Box(5716, 5716), Box(5716, 5716)),
+ Box(Box(5717, 5717), Box(5717, 5717)),
+ Box(Box(5718, 5718), Box(5718, 5718)),
+ Box(Box(5719, 5719), Box(5719, 5719)),
+ Box(Box(5720, 5720), Box(5720, 5720)),
+ Box(Box(5721, 5721), Box(5721, 5721)),
+ Box(Box(5722, 5722), Box(5722, 5722)),
+ Box(Box(5723, 5723), Box(5723, 5723)),
+ Box(Box(5724, 5724), Box(5724, 5724)),
+ Box(Box(5725, 5725), Box(5725, 5725)),
+ Box(Box(5726, 5726), Box(5726, 5726)),
+ Box(Box(5727, 5727), Box(5727, 5727)),
+ Box(Box(5728, 5728), Box(5728, 5728)),
+ Box(Box(5729, 5729), Box(5729, 5729)),
+ Box(Box(5730, 5730), Box(5730, 5730)),
+ Box(Box(5731, 5731), Box(5731, 5731)),
+ Box(Box(5732, 5732), Box(5732, 5732)),
+ Box(Box(5733, 5733), Box(5733, 5733)),
+ Box(Box(5734, 5734), Box(5734, 5734)),
+ Box(Box(5735, 5735), Box(5735, 5735)),
+ Box(Box(5736, 5736), Box(5736, 5736)),
+ Box(Box(5737, 5737), Box(5737, 5737)),
+ Box(Box(5738, 5738), Box(5738, 5738)),
+ Box(Box(5739, 5739), Box(5739, 5739)),
+ Box(Box(5740, 5740), Box(5740, 5740)),
+ Box(Box(5741, 5741), Box(5741, 5741)),
+ Box(Box(5742, 5742), Box(5742, 5742)),
+ Box(Box(5743, 5743), Box(5743, 5743)),
+ Box(Box(5744, 5744), Box(5744, 5744)),
+ Box(Box(5745, 5745), Box(5745, 5745)),
+ Box(Box(5746, 5746), Box(5746, 5746)),
+ Box(Box(5747, 5747), Box(5747, 5747)),
+ Box(Box(5748, 5748), Box(5748, 5748)),
+ Box(Box(5749, 5749), Box(5749, 5749)),
+ Box(Box(5750, 5750), Box(5750, 5750)),
+ Box(Box(5751, 5751), Box(5751, 5751)),
+ Box(Box(5752, 5752), Box(5752, 5752)),
+ Box(Box(5753, 5753), Box(5753, 5753)),
+ Box(Box(5754, 5754), Box(5754, 5754)),
+ Box(Box(5755, 5755), Box(5755, 5755)),
+ Box(Box(5756, 5756), Box(5756, 5756)),
+ Box(Box(5757, 5757), Box(5757, 5757)),
+ Box(Box(5758, 5758), Box(5758, 5758)),
+ Box(Box(5759, 5759), Box(5759, 5759)),
+ Box(Box(5760, 5760), Box(5760, 5760)),
+ Box(Box(5761, 5761), Box(5761, 5761)),
+ Box(Box(5762, 5762), Box(5762, 5762)),
+ Box(Box(5763, 5763), Box(5763, 5763)),
+ Box(Box(5764, 5764), Box(5764, 5764)),
+ Box(Box(5765, 5765), Box(5765, 5765)),
+ Box(Box(5766, 5766), Box(5766, 5766)),
+ Box(Box(5767, 5767), Box(5767, 5767)),
+ Box(Box(5768, 5768), Box(5768, 5768)),
+ Box(Box(5769, 5769), Box(5769, 5769)),
+ Box(Box(5770, 5770), Box(5770, 5770)),
+ Box(Box(5771, 5771), Box(5771, 5771)),
+ Box(Box(5772, 5772), Box(5772, 5772)),
+ Box(Box(5773, 5773), Box(5773, 5773)),
+ Box(Box(5774, 5774), Box(5774, 5774)),
+ Box(Box(5775, 5775), Box(5775, 5775)),
+ Box(Box(5776, 5776), Box(5776, 5776)),
+ Box(Box(5777, 5777), Box(5777, 5777)),
+ Box(Box(5778, 5778), Box(5778, 5778)),
+ Box(Box(5779, 5779), Box(5779, 5779)),
+ Box(Box(5780, 5780), Box(5780, 5780)),
+ Box(Box(5781, 5781), Box(5781, 5781)),
+ Box(Box(5782, 5782), Box(5782, 5782)),
+ Box(Box(5783, 5783), Box(5783, 5783)),
+ Box(Box(5784, 5784), Box(5784, 5784)),
+ Box(Box(5785, 5785), Box(5785, 5785)),
+ Box(Box(5786, 5786), Box(5786, 5786)),
+ Box(Box(5787, 5787), Box(5787, 5787)),
+ Box(Box(5788, 5788), Box(5788, 5788)),
+ Box(Box(5789, 5789), Box(5789, 5789)),
+ Box(Box(5790, 5790), Box(5790, 5790)),
+ Box(Box(5791, 5791), Box(5791, 5791)),
+ Box(Box(5792, 5792), Box(5792, 5792)),
+ Box(Box(5793, 5793), Box(5793, 5793)),
+ Box(Box(5794, 5794), Box(5794, 5794)),
+ Box(Box(5795, 5795), Box(5795, 5795)),
+ Box(Box(5796, 5796), Box(5796, 5796)),
+ Box(Box(5797, 5797), Box(5797, 5797)),
+ Box(Box(5798, 5798), Box(5798, 5798)),
+ Box(Box(5799, 5799), Box(5799, 5799)),
+ Box(Box(5800, 5800), Box(5800, 5800)),
+ Box(Box(5801, 5801), Box(5801, 5801)),
+ Box(Box(5802, 5802), Box(5802, 5802)),
+ Box(Box(5803, 5803), Box(5803, 5803)),
+ Box(Box(5804, 5804), Box(5804, 5804)),
+ Box(Box(5805, 5805), Box(5805, 5805)),
+ Box(Box(5806, 5806), Box(5806, 5806)),
+ Box(Box(5807, 5807), Box(5807, 5807)),
+ Box(Box(5808, 5808), Box(5808, 5808)),
+ Box(Box(5809, 5809), Box(5809, 5809)),
+ Box(Box(5810, 5810), Box(5810, 5810)),
+ Box(Box(5811, 5811), Box(5811, 5811)),
+ Box(Box(5812, 5812), Box(5812, 5812)),
+ Box(Box(5813, 5813), Box(5813, 5813)),
+ Box(Box(5814, 5814), Box(5814, 5814)),
+ Box(Box(5815, 5815), Box(5815, 5815)),
+ Box(Box(5816, 5816), Box(5816, 5816)),
+ Box(Box(5817, 5817), Box(5817, 5817)),
+ Box(Box(5818, 5818), Box(5818, 5818)),
+ Box(Box(5819, 5819), Box(5819, 5819)),
+ Box(Box(5820, 5820), Box(5820, 5820)),
+ Box(Box(5821, 5821), Box(5821, 5821)),
+ Box(Box(5822, 5822), Box(5822, 5822)),
+ Box(Box(5823, 5823), Box(5823, 5823)),
+ Box(Box(5824, 5824), Box(5824, 5824)),
+ Box(Box(5825, 5825), Box(5825, 5825)),
+ Box(Box(5826, 5826), Box(5826, 5826)),
+ Box(Box(5827, 5827), Box(5827, 5827)),
+ Box(Box(5828, 5828), Box(5828, 5828)),
+ Box(Box(5829, 5829), Box(5829, 5829)),
+ Box(Box(5830, 5830), Box(5830, 5830)),
+ Box(Box(5831, 5831), Box(5831, 5831)),
+ Box(Box(5832, 5832), Box(5832, 5832)),
+ Box(Box(5833, 5833), Box(5833, 5833)),
+ Box(Box(5834, 5834), Box(5834, 5834)),
+ Box(Box(5835, 5835), Box(5835, 5835)),
+ Box(Box(5836, 5836), Box(5836, 5836)),
+ Box(Box(5837, 5837), Box(5837, 5837)),
+ Box(Box(5838, 5838), Box(5838, 5838)),
+ Box(Box(5839, 5839), Box(5839, 5839)),
+ Box(Box(5840, 5840), Box(5840, 5840)),
+ Box(Box(5841, 5841), Box(5841, 5841)),
+ Box(Box(5842, 5842), Box(5842, 5842)),
+ Box(Box(5843, 5843), Box(5843, 5843)),
+ Box(Box(5844, 5844), Box(5844, 5844)),
+ Box(Box(5845, 5845), Box(5845, 5845)),
+ Box(Box(5846, 5846), Box(5846, 5846)),
+ Box(Box(5847, 5847), Box(5847, 5847)),
+ Box(Box(5848, 5848), Box(5848, 5848)),
+ Box(Box(5849, 5849), Box(5849, 5849)),
+ Box(Box(5850, 5850), Box(5850, 5850)),
+ Box(Box(5851, 5851), Box(5851, 5851)),
+ Box(Box(5852, 5852), Box(5852, 5852)),
+ Box(Box(5853, 5853), Box(5853, 5853)),
+ Box(Box(5854, 5854), Box(5854, 5854)),
+ Box(Box(5855, 5855), Box(5855, 5855)),
+ Box(Box(5856, 5856), Box(5856, 5856)),
+ Box(Box(5857, 5857), Box(5857, 5857)),
+ Box(Box(5858, 5858), Box(5858, 5858)),
+ Box(Box(5859, 5859), Box(5859, 5859)),
+ Box(Box(5860, 5860), Box(5860, 5860)),
+ Box(Box(5861, 5861), Box(5861, 5861)),
+ Box(Box(5862, 5862), Box(5862, 5862)),
+ Box(Box(5863, 5863), Box(5863, 5863)),
+ Box(Box(5864, 5864), Box(5864, 5864)),
+ Box(Box(5865, 5865), Box(5865, 5865)),
+ Box(Box(5866, 5866), Box(5866, 5866)),
+ Box(Box(5867, 5867), Box(5867, 5867)),
+ Box(Box(5868, 5868), Box(5868, 5868)),
+ Box(Box(5869, 5869), Box(5869, 5869)),
+ Box(Box(5870, 5870), Box(5870, 5870)),
+ Box(Box(5871, 5871), Box(5871, 5871)),
+ Box(Box(5872, 5872), Box(5872, 5872)),
+ Box(Box(5873, 5873), Box(5873, 5873)),
+ Box(Box(5874, 5874), Box(5874, 5874)),
+ Box(Box(5875, 5875), Box(5875, 5875)),
+ Box(Box(5876, 5876), Box(5876, 5876)),
+ Box(Box(5877, 5877), Box(5877, 5877)),
+ Box(Box(5878, 5878), Box(5878, 5878)),
+ Box(Box(5879, 5879), Box(5879, 5879)),
+ Box(Box(5880, 5880), Box(5880, 5880)),
+ Box(Box(5881, 5881), Box(5881, 5881)),
+ Box(Box(5882, 5882), Box(5882, 5882)),
+ Box(Box(5883, 5883), Box(5883, 5883)),
+ Box(Box(5884, 5884), Box(5884, 5884)),
+ Box(Box(5885, 5885), Box(5885, 5885)),
+ Box(Box(5886, 5886), Box(5886, 5886)),
+ Box(Box(5887, 5887), Box(5887, 5887)),
+ Box(Box(5888, 5888), Box(5888, 5888)),
+ Box(Box(5889, 5889), Box(5889, 5889)),
+ Box(Box(5890, 5890), Box(5890, 5890)),
+ Box(Box(5891, 5891), Box(5891, 5891)),
+ Box(Box(5892, 5892), Box(5892, 5892)),
+ Box(Box(5893, 5893), Box(5893, 5893)),
+ Box(Box(5894, 5894), Box(5894, 5894)),
+ Box(Box(5895, 5895), Box(5895, 5895)),
+ Box(Box(5896, 5896), Box(5896, 5896)),
+ Box(Box(5897, 5897), Box(5897, 5897)),
+ Box(Box(5898, 5898), Box(5898, 5898)),
+ Box(Box(5899, 5899), Box(5899, 5899)),
+ Box(Box(5900, 5900), Box(5900, 5900)),
+ Box(Box(5901, 5901), Box(5901, 5901)),
+ Box(Box(5902, 5902), Box(5902, 5902)),
+ Box(Box(5903, 5903), Box(5903, 5903)),
+ Box(Box(5904, 5904), Box(5904, 5904)),
+ Box(Box(5905, 5905), Box(5905, 5905)),
+ Box(Box(5906, 5906), Box(5906, 5906)),
+ Box(Box(5907, 5907), Box(5907, 5907)),
+ Box(Box(5908, 5908), Box(5908, 5908)),
+ Box(Box(5909, 5909), Box(5909, 5909)),
+ Box(Box(5910, 5910), Box(5910, 5910)),
+ Box(Box(5911, 5911), Box(5911, 5911)),
+ Box(Box(5912, 5912), Box(5912, 5912)),
+ Box(Box(5913, 5913), Box(5913, 5913)),
+ Box(Box(5914, 5914), Box(5914, 5914)),
+ Box(Box(5915, 5915), Box(5915, 5915)),
+ Box(Box(5916, 5916), Box(5916, 5916)),
+ Box(Box(5917, 5917), Box(5917, 5917)),
+ Box(Box(5918, 5918), Box(5918, 5918)),
+ Box(Box(5919, 5919), Box(5919, 5919)),
+ Box(Box(5920, 5920), Box(5920, 5920)),
+ Box(Box(5921, 5921), Box(5921, 5921)),
+ Box(Box(5922, 5922), Box(5922, 5922)),
+ Box(Box(5923, 5923), Box(5923, 5923)),
+ Box(Box(5924, 5924), Box(5924, 5924)),
+ Box(Box(5925, 5925), Box(5925, 5925)),
+ Box(Box(5926, 5926), Box(5926, 5926)),
+ Box(Box(5927, 5927), Box(5927, 5927)),
+ Box(Box(5928, 5928), Box(5928, 5928)),
+ Box(Box(5929, 5929), Box(5929, 5929)),
+ Box(Box(5930, 5930), Box(5930, 5930)),
+ Box(Box(5931, 5931), Box(5931, 5931)),
+ Box(Box(5932, 5932), Box(5932, 5932)),
+ Box(Box(5933, 5933), Box(5933, 5933)),
+ Box(Box(5934, 5934), Box(5934, 5934)),
+ Box(Box(5935, 5935), Box(5935, 5935)),
+ Box(Box(5936, 5936), Box(5936, 5936)),
+ Box(Box(5937, 5937), Box(5937, 5937)),
+ Box(Box(5938, 5938), Box(5938, 5938)),
+ Box(Box(5939, 5939), Box(5939, 5939)),
+ Box(Box(5940, 5940), Box(5940, 5940)),
+ Box(Box(5941, 5941), Box(5941, 5941)),
+ Box(Box(5942, 5942), Box(5942, 5942)),
+ Box(Box(5943, 5943), Box(5943, 5943)),
+ Box(Box(5944, 5944), Box(5944, 5944)),
+ Box(Box(5945, 5945), Box(5945, 5945)),
+ Box(Box(5946, 5946), Box(5946, 5946)),
+ Box(Box(5947, 5947), Box(5947, 5947)),
+ Box(Box(5948, 5948), Box(5948, 5948)),
+ Box(Box(5949, 5949), Box(5949, 5949)),
+ Box(Box(5950, 5950), Box(5950, 5950)),
+ Box(Box(5951, 5951), Box(5951, 5951)),
+ Box(Box(5952, 5952), Box(5952, 5952)),
+ Box(Box(5953, 5953), Box(5953, 5953)),
+ Box(Box(5954, 5954), Box(5954, 5954)),
+ Box(Box(5955, 5955), Box(5955, 5955)),
+ Box(Box(5956, 5956), Box(5956, 5956)),
+ Box(Box(5957, 5957), Box(5957, 5957)),
+ Box(Box(5958, 5958), Box(5958, 5958)),
+ Box(Box(5959, 5959), Box(5959, 5959)),
+ Box(Box(5960, 5960), Box(5960, 5960)),
+ Box(Box(5961, 5961), Box(5961, 5961)),
+ Box(Box(5962, 5962), Box(5962, 5962)),
+ Box(Box(5963, 5963), Box(5963, 5963)),
+ Box(Box(5964, 5964), Box(5964, 5964)),
+ Box(Box(5965, 5965), Box(5965, 5965)),
+ Box(Box(5966, 5966), Box(5966, 5966)),
+ Box(Box(5967, 5967), Box(5967, 5967)),
+ Box(Box(5968, 5968), Box(5968, 5968)),
+ Box(Box(5969, 5969), Box(5969, 5969)),
+ Box(Box(5970, 5970), Box(5970, 5970)),
+ Box(Box(5971, 5971), Box(5971, 5971)),
+ Box(Box(5972, 5972), Box(5972, 5972)),
+ Box(Box(5973, 5973), Box(5973, 5973)),
+ Box(Box(5974, 5974), Box(5974, 5974)),
+ Box(Box(5975, 5975), Box(5975, 5975)),
+ Box(Box(5976, 5976), Box(5976, 5976)),
+ Box(Box(5977, 5977), Box(5977, 5977)),
+ Box(Box(5978, 5978), Box(5978, 5978)),
+ Box(Box(5979, 5979), Box(5979, 5979)),
+ Box(Box(5980, 5980), Box(5980, 5980)),
+ Box(Box(5981, 5981), Box(5981, 5981)),
+ Box(Box(5982, 5982), Box(5982, 5982)),
+ Box(Box(5983, 5983), Box(5983, 5983)),
+ Box(Box(5984, 5984), Box(5984, 5984)),
+ Box(Box(5985, 5985), Box(5985, 5985)),
+ Box(Box(5986, 5986), Box(5986, 5986)),
+ Box(Box(5987, 5987), Box(5987, 5987)),
+ Box(Box(5988, 5988), Box(5988, 5988)),
+ Box(Box(5989, 5989), Box(5989, 5989)),
+ Box(Box(5990, 5990), Box(5990, 5990)),
+ Box(Box(5991, 5991), Box(5991, 5991)),
+ Box(Box(5992, 5992), Box(5992, 5992)),
+ Box(Box(5993, 5993), Box(5993, 5993)),
+ Box(Box(5994, 5994), Box(5994, 5994)),
+ Box(Box(5995, 5995), Box(5995, 5995)),
+ Box(Box(5996, 5996), Box(5996, 5996)),
+ Box(Box(5997, 5997), Box(5997, 5997)),
+ Box(Box(5998, 5998), Box(5998, 5998)),
+ Box(Box(5999, 5999), Box(5999, 5999)),
+ Box(Box(6000, 6000), Box(6000, 6000)),
+ Box(Box(6001, 6001), Box(6001, 6001)),
+ Box(Box(6002, 6002), Box(6002, 6002)),
+ Box(Box(6003, 6003), Box(6003, 6003)),
+ Box(Box(6004, 6004), Box(6004, 6004)),
+ Box(Box(6005, 6005), Box(6005, 6005)),
+ Box(Box(6006, 6006), Box(6006, 6006)),
+ Box(Box(6007, 6007), Box(6007, 6007)),
+ Box(Box(6008, 6008), Box(6008, 6008)),
+ Box(Box(6009, 6009), Box(6009, 6009)),
+ Box(Box(6010, 6010), Box(6010, 6010)),
+ Box(Box(6011, 6011), Box(6011, 6011)),
+ Box(Box(6012, 6012), Box(6012, 6012)),
+ Box(Box(6013, 6013), Box(6013, 6013)),
+ Box(Box(6014, 6014), Box(6014, 6014)),
+ Box(Box(6015, 6015), Box(6015, 6015)),
+ Box(Box(6016, 6016), Box(6016, 6016)),
+ Box(Box(6017, 6017), Box(6017, 6017)),
+ Box(Box(6018, 6018), Box(6018, 6018)),
+ Box(Box(6019, 6019), Box(6019, 6019)),
+ Box(Box(6020, 6020), Box(6020, 6020)),
+ Box(Box(6021, 6021), Box(6021, 6021)),
+ Box(Box(6022, 6022), Box(6022, 6022)),
+ Box(Box(6023, 6023), Box(6023, 6023)),
+ Box(Box(6024, 6024), Box(6024, 6024)),
+ Box(Box(6025, 6025), Box(6025, 6025)),
+ Box(Box(6026, 6026), Box(6026, 6026)),
+ Box(Box(6027, 6027), Box(6027, 6027)),
+ Box(Box(6028, 6028), Box(6028, 6028)),
+ Box(Box(6029, 6029), Box(6029, 6029)),
+ Box(Box(6030, 6030), Box(6030, 6030)),
+ Box(Box(6031, 6031), Box(6031, 6031)),
+ Box(Box(6032, 6032), Box(6032, 6032)),
+ Box(Box(6033, 6033), Box(6033, 6033)),
+ Box(Box(6034, 6034), Box(6034, 6034)),
+ Box(Box(6035, 6035), Box(6035, 6035)),
+ Box(Box(6036, 6036), Box(6036, 6036)),
+ Box(Box(6037, 6037), Box(6037, 6037)),
+ Box(Box(6038, 6038), Box(6038, 6038)),
+ Box(Box(6039, 6039), Box(6039, 6039)),
+ Box(Box(6040, 6040), Box(6040, 6040)),
+ Box(Box(6041, 6041), Box(6041, 6041)),
+ Box(Box(6042, 6042), Box(6042, 6042)),
+ Box(Box(6043, 6043), Box(6043, 6043)),
+ Box(Box(6044, 6044), Box(6044, 6044)),
+ Box(Box(6045, 6045), Box(6045, 6045)),
+ Box(Box(6046, 6046), Box(6046, 6046)),
+ Box(Box(6047, 6047), Box(6047, 6047)),
+ Box(Box(6048, 6048), Box(6048, 6048)),
+ Box(Box(6049, 6049), Box(6049, 6049)),
+ Box(Box(6050, 6050), Box(6050, 6050)),
+ Box(Box(6051, 6051), Box(6051, 6051)),
+ Box(Box(6052, 6052), Box(6052, 6052)),
+ Box(Box(6053, 6053), Box(6053, 6053)),
+ Box(Box(6054, 6054), Box(6054, 6054)),
+ Box(Box(6055, 6055), Box(6055, 6055)),
+ Box(Box(6056, 6056), Box(6056, 6056)),
+ Box(Box(6057, 6057), Box(6057, 6057)),
+ Box(Box(6058, 6058), Box(6058, 6058)),
+ Box(Box(6059, 6059), Box(6059, 6059)),
+ Box(Box(6060, 6060), Box(6060, 6060)),
+ Box(Box(6061, 6061), Box(6061, 6061)),
+ Box(Box(6062, 6062), Box(6062, 6062)),
+ Box(Box(6063, 6063), Box(6063, 6063)),
+ Box(Box(6064, 6064), Box(6064, 6064)),
+ Box(Box(6065, 6065), Box(6065, 6065)),
+ Box(Box(6066, 6066), Box(6066, 6066)),
+ Box(Box(6067, 6067), Box(6067, 6067)),
+ Box(Box(6068, 6068), Box(6068, 6068)),
+ Box(Box(6069, 6069), Box(6069, 6069)),
+ Box(Box(6070, 6070), Box(6070, 6070)),
+ Box(Box(6071, 6071), Box(6071, 6071)),
+ Box(Box(6072, 6072), Box(6072, 6072)),
+ Box(Box(6073, 6073), Box(6073, 6073)),
+ Box(Box(6074, 6074), Box(6074, 6074)),
+ Box(Box(6075, 6075), Box(6075, 6075)),
+ Box(Box(6076, 6076), Box(6076, 6076)),
+ Box(Box(6077, 6077), Box(6077, 6077)),
+ Box(Box(6078, 6078), Box(6078, 6078)),
+ Box(Box(6079, 6079), Box(6079, 6079)),
+ Box(Box(6080, 6080), Box(6080, 6080)),
+ Box(Box(6081, 6081), Box(6081, 6081)),
+ Box(Box(6082, 6082), Box(6082, 6082)),
+ Box(Box(6083, 6083), Box(6083, 6083)),
+ Box(Box(6084, 6084), Box(6084, 6084)),
+ Box(Box(6085, 6085), Box(6085, 6085)),
+ Box(Box(6086, 6086), Box(6086, 6086)),
+ Box(Box(6087, 6087), Box(6087, 6087)),
+ Box(Box(6088, 6088), Box(6088, 6088)),
+ Box(Box(6089, 6089), Box(6089, 6089)),
+ Box(Box(6090, 6090), Box(6090, 6090)),
+ Box(Box(6091, 6091), Box(6091, 6091)),
+ Box(Box(6092, 6092), Box(6092, 6092)),
+ Box(Box(6093, 6093), Box(6093, 6093)),
+ Box(Box(6094, 6094), Box(6094, 6094)),
+ Box(Box(6095, 6095), Box(6095, 6095)),
+ Box(Box(6096, 6096), Box(6096, 6096)),
+ Box(Box(6097, 6097), Box(6097, 6097)),
+ Box(Box(6098, 6098), Box(6098, 6098)),
+ Box(Box(6099, 6099), Box(6099, 6099)),
+ Box(Box(6100, 6100), Box(6100, 6100)),
+ Box(Box(6101, 6101), Box(6101, 6101)),
+ Box(Box(6102, 6102), Box(6102, 6102)),
+ Box(Box(6103, 6103), Box(6103, 6103)),
+ Box(Box(6104, 6104), Box(6104, 6104)),
+ Box(Box(6105, 6105), Box(6105, 6105)),
+ Box(Box(6106, 6106), Box(6106, 6106)),
+ Box(Box(6107, 6107), Box(6107, 6107)),
+ Box(Box(6108, 6108), Box(6108, 6108)),
+ Box(Box(6109, 6109), Box(6109, 6109)),
+ Box(Box(6110, 6110), Box(6110, 6110)),
+ Box(Box(6111, 6111), Box(6111, 6111)),
+ Box(Box(6112, 6112), Box(6112, 6112)),
+ Box(Box(6113, 6113), Box(6113, 6113)),
+ Box(Box(6114, 6114), Box(6114, 6114)),
+ Box(Box(6115, 6115), Box(6115, 6115)),
+ Box(Box(6116, 6116), Box(6116, 6116)),
+ Box(Box(6117, 6117), Box(6117, 6117)),
+ Box(Box(6118, 6118), Box(6118, 6118)),
+ Box(Box(6119, 6119), Box(6119, 6119)),
+ Box(Box(6120, 6120), Box(6120, 6120)),
+ Box(Box(6121, 6121), Box(6121, 6121)),
+ Box(Box(6122, 6122), Box(6122, 6122)),
+ Box(Box(6123, 6123), Box(6123, 6123)),
+ Box(Box(6124, 6124), Box(6124, 6124)),
+ Box(Box(6125, 6125), Box(6125, 6125)),
+ Box(Box(6126, 6126), Box(6126, 6126)),
+ Box(Box(6127, 6127), Box(6127, 6127)),
+ Box(Box(6128, 6128), Box(6128, 6128)),
+ Box(Box(6129, 6129), Box(6129, 6129)),
+ Box(Box(6130, 6130), Box(6130, 6130)),
+ Box(Box(6131, 6131), Box(6131, 6131)),
+ Box(Box(6132, 6132), Box(6132, 6132)),
+ Box(Box(6133, 6133), Box(6133, 6133)),
+ Box(Box(6134, 6134), Box(6134, 6134)),
+ Box(Box(6135, 6135), Box(6135, 6135)),
+ Box(Box(6136, 6136), Box(6136, 6136)),
+ Box(Box(6137, 6137), Box(6137, 6137)),
+ Box(Box(6138, 6138), Box(6138, 6138)),
+ Box(Box(6139, 6139), Box(6139, 6139)),
+ Box(Box(6140, 6140), Box(6140, 6140)),
+ Box(Box(6141, 6141), Box(6141, 6141)),
+ Box(Box(6142, 6142), Box(6142, 6142)),
+ Box(Box(6143, 6143), Box(6143, 6143)),
+ Box(Box(6144, 6144), Box(6144, 6144)),
+ Box(Box(6145, 6145), Box(6145, 6145)),
+ Box(Box(6146, 6146), Box(6146, 6146)),
+ Box(Box(6147, 6147), Box(6147, 6147)),
+ Box(Box(6148, 6148), Box(6148, 6148)),
+ Box(Box(6149, 6149), Box(6149, 6149)),
+ Box(Box(6150, 6150), Box(6150, 6150)),
+ Box(Box(6151, 6151), Box(6151, 6151)),
+ Box(Box(6152, 6152), Box(6152, 6152)),
+ Box(Box(6153, 6153), Box(6153, 6153)),
+ Box(Box(6154, 6154), Box(6154, 6154)),
+ Box(Box(6155, 6155), Box(6155, 6155)),
+ Box(Box(6156, 6156), Box(6156, 6156)),
+ Box(Box(6157, 6157), Box(6157, 6157)),
+ Box(Box(6158, 6158), Box(6158, 6158)),
+ Box(Box(6159, 6159), Box(6159, 6159)),
+ Box(Box(6160, 6160), Box(6160, 6160)),
+ Box(Box(6161, 6161), Box(6161, 6161)),
+ Box(Box(6162, 6162), Box(6162, 6162)),
+ Box(Box(6163, 6163), Box(6163, 6163)),
+ Box(Box(6164, 6164), Box(6164, 6164)),
+ Box(Box(6165, 6165), Box(6165, 6165)),
+ Box(Box(6166, 6166), Box(6166, 6166)),
+ Box(Box(6167, 6167), Box(6167, 6167)),
+ Box(Box(6168, 6168), Box(6168, 6168)),
+ Box(Box(6169, 6169), Box(6169, 6169)),
+ Box(Box(6170, 6170), Box(6170, 6170)),
+ Box(Box(6171, 6171), Box(6171, 6171)),
+ Box(Box(6172, 6172), Box(6172, 6172)),
+ Box(Box(6173, 6173), Box(6173, 6173)),
+ Box(Box(6174, 6174), Box(6174, 6174)),
+ Box(Box(6175, 6175), Box(6175, 6175)),
+ Box(Box(6176, 6176), Box(6176, 6176)),
+ Box(Box(6177, 6177), Box(6177, 6177)),
+ Box(Box(6178, 6178), Box(6178, 6178)),
+ Box(Box(6179, 6179), Box(6179, 6179)),
+ Box(Box(6180, 6180), Box(6180, 6180)),
+ Box(Box(6181, 6181), Box(6181, 6181)),
+ Box(Box(6182, 6182), Box(6182, 6182)),
+ Box(Box(6183, 6183), Box(6183, 6183)),
+ Box(Box(6184, 6184), Box(6184, 6184)),
+ Box(Box(6185, 6185), Box(6185, 6185)),
+ Box(Box(6186, 6186), Box(6186, 6186)),
+ Box(Box(6187, 6187), Box(6187, 6187)),
+ Box(Box(6188, 6188), Box(6188, 6188)),
+ Box(Box(6189, 6189), Box(6189, 6189)),
+ Box(Box(6190, 6190), Box(6190, 6190)),
+ Box(Box(6191, 6191), Box(6191, 6191)),
+ Box(Box(6192, 6192), Box(6192, 6192)),
+ Box(Box(6193, 6193), Box(6193, 6193)),
+ Box(Box(6194, 6194), Box(6194, 6194)),
+ Box(Box(6195, 6195), Box(6195, 6195)),
+ Box(Box(6196, 6196), Box(6196, 6196)),
+ Box(Box(6197, 6197), Box(6197, 6197)),
+ Box(Box(6198, 6198), Box(6198, 6198)),
+ Box(Box(6199, 6199), Box(6199, 6199)),
+ Box(Box(6200, 6200), Box(6200, 6200)),
+ Box(Box(6201, 6201), Box(6201, 6201)),
+ Box(Box(6202, 6202), Box(6202, 6202)),
+ Box(Box(6203, 6203), Box(6203, 6203)),
+ Box(Box(6204, 6204), Box(6204, 6204)),
+ Box(Box(6205, 6205), Box(6205, 6205)),
+ Box(Box(6206, 6206), Box(6206, 6206)),
+ Box(Box(6207, 6207), Box(6207, 6207)),
+ Box(Box(6208, 6208), Box(6208, 6208)),
+ Box(Box(6209, 6209), Box(6209, 6209)),
+ Box(Box(6210, 6210), Box(6210, 6210)),
+ Box(Box(6211, 6211), Box(6211, 6211)),
+ Box(Box(6212, 6212), Box(6212, 6212)),
+ Box(Box(6213, 6213), Box(6213, 6213)),
+ Box(Box(6214, 6214), Box(6214, 6214)),
+ Box(Box(6215, 6215), Box(6215, 6215)),
+ Box(Box(6216, 6216), Box(6216, 6216)),
+ Box(Box(6217, 6217), Box(6217, 6217)),
+ Box(Box(6218, 6218), Box(6218, 6218)),
+ Box(Box(6219, 6219), Box(6219, 6219)),
+ Box(Box(6220, 6220), Box(6220, 6220)),
+ Box(Box(6221, 6221), Box(6221, 6221)),
+ Box(Box(6222, 6222), Box(6222, 6222)),
+ Box(Box(6223, 6223), Box(6223, 6223)),
+ Box(Box(6224, 6224), Box(6224, 6224)),
+ Box(Box(6225, 6225), Box(6225, 6225)),
+ Box(Box(6226, 6226), Box(6226, 6226)),
+ Box(Box(6227, 6227), Box(6227, 6227)),
+ Box(Box(6228, 6228), Box(6228, 6228)),
+ Box(Box(6229, 6229), Box(6229, 6229)),
+ Box(Box(6230, 6230), Box(6230, 6230)),
+ Box(Box(6231, 6231), Box(6231, 6231)),
+ Box(Box(6232, 6232), Box(6232, 6232)),
+ Box(Box(6233, 6233), Box(6233, 6233)),
+ Box(Box(6234, 6234), Box(6234, 6234)),
+ Box(Box(6235, 6235), Box(6235, 6235)),
+ Box(Box(6236, 6236), Box(6236, 6236)),
+ Box(Box(6237, 6237), Box(6237, 6237)),
+ Box(Box(6238, 6238), Box(6238, 6238)),
+ Box(Box(6239, 6239), Box(6239, 6239)),
+ Box(Box(6240, 6240), Box(6240, 6240)),
+ Box(Box(6241, 6241), Box(6241, 6241)),
+ Box(Box(6242, 6242), Box(6242, 6242)),
+ Box(Box(6243, 6243), Box(6243, 6243)),
+ Box(Box(6244, 6244), Box(6244, 6244)),
+ Box(Box(6245, 6245), Box(6245, 6245)),
+ Box(Box(6246, 6246), Box(6246, 6246)),
+ Box(Box(6247, 6247), Box(6247, 6247)),
+ Box(Box(6248, 6248), Box(6248, 6248)),
+ Box(Box(6249, 6249), Box(6249, 6249)),
+ Box(Box(6250, 6250), Box(6250, 6250)),
+ Box(Box(6251, 6251), Box(6251, 6251)),
+ Box(Box(6252, 6252), Box(6252, 6252)),
+ Box(Box(6253, 6253), Box(6253, 6253)),
+ Box(Box(6254, 6254), Box(6254, 6254)),
+ Box(Box(6255, 6255), Box(6255, 6255)),
+ Box(Box(6256, 6256), Box(6256, 6256)),
+ Box(Box(6257, 6257), Box(6257, 6257)),
+ Box(Box(6258, 6258), Box(6258, 6258)),
+ Box(Box(6259, 6259), Box(6259, 6259)),
+ Box(Box(6260, 6260), Box(6260, 6260)),
+ Box(Box(6261, 6261), Box(6261, 6261)),
+ Box(Box(6262, 6262), Box(6262, 6262)),
+ Box(Box(6263, 6263), Box(6263, 6263)),
+ Box(Box(6264, 6264), Box(6264, 6264)),
+ Box(Box(6265, 6265), Box(6265, 6265)),
+ Box(Box(6266, 6266), Box(6266, 6266)),
+ Box(Box(6267, 6267), Box(6267, 6267)),
+ Box(Box(6268, 6268), Box(6268, 6268)),
+ Box(Box(6269, 6269), Box(6269, 6269)),
+ Box(Box(6270, 6270), Box(6270, 6270)),
+ Box(Box(6271, 6271), Box(6271, 6271)),
+ Box(Box(6272, 6272), Box(6272, 6272)),
+ Box(Box(6273, 6273), Box(6273, 6273)),
+ Box(Box(6274, 6274), Box(6274, 6274)),
+ Box(Box(6275, 6275), Box(6275, 6275)),
+ Box(Box(6276, 6276), Box(6276, 6276)),
+ Box(Box(6277, 6277), Box(6277, 6277)),
+ Box(Box(6278, 6278), Box(6278, 6278)),
+ Box(Box(6279, 6279), Box(6279, 6279)),
+ Box(Box(6280, 6280), Box(6280, 6280)),
+ Box(Box(6281, 6281), Box(6281, 6281)),
+ Box(Box(6282, 6282), Box(6282, 6282)),
+ Box(Box(6283, 6283), Box(6283, 6283)),
+ Box(Box(6284, 6284), Box(6284, 6284)),
+ Box(Box(6285, 6285), Box(6285, 6285)),
+ Box(Box(6286, 6286), Box(6286, 6286)),
+ Box(Box(6287, 6287), Box(6287, 6287)),
+ Box(Box(6288, 6288), Box(6288, 6288)),
+ Box(Box(6289, 6289), Box(6289, 6289)),
+ Box(Box(6290, 6290), Box(6290, 6290)),
+ Box(Box(6291, 6291), Box(6291, 6291)),
+ Box(Box(6292, 6292), Box(6292, 6292)),
+ Box(Box(6293, 6293), Box(6293, 6293)),
+ Box(Box(6294, 6294), Box(6294, 6294)),
+ Box(Box(6295, 6295), Box(6295, 6295)),
+ Box(Box(6296, 6296), Box(6296, 6296)),
+ Box(Box(6297, 6297), Box(6297, 6297)),
+ Box(Box(6298, 6298), Box(6298, 6298)),
+ Box(Box(6299, 6299), Box(6299, 6299)),
+ Box(Box(6300, 6300), Box(6300, 6300)),
+ Box(Box(6301, 6301), Box(6301, 6301)),
+ Box(Box(6302, 6302), Box(6302, 6302)),
+ Box(Box(6303, 6303), Box(6303, 6303)),
+ Box(Box(6304, 6304), Box(6304, 6304)),
+ Box(Box(6305, 6305), Box(6305, 6305)),
+ Box(Box(6306, 6306), Box(6306, 6306)),
+ Box(Box(6307, 6307), Box(6307, 6307)),
+ Box(Box(6308, 6308), Box(6308, 6308)),
+ Box(Box(6309, 6309), Box(6309, 6309)),
+ Box(Box(6310, 6310), Box(6310, 6310)),
+ Box(Box(6311, 6311), Box(6311, 6311)),
+ Box(Box(6312, 6312), Box(6312, 6312)),
+ Box(Box(6313, 6313), Box(6313, 6313)),
+ Box(Box(6314, 6314), Box(6314, 6314)),
+ Box(Box(6315, 6315), Box(6315, 6315)),
+ Box(Box(6316, 6316), Box(6316, 6316)),
+ Box(Box(6317, 6317), Box(6317, 6317)),
+ Box(Box(6318, 6318), Box(6318, 6318)),
+ Box(Box(6319, 6319), Box(6319, 6319)),
+ Box(Box(6320, 6320), Box(6320, 6320)),
+ Box(Box(6321, 6321), Box(6321, 6321)),
+ Box(Box(6322, 6322), Box(6322, 6322)),
+ Box(Box(6323, 6323), Box(6323, 6323)),
+ Box(Box(6324, 6324), Box(6324, 6324)),
+ Box(Box(6325, 6325), Box(6325, 6325)),
+ Box(Box(6326, 6326), Box(6326, 6326)),
+ Box(Box(6327, 6327), Box(6327, 6327)),
+ Box(Box(6328, 6328), Box(6328, 6328)),
+ Box(Box(6329, 6329), Box(6329, 6329)),
+ Box(Box(6330, 6330), Box(6330, 6330)),
+ Box(Box(6331, 6331), Box(6331, 6331)),
+ Box(Box(6332, 6332), Box(6332, 6332)),
+ Box(Box(6333, 6333), Box(6333, 6333)),
+ Box(Box(6334, 6334), Box(6334, 6334)),
+ Box(Box(6335, 6335), Box(6335, 6335)),
+ Box(Box(6336, 6336), Box(6336, 6336)),
+ Box(Box(6337, 6337), Box(6337, 6337)),
+ Box(Box(6338, 6338), Box(6338, 6338)),
+ Box(Box(6339, 6339), Box(6339, 6339)),
+ Box(Box(6340, 6340), Box(6340, 6340)),
+ Box(Box(6341, 6341), Box(6341, 6341)),
+ Box(Box(6342, 6342), Box(6342, 6342)),
+ Box(Box(6343, 6343), Box(6343, 6343)),
+ Box(Box(6344, 6344), Box(6344, 6344)),
+ Box(Box(6345, 6345), Box(6345, 6345)),
+ Box(Box(6346, 6346), Box(6346, 6346)),
+ Box(Box(6347, 6347), Box(6347, 6347)),
+ Box(Box(6348, 6348), Box(6348, 6348)),
+ Box(Box(6349, 6349), Box(6349, 6349)),
+ Box(Box(6350, 6350), Box(6350, 6350)),
+ Box(Box(6351, 6351), Box(6351, 6351)),
+ Box(Box(6352, 6352), Box(6352, 6352)),
+ Box(Box(6353, 6353), Box(6353, 6353)),
+ Box(Box(6354, 6354), Box(6354, 6354)),
+ Box(Box(6355, 6355), Box(6355, 6355)),
+ Box(Box(6356, 6356), Box(6356, 6356)),
+ Box(Box(6357, 6357), Box(6357, 6357)),
+ Box(Box(6358, 6358), Box(6358, 6358)),
+ Box(Box(6359, 6359), Box(6359, 6359)),
+ Box(Box(6360, 6360), Box(6360, 6360)),
+ Box(Box(6361, 6361), Box(6361, 6361)),
+ Box(Box(6362, 6362), Box(6362, 6362)),
+ Box(Box(6363, 6363), Box(6363, 6363)),
+ Box(Box(6364, 6364), Box(6364, 6364)),
+ Box(Box(6365, 6365), Box(6365, 6365)),
+ Box(Box(6366, 6366), Box(6366, 6366)),
+ Box(Box(6367, 6367), Box(6367, 6367)),
+ Box(Box(6368, 6368), Box(6368, 6368)),
+ Box(Box(6369, 6369), Box(6369, 6369)),
+ Box(Box(6370, 6370), Box(6370, 6370)),
+ Box(Box(6371, 6371), Box(6371, 6371)),
+ Box(Box(6372, 6372), Box(6372, 6372)),
+ Box(Box(6373, 6373), Box(6373, 6373)),
+ Box(Box(6374, 6374), Box(6374, 6374)),
+ Box(Box(6375, 6375), Box(6375, 6375)),
+ Box(Box(6376, 6376), Box(6376, 6376)),
+ Box(Box(6377, 6377), Box(6377, 6377)),
+ Box(Box(6378, 6378), Box(6378, 6378)),
+ Box(Box(6379, 6379), Box(6379, 6379)),
+ Box(Box(6380, 6380), Box(6380, 6380)),
+ Box(Box(6381, 6381), Box(6381, 6381)),
+ Box(Box(6382, 6382), Box(6382, 6382)),
+ Box(Box(6383, 6383), Box(6383, 6383)),
+ Box(Box(6384, 6384), Box(6384, 6384)),
+ Box(Box(6385, 6385), Box(6385, 6385)),
+ Box(Box(6386, 6386), Box(6386, 6386)),
+ Box(Box(6387, 6387), Box(6387, 6387)),
+ Box(Box(6388, 6388), Box(6388, 6388)),
+ Box(Box(6389, 6389), Box(6389, 6389)),
+ Box(Box(6390, 6390), Box(6390, 6390)),
+ Box(Box(6391, 6391), Box(6391, 6391)),
+ Box(Box(6392, 6392), Box(6392, 6392)),
+ Box(Box(6393, 6393), Box(6393, 6393)),
+ Box(Box(6394, 6394), Box(6394, 6394)),
+ Box(Box(6395, 6395), Box(6395, 6395)),
+ Box(Box(6396, 6396), Box(6396, 6396)),
+ Box(Box(6397, 6397), Box(6397, 6397)),
+ Box(Box(6398, 6398), Box(6398, 6398)),
+ Box(Box(6399, 6399), Box(6399, 6399)),
+ Box(Box(6400, 6400), Box(6400, 6400)),
+ Box(Box(6401, 6401), Box(6401, 6401)),
+ Box(Box(6402, 6402), Box(6402, 6402)),
+ Box(Box(6403, 6403), Box(6403, 6403)),
+ Box(Box(6404, 6404), Box(6404, 6404)),
+ Box(Box(6405, 6405), Box(6405, 6405)),
+ Box(Box(6406, 6406), Box(6406, 6406)),
+ Box(Box(6407, 6407), Box(6407, 6407)),
+ Box(Box(6408, 6408), Box(6408, 6408)),
+ Box(Box(6409, 6409), Box(6409, 6409)),
+ Box(Box(6410, 6410), Box(6410, 6410)),
+ Box(Box(6411, 6411), Box(6411, 6411)),
+ Box(Box(6412, 6412), Box(6412, 6412)),
+ Box(Box(6413, 6413), Box(6413, 6413)),
+ Box(Box(6414, 6414), Box(6414, 6414)),
+ Box(Box(6415, 6415), Box(6415, 6415)),
+ Box(Box(6416, 6416), Box(6416, 6416)),
+ Box(Box(6417, 6417), Box(6417, 6417)),
+ Box(Box(6418, 6418), Box(6418, 6418)),
+ Box(Box(6419, 6419), Box(6419, 6419)),
+ Box(Box(6420, 6420), Box(6420, 6420)),
+ Box(Box(6421, 6421), Box(6421, 6421)),
+ Box(Box(6422, 6422), Box(6422, 6422)),
+ Box(Box(6423, 6423), Box(6423, 6423)),
+ Box(Box(6424, 6424), Box(6424, 6424)),
+ Box(Box(6425, 6425), Box(6425, 6425)),
+ Box(Box(6426, 6426), Box(6426, 6426)),
+ Box(Box(6427, 6427), Box(6427, 6427)),
+ Box(Box(6428, 6428), Box(6428, 6428)),
+ Box(Box(6429, 6429), Box(6429, 6429)),
+ Box(Box(6430, 6430), Box(6430, 6430)),
+ Box(Box(6431, 6431), Box(6431, 6431)),
+ Box(Box(6432, 6432), Box(6432, 6432)),
+ Box(Box(6433, 6433), Box(6433, 6433)),
+ Box(Box(6434, 6434), Box(6434, 6434)),
+ Box(Box(6435, 6435), Box(6435, 6435)),
+ Box(Box(6436, 6436), Box(6436, 6436)),
+ Box(Box(6437, 6437), Box(6437, 6437)),
+ Box(Box(6438, 6438), Box(6438, 6438)),
+ Box(Box(6439, 6439), Box(6439, 6439)),
+ Box(Box(6440, 6440), Box(6440, 6440)),
+ Box(Box(6441, 6441), Box(6441, 6441)),
+ Box(Box(6442, 6442), Box(6442, 6442)),
+ Box(Box(6443, 6443), Box(6443, 6443)),
+ Box(Box(6444, 6444), Box(6444, 6444)),
+ Box(Box(6445, 6445), Box(6445, 6445)),
+ Box(Box(6446, 6446), Box(6446, 6446)),
+ Box(Box(6447, 6447), Box(6447, 6447)),
+ Box(Box(6448, 6448), Box(6448, 6448)),
+ Box(Box(6449, 6449), Box(6449, 6449)),
+ Box(Box(6450, 6450), Box(6450, 6450)),
+ Box(Box(6451, 6451), Box(6451, 6451)),
+ Box(Box(6452, 6452), Box(6452, 6452)),
+ Box(Box(6453, 6453), Box(6453, 6453)),
+ Box(Box(6454, 6454), Box(6454, 6454)),
+ Box(Box(6455, 6455), Box(6455, 6455)),
+ Box(Box(6456, 6456), Box(6456, 6456)),
+ Box(Box(6457, 6457), Box(6457, 6457)),
+ Box(Box(6458, 6458), Box(6458, 6458)),
+ Box(Box(6459, 6459), Box(6459, 6459)),
+ Box(Box(6460, 6460), Box(6460, 6460)),
+ Box(Box(6461, 6461), Box(6461, 6461)),
+ Box(Box(6462, 6462), Box(6462, 6462)),
+ Box(Box(6463, 6463), Box(6463, 6463)),
+ Box(Box(6464, 6464), Box(6464, 6464)),
+ Box(Box(6465, 6465), Box(6465, 6465)),
+ Box(Box(6466, 6466), Box(6466, 6466)),
+ Box(Box(6467, 6467), Box(6467, 6467)),
+ Box(Box(6468, 6468), Box(6468, 6468)),
+ Box(Box(6469, 6469), Box(6469, 6469)),
+ Box(Box(6470, 6470), Box(6470, 6470)),
+ Box(Box(6471, 6471), Box(6471, 6471)),
+ Box(Box(6472, 6472), Box(6472, 6472)),
+ Box(Box(6473, 6473), Box(6473, 6473)),
+ Box(Box(6474, 6474), Box(6474, 6474)),
+ Box(Box(6475, 6475), Box(6475, 6475)),
+ Box(Box(6476, 6476), Box(6476, 6476)),
+ Box(Box(6477, 6477), Box(6477, 6477)),
+ Box(Box(6478, 6478), Box(6478, 6478)),
+ Box(Box(6479, 6479), Box(6479, 6479)),
+ Box(Box(6480, 6480), Box(6480, 6480)),
+ Box(Box(6481, 6481), Box(6481, 6481)),
+ Box(Box(6482, 6482), Box(6482, 6482)),
+ Box(Box(6483, 6483), Box(6483, 6483)),
+ Box(Box(6484, 6484), Box(6484, 6484)),
+ Box(Box(6485, 6485), Box(6485, 6485)),
+ Box(Box(6486, 6486), Box(6486, 6486)),
+ Box(Box(6487, 6487), Box(6487, 6487)),
+ Box(Box(6488, 6488), Box(6488, 6488)),
+ Box(Box(6489, 6489), Box(6489, 6489)),
+ Box(Box(6490, 6490), Box(6490, 6490)),
+ Box(Box(6491, 6491), Box(6491, 6491)),
+ Box(Box(6492, 6492), Box(6492, 6492)),
+ Box(Box(6493, 6493), Box(6493, 6493)),
+ Box(Box(6494, 6494), Box(6494, 6494)),
+ Box(Box(6495, 6495), Box(6495, 6495)),
+ Box(Box(6496, 6496), Box(6496, 6496)),
+ Box(Box(6497, 6497), Box(6497, 6497)),
+ Box(Box(6498, 6498), Box(6498, 6498)),
+ Box(Box(6499, 6499), Box(6499, 6499)),
+ Box(Box(6500, 6500), Box(6500, 6500)),
+ Box(Box(6501, 6501), Box(6501, 6501)),
+ Box(Box(6502, 6502), Box(6502, 6502)),
+ Box(Box(6503, 6503), Box(6503, 6503)),
+ Box(Box(6504, 6504), Box(6504, 6504)),
+ Box(Box(6505, 6505), Box(6505, 6505)),
+ Box(Box(6506, 6506), Box(6506, 6506)),
+ Box(Box(6507, 6507), Box(6507, 6507)),
+ Box(Box(6508, 6508), Box(6508, 6508)),
+ Box(Box(6509, 6509), Box(6509, 6509)),
+ Box(Box(6510, 6510), Box(6510, 6510)),
+ Box(Box(6511, 6511), Box(6511, 6511)),
+ Box(Box(6512, 6512), Box(6512, 6512)),
+ Box(Box(6513, 6513), Box(6513, 6513)),
+ Box(Box(6514, 6514), Box(6514, 6514)),
+ Box(Box(6515, 6515), Box(6515, 6515)),
+ Box(Box(6516, 6516), Box(6516, 6516)),
+ Box(Box(6517, 6517), Box(6517, 6517)),
+ Box(Box(6518, 6518), Box(6518, 6518)),
+ Box(Box(6519, 6519), Box(6519, 6519)),
+ Box(Box(6520, 6520), Box(6520, 6520)),
+ Box(Box(6521, 6521), Box(6521, 6521)),
+ Box(Box(6522, 6522), Box(6522, 6522)),
+ Box(Box(6523, 6523), Box(6523, 6523)),
+ Box(Box(6524, 6524), Box(6524, 6524)),
+ Box(Box(6525, 6525), Box(6525, 6525)),
+ Box(Box(6526, 6526), Box(6526, 6526)),
+ Box(Box(6527, 6527), Box(6527, 6527)),
+ Box(Box(6528, 6528), Box(6528, 6528)),
+ Box(Box(6529, 6529), Box(6529, 6529)),
+ Box(Box(6530, 6530), Box(6530, 6530)),
+ Box(Box(6531, 6531), Box(6531, 6531)),
+ Box(Box(6532, 6532), Box(6532, 6532)),
+ Box(Box(6533, 6533), Box(6533, 6533)),
+ Box(Box(6534, 6534), Box(6534, 6534)),
+ Box(Box(6535, 6535), Box(6535, 6535)),
+ Box(Box(6536, 6536), Box(6536, 6536)),
+ Box(Box(6537, 6537), Box(6537, 6537)),
+ Box(Box(6538, 6538), Box(6538, 6538)),
+ Box(Box(6539, 6539), Box(6539, 6539)),
+ Box(Box(6540, 6540), Box(6540, 6540)),
+ Box(Box(6541, 6541), Box(6541, 6541)),
+ Box(Box(6542, 6542), Box(6542, 6542)),
+ Box(Box(6543, 6543), Box(6543, 6543)),
+ Box(Box(6544, 6544), Box(6544, 6544)),
+ Box(Box(6545, 6545), Box(6545, 6545)),
+ Box(Box(6546, 6546), Box(6546, 6546)),
+ Box(Box(6547, 6547), Box(6547, 6547)),
+ Box(Box(6548, 6548), Box(6548, 6548)),
+ Box(Box(6549, 6549), Box(6549, 6549)),
+ Box(Box(6550, 6550), Box(6550, 6550)),
+ Box(Box(6551, 6551), Box(6551, 6551)),
+ Box(Box(6552, 6552), Box(6552, 6552)),
+ Box(Box(6553, 6553), Box(6553, 6553)),
+ Box(Box(6554, 6554), Box(6554, 6554)),
+ Box(Box(6555, 6555), Box(6555, 6555)),
+ Box(Box(6556, 6556), Box(6556, 6556)),
+ Box(Box(6557, 6557), Box(6557, 6557)),
+ Box(Box(6558, 6558), Box(6558, 6558)),
+ Box(Box(6559, 6559), Box(6559, 6559)),
+ Box(Box(6560, 6560), Box(6560, 6560)),
+ Box(Box(6561, 6561), Box(6561, 6561)),
+ Box(Box(6562, 6562), Box(6562, 6562)),
+ Box(Box(6563, 6563), Box(6563, 6563)),
+ Box(Box(6564, 6564), Box(6564, 6564)),
+ Box(Box(6565, 6565), Box(6565, 6565)),
+ Box(Box(6566, 6566), Box(6566, 6566)),
+ Box(Box(6567, 6567), Box(6567, 6567)),
+ Box(Box(6568, 6568), Box(6568, 6568)),
+ Box(Box(6569, 6569), Box(6569, 6569)),
+ Box(Box(6570, 6570), Box(6570, 6570)),
+ Box(Box(6571, 6571), Box(6571, 6571)),
+ Box(Box(6572, 6572), Box(6572, 6572)),
+ Box(Box(6573, 6573), Box(6573, 6573)),
+ Box(Box(6574, 6574), Box(6574, 6574)),
+ Box(Box(6575, 6575), Box(6575, 6575)),
+ Box(Box(6576, 6576), Box(6576, 6576)),
+ Box(Box(6577, 6577), Box(6577, 6577)),
+ Box(Box(6578, 6578), Box(6578, 6578)),
+ Box(Box(6579, 6579), Box(6579, 6579)),
+ Box(Box(6580, 6580), Box(6580, 6580)),
+ Box(Box(6581, 6581), Box(6581, 6581)),
+ Box(Box(6582, 6582), Box(6582, 6582)),
+ Box(Box(6583, 6583), Box(6583, 6583)),
+ Box(Box(6584, 6584), Box(6584, 6584)),
+ Box(Box(6585, 6585), Box(6585, 6585)),
+ Box(Box(6586, 6586), Box(6586, 6586)),
+ Box(Box(6587, 6587), Box(6587, 6587)),
+ Box(Box(6588, 6588), Box(6588, 6588)),
+ Box(Box(6589, 6589), Box(6589, 6589)),
+ Box(Box(6590, 6590), Box(6590, 6590)),
+ Box(Box(6591, 6591), Box(6591, 6591)),
+ Box(Box(6592, 6592), Box(6592, 6592)),
+ Box(Box(6593, 6593), Box(6593, 6593)),
+ Box(Box(6594, 6594), Box(6594, 6594)),
+ Box(Box(6595, 6595), Box(6595, 6595)),
+ Box(Box(6596, 6596), Box(6596, 6596)),
+ Box(Box(6597, 6597), Box(6597, 6597)),
+ Box(Box(6598, 6598), Box(6598, 6598)),
+ Box(Box(6599, 6599), Box(6599, 6599)),
+ Box(Box(6600, 6600), Box(6600, 6600)),
+ Box(Box(6601, 6601), Box(6601, 6601)),
+ Box(Box(6602, 6602), Box(6602, 6602)),
+ Box(Box(6603, 6603), Box(6603, 6603)),
+ Box(Box(6604, 6604), Box(6604, 6604)),
+ Box(Box(6605, 6605), Box(6605, 6605)),
+ Box(Box(6606, 6606), Box(6606, 6606)),
+ Box(Box(6607, 6607), Box(6607, 6607)),
+ Box(Box(6608, 6608), Box(6608, 6608)),
+ Box(Box(6609, 6609), Box(6609, 6609)),
+ Box(Box(6610, 6610), Box(6610, 6610)),
+ Box(Box(6611, 6611), Box(6611, 6611)),
+ Box(Box(6612, 6612), Box(6612, 6612)),
+ Box(Box(6613, 6613), Box(6613, 6613)),
+ Box(Box(6614, 6614), Box(6614, 6614)),
+ Box(Box(6615, 6615), Box(6615, 6615)),
+ Box(Box(6616, 6616), Box(6616, 6616)),
+ Box(Box(6617, 6617), Box(6617, 6617)),
+ Box(Box(6618, 6618), Box(6618, 6618)),
+ Box(Box(6619, 6619), Box(6619, 6619)),
+ Box(Box(6620, 6620), Box(6620, 6620)),
+ Box(Box(6621, 6621), Box(6621, 6621)),
+ Box(Box(6622, 6622), Box(6622, 6622)),
+ Box(Box(6623, 6623), Box(6623, 6623)),
+ Box(Box(6624, 6624), Box(6624, 6624)),
+ Box(Box(6625, 6625), Box(6625, 6625)),
+ Box(Box(6626, 6626), Box(6626, 6626)),
+ Box(Box(6627, 6627), Box(6627, 6627)),
+ Box(Box(6628, 6628), Box(6628, 6628)),
+ Box(Box(6629, 6629), Box(6629, 6629)),
+ Box(Box(6630, 6630), Box(6630, 6630)),
+ Box(Box(6631, 6631), Box(6631, 6631)),
+ Box(Box(6632, 6632), Box(6632, 6632)),
+ Box(Box(6633, 6633), Box(6633, 6633)),
+ Box(Box(6634, 6634), Box(6634, 6634)),
+ Box(Box(6635, 6635), Box(6635, 6635)),
+ Box(Box(6636, 6636), Box(6636, 6636)),
+ Box(Box(6637, 6637), Box(6637, 6637)),
+ Box(Box(6638, 6638), Box(6638, 6638)),
+ Box(Box(6639, 6639), Box(6639, 6639)),
+ Box(Box(6640, 6640), Box(6640, 6640)),
+ Box(Box(6641, 6641), Box(6641, 6641)),
+ Box(Box(6642, 6642), Box(6642, 6642)),
+ Box(Box(6643, 6643), Box(6643, 6643)),
+ Box(Box(6644, 6644), Box(6644, 6644)),
+ Box(Box(6645, 6645), Box(6645, 6645)),
+ Box(Box(6646, 6646), Box(6646, 6646)),
+ Box(Box(6647, 6647), Box(6647, 6647)),
+ Box(Box(6648, 6648), Box(6648, 6648)),
+ Box(Box(6649, 6649), Box(6649, 6649)),
+ Box(Box(6650, 6650), Box(6650, 6650)),
+ Box(Box(6651, 6651), Box(6651, 6651)),
+ Box(Box(6652, 6652), Box(6652, 6652)),
+ Box(Box(6653, 6653), Box(6653, 6653)),
+ Box(Box(6654, 6654), Box(6654, 6654)),
+ Box(Box(6655, 6655), Box(6655, 6655)),
+ Box(Box(6656, 6656), Box(6656, 6656)),
+ Box(Box(6657, 6657), Box(6657, 6657)),
+ Box(Box(6658, 6658), Box(6658, 6658)),
+ Box(Box(6659, 6659), Box(6659, 6659)),
+ Box(Box(6660, 6660), Box(6660, 6660)),
+ Box(Box(6661, 6661), Box(6661, 6661)),
+ Box(Box(6662, 6662), Box(6662, 6662)),
+ Box(Box(6663, 6663), Box(6663, 6663)),
+ Box(Box(6664, 6664), Box(6664, 6664)),
+ Box(Box(6665, 6665), Box(6665, 6665)),
+ Box(Box(6666, 6666), Box(6666, 6666)),
+ Box(Box(6667, 6667), Box(6667, 6667)),
+ Box(Box(6668, 6668), Box(6668, 6668)),
+ Box(Box(6669, 6669), Box(6669, 6669)),
+ Box(Box(6670, 6670), Box(6670, 6670)),
+ Box(Box(6671, 6671), Box(6671, 6671)),
+ Box(Box(6672, 6672), Box(6672, 6672)),
+ Box(Box(6673, 6673), Box(6673, 6673)),
+ Box(Box(6674, 6674), Box(6674, 6674)),
+ Box(Box(6675, 6675), Box(6675, 6675)),
+ Box(Box(6676, 6676), Box(6676, 6676)),
+ Box(Box(6677, 6677), Box(6677, 6677)),
+ Box(Box(6678, 6678), Box(6678, 6678)),
+ Box(Box(6679, 6679), Box(6679, 6679)),
+ Box(Box(6680, 6680), Box(6680, 6680)),
+ Box(Box(6681, 6681), Box(6681, 6681)),
+ Box(Box(6682, 6682), Box(6682, 6682)),
+ Box(Box(6683, 6683), Box(6683, 6683)),
+ Box(Box(6684, 6684), Box(6684, 6684)),
+ Box(Box(6685, 6685), Box(6685, 6685)),
+ Box(Box(6686, 6686), Box(6686, 6686)),
+ Box(Box(6687, 6687), Box(6687, 6687)),
+ Box(Box(6688, 6688), Box(6688, 6688)),
+ Box(Box(6689, 6689), Box(6689, 6689)),
+ Box(Box(6690, 6690), Box(6690, 6690)),
+ Box(Box(6691, 6691), Box(6691, 6691)),
+ Box(Box(6692, 6692), Box(6692, 6692)),
+ Box(Box(6693, 6693), Box(6693, 6693)),
+ Box(Box(6694, 6694), Box(6694, 6694)),
+ Box(Box(6695, 6695), Box(6695, 6695)),
+ Box(Box(6696, 6696), Box(6696, 6696)),
+ Box(Box(6697, 6697), Box(6697, 6697)),
+ Box(Box(6698, 6698), Box(6698, 6698)),
+ Box(Box(6699, 6699), Box(6699, 6699)),
+ Box(Box(6700, 6700), Box(6700, 6700)),
+ Box(Box(6701, 6701), Box(6701, 6701)),
+ Box(Box(6702, 6702), Box(6702, 6702)),
+ Box(Box(6703, 6703), Box(6703, 6703)),
+ Box(Box(6704, 6704), Box(6704, 6704)),
+ Box(Box(6705, 6705), Box(6705, 6705)),
+ Box(Box(6706, 6706), Box(6706, 6706)),
+ Box(Box(6707, 6707), Box(6707, 6707)),
+ Box(Box(6708, 6708), Box(6708, 6708)),
+ Box(Box(6709, 6709), Box(6709, 6709)),
+ Box(Box(6710, 6710), Box(6710, 6710)),
+ Box(Box(6711, 6711), Box(6711, 6711)),
+ Box(Box(6712, 6712), Box(6712, 6712)),
+ Box(Box(6713, 6713), Box(6713, 6713)),
+ Box(Box(6714, 6714), Box(6714, 6714)),
+ Box(Box(6715, 6715), Box(6715, 6715)),
+ Box(Box(6716, 6716), Box(6716, 6716)),
+ Box(Box(6717, 6717), Box(6717, 6717)),
+ Box(Box(6718, 6718), Box(6718, 6718)),
+ Box(Box(6719, 6719), Box(6719, 6719)),
+ Box(Box(6720, 6720), Box(6720, 6720)),
+ Box(Box(6721, 6721), Box(6721, 6721)),
+ Box(Box(6722, 6722), Box(6722, 6722)),
+ Box(Box(6723, 6723), Box(6723, 6723)),
+ Box(Box(6724, 6724), Box(6724, 6724)),
+ Box(Box(6725, 6725), Box(6725, 6725)),
+ Box(Box(6726, 6726), Box(6726, 6726)),
+ Box(Box(6727, 6727), Box(6727, 6727)),
+ Box(Box(6728, 6728), Box(6728, 6728)),
+ Box(Box(6729, 6729), Box(6729, 6729)),
+ Box(Box(6730, 6730), Box(6730, 6730)),
+ Box(Box(6731, 6731), Box(6731, 6731)),
+ Box(Box(6732, 6732), Box(6732, 6732)),
+ Box(Box(6733, 6733), Box(6733, 6733)),
+ Box(Box(6734, 6734), Box(6734, 6734)),
+ Box(Box(6735, 6735), Box(6735, 6735)),
+ Box(Box(6736, 6736), Box(6736, 6736)),
+ Box(Box(6737, 6737), Box(6737, 6737)),
+ Box(Box(6738, 6738), Box(6738, 6738)),
+ Box(Box(6739, 6739), Box(6739, 6739)),
+ Box(Box(6740, 6740), Box(6740, 6740)),
+ Box(Box(6741, 6741), Box(6741, 6741)),
+ Box(Box(6742, 6742), Box(6742, 6742)),
+ Box(Box(6743, 6743), Box(6743, 6743)),
+ Box(Box(6744, 6744), Box(6744, 6744)),
+ Box(Box(6745, 6745), Box(6745, 6745)),
+ Box(Box(6746, 6746), Box(6746, 6746)),
+ Box(Box(6747, 6747), Box(6747, 6747)),
+ Box(Box(6748, 6748), Box(6748, 6748)),
+ Box(Box(6749, 6749), Box(6749, 6749)),
+ Box(Box(6750, 6750), Box(6750, 6750)),
+ Box(Box(6751, 6751), Box(6751, 6751)),
+ Box(Box(6752, 6752), Box(6752, 6752)),
+ Box(Box(6753, 6753), Box(6753, 6753)),
+ Box(Box(6754, 6754), Box(6754, 6754)),
+ Box(Box(6755, 6755), Box(6755, 6755)),
+ Box(Box(6756, 6756), Box(6756, 6756)),
+ Box(Box(6757, 6757), Box(6757, 6757)),
+ Box(Box(6758, 6758), Box(6758, 6758)),
+ Box(Box(6759, 6759), Box(6759, 6759)),
+ Box(Box(6760, 6760), Box(6760, 6760)),
+ Box(Box(6761, 6761), Box(6761, 6761)),
+ Box(Box(6762, 6762), Box(6762, 6762)),
+ Box(Box(6763, 6763), Box(6763, 6763)),
+ Box(Box(6764, 6764), Box(6764, 6764)),
+ Box(Box(6765, 6765), Box(6765, 6765)),
+ Box(Box(6766, 6766), Box(6766, 6766)),
+ Box(Box(6767, 6767), Box(6767, 6767)),
+ Box(Box(6768, 6768), Box(6768, 6768)),
+ Box(Box(6769, 6769), Box(6769, 6769)),
+ Box(Box(6770, 6770), Box(6770, 6770)),
+ Box(Box(6771, 6771), Box(6771, 6771)),
+ Box(Box(6772, 6772), Box(6772, 6772)),
+ Box(Box(6773, 6773), Box(6773, 6773)),
+ Box(Box(6774, 6774), Box(6774, 6774)),
+ Box(Box(6775, 6775), Box(6775, 6775)),
+ Box(Box(6776, 6776), Box(6776, 6776)),
+ Box(Box(6777, 6777), Box(6777, 6777)),
+ Box(Box(6778, 6778), Box(6778, 6778)),
+ Box(Box(6779, 6779), Box(6779, 6779)),
+ Box(Box(6780, 6780), Box(6780, 6780)),
+ Box(Box(6781, 6781), Box(6781, 6781)),
+ Box(Box(6782, 6782), Box(6782, 6782)),
+ Box(Box(6783, 6783), Box(6783, 6783)),
+ Box(Box(6784, 6784), Box(6784, 6784)),
+ Box(Box(6785, 6785), Box(6785, 6785)),
+ Box(Box(6786, 6786), Box(6786, 6786)),
+ Box(Box(6787, 6787), Box(6787, 6787)),
+ Box(Box(6788, 6788), Box(6788, 6788)),
+ Box(Box(6789, 6789), Box(6789, 6789)),
+ Box(Box(6790, 6790), Box(6790, 6790)),
+ Box(Box(6791, 6791), Box(6791, 6791)),
+ Box(Box(6792, 6792), Box(6792, 6792)),
+ Box(Box(6793, 6793), Box(6793, 6793)),
+ Box(Box(6794, 6794), Box(6794, 6794)),
+ Box(Box(6795, 6795), Box(6795, 6795)),
+ Box(Box(6796, 6796), Box(6796, 6796)),
+ Box(Box(6797, 6797), Box(6797, 6797)),
+ Box(Box(6798, 6798), Box(6798, 6798)),
+ Box(Box(6799, 6799), Box(6799, 6799)),
+ Box(Box(6800, 6800), Box(6800, 6800)),
+ Box(Box(6801, 6801), Box(6801, 6801)),
+ Box(Box(6802, 6802), Box(6802, 6802)),
+ Box(Box(6803, 6803), Box(6803, 6803)),
+ Box(Box(6804, 6804), Box(6804, 6804)),
+ Box(Box(6805, 6805), Box(6805, 6805)),
+ Box(Box(6806, 6806), Box(6806, 6806)),
+ Box(Box(6807, 6807), Box(6807, 6807)),
+ Box(Box(6808, 6808), Box(6808, 6808)),
+ Box(Box(6809, 6809), Box(6809, 6809)),
+ Box(Box(6810, 6810), Box(6810, 6810)),
+ Box(Box(6811, 6811), Box(6811, 6811)),
+ Box(Box(6812, 6812), Box(6812, 6812)),
+ Box(Box(6813, 6813), Box(6813, 6813)),
+ Box(Box(6814, 6814), Box(6814, 6814)),
+ Box(Box(6815, 6815), Box(6815, 6815)),
+ Box(Box(6816, 6816), Box(6816, 6816)),
+ Box(Box(6817, 6817), Box(6817, 6817)),
+ Box(Box(6818, 6818), Box(6818, 6818)),
+ Box(Box(6819, 6819), Box(6819, 6819)),
+ Box(Box(6820, 6820), Box(6820, 6820)),
+ Box(Box(6821, 6821), Box(6821, 6821)),
+ Box(Box(6822, 6822), Box(6822, 6822)),
+ Box(Box(6823, 6823), Box(6823, 6823)),
+ Box(Box(6824, 6824), Box(6824, 6824)),
+ Box(Box(6825, 6825), Box(6825, 6825)),
+ Box(Box(6826, 6826), Box(6826, 6826)),
+ Box(Box(6827, 6827), Box(6827, 6827)),
+ Box(Box(6828, 6828), Box(6828, 6828)),
+ Box(Box(6829, 6829), Box(6829, 6829)),
+ Box(Box(6830, 6830), Box(6830, 6830)),
+ Box(Box(6831, 6831), Box(6831, 6831)),
+ Box(Box(6832, 6832), Box(6832, 6832)),
+ Box(Box(6833, 6833), Box(6833, 6833)),
+ Box(Box(6834, 6834), Box(6834, 6834)),
+ Box(Box(6835, 6835), Box(6835, 6835)),
+ Box(Box(6836, 6836), Box(6836, 6836)),
+ Box(Box(6837, 6837), Box(6837, 6837)),
+ Box(Box(6838, 6838), Box(6838, 6838)),
+ Box(Box(6839, 6839), Box(6839, 6839)),
+ Box(Box(6840, 6840), Box(6840, 6840)),
+ Box(Box(6841, 6841), Box(6841, 6841)),
+ Box(Box(6842, 6842), Box(6842, 6842)),
+ Box(Box(6843, 6843), Box(6843, 6843)),
+ Box(Box(6844, 6844), Box(6844, 6844)),
+ Box(Box(6845, 6845), Box(6845, 6845)),
+ Box(Box(6846, 6846), Box(6846, 6846)),
+ Box(Box(6847, 6847), Box(6847, 6847)),
+ Box(Box(6848, 6848), Box(6848, 6848)),
+ Box(Box(6849, 6849), Box(6849, 6849)),
+ Box(Box(6850, 6850), Box(6850, 6850)),
+ Box(Box(6851, 6851), Box(6851, 6851)),
+ Box(Box(6852, 6852), Box(6852, 6852)),
+ Box(Box(6853, 6853), Box(6853, 6853)),
+ Box(Box(6854, 6854), Box(6854, 6854)),
+ Box(Box(6855, 6855), Box(6855, 6855)),
+ Box(Box(6856, 6856), Box(6856, 6856)),
+ Box(Box(6857, 6857), Box(6857, 6857)),
+ Box(Box(6858, 6858), Box(6858, 6858)),
+ Box(Box(6859, 6859), Box(6859, 6859)),
+ Box(Box(6860, 6860), Box(6860, 6860)),
+ Box(Box(6861, 6861), Box(6861, 6861)),
+ Box(Box(6862, 6862), Box(6862, 6862)),
+ Box(Box(6863, 6863), Box(6863, 6863)),
+ Box(Box(6864, 6864), Box(6864, 6864)),
+ Box(Box(6865, 6865), Box(6865, 6865)),
+ Box(Box(6866, 6866), Box(6866, 6866)),
+ Box(Box(6867, 6867), Box(6867, 6867)),
+ Box(Box(6868, 6868), Box(6868, 6868)),
+ Box(Box(6869, 6869), Box(6869, 6869)),
+ Box(Box(6870, 6870), Box(6870, 6870)),
+ Box(Box(6871, 6871), Box(6871, 6871)),
+ Box(Box(6872, 6872), Box(6872, 6872)),
+ Box(Box(6873, 6873), Box(6873, 6873)),
+ Box(Box(6874, 6874), Box(6874, 6874)),
+ Box(Box(6875, 6875), Box(6875, 6875)),
+ Box(Box(6876, 6876), Box(6876, 6876)),
+ Box(Box(6877, 6877), Box(6877, 6877)),
+ Box(Box(6878, 6878), Box(6878, 6878)),
+ Box(Box(6879, 6879), Box(6879, 6879)),
+ Box(Box(6880, 6880), Box(6880, 6880)),
+ Box(Box(6881, 6881), Box(6881, 6881)),
+ Box(Box(6882, 6882), Box(6882, 6882)),
+ Box(Box(6883, 6883), Box(6883, 6883)),
+ Box(Box(6884, 6884), Box(6884, 6884)),
+ Box(Box(6885, 6885), Box(6885, 6885)),
+ Box(Box(6886, 6886), Box(6886, 6886)),
+ Box(Box(6887, 6887), Box(6887, 6887)),
+ Box(Box(6888, 6888), Box(6888, 6888)),
+ Box(Box(6889, 6889), Box(6889, 6889)),
+ Box(Box(6890, 6890), Box(6890, 6890)),
+ Box(Box(6891, 6891), Box(6891, 6891)),
+ Box(Box(6892, 6892), Box(6892, 6892)),
+ Box(Box(6893, 6893), Box(6893, 6893)),
+ Box(Box(6894, 6894), Box(6894, 6894)),
+ Box(Box(6895, 6895), Box(6895, 6895)),
+ Box(Box(6896, 6896), Box(6896, 6896)),
+ Box(Box(6897, 6897), Box(6897, 6897)),
+ Box(Box(6898, 6898), Box(6898, 6898)),
+ Box(Box(6899, 6899), Box(6899, 6899)),
+ Box(Box(6900, 6900), Box(6900, 6900)),
+ Box(Box(6901, 6901), Box(6901, 6901)),
+ Box(Box(6902, 6902), Box(6902, 6902)),
+ Box(Box(6903, 6903), Box(6903, 6903)),
+ Box(Box(6904, 6904), Box(6904, 6904)),
+ Box(Box(6905, 6905), Box(6905, 6905)),
+ Box(Box(6906, 6906), Box(6906, 6906)),
+ Box(Box(6907, 6907), Box(6907, 6907)),
+ Box(Box(6908, 6908), Box(6908, 6908)),
+ Box(Box(6909, 6909), Box(6909, 6909)),
+ Box(Box(6910, 6910), Box(6910, 6910)),
+ Box(Box(6911, 6911), Box(6911, 6911)),
+ Box(Box(6912, 6912), Box(6912, 6912)),
+ Box(Box(6913, 6913), Box(6913, 6913)),
+ Box(Box(6914, 6914), Box(6914, 6914)),
+ Box(Box(6915, 6915), Box(6915, 6915)),
+ Box(Box(6916, 6916), Box(6916, 6916)),
+ Box(Box(6917, 6917), Box(6917, 6917)),
+ Box(Box(6918, 6918), Box(6918, 6918)),
+ Box(Box(6919, 6919), Box(6919, 6919)),
+ Box(Box(6920, 6920), Box(6920, 6920)),
+ Box(Box(6921, 6921), Box(6921, 6921)),
+ Box(Box(6922, 6922), Box(6922, 6922)),
+ Box(Box(6923, 6923), Box(6923, 6923)),
+ Box(Box(6924, 6924), Box(6924, 6924)),
+ Box(Box(6925, 6925), Box(6925, 6925)),
+ Box(Box(6926, 6926), Box(6926, 6926)),
+ Box(Box(6927, 6927), Box(6927, 6927)),
+ Box(Box(6928, 6928), Box(6928, 6928)),
+ Box(Box(6929, 6929), Box(6929, 6929)),
+ Box(Box(6930, 6930), Box(6930, 6930)),
+ Box(Box(6931, 6931), Box(6931, 6931)),
+ Box(Box(6932, 6932), Box(6932, 6932)),
+ Box(Box(6933, 6933), Box(6933, 6933)),
+ Box(Box(6934, 6934), Box(6934, 6934)),
+ Box(Box(6935, 6935), Box(6935, 6935)),
+ Box(Box(6936, 6936), Box(6936, 6936)),
+ Box(Box(6937, 6937), Box(6937, 6937)),
+ Box(Box(6938, 6938), Box(6938, 6938)),
+ Box(Box(6939, 6939), Box(6939, 6939)),
+ Box(Box(6940, 6940), Box(6940, 6940)),
+ Box(Box(6941, 6941), Box(6941, 6941)),
+ Box(Box(6942, 6942), Box(6942, 6942)),
+ Box(Box(6943, 6943), Box(6943, 6943)),
+ Box(Box(6944, 6944), Box(6944, 6944)),
+ Box(Box(6945, 6945), Box(6945, 6945)),
+ Box(Box(6946, 6946), Box(6946, 6946)),
+ Box(Box(6947, 6947), Box(6947, 6947)),
+ Box(Box(6948, 6948), Box(6948, 6948)),
+ Box(Box(6949, 6949), Box(6949, 6949)),
+ Box(Box(6950, 6950), Box(6950, 6950)),
+ Box(Box(6951, 6951), Box(6951, 6951)),
+ Box(Box(6952, 6952), Box(6952, 6952)),
+ Box(Box(6953, 6953), Box(6953, 6953)),
+ Box(Box(6954, 6954), Box(6954, 6954)),
+ Box(Box(6955, 6955), Box(6955, 6955)),
+ Box(Box(6956, 6956), Box(6956, 6956)),
+ Box(Box(6957, 6957), Box(6957, 6957)),
+ Box(Box(6958, 6958), Box(6958, 6958)),
+ Box(Box(6959, 6959), Box(6959, 6959)),
+ Box(Box(6960, 6960), Box(6960, 6960)),
+ Box(Box(6961, 6961), Box(6961, 6961)),
+ Box(Box(6962, 6962), Box(6962, 6962)),
+ Box(Box(6963, 6963), Box(6963, 6963)),
+ Box(Box(6964, 6964), Box(6964, 6964)),
+ Box(Box(6965, 6965), Box(6965, 6965)),
+ Box(Box(6966, 6966), Box(6966, 6966)),
+ Box(Box(6967, 6967), Box(6967, 6967)),
+ Box(Box(6968, 6968), Box(6968, 6968)),
+ Box(Box(6969, 6969), Box(6969, 6969)),
+ Box(Box(6970, 6970), Box(6970, 6970)),
+ Box(Box(6971, 6971), Box(6971, 6971)),
+ Box(Box(6972, 6972), Box(6972, 6972)),
+ Box(Box(6973, 6973), Box(6973, 6973)),
+ Box(Box(6974, 6974), Box(6974, 6974)),
+ Box(Box(6975, 6975), Box(6975, 6975)),
+ Box(Box(6976, 6976), Box(6976, 6976)),
+ Box(Box(6977, 6977), Box(6977, 6977)),
+ Box(Box(6978, 6978), Box(6978, 6978)),
+ Box(Box(6979, 6979), Box(6979, 6979)),
+ Box(Box(6980, 6980), Box(6980, 6980)),
+ Box(Box(6981, 6981), Box(6981, 6981)),
+ Box(Box(6982, 6982), Box(6982, 6982)),
+ Box(Box(6983, 6983), Box(6983, 6983)),
+ Box(Box(6984, 6984), Box(6984, 6984)),
+ Box(Box(6985, 6985), Box(6985, 6985)),
+ Box(Box(6986, 6986), Box(6986, 6986)),
+ Box(Box(6987, 6987), Box(6987, 6987)),
+ Box(Box(6988, 6988), Box(6988, 6988)),
+ Box(Box(6989, 6989), Box(6989, 6989)),
+ Box(Box(6990, 6990), Box(6990, 6990)),
+ Box(Box(6991, 6991), Box(6991, 6991)),
+ Box(Box(6992, 6992), Box(6992, 6992)),
+ Box(Box(6993, 6993), Box(6993, 6993)),
+ Box(Box(6994, 6994), Box(6994, 6994)),
+ Box(Box(6995, 6995), Box(6995, 6995)),
+ Box(Box(6996, 6996), Box(6996, 6996)),
+ Box(Box(6997, 6997), Box(6997, 6997)),
+ Box(Box(6998, 6998), Box(6998, 6998)),
+ Box(Box(6999, 6999), Box(6999, 6999)),
+ Box(Box(7000, 7000), Box(7000, 7000)),
+ Box(Box(7001, 7001), Box(7001, 7001)),
+ Box(Box(7002, 7002), Box(7002, 7002)),
+ Box(Box(7003, 7003), Box(7003, 7003)),
+ Box(Box(7004, 7004), Box(7004, 7004)),
+ Box(Box(7005, 7005), Box(7005, 7005)),
+ Box(Box(7006, 7006), Box(7006, 7006)),
+ Box(Box(7007, 7007), Box(7007, 7007)),
+ Box(Box(7008, 7008), Box(7008, 7008)),
+ Box(Box(7009, 7009), Box(7009, 7009)),
+ Box(Box(7010, 7010), Box(7010, 7010)),
+ Box(Box(7011, 7011), Box(7011, 7011)),
+ Box(Box(7012, 7012), Box(7012, 7012)),
+ Box(Box(7013, 7013), Box(7013, 7013)),
+ Box(Box(7014, 7014), Box(7014, 7014)),
+ Box(Box(7015, 7015), Box(7015, 7015)),
+ Box(Box(7016, 7016), Box(7016, 7016)),
+ Box(Box(7017, 7017), Box(7017, 7017)),
+ Box(Box(7018, 7018), Box(7018, 7018)),
+ Box(Box(7019, 7019), Box(7019, 7019)),
+ Box(Box(7020, 7020), Box(7020, 7020)),
+ Box(Box(7021, 7021), Box(7021, 7021)),
+ Box(Box(7022, 7022), Box(7022, 7022)),
+ Box(Box(7023, 7023), Box(7023, 7023)),
+ Box(Box(7024, 7024), Box(7024, 7024)),
+ Box(Box(7025, 7025), Box(7025, 7025)),
+ Box(Box(7026, 7026), Box(7026, 7026)),
+ Box(Box(7027, 7027), Box(7027, 7027)),
+ Box(Box(7028, 7028), Box(7028, 7028)),
+ Box(Box(7029, 7029), Box(7029, 7029)),
+ Box(Box(7030, 7030), Box(7030, 7030)),
+ Box(Box(7031, 7031), Box(7031, 7031)),
+ Box(Box(7032, 7032), Box(7032, 7032)),
+ Box(Box(7033, 7033), Box(7033, 7033)),
+ Box(Box(7034, 7034), Box(7034, 7034)),
+ Box(Box(7035, 7035), Box(7035, 7035)),
+ Box(Box(7036, 7036), Box(7036, 7036)),
+ Box(Box(7037, 7037), Box(7037, 7037)),
+ Box(Box(7038, 7038), Box(7038, 7038)),
+ Box(Box(7039, 7039), Box(7039, 7039)),
+ Box(Box(7040, 7040), Box(7040, 7040)),
+ Box(Box(7041, 7041), Box(7041, 7041)),
+ Box(Box(7042, 7042), Box(7042, 7042)),
+ Box(Box(7043, 7043), Box(7043, 7043)),
+ Box(Box(7044, 7044), Box(7044, 7044)),
+ Box(Box(7045, 7045), Box(7045, 7045)),
+ Box(Box(7046, 7046), Box(7046, 7046)),
+ Box(Box(7047, 7047), Box(7047, 7047)),
+ Box(Box(7048, 7048), Box(7048, 7048)),
+ Box(Box(7049, 7049), Box(7049, 7049)),
+ Box(Box(7050, 7050), Box(7050, 7050)),
+ Box(Box(7051, 7051), Box(7051, 7051)),
+ Box(Box(7052, 7052), Box(7052, 7052)),
+ Box(Box(7053, 7053), Box(7053, 7053)),
+ Box(Box(7054, 7054), Box(7054, 7054)),
+ Box(Box(7055, 7055), Box(7055, 7055)),
+ Box(Box(7056, 7056), Box(7056, 7056)),
+ Box(Box(7057, 7057), Box(7057, 7057)),
+ Box(Box(7058, 7058), Box(7058, 7058)),
+ Box(Box(7059, 7059), Box(7059, 7059)),
+ Box(Box(7060, 7060), Box(7060, 7060)),
+ Box(Box(7061, 7061), Box(7061, 7061)),
+ Box(Box(7062, 7062), Box(7062, 7062)),
+ Box(Box(7063, 7063), Box(7063, 7063)),
+ Box(Box(7064, 7064), Box(7064, 7064)),
+ Box(Box(7065, 7065), Box(7065, 7065)),
+ Box(Box(7066, 7066), Box(7066, 7066)),
+ Box(Box(7067, 7067), Box(7067, 7067)),
+ Box(Box(7068, 7068), Box(7068, 7068)),
+ Box(Box(7069, 7069), Box(7069, 7069)),
+ Box(Box(7070, 7070), Box(7070, 7070)),
+ Box(Box(7071, 7071), Box(7071, 7071)),
+ Box(Box(7072, 7072), Box(7072, 7072)),
+ Box(Box(7073, 7073), Box(7073, 7073)),
+ Box(Box(7074, 7074), Box(7074, 7074)),
+ Box(Box(7075, 7075), Box(7075, 7075)),
+ Box(Box(7076, 7076), Box(7076, 7076)),
+ Box(Box(7077, 7077), Box(7077, 7077)),
+ Box(Box(7078, 7078), Box(7078, 7078)),
+ Box(Box(7079, 7079), Box(7079, 7079)),
+ Box(Box(7080, 7080), Box(7080, 7080)),
+ Box(Box(7081, 7081), Box(7081, 7081)),
+ Box(Box(7082, 7082), Box(7082, 7082)),
+ Box(Box(7083, 7083), Box(7083, 7083)),
+ Box(Box(7084, 7084), Box(7084, 7084)),
+ Box(Box(7085, 7085), Box(7085, 7085)),
+ Box(Box(7086, 7086), Box(7086, 7086)),
+ Box(Box(7087, 7087), Box(7087, 7087)),
+ Box(Box(7088, 7088), Box(7088, 7088)),
+ Box(Box(7089, 7089), Box(7089, 7089)),
+ Box(Box(7090, 7090), Box(7090, 7090)),
+ Box(Box(7091, 7091), Box(7091, 7091)),
+ Box(Box(7092, 7092), Box(7092, 7092)),
+ Box(Box(7093, 7093), Box(7093, 7093)),
+ Box(Box(7094, 7094), Box(7094, 7094)),
+ Box(Box(7095, 7095), Box(7095, 7095)),
+ Box(Box(7096, 7096), Box(7096, 7096)),
+ Box(Box(7097, 7097), Box(7097, 7097)),
+ Box(Box(7098, 7098), Box(7098, 7098)),
+ Box(Box(7099, 7099), Box(7099, 7099)),
+ Box(Box(7100, 7100), Box(7100, 7100)),
+ Box(Box(7101, 7101), Box(7101, 7101)),
+ Box(Box(7102, 7102), Box(7102, 7102)),
+ Box(Box(7103, 7103), Box(7103, 7103)),
+ Box(Box(7104, 7104), Box(7104, 7104)),
+ Box(Box(7105, 7105), Box(7105, 7105)),
+ Box(Box(7106, 7106), Box(7106, 7106)),
+ Box(Box(7107, 7107), Box(7107, 7107)),
+ Box(Box(7108, 7108), Box(7108, 7108)),
+ Box(Box(7109, 7109), Box(7109, 7109)),
+ Box(Box(7110, 7110), Box(7110, 7110)),
+ Box(Box(7111, 7111), Box(7111, 7111)),
+ Box(Box(7112, 7112), Box(7112, 7112)),
+ Box(Box(7113, 7113), Box(7113, 7113)),
+ Box(Box(7114, 7114), Box(7114, 7114)),
+ Box(Box(7115, 7115), Box(7115, 7115)),
+ Box(Box(7116, 7116), Box(7116, 7116)),
+ Box(Box(7117, 7117), Box(7117, 7117)),
+ Box(Box(7118, 7118), Box(7118, 7118)),
+ Box(Box(7119, 7119), Box(7119, 7119)),
+ Box(Box(7120, 7120), Box(7120, 7120)),
+ Box(Box(7121, 7121), Box(7121, 7121)),
+ Box(Box(7122, 7122), Box(7122, 7122)),
+ Box(Box(7123, 7123), Box(7123, 7123)),
+ Box(Box(7124, 7124), Box(7124, 7124)),
+ Box(Box(7125, 7125), Box(7125, 7125)),
+ Box(Box(7126, 7126), Box(7126, 7126)),
+ Box(Box(7127, 7127), Box(7127, 7127)),
+ Box(Box(7128, 7128), Box(7128, 7128)),
+ Box(Box(7129, 7129), Box(7129, 7129)),
+ Box(Box(7130, 7130), Box(7130, 7130)),
+ Box(Box(7131, 7131), Box(7131, 7131)),
+ Box(Box(7132, 7132), Box(7132, 7132)),
+ Box(Box(7133, 7133), Box(7133, 7133)),
+ Box(Box(7134, 7134), Box(7134, 7134)),
+ Box(Box(7135, 7135), Box(7135, 7135)),
+ Box(Box(7136, 7136), Box(7136, 7136)),
+ Box(Box(7137, 7137), Box(7137, 7137)),
+ Box(Box(7138, 7138), Box(7138, 7138)),
+ Box(Box(7139, 7139), Box(7139, 7139)),
+ Box(Box(7140, 7140), Box(7140, 7140)),
+ Box(Box(7141, 7141), Box(7141, 7141)),
+ Box(Box(7142, 7142), Box(7142, 7142)),
+ Box(Box(7143, 7143), Box(7143, 7143)),
+ Box(Box(7144, 7144), Box(7144, 7144)),
+ Box(Box(7145, 7145), Box(7145, 7145)),
+ Box(Box(7146, 7146), Box(7146, 7146)),
+ Box(Box(7147, 7147), Box(7147, 7147)),
+ Box(Box(7148, 7148), Box(7148, 7148)),
+ Box(Box(7149, 7149), Box(7149, 7149)),
+ Box(Box(7150, 7150), Box(7150, 7150)),
+ Box(Box(7151, 7151), Box(7151, 7151)),
+ Box(Box(7152, 7152), Box(7152, 7152)),
+ Box(Box(7153, 7153), Box(7153, 7153)),
+ Box(Box(7154, 7154), Box(7154, 7154)),
+ Box(Box(7155, 7155), Box(7155, 7155)),
+ Box(Box(7156, 7156), Box(7156, 7156)),
+ Box(Box(7157, 7157), Box(7157, 7157)),
+ Box(Box(7158, 7158), Box(7158, 7158)),
+ Box(Box(7159, 7159), Box(7159, 7159)),
+ Box(Box(7160, 7160), Box(7160, 7160)),
+ Box(Box(7161, 7161), Box(7161, 7161)),
+ Box(Box(7162, 7162), Box(7162, 7162)),
+ Box(Box(7163, 7163), Box(7163, 7163)),
+ Box(Box(7164, 7164), Box(7164, 7164)),
+ Box(Box(7165, 7165), Box(7165, 7165)),
+ Box(Box(7166, 7166), Box(7166, 7166)),
+ Box(Box(7167, 7167), Box(7167, 7167)),
+ Box(Box(7168, 7168), Box(7168, 7168)),
+ Box(Box(7169, 7169), Box(7169, 7169)),
+ Box(Box(7170, 7170), Box(7170, 7170)),
+ Box(Box(7171, 7171), Box(7171, 7171)),
+ Box(Box(7172, 7172), Box(7172, 7172)),
+ Box(Box(7173, 7173), Box(7173, 7173)),
+ Box(Box(7174, 7174), Box(7174, 7174)),
+ Box(Box(7175, 7175), Box(7175, 7175)),
+ Box(Box(7176, 7176), Box(7176, 7176)),
+ Box(Box(7177, 7177), Box(7177, 7177)),
+ Box(Box(7178, 7178), Box(7178, 7178)),
+ Box(Box(7179, 7179), Box(7179, 7179)),
+ Box(Box(7180, 7180), Box(7180, 7180)),
+ Box(Box(7181, 7181), Box(7181, 7181)),
+ Box(Box(7182, 7182), Box(7182, 7182)),
+ Box(Box(7183, 7183), Box(7183, 7183)),
+ Box(Box(7184, 7184), Box(7184, 7184)),
+ Box(Box(7185, 7185), Box(7185, 7185)),
+ Box(Box(7186, 7186), Box(7186, 7186)),
+ Box(Box(7187, 7187), Box(7187, 7187)),
+ Box(Box(7188, 7188), Box(7188, 7188)),
+ Box(Box(7189, 7189), Box(7189, 7189)),
+ Box(Box(7190, 7190), Box(7190, 7190)),
+ Box(Box(7191, 7191), Box(7191, 7191)),
+ Box(Box(7192, 7192), Box(7192, 7192)),
+ Box(Box(7193, 7193), Box(7193, 7193)),
+ Box(Box(7194, 7194), Box(7194, 7194)),
+ Box(Box(7195, 7195), Box(7195, 7195)),
+ Box(Box(7196, 7196), Box(7196, 7196)),
+ Box(Box(7197, 7197), Box(7197, 7197)),
+ Box(Box(7198, 7198), Box(7198, 7198)),
+ Box(Box(7199, 7199), Box(7199, 7199)),
+ Box(Box(7200, 7200), Box(7200, 7200)),
+ Box(Box(7201, 7201), Box(7201, 7201)),
+ Box(Box(7202, 7202), Box(7202, 7202)),
+ Box(Box(7203, 7203), Box(7203, 7203)),
+ Box(Box(7204, 7204), Box(7204, 7204)),
+ Box(Box(7205, 7205), Box(7205, 7205)),
+ Box(Box(7206, 7206), Box(7206, 7206)),
+ Box(Box(7207, 7207), Box(7207, 7207)),
+ Box(Box(7208, 7208), Box(7208, 7208)),
+ Box(Box(7209, 7209), Box(7209, 7209)),
+ Box(Box(7210, 7210), Box(7210, 7210)),
+ Box(Box(7211, 7211), Box(7211, 7211)),
+ Box(Box(7212, 7212), Box(7212, 7212)),
+ Box(Box(7213, 7213), Box(7213, 7213)),
+ Box(Box(7214, 7214), Box(7214, 7214)),
+ Box(Box(7215, 7215), Box(7215, 7215)),
+ Box(Box(7216, 7216), Box(7216, 7216)),
+ Box(Box(7217, 7217), Box(7217, 7217)),
+ Box(Box(7218, 7218), Box(7218, 7218)),
+ Box(Box(7219, 7219), Box(7219, 7219)),
+ Box(Box(7220, 7220), Box(7220, 7220)),
+ Box(Box(7221, 7221), Box(7221, 7221)),
+ Box(Box(7222, 7222), Box(7222, 7222)),
+ Box(Box(7223, 7223), Box(7223, 7223)),
+ Box(Box(7224, 7224), Box(7224, 7224)),
+ Box(Box(7225, 7225), Box(7225, 7225)),
+ Box(Box(7226, 7226), Box(7226, 7226)),
+ Box(Box(7227, 7227), Box(7227, 7227)),
+ Box(Box(7228, 7228), Box(7228, 7228)),
+ Box(Box(7229, 7229), Box(7229, 7229)),
+ Box(Box(7230, 7230), Box(7230, 7230)),
+ Box(Box(7231, 7231), Box(7231, 7231)),
+ Box(Box(7232, 7232), Box(7232, 7232)),
+ Box(Box(7233, 7233), Box(7233, 7233)),
+ Box(Box(7234, 7234), Box(7234, 7234)),
+ Box(Box(7235, 7235), Box(7235, 7235)),
+ Box(Box(7236, 7236), Box(7236, 7236)),
+ Box(Box(7237, 7237), Box(7237, 7237)),
+ Box(Box(7238, 7238), Box(7238, 7238)),
+ Box(Box(7239, 7239), Box(7239, 7239)),
+ Box(Box(7240, 7240), Box(7240, 7240)),
+ Box(Box(7241, 7241), Box(7241, 7241)),
+ Box(Box(7242, 7242), Box(7242, 7242)),
+ Box(Box(7243, 7243), Box(7243, 7243)),
+ Box(Box(7244, 7244), Box(7244, 7244)),
+ Box(Box(7245, 7245), Box(7245, 7245)),
+ Box(Box(7246, 7246), Box(7246, 7246)),
+ Box(Box(7247, 7247), Box(7247, 7247)),
+ Box(Box(7248, 7248), Box(7248, 7248)),
+ Box(Box(7249, 7249), Box(7249, 7249)),
+ Box(Box(7250, 7250), Box(7250, 7250)),
+ Box(Box(7251, 7251), Box(7251, 7251)),
+ Box(Box(7252, 7252), Box(7252, 7252)),
+ Box(Box(7253, 7253), Box(7253, 7253)),
+ Box(Box(7254, 7254), Box(7254, 7254)),
+ Box(Box(7255, 7255), Box(7255, 7255)),
+ Box(Box(7256, 7256), Box(7256, 7256)),
+ Box(Box(7257, 7257), Box(7257, 7257)),
+ Box(Box(7258, 7258), Box(7258, 7258)),
+ Box(Box(7259, 7259), Box(7259, 7259)),
+ Box(Box(7260, 7260), Box(7260, 7260)),
+ Box(Box(7261, 7261), Box(7261, 7261)),
+ Box(Box(7262, 7262), Box(7262, 7262)),
+ Box(Box(7263, 7263), Box(7263, 7263)),
+ Box(Box(7264, 7264), Box(7264, 7264)),
+ Box(Box(7265, 7265), Box(7265, 7265)),
+ Box(Box(7266, 7266), Box(7266, 7266)),
+ Box(Box(7267, 7267), Box(7267, 7267)),
+ Box(Box(7268, 7268), Box(7268, 7268)),
+ Box(Box(7269, 7269), Box(7269, 7269)),
+ Box(Box(7270, 7270), Box(7270, 7270)),
+ Box(Box(7271, 7271), Box(7271, 7271)),
+ Box(Box(7272, 7272), Box(7272, 7272)),
+ Box(Box(7273, 7273), Box(7273, 7273)),
+ Box(Box(7274, 7274), Box(7274, 7274)),
+ Box(Box(7275, 7275), Box(7275, 7275)),
+ Box(Box(7276, 7276), Box(7276, 7276)),
+ Box(Box(7277, 7277), Box(7277, 7277)),
+ Box(Box(7278, 7278), Box(7278, 7278)),
+ Box(Box(7279, 7279), Box(7279, 7279)),
+ Box(Box(7280, 7280), Box(7280, 7280)),
+ Box(Box(7281, 7281), Box(7281, 7281)),
+ Box(Box(7282, 7282), Box(7282, 7282)),
+ Box(Box(7283, 7283), Box(7283, 7283)),
+ Box(Box(7284, 7284), Box(7284, 7284)),
+ Box(Box(7285, 7285), Box(7285, 7285)),
+ Box(Box(7286, 7286), Box(7286, 7286)),
+ Box(Box(7287, 7287), Box(7287, 7287)),
+ Box(Box(7288, 7288), Box(7288, 7288)),
+ Box(Box(7289, 7289), Box(7289, 7289)),
+ Box(Box(7290, 7290), Box(7290, 7290)),
+ Box(Box(7291, 7291), Box(7291, 7291)),
+ Box(Box(7292, 7292), Box(7292, 7292)),
+ Box(Box(7293, 7293), Box(7293, 7293)),
+ Box(Box(7294, 7294), Box(7294, 7294)),
+ Box(Box(7295, 7295), Box(7295, 7295)),
+ Box(Box(7296, 7296), Box(7296, 7296)),
+ Box(Box(7297, 7297), Box(7297, 7297)),
+ Box(Box(7298, 7298), Box(7298, 7298)),
+ Box(Box(7299, 7299), Box(7299, 7299)),
+ Box(Box(7300, 7300), Box(7300, 7300)),
+ Box(Box(7301, 7301), Box(7301, 7301)),
+ Box(Box(7302, 7302), Box(7302, 7302)),
+ Box(Box(7303, 7303), Box(7303, 7303)),
+ Box(Box(7304, 7304), Box(7304, 7304)),
+ Box(Box(7305, 7305), Box(7305, 7305)),
+ Box(Box(7306, 7306), Box(7306, 7306)),
+ Box(Box(7307, 7307), Box(7307, 7307)),
+ Box(Box(7308, 7308), Box(7308, 7308)),
+ Box(Box(7309, 7309), Box(7309, 7309)),
+ Box(Box(7310, 7310), Box(7310, 7310)),
+ Box(Box(7311, 7311), Box(7311, 7311)),
+ Box(Box(7312, 7312), Box(7312, 7312)),
+ Box(Box(7313, 7313), Box(7313, 7313)),
+ Box(Box(7314, 7314), Box(7314, 7314)),
+ Box(Box(7315, 7315), Box(7315, 7315)),
+ Box(Box(7316, 7316), Box(7316, 7316)),
+ Box(Box(7317, 7317), Box(7317, 7317)),
+ Box(Box(7318, 7318), Box(7318, 7318)),
+ Box(Box(7319, 7319), Box(7319, 7319)),
+ Box(Box(7320, 7320), Box(7320, 7320)),
+ Box(Box(7321, 7321), Box(7321, 7321)),
+ Box(Box(7322, 7322), Box(7322, 7322)),
+ Box(Box(7323, 7323), Box(7323, 7323)),
+ Box(Box(7324, 7324), Box(7324, 7324)),
+ Box(Box(7325, 7325), Box(7325, 7325)),
+ Box(Box(7326, 7326), Box(7326, 7326)),
+ Box(Box(7327, 7327), Box(7327, 7327)),
+ Box(Box(7328, 7328), Box(7328, 7328)),
+ Box(Box(7329, 7329), Box(7329, 7329)),
+ Box(Box(7330, 7330), Box(7330, 7330)),
+ Box(Box(7331, 7331), Box(7331, 7331)),
+ Box(Box(7332, 7332), Box(7332, 7332)),
+ Box(Box(7333, 7333), Box(7333, 7333)),
+ Box(Box(7334, 7334), Box(7334, 7334)),
+ Box(Box(7335, 7335), Box(7335, 7335)),
+ Box(Box(7336, 7336), Box(7336, 7336)),
+ Box(Box(7337, 7337), Box(7337, 7337)),
+ Box(Box(7338, 7338), Box(7338, 7338)),
+ Box(Box(7339, 7339), Box(7339, 7339)),
+ Box(Box(7340, 7340), Box(7340, 7340)),
+ Box(Box(7341, 7341), Box(7341, 7341)),
+ Box(Box(7342, 7342), Box(7342, 7342)),
+ Box(Box(7343, 7343), Box(7343, 7343)),
+ Box(Box(7344, 7344), Box(7344, 7344)),
+ Box(Box(7345, 7345), Box(7345, 7345)),
+ Box(Box(7346, 7346), Box(7346, 7346)),
+ Box(Box(7347, 7347), Box(7347, 7347)),
+ Box(Box(7348, 7348), Box(7348, 7348)),
+ Box(Box(7349, 7349), Box(7349, 7349)),
+ Box(Box(7350, 7350), Box(7350, 7350)),
+ Box(Box(7351, 7351), Box(7351, 7351)),
+ Box(Box(7352, 7352), Box(7352, 7352)),
+ Box(Box(7353, 7353), Box(7353, 7353)),
+ Box(Box(7354, 7354), Box(7354, 7354)),
+ Box(Box(7355, 7355), Box(7355, 7355)),
+ Box(Box(7356, 7356), Box(7356, 7356)),
+ Box(Box(7357, 7357), Box(7357, 7357)),
+ Box(Box(7358, 7358), Box(7358, 7358)),
+ Box(Box(7359, 7359), Box(7359, 7359)),
+ Box(Box(7360, 7360), Box(7360, 7360)),
+ Box(Box(7361, 7361), Box(7361, 7361)),
+ Box(Box(7362, 7362), Box(7362, 7362)),
+ Box(Box(7363, 7363), Box(7363, 7363)),
+ Box(Box(7364, 7364), Box(7364, 7364)),
+ Box(Box(7365, 7365), Box(7365, 7365)),
+ Box(Box(7366, 7366), Box(7366, 7366)),
+ Box(Box(7367, 7367), Box(7367, 7367)),
+ Box(Box(7368, 7368), Box(7368, 7368)),
+ Box(Box(7369, 7369), Box(7369, 7369)),
+ Box(Box(7370, 7370), Box(7370, 7370)),
+ Box(Box(7371, 7371), Box(7371, 7371)),
+ Box(Box(7372, 7372), Box(7372, 7372)),
+ Box(Box(7373, 7373), Box(7373, 7373)),
+ Box(Box(7374, 7374), Box(7374, 7374)),
+ Box(Box(7375, 7375), Box(7375, 7375)),
+ Box(Box(7376, 7376), Box(7376, 7376)),
+ Box(Box(7377, 7377), Box(7377, 7377)),
+ Box(Box(7378, 7378), Box(7378, 7378)),
+ Box(Box(7379, 7379), Box(7379, 7379)),
+ Box(Box(7380, 7380), Box(7380, 7380)),
+ Box(Box(7381, 7381), Box(7381, 7381)),
+ Box(Box(7382, 7382), Box(7382, 7382)),
+ Box(Box(7383, 7383), Box(7383, 7383)),
+ Box(Box(7384, 7384), Box(7384, 7384)),
+ Box(Box(7385, 7385), Box(7385, 7385)),
+ Box(Box(7386, 7386), Box(7386, 7386)),
+ Box(Box(7387, 7387), Box(7387, 7387)),
+ Box(Box(7388, 7388), Box(7388, 7388)),
+ Box(Box(7389, 7389), Box(7389, 7389)),
+ Box(Box(7390, 7390), Box(7390, 7390)),
+ Box(Box(7391, 7391), Box(7391, 7391)),
+ Box(Box(7392, 7392), Box(7392, 7392)),
+ Box(Box(7393, 7393), Box(7393, 7393)),
+ Box(Box(7394, 7394), Box(7394, 7394)),
+ Box(Box(7395, 7395), Box(7395, 7395)),
+ Box(Box(7396, 7396), Box(7396, 7396)),
+ Box(Box(7397, 7397), Box(7397, 7397)),
+ Box(Box(7398, 7398), Box(7398, 7398)),
+ Box(Box(7399, 7399), Box(7399, 7399)),
+ Box(Box(7400, 7400), Box(7400, 7400)),
+ Box(Box(7401, 7401), Box(7401, 7401)),
+ Box(Box(7402, 7402), Box(7402, 7402)),
+ Box(Box(7403, 7403), Box(7403, 7403)),
+ Box(Box(7404, 7404), Box(7404, 7404)),
+ Box(Box(7405, 7405), Box(7405, 7405)),
+ Box(Box(7406, 7406), Box(7406, 7406)),
+ Box(Box(7407, 7407), Box(7407, 7407)),
+ Box(Box(7408, 7408), Box(7408, 7408)),
+ Box(Box(7409, 7409), Box(7409, 7409)),
+ Box(Box(7410, 7410), Box(7410, 7410)),
+ Box(Box(7411, 7411), Box(7411, 7411)),
+ Box(Box(7412, 7412), Box(7412, 7412)),
+ Box(Box(7413, 7413), Box(7413, 7413)),
+ Box(Box(7414, 7414), Box(7414, 7414)),
+ Box(Box(7415, 7415), Box(7415, 7415)),
+ Box(Box(7416, 7416), Box(7416, 7416)),
+ Box(Box(7417, 7417), Box(7417, 7417)),
+ Box(Box(7418, 7418), Box(7418, 7418)),
+ Box(Box(7419, 7419), Box(7419, 7419)),
+ Box(Box(7420, 7420), Box(7420, 7420)),
+ Box(Box(7421, 7421), Box(7421, 7421)),
+ Box(Box(7422, 7422), Box(7422, 7422)),
+ Box(Box(7423, 7423), Box(7423, 7423)),
+ Box(Box(7424, 7424), Box(7424, 7424)),
+ Box(Box(7425, 7425), Box(7425, 7425)),
+ Box(Box(7426, 7426), Box(7426, 7426)),
+ Box(Box(7427, 7427), Box(7427, 7427)),
+ Box(Box(7428, 7428), Box(7428, 7428)),
+ Box(Box(7429, 7429), Box(7429, 7429)),
+ Box(Box(7430, 7430), Box(7430, 7430)),
+ Box(Box(7431, 7431), Box(7431, 7431)),
+ Box(Box(7432, 7432), Box(7432, 7432)),
+ Box(Box(7433, 7433), Box(7433, 7433)),
+ Box(Box(7434, 7434), Box(7434, 7434)),
+ Box(Box(7435, 7435), Box(7435, 7435)),
+ Box(Box(7436, 7436), Box(7436, 7436)),
+ Box(Box(7437, 7437), Box(7437, 7437)),
+ Box(Box(7438, 7438), Box(7438, 7438)),
+ Box(Box(7439, 7439), Box(7439, 7439)),
+ Box(Box(7440, 7440), Box(7440, 7440)),
+ Box(Box(7441, 7441), Box(7441, 7441)),
+ Box(Box(7442, 7442), Box(7442, 7442)),
+ Box(Box(7443, 7443), Box(7443, 7443)),
+ Box(Box(7444, 7444), Box(7444, 7444)),
+ Box(Box(7445, 7445), Box(7445, 7445)),
+ Box(Box(7446, 7446), Box(7446, 7446)),
+ Box(Box(7447, 7447), Box(7447, 7447)),
+ Box(Box(7448, 7448), Box(7448, 7448)),
+ Box(Box(7449, 7449), Box(7449, 7449)),
+ Box(Box(7450, 7450), Box(7450, 7450)),
+ Box(Box(7451, 7451), Box(7451, 7451)),
+ Box(Box(7452, 7452), Box(7452, 7452)),
+ Box(Box(7453, 7453), Box(7453, 7453)),
+ Box(Box(7454, 7454), Box(7454, 7454)),
+ Box(Box(7455, 7455), Box(7455, 7455)),
+ Box(Box(7456, 7456), Box(7456, 7456)),
+ Box(Box(7457, 7457), Box(7457, 7457)),
+ Box(Box(7458, 7458), Box(7458, 7458)),
+ Box(Box(7459, 7459), Box(7459, 7459)),
+ Box(Box(7460, 7460), Box(7460, 7460)),
+ Box(Box(7461, 7461), Box(7461, 7461)),
+ Box(Box(7462, 7462), Box(7462, 7462)),
+ Box(Box(7463, 7463), Box(7463, 7463)),
+ Box(Box(7464, 7464), Box(7464, 7464)),
+ Box(Box(7465, 7465), Box(7465, 7465)),
+ Box(Box(7466, 7466), Box(7466, 7466)),
+ Box(Box(7467, 7467), Box(7467, 7467)),
+ Box(Box(7468, 7468), Box(7468, 7468)),
+ Box(Box(7469, 7469), Box(7469, 7469)),
+ Box(Box(7470, 7470), Box(7470, 7470)),
+ Box(Box(7471, 7471), Box(7471, 7471)),
+ Box(Box(7472, 7472), Box(7472, 7472)),
+ Box(Box(7473, 7473), Box(7473, 7473)),
+ Box(Box(7474, 7474), Box(7474, 7474)),
+ Box(Box(7475, 7475), Box(7475, 7475)),
+ Box(Box(7476, 7476), Box(7476, 7476)),
+ Box(Box(7477, 7477), Box(7477, 7477)),
+ Box(Box(7478, 7478), Box(7478, 7478)),
+ Box(Box(7479, 7479), Box(7479, 7479)),
+ Box(Box(7480, 7480), Box(7480, 7480)),
+ Box(Box(7481, 7481), Box(7481, 7481)),
+ Box(Box(7482, 7482), Box(7482, 7482)),
+ Box(Box(7483, 7483), Box(7483, 7483)),
+ Box(Box(7484, 7484), Box(7484, 7484)),
+ Box(Box(7485, 7485), Box(7485, 7485)),
+ Box(Box(7486, 7486), Box(7486, 7486)),
+ Box(Box(7487, 7487), Box(7487, 7487)),
+ Box(Box(7488, 7488), Box(7488, 7488)),
+ Box(Box(7489, 7489), Box(7489, 7489)),
+ Box(Box(7490, 7490), Box(7490, 7490)),
+ Box(Box(7491, 7491), Box(7491, 7491)),
+ Box(Box(7492, 7492), Box(7492, 7492)),
+ Box(Box(7493, 7493), Box(7493, 7493)),
+ Box(Box(7494, 7494), Box(7494, 7494)),
+ Box(Box(7495, 7495), Box(7495, 7495)),
+ Box(Box(7496, 7496), Box(7496, 7496)),
+ Box(Box(7497, 7497), Box(7497, 7497)),
+ Box(Box(7498, 7498), Box(7498, 7498)),
+ Box(Box(7499, 7499), Box(7499, 7499)),
+ Box(Box(7500, 7500), Box(7500, 7500)),
+ Box(Box(7501, 7501), Box(7501, 7501)),
+ Box(Box(7502, 7502), Box(7502, 7502)),
+ Box(Box(7503, 7503), Box(7503, 7503)),
+ Box(Box(7504, 7504), Box(7504, 7504)),
+ Box(Box(7505, 7505), Box(7505, 7505)),
+ Box(Box(7506, 7506), Box(7506, 7506)),
+ Box(Box(7507, 7507), Box(7507, 7507)),
+ Box(Box(7508, 7508), Box(7508, 7508)),
+ Box(Box(7509, 7509), Box(7509, 7509)),
+ Box(Box(7510, 7510), Box(7510, 7510)),
+ Box(Box(7511, 7511), Box(7511, 7511)),
+ Box(Box(7512, 7512), Box(7512, 7512)),
+ Box(Box(7513, 7513), Box(7513, 7513)),
+ Box(Box(7514, 7514), Box(7514, 7514)),
+ Box(Box(7515, 7515), Box(7515, 7515)),
+ Box(Box(7516, 7516), Box(7516, 7516)),
+ Box(Box(7517, 7517), Box(7517, 7517)),
+ Box(Box(7518, 7518), Box(7518, 7518)),
+ Box(Box(7519, 7519), Box(7519, 7519)),
+ Box(Box(7520, 7520), Box(7520, 7520)),
+ Box(Box(7521, 7521), Box(7521, 7521)),
+ Box(Box(7522, 7522), Box(7522, 7522)),
+ Box(Box(7523, 7523), Box(7523, 7523)),
+ Box(Box(7524, 7524), Box(7524, 7524)),
+ Box(Box(7525, 7525), Box(7525, 7525)),
+ Box(Box(7526, 7526), Box(7526, 7526)),
+ Box(Box(7527, 7527), Box(7527, 7527)),
+ Box(Box(7528, 7528), Box(7528, 7528)),
+ Box(Box(7529, 7529), Box(7529, 7529)),
+ Box(Box(7530, 7530), Box(7530, 7530)),
+ Box(Box(7531, 7531), Box(7531, 7531)),
+ Box(Box(7532, 7532), Box(7532, 7532)),
+ Box(Box(7533, 7533), Box(7533, 7533)),
+ Box(Box(7534, 7534), Box(7534, 7534)),
+ Box(Box(7535, 7535), Box(7535, 7535)),
+ Box(Box(7536, 7536), Box(7536, 7536)),
+ Box(Box(7537, 7537), Box(7537, 7537)),
+ Box(Box(7538, 7538), Box(7538, 7538)),
+ Box(Box(7539, 7539), Box(7539, 7539)),
+ Box(Box(7540, 7540), Box(7540, 7540)),
+ Box(Box(7541, 7541), Box(7541, 7541)),
+ Box(Box(7542, 7542), Box(7542, 7542)),
+ Box(Box(7543, 7543), Box(7543, 7543)),
+ Box(Box(7544, 7544), Box(7544, 7544)),
+ Box(Box(7545, 7545), Box(7545, 7545)),
+ Box(Box(7546, 7546), Box(7546, 7546)),
+ Box(Box(7547, 7547), Box(7547, 7547)),
+ Box(Box(7548, 7548), Box(7548, 7548)),
+ Box(Box(7549, 7549), Box(7549, 7549)),
+ Box(Box(7550, 7550), Box(7550, 7550)),
+ Box(Box(7551, 7551), Box(7551, 7551)),
+ Box(Box(7552, 7552), Box(7552, 7552)),
+ Box(Box(7553, 7553), Box(7553, 7553)),
+ Box(Box(7554, 7554), Box(7554, 7554)),
+ Box(Box(7555, 7555), Box(7555, 7555)),
+ Box(Box(7556, 7556), Box(7556, 7556)),
+ Box(Box(7557, 7557), Box(7557, 7557)),
+ Box(Box(7558, 7558), Box(7558, 7558)),
+ Box(Box(7559, 7559), Box(7559, 7559)),
+ Box(Box(7560, 7560), Box(7560, 7560)),
+ Box(Box(7561, 7561), Box(7561, 7561)),
+ Box(Box(7562, 7562), Box(7562, 7562)),
+ Box(Box(7563, 7563), Box(7563, 7563)),
+ Box(Box(7564, 7564), Box(7564, 7564)),
+ Box(Box(7565, 7565), Box(7565, 7565)),
+ Box(Box(7566, 7566), Box(7566, 7566)),
+ Box(Box(7567, 7567), Box(7567, 7567)),
+ Box(Box(7568, 7568), Box(7568, 7568)),
+ Box(Box(7569, 7569), Box(7569, 7569)),
+ Box(Box(7570, 7570), Box(7570, 7570)),
+ Box(Box(7571, 7571), Box(7571, 7571)),
+ Box(Box(7572, 7572), Box(7572, 7572)),
+ Box(Box(7573, 7573), Box(7573, 7573)),
+ Box(Box(7574, 7574), Box(7574, 7574)),
+ Box(Box(7575, 7575), Box(7575, 7575)),
+ Box(Box(7576, 7576), Box(7576, 7576)),
+ Box(Box(7577, 7577), Box(7577, 7577)),
+ Box(Box(7578, 7578), Box(7578, 7578)),
+ Box(Box(7579, 7579), Box(7579, 7579)),
+ Box(Box(7580, 7580), Box(7580, 7580)),
+ Box(Box(7581, 7581), Box(7581, 7581)),
+ Box(Box(7582, 7582), Box(7582, 7582)),
+ Box(Box(7583, 7583), Box(7583, 7583)),
+ Box(Box(7584, 7584), Box(7584, 7584)),
+ Box(Box(7585, 7585), Box(7585, 7585)),
+ Box(Box(7586, 7586), Box(7586, 7586)),
+ Box(Box(7587, 7587), Box(7587, 7587)),
+ Box(Box(7588, 7588), Box(7588, 7588)),
+ Box(Box(7589, 7589), Box(7589, 7589)),
+ Box(Box(7590, 7590), Box(7590, 7590)),
+ Box(Box(7591, 7591), Box(7591, 7591)),
+ Box(Box(7592, 7592), Box(7592, 7592)),
+ Box(Box(7593, 7593), Box(7593, 7593)),
+ Box(Box(7594, 7594), Box(7594, 7594)),
+ Box(Box(7595, 7595), Box(7595, 7595)),
+ Box(Box(7596, 7596), Box(7596, 7596)),
+ Box(Box(7597, 7597), Box(7597, 7597)),
+ Box(Box(7598, 7598), Box(7598, 7598)),
+ Box(Box(7599, 7599), Box(7599, 7599)),
+ Box(Box(7600, 7600), Box(7600, 7600)),
+ Box(Box(7601, 7601), Box(7601, 7601)),
+ Box(Box(7602, 7602), Box(7602, 7602)),
+ Box(Box(7603, 7603), Box(7603, 7603)),
+ Box(Box(7604, 7604), Box(7604, 7604)),
+ Box(Box(7605, 7605), Box(7605, 7605)),
+ Box(Box(7606, 7606), Box(7606, 7606)),
+ Box(Box(7607, 7607), Box(7607, 7607)),
+ Box(Box(7608, 7608), Box(7608, 7608)),
+ Box(Box(7609, 7609), Box(7609, 7609)),
+ Box(Box(7610, 7610), Box(7610, 7610)),
+ Box(Box(7611, 7611), Box(7611, 7611)),
+ Box(Box(7612, 7612), Box(7612, 7612)),
+ Box(Box(7613, 7613), Box(7613, 7613)),
+ Box(Box(7614, 7614), Box(7614, 7614)),
+ Box(Box(7615, 7615), Box(7615, 7615)),
+ Box(Box(7616, 7616), Box(7616, 7616)),
+ Box(Box(7617, 7617), Box(7617, 7617)),
+ Box(Box(7618, 7618), Box(7618, 7618)),
+ Box(Box(7619, 7619), Box(7619, 7619)),
+ Box(Box(7620, 7620), Box(7620, 7620)),
+ Box(Box(7621, 7621), Box(7621, 7621)),
+ Box(Box(7622, 7622), Box(7622, 7622)),
+ Box(Box(7623, 7623), Box(7623, 7623)),
+ Box(Box(7624, 7624), Box(7624, 7624)),
+ Box(Box(7625, 7625), Box(7625, 7625)),
+ Box(Box(7626, 7626), Box(7626, 7626)),
+ Box(Box(7627, 7627), Box(7627, 7627)),
+ Box(Box(7628, 7628), Box(7628, 7628)),
+ Box(Box(7629, 7629), Box(7629, 7629)),
+ Box(Box(7630, 7630), Box(7630, 7630)),
+ Box(Box(7631, 7631), Box(7631, 7631)),
+ Box(Box(7632, 7632), Box(7632, 7632)),
+ Box(Box(7633, 7633), Box(7633, 7633)),
+ Box(Box(7634, 7634), Box(7634, 7634)),
+ Box(Box(7635, 7635), Box(7635, 7635)),
+ Box(Box(7636, 7636), Box(7636, 7636)),
+ Box(Box(7637, 7637), Box(7637, 7637)),
+ Box(Box(7638, 7638), Box(7638, 7638)),
+ Box(Box(7639, 7639), Box(7639, 7639)),
+ Box(Box(7640, 7640), Box(7640, 7640)),
+ Box(Box(7641, 7641), Box(7641, 7641)),
+ Box(Box(7642, 7642), Box(7642, 7642)),
+ Box(Box(7643, 7643), Box(7643, 7643)),
+ Box(Box(7644, 7644), Box(7644, 7644)),
+ Box(Box(7645, 7645), Box(7645, 7645)),
+ Box(Box(7646, 7646), Box(7646, 7646)),
+ Box(Box(7647, 7647), Box(7647, 7647)),
+ Box(Box(7648, 7648), Box(7648, 7648)),
+ Box(Box(7649, 7649), Box(7649, 7649)),
+ Box(Box(7650, 7650), Box(7650, 7650)),
+ Box(Box(7651, 7651), Box(7651, 7651)),
+ Box(Box(7652, 7652), Box(7652, 7652)),
+ Box(Box(7653, 7653), Box(7653, 7653)),
+ Box(Box(7654, 7654), Box(7654, 7654)),
+ Box(Box(7655, 7655), Box(7655, 7655)),
+ Box(Box(7656, 7656), Box(7656, 7656)),
+ Box(Box(7657, 7657), Box(7657, 7657)),
+ Box(Box(7658, 7658), Box(7658, 7658)),
+ Box(Box(7659, 7659), Box(7659, 7659)),
+ Box(Box(7660, 7660), Box(7660, 7660)),
+ Box(Box(7661, 7661), Box(7661, 7661)),
+ Box(Box(7662, 7662), Box(7662, 7662)),
+ Box(Box(7663, 7663), Box(7663, 7663)),
+ Box(Box(7664, 7664), Box(7664, 7664)),
+ Box(Box(7665, 7665), Box(7665, 7665)),
+ Box(Box(7666, 7666), Box(7666, 7666)),
+ Box(Box(7667, 7667), Box(7667, 7667)),
+ Box(Box(7668, 7668), Box(7668, 7668)),
+ Box(Box(7669, 7669), Box(7669, 7669)),
+ Box(Box(7670, 7670), Box(7670, 7670)),
+ Box(Box(7671, 7671), Box(7671, 7671)),
+ Box(Box(7672, 7672), Box(7672, 7672)),
+ Box(Box(7673, 7673), Box(7673, 7673)),
+ Box(Box(7674, 7674), Box(7674, 7674)),
+ Box(Box(7675, 7675), Box(7675, 7675)),
+ Box(Box(7676, 7676), Box(7676, 7676)),
+ Box(Box(7677, 7677), Box(7677, 7677)),
+ Box(Box(7678, 7678), Box(7678, 7678)),
+ Box(Box(7679, 7679), Box(7679, 7679)),
+ Box(Box(7680, 7680), Box(7680, 7680)),
+ Box(Box(7681, 7681), Box(7681, 7681)),
+ Box(Box(7682, 7682), Box(7682, 7682)),
+ Box(Box(7683, 7683), Box(7683, 7683)),
+ Box(Box(7684, 7684), Box(7684, 7684)),
+ Box(Box(7685, 7685), Box(7685, 7685)),
+ Box(Box(7686, 7686), Box(7686, 7686)),
+ Box(Box(7687, 7687), Box(7687, 7687)),
+ Box(Box(7688, 7688), Box(7688, 7688)),
+ Box(Box(7689, 7689), Box(7689, 7689)),
+ Box(Box(7690, 7690), Box(7690, 7690)),
+ Box(Box(7691, 7691), Box(7691, 7691)),
+ Box(Box(7692, 7692), Box(7692, 7692)),
+ Box(Box(7693, 7693), Box(7693, 7693)),
+ Box(Box(7694, 7694), Box(7694, 7694)),
+ Box(Box(7695, 7695), Box(7695, 7695)),
+ Box(Box(7696, 7696), Box(7696, 7696)),
+ Box(Box(7697, 7697), Box(7697, 7697)),
+ Box(Box(7698, 7698), Box(7698, 7698)),
+ Box(Box(7699, 7699), Box(7699, 7699)),
+ Box(Box(7700, 7700), Box(7700, 7700)),
+ Box(Box(7701, 7701), Box(7701, 7701)),
+ Box(Box(7702, 7702), Box(7702, 7702)),
+ Box(Box(7703, 7703), Box(7703, 7703)),
+ Box(Box(7704, 7704), Box(7704, 7704)),
+ Box(Box(7705, 7705), Box(7705, 7705)),
+ Box(Box(7706, 7706), Box(7706, 7706)),
+ Box(Box(7707, 7707), Box(7707, 7707)),
+ Box(Box(7708, 7708), Box(7708, 7708)),
+ Box(Box(7709, 7709), Box(7709, 7709)),
+ Box(Box(7710, 7710), Box(7710, 7710)),
+ Box(Box(7711, 7711), Box(7711, 7711)),
+ Box(Box(7712, 7712), Box(7712, 7712)),
+ Box(Box(7713, 7713), Box(7713, 7713)),
+ Box(Box(7714, 7714), Box(7714, 7714)),
+ Box(Box(7715, 7715), Box(7715, 7715)),
+ Box(Box(7716, 7716), Box(7716, 7716)),
+ Box(Box(7717, 7717), Box(7717, 7717)),
+ Box(Box(7718, 7718), Box(7718, 7718)),
+ Box(Box(7719, 7719), Box(7719, 7719)),
+ Box(Box(7720, 7720), Box(7720, 7720)),
+ Box(Box(7721, 7721), Box(7721, 7721)),
+ Box(Box(7722, 7722), Box(7722, 7722)),
+ Box(Box(7723, 7723), Box(7723, 7723)),
+ Box(Box(7724, 7724), Box(7724, 7724)),
+ Box(Box(7725, 7725), Box(7725, 7725)),
+ Box(Box(7726, 7726), Box(7726, 7726)),
+ Box(Box(7727, 7727), Box(7727, 7727)),
+ Box(Box(7728, 7728), Box(7728, 7728)),
+ Box(Box(7729, 7729), Box(7729, 7729)),
+ Box(Box(7730, 7730), Box(7730, 7730)),
+ Box(Box(7731, 7731), Box(7731, 7731)),
+ Box(Box(7732, 7732), Box(7732, 7732)),
+ Box(Box(7733, 7733), Box(7733, 7733)),
+ Box(Box(7734, 7734), Box(7734, 7734)),
+ Box(Box(7735, 7735), Box(7735, 7735)),
+ Box(Box(7736, 7736), Box(7736, 7736)),
+ Box(Box(7737, 7737), Box(7737, 7737)),
+ Box(Box(7738, 7738), Box(7738, 7738)),
+ Box(Box(7739, 7739), Box(7739, 7739)),
+ Box(Box(7740, 7740), Box(7740, 7740)),
+ Box(Box(7741, 7741), Box(7741, 7741)),
+ Box(Box(7742, 7742), Box(7742, 7742)),
+ Box(Box(7743, 7743), Box(7743, 7743)),
+ Box(Box(7744, 7744), Box(7744, 7744)),
+ Box(Box(7745, 7745), Box(7745, 7745)),
+ Box(Box(7746, 7746), Box(7746, 7746)),
+ Box(Box(7747, 7747), Box(7747, 7747)),
+ Box(Box(7748, 7748), Box(7748, 7748)),
+ Box(Box(7749, 7749), Box(7749, 7749)),
+ Box(Box(7750, 7750), Box(7750, 7750)),
+ Box(Box(7751, 7751), Box(7751, 7751)),
+ Box(Box(7752, 7752), Box(7752, 7752)),
+ Box(Box(7753, 7753), Box(7753, 7753)),
+ Box(Box(7754, 7754), Box(7754, 7754)),
+ Box(Box(7755, 7755), Box(7755, 7755)),
+ Box(Box(7756, 7756), Box(7756, 7756)),
+ Box(Box(7757, 7757), Box(7757, 7757)),
+ Box(Box(7758, 7758), Box(7758, 7758)),
+ Box(Box(7759, 7759), Box(7759, 7759)),
+ Box(Box(7760, 7760), Box(7760, 7760)),
+ Box(Box(7761, 7761), Box(7761, 7761)),
+ Box(Box(7762, 7762), Box(7762, 7762)),
+ Box(Box(7763, 7763), Box(7763, 7763)),
+ Box(Box(7764, 7764), Box(7764, 7764)),
+ Box(Box(7765, 7765), Box(7765, 7765)),
+ Box(Box(7766, 7766), Box(7766, 7766)),
+ Box(Box(7767, 7767), Box(7767, 7767)),
+ Box(Box(7768, 7768), Box(7768, 7768)),
+ Box(Box(7769, 7769), Box(7769, 7769)),
+ Box(Box(7770, 7770), Box(7770, 7770)),
+ Box(Box(7771, 7771), Box(7771, 7771)),
+ Box(Box(7772, 7772), Box(7772, 7772)),
+ Box(Box(7773, 7773), Box(7773, 7773)),
+ Box(Box(7774, 7774), Box(7774, 7774)),
+ Box(Box(7775, 7775), Box(7775, 7775)),
+ Box(Box(7776, 7776), Box(7776, 7776)),
+ Box(Box(7777, 7777), Box(7777, 7777)),
+ Box(Box(7778, 7778), Box(7778, 7778)),
+ Box(Box(7779, 7779), Box(7779, 7779)),
+ Box(Box(7780, 7780), Box(7780, 7780)),
+ Box(Box(7781, 7781), Box(7781, 7781)),
+ Box(Box(7782, 7782), Box(7782, 7782)),
+ Box(Box(7783, 7783), Box(7783, 7783)),
+ Box(Box(7784, 7784), Box(7784, 7784)),
+ Box(Box(7785, 7785), Box(7785, 7785)),
+ Box(Box(7786, 7786), Box(7786, 7786)),
+ Box(Box(7787, 7787), Box(7787, 7787)),
+ Box(Box(7788, 7788), Box(7788, 7788)),
+ Box(Box(7789, 7789), Box(7789, 7789)),
+ Box(Box(7790, 7790), Box(7790, 7790)),
+ Box(Box(7791, 7791), Box(7791, 7791)),
+ Box(Box(7792, 7792), Box(7792, 7792)),
+ Box(Box(7793, 7793), Box(7793, 7793)),
+ Box(Box(7794, 7794), Box(7794, 7794)),
+ Box(Box(7795, 7795), Box(7795, 7795)),
+ Box(Box(7796, 7796), Box(7796, 7796)),
+ Box(Box(7797, 7797), Box(7797, 7797)),
+ Box(Box(7798, 7798), Box(7798, 7798)),
+ Box(Box(7799, 7799), Box(7799, 7799)),
+ Box(Box(7800, 7800), Box(7800, 7800)),
+ Box(Box(7801, 7801), Box(7801, 7801)),
+ Box(Box(7802, 7802), Box(7802, 7802)),
+ Box(Box(7803, 7803), Box(7803, 7803)),
+ Box(Box(7804, 7804), Box(7804, 7804)),
+ Box(Box(7805, 7805), Box(7805, 7805)),
+ Box(Box(7806, 7806), Box(7806, 7806)),
+ Box(Box(7807, 7807), Box(7807, 7807)),
+ Box(Box(7808, 7808), Box(7808, 7808)),
+ Box(Box(7809, 7809), Box(7809, 7809)),
+ Box(Box(7810, 7810), Box(7810, 7810)),
+ Box(Box(7811, 7811), Box(7811, 7811)),
+ Box(Box(7812, 7812), Box(7812, 7812)),
+ Box(Box(7813, 7813), Box(7813, 7813)),
+ Box(Box(7814, 7814), Box(7814, 7814)),
+ Box(Box(7815, 7815), Box(7815, 7815)),
+ Box(Box(7816, 7816), Box(7816, 7816)),
+ Box(Box(7817, 7817), Box(7817, 7817)),
+ Box(Box(7818, 7818), Box(7818, 7818)),
+ Box(Box(7819, 7819), Box(7819, 7819)),
+ Box(Box(7820, 7820), Box(7820, 7820)),
+ Box(Box(7821, 7821), Box(7821, 7821)),
+ Box(Box(7822, 7822), Box(7822, 7822)),
+ Box(Box(7823, 7823), Box(7823, 7823)),
+ Box(Box(7824, 7824), Box(7824, 7824)),
+ Box(Box(7825, 7825), Box(7825, 7825)),
+ Box(Box(7826, 7826), Box(7826, 7826)),
+ Box(Box(7827, 7827), Box(7827, 7827)),
+ Box(Box(7828, 7828), Box(7828, 7828)),
+ Box(Box(7829, 7829), Box(7829, 7829)),
+ Box(Box(7830, 7830), Box(7830, 7830)),
+ Box(Box(7831, 7831), Box(7831, 7831)),
+ Box(Box(7832, 7832), Box(7832, 7832)),
+ Box(Box(7833, 7833), Box(7833, 7833)),
+ Box(Box(7834, 7834), Box(7834, 7834)),
+ Box(Box(7835, 7835), Box(7835, 7835)),
+ Box(Box(7836, 7836), Box(7836, 7836)),
+ Box(Box(7837, 7837), Box(7837, 7837)),
+ Box(Box(7838, 7838), Box(7838, 7838)),
+ Box(Box(7839, 7839), Box(7839, 7839)),
+ Box(Box(7840, 7840), Box(7840, 7840)),
+ Box(Box(7841, 7841), Box(7841, 7841)),
+ Box(Box(7842, 7842), Box(7842, 7842)),
+ Box(Box(7843, 7843), Box(7843, 7843)),
+ Box(Box(7844, 7844), Box(7844, 7844)),
+ Box(Box(7845, 7845), Box(7845, 7845)),
+ Box(Box(7846, 7846), Box(7846, 7846)),
+ Box(Box(7847, 7847), Box(7847, 7847)),
+ Box(Box(7848, 7848), Box(7848, 7848)),
+ Box(Box(7849, 7849), Box(7849, 7849)),
+ Box(Box(7850, 7850), Box(7850, 7850)),
+ Box(Box(7851, 7851), Box(7851, 7851)),
+ Box(Box(7852, 7852), Box(7852, 7852)),
+ Box(Box(7853, 7853), Box(7853, 7853)),
+ Box(Box(7854, 7854), Box(7854, 7854)),
+ Box(Box(7855, 7855), Box(7855, 7855)),
+ Box(Box(7856, 7856), Box(7856, 7856)),
+ Box(Box(7857, 7857), Box(7857, 7857)),
+ Box(Box(7858, 7858), Box(7858, 7858)),
+ Box(Box(7859, 7859), Box(7859, 7859)),
+ Box(Box(7860, 7860), Box(7860, 7860)),
+ Box(Box(7861, 7861), Box(7861, 7861)),
+ Box(Box(7862, 7862), Box(7862, 7862)),
+ Box(Box(7863, 7863), Box(7863, 7863)),
+ Box(Box(7864, 7864), Box(7864, 7864)),
+ Box(Box(7865, 7865), Box(7865, 7865)),
+ Box(Box(7866, 7866), Box(7866, 7866)),
+ Box(Box(7867, 7867), Box(7867, 7867)),
+ Box(Box(7868, 7868), Box(7868, 7868)),
+ Box(Box(7869, 7869), Box(7869, 7869)),
+ Box(Box(7870, 7870), Box(7870, 7870)),
+ Box(Box(7871, 7871), Box(7871, 7871)),
+ Box(Box(7872, 7872), Box(7872, 7872)),
+ Box(Box(7873, 7873), Box(7873, 7873)),
+ Box(Box(7874, 7874), Box(7874, 7874)),
+ Box(Box(7875, 7875), Box(7875, 7875)),
+ Box(Box(7876, 7876), Box(7876, 7876)),
+ Box(Box(7877, 7877), Box(7877, 7877)),
+ Box(Box(7878, 7878), Box(7878, 7878)),
+ Box(Box(7879, 7879), Box(7879, 7879)),
+ Box(Box(7880, 7880), Box(7880, 7880)),
+ Box(Box(7881, 7881), Box(7881, 7881)),
+ Box(Box(7882, 7882), Box(7882, 7882)),
+ Box(Box(7883, 7883), Box(7883, 7883)),
+ Box(Box(7884, 7884), Box(7884, 7884)),
+ Box(Box(7885, 7885), Box(7885, 7885)),
+ Box(Box(7886, 7886), Box(7886, 7886)),
+ Box(Box(7887, 7887), Box(7887, 7887)),
+ Box(Box(7888, 7888), Box(7888, 7888)),
+ Box(Box(7889, 7889), Box(7889, 7889)),
+ Box(Box(7890, 7890), Box(7890, 7890)),
+ Box(Box(7891, 7891), Box(7891, 7891)),
+ Box(Box(7892, 7892), Box(7892, 7892)),
+ Box(Box(7893, 7893), Box(7893, 7893)),
+ Box(Box(7894, 7894), Box(7894, 7894)),
+ Box(Box(7895, 7895), Box(7895, 7895)),
+ Box(Box(7896, 7896), Box(7896, 7896)),
+ Box(Box(7897, 7897), Box(7897, 7897)),
+ Box(Box(7898, 7898), Box(7898, 7898)),
+ Box(Box(7899, 7899), Box(7899, 7899)),
+ Box(Box(7900, 7900), Box(7900, 7900)),
+ Box(Box(7901, 7901), Box(7901, 7901)),
+ Box(Box(7902, 7902), Box(7902, 7902)),
+ Box(Box(7903, 7903), Box(7903, 7903)),
+ Box(Box(7904, 7904), Box(7904, 7904)),
+ Box(Box(7905, 7905), Box(7905, 7905)),
+ Box(Box(7906, 7906), Box(7906, 7906)),
+ Box(Box(7907, 7907), Box(7907, 7907)),
+ Box(Box(7908, 7908), Box(7908, 7908)),
+ Box(Box(7909, 7909), Box(7909, 7909)),
+ Box(Box(7910, 7910), Box(7910, 7910)),
+ Box(Box(7911, 7911), Box(7911, 7911)),
+ Box(Box(7912, 7912), Box(7912, 7912)),
+ Box(Box(7913, 7913), Box(7913, 7913)),
+ Box(Box(7914, 7914), Box(7914, 7914)),
+ Box(Box(7915, 7915), Box(7915, 7915)),
+ Box(Box(7916, 7916), Box(7916, 7916)),
+ Box(Box(7917, 7917), Box(7917, 7917)),
+ Box(Box(7918, 7918), Box(7918, 7918)),
+ Box(Box(7919, 7919), Box(7919, 7919)),
+ Box(Box(7920, 7920), Box(7920, 7920)),
+ Box(Box(7921, 7921), Box(7921, 7921)),
+ Box(Box(7922, 7922), Box(7922, 7922)),
+ Box(Box(7923, 7923), Box(7923, 7923)),
+ Box(Box(7924, 7924), Box(7924, 7924)),
+ Box(Box(7925, 7925), Box(7925, 7925)),
+ Box(Box(7926, 7926), Box(7926, 7926)),
+ Box(Box(7927, 7927), Box(7927, 7927)),
+ Box(Box(7928, 7928), Box(7928, 7928)),
+ Box(Box(7929, 7929), Box(7929, 7929)),
+ Box(Box(7930, 7930), Box(7930, 7930)),
+ Box(Box(7931, 7931), Box(7931, 7931)),
+ Box(Box(7932, 7932), Box(7932, 7932)),
+ Box(Box(7933, 7933), Box(7933, 7933)),
+ Box(Box(7934, 7934), Box(7934, 7934)),
+ Box(Box(7935, 7935), Box(7935, 7935)),
+ Box(Box(7936, 7936), Box(7936, 7936)),
+ Box(Box(7937, 7937), Box(7937, 7937)),
+ Box(Box(7938, 7938), Box(7938, 7938)),
+ Box(Box(7939, 7939), Box(7939, 7939)),
+ Box(Box(7940, 7940), Box(7940, 7940)),
+ Box(Box(7941, 7941), Box(7941, 7941)),
+ Box(Box(7942, 7942), Box(7942, 7942)),
+ Box(Box(7943, 7943), Box(7943, 7943)),
+ Box(Box(7944, 7944), Box(7944, 7944)),
+ Box(Box(7945, 7945), Box(7945, 7945)),
+ Box(Box(7946, 7946), Box(7946, 7946)),
+ Box(Box(7947, 7947), Box(7947, 7947)),
+ Box(Box(7948, 7948), Box(7948, 7948)),
+ Box(Box(7949, 7949), Box(7949, 7949)),
+ Box(Box(7950, 7950), Box(7950, 7950)),
+ Box(Box(7951, 7951), Box(7951, 7951)),
+ Box(Box(7952, 7952), Box(7952, 7952)),
+ Box(Box(7953, 7953), Box(7953, 7953)),
+ Box(Box(7954, 7954), Box(7954, 7954)),
+ Box(Box(7955, 7955), Box(7955, 7955)),
+ Box(Box(7956, 7956), Box(7956, 7956)),
+ Box(Box(7957, 7957), Box(7957, 7957)),
+ Box(Box(7958, 7958), Box(7958, 7958)),
+ Box(Box(7959, 7959), Box(7959, 7959)),
+ Box(Box(7960, 7960), Box(7960, 7960)),
+ Box(Box(7961, 7961), Box(7961, 7961)),
+ Box(Box(7962, 7962), Box(7962, 7962)),
+ Box(Box(7963, 7963), Box(7963, 7963)),
+ Box(Box(7964, 7964), Box(7964, 7964)),
+ Box(Box(7965, 7965), Box(7965, 7965)),
+ Box(Box(7966, 7966), Box(7966, 7966)),
+ Box(Box(7967, 7967), Box(7967, 7967)),
+ Box(Box(7968, 7968), Box(7968, 7968)),
+ Box(Box(7969, 7969), Box(7969, 7969)),
+ Box(Box(7970, 7970), Box(7970, 7970)),
+ Box(Box(7971, 7971), Box(7971, 7971)),
+ Box(Box(7972, 7972), Box(7972, 7972)),
+ Box(Box(7973, 7973), Box(7973, 7973)),
+ Box(Box(7974, 7974), Box(7974, 7974)),
+ Box(Box(7975, 7975), Box(7975, 7975)),
+ Box(Box(7976, 7976), Box(7976, 7976)),
+ Box(Box(7977, 7977), Box(7977, 7977)),
+ Box(Box(7978, 7978), Box(7978, 7978)),
+ Box(Box(7979, 7979), Box(7979, 7979)),
+ Box(Box(7980, 7980), Box(7980, 7980)),
+ Box(Box(7981, 7981), Box(7981, 7981)),
+ Box(Box(7982, 7982), Box(7982, 7982)),
+ Box(Box(7983, 7983), Box(7983, 7983)),
+ Box(Box(7984, 7984), Box(7984, 7984)),
+ Box(Box(7985, 7985), Box(7985, 7985)),
+ Box(Box(7986, 7986), Box(7986, 7986)),
+ Box(Box(7987, 7987), Box(7987, 7987)),
+ Box(Box(7988, 7988), Box(7988, 7988)),
+ Box(Box(7989, 7989), Box(7989, 7989)),
+ Box(Box(7990, 7990), Box(7990, 7990)),
+ Box(Box(7991, 7991), Box(7991, 7991)),
+ Box(Box(7992, 7992), Box(7992, 7992)),
+ Box(Box(7993, 7993), Box(7993, 7993)),
+ Box(Box(7994, 7994), Box(7994, 7994)),
+ Box(Box(7995, 7995), Box(7995, 7995)),
+ Box(Box(7996, 7996), Box(7996, 7996)),
+ Box(Box(7997, 7997), Box(7997, 7997)),
+ Box(Box(7998, 7998), Box(7998, 7998)),
+ Box(Box(7999, 7999), Box(7999, 7999)),
+ Box(Box(8000, 8000), Box(8000, 8000)),
+ Box(Box(8001, 8001), Box(8001, 8001)),
+ Box(Box(8002, 8002), Box(8002, 8002)),
+ Box(Box(8003, 8003), Box(8003, 8003)),
+ Box(Box(8004, 8004), Box(8004, 8004)),
+ Box(Box(8005, 8005), Box(8005, 8005)),
+ Box(Box(8006, 8006), Box(8006, 8006)),
+ Box(Box(8007, 8007), Box(8007, 8007)),
+ Box(Box(8008, 8008), Box(8008, 8008)),
+ Box(Box(8009, 8009), Box(8009, 8009)),
+ Box(Box(8010, 8010), Box(8010, 8010)),
+ Box(Box(8011, 8011), Box(8011, 8011)),
+ Box(Box(8012, 8012), Box(8012, 8012)),
+ Box(Box(8013, 8013), Box(8013, 8013)),
+ Box(Box(8014, 8014), Box(8014, 8014)),
+ Box(Box(8015, 8015), Box(8015, 8015)),
+ Box(Box(8016, 8016), Box(8016, 8016)),
+ Box(Box(8017, 8017), Box(8017, 8017)),
+ Box(Box(8018, 8018), Box(8018, 8018)),
+ Box(Box(8019, 8019), Box(8019, 8019)),
+ Box(Box(8020, 8020), Box(8020, 8020)),
+ Box(Box(8021, 8021), Box(8021, 8021)),
+ Box(Box(8022, 8022), Box(8022, 8022)),
+ Box(Box(8023, 8023), Box(8023, 8023)),
+ Box(Box(8024, 8024), Box(8024, 8024)),
+ Box(Box(8025, 8025), Box(8025, 8025)),
+ Box(Box(8026, 8026), Box(8026, 8026)),
+ Box(Box(8027, 8027), Box(8027, 8027)),
+ Box(Box(8028, 8028), Box(8028, 8028)),
+ Box(Box(8029, 8029), Box(8029, 8029)),
+ Box(Box(8030, 8030), Box(8030, 8030)),
+ Box(Box(8031, 8031), Box(8031, 8031)),
+ Box(Box(8032, 8032), Box(8032, 8032)),
+ Box(Box(8033, 8033), Box(8033, 8033)),
+ Box(Box(8034, 8034), Box(8034, 8034)),
+ Box(Box(8035, 8035), Box(8035, 8035)),
+ Box(Box(8036, 8036), Box(8036, 8036)),
+ Box(Box(8037, 8037), Box(8037, 8037)),
+ Box(Box(8038, 8038), Box(8038, 8038)),
+ Box(Box(8039, 8039), Box(8039, 8039)),
+ Box(Box(8040, 8040), Box(8040, 8040)),
+ Box(Box(8041, 8041), Box(8041, 8041)),
+ Box(Box(8042, 8042), Box(8042, 8042)),
+ Box(Box(8043, 8043), Box(8043, 8043)),
+ Box(Box(8044, 8044), Box(8044, 8044)),
+ Box(Box(8045, 8045), Box(8045, 8045)),
+ Box(Box(8046, 8046), Box(8046, 8046)),
+ Box(Box(8047, 8047), Box(8047, 8047)),
+ Box(Box(8048, 8048), Box(8048, 8048)),
+ Box(Box(8049, 8049), Box(8049, 8049)),
+ Box(Box(8050, 8050), Box(8050, 8050)),
+ Box(Box(8051, 8051), Box(8051, 8051)),
+ Box(Box(8052, 8052), Box(8052, 8052)),
+ Box(Box(8053, 8053), Box(8053, 8053)),
+ Box(Box(8054, 8054), Box(8054, 8054)),
+ Box(Box(8055, 8055), Box(8055, 8055)),
+ Box(Box(8056, 8056), Box(8056, 8056)),
+ Box(Box(8057, 8057), Box(8057, 8057)),
+ Box(Box(8058, 8058), Box(8058, 8058)),
+ Box(Box(8059, 8059), Box(8059, 8059)),
+ Box(Box(8060, 8060), Box(8060, 8060)),
+ Box(Box(8061, 8061), Box(8061, 8061)),
+ Box(Box(8062, 8062), Box(8062, 8062)),
+ Box(Box(8063, 8063), Box(8063, 8063)),
+ Box(Box(8064, 8064), Box(8064, 8064)),
+ Box(Box(8065, 8065), Box(8065, 8065)),
+ Box(Box(8066, 8066), Box(8066, 8066)),
+ Box(Box(8067, 8067), Box(8067, 8067)),
+ Box(Box(8068, 8068), Box(8068, 8068)),
+ Box(Box(8069, 8069), Box(8069, 8069)),
+ Box(Box(8070, 8070), Box(8070, 8070)),
+ Box(Box(8071, 8071), Box(8071, 8071)),
+ Box(Box(8072, 8072), Box(8072, 8072)),
+ Box(Box(8073, 8073), Box(8073, 8073)),
+ Box(Box(8074, 8074), Box(8074, 8074)),
+ Box(Box(8075, 8075), Box(8075, 8075)),
+ Box(Box(8076, 8076), Box(8076, 8076)),
+ Box(Box(8077, 8077), Box(8077, 8077)),
+ Box(Box(8078, 8078), Box(8078, 8078)),
+ Box(Box(8079, 8079), Box(8079, 8079)),
+ Box(Box(8080, 8080), Box(8080, 8080)),
+ Box(Box(8081, 8081), Box(8081, 8081)),
+ Box(Box(8082, 8082), Box(8082, 8082)),
+ Box(Box(8083, 8083), Box(8083, 8083)),
+ Box(Box(8084, 8084), Box(8084, 8084)),
+ Box(Box(8085, 8085), Box(8085, 8085)),
+ Box(Box(8086, 8086), Box(8086, 8086)),
+ Box(Box(8087, 8087), Box(8087, 8087)),
+ Box(Box(8088, 8088), Box(8088, 8088)),
+ Box(Box(8089, 8089), Box(8089, 8089)),
+ Box(Box(8090, 8090), Box(8090, 8090)),
+ Box(Box(8091, 8091), Box(8091, 8091)),
+ Box(Box(8092, 8092), Box(8092, 8092)),
+ Box(Box(8093, 8093), Box(8093, 8093)),
+ Box(Box(8094, 8094), Box(8094, 8094)),
+ Box(Box(8095, 8095), Box(8095, 8095)),
+ Box(Box(8096, 8096), Box(8096, 8096)),
+ Box(Box(8097, 8097), Box(8097, 8097)),
+ Box(Box(8098, 8098), Box(8098, 8098)),
+ Box(Box(8099, 8099), Box(8099, 8099)),
+ Box(Box(8100, 8100), Box(8100, 8100)),
+ Box(Box(8101, 8101), Box(8101, 8101)),
+ Box(Box(8102, 8102), Box(8102, 8102)),
+ Box(Box(8103, 8103), Box(8103, 8103)),
+ Box(Box(8104, 8104), Box(8104, 8104)),
+ Box(Box(8105, 8105), Box(8105, 8105)),
+ Box(Box(8106, 8106), Box(8106, 8106)),
+ Box(Box(8107, 8107), Box(8107, 8107)),
+ Box(Box(8108, 8108), Box(8108, 8108)),
+ Box(Box(8109, 8109), Box(8109, 8109)),
+ Box(Box(8110, 8110), Box(8110, 8110)),
+ Box(Box(8111, 8111), Box(8111, 8111)),
+ Box(Box(8112, 8112), Box(8112, 8112)),
+ Box(Box(8113, 8113), Box(8113, 8113)),
+ Box(Box(8114, 8114), Box(8114, 8114)),
+ Box(Box(8115, 8115), Box(8115, 8115)),
+ Box(Box(8116, 8116), Box(8116, 8116)),
+ Box(Box(8117, 8117), Box(8117, 8117)),
+ Box(Box(8118, 8118), Box(8118, 8118)),
+ Box(Box(8119, 8119), Box(8119, 8119)),
+ Box(Box(8120, 8120), Box(8120, 8120)),
+ Box(Box(8121, 8121), Box(8121, 8121)),
+ Box(Box(8122, 8122), Box(8122, 8122)),
+ Box(Box(8123, 8123), Box(8123, 8123)),
+ Box(Box(8124, 8124), Box(8124, 8124)),
+ Box(Box(8125, 8125), Box(8125, 8125)),
+ Box(Box(8126, 8126), Box(8126, 8126)),
+ Box(Box(8127, 8127), Box(8127, 8127)),
+ Box(Box(8128, 8128), Box(8128, 8128)),
+ Box(Box(8129, 8129), Box(8129, 8129)),
+ Box(Box(8130, 8130), Box(8130, 8130)),
+ Box(Box(8131, 8131), Box(8131, 8131)),
+ Box(Box(8132, 8132), Box(8132, 8132)),
+ Box(Box(8133, 8133), Box(8133, 8133)),
+ Box(Box(8134, 8134), Box(8134, 8134)),
+ Box(Box(8135, 8135), Box(8135, 8135)),
+ Box(Box(8136, 8136), Box(8136, 8136)),
+ Box(Box(8137, 8137), Box(8137, 8137)),
+ Box(Box(8138, 8138), Box(8138, 8138)),
+ Box(Box(8139, 8139), Box(8139, 8139)),
+ Box(Box(8140, 8140), Box(8140, 8140)),
+ Box(Box(8141, 8141), Box(8141, 8141)),
+ Box(Box(8142, 8142), Box(8142, 8142)),
+ Box(Box(8143, 8143), Box(8143, 8143)),
+ Box(Box(8144, 8144), Box(8144, 8144)),
+ Box(Box(8145, 8145), Box(8145, 8145)),
+ Box(Box(8146, 8146), Box(8146, 8146)),
+ Box(Box(8147, 8147), Box(8147, 8147)),
+ Box(Box(8148, 8148), Box(8148, 8148)),
+ Box(Box(8149, 8149), Box(8149, 8149)),
+ Box(Box(8150, 8150), Box(8150, 8150)),
+ Box(Box(8151, 8151), Box(8151, 8151)),
+ Box(Box(8152, 8152), Box(8152, 8152)),
+ Box(Box(8153, 8153), Box(8153, 8153)),
+ Box(Box(8154, 8154), Box(8154, 8154)),
+ Box(Box(8155, 8155), Box(8155, 8155)),
+ Box(Box(8156, 8156), Box(8156, 8156)),
+ Box(Box(8157, 8157), Box(8157, 8157)),
+ Box(Box(8158, 8158), Box(8158, 8158)),
+ Box(Box(8159, 8159), Box(8159, 8159)),
+ Box(Box(8160, 8160), Box(8160, 8160)),
+ Box(Box(8161, 8161), Box(8161, 8161)),
+ Box(Box(8162, 8162), Box(8162, 8162)),
+ Box(Box(8163, 8163), Box(8163, 8163)),
+ Box(Box(8164, 8164), Box(8164, 8164)),
+ Box(Box(8165, 8165), Box(8165, 8165)),
+ Box(Box(8166, 8166), Box(8166, 8166)),
+ Box(Box(8167, 8167), Box(8167, 8167)),
+ Box(Box(8168, 8168), Box(8168, 8168)),
+ Box(Box(8169, 8169), Box(8169, 8169)),
+ Box(Box(8170, 8170), Box(8170, 8170)),
+ Box(Box(8171, 8171), Box(8171, 8171)),
+ Box(Box(8172, 8172), Box(8172, 8172)),
+ Box(Box(8173, 8173), Box(8173, 8173)),
+ Box(Box(8174, 8174), Box(8174, 8174)),
+ Box(Box(8175, 8175), Box(8175, 8175)),
+ Box(Box(8176, 8176), Box(8176, 8176)),
+ Box(Box(8177, 8177), Box(8177, 8177)),
+ Box(Box(8178, 8178), Box(8178, 8178)),
+ Box(Box(8179, 8179), Box(8179, 8179)),
+ Box(Box(8180, 8180), Box(8180, 8180)),
+ Box(Box(8181, 8181), Box(8181, 8181)),
+ Box(Box(8182, 8182), Box(8182, 8182)),
+ Box(Box(8183, 8183), Box(8183, 8183)),
+ Box(Box(8184, 8184), Box(8184, 8184)),
+ Box(Box(8185, 8185), Box(8185, 8185)),
+ Box(Box(8186, 8186), Box(8186, 8186)),
+ Box(Box(8187, 8187), Box(8187, 8187)),
+ Box(Box(8188, 8188), Box(8188, 8188)),
+ Box(Box(8189, 8189), Box(8189, 8189)),
+ Box(Box(8190, 8190), Box(8190, 8190)),
+ Box(Box(8191, 8191), Box(8191, 8191)),
+ Box(Box(8192, 8192), Box(8192, 8192)),
+ Box(Box(8193, 8193), Box(8193, 8193)),
+ Box(Box(8194, 8194), Box(8194, 8194)),
+ Box(Box(8195, 8195), Box(8195, 8195)),
+ Box(Box(8196, 8196), Box(8196, 8196)),
+ Box(Box(8197, 8197), Box(8197, 8197)),
+ Box(Box(8198, 8198), Box(8198, 8198)),
+ Box(Box(8199, 8199), Box(8199, 8199)),
+ Box(Box(8200, 8200), Box(8200, 8200)),
+ Box(Box(8201, 8201), Box(8201, 8201)),
+ Box(Box(8202, 8202), Box(8202, 8202)),
+ Box(Box(8203, 8203), Box(8203, 8203)),
+ Box(Box(8204, 8204), Box(8204, 8204)),
+ Box(Box(8205, 8205), Box(8205, 8205)),
+ Box(Box(8206, 8206), Box(8206, 8206)),
+ Box(Box(8207, 8207), Box(8207, 8207)),
+ Box(Box(8208, 8208), Box(8208, 8208)),
+ Box(Box(8209, 8209), Box(8209, 8209)),
+ Box(Box(8210, 8210), Box(8210, 8210)),
+ Box(Box(8211, 8211), Box(8211, 8211)),
+ Box(Box(8212, 8212), Box(8212, 8212)),
+ Box(Box(8213, 8213), Box(8213, 8213)),
+ Box(Box(8214, 8214), Box(8214, 8214)),
+ Box(Box(8215, 8215), Box(8215, 8215)),
+ Box(Box(8216, 8216), Box(8216, 8216)),
+ Box(Box(8217, 8217), Box(8217, 8217)),
+ Box(Box(8218, 8218), Box(8218, 8218)),
+ Box(Box(8219, 8219), Box(8219, 8219)),
+ Box(Box(8220, 8220), Box(8220, 8220)),
+ Box(Box(8221, 8221), Box(8221, 8221)),
+ Box(Box(8222, 8222), Box(8222, 8222)),
+ Box(Box(8223, 8223), Box(8223, 8223)),
+ Box(Box(8224, 8224), Box(8224, 8224)),
+ Box(Box(8225, 8225), Box(8225, 8225)),
+ Box(Box(8226, 8226), Box(8226, 8226)),
+ Box(Box(8227, 8227), Box(8227, 8227)),
+ Box(Box(8228, 8228), Box(8228, 8228)),
+ Box(Box(8229, 8229), Box(8229, 8229)),
+ Box(Box(8230, 8230), Box(8230, 8230)),
+ Box(Box(8231, 8231), Box(8231, 8231)),
+ Box(Box(8232, 8232), Box(8232, 8232)),
+ Box(Box(8233, 8233), Box(8233, 8233)),
+ Box(Box(8234, 8234), Box(8234, 8234)),
+ Box(Box(8235, 8235), Box(8235, 8235)),
+ Box(Box(8236, 8236), Box(8236, 8236)),
+ Box(Box(8237, 8237), Box(8237, 8237)),
+ Box(Box(8238, 8238), Box(8238, 8238)),
+ Box(Box(8239, 8239), Box(8239, 8239)),
+ Box(Box(8240, 8240), Box(8240, 8240)),
+ Box(Box(8241, 8241), Box(8241, 8241)),
+ Box(Box(8242, 8242), Box(8242, 8242)),
+ Box(Box(8243, 8243), Box(8243, 8243)),
+ Box(Box(8244, 8244), Box(8244, 8244)),
+ Box(Box(8245, 8245), Box(8245, 8245)),
+ Box(Box(8246, 8246), Box(8246, 8246)),
+ Box(Box(8247, 8247), Box(8247, 8247)),
+ Box(Box(8248, 8248), Box(8248, 8248)),
+ Box(Box(8249, 8249), Box(8249, 8249)),
+ Box(Box(8250, 8250), Box(8250, 8250)),
+ Box(Box(8251, 8251), Box(8251, 8251)),
+ Box(Box(8252, 8252), Box(8252, 8252)),
+ Box(Box(8253, 8253), Box(8253, 8253)),
+ Box(Box(8254, 8254), Box(8254, 8254)),
+ Box(Box(8255, 8255), Box(8255, 8255)),
+ Box(Box(8256, 8256), Box(8256, 8256)),
+ Box(Box(8257, 8257), Box(8257, 8257)),
+ Box(Box(8258, 8258), Box(8258, 8258)),
+ Box(Box(8259, 8259), Box(8259, 8259)),
+ Box(Box(8260, 8260), Box(8260, 8260)),
+ Box(Box(8261, 8261), Box(8261, 8261)),
+ Box(Box(8262, 8262), Box(8262, 8262)),
+ Box(Box(8263, 8263), Box(8263, 8263)),
+ Box(Box(8264, 8264), Box(8264, 8264)),
+ Box(Box(8265, 8265), Box(8265, 8265)),
+ Box(Box(8266, 8266), Box(8266, 8266)),
+ Box(Box(8267, 8267), Box(8267, 8267)),
+ Box(Box(8268, 8268), Box(8268, 8268)),
+ Box(Box(8269, 8269), Box(8269, 8269)),
+ Box(Box(8270, 8270), Box(8270, 8270)),
+ Box(Box(8271, 8271), Box(8271, 8271)),
+ Box(Box(8272, 8272), Box(8272, 8272)),
+ Box(Box(8273, 8273), Box(8273, 8273)),
+ Box(Box(8274, 8274), Box(8274, 8274)),
+ Box(Box(8275, 8275), Box(8275, 8275)),
+ Box(Box(8276, 8276), Box(8276, 8276)),
+ Box(Box(8277, 8277), Box(8277, 8277)),
+ Box(Box(8278, 8278), Box(8278, 8278)),
+ Box(Box(8279, 8279), Box(8279, 8279)),
+ Box(Box(8280, 8280), Box(8280, 8280)),
+ Box(Box(8281, 8281), Box(8281, 8281)),
+ Box(Box(8282, 8282), Box(8282, 8282)),
+ Box(Box(8283, 8283), Box(8283, 8283)),
+ Box(Box(8284, 8284), Box(8284, 8284)),
+ Box(Box(8285, 8285), Box(8285, 8285)),
+ Box(Box(8286, 8286), Box(8286, 8286)),
+ Box(Box(8287, 8287), Box(8287, 8287)),
+ Box(Box(8288, 8288), Box(8288, 8288)),
+ Box(Box(8289, 8289), Box(8289, 8289)),
+ Box(Box(8290, 8290), Box(8290, 8290)),
+ Box(Box(8291, 8291), Box(8291, 8291)),
+ Box(Box(8292, 8292), Box(8292, 8292)),
+ Box(Box(8293, 8293), Box(8293, 8293)),
+ Box(Box(8294, 8294), Box(8294, 8294)),
+ Box(Box(8295, 8295), Box(8295, 8295)),
+ Box(Box(8296, 8296), Box(8296, 8296)),
+ Box(Box(8297, 8297), Box(8297, 8297)),
+ Box(Box(8298, 8298), Box(8298, 8298)),
+ Box(Box(8299, 8299), Box(8299, 8299)),
+ Box(Box(8300, 8300), Box(8300, 8300)),
+ Box(Box(8301, 8301), Box(8301, 8301)),
+ Box(Box(8302, 8302), Box(8302, 8302)),
+ Box(Box(8303, 8303), Box(8303, 8303)),
+ Box(Box(8304, 8304), Box(8304, 8304)),
+ Box(Box(8305, 8305), Box(8305, 8305)),
+ Box(Box(8306, 8306), Box(8306, 8306)),
+ Box(Box(8307, 8307), Box(8307, 8307)),
+ Box(Box(8308, 8308), Box(8308, 8308)),
+ Box(Box(8309, 8309), Box(8309, 8309)),
+ Box(Box(8310, 8310), Box(8310, 8310)),
+ Box(Box(8311, 8311), Box(8311, 8311)),
+ Box(Box(8312, 8312), Box(8312, 8312)),
+ Box(Box(8313, 8313), Box(8313, 8313)),
+ Box(Box(8314, 8314), Box(8314, 8314)),
+ Box(Box(8315, 8315), Box(8315, 8315)),
+ Box(Box(8316, 8316), Box(8316, 8316)),
+ Box(Box(8317, 8317), Box(8317, 8317)),
+ Box(Box(8318, 8318), Box(8318, 8318)),
+ Box(Box(8319, 8319), Box(8319, 8319)),
+ Box(Box(8320, 8320), Box(8320, 8320)),
+ Box(Box(8321, 8321), Box(8321, 8321)),
+ Box(Box(8322, 8322), Box(8322, 8322)),
+ Box(Box(8323, 8323), Box(8323, 8323)),
+ Box(Box(8324, 8324), Box(8324, 8324)),
+ Box(Box(8325, 8325), Box(8325, 8325)),
+ Box(Box(8326, 8326), Box(8326, 8326)),
+ Box(Box(8327, 8327), Box(8327, 8327)),
+ Box(Box(8328, 8328), Box(8328, 8328)),
+ Box(Box(8329, 8329), Box(8329, 8329)),
+ Box(Box(8330, 8330), Box(8330, 8330)),
+ Box(Box(8331, 8331), Box(8331, 8331)),
+ Box(Box(8332, 8332), Box(8332, 8332)),
+ Box(Box(8333, 8333), Box(8333, 8333)),
+ Box(Box(8334, 8334), Box(8334, 8334)),
+ Box(Box(8335, 8335), Box(8335, 8335)),
+ Box(Box(8336, 8336), Box(8336, 8336)),
+ Box(Box(8337, 8337), Box(8337, 8337)),
+ Box(Box(8338, 8338), Box(8338, 8338)),
+ Box(Box(8339, 8339), Box(8339, 8339)),
+ Box(Box(8340, 8340), Box(8340, 8340)),
+ Box(Box(8341, 8341), Box(8341, 8341)),
+ Box(Box(8342, 8342), Box(8342, 8342)),
+ Box(Box(8343, 8343), Box(8343, 8343)),
+ Box(Box(8344, 8344), Box(8344, 8344)),
+ Box(Box(8345, 8345), Box(8345, 8345)),
+ Box(Box(8346, 8346), Box(8346, 8346)),
+ Box(Box(8347, 8347), Box(8347, 8347)),
+ Box(Box(8348, 8348), Box(8348, 8348)),
+ Box(Box(8349, 8349), Box(8349, 8349)),
+ Box(Box(8350, 8350), Box(8350, 8350)),
+ Box(Box(8351, 8351), Box(8351, 8351)),
+ Box(Box(8352, 8352), Box(8352, 8352)),
+ Box(Box(8353, 8353), Box(8353, 8353)),
+ Box(Box(8354, 8354), Box(8354, 8354)),
+ Box(Box(8355, 8355), Box(8355, 8355)),
+ Box(Box(8356, 8356), Box(8356, 8356)),
+ Box(Box(8357, 8357), Box(8357, 8357)),
+ Box(Box(8358, 8358), Box(8358, 8358)),
+ Box(Box(8359, 8359), Box(8359, 8359)),
+ Box(Box(8360, 8360), Box(8360, 8360)),
+ Box(Box(8361, 8361), Box(8361, 8361)),
+ Box(Box(8362, 8362), Box(8362, 8362)),
+ Box(Box(8363, 8363), Box(8363, 8363)),
+ Box(Box(8364, 8364), Box(8364, 8364)),
+ Box(Box(8365, 8365), Box(8365, 8365)),
+ Box(Box(8366, 8366), Box(8366, 8366)),
+ Box(Box(8367, 8367), Box(8367, 8367)),
+ Box(Box(8368, 8368), Box(8368, 8368)),
+ Box(Box(8369, 8369), Box(8369, 8369)),
+ Box(Box(8370, 8370), Box(8370, 8370)),
+ Box(Box(8371, 8371), Box(8371, 8371)),
+ Box(Box(8372, 8372), Box(8372, 8372)),
+ Box(Box(8373, 8373), Box(8373, 8373)),
+ Box(Box(8374, 8374), Box(8374, 8374)),
+ Box(Box(8375, 8375), Box(8375, 8375)),
+ Box(Box(8376, 8376), Box(8376, 8376)),
+ Box(Box(8377, 8377), Box(8377, 8377)),
+ Box(Box(8378, 8378), Box(8378, 8378)),
+ Box(Box(8379, 8379), Box(8379, 8379)),
+ Box(Box(8380, 8380), Box(8380, 8380)),
+ Box(Box(8381, 8381), Box(8381, 8381)),
+ Box(Box(8382, 8382), Box(8382, 8382)),
+ Box(Box(8383, 8383), Box(8383, 8383)),
+ Box(Box(8384, 8384), Box(8384, 8384)),
+ Box(Box(8385, 8385), Box(8385, 8385)),
+ Box(Box(8386, 8386), Box(8386, 8386)),
+ Box(Box(8387, 8387), Box(8387, 8387)),
+ Box(Box(8388, 8388), Box(8388, 8388)),
+ Box(Box(8389, 8389), Box(8389, 8389)),
+ Box(Box(8390, 8390), Box(8390, 8390)),
+ Box(Box(8391, 8391), Box(8391, 8391)),
+ Box(Box(8392, 8392), Box(8392, 8392)),
+ Box(Box(8393, 8393), Box(8393, 8393)),
+ Box(Box(8394, 8394), Box(8394, 8394)),
+ Box(Box(8395, 8395), Box(8395, 8395)),
+ Box(Box(8396, 8396), Box(8396, 8396)),
+ Box(Box(8397, 8397), Box(8397, 8397)),
+ Box(Box(8398, 8398), Box(8398, 8398)),
+ Box(Box(8399, 8399), Box(8399, 8399)),
+ Box(Box(8400, 8400), Box(8400, 8400)),
+ Box(Box(8401, 8401), Box(8401, 8401)),
+ Box(Box(8402, 8402), Box(8402, 8402)),
+ Box(Box(8403, 8403), Box(8403, 8403)),
+ Box(Box(8404, 8404), Box(8404, 8404)),
+ Box(Box(8405, 8405), Box(8405, 8405)),
+ Box(Box(8406, 8406), Box(8406, 8406)),
+ Box(Box(8407, 8407), Box(8407, 8407)),
+ Box(Box(8408, 8408), Box(8408, 8408)),
+ Box(Box(8409, 8409), Box(8409, 8409)),
+ Box(Box(8410, 8410), Box(8410, 8410)),
+ Box(Box(8411, 8411), Box(8411, 8411)),
+ Box(Box(8412, 8412), Box(8412, 8412)),
+ Box(Box(8413, 8413), Box(8413, 8413)),
+ Box(Box(8414, 8414), Box(8414, 8414)),
+ Box(Box(8415, 8415), Box(8415, 8415)),
+ Box(Box(8416, 8416), Box(8416, 8416)),
+ Box(Box(8417, 8417), Box(8417, 8417)),
+ Box(Box(8418, 8418), Box(8418, 8418)),
+ Box(Box(8419, 8419), Box(8419, 8419)),
+ Box(Box(8420, 8420), Box(8420, 8420)),
+ Box(Box(8421, 8421), Box(8421, 8421)),
+ Box(Box(8422, 8422), Box(8422, 8422)),
+ Box(Box(8423, 8423), Box(8423, 8423)),
+ Box(Box(8424, 8424), Box(8424, 8424)),
+ Box(Box(8425, 8425), Box(8425, 8425)),
+ Box(Box(8426, 8426), Box(8426, 8426)),
+ Box(Box(8427, 8427), Box(8427, 8427)),
+ Box(Box(8428, 8428), Box(8428, 8428)),
+ Box(Box(8429, 8429), Box(8429, 8429)),
+ Box(Box(8430, 8430), Box(8430, 8430)),
+ Box(Box(8431, 8431), Box(8431, 8431)),
+ Box(Box(8432, 8432), Box(8432, 8432)),
+ Box(Box(8433, 8433), Box(8433, 8433)),
+ Box(Box(8434, 8434), Box(8434, 8434)),
+ Box(Box(8435, 8435), Box(8435, 8435)),
+ Box(Box(8436, 8436), Box(8436, 8436)),
+ Box(Box(8437, 8437), Box(8437, 8437)),
+ Box(Box(8438, 8438), Box(8438, 8438)),
+ Box(Box(8439, 8439), Box(8439, 8439)),
+ Box(Box(8440, 8440), Box(8440, 8440)),
+ Box(Box(8441, 8441), Box(8441, 8441)),
+ Box(Box(8442, 8442), Box(8442, 8442)),
+ Box(Box(8443, 8443), Box(8443, 8443)),
+ Box(Box(8444, 8444), Box(8444, 8444)),
+ Box(Box(8445, 8445), Box(8445, 8445)),
+ Box(Box(8446, 8446), Box(8446, 8446)),
+ Box(Box(8447, 8447), Box(8447, 8447)),
+ Box(Box(8448, 8448), Box(8448, 8448)),
+ Box(Box(8449, 8449), Box(8449, 8449)),
+ Box(Box(8450, 8450), Box(8450, 8450)),
+ Box(Box(8451, 8451), Box(8451, 8451)),
+ Box(Box(8452, 8452), Box(8452, 8452)),
+ Box(Box(8453, 8453), Box(8453, 8453)),
+ Box(Box(8454, 8454), Box(8454, 8454)),
+ Box(Box(8455, 8455), Box(8455, 8455)),
+ Box(Box(8456, 8456), Box(8456, 8456)),
+ Box(Box(8457, 8457), Box(8457, 8457)),
+ Box(Box(8458, 8458), Box(8458, 8458)),
+ Box(Box(8459, 8459), Box(8459, 8459)),
+ Box(Box(8460, 8460), Box(8460, 8460)),
+ Box(Box(8461, 8461), Box(8461, 8461)),
+ Box(Box(8462, 8462), Box(8462, 8462)),
+ Box(Box(8463, 8463), Box(8463, 8463)),
+ Box(Box(8464, 8464), Box(8464, 8464)),
+ Box(Box(8465, 8465), Box(8465, 8465)),
+ Box(Box(8466, 8466), Box(8466, 8466)),
+ Box(Box(8467, 8467), Box(8467, 8467)),
+ Box(Box(8468, 8468), Box(8468, 8468)),
+ Box(Box(8469, 8469), Box(8469, 8469)),
+ Box(Box(8470, 8470), Box(8470, 8470)),
+ Box(Box(8471, 8471), Box(8471, 8471)),
+ Box(Box(8472, 8472), Box(8472, 8472)),
+ Box(Box(8473, 8473), Box(8473, 8473)),
+ Box(Box(8474, 8474), Box(8474, 8474)),
+ Box(Box(8475, 8475), Box(8475, 8475)),
+ Box(Box(8476, 8476), Box(8476, 8476)),
+ Box(Box(8477, 8477), Box(8477, 8477)),
+ Box(Box(8478, 8478), Box(8478, 8478)),
+ Box(Box(8479, 8479), Box(8479, 8479)),
+ Box(Box(8480, 8480), Box(8480, 8480)),
+ Box(Box(8481, 8481), Box(8481, 8481)),
+ Box(Box(8482, 8482), Box(8482, 8482)),
+ Box(Box(8483, 8483), Box(8483, 8483)),
+ Box(Box(8484, 8484), Box(8484, 8484)),
+ Box(Box(8485, 8485), Box(8485, 8485)),
+ Box(Box(8486, 8486), Box(8486, 8486)),
+ Box(Box(8487, 8487), Box(8487, 8487)),
+ Box(Box(8488, 8488), Box(8488, 8488)),
+ Box(Box(8489, 8489), Box(8489, 8489)),
+ Box(Box(8490, 8490), Box(8490, 8490)),
+ Box(Box(8491, 8491), Box(8491, 8491)),
+ Box(Box(8492, 8492), Box(8492, 8492)),
+ Box(Box(8493, 8493), Box(8493, 8493)),
+ Box(Box(8494, 8494), Box(8494, 8494)),
+ Box(Box(8495, 8495), Box(8495, 8495)),
+ Box(Box(8496, 8496), Box(8496, 8496)),
+ Box(Box(8497, 8497), Box(8497, 8497)),
+ Box(Box(8498, 8498), Box(8498, 8498)),
+ Box(Box(8499, 8499), Box(8499, 8499)),
+ Box(Box(8500, 8500), Box(8500, 8500)),
+ Box(Box(8501, 8501), Box(8501, 8501)),
+ Box(Box(8502, 8502), Box(8502, 8502)),
+ Box(Box(8503, 8503), Box(8503, 8503)),
+ Box(Box(8504, 8504), Box(8504, 8504)),
+ Box(Box(8505, 8505), Box(8505, 8505)),
+ Box(Box(8506, 8506), Box(8506, 8506)),
+ Box(Box(8507, 8507), Box(8507, 8507)),
+ Box(Box(8508, 8508), Box(8508, 8508)),
+ Box(Box(8509, 8509), Box(8509, 8509)),
+ Box(Box(8510, 8510), Box(8510, 8510)),
+ Box(Box(8511, 8511), Box(8511, 8511)),
+ Box(Box(8512, 8512), Box(8512, 8512)),
+ Box(Box(8513, 8513), Box(8513, 8513)),
+ Box(Box(8514, 8514), Box(8514, 8514)),
+ Box(Box(8515, 8515), Box(8515, 8515)),
+ Box(Box(8516, 8516), Box(8516, 8516)),
+ Box(Box(8517, 8517), Box(8517, 8517)),
+ Box(Box(8518, 8518), Box(8518, 8518)),
+ Box(Box(8519, 8519), Box(8519, 8519)),
+ Box(Box(8520, 8520), Box(8520, 8520)),
+ Box(Box(8521, 8521), Box(8521, 8521)),
+ Box(Box(8522, 8522), Box(8522, 8522)),
+ Box(Box(8523, 8523), Box(8523, 8523)),
+ Box(Box(8524, 8524), Box(8524, 8524)),
+ Box(Box(8525, 8525), Box(8525, 8525)),
+ Box(Box(8526, 8526), Box(8526, 8526)),
+ Box(Box(8527, 8527), Box(8527, 8527)),
+ Box(Box(8528, 8528), Box(8528, 8528)),
+ Box(Box(8529, 8529), Box(8529, 8529)),
+ Box(Box(8530, 8530), Box(8530, 8530)),
+ Box(Box(8531, 8531), Box(8531, 8531)),
+ Box(Box(8532, 8532), Box(8532, 8532)),
+ Box(Box(8533, 8533), Box(8533, 8533)),
+ Box(Box(8534, 8534), Box(8534, 8534)),
+ Box(Box(8535, 8535), Box(8535, 8535)),
+ Box(Box(8536, 8536), Box(8536, 8536)),
+ Box(Box(8537, 8537), Box(8537, 8537)),
+ Box(Box(8538, 8538), Box(8538, 8538)),
+ Box(Box(8539, 8539), Box(8539, 8539)),
+ Box(Box(8540, 8540), Box(8540, 8540)),
+ Box(Box(8541, 8541), Box(8541, 8541)),
+ Box(Box(8542, 8542), Box(8542, 8542)),
+ Box(Box(8543, 8543), Box(8543, 8543)),
+ Box(Box(8544, 8544), Box(8544, 8544)),
+ Box(Box(8545, 8545), Box(8545, 8545)),
+ Box(Box(8546, 8546), Box(8546, 8546)),
+ Box(Box(8547, 8547), Box(8547, 8547)),
+ Box(Box(8548, 8548), Box(8548, 8548)),
+ Box(Box(8549, 8549), Box(8549, 8549)),
+ Box(Box(8550, 8550), Box(8550, 8550)),
+ Box(Box(8551, 8551), Box(8551, 8551)),
+ Box(Box(8552, 8552), Box(8552, 8552)),
+ Box(Box(8553, 8553), Box(8553, 8553)),
+ Box(Box(8554, 8554), Box(8554, 8554)),
+ Box(Box(8555, 8555), Box(8555, 8555)),
+ Box(Box(8556, 8556), Box(8556, 8556)),
+ Box(Box(8557, 8557), Box(8557, 8557)),
+ Box(Box(8558, 8558), Box(8558, 8558)),
+ Box(Box(8559, 8559), Box(8559, 8559)),
+ Box(Box(8560, 8560), Box(8560, 8560)),
+ Box(Box(8561, 8561), Box(8561, 8561)),
+ Box(Box(8562, 8562), Box(8562, 8562)),
+ Box(Box(8563, 8563), Box(8563, 8563)),
+ Box(Box(8564, 8564), Box(8564, 8564)),
+ Box(Box(8565, 8565), Box(8565, 8565)),
+ Box(Box(8566, 8566), Box(8566, 8566)),
+ Box(Box(8567, 8567), Box(8567, 8567)),
+ Box(Box(8568, 8568), Box(8568, 8568)),
+ Box(Box(8569, 8569), Box(8569, 8569)),
+ Box(Box(8570, 8570), Box(8570, 8570)),
+ Box(Box(8571, 8571), Box(8571, 8571)),
+ Box(Box(8572, 8572), Box(8572, 8572)),
+ Box(Box(8573, 8573), Box(8573, 8573)),
+ Box(Box(8574, 8574), Box(8574, 8574)),
+ Box(Box(8575, 8575), Box(8575, 8575)),
+ Box(Box(8576, 8576), Box(8576, 8576)),
+ Box(Box(8577, 8577), Box(8577, 8577)),
+ Box(Box(8578, 8578), Box(8578, 8578)),
+ Box(Box(8579, 8579), Box(8579, 8579)),
+ Box(Box(8580, 8580), Box(8580, 8580)),
+ Box(Box(8581, 8581), Box(8581, 8581)),
+ Box(Box(8582, 8582), Box(8582, 8582)),
+ Box(Box(8583, 8583), Box(8583, 8583)),
+ Box(Box(8584, 8584), Box(8584, 8584)),
+ Box(Box(8585, 8585), Box(8585, 8585)),
+ Box(Box(8586, 8586), Box(8586, 8586)),
+ Box(Box(8587, 8587), Box(8587, 8587)),
+ Box(Box(8588, 8588), Box(8588, 8588)),
+ Box(Box(8589, 8589), Box(8589, 8589)),
+ Box(Box(8590, 8590), Box(8590, 8590)),
+ Box(Box(8591, 8591), Box(8591, 8591)),
+ Box(Box(8592, 8592), Box(8592, 8592)),
+ Box(Box(8593, 8593), Box(8593, 8593)),
+ Box(Box(8594, 8594), Box(8594, 8594)),
+ Box(Box(8595, 8595), Box(8595, 8595)),
+ Box(Box(8596, 8596), Box(8596, 8596)),
+ Box(Box(8597, 8597), Box(8597, 8597)),
+ Box(Box(8598, 8598), Box(8598, 8598)),
+ Box(Box(8599, 8599), Box(8599, 8599)),
+ Box(Box(8600, 8600), Box(8600, 8600)),
+ Box(Box(8601, 8601), Box(8601, 8601)),
+ Box(Box(8602, 8602), Box(8602, 8602)),
+ Box(Box(8603, 8603), Box(8603, 8603)),
+ Box(Box(8604, 8604), Box(8604, 8604)),
+ Box(Box(8605, 8605), Box(8605, 8605)),
+ Box(Box(8606, 8606), Box(8606, 8606)),
+ Box(Box(8607, 8607), Box(8607, 8607)),
+ Box(Box(8608, 8608), Box(8608, 8608)),
+ Box(Box(8609, 8609), Box(8609, 8609)),
+ Box(Box(8610, 8610), Box(8610, 8610)),
+ Box(Box(8611, 8611), Box(8611, 8611)),
+ Box(Box(8612, 8612), Box(8612, 8612)),
+ Box(Box(8613, 8613), Box(8613, 8613)),
+ Box(Box(8614, 8614), Box(8614, 8614)),
+ Box(Box(8615, 8615), Box(8615, 8615)),
+ Box(Box(8616, 8616), Box(8616, 8616)),
+ Box(Box(8617, 8617), Box(8617, 8617)),
+ Box(Box(8618, 8618), Box(8618, 8618)),
+ Box(Box(8619, 8619), Box(8619, 8619)),
+ Box(Box(8620, 8620), Box(8620, 8620)),
+ Box(Box(8621, 8621), Box(8621, 8621)),
+ Box(Box(8622, 8622), Box(8622, 8622)),
+ Box(Box(8623, 8623), Box(8623, 8623)),
+ Box(Box(8624, 8624), Box(8624, 8624)),
+ Box(Box(8625, 8625), Box(8625, 8625)),
+ Box(Box(8626, 8626), Box(8626, 8626)),
+ Box(Box(8627, 8627), Box(8627, 8627)),
+ Box(Box(8628, 8628), Box(8628, 8628)),
+ Box(Box(8629, 8629), Box(8629, 8629)),
+ Box(Box(8630, 8630), Box(8630, 8630)),
+ Box(Box(8631, 8631), Box(8631, 8631)),
+ Box(Box(8632, 8632), Box(8632, 8632)),
+ Box(Box(8633, 8633), Box(8633, 8633)),
+ Box(Box(8634, 8634), Box(8634, 8634)),
+ Box(Box(8635, 8635), Box(8635, 8635)),
+ Box(Box(8636, 8636), Box(8636, 8636)),
+ Box(Box(8637, 8637), Box(8637, 8637)),
+ Box(Box(8638, 8638), Box(8638, 8638)),
+ Box(Box(8639, 8639), Box(8639, 8639)),
+ Box(Box(8640, 8640), Box(8640, 8640)),
+ Box(Box(8641, 8641), Box(8641, 8641)),
+ Box(Box(8642, 8642), Box(8642, 8642)),
+ Box(Box(8643, 8643), Box(8643, 8643)),
+ Box(Box(8644, 8644), Box(8644, 8644)),
+ Box(Box(8645, 8645), Box(8645, 8645)),
+ Box(Box(8646, 8646), Box(8646, 8646)),
+ Box(Box(8647, 8647), Box(8647, 8647)),
+ Box(Box(8648, 8648), Box(8648, 8648)),
+ Box(Box(8649, 8649), Box(8649, 8649)),
+ Box(Box(8650, 8650), Box(8650, 8650)),
+ Box(Box(8651, 8651), Box(8651, 8651)),
+ Box(Box(8652, 8652), Box(8652, 8652)),
+ Box(Box(8653, 8653), Box(8653, 8653)),
+ Box(Box(8654, 8654), Box(8654, 8654)),
+ Box(Box(8655, 8655), Box(8655, 8655)),
+ Box(Box(8656, 8656), Box(8656, 8656)),
+ Box(Box(8657, 8657), Box(8657, 8657)),
+ Box(Box(8658, 8658), Box(8658, 8658)),
+ Box(Box(8659, 8659), Box(8659, 8659)),
+ Box(Box(8660, 8660), Box(8660, 8660)),
+ Box(Box(8661, 8661), Box(8661, 8661)),
+ Box(Box(8662, 8662), Box(8662, 8662)),
+ Box(Box(8663, 8663), Box(8663, 8663)),
+ Box(Box(8664, 8664), Box(8664, 8664)),
+ Box(Box(8665, 8665), Box(8665, 8665)),
+ Box(Box(8666, 8666), Box(8666, 8666)),
+ Box(Box(8667, 8667), Box(8667, 8667)),
+ Box(Box(8668, 8668), Box(8668, 8668)),
+ Box(Box(8669, 8669), Box(8669, 8669)),
+ Box(Box(8670, 8670), Box(8670, 8670)),
+ Box(Box(8671, 8671), Box(8671, 8671)),
+ Box(Box(8672, 8672), Box(8672, 8672)),
+ Box(Box(8673, 8673), Box(8673, 8673)),
+ Box(Box(8674, 8674), Box(8674, 8674)),
+ Box(Box(8675, 8675), Box(8675, 8675)),
+ Box(Box(8676, 8676), Box(8676, 8676)),
+ Box(Box(8677, 8677), Box(8677, 8677)),
+ Box(Box(8678, 8678), Box(8678, 8678)),
+ Box(Box(8679, 8679), Box(8679, 8679)),
+ Box(Box(8680, 8680), Box(8680, 8680)),
+ Box(Box(8681, 8681), Box(8681, 8681)),
+ Box(Box(8682, 8682), Box(8682, 8682)),
+ Box(Box(8683, 8683), Box(8683, 8683)),
+ Box(Box(8684, 8684), Box(8684, 8684)),
+ Box(Box(8685, 8685), Box(8685, 8685)),
+ Box(Box(8686, 8686), Box(8686, 8686)),
+ Box(Box(8687, 8687), Box(8687, 8687)),
+ Box(Box(8688, 8688), Box(8688, 8688)),
+ Box(Box(8689, 8689), Box(8689, 8689)),
+ Box(Box(8690, 8690), Box(8690, 8690)),
+ Box(Box(8691, 8691), Box(8691, 8691)),
+ Box(Box(8692, 8692), Box(8692, 8692)),
+ Box(Box(8693, 8693), Box(8693, 8693)),
+ Box(Box(8694, 8694), Box(8694, 8694)),
+ Box(Box(8695, 8695), Box(8695, 8695)),
+ Box(Box(8696, 8696), Box(8696, 8696)),
+ Box(Box(8697, 8697), Box(8697, 8697)),
+ Box(Box(8698, 8698), Box(8698, 8698)),
+ Box(Box(8699, 8699), Box(8699, 8699)),
+ Box(Box(8700, 8700), Box(8700, 8700)),
+ Box(Box(8701, 8701), Box(8701, 8701)),
+ Box(Box(8702, 8702), Box(8702, 8702)),
+ Box(Box(8703, 8703), Box(8703, 8703)),
+ Box(Box(8704, 8704), Box(8704, 8704)),
+ Box(Box(8705, 8705), Box(8705, 8705)),
+ Box(Box(8706, 8706), Box(8706, 8706)),
+ Box(Box(8707, 8707), Box(8707, 8707)),
+ Box(Box(8708, 8708), Box(8708, 8708)),
+ Box(Box(8709, 8709), Box(8709, 8709)),
+ Box(Box(8710, 8710), Box(8710, 8710)),
+ Box(Box(8711, 8711), Box(8711, 8711)),
+ Box(Box(8712, 8712), Box(8712, 8712)),
+ Box(Box(8713, 8713), Box(8713, 8713)),
+ Box(Box(8714, 8714), Box(8714, 8714)),
+ Box(Box(8715, 8715), Box(8715, 8715)),
+ Box(Box(8716, 8716), Box(8716, 8716)),
+ Box(Box(8717, 8717), Box(8717, 8717)),
+ Box(Box(8718, 8718), Box(8718, 8718)),
+ Box(Box(8719, 8719), Box(8719, 8719)),
+ Box(Box(8720, 8720), Box(8720, 8720)),
+ Box(Box(8721, 8721), Box(8721, 8721)),
+ Box(Box(8722, 8722), Box(8722, 8722)),
+ Box(Box(8723, 8723), Box(8723, 8723)),
+ Box(Box(8724, 8724), Box(8724, 8724)),
+ Box(Box(8725, 8725), Box(8725, 8725)),
+ Box(Box(8726, 8726), Box(8726, 8726)),
+ Box(Box(8727, 8727), Box(8727, 8727)),
+ Box(Box(8728, 8728), Box(8728, 8728)),
+ Box(Box(8729, 8729), Box(8729, 8729)),
+ Box(Box(8730, 8730), Box(8730, 8730)),
+ Box(Box(8731, 8731), Box(8731, 8731)),
+ Box(Box(8732, 8732), Box(8732, 8732)),
+ Box(Box(8733, 8733), Box(8733, 8733)),
+ Box(Box(8734, 8734), Box(8734, 8734)),
+ Box(Box(8735, 8735), Box(8735, 8735)),
+ Box(Box(8736, 8736), Box(8736, 8736)),
+ Box(Box(8737, 8737), Box(8737, 8737)),
+ Box(Box(8738, 8738), Box(8738, 8738)),
+ Box(Box(8739, 8739), Box(8739, 8739)),
+ Box(Box(8740, 8740), Box(8740, 8740)),
+ Box(Box(8741, 8741), Box(8741, 8741)),
+ Box(Box(8742, 8742), Box(8742, 8742)),
+ Box(Box(8743, 8743), Box(8743, 8743)),
+ Box(Box(8744, 8744), Box(8744, 8744)),
+ Box(Box(8745, 8745), Box(8745, 8745)),
+ Box(Box(8746, 8746), Box(8746, 8746)),
+ Box(Box(8747, 8747), Box(8747, 8747)),
+ Box(Box(8748, 8748), Box(8748, 8748)),
+ Box(Box(8749, 8749), Box(8749, 8749)),
+ Box(Box(8750, 8750), Box(8750, 8750)),
+ Box(Box(8751, 8751), Box(8751, 8751)),
+ Box(Box(8752, 8752), Box(8752, 8752)),
+ Box(Box(8753, 8753), Box(8753, 8753)),
+ Box(Box(8754, 8754), Box(8754, 8754)),
+ Box(Box(8755, 8755), Box(8755, 8755)),
+ Box(Box(8756, 8756), Box(8756, 8756)),
+ Box(Box(8757, 8757), Box(8757, 8757)),
+ Box(Box(8758, 8758), Box(8758, 8758)),
+ Box(Box(8759, 8759), Box(8759, 8759)),
+ Box(Box(8760, 8760), Box(8760, 8760)),
+ Box(Box(8761, 8761), Box(8761, 8761)),
+ Box(Box(8762, 8762), Box(8762, 8762)),
+ Box(Box(8763, 8763), Box(8763, 8763)),
+ Box(Box(8764, 8764), Box(8764, 8764)),
+ Box(Box(8765, 8765), Box(8765, 8765)),
+ Box(Box(8766, 8766), Box(8766, 8766)),
+ Box(Box(8767, 8767), Box(8767, 8767)),
+ Box(Box(8768, 8768), Box(8768, 8768)),
+ Box(Box(8769, 8769), Box(8769, 8769)),
+ Box(Box(8770, 8770), Box(8770, 8770)),
+ Box(Box(8771, 8771), Box(8771, 8771)),
+ Box(Box(8772, 8772), Box(8772, 8772)),
+ Box(Box(8773, 8773), Box(8773, 8773)),
+ Box(Box(8774, 8774), Box(8774, 8774)),
+ Box(Box(8775, 8775), Box(8775, 8775)),
+ Box(Box(8776, 8776), Box(8776, 8776)),
+ Box(Box(8777, 8777), Box(8777, 8777)),
+ Box(Box(8778, 8778), Box(8778, 8778)),
+ Box(Box(8779, 8779), Box(8779, 8779)),
+ Box(Box(8780, 8780), Box(8780, 8780)),
+ Box(Box(8781, 8781), Box(8781, 8781)),
+ Box(Box(8782, 8782), Box(8782, 8782)),
+ Box(Box(8783, 8783), Box(8783, 8783)),
+ Box(Box(8784, 8784), Box(8784, 8784)),
+ Box(Box(8785, 8785), Box(8785, 8785)),
+ Box(Box(8786, 8786), Box(8786, 8786)),
+ Box(Box(8787, 8787), Box(8787, 8787)),
+ Box(Box(8788, 8788), Box(8788, 8788)),
+ Box(Box(8789, 8789), Box(8789, 8789)),
+ Box(Box(8790, 8790), Box(8790, 8790)),
+ Box(Box(8791, 8791), Box(8791, 8791)),
+ Box(Box(8792, 8792), Box(8792, 8792)),
+ Box(Box(8793, 8793), Box(8793, 8793)),
+ Box(Box(8794, 8794), Box(8794, 8794)),
+ Box(Box(8795, 8795), Box(8795, 8795)),
+ Box(Box(8796, 8796), Box(8796, 8796)),
+ Box(Box(8797, 8797), Box(8797, 8797)),
+ Box(Box(8798, 8798), Box(8798, 8798)),
+ Box(Box(8799, 8799), Box(8799, 8799)),
+ Box(Box(8800, 8800), Box(8800, 8800)),
+ Box(Box(8801, 8801), Box(8801, 8801)),
+ Box(Box(8802, 8802), Box(8802, 8802)),
+ Box(Box(8803, 8803), Box(8803, 8803)),
+ Box(Box(8804, 8804), Box(8804, 8804)),
+ Box(Box(8805, 8805), Box(8805, 8805)),
+ Box(Box(8806, 8806), Box(8806, 8806)),
+ Box(Box(8807, 8807), Box(8807, 8807)),
+ Box(Box(8808, 8808), Box(8808, 8808)),
+ Box(Box(8809, 8809), Box(8809, 8809)),
+ Box(Box(8810, 8810), Box(8810, 8810)),
+ Box(Box(8811, 8811), Box(8811, 8811)),
+ Box(Box(8812, 8812), Box(8812, 8812)),
+ Box(Box(8813, 8813), Box(8813, 8813)),
+ Box(Box(8814, 8814), Box(8814, 8814)),
+ Box(Box(8815, 8815), Box(8815, 8815)),
+ Box(Box(8816, 8816), Box(8816, 8816)),
+ Box(Box(8817, 8817), Box(8817, 8817)),
+ Box(Box(8818, 8818), Box(8818, 8818)),
+ Box(Box(8819, 8819), Box(8819, 8819)),
+ Box(Box(8820, 8820), Box(8820, 8820)),
+ Box(Box(8821, 8821), Box(8821, 8821)),
+ Box(Box(8822, 8822), Box(8822, 8822)),
+ Box(Box(8823, 8823), Box(8823, 8823)),
+ Box(Box(8824, 8824), Box(8824, 8824)),
+ Box(Box(8825, 8825), Box(8825, 8825)),
+ Box(Box(8826, 8826), Box(8826, 8826)),
+ Box(Box(8827, 8827), Box(8827, 8827)),
+ Box(Box(8828, 8828), Box(8828, 8828)),
+ Box(Box(8829, 8829), Box(8829, 8829)),
+ Box(Box(8830, 8830), Box(8830, 8830)),
+ Box(Box(8831, 8831), Box(8831, 8831)),
+ Box(Box(8832, 8832), Box(8832, 8832)),
+ Box(Box(8833, 8833), Box(8833, 8833)),
+ Box(Box(8834, 8834), Box(8834, 8834)),
+ Box(Box(8835, 8835), Box(8835, 8835)),
+ Box(Box(8836, 8836), Box(8836, 8836)),
+ Box(Box(8837, 8837), Box(8837, 8837)),
+ Box(Box(8838, 8838), Box(8838, 8838)),
+ Box(Box(8839, 8839), Box(8839, 8839)),
+ Box(Box(8840, 8840), Box(8840, 8840)),
+ Box(Box(8841, 8841), Box(8841, 8841)),
+ Box(Box(8842, 8842), Box(8842, 8842)),
+ Box(Box(8843, 8843), Box(8843, 8843)),
+ Box(Box(8844, 8844), Box(8844, 8844)),
+ Box(Box(8845, 8845), Box(8845, 8845)),
+ Box(Box(8846, 8846), Box(8846, 8846)),
+ Box(Box(8847, 8847), Box(8847, 8847)),
+ Box(Box(8848, 8848), Box(8848, 8848)),
+ Box(Box(8849, 8849), Box(8849, 8849)),
+ Box(Box(8850, 8850), Box(8850, 8850)),
+ Box(Box(8851, 8851), Box(8851, 8851)),
+ Box(Box(8852, 8852), Box(8852, 8852)),
+ Box(Box(8853, 8853), Box(8853, 8853)),
+ Box(Box(8854, 8854), Box(8854, 8854)),
+ Box(Box(8855, 8855), Box(8855, 8855)),
+ Box(Box(8856, 8856), Box(8856, 8856)),
+ Box(Box(8857, 8857), Box(8857, 8857)),
+ Box(Box(8858, 8858), Box(8858, 8858)),
+ Box(Box(8859, 8859), Box(8859, 8859)),
+ Box(Box(8860, 8860), Box(8860, 8860)),
+ Box(Box(8861, 8861), Box(8861, 8861)),
+ Box(Box(8862, 8862), Box(8862, 8862)),
+ Box(Box(8863, 8863), Box(8863, 8863)),
+ Box(Box(8864, 8864), Box(8864, 8864)),
+ Box(Box(8865, 8865), Box(8865, 8865)),
+ Box(Box(8866, 8866), Box(8866, 8866)),
+ Box(Box(8867, 8867), Box(8867, 8867)),
+ Box(Box(8868, 8868), Box(8868, 8868)),
+ Box(Box(8869, 8869), Box(8869, 8869)),
+ Box(Box(8870, 8870), Box(8870, 8870)),
+ Box(Box(8871, 8871), Box(8871, 8871)),
+ Box(Box(8872, 8872), Box(8872, 8872)),
+ Box(Box(8873, 8873), Box(8873, 8873)),
+ Box(Box(8874, 8874), Box(8874, 8874)),
+ Box(Box(8875, 8875), Box(8875, 8875)),
+ Box(Box(8876, 8876), Box(8876, 8876)),
+ Box(Box(8877, 8877), Box(8877, 8877)),
+ Box(Box(8878, 8878), Box(8878, 8878)),
+ Box(Box(8879, 8879), Box(8879, 8879)),
+ Box(Box(8880, 8880), Box(8880, 8880)),
+ Box(Box(8881, 8881), Box(8881, 8881)),
+ Box(Box(8882, 8882), Box(8882, 8882)),
+ Box(Box(8883, 8883), Box(8883, 8883)),
+ Box(Box(8884, 8884), Box(8884, 8884)),
+ Box(Box(8885, 8885), Box(8885, 8885)),
+ Box(Box(8886, 8886), Box(8886, 8886)),
+ Box(Box(8887, 8887), Box(8887, 8887)),
+ Box(Box(8888, 8888), Box(8888, 8888)),
+ Box(Box(8889, 8889), Box(8889, 8889)),
+ Box(Box(8890, 8890), Box(8890, 8890)),
+ Box(Box(8891, 8891), Box(8891, 8891)),
+ Box(Box(8892, 8892), Box(8892, 8892)),
+ Box(Box(8893, 8893), Box(8893, 8893)),
+ Box(Box(8894, 8894), Box(8894, 8894)),
+ Box(Box(8895, 8895), Box(8895, 8895)),
+ Box(Box(8896, 8896), Box(8896, 8896)),
+ Box(Box(8897, 8897), Box(8897, 8897)),
+ Box(Box(8898, 8898), Box(8898, 8898)),
+ Box(Box(8899, 8899), Box(8899, 8899)),
+ Box(Box(8900, 8900), Box(8900, 8900)),
+ Box(Box(8901, 8901), Box(8901, 8901)),
+ Box(Box(8902, 8902), Box(8902, 8902)),
+ Box(Box(8903, 8903), Box(8903, 8903)),
+ Box(Box(8904, 8904), Box(8904, 8904)),
+ Box(Box(8905, 8905), Box(8905, 8905)),
+ Box(Box(8906, 8906), Box(8906, 8906)),
+ Box(Box(8907, 8907), Box(8907, 8907)),
+ Box(Box(8908, 8908), Box(8908, 8908)),
+ Box(Box(8909, 8909), Box(8909, 8909)),
+ Box(Box(8910, 8910), Box(8910, 8910)),
+ Box(Box(8911, 8911), Box(8911, 8911)),
+ Box(Box(8912, 8912), Box(8912, 8912)),
+ Box(Box(8913, 8913), Box(8913, 8913)),
+ Box(Box(8914, 8914), Box(8914, 8914)),
+ Box(Box(8915, 8915), Box(8915, 8915)),
+ Box(Box(8916, 8916), Box(8916, 8916)),
+ Box(Box(8917, 8917), Box(8917, 8917)),
+ Box(Box(8918, 8918), Box(8918, 8918)),
+ Box(Box(8919, 8919), Box(8919, 8919)),
+ Box(Box(8920, 8920), Box(8920, 8920)),
+ Box(Box(8921, 8921), Box(8921, 8921)),
+ Box(Box(8922, 8922), Box(8922, 8922)),
+ Box(Box(8923, 8923), Box(8923, 8923)),
+ Box(Box(8924, 8924), Box(8924, 8924)),
+ Box(Box(8925, 8925), Box(8925, 8925)),
+ Box(Box(8926, 8926), Box(8926, 8926)),
+ Box(Box(8927, 8927), Box(8927, 8927)),
+ Box(Box(8928, 8928), Box(8928, 8928)),
+ Box(Box(8929, 8929), Box(8929, 8929)),
+ Box(Box(8930, 8930), Box(8930, 8930)),
+ Box(Box(8931, 8931), Box(8931, 8931)),
+ Box(Box(8932, 8932), Box(8932, 8932)),
+ Box(Box(8933, 8933), Box(8933, 8933)),
+ Box(Box(8934, 8934), Box(8934, 8934)),
+ Box(Box(8935, 8935), Box(8935, 8935)),
+ Box(Box(8936, 8936), Box(8936, 8936)),
+ Box(Box(8937, 8937), Box(8937, 8937)),
+ Box(Box(8938, 8938), Box(8938, 8938)),
+ Box(Box(8939, 8939), Box(8939, 8939)),
+ Box(Box(8940, 8940), Box(8940, 8940)),
+ Box(Box(8941, 8941), Box(8941, 8941)),
+ Box(Box(8942, 8942), Box(8942, 8942)),
+ Box(Box(8943, 8943), Box(8943, 8943)),
+ Box(Box(8944, 8944), Box(8944, 8944)),
+ Box(Box(8945, 8945), Box(8945, 8945)),
+ Box(Box(8946, 8946), Box(8946, 8946)),
+ Box(Box(8947, 8947), Box(8947, 8947)),
+ Box(Box(8948, 8948), Box(8948, 8948)),
+ Box(Box(8949, 8949), Box(8949, 8949)),
+ Box(Box(8950, 8950), Box(8950, 8950)),
+ Box(Box(8951, 8951), Box(8951, 8951)),
+ Box(Box(8952, 8952), Box(8952, 8952)),
+ Box(Box(8953, 8953), Box(8953, 8953)),
+ Box(Box(8954, 8954), Box(8954, 8954)),
+ Box(Box(8955, 8955), Box(8955, 8955)),
+ Box(Box(8956, 8956), Box(8956, 8956)),
+ Box(Box(8957, 8957), Box(8957, 8957)),
+ Box(Box(8958, 8958), Box(8958, 8958)),
+ Box(Box(8959, 8959), Box(8959, 8959)),
+ Box(Box(8960, 8960), Box(8960, 8960)),
+ Box(Box(8961, 8961), Box(8961, 8961)),
+ Box(Box(8962, 8962), Box(8962, 8962)),
+ Box(Box(8963, 8963), Box(8963, 8963)),
+ Box(Box(8964, 8964), Box(8964, 8964)),
+ Box(Box(8965, 8965), Box(8965, 8965)),
+ Box(Box(8966, 8966), Box(8966, 8966)),
+ Box(Box(8967, 8967), Box(8967, 8967)),
+ Box(Box(8968, 8968), Box(8968, 8968)),
+ Box(Box(8969, 8969), Box(8969, 8969)),
+ Box(Box(8970, 8970), Box(8970, 8970)),
+ Box(Box(8971, 8971), Box(8971, 8971)),
+ Box(Box(8972, 8972), Box(8972, 8972)),
+ Box(Box(8973, 8973), Box(8973, 8973)),
+ Box(Box(8974, 8974), Box(8974, 8974)),
+ Box(Box(8975, 8975), Box(8975, 8975)),
+ Box(Box(8976, 8976), Box(8976, 8976)),
+ Box(Box(8977, 8977), Box(8977, 8977)),
+ Box(Box(8978, 8978), Box(8978, 8978)),
+ Box(Box(8979, 8979), Box(8979, 8979)),
+ Box(Box(8980, 8980), Box(8980, 8980)),
+ Box(Box(8981, 8981), Box(8981, 8981)),
+ Box(Box(8982, 8982), Box(8982, 8982)),
+ Box(Box(8983, 8983), Box(8983, 8983)),
+ Box(Box(8984, 8984), Box(8984, 8984)),
+ Box(Box(8985, 8985), Box(8985, 8985)),
+ Box(Box(8986, 8986), Box(8986, 8986)),
+ Box(Box(8987, 8987), Box(8987, 8987)),
+ Box(Box(8988, 8988), Box(8988, 8988)),
+ Box(Box(8989, 8989), Box(8989, 8989)),
+ Box(Box(8990, 8990), Box(8990, 8990)),
+ Box(Box(8991, 8991), Box(8991, 8991)),
+ Box(Box(8992, 8992), Box(8992, 8992)),
+ Box(Box(8993, 8993), Box(8993, 8993)),
+ Box(Box(8994, 8994), Box(8994, 8994)),
+ Box(Box(8995, 8995), Box(8995, 8995)),
+ Box(Box(8996, 8996), Box(8996, 8996)),
+ Box(Box(8997, 8997), Box(8997, 8997)),
+ Box(Box(8998, 8998), Box(8998, 8998)),
+ Box(Box(8999, 8999), Box(8999, 8999)),
+ Box(Box(9000, 9000), Box(9000, 9000)),
+ Box(Box(9001, 9001), Box(9001, 9001)),
+ Box(Box(9002, 9002), Box(9002, 9002)),
+ Box(Box(9003, 9003), Box(9003, 9003)),
+ Box(Box(9004, 9004), Box(9004, 9004)),
+ Box(Box(9005, 9005), Box(9005, 9005)),
+ Box(Box(9006, 9006), Box(9006, 9006)),
+ Box(Box(9007, 9007), Box(9007, 9007)),
+ Box(Box(9008, 9008), Box(9008, 9008)),
+ Box(Box(9009, 9009), Box(9009, 9009)),
+ Box(Box(9010, 9010), Box(9010, 9010)),
+ Box(Box(9011, 9011), Box(9011, 9011)),
+ Box(Box(9012, 9012), Box(9012, 9012)),
+ Box(Box(9013, 9013), Box(9013, 9013)),
+ Box(Box(9014, 9014), Box(9014, 9014)),
+ Box(Box(9015, 9015), Box(9015, 9015)),
+ Box(Box(9016, 9016), Box(9016, 9016)),
+ Box(Box(9017, 9017), Box(9017, 9017)),
+ Box(Box(9018, 9018), Box(9018, 9018)),
+ Box(Box(9019, 9019), Box(9019, 9019)),
+ Box(Box(9020, 9020), Box(9020, 9020)),
+ Box(Box(9021, 9021), Box(9021, 9021)),
+ Box(Box(9022, 9022), Box(9022, 9022)),
+ Box(Box(9023, 9023), Box(9023, 9023)),
+ Box(Box(9024, 9024), Box(9024, 9024)),
+ Box(Box(9025, 9025), Box(9025, 9025)),
+ Box(Box(9026, 9026), Box(9026, 9026)),
+ Box(Box(9027, 9027), Box(9027, 9027)),
+ Box(Box(9028, 9028), Box(9028, 9028)),
+ Box(Box(9029, 9029), Box(9029, 9029)),
+ Box(Box(9030, 9030), Box(9030, 9030)),
+ Box(Box(9031, 9031), Box(9031, 9031)),
+ Box(Box(9032, 9032), Box(9032, 9032)),
+ Box(Box(9033, 9033), Box(9033, 9033)),
+ Box(Box(9034, 9034), Box(9034, 9034)),
+ Box(Box(9035, 9035), Box(9035, 9035)),
+ Box(Box(9036, 9036), Box(9036, 9036)),
+ Box(Box(9037, 9037), Box(9037, 9037)),
+ Box(Box(9038, 9038), Box(9038, 9038)),
+ Box(Box(9039, 9039), Box(9039, 9039)),
+ Box(Box(9040, 9040), Box(9040, 9040)),
+ Box(Box(9041, 9041), Box(9041, 9041)),
+ Box(Box(9042, 9042), Box(9042, 9042)),
+ Box(Box(9043, 9043), Box(9043, 9043)),
+ Box(Box(9044, 9044), Box(9044, 9044)),
+ Box(Box(9045, 9045), Box(9045, 9045)),
+ Box(Box(9046, 9046), Box(9046, 9046)),
+ Box(Box(9047, 9047), Box(9047, 9047)),
+ Box(Box(9048, 9048), Box(9048, 9048)),
+ Box(Box(9049, 9049), Box(9049, 9049)),
+ Box(Box(9050, 9050), Box(9050, 9050)),
+ Box(Box(9051, 9051), Box(9051, 9051)),
+ Box(Box(9052, 9052), Box(9052, 9052)),
+ Box(Box(9053, 9053), Box(9053, 9053)),
+ Box(Box(9054, 9054), Box(9054, 9054)),
+ Box(Box(9055, 9055), Box(9055, 9055)),
+ Box(Box(9056, 9056), Box(9056, 9056)),
+ Box(Box(9057, 9057), Box(9057, 9057)),
+ Box(Box(9058, 9058), Box(9058, 9058)),
+ Box(Box(9059, 9059), Box(9059, 9059)),
+ Box(Box(9060, 9060), Box(9060, 9060)),
+ Box(Box(9061, 9061), Box(9061, 9061)),
+ Box(Box(9062, 9062), Box(9062, 9062)),
+ Box(Box(9063, 9063), Box(9063, 9063)),
+ Box(Box(9064, 9064), Box(9064, 9064)),
+ Box(Box(9065, 9065), Box(9065, 9065)),
+ Box(Box(9066, 9066), Box(9066, 9066)),
+ Box(Box(9067, 9067), Box(9067, 9067)),
+ Box(Box(9068, 9068), Box(9068, 9068)),
+ Box(Box(9069, 9069), Box(9069, 9069)),
+ Box(Box(9070, 9070), Box(9070, 9070)),
+ Box(Box(9071, 9071), Box(9071, 9071)),
+ Box(Box(9072, 9072), Box(9072, 9072)),
+ Box(Box(9073, 9073), Box(9073, 9073)),
+ Box(Box(9074, 9074), Box(9074, 9074)),
+ Box(Box(9075, 9075), Box(9075, 9075)),
+ Box(Box(9076, 9076), Box(9076, 9076)),
+ Box(Box(9077, 9077), Box(9077, 9077)),
+ Box(Box(9078, 9078), Box(9078, 9078)),
+ Box(Box(9079, 9079), Box(9079, 9079)),
+ Box(Box(9080, 9080), Box(9080, 9080)),
+ Box(Box(9081, 9081), Box(9081, 9081)),
+ Box(Box(9082, 9082), Box(9082, 9082)),
+ Box(Box(9083, 9083), Box(9083, 9083)),
+ Box(Box(9084, 9084), Box(9084, 9084)),
+ Box(Box(9085, 9085), Box(9085, 9085)),
+ Box(Box(9086, 9086), Box(9086, 9086)),
+ Box(Box(9087, 9087), Box(9087, 9087)),
+ Box(Box(9088, 9088), Box(9088, 9088)),
+ Box(Box(9089, 9089), Box(9089, 9089)),
+ Box(Box(9090, 9090), Box(9090, 9090)),
+ Box(Box(9091, 9091), Box(9091, 9091)),
+ Box(Box(9092, 9092), Box(9092, 9092)),
+ Box(Box(9093, 9093), Box(9093, 9093)),
+ Box(Box(9094, 9094), Box(9094, 9094)),
+ Box(Box(9095, 9095), Box(9095, 9095)),
+ Box(Box(9096, 9096), Box(9096, 9096)),
+ Box(Box(9097, 9097), Box(9097, 9097)),
+ Box(Box(9098, 9098), Box(9098, 9098)),
+ Box(Box(9099, 9099), Box(9099, 9099)),
+ Box(Box(9100, 9100), Box(9100, 9100)),
+ Box(Box(9101, 9101), Box(9101, 9101)),
+ Box(Box(9102, 9102), Box(9102, 9102)),
+ Box(Box(9103, 9103), Box(9103, 9103)),
+ Box(Box(9104, 9104), Box(9104, 9104)),
+ Box(Box(9105, 9105), Box(9105, 9105)),
+ Box(Box(9106, 9106), Box(9106, 9106)),
+ Box(Box(9107, 9107), Box(9107, 9107)),
+ Box(Box(9108, 9108), Box(9108, 9108)),
+ Box(Box(9109, 9109), Box(9109, 9109)),
+ Box(Box(9110, 9110), Box(9110, 9110)),
+ Box(Box(9111, 9111), Box(9111, 9111)),
+ Box(Box(9112, 9112), Box(9112, 9112)),
+ Box(Box(9113, 9113), Box(9113, 9113)),
+ Box(Box(9114, 9114), Box(9114, 9114)),
+ Box(Box(9115, 9115), Box(9115, 9115)),
+ Box(Box(9116, 9116), Box(9116, 9116)),
+ Box(Box(9117, 9117), Box(9117, 9117)),
+ Box(Box(9118, 9118), Box(9118, 9118)),
+ Box(Box(9119, 9119), Box(9119, 9119)),
+ Box(Box(9120, 9120), Box(9120, 9120)),
+ Box(Box(9121, 9121), Box(9121, 9121)),
+ Box(Box(9122, 9122), Box(9122, 9122)),
+ Box(Box(9123, 9123), Box(9123, 9123)),
+ Box(Box(9124, 9124), Box(9124, 9124)),
+ Box(Box(9125, 9125), Box(9125, 9125)),
+ Box(Box(9126, 9126), Box(9126, 9126)),
+ Box(Box(9127, 9127), Box(9127, 9127)),
+ Box(Box(9128, 9128), Box(9128, 9128)),
+ Box(Box(9129, 9129), Box(9129, 9129)),
+ Box(Box(9130, 9130), Box(9130, 9130)),
+ Box(Box(9131, 9131), Box(9131, 9131)),
+ Box(Box(9132, 9132), Box(9132, 9132)),
+ Box(Box(9133, 9133), Box(9133, 9133)),
+ Box(Box(9134, 9134), Box(9134, 9134)),
+ Box(Box(9135, 9135), Box(9135, 9135)),
+ Box(Box(9136, 9136), Box(9136, 9136)),
+ Box(Box(9137, 9137), Box(9137, 9137)),
+ Box(Box(9138, 9138), Box(9138, 9138)),
+ Box(Box(9139, 9139), Box(9139, 9139)),
+ Box(Box(9140, 9140), Box(9140, 9140)),
+ Box(Box(9141, 9141), Box(9141, 9141)),
+ Box(Box(9142, 9142), Box(9142, 9142)),
+ Box(Box(9143, 9143), Box(9143, 9143)),
+ Box(Box(9144, 9144), Box(9144, 9144)),
+ Box(Box(9145, 9145), Box(9145, 9145)),
+ Box(Box(9146, 9146), Box(9146, 9146)),
+ Box(Box(9147, 9147), Box(9147, 9147)),
+ Box(Box(9148, 9148), Box(9148, 9148)),
+ Box(Box(9149, 9149), Box(9149, 9149)),
+ Box(Box(9150, 9150), Box(9150, 9150)),
+ Box(Box(9151, 9151), Box(9151, 9151)),
+ Box(Box(9152, 9152), Box(9152, 9152)),
+ Box(Box(9153, 9153), Box(9153, 9153)),
+ Box(Box(9154, 9154), Box(9154, 9154)),
+ Box(Box(9155, 9155), Box(9155, 9155)),
+ Box(Box(9156, 9156), Box(9156, 9156)),
+ Box(Box(9157, 9157), Box(9157, 9157)),
+ Box(Box(9158, 9158), Box(9158, 9158)),
+ Box(Box(9159, 9159), Box(9159, 9159)),
+ Box(Box(9160, 9160), Box(9160, 9160)),
+ Box(Box(9161, 9161), Box(9161, 9161)),
+ Box(Box(9162, 9162), Box(9162, 9162)),
+ Box(Box(9163, 9163), Box(9163, 9163)),
+ Box(Box(9164, 9164), Box(9164, 9164)),
+ Box(Box(9165, 9165), Box(9165, 9165)),
+ Box(Box(9166, 9166), Box(9166, 9166)),
+ Box(Box(9167, 9167), Box(9167, 9167)),
+ Box(Box(9168, 9168), Box(9168, 9168)),
+ Box(Box(9169, 9169), Box(9169, 9169)),
+ Box(Box(9170, 9170), Box(9170, 9170)),
+ Box(Box(9171, 9171), Box(9171, 9171)),
+ Box(Box(9172, 9172), Box(9172, 9172)),
+ Box(Box(9173, 9173), Box(9173, 9173)),
+ Box(Box(9174, 9174), Box(9174, 9174)),
+ Box(Box(9175, 9175), Box(9175, 9175)),
+ Box(Box(9176, 9176), Box(9176, 9176)),
+ Box(Box(9177, 9177), Box(9177, 9177)),
+ Box(Box(9178, 9178), Box(9178, 9178)),
+ Box(Box(9179, 9179), Box(9179, 9179)),
+ Box(Box(9180, 9180), Box(9180, 9180)),
+ Box(Box(9181, 9181), Box(9181, 9181)),
+ Box(Box(9182, 9182), Box(9182, 9182)),
+ Box(Box(9183, 9183), Box(9183, 9183)),
+ Box(Box(9184, 9184), Box(9184, 9184)),
+ Box(Box(9185, 9185), Box(9185, 9185)),
+ Box(Box(9186, 9186), Box(9186, 9186)),
+ Box(Box(9187, 9187), Box(9187, 9187)),
+ Box(Box(9188, 9188), Box(9188, 9188)),
+ Box(Box(9189, 9189), Box(9189, 9189)),
+ Box(Box(9190, 9190), Box(9190, 9190)),
+ Box(Box(9191, 9191), Box(9191, 9191)),
+ Box(Box(9192, 9192), Box(9192, 9192)),
+ Box(Box(9193, 9193), Box(9193, 9193)),
+ Box(Box(9194, 9194), Box(9194, 9194)),
+ Box(Box(9195, 9195), Box(9195, 9195)),
+ Box(Box(9196, 9196), Box(9196, 9196)),
+ Box(Box(9197, 9197), Box(9197, 9197)),
+ Box(Box(9198, 9198), Box(9198, 9198)),
+ Box(Box(9199, 9199), Box(9199, 9199)),
+ Box(Box(9200, 9200), Box(9200, 9200)),
+ Box(Box(9201, 9201), Box(9201, 9201)),
+ Box(Box(9202, 9202), Box(9202, 9202)),
+ Box(Box(9203, 9203), Box(9203, 9203)),
+ Box(Box(9204, 9204), Box(9204, 9204)),
+ Box(Box(9205, 9205), Box(9205, 9205)),
+ Box(Box(9206, 9206), Box(9206, 9206)),
+ Box(Box(9207, 9207), Box(9207, 9207)),
+ Box(Box(9208, 9208), Box(9208, 9208)),
+ Box(Box(9209, 9209), Box(9209, 9209)),
+ Box(Box(9210, 9210), Box(9210, 9210)),
+ Box(Box(9211, 9211), Box(9211, 9211)),
+ Box(Box(9212, 9212), Box(9212, 9212)),
+ Box(Box(9213, 9213), Box(9213, 9213)),
+ Box(Box(9214, 9214), Box(9214, 9214)),
+ Box(Box(9215, 9215), Box(9215, 9215)),
+ Box(Box(9216, 9216), Box(9216, 9216)),
+ Box(Box(9217, 9217), Box(9217, 9217)),
+ Box(Box(9218, 9218), Box(9218, 9218)),
+ Box(Box(9219, 9219), Box(9219, 9219)),
+ Box(Box(9220, 9220), Box(9220, 9220)),
+ Box(Box(9221, 9221), Box(9221, 9221)),
+ Box(Box(9222, 9222), Box(9222, 9222)),
+ Box(Box(9223, 9223), Box(9223, 9223)),
+ Box(Box(9224, 9224), Box(9224, 9224)),
+ Box(Box(9225, 9225), Box(9225, 9225)),
+ Box(Box(9226, 9226), Box(9226, 9226)),
+ Box(Box(9227, 9227), Box(9227, 9227)),
+ Box(Box(9228, 9228), Box(9228, 9228)),
+ Box(Box(9229, 9229), Box(9229, 9229)),
+ Box(Box(9230, 9230), Box(9230, 9230)),
+ Box(Box(9231, 9231), Box(9231, 9231)),
+ Box(Box(9232, 9232), Box(9232, 9232)),
+ Box(Box(9233, 9233), Box(9233, 9233)),
+ Box(Box(9234, 9234), Box(9234, 9234)),
+ Box(Box(9235, 9235), Box(9235, 9235)),
+ Box(Box(9236, 9236), Box(9236, 9236)),
+ Box(Box(9237, 9237), Box(9237, 9237)),
+ Box(Box(9238, 9238), Box(9238, 9238)),
+ Box(Box(9239, 9239), Box(9239, 9239)),
+ Box(Box(9240, 9240), Box(9240, 9240)),
+ Box(Box(9241, 9241), Box(9241, 9241)),
+ Box(Box(9242, 9242), Box(9242, 9242)),
+ Box(Box(9243, 9243), Box(9243, 9243)),
+ Box(Box(9244, 9244), Box(9244, 9244)),
+ Box(Box(9245, 9245), Box(9245, 9245)),
+ Box(Box(9246, 9246), Box(9246, 9246)),
+ Box(Box(9247, 9247), Box(9247, 9247)),
+ Box(Box(9248, 9248), Box(9248, 9248)),
+ Box(Box(9249, 9249), Box(9249, 9249)),
+ Box(Box(9250, 9250), Box(9250, 9250)),
+ Box(Box(9251, 9251), Box(9251, 9251)),
+ Box(Box(9252, 9252), Box(9252, 9252)),
+ Box(Box(9253, 9253), Box(9253, 9253)),
+ Box(Box(9254, 9254), Box(9254, 9254)),
+ Box(Box(9255, 9255), Box(9255, 9255)),
+ Box(Box(9256, 9256), Box(9256, 9256)),
+ Box(Box(9257, 9257), Box(9257, 9257)),
+ Box(Box(9258, 9258), Box(9258, 9258)),
+ Box(Box(9259, 9259), Box(9259, 9259)),
+ Box(Box(9260, 9260), Box(9260, 9260)),
+ Box(Box(9261, 9261), Box(9261, 9261)),
+ Box(Box(9262, 9262), Box(9262, 9262)),
+ Box(Box(9263, 9263), Box(9263, 9263)),
+ Box(Box(9264, 9264), Box(9264, 9264)),
+ Box(Box(9265, 9265), Box(9265, 9265)),
+ Box(Box(9266, 9266), Box(9266, 9266)),
+ Box(Box(9267, 9267), Box(9267, 9267)),
+ Box(Box(9268, 9268), Box(9268, 9268)),
+ Box(Box(9269, 9269), Box(9269, 9269)),
+ Box(Box(9270, 9270), Box(9270, 9270)),
+ Box(Box(9271, 9271), Box(9271, 9271)),
+ Box(Box(9272, 9272), Box(9272, 9272)),
+ Box(Box(9273, 9273), Box(9273, 9273)),
+ Box(Box(9274, 9274), Box(9274, 9274)),
+ Box(Box(9275, 9275), Box(9275, 9275)),
+ Box(Box(9276, 9276), Box(9276, 9276)),
+ Box(Box(9277, 9277), Box(9277, 9277)),
+ Box(Box(9278, 9278), Box(9278, 9278)),
+ Box(Box(9279, 9279), Box(9279, 9279)),
+ Box(Box(9280, 9280), Box(9280, 9280)),
+ Box(Box(9281, 9281), Box(9281, 9281)),
+ Box(Box(9282, 9282), Box(9282, 9282)),
+ Box(Box(9283, 9283), Box(9283, 9283)),
+ Box(Box(9284, 9284), Box(9284, 9284)),
+ Box(Box(9285, 9285), Box(9285, 9285)),
+ Box(Box(9286, 9286), Box(9286, 9286)),
+ Box(Box(9287, 9287), Box(9287, 9287)),
+ Box(Box(9288, 9288), Box(9288, 9288)),
+ Box(Box(9289, 9289), Box(9289, 9289)),
+ Box(Box(9290, 9290), Box(9290, 9290)),
+ Box(Box(9291, 9291), Box(9291, 9291)),
+ Box(Box(9292, 9292), Box(9292, 9292)),
+ Box(Box(9293, 9293), Box(9293, 9293)),
+ Box(Box(9294, 9294), Box(9294, 9294)),
+ Box(Box(9295, 9295), Box(9295, 9295)),
+ Box(Box(9296, 9296), Box(9296, 9296)),
+ Box(Box(9297, 9297), Box(9297, 9297)),
+ Box(Box(9298, 9298), Box(9298, 9298)),
+ Box(Box(9299, 9299), Box(9299, 9299)),
+ Box(Box(9300, 9300), Box(9300, 9300)),
+ Box(Box(9301, 9301), Box(9301, 9301)),
+ Box(Box(9302, 9302), Box(9302, 9302)),
+ Box(Box(9303, 9303), Box(9303, 9303)),
+ Box(Box(9304, 9304), Box(9304, 9304)),
+ Box(Box(9305, 9305), Box(9305, 9305)),
+ Box(Box(9306, 9306), Box(9306, 9306)),
+ Box(Box(9307, 9307), Box(9307, 9307)),
+ Box(Box(9308, 9308), Box(9308, 9308)),
+ Box(Box(9309, 9309), Box(9309, 9309)),
+ Box(Box(9310, 9310), Box(9310, 9310)),
+ Box(Box(9311, 9311), Box(9311, 9311)),
+ Box(Box(9312, 9312), Box(9312, 9312)),
+ Box(Box(9313, 9313), Box(9313, 9313)),
+ Box(Box(9314, 9314), Box(9314, 9314)),
+ Box(Box(9315, 9315), Box(9315, 9315)),
+ Box(Box(9316, 9316), Box(9316, 9316)),
+ Box(Box(9317, 9317), Box(9317, 9317)),
+ Box(Box(9318, 9318), Box(9318, 9318)),
+ Box(Box(9319, 9319), Box(9319, 9319)),
+ Box(Box(9320, 9320), Box(9320, 9320)),
+ Box(Box(9321, 9321), Box(9321, 9321)),
+ Box(Box(9322, 9322), Box(9322, 9322)),
+ Box(Box(9323, 9323), Box(9323, 9323)),
+ Box(Box(9324, 9324), Box(9324, 9324)),
+ Box(Box(9325, 9325), Box(9325, 9325)),
+ Box(Box(9326, 9326), Box(9326, 9326)),
+ Box(Box(9327, 9327), Box(9327, 9327)),
+ Box(Box(9328, 9328), Box(9328, 9328)),
+ Box(Box(9329, 9329), Box(9329, 9329)),
+ Box(Box(9330, 9330), Box(9330, 9330)),
+ Box(Box(9331, 9331), Box(9331, 9331)),
+ Box(Box(9332, 9332), Box(9332, 9332)),
+ Box(Box(9333, 9333), Box(9333, 9333)),
+ Box(Box(9334, 9334), Box(9334, 9334)),
+ Box(Box(9335, 9335), Box(9335, 9335)),
+ Box(Box(9336, 9336), Box(9336, 9336)),
+ Box(Box(9337, 9337), Box(9337, 9337)),
+ Box(Box(9338, 9338), Box(9338, 9338)),
+ Box(Box(9339, 9339), Box(9339, 9339)),
+ Box(Box(9340, 9340), Box(9340, 9340)),
+ Box(Box(9341, 9341), Box(9341, 9341)),
+ Box(Box(9342, 9342), Box(9342, 9342)),
+ Box(Box(9343, 9343), Box(9343, 9343)),
+ Box(Box(9344, 9344), Box(9344, 9344)),
+ Box(Box(9345, 9345), Box(9345, 9345)),
+ Box(Box(9346, 9346), Box(9346, 9346)),
+ Box(Box(9347, 9347), Box(9347, 9347)),
+ Box(Box(9348, 9348), Box(9348, 9348)),
+ Box(Box(9349, 9349), Box(9349, 9349)),
+ Box(Box(9350, 9350), Box(9350, 9350)),
+ Box(Box(9351, 9351), Box(9351, 9351)),
+ Box(Box(9352, 9352), Box(9352, 9352)),
+ Box(Box(9353, 9353), Box(9353, 9353)),
+ Box(Box(9354, 9354), Box(9354, 9354)),
+ Box(Box(9355, 9355), Box(9355, 9355)),
+ Box(Box(9356, 9356), Box(9356, 9356)),
+ Box(Box(9357, 9357), Box(9357, 9357)),
+ Box(Box(9358, 9358), Box(9358, 9358)),
+ Box(Box(9359, 9359), Box(9359, 9359)),
+ Box(Box(9360, 9360), Box(9360, 9360)),
+ Box(Box(9361, 9361), Box(9361, 9361)),
+ Box(Box(9362, 9362), Box(9362, 9362)),
+ Box(Box(9363, 9363), Box(9363, 9363)),
+ Box(Box(9364, 9364), Box(9364, 9364)),
+ Box(Box(9365, 9365), Box(9365, 9365)),
+ Box(Box(9366, 9366), Box(9366, 9366)),
+ Box(Box(9367, 9367), Box(9367, 9367)),
+ Box(Box(9368, 9368), Box(9368, 9368)),
+ Box(Box(9369, 9369), Box(9369, 9369)),
+ Box(Box(9370, 9370), Box(9370, 9370)),
+ Box(Box(9371, 9371), Box(9371, 9371)),
+ Box(Box(9372, 9372), Box(9372, 9372)),
+ Box(Box(9373, 9373), Box(9373, 9373)),
+ Box(Box(9374, 9374), Box(9374, 9374)),
+ Box(Box(9375, 9375), Box(9375, 9375)),
+ Box(Box(9376, 9376), Box(9376, 9376)),
+ Box(Box(9377, 9377), Box(9377, 9377)),
+ Box(Box(9378, 9378), Box(9378, 9378)),
+ Box(Box(9379, 9379), Box(9379, 9379)),
+ Box(Box(9380, 9380), Box(9380, 9380)),
+ Box(Box(9381, 9381), Box(9381, 9381)),
+ Box(Box(9382, 9382), Box(9382, 9382)),
+ Box(Box(9383, 9383), Box(9383, 9383)),
+ Box(Box(9384, 9384), Box(9384, 9384)),
+ Box(Box(9385, 9385), Box(9385, 9385)),
+ Box(Box(9386, 9386), Box(9386, 9386)),
+ Box(Box(9387, 9387), Box(9387, 9387)),
+ Box(Box(9388, 9388), Box(9388, 9388)),
+ Box(Box(9389, 9389), Box(9389, 9389)),
+ Box(Box(9390, 9390), Box(9390, 9390)),
+ Box(Box(9391, 9391), Box(9391, 9391)),
+ Box(Box(9392, 9392), Box(9392, 9392)),
+ Box(Box(9393, 9393), Box(9393, 9393)),
+ Box(Box(9394, 9394), Box(9394, 9394)),
+ Box(Box(9395, 9395), Box(9395, 9395)),
+ Box(Box(9396, 9396), Box(9396, 9396)),
+ Box(Box(9397, 9397), Box(9397, 9397)),
+ Box(Box(9398, 9398), Box(9398, 9398)),
+ Box(Box(9399, 9399), Box(9399, 9399)),
+ Box(Box(9400, 9400), Box(9400, 9400)),
+ Box(Box(9401, 9401), Box(9401, 9401)),
+ Box(Box(9402, 9402), Box(9402, 9402)),
+ Box(Box(9403, 9403), Box(9403, 9403)),
+ Box(Box(9404, 9404), Box(9404, 9404)),
+ Box(Box(9405, 9405), Box(9405, 9405)),
+ Box(Box(9406, 9406), Box(9406, 9406)),
+ Box(Box(9407, 9407), Box(9407, 9407)),
+ Box(Box(9408, 9408), Box(9408, 9408)),
+ Box(Box(9409, 9409), Box(9409, 9409)),
+ Box(Box(9410, 9410), Box(9410, 9410)),
+ Box(Box(9411, 9411), Box(9411, 9411)),
+ Box(Box(9412, 9412), Box(9412, 9412)),
+ Box(Box(9413, 9413), Box(9413, 9413)),
+ Box(Box(9414, 9414), Box(9414, 9414)),
+ Box(Box(9415, 9415), Box(9415, 9415)),
+ Box(Box(9416, 9416), Box(9416, 9416)),
+ Box(Box(9417, 9417), Box(9417, 9417)),
+ Box(Box(9418, 9418), Box(9418, 9418)),
+ Box(Box(9419, 9419), Box(9419, 9419)),
+ Box(Box(9420, 9420), Box(9420, 9420)),
+ Box(Box(9421, 9421), Box(9421, 9421)),
+ Box(Box(9422, 9422), Box(9422, 9422)),
+ Box(Box(9423, 9423), Box(9423, 9423)),
+ Box(Box(9424, 9424), Box(9424, 9424)),
+ Box(Box(9425, 9425), Box(9425, 9425)),
+ Box(Box(9426, 9426), Box(9426, 9426)),
+ Box(Box(9427, 9427), Box(9427, 9427)),
+ Box(Box(9428, 9428), Box(9428, 9428)),
+ Box(Box(9429, 9429), Box(9429, 9429)),
+ Box(Box(9430, 9430), Box(9430, 9430)),
+ Box(Box(9431, 9431), Box(9431, 9431)),
+ Box(Box(9432, 9432), Box(9432, 9432)),
+ Box(Box(9433, 9433), Box(9433, 9433)),
+ Box(Box(9434, 9434), Box(9434, 9434)),
+ Box(Box(9435, 9435), Box(9435, 9435)),
+ Box(Box(9436, 9436), Box(9436, 9436)),
+ Box(Box(9437, 9437), Box(9437, 9437)),
+ Box(Box(9438, 9438), Box(9438, 9438)),
+ Box(Box(9439, 9439), Box(9439, 9439)),
+ Box(Box(9440, 9440), Box(9440, 9440)),
+ Box(Box(9441, 9441), Box(9441, 9441)),
+ Box(Box(9442, 9442), Box(9442, 9442)),
+ Box(Box(9443, 9443), Box(9443, 9443)),
+ Box(Box(9444, 9444), Box(9444, 9444)),
+ Box(Box(9445, 9445), Box(9445, 9445)),
+ Box(Box(9446, 9446), Box(9446, 9446)),
+ Box(Box(9447, 9447), Box(9447, 9447)),
+ Box(Box(9448, 9448), Box(9448, 9448)),
+ Box(Box(9449, 9449), Box(9449, 9449)),
+ Box(Box(9450, 9450), Box(9450, 9450)),
+ Box(Box(9451, 9451), Box(9451, 9451)),
+ Box(Box(9452, 9452), Box(9452, 9452)),
+ Box(Box(9453, 9453), Box(9453, 9453)),
+ Box(Box(9454, 9454), Box(9454, 9454)),
+ Box(Box(9455, 9455), Box(9455, 9455)),
+ Box(Box(9456, 9456), Box(9456, 9456)),
+ Box(Box(9457, 9457), Box(9457, 9457)),
+ Box(Box(9458, 9458), Box(9458, 9458)),
+ Box(Box(9459, 9459), Box(9459, 9459)),
+ Box(Box(9460, 9460), Box(9460, 9460)),
+ Box(Box(9461, 9461), Box(9461, 9461)),
+ Box(Box(9462, 9462), Box(9462, 9462)),
+ Box(Box(9463, 9463), Box(9463, 9463)),
+ Box(Box(9464, 9464), Box(9464, 9464)),
+ Box(Box(9465, 9465), Box(9465, 9465)),
+ Box(Box(9466, 9466), Box(9466, 9466)),
+ Box(Box(9467, 9467), Box(9467, 9467)),
+ Box(Box(9468, 9468), Box(9468, 9468)),
+ Box(Box(9469, 9469), Box(9469, 9469)),
+ Box(Box(9470, 9470), Box(9470, 9470)),
+ Box(Box(9471, 9471), Box(9471, 9471)),
+ Box(Box(9472, 9472), Box(9472, 9472)),
+ Box(Box(9473, 9473), Box(9473, 9473)),
+ Box(Box(9474, 9474), Box(9474, 9474)),
+ Box(Box(9475, 9475), Box(9475, 9475)),
+ Box(Box(9476, 9476), Box(9476, 9476)),
+ Box(Box(9477, 9477), Box(9477, 9477)),
+ Box(Box(9478, 9478), Box(9478, 9478)),
+ Box(Box(9479, 9479), Box(9479, 9479)),
+ Box(Box(9480, 9480), Box(9480, 9480)),
+ Box(Box(9481, 9481), Box(9481, 9481)),
+ Box(Box(9482, 9482), Box(9482, 9482)),
+ Box(Box(9483, 9483), Box(9483, 9483)),
+ Box(Box(9484, 9484), Box(9484, 9484)),
+ Box(Box(9485, 9485), Box(9485, 9485)),
+ Box(Box(9486, 9486), Box(9486, 9486)),
+ Box(Box(9487, 9487), Box(9487, 9487)),
+ Box(Box(9488, 9488), Box(9488, 9488)),
+ Box(Box(9489, 9489), Box(9489, 9489)),
+ Box(Box(9490, 9490), Box(9490, 9490)),
+ Box(Box(9491, 9491), Box(9491, 9491)),
+ Box(Box(9492, 9492), Box(9492, 9492)),
+ Box(Box(9493, 9493), Box(9493, 9493)),
+ Box(Box(9494, 9494), Box(9494, 9494)),
+ Box(Box(9495, 9495), Box(9495, 9495)),
+ Box(Box(9496, 9496), Box(9496, 9496)),
+ Box(Box(9497, 9497), Box(9497, 9497)),
+ Box(Box(9498, 9498), Box(9498, 9498)),
+ Box(Box(9499, 9499), Box(9499, 9499)),
+ Box(Box(9500, 9500), Box(9500, 9500)),
+ Box(Box(9501, 9501), Box(9501, 9501)),
+ Box(Box(9502, 9502), Box(9502, 9502)),
+ Box(Box(9503, 9503), Box(9503, 9503)),
+ Box(Box(9504, 9504), Box(9504, 9504)),
+ Box(Box(9505, 9505), Box(9505, 9505)),
+ Box(Box(9506, 9506), Box(9506, 9506)),
+ Box(Box(9507, 9507), Box(9507, 9507)),
+ Box(Box(9508, 9508), Box(9508, 9508)),
+ Box(Box(9509, 9509), Box(9509, 9509)),
+ Box(Box(9510, 9510), Box(9510, 9510)),
+ Box(Box(9511, 9511), Box(9511, 9511)),
+ Box(Box(9512, 9512), Box(9512, 9512)),
+ Box(Box(9513, 9513), Box(9513, 9513)),
+ Box(Box(9514, 9514), Box(9514, 9514)),
+ Box(Box(9515, 9515), Box(9515, 9515)),
+ Box(Box(9516, 9516), Box(9516, 9516)),
+ Box(Box(9517, 9517), Box(9517, 9517)),
+ Box(Box(9518, 9518), Box(9518, 9518)),
+ Box(Box(9519, 9519), Box(9519, 9519)),
+ Box(Box(9520, 9520), Box(9520, 9520)),
+ Box(Box(9521, 9521), Box(9521, 9521)),
+ Box(Box(9522, 9522), Box(9522, 9522)),
+ Box(Box(9523, 9523), Box(9523, 9523)),
+ Box(Box(9524, 9524), Box(9524, 9524)),
+ Box(Box(9525, 9525), Box(9525, 9525)),
+ Box(Box(9526, 9526), Box(9526, 9526)),
+ Box(Box(9527, 9527), Box(9527, 9527)),
+ Box(Box(9528, 9528), Box(9528, 9528)),
+ Box(Box(9529, 9529), Box(9529, 9529)),
+ Box(Box(9530, 9530), Box(9530, 9530)),
+ Box(Box(9531, 9531), Box(9531, 9531)),
+ Box(Box(9532, 9532), Box(9532, 9532)),
+ Box(Box(9533, 9533), Box(9533, 9533)),
+ Box(Box(9534, 9534), Box(9534, 9534)),
+ Box(Box(9535, 9535), Box(9535, 9535)),
+ Box(Box(9536, 9536), Box(9536, 9536)),
+ Box(Box(9537, 9537), Box(9537, 9537)),
+ Box(Box(9538, 9538), Box(9538, 9538)),
+ Box(Box(9539, 9539), Box(9539, 9539)),
+ Box(Box(9540, 9540), Box(9540, 9540)),
+ Box(Box(9541, 9541), Box(9541, 9541)),
+ Box(Box(9542, 9542), Box(9542, 9542)),
+ Box(Box(9543, 9543), Box(9543, 9543)),
+ Box(Box(9544, 9544), Box(9544, 9544)),
+ Box(Box(9545, 9545), Box(9545, 9545)),
+ Box(Box(9546, 9546), Box(9546, 9546)),
+ Box(Box(9547, 9547), Box(9547, 9547)),
+ Box(Box(9548, 9548), Box(9548, 9548)),
+ Box(Box(9549, 9549), Box(9549, 9549)),
+ Box(Box(9550, 9550), Box(9550, 9550)),
+ Box(Box(9551, 9551), Box(9551, 9551)),
+ Box(Box(9552, 9552), Box(9552, 9552)),
+ Box(Box(9553, 9553), Box(9553, 9553)),
+ Box(Box(9554, 9554), Box(9554, 9554)),
+ Box(Box(9555, 9555), Box(9555, 9555)),
+ Box(Box(9556, 9556), Box(9556, 9556)),
+ Box(Box(9557, 9557), Box(9557, 9557)),
+ Box(Box(9558, 9558), Box(9558, 9558)),
+ Box(Box(9559, 9559), Box(9559, 9559)),
+ Box(Box(9560, 9560), Box(9560, 9560)),
+ Box(Box(9561, 9561), Box(9561, 9561)),
+ Box(Box(9562, 9562), Box(9562, 9562)),
+ Box(Box(9563, 9563), Box(9563, 9563)),
+ Box(Box(9564, 9564), Box(9564, 9564)),
+ Box(Box(9565, 9565), Box(9565, 9565)),
+ Box(Box(9566, 9566), Box(9566, 9566)),
+ Box(Box(9567, 9567), Box(9567, 9567)),
+ Box(Box(9568, 9568), Box(9568, 9568)),
+ Box(Box(9569, 9569), Box(9569, 9569)),
+ Box(Box(9570, 9570), Box(9570, 9570)),
+ Box(Box(9571, 9571), Box(9571, 9571)),
+ Box(Box(9572, 9572), Box(9572, 9572)),
+ Box(Box(9573, 9573), Box(9573, 9573)),
+ Box(Box(9574, 9574), Box(9574, 9574)),
+ Box(Box(9575, 9575), Box(9575, 9575)),
+ Box(Box(9576, 9576), Box(9576, 9576)),
+ Box(Box(9577, 9577), Box(9577, 9577)),
+ Box(Box(9578, 9578), Box(9578, 9578)),
+ Box(Box(9579, 9579), Box(9579, 9579)),
+ Box(Box(9580, 9580), Box(9580, 9580)),
+ Box(Box(9581, 9581), Box(9581, 9581)),
+ Box(Box(9582, 9582), Box(9582, 9582)),
+ Box(Box(9583, 9583), Box(9583, 9583)),
+ Box(Box(9584, 9584), Box(9584, 9584)),
+ Box(Box(9585, 9585), Box(9585, 9585)),
+ Box(Box(9586, 9586), Box(9586, 9586)),
+ Box(Box(9587, 9587), Box(9587, 9587)),
+ Box(Box(9588, 9588), Box(9588, 9588)),
+ Box(Box(9589, 9589), Box(9589, 9589)),
+ Box(Box(9590, 9590), Box(9590, 9590)),
+ Box(Box(9591, 9591), Box(9591, 9591)),
+ Box(Box(9592, 9592), Box(9592, 9592)),
+ Box(Box(9593, 9593), Box(9593, 9593)),
+ Box(Box(9594, 9594), Box(9594, 9594)),
+ Box(Box(9595, 9595), Box(9595, 9595)),
+ Box(Box(9596, 9596), Box(9596, 9596)),
+ Box(Box(9597, 9597), Box(9597, 9597)),
+ Box(Box(9598, 9598), Box(9598, 9598)),
+ Box(Box(9599, 9599), Box(9599, 9599)),
+ Box(Box(9600, 9600), Box(9600, 9600)),
+ Box(Box(9601, 9601), Box(9601, 9601)),
+ Box(Box(9602, 9602), Box(9602, 9602)),
+ Box(Box(9603, 9603), Box(9603, 9603)),
+ Box(Box(9604, 9604), Box(9604, 9604)),
+ Box(Box(9605, 9605), Box(9605, 9605)),
+ Box(Box(9606, 9606), Box(9606, 9606)),
+ Box(Box(9607, 9607), Box(9607, 9607)),
+ Box(Box(9608, 9608), Box(9608, 9608)),
+ Box(Box(9609, 9609), Box(9609, 9609)),
+ Box(Box(9610, 9610), Box(9610, 9610)),
+ Box(Box(9611, 9611), Box(9611, 9611)),
+ Box(Box(9612, 9612), Box(9612, 9612)),
+ Box(Box(9613, 9613), Box(9613, 9613)),
+ Box(Box(9614, 9614), Box(9614, 9614)),
+ Box(Box(9615, 9615), Box(9615, 9615)),
+ Box(Box(9616, 9616), Box(9616, 9616)),
+ Box(Box(9617, 9617), Box(9617, 9617)),
+ Box(Box(9618, 9618), Box(9618, 9618)),
+ Box(Box(9619, 9619), Box(9619, 9619)),
+ Box(Box(9620, 9620), Box(9620, 9620)),
+ Box(Box(9621, 9621), Box(9621, 9621)),
+ Box(Box(9622, 9622), Box(9622, 9622)),
+ Box(Box(9623, 9623), Box(9623, 9623)),
+ Box(Box(9624, 9624), Box(9624, 9624)),
+ Box(Box(9625, 9625), Box(9625, 9625)),
+ Box(Box(9626, 9626), Box(9626, 9626)),
+ Box(Box(9627, 9627), Box(9627, 9627)),
+ Box(Box(9628, 9628), Box(9628, 9628)),
+ Box(Box(9629, 9629), Box(9629, 9629)),
+ Box(Box(9630, 9630), Box(9630, 9630)),
+ Box(Box(9631, 9631), Box(9631, 9631)),
+ Box(Box(9632, 9632), Box(9632, 9632)),
+ Box(Box(9633, 9633), Box(9633, 9633)),
+ Box(Box(9634, 9634), Box(9634, 9634)),
+ Box(Box(9635, 9635), Box(9635, 9635)),
+ Box(Box(9636, 9636), Box(9636, 9636)),
+ Box(Box(9637, 9637), Box(9637, 9637)),
+ Box(Box(9638, 9638), Box(9638, 9638)),
+ Box(Box(9639, 9639), Box(9639, 9639)),
+ Box(Box(9640, 9640), Box(9640, 9640)),
+ Box(Box(9641, 9641), Box(9641, 9641)),
+ Box(Box(9642, 9642), Box(9642, 9642)),
+ Box(Box(9643, 9643), Box(9643, 9643)),
+ Box(Box(9644, 9644), Box(9644, 9644)),
+ Box(Box(9645, 9645), Box(9645, 9645)),
+ Box(Box(9646, 9646), Box(9646, 9646)),
+ Box(Box(9647, 9647), Box(9647, 9647)),
+ Box(Box(9648, 9648), Box(9648, 9648)),
+ Box(Box(9649, 9649), Box(9649, 9649)),
+ Box(Box(9650, 9650), Box(9650, 9650)),
+ Box(Box(9651, 9651), Box(9651, 9651)),
+ Box(Box(9652, 9652), Box(9652, 9652)),
+ Box(Box(9653, 9653), Box(9653, 9653)),
+ Box(Box(9654, 9654), Box(9654, 9654)),
+ Box(Box(9655, 9655), Box(9655, 9655)),
+ Box(Box(9656, 9656), Box(9656, 9656)),
+ Box(Box(9657, 9657), Box(9657, 9657)),
+ Box(Box(9658, 9658), Box(9658, 9658)),
+ Box(Box(9659, 9659), Box(9659, 9659)),
+ Box(Box(9660, 9660), Box(9660, 9660)),
+ Box(Box(9661, 9661), Box(9661, 9661)),
+ Box(Box(9662, 9662), Box(9662, 9662)),
+ Box(Box(9663, 9663), Box(9663, 9663)),
+ Box(Box(9664, 9664), Box(9664, 9664)),
+ Box(Box(9665, 9665), Box(9665, 9665)),
+ Box(Box(9666, 9666), Box(9666, 9666)),
+ Box(Box(9667, 9667), Box(9667, 9667)),
+ Box(Box(9668, 9668), Box(9668, 9668)),
+ Box(Box(9669, 9669), Box(9669, 9669)),
+ Box(Box(9670, 9670), Box(9670, 9670)),
+ Box(Box(9671, 9671), Box(9671, 9671)),
+ Box(Box(9672, 9672), Box(9672, 9672)),
+ Box(Box(9673, 9673), Box(9673, 9673)),
+ Box(Box(9674, 9674), Box(9674, 9674)),
+ Box(Box(9675, 9675), Box(9675, 9675)),
+ Box(Box(9676, 9676), Box(9676, 9676)),
+ Box(Box(9677, 9677), Box(9677, 9677)),
+ Box(Box(9678, 9678), Box(9678, 9678)),
+ Box(Box(9679, 9679), Box(9679, 9679)),
+ Box(Box(9680, 9680), Box(9680, 9680)),
+ Box(Box(9681, 9681), Box(9681, 9681)),
+ Box(Box(9682, 9682), Box(9682, 9682)),
+ Box(Box(9683, 9683), Box(9683, 9683)),
+ Box(Box(9684, 9684), Box(9684, 9684)),
+ Box(Box(9685, 9685), Box(9685, 9685)),
+ Box(Box(9686, 9686), Box(9686, 9686)),
+ Box(Box(9687, 9687), Box(9687, 9687)),
+ Box(Box(9688, 9688), Box(9688, 9688)),
+ Box(Box(9689, 9689), Box(9689, 9689)),
+ Box(Box(9690, 9690), Box(9690, 9690)),
+ Box(Box(9691, 9691), Box(9691, 9691)),
+ Box(Box(9692, 9692), Box(9692, 9692)),
+ Box(Box(9693, 9693), Box(9693, 9693)),
+ Box(Box(9694, 9694), Box(9694, 9694)),
+ Box(Box(9695, 9695), Box(9695, 9695)),
+ Box(Box(9696, 9696), Box(9696, 9696)),
+ Box(Box(9697, 9697), Box(9697, 9697)),
+ Box(Box(9698, 9698), Box(9698, 9698)),
+ Box(Box(9699, 9699), Box(9699, 9699)),
+ Box(Box(9700, 9700), Box(9700, 9700)),
+ Box(Box(9701, 9701), Box(9701, 9701)),
+ Box(Box(9702, 9702), Box(9702, 9702)),
+ Box(Box(9703, 9703), Box(9703, 9703)),
+ Box(Box(9704, 9704), Box(9704, 9704)),
+ Box(Box(9705, 9705), Box(9705, 9705)),
+ Box(Box(9706, 9706), Box(9706, 9706)),
+ Box(Box(9707, 9707), Box(9707, 9707)),
+ Box(Box(9708, 9708), Box(9708, 9708)),
+ Box(Box(9709, 9709), Box(9709, 9709)),
+ Box(Box(9710, 9710), Box(9710, 9710)),
+ Box(Box(9711, 9711), Box(9711, 9711)),
+ Box(Box(9712, 9712), Box(9712, 9712)),
+ Box(Box(9713, 9713), Box(9713, 9713)),
+ Box(Box(9714, 9714), Box(9714, 9714)),
+ Box(Box(9715, 9715), Box(9715, 9715)),
+ Box(Box(9716, 9716), Box(9716, 9716)),
+ Box(Box(9717, 9717), Box(9717, 9717)),
+ Box(Box(9718, 9718), Box(9718, 9718)),
+ Box(Box(9719, 9719), Box(9719, 9719)),
+ Box(Box(9720, 9720), Box(9720, 9720)),
+ Box(Box(9721, 9721), Box(9721, 9721)),
+ Box(Box(9722, 9722), Box(9722, 9722)),
+ Box(Box(9723, 9723), Box(9723, 9723)),
+ Box(Box(9724, 9724), Box(9724, 9724)),
+ Box(Box(9725, 9725), Box(9725, 9725)),
+ Box(Box(9726, 9726), Box(9726, 9726)),
+ Box(Box(9727, 9727), Box(9727, 9727)),
+ Box(Box(9728, 9728), Box(9728, 9728)),
+ Box(Box(9729, 9729), Box(9729, 9729)),
+ Box(Box(9730, 9730), Box(9730, 9730)),
+ Box(Box(9731, 9731), Box(9731, 9731)),
+ Box(Box(9732, 9732), Box(9732, 9732)),
+ Box(Box(9733, 9733), Box(9733, 9733)),
+ Box(Box(9734, 9734), Box(9734, 9734)),
+ Box(Box(9735, 9735), Box(9735, 9735)),
+ Box(Box(9736, 9736), Box(9736, 9736)),
+ Box(Box(9737, 9737), Box(9737, 9737)),
+ Box(Box(9738, 9738), Box(9738, 9738)),
+ Box(Box(9739, 9739), Box(9739, 9739)),
+ Box(Box(9740, 9740), Box(9740, 9740)),
+ Box(Box(9741, 9741), Box(9741, 9741)),
+ Box(Box(9742, 9742), Box(9742, 9742)),
+ Box(Box(9743, 9743), Box(9743, 9743)),
+ Box(Box(9744, 9744), Box(9744, 9744)),
+ Box(Box(9745, 9745), Box(9745, 9745)),
+ Box(Box(9746, 9746), Box(9746, 9746)),
+ Box(Box(9747, 9747), Box(9747, 9747)),
+ Box(Box(9748, 9748), Box(9748, 9748)),
+ Box(Box(9749, 9749), Box(9749, 9749)),
+ Box(Box(9750, 9750), Box(9750, 9750)),
+ Box(Box(9751, 9751), Box(9751, 9751)),
+ Box(Box(9752, 9752), Box(9752, 9752)),
+ Box(Box(9753, 9753), Box(9753, 9753)),
+ Box(Box(9754, 9754), Box(9754, 9754)),
+ Box(Box(9755, 9755), Box(9755, 9755)),
+ Box(Box(9756, 9756), Box(9756, 9756)),
+ Box(Box(9757, 9757), Box(9757, 9757)),
+ Box(Box(9758, 9758), Box(9758, 9758)),
+ Box(Box(9759, 9759), Box(9759, 9759)),
+ Box(Box(9760, 9760), Box(9760, 9760)),
+ Box(Box(9761, 9761), Box(9761, 9761)),
+ Box(Box(9762, 9762), Box(9762, 9762)),
+ Box(Box(9763, 9763), Box(9763, 9763)),
+ Box(Box(9764, 9764), Box(9764, 9764)),
+ Box(Box(9765, 9765), Box(9765, 9765)),
+ Box(Box(9766, 9766), Box(9766, 9766)),
+ Box(Box(9767, 9767), Box(9767, 9767)),
+ Box(Box(9768, 9768), Box(9768, 9768)),
+ Box(Box(9769, 9769), Box(9769, 9769)),
+ Box(Box(9770, 9770), Box(9770, 9770)),
+ Box(Box(9771, 9771), Box(9771, 9771)),
+ Box(Box(9772, 9772), Box(9772, 9772)),
+ Box(Box(9773, 9773), Box(9773, 9773)),
+ Box(Box(9774, 9774), Box(9774, 9774)),
+ Box(Box(9775, 9775), Box(9775, 9775)),
+ Box(Box(9776, 9776), Box(9776, 9776)),
+ Box(Box(9777, 9777), Box(9777, 9777)),
+ Box(Box(9778, 9778), Box(9778, 9778)),
+ Box(Box(9779, 9779), Box(9779, 9779)),
+ Box(Box(9780, 9780), Box(9780, 9780)),
+ Box(Box(9781, 9781), Box(9781, 9781)),
+ Box(Box(9782, 9782), Box(9782, 9782)),
+ Box(Box(9783, 9783), Box(9783, 9783)),
+ Box(Box(9784, 9784), Box(9784, 9784)),
+ Box(Box(9785, 9785), Box(9785, 9785)),
+ Box(Box(9786, 9786), Box(9786, 9786)),
+ Box(Box(9787, 9787), Box(9787, 9787)),
+ Box(Box(9788, 9788), Box(9788, 9788)),
+ Box(Box(9789, 9789), Box(9789, 9789)),
+ Box(Box(9790, 9790), Box(9790, 9790)),
+ Box(Box(9791, 9791), Box(9791, 9791)),
+ Box(Box(9792, 9792), Box(9792, 9792)),
+ Box(Box(9793, 9793), Box(9793, 9793)),
+ Box(Box(9794, 9794), Box(9794, 9794)),
+ Box(Box(9795, 9795), Box(9795, 9795)),
+ Box(Box(9796, 9796), Box(9796, 9796)),
+ Box(Box(9797, 9797), Box(9797, 9797)),
+ Box(Box(9798, 9798), Box(9798, 9798)),
+ Box(Box(9799, 9799), Box(9799, 9799)),
+ Box(Box(9800, 9800), Box(9800, 9800)),
+ Box(Box(9801, 9801), Box(9801, 9801)),
+ Box(Box(9802, 9802), Box(9802, 9802)),
+ Box(Box(9803, 9803), Box(9803, 9803)),
+ Box(Box(9804, 9804), Box(9804, 9804)),
+ Box(Box(9805, 9805), Box(9805, 9805)),
+ Box(Box(9806, 9806), Box(9806, 9806)),
+ Box(Box(9807, 9807), Box(9807, 9807)),
+ Box(Box(9808, 9808), Box(9808, 9808)),
+ Box(Box(9809, 9809), Box(9809, 9809)),
+ Box(Box(9810, 9810), Box(9810, 9810)),
+ Box(Box(9811, 9811), Box(9811, 9811)),
+ Box(Box(9812, 9812), Box(9812, 9812)),
+ Box(Box(9813, 9813), Box(9813, 9813)),
+ Box(Box(9814, 9814), Box(9814, 9814)),
+ Box(Box(9815, 9815), Box(9815, 9815)),
+ Box(Box(9816, 9816), Box(9816, 9816)),
+ Box(Box(9817, 9817), Box(9817, 9817)),
+ Box(Box(9818, 9818), Box(9818, 9818)),
+ Box(Box(9819, 9819), Box(9819, 9819)),
+ Box(Box(9820, 9820), Box(9820, 9820)),
+ Box(Box(9821, 9821), Box(9821, 9821)),
+ Box(Box(9822, 9822), Box(9822, 9822)),
+ Box(Box(9823, 9823), Box(9823, 9823)),
+ Box(Box(9824, 9824), Box(9824, 9824)),
+ Box(Box(9825, 9825), Box(9825, 9825)),
+ Box(Box(9826, 9826), Box(9826, 9826)),
+ Box(Box(9827, 9827), Box(9827, 9827)),
+ Box(Box(9828, 9828), Box(9828, 9828)),
+ Box(Box(9829, 9829), Box(9829, 9829)),
+ Box(Box(9830, 9830), Box(9830, 9830)),
+ Box(Box(9831, 9831), Box(9831, 9831)),
+ Box(Box(9832, 9832), Box(9832, 9832)),
+ Box(Box(9833, 9833), Box(9833, 9833)),
+ Box(Box(9834, 9834), Box(9834, 9834)),
+ Box(Box(9835, 9835), Box(9835, 9835)),
+ Box(Box(9836, 9836), Box(9836, 9836)),
+ Box(Box(9837, 9837), Box(9837, 9837)),
+ Box(Box(9838, 9838), Box(9838, 9838)),
+ Box(Box(9839, 9839), Box(9839, 9839)),
+ Box(Box(9840, 9840), Box(9840, 9840)),
+ Box(Box(9841, 9841), Box(9841, 9841)),
+ Box(Box(9842, 9842), Box(9842, 9842)),
+ Box(Box(9843, 9843), Box(9843, 9843)),
+ Box(Box(9844, 9844), Box(9844, 9844)),
+ Box(Box(9845, 9845), Box(9845, 9845)),
+ Box(Box(9846, 9846), Box(9846, 9846)),
+ Box(Box(9847, 9847), Box(9847, 9847)),
+ Box(Box(9848, 9848), Box(9848, 9848)),
+ Box(Box(9849, 9849), Box(9849, 9849)),
+ Box(Box(9850, 9850), Box(9850, 9850)),
+ Box(Box(9851, 9851), Box(9851, 9851)),
+ Box(Box(9852, 9852), Box(9852, 9852)),
+ Box(Box(9853, 9853), Box(9853, 9853)),
+ Box(Box(9854, 9854), Box(9854, 9854)),
+ Box(Box(9855, 9855), Box(9855, 9855)),
+ Box(Box(9856, 9856), Box(9856, 9856)),
+ Box(Box(9857, 9857), Box(9857, 9857)),
+ Box(Box(9858, 9858), Box(9858, 9858)),
+ Box(Box(9859, 9859), Box(9859, 9859)),
+ Box(Box(9860, 9860), Box(9860, 9860)),
+ Box(Box(9861, 9861), Box(9861, 9861)),
+ Box(Box(9862, 9862), Box(9862, 9862)),
+ Box(Box(9863, 9863), Box(9863, 9863)),
+ Box(Box(9864, 9864), Box(9864, 9864)),
+ Box(Box(9865, 9865), Box(9865, 9865)),
+ Box(Box(9866, 9866), Box(9866, 9866)),
+ Box(Box(9867, 9867), Box(9867, 9867)),
+ Box(Box(9868, 9868), Box(9868, 9868)),
+ Box(Box(9869, 9869), Box(9869, 9869)),
+ Box(Box(9870, 9870), Box(9870, 9870)),
+ Box(Box(9871, 9871), Box(9871, 9871)),
+ Box(Box(9872, 9872), Box(9872, 9872)),
+ Box(Box(9873, 9873), Box(9873, 9873)),
+ Box(Box(9874, 9874), Box(9874, 9874)),
+ Box(Box(9875, 9875), Box(9875, 9875)),
+ Box(Box(9876, 9876), Box(9876, 9876)),
+ Box(Box(9877, 9877), Box(9877, 9877)),
+ Box(Box(9878, 9878), Box(9878, 9878)),
+ Box(Box(9879, 9879), Box(9879, 9879)),
+ Box(Box(9880, 9880), Box(9880, 9880)),
+ Box(Box(9881, 9881), Box(9881, 9881)),
+ Box(Box(9882, 9882), Box(9882, 9882)),
+ Box(Box(9883, 9883), Box(9883, 9883)),
+ Box(Box(9884, 9884), Box(9884, 9884)),
+ Box(Box(9885, 9885), Box(9885, 9885)),
+ Box(Box(9886, 9886), Box(9886, 9886)),
+ Box(Box(9887, 9887), Box(9887, 9887)),
+ Box(Box(9888, 9888), Box(9888, 9888)),
+ Box(Box(9889, 9889), Box(9889, 9889)),
+ Box(Box(9890, 9890), Box(9890, 9890)),
+ Box(Box(9891, 9891), Box(9891, 9891)),
+ Box(Box(9892, 9892), Box(9892, 9892)),
+ Box(Box(9893, 9893), Box(9893, 9893)),
+ Box(Box(9894, 9894), Box(9894, 9894)),
+ Box(Box(9895, 9895), Box(9895, 9895)),
+ Box(Box(9896, 9896), Box(9896, 9896)),
+ Box(Box(9897, 9897), Box(9897, 9897)),
+ Box(Box(9898, 9898), Box(9898, 9898)),
+ Box(Box(9899, 9899), Box(9899, 9899)),
+ Box(Box(9900, 9900), Box(9900, 9900)),
+ Box(Box(9901, 9901), Box(9901, 9901)),
+ Box(Box(9902, 9902), Box(9902, 9902)),
+ Box(Box(9903, 9903), Box(9903, 9903)),
+ Box(Box(9904, 9904), Box(9904, 9904)),
+ Box(Box(9905, 9905), Box(9905, 9905)),
+ Box(Box(9906, 9906), Box(9906, 9906)),
+ Box(Box(9907, 9907), Box(9907, 9907)),
+ Box(Box(9908, 9908), Box(9908, 9908)),
+ Box(Box(9909, 9909), Box(9909, 9909)),
+ Box(Box(9910, 9910), Box(9910, 9910)),
+ Box(Box(9911, 9911), Box(9911, 9911)),
+ Box(Box(9912, 9912), Box(9912, 9912)),
+ Box(Box(9913, 9913), Box(9913, 9913)),
+ Box(Box(9914, 9914), Box(9914, 9914)),
+ Box(Box(9915, 9915), Box(9915, 9915)),
+ Box(Box(9916, 9916), Box(9916, 9916)),
+ Box(Box(9917, 9917), Box(9917, 9917)),
+ Box(Box(9918, 9918), Box(9918, 9918)),
+ Box(Box(9919, 9919), Box(9919, 9919)),
+ Box(Box(9920, 9920), Box(9920, 9920)),
+ Box(Box(9921, 9921), Box(9921, 9921)),
+ Box(Box(9922, 9922), Box(9922, 9922)),
+ Box(Box(9923, 9923), Box(9923, 9923)),
+ Box(Box(9924, 9924), Box(9924, 9924)),
+ Box(Box(9925, 9925), Box(9925, 9925)),
+ Box(Box(9926, 9926), Box(9926, 9926)),
+ Box(Box(9927, 9927), Box(9927, 9927)),
+ Box(Box(9928, 9928), Box(9928, 9928)),
+ Box(Box(9929, 9929), Box(9929, 9929)),
+ Box(Box(9930, 9930), Box(9930, 9930)),
+ Box(Box(9931, 9931), Box(9931, 9931)),
+ Box(Box(9932, 9932), Box(9932, 9932)),
+ Box(Box(9933, 9933), Box(9933, 9933)),
+ Box(Box(9934, 9934), Box(9934, 9934)),
+ Box(Box(9935, 9935), Box(9935, 9935)),
+ Box(Box(9936, 9936), Box(9936, 9936)),
+ Box(Box(9937, 9937), Box(9937, 9937)),
+ Box(Box(9938, 9938), Box(9938, 9938)),
+ Box(Box(9939, 9939), Box(9939, 9939)),
+ Box(Box(9940, 9940), Box(9940, 9940)),
+ Box(Box(9941, 9941), Box(9941, 9941)),
+ Box(Box(9942, 9942), Box(9942, 9942)),
+ Box(Box(9943, 9943), Box(9943, 9943)),
+ Box(Box(9944, 9944), Box(9944, 9944)),
+ Box(Box(9945, 9945), Box(9945, 9945)),
+ Box(Box(9946, 9946), Box(9946, 9946)),
+ Box(Box(9947, 9947), Box(9947, 9947)),
+ Box(Box(9948, 9948), Box(9948, 9948)),
+ Box(Box(9949, 9949), Box(9949, 9949)),
+ Box(Box(9950, 9950), Box(9950, 9950)),
+ Box(Box(9951, 9951), Box(9951, 9951)),
+ Box(Box(9952, 9952), Box(9952, 9952)),
+ Box(Box(9953, 9953), Box(9953, 9953)),
+ Box(Box(9954, 9954), Box(9954, 9954)),
+ Box(Box(9955, 9955), Box(9955, 9955)),
+ Box(Box(9956, 9956), Box(9956, 9956)),
+ Box(Box(9957, 9957), Box(9957, 9957)),
+ Box(Box(9958, 9958), Box(9958, 9958)),
+ Box(Box(9959, 9959), Box(9959, 9959)),
+ Box(Box(9960, 9960), Box(9960, 9960)),
+ Box(Box(9961, 9961), Box(9961, 9961)),
+ Box(Box(9962, 9962), Box(9962, 9962)),
+ Box(Box(9963, 9963), Box(9963, 9963)),
+ Box(Box(9964, 9964), Box(9964, 9964)),
+ Box(Box(9965, 9965), Box(9965, 9965)),
+ Box(Box(9966, 9966), Box(9966, 9966)),
+ Box(Box(9967, 9967), Box(9967, 9967)),
+ Box(Box(9968, 9968), Box(9968, 9968)),
+ Box(Box(9969, 9969), Box(9969, 9969)),
+ Box(Box(9970, 9970), Box(9970, 9970)),
+ Box(Box(9971, 9971), Box(9971, 9971)),
+ Box(Box(9972, 9972), Box(9972, 9972)),
+ Box(Box(9973, 9973), Box(9973, 9973)),
+ Box(Box(9974, 9974), Box(9974, 9974)),
+ Box(Box(9975, 9975), Box(9975, 9975)),
+ Box(Box(9976, 9976), Box(9976, 9976)),
+ Box(Box(9977, 9977), Box(9977, 9977)),
+ Box(Box(9978, 9978), Box(9978, 9978)),
+ Box(Box(9979, 9979), Box(9979, 9979)),
+ Box(Box(9980, 9980), Box(9980, 9980)),
+ Box(Box(9981, 9981), Box(9981, 9981)),
+ Box(Box(9982, 9982), Box(9982, 9982)),
+ Box(Box(9983, 9983), Box(9983, 9983)),
+ Box(Box(9984, 9984), Box(9984, 9984)),
+ Box(Box(9985, 9985), Box(9985, 9985)),
+ Box(Box(9986, 9986), Box(9986, 9986)),
+ Box(Box(9987, 9987), Box(9987, 9987)),
+ Box(Box(9988, 9988), Box(9988, 9988)),
+ Box(Box(9989, 9989), Box(9989, 9989)),
+ Box(Box(9990, 9990), Box(9990, 9990)),
+ Box(Box(9991, 9991), Box(9991, 9991)),
+ Box(Box(9992, 9992), Box(9992, 9992)),
+ Box(Box(9993, 9993), Box(9993, 9993)),
+ Box(Box(9994, 9994), Box(9994, 9994)),
+ Box(Box(9995, 9995), Box(9995, 9995)),
+ Box(Box(9996, 9996), Box(9996, 9996)),
+ Box(Box(9997, 9997), Box(9997, 9997)),
+ Box(Box(9998, 9998), Box(9998, 9998)),
+ Box(Box(9999, 9999), Box(9999, 9999)),
+];
+
+// 10,000 elements.
+const list2 = [
+ Box(Box(0, 0), Box(0, 0)),
+ Box(Box(1, 1), Box(1, 1)),
+ Box(Box(2, 2), Box(2, 2)),
+ Box(Box(3, 3), Box(3, 3)),
+ Box(Box(4, 4), Box(4, 4)),
+ Box(Box(5, 5), Box(5, 5)),
+ Box(Box(6, 6), Box(6, 6)),
+ Box(Box(7, 7), Box(7, 7)),
+ Box(Box(8, 8), Box(8, 8)),
+ Box(Box(9, 9), Box(9, 9)),
+ Box(Box(10, 10), Box(10, 10)),
+ Box(Box(11, 11), Box(11, 11)),
+ Box(Box(12, 12), Box(12, 12)),
+ Box(Box(13, 13), Box(13, 13)),
+ Box(Box(14, 14), Box(14, 14)),
+ Box(Box(15, 15), Box(15, 15)),
+ Box(Box(16, 16), Box(16, 16)),
+ Box(Box(17, 17), Box(17, 17)),
+ Box(Box(18, 18), Box(18, 18)),
+ Box(Box(19, 19), Box(19, 19)),
+ Box(Box(20, 20), Box(20, 20)),
+ Box(Box(21, 21), Box(21, 21)),
+ Box(Box(22, 22), Box(22, 22)),
+ Box(Box(23, 23), Box(23, 23)),
+ Box(Box(24, 24), Box(24, 24)),
+ Box(Box(25, 25), Box(25, 25)),
+ Box(Box(26, 26), Box(26, 26)),
+ Box(Box(27, 27), Box(27, 27)),
+ Box(Box(28, 28), Box(28, 28)),
+ Box(Box(29, 29), Box(29, 29)),
+ Box(Box(30, 30), Box(30, 30)),
+ Box(Box(31, 31), Box(31, 31)),
+ Box(Box(32, 32), Box(32, 32)),
+ Box(Box(33, 33), Box(33, 33)),
+ Box(Box(34, 34), Box(34, 34)),
+ Box(Box(35, 35), Box(35, 35)),
+ Box(Box(36, 36), Box(36, 36)),
+ Box(Box(37, 37), Box(37, 37)),
+ Box(Box(38, 38), Box(38, 38)),
+ Box(Box(39, 39), Box(39, 39)),
+ Box(Box(40, 40), Box(40, 40)),
+ Box(Box(41, 41), Box(41, 41)),
+ Box(Box(42, 42), Box(42, 42)),
+ Box(Box(43, 43), Box(43, 43)),
+ Box(Box(44, 44), Box(44, 44)),
+ Box(Box(45, 45), Box(45, 45)),
+ Box(Box(46, 46), Box(46, 46)),
+ Box(Box(47, 47), Box(47, 47)),
+ Box(Box(48, 48), Box(48, 48)),
+ Box(Box(49, 49), Box(49, 49)),
+ Box(Box(50, 50), Box(50, 50)),
+ Box(Box(51, 51), Box(51, 51)),
+ Box(Box(52, 52), Box(52, 52)),
+ Box(Box(53, 53), Box(53, 53)),
+ Box(Box(54, 54), Box(54, 54)),
+ Box(Box(55, 55), Box(55, 55)),
+ Box(Box(56, 56), Box(56, 56)),
+ Box(Box(57, 57), Box(57, 57)),
+ Box(Box(58, 58), Box(58, 58)),
+ Box(Box(59, 59), Box(59, 59)),
+ Box(Box(60, 60), Box(60, 60)),
+ Box(Box(61, 61), Box(61, 61)),
+ Box(Box(62, 62), Box(62, 62)),
+ Box(Box(63, 63), Box(63, 63)),
+ Box(Box(64, 64), Box(64, 64)),
+ Box(Box(65, 65), Box(65, 65)),
+ Box(Box(66, 66), Box(66, 66)),
+ Box(Box(67, 67), Box(67, 67)),
+ Box(Box(68, 68), Box(68, 68)),
+ Box(Box(69, 69), Box(69, 69)),
+ Box(Box(70, 70), Box(70, 70)),
+ Box(Box(71, 71), Box(71, 71)),
+ Box(Box(72, 72), Box(72, 72)),
+ Box(Box(73, 73), Box(73, 73)),
+ Box(Box(74, 74), Box(74, 74)),
+ Box(Box(75, 75), Box(75, 75)),
+ Box(Box(76, 76), Box(76, 76)),
+ Box(Box(77, 77), Box(77, 77)),
+ Box(Box(78, 78), Box(78, 78)),
+ Box(Box(79, 79), Box(79, 79)),
+ Box(Box(80, 80), Box(80, 80)),
+ Box(Box(81, 81), Box(81, 81)),
+ Box(Box(82, 82), Box(82, 82)),
+ Box(Box(83, 83), Box(83, 83)),
+ Box(Box(84, 84), Box(84, 84)),
+ Box(Box(85, 85), Box(85, 85)),
+ Box(Box(86, 86), Box(86, 86)),
+ Box(Box(87, 87), Box(87, 87)),
+ Box(Box(88, 88), Box(88, 88)),
+ Box(Box(89, 89), Box(89, 89)),
+ Box(Box(90, 90), Box(90, 90)),
+ Box(Box(91, 91), Box(91, 91)),
+ Box(Box(92, 92), Box(92, 92)),
+ Box(Box(93, 93), Box(93, 93)),
+ Box(Box(94, 94), Box(94, 94)),
+ Box(Box(95, 95), Box(95, 95)),
+ Box(Box(96, 96), Box(96, 96)),
+ Box(Box(97, 97), Box(97, 97)),
+ Box(Box(98, 98), Box(98, 98)),
+ Box(Box(99, 99), Box(99, 99)),
+ Box(Box(100, 100), Box(100, 100)),
+ Box(Box(101, 101), Box(101, 101)),
+ Box(Box(102, 102), Box(102, 102)),
+ Box(Box(103, 103), Box(103, 103)),
+ Box(Box(104, 104), Box(104, 104)),
+ Box(Box(105, 105), Box(105, 105)),
+ Box(Box(106, 106), Box(106, 106)),
+ Box(Box(107, 107), Box(107, 107)),
+ Box(Box(108, 108), Box(108, 108)),
+ Box(Box(109, 109), Box(109, 109)),
+ Box(Box(110, 110), Box(110, 110)),
+ Box(Box(111, 111), Box(111, 111)),
+ Box(Box(112, 112), Box(112, 112)),
+ Box(Box(113, 113), Box(113, 113)),
+ Box(Box(114, 114), Box(114, 114)),
+ Box(Box(115, 115), Box(115, 115)),
+ Box(Box(116, 116), Box(116, 116)),
+ Box(Box(117, 117), Box(117, 117)),
+ Box(Box(118, 118), Box(118, 118)),
+ Box(Box(119, 119), Box(119, 119)),
+ Box(Box(120, 120), Box(120, 120)),
+ Box(Box(121, 121), Box(121, 121)),
+ Box(Box(122, 122), Box(122, 122)),
+ Box(Box(123, 123), Box(123, 123)),
+ Box(Box(124, 124), Box(124, 124)),
+ Box(Box(125, 125), Box(125, 125)),
+ Box(Box(126, 126), Box(126, 126)),
+ Box(Box(127, 127), Box(127, 127)),
+ Box(Box(128, 128), Box(128, 128)),
+ Box(Box(129, 129), Box(129, 129)),
+ Box(Box(130, 130), Box(130, 130)),
+ Box(Box(131, 131), Box(131, 131)),
+ Box(Box(132, 132), Box(132, 132)),
+ Box(Box(133, 133), Box(133, 133)),
+ Box(Box(134, 134), Box(134, 134)),
+ Box(Box(135, 135), Box(135, 135)),
+ Box(Box(136, 136), Box(136, 136)),
+ Box(Box(137, 137), Box(137, 137)),
+ Box(Box(138, 138), Box(138, 138)),
+ Box(Box(139, 139), Box(139, 139)),
+ Box(Box(140, 140), Box(140, 140)),
+ Box(Box(141, 141), Box(141, 141)),
+ Box(Box(142, 142), Box(142, 142)),
+ Box(Box(143, 143), Box(143, 143)),
+ Box(Box(144, 144), Box(144, 144)),
+ Box(Box(145, 145), Box(145, 145)),
+ Box(Box(146, 146), Box(146, 146)),
+ Box(Box(147, 147), Box(147, 147)),
+ Box(Box(148, 148), Box(148, 148)),
+ Box(Box(149, 149), Box(149, 149)),
+ Box(Box(150, 150), Box(150, 150)),
+ Box(Box(151, 151), Box(151, 151)),
+ Box(Box(152, 152), Box(152, 152)),
+ Box(Box(153, 153), Box(153, 153)),
+ Box(Box(154, 154), Box(154, 154)),
+ Box(Box(155, 155), Box(155, 155)),
+ Box(Box(156, 156), Box(156, 156)),
+ Box(Box(157, 157), Box(157, 157)),
+ Box(Box(158, 158), Box(158, 158)),
+ Box(Box(159, 159), Box(159, 159)),
+ Box(Box(160, 160), Box(160, 160)),
+ Box(Box(161, 161), Box(161, 161)),
+ Box(Box(162, 162), Box(162, 162)),
+ Box(Box(163, 163), Box(163, 163)),
+ Box(Box(164, 164), Box(164, 164)),
+ Box(Box(165, 165), Box(165, 165)),
+ Box(Box(166, 166), Box(166, 166)),
+ Box(Box(167, 167), Box(167, 167)),
+ Box(Box(168, 168), Box(168, 168)),
+ Box(Box(169, 169), Box(169, 169)),
+ Box(Box(170, 170), Box(170, 170)),
+ Box(Box(171, 171), Box(171, 171)),
+ Box(Box(172, 172), Box(172, 172)),
+ Box(Box(173, 173), Box(173, 173)),
+ Box(Box(174, 174), Box(174, 174)),
+ Box(Box(175, 175), Box(175, 175)),
+ Box(Box(176, 176), Box(176, 176)),
+ Box(Box(177, 177), Box(177, 177)),
+ Box(Box(178, 178), Box(178, 178)),
+ Box(Box(179, 179), Box(179, 179)),
+ Box(Box(180, 180), Box(180, 180)),
+ Box(Box(181, 181), Box(181, 181)),
+ Box(Box(182, 182), Box(182, 182)),
+ Box(Box(183, 183), Box(183, 183)),
+ Box(Box(184, 184), Box(184, 184)),
+ Box(Box(185, 185), Box(185, 185)),
+ Box(Box(186, 186), Box(186, 186)),
+ Box(Box(187, 187), Box(187, 187)),
+ Box(Box(188, 188), Box(188, 188)),
+ Box(Box(189, 189), Box(189, 189)),
+ Box(Box(190, 190), Box(190, 190)),
+ Box(Box(191, 191), Box(191, 191)),
+ Box(Box(192, 192), Box(192, 192)),
+ Box(Box(193, 193), Box(193, 193)),
+ Box(Box(194, 194), Box(194, 194)),
+ Box(Box(195, 195), Box(195, 195)),
+ Box(Box(196, 196), Box(196, 196)),
+ Box(Box(197, 197), Box(197, 197)),
+ Box(Box(198, 198), Box(198, 198)),
+ Box(Box(199, 199), Box(199, 199)),
+ Box(Box(200, 200), Box(200, 200)),
+ Box(Box(201, 201), Box(201, 201)),
+ Box(Box(202, 202), Box(202, 202)),
+ Box(Box(203, 203), Box(203, 203)),
+ Box(Box(204, 204), Box(204, 204)),
+ Box(Box(205, 205), Box(205, 205)),
+ Box(Box(206, 206), Box(206, 206)),
+ Box(Box(207, 207), Box(207, 207)),
+ Box(Box(208, 208), Box(208, 208)),
+ Box(Box(209, 209), Box(209, 209)),
+ Box(Box(210, 210), Box(210, 210)),
+ Box(Box(211, 211), Box(211, 211)),
+ Box(Box(212, 212), Box(212, 212)),
+ Box(Box(213, 213), Box(213, 213)),
+ Box(Box(214, 214), Box(214, 214)),
+ Box(Box(215, 215), Box(215, 215)),
+ Box(Box(216, 216), Box(216, 216)),
+ Box(Box(217, 217), Box(217, 217)),
+ Box(Box(218, 218), Box(218, 218)),
+ Box(Box(219, 219), Box(219, 219)),
+ Box(Box(220, 220), Box(220, 220)),
+ Box(Box(221, 221), Box(221, 221)),
+ Box(Box(222, 222), Box(222, 222)),
+ Box(Box(223, 223), Box(223, 223)),
+ Box(Box(224, 224), Box(224, 224)),
+ Box(Box(225, 225), Box(225, 225)),
+ Box(Box(226, 226), Box(226, 226)),
+ Box(Box(227, 227), Box(227, 227)),
+ Box(Box(228, 228), Box(228, 228)),
+ Box(Box(229, 229), Box(229, 229)),
+ Box(Box(230, 230), Box(230, 230)),
+ Box(Box(231, 231), Box(231, 231)),
+ Box(Box(232, 232), Box(232, 232)),
+ Box(Box(233, 233), Box(233, 233)),
+ Box(Box(234, 234), Box(234, 234)),
+ Box(Box(235, 235), Box(235, 235)),
+ Box(Box(236, 236), Box(236, 236)),
+ Box(Box(237, 237), Box(237, 237)),
+ Box(Box(238, 238), Box(238, 238)),
+ Box(Box(239, 239), Box(239, 239)),
+ Box(Box(240, 240), Box(240, 240)),
+ Box(Box(241, 241), Box(241, 241)),
+ Box(Box(242, 242), Box(242, 242)),
+ Box(Box(243, 243), Box(243, 243)),
+ Box(Box(244, 244), Box(244, 244)),
+ Box(Box(245, 245), Box(245, 245)),
+ Box(Box(246, 246), Box(246, 246)),
+ Box(Box(247, 247), Box(247, 247)),
+ Box(Box(248, 248), Box(248, 248)),
+ Box(Box(249, 249), Box(249, 249)),
+ Box(Box(250, 250), Box(250, 250)),
+ Box(Box(251, 251), Box(251, 251)),
+ Box(Box(252, 252), Box(252, 252)),
+ Box(Box(253, 253), Box(253, 253)),
+ Box(Box(254, 254), Box(254, 254)),
+ Box(Box(255, 255), Box(255, 255)),
+ Box(Box(256, 256), Box(256, 256)),
+ Box(Box(257, 257), Box(257, 257)),
+ Box(Box(258, 258), Box(258, 258)),
+ Box(Box(259, 259), Box(259, 259)),
+ Box(Box(260, 260), Box(260, 260)),
+ Box(Box(261, 261), Box(261, 261)),
+ Box(Box(262, 262), Box(262, 262)),
+ Box(Box(263, 263), Box(263, 263)),
+ Box(Box(264, 264), Box(264, 264)),
+ Box(Box(265, 265), Box(265, 265)),
+ Box(Box(266, 266), Box(266, 266)),
+ Box(Box(267, 267), Box(267, 267)),
+ Box(Box(268, 268), Box(268, 268)),
+ Box(Box(269, 269), Box(269, 269)),
+ Box(Box(270, 270), Box(270, 270)),
+ Box(Box(271, 271), Box(271, 271)),
+ Box(Box(272, 272), Box(272, 272)),
+ Box(Box(273, 273), Box(273, 273)),
+ Box(Box(274, 274), Box(274, 274)),
+ Box(Box(275, 275), Box(275, 275)),
+ Box(Box(276, 276), Box(276, 276)),
+ Box(Box(277, 277), Box(277, 277)),
+ Box(Box(278, 278), Box(278, 278)),
+ Box(Box(279, 279), Box(279, 279)),
+ Box(Box(280, 280), Box(280, 280)),
+ Box(Box(281, 281), Box(281, 281)),
+ Box(Box(282, 282), Box(282, 282)),
+ Box(Box(283, 283), Box(283, 283)),
+ Box(Box(284, 284), Box(284, 284)),
+ Box(Box(285, 285), Box(285, 285)),
+ Box(Box(286, 286), Box(286, 286)),
+ Box(Box(287, 287), Box(287, 287)),
+ Box(Box(288, 288), Box(288, 288)),
+ Box(Box(289, 289), Box(289, 289)),
+ Box(Box(290, 290), Box(290, 290)),
+ Box(Box(291, 291), Box(291, 291)),
+ Box(Box(292, 292), Box(292, 292)),
+ Box(Box(293, 293), Box(293, 293)),
+ Box(Box(294, 294), Box(294, 294)),
+ Box(Box(295, 295), Box(295, 295)),
+ Box(Box(296, 296), Box(296, 296)),
+ Box(Box(297, 297), Box(297, 297)),
+ Box(Box(298, 298), Box(298, 298)),
+ Box(Box(299, 299), Box(299, 299)),
+ Box(Box(300, 300), Box(300, 300)),
+ Box(Box(301, 301), Box(301, 301)),
+ Box(Box(302, 302), Box(302, 302)),
+ Box(Box(303, 303), Box(303, 303)),
+ Box(Box(304, 304), Box(304, 304)),
+ Box(Box(305, 305), Box(305, 305)),
+ Box(Box(306, 306), Box(306, 306)),
+ Box(Box(307, 307), Box(307, 307)),
+ Box(Box(308, 308), Box(308, 308)),
+ Box(Box(309, 309), Box(309, 309)),
+ Box(Box(310, 310), Box(310, 310)),
+ Box(Box(311, 311), Box(311, 311)),
+ Box(Box(312, 312), Box(312, 312)),
+ Box(Box(313, 313), Box(313, 313)),
+ Box(Box(314, 314), Box(314, 314)),
+ Box(Box(315, 315), Box(315, 315)),
+ Box(Box(316, 316), Box(316, 316)),
+ Box(Box(317, 317), Box(317, 317)),
+ Box(Box(318, 318), Box(318, 318)),
+ Box(Box(319, 319), Box(319, 319)),
+ Box(Box(320, 320), Box(320, 320)),
+ Box(Box(321, 321), Box(321, 321)),
+ Box(Box(322, 322), Box(322, 322)),
+ Box(Box(323, 323), Box(323, 323)),
+ Box(Box(324, 324), Box(324, 324)),
+ Box(Box(325, 325), Box(325, 325)),
+ Box(Box(326, 326), Box(326, 326)),
+ Box(Box(327, 327), Box(327, 327)),
+ Box(Box(328, 328), Box(328, 328)),
+ Box(Box(329, 329), Box(329, 329)),
+ Box(Box(330, 330), Box(330, 330)),
+ Box(Box(331, 331), Box(331, 331)),
+ Box(Box(332, 332), Box(332, 332)),
+ Box(Box(333, 333), Box(333, 333)),
+ Box(Box(334, 334), Box(334, 334)),
+ Box(Box(335, 335), Box(335, 335)),
+ Box(Box(336, 336), Box(336, 336)),
+ Box(Box(337, 337), Box(337, 337)),
+ Box(Box(338, 338), Box(338, 338)),
+ Box(Box(339, 339), Box(339, 339)),
+ Box(Box(340, 340), Box(340, 340)),
+ Box(Box(341, 341), Box(341, 341)),
+ Box(Box(342, 342), Box(342, 342)),
+ Box(Box(343, 343), Box(343, 343)),
+ Box(Box(344, 344), Box(344, 344)),
+ Box(Box(345, 345), Box(345, 345)),
+ Box(Box(346, 346), Box(346, 346)),
+ Box(Box(347, 347), Box(347, 347)),
+ Box(Box(348, 348), Box(348, 348)),
+ Box(Box(349, 349), Box(349, 349)),
+ Box(Box(350, 350), Box(350, 350)),
+ Box(Box(351, 351), Box(351, 351)),
+ Box(Box(352, 352), Box(352, 352)),
+ Box(Box(353, 353), Box(353, 353)),
+ Box(Box(354, 354), Box(354, 354)),
+ Box(Box(355, 355), Box(355, 355)),
+ Box(Box(356, 356), Box(356, 356)),
+ Box(Box(357, 357), Box(357, 357)),
+ Box(Box(358, 358), Box(358, 358)),
+ Box(Box(359, 359), Box(359, 359)),
+ Box(Box(360, 360), Box(360, 360)),
+ Box(Box(361, 361), Box(361, 361)),
+ Box(Box(362, 362), Box(362, 362)),
+ Box(Box(363, 363), Box(363, 363)),
+ Box(Box(364, 364), Box(364, 364)),
+ Box(Box(365, 365), Box(365, 365)),
+ Box(Box(366, 366), Box(366, 366)),
+ Box(Box(367, 367), Box(367, 367)),
+ Box(Box(368, 368), Box(368, 368)),
+ Box(Box(369, 369), Box(369, 369)),
+ Box(Box(370, 370), Box(370, 370)),
+ Box(Box(371, 371), Box(371, 371)),
+ Box(Box(372, 372), Box(372, 372)),
+ Box(Box(373, 373), Box(373, 373)),
+ Box(Box(374, 374), Box(374, 374)),
+ Box(Box(375, 375), Box(375, 375)),
+ Box(Box(376, 376), Box(376, 376)),
+ Box(Box(377, 377), Box(377, 377)),
+ Box(Box(378, 378), Box(378, 378)),
+ Box(Box(379, 379), Box(379, 379)),
+ Box(Box(380, 380), Box(380, 380)),
+ Box(Box(381, 381), Box(381, 381)),
+ Box(Box(382, 382), Box(382, 382)),
+ Box(Box(383, 383), Box(383, 383)),
+ Box(Box(384, 384), Box(384, 384)),
+ Box(Box(385, 385), Box(385, 385)),
+ Box(Box(386, 386), Box(386, 386)),
+ Box(Box(387, 387), Box(387, 387)),
+ Box(Box(388, 388), Box(388, 388)),
+ Box(Box(389, 389), Box(389, 389)),
+ Box(Box(390, 390), Box(390, 390)),
+ Box(Box(391, 391), Box(391, 391)),
+ Box(Box(392, 392), Box(392, 392)),
+ Box(Box(393, 393), Box(393, 393)),
+ Box(Box(394, 394), Box(394, 394)),
+ Box(Box(395, 395), Box(395, 395)),
+ Box(Box(396, 396), Box(396, 396)),
+ Box(Box(397, 397), Box(397, 397)),
+ Box(Box(398, 398), Box(398, 398)),
+ Box(Box(399, 399), Box(399, 399)),
+ Box(Box(400, 400), Box(400, 400)),
+ Box(Box(401, 401), Box(401, 401)),
+ Box(Box(402, 402), Box(402, 402)),
+ Box(Box(403, 403), Box(403, 403)),
+ Box(Box(404, 404), Box(404, 404)),
+ Box(Box(405, 405), Box(405, 405)),
+ Box(Box(406, 406), Box(406, 406)),
+ Box(Box(407, 407), Box(407, 407)),
+ Box(Box(408, 408), Box(408, 408)),
+ Box(Box(409, 409), Box(409, 409)),
+ Box(Box(410, 410), Box(410, 410)),
+ Box(Box(411, 411), Box(411, 411)),
+ Box(Box(412, 412), Box(412, 412)),
+ Box(Box(413, 413), Box(413, 413)),
+ Box(Box(414, 414), Box(414, 414)),
+ Box(Box(415, 415), Box(415, 415)),
+ Box(Box(416, 416), Box(416, 416)),
+ Box(Box(417, 417), Box(417, 417)),
+ Box(Box(418, 418), Box(418, 418)),
+ Box(Box(419, 419), Box(419, 419)),
+ Box(Box(420, 420), Box(420, 420)),
+ Box(Box(421, 421), Box(421, 421)),
+ Box(Box(422, 422), Box(422, 422)),
+ Box(Box(423, 423), Box(423, 423)),
+ Box(Box(424, 424), Box(424, 424)),
+ Box(Box(425, 425), Box(425, 425)),
+ Box(Box(426, 426), Box(426, 426)),
+ Box(Box(427, 427), Box(427, 427)),
+ Box(Box(428, 428), Box(428, 428)),
+ Box(Box(429, 429), Box(429, 429)),
+ Box(Box(430, 430), Box(430, 430)),
+ Box(Box(431, 431), Box(431, 431)),
+ Box(Box(432, 432), Box(432, 432)),
+ Box(Box(433, 433), Box(433, 433)),
+ Box(Box(434, 434), Box(434, 434)),
+ Box(Box(435, 435), Box(435, 435)),
+ Box(Box(436, 436), Box(436, 436)),
+ Box(Box(437, 437), Box(437, 437)),
+ Box(Box(438, 438), Box(438, 438)),
+ Box(Box(439, 439), Box(439, 439)),
+ Box(Box(440, 440), Box(440, 440)),
+ Box(Box(441, 441), Box(441, 441)),
+ Box(Box(442, 442), Box(442, 442)),
+ Box(Box(443, 443), Box(443, 443)),
+ Box(Box(444, 444), Box(444, 444)),
+ Box(Box(445, 445), Box(445, 445)),
+ Box(Box(446, 446), Box(446, 446)),
+ Box(Box(447, 447), Box(447, 447)),
+ Box(Box(448, 448), Box(448, 448)),
+ Box(Box(449, 449), Box(449, 449)),
+ Box(Box(450, 450), Box(450, 450)),
+ Box(Box(451, 451), Box(451, 451)),
+ Box(Box(452, 452), Box(452, 452)),
+ Box(Box(453, 453), Box(453, 453)),
+ Box(Box(454, 454), Box(454, 454)),
+ Box(Box(455, 455), Box(455, 455)),
+ Box(Box(456, 456), Box(456, 456)),
+ Box(Box(457, 457), Box(457, 457)),
+ Box(Box(458, 458), Box(458, 458)),
+ Box(Box(459, 459), Box(459, 459)),
+ Box(Box(460, 460), Box(460, 460)),
+ Box(Box(461, 461), Box(461, 461)),
+ Box(Box(462, 462), Box(462, 462)),
+ Box(Box(463, 463), Box(463, 463)),
+ Box(Box(464, 464), Box(464, 464)),
+ Box(Box(465, 465), Box(465, 465)),
+ Box(Box(466, 466), Box(466, 466)),
+ Box(Box(467, 467), Box(467, 467)),
+ Box(Box(468, 468), Box(468, 468)),
+ Box(Box(469, 469), Box(469, 469)),
+ Box(Box(470, 470), Box(470, 470)),
+ Box(Box(471, 471), Box(471, 471)),
+ Box(Box(472, 472), Box(472, 472)),
+ Box(Box(473, 473), Box(473, 473)),
+ Box(Box(474, 474), Box(474, 474)),
+ Box(Box(475, 475), Box(475, 475)),
+ Box(Box(476, 476), Box(476, 476)),
+ Box(Box(477, 477), Box(477, 477)),
+ Box(Box(478, 478), Box(478, 478)),
+ Box(Box(479, 479), Box(479, 479)),
+ Box(Box(480, 480), Box(480, 480)),
+ Box(Box(481, 481), Box(481, 481)),
+ Box(Box(482, 482), Box(482, 482)),
+ Box(Box(483, 483), Box(483, 483)),
+ Box(Box(484, 484), Box(484, 484)),
+ Box(Box(485, 485), Box(485, 485)),
+ Box(Box(486, 486), Box(486, 486)),
+ Box(Box(487, 487), Box(487, 487)),
+ Box(Box(488, 488), Box(488, 488)),
+ Box(Box(489, 489), Box(489, 489)),
+ Box(Box(490, 490), Box(490, 490)),
+ Box(Box(491, 491), Box(491, 491)),
+ Box(Box(492, 492), Box(492, 492)),
+ Box(Box(493, 493), Box(493, 493)),
+ Box(Box(494, 494), Box(494, 494)),
+ Box(Box(495, 495), Box(495, 495)),
+ Box(Box(496, 496), Box(496, 496)),
+ Box(Box(497, 497), Box(497, 497)),
+ Box(Box(498, 498), Box(498, 498)),
+ Box(Box(499, 499), Box(499, 499)),
+ Box(Box(500, 500), Box(500, 500)),
+ Box(Box(501, 501), Box(501, 501)),
+ Box(Box(502, 502), Box(502, 502)),
+ Box(Box(503, 503), Box(503, 503)),
+ Box(Box(504, 504), Box(504, 504)),
+ Box(Box(505, 505), Box(505, 505)),
+ Box(Box(506, 506), Box(506, 506)),
+ Box(Box(507, 507), Box(507, 507)),
+ Box(Box(508, 508), Box(508, 508)),
+ Box(Box(509, 509), Box(509, 509)),
+ Box(Box(510, 510), Box(510, 510)),
+ Box(Box(511, 511), Box(511, 511)),
+ Box(Box(512, 512), Box(512, 512)),
+ Box(Box(513, 513), Box(513, 513)),
+ Box(Box(514, 514), Box(514, 514)),
+ Box(Box(515, 515), Box(515, 515)),
+ Box(Box(516, 516), Box(516, 516)),
+ Box(Box(517, 517), Box(517, 517)),
+ Box(Box(518, 518), Box(518, 518)),
+ Box(Box(519, 519), Box(519, 519)),
+ Box(Box(520, 520), Box(520, 520)),
+ Box(Box(521, 521), Box(521, 521)),
+ Box(Box(522, 522), Box(522, 522)),
+ Box(Box(523, 523), Box(523, 523)),
+ Box(Box(524, 524), Box(524, 524)),
+ Box(Box(525, 525), Box(525, 525)),
+ Box(Box(526, 526), Box(526, 526)),
+ Box(Box(527, 527), Box(527, 527)),
+ Box(Box(528, 528), Box(528, 528)),
+ Box(Box(529, 529), Box(529, 529)),
+ Box(Box(530, 530), Box(530, 530)),
+ Box(Box(531, 531), Box(531, 531)),
+ Box(Box(532, 532), Box(532, 532)),
+ Box(Box(533, 533), Box(533, 533)),
+ Box(Box(534, 534), Box(534, 534)),
+ Box(Box(535, 535), Box(535, 535)),
+ Box(Box(536, 536), Box(536, 536)),
+ Box(Box(537, 537), Box(537, 537)),
+ Box(Box(538, 538), Box(538, 538)),
+ Box(Box(539, 539), Box(539, 539)),
+ Box(Box(540, 540), Box(540, 540)),
+ Box(Box(541, 541), Box(541, 541)),
+ Box(Box(542, 542), Box(542, 542)),
+ Box(Box(543, 543), Box(543, 543)),
+ Box(Box(544, 544), Box(544, 544)),
+ Box(Box(545, 545), Box(545, 545)),
+ Box(Box(546, 546), Box(546, 546)),
+ Box(Box(547, 547), Box(547, 547)),
+ Box(Box(548, 548), Box(548, 548)),
+ Box(Box(549, 549), Box(549, 549)),
+ Box(Box(550, 550), Box(550, 550)),
+ Box(Box(551, 551), Box(551, 551)),
+ Box(Box(552, 552), Box(552, 552)),
+ Box(Box(553, 553), Box(553, 553)),
+ Box(Box(554, 554), Box(554, 554)),
+ Box(Box(555, 555), Box(555, 555)),
+ Box(Box(556, 556), Box(556, 556)),
+ Box(Box(557, 557), Box(557, 557)),
+ Box(Box(558, 558), Box(558, 558)),
+ Box(Box(559, 559), Box(559, 559)),
+ Box(Box(560, 560), Box(560, 560)),
+ Box(Box(561, 561), Box(561, 561)),
+ Box(Box(562, 562), Box(562, 562)),
+ Box(Box(563, 563), Box(563, 563)),
+ Box(Box(564, 564), Box(564, 564)),
+ Box(Box(565, 565), Box(565, 565)),
+ Box(Box(566, 566), Box(566, 566)),
+ Box(Box(567, 567), Box(567, 567)),
+ Box(Box(568, 568), Box(568, 568)),
+ Box(Box(569, 569), Box(569, 569)),
+ Box(Box(570, 570), Box(570, 570)),
+ Box(Box(571, 571), Box(571, 571)),
+ Box(Box(572, 572), Box(572, 572)),
+ Box(Box(573, 573), Box(573, 573)),
+ Box(Box(574, 574), Box(574, 574)),
+ Box(Box(575, 575), Box(575, 575)),
+ Box(Box(576, 576), Box(576, 576)),
+ Box(Box(577, 577), Box(577, 577)),
+ Box(Box(578, 578), Box(578, 578)),
+ Box(Box(579, 579), Box(579, 579)),
+ Box(Box(580, 580), Box(580, 580)),
+ Box(Box(581, 581), Box(581, 581)),
+ Box(Box(582, 582), Box(582, 582)),
+ Box(Box(583, 583), Box(583, 583)),
+ Box(Box(584, 584), Box(584, 584)),
+ Box(Box(585, 585), Box(585, 585)),
+ Box(Box(586, 586), Box(586, 586)),
+ Box(Box(587, 587), Box(587, 587)),
+ Box(Box(588, 588), Box(588, 588)),
+ Box(Box(589, 589), Box(589, 589)),
+ Box(Box(590, 590), Box(590, 590)),
+ Box(Box(591, 591), Box(591, 591)),
+ Box(Box(592, 592), Box(592, 592)),
+ Box(Box(593, 593), Box(593, 593)),
+ Box(Box(594, 594), Box(594, 594)),
+ Box(Box(595, 595), Box(595, 595)),
+ Box(Box(596, 596), Box(596, 596)),
+ Box(Box(597, 597), Box(597, 597)),
+ Box(Box(598, 598), Box(598, 598)),
+ Box(Box(599, 599), Box(599, 599)),
+ Box(Box(600, 600), Box(600, 600)),
+ Box(Box(601, 601), Box(601, 601)),
+ Box(Box(602, 602), Box(602, 602)),
+ Box(Box(603, 603), Box(603, 603)),
+ Box(Box(604, 604), Box(604, 604)),
+ Box(Box(605, 605), Box(605, 605)),
+ Box(Box(606, 606), Box(606, 606)),
+ Box(Box(607, 607), Box(607, 607)),
+ Box(Box(608, 608), Box(608, 608)),
+ Box(Box(609, 609), Box(609, 609)),
+ Box(Box(610, 610), Box(610, 610)),
+ Box(Box(611, 611), Box(611, 611)),
+ Box(Box(612, 612), Box(612, 612)),
+ Box(Box(613, 613), Box(613, 613)),
+ Box(Box(614, 614), Box(614, 614)),
+ Box(Box(615, 615), Box(615, 615)),
+ Box(Box(616, 616), Box(616, 616)),
+ Box(Box(617, 617), Box(617, 617)),
+ Box(Box(618, 618), Box(618, 618)),
+ Box(Box(619, 619), Box(619, 619)),
+ Box(Box(620, 620), Box(620, 620)),
+ Box(Box(621, 621), Box(621, 621)),
+ Box(Box(622, 622), Box(622, 622)),
+ Box(Box(623, 623), Box(623, 623)),
+ Box(Box(624, 624), Box(624, 624)),
+ Box(Box(625, 625), Box(625, 625)),
+ Box(Box(626, 626), Box(626, 626)),
+ Box(Box(627, 627), Box(627, 627)),
+ Box(Box(628, 628), Box(628, 628)),
+ Box(Box(629, 629), Box(629, 629)),
+ Box(Box(630, 630), Box(630, 630)),
+ Box(Box(631, 631), Box(631, 631)),
+ Box(Box(632, 632), Box(632, 632)),
+ Box(Box(633, 633), Box(633, 633)),
+ Box(Box(634, 634), Box(634, 634)),
+ Box(Box(635, 635), Box(635, 635)),
+ Box(Box(636, 636), Box(636, 636)),
+ Box(Box(637, 637), Box(637, 637)),
+ Box(Box(638, 638), Box(638, 638)),
+ Box(Box(639, 639), Box(639, 639)),
+ Box(Box(640, 640), Box(640, 640)),
+ Box(Box(641, 641), Box(641, 641)),
+ Box(Box(642, 642), Box(642, 642)),
+ Box(Box(643, 643), Box(643, 643)),
+ Box(Box(644, 644), Box(644, 644)),
+ Box(Box(645, 645), Box(645, 645)),
+ Box(Box(646, 646), Box(646, 646)),
+ Box(Box(647, 647), Box(647, 647)),
+ Box(Box(648, 648), Box(648, 648)),
+ Box(Box(649, 649), Box(649, 649)),
+ Box(Box(650, 650), Box(650, 650)),
+ Box(Box(651, 651), Box(651, 651)),
+ Box(Box(652, 652), Box(652, 652)),
+ Box(Box(653, 653), Box(653, 653)),
+ Box(Box(654, 654), Box(654, 654)),
+ Box(Box(655, 655), Box(655, 655)),
+ Box(Box(656, 656), Box(656, 656)),
+ Box(Box(657, 657), Box(657, 657)),
+ Box(Box(658, 658), Box(658, 658)),
+ Box(Box(659, 659), Box(659, 659)),
+ Box(Box(660, 660), Box(660, 660)),
+ Box(Box(661, 661), Box(661, 661)),
+ Box(Box(662, 662), Box(662, 662)),
+ Box(Box(663, 663), Box(663, 663)),
+ Box(Box(664, 664), Box(664, 664)),
+ Box(Box(665, 665), Box(665, 665)),
+ Box(Box(666, 666), Box(666, 666)),
+ Box(Box(667, 667), Box(667, 667)),
+ Box(Box(668, 668), Box(668, 668)),
+ Box(Box(669, 669), Box(669, 669)),
+ Box(Box(670, 670), Box(670, 670)),
+ Box(Box(671, 671), Box(671, 671)),
+ Box(Box(672, 672), Box(672, 672)),
+ Box(Box(673, 673), Box(673, 673)),
+ Box(Box(674, 674), Box(674, 674)),
+ Box(Box(675, 675), Box(675, 675)),
+ Box(Box(676, 676), Box(676, 676)),
+ Box(Box(677, 677), Box(677, 677)),
+ Box(Box(678, 678), Box(678, 678)),
+ Box(Box(679, 679), Box(679, 679)),
+ Box(Box(680, 680), Box(680, 680)),
+ Box(Box(681, 681), Box(681, 681)),
+ Box(Box(682, 682), Box(682, 682)),
+ Box(Box(683, 683), Box(683, 683)),
+ Box(Box(684, 684), Box(684, 684)),
+ Box(Box(685, 685), Box(685, 685)),
+ Box(Box(686, 686), Box(686, 686)),
+ Box(Box(687, 687), Box(687, 687)),
+ Box(Box(688, 688), Box(688, 688)),
+ Box(Box(689, 689), Box(689, 689)),
+ Box(Box(690, 690), Box(690, 690)),
+ Box(Box(691, 691), Box(691, 691)),
+ Box(Box(692, 692), Box(692, 692)),
+ Box(Box(693, 693), Box(693, 693)),
+ Box(Box(694, 694), Box(694, 694)),
+ Box(Box(695, 695), Box(695, 695)),
+ Box(Box(696, 696), Box(696, 696)),
+ Box(Box(697, 697), Box(697, 697)),
+ Box(Box(698, 698), Box(698, 698)),
+ Box(Box(699, 699), Box(699, 699)),
+ Box(Box(700, 700), Box(700, 700)),
+ Box(Box(701, 701), Box(701, 701)),
+ Box(Box(702, 702), Box(702, 702)),
+ Box(Box(703, 703), Box(703, 703)),
+ Box(Box(704, 704), Box(704, 704)),
+ Box(Box(705, 705), Box(705, 705)),
+ Box(Box(706, 706), Box(706, 706)),
+ Box(Box(707, 707), Box(707, 707)),
+ Box(Box(708, 708), Box(708, 708)),
+ Box(Box(709, 709), Box(709, 709)),
+ Box(Box(710, 710), Box(710, 710)),
+ Box(Box(711, 711), Box(711, 711)),
+ Box(Box(712, 712), Box(712, 712)),
+ Box(Box(713, 713), Box(713, 713)),
+ Box(Box(714, 714), Box(714, 714)),
+ Box(Box(715, 715), Box(715, 715)),
+ Box(Box(716, 716), Box(716, 716)),
+ Box(Box(717, 717), Box(717, 717)),
+ Box(Box(718, 718), Box(718, 718)),
+ Box(Box(719, 719), Box(719, 719)),
+ Box(Box(720, 720), Box(720, 720)),
+ Box(Box(721, 721), Box(721, 721)),
+ Box(Box(722, 722), Box(722, 722)),
+ Box(Box(723, 723), Box(723, 723)),
+ Box(Box(724, 724), Box(724, 724)),
+ Box(Box(725, 725), Box(725, 725)),
+ Box(Box(726, 726), Box(726, 726)),
+ Box(Box(727, 727), Box(727, 727)),
+ Box(Box(728, 728), Box(728, 728)),
+ Box(Box(729, 729), Box(729, 729)),
+ Box(Box(730, 730), Box(730, 730)),
+ Box(Box(731, 731), Box(731, 731)),
+ Box(Box(732, 732), Box(732, 732)),
+ Box(Box(733, 733), Box(733, 733)),
+ Box(Box(734, 734), Box(734, 734)),
+ Box(Box(735, 735), Box(735, 735)),
+ Box(Box(736, 736), Box(736, 736)),
+ Box(Box(737, 737), Box(737, 737)),
+ Box(Box(738, 738), Box(738, 738)),
+ Box(Box(739, 739), Box(739, 739)),
+ Box(Box(740, 740), Box(740, 740)),
+ Box(Box(741, 741), Box(741, 741)),
+ Box(Box(742, 742), Box(742, 742)),
+ Box(Box(743, 743), Box(743, 743)),
+ Box(Box(744, 744), Box(744, 744)),
+ Box(Box(745, 745), Box(745, 745)),
+ Box(Box(746, 746), Box(746, 746)),
+ Box(Box(747, 747), Box(747, 747)),
+ Box(Box(748, 748), Box(748, 748)),
+ Box(Box(749, 749), Box(749, 749)),
+ Box(Box(750, 750), Box(750, 750)),
+ Box(Box(751, 751), Box(751, 751)),
+ Box(Box(752, 752), Box(752, 752)),
+ Box(Box(753, 753), Box(753, 753)),
+ Box(Box(754, 754), Box(754, 754)),
+ Box(Box(755, 755), Box(755, 755)),
+ Box(Box(756, 756), Box(756, 756)),
+ Box(Box(757, 757), Box(757, 757)),
+ Box(Box(758, 758), Box(758, 758)),
+ Box(Box(759, 759), Box(759, 759)),
+ Box(Box(760, 760), Box(760, 760)),
+ Box(Box(761, 761), Box(761, 761)),
+ Box(Box(762, 762), Box(762, 762)),
+ Box(Box(763, 763), Box(763, 763)),
+ Box(Box(764, 764), Box(764, 764)),
+ Box(Box(765, 765), Box(765, 765)),
+ Box(Box(766, 766), Box(766, 766)),
+ Box(Box(767, 767), Box(767, 767)),
+ Box(Box(768, 768), Box(768, 768)),
+ Box(Box(769, 769), Box(769, 769)),
+ Box(Box(770, 770), Box(770, 770)),
+ Box(Box(771, 771), Box(771, 771)),
+ Box(Box(772, 772), Box(772, 772)),
+ Box(Box(773, 773), Box(773, 773)),
+ Box(Box(774, 774), Box(774, 774)),
+ Box(Box(775, 775), Box(775, 775)),
+ Box(Box(776, 776), Box(776, 776)),
+ Box(Box(777, 777), Box(777, 777)),
+ Box(Box(778, 778), Box(778, 778)),
+ Box(Box(779, 779), Box(779, 779)),
+ Box(Box(780, 780), Box(780, 780)),
+ Box(Box(781, 781), Box(781, 781)),
+ Box(Box(782, 782), Box(782, 782)),
+ Box(Box(783, 783), Box(783, 783)),
+ Box(Box(784, 784), Box(784, 784)),
+ Box(Box(785, 785), Box(785, 785)),
+ Box(Box(786, 786), Box(786, 786)),
+ Box(Box(787, 787), Box(787, 787)),
+ Box(Box(788, 788), Box(788, 788)),
+ Box(Box(789, 789), Box(789, 789)),
+ Box(Box(790, 790), Box(790, 790)),
+ Box(Box(791, 791), Box(791, 791)),
+ Box(Box(792, 792), Box(792, 792)),
+ Box(Box(793, 793), Box(793, 793)),
+ Box(Box(794, 794), Box(794, 794)),
+ Box(Box(795, 795), Box(795, 795)),
+ Box(Box(796, 796), Box(796, 796)),
+ Box(Box(797, 797), Box(797, 797)),
+ Box(Box(798, 798), Box(798, 798)),
+ Box(Box(799, 799), Box(799, 799)),
+ Box(Box(800, 800), Box(800, 800)),
+ Box(Box(801, 801), Box(801, 801)),
+ Box(Box(802, 802), Box(802, 802)),
+ Box(Box(803, 803), Box(803, 803)),
+ Box(Box(804, 804), Box(804, 804)),
+ Box(Box(805, 805), Box(805, 805)),
+ Box(Box(806, 806), Box(806, 806)),
+ Box(Box(807, 807), Box(807, 807)),
+ Box(Box(808, 808), Box(808, 808)),
+ Box(Box(809, 809), Box(809, 809)),
+ Box(Box(810, 810), Box(810, 810)),
+ Box(Box(811, 811), Box(811, 811)),
+ Box(Box(812, 812), Box(812, 812)),
+ Box(Box(813, 813), Box(813, 813)),
+ Box(Box(814, 814), Box(814, 814)),
+ Box(Box(815, 815), Box(815, 815)),
+ Box(Box(816, 816), Box(816, 816)),
+ Box(Box(817, 817), Box(817, 817)),
+ Box(Box(818, 818), Box(818, 818)),
+ Box(Box(819, 819), Box(819, 819)),
+ Box(Box(820, 820), Box(820, 820)),
+ Box(Box(821, 821), Box(821, 821)),
+ Box(Box(822, 822), Box(822, 822)),
+ Box(Box(823, 823), Box(823, 823)),
+ Box(Box(824, 824), Box(824, 824)),
+ Box(Box(825, 825), Box(825, 825)),
+ Box(Box(826, 826), Box(826, 826)),
+ Box(Box(827, 827), Box(827, 827)),
+ Box(Box(828, 828), Box(828, 828)),
+ Box(Box(829, 829), Box(829, 829)),
+ Box(Box(830, 830), Box(830, 830)),
+ Box(Box(831, 831), Box(831, 831)),
+ Box(Box(832, 832), Box(832, 832)),
+ Box(Box(833, 833), Box(833, 833)),
+ Box(Box(834, 834), Box(834, 834)),
+ Box(Box(835, 835), Box(835, 835)),
+ Box(Box(836, 836), Box(836, 836)),
+ Box(Box(837, 837), Box(837, 837)),
+ Box(Box(838, 838), Box(838, 838)),
+ Box(Box(839, 839), Box(839, 839)),
+ Box(Box(840, 840), Box(840, 840)),
+ Box(Box(841, 841), Box(841, 841)),
+ Box(Box(842, 842), Box(842, 842)),
+ Box(Box(843, 843), Box(843, 843)),
+ Box(Box(844, 844), Box(844, 844)),
+ Box(Box(845, 845), Box(845, 845)),
+ Box(Box(846, 846), Box(846, 846)),
+ Box(Box(847, 847), Box(847, 847)),
+ Box(Box(848, 848), Box(848, 848)),
+ Box(Box(849, 849), Box(849, 849)),
+ Box(Box(850, 850), Box(850, 850)),
+ Box(Box(851, 851), Box(851, 851)),
+ Box(Box(852, 852), Box(852, 852)),
+ Box(Box(853, 853), Box(853, 853)),
+ Box(Box(854, 854), Box(854, 854)),
+ Box(Box(855, 855), Box(855, 855)),
+ Box(Box(856, 856), Box(856, 856)),
+ Box(Box(857, 857), Box(857, 857)),
+ Box(Box(858, 858), Box(858, 858)),
+ Box(Box(859, 859), Box(859, 859)),
+ Box(Box(860, 860), Box(860, 860)),
+ Box(Box(861, 861), Box(861, 861)),
+ Box(Box(862, 862), Box(862, 862)),
+ Box(Box(863, 863), Box(863, 863)),
+ Box(Box(864, 864), Box(864, 864)),
+ Box(Box(865, 865), Box(865, 865)),
+ Box(Box(866, 866), Box(866, 866)),
+ Box(Box(867, 867), Box(867, 867)),
+ Box(Box(868, 868), Box(868, 868)),
+ Box(Box(869, 869), Box(869, 869)),
+ Box(Box(870, 870), Box(870, 870)),
+ Box(Box(871, 871), Box(871, 871)),
+ Box(Box(872, 872), Box(872, 872)),
+ Box(Box(873, 873), Box(873, 873)),
+ Box(Box(874, 874), Box(874, 874)),
+ Box(Box(875, 875), Box(875, 875)),
+ Box(Box(876, 876), Box(876, 876)),
+ Box(Box(877, 877), Box(877, 877)),
+ Box(Box(878, 878), Box(878, 878)),
+ Box(Box(879, 879), Box(879, 879)),
+ Box(Box(880, 880), Box(880, 880)),
+ Box(Box(881, 881), Box(881, 881)),
+ Box(Box(882, 882), Box(882, 882)),
+ Box(Box(883, 883), Box(883, 883)),
+ Box(Box(884, 884), Box(884, 884)),
+ Box(Box(885, 885), Box(885, 885)),
+ Box(Box(886, 886), Box(886, 886)),
+ Box(Box(887, 887), Box(887, 887)),
+ Box(Box(888, 888), Box(888, 888)),
+ Box(Box(889, 889), Box(889, 889)),
+ Box(Box(890, 890), Box(890, 890)),
+ Box(Box(891, 891), Box(891, 891)),
+ Box(Box(892, 892), Box(892, 892)),
+ Box(Box(893, 893), Box(893, 893)),
+ Box(Box(894, 894), Box(894, 894)),
+ Box(Box(895, 895), Box(895, 895)),
+ Box(Box(896, 896), Box(896, 896)),
+ Box(Box(897, 897), Box(897, 897)),
+ Box(Box(898, 898), Box(898, 898)),
+ Box(Box(899, 899), Box(899, 899)),
+ Box(Box(900, 900), Box(900, 900)),
+ Box(Box(901, 901), Box(901, 901)),
+ Box(Box(902, 902), Box(902, 902)),
+ Box(Box(903, 903), Box(903, 903)),
+ Box(Box(904, 904), Box(904, 904)),
+ Box(Box(905, 905), Box(905, 905)),
+ Box(Box(906, 906), Box(906, 906)),
+ Box(Box(907, 907), Box(907, 907)),
+ Box(Box(908, 908), Box(908, 908)),
+ Box(Box(909, 909), Box(909, 909)),
+ Box(Box(910, 910), Box(910, 910)),
+ Box(Box(911, 911), Box(911, 911)),
+ Box(Box(912, 912), Box(912, 912)),
+ Box(Box(913, 913), Box(913, 913)),
+ Box(Box(914, 914), Box(914, 914)),
+ Box(Box(915, 915), Box(915, 915)),
+ Box(Box(916, 916), Box(916, 916)),
+ Box(Box(917, 917), Box(917, 917)),
+ Box(Box(918, 918), Box(918, 918)),
+ Box(Box(919, 919), Box(919, 919)),
+ Box(Box(920, 920), Box(920, 920)),
+ Box(Box(921, 921), Box(921, 921)),
+ Box(Box(922, 922), Box(922, 922)),
+ Box(Box(923, 923), Box(923, 923)),
+ Box(Box(924, 924), Box(924, 924)),
+ Box(Box(925, 925), Box(925, 925)),
+ Box(Box(926, 926), Box(926, 926)),
+ Box(Box(927, 927), Box(927, 927)),
+ Box(Box(928, 928), Box(928, 928)),
+ Box(Box(929, 929), Box(929, 929)),
+ Box(Box(930, 930), Box(930, 930)),
+ Box(Box(931, 931), Box(931, 931)),
+ Box(Box(932, 932), Box(932, 932)),
+ Box(Box(933, 933), Box(933, 933)),
+ Box(Box(934, 934), Box(934, 934)),
+ Box(Box(935, 935), Box(935, 935)),
+ Box(Box(936, 936), Box(936, 936)),
+ Box(Box(937, 937), Box(937, 937)),
+ Box(Box(938, 938), Box(938, 938)),
+ Box(Box(939, 939), Box(939, 939)),
+ Box(Box(940, 940), Box(940, 940)),
+ Box(Box(941, 941), Box(941, 941)),
+ Box(Box(942, 942), Box(942, 942)),
+ Box(Box(943, 943), Box(943, 943)),
+ Box(Box(944, 944), Box(944, 944)),
+ Box(Box(945, 945), Box(945, 945)),
+ Box(Box(946, 946), Box(946, 946)),
+ Box(Box(947, 947), Box(947, 947)),
+ Box(Box(948, 948), Box(948, 948)),
+ Box(Box(949, 949), Box(949, 949)),
+ Box(Box(950, 950), Box(950, 950)),
+ Box(Box(951, 951), Box(951, 951)),
+ Box(Box(952, 952), Box(952, 952)),
+ Box(Box(953, 953), Box(953, 953)),
+ Box(Box(954, 954), Box(954, 954)),
+ Box(Box(955, 955), Box(955, 955)),
+ Box(Box(956, 956), Box(956, 956)),
+ Box(Box(957, 957), Box(957, 957)),
+ Box(Box(958, 958), Box(958, 958)),
+ Box(Box(959, 959), Box(959, 959)),
+ Box(Box(960, 960), Box(960, 960)),
+ Box(Box(961, 961), Box(961, 961)),
+ Box(Box(962, 962), Box(962, 962)),
+ Box(Box(963, 963), Box(963, 963)),
+ Box(Box(964, 964), Box(964, 964)),
+ Box(Box(965, 965), Box(965, 965)),
+ Box(Box(966, 966), Box(966, 966)),
+ Box(Box(967, 967), Box(967, 967)),
+ Box(Box(968, 968), Box(968, 968)),
+ Box(Box(969, 969), Box(969, 969)),
+ Box(Box(970, 970), Box(970, 970)),
+ Box(Box(971, 971), Box(971, 971)),
+ Box(Box(972, 972), Box(972, 972)),
+ Box(Box(973, 973), Box(973, 973)),
+ Box(Box(974, 974), Box(974, 974)),
+ Box(Box(975, 975), Box(975, 975)),
+ Box(Box(976, 976), Box(976, 976)),
+ Box(Box(977, 977), Box(977, 977)),
+ Box(Box(978, 978), Box(978, 978)),
+ Box(Box(979, 979), Box(979, 979)),
+ Box(Box(980, 980), Box(980, 980)),
+ Box(Box(981, 981), Box(981, 981)),
+ Box(Box(982, 982), Box(982, 982)),
+ Box(Box(983, 983), Box(983, 983)),
+ Box(Box(984, 984), Box(984, 984)),
+ Box(Box(985, 985), Box(985, 985)),
+ Box(Box(986, 986), Box(986, 986)),
+ Box(Box(987, 987), Box(987, 987)),
+ Box(Box(988, 988), Box(988, 988)),
+ Box(Box(989, 989), Box(989, 989)),
+ Box(Box(990, 990), Box(990, 990)),
+ Box(Box(991, 991), Box(991, 991)),
+ Box(Box(992, 992), Box(992, 992)),
+ Box(Box(993, 993), Box(993, 993)),
+ Box(Box(994, 994), Box(994, 994)),
+ Box(Box(995, 995), Box(995, 995)),
+ Box(Box(996, 996), Box(996, 996)),
+ Box(Box(997, 997), Box(997, 997)),
+ Box(Box(998, 998), Box(998, 998)),
+ Box(Box(999, 999), Box(999, 999)),
+ Box(Box(1000, 1000), Box(1000, 1000)),
+ Box(Box(1001, 1001), Box(1001, 1001)),
+ Box(Box(1002, 1002), Box(1002, 1002)),
+ Box(Box(1003, 1003), Box(1003, 1003)),
+ Box(Box(1004, 1004), Box(1004, 1004)),
+ Box(Box(1005, 1005), Box(1005, 1005)),
+ Box(Box(1006, 1006), Box(1006, 1006)),
+ Box(Box(1007, 1007), Box(1007, 1007)),
+ Box(Box(1008, 1008), Box(1008, 1008)),
+ Box(Box(1009, 1009), Box(1009, 1009)),
+ Box(Box(1010, 1010), Box(1010, 1010)),
+ Box(Box(1011, 1011), Box(1011, 1011)),
+ Box(Box(1012, 1012), Box(1012, 1012)),
+ Box(Box(1013, 1013), Box(1013, 1013)),
+ Box(Box(1014, 1014), Box(1014, 1014)),
+ Box(Box(1015, 1015), Box(1015, 1015)),
+ Box(Box(1016, 1016), Box(1016, 1016)),
+ Box(Box(1017, 1017), Box(1017, 1017)),
+ Box(Box(1018, 1018), Box(1018, 1018)),
+ Box(Box(1019, 1019), Box(1019, 1019)),
+ Box(Box(1020, 1020), Box(1020, 1020)),
+ Box(Box(1021, 1021), Box(1021, 1021)),
+ Box(Box(1022, 1022), Box(1022, 1022)),
+ Box(Box(1023, 1023), Box(1023, 1023)),
+ Box(Box(1024, 1024), Box(1024, 1024)),
+ Box(Box(1025, 1025), Box(1025, 1025)),
+ Box(Box(1026, 1026), Box(1026, 1026)),
+ Box(Box(1027, 1027), Box(1027, 1027)),
+ Box(Box(1028, 1028), Box(1028, 1028)),
+ Box(Box(1029, 1029), Box(1029, 1029)),
+ Box(Box(1030, 1030), Box(1030, 1030)),
+ Box(Box(1031, 1031), Box(1031, 1031)),
+ Box(Box(1032, 1032), Box(1032, 1032)),
+ Box(Box(1033, 1033), Box(1033, 1033)),
+ Box(Box(1034, 1034), Box(1034, 1034)),
+ Box(Box(1035, 1035), Box(1035, 1035)),
+ Box(Box(1036, 1036), Box(1036, 1036)),
+ Box(Box(1037, 1037), Box(1037, 1037)),
+ Box(Box(1038, 1038), Box(1038, 1038)),
+ Box(Box(1039, 1039), Box(1039, 1039)),
+ Box(Box(1040, 1040), Box(1040, 1040)),
+ Box(Box(1041, 1041), Box(1041, 1041)),
+ Box(Box(1042, 1042), Box(1042, 1042)),
+ Box(Box(1043, 1043), Box(1043, 1043)),
+ Box(Box(1044, 1044), Box(1044, 1044)),
+ Box(Box(1045, 1045), Box(1045, 1045)),
+ Box(Box(1046, 1046), Box(1046, 1046)),
+ Box(Box(1047, 1047), Box(1047, 1047)),
+ Box(Box(1048, 1048), Box(1048, 1048)),
+ Box(Box(1049, 1049), Box(1049, 1049)),
+ Box(Box(1050, 1050), Box(1050, 1050)),
+ Box(Box(1051, 1051), Box(1051, 1051)),
+ Box(Box(1052, 1052), Box(1052, 1052)),
+ Box(Box(1053, 1053), Box(1053, 1053)),
+ Box(Box(1054, 1054), Box(1054, 1054)),
+ Box(Box(1055, 1055), Box(1055, 1055)),
+ Box(Box(1056, 1056), Box(1056, 1056)),
+ Box(Box(1057, 1057), Box(1057, 1057)),
+ Box(Box(1058, 1058), Box(1058, 1058)),
+ Box(Box(1059, 1059), Box(1059, 1059)),
+ Box(Box(1060, 1060), Box(1060, 1060)),
+ Box(Box(1061, 1061), Box(1061, 1061)),
+ Box(Box(1062, 1062), Box(1062, 1062)),
+ Box(Box(1063, 1063), Box(1063, 1063)),
+ Box(Box(1064, 1064), Box(1064, 1064)),
+ Box(Box(1065, 1065), Box(1065, 1065)),
+ Box(Box(1066, 1066), Box(1066, 1066)),
+ Box(Box(1067, 1067), Box(1067, 1067)),
+ Box(Box(1068, 1068), Box(1068, 1068)),
+ Box(Box(1069, 1069), Box(1069, 1069)),
+ Box(Box(1070, 1070), Box(1070, 1070)),
+ Box(Box(1071, 1071), Box(1071, 1071)),
+ Box(Box(1072, 1072), Box(1072, 1072)),
+ Box(Box(1073, 1073), Box(1073, 1073)),
+ Box(Box(1074, 1074), Box(1074, 1074)),
+ Box(Box(1075, 1075), Box(1075, 1075)),
+ Box(Box(1076, 1076), Box(1076, 1076)),
+ Box(Box(1077, 1077), Box(1077, 1077)),
+ Box(Box(1078, 1078), Box(1078, 1078)),
+ Box(Box(1079, 1079), Box(1079, 1079)),
+ Box(Box(1080, 1080), Box(1080, 1080)),
+ Box(Box(1081, 1081), Box(1081, 1081)),
+ Box(Box(1082, 1082), Box(1082, 1082)),
+ Box(Box(1083, 1083), Box(1083, 1083)),
+ Box(Box(1084, 1084), Box(1084, 1084)),
+ Box(Box(1085, 1085), Box(1085, 1085)),
+ Box(Box(1086, 1086), Box(1086, 1086)),
+ Box(Box(1087, 1087), Box(1087, 1087)),
+ Box(Box(1088, 1088), Box(1088, 1088)),
+ Box(Box(1089, 1089), Box(1089, 1089)),
+ Box(Box(1090, 1090), Box(1090, 1090)),
+ Box(Box(1091, 1091), Box(1091, 1091)),
+ Box(Box(1092, 1092), Box(1092, 1092)),
+ Box(Box(1093, 1093), Box(1093, 1093)),
+ Box(Box(1094, 1094), Box(1094, 1094)),
+ Box(Box(1095, 1095), Box(1095, 1095)),
+ Box(Box(1096, 1096), Box(1096, 1096)),
+ Box(Box(1097, 1097), Box(1097, 1097)),
+ Box(Box(1098, 1098), Box(1098, 1098)),
+ Box(Box(1099, 1099), Box(1099, 1099)),
+ Box(Box(1100, 1100), Box(1100, 1100)),
+ Box(Box(1101, 1101), Box(1101, 1101)),
+ Box(Box(1102, 1102), Box(1102, 1102)),
+ Box(Box(1103, 1103), Box(1103, 1103)),
+ Box(Box(1104, 1104), Box(1104, 1104)),
+ Box(Box(1105, 1105), Box(1105, 1105)),
+ Box(Box(1106, 1106), Box(1106, 1106)),
+ Box(Box(1107, 1107), Box(1107, 1107)),
+ Box(Box(1108, 1108), Box(1108, 1108)),
+ Box(Box(1109, 1109), Box(1109, 1109)),
+ Box(Box(1110, 1110), Box(1110, 1110)),
+ Box(Box(1111, 1111), Box(1111, 1111)),
+ Box(Box(1112, 1112), Box(1112, 1112)),
+ Box(Box(1113, 1113), Box(1113, 1113)),
+ Box(Box(1114, 1114), Box(1114, 1114)),
+ Box(Box(1115, 1115), Box(1115, 1115)),
+ Box(Box(1116, 1116), Box(1116, 1116)),
+ Box(Box(1117, 1117), Box(1117, 1117)),
+ Box(Box(1118, 1118), Box(1118, 1118)),
+ Box(Box(1119, 1119), Box(1119, 1119)),
+ Box(Box(1120, 1120), Box(1120, 1120)),
+ Box(Box(1121, 1121), Box(1121, 1121)),
+ Box(Box(1122, 1122), Box(1122, 1122)),
+ Box(Box(1123, 1123), Box(1123, 1123)),
+ Box(Box(1124, 1124), Box(1124, 1124)),
+ Box(Box(1125, 1125), Box(1125, 1125)),
+ Box(Box(1126, 1126), Box(1126, 1126)),
+ Box(Box(1127, 1127), Box(1127, 1127)),
+ Box(Box(1128, 1128), Box(1128, 1128)),
+ Box(Box(1129, 1129), Box(1129, 1129)),
+ Box(Box(1130, 1130), Box(1130, 1130)),
+ Box(Box(1131, 1131), Box(1131, 1131)),
+ Box(Box(1132, 1132), Box(1132, 1132)),
+ Box(Box(1133, 1133), Box(1133, 1133)),
+ Box(Box(1134, 1134), Box(1134, 1134)),
+ Box(Box(1135, 1135), Box(1135, 1135)),
+ Box(Box(1136, 1136), Box(1136, 1136)),
+ Box(Box(1137, 1137), Box(1137, 1137)),
+ Box(Box(1138, 1138), Box(1138, 1138)),
+ Box(Box(1139, 1139), Box(1139, 1139)),
+ Box(Box(1140, 1140), Box(1140, 1140)),
+ Box(Box(1141, 1141), Box(1141, 1141)),
+ Box(Box(1142, 1142), Box(1142, 1142)),
+ Box(Box(1143, 1143), Box(1143, 1143)),
+ Box(Box(1144, 1144), Box(1144, 1144)),
+ Box(Box(1145, 1145), Box(1145, 1145)),
+ Box(Box(1146, 1146), Box(1146, 1146)),
+ Box(Box(1147, 1147), Box(1147, 1147)),
+ Box(Box(1148, 1148), Box(1148, 1148)),
+ Box(Box(1149, 1149), Box(1149, 1149)),
+ Box(Box(1150, 1150), Box(1150, 1150)),
+ Box(Box(1151, 1151), Box(1151, 1151)),
+ Box(Box(1152, 1152), Box(1152, 1152)),
+ Box(Box(1153, 1153), Box(1153, 1153)),
+ Box(Box(1154, 1154), Box(1154, 1154)),
+ Box(Box(1155, 1155), Box(1155, 1155)),
+ Box(Box(1156, 1156), Box(1156, 1156)),
+ Box(Box(1157, 1157), Box(1157, 1157)),
+ Box(Box(1158, 1158), Box(1158, 1158)),
+ Box(Box(1159, 1159), Box(1159, 1159)),
+ Box(Box(1160, 1160), Box(1160, 1160)),
+ Box(Box(1161, 1161), Box(1161, 1161)),
+ Box(Box(1162, 1162), Box(1162, 1162)),
+ Box(Box(1163, 1163), Box(1163, 1163)),
+ Box(Box(1164, 1164), Box(1164, 1164)),
+ Box(Box(1165, 1165), Box(1165, 1165)),
+ Box(Box(1166, 1166), Box(1166, 1166)),
+ Box(Box(1167, 1167), Box(1167, 1167)),
+ Box(Box(1168, 1168), Box(1168, 1168)),
+ Box(Box(1169, 1169), Box(1169, 1169)),
+ Box(Box(1170, 1170), Box(1170, 1170)),
+ Box(Box(1171, 1171), Box(1171, 1171)),
+ Box(Box(1172, 1172), Box(1172, 1172)),
+ Box(Box(1173, 1173), Box(1173, 1173)),
+ Box(Box(1174, 1174), Box(1174, 1174)),
+ Box(Box(1175, 1175), Box(1175, 1175)),
+ Box(Box(1176, 1176), Box(1176, 1176)),
+ Box(Box(1177, 1177), Box(1177, 1177)),
+ Box(Box(1178, 1178), Box(1178, 1178)),
+ Box(Box(1179, 1179), Box(1179, 1179)),
+ Box(Box(1180, 1180), Box(1180, 1180)),
+ Box(Box(1181, 1181), Box(1181, 1181)),
+ Box(Box(1182, 1182), Box(1182, 1182)),
+ Box(Box(1183, 1183), Box(1183, 1183)),
+ Box(Box(1184, 1184), Box(1184, 1184)),
+ Box(Box(1185, 1185), Box(1185, 1185)),
+ Box(Box(1186, 1186), Box(1186, 1186)),
+ Box(Box(1187, 1187), Box(1187, 1187)),
+ Box(Box(1188, 1188), Box(1188, 1188)),
+ Box(Box(1189, 1189), Box(1189, 1189)),
+ Box(Box(1190, 1190), Box(1190, 1190)),
+ Box(Box(1191, 1191), Box(1191, 1191)),
+ Box(Box(1192, 1192), Box(1192, 1192)),
+ Box(Box(1193, 1193), Box(1193, 1193)),
+ Box(Box(1194, 1194), Box(1194, 1194)),
+ Box(Box(1195, 1195), Box(1195, 1195)),
+ Box(Box(1196, 1196), Box(1196, 1196)),
+ Box(Box(1197, 1197), Box(1197, 1197)),
+ Box(Box(1198, 1198), Box(1198, 1198)),
+ Box(Box(1199, 1199), Box(1199, 1199)),
+ Box(Box(1200, 1200), Box(1200, 1200)),
+ Box(Box(1201, 1201), Box(1201, 1201)),
+ Box(Box(1202, 1202), Box(1202, 1202)),
+ Box(Box(1203, 1203), Box(1203, 1203)),
+ Box(Box(1204, 1204), Box(1204, 1204)),
+ Box(Box(1205, 1205), Box(1205, 1205)),
+ Box(Box(1206, 1206), Box(1206, 1206)),
+ Box(Box(1207, 1207), Box(1207, 1207)),
+ Box(Box(1208, 1208), Box(1208, 1208)),
+ Box(Box(1209, 1209), Box(1209, 1209)),
+ Box(Box(1210, 1210), Box(1210, 1210)),
+ Box(Box(1211, 1211), Box(1211, 1211)),
+ Box(Box(1212, 1212), Box(1212, 1212)),
+ Box(Box(1213, 1213), Box(1213, 1213)),
+ Box(Box(1214, 1214), Box(1214, 1214)),
+ Box(Box(1215, 1215), Box(1215, 1215)),
+ Box(Box(1216, 1216), Box(1216, 1216)),
+ Box(Box(1217, 1217), Box(1217, 1217)),
+ Box(Box(1218, 1218), Box(1218, 1218)),
+ Box(Box(1219, 1219), Box(1219, 1219)),
+ Box(Box(1220, 1220), Box(1220, 1220)),
+ Box(Box(1221, 1221), Box(1221, 1221)),
+ Box(Box(1222, 1222), Box(1222, 1222)),
+ Box(Box(1223, 1223), Box(1223, 1223)),
+ Box(Box(1224, 1224), Box(1224, 1224)),
+ Box(Box(1225, 1225), Box(1225, 1225)),
+ Box(Box(1226, 1226), Box(1226, 1226)),
+ Box(Box(1227, 1227), Box(1227, 1227)),
+ Box(Box(1228, 1228), Box(1228, 1228)),
+ Box(Box(1229, 1229), Box(1229, 1229)),
+ Box(Box(1230, 1230), Box(1230, 1230)),
+ Box(Box(1231, 1231), Box(1231, 1231)),
+ Box(Box(1232, 1232), Box(1232, 1232)),
+ Box(Box(1233, 1233), Box(1233, 1233)),
+ Box(Box(1234, 1234), Box(1234, 1234)),
+ Box(Box(1235, 1235), Box(1235, 1235)),
+ Box(Box(1236, 1236), Box(1236, 1236)),
+ Box(Box(1237, 1237), Box(1237, 1237)),
+ Box(Box(1238, 1238), Box(1238, 1238)),
+ Box(Box(1239, 1239), Box(1239, 1239)),
+ Box(Box(1240, 1240), Box(1240, 1240)),
+ Box(Box(1241, 1241), Box(1241, 1241)),
+ Box(Box(1242, 1242), Box(1242, 1242)),
+ Box(Box(1243, 1243), Box(1243, 1243)),
+ Box(Box(1244, 1244), Box(1244, 1244)),
+ Box(Box(1245, 1245), Box(1245, 1245)),
+ Box(Box(1246, 1246), Box(1246, 1246)),
+ Box(Box(1247, 1247), Box(1247, 1247)),
+ Box(Box(1248, 1248), Box(1248, 1248)),
+ Box(Box(1249, 1249), Box(1249, 1249)),
+ Box(Box(1250, 1250), Box(1250, 1250)),
+ Box(Box(1251, 1251), Box(1251, 1251)),
+ Box(Box(1252, 1252), Box(1252, 1252)),
+ Box(Box(1253, 1253), Box(1253, 1253)),
+ Box(Box(1254, 1254), Box(1254, 1254)),
+ Box(Box(1255, 1255), Box(1255, 1255)),
+ Box(Box(1256, 1256), Box(1256, 1256)),
+ Box(Box(1257, 1257), Box(1257, 1257)),
+ Box(Box(1258, 1258), Box(1258, 1258)),
+ Box(Box(1259, 1259), Box(1259, 1259)),
+ Box(Box(1260, 1260), Box(1260, 1260)),
+ Box(Box(1261, 1261), Box(1261, 1261)),
+ Box(Box(1262, 1262), Box(1262, 1262)),
+ Box(Box(1263, 1263), Box(1263, 1263)),
+ Box(Box(1264, 1264), Box(1264, 1264)),
+ Box(Box(1265, 1265), Box(1265, 1265)),
+ Box(Box(1266, 1266), Box(1266, 1266)),
+ Box(Box(1267, 1267), Box(1267, 1267)),
+ Box(Box(1268, 1268), Box(1268, 1268)),
+ Box(Box(1269, 1269), Box(1269, 1269)),
+ Box(Box(1270, 1270), Box(1270, 1270)),
+ Box(Box(1271, 1271), Box(1271, 1271)),
+ Box(Box(1272, 1272), Box(1272, 1272)),
+ Box(Box(1273, 1273), Box(1273, 1273)),
+ Box(Box(1274, 1274), Box(1274, 1274)),
+ Box(Box(1275, 1275), Box(1275, 1275)),
+ Box(Box(1276, 1276), Box(1276, 1276)),
+ Box(Box(1277, 1277), Box(1277, 1277)),
+ Box(Box(1278, 1278), Box(1278, 1278)),
+ Box(Box(1279, 1279), Box(1279, 1279)),
+ Box(Box(1280, 1280), Box(1280, 1280)),
+ Box(Box(1281, 1281), Box(1281, 1281)),
+ Box(Box(1282, 1282), Box(1282, 1282)),
+ Box(Box(1283, 1283), Box(1283, 1283)),
+ Box(Box(1284, 1284), Box(1284, 1284)),
+ Box(Box(1285, 1285), Box(1285, 1285)),
+ Box(Box(1286, 1286), Box(1286, 1286)),
+ Box(Box(1287, 1287), Box(1287, 1287)),
+ Box(Box(1288, 1288), Box(1288, 1288)),
+ Box(Box(1289, 1289), Box(1289, 1289)),
+ Box(Box(1290, 1290), Box(1290, 1290)),
+ Box(Box(1291, 1291), Box(1291, 1291)),
+ Box(Box(1292, 1292), Box(1292, 1292)),
+ Box(Box(1293, 1293), Box(1293, 1293)),
+ Box(Box(1294, 1294), Box(1294, 1294)),
+ Box(Box(1295, 1295), Box(1295, 1295)),
+ Box(Box(1296, 1296), Box(1296, 1296)),
+ Box(Box(1297, 1297), Box(1297, 1297)),
+ Box(Box(1298, 1298), Box(1298, 1298)),
+ Box(Box(1299, 1299), Box(1299, 1299)),
+ Box(Box(1300, 1300), Box(1300, 1300)),
+ Box(Box(1301, 1301), Box(1301, 1301)),
+ Box(Box(1302, 1302), Box(1302, 1302)),
+ Box(Box(1303, 1303), Box(1303, 1303)),
+ Box(Box(1304, 1304), Box(1304, 1304)),
+ Box(Box(1305, 1305), Box(1305, 1305)),
+ Box(Box(1306, 1306), Box(1306, 1306)),
+ Box(Box(1307, 1307), Box(1307, 1307)),
+ Box(Box(1308, 1308), Box(1308, 1308)),
+ Box(Box(1309, 1309), Box(1309, 1309)),
+ Box(Box(1310, 1310), Box(1310, 1310)),
+ Box(Box(1311, 1311), Box(1311, 1311)),
+ Box(Box(1312, 1312), Box(1312, 1312)),
+ Box(Box(1313, 1313), Box(1313, 1313)),
+ Box(Box(1314, 1314), Box(1314, 1314)),
+ Box(Box(1315, 1315), Box(1315, 1315)),
+ Box(Box(1316, 1316), Box(1316, 1316)),
+ Box(Box(1317, 1317), Box(1317, 1317)),
+ Box(Box(1318, 1318), Box(1318, 1318)),
+ Box(Box(1319, 1319), Box(1319, 1319)),
+ Box(Box(1320, 1320), Box(1320, 1320)),
+ Box(Box(1321, 1321), Box(1321, 1321)),
+ Box(Box(1322, 1322), Box(1322, 1322)),
+ Box(Box(1323, 1323), Box(1323, 1323)),
+ Box(Box(1324, 1324), Box(1324, 1324)),
+ Box(Box(1325, 1325), Box(1325, 1325)),
+ Box(Box(1326, 1326), Box(1326, 1326)),
+ Box(Box(1327, 1327), Box(1327, 1327)),
+ Box(Box(1328, 1328), Box(1328, 1328)),
+ Box(Box(1329, 1329), Box(1329, 1329)),
+ Box(Box(1330, 1330), Box(1330, 1330)),
+ Box(Box(1331, 1331), Box(1331, 1331)),
+ Box(Box(1332, 1332), Box(1332, 1332)),
+ Box(Box(1333, 1333), Box(1333, 1333)),
+ Box(Box(1334, 1334), Box(1334, 1334)),
+ Box(Box(1335, 1335), Box(1335, 1335)),
+ Box(Box(1336, 1336), Box(1336, 1336)),
+ Box(Box(1337, 1337), Box(1337, 1337)),
+ Box(Box(1338, 1338), Box(1338, 1338)),
+ Box(Box(1339, 1339), Box(1339, 1339)),
+ Box(Box(1340, 1340), Box(1340, 1340)),
+ Box(Box(1341, 1341), Box(1341, 1341)),
+ Box(Box(1342, 1342), Box(1342, 1342)),
+ Box(Box(1343, 1343), Box(1343, 1343)),
+ Box(Box(1344, 1344), Box(1344, 1344)),
+ Box(Box(1345, 1345), Box(1345, 1345)),
+ Box(Box(1346, 1346), Box(1346, 1346)),
+ Box(Box(1347, 1347), Box(1347, 1347)),
+ Box(Box(1348, 1348), Box(1348, 1348)),
+ Box(Box(1349, 1349), Box(1349, 1349)),
+ Box(Box(1350, 1350), Box(1350, 1350)),
+ Box(Box(1351, 1351), Box(1351, 1351)),
+ Box(Box(1352, 1352), Box(1352, 1352)),
+ Box(Box(1353, 1353), Box(1353, 1353)),
+ Box(Box(1354, 1354), Box(1354, 1354)),
+ Box(Box(1355, 1355), Box(1355, 1355)),
+ Box(Box(1356, 1356), Box(1356, 1356)),
+ Box(Box(1357, 1357), Box(1357, 1357)),
+ Box(Box(1358, 1358), Box(1358, 1358)),
+ Box(Box(1359, 1359), Box(1359, 1359)),
+ Box(Box(1360, 1360), Box(1360, 1360)),
+ Box(Box(1361, 1361), Box(1361, 1361)),
+ Box(Box(1362, 1362), Box(1362, 1362)),
+ Box(Box(1363, 1363), Box(1363, 1363)),
+ Box(Box(1364, 1364), Box(1364, 1364)),
+ Box(Box(1365, 1365), Box(1365, 1365)),
+ Box(Box(1366, 1366), Box(1366, 1366)),
+ Box(Box(1367, 1367), Box(1367, 1367)),
+ Box(Box(1368, 1368), Box(1368, 1368)),
+ Box(Box(1369, 1369), Box(1369, 1369)),
+ Box(Box(1370, 1370), Box(1370, 1370)),
+ Box(Box(1371, 1371), Box(1371, 1371)),
+ Box(Box(1372, 1372), Box(1372, 1372)),
+ Box(Box(1373, 1373), Box(1373, 1373)),
+ Box(Box(1374, 1374), Box(1374, 1374)),
+ Box(Box(1375, 1375), Box(1375, 1375)),
+ Box(Box(1376, 1376), Box(1376, 1376)),
+ Box(Box(1377, 1377), Box(1377, 1377)),
+ Box(Box(1378, 1378), Box(1378, 1378)),
+ Box(Box(1379, 1379), Box(1379, 1379)),
+ Box(Box(1380, 1380), Box(1380, 1380)),
+ Box(Box(1381, 1381), Box(1381, 1381)),
+ Box(Box(1382, 1382), Box(1382, 1382)),
+ Box(Box(1383, 1383), Box(1383, 1383)),
+ Box(Box(1384, 1384), Box(1384, 1384)),
+ Box(Box(1385, 1385), Box(1385, 1385)),
+ Box(Box(1386, 1386), Box(1386, 1386)),
+ Box(Box(1387, 1387), Box(1387, 1387)),
+ Box(Box(1388, 1388), Box(1388, 1388)),
+ Box(Box(1389, 1389), Box(1389, 1389)),
+ Box(Box(1390, 1390), Box(1390, 1390)),
+ Box(Box(1391, 1391), Box(1391, 1391)),
+ Box(Box(1392, 1392), Box(1392, 1392)),
+ Box(Box(1393, 1393), Box(1393, 1393)),
+ Box(Box(1394, 1394), Box(1394, 1394)),
+ Box(Box(1395, 1395), Box(1395, 1395)),
+ Box(Box(1396, 1396), Box(1396, 1396)),
+ Box(Box(1397, 1397), Box(1397, 1397)),
+ Box(Box(1398, 1398), Box(1398, 1398)),
+ Box(Box(1399, 1399), Box(1399, 1399)),
+ Box(Box(1400, 1400), Box(1400, 1400)),
+ Box(Box(1401, 1401), Box(1401, 1401)),
+ Box(Box(1402, 1402), Box(1402, 1402)),
+ Box(Box(1403, 1403), Box(1403, 1403)),
+ Box(Box(1404, 1404), Box(1404, 1404)),
+ Box(Box(1405, 1405), Box(1405, 1405)),
+ Box(Box(1406, 1406), Box(1406, 1406)),
+ Box(Box(1407, 1407), Box(1407, 1407)),
+ Box(Box(1408, 1408), Box(1408, 1408)),
+ Box(Box(1409, 1409), Box(1409, 1409)),
+ Box(Box(1410, 1410), Box(1410, 1410)),
+ Box(Box(1411, 1411), Box(1411, 1411)),
+ Box(Box(1412, 1412), Box(1412, 1412)),
+ Box(Box(1413, 1413), Box(1413, 1413)),
+ Box(Box(1414, 1414), Box(1414, 1414)),
+ Box(Box(1415, 1415), Box(1415, 1415)),
+ Box(Box(1416, 1416), Box(1416, 1416)),
+ Box(Box(1417, 1417), Box(1417, 1417)),
+ Box(Box(1418, 1418), Box(1418, 1418)),
+ Box(Box(1419, 1419), Box(1419, 1419)),
+ Box(Box(1420, 1420), Box(1420, 1420)),
+ Box(Box(1421, 1421), Box(1421, 1421)),
+ Box(Box(1422, 1422), Box(1422, 1422)),
+ Box(Box(1423, 1423), Box(1423, 1423)),
+ Box(Box(1424, 1424), Box(1424, 1424)),
+ Box(Box(1425, 1425), Box(1425, 1425)),
+ Box(Box(1426, 1426), Box(1426, 1426)),
+ Box(Box(1427, 1427), Box(1427, 1427)),
+ Box(Box(1428, 1428), Box(1428, 1428)),
+ Box(Box(1429, 1429), Box(1429, 1429)),
+ Box(Box(1430, 1430), Box(1430, 1430)),
+ Box(Box(1431, 1431), Box(1431, 1431)),
+ Box(Box(1432, 1432), Box(1432, 1432)),
+ Box(Box(1433, 1433), Box(1433, 1433)),
+ Box(Box(1434, 1434), Box(1434, 1434)),
+ Box(Box(1435, 1435), Box(1435, 1435)),
+ Box(Box(1436, 1436), Box(1436, 1436)),
+ Box(Box(1437, 1437), Box(1437, 1437)),
+ Box(Box(1438, 1438), Box(1438, 1438)),
+ Box(Box(1439, 1439), Box(1439, 1439)),
+ Box(Box(1440, 1440), Box(1440, 1440)),
+ Box(Box(1441, 1441), Box(1441, 1441)),
+ Box(Box(1442, 1442), Box(1442, 1442)),
+ Box(Box(1443, 1443), Box(1443, 1443)),
+ Box(Box(1444, 1444), Box(1444, 1444)),
+ Box(Box(1445, 1445), Box(1445, 1445)),
+ Box(Box(1446, 1446), Box(1446, 1446)),
+ Box(Box(1447, 1447), Box(1447, 1447)),
+ Box(Box(1448, 1448), Box(1448, 1448)),
+ Box(Box(1449, 1449), Box(1449, 1449)),
+ Box(Box(1450, 1450), Box(1450, 1450)),
+ Box(Box(1451, 1451), Box(1451, 1451)),
+ Box(Box(1452, 1452), Box(1452, 1452)),
+ Box(Box(1453, 1453), Box(1453, 1453)),
+ Box(Box(1454, 1454), Box(1454, 1454)),
+ Box(Box(1455, 1455), Box(1455, 1455)),
+ Box(Box(1456, 1456), Box(1456, 1456)),
+ Box(Box(1457, 1457), Box(1457, 1457)),
+ Box(Box(1458, 1458), Box(1458, 1458)),
+ Box(Box(1459, 1459), Box(1459, 1459)),
+ Box(Box(1460, 1460), Box(1460, 1460)),
+ Box(Box(1461, 1461), Box(1461, 1461)),
+ Box(Box(1462, 1462), Box(1462, 1462)),
+ Box(Box(1463, 1463), Box(1463, 1463)),
+ Box(Box(1464, 1464), Box(1464, 1464)),
+ Box(Box(1465, 1465), Box(1465, 1465)),
+ Box(Box(1466, 1466), Box(1466, 1466)),
+ Box(Box(1467, 1467), Box(1467, 1467)),
+ Box(Box(1468, 1468), Box(1468, 1468)),
+ Box(Box(1469, 1469), Box(1469, 1469)),
+ Box(Box(1470, 1470), Box(1470, 1470)),
+ Box(Box(1471, 1471), Box(1471, 1471)),
+ Box(Box(1472, 1472), Box(1472, 1472)),
+ Box(Box(1473, 1473), Box(1473, 1473)),
+ Box(Box(1474, 1474), Box(1474, 1474)),
+ Box(Box(1475, 1475), Box(1475, 1475)),
+ Box(Box(1476, 1476), Box(1476, 1476)),
+ Box(Box(1477, 1477), Box(1477, 1477)),
+ Box(Box(1478, 1478), Box(1478, 1478)),
+ Box(Box(1479, 1479), Box(1479, 1479)),
+ Box(Box(1480, 1480), Box(1480, 1480)),
+ Box(Box(1481, 1481), Box(1481, 1481)),
+ Box(Box(1482, 1482), Box(1482, 1482)),
+ Box(Box(1483, 1483), Box(1483, 1483)),
+ Box(Box(1484, 1484), Box(1484, 1484)),
+ Box(Box(1485, 1485), Box(1485, 1485)),
+ Box(Box(1486, 1486), Box(1486, 1486)),
+ Box(Box(1487, 1487), Box(1487, 1487)),
+ Box(Box(1488, 1488), Box(1488, 1488)),
+ Box(Box(1489, 1489), Box(1489, 1489)),
+ Box(Box(1490, 1490), Box(1490, 1490)),
+ Box(Box(1491, 1491), Box(1491, 1491)),
+ Box(Box(1492, 1492), Box(1492, 1492)),
+ Box(Box(1493, 1493), Box(1493, 1493)),
+ Box(Box(1494, 1494), Box(1494, 1494)),
+ Box(Box(1495, 1495), Box(1495, 1495)),
+ Box(Box(1496, 1496), Box(1496, 1496)),
+ Box(Box(1497, 1497), Box(1497, 1497)),
+ Box(Box(1498, 1498), Box(1498, 1498)),
+ Box(Box(1499, 1499), Box(1499, 1499)),
+ Box(Box(1500, 1500), Box(1500, 1500)),
+ Box(Box(1501, 1501), Box(1501, 1501)),
+ Box(Box(1502, 1502), Box(1502, 1502)),
+ Box(Box(1503, 1503), Box(1503, 1503)),
+ Box(Box(1504, 1504), Box(1504, 1504)),
+ Box(Box(1505, 1505), Box(1505, 1505)),
+ Box(Box(1506, 1506), Box(1506, 1506)),
+ Box(Box(1507, 1507), Box(1507, 1507)),
+ Box(Box(1508, 1508), Box(1508, 1508)),
+ Box(Box(1509, 1509), Box(1509, 1509)),
+ Box(Box(1510, 1510), Box(1510, 1510)),
+ Box(Box(1511, 1511), Box(1511, 1511)),
+ Box(Box(1512, 1512), Box(1512, 1512)),
+ Box(Box(1513, 1513), Box(1513, 1513)),
+ Box(Box(1514, 1514), Box(1514, 1514)),
+ Box(Box(1515, 1515), Box(1515, 1515)),
+ Box(Box(1516, 1516), Box(1516, 1516)),
+ Box(Box(1517, 1517), Box(1517, 1517)),
+ Box(Box(1518, 1518), Box(1518, 1518)),
+ Box(Box(1519, 1519), Box(1519, 1519)),
+ Box(Box(1520, 1520), Box(1520, 1520)),
+ Box(Box(1521, 1521), Box(1521, 1521)),
+ Box(Box(1522, 1522), Box(1522, 1522)),
+ Box(Box(1523, 1523), Box(1523, 1523)),
+ Box(Box(1524, 1524), Box(1524, 1524)),
+ Box(Box(1525, 1525), Box(1525, 1525)),
+ Box(Box(1526, 1526), Box(1526, 1526)),
+ Box(Box(1527, 1527), Box(1527, 1527)),
+ Box(Box(1528, 1528), Box(1528, 1528)),
+ Box(Box(1529, 1529), Box(1529, 1529)),
+ Box(Box(1530, 1530), Box(1530, 1530)),
+ Box(Box(1531, 1531), Box(1531, 1531)),
+ Box(Box(1532, 1532), Box(1532, 1532)),
+ Box(Box(1533, 1533), Box(1533, 1533)),
+ Box(Box(1534, 1534), Box(1534, 1534)),
+ Box(Box(1535, 1535), Box(1535, 1535)),
+ Box(Box(1536, 1536), Box(1536, 1536)),
+ Box(Box(1537, 1537), Box(1537, 1537)),
+ Box(Box(1538, 1538), Box(1538, 1538)),
+ Box(Box(1539, 1539), Box(1539, 1539)),
+ Box(Box(1540, 1540), Box(1540, 1540)),
+ Box(Box(1541, 1541), Box(1541, 1541)),
+ Box(Box(1542, 1542), Box(1542, 1542)),
+ Box(Box(1543, 1543), Box(1543, 1543)),
+ Box(Box(1544, 1544), Box(1544, 1544)),
+ Box(Box(1545, 1545), Box(1545, 1545)),
+ Box(Box(1546, 1546), Box(1546, 1546)),
+ Box(Box(1547, 1547), Box(1547, 1547)),
+ Box(Box(1548, 1548), Box(1548, 1548)),
+ Box(Box(1549, 1549), Box(1549, 1549)),
+ Box(Box(1550, 1550), Box(1550, 1550)),
+ Box(Box(1551, 1551), Box(1551, 1551)),
+ Box(Box(1552, 1552), Box(1552, 1552)),
+ Box(Box(1553, 1553), Box(1553, 1553)),
+ Box(Box(1554, 1554), Box(1554, 1554)),
+ Box(Box(1555, 1555), Box(1555, 1555)),
+ Box(Box(1556, 1556), Box(1556, 1556)),
+ Box(Box(1557, 1557), Box(1557, 1557)),
+ Box(Box(1558, 1558), Box(1558, 1558)),
+ Box(Box(1559, 1559), Box(1559, 1559)),
+ Box(Box(1560, 1560), Box(1560, 1560)),
+ Box(Box(1561, 1561), Box(1561, 1561)),
+ Box(Box(1562, 1562), Box(1562, 1562)),
+ Box(Box(1563, 1563), Box(1563, 1563)),
+ Box(Box(1564, 1564), Box(1564, 1564)),
+ Box(Box(1565, 1565), Box(1565, 1565)),
+ Box(Box(1566, 1566), Box(1566, 1566)),
+ Box(Box(1567, 1567), Box(1567, 1567)),
+ Box(Box(1568, 1568), Box(1568, 1568)),
+ Box(Box(1569, 1569), Box(1569, 1569)),
+ Box(Box(1570, 1570), Box(1570, 1570)),
+ Box(Box(1571, 1571), Box(1571, 1571)),
+ Box(Box(1572, 1572), Box(1572, 1572)),
+ Box(Box(1573, 1573), Box(1573, 1573)),
+ Box(Box(1574, 1574), Box(1574, 1574)),
+ Box(Box(1575, 1575), Box(1575, 1575)),
+ Box(Box(1576, 1576), Box(1576, 1576)),
+ Box(Box(1577, 1577), Box(1577, 1577)),
+ Box(Box(1578, 1578), Box(1578, 1578)),
+ Box(Box(1579, 1579), Box(1579, 1579)),
+ Box(Box(1580, 1580), Box(1580, 1580)),
+ Box(Box(1581, 1581), Box(1581, 1581)),
+ Box(Box(1582, 1582), Box(1582, 1582)),
+ Box(Box(1583, 1583), Box(1583, 1583)),
+ Box(Box(1584, 1584), Box(1584, 1584)),
+ Box(Box(1585, 1585), Box(1585, 1585)),
+ Box(Box(1586, 1586), Box(1586, 1586)),
+ Box(Box(1587, 1587), Box(1587, 1587)),
+ Box(Box(1588, 1588), Box(1588, 1588)),
+ Box(Box(1589, 1589), Box(1589, 1589)),
+ Box(Box(1590, 1590), Box(1590, 1590)),
+ Box(Box(1591, 1591), Box(1591, 1591)),
+ Box(Box(1592, 1592), Box(1592, 1592)),
+ Box(Box(1593, 1593), Box(1593, 1593)),
+ Box(Box(1594, 1594), Box(1594, 1594)),
+ Box(Box(1595, 1595), Box(1595, 1595)),
+ Box(Box(1596, 1596), Box(1596, 1596)),
+ Box(Box(1597, 1597), Box(1597, 1597)),
+ Box(Box(1598, 1598), Box(1598, 1598)),
+ Box(Box(1599, 1599), Box(1599, 1599)),
+ Box(Box(1600, 1600), Box(1600, 1600)),
+ Box(Box(1601, 1601), Box(1601, 1601)),
+ Box(Box(1602, 1602), Box(1602, 1602)),
+ Box(Box(1603, 1603), Box(1603, 1603)),
+ Box(Box(1604, 1604), Box(1604, 1604)),
+ Box(Box(1605, 1605), Box(1605, 1605)),
+ Box(Box(1606, 1606), Box(1606, 1606)),
+ Box(Box(1607, 1607), Box(1607, 1607)),
+ Box(Box(1608, 1608), Box(1608, 1608)),
+ Box(Box(1609, 1609), Box(1609, 1609)),
+ Box(Box(1610, 1610), Box(1610, 1610)),
+ Box(Box(1611, 1611), Box(1611, 1611)),
+ Box(Box(1612, 1612), Box(1612, 1612)),
+ Box(Box(1613, 1613), Box(1613, 1613)),
+ Box(Box(1614, 1614), Box(1614, 1614)),
+ Box(Box(1615, 1615), Box(1615, 1615)),
+ Box(Box(1616, 1616), Box(1616, 1616)),
+ Box(Box(1617, 1617), Box(1617, 1617)),
+ Box(Box(1618, 1618), Box(1618, 1618)),
+ Box(Box(1619, 1619), Box(1619, 1619)),
+ Box(Box(1620, 1620), Box(1620, 1620)),
+ Box(Box(1621, 1621), Box(1621, 1621)),
+ Box(Box(1622, 1622), Box(1622, 1622)),
+ Box(Box(1623, 1623), Box(1623, 1623)),
+ Box(Box(1624, 1624), Box(1624, 1624)),
+ Box(Box(1625, 1625), Box(1625, 1625)),
+ Box(Box(1626, 1626), Box(1626, 1626)),
+ Box(Box(1627, 1627), Box(1627, 1627)),
+ Box(Box(1628, 1628), Box(1628, 1628)),
+ Box(Box(1629, 1629), Box(1629, 1629)),
+ Box(Box(1630, 1630), Box(1630, 1630)),
+ Box(Box(1631, 1631), Box(1631, 1631)),
+ Box(Box(1632, 1632), Box(1632, 1632)),
+ Box(Box(1633, 1633), Box(1633, 1633)),
+ Box(Box(1634, 1634), Box(1634, 1634)),
+ Box(Box(1635, 1635), Box(1635, 1635)),
+ Box(Box(1636, 1636), Box(1636, 1636)),
+ Box(Box(1637, 1637), Box(1637, 1637)),
+ Box(Box(1638, 1638), Box(1638, 1638)),
+ Box(Box(1639, 1639), Box(1639, 1639)),
+ Box(Box(1640, 1640), Box(1640, 1640)),
+ Box(Box(1641, 1641), Box(1641, 1641)),
+ Box(Box(1642, 1642), Box(1642, 1642)),
+ Box(Box(1643, 1643), Box(1643, 1643)),
+ Box(Box(1644, 1644), Box(1644, 1644)),
+ Box(Box(1645, 1645), Box(1645, 1645)),
+ Box(Box(1646, 1646), Box(1646, 1646)),
+ Box(Box(1647, 1647), Box(1647, 1647)),
+ Box(Box(1648, 1648), Box(1648, 1648)),
+ Box(Box(1649, 1649), Box(1649, 1649)),
+ Box(Box(1650, 1650), Box(1650, 1650)),
+ Box(Box(1651, 1651), Box(1651, 1651)),
+ Box(Box(1652, 1652), Box(1652, 1652)),
+ Box(Box(1653, 1653), Box(1653, 1653)),
+ Box(Box(1654, 1654), Box(1654, 1654)),
+ Box(Box(1655, 1655), Box(1655, 1655)),
+ Box(Box(1656, 1656), Box(1656, 1656)),
+ Box(Box(1657, 1657), Box(1657, 1657)),
+ Box(Box(1658, 1658), Box(1658, 1658)),
+ Box(Box(1659, 1659), Box(1659, 1659)),
+ Box(Box(1660, 1660), Box(1660, 1660)),
+ Box(Box(1661, 1661), Box(1661, 1661)),
+ Box(Box(1662, 1662), Box(1662, 1662)),
+ Box(Box(1663, 1663), Box(1663, 1663)),
+ Box(Box(1664, 1664), Box(1664, 1664)),
+ Box(Box(1665, 1665), Box(1665, 1665)),
+ Box(Box(1666, 1666), Box(1666, 1666)),
+ Box(Box(1667, 1667), Box(1667, 1667)),
+ Box(Box(1668, 1668), Box(1668, 1668)),
+ Box(Box(1669, 1669), Box(1669, 1669)),
+ Box(Box(1670, 1670), Box(1670, 1670)),
+ Box(Box(1671, 1671), Box(1671, 1671)),
+ Box(Box(1672, 1672), Box(1672, 1672)),
+ Box(Box(1673, 1673), Box(1673, 1673)),
+ Box(Box(1674, 1674), Box(1674, 1674)),
+ Box(Box(1675, 1675), Box(1675, 1675)),
+ Box(Box(1676, 1676), Box(1676, 1676)),
+ Box(Box(1677, 1677), Box(1677, 1677)),
+ Box(Box(1678, 1678), Box(1678, 1678)),
+ Box(Box(1679, 1679), Box(1679, 1679)),
+ Box(Box(1680, 1680), Box(1680, 1680)),
+ Box(Box(1681, 1681), Box(1681, 1681)),
+ Box(Box(1682, 1682), Box(1682, 1682)),
+ Box(Box(1683, 1683), Box(1683, 1683)),
+ Box(Box(1684, 1684), Box(1684, 1684)),
+ Box(Box(1685, 1685), Box(1685, 1685)),
+ Box(Box(1686, 1686), Box(1686, 1686)),
+ Box(Box(1687, 1687), Box(1687, 1687)),
+ Box(Box(1688, 1688), Box(1688, 1688)),
+ Box(Box(1689, 1689), Box(1689, 1689)),
+ Box(Box(1690, 1690), Box(1690, 1690)),
+ Box(Box(1691, 1691), Box(1691, 1691)),
+ Box(Box(1692, 1692), Box(1692, 1692)),
+ Box(Box(1693, 1693), Box(1693, 1693)),
+ Box(Box(1694, 1694), Box(1694, 1694)),
+ Box(Box(1695, 1695), Box(1695, 1695)),
+ Box(Box(1696, 1696), Box(1696, 1696)),
+ Box(Box(1697, 1697), Box(1697, 1697)),
+ Box(Box(1698, 1698), Box(1698, 1698)),
+ Box(Box(1699, 1699), Box(1699, 1699)),
+ Box(Box(1700, 1700), Box(1700, 1700)),
+ Box(Box(1701, 1701), Box(1701, 1701)),
+ Box(Box(1702, 1702), Box(1702, 1702)),
+ Box(Box(1703, 1703), Box(1703, 1703)),
+ Box(Box(1704, 1704), Box(1704, 1704)),
+ Box(Box(1705, 1705), Box(1705, 1705)),
+ Box(Box(1706, 1706), Box(1706, 1706)),
+ Box(Box(1707, 1707), Box(1707, 1707)),
+ Box(Box(1708, 1708), Box(1708, 1708)),
+ Box(Box(1709, 1709), Box(1709, 1709)),
+ Box(Box(1710, 1710), Box(1710, 1710)),
+ Box(Box(1711, 1711), Box(1711, 1711)),
+ Box(Box(1712, 1712), Box(1712, 1712)),
+ Box(Box(1713, 1713), Box(1713, 1713)),
+ Box(Box(1714, 1714), Box(1714, 1714)),
+ Box(Box(1715, 1715), Box(1715, 1715)),
+ Box(Box(1716, 1716), Box(1716, 1716)),
+ Box(Box(1717, 1717), Box(1717, 1717)),
+ Box(Box(1718, 1718), Box(1718, 1718)),
+ Box(Box(1719, 1719), Box(1719, 1719)),
+ Box(Box(1720, 1720), Box(1720, 1720)),
+ Box(Box(1721, 1721), Box(1721, 1721)),
+ Box(Box(1722, 1722), Box(1722, 1722)),
+ Box(Box(1723, 1723), Box(1723, 1723)),
+ Box(Box(1724, 1724), Box(1724, 1724)),
+ Box(Box(1725, 1725), Box(1725, 1725)),
+ Box(Box(1726, 1726), Box(1726, 1726)),
+ Box(Box(1727, 1727), Box(1727, 1727)),
+ Box(Box(1728, 1728), Box(1728, 1728)),
+ Box(Box(1729, 1729), Box(1729, 1729)),
+ Box(Box(1730, 1730), Box(1730, 1730)),
+ Box(Box(1731, 1731), Box(1731, 1731)),
+ Box(Box(1732, 1732), Box(1732, 1732)),
+ Box(Box(1733, 1733), Box(1733, 1733)),
+ Box(Box(1734, 1734), Box(1734, 1734)),
+ Box(Box(1735, 1735), Box(1735, 1735)),
+ Box(Box(1736, 1736), Box(1736, 1736)),
+ Box(Box(1737, 1737), Box(1737, 1737)),
+ Box(Box(1738, 1738), Box(1738, 1738)),
+ Box(Box(1739, 1739), Box(1739, 1739)),
+ Box(Box(1740, 1740), Box(1740, 1740)),
+ Box(Box(1741, 1741), Box(1741, 1741)),
+ Box(Box(1742, 1742), Box(1742, 1742)),
+ Box(Box(1743, 1743), Box(1743, 1743)),
+ Box(Box(1744, 1744), Box(1744, 1744)),
+ Box(Box(1745, 1745), Box(1745, 1745)),
+ Box(Box(1746, 1746), Box(1746, 1746)),
+ Box(Box(1747, 1747), Box(1747, 1747)),
+ Box(Box(1748, 1748), Box(1748, 1748)),
+ Box(Box(1749, 1749), Box(1749, 1749)),
+ Box(Box(1750, 1750), Box(1750, 1750)),
+ Box(Box(1751, 1751), Box(1751, 1751)),
+ Box(Box(1752, 1752), Box(1752, 1752)),
+ Box(Box(1753, 1753), Box(1753, 1753)),
+ Box(Box(1754, 1754), Box(1754, 1754)),
+ Box(Box(1755, 1755), Box(1755, 1755)),
+ Box(Box(1756, 1756), Box(1756, 1756)),
+ Box(Box(1757, 1757), Box(1757, 1757)),
+ Box(Box(1758, 1758), Box(1758, 1758)),
+ Box(Box(1759, 1759), Box(1759, 1759)),
+ Box(Box(1760, 1760), Box(1760, 1760)),
+ Box(Box(1761, 1761), Box(1761, 1761)),
+ Box(Box(1762, 1762), Box(1762, 1762)),
+ Box(Box(1763, 1763), Box(1763, 1763)),
+ Box(Box(1764, 1764), Box(1764, 1764)),
+ Box(Box(1765, 1765), Box(1765, 1765)),
+ Box(Box(1766, 1766), Box(1766, 1766)),
+ Box(Box(1767, 1767), Box(1767, 1767)),
+ Box(Box(1768, 1768), Box(1768, 1768)),
+ Box(Box(1769, 1769), Box(1769, 1769)),
+ Box(Box(1770, 1770), Box(1770, 1770)),
+ Box(Box(1771, 1771), Box(1771, 1771)),
+ Box(Box(1772, 1772), Box(1772, 1772)),
+ Box(Box(1773, 1773), Box(1773, 1773)),
+ Box(Box(1774, 1774), Box(1774, 1774)),
+ Box(Box(1775, 1775), Box(1775, 1775)),
+ Box(Box(1776, 1776), Box(1776, 1776)),
+ Box(Box(1777, 1777), Box(1777, 1777)),
+ Box(Box(1778, 1778), Box(1778, 1778)),
+ Box(Box(1779, 1779), Box(1779, 1779)),
+ Box(Box(1780, 1780), Box(1780, 1780)),
+ Box(Box(1781, 1781), Box(1781, 1781)),
+ Box(Box(1782, 1782), Box(1782, 1782)),
+ Box(Box(1783, 1783), Box(1783, 1783)),
+ Box(Box(1784, 1784), Box(1784, 1784)),
+ Box(Box(1785, 1785), Box(1785, 1785)),
+ Box(Box(1786, 1786), Box(1786, 1786)),
+ Box(Box(1787, 1787), Box(1787, 1787)),
+ Box(Box(1788, 1788), Box(1788, 1788)),
+ Box(Box(1789, 1789), Box(1789, 1789)),
+ Box(Box(1790, 1790), Box(1790, 1790)),
+ Box(Box(1791, 1791), Box(1791, 1791)),
+ Box(Box(1792, 1792), Box(1792, 1792)),
+ Box(Box(1793, 1793), Box(1793, 1793)),
+ Box(Box(1794, 1794), Box(1794, 1794)),
+ Box(Box(1795, 1795), Box(1795, 1795)),
+ Box(Box(1796, 1796), Box(1796, 1796)),
+ Box(Box(1797, 1797), Box(1797, 1797)),
+ Box(Box(1798, 1798), Box(1798, 1798)),
+ Box(Box(1799, 1799), Box(1799, 1799)),
+ Box(Box(1800, 1800), Box(1800, 1800)),
+ Box(Box(1801, 1801), Box(1801, 1801)),
+ Box(Box(1802, 1802), Box(1802, 1802)),
+ Box(Box(1803, 1803), Box(1803, 1803)),
+ Box(Box(1804, 1804), Box(1804, 1804)),
+ Box(Box(1805, 1805), Box(1805, 1805)),
+ Box(Box(1806, 1806), Box(1806, 1806)),
+ Box(Box(1807, 1807), Box(1807, 1807)),
+ Box(Box(1808, 1808), Box(1808, 1808)),
+ Box(Box(1809, 1809), Box(1809, 1809)),
+ Box(Box(1810, 1810), Box(1810, 1810)),
+ Box(Box(1811, 1811), Box(1811, 1811)),
+ Box(Box(1812, 1812), Box(1812, 1812)),
+ Box(Box(1813, 1813), Box(1813, 1813)),
+ Box(Box(1814, 1814), Box(1814, 1814)),
+ Box(Box(1815, 1815), Box(1815, 1815)),
+ Box(Box(1816, 1816), Box(1816, 1816)),
+ Box(Box(1817, 1817), Box(1817, 1817)),
+ Box(Box(1818, 1818), Box(1818, 1818)),
+ Box(Box(1819, 1819), Box(1819, 1819)),
+ Box(Box(1820, 1820), Box(1820, 1820)),
+ Box(Box(1821, 1821), Box(1821, 1821)),
+ Box(Box(1822, 1822), Box(1822, 1822)),
+ Box(Box(1823, 1823), Box(1823, 1823)),
+ Box(Box(1824, 1824), Box(1824, 1824)),
+ Box(Box(1825, 1825), Box(1825, 1825)),
+ Box(Box(1826, 1826), Box(1826, 1826)),
+ Box(Box(1827, 1827), Box(1827, 1827)),
+ Box(Box(1828, 1828), Box(1828, 1828)),
+ Box(Box(1829, 1829), Box(1829, 1829)),
+ Box(Box(1830, 1830), Box(1830, 1830)),
+ Box(Box(1831, 1831), Box(1831, 1831)),
+ Box(Box(1832, 1832), Box(1832, 1832)),
+ Box(Box(1833, 1833), Box(1833, 1833)),
+ Box(Box(1834, 1834), Box(1834, 1834)),
+ Box(Box(1835, 1835), Box(1835, 1835)),
+ Box(Box(1836, 1836), Box(1836, 1836)),
+ Box(Box(1837, 1837), Box(1837, 1837)),
+ Box(Box(1838, 1838), Box(1838, 1838)),
+ Box(Box(1839, 1839), Box(1839, 1839)),
+ Box(Box(1840, 1840), Box(1840, 1840)),
+ Box(Box(1841, 1841), Box(1841, 1841)),
+ Box(Box(1842, 1842), Box(1842, 1842)),
+ Box(Box(1843, 1843), Box(1843, 1843)),
+ Box(Box(1844, 1844), Box(1844, 1844)),
+ Box(Box(1845, 1845), Box(1845, 1845)),
+ Box(Box(1846, 1846), Box(1846, 1846)),
+ Box(Box(1847, 1847), Box(1847, 1847)),
+ Box(Box(1848, 1848), Box(1848, 1848)),
+ Box(Box(1849, 1849), Box(1849, 1849)),
+ Box(Box(1850, 1850), Box(1850, 1850)),
+ Box(Box(1851, 1851), Box(1851, 1851)),
+ Box(Box(1852, 1852), Box(1852, 1852)),
+ Box(Box(1853, 1853), Box(1853, 1853)),
+ Box(Box(1854, 1854), Box(1854, 1854)),
+ Box(Box(1855, 1855), Box(1855, 1855)),
+ Box(Box(1856, 1856), Box(1856, 1856)),
+ Box(Box(1857, 1857), Box(1857, 1857)),
+ Box(Box(1858, 1858), Box(1858, 1858)),
+ Box(Box(1859, 1859), Box(1859, 1859)),
+ Box(Box(1860, 1860), Box(1860, 1860)),
+ Box(Box(1861, 1861), Box(1861, 1861)),
+ Box(Box(1862, 1862), Box(1862, 1862)),
+ Box(Box(1863, 1863), Box(1863, 1863)),
+ Box(Box(1864, 1864), Box(1864, 1864)),
+ Box(Box(1865, 1865), Box(1865, 1865)),
+ Box(Box(1866, 1866), Box(1866, 1866)),
+ Box(Box(1867, 1867), Box(1867, 1867)),
+ Box(Box(1868, 1868), Box(1868, 1868)),
+ Box(Box(1869, 1869), Box(1869, 1869)),
+ Box(Box(1870, 1870), Box(1870, 1870)),
+ Box(Box(1871, 1871), Box(1871, 1871)),
+ Box(Box(1872, 1872), Box(1872, 1872)),
+ Box(Box(1873, 1873), Box(1873, 1873)),
+ Box(Box(1874, 1874), Box(1874, 1874)),
+ Box(Box(1875, 1875), Box(1875, 1875)),
+ Box(Box(1876, 1876), Box(1876, 1876)),
+ Box(Box(1877, 1877), Box(1877, 1877)),
+ Box(Box(1878, 1878), Box(1878, 1878)),
+ Box(Box(1879, 1879), Box(1879, 1879)),
+ Box(Box(1880, 1880), Box(1880, 1880)),
+ Box(Box(1881, 1881), Box(1881, 1881)),
+ Box(Box(1882, 1882), Box(1882, 1882)),
+ Box(Box(1883, 1883), Box(1883, 1883)),
+ Box(Box(1884, 1884), Box(1884, 1884)),
+ Box(Box(1885, 1885), Box(1885, 1885)),
+ Box(Box(1886, 1886), Box(1886, 1886)),
+ Box(Box(1887, 1887), Box(1887, 1887)),
+ Box(Box(1888, 1888), Box(1888, 1888)),
+ Box(Box(1889, 1889), Box(1889, 1889)),
+ Box(Box(1890, 1890), Box(1890, 1890)),
+ Box(Box(1891, 1891), Box(1891, 1891)),
+ Box(Box(1892, 1892), Box(1892, 1892)),
+ Box(Box(1893, 1893), Box(1893, 1893)),
+ Box(Box(1894, 1894), Box(1894, 1894)),
+ Box(Box(1895, 1895), Box(1895, 1895)),
+ Box(Box(1896, 1896), Box(1896, 1896)),
+ Box(Box(1897, 1897), Box(1897, 1897)),
+ Box(Box(1898, 1898), Box(1898, 1898)),
+ Box(Box(1899, 1899), Box(1899, 1899)),
+ Box(Box(1900, 1900), Box(1900, 1900)),
+ Box(Box(1901, 1901), Box(1901, 1901)),
+ Box(Box(1902, 1902), Box(1902, 1902)),
+ Box(Box(1903, 1903), Box(1903, 1903)),
+ Box(Box(1904, 1904), Box(1904, 1904)),
+ Box(Box(1905, 1905), Box(1905, 1905)),
+ Box(Box(1906, 1906), Box(1906, 1906)),
+ Box(Box(1907, 1907), Box(1907, 1907)),
+ Box(Box(1908, 1908), Box(1908, 1908)),
+ Box(Box(1909, 1909), Box(1909, 1909)),
+ Box(Box(1910, 1910), Box(1910, 1910)),
+ Box(Box(1911, 1911), Box(1911, 1911)),
+ Box(Box(1912, 1912), Box(1912, 1912)),
+ Box(Box(1913, 1913), Box(1913, 1913)),
+ Box(Box(1914, 1914), Box(1914, 1914)),
+ Box(Box(1915, 1915), Box(1915, 1915)),
+ Box(Box(1916, 1916), Box(1916, 1916)),
+ Box(Box(1917, 1917), Box(1917, 1917)),
+ Box(Box(1918, 1918), Box(1918, 1918)),
+ Box(Box(1919, 1919), Box(1919, 1919)),
+ Box(Box(1920, 1920), Box(1920, 1920)),
+ Box(Box(1921, 1921), Box(1921, 1921)),
+ Box(Box(1922, 1922), Box(1922, 1922)),
+ Box(Box(1923, 1923), Box(1923, 1923)),
+ Box(Box(1924, 1924), Box(1924, 1924)),
+ Box(Box(1925, 1925), Box(1925, 1925)),
+ Box(Box(1926, 1926), Box(1926, 1926)),
+ Box(Box(1927, 1927), Box(1927, 1927)),
+ Box(Box(1928, 1928), Box(1928, 1928)),
+ Box(Box(1929, 1929), Box(1929, 1929)),
+ Box(Box(1930, 1930), Box(1930, 1930)),
+ Box(Box(1931, 1931), Box(1931, 1931)),
+ Box(Box(1932, 1932), Box(1932, 1932)),
+ Box(Box(1933, 1933), Box(1933, 1933)),
+ Box(Box(1934, 1934), Box(1934, 1934)),
+ Box(Box(1935, 1935), Box(1935, 1935)),
+ Box(Box(1936, 1936), Box(1936, 1936)),
+ Box(Box(1937, 1937), Box(1937, 1937)),
+ Box(Box(1938, 1938), Box(1938, 1938)),
+ Box(Box(1939, 1939), Box(1939, 1939)),
+ Box(Box(1940, 1940), Box(1940, 1940)),
+ Box(Box(1941, 1941), Box(1941, 1941)),
+ Box(Box(1942, 1942), Box(1942, 1942)),
+ Box(Box(1943, 1943), Box(1943, 1943)),
+ Box(Box(1944, 1944), Box(1944, 1944)),
+ Box(Box(1945, 1945), Box(1945, 1945)),
+ Box(Box(1946, 1946), Box(1946, 1946)),
+ Box(Box(1947, 1947), Box(1947, 1947)),
+ Box(Box(1948, 1948), Box(1948, 1948)),
+ Box(Box(1949, 1949), Box(1949, 1949)),
+ Box(Box(1950, 1950), Box(1950, 1950)),
+ Box(Box(1951, 1951), Box(1951, 1951)),
+ Box(Box(1952, 1952), Box(1952, 1952)),
+ Box(Box(1953, 1953), Box(1953, 1953)),
+ Box(Box(1954, 1954), Box(1954, 1954)),
+ Box(Box(1955, 1955), Box(1955, 1955)),
+ Box(Box(1956, 1956), Box(1956, 1956)),
+ Box(Box(1957, 1957), Box(1957, 1957)),
+ Box(Box(1958, 1958), Box(1958, 1958)),
+ Box(Box(1959, 1959), Box(1959, 1959)),
+ Box(Box(1960, 1960), Box(1960, 1960)),
+ Box(Box(1961, 1961), Box(1961, 1961)),
+ Box(Box(1962, 1962), Box(1962, 1962)),
+ Box(Box(1963, 1963), Box(1963, 1963)),
+ Box(Box(1964, 1964), Box(1964, 1964)),
+ Box(Box(1965, 1965), Box(1965, 1965)),
+ Box(Box(1966, 1966), Box(1966, 1966)),
+ Box(Box(1967, 1967), Box(1967, 1967)),
+ Box(Box(1968, 1968), Box(1968, 1968)),
+ Box(Box(1969, 1969), Box(1969, 1969)),
+ Box(Box(1970, 1970), Box(1970, 1970)),
+ Box(Box(1971, 1971), Box(1971, 1971)),
+ Box(Box(1972, 1972), Box(1972, 1972)),
+ Box(Box(1973, 1973), Box(1973, 1973)),
+ Box(Box(1974, 1974), Box(1974, 1974)),
+ Box(Box(1975, 1975), Box(1975, 1975)),
+ Box(Box(1976, 1976), Box(1976, 1976)),
+ Box(Box(1977, 1977), Box(1977, 1977)),
+ Box(Box(1978, 1978), Box(1978, 1978)),
+ Box(Box(1979, 1979), Box(1979, 1979)),
+ Box(Box(1980, 1980), Box(1980, 1980)),
+ Box(Box(1981, 1981), Box(1981, 1981)),
+ Box(Box(1982, 1982), Box(1982, 1982)),
+ Box(Box(1983, 1983), Box(1983, 1983)),
+ Box(Box(1984, 1984), Box(1984, 1984)),
+ Box(Box(1985, 1985), Box(1985, 1985)),
+ Box(Box(1986, 1986), Box(1986, 1986)),
+ Box(Box(1987, 1987), Box(1987, 1987)),
+ Box(Box(1988, 1988), Box(1988, 1988)),
+ Box(Box(1989, 1989), Box(1989, 1989)),
+ Box(Box(1990, 1990), Box(1990, 1990)),
+ Box(Box(1991, 1991), Box(1991, 1991)),
+ Box(Box(1992, 1992), Box(1992, 1992)),
+ Box(Box(1993, 1993), Box(1993, 1993)),
+ Box(Box(1994, 1994), Box(1994, 1994)),
+ Box(Box(1995, 1995), Box(1995, 1995)),
+ Box(Box(1996, 1996), Box(1996, 1996)),
+ Box(Box(1997, 1997), Box(1997, 1997)),
+ Box(Box(1998, 1998), Box(1998, 1998)),
+ Box(Box(1999, 1999), Box(1999, 1999)),
+ Box(Box(2000, 2000), Box(2000, 2000)),
+ Box(Box(2001, 2001), Box(2001, 2001)),
+ Box(Box(2002, 2002), Box(2002, 2002)),
+ Box(Box(2003, 2003), Box(2003, 2003)),
+ Box(Box(2004, 2004), Box(2004, 2004)),
+ Box(Box(2005, 2005), Box(2005, 2005)),
+ Box(Box(2006, 2006), Box(2006, 2006)),
+ Box(Box(2007, 2007), Box(2007, 2007)),
+ Box(Box(2008, 2008), Box(2008, 2008)),
+ Box(Box(2009, 2009), Box(2009, 2009)),
+ Box(Box(2010, 2010), Box(2010, 2010)),
+ Box(Box(2011, 2011), Box(2011, 2011)),
+ Box(Box(2012, 2012), Box(2012, 2012)),
+ Box(Box(2013, 2013), Box(2013, 2013)),
+ Box(Box(2014, 2014), Box(2014, 2014)),
+ Box(Box(2015, 2015), Box(2015, 2015)),
+ Box(Box(2016, 2016), Box(2016, 2016)),
+ Box(Box(2017, 2017), Box(2017, 2017)),
+ Box(Box(2018, 2018), Box(2018, 2018)),
+ Box(Box(2019, 2019), Box(2019, 2019)),
+ Box(Box(2020, 2020), Box(2020, 2020)),
+ Box(Box(2021, 2021), Box(2021, 2021)),
+ Box(Box(2022, 2022), Box(2022, 2022)),
+ Box(Box(2023, 2023), Box(2023, 2023)),
+ Box(Box(2024, 2024), Box(2024, 2024)),
+ Box(Box(2025, 2025), Box(2025, 2025)),
+ Box(Box(2026, 2026), Box(2026, 2026)),
+ Box(Box(2027, 2027), Box(2027, 2027)),
+ Box(Box(2028, 2028), Box(2028, 2028)),
+ Box(Box(2029, 2029), Box(2029, 2029)),
+ Box(Box(2030, 2030), Box(2030, 2030)),
+ Box(Box(2031, 2031), Box(2031, 2031)),
+ Box(Box(2032, 2032), Box(2032, 2032)),
+ Box(Box(2033, 2033), Box(2033, 2033)),
+ Box(Box(2034, 2034), Box(2034, 2034)),
+ Box(Box(2035, 2035), Box(2035, 2035)),
+ Box(Box(2036, 2036), Box(2036, 2036)),
+ Box(Box(2037, 2037), Box(2037, 2037)),
+ Box(Box(2038, 2038), Box(2038, 2038)),
+ Box(Box(2039, 2039), Box(2039, 2039)),
+ Box(Box(2040, 2040), Box(2040, 2040)),
+ Box(Box(2041, 2041), Box(2041, 2041)),
+ Box(Box(2042, 2042), Box(2042, 2042)),
+ Box(Box(2043, 2043), Box(2043, 2043)),
+ Box(Box(2044, 2044), Box(2044, 2044)),
+ Box(Box(2045, 2045), Box(2045, 2045)),
+ Box(Box(2046, 2046), Box(2046, 2046)),
+ Box(Box(2047, 2047), Box(2047, 2047)),
+ Box(Box(2048, 2048), Box(2048, 2048)),
+ Box(Box(2049, 2049), Box(2049, 2049)),
+ Box(Box(2050, 2050), Box(2050, 2050)),
+ Box(Box(2051, 2051), Box(2051, 2051)),
+ Box(Box(2052, 2052), Box(2052, 2052)),
+ Box(Box(2053, 2053), Box(2053, 2053)),
+ Box(Box(2054, 2054), Box(2054, 2054)),
+ Box(Box(2055, 2055), Box(2055, 2055)),
+ Box(Box(2056, 2056), Box(2056, 2056)),
+ Box(Box(2057, 2057), Box(2057, 2057)),
+ Box(Box(2058, 2058), Box(2058, 2058)),
+ Box(Box(2059, 2059), Box(2059, 2059)),
+ Box(Box(2060, 2060), Box(2060, 2060)),
+ Box(Box(2061, 2061), Box(2061, 2061)),
+ Box(Box(2062, 2062), Box(2062, 2062)),
+ Box(Box(2063, 2063), Box(2063, 2063)),
+ Box(Box(2064, 2064), Box(2064, 2064)),
+ Box(Box(2065, 2065), Box(2065, 2065)),
+ Box(Box(2066, 2066), Box(2066, 2066)),
+ Box(Box(2067, 2067), Box(2067, 2067)),
+ Box(Box(2068, 2068), Box(2068, 2068)),
+ Box(Box(2069, 2069), Box(2069, 2069)),
+ Box(Box(2070, 2070), Box(2070, 2070)),
+ Box(Box(2071, 2071), Box(2071, 2071)),
+ Box(Box(2072, 2072), Box(2072, 2072)),
+ Box(Box(2073, 2073), Box(2073, 2073)),
+ Box(Box(2074, 2074), Box(2074, 2074)),
+ Box(Box(2075, 2075), Box(2075, 2075)),
+ Box(Box(2076, 2076), Box(2076, 2076)),
+ Box(Box(2077, 2077), Box(2077, 2077)),
+ Box(Box(2078, 2078), Box(2078, 2078)),
+ Box(Box(2079, 2079), Box(2079, 2079)),
+ Box(Box(2080, 2080), Box(2080, 2080)),
+ Box(Box(2081, 2081), Box(2081, 2081)),
+ Box(Box(2082, 2082), Box(2082, 2082)),
+ Box(Box(2083, 2083), Box(2083, 2083)),
+ Box(Box(2084, 2084), Box(2084, 2084)),
+ Box(Box(2085, 2085), Box(2085, 2085)),
+ Box(Box(2086, 2086), Box(2086, 2086)),
+ Box(Box(2087, 2087), Box(2087, 2087)),
+ Box(Box(2088, 2088), Box(2088, 2088)),
+ Box(Box(2089, 2089), Box(2089, 2089)),
+ Box(Box(2090, 2090), Box(2090, 2090)),
+ Box(Box(2091, 2091), Box(2091, 2091)),
+ Box(Box(2092, 2092), Box(2092, 2092)),
+ Box(Box(2093, 2093), Box(2093, 2093)),
+ Box(Box(2094, 2094), Box(2094, 2094)),
+ Box(Box(2095, 2095), Box(2095, 2095)),
+ Box(Box(2096, 2096), Box(2096, 2096)),
+ Box(Box(2097, 2097), Box(2097, 2097)),
+ Box(Box(2098, 2098), Box(2098, 2098)),
+ Box(Box(2099, 2099), Box(2099, 2099)),
+ Box(Box(2100, 2100), Box(2100, 2100)),
+ Box(Box(2101, 2101), Box(2101, 2101)),
+ Box(Box(2102, 2102), Box(2102, 2102)),
+ Box(Box(2103, 2103), Box(2103, 2103)),
+ Box(Box(2104, 2104), Box(2104, 2104)),
+ Box(Box(2105, 2105), Box(2105, 2105)),
+ Box(Box(2106, 2106), Box(2106, 2106)),
+ Box(Box(2107, 2107), Box(2107, 2107)),
+ Box(Box(2108, 2108), Box(2108, 2108)),
+ Box(Box(2109, 2109), Box(2109, 2109)),
+ Box(Box(2110, 2110), Box(2110, 2110)),
+ Box(Box(2111, 2111), Box(2111, 2111)),
+ Box(Box(2112, 2112), Box(2112, 2112)),
+ Box(Box(2113, 2113), Box(2113, 2113)),
+ Box(Box(2114, 2114), Box(2114, 2114)),
+ Box(Box(2115, 2115), Box(2115, 2115)),
+ Box(Box(2116, 2116), Box(2116, 2116)),
+ Box(Box(2117, 2117), Box(2117, 2117)),
+ Box(Box(2118, 2118), Box(2118, 2118)),
+ Box(Box(2119, 2119), Box(2119, 2119)),
+ Box(Box(2120, 2120), Box(2120, 2120)),
+ Box(Box(2121, 2121), Box(2121, 2121)),
+ Box(Box(2122, 2122), Box(2122, 2122)),
+ Box(Box(2123, 2123), Box(2123, 2123)),
+ Box(Box(2124, 2124), Box(2124, 2124)),
+ Box(Box(2125, 2125), Box(2125, 2125)),
+ Box(Box(2126, 2126), Box(2126, 2126)),
+ Box(Box(2127, 2127), Box(2127, 2127)),
+ Box(Box(2128, 2128), Box(2128, 2128)),
+ Box(Box(2129, 2129), Box(2129, 2129)),
+ Box(Box(2130, 2130), Box(2130, 2130)),
+ Box(Box(2131, 2131), Box(2131, 2131)),
+ Box(Box(2132, 2132), Box(2132, 2132)),
+ Box(Box(2133, 2133), Box(2133, 2133)),
+ Box(Box(2134, 2134), Box(2134, 2134)),
+ Box(Box(2135, 2135), Box(2135, 2135)),
+ Box(Box(2136, 2136), Box(2136, 2136)),
+ Box(Box(2137, 2137), Box(2137, 2137)),
+ Box(Box(2138, 2138), Box(2138, 2138)),
+ Box(Box(2139, 2139), Box(2139, 2139)),
+ Box(Box(2140, 2140), Box(2140, 2140)),
+ Box(Box(2141, 2141), Box(2141, 2141)),
+ Box(Box(2142, 2142), Box(2142, 2142)),
+ Box(Box(2143, 2143), Box(2143, 2143)),
+ Box(Box(2144, 2144), Box(2144, 2144)),
+ Box(Box(2145, 2145), Box(2145, 2145)),
+ Box(Box(2146, 2146), Box(2146, 2146)),
+ Box(Box(2147, 2147), Box(2147, 2147)),
+ Box(Box(2148, 2148), Box(2148, 2148)),
+ Box(Box(2149, 2149), Box(2149, 2149)),
+ Box(Box(2150, 2150), Box(2150, 2150)),
+ Box(Box(2151, 2151), Box(2151, 2151)),
+ Box(Box(2152, 2152), Box(2152, 2152)),
+ Box(Box(2153, 2153), Box(2153, 2153)),
+ Box(Box(2154, 2154), Box(2154, 2154)),
+ Box(Box(2155, 2155), Box(2155, 2155)),
+ Box(Box(2156, 2156), Box(2156, 2156)),
+ Box(Box(2157, 2157), Box(2157, 2157)),
+ Box(Box(2158, 2158), Box(2158, 2158)),
+ Box(Box(2159, 2159), Box(2159, 2159)),
+ Box(Box(2160, 2160), Box(2160, 2160)),
+ Box(Box(2161, 2161), Box(2161, 2161)),
+ Box(Box(2162, 2162), Box(2162, 2162)),
+ Box(Box(2163, 2163), Box(2163, 2163)),
+ Box(Box(2164, 2164), Box(2164, 2164)),
+ Box(Box(2165, 2165), Box(2165, 2165)),
+ Box(Box(2166, 2166), Box(2166, 2166)),
+ Box(Box(2167, 2167), Box(2167, 2167)),
+ Box(Box(2168, 2168), Box(2168, 2168)),
+ Box(Box(2169, 2169), Box(2169, 2169)),
+ Box(Box(2170, 2170), Box(2170, 2170)),
+ Box(Box(2171, 2171), Box(2171, 2171)),
+ Box(Box(2172, 2172), Box(2172, 2172)),
+ Box(Box(2173, 2173), Box(2173, 2173)),
+ Box(Box(2174, 2174), Box(2174, 2174)),
+ Box(Box(2175, 2175), Box(2175, 2175)),
+ Box(Box(2176, 2176), Box(2176, 2176)),
+ Box(Box(2177, 2177), Box(2177, 2177)),
+ Box(Box(2178, 2178), Box(2178, 2178)),
+ Box(Box(2179, 2179), Box(2179, 2179)),
+ Box(Box(2180, 2180), Box(2180, 2180)),
+ Box(Box(2181, 2181), Box(2181, 2181)),
+ Box(Box(2182, 2182), Box(2182, 2182)),
+ Box(Box(2183, 2183), Box(2183, 2183)),
+ Box(Box(2184, 2184), Box(2184, 2184)),
+ Box(Box(2185, 2185), Box(2185, 2185)),
+ Box(Box(2186, 2186), Box(2186, 2186)),
+ Box(Box(2187, 2187), Box(2187, 2187)),
+ Box(Box(2188, 2188), Box(2188, 2188)),
+ Box(Box(2189, 2189), Box(2189, 2189)),
+ Box(Box(2190, 2190), Box(2190, 2190)),
+ Box(Box(2191, 2191), Box(2191, 2191)),
+ Box(Box(2192, 2192), Box(2192, 2192)),
+ Box(Box(2193, 2193), Box(2193, 2193)),
+ Box(Box(2194, 2194), Box(2194, 2194)),
+ Box(Box(2195, 2195), Box(2195, 2195)),
+ Box(Box(2196, 2196), Box(2196, 2196)),
+ Box(Box(2197, 2197), Box(2197, 2197)),
+ Box(Box(2198, 2198), Box(2198, 2198)),
+ Box(Box(2199, 2199), Box(2199, 2199)),
+ Box(Box(2200, 2200), Box(2200, 2200)),
+ Box(Box(2201, 2201), Box(2201, 2201)),
+ Box(Box(2202, 2202), Box(2202, 2202)),
+ Box(Box(2203, 2203), Box(2203, 2203)),
+ Box(Box(2204, 2204), Box(2204, 2204)),
+ Box(Box(2205, 2205), Box(2205, 2205)),
+ Box(Box(2206, 2206), Box(2206, 2206)),
+ Box(Box(2207, 2207), Box(2207, 2207)),
+ Box(Box(2208, 2208), Box(2208, 2208)),
+ Box(Box(2209, 2209), Box(2209, 2209)),
+ Box(Box(2210, 2210), Box(2210, 2210)),
+ Box(Box(2211, 2211), Box(2211, 2211)),
+ Box(Box(2212, 2212), Box(2212, 2212)),
+ Box(Box(2213, 2213), Box(2213, 2213)),
+ Box(Box(2214, 2214), Box(2214, 2214)),
+ Box(Box(2215, 2215), Box(2215, 2215)),
+ Box(Box(2216, 2216), Box(2216, 2216)),
+ Box(Box(2217, 2217), Box(2217, 2217)),
+ Box(Box(2218, 2218), Box(2218, 2218)),
+ Box(Box(2219, 2219), Box(2219, 2219)),
+ Box(Box(2220, 2220), Box(2220, 2220)),
+ Box(Box(2221, 2221), Box(2221, 2221)),
+ Box(Box(2222, 2222), Box(2222, 2222)),
+ Box(Box(2223, 2223), Box(2223, 2223)),
+ Box(Box(2224, 2224), Box(2224, 2224)),
+ Box(Box(2225, 2225), Box(2225, 2225)),
+ Box(Box(2226, 2226), Box(2226, 2226)),
+ Box(Box(2227, 2227), Box(2227, 2227)),
+ Box(Box(2228, 2228), Box(2228, 2228)),
+ Box(Box(2229, 2229), Box(2229, 2229)),
+ Box(Box(2230, 2230), Box(2230, 2230)),
+ Box(Box(2231, 2231), Box(2231, 2231)),
+ Box(Box(2232, 2232), Box(2232, 2232)),
+ Box(Box(2233, 2233), Box(2233, 2233)),
+ Box(Box(2234, 2234), Box(2234, 2234)),
+ Box(Box(2235, 2235), Box(2235, 2235)),
+ Box(Box(2236, 2236), Box(2236, 2236)),
+ Box(Box(2237, 2237), Box(2237, 2237)),
+ Box(Box(2238, 2238), Box(2238, 2238)),
+ Box(Box(2239, 2239), Box(2239, 2239)),
+ Box(Box(2240, 2240), Box(2240, 2240)),
+ Box(Box(2241, 2241), Box(2241, 2241)),
+ Box(Box(2242, 2242), Box(2242, 2242)),
+ Box(Box(2243, 2243), Box(2243, 2243)),
+ Box(Box(2244, 2244), Box(2244, 2244)),
+ Box(Box(2245, 2245), Box(2245, 2245)),
+ Box(Box(2246, 2246), Box(2246, 2246)),
+ Box(Box(2247, 2247), Box(2247, 2247)),
+ Box(Box(2248, 2248), Box(2248, 2248)),
+ Box(Box(2249, 2249), Box(2249, 2249)),
+ Box(Box(2250, 2250), Box(2250, 2250)),
+ Box(Box(2251, 2251), Box(2251, 2251)),
+ Box(Box(2252, 2252), Box(2252, 2252)),
+ Box(Box(2253, 2253), Box(2253, 2253)),
+ Box(Box(2254, 2254), Box(2254, 2254)),
+ Box(Box(2255, 2255), Box(2255, 2255)),
+ Box(Box(2256, 2256), Box(2256, 2256)),
+ Box(Box(2257, 2257), Box(2257, 2257)),
+ Box(Box(2258, 2258), Box(2258, 2258)),
+ Box(Box(2259, 2259), Box(2259, 2259)),
+ Box(Box(2260, 2260), Box(2260, 2260)),
+ Box(Box(2261, 2261), Box(2261, 2261)),
+ Box(Box(2262, 2262), Box(2262, 2262)),
+ Box(Box(2263, 2263), Box(2263, 2263)),
+ Box(Box(2264, 2264), Box(2264, 2264)),
+ Box(Box(2265, 2265), Box(2265, 2265)),
+ Box(Box(2266, 2266), Box(2266, 2266)),
+ Box(Box(2267, 2267), Box(2267, 2267)),
+ Box(Box(2268, 2268), Box(2268, 2268)),
+ Box(Box(2269, 2269), Box(2269, 2269)),
+ Box(Box(2270, 2270), Box(2270, 2270)),
+ Box(Box(2271, 2271), Box(2271, 2271)),
+ Box(Box(2272, 2272), Box(2272, 2272)),
+ Box(Box(2273, 2273), Box(2273, 2273)),
+ Box(Box(2274, 2274), Box(2274, 2274)),
+ Box(Box(2275, 2275), Box(2275, 2275)),
+ Box(Box(2276, 2276), Box(2276, 2276)),
+ Box(Box(2277, 2277), Box(2277, 2277)),
+ Box(Box(2278, 2278), Box(2278, 2278)),
+ Box(Box(2279, 2279), Box(2279, 2279)),
+ Box(Box(2280, 2280), Box(2280, 2280)),
+ Box(Box(2281, 2281), Box(2281, 2281)),
+ Box(Box(2282, 2282), Box(2282, 2282)),
+ Box(Box(2283, 2283), Box(2283, 2283)),
+ Box(Box(2284, 2284), Box(2284, 2284)),
+ Box(Box(2285, 2285), Box(2285, 2285)),
+ Box(Box(2286, 2286), Box(2286, 2286)),
+ Box(Box(2287, 2287), Box(2287, 2287)),
+ Box(Box(2288, 2288), Box(2288, 2288)),
+ Box(Box(2289, 2289), Box(2289, 2289)),
+ Box(Box(2290, 2290), Box(2290, 2290)),
+ Box(Box(2291, 2291), Box(2291, 2291)),
+ Box(Box(2292, 2292), Box(2292, 2292)),
+ Box(Box(2293, 2293), Box(2293, 2293)),
+ Box(Box(2294, 2294), Box(2294, 2294)),
+ Box(Box(2295, 2295), Box(2295, 2295)),
+ Box(Box(2296, 2296), Box(2296, 2296)),
+ Box(Box(2297, 2297), Box(2297, 2297)),
+ Box(Box(2298, 2298), Box(2298, 2298)),
+ Box(Box(2299, 2299), Box(2299, 2299)),
+ Box(Box(2300, 2300), Box(2300, 2300)),
+ Box(Box(2301, 2301), Box(2301, 2301)),
+ Box(Box(2302, 2302), Box(2302, 2302)),
+ Box(Box(2303, 2303), Box(2303, 2303)),
+ Box(Box(2304, 2304), Box(2304, 2304)),
+ Box(Box(2305, 2305), Box(2305, 2305)),
+ Box(Box(2306, 2306), Box(2306, 2306)),
+ Box(Box(2307, 2307), Box(2307, 2307)),
+ Box(Box(2308, 2308), Box(2308, 2308)),
+ Box(Box(2309, 2309), Box(2309, 2309)),
+ Box(Box(2310, 2310), Box(2310, 2310)),
+ Box(Box(2311, 2311), Box(2311, 2311)),
+ Box(Box(2312, 2312), Box(2312, 2312)),
+ Box(Box(2313, 2313), Box(2313, 2313)),
+ Box(Box(2314, 2314), Box(2314, 2314)),
+ Box(Box(2315, 2315), Box(2315, 2315)),
+ Box(Box(2316, 2316), Box(2316, 2316)),
+ Box(Box(2317, 2317), Box(2317, 2317)),
+ Box(Box(2318, 2318), Box(2318, 2318)),
+ Box(Box(2319, 2319), Box(2319, 2319)),
+ Box(Box(2320, 2320), Box(2320, 2320)),
+ Box(Box(2321, 2321), Box(2321, 2321)),
+ Box(Box(2322, 2322), Box(2322, 2322)),
+ Box(Box(2323, 2323), Box(2323, 2323)),
+ Box(Box(2324, 2324), Box(2324, 2324)),
+ Box(Box(2325, 2325), Box(2325, 2325)),
+ Box(Box(2326, 2326), Box(2326, 2326)),
+ Box(Box(2327, 2327), Box(2327, 2327)),
+ Box(Box(2328, 2328), Box(2328, 2328)),
+ Box(Box(2329, 2329), Box(2329, 2329)),
+ Box(Box(2330, 2330), Box(2330, 2330)),
+ Box(Box(2331, 2331), Box(2331, 2331)),
+ Box(Box(2332, 2332), Box(2332, 2332)),
+ Box(Box(2333, 2333), Box(2333, 2333)),
+ Box(Box(2334, 2334), Box(2334, 2334)),
+ Box(Box(2335, 2335), Box(2335, 2335)),
+ Box(Box(2336, 2336), Box(2336, 2336)),
+ Box(Box(2337, 2337), Box(2337, 2337)),
+ Box(Box(2338, 2338), Box(2338, 2338)),
+ Box(Box(2339, 2339), Box(2339, 2339)),
+ Box(Box(2340, 2340), Box(2340, 2340)),
+ Box(Box(2341, 2341), Box(2341, 2341)),
+ Box(Box(2342, 2342), Box(2342, 2342)),
+ Box(Box(2343, 2343), Box(2343, 2343)),
+ Box(Box(2344, 2344), Box(2344, 2344)),
+ Box(Box(2345, 2345), Box(2345, 2345)),
+ Box(Box(2346, 2346), Box(2346, 2346)),
+ Box(Box(2347, 2347), Box(2347, 2347)),
+ Box(Box(2348, 2348), Box(2348, 2348)),
+ Box(Box(2349, 2349), Box(2349, 2349)),
+ Box(Box(2350, 2350), Box(2350, 2350)),
+ Box(Box(2351, 2351), Box(2351, 2351)),
+ Box(Box(2352, 2352), Box(2352, 2352)),
+ Box(Box(2353, 2353), Box(2353, 2353)),
+ Box(Box(2354, 2354), Box(2354, 2354)),
+ Box(Box(2355, 2355), Box(2355, 2355)),
+ Box(Box(2356, 2356), Box(2356, 2356)),
+ Box(Box(2357, 2357), Box(2357, 2357)),
+ Box(Box(2358, 2358), Box(2358, 2358)),
+ Box(Box(2359, 2359), Box(2359, 2359)),
+ Box(Box(2360, 2360), Box(2360, 2360)),
+ Box(Box(2361, 2361), Box(2361, 2361)),
+ Box(Box(2362, 2362), Box(2362, 2362)),
+ Box(Box(2363, 2363), Box(2363, 2363)),
+ Box(Box(2364, 2364), Box(2364, 2364)),
+ Box(Box(2365, 2365), Box(2365, 2365)),
+ Box(Box(2366, 2366), Box(2366, 2366)),
+ Box(Box(2367, 2367), Box(2367, 2367)),
+ Box(Box(2368, 2368), Box(2368, 2368)),
+ Box(Box(2369, 2369), Box(2369, 2369)),
+ Box(Box(2370, 2370), Box(2370, 2370)),
+ Box(Box(2371, 2371), Box(2371, 2371)),
+ Box(Box(2372, 2372), Box(2372, 2372)),
+ Box(Box(2373, 2373), Box(2373, 2373)),
+ Box(Box(2374, 2374), Box(2374, 2374)),
+ Box(Box(2375, 2375), Box(2375, 2375)),
+ Box(Box(2376, 2376), Box(2376, 2376)),
+ Box(Box(2377, 2377), Box(2377, 2377)),
+ Box(Box(2378, 2378), Box(2378, 2378)),
+ Box(Box(2379, 2379), Box(2379, 2379)),
+ Box(Box(2380, 2380), Box(2380, 2380)),
+ Box(Box(2381, 2381), Box(2381, 2381)),
+ Box(Box(2382, 2382), Box(2382, 2382)),
+ Box(Box(2383, 2383), Box(2383, 2383)),
+ Box(Box(2384, 2384), Box(2384, 2384)),
+ Box(Box(2385, 2385), Box(2385, 2385)),
+ Box(Box(2386, 2386), Box(2386, 2386)),
+ Box(Box(2387, 2387), Box(2387, 2387)),
+ Box(Box(2388, 2388), Box(2388, 2388)),
+ Box(Box(2389, 2389), Box(2389, 2389)),
+ Box(Box(2390, 2390), Box(2390, 2390)),
+ Box(Box(2391, 2391), Box(2391, 2391)),
+ Box(Box(2392, 2392), Box(2392, 2392)),
+ Box(Box(2393, 2393), Box(2393, 2393)),
+ Box(Box(2394, 2394), Box(2394, 2394)),
+ Box(Box(2395, 2395), Box(2395, 2395)),
+ Box(Box(2396, 2396), Box(2396, 2396)),
+ Box(Box(2397, 2397), Box(2397, 2397)),
+ Box(Box(2398, 2398), Box(2398, 2398)),
+ Box(Box(2399, 2399), Box(2399, 2399)),
+ Box(Box(2400, 2400), Box(2400, 2400)),
+ Box(Box(2401, 2401), Box(2401, 2401)),
+ Box(Box(2402, 2402), Box(2402, 2402)),
+ Box(Box(2403, 2403), Box(2403, 2403)),
+ Box(Box(2404, 2404), Box(2404, 2404)),
+ Box(Box(2405, 2405), Box(2405, 2405)),
+ Box(Box(2406, 2406), Box(2406, 2406)),
+ Box(Box(2407, 2407), Box(2407, 2407)),
+ Box(Box(2408, 2408), Box(2408, 2408)),
+ Box(Box(2409, 2409), Box(2409, 2409)),
+ Box(Box(2410, 2410), Box(2410, 2410)),
+ Box(Box(2411, 2411), Box(2411, 2411)),
+ Box(Box(2412, 2412), Box(2412, 2412)),
+ Box(Box(2413, 2413), Box(2413, 2413)),
+ Box(Box(2414, 2414), Box(2414, 2414)),
+ Box(Box(2415, 2415), Box(2415, 2415)),
+ Box(Box(2416, 2416), Box(2416, 2416)),
+ Box(Box(2417, 2417), Box(2417, 2417)),
+ Box(Box(2418, 2418), Box(2418, 2418)),
+ Box(Box(2419, 2419), Box(2419, 2419)),
+ Box(Box(2420, 2420), Box(2420, 2420)),
+ Box(Box(2421, 2421), Box(2421, 2421)),
+ Box(Box(2422, 2422), Box(2422, 2422)),
+ Box(Box(2423, 2423), Box(2423, 2423)),
+ Box(Box(2424, 2424), Box(2424, 2424)),
+ Box(Box(2425, 2425), Box(2425, 2425)),
+ Box(Box(2426, 2426), Box(2426, 2426)),
+ Box(Box(2427, 2427), Box(2427, 2427)),
+ Box(Box(2428, 2428), Box(2428, 2428)),
+ Box(Box(2429, 2429), Box(2429, 2429)),
+ Box(Box(2430, 2430), Box(2430, 2430)),
+ Box(Box(2431, 2431), Box(2431, 2431)),
+ Box(Box(2432, 2432), Box(2432, 2432)),
+ Box(Box(2433, 2433), Box(2433, 2433)),
+ Box(Box(2434, 2434), Box(2434, 2434)),
+ Box(Box(2435, 2435), Box(2435, 2435)),
+ Box(Box(2436, 2436), Box(2436, 2436)),
+ Box(Box(2437, 2437), Box(2437, 2437)),
+ Box(Box(2438, 2438), Box(2438, 2438)),
+ Box(Box(2439, 2439), Box(2439, 2439)),
+ Box(Box(2440, 2440), Box(2440, 2440)),
+ Box(Box(2441, 2441), Box(2441, 2441)),
+ Box(Box(2442, 2442), Box(2442, 2442)),
+ Box(Box(2443, 2443), Box(2443, 2443)),
+ Box(Box(2444, 2444), Box(2444, 2444)),
+ Box(Box(2445, 2445), Box(2445, 2445)),
+ Box(Box(2446, 2446), Box(2446, 2446)),
+ Box(Box(2447, 2447), Box(2447, 2447)),
+ Box(Box(2448, 2448), Box(2448, 2448)),
+ Box(Box(2449, 2449), Box(2449, 2449)),
+ Box(Box(2450, 2450), Box(2450, 2450)),
+ Box(Box(2451, 2451), Box(2451, 2451)),
+ Box(Box(2452, 2452), Box(2452, 2452)),
+ Box(Box(2453, 2453), Box(2453, 2453)),
+ Box(Box(2454, 2454), Box(2454, 2454)),
+ Box(Box(2455, 2455), Box(2455, 2455)),
+ Box(Box(2456, 2456), Box(2456, 2456)),
+ Box(Box(2457, 2457), Box(2457, 2457)),
+ Box(Box(2458, 2458), Box(2458, 2458)),
+ Box(Box(2459, 2459), Box(2459, 2459)),
+ Box(Box(2460, 2460), Box(2460, 2460)),
+ Box(Box(2461, 2461), Box(2461, 2461)),
+ Box(Box(2462, 2462), Box(2462, 2462)),
+ Box(Box(2463, 2463), Box(2463, 2463)),
+ Box(Box(2464, 2464), Box(2464, 2464)),
+ Box(Box(2465, 2465), Box(2465, 2465)),
+ Box(Box(2466, 2466), Box(2466, 2466)),
+ Box(Box(2467, 2467), Box(2467, 2467)),
+ Box(Box(2468, 2468), Box(2468, 2468)),
+ Box(Box(2469, 2469), Box(2469, 2469)),
+ Box(Box(2470, 2470), Box(2470, 2470)),
+ Box(Box(2471, 2471), Box(2471, 2471)),
+ Box(Box(2472, 2472), Box(2472, 2472)),
+ Box(Box(2473, 2473), Box(2473, 2473)),
+ Box(Box(2474, 2474), Box(2474, 2474)),
+ Box(Box(2475, 2475), Box(2475, 2475)),
+ Box(Box(2476, 2476), Box(2476, 2476)),
+ Box(Box(2477, 2477), Box(2477, 2477)),
+ Box(Box(2478, 2478), Box(2478, 2478)),
+ Box(Box(2479, 2479), Box(2479, 2479)),
+ Box(Box(2480, 2480), Box(2480, 2480)),
+ Box(Box(2481, 2481), Box(2481, 2481)),
+ Box(Box(2482, 2482), Box(2482, 2482)),
+ Box(Box(2483, 2483), Box(2483, 2483)),
+ Box(Box(2484, 2484), Box(2484, 2484)),
+ Box(Box(2485, 2485), Box(2485, 2485)),
+ Box(Box(2486, 2486), Box(2486, 2486)),
+ Box(Box(2487, 2487), Box(2487, 2487)),
+ Box(Box(2488, 2488), Box(2488, 2488)),
+ Box(Box(2489, 2489), Box(2489, 2489)),
+ Box(Box(2490, 2490), Box(2490, 2490)),
+ Box(Box(2491, 2491), Box(2491, 2491)),
+ Box(Box(2492, 2492), Box(2492, 2492)),
+ Box(Box(2493, 2493), Box(2493, 2493)),
+ Box(Box(2494, 2494), Box(2494, 2494)),
+ Box(Box(2495, 2495), Box(2495, 2495)),
+ Box(Box(2496, 2496), Box(2496, 2496)),
+ Box(Box(2497, 2497), Box(2497, 2497)),
+ Box(Box(2498, 2498), Box(2498, 2498)),
+ Box(Box(2499, 2499), Box(2499, 2499)),
+ Box(Box(2500, 2500), Box(2500, 2500)),
+ Box(Box(2501, 2501), Box(2501, 2501)),
+ Box(Box(2502, 2502), Box(2502, 2502)),
+ Box(Box(2503, 2503), Box(2503, 2503)),
+ Box(Box(2504, 2504), Box(2504, 2504)),
+ Box(Box(2505, 2505), Box(2505, 2505)),
+ Box(Box(2506, 2506), Box(2506, 2506)),
+ Box(Box(2507, 2507), Box(2507, 2507)),
+ Box(Box(2508, 2508), Box(2508, 2508)),
+ Box(Box(2509, 2509), Box(2509, 2509)),
+ Box(Box(2510, 2510), Box(2510, 2510)),
+ Box(Box(2511, 2511), Box(2511, 2511)),
+ Box(Box(2512, 2512), Box(2512, 2512)),
+ Box(Box(2513, 2513), Box(2513, 2513)),
+ Box(Box(2514, 2514), Box(2514, 2514)),
+ Box(Box(2515, 2515), Box(2515, 2515)),
+ Box(Box(2516, 2516), Box(2516, 2516)),
+ Box(Box(2517, 2517), Box(2517, 2517)),
+ Box(Box(2518, 2518), Box(2518, 2518)),
+ Box(Box(2519, 2519), Box(2519, 2519)),
+ Box(Box(2520, 2520), Box(2520, 2520)),
+ Box(Box(2521, 2521), Box(2521, 2521)),
+ Box(Box(2522, 2522), Box(2522, 2522)),
+ Box(Box(2523, 2523), Box(2523, 2523)),
+ Box(Box(2524, 2524), Box(2524, 2524)),
+ Box(Box(2525, 2525), Box(2525, 2525)),
+ Box(Box(2526, 2526), Box(2526, 2526)),
+ Box(Box(2527, 2527), Box(2527, 2527)),
+ Box(Box(2528, 2528), Box(2528, 2528)),
+ Box(Box(2529, 2529), Box(2529, 2529)),
+ Box(Box(2530, 2530), Box(2530, 2530)),
+ Box(Box(2531, 2531), Box(2531, 2531)),
+ Box(Box(2532, 2532), Box(2532, 2532)),
+ Box(Box(2533, 2533), Box(2533, 2533)),
+ Box(Box(2534, 2534), Box(2534, 2534)),
+ Box(Box(2535, 2535), Box(2535, 2535)),
+ Box(Box(2536, 2536), Box(2536, 2536)),
+ Box(Box(2537, 2537), Box(2537, 2537)),
+ Box(Box(2538, 2538), Box(2538, 2538)),
+ Box(Box(2539, 2539), Box(2539, 2539)),
+ Box(Box(2540, 2540), Box(2540, 2540)),
+ Box(Box(2541, 2541), Box(2541, 2541)),
+ Box(Box(2542, 2542), Box(2542, 2542)),
+ Box(Box(2543, 2543), Box(2543, 2543)),
+ Box(Box(2544, 2544), Box(2544, 2544)),
+ Box(Box(2545, 2545), Box(2545, 2545)),
+ Box(Box(2546, 2546), Box(2546, 2546)),
+ Box(Box(2547, 2547), Box(2547, 2547)),
+ Box(Box(2548, 2548), Box(2548, 2548)),
+ Box(Box(2549, 2549), Box(2549, 2549)),
+ Box(Box(2550, 2550), Box(2550, 2550)),
+ Box(Box(2551, 2551), Box(2551, 2551)),
+ Box(Box(2552, 2552), Box(2552, 2552)),
+ Box(Box(2553, 2553), Box(2553, 2553)),
+ Box(Box(2554, 2554), Box(2554, 2554)),
+ Box(Box(2555, 2555), Box(2555, 2555)),
+ Box(Box(2556, 2556), Box(2556, 2556)),
+ Box(Box(2557, 2557), Box(2557, 2557)),
+ Box(Box(2558, 2558), Box(2558, 2558)),
+ Box(Box(2559, 2559), Box(2559, 2559)),
+ Box(Box(2560, 2560), Box(2560, 2560)),
+ Box(Box(2561, 2561), Box(2561, 2561)),
+ Box(Box(2562, 2562), Box(2562, 2562)),
+ Box(Box(2563, 2563), Box(2563, 2563)),
+ Box(Box(2564, 2564), Box(2564, 2564)),
+ Box(Box(2565, 2565), Box(2565, 2565)),
+ Box(Box(2566, 2566), Box(2566, 2566)),
+ Box(Box(2567, 2567), Box(2567, 2567)),
+ Box(Box(2568, 2568), Box(2568, 2568)),
+ Box(Box(2569, 2569), Box(2569, 2569)),
+ Box(Box(2570, 2570), Box(2570, 2570)),
+ Box(Box(2571, 2571), Box(2571, 2571)),
+ Box(Box(2572, 2572), Box(2572, 2572)),
+ Box(Box(2573, 2573), Box(2573, 2573)),
+ Box(Box(2574, 2574), Box(2574, 2574)),
+ Box(Box(2575, 2575), Box(2575, 2575)),
+ Box(Box(2576, 2576), Box(2576, 2576)),
+ Box(Box(2577, 2577), Box(2577, 2577)),
+ Box(Box(2578, 2578), Box(2578, 2578)),
+ Box(Box(2579, 2579), Box(2579, 2579)),
+ Box(Box(2580, 2580), Box(2580, 2580)),
+ Box(Box(2581, 2581), Box(2581, 2581)),
+ Box(Box(2582, 2582), Box(2582, 2582)),
+ Box(Box(2583, 2583), Box(2583, 2583)),
+ Box(Box(2584, 2584), Box(2584, 2584)),
+ Box(Box(2585, 2585), Box(2585, 2585)),
+ Box(Box(2586, 2586), Box(2586, 2586)),
+ Box(Box(2587, 2587), Box(2587, 2587)),
+ Box(Box(2588, 2588), Box(2588, 2588)),
+ Box(Box(2589, 2589), Box(2589, 2589)),
+ Box(Box(2590, 2590), Box(2590, 2590)),
+ Box(Box(2591, 2591), Box(2591, 2591)),
+ Box(Box(2592, 2592), Box(2592, 2592)),
+ Box(Box(2593, 2593), Box(2593, 2593)),
+ Box(Box(2594, 2594), Box(2594, 2594)),
+ Box(Box(2595, 2595), Box(2595, 2595)),
+ Box(Box(2596, 2596), Box(2596, 2596)),
+ Box(Box(2597, 2597), Box(2597, 2597)),
+ Box(Box(2598, 2598), Box(2598, 2598)),
+ Box(Box(2599, 2599), Box(2599, 2599)),
+ Box(Box(2600, 2600), Box(2600, 2600)),
+ Box(Box(2601, 2601), Box(2601, 2601)),
+ Box(Box(2602, 2602), Box(2602, 2602)),
+ Box(Box(2603, 2603), Box(2603, 2603)),
+ Box(Box(2604, 2604), Box(2604, 2604)),
+ Box(Box(2605, 2605), Box(2605, 2605)),
+ Box(Box(2606, 2606), Box(2606, 2606)),
+ Box(Box(2607, 2607), Box(2607, 2607)),
+ Box(Box(2608, 2608), Box(2608, 2608)),
+ Box(Box(2609, 2609), Box(2609, 2609)),
+ Box(Box(2610, 2610), Box(2610, 2610)),
+ Box(Box(2611, 2611), Box(2611, 2611)),
+ Box(Box(2612, 2612), Box(2612, 2612)),
+ Box(Box(2613, 2613), Box(2613, 2613)),
+ Box(Box(2614, 2614), Box(2614, 2614)),
+ Box(Box(2615, 2615), Box(2615, 2615)),
+ Box(Box(2616, 2616), Box(2616, 2616)),
+ Box(Box(2617, 2617), Box(2617, 2617)),
+ Box(Box(2618, 2618), Box(2618, 2618)),
+ Box(Box(2619, 2619), Box(2619, 2619)),
+ Box(Box(2620, 2620), Box(2620, 2620)),
+ Box(Box(2621, 2621), Box(2621, 2621)),
+ Box(Box(2622, 2622), Box(2622, 2622)),
+ Box(Box(2623, 2623), Box(2623, 2623)),
+ Box(Box(2624, 2624), Box(2624, 2624)),
+ Box(Box(2625, 2625), Box(2625, 2625)),
+ Box(Box(2626, 2626), Box(2626, 2626)),
+ Box(Box(2627, 2627), Box(2627, 2627)),
+ Box(Box(2628, 2628), Box(2628, 2628)),
+ Box(Box(2629, 2629), Box(2629, 2629)),
+ Box(Box(2630, 2630), Box(2630, 2630)),
+ Box(Box(2631, 2631), Box(2631, 2631)),
+ Box(Box(2632, 2632), Box(2632, 2632)),
+ Box(Box(2633, 2633), Box(2633, 2633)),
+ Box(Box(2634, 2634), Box(2634, 2634)),
+ Box(Box(2635, 2635), Box(2635, 2635)),
+ Box(Box(2636, 2636), Box(2636, 2636)),
+ Box(Box(2637, 2637), Box(2637, 2637)),
+ Box(Box(2638, 2638), Box(2638, 2638)),
+ Box(Box(2639, 2639), Box(2639, 2639)),
+ Box(Box(2640, 2640), Box(2640, 2640)),
+ Box(Box(2641, 2641), Box(2641, 2641)),
+ Box(Box(2642, 2642), Box(2642, 2642)),
+ Box(Box(2643, 2643), Box(2643, 2643)),
+ Box(Box(2644, 2644), Box(2644, 2644)),
+ Box(Box(2645, 2645), Box(2645, 2645)),
+ Box(Box(2646, 2646), Box(2646, 2646)),
+ Box(Box(2647, 2647), Box(2647, 2647)),
+ Box(Box(2648, 2648), Box(2648, 2648)),
+ Box(Box(2649, 2649), Box(2649, 2649)),
+ Box(Box(2650, 2650), Box(2650, 2650)),
+ Box(Box(2651, 2651), Box(2651, 2651)),
+ Box(Box(2652, 2652), Box(2652, 2652)),
+ Box(Box(2653, 2653), Box(2653, 2653)),
+ Box(Box(2654, 2654), Box(2654, 2654)),
+ Box(Box(2655, 2655), Box(2655, 2655)),
+ Box(Box(2656, 2656), Box(2656, 2656)),
+ Box(Box(2657, 2657), Box(2657, 2657)),
+ Box(Box(2658, 2658), Box(2658, 2658)),
+ Box(Box(2659, 2659), Box(2659, 2659)),
+ Box(Box(2660, 2660), Box(2660, 2660)),
+ Box(Box(2661, 2661), Box(2661, 2661)),
+ Box(Box(2662, 2662), Box(2662, 2662)),
+ Box(Box(2663, 2663), Box(2663, 2663)),
+ Box(Box(2664, 2664), Box(2664, 2664)),
+ Box(Box(2665, 2665), Box(2665, 2665)),
+ Box(Box(2666, 2666), Box(2666, 2666)),
+ Box(Box(2667, 2667), Box(2667, 2667)),
+ Box(Box(2668, 2668), Box(2668, 2668)),
+ Box(Box(2669, 2669), Box(2669, 2669)),
+ Box(Box(2670, 2670), Box(2670, 2670)),
+ Box(Box(2671, 2671), Box(2671, 2671)),
+ Box(Box(2672, 2672), Box(2672, 2672)),
+ Box(Box(2673, 2673), Box(2673, 2673)),
+ Box(Box(2674, 2674), Box(2674, 2674)),
+ Box(Box(2675, 2675), Box(2675, 2675)),
+ Box(Box(2676, 2676), Box(2676, 2676)),
+ Box(Box(2677, 2677), Box(2677, 2677)),
+ Box(Box(2678, 2678), Box(2678, 2678)),
+ Box(Box(2679, 2679), Box(2679, 2679)),
+ Box(Box(2680, 2680), Box(2680, 2680)),
+ Box(Box(2681, 2681), Box(2681, 2681)),
+ Box(Box(2682, 2682), Box(2682, 2682)),
+ Box(Box(2683, 2683), Box(2683, 2683)),
+ Box(Box(2684, 2684), Box(2684, 2684)),
+ Box(Box(2685, 2685), Box(2685, 2685)),
+ Box(Box(2686, 2686), Box(2686, 2686)),
+ Box(Box(2687, 2687), Box(2687, 2687)),
+ Box(Box(2688, 2688), Box(2688, 2688)),
+ Box(Box(2689, 2689), Box(2689, 2689)),
+ Box(Box(2690, 2690), Box(2690, 2690)),
+ Box(Box(2691, 2691), Box(2691, 2691)),
+ Box(Box(2692, 2692), Box(2692, 2692)),
+ Box(Box(2693, 2693), Box(2693, 2693)),
+ Box(Box(2694, 2694), Box(2694, 2694)),
+ Box(Box(2695, 2695), Box(2695, 2695)),
+ Box(Box(2696, 2696), Box(2696, 2696)),
+ Box(Box(2697, 2697), Box(2697, 2697)),
+ Box(Box(2698, 2698), Box(2698, 2698)),
+ Box(Box(2699, 2699), Box(2699, 2699)),
+ Box(Box(2700, 2700), Box(2700, 2700)),
+ Box(Box(2701, 2701), Box(2701, 2701)),
+ Box(Box(2702, 2702), Box(2702, 2702)),
+ Box(Box(2703, 2703), Box(2703, 2703)),
+ Box(Box(2704, 2704), Box(2704, 2704)),
+ Box(Box(2705, 2705), Box(2705, 2705)),
+ Box(Box(2706, 2706), Box(2706, 2706)),
+ Box(Box(2707, 2707), Box(2707, 2707)),
+ Box(Box(2708, 2708), Box(2708, 2708)),
+ Box(Box(2709, 2709), Box(2709, 2709)),
+ Box(Box(2710, 2710), Box(2710, 2710)),
+ Box(Box(2711, 2711), Box(2711, 2711)),
+ Box(Box(2712, 2712), Box(2712, 2712)),
+ Box(Box(2713, 2713), Box(2713, 2713)),
+ Box(Box(2714, 2714), Box(2714, 2714)),
+ Box(Box(2715, 2715), Box(2715, 2715)),
+ Box(Box(2716, 2716), Box(2716, 2716)),
+ Box(Box(2717, 2717), Box(2717, 2717)),
+ Box(Box(2718, 2718), Box(2718, 2718)),
+ Box(Box(2719, 2719), Box(2719, 2719)),
+ Box(Box(2720, 2720), Box(2720, 2720)),
+ Box(Box(2721, 2721), Box(2721, 2721)),
+ Box(Box(2722, 2722), Box(2722, 2722)),
+ Box(Box(2723, 2723), Box(2723, 2723)),
+ Box(Box(2724, 2724), Box(2724, 2724)),
+ Box(Box(2725, 2725), Box(2725, 2725)),
+ Box(Box(2726, 2726), Box(2726, 2726)),
+ Box(Box(2727, 2727), Box(2727, 2727)),
+ Box(Box(2728, 2728), Box(2728, 2728)),
+ Box(Box(2729, 2729), Box(2729, 2729)),
+ Box(Box(2730, 2730), Box(2730, 2730)),
+ Box(Box(2731, 2731), Box(2731, 2731)),
+ Box(Box(2732, 2732), Box(2732, 2732)),
+ Box(Box(2733, 2733), Box(2733, 2733)),
+ Box(Box(2734, 2734), Box(2734, 2734)),
+ Box(Box(2735, 2735), Box(2735, 2735)),
+ Box(Box(2736, 2736), Box(2736, 2736)),
+ Box(Box(2737, 2737), Box(2737, 2737)),
+ Box(Box(2738, 2738), Box(2738, 2738)),
+ Box(Box(2739, 2739), Box(2739, 2739)),
+ Box(Box(2740, 2740), Box(2740, 2740)),
+ Box(Box(2741, 2741), Box(2741, 2741)),
+ Box(Box(2742, 2742), Box(2742, 2742)),
+ Box(Box(2743, 2743), Box(2743, 2743)),
+ Box(Box(2744, 2744), Box(2744, 2744)),
+ Box(Box(2745, 2745), Box(2745, 2745)),
+ Box(Box(2746, 2746), Box(2746, 2746)),
+ Box(Box(2747, 2747), Box(2747, 2747)),
+ Box(Box(2748, 2748), Box(2748, 2748)),
+ Box(Box(2749, 2749), Box(2749, 2749)),
+ Box(Box(2750, 2750), Box(2750, 2750)),
+ Box(Box(2751, 2751), Box(2751, 2751)),
+ Box(Box(2752, 2752), Box(2752, 2752)),
+ Box(Box(2753, 2753), Box(2753, 2753)),
+ Box(Box(2754, 2754), Box(2754, 2754)),
+ Box(Box(2755, 2755), Box(2755, 2755)),
+ Box(Box(2756, 2756), Box(2756, 2756)),
+ Box(Box(2757, 2757), Box(2757, 2757)),
+ Box(Box(2758, 2758), Box(2758, 2758)),
+ Box(Box(2759, 2759), Box(2759, 2759)),
+ Box(Box(2760, 2760), Box(2760, 2760)),
+ Box(Box(2761, 2761), Box(2761, 2761)),
+ Box(Box(2762, 2762), Box(2762, 2762)),
+ Box(Box(2763, 2763), Box(2763, 2763)),
+ Box(Box(2764, 2764), Box(2764, 2764)),
+ Box(Box(2765, 2765), Box(2765, 2765)),
+ Box(Box(2766, 2766), Box(2766, 2766)),
+ Box(Box(2767, 2767), Box(2767, 2767)),
+ Box(Box(2768, 2768), Box(2768, 2768)),
+ Box(Box(2769, 2769), Box(2769, 2769)),
+ Box(Box(2770, 2770), Box(2770, 2770)),
+ Box(Box(2771, 2771), Box(2771, 2771)),
+ Box(Box(2772, 2772), Box(2772, 2772)),
+ Box(Box(2773, 2773), Box(2773, 2773)),
+ Box(Box(2774, 2774), Box(2774, 2774)),
+ Box(Box(2775, 2775), Box(2775, 2775)),
+ Box(Box(2776, 2776), Box(2776, 2776)),
+ Box(Box(2777, 2777), Box(2777, 2777)),
+ Box(Box(2778, 2778), Box(2778, 2778)),
+ Box(Box(2779, 2779), Box(2779, 2779)),
+ Box(Box(2780, 2780), Box(2780, 2780)),
+ Box(Box(2781, 2781), Box(2781, 2781)),
+ Box(Box(2782, 2782), Box(2782, 2782)),
+ Box(Box(2783, 2783), Box(2783, 2783)),
+ Box(Box(2784, 2784), Box(2784, 2784)),
+ Box(Box(2785, 2785), Box(2785, 2785)),
+ Box(Box(2786, 2786), Box(2786, 2786)),
+ Box(Box(2787, 2787), Box(2787, 2787)),
+ Box(Box(2788, 2788), Box(2788, 2788)),
+ Box(Box(2789, 2789), Box(2789, 2789)),
+ Box(Box(2790, 2790), Box(2790, 2790)),
+ Box(Box(2791, 2791), Box(2791, 2791)),
+ Box(Box(2792, 2792), Box(2792, 2792)),
+ Box(Box(2793, 2793), Box(2793, 2793)),
+ Box(Box(2794, 2794), Box(2794, 2794)),
+ Box(Box(2795, 2795), Box(2795, 2795)),
+ Box(Box(2796, 2796), Box(2796, 2796)),
+ Box(Box(2797, 2797), Box(2797, 2797)),
+ Box(Box(2798, 2798), Box(2798, 2798)),
+ Box(Box(2799, 2799), Box(2799, 2799)),
+ Box(Box(2800, 2800), Box(2800, 2800)),
+ Box(Box(2801, 2801), Box(2801, 2801)),
+ Box(Box(2802, 2802), Box(2802, 2802)),
+ Box(Box(2803, 2803), Box(2803, 2803)),
+ Box(Box(2804, 2804), Box(2804, 2804)),
+ Box(Box(2805, 2805), Box(2805, 2805)),
+ Box(Box(2806, 2806), Box(2806, 2806)),
+ Box(Box(2807, 2807), Box(2807, 2807)),
+ Box(Box(2808, 2808), Box(2808, 2808)),
+ Box(Box(2809, 2809), Box(2809, 2809)),
+ Box(Box(2810, 2810), Box(2810, 2810)),
+ Box(Box(2811, 2811), Box(2811, 2811)),
+ Box(Box(2812, 2812), Box(2812, 2812)),
+ Box(Box(2813, 2813), Box(2813, 2813)),
+ Box(Box(2814, 2814), Box(2814, 2814)),
+ Box(Box(2815, 2815), Box(2815, 2815)),
+ Box(Box(2816, 2816), Box(2816, 2816)),
+ Box(Box(2817, 2817), Box(2817, 2817)),
+ Box(Box(2818, 2818), Box(2818, 2818)),
+ Box(Box(2819, 2819), Box(2819, 2819)),
+ Box(Box(2820, 2820), Box(2820, 2820)),
+ Box(Box(2821, 2821), Box(2821, 2821)),
+ Box(Box(2822, 2822), Box(2822, 2822)),
+ Box(Box(2823, 2823), Box(2823, 2823)),
+ Box(Box(2824, 2824), Box(2824, 2824)),
+ Box(Box(2825, 2825), Box(2825, 2825)),
+ Box(Box(2826, 2826), Box(2826, 2826)),
+ Box(Box(2827, 2827), Box(2827, 2827)),
+ Box(Box(2828, 2828), Box(2828, 2828)),
+ Box(Box(2829, 2829), Box(2829, 2829)),
+ Box(Box(2830, 2830), Box(2830, 2830)),
+ Box(Box(2831, 2831), Box(2831, 2831)),
+ Box(Box(2832, 2832), Box(2832, 2832)),
+ Box(Box(2833, 2833), Box(2833, 2833)),
+ Box(Box(2834, 2834), Box(2834, 2834)),
+ Box(Box(2835, 2835), Box(2835, 2835)),
+ Box(Box(2836, 2836), Box(2836, 2836)),
+ Box(Box(2837, 2837), Box(2837, 2837)),
+ Box(Box(2838, 2838), Box(2838, 2838)),
+ Box(Box(2839, 2839), Box(2839, 2839)),
+ Box(Box(2840, 2840), Box(2840, 2840)),
+ Box(Box(2841, 2841), Box(2841, 2841)),
+ Box(Box(2842, 2842), Box(2842, 2842)),
+ Box(Box(2843, 2843), Box(2843, 2843)),
+ Box(Box(2844, 2844), Box(2844, 2844)),
+ Box(Box(2845, 2845), Box(2845, 2845)),
+ Box(Box(2846, 2846), Box(2846, 2846)),
+ Box(Box(2847, 2847), Box(2847, 2847)),
+ Box(Box(2848, 2848), Box(2848, 2848)),
+ Box(Box(2849, 2849), Box(2849, 2849)),
+ Box(Box(2850, 2850), Box(2850, 2850)),
+ Box(Box(2851, 2851), Box(2851, 2851)),
+ Box(Box(2852, 2852), Box(2852, 2852)),
+ Box(Box(2853, 2853), Box(2853, 2853)),
+ Box(Box(2854, 2854), Box(2854, 2854)),
+ Box(Box(2855, 2855), Box(2855, 2855)),
+ Box(Box(2856, 2856), Box(2856, 2856)),
+ Box(Box(2857, 2857), Box(2857, 2857)),
+ Box(Box(2858, 2858), Box(2858, 2858)),
+ Box(Box(2859, 2859), Box(2859, 2859)),
+ Box(Box(2860, 2860), Box(2860, 2860)),
+ Box(Box(2861, 2861), Box(2861, 2861)),
+ Box(Box(2862, 2862), Box(2862, 2862)),
+ Box(Box(2863, 2863), Box(2863, 2863)),
+ Box(Box(2864, 2864), Box(2864, 2864)),
+ Box(Box(2865, 2865), Box(2865, 2865)),
+ Box(Box(2866, 2866), Box(2866, 2866)),
+ Box(Box(2867, 2867), Box(2867, 2867)),
+ Box(Box(2868, 2868), Box(2868, 2868)),
+ Box(Box(2869, 2869), Box(2869, 2869)),
+ Box(Box(2870, 2870), Box(2870, 2870)),
+ Box(Box(2871, 2871), Box(2871, 2871)),
+ Box(Box(2872, 2872), Box(2872, 2872)),
+ Box(Box(2873, 2873), Box(2873, 2873)),
+ Box(Box(2874, 2874), Box(2874, 2874)),
+ Box(Box(2875, 2875), Box(2875, 2875)),
+ Box(Box(2876, 2876), Box(2876, 2876)),
+ Box(Box(2877, 2877), Box(2877, 2877)),
+ Box(Box(2878, 2878), Box(2878, 2878)),
+ Box(Box(2879, 2879), Box(2879, 2879)),
+ Box(Box(2880, 2880), Box(2880, 2880)),
+ Box(Box(2881, 2881), Box(2881, 2881)),
+ Box(Box(2882, 2882), Box(2882, 2882)),
+ Box(Box(2883, 2883), Box(2883, 2883)),
+ Box(Box(2884, 2884), Box(2884, 2884)),
+ Box(Box(2885, 2885), Box(2885, 2885)),
+ Box(Box(2886, 2886), Box(2886, 2886)),
+ Box(Box(2887, 2887), Box(2887, 2887)),
+ Box(Box(2888, 2888), Box(2888, 2888)),
+ Box(Box(2889, 2889), Box(2889, 2889)),
+ Box(Box(2890, 2890), Box(2890, 2890)),
+ Box(Box(2891, 2891), Box(2891, 2891)),
+ Box(Box(2892, 2892), Box(2892, 2892)),
+ Box(Box(2893, 2893), Box(2893, 2893)),
+ Box(Box(2894, 2894), Box(2894, 2894)),
+ Box(Box(2895, 2895), Box(2895, 2895)),
+ Box(Box(2896, 2896), Box(2896, 2896)),
+ Box(Box(2897, 2897), Box(2897, 2897)),
+ Box(Box(2898, 2898), Box(2898, 2898)),
+ Box(Box(2899, 2899), Box(2899, 2899)),
+ Box(Box(2900, 2900), Box(2900, 2900)),
+ Box(Box(2901, 2901), Box(2901, 2901)),
+ Box(Box(2902, 2902), Box(2902, 2902)),
+ Box(Box(2903, 2903), Box(2903, 2903)),
+ Box(Box(2904, 2904), Box(2904, 2904)),
+ Box(Box(2905, 2905), Box(2905, 2905)),
+ Box(Box(2906, 2906), Box(2906, 2906)),
+ Box(Box(2907, 2907), Box(2907, 2907)),
+ Box(Box(2908, 2908), Box(2908, 2908)),
+ Box(Box(2909, 2909), Box(2909, 2909)),
+ Box(Box(2910, 2910), Box(2910, 2910)),
+ Box(Box(2911, 2911), Box(2911, 2911)),
+ Box(Box(2912, 2912), Box(2912, 2912)),
+ Box(Box(2913, 2913), Box(2913, 2913)),
+ Box(Box(2914, 2914), Box(2914, 2914)),
+ Box(Box(2915, 2915), Box(2915, 2915)),
+ Box(Box(2916, 2916), Box(2916, 2916)),
+ Box(Box(2917, 2917), Box(2917, 2917)),
+ Box(Box(2918, 2918), Box(2918, 2918)),
+ Box(Box(2919, 2919), Box(2919, 2919)),
+ Box(Box(2920, 2920), Box(2920, 2920)),
+ Box(Box(2921, 2921), Box(2921, 2921)),
+ Box(Box(2922, 2922), Box(2922, 2922)),
+ Box(Box(2923, 2923), Box(2923, 2923)),
+ Box(Box(2924, 2924), Box(2924, 2924)),
+ Box(Box(2925, 2925), Box(2925, 2925)),
+ Box(Box(2926, 2926), Box(2926, 2926)),
+ Box(Box(2927, 2927), Box(2927, 2927)),
+ Box(Box(2928, 2928), Box(2928, 2928)),
+ Box(Box(2929, 2929), Box(2929, 2929)),
+ Box(Box(2930, 2930), Box(2930, 2930)),
+ Box(Box(2931, 2931), Box(2931, 2931)),
+ Box(Box(2932, 2932), Box(2932, 2932)),
+ Box(Box(2933, 2933), Box(2933, 2933)),
+ Box(Box(2934, 2934), Box(2934, 2934)),
+ Box(Box(2935, 2935), Box(2935, 2935)),
+ Box(Box(2936, 2936), Box(2936, 2936)),
+ Box(Box(2937, 2937), Box(2937, 2937)),
+ Box(Box(2938, 2938), Box(2938, 2938)),
+ Box(Box(2939, 2939), Box(2939, 2939)),
+ Box(Box(2940, 2940), Box(2940, 2940)),
+ Box(Box(2941, 2941), Box(2941, 2941)),
+ Box(Box(2942, 2942), Box(2942, 2942)),
+ Box(Box(2943, 2943), Box(2943, 2943)),
+ Box(Box(2944, 2944), Box(2944, 2944)),
+ Box(Box(2945, 2945), Box(2945, 2945)),
+ Box(Box(2946, 2946), Box(2946, 2946)),
+ Box(Box(2947, 2947), Box(2947, 2947)),
+ Box(Box(2948, 2948), Box(2948, 2948)),
+ Box(Box(2949, 2949), Box(2949, 2949)),
+ Box(Box(2950, 2950), Box(2950, 2950)),
+ Box(Box(2951, 2951), Box(2951, 2951)),
+ Box(Box(2952, 2952), Box(2952, 2952)),
+ Box(Box(2953, 2953), Box(2953, 2953)),
+ Box(Box(2954, 2954), Box(2954, 2954)),
+ Box(Box(2955, 2955), Box(2955, 2955)),
+ Box(Box(2956, 2956), Box(2956, 2956)),
+ Box(Box(2957, 2957), Box(2957, 2957)),
+ Box(Box(2958, 2958), Box(2958, 2958)),
+ Box(Box(2959, 2959), Box(2959, 2959)),
+ Box(Box(2960, 2960), Box(2960, 2960)),
+ Box(Box(2961, 2961), Box(2961, 2961)),
+ Box(Box(2962, 2962), Box(2962, 2962)),
+ Box(Box(2963, 2963), Box(2963, 2963)),
+ Box(Box(2964, 2964), Box(2964, 2964)),
+ Box(Box(2965, 2965), Box(2965, 2965)),
+ Box(Box(2966, 2966), Box(2966, 2966)),
+ Box(Box(2967, 2967), Box(2967, 2967)),
+ Box(Box(2968, 2968), Box(2968, 2968)),
+ Box(Box(2969, 2969), Box(2969, 2969)),
+ Box(Box(2970, 2970), Box(2970, 2970)),
+ Box(Box(2971, 2971), Box(2971, 2971)),
+ Box(Box(2972, 2972), Box(2972, 2972)),
+ Box(Box(2973, 2973), Box(2973, 2973)),
+ Box(Box(2974, 2974), Box(2974, 2974)),
+ Box(Box(2975, 2975), Box(2975, 2975)),
+ Box(Box(2976, 2976), Box(2976, 2976)),
+ Box(Box(2977, 2977), Box(2977, 2977)),
+ Box(Box(2978, 2978), Box(2978, 2978)),
+ Box(Box(2979, 2979), Box(2979, 2979)),
+ Box(Box(2980, 2980), Box(2980, 2980)),
+ Box(Box(2981, 2981), Box(2981, 2981)),
+ Box(Box(2982, 2982), Box(2982, 2982)),
+ Box(Box(2983, 2983), Box(2983, 2983)),
+ Box(Box(2984, 2984), Box(2984, 2984)),
+ Box(Box(2985, 2985), Box(2985, 2985)),
+ Box(Box(2986, 2986), Box(2986, 2986)),
+ Box(Box(2987, 2987), Box(2987, 2987)),
+ Box(Box(2988, 2988), Box(2988, 2988)),
+ Box(Box(2989, 2989), Box(2989, 2989)),
+ Box(Box(2990, 2990), Box(2990, 2990)),
+ Box(Box(2991, 2991), Box(2991, 2991)),
+ Box(Box(2992, 2992), Box(2992, 2992)),
+ Box(Box(2993, 2993), Box(2993, 2993)),
+ Box(Box(2994, 2994), Box(2994, 2994)),
+ Box(Box(2995, 2995), Box(2995, 2995)),
+ Box(Box(2996, 2996), Box(2996, 2996)),
+ Box(Box(2997, 2997), Box(2997, 2997)),
+ Box(Box(2998, 2998), Box(2998, 2998)),
+ Box(Box(2999, 2999), Box(2999, 2999)),
+ Box(Box(3000, 3000), Box(3000, 3000)),
+ Box(Box(3001, 3001), Box(3001, 3001)),
+ Box(Box(3002, 3002), Box(3002, 3002)),
+ Box(Box(3003, 3003), Box(3003, 3003)),
+ Box(Box(3004, 3004), Box(3004, 3004)),
+ Box(Box(3005, 3005), Box(3005, 3005)),
+ Box(Box(3006, 3006), Box(3006, 3006)),
+ Box(Box(3007, 3007), Box(3007, 3007)),
+ Box(Box(3008, 3008), Box(3008, 3008)),
+ Box(Box(3009, 3009), Box(3009, 3009)),
+ Box(Box(3010, 3010), Box(3010, 3010)),
+ Box(Box(3011, 3011), Box(3011, 3011)),
+ Box(Box(3012, 3012), Box(3012, 3012)),
+ Box(Box(3013, 3013), Box(3013, 3013)),
+ Box(Box(3014, 3014), Box(3014, 3014)),
+ Box(Box(3015, 3015), Box(3015, 3015)),
+ Box(Box(3016, 3016), Box(3016, 3016)),
+ Box(Box(3017, 3017), Box(3017, 3017)),
+ Box(Box(3018, 3018), Box(3018, 3018)),
+ Box(Box(3019, 3019), Box(3019, 3019)),
+ Box(Box(3020, 3020), Box(3020, 3020)),
+ Box(Box(3021, 3021), Box(3021, 3021)),
+ Box(Box(3022, 3022), Box(3022, 3022)),
+ Box(Box(3023, 3023), Box(3023, 3023)),
+ Box(Box(3024, 3024), Box(3024, 3024)),
+ Box(Box(3025, 3025), Box(3025, 3025)),
+ Box(Box(3026, 3026), Box(3026, 3026)),
+ Box(Box(3027, 3027), Box(3027, 3027)),
+ Box(Box(3028, 3028), Box(3028, 3028)),
+ Box(Box(3029, 3029), Box(3029, 3029)),
+ Box(Box(3030, 3030), Box(3030, 3030)),
+ Box(Box(3031, 3031), Box(3031, 3031)),
+ Box(Box(3032, 3032), Box(3032, 3032)),
+ Box(Box(3033, 3033), Box(3033, 3033)),
+ Box(Box(3034, 3034), Box(3034, 3034)),
+ Box(Box(3035, 3035), Box(3035, 3035)),
+ Box(Box(3036, 3036), Box(3036, 3036)),
+ Box(Box(3037, 3037), Box(3037, 3037)),
+ Box(Box(3038, 3038), Box(3038, 3038)),
+ Box(Box(3039, 3039), Box(3039, 3039)),
+ Box(Box(3040, 3040), Box(3040, 3040)),
+ Box(Box(3041, 3041), Box(3041, 3041)),
+ Box(Box(3042, 3042), Box(3042, 3042)),
+ Box(Box(3043, 3043), Box(3043, 3043)),
+ Box(Box(3044, 3044), Box(3044, 3044)),
+ Box(Box(3045, 3045), Box(3045, 3045)),
+ Box(Box(3046, 3046), Box(3046, 3046)),
+ Box(Box(3047, 3047), Box(3047, 3047)),
+ Box(Box(3048, 3048), Box(3048, 3048)),
+ Box(Box(3049, 3049), Box(3049, 3049)),
+ Box(Box(3050, 3050), Box(3050, 3050)),
+ Box(Box(3051, 3051), Box(3051, 3051)),
+ Box(Box(3052, 3052), Box(3052, 3052)),
+ Box(Box(3053, 3053), Box(3053, 3053)),
+ Box(Box(3054, 3054), Box(3054, 3054)),
+ Box(Box(3055, 3055), Box(3055, 3055)),
+ Box(Box(3056, 3056), Box(3056, 3056)),
+ Box(Box(3057, 3057), Box(3057, 3057)),
+ Box(Box(3058, 3058), Box(3058, 3058)),
+ Box(Box(3059, 3059), Box(3059, 3059)),
+ Box(Box(3060, 3060), Box(3060, 3060)),
+ Box(Box(3061, 3061), Box(3061, 3061)),
+ Box(Box(3062, 3062), Box(3062, 3062)),
+ Box(Box(3063, 3063), Box(3063, 3063)),
+ Box(Box(3064, 3064), Box(3064, 3064)),
+ Box(Box(3065, 3065), Box(3065, 3065)),
+ Box(Box(3066, 3066), Box(3066, 3066)),
+ Box(Box(3067, 3067), Box(3067, 3067)),
+ Box(Box(3068, 3068), Box(3068, 3068)),
+ Box(Box(3069, 3069), Box(3069, 3069)),
+ Box(Box(3070, 3070), Box(3070, 3070)),
+ Box(Box(3071, 3071), Box(3071, 3071)),
+ Box(Box(3072, 3072), Box(3072, 3072)),
+ Box(Box(3073, 3073), Box(3073, 3073)),
+ Box(Box(3074, 3074), Box(3074, 3074)),
+ Box(Box(3075, 3075), Box(3075, 3075)),
+ Box(Box(3076, 3076), Box(3076, 3076)),
+ Box(Box(3077, 3077), Box(3077, 3077)),
+ Box(Box(3078, 3078), Box(3078, 3078)),
+ Box(Box(3079, 3079), Box(3079, 3079)),
+ Box(Box(3080, 3080), Box(3080, 3080)),
+ Box(Box(3081, 3081), Box(3081, 3081)),
+ Box(Box(3082, 3082), Box(3082, 3082)),
+ Box(Box(3083, 3083), Box(3083, 3083)),
+ Box(Box(3084, 3084), Box(3084, 3084)),
+ Box(Box(3085, 3085), Box(3085, 3085)),
+ Box(Box(3086, 3086), Box(3086, 3086)),
+ Box(Box(3087, 3087), Box(3087, 3087)),
+ Box(Box(3088, 3088), Box(3088, 3088)),
+ Box(Box(3089, 3089), Box(3089, 3089)),
+ Box(Box(3090, 3090), Box(3090, 3090)),
+ Box(Box(3091, 3091), Box(3091, 3091)),
+ Box(Box(3092, 3092), Box(3092, 3092)),
+ Box(Box(3093, 3093), Box(3093, 3093)),
+ Box(Box(3094, 3094), Box(3094, 3094)),
+ Box(Box(3095, 3095), Box(3095, 3095)),
+ Box(Box(3096, 3096), Box(3096, 3096)),
+ Box(Box(3097, 3097), Box(3097, 3097)),
+ Box(Box(3098, 3098), Box(3098, 3098)),
+ Box(Box(3099, 3099), Box(3099, 3099)),
+ Box(Box(3100, 3100), Box(3100, 3100)),
+ Box(Box(3101, 3101), Box(3101, 3101)),
+ Box(Box(3102, 3102), Box(3102, 3102)),
+ Box(Box(3103, 3103), Box(3103, 3103)),
+ Box(Box(3104, 3104), Box(3104, 3104)),
+ Box(Box(3105, 3105), Box(3105, 3105)),
+ Box(Box(3106, 3106), Box(3106, 3106)),
+ Box(Box(3107, 3107), Box(3107, 3107)),
+ Box(Box(3108, 3108), Box(3108, 3108)),
+ Box(Box(3109, 3109), Box(3109, 3109)),
+ Box(Box(3110, 3110), Box(3110, 3110)),
+ Box(Box(3111, 3111), Box(3111, 3111)),
+ Box(Box(3112, 3112), Box(3112, 3112)),
+ Box(Box(3113, 3113), Box(3113, 3113)),
+ Box(Box(3114, 3114), Box(3114, 3114)),
+ Box(Box(3115, 3115), Box(3115, 3115)),
+ Box(Box(3116, 3116), Box(3116, 3116)),
+ Box(Box(3117, 3117), Box(3117, 3117)),
+ Box(Box(3118, 3118), Box(3118, 3118)),
+ Box(Box(3119, 3119), Box(3119, 3119)),
+ Box(Box(3120, 3120), Box(3120, 3120)),
+ Box(Box(3121, 3121), Box(3121, 3121)),
+ Box(Box(3122, 3122), Box(3122, 3122)),
+ Box(Box(3123, 3123), Box(3123, 3123)),
+ Box(Box(3124, 3124), Box(3124, 3124)),
+ Box(Box(3125, 3125), Box(3125, 3125)),
+ Box(Box(3126, 3126), Box(3126, 3126)),
+ Box(Box(3127, 3127), Box(3127, 3127)),
+ Box(Box(3128, 3128), Box(3128, 3128)),
+ Box(Box(3129, 3129), Box(3129, 3129)),
+ Box(Box(3130, 3130), Box(3130, 3130)),
+ Box(Box(3131, 3131), Box(3131, 3131)),
+ Box(Box(3132, 3132), Box(3132, 3132)),
+ Box(Box(3133, 3133), Box(3133, 3133)),
+ Box(Box(3134, 3134), Box(3134, 3134)),
+ Box(Box(3135, 3135), Box(3135, 3135)),
+ Box(Box(3136, 3136), Box(3136, 3136)),
+ Box(Box(3137, 3137), Box(3137, 3137)),
+ Box(Box(3138, 3138), Box(3138, 3138)),
+ Box(Box(3139, 3139), Box(3139, 3139)),
+ Box(Box(3140, 3140), Box(3140, 3140)),
+ Box(Box(3141, 3141), Box(3141, 3141)),
+ Box(Box(3142, 3142), Box(3142, 3142)),
+ Box(Box(3143, 3143), Box(3143, 3143)),
+ Box(Box(3144, 3144), Box(3144, 3144)),
+ Box(Box(3145, 3145), Box(3145, 3145)),
+ Box(Box(3146, 3146), Box(3146, 3146)),
+ Box(Box(3147, 3147), Box(3147, 3147)),
+ Box(Box(3148, 3148), Box(3148, 3148)),
+ Box(Box(3149, 3149), Box(3149, 3149)),
+ Box(Box(3150, 3150), Box(3150, 3150)),
+ Box(Box(3151, 3151), Box(3151, 3151)),
+ Box(Box(3152, 3152), Box(3152, 3152)),
+ Box(Box(3153, 3153), Box(3153, 3153)),
+ Box(Box(3154, 3154), Box(3154, 3154)),
+ Box(Box(3155, 3155), Box(3155, 3155)),
+ Box(Box(3156, 3156), Box(3156, 3156)),
+ Box(Box(3157, 3157), Box(3157, 3157)),
+ Box(Box(3158, 3158), Box(3158, 3158)),
+ Box(Box(3159, 3159), Box(3159, 3159)),
+ Box(Box(3160, 3160), Box(3160, 3160)),
+ Box(Box(3161, 3161), Box(3161, 3161)),
+ Box(Box(3162, 3162), Box(3162, 3162)),
+ Box(Box(3163, 3163), Box(3163, 3163)),
+ Box(Box(3164, 3164), Box(3164, 3164)),
+ Box(Box(3165, 3165), Box(3165, 3165)),
+ Box(Box(3166, 3166), Box(3166, 3166)),
+ Box(Box(3167, 3167), Box(3167, 3167)),
+ Box(Box(3168, 3168), Box(3168, 3168)),
+ Box(Box(3169, 3169), Box(3169, 3169)),
+ Box(Box(3170, 3170), Box(3170, 3170)),
+ Box(Box(3171, 3171), Box(3171, 3171)),
+ Box(Box(3172, 3172), Box(3172, 3172)),
+ Box(Box(3173, 3173), Box(3173, 3173)),
+ Box(Box(3174, 3174), Box(3174, 3174)),
+ Box(Box(3175, 3175), Box(3175, 3175)),
+ Box(Box(3176, 3176), Box(3176, 3176)),
+ Box(Box(3177, 3177), Box(3177, 3177)),
+ Box(Box(3178, 3178), Box(3178, 3178)),
+ Box(Box(3179, 3179), Box(3179, 3179)),
+ Box(Box(3180, 3180), Box(3180, 3180)),
+ Box(Box(3181, 3181), Box(3181, 3181)),
+ Box(Box(3182, 3182), Box(3182, 3182)),
+ Box(Box(3183, 3183), Box(3183, 3183)),
+ Box(Box(3184, 3184), Box(3184, 3184)),
+ Box(Box(3185, 3185), Box(3185, 3185)),
+ Box(Box(3186, 3186), Box(3186, 3186)),
+ Box(Box(3187, 3187), Box(3187, 3187)),
+ Box(Box(3188, 3188), Box(3188, 3188)),
+ Box(Box(3189, 3189), Box(3189, 3189)),
+ Box(Box(3190, 3190), Box(3190, 3190)),
+ Box(Box(3191, 3191), Box(3191, 3191)),
+ Box(Box(3192, 3192), Box(3192, 3192)),
+ Box(Box(3193, 3193), Box(3193, 3193)),
+ Box(Box(3194, 3194), Box(3194, 3194)),
+ Box(Box(3195, 3195), Box(3195, 3195)),
+ Box(Box(3196, 3196), Box(3196, 3196)),
+ Box(Box(3197, 3197), Box(3197, 3197)),
+ Box(Box(3198, 3198), Box(3198, 3198)),
+ Box(Box(3199, 3199), Box(3199, 3199)),
+ Box(Box(3200, 3200), Box(3200, 3200)),
+ Box(Box(3201, 3201), Box(3201, 3201)),
+ Box(Box(3202, 3202), Box(3202, 3202)),
+ Box(Box(3203, 3203), Box(3203, 3203)),
+ Box(Box(3204, 3204), Box(3204, 3204)),
+ Box(Box(3205, 3205), Box(3205, 3205)),
+ Box(Box(3206, 3206), Box(3206, 3206)),
+ Box(Box(3207, 3207), Box(3207, 3207)),
+ Box(Box(3208, 3208), Box(3208, 3208)),
+ Box(Box(3209, 3209), Box(3209, 3209)),
+ Box(Box(3210, 3210), Box(3210, 3210)),
+ Box(Box(3211, 3211), Box(3211, 3211)),
+ Box(Box(3212, 3212), Box(3212, 3212)),
+ Box(Box(3213, 3213), Box(3213, 3213)),
+ Box(Box(3214, 3214), Box(3214, 3214)),
+ Box(Box(3215, 3215), Box(3215, 3215)),
+ Box(Box(3216, 3216), Box(3216, 3216)),
+ Box(Box(3217, 3217), Box(3217, 3217)),
+ Box(Box(3218, 3218), Box(3218, 3218)),
+ Box(Box(3219, 3219), Box(3219, 3219)),
+ Box(Box(3220, 3220), Box(3220, 3220)),
+ Box(Box(3221, 3221), Box(3221, 3221)),
+ Box(Box(3222, 3222), Box(3222, 3222)),
+ Box(Box(3223, 3223), Box(3223, 3223)),
+ Box(Box(3224, 3224), Box(3224, 3224)),
+ Box(Box(3225, 3225), Box(3225, 3225)),
+ Box(Box(3226, 3226), Box(3226, 3226)),
+ Box(Box(3227, 3227), Box(3227, 3227)),
+ Box(Box(3228, 3228), Box(3228, 3228)),
+ Box(Box(3229, 3229), Box(3229, 3229)),
+ Box(Box(3230, 3230), Box(3230, 3230)),
+ Box(Box(3231, 3231), Box(3231, 3231)),
+ Box(Box(3232, 3232), Box(3232, 3232)),
+ Box(Box(3233, 3233), Box(3233, 3233)),
+ Box(Box(3234, 3234), Box(3234, 3234)),
+ Box(Box(3235, 3235), Box(3235, 3235)),
+ Box(Box(3236, 3236), Box(3236, 3236)),
+ Box(Box(3237, 3237), Box(3237, 3237)),
+ Box(Box(3238, 3238), Box(3238, 3238)),
+ Box(Box(3239, 3239), Box(3239, 3239)),
+ Box(Box(3240, 3240), Box(3240, 3240)),
+ Box(Box(3241, 3241), Box(3241, 3241)),
+ Box(Box(3242, 3242), Box(3242, 3242)),
+ Box(Box(3243, 3243), Box(3243, 3243)),
+ Box(Box(3244, 3244), Box(3244, 3244)),
+ Box(Box(3245, 3245), Box(3245, 3245)),
+ Box(Box(3246, 3246), Box(3246, 3246)),
+ Box(Box(3247, 3247), Box(3247, 3247)),
+ Box(Box(3248, 3248), Box(3248, 3248)),
+ Box(Box(3249, 3249), Box(3249, 3249)),
+ Box(Box(3250, 3250), Box(3250, 3250)),
+ Box(Box(3251, 3251), Box(3251, 3251)),
+ Box(Box(3252, 3252), Box(3252, 3252)),
+ Box(Box(3253, 3253), Box(3253, 3253)),
+ Box(Box(3254, 3254), Box(3254, 3254)),
+ Box(Box(3255, 3255), Box(3255, 3255)),
+ Box(Box(3256, 3256), Box(3256, 3256)),
+ Box(Box(3257, 3257), Box(3257, 3257)),
+ Box(Box(3258, 3258), Box(3258, 3258)),
+ Box(Box(3259, 3259), Box(3259, 3259)),
+ Box(Box(3260, 3260), Box(3260, 3260)),
+ Box(Box(3261, 3261), Box(3261, 3261)),
+ Box(Box(3262, 3262), Box(3262, 3262)),
+ Box(Box(3263, 3263), Box(3263, 3263)),
+ Box(Box(3264, 3264), Box(3264, 3264)),
+ Box(Box(3265, 3265), Box(3265, 3265)),
+ Box(Box(3266, 3266), Box(3266, 3266)),
+ Box(Box(3267, 3267), Box(3267, 3267)),
+ Box(Box(3268, 3268), Box(3268, 3268)),
+ Box(Box(3269, 3269), Box(3269, 3269)),
+ Box(Box(3270, 3270), Box(3270, 3270)),
+ Box(Box(3271, 3271), Box(3271, 3271)),
+ Box(Box(3272, 3272), Box(3272, 3272)),
+ Box(Box(3273, 3273), Box(3273, 3273)),
+ Box(Box(3274, 3274), Box(3274, 3274)),
+ Box(Box(3275, 3275), Box(3275, 3275)),
+ Box(Box(3276, 3276), Box(3276, 3276)),
+ Box(Box(3277, 3277), Box(3277, 3277)),
+ Box(Box(3278, 3278), Box(3278, 3278)),
+ Box(Box(3279, 3279), Box(3279, 3279)),
+ Box(Box(3280, 3280), Box(3280, 3280)),
+ Box(Box(3281, 3281), Box(3281, 3281)),
+ Box(Box(3282, 3282), Box(3282, 3282)),
+ Box(Box(3283, 3283), Box(3283, 3283)),
+ Box(Box(3284, 3284), Box(3284, 3284)),
+ Box(Box(3285, 3285), Box(3285, 3285)),
+ Box(Box(3286, 3286), Box(3286, 3286)),
+ Box(Box(3287, 3287), Box(3287, 3287)),
+ Box(Box(3288, 3288), Box(3288, 3288)),
+ Box(Box(3289, 3289), Box(3289, 3289)),
+ Box(Box(3290, 3290), Box(3290, 3290)),
+ Box(Box(3291, 3291), Box(3291, 3291)),
+ Box(Box(3292, 3292), Box(3292, 3292)),
+ Box(Box(3293, 3293), Box(3293, 3293)),
+ Box(Box(3294, 3294), Box(3294, 3294)),
+ Box(Box(3295, 3295), Box(3295, 3295)),
+ Box(Box(3296, 3296), Box(3296, 3296)),
+ Box(Box(3297, 3297), Box(3297, 3297)),
+ Box(Box(3298, 3298), Box(3298, 3298)),
+ Box(Box(3299, 3299), Box(3299, 3299)),
+ Box(Box(3300, 3300), Box(3300, 3300)),
+ Box(Box(3301, 3301), Box(3301, 3301)),
+ Box(Box(3302, 3302), Box(3302, 3302)),
+ Box(Box(3303, 3303), Box(3303, 3303)),
+ Box(Box(3304, 3304), Box(3304, 3304)),
+ Box(Box(3305, 3305), Box(3305, 3305)),
+ Box(Box(3306, 3306), Box(3306, 3306)),
+ Box(Box(3307, 3307), Box(3307, 3307)),
+ Box(Box(3308, 3308), Box(3308, 3308)),
+ Box(Box(3309, 3309), Box(3309, 3309)),
+ Box(Box(3310, 3310), Box(3310, 3310)),
+ Box(Box(3311, 3311), Box(3311, 3311)),
+ Box(Box(3312, 3312), Box(3312, 3312)),
+ Box(Box(3313, 3313), Box(3313, 3313)),
+ Box(Box(3314, 3314), Box(3314, 3314)),
+ Box(Box(3315, 3315), Box(3315, 3315)),
+ Box(Box(3316, 3316), Box(3316, 3316)),
+ Box(Box(3317, 3317), Box(3317, 3317)),
+ Box(Box(3318, 3318), Box(3318, 3318)),
+ Box(Box(3319, 3319), Box(3319, 3319)),
+ Box(Box(3320, 3320), Box(3320, 3320)),
+ Box(Box(3321, 3321), Box(3321, 3321)),
+ Box(Box(3322, 3322), Box(3322, 3322)),
+ Box(Box(3323, 3323), Box(3323, 3323)),
+ Box(Box(3324, 3324), Box(3324, 3324)),
+ Box(Box(3325, 3325), Box(3325, 3325)),
+ Box(Box(3326, 3326), Box(3326, 3326)),
+ Box(Box(3327, 3327), Box(3327, 3327)),
+ Box(Box(3328, 3328), Box(3328, 3328)),
+ Box(Box(3329, 3329), Box(3329, 3329)),
+ Box(Box(3330, 3330), Box(3330, 3330)),
+ Box(Box(3331, 3331), Box(3331, 3331)),
+ Box(Box(3332, 3332), Box(3332, 3332)),
+ Box(Box(3333, 3333), Box(3333, 3333)),
+ Box(Box(3334, 3334), Box(3334, 3334)),
+ Box(Box(3335, 3335), Box(3335, 3335)),
+ Box(Box(3336, 3336), Box(3336, 3336)),
+ Box(Box(3337, 3337), Box(3337, 3337)),
+ Box(Box(3338, 3338), Box(3338, 3338)),
+ Box(Box(3339, 3339), Box(3339, 3339)),
+ Box(Box(3340, 3340), Box(3340, 3340)),
+ Box(Box(3341, 3341), Box(3341, 3341)),
+ Box(Box(3342, 3342), Box(3342, 3342)),
+ Box(Box(3343, 3343), Box(3343, 3343)),
+ Box(Box(3344, 3344), Box(3344, 3344)),
+ Box(Box(3345, 3345), Box(3345, 3345)),
+ Box(Box(3346, 3346), Box(3346, 3346)),
+ Box(Box(3347, 3347), Box(3347, 3347)),
+ Box(Box(3348, 3348), Box(3348, 3348)),
+ Box(Box(3349, 3349), Box(3349, 3349)),
+ Box(Box(3350, 3350), Box(3350, 3350)),
+ Box(Box(3351, 3351), Box(3351, 3351)),
+ Box(Box(3352, 3352), Box(3352, 3352)),
+ Box(Box(3353, 3353), Box(3353, 3353)),
+ Box(Box(3354, 3354), Box(3354, 3354)),
+ Box(Box(3355, 3355), Box(3355, 3355)),
+ Box(Box(3356, 3356), Box(3356, 3356)),
+ Box(Box(3357, 3357), Box(3357, 3357)),
+ Box(Box(3358, 3358), Box(3358, 3358)),
+ Box(Box(3359, 3359), Box(3359, 3359)),
+ Box(Box(3360, 3360), Box(3360, 3360)),
+ Box(Box(3361, 3361), Box(3361, 3361)),
+ Box(Box(3362, 3362), Box(3362, 3362)),
+ Box(Box(3363, 3363), Box(3363, 3363)),
+ Box(Box(3364, 3364), Box(3364, 3364)),
+ Box(Box(3365, 3365), Box(3365, 3365)),
+ Box(Box(3366, 3366), Box(3366, 3366)),
+ Box(Box(3367, 3367), Box(3367, 3367)),
+ Box(Box(3368, 3368), Box(3368, 3368)),
+ Box(Box(3369, 3369), Box(3369, 3369)),
+ Box(Box(3370, 3370), Box(3370, 3370)),
+ Box(Box(3371, 3371), Box(3371, 3371)),
+ Box(Box(3372, 3372), Box(3372, 3372)),
+ Box(Box(3373, 3373), Box(3373, 3373)),
+ Box(Box(3374, 3374), Box(3374, 3374)),
+ Box(Box(3375, 3375), Box(3375, 3375)),
+ Box(Box(3376, 3376), Box(3376, 3376)),
+ Box(Box(3377, 3377), Box(3377, 3377)),
+ Box(Box(3378, 3378), Box(3378, 3378)),
+ Box(Box(3379, 3379), Box(3379, 3379)),
+ Box(Box(3380, 3380), Box(3380, 3380)),
+ Box(Box(3381, 3381), Box(3381, 3381)),
+ Box(Box(3382, 3382), Box(3382, 3382)),
+ Box(Box(3383, 3383), Box(3383, 3383)),
+ Box(Box(3384, 3384), Box(3384, 3384)),
+ Box(Box(3385, 3385), Box(3385, 3385)),
+ Box(Box(3386, 3386), Box(3386, 3386)),
+ Box(Box(3387, 3387), Box(3387, 3387)),
+ Box(Box(3388, 3388), Box(3388, 3388)),
+ Box(Box(3389, 3389), Box(3389, 3389)),
+ Box(Box(3390, 3390), Box(3390, 3390)),
+ Box(Box(3391, 3391), Box(3391, 3391)),
+ Box(Box(3392, 3392), Box(3392, 3392)),
+ Box(Box(3393, 3393), Box(3393, 3393)),
+ Box(Box(3394, 3394), Box(3394, 3394)),
+ Box(Box(3395, 3395), Box(3395, 3395)),
+ Box(Box(3396, 3396), Box(3396, 3396)),
+ Box(Box(3397, 3397), Box(3397, 3397)),
+ Box(Box(3398, 3398), Box(3398, 3398)),
+ Box(Box(3399, 3399), Box(3399, 3399)),
+ Box(Box(3400, 3400), Box(3400, 3400)),
+ Box(Box(3401, 3401), Box(3401, 3401)),
+ Box(Box(3402, 3402), Box(3402, 3402)),
+ Box(Box(3403, 3403), Box(3403, 3403)),
+ Box(Box(3404, 3404), Box(3404, 3404)),
+ Box(Box(3405, 3405), Box(3405, 3405)),
+ Box(Box(3406, 3406), Box(3406, 3406)),
+ Box(Box(3407, 3407), Box(3407, 3407)),
+ Box(Box(3408, 3408), Box(3408, 3408)),
+ Box(Box(3409, 3409), Box(3409, 3409)),
+ Box(Box(3410, 3410), Box(3410, 3410)),
+ Box(Box(3411, 3411), Box(3411, 3411)),
+ Box(Box(3412, 3412), Box(3412, 3412)),
+ Box(Box(3413, 3413), Box(3413, 3413)),
+ Box(Box(3414, 3414), Box(3414, 3414)),
+ Box(Box(3415, 3415), Box(3415, 3415)),
+ Box(Box(3416, 3416), Box(3416, 3416)),
+ Box(Box(3417, 3417), Box(3417, 3417)),
+ Box(Box(3418, 3418), Box(3418, 3418)),
+ Box(Box(3419, 3419), Box(3419, 3419)),
+ Box(Box(3420, 3420), Box(3420, 3420)),
+ Box(Box(3421, 3421), Box(3421, 3421)),
+ Box(Box(3422, 3422), Box(3422, 3422)),
+ Box(Box(3423, 3423), Box(3423, 3423)),
+ Box(Box(3424, 3424), Box(3424, 3424)),
+ Box(Box(3425, 3425), Box(3425, 3425)),
+ Box(Box(3426, 3426), Box(3426, 3426)),
+ Box(Box(3427, 3427), Box(3427, 3427)),
+ Box(Box(3428, 3428), Box(3428, 3428)),
+ Box(Box(3429, 3429), Box(3429, 3429)),
+ Box(Box(3430, 3430), Box(3430, 3430)),
+ Box(Box(3431, 3431), Box(3431, 3431)),
+ Box(Box(3432, 3432), Box(3432, 3432)),
+ Box(Box(3433, 3433), Box(3433, 3433)),
+ Box(Box(3434, 3434), Box(3434, 3434)),
+ Box(Box(3435, 3435), Box(3435, 3435)),
+ Box(Box(3436, 3436), Box(3436, 3436)),
+ Box(Box(3437, 3437), Box(3437, 3437)),
+ Box(Box(3438, 3438), Box(3438, 3438)),
+ Box(Box(3439, 3439), Box(3439, 3439)),
+ Box(Box(3440, 3440), Box(3440, 3440)),
+ Box(Box(3441, 3441), Box(3441, 3441)),
+ Box(Box(3442, 3442), Box(3442, 3442)),
+ Box(Box(3443, 3443), Box(3443, 3443)),
+ Box(Box(3444, 3444), Box(3444, 3444)),
+ Box(Box(3445, 3445), Box(3445, 3445)),
+ Box(Box(3446, 3446), Box(3446, 3446)),
+ Box(Box(3447, 3447), Box(3447, 3447)),
+ Box(Box(3448, 3448), Box(3448, 3448)),
+ Box(Box(3449, 3449), Box(3449, 3449)),
+ Box(Box(3450, 3450), Box(3450, 3450)),
+ Box(Box(3451, 3451), Box(3451, 3451)),
+ Box(Box(3452, 3452), Box(3452, 3452)),
+ Box(Box(3453, 3453), Box(3453, 3453)),
+ Box(Box(3454, 3454), Box(3454, 3454)),
+ Box(Box(3455, 3455), Box(3455, 3455)),
+ Box(Box(3456, 3456), Box(3456, 3456)),
+ Box(Box(3457, 3457), Box(3457, 3457)),
+ Box(Box(3458, 3458), Box(3458, 3458)),
+ Box(Box(3459, 3459), Box(3459, 3459)),
+ Box(Box(3460, 3460), Box(3460, 3460)),
+ Box(Box(3461, 3461), Box(3461, 3461)),
+ Box(Box(3462, 3462), Box(3462, 3462)),
+ Box(Box(3463, 3463), Box(3463, 3463)),
+ Box(Box(3464, 3464), Box(3464, 3464)),
+ Box(Box(3465, 3465), Box(3465, 3465)),
+ Box(Box(3466, 3466), Box(3466, 3466)),
+ Box(Box(3467, 3467), Box(3467, 3467)),
+ Box(Box(3468, 3468), Box(3468, 3468)),
+ Box(Box(3469, 3469), Box(3469, 3469)),
+ Box(Box(3470, 3470), Box(3470, 3470)),
+ Box(Box(3471, 3471), Box(3471, 3471)),
+ Box(Box(3472, 3472), Box(3472, 3472)),
+ Box(Box(3473, 3473), Box(3473, 3473)),
+ Box(Box(3474, 3474), Box(3474, 3474)),
+ Box(Box(3475, 3475), Box(3475, 3475)),
+ Box(Box(3476, 3476), Box(3476, 3476)),
+ Box(Box(3477, 3477), Box(3477, 3477)),
+ Box(Box(3478, 3478), Box(3478, 3478)),
+ Box(Box(3479, 3479), Box(3479, 3479)),
+ Box(Box(3480, 3480), Box(3480, 3480)),
+ Box(Box(3481, 3481), Box(3481, 3481)),
+ Box(Box(3482, 3482), Box(3482, 3482)),
+ Box(Box(3483, 3483), Box(3483, 3483)),
+ Box(Box(3484, 3484), Box(3484, 3484)),
+ Box(Box(3485, 3485), Box(3485, 3485)),
+ Box(Box(3486, 3486), Box(3486, 3486)),
+ Box(Box(3487, 3487), Box(3487, 3487)),
+ Box(Box(3488, 3488), Box(3488, 3488)),
+ Box(Box(3489, 3489), Box(3489, 3489)),
+ Box(Box(3490, 3490), Box(3490, 3490)),
+ Box(Box(3491, 3491), Box(3491, 3491)),
+ Box(Box(3492, 3492), Box(3492, 3492)),
+ Box(Box(3493, 3493), Box(3493, 3493)),
+ Box(Box(3494, 3494), Box(3494, 3494)),
+ Box(Box(3495, 3495), Box(3495, 3495)),
+ Box(Box(3496, 3496), Box(3496, 3496)),
+ Box(Box(3497, 3497), Box(3497, 3497)),
+ Box(Box(3498, 3498), Box(3498, 3498)),
+ Box(Box(3499, 3499), Box(3499, 3499)),
+ Box(Box(3500, 3500), Box(3500, 3500)),
+ Box(Box(3501, 3501), Box(3501, 3501)),
+ Box(Box(3502, 3502), Box(3502, 3502)),
+ Box(Box(3503, 3503), Box(3503, 3503)),
+ Box(Box(3504, 3504), Box(3504, 3504)),
+ Box(Box(3505, 3505), Box(3505, 3505)),
+ Box(Box(3506, 3506), Box(3506, 3506)),
+ Box(Box(3507, 3507), Box(3507, 3507)),
+ Box(Box(3508, 3508), Box(3508, 3508)),
+ Box(Box(3509, 3509), Box(3509, 3509)),
+ Box(Box(3510, 3510), Box(3510, 3510)),
+ Box(Box(3511, 3511), Box(3511, 3511)),
+ Box(Box(3512, 3512), Box(3512, 3512)),
+ Box(Box(3513, 3513), Box(3513, 3513)),
+ Box(Box(3514, 3514), Box(3514, 3514)),
+ Box(Box(3515, 3515), Box(3515, 3515)),
+ Box(Box(3516, 3516), Box(3516, 3516)),
+ Box(Box(3517, 3517), Box(3517, 3517)),
+ Box(Box(3518, 3518), Box(3518, 3518)),
+ Box(Box(3519, 3519), Box(3519, 3519)),
+ Box(Box(3520, 3520), Box(3520, 3520)),
+ Box(Box(3521, 3521), Box(3521, 3521)),
+ Box(Box(3522, 3522), Box(3522, 3522)),
+ Box(Box(3523, 3523), Box(3523, 3523)),
+ Box(Box(3524, 3524), Box(3524, 3524)),
+ Box(Box(3525, 3525), Box(3525, 3525)),
+ Box(Box(3526, 3526), Box(3526, 3526)),
+ Box(Box(3527, 3527), Box(3527, 3527)),
+ Box(Box(3528, 3528), Box(3528, 3528)),
+ Box(Box(3529, 3529), Box(3529, 3529)),
+ Box(Box(3530, 3530), Box(3530, 3530)),
+ Box(Box(3531, 3531), Box(3531, 3531)),
+ Box(Box(3532, 3532), Box(3532, 3532)),
+ Box(Box(3533, 3533), Box(3533, 3533)),
+ Box(Box(3534, 3534), Box(3534, 3534)),
+ Box(Box(3535, 3535), Box(3535, 3535)),
+ Box(Box(3536, 3536), Box(3536, 3536)),
+ Box(Box(3537, 3537), Box(3537, 3537)),
+ Box(Box(3538, 3538), Box(3538, 3538)),
+ Box(Box(3539, 3539), Box(3539, 3539)),
+ Box(Box(3540, 3540), Box(3540, 3540)),
+ Box(Box(3541, 3541), Box(3541, 3541)),
+ Box(Box(3542, 3542), Box(3542, 3542)),
+ Box(Box(3543, 3543), Box(3543, 3543)),
+ Box(Box(3544, 3544), Box(3544, 3544)),
+ Box(Box(3545, 3545), Box(3545, 3545)),
+ Box(Box(3546, 3546), Box(3546, 3546)),
+ Box(Box(3547, 3547), Box(3547, 3547)),
+ Box(Box(3548, 3548), Box(3548, 3548)),
+ Box(Box(3549, 3549), Box(3549, 3549)),
+ Box(Box(3550, 3550), Box(3550, 3550)),
+ Box(Box(3551, 3551), Box(3551, 3551)),
+ Box(Box(3552, 3552), Box(3552, 3552)),
+ Box(Box(3553, 3553), Box(3553, 3553)),
+ Box(Box(3554, 3554), Box(3554, 3554)),
+ Box(Box(3555, 3555), Box(3555, 3555)),
+ Box(Box(3556, 3556), Box(3556, 3556)),
+ Box(Box(3557, 3557), Box(3557, 3557)),
+ Box(Box(3558, 3558), Box(3558, 3558)),
+ Box(Box(3559, 3559), Box(3559, 3559)),
+ Box(Box(3560, 3560), Box(3560, 3560)),
+ Box(Box(3561, 3561), Box(3561, 3561)),
+ Box(Box(3562, 3562), Box(3562, 3562)),
+ Box(Box(3563, 3563), Box(3563, 3563)),
+ Box(Box(3564, 3564), Box(3564, 3564)),
+ Box(Box(3565, 3565), Box(3565, 3565)),
+ Box(Box(3566, 3566), Box(3566, 3566)),
+ Box(Box(3567, 3567), Box(3567, 3567)),
+ Box(Box(3568, 3568), Box(3568, 3568)),
+ Box(Box(3569, 3569), Box(3569, 3569)),
+ Box(Box(3570, 3570), Box(3570, 3570)),
+ Box(Box(3571, 3571), Box(3571, 3571)),
+ Box(Box(3572, 3572), Box(3572, 3572)),
+ Box(Box(3573, 3573), Box(3573, 3573)),
+ Box(Box(3574, 3574), Box(3574, 3574)),
+ Box(Box(3575, 3575), Box(3575, 3575)),
+ Box(Box(3576, 3576), Box(3576, 3576)),
+ Box(Box(3577, 3577), Box(3577, 3577)),
+ Box(Box(3578, 3578), Box(3578, 3578)),
+ Box(Box(3579, 3579), Box(3579, 3579)),
+ Box(Box(3580, 3580), Box(3580, 3580)),
+ Box(Box(3581, 3581), Box(3581, 3581)),
+ Box(Box(3582, 3582), Box(3582, 3582)),
+ Box(Box(3583, 3583), Box(3583, 3583)),
+ Box(Box(3584, 3584), Box(3584, 3584)),
+ Box(Box(3585, 3585), Box(3585, 3585)),
+ Box(Box(3586, 3586), Box(3586, 3586)),
+ Box(Box(3587, 3587), Box(3587, 3587)),
+ Box(Box(3588, 3588), Box(3588, 3588)),
+ Box(Box(3589, 3589), Box(3589, 3589)),
+ Box(Box(3590, 3590), Box(3590, 3590)),
+ Box(Box(3591, 3591), Box(3591, 3591)),
+ Box(Box(3592, 3592), Box(3592, 3592)),
+ Box(Box(3593, 3593), Box(3593, 3593)),
+ Box(Box(3594, 3594), Box(3594, 3594)),
+ Box(Box(3595, 3595), Box(3595, 3595)),
+ Box(Box(3596, 3596), Box(3596, 3596)),
+ Box(Box(3597, 3597), Box(3597, 3597)),
+ Box(Box(3598, 3598), Box(3598, 3598)),
+ Box(Box(3599, 3599), Box(3599, 3599)),
+ Box(Box(3600, 3600), Box(3600, 3600)),
+ Box(Box(3601, 3601), Box(3601, 3601)),
+ Box(Box(3602, 3602), Box(3602, 3602)),
+ Box(Box(3603, 3603), Box(3603, 3603)),
+ Box(Box(3604, 3604), Box(3604, 3604)),
+ Box(Box(3605, 3605), Box(3605, 3605)),
+ Box(Box(3606, 3606), Box(3606, 3606)),
+ Box(Box(3607, 3607), Box(3607, 3607)),
+ Box(Box(3608, 3608), Box(3608, 3608)),
+ Box(Box(3609, 3609), Box(3609, 3609)),
+ Box(Box(3610, 3610), Box(3610, 3610)),
+ Box(Box(3611, 3611), Box(3611, 3611)),
+ Box(Box(3612, 3612), Box(3612, 3612)),
+ Box(Box(3613, 3613), Box(3613, 3613)),
+ Box(Box(3614, 3614), Box(3614, 3614)),
+ Box(Box(3615, 3615), Box(3615, 3615)),
+ Box(Box(3616, 3616), Box(3616, 3616)),
+ Box(Box(3617, 3617), Box(3617, 3617)),
+ Box(Box(3618, 3618), Box(3618, 3618)),
+ Box(Box(3619, 3619), Box(3619, 3619)),
+ Box(Box(3620, 3620), Box(3620, 3620)),
+ Box(Box(3621, 3621), Box(3621, 3621)),
+ Box(Box(3622, 3622), Box(3622, 3622)),
+ Box(Box(3623, 3623), Box(3623, 3623)),
+ Box(Box(3624, 3624), Box(3624, 3624)),
+ Box(Box(3625, 3625), Box(3625, 3625)),
+ Box(Box(3626, 3626), Box(3626, 3626)),
+ Box(Box(3627, 3627), Box(3627, 3627)),
+ Box(Box(3628, 3628), Box(3628, 3628)),
+ Box(Box(3629, 3629), Box(3629, 3629)),
+ Box(Box(3630, 3630), Box(3630, 3630)),
+ Box(Box(3631, 3631), Box(3631, 3631)),
+ Box(Box(3632, 3632), Box(3632, 3632)),
+ Box(Box(3633, 3633), Box(3633, 3633)),
+ Box(Box(3634, 3634), Box(3634, 3634)),
+ Box(Box(3635, 3635), Box(3635, 3635)),
+ Box(Box(3636, 3636), Box(3636, 3636)),
+ Box(Box(3637, 3637), Box(3637, 3637)),
+ Box(Box(3638, 3638), Box(3638, 3638)),
+ Box(Box(3639, 3639), Box(3639, 3639)),
+ Box(Box(3640, 3640), Box(3640, 3640)),
+ Box(Box(3641, 3641), Box(3641, 3641)),
+ Box(Box(3642, 3642), Box(3642, 3642)),
+ Box(Box(3643, 3643), Box(3643, 3643)),
+ Box(Box(3644, 3644), Box(3644, 3644)),
+ Box(Box(3645, 3645), Box(3645, 3645)),
+ Box(Box(3646, 3646), Box(3646, 3646)),
+ Box(Box(3647, 3647), Box(3647, 3647)),
+ Box(Box(3648, 3648), Box(3648, 3648)),
+ Box(Box(3649, 3649), Box(3649, 3649)),
+ Box(Box(3650, 3650), Box(3650, 3650)),
+ Box(Box(3651, 3651), Box(3651, 3651)),
+ Box(Box(3652, 3652), Box(3652, 3652)),
+ Box(Box(3653, 3653), Box(3653, 3653)),
+ Box(Box(3654, 3654), Box(3654, 3654)),
+ Box(Box(3655, 3655), Box(3655, 3655)),
+ Box(Box(3656, 3656), Box(3656, 3656)),
+ Box(Box(3657, 3657), Box(3657, 3657)),
+ Box(Box(3658, 3658), Box(3658, 3658)),
+ Box(Box(3659, 3659), Box(3659, 3659)),
+ Box(Box(3660, 3660), Box(3660, 3660)),
+ Box(Box(3661, 3661), Box(3661, 3661)),
+ Box(Box(3662, 3662), Box(3662, 3662)),
+ Box(Box(3663, 3663), Box(3663, 3663)),
+ Box(Box(3664, 3664), Box(3664, 3664)),
+ Box(Box(3665, 3665), Box(3665, 3665)),
+ Box(Box(3666, 3666), Box(3666, 3666)),
+ Box(Box(3667, 3667), Box(3667, 3667)),
+ Box(Box(3668, 3668), Box(3668, 3668)),
+ Box(Box(3669, 3669), Box(3669, 3669)),
+ Box(Box(3670, 3670), Box(3670, 3670)),
+ Box(Box(3671, 3671), Box(3671, 3671)),
+ Box(Box(3672, 3672), Box(3672, 3672)),
+ Box(Box(3673, 3673), Box(3673, 3673)),
+ Box(Box(3674, 3674), Box(3674, 3674)),
+ Box(Box(3675, 3675), Box(3675, 3675)),
+ Box(Box(3676, 3676), Box(3676, 3676)),
+ Box(Box(3677, 3677), Box(3677, 3677)),
+ Box(Box(3678, 3678), Box(3678, 3678)),
+ Box(Box(3679, 3679), Box(3679, 3679)),
+ Box(Box(3680, 3680), Box(3680, 3680)),
+ Box(Box(3681, 3681), Box(3681, 3681)),
+ Box(Box(3682, 3682), Box(3682, 3682)),
+ Box(Box(3683, 3683), Box(3683, 3683)),
+ Box(Box(3684, 3684), Box(3684, 3684)),
+ Box(Box(3685, 3685), Box(3685, 3685)),
+ Box(Box(3686, 3686), Box(3686, 3686)),
+ Box(Box(3687, 3687), Box(3687, 3687)),
+ Box(Box(3688, 3688), Box(3688, 3688)),
+ Box(Box(3689, 3689), Box(3689, 3689)),
+ Box(Box(3690, 3690), Box(3690, 3690)),
+ Box(Box(3691, 3691), Box(3691, 3691)),
+ Box(Box(3692, 3692), Box(3692, 3692)),
+ Box(Box(3693, 3693), Box(3693, 3693)),
+ Box(Box(3694, 3694), Box(3694, 3694)),
+ Box(Box(3695, 3695), Box(3695, 3695)),
+ Box(Box(3696, 3696), Box(3696, 3696)),
+ Box(Box(3697, 3697), Box(3697, 3697)),
+ Box(Box(3698, 3698), Box(3698, 3698)),
+ Box(Box(3699, 3699), Box(3699, 3699)),
+ Box(Box(3700, 3700), Box(3700, 3700)),
+ Box(Box(3701, 3701), Box(3701, 3701)),
+ Box(Box(3702, 3702), Box(3702, 3702)),
+ Box(Box(3703, 3703), Box(3703, 3703)),
+ Box(Box(3704, 3704), Box(3704, 3704)),
+ Box(Box(3705, 3705), Box(3705, 3705)),
+ Box(Box(3706, 3706), Box(3706, 3706)),
+ Box(Box(3707, 3707), Box(3707, 3707)),
+ Box(Box(3708, 3708), Box(3708, 3708)),
+ Box(Box(3709, 3709), Box(3709, 3709)),
+ Box(Box(3710, 3710), Box(3710, 3710)),
+ Box(Box(3711, 3711), Box(3711, 3711)),
+ Box(Box(3712, 3712), Box(3712, 3712)),
+ Box(Box(3713, 3713), Box(3713, 3713)),
+ Box(Box(3714, 3714), Box(3714, 3714)),
+ Box(Box(3715, 3715), Box(3715, 3715)),
+ Box(Box(3716, 3716), Box(3716, 3716)),
+ Box(Box(3717, 3717), Box(3717, 3717)),
+ Box(Box(3718, 3718), Box(3718, 3718)),
+ Box(Box(3719, 3719), Box(3719, 3719)),
+ Box(Box(3720, 3720), Box(3720, 3720)),
+ Box(Box(3721, 3721), Box(3721, 3721)),
+ Box(Box(3722, 3722), Box(3722, 3722)),
+ Box(Box(3723, 3723), Box(3723, 3723)),
+ Box(Box(3724, 3724), Box(3724, 3724)),
+ Box(Box(3725, 3725), Box(3725, 3725)),
+ Box(Box(3726, 3726), Box(3726, 3726)),
+ Box(Box(3727, 3727), Box(3727, 3727)),
+ Box(Box(3728, 3728), Box(3728, 3728)),
+ Box(Box(3729, 3729), Box(3729, 3729)),
+ Box(Box(3730, 3730), Box(3730, 3730)),
+ Box(Box(3731, 3731), Box(3731, 3731)),
+ Box(Box(3732, 3732), Box(3732, 3732)),
+ Box(Box(3733, 3733), Box(3733, 3733)),
+ Box(Box(3734, 3734), Box(3734, 3734)),
+ Box(Box(3735, 3735), Box(3735, 3735)),
+ Box(Box(3736, 3736), Box(3736, 3736)),
+ Box(Box(3737, 3737), Box(3737, 3737)),
+ Box(Box(3738, 3738), Box(3738, 3738)),
+ Box(Box(3739, 3739), Box(3739, 3739)),
+ Box(Box(3740, 3740), Box(3740, 3740)),
+ Box(Box(3741, 3741), Box(3741, 3741)),
+ Box(Box(3742, 3742), Box(3742, 3742)),
+ Box(Box(3743, 3743), Box(3743, 3743)),
+ Box(Box(3744, 3744), Box(3744, 3744)),
+ Box(Box(3745, 3745), Box(3745, 3745)),
+ Box(Box(3746, 3746), Box(3746, 3746)),
+ Box(Box(3747, 3747), Box(3747, 3747)),
+ Box(Box(3748, 3748), Box(3748, 3748)),
+ Box(Box(3749, 3749), Box(3749, 3749)),
+ Box(Box(3750, 3750), Box(3750, 3750)),
+ Box(Box(3751, 3751), Box(3751, 3751)),
+ Box(Box(3752, 3752), Box(3752, 3752)),
+ Box(Box(3753, 3753), Box(3753, 3753)),
+ Box(Box(3754, 3754), Box(3754, 3754)),
+ Box(Box(3755, 3755), Box(3755, 3755)),
+ Box(Box(3756, 3756), Box(3756, 3756)),
+ Box(Box(3757, 3757), Box(3757, 3757)),
+ Box(Box(3758, 3758), Box(3758, 3758)),
+ Box(Box(3759, 3759), Box(3759, 3759)),
+ Box(Box(3760, 3760), Box(3760, 3760)),
+ Box(Box(3761, 3761), Box(3761, 3761)),
+ Box(Box(3762, 3762), Box(3762, 3762)),
+ Box(Box(3763, 3763), Box(3763, 3763)),
+ Box(Box(3764, 3764), Box(3764, 3764)),
+ Box(Box(3765, 3765), Box(3765, 3765)),
+ Box(Box(3766, 3766), Box(3766, 3766)),
+ Box(Box(3767, 3767), Box(3767, 3767)),
+ Box(Box(3768, 3768), Box(3768, 3768)),
+ Box(Box(3769, 3769), Box(3769, 3769)),
+ Box(Box(3770, 3770), Box(3770, 3770)),
+ Box(Box(3771, 3771), Box(3771, 3771)),
+ Box(Box(3772, 3772), Box(3772, 3772)),
+ Box(Box(3773, 3773), Box(3773, 3773)),
+ Box(Box(3774, 3774), Box(3774, 3774)),
+ Box(Box(3775, 3775), Box(3775, 3775)),
+ Box(Box(3776, 3776), Box(3776, 3776)),
+ Box(Box(3777, 3777), Box(3777, 3777)),
+ Box(Box(3778, 3778), Box(3778, 3778)),
+ Box(Box(3779, 3779), Box(3779, 3779)),
+ Box(Box(3780, 3780), Box(3780, 3780)),
+ Box(Box(3781, 3781), Box(3781, 3781)),
+ Box(Box(3782, 3782), Box(3782, 3782)),
+ Box(Box(3783, 3783), Box(3783, 3783)),
+ Box(Box(3784, 3784), Box(3784, 3784)),
+ Box(Box(3785, 3785), Box(3785, 3785)),
+ Box(Box(3786, 3786), Box(3786, 3786)),
+ Box(Box(3787, 3787), Box(3787, 3787)),
+ Box(Box(3788, 3788), Box(3788, 3788)),
+ Box(Box(3789, 3789), Box(3789, 3789)),
+ Box(Box(3790, 3790), Box(3790, 3790)),
+ Box(Box(3791, 3791), Box(3791, 3791)),
+ Box(Box(3792, 3792), Box(3792, 3792)),
+ Box(Box(3793, 3793), Box(3793, 3793)),
+ Box(Box(3794, 3794), Box(3794, 3794)),
+ Box(Box(3795, 3795), Box(3795, 3795)),
+ Box(Box(3796, 3796), Box(3796, 3796)),
+ Box(Box(3797, 3797), Box(3797, 3797)),
+ Box(Box(3798, 3798), Box(3798, 3798)),
+ Box(Box(3799, 3799), Box(3799, 3799)),
+ Box(Box(3800, 3800), Box(3800, 3800)),
+ Box(Box(3801, 3801), Box(3801, 3801)),
+ Box(Box(3802, 3802), Box(3802, 3802)),
+ Box(Box(3803, 3803), Box(3803, 3803)),
+ Box(Box(3804, 3804), Box(3804, 3804)),
+ Box(Box(3805, 3805), Box(3805, 3805)),
+ Box(Box(3806, 3806), Box(3806, 3806)),
+ Box(Box(3807, 3807), Box(3807, 3807)),
+ Box(Box(3808, 3808), Box(3808, 3808)),
+ Box(Box(3809, 3809), Box(3809, 3809)),
+ Box(Box(3810, 3810), Box(3810, 3810)),
+ Box(Box(3811, 3811), Box(3811, 3811)),
+ Box(Box(3812, 3812), Box(3812, 3812)),
+ Box(Box(3813, 3813), Box(3813, 3813)),
+ Box(Box(3814, 3814), Box(3814, 3814)),
+ Box(Box(3815, 3815), Box(3815, 3815)),
+ Box(Box(3816, 3816), Box(3816, 3816)),
+ Box(Box(3817, 3817), Box(3817, 3817)),
+ Box(Box(3818, 3818), Box(3818, 3818)),
+ Box(Box(3819, 3819), Box(3819, 3819)),
+ Box(Box(3820, 3820), Box(3820, 3820)),
+ Box(Box(3821, 3821), Box(3821, 3821)),
+ Box(Box(3822, 3822), Box(3822, 3822)),
+ Box(Box(3823, 3823), Box(3823, 3823)),
+ Box(Box(3824, 3824), Box(3824, 3824)),
+ Box(Box(3825, 3825), Box(3825, 3825)),
+ Box(Box(3826, 3826), Box(3826, 3826)),
+ Box(Box(3827, 3827), Box(3827, 3827)),
+ Box(Box(3828, 3828), Box(3828, 3828)),
+ Box(Box(3829, 3829), Box(3829, 3829)),
+ Box(Box(3830, 3830), Box(3830, 3830)),
+ Box(Box(3831, 3831), Box(3831, 3831)),
+ Box(Box(3832, 3832), Box(3832, 3832)),
+ Box(Box(3833, 3833), Box(3833, 3833)),
+ Box(Box(3834, 3834), Box(3834, 3834)),
+ Box(Box(3835, 3835), Box(3835, 3835)),
+ Box(Box(3836, 3836), Box(3836, 3836)),
+ Box(Box(3837, 3837), Box(3837, 3837)),
+ Box(Box(3838, 3838), Box(3838, 3838)),
+ Box(Box(3839, 3839), Box(3839, 3839)),
+ Box(Box(3840, 3840), Box(3840, 3840)),
+ Box(Box(3841, 3841), Box(3841, 3841)),
+ Box(Box(3842, 3842), Box(3842, 3842)),
+ Box(Box(3843, 3843), Box(3843, 3843)),
+ Box(Box(3844, 3844), Box(3844, 3844)),
+ Box(Box(3845, 3845), Box(3845, 3845)),
+ Box(Box(3846, 3846), Box(3846, 3846)),
+ Box(Box(3847, 3847), Box(3847, 3847)),
+ Box(Box(3848, 3848), Box(3848, 3848)),
+ Box(Box(3849, 3849), Box(3849, 3849)),
+ Box(Box(3850, 3850), Box(3850, 3850)),
+ Box(Box(3851, 3851), Box(3851, 3851)),
+ Box(Box(3852, 3852), Box(3852, 3852)),
+ Box(Box(3853, 3853), Box(3853, 3853)),
+ Box(Box(3854, 3854), Box(3854, 3854)),
+ Box(Box(3855, 3855), Box(3855, 3855)),
+ Box(Box(3856, 3856), Box(3856, 3856)),
+ Box(Box(3857, 3857), Box(3857, 3857)),
+ Box(Box(3858, 3858), Box(3858, 3858)),
+ Box(Box(3859, 3859), Box(3859, 3859)),
+ Box(Box(3860, 3860), Box(3860, 3860)),
+ Box(Box(3861, 3861), Box(3861, 3861)),
+ Box(Box(3862, 3862), Box(3862, 3862)),
+ Box(Box(3863, 3863), Box(3863, 3863)),
+ Box(Box(3864, 3864), Box(3864, 3864)),
+ Box(Box(3865, 3865), Box(3865, 3865)),
+ Box(Box(3866, 3866), Box(3866, 3866)),
+ Box(Box(3867, 3867), Box(3867, 3867)),
+ Box(Box(3868, 3868), Box(3868, 3868)),
+ Box(Box(3869, 3869), Box(3869, 3869)),
+ Box(Box(3870, 3870), Box(3870, 3870)),
+ Box(Box(3871, 3871), Box(3871, 3871)),
+ Box(Box(3872, 3872), Box(3872, 3872)),
+ Box(Box(3873, 3873), Box(3873, 3873)),
+ Box(Box(3874, 3874), Box(3874, 3874)),
+ Box(Box(3875, 3875), Box(3875, 3875)),
+ Box(Box(3876, 3876), Box(3876, 3876)),
+ Box(Box(3877, 3877), Box(3877, 3877)),
+ Box(Box(3878, 3878), Box(3878, 3878)),
+ Box(Box(3879, 3879), Box(3879, 3879)),
+ Box(Box(3880, 3880), Box(3880, 3880)),
+ Box(Box(3881, 3881), Box(3881, 3881)),
+ Box(Box(3882, 3882), Box(3882, 3882)),
+ Box(Box(3883, 3883), Box(3883, 3883)),
+ Box(Box(3884, 3884), Box(3884, 3884)),
+ Box(Box(3885, 3885), Box(3885, 3885)),
+ Box(Box(3886, 3886), Box(3886, 3886)),
+ Box(Box(3887, 3887), Box(3887, 3887)),
+ Box(Box(3888, 3888), Box(3888, 3888)),
+ Box(Box(3889, 3889), Box(3889, 3889)),
+ Box(Box(3890, 3890), Box(3890, 3890)),
+ Box(Box(3891, 3891), Box(3891, 3891)),
+ Box(Box(3892, 3892), Box(3892, 3892)),
+ Box(Box(3893, 3893), Box(3893, 3893)),
+ Box(Box(3894, 3894), Box(3894, 3894)),
+ Box(Box(3895, 3895), Box(3895, 3895)),
+ Box(Box(3896, 3896), Box(3896, 3896)),
+ Box(Box(3897, 3897), Box(3897, 3897)),
+ Box(Box(3898, 3898), Box(3898, 3898)),
+ Box(Box(3899, 3899), Box(3899, 3899)),
+ Box(Box(3900, 3900), Box(3900, 3900)),
+ Box(Box(3901, 3901), Box(3901, 3901)),
+ Box(Box(3902, 3902), Box(3902, 3902)),
+ Box(Box(3903, 3903), Box(3903, 3903)),
+ Box(Box(3904, 3904), Box(3904, 3904)),
+ Box(Box(3905, 3905), Box(3905, 3905)),
+ Box(Box(3906, 3906), Box(3906, 3906)),
+ Box(Box(3907, 3907), Box(3907, 3907)),
+ Box(Box(3908, 3908), Box(3908, 3908)),
+ Box(Box(3909, 3909), Box(3909, 3909)),
+ Box(Box(3910, 3910), Box(3910, 3910)),
+ Box(Box(3911, 3911), Box(3911, 3911)),
+ Box(Box(3912, 3912), Box(3912, 3912)),
+ Box(Box(3913, 3913), Box(3913, 3913)),
+ Box(Box(3914, 3914), Box(3914, 3914)),
+ Box(Box(3915, 3915), Box(3915, 3915)),
+ Box(Box(3916, 3916), Box(3916, 3916)),
+ Box(Box(3917, 3917), Box(3917, 3917)),
+ Box(Box(3918, 3918), Box(3918, 3918)),
+ Box(Box(3919, 3919), Box(3919, 3919)),
+ Box(Box(3920, 3920), Box(3920, 3920)),
+ Box(Box(3921, 3921), Box(3921, 3921)),
+ Box(Box(3922, 3922), Box(3922, 3922)),
+ Box(Box(3923, 3923), Box(3923, 3923)),
+ Box(Box(3924, 3924), Box(3924, 3924)),
+ Box(Box(3925, 3925), Box(3925, 3925)),
+ Box(Box(3926, 3926), Box(3926, 3926)),
+ Box(Box(3927, 3927), Box(3927, 3927)),
+ Box(Box(3928, 3928), Box(3928, 3928)),
+ Box(Box(3929, 3929), Box(3929, 3929)),
+ Box(Box(3930, 3930), Box(3930, 3930)),
+ Box(Box(3931, 3931), Box(3931, 3931)),
+ Box(Box(3932, 3932), Box(3932, 3932)),
+ Box(Box(3933, 3933), Box(3933, 3933)),
+ Box(Box(3934, 3934), Box(3934, 3934)),
+ Box(Box(3935, 3935), Box(3935, 3935)),
+ Box(Box(3936, 3936), Box(3936, 3936)),
+ Box(Box(3937, 3937), Box(3937, 3937)),
+ Box(Box(3938, 3938), Box(3938, 3938)),
+ Box(Box(3939, 3939), Box(3939, 3939)),
+ Box(Box(3940, 3940), Box(3940, 3940)),
+ Box(Box(3941, 3941), Box(3941, 3941)),
+ Box(Box(3942, 3942), Box(3942, 3942)),
+ Box(Box(3943, 3943), Box(3943, 3943)),
+ Box(Box(3944, 3944), Box(3944, 3944)),
+ Box(Box(3945, 3945), Box(3945, 3945)),
+ Box(Box(3946, 3946), Box(3946, 3946)),
+ Box(Box(3947, 3947), Box(3947, 3947)),
+ Box(Box(3948, 3948), Box(3948, 3948)),
+ Box(Box(3949, 3949), Box(3949, 3949)),
+ Box(Box(3950, 3950), Box(3950, 3950)),
+ Box(Box(3951, 3951), Box(3951, 3951)),
+ Box(Box(3952, 3952), Box(3952, 3952)),
+ Box(Box(3953, 3953), Box(3953, 3953)),
+ Box(Box(3954, 3954), Box(3954, 3954)),
+ Box(Box(3955, 3955), Box(3955, 3955)),
+ Box(Box(3956, 3956), Box(3956, 3956)),
+ Box(Box(3957, 3957), Box(3957, 3957)),
+ Box(Box(3958, 3958), Box(3958, 3958)),
+ Box(Box(3959, 3959), Box(3959, 3959)),
+ Box(Box(3960, 3960), Box(3960, 3960)),
+ Box(Box(3961, 3961), Box(3961, 3961)),
+ Box(Box(3962, 3962), Box(3962, 3962)),
+ Box(Box(3963, 3963), Box(3963, 3963)),
+ Box(Box(3964, 3964), Box(3964, 3964)),
+ Box(Box(3965, 3965), Box(3965, 3965)),
+ Box(Box(3966, 3966), Box(3966, 3966)),
+ Box(Box(3967, 3967), Box(3967, 3967)),
+ Box(Box(3968, 3968), Box(3968, 3968)),
+ Box(Box(3969, 3969), Box(3969, 3969)),
+ Box(Box(3970, 3970), Box(3970, 3970)),
+ Box(Box(3971, 3971), Box(3971, 3971)),
+ Box(Box(3972, 3972), Box(3972, 3972)),
+ Box(Box(3973, 3973), Box(3973, 3973)),
+ Box(Box(3974, 3974), Box(3974, 3974)),
+ Box(Box(3975, 3975), Box(3975, 3975)),
+ Box(Box(3976, 3976), Box(3976, 3976)),
+ Box(Box(3977, 3977), Box(3977, 3977)),
+ Box(Box(3978, 3978), Box(3978, 3978)),
+ Box(Box(3979, 3979), Box(3979, 3979)),
+ Box(Box(3980, 3980), Box(3980, 3980)),
+ Box(Box(3981, 3981), Box(3981, 3981)),
+ Box(Box(3982, 3982), Box(3982, 3982)),
+ Box(Box(3983, 3983), Box(3983, 3983)),
+ Box(Box(3984, 3984), Box(3984, 3984)),
+ Box(Box(3985, 3985), Box(3985, 3985)),
+ Box(Box(3986, 3986), Box(3986, 3986)),
+ Box(Box(3987, 3987), Box(3987, 3987)),
+ Box(Box(3988, 3988), Box(3988, 3988)),
+ Box(Box(3989, 3989), Box(3989, 3989)),
+ Box(Box(3990, 3990), Box(3990, 3990)),
+ Box(Box(3991, 3991), Box(3991, 3991)),
+ Box(Box(3992, 3992), Box(3992, 3992)),
+ Box(Box(3993, 3993), Box(3993, 3993)),
+ Box(Box(3994, 3994), Box(3994, 3994)),
+ Box(Box(3995, 3995), Box(3995, 3995)),
+ Box(Box(3996, 3996), Box(3996, 3996)),
+ Box(Box(3997, 3997), Box(3997, 3997)),
+ Box(Box(3998, 3998), Box(3998, 3998)),
+ Box(Box(3999, 3999), Box(3999, 3999)),
+ Box(Box(4000, 4000), Box(4000, 4000)),
+ Box(Box(4001, 4001), Box(4001, 4001)),
+ Box(Box(4002, 4002), Box(4002, 4002)),
+ Box(Box(4003, 4003), Box(4003, 4003)),
+ Box(Box(4004, 4004), Box(4004, 4004)),
+ Box(Box(4005, 4005), Box(4005, 4005)),
+ Box(Box(4006, 4006), Box(4006, 4006)),
+ Box(Box(4007, 4007), Box(4007, 4007)),
+ Box(Box(4008, 4008), Box(4008, 4008)),
+ Box(Box(4009, 4009), Box(4009, 4009)),
+ Box(Box(4010, 4010), Box(4010, 4010)),
+ Box(Box(4011, 4011), Box(4011, 4011)),
+ Box(Box(4012, 4012), Box(4012, 4012)),
+ Box(Box(4013, 4013), Box(4013, 4013)),
+ Box(Box(4014, 4014), Box(4014, 4014)),
+ Box(Box(4015, 4015), Box(4015, 4015)),
+ Box(Box(4016, 4016), Box(4016, 4016)),
+ Box(Box(4017, 4017), Box(4017, 4017)),
+ Box(Box(4018, 4018), Box(4018, 4018)),
+ Box(Box(4019, 4019), Box(4019, 4019)),
+ Box(Box(4020, 4020), Box(4020, 4020)),
+ Box(Box(4021, 4021), Box(4021, 4021)),
+ Box(Box(4022, 4022), Box(4022, 4022)),
+ Box(Box(4023, 4023), Box(4023, 4023)),
+ Box(Box(4024, 4024), Box(4024, 4024)),
+ Box(Box(4025, 4025), Box(4025, 4025)),
+ Box(Box(4026, 4026), Box(4026, 4026)),
+ Box(Box(4027, 4027), Box(4027, 4027)),
+ Box(Box(4028, 4028), Box(4028, 4028)),
+ Box(Box(4029, 4029), Box(4029, 4029)),
+ Box(Box(4030, 4030), Box(4030, 4030)),
+ Box(Box(4031, 4031), Box(4031, 4031)),
+ Box(Box(4032, 4032), Box(4032, 4032)),
+ Box(Box(4033, 4033), Box(4033, 4033)),
+ Box(Box(4034, 4034), Box(4034, 4034)),
+ Box(Box(4035, 4035), Box(4035, 4035)),
+ Box(Box(4036, 4036), Box(4036, 4036)),
+ Box(Box(4037, 4037), Box(4037, 4037)),
+ Box(Box(4038, 4038), Box(4038, 4038)),
+ Box(Box(4039, 4039), Box(4039, 4039)),
+ Box(Box(4040, 4040), Box(4040, 4040)),
+ Box(Box(4041, 4041), Box(4041, 4041)),
+ Box(Box(4042, 4042), Box(4042, 4042)),
+ Box(Box(4043, 4043), Box(4043, 4043)),
+ Box(Box(4044, 4044), Box(4044, 4044)),
+ Box(Box(4045, 4045), Box(4045, 4045)),
+ Box(Box(4046, 4046), Box(4046, 4046)),
+ Box(Box(4047, 4047), Box(4047, 4047)),
+ Box(Box(4048, 4048), Box(4048, 4048)),
+ Box(Box(4049, 4049), Box(4049, 4049)),
+ Box(Box(4050, 4050), Box(4050, 4050)),
+ Box(Box(4051, 4051), Box(4051, 4051)),
+ Box(Box(4052, 4052), Box(4052, 4052)),
+ Box(Box(4053, 4053), Box(4053, 4053)),
+ Box(Box(4054, 4054), Box(4054, 4054)),
+ Box(Box(4055, 4055), Box(4055, 4055)),
+ Box(Box(4056, 4056), Box(4056, 4056)),
+ Box(Box(4057, 4057), Box(4057, 4057)),
+ Box(Box(4058, 4058), Box(4058, 4058)),
+ Box(Box(4059, 4059), Box(4059, 4059)),
+ Box(Box(4060, 4060), Box(4060, 4060)),
+ Box(Box(4061, 4061), Box(4061, 4061)),
+ Box(Box(4062, 4062), Box(4062, 4062)),
+ Box(Box(4063, 4063), Box(4063, 4063)),
+ Box(Box(4064, 4064), Box(4064, 4064)),
+ Box(Box(4065, 4065), Box(4065, 4065)),
+ Box(Box(4066, 4066), Box(4066, 4066)),
+ Box(Box(4067, 4067), Box(4067, 4067)),
+ Box(Box(4068, 4068), Box(4068, 4068)),
+ Box(Box(4069, 4069), Box(4069, 4069)),
+ Box(Box(4070, 4070), Box(4070, 4070)),
+ Box(Box(4071, 4071), Box(4071, 4071)),
+ Box(Box(4072, 4072), Box(4072, 4072)),
+ Box(Box(4073, 4073), Box(4073, 4073)),
+ Box(Box(4074, 4074), Box(4074, 4074)),
+ Box(Box(4075, 4075), Box(4075, 4075)),
+ Box(Box(4076, 4076), Box(4076, 4076)),
+ Box(Box(4077, 4077), Box(4077, 4077)),
+ Box(Box(4078, 4078), Box(4078, 4078)),
+ Box(Box(4079, 4079), Box(4079, 4079)),
+ Box(Box(4080, 4080), Box(4080, 4080)),
+ Box(Box(4081, 4081), Box(4081, 4081)),
+ Box(Box(4082, 4082), Box(4082, 4082)),
+ Box(Box(4083, 4083), Box(4083, 4083)),
+ Box(Box(4084, 4084), Box(4084, 4084)),
+ Box(Box(4085, 4085), Box(4085, 4085)),
+ Box(Box(4086, 4086), Box(4086, 4086)),
+ Box(Box(4087, 4087), Box(4087, 4087)),
+ Box(Box(4088, 4088), Box(4088, 4088)),
+ Box(Box(4089, 4089), Box(4089, 4089)),
+ Box(Box(4090, 4090), Box(4090, 4090)),
+ Box(Box(4091, 4091), Box(4091, 4091)),
+ Box(Box(4092, 4092), Box(4092, 4092)),
+ Box(Box(4093, 4093), Box(4093, 4093)),
+ Box(Box(4094, 4094), Box(4094, 4094)),
+ Box(Box(4095, 4095), Box(4095, 4095)),
+ Box(Box(4096, 4096), Box(4096, 4096)),
+ Box(Box(4097, 4097), Box(4097, 4097)),
+ Box(Box(4098, 4098), Box(4098, 4098)),
+ Box(Box(4099, 4099), Box(4099, 4099)),
+ Box(Box(4100, 4100), Box(4100, 4100)),
+ Box(Box(4101, 4101), Box(4101, 4101)),
+ Box(Box(4102, 4102), Box(4102, 4102)),
+ Box(Box(4103, 4103), Box(4103, 4103)),
+ Box(Box(4104, 4104), Box(4104, 4104)),
+ Box(Box(4105, 4105), Box(4105, 4105)),
+ Box(Box(4106, 4106), Box(4106, 4106)),
+ Box(Box(4107, 4107), Box(4107, 4107)),
+ Box(Box(4108, 4108), Box(4108, 4108)),
+ Box(Box(4109, 4109), Box(4109, 4109)),
+ Box(Box(4110, 4110), Box(4110, 4110)),
+ Box(Box(4111, 4111), Box(4111, 4111)),
+ Box(Box(4112, 4112), Box(4112, 4112)),
+ Box(Box(4113, 4113), Box(4113, 4113)),
+ Box(Box(4114, 4114), Box(4114, 4114)),
+ Box(Box(4115, 4115), Box(4115, 4115)),
+ Box(Box(4116, 4116), Box(4116, 4116)),
+ Box(Box(4117, 4117), Box(4117, 4117)),
+ Box(Box(4118, 4118), Box(4118, 4118)),
+ Box(Box(4119, 4119), Box(4119, 4119)),
+ Box(Box(4120, 4120), Box(4120, 4120)),
+ Box(Box(4121, 4121), Box(4121, 4121)),
+ Box(Box(4122, 4122), Box(4122, 4122)),
+ Box(Box(4123, 4123), Box(4123, 4123)),
+ Box(Box(4124, 4124), Box(4124, 4124)),
+ Box(Box(4125, 4125), Box(4125, 4125)),
+ Box(Box(4126, 4126), Box(4126, 4126)),
+ Box(Box(4127, 4127), Box(4127, 4127)),
+ Box(Box(4128, 4128), Box(4128, 4128)),
+ Box(Box(4129, 4129), Box(4129, 4129)),
+ Box(Box(4130, 4130), Box(4130, 4130)),
+ Box(Box(4131, 4131), Box(4131, 4131)),
+ Box(Box(4132, 4132), Box(4132, 4132)),
+ Box(Box(4133, 4133), Box(4133, 4133)),
+ Box(Box(4134, 4134), Box(4134, 4134)),
+ Box(Box(4135, 4135), Box(4135, 4135)),
+ Box(Box(4136, 4136), Box(4136, 4136)),
+ Box(Box(4137, 4137), Box(4137, 4137)),
+ Box(Box(4138, 4138), Box(4138, 4138)),
+ Box(Box(4139, 4139), Box(4139, 4139)),
+ Box(Box(4140, 4140), Box(4140, 4140)),
+ Box(Box(4141, 4141), Box(4141, 4141)),
+ Box(Box(4142, 4142), Box(4142, 4142)),
+ Box(Box(4143, 4143), Box(4143, 4143)),
+ Box(Box(4144, 4144), Box(4144, 4144)),
+ Box(Box(4145, 4145), Box(4145, 4145)),
+ Box(Box(4146, 4146), Box(4146, 4146)),
+ Box(Box(4147, 4147), Box(4147, 4147)),
+ Box(Box(4148, 4148), Box(4148, 4148)),
+ Box(Box(4149, 4149), Box(4149, 4149)),
+ Box(Box(4150, 4150), Box(4150, 4150)),
+ Box(Box(4151, 4151), Box(4151, 4151)),
+ Box(Box(4152, 4152), Box(4152, 4152)),
+ Box(Box(4153, 4153), Box(4153, 4153)),
+ Box(Box(4154, 4154), Box(4154, 4154)),
+ Box(Box(4155, 4155), Box(4155, 4155)),
+ Box(Box(4156, 4156), Box(4156, 4156)),
+ Box(Box(4157, 4157), Box(4157, 4157)),
+ Box(Box(4158, 4158), Box(4158, 4158)),
+ Box(Box(4159, 4159), Box(4159, 4159)),
+ Box(Box(4160, 4160), Box(4160, 4160)),
+ Box(Box(4161, 4161), Box(4161, 4161)),
+ Box(Box(4162, 4162), Box(4162, 4162)),
+ Box(Box(4163, 4163), Box(4163, 4163)),
+ Box(Box(4164, 4164), Box(4164, 4164)),
+ Box(Box(4165, 4165), Box(4165, 4165)),
+ Box(Box(4166, 4166), Box(4166, 4166)),
+ Box(Box(4167, 4167), Box(4167, 4167)),
+ Box(Box(4168, 4168), Box(4168, 4168)),
+ Box(Box(4169, 4169), Box(4169, 4169)),
+ Box(Box(4170, 4170), Box(4170, 4170)),
+ Box(Box(4171, 4171), Box(4171, 4171)),
+ Box(Box(4172, 4172), Box(4172, 4172)),
+ Box(Box(4173, 4173), Box(4173, 4173)),
+ Box(Box(4174, 4174), Box(4174, 4174)),
+ Box(Box(4175, 4175), Box(4175, 4175)),
+ Box(Box(4176, 4176), Box(4176, 4176)),
+ Box(Box(4177, 4177), Box(4177, 4177)),
+ Box(Box(4178, 4178), Box(4178, 4178)),
+ Box(Box(4179, 4179), Box(4179, 4179)),
+ Box(Box(4180, 4180), Box(4180, 4180)),
+ Box(Box(4181, 4181), Box(4181, 4181)),
+ Box(Box(4182, 4182), Box(4182, 4182)),
+ Box(Box(4183, 4183), Box(4183, 4183)),
+ Box(Box(4184, 4184), Box(4184, 4184)),
+ Box(Box(4185, 4185), Box(4185, 4185)),
+ Box(Box(4186, 4186), Box(4186, 4186)),
+ Box(Box(4187, 4187), Box(4187, 4187)),
+ Box(Box(4188, 4188), Box(4188, 4188)),
+ Box(Box(4189, 4189), Box(4189, 4189)),
+ Box(Box(4190, 4190), Box(4190, 4190)),
+ Box(Box(4191, 4191), Box(4191, 4191)),
+ Box(Box(4192, 4192), Box(4192, 4192)),
+ Box(Box(4193, 4193), Box(4193, 4193)),
+ Box(Box(4194, 4194), Box(4194, 4194)),
+ Box(Box(4195, 4195), Box(4195, 4195)),
+ Box(Box(4196, 4196), Box(4196, 4196)),
+ Box(Box(4197, 4197), Box(4197, 4197)),
+ Box(Box(4198, 4198), Box(4198, 4198)),
+ Box(Box(4199, 4199), Box(4199, 4199)),
+ Box(Box(4200, 4200), Box(4200, 4200)),
+ Box(Box(4201, 4201), Box(4201, 4201)),
+ Box(Box(4202, 4202), Box(4202, 4202)),
+ Box(Box(4203, 4203), Box(4203, 4203)),
+ Box(Box(4204, 4204), Box(4204, 4204)),
+ Box(Box(4205, 4205), Box(4205, 4205)),
+ Box(Box(4206, 4206), Box(4206, 4206)),
+ Box(Box(4207, 4207), Box(4207, 4207)),
+ Box(Box(4208, 4208), Box(4208, 4208)),
+ Box(Box(4209, 4209), Box(4209, 4209)),
+ Box(Box(4210, 4210), Box(4210, 4210)),
+ Box(Box(4211, 4211), Box(4211, 4211)),
+ Box(Box(4212, 4212), Box(4212, 4212)),
+ Box(Box(4213, 4213), Box(4213, 4213)),
+ Box(Box(4214, 4214), Box(4214, 4214)),
+ Box(Box(4215, 4215), Box(4215, 4215)),
+ Box(Box(4216, 4216), Box(4216, 4216)),
+ Box(Box(4217, 4217), Box(4217, 4217)),
+ Box(Box(4218, 4218), Box(4218, 4218)),
+ Box(Box(4219, 4219), Box(4219, 4219)),
+ Box(Box(4220, 4220), Box(4220, 4220)),
+ Box(Box(4221, 4221), Box(4221, 4221)),
+ Box(Box(4222, 4222), Box(4222, 4222)),
+ Box(Box(4223, 4223), Box(4223, 4223)),
+ Box(Box(4224, 4224), Box(4224, 4224)),
+ Box(Box(4225, 4225), Box(4225, 4225)),
+ Box(Box(4226, 4226), Box(4226, 4226)),
+ Box(Box(4227, 4227), Box(4227, 4227)),
+ Box(Box(4228, 4228), Box(4228, 4228)),
+ Box(Box(4229, 4229), Box(4229, 4229)),
+ Box(Box(4230, 4230), Box(4230, 4230)),
+ Box(Box(4231, 4231), Box(4231, 4231)),
+ Box(Box(4232, 4232), Box(4232, 4232)),
+ Box(Box(4233, 4233), Box(4233, 4233)),
+ Box(Box(4234, 4234), Box(4234, 4234)),
+ Box(Box(4235, 4235), Box(4235, 4235)),
+ Box(Box(4236, 4236), Box(4236, 4236)),
+ Box(Box(4237, 4237), Box(4237, 4237)),
+ Box(Box(4238, 4238), Box(4238, 4238)),
+ Box(Box(4239, 4239), Box(4239, 4239)),
+ Box(Box(4240, 4240), Box(4240, 4240)),
+ Box(Box(4241, 4241), Box(4241, 4241)),
+ Box(Box(4242, 4242), Box(4242, 4242)),
+ Box(Box(4243, 4243), Box(4243, 4243)),
+ Box(Box(4244, 4244), Box(4244, 4244)),
+ Box(Box(4245, 4245), Box(4245, 4245)),
+ Box(Box(4246, 4246), Box(4246, 4246)),
+ Box(Box(4247, 4247), Box(4247, 4247)),
+ Box(Box(4248, 4248), Box(4248, 4248)),
+ Box(Box(4249, 4249), Box(4249, 4249)),
+ Box(Box(4250, 4250), Box(4250, 4250)),
+ Box(Box(4251, 4251), Box(4251, 4251)),
+ Box(Box(4252, 4252), Box(4252, 4252)),
+ Box(Box(4253, 4253), Box(4253, 4253)),
+ Box(Box(4254, 4254), Box(4254, 4254)),
+ Box(Box(4255, 4255), Box(4255, 4255)),
+ Box(Box(4256, 4256), Box(4256, 4256)),
+ Box(Box(4257, 4257), Box(4257, 4257)),
+ Box(Box(4258, 4258), Box(4258, 4258)),
+ Box(Box(4259, 4259), Box(4259, 4259)),
+ Box(Box(4260, 4260), Box(4260, 4260)),
+ Box(Box(4261, 4261), Box(4261, 4261)),
+ Box(Box(4262, 4262), Box(4262, 4262)),
+ Box(Box(4263, 4263), Box(4263, 4263)),
+ Box(Box(4264, 4264), Box(4264, 4264)),
+ Box(Box(4265, 4265), Box(4265, 4265)),
+ Box(Box(4266, 4266), Box(4266, 4266)),
+ Box(Box(4267, 4267), Box(4267, 4267)),
+ Box(Box(4268, 4268), Box(4268, 4268)),
+ Box(Box(4269, 4269), Box(4269, 4269)),
+ Box(Box(4270, 4270), Box(4270, 4270)),
+ Box(Box(4271, 4271), Box(4271, 4271)),
+ Box(Box(4272, 4272), Box(4272, 4272)),
+ Box(Box(4273, 4273), Box(4273, 4273)),
+ Box(Box(4274, 4274), Box(4274, 4274)),
+ Box(Box(4275, 4275), Box(4275, 4275)),
+ Box(Box(4276, 4276), Box(4276, 4276)),
+ Box(Box(4277, 4277), Box(4277, 4277)),
+ Box(Box(4278, 4278), Box(4278, 4278)),
+ Box(Box(4279, 4279), Box(4279, 4279)),
+ Box(Box(4280, 4280), Box(4280, 4280)),
+ Box(Box(4281, 4281), Box(4281, 4281)),
+ Box(Box(4282, 4282), Box(4282, 4282)),
+ Box(Box(4283, 4283), Box(4283, 4283)),
+ Box(Box(4284, 4284), Box(4284, 4284)),
+ Box(Box(4285, 4285), Box(4285, 4285)),
+ Box(Box(4286, 4286), Box(4286, 4286)),
+ Box(Box(4287, 4287), Box(4287, 4287)),
+ Box(Box(4288, 4288), Box(4288, 4288)),
+ Box(Box(4289, 4289), Box(4289, 4289)),
+ Box(Box(4290, 4290), Box(4290, 4290)),
+ Box(Box(4291, 4291), Box(4291, 4291)),
+ Box(Box(4292, 4292), Box(4292, 4292)),
+ Box(Box(4293, 4293), Box(4293, 4293)),
+ Box(Box(4294, 4294), Box(4294, 4294)),
+ Box(Box(4295, 4295), Box(4295, 4295)),
+ Box(Box(4296, 4296), Box(4296, 4296)),
+ Box(Box(4297, 4297), Box(4297, 4297)),
+ Box(Box(4298, 4298), Box(4298, 4298)),
+ Box(Box(4299, 4299), Box(4299, 4299)),
+ Box(Box(4300, 4300), Box(4300, 4300)),
+ Box(Box(4301, 4301), Box(4301, 4301)),
+ Box(Box(4302, 4302), Box(4302, 4302)),
+ Box(Box(4303, 4303), Box(4303, 4303)),
+ Box(Box(4304, 4304), Box(4304, 4304)),
+ Box(Box(4305, 4305), Box(4305, 4305)),
+ Box(Box(4306, 4306), Box(4306, 4306)),
+ Box(Box(4307, 4307), Box(4307, 4307)),
+ Box(Box(4308, 4308), Box(4308, 4308)),
+ Box(Box(4309, 4309), Box(4309, 4309)),
+ Box(Box(4310, 4310), Box(4310, 4310)),
+ Box(Box(4311, 4311), Box(4311, 4311)),
+ Box(Box(4312, 4312), Box(4312, 4312)),
+ Box(Box(4313, 4313), Box(4313, 4313)),
+ Box(Box(4314, 4314), Box(4314, 4314)),
+ Box(Box(4315, 4315), Box(4315, 4315)),
+ Box(Box(4316, 4316), Box(4316, 4316)),
+ Box(Box(4317, 4317), Box(4317, 4317)),
+ Box(Box(4318, 4318), Box(4318, 4318)),
+ Box(Box(4319, 4319), Box(4319, 4319)),
+ Box(Box(4320, 4320), Box(4320, 4320)),
+ Box(Box(4321, 4321), Box(4321, 4321)),
+ Box(Box(4322, 4322), Box(4322, 4322)),
+ Box(Box(4323, 4323), Box(4323, 4323)),
+ Box(Box(4324, 4324), Box(4324, 4324)),
+ Box(Box(4325, 4325), Box(4325, 4325)),
+ Box(Box(4326, 4326), Box(4326, 4326)),
+ Box(Box(4327, 4327), Box(4327, 4327)),
+ Box(Box(4328, 4328), Box(4328, 4328)),
+ Box(Box(4329, 4329), Box(4329, 4329)),
+ Box(Box(4330, 4330), Box(4330, 4330)),
+ Box(Box(4331, 4331), Box(4331, 4331)),
+ Box(Box(4332, 4332), Box(4332, 4332)),
+ Box(Box(4333, 4333), Box(4333, 4333)),
+ Box(Box(4334, 4334), Box(4334, 4334)),
+ Box(Box(4335, 4335), Box(4335, 4335)),
+ Box(Box(4336, 4336), Box(4336, 4336)),
+ Box(Box(4337, 4337), Box(4337, 4337)),
+ Box(Box(4338, 4338), Box(4338, 4338)),
+ Box(Box(4339, 4339), Box(4339, 4339)),
+ Box(Box(4340, 4340), Box(4340, 4340)),
+ Box(Box(4341, 4341), Box(4341, 4341)),
+ Box(Box(4342, 4342), Box(4342, 4342)),
+ Box(Box(4343, 4343), Box(4343, 4343)),
+ Box(Box(4344, 4344), Box(4344, 4344)),
+ Box(Box(4345, 4345), Box(4345, 4345)),
+ Box(Box(4346, 4346), Box(4346, 4346)),
+ Box(Box(4347, 4347), Box(4347, 4347)),
+ Box(Box(4348, 4348), Box(4348, 4348)),
+ Box(Box(4349, 4349), Box(4349, 4349)),
+ Box(Box(4350, 4350), Box(4350, 4350)),
+ Box(Box(4351, 4351), Box(4351, 4351)),
+ Box(Box(4352, 4352), Box(4352, 4352)),
+ Box(Box(4353, 4353), Box(4353, 4353)),
+ Box(Box(4354, 4354), Box(4354, 4354)),
+ Box(Box(4355, 4355), Box(4355, 4355)),
+ Box(Box(4356, 4356), Box(4356, 4356)),
+ Box(Box(4357, 4357), Box(4357, 4357)),
+ Box(Box(4358, 4358), Box(4358, 4358)),
+ Box(Box(4359, 4359), Box(4359, 4359)),
+ Box(Box(4360, 4360), Box(4360, 4360)),
+ Box(Box(4361, 4361), Box(4361, 4361)),
+ Box(Box(4362, 4362), Box(4362, 4362)),
+ Box(Box(4363, 4363), Box(4363, 4363)),
+ Box(Box(4364, 4364), Box(4364, 4364)),
+ Box(Box(4365, 4365), Box(4365, 4365)),
+ Box(Box(4366, 4366), Box(4366, 4366)),
+ Box(Box(4367, 4367), Box(4367, 4367)),
+ Box(Box(4368, 4368), Box(4368, 4368)),
+ Box(Box(4369, 4369), Box(4369, 4369)),
+ Box(Box(4370, 4370), Box(4370, 4370)),
+ Box(Box(4371, 4371), Box(4371, 4371)),
+ Box(Box(4372, 4372), Box(4372, 4372)),
+ Box(Box(4373, 4373), Box(4373, 4373)),
+ Box(Box(4374, 4374), Box(4374, 4374)),
+ Box(Box(4375, 4375), Box(4375, 4375)),
+ Box(Box(4376, 4376), Box(4376, 4376)),
+ Box(Box(4377, 4377), Box(4377, 4377)),
+ Box(Box(4378, 4378), Box(4378, 4378)),
+ Box(Box(4379, 4379), Box(4379, 4379)),
+ Box(Box(4380, 4380), Box(4380, 4380)),
+ Box(Box(4381, 4381), Box(4381, 4381)),
+ Box(Box(4382, 4382), Box(4382, 4382)),
+ Box(Box(4383, 4383), Box(4383, 4383)),
+ Box(Box(4384, 4384), Box(4384, 4384)),
+ Box(Box(4385, 4385), Box(4385, 4385)),
+ Box(Box(4386, 4386), Box(4386, 4386)),
+ Box(Box(4387, 4387), Box(4387, 4387)),
+ Box(Box(4388, 4388), Box(4388, 4388)),
+ Box(Box(4389, 4389), Box(4389, 4389)),
+ Box(Box(4390, 4390), Box(4390, 4390)),
+ Box(Box(4391, 4391), Box(4391, 4391)),
+ Box(Box(4392, 4392), Box(4392, 4392)),
+ Box(Box(4393, 4393), Box(4393, 4393)),
+ Box(Box(4394, 4394), Box(4394, 4394)),
+ Box(Box(4395, 4395), Box(4395, 4395)),
+ Box(Box(4396, 4396), Box(4396, 4396)),
+ Box(Box(4397, 4397), Box(4397, 4397)),
+ Box(Box(4398, 4398), Box(4398, 4398)),
+ Box(Box(4399, 4399), Box(4399, 4399)),
+ Box(Box(4400, 4400), Box(4400, 4400)),
+ Box(Box(4401, 4401), Box(4401, 4401)),
+ Box(Box(4402, 4402), Box(4402, 4402)),
+ Box(Box(4403, 4403), Box(4403, 4403)),
+ Box(Box(4404, 4404), Box(4404, 4404)),
+ Box(Box(4405, 4405), Box(4405, 4405)),
+ Box(Box(4406, 4406), Box(4406, 4406)),
+ Box(Box(4407, 4407), Box(4407, 4407)),
+ Box(Box(4408, 4408), Box(4408, 4408)),
+ Box(Box(4409, 4409), Box(4409, 4409)),
+ Box(Box(4410, 4410), Box(4410, 4410)),
+ Box(Box(4411, 4411), Box(4411, 4411)),
+ Box(Box(4412, 4412), Box(4412, 4412)),
+ Box(Box(4413, 4413), Box(4413, 4413)),
+ Box(Box(4414, 4414), Box(4414, 4414)),
+ Box(Box(4415, 4415), Box(4415, 4415)),
+ Box(Box(4416, 4416), Box(4416, 4416)),
+ Box(Box(4417, 4417), Box(4417, 4417)),
+ Box(Box(4418, 4418), Box(4418, 4418)),
+ Box(Box(4419, 4419), Box(4419, 4419)),
+ Box(Box(4420, 4420), Box(4420, 4420)),
+ Box(Box(4421, 4421), Box(4421, 4421)),
+ Box(Box(4422, 4422), Box(4422, 4422)),
+ Box(Box(4423, 4423), Box(4423, 4423)),
+ Box(Box(4424, 4424), Box(4424, 4424)),
+ Box(Box(4425, 4425), Box(4425, 4425)),
+ Box(Box(4426, 4426), Box(4426, 4426)),
+ Box(Box(4427, 4427), Box(4427, 4427)),
+ Box(Box(4428, 4428), Box(4428, 4428)),
+ Box(Box(4429, 4429), Box(4429, 4429)),
+ Box(Box(4430, 4430), Box(4430, 4430)),
+ Box(Box(4431, 4431), Box(4431, 4431)),
+ Box(Box(4432, 4432), Box(4432, 4432)),
+ Box(Box(4433, 4433), Box(4433, 4433)),
+ Box(Box(4434, 4434), Box(4434, 4434)),
+ Box(Box(4435, 4435), Box(4435, 4435)),
+ Box(Box(4436, 4436), Box(4436, 4436)),
+ Box(Box(4437, 4437), Box(4437, 4437)),
+ Box(Box(4438, 4438), Box(4438, 4438)),
+ Box(Box(4439, 4439), Box(4439, 4439)),
+ Box(Box(4440, 4440), Box(4440, 4440)),
+ Box(Box(4441, 4441), Box(4441, 4441)),
+ Box(Box(4442, 4442), Box(4442, 4442)),
+ Box(Box(4443, 4443), Box(4443, 4443)),
+ Box(Box(4444, 4444), Box(4444, 4444)),
+ Box(Box(4445, 4445), Box(4445, 4445)),
+ Box(Box(4446, 4446), Box(4446, 4446)),
+ Box(Box(4447, 4447), Box(4447, 4447)),
+ Box(Box(4448, 4448), Box(4448, 4448)),
+ Box(Box(4449, 4449), Box(4449, 4449)),
+ Box(Box(4450, 4450), Box(4450, 4450)),
+ Box(Box(4451, 4451), Box(4451, 4451)),
+ Box(Box(4452, 4452), Box(4452, 4452)),
+ Box(Box(4453, 4453), Box(4453, 4453)),
+ Box(Box(4454, 4454), Box(4454, 4454)),
+ Box(Box(4455, 4455), Box(4455, 4455)),
+ Box(Box(4456, 4456), Box(4456, 4456)),
+ Box(Box(4457, 4457), Box(4457, 4457)),
+ Box(Box(4458, 4458), Box(4458, 4458)),
+ Box(Box(4459, 4459), Box(4459, 4459)),
+ Box(Box(4460, 4460), Box(4460, 4460)),
+ Box(Box(4461, 4461), Box(4461, 4461)),
+ Box(Box(4462, 4462), Box(4462, 4462)),
+ Box(Box(4463, 4463), Box(4463, 4463)),
+ Box(Box(4464, 4464), Box(4464, 4464)),
+ Box(Box(4465, 4465), Box(4465, 4465)),
+ Box(Box(4466, 4466), Box(4466, 4466)),
+ Box(Box(4467, 4467), Box(4467, 4467)),
+ Box(Box(4468, 4468), Box(4468, 4468)),
+ Box(Box(4469, 4469), Box(4469, 4469)),
+ Box(Box(4470, 4470), Box(4470, 4470)),
+ Box(Box(4471, 4471), Box(4471, 4471)),
+ Box(Box(4472, 4472), Box(4472, 4472)),
+ Box(Box(4473, 4473), Box(4473, 4473)),
+ Box(Box(4474, 4474), Box(4474, 4474)),
+ Box(Box(4475, 4475), Box(4475, 4475)),
+ Box(Box(4476, 4476), Box(4476, 4476)),
+ Box(Box(4477, 4477), Box(4477, 4477)),
+ Box(Box(4478, 4478), Box(4478, 4478)),
+ Box(Box(4479, 4479), Box(4479, 4479)),
+ Box(Box(4480, 4480), Box(4480, 4480)),
+ Box(Box(4481, 4481), Box(4481, 4481)),
+ Box(Box(4482, 4482), Box(4482, 4482)),
+ Box(Box(4483, 4483), Box(4483, 4483)),
+ Box(Box(4484, 4484), Box(4484, 4484)),
+ Box(Box(4485, 4485), Box(4485, 4485)),
+ Box(Box(4486, 4486), Box(4486, 4486)),
+ Box(Box(4487, 4487), Box(4487, 4487)),
+ Box(Box(4488, 4488), Box(4488, 4488)),
+ Box(Box(4489, 4489), Box(4489, 4489)),
+ Box(Box(4490, 4490), Box(4490, 4490)),
+ Box(Box(4491, 4491), Box(4491, 4491)),
+ Box(Box(4492, 4492), Box(4492, 4492)),
+ Box(Box(4493, 4493), Box(4493, 4493)),
+ Box(Box(4494, 4494), Box(4494, 4494)),
+ Box(Box(4495, 4495), Box(4495, 4495)),
+ Box(Box(4496, 4496), Box(4496, 4496)),
+ Box(Box(4497, 4497), Box(4497, 4497)),
+ Box(Box(4498, 4498), Box(4498, 4498)),
+ Box(Box(4499, 4499), Box(4499, 4499)),
+ Box(Box(4500, 4500), Box(4500, 4500)),
+ Box(Box(4501, 4501), Box(4501, 4501)),
+ Box(Box(4502, 4502), Box(4502, 4502)),
+ Box(Box(4503, 4503), Box(4503, 4503)),
+ Box(Box(4504, 4504), Box(4504, 4504)),
+ Box(Box(4505, 4505), Box(4505, 4505)),
+ Box(Box(4506, 4506), Box(4506, 4506)),
+ Box(Box(4507, 4507), Box(4507, 4507)),
+ Box(Box(4508, 4508), Box(4508, 4508)),
+ Box(Box(4509, 4509), Box(4509, 4509)),
+ Box(Box(4510, 4510), Box(4510, 4510)),
+ Box(Box(4511, 4511), Box(4511, 4511)),
+ Box(Box(4512, 4512), Box(4512, 4512)),
+ Box(Box(4513, 4513), Box(4513, 4513)),
+ Box(Box(4514, 4514), Box(4514, 4514)),
+ Box(Box(4515, 4515), Box(4515, 4515)),
+ Box(Box(4516, 4516), Box(4516, 4516)),
+ Box(Box(4517, 4517), Box(4517, 4517)),
+ Box(Box(4518, 4518), Box(4518, 4518)),
+ Box(Box(4519, 4519), Box(4519, 4519)),
+ Box(Box(4520, 4520), Box(4520, 4520)),
+ Box(Box(4521, 4521), Box(4521, 4521)),
+ Box(Box(4522, 4522), Box(4522, 4522)),
+ Box(Box(4523, 4523), Box(4523, 4523)),
+ Box(Box(4524, 4524), Box(4524, 4524)),
+ Box(Box(4525, 4525), Box(4525, 4525)),
+ Box(Box(4526, 4526), Box(4526, 4526)),
+ Box(Box(4527, 4527), Box(4527, 4527)),
+ Box(Box(4528, 4528), Box(4528, 4528)),
+ Box(Box(4529, 4529), Box(4529, 4529)),
+ Box(Box(4530, 4530), Box(4530, 4530)),
+ Box(Box(4531, 4531), Box(4531, 4531)),
+ Box(Box(4532, 4532), Box(4532, 4532)),
+ Box(Box(4533, 4533), Box(4533, 4533)),
+ Box(Box(4534, 4534), Box(4534, 4534)),
+ Box(Box(4535, 4535), Box(4535, 4535)),
+ Box(Box(4536, 4536), Box(4536, 4536)),
+ Box(Box(4537, 4537), Box(4537, 4537)),
+ Box(Box(4538, 4538), Box(4538, 4538)),
+ Box(Box(4539, 4539), Box(4539, 4539)),
+ Box(Box(4540, 4540), Box(4540, 4540)),
+ Box(Box(4541, 4541), Box(4541, 4541)),
+ Box(Box(4542, 4542), Box(4542, 4542)),
+ Box(Box(4543, 4543), Box(4543, 4543)),
+ Box(Box(4544, 4544), Box(4544, 4544)),
+ Box(Box(4545, 4545), Box(4545, 4545)),
+ Box(Box(4546, 4546), Box(4546, 4546)),
+ Box(Box(4547, 4547), Box(4547, 4547)),
+ Box(Box(4548, 4548), Box(4548, 4548)),
+ Box(Box(4549, 4549), Box(4549, 4549)),
+ Box(Box(4550, 4550), Box(4550, 4550)),
+ Box(Box(4551, 4551), Box(4551, 4551)),
+ Box(Box(4552, 4552), Box(4552, 4552)),
+ Box(Box(4553, 4553), Box(4553, 4553)),
+ Box(Box(4554, 4554), Box(4554, 4554)),
+ Box(Box(4555, 4555), Box(4555, 4555)),
+ Box(Box(4556, 4556), Box(4556, 4556)),
+ Box(Box(4557, 4557), Box(4557, 4557)),
+ Box(Box(4558, 4558), Box(4558, 4558)),
+ Box(Box(4559, 4559), Box(4559, 4559)),
+ Box(Box(4560, 4560), Box(4560, 4560)),
+ Box(Box(4561, 4561), Box(4561, 4561)),
+ Box(Box(4562, 4562), Box(4562, 4562)),
+ Box(Box(4563, 4563), Box(4563, 4563)),
+ Box(Box(4564, 4564), Box(4564, 4564)),
+ Box(Box(4565, 4565), Box(4565, 4565)),
+ Box(Box(4566, 4566), Box(4566, 4566)),
+ Box(Box(4567, 4567), Box(4567, 4567)),
+ Box(Box(4568, 4568), Box(4568, 4568)),
+ Box(Box(4569, 4569), Box(4569, 4569)),
+ Box(Box(4570, 4570), Box(4570, 4570)),
+ Box(Box(4571, 4571), Box(4571, 4571)),
+ Box(Box(4572, 4572), Box(4572, 4572)),
+ Box(Box(4573, 4573), Box(4573, 4573)),
+ Box(Box(4574, 4574), Box(4574, 4574)),
+ Box(Box(4575, 4575), Box(4575, 4575)),
+ Box(Box(4576, 4576), Box(4576, 4576)),
+ Box(Box(4577, 4577), Box(4577, 4577)),
+ Box(Box(4578, 4578), Box(4578, 4578)),
+ Box(Box(4579, 4579), Box(4579, 4579)),
+ Box(Box(4580, 4580), Box(4580, 4580)),
+ Box(Box(4581, 4581), Box(4581, 4581)),
+ Box(Box(4582, 4582), Box(4582, 4582)),
+ Box(Box(4583, 4583), Box(4583, 4583)),
+ Box(Box(4584, 4584), Box(4584, 4584)),
+ Box(Box(4585, 4585), Box(4585, 4585)),
+ Box(Box(4586, 4586), Box(4586, 4586)),
+ Box(Box(4587, 4587), Box(4587, 4587)),
+ Box(Box(4588, 4588), Box(4588, 4588)),
+ Box(Box(4589, 4589), Box(4589, 4589)),
+ Box(Box(4590, 4590), Box(4590, 4590)),
+ Box(Box(4591, 4591), Box(4591, 4591)),
+ Box(Box(4592, 4592), Box(4592, 4592)),
+ Box(Box(4593, 4593), Box(4593, 4593)),
+ Box(Box(4594, 4594), Box(4594, 4594)),
+ Box(Box(4595, 4595), Box(4595, 4595)),
+ Box(Box(4596, 4596), Box(4596, 4596)),
+ Box(Box(4597, 4597), Box(4597, 4597)),
+ Box(Box(4598, 4598), Box(4598, 4598)),
+ Box(Box(4599, 4599), Box(4599, 4599)),
+ Box(Box(4600, 4600), Box(4600, 4600)),
+ Box(Box(4601, 4601), Box(4601, 4601)),
+ Box(Box(4602, 4602), Box(4602, 4602)),
+ Box(Box(4603, 4603), Box(4603, 4603)),
+ Box(Box(4604, 4604), Box(4604, 4604)),
+ Box(Box(4605, 4605), Box(4605, 4605)),
+ Box(Box(4606, 4606), Box(4606, 4606)),
+ Box(Box(4607, 4607), Box(4607, 4607)),
+ Box(Box(4608, 4608), Box(4608, 4608)),
+ Box(Box(4609, 4609), Box(4609, 4609)),
+ Box(Box(4610, 4610), Box(4610, 4610)),
+ Box(Box(4611, 4611), Box(4611, 4611)),
+ Box(Box(4612, 4612), Box(4612, 4612)),
+ Box(Box(4613, 4613), Box(4613, 4613)),
+ Box(Box(4614, 4614), Box(4614, 4614)),
+ Box(Box(4615, 4615), Box(4615, 4615)),
+ Box(Box(4616, 4616), Box(4616, 4616)),
+ Box(Box(4617, 4617), Box(4617, 4617)),
+ Box(Box(4618, 4618), Box(4618, 4618)),
+ Box(Box(4619, 4619), Box(4619, 4619)),
+ Box(Box(4620, 4620), Box(4620, 4620)),
+ Box(Box(4621, 4621), Box(4621, 4621)),
+ Box(Box(4622, 4622), Box(4622, 4622)),
+ Box(Box(4623, 4623), Box(4623, 4623)),
+ Box(Box(4624, 4624), Box(4624, 4624)),
+ Box(Box(4625, 4625), Box(4625, 4625)),
+ Box(Box(4626, 4626), Box(4626, 4626)),
+ Box(Box(4627, 4627), Box(4627, 4627)),
+ Box(Box(4628, 4628), Box(4628, 4628)),
+ Box(Box(4629, 4629), Box(4629, 4629)),
+ Box(Box(4630, 4630), Box(4630, 4630)),
+ Box(Box(4631, 4631), Box(4631, 4631)),
+ Box(Box(4632, 4632), Box(4632, 4632)),
+ Box(Box(4633, 4633), Box(4633, 4633)),
+ Box(Box(4634, 4634), Box(4634, 4634)),
+ Box(Box(4635, 4635), Box(4635, 4635)),
+ Box(Box(4636, 4636), Box(4636, 4636)),
+ Box(Box(4637, 4637), Box(4637, 4637)),
+ Box(Box(4638, 4638), Box(4638, 4638)),
+ Box(Box(4639, 4639), Box(4639, 4639)),
+ Box(Box(4640, 4640), Box(4640, 4640)),
+ Box(Box(4641, 4641), Box(4641, 4641)),
+ Box(Box(4642, 4642), Box(4642, 4642)),
+ Box(Box(4643, 4643), Box(4643, 4643)),
+ Box(Box(4644, 4644), Box(4644, 4644)),
+ Box(Box(4645, 4645), Box(4645, 4645)),
+ Box(Box(4646, 4646), Box(4646, 4646)),
+ Box(Box(4647, 4647), Box(4647, 4647)),
+ Box(Box(4648, 4648), Box(4648, 4648)),
+ Box(Box(4649, 4649), Box(4649, 4649)),
+ Box(Box(4650, 4650), Box(4650, 4650)),
+ Box(Box(4651, 4651), Box(4651, 4651)),
+ Box(Box(4652, 4652), Box(4652, 4652)),
+ Box(Box(4653, 4653), Box(4653, 4653)),
+ Box(Box(4654, 4654), Box(4654, 4654)),
+ Box(Box(4655, 4655), Box(4655, 4655)),
+ Box(Box(4656, 4656), Box(4656, 4656)),
+ Box(Box(4657, 4657), Box(4657, 4657)),
+ Box(Box(4658, 4658), Box(4658, 4658)),
+ Box(Box(4659, 4659), Box(4659, 4659)),
+ Box(Box(4660, 4660), Box(4660, 4660)),
+ Box(Box(4661, 4661), Box(4661, 4661)),
+ Box(Box(4662, 4662), Box(4662, 4662)),
+ Box(Box(4663, 4663), Box(4663, 4663)),
+ Box(Box(4664, 4664), Box(4664, 4664)),
+ Box(Box(4665, 4665), Box(4665, 4665)),
+ Box(Box(4666, 4666), Box(4666, 4666)),
+ Box(Box(4667, 4667), Box(4667, 4667)),
+ Box(Box(4668, 4668), Box(4668, 4668)),
+ Box(Box(4669, 4669), Box(4669, 4669)),
+ Box(Box(4670, 4670), Box(4670, 4670)),
+ Box(Box(4671, 4671), Box(4671, 4671)),
+ Box(Box(4672, 4672), Box(4672, 4672)),
+ Box(Box(4673, 4673), Box(4673, 4673)),
+ Box(Box(4674, 4674), Box(4674, 4674)),
+ Box(Box(4675, 4675), Box(4675, 4675)),
+ Box(Box(4676, 4676), Box(4676, 4676)),
+ Box(Box(4677, 4677), Box(4677, 4677)),
+ Box(Box(4678, 4678), Box(4678, 4678)),
+ Box(Box(4679, 4679), Box(4679, 4679)),
+ Box(Box(4680, 4680), Box(4680, 4680)),
+ Box(Box(4681, 4681), Box(4681, 4681)),
+ Box(Box(4682, 4682), Box(4682, 4682)),
+ Box(Box(4683, 4683), Box(4683, 4683)),
+ Box(Box(4684, 4684), Box(4684, 4684)),
+ Box(Box(4685, 4685), Box(4685, 4685)),
+ Box(Box(4686, 4686), Box(4686, 4686)),
+ Box(Box(4687, 4687), Box(4687, 4687)),
+ Box(Box(4688, 4688), Box(4688, 4688)),
+ Box(Box(4689, 4689), Box(4689, 4689)),
+ Box(Box(4690, 4690), Box(4690, 4690)),
+ Box(Box(4691, 4691), Box(4691, 4691)),
+ Box(Box(4692, 4692), Box(4692, 4692)),
+ Box(Box(4693, 4693), Box(4693, 4693)),
+ Box(Box(4694, 4694), Box(4694, 4694)),
+ Box(Box(4695, 4695), Box(4695, 4695)),
+ Box(Box(4696, 4696), Box(4696, 4696)),
+ Box(Box(4697, 4697), Box(4697, 4697)),
+ Box(Box(4698, 4698), Box(4698, 4698)),
+ Box(Box(4699, 4699), Box(4699, 4699)),
+ Box(Box(4700, 4700), Box(4700, 4700)),
+ Box(Box(4701, 4701), Box(4701, 4701)),
+ Box(Box(4702, 4702), Box(4702, 4702)),
+ Box(Box(4703, 4703), Box(4703, 4703)),
+ Box(Box(4704, 4704), Box(4704, 4704)),
+ Box(Box(4705, 4705), Box(4705, 4705)),
+ Box(Box(4706, 4706), Box(4706, 4706)),
+ Box(Box(4707, 4707), Box(4707, 4707)),
+ Box(Box(4708, 4708), Box(4708, 4708)),
+ Box(Box(4709, 4709), Box(4709, 4709)),
+ Box(Box(4710, 4710), Box(4710, 4710)),
+ Box(Box(4711, 4711), Box(4711, 4711)),
+ Box(Box(4712, 4712), Box(4712, 4712)),
+ Box(Box(4713, 4713), Box(4713, 4713)),
+ Box(Box(4714, 4714), Box(4714, 4714)),
+ Box(Box(4715, 4715), Box(4715, 4715)),
+ Box(Box(4716, 4716), Box(4716, 4716)),
+ Box(Box(4717, 4717), Box(4717, 4717)),
+ Box(Box(4718, 4718), Box(4718, 4718)),
+ Box(Box(4719, 4719), Box(4719, 4719)),
+ Box(Box(4720, 4720), Box(4720, 4720)),
+ Box(Box(4721, 4721), Box(4721, 4721)),
+ Box(Box(4722, 4722), Box(4722, 4722)),
+ Box(Box(4723, 4723), Box(4723, 4723)),
+ Box(Box(4724, 4724), Box(4724, 4724)),
+ Box(Box(4725, 4725), Box(4725, 4725)),
+ Box(Box(4726, 4726), Box(4726, 4726)),
+ Box(Box(4727, 4727), Box(4727, 4727)),
+ Box(Box(4728, 4728), Box(4728, 4728)),
+ Box(Box(4729, 4729), Box(4729, 4729)),
+ Box(Box(4730, 4730), Box(4730, 4730)),
+ Box(Box(4731, 4731), Box(4731, 4731)),
+ Box(Box(4732, 4732), Box(4732, 4732)),
+ Box(Box(4733, 4733), Box(4733, 4733)),
+ Box(Box(4734, 4734), Box(4734, 4734)),
+ Box(Box(4735, 4735), Box(4735, 4735)),
+ Box(Box(4736, 4736), Box(4736, 4736)),
+ Box(Box(4737, 4737), Box(4737, 4737)),
+ Box(Box(4738, 4738), Box(4738, 4738)),
+ Box(Box(4739, 4739), Box(4739, 4739)),
+ Box(Box(4740, 4740), Box(4740, 4740)),
+ Box(Box(4741, 4741), Box(4741, 4741)),
+ Box(Box(4742, 4742), Box(4742, 4742)),
+ Box(Box(4743, 4743), Box(4743, 4743)),
+ Box(Box(4744, 4744), Box(4744, 4744)),
+ Box(Box(4745, 4745), Box(4745, 4745)),
+ Box(Box(4746, 4746), Box(4746, 4746)),
+ Box(Box(4747, 4747), Box(4747, 4747)),
+ Box(Box(4748, 4748), Box(4748, 4748)),
+ Box(Box(4749, 4749), Box(4749, 4749)),
+ Box(Box(4750, 4750), Box(4750, 4750)),
+ Box(Box(4751, 4751), Box(4751, 4751)),
+ Box(Box(4752, 4752), Box(4752, 4752)),
+ Box(Box(4753, 4753), Box(4753, 4753)),
+ Box(Box(4754, 4754), Box(4754, 4754)),
+ Box(Box(4755, 4755), Box(4755, 4755)),
+ Box(Box(4756, 4756), Box(4756, 4756)),
+ Box(Box(4757, 4757), Box(4757, 4757)),
+ Box(Box(4758, 4758), Box(4758, 4758)),
+ Box(Box(4759, 4759), Box(4759, 4759)),
+ Box(Box(4760, 4760), Box(4760, 4760)),
+ Box(Box(4761, 4761), Box(4761, 4761)),
+ Box(Box(4762, 4762), Box(4762, 4762)),
+ Box(Box(4763, 4763), Box(4763, 4763)),
+ Box(Box(4764, 4764), Box(4764, 4764)),
+ Box(Box(4765, 4765), Box(4765, 4765)),
+ Box(Box(4766, 4766), Box(4766, 4766)),
+ Box(Box(4767, 4767), Box(4767, 4767)),
+ Box(Box(4768, 4768), Box(4768, 4768)),
+ Box(Box(4769, 4769), Box(4769, 4769)),
+ Box(Box(4770, 4770), Box(4770, 4770)),
+ Box(Box(4771, 4771), Box(4771, 4771)),
+ Box(Box(4772, 4772), Box(4772, 4772)),
+ Box(Box(4773, 4773), Box(4773, 4773)),
+ Box(Box(4774, 4774), Box(4774, 4774)),
+ Box(Box(4775, 4775), Box(4775, 4775)),
+ Box(Box(4776, 4776), Box(4776, 4776)),
+ Box(Box(4777, 4777), Box(4777, 4777)),
+ Box(Box(4778, 4778), Box(4778, 4778)),
+ Box(Box(4779, 4779), Box(4779, 4779)),
+ Box(Box(4780, 4780), Box(4780, 4780)),
+ Box(Box(4781, 4781), Box(4781, 4781)),
+ Box(Box(4782, 4782), Box(4782, 4782)),
+ Box(Box(4783, 4783), Box(4783, 4783)),
+ Box(Box(4784, 4784), Box(4784, 4784)),
+ Box(Box(4785, 4785), Box(4785, 4785)),
+ Box(Box(4786, 4786), Box(4786, 4786)),
+ Box(Box(4787, 4787), Box(4787, 4787)),
+ Box(Box(4788, 4788), Box(4788, 4788)),
+ Box(Box(4789, 4789), Box(4789, 4789)),
+ Box(Box(4790, 4790), Box(4790, 4790)),
+ Box(Box(4791, 4791), Box(4791, 4791)),
+ Box(Box(4792, 4792), Box(4792, 4792)),
+ Box(Box(4793, 4793), Box(4793, 4793)),
+ Box(Box(4794, 4794), Box(4794, 4794)),
+ Box(Box(4795, 4795), Box(4795, 4795)),
+ Box(Box(4796, 4796), Box(4796, 4796)),
+ Box(Box(4797, 4797), Box(4797, 4797)),
+ Box(Box(4798, 4798), Box(4798, 4798)),
+ Box(Box(4799, 4799), Box(4799, 4799)),
+ Box(Box(4800, 4800), Box(4800, 4800)),
+ Box(Box(4801, 4801), Box(4801, 4801)),
+ Box(Box(4802, 4802), Box(4802, 4802)),
+ Box(Box(4803, 4803), Box(4803, 4803)),
+ Box(Box(4804, 4804), Box(4804, 4804)),
+ Box(Box(4805, 4805), Box(4805, 4805)),
+ Box(Box(4806, 4806), Box(4806, 4806)),
+ Box(Box(4807, 4807), Box(4807, 4807)),
+ Box(Box(4808, 4808), Box(4808, 4808)),
+ Box(Box(4809, 4809), Box(4809, 4809)),
+ Box(Box(4810, 4810), Box(4810, 4810)),
+ Box(Box(4811, 4811), Box(4811, 4811)),
+ Box(Box(4812, 4812), Box(4812, 4812)),
+ Box(Box(4813, 4813), Box(4813, 4813)),
+ Box(Box(4814, 4814), Box(4814, 4814)),
+ Box(Box(4815, 4815), Box(4815, 4815)),
+ Box(Box(4816, 4816), Box(4816, 4816)),
+ Box(Box(4817, 4817), Box(4817, 4817)),
+ Box(Box(4818, 4818), Box(4818, 4818)),
+ Box(Box(4819, 4819), Box(4819, 4819)),
+ Box(Box(4820, 4820), Box(4820, 4820)),
+ Box(Box(4821, 4821), Box(4821, 4821)),
+ Box(Box(4822, 4822), Box(4822, 4822)),
+ Box(Box(4823, 4823), Box(4823, 4823)),
+ Box(Box(4824, 4824), Box(4824, 4824)),
+ Box(Box(4825, 4825), Box(4825, 4825)),
+ Box(Box(4826, 4826), Box(4826, 4826)),
+ Box(Box(4827, 4827), Box(4827, 4827)),
+ Box(Box(4828, 4828), Box(4828, 4828)),
+ Box(Box(4829, 4829), Box(4829, 4829)),
+ Box(Box(4830, 4830), Box(4830, 4830)),
+ Box(Box(4831, 4831), Box(4831, 4831)),
+ Box(Box(4832, 4832), Box(4832, 4832)),
+ Box(Box(4833, 4833), Box(4833, 4833)),
+ Box(Box(4834, 4834), Box(4834, 4834)),
+ Box(Box(4835, 4835), Box(4835, 4835)),
+ Box(Box(4836, 4836), Box(4836, 4836)),
+ Box(Box(4837, 4837), Box(4837, 4837)),
+ Box(Box(4838, 4838), Box(4838, 4838)),
+ Box(Box(4839, 4839), Box(4839, 4839)),
+ Box(Box(4840, 4840), Box(4840, 4840)),
+ Box(Box(4841, 4841), Box(4841, 4841)),
+ Box(Box(4842, 4842), Box(4842, 4842)),
+ Box(Box(4843, 4843), Box(4843, 4843)),
+ Box(Box(4844, 4844), Box(4844, 4844)),
+ Box(Box(4845, 4845), Box(4845, 4845)),
+ Box(Box(4846, 4846), Box(4846, 4846)),
+ Box(Box(4847, 4847), Box(4847, 4847)),
+ Box(Box(4848, 4848), Box(4848, 4848)),
+ Box(Box(4849, 4849), Box(4849, 4849)),
+ Box(Box(4850, 4850), Box(4850, 4850)),
+ Box(Box(4851, 4851), Box(4851, 4851)),
+ Box(Box(4852, 4852), Box(4852, 4852)),
+ Box(Box(4853, 4853), Box(4853, 4853)),
+ Box(Box(4854, 4854), Box(4854, 4854)),
+ Box(Box(4855, 4855), Box(4855, 4855)),
+ Box(Box(4856, 4856), Box(4856, 4856)),
+ Box(Box(4857, 4857), Box(4857, 4857)),
+ Box(Box(4858, 4858), Box(4858, 4858)),
+ Box(Box(4859, 4859), Box(4859, 4859)),
+ Box(Box(4860, 4860), Box(4860, 4860)),
+ Box(Box(4861, 4861), Box(4861, 4861)),
+ Box(Box(4862, 4862), Box(4862, 4862)),
+ Box(Box(4863, 4863), Box(4863, 4863)),
+ Box(Box(4864, 4864), Box(4864, 4864)),
+ Box(Box(4865, 4865), Box(4865, 4865)),
+ Box(Box(4866, 4866), Box(4866, 4866)),
+ Box(Box(4867, 4867), Box(4867, 4867)),
+ Box(Box(4868, 4868), Box(4868, 4868)),
+ Box(Box(4869, 4869), Box(4869, 4869)),
+ Box(Box(4870, 4870), Box(4870, 4870)),
+ Box(Box(4871, 4871), Box(4871, 4871)),
+ Box(Box(4872, 4872), Box(4872, 4872)),
+ Box(Box(4873, 4873), Box(4873, 4873)),
+ Box(Box(4874, 4874), Box(4874, 4874)),
+ Box(Box(4875, 4875), Box(4875, 4875)),
+ Box(Box(4876, 4876), Box(4876, 4876)),
+ Box(Box(4877, 4877), Box(4877, 4877)),
+ Box(Box(4878, 4878), Box(4878, 4878)),
+ Box(Box(4879, 4879), Box(4879, 4879)),
+ Box(Box(4880, 4880), Box(4880, 4880)),
+ Box(Box(4881, 4881), Box(4881, 4881)),
+ Box(Box(4882, 4882), Box(4882, 4882)),
+ Box(Box(4883, 4883), Box(4883, 4883)),
+ Box(Box(4884, 4884), Box(4884, 4884)),
+ Box(Box(4885, 4885), Box(4885, 4885)),
+ Box(Box(4886, 4886), Box(4886, 4886)),
+ Box(Box(4887, 4887), Box(4887, 4887)),
+ Box(Box(4888, 4888), Box(4888, 4888)),
+ Box(Box(4889, 4889), Box(4889, 4889)),
+ Box(Box(4890, 4890), Box(4890, 4890)),
+ Box(Box(4891, 4891), Box(4891, 4891)),
+ Box(Box(4892, 4892), Box(4892, 4892)),
+ Box(Box(4893, 4893), Box(4893, 4893)),
+ Box(Box(4894, 4894), Box(4894, 4894)),
+ Box(Box(4895, 4895), Box(4895, 4895)),
+ Box(Box(4896, 4896), Box(4896, 4896)),
+ Box(Box(4897, 4897), Box(4897, 4897)),
+ Box(Box(4898, 4898), Box(4898, 4898)),
+ Box(Box(4899, 4899), Box(4899, 4899)),
+ Box(Box(4900, 4900), Box(4900, 4900)),
+ Box(Box(4901, 4901), Box(4901, 4901)),
+ Box(Box(4902, 4902), Box(4902, 4902)),
+ Box(Box(4903, 4903), Box(4903, 4903)),
+ Box(Box(4904, 4904), Box(4904, 4904)),
+ Box(Box(4905, 4905), Box(4905, 4905)),
+ Box(Box(4906, 4906), Box(4906, 4906)),
+ Box(Box(4907, 4907), Box(4907, 4907)),
+ Box(Box(4908, 4908), Box(4908, 4908)),
+ Box(Box(4909, 4909), Box(4909, 4909)),
+ Box(Box(4910, 4910), Box(4910, 4910)),
+ Box(Box(4911, 4911), Box(4911, 4911)),
+ Box(Box(4912, 4912), Box(4912, 4912)),
+ Box(Box(4913, 4913), Box(4913, 4913)),
+ Box(Box(4914, 4914), Box(4914, 4914)),
+ Box(Box(4915, 4915), Box(4915, 4915)),
+ Box(Box(4916, 4916), Box(4916, 4916)),
+ Box(Box(4917, 4917), Box(4917, 4917)),
+ Box(Box(4918, 4918), Box(4918, 4918)),
+ Box(Box(4919, 4919), Box(4919, 4919)),
+ Box(Box(4920, 4920), Box(4920, 4920)),
+ Box(Box(4921, 4921), Box(4921, 4921)),
+ Box(Box(4922, 4922), Box(4922, 4922)),
+ Box(Box(4923, 4923), Box(4923, 4923)),
+ Box(Box(4924, 4924), Box(4924, 4924)),
+ Box(Box(4925, 4925), Box(4925, 4925)),
+ Box(Box(4926, 4926), Box(4926, 4926)),
+ Box(Box(4927, 4927), Box(4927, 4927)),
+ Box(Box(4928, 4928), Box(4928, 4928)),
+ Box(Box(4929, 4929), Box(4929, 4929)),
+ Box(Box(4930, 4930), Box(4930, 4930)),
+ Box(Box(4931, 4931), Box(4931, 4931)),
+ Box(Box(4932, 4932), Box(4932, 4932)),
+ Box(Box(4933, 4933), Box(4933, 4933)),
+ Box(Box(4934, 4934), Box(4934, 4934)),
+ Box(Box(4935, 4935), Box(4935, 4935)),
+ Box(Box(4936, 4936), Box(4936, 4936)),
+ Box(Box(4937, 4937), Box(4937, 4937)),
+ Box(Box(4938, 4938), Box(4938, 4938)),
+ Box(Box(4939, 4939), Box(4939, 4939)),
+ Box(Box(4940, 4940), Box(4940, 4940)),
+ Box(Box(4941, 4941), Box(4941, 4941)),
+ Box(Box(4942, 4942), Box(4942, 4942)),
+ Box(Box(4943, 4943), Box(4943, 4943)),
+ Box(Box(4944, 4944), Box(4944, 4944)),
+ Box(Box(4945, 4945), Box(4945, 4945)),
+ Box(Box(4946, 4946), Box(4946, 4946)),
+ Box(Box(4947, 4947), Box(4947, 4947)),
+ Box(Box(4948, 4948), Box(4948, 4948)),
+ Box(Box(4949, 4949), Box(4949, 4949)),
+ Box(Box(4950, 4950), Box(4950, 4950)),
+ Box(Box(4951, 4951), Box(4951, 4951)),
+ Box(Box(4952, 4952), Box(4952, 4952)),
+ Box(Box(4953, 4953), Box(4953, 4953)),
+ Box(Box(4954, 4954), Box(4954, 4954)),
+ Box(Box(4955, 4955), Box(4955, 4955)),
+ Box(Box(4956, 4956), Box(4956, 4956)),
+ Box(Box(4957, 4957), Box(4957, 4957)),
+ Box(Box(4958, 4958), Box(4958, 4958)),
+ Box(Box(4959, 4959), Box(4959, 4959)),
+ Box(Box(4960, 4960), Box(4960, 4960)),
+ Box(Box(4961, 4961), Box(4961, 4961)),
+ Box(Box(4962, 4962), Box(4962, 4962)),
+ Box(Box(4963, 4963), Box(4963, 4963)),
+ Box(Box(4964, 4964), Box(4964, 4964)),
+ Box(Box(4965, 4965), Box(4965, 4965)),
+ Box(Box(4966, 4966), Box(4966, 4966)),
+ Box(Box(4967, 4967), Box(4967, 4967)),
+ Box(Box(4968, 4968), Box(4968, 4968)),
+ Box(Box(4969, 4969), Box(4969, 4969)),
+ Box(Box(4970, 4970), Box(4970, 4970)),
+ Box(Box(4971, 4971), Box(4971, 4971)),
+ Box(Box(4972, 4972), Box(4972, 4972)),
+ Box(Box(4973, 4973), Box(4973, 4973)),
+ Box(Box(4974, 4974), Box(4974, 4974)),
+ Box(Box(4975, 4975), Box(4975, 4975)),
+ Box(Box(4976, 4976), Box(4976, 4976)),
+ Box(Box(4977, 4977), Box(4977, 4977)),
+ Box(Box(4978, 4978), Box(4978, 4978)),
+ Box(Box(4979, 4979), Box(4979, 4979)),
+ Box(Box(4980, 4980), Box(4980, 4980)),
+ Box(Box(4981, 4981), Box(4981, 4981)),
+ Box(Box(4982, 4982), Box(4982, 4982)),
+ Box(Box(4983, 4983), Box(4983, 4983)),
+ Box(Box(4984, 4984), Box(4984, 4984)),
+ Box(Box(4985, 4985), Box(4985, 4985)),
+ Box(Box(4986, 4986), Box(4986, 4986)),
+ Box(Box(4987, 4987), Box(4987, 4987)),
+ Box(Box(4988, 4988), Box(4988, 4988)),
+ Box(Box(4989, 4989), Box(4989, 4989)),
+ Box(Box(4990, 4990), Box(4990, 4990)),
+ Box(Box(4991, 4991), Box(4991, 4991)),
+ Box(Box(4992, 4992), Box(4992, 4992)),
+ Box(Box(4993, 4993), Box(4993, 4993)),
+ Box(Box(4994, 4994), Box(4994, 4994)),
+ Box(Box(4995, 4995), Box(4995, 4995)),
+ Box(Box(4996, 4996), Box(4996, 4996)),
+ Box(Box(4997, 4997), Box(4997, 4997)),
+ Box(Box(4998, 4998), Box(4998, 4998)),
+ Box(Box(4999, 4999), Box(4999, 4999)),
+ Box(Box(5000, 5000), Box(5000, 5000)),
+ Box(Box(5001, 5001), Box(5001, 5001)),
+ Box(Box(5002, 5002), Box(5002, 5002)),
+ Box(Box(5003, 5003), Box(5003, 5003)),
+ Box(Box(5004, 5004), Box(5004, 5004)),
+ Box(Box(5005, 5005), Box(5005, 5005)),
+ Box(Box(5006, 5006), Box(5006, 5006)),
+ Box(Box(5007, 5007), Box(5007, 5007)),
+ Box(Box(5008, 5008), Box(5008, 5008)),
+ Box(Box(5009, 5009), Box(5009, 5009)),
+ Box(Box(5010, 5010), Box(5010, 5010)),
+ Box(Box(5011, 5011), Box(5011, 5011)),
+ Box(Box(5012, 5012), Box(5012, 5012)),
+ Box(Box(5013, 5013), Box(5013, 5013)),
+ Box(Box(5014, 5014), Box(5014, 5014)),
+ Box(Box(5015, 5015), Box(5015, 5015)),
+ Box(Box(5016, 5016), Box(5016, 5016)),
+ Box(Box(5017, 5017), Box(5017, 5017)),
+ Box(Box(5018, 5018), Box(5018, 5018)),
+ Box(Box(5019, 5019), Box(5019, 5019)),
+ Box(Box(5020, 5020), Box(5020, 5020)),
+ Box(Box(5021, 5021), Box(5021, 5021)),
+ Box(Box(5022, 5022), Box(5022, 5022)),
+ Box(Box(5023, 5023), Box(5023, 5023)),
+ Box(Box(5024, 5024), Box(5024, 5024)),
+ Box(Box(5025, 5025), Box(5025, 5025)),
+ Box(Box(5026, 5026), Box(5026, 5026)),
+ Box(Box(5027, 5027), Box(5027, 5027)),
+ Box(Box(5028, 5028), Box(5028, 5028)),
+ Box(Box(5029, 5029), Box(5029, 5029)),
+ Box(Box(5030, 5030), Box(5030, 5030)),
+ Box(Box(5031, 5031), Box(5031, 5031)),
+ Box(Box(5032, 5032), Box(5032, 5032)),
+ Box(Box(5033, 5033), Box(5033, 5033)),
+ Box(Box(5034, 5034), Box(5034, 5034)),
+ Box(Box(5035, 5035), Box(5035, 5035)),
+ Box(Box(5036, 5036), Box(5036, 5036)),
+ Box(Box(5037, 5037), Box(5037, 5037)),
+ Box(Box(5038, 5038), Box(5038, 5038)),
+ Box(Box(5039, 5039), Box(5039, 5039)),
+ Box(Box(5040, 5040), Box(5040, 5040)),
+ Box(Box(5041, 5041), Box(5041, 5041)),
+ Box(Box(5042, 5042), Box(5042, 5042)),
+ Box(Box(5043, 5043), Box(5043, 5043)),
+ Box(Box(5044, 5044), Box(5044, 5044)),
+ Box(Box(5045, 5045), Box(5045, 5045)),
+ Box(Box(5046, 5046), Box(5046, 5046)),
+ Box(Box(5047, 5047), Box(5047, 5047)),
+ Box(Box(5048, 5048), Box(5048, 5048)),
+ Box(Box(5049, 5049), Box(5049, 5049)),
+ Box(Box(5050, 5050), Box(5050, 5050)),
+ Box(Box(5051, 5051), Box(5051, 5051)),
+ Box(Box(5052, 5052), Box(5052, 5052)),
+ Box(Box(5053, 5053), Box(5053, 5053)),
+ Box(Box(5054, 5054), Box(5054, 5054)),
+ Box(Box(5055, 5055), Box(5055, 5055)),
+ Box(Box(5056, 5056), Box(5056, 5056)),
+ Box(Box(5057, 5057), Box(5057, 5057)),
+ Box(Box(5058, 5058), Box(5058, 5058)),
+ Box(Box(5059, 5059), Box(5059, 5059)),
+ Box(Box(5060, 5060), Box(5060, 5060)),
+ Box(Box(5061, 5061), Box(5061, 5061)),
+ Box(Box(5062, 5062), Box(5062, 5062)),
+ Box(Box(5063, 5063), Box(5063, 5063)),
+ Box(Box(5064, 5064), Box(5064, 5064)),
+ Box(Box(5065, 5065), Box(5065, 5065)),
+ Box(Box(5066, 5066), Box(5066, 5066)),
+ Box(Box(5067, 5067), Box(5067, 5067)),
+ Box(Box(5068, 5068), Box(5068, 5068)),
+ Box(Box(5069, 5069), Box(5069, 5069)),
+ Box(Box(5070, 5070), Box(5070, 5070)),
+ Box(Box(5071, 5071), Box(5071, 5071)),
+ Box(Box(5072, 5072), Box(5072, 5072)),
+ Box(Box(5073, 5073), Box(5073, 5073)),
+ Box(Box(5074, 5074), Box(5074, 5074)),
+ Box(Box(5075, 5075), Box(5075, 5075)),
+ Box(Box(5076, 5076), Box(5076, 5076)),
+ Box(Box(5077, 5077), Box(5077, 5077)),
+ Box(Box(5078, 5078), Box(5078, 5078)),
+ Box(Box(5079, 5079), Box(5079, 5079)),
+ Box(Box(5080, 5080), Box(5080, 5080)),
+ Box(Box(5081, 5081), Box(5081, 5081)),
+ Box(Box(5082, 5082), Box(5082, 5082)),
+ Box(Box(5083, 5083), Box(5083, 5083)),
+ Box(Box(5084, 5084), Box(5084, 5084)),
+ Box(Box(5085, 5085), Box(5085, 5085)),
+ Box(Box(5086, 5086), Box(5086, 5086)),
+ Box(Box(5087, 5087), Box(5087, 5087)),
+ Box(Box(5088, 5088), Box(5088, 5088)),
+ Box(Box(5089, 5089), Box(5089, 5089)),
+ Box(Box(5090, 5090), Box(5090, 5090)),
+ Box(Box(5091, 5091), Box(5091, 5091)),
+ Box(Box(5092, 5092), Box(5092, 5092)),
+ Box(Box(5093, 5093), Box(5093, 5093)),
+ Box(Box(5094, 5094), Box(5094, 5094)),
+ Box(Box(5095, 5095), Box(5095, 5095)),
+ Box(Box(5096, 5096), Box(5096, 5096)),
+ Box(Box(5097, 5097), Box(5097, 5097)),
+ Box(Box(5098, 5098), Box(5098, 5098)),
+ Box(Box(5099, 5099), Box(5099, 5099)),
+ Box(Box(5100, 5100), Box(5100, 5100)),
+ Box(Box(5101, 5101), Box(5101, 5101)),
+ Box(Box(5102, 5102), Box(5102, 5102)),
+ Box(Box(5103, 5103), Box(5103, 5103)),
+ Box(Box(5104, 5104), Box(5104, 5104)),
+ Box(Box(5105, 5105), Box(5105, 5105)),
+ Box(Box(5106, 5106), Box(5106, 5106)),
+ Box(Box(5107, 5107), Box(5107, 5107)),
+ Box(Box(5108, 5108), Box(5108, 5108)),
+ Box(Box(5109, 5109), Box(5109, 5109)),
+ Box(Box(5110, 5110), Box(5110, 5110)),
+ Box(Box(5111, 5111), Box(5111, 5111)),
+ Box(Box(5112, 5112), Box(5112, 5112)),
+ Box(Box(5113, 5113), Box(5113, 5113)),
+ Box(Box(5114, 5114), Box(5114, 5114)),
+ Box(Box(5115, 5115), Box(5115, 5115)),
+ Box(Box(5116, 5116), Box(5116, 5116)),
+ Box(Box(5117, 5117), Box(5117, 5117)),
+ Box(Box(5118, 5118), Box(5118, 5118)),
+ Box(Box(5119, 5119), Box(5119, 5119)),
+ Box(Box(5120, 5120), Box(5120, 5120)),
+ Box(Box(5121, 5121), Box(5121, 5121)),
+ Box(Box(5122, 5122), Box(5122, 5122)),
+ Box(Box(5123, 5123), Box(5123, 5123)),
+ Box(Box(5124, 5124), Box(5124, 5124)),
+ Box(Box(5125, 5125), Box(5125, 5125)),
+ Box(Box(5126, 5126), Box(5126, 5126)),
+ Box(Box(5127, 5127), Box(5127, 5127)),
+ Box(Box(5128, 5128), Box(5128, 5128)),
+ Box(Box(5129, 5129), Box(5129, 5129)),
+ Box(Box(5130, 5130), Box(5130, 5130)),
+ Box(Box(5131, 5131), Box(5131, 5131)),
+ Box(Box(5132, 5132), Box(5132, 5132)),
+ Box(Box(5133, 5133), Box(5133, 5133)),
+ Box(Box(5134, 5134), Box(5134, 5134)),
+ Box(Box(5135, 5135), Box(5135, 5135)),
+ Box(Box(5136, 5136), Box(5136, 5136)),
+ Box(Box(5137, 5137), Box(5137, 5137)),
+ Box(Box(5138, 5138), Box(5138, 5138)),
+ Box(Box(5139, 5139), Box(5139, 5139)),
+ Box(Box(5140, 5140), Box(5140, 5140)),
+ Box(Box(5141, 5141), Box(5141, 5141)),
+ Box(Box(5142, 5142), Box(5142, 5142)),
+ Box(Box(5143, 5143), Box(5143, 5143)),
+ Box(Box(5144, 5144), Box(5144, 5144)),
+ Box(Box(5145, 5145), Box(5145, 5145)),
+ Box(Box(5146, 5146), Box(5146, 5146)),
+ Box(Box(5147, 5147), Box(5147, 5147)),
+ Box(Box(5148, 5148), Box(5148, 5148)),
+ Box(Box(5149, 5149), Box(5149, 5149)),
+ Box(Box(5150, 5150), Box(5150, 5150)),
+ Box(Box(5151, 5151), Box(5151, 5151)),
+ Box(Box(5152, 5152), Box(5152, 5152)),
+ Box(Box(5153, 5153), Box(5153, 5153)),
+ Box(Box(5154, 5154), Box(5154, 5154)),
+ Box(Box(5155, 5155), Box(5155, 5155)),
+ Box(Box(5156, 5156), Box(5156, 5156)),
+ Box(Box(5157, 5157), Box(5157, 5157)),
+ Box(Box(5158, 5158), Box(5158, 5158)),
+ Box(Box(5159, 5159), Box(5159, 5159)),
+ Box(Box(5160, 5160), Box(5160, 5160)),
+ Box(Box(5161, 5161), Box(5161, 5161)),
+ Box(Box(5162, 5162), Box(5162, 5162)),
+ Box(Box(5163, 5163), Box(5163, 5163)),
+ Box(Box(5164, 5164), Box(5164, 5164)),
+ Box(Box(5165, 5165), Box(5165, 5165)),
+ Box(Box(5166, 5166), Box(5166, 5166)),
+ Box(Box(5167, 5167), Box(5167, 5167)),
+ Box(Box(5168, 5168), Box(5168, 5168)),
+ Box(Box(5169, 5169), Box(5169, 5169)),
+ Box(Box(5170, 5170), Box(5170, 5170)),
+ Box(Box(5171, 5171), Box(5171, 5171)),
+ Box(Box(5172, 5172), Box(5172, 5172)),
+ Box(Box(5173, 5173), Box(5173, 5173)),
+ Box(Box(5174, 5174), Box(5174, 5174)),
+ Box(Box(5175, 5175), Box(5175, 5175)),
+ Box(Box(5176, 5176), Box(5176, 5176)),
+ Box(Box(5177, 5177), Box(5177, 5177)),
+ Box(Box(5178, 5178), Box(5178, 5178)),
+ Box(Box(5179, 5179), Box(5179, 5179)),
+ Box(Box(5180, 5180), Box(5180, 5180)),
+ Box(Box(5181, 5181), Box(5181, 5181)),
+ Box(Box(5182, 5182), Box(5182, 5182)),
+ Box(Box(5183, 5183), Box(5183, 5183)),
+ Box(Box(5184, 5184), Box(5184, 5184)),
+ Box(Box(5185, 5185), Box(5185, 5185)),
+ Box(Box(5186, 5186), Box(5186, 5186)),
+ Box(Box(5187, 5187), Box(5187, 5187)),
+ Box(Box(5188, 5188), Box(5188, 5188)),
+ Box(Box(5189, 5189), Box(5189, 5189)),
+ Box(Box(5190, 5190), Box(5190, 5190)),
+ Box(Box(5191, 5191), Box(5191, 5191)),
+ Box(Box(5192, 5192), Box(5192, 5192)),
+ Box(Box(5193, 5193), Box(5193, 5193)),
+ Box(Box(5194, 5194), Box(5194, 5194)),
+ Box(Box(5195, 5195), Box(5195, 5195)),
+ Box(Box(5196, 5196), Box(5196, 5196)),
+ Box(Box(5197, 5197), Box(5197, 5197)),
+ Box(Box(5198, 5198), Box(5198, 5198)),
+ Box(Box(5199, 5199), Box(5199, 5199)),
+ Box(Box(5200, 5200), Box(5200, 5200)),
+ Box(Box(5201, 5201), Box(5201, 5201)),
+ Box(Box(5202, 5202), Box(5202, 5202)),
+ Box(Box(5203, 5203), Box(5203, 5203)),
+ Box(Box(5204, 5204), Box(5204, 5204)),
+ Box(Box(5205, 5205), Box(5205, 5205)),
+ Box(Box(5206, 5206), Box(5206, 5206)),
+ Box(Box(5207, 5207), Box(5207, 5207)),
+ Box(Box(5208, 5208), Box(5208, 5208)),
+ Box(Box(5209, 5209), Box(5209, 5209)),
+ Box(Box(5210, 5210), Box(5210, 5210)),
+ Box(Box(5211, 5211), Box(5211, 5211)),
+ Box(Box(5212, 5212), Box(5212, 5212)),
+ Box(Box(5213, 5213), Box(5213, 5213)),
+ Box(Box(5214, 5214), Box(5214, 5214)),
+ Box(Box(5215, 5215), Box(5215, 5215)),
+ Box(Box(5216, 5216), Box(5216, 5216)),
+ Box(Box(5217, 5217), Box(5217, 5217)),
+ Box(Box(5218, 5218), Box(5218, 5218)),
+ Box(Box(5219, 5219), Box(5219, 5219)),
+ Box(Box(5220, 5220), Box(5220, 5220)),
+ Box(Box(5221, 5221), Box(5221, 5221)),
+ Box(Box(5222, 5222), Box(5222, 5222)),
+ Box(Box(5223, 5223), Box(5223, 5223)),
+ Box(Box(5224, 5224), Box(5224, 5224)),
+ Box(Box(5225, 5225), Box(5225, 5225)),
+ Box(Box(5226, 5226), Box(5226, 5226)),
+ Box(Box(5227, 5227), Box(5227, 5227)),
+ Box(Box(5228, 5228), Box(5228, 5228)),
+ Box(Box(5229, 5229), Box(5229, 5229)),
+ Box(Box(5230, 5230), Box(5230, 5230)),
+ Box(Box(5231, 5231), Box(5231, 5231)),
+ Box(Box(5232, 5232), Box(5232, 5232)),
+ Box(Box(5233, 5233), Box(5233, 5233)),
+ Box(Box(5234, 5234), Box(5234, 5234)),
+ Box(Box(5235, 5235), Box(5235, 5235)),
+ Box(Box(5236, 5236), Box(5236, 5236)),
+ Box(Box(5237, 5237), Box(5237, 5237)),
+ Box(Box(5238, 5238), Box(5238, 5238)),
+ Box(Box(5239, 5239), Box(5239, 5239)),
+ Box(Box(5240, 5240), Box(5240, 5240)),
+ Box(Box(5241, 5241), Box(5241, 5241)),
+ Box(Box(5242, 5242), Box(5242, 5242)),
+ Box(Box(5243, 5243), Box(5243, 5243)),
+ Box(Box(5244, 5244), Box(5244, 5244)),
+ Box(Box(5245, 5245), Box(5245, 5245)),
+ Box(Box(5246, 5246), Box(5246, 5246)),
+ Box(Box(5247, 5247), Box(5247, 5247)),
+ Box(Box(5248, 5248), Box(5248, 5248)),
+ Box(Box(5249, 5249), Box(5249, 5249)),
+ Box(Box(5250, 5250), Box(5250, 5250)),
+ Box(Box(5251, 5251), Box(5251, 5251)),
+ Box(Box(5252, 5252), Box(5252, 5252)),
+ Box(Box(5253, 5253), Box(5253, 5253)),
+ Box(Box(5254, 5254), Box(5254, 5254)),
+ Box(Box(5255, 5255), Box(5255, 5255)),
+ Box(Box(5256, 5256), Box(5256, 5256)),
+ Box(Box(5257, 5257), Box(5257, 5257)),
+ Box(Box(5258, 5258), Box(5258, 5258)),
+ Box(Box(5259, 5259), Box(5259, 5259)),
+ Box(Box(5260, 5260), Box(5260, 5260)),
+ Box(Box(5261, 5261), Box(5261, 5261)),
+ Box(Box(5262, 5262), Box(5262, 5262)),
+ Box(Box(5263, 5263), Box(5263, 5263)),
+ Box(Box(5264, 5264), Box(5264, 5264)),
+ Box(Box(5265, 5265), Box(5265, 5265)),
+ Box(Box(5266, 5266), Box(5266, 5266)),
+ Box(Box(5267, 5267), Box(5267, 5267)),
+ Box(Box(5268, 5268), Box(5268, 5268)),
+ Box(Box(5269, 5269), Box(5269, 5269)),
+ Box(Box(5270, 5270), Box(5270, 5270)),
+ Box(Box(5271, 5271), Box(5271, 5271)),
+ Box(Box(5272, 5272), Box(5272, 5272)),
+ Box(Box(5273, 5273), Box(5273, 5273)),
+ Box(Box(5274, 5274), Box(5274, 5274)),
+ Box(Box(5275, 5275), Box(5275, 5275)),
+ Box(Box(5276, 5276), Box(5276, 5276)),
+ Box(Box(5277, 5277), Box(5277, 5277)),
+ Box(Box(5278, 5278), Box(5278, 5278)),
+ Box(Box(5279, 5279), Box(5279, 5279)),
+ Box(Box(5280, 5280), Box(5280, 5280)),
+ Box(Box(5281, 5281), Box(5281, 5281)),
+ Box(Box(5282, 5282), Box(5282, 5282)),
+ Box(Box(5283, 5283), Box(5283, 5283)),
+ Box(Box(5284, 5284), Box(5284, 5284)),
+ Box(Box(5285, 5285), Box(5285, 5285)),
+ Box(Box(5286, 5286), Box(5286, 5286)),
+ Box(Box(5287, 5287), Box(5287, 5287)),
+ Box(Box(5288, 5288), Box(5288, 5288)),
+ Box(Box(5289, 5289), Box(5289, 5289)),
+ Box(Box(5290, 5290), Box(5290, 5290)),
+ Box(Box(5291, 5291), Box(5291, 5291)),
+ Box(Box(5292, 5292), Box(5292, 5292)),
+ Box(Box(5293, 5293), Box(5293, 5293)),
+ Box(Box(5294, 5294), Box(5294, 5294)),
+ Box(Box(5295, 5295), Box(5295, 5295)),
+ Box(Box(5296, 5296), Box(5296, 5296)),
+ Box(Box(5297, 5297), Box(5297, 5297)),
+ Box(Box(5298, 5298), Box(5298, 5298)),
+ Box(Box(5299, 5299), Box(5299, 5299)),
+ Box(Box(5300, 5300), Box(5300, 5300)),
+ Box(Box(5301, 5301), Box(5301, 5301)),
+ Box(Box(5302, 5302), Box(5302, 5302)),
+ Box(Box(5303, 5303), Box(5303, 5303)),
+ Box(Box(5304, 5304), Box(5304, 5304)),
+ Box(Box(5305, 5305), Box(5305, 5305)),
+ Box(Box(5306, 5306), Box(5306, 5306)),
+ Box(Box(5307, 5307), Box(5307, 5307)),
+ Box(Box(5308, 5308), Box(5308, 5308)),
+ Box(Box(5309, 5309), Box(5309, 5309)),
+ Box(Box(5310, 5310), Box(5310, 5310)),
+ Box(Box(5311, 5311), Box(5311, 5311)),
+ Box(Box(5312, 5312), Box(5312, 5312)),
+ Box(Box(5313, 5313), Box(5313, 5313)),
+ Box(Box(5314, 5314), Box(5314, 5314)),
+ Box(Box(5315, 5315), Box(5315, 5315)),
+ Box(Box(5316, 5316), Box(5316, 5316)),
+ Box(Box(5317, 5317), Box(5317, 5317)),
+ Box(Box(5318, 5318), Box(5318, 5318)),
+ Box(Box(5319, 5319), Box(5319, 5319)),
+ Box(Box(5320, 5320), Box(5320, 5320)),
+ Box(Box(5321, 5321), Box(5321, 5321)),
+ Box(Box(5322, 5322), Box(5322, 5322)),
+ Box(Box(5323, 5323), Box(5323, 5323)),
+ Box(Box(5324, 5324), Box(5324, 5324)),
+ Box(Box(5325, 5325), Box(5325, 5325)),
+ Box(Box(5326, 5326), Box(5326, 5326)),
+ Box(Box(5327, 5327), Box(5327, 5327)),
+ Box(Box(5328, 5328), Box(5328, 5328)),
+ Box(Box(5329, 5329), Box(5329, 5329)),
+ Box(Box(5330, 5330), Box(5330, 5330)),
+ Box(Box(5331, 5331), Box(5331, 5331)),
+ Box(Box(5332, 5332), Box(5332, 5332)),
+ Box(Box(5333, 5333), Box(5333, 5333)),
+ Box(Box(5334, 5334), Box(5334, 5334)),
+ Box(Box(5335, 5335), Box(5335, 5335)),
+ Box(Box(5336, 5336), Box(5336, 5336)),
+ Box(Box(5337, 5337), Box(5337, 5337)),
+ Box(Box(5338, 5338), Box(5338, 5338)),
+ Box(Box(5339, 5339), Box(5339, 5339)),
+ Box(Box(5340, 5340), Box(5340, 5340)),
+ Box(Box(5341, 5341), Box(5341, 5341)),
+ Box(Box(5342, 5342), Box(5342, 5342)),
+ Box(Box(5343, 5343), Box(5343, 5343)),
+ Box(Box(5344, 5344), Box(5344, 5344)),
+ Box(Box(5345, 5345), Box(5345, 5345)),
+ Box(Box(5346, 5346), Box(5346, 5346)),
+ Box(Box(5347, 5347), Box(5347, 5347)),
+ Box(Box(5348, 5348), Box(5348, 5348)),
+ Box(Box(5349, 5349), Box(5349, 5349)),
+ Box(Box(5350, 5350), Box(5350, 5350)),
+ Box(Box(5351, 5351), Box(5351, 5351)),
+ Box(Box(5352, 5352), Box(5352, 5352)),
+ Box(Box(5353, 5353), Box(5353, 5353)),
+ Box(Box(5354, 5354), Box(5354, 5354)),
+ Box(Box(5355, 5355), Box(5355, 5355)),
+ Box(Box(5356, 5356), Box(5356, 5356)),
+ Box(Box(5357, 5357), Box(5357, 5357)),
+ Box(Box(5358, 5358), Box(5358, 5358)),
+ Box(Box(5359, 5359), Box(5359, 5359)),
+ Box(Box(5360, 5360), Box(5360, 5360)),
+ Box(Box(5361, 5361), Box(5361, 5361)),
+ Box(Box(5362, 5362), Box(5362, 5362)),
+ Box(Box(5363, 5363), Box(5363, 5363)),
+ Box(Box(5364, 5364), Box(5364, 5364)),
+ Box(Box(5365, 5365), Box(5365, 5365)),
+ Box(Box(5366, 5366), Box(5366, 5366)),
+ Box(Box(5367, 5367), Box(5367, 5367)),
+ Box(Box(5368, 5368), Box(5368, 5368)),
+ Box(Box(5369, 5369), Box(5369, 5369)),
+ Box(Box(5370, 5370), Box(5370, 5370)),
+ Box(Box(5371, 5371), Box(5371, 5371)),
+ Box(Box(5372, 5372), Box(5372, 5372)),
+ Box(Box(5373, 5373), Box(5373, 5373)),
+ Box(Box(5374, 5374), Box(5374, 5374)),
+ Box(Box(5375, 5375), Box(5375, 5375)),
+ Box(Box(5376, 5376), Box(5376, 5376)),
+ Box(Box(5377, 5377), Box(5377, 5377)),
+ Box(Box(5378, 5378), Box(5378, 5378)),
+ Box(Box(5379, 5379), Box(5379, 5379)),
+ Box(Box(5380, 5380), Box(5380, 5380)),
+ Box(Box(5381, 5381), Box(5381, 5381)),
+ Box(Box(5382, 5382), Box(5382, 5382)),
+ Box(Box(5383, 5383), Box(5383, 5383)),
+ Box(Box(5384, 5384), Box(5384, 5384)),
+ Box(Box(5385, 5385), Box(5385, 5385)),
+ Box(Box(5386, 5386), Box(5386, 5386)),
+ Box(Box(5387, 5387), Box(5387, 5387)),
+ Box(Box(5388, 5388), Box(5388, 5388)),
+ Box(Box(5389, 5389), Box(5389, 5389)),
+ Box(Box(5390, 5390), Box(5390, 5390)),
+ Box(Box(5391, 5391), Box(5391, 5391)),
+ Box(Box(5392, 5392), Box(5392, 5392)),
+ Box(Box(5393, 5393), Box(5393, 5393)),
+ Box(Box(5394, 5394), Box(5394, 5394)),
+ Box(Box(5395, 5395), Box(5395, 5395)),
+ Box(Box(5396, 5396), Box(5396, 5396)),
+ Box(Box(5397, 5397), Box(5397, 5397)),
+ Box(Box(5398, 5398), Box(5398, 5398)),
+ Box(Box(5399, 5399), Box(5399, 5399)),
+ Box(Box(5400, 5400), Box(5400, 5400)),
+ Box(Box(5401, 5401), Box(5401, 5401)),
+ Box(Box(5402, 5402), Box(5402, 5402)),
+ Box(Box(5403, 5403), Box(5403, 5403)),
+ Box(Box(5404, 5404), Box(5404, 5404)),
+ Box(Box(5405, 5405), Box(5405, 5405)),
+ Box(Box(5406, 5406), Box(5406, 5406)),
+ Box(Box(5407, 5407), Box(5407, 5407)),
+ Box(Box(5408, 5408), Box(5408, 5408)),
+ Box(Box(5409, 5409), Box(5409, 5409)),
+ Box(Box(5410, 5410), Box(5410, 5410)),
+ Box(Box(5411, 5411), Box(5411, 5411)),
+ Box(Box(5412, 5412), Box(5412, 5412)),
+ Box(Box(5413, 5413), Box(5413, 5413)),
+ Box(Box(5414, 5414), Box(5414, 5414)),
+ Box(Box(5415, 5415), Box(5415, 5415)),
+ Box(Box(5416, 5416), Box(5416, 5416)),
+ Box(Box(5417, 5417), Box(5417, 5417)),
+ Box(Box(5418, 5418), Box(5418, 5418)),
+ Box(Box(5419, 5419), Box(5419, 5419)),
+ Box(Box(5420, 5420), Box(5420, 5420)),
+ Box(Box(5421, 5421), Box(5421, 5421)),
+ Box(Box(5422, 5422), Box(5422, 5422)),
+ Box(Box(5423, 5423), Box(5423, 5423)),
+ Box(Box(5424, 5424), Box(5424, 5424)),
+ Box(Box(5425, 5425), Box(5425, 5425)),
+ Box(Box(5426, 5426), Box(5426, 5426)),
+ Box(Box(5427, 5427), Box(5427, 5427)),
+ Box(Box(5428, 5428), Box(5428, 5428)),
+ Box(Box(5429, 5429), Box(5429, 5429)),
+ Box(Box(5430, 5430), Box(5430, 5430)),
+ Box(Box(5431, 5431), Box(5431, 5431)),
+ Box(Box(5432, 5432), Box(5432, 5432)),
+ Box(Box(5433, 5433), Box(5433, 5433)),
+ Box(Box(5434, 5434), Box(5434, 5434)),
+ Box(Box(5435, 5435), Box(5435, 5435)),
+ Box(Box(5436, 5436), Box(5436, 5436)),
+ Box(Box(5437, 5437), Box(5437, 5437)),
+ Box(Box(5438, 5438), Box(5438, 5438)),
+ Box(Box(5439, 5439), Box(5439, 5439)),
+ Box(Box(5440, 5440), Box(5440, 5440)),
+ Box(Box(5441, 5441), Box(5441, 5441)),
+ Box(Box(5442, 5442), Box(5442, 5442)),
+ Box(Box(5443, 5443), Box(5443, 5443)),
+ Box(Box(5444, 5444), Box(5444, 5444)),
+ Box(Box(5445, 5445), Box(5445, 5445)),
+ Box(Box(5446, 5446), Box(5446, 5446)),
+ Box(Box(5447, 5447), Box(5447, 5447)),
+ Box(Box(5448, 5448), Box(5448, 5448)),
+ Box(Box(5449, 5449), Box(5449, 5449)),
+ Box(Box(5450, 5450), Box(5450, 5450)),
+ Box(Box(5451, 5451), Box(5451, 5451)),
+ Box(Box(5452, 5452), Box(5452, 5452)),
+ Box(Box(5453, 5453), Box(5453, 5453)),
+ Box(Box(5454, 5454), Box(5454, 5454)),
+ Box(Box(5455, 5455), Box(5455, 5455)),
+ Box(Box(5456, 5456), Box(5456, 5456)),
+ Box(Box(5457, 5457), Box(5457, 5457)),
+ Box(Box(5458, 5458), Box(5458, 5458)),
+ Box(Box(5459, 5459), Box(5459, 5459)),
+ Box(Box(5460, 5460), Box(5460, 5460)),
+ Box(Box(5461, 5461), Box(5461, 5461)),
+ Box(Box(5462, 5462), Box(5462, 5462)),
+ Box(Box(5463, 5463), Box(5463, 5463)),
+ Box(Box(5464, 5464), Box(5464, 5464)),
+ Box(Box(5465, 5465), Box(5465, 5465)),
+ Box(Box(5466, 5466), Box(5466, 5466)),
+ Box(Box(5467, 5467), Box(5467, 5467)),
+ Box(Box(5468, 5468), Box(5468, 5468)),
+ Box(Box(5469, 5469), Box(5469, 5469)),
+ Box(Box(5470, 5470), Box(5470, 5470)),
+ Box(Box(5471, 5471), Box(5471, 5471)),
+ Box(Box(5472, 5472), Box(5472, 5472)),
+ Box(Box(5473, 5473), Box(5473, 5473)),
+ Box(Box(5474, 5474), Box(5474, 5474)),
+ Box(Box(5475, 5475), Box(5475, 5475)),
+ Box(Box(5476, 5476), Box(5476, 5476)),
+ Box(Box(5477, 5477), Box(5477, 5477)),
+ Box(Box(5478, 5478), Box(5478, 5478)),
+ Box(Box(5479, 5479), Box(5479, 5479)),
+ Box(Box(5480, 5480), Box(5480, 5480)),
+ Box(Box(5481, 5481), Box(5481, 5481)),
+ Box(Box(5482, 5482), Box(5482, 5482)),
+ Box(Box(5483, 5483), Box(5483, 5483)),
+ Box(Box(5484, 5484), Box(5484, 5484)),
+ Box(Box(5485, 5485), Box(5485, 5485)),
+ Box(Box(5486, 5486), Box(5486, 5486)),
+ Box(Box(5487, 5487), Box(5487, 5487)),
+ Box(Box(5488, 5488), Box(5488, 5488)),
+ Box(Box(5489, 5489), Box(5489, 5489)),
+ Box(Box(5490, 5490), Box(5490, 5490)),
+ Box(Box(5491, 5491), Box(5491, 5491)),
+ Box(Box(5492, 5492), Box(5492, 5492)),
+ Box(Box(5493, 5493), Box(5493, 5493)),
+ Box(Box(5494, 5494), Box(5494, 5494)),
+ Box(Box(5495, 5495), Box(5495, 5495)),
+ Box(Box(5496, 5496), Box(5496, 5496)),
+ Box(Box(5497, 5497), Box(5497, 5497)),
+ Box(Box(5498, 5498), Box(5498, 5498)),
+ Box(Box(5499, 5499), Box(5499, 5499)),
+ Box(Box(5500, 5500), Box(5500, 5500)),
+ Box(Box(5501, 5501), Box(5501, 5501)),
+ Box(Box(5502, 5502), Box(5502, 5502)),
+ Box(Box(5503, 5503), Box(5503, 5503)),
+ Box(Box(5504, 5504), Box(5504, 5504)),
+ Box(Box(5505, 5505), Box(5505, 5505)),
+ Box(Box(5506, 5506), Box(5506, 5506)),
+ Box(Box(5507, 5507), Box(5507, 5507)),
+ Box(Box(5508, 5508), Box(5508, 5508)),
+ Box(Box(5509, 5509), Box(5509, 5509)),
+ Box(Box(5510, 5510), Box(5510, 5510)),
+ Box(Box(5511, 5511), Box(5511, 5511)),
+ Box(Box(5512, 5512), Box(5512, 5512)),
+ Box(Box(5513, 5513), Box(5513, 5513)),
+ Box(Box(5514, 5514), Box(5514, 5514)),
+ Box(Box(5515, 5515), Box(5515, 5515)),
+ Box(Box(5516, 5516), Box(5516, 5516)),
+ Box(Box(5517, 5517), Box(5517, 5517)),
+ Box(Box(5518, 5518), Box(5518, 5518)),
+ Box(Box(5519, 5519), Box(5519, 5519)),
+ Box(Box(5520, 5520), Box(5520, 5520)),
+ Box(Box(5521, 5521), Box(5521, 5521)),
+ Box(Box(5522, 5522), Box(5522, 5522)),
+ Box(Box(5523, 5523), Box(5523, 5523)),
+ Box(Box(5524, 5524), Box(5524, 5524)),
+ Box(Box(5525, 5525), Box(5525, 5525)),
+ Box(Box(5526, 5526), Box(5526, 5526)),
+ Box(Box(5527, 5527), Box(5527, 5527)),
+ Box(Box(5528, 5528), Box(5528, 5528)),
+ Box(Box(5529, 5529), Box(5529, 5529)),
+ Box(Box(5530, 5530), Box(5530, 5530)),
+ Box(Box(5531, 5531), Box(5531, 5531)),
+ Box(Box(5532, 5532), Box(5532, 5532)),
+ Box(Box(5533, 5533), Box(5533, 5533)),
+ Box(Box(5534, 5534), Box(5534, 5534)),
+ Box(Box(5535, 5535), Box(5535, 5535)),
+ Box(Box(5536, 5536), Box(5536, 5536)),
+ Box(Box(5537, 5537), Box(5537, 5537)),
+ Box(Box(5538, 5538), Box(5538, 5538)),
+ Box(Box(5539, 5539), Box(5539, 5539)),
+ Box(Box(5540, 5540), Box(5540, 5540)),
+ Box(Box(5541, 5541), Box(5541, 5541)),
+ Box(Box(5542, 5542), Box(5542, 5542)),
+ Box(Box(5543, 5543), Box(5543, 5543)),
+ Box(Box(5544, 5544), Box(5544, 5544)),
+ Box(Box(5545, 5545), Box(5545, 5545)),
+ Box(Box(5546, 5546), Box(5546, 5546)),
+ Box(Box(5547, 5547), Box(5547, 5547)),
+ Box(Box(5548, 5548), Box(5548, 5548)),
+ Box(Box(5549, 5549), Box(5549, 5549)),
+ Box(Box(5550, 5550), Box(5550, 5550)),
+ Box(Box(5551, 5551), Box(5551, 5551)),
+ Box(Box(5552, 5552), Box(5552, 5552)),
+ Box(Box(5553, 5553), Box(5553, 5553)),
+ Box(Box(5554, 5554), Box(5554, 5554)),
+ Box(Box(5555, 5555), Box(5555, 5555)),
+ Box(Box(5556, 5556), Box(5556, 5556)),
+ Box(Box(5557, 5557), Box(5557, 5557)),
+ Box(Box(5558, 5558), Box(5558, 5558)),
+ Box(Box(5559, 5559), Box(5559, 5559)),
+ Box(Box(5560, 5560), Box(5560, 5560)),
+ Box(Box(5561, 5561), Box(5561, 5561)),
+ Box(Box(5562, 5562), Box(5562, 5562)),
+ Box(Box(5563, 5563), Box(5563, 5563)),
+ Box(Box(5564, 5564), Box(5564, 5564)),
+ Box(Box(5565, 5565), Box(5565, 5565)),
+ Box(Box(5566, 5566), Box(5566, 5566)),
+ Box(Box(5567, 5567), Box(5567, 5567)),
+ Box(Box(5568, 5568), Box(5568, 5568)),
+ Box(Box(5569, 5569), Box(5569, 5569)),
+ Box(Box(5570, 5570), Box(5570, 5570)),
+ Box(Box(5571, 5571), Box(5571, 5571)),
+ Box(Box(5572, 5572), Box(5572, 5572)),
+ Box(Box(5573, 5573), Box(5573, 5573)),
+ Box(Box(5574, 5574), Box(5574, 5574)),
+ Box(Box(5575, 5575), Box(5575, 5575)),
+ Box(Box(5576, 5576), Box(5576, 5576)),
+ Box(Box(5577, 5577), Box(5577, 5577)),
+ Box(Box(5578, 5578), Box(5578, 5578)),
+ Box(Box(5579, 5579), Box(5579, 5579)),
+ Box(Box(5580, 5580), Box(5580, 5580)),
+ Box(Box(5581, 5581), Box(5581, 5581)),
+ Box(Box(5582, 5582), Box(5582, 5582)),
+ Box(Box(5583, 5583), Box(5583, 5583)),
+ Box(Box(5584, 5584), Box(5584, 5584)),
+ Box(Box(5585, 5585), Box(5585, 5585)),
+ Box(Box(5586, 5586), Box(5586, 5586)),
+ Box(Box(5587, 5587), Box(5587, 5587)),
+ Box(Box(5588, 5588), Box(5588, 5588)),
+ Box(Box(5589, 5589), Box(5589, 5589)),
+ Box(Box(5590, 5590), Box(5590, 5590)),
+ Box(Box(5591, 5591), Box(5591, 5591)),
+ Box(Box(5592, 5592), Box(5592, 5592)),
+ Box(Box(5593, 5593), Box(5593, 5593)),
+ Box(Box(5594, 5594), Box(5594, 5594)),
+ Box(Box(5595, 5595), Box(5595, 5595)),
+ Box(Box(5596, 5596), Box(5596, 5596)),
+ Box(Box(5597, 5597), Box(5597, 5597)),
+ Box(Box(5598, 5598), Box(5598, 5598)),
+ Box(Box(5599, 5599), Box(5599, 5599)),
+ Box(Box(5600, 5600), Box(5600, 5600)),
+ Box(Box(5601, 5601), Box(5601, 5601)),
+ Box(Box(5602, 5602), Box(5602, 5602)),
+ Box(Box(5603, 5603), Box(5603, 5603)),
+ Box(Box(5604, 5604), Box(5604, 5604)),
+ Box(Box(5605, 5605), Box(5605, 5605)),
+ Box(Box(5606, 5606), Box(5606, 5606)),
+ Box(Box(5607, 5607), Box(5607, 5607)),
+ Box(Box(5608, 5608), Box(5608, 5608)),
+ Box(Box(5609, 5609), Box(5609, 5609)),
+ Box(Box(5610, 5610), Box(5610, 5610)),
+ Box(Box(5611, 5611), Box(5611, 5611)),
+ Box(Box(5612, 5612), Box(5612, 5612)),
+ Box(Box(5613, 5613), Box(5613, 5613)),
+ Box(Box(5614, 5614), Box(5614, 5614)),
+ Box(Box(5615, 5615), Box(5615, 5615)),
+ Box(Box(5616, 5616), Box(5616, 5616)),
+ Box(Box(5617, 5617), Box(5617, 5617)),
+ Box(Box(5618, 5618), Box(5618, 5618)),
+ Box(Box(5619, 5619), Box(5619, 5619)),
+ Box(Box(5620, 5620), Box(5620, 5620)),
+ Box(Box(5621, 5621), Box(5621, 5621)),
+ Box(Box(5622, 5622), Box(5622, 5622)),
+ Box(Box(5623, 5623), Box(5623, 5623)),
+ Box(Box(5624, 5624), Box(5624, 5624)),
+ Box(Box(5625, 5625), Box(5625, 5625)),
+ Box(Box(5626, 5626), Box(5626, 5626)),
+ Box(Box(5627, 5627), Box(5627, 5627)),
+ Box(Box(5628, 5628), Box(5628, 5628)),
+ Box(Box(5629, 5629), Box(5629, 5629)),
+ Box(Box(5630, 5630), Box(5630, 5630)),
+ Box(Box(5631, 5631), Box(5631, 5631)),
+ Box(Box(5632, 5632), Box(5632, 5632)),
+ Box(Box(5633, 5633), Box(5633, 5633)),
+ Box(Box(5634, 5634), Box(5634, 5634)),
+ Box(Box(5635, 5635), Box(5635, 5635)),
+ Box(Box(5636, 5636), Box(5636, 5636)),
+ Box(Box(5637, 5637), Box(5637, 5637)),
+ Box(Box(5638, 5638), Box(5638, 5638)),
+ Box(Box(5639, 5639), Box(5639, 5639)),
+ Box(Box(5640, 5640), Box(5640, 5640)),
+ Box(Box(5641, 5641), Box(5641, 5641)),
+ Box(Box(5642, 5642), Box(5642, 5642)),
+ Box(Box(5643, 5643), Box(5643, 5643)),
+ Box(Box(5644, 5644), Box(5644, 5644)),
+ Box(Box(5645, 5645), Box(5645, 5645)),
+ Box(Box(5646, 5646), Box(5646, 5646)),
+ Box(Box(5647, 5647), Box(5647, 5647)),
+ Box(Box(5648, 5648), Box(5648, 5648)),
+ Box(Box(5649, 5649), Box(5649, 5649)),
+ Box(Box(5650, 5650), Box(5650, 5650)),
+ Box(Box(5651, 5651), Box(5651, 5651)),
+ Box(Box(5652, 5652), Box(5652, 5652)),
+ Box(Box(5653, 5653), Box(5653, 5653)),
+ Box(Box(5654, 5654), Box(5654, 5654)),
+ Box(Box(5655, 5655), Box(5655, 5655)),
+ Box(Box(5656, 5656), Box(5656, 5656)),
+ Box(Box(5657, 5657), Box(5657, 5657)),
+ Box(Box(5658, 5658), Box(5658, 5658)),
+ Box(Box(5659, 5659), Box(5659, 5659)),
+ Box(Box(5660, 5660), Box(5660, 5660)),
+ Box(Box(5661, 5661), Box(5661, 5661)),
+ Box(Box(5662, 5662), Box(5662, 5662)),
+ Box(Box(5663, 5663), Box(5663, 5663)),
+ Box(Box(5664, 5664), Box(5664, 5664)),
+ Box(Box(5665, 5665), Box(5665, 5665)),
+ Box(Box(5666, 5666), Box(5666, 5666)),
+ Box(Box(5667, 5667), Box(5667, 5667)),
+ Box(Box(5668, 5668), Box(5668, 5668)),
+ Box(Box(5669, 5669), Box(5669, 5669)),
+ Box(Box(5670, 5670), Box(5670, 5670)),
+ Box(Box(5671, 5671), Box(5671, 5671)),
+ Box(Box(5672, 5672), Box(5672, 5672)),
+ Box(Box(5673, 5673), Box(5673, 5673)),
+ Box(Box(5674, 5674), Box(5674, 5674)),
+ Box(Box(5675, 5675), Box(5675, 5675)),
+ Box(Box(5676, 5676), Box(5676, 5676)),
+ Box(Box(5677, 5677), Box(5677, 5677)),
+ Box(Box(5678, 5678), Box(5678, 5678)),
+ Box(Box(5679, 5679), Box(5679, 5679)),
+ Box(Box(5680, 5680), Box(5680, 5680)),
+ Box(Box(5681, 5681), Box(5681, 5681)),
+ Box(Box(5682, 5682), Box(5682, 5682)),
+ Box(Box(5683, 5683), Box(5683, 5683)),
+ Box(Box(5684, 5684), Box(5684, 5684)),
+ Box(Box(5685, 5685), Box(5685, 5685)),
+ Box(Box(5686, 5686), Box(5686, 5686)),
+ Box(Box(5687, 5687), Box(5687, 5687)),
+ Box(Box(5688, 5688), Box(5688, 5688)),
+ Box(Box(5689, 5689), Box(5689, 5689)),
+ Box(Box(5690, 5690), Box(5690, 5690)),
+ Box(Box(5691, 5691), Box(5691, 5691)),
+ Box(Box(5692, 5692), Box(5692, 5692)),
+ Box(Box(5693, 5693), Box(5693, 5693)),
+ Box(Box(5694, 5694), Box(5694, 5694)),
+ Box(Box(5695, 5695), Box(5695, 5695)),
+ Box(Box(5696, 5696), Box(5696, 5696)),
+ Box(Box(5697, 5697), Box(5697, 5697)),
+ Box(Box(5698, 5698), Box(5698, 5698)),
+ Box(Box(5699, 5699), Box(5699, 5699)),
+ Box(Box(5700, 5700), Box(5700, 5700)),
+ Box(Box(5701, 5701), Box(5701, 5701)),
+ Box(Box(5702, 5702), Box(5702, 5702)),
+ Box(Box(5703, 5703), Box(5703, 5703)),
+ Box(Box(5704, 5704), Box(5704, 5704)),
+ Box(Box(5705, 5705), Box(5705, 5705)),
+ Box(Box(5706, 5706), Box(5706, 5706)),
+ Box(Box(5707, 5707), Box(5707, 5707)),
+ Box(Box(5708, 5708), Box(5708, 5708)),
+ Box(Box(5709, 5709), Box(5709, 5709)),
+ Box(Box(5710, 5710), Box(5710, 5710)),
+ Box(Box(5711, 5711), Box(5711, 5711)),
+ Box(Box(5712, 5712), Box(5712, 5712)),
+ Box(Box(5713, 5713), Box(5713, 5713)),
+ Box(Box(5714, 5714), Box(5714, 5714)),
+ Box(Box(5715, 5715), Box(5715, 5715)),
+ Box(Box(5716, 5716), Box(5716, 5716)),
+ Box(Box(5717, 5717), Box(5717, 5717)),
+ Box(Box(5718, 5718), Box(5718, 5718)),
+ Box(Box(5719, 5719), Box(5719, 5719)),
+ Box(Box(5720, 5720), Box(5720, 5720)),
+ Box(Box(5721, 5721), Box(5721, 5721)),
+ Box(Box(5722, 5722), Box(5722, 5722)),
+ Box(Box(5723, 5723), Box(5723, 5723)),
+ Box(Box(5724, 5724), Box(5724, 5724)),
+ Box(Box(5725, 5725), Box(5725, 5725)),
+ Box(Box(5726, 5726), Box(5726, 5726)),
+ Box(Box(5727, 5727), Box(5727, 5727)),
+ Box(Box(5728, 5728), Box(5728, 5728)),
+ Box(Box(5729, 5729), Box(5729, 5729)),
+ Box(Box(5730, 5730), Box(5730, 5730)),
+ Box(Box(5731, 5731), Box(5731, 5731)),
+ Box(Box(5732, 5732), Box(5732, 5732)),
+ Box(Box(5733, 5733), Box(5733, 5733)),
+ Box(Box(5734, 5734), Box(5734, 5734)),
+ Box(Box(5735, 5735), Box(5735, 5735)),
+ Box(Box(5736, 5736), Box(5736, 5736)),
+ Box(Box(5737, 5737), Box(5737, 5737)),
+ Box(Box(5738, 5738), Box(5738, 5738)),
+ Box(Box(5739, 5739), Box(5739, 5739)),
+ Box(Box(5740, 5740), Box(5740, 5740)),
+ Box(Box(5741, 5741), Box(5741, 5741)),
+ Box(Box(5742, 5742), Box(5742, 5742)),
+ Box(Box(5743, 5743), Box(5743, 5743)),
+ Box(Box(5744, 5744), Box(5744, 5744)),
+ Box(Box(5745, 5745), Box(5745, 5745)),
+ Box(Box(5746, 5746), Box(5746, 5746)),
+ Box(Box(5747, 5747), Box(5747, 5747)),
+ Box(Box(5748, 5748), Box(5748, 5748)),
+ Box(Box(5749, 5749), Box(5749, 5749)),
+ Box(Box(5750, 5750), Box(5750, 5750)),
+ Box(Box(5751, 5751), Box(5751, 5751)),
+ Box(Box(5752, 5752), Box(5752, 5752)),
+ Box(Box(5753, 5753), Box(5753, 5753)),
+ Box(Box(5754, 5754), Box(5754, 5754)),
+ Box(Box(5755, 5755), Box(5755, 5755)),
+ Box(Box(5756, 5756), Box(5756, 5756)),
+ Box(Box(5757, 5757), Box(5757, 5757)),
+ Box(Box(5758, 5758), Box(5758, 5758)),
+ Box(Box(5759, 5759), Box(5759, 5759)),
+ Box(Box(5760, 5760), Box(5760, 5760)),
+ Box(Box(5761, 5761), Box(5761, 5761)),
+ Box(Box(5762, 5762), Box(5762, 5762)),
+ Box(Box(5763, 5763), Box(5763, 5763)),
+ Box(Box(5764, 5764), Box(5764, 5764)),
+ Box(Box(5765, 5765), Box(5765, 5765)),
+ Box(Box(5766, 5766), Box(5766, 5766)),
+ Box(Box(5767, 5767), Box(5767, 5767)),
+ Box(Box(5768, 5768), Box(5768, 5768)),
+ Box(Box(5769, 5769), Box(5769, 5769)),
+ Box(Box(5770, 5770), Box(5770, 5770)),
+ Box(Box(5771, 5771), Box(5771, 5771)),
+ Box(Box(5772, 5772), Box(5772, 5772)),
+ Box(Box(5773, 5773), Box(5773, 5773)),
+ Box(Box(5774, 5774), Box(5774, 5774)),
+ Box(Box(5775, 5775), Box(5775, 5775)),
+ Box(Box(5776, 5776), Box(5776, 5776)),
+ Box(Box(5777, 5777), Box(5777, 5777)),
+ Box(Box(5778, 5778), Box(5778, 5778)),
+ Box(Box(5779, 5779), Box(5779, 5779)),
+ Box(Box(5780, 5780), Box(5780, 5780)),
+ Box(Box(5781, 5781), Box(5781, 5781)),
+ Box(Box(5782, 5782), Box(5782, 5782)),
+ Box(Box(5783, 5783), Box(5783, 5783)),
+ Box(Box(5784, 5784), Box(5784, 5784)),
+ Box(Box(5785, 5785), Box(5785, 5785)),
+ Box(Box(5786, 5786), Box(5786, 5786)),
+ Box(Box(5787, 5787), Box(5787, 5787)),
+ Box(Box(5788, 5788), Box(5788, 5788)),
+ Box(Box(5789, 5789), Box(5789, 5789)),
+ Box(Box(5790, 5790), Box(5790, 5790)),
+ Box(Box(5791, 5791), Box(5791, 5791)),
+ Box(Box(5792, 5792), Box(5792, 5792)),
+ Box(Box(5793, 5793), Box(5793, 5793)),
+ Box(Box(5794, 5794), Box(5794, 5794)),
+ Box(Box(5795, 5795), Box(5795, 5795)),
+ Box(Box(5796, 5796), Box(5796, 5796)),
+ Box(Box(5797, 5797), Box(5797, 5797)),
+ Box(Box(5798, 5798), Box(5798, 5798)),
+ Box(Box(5799, 5799), Box(5799, 5799)),
+ Box(Box(5800, 5800), Box(5800, 5800)),
+ Box(Box(5801, 5801), Box(5801, 5801)),
+ Box(Box(5802, 5802), Box(5802, 5802)),
+ Box(Box(5803, 5803), Box(5803, 5803)),
+ Box(Box(5804, 5804), Box(5804, 5804)),
+ Box(Box(5805, 5805), Box(5805, 5805)),
+ Box(Box(5806, 5806), Box(5806, 5806)),
+ Box(Box(5807, 5807), Box(5807, 5807)),
+ Box(Box(5808, 5808), Box(5808, 5808)),
+ Box(Box(5809, 5809), Box(5809, 5809)),
+ Box(Box(5810, 5810), Box(5810, 5810)),
+ Box(Box(5811, 5811), Box(5811, 5811)),
+ Box(Box(5812, 5812), Box(5812, 5812)),
+ Box(Box(5813, 5813), Box(5813, 5813)),
+ Box(Box(5814, 5814), Box(5814, 5814)),
+ Box(Box(5815, 5815), Box(5815, 5815)),
+ Box(Box(5816, 5816), Box(5816, 5816)),
+ Box(Box(5817, 5817), Box(5817, 5817)),
+ Box(Box(5818, 5818), Box(5818, 5818)),
+ Box(Box(5819, 5819), Box(5819, 5819)),
+ Box(Box(5820, 5820), Box(5820, 5820)),
+ Box(Box(5821, 5821), Box(5821, 5821)),
+ Box(Box(5822, 5822), Box(5822, 5822)),
+ Box(Box(5823, 5823), Box(5823, 5823)),
+ Box(Box(5824, 5824), Box(5824, 5824)),
+ Box(Box(5825, 5825), Box(5825, 5825)),
+ Box(Box(5826, 5826), Box(5826, 5826)),
+ Box(Box(5827, 5827), Box(5827, 5827)),
+ Box(Box(5828, 5828), Box(5828, 5828)),
+ Box(Box(5829, 5829), Box(5829, 5829)),
+ Box(Box(5830, 5830), Box(5830, 5830)),
+ Box(Box(5831, 5831), Box(5831, 5831)),
+ Box(Box(5832, 5832), Box(5832, 5832)),
+ Box(Box(5833, 5833), Box(5833, 5833)),
+ Box(Box(5834, 5834), Box(5834, 5834)),
+ Box(Box(5835, 5835), Box(5835, 5835)),
+ Box(Box(5836, 5836), Box(5836, 5836)),
+ Box(Box(5837, 5837), Box(5837, 5837)),
+ Box(Box(5838, 5838), Box(5838, 5838)),
+ Box(Box(5839, 5839), Box(5839, 5839)),
+ Box(Box(5840, 5840), Box(5840, 5840)),
+ Box(Box(5841, 5841), Box(5841, 5841)),
+ Box(Box(5842, 5842), Box(5842, 5842)),
+ Box(Box(5843, 5843), Box(5843, 5843)),
+ Box(Box(5844, 5844), Box(5844, 5844)),
+ Box(Box(5845, 5845), Box(5845, 5845)),
+ Box(Box(5846, 5846), Box(5846, 5846)),
+ Box(Box(5847, 5847), Box(5847, 5847)),
+ Box(Box(5848, 5848), Box(5848, 5848)),
+ Box(Box(5849, 5849), Box(5849, 5849)),
+ Box(Box(5850, 5850), Box(5850, 5850)),
+ Box(Box(5851, 5851), Box(5851, 5851)),
+ Box(Box(5852, 5852), Box(5852, 5852)),
+ Box(Box(5853, 5853), Box(5853, 5853)),
+ Box(Box(5854, 5854), Box(5854, 5854)),
+ Box(Box(5855, 5855), Box(5855, 5855)),
+ Box(Box(5856, 5856), Box(5856, 5856)),
+ Box(Box(5857, 5857), Box(5857, 5857)),
+ Box(Box(5858, 5858), Box(5858, 5858)),
+ Box(Box(5859, 5859), Box(5859, 5859)),
+ Box(Box(5860, 5860), Box(5860, 5860)),
+ Box(Box(5861, 5861), Box(5861, 5861)),
+ Box(Box(5862, 5862), Box(5862, 5862)),
+ Box(Box(5863, 5863), Box(5863, 5863)),
+ Box(Box(5864, 5864), Box(5864, 5864)),
+ Box(Box(5865, 5865), Box(5865, 5865)),
+ Box(Box(5866, 5866), Box(5866, 5866)),
+ Box(Box(5867, 5867), Box(5867, 5867)),
+ Box(Box(5868, 5868), Box(5868, 5868)),
+ Box(Box(5869, 5869), Box(5869, 5869)),
+ Box(Box(5870, 5870), Box(5870, 5870)),
+ Box(Box(5871, 5871), Box(5871, 5871)),
+ Box(Box(5872, 5872), Box(5872, 5872)),
+ Box(Box(5873, 5873), Box(5873, 5873)),
+ Box(Box(5874, 5874), Box(5874, 5874)),
+ Box(Box(5875, 5875), Box(5875, 5875)),
+ Box(Box(5876, 5876), Box(5876, 5876)),
+ Box(Box(5877, 5877), Box(5877, 5877)),
+ Box(Box(5878, 5878), Box(5878, 5878)),
+ Box(Box(5879, 5879), Box(5879, 5879)),
+ Box(Box(5880, 5880), Box(5880, 5880)),
+ Box(Box(5881, 5881), Box(5881, 5881)),
+ Box(Box(5882, 5882), Box(5882, 5882)),
+ Box(Box(5883, 5883), Box(5883, 5883)),
+ Box(Box(5884, 5884), Box(5884, 5884)),
+ Box(Box(5885, 5885), Box(5885, 5885)),
+ Box(Box(5886, 5886), Box(5886, 5886)),
+ Box(Box(5887, 5887), Box(5887, 5887)),
+ Box(Box(5888, 5888), Box(5888, 5888)),
+ Box(Box(5889, 5889), Box(5889, 5889)),
+ Box(Box(5890, 5890), Box(5890, 5890)),
+ Box(Box(5891, 5891), Box(5891, 5891)),
+ Box(Box(5892, 5892), Box(5892, 5892)),
+ Box(Box(5893, 5893), Box(5893, 5893)),
+ Box(Box(5894, 5894), Box(5894, 5894)),
+ Box(Box(5895, 5895), Box(5895, 5895)),
+ Box(Box(5896, 5896), Box(5896, 5896)),
+ Box(Box(5897, 5897), Box(5897, 5897)),
+ Box(Box(5898, 5898), Box(5898, 5898)),
+ Box(Box(5899, 5899), Box(5899, 5899)),
+ Box(Box(5900, 5900), Box(5900, 5900)),
+ Box(Box(5901, 5901), Box(5901, 5901)),
+ Box(Box(5902, 5902), Box(5902, 5902)),
+ Box(Box(5903, 5903), Box(5903, 5903)),
+ Box(Box(5904, 5904), Box(5904, 5904)),
+ Box(Box(5905, 5905), Box(5905, 5905)),
+ Box(Box(5906, 5906), Box(5906, 5906)),
+ Box(Box(5907, 5907), Box(5907, 5907)),
+ Box(Box(5908, 5908), Box(5908, 5908)),
+ Box(Box(5909, 5909), Box(5909, 5909)),
+ Box(Box(5910, 5910), Box(5910, 5910)),
+ Box(Box(5911, 5911), Box(5911, 5911)),
+ Box(Box(5912, 5912), Box(5912, 5912)),
+ Box(Box(5913, 5913), Box(5913, 5913)),
+ Box(Box(5914, 5914), Box(5914, 5914)),
+ Box(Box(5915, 5915), Box(5915, 5915)),
+ Box(Box(5916, 5916), Box(5916, 5916)),
+ Box(Box(5917, 5917), Box(5917, 5917)),
+ Box(Box(5918, 5918), Box(5918, 5918)),
+ Box(Box(5919, 5919), Box(5919, 5919)),
+ Box(Box(5920, 5920), Box(5920, 5920)),
+ Box(Box(5921, 5921), Box(5921, 5921)),
+ Box(Box(5922, 5922), Box(5922, 5922)),
+ Box(Box(5923, 5923), Box(5923, 5923)),
+ Box(Box(5924, 5924), Box(5924, 5924)),
+ Box(Box(5925, 5925), Box(5925, 5925)),
+ Box(Box(5926, 5926), Box(5926, 5926)),
+ Box(Box(5927, 5927), Box(5927, 5927)),
+ Box(Box(5928, 5928), Box(5928, 5928)),
+ Box(Box(5929, 5929), Box(5929, 5929)),
+ Box(Box(5930, 5930), Box(5930, 5930)),
+ Box(Box(5931, 5931), Box(5931, 5931)),
+ Box(Box(5932, 5932), Box(5932, 5932)),
+ Box(Box(5933, 5933), Box(5933, 5933)),
+ Box(Box(5934, 5934), Box(5934, 5934)),
+ Box(Box(5935, 5935), Box(5935, 5935)),
+ Box(Box(5936, 5936), Box(5936, 5936)),
+ Box(Box(5937, 5937), Box(5937, 5937)),
+ Box(Box(5938, 5938), Box(5938, 5938)),
+ Box(Box(5939, 5939), Box(5939, 5939)),
+ Box(Box(5940, 5940), Box(5940, 5940)),
+ Box(Box(5941, 5941), Box(5941, 5941)),
+ Box(Box(5942, 5942), Box(5942, 5942)),
+ Box(Box(5943, 5943), Box(5943, 5943)),
+ Box(Box(5944, 5944), Box(5944, 5944)),
+ Box(Box(5945, 5945), Box(5945, 5945)),
+ Box(Box(5946, 5946), Box(5946, 5946)),
+ Box(Box(5947, 5947), Box(5947, 5947)),
+ Box(Box(5948, 5948), Box(5948, 5948)),
+ Box(Box(5949, 5949), Box(5949, 5949)),
+ Box(Box(5950, 5950), Box(5950, 5950)),
+ Box(Box(5951, 5951), Box(5951, 5951)),
+ Box(Box(5952, 5952), Box(5952, 5952)),
+ Box(Box(5953, 5953), Box(5953, 5953)),
+ Box(Box(5954, 5954), Box(5954, 5954)),
+ Box(Box(5955, 5955), Box(5955, 5955)),
+ Box(Box(5956, 5956), Box(5956, 5956)),
+ Box(Box(5957, 5957), Box(5957, 5957)),
+ Box(Box(5958, 5958), Box(5958, 5958)),
+ Box(Box(5959, 5959), Box(5959, 5959)),
+ Box(Box(5960, 5960), Box(5960, 5960)),
+ Box(Box(5961, 5961), Box(5961, 5961)),
+ Box(Box(5962, 5962), Box(5962, 5962)),
+ Box(Box(5963, 5963), Box(5963, 5963)),
+ Box(Box(5964, 5964), Box(5964, 5964)),
+ Box(Box(5965, 5965), Box(5965, 5965)),
+ Box(Box(5966, 5966), Box(5966, 5966)),
+ Box(Box(5967, 5967), Box(5967, 5967)),
+ Box(Box(5968, 5968), Box(5968, 5968)),
+ Box(Box(5969, 5969), Box(5969, 5969)),
+ Box(Box(5970, 5970), Box(5970, 5970)),
+ Box(Box(5971, 5971), Box(5971, 5971)),
+ Box(Box(5972, 5972), Box(5972, 5972)),
+ Box(Box(5973, 5973), Box(5973, 5973)),
+ Box(Box(5974, 5974), Box(5974, 5974)),
+ Box(Box(5975, 5975), Box(5975, 5975)),
+ Box(Box(5976, 5976), Box(5976, 5976)),
+ Box(Box(5977, 5977), Box(5977, 5977)),
+ Box(Box(5978, 5978), Box(5978, 5978)),
+ Box(Box(5979, 5979), Box(5979, 5979)),
+ Box(Box(5980, 5980), Box(5980, 5980)),
+ Box(Box(5981, 5981), Box(5981, 5981)),
+ Box(Box(5982, 5982), Box(5982, 5982)),
+ Box(Box(5983, 5983), Box(5983, 5983)),
+ Box(Box(5984, 5984), Box(5984, 5984)),
+ Box(Box(5985, 5985), Box(5985, 5985)),
+ Box(Box(5986, 5986), Box(5986, 5986)),
+ Box(Box(5987, 5987), Box(5987, 5987)),
+ Box(Box(5988, 5988), Box(5988, 5988)),
+ Box(Box(5989, 5989), Box(5989, 5989)),
+ Box(Box(5990, 5990), Box(5990, 5990)),
+ Box(Box(5991, 5991), Box(5991, 5991)),
+ Box(Box(5992, 5992), Box(5992, 5992)),
+ Box(Box(5993, 5993), Box(5993, 5993)),
+ Box(Box(5994, 5994), Box(5994, 5994)),
+ Box(Box(5995, 5995), Box(5995, 5995)),
+ Box(Box(5996, 5996), Box(5996, 5996)),
+ Box(Box(5997, 5997), Box(5997, 5997)),
+ Box(Box(5998, 5998), Box(5998, 5998)),
+ Box(Box(5999, 5999), Box(5999, 5999)),
+ Box(Box(6000, 6000), Box(6000, 6000)),
+ Box(Box(6001, 6001), Box(6001, 6001)),
+ Box(Box(6002, 6002), Box(6002, 6002)),
+ Box(Box(6003, 6003), Box(6003, 6003)),
+ Box(Box(6004, 6004), Box(6004, 6004)),
+ Box(Box(6005, 6005), Box(6005, 6005)),
+ Box(Box(6006, 6006), Box(6006, 6006)),
+ Box(Box(6007, 6007), Box(6007, 6007)),
+ Box(Box(6008, 6008), Box(6008, 6008)),
+ Box(Box(6009, 6009), Box(6009, 6009)),
+ Box(Box(6010, 6010), Box(6010, 6010)),
+ Box(Box(6011, 6011), Box(6011, 6011)),
+ Box(Box(6012, 6012), Box(6012, 6012)),
+ Box(Box(6013, 6013), Box(6013, 6013)),
+ Box(Box(6014, 6014), Box(6014, 6014)),
+ Box(Box(6015, 6015), Box(6015, 6015)),
+ Box(Box(6016, 6016), Box(6016, 6016)),
+ Box(Box(6017, 6017), Box(6017, 6017)),
+ Box(Box(6018, 6018), Box(6018, 6018)),
+ Box(Box(6019, 6019), Box(6019, 6019)),
+ Box(Box(6020, 6020), Box(6020, 6020)),
+ Box(Box(6021, 6021), Box(6021, 6021)),
+ Box(Box(6022, 6022), Box(6022, 6022)),
+ Box(Box(6023, 6023), Box(6023, 6023)),
+ Box(Box(6024, 6024), Box(6024, 6024)),
+ Box(Box(6025, 6025), Box(6025, 6025)),
+ Box(Box(6026, 6026), Box(6026, 6026)),
+ Box(Box(6027, 6027), Box(6027, 6027)),
+ Box(Box(6028, 6028), Box(6028, 6028)),
+ Box(Box(6029, 6029), Box(6029, 6029)),
+ Box(Box(6030, 6030), Box(6030, 6030)),
+ Box(Box(6031, 6031), Box(6031, 6031)),
+ Box(Box(6032, 6032), Box(6032, 6032)),
+ Box(Box(6033, 6033), Box(6033, 6033)),
+ Box(Box(6034, 6034), Box(6034, 6034)),
+ Box(Box(6035, 6035), Box(6035, 6035)),
+ Box(Box(6036, 6036), Box(6036, 6036)),
+ Box(Box(6037, 6037), Box(6037, 6037)),
+ Box(Box(6038, 6038), Box(6038, 6038)),
+ Box(Box(6039, 6039), Box(6039, 6039)),
+ Box(Box(6040, 6040), Box(6040, 6040)),
+ Box(Box(6041, 6041), Box(6041, 6041)),
+ Box(Box(6042, 6042), Box(6042, 6042)),
+ Box(Box(6043, 6043), Box(6043, 6043)),
+ Box(Box(6044, 6044), Box(6044, 6044)),
+ Box(Box(6045, 6045), Box(6045, 6045)),
+ Box(Box(6046, 6046), Box(6046, 6046)),
+ Box(Box(6047, 6047), Box(6047, 6047)),
+ Box(Box(6048, 6048), Box(6048, 6048)),
+ Box(Box(6049, 6049), Box(6049, 6049)),
+ Box(Box(6050, 6050), Box(6050, 6050)),
+ Box(Box(6051, 6051), Box(6051, 6051)),
+ Box(Box(6052, 6052), Box(6052, 6052)),
+ Box(Box(6053, 6053), Box(6053, 6053)),
+ Box(Box(6054, 6054), Box(6054, 6054)),
+ Box(Box(6055, 6055), Box(6055, 6055)),
+ Box(Box(6056, 6056), Box(6056, 6056)),
+ Box(Box(6057, 6057), Box(6057, 6057)),
+ Box(Box(6058, 6058), Box(6058, 6058)),
+ Box(Box(6059, 6059), Box(6059, 6059)),
+ Box(Box(6060, 6060), Box(6060, 6060)),
+ Box(Box(6061, 6061), Box(6061, 6061)),
+ Box(Box(6062, 6062), Box(6062, 6062)),
+ Box(Box(6063, 6063), Box(6063, 6063)),
+ Box(Box(6064, 6064), Box(6064, 6064)),
+ Box(Box(6065, 6065), Box(6065, 6065)),
+ Box(Box(6066, 6066), Box(6066, 6066)),
+ Box(Box(6067, 6067), Box(6067, 6067)),
+ Box(Box(6068, 6068), Box(6068, 6068)),
+ Box(Box(6069, 6069), Box(6069, 6069)),
+ Box(Box(6070, 6070), Box(6070, 6070)),
+ Box(Box(6071, 6071), Box(6071, 6071)),
+ Box(Box(6072, 6072), Box(6072, 6072)),
+ Box(Box(6073, 6073), Box(6073, 6073)),
+ Box(Box(6074, 6074), Box(6074, 6074)),
+ Box(Box(6075, 6075), Box(6075, 6075)),
+ Box(Box(6076, 6076), Box(6076, 6076)),
+ Box(Box(6077, 6077), Box(6077, 6077)),
+ Box(Box(6078, 6078), Box(6078, 6078)),
+ Box(Box(6079, 6079), Box(6079, 6079)),
+ Box(Box(6080, 6080), Box(6080, 6080)),
+ Box(Box(6081, 6081), Box(6081, 6081)),
+ Box(Box(6082, 6082), Box(6082, 6082)),
+ Box(Box(6083, 6083), Box(6083, 6083)),
+ Box(Box(6084, 6084), Box(6084, 6084)),
+ Box(Box(6085, 6085), Box(6085, 6085)),
+ Box(Box(6086, 6086), Box(6086, 6086)),
+ Box(Box(6087, 6087), Box(6087, 6087)),
+ Box(Box(6088, 6088), Box(6088, 6088)),
+ Box(Box(6089, 6089), Box(6089, 6089)),
+ Box(Box(6090, 6090), Box(6090, 6090)),
+ Box(Box(6091, 6091), Box(6091, 6091)),
+ Box(Box(6092, 6092), Box(6092, 6092)),
+ Box(Box(6093, 6093), Box(6093, 6093)),
+ Box(Box(6094, 6094), Box(6094, 6094)),
+ Box(Box(6095, 6095), Box(6095, 6095)),
+ Box(Box(6096, 6096), Box(6096, 6096)),
+ Box(Box(6097, 6097), Box(6097, 6097)),
+ Box(Box(6098, 6098), Box(6098, 6098)),
+ Box(Box(6099, 6099), Box(6099, 6099)),
+ Box(Box(6100, 6100), Box(6100, 6100)),
+ Box(Box(6101, 6101), Box(6101, 6101)),
+ Box(Box(6102, 6102), Box(6102, 6102)),
+ Box(Box(6103, 6103), Box(6103, 6103)),
+ Box(Box(6104, 6104), Box(6104, 6104)),
+ Box(Box(6105, 6105), Box(6105, 6105)),
+ Box(Box(6106, 6106), Box(6106, 6106)),
+ Box(Box(6107, 6107), Box(6107, 6107)),
+ Box(Box(6108, 6108), Box(6108, 6108)),
+ Box(Box(6109, 6109), Box(6109, 6109)),
+ Box(Box(6110, 6110), Box(6110, 6110)),
+ Box(Box(6111, 6111), Box(6111, 6111)),
+ Box(Box(6112, 6112), Box(6112, 6112)),
+ Box(Box(6113, 6113), Box(6113, 6113)),
+ Box(Box(6114, 6114), Box(6114, 6114)),
+ Box(Box(6115, 6115), Box(6115, 6115)),
+ Box(Box(6116, 6116), Box(6116, 6116)),
+ Box(Box(6117, 6117), Box(6117, 6117)),
+ Box(Box(6118, 6118), Box(6118, 6118)),
+ Box(Box(6119, 6119), Box(6119, 6119)),
+ Box(Box(6120, 6120), Box(6120, 6120)),
+ Box(Box(6121, 6121), Box(6121, 6121)),
+ Box(Box(6122, 6122), Box(6122, 6122)),
+ Box(Box(6123, 6123), Box(6123, 6123)),
+ Box(Box(6124, 6124), Box(6124, 6124)),
+ Box(Box(6125, 6125), Box(6125, 6125)),
+ Box(Box(6126, 6126), Box(6126, 6126)),
+ Box(Box(6127, 6127), Box(6127, 6127)),
+ Box(Box(6128, 6128), Box(6128, 6128)),
+ Box(Box(6129, 6129), Box(6129, 6129)),
+ Box(Box(6130, 6130), Box(6130, 6130)),
+ Box(Box(6131, 6131), Box(6131, 6131)),
+ Box(Box(6132, 6132), Box(6132, 6132)),
+ Box(Box(6133, 6133), Box(6133, 6133)),
+ Box(Box(6134, 6134), Box(6134, 6134)),
+ Box(Box(6135, 6135), Box(6135, 6135)),
+ Box(Box(6136, 6136), Box(6136, 6136)),
+ Box(Box(6137, 6137), Box(6137, 6137)),
+ Box(Box(6138, 6138), Box(6138, 6138)),
+ Box(Box(6139, 6139), Box(6139, 6139)),
+ Box(Box(6140, 6140), Box(6140, 6140)),
+ Box(Box(6141, 6141), Box(6141, 6141)),
+ Box(Box(6142, 6142), Box(6142, 6142)),
+ Box(Box(6143, 6143), Box(6143, 6143)),
+ Box(Box(6144, 6144), Box(6144, 6144)),
+ Box(Box(6145, 6145), Box(6145, 6145)),
+ Box(Box(6146, 6146), Box(6146, 6146)),
+ Box(Box(6147, 6147), Box(6147, 6147)),
+ Box(Box(6148, 6148), Box(6148, 6148)),
+ Box(Box(6149, 6149), Box(6149, 6149)),
+ Box(Box(6150, 6150), Box(6150, 6150)),
+ Box(Box(6151, 6151), Box(6151, 6151)),
+ Box(Box(6152, 6152), Box(6152, 6152)),
+ Box(Box(6153, 6153), Box(6153, 6153)),
+ Box(Box(6154, 6154), Box(6154, 6154)),
+ Box(Box(6155, 6155), Box(6155, 6155)),
+ Box(Box(6156, 6156), Box(6156, 6156)),
+ Box(Box(6157, 6157), Box(6157, 6157)),
+ Box(Box(6158, 6158), Box(6158, 6158)),
+ Box(Box(6159, 6159), Box(6159, 6159)),
+ Box(Box(6160, 6160), Box(6160, 6160)),
+ Box(Box(6161, 6161), Box(6161, 6161)),
+ Box(Box(6162, 6162), Box(6162, 6162)),
+ Box(Box(6163, 6163), Box(6163, 6163)),
+ Box(Box(6164, 6164), Box(6164, 6164)),
+ Box(Box(6165, 6165), Box(6165, 6165)),
+ Box(Box(6166, 6166), Box(6166, 6166)),
+ Box(Box(6167, 6167), Box(6167, 6167)),
+ Box(Box(6168, 6168), Box(6168, 6168)),
+ Box(Box(6169, 6169), Box(6169, 6169)),
+ Box(Box(6170, 6170), Box(6170, 6170)),
+ Box(Box(6171, 6171), Box(6171, 6171)),
+ Box(Box(6172, 6172), Box(6172, 6172)),
+ Box(Box(6173, 6173), Box(6173, 6173)),
+ Box(Box(6174, 6174), Box(6174, 6174)),
+ Box(Box(6175, 6175), Box(6175, 6175)),
+ Box(Box(6176, 6176), Box(6176, 6176)),
+ Box(Box(6177, 6177), Box(6177, 6177)),
+ Box(Box(6178, 6178), Box(6178, 6178)),
+ Box(Box(6179, 6179), Box(6179, 6179)),
+ Box(Box(6180, 6180), Box(6180, 6180)),
+ Box(Box(6181, 6181), Box(6181, 6181)),
+ Box(Box(6182, 6182), Box(6182, 6182)),
+ Box(Box(6183, 6183), Box(6183, 6183)),
+ Box(Box(6184, 6184), Box(6184, 6184)),
+ Box(Box(6185, 6185), Box(6185, 6185)),
+ Box(Box(6186, 6186), Box(6186, 6186)),
+ Box(Box(6187, 6187), Box(6187, 6187)),
+ Box(Box(6188, 6188), Box(6188, 6188)),
+ Box(Box(6189, 6189), Box(6189, 6189)),
+ Box(Box(6190, 6190), Box(6190, 6190)),
+ Box(Box(6191, 6191), Box(6191, 6191)),
+ Box(Box(6192, 6192), Box(6192, 6192)),
+ Box(Box(6193, 6193), Box(6193, 6193)),
+ Box(Box(6194, 6194), Box(6194, 6194)),
+ Box(Box(6195, 6195), Box(6195, 6195)),
+ Box(Box(6196, 6196), Box(6196, 6196)),
+ Box(Box(6197, 6197), Box(6197, 6197)),
+ Box(Box(6198, 6198), Box(6198, 6198)),
+ Box(Box(6199, 6199), Box(6199, 6199)),
+ Box(Box(6200, 6200), Box(6200, 6200)),
+ Box(Box(6201, 6201), Box(6201, 6201)),
+ Box(Box(6202, 6202), Box(6202, 6202)),
+ Box(Box(6203, 6203), Box(6203, 6203)),
+ Box(Box(6204, 6204), Box(6204, 6204)),
+ Box(Box(6205, 6205), Box(6205, 6205)),
+ Box(Box(6206, 6206), Box(6206, 6206)),
+ Box(Box(6207, 6207), Box(6207, 6207)),
+ Box(Box(6208, 6208), Box(6208, 6208)),
+ Box(Box(6209, 6209), Box(6209, 6209)),
+ Box(Box(6210, 6210), Box(6210, 6210)),
+ Box(Box(6211, 6211), Box(6211, 6211)),
+ Box(Box(6212, 6212), Box(6212, 6212)),
+ Box(Box(6213, 6213), Box(6213, 6213)),
+ Box(Box(6214, 6214), Box(6214, 6214)),
+ Box(Box(6215, 6215), Box(6215, 6215)),
+ Box(Box(6216, 6216), Box(6216, 6216)),
+ Box(Box(6217, 6217), Box(6217, 6217)),
+ Box(Box(6218, 6218), Box(6218, 6218)),
+ Box(Box(6219, 6219), Box(6219, 6219)),
+ Box(Box(6220, 6220), Box(6220, 6220)),
+ Box(Box(6221, 6221), Box(6221, 6221)),
+ Box(Box(6222, 6222), Box(6222, 6222)),
+ Box(Box(6223, 6223), Box(6223, 6223)),
+ Box(Box(6224, 6224), Box(6224, 6224)),
+ Box(Box(6225, 6225), Box(6225, 6225)),
+ Box(Box(6226, 6226), Box(6226, 6226)),
+ Box(Box(6227, 6227), Box(6227, 6227)),
+ Box(Box(6228, 6228), Box(6228, 6228)),
+ Box(Box(6229, 6229), Box(6229, 6229)),
+ Box(Box(6230, 6230), Box(6230, 6230)),
+ Box(Box(6231, 6231), Box(6231, 6231)),
+ Box(Box(6232, 6232), Box(6232, 6232)),
+ Box(Box(6233, 6233), Box(6233, 6233)),
+ Box(Box(6234, 6234), Box(6234, 6234)),
+ Box(Box(6235, 6235), Box(6235, 6235)),
+ Box(Box(6236, 6236), Box(6236, 6236)),
+ Box(Box(6237, 6237), Box(6237, 6237)),
+ Box(Box(6238, 6238), Box(6238, 6238)),
+ Box(Box(6239, 6239), Box(6239, 6239)),
+ Box(Box(6240, 6240), Box(6240, 6240)),
+ Box(Box(6241, 6241), Box(6241, 6241)),
+ Box(Box(6242, 6242), Box(6242, 6242)),
+ Box(Box(6243, 6243), Box(6243, 6243)),
+ Box(Box(6244, 6244), Box(6244, 6244)),
+ Box(Box(6245, 6245), Box(6245, 6245)),
+ Box(Box(6246, 6246), Box(6246, 6246)),
+ Box(Box(6247, 6247), Box(6247, 6247)),
+ Box(Box(6248, 6248), Box(6248, 6248)),
+ Box(Box(6249, 6249), Box(6249, 6249)),
+ Box(Box(6250, 6250), Box(6250, 6250)),
+ Box(Box(6251, 6251), Box(6251, 6251)),
+ Box(Box(6252, 6252), Box(6252, 6252)),
+ Box(Box(6253, 6253), Box(6253, 6253)),
+ Box(Box(6254, 6254), Box(6254, 6254)),
+ Box(Box(6255, 6255), Box(6255, 6255)),
+ Box(Box(6256, 6256), Box(6256, 6256)),
+ Box(Box(6257, 6257), Box(6257, 6257)),
+ Box(Box(6258, 6258), Box(6258, 6258)),
+ Box(Box(6259, 6259), Box(6259, 6259)),
+ Box(Box(6260, 6260), Box(6260, 6260)),
+ Box(Box(6261, 6261), Box(6261, 6261)),
+ Box(Box(6262, 6262), Box(6262, 6262)),
+ Box(Box(6263, 6263), Box(6263, 6263)),
+ Box(Box(6264, 6264), Box(6264, 6264)),
+ Box(Box(6265, 6265), Box(6265, 6265)),
+ Box(Box(6266, 6266), Box(6266, 6266)),
+ Box(Box(6267, 6267), Box(6267, 6267)),
+ Box(Box(6268, 6268), Box(6268, 6268)),
+ Box(Box(6269, 6269), Box(6269, 6269)),
+ Box(Box(6270, 6270), Box(6270, 6270)),
+ Box(Box(6271, 6271), Box(6271, 6271)),
+ Box(Box(6272, 6272), Box(6272, 6272)),
+ Box(Box(6273, 6273), Box(6273, 6273)),
+ Box(Box(6274, 6274), Box(6274, 6274)),
+ Box(Box(6275, 6275), Box(6275, 6275)),
+ Box(Box(6276, 6276), Box(6276, 6276)),
+ Box(Box(6277, 6277), Box(6277, 6277)),
+ Box(Box(6278, 6278), Box(6278, 6278)),
+ Box(Box(6279, 6279), Box(6279, 6279)),
+ Box(Box(6280, 6280), Box(6280, 6280)),
+ Box(Box(6281, 6281), Box(6281, 6281)),
+ Box(Box(6282, 6282), Box(6282, 6282)),
+ Box(Box(6283, 6283), Box(6283, 6283)),
+ Box(Box(6284, 6284), Box(6284, 6284)),
+ Box(Box(6285, 6285), Box(6285, 6285)),
+ Box(Box(6286, 6286), Box(6286, 6286)),
+ Box(Box(6287, 6287), Box(6287, 6287)),
+ Box(Box(6288, 6288), Box(6288, 6288)),
+ Box(Box(6289, 6289), Box(6289, 6289)),
+ Box(Box(6290, 6290), Box(6290, 6290)),
+ Box(Box(6291, 6291), Box(6291, 6291)),
+ Box(Box(6292, 6292), Box(6292, 6292)),
+ Box(Box(6293, 6293), Box(6293, 6293)),
+ Box(Box(6294, 6294), Box(6294, 6294)),
+ Box(Box(6295, 6295), Box(6295, 6295)),
+ Box(Box(6296, 6296), Box(6296, 6296)),
+ Box(Box(6297, 6297), Box(6297, 6297)),
+ Box(Box(6298, 6298), Box(6298, 6298)),
+ Box(Box(6299, 6299), Box(6299, 6299)),
+ Box(Box(6300, 6300), Box(6300, 6300)),
+ Box(Box(6301, 6301), Box(6301, 6301)),
+ Box(Box(6302, 6302), Box(6302, 6302)),
+ Box(Box(6303, 6303), Box(6303, 6303)),
+ Box(Box(6304, 6304), Box(6304, 6304)),
+ Box(Box(6305, 6305), Box(6305, 6305)),
+ Box(Box(6306, 6306), Box(6306, 6306)),
+ Box(Box(6307, 6307), Box(6307, 6307)),
+ Box(Box(6308, 6308), Box(6308, 6308)),
+ Box(Box(6309, 6309), Box(6309, 6309)),
+ Box(Box(6310, 6310), Box(6310, 6310)),
+ Box(Box(6311, 6311), Box(6311, 6311)),
+ Box(Box(6312, 6312), Box(6312, 6312)),
+ Box(Box(6313, 6313), Box(6313, 6313)),
+ Box(Box(6314, 6314), Box(6314, 6314)),
+ Box(Box(6315, 6315), Box(6315, 6315)),
+ Box(Box(6316, 6316), Box(6316, 6316)),
+ Box(Box(6317, 6317), Box(6317, 6317)),
+ Box(Box(6318, 6318), Box(6318, 6318)),
+ Box(Box(6319, 6319), Box(6319, 6319)),
+ Box(Box(6320, 6320), Box(6320, 6320)),
+ Box(Box(6321, 6321), Box(6321, 6321)),
+ Box(Box(6322, 6322), Box(6322, 6322)),
+ Box(Box(6323, 6323), Box(6323, 6323)),
+ Box(Box(6324, 6324), Box(6324, 6324)),
+ Box(Box(6325, 6325), Box(6325, 6325)),
+ Box(Box(6326, 6326), Box(6326, 6326)),
+ Box(Box(6327, 6327), Box(6327, 6327)),
+ Box(Box(6328, 6328), Box(6328, 6328)),
+ Box(Box(6329, 6329), Box(6329, 6329)),
+ Box(Box(6330, 6330), Box(6330, 6330)),
+ Box(Box(6331, 6331), Box(6331, 6331)),
+ Box(Box(6332, 6332), Box(6332, 6332)),
+ Box(Box(6333, 6333), Box(6333, 6333)),
+ Box(Box(6334, 6334), Box(6334, 6334)),
+ Box(Box(6335, 6335), Box(6335, 6335)),
+ Box(Box(6336, 6336), Box(6336, 6336)),
+ Box(Box(6337, 6337), Box(6337, 6337)),
+ Box(Box(6338, 6338), Box(6338, 6338)),
+ Box(Box(6339, 6339), Box(6339, 6339)),
+ Box(Box(6340, 6340), Box(6340, 6340)),
+ Box(Box(6341, 6341), Box(6341, 6341)),
+ Box(Box(6342, 6342), Box(6342, 6342)),
+ Box(Box(6343, 6343), Box(6343, 6343)),
+ Box(Box(6344, 6344), Box(6344, 6344)),
+ Box(Box(6345, 6345), Box(6345, 6345)),
+ Box(Box(6346, 6346), Box(6346, 6346)),
+ Box(Box(6347, 6347), Box(6347, 6347)),
+ Box(Box(6348, 6348), Box(6348, 6348)),
+ Box(Box(6349, 6349), Box(6349, 6349)),
+ Box(Box(6350, 6350), Box(6350, 6350)),
+ Box(Box(6351, 6351), Box(6351, 6351)),
+ Box(Box(6352, 6352), Box(6352, 6352)),
+ Box(Box(6353, 6353), Box(6353, 6353)),
+ Box(Box(6354, 6354), Box(6354, 6354)),
+ Box(Box(6355, 6355), Box(6355, 6355)),
+ Box(Box(6356, 6356), Box(6356, 6356)),
+ Box(Box(6357, 6357), Box(6357, 6357)),
+ Box(Box(6358, 6358), Box(6358, 6358)),
+ Box(Box(6359, 6359), Box(6359, 6359)),
+ Box(Box(6360, 6360), Box(6360, 6360)),
+ Box(Box(6361, 6361), Box(6361, 6361)),
+ Box(Box(6362, 6362), Box(6362, 6362)),
+ Box(Box(6363, 6363), Box(6363, 6363)),
+ Box(Box(6364, 6364), Box(6364, 6364)),
+ Box(Box(6365, 6365), Box(6365, 6365)),
+ Box(Box(6366, 6366), Box(6366, 6366)),
+ Box(Box(6367, 6367), Box(6367, 6367)),
+ Box(Box(6368, 6368), Box(6368, 6368)),
+ Box(Box(6369, 6369), Box(6369, 6369)),
+ Box(Box(6370, 6370), Box(6370, 6370)),
+ Box(Box(6371, 6371), Box(6371, 6371)),
+ Box(Box(6372, 6372), Box(6372, 6372)),
+ Box(Box(6373, 6373), Box(6373, 6373)),
+ Box(Box(6374, 6374), Box(6374, 6374)),
+ Box(Box(6375, 6375), Box(6375, 6375)),
+ Box(Box(6376, 6376), Box(6376, 6376)),
+ Box(Box(6377, 6377), Box(6377, 6377)),
+ Box(Box(6378, 6378), Box(6378, 6378)),
+ Box(Box(6379, 6379), Box(6379, 6379)),
+ Box(Box(6380, 6380), Box(6380, 6380)),
+ Box(Box(6381, 6381), Box(6381, 6381)),
+ Box(Box(6382, 6382), Box(6382, 6382)),
+ Box(Box(6383, 6383), Box(6383, 6383)),
+ Box(Box(6384, 6384), Box(6384, 6384)),
+ Box(Box(6385, 6385), Box(6385, 6385)),
+ Box(Box(6386, 6386), Box(6386, 6386)),
+ Box(Box(6387, 6387), Box(6387, 6387)),
+ Box(Box(6388, 6388), Box(6388, 6388)),
+ Box(Box(6389, 6389), Box(6389, 6389)),
+ Box(Box(6390, 6390), Box(6390, 6390)),
+ Box(Box(6391, 6391), Box(6391, 6391)),
+ Box(Box(6392, 6392), Box(6392, 6392)),
+ Box(Box(6393, 6393), Box(6393, 6393)),
+ Box(Box(6394, 6394), Box(6394, 6394)),
+ Box(Box(6395, 6395), Box(6395, 6395)),
+ Box(Box(6396, 6396), Box(6396, 6396)),
+ Box(Box(6397, 6397), Box(6397, 6397)),
+ Box(Box(6398, 6398), Box(6398, 6398)),
+ Box(Box(6399, 6399), Box(6399, 6399)),
+ Box(Box(6400, 6400), Box(6400, 6400)),
+ Box(Box(6401, 6401), Box(6401, 6401)),
+ Box(Box(6402, 6402), Box(6402, 6402)),
+ Box(Box(6403, 6403), Box(6403, 6403)),
+ Box(Box(6404, 6404), Box(6404, 6404)),
+ Box(Box(6405, 6405), Box(6405, 6405)),
+ Box(Box(6406, 6406), Box(6406, 6406)),
+ Box(Box(6407, 6407), Box(6407, 6407)),
+ Box(Box(6408, 6408), Box(6408, 6408)),
+ Box(Box(6409, 6409), Box(6409, 6409)),
+ Box(Box(6410, 6410), Box(6410, 6410)),
+ Box(Box(6411, 6411), Box(6411, 6411)),
+ Box(Box(6412, 6412), Box(6412, 6412)),
+ Box(Box(6413, 6413), Box(6413, 6413)),
+ Box(Box(6414, 6414), Box(6414, 6414)),
+ Box(Box(6415, 6415), Box(6415, 6415)),
+ Box(Box(6416, 6416), Box(6416, 6416)),
+ Box(Box(6417, 6417), Box(6417, 6417)),
+ Box(Box(6418, 6418), Box(6418, 6418)),
+ Box(Box(6419, 6419), Box(6419, 6419)),
+ Box(Box(6420, 6420), Box(6420, 6420)),
+ Box(Box(6421, 6421), Box(6421, 6421)),
+ Box(Box(6422, 6422), Box(6422, 6422)),
+ Box(Box(6423, 6423), Box(6423, 6423)),
+ Box(Box(6424, 6424), Box(6424, 6424)),
+ Box(Box(6425, 6425), Box(6425, 6425)),
+ Box(Box(6426, 6426), Box(6426, 6426)),
+ Box(Box(6427, 6427), Box(6427, 6427)),
+ Box(Box(6428, 6428), Box(6428, 6428)),
+ Box(Box(6429, 6429), Box(6429, 6429)),
+ Box(Box(6430, 6430), Box(6430, 6430)),
+ Box(Box(6431, 6431), Box(6431, 6431)),
+ Box(Box(6432, 6432), Box(6432, 6432)),
+ Box(Box(6433, 6433), Box(6433, 6433)),
+ Box(Box(6434, 6434), Box(6434, 6434)),
+ Box(Box(6435, 6435), Box(6435, 6435)),
+ Box(Box(6436, 6436), Box(6436, 6436)),
+ Box(Box(6437, 6437), Box(6437, 6437)),
+ Box(Box(6438, 6438), Box(6438, 6438)),
+ Box(Box(6439, 6439), Box(6439, 6439)),
+ Box(Box(6440, 6440), Box(6440, 6440)),
+ Box(Box(6441, 6441), Box(6441, 6441)),
+ Box(Box(6442, 6442), Box(6442, 6442)),
+ Box(Box(6443, 6443), Box(6443, 6443)),
+ Box(Box(6444, 6444), Box(6444, 6444)),
+ Box(Box(6445, 6445), Box(6445, 6445)),
+ Box(Box(6446, 6446), Box(6446, 6446)),
+ Box(Box(6447, 6447), Box(6447, 6447)),
+ Box(Box(6448, 6448), Box(6448, 6448)),
+ Box(Box(6449, 6449), Box(6449, 6449)),
+ Box(Box(6450, 6450), Box(6450, 6450)),
+ Box(Box(6451, 6451), Box(6451, 6451)),
+ Box(Box(6452, 6452), Box(6452, 6452)),
+ Box(Box(6453, 6453), Box(6453, 6453)),
+ Box(Box(6454, 6454), Box(6454, 6454)),
+ Box(Box(6455, 6455), Box(6455, 6455)),
+ Box(Box(6456, 6456), Box(6456, 6456)),
+ Box(Box(6457, 6457), Box(6457, 6457)),
+ Box(Box(6458, 6458), Box(6458, 6458)),
+ Box(Box(6459, 6459), Box(6459, 6459)),
+ Box(Box(6460, 6460), Box(6460, 6460)),
+ Box(Box(6461, 6461), Box(6461, 6461)),
+ Box(Box(6462, 6462), Box(6462, 6462)),
+ Box(Box(6463, 6463), Box(6463, 6463)),
+ Box(Box(6464, 6464), Box(6464, 6464)),
+ Box(Box(6465, 6465), Box(6465, 6465)),
+ Box(Box(6466, 6466), Box(6466, 6466)),
+ Box(Box(6467, 6467), Box(6467, 6467)),
+ Box(Box(6468, 6468), Box(6468, 6468)),
+ Box(Box(6469, 6469), Box(6469, 6469)),
+ Box(Box(6470, 6470), Box(6470, 6470)),
+ Box(Box(6471, 6471), Box(6471, 6471)),
+ Box(Box(6472, 6472), Box(6472, 6472)),
+ Box(Box(6473, 6473), Box(6473, 6473)),
+ Box(Box(6474, 6474), Box(6474, 6474)),
+ Box(Box(6475, 6475), Box(6475, 6475)),
+ Box(Box(6476, 6476), Box(6476, 6476)),
+ Box(Box(6477, 6477), Box(6477, 6477)),
+ Box(Box(6478, 6478), Box(6478, 6478)),
+ Box(Box(6479, 6479), Box(6479, 6479)),
+ Box(Box(6480, 6480), Box(6480, 6480)),
+ Box(Box(6481, 6481), Box(6481, 6481)),
+ Box(Box(6482, 6482), Box(6482, 6482)),
+ Box(Box(6483, 6483), Box(6483, 6483)),
+ Box(Box(6484, 6484), Box(6484, 6484)),
+ Box(Box(6485, 6485), Box(6485, 6485)),
+ Box(Box(6486, 6486), Box(6486, 6486)),
+ Box(Box(6487, 6487), Box(6487, 6487)),
+ Box(Box(6488, 6488), Box(6488, 6488)),
+ Box(Box(6489, 6489), Box(6489, 6489)),
+ Box(Box(6490, 6490), Box(6490, 6490)),
+ Box(Box(6491, 6491), Box(6491, 6491)),
+ Box(Box(6492, 6492), Box(6492, 6492)),
+ Box(Box(6493, 6493), Box(6493, 6493)),
+ Box(Box(6494, 6494), Box(6494, 6494)),
+ Box(Box(6495, 6495), Box(6495, 6495)),
+ Box(Box(6496, 6496), Box(6496, 6496)),
+ Box(Box(6497, 6497), Box(6497, 6497)),
+ Box(Box(6498, 6498), Box(6498, 6498)),
+ Box(Box(6499, 6499), Box(6499, 6499)),
+ Box(Box(6500, 6500), Box(6500, 6500)),
+ Box(Box(6501, 6501), Box(6501, 6501)),
+ Box(Box(6502, 6502), Box(6502, 6502)),
+ Box(Box(6503, 6503), Box(6503, 6503)),
+ Box(Box(6504, 6504), Box(6504, 6504)),
+ Box(Box(6505, 6505), Box(6505, 6505)),
+ Box(Box(6506, 6506), Box(6506, 6506)),
+ Box(Box(6507, 6507), Box(6507, 6507)),
+ Box(Box(6508, 6508), Box(6508, 6508)),
+ Box(Box(6509, 6509), Box(6509, 6509)),
+ Box(Box(6510, 6510), Box(6510, 6510)),
+ Box(Box(6511, 6511), Box(6511, 6511)),
+ Box(Box(6512, 6512), Box(6512, 6512)),
+ Box(Box(6513, 6513), Box(6513, 6513)),
+ Box(Box(6514, 6514), Box(6514, 6514)),
+ Box(Box(6515, 6515), Box(6515, 6515)),
+ Box(Box(6516, 6516), Box(6516, 6516)),
+ Box(Box(6517, 6517), Box(6517, 6517)),
+ Box(Box(6518, 6518), Box(6518, 6518)),
+ Box(Box(6519, 6519), Box(6519, 6519)),
+ Box(Box(6520, 6520), Box(6520, 6520)),
+ Box(Box(6521, 6521), Box(6521, 6521)),
+ Box(Box(6522, 6522), Box(6522, 6522)),
+ Box(Box(6523, 6523), Box(6523, 6523)),
+ Box(Box(6524, 6524), Box(6524, 6524)),
+ Box(Box(6525, 6525), Box(6525, 6525)),
+ Box(Box(6526, 6526), Box(6526, 6526)),
+ Box(Box(6527, 6527), Box(6527, 6527)),
+ Box(Box(6528, 6528), Box(6528, 6528)),
+ Box(Box(6529, 6529), Box(6529, 6529)),
+ Box(Box(6530, 6530), Box(6530, 6530)),
+ Box(Box(6531, 6531), Box(6531, 6531)),
+ Box(Box(6532, 6532), Box(6532, 6532)),
+ Box(Box(6533, 6533), Box(6533, 6533)),
+ Box(Box(6534, 6534), Box(6534, 6534)),
+ Box(Box(6535, 6535), Box(6535, 6535)),
+ Box(Box(6536, 6536), Box(6536, 6536)),
+ Box(Box(6537, 6537), Box(6537, 6537)),
+ Box(Box(6538, 6538), Box(6538, 6538)),
+ Box(Box(6539, 6539), Box(6539, 6539)),
+ Box(Box(6540, 6540), Box(6540, 6540)),
+ Box(Box(6541, 6541), Box(6541, 6541)),
+ Box(Box(6542, 6542), Box(6542, 6542)),
+ Box(Box(6543, 6543), Box(6543, 6543)),
+ Box(Box(6544, 6544), Box(6544, 6544)),
+ Box(Box(6545, 6545), Box(6545, 6545)),
+ Box(Box(6546, 6546), Box(6546, 6546)),
+ Box(Box(6547, 6547), Box(6547, 6547)),
+ Box(Box(6548, 6548), Box(6548, 6548)),
+ Box(Box(6549, 6549), Box(6549, 6549)),
+ Box(Box(6550, 6550), Box(6550, 6550)),
+ Box(Box(6551, 6551), Box(6551, 6551)),
+ Box(Box(6552, 6552), Box(6552, 6552)),
+ Box(Box(6553, 6553), Box(6553, 6553)),
+ Box(Box(6554, 6554), Box(6554, 6554)),
+ Box(Box(6555, 6555), Box(6555, 6555)),
+ Box(Box(6556, 6556), Box(6556, 6556)),
+ Box(Box(6557, 6557), Box(6557, 6557)),
+ Box(Box(6558, 6558), Box(6558, 6558)),
+ Box(Box(6559, 6559), Box(6559, 6559)),
+ Box(Box(6560, 6560), Box(6560, 6560)),
+ Box(Box(6561, 6561), Box(6561, 6561)),
+ Box(Box(6562, 6562), Box(6562, 6562)),
+ Box(Box(6563, 6563), Box(6563, 6563)),
+ Box(Box(6564, 6564), Box(6564, 6564)),
+ Box(Box(6565, 6565), Box(6565, 6565)),
+ Box(Box(6566, 6566), Box(6566, 6566)),
+ Box(Box(6567, 6567), Box(6567, 6567)),
+ Box(Box(6568, 6568), Box(6568, 6568)),
+ Box(Box(6569, 6569), Box(6569, 6569)),
+ Box(Box(6570, 6570), Box(6570, 6570)),
+ Box(Box(6571, 6571), Box(6571, 6571)),
+ Box(Box(6572, 6572), Box(6572, 6572)),
+ Box(Box(6573, 6573), Box(6573, 6573)),
+ Box(Box(6574, 6574), Box(6574, 6574)),
+ Box(Box(6575, 6575), Box(6575, 6575)),
+ Box(Box(6576, 6576), Box(6576, 6576)),
+ Box(Box(6577, 6577), Box(6577, 6577)),
+ Box(Box(6578, 6578), Box(6578, 6578)),
+ Box(Box(6579, 6579), Box(6579, 6579)),
+ Box(Box(6580, 6580), Box(6580, 6580)),
+ Box(Box(6581, 6581), Box(6581, 6581)),
+ Box(Box(6582, 6582), Box(6582, 6582)),
+ Box(Box(6583, 6583), Box(6583, 6583)),
+ Box(Box(6584, 6584), Box(6584, 6584)),
+ Box(Box(6585, 6585), Box(6585, 6585)),
+ Box(Box(6586, 6586), Box(6586, 6586)),
+ Box(Box(6587, 6587), Box(6587, 6587)),
+ Box(Box(6588, 6588), Box(6588, 6588)),
+ Box(Box(6589, 6589), Box(6589, 6589)),
+ Box(Box(6590, 6590), Box(6590, 6590)),
+ Box(Box(6591, 6591), Box(6591, 6591)),
+ Box(Box(6592, 6592), Box(6592, 6592)),
+ Box(Box(6593, 6593), Box(6593, 6593)),
+ Box(Box(6594, 6594), Box(6594, 6594)),
+ Box(Box(6595, 6595), Box(6595, 6595)),
+ Box(Box(6596, 6596), Box(6596, 6596)),
+ Box(Box(6597, 6597), Box(6597, 6597)),
+ Box(Box(6598, 6598), Box(6598, 6598)),
+ Box(Box(6599, 6599), Box(6599, 6599)),
+ Box(Box(6600, 6600), Box(6600, 6600)),
+ Box(Box(6601, 6601), Box(6601, 6601)),
+ Box(Box(6602, 6602), Box(6602, 6602)),
+ Box(Box(6603, 6603), Box(6603, 6603)),
+ Box(Box(6604, 6604), Box(6604, 6604)),
+ Box(Box(6605, 6605), Box(6605, 6605)),
+ Box(Box(6606, 6606), Box(6606, 6606)),
+ Box(Box(6607, 6607), Box(6607, 6607)),
+ Box(Box(6608, 6608), Box(6608, 6608)),
+ Box(Box(6609, 6609), Box(6609, 6609)),
+ Box(Box(6610, 6610), Box(6610, 6610)),
+ Box(Box(6611, 6611), Box(6611, 6611)),
+ Box(Box(6612, 6612), Box(6612, 6612)),
+ Box(Box(6613, 6613), Box(6613, 6613)),
+ Box(Box(6614, 6614), Box(6614, 6614)),
+ Box(Box(6615, 6615), Box(6615, 6615)),
+ Box(Box(6616, 6616), Box(6616, 6616)),
+ Box(Box(6617, 6617), Box(6617, 6617)),
+ Box(Box(6618, 6618), Box(6618, 6618)),
+ Box(Box(6619, 6619), Box(6619, 6619)),
+ Box(Box(6620, 6620), Box(6620, 6620)),
+ Box(Box(6621, 6621), Box(6621, 6621)),
+ Box(Box(6622, 6622), Box(6622, 6622)),
+ Box(Box(6623, 6623), Box(6623, 6623)),
+ Box(Box(6624, 6624), Box(6624, 6624)),
+ Box(Box(6625, 6625), Box(6625, 6625)),
+ Box(Box(6626, 6626), Box(6626, 6626)),
+ Box(Box(6627, 6627), Box(6627, 6627)),
+ Box(Box(6628, 6628), Box(6628, 6628)),
+ Box(Box(6629, 6629), Box(6629, 6629)),
+ Box(Box(6630, 6630), Box(6630, 6630)),
+ Box(Box(6631, 6631), Box(6631, 6631)),
+ Box(Box(6632, 6632), Box(6632, 6632)),
+ Box(Box(6633, 6633), Box(6633, 6633)),
+ Box(Box(6634, 6634), Box(6634, 6634)),
+ Box(Box(6635, 6635), Box(6635, 6635)),
+ Box(Box(6636, 6636), Box(6636, 6636)),
+ Box(Box(6637, 6637), Box(6637, 6637)),
+ Box(Box(6638, 6638), Box(6638, 6638)),
+ Box(Box(6639, 6639), Box(6639, 6639)),
+ Box(Box(6640, 6640), Box(6640, 6640)),
+ Box(Box(6641, 6641), Box(6641, 6641)),
+ Box(Box(6642, 6642), Box(6642, 6642)),
+ Box(Box(6643, 6643), Box(6643, 6643)),
+ Box(Box(6644, 6644), Box(6644, 6644)),
+ Box(Box(6645, 6645), Box(6645, 6645)),
+ Box(Box(6646, 6646), Box(6646, 6646)),
+ Box(Box(6647, 6647), Box(6647, 6647)),
+ Box(Box(6648, 6648), Box(6648, 6648)),
+ Box(Box(6649, 6649), Box(6649, 6649)),
+ Box(Box(6650, 6650), Box(6650, 6650)),
+ Box(Box(6651, 6651), Box(6651, 6651)),
+ Box(Box(6652, 6652), Box(6652, 6652)),
+ Box(Box(6653, 6653), Box(6653, 6653)),
+ Box(Box(6654, 6654), Box(6654, 6654)),
+ Box(Box(6655, 6655), Box(6655, 6655)),
+ Box(Box(6656, 6656), Box(6656, 6656)),
+ Box(Box(6657, 6657), Box(6657, 6657)),
+ Box(Box(6658, 6658), Box(6658, 6658)),
+ Box(Box(6659, 6659), Box(6659, 6659)),
+ Box(Box(6660, 6660), Box(6660, 6660)),
+ Box(Box(6661, 6661), Box(6661, 6661)),
+ Box(Box(6662, 6662), Box(6662, 6662)),
+ Box(Box(6663, 6663), Box(6663, 6663)),
+ Box(Box(6664, 6664), Box(6664, 6664)),
+ Box(Box(6665, 6665), Box(6665, 6665)),
+ Box(Box(6666, 6666), Box(6666, 6666)),
+ Box(Box(6667, 6667), Box(6667, 6667)),
+ Box(Box(6668, 6668), Box(6668, 6668)),
+ Box(Box(6669, 6669), Box(6669, 6669)),
+ Box(Box(6670, 6670), Box(6670, 6670)),
+ Box(Box(6671, 6671), Box(6671, 6671)),
+ Box(Box(6672, 6672), Box(6672, 6672)),
+ Box(Box(6673, 6673), Box(6673, 6673)),
+ Box(Box(6674, 6674), Box(6674, 6674)),
+ Box(Box(6675, 6675), Box(6675, 6675)),
+ Box(Box(6676, 6676), Box(6676, 6676)),
+ Box(Box(6677, 6677), Box(6677, 6677)),
+ Box(Box(6678, 6678), Box(6678, 6678)),
+ Box(Box(6679, 6679), Box(6679, 6679)),
+ Box(Box(6680, 6680), Box(6680, 6680)),
+ Box(Box(6681, 6681), Box(6681, 6681)),
+ Box(Box(6682, 6682), Box(6682, 6682)),
+ Box(Box(6683, 6683), Box(6683, 6683)),
+ Box(Box(6684, 6684), Box(6684, 6684)),
+ Box(Box(6685, 6685), Box(6685, 6685)),
+ Box(Box(6686, 6686), Box(6686, 6686)),
+ Box(Box(6687, 6687), Box(6687, 6687)),
+ Box(Box(6688, 6688), Box(6688, 6688)),
+ Box(Box(6689, 6689), Box(6689, 6689)),
+ Box(Box(6690, 6690), Box(6690, 6690)),
+ Box(Box(6691, 6691), Box(6691, 6691)),
+ Box(Box(6692, 6692), Box(6692, 6692)),
+ Box(Box(6693, 6693), Box(6693, 6693)),
+ Box(Box(6694, 6694), Box(6694, 6694)),
+ Box(Box(6695, 6695), Box(6695, 6695)),
+ Box(Box(6696, 6696), Box(6696, 6696)),
+ Box(Box(6697, 6697), Box(6697, 6697)),
+ Box(Box(6698, 6698), Box(6698, 6698)),
+ Box(Box(6699, 6699), Box(6699, 6699)),
+ Box(Box(6700, 6700), Box(6700, 6700)),
+ Box(Box(6701, 6701), Box(6701, 6701)),
+ Box(Box(6702, 6702), Box(6702, 6702)),
+ Box(Box(6703, 6703), Box(6703, 6703)),
+ Box(Box(6704, 6704), Box(6704, 6704)),
+ Box(Box(6705, 6705), Box(6705, 6705)),
+ Box(Box(6706, 6706), Box(6706, 6706)),
+ Box(Box(6707, 6707), Box(6707, 6707)),
+ Box(Box(6708, 6708), Box(6708, 6708)),
+ Box(Box(6709, 6709), Box(6709, 6709)),
+ Box(Box(6710, 6710), Box(6710, 6710)),
+ Box(Box(6711, 6711), Box(6711, 6711)),
+ Box(Box(6712, 6712), Box(6712, 6712)),
+ Box(Box(6713, 6713), Box(6713, 6713)),
+ Box(Box(6714, 6714), Box(6714, 6714)),
+ Box(Box(6715, 6715), Box(6715, 6715)),
+ Box(Box(6716, 6716), Box(6716, 6716)),
+ Box(Box(6717, 6717), Box(6717, 6717)),
+ Box(Box(6718, 6718), Box(6718, 6718)),
+ Box(Box(6719, 6719), Box(6719, 6719)),
+ Box(Box(6720, 6720), Box(6720, 6720)),
+ Box(Box(6721, 6721), Box(6721, 6721)),
+ Box(Box(6722, 6722), Box(6722, 6722)),
+ Box(Box(6723, 6723), Box(6723, 6723)),
+ Box(Box(6724, 6724), Box(6724, 6724)),
+ Box(Box(6725, 6725), Box(6725, 6725)),
+ Box(Box(6726, 6726), Box(6726, 6726)),
+ Box(Box(6727, 6727), Box(6727, 6727)),
+ Box(Box(6728, 6728), Box(6728, 6728)),
+ Box(Box(6729, 6729), Box(6729, 6729)),
+ Box(Box(6730, 6730), Box(6730, 6730)),
+ Box(Box(6731, 6731), Box(6731, 6731)),
+ Box(Box(6732, 6732), Box(6732, 6732)),
+ Box(Box(6733, 6733), Box(6733, 6733)),
+ Box(Box(6734, 6734), Box(6734, 6734)),
+ Box(Box(6735, 6735), Box(6735, 6735)),
+ Box(Box(6736, 6736), Box(6736, 6736)),
+ Box(Box(6737, 6737), Box(6737, 6737)),
+ Box(Box(6738, 6738), Box(6738, 6738)),
+ Box(Box(6739, 6739), Box(6739, 6739)),
+ Box(Box(6740, 6740), Box(6740, 6740)),
+ Box(Box(6741, 6741), Box(6741, 6741)),
+ Box(Box(6742, 6742), Box(6742, 6742)),
+ Box(Box(6743, 6743), Box(6743, 6743)),
+ Box(Box(6744, 6744), Box(6744, 6744)),
+ Box(Box(6745, 6745), Box(6745, 6745)),
+ Box(Box(6746, 6746), Box(6746, 6746)),
+ Box(Box(6747, 6747), Box(6747, 6747)),
+ Box(Box(6748, 6748), Box(6748, 6748)),
+ Box(Box(6749, 6749), Box(6749, 6749)),
+ Box(Box(6750, 6750), Box(6750, 6750)),
+ Box(Box(6751, 6751), Box(6751, 6751)),
+ Box(Box(6752, 6752), Box(6752, 6752)),
+ Box(Box(6753, 6753), Box(6753, 6753)),
+ Box(Box(6754, 6754), Box(6754, 6754)),
+ Box(Box(6755, 6755), Box(6755, 6755)),
+ Box(Box(6756, 6756), Box(6756, 6756)),
+ Box(Box(6757, 6757), Box(6757, 6757)),
+ Box(Box(6758, 6758), Box(6758, 6758)),
+ Box(Box(6759, 6759), Box(6759, 6759)),
+ Box(Box(6760, 6760), Box(6760, 6760)),
+ Box(Box(6761, 6761), Box(6761, 6761)),
+ Box(Box(6762, 6762), Box(6762, 6762)),
+ Box(Box(6763, 6763), Box(6763, 6763)),
+ Box(Box(6764, 6764), Box(6764, 6764)),
+ Box(Box(6765, 6765), Box(6765, 6765)),
+ Box(Box(6766, 6766), Box(6766, 6766)),
+ Box(Box(6767, 6767), Box(6767, 6767)),
+ Box(Box(6768, 6768), Box(6768, 6768)),
+ Box(Box(6769, 6769), Box(6769, 6769)),
+ Box(Box(6770, 6770), Box(6770, 6770)),
+ Box(Box(6771, 6771), Box(6771, 6771)),
+ Box(Box(6772, 6772), Box(6772, 6772)),
+ Box(Box(6773, 6773), Box(6773, 6773)),
+ Box(Box(6774, 6774), Box(6774, 6774)),
+ Box(Box(6775, 6775), Box(6775, 6775)),
+ Box(Box(6776, 6776), Box(6776, 6776)),
+ Box(Box(6777, 6777), Box(6777, 6777)),
+ Box(Box(6778, 6778), Box(6778, 6778)),
+ Box(Box(6779, 6779), Box(6779, 6779)),
+ Box(Box(6780, 6780), Box(6780, 6780)),
+ Box(Box(6781, 6781), Box(6781, 6781)),
+ Box(Box(6782, 6782), Box(6782, 6782)),
+ Box(Box(6783, 6783), Box(6783, 6783)),
+ Box(Box(6784, 6784), Box(6784, 6784)),
+ Box(Box(6785, 6785), Box(6785, 6785)),
+ Box(Box(6786, 6786), Box(6786, 6786)),
+ Box(Box(6787, 6787), Box(6787, 6787)),
+ Box(Box(6788, 6788), Box(6788, 6788)),
+ Box(Box(6789, 6789), Box(6789, 6789)),
+ Box(Box(6790, 6790), Box(6790, 6790)),
+ Box(Box(6791, 6791), Box(6791, 6791)),
+ Box(Box(6792, 6792), Box(6792, 6792)),
+ Box(Box(6793, 6793), Box(6793, 6793)),
+ Box(Box(6794, 6794), Box(6794, 6794)),
+ Box(Box(6795, 6795), Box(6795, 6795)),
+ Box(Box(6796, 6796), Box(6796, 6796)),
+ Box(Box(6797, 6797), Box(6797, 6797)),
+ Box(Box(6798, 6798), Box(6798, 6798)),
+ Box(Box(6799, 6799), Box(6799, 6799)),
+ Box(Box(6800, 6800), Box(6800, 6800)),
+ Box(Box(6801, 6801), Box(6801, 6801)),
+ Box(Box(6802, 6802), Box(6802, 6802)),
+ Box(Box(6803, 6803), Box(6803, 6803)),
+ Box(Box(6804, 6804), Box(6804, 6804)),
+ Box(Box(6805, 6805), Box(6805, 6805)),
+ Box(Box(6806, 6806), Box(6806, 6806)),
+ Box(Box(6807, 6807), Box(6807, 6807)),
+ Box(Box(6808, 6808), Box(6808, 6808)),
+ Box(Box(6809, 6809), Box(6809, 6809)),
+ Box(Box(6810, 6810), Box(6810, 6810)),
+ Box(Box(6811, 6811), Box(6811, 6811)),
+ Box(Box(6812, 6812), Box(6812, 6812)),
+ Box(Box(6813, 6813), Box(6813, 6813)),
+ Box(Box(6814, 6814), Box(6814, 6814)),
+ Box(Box(6815, 6815), Box(6815, 6815)),
+ Box(Box(6816, 6816), Box(6816, 6816)),
+ Box(Box(6817, 6817), Box(6817, 6817)),
+ Box(Box(6818, 6818), Box(6818, 6818)),
+ Box(Box(6819, 6819), Box(6819, 6819)),
+ Box(Box(6820, 6820), Box(6820, 6820)),
+ Box(Box(6821, 6821), Box(6821, 6821)),
+ Box(Box(6822, 6822), Box(6822, 6822)),
+ Box(Box(6823, 6823), Box(6823, 6823)),
+ Box(Box(6824, 6824), Box(6824, 6824)),
+ Box(Box(6825, 6825), Box(6825, 6825)),
+ Box(Box(6826, 6826), Box(6826, 6826)),
+ Box(Box(6827, 6827), Box(6827, 6827)),
+ Box(Box(6828, 6828), Box(6828, 6828)),
+ Box(Box(6829, 6829), Box(6829, 6829)),
+ Box(Box(6830, 6830), Box(6830, 6830)),
+ Box(Box(6831, 6831), Box(6831, 6831)),
+ Box(Box(6832, 6832), Box(6832, 6832)),
+ Box(Box(6833, 6833), Box(6833, 6833)),
+ Box(Box(6834, 6834), Box(6834, 6834)),
+ Box(Box(6835, 6835), Box(6835, 6835)),
+ Box(Box(6836, 6836), Box(6836, 6836)),
+ Box(Box(6837, 6837), Box(6837, 6837)),
+ Box(Box(6838, 6838), Box(6838, 6838)),
+ Box(Box(6839, 6839), Box(6839, 6839)),
+ Box(Box(6840, 6840), Box(6840, 6840)),
+ Box(Box(6841, 6841), Box(6841, 6841)),
+ Box(Box(6842, 6842), Box(6842, 6842)),
+ Box(Box(6843, 6843), Box(6843, 6843)),
+ Box(Box(6844, 6844), Box(6844, 6844)),
+ Box(Box(6845, 6845), Box(6845, 6845)),
+ Box(Box(6846, 6846), Box(6846, 6846)),
+ Box(Box(6847, 6847), Box(6847, 6847)),
+ Box(Box(6848, 6848), Box(6848, 6848)),
+ Box(Box(6849, 6849), Box(6849, 6849)),
+ Box(Box(6850, 6850), Box(6850, 6850)),
+ Box(Box(6851, 6851), Box(6851, 6851)),
+ Box(Box(6852, 6852), Box(6852, 6852)),
+ Box(Box(6853, 6853), Box(6853, 6853)),
+ Box(Box(6854, 6854), Box(6854, 6854)),
+ Box(Box(6855, 6855), Box(6855, 6855)),
+ Box(Box(6856, 6856), Box(6856, 6856)),
+ Box(Box(6857, 6857), Box(6857, 6857)),
+ Box(Box(6858, 6858), Box(6858, 6858)),
+ Box(Box(6859, 6859), Box(6859, 6859)),
+ Box(Box(6860, 6860), Box(6860, 6860)),
+ Box(Box(6861, 6861), Box(6861, 6861)),
+ Box(Box(6862, 6862), Box(6862, 6862)),
+ Box(Box(6863, 6863), Box(6863, 6863)),
+ Box(Box(6864, 6864), Box(6864, 6864)),
+ Box(Box(6865, 6865), Box(6865, 6865)),
+ Box(Box(6866, 6866), Box(6866, 6866)),
+ Box(Box(6867, 6867), Box(6867, 6867)),
+ Box(Box(6868, 6868), Box(6868, 6868)),
+ Box(Box(6869, 6869), Box(6869, 6869)),
+ Box(Box(6870, 6870), Box(6870, 6870)),
+ Box(Box(6871, 6871), Box(6871, 6871)),
+ Box(Box(6872, 6872), Box(6872, 6872)),
+ Box(Box(6873, 6873), Box(6873, 6873)),
+ Box(Box(6874, 6874), Box(6874, 6874)),
+ Box(Box(6875, 6875), Box(6875, 6875)),
+ Box(Box(6876, 6876), Box(6876, 6876)),
+ Box(Box(6877, 6877), Box(6877, 6877)),
+ Box(Box(6878, 6878), Box(6878, 6878)),
+ Box(Box(6879, 6879), Box(6879, 6879)),
+ Box(Box(6880, 6880), Box(6880, 6880)),
+ Box(Box(6881, 6881), Box(6881, 6881)),
+ Box(Box(6882, 6882), Box(6882, 6882)),
+ Box(Box(6883, 6883), Box(6883, 6883)),
+ Box(Box(6884, 6884), Box(6884, 6884)),
+ Box(Box(6885, 6885), Box(6885, 6885)),
+ Box(Box(6886, 6886), Box(6886, 6886)),
+ Box(Box(6887, 6887), Box(6887, 6887)),
+ Box(Box(6888, 6888), Box(6888, 6888)),
+ Box(Box(6889, 6889), Box(6889, 6889)),
+ Box(Box(6890, 6890), Box(6890, 6890)),
+ Box(Box(6891, 6891), Box(6891, 6891)),
+ Box(Box(6892, 6892), Box(6892, 6892)),
+ Box(Box(6893, 6893), Box(6893, 6893)),
+ Box(Box(6894, 6894), Box(6894, 6894)),
+ Box(Box(6895, 6895), Box(6895, 6895)),
+ Box(Box(6896, 6896), Box(6896, 6896)),
+ Box(Box(6897, 6897), Box(6897, 6897)),
+ Box(Box(6898, 6898), Box(6898, 6898)),
+ Box(Box(6899, 6899), Box(6899, 6899)),
+ Box(Box(6900, 6900), Box(6900, 6900)),
+ Box(Box(6901, 6901), Box(6901, 6901)),
+ Box(Box(6902, 6902), Box(6902, 6902)),
+ Box(Box(6903, 6903), Box(6903, 6903)),
+ Box(Box(6904, 6904), Box(6904, 6904)),
+ Box(Box(6905, 6905), Box(6905, 6905)),
+ Box(Box(6906, 6906), Box(6906, 6906)),
+ Box(Box(6907, 6907), Box(6907, 6907)),
+ Box(Box(6908, 6908), Box(6908, 6908)),
+ Box(Box(6909, 6909), Box(6909, 6909)),
+ Box(Box(6910, 6910), Box(6910, 6910)),
+ Box(Box(6911, 6911), Box(6911, 6911)),
+ Box(Box(6912, 6912), Box(6912, 6912)),
+ Box(Box(6913, 6913), Box(6913, 6913)),
+ Box(Box(6914, 6914), Box(6914, 6914)),
+ Box(Box(6915, 6915), Box(6915, 6915)),
+ Box(Box(6916, 6916), Box(6916, 6916)),
+ Box(Box(6917, 6917), Box(6917, 6917)),
+ Box(Box(6918, 6918), Box(6918, 6918)),
+ Box(Box(6919, 6919), Box(6919, 6919)),
+ Box(Box(6920, 6920), Box(6920, 6920)),
+ Box(Box(6921, 6921), Box(6921, 6921)),
+ Box(Box(6922, 6922), Box(6922, 6922)),
+ Box(Box(6923, 6923), Box(6923, 6923)),
+ Box(Box(6924, 6924), Box(6924, 6924)),
+ Box(Box(6925, 6925), Box(6925, 6925)),
+ Box(Box(6926, 6926), Box(6926, 6926)),
+ Box(Box(6927, 6927), Box(6927, 6927)),
+ Box(Box(6928, 6928), Box(6928, 6928)),
+ Box(Box(6929, 6929), Box(6929, 6929)),
+ Box(Box(6930, 6930), Box(6930, 6930)),
+ Box(Box(6931, 6931), Box(6931, 6931)),
+ Box(Box(6932, 6932), Box(6932, 6932)),
+ Box(Box(6933, 6933), Box(6933, 6933)),
+ Box(Box(6934, 6934), Box(6934, 6934)),
+ Box(Box(6935, 6935), Box(6935, 6935)),
+ Box(Box(6936, 6936), Box(6936, 6936)),
+ Box(Box(6937, 6937), Box(6937, 6937)),
+ Box(Box(6938, 6938), Box(6938, 6938)),
+ Box(Box(6939, 6939), Box(6939, 6939)),
+ Box(Box(6940, 6940), Box(6940, 6940)),
+ Box(Box(6941, 6941), Box(6941, 6941)),
+ Box(Box(6942, 6942), Box(6942, 6942)),
+ Box(Box(6943, 6943), Box(6943, 6943)),
+ Box(Box(6944, 6944), Box(6944, 6944)),
+ Box(Box(6945, 6945), Box(6945, 6945)),
+ Box(Box(6946, 6946), Box(6946, 6946)),
+ Box(Box(6947, 6947), Box(6947, 6947)),
+ Box(Box(6948, 6948), Box(6948, 6948)),
+ Box(Box(6949, 6949), Box(6949, 6949)),
+ Box(Box(6950, 6950), Box(6950, 6950)),
+ Box(Box(6951, 6951), Box(6951, 6951)),
+ Box(Box(6952, 6952), Box(6952, 6952)),
+ Box(Box(6953, 6953), Box(6953, 6953)),
+ Box(Box(6954, 6954), Box(6954, 6954)),
+ Box(Box(6955, 6955), Box(6955, 6955)),
+ Box(Box(6956, 6956), Box(6956, 6956)),
+ Box(Box(6957, 6957), Box(6957, 6957)),
+ Box(Box(6958, 6958), Box(6958, 6958)),
+ Box(Box(6959, 6959), Box(6959, 6959)),
+ Box(Box(6960, 6960), Box(6960, 6960)),
+ Box(Box(6961, 6961), Box(6961, 6961)),
+ Box(Box(6962, 6962), Box(6962, 6962)),
+ Box(Box(6963, 6963), Box(6963, 6963)),
+ Box(Box(6964, 6964), Box(6964, 6964)),
+ Box(Box(6965, 6965), Box(6965, 6965)),
+ Box(Box(6966, 6966), Box(6966, 6966)),
+ Box(Box(6967, 6967), Box(6967, 6967)),
+ Box(Box(6968, 6968), Box(6968, 6968)),
+ Box(Box(6969, 6969), Box(6969, 6969)),
+ Box(Box(6970, 6970), Box(6970, 6970)),
+ Box(Box(6971, 6971), Box(6971, 6971)),
+ Box(Box(6972, 6972), Box(6972, 6972)),
+ Box(Box(6973, 6973), Box(6973, 6973)),
+ Box(Box(6974, 6974), Box(6974, 6974)),
+ Box(Box(6975, 6975), Box(6975, 6975)),
+ Box(Box(6976, 6976), Box(6976, 6976)),
+ Box(Box(6977, 6977), Box(6977, 6977)),
+ Box(Box(6978, 6978), Box(6978, 6978)),
+ Box(Box(6979, 6979), Box(6979, 6979)),
+ Box(Box(6980, 6980), Box(6980, 6980)),
+ Box(Box(6981, 6981), Box(6981, 6981)),
+ Box(Box(6982, 6982), Box(6982, 6982)),
+ Box(Box(6983, 6983), Box(6983, 6983)),
+ Box(Box(6984, 6984), Box(6984, 6984)),
+ Box(Box(6985, 6985), Box(6985, 6985)),
+ Box(Box(6986, 6986), Box(6986, 6986)),
+ Box(Box(6987, 6987), Box(6987, 6987)),
+ Box(Box(6988, 6988), Box(6988, 6988)),
+ Box(Box(6989, 6989), Box(6989, 6989)),
+ Box(Box(6990, 6990), Box(6990, 6990)),
+ Box(Box(6991, 6991), Box(6991, 6991)),
+ Box(Box(6992, 6992), Box(6992, 6992)),
+ Box(Box(6993, 6993), Box(6993, 6993)),
+ Box(Box(6994, 6994), Box(6994, 6994)),
+ Box(Box(6995, 6995), Box(6995, 6995)),
+ Box(Box(6996, 6996), Box(6996, 6996)),
+ Box(Box(6997, 6997), Box(6997, 6997)),
+ Box(Box(6998, 6998), Box(6998, 6998)),
+ Box(Box(6999, 6999), Box(6999, 6999)),
+ Box(Box(7000, 7000), Box(7000, 7000)),
+ Box(Box(7001, 7001), Box(7001, 7001)),
+ Box(Box(7002, 7002), Box(7002, 7002)),
+ Box(Box(7003, 7003), Box(7003, 7003)),
+ Box(Box(7004, 7004), Box(7004, 7004)),
+ Box(Box(7005, 7005), Box(7005, 7005)),
+ Box(Box(7006, 7006), Box(7006, 7006)),
+ Box(Box(7007, 7007), Box(7007, 7007)),
+ Box(Box(7008, 7008), Box(7008, 7008)),
+ Box(Box(7009, 7009), Box(7009, 7009)),
+ Box(Box(7010, 7010), Box(7010, 7010)),
+ Box(Box(7011, 7011), Box(7011, 7011)),
+ Box(Box(7012, 7012), Box(7012, 7012)),
+ Box(Box(7013, 7013), Box(7013, 7013)),
+ Box(Box(7014, 7014), Box(7014, 7014)),
+ Box(Box(7015, 7015), Box(7015, 7015)),
+ Box(Box(7016, 7016), Box(7016, 7016)),
+ Box(Box(7017, 7017), Box(7017, 7017)),
+ Box(Box(7018, 7018), Box(7018, 7018)),
+ Box(Box(7019, 7019), Box(7019, 7019)),
+ Box(Box(7020, 7020), Box(7020, 7020)),
+ Box(Box(7021, 7021), Box(7021, 7021)),
+ Box(Box(7022, 7022), Box(7022, 7022)),
+ Box(Box(7023, 7023), Box(7023, 7023)),
+ Box(Box(7024, 7024), Box(7024, 7024)),
+ Box(Box(7025, 7025), Box(7025, 7025)),
+ Box(Box(7026, 7026), Box(7026, 7026)),
+ Box(Box(7027, 7027), Box(7027, 7027)),
+ Box(Box(7028, 7028), Box(7028, 7028)),
+ Box(Box(7029, 7029), Box(7029, 7029)),
+ Box(Box(7030, 7030), Box(7030, 7030)),
+ Box(Box(7031, 7031), Box(7031, 7031)),
+ Box(Box(7032, 7032), Box(7032, 7032)),
+ Box(Box(7033, 7033), Box(7033, 7033)),
+ Box(Box(7034, 7034), Box(7034, 7034)),
+ Box(Box(7035, 7035), Box(7035, 7035)),
+ Box(Box(7036, 7036), Box(7036, 7036)),
+ Box(Box(7037, 7037), Box(7037, 7037)),
+ Box(Box(7038, 7038), Box(7038, 7038)),
+ Box(Box(7039, 7039), Box(7039, 7039)),
+ Box(Box(7040, 7040), Box(7040, 7040)),
+ Box(Box(7041, 7041), Box(7041, 7041)),
+ Box(Box(7042, 7042), Box(7042, 7042)),
+ Box(Box(7043, 7043), Box(7043, 7043)),
+ Box(Box(7044, 7044), Box(7044, 7044)),
+ Box(Box(7045, 7045), Box(7045, 7045)),
+ Box(Box(7046, 7046), Box(7046, 7046)),
+ Box(Box(7047, 7047), Box(7047, 7047)),
+ Box(Box(7048, 7048), Box(7048, 7048)),
+ Box(Box(7049, 7049), Box(7049, 7049)),
+ Box(Box(7050, 7050), Box(7050, 7050)),
+ Box(Box(7051, 7051), Box(7051, 7051)),
+ Box(Box(7052, 7052), Box(7052, 7052)),
+ Box(Box(7053, 7053), Box(7053, 7053)),
+ Box(Box(7054, 7054), Box(7054, 7054)),
+ Box(Box(7055, 7055), Box(7055, 7055)),
+ Box(Box(7056, 7056), Box(7056, 7056)),
+ Box(Box(7057, 7057), Box(7057, 7057)),
+ Box(Box(7058, 7058), Box(7058, 7058)),
+ Box(Box(7059, 7059), Box(7059, 7059)),
+ Box(Box(7060, 7060), Box(7060, 7060)),
+ Box(Box(7061, 7061), Box(7061, 7061)),
+ Box(Box(7062, 7062), Box(7062, 7062)),
+ Box(Box(7063, 7063), Box(7063, 7063)),
+ Box(Box(7064, 7064), Box(7064, 7064)),
+ Box(Box(7065, 7065), Box(7065, 7065)),
+ Box(Box(7066, 7066), Box(7066, 7066)),
+ Box(Box(7067, 7067), Box(7067, 7067)),
+ Box(Box(7068, 7068), Box(7068, 7068)),
+ Box(Box(7069, 7069), Box(7069, 7069)),
+ Box(Box(7070, 7070), Box(7070, 7070)),
+ Box(Box(7071, 7071), Box(7071, 7071)),
+ Box(Box(7072, 7072), Box(7072, 7072)),
+ Box(Box(7073, 7073), Box(7073, 7073)),
+ Box(Box(7074, 7074), Box(7074, 7074)),
+ Box(Box(7075, 7075), Box(7075, 7075)),
+ Box(Box(7076, 7076), Box(7076, 7076)),
+ Box(Box(7077, 7077), Box(7077, 7077)),
+ Box(Box(7078, 7078), Box(7078, 7078)),
+ Box(Box(7079, 7079), Box(7079, 7079)),
+ Box(Box(7080, 7080), Box(7080, 7080)),
+ Box(Box(7081, 7081), Box(7081, 7081)),
+ Box(Box(7082, 7082), Box(7082, 7082)),
+ Box(Box(7083, 7083), Box(7083, 7083)),
+ Box(Box(7084, 7084), Box(7084, 7084)),
+ Box(Box(7085, 7085), Box(7085, 7085)),
+ Box(Box(7086, 7086), Box(7086, 7086)),
+ Box(Box(7087, 7087), Box(7087, 7087)),
+ Box(Box(7088, 7088), Box(7088, 7088)),
+ Box(Box(7089, 7089), Box(7089, 7089)),
+ Box(Box(7090, 7090), Box(7090, 7090)),
+ Box(Box(7091, 7091), Box(7091, 7091)),
+ Box(Box(7092, 7092), Box(7092, 7092)),
+ Box(Box(7093, 7093), Box(7093, 7093)),
+ Box(Box(7094, 7094), Box(7094, 7094)),
+ Box(Box(7095, 7095), Box(7095, 7095)),
+ Box(Box(7096, 7096), Box(7096, 7096)),
+ Box(Box(7097, 7097), Box(7097, 7097)),
+ Box(Box(7098, 7098), Box(7098, 7098)),
+ Box(Box(7099, 7099), Box(7099, 7099)),
+ Box(Box(7100, 7100), Box(7100, 7100)),
+ Box(Box(7101, 7101), Box(7101, 7101)),
+ Box(Box(7102, 7102), Box(7102, 7102)),
+ Box(Box(7103, 7103), Box(7103, 7103)),
+ Box(Box(7104, 7104), Box(7104, 7104)),
+ Box(Box(7105, 7105), Box(7105, 7105)),
+ Box(Box(7106, 7106), Box(7106, 7106)),
+ Box(Box(7107, 7107), Box(7107, 7107)),
+ Box(Box(7108, 7108), Box(7108, 7108)),
+ Box(Box(7109, 7109), Box(7109, 7109)),
+ Box(Box(7110, 7110), Box(7110, 7110)),
+ Box(Box(7111, 7111), Box(7111, 7111)),
+ Box(Box(7112, 7112), Box(7112, 7112)),
+ Box(Box(7113, 7113), Box(7113, 7113)),
+ Box(Box(7114, 7114), Box(7114, 7114)),
+ Box(Box(7115, 7115), Box(7115, 7115)),
+ Box(Box(7116, 7116), Box(7116, 7116)),
+ Box(Box(7117, 7117), Box(7117, 7117)),
+ Box(Box(7118, 7118), Box(7118, 7118)),
+ Box(Box(7119, 7119), Box(7119, 7119)),
+ Box(Box(7120, 7120), Box(7120, 7120)),
+ Box(Box(7121, 7121), Box(7121, 7121)),
+ Box(Box(7122, 7122), Box(7122, 7122)),
+ Box(Box(7123, 7123), Box(7123, 7123)),
+ Box(Box(7124, 7124), Box(7124, 7124)),
+ Box(Box(7125, 7125), Box(7125, 7125)),
+ Box(Box(7126, 7126), Box(7126, 7126)),
+ Box(Box(7127, 7127), Box(7127, 7127)),
+ Box(Box(7128, 7128), Box(7128, 7128)),
+ Box(Box(7129, 7129), Box(7129, 7129)),
+ Box(Box(7130, 7130), Box(7130, 7130)),
+ Box(Box(7131, 7131), Box(7131, 7131)),
+ Box(Box(7132, 7132), Box(7132, 7132)),
+ Box(Box(7133, 7133), Box(7133, 7133)),
+ Box(Box(7134, 7134), Box(7134, 7134)),
+ Box(Box(7135, 7135), Box(7135, 7135)),
+ Box(Box(7136, 7136), Box(7136, 7136)),
+ Box(Box(7137, 7137), Box(7137, 7137)),
+ Box(Box(7138, 7138), Box(7138, 7138)),
+ Box(Box(7139, 7139), Box(7139, 7139)),
+ Box(Box(7140, 7140), Box(7140, 7140)),
+ Box(Box(7141, 7141), Box(7141, 7141)),
+ Box(Box(7142, 7142), Box(7142, 7142)),
+ Box(Box(7143, 7143), Box(7143, 7143)),
+ Box(Box(7144, 7144), Box(7144, 7144)),
+ Box(Box(7145, 7145), Box(7145, 7145)),
+ Box(Box(7146, 7146), Box(7146, 7146)),
+ Box(Box(7147, 7147), Box(7147, 7147)),
+ Box(Box(7148, 7148), Box(7148, 7148)),
+ Box(Box(7149, 7149), Box(7149, 7149)),
+ Box(Box(7150, 7150), Box(7150, 7150)),
+ Box(Box(7151, 7151), Box(7151, 7151)),
+ Box(Box(7152, 7152), Box(7152, 7152)),
+ Box(Box(7153, 7153), Box(7153, 7153)),
+ Box(Box(7154, 7154), Box(7154, 7154)),
+ Box(Box(7155, 7155), Box(7155, 7155)),
+ Box(Box(7156, 7156), Box(7156, 7156)),
+ Box(Box(7157, 7157), Box(7157, 7157)),
+ Box(Box(7158, 7158), Box(7158, 7158)),
+ Box(Box(7159, 7159), Box(7159, 7159)),
+ Box(Box(7160, 7160), Box(7160, 7160)),
+ Box(Box(7161, 7161), Box(7161, 7161)),
+ Box(Box(7162, 7162), Box(7162, 7162)),
+ Box(Box(7163, 7163), Box(7163, 7163)),
+ Box(Box(7164, 7164), Box(7164, 7164)),
+ Box(Box(7165, 7165), Box(7165, 7165)),
+ Box(Box(7166, 7166), Box(7166, 7166)),
+ Box(Box(7167, 7167), Box(7167, 7167)),
+ Box(Box(7168, 7168), Box(7168, 7168)),
+ Box(Box(7169, 7169), Box(7169, 7169)),
+ Box(Box(7170, 7170), Box(7170, 7170)),
+ Box(Box(7171, 7171), Box(7171, 7171)),
+ Box(Box(7172, 7172), Box(7172, 7172)),
+ Box(Box(7173, 7173), Box(7173, 7173)),
+ Box(Box(7174, 7174), Box(7174, 7174)),
+ Box(Box(7175, 7175), Box(7175, 7175)),
+ Box(Box(7176, 7176), Box(7176, 7176)),
+ Box(Box(7177, 7177), Box(7177, 7177)),
+ Box(Box(7178, 7178), Box(7178, 7178)),
+ Box(Box(7179, 7179), Box(7179, 7179)),
+ Box(Box(7180, 7180), Box(7180, 7180)),
+ Box(Box(7181, 7181), Box(7181, 7181)),
+ Box(Box(7182, 7182), Box(7182, 7182)),
+ Box(Box(7183, 7183), Box(7183, 7183)),
+ Box(Box(7184, 7184), Box(7184, 7184)),
+ Box(Box(7185, 7185), Box(7185, 7185)),
+ Box(Box(7186, 7186), Box(7186, 7186)),
+ Box(Box(7187, 7187), Box(7187, 7187)),
+ Box(Box(7188, 7188), Box(7188, 7188)),
+ Box(Box(7189, 7189), Box(7189, 7189)),
+ Box(Box(7190, 7190), Box(7190, 7190)),
+ Box(Box(7191, 7191), Box(7191, 7191)),
+ Box(Box(7192, 7192), Box(7192, 7192)),
+ Box(Box(7193, 7193), Box(7193, 7193)),
+ Box(Box(7194, 7194), Box(7194, 7194)),
+ Box(Box(7195, 7195), Box(7195, 7195)),
+ Box(Box(7196, 7196), Box(7196, 7196)),
+ Box(Box(7197, 7197), Box(7197, 7197)),
+ Box(Box(7198, 7198), Box(7198, 7198)),
+ Box(Box(7199, 7199), Box(7199, 7199)),
+ Box(Box(7200, 7200), Box(7200, 7200)),
+ Box(Box(7201, 7201), Box(7201, 7201)),
+ Box(Box(7202, 7202), Box(7202, 7202)),
+ Box(Box(7203, 7203), Box(7203, 7203)),
+ Box(Box(7204, 7204), Box(7204, 7204)),
+ Box(Box(7205, 7205), Box(7205, 7205)),
+ Box(Box(7206, 7206), Box(7206, 7206)),
+ Box(Box(7207, 7207), Box(7207, 7207)),
+ Box(Box(7208, 7208), Box(7208, 7208)),
+ Box(Box(7209, 7209), Box(7209, 7209)),
+ Box(Box(7210, 7210), Box(7210, 7210)),
+ Box(Box(7211, 7211), Box(7211, 7211)),
+ Box(Box(7212, 7212), Box(7212, 7212)),
+ Box(Box(7213, 7213), Box(7213, 7213)),
+ Box(Box(7214, 7214), Box(7214, 7214)),
+ Box(Box(7215, 7215), Box(7215, 7215)),
+ Box(Box(7216, 7216), Box(7216, 7216)),
+ Box(Box(7217, 7217), Box(7217, 7217)),
+ Box(Box(7218, 7218), Box(7218, 7218)),
+ Box(Box(7219, 7219), Box(7219, 7219)),
+ Box(Box(7220, 7220), Box(7220, 7220)),
+ Box(Box(7221, 7221), Box(7221, 7221)),
+ Box(Box(7222, 7222), Box(7222, 7222)),
+ Box(Box(7223, 7223), Box(7223, 7223)),
+ Box(Box(7224, 7224), Box(7224, 7224)),
+ Box(Box(7225, 7225), Box(7225, 7225)),
+ Box(Box(7226, 7226), Box(7226, 7226)),
+ Box(Box(7227, 7227), Box(7227, 7227)),
+ Box(Box(7228, 7228), Box(7228, 7228)),
+ Box(Box(7229, 7229), Box(7229, 7229)),
+ Box(Box(7230, 7230), Box(7230, 7230)),
+ Box(Box(7231, 7231), Box(7231, 7231)),
+ Box(Box(7232, 7232), Box(7232, 7232)),
+ Box(Box(7233, 7233), Box(7233, 7233)),
+ Box(Box(7234, 7234), Box(7234, 7234)),
+ Box(Box(7235, 7235), Box(7235, 7235)),
+ Box(Box(7236, 7236), Box(7236, 7236)),
+ Box(Box(7237, 7237), Box(7237, 7237)),
+ Box(Box(7238, 7238), Box(7238, 7238)),
+ Box(Box(7239, 7239), Box(7239, 7239)),
+ Box(Box(7240, 7240), Box(7240, 7240)),
+ Box(Box(7241, 7241), Box(7241, 7241)),
+ Box(Box(7242, 7242), Box(7242, 7242)),
+ Box(Box(7243, 7243), Box(7243, 7243)),
+ Box(Box(7244, 7244), Box(7244, 7244)),
+ Box(Box(7245, 7245), Box(7245, 7245)),
+ Box(Box(7246, 7246), Box(7246, 7246)),
+ Box(Box(7247, 7247), Box(7247, 7247)),
+ Box(Box(7248, 7248), Box(7248, 7248)),
+ Box(Box(7249, 7249), Box(7249, 7249)),
+ Box(Box(7250, 7250), Box(7250, 7250)),
+ Box(Box(7251, 7251), Box(7251, 7251)),
+ Box(Box(7252, 7252), Box(7252, 7252)),
+ Box(Box(7253, 7253), Box(7253, 7253)),
+ Box(Box(7254, 7254), Box(7254, 7254)),
+ Box(Box(7255, 7255), Box(7255, 7255)),
+ Box(Box(7256, 7256), Box(7256, 7256)),
+ Box(Box(7257, 7257), Box(7257, 7257)),
+ Box(Box(7258, 7258), Box(7258, 7258)),
+ Box(Box(7259, 7259), Box(7259, 7259)),
+ Box(Box(7260, 7260), Box(7260, 7260)),
+ Box(Box(7261, 7261), Box(7261, 7261)),
+ Box(Box(7262, 7262), Box(7262, 7262)),
+ Box(Box(7263, 7263), Box(7263, 7263)),
+ Box(Box(7264, 7264), Box(7264, 7264)),
+ Box(Box(7265, 7265), Box(7265, 7265)),
+ Box(Box(7266, 7266), Box(7266, 7266)),
+ Box(Box(7267, 7267), Box(7267, 7267)),
+ Box(Box(7268, 7268), Box(7268, 7268)),
+ Box(Box(7269, 7269), Box(7269, 7269)),
+ Box(Box(7270, 7270), Box(7270, 7270)),
+ Box(Box(7271, 7271), Box(7271, 7271)),
+ Box(Box(7272, 7272), Box(7272, 7272)),
+ Box(Box(7273, 7273), Box(7273, 7273)),
+ Box(Box(7274, 7274), Box(7274, 7274)),
+ Box(Box(7275, 7275), Box(7275, 7275)),
+ Box(Box(7276, 7276), Box(7276, 7276)),
+ Box(Box(7277, 7277), Box(7277, 7277)),
+ Box(Box(7278, 7278), Box(7278, 7278)),
+ Box(Box(7279, 7279), Box(7279, 7279)),
+ Box(Box(7280, 7280), Box(7280, 7280)),
+ Box(Box(7281, 7281), Box(7281, 7281)),
+ Box(Box(7282, 7282), Box(7282, 7282)),
+ Box(Box(7283, 7283), Box(7283, 7283)),
+ Box(Box(7284, 7284), Box(7284, 7284)),
+ Box(Box(7285, 7285), Box(7285, 7285)),
+ Box(Box(7286, 7286), Box(7286, 7286)),
+ Box(Box(7287, 7287), Box(7287, 7287)),
+ Box(Box(7288, 7288), Box(7288, 7288)),
+ Box(Box(7289, 7289), Box(7289, 7289)),
+ Box(Box(7290, 7290), Box(7290, 7290)),
+ Box(Box(7291, 7291), Box(7291, 7291)),
+ Box(Box(7292, 7292), Box(7292, 7292)),
+ Box(Box(7293, 7293), Box(7293, 7293)),
+ Box(Box(7294, 7294), Box(7294, 7294)),
+ Box(Box(7295, 7295), Box(7295, 7295)),
+ Box(Box(7296, 7296), Box(7296, 7296)),
+ Box(Box(7297, 7297), Box(7297, 7297)),
+ Box(Box(7298, 7298), Box(7298, 7298)),
+ Box(Box(7299, 7299), Box(7299, 7299)),
+ Box(Box(7300, 7300), Box(7300, 7300)),
+ Box(Box(7301, 7301), Box(7301, 7301)),
+ Box(Box(7302, 7302), Box(7302, 7302)),
+ Box(Box(7303, 7303), Box(7303, 7303)),
+ Box(Box(7304, 7304), Box(7304, 7304)),
+ Box(Box(7305, 7305), Box(7305, 7305)),
+ Box(Box(7306, 7306), Box(7306, 7306)),
+ Box(Box(7307, 7307), Box(7307, 7307)),
+ Box(Box(7308, 7308), Box(7308, 7308)),
+ Box(Box(7309, 7309), Box(7309, 7309)),
+ Box(Box(7310, 7310), Box(7310, 7310)),
+ Box(Box(7311, 7311), Box(7311, 7311)),
+ Box(Box(7312, 7312), Box(7312, 7312)),
+ Box(Box(7313, 7313), Box(7313, 7313)),
+ Box(Box(7314, 7314), Box(7314, 7314)),
+ Box(Box(7315, 7315), Box(7315, 7315)),
+ Box(Box(7316, 7316), Box(7316, 7316)),
+ Box(Box(7317, 7317), Box(7317, 7317)),
+ Box(Box(7318, 7318), Box(7318, 7318)),
+ Box(Box(7319, 7319), Box(7319, 7319)),
+ Box(Box(7320, 7320), Box(7320, 7320)),
+ Box(Box(7321, 7321), Box(7321, 7321)),
+ Box(Box(7322, 7322), Box(7322, 7322)),
+ Box(Box(7323, 7323), Box(7323, 7323)),
+ Box(Box(7324, 7324), Box(7324, 7324)),
+ Box(Box(7325, 7325), Box(7325, 7325)),
+ Box(Box(7326, 7326), Box(7326, 7326)),
+ Box(Box(7327, 7327), Box(7327, 7327)),
+ Box(Box(7328, 7328), Box(7328, 7328)),
+ Box(Box(7329, 7329), Box(7329, 7329)),
+ Box(Box(7330, 7330), Box(7330, 7330)),
+ Box(Box(7331, 7331), Box(7331, 7331)),
+ Box(Box(7332, 7332), Box(7332, 7332)),
+ Box(Box(7333, 7333), Box(7333, 7333)),
+ Box(Box(7334, 7334), Box(7334, 7334)),
+ Box(Box(7335, 7335), Box(7335, 7335)),
+ Box(Box(7336, 7336), Box(7336, 7336)),
+ Box(Box(7337, 7337), Box(7337, 7337)),
+ Box(Box(7338, 7338), Box(7338, 7338)),
+ Box(Box(7339, 7339), Box(7339, 7339)),
+ Box(Box(7340, 7340), Box(7340, 7340)),
+ Box(Box(7341, 7341), Box(7341, 7341)),
+ Box(Box(7342, 7342), Box(7342, 7342)),
+ Box(Box(7343, 7343), Box(7343, 7343)),
+ Box(Box(7344, 7344), Box(7344, 7344)),
+ Box(Box(7345, 7345), Box(7345, 7345)),
+ Box(Box(7346, 7346), Box(7346, 7346)),
+ Box(Box(7347, 7347), Box(7347, 7347)),
+ Box(Box(7348, 7348), Box(7348, 7348)),
+ Box(Box(7349, 7349), Box(7349, 7349)),
+ Box(Box(7350, 7350), Box(7350, 7350)),
+ Box(Box(7351, 7351), Box(7351, 7351)),
+ Box(Box(7352, 7352), Box(7352, 7352)),
+ Box(Box(7353, 7353), Box(7353, 7353)),
+ Box(Box(7354, 7354), Box(7354, 7354)),
+ Box(Box(7355, 7355), Box(7355, 7355)),
+ Box(Box(7356, 7356), Box(7356, 7356)),
+ Box(Box(7357, 7357), Box(7357, 7357)),
+ Box(Box(7358, 7358), Box(7358, 7358)),
+ Box(Box(7359, 7359), Box(7359, 7359)),
+ Box(Box(7360, 7360), Box(7360, 7360)),
+ Box(Box(7361, 7361), Box(7361, 7361)),
+ Box(Box(7362, 7362), Box(7362, 7362)),
+ Box(Box(7363, 7363), Box(7363, 7363)),
+ Box(Box(7364, 7364), Box(7364, 7364)),
+ Box(Box(7365, 7365), Box(7365, 7365)),
+ Box(Box(7366, 7366), Box(7366, 7366)),
+ Box(Box(7367, 7367), Box(7367, 7367)),
+ Box(Box(7368, 7368), Box(7368, 7368)),
+ Box(Box(7369, 7369), Box(7369, 7369)),
+ Box(Box(7370, 7370), Box(7370, 7370)),
+ Box(Box(7371, 7371), Box(7371, 7371)),
+ Box(Box(7372, 7372), Box(7372, 7372)),
+ Box(Box(7373, 7373), Box(7373, 7373)),
+ Box(Box(7374, 7374), Box(7374, 7374)),
+ Box(Box(7375, 7375), Box(7375, 7375)),
+ Box(Box(7376, 7376), Box(7376, 7376)),
+ Box(Box(7377, 7377), Box(7377, 7377)),
+ Box(Box(7378, 7378), Box(7378, 7378)),
+ Box(Box(7379, 7379), Box(7379, 7379)),
+ Box(Box(7380, 7380), Box(7380, 7380)),
+ Box(Box(7381, 7381), Box(7381, 7381)),
+ Box(Box(7382, 7382), Box(7382, 7382)),
+ Box(Box(7383, 7383), Box(7383, 7383)),
+ Box(Box(7384, 7384), Box(7384, 7384)),
+ Box(Box(7385, 7385), Box(7385, 7385)),
+ Box(Box(7386, 7386), Box(7386, 7386)),
+ Box(Box(7387, 7387), Box(7387, 7387)),
+ Box(Box(7388, 7388), Box(7388, 7388)),
+ Box(Box(7389, 7389), Box(7389, 7389)),
+ Box(Box(7390, 7390), Box(7390, 7390)),
+ Box(Box(7391, 7391), Box(7391, 7391)),
+ Box(Box(7392, 7392), Box(7392, 7392)),
+ Box(Box(7393, 7393), Box(7393, 7393)),
+ Box(Box(7394, 7394), Box(7394, 7394)),
+ Box(Box(7395, 7395), Box(7395, 7395)),
+ Box(Box(7396, 7396), Box(7396, 7396)),
+ Box(Box(7397, 7397), Box(7397, 7397)),
+ Box(Box(7398, 7398), Box(7398, 7398)),
+ Box(Box(7399, 7399), Box(7399, 7399)),
+ Box(Box(7400, 7400), Box(7400, 7400)),
+ Box(Box(7401, 7401), Box(7401, 7401)),
+ Box(Box(7402, 7402), Box(7402, 7402)),
+ Box(Box(7403, 7403), Box(7403, 7403)),
+ Box(Box(7404, 7404), Box(7404, 7404)),
+ Box(Box(7405, 7405), Box(7405, 7405)),
+ Box(Box(7406, 7406), Box(7406, 7406)),
+ Box(Box(7407, 7407), Box(7407, 7407)),
+ Box(Box(7408, 7408), Box(7408, 7408)),
+ Box(Box(7409, 7409), Box(7409, 7409)),
+ Box(Box(7410, 7410), Box(7410, 7410)),
+ Box(Box(7411, 7411), Box(7411, 7411)),
+ Box(Box(7412, 7412), Box(7412, 7412)),
+ Box(Box(7413, 7413), Box(7413, 7413)),
+ Box(Box(7414, 7414), Box(7414, 7414)),
+ Box(Box(7415, 7415), Box(7415, 7415)),
+ Box(Box(7416, 7416), Box(7416, 7416)),
+ Box(Box(7417, 7417), Box(7417, 7417)),
+ Box(Box(7418, 7418), Box(7418, 7418)),
+ Box(Box(7419, 7419), Box(7419, 7419)),
+ Box(Box(7420, 7420), Box(7420, 7420)),
+ Box(Box(7421, 7421), Box(7421, 7421)),
+ Box(Box(7422, 7422), Box(7422, 7422)),
+ Box(Box(7423, 7423), Box(7423, 7423)),
+ Box(Box(7424, 7424), Box(7424, 7424)),
+ Box(Box(7425, 7425), Box(7425, 7425)),
+ Box(Box(7426, 7426), Box(7426, 7426)),
+ Box(Box(7427, 7427), Box(7427, 7427)),
+ Box(Box(7428, 7428), Box(7428, 7428)),
+ Box(Box(7429, 7429), Box(7429, 7429)),
+ Box(Box(7430, 7430), Box(7430, 7430)),
+ Box(Box(7431, 7431), Box(7431, 7431)),
+ Box(Box(7432, 7432), Box(7432, 7432)),
+ Box(Box(7433, 7433), Box(7433, 7433)),
+ Box(Box(7434, 7434), Box(7434, 7434)),
+ Box(Box(7435, 7435), Box(7435, 7435)),
+ Box(Box(7436, 7436), Box(7436, 7436)),
+ Box(Box(7437, 7437), Box(7437, 7437)),
+ Box(Box(7438, 7438), Box(7438, 7438)),
+ Box(Box(7439, 7439), Box(7439, 7439)),
+ Box(Box(7440, 7440), Box(7440, 7440)),
+ Box(Box(7441, 7441), Box(7441, 7441)),
+ Box(Box(7442, 7442), Box(7442, 7442)),
+ Box(Box(7443, 7443), Box(7443, 7443)),
+ Box(Box(7444, 7444), Box(7444, 7444)),
+ Box(Box(7445, 7445), Box(7445, 7445)),
+ Box(Box(7446, 7446), Box(7446, 7446)),
+ Box(Box(7447, 7447), Box(7447, 7447)),
+ Box(Box(7448, 7448), Box(7448, 7448)),
+ Box(Box(7449, 7449), Box(7449, 7449)),
+ Box(Box(7450, 7450), Box(7450, 7450)),
+ Box(Box(7451, 7451), Box(7451, 7451)),
+ Box(Box(7452, 7452), Box(7452, 7452)),
+ Box(Box(7453, 7453), Box(7453, 7453)),
+ Box(Box(7454, 7454), Box(7454, 7454)),
+ Box(Box(7455, 7455), Box(7455, 7455)),
+ Box(Box(7456, 7456), Box(7456, 7456)),
+ Box(Box(7457, 7457), Box(7457, 7457)),
+ Box(Box(7458, 7458), Box(7458, 7458)),
+ Box(Box(7459, 7459), Box(7459, 7459)),
+ Box(Box(7460, 7460), Box(7460, 7460)),
+ Box(Box(7461, 7461), Box(7461, 7461)),
+ Box(Box(7462, 7462), Box(7462, 7462)),
+ Box(Box(7463, 7463), Box(7463, 7463)),
+ Box(Box(7464, 7464), Box(7464, 7464)),
+ Box(Box(7465, 7465), Box(7465, 7465)),
+ Box(Box(7466, 7466), Box(7466, 7466)),
+ Box(Box(7467, 7467), Box(7467, 7467)),
+ Box(Box(7468, 7468), Box(7468, 7468)),
+ Box(Box(7469, 7469), Box(7469, 7469)),
+ Box(Box(7470, 7470), Box(7470, 7470)),
+ Box(Box(7471, 7471), Box(7471, 7471)),
+ Box(Box(7472, 7472), Box(7472, 7472)),
+ Box(Box(7473, 7473), Box(7473, 7473)),
+ Box(Box(7474, 7474), Box(7474, 7474)),
+ Box(Box(7475, 7475), Box(7475, 7475)),
+ Box(Box(7476, 7476), Box(7476, 7476)),
+ Box(Box(7477, 7477), Box(7477, 7477)),
+ Box(Box(7478, 7478), Box(7478, 7478)),
+ Box(Box(7479, 7479), Box(7479, 7479)),
+ Box(Box(7480, 7480), Box(7480, 7480)),
+ Box(Box(7481, 7481), Box(7481, 7481)),
+ Box(Box(7482, 7482), Box(7482, 7482)),
+ Box(Box(7483, 7483), Box(7483, 7483)),
+ Box(Box(7484, 7484), Box(7484, 7484)),
+ Box(Box(7485, 7485), Box(7485, 7485)),
+ Box(Box(7486, 7486), Box(7486, 7486)),
+ Box(Box(7487, 7487), Box(7487, 7487)),
+ Box(Box(7488, 7488), Box(7488, 7488)),
+ Box(Box(7489, 7489), Box(7489, 7489)),
+ Box(Box(7490, 7490), Box(7490, 7490)),
+ Box(Box(7491, 7491), Box(7491, 7491)),
+ Box(Box(7492, 7492), Box(7492, 7492)),
+ Box(Box(7493, 7493), Box(7493, 7493)),
+ Box(Box(7494, 7494), Box(7494, 7494)),
+ Box(Box(7495, 7495), Box(7495, 7495)),
+ Box(Box(7496, 7496), Box(7496, 7496)),
+ Box(Box(7497, 7497), Box(7497, 7497)),
+ Box(Box(7498, 7498), Box(7498, 7498)),
+ Box(Box(7499, 7499), Box(7499, 7499)),
+ Box(Box(7500, 7500), Box(7500, 7500)),
+ Box(Box(7501, 7501), Box(7501, 7501)),
+ Box(Box(7502, 7502), Box(7502, 7502)),
+ Box(Box(7503, 7503), Box(7503, 7503)),
+ Box(Box(7504, 7504), Box(7504, 7504)),
+ Box(Box(7505, 7505), Box(7505, 7505)),
+ Box(Box(7506, 7506), Box(7506, 7506)),
+ Box(Box(7507, 7507), Box(7507, 7507)),
+ Box(Box(7508, 7508), Box(7508, 7508)),
+ Box(Box(7509, 7509), Box(7509, 7509)),
+ Box(Box(7510, 7510), Box(7510, 7510)),
+ Box(Box(7511, 7511), Box(7511, 7511)),
+ Box(Box(7512, 7512), Box(7512, 7512)),
+ Box(Box(7513, 7513), Box(7513, 7513)),
+ Box(Box(7514, 7514), Box(7514, 7514)),
+ Box(Box(7515, 7515), Box(7515, 7515)),
+ Box(Box(7516, 7516), Box(7516, 7516)),
+ Box(Box(7517, 7517), Box(7517, 7517)),
+ Box(Box(7518, 7518), Box(7518, 7518)),
+ Box(Box(7519, 7519), Box(7519, 7519)),
+ Box(Box(7520, 7520), Box(7520, 7520)),
+ Box(Box(7521, 7521), Box(7521, 7521)),
+ Box(Box(7522, 7522), Box(7522, 7522)),
+ Box(Box(7523, 7523), Box(7523, 7523)),
+ Box(Box(7524, 7524), Box(7524, 7524)),
+ Box(Box(7525, 7525), Box(7525, 7525)),
+ Box(Box(7526, 7526), Box(7526, 7526)),
+ Box(Box(7527, 7527), Box(7527, 7527)),
+ Box(Box(7528, 7528), Box(7528, 7528)),
+ Box(Box(7529, 7529), Box(7529, 7529)),
+ Box(Box(7530, 7530), Box(7530, 7530)),
+ Box(Box(7531, 7531), Box(7531, 7531)),
+ Box(Box(7532, 7532), Box(7532, 7532)),
+ Box(Box(7533, 7533), Box(7533, 7533)),
+ Box(Box(7534, 7534), Box(7534, 7534)),
+ Box(Box(7535, 7535), Box(7535, 7535)),
+ Box(Box(7536, 7536), Box(7536, 7536)),
+ Box(Box(7537, 7537), Box(7537, 7537)),
+ Box(Box(7538, 7538), Box(7538, 7538)),
+ Box(Box(7539, 7539), Box(7539, 7539)),
+ Box(Box(7540, 7540), Box(7540, 7540)),
+ Box(Box(7541, 7541), Box(7541, 7541)),
+ Box(Box(7542, 7542), Box(7542, 7542)),
+ Box(Box(7543, 7543), Box(7543, 7543)),
+ Box(Box(7544, 7544), Box(7544, 7544)),
+ Box(Box(7545, 7545), Box(7545, 7545)),
+ Box(Box(7546, 7546), Box(7546, 7546)),
+ Box(Box(7547, 7547), Box(7547, 7547)),
+ Box(Box(7548, 7548), Box(7548, 7548)),
+ Box(Box(7549, 7549), Box(7549, 7549)),
+ Box(Box(7550, 7550), Box(7550, 7550)),
+ Box(Box(7551, 7551), Box(7551, 7551)),
+ Box(Box(7552, 7552), Box(7552, 7552)),
+ Box(Box(7553, 7553), Box(7553, 7553)),
+ Box(Box(7554, 7554), Box(7554, 7554)),
+ Box(Box(7555, 7555), Box(7555, 7555)),
+ Box(Box(7556, 7556), Box(7556, 7556)),
+ Box(Box(7557, 7557), Box(7557, 7557)),
+ Box(Box(7558, 7558), Box(7558, 7558)),
+ Box(Box(7559, 7559), Box(7559, 7559)),
+ Box(Box(7560, 7560), Box(7560, 7560)),
+ Box(Box(7561, 7561), Box(7561, 7561)),
+ Box(Box(7562, 7562), Box(7562, 7562)),
+ Box(Box(7563, 7563), Box(7563, 7563)),
+ Box(Box(7564, 7564), Box(7564, 7564)),
+ Box(Box(7565, 7565), Box(7565, 7565)),
+ Box(Box(7566, 7566), Box(7566, 7566)),
+ Box(Box(7567, 7567), Box(7567, 7567)),
+ Box(Box(7568, 7568), Box(7568, 7568)),
+ Box(Box(7569, 7569), Box(7569, 7569)),
+ Box(Box(7570, 7570), Box(7570, 7570)),
+ Box(Box(7571, 7571), Box(7571, 7571)),
+ Box(Box(7572, 7572), Box(7572, 7572)),
+ Box(Box(7573, 7573), Box(7573, 7573)),
+ Box(Box(7574, 7574), Box(7574, 7574)),
+ Box(Box(7575, 7575), Box(7575, 7575)),
+ Box(Box(7576, 7576), Box(7576, 7576)),
+ Box(Box(7577, 7577), Box(7577, 7577)),
+ Box(Box(7578, 7578), Box(7578, 7578)),
+ Box(Box(7579, 7579), Box(7579, 7579)),
+ Box(Box(7580, 7580), Box(7580, 7580)),
+ Box(Box(7581, 7581), Box(7581, 7581)),
+ Box(Box(7582, 7582), Box(7582, 7582)),
+ Box(Box(7583, 7583), Box(7583, 7583)),
+ Box(Box(7584, 7584), Box(7584, 7584)),
+ Box(Box(7585, 7585), Box(7585, 7585)),
+ Box(Box(7586, 7586), Box(7586, 7586)),
+ Box(Box(7587, 7587), Box(7587, 7587)),
+ Box(Box(7588, 7588), Box(7588, 7588)),
+ Box(Box(7589, 7589), Box(7589, 7589)),
+ Box(Box(7590, 7590), Box(7590, 7590)),
+ Box(Box(7591, 7591), Box(7591, 7591)),
+ Box(Box(7592, 7592), Box(7592, 7592)),
+ Box(Box(7593, 7593), Box(7593, 7593)),
+ Box(Box(7594, 7594), Box(7594, 7594)),
+ Box(Box(7595, 7595), Box(7595, 7595)),
+ Box(Box(7596, 7596), Box(7596, 7596)),
+ Box(Box(7597, 7597), Box(7597, 7597)),
+ Box(Box(7598, 7598), Box(7598, 7598)),
+ Box(Box(7599, 7599), Box(7599, 7599)),
+ Box(Box(7600, 7600), Box(7600, 7600)),
+ Box(Box(7601, 7601), Box(7601, 7601)),
+ Box(Box(7602, 7602), Box(7602, 7602)),
+ Box(Box(7603, 7603), Box(7603, 7603)),
+ Box(Box(7604, 7604), Box(7604, 7604)),
+ Box(Box(7605, 7605), Box(7605, 7605)),
+ Box(Box(7606, 7606), Box(7606, 7606)),
+ Box(Box(7607, 7607), Box(7607, 7607)),
+ Box(Box(7608, 7608), Box(7608, 7608)),
+ Box(Box(7609, 7609), Box(7609, 7609)),
+ Box(Box(7610, 7610), Box(7610, 7610)),
+ Box(Box(7611, 7611), Box(7611, 7611)),
+ Box(Box(7612, 7612), Box(7612, 7612)),
+ Box(Box(7613, 7613), Box(7613, 7613)),
+ Box(Box(7614, 7614), Box(7614, 7614)),
+ Box(Box(7615, 7615), Box(7615, 7615)),
+ Box(Box(7616, 7616), Box(7616, 7616)),
+ Box(Box(7617, 7617), Box(7617, 7617)),
+ Box(Box(7618, 7618), Box(7618, 7618)),
+ Box(Box(7619, 7619), Box(7619, 7619)),
+ Box(Box(7620, 7620), Box(7620, 7620)),
+ Box(Box(7621, 7621), Box(7621, 7621)),
+ Box(Box(7622, 7622), Box(7622, 7622)),
+ Box(Box(7623, 7623), Box(7623, 7623)),
+ Box(Box(7624, 7624), Box(7624, 7624)),
+ Box(Box(7625, 7625), Box(7625, 7625)),
+ Box(Box(7626, 7626), Box(7626, 7626)),
+ Box(Box(7627, 7627), Box(7627, 7627)),
+ Box(Box(7628, 7628), Box(7628, 7628)),
+ Box(Box(7629, 7629), Box(7629, 7629)),
+ Box(Box(7630, 7630), Box(7630, 7630)),
+ Box(Box(7631, 7631), Box(7631, 7631)),
+ Box(Box(7632, 7632), Box(7632, 7632)),
+ Box(Box(7633, 7633), Box(7633, 7633)),
+ Box(Box(7634, 7634), Box(7634, 7634)),
+ Box(Box(7635, 7635), Box(7635, 7635)),
+ Box(Box(7636, 7636), Box(7636, 7636)),
+ Box(Box(7637, 7637), Box(7637, 7637)),
+ Box(Box(7638, 7638), Box(7638, 7638)),
+ Box(Box(7639, 7639), Box(7639, 7639)),
+ Box(Box(7640, 7640), Box(7640, 7640)),
+ Box(Box(7641, 7641), Box(7641, 7641)),
+ Box(Box(7642, 7642), Box(7642, 7642)),
+ Box(Box(7643, 7643), Box(7643, 7643)),
+ Box(Box(7644, 7644), Box(7644, 7644)),
+ Box(Box(7645, 7645), Box(7645, 7645)),
+ Box(Box(7646, 7646), Box(7646, 7646)),
+ Box(Box(7647, 7647), Box(7647, 7647)),
+ Box(Box(7648, 7648), Box(7648, 7648)),
+ Box(Box(7649, 7649), Box(7649, 7649)),
+ Box(Box(7650, 7650), Box(7650, 7650)),
+ Box(Box(7651, 7651), Box(7651, 7651)),
+ Box(Box(7652, 7652), Box(7652, 7652)),
+ Box(Box(7653, 7653), Box(7653, 7653)),
+ Box(Box(7654, 7654), Box(7654, 7654)),
+ Box(Box(7655, 7655), Box(7655, 7655)),
+ Box(Box(7656, 7656), Box(7656, 7656)),
+ Box(Box(7657, 7657), Box(7657, 7657)),
+ Box(Box(7658, 7658), Box(7658, 7658)),
+ Box(Box(7659, 7659), Box(7659, 7659)),
+ Box(Box(7660, 7660), Box(7660, 7660)),
+ Box(Box(7661, 7661), Box(7661, 7661)),
+ Box(Box(7662, 7662), Box(7662, 7662)),
+ Box(Box(7663, 7663), Box(7663, 7663)),
+ Box(Box(7664, 7664), Box(7664, 7664)),
+ Box(Box(7665, 7665), Box(7665, 7665)),
+ Box(Box(7666, 7666), Box(7666, 7666)),
+ Box(Box(7667, 7667), Box(7667, 7667)),
+ Box(Box(7668, 7668), Box(7668, 7668)),
+ Box(Box(7669, 7669), Box(7669, 7669)),
+ Box(Box(7670, 7670), Box(7670, 7670)),
+ Box(Box(7671, 7671), Box(7671, 7671)),
+ Box(Box(7672, 7672), Box(7672, 7672)),
+ Box(Box(7673, 7673), Box(7673, 7673)),
+ Box(Box(7674, 7674), Box(7674, 7674)),
+ Box(Box(7675, 7675), Box(7675, 7675)),
+ Box(Box(7676, 7676), Box(7676, 7676)),
+ Box(Box(7677, 7677), Box(7677, 7677)),
+ Box(Box(7678, 7678), Box(7678, 7678)),
+ Box(Box(7679, 7679), Box(7679, 7679)),
+ Box(Box(7680, 7680), Box(7680, 7680)),
+ Box(Box(7681, 7681), Box(7681, 7681)),
+ Box(Box(7682, 7682), Box(7682, 7682)),
+ Box(Box(7683, 7683), Box(7683, 7683)),
+ Box(Box(7684, 7684), Box(7684, 7684)),
+ Box(Box(7685, 7685), Box(7685, 7685)),
+ Box(Box(7686, 7686), Box(7686, 7686)),
+ Box(Box(7687, 7687), Box(7687, 7687)),
+ Box(Box(7688, 7688), Box(7688, 7688)),
+ Box(Box(7689, 7689), Box(7689, 7689)),
+ Box(Box(7690, 7690), Box(7690, 7690)),
+ Box(Box(7691, 7691), Box(7691, 7691)),
+ Box(Box(7692, 7692), Box(7692, 7692)),
+ Box(Box(7693, 7693), Box(7693, 7693)),
+ Box(Box(7694, 7694), Box(7694, 7694)),
+ Box(Box(7695, 7695), Box(7695, 7695)),
+ Box(Box(7696, 7696), Box(7696, 7696)),
+ Box(Box(7697, 7697), Box(7697, 7697)),
+ Box(Box(7698, 7698), Box(7698, 7698)),
+ Box(Box(7699, 7699), Box(7699, 7699)),
+ Box(Box(7700, 7700), Box(7700, 7700)),
+ Box(Box(7701, 7701), Box(7701, 7701)),
+ Box(Box(7702, 7702), Box(7702, 7702)),
+ Box(Box(7703, 7703), Box(7703, 7703)),
+ Box(Box(7704, 7704), Box(7704, 7704)),
+ Box(Box(7705, 7705), Box(7705, 7705)),
+ Box(Box(7706, 7706), Box(7706, 7706)),
+ Box(Box(7707, 7707), Box(7707, 7707)),
+ Box(Box(7708, 7708), Box(7708, 7708)),
+ Box(Box(7709, 7709), Box(7709, 7709)),
+ Box(Box(7710, 7710), Box(7710, 7710)),
+ Box(Box(7711, 7711), Box(7711, 7711)),
+ Box(Box(7712, 7712), Box(7712, 7712)),
+ Box(Box(7713, 7713), Box(7713, 7713)),
+ Box(Box(7714, 7714), Box(7714, 7714)),
+ Box(Box(7715, 7715), Box(7715, 7715)),
+ Box(Box(7716, 7716), Box(7716, 7716)),
+ Box(Box(7717, 7717), Box(7717, 7717)),
+ Box(Box(7718, 7718), Box(7718, 7718)),
+ Box(Box(7719, 7719), Box(7719, 7719)),
+ Box(Box(7720, 7720), Box(7720, 7720)),
+ Box(Box(7721, 7721), Box(7721, 7721)),
+ Box(Box(7722, 7722), Box(7722, 7722)),
+ Box(Box(7723, 7723), Box(7723, 7723)),
+ Box(Box(7724, 7724), Box(7724, 7724)),
+ Box(Box(7725, 7725), Box(7725, 7725)),
+ Box(Box(7726, 7726), Box(7726, 7726)),
+ Box(Box(7727, 7727), Box(7727, 7727)),
+ Box(Box(7728, 7728), Box(7728, 7728)),
+ Box(Box(7729, 7729), Box(7729, 7729)),
+ Box(Box(7730, 7730), Box(7730, 7730)),
+ Box(Box(7731, 7731), Box(7731, 7731)),
+ Box(Box(7732, 7732), Box(7732, 7732)),
+ Box(Box(7733, 7733), Box(7733, 7733)),
+ Box(Box(7734, 7734), Box(7734, 7734)),
+ Box(Box(7735, 7735), Box(7735, 7735)),
+ Box(Box(7736, 7736), Box(7736, 7736)),
+ Box(Box(7737, 7737), Box(7737, 7737)),
+ Box(Box(7738, 7738), Box(7738, 7738)),
+ Box(Box(7739, 7739), Box(7739, 7739)),
+ Box(Box(7740, 7740), Box(7740, 7740)),
+ Box(Box(7741, 7741), Box(7741, 7741)),
+ Box(Box(7742, 7742), Box(7742, 7742)),
+ Box(Box(7743, 7743), Box(7743, 7743)),
+ Box(Box(7744, 7744), Box(7744, 7744)),
+ Box(Box(7745, 7745), Box(7745, 7745)),
+ Box(Box(7746, 7746), Box(7746, 7746)),
+ Box(Box(7747, 7747), Box(7747, 7747)),
+ Box(Box(7748, 7748), Box(7748, 7748)),
+ Box(Box(7749, 7749), Box(7749, 7749)),
+ Box(Box(7750, 7750), Box(7750, 7750)),
+ Box(Box(7751, 7751), Box(7751, 7751)),
+ Box(Box(7752, 7752), Box(7752, 7752)),
+ Box(Box(7753, 7753), Box(7753, 7753)),
+ Box(Box(7754, 7754), Box(7754, 7754)),
+ Box(Box(7755, 7755), Box(7755, 7755)),
+ Box(Box(7756, 7756), Box(7756, 7756)),
+ Box(Box(7757, 7757), Box(7757, 7757)),
+ Box(Box(7758, 7758), Box(7758, 7758)),
+ Box(Box(7759, 7759), Box(7759, 7759)),
+ Box(Box(7760, 7760), Box(7760, 7760)),
+ Box(Box(7761, 7761), Box(7761, 7761)),
+ Box(Box(7762, 7762), Box(7762, 7762)),
+ Box(Box(7763, 7763), Box(7763, 7763)),
+ Box(Box(7764, 7764), Box(7764, 7764)),
+ Box(Box(7765, 7765), Box(7765, 7765)),
+ Box(Box(7766, 7766), Box(7766, 7766)),
+ Box(Box(7767, 7767), Box(7767, 7767)),
+ Box(Box(7768, 7768), Box(7768, 7768)),
+ Box(Box(7769, 7769), Box(7769, 7769)),
+ Box(Box(7770, 7770), Box(7770, 7770)),
+ Box(Box(7771, 7771), Box(7771, 7771)),
+ Box(Box(7772, 7772), Box(7772, 7772)),
+ Box(Box(7773, 7773), Box(7773, 7773)),
+ Box(Box(7774, 7774), Box(7774, 7774)),
+ Box(Box(7775, 7775), Box(7775, 7775)),
+ Box(Box(7776, 7776), Box(7776, 7776)),
+ Box(Box(7777, 7777), Box(7777, 7777)),
+ Box(Box(7778, 7778), Box(7778, 7778)),
+ Box(Box(7779, 7779), Box(7779, 7779)),
+ Box(Box(7780, 7780), Box(7780, 7780)),
+ Box(Box(7781, 7781), Box(7781, 7781)),
+ Box(Box(7782, 7782), Box(7782, 7782)),
+ Box(Box(7783, 7783), Box(7783, 7783)),
+ Box(Box(7784, 7784), Box(7784, 7784)),
+ Box(Box(7785, 7785), Box(7785, 7785)),
+ Box(Box(7786, 7786), Box(7786, 7786)),
+ Box(Box(7787, 7787), Box(7787, 7787)),
+ Box(Box(7788, 7788), Box(7788, 7788)),
+ Box(Box(7789, 7789), Box(7789, 7789)),
+ Box(Box(7790, 7790), Box(7790, 7790)),
+ Box(Box(7791, 7791), Box(7791, 7791)),
+ Box(Box(7792, 7792), Box(7792, 7792)),
+ Box(Box(7793, 7793), Box(7793, 7793)),
+ Box(Box(7794, 7794), Box(7794, 7794)),
+ Box(Box(7795, 7795), Box(7795, 7795)),
+ Box(Box(7796, 7796), Box(7796, 7796)),
+ Box(Box(7797, 7797), Box(7797, 7797)),
+ Box(Box(7798, 7798), Box(7798, 7798)),
+ Box(Box(7799, 7799), Box(7799, 7799)),
+ Box(Box(7800, 7800), Box(7800, 7800)),
+ Box(Box(7801, 7801), Box(7801, 7801)),
+ Box(Box(7802, 7802), Box(7802, 7802)),
+ Box(Box(7803, 7803), Box(7803, 7803)),
+ Box(Box(7804, 7804), Box(7804, 7804)),
+ Box(Box(7805, 7805), Box(7805, 7805)),
+ Box(Box(7806, 7806), Box(7806, 7806)),
+ Box(Box(7807, 7807), Box(7807, 7807)),
+ Box(Box(7808, 7808), Box(7808, 7808)),
+ Box(Box(7809, 7809), Box(7809, 7809)),
+ Box(Box(7810, 7810), Box(7810, 7810)),
+ Box(Box(7811, 7811), Box(7811, 7811)),
+ Box(Box(7812, 7812), Box(7812, 7812)),
+ Box(Box(7813, 7813), Box(7813, 7813)),
+ Box(Box(7814, 7814), Box(7814, 7814)),
+ Box(Box(7815, 7815), Box(7815, 7815)),
+ Box(Box(7816, 7816), Box(7816, 7816)),
+ Box(Box(7817, 7817), Box(7817, 7817)),
+ Box(Box(7818, 7818), Box(7818, 7818)),
+ Box(Box(7819, 7819), Box(7819, 7819)),
+ Box(Box(7820, 7820), Box(7820, 7820)),
+ Box(Box(7821, 7821), Box(7821, 7821)),
+ Box(Box(7822, 7822), Box(7822, 7822)),
+ Box(Box(7823, 7823), Box(7823, 7823)),
+ Box(Box(7824, 7824), Box(7824, 7824)),
+ Box(Box(7825, 7825), Box(7825, 7825)),
+ Box(Box(7826, 7826), Box(7826, 7826)),
+ Box(Box(7827, 7827), Box(7827, 7827)),
+ Box(Box(7828, 7828), Box(7828, 7828)),
+ Box(Box(7829, 7829), Box(7829, 7829)),
+ Box(Box(7830, 7830), Box(7830, 7830)),
+ Box(Box(7831, 7831), Box(7831, 7831)),
+ Box(Box(7832, 7832), Box(7832, 7832)),
+ Box(Box(7833, 7833), Box(7833, 7833)),
+ Box(Box(7834, 7834), Box(7834, 7834)),
+ Box(Box(7835, 7835), Box(7835, 7835)),
+ Box(Box(7836, 7836), Box(7836, 7836)),
+ Box(Box(7837, 7837), Box(7837, 7837)),
+ Box(Box(7838, 7838), Box(7838, 7838)),
+ Box(Box(7839, 7839), Box(7839, 7839)),
+ Box(Box(7840, 7840), Box(7840, 7840)),
+ Box(Box(7841, 7841), Box(7841, 7841)),
+ Box(Box(7842, 7842), Box(7842, 7842)),
+ Box(Box(7843, 7843), Box(7843, 7843)),
+ Box(Box(7844, 7844), Box(7844, 7844)),
+ Box(Box(7845, 7845), Box(7845, 7845)),
+ Box(Box(7846, 7846), Box(7846, 7846)),
+ Box(Box(7847, 7847), Box(7847, 7847)),
+ Box(Box(7848, 7848), Box(7848, 7848)),
+ Box(Box(7849, 7849), Box(7849, 7849)),
+ Box(Box(7850, 7850), Box(7850, 7850)),
+ Box(Box(7851, 7851), Box(7851, 7851)),
+ Box(Box(7852, 7852), Box(7852, 7852)),
+ Box(Box(7853, 7853), Box(7853, 7853)),
+ Box(Box(7854, 7854), Box(7854, 7854)),
+ Box(Box(7855, 7855), Box(7855, 7855)),
+ Box(Box(7856, 7856), Box(7856, 7856)),
+ Box(Box(7857, 7857), Box(7857, 7857)),
+ Box(Box(7858, 7858), Box(7858, 7858)),
+ Box(Box(7859, 7859), Box(7859, 7859)),
+ Box(Box(7860, 7860), Box(7860, 7860)),
+ Box(Box(7861, 7861), Box(7861, 7861)),
+ Box(Box(7862, 7862), Box(7862, 7862)),
+ Box(Box(7863, 7863), Box(7863, 7863)),
+ Box(Box(7864, 7864), Box(7864, 7864)),
+ Box(Box(7865, 7865), Box(7865, 7865)),
+ Box(Box(7866, 7866), Box(7866, 7866)),
+ Box(Box(7867, 7867), Box(7867, 7867)),
+ Box(Box(7868, 7868), Box(7868, 7868)),
+ Box(Box(7869, 7869), Box(7869, 7869)),
+ Box(Box(7870, 7870), Box(7870, 7870)),
+ Box(Box(7871, 7871), Box(7871, 7871)),
+ Box(Box(7872, 7872), Box(7872, 7872)),
+ Box(Box(7873, 7873), Box(7873, 7873)),
+ Box(Box(7874, 7874), Box(7874, 7874)),
+ Box(Box(7875, 7875), Box(7875, 7875)),
+ Box(Box(7876, 7876), Box(7876, 7876)),
+ Box(Box(7877, 7877), Box(7877, 7877)),
+ Box(Box(7878, 7878), Box(7878, 7878)),
+ Box(Box(7879, 7879), Box(7879, 7879)),
+ Box(Box(7880, 7880), Box(7880, 7880)),
+ Box(Box(7881, 7881), Box(7881, 7881)),
+ Box(Box(7882, 7882), Box(7882, 7882)),
+ Box(Box(7883, 7883), Box(7883, 7883)),
+ Box(Box(7884, 7884), Box(7884, 7884)),
+ Box(Box(7885, 7885), Box(7885, 7885)),
+ Box(Box(7886, 7886), Box(7886, 7886)),
+ Box(Box(7887, 7887), Box(7887, 7887)),
+ Box(Box(7888, 7888), Box(7888, 7888)),
+ Box(Box(7889, 7889), Box(7889, 7889)),
+ Box(Box(7890, 7890), Box(7890, 7890)),
+ Box(Box(7891, 7891), Box(7891, 7891)),
+ Box(Box(7892, 7892), Box(7892, 7892)),
+ Box(Box(7893, 7893), Box(7893, 7893)),
+ Box(Box(7894, 7894), Box(7894, 7894)),
+ Box(Box(7895, 7895), Box(7895, 7895)),
+ Box(Box(7896, 7896), Box(7896, 7896)),
+ Box(Box(7897, 7897), Box(7897, 7897)),
+ Box(Box(7898, 7898), Box(7898, 7898)),
+ Box(Box(7899, 7899), Box(7899, 7899)),
+ Box(Box(7900, 7900), Box(7900, 7900)),
+ Box(Box(7901, 7901), Box(7901, 7901)),
+ Box(Box(7902, 7902), Box(7902, 7902)),
+ Box(Box(7903, 7903), Box(7903, 7903)),
+ Box(Box(7904, 7904), Box(7904, 7904)),
+ Box(Box(7905, 7905), Box(7905, 7905)),
+ Box(Box(7906, 7906), Box(7906, 7906)),
+ Box(Box(7907, 7907), Box(7907, 7907)),
+ Box(Box(7908, 7908), Box(7908, 7908)),
+ Box(Box(7909, 7909), Box(7909, 7909)),
+ Box(Box(7910, 7910), Box(7910, 7910)),
+ Box(Box(7911, 7911), Box(7911, 7911)),
+ Box(Box(7912, 7912), Box(7912, 7912)),
+ Box(Box(7913, 7913), Box(7913, 7913)),
+ Box(Box(7914, 7914), Box(7914, 7914)),
+ Box(Box(7915, 7915), Box(7915, 7915)),
+ Box(Box(7916, 7916), Box(7916, 7916)),
+ Box(Box(7917, 7917), Box(7917, 7917)),
+ Box(Box(7918, 7918), Box(7918, 7918)),
+ Box(Box(7919, 7919), Box(7919, 7919)),
+ Box(Box(7920, 7920), Box(7920, 7920)),
+ Box(Box(7921, 7921), Box(7921, 7921)),
+ Box(Box(7922, 7922), Box(7922, 7922)),
+ Box(Box(7923, 7923), Box(7923, 7923)),
+ Box(Box(7924, 7924), Box(7924, 7924)),
+ Box(Box(7925, 7925), Box(7925, 7925)),
+ Box(Box(7926, 7926), Box(7926, 7926)),
+ Box(Box(7927, 7927), Box(7927, 7927)),
+ Box(Box(7928, 7928), Box(7928, 7928)),
+ Box(Box(7929, 7929), Box(7929, 7929)),
+ Box(Box(7930, 7930), Box(7930, 7930)),
+ Box(Box(7931, 7931), Box(7931, 7931)),
+ Box(Box(7932, 7932), Box(7932, 7932)),
+ Box(Box(7933, 7933), Box(7933, 7933)),
+ Box(Box(7934, 7934), Box(7934, 7934)),
+ Box(Box(7935, 7935), Box(7935, 7935)),
+ Box(Box(7936, 7936), Box(7936, 7936)),
+ Box(Box(7937, 7937), Box(7937, 7937)),
+ Box(Box(7938, 7938), Box(7938, 7938)),
+ Box(Box(7939, 7939), Box(7939, 7939)),
+ Box(Box(7940, 7940), Box(7940, 7940)),
+ Box(Box(7941, 7941), Box(7941, 7941)),
+ Box(Box(7942, 7942), Box(7942, 7942)),
+ Box(Box(7943, 7943), Box(7943, 7943)),
+ Box(Box(7944, 7944), Box(7944, 7944)),
+ Box(Box(7945, 7945), Box(7945, 7945)),
+ Box(Box(7946, 7946), Box(7946, 7946)),
+ Box(Box(7947, 7947), Box(7947, 7947)),
+ Box(Box(7948, 7948), Box(7948, 7948)),
+ Box(Box(7949, 7949), Box(7949, 7949)),
+ Box(Box(7950, 7950), Box(7950, 7950)),
+ Box(Box(7951, 7951), Box(7951, 7951)),
+ Box(Box(7952, 7952), Box(7952, 7952)),
+ Box(Box(7953, 7953), Box(7953, 7953)),
+ Box(Box(7954, 7954), Box(7954, 7954)),
+ Box(Box(7955, 7955), Box(7955, 7955)),
+ Box(Box(7956, 7956), Box(7956, 7956)),
+ Box(Box(7957, 7957), Box(7957, 7957)),
+ Box(Box(7958, 7958), Box(7958, 7958)),
+ Box(Box(7959, 7959), Box(7959, 7959)),
+ Box(Box(7960, 7960), Box(7960, 7960)),
+ Box(Box(7961, 7961), Box(7961, 7961)),
+ Box(Box(7962, 7962), Box(7962, 7962)),
+ Box(Box(7963, 7963), Box(7963, 7963)),
+ Box(Box(7964, 7964), Box(7964, 7964)),
+ Box(Box(7965, 7965), Box(7965, 7965)),
+ Box(Box(7966, 7966), Box(7966, 7966)),
+ Box(Box(7967, 7967), Box(7967, 7967)),
+ Box(Box(7968, 7968), Box(7968, 7968)),
+ Box(Box(7969, 7969), Box(7969, 7969)),
+ Box(Box(7970, 7970), Box(7970, 7970)),
+ Box(Box(7971, 7971), Box(7971, 7971)),
+ Box(Box(7972, 7972), Box(7972, 7972)),
+ Box(Box(7973, 7973), Box(7973, 7973)),
+ Box(Box(7974, 7974), Box(7974, 7974)),
+ Box(Box(7975, 7975), Box(7975, 7975)),
+ Box(Box(7976, 7976), Box(7976, 7976)),
+ Box(Box(7977, 7977), Box(7977, 7977)),
+ Box(Box(7978, 7978), Box(7978, 7978)),
+ Box(Box(7979, 7979), Box(7979, 7979)),
+ Box(Box(7980, 7980), Box(7980, 7980)),
+ Box(Box(7981, 7981), Box(7981, 7981)),
+ Box(Box(7982, 7982), Box(7982, 7982)),
+ Box(Box(7983, 7983), Box(7983, 7983)),
+ Box(Box(7984, 7984), Box(7984, 7984)),
+ Box(Box(7985, 7985), Box(7985, 7985)),
+ Box(Box(7986, 7986), Box(7986, 7986)),
+ Box(Box(7987, 7987), Box(7987, 7987)),
+ Box(Box(7988, 7988), Box(7988, 7988)),
+ Box(Box(7989, 7989), Box(7989, 7989)),
+ Box(Box(7990, 7990), Box(7990, 7990)),
+ Box(Box(7991, 7991), Box(7991, 7991)),
+ Box(Box(7992, 7992), Box(7992, 7992)),
+ Box(Box(7993, 7993), Box(7993, 7993)),
+ Box(Box(7994, 7994), Box(7994, 7994)),
+ Box(Box(7995, 7995), Box(7995, 7995)),
+ Box(Box(7996, 7996), Box(7996, 7996)),
+ Box(Box(7997, 7997), Box(7997, 7997)),
+ Box(Box(7998, 7998), Box(7998, 7998)),
+ Box(Box(7999, 7999), Box(7999, 7999)),
+ Box(Box(8000, 8000), Box(8000, 8000)),
+ Box(Box(8001, 8001), Box(8001, 8001)),
+ Box(Box(8002, 8002), Box(8002, 8002)),
+ Box(Box(8003, 8003), Box(8003, 8003)),
+ Box(Box(8004, 8004), Box(8004, 8004)),
+ Box(Box(8005, 8005), Box(8005, 8005)),
+ Box(Box(8006, 8006), Box(8006, 8006)),
+ Box(Box(8007, 8007), Box(8007, 8007)),
+ Box(Box(8008, 8008), Box(8008, 8008)),
+ Box(Box(8009, 8009), Box(8009, 8009)),
+ Box(Box(8010, 8010), Box(8010, 8010)),
+ Box(Box(8011, 8011), Box(8011, 8011)),
+ Box(Box(8012, 8012), Box(8012, 8012)),
+ Box(Box(8013, 8013), Box(8013, 8013)),
+ Box(Box(8014, 8014), Box(8014, 8014)),
+ Box(Box(8015, 8015), Box(8015, 8015)),
+ Box(Box(8016, 8016), Box(8016, 8016)),
+ Box(Box(8017, 8017), Box(8017, 8017)),
+ Box(Box(8018, 8018), Box(8018, 8018)),
+ Box(Box(8019, 8019), Box(8019, 8019)),
+ Box(Box(8020, 8020), Box(8020, 8020)),
+ Box(Box(8021, 8021), Box(8021, 8021)),
+ Box(Box(8022, 8022), Box(8022, 8022)),
+ Box(Box(8023, 8023), Box(8023, 8023)),
+ Box(Box(8024, 8024), Box(8024, 8024)),
+ Box(Box(8025, 8025), Box(8025, 8025)),
+ Box(Box(8026, 8026), Box(8026, 8026)),
+ Box(Box(8027, 8027), Box(8027, 8027)),
+ Box(Box(8028, 8028), Box(8028, 8028)),
+ Box(Box(8029, 8029), Box(8029, 8029)),
+ Box(Box(8030, 8030), Box(8030, 8030)),
+ Box(Box(8031, 8031), Box(8031, 8031)),
+ Box(Box(8032, 8032), Box(8032, 8032)),
+ Box(Box(8033, 8033), Box(8033, 8033)),
+ Box(Box(8034, 8034), Box(8034, 8034)),
+ Box(Box(8035, 8035), Box(8035, 8035)),
+ Box(Box(8036, 8036), Box(8036, 8036)),
+ Box(Box(8037, 8037), Box(8037, 8037)),
+ Box(Box(8038, 8038), Box(8038, 8038)),
+ Box(Box(8039, 8039), Box(8039, 8039)),
+ Box(Box(8040, 8040), Box(8040, 8040)),
+ Box(Box(8041, 8041), Box(8041, 8041)),
+ Box(Box(8042, 8042), Box(8042, 8042)),
+ Box(Box(8043, 8043), Box(8043, 8043)),
+ Box(Box(8044, 8044), Box(8044, 8044)),
+ Box(Box(8045, 8045), Box(8045, 8045)),
+ Box(Box(8046, 8046), Box(8046, 8046)),
+ Box(Box(8047, 8047), Box(8047, 8047)),
+ Box(Box(8048, 8048), Box(8048, 8048)),
+ Box(Box(8049, 8049), Box(8049, 8049)),
+ Box(Box(8050, 8050), Box(8050, 8050)),
+ Box(Box(8051, 8051), Box(8051, 8051)),
+ Box(Box(8052, 8052), Box(8052, 8052)),
+ Box(Box(8053, 8053), Box(8053, 8053)),
+ Box(Box(8054, 8054), Box(8054, 8054)),
+ Box(Box(8055, 8055), Box(8055, 8055)),
+ Box(Box(8056, 8056), Box(8056, 8056)),
+ Box(Box(8057, 8057), Box(8057, 8057)),
+ Box(Box(8058, 8058), Box(8058, 8058)),
+ Box(Box(8059, 8059), Box(8059, 8059)),
+ Box(Box(8060, 8060), Box(8060, 8060)),
+ Box(Box(8061, 8061), Box(8061, 8061)),
+ Box(Box(8062, 8062), Box(8062, 8062)),
+ Box(Box(8063, 8063), Box(8063, 8063)),
+ Box(Box(8064, 8064), Box(8064, 8064)),
+ Box(Box(8065, 8065), Box(8065, 8065)),
+ Box(Box(8066, 8066), Box(8066, 8066)),
+ Box(Box(8067, 8067), Box(8067, 8067)),
+ Box(Box(8068, 8068), Box(8068, 8068)),
+ Box(Box(8069, 8069), Box(8069, 8069)),
+ Box(Box(8070, 8070), Box(8070, 8070)),
+ Box(Box(8071, 8071), Box(8071, 8071)),
+ Box(Box(8072, 8072), Box(8072, 8072)),
+ Box(Box(8073, 8073), Box(8073, 8073)),
+ Box(Box(8074, 8074), Box(8074, 8074)),
+ Box(Box(8075, 8075), Box(8075, 8075)),
+ Box(Box(8076, 8076), Box(8076, 8076)),
+ Box(Box(8077, 8077), Box(8077, 8077)),
+ Box(Box(8078, 8078), Box(8078, 8078)),
+ Box(Box(8079, 8079), Box(8079, 8079)),
+ Box(Box(8080, 8080), Box(8080, 8080)),
+ Box(Box(8081, 8081), Box(8081, 8081)),
+ Box(Box(8082, 8082), Box(8082, 8082)),
+ Box(Box(8083, 8083), Box(8083, 8083)),
+ Box(Box(8084, 8084), Box(8084, 8084)),
+ Box(Box(8085, 8085), Box(8085, 8085)),
+ Box(Box(8086, 8086), Box(8086, 8086)),
+ Box(Box(8087, 8087), Box(8087, 8087)),
+ Box(Box(8088, 8088), Box(8088, 8088)),
+ Box(Box(8089, 8089), Box(8089, 8089)),
+ Box(Box(8090, 8090), Box(8090, 8090)),
+ Box(Box(8091, 8091), Box(8091, 8091)),
+ Box(Box(8092, 8092), Box(8092, 8092)),
+ Box(Box(8093, 8093), Box(8093, 8093)),
+ Box(Box(8094, 8094), Box(8094, 8094)),
+ Box(Box(8095, 8095), Box(8095, 8095)),
+ Box(Box(8096, 8096), Box(8096, 8096)),
+ Box(Box(8097, 8097), Box(8097, 8097)),
+ Box(Box(8098, 8098), Box(8098, 8098)),
+ Box(Box(8099, 8099), Box(8099, 8099)),
+ Box(Box(8100, 8100), Box(8100, 8100)),
+ Box(Box(8101, 8101), Box(8101, 8101)),
+ Box(Box(8102, 8102), Box(8102, 8102)),
+ Box(Box(8103, 8103), Box(8103, 8103)),
+ Box(Box(8104, 8104), Box(8104, 8104)),
+ Box(Box(8105, 8105), Box(8105, 8105)),
+ Box(Box(8106, 8106), Box(8106, 8106)),
+ Box(Box(8107, 8107), Box(8107, 8107)),
+ Box(Box(8108, 8108), Box(8108, 8108)),
+ Box(Box(8109, 8109), Box(8109, 8109)),
+ Box(Box(8110, 8110), Box(8110, 8110)),
+ Box(Box(8111, 8111), Box(8111, 8111)),
+ Box(Box(8112, 8112), Box(8112, 8112)),
+ Box(Box(8113, 8113), Box(8113, 8113)),
+ Box(Box(8114, 8114), Box(8114, 8114)),
+ Box(Box(8115, 8115), Box(8115, 8115)),
+ Box(Box(8116, 8116), Box(8116, 8116)),
+ Box(Box(8117, 8117), Box(8117, 8117)),
+ Box(Box(8118, 8118), Box(8118, 8118)),
+ Box(Box(8119, 8119), Box(8119, 8119)),
+ Box(Box(8120, 8120), Box(8120, 8120)),
+ Box(Box(8121, 8121), Box(8121, 8121)),
+ Box(Box(8122, 8122), Box(8122, 8122)),
+ Box(Box(8123, 8123), Box(8123, 8123)),
+ Box(Box(8124, 8124), Box(8124, 8124)),
+ Box(Box(8125, 8125), Box(8125, 8125)),
+ Box(Box(8126, 8126), Box(8126, 8126)),
+ Box(Box(8127, 8127), Box(8127, 8127)),
+ Box(Box(8128, 8128), Box(8128, 8128)),
+ Box(Box(8129, 8129), Box(8129, 8129)),
+ Box(Box(8130, 8130), Box(8130, 8130)),
+ Box(Box(8131, 8131), Box(8131, 8131)),
+ Box(Box(8132, 8132), Box(8132, 8132)),
+ Box(Box(8133, 8133), Box(8133, 8133)),
+ Box(Box(8134, 8134), Box(8134, 8134)),
+ Box(Box(8135, 8135), Box(8135, 8135)),
+ Box(Box(8136, 8136), Box(8136, 8136)),
+ Box(Box(8137, 8137), Box(8137, 8137)),
+ Box(Box(8138, 8138), Box(8138, 8138)),
+ Box(Box(8139, 8139), Box(8139, 8139)),
+ Box(Box(8140, 8140), Box(8140, 8140)),
+ Box(Box(8141, 8141), Box(8141, 8141)),
+ Box(Box(8142, 8142), Box(8142, 8142)),
+ Box(Box(8143, 8143), Box(8143, 8143)),
+ Box(Box(8144, 8144), Box(8144, 8144)),
+ Box(Box(8145, 8145), Box(8145, 8145)),
+ Box(Box(8146, 8146), Box(8146, 8146)),
+ Box(Box(8147, 8147), Box(8147, 8147)),
+ Box(Box(8148, 8148), Box(8148, 8148)),
+ Box(Box(8149, 8149), Box(8149, 8149)),
+ Box(Box(8150, 8150), Box(8150, 8150)),
+ Box(Box(8151, 8151), Box(8151, 8151)),
+ Box(Box(8152, 8152), Box(8152, 8152)),
+ Box(Box(8153, 8153), Box(8153, 8153)),
+ Box(Box(8154, 8154), Box(8154, 8154)),
+ Box(Box(8155, 8155), Box(8155, 8155)),
+ Box(Box(8156, 8156), Box(8156, 8156)),
+ Box(Box(8157, 8157), Box(8157, 8157)),
+ Box(Box(8158, 8158), Box(8158, 8158)),
+ Box(Box(8159, 8159), Box(8159, 8159)),
+ Box(Box(8160, 8160), Box(8160, 8160)),
+ Box(Box(8161, 8161), Box(8161, 8161)),
+ Box(Box(8162, 8162), Box(8162, 8162)),
+ Box(Box(8163, 8163), Box(8163, 8163)),
+ Box(Box(8164, 8164), Box(8164, 8164)),
+ Box(Box(8165, 8165), Box(8165, 8165)),
+ Box(Box(8166, 8166), Box(8166, 8166)),
+ Box(Box(8167, 8167), Box(8167, 8167)),
+ Box(Box(8168, 8168), Box(8168, 8168)),
+ Box(Box(8169, 8169), Box(8169, 8169)),
+ Box(Box(8170, 8170), Box(8170, 8170)),
+ Box(Box(8171, 8171), Box(8171, 8171)),
+ Box(Box(8172, 8172), Box(8172, 8172)),
+ Box(Box(8173, 8173), Box(8173, 8173)),
+ Box(Box(8174, 8174), Box(8174, 8174)),
+ Box(Box(8175, 8175), Box(8175, 8175)),
+ Box(Box(8176, 8176), Box(8176, 8176)),
+ Box(Box(8177, 8177), Box(8177, 8177)),
+ Box(Box(8178, 8178), Box(8178, 8178)),
+ Box(Box(8179, 8179), Box(8179, 8179)),
+ Box(Box(8180, 8180), Box(8180, 8180)),
+ Box(Box(8181, 8181), Box(8181, 8181)),
+ Box(Box(8182, 8182), Box(8182, 8182)),
+ Box(Box(8183, 8183), Box(8183, 8183)),
+ Box(Box(8184, 8184), Box(8184, 8184)),
+ Box(Box(8185, 8185), Box(8185, 8185)),
+ Box(Box(8186, 8186), Box(8186, 8186)),
+ Box(Box(8187, 8187), Box(8187, 8187)),
+ Box(Box(8188, 8188), Box(8188, 8188)),
+ Box(Box(8189, 8189), Box(8189, 8189)),
+ Box(Box(8190, 8190), Box(8190, 8190)),
+ Box(Box(8191, 8191), Box(8191, 8191)),
+ Box(Box(8192, 8192), Box(8192, 8192)),
+ Box(Box(8193, 8193), Box(8193, 8193)),
+ Box(Box(8194, 8194), Box(8194, 8194)),
+ Box(Box(8195, 8195), Box(8195, 8195)),
+ Box(Box(8196, 8196), Box(8196, 8196)),
+ Box(Box(8197, 8197), Box(8197, 8197)),
+ Box(Box(8198, 8198), Box(8198, 8198)),
+ Box(Box(8199, 8199), Box(8199, 8199)),
+ Box(Box(8200, 8200), Box(8200, 8200)),
+ Box(Box(8201, 8201), Box(8201, 8201)),
+ Box(Box(8202, 8202), Box(8202, 8202)),
+ Box(Box(8203, 8203), Box(8203, 8203)),
+ Box(Box(8204, 8204), Box(8204, 8204)),
+ Box(Box(8205, 8205), Box(8205, 8205)),
+ Box(Box(8206, 8206), Box(8206, 8206)),
+ Box(Box(8207, 8207), Box(8207, 8207)),
+ Box(Box(8208, 8208), Box(8208, 8208)),
+ Box(Box(8209, 8209), Box(8209, 8209)),
+ Box(Box(8210, 8210), Box(8210, 8210)),
+ Box(Box(8211, 8211), Box(8211, 8211)),
+ Box(Box(8212, 8212), Box(8212, 8212)),
+ Box(Box(8213, 8213), Box(8213, 8213)),
+ Box(Box(8214, 8214), Box(8214, 8214)),
+ Box(Box(8215, 8215), Box(8215, 8215)),
+ Box(Box(8216, 8216), Box(8216, 8216)),
+ Box(Box(8217, 8217), Box(8217, 8217)),
+ Box(Box(8218, 8218), Box(8218, 8218)),
+ Box(Box(8219, 8219), Box(8219, 8219)),
+ Box(Box(8220, 8220), Box(8220, 8220)),
+ Box(Box(8221, 8221), Box(8221, 8221)),
+ Box(Box(8222, 8222), Box(8222, 8222)),
+ Box(Box(8223, 8223), Box(8223, 8223)),
+ Box(Box(8224, 8224), Box(8224, 8224)),
+ Box(Box(8225, 8225), Box(8225, 8225)),
+ Box(Box(8226, 8226), Box(8226, 8226)),
+ Box(Box(8227, 8227), Box(8227, 8227)),
+ Box(Box(8228, 8228), Box(8228, 8228)),
+ Box(Box(8229, 8229), Box(8229, 8229)),
+ Box(Box(8230, 8230), Box(8230, 8230)),
+ Box(Box(8231, 8231), Box(8231, 8231)),
+ Box(Box(8232, 8232), Box(8232, 8232)),
+ Box(Box(8233, 8233), Box(8233, 8233)),
+ Box(Box(8234, 8234), Box(8234, 8234)),
+ Box(Box(8235, 8235), Box(8235, 8235)),
+ Box(Box(8236, 8236), Box(8236, 8236)),
+ Box(Box(8237, 8237), Box(8237, 8237)),
+ Box(Box(8238, 8238), Box(8238, 8238)),
+ Box(Box(8239, 8239), Box(8239, 8239)),
+ Box(Box(8240, 8240), Box(8240, 8240)),
+ Box(Box(8241, 8241), Box(8241, 8241)),
+ Box(Box(8242, 8242), Box(8242, 8242)),
+ Box(Box(8243, 8243), Box(8243, 8243)),
+ Box(Box(8244, 8244), Box(8244, 8244)),
+ Box(Box(8245, 8245), Box(8245, 8245)),
+ Box(Box(8246, 8246), Box(8246, 8246)),
+ Box(Box(8247, 8247), Box(8247, 8247)),
+ Box(Box(8248, 8248), Box(8248, 8248)),
+ Box(Box(8249, 8249), Box(8249, 8249)),
+ Box(Box(8250, 8250), Box(8250, 8250)),
+ Box(Box(8251, 8251), Box(8251, 8251)),
+ Box(Box(8252, 8252), Box(8252, 8252)),
+ Box(Box(8253, 8253), Box(8253, 8253)),
+ Box(Box(8254, 8254), Box(8254, 8254)),
+ Box(Box(8255, 8255), Box(8255, 8255)),
+ Box(Box(8256, 8256), Box(8256, 8256)),
+ Box(Box(8257, 8257), Box(8257, 8257)),
+ Box(Box(8258, 8258), Box(8258, 8258)),
+ Box(Box(8259, 8259), Box(8259, 8259)),
+ Box(Box(8260, 8260), Box(8260, 8260)),
+ Box(Box(8261, 8261), Box(8261, 8261)),
+ Box(Box(8262, 8262), Box(8262, 8262)),
+ Box(Box(8263, 8263), Box(8263, 8263)),
+ Box(Box(8264, 8264), Box(8264, 8264)),
+ Box(Box(8265, 8265), Box(8265, 8265)),
+ Box(Box(8266, 8266), Box(8266, 8266)),
+ Box(Box(8267, 8267), Box(8267, 8267)),
+ Box(Box(8268, 8268), Box(8268, 8268)),
+ Box(Box(8269, 8269), Box(8269, 8269)),
+ Box(Box(8270, 8270), Box(8270, 8270)),
+ Box(Box(8271, 8271), Box(8271, 8271)),
+ Box(Box(8272, 8272), Box(8272, 8272)),
+ Box(Box(8273, 8273), Box(8273, 8273)),
+ Box(Box(8274, 8274), Box(8274, 8274)),
+ Box(Box(8275, 8275), Box(8275, 8275)),
+ Box(Box(8276, 8276), Box(8276, 8276)),
+ Box(Box(8277, 8277), Box(8277, 8277)),
+ Box(Box(8278, 8278), Box(8278, 8278)),
+ Box(Box(8279, 8279), Box(8279, 8279)),
+ Box(Box(8280, 8280), Box(8280, 8280)),
+ Box(Box(8281, 8281), Box(8281, 8281)),
+ Box(Box(8282, 8282), Box(8282, 8282)),
+ Box(Box(8283, 8283), Box(8283, 8283)),
+ Box(Box(8284, 8284), Box(8284, 8284)),
+ Box(Box(8285, 8285), Box(8285, 8285)),
+ Box(Box(8286, 8286), Box(8286, 8286)),
+ Box(Box(8287, 8287), Box(8287, 8287)),
+ Box(Box(8288, 8288), Box(8288, 8288)),
+ Box(Box(8289, 8289), Box(8289, 8289)),
+ Box(Box(8290, 8290), Box(8290, 8290)),
+ Box(Box(8291, 8291), Box(8291, 8291)),
+ Box(Box(8292, 8292), Box(8292, 8292)),
+ Box(Box(8293, 8293), Box(8293, 8293)),
+ Box(Box(8294, 8294), Box(8294, 8294)),
+ Box(Box(8295, 8295), Box(8295, 8295)),
+ Box(Box(8296, 8296), Box(8296, 8296)),
+ Box(Box(8297, 8297), Box(8297, 8297)),
+ Box(Box(8298, 8298), Box(8298, 8298)),
+ Box(Box(8299, 8299), Box(8299, 8299)),
+ Box(Box(8300, 8300), Box(8300, 8300)),
+ Box(Box(8301, 8301), Box(8301, 8301)),
+ Box(Box(8302, 8302), Box(8302, 8302)),
+ Box(Box(8303, 8303), Box(8303, 8303)),
+ Box(Box(8304, 8304), Box(8304, 8304)),
+ Box(Box(8305, 8305), Box(8305, 8305)),
+ Box(Box(8306, 8306), Box(8306, 8306)),
+ Box(Box(8307, 8307), Box(8307, 8307)),
+ Box(Box(8308, 8308), Box(8308, 8308)),
+ Box(Box(8309, 8309), Box(8309, 8309)),
+ Box(Box(8310, 8310), Box(8310, 8310)),
+ Box(Box(8311, 8311), Box(8311, 8311)),
+ Box(Box(8312, 8312), Box(8312, 8312)),
+ Box(Box(8313, 8313), Box(8313, 8313)),
+ Box(Box(8314, 8314), Box(8314, 8314)),
+ Box(Box(8315, 8315), Box(8315, 8315)),
+ Box(Box(8316, 8316), Box(8316, 8316)),
+ Box(Box(8317, 8317), Box(8317, 8317)),
+ Box(Box(8318, 8318), Box(8318, 8318)),
+ Box(Box(8319, 8319), Box(8319, 8319)),
+ Box(Box(8320, 8320), Box(8320, 8320)),
+ Box(Box(8321, 8321), Box(8321, 8321)),
+ Box(Box(8322, 8322), Box(8322, 8322)),
+ Box(Box(8323, 8323), Box(8323, 8323)),
+ Box(Box(8324, 8324), Box(8324, 8324)),
+ Box(Box(8325, 8325), Box(8325, 8325)),
+ Box(Box(8326, 8326), Box(8326, 8326)),
+ Box(Box(8327, 8327), Box(8327, 8327)),
+ Box(Box(8328, 8328), Box(8328, 8328)),
+ Box(Box(8329, 8329), Box(8329, 8329)),
+ Box(Box(8330, 8330), Box(8330, 8330)),
+ Box(Box(8331, 8331), Box(8331, 8331)),
+ Box(Box(8332, 8332), Box(8332, 8332)),
+ Box(Box(8333, 8333), Box(8333, 8333)),
+ Box(Box(8334, 8334), Box(8334, 8334)),
+ Box(Box(8335, 8335), Box(8335, 8335)),
+ Box(Box(8336, 8336), Box(8336, 8336)),
+ Box(Box(8337, 8337), Box(8337, 8337)),
+ Box(Box(8338, 8338), Box(8338, 8338)),
+ Box(Box(8339, 8339), Box(8339, 8339)),
+ Box(Box(8340, 8340), Box(8340, 8340)),
+ Box(Box(8341, 8341), Box(8341, 8341)),
+ Box(Box(8342, 8342), Box(8342, 8342)),
+ Box(Box(8343, 8343), Box(8343, 8343)),
+ Box(Box(8344, 8344), Box(8344, 8344)),
+ Box(Box(8345, 8345), Box(8345, 8345)),
+ Box(Box(8346, 8346), Box(8346, 8346)),
+ Box(Box(8347, 8347), Box(8347, 8347)),
+ Box(Box(8348, 8348), Box(8348, 8348)),
+ Box(Box(8349, 8349), Box(8349, 8349)),
+ Box(Box(8350, 8350), Box(8350, 8350)),
+ Box(Box(8351, 8351), Box(8351, 8351)),
+ Box(Box(8352, 8352), Box(8352, 8352)),
+ Box(Box(8353, 8353), Box(8353, 8353)),
+ Box(Box(8354, 8354), Box(8354, 8354)),
+ Box(Box(8355, 8355), Box(8355, 8355)),
+ Box(Box(8356, 8356), Box(8356, 8356)),
+ Box(Box(8357, 8357), Box(8357, 8357)),
+ Box(Box(8358, 8358), Box(8358, 8358)),
+ Box(Box(8359, 8359), Box(8359, 8359)),
+ Box(Box(8360, 8360), Box(8360, 8360)),
+ Box(Box(8361, 8361), Box(8361, 8361)),
+ Box(Box(8362, 8362), Box(8362, 8362)),
+ Box(Box(8363, 8363), Box(8363, 8363)),
+ Box(Box(8364, 8364), Box(8364, 8364)),
+ Box(Box(8365, 8365), Box(8365, 8365)),
+ Box(Box(8366, 8366), Box(8366, 8366)),
+ Box(Box(8367, 8367), Box(8367, 8367)),
+ Box(Box(8368, 8368), Box(8368, 8368)),
+ Box(Box(8369, 8369), Box(8369, 8369)),
+ Box(Box(8370, 8370), Box(8370, 8370)),
+ Box(Box(8371, 8371), Box(8371, 8371)),
+ Box(Box(8372, 8372), Box(8372, 8372)),
+ Box(Box(8373, 8373), Box(8373, 8373)),
+ Box(Box(8374, 8374), Box(8374, 8374)),
+ Box(Box(8375, 8375), Box(8375, 8375)),
+ Box(Box(8376, 8376), Box(8376, 8376)),
+ Box(Box(8377, 8377), Box(8377, 8377)),
+ Box(Box(8378, 8378), Box(8378, 8378)),
+ Box(Box(8379, 8379), Box(8379, 8379)),
+ Box(Box(8380, 8380), Box(8380, 8380)),
+ Box(Box(8381, 8381), Box(8381, 8381)),
+ Box(Box(8382, 8382), Box(8382, 8382)),
+ Box(Box(8383, 8383), Box(8383, 8383)),
+ Box(Box(8384, 8384), Box(8384, 8384)),
+ Box(Box(8385, 8385), Box(8385, 8385)),
+ Box(Box(8386, 8386), Box(8386, 8386)),
+ Box(Box(8387, 8387), Box(8387, 8387)),
+ Box(Box(8388, 8388), Box(8388, 8388)),
+ Box(Box(8389, 8389), Box(8389, 8389)),
+ Box(Box(8390, 8390), Box(8390, 8390)),
+ Box(Box(8391, 8391), Box(8391, 8391)),
+ Box(Box(8392, 8392), Box(8392, 8392)),
+ Box(Box(8393, 8393), Box(8393, 8393)),
+ Box(Box(8394, 8394), Box(8394, 8394)),
+ Box(Box(8395, 8395), Box(8395, 8395)),
+ Box(Box(8396, 8396), Box(8396, 8396)),
+ Box(Box(8397, 8397), Box(8397, 8397)),
+ Box(Box(8398, 8398), Box(8398, 8398)),
+ Box(Box(8399, 8399), Box(8399, 8399)),
+ Box(Box(8400, 8400), Box(8400, 8400)),
+ Box(Box(8401, 8401), Box(8401, 8401)),
+ Box(Box(8402, 8402), Box(8402, 8402)),
+ Box(Box(8403, 8403), Box(8403, 8403)),
+ Box(Box(8404, 8404), Box(8404, 8404)),
+ Box(Box(8405, 8405), Box(8405, 8405)),
+ Box(Box(8406, 8406), Box(8406, 8406)),
+ Box(Box(8407, 8407), Box(8407, 8407)),
+ Box(Box(8408, 8408), Box(8408, 8408)),
+ Box(Box(8409, 8409), Box(8409, 8409)),
+ Box(Box(8410, 8410), Box(8410, 8410)),
+ Box(Box(8411, 8411), Box(8411, 8411)),
+ Box(Box(8412, 8412), Box(8412, 8412)),
+ Box(Box(8413, 8413), Box(8413, 8413)),
+ Box(Box(8414, 8414), Box(8414, 8414)),
+ Box(Box(8415, 8415), Box(8415, 8415)),
+ Box(Box(8416, 8416), Box(8416, 8416)),
+ Box(Box(8417, 8417), Box(8417, 8417)),
+ Box(Box(8418, 8418), Box(8418, 8418)),
+ Box(Box(8419, 8419), Box(8419, 8419)),
+ Box(Box(8420, 8420), Box(8420, 8420)),
+ Box(Box(8421, 8421), Box(8421, 8421)),
+ Box(Box(8422, 8422), Box(8422, 8422)),
+ Box(Box(8423, 8423), Box(8423, 8423)),
+ Box(Box(8424, 8424), Box(8424, 8424)),
+ Box(Box(8425, 8425), Box(8425, 8425)),
+ Box(Box(8426, 8426), Box(8426, 8426)),
+ Box(Box(8427, 8427), Box(8427, 8427)),
+ Box(Box(8428, 8428), Box(8428, 8428)),
+ Box(Box(8429, 8429), Box(8429, 8429)),
+ Box(Box(8430, 8430), Box(8430, 8430)),
+ Box(Box(8431, 8431), Box(8431, 8431)),
+ Box(Box(8432, 8432), Box(8432, 8432)),
+ Box(Box(8433, 8433), Box(8433, 8433)),
+ Box(Box(8434, 8434), Box(8434, 8434)),
+ Box(Box(8435, 8435), Box(8435, 8435)),
+ Box(Box(8436, 8436), Box(8436, 8436)),
+ Box(Box(8437, 8437), Box(8437, 8437)),
+ Box(Box(8438, 8438), Box(8438, 8438)),
+ Box(Box(8439, 8439), Box(8439, 8439)),
+ Box(Box(8440, 8440), Box(8440, 8440)),
+ Box(Box(8441, 8441), Box(8441, 8441)),
+ Box(Box(8442, 8442), Box(8442, 8442)),
+ Box(Box(8443, 8443), Box(8443, 8443)),
+ Box(Box(8444, 8444), Box(8444, 8444)),
+ Box(Box(8445, 8445), Box(8445, 8445)),
+ Box(Box(8446, 8446), Box(8446, 8446)),
+ Box(Box(8447, 8447), Box(8447, 8447)),
+ Box(Box(8448, 8448), Box(8448, 8448)),
+ Box(Box(8449, 8449), Box(8449, 8449)),
+ Box(Box(8450, 8450), Box(8450, 8450)),
+ Box(Box(8451, 8451), Box(8451, 8451)),
+ Box(Box(8452, 8452), Box(8452, 8452)),
+ Box(Box(8453, 8453), Box(8453, 8453)),
+ Box(Box(8454, 8454), Box(8454, 8454)),
+ Box(Box(8455, 8455), Box(8455, 8455)),
+ Box(Box(8456, 8456), Box(8456, 8456)),
+ Box(Box(8457, 8457), Box(8457, 8457)),
+ Box(Box(8458, 8458), Box(8458, 8458)),
+ Box(Box(8459, 8459), Box(8459, 8459)),
+ Box(Box(8460, 8460), Box(8460, 8460)),
+ Box(Box(8461, 8461), Box(8461, 8461)),
+ Box(Box(8462, 8462), Box(8462, 8462)),
+ Box(Box(8463, 8463), Box(8463, 8463)),
+ Box(Box(8464, 8464), Box(8464, 8464)),
+ Box(Box(8465, 8465), Box(8465, 8465)),
+ Box(Box(8466, 8466), Box(8466, 8466)),
+ Box(Box(8467, 8467), Box(8467, 8467)),
+ Box(Box(8468, 8468), Box(8468, 8468)),
+ Box(Box(8469, 8469), Box(8469, 8469)),
+ Box(Box(8470, 8470), Box(8470, 8470)),
+ Box(Box(8471, 8471), Box(8471, 8471)),
+ Box(Box(8472, 8472), Box(8472, 8472)),
+ Box(Box(8473, 8473), Box(8473, 8473)),
+ Box(Box(8474, 8474), Box(8474, 8474)),
+ Box(Box(8475, 8475), Box(8475, 8475)),
+ Box(Box(8476, 8476), Box(8476, 8476)),
+ Box(Box(8477, 8477), Box(8477, 8477)),
+ Box(Box(8478, 8478), Box(8478, 8478)),
+ Box(Box(8479, 8479), Box(8479, 8479)),
+ Box(Box(8480, 8480), Box(8480, 8480)),
+ Box(Box(8481, 8481), Box(8481, 8481)),
+ Box(Box(8482, 8482), Box(8482, 8482)),
+ Box(Box(8483, 8483), Box(8483, 8483)),
+ Box(Box(8484, 8484), Box(8484, 8484)),
+ Box(Box(8485, 8485), Box(8485, 8485)),
+ Box(Box(8486, 8486), Box(8486, 8486)),
+ Box(Box(8487, 8487), Box(8487, 8487)),
+ Box(Box(8488, 8488), Box(8488, 8488)),
+ Box(Box(8489, 8489), Box(8489, 8489)),
+ Box(Box(8490, 8490), Box(8490, 8490)),
+ Box(Box(8491, 8491), Box(8491, 8491)),
+ Box(Box(8492, 8492), Box(8492, 8492)),
+ Box(Box(8493, 8493), Box(8493, 8493)),
+ Box(Box(8494, 8494), Box(8494, 8494)),
+ Box(Box(8495, 8495), Box(8495, 8495)),
+ Box(Box(8496, 8496), Box(8496, 8496)),
+ Box(Box(8497, 8497), Box(8497, 8497)),
+ Box(Box(8498, 8498), Box(8498, 8498)),
+ Box(Box(8499, 8499), Box(8499, 8499)),
+ Box(Box(8500, 8500), Box(8500, 8500)),
+ Box(Box(8501, 8501), Box(8501, 8501)),
+ Box(Box(8502, 8502), Box(8502, 8502)),
+ Box(Box(8503, 8503), Box(8503, 8503)),
+ Box(Box(8504, 8504), Box(8504, 8504)),
+ Box(Box(8505, 8505), Box(8505, 8505)),
+ Box(Box(8506, 8506), Box(8506, 8506)),
+ Box(Box(8507, 8507), Box(8507, 8507)),
+ Box(Box(8508, 8508), Box(8508, 8508)),
+ Box(Box(8509, 8509), Box(8509, 8509)),
+ Box(Box(8510, 8510), Box(8510, 8510)),
+ Box(Box(8511, 8511), Box(8511, 8511)),
+ Box(Box(8512, 8512), Box(8512, 8512)),
+ Box(Box(8513, 8513), Box(8513, 8513)),
+ Box(Box(8514, 8514), Box(8514, 8514)),
+ Box(Box(8515, 8515), Box(8515, 8515)),
+ Box(Box(8516, 8516), Box(8516, 8516)),
+ Box(Box(8517, 8517), Box(8517, 8517)),
+ Box(Box(8518, 8518), Box(8518, 8518)),
+ Box(Box(8519, 8519), Box(8519, 8519)),
+ Box(Box(8520, 8520), Box(8520, 8520)),
+ Box(Box(8521, 8521), Box(8521, 8521)),
+ Box(Box(8522, 8522), Box(8522, 8522)),
+ Box(Box(8523, 8523), Box(8523, 8523)),
+ Box(Box(8524, 8524), Box(8524, 8524)),
+ Box(Box(8525, 8525), Box(8525, 8525)),
+ Box(Box(8526, 8526), Box(8526, 8526)),
+ Box(Box(8527, 8527), Box(8527, 8527)),
+ Box(Box(8528, 8528), Box(8528, 8528)),
+ Box(Box(8529, 8529), Box(8529, 8529)),
+ Box(Box(8530, 8530), Box(8530, 8530)),
+ Box(Box(8531, 8531), Box(8531, 8531)),
+ Box(Box(8532, 8532), Box(8532, 8532)),
+ Box(Box(8533, 8533), Box(8533, 8533)),
+ Box(Box(8534, 8534), Box(8534, 8534)),
+ Box(Box(8535, 8535), Box(8535, 8535)),
+ Box(Box(8536, 8536), Box(8536, 8536)),
+ Box(Box(8537, 8537), Box(8537, 8537)),
+ Box(Box(8538, 8538), Box(8538, 8538)),
+ Box(Box(8539, 8539), Box(8539, 8539)),
+ Box(Box(8540, 8540), Box(8540, 8540)),
+ Box(Box(8541, 8541), Box(8541, 8541)),
+ Box(Box(8542, 8542), Box(8542, 8542)),
+ Box(Box(8543, 8543), Box(8543, 8543)),
+ Box(Box(8544, 8544), Box(8544, 8544)),
+ Box(Box(8545, 8545), Box(8545, 8545)),
+ Box(Box(8546, 8546), Box(8546, 8546)),
+ Box(Box(8547, 8547), Box(8547, 8547)),
+ Box(Box(8548, 8548), Box(8548, 8548)),
+ Box(Box(8549, 8549), Box(8549, 8549)),
+ Box(Box(8550, 8550), Box(8550, 8550)),
+ Box(Box(8551, 8551), Box(8551, 8551)),
+ Box(Box(8552, 8552), Box(8552, 8552)),
+ Box(Box(8553, 8553), Box(8553, 8553)),
+ Box(Box(8554, 8554), Box(8554, 8554)),
+ Box(Box(8555, 8555), Box(8555, 8555)),
+ Box(Box(8556, 8556), Box(8556, 8556)),
+ Box(Box(8557, 8557), Box(8557, 8557)),
+ Box(Box(8558, 8558), Box(8558, 8558)),
+ Box(Box(8559, 8559), Box(8559, 8559)),
+ Box(Box(8560, 8560), Box(8560, 8560)),
+ Box(Box(8561, 8561), Box(8561, 8561)),
+ Box(Box(8562, 8562), Box(8562, 8562)),
+ Box(Box(8563, 8563), Box(8563, 8563)),
+ Box(Box(8564, 8564), Box(8564, 8564)),
+ Box(Box(8565, 8565), Box(8565, 8565)),
+ Box(Box(8566, 8566), Box(8566, 8566)),
+ Box(Box(8567, 8567), Box(8567, 8567)),
+ Box(Box(8568, 8568), Box(8568, 8568)),
+ Box(Box(8569, 8569), Box(8569, 8569)),
+ Box(Box(8570, 8570), Box(8570, 8570)),
+ Box(Box(8571, 8571), Box(8571, 8571)),
+ Box(Box(8572, 8572), Box(8572, 8572)),
+ Box(Box(8573, 8573), Box(8573, 8573)),
+ Box(Box(8574, 8574), Box(8574, 8574)),
+ Box(Box(8575, 8575), Box(8575, 8575)),
+ Box(Box(8576, 8576), Box(8576, 8576)),
+ Box(Box(8577, 8577), Box(8577, 8577)),
+ Box(Box(8578, 8578), Box(8578, 8578)),
+ Box(Box(8579, 8579), Box(8579, 8579)),
+ Box(Box(8580, 8580), Box(8580, 8580)),
+ Box(Box(8581, 8581), Box(8581, 8581)),
+ Box(Box(8582, 8582), Box(8582, 8582)),
+ Box(Box(8583, 8583), Box(8583, 8583)),
+ Box(Box(8584, 8584), Box(8584, 8584)),
+ Box(Box(8585, 8585), Box(8585, 8585)),
+ Box(Box(8586, 8586), Box(8586, 8586)),
+ Box(Box(8587, 8587), Box(8587, 8587)),
+ Box(Box(8588, 8588), Box(8588, 8588)),
+ Box(Box(8589, 8589), Box(8589, 8589)),
+ Box(Box(8590, 8590), Box(8590, 8590)),
+ Box(Box(8591, 8591), Box(8591, 8591)),
+ Box(Box(8592, 8592), Box(8592, 8592)),
+ Box(Box(8593, 8593), Box(8593, 8593)),
+ Box(Box(8594, 8594), Box(8594, 8594)),
+ Box(Box(8595, 8595), Box(8595, 8595)),
+ Box(Box(8596, 8596), Box(8596, 8596)),
+ Box(Box(8597, 8597), Box(8597, 8597)),
+ Box(Box(8598, 8598), Box(8598, 8598)),
+ Box(Box(8599, 8599), Box(8599, 8599)),
+ Box(Box(8600, 8600), Box(8600, 8600)),
+ Box(Box(8601, 8601), Box(8601, 8601)),
+ Box(Box(8602, 8602), Box(8602, 8602)),
+ Box(Box(8603, 8603), Box(8603, 8603)),
+ Box(Box(8604, 8604), Box(8604, 8604)),
+ Box(Box(8605, 8605), Box(8605, 8605)),
+ Box(Box(8606, 8606), Box(8606, 8606)),
+ Box(Box(8607, 8607), Box(8607, 8607)),
+ Box(Box(8608, 8608), Box(8608, 8608)),
+ Box(Box(8609, 8609), Box(8609, 8609)),
+ Box(Box(8610, 8610), Box(8610, 8610)),
+ Box(Box(8611, 8611), Box(8611, 8611)),
+ Box(Box(8612, 8612), Box(8612, 8612)),
+ Box(Box(8613, 8613), Box(8613, 8613)),
+ Box(Box(8614, 8614), Box(8614, 8614)),
+ Box(Box(8615, 8615), Box(8615, 8615)),
+ Box(Box(8616, 8616), Box(8616, 8616)),
+ Box(Box(8617, 8617), Box(8617, 8617)),
+ Box(Box(8618, 8618), Box(8618, 8618)),
+ Box(Box(8619, 8619), Box(8619, 8619)),
+ Box(Box(8620, 8620), Box(8620, 8620)),
+ Box(Box(8621, 8621), Box(8621, 8621)),
+ Box(Box(8622, 8622), Box(8622, 8622)),
+ Box(Box(8623, 8623), Box(8623, 8623)),
+ Box(Box(8624, 8624), Box(8624, 8624)),
+ Box(Box(8625, 8625), Box(8625, 8625)),
+ Box(Box(8626, 8626), Box(8626, 8626)),
+ Box(Box(8627, 8627), Box(8627, 8627)),
+ Box(Box(8628, 8628), Box(8628, 8628)),
+ Box(Box(8629, 8629), Box(8629, 8629)),
+ Box(Box(8630, 8630), Box(8630, 8630)),
+ Box(Box(8631, 8631), Box(8631, 8631)),
+ Box(Box(8632, 8632), Box(8632, 8632)),
+ Box(Box(8633, 8633), Box(8633, 8633)),
+ Box(Box(8634, 8634), Box(8634, 8634)),
+ Box(Box(8635, 8635), Box(8635, 8635)),
+ Box(Box(8636, 8636), Box(8636, 8636)),
+ Box(Box(8637, 8637), Box(8637, 8637)),
+ Box(Box(8638, 8638), Box(8638, 8638)),
+ Box(Box(8639, 8639), Box(8639, 8639)),
+ Box(Box(8640, 8640), Box(8640, 8640)),
+ Box(Box(8641, 8641), Box(8641, 8641)),
+ Box(Box(8642, 8642), Box(8642, 8642)),
+ Box(Box(8643, 8643), Box(8643, 8643)),
+ Box(Box(8644, 8644), Box(8644, 8644)),
+ Box(Box(8645, 8645), Box(8645, 8645)),
+ Box(Box(8646, 8646), Box(8646, 8646)),
+ Box(Box(8647, 8647), Box(8647, 8647)),
+ Box(Box(8648, 8648), Box(8648, 8648)),
+ Box(Box(8649, 8649), Box(8649, 8649)),
+ Box(Box(8650, 8650), Box(8650, 8650)),
+ Box(Box(8651, 8651), Box(8651, 8651)),
+ Box(Box(8652, 8652), Box(8652, 8652)),
+ Box(Box(8653, 8653), Box(8653, 8653)),
+ Box(Box(8654, 8654), Box(8654, 8654)),
+ Box(Box(8655, 8655), Box(8655, 8655)),
+ Box(Box(8656, 8656), Box(8656, 8656)),
+ Box(Box(8657, 8657), Box(8657, 8657)),
+ Box(Box(8658, 8658), Box(8658, 8658)),
+ Box(Box(8659, 8659), Box(8659, 8659)),
+ Box(Box(8660, 8660), Box(8660, 8660)),
+ Box(Box(8661, 8661), Box(8661, 8661)),
+ Box(Box(8662, 8662), Box(8662, 8662)),
+ Box(Box(8663, 8663), Box(8663, 8663)),
+ Box(Box(8664, 8664), Box(8664, 8664)),
+ Box(Box(8665, 8665), Box(8665, 8665)),
+ Box(Box(8666, 8666), Box(8666, 8666)),
+ Box(Box(8667, 8667), Box(8667, 8667)),
+ Box(Box(8668, 8668), Box(8668, 8668)),
+ Box(Box(8669, 8669), Box(8669, 8669)),
+ Box(Box(8670, 8670), Box(8670, 8670)),
+ Box(Box(8671, 8671), Box(8671, 8671)),
+ Box(Box(8672, 8672), Box(8672, 8672)),
+ Box(Box(8673, 8673), Box(8673, 8673)),
+ Box(Box(8674, 8674), Box(8674, 8674)),
+ Box(Box(8675, 8675), Box(8675, 8675)),
+ Box(Box(8676, 8676), Box(8676, 8676)),
+ Box(Box(8677, 8677), Box(8677, 8677)),
+ Box(Box(8678, 8678), Box(8678, 8678)),
+ Box(Box(8679, 8679), Box(8679, 8679)),
+ Box(Box(8680, 8680), Box(8680, 8680)),
+ Box(Box(8681, 8681), Box(8681, 8681)),
+ Box(Box(8682, 8682), Box(8682, 8682)),
+ Box(Box(8683, 8683), Box(8683, 8683)),
+ Box(Box(8684, 8684), Box(8684, 8684)),
+ Box(Box(8685, 8685), Box(8685, 8685)),
+ Box(Box(8686, 8686), Box(8686, 8686)),
+ Box(Box(8687, 8687), Box(8687, 8687)),
+ Box(Box(8688, 8688), Box(8688, 8688)),
+ Box(Box(8689, 8689), Box(8689, 8689)),
+ Box(Box(8690, 8690), Box(8690, 8690)),
+ Box(Box(8691, 8691), Box(8691, 8691)),
+ Box(Box(8692, 8692), Box(8692, 8692)),
+ Box(Box(8693, 8693), Box(8693, 8693)),
+ Box(Box(8694, 8694), Box(8694, 8694)),
+ Box(Box(8695, 8695), Box(8695, 8695)),
+ Box(Box(8696, 8696), Box(8696, 8696)),
+ Box(Box(8697, 8697), Box(8697, 8697)),
+ Box(Box(8698, 8698), Box(8698, 8698)),
+ Box(Box(8699, 8699), Box(8699, 8699)),
+ Box(Box(8700, 8700), Box(8700, 8700)),
+ Box(Box(8701, 8701), Box(8701, 8701)),
+ Box(Box(8702, 8702), Box(8702, 8702)),
+ Box(Box(8703, 8703), Box(8703, 8703)),
+ Box(Box(8704, 8704), Box(8704, 8704)),
+ Box(Box(8705, 8705), Box(8705, 8705)),
+ Box(Box(8706, 8706), Box(8706, 8706)),
+ Box(Box(8707, 8707), Box(8707, 8707)),
+ Box(Box(8708, 8708), Box(8708, 8708)),
+ Box(Box(8709, 8709), Box(8709, 8709)),
+ Box(Box(8710, 8710), Box(8710, 8710)),
+ Box(Box(8711, 8711), Box(8711, 8711)),
+ Box(Box(8712, 8712), Box(8712, 8712)),
+ Box(Box(8713, 8713), Box(8713, 8713)),
+ Box(Box(8714, 8714), Box(8714, 8714)),
+ Box(Box(8715, 8715), Box(8715, 8715)),
+ Box(Box(8716, 8716), Box(8716, 8716)),
+ Box(Box(8717, 8717), Box(8717, 8717)),
+ Box(Box(8718, 8718), Box(8718, 8718)),
+ Box(Box(8719, 8719), Box(8719, 8719)),
+ Box(Box(8720, 8720), Box(8720, 8720)),
+ Box(Box(8721, 8721), Box(8721, 8721)),
+ Box(Box(8722, 8722), Box(8722, 8722)),
+ Box(Box(8723, 8723), Box(8723, 8723)),
+ Box(Box(8724, 8724), Box(8724, 8724)),
+ Box(Box(8725, 8725), Box(8725, 8725)),
+ Box(Box(8726, 8726), Box(8726, 8726)),
+ Box(Box(8727, 8727), Box(8727, 8727)),
+ Box(Box(8728, 8728), Box(8728, 8728)),
+ Box(Box(8729, 8729), Box(8729, 8729)),
+ Box(Box(8730, 8730), Box(8730, 8730)),
+ Box(Box(8731, 8731), Box(8731, 8731)),
+ Box(Box(8732, 8732), Box(8732, 8732)),
+ Box(Box(8733, 8733), Box(8733, 8733)),
+ Box(Box(8734, 8734), Box(8734, 8734)),
+ Box(Box(8735, 8735), Box(8735, 8735)),
+ Box(Box(8736, 8736), Box(8736, 8736)),
+ Box(Box(8737, 8737), Box(8737, 8737)),
+ Box(Box(8738, 8738), Box(8738, 8738)),
+ Box(Box(8739, 8739), Box(8739, 8739)),
+ Box(Box(8740, 8740), Box(8740, 8740)),
+ Box(Box(8741, 8741), Box(8741, 8741)),
+ Box(Box(8742, 8742), Box(8742, 8742)),
+ Box(Box(8743, 8743), Box(8743, 8743)),
+ Box(Box(8744, 8744), Box(8744, 8744)),
+ Box(Box(8745, 8745), Box(8745, 8745)),
+ Box(Box(8746, 8746), Box(8746, 8746)),
+ Box(Box(8747, 8747), Box(8747, 8747)),
+ Box(Box(8748, 8748), Box(8748, 8748)),
+ Box(Box(8749, 8749), Box(8749, 8749)),
+ Box(Box(8750, 8750), Box(8750, 8750)),
+ Box(Box(8751, 8751), Box(8751, 8751)),
+ Box(Box(8752, 8752), Box(8752, 8752)),
+ Box(Box(8753, 8753), Box(8753, 8753)),
+ Box(Box(8754, 8754), Box(8754, 8754)),
+ Box(Box(8755, 8755), Box(8755, 8755)),
+ Box(Box(8756, 8756), Box(8756, 8756)),
+ Box(Box(8757, 8757), Box(8757, 8757)),
+ Box(Box(8758, 8758), Box(8758, 8758)),
+ Box(Box(8759, 8759), Box(8759, 8759)),
+ Box(Box(8760, 8760), Box(8760, 8760)),
+ Box(Box(8761, 8761), Box(8761, 8761)),
+ Box(Box(8762, 8762), Box(8762, 8762)),
+ Box(Box(8763, 8763), Box(8763, 8763)),
+ Box(Box(8764, 8764), Box(8764, 8764)),
+ Box(Box(8765, 8765), Box(8765, 8765)),
+ Box(Box(8766, 8766), Box(8766, 8766)),
+ Box(Box(8767, 8767), Box(8767, 8767)),
+ Box(Box(8768, 8768), Box(8768, 8768)),
+ Box(Box(8769, 8769), Box(8769, 8769)),
+ Box(Box(8770, 8770), Box(8770, 8770)),
+ Box(Box(8771, 8771), Box(8771, 8771)),
+ Box(Box(8772, 8772), Box(8772, 8772)),
+ Box(Box(8773, 8773), Box(8773, 8773)),
+ Box(Box(8774, 8774), Box(8774, 8774)),
+ Box(Box(8775, 8775), Box(8775, 8775)),
+ Box(Box(8776, 8776), Box(8776, 8776)),
+ Box(Box(8777, 8777), Box(8777, 8777)),
+ Box(Box(8778, 8778), Box(8778, 8778)),
+ Box(Box(8779, 8779), Box(8779, 8779)),
+ Box(Box(8780, 8780), Box(8780, 8780)),
+ Box(Box(8781, 8781), Box(8781, 8781)),
+ Box(Box(8782, 8782), Box(8782, 8782)),
+ Box(Box(8783, 8783), Box(8783, 8783)),
+ Box(Box(8784, 8784), Box(8784, 8784)),
+ Box(Box(8785, 8785), Box(8785, 8785)),
+ Box(Box(8786, 8786), Box(8786, 8786)),
+ Box(Box(8787, 8787), Box(8787, 8787)),
+ Box(Box(8788, 8788), Box(8788, 8788)),
+ Box(Box(8789, 8789), Box(8789, 8789)),
+ Box(Box(8790, 8790), Box(8790, 8790)),
+ Box(Box(8791, 8791), Box(8791, 8791)),
+ Box(Box(8792, 8792), Box(8792, 8792)),
+ Box(Box(8793, 8793), Box(8793, 8793)),
+ Box(Box(8794, 8794), Box(8794, 8794)),
+ Box(Box(8795, 8795), Box(8795, 8795)),
+ Box(Box(8796, 8796), Box(8796, 8796)),
+ Box(Box(8797, 8797), Box(8797, 8797)),
+ Box(Box(8798, 8798), Box(8798, 8798)),
+ Box(Box(8799, 8799), Box(8799, 8799)),
+ Box(Box(8800, 8800), Box(8800, 8800)),
+ Box(Box(8801, 8801), Box(8801, 8801)),
+ Box(Box(8802, 8802), Box(8802, 8802)),
+ Box(Box(8803, 8803), Box(8803, 8803)),
+ Box(Box(8804, 8804), Box(8804, 8804)),
+ Box(Box(8805, 8805), Box(8805, 8805)),
+ Box(Box(8806, 8806), Box(8806, 8806)),
+ Box(Box(8807, 8807), Box(8807, 8807)),
+ Box(Box(8808, 8808), Box(8808, 8808)),
+ Box(Box(8809, 8809), Box(8809, 8809)),
+ Box(Box(8810, 8810), Box(8810, 8810)),
+ Box(Box(8811, 8811), Box(8811, 8811)),
+ Box(Box(8812, 8812), Box(8812, 8812)),
+ Box(Box(8813, 8813), Box(8813, 8813)),
+ Box(Box(8814, 8814), Box(8814, 8814)),
+ Box(Box(8815, 8815), Box(8815, 8815)),
+ Box(Box(8816, 8816), Box(8816, 8816)),
+ Box(Box(8817, 8817), Box(8817, 8817)),
+ Box(Box(8818, 8818), Box(8818, 8818)),
+ Box(Box(8819, 8819), Box(8819, 8819)),
+ Box(Box(8820, 8820), Box(8820, 8820)),
+ Box(Box(8821, 8821), Box(8821, 8821)),
+ Box(Box(8822, 8822), Box(8822, 8822)),
+ Box(Box(8823, 8823), Box(8823, 8823)),
+ Box(Box(8824, 8824), Box(8824, 8824)),
+ Box(Box(8825, 8825), Box(8825, 8825)),
+ Box(Box(8826, 8826), Box(8826, 8826)),
+ Box(Box(8827, 8827), Box(8827, 8827)),
+ Box(Box(8828, 8828), Box(8828, 8828)),
+ Box(Box(8829, 8829), Box(8829, 8829)),
+ Box(Box(8830, 8830), Box(8830, 8830)),
+ Box(Box(8831, 8831), Box(8831, 8831)),
+ Box(Box(8832, 8832), Box(8832, 8832)),
+ Box(Box(8833, 8833), Box(8833, 8833)),
+ Box(Box(8834, 8834), Box(8834, 8834)),
+ Box(Box(8835, 8835), Box(8835, 8835)),
+ Box(Box(8836, 8836), Box(8836, 8836)),
+ Box(Box(8837, 8837), Box(8837, 8837)),
+ Box(Box(8838, 8838), Box(8838, 8838)),
+ Box(Box(8839, 8839), Box(8839, 8839)),
+ Box(Box(8840, 8840), Box(8840, 8840)),
+ Box(Box(8841, 8841), Box(8841, 8841)),
+ Box(Box(8842, 8842), Box(8842, 8842)),
+ Box(Box(8843, 8843), Box(8843, 8843)),
+ Box(Box(8844, 8844), Box(8844, 8844)),
+ Box(Box(8845, 8845), Box(8845, 8845)),
+ Box(Box(8846, 8846), Box(8846, 8846)),
+ Box(Box(8847, 8847), Box(8847, 8847)),
+ Box(Box(8848, 8848), Box(8848, 8848)),
+ Box(Box(8849, 8849), Box(8849, 8849)),
+ Box(Box(8850, 8850), Box(8850, 8850)),
+ Box(Box(8851, 8851), Box(8851, 8851)),
+ Box(Box(8852, 8852), Box(8852, 8852)),
+ Box(Box(8853, 8853), Box(8853, 8853)),
+ Box(Box(8854, 8854), Box(8854, 8854)),
+ Box(Box(8855, 8855), Box(8855, 8855)),
+ Box(Box(8856, 8856), Box(8856, 8856)),
+ Box(Box(8857, 8857), Box(8857, 8857)),
+ Box(Box(8858, 8858), Box(8858, 8858)),
+ Box(Box(8859, 8859), Box(8859, 8859)),
+ Box(Box(8860, 8860), Box(8860, 8860)),
+ Box(Box(8861, 8861), Box(8861, 8861)),
+ Box(Box(8862, 8862), Box(8862, 8862)),
+ Box(Box(8863, 8863), Box(8863, 8863)),
+ Box(Box(8864, 8864), Box(8864, 8864)),
+ Box(Box(8865, 8865), Box(8865, 8865)),
+ Box(Box(8866, 8866), Box(8866, 8866)),
+ Box(Box(8867, 8867), Box(8867, 8867)),
+ Box(Box(8868, 8868), Box(8868, 8868)),
+ Box(Box(8869, 8869), Box(8869, 8869)),
+ Box(Box(8870, 8870), Box(8870, 8870)),
+ Box(Box(8871, 8871), Box(8871, 8871)),
+ Box(Box(8872, 8872), Box(8872, 8872)),
+ Box(Box(8873, 8873), Box(8873, 8873)),
+ Box(Box(8874, 8874), Box(8874, 8874)),
+ Box(Box(8875, 8875), Box(8875, 8875)),
+ Box(Box(8876, 8876), Box(8876, 8876)),
+ Box(Box(8877, 8877), Box(8877, 8877)),
+ Box(Box(8878, 8878), Box(8878, 8878)),
+ Box(Box(8879, 8879), Box(8879, 8879)),
+ Box(Box(8880, 8880), Box(8880, 8880)),
+ Box(Box(8881, 8881), Box(8881, 8881)),
+ Box(Box(8882, 8882), Box(8882, 8882)),
+ Box(Box(8883, 8883), Box(8883, 8883)),
+ Box(Box(8884, 8884), Box(8884, 8884)),
+ Box(Box(8885, 8885), Box(8885, 8885)),
+ Box(Box(8886, 8886), Box(8886, 8886)),
+ Box(Box(8887, 8887), Box(8887, 8887)),
+ Box(Box(8888, 8888), Box(8888, 8888)),
+ Box(Box(8889, 8889), Box(8889, 8889)),
+ Box(Box(8890, 8890), Box(8890, 8890)),
+ Box(Box(8891, 8891), Box(8891, 8891)),
+ Box(Box(8892, 8892), Box(8892, 8892)),
+ Box(Box(8893, 8893), Box(8893, 8893)),
+ Box(Box(8894, 8894), Box(8894, 8894)),
+ Box(Box(8895, 8895), Box(8895, 8895)),
+ Box(Box(8896, 8896), Box(8896, 8896)),
+ Box(Box(8897, 8897), Box(8897, 8897)),
+ Box(Box(8898, 8898), Box(8898, 8898)),
+ Box(Box(8899, 8899), Box(8899, 8899)),
+ Box(Box(8900, 8900), Box(8900, 8900)),
+ Box(Box(8901, 8901), Box(8901, 8901)),
+ Box(Box(8902, 8902), Box(8902, 8902)),
+ Box(Box(8903, 8903), Box(8903, 8903)),
+ Box(Box(8904, 8904), Box(8904, 8904)),
+ Box(Box(8905, 8905), Box(8905, 8905)),
+ Box(Box(8906, 8906), Box(8906, 8906)),
+ Box(Box(8907, 8907), Box(8907, 8907)),
+ Box(Box(8908, 8908), Box(8908, 8908)),
+ Box(Box(8909, 8909), Box(8909, 8909)),
+ Box(Box(8910, 8910), Box(8910, 8910)),
+ Box(Box(8911, 8911), Box(8911, 8911)),
+ Box(Box(8912, 8912), Box(8912, 8912)),
+ Box(Box(8913, 8913), Box(8913, 8913)),
+ Box(Box(8914, 8914), Box(8914, 8914)),
+ Box(Box(8915, 8915), Box(8915, 8915)),
+ Box(Box(8916, 8916), Box(8916, 8916)),
+ Box(Box(8917, 8917), Box(8917, 8917)),
+ Box(Box(8918, 8918), Box(8918, 8918)),
+ Box(Box(8919, 8919), Box(8919, 8919)),
+ Box(Box(8920, 8920), Box(8920, 8920)),
+ Box(Box(8921, 8921), Box(8921, 8921)),
+ Box(Box(8922, 8922), Box(8922, 8922)),
+ Box(Box(8923, 8923), Box(8923, 8923)),
+ Box(Box(8924, 8924), Box(8924, 8924)),
+ Box(Box(8925, 8925), Box(8925, 8925)),
+ Box(Box(8926, 8926), Box(8926, 8926)),
+ Box(Box(8927, 8927), Box(8927, 8927)),
+ Box(Box(8928, 8928), Box(8928, 8928)),
+ Box(Box(8929, 8929), Box(8929, 8929)),
+ Box(Box(8930, 8930), Box(8930, 8930)),
+ Box(Box(8931, 8931), Box(8931, 8931)),
+ Box(Box(8932, 8932), Box(8932, 8932)),
+ Box(Box(8933, 8933), Box(8933, 8933)),
+ Box(Box(8934, 8934), Box(8934, 8934)),
+ Box(Box(8935, 8935), Box(8935, 8935)),
+ Box(Box(8936, 8936), Box(8936, 8936)),
+ Box(Box(8937, 8937), Box(8937, 8937)),
+ Box(Box(8938, 8938), Box(8938, 8938)),
+ Box(Box(8939, 8939), Box(8939, 8939)),
+ Box(Box(8940, 8940), Box(8940, 8940)),
+ Box(Box(8941, 8941), Box(8941, 8941)),
+ Box(Box(8942, 8942), Box(8942, 8942)),
+ Box(Box(8943, 8943), Box(8943, 8943)),
+ Box(Box(8944, 8944), Box(8944, 8944)),
+ Box(Box(8945, 8945), Box(8945, 8945)),
+ Box(Box(8946, 8946), Box(8946, 8946)),
+ Box(Box(8947, 8947), Box(8947, 8947)),
+ Box(Box(8948, 8948), Box(8948, 8948)),
+ Box(Box(8949, 8949), Box(8949, 8949)),
+ Box(Box(8950, 8950), Box(8950, 8950)),
+ Box(Box(8951, 8951), Box(8951, 8951)),
+ Box(Box(8952, 8952), Box(8952, 8952)),
+ Box(Box(8953, 8953), Box(8953, 8953)),
+ Box(Box(8954, 8954), Box(8954, 8954)),
+ Box(Box(8955, 8955), Box(8955, 8955)),
+ Box(Box(8956, 8956), Box(8956, 8956)),
+ Box(Box(8957, 8957), Box(8957, 8957)),
+ Box(Box(8958, 8958), Box(8958, 8958)),
+ Box(Box(8959, 8959), Box(8959, 8959)),
+ Box(Box(8960, 8960), Box(8960, 8960)),
+ Box(Box(8961, 8961), Box(8961, 8961)),
+ Box(Box(8962, 8962), Box(8962, 8962)),
+ Box(Box(8963, 8963), Box(8963, 8963)),
+ Box(Box(8964, 8964), Box(8964, 8964)),
+ Box(Box(8965, 8965), Box(8965, 8965)),
+ Box(Box(8966, 8966), Box(8966, 8966)),
+ Box(Box(8967, 8967), Box(8967, 8967)),
+ Box(Box(8968, 8968), Box(8968, 8968)),
+ Box(Box(8969, 8969), Box(8969, 8969)),
+ Box(Box(8970, 8970), Box(8970, 8970)),
+ Box(Box(8971, 8971), Box(8971, 8971)),
+ Box(Box(8972, 8972), Box(8972, 8972)),
+ Box(Box(8973, 8973), Box(8973, 8973)),
+ Box(Box(8974, 8974), Box(8974, 8974)),
+ Box(Box(8975, 8975), Box(8975, 8975)),
+ Box(Box(8976, 8976), Box(8976, 8976)),
+ Box(Box(8977, 8977), Box(8977, 8977)),
+ Box(Box(8978, 8978), Box(8978, 8978)),
+ Box(Box(8979, 8979), Box(8979, 8979)),
+ Box(Box(8980, 8980), Box(8980, 8980)),
+ Box(Box(8981, 8981), Box(8981, 8981)),
+ Box(Box(8982, 8982), Box(8982, 8982)),
+ Box(Box(8983, 8983), Box(8983, 8983)),
+ Box(Box(8984, 8984), Box(8984, 8984)),
+ Box(Box(8985, 8985), Box(8985, 8985)),
+ Box(Box(8986, 8986), Box(8986, 8986)),
+ Box(Box(8987, 8987), Box(8987, 8987)),
+ Box(Box(8988, 8988), Box(8988, 8988)),
+ Box(Box(8989, 8989), Box(8989, 8989)),
+ Box(Box(8990, 8990), Box(8990, 8990)),
+ Box(Box(8991, 8991), Box(8991, 8991)),
+ Box(Box(8992, 8992), Box(8992, 8992)),
+ Box(Box(8993, 8993), Box(8993, 8993)),
+ Box(Box(8994, 8994), Box(8994, 8994)),
+ Box(Box(8995, 8995), Box(8995, 8995)),
+ Box(Box(8996, 8996), Box(8996, 8996)),
+ Box(Box(8997, 8997), Box(8997, 8997)),
+ Box(Box(8998, 8998), Box(8998, 8998)),
+ Box(Box(8999, 8999), Box(8999, 8999)),
+ Box(Box(9000, 9000), Box(9000, 9000)),
+ Box(Box(9001, 9001), Box(9001, 9001)),
+ Box(Box(9002, 9002), Box(9002, 9002)),
+ Box(Box(9003, 9003), Box(9003, 9003)),
+ Box(Box(9004, 9004), Box(9004, 9004)),
+ Box(Box(9005, 9005), Box(9005, 9005)),
+ Box(Box(9006, 9006), Box(9006, 9006)),
+ Box(Box(9007, 9007), Box(9007, 9007)),
+ Box(Box(9008, 9008), Box(9008, 9008)),
+ Box(Box(9009, 9009), Box(9009, 9009)),
+ Box(Box(9010, 9010), Box(9010, 9010)),
+ Box(Box(9011, 9011), Box(9011, 9011)),
+ Box(Box(9012, 9012), Box(9012, 9012)),
+ Box(Box(9013, 9013), Box(9013, 9013)),
+ Box(Box(9014, 9014), Box(9014, 9014)),
+ Box(Box(9015, 9015), Box(9015, 9015)),
+ Box(Box(9016, 9016), Box(9016, 9016)),
+ Box(Box(9017, 9017), Box(9017, 9017)),
+ Box(Box(9018, 9018), Box(9018, 9018)),
+ Box(Box(9019, 9019), Box(9019, 9019)),
+ Box(Box(9020, 9020), Box(9020, 9020)),
+ Box(Box(9021, 9021), Box(9021, 9021)),
+ Box(Box(9022, 9022), Box(9022, 9022)),
+ Box(Box(9023, 9023), Box(9023, 9023)),
+ Box(Box(9024, 9024), Box(9024, 9024)),
+ Box(Box(9025, 9025), Box(9025, 9025)),
+ Box(Box(9026, 9026), Box(9026, 9026)),
+ Box(Box(9027, 9027), Box(9027, 9027)),
+ Box(Box(9028, 9028), Box(9028, 9028)),
+ Box(Box(9029, 9029), Box(9029, 9029)),
+ Box(Box(9030, 9030), Box(9030, 9030)),
+ Box(Box(9031, 9031), Box(9031, 9031)),
+ Box(Box(9032, 9032), Box(9032, 9032)),
+ Box(Box(9033, 9033), Box(9033, 9033)),
+ Box(Box(9034, 9034), Box(9034, 9034)),
+ Box(Box(9035, 9035), Box(9035, 9035)),
+ Box(Box(9036, 9036), Box(9036, 9036)),
+ Box(Box(9037, 9037), Box(9037, 9037)),
+ Box(Box(9038, 9038), Box(9038, 9038)),
+ Box(Box(9039, 9039), Box(9039, 9039)),
+ Box(Box(9040, 9040), Box(9040, 9040)),
+ Box(Box(9041, 9041), Box(9041, 9041)),
+ Box(Box(9042, 9042), Box(9042, 9042)),
+ Box(Box(9043, 9043), Box(9043, 9043)),
+ Box(Box(9044, 9044), Box(9044, 9044)),
+ Box(Box(9045, 9045), Box(9045, 9045)),
+ Box(Box(9046, 9046), Box(9046, 9046)),
+ Box(Box(9047, 9047), Box(9047, 9047)),
+ Box(Box(9048, 9048), Box(9048, 9048)),
+ Box(Box(9049, 9049), Box(9049, 9049)),
+ Box(Box(9050, 9050), Box(9050, 9050)),
+ Box(Box(9051, 9051), Box(9051, 9051)),
+ Box(Box(9052, 9052), Box(9052, 9052)),
+ Box(Box(9053, 9053), Box(9053, 9053)),
+ Box(Box(9054, 9054), Box(9054, 9054)),
+ Box(Box(9055, 9055), Box(9055, 9055)),
+ Box(Box(9056, 9056), Box(9056, 9056)),
+ Box(Box(9057, 9057), Box(9057, 9057)),
+ Box(Box(9058, 9058), Box(9058, 9058)),
+ Box(Box(9059, 9059), Box(9059, 9059)),
+ Box(Box(9060, 9060), Box(9060, 9060)),
+ Box(Box(9061, 9061), Box(9061, 9061)),
+ Box(Box(9062, 9062), Box(9062, 9062)),
+ Box(Box(9063, 9063), Box(9063, 9063)),
+ Box(Box(9064, 9064), Box(9064, 9064)),
+ Box(Box(9065, 9065), Box(9065, 9065)),
+ Box(Box(9066, 9066), Box(9066, 9066)),
+ Box(Box(9067, 9067), Box(9067, 9067)),
+ Box(Box(9068, 9068), Box(9068, 9068)),
+ Box(Box(9069, 9069), Box(9069, 9069)),
+ Box(Box(9070, 9070), Box(9070, 9070)),
+ Box(Box(9071, 9071), Box(9071, 9071)),
+ Box(Box(9072, 9072), Box(9072, 9072)),
+ Box(Box(9073, 9073), Box(9073, 9073)),
+ Box(Box(9074, 9074), Box(9074, 9074)),
+ Box(Box(9075, 9075), Box(9075, 9075)),
+ Box(Box(9076, 9076), Box(9076, 9076)),
+ Box(Box(9077, 9077), Box(9077, 9077)),
+ Box(Box(9078, 9078), Box(9078, 9078)),
+ Box(Box(9079, 9079), Box(9079, 9079)),
+ Box(Box(9080, 9080), Box(9080, 9080)),
+ Box(Box(9081, 9081), Box(9081, 9081)),
+ Box(Box(9082, 9082), Box(9082, 9082)),
+ Box(Box(9083, 9083), Box(9083, 9083)),
+ Box(Box(9084, 9084), Box(9084, 9084)),
+ Box(Box(9085, 9085), Box(9085, 9085)),
+ Box(Box(9086, 9086), Box(9086, 9086)),
+ Box(Box(9087, 9087), Box(9087, 9087)),
+ Box(Box(9088, 9088), Box(9088, 9088)),
+ Box(Box(9089, 9089), Box(9089, 9089)),
+ Box(Box(9090, 9090), Box(9090, 9090)),
+ Box(Box(9091, 9091), Box(9091, 9091)),
+ Box(Box(9092, 9092), Box(9092, 9092)),
+ Box(Box(9093, 9093), Box(9093, 9093)),
+ Box(Box(9094, 9094), Box(9094, 9094)),
+ Box(Box(9095, 9095), Box(9095, 9095)),
+ Box(Box(9096, 9096), Box(9096, 9096)),
+ Box(Box(9097, 9097), Box(9097, 9097)),
+ Box(Box(9098, 9098), Box(9098, 9098)),
+ Box(Box(9099, 9099), Box(9099, 9099)),
+ Box(Box(9100, 9100), Box(9100, 9100)),
+ Box(Box(9101, 9101), Box(9101, 9101)),
+ Box(Box(9102, 9102), Box(9102, 9102)),
+ Box(Box(9103, 9103), Box(9103, 9103)),
+ Box(Box(9104, 9104), Box(9104, 9104)),
+ Box(Box(9105, 9105), Box(9105, 9105)),
+ Box(Box(9106, 9106), Box(9106, 9106)),
+ Box(Box(9107, 9107), Box(9107, 9107)),
+ Box(Box(9108, 9108), Box(9108, 9108)),
+ Box(Box(9109, 9109), Box(9109, 9109)),
+ Box(Box(9110, 9110), Box(9110, 9110)),
+ Box(Box(9111, 9111), Box(9111, 9111)),
+ Box(Box(9112, 9112), Box(9112, 9112)),
+ Box(Box(9113, 9113), Box(9113, 9113)),
+ Box(Box(9114, 9114), Box(9114, 9114)),
+ Box(Box(9115, 9115), Box(9115, 9115)),
+ Box(Box(9116, 9116), Box(9116, 9116)),
+ Box(Box(9117, 9117), Box(9117, 9117)),
+ Box(Box(9118, 9118), Box(9118, 9118)),
+ Box(Box(9119, 9119), Box(9119, 9119)),
+ Box(Box(9120, 9120), Box(9120, 9120)),
+ Box(Box(9121, 9121), Box(9121, 9121)),
+ Box(Box(9122, 9122), Box(9122, 9122)),
+ Box(Box(9123, 9123), Box(9123, 9123)),
+ Box(Box(9124, 9124), Box(9124, 9124)),
+ Box(Box(9125, 9125), Box(9125, 9125)),
+ Box(Box(9126, 9126), Box(9126, 9126)),
+ Box(Box(9127, 9127), Box(9127, 9127)),
+ Box(Box(9128, 9128), Box(9128, 9128)),
+ Box(Box(9129, 9129), Box(9129, 9129)),
+ Box(Box(9130, 9130), Box(9130, 9130)),
+ Box(Box(9131, 9131), Box(9131, 9131)),
+ Box(Box(9132, 9132), Box(9132, 9132)),
+ Box(Box(9133, 9133), Box(9133, 9133)),
+ Box(Box(9134, 9134), Box(9134, 9134)),
+ Box(Box(9135, 9135), Box(9135, 9135)),
+ Box(Box(9136, 9136), Box(9136, 9136)),
+ Box(Box(9137, 9137), Box(9137, 9137)),
+ Box(Box(9138, 9138), Box(9138, 9138)),
+ Box(Box(9139, 9139), Box(9139, 9139)),
+ Box(Box(9140, 9140), Box(9140, 9140)),
+ Box(Box(9141, 9141), Box(9141, 9141)),
+ Box(Box(9142, 9142), Box(9142, 9142)),
+ Box(Box(9143, 9143), Box(9143, 9143)),
+ Box(Box(9144, 9144), Box(9144, 9144)),
+ Box(Box(9145, 9145), Box(9145, 9145)),
+ Box(Box(9146, 9146), Box(9146, 9146)),
+ Box(Box(9147, 9147), Box(9147, 9147)),
+ Box(Box(9148, 9148), Box(9148, 9148)),
+ Box(Box(9149, 9149), Box(9149, 9149)),
+ Box(Box(9150, 9150), Box(9150, 9150)),
+ Box(Box(9151, 9151), Box(9151, 9151)),
+ Box(Box(9152, 9152), Box(9152, 9152)),
+ Box(Box(9153, 9153), Box(9153, 9153)),
+ Box(Box(9154, 9154), Box(9154, 9154)),
+ Box(Box(9155, 9155), Box(9155, 9155)),
+ Box(Box(9156, 9156), Box(9156, 9156)),
+ Box(Box(9157, 9157), Box(9157, 9157)),
+ Box(Box(9158, 9158), Box(9158, 9158)),
+ Box(Box(9159, 9159), Box(9159, 9159)),
+ Box(Box(9160, 9160), Box(9160, 9160)),
+ Box(Box(9161, 9161), Box(9161, 9161)),
+ Box(Box(9162, 9162), Box(9162, 9162)),
+ Box(Box(9163, 9163), Box(9163, 9163)),
+ Box(Box(9164, 9164), Box(9164, 9164)),
+ Box(Box(9165, 9165), Box(9165, 9165)),
+ Box(Box(9166, 9166), Box(9166, 9166)),
+ Box(Box(9167, 9167), Box(9167, 9167)),
+ Box(Box(9168, 9168), Box(9168, 9168)),
+ Box(Box(9169, 9169), Box(9169, 9169)),
+ Box(Box(9170, 9170), Box(9170, 9170)),
+ Box(Box(9171, 9171), Box(9171, 9171)),
+ Box(Box(9172, 9172), Box(9172, 9172)),
+ Box(Box(9173, 9173), Box(9173, 9173)),
+ Box(Box(9174, 9174), Box(9174, 9174)),
+ Box(Box(9175, 9175), Box(9175, 9175)),
+ Box(Box(9176, 9176), Box(9176, 9176)),
+ Box(Box(9177, 9177), Box(9177, 9177)),
+ Box(Box(9178, 9178), Box(9178, 9178)),
+ Box(Box(9179, 9179), Box(9179, 9179)),
+ Box(Box(9180, 9180), Box(9180, 9180)),
+ Box(Box(9181, 9181), Box(9181, 9181)),
+ Box(Box(9182, 9182), Box(9182, 9182)),
+ Box(Box(9183, 9183), Box(9183, 9183)),
+ Box(Box(9184, 9184), Box(9184, 9184)),
+ Box(Box(9185, 9185), Box(9185, 9185)),
+ Box(Box(9186, 9186), Box(9186, 9186)),
+ Box(Box(9187, 9187), Box(9187, 9187)),
+ Box(Box(9188, 9188), Box(9188, 9188)),
+ Box(Box(9189, 9189), Box(9189, 9189)),
+ Box(Box(9190, 9190), Box(9190, 9190)),
+ Box(Box(9191, 9191), Box(9191, 9191)),
+ Box(Box(9192, 9192), Box(9192, 9192)),
+ Box(Box(9193, 9193), Box(9193, 9193)),
+ Box(Box(9194, 9194), Box(9194, 9194)),
+ Box(Box(9195, 9195), Box(9195, 9195)),
+ Box(Box(9196, 9196), Box(9196, 9196)),
+ Box(Box(9197, 9197), Box(9197, 9197)),
+ Box(Box(9198, 9198), Box(9198, 9198)),
+ Box(Box(9199, 9199), Box(9199, 9199)),
+ Box(Box(9200, 9200), Box(9200, 9200)),
+ Box(Box(9201, 9201), Box(9201, 9201)),
+ Box(Box(9202, 9202), Box(9202, 9202)),
+ Box(Box(9203, 9203), Box(9203, 9203)),
+ Box(Box(9204, 9204), Box(9204, 9204)),
+ Box(Box(9205, 9205), Box(9205, 9205)),
+ Box(Box(9206, 9206), Box(9206, 9206)),
+ Box(Box(9207, 9207), Box(9207, 9207)),
+ Box(Box(9208, 9208), Box(9208, 9208)),
+ Box(Box(9209, 9209), Box(9209, 9209)),
+ Box(Box(9210, 9210), Box(9210, 9210)),
+ Box(Box(9211, 9211), Box(9211, 9211)),
+ Box(Box(9212, 9212), Box(9212, 9212)),
+ Box(Box(9213, 9213), Box(9213, 9213)),
+ Box(Box(9214, 9214), Box(9214, 9214)),
+ Box(Box(9215, 9215), Box(9215, 9215)),
+ Box(Box(9216, 9216), Box(9216, 9216)),
+ Box(Box(9217, 9217), Box(9217, 9217)),
+ Box(Box(9218, 9218), Box(9218, 9218)),
+ Box(Box(9219, 9219), Box(9219, 9219)),
+ Box(Box(9220, 9220), Box(9220, 9220)),
+ Box(Box(9221, 9221), Box(9221, 9221)),
+ Box(Box(9222, 9222), Box(9222, 9222)),
+ Box(Box(9223, 9223), Box(9223, 9223)),
+ Box(Box(9224, 9224), Box(9224, 9224)),
+ Box(Box(9225, 9225), Box(9225, 9225)),
+ Box(Box(9226, 9226), Box(9226, 9226)),
+ Box(Box(9227, 9227), Box(9227, 9227)),
+ Box(Box(9228, 9228), Box(9228, 9228)),
+ Box(Box(9229, 9229), Box(9229, 9229)),
+ Box(Box(9230, 9230), Box(9230, 9230)),
+ Box(Box(9231, 9231), Box(9231, 9231)),
+ Box(Box(9232, 9232), Box(9232, 9232)),
+ Box(Box(9233, 9233), Box(9233, 9233)),
+ Box(Box(9234, 9234), Box(9234, 9234)),
+ Box(Box(9235, 9235), Box(9235, 9235)),
+ Box(Box(9236, 9236), Box(9236, 9236)),
+ Box(Box(9237, 9237), Box(9237, 9237)),
+ Box(Box(9238, 9238), Box(9238, 9238)),
+ Box(Box(9239, 9239), Box(9239, 9239)),
+ Box(Box(9240, 9240), Box(9240, 9240)),
+ Box(Box(9241, 9241), Box(9241, 9241)),
+ Box(Box(9242, 9242), Box(9242, 9242)),
+ Box(Box(9243, 9243), Box(9243, 9243)),
+ Box(Box(9244, 9244), Box(9244, 9244)),
+ Box(Box(9245, 9245), Box(9245, 9245)),
+ Box(Box(9246, 9246), Box(9246, 9246)),
+ Box(Box(9247, 9247), Box(9247, 9247)),
+ Box(Box(9248, 9248), Box(9248, 9248)),
+ Box(Box(9249, 9249), Box(9249, 9249)),
+ Box(Box(9250, 9250), Box(9250, 9250)),
+ Box(Box(9251, 9251), Box(9251, 9251)),
+ Box(Box(9252, 9252), Box(9252, 9252)),
+ Box(Box(9253, 9253), Box(9253, 9253)),
+ Box(Box(9254, 9254), Box(9254, 9254)),
+ Box(Box(9255, 9255), Box(9255, 9255)),
+ Box(Box(9256, 9256), Box(9256, 9256)),
+ Box(Box(9257, 9257), Box(9257, 9257)),
+ Box(Box(9258, 9258), Box(9258, 9258)),
+ Box(Box(9259, 9259), Box(9259, 9259)),
+ Box(Box(9260, 9260), Box(9260, 9260)),
+ Box(Box(9261, 9261), Box(9261, 9261)),
+ Box(Box(9262, 9262), Box(9262, 9262)),
+ Box(Box(9263, 9263), Box(9263, 9263)),
+ Box(Box(9264, 9264), Box(9264, 9264)),
+ Box(Box(9265, 9265), Box(9265, 9265)),
+ Box(Box(9266, 9266), Box(9266, 9266)),
+ Box(Box(9267, 9267), Box(9267, 9267)),
+ Box(Box(9268, 9268), Box(9268, 9268)),
+ Box(Box(9269, 9269), Box(9269, 9269)),
+ Box(Box(9270, 9270), Box(9270, 9270)),
+ Box(Box(9271, 9271), Box(9271, 9271)),
+ Box(Box(9272, 9272), Box(9272, 9272)),
+ Box(Box(9273, 9273), Box(9273, 9273)),
+ Box(Box(9274, 9274), Box(9274, 9274)),
+ Box(Box(9275, 9275), Box(9275, 9275)),
+ Box(Box(9276, 9276), Box(9276, 9276)),
+ Box(Box(9277, 9277), Box(9277, 9277)),
+ Box(Box(9278, 9278), Box(9278, 9278)),
+ Box(Box(9279, 9279), Box(9279, 9279)),
+ Box(Box(9280, 9280), Box(9280, 9280)),
+ Box(Box(9281, 9281), Box(9281, 9281)),
+ Box(Box(9282, 9282), Box(9282, 9282)),
+ Box(Box(9283, 9283), Box(9283, 9283)),
+ Box(Box(9284, 9284), Box(9284, 9284)),
+ Box(Box(9285, 9285), Box(9285, 9285)),
+ Box(Box(9286, 9286), Box(9286, 9286)),
+ Box(Box(9287, 9287), Box(9287, 9287)),
+ Box(Box(9288, 9288), Box(9288, 9288)),
+ Box(Box(9289, 9289), Box(9289, 9289)),
+ Box(Box(9290, 9290), Box(9290, 9290)),
+ Box(Box(9291, 9291), Box(9291, 9291)),
+ Box(Box(9292, 9292), Box(9292, 9292)),
+ Box(Box(9293, 9293), Box(9293, 9293)),
+ Box(Box(9294, 9294), Box(9294, 9294)),
+ Box(Box(9295, 9295), Box(9295, 9295)),
+ Box(Box(9296, 9296), Box(9296, 9296)),
+ Box(Box(9297, 9297), Box(9297, 9297)),
+ Box(Box(9298, 9298), Box(9298, 9298)),
+ Box(Box(9299, 9299), Box(9299, 9299)),
+ Box(Box(9300, 9300), Box(9300, 9300)),
+ Box(Box(9301, 9301), Box(9301, 9301)),
+ Box(Box(9302, 9302), Box(9302, 9302)),
+ Box(Box(9303, 9303), Box(9303, 9303)),
+ Box(Box(9304, 9304), Box(9304, 9304)),
+ Box(Box(9305, 9305), Box(9305, 9305)),
+ Box(Box(9306, 9306), Box(9306, 9306)),
+ Box(Box(9307, 9307), Box(9307, 9307)),
+ Box(Box(9308, 9308), Box(9308, 9308)),
+ Box(Box(9309, 9309), Box(9309, 9309)),
+ Box(Box(9310, 9310), Box(9310, 9310)),
+ Box(Box(9311, 9311), Box(9311, 9311)),
+ Box(Box(9312, 9312), Box(9312, 9312)),
+ Box(Box(9313, 9313), Box(9313, 9313)),
+ Box(Box(9314, 9314), Box(9314, 9314)),
+ Box(Box(9315, 9315), Box(9315, 9315)),
+ Box(Box(9316, 9316), Box(9316, 9316)),
+ Box(Box(9317, 9317), Box(9317, 9317)),
+ Box(Box(9318, 9318), Box(9318, 9318)),
+ Box(Box(9319, 9319), Box(9319, 9319)),
+ Box(Box(9320, 9320), Box(9320, 9320)),
+ Box(Box(9321, 9321), Box(9321, 9321)),
+ Box(Box(9322, 9322), Box(9322, 9322)),
+ Box(Box(9323, 9323), Box(9323, 9323)),
+ Box(Box(9324, 9324), Box(9324, 9324)),
+ Box(Box(9325, 9325), Box(9325, 9325)),
+ Box(Box(9326, 9326), Box(9326, 9326)),
+ Box(Box(9327, 9327), Box(9327, 9327)),
+ Box(Box(9328, 9328), Box(9328, 9328)),
+ Box(Box(9329, 9329), Box(9329, 9329)),
+ Box(Box(9330, 9330), Box(9330, 9330)),
+ Box(Box(9331, 9331), Box(9331, 9331)),
+ Box(Box(9332, 9332), Box(9332, 9332)),
+ Box(Box(9333, 9333), Box(9333, 9333)),
+ Box(Box(9334, 9334), Box(9334, 9334)),
+ Box(Box(9335, 9335), Box(9335, 9335)),
+ Box(Box(9336, 9336), Box(9336, 9336)),
+ Box(Box(9337, 9337), Box(9337, 9337)),
+ Box(Box(9338, 9338), Box(9338, 9338)),
+ Box(Box(9339, 9339), Box(9339, 9339)),
+ Box(Box(9340, 9340), Box(9340, 9340)),
+ Box(Box(9341, 9341), Box(9341, 9341)),
+ Box(Box(9342, 9342), Box(9342, 9342)),
+ Box(Box(9343, 9343), Box(9343, 9343)),
+ Box(Box(9344, 9344), Box(9344, 9344)),
+ Box(Box(9345, 9345), Box(9345, 9345)),
+ Box(Box(9346, 9346), Box(9346, 9346)),
+ Box(Box(9347, 9347), Box(9347, 9347)),
+ Box(Box(9348, 9348), Box(9348, 9348)),
+ Box(Box(9349, 9349), Box(9349, 9349)),
+ Box(Box(9350, 9350), Box(9350, 9350)),
+ Box(Box(9351, 9351), Box(9351, 9351)),
+ Box(Box(9352, 9352), Box(9352, 9352)),
+ Box(Box(9353, 9353), Box(9353, 9353)),
+ Box(Box(9354, 9354), Box(9354, 9354)),
+ Box(Box(9355, 9355), Box(9355, 9355)),
+ Box(Box(9356, 9356), Box(9356, 9356)),
+ Box(Box(9357, 9357), Box(9357, 9357)),
+ Box(Box(9358, 9358), Box(9358, 9358)),
+ Box(Box(9359, 9359), Box(9359, 9359)),
+ Box(Box(9360, 9360), Box(9360, 9360)),
+ Box(Box(9361, 9361), Box(9361, 9361)),
+ Box(Box(9362, 9362), Box(9362, 9362)),
+ Box(Box(9363, 9363), Box(9363, 9363)),
+ Box(Box(9364, 9364), Box(9364, 9364)),
+ Box(Box(9365, 9365), Box(9365, 9365)),
+ Box(Box(9366, 9366), Box(9366, 9366)),
+ Box(Box(9367, 9367), Box(9367, 9367)),
+ Box(Box(9368, 9368), Box(9368, 9368)),
+ Box(Box(9369, 9369), Box(9369, 9369)),
+ Box(Box(9370, 9370), Box(9370, 9370)),
+ Box(Box(9371, 9371), Box(9371, 9371)),
+ Box(Box(9372, 9372), Box(9372, 9372)),
+ Box(Box(9373, 9373), Box(9373, 9373)),
+ Box(Box(9374, 9374), Box(9374, 9374)),
+ Box(Box(9375, 9375), Box(9375, 9375)),
+ Box(Box(9376, 9376), Box(9376, 9376)),
+ Box(Box(9377, 9377), Box(9377, 9377)),
+ Box(Box(9378, 9378), Box(9378, 9378)),
+ Box(Box(9379, 9379), Box(9379, 9379)),
+ Box(Box(9380, 9380), Box(9380, 9380)),
+ Box(Box(9381, 9381), Box(9381, 9381)),
+ Box(Box(9382, 9382), Box(9382, 9382)),
+ Box(Box(9383, 9383), Box(9383, 9383)),
+ Box(Box(9384, 9384), Box(9384, 9384)),
+ Box(Box(9385, 9385), Box(9385, 9385)),
+ Box(Box(9386, 9386), Box(9386, 9386)),
+ Box(Box(9387, 9387), Box(9387, 9387)),
+ Box(Box(9388, 9388), Box(9388, 9388)),
+ Box(Box(9389, 9389), Box(9389, 9389)),
+ Box(Box(9390, 9390), Box(9390, 9390)),
+ Box(Box(9391, 9391), Box(9391, 9391)),
+ Box(Box(9392, 9392), Box(9392, 9392)),
+ Box(Box(9393, 9393), Box(9393, 9393)),
+ Box(Box(9394, 9394), Box(9394, 9394)),
+ Box(Box(9395, 9395), Box(9395, 9395)),
+ Box(Box(9396, 9396), Box(9396, 9396)),
+ Box(Box(9397, 9397), Box(9397, 9397)),
+ Box(Box(9398, 9398), Box(9398, 9398)),
+ Box(Box(9399, 9399), Box(9399, 9399)),
+ Box(Box(9400, 9400), Box(9400, 9400)),
+ Box(Box(9401, 9401), Box(9401, 9401)),
+ Box(Box(9402, 9402), Box(9402, 9402)),
+ Box(Box(9403, 9403), Box(9403, 9403)),
+ Box(Box(9404, 9404), Box(9404, 9404)),
+ Box(Box(9405, 9405), Box(9405, 9405)),
+ Box(Box(9406, 9406), Box(9406, 9406)),
+ Box(Box(9407, 9407), Box(9407, 9407)),
+ Box(Box(9408, 9408), Box(9408, 9408)),
+ Box(Box(9409, 9409), Box(9409, 9409)),
+ Box(Box(9410, 9410), Box(9410, 9410)),
+ Box(Box(9411, 9411), Box(9411, 9411)),
+ Box(Box(9412, 9412), Box(9412, 9412)),
+ Box(Box(9413, 9413), Box(9413, 9413)),
+ Box(Box(9414, 9414), Box(9414, 9414)),
+ Box(Box(9415, 9415), Box(9415, 9415)),
+ Box(Box(9416, 9416), Box(9416, 9416)),
+ Box(Box(9417, 9417), Box(9417, 9417)),
+ Box(Box(9418, 9418), Box(9418, 9418)),
+ Box(Box(9419, 9419), Box(9419, 9419)),
+ Box(Box(9420, 9420), Box(9420, 9420)),
+ Box(Box(9421, 9421), Box(9421, 9421)),
+ Box(Box(9422, 9422), Box(9422, 9422)),
+ Box(Box(9423, 9423), Box(9423, 9423)),
+ Box(Box(9424, 9424), Box(9424, 9424)),
+ Box(Box(9425, 9425), Box(9425, 9425)),
+ Box(Box(9426, 9426), Box(9426, 9426)),
+ Box(Box(9427, 9427), Box(9427, 9427)),
+ Box(Box(9428, 9428), Box(9428, 9428)),
+ Box(Box(9429, 9429), Box(9429, 9429)),
+ Box(Box(9430, 9430), Box(9430, 9430)),
+ Box(Box(9431, 9431), Box(9431, 9431)),
+ Box(Box(9432, 9432), Box(9432, 9432)),
+ Box(Box(9433, 9433), Box(9433, 9433)),
+ Box(Box(9434, 9434), Box(9434, 9434)),
+ Box(Box(9435, 9435), Box(9435, 9435)),
+ Box(Box(9436, 9436), Box(9436, 9436)),
+ Box(Box(9437, 9437), Box(9437, 9437)),
+ Box(Box(9438, 9438), Box(9438, 9438)),
+ Box(Box(9439, 9439), Box(9439, 9439)),
+ Box(Box(9440, 9440), Box(9440, 9440)),
+ Box(Box(9441, 9441), Box(9441, 9441)),
+ Box(Box(9442, 9442), Box(9442, 9442)),
+ Box(Box(9443, 9443), Box(9443, 9443)),
+ Box(Box(9444, 9444), Box(9444, 9444)),
+ Box(Box(9445, 9445), Box(9445, 9445)),
+ Box(Box(9446, 9446), Box(9446, 9446)),
+ Box(Box(9447, 9447), Box(9447, 9447)),
+ Box(Box(9448, 9448), Box(9448, 9448)),
+ Box(Box(9449, 9449), Box(9449, 9449)),
+ Box(Box(9450, 9450), Box(9450, 9450)),
+ Box(Box(9451, 9451), Box(9451, 9451)),
+ Box(Box(9452, 9452), Box(9452, 9452)),
+ Box(Box(9453, 9453), Box(9453, 9453)),
+ Box(Box(9454, 9454), Box(9454, 9454)),
+ Box(Box(9455, 9455), Box(9455, 9455)),
+ Box(Box(9456, 9456), Box(9456, 9456)),
+ Box(Box(9457, 9457), Box(9457, 9457)),
+ Box(Box(9458, 9458), Box(9458, 9458)),
+ Box(Box(9459, 9459), Box(9459, 9459)),
+ Box(Box(9460, 9460), Box(9460, 9460)),
+ Box(Box(9461, 9461), Box(9461, 9461)),
+ Box(Box(9462, 9462), Box(9462, 9462)),
+ Box(Box(9463, 9463), Box(9463, 9463)),
+ Box(Box(9464, 9464), Box(9464, 9464)),
+ Box(Box(9465, 9465), Box(9465, 9465)),
+ Box(Box(9466, 9466), Box(9466, 9466)),
+ Box(Box(9467, 9467), Box(9467, 9467)),
+ Box(Box(9468, 9468), Box(9468, 9468)),
+ Box(Box(9469, 9469), Box(9469, 9469)),
+ Box(Box(9470, 9470), Box(9470, 9470)),
+ Box(Box(9471, 9471), Box(9471, 9471)),
+ Box(Box(9472, 9472), Box(9472, 9472)),
+ Box(Box(9473, 9473), Box(9473, 9473)),
+ Box(Box(9474, 9474), Box(9474, 9474)),
+ Box(Box(9475, 9475), Box(9475, 9475)),
+ Box(Box(9476, 9476), Box(9476, 9476)),
+ Box(Box(9477, 9477), Box(9477, 9477)),
+ Box(Box(9478, 9478), Box(9478, 9478)),
+ Box(Box(9479, 9479), Box(9479, 9479)),
+ Box(Box(9480, 9480), Box(9480, 9480)),
+ Box(Box(9481, 9481), Box(9481, 9481)),
+ Box(Box(9482, 9482), Box(9482, 9482)),
+ Box(Box(9483, 9483), Box(9483, 9483)),
+ Box(Box(9484, 9484), Box(9484, 9484)),
+ Box(Box(9485, 9485), Box(9485, 9485)),
+ Box(Box(9486, 9486), Box(9486, 9486)),
+ Box(Box(9487, 9487), Box(9487, 9487)),
+ Box(Box(9488, 9488), Box(9488, 9488)),
+ Box(Box(9489, 9489), Box(9489, 9489)),
+ Box(Box(9490, 9490), Box(9490, 9490)),
+ Box(Box(9491, 9491), Box(9491, 9491)),
+ Box(Box(9492, 9492), Box(9492, 9492)),
+ Box(Box(9493, 9493), Box(9493, 9493)),
+ Box(Box(9494, 9494), Box(9494, 9494)),
+ Box(Box(9495, 9495), Box(9495, 9495)),
+ Box(Box(9496, 9496), Box(9496, 9496)),
+ Box(Box(9497, 9497), Box(9497, 9497)),
+ Box(Box(9498, 9498), Box(9498, 9498)),
+ Box(Box(9499, 9499), Box(9499, 9499)),
+ Box(Box(9500, 9500), Box(9500, 9500)),
+ Box(Box(9501, 9501), Box(9501, 9501)),
+ Box(Box(9502, 9502), Box(9502, 9502)),
+ Box(Box(9503, 9503), Box(9503, 9503)),
+ Box(Box(9504, 9504), Box(9504, 9504)),
+ Box(Box(9505, 9505), Box(9505, 9505)),
+ Box(Box(9506, 9506), Box(9506, 9506)),
+ Box(Box(9507, 9507), Box(9507, 9507)),
+ Box(Box(9508, 9508), Box(9508, 9508)),
+ Box(Box(9509, 9509), Box(9509, 9509)),
+ Box(Box(9510, 9510), Box(9510, 9510)),
+ Box(Box(9511, 9511), Box(9511, 9511)),
+ Box(Box(9512, 9512), Box(9512, 9512)),
+ Box(Box(9513, 9513), Box(9513, 9513)),
+ Box(Box(9514, 9514), Box(9514, 9514)),
+ Box(Box(9515, 9515), Box(9515, 9515)),
+ Box(Box(9516, 9516), Box(9516, 9516)),
+ Box(Box(9517, 9517), Box(9517, 9517)),
+ Box(Box(9518, 9518), Box(9518, 9518)),
+ Box(Box(9519, 9519), Box(9519, 9519)),
+ Box(Box(9520, 9520), Box(9520, 9520)),
+ Box(Box(9521, 9521), Box(9521, 9521)),
+ Box(Box(9522, 9522), Box(9522, 9522)),
+ Box(Box(9523, 9523), Box(9523, 9523)),
+ Box(Box(9524, 9524), Box(9524, 9524)),
+ Box(Box(9525, 9525), Box(9525, 9525)),
+ Box(Box(9526, 9526), Box(9526, 9526)),
+ Box(Box(9527, 9527), Box(9527, 9527)),
+ Box(Box(9528, 9528), Box(9528, 9528)),
+ Box(Box(9529, 9529), Box(9529, 9529)),
+ Box(Box(9530, 9530), Box(9530, 9530)),
+ Box(Box(9531, 9531), Box(9531, 9531)),
+ Box(Box(9532, 9532), Box(9532, 9532)),
+ Box(Box(9533, 9533), Box(9533, 9533)),
+ Box(Box(9534, 9534), Box(9534, 9534)),
+ Box(Box(9535, 9535), Box(9535, 9535)),
+ Box(Box(9536, 9536), Box(9536, 9536)),
+ Box(Box(9537, 9537), Box(9537, 9537)),
+ Box(Box(9538, 9538), Box(9538, 9538)),
+ Box(Box(9539, 9539), Box(9539, 9539)),
+ Box(Box(9540, 9540), Box(9540, 9540)),
+ Box(Box(9541, 9541), Box(9541, 9541)),
+ Box(Box(9542, 9542), Box(9542, 9542)),
+ Box(Box(9543, 9543), Box(9543, 9543)),
+ Box(Box(9544, 9544), Box(9544, 9544)),
+ Box(Box(9545, 9545), Box(9545, 9545)),
+ Box(Box(9546, 9546), Box(9546, 9546)),
+ Box(Box(9547, 9547), Box(9547, 9547)),
+ Box(Box(9548, 9548), Box(9548, 9548)),
+ Box(Box(9549, 9549), Box(9549, 9549)),
+ Box(Box(9550, 9550), Box(9550, 9550)),
+ Box(Box(9551, 9551), Box(9551, 9551)),
+ Box(Box(9552, 9552), Box(9552, 9552)),
+ Box(Box(9553, 9553), Box(9553, 9553)),
+ Box(Box(9554, 9554), Box(9554, 9554)),
+ Box(Box(9555, 9555), Box(9555, 9555)),
+ Box(Box(9556, 9556), Box(9556, 9556)),
+ Box(Box(9557, 9557), Box(9557, 9557)),
+ Box(Box(9558, 9558), Box(9558, 9558)),
+ Box(Box(9559, 9559), Box(9559, 9559)),
+ Box(Box(9560, 9560), Box(9560, 9560)),
+ Box(Box(9561, 9561), Box(9561, 9561)),
+ Box(Box(9562, 9562), Box(9562, 9562)),
+ Box(Box(9563, 9563), Box(9563, 9563)),
+ Box(Box(9564, 9564), Box(9564, 9564)),
+ Box(Box(9565, 9565), Box(9565, 9565)),
+ Box(Box(9566, 9566), Box(9566, 9566)),
+ Box(Box(9567, 9567), Box(9567, 9567)),
+ Box(Box(9568, 9568), Box(9568, 9568)),
+ Box(Box(9569, 9569), Box(9569, 9569)),
+ Box(Box(9570, 9570), Box(9570, 9570)),
+ Box(Box(9571, 9571), Box(9571, 9571)),
+ Box(Box(9572, 9572), Box(9572, 9572)),
+ Box(Box(9573, 9573), Box(9573, 9573)),
+ Box(Box(9574, 9574), Box(9574, 9574)),
+ Box(Box(9575, 9575), Box(9575, 9575)),
+ Box(Box(9576, 9576), Box(9576, 9576)),
+ Box(Box(9577, 9577), Box(9577, 9577)),
+ Box(Box(9578, 9578), Box(9578, 9578)),
+ Box(Box(9579, 9579), Box(9579, 9579)),
+ Box(Box(9580, 9580), Box(9580, 9580)),
+ Box(Box(9581, 9581), Box(9581, 9581)),
+ Box(Box(9582, 9582), Box(9582, 9582)),
+ Box(Box(9583, 9583), Box(9583, 9583)),
+ Box(Box(9584, 9584), Box(9584, 9584)),
+ Box(Box(9585, 9585), Box(9585, 9585)),
+ Box(Box(9586, 9586), Box(9586, 9586)),
+ Box(Box(9587, 9587), Box(9587, 9587)),
+ Box(Box(9588, 9588), Box(9588, 9588)),
+ Box(Box(9589, 9589), Box(9589, 9589)),
+ Box(Box(9590, 9590), Box(9590, 9590)),
+ Box(Box(9591, 9591), Box(9591, 9591)),
+ Box(Box(9592, 9592), Box(9592, 9592)),
+ Box(Box(9593, 9593), Box(9593, 9593)),
+ Box(Box(9594, 9594), Box(9594, 9594)),
+ Box(Box(9595, 9595), Box(9595, 9595)),
+ Box(Box(9596, 9596), Box(9596, 9596)),
+ Box(Box(9597, 9597), Box(9597, 9597)),
+ Box(Box(9598, 9598), Box(9598, 9598)),
+ Box(Box(9599, 9599), Box(9599, 9599)),
+ Box(Box(9600, 9600), Box(9600, 9600)),
+ Box(Box(9601, 9601), Box(9601, 9601)),
+ Box(Box(9602, 9602), Box(9602, 9602)),
+ Box(Box(9603, 9603), Box(9603, 9603)),
+ Box(Box(9604, 9604), Box(9604, 9604)),
+ Box(Box(9605, 9605), Box(9605, 9605)),
+ Box(Box(9606, 9606), Box(9606, 9606)),
+ Box(Box(9607, 9607), Box(9607, 9607)),
+ Box(Box(9608, 9608), Box(9608, 9608)),
+ Box(Box(9609, 9609), Box(9609, 9609)),
+ Box(Box(9610, 9610), Box(9610, 9610)),
+ Box(Box(9611, 9611), Box(9611, 9611)),
+ Box(Box(9612, 9612), Box(9612, 9612)),
+ Box(Box(9613, 9613), Box(9613, 9613)),
+ Box(Box(9614, 9614), Box(9614, 9614)),
+ Box(Box(9615, 9615), Box(9615, 9615)),
+ Box(Box(9616, 9616), Box(9616, 9616)),
+ Box(Box(9617, 9617), Box(9617, 9617)),
+ Box(Box(9618, 9618), Box(9618, 9618)),
+ Box(Box(9619, 9619), Box(9619, 9619)),
+ Box(Box(9620, 9620), Box(9620, 9620)),
+ Box(Box(9621, 9621), Box(9621, 9621)),
+ Box(Box(9622, 9622), Box(9622, 9622)),
+ Box(Box(9623, 9623), Box(9623, 9623)),
+ Box(Box(9624, 9624), Box(9624, 9624)),
+ Box(Box(9625, 9625), Box(9625, 9625)),
+ Box(Box(9626, 9626), Box(9626, 9626)),
+ Box(Box(9627, 9627), Box(9627, 9627)),
+ Box(Box(9628, 9628), Box(9628, 9628)),
+ Box(Box(9629, 9629), Box(9629, 9629)),
+ Box(Box(9630, 9630), Box(9630, 9630)),
+ Box(Box(9631, 9631), Box(9631, 9631)),
+ Box(Box(9632, 9632), Box(9632, 9632)),
+ Box(Box(9633, 9633), Box(9633, 9633)),
+ Box(Box(9634, 9634), Box(9634, 9634)),
+ Box(Box(9635, 9635), Box(9635, 9635)),
+ Box(Box(9636, 9636), Box(9636, 9636)),
+ Box(Box(9637, 9637), Box(9637, 9637)),
+ Box(Box(9638, 9638), Box(9638, 9638)),
+ Box(Box(9639, 9639), Box(9639, 9639)),
+ Box(Box(9640, 9640), Box(9640, 9640)),
+ Box(Box(9641, 9641), Box(9641, 9641)),
+ Box(Box(9642, 9642), Box(9642, 9642)),
+ Box(Box(9643, 9643), Box(9643, 9643)),
+ Box(Box(9644, 9644), Box(9644, 9644)),
+ Box(Box(9645, 9645), Box(9645, 9645)),
+ Box(Box(9646, 9646), Box(9646, 9646)),
+ Box(Box(9647, 9647), Box(9647, 9647)),
+ Box(Box(9648, 9648), Box(9648, 9648)),
+ Box(Box(9649, 9649), Box(9649, 9649)),
+ Box(Box(9650, 9650), Box(9650, 9650)),
+ Box(Box(9651, 9651), Box(9651, 9651)),
+ Box(Box(9652, 9652), Box(9652, 9652)),
+ Box(Box(9653, 9653), Box(9653, 9653)),
+ Box(Box(9654, 9654), Box(9654, 9654)),
+ Box(Box(9655, 9655), Box(9655, 9655)),
+ Box(Box(9656, 9656), Box(9656, 9656)),
+ Box(Box(9657, 9657), Box(9657, 9657)),
+ Box(Box(9658, 9658), Box(9658, 9658)),
+ Box(Box(9659, 9659), Box(9659, 9659)),
+ Box(Box(9660, 9660), Box(9660, 9660)),
+ Box(Box(9661, 9661), Box(9661, 9661)),
+ Box(Box(9662, 9662), Box(9662, 9662)),
+ Box(Box(9663, 9663), Box(9663, 9663)),
+ Box(Box(9664, 9664), Box(9664, 9664)),
+ Box(Box(9665, 9665), Box(9665, 9665)),
+ Box(Box(9666, 9666), Box(9666, 9666)),
+ Box(Box(9667, 9667), Box(9667, 9667)),
+ Box(Box(9668, 9668), Box(9668, 9668)),
+ Box(Box(9669, 9669), Box(9669, 9669)),
+ Box(Box(9670, 9670), Box(9670, 9670)),
+ Box(Box(9671, 9671), Box(9671, 9671)),
+ Box(Box(9672, 9672), Box(9672, 9672)),
+ Box(Box(9673, 9673), Box(9673, 9673)),
+ Box(Box(9674, 9674), Box(9674, 9674)),
+ Box(Box(9675, 9675), Box(9675, 9675)),
+ Box(Box(9676, 9676), Box(9676, 9676)),
+ Box(Box(9677, 9677), Box(9677, 9677)),
+ Box(Box(9678, 9678), Box(9678, 9678)),
+ Box(Box(9679, 9679), Box(9679, 9679)),
+ Box(Box(9680, 9680), Box(9680, 9680)),
+ Box(Box(9681, 9681), Box(9681, 9681)),
+ Box(Box(9682, 9682), Box(9682, 9682)),
+ Box(Box(9683, 9683), Box(9683, 9683)),
+ Box(Box(9684, 9684), Box(9684, 9684)),
+ Box(Box(9685, 9685), Box(9685, 9685)),
+ Box(Box(9686, 9686), Box(9686, 9686)),
+ Box(Box(9687, 9687), Box(9687, 9687)),
+ Box(Box(9688, 9688), Box(9688, 9688)),
+ Box(Box(9689, 9689), Box(9689, 9689)),
+ Box(Box(9690, 9690), Box(9690, 9690)),
+ Box(Box(9691, 9691), Box(9691, 9691)),
+ Box(Box(9692, 9692), Box(9692, 9692)),
+ Box(Box(9693, 9693), Box(9693, 9693)),
+ Box(Box(9694, 9694), Box(9694, 9694)),
+ Box(Box(9695, 9695), Box(9695, 9695)),
+ Box(Box(9696, 9696), Box(9696, 9696)),
+ Box(Box(9697, 9697), Box(9697, 9697)),
+ Box(Box(9698, 9698), Box(9698, 9698)),
+ Box(Box(9699, 9699), Box(9699, 9699)),
+ Box(Box(9700, 9700), Box(9700, 9700)),
+ Box(Box(9701, 9701), Box(9701, 9701)),
+ Box(Box(9702, 9702), Box(9702, 9702)),
+ Box(Box(9703, 9703), Box(9703, 9703)),
+ Box(Box(9704, 9704), Box(9704, 9704)),
+ Box(Box(9705, 9705), Box(9705, 9705)),
+ Box(Box(9706, 9706), Box(9706, 9706)),
+ Box(Box(9707, 9707), Box(9707, 9707)),
+ Box(Box(9708, 9708), Box(9708, 9708)),
+ Box(Box(9709, 9709), Box(9709, 9709)),
+ Box(Box(9710, 9710), Box(9710, 9710)),
+ Box(Box(9711, 9711), Box(9711, 9711)),
+ Box(Box(9712, 9712), Box(9712, 9712)),
+ Box(Box(9713, 9713), Box(9713, 9713)),
+ Box(Box(9714, 9714), Box(9714, 9714)),
+ Box(Box(9715, 9715), Box(9715, 9715)),
+ Box(Box(9716, 9716), Box(9716, 9716)),
+ Box(Box(9717, 9717), Box(9717, 9717)),
+ Box(Box(9718, 9718), Box(9718, 9718)),
+ Box(Box(9719, 9719), Box(9719, 9719)),
+ Box(Box(9720, 9720), Box(9720, 9720)),
+ Box(Box(9721, 9721), Box(9721, 9721)),
+ Box(Box(9722, 9722), Box(9722, 9722)),
+ Box(Box(9723, 9723), Box(9723, 9723)),
+ Box(Box(9724, 9724), Box(9724, 9724)),
+ Box(Box(9725, 9725), Box(9725, 9725)),
+ Box(Box(9726, 9726), Box(9726, 9726)),
+ Box(Box(9727, 9727), Box(9727, 9727)),
+ Box(Box(9728, 9728), Box(9728, 9728)),
+ Box(Box(9729, 9729), Box(9729, 9729)),
+ Box(Box(9730, 9730), Box(9730, 9730)),
+ Box(Box(9731, 9731), Box(9731, 9731)),
+ Box(Box(9732, 9732), Box(9732, 9732)),
+ Box(Box(9733, 9733), Box(9733, 9733)),
+ Box(Box(9734, 9734), Box(9734, 9734)),
+ Box(Box(9735, 9735), Box(9735, 9735)),
+ Box(Box(9736, 9736), Box(9736, 9736)),
+ Box(Box(9737, 9737), Box(9737, 9737)),
+ Box(Box(9738, 9738), Box(9738, 9738)),
+ Box(Box(9739, 9739), Box(9739, 9739)),
+ Box(Box(9740, 9740), Box(9740, 9740)),
+ Box(Box(9741, 9741), Box(9741, 9741)),
+ Box(Box(9742, 9742), Box(9742, 9742)),
+ Box(Box(9743, 9743), Box(9743, 9743)),
+ Box(Box(9744, 9744), Box(9744, 9744)),
+ Box(Box(9745, 9745), Box(9745, 9745)),
+ Box(Box(9746, 9746), Box(9746, 9746)),
+ Box(Box(9747, 9747), Box(9747, 9747)),
+ Box(Box(9748, 9748), Box(9748, 9748)),
+ Box(Box(9749, 9749), Box(9749, 9749)),
+ Box(Box(9750, 9750), Box(9750, 9750)),
+ Box(Box(9751, 9751), Box(9751, 9751)),
+ Box(Box(9752, 9752), Box(9752, 9752)),
+ Box(Box(9753, 9753), Box(9753, 9753)),
+ Box(Box(9754, 9754), Box(9754, 9754)),
+ Box(Box(9755, 9755), Box(9755, 9755)),
+ Box(Box(9756, 9756), Box(9756, 9756)),
+ Box(Box(9757, 9757), Box(9757, 9757)),
+ Box(Box(9758, 9758), Box(9758, 9758)),
+ Box(Box(9759, 9759), Box(9759, 9759)),
+ Box(Box(9760, 9760), Box(9760, 9760)),
+ Box(Box(9761, 9761), Box(9761, 9761)),
+ Box(Box(9762, 9762), Box(9762, 9762)),
+ Box(Box(9763, 9763), Box(9763, 9763)),
+ Box(Box(9764, 9764), Box(9764, 9764)),
+ Box(Box(9765, 9765), Box(9765, 9765)),
+ Box(Box(9766, 9766), Box(9766, 9766)),
+ Box(Box(9767, 9767), Box(9767, 9767)),
+ Box(Box(9768, 9768), Box(9768, 9768)),
+ Box(Box(9769, 9769), Box(9769, 9769)),
+ Box(Box(9770, 9770), Box(9770, 9770)),
+ Box(Box(9771, 9771), Box(9771, 9771)),
+ Box(Box(9772, 9772), Box(9772, 9772)),
+ Box(Box(9773, 9773), Box(9773, 9773)),
+ Box(Box(9774, 9774), Box(9774, 9774)),
+ Box(Box(9775, 9775), Box(9775, 9775)),
+ Box(Box(9776, 9776), Box(9776, 9776)),
+ Box(Box(9777, 9777), Box(9777, 9777)),
+ Box(Box(9778, 9778), Box(9778, 9778)),
+ Box(Box(9779, 9779), Box(9779, 9779)),
+ Box(Box(9780, 9780), Box(9780, 9780)),
+ Box(Box(9781, 9781), Box(9781, 9781)),
+ Box(Box(9782, 9782), Box(9782, 9782)),
+ Box(Box(9783, 9783), Box(9783, 9783)),
+ Box(Box(9784, 9784), Box(9784, 9784)),
+ Box(Box(9785, 9785), Box(9785, 9785)),
+ Box(Box(9786, 9786), Box(9786, 9786)),
+ Box(Box(9787, 9787), Box(9787, 9787)),
+ Box(Box(9788, 9788), Box(9788, 9788)),
+ Box(Box(9789, 9789), Box(9789, 9789)),
+ Box(Box(9790, 9790), Box(9790, 9790)),
+ Box(Box(9791, 9791), Box(9791, 9791)),
+ Box(Box(9792, 9792), Box(9792, 9792)),
+ Box(Box(9793, 9793), Box(9793, 9793)),
+ Box(Box(9794, 9794), Box(9794, 9794)),
+ Box(Box(9795, 9795), Box(9795, 9795)),
+ Box(Box(9796, 9796), Box(9796, 9796)),
+ Box(Box(9797, 9797), Box(9797, 9797)),
+ Box(Box(9798, 9798), Box(9798, 9798)),
+ Box(Box(9799, 9799), Box(9799, 9799)),
+ Box(Box(9800, 9800), Box(9800, 9800)),
+ Box(Box(9801, 9801), Box(9801, 9801)),
+ Box(Box(9802, 9802), Box(9802, 9802)),
+ Box(Box(9803, 9803), Box(9803, 9803)),
+ Box(Box(9804, 9804), Box(9804, 9804)),
+ Box(Box(9805, 9805), Box(9805, 9805)),
+ Box(Box(9806, 9806), Box(9806, 9806)),
+ Box(Box(9807, 9807), Box(9807, 9807)),
+ Box(Box(9808, 9808), Box(9808, 9808)),
+ Box(Box(9809, 9809), Box(9809, 9809)),
+ Box(Box(9810, 9810), Box(9810, 9810)),
+ Box(Box(9811, 9811), Box(9811, 9811)),
+ Box(Box(9812, 9812), Box(9812, 9812)),
+ Box(Box(9813, 9813), Box(9813, 9813)),
+ Box(Box(9814, 9814), Box(9814, 9814)),
+ Box(Box(9815, 9815), Box(9815, 9815)),
+ Box(Box(9816, 9816), Box(9816, 9816)),
+ Box(Box(9817, 9817), Box(9817, 9817)),
+ Box(Box(9818, 9818), Box(9818, 9818)),
+ Box(Box(9819, 9819), Box(9819, 9819)),
+ Box(Box(9820, 9820), Box(9820, 9820)),
+ Box(Box(9821, 9821), Box(9821, 9821)),
+ Box(Box(9822, 9822), Box(9822, 9822)),
+ Box(Box(9823, 9823), Box(9823, 9823)),
+ Box(Box(9824, 9824), Box(9824, 9824)),
+ Box(Box(9825, 9825), Box(9825, 9825)),
+ Box(Box(9826, 9826), Box(9826, 9826)),
+ Box(Box(9827, 9827), Box(9827, 9827)),
+ Box(Box(9828, 9828), Box(9828, 9828)),
+ Box(Box(9829, 9829), Box(9829, 9829)),
+ Box(Box(9830, 9830), Box(9830, 9830)),
+ Box(Box(9831, 9831), Box(9831, 9831)),
+ Box(Box(9832, 9832), Box(9832, 9832)),
+ Box(Box(9833, 9833), Box(9833, 9833)),
+ Box(Box(9834, 9834), Box(9834, 9834)),
+ Box(Box(9835, 9835), Box(9835, 9835)),
+ Box(Box(9836, 9836), Box(9836, 9836)),
+ Box(Box(9837, 9837), Box(9837, 9837)),
+ Box(Box(9838, 9838), Box(9838, 9838)),
+ Box(Box(9839, 9839), Box(9839, 9839)),
+ Box(Box(9840, 9840), Box(9840, 9840)),
+ Box(Box(9841, 9841), Box(9841, 9841)),
+ Box(Box(9842, 9842), Box(9842, 9842)),
+ Box(Box(9843, 9843), Box(9843, 9843)),
+ Box(Box(9844, 9844), Box(9844, 9844)),
+ Box(Box(9845, 9845), Box(9845, 9845)),
+ Box(Box(9846, 9846), Box(9846, 9846)),
+ Box(Box(9847, 9847), Box(9847, 9847)),
+ Box(Box(9848, 9848), Box(9848, 9848)),
+ Box(Box(9849, 9849), Box(9849, 9849)),
+ Box(Box(9850, 9850), Box(9850, 9850)),
+ Box(Box(9851, 9851), Box(9851, 9851)),
+ Box(Box(9852, 9852), Box(9852, 9852)),
+ Box(Box(9853, 9853), Box(9853, 9853)),
+ Box(Box(9854, 9854), Box(9854, 9854)),
+ Box(Box(9855, 9855), Box(9855, 9855)),
+ Box(Box(9856, 9856), Box(9856, 9856)),
+ Box(Box(9857, 9857), Box(9857, 9857)),
+ Box(Box(9858, 9858), Box(9858, 9858)),
+ Box(Box(9859, 9859), Box(9859, 9859)),
+ Box(Box(9860, 9860), Box(9860, 9860)),
+ Box(Box(9861, 9861), Box(9861, 9861)),
+ Box(Box(9862, 9862), Box(9862, 9862)),
+ Box(Box(9863, 9863), Box(9863, 9863)),
+ Box(Box(9864, 9864), Box(9864, 9864)),
+ Box(Box(9865, 9865), Box(9865, 9865)),
+ Box(Box(9866, 9866), Box(9866, 9866)),
+ Box(Box(9867, 9867), Box(9867, 9867)),
+ Box(Box(9868, 9868), Box(9868, 9868)),
+ Box(Box(9869, 9869), Box(9869, 9869)),
+ Box(Box(9870, 9870), Box(9870, 9870)),
+ Box(Box(9871, 9871), Box(9871, 9871)),
+ Box(Box(9872, 9872), Box(9872, 9872)),
+ Box(Box(9873, 9873), Box(9873, 9873)),
+ Box(Box(9874, 9874), Box(9874, 9874)),
+ Box(Box(9875, 9875), Box(9875, 9875)),
+ Box(Box(9876, 9876), Box(9876, 9876)),
+ Box(Box(9877, 9877), Box(9877, 9877)),
+ Box(Box(9878, 9878), Box(9878, 9878)),
+ Box(Box(9879, 9879), Box(9879, 9879)),
+ Box(Box(9880, 9880), Box(9880, 9880)),
+ Box(Box(9881, 9881), Box(9881, 9881)),
+ Box(Box(9882, 9882), Box(9882, 9882)),
+ Box(Box(9883, 9883), Box(9883, 9883)),
+ Box(Box(9884, 9884), Box(9884, 9884)),
+ Box(Box(9885, 9885), Box(9885, 9885)),
+ Box(Box(9886, 9886), Box(9886, 9886)),
+ Box(Box(9887, 9887), Box(9887, 9887)),
+ Box(Box(9888, 9888), Box(9888, 9888)),
+ Box(Box(9889, 9889), Box(9889, 9889)),
+ Box(Box(9890, 9890), Box(9890, 9890)),
+ Box(Box(9891, 9891), Box(9891, 9891)),
+ Box(Box(9892, 9892), Box(9892, 9892)),
+ Box(Box(9893, 9893), Box(9893, 9893)),
+ Box(Box(9894, 9894), Box(9894, 9894)),
+ Box(Box(9895, 9895), Box(9895, 9895)),
+ Box(Box(9896, 9896), Box(9896, 9896)),
+ Box(Box(9897, 9897), Box(9897, 9897)),
+ Box(Box(9898, 9898), Box(9898, 9898)),
+ Box(Box(9899, 9899), Box(9899, 9899)),
+ Box(Box(9900, 9900), Box(9900, 9900)),
+ Box(Box(9901, 9901), Box(9901, 9901)),
+ Box(Box(9902, 9902), Box(9902, 9902)),
+ Box(Box(9903, 9903), Box(9903, 9903)),
+ Box(Box(9904, 9904), Box(9904, 9904)),
+ Box(Box(9905, 9905), Box(9905, 9905)),
+ Box(Box(9906, 9906), Box(9906, 9906)),
+ Box(Box(9907, 9907), Box(9907, 9907)),
+ Box(Box(9908, 9908), Box(9908, 9908)),
+ Box(Box(9909, 9909), Box(9909, 9909)),
+ Box(Box(9910, 9910), Box(9910, 9910)),
+ Box(Box(9911, 9911), Box(9911, 9911)),
+ Box(Box(9912, 9912), Box(9912, 9912)),
+ Box(Box(9913, 9913), Box(9913, 9913)),
+ Box(Box(9914, 9914), Box(9914, 9914)),
+ Box(Box(9915, 9915), Box(9915, 9915)),
+ Box(Box(9916, 9916), Box(9916, 9916)),
+ Box(Box(9917, 9917), Box(9917, 9917)),
+ Box(Box(9918, 9918), Box(9918, 9918)),
+ Box(Box(9919, 9919), Box(9919, 9919)),
+ Box(Box(9920, 9920), Box(9920, 9920)),
+ Box(Box(9921, 9921), Box(9921, 9921)),
+ Box(Box(9922, 9922), Box(9922, 9922)),
+ Box(Box(9923, 9923), Box(9923, 9923)),
+ Box(Box(9924, 9924), Box(9924, 9924)),
+ Box(Box(9925, 9925), Box(9925, 9925)),
+ Box(Box(9926, 9926), Box(9926, 9926)),
+ Box(Box(9927, 9927), Box(9927, 9927)),
+ Box(Box(9928, 9928), Box(9928, 9928)),
+ Box(Box(9929, 9929), Box(9929, 9929)),
+ Box(Box(9930, 9930), Box(9930, 9930)),
+ Box(Box(9931, 9931), Box(9931, 9931)),
+ Box(Box(9932, 9932), Box(9932, 9932)),
+ Box(Box(9933, 9933), Box(9933, 9933)),
+ Box(Box(9934, 9934), Box(9934, 9934)),
+ Box(Box(9935, 9935), Box(9935, 9935)),
+ Box(Box(9936, 9936), Box(9936, 9936)),
+ Box(Box(9937, 9937), Box(9937, 9937)),
+ Box(Box(9938, 9938), Box(9938, 9938)),
+ Box(Box(9939, 9939), Box(9939, 9939)),
+ Box(Box(9940, 9940), Box(9940, 9940)),
+ Box(Box(9941, 9941), Box(9941, 9941)),
+ Box(Box(9942, 9942), Box(9942, 9942)),
+ Box(Box(9943, 9943), Box(9943, 9943)),
+ Box(Box(9944, 9944), Box(9944, 9944)),
+ Box(Box(9945, 9945), Box(9945, 9945)),
+ Box(Box(9946, 9946), Box(9946, 9946)),
+ Box(Box(9947, 9947), Box(9947, 9947)),
+ Box(Box(9948, 9948), Box(9948, 9948)),
+ Box(Box(9949, 9949), Box(9949, 9949)),
+ Box(Box(9950, 9950), Box(9950, 9950)),
+ Box(Box(9951, 9951), Box(9951, 9951)),
+ Box(Box(9952, 9952), Box(9952, 9952)),
+ Box(Box(9953, 9953), Box(9953, 9953)),
+ Box(Box(9954, 9954), Box(9954, 9954)),
+ Box(Box(9955, 9955), Box(9955, 9955)),
+ Box(Box(9956, 9956), Box(9956, 9956)),
+ Box(Box(9957, 9957), Box(9957, 9957)),
+ Box(Box(9958, 9958), Box(9958, 9958)),
+ Box(Box(9959, 9959), Box(9959, 9959)),
+ Box(Box(9960, 9960), Box(9960, 9960)),
+ Box(Box(9961, 9961), Box(9961, 9961)),
+ Box(Box(9962, 9962), Box(9962, 9962)),
+ Box(Box(9963, 9963), Box(9963, 9963)),
+ Box(Box(9964, 9964), Box(9964, 9964)),
+ Box(Box(9965, 9965), Box(9965, 9965)),
+ Box(Box(9966, 9966), Box(9966, 9966)),
+ Box(Box(9967, 9967), Box(9967, 9967)),
+ Box(Box(9968, 9968), Box(9968, 9968)),
+ Box(Box(9969, 9969), Box(9969, 9969)),
+ Box(Box(9970, 9970), Box(9970, 9970)),
+ Box(Box(9971, 9971), Box(9971, 9971)),
+ Box(Box(9972, 9972), Box(9972, 9972)),
+ Box(Box(9973, 9973), Box(9973, 9973)),
+ Box(Box(9974, 9974), Box(9974, 9974)),
+ Box(Box(9975, 9975), Box(9975, 9975)),
+ Box(Box(9976, 9976), Box(9976, 9976)),
+ Box(Box(9977, 9977), Box(9977, 9977)),
+ Box(Box(9978, 9978), Box(9978, 9978)),
+ Box(Box(9979, 9979), Box(9979, 9979)),
+ Box(Box(9980, 9980), Box(9980, 9980)),
+ Box(Box(9981, 9981), Box(9981, 9981)),
+ Box(Box(9982, 9982), Box(9982, 9982)),
+ Box(Box(9983, 9983), Box(9983, 9983)),
+ Box(Box(9984, 9984), Box(9984, 9984)),
+ Box(Box(9985, 9985), Box(9985, 9985)),
+ Box(Box(9986, 9986), Box(9986, 9986)),
+ Box(Box(9987, 9987), Box(9987, 9987)),
+ Box(Box(9988, 9988), Box(9988, 9988)),
+ Box(Box(9989, 9989), Box(9989, 9989)),
+ Box(Box(9990, 9990), Box(9990, 9990)),
+ Box(Box(9991, 9991), Box(9991, 9991)),
+ Box(Box(9992, 9992), Box(9992, 9992)),
+ Box(Box(9993, 9993), Box(9993, 9993)),
+ Box(Box(9994, 9994), Box(9994, 9994)),
+ Box(Box(9995, 9995), Box(9995, 9995)),
+ Box(Box(9996, 9996), Box(9996, 9996)),
+ Box(Box(9997, 9997), Box(9997, 9997)),
+ Box(Box(9998, 9998), Box(9998, 9998)),
+ Box(Box(9999, 9999), Box(9999, 9999)),
+];
+
+confuse(x) {
+ try {
+ throw x;
+ } catch (e) {
+ return e;
+ }
+}
+
+main() {
+ if (!identical(confuse(list1), confuse(list2))) {
+ throw new Exception("list1 !== list2");
+ }
+}
diff --git a/tests/language/canonicalize/hashing_shallow_collision_instance_test.dart b/tests/language/canonicalize/hashing_shallow_collision_instance_test.dart
new file mode 100644
index 0000000..2de48b2
--- /dev/null
+++ b/tests/language/canonicalize/hashing_shallow_collision_instance_test.dart
@@ -0,0 +1,20029 @@
+// Copyright (c) 2019, 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.
+
+// If canonicialization hashes with only a field's cid, this will exhibit
+// quadratic time.
+
+class Box {
+ final Object content;
+ const Box(this.content);
+}
+
+// 10,000 elements.
+const list1 = [
+Box(Box(0)),
+Box(Box(1)),
+Box(Box(2)),
+Box(Box(3)),
+Box(Box(4)),
+Box(Box(5)),
+Box(Box(6)),
+Box(Box(7)),
+Box(Box(8)),
+Box(Box(9)),
+Box(Box(10)),
+Box(Box(11)),
+Box(Box(12)),
+Box(Box(13)),
+Box(Box(14)),
+Box(Box(15)),
+Box(Box(16)),
+Box(Box(17)),
+Box(Box(18)),
+Box(Box(19)),
+Box(Box(20)),
+Box(Box(21)),
+Box(Box(22)),
+Box(Box(23)),
+Box(Box(24)),
+Box(Box(25)),
+Box(Box(26)),
+Box(Box(27)),
+Box(Box(28)),
+Box(Box(29)),
+Box(Box(30)),
+Box(Box(31)),
+Box(Box(32)),
+Box(Box(33)),
+Box(Box(34)),
+Box(Box(35)),
+Box(Box(36)),
+Box(Box(37)),
+Box(Box(38)),
+Box(Box(39)),
+Box(Box(40)),
+Box(Box(41)),
+Box(Box(42)),
+Box(Box(43)),
+Box(Box(44)),
+Box(Box(45)),
+Box(Box(46)),
+Box(Box(47)),
+Box(Box(48)),
+Box(Box(49)),
+Box(Box(50)),
+Box(Box(51)),
+Box(Box(52)),
+Box(Box(53)),
+Box(Box(54)),
+Box(Box(55)),
+Box(Box(56)),
+Box(Box(57)),
+Box(Box(58)),
+Box(Box(59)),
+Box(Box(60)),
+Box(Box(61)),
+Box(Box(62)),
+Box(Box(63)),
+Box(Box(64)),
+Box(Box(65)),
+Box(Box(66)),
+Box(Box(67)),
+Box(Box(68)),
+Box(Box(69)),
+Box(Box(70)),
+Box(Box(71)),
+Box(Box(72)),
+Box(Box(73)),
+Box(Box(74)),
+Box(Box(75)),
+Box(Box(76)),
+Box(Box(77)),
+Box(Box(78)),
+Box(Box(79)),
+Box(Box(80)),
+Box(Box(81)),
+Box(Box(82)),
+Box(Box(83)),
+Box(Box(84)),
+Box(Box(85)),
+Box(Box(86)),
+Box(Box(87)),
+Box(Box(88)),
+Box(Box(89)),
+Box(Box(90)),
+Box(Box(91)),
+Box(Box(92)),
+Box(Box(93)),
+Box(Box(94)),
+Box(Box(95)),
+Box(Box(96)),
+Box(Box(97)),
+Box(Box(98)),
+Box(Box(99)),
+Box(Box(100)),
+Box(Box(101)),
+Box(Box(102)),
+Box(Box(103)),
+Box(Box(104)),
+Box(Box(105)),
+Box(Box(106)),
+Box(Box(107)),
+Box(Box(108)),
+Box(Box(109)),
+Box(Box(110)),
+Box(Box(111)),
+Box(Box(112)),
+Box(Box(113)),
+Box(Box(114)),
+Box(Box(115)),
+Box(Box(116)),
+Box(Box(117)),
+Box(Box(118)),
+Box(Box(119)),
+Box(Box(120)),
+Box(Box(121)),
+Box(Box(122)),
+Box(Box(123)),
+Box(Box(124)),
+Box(Box(125)),
+Box(Box(126)),
+Box(Box(127)),
+Box(Box(128)),
+Box(Box(129)),
+Box(Box(130)),
+Box(Box(131)),
+Box(Box(132)),
+Box(Box(133)),
+Box(Box(134)),
+Box(Box(135)),
+Box(Box(136)),
+Box(Box(137)),
+Box(Box(138)),
+Box(Box(139)),
+Box(Box(140)),
+Box(Box(141)),
+Box(Box(142)),
+Box(Box(143)),
+Box(Box(144)),
+Box(Box(145)),
+Box(Box(146)),
+Box(Box(147)),
+Box(Box(148)),
+Box(Box(149)),
+Box(Box(150)),
+Box(Box(151)),
+Box(Box(152)),
+Box(Box(153)),
+Box(Box(154)),
+Box(Box(155)),
+Box(Box(156)),
+Box(Box(157)),
+Box(Box(158)),
+Box(Box(159)),
+Box(Box(160)),
+Box(Box(161)),
+Box(Box(162)),
+Box(Box(163)),
+Box(Box(164)),
+Box(Box(165)),
+Box(Box(166)),
+Box(Box(167)),
+Box(Box(168)),
+Box(Box(169)),
+Box(Box(170)),
+Box(Box(171)),
+Box(Box(172)),
+Box(Box(173)),
+Box(Box(174)),
+Box(Box(175)),
+Box(Box(176)),
+Box(Box(177)),
+Box(Box(178)),
+Box(Box(179)),
+Box(Box(180)),
+Box(Box(181)),
+Box(Box(182)),
+Box(Box(183)),
+Box(Box(184)),
+Box(Box(185)),
+Box(Box(186)),
+Box(Box(187)),
+Box(Box(188)),
+Box(Box(189)),
+Box(Box(190)),
+Box(Box(191)),
+Box(Box(192)),
+Box(Box(193)),
+Box(Box(194)),
+Box(Box(195)),
+Box(Box(196)),
+Box(Box(197)),
+Box(Box(198)),
+Box(Box(199)),
+Box(Box(200)),
+Box(Box(201)),
+Box(Box(202)),
+Box(Box(203)),
+Box(Box(204)),
+Box(Box(205)),
+Box(Box(206)),
+Box(Box(207)),
+Box(Box(208)),
+Box(Box(209)),
+Box(Box(210)),
+Box(Box(211)),
+Box(Box(212)),
+Box(Box(213)),
+Box(Box(214)),
+Box(Box(215)),
+Box(Box(216)),
+Box(Box(217)),
+Box(Box(218)),
+Box(Box(219)),
+Box(Box(220)),
+Box(Box(221)),
+Box(Box(222)),
+Box(Box(223)),
+Box(Box(224)),
+Box(Box(225)),
+Box(Box(226)),
+Box(Box(227)),
+Box(Box(228)),
+Box(Box(229)),
+Box(Box(230)),
+Box(Box(231)),
+Box(Box(232)),
+Box(Box(233)),
+Box(Box(234)),
+Box(Box(235)),
+Box(Box(236)),
+Box(Box(237)),
+Box(Box(238)),
+Box(Box(239)),
+Box(Box(240)),
+Box(Box(241)),
+Box(Box(242)),
+Box(Box(243)),
+Box(Box(244)),
+Box(Box(245)),
+Box(Box(246)),
+Box(Box(247)),
+Box(Box(248)),
+Box(Box(249)),
+Box(Box(250)),
+Box(Box(251)),
+Box(Box(252)),
+Box(Box(253)),
+Box(Box(254)),
+Box(Box(255)),
+Box(Box(256)),
+Box(Box(257)),
+Box(Box(258)),
+Box(Box(259)),
+Box(Box(260)),
+Box(Box(261)),
+Box(Box(262)),
+Box(Box(263)),
+Box(Box(264)),
+Box(Box(265)),
+Box(Box(266)),
+Box(Box(267)),
+Box(Box(268)),
+Box(Box(269)),
+Box(Box(270)),
+Box(Box(271)),
+Box(Box(272)),
+Box(Box(273)),
+Box(Box(274)),
+Box(Box(275)),
+Box(Box(276)),
+Box(Box(277)),
+Box(Box(278)),
+Box(Box(279)),
+Box(Box(280)),
+Box(Box(281)),
+Box(Box(282)),
+Box(Box(283)),
+Box(Box(284)),
+Box(Box(285)),
+Box(Box(286)),
+Box(Box(287)),
+Box(Box(288)),
+Box(Box(289)),
+Box(Box(290)),
+Box(Box(291)),
+Box(Box(292)),
+Box(Box(293)),
+Box(Box(294)),
+Box(Box(295)),
+Box(Box(296)),
+Box(Box(297)),
+Box(Box(298)),
+Box(Box(299)),
+Box(Box(300)),
+Box(Box(301)),
+Box(Box(302)),
+Box(Box(303)),
+Box(Box(304)),
+Box(Box(305)),
+Box(Box(306)),
+Box(Box(307)),
+Box(Box(308)),
+Box(Box(309)),
+Box(Box(310)),
+Box(Box(311)),
+Box(Box(312)),
+Box(Box(313)),
+Box(Box(314)),
+Box(Box(315)),
+Box(Box(316)),
+Box(Box(317)),
+Box(Box(318)),
+Box(Box(319)),
+Box(Box(320)),
+Box(Box(321)),
+Box(Box(322)),
+Box(Box(323)),
+Box(Box(324)),
+Box(Box(325)),
+Box(Box(326)),
+Box(Box(327)),
+Box(Box(328)),
+Box(Box(329)),
+Box(Box(330)),
+Box(Box(331)),
+Box(Box(332)),
+Box(Box(333)),
+Box(Box(334)),
+Box(Box(335)),
+Box(Box(336)),
+Box(Box(337)),
+Box(Box(338)),
+Box(Box(339)),
+Box(Box(340)),
+Box(Box(341)),
+Box(Box(342)),
+Box(Box(343)),
+Box(Box(344)),
+Box(Box(345)),
+Box(Box(346)),
+Box(Box(347)),
+Box(Box(348)),
+Box(Box(349)),
+Box(Box(350)),
+Box(Box(351)),
+Box(Box(352)),
+Box(Box(353)),
+Box(Box(354)),
+Box(Box(355)),
+Box(Box(356)),
+Box(Box(357)),
+Box(Box(358)),
+Box(Box(359)),
+Box(Box(360)),
+Box(Box(361)),
+Box(Box(362)),
+Box(Box(363)),
+Box(Box(364)),
+Box(Box(365)),
+Box(Box(366)),
+Box(Box(367)),
+Box(Box(368)),
+Box(Box(369)),
+Box(Box(370)),
+Box(Box(371)),
+Box(Box(372)),
+Box(Box(373)),
+Box(Box(374)),
+Box(Box(375)),
+Box(Box(376)),
+Box(Box(377)),
+Box(Box(378)),
+Box(Box(379)),
+Box(Box(380)),
+Box(Box(381)),
+Box(Box(382)),
+Box(Box(383)),
+Box(Box(384)),
+Box(Box(385)),
+Box(Box(386)),
+Box(Box(387)),
+Box(Box(388)),
+Box(Box(389)),
+Box(Box(390)),
+Box(Box(391)),
+Box(Box(392)),
+Box(Box(393)),
+Box(Box(394)),
+Box(Box(395)),
+Box(Box(396)),
+Box(Box(397)),
+Box(Box(398)),
+Box(Box(399)),
+Box(Box(400)),
+Box(Box(401)),
+Box(Box(402)),
+Box(Box(403)),
+Box(Box(404)),
+Box(Box(405)),
+Box(Box(406)),
+Box(Box(407)),
+Box(Box(408)),
+Box(Box(409)),
+Box(Box(410)),
+Box(Box(411)),
+Box(Box(412)),
+Box(Box(413)),
+Box(Box(414)),
+Box(Box(415)),
+Box(Box(416)),
+Box(Box(417)),
+Box(Box(418)),
+Box(Box(419)),
+Box(Box(420)),
+Box(Box(421)),
+Box(Box(422)),
+Box(Box(423)),
+Box(Box(424)),
+Box(Box(425)),
+Box(Box(426)),
+Box(Box(427)),
+Box(Box(428)),
+Box(Box(429)),
+Box(Box(430)),
+Box(Box(431)),
+Box(Box(432)),
+Box(Box(433)),
+Box(Box(434)),
+Box(Box(435)),
+Box(Box(436)),
+Box(Box(437)),
+Box(Box(438)),
+Box(Box(439)),
+Box(Box(440)),
+Box(Box(441)),
+Box(Box(442)),
+Box(Box(443)),
+Box(Box(444)),
+Box(Box(445)),
+Box(Box(446)),
+Box(Box(447)),
+Box(Box(448)),
+Box(Box(449)),
+Box(Box(450)),
+Box(Box(451)),
+Box(Box(452)),
+Box(Box(453)),
+Box(Box(454)),
+Box(Box(455)),
+Box(Box(456)),
+Box(Box(457)),
+Box(Box(458)),
+Box(Box(459)),
+Box(Box(460)),
+Box(Box(461)),
+Box(Box(462)),
+Box(Box(463)),
+Box(Box(464)),
+Box(Box(465)),
+Box(Box(466)),
+Box(Box(467)),
+Box(Box(468)),
+Box(Box(469)),
+Box(Box(470)),
+Box(Box(471)),
+Box(Box(472)),
+Box(Box(473)),
+Box(Box(474)),
+Box(Box(475)),
+Box(Box(476)),
+Box(Box(477)),
+Box(Box(478)),
+Box(Box(479)),
+Box(Box(480)),
+Box(Box(481)),
+Box(Box(482)),
+Box(Box(483)),
+Box(Box(484)),
+Box(Box(485)),
+Box(Box(486)),
+Box(Box(487)),
+Box(Box(488)),
+Box(Box(489)),
+Box(Box(490)),
+Box(Box(491)),
+Box(Box(492)),
+Box(Box(493)),
+Box(Box(494)),
+Box(Box(495)),
+Box(Box(496)),
+Box(Box(497)),
+Box(Box(498)),
+Box(Box(499)),
+Box(Box(500)),
+Box(Box(501)),
+Box(Box(502)),
+Box(Box(503)),
+Box(Box(504)),
+Box(Box(505)),
+Box(Box(506)),
+Box(Box(507)),
+Box(Box(508)),
+Box(Box(509)),
+Box(Box(510)),
+Box(Box(511)),
+Box(Box(512)),
+Box(Box(513)),
+Box(Box(514)),
+Box(Box(515)),
+Box(Box(516)),
+Box(Box(517)),
+Box(Box(518)),
+Box(Box(519)),
+Box(Box(520)),
+Box(Box(521)),
+Box(Box(522)),
+Box(Box(523)),
+Box(Box(524)),
+Box(Box(525)),
+Box(Box(526)),
+Box(Box(527)),
+Box(Box(528)),
+Box(Box(529)),
+Box(Box(530)),
+Box(Box(531)),
+Box(Box(532)),
+Box(Box(533)),
+Box(Box(534)),
+Box(Box(535)),
+Box(Box(536)),
+Box(Box(537)),
+Box(Box(538)),
+Box(Box(539)),
+Box(Box(540)),
+Box(Box(541)),
+Box(Box(542)),
+Box(Box(543)),
+Box(Box(544)),
+Box(Box(545)),
+Box(Box(546)),
+Box(Box(547)),
+Box(Box(548)),
+Box(Box(549)),
+Box(Box(550)),
+Box(Box(551)),
+Box(Box(552)),
+Box(Box(553)),
+Box(Box(554)),
+Box(Box(555)),
+Box(Box(556)),
+Box(Box(557)),
+Box(Box(558)),
+Box(Box(559)),
+Box(Box(560)),
+Box(Box(561)),
+Box(Box(562)),
+Box(Box(563)),
+Box(Box(564)),
+Box(Box(565)),
+Box(Box(566)),
+Box(Box(567)),
+Box(Box(568)),
+Box(Box(569)),
+Box(Box(570)),
+Box(Box(571)),
+Box(Box(572)),
+Box(Box(573)),
+Box(Box(574)),
+Box(Box(575)),
+Box(Box(576)),
+Box(Box(577)),
+Box(Box(578)),
+Box(Box(579)),
+Box(Box(580)),
+Box(Box(581)),
+Box(Box(582)),
+Box(Box(583)),
+Box(Box(584)),
+Box(Box(585)),
+Box(Box(586)),
+Box(Box(587)),
+Box(Box(588)),
+Box(Box(589)),
+Box(Box(590)),
+Box(Box(591)),
+Box(Box(592)),
+Box(Box(593)),
+Box(Box(594)),
+Box(Box(595)),
+Box(Box(596)),
+Box(Box(597)),
+Box(Box(598)),
+Box(Box(599)),
+Box(Box(600)),
+Box(Box(601)),
+Box(Box(602)),
+Box(Box(603)),
+Box(Box(604)),
+Box(Box(605)),
+Box(Box(606)),
+Box(Box(607)),
+Box(Box(608)),
+Box(Box(609)),
+Box(Box(610)),
+Box(Box(611)),
+Box(Box(612)),
+Box(Box(613)),
+Box(Box(614)),
+Box(Box(615)),
+Box(Box(616)),
+Box(Box(617)),
+Box(Box(618)),
+Box(Box(619)),
+Box(Box(620)),
+Box(Box(621)),
+Box(Box(622)),
+Box(Box(623)),
+Box(Box(624)),
+Box(Box(625)),
+Box(Box(626)),
+Box(Box(627)),
+Box(Box(628)),
+Box(Box(629)),
+Box(Box(630)),
+Box(Box(631)),
+Box(Box(632)),
+Box(Box(633)),
+Box(Box(634)),
+Box(Box(635)),
+Box(Box(636)),
+Box(Box(637)),
+Box(Box(638)),
+Box(Box(639)),
+Box(Box(640)),
+Box(Box(641)),
+Box(Box(642)),
+Box(Box(643)),
+Box(Box(644)),
+Box(Box(645)),
+Box(Box(646)),
+Box(Box(647)),
+Box(Box(648)),
+Box(Box(649)),
+Box(Box(650)),
+Box(Box(651)),
+Box(Box(652)),
+Box(Box(653)),
+Box(Box(654)),
+Box(Box(655)),
+Box(Box(656)),
+Box(Box(657)),
+Box(Box(658)),
+Box(Box(659)),
+Box(Box(660)),
+Box(Box(661)),
+Box(Box(662)),
+Box(Box(663)),
+Box(Box(664)),
+Box(Box(665)),
+Box(Box(666)),
+Box(Box(667)),
+Box(Box(668)),
+Box(Box(669)),
+Box(Box(670)),
+Box(Box(671)),
+Box(Box(672)),
+Box(Box(673)),
+Box(Box(674)),
+Box(Box(675)),
+Box(Box(676)),
+Box(Box(677)),
+Box(Box(678)),
+Box(Box(679)),
+Box(Box(680)),
+Box(Box(681)),
+Box(Box(682)),
+Box(Box(683)),
+Box(Box(684)),
+Box(Box(685)),
+Box(Box(686)),
+Box(Box(687)),
+Box(Box(688)),
+Box(Box(689)),
+Box(Box(690)),
+Box(Box(691)),
+Box(Box(692)),
+Box(Box(693)),
+Box(Box(694)),
+Box(Box(695)),
+Box(Box(696)),
+Box(Box(697)),
+Box(Box(698)),
+Box(Box(699)),
+Box(Box(700)),
+Box(Box(701)),
+Box(Box(702)),
+Box(Box(703)),
+Box(Box(704)),
+Box(Box(705)),
+Box(Box(706)),
+Box(Box(707)),
+Box(Box(708)),
+Box(Box(709)),
+Box(Box(710)),
+Box(Box(711)),
+Box(Box(712)),
+Box(Box(713)),
+Box(Box(714)),
+Box(Box(715)),
+Box(Box(716)),
+Box(Box(717)),
+Box(Box(718)),
+Box(Box(719)),
+Box(Box(720)),
+Box(Box(721)),
+Box(Box(722)),
+Box(Box(723)),
+Box(Box(724)),
+Box(Box(725)),
+Box(Box(726)),
+Box(Box(727)),
+Box(Box(728)),
+Box(Box(729)),
+Box(Box(730)),
+Box(Box(731)),
+Box(Box(732)),
+Box(Box(733)),
+Box(Box(734)),
+Box(Box(735)),
+Box(Box(736)),
+Box(Box(737)),
+Box(Box(738)),
+Box(Box(739)),
+Box(Box(740)),
+Box(Box(741)),
+Box(Box(742)),
+Box(Box(743)),
+Box(Box(744)),
+Box(Box(745)),
+Box(Box(746)),
+Box(Box(747)),
+Box(Box(748)),
+Box(Box(749)),
+Box(Box(750)),
+Box(Box(751)),
+Box(Box(752)),
+Box(Box(753)),
+Box(Box(754)),
+Box(Box(755)),
+Box(Box(756)),
+Box(Box(757)),
+Box(Box(758)),
+Box(Box(759)),
+Box(Box(760)),
+Box(Box(761)),
+Box(Box(762)),
+Box(Box(763)),
+Box(Box(764)),
+Box(Box(765)),
+Box(Box(766)),
+Box(Box(767)),
+Box(Box(768)),
+Box(Box(769)),
+Box(Box(770)),
+Box(Box(771)),
+Box(Box(772)),
+Box(Box(773)),
+Box(Box(774)),
+Box(Box(775)),
+Box(Box(776)),
+Box(Box(777)),
+Box(Box(778)),
+Box(Box(779)),
+Box(Box(780)),
+Box(Box(781)),
+Box(Box(782)),
+Box(Box(783)),
+Box(Box(784)),
+Box(Box(785)),
+Box(Box(786)),
+Box(Box(787)),
+Box(Box(788)),
+Box(Box(789)),
+Box(Box(790)),
+Box(Box(791)),
+Box(Box(792)),
+Box(Box(793)),
+Box(Box(794)),
+Box(Box(795)),
+Box(Box(796)),
+Box(Box(797)),
+Box(Box(798)),
+Box(Box(799)),
+Box(Box(800)),
+Box(Box(801)),
+Box(Box(802)),
+Box(Box(803)),
+Box(Box(804)),
+Box(Box(805)),
+Box(Box(806)),
+Box(Box(807)),
+Box(Box(808)),
+Box(Box(809)),
+Box(Box(810)),
+Box(Box(811)),
+Box(Box(812)),
+Box(Box(813)),
+Box(Box(814)),
+Box(Box(815)),
+Box(Box(816)),
+Box(Box(817)),
+Box(Box(818)),
+Box(Box(819)),
+Box(Box(820)),
+Box(Box(821)),
+Box(Box(822)),
+Box(Box(823)),
+Box(Box(824)),
+Box(Box(825)),
+Box(Box(826)),
+Box(Box(827)),
+Box(Box(828)),
+Box(Box(829)),
+Box(Box(830)),
+Box(Box(831)),
+Box(Box(832)),
+Box(Box(833)),
+Box(Box(834)),
+Box(Box(835)),
+Box(Box(836)),
+Box(Box(837)),
+Box(Box(838)),
+Box(Box(839)),
+Box(Box(840)),
+Box(Box(841)),
+Box(Box(842)),
+Box(Box(843)),
+Box(Box(844)),
+Box(Box(845)),
+Box(Box(846)),
+Box(Box(847)),
+Box(Box(848)),
+Box(Box(849)),
+Box(Box(850)),
+Box(Box(851)),
+Box(Box(852)),
+Box(Box(853)),
+Box(Box(854)),
+Box(Box(855)),
+Box(Box(856)),
+Box(Box(857)),
+Box(Box(858)),
+Box(Box(859)),
+Box(Box(860)),
+Box(Box(861)),
+Box(Box(862)),
+Box(Box(863)),
+Box(Box(864)),
+Box(Box(865)),
+Box(Box(866)),
+Box(Box(867)),
+Box(Box(868)),
+Box(Box(869)),
+Box(Box(870)),
+Box(Box(871)),
+Box(Box(872)),
+Box(Box(873)),
+Box(Box(874)),
+Box(Box(875)),
+Box(Box(876)),
+Box(Box(877)),
+Box(Box(878)),
+Box(Box(879)),
+Box(Box(880)),
+Box(Box(881)),
+Box(Box(882)),
+Box(Box(883)),
+Box(Box(884)),
+Box(Box(885)),
+Box(Box(886)),
+Box(Box(887)),
+Box(Box(888)),
+Box(Box(889)),
+Box(Box(890)),
+Box(Box(891)),
+Box(Box(892)),
+Box(Box(893)),
+Box(Box(894)),
+Box(Box(895)),
+Box(Box(896)),
+Box(Box(897)),
+Box(Box(898)),
+Box(Box(899)),
+Box(Box(900)),
+Box(Box(901)),
+Box(Box(902)),
+Box(Box(903)),
+Box(Box(904)),
+Box(Box(905)),
+Box(Box(906)),
+Box(Box(907)),
+Box(Box(908)),
+Box(Box(909)),
+Box(Box(910)),
+Box(Box(911)),
+Box(Box(912)),
+Box(Box(913)),
+Box(Box(914)),
+Box(Box(915)),
+Box(Box(916)),
+Box(Box(917)),
+Box(Box(918)),
+Box(Box(919)),
+Box(Box(920)),
+Box(Box(921)),
+Box(Box(922)),
+Box(Box(923)),
+Box(Box(924)),
+Box(Box(925)),
+Box(Box(926)),
+Box(Box(927)),
+Box(Box(928)),
+Box(Box(929)),
+Box(Box(930)),
+Box(Box(931)),
+Box(Box(932)),
+Box(Box(933)),
+Box(Box(934)),
+Box(Box(935)),
+Box(Box(936)),
+Box(Box(937)),
+Box(Box(938)),
+Box(Box(939)),
+Box(Box(940)),
+Box(Box(941)),
+Box(Box(942)),
+Box(Box(943)),
+Box(Box(944)),
+Box(Box(945)),
+Box(Box(946)),
+Box(Box(947)),
+Box(Box(948)),
+Box(Box(949)),
+Box(Box(950)),
+Box(Box(951)),
+Box(Box(952)),
+Box(Box(953)),
+Box(Box(954)),
+Box(Box(955)),
+Box(Box(956)),
+Box(Box(957)),
+Box(Box(958)),
+Box(Box(959)),
+Box(Box(960)),
+Box(Box(961)),
+Box(Box(962)),
+Box(Box(963)),
+Box(Box(964)),
+Box(Box(965)),
+Box(Box(966)),
+Box(Box(967)),
+Box(Box(968)),
+Box(Box(969)),
+Box(Box(970)),
+Box(Box(971)),
+Box(Box(972)),
+Box(Box(973)),
+Box(Box(974)),
+Box(Box(975)),
+Box(Box(976)),
+Box(Box(977)),
+Box(Box(978)),
+Box(Box(979)),
+Box(Box(980)),
+Box(Box(981)),
+Box(Box(982)),
+Box(Box(983)),
+Box(Box(984)),
+Box(Box(985)),
+Box(Box(986)),
+Box(Box(987)),
+Box(Box(988)),
+Box(Box(989)),
+Box(Box(990)),
+Box(Box(991)),
+Box(Box(992)),
+Box(Box(993)),
+Box(Box(994)),
+Box(Box(995)),
+Box(Box(996)),
+Box(Box(997)),
+Box(Box(998)),
+Box(Box(999)),
+Box(Box(1000)),
+Box(Box(1001)),
+Box(Box(1002)),
+Box(Box(1003)),
+Box(Box(1004)),
+Box(Box(1005)),
+Box(Box(1006)),
+Box(Box(1007)),
+Box(Box(1008)),
+Box(Box(1009)),
+Box(Box(1010)),
+Box(Box(1011)),
+Box(Box(1012)),
+Box(Box(1013)),
+Box(Box(1014)),
+Box(Box(1015)),
+Box(Box(1016)),
+Box(Box(1017)),
+Box(Box(1018)),
+Box(Box(1019)),
+Box(Box(1020)),
+Box(Box(1021)),
+Box(Box(1022)),
+Box(Box(1023)),
+Box(Box(1024)),
+Box(Box(1025)),
+Box(Box(1026)),
+Box(Box(1027)),
+Box(Box(1028)),
+Box(Box(1029)),
+Box(Box(1030)),
+Box(Box(1031)),
+Box(Box(1032)),
+Box(Box(1033)),
+Box(Box(1034)),
+Box(Box(1035)),
+Box(Box(1036)),
+Box(Box(1037)),
+Box(Box(1038)),
+Box(Box(1039)),
+Box(Box(1040)),
+Box(Box(1041)),
+Box(Box(1042)),
+Box(Box(1043)),
+Box(Box(1044)),
+Box(Box(1045)),
+Box(Box(1046)),
+Box(Box(1047)),
+Box(Box(1048)),
+Box(Box(1049)),
+Box(Box(1050)),
+Box(Box(1051)),
+Box(Box(1052)),
+Box(Box(1053)),
+Box(Box(1054)),
+Box(Box(1055)),
+Box(Box(1056)),
+Box(Box(1057)),
+Box(Box(1058)),
+Box(Box(1059)),
+Box(Box(1060)),
+Box(Box(1061)),
+Box(Box(1062)),
+Box(Box(1063)),
+Box(Box(1064)),
+Box(Box(1065)),
+Box(Box(1066)),
+Box(Box(1067)),
+Box(Box(1068)),
+Box(Box(1069)),
+Box(Box(1070)),
+Box(Box(1071)),
+Box(Box(1072)),
+Box(Box(1073)),
+Box(Box(1074)),
+Box(Box(1075)),
+Box(Box(1076)),
+Box(Box(1077)),
+Box(Box(1078)),
+Box(Box(1079)),
+Box(Box(1080)),
+Box(Box(1081)),
+Box(Box(1082)),
+Box(Box(1083)),
+Box(Box(1084)),
+Box(Box(1085)),
+Box(Box(1086)),
+Box(Box(1087)),
+Box(Box(1088)),
+Box(Box(1089)),
+Box(Box(1090)),
+Box(Box(1091)),
+Box(Box(1092)),
+Box(Box(1093)),
+Box(Box(1094)),
+Box(Box(1095)),
+Box(Box(1096)),
+Box(Box(1097)),
+Box(Box(1098)),
+Box(Box(1099)),
+Box(Box(1100)),
+Box(Box(1101)),
+Box(Box(1102)),
+Box(Box(1103)),
+Box(Box(1104)),
+Box(Box(1105)),
+Box(Box(1106)),
+Box(Box(1107)),
+Box(Box(1108)),
+Box(Box(1109)),
+Box(Box(1110)),
+Box(Box(1111)),
+Box(Box(1112)),
+Box(Box(1113)),
+Box(Box(1114)),
+Box(Box(1115)),
+Box(Box(1116)),
+Box(Box(1117)),
+Box(Box(1118)),
+Box(Box(1119)),
+Box(Box(1120)),
+Box(Box(1121)),
+Box(Box(1122)),
+Box(Box(1123)),
+Box(Box(1124)),
+Box(Box(1125)),
+Box(Box(1126)),
+Box(Box(1127)),
+Box(Box(1128)),
+Box(Box(1129)),
+Box(Box(1130)),
+Box(Box(1131)),
+Box(Box(1132)),
+Box(Box(1133)),
+Box(Box(1134)),
+Box(Box(1135)),
+Box(Box(1136)),
+Box(Box(1137)),
+Box(Box(1138)),
+Box(Box(1139)),
+Box(Box(1140)),
+Box(Box(1141)),
+Box(Box(1142)),
+Box(Box(1143)),
+Box(Box(1144)),
+Box(Box(1145)),
+Box(Box(1146)),
+Box(Box(1147)),
+Box(Box(1148)),
+Box(Box(1149)),
+Box(Box(1150)),
+Box(Box(1151)),
+Box(Box(1152)),
+Box(Box(1153)),
+Box(Box(1154)),
+Box(Box(1155)),
+Box(Box(1156)),
+Box(Box(1157)),
+Box(Box(1158)),
+Box(Box(1159)),
+Box(Box(1160)),
+Box(Box(1161)),
+Box(Box(1162)),
+Box(Box(1163)),
+Box(Box(1164)),
+Box(Box(1165)),
+Box(Box(1166)),
+Box(Box(1167)),
+Box(Box(1168)),
+Box(Box(1169)),
+Box(Box(1170)),
+Box(Box(1171)),
+Box(Box(1172)),
+Box(Box(1173)),
+Box(Box(1174)),
+Box(Box(1175)),
+Box(Box(1176)),
+Box(Box(1177)),
+Box(Box(1178)),
+Box(Box(1179)),
+Box(Box(1180)),
+Box(Box(1181)),
+Box(Box(1182)),
+Box(Box(1183)),
+Box(Box(1184)),
+Box(Box(1185)),
+Box(Box(1186)),
+Box(Box(1187)),
+Box(Box(1188)),
+Box(Box(1189)),
+Box(Box(1190)),
+Box(Box(1191)),
+Box(Box(1192)),
+Box(Box(1193)),
+Box(Box(1194)),
+Box(Box(1195)),
+Box(Box(1196)),
+Box(Box(1197)),
+Box(Box(1198)),
+Box(Box(1199)),
+Box(Box(1200)),
+Box(Box(1201)),
+Box(Box(1202)),
+Box(Box(1203)),
+Box(Box(1204)),
+Box(Box(1205)),
+Box(Box(1206)),
+Box(Box(1207)),
+Box(Box(1208)),
+Box(Box(1209)),
+Box(Box(1210)),
+Box(Box(1211)),
+Box(Box(1212)),
+Box(Box(1213)),
+Box(Box(1214)),
+Box(Box(1215)),
+Box(Box(1216)),
+Box(Box(1217)),
+Box(Box(1218)),
+Box(Box(1219)),
+Box(Box(1220)),
+Box(Box(1221)),
+Box(Box(1222)),
+Box(Box(1223)),
+Box(Box(1224)),
+Box(Box(1225)),
+Box(Box(1226)),
+Box(Box(1227)),
+Box(Box(1228)),
+Box(Box(1229)),
+Box(Box(1230)),
+Box(Box(1231)),
+Box(Box(1232)),
+Box(Box(1233)),
+Box(Box(1234)),
+Box(Box(1235)),
+Box(Box(1236)),
+Box(Box(1237)),
+Box(Box(1238)),
+Box(Box(1239)),
+Box(Box(1240)),
+Box(Box(1241)),
+Box(Box(1242)),
+Box(Box(1243)),
+Box(Box(1244)),
+Box(Box(1245)),
+Box(Box(1246)),
+Box(Box(1247)),
+Box(Box(1248)),
+Box(Box(1249)),
+Box(Box(1250)),
+Box(Box(1251)),
+Box(Box(1252)),
+Box(Box(1253)),
+Box(Box(1254)),
+Box(Box(1255)),
+Box(Box(1256)),
+Box(Box(1257)),
+Box(Box(1258)),
+Box(Box(1259)),
+Box(Box(1260)),
+Box(Box(1261)),
+Box(Box(1262)),
+Box(Box(1263)),
+Box(Box(1264)),
+Box(Box(1265)),
+Box(Box(1266)),
+Box(Box(1267)),
+Box(Box(1268)),
+Box(Box(1269)),
+Box(Box(1270)),
+Box(Box(1271)),
+Box(Box(1272)),
+Box(Box(1273)),
+Box(Box(1274)),
+Box(Box(1275)),
+Box(Box(1276)),
+Box(Box(1277)),
+Box(Box(1278)),
+Box(Box(1279)),
+Box(Box(1280)),
+Box(Box(1281)),
+Box(Box(1282)),
+Box(Box(1283)),
+Box(Box(1284)),
+Box(Box(1285)),
+Box(Box(1286)),
+Box(Box(1287)),
+Box(Box(1288)),
+Box(Box(1289)),
+Box(Box(1290)),
+Box(Box(1291)),
+Box(Box(1292)),
+Box(Box(1293)),
+Box(Box(1294)),
+Box(Box(1295)),
+Box(Box(1296)),
+Box(Box(1297)),
+Box(Box(1298)),
+Box(Box(1299)),
+Box(Box(1300)),
+Box(Box(1301)),
+Box(Box(1302)),
+Box(Box(1303)),
+Box(Box(1304)),
+Box(Box(1305)),
+Box(Box(1306)),
+Box(Box(1307)),
+Box(Box(1308)),
+Box(Box(1309)),
+Box(Box(1310)),
+Box(Box(1311)),
+Box(Box(1312)),
+Box(Box(1313)),
+Box(Box(1314)),
+Box(Box(1315)),
+Box(Box(1316)),
+Box(Box(1317)),
+Box(Box(1318)),
+Box(Box(1319)),
+Box(Box(1320)),
+Box(Box(1321)),
+Box(Box(1322)),
+Box(Box(1323)),
+Box(Box(1324)),
+Box(Box(1325)),
+Box(Box(1326)),
+Box(Box(1327)),
+Box(Box(1328)),
+Box(Box(1329)),
+Box(Box(1330)),
+Box(Box(1331)),
+Box(Box(1332)),
+Box(Box(1333)),
+Box(Box(1334)),
+Box(Box(1335)),
+Box(Box(1336)),
+Box(Box(1337)),
+Box(Box(1338)),
+Box(Box(1339)),
+Box(Box(1340)),
+Box(Box(1341)),
+Box(Box(1342)),
+Box(Box(1343)),
+Box(Box(1344)),
+Box(Box(1345)),
+Box(Box(1346)),
+Box(Box(1347)),
+Box(Box(1348)),
+Box(Box(1349)),
+Box(Box(1350)),
+Box(Box(1351)),
+Box(Box(1352)),
+Box(Box(1353)),
+Box(Box(1354)),
+Box(Box(1355)),
+Box(Box(1356)),
+Box(Box(1357)),
+Box(Box(1358)),
+Box(Box(1359)),
+Box(Box(1360)),
+Box(Box(1361)),
+Box(Box(1362)),
+Box(Box(1363)),
+Box(Box(1364)),
+Box(Box(1365)),
+Box(Box(1366)),
+Box(Box(1367)),
+Box(Box(1368)),
+Box(Box(1369)),
+Box(Box(1370)),
+Box(Box(1371)),
+Box(Box(1372)),
+Box(Box(1373)),
+Box(Box(1374)),
+Box(Box(1375)),
+Box(Box(1376)),
+Box(Box(1377)),
+Box(Box(1378)),
+Box(Box(1379)),
+Box(Box(1380)),
+Box(Box(1381)),
+Box(Box(1382)),
+Box(Box(1383)),
+Box(Box(1384)),
+Box(Box(1385)),
+Box(Box(1386)),
+Box(Box(1387)),
+Box(Box(1388)),
+Box(Box(1389)),
+Box(Box(1390)),
+Box(Box(1391)),
+Box(Box(1392)),
+Box(Box(1393)),
+Box(Box(1394)),
+Box(Box(1395)),
+Box(Box(1396)),
+Box(Box(1397)),
+Box(Box(1398)),
+Box(Box(1399)),
+Box(Box(1400)),
+Box(Box(1401)),
+Box(Box(1402)),
+Box(Box(1403)),
+Box(Box(1404)),
+Box(Box(1405)),
+Box(Box(1406)),
+Box(Box(1407)),
+Box(Box(1408)),
+Box(Box(1409)),
+Box(Box(1410)),
+Box(Box(1411)),
+Box(Box(1412)),
+Box(Box(1413)),
+Box(Box(1414)),
+Box(Box(1415)),
+Box(Box(1416)),
+Box(Box(1417)),
+Box(Box(1418)),
+Box(Box(1419)),
+Box(Box(1420)),
+Box(Box(1421)),
+Box(Box(1422)),
+Box(Box(1423)),
+Box(Box(1424)),
+Box(Box(1425)),
+Box(Box(1426)),
+Box(Box(1427)),
+Box(Box(1428)),
+Box(Box(1429)),
+Box(Box(1430)),
+Box(Box(1431)),
+Box(Box(1432)),
+Box(Box(1433)),
+Box(Box(1434)),
+Box(Box(1435)),
+Box(Box(1436)),
+Box(Box(1437)),
+Box(Box(1438)),
+Box(Box(1439)),
+Box(Box(1440)),
+Box(Box(1441)),
+Box(Box(1442)),
+Box(Box(1443)),
+Box(Box(1444)),
+Box(Box(1445)),
+Box(Box(1446)),
+Box(Box(1447)),
+Box(Box(1448)),
+Box(Box(1449)),
+Box(Box(1450)),
+Box(Box(1451)),
+Box(Box(1452)),
+Box(Box(1453)),
+Box(Box(1454)),
+Box(Box(1455)),
+Box(Box(1456)),
+Box(Box(1457)),
+Box(Box(1458)),
+Box(Box(1459)),
+Box(Box(1460)),
+Box(Box(1461)),
+Box(Box(1462)),
+Box(Box(1463)),
+Box(Box(1464)),
+Box(Box(1465)),
+Box(Box(1466)),
+Box(Box(1467)),
+Box(Box(1468)),
+Box(Box(1469)),
+Box(Box(1470)),
+Box(Box(1471)),
+Box(Box(1472)),
+Box(Box(1473)),
+Box(Box(1474)),
+Box(Box(1475)),
+Box(Box(1476)),
+Box(Box(1477)),
+Box(Box(1478)),
+Box(Box(1479)),
+Box(Box(1480)),
+Box(Box(1481)),
+Box(Box(1482)),
+Box(Box(1483)),
+Box(Box(1484)),
+Box(Box(1485)),
+Box(Box(1486)),
+Box(Box(1487)),
+Box(Box(1488)),
+Box(Box(1489)),
+Box(Box(1490)),
+Box(Box(1491)),
+Box(Box(1492)),
+Box(Box(1493)),
+Box(Box(1494)),
+Box(Box(1495)),
+Box(Box(1496)),
+Box(Box(1497)),
+Box(Box(1498)),
+Box(Box(1499)),
+Box(Box(1500)),
+Box(Box(1501)),
+Box(Box(1502)),
+Box(Box(1503)),
+Box(Box(1504)),
+Box(Box(1505)),
+Box(Box(1506)),
+Box(Box(1507)),
+Box(Box(1508)),
+Box(Box(1509)),
+Box(Box(1510)),
+Box(Box(1511)),
+Box(Box(1512)),
+Box(Box(1513)),
+Box(Box(1514)),
+Box(Box(1515)),
+Box(Box(1516)),
+Box(Box(1517)),
+Box(Box(1518)),
+Box(Box(1519)),
+Box(Box(1520)),
+Box(Box(1521)),
+Box(Box(1522)),
+Box(Box(1523)),
+Box(Box(1524)),
+Box(Box(1525)),
+Box(Box(1526)),
+Box(Box(1527)),
+Box(Box(1528)),
+Box(Box(1529)),
+Box(Box(1530)),
+Box(Box(1531)),
+Box(Box(1532)),
+Box(Box(1533)),
+Box(Box(1534)),
+Box(Box(1535)),
+Box(Box(1536)),
+Box(Box(1537)),
+Box(Box(1538)),
+Box(Box(1539)),
+Box(Box(1540)),
+Box(Box(1541)),
+Box(Box(1542)),
+Box(Box(1543)),
+Box(Box(1544)),
+Box(Box(1545)),
+Box(Box(1546)),
+Box(Box(1547)),
+Box(Box(1548)),
+Box(Box(1549)),
+Box(Box(1550)),
+Box(Box(1551)),
+Box(Box(1552)),
+Box(Box(1553)),
+Box(Box(1554)),
+Box(Box(1555)),
+Box(Box(1556)),
+Box(Box(1557)),
+Box(Box(1558)),
+Box(Box(1559)),
+Box(Box(1560)),
+Box(Box(1561)),
+Box(Box(1562)),
+Box(Box(1563)),
+Box(Box(1564)),
+Box(Box(1565)),
+Box(Box(1566)),
+Box(Box(1567)),
+Box(Box(1568)),
+Box(Box(1569)),
+Box(Box(1570)),
+Box(Box(1571)),
+Box(Box(1572)),
+Box(Box(1573)),
+Box(Box(1574)),
+Box(Box(1575)),
+Box(Box(1576)),
+Box(Box(1577)),
+Box(Box(1578)),
+Box(Box(1579)),
+Box(Box(1580)),
+Box(Box(1581)),
+Box(Box(1582)),
+Box(Box(1583)),
+Box(Box(1584)),
+Box(Box(1585)),
+Box(Box(1586)),
+Box(Box(1587)),
+Box(Box(1588)),
+Box(Box(1589)),
+Box(Box(1590)),
+Box(Box(1591)),
+Box(Box(1592)),
+Box(Box(1593)),
+Box(Box(1594)),
+Box(Box(1595)),
+Box(Box(1596)),
+Box(Box(1597)),
+Box(Box(1598)),
+Box(Box(1599)),
+Box(Box(1600)),
+Box(Box(1601)),
+Box(Box(1602)),
+Box(Box(1603)),
+Box(Box(1604)),
+Box(Box(1605)),
+Box(Box(1606)),
+Box(Box(1607)),
+Box(Box(1608)),
+Box(Box(1609)),
+Box(Box(1610)),
+Box(Box(1611)),
+Box(Box(1612)),
+Box(Box(1613)),
+Box(Box(1614)),
+Box(Box(1615)),
+Box(Box(1616)),
+Box(Box(1617)),
+Box(Box(1618)),
+Box(Box(1619)),
+Box(Box(1620)),
+Box(Box(1621)),
+Box(Box(1622)),
+Box(Box(1623)),
+Box(Box(1624)),
+Box(Box(1625)),
+Box(Box(1626)),
+Box(Box(1627)),
+Box(Box(1628)),
+Box(Box(1629)),
+Box(Box(1630)),
+Box(Box(1631)),
+Box(Box(1632)),
+Box(Box(1633)),
+Box(Box(1634)),
+Box(Box(1635)),
+Box(Box(1636)),
+Box(Box(1637)),
+Box(Box(1638)),
+Box(Box(1639)),
+Box(Box(1640)),
+Box(Box(1641)),
+Box(Box(1642)),
+Box(Box(1643)),
+Box(Box(1644)),
+Box(Box(1645)),
+Box(Box(1646)),
+Box(Box(1647)),
+Box(Box(1648)),
+Box(Box(1649)),
+Box(Box(1650)),
+Box(Box(1651)),
+Box(Box(1652)),
+Box(Box(1653)),
+Box(Box(1654)),
+Box(Box(1655)),
+Box(Box(1656)),
+Box(Box(1657)),
+Box(Box(1658)),
+Box(Box(1659)),
+Box(Box(1660)),
+Box(Box(1661)),
+Box(Box(1662)),
+Box(Box(1663)),
+Box(Box(1664)),
+Box(Box(1665)),
+Box(Box(1666)),
+Box(Box(1667)),
+Box(Box(1668)),
+Box(Box(1669)),
+Box(Box(1670)),
+Box(Box(1671)),
+Box(Box(1672)),
+Box(Box(1673)),
+Box(Box(1674)),
+Box(Box(1675)),
+Box(Box(1676)),
+Box(Box(1677)),
+Box(Box(1678)),
+Box(Box(1679)),
+Box(Box(1680)),
+Box(Box(1681)),
+Box(Box(1682)),
+Box(Box(1683)),
+Box(Box(1684)),
+Box(Box(1685)),
+Box(Box(1686)),
+Box(Box(1687)),
+Box(Box(1688)),
+Box(Box(1689)),
+Box(Box(1690)),
+Box(Box(1691)),
+Box(Box(1692)),
+Box(Box(1693)),
+Box(Box(1694)),
+Box(Box(1695)),
+Box(Box(1696)),
+Box(Box(1697)),
+Box(Box(1698)),
+Box(Box(1699)),
+Box(Box(1700)),
+Box(Box(1701)),
+Box(Box(1702)),
+Box(Box(1703)),
+Box(Box(1704)),
+Box(Box(1705)),
+Box(Box(1706)),
+Box(Box(1707)),
+Box(Box(1708)),
+Box(Box(1709)),
+Box(Box(1710)),
+Box(Box(1711)),
+Box(Box(1712)),
+Box(Box(1713)),
+Box(Box(1714)),
+Box(Box(1715)),
+Box(Box(1716)),
+Box(Box(1717)),
+Box(Box(1718)),
+Box(Box(1719)),
+Box(Box(1720)),
+Box(Box(1721)),
+Box(Box(1722)),
+Box(Box(1723)),
+Box(Box(1724)),
+Box(Box(1725)),
+Box(Box(1726)),
+Box(Box(1727)),
+Box(Box(1728)),
+Box(Box(1729)),
+Box(Box(1730)),
+Box(Box(1731)),
+Box(Box(1732)),
+Box(Box(1733)),
+Box(Box(1734)),
+Box(Box(1735)),
+Box(Box(1736)),
+Box(Box(1737)),
+Box(Box(1738)),
+Box(Box(1739)),
+Box(Box(1740)),
+Box(Box(1741)),
+Box(Box(1742)),
+Box(Box(1743)),
+Box(Box(1744)),
+Box(Box(1745)),
+Box(Box(1746)),
+Box(Box(1747)),
+Box(Box(1748)),
+Box(Box(1749)),
+Box(Box(1750)),
+Box(Box(1751)),
+Box(Box(1752)),
+Box(Box(1753)),
+Box(Box(1754)),
+Box(Box(1755)),
+Box(Box(1756)),
+Box(Box(1757)),
+Box(Box(1758)),
+Box(Box(1759)),
+Box(Box(1760)),
+Box(Box(1761)),
+Box(Box(1762)),
+Box(Box(1763)),
+Box(Box(1764)),
+Box(Box(1765)),
+Box(Box(1766)),
+Box(Box(1767)),
+Box(Box(1768)),
+Box(Box(1769)),
+Box(Box(1770)),
+Box(Box(1771)),
+Box(Box(1772)),
+Box(Box(1773)),
+Box(Box(1774)),
+Box(Box(1775)),
+Box(Box(1776)),
+Box(Box(1777)),
+Box(Box(1778)),
+Box(Box(1779)),
+Box(Box(1780)),
+Box(Box(1781)),
+Box(Box(1782)),
+Box(Box(1783)),
+Box(Box(1784)),
+Box(Box(1785)),
+Box(Box(1786)),
+Box(Box(1787)),
+Box(Box(1788)),
+Box(Box(1789)),
+Box(Box(1790)),
+Box(Box(1791)),
+Box(Box(1792)),
+Box(Box(1793)),
+Box(Box(1794)),
+Box(Box(1795)),
+Box(Box(1796)),
+Box(Box(1797)),
+Box(Box(1798)),
+Box(Box(1799)),
+Box(Box(1800)),
+Box(Box(1801)),
+Box(Box(1802)),
+Box(Box(1803)),
+Box(Box(1804)),
+Box(Box(1805)),
+Box(Box(1806)),
+Box(Box(1807)),
+Box(Box(1808)),
+Box(Box(1809)),
+Box(Box(1810)),
+Box(Box(1811)),
+Box(Box(1812)),
+Box(Box(1813)),
+Box(Box(1814)),
+Box(Box(1815)),
+Box(Box(1816)),
+Box(Box(1817)),
+Box(Box(1818)),
+Box(Box(1819)),
+Box(Box(1820)),
+Box(Box(1821)),
+Box(Box(1822)),
+Box(Box(1823)),
+Box(Box(1824)),
+Box(Box(1825)),
+Box(Box(1826)),
+Box(Box(1827)),
+Box(Box(1828)),
+Box(Box(1829)),
+Box(Box(1830)),
+Box(Box(1831)),
+Box(Box(1832)),
+Box(Box(1833)),
+Box(Box(1834)),
+Box(Box(1835)),
+Box(Box(1836)),
+Box(Box(1837)),
+Box(Box(1838)),
+Box(Box(1839)),
+Box(Box(1840)),
+Box(Box(1841)),
+Box(Box(1842)),
+Box(Box(1843)),
+Box(Box(1844)),
+Box(Box(1845)),
+Box(Box(1846)),
+Box(Box(1847)),
+Box(Box(1848)),
+Box(Box(1849)),
+Box(Box(1850)),
+Box(Box(1851)),
+Box(Box(1852)),
+Box(Box(1853)),
+Box(Box(1854)),
+Box(Box(1855)),
+Box(Box(1856)),
+Box(Box(1857)),
+Box(Box(1858)),
+Box(Box(1859)),
+Box(Box(1860)),
+Box(Box(1861)),
+Box(Box(1862)),
+Box(Box(1863)),
+Box(Box(1864)),
+Box(Box(1865)),
+Box(Box(1866)),
+Box(Box(1867)),
+Box(Box(1868)),
+Box(Box(1869)),
+Box(Box(1870)),
+Box(Box(1871)),
+Box(Box(1872)),
+Box(Box(1873)),
+Box(Box(1874)),
+Box(Box(1875)),
+Box(Box(1876)),
+Box(Box(1877)),
+Box(Box(1878)),
+Box(Box(1879)),
+Box(Box(1880)),
+Box(Box(1881)),
+Box(Box(1882)),
+Box(Box(1883)),
+Box(Box(1884)),
+Box(Box(1885)),
+Box(Box(1886)),
+Box(Box(1887)),
+Box(Box(1888)),
+Box(Box(1889)),
+Box(Box(1890)),
+Box(Box(1891)),
+Box(Box(1892)),
+Box(Box(1893)),
+Box(Box(1894)),
+Box(Box(1895)),
+Box(Box(1896)),
+Box(Box(1897)),
+Box(Box(1898)),
+Box(Box(1899)),
+Box(Box(1900)),
+Box(Box(1901)),
+Box(Box(1902)),
+Box(Box(1903)),
+Box(Box(1904)),
+Box(Box(1905)),
+Box(Box(1906)),
+Box(Box(1907)),
+Box(Box(1908)),
+Box(Box(1909)),
+Box(Box(1910)),
+Box(Box(1911)),
+Box(Box(1912)),
+Box(Box(1913)),
+Box(Box(1914)),
+Box(Box(1915)),
+Box(Box(1916)),
+Box(Box(1917)),
+Box(Box(1918)),
+Box(Box(1919)),
+Box(Box(1920)),
+Box(Box(1921)),
+Box(Box(1922)),
+Box(Box(1923)),
+Box(Box(1924)),
+Box(Box(1925)),
+Box(Box(1926)),
+Box(Box(1927)),
+Box(Box(1928)),
+Box(Box(1929)),
+Box(Box(1930)),
+Box(Box(1931)),
+Box(Box(1932)),
+Box(Box(1933)),
+Box(Box(1934)),
+Box(Box(1935)),
+Box(Box(1936)),
+Box(Box(1937)),
+Box(Box(1938)),
+Box(Box(1939)),
+Box(Box(1940)),
+Box(Box(1941)),
+Box(Box(1942)),
+Box(Box(1943)),
+Box(Box(1944)),
+Box(Box(1945)),
+Box(Box(1946)),
+Box(Box(1947)),
+Box(Box(1948)),
+Box(Box(1949)),
+Box(Box(1950)),
+Box(Box(1951)),
+Box(Box(1952)),
+Box(Box(1953)),
+Box(Box(1954)),
+Box(Box(1955)),
+Box(Box(1956)),
+Box(Box(1957)),
+Box(Box(1958)),
+Box(Box(1959)),
+Box(Box(1960)),
+Box(Box(1961)),
+Box(Box(1962)),
+Box(Box(1963)),
+Box(Box(1964)),
+Box(Box(1965)),
+Box(Box(1966)),
+Box(Box(1967)),
+Box(Box(1968)),
+Box(Box(1969)),
+Box(Box(1970)),
+Box(Box(1971)),
+Box(Box(1972)),
+Box(Box(1973)),
+Box(Box(1974)),
+Box(Box(1975)),
+Box(Box(1976)),
+Box(Box(1977)),
+Box(Box(1978)),
+Box(Box(1979)),
+Box(Box(1980)),
+Box(Box(1981)),
+Box(Box(1982)),
+Box(Box(1983)),
+Box(Box(1984)),
+Box(Box(1985)),
+Box(Box(1986)),
+Box(Box(1987)),
+Box(Box(1988)),
+Box(Box(1989)),
+Box(Box(1990)),
+Box(Box(1991)),
+Box(Box(1992)),
+Box(Box(1993)),
+Box(Box(1994)),
+Box(Box(1995)),
+Box(Box(1996)),
+Box(Box(1997)),
+Box(Box(1998)),
+Box(Box(1999)),
+Box(Box(2000)),
+Box(Box(2001)),
+Box(Box(2002)),
+Box(Box(2003)),
+Box(Box(2004)),
+Box(Box(2005)),
+Box(Box(2006)),
+Box(Box(2007)),
+Box(Box(2008)),
+Box(Box(2009)),
+Box(Box(2010)),
+Box(Box(2011)),
+Box(Box(2012)),
+Box(Box(2013)),
+Box(Box(2014)),
+Box(Box(2015)),
+Box(Box(2016)),
+Box(Box(2017)),
+Box(Box(2018)),
+Box(Box(2019)),
+Box(Box(2020)),
+Box(Box(2021)),
+Box(Box(2022)),
+Box(Box(2023)),
+Box(Box(2024)),
+Box(Box(2025)),
+Box(Box(2026)),
+Box(Box(2027)),
+Box(Box(2028)),
+Box(Box(2029)),
+Box(Box(2030)),
+Box(Box(2031)),
+Box(Box(2032)),
+Box(Box(2033)),
+Box(Box(2034)),
+Box(Box(2035)),
+Box(Box(2036)),
+Box(Box(2037)),
+Box(Box(2038)),
+Box(Box(2039)),
+Box(Box(2040)),
+Box(Box(2041)),
+Box(Box(2042)),
+Box(Box(2043)),
+Box(Box(2044)),
+Box(Box(2045)),
+Box(Box(2046)),
+Box(Box(2047)),
+Box(Box(2048)),
+Box(Box(2049)),
+Box(Box(2050)),
+Box(Box(2051)),
+Box(Box(2052)),
+Box(Box(2053)),
+Box(Box(2054)),
+Box(Box(2055)),
+Box(Box(2056)),
+Box(Box(2057)),
+Box(Box(2058)),
+Box(Box(2059)),
+Box(Box(2060)),
+Box(Box(2061)),
+Box(Box(2062)),
+Box(Box(2063)),
+Box(Box(2064)),
+Box(Box(2065)),
+Box(Box(2066)),
+Box(Box(2067)),
+Box(Box(2068)),
+Box(Box(2069)),
+Box(Box(2070)),
+Box(Box(2071)),
+Box(Box(2072)),
+Box(Box(2073)),
+Box(Box(2074)),
+Box(Box(2075)),
+Box(Box(2076)),
+Box(Box(2077)),
+Box(Box(2078)),
+Box(Box(2079)),
+Box(Box(2080)),
+Box(Box(2081)),
+Box(Box(2082)),
+Box(Box(2083)),
+Box(Box(2084)),
+Box(Box(2085)),
+Box(Box(2086)),
+Box(Box(2087)),
+Box(Box(2088)),
+Box(Box(2089)),
+Box(Box(2090)),
+Box(Box(2091)),
+Box(Box(2092)),
+Box(Box(2093)),
+Box(Box(2094)),
+Box(Box(2095)),
+Box(Box(2096)),
+Box(Box(2097)),
+Box(Box(2098)),
+Box(Box(2099)),
+Box(Box(2100)),
+Box(Box(2101)),
+Box(Box(2102)),
+Box(Box(2103)),
+Box(Box(2104)),
+Box(Box(2105)),
+Box(Box(2106)),
+Box(Box(2107)),
+Box(Box(2108)),
+Box(Box(2109)),
+Box(Box(2110)),
+Box(Box(2111)),
+Box(Box(2112)),
+Box(Box(2113)),
+Box(Box(2114)),
+Box(Box(2115)),
+Box(Box(2116)),
+Box(Box(2117)),
+Box(Box(2118)),
+Box(Box(2119)),
+Box(Box(2120)),
+Box(Box(2121)),
+Box(Box(2122)),
+Box(Box(2123)),
+Box(Box(2124)),
+Box(Box(2125)),
+Box(Box(2126)),
+Box(Box(2127)),
+Box(Box(2128)),
+Box(Box(2129)),
+Box(Box(2130)),
+Box(Box(2131)),
+Box(Box(2132)),
+Box(Box(2133)),
+Box(Box(2134)),
+Box(Box(2135)),
+Box(Box(2136)),
+Box(Box(2137)),
+Box(Box(2138)),
+Box(Box(2139)),
+Box(Box(2140)),
+Box(Box(2141)),
+Box(Box(2142)),
+Box(Box(2143)),
+Box(Box(2144)),
+Box(Box(2145)),
+Box(Box(2146)),
+Box(Box(2147)),
+Box(Box(2148)),
+Box(Box(2149)),
+Box(Box(2150)),
+Box(Box(2151)),
+Box(Box(2152)),
+Box(Box(2153)),
+Box(Box(2154)),
+Box(Box(2155)),
+Box(Box(2156)),
+Box(Box(2157)),
+Box(Box(2158)),
+Box(Box(2159)),
+Box(Box(2160)),
+Box(Box(2161)),
+Box(Box(2162)),
+Box(Box(2163)),
+Box(Box(2164)),
+Box(Box(2165)),
+Box(Box(2166)),
+Box(Box(2167)),
+Box(Box(2168)),
+Box(Box(2169)),
+Box(Box(2170)),
+Box(Box(2171)),
+Box(Box(2172)),
+Box(Box(2173)),
+Box(Box(2174)),
+Box(Box(2175)),
+Box(Box(2176)),
+Box(Box(2177)),
+Box(Box(2178)),
+Box(Box(2179)),
+Box(Box(2180)),
+Box(Box(2181)),
+Box(Box(2182)),
+Box(Box(2183)),
+Box(Box(2184)),
+Box(Box(2185)),
+Box(Box(2186)),
+Box(Box(2187)),
+Box(Box(2188)),
+Box(Box(2189)),
+Box(Box(2190)),
+Box(Box(2191)),
+Box(Box(2192)),
+Box(Box(2193)),
+Box(Box(2194)),
+Box(Box(2195)),
+Box(Box(2196)),
+Box(Box(2197)),
+Box(Box(2198)),
+Box(Box(2199)),
+Box(Box(2200)),
+Box(Box(2201)),
+Box(Box(2202)),
+Box(Box(2203)),
+Box(Box(2204)),
+Box(Box(2205)),
+Box(Box(2206)),
+Box(Box(2207)),
+Box(Box(2208)),
+Box(Box(2209)),
+Box(Box(2210)),
+Box(Box(2211)),
+Box(Box(2212)),
+Box(Box(2213)),
+Box(Box(2214)),
+Box(Box(2215)),
+Box(Box(2216)),
+Box(Box(2217)),
+Box(Box(2218)),
+Box(Box(2219)),
+Box(Box(2220)),
+Box(Box(2221)),
+Box(Box(2222)),
+Box(Box(2223)),
+Box(Box(2224)),
+Box(Box(2225)),
+Box(Box(2226)),
+Box(Box(2227)),
+Box(Box(2228)),
+Box(Box(2229)),
+Box(Box(2230)),
+Box(Box(2231)),
+Box(Box(2232)),
+Box(Box(2233)),
+Box(Box(2234)),
+Box(Box(2235)),
+Box(Box(2236)),
+Box(Box(2237)),
+Box(Box(2238)),
+Box(Box(2239)),
+Box(Box(2240)),
+Box(Box(2241)),
+Box(Box(2242)),
+Box(Box(2243)),
+Box(Box(2244)),
+Box(Box(2245)),
+Box(Box(2246)),
+Box(Box(2247)),
+Box(Box(2248)),
+Box(Box(2249)),
+Box(Box(2250)),
+Box(Box(2251)),
+Box(Box(2252)),
+Box(Box(2253)),
+Box(Box(2254)),
+Box(Box(2255)),
+Box(Box(2256)),
+Box(Box(2257)),
+Box(Box(2258)),
+Box(Box(2259)),
+Box(Box(2260)),
+Box(Box(2261)),
+Box(Box(2262)),
+Box(Box(2263)),
+Box(Box(2264)),
+Box(Box(2265)),
+Box(Box(2266)),
+Box(Box(2267)),
+Box(Box(2268)),
+Box(Box(2269)),
+Box(Box(2270)),
+Box(Box(2271)),
+Box(Box(2272)),
+Box(Box(2273)),
+Box(Box(2274)),
+Box(Box(2275)),
+Box(Box(2276)),
+Box(Box(2277)),
+Box(Box(2278)),
+Box(Box(2279)),
+Box(Box(2280)),
+Box(Box(2281)),
+Box(Box(2282)),
+Box(Box(2283)),
+Box(Box(2284)),
+Box(Box(2285)),
+Box(Box(2286)),
+Box(Box(2287)),
+Box(Box(2288)),
+Box(Box(2289)),
+Box(Box(2290)),
+Box(Box(2291)),
+Box(Box(2292)),
+Box(Box(2293)),
+Box(Box(2294)),
+Box(Box(2295)),
+Box(Box(2296)),
+Box(Box(2297)),
+Box(Box(2298)),
+Box(Box(2299)),
+Box(Box(2300)),
+Box(Box(2301)),
+Box(Box(2302)),
+Box(Box(2303)),
+Box(Box(2304)),
+Box(Box(2305)),
+Box(Box(2306)),
+Box(Box(2307)),
+Box(Box(2308)),
+Box(Box(2309)),
+Box(Box(2310)),
+Box(Box(2311)),
+Box(Box(2312)),
+Box(Box(2313)),
+Box(Box(2314)),
+Box(Box(2315)),
+Box(Box(2316)),
+Box(Box(2317)),
+Box(Box(2318)),
+Box(Box(2319)),
+Box(Box(2320)),
+Box(Box(2321)),
+Box(Box(2322)),
+Box(Box(2323)),
+Box(Box(2324)),
+Box(Box(2325)),
+Box(Box(2326)),
+Box(Box(2327)),
+Box(Box(2328)),
+Box(Box(2329)),
+Box(Box(2330)),
+Box(Box(2331)),
+Box(Box(2332)),
+Box(Box(2333)),
+Box(Box(2334)),
+Box(Box(2335)),
+Box(Box(2336)),
+Box(Box(2337)),
+Box(Box(2338)),
+Box(Box(2339)),
+Box(Box(2340)),
+Box(Box(2341)),
+Box(Box(2342)),
+Box(Box(2343)),
+Box(Box(2344)),
+Box(Box(2345)),
+Box(Box(2346)),
+Box(Box(2347)),
+Box(Box(2348)),
+Box(Box(2349)),
+Box(Box(2350)),
+Box(Box(2351)),
+Box(Box(2352)),
+Box(Box(2353)),
+Box(Box(2354)),
+Box(Box(2355)),
+Box(Box(2356)),
+Box(Box(2357)),
+Box(Box(2358)),
+Box(Box(2359)),
+Box(Box(2360)),
+Box(Box(2361)),
+Box(Box(2362)),
+Box(Box(2363)),
+Box(Box(2364)),
+Box(Box(2365)),
+Box(Box(2366)),
+Box(Box(2367)),
+Box(Box(2368)),
+Box(Box(2369)),
+Box(Box(2370)),
+Box(Box(2371)),
+Box(Box(2372)),
+Box(Box(2373)),
+Box(Box(2374)),
+Box(Box(2375)),
+Box(Box(2376)),
+Box(Box(2377)),
+Box(Box(2378)),
+Box(Box(2379)),
+Box(Box(2380)),
+Box(Box(2381)),
+Box(Box(2382)),
+Box(Box(2383)),
+Box(Box(2384)),
+Box(Box(2385)),
+Box(Box(2386)),
+Box(Box(2387)),
+Box(Box(2388)),
+Box(Box(2389)),
+Box(Box(2390)),
+Box(Box(2391)),
+Box(Box(2392)),
+Box(Box(2393)),
+Box(Box(2394)),
+Box(Box(2395)),
+Box(Box(2396)),
+Box(Box(2397)),
+Box(Box(2398)),
+Box(Box(2399)),
+Box(Box(2400)),
+Box(Box(2401)),
+Box(Box(2402)),
+Box(Box(2403)),
+Box(Box(2404)),
+Box(Box(2405)),
+Box(Box(2406)),
+Box(Box(2407)),
+Box(Box(2408)),
+Box(Box(2409)),
+Box(Box(2410)),
+Box(Box(2411)),
+Box(Box(2412)),
+Box(Box(2413)),
+Box(Box(2414)),
+Box(Box(2415)),
+Box(Box(2416)),
+Box(Box(2417)),
+Box(Box(2418)),
+Box(Box(2419)),
+Box(Box(2420)),
+Box(Box(2421)),
+Box(Box(2422)),
+Box(Box(2423)),
+Box(Box(2424)),
+Box(Box(2425)),
+Box(Box(2426)),
+Box(Box(2427)),
+Box(Box(2428)),
+Box(Box(2429)),
+Box(Box(2430)),
+Box(Box(2431)),
+Box(Box(2432)),
+Box(Box(2433)),
+Box(Box(2434)),
+Box(Box(2435)),
+Box(Box(2436)),
+Box(Box(2437)),
+Box(Box(2438)),
+Box(Box(2439)),
+Box(Box(2440)),
+Box(Box(2441)),
+Box(Box(2442)),
+Box(Box(2443)),
+Box(Box(2444)),
+Box(Box(2445)),
+Box(Box(2446)),
+Box(Box(2447)),
+Box(Box(2448)),
+Box(Box(2449)),
+Box(Box(2450)),
+Box(Box(2451)),
+Box(Box(2452)),
+Box(Box(2453)),
+Box(Box(2454)),
+Box(Box(2455)),
+Box(Box(2456)),
+Box(Box(2457)),
+Box(Box(2458)),
+Box(Box(2459)),
+Box(Box(2460)),
+Box(Box(2461)),
+Box(Box(2462)),
+Box(Box(2463)),
+Box(Box(2464)),
+Box(Box(2465)),
+Box(Box(2466)),
+Box(Box(2467)),
+Box(Box(2468)),
+Box(Box(2469)),
+Box(Box(2470)),
+Box(Box(2471)),
+Box(Box(2472)),
+Box(Box(2473)),
+Box(Box(2474)),
+Box(Box(2475)),
+Box(Box(2476)),
+Box(Box(2477)),
+Box(Box(2478)),
+Box(Box(2479)),
+Box(Box(2480)),
+Box(Box(2481)),
+Box(Box(2482)),
+Box(Box(2483)),
+Box(Box(2484)),
+Box(Box(2485)),
+Box(Box(2486)),
+Box(Box(2487)),
+Box(Box(2488)),
+Box(Box(2489)),
+Box(Box(2490)),
+Box(Box(2491)),
+Box(Box(2492)),
+Box(Box(2493)),
+Box(Box(2494)),
+Box(Box(2495)),
+Box(Box(2496)),
+Box(Box(2497)),
+Box(Box(2498)),
+Box(Box(2499)),
+Box(Box(2500)),
+Box(Box(2501)),
+Box(Box(2502)),
+Box(Box(2503)),
+Box(Box(2504)),
+Box(Box(2505)),
+Box(Box(2506)),
+Box(Box(2507)),
+Box(Box(2508)),
+Box(Box(2509)),
+Box(Box(2510)),
+Box(Box(2511)),
+Box(Box(2512)),
+Box(Box(2513)),
+Box(Box(2514)),
+Box(Box(2515)),
+Box(Box(2516)),
+Box(Box(2517)),
+Box(Box(2518)),
+Box(Box(2519)),
+Box(Box(2520)),
+Box(Box(2521)),
+Box(Box(2522)),
+Box(Box(2523)),
+Box(Box(2524)),
+Box(Box(2525)),
+Box(Box(2526)),
+Box(Box(2527)),
+Box(Box(2528)),
+Box(Box(2529)),
+Box(Box(2530)),
+Box(Box(2531)),
+Box(Box(2532)),
+Box(Box(2533)),
+Box(Box(2534)),
+Box(Box(2535)),
+Box(Box(2536)),
+Box(Box(2537)),
+Box(Box(2538)),
+Box(Box(2539)),
+Box(Box(2540)),
+Box(Box(2541)),
+Box(Box(2542)),
+Box(Box(2543)),
+Box(Box(2544)),
+Box(Box(2545)),
+Box(Box(2546)),
+Box(Box(2547)),
+Box(Box(2548)),
+Box(Box(2549)),
+Box(Box(2550)),
+Box(Box(2551)),
+Box(Box(2552)),
+Box(Box(2553)),
+Box(Box(2554)),
+Box(Box(2555)),
+Box(Box(2556)),
+Box(Box(2557)),
+Box(Box(2558)),
+Box(Box(2559)),
+Box(Box(2560)),
+Box(Box(2561)),
+Box(Box(2562)),
+Box(Box(2563)),
+Box(Box(2564)),
+Box(Box(2565)),
+Box(Box(2566)),
+Box(Box(2567)),
+Box(Box(2568)),
+Box(Box(2569)),
+Box(Box(2570)),
+Box(Box(2571)),
+Box(Box(2572)),
+Box(Box(2573)),
+Box(Box(2574)),
+Box(Box(2575)),
+Box(Box(2576)),
+Box(Box(2577)),
+Box(Box(2578)),
+Box(Box(2579)),
+Box(Box(2580)),
+Box(Box(2581)),
+Box(Box(2582)),
+Box(Box(2583)),
+Box(Box(2584)),
+Box(Box(2585)),
+Box(Box(2586)),
+Box(Box(2587)),
+Box(Box(2588)),
+Box(Box(2589)),
+Box(Box(2590)),
+Box(Box(2591)),
+Box(Box(2592)),
+Box(Box(2593)),
+Box(Box(2594)),
+Box(Box(2595)),
+Box(Box(2596)),
+Box(Box(2597)),
+Box(Box(2598)),
+Box(Box(2599)),
+Box(Box(2600)),
+Box(Box(2601)),
+Box(Box(2602)),
+Box(Box(2603)),
+Box(Box(2604)),
+Box(Box(2605)),
+Box(Box(2606)),
+Box(Box(2607)),
+Box(Box(2608)),
+Box(Box(2609)),
+Box(Box(2610)),
+Box(Box(2611)),
+Box(Box(2612)),
+Box(Box(2613)),
+Box(Box(2614)),
+Box(Box(2615)),
+Box(Box(2616)),
+Box(Box(2617)),
+Box(Box(2618)),
+Box(Box(2619)),
+Box(Box(2620)),
+Box(Box(2621)),
+Box(Box(2622)),
+Box(Box(2623)),
+Box(Box(2624)),
+Box(Box(2625)),
+Box(Box(2626)),
+Box(Box(2627)),
+Box(Box(2628)),
+Box(Box(2629)),
+Box(Box(2630)),
+Box(Box(2631)),
+Box(Box(2632)),
+Box(Box(2633)),
+Box(Box(2634)),
+Box(Box(2635)),
+Box(Box(2636)),
+Box(Box(2637)),
+Box(Box(2638)),
+Box(Box(2639)),
+Box(Box(2640)),
+Box(Box(2641)),
+Box(Box(2642)),
+Box(Box(2643)),
+Box(Box(2644)),
+Box(Box(2645)),
+Box(Box(2646)),
+Box(Box(2647)),
+Box(Box(2648)),
+Box(Box(2649)),
+Box(Box(2650)),
+Box(Box(2651)),
+Box(Box(2652)),
+Box(Box(2653)),
+Box(Box(2654)),
+Box(Box(2655)),
+Box(Box(2656)),
+Box(Box(2657)),
+Box(Box(2658)),
+Box(Box(2659)),
+Box(Box(2660)),
+Box(Box(2661)),
+Box(Box(2662)),
+Box(Box(2663)),
+Box(Box(2664)),
+Box(Box(2665)),
+Box(Box(2666)),
+Box(Box(2667)),
+Box(Box(2668)),
+Box(Box(2669)),
+Box(Box(2670)),
+Box(Box(2671)),
+Box(Box(2672)),
+Box(Box(2673)),
+Box(Box(2674)),
+Box(Box(2675)),
+Box(Box(2676)),
+Box(Box(2677)),
+Box(Box(2678)),
+Box(Box(2679)),
+Box(Box(2680)),
+Box(Box(2681)),
+Box(Box(2682)),
+Box(Box(2683)),
+Box(Box(2684)),
+Box(Box(2685)),
+Box(Box(2686)),
+Box(Box(2687)),
+Box(Box(2688)),
+Box(Box(2689)),
+Box(Box(2690)),
+Box(Box(2691)),
+Box(Box(2692)),
+Box(Box(2693)),
+Box(Box(2694)),
+Box(Box(2695)),
+Box(Box(2696)),
+Box(Box(2697)),
+Box(Box(2698)),
+Box(Box(2699)),
+Box(Box(2700)),
+Box(Box(2701)),
+Box(Box(2702)),
+Box(Box(2703)),
+Box(Box(2704)),
+Box(Box(2705)),
+Box(Box(2706)),
+Box(Box(2707)),
+Box(Box(2708)),
+Box(Box(2709)),
+Box(Box(2710)),
+Box(Box(2711)),
+Box(Box(2712)),
+Box(Box(2713)),
+Box(Box(2714)),
+Box(Box(2715)),
+Box(Box(2716)),
+Box(Box(2717)),
+Box(Box(2718)),
+Box(Box(2719)),
+Box(Box(2720)),
+Box(Box(2721)),
+Box(Box(2722)),
+Box(Box(2723)),
+Box(Box(2724)),
+Box(Box(2725)),
+Box(Box(2726)),
+Box(Box(2727)),
+Box(Box(2728)),
+Box(Box(2729)),
+Box(Box(2730)),
+Box(Box(2731)),
+Box(Box(2732)),
+Box(Box(2733)),
+Box(Box(2734)),
+Box(Box(2735)),
+Box(Box(2736)),
+Box(Box(2737)),
+Box(Box(2738)),
+Box(Box(2739)),
+Box(Box(2740)),
+Box(Box(2741)),
+Box(Box(2742)),
+Box(Box(2743)),
+Box(Box(2744)),
+Box(Box(2745)),
+Box(Box(2746)),
+Box(Box(2747)),
+Box(Box(2748)),
+Box(Box(2749)),
+Box(Box(2750)),
+Box(Box(2751)),
+Box(Box(2752)),
+Box(Box(2753)),
+Box(Box(2754)),
+Box(Box(2755)),
+Box(Box(2756)),
+Box(Box(2757)),
+Box(Box(2758)),
+Box(Box(2759)),
+Box(Box(2760)),
+Box(Box(2761)),
+Box(Box(2762)),
+Box(Box(2763)),
+Box(Box(2764)),
+Box(Box(2765)),
+Box(Box(2766)),
+Box(Box(2767)),
+Box(Box(2768)),
+Box(Box(2769)),
+Box(Box(2770)),
+Box(Box(2771)),
+Box(Box(2772)),
+Box(Box(2773)),
+Box(Box(2774)),
+Box(Box(2775)),
+Box(Box(2776)),
+Box(Box(2777)),
+Box(Box(2778)),
+Box(Box(2779)),
+Box(Box(2780)),
+Box(Box(2781)),
+Box(Box(2782)),
+Box(Box(2783)),
+Box(Box(2784)),
+Box(Box(2785)),
+Box(Box(2786)),
+Box(Box(2787)),
+Box(Box(2788)),
+Box(Box(2789)),
+Box(Box(2790)),
+Box(Box(2791)),
+Box(Box(2792)),
+Box(Box(2793)),
+Box(Box(2794)),
+Box(Box(2795)),
+Box(Box(2796)),
+Box(Box(2797)),
+Box(Box(2798)),
+Box(Box(2799)),
+Box(Box(2800)),
+Box(Box(2801)),
+Box(Box(2802)),
+Box(Box(2803)),
+Box(Box(2804)),
+Box(Box(2805)),
+Box(Box(2806)),
+Box(Box(2807)),
+Box(Box(2808)),
+Box(Box(2809)),
+Box(Box(2810)),
+Box(Box(2811)),
+Box(Box(2812)),
+Box(Box(2813)),
+Box(Box(2814)),
+Box(Box(2815)),
+Box(Box(2816)),
+Box(Box(2817)),
+Box(Box(2818)),
+Box(Box(2819)),
+Box(Box(2820)),
+Box(Box(2821)),
+Box(Box(2822)),
+Box(Box(2823)),
+Box(Box(2824)),
+Box(Box(2825)),
+Box(Box(2826)),
+Box(Box(2827)),
+Box(Box(2828)),
+Box(Box(2829)),
+Box(Box(2830)),
+Box(Box(2831)),
+Box(Box(2832)),
+Box(Box(2833)),
+Box(Box(2834)),
+Box(Box(2835)),
+Box(Box(2836)),
+Box(Box(2837)),
+Box(Box(2838)),
+Box(Box(2839)),
+Box(Box(2840)),
+Box(Box(2841)),
+Box(Box(2842)),
+Box(Box(2843)),
+Box(Box(2844)),
+Box(Box(2845)),
+Box(Box(2846)),
+Box(Box(2847)),
+Box(Box(2848)),
+Box(Box(2849)),
+Box(Box(2850)),
+Box(Box(2851)),
+Box(Box(2852)),
+Box(Box(2853)),
+Box(Box(2854)),
+Box(Box(2855)),
+Box(Box(2856)),
+Box(Box(2857)),
+Box(Box(2858)),
+Box(Box(2859)),
+Box(Box(2860)),
+Box(Box(2861)),
+Box(Box(2862)),
+Box(Box(2863)),
+Box(Box(2864)),
+Box(Box(2865)),
+Box(Box(2866)),
+Box(Box(2867)),
+Box(Box(2868)),
+Box(Box(2869)),
+Box(Box(2870)),
+Box(Box(2871)),
+Box(Box(2872)),
+Box(Box(2873)),
+Box(Box(2874)),
+Box(Box(2875)),
+Box(Box(2876)),
+Box(Box(2877)),
+Box(Box(2878)),
+Box(Box(2879)),
+Box(Box(2880)),
+Box(Box(2881)),
+Box(Box(2882)),
+Box(Box(2883)),
+Box(Box(2884)),
+Box(Box(2885)),
+Box(Box(2886)),
+Box(Box(2887)),
+Box(Box(2888)),
+Box(Box(2889)),
+Box(Box(2890)),
+Box(Box(2891)),
+Box(Box(2892)),
+Box(Box(2893)),
+Box(Box(2894)),
+Box(Box(2895)),
+Box(Box(2896)),
+Box(Box(2897)),
+Box(Box(2898)),
+Box(Box(2899)),
+Box(Box(2900)),
+Box(Box(2901)),
+Box(Box(2902)),
+Box(Box(2903)),
+Box(Box(2904)),
+Box(Box(2905)),
+Box(Box(2906)),
+Box(Box(2907)),
+Box(Box(2908)),
+Box(Box(2909)),
+Box(Box(2910)),
+Box(Box(2911)),
+Box(Box(2912)),
+Box(Box(2913)),
+Box(Box(2914)),
+Box(Box(2915)),
+Box(Box(2916)),
+Box(Box(2917)),
+Box(Box(2918)),
+Box(Box(2919)),
+Box(Box(2920)),
+Box(Box(2921)),
+Box(Box(2922)),
+Box(Box(2923)),
+Box(Box(2924)),
+Box(Box(2925)),
+Box(Box(2926)),
+Box(Box(2927)),
+Box(Box(2928)),
+Box(Box(2929)),
+Box(Box(2930)),
+Box(Box(2931)),
+Box(Box(2932)),
+Box(Box(2933)),
+Box(Box(2934)),
+Box(Box(2935)),
+Box(Box(2936)),
+Box(Box(2937)),
+Box(Box(2938)),
+Box(Box(2939)),
+Box(Box(2940)),
+Box(Box(2941)),
+Box(Box(2942)),
+Box(Box(2943)),
+Box(Box(2944)),
+Box(Box(2945)),
+Box(Box(2946)),
+Box(Box(2947)),
+Box(Box(2948)),
+Box(Box(2949)),
+Box(Box(2950)),
+Box(Box(2951)),
+Box(Box(2952)),
+Box(Box(2953)),
+Box(Box(2954)),
+Box(Box(2955)),
+Box(Box(2956)),
+Box(Box(2957)),
+Box(Box(2958)),
+Box(Box(2959)),
+Box(Box(2960)),
+Box(Box(2961)),
+Box(Box(2962)),
+Box(Box(2963)),
+Box(Box(2964)),
+Box(Box(2965)),
+Box(Box(2966)),
+Box(Box(2967)),
+Box(Box(2968)),
+Box(Box(2969)),
+Box(Box(2970)),
+Box(Box(2971)),
+Box(Box(2972)),
+Box(Box(2973)),
+Box(Box(2974)),
+Box(Box(2975)),
+Box(Box(2976)),
+Box(Box(2977)),
+Box(Box(2978)),
+Box(Box(2979)),
+Box(Box(2980)),
+Box(Box(2981)),
+Box(Box(2982)),
+Box(Box(2983)),
+Box(Box(2984)),
+Box(Box(2985)),
+Box(Box(2986)),
+Box(Box(2987)),
+Box(Box(2988)),
+Box(Box(2989)),
+Box(Box(2990)),
+Box(Box(2991)),
+Box(Box(2992)),
+Box(Box(2993)),
+Box(Box(2994)),
+Box(Box(2995)),
+Box(Box(2996)),
+Box(Box(2997)),
+Box(Box(2998)),
+Box(Box(2999)),
+Box(Box(3000)),
+Box(Box(3001)),
+Box(Box(3002)),
+Box(Box(3003)),
+Box(Box(3004)),
+Box(Box(3005)),
+Box(Box(3006)),
+Box(Box(3007)),
+Box(Box(3008)),
+Box(Box(3009)),
+Box(Box(3010)),
+Box(Box(3011)),
+Box(Box(3012)),
+Box(Box(3013)),
+Box(Box(3014)),
+Box(Box(3015)),
+Box(Box(3016)),
+Box(Box(3017)),
+Box(Box(3018)),
+Box(Box(3019)),
+Box(Box(3020)),
+Box(Box(3021)),
+Box(Box(3022)),
+Box(Box(3023)),
+Box(Box(3024)),
+Box(Box(3025)),
+Box(Box(3026)),
+Box(Box(3027)),
+Box(Box(3028)),
+Box(Box(3029)),
+Box(Box(3030)),
+Box(Box(3031)),
+Box(Box(3032)),
+Box(Box(3033)),
+Box(Box(3034)),
+Box(Box(3035)),
+Box(Box(3036)),
+Box(Box(3037)),
+Box(Box(3038)),
+Box(Box(3039)),
+Box(Box(3040)),
+Box(Box(3041)),
+Box(Box(3042)),
+Box(Box(3043)),
+Box(Box(3044)),
+Box(Box(3045)),
+Box(Box(3046)),
+Box(Box(3047)),
+Box(Box(3048)),
+Box(Box(3049)),
+Box(Box(3050)),
+Box(Box(3051)),
+Box(Box(3052)),
+Box(Box(3053)),
+Box(Box(3054)),
+Box(Box(3055)),
+Box(Box(3056)),
+Box(Box(3057)),
+Box(Box(3058)),
+Box(Box(3059)),
+Box(Box(3060)),
+Box(Box(3061)),
+Box(Box(3062)),
+Box(Box(3063)),
+Box(Box(3064)),
+Box(Box(3065)),
+Box(Box(3066)),
+Box(Box(3067)),
+Box(Box(3068)),
+Box(Box(3069)),
+Box(Box(3070)),
+Box(Box(3071)),
+Box(Box(3072)),
+Box(Box(3073)),
+Box(Box(3074)),
+Box(Box(3075)),
+Box(Box(3076)),
+Box(Box(3077)),
+Box(Box(3078)),
+Box(Box(3079)),
+Box(Box(3080)),
+Box(Box(3081)),
+Box(Box(3082)),
+Box(Box(3083)),
+Box(Box(3084)),
+Box(Box(3085)),
+Box(Box(3086)),
+Box(Box(3087)),
+Box(Box(3088)),
+Box(Box(3089)),
+Box(Box(3090)),
+Box(Box(3091)),
+Box(Box(3092)),
+Box(Box(3093)),
+Box(Box(3094)),
+Box(Box(3095)),
+Box(Box(3096)),
+Box(Box(3097)),
+Box(Box(3098)),
+Box(Box(3099)),
+Box(Box(3100)),
+Box(Box(3101)),
+Box(Box(3102)),
+Box(Box(3103)),
+Box(Box(3104)),
+Box(Box(3105)),
+Box(Box(3106)),
+Box(Box(3107)),
+Box(Box(3108)),
+Box(Box(3109)),
+Box(Box(3110)),
+Box(Box(3111)),
+Box(Box(3112)),
+Box(Box(3113)),
+Box(Box(3114)),
+Box(Box(3115)),
+Box(Box(3116)),
+Box(Box(3117)),
+Box(Box(3118)),
+Box(Box(3119)),
+Box(Box(3120)),
+Box(Box(3121)),
+Box(Box(3122)),
+Box(Box(3123)),
+Box(Box(3124)),
+Box(Box(3125)),
+Box(Box(3126)),
+Box(Box(3127)),
+Box(Box(3128)),
+Box(Box(3129)),
+Box(Box(3130)),
+Box(Box(3131)),
+Box(Box(3132)),
+Box(Box(3133)),
+Box(Box(3134)),
+Box(Box(3135)),
+Box(Box(3136)),
+Box(Box(3137)),
+Box(Box(3138)),
+Box(Box(3139)),
+Box(Box(3140)),
+Box(Box(3141)),
+Box(Box(3142)),
+Box(Box(3143)),
+Box(Box(3144)),
+Box(Box(3145)),
+Box(Box(3146)),
+Box(Box(3147)),
+Box(Box(3148)),
+Box(Box(3149)),
+Box(Box(3150)),
+Box(Box(3151)),
+Box(Box(3152)),
+Box(Box(3153)),
+Box(Box(3154)),
+Box(Box(3155)),
+Box(Box(3156)),
+Box(Box(3157)),
+Box(Box(3158)),
+Box(Box(3159)),
+Box(Box(3160)),
+Box(Box(3161)),
+Box(Box(3162)),
+Box(Box(3163)),
+Box(Box(3164)),
+Box(Box(3165)),
+Box(Box(3166)),
+Box(Box(3167)),
+Box(Box(3168)),
+Box(Box(3169)),
+Box(Box(3170)),
+Box(Box(3171)),
+Box(Box(3172)),
+Box(Box(3173)),
+Box(Box(3174)),
+Box(Box(3175)),
+Box(Box(3176)),
+Box(Box(3177)),
+Box(Box(3178)),
+Box(Box(3179)),
+Box(Box(3180)),
+Box(Box(3181)),
+Box(Box(3182)),
+Box(Box(3183)),
+Box(Box(3184)),
+Box(Box(3185)),
+Box(Box(3186)),
+Box(Box(3187)),
+Box(Box(3188)),
+Box(Box(3189)),
+Box(Box(3190)),
+Box(Box(3191)),
+Box(Box(3192)),
+Box(Box(3193)),
+Box(Box(3194)),
+Box(Box(3195)),
+Box(Box(3196)),
+Box(Box(3197)),
+Box(Box(3198)),
+Box(Box(3199)),
+Box(Box(3200)),
+Box(Box(3201)),
+Box(Box(3202)),
+Box(Box(3203)),
+Box(Box(3204)),
+Box(Box(3205)),
+Box(Box(3206)),
+Box(Box(3207)),
+Box(Box(3208)),
+Box(Box(3209)),
+Box(Box(3210)),
+Box(Box(3211)),
+Box(Box(3212)),
+Box(Box(3213)),
+Box(Box(3214)),
+Box(Box(3215)),
+Box(Box(3216)),
+Box(Box(3217)),
+Box(Box(3218)),
+Box(Box(3219)),
+Box(Box(3220)),
+Box(Box(3221)),
+Box(Box(3222)),
+Box(Box(3223)),
+Box(Box(3224)),
+Box(Box(3225)),
+Box(Box(3226)),
+Box(Box(3227)),
+Box(Box(3228)),
+Box(Box(3229)),
+Box(Box(3230)),
+Box(Box(3231)),
+Box(Box(3232)),
+Box(Box(3233)),
+Box(Box(3234)),
+Box(Box(3235)),
+Box(Box(3236)),
+Box(Box(3237)),
+Box(Box(3238)),
+Box(Box(3239)),
+Box(Box(3240)),
+Box(Box(3241)),
+Box(Box(3242)),
+Box(Box(3243)),
+Box(Box(3244)),
+Box(Box(3245)),
+Box(Box(3246)),
+Box(Box(3247)),
+Box(Box(3248)),
+Box(Box(3249)),
+Box(Box(3250)),
+Box(Box(3251)),
+Box(Box(3252)),
+Box(Box(3253)),
+Box(Box(3254)),
+Box(Box(3255)),
+Box(Box(3256)),
+Box(Box(3257)),
+Box(Box(3258)),
+Box(Box(3259)),
+Box(Box(3260)),
+Box(Box(3261)),
+Box(Box(3262)),
+Box(Box(3263)),
+Box(Box(3264)),
+Box(Box(3265)),
+Box(Box(3266)),
+Box(Box(3267)),
+Box(Box(3268)),
+Box(Box(3269)),
+Box(Box(3270)),
+Box(Box(3271)),
+Box(Box(3272)),
+Box(Box(3273)),
+Box(Box(3274)),
+Box(Box(3275)),
+Box(Box(3276)),
+Box(Box(3277)),
+Box(Box(3278)),
+Box(Box(3279)),
+Box(Box(3280)),
+Box(Box(3281)),
+Box(Box(3282)),
+Box(Box(3283)),
+Box(Box(3284)),
+Box(Box(3285)),
+Box(Box(3286)),
+Box(Box(3287)),
+Box(Box(3288)),
+Box(Box(3289)),
+Box(Box(3290)),
+Box(Box(3291)),
+Box(Box(3292)),
+Box(Box(3293)),
+Box(Box(3294)),
+Box(Box(3295)),
+Box(Box(3296)),
+Box(Box(3297)),
+Box(Box(3298)),
+Box(Box(3299)),
+Box(Box(3300)),
+Box(Box(3301)),
+Box(Box(3302)),
+Box(Box(3303)),
+Box(Box(3304)),
+Box(Box(3305)),
+Box(Box(3306)),
+Box(Box(3307)),
+Box(Box(3308)),
+Box(Box(3309)),
+Box(Box(3310)),
+Box(Box(3311)),
+Box(Box(3312)),
+Box(Box(3313)),
+Box(Box(3314)),
+Box(Box(3315)),
+Box(Box(3316)),
+Box(Box(3317)),
+Box(Box(3318)),
+Box(Box(3319)),
+Box(Box(3320)),
+Box(Box(3321)),
+Box(Box(3322)),
+Box(Box(3323)),
+Box(Box(3324)),
+Box(Box(3325)),
+Box(Box(3326)),
+Box(Box(3327)),
+Box(Box(3328)),
+Box(Box(3329)),
+Box(Box(3330)),
+Box(Box(3331)),
+Box(Box(3332)),
+Box(Box(3333)),
+Box(Box(3334)),
+Box(Box(3335)),
+Box(Box(3336)),
+Box(Box(3337)),
+Box(Box(3338)),
+Box(Box(3339)),
+Box(Box(3340)),
+Box(Box(3341)),
+Box(Box(3342)),
+Box(Box(3343)),
+Box(Box(3344)),
+Box(Box(3345)),
+Box(Box(3346)),
+Box(Box(3347)),
+Box(Box(3348)),
+Box(Box(3349)),
+Box(Box(3350)),
+Box(Box(3351)),
+Box(Box(3352)),
+Box(Box(3353)),
+Box(Box(3354)),
+Box(Box(3355)),
+Box(Box(3356)),
+Box(Box(3357)),
+Box(Box(3358)),
+Box(Box(3359)),
+Box(Box(3360)),
+Box(Box(3361)),
+Box(Box(3362)),
+Box(Box(3363)),
+Box(Box(3364)),
+Box(Box(3365)),
+Box(Box(3366)),
+Box(Box(3367)),
+Box(Box(3368)),
+Box(Box(3369)),
+Box(Box(3370)),
+Box(Box(3371)),
+Box(Box(3372)),
+Box(Box(3373)),
+Box(Box(3374)),
+Box(Box(3375)),
+Box(Box(3376)),
+Box(Box(3377)),
+Box(Box(3378)),
+Box(Box(3379)),
+Box(Box(3380)),
+Box(Box(3381)),
+Box(Box(3382)),
+Box(Box(3383)),
+Box(Box(3384)),
+Box(Box(3385)),
+Box(Box(3386)),
+Box(Box(3387)),
+Box(Box(3388)),
+Box(Box(3389)),
+Box(Box(3390)),
+Box(Box(3391)),
+Box(Box(3392)),
+Box(Box(3393)),
+Box(Box(3394)),
+Box(Box(3395)),
+Box(Box(3396)),
+Box(Box(3397)),
+Box(Box(3398)),
+Box(Box(3399)),
+Box(Box(3400)),
+Box(Box(3401)),
+Box(Box(3402)),
+Box(Box(3403)),
+Box(Box(3404)),
+Box(Box(3405)),
+Box(Box(3406)),
+Box(Box(3407)),
+Box(Box(3408)),
+Box(Box(3409)),
+Box(Box(3410)),
+Box(Box(3411)),
+Box(Box(3412)),
+Box(Box(3413)),
+Box(Box(3414)),
+Box(Box(3415)),
+Box(Box(3416)),
+Box(Box(3417)),
+Box(Box(3418)),
+Box(Box(3419)),
+Box(Box(3420)),
+Box(Box(3421)),
+Box(Box(3422)),
+Box(Box(3423)),
+Box(Box(3424)),
+Box(Box(3425)),
+Box(Box(3426)),
+Box(Box(3427)),
+Box(Box(3428)),
+Box(Box(3429)),
+Box(Box(3430)),
+Box(Box(3431)),
+Box(Box(3432)),
+Box(Box(3433)),
+Box(Box(3434)),
+Box(Box(3435)),
+Box(Box(3436)),
+Box(Box(3437)),
+Box(Box(3438)),
+Box(Box(3439)),
+Box(Box(3440)),
+Box(Box(3441)),
+Box(Box(3442)),
+Box(Box(3443)),
+Box(Box(3444)),
+Box(Box(3445)),
+Box(Box(3446)),
+Box(Box(3447)),
+Box(Box(3448)),
+Box(Box(3449)),
+Box(Box(3450)),
+Box(Box(3451)),
+Box(Box(3452)),
+Box(Box(3453)),
+Box(Box(3454)),
+Box(Box(3455)),
+Box(Box(3456)),
+Box(Box(3457)),
+Box(Box(3458)),
+Box(Box(3459)),
+Box(Box(3460)),
+Box(Box(3461)),
+Box(Box(3462)),
+Box(Box(3463)),
+Box(Box(3464)),
+Box(Box(3465)),
+Box(Box(3466)),
+Box(Box(3467)),
+Box(Box(3468)),
+Box(Box(3469)),
+Box(Box(3470)),
+Box(Box(3471)),
+Box(Box(3472)),
+Box(Box(3473)),
+Box(Box(3474)),
+Box(Box(3475)),
+Box(Box(3476)),
+Box(Box(3477)),
+Box(Box(3478)),
+Box(Box(3479)),
+Box(Box(3480)),
+Box(Box(3481)),
+Box(Box(3482)),
+Box(Box(3483)),
+Box(Box(3484)),
+Box(Box(3485)),
+Box(Box(3486)),
+Box(Box(3487)),
+Box(Box(3488)),
+Box(Box(3489)),
+Box(Box(3490)),
+Box(Box(3491)),
+Box(Box(3492)),
+Box(Box(3493)),
+Box(Box(3494)),
+Box(Box(3495)),
+Box(Box(3496)),
+Box(Box(3497)),
+Box(Box(3498)),
+Box(Box(3499)),
+Box(Box(3500)),
+Box(Box(3501)),
+Box(Box(3502)),
+Box(Box(3503)),
+Box(Box(3504)),
+Box(Box(3505)),
+Box(Box(3506)),
+Box(Box(3507)),
+Box(Box(3508)),
+Box(Box(3509)),
+Box(Box(3510)),
+Box(Box(3511)),
+Box(Box(3512)),
+Box(Box(3513)),
+Box(Box(3514)),
+Box(Box(3515)),
+Box(Box(3516)),
+Box(Box(3517)),
+Box(Box(3518)),
+Box(Box(3519)),
+Box(Box(3520)),
+Box(Box(3521)),
+Box(Box(3522)),
+Box(Box(3523)),
+Box(Box(3524)),
+Box(Box(3525)),
+Box(Box(3526)),
+Box(Box(3527)),
+Box(Box(3528)),
+Box(Box(3529)),
+Box(Box(3530)),
+Box(Box(3531)),
+Box(Box(3532)),
+Box(Box(3533)),
+Box(Box(3534)),
+Box(Box(3535)),
+Box(Box(3536)),
+Box(Box(3537)),
+Box(Box(3538)),
+Box(Box(3539)),
+Box(Box(3540)),
+Box(Box(3541)),
+Box(Box(3542)),
+Box(Box(3543)),
+Box(Box(3544)),
+Box(Box(3545)),
+Box(Box(3546)),
+Box(Box(3547)),
+Box(Box(3548)),
+Box(Box(3549)),
+Box(Box(3550)),
+Box(Box(3551)),
+Box(Box(3552)),
+Box(Box(3553)),
+Box(Box(3554)),
+Box(Box(3555)),
+Box(Box(3556)),
+Box(Box(3557)),
+Box(Box(3558)),
+Box(Box(3559)),
+Box(Box(3560)),
+Box(Box(3561)),
+Box(Box(3562)),
+Box(Box(3563)),
+Box(Box(3564)),
+Box(Box(3565)),
+Box(Box(3566)),
+Box(Box(3567)),
+Box(Box(3568)),
+Box(Box(3569)),
+Box(Box(3570)),
+Box(Box(3571)),
+Box(Box(3572)),
+Box(Box(3573)),
+Box(Box(3574)),
+Box(Box(3575)),
+Box(Box(3576)),
+Box(Box(3577)),
+Box(Box(3578)),
+Box(Box(3579)),
+Box(Box(3580)),
+Box(Box(3581)),
+Box(Box(3582)),
+Box(Box(3583)),
+Box(Box(3584)),
+Box(Box(3585)),
+Box(Box(3586)),
+Box(Box(3587)),
+Box(Box(3588)),
+Box(Box(3589)),
+Box(Box(3590)),
+Box(Box(3591)),
+Box(Box(3592)),
+Box(Box(3593)),
+Box(Box(3594)),
+Box(Box(3595)),
+Box(Box(3596)),
+Box(Box(3597)),
+Box(Box(3598)),
+Box(Box(3599)),
+Box(Box(3600)),
+Box(Box(3601)),
+Box(Box(3602)),
+Box(Box(3603)),
+Box(Box(3604)),
+Box(Box(3605)),
+Box(Box(3606)),
+Box(Box(3607)),
+Box(Box(3608)),
+Box(Box(3609)),
+Box(Box(3610)),
+Box(Box(3611)),
+Box(Box(3612)),
+Box(Box(3613)),
+Box(Box(3614)),
+Box(Box(3615)),
+Box(Box(3616)),
+Box(Box(3617)),
+Box(Box(3618)),
+Box(Box(3619)),
+Box(Box(3620)),
+Box(Box(3621)),
+Box(Box(3622)),
+Box(Box(3623)),
+Box(Box(3624)),
+Box(Box(3625)),
+Box(Box(3626)),
+Box(Box(3627)),
+Box(Box(3628)),
+Box(Box(3629)),
+Box(Box(3630)),
+Box(Box(3631)),
+Box(Box(3632)),
+Box(Box(3633)),
+Box(Box(3634)),
+Box(Box(3635)),
+Box(Box(3636)),
+Box(Box(3637)),
+Box(Box(3638)),
+Box(Box(3639)),
+Box(Box(3640)),
+Box(Box(3641)),
+Box(Box(3642)),
+Box(Box(3643)),
+Box(Box(3644)),
+Box(Box(3645)),
+Box(Box(3646)),
+Box(Box(3647)),
+Box(Box(3648)),
+Box(Box(3649)),
+Box(Box(3650)),
+Box(Box(3651)),
+Box(Box(3652)),
+Box(Box(3653)),
+Box(Box(3654)),
+Box(Box(3655)),
+Box(Box(3656)),
+Box(Box(3657)),
+Box(Box(3658)),
+Box(Box(3659)),
+Box(Box(3660)),
+Box(Box(3661)),
+Box(Box(3662)),
+Box(Box(3663)),
+Box(Box(3664)),
+Box(Box(3665)),
+Box(Box(3666)),
+Box(Box(3667)),
+Box(Box(3668)),
+Box(Box(3669)),
+Box(Box(3670)),
+Box(Box(3671)),
+Box(Box(3672)),
+Box(Box(3673)),
+Box(Box(3674)),
+Box(Box(3675)),
+Box(Box(3676)),
+Box(Box(3677)),
+Box(Box(3678)),
+Box(Box(3679)),
+Box(Box(3680)),
+Box(Box(3681)),
+Box(Box(3682)),
+Box(Box(3683)),
+Box(Box(3684)),
+Box(Box(3685)),
+Box(Box(3686)),
+Box(Box(3687)),
+Box(Box(3688)),
+Box(Box(3689)),
+Box(Box(3690)),
+Box(Box(3691)),
+Box(Box(3692)),
+Box(Box(3693)),
+Box(Box(3694)),
+Box(Box(3695)),
+Box(Box(3696)),
+Box(Box(3697)),
+Box(Box(3698)),
+Box(Box(3699)),
+Box(Box(3700)),
+Box(Box(3701)),
+Box(Box(3702)),
+Box(Box(3703)),
+Box(Box(3704)),
+Box(Box(3705)),
+Box(Box(3706)),
+Box(Box(3707)),
+Box(Box(3708)),
+Box(Box(3709)),
+Box(Box(3710)),
+Box(Box(3711)),
+Box(Box(3712)),
+Box(Box(3713)),
+Box(Box(3714)),
+Box(Box(3715)),
+Box(Box(3716)),
+Box(Box(3717)),
+Box(Box(3718)),
+Box(Box(3719)),
+Box(Box(3720)),
+Box(Box(3721)),
+Box(Box(3722)),
+Box(Box(3723)),
+Box(Box(3724)),
+Box(Box(3725)),
+Box(Box(3726)),
+Box(Box(3727)),
+Box(Box(3728)),
+Box(Box(3729)),
+Box(Box(3730)),
+Box(Box(3731)),
+Box(Box(3732)),
+Box(Box(3733)),
+Box(Box(3734)),
+Box(Box(3735)),
+Box(Box(3736)),
+Box(Box(3737)),
+Box(Box(3738)),
+Box(Box(3739)),
+Box(Box(3740)),
+Box(Box(3741)),
+Box(Box(3742)),
+Box(Box(3743)),
+Box(Box(3744)),
+Box(Box(3745)),
+Box(Box(3746)),
+Box(Box(3747)),
+Box(Box(3748)),
+Box(Box(3749)),
+Box(Box(3750)),
+Box(Box(3751)),
+Box(Box(3752)),
+Box(Box(3753)),
+Box(Box(3754)),
+Box(Box(3755)),
+Box(Box(3756)),
+Box(Box(3757)),
+Box(Box(3758)),
+Box(Box(3759)),
+Box(Box(3760)),
+Box(Box(3761)),
+Box(Box(3762)),
+Box(Box(3763)),
+Box(Box(3764)),
+Box(Box(3765)),
+Box(Box(3766)),
+Box(Box(3767)),
+Box(Box(3768)),
+Box(Box(3769)),
+Box(Box(3770)),
+Box(Box(3771)),
+Box(Box(3772)),
+Box(Box(3773)),
+Box(Box(3774)),
+Box(Box(3775)),
+Box(Box(3776)),
+Box(Box(3777)),
+Box(Box(3778)),
+Box(Box(3779)),
+Box(Box(3780)),
+Box(Box(3781)),
+Box(Box(3782)),
+Box(Box(3783)),
+Box(Box(3784)),
+Box(Box(3785)),
+Box(Box(3786)),
+Box(Box(3787)),
+Box(Box(3788)),
+Box(Box(3789)),
+Box(Box(3790)),
+Box(Box(3791)),
+Box(Box(3792)),
+Box(Box(3793)),
+Box(Box(3794)),
+Box(Box(3795)),
+Box(Box(3796)),
+Box(Box(3797)),
+Box(Box(3798)),
+Box(Box(3799)),
+Box(Box(3800)),
+Box(Box(3801)),
+Box(Box(3802)),
+Box(Box(3803)),
+Box(Box(3804)),
+Box(Box(3805)),
+Box(Box(3806)),
+Box(Box(3807)),
+Box(Box(3808)),
+Box(Box(3809)),
+Box(Box(3810)),
+Box(Box(3811)),
+Box(Box(3812)),
+Box(Box(3813)),
+Box(Box(3814)),
+Box(Box(3815)),
+Box(Box(3816)),
+Box(Box(3817)),
+Box(Box(3818)),
+Box(Box(3819)),
+Box(Box(3820)),
+Box(Box(3821)),
+Box(Box(3822)),
+Box(Box(3823)),
+Box(Box(3824)),
+Box(Box(3825)),
+Box(Box(3826)),
+Box(Box(3827)),
+Box(Box(3828)),
+Box(Box(3829)),
+Box(Box(3830)),
+Box(Box(3831)),
+Box(Box(3832)),
+Box(Box(3833)),
+Box(Box(3834)),
+Box(Box(3835)),
+Box(Box(3836)),
+Box(Box(3837)),
+Box(Box(3838)),
+Box(Box(3839)),
+Box(Box(3840)),
+Box(Box(3841)),
+Box(Box(3842)),
+Box(Box(3843)),
+Box(Box(3844)),
+Box(Box(3845)),
+Box(Box(3846)),
+Box(Box(3847)),
+Box(Box(3848)),
+Box(Box(3849)),
+Box(Box(3850)),
+Box(Box(3851)),
+Box(Box(3852)),
+Box(Box(3853)),
+Box(Box(3854)),
+Box(Box(3855)),
+Box(Box(3856)),
+Box(Box(3857)),
+Box(Box(3858)),
+Box(Box(3859)),
+Box(Box(3860)),
+Box(Box(3861)),
+Box(Box(3862)),
+Box(Box(3863)),
+Box(Box(3864)),
+Box(Box(3865)),
+Box(Box(3866)),
+Box(Box(3867)),
+Box(Box(3868)),
+Box(Box(3869)),
+Box(Box(3870)),
+Box(Box(3871)),
+Box(Box(3872)),
+Box(Box(3873)),
+Box(Box(3874)),
+Box(Box(3875)),
+Box(Box(3876)),
+Box(Box(3877)),
+Box(Box(3878)),
+Box(Box(3879)),
+Box(Box(3880)),
+Box(Box(3881)),
+Box(Box(3882)),
+Box(Box(3883)),
+Box(Box(3884)),
+Box(Box(3885)),
+Box(Box(3886)),
+Box(Box(3887)),
+Box(Box(3888)),
+Box(Box(3889)),
+Box(Box(3890)),
+Box(Box(3891)),
+Box(Box(3892)),
+Box(Box(3893)),
+Box(Box(3894)),
+Box(Box(3895)),
+Box(Box(3896)),
+Box(Box(3897)),
+Box(Box(3898)),
+Box(Box(3899)),
+Box(Box(3900)),
+Box(Box(3901)),
+Box(Box(3902)),
+Box(Box(3903)),
+Box(Box(3904)),
+Box(Box(3905)),
+Box(Box(3906)),
+Box(Box(3907)),
+Box(Box(3908)),
+Box(Box(3909)),
+Box(Box(3910)),
+Box(Box(3911)),
+Box(Box(3912)),
+Box(Box(3913)),
+Box(Box(3914)),
+Box(Box(3915)),
+Box(Box(3916)),
+Box(Box(3917)),
+Box(Box(3918)),
+Box(Box(3919)),
+Box(Box(3920)),
+Box(Box(3921)),
+Box(Box(3922)),
+Box(Box(3923)),
+Box(Box(3924)),
+Box(Box(3925)),
+Box(Box(3926)),
+Box(Box(3927)),
+Box(Box(3928)),
+Box(Box(3929)),
+Box(Box(3930)),
+Box(Box(3931)),
+Box(Box(3932)),
+Box(Box(3933)),
+Box(Box(3934)),
+Box(Box(3935)),
+Box(Box(3936)),
+Box(Box(3937)),
+Box(Box(3938)),
+Box(Box(3939)),
+Box(Box(3940)),
+Box(Box(3941)),
+Box(Box(3942)),
+Box(Box(3943)),
+Box(Box(3944)),
+Box(Box(3945)),
+Box(Box(3946)),
+Box(Box(3947)),
+Box(Box(3948)),
+Box(Box(3949)),
+Box(Box(3950)),
+Box(Box(3951)),
+Box(Box(3952)),
+Box(Box(3953)),
+Box(Box(3954)),
+Box(Box(3955)),
+Box(Box(3956)),
+Box(Box(3957)),
+Box(Box(3958)),
+Box(Box(3959)),
+Box(Box(3960)),
+Box(Box(3961)),
+Box(Box(3962)),
+Box(Box(3963)),
+Box(Box(3964)),
+Box(Box(3965)),
+Box(Box(3966)),
+Box(Box(3967)),
+Box(Box(3968)),
+Box(Box(3969)),
+Box(Box(3970)),
+Box(Box(3971)),
+Box(Box(3972)),
+Box(Box(3973)),
+Box(Box(3974)),
+Box(Box(3975)),
+Box(Box(3976)),
+Box(Box(3977)),
+Box(Box(3978)),
+Box(Box(3979)),
+Box(Box(3980)),
+Box(Box(3981)),
+Box(Box(3982)),
+Box(Box(3983)),
+Box(Box(3984)),
+Box(Box(3985)),
+Box(Box(3986)),
+Box(Box(3987)),
+Box(Box(3988)),
+Box(Box(3989)),
+Box(Box(3990)),
+Box(Box(3991)),
+Box(Box(3992)),
+Box(Box(3993)),
+Box(Box(3994)),
+Box(Box(3995)),
+Box(Box(3996)),
+Box(Box(3997)),
+Box(Box(3998)),
+Box(Box(3999)),
+Box(Box(4000)),
+Box(Box(4001)),
+Box(Box(4002)),
+Box(Box(4003)),
+Box(Box(4004)),
+Box(Box(4005)),
+Box(Box(4006)),
+Box(Box(4007)),
+Box(Box(4008)),
+Box(Box(4009)),
+Box(Box(4010)),
+Box(Box(4011)),
+Box(Box(4012)),
+Box(Box(4013)),
+Box(Box(4014)),
+Box(Box(4015)),
+Box(Box(4016)),
+Box(Box(4017)),
+Box(Box(4018)),
+Box(Box(4019)),
+Box(Box(4020)),
+Box(Box(4021)),
+Box(Box(4022)),
+Box(Box(4023)),
+Box(Box(4024)),
+Box(Box(4025)),
+Box(Box(4026)),
+Box(Box(4027)),
+Box(Box(4028)),
+Box(Box(4029)),
+Box(Box(4030)),
+Box(Box(4031)),
+Box(Box(4032)),
+Box(Box(4033)),
+Box(Box(4034)),
+Box(Box(4035)),
+Box(Box(4036)),
+Box(Box(4037)),
+Box(Box(4038)),
+Box(Box(4039)),
+Box(Box(4040)),
+Box(Box(4041)),
+Box(Box(4042)),
+Box(Box(4043)),
+Box(Box(4044)),
+Box(Box(4045)),
+Box(Box(4046)),
+Box(Box(4047)),
+Box(Box(4048)),
+Box(Box(4049)),
+Box(Box(4050)),
+Box(Box(4051)),
+Box(Box(4052)),
+Box(Box(4053)),
+Box(Box(4054)),
+Box(Box(4055)),
+Box(Box(4056)),
+Box(Box(4057)),
+Box(Box(4058)),
+Box(Box(4059)),
+Box(Box(4060)),
+Box(Box(4061)),
+Box(Box(4062)),
+Box(Box(4063)),
+Box(Box(4064)),
+Box(Box(4065)),
+Box(Box(4066)),
+Box(Box(4067)),
+Box(Box(4068)),
+Box(Box(4069)),
+Box(Box(4070)),
+Box(Box(4071)),
+Box(Box(4072)),
+Box(Box(4073)),
+Box(Box(4074)),
+Box(Box(4075)),
+Box(Box(4076)),
+Box(Box(4077)),
+Box(Box(4078)),
+Box(Box(4079)),
+Box(Box(4080)),
+Box(Box(4081)),
+Box(Box(4082)),
+Box(Box(4083)),
+Box(Box(4084)),
+Box(Box(4085)),
+Box(Box(4086)),
+Box(Box(4087)),
+Box(Box(4088)),
+Box(Box(4089)),
+Box(Box(4090)),
+Box(Box(4091)),
+Box(Box(4092)),
+Box(Box(4093)),
+Box(Box(4094)),
+Box(Box(4095)),
+Box(Box(4096)),
+Box(Box(4097)),
+Box(Box(4098)),
+Box(Box(4099)),
+Box(Box(4100)),
+Box(Box(4101)),
+Box(Box(4102)),
+Box(Box(4103)),
+Box(Box(4104)),
+Box(Box(4105)),
+Box(Box(4106)),
+Box(Box(4107)),
+Box(Box(4108)),
+Box(Box(4109)),
+Box(Box(4110)),
+Box(Box(4111)),
+Box(Box(4112)),
+Box(Box(4113)),
+Box(Box(4114)),
+Box(Box(4115)),
+Box(Box(4116)),
+Box(Box(4117)),
+Box(Box(4118)),
+Box(Box(4119)),
+Box(Box(4120)),
+Box(Box(4121)),
+Box(Box(4122)),
+Box(Box(4123)),
+Box(Box(4124)),
+Box(Box(4125)),
+Box(Box(4126)),
+Box(Box(4127)),
+Box(Box(4128)),
+Box(Box(4129)),
+Box(Box(4130)),
+Box(Box(4131)),
+Box(Box(4132)),
+Box(Box(4133)),
+Box(Box(4134)),
+Box(Box(4135)),
+Box(Box(4136)),
+Box(Box(4137)),
+Box(Box(4138)),
+Box(Box(4139)),
+Box(Box(4140)),
+Box(Box(4141)),
+Box(Box(4142)),
+Box(Box(4143)),
+Box(Box(4144)),
+Box(Box(4145)),
+Box(Box(4146)),
+Box(Box(4147)),
+Box(Box(4148)),
+Box(Box(4149)),
+Box(Box(4150)),
+Box(Box(4151)),
+Box(Box(4152)),
+Box(Box(4153)),
+Box(Box(4154)),
+Box(Box(4155)),
+Box(Box(4156)),
+Box(Box(4157)),
+Box(Box(4158)),
+Box(Box(4159)),
+Box(Box(4160)),
+Box(Box(4161)),
+Box(Box(4162)),
+Box(Box(4163)),
+Box(Box(4164)),
+Box(Box(4165)),
+Box(Box(4166)),
+Box(Box(4167)),
+Box(Box(4168)),
+Box(Box(4169)),
+Box(Box(4170)),
+Box(Box(4171)),
+Box(Box(4172)),
+Box(Box(4173)),
+Box(Box(4174)),
+Box(Box(4175)),
+Box(Box(4176)),
+Box(Box(4177)),
+Box(Box(4178)),
+Box(Box(4179)),
+Box(Box(4180)),
+Box(Box(4181)),
+Box(Box(4182)),
+Box(Box(4183)),
+Box(Box(4184)),
+Box(Box(4185)),
+Box(Box(4186)),
+Box(Box(4187)),
+Box(Box(4188)),
+Box(Box(4189)),
+Box(Box(4190)),
+Box(Box(4191)),
+Box(Box(4192)),
+Box(Box(4193)),
+Box(Box(4194)),
+Box(Box(4195)),
+Box(Box(4196)),
+Box(Box(4197)),
+Box(Box(4198)),
+Box(Box(4199)),
+Box(Box(4200)),
+Box(Box(4201)),
+Box(Box(4202)),
+Box(Box(4203)),
+Box(Box(4204)),
+Box(Box(4205)),
+Box(Box(4206)),
+Box(Box(4207)),
+Box(Box(4208)),
+Box(Box(4209)),
+Box(Box(4210)),
+Box(Box(4211)),
+Box(Box(4212)),
+Box(Box(4213)),
+Box(Box(4214)),
+Box(Box(4215)),
+Box(Box(4216)),
+Box(Box(4217)),
+Box(Box(4218)),
+Box(Box(4219)),
+Box(Box(4220)),
+Box(Box(4221)),
+Box(Box(4222)),
+Box(Box(4223)),
+Box(Box(4224)),
+Box(Box(4225)),
+Box(Box(4226)),
+Box(Box(4227)),
+Box(Box(4228)),
+Box(Box(4229)),
+Box(Box(4230)),
+Box(Box(4231)),
+Box(Box(4232)),
+Box(Box(4233)),
+Box(Box(4234)),
+Box(Box(4235)),
+Box(Box(4236)),
+Box(Box(4237)),
+Box(Box(4238)),
+Box(Box(4239)),
+Box(Box(4240)),
+Box(Box(4241)),
+Box(Box(4242)),
+Box(Box(4243)),
+Box(Box(4244)),
+Box(Box(4245)),
+Box(Box(4246)),
+Box(Box(4247)),
+Box(Box(4248)),
+Box(Box(4249)),
+Box(Box(4250)),
+Box(Box(4251)),
+Box(Box(4252)),
+Box(Box(4253)),
+Box(Box(4254)),
+Box(Box(4255)),
+Box(Box(4256)),
+Box(Box(4257)),
+Box(Box(4258)),
+Box(Box(4259)),
+Box(Box(4260)),
+Box(Box(4261)),
+Box(Box(4262)),
+Box(Box(4263)),
+Box(Box(4264)),
+Box(Box(4265)),
+Box(Box(4266)),
+Box(Box(4267)),
+Box(Box(4268)),
+Box(Box(4269)),
+Box(Box(4270)),
+Box(Box(4271)),
+Box(Box(4272)),
+Box(Box(4273)),
+Box(Box(4274)),
+Box(Box(4275)),
+Box(Box(4276)),
+Box(Box(4277)),
+Box(Box(4278)),
+Box(Box(4279)),
+Box(Box(4280)),
+Box(Box(4281)),
+Box(Box(4282)),
+Box(Box(4283)),
+Box(Box(4284)),
+Box(Box(4285)),
+Box(Box(4286)),
+Box(Box(4287)),
+Box(Box(4288)),
+Box(Box(4289)),
+Box(Box(4290)),
+Box(Box(4291)),
+Box(Box(4292)),
+Box(Box(4293)),
+Box(Box(4294)),
+Box(Box(4295)),
+Box(Box(4296)),
+Box(Box(4297)),
+Box(Box(4298)),
+Box(Box(4299)),
+Box(Box(4300)),
+Box(Box(4301)),
+Box(Box(4302)),
+Box(Box(4303)),
+Box(Box(4304)),
+Box(Box(4305)),
+Box(Box(4306)),
+Box(Box(4307)),
+Box(Box(4308)),
+Box(Box(4309)),
+Box(Box(4310)),
+Box(Box(4311)),
+Box(Box(4312)),
+Box(Box(4313)),
+Box(Box(4314)),
+Box(Box(4315)),
+Box(Box(4316)),
+Box(Box(4317)),
+Box(Box(4318)),
+Box(Box(4319)),
+Box(Box(4320)),
+Box(Box(4321)),
+Box(Box(4322)),
+Box(Box(4323)),
+Box(Box(4324)),
+Box(Box(4325)),
+Box(Box(4326)),
+Box(Box(4327)),
+Box(Box(4328)),
+Box(Box(4329)),
+Box(Box(4330)),
+Box(Box(4331)),
+Box(Box(4332)),
+Box(Box(4333)),
+Box(Box(4334)),
+Box(Box(4335)),
+Box(Box(4336)),
+Box(Box(4337)),
+Box(Box(4338)),
+Box(Box(4339)),
+Box(Box(4340)),
+Box(Box(4341)),
+Box(Box(4342)),
+Box(Box(4343)),
+Box(Box(4344)),
+Box(Box(4345)),
+Box(Box(4346)),
+Box(Box(4347)),
+Box(Box(4348)),
+Box(Box(4349)),
+Box(Box(4350)),
+Box(Box(4351)),
+Box(Box(4352)),
+Box(Box(4353)),
+Box(Box(4354)),
+Box(Box(4355)),
+Box(Box(4356)),
+Box(Box(4357)),
+Box(Box(4358)),
+Box(Box(4359)),
+Box(Box(4360)),
+Box(Box(4361)),
+Box(Box(4362)),
+Box(Box(4363)),
+Box(Box(4364)),
+Box(Box(4365)),
+Box(Box(4366)),
+Box(Box(4367)),
+Box(Box(4368)),
+Box(Box(4369)),
+Box(Box(4370)),
+Box(Box(4371)),
+Box(Box(4372)),
+Box(Box(4373)),
+Box(Box(4374)),
+Box(Box(4375)),
+Box(Box(4376)),
+Box(Box(4377)),
+Box(Box(4378)),
+Box(Box(4379)),
+Box(Box(4380)),
+Box(Box(4381)),
+Box(Box(4382)),
+Box(Box(4383)),
+Box(Box(4384)),
+Box(Box(4385)),
+Box(Box(4386)),
+Box(Box(4387)),
+Box(Box(4388)),
+Box(Box(4389)),
+Box(Box(4390)),
+Box(Box(4391)),
+Box(Box(4392)),
+Box(Box(4393)),
+Box(Box(4394)),
+Box(Box(4395)),
+Box(Box(4396)),
+Box(Box(4397)),
+Box(Box(4398)),
+Box(Box(4399)),
+Box(Box(4400)),
+Box(Box(4401)),
+Box(Box(4402)),
+Box(Box(4403)),
+Box(Box(4404)),
+Box(Box(4405)),
+Box(Box(4406)),
+Box(Box(4407)),
+Box(Box(4408)),
+Box(Box(4409)),
+Box(Box(4410)),
+Box(Box(4411)),
+Box(Box(4412)),
+Box(Box(4413)),
+Box(Box(4414)),
+Box(Box(4415)),
+Box(Box(4416)),
+Box(Box(4417)),
+Box(Box(4418)),
+Box(Box(4419)),
+Box(Box(4420)),
+Box(Box(4421)),
+Box(Box(4422)),
+Box(Box(4423)),
+Box(Box(4424)),
+Box(Box(4425)),
+Box(Box(4426)),
+Box(Box(4427)),
+Box(Box(4428)),
+Box(Box(4429)),
+Box(Box(4430)),
+Box(Box(4431)),
+Box(Box(4432)),
+Box(Box(4433)),
+Box(Box(4434)),
+Box(Box(4435)),
+Box(Box(4436)),
+Box(Box(4437)),
+Box(Box(4438)),
+Box(Box(4439)),
+Box(Box(4440)),
+Box(Box(4441)),
+Box(Box(4442)),
+Box(Box(4443)),
+Box(Box(4444)),
+Box(Box(4445)),
+Box(Box(4446)),
+Box(Box(4447)),
+Box(Box(4448)),
+Box(Box(4449)),
+Box(Box(4450)),
+Box(Box(4451)),
+Box(Box(4452)),
+Box(Box(4453)),
+Box(Box(4454)),
+Box(Box(4455)),
+Box(Box(4456)),
+Box(Box(4457)),
+Box(Box(4458)),
+Box(Box(4459)),
+Box(Box(4460)),
+Box(Box(4461)),
+Box(Box(4462)),
+Box(Box(4463)),
+Box(Box(4464)),
+Box(Box(4465)),
+Box(Box(4466)),
+Box(Box(4467)),
+Box(Box(4468)),
+Box(Box(4469)),
+Box(Box(4470)),
+Box(Box(4471)),
+Box(Box(4472)),
+Box(Box(4473)),
+Box(Box(4474)),
+Box(Box(4475)),
+Box(Box(4476)),
+Box(Box(4477)),
+Box(Box(4478)),
+Box(Box(4479)),
+Box(Box(4480)),
+Box(Box(4481)),
+Box(Box(4482)),
+Box(Box(4483)),
+Box(Box(4484)),
+Box(Box(4485)),
+Box(Box(4486)),
+Box(Box(4487)),
+Box(Box(4488)),
+Box(Box(4489)),
+Box(Box(4490)),
+Box(Box(4491)),
+Box(Box(4492)),
+Box(Box(4493)),
+Box(Box(4494)),
+Box(Box(4495)),
+Box(Box(4496)),
+Box(Box(4497)),
+Box(Box(4498)),
+Box(Box(4499)),
+Box(Box(4500)),
+Box(Box(4501)),
+Box(Box(4502)),
+Box(Box(4503)),
+Box(Box(4504)),
+Box(Box(4505)),
+Box(Box(4506)),
+Box(Box(4507)),
+Box(Box(4508)),
+Box(Box(4509)),
+Box(Box(4510)),
+Box(Box(4511)),
+Box(Box(4512)),
+Box(Box(4513)),
+Box(Box(4514)),
+Box(Box(4515)),
+Box(Box(4516)),
+Box(Box(4517)),
+Box(Box(4518)),
+Box(Box(4519)),
+Box(Box(4520)),
+Box(Box(4521)),
+Box(Box(4522)),
+Box(Box(4523)),
+Box(Box(4524)),
+Box(Box(4525)),
+Box(Box(4526)),
+Box(Box(4527)),
+Box(Box(4528)),
+Box(Box(4529)),
+Box(Box(4530)),
+Box(Box(4531)),
+Box(Box(4532)),
+Box(Box(4533)),
+Box(Box(4534)),
+Box(Box(4535)),
+Box(Box(4536)),
+Box(Box(4537)),
+Box(Box(4538)),
+Box(Box(4539)),
+Box(Box(4540)),
+Box(Box(4541)),
+Box(Box(4542)),
+Box(Box(4543)),
+Box(Box(4544)),
+Box(Box(4545)),
+Box(Box(4546)),
+Box(Box(4547)),
+Box(Box(4548)),
+Box(Box(4549)),
+Box(Box(4550)),
+Box(Box(4551)),
+Box(Box(4552)),
+Box(Box(4553)),
+Box(Box(4554)),
+Box(Box(4555)),
+Box(Box(4556)),
+Box(Box(4557)),
+Box(Box(4558)),
+Box(Box(4559)),
+Box(Box(4560)),
+Box(Box(4561)),
+Box(Box(4562)),
+Box(Box(4563)),
+Box(Box(4564)),
+Box(Box(4565)),
+Box(Box(4566)),
+Box(Box(4567)),
+Box(Box(4568)),
+Box(Box(4569)),
+Box(Box(4570)),
+Box(Box(4571)),
+Box(Box(4572)),
+Box(Box(4573)),
+Box(Box(4574)),
+Box(Box(4575)),
+Box(Box(4576)),
+Box(Box(4577)),
+Box(Box(4578)),
+Box(Box(4579)),
+Box(Box(4580)),
+Box(Box(4581)),
+Box(Box(4582)),
+Box(Box(4583)),
+Box(Box(4584)),
+Box(Box(4585)),
+Box(Box(4586)),
+Box(Box(4587)),
+Box(Box(4588)),
+Box(Box(4589)),
+Box(Box(4590)),
+Box(Box(4591)),
+Box(Box(4592)),
+Box(Box(4593)),
+Box(Box(4594)),
+Box(Box(4595)),
+Box(Box(4596)),
+Box(Box(4597)),
+Box(Box(4598)),
+Box(Box(4599)),
+Box(Box(4600)),
+Box(Box(4601)),
+Box(Box(4602)),
+Box(Box(4603)),
+Box(Box(4604)),
+Box(Box(4605)),
+Box(Box(4606)),
+Box(Box(4607)),
+Box(Box(4608)),
+Box(Box(4609)),
+Box(Box(4610)),
+Box(Box(4611)),
+Box(Box(4612)),
+Box(Box(4613)),
+Box(Box(4614)),
+Box(Box(4615)),
+Box(Box(4616)),
+Box(Box(4617)),
+Box(Box(4618)),
+Box(Box(4619)),
+Box(Box(4620)),
+Box(Box(4621)),
+Box(Box(4622)),
+Box(Box(4623)),
+Box(Box(4624)),
+Box(Box(4625)),
+Box(Box(4626)),
+Box(Box(4627)),
+Box(Box(4628)),
+Box(Box(4629)),
+Box(Box(4630)),
+Box(Box(4631)),
+Box(Box(4632)),
+Box(Box(4633)),
+Box(Box(4634)),
+Box(Box(4635)),
+Box(Box(4636)),
+Box(Box(4637)),
+Box(Box(4638)),
+Box(Box(4639)),
+Box(Box(4640)),
+Box(Box(4641)),
+Box(Box(4642)),
+Box(Box(4643)),
+Box(Box(4644)),
+Box(Box(4645)),
+Box(Box(4646)),
+Box(Box(4647)),
+Box(Box(4648)),
+Box(Box(4649)),
+Box(Box(4650)),
+Box(Box(4651)),
+Box(Box(4652)),
+Box(Box(4653)),
+Box(Box(4654)),
+Box(Box(4655)),
+Box(Box(4656)),
+Box(Box(4657)),
+Box(Box(4658)),
+Box(Box(4659)),
+Box(Box(4660)),
+Box(Box(4661)),
+Box(Box(4662)),
+Box(Box(4663)),
+Box(Box(4664)),
+Box(Box(4665)),
+Box(Box(4666)),
+Box(Box(4667)),
+Box(Box(4668)),
+Box(Box(4669)),
+Box(Box(4670)),
+Box(Box(4671)),
+Box(Box(4672)),
+Box(Box(4673)),
+Box(Box(4674)),
+Box(Box(4675)),
+Box(Box(4676)),
+Box(Box(4677)),
+Box(Box(4678)),
+Box(Box(4679)),
+Box(Box(4680)),
+Box(Box(4681)),
+Box(Box(4682)),
+Box(Box(4683)),
+Box(Box(4684)),
+Box(Box(4685)),
+Box(Box(4686)),
+Box(Box(4687)),
+Box(Box(4688)),
+Box(Box(4689)),
+Box(Box(4690)),
+Box(Box(4691)),
+Box(Box(4692)),
+Box(Box(4693)),
+Box(Box(4694)),
+Box(Box(4695)),
+Box(Box(4696)),
+Box(Box(4697)),
+Box(Box(4698)),
+Box(Box(4699)),
+Box(Box(4700)),
+Box(Box(4701)),
+Box(Box(4702)),
+Box(Box(4703)),
+Box(Box(4704)),
+Box(Box(4705)),
+Box(Box(4706)),
+Box(Box(4707)),
+Box(Box(4708)),
+Box(Box(4709)),
+Box(Box(4710)),
+Box(Box(4711)),
+Box(Box(4712)),
+Box(Box(4713)),
+Box(Box(4714)),
+Box(Box(4715)),
+Box(Box(4716)),
+Box(Box(4717)),
+Box(Box(4718)),
+Box(Box(4719)),
+Box(Box(4720)),
+Box(Box(4721)),
+Box(Box(4722)),
+Box(Box(4723)),
+Box(Box(4724)),
+Box(Box(4725)),
+Box(Box(4726)),
+Box(Box(4727)),
+Box(Box(4728)),
+Box(Box(4729)),
+Box(Box(4730)),
+Box(Box(4731)),
+Box(Box(4732)),
+Box(Box(4733)),
+Box(Box(4734)),
+Box(Box(4735)),
+Box(Box(4736)),
+Box(Box(4737)),
+Box(Box(4738)),
+Box(Box(4739)),
+Box(Box(4740)),
+Box(Box(4741)),
+Box(Box(4742)),
+Box(Box(4743)),
+Box(Box(4744)),
+Box(Box(4745)),
+Box(Box(4746)),
+Box(Box(4747)),
+Box(Box(4748)),
+Box(Box(4749)),
+Box(Box(4750)),
+Box(Box(4751)),
+Box(Box(4752)),
+Box(Box(4753)),
+Box(Box(4754)),
+Box(Box(4755)),
+Box(Box(4756)),
+Box(Box(4757)),
+Box(Box(4758)),
+Box(Box(4759)),
+Box(Box(4760)),
+Box(Box(4761)),
+Box(Box(4762)),
+Box(Box(4763)),
+Box(Box(4764)),
+Box(Box(4765)),
+Box(Box(4766)),
+Box(Box(4767)),
+Box(Box(4768)),
+Box(Box(4769)),
+Box(Box(4770)),
+Box(Box(4771)),
+Box(Box(4772)),
+Box(Box(4773)),
+Box(Box(4774)),
+Box(Box(4775)),
+Box(Box(4776)),
+Box(Box(4777)),
+Box(Box(4778)),
+Box(Box(4779)),
+Box(Box(4780)),
+Box(Box(4781)),
+Box(Box(4782)),
+Box(Box(4783)),
+Box(Box(4784)),
+Box(Box(4785)),
+Box(Box(4786)),
+Box(Box(4787)),
+Box(Box(4788)),
+Box(Box(4789)),
+Box(Box(4790)),
+Box(Box(4791)),
+Box(Box(4792)),
+Box(Box(4793)),
+Box(Box(4794)),
+Box(Box(4795)),
+Box(Box(4796)),
+Box(Box(4797)),
+Box(Box(4798)),
+Box(Box(4799)),
+Box(Box(4800)),
+Box(Box(4801)),
+Box(Box(4802)),
+Box(Box(4803)),
+Box(Box(4804)),
+Box(Box(4805)),
+Box(Box(4806)),
+Box(Box(4807)),
+Box(Box(4808)),
+Box(Box(4809)),
+Box(Box(4810)),
+Box(Box(4811)),
+Box(Box(4812)),
+Box(Box(4813)),
+Box(Box(4814)),
+Box(Box(4815)),
+Box(Box(4816)),
+Box(Box(4817)),
+Box(Box(4818)),
+Box(Box(4819)),
+Box(Box(4820)),
+Box(Box(4821)),
+Box(Box(4822)),
+Box(Box(4823)),
+Box(Box(4824)),
+Box(Box(4825)),
+Box(Box(4826)),
+Box(Box(4827)),
+Box(Box(4828)),
+Box(Box(4829)),
+Box(Box(4830)),
+Box(Box(4831)),
+Box(Box(4832)),
+Box(Box(4833)),
+Box(Box(4834)),
+Box(Box(4835)),
+Box(Box(4836)),
+Box(Box(4837)),
+Box(Box(4838)),
+Box(Box(4839)),
+Box(Box(4840)),
+Box(Box(4841)),
+Box(Box(4842)),
+Box(Box(4843)),
+Box(Box(4844)),
+Box(Box(4845)),
+Box(Box(4846)),
+Box(Box(4847)),
+Box(Box(4848)),
+Box(Box(4849)),
+Box(Box(4850)),
+Box(Box(4851)),
+Box(Box(4852)),
+Box(Box(4853)),
+Box(Box(4854)),
+Box(Box(4855)),
+Box(Box(4856)),
+Box(Box(4857)),
+Box(Box(4858)),
+Box(Box(4859)),
+Box(Box(4860)),
+Box(Box(4861)),
+Box(Box(4862)),
+Box(Box(4863)),
+Box(Box(4864)),
+Box(Box(4865)),
+Box(Box(4866)),
+Box(Box(4867)),
+Box(Box(4868)),
+Box(Box(4869)),
+Box(Box(4870)),
+Box(Box(4871)),
+Box(Box(4872)),
+Box(Box(4873)),
+Box(Box(4874)),
+Box(Box(4875)),
+Box(Box(4876)),
+Box(Box(4877)),
+Box(Box(4878)),
+Box(Box(4879)),
+Box(Box(4880)),
+Box(Box(4881)),
+Box(Box(4882)),
+Box(Box(4883)),
+Box(Box(4884)),
+Box(Box(4885)),
+Box(Box(4886)),
+Box(Box(4887)),
+Box(Box(4888)),
+Box(Box(4889)),
+Box(Box(4890)),
+Box(Box(4891)),
+Box(Box(4892)),
+Box(Box(4893)),
+Box(Box(4894)),
+Box(Box(4895)),
+Box(Box(4896)),
+Box(Box(4897)),
+Box(Box(4898)),
+Box(Box(4899)),
+Box(Box(4900)),
+Box(Box(4901)),
+Box(Box(4902)),
+Box(Box(4903)),
+Box(Box(4904)),
+Box(Box(4905)),
+Box(Box(4906)),
+Box(Box(4907)),
+Box(Box(4908)),
+Box(Box(4909)),
+Box(Box(4910)),
+Box(Box(4911)),
+Box(Box(4912)),
+Box(Box(4913)),
+Box(Box(4914)),
+Box(Box(4915)),
+Box(Box(4916)),
+Box(Box(4917)),
+Box(Box(4918)),
+Box(Box(4919)),
+Box(Box(4920)),
+Box(Box(4921)),
+Box(Box(4922)),
+Box(Box(4923)),
+Box(Box(4924)),
+Box(Box(4925)),
+Box(Box(4926)),
+Box(Box(4927)),
+Box(Box(4928)),
+Box(Box(4929)),
+Box(Box(4930)),
+Box(Box(4931)),
+Box(Box(4932)),
+Box(Box(4933)),
+Box(Box(4934)),
+Box(Box(4935)),
+Box(Box(4936)),
+Box(Box(4937)),
+Box(Box(4938)),
+Box(Box(4939)),
+Box(Box(4940)),
+Box(Box(4941)),
+Box(Box(4942)),
+Box(Box(4943)),
+Box(Box(4944)),
+Box(Box(4945)),
+Box(Box(4946)),
+Box(Box(4947)),
+Box(Box(4948)),
+Box(Box(4949)),
+Box(Box(4950)),
+Box(Box(4951)),
+Box(Box(4952)),
+Box(Box(4953)),
+Box(Box(4954)),
+Box(Box(4955)),
+Box(Box(4956)),
+Box(Box(4957)),
+Box(Box(4958)),
+Box(Box(4959)),
+Box(Box(4960)),
+Box(Box(4961)),
+Box(Box(4962)),
+Box(Box(4963)),
+Box(Box(4964)),
+Box(Box(4965)),
+Box(Box(4966)),
+Box(Box(4967)),
+Box(Box(4968)),
+Box(Box(4969)),
+Box(Box(4970)),
+Box(Box(4971)),
+Box(Box(4972)),
+Box(Box(4973)),
+Box(Box(4974)),
+Box(Box(4975)),
+Box(Box(4976)),
+Box(Box(4977)),
+Box(Box(4978)),
+Box(Box(4979)),
+Box(Box(4980)),
+Box(Box(4981)),
+Box(Box(4982)),
+Box(Box(4983)),
+Box(Box(4984)),
+Box(Box(4985)),
+Box(Box(4986)),
+Box(Box(4987)),
+Box(Box(4988)),
+Box(Box(4989)),
+Box(Box(4990)),
+Box(Box(4991)),
+Box(Box(4992)),
+Box(Box(4993)),
+Box(Box(4994)),
+Box(Box(4995)),
+Box(Box(4996)),
+Box(Box(4997)),
+Box(Box(4998)),
+Box(Box(4999)),
+Box(Box(5000)),
+Box(Box(5001)),
+Box(Box(5002)),
+Box(Box(5003)),
+Box(Box(5004)),
+Box(Box(5005)),
+Box(Box(5006)),
+Box(Box(5007)),
+Box(Box(5008)),
+Box(Box(5009)),
+Box(Box(5010)),
+Box(Box(5011)),
+Box(Box(5012)),
+Box(Box(5013)),
+Box(Box(5014)),
+Box(Box(5015)),
+Box(Box(5016)),
+Box(Box(5017)),
+Box(Box(5018)),
+Box(Box(5019)),
+Box(Box(5020)),
+Box(Box(5021)),
+Box(Box(5022)),
+Box(Box(5023)),
+Box(Box(5024)),
+Box(Box(5025)),
+Box(Box(5026)),
+Box(Box(5027)),
+Box(Box(5028)),
+Box(Box(5029)),
+Box(Box(5030)),
+Box(Box(5031)),
+Box(Box(5032)),
+Box(Box(5033)),
+Box(Box(5034)),
+Box(Box(5035)),
+Box(Box(5036)),
+Box(Box(5037)),
+Box(Box(5038)),
+Box(Box(5039)),
+Box(Box(5040)),
+Box(Box(5041)),
+Box(Box(5042)),
+Box(Box(5043)),
+Box(Box(5044)),
+Box(Box(5045)),
+Box(Box(5046)),
+Box(Box(5047)),
+Box(Box(5048)),
+Box(Box(5049)),
+Box(Box(5050)),
+Box(Box(5051)),
+Box(Box(5052)),
+Box(Box(5053)),
+Box(Box(5054)),
+Box(Box(5055)),
+Box(Box(5056)),
+Box(Box(5057)),
+Box(Box(5058)),
+Box(Box(5059)),
+Box(Box(5060)),
+Box(Box(5061)),
+Box(Box(5062)),
+Box(Box(5063)),
+Box(Box(5064)),
+Box(Box(5065)),
+Box(Box(5066)),
+Box(Box(5067)),
+Box(Box(5068)),
+Box(Box(5069)),
+Box(Box(5070)),
+Box(Box(5071)),
+Box(Box(5072)),
+Box(Box(5073)),
+Box(Box(5074)),
+Box(Box(5075)),
+Box(Box(5076)),
+Box(Box(5077)),
+Box(Box(5078)),
+Box(Box(5079)),
+Box(Box(5080)),
+Box(Box(5081)),
+Box(Box(5082)),
+Box(Box(5083)),
+Box(Box(5084)),
+Box(Box(5085)),
+Box(Box(5086)),
+Box(Box(5087)),
+Box(Box(5088)),
+Box(Box(5089)),
+Box(Box(5090)),
+Box(Box(5091)),
+Box(Box(5092)),
+Box(Box(5093)),
+Box(Box(5094)),
+Box(Box(5095)),
+Box(Box(5096)),
+Box(Box(5097)),
+Box(Box(5098)),
+Box(Box(5099)),
+Box(Box(5100)),
+Box(Box(5101)),
+Box(Box(5102)),
+Box(Box(5103)),
+Box(Box(5104)),
+Box(Box(5105)),
+Box(Box(5106)),
+Box(Box(5107)),
+Box(Box(5108)),
+Box(Box(5109)),
+Box(Box(5110)),
+Box(Box(5111)),
+Box(Box(5112)),
+Box(Box(5113)),
+Box(Box(5114)),
+Box(Box(5115)),
+Box(Box(5116)),
+Box(Box(5117)),
+Box(Box(5118)),
+Box(Box(5119)),
+Box(Box(5120)),
+Box(Box(5121)),
+Box(Box(5122)),
+Box(Box(5123)),
+Box(Box(5124)),
+Box(Box(5125)),
+Box(Box(5126)),
+Box(Box(5127)),
+Box(Box(5128)),
+Box(Box(5129)),
+Box(Box(5130)),
+Box(Box(5131)),
+Box(Box(5132)),
+Box(Box(5133)),
+Box(Box(5134)),
+Box(Box(5135)),
+Box(Box(5136)),
+Box(Box(5137)),
+Box(Box(5138)),
+Box(Box(5139)),
+Box(Box(5140)),
+Box(Box(5141)),
+Box(Box(5142)),
+Box(Box(5143)),
+Box(Box(5144)),
+Box(Box(5145)),
+Box(Box(5146)),
+Box(Box(5147)),
+Box(Box(5148)),
+Box(Box(5149)),
+Box(Box(5150)),
+Box(Box(5151)),
+Box(Box(5152)),
+Box(Box(5153)),
+Box(Box(5154)),
+Box(Box(5155)),
+Box(Box(5156)),
+Box(Box(5157)),
+Box(Box(5158)),
+Box(Box(5159)),
+Box(Box(5160)),
+Box(Box(5161)),
+Box(Box(5162)),
+Box(Box(5163)),
+Box(Box(5164)),
+Box(Box(5165)),
+Box(Box(5166)),
+Box(Box(5167)),
+Box(Box(5168)),
+Box(Box(5169)),
+Box(Box(5170)),
+Box(Box(5171)),
+Box(Box(5172)),
+Box(Box(5173)),
+Box(Box(5174)),
+Box(Box(5175)),
+Box(Box(5176)),
+Box(Box(5177)),
+Box(Box(5178)),
+Box(Box(5179)),
+Box(Box(5180)),
+Box(Box(5181)),
+Box(Box(5182)),
+Box(Box(5183)),
+Box(Box(5184)),
+Box(Box(5185)),
+Box(Box(5186)),
+Box(Box(5187)),
+Box(Box(5188)),
+Box(Box(5189)),
+Box(Box(5190)),
+Box(Box(5191)),
+Box(Box(5192)),
+Box(Box(5193)),
+Box(Box(5194)),
+Box(Box(5195)),
+Box(Box(5196)),
+Box(Box(5197)),
+Box(Box(5198)),
+Box(Box(5199)),
+Box(Box(5200)),
+Box(Box(5201)),
+Box(Box(5202)),
+Box(Box(5203)),
+Box(Box(5204)),
+Box(Box(5205)),
+Box(Box(5206)),
+Box(Box(5207)),
+Box(Box(5208)),
+Box(Box(5209)),
+Box(Box(5210)),
+Box(Box(5211)),
+Box(Box(5212)),
+Box(Box(5213)),
+Box(Box(5214)),
+Box(Box(5215)),
+Box(Box(5216)),
+Box(Box(5217)),
+Box(Box(5218)),
+Box(Box(5219)),
+Box(Box(5220)),
+Box(Box(5221)),
+Box(Box(5222)),
+Box(Box(5223)),
+Box(Box(5224)),
+Box(Box(5225)),
+Box(Box(5226)),
+Box(Box(5227)),
+Box(Box(5228)),
+Box(Box(5229)),
+Box(Box(5230)),
+Box(Box(5231)),
+Box(Box(5232)),
+Box(Box(5233)),
+Box(Box(5234)),
+Box(Box(5235)),
+Box(Box(5236)),
+Box(Box(5237)),
+Box(Box(5238)),
+Box(Box(5239)),
+Box(Box(5240)),
+Box(Box(5241)),
+Box(Box(5242)),
+Box(Box(5243)),
+Box(Box(5244)),
+Box(Box(5245)),
+Box(Box(5246)),
+Box(Box(5247)),
+Box(Box(5248)),
+Box(Box(5249)),
+Box(Box(5250)),
+Box(Box(5251)),
+Box(Box(5252)),
+Box(Box(5253)),
+Box(Box(5254)),
+Box(Box(5255)),
+Box(Box(5256)),
+Box(Box(5257)),
+Box(Box(5258)),
+Box(Box(5259)),
+Box(Box(5260)),
+Box(Box(5261)),
+Box(Box(5262)),
+Box(Box(5263)),
+Box(Box(5264)),
+Box(Box(5265)),
+Box(Box(5266)),
+Box(Box(5267)),
+Box(Box(5268)),
+Box(Box(5269)),
+Box(Box(5270)),
+Box(Box(5271)),
+Box(Box(5272)),
+Box(Box(5273)),
+Box(Box(5274)),
+Box(Box(5275)),
+Box(Box(5276)),
+Box(Box(5277)),
+Box(Box(5278)),
+Box(Box(5279)),
+Box(Box(5280)),
+Box(Box(5281)),
+Box(Box(5282)),
+Box(Box(5283)),
+Box(Box(5284)),
+Box(Box(5285)),
+Box(Box(5286)),
+Box(Box(5287)),
+Box(Box(5288)),
+Box(Box(5289)),
+Box(Box(5290)),
+Box(Box(5291)),
+Box(Box(5292)),
+Box(Box(5293)),
+Box(Box(5294)),
+Box(Box(5295)),
+Box(Box(5296)),
+Box(Box(5297)),
+Box(Box(5298)),
+Box(Box(5299)),
+Box(Box(5300)),
+Box(Box(5301)),
+Box(Box(5302)),
+Box(Box(5303)),
+Box(Box(5304)),
+Box(Box(5305)),
+Box(Box(5306)),
+Box(Box(5307)),
+Box(Box(5308)),
+Box(Box(5309)),
+Box(Box(5310)),
+Box(Box(5311)),
+Box(Box(5312)),
+Box(Box(5313)),
+Box(Box(5314)),
+Box(Box(5315)),
+Box(Box(5316)),
+Box(Box(5317)),
+Box(Box(5318)),
+Box(Box(5319)),
+Box(Box(5320)),
+Box(Box(5321)),
+Box(Box(5322)),
+Box(Box(5323)),
+Box(Box(5324)),
+Box(Box(5325)),
+Box(Box(5326)),
+Box(Box(5327)),
+Box(Box(5328)),
+Box(Box(5329)),
+Box(Box(5330)),
+Box(Box(5331)),
+Box(Box(5332)),
+Box(Box(5333)),
+Box(Box(5334)),
+Box(Box(5335)),
+Box(Box(5336)),
+Box(Box(5337)),
+Box(Box(5338)),
+Box(Box(5339)),
+Box(Box(5340)),
+Box(Box(5341)),
+Box(Box(5342)),
+Box(Box(5343)),
+Box(Box(5344)),
+Box(Box(5345)),
+Box(Box(5346)),
+Box(Box(5347)),
+Box(Box(5348)),
+Box(Box(5349)),
+Box(Box(5350)),
+Box(Box(5351)),
+Box(Box(5352)),
+Box(Box(5353)),
+Box(Box(5354)),
+Box(Box(5355)),
+Box(Box(5356)),
+Box(Box(5357)),
+Box(Box(5358)),
+Box(Box(5359)),
+Box(Box(5360)),
+Box(Box(5361)),
+Box(Box(5362)),
+Box(Box(5363)),
+Box(Box(5364)),
+Box(Box(5365)),
+Box(Box(5366)),
+Box(Box(5367)),
+Box(Box(5368)),
+Box(Box(5369)),
+Box(Box(5370)),
+Box(Box(5371)),
+Box(Box(5372)),
+Box(Box(5373)),
+Box(Box(5374)),
+Box(Box(5375)),
+Box(Box(5376)),
+Box(Box(5377)),
+Box(Box(5378)),
+Box(Box(5379)),
+Box(Box(5380)),
+Box(Box(5381)),
+Box(Box(5382)),
+Box(Box(5383)),
+Box(Box(5384)),
+Box(Box(5385)),
+Box(Box(5386)),
+Box(Box(5387)),
+Box(Box(5388)),
+Box(Box(5389)),
+Box(Box(5390)),
+Box(Box(5391)),
+Box(Box(5392)),
+Box(Box(5393)),
+Box(Box(5394)),
+Box(Box(5395)),
+Box(Box(5396)),
+Box(Box(5397)),
+Box(Box(5398)),
+Box(Box(5399)),
+Box(Box(5400)),
+Box(Box(5401)),
+Box(Box(5402)),
+Box(Box(5403)),
+Box(Box(5404)),
+Box(Box(5405)),
+Box(Box(5406)),
+Box(Box(5407)),
+Box(Box(5408)),
+Box(Box(5409)),
+Box(Box(5410)),
+Box(Box(5411)),
+Box(Box(5412)),
+Box(Box(5413)),
+Box(Box(5414)),
+Box(Box(5415)),
+Box(Box(5416)),
+Box(Box(5417)),
+Box(Box(5418)),
+Box(Box(5419)),
+Box(Box(5420)),
+Box(Box(5421)),
+Box(Box(5422)),
+Box(Box(5423)),
+Box(Box(5424)),
+Box(Box(5425)),
+Box(Box(5426)),
+Box(Box(5427)),
+Box(Box(5428)),
+Box(Box(5429)),
+Box(Box(5430)),
+Box(Box(5431)),
+Box(Box(5432)),
+Box(Box(5433)),
+Box(Box(5434)),
+Box(Box(5435)),
+Box(Box(5436)),
+Box(Box(5437)),
+Box(Box(5438)),
+Box(Box(5439)),
+Box(Box(5440)),
+Box(Box(5441)),
+Box(Box(5442)),
+Box(Box(5443)),
+Box(Box(5444)),
+Box(Box(5445)),
+Box(Box(5446)),
+Box(Box(5447)),
+Box(Box(5448)),
+Box(Box(5449)),
+Box(Box(5450)),
+Box(Box(5451)),
+Box(Box(5452)),
+Box(Box(5453)),
+Box(Box(5454)),
+Box(Box(5455)),
+Box(Box(5456)),
+Box(Box(5457)),
+Box(Box(5458)),
+Box(Box(5459)),
+Box(Box(5460)),
+Box(Box(5461)),
+Box(Box(5462)),
+Box(Box(5463)),
+Box(Box(5464)),
+Box(Box(5465)),
+Box(Box(5466)),
+Box(Box(5467)),
+Box(Box(5468)),
+Box(Box(5469)),
+Box(Box(5470)),
+Box(Box(5471)),
+Box(Box(5472)),
+Box(Box(5473)),
+Box(Box(5474)),
+Box(Box(5475)),
+Box(Box(5476)),
+Box(Box(5477)),
+Box(Box(5478)),
+Box(Box(5479)),
+Box(Box(5480)),
+Box(Box(5481)),
+Box(Box(5482)),
+Box(Box(5483)),
+Box(Box(5484)),
+Box(Box(5485)),
+Box(Box(5486)),
+Box(Box(5487)),
+Box(Box(5488)),
+Box(Box(5489)),
+Box(Box(5490)),
+Box(Box(5491)),
+Box(Box(5492)),
+Box(Box(5493)),
+Box(Box(5494)),
+Box(Box(5495)),
+Box(Box(5496)),
+Box(Box(5497)),
+Box(Box(5498)),
+Box(Box(5499)),
+Box(Box(5500)),
+Box(Box(5501)),
+Box(Box(5502)),
+Box(Box(5503)),
+Box(Box(5504)),
+Box(Box(5505)),
+Box(Box(5506)),
+Box(Box(5507)),
+Box(Box(5508)),
+Box(Box(5509)),
+Box(Box(5510)),
+Box(Box(5511)),
+Box(Box(5512)),
+Box(Box(5513)),
+Box(Box(5514)),
+Box(Box(5515)),
+Box(Box(5516)),
+Box(Box(5517)),
+Box(Box(5518)),
+Box(Box(5519)),
+Box(Box(5520)),
+Box(Box(5521)),
+Box(Box(5522)),
+Box(Box(5523)),
+Box(Box(5524)),
+Box(Box(5525)),
+Box(Box(5526)),
+Box(Box(5527)),
+Box(Box(5528)),
+Box(Box(5529)),
+Box(Box(5530)),
+Box(Box(5531)),
+Box(Box(5532)),
+Box(Box(5533)),
+Box(Box(5534)),
+Box(Box(5535)),
+Box(Box(5536)),
+Box(Box(5537)),
+Box(Box(5538)),
+Box(Box(5539)),
+Box(Box(5540)),
+Box(Box(5541)),
+Box(Box(5542)),
+Box(Box(5543)),
+Box(Box(5544)),
+Box(Box(5545)),
+Box(Box(5546)),
+Box(Box(5547)),
+Box(Box(5548)),
+Box(Box(5549)),
+Box(Box(5550)),
+Box(Box(5551)),
+Box(Box(5552)),
+Box(Box(5553)),
+Box(Box(5554)),
+Box(Box(5555)),
+Box(Box(5556)),
+Box(Box(5557)),
+Box(Box(5558)),
+Box(Box(5559)),
+Box(Box(5560)),
+Box(Box(5561)),
+Box(Box(5562)),
+Box(Box(5563)),
+Box(Box(5564)),
+Box(Box(5565)),
+Box(Box(5566)),
+Box(Box(5567)),
+Box(Box(5568)),
+Box(Box(5569)),
+Box(Box(5570)),
+Box(Box(5571)),
+Box(Box(5572)),
+Box(Box(5573)),
+Box(Box(5574)),
+Box(Box(5575)),
+Box(Box(5576)),
+Box(Box(5577)),
+Box(Box(5578)),
+Box(Box(5579)),
+Box(Box(5580)),
+Box(Box(5581)),
+Box(Box(5582)),
+Box(Box(5583)),
+Box(Box(5584)),
+Box(Box(5585)),
+Box(Box(5586)),
+Box(Box(5587)),
+Box(Box(5588)),
+Box(Box(5589)),
+Box(Box(5590)),
+Box(Box(5591)),
+Box(Box(5592)),
+Box(Box(5593)),
+Box(Box(5594)),
+Box(Box(5595)),
+Box(Box(5596)),
+Box(Box(5597)),
+Box(Box(5598)),
+Box(Box(5599)),
+Box(Box(5600)),
+Box(Box(5601)),
+Box(Box(5602)),
+Box(Box(5603)),
+Box(Box(5604)),
+Box(Box(5605)),
+Box(Box(5606)),
+Box(Box(5607)),
+Box(Box(5608)),
+Box(Box(5609)),
+Box(Box(5610)),
+Box(Box(5611)),
+Box(Box(5612)),
+Box(Box(5613)),
+Box(Box(5614)),
+Box(Box(5615)),
+Box(Box(5616)),
+Box(Box(5617)),
+Box(Box(5618)),
+Box(Box(5619)),
+Box(Box(5620)),
+Box(Box(5621)),
+Box(Box(5622)),
+Box(Box(5623)),
+Box(Box(5624)),
+Box(Box(5625)),
+Box(Box(5626)),
+Box(Box(5627)),
+Box(Box(5628)),
+Box(Box(5629)),
+Box(Box(5630)),
+Box(Box(5631)),
+Box(Box(5632)),
+Box(Box(5633)),
+Box(Box(5634)),
+Box(Box(5635)),
+Box(Box(5636)),
+Box(Box(5637)),
+Box(Box(5638)),
+Box(Box(5639)),
+Box(Box(5640)),
+Box(Box(5641)),
+Box(Box(5642)),
+Box(Box(5643)),
+Box(Box(5644)),
+Box(Box(5645)),
+Box(Box(5646)),
+Box(Box(5647)),
+Box(Box(5648)),
+Box(Box(5649)),
+Box(Box(5650)),
+Box(Box(5651)),
+Box(Box(5652)),
+Box(Box(5653)),
+Box(Box(5654)),
+Box(Box(5655)),
+Box(Box(5656)),
+Box(Box(5657)),
+Box(Box(5658)),
+Box(Box(5659)),
+Box(Box(5660)),
+Box(Box(5661)),
+Box(Box(5662)),
+Box(Box(5663)),
+Box(Box(5664)),
+Box(Box(5665)),
+Box(Box(5666)),
+Box(Box(5667)),
+Box(Box(5668)),
+Box(Box(5669)),
+Box(Box(5670)),
+Box(Box(5671)),
+Box(Box(5672)),
+Box(Box(5673)),
+Box(Box(5674)),
+Box(Box(5675)),
+Box(Box(5676)),
+Box(Box(5677)),
+Box(Box(5678)),
+Box(Box(5679)),
+Box(Box(5680)),
+Box(Box(5681)),
+Box(Box(5682)),
+Box(Box(5683)),
+Box(Box(5684)),
+Box(Box(5685)),
+Box(Box(5686)),
+Box(Box(5687)),
+Box(Box(5688)),
+Box(Box(5689)),
+Box(Box(5690)),
+Box(Box(5691)),
+Box(Box(5692)),
+Box(Box(5693)),
+Box(Box(5694)),
+Box(Box(5695)),
+Box(Box(5696)),
+Box(Box(5697)),
+Box(Box(5698)),
+Box(Box(5699)),
+Box(Box(5700)),
+Box(Box(5701)),
+Box(Box(5702)),
+Box(Box(5703)),
+Box(Box(5704)),
+Box(Box(5705)),
+Box(Box(5706)),
+Box(Box(5707)),
+Box(Box(5708)),
+Box(Box(5709)),
+Box(Box(5710)),
+Box(Box(5711)),
+Box(Box(5712)),
+Box(Box(5713)),
+Box(Box(5714)),
+Box(Box(5715)),
+Box(Box(5716)),
+Box(Box(5717)),
+Box(Box(5718)),
+Box(Box(5719)),
+Box(Box(5720)),
+Box(Box(5721)),
+Box(Box(5722)),
+Box(Box(5723)),
+Box(Box(5724)),
+Box(Box(5725)),
+Box(Box(5726)),
+Box(Box(5727)),
+Box(Box(5728)),
+Box(Box(5729)),
+Box(Box(5730)),
+Box(Box(5731)),
+Box(Box(5732)),
+Box(Box(5733)),
+Box(Box(5734)),
+Box(Box(5735)),
+Box(Box(5736)),
+Box(Box(5737)),
+Box(Box(5738)),
+Box(Box(5739)),
+Box(Box(5740)),
+Box(Box(5741)),
+Box(Box(5742)),
+Box(Box(5743)),
+Box(Box(5744)),
+Box(Box(5745)),
+Box(Box(5746)),
+Box(Box(5747)),
+Box(Box(5748)),
+Box(Box(5749)),
+Box(Box(5750)),
+Box(Box(5751)),
+Box(Box(5752)),
+Box(Box(5753)),
+Box(Box(5754)),
+Box(Box(5755)),
+Box(Box(5756)),
+Box(Box(5757)),
+Box(Box(5758)),
+Box(Box(5759)),
+Box(Box(5760)),
+Box(Box(5761)),
+Box(Box(5762)),
+Box(Box(5763)),
+Box(Box(5764)),
+Box(Box(5765)),
+Box(Box(5766)),
+Box(Box(5767)),
+Box(Box(5768)),
+Box(Box(5769)),
+Box(Box(5770)),
+Box(Box(5771)),
+Box(Box(5772)),
+Box(Box(5773)),
+Box(Box(5774)),
+Box(Box(5775)),
+Box(Box(5776)),
+Box(Box(5777)),
+Box(Box(5778)),
+Box(Box(5779)),
+Box(Box(5780)),
+Box(Box(5781)),
+Box(Box(5782)),
+Box(Box(5783)),
+Box(Box(5784)),
+Box(Box(5785)),
+Box(Box(5786)),
+Box(Box(5787)),
+Box(Box(5788)),
+Box(Box(5789)),
+Box(Box(5790)),
+Box(Box(5791)),
+Box(Box(5792)),
+Box(Box(5793)),
+Box(Box(5794)),
+Box(Box(5795)),
+Box(Box(5796)),
+Box(Box(5797)),
+Box(Box(5798)),
+Box(Box(5799)),
+Box(Box(5800)),
+Box(Box(5801)),
+Box(Box(5802)),
+Box(Box(5803)),
+Box(Box(5804)),
+Box(Box(5805)),
+Box(Box(5806)),
+Box(Box(5807)),
+Box(Box(5808)),
+Box(Box(5809)),
+Box(Box(5810)),
+Box(Box(5811)),
+Box(Box(5812)),
+Box(Box(5813)),
+Box(Box(5814)),
+Box(Box(5815)),
+Box(Box(5816)),
+Box(Box(5817)),
+Box(Box(5818)),
+Box(Box(5819)),
+Box(Box(5820)),
+Box(Box(5821)),
+Box(Box(5822)),
+Box(Box(5823)),
+Box(Box(5824)),
+Box(Box(5825)),
+Box(Box(5826)),
+Box(Box(5827)),
+Box(Box(5828)),
+Box(Box(5829)),
+Box(Box(5830)),
+Box(Box(5831)),
+Box(Box(5832)),
+Box(Box(5833)),
+Box(Box(5834)),
+Box(Box(5835)),
+Box(Box(5836)),
+Box(Box(5837)),
+Box(Box(5838)),
+Box(Box(5839)),
+Box(Box(5840)),
+Box(Box(5841)),
+Box(Box(5842)),
+Box(Box(5843)),
+Box(Box(5844)),
+Box(Box(5845)),
+Box(Box(5846)),
+Box(Box(5847)),
+Box(Box(5848)),
+Box(Box(5849)),
+Box(Box(5850)),
+Box(Box(5851)),
+Box(Box(5852)),
+Box(Box(5853)),
+Box(Box(5854)),
+Box(Box(5855)),
+Box(Box(5856)),
+Box(Box(5857)),
+Box(Box(5858)),
+Box(Box(5859)),
+Box(Box(5860)),
+Box(Box(5861)),
+Box(Box(5862)),
+Box(Box(5863)),
+Box(Box(5864)),
+Box(Box(5865)),
+Box(Box(5866)),
+Box(Box(5867)),
+Box(Box(5868)),
+Box(Box(5869)),
+Box(Box(5870)),
+Box(Box(5871)),
+Box(Box(5872)),
+Box(Box(5873)),
+Box(Box(5874)),
+Box(Box(5875)),
+Box(Box(5876)),
+Box(Box(5877)),
+Box(Box(5878)),
+Box(Box(5879)),
+Box(Box(5880)),
+Box(Box(5881)),
+Box(Box(5882)),
+Box(Box(5883)),
+Box(Box(5884)),
+Box(Box(5885)),
+Box(Box(5886)),
+Box(Box(5887)),
+Box(Box(5888)),
+Box(Box(5889)),
+Box(Box(5890)),
+Box(Box(5891)),
+Box(Box(5892)),
+Box(Box(5893)),
+Box(Box(5894)),
+Box(Box(5895)),
+Box(Box(5896)),
+Box(Box(5897)),
+Box(Box(5898)),
+Box(Box(5899)),
+Box(Box(5900)),
+Box(Box(5901)),
+Box(Box(5902)),
+Box(Box(5903)),
+Box(Box(5904)),
+Box(Box(5905)),
+Box(Box(5906)),
+Box(Box(5907)),
+Box(Box(5908)),
+Box(Box(5909)),
+Box(Box(5910)),
+Box(Box(5911)),
+Box(Box(5912)),
+Box(Box(5913)),
+Box(Box(5914)),
+Box(Box(5915)),
+Box(Box(5916)),
+Box(Box(5917)),
+Box(Box(5918)),
+Box(Box(5919)),
+Box(Box(5920)),
+Box(Box(5921)),
+Box(Box(5922)),
+Box(Box(5923)),
+Box(Box(5924)),
+Box(Box(5925)),
+Box(Box(5926)),
+Box(Box(5927)),
+Box(Box(5928)),
+Box(Box(5929)),
+Box(Box(5930)),
+Box(Box(5931)),
+Box(Box(5932)),
+Box(Box(5933)),
+Box(Box(5934)),
+Box(Box(5935)),
+Box(Box(5936)),
+Box(Box(5937)),
+Box(Box(5938)),
+Box(Box(5939)),
+Box(Box(5940)),
+Box(Box(5941)),
+Box(Box(5942)),
+Box(Box(5943)),
+Box(Box(5944)),
+Box(Box(5945)),
+Box(Box(5946)),
+Box(Box(5947)),
+Box(Box(5948)),
+Box(Box(5949)),
+Box(Box(5950)),
+Box(Box(5951)),
+Box(Box(5952)),
+Box(Box(5953)),
+Box(Box(5954)),
+Box(Box(5955)),
+Box(Box(5956)),
+Box(Box(5957)),
+Box(Box(5958)),
+Box(Box(5959)),
+Box(Box(5960)),
+Box(Box(5961)),
+Box(Box(5962)),
+Box(Box(5963)),
+Box(Box(5964)),
+Box(Box(5965)),
+Box(Box(5966)),
+Box(Box(5967)),
+Box(Box(5968)),
+Box(Box(5969)),
+Box(Box(5970)),
+Box(Box(5971)),
+Box(Box(5972)),
+Box(Box(5973)),
+Box(Box(5974)),
+Box(Box(5975)),
+Box(Box(5976)),
+Box(Box(5977)),
+Box(Box(5978)),
+Box(Box(5979)),
+Box(Box(5980)),
+Box(Box(5981)),
+Box(Box(5982)),
+Box(Box(5983)),
+Box(Box(5984)),
+Box(Box(5985)),
+Box(Box(5986)),
+Box(Box(5987)),
+Box(Box(5988)),
+Box(Box(5989)),
+Box(Box(5990)),
+Box(Box(5991)),
+Box(Box(5992)),
+Box(Box(5993)),
+Box(Box(5994)),
+Box(Box(5995)),
+Box(Box(5996)),
+Box(Box(5997)),
+Box(Box(5998)),
+Box(Box(5999)),
+Box(Box(6000)),
+Box(Box(6001)),
+Box(Box(6002)),
+Box(Box(6003)),
+Box(Box(6004)),
+Box(Box(6005)),
+Box(Box(6006)),
+Box(Box(6007)),
+Box(Box(6008)),
+Box(Box(6009)),
+Box(Box(6010)),
+Box(Box(6011)),
+Box(Box(6012)),
+Box(Box(6013)),
+Box(Box(6014)),
+Box(Box(6015)),
+Box(Box(6016)),
+Box(Box(6017)),
+Box(Box(6018)),
+Box(Box(6019)),
+Box(Box(6020)),
+Box(Box(6021)),
+Box(Box(6022)),
+Box(Box(6023)),
+Box(Box(6024)),
+Box(Box(6025)),
+Box(Box(6026)),
+Box(Box(6027)),
+Box(Box(6028)),
+Box(Box(6029)),
+Box(Box(6030)),
+Box(Box(6031)),
+Box(Box(6032)),
+Box(Box(6033)),
+Box(Box(6034)),
+Box(Box(6035)),
+Box(Box(6036)),
+Box(Box(6037)),
+Box(Box(6038)),
+Box(Box(6039)),
+Box(Box(6040)),
+Box(Box(6041)),
+Box(Box(6042)),
+Box(Box(6043)),
+Box(Box(6044)),
+Box(Box(6045)),
+Box(Box(6046)),
+Box(Box(6047)),
+Box(Box(6048)),
+Box(Box(6049)),
+Box(Box(6050)),
+Box(Box(6051)),
+Box(Box(6052)),
+Box(Box(6053)),
+Box(Box(6054)),
+Box(Box(6055)),
+Box(Box(6056)),
+Box(Box(6057)),
+Box(Box(6058)),
+Box(Box(6059)),
+Box(Box(6060)),
+Box(Box(6061)),
+Box(Box(6062)),
+Box(Box(6063)),
+Box(Box(6064)),
+Box(Box(6065)),
+Box(Box(6066)),
+Box(Box(6067)),
+Box(Box(6068)),
+Box(Box(6069)),
+Box(Box(6070)),
+Box(Box(6071)),
+Box(Box(6072)),
+Box(Box(6073)),
+Box(Box(6074)),
+Box(Box(6075)),
+Box(Box(6076)),
+Box(Box(6077)),
+Box(Box(6078)),
+Box(Box(6079)),
+Box(Box(6080)),
+Box(Box(6081)),
+Box(Box(6082)),
+Box(Box(6083)),
+Box(Box(6084)),
+Box(Box(6085)),
+Box(Box(6086)),
+Box(Box(6087)),
+Box(Box(6088)),
+Box(Box(6089)),
+Box(Box(6090)),
+Box(Box(6091)),
+Box(Box(6092)),
+Box(Box(6093)),
+Box(Box(6094)),
+Box(Box(6095)),
+Box(Box(6096)),
+Box(Box(6097)),
+Box(Box(6098)),
+Box(Box(6099)),
+Box(Box(6100)),
+Box(Box(6101)),
+Box(Box(6102)),
+Box(Box(6103)),
+Box(Box(6104)),
+Box(Box(6105)),
+Box(Box(6106)),
+Box(Box(6107)),
+Box(Box(6108)),
+Box(Box(6109)),
+Box(Box(6110)),
+Box(Box(6111)),
+Box(Box(6112)),
+Box(Box(6113)),
+Box(Box(6114)),
+Box(Box(6115)),
+Box(Box(6116)),
+Box(Box(6117)),
+Box(Box(6118)),
+Box(Box(6119)),
+Box(Box(6120)),
+Box(Box(6121)),
+Box(Box(6122)),
+Box(Box(6123)),
+Box(Box(6124)),
+Box(Box(6125)),
+Box(Box(6126)),
+Box(Box(6127)),
+Box(Box(6128)),
+Box(Box(6129)),
+Box(Box(6130)),
+Box(Box(6131)),
+Box(Box(6132)),
+Box(Box(6133)),
+Box(Box(6134)),
+Box(Box(6135)),
+Box(Box(6136)),
+Box(Box(6137)),
+Box(Box(6138)),
+Box(Box(6139)),
+Box(Box(6140)),
+Box(Box(6141)),
+Box(Box(6142)),
+Box(Box(6143)),
+Box(Box(6144)),
+Box(Box(6145)),
+Box(Box(6146)),
+Box(Box(6147)),
+Box(Box(6148)),
+Box(Box(6149)),
+Box(Box(6150)),
+Box(Box(6151)),
+Box(Box(6152)),
+Box(Box(6153)),
+Box(Box(6154)),
+Box(Box(6155)),
+Box(Box(6156)),
+Box(Box(6157)),
+Box(Box(6158)),
+Box(Box(6159)),
+Box(Box(6160)),
+Box(Box(6161)),
+Box(Box(6162)),
+Box(Box(6163)),
+Box(Box(6164)),
+Box(Box(6165)),
+Box(Box(6166)),
+Box(Box(6167)),
+Box(Box(6168)),
+Box(Box(6169)),
+Box(Box(6170)),
+Box(Box(6171)),
+Box(Box(6172)),
+Box(Box(6173)),
+Box(Box(6174)),
+Box(Box(6175)),
+Box(Box(6176)),
+Box(Box(6177)),
+Box(Box(6178)),
+Box(Box(6179)),
+Box(Box(6180)),
+Box(Box(6181)),
+Box(Box(6182)),
+Box(Box(6183)),
+Box(Box(6184)),
+Box(Box(6185)),
+Box(Box(6186)),
+Box(Box(6187)),
+Box(Box(6188)),
+Box(Box(6189)),
+Box(Box(6190)),
+Box(Box(6191)),
+Box(Box(6192)),
+Box(Box(6193)),
+Box(Box(6194)),
+Box(Box(6195)),
+Box(Box(6196)),
+Box(Box(6197)),
+Box(Box(6198)),
+Box(Box(6199)),
+Box(Box(6200)),
+Box(Box(6201)),
+Box(Box(6202)),
+Box(Box(6203)),
+Box(Box(6204)),
+Box(Box(6205)),
+Box(Box(6206)),
+Box(Box(6207)),
+Box(Box(6208)),
+Box(Box(6209)),
+Box(Box(6210)),
+Box(Box(6211)),
+Box(Box(6212)),
+Box(Box(6213)),
+Box(Box(6214)),
+Box(Box(6215)),
+Box(Box(6216)),
+Box(Box(6217)),
+Box(Box(6218)),
+Box(Box(6219)),
+Box(Box(6220)),
+Box(Box(6221)),
+Box(Box(6222)),
+Box(Box(6223)),
+Box(Box(6224)),
+Box(Box(6225)),
+Box(Box(6226)),
+Box(Box(6227)),
+Box(Box(6228)),
+Box(Box(6229)),
+Box(Box(6230)),
+Box(Box(6231)),
+Box(Box(6232)),
+Box(Box(6233)),
+Box(Box(6234)),
+Box(Box(6235)),
+Box(Box(6236)),
+Box(Box(6237)),
+Box(Box(6238)),
+Box(Box(6239)),
+Box(Box(6240)),
+Box(Box(6241)),
+Box(Box(6242)),
+Box(Box(6243)),
+Box(Box(6244)),
+Box(Box(6245)),
+Box(Box(6246)),
+Box(Box(6247)),
+Box(Box(6248)),
+Box(Box(6249)),
+Box(Box(6250)),
+Box(Box(6251)),
+Box(Box(6252)),
+Box(Box(6253)),
+Box(Box(6254)),
+Box(Box(6255)),
+Box(Box(6256)),
+Box(Box(6257)),
+Box(Box(6258)),
+Box(Box(6259)),
+Box(Box(6260)),
+Box(Box(6261)),
+Box(Box(6262)),
+Box(Box(6263)),
+Box(Box(6264)),
+Box(Box(6265)),
+Box(Box(6266)),
+Box(Box(6267)),
+Box(Box(6268)),
+Box(Box(6269)),
+Box(Box(6270)),
+Box(Box(6271)),
+Box(Box(6272)),
+Box(Box(6273)),
+Box(Box(6274)),
+Box(Box(6275)),
+Box(Box(6276)),
+Box(Box(6277)),
+Box(Box(6278)),
+Box(Box(6279)),
+Box(Box(6280)),
+Box(Box(6281)),
+Box(Box(6282)),
+Box(Box(6283)),
+Box(Box(6284)),
+Box(Box(6285)),
+Box(Box(6286)),
+Box(Box(6287)),
+Box(Box(6288)),
+Box(Box(6289)),
+Box(Box(6290)),
+Box(Box(6291)),
+Box(Box(6292)),
+Box(Box(6293)),
+Box(Box(6294)),
+Box(Box(6295)),
+Box(Box(6296)),
+Box(Box(6297)),
+Box(Box(6298)),
+Box(Box(6299)),
+Box(Box(6300)),
+Box(Box(6301)),
+Box(Box(6302)),
+Box(Box(6303)),
+Box(Box(6304)),
+Box(Box(6305)),
+Box(Box(6306)),
+Box(Box(6307)),
+Box(Box(6308)),
+Box(Box(6309)),
+Box(Box(6310)),
+Box(Box(6311)),
+Box(Box(6312)),
+Box(Box(6313)),
+Box(Box(6314)),
+Box(Box(6315)),
+Box(Box(6316)),
+Box(Box(6317)),
+Box(Box(6318)),
+Box(Box(6319)),
+Box(Box(6320)),
+Box(Box(6321)),
+Box(Box(6322)),
+Box(Box(6323)),
+Box(Box(6324)),
+Box(Box(6325)),
+Box(Box(6326)),
+Box(Box(6327)),
+Box(Box(6328)),
+Box(Box(6329)),
+Box(Box(6330)),
+Box(Box(6331)),
+Box(Box(6332)),
+Box(Box(6333)),
+Box(Box(6334)),
+Box(Box(6335)),
+Box(Box(6336)),
+Box(Box(6337)),
+Box(Box(6338)),
+Box(Box(6339)),
+Box(Box(6340)),
+Box(Box(6341)),
+Box(Box(6342)),
+Box(Box(6343)),
+Box(Box(6344)),
+Box(Box(6345)),
+Box(Box(6346)),
+Box(Box(6347)),
+Box(Box(6348)),
+Box(Box(6349)),
+Box(Box(6350)),
+Box(Box(6351)),
+Box(Box(6352)),
+Box(Box(6353)),
+Box(Box(6354)),
+Box(Box(6355)),
+Box(Box(6356)),
+Box(Box(6357)),
+Box(Box(6358)),
+Box(Box(6359)),
+Box(Box(6360)),
+Box(Box(6361)),
+Box(Box(6362)),
+Box(Box(6363)),
+Box(Box(6364)),
+Box(Box(6365)),
+Box(Box(6366)),
+Box(Box(6367)),
+Box(Box(6368)),
+Box(Box(6369)),
+Box(Box(6370)),
+Box(Box(6371)),
+Box(Box(6372)),
+Box(Box(6373)),
+Box(Box(6374)),
+Box(Box(6375)),
+Box(Box(6376)),
+Box(Box(6377)),
+Box(Box(6378)),
+Box(Box(6379)),
+Box(Box(6380)),
+Box(Box(6381)),
+Box(Box(6382)),
+Box(Box(6383)),
+Box(Box(6384)),
+Box(Box(6385)),
+Box(Box(6386)),
+Box(Box(6387)),
+Box(Box(6388)),
+Box(Box(6389)),
+Box(Box(6390)),
+Box(Box(6391)),
+Box(Box(6392)),
+Box(Box(6393)),
+Box(Box(6394)),
+Box(Box(6395)),
+Box(Box(6396)),
+Box(Box(6397)),
+Box(Box(6398)),
+Box(Box(6399)),
+Box(Box(6400)),
+Box(Box(6401)),
+Box(Box(6402)),
+Box(Box(6403)),
+Box(Box(6404)),
+Box(Box(6405)),
+Box(Box(6406)),
+Box(Box(6407)),
+Box(Box(6408)),
+Box(Box(6409)),
+Box(Box(6410)),
+Box(Box(6411)),
+Box(Box(6412)),
+Box(Box(6413)),
+Box(Box(6414)),
+Box(Box(6415)),
+Box(Box(6416)),
+Box(Box(6417)),
+Box(Box(6418)),
+Box(Box(6419)),
+Box(Box(6420)),
+Box(Box(6421)),
+Box(Box(6422)),
+Box(Box(6423)),
+Box(Box(6424)),
+Box(Box(6425)),
+Box(Box(6426)),
+Box(Box(6427)),
+Box(Box(6428)),
+Box(Box(6429)),
+Box(Box(6430)),
+Box(Box(6431)),
+Box(Box(6432)),
+Box(Box(6433)),
+Box(Box(6434)),
+Box(Box(6435)),
+Box(Box(6436)),
+Box(Box(6437)),
+Box(Box(6438)),
+Box(Box(6439)),
+Box(Box(6440)),
+Box(Box(6441)),
+Box(Box(6442)),
+Box(Box(6443)),
+Box(Box(6444)),
+Box(Box(6445)),
+Box(Box(6446)),
+Box(Box(6447)),
+Box(Box(6448)),
+Box(Box(6449)),
+Box(Box(6450)),
+Box(Box(6451)),
+Box(Box(6452)),
+Box(Box(6453)),
+Box(Box(6454)),
+Box(Box(6455)),
+Box(Box(6456)),
+Box(Box(6457)),
+Box(Box(6458)),
+Box(Box(6459)),
+Box(Box(6460)),
+Box(Box(6461)),
+Box(Box(6462)),
+Box(Box(6463)),
+Box(Box(6464)),
+Box(Box(6465)),
+Box(Box(6466)),
+Box(Box(6467)),
+Box(Box(6468)),
+Box(Box(6469)),
+Box(Box(6470)),
+Box(Box(6471)),
+Box(Box(6472)),
+Box(Box(6473)),
+Box(Box(6474)),
+Box(Box(6475)),
+Box(Box(6476)),
+Box(Box(6477)),
+Box(Box(6478)),
+Box(Box(6479)),
+Box(Box(6480)),
+Box(Box(6481)),
+Box(Box(6482)),
+Box(Box(6483)),
+Box(Box(6484)),
+Box(Box(6485)),
+Box(Box(6486)),
+Box(Box(6487)),
+Box(Box(6488)),
+Box(Box(6489)),
+Box(Box(6490)),
+Box(Box(6491)),
+Box(Box(6492)),
+Box(Box(6493)),
+Box(Box(6494)),
+Box(Box(6495)),
+Box(Box(6496)),
+Box(Box(6497)),
+Box(Box(6498)),
+Box(Box(6499)),
+Box(Box(6500)),
+Box(Box(6501)),
+Box(Box(6502)),
+Box(Box(6503)),
+Box(Box(6504)),
+Box(Box(6505)),
+Box(Box(6506)),
+Box(Box(6507)),
+Box(Box(6508)),
+Box(Box(6509)),
+Box(Box(6510)),
+Box(Box(6511)),
+Box(Box(6512)),
+Box(Box(6513)),
+Box(Box(6514)),
+Box(Box(6515)),
+Box(Box(6516)),
+Box(Box(6517)),
+Box(Box(6518)),
+Box(Box(6519)),
+Box(Box(6520)),
+Box(Box(6521)),
+Box(Box(6522)),
+Box(Box(6523)),
+Box(Box(6524)),
+Box(Box(6525)),
+Box(Box(6526)),
+Box(Box(6527)),
+Box(Box(6528)),
+Box(Box(6529)),
+Box(Box(6530)),
+Box(Box(6531)),
+Box(Box(6532)),
+Box(Box(6533)),
+Box(Box(6534)),
+Box(Box(6535)),
+Box(Box(6536)),
+Box(Box(6537)),
+Box(Box(6538)),
+Box(Box(6539)),
+Box(Box(6540)),
+Box(Box(6541)),
+Box(Box(6542)),
+Box(Box(6543)),
+Box(Box(6544)),
+Box(Box(6545)),
+Box(Box(6546)),
+Box(Box(6547)),
+Box(Box(6548)),
+Box(Box(6549)),
+Box(Box(6550)),
+Box(Box(6551)),
+Box(Box(6552)),
+Box(Box(6553)),
+Box(Box(6554)),
+Box(Box(6555)),
+Box(Box(6556)),
+Box(Box(6557)),
+Box(Box(6558)),
+Box(Box(6559)),
+Box(Box(6560)),
+Box(Box(6561)),
+Box(Box(6562)),
+Box(Box(6563)),
+Box(Box(6564)),
+Box(Box(6565)),
+Box(Box(6566)),
+Box(Box(6567)),
+Box(Box(6568)),
+Box(Box(6569)),
+Box(Box(6570)),
+Box(Box(6571)),
+Box(Box(6572)),
+Box(Box(6573)),
+Box(Box(6574)),
+Box(Box(6575)),
+Box(Box(6576)),
+Box(Box(6577)),
+Box(Box(6578)),
+Box(Box(6579)),
+Box(Box(6580)),
+Box(Box(6581)),
+Box(Box(6582)),
+Box(Box(6583)),
+Box(Box(6584)),
+Box(Box(6585)),
+Box(Box(6586)),
+Box(Box(6587)),
+Box(Box(6588)),
+Box(Box(6589)),
+Box(Box(6590)),
+Box(Box(6591)),
+Box(Box(6592)),
+Box(Box(6593)),
+Box(Box(6594)),
+Box(Box(6595)),
+Box(Box(6596)),
+Box(Box(6597)),
+Box(Box(6598)),
+Box(Box(6599)),
+Box(Box(6600)),
+Box(Box(6601)),
+Box(Box(6602)),
+Box(Box(6603)),
+Box(Box(6604)),
+Box(Box(6605)),
+Box(Box(6606)),
+Box(Box(6607)),
+Box(Box(6608)),
+Box(Box(6609)),
+Box(Box(6610)),
+Box(Box(6611)),
+Box(Box(6612)),
+Box(Box(6613)),
+Box(Box(6614)),
+Box(Box(6615)),
+Box(Box(6616)),
+Box(Box(6617)),
+Box(Box(6618)),
+Box(Box(6619)),
+Box(Box(6620)),
+Box(Box(6621)),
+Box(Box(6622)),
+Box(Box(6623)),
+Box(Box(6624)),
+Box(Box(6625)),
+Box(Box(6626)),
+Box(Box(6627)),
+Box(Box(6628)),
+Box(Box(6629)),
+Box(Box(6630)),
+Box(Box(6631)),
+Box(Box(6632)),
+Box(Box(6633)),
+Box(Box(6634)),
+Box(Box(6635)),
+Box(Box(6636)),
+Box(Box(6637)),
+Box(Box(6638)),
+Box(Box(6639)),
+Box(Box(6640)),
+Box(Box(6641)),
+Box(Box(6642)),
+Box(Box(6643)),
+Box(Box(6644)),
+Box(Box(6645)),
+Box(Box(6646)),
+Box(Box(6647)),
+Box(Box(6648)),
+Box(Box(6649)),
+Box(Box(6650)),
+Box(Box(6651)),
+Box(Box(6652)),
+Box(Box(6653)),
+Box(Box(6654)),
+Box(Box(6655)),
+Box(Box(6656)),
+Box(Box(6657)),
+Box(Box(6658)),
+Box(Box(6659)),
+Box(Box(6660)),
+Box(Box(6661)),
+Box(Box(6662)),
+Box(Box(6663)),
+Box(Box(6664)),
+Box(Box(6665)),
+Box(Box(6666)),
+Box(Box(6667)),
+Box(Box(6668)),
+Box(Box(6669)),
+Box(Box(6670)),
+Box(Box(6671)),
+Box(Box(6672)),
+Box(Box(6673)),
+Box(Box(6674)),
+Box(Box(6675)),
+Box(Box(6676)),
+Box(Box(6677)),
+Box(Box(6678)),
+Box(Box(6679)),
+Box(Box(6680)),
+Box(Box(6681)),
+Box(Box(6682)),
+Box(Box(6683)),
+Box(Box(6684)),
+Box(Box(6685)),
+Box(Box(6686)),
+Box(Box(6687)),
+Box(Box(6688)),
+Box(Box(6689)),
+Box(Box(6690)),
+Box(Box(6691)),
+Box(Box(6692)),
+Box(Box(6693)),
+Box(Box(6694)),
+Box(Box(6695)),
+Box(Box(6696)),
+Box(Box(6697)),
+Box(Box(6698)),
+Box(Box(6699)),
+Box(Box(6700)),
+Box(Box(6701)),
+Box(Box(6702)),
+Box(Box(6703)),
+Box(Box(6704)),
+Box(Box(6705)),
+Box(Box(6706)),
+Box(Box(6707)),
+Box(Box(6708)),
+Box(Box(6709)),
+Box(Box(6710)),
+Box(Box(6711)),
+Box(Box(6712)),
+Box(Box(6713)),
+Box(Box(6714)),
+Box(Box(6715)),
+Box(Box(6716)),
+Box(Box(6717)),
+Box(Box(6718)),
+Box(Box(6719)),
+Box(Box(6720)),
+Box(Box(6721)),
+Box(Box(6722)),
+Box(Box(6723)),
+Box(Box(6724)),
+Box(Box(6725)),
+Box(Box(6726)),
+Box(Box(6727)),
+Box(Box(6728)),
+Box(Box(6729)),
+Box(Box(6730)),
+Box(Box(6731)),
+Box(Box(6732)),
+Box(Box(6733)),
+Box(Box(6734)),
+Box(Box(6735)),
+Box(Box(6736)),
+Box(Box(6737)),
+Box(Box(6738)),
+Box(Box(6739)),
+Box(Box(6740)),
+Box(Box(6741)),
+Box(Box(6742)),
+Box(Box(6743)),
+Box(Box(6744)),
+Box(Box(6745)),
+Box(Box(6746)),
+Box(Box(6747)),
+Box(Box(6748)),
+Box(Box(6749)),
+Box(Box(6750)),
+Box(Box(6751)),
+Box(Box(6752)),
+Box(Box(6753)),
+Box(Box(6754)),
+Box(Box(6755)),
+Box(Box(6756)),
+Box(Box(6757)),
+Box(Box(6758)),
+Box(Box(6759)),
+Box(Box(6760)),
+Box(Box(6761)),
+Box(Box(6762)),
+Box(Box(6763)),
+Box(Box(6764)),
+Box(Box(6765)),
+Box(Box(6766)),
+Box(Box(6767)),
+Box(Box(6768)),
+Box(Box(6769)),
+Box(Box(6770)),
+Box(Box(6771)),
+Box(Box(6772)),
+Box(Box(6773)),
+Box(Box(6774)),
+Box(Box(6775)),
+Box(Box(6776)),
+Box(Box(6777)),
+Box(Box(6778)),
+Box(Box(6779)),
+Box(Box(6780)),
+Box(Box(6781)),
+Box(Box(6782)),
+Box(Box(6783)),
+Box(Box(6784)),
+Box(Box(6785)),
+Box(Box(6786)),
+Box(Box(6787)),
+Box(Box(6788)),
+Box(Box(6789)),
+Box(Box(6790)),
+Box(Box(6791)),
+Box(Box(6792)),
+Box(Box(6793)),
+Box(Box(6794)),
+Box(Box(6795)),
+Box(Box(6796)),
+Box(Box(6797)),
+Box(Box(6798)),
+Box(Box(6799)),
+Box(Box(6800)),
+Box(Box(6801)),
+Box(Box(6802)),
+Box(Box(6803)),
+Box(Box(6804)),
+Box(Box(6805)),
+Box(Box(6806)),
+Box(Box(6807)),
+Box(Box(6808)),
+Box(Box(6809)),
+Box(Box(6810)),
+Box(Box(6811)),
+Box(Box(6812)),
+Box(Box(6813)),
+Box(Box(6814)),
+Box(Box(6815)),
+Box(Box(6816)),
+Box(Box(6817)),
+Box(Box(6818)),
+Box(Box(6819)),
+Box(Box(6820)),
+Box(Box(6821)),
+Box(Box(6822)),
+Box(Box(6823)),
+Box(Box(6824)),
+Box(Box(6825)),
+Box(Box(6826)),
+Box(Box(6827)),
+Box(Box(6828)),
+Box(Box(6829)),
+Box(Box(6830)),
+Box(Box(6831)),
+Box(Box(6832)),
+Box(Box(6833)),
+Box(Box(6834)),
+Box(Box(6835)),
+Box(Box(6836)),
+Box(Box(6837)),
+Box(Box(6838)),
+Box(Box(6839)),
+Box(Box(6840)),
+Box(Box(6841)),
+Box(Box(6842)),
+Box(Box(6843)),
+Box(Box(6844)),
+Box(Box(6845)),
+Box(Box(6846)),
+Box(Box(6847)),
+Box(Box(6848)),
+Box(Box(6849)),
+Box(Box(6850)),
+Box(Box(6851)),
+Box(Box(6852)),
+Box(Box(6853)),
+Box(Box(6854)),
+Box(Box(6855)),
+Box(Box(6856)),
+Box(Box(6857)),
+Box(Box(6858)),
+Box(Box(6859)),
+Box(Box(6860)),
+Box(Box(6861)),
+Box(Box(6862)),
+Box(Box(6863)),
+Box(Box(6864)),
+Box(Box(6865)),
+Box(Box(6866)),
+Box(Box(6867)),
+Box(Box(6868)),
+Box(Box(6869)),
+Box(Box(6870)),
+Box(Box(6871)),
+Box(Box(6872)),
+Box(Box(6873)),
+Box(Box(6874)),
+Box(Box(6875)),
+Box(Box(6876)),
+Box(Box(6877)),
+Box(Box(6878)),
+Box(Box(6879)),
+Box(Box(6880)),
+Box(Box(6881)),
+Box(Box(6882)),
+Box(Box(6883)),
+Box(Box(6884)),
+Box(Box(6885)),
+Box(Box(6886)),
+Box(Box(6887)),
+Box(Box(6888)),
+Box(Box(6889)),
+Box(Box(6890)),
+Box(Box(6891)),
+Box(Box(6892)),
+Box(Box(6893)),
+Box(Box(6894)),
+Box(Box(6895)),
+Box(Box(6896)),
+Box(Box(6897)),
+Box(Box(6898)),
+Box(Box(6899)),
+Box(Box(6900)),
+Box(Box(6901)),
+Box(Box(6902)),
+Box(Box(6903)),
+Box(Box(6904)),
+Box(Box(6905)),
+Box(Box(6906)),
+Box(Box(6907)),
+Box(Box(6908)),
+Box(Box(6909)),
+Box(Box(6910)),
+Box(Box(6911)),
+Box(Box(6912)),
+Box(Box(6913)),
+Box(Box(6914)),
+Box(Box(6915)),
+Box(Box(6916)),
+Box(Box(6917)),
+Box(Box(6918)),
+Box(Box(6919)),
+Box(Box(6920)),
+Box(Box(6921)),
+Box(Box(6922)),
+Box(Box(6923)),
+Box(Box(6924)),
+Box(Box(6925)),
+Box(Box(6926)),
+Box(Box(6927)),
+Box(Box(6928)),
+Box(Box(6929)),
+Box(Box(6930)),
+Box(Box(6931)),
+Box(Box(6932)),
+Box(Box(6933)),
+Box(Box(6934)),
+Box(Box(6935)),
+Box(Box(6936)),
+Box(Box(6937)),
+Box(Box(6938)),
+Box(Box(6939)),
+Box(Box(6940)),
+Box(Box(6941)),
+Box(Box(6942)),
+Box(Box(6943)),
+Box(Box(6944)),
+Box(Box(6945)),
+Box(Box(6946)),
+Box(Box(6947)),
+Box(Box(6948)),
+Box(Box(6949)),
+Box(Box(6950)),
+Box(Box(6951)),
+Box(Box(6952)),
+Box(Box(6953)),
+Box(Box(6954)),
+Box(Box(6955)),
+Box(Box(6956)),
+Box(Box(6957)),
+Box(Box(6958)),
+Box(Box(6959)),
+Box(Box(6960)),
+Box(Box(6961)),
+Box(Box(6962)),
+Box(Box(6963)),
+Box(Box(6964)),
+Box(Box(6965)),
+Box(Box(6966)),
+Box(Box(6967)),
+Box(Box(6968)),
+Box(Box(6969)),
+Box(Box(6970)),
+Box(Box(6971)),
+Box(Box(6972)),
+Box(Box(6973)),
+Box(Box(6974)),
+Box(Box(6975)),
+Box(Box(6976)),
+Box(Box(6977)),
+Box(Box(6978)),
+Box(Box(6979)),
+Box(Box(6980)),
+Box(Box(6981)),
+Box(Box(6982)),
+Box(Box(6983)),
+Box(Box(6984)),
+Box(Box(6985)),
+Box(Box(6986)),
+Box(Box(6987)),
+Box(Box(6988)),
+Box(Box(6989)),
+Box(Box(6990)),
+Box(Box(6991)),
+Box(Box(6992)),
+Box(Box(6993)),
+Box(Box(6994)),
+Box(Box(6995)),
+Box(Box(6996)),
+Box(Box(6997)),
+Box(Box(6998)),
+Box(Box(6999)),
+Box(Box(7000)),
+Box(Box(7001)),
+Box(Box(7002)),
+Box(Box(7003)),
+Box(Box(7004)),
+Box(Box(7005)),
+Box(Box(7006)),
+Box(Box(7007)),
+Box(Box(7008)),
+Box(Box(7009)),
+Box(Box(7010)),
+Box(Box(7011)),
+Box(Box(7012)),
+Box(Box(7013)),
+Box(Box(7014)),
+Box(Box(7015)),
+Box(Box(7016)),
+Box(Box(7017)),
+Box(Box(7018)),
+Box(Box(7019)),
+Box(Box(7020)),
+Box(Box(7021)),
+Box(Box(7022)),
+Box(Box(7023)),
+Box(Box(7024)),
+Box(Box(7025)),
+Box(Box(7026)),
+Box(Box(7027)),
+Box(Box(7028)),
+Box(Box(7029)),
+Box(Box(7030)),
+Box(Box(7031)),
+Box(Box(7032)),
+Box(Box(7033)),
+Box(Box(7034)),
+Box(Box(7035)),
+Box(Box(7036)),
+Box(Box(7037)),
+Box(Box(7038)),
+Box(Box(7039)),
+Box(Box(7040)),
+Box(Box(7041)),
+Box(Box(7042)),
+Box(Box(7043)),
+Box(Box(7044)),
+Box(Box(7045)),
+Box(Box(7046)),
+Box(Box(7047)),
+Box(Box(7048)),
+Box(Box(7049)),
+Box(Box(7050)),
+Box(Box(7051)),
+Box(Box(7052)),
+Box(Box(7053)),
+Box(Box(7054)),
+Box(Box(7055)),
+Box(Box(7056)),
+Box(Box(7057)),
+Box(Box(7058)),
+Box(Box(7059)),
+Box(Box(7060)),
+Box(Box(7061)),
+Box(Box(7062)),
+Box(Box(7063)),
+Box(Box(7064)),
+Box(Box(7065)),
+Box(Box(7066)),
+Box(Box(7067)),
+Box(Box(7068)),
+Box(Box(7069)),
+Box(Box(7070)),
+Box(Box(7071)),
+Box(Box(7072)),
+Box(Box(7073)),
+Box(Box(7074)),
+Box(Box(7075)),
+Box(Box(7076)),
+Box(Box(7077)),
+Box(Box(7078)),
+Box(Box(7079)),
+Box(Box(7080)),
+Box(Box(7081)),
+Box(Box(7082)),
+Box(Box(7083)),
+Box(Box(7084)),
+Box(Box(7085)),
+Box(Box(7086)),
+Box(Box(7087)),
+Box(Box(7088)),
+Box(Box(7089)),
+Box(Box(7090)),
+Box(Box(7091)),
+Box(Box(7092)),
+Box(Box(7093)),
+Box(Box(7094)),
+Box(Box(7095)),
+Box(Box(7096)),
+Box(Box(7097)),
+Box(Box(7098)),
+Box(Box(7099)),
+Box(Box(7100)),
+Box(Box(7101)),
+Box(Box(7102)),
+Box(Box(7103)),
+Box(Box(7104)),
+Box(Box(7105)),
+Box(Box(7106)),
+Box(Box(7107)),
+Box(Box(7108)),
+Box(Box(7109)),
+Box(Box(7110)),
+Box(Box(7111)),
+Box(Box(7112)),
+Box(Box(7113)),
+Box(Box(7114)),
+Box(Box(7115)),
+Box(Box(7116)),
+Box(Box(7117)),
+Box(Box(7118)),
+Box(Box(7119)),
+Box(Box(7120)),
+Box(Box(7121)),
+Box(Box(7122)),
+Box(Box(7123)),
+Box(Box(7124)),
+Box(Box(7125)),
+Box(Box(7126)),
+Box(Box(7127)),
+Box(Box(7128)),
+Box(Box(7129)),
+Box(Box(7130)),
+Box(Box(7131)),
+Box(Box(7132)),
+Box(Box(7133)),
+Box(Box(7134)),
+Box(Box(7135)),
+Box(Box(7136)),
+Box(Box(7137)),
+Box(Box(7138)),
+Box(Box(7139)),
+Box(Box(7140)),
+Box(Box(7141)),
+Box(Box(7142)),
+Box(Box(7143)),
+Box(Box(7144)),
+Box(Box(7145)),
+Box(Box(7146)),
+Box(Box(7147)),
+Box(Box(7148)),
+Box(Box(7149)),
+Box(Box(7150)),
+Box(Box(7151)),
+Box(Box(7152)),
+Box(Box(7153)),
+Box(Box(7154)),
+Box(Box(7155)),
+Box(Box(7156)),
+Box(Box(7157)),
+Box(Box(7158)),
+Box(Box(7159)),
+Box(Box(7160)),
+Box(Box(7161)),
+Box(Box(7162)),
+Box(Box(7163)),
+Box(Box(7164)),
+Box(Box(7165)),
+Box(Box(7166)),
+Box(Box(7167)),
+Box(Box(7168)),
+Box(Box(7169)),
+Box(Box(7170)),
+Box(Box(7171)),
+Box(Box(7172)),
+Box(Box(7173)),
+Box(Box(7174)),
+Box(Box(7175)),
+Box(Box(7176)),
+Box(Box(7177)),
+Box(Box(7178)),
+Box(Box(7179)),
+Box(Box(7180)),
+Box(Box(7181)),
+Box(Box(7182)),
+Box(Box(7183)),
+Box(Box(7184)),
+Box(Box(7185)),
+Box(Box(7186)),
+Box(Box(7187)),
+Box(Box(7188)),
+Box(Box(7189)),
+Box(Box(7190)),
+Box(Box(7191)),
+Box(Box(7192)),
+Box(Box(7193)),
+Box(Box(7194)),
+Box(Box(7195)),
+Box(Box(7196)),
+Box(Box(7197)),
+Box(Box(7198)),
+Box(Box(7199)),
+Box(Box(7200)),
+Box(Box(7201)),
+Box(Box(7202)),
+Box(Box(7203)),
+Box(Box(7204)),
+Box(Box(7205)),
+Box(Box(7206)),
+Box(Box(7207)),
+Box(Box(7208)),
+Box(Box(7209)),
+Box(Box(7210)),
+Box(Box(7211)),
+Box(Box(7212)),
+Box(Box(7213)),
+Box(Box(7214)),
+Box(Box(7215)),
+Box(Box(7216)),
+Box(Box(7217)),
+Box(Box(7218)),
+Box(Box(7219)),
+Box(Box(7220)),
+Box(Box(7221)),
+Box(Box(7222)),
+Box(Box(7223)),
+Box(Box(7224)),
+Box(Box(7225)),
+Box(Box(7226)),
+Box(Box(7227)),
+Box(Box(7228)),
+Box(Box(7229)),
+Box(Box(7230)),
+Box(Box(7231)),
+Box(Box(7232)),
+Box(Box(7233)),
+Box(Box(7234)),
+Box(Box(7235)),
+Box(Box(7236)),
+Box(Box(7237)),
+Box(Box(7238)),
+Box(Box(7239)),
+Box(Box(7240)),
+Box(Box(7241)),
+Box(Box(7242)),
+Box(Box(7243)),
+Box(Box(7244)),
+Box(Box(7245)),
+Box(Box(7246)),
+Box(Box(7247)),
+Box(Box(7248)),
+Box(Box(7249)),
+Box(Box(7250)),
+Box(Box(7251)),
+Box(Box(7252)),
+Box(Box(7253)),
+Box(Box(7254)),
+Box(Box(7255)),
+Box(Box(7256)),
+Box(Box(7257)),
+Box(Box(7258)),
+Box(Box(7259)),
+Box(Box(7260)),
+Box(Box(7261)),
+Box(Box(7262)),
+Box(Box(7263)),
+Box(Box(7264)),
+Box(Box(7265)),
+Box(Box(7266)),
+Box(Box(7267)),
+Box(Box(7268)),
+Box(Box(7269)),
+Box(Box(7270)),
+Box(Box(7271)),
+Box(Box(7272)),
+Box(Box(7273)),
+Box(Box(7274)),
+Box(Box(7275)),
+Box(Box(7276)),
+Box(Box(7277)),
+Box(Box(7278)),
+Box(Box(7279)),
+Box(Box(7280)),
+Box(Box(7281)),
+Box(Box(7282)),
+Box(Box(7283)),
+Box(Box(7284)),
+Box(Box(7285)),
+Box(Box(7286)),
+Box(Box(7287)),
+Box(Box(7288)),
+Box(Box(7289)),
+Box(Box(7290)),
+Box(Box(7291)),
+Box(Box(7292)),
+Box(Box(7293)),
+Box(Box(7294)),
+Box(Box(7295)),
+Box(Box(7296)),
+Box(Box(7297)),
+Box(Box(7298)),
+Box(Box(7299)),
+Box(Box(7300)),
+Box(Box(7301)),
+Box(Box(7302)),
+Box(Box(7303)),
+Box(Box(7304)),
+Box(Box(7305)),
+Box(Box(7306)),
+Box(Box(7307)),
+Box(Box(7308)),
+Box(Box(7309)),
+Box(Box(7310)),
+Box(Box(7311)),
+Box(Box(7312)),
+Box(Box(7313)),
+Box(Box(7314)),
+Box(Box(7315)),
+Box(Box(7316)),
+Box(Box(7317)),
+Box(Box(7318)),
+Box(Box(7319)),
+Box(Box(7320)),
+Box(Box(7321)),
+Box(Box(7322)),
+Box(Box(7323)),
+Box(Box(7324)),
+Box(Box(7325)),
+Box(Box(7326)),
+Box(Box(7327)),
+Box(Box(7328)),
+Box(Box(7329)),
+Box(Box(7330)),
+Box(Box(7331)),
+Box(Box(7332)),
+Box(Box(7333)),
+Box(Box(7334)),
+Box(Box(7335)),
+Box(Box(7336)),
+Box(Box(7337)),
+Box(Box(7338)),
+Box(Box(7339)),
+Box(Box(7340)),
+Box(Box(7341)),
+Box(Box(7342)),
+Box(Box(7343)),
+Box(Box(7344)),
+Box(Box(7345)),
+Box(Box(7346)),
+Box(Box(7347)),
+Box(Box(7348)),
+Box(Box(7349)),
+Box(Box(7350)),
+Box(Box(7351)),
+Box(Box(7352)),
+Box(Box(7353)),
+Box(Box(7354)),
+Box(Box(7355)),
+Box(Box(7356)),
+Box(Box(7357)),
+Box(Box(7358)),
+Box(Box(7359)),
+Box(Box(7360)),
+Box(Box(7361)),
+Box(Box(7362)),
+Box(Box(7363)),
+Box(Box(7364)),
+Box(Box(7365)),
+Box(Box(7366)),
+Box(Box(7367)),
+Box(Box(7368)),
+Box(Box(7369)),
+Box(Box(7370)),
+Box(Box(7371)),
+Box(Box(7372)),
+Box(Box(7373)),
+Box(Box(7374)),
+Box(Box(7375)),
+Box(Box(7376)),
+Box(Box(7377)),
+Box(Box(7378)),
+Box(Box(7379)),
+Box(Box(7380)),
+Box(Box(7381)),
+Box(Box(7382)),
+Box(Box(7383)),
+Box(Box(7384)),
+Box(Box(7385)),
+Box(Box(7386)),
+Box(Box(7387)),
+Box(Box(7388)),
+Box(Box(7389)),
+Box(Box(7390)),
+Box(Box(7391)),
+Box(Box(7392)),
+Box(Box(7393)),
+Box(Box(7394)),
+Box(Box(7395)),
+Box(Box(7396)),
+Box(Box(7397)),
+Box(Box(7398)),
+Box(Box(7399)),
+Box(Box(7400)),
+Box(Box(7401)),
+Box(Box(7402)),
+Box(Box(7403)),
+Box(Box(7404)),
+Box(Box(7405)),
+Box(Box(7406)),
+Box(Box(7407)),
+Box(Box(7408)),
+Box(Box(7409)),
+Box(Box(7410)),
+Box(Box(7411)),
+Box(Box(7412)),
+Box(Box(7413)),
+Box(Box(7414)),
+Box(Box(7415)),
+Box(Box(7416)),
+Box(Box(7417)),
+Box(Box(7418)),
+Box(Box(7419)),
+Box(Box(7420)),
+Box(Box(7421)),
+Box(Box(7422)),
+Box(Box(7423)),
+Box(Box(7424)),
+Box(Box(7425)),
+Box(Box(7426)),
+Box(Box(7427)),
+Box(Box(7428)),
+Box(Box(7429)),
+Box(Box(7430)),
+Box(Box(7431)),
+Box(Box(7432)),
+Box(Box(7433)),
+Box(Box(7434)),
+Box(Box(7435)),
+Box(Box(7436)),
+Box(Box(7437)),
+Box(Box(7438)),
+Box(Box(7439)),
+Box(Box(7440)),
+Box(Box(7441)),
+Box(Box(7442)),
+Box(Box(7443)),
+Box(Box(7444)),
+Box(Box(7445)),
+Box(Box(7446)),
+Box(Box(7447)),
+Box(Box(7448)),
+Box(Box(7449)),
+Box(Box(7450)),
+Box(Box(7451)),
+Box(Box(7452)),
+Box(Box(7453)),
+Box(Box(7454)),
+Box(Box(7455)),
+Box(Box(7456)),
+Box(Box(7457)),
+Box(Box(7458)),
+Box(Box(7459)),
+Box(Box(7460)),
+Box(Box(7461)),
+Box(Box(7462)),
+Box(Box(7463)),
+Box(Box(7464)),
+Box(Box(7465)),
+Box(Box(7466)),
+Box(Box(7467)),
+Box(Box(7468)),
+Box(Box(7469)),
+Box(Box(7470)),
+Box(Box(7471)),
+Box(Box(7472)),
+Box(Box(7473)),
+Box(Box(7474)),
+Box(Box(7475)),
+Box(Box(7476)),
+Box(Box(7477)),
+Box(Box(7478)),
+Box(Box(7479)),
+Box(Box(7480)),
+Box(Box(7481)),
+Box(Box(7482)),
+Box(Box(7483)),
+Box(Box(7484)),
+Box(Box(7485)),
+Box(Box(7486)),
+Box(Box(7487)),
+Box(Box(7488)),
+Box(Box(7489)),
+Box(Box(7490)),
+Box(Box(7491)),
+Box(Box(7492)),
+Box(Box(7493)),
+Box(Box(7494)),
+Box(Box(7495)),
+Box(Box(7496)),
+Box(Box(7497)),
+Box(Box(7498)),
+Box(Box(7499)),
+Box(Box(7500)),
+Box(Box(7501)),
+Box(Box(7502)),
+Box(Box(7503)),
+Box(Box(7504)),
+Box(Box(7505)),
+Box(Box(7506)),
+Box(Box(7507)),
+Box(Box(7508)),
+Box(Box(7509)),
+Box(Box(7510)),
+Box(Box(7511)),
+Box(Box(7512)),
+Box(Box(7513)),
+Box(Box(7514)),
+Box(Box(7515)),
+Box(Box(7516)),
+Box(Box(7517)),
+Box(Box(7518)),
+Box(Box(7519)),
+Box(Box(7520)),
+Box(Box(7521)),
+Box(Box(7522)),
+Box(Box(7523)),
+Box(Box(7524)),
+Box(Box(7525)),
+Box(Box(7526)),
+Box(Box(7527)),
+Box(Box(7528)),
+Box(Box(7529)),
+Box(Box(7530)),
+Box(Box(7531)),
+Box(Box(7532)),
+Box(Box(7533)),
+Box(Box(7534)),
+Box(Box(7535)),
+Box(Box(7536)),
+Box(Box(7537)),
+Box(Box(7538)),
+Box(Box(7539)),
+Box(Box(7540)),
+Box(Box(7541)),
+Box(Box(7542)),
+Box(Box(7543)),
+Box(Box(7544)),
+Box(Box(7545)),
+Box(Box(7546)),
+Box(Box(7547)),
+Box(Box(7548)),
+Box(Box(7549)),
+Box(Box(7550)),
+Box(Box(7551)),
+Box(Box(7552)),
+Box(Box(7553)),
+Box(Box(7554)),
+Box(Box(7555)),
+Box(Box(7556)),
+Box(Box(7557)),
+Box(Box(7558)),
+Box(Box(7559)),
+Box(Box(7560)),
+Box(Box(7561)),
+Box(Box(7562)),
+Box(Box(7563)),
+Box(Box(7564)),
+Box(Box(7565)),
+Box(Box(7566)),
+Box(Box(7567)),
+Box(Box(7568)),
+Box(Box(7569)),
+Box(Box(7570)),
+Box(Box(7571)),
+Box(Box(7572)),
+Box(Box(7573)),
+Box(Box(7574)),
+Box(Box(7575)),
+Box(Box(7576)),
+Box(Box(7577)),
+Box(Box(7578)),
+Box(Box(7579)),
+Box(Box(7580)),
+Box(Box(7581)),
+Box(Box(7582)),
+Box(Box(7583)),
+Box(Box(7584)),
+Box(Box(7585)),
+Box(Box(7586)),
+Box(Box(7587)),
+Box(Box(7588)),
+Box(Box(7589)),
+Box(Box(7590)),
+Box(Box(7591)),
+Box(Box(7592)),
+Box(Box(7593)),
+Box(Box(7594)),
+Box(Box(7595)),
+Box(Box(7596)),
+Box(Box(7597)),
+Box(Box(7598)),
+Box(Box(7599)),
+Box(Box(7600)),
+Box(Box(7601)),
+Box(Box(7602)),
+Box(Box(7603)),
+Box(Box(7604)),
+Box(Box(7605)),
+Box(Box(7606)),
+Box(Box(7607)),
+Box(Box(7608)),
+Box(Box(7609)),
+Box(Box(7610)),
+Box(Box(7611)),
+Box(Box(7612)),
+Box(Box(7613)),
+Box(Box(7614)),
+Box(Box(7615)),
+Box(Box(7616)),
+Box(Box(7617)),
+Box(Box(7618)),
+Box(Box(7619)),
+Box(Box(7620)),
+Box(Box(7621)),
+Box(Box(7622)),
+Box(Box(7623)),
+Box(Box(7624)),
+Box(Box(7625)),
+Box(Box(7626)),
+Box(Box(7627)),
+Box(Box(7628)),
+Box(Box(7629)),
+Box(Box(7630)),
+Box(Box(7631)),
+Box(Box(7632)),
+Box(Box(7633)),
+Box(Box(7634)),
+Box(Box(7635)),
+Box(Box(7636)),
+Box(Box(7637)),
+Box(Box(7638)),
+Box(Box(7639)),
+Box(Box(7640)),
+Box(Box(7641)),
+Box(Box(7642)),
+Box(Box(7643)),
+Box(Box(7644)),
+Box(Box(7645)),
+Box(Box(7646)),
+Box(Box(7647)),
+Box(Box(7648)),
+Box(Box(7649)),
+Box(Box(7650)),
+Box(Box(7651)),
+Box(Box(7652)),
+Box(Box(7653)),
+Box(Box(7654)),
+Box(Box(7655)),
+Box(Box(7656)),
+Box(Box(7657)),
+Box(Box(7658)),
+Box(Box(7659)),
+Box(Box(7660)),
+Box(Box(7661)),
+Box(Box(7662)),
+Box(Box(7663)),
+Box(Box(7664)),
+Box(Box(7665)),
+Box(Box(7666)),
+Box(Box(7667)),
+Box(Box(7668)),
+Box(Box(7669)),
+Box(Box(7670)),
+Box(Box(7671)),
+Box(Box(7672)),
+Box(Box(7673)),
+Box(Box(7674)),
+Box(Box(7675)),
+Box(Box(7676)),
+Box(Box(7677)),
+Box(Box(7678)),
+Box(Box(7679)),
+Box(Box(7680)),
+Box(Box(7681)),
+Box(Box(7682)),
+Box(Box(7683)),
+Box(Box(7684)),
+Box(Box(7685)),
+Box(Box(7686)),
+Box(Box(7687)),
+Box(Box(7688)),
+Box(Box(7689)),
+Box(Box(7690)),
+Box(Box(7691)),
+Box(Box(7692)),
+Box(Box(7693)),
+Box(Box(7694)),
+Box(Box(7695)),
+Box(Box(7696)),
+Box(Box(7697)),
+Box(Box(7698)),
+Box(Box(7699)),
+Box(Box(7700)),
+Box(Box(7701)),
+Box(Box(7702)),
+Box(Box(7703)),
+Box(Box(7704)),
+Box(Box(7705)),
+Box(Box(7706)),
+Box(Box(7707)),
+Box(Box(7708)),
+Box(Box(7709)),
+Box(Box(7710)),
+Box(Box(7711)),
+Box(Box(7712)),
+Box(Box(7713)),
+Box(Box(7714)),
+Box(Box(7715)),
+Box(Box(7716)),
+Box(Box(7717)),
+Box(Box(7718)),
+Box(Box(7719)),
+Box(Box(7720)),
+Box(Box(7721)),
+Box(Box(7722)),
+Box(Box(7723)),
+Box(Box(7724)),
+Box(Box(7725)),
+Box(Box(7726)),
+Box(Box(7727)),
+Box(Box(7728)),
+Box(Box(7729)),
+Box(Box(7730)),
+Box(Box(7731)),
+Box(Box(7732)),
+Box(Box(7733)),
+Box(Box(7734)),
+Box(Box(7735)),
+Box(Box(7736)),
+Box(Box(7737)),
+Box(Box(7738)),
+Box(Box(7739)),
+Box(Box(7740)),
+Box(Box(7741)),
+Box(Box(7742)),
+Box(Box(7743)),
+Box(Box(7744)),
+Box(Box(7745)),
+Box(Box(7746)),
+Box(Box(7747)),
+Box(Box(7748)),
+Box(Box(7749)),
+Box(Box(7750)),
+Box(Box(7751)),
+Box(Box(7752)),
+Box(Box(7753)),
+Box(Box(7754)),
+Box(Box(7755)),
+Box(Box(7756)),
+Box(Box(7757)),
+Box(Box(7758)),
+Box(Box(7759)),
+Box(Box(7760)),
+Box(Box(7761)),
+Box(Box(7762)),
+Box(Box(7763)),
+Box(Box(7764)),
+Box(Box(7765)),
+Box(Box(7766)),
+Box(Box(7767)),
+Box(Box(7768)),
+Box(Box(7769)),
+Box(Box(7770)),
+Box(Box(7771)),
+Box(Box(7772)),
+Box(Box(7773)),
+Box(Box(7774)),
+Box(Box(7775)),
+Box(Box(7776)),
+Box(Box(7777)),
+Box(Box(7778)),
+Box(Box(7779)),
+Box(Box(7780)),
+Box(Box(7781)),
+Box(Box(7782)),
+Box(Box(7783)),
+Box(Box(7784)),
+Box(Box(7785)),
+Box(Box(7786)),
+Box(Box(7787)),
+Box(Box(7788)),
+Box(Box(7789)),
+Box(Box(7790)),
+Box(Box(7791)),
+Box(Box(7792)),
+Box(Box(7793)),
+Box(Box(7794)),
+Box(Box(7795)),
+Box(Box(7796)),
+Box(Box(7797)),
+Box(Box(7798)),
+Box(Box(7799)),
+Box(Box(7800)),
+Box(Box(7801)),
+Box(Box(7802)),
+Box(Box(7803)),
+Box(Box(7804)),
+Box(Box(7805)),
+Box(Box(7806)),
+Box(Box(7807)),
+Box(Box(7808)),
+Box(Box(7809)),
+Box(Box(7810)),
+Box(Box(7811)),
+Box(Box(7812)),
+Box(Box(7813)),
+Box(Box(7814)),
+Box(Box(7815)),
+Box(Box(7816)),
+Box(Box(7817)),
+Box(Box(7818)),
+Box(Box(7819)),
+Box(Box(7820)),
+Box(Box(7821)),
+Box(Box(7822)),
+Box(Box(7823)),
+Box(Box(7824)),
+Box(Box(7825)),
+Box(Box(7826)),
+Box(Box(7827)),
+Box(Box(7828)),
+Box(Box(7829)),
+Box(Box(7830)),
+Box(Box(7831)),
+Box(Box(7832)),
+Box(Box(7833)),
+Box(Box(7834)),
+Box(Box(7835)),
+Box(Box(7836)),
+Box(Box(7837)),
+Box(Box(7838)),
+Box(Box(7839)),
+Box(Box(7840)),
+Box(Box(7841)),
+Box(Box(7842)),
+Box(Box(7843)),
+Box(Box(7844)),
+Box(Box(7845)),
+Box(Box(7846)),
+Box(Box(7847)),
+Box(Box(7848)),
+Box(Box(7849)),
+Box(Box(7850)),
+Box(Box(7851)),
+Box(Box(7852)),
+Box(Box(7853)),
+Box(Box(7854)),
+Box(Box(7855)),
+Box(Box(7856)),
+Box(Box(7857)),
+Box(Box(7858)),
+Box(Box(7859)),
+Box(Box(7860)),
+Box(Box(7861)),
+Box(Box(7862)),
+Box(Box(7863)),
+Box(Box(7864)),
+Box(Box(7865)),
+Box(Box(7866)),
+Box(Box(7867)),
+Box(Box(7868)),
+Box(Box(7869)),
+Box(Box(7870)),
+Box(Box(7871)),
+Box(Box(7872)),
+Box(Box(7873)),
+Box(Box(7874)),
+Box(Box(7875)),
+Box(Box(7876)),
+Box(Box(7877)),
+Box(Box(7878)),
+Box(Box(7879)),
+Box(Box(7880)),
+Box(Box(7881)),
+Box(Box(7882)),
+Box(Box(7883)),
+Box(Box(7884)),
+Box(Box(7885)),
+Box(Box(7886)),
+Box(Box(7887)),
+Box(Box(7888)),
+Box(Box(7889)),
+Box(Box(7890)),
+Box(Box(7891)),
+Box(Box(7892)),
+Box(Box(7893)),
+Box(Box(7894)),
+Box(Box(7895)),
+Box(Box(7896)),
+Box(Box(7897)),
+Box(Box(7898)),
+Box(Box(7899)),
+Box(Box(7900)),
+Box(Box(7901)),
+Box(Box(7902)),
+Box(Box(7903)),
+Box(Box(7904)),
+Box(Box(7905)),
+Box(Box(7906)),
+Box(Box(7907)),
+Box(Box(7908)),
+Box(Box(7909)),
+Box(Box(7910)),
+Box(Box(7911)),
+Box(Box(7912)),
+Box(Box(7913)),
+Box(Box(7914)),
+Box(Box(7915)),
+Box(Box(7916)),
+Box(Box(7917)),
+Box(Box(7918)),
+Box(Box(7919)),
+Box(Box(7920)),
+Box(Box(7921)),
+Box(Box(7922)),
+Box(Box(7923)),
+Box(Box(7924)),
+Box(Box(7925)),
+Box(Box(7926)),
+Box(Box(7927)),
+Box(Box(7928)),
+Box(Box(7929)),
+Box(Box(7930)),
+Box(Box(7931)),
+Box(Box(7932)),
+Box(Box(7933)),
+Box(Box(7934)),
+Box(Box(7935)),
+Box(Box(7936)),
+Box(Box(7937)),
+Box(Box(7938)),
+Box(Box(7939)),
+Box(Box(7940)),
+Box(Box(7941)),
+Box(Box(7942)),
+Box(Box(7943)),
+Box(Box(7944)),
+Box(Box(7945)),
+Box(Box(7946)),
+Box(Box(7947)),
+Box(Box(7948)),
+Box(Box(7949)),
+Box(Box(7950)),
+Box(Box(7951)),
+Box(Box(7952)),
+Box(Box(7953)),
+Box(Box(7954)),
+Box(Box(7955)),
+Box(Box(7956)),
+Box(Box(7957)),
+Box(Box(7958)),
+Box(Box(7959)),
+Box(Box(7960)),
+Box(Box(7961)),
+Box(Box(7962)),
+Box(Box(7963)),
+Box(Box(7964)),
+Box(Box(7965)),
+Box(Box(7966)),
+Box(Box(7967)),
+Box(Box(7968)),
+Box(Box(7969)),
+Box(Box(7970)),
+Box(Box(7971)),
+Box(Box(7972)),
+Box(Box(7973)),
+Box(Box(7974)),
+Box(Box(7975)),
+Box(Box(7976)),
+Box(Box(7977)),
+Box(Box(7978)),
+Box(Box(7979)),
+Box(Box(7980)),
+Box(Box(7981)),
+Box(Box(7982)),
+Box(Box(7983)),
+Box(Box(7984)),
+Box(Box(7985)),
+Box(Box(7986)),
+Box(Box(7987)),
+Box(Box(7988)),
+Box(Box(7989)),
+Box(Box(7990)),
+Box(Box(7991)),
+Box(Box(7992)),
+Box(Box(7993)),
+Box(Box(7994)),
+Box(Box(7995)),
+Box(Box(7996)),
+Box(Box(7997)),
+Box(Box(7998)),
+Box(Box(7999)),
+Box(Box(8000)),
+Box(Box(8001)),
+Box(Box(8002)),
+Box(Box(8003)),
+Box(Box(8004)),
+Box(Box(8005)),
+Box(Box(8006)),
+Box(Box(8007)),
+Box(Box(8008)),
+Box(Box(8009)),
+Box(Box(8010)),
+Box(Box(8011)),
+Box(Box(8012)),
+Box(Box(8013)),
+Box(Box(8014)),
+Box(Box(8015)),
+Box(Box(8016)),
+Box(Box(8017)),
+Box(Box(8018)),
+Box(Box(8019)),
+Box(Box(8020)),
+Box(Box(8021)),
+Box(Box(8022)),
+Box(Box(8023)),
+Box(Box(8024)),
+Box(Box(8025)),
+Box(Box(8026)),
+Box(Box(8027)),
+Box(Box(8028)),
+Box(Box(8029)),
+Box(Box(8030)),
+Box(Box(8031)),
+Box(Box(8032)),
+Box(Box(8033)),
+Box(Box(8034)),
+Box(Box(8035)),
+Box(Box(8036)),
+Box(Box(8037)),
+Box(Box(8038)),
+Box(Box(8039)),
+Box(Box(8040)),
+Box(Box(8041)),
+Box(Box(8042)),
+Box(Box(8043)),
+Box(Box(8044)),
+Box(Box(8045)),
+Box(Box(8046)),
+Box(Box(8047)),
+Box(Box(8048)),
+Box(Box(8049)),
+Box(Box(8050)),
+Box(Box(8051)),
+Box(Box(8052)),
+Box(Box(8053)),
+Box(Box(8054)),
+Box(Box(8055)),
+Box(Box(8056)),
+Box(Box(8057)),
+Box(Box(8058)),
+Box(Box(8059)),
+Box(Box(8060)),
+Box(Box(8061)),
+Box(Box(8062)),
+Box(Box(8063)),
+Box(Box(8064)),
+Box(Box(8065)),
+Box(Box(8066)),
+Box(Box(8067)),
+Box(Box(8068)),
+Box(Box(8069)),
+Box(Box(8070)),
+Box(Box(8071)),
+Box(Box(8072)),
+Box(Box(8073)),
+Box(Box(8074)),
+Box(Box(8075)),
+Box(Box(8076)),
+Box(Box(8077)),
+Box(Box(8078)),
+Box(Box(8079)),
+Box(Box(8080)),
+Box(Box(8081)),
+Box(Box(8082)),
+Box(Box(8083)),
+Box(Box(8084)),
+Box(Box(8085)),
+Box(Box(8086)),
+Box(Box(8087)),
+Box(Box(8088)),
+Box(Box(8089)),
+Box(Box(8090)),
+Box(Box(8091)),
+Box(Box(8092)),
+Box(Box(8093)),
+Box(Box(8094)),
+Box(Box(8095)),
+Box(Box(8096)),
+Box(Box(8097)),
+Box(Box(8098)),
+Box(Box(8099)),
+Box(Box(8100)),
+Box(Box(8101)),
+Box(Box(8102)),
+Box(Box(8103)),
+Box(Box(8104)),
+Box(Box(8105)),
+Box(Box(8106)),
+Box(Box(8107)),
+Box(Box(8108)),
+Box(Box(8109)),
+Box(Box(8110)),
+Box(Box(8111)),
+Box(Box(8112)),
+Box(Box(8113)),
+Box(Box(8114)),
+Box(Box(8115)),
+Box(Box(8116)),
+Box(Box(8117)),
+Box(Box(8118)),
+Box(Box(8119)),
+Box(Box(8120)),
+Box(Box(8121)),
+Box(Box(8122)),
+Box(Box(8123)),
+Box(Box(8124)),
+Box(Box(8125)),
+Box(Box(8126)),
+Box(Box(8127)),
+Box(Box(8128)),
+Box(Box(8129)),
+Box(Box(8130)),
+Box(Box(8131)),
+Box(Box(8132)),
+Box(Box(8133)),
+Box(Box(8134)),
+Box(Box(8135)),
+Box(Box(8136)),
+Box(Box(8137)),
+Box(Box(8138)),
+Box(Box(8139)),
+Box(Box(8140)),
+Box(Box(8141)),
+Box(Box(8142)),
+Box(Box(8143)),
+Box(Box(8144)),
+Box(Box(8145)),
+Box(Box(8146)),
+Box(Box(8147)),
+Box(Box(8148)),
+Box(Box(8149)),
+Box(Box(8150)),
+Box(Box(8151)),
+Box(Box(8152)),
+Box(Box(8153)),
+Box(Box(8154)),
+Box(Box(8155)),
+Box(Box(8156)),
+Box(Box(8157)),
+Box(Box(8158)),
+Box(Box(8159)),
+Box(Box(8160)),
+Box(Box(8161)),
+Box(Box(8162)),
+Box(Box(8163)),
+Box(Box(8164)),
+Box(Box(8165)),
+Box(Box(8166)),
+Box(Box(8167)),
+Box(Box(8168)),
+Box(Box(8169)),
+Box(Box(8170)),
+Box(Box(8171)),
+Box(Box(8172)),
+Box(Box(8173)),
+Box(Box(8174)),
+Box(Box(8175)),
+Box(Box(8176)),
+Box(Box(8177)),
+Box(Box(8178)),
+Box(Box(8179)),
+Box(Box(8180)),
+Box(Box(8181)),
+Box(Box(8182)),
+Box(Box(8183)),
+Box(Box(8184)),
+Box(Box(8185)),
+Box(Box(8186)),
+Box(Box(8187)),
+Box(Box(8188)),
+Box(Box(8189)),
+Box(Box(8190)),
+Box(Box(8191)),
+Box(Box(8192)),
+Box(Box(8193)),
+Box(Box(8194)),
+Box(Box(8195)),
+Box(Box(8196)),
+Box(Box(8197)),
+Box(Box(8198)),
+Box(Box(8199)),
+Box(Box(8200)),
+Box(Box(8201)),
+Box(Box(8202)),
+Box(Box(8203)),
+Box(Box(8204)),
+Box(Box(8205)),
+Box(Box(8206)),
+Box(Box(8207)),
+Box(Box(8208)),
+Box(Box(8209)),
+Box(Box(8210)),
+Box(Box(8211)),
+Box(Box(8212)),
+Box(Box(8213)),
+Box(Box(8214)),
+Box(Box(8215)),
+Box(Box(8216)),
+Box(Box(8217)),
+Box(Box(8218)),
+Box(Box(8219)),
+Box(Box(8220)),
+Box(Box(8221)),
+Box(Box(8222)),
+Box(Box(8223)),
+Box(Box(8224)),
+Box(Box(8225)),
+Box(Box(8226)),
+Box(Box(8227)),
+Box(Box(8228)),
+Box(Box(8229)),
+Box(Box(8230)),
+Box(Box(8231)),
+Box(Box(8232)),
+Box(Box(8233)),
+Box(Box(8234)),
+Box(Box(8235)),
+Box(Box(8236)),
+Box(Box(8237)),
+Box(Box(8238)),
+Box(Box(8239)),
+Box(Box(8240)),
+Box(Box(8241)),
+Box(Box(8242)),
+Box(Box(8243)),
+Box(Box(8244)),
+Box(Box(8245)),
+Box(Box(8246)),
+Box(Box(8247)),
+Box(Box(8248)),
+Box(Box(8249)),
+Box(Box(8250)),
+Box(Box(8251)),
+Box(Box(8252)),
+Box(Box(8253)),
+Box(Box(8254)),
+Box(Box(8255)),
+Box(Box(8256)),
+Box(Box(8257)),
+Box(Box(8258)),
+Box(Box(8259)),
+Box(Box(8260)),
+Box(Box(8261)),
+Box(Box(8262)),
+Box(Box(8263)),
+Box(Box(8264)),
+Box(Box(8265)),
+Box(Box(8266)),
+Box(Box(8267)),
+Box(Box(8268)),
+Box(Box(8269)),
+Box(Box(8270)),
+Box(Box(8271)),
+Box(Box(8272)),
+Box(Box(8273)),
+Box(Box(8274)),
+Box(Box(8275)),
+Box(Box(8276)),
+Box(Box(8277)),
+Box(Box(8278)),
+Box(Box(8279)),
+Box(Box(8280)),
+Box(Box(8281)),
+Box(Box(8282)),
+Box(Box(8283)),
+Box(Box(8284)),
+Box(Box(8285)),
+Box(Box(8286)),
+Box(Box(8287)),
+Box(Box(8288)),
+Box(Box(8289)),
+Box(Box(8290)),
+Box(Box(8291)),
+Box(Box(8292)),
+Box(Box(8293)),
+Box(Box(8294)),
+Box(Box(8295)),
+Box(Box(8296)),
+Box(Box(8297)),
+Box(Box(8298)),
+Box(Box(8299)),
+Box(Box(8300)),
+Box(Box(8301)),
+Box(Box(8302)),
+Box(Box(8303)),
+Box(Box(8304)),
+Box(Box(8305)),
+Box(Box(8306)),
+Box(Box(8307)),
+Box(Box(8308)),
+Box(Box(8309)),
+Box(Box(8310)),
+Box(Box(8311)),
+Box(Box(8312)),
+Box(Box(8313)),
+Box(Box(8314)),
+Box(Box(8315)),
+Box(Box(8316)),
+Box(Box(8317)),
+Box(Box(8318)),
+Box(Box(8319)),
+Box(Box(8320)),
+Box(Box(8321)),
+Box(Box(8322)),
+Box(Box(8323)),
+Box(Box(8324)),
+Box(Box(8325)),
+Box(Box(8326)),
+Box(Box(8327)),
+Box(Box(8328)),
+Box(Box(8329)),
+Box(Box(8330)),
+Box(Box(8331)),
+Box(Box(8332)),
+Box(Box(8333)),
+Box(Box(8334)),
+Box(Box(8335)),
+Box(Box(8336)),
+Box(Box(8337)),
+Box(Box(8338)),
+Box(Box(8339)),
+Box(Box(8340)),
+Box(Box(8341)),
+Box(Box(8342)),
+Box(Box(8343)),
+Box(Box(8344)),
+Box(Box(8345)),
+Box(Box(8346)),
+Box(Box(8347)),
+Box(Box(8348)),
+Box(Box(8349)),
+Box(Box(8350)),
+Box(Box(8351)),
+Box(Box(8352)),
+Box(Box(8353)),
+Box(Box(8354)),
+Box(Box(8355)),
+Box(Box(8356)),
+Box(Box(8357)),
+Box(Box(8358)),
+Box(Box(8359)),
+Box(Box(8360)),
+Box(Box(8361)),
+Box(Box(8362)),
+Box(Box(8363)),
+Box(Box(8364)),
+Box(Box(8365)),
+Box(Box(8366)),
+Box(Box(8367)),
+Box(Box(8368)),
+Box(Box(8369)),
+Box(Box(8370)),
+Box(Box(8371)),
+Box(Box(8372)),
+Box(Box(8373)),
+Box(Box(8374)),
+Box(Box(8375)),
+Box(Box(8376)),
+Box(Box(8377)),
+Box(Box(8378)),
+Box(Box(8379)),
+Box(Box(8380)),
+Box(Box(8381)),
+Box(Box(8382)),
+Box(Box(8383)),
+Box(Box(8384)),
+Box(Box(8385)),
+Box(Box(8386)),
+Box(Box(8387)),
+Box(Box(8388)),
+Box(Box(8389)),
+Box(Box(8390)),
+Box(Box(8391)),
+Box(Box(8392)),
+Box(Box(8393)),
+Box(Box(8394)),
+Box(Box(8395)),
+Box(Box(8396)),
+Box(Box(8397)),
+Box(Box(8398)),
+Box(Box(8399)),
+Box(Box(8400)),
+Box(Box(8401)),
+Box(Box(8402)),
+Box(Box(8403)),
+Box(Box(8404)),
+Box(Box(8405)),
+Box(Box(8406)),
+Box(Box(8407)),
+Box(Box(8408)),
+Box(Box(8409)),
+Box(Box(8410)),
+Box(Box(8411)),
+Box(Box(8412)),
+Box(Box(8413)),
+Box(Box(8414)),
+Box(Box(8415)),
+Box(Box(8416)),
+Box(Box(8417)),
+Box(Box(8418)),
+Box(Box(8419)),
+Box(Box(8420)),
+Box(Box(8421)),
+Box(Box(8422)),
+Box(Box(8423)),
+Box(Box(8424)),
+Box(Box(8425)),
+Box(Box(8426)),
+Box(Box(8427)),
+Box(Box(8428)),
+Box(Box(8429)),
+Box(Box(8430)),
+Box(Box(8431)),
+Box(Box(8432)),
+Box(Box(8433)),
+Box(Box(8434)),
+Box(Box(8435)),
+Box(Box(8436)),
+Box(Box(8437)),
+Box(Box(8438)),
+Box(Box(8439)),
+Box(Box(8440)),
+Box(Box(8441)),
+Box(Box(8442)),
+Box(Box(8443)),
+Box(Box(8444)),
+Box(Box(8445)),
+Box(Box(8446)),
+Box(Box(8447)),
+Box(Box(8448)),
+Box(Box(8449)),
+Box(Box(8450)),
+Box(Box(8451)),
+Box(Box(8452)),
+Box(Box(8453)),
+Box(Box(8454)),
+Box(Box(8455)),
+Box(Box(8456)),
+Box(Box(8457)),
+Box(Box(8458)),
+Box(Box(8459)),
+Box(Box(8460)),
+Box(Box(8461)),
+Box(Box(8462)),
+Box(Box(8463)),
+Box(Box(8464)),
+Box(Box(8465)),
+Box(Box(8466)),
+Box(Box(8467)),
+Box(Box(8468)),
+Box(Box(8469)),
+Box(Box(8470)),
+Box(Box(8471)),
+Box(Box(8472)),
+Box(Box(8473)),
+Box(Box(8474)),
+Box(Box(8475)),
+Box(Box(8476)),
+Box(Box(8477)),
+Box(Box(8478)),
+Box(Box(8479)),
+Box(Box(8480)),
+Box(Box(8481)),
+Box(Box(8482)),
+Box(Box(8483)),
+Box(Box(8484)),
+Box(Box(8485)),
+Box(Box(8486)),
+Box(Box(8487)),
+Box(Box(8488)),
+Box(Box(8489)),
+Box(Box(8490)),
+Box(Box(8491)),
+Box(Box(8492)),
+Box(Box(8493)),
+Box(Box(8494)),
+Box(Box(8495)),
+Box(Box(8496)),
+Box(Box(8497)),
+Box(Box(8498)),
+Box(Box(8499)),
+Box(Box(8500)),
+Box(Box(8501)),
+Box(Box(8502)),
+Box(Box(8503)),
+Box(Box(8504)),
+Box(Box(8505)),
+Box(Box(8506)),
+Box(Box(8507)),
+Box(Box(8508)),
+Box(Box(8509)),
+Box(Box(8510)),
+Box(Box(8511)),
+Box(Box(8512)),
+Box(Box(8513)),
+Box(Box(8514)),
+Box(Box(8515)),
+Box(Box(8516)),
+Box(Box(8517)),
+Box(Box(8518)),
+Box(Box(8519)),
+Box(Box(8520)),
+Box(Box(8521)),
+Box(Box(8522)),
+Box(Box(8523)),
+Box(Box(8524)),
+Box(Box(8525)),
+Box(Box(8526)),
+Box(Box(8527)),
+Box(Box(8528)),
+Box(Box(8529)),
+Box(Box(8530)),
+Box(Box(8531)),
+Box(Box(8532)),
+Box(Box(8533)),
+Box(Box(8534)),
+Box(Box(8535)),
+Box(Box(8536)),
+Box(Box(8537)),
+Box(Box(8538)),
+Box(Box(8539)),
+Box(Box(8540)),
+Box(Box(8541)),
+Box(Box(8542)),
+Box(Box(8543)),
+Box(Box(8544)),
+Box(Box(8545)),
+Box(Box(8546)),
+Box(Box(8547)),
+Box(Box(8548)),
+Box(Box(8549)),
+Box(Box(8550)),
+Box(Box(8551)),
+Box(Box(8552)),
+Box(Box(8553)),
+Box(Box(8554)),
+Box(Box(8555)),
+Box(Box(8556)),
+Box(Box(8557)),
+Box(Box(8558)),
+Box(Box(8559)),
+Box(Box(8560)),
+Box(Box(8561)),
+Box(Box(8562)),
+Box(Box(8563)),
+Box(Box(8564)),
+Box(Box(8565)),
+Box(Box(8566)),
+Box(Box(8567)),
+Box(Box(8568)),
+Box(Box(8569)),
+Box(Box(8570)),
+Box(Box(8571)),
+Box(Box(8572)),
+Box(Box(8573)),
+Box(Box(8574)),
+Box(Box(8575)),
+Box(Box(8576)),
+Box(Box(8577)),
+Box(Box(8578)),
+Box(Box(8579)),
+Box(Box(8580)),
+Box(Box(8581)),
+Box(Box(8582)),
+Box(Box(8583)),
+Box(Box(8584)),
+Box(Box(8585)),
+Box(Box(8586)),
+Box(Box(8587)),
+Box(Box(8588)),
+Box(Box(8589)),
+Box(Box(8590)),
+Box(Box(8591)),
+Box(Box(8592)),
+Box(Box(8593)),
+Box(Box(8594)),
+Box(Box(8595)),
+Box(Box(8596)),
+Box(Box(8597)),
+Box(Box(8598)),
+Box(Box(8599)),
+Box(Box(8600)),
+Box(Box(8601)),
+Box(Box(8602)),
+Box(Box(8603)),
+Box(Box(8604)),
+Box(Box(8605)),
+Box(Box(8606)),
+Box(Box(8607)),
+Box(Box(8608)),
+Box(Box(8609)),
+Box(Box(8610)),
+Box(Box(8611)),
+Box(Box(8612)),
+Box(Box(8613)),
+Box(Box(8614)),
+Box(Box(8615)),
+Box(Box(8616)),
+Box(Box(8617)),
+Box(Box(8618)),
+Box(Box(8619)),
+Box(Box(8620)),
+Box(Box(8621)),
+Box(Box(8622)),
+Box(Box(8623)),
+Box(Box(8624)),
+Box(Box(8625)),
+Box(Box(8626)),
+Box(Box(8627)),
+Box(Box(8628)),
+Box(Box(8629)),
+Box(Box(8630)),
+Box(Box(8631)),
+Box(Box(8632)),
+Box(Box(8633)),
+Box(Box(8634)),
+Box(Box(8635)),
+Box(Box(8636)),
+Box(Box(8637)),
+Box(Box(8638)),
+Box(Box(8639)),
+Box(Box(8640)),
+Box(Box(8641)),
+Box(Box(8642)),
+Box(Box(8643)),
+Box(Box(8644)),
+Box(Box(8645)),
+Box(Box(8646)),
+Box(Box(8647)),
+Box(Box(8648)),
+Box(Box(8649)),
+Box(Box(8650)),
+Box(Box(8651)),
+Box(Box(8652)),
+Box(Box(8653)),
+Box(Box(8654)),
+Box(Box(8655)),
+Box(Box(8656)),
+Box(Box(8657)),
+Box(Box(8658)),
+Box(Box(8659)),
+Box(Box(8660)),
+Box(Box(8661)),
+Box(Box(8662)),
+Box(Box(8663)),
+Box(Box(8664)),
+Box(Box(8665)),
+Box(Box(8666)),
+Box(Box(8667)),
+Box(Box(8668)),
+Box(Box(8669)),
+Box(Box(8670)),
+Box(Box(8671)),
+Box(Box(8672)),
+Box(Box(8673)),
+Box(Box(8674)),
+Box(Box(8675)),
+Box(Box(8676)),
+Box(Box(8677)),
+Box(Box(8678)),
+Box(Box(8679)),
+Box(Box(8680)),
+Box(Box(8681)),
+Box(Box(8682)),
+Box(Box(8683)),
+Box(Box(8684)),
+Box(Box(8685)),
+Box(Box(8686)),
+Box(Box(8687)),
+Box(Box(8688)),
+Box(Box(8689)),
+Box(Box(8690)),
+Box(Box(8691)),
+Box(Box(8692)),
+Box(Box(8693)),
+Box(Box(8694)),
+Box(Box(8695)),
+Box(Box(8696)),
+Box(Box(8697)),
+Box(Box(8698)),
+Box(Box(8699)),
+Box(Box(8700)),
+Box(Box(8701)),
+Box(Box(8702)),
+Box(Box(8703)),
+Box(Box(8704)),
+Box(Box(8705)),
+Box(Box(8706)),
+Box(Box(8707)),
+Box(Box(8708)),
+Box(Box(8709)),
+Box(Box(8710)),
+Box(Box(8711)),
+Box(Box(8712)),
+Box(Box(8713)),
+Box(Box(8714)),
+Box(Box(8715)),
+Box(Box(8716)),
+Box(Box(8717)),
+Box(Box(8718)),
+Box(Box(8719)),
+Box(Box(8720)),
+Box(Box(8721)),
+Box(Box(8722)),
+Box(Box(8723)),
+Box(Box(8724)),
+Box(Box(8725)),
+Box(Box(8726)),
+Box(Box(8727)),
+Box(Box(8728)),
+Box(Box(8729)),
+Box(Box(8730)),
+Box(Box(8731)),
+Box(Box(8732)),
+Box(Box(8733)),
+Box(Box(8734)),
+Box(Box(8735)),
+Box(Box(8736)),
+Box(Box(8737)),
+Box(Box(8738)),
+Box(Box(8739)),
+Box(Box(8740)),
+Box(Box(8741)),
+Box(Box(8742)),
+Box(Box(8743)),
+Box(Box(8744)),
+Box(Box(8745)),
+Box(Box(8746)),
+Box(Box(8747)),
+Box(Box(8748)),
+Box(Box(8749)),
+Box(Box(8750)),
+Box(Box(8751)),
+Box(Box(8752)),
+Box(Box(8753)),
+Box(Box(8754)),
+Box(Box(8755)),
+Box(Box(8756)),
+Box(Box(8757)),
+Box(Box(8758)),
+Box(Box(8759)),
+Box(Box(8760)),
+Box(Box(8761)),
+Box(Box(8762)),
+Box(Box(8763)),
+Box(Box(8764)),
+Box(Box(8765)),
+Box(Box(8766)),
+Box(Box(8767)),
+Box(Box(8768)),
+Box(Box(8769)),
+Box(Box(8770)),
+Box(Box(8771)),
+Box(Box(8772)),
+Box(Box(8773)),
+Box(Box(8774)),
+Box(Box(8775)),
+Box(Box(8776)),
+Box(Box(8777)),
+Box(Box(8778)),
+Box(Box(8779)),
+Box(Box(8780)),
+Box(Box(8781)),
+Box(Box(8782)),
+Box(Box(8783)),
+Box(Box(8784)),
+Box(Box(8785)),
+Box(Box(8786)),
+Box(Box(8787)),
+Box(Box(8788)),
+Box(Box(8789)),
+Box(Box(8790)),
+Box(Box(8791)),
+Box(Box(8792)),
+Box(Box(8793)),
+Box(Box(8794)),
+Box(Box(8795)),
+Box(Box(8796)),
+Box(Box(8797)),
+Box(Box(8798)),
+Box(Box(8799)),
+Box(Box(8800)),
+Box(Box(8801)),
+Box(Box(8802)),
+Box(Box(8803)),
+Box(Box(8804)),
+Box(Box(8805)),
+Box(Box(8806)),
+Box(Box(8807)),
+Box(Box(8808)),
+Box(Box(8809)),
+Box(Box(8810)),
+Box(Box(8811)),
+Box(Box(8812)),
+Box(Box(8813)),
+Box(Box(8814)),
+Box(Box(8815)),
+Box(Box(8816)),
+Box(Box(8817)),
+Box(Box(8818)),
+Box(Box(8819)),
+Box(Box(8820)),
+Box(Box(8821)),
+Box(Box(8822)),
+Box(Box(8823)),
+Box(Box(8824)),
+Box(Box(8825)),
+Box(Box(8826)),
+Box(Box(8827)),
+Box(Box(8828)),
+Box(Box(8829)),
+Box(Box(8830)),
+Box(Box(8831)),
+Box(Box(8832)),
+Box(Box(8833)),
+Box(Box(8834)),
+Box(Box(8835)),
+Box(Box(8836)),
+Box(Box(8837)),
+Box(Box(8838)),
+Box(Box(8839)),
+Box(Box(8840)),
+Box(Box(8841)),
+Box(Box(8842)),
+Box(Box(8843)),
+Box(Box(8844)),
+Box(Box(8845)),
+Box(Box(8846)),
+Box(Box(8847)),
+Box(Box(8848)),
+Box(Box(8849)),
+Box(Box(8850)),
+Box(Box(8851)),
+Box(Box(8852)),
+Box(Box(8853)),
+Box(Box(8854)),
+Box(Box(8855)),
+Box(Box(8856)),
+Box(Box(8857)),
+Box(Box(8858)),
+Box(Box(8859)),
+Box(Box(8860)),
+Box(Box(8861)),
+Box(Box(8862)),
+Box(Box(8863)),
+Box(Box(8864)),
+Box(Box(8865)),
+Box(Box(8866)),
+Box(Box(8867)),
+Box(Box(8868)),
+Box(Box(8869)),
+Box(Box(8870)),
+Box(Box(8871)),
+Box(Box(8872)),
+Box(Box(8873)),
+Box(Box(8874)),
+Box(Box(8875)),
+Box(Box(8876)),
+Box(Box(8877)),
+Box(Box(8878)),
+Box(Box(8879)),
+Box(Box(8880)),
+Box(Box(8881)),
+Box(Box(8882)),
+Box(Box(8883)),
+Box(Box(8884)),
+Box(Box(8885)),
+Box(Box(8886)),
+Box(Box(8887)),
+Box(Box(8888)),
+Box(Box(8889)),
+Box(Box(8890)),
+Box(Box(8891)),
+Box(Box(8892)),
+Box(Box(8893)),
+Box(Box(8894)),
+Box(Box(8895)),
+Box(Box(8896)),
+Box(Box(8897)),
+Box(Box(8898)),
+Box(Box(8899)),
+Box(Box(8900)),
+Box(Box(8901)),
+Box(Box(8902)),
+Box(Box(8903)),
+Box(Box(8904)),
+Box(Box(8905)),
+Box(Box(8906)),
+Box(Box(8907)),
+Box(Box(8908)),
+Box(Box(8909)),
+Box(Box(8910)),
+Box(Box(8911)),
+Box(Box(8912)),
+Box(Box(8913)),
+Box(Box(8914)),
+Box(Box(8915)),
+Box(Box(8916)),
+Box(Box(8917)),
+Box(Box(8918)),
+Box(Box(8919)),
+Box(Box(8920)),
+Box(Box(8921)),
+Box(Box(8922)),
+Box(Box(8923)),
+Box(Box(8924)),
+Box(Box(8925)),
+Box(Box(8926)),
+Box(Box(8927)),
+Box(Box(8928)),
+Box(Box(8929)),
+Box(Box(8930)),
+Box(Box(8931)),
+Box(Box(8932)),
+Box(Box(8933)),
+Box(Box(8934)),
+Box(Box(8935)),
+Box(Box(8936)),
+Box(Box(8937)),
+Box(Box(8938)),
+Box(Box(8939)),
+Box(Box(8940)),
+Box(Box(8941)),
+Box(Box(8942)),
+Box(Box(8943)),
+Box(Box(8944)),
+Box(Box(8945)),
+Box(Box(8946)),
+Box(Box(8947)),
+Box(Box(8948)),
+Box(Box(8949)),
+Box(Box(8950)),
+Box(Box(8951)),
+Box(Box(8952)),
+Box(Box(8953)),
+Box(Box(8954)),
+Box(Box(8955)),
+Box(Box(8956)),
+Box(Box(8957)),
+Box(Box(8958)),
+Box(Box(8959)),
+Box(Box(8960)),
+Box(Box(8961)),
+Box(Box(8962)),
+Box(Box(8963)),
+Box(Box(8964)),
+Box(Box(8965)),
+Box(Box(8966)),
+Box(Box(8967)),
+Box(Box(8968)),
+Box(Box(8969)),
+Box(Box(8970)),
+Box(Box(8971)),
+Box(Box(8972)),
+Box(Box(8973)),
+Box(Box(8974)),
+Box(Box(8975)),
+Box(Box(8976)),
+Box(Box(8977)),
+Box(Box(8978)),
+Box(Box(8979)),
+Box(Box(8980)),
+Box(Box(8981)),
+Box(Box(8982)),
+Box(Box(8983)),
+Box(Box(8984)),
+Box(Box(8985)),
+Box(Box(8986)),
+Box(Box(8987)),
+Box(Box(8988)),
+Box(Box(8989)),
+Box(Box(8990)),
+Box(Box(8991)),
+Box(Box(8992)),
+Box(Box(8993)),
+Box(Box(8994)),
+Box(Box(8995)),
+Box(Box(8996)),
+Box(Box(8997)),
+Box(Box(8998)),
+Box(Box(8999)),
+Box(Box(9000)),
+Box(Box(9001)),
+Box(Box(9002)),
+Box(Box(9003)),
+Box(Box(9004)),
+Box(Box(9005)),
+Box(Box(9006)),
+Box(Box(9007)),
+Box(Box(9008)),
+Box(Box(9009)),
+Box(Box(9010)),
+Box(Box(9011)),
+Box(Box(9012)),
+Box(Box(9013)),
+Box(Box(9014)),
+Box(Box(9015)),
+Box(Box(9016)),
+Box(Box(9017)),
+Box(Box(9018)),
+Box(Box(9019)),
+Box(Box(9020)),
+Box(Box(9021)),
+Box(Box(9022)),
+Box(Box(9023)),
+Box(Box(9024)),
+Box(Box(9025)),
+Box(Box(9026)),
+Box(Box(9027)),
+Box(Box(9028)),
+Box(Box(9029)),
+Box(Box(9030)),
+Box(Box(9031)),
+Box(Box(9032)),
+Box(Box(9033)),
+Box(Box(9034)),
+Box(Box(9035)),
+Box(Box(9036)),
+Box(Box(9037)),
+Box(Box(9038)),
+Box(Box(9039)),
+Box(Box(9040)),
+Box(Box(9041)),
+Box(Box(9042)),
+Box(Box(9043)),
+Box(Box(9044)),
+Box(Box(9045)),
+Box(Box(9046)),
+Box(Box(9047)),
+Box(Box(9048)),
+Box(Box(9049)),
+Box(Box(9050)),
+Box(Box(9051)),
+Box(Box(9052)),
+Box(Box(9053)),
+Box(Box(9054)),
+Box(Box(9055)),
+Box(Box(9056)),
+Box(Box(9057)),
+Box(Box(9058)),
+Box(Box(9059)),
+Box(Box(9060)),
+Box(Box(9061)),
+Box(Box(9062)),
+Box(Box(9063)),
+Box(Box(9064)),
+Box(Box(9065)),
+Box(Box(9066)),
+Box(Box(9067)),
+Box(Box(9068)),
+Box(Box(9069)),
+Box(Box(9070)),
+Box(Box(9071)),
+Box(Box(9072)),
+Box(Box(9073)),
+Box(Box(9074)),
+Box(Box(9075)),
+Box(Box(9076)),
+Box(Box(9077)),
+Box(Box(9078)),
+Box(Box(9079)),
+Box(Box(9080)),
+Box(Box(9081)),
+Box(Box(9082)),
+Box(Box(9083)),
+Box(Box(9084)),
+Box(Box(9085)),
+Box(Box(9086)),
+Box(Box(9087)),
+Box(Box(9088)),
+Box(Box(9089)),
+Box(Box(9090)),
+Box(Box(9091)),
+Box(Box(9092)),
+Box(Box(9093)),
+Box(Box(9094)),
+Box(Box(9095)),
+Box(Box(9096)),
+Box(Box(9097)),
+Box(Box(9098)),
+Box(Box(9099)),
+Box(Box(9100)),
+Box(Box(9101)),
+Box(Box(9102)),
+Box(Box(9103)),
+Box(Box(9104)),
+Box(Box(9105)),
+Box(Box(9106)),
+Box(Box(9107)),
+Box(Box(9108)),
+Box(Box(9109)),
+Box(Box(9110)),
+Box(Box(9111)),
+Box(Box(9112)),
+Box(Box(9113)),
+Box(Box(9114)),
+Box(Box(9115)),
+Box(Box(9116)),
+Box(Box(9117)),
+Box(Box(9118)),
+Box(Box(9119)),
+Box(Box(9120)),
+Box(Box(9121)),
+Box(Box(9122)),
+Box(Box(9123)),
+Box(Box(9124)),
+Box(Box(9125)),
+Box(Box(9126)),
+Box(Box(9127)),
+Box(Box(9128)),
+Box(Box(9129)),
+Box(Box(9130)),
+Box(Box(9131)),
+Box(Box(9132)),
+Box(Box(9133)),
+Box(Box(9134)),
+Box(Box(9135)),
+Box(Box(9136)),
+Box(Box(9137)),
+Box(Box(9138)),
+Box(Box(9139)),
+Box(Box(9140)),
+Box(Box(9141)),
+Box(Box(9142)),
+Box(Box(9143)),
+Box(Box(9144)),
+Box(Box(9145)),
+Box(Box(9146)),
+Box(Box(9147)),
+Box(Box(9148)),
+Box(Box(9149)),
+Box(Box(9150)),
+Box(Box(9151)),
+Box(Box(9152)),
+Box(Box(9153)),
+Box(Box(9154)),
+Box(Box(9155)),
+Box(Box(9156)),
+Box(Box(9157)),
+Box(Box(9158)),
+Box(Box(9159)),
+Box(Box(9160)),
+Box(Box(9161)),
+Box(Box(9162)),
+Box(Box(9163)),
+Box(Box(9164)),
+Box(Box(9165)),
+Box(Box(9166)),
+Box(Box(9167)),
+Box(Box(9168)),
+Box(Box(9169)),
+Box(Box(9170)),
+Box(Box(9171)),
+Box(Box(9172)),
+Box(Box(9173)),
+Box(Box(9174)),
+Box(Box(9175)),
+Box(Box(9176)),
+Box(Box(9177)),
+Box(Box(9178)),
+Box(Box(9179)),
+Box(Box(9180)),
+Box(Box(9181)),
+Box(Box(9182)),
+Box(Box(9183)),
+Box(Box(9184)),
+Box(Box(9185)),
+Box(Box(9186)),
+Box(Box(9187)),
+Box(Box(9188)),
+Box(Box(9189)),
+Box(Box(9190)),
+Box(Box(9191)),
+Box(Box(9192)),
+Box(Box(9193)),
+Box(Box(9194)),
+Box(Box(9195)),
+Box(Box(9196)),
+Box(Box(9197)),
+Box(Box(9198)),
+Box(Box(9199)),
+Box(Box(9200)),
+Box(Box(9201)),
+Box(Box(9202)),
+Box(Box(9203)),
+Box(Box(9204)),
+Box(Box(9205)),
+Box(Box(9206)),
+Box(Box(9207)),
+Box(Box(9208)),
+Box(Box(9209)),
+Box(Box(9210)),
+Box(Box(9211)),
+Box(Box(9212)),
+Box(Box(9213)),
+Box(Box(9214)),
+Box(Box(9215)),
+Box(Box(9216)),
+Box(Box(9217)),
+Box(Box(9218)),
+Box(Box(9219)),
+Box(Box(9220)),
+Box(Box(9221)),
+Box(Box(9222)),
+Box(Box(9223)),
+Box(Box(9224)),
+Box(Box(9225)),
+Box(Box(9226)),
+Box(Box(9227)),
+Box(Box(9228)),
+Box(Box(9229)),
+Box(Box(9230)),
+Box(Box(9231)),
+Box(Box(9232)),
+Box(Box(9233)),
+Box(Box(9234)),
+Box(Box(9235)),
+Box(Box(9236)),
+Box(Box(9237)),
+Box(Box(9238)),
+Box(Box(9239)),
+Box(Box(9240)),
+Box(Box(9241)),
+Box(Box(9242)),
+Box(Box(9243)),
+Box(Box(9244)),
+Box(Box(9245)),
+Box(Box(9246)),
+Box(Box(9247)),
+Box(Box(9248)),
+Box(Box(9249)),
+Box(Box(9250)),
+Box(Box(9251)),
+Box(Box(9252)),
+Box(Box(9253)),
+Box(Box(9254)),
+Box(Box(9255)),
+Box(Box(9256)),
+Box(Box(9257)),
+Box(Box(9258)),
+Box(Box(9259)),
+Box(Box(9260)),
+Box(Box(9261)),
+Box(Box(9262)),
+Box(Box(9263)),
+Box(Box(9264)),
+Box(Box(9265)),
+Box(Box(9266)),
+Box(Box(9267)),
+Box(Box(9268)),
+Box(Box(9269)),
+Box(Box(9270)),
+Box(Box(9271)),
+Box(Box(9272)),
+Box(Box(9273)),
+Box(Box(9274)),
+Box(Box(9275)),
+Box(Box(9276)),
+Box(Box(9277)),
+Box(Box(9278)),
+Box(Box(9279)),
+Box(Box(9280)),
+Box(Box(9281)),
+Box(Box(9282)),
+Box(Box(9283)),
+Box(Box(9284)),
+Box(Box(9285)),
+Box(Box(9286)),
+Box(Box(9287)),
+Box(Box(9288)),
+Box(Box(9289)),
+Box(Box(9290)),
+Box(Box(9291)),
+Box(Box(9292)),
+Box(Box(9293)),
+Box(Box(9294)),
+Box(Box(9295)),
+Box(Box(9296)),
+Box(Box(9297)),
+Box(Box(9298)),
+Box(Box(9299)),
+Box(Box(9300)),
+Box(Box(9301)),
+Box(Box(9302)),
+Box(Box(9303)),
+Box(Box(9304)),
+Box(Box(9305)),
+Box(Box(9306)),
+Box(Box(9307)),
+Box(Box(9308)),
+Box(Box(9309)),
+Box(Box(9310)),
+Box(Box(9311)),
+Box(Box(9312)),
+Box(Box(9313)),
+Box(Box(9314)),
+Box(Box(9315)),
+Box(Box(9316)),
+Box(Box(9317)),
+Box(Box(9318)),
+Box(Box(9319)),
+Box(Box(9320)),
+Box(Box(9321)),
+Box(Box(9322)),
+Box(Box(9323)),
+Box(Box(9324)),
+Box(Box(9325)),
+Box(Box(9326)),
+Box(Box(9327)),
+Box(Box(9328)),
+Box(Box(9329)),
+Box(Box(9330)),
+Box(Box(9331)),
+Box(Box(9332)),
+Box(Box(9333)),
+Box(Box(9334)),
+Box(Box(9335)),
+Box(Box(9336)),
+Box(Box(9337)),
+Box(Box(9338)),
+Box(Box(9339)),
+Box(Box(9340)),
+Box(Box(9341)),
+Box(Box(9342)),
+Box(Box(9343)),
+Box(Box(9344)),
+Box(Box(9345)),
+Box(Box(9346)),
+Box(Box(9347)),
+Box(Box(9348)),
+Box(Box(9349)),
+Box(Box(9350)),
+Box(Box(9351)),
+Box(Box(9352)),
+Box(Box(9353)),
+Box(Box(9354)),
+Box(Box(9355)),
+Box(Box(9356)),
+Box(Box(9357)),
+Box(Box(9358)),
+Box(Box(9359)),
+Box(Box(9360)),
+Box(Box(9361)),
+Box(Box(9362)),
+Box(Box(9363)),
+Box(Box(9364)),
+Box(Box(9365)),
+Box(Box(9366)),
+Box(Box(9367)),
+Box(Box(9368)),
+Box(Box(9369)),
+Box(Box(9370)),
+Box(Box(9371)),
+Box(Box(9372)),
+Box(Box(9373)),
+Box(Box(9374)),
+Box(Box(9375)),
+Box(Box(9376)),
+Box(Box(9377)),
+Box(Box(9378)),
+Box(Box(9379)),
+Box(Box(9380)),
+Box(Box(9381)),
+Box(Box(9382)),
+Box(Box(9383)),
+Box(Box(9384)),
+Box(Box(9385)),
+Box(Box(9386)),
+Box(Box(9387)),
+Box(Box(9388)),
+Box(Box(9389)),
+Box(Box(9390)),
+Box(Box(9391)),
+Box(Box(9392)),
+Box(Box(9393)),
+Box(Box(9394)),
+Box(Box(9395)),
+Box(Box(9396)),
+Box(Box(9397)),
+Box(Box(9398)),
+Box(Box(9399)),
+Box(Box(9400)),
+Box(Box(9401)),
+Box(Box(9402)),
+Box(Box(9403)),
+Box(Box(9404)),
+Box(Box(9405)),
+Box(Box(9406)),
+Box(Box(9407)),
+Box(Box(9408)),
+Box(Box(9409)),
+Box(Box(9410)),
+Box(Box(9411)),
+Box(Box(9412)),
+Box(Box(9413)),
+Box(Box(9414)),
+Box(Box(9415)),
+Box(Box(9416)),
+Box(Box(9417)),
+Box(Box(9418)),
+Box(Box(9419)),
+Box(Box(9420)),
+Box(Box(9421)),
+Box(Box(9422)),
+Box(Box(9423)),
+Box(Box(9424)),
+Box(Box(9425)),
+Box(Box(9426)),
+Box(Box(9427)),
+Box(Box(9428)),
+Box(Box(9429)),
+Box(Box(9430)),
+Box(Box(9431)),
+Box(Box(9432)),
+Box(Box(9433)),
+Box(Box(9434)),
+Box(Box(9435)),
+Box(Box(9436)),
+Box(Box(9437)),
+Box(Box(9438)),
+Box(Box(9439)),
+Box(Box(9440)),
+Box(Box(9441)),
+Box(Box(9442)),
+Box(Box(9443)),
+Box(Box(9444)),
+Box(Box(9445)),
+Box(Box(9446)),
+Box(Box(9447)),
+Box(Box(9448)),
+Box(Box(9449)),
+Box(Box(9450)),
+Box(Box(9451)),
+Box(Box(9452)),
+Box(Box(9453)),
+Box(Box(9454)),
+Box(Box(9455)),
+Box(Box(9456)),
+Box(Box(9457)),
+Box(Box(9458)),
+Box(Box(9459)),
+Box(Box(9460)),
+Box(Box(9461)),
+Box(Box(9462)),
+Box(Box(9463)),
+Box(Box(9464)),
+Box(Box(9465)),
+Box(Box(9466)),
+Box(Box(9467)),
+Box(Box(9468)),
+Box(Box(9469)),
+Box(Box(9470)),
+Box(Box(9471)),
+Box(Box(9472)),
+Box(Box(9473)),
+Box(Box(9474)),
+Box(Box(9475)),
+Box(Box(9476)),
+Box(Box(9477)),
+Box(Box(9478)),
+Box(Box(9479)),
+Box(Box(9480)),
+Box(Box(9481)),
+Box(Box(9482)),
+Box(Box(9483)),
+Box(Box(9484)),
+Box(Box(9485)),
+Box(Box(9486)),
+Box(Box(9487)),
+Box(Box(9488)),
+Box(Box(9489)),
+Box(Box(9490)),
+Box(Box(9491)),
+Box(Box(9492)),
+Box(Box(9493)),
+Box(Box(9494)),
+Box(Box(9495)),
+Box(Box(9496)),
+Box(Box(9497)),
+Box(Box(9498)),
+Box(Box(9499)),
+Box(Box(9500)),
+Box(Box(9501)),
+Box(Box(9502)),
+Box(Box(9503)),
+Box(Box(9504)),
+Box(Box(9505)),
+Box(Box(9506)),
+Box(Box(9507)),
+Box(Box(9508)),
+Box(Box(9509)),
+Box(Box(9510)),
+Box(Box(9511)),
+Box(Box(9512)),
+Box(Box(9513)),
+Box(Box(9514)),
+Box(Box(9515)),
+Box(Box(9516)),
+Box(Box(9517)),
+Box(Box(9518)),
+Box(Box(9519)),
+Box(Box(9520)),
+Box(Box(9521)),
+Box(Box(9522)),
+Box(Box(9523)),
+Box(Box(9524)),
+Box(Box(9525)),
+Box(Box(9526)),
+Box(Box(9527)),
+Box(Box(9528)),
+Box(Box(9529)),
+Box(Box(9530)),
+Box(Box(9531)),
+Box(Box(9532)),
+Box(Box(9533)),
+Box(Box(9534)),
+Box(Box(9535)),
+Box(Box(9536)),
+Box(Box(9537)),
+Box(Box(9538)),
+Box(Box(9539)),
+Box(Box(9540)),
+Box(Box(9541)),
+Box(Box(9542)),
+Box(Box(9543)),
+Box(Box(9544)),
+Box(Box(9545)),
+Box(Box(9546)),
+Box(Box(9547)),
+Box(Box(9548)),
+Box(Box(9549)),
+Box(Box(9550)),
+Box(Box(9551)),
+Box(Box(9552)),
+Box(Box(9553)),
+Box(Box(9554)),
+Box(Box(9555)),
+Box(Box(9556)),
+Box(Box(9557)),
+Box(Box(9558)),
+Box(Box(9559)),
+Box(Box(9560)),
+Box(Box(9561)),
+Box(Box(9562)),
+Box(Box(9563)),
+Box(Box(9564)),
+Box(Box(9565)),
+Box(Box(9566)),
+Box(Box(9567)),
+Box(Box(9568)),
+Box(Box(9569)),
+Box(Box(9570)),
+Box(Box(9571)),
+Box(Box(9572)),
+Box(Box(9573)),
+Box(Box(9574)),
+Box(Box(9575)),
+Box(Box(9576)),
+Box(Box(9577)),
+Box(Box(9578)),
+Box(Box(9579)),
+Box(Box(9580)),
+Box(Box(9581)),
+Box(Box(9582)),
+Box(Box(9583)),
+Box(Box(9584)),
+Box(Box(9585)),
+Box(Box(9586)),
+Box(Box(9587)),
+Box(Box(9588)),
+Box(Box(9589)),
+Box(Box(9590)),
+Box(Box(9591)),
+Box(Box(9592)),
+Box(Box(9593)),
+Box(Box(9594)),
+Box(Box(9595)),
+Box(Box(9596)),
+Box(Box(9597)),
+Box(Box(9598)),
+Box(Box(9599)),
+Box(Box(9600)),
+Box(Box(9601)),
+Box(Box(9602)),
+Box(Box(9603)),
+Box(Box(9604)),
+Box(Box(9605)),
+Box(Box(9606)),
+Box(Box(9607)),
+Box(Box(9608)),
+Box(Box(9609)),
+Box(Box(9610)),
+Box(Box(9611)),
+Box(Box(9612)),
+Box(Box(9613)),
+Box(Box(9614)),
+Box(Box(9615)),
+Box(Box(9616)),
+Box(Box(9617)),
+Box(Box(9618)),
+Box(Box(9619)),
+Box(Box(9620)),
+Box(Box(9621)),
+Box(Box(9622)),
+Box(Box(9623)),
+Box(Box(9624)),
+Box(Box(9625)),
+Box(Box(9626)),
+Box(Box(9627)),
+Box(Box(9628)),
+Box(Box(9629)),
+Box(Box(9630)),
+Box(Box(9631)),
+Box(Box(9632)),
+Box(Box(9633)),
+Box(Box(9634)),
+Box(Box(9635)),
+Box(Box(9636)),
+Box(Box(9637)),
+Box(Box(9638)),
+Box(Box(9639)),
+Box(Box(9640)),
+Box(Box(9641)),
+Box(Box(9642)),
+Box(Box(9643)),
+Box(Box(9644)),
+Box(Box(9645)),
+Box(Box(9646)),
+Box(Box(9647)),
+Box(Box(9648)),
+Box(Box(9649)),
+Box(Box(9650)),
+Box(Box(9651)),
+Box(Box(9652)),
+Box(Box(9653)),
+Box(Box(9654)),
+Box(Box(9655)),
+Box(Box(9656)),
+Box(Box(9657)),
+Box(Box(9658)),
+Box(Box(9659)),
+Box(Box(9660)),
+Box(Box(9661)),
+Box(Box(9662)),
+Box(Box(9663)),
+Box(Box(9664)),
+Box(Box(9665)),
+Box(Box(9666)),
+Box(Box(9667)),
+Box(Box(9668)),
+Box(Box(9669)),
+Box(Box(9670)),
+Box(Box(9671)),
+Box(Box(9672)),
+Box(Box(9673)),
+Box(Box(9674)),
+Box(Box(9675)),
+Box(Box(9676)),
+Box(Box(9677)),
+Box(Box(9678)),
+Box(Box(9679)),
+Box(Box(9680)),
+Box(Box(9681)),
+Box(Box(9682)),
+Box(Box(9683)),
+Box(Box(9684)),
+Box(Box(9685)),
+Box(Box(9686)),
+Box(Box(9687)),
+Box(Box(9688)),
+Box(Box(9689)),
+Box(Box(9690)),
+Box(Box(9691)),
+Box(Box(9692)),
+Box(Box(9693)),
+Box(Box(9694)),
+Box(Box(9695)),
+Box(Box(9696)),
+Box(Box(9697)),
+Box(Box(9698)),
+Box(Box(9699)),
+Box(Box(9700)),
+Box(Box(9701)),
+Box(Box(9702)),
+Box(Box(9703)),
+Box(Box(9704)),
+Box(Box(9705)),
+Box(Box(9706)),
+Box(Box(9707)),
+Box(Box(9708)),
+Box(Box(9709)),
+Box(Box(9710)),
+Box(Box(9711)),
+Box(Box(9712)),
+Box(Box(9713)),
+Box(Box(9714)),
+Box(Box(9715)),
+Box(Box(9716)),
+Box(Box(9717)),
+Box(Box(9718)),
+Box(Box(9719)),
+Box(Box(9720)),
+Box(Box(9721)),
+Box(Box(9722)),
+Box(Box(9723)),
+Box(Box(9724)),
+Box(Box(9725)),
+Box(Box(9726)),
+Box(Box(9727)),
+Box(Box(9728)),
+Box(Box(9729)),
+Box(Box(9730)),
+Box(Box(9731)),
+Box(Box(9732)),
+Box(Box(9733)),
+Box(Box(9734)),
+Box(Box(9735)),
+Box(Box(9736)),
+Box(Box(9737)),
+Box(Box(9738)),
+Box(Box(9739)),
+Box(Box(9740)),
+Box(Box(9741)),
+Box(Box(9742)),
+Box(Box(9743)),
+Box(Box(9744)),
+Box(Box(9745)),
+Box(Box(9746)),
+Box(Box(9747)),
+Box(Box(9748)),
+Box(Box(9749)),
+Box(Box(9750)),
+Box(Box(9751)),
+Box(Box(9752)),
+Box(Box(9753)),
+Box(Box(9754)),
+Box(Box(9755)),
+Box(Box(9756)),
+Box(Box(9757)),
+Box(Box(9758)),
+Box(Box(9759)),
+Box(Box(9760)),
+Box(Box(9761)),
+Box(Box(9762)),
+Box(Box(9763)),
+Box(Box(9764)),
+Box(Box(9765)),
+Box(Box(9766)),
+Box(Box(9767)),
+Box(Box(9768)),
+Box(Box(9769)),
+Box(Box(9770)),
+Box(Box(9771)),
+Box(Box(9772)),
+Box(Box(9773)),
+Box(Box(9774)),
+Box(Box(9775)),
+Box(Box(9776)),
+Box(Box(9777)),
+Box(Box(9778)),
+Box(Box(9779)),
+Box(Box(9780)),
+Box(Box(9781)),
+Box(Box(9782)),
+Box(Box(9783)),
+Box(Box(9784)),
+Box(Box(9785)),
+Box(Box(9786)),
+Box(Box(9787)),
+Box(Box(9788)),
+Box(Box(9789)),
+Box(Box(9790)),
+Box(Box(9791)),
+Box(Box(9792)),
+Box(Box(9793)),
+Box(Box(9794)),
+Box(Box(9795)),
+Box(Box(9796)),
+Box(Box(9797)),
+Box(Box(9798)),
+Box(Box(9799)),
+Box(Box(9800)),
+Box(Box(9801)),
+Box(Box(9802)),
+Box(Box(9803)),
+Box(Box(9804)),
+Box(Box(9805)),
+Box(Box(9806)),
+Box(Box(9807)),
+Box(Box(9808)),
+Box(Box(9809)),
+Box(Box(9810)),
+Box(Box(9811)),
+Box(Box(9812)),
+Box(Box(9813)),
+Box(Box(9814)),
+Box(Box(9815)),
+Box(Box(9816)),
+Box(Box(9817)),
+Box(Box(9818)),
+Box(Box(9819)),
+Box(Box(9820)),
+Box(Box(9821)),
+Box(Box(9822)),
+Box(Box(9823)),
+Box(Box(9824)),
+Box(Box(9825)),
+Box(Box(9826)),
+Box(Box(9827)),
+Box(Box(9828)),
+Box(Box(9829)),
+Box(Box(9830)),
+Box(Box(9831)),
+Box(Box(9832)),
+Box(Box(9833)),
+Box(Box(9834)),
+Box(Box(9835)),
+Box(Box(9836)),
+Box(Box(9837)),
+Box(Box(9838)),
+Box(Box(9839)),
+Box(Box(9840)),
+Box(Box(9841)),
+Box(Box(9842)),
+Box(Box(9843)),
+Box(Box(9844)),
+Box(Box(9845)),
+Box(Box(9846)),
+Box(Box(9847)),
+Box(Box(9848)),
+Box(Box(9849)),
+Box(Box(9850)),
+Box(Box(9851)),
+Box(Box(9852)),
+Box(Box(9853)),
+Box(Box(9854)),
+Box(Box(9855)),
+Box(Box(9856)),
+Box(Box(9857)),
+Box(Box(9858)),
+Box(Box(9859)),
+Box(Box(9860)),
+Box(Box(9861)),
+Box(Box(9862)),
+Box(Box(9863)),
+Box(Box(9864)),
+Box(Box(9865)),
+Box(Box(9866)),
+Box(Box(9867)),
+Box(Box(9868)),
+Box(Box(9869)),
+Box(Box(9870)),
+Box(Box(9871)),
+Box(Box(9872)),
+Box(Box(9873)),
+Box(Box(9874)),
+Box(Box(9875)),
+Box(Box(9876)),
+Box(Box(9877)),
+Box(Box(9878)),
+Box(Box(9879)),
+Box(Box(9880)),
+Box(Box(9881)),
+Box(Box(9882)),
+Box(Box(9883)),
+Box(Box(9884)),
+Box(Box(9885)),
+Box(Box(9886)),
+Box(Box(9887)),
+Box(Box(9888)),
+Box(Box(9889)),
+Box(Box(9890)),
+Box(Box(9891)),
+Box(Box(9892)),
+Box(Box(9893)),
+Box(Box(9894)),
+Box(Box(9895)),
+Box(Box(9896)),
+Box(Box(9897)),
+Box(Box(9898)),
+Box(Box(9899)),
+Box(Box(9900)),
+Box(Box(9901)),
+Box(Box(9902)),
+Box(Box(9903)),
+Box(Box(9904)),
+Box(Box(9905)),
+Box(Box(9906)),
+Box(Box(9907)),
+Box(Box(9908)),
+Box(Box(9909)),
+Box(Box(9910)),
+Box(Box(9911)),
+Box(Box(9912)),
+Box(Box(9913)),
+Box(Box(9914)),
+Box(Box(9915)),
+Box(Box(9916)),
+Box(Box(9917)),
+Box(Box(9918)),
+Box(Box(9919)),
+Box(Box(9920)),
+Box(Box(9921)),
+Box(Box(9922)),
+Box(Box(9923)),
+Box(Box(9924)),
+Box(Box(9925)),
+Box(Box(9926)),
+Box(Box(9927)),
+Box(Box(9928)),
+Box(Box(9929)),
+Box(Box(9930)),
+Box(Box(9931)),
+Box(Box(9932)),
+Box(Box(9933)),
+Box(Box(9934)),
+Box(Box(9935)),
+Box(Box(9936)),
+Box(Box(9937)),
+Box(Box(9938)),
+Box(Box(9939)),
+Box(Box(9940)),
+Box(Box(9941)),
+Box(Box(9942)),
+Box(Box(9943)),
+Box(Box(9944)),
+Box(Box(9945)),
+Box(Box(9946)),
+Box(Box(9947)),
+Box(Box(9948)),
+Box(Box(9949)),
+Box(Box(9950)),
+Box(Box(9951)),
+Box(Box(9952)),
+Box(Box(9953)),
+Box(Box(9954)),
+Box(Box(9955)),
+Box(Box(9956)),
+Box(Box(9957)),
+Box(Box(9958)),
+Box(Box(9959)),
+Box(Box(9960)),
+Box(Box(9961)),
+Box(Box(9962)),
+Box(Box(9963)),
+Box(Box(9964)),
+Box(Box(9965)),
+Box(Box(9966)),
+Box(Box(9967)),
+Box(Box(9968)),
+Box(Box(9969)),
+Box(Box(9970)),
+Box(Box(9971)),
+Box(Box(9972)),
+Box(Box(9973)),
+Box(Box(9974)),
+Box(Box(9975)),
+Box(Box(9976)),
+Box(Box(9977)),
+Box(Box(9978)),
+Box(Box(9979)),
+Box(Box(9980)),
+Box(Box(9981)),
+Box(Box(9982)),
+Box(Box(9983)),
+Box(Box(9984)),
+Box(Box(9985)),
+Box(Box(9986)),
+Box(Box(9987)),
+Box(Box(9988)),
+Box(Box(9989)),
+Box(Box(9990)),
+Box(Box(9991)),
+Box(Box(9992)),
+Box(Box(9993)),
+Box(Box(9994)),
+Box(Box(9995)),
+Box(Box(9996)),
+Box(Box(9997)),
+Box(Box(9998)),
+Box(Box(9999)),
+];
+
+// 10,000 elements.
+const list2 = [
+Box(Box(0)),
+Box(Box(1)),
+Box(Box(2)),
+Box(Box(3)),
+Box(Box(4)),
+Box(Box(5)),
+Box(Box(6)),
+Box(Box(7)),
+Box(Box(8)),
+Box(Box(9)),
+Box(Box(10)),
+Box(Box(11)),
+Box(Box(12)),
+Box(Box(13)),
+Box(Box(14)),
+Box(Box(15)),
+Box(Box(16)),
+Box(Box(17)),
+Box(Box(18)),
+Box(Box(19)),
+Box(Box(20)),
+Box(Box(21)),
+Box(Box(22)),
+Box(Box(23)),
+Box(Box(24)),
+Box(Box(25)),
+Box(Box(26)),
+Box(Box(27)),
+Box(Box(28)),
+Box(Box(29)),
+Box(Box(30)),
+Box(Box(31)),
+Box(Box(32)),
+Box(Box(33)),
+Box(Box(34)),
+Box(Box(35)),
+Box(Box(36)),
+Box(Box(37)),
+Box(Box(38)),
+Box(Box(39)),
+Box(Box(40)),
+Box(Box(41)),
+Box(Box(42)),
+Box(Box(43)),
+Box(Box(44)),
+Box(Box(45)),
+Box(Box(46)),
+Box(Box(47)),
+Box(Box(48)),
+Box(Box(49)),
+Box(Box(50)),
+Box(Box(51)),
+Box(Box(52)),
+Box(Box(53)),
+Box(Box(54)),
+Box(Box(55)),
+Box(Box(56)),
+Box(Box(57)),
+Box(Box(58)),
+Box(Box(59)),
+Box(Box(60)),
+Box(Box(61)),
+Box(Box(62)),
+Box(Box(63)),
+Box(Box(64)),
+Box(Box(65)),
+Box(Box(66)),
+Box(Box(67)),
+Box(Box(68)),
+Box(Box(69)),
+Box(Box(70)),
+Box(Box(71)),
+Box(Box(72)),
+Box(Box(73)),
+Box(Box(74)),
+Box(Box(75)),
+Box(Box(76)),
+Box(Box(77)),
+Box(Box(78)),
+Box(Box(79)),
+Box(Box(80)),
+Box(Box(81)),
+Box(Box(82)),
+Box(Box(83)),
+Box(Box(84)),
+Box(Box(85)),
+Box(Box(86)),
+Box(Box(87)),
+Box(Box(88)),
+Box(Box(89)),
+Box(Box(90)),
+Box(Box(91)),
+Box(Box(92)),
+Box(Box(93)),
+Box(Box(94)),
+Box(Box(95)),
+Box(Box(96)),
+Box(Box(97)),
+Box(Box(98)),
+Box(Box(99)),
+Box(Box(100)),
+Box(Box(101)),
+Box(Box(102)),
+Box(Box(103)),
+Box(Box(104)),
+Box(Box(105)),
+Box(Box(106)),
+Box(Box(107)),
+Box(Box(108)),
+Box(Box(109)),
+Box(Box(110)),
+Box(Box(111)),
+Box(Box(112)),
+Box(Box(113)),
+Box(Box(114)),
+Box(Box(115)),
+Box(Box(116)),
+Box(Box(117)),
+Box(Box(118)),
+Box(Box(119)),
+Box(Box(120)),
+Box(Box(121)),
+Box(Box(122)),
+Box(Box(123)),
+Box(Box(124)),
+Box(Box(125)),
+Box(Box(126)),
+Box(Box(127)),
+Box(Box(128)),
+Box(Box(129)),
+Box(Box(130)),
+Box(Box(131)),
+Box(Box(132)),
+Box(Box(133)),
+Box(Box(134)),
+Box(Box(135)),
+Box(Box(136)),
+Box(Box(137)),
+Box(Box(138)),
+Box(Box(139)),
+Box(Box(140)),
+Box(Box(141)),
+Box(Box(142)),
+Box(Box(143)),
+Box(Box(144)),
+Box(Box(145)),
+Box(Box(146)),
+Box(Box(147)),
+Box(Box(148)),
+Box(Box(149)),
+Box(Box(150)),
+Box(Box(151)),
+Box(Box(152)),
+Box(Box(153)),
+Box(Box(154)),
+Box(Box(155)),
+Box(Box(156)),
+Box(Box(157)),
+Box(Box(158)),
+Box(Box(159)),
+Box(Box(160)),
+Box(Box(161)),
+Box(Box(162)),
+Box(Box(163)),
+Box(Box(164)),
+Box(Box(165)),
+Box(Box(166)),
+Box(Box(167)),
+Box(Box(168)),
+Box(Box(169)),
+Box(Box(170)),
+Box(Box(171)),
+Box(Box(172)),
+Box(Box(173)),
+Box(Box(174)),
+Box(Box(175)),
+Box(Box(176)),
+Box(Box(177)),
+Box(Box(178)),
+Box(Box(179)),
+Box(Box(180)),
+Box(Box(181)),
+Box(Box(182)),
+Box(Box(183)),
+Box(Box(184)),
+Box(Box(185)),
+Box(Box(186)),
+Box(Box(187)),
+Box(Box(188)),
+Box(Box(189)),
+Box(Box(190)),
+Box(Box(191)),
+Box(Box(192)),
+Box(Box(193)),
+Box(Box(194)),
+Box(Box(195)),
+Box(Box(196)),
+Box(Box(197)),
+Box(Box(198)),
+Box(Box(199)),
+Box(Box(200)),
+Box(Box(201)),
+Box(Box(202)),
+Box(Box(203)),
+Box(Box(204)),
+Box(Box(205)),
+Box(Box(206)),
+Box(Box(207)),
+Box(Box(208)),
+Box(Box(209)),
+Box(Box(210)),
+Box(Box(211)),
+Box(Box(212)),
+Box(Box(213)),
+Box(Box(214)),
+Box(Box(215)),
+Box(Box(216)),
+Box(Box(217)),
+Box(Box(218)),
+Box(Box(219)),
+Box(Box(220)),
+Box(Box(221)),
+Box(Box(222)),
+Box(Box(223)),
+Box(Box(224)),
+Box(Box(225)),
+Box(Box(226)),
+Box(Box(227)),
+Box(Box(228)),
+Box(Box(229)),
+Box(Box(230)),
+Box(Box(231)),
+Box(Box(232)),
+Box(Box(233)),
+Box(Box(234)),
+Box(Box(235)),
+Box(Box(236)),
+Box(Box(237)),
+Box(Box(238)),
+Box(Box(239)),
+Box(Box(240)),
+Box(Box(241)),
+Box(Box(242)),
+Box(Box(243)),
+Box(Box(244)),
+Box(Box(245)),
+Box(Box(246)),
+Box(Box(247)),
+Box(Box(248)),
+Box(Box(249)),
+Box(Box(250)),
+Box(Box(251)),
+Box(Box(252)),
+Box(Box(253)),
+Box(Box(254)),
+Box(Box(255)),
+Box(Box(256)),
+Box(Box(257)),
+Box(Box(258)),
+Box(Box(259)),
+Box(Box(260)),
+Box(Box(261)),
+Box(Box(262)),
+Box(Box(263)),
+Box(Box(264)),
+Box(Box(265)),
+Box(Box(266)),
+Box(Box(267)),
+Box(Box(268)),
+Box(Box(269)),
+Box(Box(270)),
+Box(Box(271)),
+Box(Box(272)),
+Box(Box(273)),
+Box(Box(274)),
+Box(Box(275)),
+Box(Box(276)),
+Box(Box(277)),
+Box(Box(278)),
+Box(Box(279)),
+Box(Box(280)),
+Box(Box(281)),
+Box(Box(282)),
+Box(Box(283)),
+Box(Box(284)),
+Box(Box(285)),
+Box(Box(286)),
+Box(Box(287)),
+Box(Box(288)),
+Box(Box(289)),
+Box(Box(290)),
+Box(Box(291)),
+Box(Box(292)),
+Box(Box(293)),
+Box(Box(294)),
+Box(Box(295)),
+Box(Box(296)),
+Box(Box(297)),
+Box(Box(298)),
+Box(Box(299)),
+Box(Box(300)),
+Box(Box(301)),
+Box(Box(302)),
+Box(Box(303)),
+Box(Box(304)),
+Box(Box(305)),
+Box(Box(306)),
+Box(Box(307)),
+Box(Box(308)),
+Box(Box(309)),
+Box(Box(310)),
+Box(Box(311)),
+Box(Box(312)),
+Box(Box(313)),
+Box(Box(314)),
+Box(Box(315)),
+Box(Box(316)),
+Box(Box(317)),
+Box(Box(318)),
+Box(Box(319)),
+Box(Box(320)),
+Box(Box(321)),
+Box(Box(322)),
+Box(Box(323)),
+Box(Box(324)),
+Box(Box(325)),
+Box(Box(326)),
+Box(Box(327)),
+Box(Box(328)),
+Box(Box(329)),
+Box(Box(330)),
+Box(Box(331)),
+Box(Box(332)),
+Box(Box(333)),
+Box(Box(334)),
+Box(Box(335)),
+Box(Box(336)),
+Box(Box(337)),
+Box(Box(338)),
+Box(Box(339)),
+Box(Box(340)),
+Box(Box(341)),
+Box(Box(342)),
+Box(Box(343)),
+Box(Box(344)),
+Box(Box(345)),
+Box(Box(346)),
+Box(Box(347)),
+Box(Box(348)),
+Box(Box(349)),
+Box(Box(350)),
+Box(Box(351)),
+Box(Box(352)),
+Box(Box(353)),
+Box(Box(354)),
+Box(Box(355)),
+Box(Box(356)),
+Box(Box(357)),
+Box(Box(358)),
+Box(Box(359)),
+Box(Box(360)),
+Box(Box(361)),
+Box(Box(362)),
+Box(Box(363)),
+Box(Box(364)),
+Box(Box(365)),
+Box(Box(366)),
+Box(Box(367)),
+Box(Box(368)),
+Box(Box(369)),
+Box(Box(370)),
+Box(Box(371)),
+Box(Box(372)),
+Box(Box(373)),
+Box(Box(374)),
+Box(Box(375)),
+Box(Box(376)),
+Box(Box(377)),
+Box(Box(378)),
+Box(Box(379)),
+Box(Box(380)),
+Box(Box(381)),
+Box(Box(382)),
+Box(Box(383)),
+Box(Box(384)),
+Box(Box(385)),
+Box(Box(386)),
+Box(Box(387)),
+Box(Box(388)),
+Box(Box(389)),
+Box(Box(390)),
+Box(Box(391)),
+Box(Box(392)),
+Box(Box(393)),
+Box(Box(394)),
+Box(Box(395)),
+Box(Box(396)),
+Box(Box(397)),
+Box(Box(398)),
+Box(Box(399)),
+Box(Box(400)),
+Box(Box(401)),
+Box(Box(402)),
+Box(Box(403)),
+Box(Box(404)),
+Box(Box(405)),
+Box(Box(406)),
+Box(Box(407)),
+Box(Box(408)),
+Box(Box(409)),
+Box(Box(410)),
+Box(Box(411)),
+Box(Box(412)),
+Box(Box(413)),
+Box(Box(414)),
+Box(Box(415)),
+Box(Box(416)),
+Box(Box(417)),
+Box(Box(418)),
+Box(Box(419)),
+Box(Box(420)),
+Box(Box(421)),
+Box(Box(422)),
+Box(Box(423)),
+Box(Box(424)),
+Box(Box(425)),
+Box(Box(426)),
+Box(Box(427)),
+Box(Box(428)),
+Box(Box(429)),
+Box(Box(430)),
+Box(Box(431)),
+Box(Box(432)),
+Box(Box(433)),
+Box(Box(434)),
+Box(Box(435)),
+Box(Box(436)),
+Box(Box(437)),
+Box(Box(438)),
+Box(Box(439)),
+Box(Box(440)),
+Box(Box(441)),
+Box(Box(442)),
+Box(Box(443)),
+Box(Box(444)),
+Box(Box(445)),
+Box(Box(446)),
+Box(Box(447)),
+Box(Box(448)),
+Box(Box(449)),
+Box(Box(450)),
+Box(Box(451)),
+Box(Box(452)),
+Box(Box(453)),
+Box(Box(454)),
+Box(Box(455)),
+Box(Box(456)),
+Box(Box(457)),
+Box(Box(458)),
+Box(Box(459)),
+Box(Box(460)),
+Box(Box(461)),
+Box(Box(462)),
+Box(Box(463)),
+Box(Box(464)),
+Box(Box(465)),
+Box(Box(466)),
+Box(Box(467)),
+Box(Box(468)),
+Box(Box(469)),
+Box(Box(470)),
+Box(Box(471)),
+Box(Box(472)),
+Box(Box(473)),
+Box(Box(474)),
+Box(Box(475)),
+Box(Box(476)),
+Box(Box(477)),
+Box(Box(478)),
+Box(Box(479)),
+Box(Box(480)),
+Box(Box(481)),
+Box(Box(482)),
+Box(Box(483)),
+Box(Box(484)),
+Box(Box(485)),
+Box(Box(486)),
+Box(Box(487)),
+Box(Box(488)),
+Box(Box(489)),
+Box(Box(490)),
+Box(Box(491)),
+Box(Box(492)),
+Box(Box(493)),
+Box(Box(494)),
+Box(Box(495)),
+Box(Box(496)),
+Box(Box(497)),
+Box(Box(498)),
+Box(Box(499)),
+Box(Box(500)),
+Box(Box(501)),
+Box(Box(502)),
+Box(Box(503)),
+Box(Box(504)),
+Box(Box(505)),
+Box(Box(506)),
+Box(Box(507)),
+Box(Box(508)),
+Box(Box(509)),
+Box(Box(510)),
+Box(Box(511)),
+Box(Box(512)),
+Box(Box(513)),
+Box(Box(514)),
+Box(Box(515)),
+Box(Box(516)),
+Box(Box(517)),
+Box(Box(518)),
+Box(Box(519)),
+Box(Box(520)),
+Box(Box(521)),
+Box(Box(522)),
+Box(Box(523)),
+Box(Box(524)),
+Box(Box(525)),
+Box(Box(526)),
+Box(Box(527)),
+Box(Box(528)),
+Box(Box(529)),
+Box(Box(530)),
+Box(Box(531)),
+Box(Box(532)),
+Box(Box(533)),
+Box(Box(534)),
+Box(Box(535)),
+Box(Box(536)),
+Box(Box(537)),
+Box(Box(538)),
+Box(Box(539)),
+Box(Box(540)),
+Box(Box(541)),
+Box(Box(542)),
+Box(Box(543)),
+Box(Box(544)),
+Box(Box(545)),
+Box(Box(546)),
+Box(Box(547)),
+Box(Box(548)),
+Box(Box(549)),
+Box(Box(550)),
+Box(Box(551)),
+Box(Box(552)),
+Box(Box(553)),
+Box(Box(554)),
+Box(Box(555)),
+Box(Box(556)),
+Box(Box(557)),
+Box(Box(558)),
+Box(Box(559)),
+Box(Box(560)),
+Box(Box(561)),
+Box(Box(562)),
+Box(Box(563)),
+Box(Box(564)),
+Box(Box(565)),
+Box(Box(566)),
+Box(Box(567)),
+Box(Box(568)),
+Box(Box(569)),
+Box(Box(570)),
+Box(Box(571)),
+Box(Box(572)),
+Box(Box(573)),
+Box(Box(574)),
+Box(Box(575)),
+Box(Box(576)),
+Box(Box(577)),
+Box(Box(578)),
+Box(Box(579)),
+Box(Box(580)),
+Box(Box(581)),
+Box(Box(582)),
+Box(Box(583)),
+Box(Box(584)),
+Box(Box(585)),
+Box(Box(586)),
+Box(Box(587)),
+Box(Box(588)),
+Box(Box(589)),
+Box(Box(590)),
+Box(Box(591)),
+Box(Box(592)),
+Box(Box(593)),
+Box(Box(594)),
+Box(Box(595)),
+Box(Box(596)),
+Box(Box(597)),
+Box(Box(598)),
+Box(Box(599)),
+Box(Box(600)),
+Box(Box(601)),
+Box(Box(602)),
+Box(Box(603)),
+Box(Box(604)),
+Box(Box(605)),
+Box(Box(606)),
+Box(Box(607)),
+Box(Box(608)),
+Box(Box(609)),
+Box(Box(610)),
+Box(Box(611)),
+Box(Box(612)),
+Box(Box(613)),
+Box(Box(614)),
+Box(Box(615)),
+Box(Box(616)),
+Box(Box(617)),
+Box(Box(618)),
+Box(Box(619)),
+Box(Box(620)),
+Box(Box(621)),
+Box(Box(622)),
+Box(Box(623)),
+Box(Box(624)),
+Box(Box(625)),
+Box(Box(626)),
+Box(Box(627)),
+Box(Box(628)),
+Box(Box(629)),
+Box(Box(630)),
+Box(Box(631)),
+Box(Box(632)),
+Box(Box(633)),
+Box(Box(634)),
+Box(Box(635)),
+Box(Box(636)),
+Box(Box(637)),
+Box(Box(638)),
+Box(Box(639)),
+Box(Box(640)),
+Box(Box(641)),
+Box(Box(642)),
+Box(Box(643)),
+Box(Box(644)),
+Box(Box(645)),
+Box(Box(646)),
+Box(Box(647)),
+Box(Box(648)),
+Box(Box(649)),
+Box(Box(650)),
+Box(Box(651)),
+Box(Box(652)),
+Box(Box(653)),
+Box(Box(654)),
+Box(Box(655)),
+Box(Box(656)),
+Box(Box(657)),
+Box(Box(658)),
+Box(Box(659)),
+Box(Box(660)),
+Box(Box(661)),
+Box(Box(662)),
+Box(Box(663)),
+Box(Box(664)),
+Box(Box(665)),
+Box(Box(666)),
+Box(Box(667)),
+Box(Box(668)),
+Box(Box(669)),
+Box(Box(670)),
+Box(Box(671)),
+Box(Box(672)),
+Box(Box(673)),
+Box(Box(674)),
+Box(Box(675)),
+Box(Box(676)),
+Box(Box(677)),
+Box(Box(678)),
+Box(Box(679)),
+Box(Box(680)),
+Box(Box(681)),
+Box(Box(682)),
+Box(Box(683)),
+Box(Box(684)),
+Box(Box(685)),
+Box(Box(686)),
+Box(Box(687)),
+Box(Box(688)),
+Box(Box(689)),
+Box(Box(690)),
+Box(Box(691)),
+Box(Box(692)),
+Box(Box(693)),
+Box(Box(694)),
+Box(Box(695)),
+Box(Box(696)),
+Box(Box(697)),
+Box(Box(698)),
+Box(Box(699)),
+Box(Box(700)),
+Box(Box(701)),
+Box(Box(702)),
+Box(Box(703)),
+Box(Box(704)),
+Box(Box(705)),
+Box(Box(706)),
+Box(Box(707)),
+Box(Box(708)),
+Box(Box(709)),
+Box(Box(710)),
+Box(Box(711)),
+Box(Box(712)),
+Box(Box(713)),
+Box(Box(714)),
+Box(Box(715)),
+Box(Box(716)),
+Box(Box(717)),
+Box(Box(718)),
+Box(Box(719)),
+Box(Box(720)),
+Box(Box(721)),
+Box(Box(722)),
+Box(Box(723)),
+Box(Box(724)),
+Box(Box(725)),
+Box(Box(726)),
+Box(Box(727)),
+Box(Box(728)),
+Box(Box(729)),
+Box(Box(730)),
+Box(Box(731)),
+Box(Box(732)),
+Box(Box(733)),
+Box(Box(734)),
+Box(Box(735)),
+Box(Box(736)),
+Box(Box(737)),
+Box(Box(738)),
+Box(Box(739)),
+Box(Box(740)),
+Box(Box(741)),
+Box(Box(742)),
+Box(Box(743)),
+Box(Box(744)),
+Box(Box(745)),
+Box(Box(746)),
+Box(Box(747)),
+Box(Box(748)),
+Box(Box(749)),
+Box(Box(750)),
+Box(Box(751)),
+Box(Box(752)),
+Box(Box(753)),
+Box(Box(754)),
+Box(Box(755)),
+Box(Box(756)),
+Box(Box(757)),
+Box(Box(758)),
+Box(Box(759)),
+Box(Box(760)),
+Box(Box(761)),
+Box(Box(762)),
+Box(Box(763)),
+Box(Box(764)),
+Box(Box(765)),
+Box(Box(766)),
+Box(Box(767)),
+Box(Box(768)),
+Box(Box(769)),
+Box(Box(770)),
+Box(Box(771)),
+Box(Box(772)),
+Box(Box(773)),
+Box(Box(774)),
+Box(Box(775)),
+Box(Box(776)),
+Box(Box(777)),
+Box(Box(778)),
+Box(Box(779)),
+Box(Box(780)),
+Box(Box(781)),
+Box(Box(782)),
+Box(Box(783)),
+Box(Box(784)),
+Box(Box(785)),
+Box(Box(786)),
+Box(Box(787)),
+Box(Box(788)),
+Box(Box(789)),
+Box(Box(790)),
+Box(Box(791)),
+Box(Box(792)),
+Box(Box(793)),
+Box(Box(794)),
+Box(Box(795)),
+Box(Box(796)),
+Box(Box(797)),
+Box(Box(798)),
+Box(Box(799)),
+Box(Box(800)),
+Box(Box(801)),
+Box(Box(802)),
+Box(Box(803)),
+Box(Box(804)),
+Box(Box(805)),
+Box(Box(806)),
+Box(Box(807)),
+Box(Box(808)),
+Box(Box(809)),
+Box(Box(810)),
+Box(Box(811)),
+Box(Box(812)),
+Box(Box(813)),
+Box(Box(814)),
+Box(Box(815)),
+Box(Box(816)),
+Box(Box(817)),
+Box(Box(818)),
+Box(Box(819)),
+Box(Box(820)),
+Box(Box(821)),
+Box(Box(822)),
+Box(Box(823)),
+Box(Box(824)),
+Box(Box(825)),
+Box(Box(826)),
+Box(Box(827)),
+Box(Box(828)),
+Box(Box(829)),
+Box(Box(830)),
+Box(Box(831)),
+Box(Box(832)),
+Box(Box(833)),
+Box(Box(834)),
+Box(Box(835)),
+Box(Box(836)),
+Box(Box(837)),
+Box(Box(838)),
+Box(Box(839)),
+Box(Box(840)),
+Box(Box(841)),
+Box(Box(842)),
+Box(Box(843)),
+Box(Box(844)),
+Box(Box(845)),
+Box(Box(846)),
+Box(Box(847)),
+Box(Box(848)),
+Box(Box(849)),
+Box(Box(850)),
+Box(Box(851)),
+Box(Box(852)),
+Box(Box(853)),
+Box(Box(854)),
+Box(Box(855)),
+Box(Box(856)),
+Box(Box(857)),
+Box(Box(858)),
+Box(Box(859)),
+Box(Box(860)),
+Box(Box(861)),
+Box(Box(862)),
+Box(Box(863)),
+Box(Box(864)),
+Box(Box(865)),
+Box(Box(866)),
+Box(Box(867)),
+Box(Box(868)),
+Box(Box(869)),
+Box(Box(870)),
+Box(Box(871)),
+Box(Box(872)),
+Box(Box(873)),
+Box(Box(874)),
+Box(Box(875)),
+Box(Box(876)),
+Box(Box(877)),
+Box(Box(878)),
+Box(Box(879)),
+Box(Box(880)),
+Box(Box(881)),
+Box(Box(882)),
+Box(Box(883)),
+Box(Box(884)),
+Box(Box(885)),
+Box(Box(886)),
+Box(Box(887)),
+Box(Box(888)),
+Box(Box(889)),
+Box(Box(890)),
+Box(Box(891)),
+Box(Box(892)),
+Box(Box(893)),
+Box(Box(894)),
+Box(Box(895)),
+Box(Box(896)),
+Box(Box(897)),
+Box(Box(898)),
+Box(Box(899)),
+Box(Box(900)),
+Box(Box(901)),
+Box(Box(902)),
+Box(Box(903)),
+Box(Box(904)),
+Box(Box(905)),
+Box(Box(906)),
+Box(Box(907)),
+Box(Box(908)),
+Box(Box(909)),
+Box(Box(910)),
+Box(Box(911)),
+Box(Box(912)),
+Box(Box(913)),
+Box(Box(914)),
+Box(Box(915)),
+Box(Box(916)),
+Box(Box(917)),
+Box(Box(918)),
+Box(Box(919)),
+Box(Box(920)),
+Box(Box(921)),
+Box(Box(922)),
+Box(Box(923)),
+Box(Box(924)),
+Box(Box(925)),
+Box(Box(926)),
+Box(Box(927)),
+Box(Box(928)),
+Box(Box(929)),
+Box(Box(930)),
+Box(Box(931)),
+Box(Box(932)),
+Box(Box(933)),
+Box(Box(934)),
+Box(Box(935)),
+Box(Box(936)),
+Box(Box(937)),
+Box(Box(938)),
+Box(Box(939)),
+Box(Box(940)),
+Box(Box(941)),
+Box(Box(942)),
+Box(Box(943)),
+Box(Box(944)),
+Box(Box(945)),
+Box(Box(946)),
+Box(Box(947)),
+Box(Box(948)),
+Box(Box(949)),
+Box(Box(950)),
+Box(Box(951)),
+Box(Box(952)),
+Box(Box(953)),
+Box(Box(954)),
+Box(Box(955)),
+Box(Box(956)),
+Box(Box(957)),
+Box(Box(958)),
+Box(Box(959)),
+Box(Box(960)),
+Box(Box(961)),
+Box(Box(962)),
+Box(Box(963)),
+Box(Box(964)),
+Box(Box(965)),
+Box(Box(966)),
+Box(Box(967)),
+Box(Box(968)),
+Box(Box(969)),
+Box(Box(970)),
+Box(Box(971)),
+Box(Box(972)),
+Box(Box(973)),
+Box(Box(974)),
+Box(Box(975)),
+Box(Box(976)),
+Box(Box(977)),
+Box(Box(978)),
+Box(Box(979)),
+Box(Box(980)),
+Box(Box(981)),
+Box(Box(982)),
+Box(Box(983)),
+Box(Box(984)),
+Box(Box(985)),
+Box(Box(986)),
+Box(Box(987)),
+Box(Box(988)),
+Box(Box(989)),
+Box(Box(990)),
+Box(Box(991)),
+Box(Box(992)),
+Box(Box(993)),
+Box(Box(994)),
+Box(Box(995)),
+Box(Box(996)),
+Box(Box(997)),
+Box(Box(998)),
+Box(Box(999)),
+Box(Box(1000)),
+Box(Box(1001)),
+Box(Box(1002)),
+Box(Box(1003)),
+Box(Box(1004)),
+Box(Box(1005)),
+Box(Box(1006)),
+Box(Box(1007)),
+Box(Box(1008)),
+Box(Box(1009)),
+Box(Box(1010)),
+Box(Box(1011)),
+Box(Box(1012)),
+Box(Box(1013)),
+Box(Box(1014)),
+Box(Box(1015)),
+Box(Box(1016)),
+Box(Box(1017)),
+Box(Box(1018)),
+Box(Box(1019)),
+Box(Box(1020)),
+Box(Box(1021)),
+Box(Box(1022)),
+Box(Box(1023)),
+Box(Box(1024)),
+Box(Box(1025)),
+Box(Box(1026)),
+Box(Box(1027)),
+Box(Box(1028)),
+Box(Box(1029)),
+Box(Box(1030)),
+Box(Box(1031)),
+Box(Box(1032)),
+Box(Box(1033)),
+Box(Box(1034)),
+Box(Box(1035)),
+Box(Box(1036)),
+Box(Box(1037)),
+Box(Box(1038)),
+Box(Box(1039)),
+Box(Box(1040)),
+Box(Box(1041)),
+Box(Box(1042)),
+Box(Box(1043)),
+Box(Box(1044)),
+Box(Box(1045)),
+Box(Box(1046)),
+Box(Box(1047)),
+Box(Box(1048)),
+Box(Box(1049)),
+Box(Box(1050)),
+Box(Box(1051)),
+Box(Box(1052)),
+Box(Box(1053)),
+Box(Box(1054)),
+Box(Box(1055)),
+Box(Box(1056)),
+Box(Box(1057)),
+Box(Box(1058)),
+Box(Box(1059)),
+Box(Box(1060)),
+Box(Box(1061)),
+Box(Box(1062)),
+Box(Box(1063)),
+Box(Box(1064)),
+Box(Box(1065)),
+Box(Box(1066)),
+Box(Box(1067)),
+Box(Box(1068)),
+Box(Box(1069)),
+Box(Box(1070)),
+Box(Box(1071)),
+Box(Box(1072)),
+Box(Box(1073)),
+Box(Box(1074)),
+Box(Box(1075)),
+Box(Box(1076)),
+Box(Box(1077)),
+Box(Box(1078)),
+Box(Box(1079)),
+Box(Box(1080)),
+Box(Box(1081)),
+Box(Box(1082)),
+Box(Box(1083)),
+Box(Box(1084)),
+Box(Box(1085)),
+Box(Box(1086)),
+Box(Box(1087)),
+Box(Box(1088)),
+Box(Box(1089)),
+Box(Box(1090)),
+Box(Box(1091)),
+Box(Box(1092)),
+Box(Box(1093)),
+Box(Box(1094)),
+Box(Box(1095)),
+Box(Box(1096)),
+Box(Box(1097)),
+Box(Box(1098)),
+Box(Box(1099)),
+Box(Box(1100)),
+Box(Box(1101)),
+Box(Box(1102)),
+Box(Box(1103)),
+Box(Box(1104)),
+Box(Box(1105)),
+Box(Box(1106)),
+Box(Box(1107)),
+Box(Box(1108)),
+Box(Box(1109)),
+Box(Box(1110)),
+Box(Box(1111)),
+Box(Box(1112)),
+Box(Box(1113)),
+Box(Box(1114)),
+Box(Box(1115)),
+Box(Box(1116)),
+Box(Box(1117)),
+Box(Box(1118)),
+Box(Box(1119)),
+Box(Box(1120)),
+Box(Box(1121)),
+Box(Box(1122)),
+Box(Box(1123)),
+Box(Box(1124)),
+Box(Box(1125)),
+Box(Box(1126)),
+Box(Box(1127)),
+Box(Box(1128)),
+Box(Box(1129)),
+Box(Box(1130)),
+Box(Box(1131)),
+Box(Box(1132)),
+Box(Box(1133)),
+Box(Box(1134)),
+Box(Box(1135)),
+Box(Box(1136)),
+Box(Box(1137)),
+Box(Box(1138)),
+Box(Box(1139)),
+Box(Box(1140)),
+Box(Box(1141)),
+Box(Box(1142)),
+Box(Box(1143)),
+Box(Box(1144)),
+Box(Box(1145)),
+Box(Box(1146)),
+Box(Box(1147)),
+Box(Box(1148)),
+Box(Box(1149)),
+Box(Box(1150)),
+Box(Box(1151)),
+Box(Box(1152)),
+Box(Box(1153)),
+Box(Box(1154)),
+Box(Box(1155)),
+Box(Box(1156)),
+Box(Box(1157)),
+Box(Box(1158)),
+Box(Box(1159)),
+Box(Box(1160)),
+Box(Box(1161)),
+Box(Box(1162)),
+Box(Box(1163)),
+Box(Box(1164)),
+Box(Box(1165)),
+Box(Box(1166)),
+Box(Box(1167)),
+Box(Box(1168)),
+Box(Box(1169)),
+Box(Box(1170)),
+Box(Box(1171)),
+Box(Box(1172)),
+Box(Box(1173)),
+Box(Box(1174)),
+Box(Box(1175)),
+Box(Box(1176)),
+Box(Box(1177)),
+Box(Box(1178)),
+Box(Box(1179)),
+Box(Box(1180)),
+Box(Box(1181)),
+Box(Box(1182)),
+Box(Box(1183)),
+Box(Box(1184)),
+Box(Box(1185)),
+Box(Box(1186)),
+Box(Box(1187)),
+Box(Box(1188)),
+Box(Box(1189)),
+Box(Box(1190)),
+Box(Box(1191)),
+Box(Box(1192)),
+Box(Box(1193)),
+Box(Box(1194)),
+Box(Box(1195)),
+Box(Box(1196)),
+Box(Box(1197)),
+Box(Box(1198)),
+Box(Box(1199)),
+Box(Box(1200)),
+Box(Box(1201)),
+Box(Box(1202)),
+Box(Box(1203)),
+Box(Box(1204)),
+Box(Box(1205)),
+Box(Box(1206)),
+Box(Box(1207)),
+Box(Box(1208)),
+Box(Box(1209)),
+Box(Box(1210)),
+Box(Box(1211)),
+Box(Box(1212)),
+Box(Box(1213)),
+Box(Box(1214)),
+Box(Box(1215)),
+Box(Box(1216)),
+Box(Box(1217)),
+Box(Box(1218)),
+Box(Box(1219)),
+Box(Box(1220)),
+Box(Box(1221)),
+Box(Box(1222)),
+Box(Box(1223)),
+Box(Box(1224)),
+Box(Box(1225)),
+Box(Box(1226)),
+Box(Box(1227)),
+Box(Box(1228)),
+Box(Box(1229)),
+Box(Box(1230)),
+Box(Box(1231)),
+Box(Box(1232)),
+Box(Box(1233)),
+Box(Box(1234)),
+Box(Box(1235)),
+Box(Box(1236)),
+Box(Box(1237)),
+Box(Box(1238)),
+Box(Box(1239)),
+Box(Box(1240)),
+Box(Box(1241)),
+Box(Box(1242)),
+Box(Box(1243)),
+Box(Box(1244)),
+Box(Box(1245)),
+Box(Box(1246)),
+Box(Box(1247)),
+Box(Box(1248)),
+Box(Box(1249)),
+Box(Box(1250)),
+Box(Box(1251)),
+Box(Box(1252)),
+Box(Box(1253)),
+Box(Box(1254)),
+Box(Box(1255)),
+Box(Box(1256)),
+Box(Box(1257)),
+Box(Box(1258)),
+Box(Box(1259)),
+Box(Box(1260)),
+Box(Box(1261)),
+Box(Box(1262)),
+Box(Box(1263)),
+Box(Box(1264)),
+Box(Box(1265)),
+Box(Box(1266)),
+Box(Box(1267)),
+Box(Box(1268)),
+Box(Box(1269)),
+Box(Box(1270)),
+Box(Box(1271)),
+Box(Box(1272)),
+Box(Box(1273)),
+Box(Box(1274)),
+Box(Box(1275)),
+Box(Box(1276)),
+Box(Box(1277)),
+Box(Box(1278)),
+Box(Box(1279)),
+Box(Box(1280)),
+Box(Box(1281)),
+Box(Box(1282)),
+Box(Box(1283)),
+Box(Box(1284)),
+Box(Box(1285)),
+Box(Box(1286)),
+Box(Box(1287)),
+Box(Box(1288)),
+Box(Box(1289)),
+Box(Box(1290)),
+Box(Box(1291)),
+Box(Box(1292)),
+Box(Box(1293)),
+Box(Box(1294)),
+Box(Box(1295)),
+Box(Box(1296)),
+Box(Box(1297)),
+Box(Box(1298)),
+Box(Box(1299)),
+Box(Box(1300)),
+Box(Box(1301)),
+Box(Box(1302)),
+Box(Box(1303)),
+Box(Box(1304)),
+Box(Box(1305)),
+Box(Box(1306)),
+Box(Box(1307)),
+Box(Box(1308)),
+Box(Box(1309)),
+Box(Box(1310)),
+Box(Box(1311)),
+Box(Box(1312)),
+Box(Box(1313)),
+Box(Box(1314)),
+Box(Box(1315)),
+Box(Box(1316)),
+Box(Box(1317)),
+Box(Box(1318)),
+Box(Box(1319)),
+Box(Box(1320)),
+Box(Box(1321)),
+Box(Box(1322)),
+Box(Box(1323)),
+Box(Box(1324)),
+Box(Box(1325)),
+Box(Box(1326)),
+Box(Box(1327)),
+Box(Box(1328)),
+Box(Box(1329)),
+Box(Box(1330)),
+Box(Box(1331)),
+Box(Box(1332)),
+Box(Box(1333)),
+Box(Box(1334)),
+Box(Box(1335)),
+Box(Box(1336)),
+Box(Box(1337)),
+Box(Box(1338)),
+Box(Box(1339)),
+Box(Box(1340)),
+Box(Box(1341)),
+Box(Box(1342)),
+Box(Box(1343)),
+Box(Box(1344)),
+Box(Box(1345)),
+Box(Box(1346)),
+Box(Box(1347)),
+Box(Box(1348)),
+Box(Box(1349)),
+Box(Box(1350)),
+Box(Box(1351)),
+Box(Box(1352)),
+Box(Box(1353)),
+Box(Box(1354)),
+Box(Box(1355)),
+Box(Box(1356)),
+Box(Box(1357)),
+Box(Box(1358)),
+Box(Box(1359)),
+Box(Box(1360)),
+Box(Box(1361)),
+Box(Box(1362)),
+Box(Box(1363)),
+Box(Box(1364)),
+Box(Box(1365)),
+Box(Box(1366)),
+Box(Box(1367)),
+Box(Box(1368)),
+Box(Box(1369)),
+Box(Box(1370)),
+Box(Box(1371)),
+Box(Box(1372)),
+Box(Box(1373)),
+Box(Box(1374)),
+Box(Box(1375)),
+Box(Box(1376)),
+Box(Box(1377)),
+Box(Box(1378)),
+Box(Box(1379)),
+Box(Box(1380)),
+Box(Box(1381)),
+Box(Box(1382)),
+Box(Box(1383)),
+Box(Box(1384)),
+Box(Box(1385)),
+Box(Box(1386)),
+Box(Box(1387)),
+Box(Box(1388)),
+Box(Box(1389)),
+Box(Box(1390)),
+Box(Box(1391)),
+Box(Box(1392)),
+Box(Box(1393)),
+Box(Box(1394)),
+Box(Box(1395)),
+Box(Box(1396)),
+Box(Box(1397)),
+Box(Box(1398)),
+Box(Box(1399)),
+Box(Box(1400)),
+Box(Box(1401)),
+Box(Box(1402)),
+Box(Box(1403)),
+Box(Box(1404)),
+Box(Box(1405)),
+Box(Box(1406)),
+Box(Box(1407)),
+Box(Box(1408)),
+Box(Box(1409)),
+Box(Box(1410)),
+Box(Box(1411)),
+Box(Box(1412)),
+Box(Box(1413)),
+Box(Box(1414)),
+Box(Box(1415)),
+Box(Box(1416)),
+Box(Box(1417)),
+Box(Box(1418)),
+Box(Box(1419)),
+Box(Box(1420)),
+Box(Box(1421)),
+Box(Box(1422)),
+Box(Box(1423)),
+Box(Box(1424)),
+Box(Box(1425)),
+Box(Box(1426)),
+Box(Box(1427)),
+Box(Box(1428)),
+Box(Box(1429)),
+Box(Box(1430)),
+Box(Box(1431)),
+Box(Box(1432)),
+Box(Box(1433)),
+Box(Box(1434)),
+Box(Box(1435)),
+Box(Box(1436)),
+Box(Box(1437)),
+Box(Box(1438)),
+Box(Box(1439)),
+Box(Box(1440)),
+Box(Box(1441)),
+Box(Box(1442)),
+Box(Box(1443)),
+Box(Box(1444)),
+Box(Box(1445)),
+Box(Box(1446)),
+Box(Box(1447)),
+Box(Box(1448)),
+Box(Box(1449)),
+Box(Box(1450)),
+Box(Box(1451)),
+Box(Box(1452)),
+Box(Box(1453)),
+Box(Box(1454)),
+Box(Box(1455)),
+Box(Box(1456)),
+Box(Box(1457)),
+Box(Box(1458)),
+Box(Box(1459)),
+Box(Box(1460)),
+Box(Box(1461)),
+Box(Box(1462)),
+Box(Box(1463)),
+Box(Box(1464)),
+Box(Box(1465)),
+Box(Box(1466)),
+Box(Box(1467)),
+Box(Box(1468)),
+Box(Box(1469)),
+Box(Box(1470)),
+Box(Box(1471)),
+Box(Box(1472)),
+Box(Box(1473)),
+Box(Box(1474)),
+Box(Box(1475)),
+Box(Box(1476)),
+Box(Box(1477)),
+Box(Box(1478)),
+Box(Box(1479)),
+Box(Box(1480)),
+Box(Box(1481)),
+Box(Box(1482)),
+Box(Box(1483)),
+Box(Box(1484)),
+Box(Box(1485)),
+Box(Box(1486)),
+Box(Box(1487)),
+Box(Box(1488)),
+Box(Box(1489)),
+Box(Box(1490)),
+Box(Box(1491)),
+Box(Box(1492)),
+Box(Box(1493)),
+Box(Box(1494)),
+Box(Box(1495)),
+Box(Box(1496)),
+Box(Box(1497)),
+Box(Box(1498)),
+Box(Box(1499)),
+Box(Box(1500)),
+Box(Box(1501)),
+Box(Box(1502)),
+Box(Box(1503)),
+Box(Box(1504)),
+Box(Box(1505)),
+Box(Box(1506)),
+Box(Box(1507)),
+Box(Box(1508)),
+Box(Box(1509)),
+Box(Box(1510)),
+Box(Box(1511)),
+Box(Box(1512)),
+Box(Box(1513)),
+Box(Box(1514)),
+Box(Box(1515)),
+Box(Box(1516)),
+Box(Box(1517)),
+Box(Box(1518)),
+Box(Box(1519)),
+Box(Box(1520)),
+Box(Box(1521)),
+Box(Box(1522)),
+Box(Box(1523)),
+Box(Box(1524)),
+Box(Box(1525)),
+Box(Box(1526)),
+Box(Box(1527)),
+Box(Box(1528)),
+Box(Box(1529)),
+Box(Box(1530)),
+Box(Box(1531)),
+Box(Box(1532)),
+Box(Box(1533)),
+Box(Box(1534)),
+Box(Box(1535)),
+Box(Box(1536)),
+Box(Box(1537)),
+Box(Box(1538)),
+Box(Box(1539)),
+Box(Box(1540)),
+Box(Box(1541)),
+Box(Box(1542)),
+Box(Box(1543)),
+Box(Box(1544)),
+Box(Box(1545)),
+Box(Box(1546)),
+Box(Box(1547)),
+Box(Box(1548)),
+Box(Box(1549)),
+Box(Box(1550)),
+Box(Box(1551)),
+Box(Box(1552)),
+Box(Box(1553)),
+Box(Box(1554)),
+Box(Box(1555)),
+Box(Box(1556)),
+Box(Box(1557)),
+Box(Box(1558)),
+Box(Box(1559)),
+Box(Box(1560)),
+Box(Box(1561)),
+Box(Box(1562)),
+Box(Box(1563)),
+Box(Box(1564)),
+Box(Box(1565)),
+Box(Box(1566)),
+Box(Box(1567)),
+Box(Box(1568)),
+Box(Box(1569)),
+Box(Box(1570)),
+Box(Box(1571)),
+Box(Box(1572)),
+Box(Box(1573)),
+Box(Box(1574)),
+Box(Box(1575)),
+Box(Box(1576)),
+Box(Box(1577)),
+Box(Box(1578)),
+Box(Box(1579)),
+Box(Box(1580)),
+Box(Box(1581)),
+Box(Box(1582)),
+Box(Box(1583)),
+Box(Box(1584)),
+Box(Box(1585)),
+Box(Box(1586)),
+Box(Box(1587)),
+Box(Box(1588)),
+Box(Box(1589)),
+Box(Box(1590)),
+Box(Box(1591)),
+Box(Box(1592)),
+Box(Box(1593)),
+Box(Box(1594)),
+Box(Box(1595)),
+Box(Box(1596)),
+Box(Box(1597)),
+Box(Box(1598)),
+Box(Box(1599)),
+Box(Box(1600)),
+Box(Box(1601)),
+Box(Box(1602)),
+Box(Box(1603)),
+Box(Box(1604)),
+Box(Box(1605)),
+Box(Box(1606)),
+Box(Box(1607)),
+Box(Box(1608)),
+Box(Box(1609)),
+Box(Box(1610)),
+Box(Box(1611)),
+Box(Box(1612)),
+Box(Box(1613)),
+Box(Box(1614)),
+Box(Box(1615)),
+Box(Box(1616)),
+Box(Box(1617)),
+Box(Box(1618)),
+Box(Box(1619)),
+Box(Box(1620)),
+Box(Box(1621)),
+Box(Box(1622)),
+Box(Box(1623)),
+Box(Box(1624)),
+Box(Box(1625)),
+Box(Box(1626)),
+Box(Box(1627)),
+Box(Box(1628)),
+Box(Box(1629)),
+Box(Box(1630)),
+Box(Box(1631)),
+Box(Box(1632)),
+Box(Box(1633)),
+Box(Box(1634)),
+Box(Box(1635)),
+Box(Box(1636)),
+Box(Box(1637)),
+Box(Box(1638)),
+Box(Box(1639)),
+Box(Box(1640)),
+Box(Box(1641)),
+Box(Box(1642)),
+Box(Box(1643)),
+Box(Box(1644)),
+Box(Box(1645)),
+Box(Box(1646)),
+Box(Box(1647)),
+Box(Box(1648)),
+Box(Box(1649)),
+Box(Box(1650)),
+Box(Box(1651)),
+Box(Box(1652)),
+Box(Box(1653)),
+Box(Box(1654)),
+Box(Box(1655)),
+Box(Box(1656)),
+Box(Box(1657)),
+Box(Box(1658)),
+Box(Box(1659)),
+Box(Box(1660)),
+Box(Box(1661)),
+Box(Box(1662)),
+Box(Box(1663)),
+Box(Box(1664)),
+Box(Box(1665)),
+Box(Box(1666)),
+Box(Box(1667)),
+Box(Box(1668)),
+Box(Box(1669)),
+Box(Box(1670)),
+Box(Box(1671)),
+Box(Box(1672)),
+Box(Box(1673)),
+Box(Box(1674)),
+Box(Box(1675)),
+Box(Box(1676)),
+Box(Box(1677)),
+Box(Box(1678)),
+Box(Box(1679)),
+Box(Box(1680)),
+Box(Box(1681)),
+Box(Box(1682)),
+Box(Box(1683)),
+Box(Box(1684)),
+Box(Box(1685)),
+Box(Box(1686)),
+Box(Box(1687)),
+Box(Box(1688)),
+Box(Box(1689)),
+Box(Box(1690)),
+Box(Box(1691)),
+Box(Box(1692)),
+Box(Box(1693)),
+Box(Box(1694)),
+Box(Box(1695)),
+Box(Box(1696)),
+Box(Box(1697)),
+Box(Box(1698)),
+Box(Box(1699)),
+Box(Box(1700)),
+Box(Box(1701)),
+Box(Box(1702)),
+Box(Box(1703)),
+Box(Box(1704)),
+Box(Box(1705)),
+Box(Box(1706)),
+Box(Box(1707)),
+Box(Box(1708)),
+Box(Box(1709)),
+Box(Box(1710)),
+Box(Box(1711)),
+Box(Box(1712)),
+Box(Box(1713)),
+Box(Box(1714)),
+Box(Box(1715)),
+Box(Box(1716)),
+Box(Box(1717)),
+Box(Box(1718)),
+Box(Box(1719)),
+Box(Box(1720)),
+Box(Box(1721)),
+Box(Box(1722)),
+Box(Box(1723)),
+Box(Box(1724)),
+Box(Box(1725)),
+Box(Box(1726)),
+Box(Box(1727)),
+Box(Box(1728)),
+Box(Box(1729)),
+Box(Box(1730)),
+Box(Box(1731)),
+Box(Box(1732)),
+Box(Box(1733)),
+Box(Box(1734)),
+Box(Box(1735)),
+Box(Box(1736)),
+Box(Box(1737)),
+Box(Box(1738)),
+Box(Box(1739)),
+Box(Box(1740)),
+Box(Box(1741)),
+Box(Box(1742)),
+Box(Box(1743)),
+Box(Box(1744)),
+Box(Box(1745)),
+Box(Box(1746)),
+Box(Box(1747)),
+Box(Box(1748)),
+Box(Box(1749)),
+Box(Box(1750)),
+Box(Box(1751)),
+Box(Box(1752)),
+Box(Box(1753)),
+Box(Box(1754)),
+Box(Box(1755)),
+Box(Box(1756)),
+Box(Box(1757)),
+Box(Box(1758)),
+Box(Box(1759)),
+Box(Box(1760)),
+Box(Box(1761)),
+Box(Box(1762)),
+Box(Box(1763)),
+Box(Box(1764)),
+Box(Box(1765)),
+Box(Box(1766)),
+Box(Box(1767)),
+Box(Box(1768)),
+Box(Box(1769)),
+Box(Box(1770)),
+Box(Box(1771)),
+Box(Box(1772)),
+Box(Box(1773)),
+Box(Box(1774)),
+Box(Box(1775)),
+Box(Box(1776)),
+Box(Box(1777)),
+Box(Box(1778)),
+Box(Box(1779)),
+Box(Box(1780)),
+Box(Box(1781)),
+Box(Box(1782)),
+Box(Box(1783)),
+Box(Box(1784)),
+Box(Box(1785)),
+Box(Box(1786)),
+Box(Box(1787)),
+Box(Box(1788)),
+Box(Box(1789)),
+Box(Box(1790)),
+Box(Box(1791)),
+Box(Box(1792)),
+Box(Box(1793)),
+Box(Box(1794)),
+Box(Box(1795)),
+Box(Box(1796)),
+Box(Box(1797)),
+Box(Box(1798)),
+Box(Box(1799)),
+Box(Box(1800)),
+Box(Box(1801)),
+Box(Box(1802)),
+Box(Box(1803)),
+Box(Box(1804)),
+Box(Box(1805)),
+Box(Box(1806)),
+Box(Box(1807)),
+Box(Box(1808)),
+Box(Box(1809)),
+Box(Box(1810)),
+Box(Box(1811)),
+Box(Box(1812)),
+Box(Box(1813)),
+Box(Box(1814)),
+Box(Box(1815)),
+Box(Box(1816)),
+Box(Box(1817)),
+Box(Box(1818)),
+Box(Box(1819)),
+Box(Box(1820)),
+Box(Box(1821)),
+Box(Box(1822)),
+Box(Box(1823)),
+Box(Box(1824)),
+Box(Box(1825)),
+Box(Box(1826)),
+Box(Box(1827)),
+Box(Box(1828)),
+Box(Box(1829)),
+Box(Box(1830)),
+Box(Box(1831)),
+Box(Box(1832)),
+Box(Box(1833)),
+Box(Box(1834)),
+Box(Box(1835)),
+Box(Box(1836)),
+Box(Box(1837)),
+Box(Box(1838)),
+Box(Box(1839)),
+Box(Box(1840)),
+Box(Box(1841)),
+Box(Box(1842)),
+Box(Box(1843)),
+Box(Box(1844)),
+Box(Box(1845)),
+Box(Box(1846)),
+Box(Box(1847)),
+Box(Box(1848)),
+Box(Box(1849)),
+Box(Box(1850)),
+Box(Box(1851)),
+Box(Box(1852)),
+Box(Box(1853)),
+Box(Box(1854)),
+Box(Box(1855)),
+Box(Box(1856)),
+Box(Box(1857)),
+Box(Box(1858)),
+Box(Box(1859)),
+Box(Box(1860)),
+Box(Box(1861)),
+Box(Box(1862)),
+Box(Box(1863)),
+Box(Box(1864)),
+Box(Box(1865)),
+Box(Box(1866)),
+Box(Box(1867)),
+Box(Box(1868)),
+Box(Box(1869)),
+Box(Box(1870)),
+Box(Box(1871)),
+Box(Box(1872)),
+Box(Box(1873)),
+Box(Box(1874)),
+Box(Box(1875)),
+Box(Box(1876)),
+Box(Box(1877)),
+Box(Box(1878)),
+Box(Box(1879)),
+Box(Box(1880)),
+Box(Box(1881)),
+Box(Box(1882)),
+Box(Box(1883)),
+Box(Box(1884)),
+Box(Box(1885)),
+Box(Box(1886)),
+Box(Box(1887)),
+Box(Box(1888)),
+Box(Box(1889)),
+Box(Box(1890)),
+Box(Box(1891)),
+Box(Box(1892)),
+Box(Box(1893)),
+Box(Box(1894)),
+Box(Box(1895)),
+Box(Box(1896)),
+Box(Box(1897)),
+Box(Box(1898)),
+Box(Box(1899)),
+Box(Box(1900)),
+Box(Box(1901)),
+Box(Box(1902)),
+Box(Box(1903)),
+Box(Box(1904)),
+Box(Box(1905)),
+Box(Box(1906)),
+Box(Box(1907)),
+Box(Box(1908)),
+Box(Box(1909)),
+Box(Box(1910)),
+Box(Box(1911)),
+Box(Box(1912)),
+Box(Box(1913)),
+Box(Box(1914)),
+Box(Box(1915)),
+Box(Box(1916)),
+Box(Box(1917)),
+Box(Box(1918)),
+Box(Box(1919)),
+Box(Box(1920)),
+Box(Box(1921)),
+Box(Box(1922)),
+Box(Box(1923)),
+Box(Box(1924)),
+Box(Box(1925)),
+Box(Box(1926)),
+Box(Box(1927)),
+Box(Box(1928)),
+Box(Box(1929)),
+Box(Box(1930)),
+Box(Box(1931)),
+Box(Box(1932)),
+Box(Box(1933)),
+Box(Box(1934)),
+Box(Box(1935)),
+Box(Box(1936)),
+Box(Box(1937)),
+Box(Box(1938)),
+Box(Box(1939)),
+Box(Box(1940)),
+Box(Box(1941)),
+Box(Box(1942)),
+Box(Box(1943)),
+Box(Box(1944)),
+Box(Box(1945)),
+Box(Box(1946)),
+Box(Box(1947)),
+Box(Box(1948)),
+Box(Box(1949)),
+Box(Box(1950)),
+Box(Box(1951)),
+Box(Box(1952)),
+Box(Box(1953)),
+Box(Box(1954)),
+Box(Box(1955)),
+Box(Box(1956)),
+Box(Box(1957)),
+Box(Box(1958)),
+Box(Box(1959)),
+Box(Box(1960)),
+Box(Box(1961)),
+Box(Box(1962)),
+Box(Box(1963)),
+Box(Box(1964)),
+Box(Box(1965)),
+Box(Box(1966)),
+Box(Box(1967)),
+Box(Box(1968)),
+Box(Box(1969)),
+Box(Box(1970)),
+Box(Box(1971)),
+Box(Box(1972)),
+Box(Box(1973)),
+Box(Box(1974)),
+Box(Box(1975)),
+Box(Box(1976)),
+Box(Box(1977)),
+Box(Box(1978)),
+Box(Box(1979)),
+Box(Box(1980)),
+Box(Box(1981)),
+Box(Box(1982)),
+Box(Box(1983)),
+Box(Box(1984)),
+Box(Box(1985)),
+Box(Box(1986)),
+Box(Box(1987)),
+Box(Box(1988)),
+Box(Box(1989)),
+Box(Box(1990)),
+Box(Box(1991)),
+Box(Box(1992)),
+Box(Box(1993)),
+Box(Box(1994)),
+Box(Box(1995)),
+Box(Box(1996)),
+Box(Box(1997)),
+Box(Box(1998)),
+Box(Box(1999)),
+Box(Box(2000)),
+Box(Box(2001)),
+Box(Box(2002)),
+Box(Box(2003)),
+Box(Box(2004)),
+Box(Box(2005)),
+Box(Box(2006)),
+Box(Box(2007)),
+Box(Box(2008)),
+Box(Box(2009)),
+Box(Box(2010)),
+Box(Box(2011)),
+Box(Box(2012)),
+Box(Box(2013)),
+Box(Box(2014)),
+Box(Box(2015)),
+Box(Box(2016)),
+Box(Box(2017)),
+Box(Box(2018)),
+Box(Box(2019)),
+Box(Box(2020)),
+Box(Box(2021)),
+Box(Box(2022)),
+Box(Box(2023)),
+Box(Box(2024)),
+Box(Box(2025)),
+Box(Box(2026)),
+Box(Box(2027)),
+Box(Box(2028)),
+Box(Box(2029)),
+Box(Box(2030)),
+Box(Box(2031)),
+Box(Box(2032)),
+Box(Box(2033)),
+Box(Box(2034)),
+Box(Box(2035)),
+Box(Box(2036)),
+Box(Box(2037)),
+Box(Box(2038)),
+Box(Box(2039)),
+Box(Box(2040)),
+Box(Box(2041)),
+Box(Box(2042)),
+Box(Box(2043)),
+Box(Box(2044)),
+Box(Box(2045)),
+Box(Box(2046)),
+Box(Box(2047)),
+Box(Box(2048)),
+Box(Box(2049)),
+Box(Box(2050)),
+Box(Box(2051)),
+Box(Box(2052)),
+Box(Box(2053)),
+Box(Box(2054)),
+Box(Box(2055)),
+Box(Box(2056)),
+Box(Box(2057)),
+Box(Box(2058)),
+Box(Box(2059)),
+Box(Box(2060)),
+Box(Box(2061)),
+Box(Box(2062)),
+Box(Box(2063)),
+Box(Box(2064)),
+Box(Box(2065)),
+Box(Box(2066)),
+Box(Box(2067)),
+Box(Box(2068)),
+Box(Box(2069)),
+Box(Box(2070)),
+Box(Box(2071)),
+Box(Box(2072)),
+Box(Box(2073)),
+Box(Box(2074)),
+Box(Box(2075)),
+Box(Box(2076)),
+Box(Box(2077)),
+Box(Box(2078)),
+Box(Box(2079)),
+Box(Box(2080)),
+Box(Box(2081)),
+Box(Box(2082)),
+Box(Box(2083)),
+Box(Box(2084)),
+Box(Box(2085)),
+Box(Box(2086)),
+Box(Box(2087)),
+Box(Box(2088)),
+Box(Box(2089)),
+Box(Box(2090)),
+Box(Box(2091)),
+Box(Box(2092)),
+Box(Box(2093)),
+Box(Box(2094)),
+Box(Box(2095)),
+Box(Box(2096)),
+Box(Box(2097)),
+Box(Box(2098)),
+Box(Box(2099)),
+Box(Box(2100)),
+Box(Box(2101)),
+Box(Box(2102)),
+Box(Box(2103)),
+Box(Box(2104)),
+Box(Box(2105)),
+Box(Box(2106)),
+Box(Box(2107)),
+Box(Box(2108)),
+Box(Box(2109)),
+Box(Box(2110)),
+Box(Box(2111)),
+Box(Box(2112)),
+Box(Box(2113)),
+Box(Box(2114)),
+Box(Box(2115)),
+Box(Box(2116)),
+Box(Box(2117)),
+Box(Box(2118)),
+Box(Box(2119)),
+Box(Box(2120)),
+Box(Box(2121)),
+Box(Box(2122)),
+Box(Box(2123)),
+Box(Box(2124)),
+Box(Box(2125)),
+Box(Box(2126)),
+Box(Box(2127)),
+Box(Box(2128)),
+Box(Box(2129)),
+Box(Box(2130)),
+Box(Box(2131)),
+Box(Box(2132)),
+Box(Box(2133)),
+Box(Box(2134)),
+Box(Box(2135)),
+Box(Box(2136)),
+Box(Box(2137)),
+Box(Box(2138)),
+Box(Box(2139)),
+Box(Box(2140)),
+Box(Box(2141)),
+Box(Box(2142)),
+Box(Box(2143)),
+Box(Box(2144)),
+Box(Box(2145)),
+Box(Box(2146)),
+Box(Box(2147)),
+Box(Box(2148)),
+Box(Box(2149)),
+Box(Box(2150)),
+Box(Box(2151)),
+Box(Box(2152)),
+Box(Box(2153)),
+Box(Box(2154)),
+Box(Box(2155)),
+Box(Box(2156)),
+Box(Box(2157)),
+Box(Box(2158)),
+Box(Box(2159)),
+Box(Box(2160)),
+Box(Box(2161)),
+Box(Box(2162)),
+Box(Box(2163)),
+Box(Box(2164)),
+Box(Box(2165)),
+Box(Box(2166)),
+Box(Box(2167)),
+Box(Box(2168)),
+Box(Box(2169)),
+Box(Box(2170)),
+Box(Box(2171)),
+Box(Box(2172)),
+Box(Box(2173)),
+Box(Box(2174)),
+Box(Box(2175)),
+Box(Box(2176)),
+Box(Box(2177)),
+Box(Box(2178)),
+Box(Box(2179)),
+Box(Box(2180)),
+Box(Box(2181)),
+Box(Box(2182)),
+Box(Box(2183)),
+Box(Box(2184)),
+Box(Box(2185)),
+Box(Box(2186)),
+Box(Box(2187)),
+Box(Box(2188)),
+Box(Box(2189)),
+Box(Box(2190)),
+Box(Box(2191)),
+Box(Box(2192)),
+Box(Box(2193)),
+Box(Box(2194)),
+Box(Box(2195)),
+Box(Box(2196)),
+Box(Box(2197)),
+Box(Box(2198)),
+Box(Box(2199)),
+Box(Box(2200)),
+Box(Box(2201)),
+Box(Box(2202)),
+Box(Box(2203)),
+Box(Box(2204)),
+Box(Box(2205)),
+Box(Box(2206)),
+Box(Box(2207)),
+Box(Box(2208)),
+Box(Box(2209)),
+Box(Box(2210)),
+Box(Box(2211)),
+Box(Box(2212)),
+Box(Box(2213)),
+Box(Box(2214)),
+Box(Box(2215)),
+Box(Box(2216)),
+Box(Box(2217)),
+Box(Box(2218)),
+Box(Box(2219)),
+Box(Box(2220)),
+Box(Box(2221)),
+Box(Box(2222)),
+Box(Box(2223)),
+Box(Box(2224)),
+Box(Box(2225)),
+Box(Box(2226)),
+Box(Box(2227)),
+Box(Box(2228)),
+Box(Box(2229)),
+Box(Box(2230)),
+Box(Box(2231)),
+Box(Box(2232)),
+Box(Box(2233)),
+Box(Box(2234)),
+Box(Box(2235)),
+Box(Box(2236)),
+Box(Box(2237)),
+Box(Box(2238)),
+Box(Box(2239)),
+Box(Box(2240)),
+Box(Box(2241)),
+Box(Box(2242)),
+Box(Box(2243)),
+Box(Box(2244)),
+Box(Box(2245)),
+Box(Box(2246)),
+Box(Box(2247)),
+Box(Box(2248)),
+Box(Box(2249)),
+Box(Box(2250)),
+Box(Box(2251)),
+Box(Box(2252)),
+Box(Box(2253)),
+Box(Box(2254)),
+Box(Box(2255)),
+Box(Box(2256)),
+Box(Box(2257)),
+Box(Box(2258)),
+Box(Box(2259)),
+Box(Box(2260)),
+Box(Box(2261)),
+Box(Box(2262)),
+Box(Box(2263)),
+Box(Box(2264)),
+Box(Box(2265)),
+Box(Box(2266)),
+Box(Box(2267)),
+Box(Box(2268)),
+Box(Box(2269)),
+Box(Box(2270)),
+Box(Box(2271)),
+Box(Box(2272)),
+Box(Box(2273)),
+Box(Box(2274)),
+Box(Box(2275)),
+Box(Box(2276)),
+Box(Box(2277)),
+Box(Box(2278)),
+Box(Box(2279)),
+Box(Box(2280)),
+Box(Box(2281)),
+Box(Box(2282)),
+Box(Box(2283)),
+Box(Box(2284)),
+Box(Box(2285)),
+Box(Box(2286)),
+Box(Box(2287)),
+Box(Box(2288)),
+Box(Box(2289)),
+Box(Box(2290)),
+Box(Box(2291)),
+Box(Box(2292)),
+Box(Box(2293)),
+Box(Box(2294)),
+Box(Box(2295)),
+Box(Box(2296)),
+Box(Box(2297)),
+Box(Box(2298)),
+Box(Box(2299)),
+Box(Box(2300)),
+Box(Box(2301)),
+Box(Box(2302)),
+Box(Box(2303)),
+Box(Box(2304)),
+Box(Box(2305)),
+Box(Box(2306)),
+Box(Box(2307)),
+Box(Box(2308)),
+Box(Box(2309)),
+Box(Box(2310)),
+Box(Box(2311)),
+Box(Box(2312)),
+Box(Box(2313)),
+Box(Box(2314)),
+Box(Box(2315)),
+Box(Box(2316)),
+Box(Box(2317)),
+Box(Box(2318)),
+Box(Box(2319)),
+Box(Box(2320)),
+Box(Box(2321)),
+Box(Box(2322)),
+Box(Box(2323)),
+Box(Box(2324)),
+Box(Box(2325)),
+Box(Box(2326)),
+Box(Box(2327)),
+Box(Box(2328)),
+Box(Box(2329)),
+Box(Box(2330)),
+Box(Box(2331)),
+Box(Box(2332)),
+Box(Box(2333)),
+Box(Box(2334)),
+Box(Box(2335)),
+Box(Box(2336)),
+Box(Box(2337)),
+Box(Box(2338)),
+Box(Box(2339)),
+Box(Box(2340)),
+Box(Box(2341)),
+Box(Box(2342)),
+Box(Box(2343)),
+Box(Box(2344)),
+Box(Box(2345)),
+Box(Box(2346)),
+Box(Box(2347)),
+Box(Box(2348)),
+Box(Box(2349)),
+Box(Box(2350)),
+Box(Box(2351)),
+Box(Box(2352)),
+Box(Box(2353)),
+Box(Box(2354)),
+Box(Box(2355)),
+Box(Box(2356)),
+Box(Box(2357)),
+Box(Box(2358)),
+Box(Box(2359)),
+Box(Box(2360)),
+Box(Box(2361)),
+Box(Box(2362)),
+Box(Box(2363)),
+Box(Box(2364)),
+Box(Box(2365)),
+Box(Box(2366)),
+Box(Box(2367)),
+Box(Box(2368)),
+Box(Box(2369)),
+Box(Box(2370)),
+Box(Box(2371)),
+Box(Box(2372)),
+Box(Box(2373)),
+Box(Box(2374)),
+Box(Box(2375)),
+Box(Box(2376)),
+Box(Box(2377)),
+Box(Box(2378)),
+Box(Box(2379)),
+Box(Box(2380)),
+Box(Box(2381)),
+Box(Box(2382)),
+Box(Box(2383)),
+Box(Box(2384)),
+Box(Box(2385)),
+Box(Box(2386)),
+Box(Box(2387)),
+Box(Box(2388)),
+Box(Box(2389)),
+Box(Box(2390)),
+Box(Box(2391)),
+Box(Box(2392)),
+Box(Box(2393)),
+Box(Box(2394)),
+Box(Box(2395)),
+Box(Box(2396)),
+Box(Box(2397)),
+Box(Box(2398)),
+Box(Box(2399)),
+Box(Box(2400)),
+Box(Box(2401)),
+Box(Box(2402)),
+Box(Box(2403)),
+Box(Box(2404)),
+Box(Box(2405)),
+Box(Box(2406)),
+Box(Box(2407)),
+Box(Box(2408)),
+Box(Box(2409)),
+Box(Box(2410)),
+Box(Box(2411)),
+Box(Box(2412)),
+Box(Box(2413)),
+Box(Box(2414)),
+Box(Box(2415)),
+Box(Box(2416)),
+Box(Box(2417)),
+Box(Box(2418)),
+Box(Box(2419)),
+Box(Box(2420)),
+Box(Box(2421)),
+Box(Box(2422)),
+Box(Box(2423)),
+Box(Box(2424)),
+Box(Box(2425)),
+Box(Box(2426)),
+Box(Box(2427)),
+Box(Box(2428)),
+Box(Box(2429)),
+Box(Box(2430)),
+Box(Box(2431)),
+Box(Box(2432)),
+Box(Box(2433)),
+Box(Box(2434)),
+Box(Box(2435)),
+Box(Box(2436)),
+Box(Box(2437)),
+Box(Box(2438)),
+Box(Box(2439)),
+Box(Box(2440)),
+Box(Box(2441)),
+Box(Box(2442)),
+Box(Box(2443)),
+Box(Box(2444)),
+Box(Box(2445)),
+Box(Box(2446)),
+Box(Box(2447)),
+Box(Box(2448)),
+Box(Box(2449)),
+Box(Box(2450)),
+Box(Box(2451)),
+Box(Box(2452)),
+Box(Box(2453)),
+Box(Box(2454)),
+Box(Box(2455)),
+Box(Box(2456)),
+Box(Box(2457)),
+Box(Box(2458)),
+Box(Box(2459)),
+Box(Box(2460)),
+Box(Box(2461)),
+Box(Box(2462)),
+Box(Box(2463)),
+Box(Box(2464)),
+Box(Box(2465)),
+Box(Box(2466)),
+Box(Box(2467)),
+Box(Box(2468)),
+Box(Box(2469)),
+Box(Box(2470)),
+Box(Box(2471)),
+Box(Box(2472)),
+Box(Box(2473)),
+Box(Box(2474)),
+Box(Box(2475)),
+Box(Box(2476)),
+Box(Box(2477)),
+Box(Box(2478)),
+Box(Box(2479)),
+Box(Box(2480)),
+Box(Box(2481)),
+Box(Box(2482)),
+Box(Box(2483)),
+Box(Box(2484)),
+Box(Box(2485)),
+Box(Box(2486)),
+Box(Box(2487)),
+Box(Box(2488)),
+Box(Box(2489)),
+Box(Box(2490)),
+Box(Box(2491)),
+Box(Box(2492)),
+Box(Box(2493)),
+Box(Box(2494)),
+Box(Box(2495)),
+Box(Box(2496)),
+Box(Box(2497)),
+Box(Box(2498)),
+Box(Box(2499)),
+Box(Box(2500)),
+Box(Box(2501)),
+Box(Box(2502)),
+Box(Box(2503)),
+Box(Box(2504)),
+Box(Box(2505)),
+Box(Box(2506)),
+Box(Box(2507)),
+Box(Box(2508)),
+Box(Box(2509)),
+Box(Box(2510)),
+Box(Box(2511)),
+Box(Box(2512)),
+Box(Box(2513)),
+Box(Box(2514)),
+Box(Box(2515)),
+Box(Box(2516)),
+Box(Box(2517)),
+Box(Box(2518)),
+Box(Box(2519)),
+Box(Box(2520)),
+Box(Box(2521)),
+Box(Box(2522)),
+Box(Box(2523)),
+Box(Box(2524)),
+Box(Box(2525)),
+Box(Box(2526)),
+Box(Box(2527)),
+Box(Box(2528)),
+Box(Box(2529)),
+Box(Box(2530)),
+Box(Box(2531)),
+Box(Box(2532)),
+Box(Box(2533)),
+Box(Box(2534)),
+Box(Box(2535)),
+Box(Box(2536)),
+Box(Box(2537)),
+Box(Box(2538)),
+Box(Box(2539)),
+Box(Box(2540)),
+Box(Box(2541)),
+Box(Box(2542)),
+Box(Box(2543)),
+Box(Box(2544)),
+Box(Box(2545)),
+Box(Box(2546)),
+Box(Box(2547)),
+Box(Box(2548)),
+Box(Box(2549)),
+Box(Box(2550)),
+Box(Box(2551)),
+Box(Box(2552)),
+Box(Box(2553)),
+Box(Box(2554)),
+Box(Box(2555)),
+Box(Box(2556)),
+Box(Box(2557)),
+Box(Box(2558)),
+Box(Box(2559)),
+Box(Box(2560)),
+Box(Box(2561)),
+Box(Box(2562)),
+Box(Box(2563)),
+Box(Box(2564)),
+Box(Box(2565)),
+Box(Box(2566)),
+Box(Box(2567)),
+Box(Box(2568)),
+Box(Box(2569)),
+Box(Box(2570)),
+Box(Box(2571)),
+Box(Box(2572)),
+Box(Box(2573)),
+Box(Box(2574)),
+Box(Box(2575)),
+Box(Box(2576)),
+Box(Box(2577)),
+Box(Box(2578)),
+Box(Box(2579)),
+Box(Box(2580)),
+Box(Box(2581)),
+Box(Box(2582)),
+Box(Box(2583)),
+Box(Box(2584)),
+Box(Box(2585)),
+Box(Box(2586)),
+Box(Box(2587)),
+Box(Box(2588)),
+Box(Box(2589)),
+Box(Box(2590)),
+Box(Box(2591)),
+Box(Box(2592)),
+Box(Box(2593)),
+Box(Box(2594)),
+Box(Box(2595)),
+Box(Box(2596)),
+Box(Box(2597)),
+Box(Box(2598)),
+Box(Box(2599)),
+Box(Box(2600)),
+Box(Box(2601)),
+Box(Box(2602)),
+Box(Box(2603)),
+Box(Box(2604)),
+Box(Box(2605)),
+Box(Box(2606)),
+Box(Box(2607)),
+Box(Box(2608)),
+Box(Box(2609)),
+Box(Box(2610)),
+Box(Box(2611)),
+Box(Box(2612)),
+Box(Box(2613)),
+Box(Box(2614)),
+Box(Box(2615)),
+Box(Box(2616)),
+Box(Box(2617)),
+Box(Box(2618)),
+Box(Box(2619)),
+Box(Box(2620)),
+Box(Box(2621)),
+Box(Box(2622)),
+Box(Box(2623)),
+Box(Box(2624)),
+Box(Box(2625)),
+Box(Box(2626)),
+Box(Box(2627)),
+Box(Box(2628)),
+Box(Box(2629)),
+Box(Box(2630)),
+Box(Box(2631)),
+Box(Box(2632)),
+Box(Box(2633)),
+Box(Box(2634)),
+Box(Box(2635)),
+Box(Box(2636)),
+Box(Box(2637)),
+Box(Box(2638)),
+Box(Box(2639)),
+Box(Box(2640)),
+Box(Box(2641)),
+Box(Box(2642)),
+Box(Box(2643)),
+Box(Box(2644)),
+Box(Box(2645)),
+Box(Box(2646)),
+Box(Box(2647)),
+Box(Box(2648)),
+Box(Box(2649)),
+Box(Box(2650)),
+Box(Box(2651)),
+Box(Box(2652)),
+Box(Box(2653)),
+Box(Box(2654)),
+Box(Box(2655)),
+Box(Box(2656)),
+Box(Box(2657)),
+Box(Box(2658)),
+Box(Box(2659)),
+Box(Box(2660)),
+Box(Box(2661)),
+Box(Box(2662)),
+Box(Box(2663)),
+Box(Box(2664)),
+Box(Box(2665)),
+Box(Box(2666)),
+Box(Box(2667)),
+Box(Box(2668)),
+Box(Box(2669)),
+Box(Box(2670)),
+Box(Box(2671)),
+Box(Box(2672)),
+Box(Box(2673)),
+Box(Box(2674)),
+Box(Box(2675)),
+Box(Box(2676)),
+Box(Box(2677)),
+Box(Box(2678)),
+Box(Box(2679)),
+Box(Box(2680)),
+Box(Box(2681)),
+Box(Box(2682)),
+Box(Box(2683)),
+Box(Box(2684)),
+Box(Box(2685)),
+Box(Box(2686)),
+Box(Box(2687)),
+Box(Box(2688)),
+Box(Box(2689)),
+Box(Box(2690)),
+Box(Box(2691)),
+Box(Box(2692)),
+Box(Box(2693)),
+Box(Box(2694)),
+Box(Box(2695)),
+Box(Box(2696)),
+Box(Box(2697)),
+Box(Box(2698)),
+Box(Box(2699)),
+Box(Box(2700)),
+Box(Box(2701)),
+Box(Box(2702)),
+Box(Box(2703)),
+Box(Box(2704)),
+Box(Box(2705)),
+Box(Box(2706)),
+Box(Box(2707)),
+Box(Box(2708)),
+Box(Box(2709)),
+Box(Box(2710)),
+Box(Box(2711)),
+Box(Box(2712)),
+Box(Box(2713)),
+Box(Box(2714)),
+Box(Box(2715)),
+Box(Box(2716)),
+Box(Box(2717)),
+Box(Box(2718)),
+Box(Box(2719)),
+Box(Box(2720)),
+Box(Box(2721)),
+Box(Box(2722)),
+Box(Box(2723)),
+Box(Box(2724)),
+Box(Box(2725)),
+Box(Box(2726)),
+Box(Box(2727)),
+Box(Box(2728)),
+Box(Box(2729)),
+Box(Box(2730)),
+Box(Box(2731)),
+Box(Box(2732)),
+Box(Box(2733)),
+Box(Box(2734)),
+Box(Box(2735)),
+Box(Box(2736)),
+Box(Box(2737)),
+Box(Box(2738)),
+Box(Box(2739)),
+Box(Box(2740)),
+Box(Box(2741)),
+Box(Box(2742)),
+Box(Box(2743)),
+Box(Box(2744)),
+Box(Box(2745)),
+Box(Box(2746)),
+Box(Box(2747)),
+Box(Box(2748)),
+Box(Box(2749)),
+Box(Box(2750)),
+Box(Box(2751)),
+Box(Box(2752)),
+Box(Box(2753)),
+Box(Box(2754)),
+Box(Box(2755)),
+Box(Box(2756)),
+Box(Box(2757)),
+Box(Box(2758)),
+Box(Box(2759)),
+Box(Box(2760)),
+Box(Box(2761)),
+Box(Box(2762)),
+Box(Box(2763)),
+Box(Box(2764)),
+Box(Box(2765)),
+Box(Box(2766)),
+Box(Box(2767)),
+Box(Box(2768)),
+Box(Box(2769)),
+Box(Box(2770)),
+Box(Box(2771)),
+Box(Box(2772)),
+Box(Box(2773)),
+Box(Box(2774)),
+Box(Box(2775)),
+Box(Box(2776)),
+Box(Box(2777)),
+Box(Box(2778)),
+Box(Box(2779)),
+Box(Box(2780)),
+Box(Box(2781)),
+Box(Box(2782)),
+Box(Box(2783)),
+Box(Box(2784)),
+Box(Box(2785)),
+Box(Box(2786)),
+Box(Box(2787)),
+Box(Box(2788)),
+Box(Box(2789)),
+Box(Box(2790)),
+Box(Box(2791)),
+Box(Box(2792)),
+Box(Box(2793)),
+Box(Box(2794)),
+Box(Box(2795)),
+Box(Box(2796)),
+Box(Box(2797)),
+Box(Box(2798)),
+Box(Box(2799)),
+Box(Box(2800)),
+Box(Box(2801)),
+Box(Box(2802)),
+Box(Box(2803)),
+Box(Box(2804)),
+Box(Box(2805)),
+Box(Box(2806)),
+Box(Box(2807)),
+Box(Box(2808)),
+Box(Box(2809)),
+Box(Box(2810)),
+Box(Box(2811)),
+Box(Box(2812)),
+Box(Box(2813)),
+Box(Box(2814)),
+Box(Box(2815)),
+Box(Box(2816)),
+Box(Box(2817)),
+Box(Box(2818)),
+Box(Box(2819)),
+Box(Box(2820)),
+Box(Box(2821)),
+Box(Box(2822)),
+Box(Box(2823)),
+Box(Box(2824)),
+Box(Box(2825)),
+Box(Box(2826)),
+Box(Box(2827)),
+Box(Box(2828)),
+Box(Box(2829)),
+Box(Box(2830)),
+Box(Box(2831)),
+Box(Box(2832)),
+Box(Box(2833)),
+Box(Box(2834)),
+Box(Box(2835)),
+Box(Box(2836)),
+Box(Box(2837)),
+Box(Box(2838)),
+Box(Box(2839)),
+Box(Box(2840)),
+Box(Box(2841)),
+Box(Box(2842)),
+Box(Box(2843)),
+Box(Box(2844)),
+Box(Box(2845)),
+Box(Box(2846)),
+Box(Box(2847)),
+Box(Box(2848)),
+Box(Box(2849)),
+Box(Box(2850)),
+Box(Box(2851)),
+Box(Box(2852)),
+Box(Box(2853)),
+Box(Box(2854)),
+Box(Box(2855)),
+Box(Box(2856)),
+Box(Box(2857)),
+Box(Box(2858)),
+Box(Box(2859)),
+Box(Box(2860)),
+Box(Box(2861)),
+Box(Box(2862)),
+Box(Box(2863)),
+Box(Box(2864)),
+Box(Box(2865)),
+Box(Box(2866)),
+Box(Box(2867)),
+Box(Box(2868)),
+Box(Box(2869)),
+Box(Box(2870)),
+Box(Box(2871)),
+Box(Box(2872)),
+Box(Box(2873)),
+Box(Box(2874)),
+Box(Box(2875)),
+Box(Box(2876)),
+Box(Box(2877)),
+Box(Box(2878)),
+Box(Box(2879)),
+Box(Box(2880)),
+Box(Box(2881)),
+Box(Box(2882)),
+Box(Box(2883)),
+Box(Box(2884)),
+Box(Box(2885)),
+Box(Box(2886)),
+Box(Box(2887)),
+Box(Box(2888)),
+Box(Box(2889)),
+Box(Box(2890)),
+Box(Box(2891)),
+Box(Box(2892)),
+Box(Box(2893)),
+Box(Box(2894)),
+Box(Box(2895)),
+Box(Box(2896)),
+Box(Box(2897)),
+Box(Box(2898)),
+Box(Box(2899)),
+Box(Box(2900)),
+Box(Box(2901)),
+Box(Box(2902)),
+Box(Box(2903)),
+Box(Box(2904)),
+Box(Box(2905)),
+Box(Box(2906)),
+Box(Box(2907)),
+Box(Box(2908)),
+Box(Box(2909)),
+Box(Box(2910)),
+Box(Box(2911)),
+Box(Box(2912)),
+Box(Box(2913)),
+Box(Box(2914)),
+Box(Box(2915)),
+Box(Box(2916)),
+Box(Box(2917)),
+Box(Box(2918)),
+Box(Box(2919)),
+Box(Box(2920)),
+Box(Box(2921)),
+Box(Box(2922)),
+Box(Box(2923)),
+Box(Box(2924)),
+Box(Box(2925)),
+Box(Box(2926)),
+Box(Box(2927)),
+Box(Box(2928)),
+Box(Box(2929)),
+Box(Box(2930)),
+Box(Box(2931)),
+Box(Box(2932)),
+Box(Box(2933)),
+Box(Box(2934)),
+Box(Box(2935)),
+Box(Box(2936)),
+Box(Box(2937)),
+Box(Box(2938)),
+Box(Box(2939)),
+Box(Box(2940)),
+Box(Box(2941)),
+Box(Box(2942)),
+Box(Box(2943)),
+Box(Box(2944)),
+Box(Box(2945)),
+Box(Box(2946)),
+Box(Box(2947)),
+Box(Box(2948)),
+Box(Box(2949)),
+Box(Box(2950)),
+Box(Box(2951)),
+Box(Box(2952)),
+Box(Box(2953)),
+Box(Box(2954)),
+Box(Box(2955)),
+Box(Box(2956)),
+Box(Box(2957)),
+Box(Box(2958)),
+Box(Box(2959)),
+Box(Box(2960)),
+Box(Box(2961)),
+Box(Box(2962)),
+Box(Box(2963)),
+Box(Box(2964)),
+Box(Box(2965)),
+Box(Box(2966)),
+Box(Box(2967)),
+Box(Box(2968)),
+Box(Box(2969)),
+Box(Box(2970)),
+Box(Box(2971)),
+Box(Box(2972)),
+Box(Box(2973)),
+Box(Box(2974)),
+Box(Box(2975)),
+Box(Box(2976)),
+Box(Box(2977)),
+Box(Box(2978)),
+Box(Box(2979)),
+Box(Box(2980)),
+Box(Box(2981)),
+Box(Box(2982)),
+Box(Box(2983)),
+Box(Box(2984)),
+Box(Box(2985)),
+Box(Box(2986)),
+Box(Box(2987)),
+Box(Box(2988)),
+Box(Box(2989)),
+Box(Box(2990)),
+Box(Box(2991)),
+Box(Box(2992)),
+Box(Box(2993)),
+Box(Box(2994)),
+Box(Box(2995)),
+Box(Box(2996)),
+Box(Box(2997)),
+Box(Box(2998)),
+Box(Box(2999)),
+Box(Box(3000)),
+Box(Box(3001)),
+Box(Box(3002)),
+Box(Box(3003)),
+Box(Box(3004)),
+Box(Box(3005)),
+Box(Box(3006)),
+Box(Box(3007)),
+Box(Box(3008)),
+Box(Box(3009)),
+Box(Box(3010)),
+Box(Box(3011)),
+Box(Box(3012)),
+Box(Box(3013)),
+Box(Box(3014)),
+Box(Box(3015)),
+Box(Box(3016)),
+Box(Box(3017)),
+Box(Box(3018)),
+Box(Box(3019)),
+Box(Box(3020)),
+Box(Box(3021)),
+Box(Box(3022)),
+Box(Box(3023)),
+Box(Box(3024)),
+Box(Box(3025)),
+Box(Box(3026)),
+Box(Box(3027)),
+Box(Box(3028)),
+Box(Box(3029)),
+Box(Box(3030)),
+Box(Box(3031)),
+Box(Box(3032)),
+Box(Box(3033)),
+Box(Box(3034)),
+Box(Box(3035)),
+Box(Box(3036)),
+Box(Box(3037)),
+Box(Box(3038)),
+Box(Box(3039)),
+Box(Box(3040)),
+Box(Box(3041)),
+Box(Box(3042)),
+Box(Box(3043)),
+Box(Box(3044)),
+Box(Box(3045)),
+Box(Box(3046)),
+Box(Box(3047)),
+Box(Box(3048)),
+Box(Box(3049)),
+Box(Box(3050)),
+Box(Box(3051)),
+Box(Box(3052)),
+Box(Box(3053)),
+Box(Box(3054)),
+Box(Box(3055)),
+Box(Box(3056)),
+Box(Box(3057)),
+Box(Box(3058)),
+Box(Box(3059)),
+Box(Box(3060)),
+Box(Box(3061)),
+Box(Box(3062)),
+Box(Box(3063)),
+Box(Box(3064)),
+Box(Box(3065)),
+Box(Box(3066)),
+Box(Box(3067)),
+Box(Box(3068)),
+Box(Box(3069)),
+Box(Box(3070)),
+Box(Box(3071)),
+Box(Box(3072)),
+Box(Box(3073)),
+Box(Box(3074)),
+Box(Box(3075)),
+Box(Box(3076)),
+Box(Box(3077)),
+Box(Box(3078)),
+Box(Box(3079)),
+Box(Box(3080)),
+Box(Box(3081)),
+Box(Box(3082)),
+Box(Box(3083)),
+Box(Box(3084)),
+Box(Box(3085)),
+Box(Box(3086)),
+Box(Box(3087)),
+Box(Box(3088)),
+Box(Box(3089)),
+Box(Box(3090)),
+Box(Box(3091)),
+Box(Box(3092)),
+Box(Box(3093)),
+Box(Box(3094)),
+Box(Box(3095)),
+Box(Box(3096)),
+Box(Box(3097)),
+Box(Box(3098)),
+Box(Box(3099)),
+Box(Box(3100)),
+Box(Box(3101)),
+Box(Box(3102)),
+Box(Box(3103)),
+Box(Box(3104)),
+Box(Box(3105)),
+Box(Box(3106)),
+Box(Box(3107)),
+Box(Box(3108)),
+Box(Box(3109)),
+Box(Box(3110)),
+Box(Box(3111)),
+Box(Box(3112)),
+Box(Box(3113)),
+Box(Box(3114)),
+Box(Box(3115)),
+Box(Box(3116)),
+Box(Box(3117)),
+Box(Box(3118)),
+Box(Box(3119)),
+Box(Box(3120)),
+Box(Box(3121)),
+Box(Box(3122)),
+Box(Box(3123)),
+Box(Box(3124)),
+Box(Box(3125)),
+Box(Box(3126)),
+Box(Box(3127)),
+Box(Box(3128)),
+Box(Box(3129)),
+Box(Box(3130)),
+Box(Box(3131)),
+Box(Box(3132)),
+Box(Box(3133)),
+Box(Box(3134)),
+Box(Box(3135)),
+Box(Box(3136)),
+Box(Box(3137)),
+Box(Box(3138)),
+Box(Box(3139)),
+Box(Box(3140)),
+Box(Box(3141)),
+Box(Box(3142)),
+Box(Box(3143)),
+Box(Box(3144)),
+Box(Box(3145)),
+Box(Box(3146)),
+Box(Box(3147)),
+Box(Box(3148)),
+Box(Box(3149)),
+Box(Box(3150)),
+Box(Box(3151)),
+Box(Box(3152)),
+Box(Box(3153)),
+Box(Box(3154)),
+Box(Box(3155)),
+Box(Box(3156)),
+Box(Box(3157)),
+Box(Box(3158)),
+Box(Box(3159)),
+Box(Box(3160)),
+Box(Box(3161)),
+Box(Box(3162)),
+Box(Box(3163)),
+Box(Box(3164)),
+Box(Box(3165)),
+Box(Box(3166)),
+Box(Box(3167)),
+Box(Box(3168)),
+Box(Box(3169)),
+Box(Box(3170)),
+Box(Box(3171)),
+Box(Box(3172)),
+Box(Box(3173)),
+Box(Box(3174)),
+Box(Box(3175)),
+Box(Box(3176)),
+Box(Box(3177)),
+Box(Box(3178)),
+Box(Box(3179)),
+Box(Box(3180)),
+Box(Box(3181)),
+Box(Box(3182)),
+Box(Box(3183)),
+Box(Box(3184)),
+Box(Box(3185)),
+Box(Box(3186)),
+Box(Box(3187)),
+Box(Box(3188)),
+Box(Box(3189)),
+Box(Box(3190)),
+Box(Box(3191)),
+Box(Box(3192)),
+Box(Box(3193)),
+Box(Box(3194)),
+Box(Box(3195)),
+Box(Box(3196)),
+Box(Box(3197)),
+Box(Box(3198)),
+Box(Box(3199)),
+Box(Box(3200)),
+Box(Box(3201)),
+Box(Box(3202)),
+Box(Box(3203)),
+Box(Box(3204)),
+Box(Box(3205)),
+Box(Box(3206)),
+Box(Box(3207)),
+Box(Box(3208)),
+Box(Box(3209)),
+Box(Box(3210)),
+Box(Box(3211)),
+Box(Box(3212)),
+Box(Box(3213)),
+Box(Box(3214)),
+Box(Box(3215)),
+Box(Box(3216)),
+Box(Box(3217)),
+Box(Box(3218)),
+Box(Box(3219)),
+Box(Box(3220)),
+Box(Box(3221)),
+Box(Box(3222)),
+Box(Box(3223)),
+Box(Box(3224)),
+Box(Box(3225)),
+Box(Box(3226)),
+Box(Box(3227)),
+Box(Box(3228)),
+Box(Box(3229)),
+Box(Box(3230)),
+Box(Box(3231)),
+Box(Box(3232)),
+Box(Box(3233)),
+Box(Box(3234)),
+Box(Box(3235)),
+Box(Box(3236)),
+Box(Box(3237)),
+Box(Box(3238)),
+Box(Box(3239)),
+Box(Box(3240)),
+Box(Box(3241)),
+Box(Box(3242)),
+Box(Box(3243)),
+Box(Box(3244)),
+Box(Box(3245)),
+Box(Box(3246)),
+Box(Box(3247)),
+Box(Box(3248)),
+Box(Box(3249)),
+Box(Box(3250)),
+Box(Box(3251)),
+Box(Box(3252)),
+Box(Box(3253)),
+Box(Box(3254)),
+Box(Box(3255)),
+Box(Box(3256)),
+Box(Box(3257)),
+Box(Box(3258)),
+Box(Box(3259)),
+Box(Box(3260)),
+Box(Box(3261)),
+Box(Box(3262)),
+Box(Box(3263)),
+Box(Box(3264)),
+Box(Box(3265)),
+Box(Box(3266)),
+Box(Box(3267)),
+Box(Box(3268)),
+Box(Box(3269)),
+Box(Box(3270)),
+Box(Box(3271)),
+Box(Box(3272)),
+Box(Box(3273)),
+Box(Box(3274)),
+Box(Box(3275)),
+Box(Box(3276)),
+Box(Box(3277)),
+Box(Box(3278)),
+Box(Box(3279)),
+Box(Box(3280)),
+Box(Box(3281)),
+Box(Box(3282)),
+Box(Box(3283)),
+Box(Box(3284)),
+Box(Box(3285)),
+Box(Box(3286)),
+Box(Box(3287)),
+Box(Box(3288)),
+Box(Box(3289)),
+Box(Box(3290)),
+Box(Box(3291)),
+Box(Box(3292)),
+Box(Box(3293)),
+Box(Box(3294)),
+Box(Box(3295)),
+Box(Box(3296)),
+Box(Box(3297)),
+Box(Box(3298)),
+Box(Box(3299)),
+Box(Box(3300)),
+Box(Box(3301)),
+Box(Box(3302)),
+Box(Box(3303)),
+Box(Box(3304)),
+Box(Box(3305)),
+Box(Box(3306)),
+Box(Box(3307)),
+Box(Box(3308)),
+Box(Box(3309)),
+Box(Box(3310)),
+Box(Box(3311)),
+Box(Box(3312)),
+Box(Box(3313)),
+Box(Box(3314)),
+Box(Box(3315)),
+Box(Box(3316)),
+Box(Box(3317)),
+Box(Box(3318)),
+Box(Box(3319)),
+Box(Box(3320)),
+Box(Box(3321)),
+Box(Box(3322)),
+Box(Box(3323)),
+Box(Box(3324)),
+Box(Box(3325)),
+Box(Box(3326)),
+Box(Box(3327)),
+Box(Box(3328)),
+Box(Box(3329)),
+Box(Box(3330)),
+Box(Box(3331)),
+Box(Box(3332)),
+Box(Box(3333)),
+Box(Box(3334)),
+Box(Box(3335)),
+Box(Box(3336)),
+Box(Box(3337)),
+Box(Box(3338)),
+Box(Box(3339)),
+Box(Box(3340)),
+Box(Box(3341)),
+Box(Box(3342)),
+Box(Box(3343)),
+Box(Box(3344)),
+Box(Box(3345)),
+Box(Box(3346)),
+Box(Box(3347)),
+Box(Box(3348)),
+Box(Box(3349)),
+Box(Box(3350)),
+Box(Box(3351)),
+Box(Box(3352)),
+Box(Box(3353)),
+Box(Box(3354)),
+Box(Box(3355)),
+Box(Box(3356)),
+Box(Box(3357)),
+Box(Box(3358)),
+Box(Box(3359)),
+Box(Box(3360)),
+Box(Box(3361)),
+Box(Box(3362)),
+Box(Box(3363)),
+Box(Box(3364)),
+Box(Box(3365)),
+Box(Box(3366)),
+Box(Box(3367)),
+Box(Box(3368)),
+Box(Box(3369)),
+Box(Box(3370)),
+Box(Box(3371)),
+Box(Box(3372)),
+Box(Box(3373)),
+Box(Box(3374)),
+Box(Box(3375)),
+Box(Box(3376)),
+Box(Box(3377)),
+Box(Box(3378)),
+Box(Box(3379)),
+Box(Box(3380)),
+Box(Box(3381)),
+Box(Box(3382)),
+Box(Box(3383)),
+Box(Box(3384)),
+Box(Box(3385)),
+Box(Box(3386)),
+Box(Box(3387)),
+Box(Box(3388)),
+Box(Box(3389)),
+Box(Box(3390)),
+Box(Box(3391)),
+Box(Box(3392)),
+Box(Box(3393)),
+Box(Box(3394)),
+Box(Box(3395)),
+Box(Box(3396)),
+Box(Box(3397)),
+Box(Box(3398)),
+Box(Box(3399)),
+Box(Box(3400)),
+Box(Box(3401)),
+Box(Box(3402)),
+Box(Box(3403)),
+Box(Box(3404)),
+Box(Box(3405)),
+Box(Box(3406)),
+Box(Box(3407)),
+Box(Box(3408)),
+Box(Box(3409)),
+Box(Box(3410)),
+Box(Box(3411)),
+Box(Box(3412)),
+Box(Box(3413)),
+Box(Box(3414)),
+Box(Box(3415)),
+Box(Box(3416)),
+Box(Box(3417)),
+Box(Box(3418)),
+Box(Box(3419)),
+Box(Box(3420)),
+Box(Box(3421)),
+Box(Box(3422)),
+Box(Box(3423)),
+Box(Box(3424)),
+Box(Box(3425)),
+Box(Box(3426)),
+Box(Box(3427)),
+Box(Box(3428)),
+Box(Box(3429)),
+Box(Box(3430)),
+Box(Box(3431)),
+Box(Box(3432)),
+Box(Box(3433)),
+Box(Box(3434)),
+Box(Box(3435)),
+Box(Box(3436)),
+Box(Box(3437)),
+Box(Box(3438)),
+Box(Box(3439)),
+Box(Box(3440)),
+Box(Box(3441)),
+Box(Box(3442)),
+Box(Box(3443)),
+Box(Box(3444)),
+Box(Box(3445)),
+Box(Box(3446)),
+Box(Box(3447)),
+Box(Box(3448)),
+Box(Box(3449)),
+Box(Box(3450)),
+Box(Box(3451)),
+Box(Box(3452)),
+Box(Box(3453)),
+Box(Box(3454)),
+Box(Box(3455)),
+Box(Box(3456)),
+Box(Box(3457)),
+Box(Box(3458)),
+Box(Box(3459)),
+Box(Box(3460)),
+Box(Box(3461)),
+Box(Box(3462)),
+Box(Box(3463)),
+Box(Box(3464)),
+Box(Box(3465)),
+Box(Box(3466)),
+Box(Box(3467)),
+Box(Box(3468)),
+Box(Box(3469)),
+Box(Box(3470)),
+Box(Box(3471)),
+Box(Box(3472)),
+Box(Box(3473)),
+Box(Box(3474)),
+Box(Box(3475)),
+Box(Box(3476)),
+Box(Box(3477)),
+Box(Box(3478)),
+Box(Box(3479)),
+Box(Box(3480)),
+Box(Box(3481)),
+Box(Box(3482)),
+Box(Box(3483)),
+Box(Box(3484)),
+Box(Box(3485)),
+Box(Box(3486)),
+Box(Box(3487)),
+Box(Box(3488)),
+Box(Box(3489)),
+Box(Box(3490)),
+Box(Box(3491)),
+Box(Box(3492)),
+Box(Box(3493)),
+Box(Box(3494)),
+Box(Box(3495)),
+Box(Box(3496)),
+Box(Box(3497)),
+Box(Box(3498)),
+Box(Box(3499)),
+Box(Box(3500)),
+Box(Box(3501)),
+Box(Box(3502)),
+Box(Box(3503)),
+Box(Box(3504)),
+Box(Box(3505)),
+Box(Box(3506)),
+Box(Box(3507)),
+Box(Box(3508)),
+Box(Box(3509)),
+Box(Box(3510)),
+Box(Box(3511)),
+Box(Box(3512)),
+Box(Box(3513)),
+Box(Box(3514)),
+Box(Box(3515)),
+Box(Box(3516)),
+Box(Box(3517)),
+Box(Box(3518)),
+Box(Box(3519)),
+Box(Box(3520)),
+Box(Box(3521)),
+Box(Box(3522)),
+Box(Box(3523)),
+Box(Box(3524)),
+Box(Box(3525)),
+Box(Box(3526)),
+Box(Box(3527)),
+Box(Box(3528)),
+Box(Box(3529)),
+Box(Box(3530)),
+Box(Box(3531)),
+Box(Box(3532)),
+Box(Box(3533)),
+Box(Box(3534)),
+Box(Box(3535)),
+Box(Box(3536)),
+Box(Box(3537)),
+Box(Box(3538)),
+Box(Box(3539)),
+Box(Box(3540)),
+Box(Box(3541)),
+Box(Box(3542)),
+Box(Box(3543)),
+Box(Box(3544)),
+Box(Box(3545)),
+Box(Box(3546)),
+Box(Box(3547)),
+Box(Box(3548)),
+Box(Box(3549)),
+Box(Box(3550)),
+Box(Box(3551)),
+Box(Box(3552)),
+Box(Box(3553)),
+Box(Box(3554)),
+Box(Box(3555)),
+Box(Box(3556)),
+Box(Box(3557)),
+Box(Box(3558)),
+Box(Box(3559)),
+Box(Box(3560)),
+Box(Box(3561)),
+Box(Box(3562)),
+Box(Box(3563)),
+Box(Box(3564)),
+Box(Box(3565)),
+Box(Box(3566)),
+Box(Box(3567)),
+Box(Box(3568)),
+Box(Box(3569)),
+Box(Box(3570)),
+Box(Box(3571)),
+Box(Box(3572)),
+Box(Box(3573)),
+Box(Box(3574)),
+Box(Box(3575)),
+Box(Box(3576)),
+Box(Box(3577)),
+Box(Box(3578)),
+Box(Box(3579)),
+Box(Box(3580)),
+Box(Box(3581)),
+Box(Box(3582)),
+Box(Box(3583)),
+Box(Box(3584)),
+Box(Box(3585)),
+Box(Box(3586)),
+Box(Box(3587)),
+Box(Box(3588)),
+Box(Box(3589)),
+Box(Box(3590)),
+Box(Box(3591)),
+Box(Box(3592)),
+Box(Box(3593)),
+Box(Box(3594)),
+Box(Box(3595)),
+Box(Box(3596)),
+Box(Box(3597)),
+Box(Box(3598)),
+Box(Box(3599)),
+Box(Box(3600)),
+Box(Box(3601)),
+Box(Box(3602)),
+Box(Box(3603)),
+Box(Box(3604)),
+Box(Box(3605)),
+Box(Box(3606)),
+Box(Box(3607)),
+Box(Box(3608)),
+Box(Box(3609)),
+Box(Box(3610)),
+Box(Box(3611)),
+Box(Box(3612)),
+Box(Box(3613)),
+Box(Box(3614)),
+Box(Box(3615)),
+Box(Box(3616)),
+Box(Box(3617)),
+Box(Box(3618)),
+Box(Box(3619)),
+Box(Box(3620)),
+Box(Box(3621)),
+Box(Box(3622)),
+Box(Box(3623)),
+Box(Box(3624)),
+Box(Box(3625)),
+Box(Box(3626)),
+Box(Box(3627)),
+Box(Box(3628)),
+Box(Box(3629)),
+Box(Box(3630)),
+Box(Box(3631)),
+Box(Box(3632)),
+Box(Box(3633)),
+Box(Box(3634)),
+Box(Box(3635)),
+Box(Box(3636)),
+Box(Box(3637)),
+Box(Box(3638)),
+Box(Box(3639)),
+Box(Box(3640)),
+Box(Box(3641)),
+Box(Box(3642)),
+Box(Box(3643)),
+Box(Box(3644)),
+Box(Box(3645)),
+Box(Box(3646)),
+Box(Box(3647)),
+Box(Box(3648)),
+Box(Box(3649)),
+Box(Box(3650)),
+Box(Box(3651)),
+Box(Box(3652)),
+Box(Box(3653)),
+Box(Box(3654)),
+Box(Box(3655)),
+Box(Box(3656)),
+Box(Box(3657)),
+Box(Box(3658)),
+Box(Box(3659)),
+Box(Box(3660)),
+Box(Box(3661)),
+Box(Box(3662)),
+Box(Box(3663)),
+Box(Box(3664)),
+Box(Box(3665)),
+Box(Box(3666)),
+Box(Box(3667)),
+Box(Box(3668)),
+Box(Box(3669)),
+Box(Box(3670)),
+Box(Box(3671)),
+Box(Box(3672)),
+Box(Box(3673)),
+Box(Box(3674)),
+Box(Box(3675)),
+Box(Box(3676)),
+Box(Box(3677)),
+Box(Box(3678)),
+Box(Box(3679)),
+Box(Box(3680)),
+Box(Box(3681)),
+Box(Box(3682)),
+Box(Box(3683)),
+Box(Box(3684)),
+Box(Box(3685)),
+Box(Box(3686)),
+Box(Box(3687)),
+Box(Box(3688)),
+Box(Box(3689)),
+Box(Box(3690)),
+Box(Box(3691)),
+Box(Box(3692)),
+Box(Box(3693)),
+Box(Box(3694)),
+Box(Box(3695)),
+Box(Box(3696)),
+Box(Box(3697)),
+Box(Box(3698)),
+Box(Box(3699)),
+Box(Box(3700)),
+Box(Box(3701)),
+Box(Box(3702)),
+Box(Box(3703)),
+Box(Box(3704)),
+Box(Box(3705)),
+Box(Box(3706)),
+Box(Box(3707)),
+Box(Box(3708)),
+Box(Box(3709)),
+Box(Box(3710)),
+Box(Box(3711)),
+Box(Box(3712)),
+Box(Box(3713)),
+Box(Box(3714)),
+Box(Box(3715)),
+Box(Box(3716)),
+Box(Box(3717)),
+Box(Box(3718)),
+Box(Box(3719)),
+Box(Box(3720)),
+Box(Box(3721)),
+Box(Box(3722)),
+Box(Box(3723)),
+Box(Box(3724)),
+Box(Box(3725)),
+Box(Box(3726)),
+Box(Box(3727)),
+Box(Box(3728)),
+Box(Box(3729)),
+Box(Box(3730)),
+Box(Box(3731)),
+Box(Box(3732)),
+Box(Box(3733)),
+Box(Box(3734)),
+Box(Box(3735)),
+Box(Box(3736)),
+Box(Box(3737)),
+Box(Box(3738)),
+Box(Box(3739)),
+Box(Box(3740)),
+Box(Box(3741)),
+Box(Box(3742)),
+Box(Box(3743)),
+Box(Box(3744)),
+Box(Box(3745)),
+Box(Box(3746)),
+Box(Box(3747)),
+Box(Box(3748)),
+Box(Box(3749)),
+Box(Box(3750)),
+Box(Box(3751)),
+Box(Box(3752)),
+Box(Box(3753)),
+Box(Box(3754)),
+Box(Box(3755)),
+Box(Box(3756)),
+Box(Box(3757)),
+Box(Box(3758)),
+Box(Box(3759)),
+Box(Box(3760)),
+Box(Box(3761)),
+Box(Box(3762)),
+Box(Box(3763)),
+Box(Box(3764)),
+Box(Box(3765)),
+Box(Box(3766)),
+Box(Box(3767)),
+Box(Box(3768)),
+Box(Box(3769)),
+Box(Box(3770)),
+Box(Box(3771)),
+Box(Box(3772)),
+Box(Box(3773)),
+Box(Box(3774)),
+Box(Box(3775)),
+Box(Box(3776)),
+Box(Box(3777)),
+Box(Box(3778)),
+Box(Box(3779)),
+Box(Box(3780)),
+Box(Box(3781)),
+Box(Box(3782)),
+Box(Box(3783)),
+Box(Box(3784)),
+Box(Box(3785)),
+Box(Box(3786)),
+Box(Box(3787)),
+Box(Box(3788)),
+Box(Box(3789)),
+Box(Box(3790)),
+Box(Box(3791)),
+Box(Box(3792)),
+Box(Box(3793)),
+Box(Box(3794)),
+Box(Box(3795)),
+Box(Box(3796)),
+Box(Box(3797)),
+Box(Box(3798)),
+Box(Box(3799)),
+Box(Box(3800)),
+Box(Box(3801)),
+Box(Box(3802)),
+Box(Box(3803)),
+Box(Box(3804)),
+Box(Box(3805)),
+Box(Box(3806)),
+Box(Box(3807)),
+Box(Box(3808)),
+Box(Box(3809)),
+Box(Box(3810)),
+Box(Box(3811)),
+Box(Box(3812)),
+Box(Box(3813)),
+Box(Box(3814)),
+Box(Box(3815)),
+Box(Box(3816)),
+Box(Box(3817)),
+Box(Box(3818)),
+Box(Box(3819)),
+Box(Box(3820)),
+Box(Box(3821)),
+Box(Box(3822)),
+Box(Box(3823)),
+Box(Box(3824)),
+Box(Box(3825)),
+Box(Box(3826)),
+Box(Box(3827)),
+Box(Box(3828)),
+Box(Box(3829)),
+Box(Box(3830)),
+Box(Box(3831)),
+Box(Box(3832)),
+Box(Box(3833)),
+Box(Box(3834)),
+Box(Box(3835)),
+Box(Box(3836)),
+Box(Box(3837)),
+Box(Box(3838)),
+Box(Box(3839)),
+Box(Box(3840)),
+Box(Box(3841)),
+Box(Box(3842)),
+Box(Box(3843)),
+Box(Box(3844)),
+Box(Box(3845)),
+Box(Box(3846)),
+Box(Box(3847)),
+Box(Box(3848)),
+Box(Box(3849)),
+Box(Box(3850)),
+Box(Box(3851)),
+Box(Box(3852)),
+Box(Box(3853)),
+Box(Box(3854)),
+Box(Box(3855)),
+Box(Box(3856)),
+Box(Box(3857)),
+Box(Box(3858)),
+Box(Box(3859)),
+Box(Box(3860)),
+Box(Box(3861)),
+Box(Box(3862)),
+Box(Box(3863)),
+Box(Box(3864)),
+Box(Box(3865)),
+Box(Box(3866)),
+Box(Box(3867)),
+Box(Box(3868)),
+Box(Box(3869)),
+Box(Box(3870)),
+Box(Box(3871)),
+Box(Box(3872)),
+Box(Box(3873)),
+Box(Box(3874)),
+Box(Box(3875)),
+Box(Box(3876)),
+Box(Box(3877)),
+Box(Box(3878)),
+Box(Box(3879)),
+Box(Box(3880)),
+Box(Box(3881)),
+Box(Box(3882)),
+Box(Box(3883)),
+Box(Box(3884)),
+Box(Box(3885)),
+Box(Box(3886)),
+Box(Box(3887)),
+Box(Box(3888)),
+Box(Box(3889)),
+Box(Box(3890)),
+Box(Box(3891)),
+Box(Box(3892)),
+Box(Box(3893)),
+Box(Box(3894)),
+Box(Box(3895)),
+Box(Box(3896)),
+Box(Box(3897)),
+Box(Box(3898)),
+Box(Box(3899)),
+Box(Box(3900)),
+Box(Box(3901)),
+Box(Box(3902)),
+Box(Box(3903)),
+Box(Box(3904)),
+Box(Box(3905)),
+Box(Box(3906)),
+Box(Box(3907)),
+Box(Box(3908)),
+Box(Box(3909)),
+Box(Box(3910)),
+Box(Box(3911)),
+Box(Box(3912)),
+Box(Box(3913)),
+Box(Box(3914)),
+Box(Box(3915)),
+Box(Box(3916)),
+Box(Box(3917)),
+Box(Box(3918)),
+Box(Box(3919)),
+Box(Box(3920)),
+Box(Box(3921)),
+Box(Box(3922)),
+Box(Box(3923)),
+Box(Box(3924)),
+Box(Box(3925)),
+Box(Box(3926)),
+Box(Box(3927)),
+Box(Box(3928)),
+Box(Box(3929)),
+Box(Box(3930)),
+Box(Box(3931)),
+Box(Box(3932)),
+Box(Box(3933)),
+Box(Box(3934)),
+Box(Box(3935)),
+Box(Box(3936)),
+Box(Box(3937)),
+Box(Box(3938)),
+Box(Box(3939)),
+Box(Box(3940)),
+Box(Box(3941)),
+Box(Box(3942)),
+Box(Box(3943)),
+Box(Box(3944)),
+Box(Box(3945)),
+Box(Box(3946)),
+Box(Box(3947)),
+Box(Box(3948)),
+Box(Box(3949)),
+Box(Box(3950)),
+Box(Box(3951)),
+Box(Box(3952)),
+Box(Box(3953)),
+Box(Box(3954)),
+Box(Box(3955)),
+Box(Box(3956)),
+Box(Box(3957)),
+Box(Box(3958)),
+Box(Box(3959)),
+Box(Box(3960)),
+Box(Box(3961)),
+Box(Box(3962)),
+Box(Box(3963)),
+Box(Box(3964)),
+Box(Box(3965)),
+Box(Box(3966)),
+Box(Box(3967)),
+Box(Box(3968)),
+Box(Box(3969)),
+Box(Box(3970)),
+Box(Box(3971)),
+Box(Box(3972)),
+Box(Box(3973)),
+Box(Box(3974)),
+Box(Box(3975)),
+Box(Box(3976)),
+Box(Box(3977)),
+Box(Box(3978)),
+Box(Box(3979)),
+Box(Box(3980)),
+Box(Box(3981)),
+Box(Box(3982)),
+Box(Box(3983)),
+Box(Box(3984)),
+Box(Box(3985)),
+Box(Box(3986)),
+Box(Box(3987)),
+Box(Box(3988)),
+Box(Box(3989)),
+Box(Box(3990)),
+Box(Box(3991)),
+Box(Box(3992)),
+Box(Box(3993)),
+Box(Box(3994)),
+Box(Box(3995)),
+Box(Box(3996)),
+Box(Box(3997)),
+Box(Box(3998)),
+Box(Box(3999)),
+Box(Box(4000)),
+Box(Box(4001)),
+Box(Box(4002)),
+Box(Box(4003)),
+Box(Box(4004)),
+Box(Box(4005)),
+Box(Box(4006)),
+Box(Box(4007)),
+Box(Box(4008)),
+Box(Box(4009)),
+Box(Box(4010)),
+Box(Box(4011)),
+Box(Box(4012)),
+Box(Box(4013)),
+Box(Box(4014)),
+Box(Box(4015)),
+Box(Box(4016)),
+Box(Box(4017)),
+Box(Box(4018)),
+Box(Box(4019)),
+Box(Box(4020)),
+Box(Box(4021)),
+Box(Box(4022)),
+Box(Box(4023)),
+Box(Box(4024)),
+Box(Box(4025)),
+Box(Box(4026)),
+Box(Box(4027)),
+Box(Box(4028)),
+Box(Box(4029)),
+Box(Box(4030)),
+Box(Box(4031)),
+Box(Box(4032)),
+Box(Box(4033)),
+Box(Box(4034)),
+Box(Box(4035)),
+Box(Box(4036)),
+Box(Box(4037)),
+Box(Box(4038)),
+Box(Box(4039)),
+Box(Box(4040)),
+Box(Box(4041)),
+Box(Box(4042)),
+Box(Box(4043)),
+Box(Box(4044)),
+Box(Box(4045)),
+Box(Box(4046)),
+Box(Box(4047)),
+Box(Box(4048)),
+Box(Box(4049)),
+Box(Box(4050)),
+Box(Box(4051)),
+Box(Box(4052)),
+Box(Box(4053)),
+Box(Box(4054)),
+Box(Box(4055)),
+Box(Box(4056)),
+Box(Box(4057)),
+Box(Box(4058)),
+Box(Box(4059)),
+Box(Box(4060)),
+Box(Box(4061)),
+Box(Box(4062)),
+Box(Box(4063)),
+Box(Box(4064)),
+Box(Box(4065)),
+Box(Box(4066)),
+Box(Box(4067)),
+Box(Box(4068)),
+Box(Box(4069)),
+Box(Box(4070)),
+Box(Box(4071)),
+Box(Box(4072)),
+Box(Box(4073)),
+Box(Box(4074)),
+Box(Box(4075)),
+Box(Box(4076)),
+Box(Box(4077)),
+Box(Box(4078)),
+Box(Box(4079)),
+Box(Box(4080)),
+Box(Box(4081)),
+Box(Box(4082)),
+Box(Box(4083)),
+Box(Box(4084)),
+Box(Box(4085)),
+Box(Box(4086)),
+Box(Box(4087)),
+Box(Box(4088)),
+Box(Box(4089)),
+Box(Box(4090)),
+Box(Box(4091)),
+Box(Box(4092)),
+Box(Box(4093)),
+Box(Box(4094)),
+Box(Box(4095)),
+Box(Box(4096)),
+Box(Box(4097)),
+Box(Box(4098)),
+Box(Box(4099)),
+Box(Box(4100)),
+Box(Box(4101)),
+Box(Box(4102)),
+Box(Box(4103)),
+Box(Box(4104)),
+Box(Box(4105)),
+Box(Box(4106)),
+Box(Box(4107)),
+Box(Box(4108)),
+Box(Box(4109)),
+Box(Box(4110)),
+Box(Box(4111)),
+Box(Box(4112)),
+Box(Box(4113)),
+Box(Box(4114)),
+Box(Box(4115)),
+Box(Box(4116)),
+Box(Box(4117)),
+Box(Box(4118)),
+Box(Box(4119)),
+Box(Box(4120)),
+Box(Box(4121)),
+Box(Box(4122)),
+Box(Box(4123)),
+Box(Box(4124)),
+Box(Box(4125)),
+Box(Box(4126)),
+Box(Box(4127)),
+Box(Box(4128)),
+Box(Box(4129)),
+Box(Box(4130)),
+Box(Box(4131)),
+Box(Box(4132)),
+Box(Box(4133)),
+Box(Box(4134)),
+Box(Box(4135)),
+Box(Box(4136)),
+Box(Box(4137)),
+Box(Box(4138)),
+Box(Box(4139)),
+Box(Box(4140)),
+Box(Box(4141)),
+Box(Box(4142)),
+Box(Box(4143)),
+Box(Box(4144)),
+Box(Box(4145)),
+Box(Box(4146)),
+Box(Box(4147)),
+Box(Box(4148)),
+Box(Box(4149)),
+Box(Box(4150)),
+Box(Box(4151)),
+Box(Box(4152)),
+Box(Box(4153)),
+Box(Box(4154)),
+Box(Box(4155)),
+Box(Box(4156)),
+Box(Box(4157)),
+Box(Box(4158)),
+Box(Box(4159)),
+Box(Box(4160)),
+Box(Box(4161)),
+Box(Box(4162)),
+Box(Box(4163)),
+Box(Box(4164)),
+Box(Box(4165)),
+Box(Box(4166)),
+Box(Box(4167)),
+Box(Box(4168)),
+Box(Box(4169)),
+Box(Box(4170)),
+Box(Box(4171)),
+Box(Box(4172)),
+Box(Box(4173)),
+Box(Box(4174)),
+Box(Box(4175)),
+Box(Box(4176)),
+Box(Box(4177)),
+Box(Box(4178)),
+Box(Box(4179)),
+Box(Box(4180)),
+Box(Box(4181)),
+Box(Box(4182)),
+Box(Box(4183)),
+Box(Box(4184)),
+Box(Box(4185)),
+Box(Box(4186)),
+Box(Box(4187)),
+Box(Box(4188)),
+Box(Box(4189)),
+Box(Box(4190)),
+Box(Box(4191)),
+Box(Box(4192)),
+Box(Box(4193)),
+Box(Box(4194)),
+Box(Box(4195)),
+Box(Box(4196)),
+Box(Box(4197)),
+Box(Box(4198)),
+Box(Box(4199)),
+Box(Box(4200)),
+Box(Box(4201)),
+Box(Box(4202)),
+Box(Box(4203)),
+Box(Box(4204)),
+Box(Box(4205)),
+Box(Box(4206)),
+Box(Box(4207)),
+Box(Box(4208)),
+Box(Box(4209)),
+Box(Box(4210)),
+Box(Box(4211)),
+Box(Box(4212)),
+Box(Box(4213)),
+Box(Box(4214)),
+Box(Box(4215)),
+Box(Box(4216)),
+Box(Box(4217)),
+Box(Box(4218)),
+Box(Box(4219)),
+Box(Box(4220)),
+Box(Box(4221)),
+Box(Box(4222)),
+Box(Box(4223)),
+Box(Box(4224)),
+Box(Box(4225)),
+Box(Box(4226)),
+Box(Box(4227)),
+Box(Box(4228)),
+Box(Box(4229)),
+Box(Box(4230)),
+Box(Box(4231)),
+Box(Box(4232)),
+Box(Box(4233)),
+Box(Box(4234)),
+Box(Box(4235)),
+Box(Box(4236)),
+Box(Box(4237)),
+Box(Box(4238)),
+Box(Box(4239)),
+Box(Box(4240)),
+Box(Box(4241)),
+Box(Box(4242)),
+Box(Box(4243)),
+Box(Box(4244)),
+Box(Box(4245)),
+Box(Box(4246)),
+Box(Box(4247)),
+Box(Box(4248)),
+Box(Box(4249)),
+Box(Box(4250)),
+Box(Box(4251)),
+Box(Box(4252)),
+Box(Box(4253)),
+Box(Box(4254)),
+Box(Box(4255)),
+Box(Box(4256)),
+Box(Box(4257)),
+Box(Box(4258)),
+Box(Box(4259)),
+Box(Box(4260)),
+Box(Box(4261)),
+Box(Box(4262)),
+Box(Box(4263)),
+Box(Box(4264)),
+Box(Box(4265)),
+Box(Box(4266)),
+Box(Box(4267)),
+Box(Box(4268)),
+Box(Box(4269)),
+Box(Box(4270)),
+Box(Box(4271)),
+Box(Box(4272)),
+Box(Box(4273)),
+Box(Box(4274)),
+Box(Box(4275)),
+Box(Box(4276)),
+Box(Box(4277)),
+Box(Box(4278)),
+Box(Box(4279)),
+Box(Box(4280)),
+Box(Box(4281)),
+Box(Box(4282)),
+Box(Box(4283)),
+Box(Box(4284)),
+Box(Box(4285)),
+Box(Box(4286)),
+Box(Box(4287)),
+Box(Box(4288)),
+Box(Box(4289)),
+Box(Box(4290)),
+Box(Box(4291)),
+Box(Box(4292)),
+Box(Box(4293)),
+Box(Box(4294)),
+Box(Box(4295)),
+Box(Box(4296)),
+Box(Box(4297)),
+Box(Box(4298)),
+Box(Box(4299)),
+Box(Box(4300)),
+Box(Box(4301)),
+Box(Box(4302)),
+Box(Box(4303)),
+Box(Box(4304)),
+Box(Box(4305)),
+Box(Box(4306)),
+Box(Box(4307)),
+Box(Box(4308)),
+Box(Box(4309)),
+Box(Box(4310)),
+Box(Box(4311)),
+Box(Box(4312)),
+Box(Box(4313)),
+Box(Box(4314)),
+Box(Box(4315)),
+Box(Box(4316)),
+Box(Box(4317)),
+Box(Box(4318)),
+Box(Box(4319)),
+Box(Box(4320)),
+Box(Box(4321)),
+Box(Box(4322)),
+Box(Box(4323)),
+Box(Box(4324)),
+Box(Box(4325)),
+Box(Box(4326)),
+Box(Box(4327)),
+Box(Box(4328)),
+Box(Box(4329)),
+Box(Box(4330)),
+Box(Box(4331)),
+Box(Box(4332)),
+Box(Box(4333)),
+Box(Box(4334)),
+Box(Box(4335)),
+Box(Box(4336)),
+Box(Box(4337)),
+Box(Box(4338)),
+Box(Box(4339)),
+Box(Box(4340)),
+Box(Box(4341)),
+Box(Box(4342)),
+Box(Box(4343)),
+Box(Box(4344)),
+Box(Box(4345)),
+Box(Box(4346)),
+Box(Box(4347)),
+Box(Box(4348)),
+Box(Box(4349)),
+Box(Box(4350)),
+Box(Box(4351)),
+Box(Box(4352)),
+Box(Box(4353)),
+Box(Box(4354)),
+Box(Box(4355)),
+Box(Box(4356)),
+Box(Box(4357)),
+Box(Box(4358)),
+Box(Box(4359)),
+Box(Box(4360)),
+Box(Box(4361)),
+Box(Box(4362)),
+Box(Box(4363)),
+Box(Box(4364)),
+Box(Box(4365)),
+Box(Box(4366)),
+Box(Box(4367)),
+Box(Box(4368)),
+Box(Box(4369)),
+Box(Box(4370)),
+Box(Box(4371)),
+Box(Box(4372)),
+Box(Box(4373)),
+Box(Box(4374)),
+Box(Box(4375)),
+Box(Box(4376)),
+Box(Box(4377)),
+Box(Box(4378)),
+Box(Box(4379)),
+Box(Box(4380)),
+Box(Box(4381)),
+Box(Box(4382)),
+Box(Box(4383)),
+Box(Box(4384)),
+Box(Box(4385)),
+Box(Box(4386)),
+Box(Box(4387)),
+Box(Box(4388)),
+Box(Box(4389)),
+Box(Box(4390)),
+Box(Box(4391)),
+Box(Box(4392)),
+Box(Box(4393)),
+Box(Box(4394)),
+Box(Box(4395)),
+Box(Box(4396)),
+Box(Box(4397)),
+Box(Box(4398)),
+Box(Box(4399)),
+Box(Box(4400)),
+Box(Box(4401)),
+Box(Box(4402)),
+Box(Box(4403)),
+Box(Box(4404)),
+Box(Box(4405)),
+Box(Box(4406)),
+Box(Box(4407)),
+Box(Box(4408)),
+Box(Box(4409)),
+Box(Box(4410)),
+Box(Box(4411)),
+Box(Box(4412)),
+Box(Box(4413)),
+Box(Box(4414)),
+Box(Box(4415)),
+Box(Box(4416)),
+Box(Box(4417)),
+Box(Box(4418)),
+Box(Box(4419)),
+Box(Box(4420)),
+Box(Box(4421)),
+Box(Box(4422)),
+Box(Box(4423)),
+Box(Box(4424)),
+Box(Box(4425)),
+Box(Box(4426)),
+Box(Box(4427)),
+Box(Box(4428)),
+Box(Box(4429)),
+Box(Box(4430)),
+Box(Box(4431)),
+Box(Box(4432)),
+Box(Box(4433)),
+Box(Box(4434)),
+Box(Box(4435)),
+Box(Box(4436)),
+Box(Box(4437)),
+Box(Box(4438)),
+Box(Box(4439)),
+Box(Box(4440)),
+Box(Box(4441)),
+Box(Box(4442)),
+Box(Box(4443)),
+Box(Box(4444)),
+Box(Box(4445)),
+Box(Box(4446)),
+Box(Box(4447)),
+Box(Box(4448)),
+Box(Box(4449)),
+Box(Box(4450)),
+Box(Box(4451)),
+Box(Box(4452)),
+Box(Box(4453)),
+Box(Box(4454)),
+Box(Box(4455)),
+Box(Box(4456)),
+Box(Box(4457)),
+Box(Box(4458)),
+Box(Box(4459)),
+Box(Box(4460)),
+Box(Box(4461)),
+Box(Box(4462)),
+Box(Box(4463)),
+Box(Box(4464)),
+Box(Box(4465)),
+Box(Box(4466)),
+Box(Box(4467)),
+Box(Box(4468)),
+Box(Box(4469)),
+Box(Box(4470)),
+Box(Box(4471)),
+Box(Box(4472)),
+Box(Box(4473)),
+Box(Box(4474)),
+Box(Box(4475)),
+Box(Box(4476)),
+Box(Box(4477)),
+Box(Box(4478)),
+Box(Box(4479)),
+Box(Box(4480)),
+Box(Box(4481)),
+Box(Box(4482)),
+Box(Box(4483)),
+Box(Box(4484)),
+Box(Box(4485)),
+Box(Box(4486)),
+Box(Box(4487)),
+Box(Box(4488)),
+Box(Box(4489)),
+Box(Box(4490)),
+Box(Box(4491)),
+Box(Box(4492)),
+Box(Box(4493)),
+Box(Box(4494)),
+Box(Box(4495)),
+Box(Box(4496)),
+Box(Box(4497)),
+Box(Box(4498)),
+Box(Box(4499)),
+Box(Box(4500)),
+Box(Box(4501)),
+Box(Box(4502)),
+Box(Box(4503)),
+Box(Box(4504)),
+Box(Box(4505)),
+Box(Box(4506)),
+Box(Box(4507)),
+Box(Box(4508)),
+Box(Box(4509)),
+Box(Box(4510)),
+Box(Box(4511)),
+Box(Box(4512)),
+Box(Box(4513)),
+Box(Box(4514)),
+Box(Box(4515)),
+Box(Box(4516)),
+Box(Box(4517)),
+Box(Box(4518)),
+Box(Box(4519)),
+Box(Box(4520)),
+Box(Box(4521)),
+Box(Box(4522)),
+Box(Box(4523)),
+Box(Box(4524)),
+Box(Box(4525)),
+Box(Box(4526)),
+Box(Box(4527)),
+Box(Box(4528)),
+Box(Box(4529)),
+Box(Box(4530)),
+Box(Box(4531)),
+Box(Box(4532)),
+Box(Box(4533)),
+Box(Box(4534)),
+Box(Box(4535)),
+Box(Box(4536)),
+Box(Box(4537)),
+Box(Box(4538)),
+Box(Box(4539)),
+Box(Box(4540)),
+Box(Box(4541)),
+Box(Box(4542)),
+Box(Box(4543)),
+Box(Box(4544)),
+Box(Box(4545)),
+Box(Box(4546)),
+Box(Box(4547)),
+Box(Box(4548)),
+Box(Box(4549)),
+Box(Box(4550)),
+Box(Box(4551)),
+Box(Box(4552)),
+Box(Box(4553)),
+Box(Box(4554)),
+Box(Box(4555)),
+Box(Box(4556)),
+Box(Box(4557)),
+Box(Box(4558)),
+Box(Box(4559)),
+Box(Box(4560)),
+Box(Box(4561)),
+Box(Box(4562)),
+Box(Box(4563)),
+Box(Box(4564)),
+Box(Box(4565)),
+Box(Box(4566)),
+Box(Box(4567)),
+Box(Box(4568)),
+Box(Box(4569)),
+Box(Box(4570)),
+Box(Box(4571)),
+Box(Box(4572)),
+Box(Box(4573)),
+Box(Box(4574)),
+Box(Box(4575)),
+Box(Box(4576)),
+Box(Box(4577)),
+Box(Box(4578)),
+Box(Box(4579)),
+Box(Box(4580)),
+Box(Box(4581)),
+Box(Box(4582)),
+Box(Box(4583)),
+Box(Box(4584)),
+Box(Box(4585)),
+Box(Box(4586)),
+Box(Box(4587)),
+Box(Box(4588)),
+Box(Box(4589)),
+Box(Box(4590)),
+Box(Box(4591)),
+Box(Box(4592)),
+Box(Box(4593)),
+Box(Box(4594)),
+Box(Box(4595)),
+Box(Box(4596)),
+Box(Box(4597)),
+Box(Box(4598)),
+Box(Box(4599)),
+Box(Box(4600)),
+Box(Box(4601)),
+Box(Box(4602)),
+Box(Box(4603)),
+Box(Box(4604)),
+Box(Box(4605)),
+Box(Box(4606)),
+Box(Box(4607)),
+Box(Box(4608)),
+Box(Box(4609)),
+Box(Box(4610)),
+Box(Box(4611)),
+Box(Box(4612)),
+Box(Box(4613)),
+Box(Box(4614)),
+Box(Box(4615)),
+Box(Box(4616)),
+Box(Box(4617)),
+Box(Box(4618)),
+Box(Box(4619)),
+Box(Box(4620)),
+Box(Box(4621)),
+Box(Box(4622)),
+Box(Box(4623)),
+Box(Box(4624)),
+Box(Box(4625)),
+Box(Box(4626)),
+Box(Box(4627)),
+Box(Box(4628)),
+Box(Box(4629)),
+Box(Box(4630)),
+Box(Box(4631)),
+Box(Box(4632)),
+Box(Box(4633)),
+Box(Box(4634)),
+Box(Box(4635)),
+Box(Box(4636)),
+Box(Box(4637)),
+Box(Box(4638)),
+Box(Box(4639)),
+Box(Box(4640)),
+Box(Box(4641)),
+Box(Box(4642)),
+Box(Box(4643)),
+Box(Box(4644)),
+Box(Box(4645)),
+Box(Box(4646)),
+Box(Box(4647)),
+Box(Box(4648)),
+Box(Box(4649)),
+Box(Box(4650)),
+Box(Box(4651)),
+Box(Box(4652)),
+Box(Box(4653)),
+Box(Box(4654)),
+Box(Box(4655)),
+Box(Box(4656)),
+Box(Box(4657)),
+Box(Box(4658)),
+Box(Box(4659)),
+Box(Box(4660)),
+Box(Box(4661)),
+Box(Box(4662)),
+Box(Box(4663)),
+Box(Box(4664)),
+Box(Box(4665)),
+Box(Box(4666)),
+Box(Box(4667)),
+Box(Box(4668)),
+Box(Box(4669)),
+Box(Box(4670)),
+Box(Box(4671)),
+Box(Box(4672)),
+Box(Box(4673)),
+Box(Box(4674)),
+Box(Box(4675)),
+Box(Box(4676)),
+Box(Box(4677)),
+Box(Box(4678)),
+Box(Box(4679)),
+Box(Box(4680)),
+Box(Box(4681)),
+Box(Box(4682)),
+Box(Box(4683)),
+Box(Box(4684)),
+Box(Box(4685)),
+Box(Box(4686)),
+Box(Box(4687)),
+Box(Box(4688)),
+Box(Box(4689)),
+Box(Box(4690)),
+Box(Box(4691)),
+Box(Box(4692)),
+Box(Box(4693)),
+Box(Box(4694)),
+Box(Box(4695)),
+Box(Box(4696)),
+Box(Box(4697)),
+Box(Box(4698)),
+Box(Box(4699)),
+Box(Box(4700)),
+Box(Box(4701)),
+Box(Box(4702)),
+Box(Box(4703)),
+Box(Box(4704)),
+Box(Box(4705)),
+Box(Box(4706)),
+Box(Box(4707)),
+Box(Box(4708)),
+Box(Box(4709)),
+Box(Box(4710)),
+Box(Box(4711)),
+Box(Box(4712)),
+Box(Box(4713)),
+Box(Box(4714)),
+Box(Box(4715)),
+Box(Box(4716)),
+Box(Box(4717)),
+Box(Box(4718)),
+Box(Box(4719)),
+Box(Box(4720)),
+Box(Box(4721)),
+Box(Box(4722)),
+Box(Box(4723)),
+Box(Box(4724)),
+Box(Box(4725)),
+Box(Box(4726)),
+Box(Box(4727)),
+Box(Box(4728)),
+Box(Box(4729)),
+Box(Box(4730)),
+Box(Box(4731)),
+Box(Box(4732)),
+Box(Box(4733)),
+Box(Box(4734)),
+Box(Box(4735)),
+Box(Box(4736)),
+Box(Box(4737)),
+Box(Box(4738)),
+Box(Box(4739)),
+Box(Box(4740)),
+Box(Box(4741)),
+Box(Box(4742)),
+Box(Box(4743)),
+Box(Box(4744)),
+Box(Box(4745)),
+Box(Box(4746)),
+Box(Box(4747)),
+Box(Box(4748)),
+Box(Box(4749)),
+Box(Box(4750)),
+Box(Box(4751)),
+Box(Box(4752)),
+Box(Box(4753)),
+Box(Box(4754)),
+Box(Box(4755)),
+Box(Box(4756)),
+Box(Box(4757)),
+Box(Box(4758)),
+Box(Box(4759)),
+Box(Box(4760)),
+Box(Box(4761)),
+Box(Box(4762)),
+Box(Box(4763)),
+Box(Box(4764)),
+Box(Box(4765)),
+Box(Box(4766)),
+Box(Box(4767)),
+Box(Box(4768)),
+Box(Box(4769)),
+Box(Box(4770)),
+Box(Box(4771)),
+Box(Box(4772)),
+Box(Box(4773)),
+Box(Box(4774)),
+Box(Box(4775)),
+Box(Box(4776)),
+Box(Box(4777)),
+Box(Box(4778)),
+Box(Box(4779)),
+Box(Box(4780)),
+Box(Box(4781)),
+Box(Box(4782)),
+Box(Box(4783)),
+Box(Box(4784)),
+Box(Box(4785)),
+Box(Box(4786)),
+Box(Box(4787)),
+Box(Box(4788)),
+Box(Box(4789)),
+Box(Box(4790)),
+Box(Box(4791)),
+Box(Box(4792)),
+Box(Box(4793)),
+Box(Box(4794)),
+Box(Box(4795)),
+Box(Box(4796)),
+Box(Box(4797)),
+Box(Box(4798)),
+Box(Box(4799)),
+Box(Box(4800)),
+Box(Box(4801)),
+Box(Box(4802)),
+Box(Box(4803)),
+Box(Box(4804)),
+Box(Box(4805)),
+Box(Box(4806)),
+Box(Box(4807)),
+Box(Box(4808)),
+Box(Box(4809)),
+Box(Box(4810)),
+Box(Box(4811)),
+Box(Box(4812)),
+Box(Box(4813)),
+Box(Box(4814)),
+Box(Box(4815)),
+Box(Box(4816)),
+Box(Box(4817)),
+Box(Box(4818)),
+Box(Box(4819)),
+Box(Box(4820)),
+Box(Box(4821)),
+Box(Box(4822)),
+Box(Box(4823)),
+Box(Box(4824)),
+Box(Box(4825)),
+Box(Box(4826)),
+Box(Box(4827)),
+Box(Box(4828)),
+Box(Box(4829)),
+Box(Box(4830)),
+Box(Box(4831)),
+Box(Box(4832)),
+Box(Box(4833)),
+Box(Box(4834)),
+Box(Box(4835)),
+Box(Box(4836)),
+Box(Box(4837)),
+Box(Box(4838)),
+Box(Box(4839)),
+Box(Box(4840)),
+Box(Box(4841)),
+Box(Box(4842)),
+Box(Box(4843)),
+Box(Box(4844)),
+Box(Box(4845)),
+Box(Box(4846)),
+Box(Box(4847)),
+Box(Box(4848)),
+Box(Box(4849)),
+Box(Box(4850)),
+Box(Box(4851)),
+Box(Box(4852)),
+Box(Box(4853)),
+Box(Box(4854)),
+Box(Box(4855)),
+Box(Box(4856)),
+Box(Box(4857)),
+Box(Box(4858)),
+Box(Box(4859)),
+Box(Box(4860)),
+Box(Box(4861)),
+Box(Box(4862)),
+Box(Box(4863)),
+Box(Box(4864)),
+Box(Box(4865)),
+Box(Box(4866)),
+Box(Box(4867)),
+Box(Box(4868)),
+Box(Box(4869)),
+Box(Box(4870)),
+Box(Box(4871)),
+Box(Box(4872)),
+Box(Box(4873)),
+Box(Box(4874)),
+Box(Box(4875)),
+Box(Box(4876)),
+Box(Box(4877)),
+Box(Box(4878)),
+Box(Box(4879)),
+Box(Box(4880)),
+Box(Box(4881)),
+Box(Box(4882)),
+Box(Box(4883)),
+Box(Box(4884)),
+Box(Box(4885)),
+Box(Box(4886)),
+Box(Box(4887)),
+Box(Box(4888)),
+Box(Box(4889)),
+Box(Box(4890)),
+Box(Box(4891)),
+Box(Box(4892)),
+Box(Box(4893)),
+Box(Box(4894)),
+Box(Box(4895)),
+Box(Box(4896)),
+Box(Box(4897)),
+Box(Box(4898)),
+Box(Box(4899)),
+Box(Box(4900)),
+Box(Box(4901)),
+Box(Box(4902)),
+Box(Box(4903)),
+Box(Box(4904)),
+Box(Box(4905)),
+Box(Box(4906)),
+Box(Box(4907)),
+Box(Box(4908)),
+Box(Box(4909)),
+Box(Box(4910)),
+Box(Box(4911)),
+Box(Box(4912)),
+Box(Box(4913)),
+Box(Box(4914)),
+Box(Box(4915)),
+Box(Box(4916)),
+Box(Box(4917)),
+Box(Box(4918)),
+Box(Box(4919)),
+Box(Box(4920)),
+Box(Box(4921)),
+Box(Box(4922)),
+Box(Box(4923)),
+Box(Box(4924)),
+Box(Box(4925)),
+Box(Box(4926)),
+Box(Box(4927)),
+Box(Box(4928)),
+Box(Box(4929)),
+Box(Box(4930)),
+Box(Box(4931)),
+Box(Box(4932)),
+Box(Box(4933)),
+Box(Box(4934)),
+Box(Box(4935)),
+Box(Box(4936)),
+Box(Box(4937)),
+Box(Box(4938)),
+Box(Box(4939)),
+Box(Box(4940)),
+Box(Box(4941)),
+Box(Box(4942)),
+Box(Box(4943)),
+Box(Box(4944)),
+Box(Box(4945)),
+Box(Box(4946)),
+Box(Box(4947)),
+Box(Box(4948)),
+Box(Box(4949)),
+Box(Box(4950)),
+Box(Box(4951)),
+Box(Box(4952)),
+Box(Box(4953)),
+Box(Box(4954)),
+Box(Box(4955)),
+Box(Box(4956)),
+Box(Box(4957)),
+Box(Box(4958)),
+Box(Box(4959)),
+Box(Box(4960)),
+Box(Box(4961)),
+Box(Box(4962)),
+Box(Box(4963)),
+Box(Box(4964)),
+Box(Box(4965)),
+Box(Box(4966)),
+Box(Box(4967)),
+Box(Box(4968)),
+Box(Box(4969)),
+Box(Box(4970)),
+Box(Box(4971)),
+Box(Box(4972)),
+Box(Box(4973)),
+Box(Box(4974)),
+Box(Box(4975)),
+Box(Box(4976)),
+Box(Box(4977)),
+Box(Box(4978)),
+Box(Box(4979)),
+Box(Box(4980)),
+Box(Box(4981)),
+Box(Box(4982)),
+Box(Box(4983)),
+Box(Box(4984)),
+Box(Box(4985)),
+Box(Box(4986)),
+Box(Box(4987)),
+Box(Box(4988)),
+Box(Box(4989)),
+Box(Box(4990)),
+Box(Box(4991)),
+Box(Box(4992)),
+Box(Box(4993)),
+Box(Box(4994)),
+Box(Box(4995)),
+Box(Box(4996)),
+Box(Box(4997)),
+Box(Box(4998)),
+Box(Box(4999)),
+Box(Box(5000)),
+Box(Box(5001)),
+Box(Box(5002)),
+Box(Box(5003)),
+Box(Box(5004)),
+Box(Box(5005)),
+Box(Box(5006)),
+Box(Box(5007)),
+Box(Box(5008)),
+Box(Box(5009)),
+Box(Box(5010)),
+Box(Box(5011)),
+Box(Box(5012)),
+Box(Box(5013)),
+Box(Box(5014)),
+Box(Box(5015)),
+Box(Box(5016)),
+Box(Box(5017)),
+Box(Box(5018)),
+Box(Box(5019)),
+Box(Box(5020)),
+Box(Box(5021)),
+Box(Box(5022)),
+Box(Box(5023)),
+Box(Box(5024)),
+Box(Box(5025)),
+Box(Box(5026)),
+Box(Box(5027)),
+Box(Box(5028)),
+Box(Box(5029)),
+Box(Box(5030)),
+Box(Box(5031)),
+Box(Box(5032)),
+Box(Box(5033)),
+Box(Box(5034)),
+Box(Box(5035)),
+Box(Box(5036)),
+Box(Box(5037)),
+Box(Box(5038)),
+Box(Box(5039)),
+Box(Box(5040)),
+Box(Box(5041)),
+Box(Box(5042)),
+Box(Box(5043)),
+Box(Box(5044)),
+Box(Box(5045)),
+Box(Box(5046)),
+Box(Box(5047)),
+Box(Box(5048)),
+Box(Box(5049)),
+Box(Box(5050)),
+Box(Box(5051)),
+Box(Box(5052)),
+Box(Box(5053)),
+Box(Box(5054)),
+Box(Box(5055)),
+Box(Box(5056)),
+Box(Box(5057)),
+Box(Box(5058)),
+Box(Box(5059)),
+Box(Box(5060)),
+Box(Box(5061)),
+Box(Box(5062)),
+Box(Box(5063)),
+Box(Box(5064)),
+Box(Box(5065)),
+Box(Box(5066)),
+Box(Box(5067)),
+Box(Box(5068)),
+Box(Box(5069)),
+Box(Box(5070)),
+Box(Box(5071)),
+Box(Box(5072)),
+Box(Box(5073)),
+Box(Box(5074)),
+Box(Box(5075)),
+Box(Box(5076)),
+Box(Box(5077)),
+Box(Box(5078)),
+Box(Box(5079)),
+Box(Box(5080)),
+Box(Box(5081)),
+Box(Box(5082)),
+Box(Box(5083)),
+Box(Box(5084)),
+Box(Box(5085)),
+Box(Box(5086)),
+Box(Box(5087)),
+Box(Box(5088)),
+Box(Box(5089)),
+Box(Box(5090)),
+Box(Box(5091)),
+Box(Box(5092)),
+Box(Box(5093)),
+Box(Box(5094)),
+Box(Box(5095)),
+Box(Box(5096)),
+Box(Box(5097)),
+Box(Box(5098)),
+Box(Box(5099)),
+Box(Box(5100)),
+Box(Box(5101)),
+Box(Box(5102)),
+Box(Box(5103)),
+Box(Box(5104)),
+Box(Box(5105)),
+Box(Box(5106)),
+Box(Box(5107)),
+Box(Box(5108)),
+Box(Box(5109)),
+Box(Box(5110)),
+Box(Box(5111)),
+Box(Box(5112)),
+Box(Box(5113)),
+Box(Box(5114)),
+Box(Box(5115)),
+Box(Box(5116)),
+Box(Box(5117)),
+Box(Box(5118)),
+Box(Box(5119)),
+Box(Box(5120)),
+Box(Box(5121)),
+Box(Box(5122)),
+Box(Box(5123)),
+Box(Box(5124)),
+Box(Box(5125)),
+Box(Box(5126)),
+Box(Box(5127)),
+Box(Box(5128)),
+Box(Box(5129)),
+Box(Box(5130)),
+Box(Box(5131)),
+Box(Box(5132)),
+Box(Box(5133)),
+Box(Box(5134)),
+Box(Box(5135)),
+Box(Box(5136)),
+Box(Box(5137)),
+Box(Box(5138)),
+Box(Box(5139)),
+Box(Box(5140)),
+Box(Box(5141)),
+Box(Box(5142)),
+Box(Box(5143)),
+Box(Box(5144)),
+Box(Box(5145)),
+Box(Box(5146)),
+Box(Box(5147)),
+Box(Box(5148)),
+Box(Box(5149)),
+Box(Box(5150)),
+Box(Box(5151)),
+Box(Box(5152)),
+Box(Box(5153)),
+Box(Box(5154)),
+Box(Box(5155)),
+Box(Box(5156)),
+Box(Box(5157)),
+Box(Box(5158)),
+Box(Box(5159)),
+Box(Box(5160)),
+Box(Box(5161)),
+Box(Box(5162)),
+Box(Box(5163)),
+Box(Box(5164)),
+Box(Box(5165)),
+Box(Box(5166)),
+Box(Box(5167)),
+Box(Box(5168)),
+Box(Box(5169)),
+Box(Box(5170)),
+Box(Box(5171)),
+Box(Box(5172)),
+Box(Box(5173)),
+Box(Box(5174)),
+Box(Box(5175)),
+Box(Box(5176)),
+Box(Box(5177)),
+Box(Box(5178)),
+Box(Box(5179)),
+Box(Box(5180)),
+Box(Box(5181)),
+Box(Box(5182)),
+Box(Box(5183)),
+Box(Box(5184)),
+Box(Box(5185)),
+Box(Box(5186)),
+Box(Box(5187)),
+Box(Box(5188)),
+Box(Box(5189)),
+Box(Box(5190)),
+Box(Box(5191)),
+Box(Box(5192)),
+Box(Box(5193)),
+Box(Box(5194)),
+Box(Box(5195)),
+Box(Box(5196)),
+Box(Box(5197)),
+Box(Box(5198)),
+Box(Box(5199)),
+Box(Box(5200)),
+Box(Box(5201)),
+Box(Box(5202)),
+Box(Box(5203)),
+Box(Box(5204)),
+Box(Box(5205)),
+Box(Box(5206)),
+Box(Box(5207)),
+Box(Box(5208)),
+Box(Box(5209)),
+Box(Box(5210)),
+Box(Box(5211)),
+Box(Box(5212)),
+Box(Box(5213)),
+Box(Box(5214)),
+Box(Box(5215)),
+Box(Box(5216)),
+Box(Box(5217)),
+Box(Box(5218)),
+Box(Box(5219)),
+Box(Box(5220)),
+Box(Box(5221)),
+Box(Box(5222)),
+Box(Box(5223)),
+Box(Box(5224)),
+Box(Box(5225)),
+Box(Box(5226)),
+Box(Box(5227)),
+Box(Box(5228)),
+Box(Box(5229)),
+Box(Box(5230)),
+Box(Box(5231)),
+Box(Box(5232)),
+Box(Box(5233)),
+Box(Box(5234)),
+Box(Box(5235)),
+Box(Box(5236)),
+Box(Box(5237)),
+Box(Box(5238)),
+Box(Box(5239)),
+Box(Box(5240)),
+Box(Box(5241)),
+Box(Box(5242)),
+Box(Box(5243)),
+Box(Box(5244)),
+Box(Box(5245)),
+Box(Box(5246)),
+Box(Box(5247)),
+Box(Box(5248)),
+Box(Box(5249)),
+Box(Box(5250)),
+Box(Box(5251)),
+Box(Box(5252)),
+Box(Box(5253)),
+Box(Box(5254)),
+Box(Box(5255)),
+Box(Box(5256)),
+Box(Box(5257)),
+Box(Box(5258)),
+Box(Box(5259)),
+Box(Box(5260)),
+Box(Box(5261)),
+Box(Box(5262)),
+Box(Box(5263)),
+Box(Box(5264)),
+Box(Box(5265)),
+Box(Box(5266)),
+Box(Box(5267)),
+Box(Box(5268)),
+Box(Box(5269)),
+Box(Box(5270)),
+Box(Box(5271)),
+Box(Box(5272)),
+Box(Box(5273)),
+Box(Box(5274)),
+Box(Box(5275)),
+Box(Box(5276)),
+Box(Box(5277)),
+Box(Box(5278)),
+Box(Box(5279)),
+Box(Box(5280)),
+Box(Box(5281)),
+Box(Box(5282)),
+Box(Box(5283)),
+Box(Box(5284)),
+Box(Box(5285)),
+Box(Box(5286)),
+Box(Box(5287)),
+Box(Box(5288)),
+Box(Box(5289)),
+Box(Box(5290)),
+Box(Box(5291)),
+Box(Box(5292)),
+Box(Box(5293)),
+Box(Box(5294)),
+Box(Box(5295)),
+Box(Box(5296)),
+Box(Box(5297)),
+Box(Box(5298)),
+Box(Box(5299)),
+Box(Box(5300)),
+Box(Box(5301)),
+Box(Box(5302)),
+Box(Box(5303)),
+Box(Box(5304)),
+Box(Box(5305)),
+Box(Box(5306)),
+Box(Box(5307)),
+Box(Box(5308)),
+Box(Box(5309)),
+Box(Box(5310)),
+Box(Box(5311)),
+Box(Box(5312)),
+Box(Box(5313)),
+Box(Box(5314)),
+Box(Box(5315)),
+Box(Box(5316)),
+Box(Box(5317)),
+Box(Box(5318)),
+Box(Box(5319)),
+Box(Box(5320)),
+Box(Box(5321)),
+Box(Box(5322)),
+Box(Box(5323)),
+Box(Box(5324)),
+Box(Box(5325)),
+Box(Box(5326)),
+Box(Box(5327)),
+Box(Box(5328)),
+Box(Box(5329)),
+Box(Box(5330)),
+Box(Box(5331)),
+Box(Box(5332)),
+Box(Box(5333)),
+Box(Box(5334)),
+Box(Box(5335)),
+Box(Box(5336)),
+Box(Box(5337)),
+Box(Box(5338)),
+Box(Box(5339)),
+Box(Box(5340)),
+Box(Box(5341)),
+Box(Box(5342)),
+Box(Box(5343)),
+Box(Box(5344)),
+Box(Box(5345)),
+Box(Box(5346)),
+Box(Box(5347)),
+Box(Box(5348)),
+Box(Box(5349)),
+Box(Box(5350)),
+Box(Box(5351)),
+Box(Box(5352)),
+Box(Box(5353)),
+Box(Box(5354)),
+Box(Box(5355)),
+Box(Box(5356)),
+Box(Box(5357)),
+Box(Box(5358)),
+Box(Box(5359)),
+Box(Box(5360)),
+Box(Box(5361)),
+Box(Box(5362)),
+Box(Box(5363)),
+Box(Box(5364)),
+Box(Box(5365)),
+Box(Box(5366)),
+Box(Box(5367)),
+Box(Box(5368)),
+Box(Box(5369)),
+Box(Box(5370)),
+Box(Box(5371)),
+Box(Box(5372)),
+Box(Box(5373)),
+Box(Box(5374)),
+Box(Box(5375)),
+Box(Box(5376)),
+Box(Box(5377)),
+Box(Box(5378)),
+Box(Box(5379)),
+Box(Box(5380)),
+Box(Box(5381)),
+Box(Box(5382)),
+Box(Box(5383)),
+Box(Box(5384)),
+Box(Box(5385)),
+Box(Box(5386)),
+Box(Box(5387)),
+Box(Box(5388)),
+Box(Box(5389)),
+Box(Box(5390)),
+Box(Box(5391)),
+Box(Box(5392)),
+Box(Box(5393)),
+Box(Box(5394)),
+Box(Box(5395)),
+Box(Box(5396)),
+Box(Box(5397)),
+Box(Box(5398)),
+Box(Box(5399)),
+Box(Box(5400)),
+Box(Box(5401)),
+Box(Box(5402)),
+Box(Box(5403)),
+Box(Box(5404)),
+Box(Box(5405)),
+Box(Box(5406)),
+Box(Box(5407)),
+Box(Box(5408)),
+Box(Box(5409)),
+Box(Box(5410)),
+Box(Box(5411)),
+Box(Box(5412)),
+Box(Box(5413)),
+Box(Box(5414)),
+Box(Box(5415)),
+Box(Box(5416)),
+Box(Box(5417)),
+Box(Box(5418)),
+Box(Box(5419)),
+Box(Box(5420)),
+Box(Box(5421)),
+Box(Box(5422)),
+Box(Box(5423)),
+Box(Box(5424)),
+Box(Box(5425)),
+Box(Box(5426)),
+Box(Box(5427)),
+Box(Box(5428)),
+Box(Box(5429)),
+Box(Box(5430)),
+Box(Box(5431)),
+Box(Box(5432)),
+Box(Box(5433)),
+Box(Box(5434)),
+Box(Box(5435)),
+Box(Box(5436)),
+Box(Box(5437)),
+Box(Box(5438)),
+Box(Box(5439)),
+Box(Box(5440)),
+Box(Box(5441)),
+Box(Box(5442)),
+Box(Box(5443)),
+Box(Box(5444)),
+Box(Box(5445)),
+Box(Box(5446)),
+Box(Box(5447)),
+Box(Box(5448)),
+Box(Box(5449)),
+Box(Box(5450)),
+Box(Box(5451)),
+Box(Box(5452)),
+Box(Box(5453)),
+Box(Box(5454)),
+Box(Box(5455)),
+Box(Box(5456)),
+Box(Box(5457)),
+Box(Box(5458)),
+Box(Box(5459)),
+Box(Box(5460)),
+Box(Box(5461)),
+Box(Box(5462)),
+Box(Box(5463)),
+Box(Box(5464)),
+Box(Box(5465)),
+Box(Box(5466)),
+Box(Box(5467)),
+Box(Box(5468)),
+Box(Box(5469)),
+Box(Box(5470)),
+Box(Box(5471)),
+Box(Box(5472)),
+Box(Box(5473)),
+Box(Box(5474)),
+Box(Box(5475)),
+Box(Box(5476)),
+Box(Box(5477)),
+Box(Box(5478)),
+Box(Box(5479)),
+Box(Box(5480)),
+Box(Box(5481)),
+Box(Box(5482)),
+Box(Box(5483)),
+Box(Box(5484)),
+Box(Box(5485)),
+Box(Box(5486)),
+Box(Box(5487)),
+Box(Box(5488)),
+Box(Box(5489)),
+Box(Box(5490)),
+Box(Box(5491)),
+Box(Box(5492)),
+Box(Box(5493)),
+Box(Box(5494)),
+Box(Box(5495)),
+Box(Box(5496)),
+Box(Box(5497)),
+Box(Box(5498)),
+Box(Box(5499)),
+Box(Box(5500)),
+Box(Box(5501)),
+Box(Box(5502)),
+Box(Box(5503)),
+Box(Box(5504)),
+Box(Box(5505)),
+Box(Box(5506)),
+Box(Box(5507)),
+Box(Box(5508)),
+Box(Box(5509)),
+Box(Box(5510)),
+Box(Box(5511)),
+Box(Box(5512)),
+Box(Box(5513)),
+Box(Box(5514)),
+Box(Box(5515)),
+Box(Box(5516)),
+Box(Box(5517)),
+Box(Box(5518)),
+Box(Box(5519)),
+Box(Box(5520)),
+Box(Box(5521)),
+Box(Box(5522)),
+Box(Box(5523)),
+Box(Box(5524)),
+Box(Box(5525)),
+Box(Box(5526)),
+Box(Box(5527)),
+Box(Box(5528)),
+Box(Box(5529)),
+Box(Box(5530)),
+Box(Box(5531)),
+Box(Box(5532)),
+Box(Box(5533)),
+Box(Box(5534)),
+Box(Box(5535)),
+Box(Box(5536)),
+Box(Box(5537)),
+Box(Box(5538)),
+Box(Box(5539)),
+Box(Box(5540)),
+Box(Box(5541)),
+Box(Box(5542)),
+Box(Box(5543)),
+Box(Box(5544)),
+Box(Box(5545)),
+Box(Box(5546)),
+Box(Box(5547)),
+Box(Box(5548)),
+Box(Box(5549)),
+Box(Box(5550)),
+Box(Box(5551)),
+Box(Box(5552)),
+Box(Box(5553)),
+Box(Box(5554)),
+Box(Box(5555)),
+Box(Box(5556)),
+Box(Box(5557)),
+Box(Box(5558)),
+Box(Box(5559)),
+Box(Box(5560)),
+Box(Box(5561)),
+Box(Box(5562)),
+Box(Box(5563)),
+Box(Box(5564)),
+Box(Box(5565)),
+Box(Box(5566)),
+Box(Box(5567)),
+Box(Box(5568)),
+Box(Box(5569)),
+Box(Box(5570)),
+Box(Box(5571)),
+Box(Box(5572)),
+Box(Box(5573)),
+Box(Box(5574)),
+Box(Box(5575)),
+Box(Box(5576)),
+Box(Box(5577)),
+Box(Box(5578)),
+Box(Box(5579)),
+Box(Box(5580)),
+Box(Box(5581)),
+Box(Box(5582)),
+Box(Box(5583)),
+Box(Box(5584)),
+Box(Box(5585)),
+Box(Box(5586)),
+Box(Box(5587)),
+Box(Box(5588)),
+Box(Box(5589)),
+Box(Box(5590)),
+Box(Box(5591)),
+Box(Box(5592)),
+Box(Box(5593)),
+Box(Box(5594)),
+Box(Box(5595)),
+Box(Box(5596)),
+Box(Box(5597)),
+Box(Box(5598)),
+Box(Box(5599)),
+Box(Box(5600)),
+Box(Box(5601)),
+Box(Box(5602)),
+Box(Box(5603)),
+Box(Box(5604)),
+Box(Box(5605)),
+Box(Box(5606)),
+Box(Box(5607)),
+Box(Box(5608)),
+Box(Box(5609)),
+Box(Box(5610)),
+Box(Box(5611)),
+Box(Box(5612)),
+Box(Box(5613)),
+Box(Box(5614)),
+Box(Box(5615)),
+Box(Box(5616)),
+Box(Box(5617)),
+Box(Box(5618)),
+Box(Box(5619)),
+Box(Box(5620)),
+Box(Box(5621)),
+Box(Box(5622)),
+Box(Box(5623)),
+Box(Box(5624)),
+Box(Box(5625)),
+Box(Box(5626)),
+Box(Box(5627)),
+Box(Box(5628)),
+Box(Box(5629)),
+Box(Box(5630)),
+Box(Box(5631)),
+Box(Box(5632)),
+Box(Box(5633)),
+Box(Box(5634)),
+Box(Box(5635)),
+Box(Box(5636)),
+Box(Box(5637)),
+Box(Box(5638)),
+Box(Box(5639)),
+Box(Box(5640)),
+Box(Box(5641)),
+Box(Box(5642)),
+Box(Box(5643)),
+Box(Box(5644)),
+Box(Box(5645)),
+Box(Box(5646)),
+Box(Box(5647)),
+Box(Box(5648)),
+Box(Box(5649)),
+Box(Box(5650)),
+Box(Box(5651)),
+Box(Box(5652)),
+Box(Box(5653)),
+Box(Box(5654)),
+Box(Box(5655)),
+Box(Box(5656)),
+Box(Box(5657)),
+Box(Box(5658)),
+Box(Box(5659)),
+Box(Box(5660)),
+Box(Box(5661)),
+Box(Box(5662)),
+Box(Box(5663)),
+Box(Box(5664)),
+Box(Box(5665)),
+Box(Box(5666)),
+Box(Box(5667)),
+Box(Box(5668)),
+Box(Box(5669)),
+Box(Box(5670)),
+Box(Box(5671)),
+Box(Box(5672)),
+Box(Box(5673)),
+Box(Box(5674)),
+Box(Box(5675)),
+Box(Box(5676)),
+Box(Box(5677)),
+Box(Box(5678)),
+Box(Box(5679)),
+Box(Box(5680)),
+Box(Box(5681)),
+Box(Box(5682)),
+Box(Box(5683)),
+Box(Box(5684)),
+Box(Box(5685)),
+Box(Box(5686)),
+Box(Box(5687)),
+Box(Box(5688)),
+Box(Box(5689)),
+Box(Box(5690)),
+Box(Box(5691)),
+Box(Box(5692)),
+Box(Box(5693)),
+Box(Box(5694)),
+Box(Box(5695)),
+Box(Box(5696)),
+Box(Box(5697)),
+Box(Box(5698)),
+Box(Box(5699)),
+Box(Box(5700)),
+Box(Box(5701)),
+Box(Box(5702)),
+Box(Box(5703)),
+Box(Box(5704)),
+Box(Box(5705)),
+Box(Box(5706)),
+Box(Box(5707)),
+Box(Box(5708)),
+Box(Box(5709)),
+Box(Box(5710)),
+Box(Box(5711)),
+Box(Box(5712)),
+Box(Box(5713)),
+Box(Box(5714)),
+Box(Box(5715)),
+Box(Box(5716)),
+Box(Box(5717)),
+Box(Box(5718)),
+Box(Box(5719)),
+Box(Box(5720)),
+Box(Box(5721)),
+Box(Box(5722)),
+Box(Box(5723)),
+Box(Box(5724)),
+Box(Box(5725)),
+Box(Box(5726)),
+Box(Box(5727)),
+Box(Box(5728)),
+Box(Box(5729)),
+Box(Box(5730)),
+Box(Box(5731)),
+Box(Box(5732)),
+Box(Box(5733)),
+Box(Box(5734)),
+Box(Box(5735)),
+Box(Box(5736)),
+Box(Box(5737)),
+Box(Box(5738)),
+Box(Box(5739)),
+Box(Box(5740)),
+Box(Box(5741)),
+Box(Box(5742)),
+Box(Box(5743)),
+Box(Box(5744)),
+Box(Box(5745)),
+Box(Box(5746)),
+Box(Box(5747)),
+Box(Box(5748)),
+Box(Box(5749)),
+Box(Box(5750)),
+Box(Box(5751)),
+Box(Box(5752)),
+Box(Box(5753)),
+Box(Box(5754)),
+Box(Box(5755)),
+Box(Box(5756)),
+Box(Box(5757)),
+Box(Box(5758)),
+Box(Box(5759)),
+Box(Box(5760)),
+Box(Box(5761)),
+Box(Box(5762)),
+Box(Box(5763)),
+Box(Box(5764)),
+Box(Box(5765)),
+Box(Box(5766)),
+Box(Box(5767)),
+Box(Box(5768)),
+Box(Box(5769)),
+Box(Box(5770)),
+Box(Box(5771)),
+Box(Box(5772)),
+Box(Box(5773)),
+Box(Box(5774)),
+Box(Box(5775)),
+Box(Box(5776)),
+Box(Box(5777)),
+Box(Box(5778)),
+Box(Box(5779)),
+Box(Box(5780)),
+Box(Box(5781)),
+Box(Box(5782)),
+Box(Box(5783)),
+Box(Box(5784)),
+Box(Box(5785)),
+Box(Box(5786)),
+Box(Box(5787)),
+Box(Box(5788)),
+Box(Box(5789)),
+Box(Box(5790)),
+Box(Box(5791)),
+Box(Box(5792)),
+Box(Box(5793)),
+Box(Box(5794)),
+Box(Box(5795)),
+Box(Box(5796)),
+Box(Box(5797)),
+Box(Box(5798)),
+Box(Box(5799)),
+Box(Box(5800)),
+Box(Box(5801)),
+Box(Box(5802)),
+Box(Box(5803)),
+Box(Box(5804)),
+Box(Box(5805)),
+Box(Box(5806)),
+Box(Box(5807)),
+Box(Box(5808)),
+Box(Box(5809)),
+Box(Box(5810)),
+Box(Box(5811)),
+Box(Box(5812)),
+Box(Box(5813)),
+Box(Box(5814)),
+Box(Box(5815)),
+Box(Box(5816)),
+Box(Box(5817)),
+Box(Box(5818)),
+Box(Box(5819)),
+Box(Box(5820)),
+Box(Box(5821)),
+Box(Box(5822)),
+Box(Box(5823)),
+Box(Box(5824)),
+Box(Box(5825)),
+Box(Box(5826)),
+Box(Box(5827)),
+Box(Box(5828)),
+Box(Box(5829)),
+Box(Box(5830)),
+Box(Box(5831)),
+Box(Box(5832)),
+Box(Box(5833)),
+Box(Box(5834)),
+Box(Box(5835)),
+Box(Box(5836)),
+Box(Box(5837)),
+Box(Box(5838)),
+Box(Box(5839)),
+Box(Box(5840)),
+Box(Box(5841)),
+Box(Box(5842)),
+Box(Box(5843)),
+Box(Box(5844)),
+Box(Box(5845)),
+Box(Box(5846)),
+Box(Box(5847)),
+Box(Box(5848)),
+Box(Box(5849)),
+Box(Box(5850)),
+Box(Box(5851)),
+Box(Box(5852)),
+Box(Box(5853)),
+Box(Box(5854)),
+Box(Box(5855)),
+Box(Box(5856)),
+Box(Box(5857)),
+Box(Box(5858)),
+Box(Box(5859)),
+Box(Box(5860)),
+Box(Box(5861)),
+Box(Box(5862)),
+Box(Box(5863)),
+Box(Box(5864)),
+Box(Box(5865)),
+Box(Box(5866)),
+Box(Box(5867)),
+Box(Box(5868)),
+Box(Box(5869)),
+Box(Box(5870)),
+Box(Box(5871)),
+Box(Box(5872)),
+Box(Box(5873)),
+Box(Box(5874)),
+Box(Box(5875)),
+Box(Box(5876)),
+Box(Box(5877)),
+Box(Box(5878)),
+Box(Box(5879)),
+Box(Box(5880)),
+Box(Box(5881)),
+Box(Box(5882)),
+Box(Box(5883)),
+Box(Box(5884)),
+Box(Box(5885)),
+Box(Box(5886)),
+Box(Box(5887)),
+Box(Box(5888)),
+Box(Box(5889)),
+Box(Box(5890)),
+Box(Box(5891)),
+Box(Box(5892)),
+Box(Box(5893)),
+Box(Box(5894)),
+Box(Box(5895)),
+Box(Box(5896)),
+Box(Box(5897)),
+Box(Box(5898)),
+Box(Box(5899)),
+Box(Box(5900)),
+Box(Box(5901)),
+Box(Box(5902)),
+Box(Box(5903)),
+Box(Box(5904)),
+Box(Box(5905)),
+Box(Box(5906)),
+Box(Box(5907)),
+Box(Box(5908)),
+Box(Box(5909)),
+Box(Box(5910)),
+Box(Box(5911)),
+Box(Box(5912)),
+Box(Box(5913)),
+Box(Box(5914)),
+Box(Box(5915)),
+Box(Box(5916)),
+Box(Box(5917)),
+Box(Box(5918)),
+Box(Box(5919)),
+Box(Box(5920)),
+Box(Box(5921)),
+Box(Box(5922)),
+Box(Box(5923)),
+Box(Box(5924)),
+Box(Box(5925)),
+Box(Box(5926)),
+Box(Box(5927)),
+Box(Box(5928)),
+Box(Box(5929)),
+Box(Box(5930)),
+Box(Box(5931)),
+Box(Box(5932)),
+Box(Box(5933)),
+Box(Box(5934)),
+Box(Box(5935)),
+Box(Box(5936)),
+Box(Box(5937)),
+Box(Box(5938)),
+Box(Box(5939)),
+Box(Box(5940)),
+Box(Box(5941)),
+Box(Box(5942)),
+Box(Box(5943)),
+Box(Box(5944)),
+Box(Box(5945)),
+Box(Box(5946)),
+Box(Box(5947)),
+Box(Box(5948)),
+Box(Box(5949)),
+Box(Box(5950)),
+Box(Box(5951)),
+Box(Box(5952)),
+Box(Box(5953)),
+Box(Box(5954)),
+Box(Box(5955)),
+Box(Box(5956)),
+Box(Box(5957)),
+Box(Box(5958)),
+Box(Box(5959)),
+Box(Box(5960)),
+Box(Box(5961)),
+Box(Box(5962)),
+Box(Box(5963)),
+Box(Box(5964)),
+Box(Box(5965)),
+Box(Box(5966)),
+Box(Box(5967)),
+Box(Box(5968)),
+Box(Box(5969)),
+Box(Box(5970)),
+Box(Box(5971)),
+Box(Box(5972)),
+Box(Box(5973)),
+Box(Box(5974)),
+Box(Box(5975)),
+Box(Box(5976)),
+Box(Box(5977)),
+Box(Box(5978)),
+Box(Box(5979)),
+Box(Box(5980)),
+Box(Box(5981)),
+Box(Box(5982)),
+Box(Box(5983)),
+Box(Box(5984)),
+Box(Box(5985)),
+Box(Box(5986)),
+Box(Box(5987)),
+Box(Box(5988)),
+Box(Box(5989)),
+Box(Box(5990)),
+Box(Box(5991)),
+Box(Box(5992)),
+Box(Box(5993)),
+Box(Box(5994)),
+Box(Box(5995)),
+Box(Box(5996)),
+Box(Box(5997)),
+Box(Box(5998)),
+Box(Box(5999)),
+Box(Box(6000)),
+Box(Box(6001)),
+Box(Box(6002)),
+Box(Box(6003)),
+Box(Box(6004)),
+Box(Box(6005)),
+Box(Box(6006)),
+Box(Box(6007)),
+Box(Box(6008)),
+Box(Box(6009)),
+Box(Box(6010)),
+Box(Box(6011)),
+Box(Box(6012)),
+Box(Box(6013)),
+Box(Box(6014)),
+Box(Box(6015)),
+Box(Box(6016)),
+Box(Box(6017)),
+Box(Box(6018)),
+Box(Box(6019)),
+Box(Box(6020)),
+Box(Box(6021)),
+Box(Box(6022)),
+Box(Box(6023)),
+Box(Box(6024)),
+Box(Box(6025)),
+Box(Box(6026)),
+Box(Box(6027)),
+Box(Box(6028)),
+Box(Box(6029)),
+Box(Box(6030)),
+Box(Box(6031)),
+Box(Box(6032)),
+Box(Box(6033)),
+Box(Box(6034)),
+Box(Box(6035)),
+Box(Box(6036)),
+Box(Box(6037)),
+Box(Box(6038)),
+Box(Box(6039)),
+Box(Box(6040)),
+Box(Box(6041)),
+Box(Box(6042)),
+Box(Box(6043)),
+Box(Box(6044)),
+Box(Box(6045)),
+Box(Box(6046)),
+Box(Box(6047)),
+Box(Box(6048)),
+Box(Box(6049)),
+Box(Box(6050)),
+Box(Box(6051)),
+Box(Box(6052)),
+Box(Box(6053)),
+Box(Box(6054)),
+Box(Box(6055)),
+Box(Box(6056)),
+Box(Box(6057)),
+Box(Box(6058)),
+Box(Box(6059)),
+Box(Box(6060)),
+Box(Box(6061)),
+Box(Box(6062)),
+Box(Box(6063)),
+Box(Box(6064)),
+Box(Box(6065)),
+Box(Box(6066)),
+Box(Box(6067)),
+Box(Box(6068)),
+Box(Box(6069)),
+Box(Box(6070)),
+Box(Box(6071)),
+Box(Box(6072)),
+Box(Box(6073)),
+Box(Box(6074)),
+Box(Box(6075)),
+Box(Box(6076)),
+Box(Box(6077)),
+Box(Box(6078)),
+Box(Box(6079)),
+Box(Box(6080)),
+Box(Box(6081)),
+Box(Box(6082)),
+Box(Box(6083)),
+Box(Box(6084)),
+Box(Box(6085)),
+Box(Box(6086)),
+Box(Box(6087)),
+Box(Box(6088)),
+Box(Box(6089)),
+Box(Box(6090)),
+Box(Box(6091)),
+Box(Box(6092)),
+Box(Box(6093)),
+Box(Box(6094)),
+Box(Box(6095)),
+Box(Box(6096)),
+Box(Box(6097)),
+Box(Box(6098)),
+Box(Box(6099)),
+Box(Box(6100)),
+Box(Box(6101)),
+Box(Box(6102)),
+Box(Box(6103)),
+Box(Box(6104)),
+Box(Box(6105)),
+Box(Box(6106)),
+Box(Box(6107)),
+Box(Box(6108)),
+Box(Box(6109)),
+Box(Box(6110)),
+Box(Box(6111)),
+Box(Box(6112)),
+Box(Box(6113)),
+Box(Box(6114)),
+Box(Box(6115)),
+Box(Box(6116)),
+Box(Box(6117)),
+Box(Box(6118)),
+Box(Box(6119)),
+Box(Box(6120)),
+Box(Box(6121)),
+Box(Box(6122)),
+Box(Box(6123)),
+Box(Box(6124)),
+Box(Box(6125)),
+Box(Box(6126)),
+Box(Box(6127)),
+Box(Box(6128)),
+Box(Box(6129)),
+Box(Box(6130)),
+Box(Box(6131)),
+Box(Box(6132)),
+Box(Box(6133)),
+Box(Box(6134)),
+Box(Box(6135)),
+Box(Box(6136)),
+Box(Box(6137)),
+Box(Box(6138)),
+Box(Box(6139)),
+Box(Box(6140)),
+Box(Box(6141)),
+Box(Box(6142)),
+Box(Box(6143)),
+Box(Box(6144)),
+Box(Box(6145)),
+Box(Box(6146)),
+Box(Box(6147)),
+Box(Box(6148)),
+Box(Box(6149)),
+Box(Box(6150)),
+Box(Box(6151)),
+Box(Box(6152)),
+Box(Box(6153)),
+Box(Box(6154)),
+Box(Box(6155)),
+Box(Box(6156)),
+Box(Box(6157)),
+Box(Box(6158)),
+Box(Box(6159)),
+Box(Box(6160)),
+Box(Box(6161)),
+Box(Box(6162)),
+Box(Box(6163)),
+Box(Box(6164)),
+Box(Box(6165)),
+Box(Box(6166)),
+Box(Box(6167)),
+Box(Box(6168)),
+Box(Box(6169)),
+Box(Box(6170)),
+Box(Box(6171)),
+Box(Box(6172)),
+Box(Box(6173)),
+Box(Box(6174)),
+Box(Box(6175)),
+Box(Box(6176)),
+Box(Box(6177)),
+Box(Box(6178)),
+Box(Box(6179)),
+Box(Box(6180)),
+Box(Box(6181)),
+Box(Box(6182)),
+Box(Box(6183)),
+Box(Box(6184)),
+Box(Box(6185)),
+Box(Box(6186)),
+Box(Box(6187)),
+Box(Box(6188)),
+Box(Box(6189)),
+Box(Box(6190)),
+Box(Box(6191)),
+Box(Box(6192)),
+Box(Box(6193)),
+Box(Box(6194)),
+Box(Box(6195)),
+Box(Box(6196)),
+Box(Box(6197)),
+Box(Box(6198)),
+Box(Box(6199)),
+Box(Box(6200)),
+Box(Box(6201)),
+Box(Box(6202)),
+Box(Box(6203)),
+Box(Box(6204)),
+Box(Box(6205)),
+Box(Box(6206)),
+Box(Box(6207)),
+Box(Box(6208)),
+Box(Box(6209)),
+Box(Box(6210)),
+Box(Box(6211)),
+Box(Box(6212)),
+Box(Box(6213)),
+Box(Box(6214)),
+Box(Box(6215)),
+Box(Box(6216)),
+Box(Box(6217)),
+Box(Box(6218)),
+Box(Box(6219)),
+Box(Box(6220)),
+Box(Box(6221)),
+Box(Box(6222)),
+Box(Box(6223)),
+Box(Box(6224)),
+Box(Box(6225)),
+Box(Box(6226)),
+Box(Box(6227)),
+Box(Box(6228)),
+Box(Box(6229)),
+Box(Box(6230)),
+Box(Box(6231)),
+Box(Box(6232)),
+Box(Box(6233)),
+Box(Box(6234)),
+Box(Box(6235)),
+Box(Box(6236)),
+Box(Box(6237)),
+Box(Box(6238)),
+Box(Box(6239)),
+Box(Box(6240)),
+Box(Box(6241)),
+Box(Box(6242)),
+Box(Box(6243)),
+Box(Box(6244)),
+Box(Box(6245)),
+Box(Box(6246)),
+Box(Box(6247)),
+Box(Box(6248)),
+Box(Box(6249)),
+Box(Box(6250)),
+Box(Box(6251)),
+Box(Box(6252)),
+Box(Box(6253)),
+Box(Box(6254)),
+Box(Box(6255)),
+Box(Box(6256)),
+Box(Box(6257)),
+Box(Box(6258)),
+Box(Box(6259)),
+Box(Box(6260)),
+Box(Box(6261)),
+Box(Box(6262)),
+Box(Box(6263)),
+Box(Box(6264)),
+Box(Box(6265)),
+Box(Box(6266)),
+Box(Box(6267)),
+Box(Box(6268)),
+Box(Box(6269)),
+Box(Box(6270)),
+Box(Box(6271)),
+Box(Box(6272)),
+Box(Box(6273)),
+Box(Box(6274)),
+Box(Box(6275)),
+Box(Box(6276)),
+Box(Box(6277)),
+Box(Box(6278)),
+Box(Box(6279)),
+Box(Box(6280)),
+Box(Box(6281)),
+Box(Box(6282)),
+Box(Box(6283)),
+Box(Box(6284)),
+Box(Box(6285)),
+Box(Box(6286)),
+Box(Box(6287)),
+Box(Box(6288)),
+Box(Box(6289)),
+Box(Box(6290)),
+Box(Box(6291)),
+Box(Box(6292)),
+Box(Box(6293)),
+Box(Box(6294)),
+Box(Box(6295)),
+Box(Box(6296)),
+Box(Box(6297)),
+Box(Box(6298)),
+Box(Box(6299)),
+Box(Box(6300)),
+Box(Box(6301)),
+Box(Box(6302)),
+Box(Box(6303)),
+Box(Box(6304)),
+Box(Box(6305)),
+Box(Box(6306)),
+Box(Box(6307)),
+Box(Box(6308)),
+Box(Box(6309)),
+Box(Box(6310)),
+Box(Box(6311)),
+Box(Box(6312)),
+Box(Box(6313)),
+Box(Box(6314)),
+Box(Box(6315)),
+Box(Box(6316)),
+Box(Box(6317)),
+Box(Box(6318)),
+Box(Box(6319)),
+Box(Box(6320)),
+Box(Box(6321)),
+Box(Box(6322)),
+Box(Box(6323)),
+Box(Box(6324)),
+Box(Box(6325)),
+Box(Box(6326)),
+Box(Box(6327)),
+Box(Box(6328)),
+Box(Box(6329)),
+Box(Box(6330)),
+Box(Box(6331)),
+Box(Box(6332)),
+Box(Box(6333)),
+Box(Box(6334)),
+Box(Box(6335)),
+Box(Box(6336)),
+Box(Box(6337)),
+Box(Box(6338)),
+Box(Box(6339)),
+Box(Box(6340)),
+Box(Box(6341)),
+Box(Box(6342)),
+Box(Box(6343)),
+Box(Box(6344)),
+Box(Box(6345)),
+Box(Box(6346)),
+Box(Box(6347)),
+Box(Box(6348)),
+Box(Box(6349)),
+Box(Box(6350)),
+Box(Box(6351)),
+Box(Box(6352)),
+Box(Box(6353)),
+Box(Box(6354)),
+Box(Box(6355)),
+Box(Box(6356)),
+Box(Box(6357)),
+Box(Box(6358)),
+Box(Box(6359)),
+Box(Box(6360)),
+Box(Box(6361)),
+Box(Box(6362)),
+Box(Box(6363)),
+Box(Box(6364)),
+Box(Box(6365)),
+Box(Box(6366)),
+Box(Box(6367)),
+Box(Box(6368)),
+Box(Box(6369)),
+Box(Box(6370)),
+Box(Box(6371)),
+Box(Box(6372)),
+Box(Box(6373)),
+Box(Box(6374)),
+Box(Box(6375)),
+Box(Box(6376)),
+Box(Box(6377)),
+Box(Box(6378)),
+Box(Box(6379)),
+Box(Box(6380)),
+Box(Box(6381)),
+Box(Box(6382)),
+Box(Box(6383)),
+Box(Box(6384)),
+Box(Box(6385)),
+Box(Box(6386)),
+Box(Box(6387)),
+Box(Box(6388)),
+Box(Box(6389)),
+Box(Box(6390)),
+Box(Box(6391)),
+Box(Box(6392)),
+Box(Box(6393)),
+Box(Box(6394)),
+Box(Box(6395)),
+Box(Box(6396)),
+Box(Box(6397)),
+Box(Box(6398)),
+Box(Box(6399)),
+Box(Box(6400)),
+Box(Box(6401)),
+Box(Box(6402)),
+Box(Box(6403)),
+Box(Box(6404)),
+Box(Box(6405)),
+Box(Box(6406)),
+Box(Box(6407)),
+Box(Box(6408)),
+Box(Box(6409)),
+Box(Box(6410)),
+Box(Box(6411)),
+Box(Box(6412)),
+Box(Box(6413)),
+Box(Box(6414)),
+Box(Box(6415)),
+Box(Box(6416)),
+Box(Box(6417)),
+Box(Box(6418)),
+Box(Box(6419)),
+Box(Box(6420)),
+Box(Box(6421)),
+Box(Box(6422)),
+Box(Box(6423)),
+Box(Box(6424)),
+Box(Box(6425)),
+Box(Box(6426)),
+Box(Box(6427)),
+Box(Box(6428)),
+Box(Box(6429)),
+Box(Box(6430)),
+Box(Box(6431)),
+Box(Box(6432)),
+Box(Box(6433)),
+Box(Box(6434)),
+Box(Box(6435)),
+Box(Box(6436)),
+Box(Box(6437)),
+Box(Box(6438)),
+Box(Box(6439)),
+Box(Box(6440)),
+Box(Box(6441)),
+Box(Box(6442)),
+Box(Box(6443)),
+Box(Box(6444)),
+Box(Box(6445)),
+Box(Box(6446)),
+Box(Box(6447)),
+Box(Box(6448)),
+Box(Box(6449)),
+Box(Box(6450)),
+Box(Box(6451)),
+Box(Box(6452)),
+Box(Box(6453)),
+Box(Box(6454)),
+Box(Box(6455)),
+Box(Box(6456)),
+Box(Box(6457)),
+Box(Box(6458)),
+Box(Box(6459)),
+Box(Box(6460)),
+Box(Box(6461)),
+Box(Box(6462)),
+Box(Box(6463)),
+Box(Box(6464)),
+Box(Box(6465)),
+Box(Box(6466)),
+Box(Box(6467)),
+Box(Box(6468)),
+Box(Box(6469)),
+Box(Box(6470)),
+Box(Box(6471)),
+Box(Box(6472)),
+Box(Box(6473)),
+Box(Box(6474)),
+Box(Box(6475)),
+Box(Box(6476)),
+Box(Box(6477)),
+Box(Box(6478)),
+Box(Box(6479)),
+Box(Box(6480)),
+Box(Box(6481)),
+Box(Box(6482)),
+Box(Box(6483)),
+Box(Box(6484)),
+Box(Box(6485)),
+Box(Box(6486)),
+Box(Box(6487)),
+Box(Box(6488)),
+Box(Box(6489)),
+Box(Box(6490)),
+Box(Box(6491)),
+Box(Box(6492)),
+Box(Box(6493)),
+Box(Box(6494)),
+Box(Box(6495)),
+Box(Box(6496)),
+Box(Box(6497)),
+Box(Box(6498)),
+Box(Box(6499)),
+Box(Box(6500)),
+Box(Box(6501)),
+Box(Box(6502)),
+Box(Box(6503)),
+Box(Box(6504)),
+Box(Box(6505)),
+Box(Box(6506)),
+Box(Box(6507)),
+Box(Box(6508)),
+Box(Box(6509)),
+Box(Box(6510)),
+Box(Box(6511)),
+Box(Box(6512)),
+Box(Box(6513)),
+Box(Box(6514)),
+Box(Box(6515)),
+Box(Box(6516)),
+Box(Box(6517)),
+Box(Box(6518)),
+Box(Box(6519)),
+Box(Box(6520)),
+Box(Box(6521)),
+Box(Box(6522)),
+Box(Box(6523)),
+Box(Box(6524)),
+Box(Box(6525)),
+Box(Box(6526)),
+Box(Box(6527)),
+Box(Box(6528)),
+Box(Box(6529)),
+Box(Box(6530)),
+Box(Box(6531)),
+Box(Box(6532)),
+Box(Box(6533)),
+Box(Box(6534)),
+Box(Box(6535)),
+Box(Box(6536)),
+Box(Box(6537)),
+Box(Box(6538)),
+Box(Box(6539)),
+Box(Box(6540)),
+Box(Box(6541)),
+Box(Box(6542)),
+Box(Box(6543)),
+Box(Box(6544)),
+Box(Box(6545)),
+Box(Box(6546)),
+Box(Box(6547)),
+Box(Box(6548)),
+Box(Box(6549)),
+Box(Box(6550)),
+Box(Box(6551)),
+Box(Box(6552)),
+Box(Box(6553)),
+Box(Box(6554)),
+Box(Box(6555)),
+Box(Box(6556)),
+Box(Box(6557)),
+Box(Box(6558)),
+Box(Box(6559)),
+Box(Box(6560)),
+Box(Box(6561)),
+Box(Box(6562)),
+Box(Box(6563)),
+Box(Box(6564)),
+Box(Box(6565)),
+Box(Box(6566)),
+Box(Box(6567)),
+Box(Box(6568)),
+Box(Box(6569)),
+Box(Box(6570)),
+Box(Box(6571)),
+Box(Box(6572)),
+Box(Box(6573)),
+Box(Box(6574)),
+Box(Box(6575)),
+Box(Box(6576)),
+Box(Box(6577)),
+Box(Box(6578)),
+Box(Box(6579)),
+Box(Box(6580)),
+Box(Box(6581)),
+Box(Box(6582)),
+Box(Box(6583)),
+Box(Box(6584)),
+Box(Box(6585)),
+Box(Box(6586)),
+Box(Box(6587)),
+Box(Box(6588)),
+Box(Box(6589)),
+Box(Box(6590)),
+Box(Box(6591)),
+Box(Box(6592)),
+Box(Box(6593)),
+Box(Box(6594)),
+Box(Box(6595)),
+Box(Box(6596)),
+Box(Box(6597)),
+Box(Box(6598)),
+Box(Box(6599)),
+Box(Box(6600)),
+Box(Box(6601)),
+Box(Box(6602)),
+Box(Box(6603)),
+Box(Box(6604)),
+Box(Box(6605)),
+Box(Box(6606)),
+Box(Box(6607)),
+Box(Box(6608)),
+Box(Box(6609)),
+Box(Box(6610)),
+Box(Box(6611)),
+Box(Box(6612)),
+Box(Box(6613)),
+Box(Box(6614)),
+Box(Box(6615)),
+Box(Box(6616)),
+Box(Box(6617)),
+Box(Box(6618)),
+Box(Box(6619)),
+Box(Box(6620)),
+Box(Box(6621)),
+Box(Box(6622)),
+Box(Box(6623)),
+Box(Box(6624)),
+Box(Box(6625)),
+Box(Box(6626)),
+Box(Box(6627)),
+Box(Box(6628)),
+Box(Box(6629)),
+Box(Box(6630)),
+Box(Box(6631)),
+Box(Box(6632)),
+Box(Box(6633)),
+Box(Box(6634)),
+Box(Box(6635)),
+Box(Box(6636)),
+Box(Box(6637)),
+Box(Box(6638)),
+Box(Box(6639)),
+Box(Box(6640)),
+Box(Box(6641)),
+Box(Box(6642)),
+Box(Box(6643)),
+Box(Box(6644)),
+Box(Box(6645)),
+Box(Box(6646)),
+Box(Box(6647)),
+Box(Box(6648)),
+Box(Box(6649)),
+Box(Box(6650)),
+Box(Box(6651)),
+Box(Box(6652)),
+Box(Box(6653)),
+Box(Box(6654)),
+Box(Box(6655)),
+Box(Box(6656)),
+Box(Box(6657)),
+Box(Box(6658)),
+Box(Box(6659)),
+Box(Box(6660)),
+Box(Box(6661)),
+Box(Box(6662)),
+Box(Box(6663)),
+Box(Box(6664)),
+Box(Box(6665)),
+Box(Box(6666)),
+Box(Box(6667)),
+Box(Box(6668)),
+Box(Box(6669)),
+Box(Box(6670)),
+Box(Box(6671)),
+Box(Box(6672)),
+Box(Box(6673)),
+Box(Box(6674)),
+Box(Box(6675)),
+Box(Box(6676)),
+Box(Box(6677)),
+Box(Box(6678)),
+Box(Box(6679)),
+Box(Box(6680)),
+Box(Box(6681)),
+Box(Box(6682)),
+Box(Box(6683)),
+Box(Box(6684)),
+Box(Box(6685)),
+Box(Box(6686)),
+Box(Box(6687)),
+Box(Box(6688)),
+Box(Box(6689)),
+Box(Box(6690)),
+Box(Box(6691)),
+Box(Box(6692)),
+Box(Box(6693)),
+Box(Box(6694)),
+Box(Box(6695)),
+Box(Box(6696)),
+Box(Box(6697)),
+Box(Box(6698)),
+Box(Box(6699)),
+Box(Box(6700)),
+Box(Box(6701)),
+Box(Box(6702)),
+Box(Box(6703)),
+Box(Box(6704)),
+Box(Box(6705)),
+Box(Box(6706)),
+Box(Box(6707)),
+Box(Box(6708)),
+Box(Box(6709)),
+Box(Box(6710)),
+Box(Box(6711)),
+Box(Box(6712)),
+Box(Box(6713)),
+Box(Box(6714)),
+Box(Box(6715)),
+Box(Box(6716)),
+Box(Box(6717)),
+Box(Box(6718)),
+Box(Box(6719)),
+Box(Box(6720)),
+Box(Box(6721)),
+Box(Box(6722)),
+Box(Box(6723)),
+Box(Box(6724)),
+Box(Box(6725)),
+Box(Box(6726)),
+Box(Box(6727)),
+Box(Box(6728)),
+Box(Box(6729)),
+Box(Box(6730)),
+Box(Box(6731)),
+Box(Box(6732)),
+Box(Box(6733)),
+Box(Box(6734)),
+Box(Box(6735)),
+Box(Box(6736)),
+Box(Box(6737)),
+Box(Box(6738)),
+Box(Box(6739)),
+Box(Box(6740)),
+Box(Box(6741)),
+Box(Box(6742)),
+Box(Box(6743)),
+Box(Box(6744)),
+Box(Box(6745)),
+Box(Box(6746)),
+Box(Box(6747)),
+Box(Box(6748)),
+Box(Box(6749)),
+Box(Box(6750)),
+Box(Box(6751)),
+Box(Box(6752)),
+Box(Box(6753)),
+Box(Box(6754)),
+Box(Box(6755)),
+Box(Box(6756)),
+Box(Box(6757)),
+Box(Box(6758)),
+Box(Box(6759)),
+Box(Box(6760)),
+Box(Box(6761)),
+Box(Box(6762)),
+Box(Box(6763)),
+Box(Box(6764)),
+Box(Box(6765)),
+Box(Box(6766)),
+Box(Box(6767)),
+Box(Box(6768)),
+Box(Box(6769)),
+Box(Box(6770)),
+Box(Box(6771)),
+Box(Box(6772)),
+Box(Box(6773)),
+Box(Box(6774)),
+Box(Box(6775)),
+Box(Box(6776)),
+Box(Box(6777)),
+Box(Box(6778)),
+Box(Box(6779)),
+Box(Box(6780)),
+Box(Box(6781)),
+Box(Box(6782)),
+Box(Box(6783)),
+Box(Box(6784)),
+Box(Box(6785)),
+Box(Box(6786)),
+Box(Box(6787)),
+Box(Box(6788)),
+Box(Box(6789)),
+Box(Box(6790)),
+Box(Box(6791)),
+Box(Box(6792)),
+Box(Box(6793)),
+Box(Box(6794)),
+Box(Box(6795)),
+Box(Box(6796)),
+Box(Box(6797)),
+Box(Box(6798)),
+Box(Box(6799)),
+Box(Box(6800)),
+Box(Box(6801)),
+Box(Box(6802)),
+Box(Box(6803)),
+Box(Box(6804)),
+Box(Box(6805)),
+Box(Box(6806)),
+Box(Box(6807)),
+Box(Box(6808)),
+Box(Box(6809)),
+Box(Box(6810)),
+Box(Box(6811)),
+Box(Box(6812)),
+Box(Box(6813)),
+Box(Box(6814)),
+Box(Box(6815)),
+Box(Box(6816)),
+Box(Box(6817)),
+Box(Box(6818)),
+Box(Box(6819)),
+Box(Box(6820)),
+Box(Box(6821)),
+Box(Box(6822)),
+Box(Box(6823)),
+Box(Box(6824)),
+Box(Box(6825)),
+Box(Box(6826)),
+Box(Box(6827)),
+Box(Box(6828)),
+Box(Box(6829)),
+Box(Box(6830)),
+Box(Box(6831)),
+Box(Box(6832)),
+Box(Box(6833)),
+Box(Box(6834)),
+Box(Box(6835)),
+Box(Box(6836)),
+Box(Box(6837)),
+Box(Box(6838)),
+Box(Box(6839)),
+Box(Box(6840)),
+Box(Box(6841)),
+Box(Box(6842)),
+Box(Box(6843)),
+Box(Box(6844)),
+Box(Box(6845)),
+Box(Box(6846)),
+Box(Box(6847)),
+Box(Box(6848)),
+Box(Box(6849)),
+Box(Box(6850)),
+Box(Box(6851)),
+Box(Box(6852)),
+Box(Box(6853)),
+Box(Box(6854)),
+Box(Box(6855)),
+Box(Box(6856)),
+Box(Box(6857)),
+Box(Box(6858)),
+Box(Box(6859)),
+Box(Box(6860)),
+Box(Box(6861)),
+Box(Box(6862)),
+Box(Box(6863)),
+Box(Box(6864)),
+Box(Box(6865)),
+Box(Box(6866)),
+Box(Box(6867)),
+Box(Box(6868)),
+Box(Box(6869)),
+Box(Box(6870)),
+Box(Box(6871)),
+Box(Box(6872)),
+Box(Box(6873)),
+Box(Box(6874)),
+Box(Box(6875)),
+Box(Box(6876)),
+Box(Box(6877)),
+Box(Box(6878)),
+Box(Box(6879)),
+Box(Box(6880)),
+Box(Box(6881)),
+Box(Box(6882)),
+Box(Box(6883)),
+Box(Box(6884)),
+Box(Box(6885)),
+Box(Box(6886)),
+Box(Box(6887)),
+Box(Box(6888)),
+Box(Box(6889)),
+Box(Box(6890)),
+Box(Box(6891)),
+Box(Box(6892)),
+Box(Box(6893)),
+Box(Box(6894)),
+Box(Box(6895)),
+Box(Box(6896)),
+Box(Box(6897)),
+Box(Box(6898)),
+Box(Box(6899)),
+Box(Box(6900)),
+Box(Box(6901)),
+Box(Box(6902)),
+Box(Box(6903)),
+Box(Box(6904)),
+Box(Box(6905)),
+Box(Box(6906)),
+Box(Box(6907)),
+Box(Box(6908)),
+Box(Box(6909)),
+Box(Box(6910)),
+Box(Box(6911)),
+Box(Box(6912)),
+Box(Box(6913)),
+Box(Box(6914)),
+Box(Box(6915)),
+Box(Box(6916)),
+Box(Box(6917)),
+Box(Box(6918)),
+Box(Box(6919)),
+Box(Box(6920)),
+Box(Box(6921)),
+Box(Box(6922)),
+Box(Box(6923)),
+Box(Box(6924)),
+Box(Box(6925)),
+Box(Box(6926)),
+Box(Box(6927)),
+Box(Box(6928)),
+Box(Box(6929)),
+Box(Box(6930)),
+Box(Box(6931)),
+Box(Box(6932)),
+Box(Box(6933)),
+Box(Box(6934)),
+Box(Box(6935)),
+Box(Box(6936)),
+Box(Box(6937)),
+Box(Box(6938)),
+Box(Box(6939)),
+Box(Box(6940)),
+Box(Box(6941)),
+Box(Box(6942)),
+Box(Box(6943)),
+Box(Box(6944)),
+Box(Box(6945)),
+Box(Box(6946)),
+Box(Box(6947)),
+Box(Box(6948)),
+Box(Box(6949)),
+Box(Box(6950)),
+Box(Box(6951)),
+Box(Box(6952)),
+Box(Box(6953)),
+Box(Box(6954)),
+Box(Box(6955)),
+Box(Box(6956)),
+Box(Box(6957)),
+Box(Box(6958)),
+Box(Box(6959)),
+Box(Box(6960)),
+Box(Box(6961)),
+Box(Box(6962)),
+Box(Box(6963)),
+Box(Box(6964)),
+Box(Box(6965)),
+Box(Box(6966)),
+Box(Box(6967)),
+Box(Box(6968)),
+Box(Box(6969)),
+Box(Box(6970)),
+Box(Box(6971)),
+Box(Box(6972)),
+Box(Box(6973)),
+Box(Box(6974)),
+Box(Box(6975)),
+Box(Box(6976)),
+Box(Box(6977)),
+Box(Box(6978)),
+Box(Box(6979)),
+Box(Box(6980)),
+Box(Box(6981)),
+Box(Box(6982)),
+Box(Box(6983)),
+Box(Box(6984)),
+Box(Box(6985)),
+Box(Box(6986)),
+Box(Box(6987)),
+Box(Box(6988)),
+Box(Box(6989)),
+Box(Box(6990)),
+Box(Box(6991)),
+Box(Box(6992)),
+Box(Box(6993)),
+Box(Box(6994)),
+Box(Box(6995)),
+Box(Box(6996)),
+Box(Box(6997)),
+Box(Box(6998)),
+Box(Box(6999)),
+Box(Box(7000)),
+Box(Box(7001)),
+Box(Box(7002)),
+Box(Box(7003)),
+Box(Box(7004)),
+Box(Box(7005)),
+Box(Box(7006)),
+Box(Box(7007)),
+Box(Box(7008)),
+Box(Box(7009)),
+Box(Box(7010)),
+Box(Box(7011)),
+Box(Box(7012)),
+Box(Box(7013)),
+Box(Box(7014)),
+Box(Box(7015)),
+Box(Box(7016)),
+Box(Box(7017)),
+Box(Box(7018)),
+Box(Box(7019)),
+Box(Box(7020)),
+Box(Box(7021)),
+Box(Box(7022)),
+Box(Box(7023)),
+Box(Box(7024)),
+Box(Box(7025)),
+Box(Box(7026)),
+Box(Box(7027)),
+Box(Box(7028)),
+Box(Box(7029)),
+Box(Box(7030)),
+Box(Box(7031)),
+Box(Box(7032)),
+Box(Box(7033)),
+Box(Box(7034)),
+Box(Box(7035)),
+Box(Box(7036)),
+Box(Box(7037)),
+Box(Box(7038)),
+Box(Box(7039)),
+Box(Box(7040)),
+Box(Box(7041)),
+Box(Box(7042)),
+Box(Box(7043)),
+Box(Box(7044)),
+Box(Box(7045)),
+Box(Box(7046)),
+Box(Box(7047)),
+Box(Box(7048)),
+Box(Box(7049)),
+Box(Box(7050)),
+Box(Box(7051)),
+Box(Box(7052)),
+Box(Box(7053)),
+Box(Box(7054)),
+Box(Box(7055)),
+Box(Box(7056)),
+Box(Box(7057)),
+Box(Box(7058)),
+Box(Box(7059)),
+Box(Box(7060)),
+Box(Box(7061)),
+Box(Box(7062)),
+Box(Box(7063)),
+Box(Box(7064)),
+Box(Box(7065)),
+Box(Box(7066)),
+Box(Box(7067)),
+Box(Box(7068)),
+Box(Box(7069)),
+Box(Box(7070)),
+Box(Box(7071)),
+Box(Box(7072)),
+Box(Box(7073)),
+Box(Box(7074)),
+Box(Box(7075)),
+Box(Box(7076)),
+Box(Box(7077)),
+Box(Box(7078)),
+Box(Box(7079)),
+Box(Box(7080)),
+Box(Box(7081)),
+Box(Box(7082)),
+Box(Box(7083)),
+Box(Box(7084)),
+Box(Box(7085)),
+Box(Box(7086)),
+Box(Box(7087)),
+Box(Box(7088)),
+Box(Box(7089)),
+Box(Box(7090)),
+Box(Box(7091)),
+Box(Box(7092)),
+Box(Box(7093)),
+Box(Box(7094)),
+Box(Box(7095)),
+Box(Box(7096)),
+Box(Box(7097)),
+Box(Box(7098)),
+Box(Box(7099)),
+Box(Box(7100)),
+Box(Box(7101)),
+Box(Box(7102)),
+Box(Box(7103)),
+Box(Box(7104)),
+Box(Box(7105)),
+Box(Box(7106)),
+Box(Box(7107)),
+Box(Box(7108)),
+Box(Box(7109)),
+Box(Box(7110)),
+Box(Box(7111)),
+Box(Box(7112)),
+Box(Box(7113)),
+Box(Box(7114)),
+Box(Box(7115)),
+Box(Box(7116)),
+Box(Box(7117)),
+Box(Box(7118)),
+Box(Box(7119)),
+Box(Box(7120)),
+Box(Box(7121)),
+Box(Box(7122)),
+Box(Box(7123)),
+Box(Box(7124)),
+Box(Box(7125)),
+Box(Box(7126)),
+Box(Box(7127)),
+Box(Box(7128)),
+Box(Box(7129)),
+Box(Box(7130)),
+Box(Box(7131)),
+Box(Box(7132)),
+Box(Box(7133)),
+Box(Box(7134)),
+Box(Box(7135)),
+Box(Box(7136)),
+Box(Box(7137)),
+Box(Box(7138)),
+Box(Box(7139)),
+Box(Box(7140)),
+Box(Box(7141)),
+Box(Box(7142)),
+Box(Box(7143)),
+Box(Box(7144)),
+Box(Box(7145)),
+Box(Box(7146)),
+Box(Box(7147)),
+Box(Box(7148)),
+Box(Box(7149)),
+Box(Box(7150)),
+Box(Box(7151)),
+Box(Box(7152)),
+Box(Box(7153)),
+Box(Box(7154)),
+Box(Box(7155)),
+Box(Box(7156)),
+Box(Box(7157)),
+Box(Box(7158)),
+Box(Box(7159)),
+Box(Box(7160)),
+Box(Box(7161)),
+Box(Box(7162)),
+Box(Box(7163)),
+Box(Box(7164)),
+Box(Box(7165)),
+Box(Box(7166)),
+Box(Box(7167)),
+Box(Box(7168)),
+Box(Box(7169)),
+Box(Box(7170)),
+Box(Box(7171)),
+Box(Box(7172)),
+Box(Box(7173)),
+Box(Box(7174)),
+Box(Box(7175)),
+Box(Box(7176)),
+Box(Box(7177)),
+Box(Box(7178)),
+Box(Box(7179)),
+Box(Box(7180)),
+Box(Box(7181)),
+Box(Box(7182)),
+Box(Box(7183)),
+Box(Box(7184)),
+Box(Box(7185)),
+Box(Box(7186)),
+Box(Box(7187)),
+Box(Box(7188)),
+Box(Box(7189)),
+Box(Box(7190)),
+Box(Box(7191)),
+Box(Box(7192)),
+Box(Box(7193)),
+Box(Box(7194)),
+Box(Box(7195)),
+Box(Box(7196)),
+Box(Box(7197)),
+Box(Box(7198)),
+Box(Box(7199)),
+Box(Box(7200)),
+Box(Box(7201)),
+Box(Box(7202)),
+Box(Box(7203)),
+Box(Box(7204)),
+Box(Box(7205)),
+Box(Box(7206)),
+Box(Box(7207)),
+Box(Box(7208)),
+Box(Box(7209)),
+Box(Box(7210)),
+Box(Box(7211)),
+Box(Box(7212)),
+Box(Box(7213)),
+Box(Box(7214)),
+Box(Box(7215)),
+Box(Box(7216)),
+Box(Box(7217)),
+Box(Box(7218)),
+Box(Box(7219)),
+Box(Box(7220)),
+Box(Box(7221)),
+Box(Box(7222)),
+Box(Box(7223)),
+Box(Box(7224)),
+Box(Box(7225)),
+Box(Box(7226)),
+Box(Box(7227)),
+Box(Box(7228)),
+Box(Box(7229)),
+Box(Box(7230)),
+Box(Box(7231)),
+Box(Box(7232)),
+Box(Box(7233)),
+Box(Box(7234)),
+Box(Box(7235)),
+Box(Box(7236)),
+Box(Box(7237)),
+Box(Box(7238)),
+Box(Box(7239)),
+Box(Box(7240)),
+Box(Box(7241)),
+Box(Box(7242)),
+Box(Box(7243)),
+Box(Box(7244)),
+Box(Box(7245)),
+Box(Box(7246)),
+Box(Box(7247)),
+Box(Box(7248)),
+Box(Box(7249)),
+Box(Box(7250)),
+Box(Box(7251)),
+Box(Box(7252)),
+Box(Box(7253)),
+Box(Box(7254)),
+Box(Box(7255)),
+Box(Box(7256)),
+Box(Box(7257)),
+Box(Box(7258)),
+Box(Box(7259)),
+Box(Box(7260)),
+Box(Box(7261)),
+Box(Box(7262)),
+Box(Box(7263)),
+Box(Box(7264)),
+Box(Box(7265)),
+Box(Box(7266)),
+Box(Box(7267)),
+Box(Box(7268)),
+Box(Box(7269)),
+Box(Box(7270)),
+Box(Box(7271)),
+Box(Box(7272)),
+Box(Box(7273)),
+Box(Box(7274)),
+Box(Box(7275)),
+Box(Box(7276)),
+Box(Box(7277)),
+Box(Box(7278)),
+Box(Box(7279)),
+Box(Box(7280)),
+Box(Box(7281)),
+Box(Box(7282)),
+Box(Box(7283)),
+Box(Box(7284)),
+Box(Box(7285)),
+Box(Box(7286)),
+Box(Box(7287)),
+Box(Box(7288)),
+Box(Box(7289)),
+Box(Box(7290)),
+Box(Box(7291)),
+Box(Box(7292)),
+Box(Box(7293)),
+Box(Box(7294)),
+Box(Box(7295)),
+Box(Box(7296)),
+Box(Box(7297)),
+Box(Box(7298)),
+Box(Box(7299)),
+Box(Box(7300)),
+Box(Box(7301)),
+Box(Box(7302)),
+Box(Box(7303)),
+Box(Box(7304)),
+Box(Box(7305)),
+Box(Box(7306)),
+Box(Box(7307)),
+Box(Box(7308)),
+Box(Box(7309)),
+Box(Box(7310)),
+Box(Box(7311)),
+Box(Box(7312)),
+Box(Box(7313)),
+Box(Box(7314)),
+Box(Box(7315)),
+Box(Box(7316)),
+Box(Box(7317)),
+Box(Box(7318)),
+Box(Box(7319)),
+Box(Box(7320)),
+Box(Box(7321)),
+Box(Box(7322)),
+Box(Box(7323)),
+Box(Box(7324)),
+Box(Box(7325)),
+Box(Box(7326)),
+Box(Box(7327)),
+Box(Box(7328)),
+Box(Box(7329)),
+Box(Box(7330)),
+Box(Box(7331)),
+Box(Box(7332)),
+Box(Box(7333)),
+Box(Box(7334)),
+Box(Box(7335)),
+Box(Box(7336)),
+Box(Box(7337)),
+Box(Box(7338)),
+Box(Box(7339)),
+Box(Box(7340)),
+Box(Box(7341)),
+Box(Box(7342)),
+Box(Box(7343)),
+Box(Box(7344)),
+Box(Box(7345)),
+Box(Box(7346)),
+Box(Box(7347)),
+Box(Box(7348)),
+Box(Box(7349)),
+Box(Box(7350)),
+Box(Box(7351)),
+Box(Box(7352)),
+Box(Box(7353)),
+Box(Box(7354)),
+Box(Box(7355)),
+Box(Box(7356)),
+Box(Box(7357)),
+Box(Box(7358)),
+Box(Box(7359)),
+Box(Box(7360)),
+Box(Box(7361)),
+Box(Box(7362)),
+Box(Box(7363)),
+Box(Box(7364)),
+Box(Box(7365)),
+Box(Box(7366)),
+Box(Box(7367)),
+Box(Box(7368)),
+Box(Box(7369)),
+Box(Box(7370)),
+Box(Box(7371)),
+Box(Box(7372)),
+Box(Box(7373)),
+Box(Box(7374)),
+Box(Box(7375)),
+Box(Box(7376)),
+Box(Box(7377)),
+Box(Box(7378)),
+Box(Box(7379)),
+Box(Box(7380)),
+Box(Box(7381)),
+Box(Box(7382)),
+Box(Box(7383)),
+Box(Box(7384)),
+Box(Box(7385)),
+Box(Box(7386)),
+Box(Box(7387)),
+Box(Box(7388)),
+Box(Box(7389)),
+Box(Box(7390)),
+Box(Box(7391)),
+Box(Box(7392)),
+Box(Box(7393)),
+Box(Box(7394)),
+Box(Box(7395)),
+Box(Box(7396)),
+Box(Box(7397)),
+Box(Box(7398)),
+Box(Box(7399)),
+Box(Box(7400)),
+Box(Box(7401)),
+Box(Box(7402)),
+Box(Box(7403)),
+Box(Box(7404)),
+Box(Box(7405)),
+Box(Box(7406)),
+Box(Box(7407)),
+Box(Box(7408)),
+Box(Box(7409)),
+Box(Box(7410)),
+Box(Box(7411)),
+Box(Box(7412)),
+Box(Box(7413)),
+Box(Box(7414)),
+Box(Box(7415)),
+Box(Box(7416)),
+Box(Box(7417)),
+Box(Box(7418)),
+Box(Box(7419)),
+Box(Box(7420)),
+Box(Box(7421)),
+Box(Box(7422)),
+Box(Box(7423)),
+Box(Box(7424)),
+Box(Box(7425)),
+Box(Box(7426)),
+Box(Box(7427)),
+Box(Box(7428)),
+Box(Box(7429)),
+Box(Box(7430)),
+Box(Box(7431)),
+Box(Box(7432)),
+Box(Box(7433)),
+Box(Box(7434)),
+Box(Box(7435)),
+Box(Box(7436)),
+Box(Box(7437)),
+Box(Box(7438)),
+Box(Box(7439)),
+Box(Box(7440)),
+Box(Box(7441)),
+Box(Box(7442)),
+Box(Box(7443)),
+Box(Box(7444)),
+Box(Box(7445)),
+Box(Box(7446)),
+Box(Box(7447)),
+Box(Box(7448)),
+Box(Box(7449)),
+Box(Box(7450)),
+Box(Box(7451)),
+Box(Box(7452)),
+Box(Box(7453)),
+Box(Box(7454)),
+Box(Box(7455)),
+Box(Box(7456)),
+Box(Box(7457)),
+Box(Box(7458)),
+Box(Box(7459)),
+Box(Box(7460)),
+Box(Box(7461)),
+Box(Box(7462)),
+Box(Box(7463)),
+Box(Box(7464)),
+Box(Box(7465)),
+Box(Box(7466)),
+Box(Box(7467)),
+Box(Box(7468)),
+Box(Box(7469)),
+Box(Box(7470)),
+Box(Box(7471)),
+Box(Box(7472)),
+Box(Box(7473)),
+Box(Box(7474)),
+Box(Box(7475)),
+Box(Box(7476)),
+Box(Box(7477)),
+Box(Box(7478)),
+Box(Box(7479)),
+Box(Box(7480)),
+Box(Box(7481)),
+Box(Box(7482)),
+Box(Box(7483)),
+Box(Box(7484)),
+Box(Box(7485)),
+Box(Box(7486)),
+Box(Box(7487)),
+Box(Box(7488)),
+Box(Box(7489)),
+Box(Box(7490)),
+Box(Box(7491)),
+Box(Box(7492)),
+Box(Box(7493)),
+Box(Box(7494)),
+Box(Box(7495)),
+Box(Box(7496)),
+Box(Box(7497)),
+Box(Box(7498)),
+Box(Box(7499)),
+Box(Box(7500)),
+Box(Box(7501)),
+Box(Box(7502)),
+Box(Box(7503)),
+Box(Box(7504)),
+Box(Box(7505)),
+Box(Box(7506)),
+Box(Box(7507)),
+Box(Box(7508)),
+Box(Box(7509)),
+Box(Box(7510)),
+Box(Box(7511)),
+Box(Box(7512)),
+Box(Box(7513)),
+Box(Box(7514)),
+Box(Box(7515)),
+Box(Box(7516)),
+Box(Box(7517)),
+Box(Box(7518)),
+Box(Box(7519)),
+Box(Box(7520)),
+Box(Box(7521)),
+Box(Box(7522)),
+Box(Box(7523)),
+Box(Box(7524)),
+Box(Box(7525)),
+Box(Box(7526)),
+Box(Box(7527)),
+Box(Box(7528)),
+Box(Box(7529)),
+Box(Box(7530)),
+Box(Box(7531)),
+Box(Box(7532)),
+Box(Box(7533)),
+Box(Box(7534)),
+Box(Box(7535)),
+Box(Box(7536)),
+Box(Box(7537)),
+Box(Box(7538)),
+Box(Box(7539)),
+Box(Box(7540)),
+Box(Box(7541)),
+Box(Box(7542)),
+Box(Box(7543)),
+Box(Box(7544)),
+Box(Box(7545)),
+Box(Box(7546)),
+Box(Box(7547)),
+Box(Box(7548)),
+Box(Box(7549)),
+Box(Box(7550)),
+Box(Box(7551)),
+Box(Box(7552)),
+Box(Box(7553)),
+Box(Box(7554)),
+Box(Box(7555)),
+Box(Box(7556)),
+Box(Box(7557)),
+Box(Box(7558)),
+Box(Box(7559)),
+Box(Box(7560)),
+Box(Box(7561)),
+Box(Box(7562)),
+Box(Box(7563)),
+Box(Box(7564)),
+Box(Box(7565)),
+Box(Box(7566)),
+Box(Box(7567)),
+Box(Box(7568)),
+Box(Box(7569)),
+Box(Box(7570)),
+Box(Box(7571)),
+Box(Box(7572)),
+Box(Box(7573)),
+Box(Box(7574)),
+Box(Box(7575)),
+Box(Box(7576)),
+Box(Box(7577)),
+Box(Box(7578)),
+Box(Box(7579)),
+Box(Box(7580)),
+Box(Box(7581)),
+Box(Box(7582)),
+Box(Box(7583)),
+Box(Box(7584)),
+Box(Box(7585)),
+Box(Box(7586)),
+Box(Box(7587)),
+Box(Box(7588)),
+Box(Box(7589)),
+Box(Box(7590)),
+Box(Box(7591)),
+Box(Box(7592)),
+Box(Box(7593)),
+Box(Box(7594)),
+Box(Box(7595)),
+Box(Box(7596)),
+Box(Box(7597)),
+Box(Box(7598)),
+Box(Box(7599)),
+Box(Box(7600)),
+Box(Box(7601)),
+Box(Box(7602)),
+Box(Box(7603)),
+Box(Box(7604)),
+Box(Box(7605)),
+Box(Box(7606)),
+Box(Box(7607)),
+Box(Box(7608)),
+Box(Box(7609)),
+Box(Box(7610)),
+Box(Box(7611)),
+Box(Box(7612)),
+Box(Box(7613)),
+Box(Box(7614)),
+Box(Box(7615)),
+Box(Box(7616)),
+Box(Box(7617)),
+Box(Box(7618)),
+Box(Box(7619)),
+Box(Box(7620)),
+Box(Box(7621)),
+Box(Box(7622)),
+Box(Box(7623)),
+Box(Box(7624)),
+Box(Box(7625)),
+Box(Box(7626)),
+Box(Box(7627)),
+Box(Box(7628)),
+Box(Box(7629)),
+Box(Box(7630)),
+Box(Box(7631)),
+Box(Box(7632)),
+Box(Box(7633)),
+Box(Box(7634)),
+Box(Box(7635)),
+Box(Box(7636)),
+Box(Box(7637)),
+Box(Box(7638)),
+Box(Box(7639)),
+Box(Box(7640)),
+Box(Box(7641)),
+Box(Box(7642)),
+Box(Box(7643)),
+Box(Box(7644)),
+Box(Box(7645)),
+Box(Box(7646)),
+Box(Box(7647)),
+Box(Box(7648)),
+Box(Box(7649)),
+Box(Box(7650)),
+Box(Box(7651)),
+Box(Box(7652)),
+Box(Box(7653)),
+Box(Box(7654)),
+Box(Box(7655)),
+Box(Box(7656)),
+Box(Box(7657)),
+Box(Box(7658)),
+Box(Box(7659)),
+Box(Box(7660)),
+Box(Box(7661)),
+Box(Box(7662)),
+Box(Box(7663)),
+Box(Box(7664)),
+Box(Box(7665)),
+Box(Box(7666)),
+Box(Box(7667)),
+Box(Box(7668)),
+Box(Box(7669)),
+Box(Box(7670)),
+Box(Box(7671)),
+Box(Box(7672)),
+Box(Box(7673)),
+Box(Box(7674)),
+Box(Box(7675)),
+Box(Box(7676)),
+Box(Box(7677)),
+Box(Box(7678)),
+Box(Box(7679)),
+Box(Box(7680)),
+Box(Box(7681)),
+Box(Box(7682)),
+Box(Box(7683)),
+Box(Box(7684)),
+Box(Box(7685)),
+Box(Box(7686)),
+Box(Box(7687)),
+Box(Box(7688)),
+Box(Box(7689)),
+Box(Box(7690)),
+Box(Box(7691)),
+Box(Box(7692)),
+Box(Box(7693)),
+Box(Box(7694)),
+Box(Box(7695)),
+Box(Box(7696)),
+Box(Box(7697)),
+Box(Box(7698)),
+Box(Box(7699)),
+Box(Box(7700)),
+Box(Box(7701)),
+Box(Box(7702)),
+Box(Box(7703)),
+Box(Box(7704)),
+Box(Box(7705)),
+Box(Box(7706)),
+Box(Box(7707)),
+Box(Box(7708)),
+Box(Box(7709)),
+Box(Box(7710)),
+Box(Box(7711)),
+Box(Box(7712)),
+Box(Box(7713)),
+Box(Box(7714)),
+Box(Box(7715)),
+Box(Box(7716)),
+Box(Box(7717)),
+Box(Box(7718)),
+Box(Box(7719)),
+Box(Box(7720)),
+Box(Box(7721)),
+Box(Box(7722)),
+Box(Box(7723)),
+Box(Box(7724)),
+Box(Box(7725)),
+Box(Box(7726)),
+Box(Box(7727)),
+Box(Box(7728)),
+Box(Box(7729)),
+Box(Box(7730)),
+Box(Box(7731)),
+Box(Box(7732)),
+Box(Box(7733)),
+Box(Box(7734)),
+Box(Box(7735)),
+Box(Box(7736)),
+Box(Box(7737)),
+Box(Box(7738)),
+Box(Box(7739)),
+Box(Box(7740)),
+Box(Box(7741)),
+Box(Box(7742)),
+Box(Box(7743)),
+Box(Box(7744)),
+Box(Box(7745)),
+Box(Box(7746)),
+Box(Box(7747)),
+Box(Box(7748)),
+Box(Box(7749)),
+Box(Box(7750)),
+Box(Box(7751)),
+Box(Box(7752)),
+Box(Box(7753)),
+Box(Box(7754)),
+Box(Box(7755)),
+Box(Box(7756)),
+Box(Box(7757)),
+Box(Box(7758)),
+Box(Box(7759)),
+Box(Box(7760)),
+Box(Box(7761)),
+Box(Box(7762)),
+Box(Box(7763)),
+Box(Box(7764)),
+Box(Box(7765)),
+Box(Box(7766)),
+Box(Box(7767)),
+Box(Box(7768)),
+Box(Box(7769)),
+Box(Box(7770)),
+Box(Box(7771)),
+Box(Box(7772)),
+Box(Box(7773)),
+Box(Box(7774)),
+Box(Box(7775)),
+Box(Box(7776)),
+Box(Box(7777)),
+Box(Box(7778)),
+Box(Box(7779)),
+Box(Box(7780)),
+Box(Box(7781)),
+Box(Box(7782)),
+Box(Box(7783)),
+Box(Box(7784)),
+Box(Box(7785)),
+Box(Box(7786)),
+Box(Box(7787)),
+Box(Box(7788)),
+Box(Box(7789)),
+Box(Box(7790)),
+Box(Box(7791)),
+Box(Box(7792)),
+Box(Box(7793)),
+Box(Box(7794)),
+Box(Box(7795)),
+Box(Box(7796)),
+Box(Box(7797)),
+Box(Box(7798)),
+Box(Box(7799)),
+Box(Box(7800)),
+Box(Box(7801)),
+Box(Box(7802)),
+Box(Box(7803)),
+Box(Box(7804)),
+Box(Box(7805)),
+Box(Box(7806)),
+Box(Box(7807)),
+Box(Box(7808)),
+Box(Box(7809)),
+Box(Box(7810)),
+Box(Box(7811)),
+Box(Box(7812)),
+Box(Box(7813)),
+Box(Box(7814)),
+Box(Box(7815)),
+Box(Box(7816)),
+Box(Box(7817)),
+Box(Box(7818)),
+Box(Box(7819)),
+Box(Box(7820)),
+Box(Box(7821)),
+Box(Box(7822)),
+Box(Box(7823)),
+Box(Box(7824)),
+Box(Box(7825)),
+Box(Box(7826)),
+Box(Box(7827)),
+Box(Box(7828)),
+Box(Box(7829)),
+Box(Box(7830)),
+Box(Box(7831)),
+Box(Box(7832)),
+Box(Box(7833)),
+Box(Box(7834)),
+Box(Box(7835)),
+Box(Box(7836)),
+Box(Box(7837)),
+Box(Box(7838)),
+Box(Box(7839)),
+Box(Box(7840)),
+Box(Box(7841)),
+Box(Box(7842)),
+Box(Box(7843)),
+Box(Box(7844)),
+Box(Box(7845)),
+Box(Box(7846)),
+Box(Box(7847)),
+Box(Box(7848)),
+Box(Box(7849)),
+Box(Box(7850)),
+Box(Box(7851)),
+Box(Box(7852)),
+Box(Box(7853)),
+Box(Box(7854)),
+Box(Box(7855)),
+Box(Box(7856)),
+Box(Box(7857)),
+Box(Box(7858)),
+Box(Box(7859)),
+Box(Box(7860)),
+Box(Box(7861)),
+Box(Box(7862)),
+Box(Box(7863)),
+Box(Box(7864)),
+Box(Box(7865)),
+Box(Box(7866)),
+Box(Box(7867)),
+Box(Box(7868)),
+Box(Box(7869)),
+Box(Box(7870)),
+Box(Box(7871)),
+Box(Box(7872)),
+Box(Box(7873)),
+Box(Box(7874)),
+Box(Box(7875)),
+Box(Box(7876)),
+Box(Box(7877)),
+Box(Box(7878)),
+Box(Box(7879)),
+Box(Box(7880)),
+Box(Box(7881)),
+Box(Box(7882)),
+Box(Box(7883)),
+Box(Box(7884)),
+Box(Box(7885)),
+Box(Box(7886)),
+Box(Box(7887)),
+Box(Box(7888)),
+Box(Box(7889)),
+Box(Box(7890)),
+Box(Box(7891)),
+Box(Box(7892)),
+Box(Box(7893)),
+Box(Box(7894)),
+Box(Box(7895)),
+Box(Box(7896)),
+Box(Box(7897)),
+Box(Box(7898)),
+Box(Box(7899)),
+Box(Box(7900)),
+Box(Box(7901)),
+Box(Box(7902)),
+Box(Box(7903)),
+Box(Box(7904)),
+Box(Box(7905)),
+Box(Box(7906)),
+Box(Box(7907)),
+Box(Box(7908)),
+Box(Box(7909)),
+Box(Box(7910)),
+Box(Box(7911)),
+Box(Box(7912)),
+Box(Box(7913)),
+Box(Box(7914)),
+Box(Box(7915)),
+Box(Box(7916)),
+Box(Box(7917)),
+Box(Box(7918)),
+Box(Box(7919)),
+Box(Box(7920)),
+Box(Box(7921)),
+Box(Box(7922)),
+Box(Box(7923)),
+Box(Box(7924)),
+Box(Box(7925)),
+Box(Box(7926)),
+Box(Box(7927)),
+Box(Box(7928)),
+Box(Box(7929)),
+Box(Box(7930)),
+Box(Box(7931)),
+Box(Box(7932)),
+Box(Box(7933)),
+Box(Box(7934)),
+Box(Box(7935)),
+Box(Box(7936)),
+Box(Box(7937)),
+Box(Box(7938)),
+Box(Box(7939)),
+Box(Box(7940)),
+Box(Box(7941)),
+Box(Box(7942)),
+Box(Box(7943)),
+Box(Box(7944)),
+Box(Box(7945)),
+Box(Box(7946)),
+Box(Box(7947)),
+Box(Box(7948)),
+Box(Box(7949)),
+Box(Box(7950)),
+Box(Box(7951)),
+Box(Box(7952)),
+Box(Box(7953)),
+Box(Box(7954)),
+Box(Box(7955)),
+Box(Box(7956)),
+Box(Box(7957)),
+Box(Box(7958)),
+Box(Box(7959)),
+Box(Box(7960)),
+Box(Box(7961)),
+Box(Box(7962)),
+Box(Box(7963)),
+Box(Box(7964)),
+Box(Box(7965)),
+Box(Box(7966)),
+Box(Box(7967)),
+Box(Box(7968)),
+Box(Box(7969)),
+Box(Box(7970)),
+Box(Box(7971)),
+Box(Box(7972)),
+Box(Box(7973)),
+Box(Box(7974)),
+Box(Box(7975)),
+Box(Box(7976)),
+Box(Box(7977)),
+Box(Box(7978)),
+Box(Box(7979)),
+Box(Box(7980)),
+Box(Box(7981)),
+Box(Box(7982)),
+Box(Box(7983)),
+Box(Box(7984)),
+Box(Box(7985)),
+Box(Box(7986)),
+Box(Box(7987)),
+Box(Box(7988)),
+Box(Box(7989)),
+Box(Box(7990)),
+Box(Box(7991)),
+Box(Box(7992)),
+Box(Box(7993)),
+Box(Box(7994)),
+Box(Box(7995)),
+Box(Box(7996)),
+Box(Box(7997)),
+Box(Box(7998)),
+Box(Box(7999)),
+Box(Box(8000)),
+Box(Box(8001)),
+Box(Box(8002)),
+Box(Box(8003)),
+Box(Box(8004)),
+Box(Box(8005)),
+Box(Box(8006)),
+Box(Box(8007)),
+Box(Box(8008)),
+Box(Box(8009)),
+Box(Box(8010)),
+Box(Box(8011)),
+Box(Box(8012)),
+Box(Box(8013)),
+Box(Box(8014)),
+Box(Box(8015)),
+Box(Box(8016)),
+Box(Box(8017)),
+Box(Box(8018)),
+Box(Box(8019)),
+Box(Box(8020)),
+Box(Box(8021)),
+Box(Box(8022)),
+Box(Box(8023)),
+Box(Box(8024)),
+Box(Box(8025)),
+Box(Box(8026)),
+Box(Box(8027)),
+Box(Box(8028)),
+Box(Box(8029)),
+Box(Box(8030)),
+Box(Box(8031)),
+Box(Box(8032)),
+Box(Box(8033)),
+Box(Box(8034)),
+Box(Box(8035)),
+Box(Box(8036)),
+Box(Box(8037)),
+Box(Box(8038)),
+Box(Box(8039)),
+Box(Box(8040)),
+Box(Box(8041)),
+Box(Box(8042)),
+Box(Box(8043)),
+Box(Box(8044)),
+Box(Box(8045)),
+Box(Box(8046)),
+Box(Box(8047)),
+Box(Box(8048)),
+Box(Box(8049)),
+Box(Box(8050)),
+Box(Box(8051)),
+Box(Box(8052)),
+Box(Box(8053)),
+Box(Box(8054)),
+Box(Box(8055)),
+Box(Box(8056)),
+Box(Box(8057)),
+Box(Box(8058)),
+Box(Box(8059)),
+Box(Box(8060)),
+Box(Box(8061)),
+Box(Box(8062)),
+Box(Box(8063)),
+Box(Box(8064)),
+Box(Box(8065)),
+Box(Box(8066)),
+Box(Box(8067)),
+Box(Box(8068)),
+Box(Box(8069)),
+Box(Box(8070)),
+Box(Box(8071)),
+Box(Box(8072)),
+Box(Box(8073)),
+Box(Box(8074)),
+Box(Box(8075)),
+Box(Box(8076)),
+Box(Box(8077)),
+Box(Box(8078)),
+Box(Box(8079)),
+Box(Box(8080)),
+Box(Box(8081)),
+Box(Box(8082)),
+Box(Box(8083)),
+Box(Box(8084)),
+Box(Box(8085)),
+Box(Box(8086)),
+Box(Box(8087)),
+Box(Box(8088)),
+Box(Box(8089)),
+Box(Box(8090)),
+Box(Box(8091)),
+Box(Box(8092)),
+Box(Box(8093)),
+Box(Box(8094)),
+Box(Box(8095)),
+Box(Box(8096)),
+Box(Box(8097)),
+Box(Box(8098)),
+Box(Box(8099)),
+Box(Box(8100)),
+Box(Box(8101)),
+Box(Box(8102)),
+Box(Box(8103)),
+Box(Box(8104)),
+Box(Box(8105)),
+Box(Box(8106)),
+Box(Box(8107)),
+Box(Box(8108)),
+Box(Box(8109)),
+Box(Box(8110)),
+Box(Box(8111)),
+Box(Box(8112)),
+Box(Box(8113)),
+Box(Box(8114)),
+Box(Box(8115)),
+Box(Box(8116)),
+Box(Box(8117)),
+Box(Box(8118)),
+Box(Box(8119)),
+Box(Box(8120)),
+Box(Box(8121)),
+Box(Box(8122)),
+Box(Box(8123)),
+Box(Box(8124)),
+Box(Box(8125)),
+Box(Box(8126)),
+Box(Box(8127)),
+Box(Box(8128)),
+Box(Box(8129)),
+Box(Box(8130)),
+Box(Box(8131)),
+Box(Box(8132)),
+Box(Box(8133)),
+Box(Box(8134)),
+Box(Box(8135)),
+Box(Box(8136)),
+Box(Box(8137)),
+Box(Box(8138)),
+Box(Box(8139)),
+Box(Box(8140)),
+Box(Box(8141)),
+Box(Box(8142)),
+Box(Box(8143)),
+Box(Box(8144)),
+Box(Box(8145)),
+Box(Box(8146)),
+Box(Box(8147)),
+Box(Box(8148)),
+Box(Box(8149)),
+Box(Box(8150)),
+Box(Box(8151)),
+Box(Box(8152)),
+Box(Box(8153)),
+Box(Box(8154)),
+Box(Box(8155)),
+Box(Box(8156)),
+Box(Box(8157)),
+Box(Box(8158)),
+Box(Box(8159)),
+Box(Box(8160)),
+Box(Box(8161)),
+Box(Box(8162)),
+Box(Box(8163)),
+Box(Box(8164)),
+Box(Box(8165)),
+Box(Box(8166)),
+Box(Box(8167)),
+Box(Box(8168)),
+Box(Box(8169)),
+Box(Box(8170)),
+Box(Box(8171)),
+Box(Box(8172)),
+Box(Box(8173)),
+Box(Box(8174)),
+Box(Box(8175)),
+Box(Box(8176)),
+Box(Box(8177)),
+Box(Box(8178)),
+Box(Box(8179)),
+Box(Box(8180)),
+Box(Box(8181)),
+Box(Box(8182)),
+Box(Box(8183)),
+Box(Box(8184)),
+Box(Box(8185)),
+Box(Box(8186)),
+Box(Box(8187)),
+Box(Box(8188)),
+Box(Box(8189)),
+Box(Box(8190)),
+Box(Box(8191)),
+Box(Box(8192)),
+Box(Box(8193)),
+Box(Box(8194)),
+Box(Box(8195)),
+Box(Box(8196)),
+Box(Box(8197)),
+Box(Box(8198)),
+Box(Box(8199)),
+Box(Box(8200)),
+Box(Box(8201)),
+Box(Box(8202)),
+Box(Box(8203)),
+Box(Box(8204)),
+Box(Box(8205)),
+Box(Box(8206)),
+Box(Box(8207)),
+Box(Box(8208)),
+Box(Box(8209)),
+Box(Box(8210)),
+Box(Box(8211)),
+Box(Box(8212)),
+Box(Box(8213)),
+Box(Box(8214)),
+Box(Box(8215)),
+Box(Box(8216)),
+Box(Box(8217)),
+Box(Box(8218)),
+Box(Box(8219)),
+Box(Box(8220)),
+Box(Box(8221)),
+Box(Box(8222)),
+Box(Box(8223)),
+Box(Box(8224)),
+Box(Box(8225)),
+Box(Box(8226)),
+Box(Box(8227)),
+Box(Box(8228)),
+Box(Box(8229)),
+Box(Box(8230)),
+Box(Box(8231)),
+Box(Box(8232)),
+Box(Box(8233)),
+Box(Box(8234)),
+Box(Box(8235)),
+Box(Box(8236)),
+Box(Box(8237)),
+Box(Box(8238)),
+Box(Box(8239)),
+Box(Box(8240)),
+Box(Box(8241)),
+Box(Box(8242)),
+Box(Box(8243)),
+Box(Box(8244)),
+Box(Box(8245)),
+Box(Box(8246)),
+Box(Box(8247)),
+Box(Box(8248)),
+Box(Box(8249)),
+Box(Box(8250)),
+Box(Box(8251)),
+Box(Box(8252)),
+Box(Box(8253)),
+Box(Box(8254)),
+Box(Box(8255)),
+Box(Box(8256)),
+Box(Box(8257)),
+Box(Box(8258)),
+Box(Box(8259)),
+Box(Box(8260)),
+Box(Box(8261)),
+Box(Box(8262)),
+Box(Box(8263)),
+Box(Box(8264)),
+Box(Box(8265)),
+Box(Box(8266)),
+Box(Box(8267)),
+Box(Box(8268)),
+Box(Box(8269)),
+Box(Box(8270)),
+Box(Box(8271)),
+Box(Box(8272)),
+Box(Box(8273)),
+Box(Box(8274)),
+Box(Box(8275)),
+Box(Box(8276)),
+Box(Box(8277)),
+Box(Box(8278)),
+Box(Box(8279)),
+Box(Box(8280)),
+Box(Box(8281)),
+Box(Box(8282)),
+Box(Box(8283)),
+Box(Box(8284)),
+Box(Box(8285)),
+Box(Box(8286)),
+Box(Box(8287)),
+Box(Box(8288)),
+Box(Box(8289)),
+Box(Box(8290)),
+Box(Box(8291)),
+Box(Box(8292)),
+Box(Box(8293)),
+Box(Box(8294)),
+Box(Box(8295)),
+Box(Box(8296)),
+Box(Box(8297)),
+Box(Box(8298)),
+Box(Box(8299)),
+Box(Box(8300)),
+Box(Box(8301)),
+Box(Box(8302)),
+Box(Box(8303)),
+Box(Box(8304)),
+Box(Box(8305)),
+Box(Box(8306)),
+Box(Box(8307)),
+Box(Box(8308)),
+Box(Box(8309)),
+Box(Box(8310)),
+Box(Box(8311)),
+Box(Box(8312)),
+Box(Box(8313)),
+Box(Box(8314)),
+Box(Box(8315)),
+Box(Box(8316)),
+Box(Box(8317)),
+Box(Box(8318)),
+Box(Box(8319)),
+Box(Box(8320)),
+Box(Box(8321)),
+Box(Box(8322)),
+Box(Box(8323)),
+Box(Box(8324)),
+Box(Box(8325)),
+Box(Box(8326)),
+Box(Box(8327)),
+Box(Box(8328)),
+Box(Box(8329)),
+Box(Box(8330)),
+Box(Box(8331)),
+Box(Box(8332)),
+Box(Box(8333)),
+Box(Box(8334)),
+Box(Box(8335)),
+Box(Box(8336)),
+Box(Box(8337)),
+Box(Box(8338)),
+Box(Box(8339)),
+Box(Box(8340)),
+Box(Box(8341)),
+Box(Box(8342)),
+Box(Box(8343)),
+Box(Box(8344)),
+Box(Box(8345)),
+Box(Box(8346)),
+Box(Box(8347)),
+Box(Box(8348)),
+Box(Box(8349)),
+Box(Box(8350)),
+Box(Box(8351)),
+Box(Box(8352)),
+Box(Box(8353)),
+Box(Box(8354)),
+Box(Box(8355)),
+Box(Box(8356)),
+Box(Box(8357)),
+Box(Box(8358)),
+Box(Box(8359)),
+Box(Box(8360)),
+Box(Box(8361)),
+Box(Box(8362)),
+Box(Box(8363)),
+Box(Box(8364)),
+Box(Box(8365)),
+Box(Box(8366)),
+Box(Box(8367)),
+Box(Box(8368)),
+Box(Box(8369)),
+Box(Box(8370)),
+Box(Box(8371)),
+Box(Box(8372)),
+Box(Box(8373)),
+Box(Box(8374)),
+Box(Box(8375)),
+Box(Box(8376)),
+Box(Box(8377)),
+Box(Box(8378)),
+Box(Box(8379)),
+Box(Box(8380)),
+Box(Box(8381)),
+Box(Box(8382)),
+Box(Box(8383)),
+Box(Box(8384)),
+Box(Box(8385)),
+Box(Box(8386)),
+Box(Box(8387)),
+Box(Box(8388)),
+Box(Box(8389)),
+Box(Box(8390)),
+Box(Box(8391)),
+Box(Box(8392)),
+Box(Box(8393)),
+Box(Box(8394)),
+Box(Box(8395)),
+Box(Box(8396)),
+Box(Box(8397)),
+Box(Box(8398)),
+Box(Box(8399)),
+Box(Box(8400)),
+Box(Box(8401)),
+Box(Box(8402)),
+Box(Box(8403)),
+Box(Box(8404)),
+Box(Box(8405)),
+Box(Box(8406)),
+Box(Box(8407)),
+Box(Box(8408)),
+Box(Box(8409)),
+Box(Box(8410)),
+Box(Box(8411)),
+Box(Box(8412)),
+Box(Box(8413)),
+Box(Box(8414)),
+Box(Box(8415)),
+Box(Box(8416)),
+Box(Box(8417)),
+Box(Box(8418)),
+Box(Box(8419)),
+Box(Box(8420)),
+Box(Box(8421)),
+Box(Box(8422)),
+Box(Box(8423)),
+Box(Box(8424)),
+Box(Box(8425)),
+Box(Box(8426)),
+Box(Box(8427)),
+Box(Box(8428)),
+Box(Box(8429)),
+Box(Box(8430)),
+Box(Box(8431)),
+Box(Box(8432)),
+Box(Box(8433)),
+Box(Box(8434)),
+Box(Box(8435)),
+Box(Box(8436)),
+Box(Box(8437)),
+Box(Box(8438)),
+Box(Box(8439)),
+Box(Box(8440)),
+Box(Box(8441)),
+Box(Box(8442)),
+Box(Box(8443)),
+Box(Box(8444)),
+Box(Box(8445)),
+Box(Box(8446)),
+Box(Box(8447)),
+Box(Box(8448)),
+Box(Box(8449)),
+Box(Box(8450)),
+Box(Box(8451)),
+Box(Box(8452)),
+Box(Box(8453)),
+Box(Box(8454)),
+Box(Box(8455)),
+Box(Box(8456)),
+Box(Box(8457)),
+Box(Box(8458)),
+Box(Box(8459)),
+Box(Box(8460)),
+Box(Box(8461)),
+Box(Box(8462)),
+Box(Box(8463)),
+Box(Box(8464)),
+Box(Box(8465)),
+Box(Box(8466)),
+Box(Box(8467)),
+Box(Box(8468)),
+Box(Box(8469)),
+Box(Box(8470)),
+Box(Box(8471)),
+Box(Box(8472)),
+Box(Box(8473)),
+Box(Box(8474)),
+Box(Box(8475)),
+Box(Box(8476)),
+Box(Box(8477)),
+Box(Box(8478)),
+Box(Box(8479)),
+Box(Box(8480)),
+Box(Box(8481)),
+Box(Box(8482)),
+Box(Box(8483)),
+Box(Box(8484)),
+Box(Box(8485)),
+Box(Box(8486)),
+Box(Box(8487)),
+Box(Box(8488)),
+Box(Box(8489)),
+Box(Box(8490)),
+Box(Box(8491)),
+Box(Box(8492)),
+Box(Box(8493)),
+Box(Box(8494)),
+Box(Box(8495)),
+Box(Box(8496)),
+Box(Box(8497)),
+Box(Box(8498)),
+Box(Box(8499)),
+Box(Box(8500)),
+Box(Box(8501)),
+Box(Box(8502)),
+Box(Box(8503)),
+Box(Box(8504)),
+Box(Box(8505)),
+Box(Box(8506)),
+Box(Box(8507)),
+Box(Box(8508)),
+Box(Box(8509)),
+Box(Box(8510)),
+Box(Box(8511)),
+Box(Box(8512)),
+Box(Box(8513)),
+Box(Box(8514)),
+Box(Box(8515)),
+Box(Box(8516)),
+Box(Box(8517)),
+Box(Box(8518)),
+Box(Box(8519)),
+Box(Box(8520)),
+Box(Box(8521)),
+Box(Box(8522)),
+Box(Box(8523)),
+Box(Box(8524)),
+Box(Box(8525)),
+Box(Box(8526)),
+Box(Box(8527)),
+Box(Box(8528)),
+Box(Box(8529)),
+Box(Box(8530)),
+Box(Box(8531)),
+Box(Box(8532)),
+Box(Box(8533)),
+Box(Box(8534)),
+Box(Box(8535)),
+Box(Box(8536)),
+Box(Box(8537)),
+Box(Box(8538)),
+Box(Box(8539)),
+Box(Box(8540)),
+Box(Box(8541)),
+Box(Box(8542)),
+Box(Box(8543)),
+Box(Box(8544)),
+Box(Box(8545)),
+Box(Box(8546)),
+Box(Box(8547)),
+Box(Box(8548)),
+Box(Box(8549)),
+Box(Box(8550)),
+Box(Box(8551)),
+Box(Box(8552)),
+Box(Box(8553)),
+Box(Box(8554)),
+Box(Box(8555)),
+Box(Box(8556)),
+Box(Box(8557)),
+Box(Box(8558)),
+Box(Box(8559)),
+Box(Box(8560)),
+Box(Box(8561)),
+Box(Box(8562)),
+Box(Box(8563)),
+Box(Box(8564)),
+Box(Box(8565)),
+Box(Box(8566)),
+Box(Box(8567)),
+Box(Box(8568)),
+Box(Box(8569)),
+Box(Box(8570)),
+Box(Box(8571)),
+Box(Box(8572)),
+Box(Box(8573)),
+Box(Box(8574)),
+Box(Box(8575)),
+Box(Box(8576)),
+Box(Box(8577)),
+Box(Box(8578)),
+Box(Box(8579)),
+Box(Box(8580)),
+Box(Box(8581)),
+Box(Box(8582)),
+Box(Box(8583)),
+Box(Box(8584)),
+Box(Box(8585)),
+Box(Box(8586)),
+Box(Box(8587)),
+Box(Box(8588)),
+Box(Box(8589)),
+Box(Box(8590)),
+Box(Box(8591)),
+Box(Box(8592)),
+Box(Box(8593)),
+Box(Box(8594)),
+Box(Box(8595)),
+Box(Box(8596)),
+Box(Box(8597)),
+Box(Box(8598)),
+Box(Box(8599)),
+Box(Box(8600)),
+Box(Box(8601)),
+Box(Box(8602)),
+Box(Box(8603)),
+Box(Box(8604)),
+Box(Box(8605)),
+Box(Box(8606)),
+Box(Box(8607)),
+Box(Box(8608)),
+Box(Box(8609)),
+Box(Box(8610)),
+Box(Box(8611)),
+Box(Box(8612)),
+Box(Box(8613)),
+Box(Box(8614)),
+Box(Box(8615)),
+Box(Box(8616)),
+Box(Box(8617)),
+Box(Box(8618)),
+Box(Box(8619)),
+Box(Box(8620)),
+Box(Box(8621)),
+Box(Box(8622)),
+Box(Box(8623)),
+Box(Box(8624)),
+Box(Box(8625)),
+Box(Box(8626)),
+Box(Box(8627)),
+Box(Box(8628)),
+Box(Box(8629)),
+Box(Box(8630)),
+Box(Box(8631)),
+Box(Box(8632)),
+Box(Box(8633)),
+Box(Box(8634)),
+Box(Box(8635)),
+Box(Box(8636)),
+Box(Box(8637)),
+Box(Box(8638)),
+Box(Box(8639)),
+Box(Box(8640)),
+Box(Box(8641)),
+Box(Box(8642)),
+Box(Box(8643)),
+Box(Box(8644)),
+Box(Box(8645)),
+Box(Box(8646)),
+Box(Box(8647)),
+Box(Box(8648)),
+Box(Box(8649)),
+Box(Box(8650)),
+Box(Box(8651)),
+Box(Box(8652)),
+Box(Box(8653)),
+Box(Box(8654)),
+Box(Box(8655)),
+Box(Box(8656)),
+Box(Box(8657)),
+Box(Box(8658)),
+Box(Box(8659)),
+Box(Box(8660)),
+Box(Box(8661)),
+Box(Box(8662)),
+Box(Box(8663)),
+Box(Box(8664)),
+Box(Box(8665)),
+Box(Box(8666)),
+Box(Box(8667)),
+Box(Box(8668)),
+Box(Box(8669)),
+Box(Box(8670)),
+Box(Box(8671)),
+Box(Box(8672)),
+Box(Box(8673)),
+Box(Box(8674)),
+Box(Box(8675)),
+Box(Box(8676)),
+Box(Box(8677)),
+Box(Box(8678)),
+Box(Box(8679)),
+Box(Box(8680)),
+Box(Box(8681)),
+Box(Box(8682)),
+Box(Box(8683)),
+Box(Box(8684)),
+Box(Box(8685)),
+Box(Box(8686)),
+Box(Box(8687)),
+Box(Box(8688)),
+Box(Box(8689)),
+Box(Box(8690)),
+Box(Box(8691)),
+Box(Box(8692)),
+Box(Box(8693)),
+Box(Box(8694)),
+Box(Box(8695)),
+Box(Box(8696)),
+Box(Box(8697)),
+Box(Box(8698)),
+Box(Box(8699)),
+Box(Box(8700)),
+Box(Box(8701)),
+Box(Box(8702)),
+Box(Box(8703)),
+Box(Box(8704)),
+Box(Box(8705)),
+Box(Box(8706)),
+Box(Box(8707)),
+Box(Box(8708)),
+Box(Box(8709)),
+Box(Box(8710)),
+Box(Box(8711)),
+Box(Box(8712)),
+Box(Box(8713)),
+Box(Box(8714)),
+Box(Box(8715)),
+Box(Box(8716)),
+Box(Box(8717)),
+Box(Box(8718)),
+Box(Box(8719)),
+Box(Box(8720)),
+Box(Box(8721)),
+Box(Box(8722)),
+Box(Box(8723)),
+Box(Box(8724)),
+Box(Box(8725)),
+Box(Box(8726)),
+Box(Box(8727)),
+Box(Box(8728)),
+Box(Box(8729)),
+Box(Box(8730)),
+Box(Box(8731)),
+Box(Box(8732)),
+Box(Box(8733)),
+Box(Box(8734)),
+Box(Box(8735)),
+Box(Box(8736)),
+Box(Box(8737)),
+Box(Box(8738)),
+Box(Box(8739)),
+Box(Box(8740)),
+Box(Box(8741)),
+Box(Box(8742)),
+Box(Box(8743)),
+Box(Box(8744)),
+Box(Box(8745)),
+Box(Box(8746)),
+Box(Box(8747)),
+Box(Box(8748)),
+Box(Box(8749)),
+Box(Box(8750)),
+Box(Box(8751)),
+Box(Box(8752)),
+Box(Box(8753)),
+Box(Box(8754)),
+Box(Box(8755)),
+Box(Box(8756)),
+Box(Box(8757)),
+Box(Box(8758)),
+Box(Box(8759)),
+Box(Box(8760)),
+Box(Box(8761)),
+Box(Box(8762)),
+Box(Box(8763)),
+Box(Box(8764)),
+Box(Box(8765)),
+Box(Box(8766)),
+Box(Box(8767)),
+Box(Box(8768)),
+Box(Box(8769)),
+Box(Box(8770)),
+Box(Box(8771)),
+Box(Box(8772)),
+Box(Box(8773)),
+Box(Box(8774)),
+Box(Box(8775)),
+Box(Box(8776)),
+Box(Box(8777)),
+Box(Box(8778)),
+Box(Box(8779)),
+Box(Box(8780)),
+Box(Box(8781)),
+Box(Box(8782)),
+Box(Box(8783)),
+Box(Box(8784)),
+Box(Box(8785)),
+Box(Box(8786)),
+Box(Box(8787)),
+Box(Box(8788)),
+Box(Box(8789)),
+Box(Box(8790)),
+Box(Box(8791)),
+Box(Box(8792)),
+Box(Box(8793)),
+Box(Box(8794)),
+Box(Box(8795)),
+Box(Box(8796)),
+Box(Box(8797)),
+Box(Box(8798)),
+Box(Box(8799)),
+Box(Box(8800)),
+Box(Box(8801)),
+Box(Box(8802)),
+Box(Box(8803)),
+Box(Box(8804)),
+Box(Box(8805)),
+Box(Box(8806)),
+Box(Box(8807)),
+Box(Box(8808)),
+Box(Box(8809)),
+Box(Box(8810)),
+Box(Box(8811)),
+Box(Box(8812)),
+Box(Box(8813)),
+Box(Box(8814)),
+Box(Box(8815)),
+Box(Box(8816)),
+Box(Box(8817)),
+Box(Box(8818)),
+Box(Box(8819)),
+Box(Box(8820)),
+Box(Box(8821)),
+Box(Box(8822)),
+Box(Box(8823)),
+Box(Box(8824)),
+Box(Box(8825)),
+Box(Box(8826)),
+Box(Box(8827)),
+Box(Box(8828)),
+Box(Box(8829)),
+Box(Box(8830)),
+Box(Box(8831)),
+Box(Box(8832)),
+Box(Box(8833)),
+Box(Box(8834)),
+Box(Box(8835)),
+Box(Box(8836)),
+Box(Box(8837)),
+Box(Box(8838)),
+Box(Box(8839)),
+Box(Box(8840)),
+Box(Box(8841)),
+Box(Box(8842)),
+Box(Box(8843)),
+Box(Box(8844)),
+Box(Box(8845)),
+Box(Box(8846)),
+Box(Box(8847)),
+Box(Box(8848)),
+Box(Box(8849)),
+Box(Box(8850)),
+Box(Box(8851)),
+Box(Box(8852)),
+Box(Box(8853)),
+Box(Box(8854)),
+Box(Box(8855)),
+Box(Box(8856)),
+Box(Box(8857)),
+Box(Box(8858)),
+Box(Box(8859)),
+Box(Box(8860)),
+Box(Box(8861)),
+Box(Box(8862)),
+Box(Box(8863)),
+Box(Box(8864)),
+Box(Box(8865)),
+Box(Box(8866)),
+Box(Box(8867)),
+Box(Box(8868)),
+Box(Box(8869)),
+Box(Box(8870)),
+Box(Box(8871)),
+Box(Box(8872)),
+Box(Box(8873)),
+Box(Box(8874)),
+Box(Box(8875)),
+Box(Box(8876)),
+Box(Box(8877)),
+Box(Box(8878)),
+Box(Box(8879)),
+Box(Box(8880)),
+Box(Box(8881)),
+Box(Box(8882)),
+Box(Box(8883)),
+Box(Box(8884)),
+Box(Box(8885)),
+Box(Box(8886)),
+Box(Box(8887)),
+Box(Box(8888)),
+Box(Box(8889)),
+Box(Box(8890)),
+Box(Box(8891)),
+Box(Box(8892)),
+Box(Box(8893)),
+Box(Box(8894)),
+Box(Box(8895)),
+Box(Box(8896)),
+Box(Box(8897)),
+Box(Box(8898)),
+Box(Box(8899)),
+Box(Box(8900)),
+Box(Box(8901)),
+Box(Box(8902)),
+Box(Box(8903)),
+Box(Box(8904)),
+Box(Box(8905)),
+Box(Box(8906)),
+Box(Box(8907)),
+Box(Box(8908)),
+Box(Box(8909)),
+Box(Box(8910)),
+Box(Box(8911)),
+Box(Box(8912)),
+Box(Box(8913)),
+Box(Box(8914)),
+Box(Box(8915)),
+Box(Box(8916)),
+Box(Box(8917)),
+Box(Box(8918)),
+Box(Box(8919)),
+Box(Box(8920)),
+Box(Box(8921)),
+Box(Box(8922)),
+Box(Box(8923)),
+Box(Box(8924)),
+Box(Box(8925)),
+Box(Box(8926)),
+Box(Box(8927)),
+Box(Box(8928)),
+Box(Box(8929)),
+Box(Box(8930)),
+Box(Box(8931)),
+Box(Box(8932)),
+Box(Box(8933)),
+Box(Box(8934)),
+Box(Box(8935)),
+Box(Box(8936)),
+Box(Box(8937)),
+Box(Box(8938)),
+Box(Box(8939)),
+Box(Box(8940)),
+Box(Box(8941)),
+Box(Box(8942)),
+Box(Box(8943)),
+Box(Box(8944)),
+Box(Box(8945)),
+Box(Box(8946)),
+Box(Box(8947)),
+Box(Box(8948)),
+Box(Box(8949)),
+Box(Box(8950)),
+Box(Box(8951)),
+Box(Box(8952)),
+Box(Box(8953)),
+Box(Box(8954)),
+Box(Box(8955)),
+Box(Box(8956)),
+Box(Box(8957)),
+Box(Box(8958)),
+Box(Box(8959)),
+Box(Box(8960)),
+Box(Box(8961)),
+Box(Box(8962)),
+Box(Box(8963)),
+Box(Box(8964)),
+Box(Box(8965)),
+Box(Box(8966)),
+Box(Box(8967)),
+Box(Box(8968)),
+Box(Box(8969)),
+Box(Box(8970)),
+Box(Box(8971)),
+Box(Box(8972)),
+Box(Box(8973)),
+Box(Box(8974)),
+Box(Box(8975)),
+Box(Box(8976)),
+Box(Box(8977)),
+Box(Box(8978)),
+Box(Box(8979)),
+Box(Box(8980)),
+Box(Box(8981)),
+Box(Box(8982)),
+Box(Box(8983)),
+Box(Box(8984)),
+Box(Box(8985)),
+Box(Box(8986)),
+Box(Box(8987)),
+Box(Box(8988)),
+Box(Box(8989)),
+Box(Box(8990)),
+Box(Box(8991)),
+Box(Box(8992)),
+Box(Box(8993)),
+Box(Box(8994)),
+Box(Box(8995)),
+Box(Box(8996)),
+Box(Box(8997)),
+Box(Box(8998)),
+Box(Box(8999)),
+Box(Box(9000)),
+Box(Box(9001)),
+Box(Box(9002)),
+Box(Box(9003)),
+Box(Box(9004)),
+Box(Box(9005)),
+Box(Box(9006)),
+Box(Box(9007)),
+Box(Box(9008)),
+Box(Box(9009)),
+Box(Box(9010)),
+Box(Box(9011)),
+Box(Box(9012)),
+Box(Box(9013)),
+Box(Box(9014)),
+Box(Box(9015)),
+Box(Box(9016)),
+Box(Box(9017)),
+Box(Box(9018)),
+Box(Box(9019)),
+Box(Box(9020)),
+Box(Box(9021)),
+Box(Box(9022)),
+Box(Box(9023)),
+Box(Box(9024)),
+Box(Box(9025)),
+Box(Box(9026)),
+Box(Box(9027)),
+Box(Box(9028)),
+Box(Box(9029)),
+Box(Box(9030)),
+Box(Box(9031)),
+Box(Box(9032)),
+Box(Box(9033)),
+Box(Box(9034)),
+Box(Box(9035)),
+Box(Box(9036)),
+Box(Box(9037)),
+Box(Box(9038)),
+Box(Box(9039)),
+Box(Box(9040)),
+Box(Box(9041)),
+Box(Box(9042)),
+Box(Box(9043)),
+Box(Box(9044)),
+Box(Box(9045)),
+Box(Box(9046)),
+Box(Box(9047)),
+Box(Box(9048)),
+Box(Box(9049)),
+Box(Box(9050)),
+Box(Box(9051)),
+Box(Box(9052)),
+Box(Box(9053)),
+Box(Box(9054)),
+Box(Box(9055)),
+Box(Box(9056)),
+Box(Box(9057)),
+Box(Box(9058)),
+Box(Box(9059)),
+Box(Box(9060)),
+Box(Box(9061)),
+Box(Box(9062)),
+Box(Box(9063)),
+Box(Box(9064)),
+Box(Box(9065)),
+Box(Box(9066)),
+Box(Box(9067)),
+Box(Box(9068)),
+Box(Box(9069)),
+Box(Box(9070)),
+Box(Box(9071)),
+Box(Box(9072)),
+Box(Box(9073)),
+Box(Box(9074)),
+Box(Box(9075)),
+Box(Box(9076)),
+Box(Box(9077)),
+Box(Box(9078)),
+Box(Box(9079)),
+Box(Box(9080)),
+Box(Box(9081)),
+Box(Box(9082)),
+Box(Box(9083)),
+Box(Box(9084)),
+Box(Box(9085)),
+Box(Box(9086)),
+Box(Box(9087)),
+Box(Box(9088)),
+Box(Box(9089)),
+Box(Box(9090)),
+Box(Box(9091)),
+Box(Box(9092)),
+Box(Box(9093)),
+Box(Box(9094)),
+Box(Box(9095)),
+Box(Box(9096)),
+Box(Box(9097)),
+Box(Box(9098)),
+Box(Box(9099)),
+Box(Box(9100)),
+Box(Box(9101)),
+Box(Box(9102)),
+Box(Box(9103)),
+Box(Box(9104)),
+Box(Box(9105)),
+Box(Box(9106)),
+Box(Box(9107)),
+Box(Box(9108)),
+Box(Box(9109)),
+Box(Box(9110)),
+Box(Box(9111)),
+Box(Box(9112)),
+Box(Box(9113)),
+Box(Box(9114)),
+Box(Box(9115)),
+Box(Box(9116)),
+Box(Box(9117)),
+Box(Box(9118)),
+Box(Box(9119)),
+Box(Box(9120)),
+Box(Box(9121)),
+Box(Box(9122)),
+Box(Box(9123)),
+Box(Box(9124)),
+Box(Box(9125)),
+Box(Box(9126)),
+Box(Box(9127)),
+Box(Box(9128)),
+Box(Box(9129)),
+Box(Box(9130)),
+Box(Box(9131)),
+Box(Box(9132)),
+Box(Box(9133)),
+Box(Box(9134)),
+Box(Box(9135)),
+Box(Box(9136)),
+Box(Box(9137)),
+Box(Box(9138)),
+Box(Box(9139)),
+Box(Box(9140)),
+Box(Box(9141)),
+Box(Box(9142)),
+Box(Box(9143)),
+Box(Box(9144)),
+Box(Box(9145)),
+Box(Box(9146)),
+Box(Box(9147)),
+Box(Box(9148)),
+Box(Box(9149)),
+Box(Box(9150)),
+Box(Box(9151)),
+Box(Box(9152)),
+Box(Box(9153)),
+Box(Box(9154)),
+Box(Box(9155)),
+Box(Box(9156)),
+Box(Box(9157)),
+Box(Box(9158)),
+Box(Box(9159)),
+Box(Box(9160)),
+Box(Box(9161)),
+Box(Box(9162)),
+Box(Box(9163)),
+Box(Box(9164)),
+Box(Box(9165)),
+Box(Box(9166)),
+Box(Box(9167)),
+Box(Box(9168)),
+Box(Box(9169)),
+Box(Box(9170)),
+Box(Box(9171)),
+Box(Box(9172)),
+Box(Box(9173)),
+Box(Box(9174)),
+Box(Box(9175)),
+Box(Box(9176)),
+Box(Box(9177)),
+Box(Box(9178)),
+Box(Box(9179)),
+Box(Box(9180)),
+Box(Box(9181)),
+Box(Box(9182)),
+Box(Box(9183)),
+Box(Box(9184)),
+Box(Box(9185)),
+Box(Box(9186)),
+Box(Box(9187)),
+Box(Box(9188)),
+Box(Box(9189)),
+Box(Box(9190)),
+Box(Box(9191)),
+Box(Box(9192)),
+Box(Box(9193)),
+Box(Box(9194)),
+Box(Box(9195)),
+Box(Box(9196)),
+Box(Box(9197)),
+Box(Box(9198)),
+Box(Box(9199)),
+Box(Box(9200)),
+Box(Box(9201)),
+Box(Box(9202)),
+Box(Box(9203)),
+Box(Box(9204)),
+Box(Box(9205)),
+Box(Box(9206)),
+Box(Box(9207)),
+Box(Box(9208)),
+Box(Box(9209)),
+Box(Box(9210)),
+Box(Box(9211)),
+Box(Box(9212)),
+Box(Box(9213)),
+Box(Box(9214)),
+Box(Box(9215)),
+Box(Box(9216)),
+Box(Box(9217)),
+Box(Box(9218)),
+Box(Box(9219)),
+Box(Box(9220)),
+Box(Box(9221)),
+Box(Box(9222)),
+Box(Box(9223)),
+Box(Box(9224)),
+Box(Box(9225)),
+Box(Box(9226)),
+Box(Box(9227)),
+Box(Box(9228)),
+Box(Box(9229)),
+Box(Box(9230)),
+Box(Box(9231)),
+Box(Box(9232)),
+Box(Box(9233)),
+Box(Box(9234)),
+Box(Box(9235)),
+Box(Box(9236)),
+Box(Box(9237)),
+Box(Box(9238)),
+Box(Box(9239)),
+Box(Box(9240)),
+Box(Box(9241)),
+Box(Box(9242)),
+Box(Box(9243)),
+Box(Box(9244)),
+Box(Box(9245)),
+Box(Box(9246)),
+Box(Box(9247)),
+Box(Box(9248)),
+Box(Box(9249)),
+Box(Box(9250)),
+Box(Box(9251)),
+Box(Box(9252)),
+Box(Box(9253)),
+Box(Box(9254)),
+Box(Box(9255)),
+Box(Box(9256)),
+Box(Box(9257)),
+Box(Box(9258)),
+Box(Box(9259)),
+Box(Box(9260)),
+Box(Box(9261)),
+Box(Box(9262)),
+Box(Box(9263)),
+Box(Box(9264)),
+Box(Box(9265)),
+Box(Box(9266)),
+Box(Box(9267)),
+Box(Box(9268)),
+Box(Box(9269)),
+Box(Box(9270)),
+Box(Box(9271)),
+Box(Box(9272)),
+Box(Box(9273)),
+Box(Box(9274)),
+Box(Box(9275)),
+Box(Box(9276)),
+Box(Box(9277)),
+Box(Box(9278)),
+Box(Box(9279)),
+Box(Box(9280)),
+Box(Box(9281)),
+Box(Box(9282)),
+Box(Box(9283)),
+Box(Box(9284)),
+Box(Box(9285)),
+Box(Box(9286)),
+Box(Box(9287)),
+Box(Box(9288)),
+Box(Box(9289)),
+Box(Box(9290)),
+Box(Box(9291)),
+Box(Box(9292)),
+Box(Box(9293)),
+Box(Box(9294)),
+Box(Box(9295)),
+Box(Box(9296)),
+Box(Box(9297)),
+Box(Box(9298)),
+Box(Box(9299)),
+Box(Box(9300)),
+Box(Box(9301)),
+Box(Box(9302)),
+Box(Box(9303)),
+Box(Box(9304)),
+Box(Box(9305)),
+Box(Box(9306)),
+Box(Box(9307)),
+Box(Box(9308)),
+Box(Box(9309)),
+Box(Box(9310)),
+Box(Box(9311)),
+Box(Box(9312)),
+Box(Box(9313)),
+Box(Box(9314)),
+Box(Box(9315)),
+Box(Box(9316)),
+Box(Box(9317)),
+Box(Box(9318)),
+Box(Box(9319)),
+Box(Box(9320)),
+Box(Box(9321)),
+Box(Box(9322)),
+Box(Box(9323)),
+Box(Box(9324)),
+Box(Box(9325)),
+Box(Box(9326)),
+Box(Box(9327)),
+Box(Box(9328)),
+Box(Box(9329)),
+Box(Box(9330)),
+Box(Box(9331)),
+Box(Box(9332)),
+Box(Box(9333)),
+Box(Box(9334)),
+Box(Box(9335)),
+Box(Box(9336)),
+Box(Box(9337)),
+Box(Box(9338)),
+Box(Box(9339)),
+Box(Box(9340)),
+Box(Box(9341)),
+Box(Box(9342)),
+Box(Box(9343)),
+Box(Box(9344)),
+Box(Box(9345)),
+Box(Box(9346)),
+Box(Box(9347)),
+Box(Box(9348)),
+Box(Box(9349)),
+Box(Box(9350)),
+Box(Box(9351)),
+Box(Box(9352)),
+Box(Box(9353)),
+Box(Box(9354)),
+Box(Box(9355)),
+Box(Box(9356)),
+Box(Box(9357)),
+Box(Box(9358)),
+Box(Box(9359)),
+Box(Box(9360)),
+Box(Box(9361)),
+Box(Box(9362)),
+Box(Box(9363)),
+Box(Box(9364)),
+Box(Box(9365)),
+Box(Box(9366)),
+Box(Box(9367)),
+Box(Box(9368)),
+Box(Box(9369)),
+Box(Box(9370)),
+Box(Box(9371)),
+Box(Box(9372)),
+Box(Box(9373)),
+Box(Box(9374)),
+Box(Box(9375)),
+Box(Box(9376)),
+Box(Box(9377)),
+Box(Box(9378)),
+Box(Box(9379)),
+Box(Box(9380)),
+Box(Box(9381)),
+Box(Box(9382)),
+Box(Box(9383)),
+Box(Box(9384)),
+Box(Box(9385)),
+Box(Box(9386)),
+Box(Box(9387)),
+Box(Box(9388)),
+Box(Box(9389)),
+Box(Box(9390)),
+Box(Box(9391)),
+Box(Box(9392)),
+Box(Box(9393)),
+Box(Box(9394)),
+Box(Box(9395)),
+Box(Box(9396)),
+Box(Box(9397)),
+Box(Box(9398)),
+Box(Box(9399)),
+Box(Box(9400)),
+Box(Box(9401)),
+Box(Box(9402)),
+Box(Box(9403)),
+Box(Box(9404)),
+Box(Box(9405)),
+Box(Box(9406)),
+Box(Box(9407)),
+Box(Box(9408)),
+Box(Box(9409)),
+Box(Box(9410)),
+Box(Box(9411)),
+Box(Box(9412)),
+Box(Box(9413)),
+Box(Box(9414)),
+Box(Box(9415)),
+Box(Box(9416)),
+Box(Box(9417)),
+Box(Box(9418)),
+Box(Box(9419)),
+Box(Box(9420)),
+Box(Box(9421)),
+Box(Box(9422)),
+Box(Box(9423)),
+Box(Box(9424)),
+Box(Box(9425)),
+Box(Box(9426)),
+Box(Box(9427)),
+Box(Box(9428)),
+Box(Box(9429)),
+Box(Box(9430)),
+Box(Box(9431)),
+Box(Box(9432)),
+Box(Box(9433)),
+Box(Box(9434)),
+Box(Box(9435)),
+Box(Box(9436)),
+Box(Box(9437)),
+Box(Box(9438)),
+Box(Box(9439)),
+Box(Box(9440)),
+Box(Box(9441)),
+Box(Box(9442)),
+Box(Box(9443)),
+Box(Box(9444)),
+Box(Box(9445)),
+Box(Box(9446)),
+Box(Box(9447)),
+Box(Box(9448)),
+Box(Box(9449)),
+Box(Box(9450)),
+Box(Box(9451)),
+Box(Box(9452)),
+Box(Box(9453)),
+Box(Box(9454)),
+Box(Box(9455)),
+Box(Box(9456)),
+Box(Box(9457)),
+Box(Box(9458)),
+Box(Box(9459)),
+Box(Box(9460)),
+Box(Box(9461)),
+Box(Box(9462)),
+Box(Box(9463)),
+Box(Box(9464)),
+Box(Box(9465)),
+Box(Box(9466)),
+Box(Box(9467)),
+Box(Box(9468)),
+Box(Box(9469)),
+Box(Box(9470)),
+Box(Box(9471)),
+Box(Box(9472)),
+Box(Box(9473)),
+Box(Box(9474)),
+Box(Box(9475)),
+Box(Box(9476)),
+Box(Box(9477)),
+Box(Box(9478)),
+Box(Box(9479)),
+Box(Box(9480)),
+Box(Box(9481)),
+Box(Box(9482)),
+Box(Box(9483)),
+Box(Box(9484)),
+Box(Box(9485)),
+Box(Box(9486)),
+Box(Box(9487)),
+Box(Box(9488)),
+Box(Box(9489)),
+Box(Box(9490)),
+Box(Box(9491)),
+Box(Box(9492)),
+Box(Box(9493)),
+Box(Box(9494)),
+Box(Box(9495)),
+Box(Box(9496)),
+Box(Box(9497)),
+Box(Box(9498)),
+Box(Box(9499)),
+Box(Box(9500)),
+Box(Box(9501)),
+Box(Box(9502)),
+Box(Box(9503)),
+Box(Box(9504)),
+Box(Box(9505)),
+Box(Box(9506)),
+Box(Box(9507)),
+Box(Box(9508)),
+Box(Box(9509)),
+Box(Box(9510)),
+Box(Box(9511)),
+Box(Box(9512)),
+Box(Box(9513)),
+Box(Box(9514)),
+Box(Box(9515)),
+Box(Box(9516)),
+Box(Box(9517)),
+Box(Box(9518)),
+Box(Box(9519)),
+Box(Box(9520)),
+Box(Box(9521)),
+Box(Box(9522)),
+Box(Box(9523)),
+Box(Box(9524)),
+Box(Box(9525)),
+Box(Box(9526)),
+Box(Box(9527)),
+Box(Box(9528)),
+Box(Box(9529)),
+Box(Box(9530)),
+Box(Box(9531)),
+Box(Box(9532)),
+Box(Box(9533)),
+Box(Box(9534)),
+Box(Box(9535)),
+Box(Box(9536)),
+Box(Box(9537)),
+Box(Box(9538)),
+Box(Box(9539)),
+Box(Box(9540)),
+Box(Box(9541)),
+Box(Box(9542)),
+Box(Box(9543)),
+Box(Box(9544)),
+Box(Box(9545)),
+Box(Box(9546)),
+Box(Box(9547)),
+Box(Box(9548)),
+Box(Box(9549)),
+Box(Box(9550)),
+Box(Box(9551)),
+Box(Box(9552)),
+Box(Box(9553)),
+Box(Box(9554)),
+Box(Box(9555)),
+Box(Box(9556)),
+Box(Box(9557)),
+Box(Box(9558)),
+Box(Box(9559)),
+Box(Box(9560)),
+Box(Box(9561)),
+Box(Box(9562)),
+Box(Box(9563)),
+Box(Box(9564)),
+Box(Box(9565)),
+Box(Box(9566)),
+Box(Box(9567)),
+Box(Box(9568)),
+Box(Box(9569)),
+Box(Box(9570)),
+Box(Box(9571)),
+Box(Box(9572)),
+Box(Box(9573)),
+Box(Box(9574)),
+Box(Box(9575)),
+Box(Box(9576)),
+Box(Box(9577)),
+Box(Box(9578)),
+Box(Box(9579)),
+Box(Box(9580)),
+Box(Box(9581)),
+Box(Box(9582)),
+Box(Box(9583)),
+Box(Box(9584)),
+Box(Box(9585)),
+Box(Box(9586)),
+Box(Box(9587)),
+Box(Box(9588)),
+Box(Box(9589)),
+Box(Box(9590)),
+Box(Box(9591)),
+Box(Box(9592)),
+Box(Box(9593)),
+Box(Box(9594)),
+Box(Box(9595)),
+Box(Box(9596)),
+Box(Box(9597)),
+Box(Box(9598)),
+Box(Box(9599)),
+Box(Box(9600)),
+Box(Box(9601)),
+Box(Box(9602)),
+Box(Box(9603)),
+Box(Box(9604)),
+Box(Box(9605)),
+Box(Box(9606)),
+Box(Box(9607)),
+Box(Box(9608)),
+Box(Box(9609)),
+Box(Box(9610)),
+Box(Box(9611)),
+Box(Box(9612)),
+Box(Box(9613)),
+Box(Box(9614)),
+Box(Box(9615)),
+Box(Box(9616)),
+Box(Box(9617)),
+Box(Box(9618)),
+Box(Box(9619)),
+Box(Box(9620)),
+Box(Box(9621)),
+Box(Box(9622)),
+Box(Box(9623)),
+Box(Box(9624)),
+Box(Box(9625)),
+Box(Box(9626)),
+Box(Box(9627)),
+Box(Box(9628)),
+Box(Box(9629)),
+Box(Box(9630)),
+Box(Box(9631)),
+Box(Box(9632)),
+Box(Box(9633)),
+Box(Box(9634)),
+Box(Box(9635)),
+Box(Box(9636)),
+Box(Box(9637)),
+Box(Box(9638)),
+Box(Box(9639)),
+Box(Box(9640)),
+Box(Box(9641)),
+Box(Box(9642)),
+Box(Box(9643)),
+Box(Box(9644)),
+Box(Box(9645)),
+Box(Box(9646)),
+Box(Box(9647)),
+Box(Box(9648)),
+Box(Box(9649)),
+Box(Box(9650)),
+Box(Box(9651)),
+Box(Box(9652)),
+Box(Box(9653)),
+Box(Box(9654)),
+Box(Box(9655)),
+Box(Box(9656)),
+Box(Box(9657)),
+Box(Box(9658)),
+Box(Box(9659)),
+Box(Box(9660)),
+Box(Box(9661)),
+Box(Box(9662)),
+Box(Box(9663)),
+Box(Box(9664)),
+Box(Box(9665)),
+Box(Box(9666)),
+Box(Box(9667)),
+Box(Box(9668)),
+Box(Box(9669)),
+Box(Box(9670)),
+Box(Box(9671)),
+Box(Box(9672)),
+Box(Box(9673)),
+Box(Box(9674)),
+Box(Box(9675)),
+Box(Box(9676)),
+Box(Box(9677)),
+Box(Box(9678)),
+Box(Box(9679)),
+Box(Box(9680)),
+Box(Box(9681)),
+Box(Box(9682)),
+Box(Box(9683)),
+Box(Box(9684)),
+Box(Box(9685)),
+Box(Box(9686)),
+Box(Box(9687)),
+Box(Box(9688)),
+Box(Box(9689)),
+Box(Box(9690)),
+Box(Box(9691)),
+Box(Box(9692)),
+Box(Box(9693)),
+Box(Box(9694)),
+Box(Box(9695)),
+Box(Box(9696)),
+Box(Box(9697)),
+Box(Box(9698)),
+Box(Box(9699)),
+Box(Box(9700)),
+Box(Box(9701)),
+Box(Box(9702)),
+Box(Box(9703)),
+Box(Box(9704)),
+Box(Box(9705)),
+Box(Box(9706)),
+Box(Box(9707)),
+Box(Box(9708)),
+Box(Box(9709)),
+Box(Box(9710)),
+Box(Box(9711)),
+Box(Box(9712)),
+Box(Box(9713)),
+Box(Box(9714)),
+Box(Box(9715)),
+Box(Box(9716)),
+Box(Box(9717)),
+Box(Box(9718)),
+Box(Box(9719)),
+Box(Box(9720)),
+Box(Box(9721)),
+Box(Box(9722)),
+Box(Box(9723)),
+Box(Box(9724)),
+Box(Box(9725)),
+Box(Box(9726)),
+Box(Box(9727)),
+Box(Box(9728)),
+Box(Box(9729)),
+Box(Box(9730)),
+Box(Box(9731)),
+Box(Box(9732)),
+Box(Box(9733)),
+Box(Box(9734)),
+Box(Box(9735)),
+Box(Box(9736)),
+Box(Box(9737)),
+Box(Box(9738)),
+Box(Box(9739)),
+Box(Box(9740)),
+Box(Box(9741)),
+Box(Box(9742)),
+Box(Box(9743)),
+Box(Box(9744)),
+Box(Box(9745)),
+Box(Box(9746)),
+Box(Box(9747)),
+Box(Box(9748)),
+Box(Box(9749)),
+Box(Box(9750)),
+Box(Box(9751)),
+Box(Box(9752)),
+Box(Box(9753)),
+Box(Box(9754)),
+Box(Box(9755)),
+Box(Box(9756)),
+Box(Box(9757)),
+Box(Box(9758)),
+Box(Box(9759)),
+Box(Box(9760)),
+Box(Box(9761)),
+Box(Box(9762)),
+Box(Box(9763)),
+Box(Box(9764)),
+Box(Box(9765)),
+Box(Box(9766)),
+Box(Box(9767)),
+Box(Box(9768)),
+Box(Box(9769)),
+Box(Box(9770)),
+Box(Box(9771)),
+Box(Box(9772)),
+Box(Box(9773)),
+Box(Box(9774)),
+Box(Box(9775)),
+Box(Box(9776)),
+Box(Box(9777)),
+Box(Box(9778)),
+Box(Box(9779)),
+Box(Box(9780)),
+Box(Box(9781)),
+Box(Box(9782)),
+Box(Box(9783)),
+Box(Box(9784)),
+Box(Box(9785)),
+Box(Box(9786)),
+Box(Box(9787)),
+Box(Box(9788)),
+Box(Box(9789)),
+Box(Box(9790)),
+Box(Box(9791)),
+Box(Box(9792)),
+Box(Box(9793)),
+Box(Box(9794)),
+Box(Box(9795)),
+Box(Box(9796)),
+Box(Box(9797)),
+Box(Box(9798)),
+Box(Box(9799)),
+Box(Box(9800)),
+Box(Box(9801)),
+Box(Box(9802)),
+Box(Box(9803)),
+Box(Box(9804)),
+Box(Box(9805)),
+Box(Box(9806)),
+Box(Box(9807)),
+Box(Box(9808)),
+Box(Box(9809)),
+Box(Box(9810)),
+Box(Box(9811)),
+Box(Box(9812)),
+Box(Box(9813)),
+Box(Box(9814)),
+Box(Box(9815)),
+Box(Box(9816)),
+Box(Box(9817)),
+Box(Box(9818)),
+Box(Box(9819)),
+Box(Box(9820)),
+Box(Box(9821)),
+Box(Box(9822)),
+Box(Box(9823)),
+Box(Box(9824)),
+Box(Box(9825)),
+Box(Box(9826)),
+Box(Box(9827)),
+Box(Box(9828)),
+Box(Box(9829)),
+Box(Box(9830)),
+Box(Box(9831)),
+Box(Box(9832)),
+Box(Box(9833)),
+Box(Box(9834)),
+Box(Box(9835)),
+Box(Box(9836)),
+Box(Box(9837)),
+Box(Box(9838)),
+Box(Box(9839)),
+Box(Box(9840)),
+Box(Box(9841)),
+Box(Box(9842)),
+Box(Box(9843)),
+Box(Box(9844)),
+Box(Box(9845)),
+Box(Box(9846)),
+Box(Box(9847)),
+Box(Box(9848)),
+Box(Box(9849)),
+Box(Box(9850)),
+Box(Box(9851)),
+Box(Box(9852)),
+Box(Box(9853)),
+Box(Box(9854)),
+Box(Box(9855)),
+Box(Box(9856)),
+Box(Box(9857)),
+Box(Box(9858)),
+Box(Box(9859)),
+Box(Box(9860)),
+Box(Box(9861)),
+Box(Box(9862)),
+Box(Box(9863)),
+Box(Box(9864)),
+Box(Box(9865)),
+Box(Box(9866)),
+Box(Box(9867)),
+Box(Box(9868)),
+Box(Box(9869)),
+Box(Box(9870)),
+Box(Box(9871)),
+Box(Box(9872)),
+Box(Box(9873)),
+Box(Box(9874)),
+Box(Box(9875)),
+Box(Box(9876)),
+Box(Box(9877)),
+Box(Box(9878)),
+Box(Box(9879)),
+Box(Box(9880)),
+Box(Box(9881)),
+Box(Box(9882)),
+Box(Box(9883)),
+Box(Box(9884)),
+Box(Box(9885)),
+Box(Box(9886)),
+Box(Box(9887)),
+Box(Box(9888)),
+Box(Box(9889)),
+Box(Box(9890)),
+Box(Box(9891)),
+Box(Box(9892)),
+Box(Box(9893)),
+Box(Box(9894)),
+Box(Box(9895)),
+Box(Box(9896)),
+Box(Box(9897)),
+Box(Box(9898)),
+Box(Box(9899)),
+Box(Box(9900)),
+Box(Box(9901)),
+Box(Box(9902)),
+Box(Box(9903)),
+Box(Box(9904)),
+Box(Box(9905)),
+Box(Box(9906)),
+Box(Box(9907)),
+Box(Box(9908)),
+Box(Box(9909)),
+Box(Box(9910)),
+Box(Box(9911)),
+Box(Box(9912)),
+Box(Box(9913)),
+Box(Box(9914)),
+Box(Box(9915)),
+Box(Box(9916)),
+Box(Box(9917)),
+Box(Box(9918)),
+Box(Box(9919)),
+Box(Box(9920)),
+Box(Box(9921)),
+Box(Box(9922)),
+Box(Box(9923)),
+Box(Box(9924)),
+Box(Box(9925)),
+Box(Box(9926)),
+Box(Box(9927)),
+Box(Box(9928)),
+Box(Box(9929)),
+Box(Box(9930)),
+Box(Box(9931)),
+Box(Box(9932)),
+Box(Box(9933)),
+Box(Box(9934)),
+Box(Box(9935)),
+Box(Box(9936)),
+Box(Box(9937)),
+Box(Box(9938)),
+Box(Box(9939)),
+Box(Box(9940)),
+Box(Box(9941)),
+Box(Box(9942)),
+Box(Box(9943)),
+Box(Box(9944)),
+Box(Box(9945)),
+Box(Box(9946)),
+Box(Box(9947)),
+Box(Box(9948)),
+Box(Box(9949)),
+Box(Box(9950)),
+Box(Box(9951)),
+Box(Box(9952)),
+Box(Box(9953)),
+Box(Box(9954)),
+Box(Box(9955)),
+Box(Box(9956)),
+Box(Box(9957)),
+Box(Box(9958)),
+Box(Box(9959)),
+Box(Box(9960)),
+Box(Box(9961)),
+Box(Box(9962)),
+Box(Box(9963)),
+Box(Box(9964)),
+Box(Box(9965)),
+Box(Box(9966)),
+Box(Box(9967)),
+Box(Box(9968)),
+Box(Box(9969)),
+Box(Box(9970)),
+Box(Box(9971)),
+Box(Box(9972)),
+Box(Box(9973)),
+Box(Box(9974)),
+Box(Box(9975)),
+Box(Box(9976)),
+Box(Box(9977)),
+Box(Box(9978)),
+Box(Box(9979)),
+Box(Box(9980)),
+Box(Box(9981)),
+Box(Box(9982)),
+Box(Box(9983)),
+Box(Box(9984)),
+Box(Box(9985)),
+Box(Box(9986)),
+Box(Box(9987)),
+Box(Box(9988)),
+Box(Box(9989)),
+Box(Box(9990)),
+Box(Box(9991)),
+Box(Box(9992)),
+Box(Box(9993)),
+Box(Box(9994)),
+Box(Box(9995)),
+Box(Box(9996)),
+Box(Box(9997)),
+Box(Box(9998)),
+Box(Box(9999)),
+];
+
+confuse(x) {
+ try { throw x; } catch (e) { return e; }
+}
+
+main() {
+ if (!identical(confuse(list1), confuse(list2))) {
+ throw new Exception("list1 !== list2");
+ }
+}
diff --git a/tests/language/compile_time_constant/a_test.dart b/tests/language/compile_time_constant/a_test.dart
new file mode 100644
index 0000000..930a96c
--- /dev/null
+++ b/tests/language/compile_time_constant/a_test.dart
@@ -0,0 +1,120 @@
+// Copyright (c) 2012, 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.
+
+import "package:expect/expect.dart";
+
+const m1 = const {'a': 400 + 99};
+const m2 = const {'a': 499, 'b': 42};
+const m3 = const {'m1': m1, 'm2': m2};
+const m4 = const {'z': 9, 'a': 8, 'm': 7};
+const m5 = const {'': 499};
+const m6 = const {'a': 499};
+const m7 = const {};
+
+main() {
+ Expect.equals(499, m1['a']);
+ Expect.equals(null, m1['b']);
+ Expect.listEquals(['a'], m1.keys.toList());
+ Expect.listEquals([499], m1.values.toList());
+ Expect.isTrue(m1.containsKey('a'));
+ Expect.isFalse(m1.containsKey('toString'));
+ Expect.isTrue(m1.containsValue(499));
+ Expect.isFalse(m1.containsValue(42));
+ Expect.isFalse(m1.containsValue(null));
+ var seenKeys = [];
+ var seenValues = [];
+ m1.forEach((key, value) {
+ seenKeys.add(key);
+ seenValues.add(value);
+ });
+ Expect.listEquals(['a'], seenKeys);
+ Expect.listEquals([499], seenValues);
+ Expect.isFalse(m1.isEmpty);
+ Expect.equals(1, m1.length);
+ Expect.throwsUnsupportedError(() => m1.remove('a'));
+ Expect.throwsUnsupportedError(() => m1.remove('b'));
+ Expect.throwsUnsupportedError(() => m1.clear());
+ Expect.throwsUnsupportedError(() => m1['b'] = 42);
+ Expect.throwsUnsupportedError(() => m1['a'] = 499);
+ Expect.throwsUnsupportedError(() => m1.putIfAbsent('a', () => 499));
+ Expect.throwsUnsupportedError(() => m1.putIfAbsent('z', () => 499));
+
+ Expect.equals(499, m2['a']);
+ Expect.equals(42, m2['b']);
+ Expect.equals(null, m2['c']);
+ Expect.listEquals(['a', 'b'], m2.keys.toList());
+ Expect.listEquals([499, 42], m2.values.toList());
+ Expect.isTrue(m2.containsKey('a'));
+ Expect.isTrue(m2.containsKey('b'));
+ Expect.isFalse(m2.containsKey('toString'));
+ Expect.isTrue(m2.containsValue(499));
+ Expect.isTrue(m2.containsValue(42));
+ Expect.isFalse(m2.containsValue(99));
+ Expect.isFalse(m2.containsValue(null));
+ seenKeys = [];
+ seenValues = [];
+ m2.forEach((key, value) {
+ seenKeys.add(key);
+ seenValues.add(value);
+ });
+ Expect.listEquals(['a', 'b'], seenKeys);
+ Expect.listEquals([499, 42], seenValues);
+ Expect.isFalse(m2.isEmpty);
+ Expect.equals(2, m2.length);
+ Expect.throwsUnsupportedError(() => m2.remove('a'));
+ Expect.throwsUnsupportedError(() => m2.remove('b'));
+ Expect.throwsUnsupportedError(() => m2.remove('c'));
+ Expect.throwsUnsupportedError(() => m2.clear());
+ Expect.throwsUnsupportedError(() => m2['a'] = 499);
+ Expect.throwsUnsupportedError(() => m2['b'] = 42);
+ Expect.throwsUnsupportedError(() => m2['c'] = 499);
+ Expect.throwsUnsupportedError(() => m2.putIfAbsent('a', () => 499));
+ Expect.throwsUnsupportedError(() => m2.putIfAbsent('z', () => 499));
+ Expect.throwsUnsupportedError(() => m2['a'] = 499);
+
+ Expect.identical(m3['m1'], m1);
+ Expect.identical(m3['m2'], m2);
+
+ Expect.listEquals(['z', 'a', 'm'], m4.keys.toList());
+ Expect.listEquals([9, 8, 7], m4.values.toList());
+ seenKeys = [];
+ seenValues = [];
+ m4.forEach((key, value) {
+ seenKeys.add(key);
+ seenValues.add(value);
+ });
+ Expect.listEquals(['z', 'a', 'm'], seenKeys);
+ Expect.listEquals([9, 8, 7], seenValues);
+
+ Expect.equals(499, m5['']);
+ Expect.isTrue(m5.containsKey(''));
+ Expect.equals(1, m5.length);
+
+ Expect.identical(m1, m6);
+
+ Expect.isTrue(m7.isEmpty);
+ Expect.equals(0, m7.length);
+ Expect.equals(null, m7['b']);
+ Expect.listEquals([], m7.keys.toList());
+ Expect.listEquals([], m7.values.toList());
+ Expect.isFalse(m7.containsKey('a'));
+ Expect.isFalse(m7.containsKey('toString'));
+ Expect.isFalse(m7.containsValue(499));
+ Expect.isFalse(m7.containsValue(null));
+ seenKeys = [];
+ seenValues = [];
+ m7.forEach((key, value) {
+ seenKeys.add(key);
+ seenValues.add(value);
+ });
+ Expect.listEquals([], seenKeys);
+ Expect.listEquals([], seenValues);
+ Expect.throwsUnsupportedError(() => m7.remove('a'));
+ Expect.throwsUnsupportedError(() => m7.remove('b'));
+ Expect.throwsUnsupportedError(() => m7.clear());
+ Expect.throwsUnsupportedError(() => m7['b'] = 42);
+ Expect.throwsUnsupportedError(() => m7['a'] = 499);
+ Expect.throwsUnsupportedError(() => m7.putIfAbsent('a', () => 499));
+ Expect.throwsUnsupportedError(() => m7.putIfAbsent('z', () => 499));
+}
diff --git a/tests/language/compile_time_constant/arguments_runtime_test.dart b/tests/language/compile_time_constant/arguments_runtime_test.dart
new file mode 100644
index 0000000..9718f01
--- /dev/null
+++ b/tests/language/compile_time_constant/arguments_runtime_test.dart
@@ -0,0 +1,25 @@
+// TODO(multitest): This was automatically migrated from a multitest and may
+// contain strange or dead code.
+
+// Copyright (c) 2012, 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.
+
+class A {
+ const A(a);
+ const A.named({a: 42});
+ const A.optional([a]);
+}
+
+main() {
+ const A(1);
+
+
+ const A.named();
+
+
+
+ const A.optional();
+ const A.optional(42);
+
+}
diff --git a/tests/language/compile_time_constant/arguments_test.dart b/tests/language/compile_time_constant/arguments_test.dart
new file mode 100644
index 0000000..70d7fd3b
--- /dev/null
+++ b/tests/language/compile_time_constant/arguments_test.dart
@@ -0,0 +1,40 @@
+// Copyright (c) 2012, 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.
+
+class A {
+ const A(a);
+ const A.named({a: 42});
+ const A.optional([a]);
+}
+
+main() {
+ const A(1);
+ const A();
+ // ^^
+ // [analyzer] COMPILE_TIME_ERROR.NOT_ENOUGH_POSITIONAL_ARGUMENTS
+ // [cfe] Too few positional arguments: 1 required, 0 given.
+ const A(1, 2);
+ // ^^^^^^
+ // [analyzer] COMPILE_TIME_ERROR.EXTRA_POSITIONAL_ARGUMENTS
+ // [cfe] Too many positional arguments: 1 allowed, but 2 found.
+ const A.named();
+ const A.named(b: 1);
+ // ^
+ // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_NAMED_PARAMETER
+ // [cfe] No named parameter with the name 'b'.
+ const A.named(a: 1, a: 2);
+ // ^
+ // [analyzer] COMPILE_TIME_ERROR.DUPLICATE_NAMED_ARGUMENT
+ // [cfe] Duplicated named argument 'a'.
+ const A.named(a: 1, b: 2);
+ // ^
+ // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_NAMED_PARAMETER
+ // [cfe] No named parameter with the name 'b'.
+ const A.optional();
+ const A.optional(42);
+ const A.optional(42, 54);
+ // ^^^^^^^^
+ // [analyzer] COMPILE_TIME_ERROR.EXTRA_POSITIONAL_ARGUMENTS
+ // [cfe] Too many positional arguments: 1 allowed, but 2 found.
+}
diff --git a/tests/language/compile_time_constant/b_test.dart b/tests/language/compile_time_constant/b_test.dart
new file mode 100644
index 0000000..23a09a8
--- /dev/null
+++ b/tests/language/compile_time_constant/b_test.dart
@@ -0,0 +1,73 @@
+// Copyright (c) 2012, 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.
+
+import "package:expect/expect.dart";
+
+const m1 = const {'__proto__': 400 + 99};
+const m2 = const {'a': 499, 'b': 42};
+const m3 = const {'__proto__': 499};
+
+main() {
+ Expect.equals(499, m1['__proto__']);
+ Expect.equals(null, m1['b']);
+ Expect.listEquals(['__proto__'], m1.keys.toList());
+ Expect.listEquals([499], m1.values.toList());
+ Expect.isTrue(m1.containsKey('__proto__'));
+ Expect.isFalse(m1.containsKey('toString'));
+ Expect.isTrue(m1.containsValue(499));
+ Expect.isFalse(m1.containsValue(null));
+ var seenKeys = [];
+ var seenValues = [];
+ m1.forEach((key, value) {
+ seenKeys.add(key);
+ seenValues.add(value);
+ });
+ Expect.listEquals(['__proto__'], seenKeys);
+ Expect.listEquals([499], seenValues);
+ Expect.isFalse(m1.isEmpty);
+ Expect.equals(1, m1.length);
+ Expect.throwsUnsupportedError(() => m1.remove('__proto__'));
+ Expect.throwsUnsupportedError(() => m1.remove('b'));
+ Expect.throwsUnsupportedError(() => m1.clear());
+ Expect.throwsUnsupportedError(() => m1['b'] = 42);
+ Expect.throwsUnsupportedError(() => m1['__proto__'] = 499);
+ Expect.throwsUnsupportedError(() => m1.putIfAbsent('__proto__', () => 499));
+ Expect.throwsUnsupportedError(() => m1.putIfAbsent('z', () => 499));
+
+ Expect.equals(499, m2['a']);
+ Expect.equals(42, m2['b']);
+ Expect.equals(null, m2['c']);
+ Expect.equals(null, m2['__proto__']);
+ Expect.listEquals(['a', 'b'], m2.keys.toList());
+ Expect.listEquals([499, 42], m2.values.toList());
+ Expect.isTrue(m2.containsKey('a'));
+ Expect.isTrue(m2.containsKey('b'));
+ Expect.isFalse(m2.containsKey('toString'));
+ Expect.isFalse(m2.containsKey('__proto__'));
+ Expect.isTrue(m2.containsValue(499));
+ Expect.isTrue(m2.containsValue(42));
+ Expect.isFalse(m2.containsValue(null));
+ seenKeys = [];
+ seenValues = [];
+ m2.forEach((key, value) {
+ seenKeys.add(key);
+ seenValues.add(value);
+ });
+ Expect.listEquals(['a', 'b'], seenKeys);
+ Expect.listEquals([499, 42], seenValues);
+ Expect.isFalse(m2.isEmpty);
+ Expect.equals(2, m2.length);
+ Expect.throwsUnsupportedError(() => m2.remove('a'));
+ Expect.throwsUnsupportedError(() => m2.remove('b'));
+ Expect.throwsUnsupportedError(() => m2.remove('__proto__'));
+ Expect.throwsUnsupportedError(() => m2.clear());
+ Expect.throwsUnsupportedError(() => m2['a'] = 499);
+ Expect.throwsUnsupportedError(() => m2['b'] = 42);
+ Expect.throwsUnsupportedError(() => m2['__proto__'] = 499);
+ Expect.throwsUnsupportedError(() => m2.putIfAbsent('a', () => 499));
+ Expect.throwsUnsupportedError(() => m2.putIfAbsent('__proto__', () => 499));
+ Expect.throwsUnsupportedError(() => m2['a'] = 499);
+
+ Expect.isTrue(identical(m1, m3));
+}
diff --git a/tests/language/compile_time_constant/c_runtime_1_test.dart b/tests/language/compile_time_constant/c_runtime_1_test.dart
new file mode 100644
index 0000000..0dfa265
--- /dev/null
+++ b/tests/language/compile_time_constant/c_runtime_1_test.dart
@@ -0,0 +1,26 @@
+// TODO(multitest): This was automatically migrated from a multitest and may
+// contain strange or dead code.
+
+// Copyright (c) 2012, 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.
+
+const m0 = const {499: 400 + 99};
+const m1 = const {
+ "foo" + "bar": 42
+};
+const m2 = const {
+
+};
+const m3 = const {
+
+};
+
+use(x) => x;
+
+main() {
+ use(m0);
+ use(m1);
+ use(m2);
+ use(m3);
+}
diff --git a/tests/language/compile_time_constant/c_runtime_test.dart b/tests/language/compile_time_constant/c_runtime_test.dart
new file mode 100644
index 0000000..8355fea
--- /dev/null
+++ b/tests/language/compile_time_constant/c_runtime_test.dart
@@ -0,0 +1,26 @@
+// TODO(multitest): This was automatically migrated from a multitest and may
+// contain strange or dead code.
+
+// Copyright (c) 2012, 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.
+
+const m0 = const {499: 400 + 99};
+const m1 = const {
+
+};
+const m2 = const {
+
+};
+const m3 = const {
+
+};
+
+use(x) => x;
+
+main() {
+ use(m0);
+ use(m1);
+ use(m2);
+ use(m3);
+}
diff --git a/tests/language/compile_time_constant/c_test.dart b/tests/language/compile_time_constant/c_test.dart
new file mode 100644
index 0000000..308f562
--- /dev/null
+++ b/tests/language/compile_time_constant/c_test.dart
@@ -0,0 +1,33 @@
+// Copyright (c) 2012, 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.
+
+const m0 = const {499: 400 + 99};
+const m1 = const {
+ "foo" + "bar": 42
+};
+const m2 = const {
+// ^
+// [cfe] Constant evaluation error:
+ "foo" * 4: 42
+//^^^^^^^^^
+// [analyzer] COMPILE_TIME_ERROR.CONST_EVAL_TYPE_NUM
+};
+const m3 = const {
+ "foo".codeUnitAt(0): 42
+//^^^^^^^^^^^^^^^^^^^
+// [analyzer] COMPILE_TIME_ERROR.CONST_INITIALIZED_WITH_NON_CONSTANT_VALUE
+//^^^^^^^^^^^^^^^^^^^
+// [analyzer] COMPILE_TIME_ERROR.NON_CONSTANT_MAP_KEY
+// ^
+// [cfe] Method invocation is not a constant expression.
+};
+
+use(x) => x;
+
+main() {
+ use(m0);
+ use(m1);
+ use(m2);
+ use(m3);
+}
diff --git a/tests/language/compile_time_constant/compile_time_constant10_test.dart b/tests/language/compile_time_constant/compile_time_constant10_test.dart
new file mode 100644
index 0000000..19c967a
--- /dev/null
+++ b/tests/language/compile_time_constant/compile_time_constant10_test.dart
@@ -0,0 +1,110 @@
+// Copyright (c) 2012, 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.
+
+import "package:expect/expect.dart";
+
+// Test that 'identical(a,b)' is a compile-time constant.
+
+class C {
+ final x;
+ const C(this.x);
+ static f3() {}
+ static f4() {}
+}
+
+const i1 = 1;
+const i2 = 2;
+const d1 = 1.5;
+const d2 = 2.5;
+const b1 = true;
+const b2 = false;
+const s1 = "1";
+const s2 = "2";
+const l1 = const [1, 2];
+const l2 = const [2, 3];
+const m1 = const {"x": 1};
+const m2 = const {"x": 2};
+const c1 = const C(1);
+const c2 = const C(2);
+f1() {}
+f2() {}
+const id = identical;
+
+class CT {
+ final x1;
+ final x2;
+ final bool id;
+ const CT(var x1, var x2)
+ : this.x1 = x1,
+ this.x2 = x2,
+ this.id = identical(x1, x2);
+ void test(void expect(a, String b), name) {
+ expect(id, "$name: identical($x1,$x2)");
+ }
+}
+
+const trueTests = const [
+ const CT(2 - 1, i1),
+ const CT(1 + 1, i2),
+ const CT(2.5 - 1.0, d1),
+ const CT(1.5 + 1.0, d2),
+ const CT(false || true, b1),
+ const CT(true && false, b2),
+ const CT('$i1', s1),
+ const CT('$i2', s2),
+ const CT(const [i1, 2], l1),
+ const CT(const [i2, 3], l2),
+ const CT(const {"x": i1}, m1),
+ const CT(const {"x": i2}, m2),
+ const CT(const C(i1), c1),
+ const CT(const C(i2), c2),
+ const CT(f1, f1),
+ const CT(f2, f2),
+ const CT(C.f3, C.f3),
+ const CT(C.f4, C.f4),
+ const CT(id, identical),
+];
+
+const falseTests = const [
+ const CT(i1, i2),
+ const CT(d1, d2),
+ const CT(b1, b2),
+ const CT(s1, s2),
+ const CT(l1, l2),
+ const CT(m1, m2),
+ const CT(c1, c2),
+ const CT(f1, f2),
+ const CT(i1, d1),
+ const CT(d1, b1),
+ const CT(b1, s1),
+ const CT(s1, l1),
+ const CT(l1, m1),
+ const CT(m1, c1),
+ const CT(c1, f1),
+ const CT(f1, C.f3),
+ const CT(C.f3, identical),
+ const CT(identical, i1),
+];
+
+// Not a constant if it's not written 'identical'.
+const idtest = id(i1, i2); // //# 01: compile-time error
+
+// Not a constant if aliased? (Current interpretation, waiting for
+// confirmation).
+class T { // //# 02: compile-time error
+ static const identical = id; // //# 02: continued
+ static const idtest2 = identical(i1, i2); // //# 02: continued
+} // //# 02: continued
+
+main() {
+ for (int i = 0; i < trueTests.length; i++) {
+ trueTests[i].test(Expect.isTrue, "true[$i]");
+ }
+ for (int i = 0; i < falseTests.length; i++) {
+ falseTests[i].test(Expect.isFalse, "false[$i]");
+ }
+
+ var x = idtest; // //# 01: continued
+ var x = T.idtest2; // //# 02: continued
+}
diff --git a/tests/language/compile_time_constant/compile_time_constant11_test.dart b/tests/language/compile_time_constant/compile_time_constant11_test.dart
new file mode 100644
index 0000000..67ff3fe
--- /dev/null
+++ b/tests/language/compile_time_constant/compile_time_constant11_test.dart
@@ -0,0 +1,25 @@
+// Copyright (c) 2012, 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.
+
+// Check that conditional expression can be a compile-time constant.
+
+import "package:expect/expect.dart";
+
+const C1 = true;
+const C2 = false;
+
+const nephew = C1 ? C2 ? "Tick" : "Trick" : "Track";
+
+main() {
+ const a = true ? 5 : 10;
+ const b = C2 ? "Track" : C1 ? "Trick" : "Tick";
+
+ Expect.equals(5, a);
+ Expect.equals("Trick", nephew);
+ Expect.equals(nephew, b);
+ Expect.identical(nephew, b);
+ var s = const Symbol(nephew);
+ var msg = "Donald is $nephew's uncle.";
+ Expect.equals("Donald is Trick's uncle.", msg);
+}
diff --git a/tests/language/compile_time_constant/compile_time_constant12_test.dart b/tests/language/compile_time_constant/compile_time_constant12_test.dart
new file mode 100644
index 0000000..0acf8b0
--- /dev/null
+++ b/tests/language/compile_time_constant/compile_time_constant12_test.dart
@@ -0,0 +1,15 @@
+// Copyright (c) 2012, 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.
+
+const String s = "foo";
+const int i = s.length;
+const int l = "foo".length + 1;
+
+use(x) => x;
+
+main() {
+ use(s);
+ use(i);
+ use(l);
+}
diff --git a/tests/language/compile_time_constant/compile_time_constant13_test.dart b/tests/language/compile_time_constant/compile_time_constant13_test.dart
new file mode 100644
index 0000000..189abbd
--- /dev/null
+++ b/tests/language/compile_time_constant/compile_time_constant13_test.dart
@@ -0,0 +1,27 @@
+// Copyright (c) 2014, 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.
+
+class A {
+ final x; //# 01: ok
+ //# 02: compile-time error
+ var x; //# 03: compile-time error
+ get x => null; //# 04: compile-time error
+ set x(v) {} //# 05: compile-time error
+
+ const A()
+ : x = 'foo' //# 01: continued
+ : x = 'foo' //# 02: continued
+ : x = 'foo' //# 03: continued
+ : x = 'foo' //# 04: continued
+ : x = 'foo' //# 05: continued
+ ;
+}
+
+use(x) => x;
+
+A a = const A();
+
+main() {
+ use(a);
+}
diff --git a/tests/language/compile_time_constant/compile_time_constant2_test.dart b/tests/language/compile_time_constant/compile_time_constant2_test.dart
new file mode 100644
index 0000000..132a93b
--- /dev/null
+++ b/tests/language/compile_time_constant/compile_time_constant2_test.dart
@@ -0,0 +1,58 @@
+// Copyright (c) 2012, 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.
+
+import "package:expect/expect.dart";
+
+const x = 19;
+const y = 3;
+const z = -5;
+const g1 = x + y;
+const g2 = x * y;
+const g3 = x / y;
+const g4 = x ~/ y;
+const g5 = x << y;
+const g6 = x >> y;
+const g7 = ~z;
+const g8 = -x;
+const g9 = x < y;
+const g10 = x <= y;
+const g11 = x <= x;
+const g12 = x > y;
+const g13 = x >= y;
+const g14 = x >= x;
+const g15 = x == y;
+const g16 = x == x;
+const g17 = x != y;
+const g18 = x != x;
+const g19 = x | y;
+const g20 = x & y;
+const g21 = x ^ y;
+const g22 = g1 + g2 + g4 + g5 + g6 + g7 + g8;
+const g23 = x % y;
+
+main() {
+ Expect.equals(22, g1);
+ Expect.equals(57, g2);
+ Expect.equals(6.333333333333333333333333333, g3);
+ Expect.equals(6, g4);
+ Expect.equals(152, g5);
+ Expect.equals(2, g6);
+ Expect.equals(4, g7);
+ Expect.equals(-19, g8);
+ Expect.equals(false, g9);
+ Expect.equals(false, g10);
+ Expect.equals(true, g11);
+ Expect.equals(true, g12);
+ Expect.equals(true, g13);
+ Expect.equals(true, g14);
+ Expect.equals(false, g15);
+ Expect.equals(true, g16);
+ Expect.equals(true, g17);
+ Expect.equals(false, g18);
+ Expect.equals(19, g19);
+ Expect.equals(3, g20);
+ Expect.equals(16, g21);
+ Expect.equals(224, g22);
+ Expect.equals(1, g23);
+}
diff --git a/tests/language/compile_time_constant/compile_time_constant3_test.dart b/tests/language/compile_time_constant/compile_time_constant3_test.dart
new file mode 100644
index 0000000..1723086
--- /dev/null
+++ b/tests/language/compile_time_constant/compile_time_constant3_test.dart
@@ -0,0 +1,45 @@
+// Copyright (c) 2012, 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.
+
+import "package:expect/expect.dart";
+
+const x = 19.5;
+const y = 3.3;
+const g1 = x + y;
+const g2 = x * y;
+const g3 = x / y;
+const g4 = x ~/ y;
+const g5 = -x;
+const g6 = x < y;
+const g7 = x <= y;
+const g8 = x <= x;
+const g9 = x > y;
+const g10 = x >= y;
+const g11 = x >= x;
+const g12 = x == y;
+const g13 = x == x;
+const g14 = x != y;
+const g15 = x != x;
+const g16 = g1 + g2 + g3 + g4 + g5;
+const g17 = x % y;
+
+main() {
+ Expect.equals(22.8, g1);
+ Expect.equals(64.35, g2);
+ Expect.equals(5.909090909090909, g3);
+ Expect.equals(5.0, g4);
+ Expect.equals(-19.5, g5);
+ Expect.equals(false, g6);
+ Expect.equals(false, g7);
+ Expect.equals(true, g8);
+ Expect.equals(true, g9);
+ Expect.equals(true, g10);
+ Expect.equals(true, g11);
+ Expect.equals(false, g12);
+ Expect.equals(true, g13);
+ Expect.equals(true, g14);
+ Expect.equals(false, g15);
+ Expect.equals(78.5590909090909, g16);
+ Expect.equals(3.000000000000001, g17);
+}
diff --git a/tests/language/compile_time_constant/compile_time_constant5_test.dart b/tests/language/compile_time_constant/compile_time_constant5_test.dart
new file mode 100644
index 0000000..5136b29
--- /dev/null
+++ b/tests/language/compile_time_constant/compile_time_constant5_test.dart
@@ -0,0 +1,14 @@
+// Copyright (c) 2012, 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.
+
+import "package:expect/expect.dart";
+
+const x = true;
+const g1 = !true;
+const g2 = !g1;
+
+main() {
+ Expect.equals(false, g1);
+ Expect.equals(true, g2);
+}
diff --git a/tests/language/compile_time_constant/compile_time_constant6_test.dart b/tests/language/compile_time_constant/compile_time_constant6_test.dart
new file mode 100644
index 0000000..b30b2b6
--- /dev/null
+++ b/tests/language/compile_time_constant/compile_time_constant6_test.dart
@@ -0,0 +1,33 @@
+// Copyright (c) 2012, 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.
+
+import "package:expect/expect.dart";
+
+const g1 = true;
+const g2 = 499;
+const g3 = "foo";
+const g4 = 3.3;
+const g5 = g1 == g2;
+const g6 = g1 == g3;
+const g7 = g1 == g4;
+const g8 = g2 == g3;
+const g9 = g2 == g4;
+const g10 = g3 == g4;
+const g11 = g1 == g1;
+const g12 = g2 == g2;
+const g13 = g3 == g3;
+const g14 = g4 == g4;
+
+main() {
+ Expect.isFalse(g5);
+ Expect.isFalse(g6);
+ Expect.isFalse(g7);
+ Expect.isFalse(g8);
+ Expect.isFalse(g9);
+ Expect.isFalse(g10);
+ Expect.isTrue(g11);
+ Expect.isTrue(g12);
+ Expect.isTrue(g13);
+ Expect.isTrue(g14);
+}
diff --git a/tests/language/compile_time_constant/compile_time_constant7_test.dart b/tests/language/compile_time_constant/compile_time_constant7_test.dart
new file mode 100644
index 0000000..4780b47
--- /dev/null
+++ b/tests/language/compile_time_constant/compile_time_constant7_test.dart
@@ -0,0 +1,16 @@
+// Copyright (c) 2012, 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.
+
+import "package:expect/expect.dart";
+
+class A {
+ const A();
+ toString() => "a";
+}
+
+const a = const A();
+
+main() {
+ Expect.equals("a", a.toString());
+}
diff --git a/tests/language/compile_time_constant/compile_time_constant8_test.dart b/tests/language/compile_time_constant/compile_time_constant8_test.dart
new file mode 100644
index 0000000..b4a9100
--- /dev/null
+++ b/tests/language/compile_time_constant/compile_time_constant8_test.dart
@@ -0,0 +1,21 @@
+// Copyright (c) 2012, 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.
+
+import "package:expect/expect.dart";
+
+class A<T> {
+ const A();
+ toString() => "a";
+}
+
+const a = const A<int>();
+const b = const A<double>();
+
+const list1 = const <int>[1, 2];
+// Strong mode change: explicit <dynamic>
+const list2 = const <dynamic>[1, 2];
+main() {
+ Expect.isFalse(identical(a, b));
+ Expect.isFalse(identical(list1, list2));
+}
diff --git a/tests/language/compile_time_constant/compile_time_constant9_test.dart b/tests/language/compile_time_constant/compile_time_constant9_test.dart
new file mode 100644
index 0000000..96cf41a
--- /dev/null
+++ b/tests/language/compile_time_constant/compile_time_constant9_test.dart
@@ -0,0 +1,18 @@
+// Copyright (c) 2012, 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.
+
+import "package:expect/expect.dart";
+
+class B {
+ const B();
+}
+
+class A {
+ var x = const B();
+ A();
+}
+
+main() {
+ Expect.isTrue(identical(new A().x, new A().x));
+}
diff --git a/tests/language/compile_time_constant/compile_time_constant_test.dart b/tests/language/compile_time_constant/compile_time_constant_test.dart
new file mode 100644
index 0000000..7a06543
--- /dev/null
+++ b/tests/language/compile_time_constant/compile_time_constant_test.dart
@@ -0,0 +1,29 @@
+// Copyright (c) 2012, 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.
+
+class Bad {
+ int foo = 0;
+ final int bar =
+ foo
+// ^^^
+// [analyzer] COMPILE_TIME_ERROR.IMPLICIT_THIS_REFERENCE_IN_INITIALIZER
+// [cfe] Can't access 'this' in a field initializer to read 'foo'.
+ -1;
+ static const int toto =
+ bar
+// ^^^
+// [analyzer] COMPILE_TIME_ERROR.CONST_INITIALIZED_WITH_NON_CONSTANT_VALUE
+// [cfe] Can't access 'this' in a field initializer to read 'bar'.
+// ^^^
+// [analyzer] COMPILE_TIME_ERROR.IMPLICIT_THIS_REFERENCE_IN_INITIALIZER
+// [cfe] Getter not found: 'bar'.
+ -3;
+}
+
+void use(x) {}
+
+main() {
+ use(new Bad().bar);
+ use(Bad.toto);
+}
diff --git a/tests/language/compile_time_constant/d_test.dart b/tests/language/compile_time_constant/d_test.dart
new file mode 100644
index 0000000..e00c822
--- /dev/null
+++ b/tests/language/compile_time_constant/d_test.dart
@@ -0,0 +1,48 @@
+// Copyright (c) 2012, 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.
+
+import "package:expect/expect.dart";
+
+class A {
+ final x;
+ final y;
+ final z;
+ final t;
+
+ const A(this.z, tt)
+ : y = 499,
+ t = tt,
+ x = 3;
+ const A.named(z, this.t)
+ : y = 400 + z,
+ this.z = z,
+ x = 3;
+ const A.named2(t, z, y, x)
+ : x = t,
+ y = z,
+ z = y,
+ t = x;
+
+ toString() => "A $x $y $z $t";
+}
+
+const a1 = const A(99, 100);
+const a2 = const A.named(99, 100);
+const a3 = const A.named2(1, 2, 3, 4);
+
+main() {
+ Expect.equals(3, a1.x);
+ Expect.equals(499, a1.y);
+ Expect.equals(99, a1.z);
+ Expect.equals(100, a1.t);
+ Expect.equals("A 3 499 99 100", a1.toString());
+
+ Expect.isTrue(identical(a1, a2));
+
+ Expect.equals(1, a3.x);
+ Expect.equals(2, a3.y);
+ Expect.equals(3, a3.z);
+ Expect.equals(4, a3.t);
+ Expect.equals("A 1 2 3 4", a3.toString());
+}
diff --git a/tests/language/compile_time_constant/e_test.dart b/tests/language/compile_time_constant/e_test.dart
new file mode 100644
index 0000000..f5b837f
--- /dev/null
+++ b/tests/language/compile_time_constant/e_test.dart
@@ -0,0 +1,88 @@
+// Copyright (c) 2012, 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.
+
+import "package:expect/expect.dart";
+
+class A {
+ final x;
+ final y;
+ final z;
+ final t;
+
+ const A([this.z = 99, tt = 100])
+ : y = 499,
+ t = tt,
+ x = 3;
+ const A.n({this.z: 99, tt: 100})
+ : y = 499,
+ t = tt,
+ x = 3;
+ const A.named({z, this.t})
+ : y = 400 + z,
+ this.z = z,
+ x = 3;
+ const A.named2({t, z, y, x})
+ : x = t,
+ y = z,
+ z = y,
+ t = x;
+
+ toString() => "A $x $y $z $t";
+}
+
+const a1 = const A(99, 100);
+const a2 = const A.named(z: 99, t: 100);
+const a3 = const A.named2(t: 1, z: 2, y: 3, x: 4);
+const a4 = const A();
+const a5 = const A(99, 100);
+const a5n = const A.n(tt: 100, z: 99);
+const a6 = const A(1, 2);
+const a6n = const A.n(z: 1, tt: 2);
+const a7 = const A.named(z: 7);
+const a8 = const A.named2();
+const a9 = const A.named2(x: 4, y: 3, z: 2, t: 1);
+const a10 = const A.named2(x: 1, y: 2, z: 3, t: 4);
+
+main() {
+ Expect.equals(3, a1.x);
+ Expect.equals(499, a1.y);
+ Expect.equals(99, a1.z);
+ Expect.equals(100, a1.t);
+ Expect.equals("A 3 499 99 100", a1.toString());
+ Expect.identical(a1, a2);
+ Expect.identical(a1, a4);
+ Expect.identical(a1, a5);
+
+ Expect.equals(1, a3.x);
+ Expect.equals(2, a3.y);
+ Expect.equals(3, a3.z);
+ Expect.equals(4, a3.t);
+ Expect.equals("A 1 2 3 4", a3.toString());
+
+ Expect.equals(3, a6.x);
+ Expect.equals(499, a6.y);
+ Expect.equals(1, a6.z);
+ Expect.equals(2, a6.t);
+ Expect.equals("A 3 499 1 2", a6.toString());
+
+ Expect.equals(3, a7.x);
+ Expect.equals(407, a7.y);
+ Expect.equals(7, a7.z);
+ Expect.equals(null, a7.t);
+ Expect.equals("A 3 407 7 null", a7.toString());
+
+ Expect.equals(null, a8.x);
+ Expect.equals(null, a8.y);
+ Expect.equals(null, a8.y);
+ Expect.equals(null, a8.t);
+ Expect.equals("A null null null null", a8.toString());
+
+ Expect.identical(a3, a9);
+
+ Expect.equals(4, a10.x);
+ Expect.equals(3, a10.y);
+ Expect.equals(2, a10.z);
+ Expect.equals(1, a10.t);
+ Expect.equals("A 4 3 2 1", a10.toString());
+}
diff --git a/tests/language/compile_time_constant/f_test.dart b/tests/language/compile_time_constant/f_test.dart
new file mode 100644
index 0000000..21c215e
--- /dev/null
+++ b/tests/language/compile_time_constant/f_test.dart
@@ -0,0 +1,26 @@
+// Copyright (c) 2012, 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.
+
+import "package:expect/expect.dart";
+
+class A {
+ final x;
+ const A(this.x);
+ const A.named([this.x]);
+ const A.named2([this.x = 2]);
+}
+
+const a1 = const A(0);
+const a2 = const A.named();
+const a3 = const A.named(1);
+const a4 = const A.named2();
+const a5 = const A.named2(3);
+
+main() {
+ Expect.equals(0, a1.x);
+ Expect.equals(null, a2.x);
+ Expect.equals(1, a3.x);
+ Expect.equals(2, a4.x);
+ Expect.equals(3, a5.x);
+}
diff --git a/tests/language/compile_time_constant/g_test.dart b/tests/language/compile_time_constant/g_test.dart
new file mode 100644
index 0000000..1be8936
--- /dev/null
+++ b/tests/language/compile_time_constant/g_test.dart
@@ -0,0 +1,34 @@
+// Copyright (c) 2012, 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.
+
+import "package:expect/expect.dart";
+
+class A {
+ final x;
+ const A(this.x);
+ const A.named([this.x]);
+ const A.named2([this.x = 2]);
+}
+
+class B extends A {
+ const B(x) : super(x + 10);
+ const B.named_() : super.named();
+ const B.named(x) : super.named(x + 10);
+ const B.named2_() : super.named2();
+ const B.named2(x) : super.named2(x + 10);
+}
+
+const b1 = const B(0);
+const b2 = const B.named_();
+const b3 = const B.named(1);
+const b4 = const B.named2_();
+const b5 = const B.named2(3);
+
+main() {
+ Expect.equals(10, b1.x);
+ Expect.equals(null, b2.x);
+ Expect.equals(11, b3.x);
+ Expect.equals(2, b4.x);
+ Expect.equals(13, b5.x);
+}
diff --git a/tests/language/compile_time_constant/h_test.dart b/tests/language/compile_time_constant/h_test.dart
new file mode 100644
index 0000000..f4ba212
--- /dev/null
+++ b/tests/language/compile_time_constant/h_test.dart
@@ -0,0 +1,20 @@
+// Copyright (c) 2012, 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.
+
+import "package:expect/expect.dart";
+
+class A implements B {
+ final x;
+ const A(this.x);
+}
+
+abstract class B {
+ const factory B(x) = A;
+}
+
+const dynamic b1 = const B(499);
+
+main() {
+ Expect.equals(499, b1.x);
+}
diff --git a/tests/language/compile_time_constant/i_test.dart b/tests/language/compile_time_constant/i_test.dart
new file mode 100644
index 0000000..e802356
--- /dev/null
+++ b/tests/language/compile_time_constant/i_test.dart
@@ -0,0 +1,113 @@
+// Copyright (c) 2012, 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.
+
+import "package:expect/expect.dart";
+
+class A {
+ final x;
+ const A(this.x);
+ const A.redirect(x) : this(x + 1);
+ const A.optional([this.x = 5]);
+}
+
+class B extends A {
+ const B(x, this.y) : super(x);
+ const B.redirect(x, y) : this(x + 22, y + 22);
+ const B.redirect2(x, y) : this.redirect3(x + 122, y + 122);
+ const B.redirect3(x, y)
+ : this.y = y,
+ super.redirect(x);
+ const B.optional(x, [this.y]) : super(x);
+ const B.optional2([x, this.y]) : super(x);
+ final y;
+}
+
+class C extends B {
+ const C(x, y, this.z) : super(x, y);
+ const C.redirect(x, y, z) : this(x + 33, y + 33, z + 33);
+ const C.redirect2(x, y, z) : this.redirect3(x + 333, y + 333, z + 333);
+ const C.redirect3(x, y, z)
+ : this.z = z,
+ super.redirect2(x, y);
+ const C.optional(x, [y, this.z]) : super(x, y);
+ const C.optional2([x, y, z])
+ : this.z = z,
+ super(x, y);
+ const C.optional3([this.z]) : super.optional2();
+ final z;
+}
+
+const a1 = const A(499);
+const a2 = const A.redirect(10499);
+const a3 = const A.optional();
+const a1b = const A.redirect(498);
+const a3b = const A(5);
+
+const b1 = const B(99499, -99499);
+const b2 = const B.redirect(1234, 5678);
+const b3 = const B.redirect2(112233, 556677);
+const b4 = const B.redirect3(332211, 776655);
+const b5 = const B.optional(43526);
+const b6 = const B.optional2(8642, 9753);
+const b3b = const B(112233 + 122 + 1, 556677 + 122);
+const b6b = const B(8642, 9753);
+
+const c1 = const C(121, 232, 343);
+const c2 = const C.redirect(12321, 23432, 34543);
+const c3 = const C.redirect2(32123, 43234, 54345);
+const c4 = const C.redirect3(313, 424, 535);
+const c5 = const C.optional(191, 181, 171);
+const c6 = const C.optional(-191);
+const c7 = const C.optional2();
+const c8 = const C.optional3(9911);
+const c3b = const C(32123 + 333 + 122 + 1, 43234 + 333 + 122, 54345 + 333);
+
+main() {
+ Expect.equals(499, a1.x);
+ Expect.equals(10500, a2.x);
+ Expect.equals(5, a3.x);
+ Expect.identical(a1, a1b);
+ Expect.identical(a3, a3b);
+
+ Expect.equals(99499, b1.x);
+ Expect.equals(-99499, b1.y);
+ Expect.equals(1256, b2.x);
+ Expect.equals(5700, b2.y);
+ Expect.equals(112233 + 122 + 1, b3.x);
+ Expect.equals(556677 + 122, b3.y);
+ Expect.equals(332211 + 1, b4.x);
+ Expect.equals(776655, b4.y);
+ Expect.equals(43526, b5.x);
+ Expect.equals(null, b5.y);
+ Expect.equals(8642, b6.x);
+ Expect.equals(9753, b6.y);
+ Expect.identical(b3, b3b);
+ Expect.identical(b6, b6b);
+
+ Expect.equals(121, c1.x);
+ Expect.equals(232, c1.y);
+ Expect.equals(343, c1.z);
+ Expect.equals(12321 + 33, c2.x);
+ Expect.equals(23432 + 33, c2.y);
+ Expect.equals(34543 + 33, c2.z);
+ Expect.equals(32123 + 333 + 122 + 1, c3.x);
+ Expect.equals(43234 + 333 + 122, c3.y);
+ Expect.equals(54345 + 333, c3.z);
+ Expect.equals(313 + 122 + 1, c4.x);
+ Expect.equals(424 + 122, c4.y);
+ Expect.equals(535, c4.z);
+ Expect.equals(191, c5.x);
+ Expect.equals(181, c5.y);
+ Expect.equals(171, c5.z);
+ Expect.equals(-191, c6.x);
+ Expect.equals(null, c6.y);
+ Expect.equals(null, c6.z);
+ Expect.equals(null, c7.x);
+ Expect.equals(null, c7.y);
+ Expect.equals(null, c7.z);
+ Expect.equals(null, c8.x);
+ Expect.equals(null, c8.y);
+ Expect.equals(9911, c8.z);
+ Expect.identical(c3, c3b);
+}
diff --git a/tests/language/compile_time_constant/j_test.dart b/tests/language/compile_time_constant/j_test.dart
new file mode 100644
index 0000000..8a5ed24
--- /dev/null
+++ b/tests/language/compile_time_constant/j_test.dart
@@ -0,0 +1,20 @@
+// Copyright (c) 2012, 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.
+
+import "package:expect/expect.dart";
+
+class A {
+ final field;
+ const A() : field = 499;
+}
+
+const x = (((1 + 2)));
+const y = (((((x)))));
+const z = (((const A())));
+
+main() {
+ Expect.equals(3, x);
+ Expect.equals(3, y);
+ Expect.equals(499, z.field);
+}
diff --git a/tests/language/compile_time_constant/k_runtime_test.dart b/tests/language/compile_time_constant/k_runtime_test.dart
new file mode 100644
index 0000000..ba5a2a0
--- /dev/null
+++ b/tests/language/compile_time_constant/k_runtime_test.dart
@@ -0,0 +1,34 @@
+// TODO(multitest): This was automatically migrated from a multitest and may
+// contain strange or dead code.
+
+// Copyright (c) 2012, 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.
+
+import "package:expect/expect.dart";
+
+const x = const {
+
+ 'a': 4
+};
+const y = const {
+
+
+};
+
+const z = const {
+
+
+
+ '__proto__': 499
+};
+
+const x2 = const {'a': 4};
+const y2 = const {'a': 14, 'b': 13};
+const z2 = const {'__proto__': 499};
+
+main() {
+ Expect.identical(x2, x);
+
+ Expect.identical(z2, z);
+}
diff --git a/tests/language/compile_time_constant/k_test.dart b/tests/language/compile_time_constant/k_test.dart
new file mode 100644
index 0000000..0fc7128
--- /dev/null
+++ b/tests/language/compile_time_constant/k_test.dart
@@ -0,0 +1,51 @@
+// Copyright (c) 2012, 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.
+
+import "package:expect/expect.dart";
+
+const x = const {
+// ^
+// [cfe] Constant evaluation error:
+ 'a': 3,
+ 'a': 4
+//^^^
+// [analyzer] COMPILE_TIME_ERROR.EQUAL_KEYS_IN_CONST_MAP
+};
+const y = const {
+// ^
+// [cfe] Constant evaluation error:
+ 'a': 10, 'b': 11, 'a': 12,
+ // ^^^
+ // [analyzer] COMPILE_TIME_ERROR.EQUAL_KEYS_IN_CONST_MAP
+ 'b': 13, 'a': 14
+//^^^
+// [analyzer] COMPILE_TIME_ERROR.EQUAL_KEYS_IN_CONST_MAP
+// ^^^
+// [analyzer] COMPILE_TIME_ERROR.EQUAL_KEYS_IN_CONST_MAP
+};
+
+const z = const {
+// ^
+// [cfe] Constant evaluation error:
+ '__proto__': 496,
+ '__proto__': 497,
+//^^^^^^^^^^^
+// [analyzer] COMPILE_TIME_ERROR.EQUAL_KEYS_IN_CONST_MAP
+ '__proto__': 498,
+//^^^^^^^^^^^
+// [analyzer] COMPILE_TIME_ERROR.EQUAL_KEYS_IN_CONST_MAP
+ '__proto__': 499
+//^^^^^^^^^^^
+// [analyzer] COMPILE_TIME_ERROR.EQUAL_KEYS_IN_CONST_MAP
+};
+
+const x2 = const {'a': 4};
+const y2 = const {'a': 14, 'b': 13};
+const z2 = const {'__proto__': 499};
+
+main() {
+ Expect.identical(x2, x);
+ Expect.identical(y2, y);
+ Expect.identical(z2, z);
+}
diff --git a/tests/language/compile_time_constant/l_test.dart b/tests/language/compile_time_constant/l_test.dart
new file mode 100644
index 0000000..1f6bc50
--- /dev/null
+++ b/tests/language/compile_time_constant/l_test.dart
@@ -0,0 +1,28 @@
+// Copyright (c) 2012, 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.
+
+import "package:expect/expect.dart";
+
+class A {
+ final x;
+ const A([x = 499]) : this.x = x;
+}
+
+class B extends A {
+ const B();
+ final z = 99;
+}
+
+class C extends B {
+ const C(this.y);
+ final y;
+}
+
+const v = const C(42);
+
+main() {
+ Expect.equals(42, v.y);
+ Expect.equals(499, v.x);
+ Expect.equals(99, v.z);
+}
diff --git a/tests/language/compile_time_constant/m_test.dart b/tests/language/compile_time_constant/m_test.dart
new file mode 100644
index 0000000..0ae096ea
--- /dev/null
+++ b/tests/language/compile_time_constant/m_test.dart
@@ -0,0 +1,19 @@
+// Copyright (c) 2012, 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.
+
+import "package:expect/expect.dart";
+
+class A {
+ const A();
+ foo([x = const A()]) => x;
+}
+
+const x = const A();
+
+foo([x = const A()]) => x;
+
+main() {
+ Expect.identical(x, foo());
+ Expect.identical(x, x.foo());
+}
diff --git a/tests/language/compile_time_constant/n_test.dart b/tests/language/compile_time_constant/n_test.dart
new file mode 100644
index 0000000..3f621b2
--- /dev/null
+++ b/tests/language/compile_time_constant/n_test.dart
@@ -0,0 +1,17 @@
+// Copyright (c) 2012, 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.
+
+import "package:expect/expect.dart";
+
+class A {
+ const A();
+ operator ==(x) => x == 499;
+}
+
+var a = const A();
+
+main() {
+ if (const A() != 499) Expect.isTrue("const equality failed");
+ Expect.isTrue(a == 499);
+}
diff --git a/tests/language/compile_time_constant/o_runtime_test.dart b/tests/language/compile_time_constant/o_runtime_test.dart
new file mode 100644
index 0000000..d808e9e
--- /dev/null
+++ b/tests/language/compile_time_constant/o_runtime_test.dart
@@ -0,0 +1,44 @@
+// TODO(multitest): This was automatically migrated from a multitest and may
+// contain strange or dead code.
+
+// Copyright (c) 2012, 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.
+// Test compile-time constants with string-interpolation.
+
+import "package:expect/expect.dart";
+
+const str = "foo";
+const m1 = const {"foo": 499};
+const m2 = const {"$str": 499};
+const m3 = const {
+ // Causes in a duplicate key error.
+
+ "foo": 499
+};
+const m4 = const {
+ // Causes in a duplicate key error.
+
+ "$str": 499
+};
+const m5 = const {"f" "o" "o": 499};
+
+const mm1 = const {"afoo#foo": 499};
+const mm2 = const {"a$str#$str": 499};
+const mm3 = const {"a" "$str" "#" "foo": 499};
+const mm4 = const {"a$str" "#$str": 499};
+
+main() {
+ Expect.equals(1, m1.length);
+ Expect.equals(499, m1["foo"]);
+ Expect.identical(m1, m2);
+ Expect.identical(m1, m3);
+ Expect.identical(m1, m4);
+ Expect.identical(m1, m5);
+
+ Expect.equals(1, mm1.length);
+ Expect.equals(499, mm1["afoo#foo"]);
+ Expect.identical(mm1, mm2);
+ Expect.identical(mm1, mm3);
+ Expect.identical(mm1, mm4);
+}
diff --git a/tests/language/compile_time_constant/o_test.dart b/tests/language/compile_time_constant/o_test.dart
new file mode 100644
index 0000000..f9419b7
--- /dev/null
+++ b/tests/language/compile_time_constant/o_test.dart
@@ -0,0 +1,51 @@
+// Copyright (c) 2012, 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.
+// Test compile-time constants with string-interpolation.
+
+import "package:expect/expect.dart";
+
+const str = "foo";
+const m1 = const {"foo": 499};
+const m2 = const {"$str": 499};
+const m3 = const {
+// ^
+// [cfe] Constant evaluation error:
+
+ // Causes in a duplicate key error.
+ "$str": 42,
+ "foo": 499
+//^^^^^
+// [analyzer] COMPILE_TIME_ERROR.EQUAL_KEYS_IN_CONST_MAP
+};
+const m4 = const {
+// ^
+// [cfe] Constant evaluation error:
+
+ // Causes in a duplicate key error.
+ "foo": 42,
+ "$str": 499
+//^^^^^^
+// [analyzer] COMPILE_TIME_ERROR.EQUAL_KEYS_IN_CONST_MAP
+};
+const m5 = const {"f" "o" "o": 499};
+
+const mm1 = const {"afoo#foo": 499};
+const mm2 = const {"a$str#$str": 499};
+const mm3 = const {"a" "$str" "#" "foo": 499};
+const mm4 = const {"a$str" "#$str": 499};
+
+main() {
+ Expect.equals(1, m1.length);
+ Expect.equals(499, m1["foo"]);
+ Expect.identical(m1, m2);
+ Expect.identical(m1, m3);
+ Expect.identical(m1, m4);
+ Expect.identical(m1, m5);
+
+ Expect.equals(1, mm1.length);
+ Expect.equals(499, mm1["afoo#foo"]);
+ Expect.identical(mm1, mm2);
+ Expect.identical(mm1, mm3);
+ Expect.identical(mm1, mm4);
+}
diff --git a/tests/language/compile_time_constant/p_runtime_test.dart b/tests/language/compile_time_constant/p_runtime_test.dart
new file mode 100644
index 0000000..283ecec
--- /dev/null
+++ b/tests/language/compile_time_constant/p_runtime_test.dart
@@ -0,0 +1,25 @@
+// TODO(multitest): This was automatically migrated from a multitest and may
+// contain strange or dead code.
+
+// Copyright (c) 2012, 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.
+
+import "package:expect/expect.dart";
+
+class A {
+ const A(
+
+ );
+ final x = null;
+}
+
+class B extends A {
+ const B();
+}
+
+var b = const B();
+
+main() {
+ Expect.equals(null, b.x);
+}
diff --git a/tests/language/compile_time_constant/p_test.dart b/tests/language/compile_time_constant/p_test.dart
new file mode 100644
index 0000000..5c41a46
--- /dev/null
+++ b/tests/language/compile_time_constant/p_test.dart
@@ -0,0 +1,32 @@
+// Copyright (c) 2012, 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.
+
+import "package:expect/expect.dart";
+
+class A {
+ const A(
+ this.x
+ // ^
+ // [analyzer] STATIC_WARNING.FINAL_INITIALIZED_IN_DECLARATION_AND_CONSTRUCTOR
+ // [cfe] 'x' is a final instance variable that has already been initialized.
+ // ^
+ // [cfe] Cannot invoke a non-'const' constructor where a const expression is expected.
+ );
+ final x = null;
+}
+
+class B extends A {
+ const B();
+ // ^
+ // [analyzer] COMPILE_TIME_ERROR.NO_DEFAULT_SUPER_CONSTRUCTOR
+ // [cfe] The superclass, 'A', has no unnamed constructor that takes no arguments.
+}
+
+var b = const B();
+// ^^^^^^^^^
+// [analyzer] COMPILE_TIME_ERROR.CONST_EVAL_THROWS_EXCEPTION
+
+main() {
+ Expect.equals(null, b.x);
+}
diff --git a/tests/language/compile_time_constant/q_test.dart b/tests/language/compile_time_constant/q_test.dart
new file mode 100644
index 0000000..3b38e3c
--- /dev/null
+++ b/tests/language/compile_time_constant/q_test.dart
@@ -0,0 +1,8 @@
+// Copyright (c) 2012, 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.
+
+const double x = 14.0;
+main() {
+ print(x);
+}
diff --git a/tests/language/compile_time_constant/r_runtime_test.dart b/tests/language/compile_time_constant/r_runtime_test.dart
new file mode 100644
index 0000000..2e8c359
--- /dev/null
+++ b/tests/language/compile_time_constant/r_runtime_test.dart
@@ -0,0 +1,25 @@
+// TODO(multitest): This was automatically migrated from a multitest and may
+// contain strange or dead code.
+
+// Copyright (c) 2014, 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.
+
+const x =
+
+ "x";
+
+const y = const {
+ 0:
+
+ "y"
+};
+
+main() {
+ print(x);
+ print(y);
+ const z =
+
+ 1 + 1 + 1;
+ print(z);
+}
diff --git a/tests/language/compile_time_constant/r_test.dart b/tests/language/compile_time_constant/r_test.dart
new file mode 100644
index 0000000..8713d18
--- /dev/null
+++ b/tests/language/compile_time_constant/r_test.dart
@@ -0,0 +1,33 @@
+// Copyright (c) 2014, 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.
+
+const x =
+ throw "x";
+// ^^^^^^^^^
+// [analyzer] COMPILE_TIME_ERROR.CONST_INITIALIZED_WITH_NON_CONSTANT_VALUE
+// [cfe] Throw is not a constant expression.
+
+const y = const {
+ 0:
+ throw "y";
+// ^^^^^^^^^
+// [analyzer] COMPILE_TIME_ERROR.CONST_INITIALIZED_WITH_NON_CONSTANT_VALUE
+// [cfe] Throw is not a constant expression.
+// ^^^^^^^^^
+// [analyzer] COMPILE_TIME_ERROR.NON_CONSTANT_MAP_VALUE
+// ^
+// [analyzer] SYNTACTIC_ERROR.EXPECTED_TOKEN
+// [cfe] Expected '}' before this.
+};
+
+main() {
+ print(x);
+ print(y);
+ const z =
+ throw 1 + 1 + 1;
+// ^^^^^^^^^^^^^^^
+// [analyzer] COMPILE_TIME_ERROR.CONST_INITIALIZED_WITH_NON_CONSTANT_VALUE
+// [cfe] Throw is not a constant expression.
+ print(z);
+}
diff --git a/tests/language/compile_time_constant/runtime_test.dart b/tests/language/compile_time_constant/runtime_test.dart
new file mode 100644
index 0000000..33725cc
--- /dev/null
+++ b/tests/language/compile_time_constant/runtime_test.dart
@@ -0,0 +1,23 @@
+// TODO(multitest): This was automatically migrated from a multitest and may
+// contain strange or dead code.
+
+// Copyright (c) 2012, 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.
+
+class Bad {
+ int foo = 0;
+ final int bar =
+
+ -1;
+ static const int toto =
+
+ -3;
+}
+
+void use(x) {}
+
+main() {
+ use(new Bad().bar);
+ use(Bad.toto);
+}
diff --git a/tests/language/compile_time_constant/static2_runtime_test.dart b/tests/language/compile_time_constant/static2_runtime_test.dart
new file mode 100644
index 0000000..d5b8939
--- /dev/null
+++ b/tests/language/compile_time_constant/static2_runtime_test.dart
@@ -0,0 +1,32 @@
+// TODO(multitest): This was automatically migrated from a multitest and may
+// contain strange or dead code.
+
+// Copyright (c) 2012, 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.
+
+class A {
+ final int x;
+
+ const A.a2(this.x);
+
+
+
+ const A.a6(int x) : this.x = x;
+}
+
+
+
+
+
+
+
+
+main() {
+
+
+
+
+
+
+}
diff --git a/tests/language/compile_time_constant/static2_test.dart b/tests/language/compile_time_constant/static2_test.dart
new file mode 100644
index 0000000..2155448
--- /dev/null
+++ b/tests/language/compile_time_constant/static2_test.dart
@@ -0,0 +1,68 @@
+// Copyright (c) 2012, 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.
+
+class A {
+ final int x;
+ const A.a1() : x = 'foo';
+ // ^^^^^
+ // [analyzer] CHECKED_MODE_COMPILE_TIME_ERROR.CONST_FIELD_INITIALIZER_NOT_ASSIGNABLE
+ // [cfe] A value of type 'String' can't be assigned to a variable of type 'int'.
+ // ^^^^^
+ // [analyzer] STATIC_WARNING.FIELD_INITIALIZER_NOT_ASSIGNABLE
+ const A.a2(this.x);
+ const A.a3([this.x = 'foo']);
+ // ^^^^^
+ // [analyzer] STATIC_TYPE_WARNING.INVALID_ASSIGNMENT
+ // [cfe] A value of type 'String' can't be assigned to a variable of type 'int'.
+ const A.a4(String this.x);
+ // ^^^^^^^^^^^^^
+ // [analyzer] COMPILE_TIME_ERROR.INVALID_PARAMETER_DECLARATION
+ // ^^^^^^^^^^^^^
+ // [analyzer] STATIC_WARNING.FIELD_INITIALIZING_FORMAL_NOT_ASSIGNABLE
+ // ^
+ // [cfe] The type of parameter 'x', 'String' is not a subtype of the corresponding field's type, 'int'.
+ const A.a5(String x) : this.x = x;
+ // ^
+ // [analyzer] CHECKED_MODE_COMPILE_TIME_ERROR.CONST_FIELD_INITIALIZER_NOT_ASSIGNABLE
+ // [cfe] A value of type 'String' can't be assigned to a variable of type 'int'.
+ // ^
+ // [analyzer] STATIC_WARNING.FIELD_INITIALIZER_NOT_ASSIGNABLE
+ const A.a6(int x) : this.x = x;
+}
+
+const a1 = const A.a1();
+// ^^^^^^^^^^^^
+// [analyzer] CHECKED_MODE_COMPILE_TIME_ERROR.CONST_CONSTRUCTOR_FIELD_TYPE_MISMATCH
+const a2 = const A.a2('foo');
+// ^^^^^
+// [analyzer] CHECKED_MODE_COMPILE_TIME_ERROR.CONST_CONSTRUCTOR_PARAM_TYPE_MISMATCH
+// [cfe] The argument type 'String' can't be assigned to the parameter type 'int'.
+// ^^^^^
+// [analyzer] STATIC_WARNING.ARGUMENT_TYPE_NOT_ASSIGNABLE
+const a3 = const A.a3();
+// ^^^^^^^^^^^^
+// [analyzer] CHECKED_MODE_COMPILE_TIME_ERROR.CONST_CONSTRUCTOR_PARAM_TYPE_MISMATCH
+const a4 = const A.a4('foo');
+// ^^^^^
+// [analyzer] CHECKED_MODE_COMPILE_TIME_ERROR.CONST_CONSTRUCTOR_PARAM_TYPE_MISMATCH
+const a5 = const A.a5('foo');
+// ^^^^^^^^^^^^^^^^^
+// [analyzer] CHECKED_MODE_COMPILE_TIME_ERROR.CONST_CONSTRUCTOR_FIELD_TYPE_MISMATCH
+const a6 = const A.a6('foo');
+// ^^^^^^^^^^^^^^^^^
+// [analyzer] CHECKED_MODE_COMPILE_TIME_ERROR.CONST_CONSTRUCTOR_FIELD_TYPE_MISMATCH
+// ^^^^^
+// [analyzer] CHECKED_MODE_COMPILE_TIME_ERROR.CONST_CONSTRUCTOR_PARAM_TYPE_MISMATCH
+// [cfe] The argument type 'String' can't be assigned to the parameter type 'int'.
+// ^^^^^
+// [analyzer] STATIC_WARNING.ARGUMENT_TYPE_NOT_ASSIGNABLE
+
+main() {
+ print(a1);
+ print(a2);
+ print(a3);
+ print(a4);
+ print(a5);
+ print(a6);
+}
diff --git a/tests/language/compile_time_constant/static3_runtime_test.dart b/tests/language/compile_time_constant/static3_runtime_test.dart
new file mode 100644
index 0000000..d5b8939
--- /dev/null
+++ b/tests/language/compile_time_constant/static3_runtime_test.dart
@@ -0,0 +1,32 @@
+// TODO(multitest): This was automatically migrated from a multitest and may
+// contain strange or dead code.
+
+// Copyright (c) 2012, 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.
+
+class A {
+ final int x;
+
+ const A.a2(this.x);
+
+
+
+ const A.a6(int x) : this.x = x;
+}
+
+
+
+
+
+
+
+
+main() {
+
+
+
+
+
+
+}
diff --git a/tests/language/compile_time_constant/static3_test.dart b/tests/language/compile_time_constant/static3_test.dart
new file mode 100644
index 0000000..3deabbb
--- /dev/null
+++ b/tests/language/compile_time_constant/static3_test.dart
@@ -0,0 +1,68 @@
+// Copyright (c) 2012, 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.
+
+class A {
+ final int x;
+ const A.a1() : x = 'foo';
+ // ^^^^^
+ // [analyzer] CHECKED_MODE_COMPILE_TIME_ERROR.CONST_FIELD_INITIALIZER_NOT_ASSIGNABLE
+ // [cfe] A value of type 'String' can't be assigned to a variable of type 'int'.
+ // ^^^^^
+ // [analyzer] STATIC_WARNING.FIELD_INITIALIZER_NOT_ASSIGNABLE
+ const A.a2(this.x);
+ const A.a3([this.x = 'foo']);
+ // ^^^^^
+ // [analyzer] STATIC_TYPE_WARNING.INVALID_ASSIGNMENT
+ // [cfe] A value of type 'String' can't be assigned to a variable of type 'int'.
+ const A.a4(String this.x);
+ // ^^^^^^^^^^^^^
+ // [analyzer] COMPILE_TIME_ERROR.INVALID_PARAMETER_DECLARATION
+ // ^^^^^^^^^^^^^
+ // [analyzer] STATIC_WARNING.FIELD_INITIALIZING_FORMAL_NOT_ASSIGNABLE
+ // ^
+ // [cfe] The type of parameter 'x', 'String' is not a subtype of the corresponding field's type, 'int'.
+ const A.a5(String x) : this.x = x;
+ // ^
+ // [analyzer] CHECKED_MODE_COMPILE_TIME_ERROR.CONST_FIELD_INITIALIZER_NOT_ASSIGNABLE
+ // [cfe] A value of type 'String' can't be assigned to a variable of type 'int'.
+ // ^
+ // [analyzer] STATIC_WARNING.FIELD_INITIALIZER_NOT_ASSIGNABLE
+ const A.a6(int x) : this.x = x;
+}
+
+var a1 = const A.a1();
+// ^^^^^^^^^^^^
+// [analyzer] CHECKED_MODE_COMPILE_TIME_ERROR.CONST_CONSTRUCTOR_FIELD_TYPE_MISMATCH
+var a2 = const A.a2('foo');
+// ^^^^^
+// [analyzer] CHECKED_MODE_COMPILE_TIME_ERROR.CONST_CONSTRUCTOR_PARAM_TYPE_MISMATCH
+// [cfe] The argument type 'String' can't be assigned to the parameter type 'int'.
+// ^^^^^
+// [analyzer] STATIC_WARNING.ARGUMENT_TYPE_NOT_ASSIGNABLE
+var a3 = const A.a3();
+// ^^^^^^^^^^^^
+// [analyzer] CHECKED_MODE_COMPILE_TIME_ERROR.CONST_CONSTRUCTOR_PARAM_TYPE_MISMATCH
+var a4 = const A.a4('foo');
+// ^^^^^
+// [analyzer] CHECKED_MODE_COMPILE_TIME_ERROR.CONST_CONSTRUCTOR_PARAM_TYPE_MISMATCH
+var a5 = const A.a5('foo');
+// ^^^^^^^^^^^^^^^^^
+// [analyzer] CHECKED_MODE_COMPILE_TIME_ERROR.CONST_CONSTRUCTOR_FIELD_TYPE_MISMATCH
+var a6 = const A.a6('foo');
+// ^^^^^^^^^^^^^^^^^
+// [analyzer] CHECKED_MODE_COMPILE_TIME_ERROR.CONST_CONSTRUCTOR_FIELD_TYPE_MISMATCH
+// ^^^^^
+// [analyzer] CHECKED_MODE_COMPILE_TIME_ERROR.CONST_CONSTRUCTOR_PARAM_TYPE_MISMATCH
+// [cfe] The argument type 'String' can't be assigned to the parameter type 'int'.
+// ^^^^^
+// [analyzer] STATIC_WARNING.ARGUMENT_TYPE_NOT_ASSIGNABLE
+
+main() {
+ print(a1);
+ print(a2);
+ print(a3);
+ print(a4);
+ print(a5);
+ print(a6);
+}
diff --git a/tests/language/compile_time_constant/static4_test.dart b/tests/language/compile_time_constant/static4_test.dart
new file mode 100644
index 0000000..8436b05
--- /dev/null
+++ b/tests/language/compile_time_constant/static4_test.dart
@@ -0,0 +1,25 @@
+// Copyright (c) 2014, 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.
+
+class A {
+ final _x;
+ const A.a1(
+ String //# 01: compile-time error
+ x)
+ : this.a2(x);
+ const A.a2(
+ String //# 02: compile-time error
+ x)
+ : this.a3(x);
+ const A.a3(
+ String //# 03: compile-time error
+ x)
+ : _x = x;
+}
+
+use(x) => x;
+
+main() {
+ use(const A.a1(0));
+}
diff --git a/tests/language/compile_time_constant/static5_test.dart b/tests/language/compile_time_constant/static5_test.dart
new file mode 100644
index 0000000..c1666e8
--- /dev/null
+++ b/tests/language/compile_time_constant/static5_test.dart
@@ -0,0 +1,79 @@
+// Copyright (c) 2014, 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.
+
+class A {
+ const A();
+}
+
+class B extends A {
+ const B();
+}
+
+class C extends A {
+ const C();
+ const factory C.d() = D;
+}
+
+class D extends B implements C {
+ const D();
+}
+
+class Test1 {
+ final A x = const A(); //# 01: ok
+ final A x = const B(); //# 02: ok
+ final B x = const A(); //# 03: compile-time error
+ final B x = const C(); //# 04: compile-time error
+ final B x = const C.d(); //# 05: compile-time error
+ const Test1();
+}
+
+// Will be instantiated with U=A and V=B.
+class Test2<U, V> {
+ final U x = const A(); //# 06: compile-time error
+ final U x = const B(); //# 07: compile-time error
+ final V x = const A(); //# 08: compile-time error
+ final V x = const C(); //# 09: compile-time error
+ final V x = const C.d(); //# 10: compile-time error
+ const Test2();
+}
+
+// Will be instantiated with U=A and V=B.
+class Test3<U extends A, V extends B> {
+ final U x = const A(); //# 11: compile-time error
+ final U x = const B(); //# 12: compile-time error
+ final V x = const A(); //# 13: compile-time error
+ final V x = const C(); //# 14: compile-time error
+ final V x = const C.d(); //# 15: compile-time error
+ const Test3();
+}
+
+// Will be instantiated with U=A and V=B.
+class Test4<U extends A, V extends A> {
+ final U x = const A(); //# 16: compile-time error
+ final U x = const B(); //# 17: compile-time error
+ final V x = const A(); //# 18: compile-time error
+ final V x = const C(); //# 19: compile-time error
+ final V x = const C.d(); //# 20: compile-time error
+ const Test4();
+}
+
+// Will be instantiated with U=dynamic and V=dynamic.
+class Test5<U extends A, V extends B> {
+ final U x = const A(); //# 21: compile-time error
+ final U x = const B(); //# 22: compile-time error
+ final V x = const A(); //# 23: compile-time error
+ final V x = const C(); //# 24: compile-time error
+ final V x = const C.d(); //# 25: compile-time error
+ const Test5();
+}
+
+use(x) => x;
+
+main() {
+ use(const Test1());
+ use(const Test2<A, B>());
+ use(const Test3<A, B>());
+ use(const Test4<A, B>());
+ use(const Test5());
+}
diff --git a/tests/language/compile_time_constant/static_runtime_test.dart b/tests/language/compile_time_constant/static_runtime_test.dart
new file mode 100644
index 0000000..9e4712f
--- /dev/null
+++ b/tests/language/compile_time_constant/static_runtime_test.dart
@@ -0,0 +1,16 @@
+// TODO(multitest): This was automatically migrated from a multitest and may
+// contain strange or dead code.
+
+// Copyright (c) 2012, 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.
+
+
+
+
+
+main() {
+
+
+
+}
diff --git a/tests/language/compile_time_constant/static_test.dart b/tests/language/compile_time_constant/static_test.dart
new file mode 100644
index 0000000..288ffef
--- /dev/null
+++ b/tests/language/compile_time_constant/static_test.dart
@@ -0,0 +1,24 @@
+// Copyright (c) 2012, 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.
+
+final int x = 'foo';
+// ^^^^^
+// [analyzer] STATIC_TYPE_WARNING.INVALID_ASSIGNMENT
+// [cfe] A value of type 'String' can't be assigned to a variable of type 'int'.
+const int y = 'foo';
+// ^^^^^
+// [analyzer] CHECKED_MODE_COMPILE_TIME_ERROR.VARIABLE_TYPE_MISMATCH
+// [cfe] A value of type 'String' can't be assigned to a variable of type 'int'.
+// ^^^^^
+// [analyzer] STATIC_TYPE_WARNING.INVALID_ASSIGNMENT
+int z = 'foo';
+// ^^^^^
+// [analyzer] STATIC_TYPE_WARNING.INVALID_ASSIGNMENT
+// [cfe] A value of type 'String' can't be assigned to a variable of type 'int'.
+
+main() {
+ print(x);
+ print(y);
+ print(z);
+}
diff --git a/tests/language_2/constructor/bad_named_constructor_test.dart b/tests/language_2/constructor/bad_named_constructor_test.dart
index b7fc8f2..d8a40d9 100644
--- a/tests/language_2/constructor/bad_named_constructor_test.dart
+++ b/tests/language_2/constructor/bad_named_constructor_test.dart
@@ -6,7 +6,7 @@
A() {}
WrongName.foo() {}
//^^^^^^^^^
-// [analyzer] COMPILE_TIME_ERROR.INVALID_CONSTRUCTOR_NAME
+// [analyzer] SYNTACTIC_ERROR.INVALID_CONSTRUCTOR_NAME
// [cfe] The name of a constructor must match the name of the enclosing class.
}
diff --git a/tests/language_2/function_subtype/call_type_variable_test.dart b/tests/language_2/function_subtype/call_type_variable_test.dart
new file mode 100644
index 0000000..dc1a811
--- /dev/null
+++ b/tests/language_2/function_subtype/call_type_variable_test.dart
@@ -0,0 +1,25 @@
+// Copyright (c) 2020, 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.
+
+import "package:expect/expect.dart";
+
+// Test that it is possible to invoke an object whose type is a proper subtype
+// of a function type (that is, its type is 'function-type bounded', and we
+// get to call it as if its type had been that bound).
+
+class A<X, Y extends X Function(X)> {
+ final Y f;
+ A(this.f);
+ X m(X value) => f(value);
+}
+
+class B extends A<String, String Function(String, {int i})> {
+ B(String Function(String, {int i}) f) : super(f);
+ String m(String value) => f(value, i: 42);
+}
+
+void main() {
+ B b = B((String s, {int i}) => "$s and $i");
+ Expect.equals('24 and 42', b.m('24'));
+}
diff --git a/tests/language_2/nonfunction_type_aliases/generic_usage_class_test.dart b/tests/language_2/nonfunction_type_aliases/generic_usage_class_test.dart
index 85ab43d..33ec568 100644
--- a/tests/language_2/nonfunction_type_aliases/generic_usage_class_test.dart
+++ b/tests/language_2/nonfunction_type_aliases/generic_usage_class_test.dart
@@ -34,7 +34,7 @@
List<T<T>> v6 = [];
final T<Null> v7;
- C(): v7 = T();
+ C(): v7 = T<Null>();
C.name1(this.v5, this.v7);
factory C.name2(T<C> arg1, T<Null> arg2) = C.name1;
diff --git a/tests/language_2/nonfunction_type_aliases/generic_usage_type_variable_error_test.dart b/tests/language_2/nonfunction_type_aliases/generic_usage_type_variable_error_test.dart
index 0075e3a..49b9cf3 100644
--- a/tests/language_2/nonfunction_type_aliases/generic_usage_type_variable_error_test.dart
+++ b/tests/language_2/nonfunction_type_aliases/generic_usage_type_variable_error_test.dart
@@ -15,7 +15,7 @@
abstract class C {
final T<Null> v7;
- C(): v7 = T();
+ C(): v7 = T<D>();
// ^
// [analyzer] unspecified
// [cfe] unspecified
@@ -45,7 +45,7 @@
main() {
var v9 = <Set<T<T>>, Set<T<T>>>{{}: {}};
- v9[{}] = {T<T>()};
+ v9[{}] = {T<D>()};
// ^
// [analyzer] unspecified
// [cfe] unspecified
@@ -69,4 +69,14 @@
// ^^^^^^^^^^^^
// [analyzer] unspecified
// [cfe] unspecified
+
+ T<Object>();
+//^^^^^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+ T<C>.name1(D(), null);
+//^^^^^^^^^^^^^^^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
}
diff --git a/tests/language_2/nonfunction_type_aliases/generic_usage_type_variable_test.dart b/tests/language_2/nonfunction_type_aliases/generic_usage_type_variable_test.dart
index beb3a06..ffb06d2 100644
--- a/tests/language_2/nonfunction_type_aliases/generic_usage_type_variable_test.dart
+++ b/tests/language_2/nonfunction_type_aliases/generic_usage_type_variable_test.dart
@@ -28,7 +28,6 @@
List<T<T>> v6 = [];
final T<Null> v7;
- C(): v7 = T<D>();
C.name1(this.v5, this.v7);
factory C.name2(T<D> arg1, T<Null> arg2) = C.name1;
@@ -55,9 +54,7 @@
var v8 = <T<C>>[];
var v9 = <Set<T<T>>, Set<T<T>>>{{}: {}};
var v10 = {v8};
- v9[{}] = {T<D>()};
+ v9[{}] = {42};
Set<List<T<C>>> v11 = v10;
v10 = v11;
- T<Object>();
- T<C>.name1(D(), null);
}
diff --git a/tests/language_2/nonfunction_type_aliases/usage_type_variable_error_test.dart b/tests/language_2/nonfunction_type_aliases/usage_type_variable_error_test.dart
index 08124c3..efd4162 100644
--- a/tests/language_2/nonfunction_type_aliases/usage_type_variable_error_test.dart
+++ b/tests/language_2/nonfunction_type_aliases/usage_type_variable_error_test.dart
@@ -16,14 +16,35 @@
// Use the aliased type.
+
+abstract class D2 extends C with T {}
+// ^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+abstract class D4 = C with T;
+// ^
+// [analyzer] unspecified
+// [cfe] unspecified
+
main() {
+ T.named();
+//^
+// [analyzer] unspecified
+// [cfe] unspecified
+
T().unknownInstanceMethod();
- // ^
- // [analyzer] unspecified
- // [cfe] unspecified
+//^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+ T.staticMethod<T>();
+//^
+// [analyzer] unspecified
+// [cfe] unspecified
T.unknownStaticMethod();
-// ^
+//^
// [analyzer] unspecified
// [cfe] unspecified
}
diff --git a/tests/language_2/nonfunction_type_aliases/usage_type_variable_test.dart b/tests/language_2/nonfunction_type_aliases/usage_type_variable_test.dart
index e4257c7..3e10b20 100644
--- a/tests/language_2/nonfunction_type_aliases/usage_type_variable_test.dart
+++ b/tests/language_2/nonfunction_type_aliases/usage_type_variable_test.dart
@@ -44,9 +44,7 @@
}
class D1 extends T {}
-abstract class D2 extends C with T {}
abstract class D3 implements T {}
-abstract class D4 = C with T;
extension E on T {
T foo(T t) => t;
@@ -64,8 +62,6 @@
Set<List<T>> v16 = v15;
v15 = v16;
T();
- T.named();
T v17 = foo<T>(T());
id(v17);
- T.staticMethod<T>();
}
diff --git a/tests/language_2/unsorted/external_test.dart b/tests/language_2/unsorted/external_test.dart
index 2e83649..1f71b6d 100644
--- a/tests/language_2/unsorted/external_test.dart
+++ b/tests/language_2/unsorted/external_test.dart
@@ -46,8 +46,9 @@
// [analyzer] STATIC_WARNING.CONCRETE_CLASS_WITH_ABSTRACT_MEMBER
external Foo.n21(val) : x = 1;
- // ^
- // [cfe] Only constructors can have initializers, and 'n21' is not a constructor.
+ // ^
+ // [analyzer] SYNTACTIC_ERROR.EXTERNAL_CONSTRUCTOR_WITH_INITIALIZER
+ // [cfe] An external constructor can't have any initializers.
external Foo.n22(val) { x = 1; }
// ^
// [analyzer] SYNTACTIC_ERROR.EXTERNAL_METHOD_WITH_BODY
@@ -71,13 +72,13 @@
}
external int t06(int i) { }
-// [error line 73, column 1, length 8]
+// [error line 74, column 1, length 8]
// [analyzer] SYNTACTIC_ERROR.EXTERNAL_METHOD_WITH_BODY
// [cfe] An external or native method can't have a body.
// ^
// [cfe] An external or native method can't have a body.
external int t07(int i) => i + 1;
-// [error line 79, column 1, length 8]
+// [error line 80, column 1, length 8]
// [analyzer] SYNTACTIC_ERROR.EXTERNAL_METHOD_WITH_BODY
// [cfe] An external or native method can't have a body.
// ^
diff --git a/tests/language_2/vm/regress_flutter_51828_bug2_test.dart b/tests/language_2/vm/regress_flutter_51828_bug2_test.dart
new file mode 100644
index 0000000..02d47a8
--- /dev/null
+++ b/tests/language_2/vm/regress_flutter_51828_bug2_test.dart
@@ -0,0 +1,24 @@
+// Copyright (c) 2020, 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 is a regression test for the 2nd bug in
+// https://github.com/flutter/flutter/issues/51828.
+// Verifies that implicit cast of :result parameter of async_op
+// doesn't affect subsequent uses.
+
+import "package:expect/expect.dart";
+
+dynamic bar() async => 42;
+dynamic baz() async => 'hi';
+
+use(x, y) {
+ Expect.equals(42, x);
+ Expect.equals(2, y.length);
+}
+
+main() async {
+ int x = await bar();
+ String y = await baz();
+ use(x, y);
+}
diff --git a/tests/lib/async/async_await_sync_completer_test.dart b/tests/lib/async/async_await_sync_completer_test.dart
index 889632f..080b1cc 100644
--- a/tests/lib/async/async_await_sync_completer_test.dart
+++ b/tests/lib/async/async_await_sync_completer_test.dart
@@ -28,7 +28,7 @@
// install handlers. When the function finishes, it can then synchronously
// propagate the values.
await null;
- new Future.microtask(() => throw 'in microtask error')
+ new Future<void>.microtask(() => throw 'in microtask error')
.catchError(events.add)
.then(delayedError.complete);
throw 'in async function error';
diff --git a/tests/lib/async/future_microtask_test.dart b/tests/lib/async/future_microtask_test.dart
index 1606fb0..f724d2e 100644
--- a/tests/lib/async/future_microtask_test.dart
+++ b/tests/lib/async/future_microtask_test.dart
@@ -29,7 +29,7 @@
});
asyncStart();
- new Future.microtask(() {
+ new Future<Null>.microtask(() {
throw "foo";
}).catchError((e, stackTrace) {
Expect.equals("foo", e);
diff --git a/tests/lib/async/stack_trace02_test.dart b/tests/lib/async/stack_trace02_test.dart
index 2932a2e..bc86f2b 100644
--- a/tests/lib/async/stack_trace02_test.dart
+++ b/tests/lib/async/stack_trace02_test.dart
@@ -9,7 +9,7 @@
main() {
StackTrace trace;
asyncStart();
- var f = new Future(() {
+ var f = new Future<Null>(() {
throw "foo";
});
f.catchError((e, st) {
diff --git a/tests/lib/async/stack_trace05_test.dart b/tests/lib/async/stack_trace05_test.dart
index d1528c6..83756b9 100644
--- a/tests/lib/async/stack_trace05_test.dart
+++ b/tests/lib/async/stack_trace05_test.dart
@@ -18,7 +18,10 @@
StackTrace trace = captureStackTrace();
asyncStart();
var f = new Future(() => 499);
- f.then((_) => new Future.error("e", trace)).whenComplete(() => 499).then((_) {
+ f
+ .then((_) => new Future.error("e", trace))
+ .whenComplete(() => 499)
+ .then<Null>((_) {
throw "should never be reached";
}).catchError((e, st) {
Expect.equals("e", e);
diff --git a/tests/lib/async/stack_trace06_test.dart b/tests/lib/async/stack_trace06_test.dart
index c6246c1..4f4ef38 100644
--- a/tests/lib/async/stack_trace06_test.dart
+++ b/tests/lib/async/stack_trace06_test.dart
@@ -18,7 +18,7 @@
Completer completer = new Completer();
StackTrace trace = captureStackTrace();
asyncStart();
- completer.future.whenComplete(() => 499).then((_) {
+ completer.future.whenComplete(() => 499).then<Null>((_) {
throw "should never be reached";
}).catchError((e, st) {
Expect.equals("c-error", e);
diff --git a/tests/lib/async/stack_trace07_test.dart b/tests/lib/async/stack_trace07_test.dart
index dd989e8..d76b489 100644
--- a/tests/lib/async/stack_trace07_test.dart
+++ b/tests/lib/async/stack_trace07_test.dart
@@ -18,7 +18,7 @@
Completer completer = new Completer();
StackTrace trace = captureStackTrace();
asyncStart();
- completer.future.whenComplete(() => 499).then((_) {
+ completer.future.whenComplete(() => 499).then<Null>((_) {
throw "bad things happen";
}).catchError((e, st) {
Expect.equals("bad things happen", e);
diff --git a/tests/lib/async/stack_trace08_test.dart b/tests/lib/async/stack_trace08_test.dart
index e9d5b94..80bb34c 100644
--- a/tests/lib/async/stack_trace08_test.dart
+++ b/tests/lib/async/stack_trace08_test.dart
@@ -18,7 +18,7 @@
Completer completer = new Completer();
StackTrace trace = captureStackTrace();
asyncStart();
- completer.future.whenComplete(() => 499).then((_) {
+ completer.future.whenComplete(() => 499).then<Null>((_) {
throw "should never be reached";
}).catchError((e, st) {
Expect.equals("c-error", e);
diff --git a/tests/lib/async/stack_trace11_test.dart b/tests/lib/async/stack_trace11_test.dart
index d698a18..e201c03 100644
--- a/tests/lib/async/stack_trace11_test.dart
+++ b/tests/lib/async/stack_trace11_test.dart
@@ -18,7 +18,7 @@
StackTrace trace = captureStackTrace();
asyncStart();
var f = new Future.error(499, trace);
- f.then((_) {
+ f.then<Null>((_) {
throw "Unreachable";
}, onError: (e, st) {
Expect.identical(trace, st);
diff --git a/tests/lib/async/stack_trace12_test.dart b/tests/lib/async/stack_trace12_test.dart
index c067d8f..ed1568e 100644
--- a/tests/lib/async/stack_trace12_test.dart
+++ b/tests/lib/async/stack_trace12_test.dart
@@ -12,7 +12,7 @@
var f = new Future(() {
throw "foo";
});
- f.then((_) {
+ f.then<Null>((_) {
throw "Unreachable";
}, onError: (e, st) {
Expect.equals("foo", e);
diff --git a/tests/lib/async/stack_trace13_test.dart b/tests/lib/async/stack_trace13_test.dart
index 8855bee..9c20973 100644
--- a/tests/lib/async/stack_trace13_test.dart
+++ b/tests/lib/async/stack_trace13_test.dart
@@ -12,7 +12,7 @@
var f = new Future(() {
throw "foo";
});
- f.then((_) => 499).then((_) {
+ f.then((_) => 499).then<Null>((_) {
throw "Unreachable";
}, onError: (e, st) {
Expect.equals("foo", e);
diff --git a/tests/lib/async/stack_trace14_test.dart b/tests/lib/async/stack_trace14_test.dart
index fe3a534..635a491 100644
--- a/tests/lib/async/stack_trace14_test.dart
+++ b/tests/lib/async/stack_trace14_test.dart
@@ -18,7 +18,7 @@
StackTrace trace = captureStackTrace();
asyncStart();
var f = new Future(() => 499);
- f.then((_) => new Future.error("e", trace)).then((_) {
+ f.then((_) => new Future.error("e", trace)).then<Null>((_) {
throw "Unreachable";
}, onError: (e, st) {
Expect.equals("e", e);
diff --git a/tests/lib/async/stack_trace15_test.dart b/tests/lib/async/stack_trace15_test.dart
index e52b4eb..17e414d 100644
--- a/tests/lib/async/stack_trace15_test.dart
+++ b/tests/lib/async/stack_trace15_test.dart
@@ -18,9 +18,12 @@
StackTrace trace = captureStackTrace();
asyncStart();
var f = new Future(() => 499);
- f.then((_) => new Future.error("e", trace)).whenComplete(() => 499).then((_) {
+ f
+ .then((_) => new Future.error("e", trace))
+ .whenComplete(() => 499)
+ .then<Null>((_) {
throw "should never be reached";
- }).then((_) {
+ }).then<Null>((_) {
throw "Unreachable";
}, onError: (e, st) {
Expect.equals("e", e);
diff --git a/tests/lib/async/stack_trace16_test.dart b/tests/lib/async/stack_trace16_test.dart
index a54a56e..633e0d7 100644
--- a/tests/lib/async/stack_trace16_test.dart
+++ b/tests/lib/async/stack_trace16_test.dart
@@ -18,9 +18,9 @@
Completer completer = new Completer();
StackTrace trace = captureStackTrace();
asyncStart();
- completer.future.whenComplete(() => 499).then((_) {
+ completer.future.whenComplete(() => 499).then<Null>((_) {
throw "should never be reached";
- }).then((_) {
+ }).then<Null>((_) {
throw "Unreachable";
}, onError: (e, st) {
Expect.equals("c-error", e);
diff --git a/tests/lib/async/stack_trace17_test.dart b/tests/lib/async/stack_trace17_test.dart
index b7f33c5..3e46d80 100644
--- a/tests/lib/async/stack_trace17_test.dart
+++ b/tests/lib/async/stack_trace17_test.dart
@@ -18,9 +18,9 @@
Completer completer = new Completer();
StackTrace trace = captureStackTrace();
asyncStart();
- completer.future.whenComplete(() => 499).then((_) {
+ completer.future.whenComplete(() => 499).then<Null>((_) {
throw "bad things happen";
- }).then((_) {
+ }).then<Null>((_) {
throw "Unreachable";
}, onError: (e, st) {
Expect.equals("bad things happen", e);
diff --git a/tests/lib/async/stack_trace18_test.dart b/tests/lib/async/stack_trace18_test.dart
index 51b0c70..17368c8 100644
--- a/tests/lib/async/stack_trace18_test.dart
+++ b/tests/lib/async/stack_trace18_test.dart
@@ -18,16 +18,16 @@
Completer completer = new Completer();
StackTrace trace = captureStackTrace();
asyncStart();
- completer.future.whenComplete(() => 499).then((_) {
+ completer.future.whenComplete(() => 499).then<Null>((_) {
throw "should never be reached";
- }).then((_) {
+ }).then<Null>((_) {
throw "Unreachable";
}, onError: (e, st) {
Expect.equals("c-error", e);
Expect.identical(trace, st);
// Test the rethrowing the same error keeps the stack trace.
throw e;
- }).then((_) {
+ }).then<Null>((_) {
throw "Unreachable";
}, onError: (e, st) {
Expect.equals("c-error", e);
diff --git a/tests/lib/async/stack_trace19_test.dart b/tests/lib/async/stack_trace19_test.dart
index 5fcef85..477ddcb 100644
--- a/tests/lib/async/stack_trace19_test.dart
+++ b/tests/lib/async/stack_trace19_test.dart
@@ -21,7 +21,7 @@
asyncStart();
completer.future.whenComplete(() {
throw "other_error";
- }).then((_) {
+ }).then<Null>((_) {
throw "should never be reached";
}).catchError((e, st) {
Expect.equals("other_error", e);
diff --git a/tests/lib/async/stack_trace25_test.dart b/tests/lib/async/stack_trace25_test.dart
index 88a541b..0eff556 100644
--- a/tests/lib/async/stack_trace25_test.dart
+++ b/tests/lib/async/stack_trace25_test.dart
@@ -24,7 +24,7 @@
asyncStart();
var iterator = new StreamIterator(controller.stream);
var future = iterator.moveNext();
- future.then((_) {
+ future.then<Null>((_) {
throw "unreachable";
}, onError: (e, st) {
Expect.equals("error", e);
diff --git a/tests/lib/async/stream_iterator_test.dart b/tests/lib/async/stream_iterator_test.dart
index c64a32f..6066341 100644
--- a/tests/lib/async/stream_iterator_test.dart
+++ b/tests/lib/async/stream_iterator_test.dart
@@ -41,7 +41,10 @@
expect(iterator.current, 42);
var hasNext = iterator.moveNext();
expect(hasNext, throwsA("BAD")); // This is an async expectation,
- await hasNext.catchError((_) {}); // so we have to wait for the future too.
+ await hasNext.catchError((_) {
+ // so we have to wait for the future too.
+ return false;
+ });
expect(iterator.current, isNull);
expect(await iterator.moveNext(), isFalse);
expect(iterator.current, isNull);
diff --git a/tests/lib/isolate/spawn_uri_missing_test.dart b/tests/lib/isolate/spawn_uri_missing_test.dart
index e13ec06..19344ba 100644
--- a/tests/lib/isolate/spawn_uri_missing_test.dart
+++ b/tests/lib/isolate/spawn_uri_missing_test.dart
@@ -19,7 +19,7 @@
Future doTest() {
return Isolate.spawnUri(Uri.base.resolve('no_such_file'), [], null)
- .then((Isolate isolate) {
+ .then<Null>((Isolate isolate) {
throw UNEXPECTED_MESSAGE;
}).catchError((error) {
if (error == UNEXPECTED_MESSAGE) throw error;
diff --git a/tests/lib/mirrors/reflected_type_generics_test.dart b/tests/lib/mirrors/reflected_type_generics_test.dart
index 4e84300..e8ca315 100644
--- a/tests/lib/mirrors/reflected_type_generics_test.dart
+++ b/tests/lib/mirrors/reflected_type_generics_test.dart
@@ -43,7 +43,7 @@
expectReflectedType(reflectType(D, [P]), new D<P>().runtimeType);
expectReflectedType(reflectType(E, [P]), new E<P>().runtimeType);
expectReflectedType(
- reflectType(FBounded, [new FBounded<Null>().runtimeType]), new FBounded<FBounded<Null>>().runtimeType);
+ reflectType(FBounded, [new FBounded<Never>().runtimeType]), new FBounded<FBounded<Never>>().runtimeType);
var predicateHelper = new Helper<Predicate<P>>();
expectReflectedType(reflectType(Predicate, [P]), predicateHelper.param); //# 01: ok
diff --git a/tests/lib_2/mirrors/reflected_type_generics_test.dart b/tests/lib_2/mirrors/reflected_type_generics_test.dart
index 4e84300..e8ca315 100644
--- a/tests/lib_2/mirrors/reflected_type_generics_test.dart
+++ b/tests/lib_2/mirrors/reflected_type_generics_test.dart
@@ -43,7 +43,7 @@
expectReflectedType(reflectType(D, [P]), new D<P>().runtimeType);
expectReflectedType(reflectType(E, [P]), new E<P>().runtimeType);
expectReflectedType(
- reflectType(FBounded, [new FBounded<Null>().runtimeType]), new FBounded<FBounded<Null>>().runtimeType);
+ reflectType(FBounded, [new FBounded<Never>().runtimeType]), new FBounded<FBounded<Never>>().runtimeType);
var predicateHelper = new Helper<Predicate<P>>();
expectReflectedType(reflectType(Predicate, [P]), predicateHelper.param); //# 01: ok
diff --git a/tests/standalone/io/http_headers_test.dart b/tests/standalone/io/http_headers_test.dart
index 5617498..33c28a3 100644
--- a/tests/standalone/io/http_headers_test.dart
+++ b/tests/standalone/io/http_headers_test.dart
@@ -299,6 +299,11 @@
check(headerValue, "attachment", parameters);
headerValue = HeaderValue.parse("xxx; aaa; bbb; ccc");
check(headerValue, "xxx", {"aaa": null, "bbb": null, "ccc": null});
+ headerValue = HeaderValue.parse("v; a=A; b=B, V; c=C", valueSeparator: ";");
+ check(headerValue, "v", {});
+ headerValue = HeaderValue.parse("v; a=A; b=B, V; c=C", valueSeparator: ",");
+ check(headerValue, "v", {"a": "A", "b": "B"});
+ Expect.throws(() => HeaderValue.parse("v; a=A; b=B, V; c=C"));
Expect.equals("", HeaderValue().toString());
Expect.equals("", HeaderValue("").toString());
diff --git a/tests/standalone/io/http_parser_connect_method.dart b/tests/standalone/io/http_parser_connect_method.dart
new file mode 100644
index 0000000..f543bcd
--- /dev/null
+++ b/tests/standalone/io/http_parser_connect_method.dart
@@ -0,0 +1,39 @@
+// Copyright (c) 2020, 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.
+
+import "dart:async";
+import "dart:io";
+import "package:expect/expect.dart";
+
+test(String header, value) async {
+ final connect = "CONNECT";
+ var server = await HttpServer.bind("127.0.0.1", 0);
+ server.listen((HttpRequest request) {
+ Expect.equals(connect, request.method);
+ request.response.statusCode = 200;
+ request.response.headers.add(header, value);
+ request.response.close();
+ });
+
+ var completer = Completer();
+ HttpClient client = HttpClient();
+ client
+ .open(connect, "127.0.0.1", server.port, "/")
+ .then((HttpClientRequest request) {
+ return request.close();
+ }).then((HttpClientResponse response) {
+ Expect.isTrue(response.statusCode == 200);
+ Expect.isNull(response.headers[header]);
+ client.close();
+ server.close();
+ completer.complete();
+ });
+
+ await completer.future;
+}
+
+main() async {
+ await test(HttpHeaders.contentLengthHeader, 0);
+ await test(HttpHeaders.transferEncodingHeader, 'chunked');
+}
diff --git a/tests/standalone/io/non_utf8_output_test.dart b/tests/standalone/io/non_utf8_output_test.dart
index d714087..241d91b 100644
--- a/tests/standalone/io/non_utf8_output_test.dart
+++ b/tests/standalone/io/non_utf8_output_test.dart
@@ -7,7 +7,8 @@
import 'dart:io';
-main() {
+main() async {
String german = "German characters: aäbcdefghijklmnoöpqrsßtuüvwxyz";
stdout.add(german.runes.toList());
+ await stdout.close();
}
diff --git a/tests/standalone/io/raw_datagram_zero_length_test.dart b/tests/standalone/io/raw_datagram_zero_length_test.dart
new file mode 100644
index 0000000..2993635
--- /dev/null
+++ b/tests/standalone/io/raw_datagram_zero_length_test.dart
@@ -0,0 +1,30 @@
+// Copyright (c) 2020, 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.
+
+import "dart:async";
+import "dart:io";
+import "dart:typed_data";
+
+import "package:async_helper/async_helper.dart";
+import "package:expect/expect.dart";
+
+main() async {
+ asyncStart();
+ var address = InternetAddress.loopbackIPv4;
+ var sender = await RawDatagramSocket.bind(address, 0);
+ var receiver = await RawDatagramSocket.bind(address, 0);
+
+ var sub;
+ sub = receiver.listen((event) {
+ if (event == RawSocketEvent.read) {
+ Expect.isNull(receiver.receive());
+ }
+ receiver.close();
+ sub.cancel();
+ asyncEnd();
+ });
+
+ sender.send(Uint8List(0), address, receiver.port);
+ sender.close();
+}
diff --git a/tests/standalone/io/socket_ipv6_test.dart b/tests/standalone/io/socket_ipv6_test.dart
index 4fb14cd..595eeaa 100644
--- a/tests/standalone/io/socket_ipv6_test.dart
+++ b/tests/standalone/io/socket_ipv6_test.dart
@@ -58,7 +58,7 @@
server.listen((socket) {
throw "Unexpected socket";
});
- return Socket.connect(clientAddr.first, server.port).then((socket) {
+ return Socket.connect(clientAddr.first, server.port).then<Null>((socket) {
socket.destroy();
throw "Unexpected connect";
}, onError: (e) {}).whenComplete(() {
@@ -118,7 +118,7 @@
server.listen((socket) {
throw "Unexpected socket";
});
- return Socket.connect("127.0.0.1", server.port).then((socket) {
+ return Socket.connect("127.0.0.1", server.port).then<Null>((socket) {
socket.destroy();
throw "Unexpected connect";
}, onError: (e) {}).whenComplete(() {
diff --git a/tests/standalone_2/io/http_headers_test.dart b/tests/standalone_2/io/http_headers_test.dart
index 1213e85..6e99646 100644
--- a/tests/standalone_2/io/http_headers_test.dart
+++ b/tests/standalone_2/io/http_headers_test.dart
@@ -299,6 +299,13 @@
check(headerValue, "attachment", parameters);
headerValue = HeaderValue.parse("xxx; aaa; bbb; ccc");
check(headerValue, "xxx", {"aaa": null, "bbb": null, "ccc": null});
+ headerValue = HeaderValue.parse("v; a=A; b=B, V; c=C", valueSeparator: ";");
+ check(headerValue, "v", {});
+ headerValue = HeaderValue.parse("v; a=A; b=B, V; c=C", valueSeparator: ";");
+ check(headerValue, "v", {});
+ headerValue = HeaderValue.parse("v; a=A; b=B, V; c=C", valueSeparator: ",");
+ check(headerValue, "v", {"a": "A", "b": "B"});
+ Expect.throws(() => HeaderValue.parse("v; a=A; b=B, V; c=C"));
Expect.equals("", HeaderValue().toString());
Expect.equals("", HeaderValue("").toString());
diff --git a/tests/standalone_2/io/http_parser_connect_method.dart b/tests/standalone_2/io/http_parser_connect_method.dart
new file mode 100644
index 0000000..f543bcd
--- /dev/null
+++ b/tests/standalone_2/io/http_parser_connect_method.dart
@@ -0,0 +1,39 @@
+// Copyright (c) 2020, 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.
+
+import "dart:async";
+import "dart:io";
+import "package:expect/expect.dart";
+
+test(String header, value) async {
+ final connect = "CONNECT";
+ var server = await HttpServer.bind("127.0.0.1", 0);
+ server.listen((HttpRequest request) {
+ Expect.equals(connect, request.method);
+ request.response.statusCode = 200;
+ request.response.headers.add(header, value);
+ request.response.close();
+ });
+
+ var completer = Completer();
+ HttpClient client = HttpClient();
+ client
+ .open(connect, "127.0.0.1", server.port, "/")
+ .then((HttpClientRequest request) {
+ return request.close();
+ }).then((HttpClientResponse response) {
+ Expect.isTrue(response.statusCode == 200);
+ Expect.isNull(response.headers[header]);
+ client.close();
+ server.close();
+ completer.complete();
+ });
+
+ await completer.future;
+}
+
+main() async {
+ await test(HttpHeaders.contentLengthHeader, 0);
+ await test(HttpHeaders.transferEncodingHeader, 'chunked');
+}
diff --git a/tests/standalone_2/io/non_utf8_output_test.dart b/tests/standalone_2/io/non_utf8_output_test.dart
index d714087..241d91b 100644
--- a/tests/standalone_2/io/non_utf8_output_test.dart
+++ b/tests/standalone_2/io/non_utf8_output_test.dart
@@ -7,7 +7,8 @@
import 'dart:io';
-main() {
+main() async {
String german = "German characters: aäbcdefghijklmnoöpqrsßtuüvwxyz";
stdout.add(german.runes.toList());
+ await stdout.close();
}
diff --git a/tests/standalone_2/io/raw_datagram_zero_length_test.dart b/tests/standalone_2/io/raw_datagram_zero_length_test.dart
new file mode 100644
index 0000000..2993635
--- /dev/null
+++ b/tests/standalone_2/io/raw_datagram_zero_length_test.dart
@@ -0,0 +1,30 @@
+// Copyright (c) 2020, 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.
+
+import "dart:async";
+import "dart:io";
+import "dart:typed_data";
+
+import "package:async_helper/async_helper.dart";
+import "package:expect/expect.dart";
+
+main() async {
+ asyncStart();
+ var address = InternetAddress.loopbackIPv4;
+ var sender = await RawDatagramSocket.bind(address, 0);
+ var receiver = await RawDatagramSocket.bind(address, 0);
+
+ var sub;
+ sub = receiver.listen((event) {
+ if (event == RawSocketEvent.read) {
+ Expect.isNull(receiver.receive());
+ }
+ receiver.close();
+ sub.cancel();
+ asyncEnd();
+ });
+
+ sender.send(Uint8List(0), address, receiver.port);
+ sender.close();
+}
diff --git a/tools/VERSION b/tools/VERSION
index 85a4ce0..b10d3a2 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -33,7 +33,7 @@
MAJOR 2
MINOR 8
PATCH 0
-PRERELEASE 18
+PRERELEASE 19
PRERELEASE_PATCH 0
-ABI_VERSION 31
-OLDEST_SUPPORTED_ABI_VERSION 31
+ABI_VERSION 32
+OLDEST_SUPPORTED_ABI_VERSION 32
diff --git a/tools/apps/update_homebrew/bin/update_homebrew.dart b/tools/apps/update_homebrew/bin/update_homebrew.dart
index 691f0a5..68dc9e0 100644
--- a/tools/apps/update_homebrew/bin/update_homebrew.dart
+++ b/tools/apps/update_homebrew/bin/update_homebrew.dart
@@ -10,14 +10,17 @@
void main(List<String> args) async {
final parser = ArgParser()
+ ..addFlag('dry-run', abbr: 'n')
..addOption('revision', abbr: 'r')
..addOption('channel', abbr: 'c', allowed: supportedChannels)
..addOption('key', abbr: 'k');
final options = parser.parse(args);
+ final dryRun = options['dry-run'] as bool;
final revision = options['revision'] as String;
final channel = options['channel'] as String;
if ([revision, channel].contains(null)) {
- print("Usage: update_homebrew.dart -r revision -c channel [-k ssh_key]\n"
+ print(
+ "Usage: update_homebrew.dart -r version -c channel [-k ssh_key] [-n]\n"
" ssh_key should allow pushes to $githubRepo on github");
exitCode = 1;
return;
@@ -46,8 +49,11 @@
'-m',
'Updated $channel branch to revision $revision'
], repository, gitEnvironment);
-
- await runGit(['push'], repository, gitEnvironment);
+ if (dryRun) {
+ await runGit(['diff', 'origin/master'], repository, gitEnvironment);
+ } else {
+ await runGit(['push'], repository, gitEnvironment);
+ }
} finally {
await tempDir.delete(recursive: true);
}
diff --git a/tools/apps/update_homebrew/lib/src/impl.dart b/tools/apps/update_homebrew/lib/src/impl.dart
index 2f7b66d..938108b 100644
--- a/tools/apps/update_homebrew/lib/src/impl.dart
+++ b/tools/apps/update_homebrew/lib/src/impl.dart
@@ -1,30 +1,23 @@
part of '../update_homebrew.dart';
-const _files = {
- 'dev': [_x64Files, _ia32Files],
- 'stable': [_x64Files, _ia32Files]
-};
+const _files = [
+ 'dartsdk-macos-x64-release.zip',
+ 'dartsdk-linux-x64-release.zip',
+ 'dartsdk-linux-arm64-release.zip',
+ 'dartsdk-linux-ia32-release.zip',
+ 'dartsdk-linux-arm-release.zip',
+];
-const _urlBase = 'https://storage.googleapis.com/dart-archive/channels';
-const _x64Files = {
- 'mac': 'sdk/dartsdk-macos-x64-release.zip',
- 'linux': 'sdk/dartsdk-linux-x64-release.zip',
- 'linux-arm': 'sdk/dartsdk-linux-arm64-release.zip',
-};
-const _ia32Files = {
- 'linux': 'sdk/dartsdk-linux-ia32-release.zip',
- 'linux-arm': 'sdk/dartsdk-linux-arm-release.zip',
-};
+const _host = 'https://storage.googleapis.com/dart-archive/channels';
Future<String> _getHash256(
- String channel, String revision, String download) async {
+ String channel, String version, String download) async {
var client = http.Client();
try {
var api = storage.StorageApi(client);
- var media = await api.objects.get('dart-archive',
- 'channels/$channel/release/$revision/$download.sha256sum',
+ var url = 'channels/$channel/release/$version/sdk/$download.sha256sum';
+ var media = await api.objects.get('dart-archive', url,
downloadOptions: DownloadOptions.FullMedia) as Media;
-
var hashLine = await ascii.decodeStream(media.stream);
return RegExp('[0-9a-fA-F]*').stringMatch(hashLine);
} finally {
@@ -32,138 +25,32 @@
}
}
-Future<String> _getVersion(String channel, String revision) async {
- var client = http.Client();
- try {
- var api = storage.StorageApi(client);
-
- var media = await api.objects.get(
- 'dart-archive', 'channels/$channel/release/$revision/VERSION',
- downloadOptions: DownloadOptions.FullMedia) as Media;
-
- var versionObject =
- await json.fuse(ascii).decoder.bind(media.stream).first as Map;
- return versionObject['version'] as String;
- } finally {
- client.close();
- }
-}
-
-Future<Map<String, String>> _getCurrentRevisions(String repository) async {
- var revisions = <String, String>{};
- var lines = await (File(p.join(repository, dartRbFileName))).readAsLines();
-
- for (var channel in supportedChannels) {
- /// This RegExp between release/ and /sdk matches
- /// * 1 digit followed by
- /// * Any number of letters, numbers, dashes and dots
- /// This covers both numeric- and version-formatted revisions
- ///
- /// Note: all of the regexp escape slashes `\` are double-escaped within the
- /// Dart string
- final regExp = RegExp('channels/$channel/release/(\\d[\\w\\d\\-\\.]*)/sdk');
-
- revisions[channel] =
- regExp.firstMatch(lines.firstWhere(regExp.hasMatch)).group(1);
- }
- return revisions;
-}
-
-Future<Map<String, Map>> _getHashes(Map<String, String> revisions) async {
- var hashes = <String, Map>{};
- for (var channel in supportedChannels) {
- hashes[channel] = {};
- for (var files in _files[channel]) {
- for (var file in files.values) {
- var hash = await _getHash256(channel, revisions[channel], file);
- hashes[channel][file] = hash;
- }
+Future<void> _updateFormula(String channel, File file, String version,
+ Map<String, String> hashes) async {
+ // Extract files and hashes that are stored in the formula in this format:
+ // url "<url base>/<channel>/release/<version>/sdk/<artifact>.zip"
+ // sha256 "<hash>"
+ var filesAndHashes = RegExp(
+ 'channels/$channel/release' +
+ r'/(\d[\w\d\-\.]*)/sdk/([\w\d\-\.]+)\"\n(\s+)sha256 \"[\da-f]+\"',
+ multiLine: true);
+ var contents = await file.readAsString();
+ contents = contents.replaceAllMapped(filesAndHashes, (m) {
+ var currentVersion = m.group(1);
+ if (currentVersion == version) {
+ throw new ArgumentError(
+ "Channel $channel is already at version $version in homebrew.");
}
- }
- return hashes;
+ var artifact = m.group(2);
+ var indent = m.group(3);
+ return 'channels/$channel/release/$version/sdk/$artifact"\n'
+ '${indent}sha256 "${hashes[artifact]}"';
+ });
+ await file.writeAsString(contents, flush: true);
}
-String _createDartFormula(
- Map revisions, Map hashes, String devVersion, String stableVersion) =>
- '''
-class Dart < Formula
- desc "The Dart SDK"
- homepage "https://dart.dev"
-
- version "$stableVersion"
- if OS.mac?
- url "$_urlBase/stable/release/${revisions['stable']}/${_x64Files['mac']}"
- sha256 "${hashes['stable'][_x64Files['mac']]}"
- elsif OS.linux? && Hardware::CPU.intel?
- if Hardware::CPU.is_64_bit?
- url "$_urlBase/stable/release/${revisions['stable']}/${_x64Files['linux']}"
- sha256 "${hashes['stable'][_x64Files['linux']]}"
- else
- url "$_urlBase/stable/release/${revisions['stable']}/${_ia32Files['linux']}"
- sha256 "${hashes['stable'][_ia32Files['linux']]}"
- end
- elsif OS.linux? && Hardware::CPU.arm?
- if Hardware::CPU.is_64_bit?
- url "$_urlBase/stable/release/${revisions['stable']}/${_x64Files['linux-arm']}"
- sha256 "${hashes['stable'][_x64Files['linux-arm']]}"
- else
- url "$_urlBase/stable/release/${revisions['stable']}/${_ia32Files['linux-arm']}"
- sha256 "${hashes['stable'][_ia32Files['linux-arm']]}"
- end
- end
-
- devel do
- version "$devVersion"
- if OS.mac?
- url "$_urlBase/dev/release/${revisions['dev']}/${_x64Files['mac']}"
- sha256 "${hashes['dev'][_x64Files['mac']]}"
- elsif OS.linux? && Hardware::CPU.intel?
- if Hardware::CPU.is_64_bit?
- url "$_urlBase/dev/release/${revisions['dev']}/${_x64Files['linux']}"
- sha256 "${hashes['dev'][_x64Files['linux']]}"
- else
- url "$_urlBase/dev/release/${revisions['dev']}/${_ia32Files['linux']}"
- sha256 "${hashes['dev'][_ia32Files['linux']]}"
- end
- elsif OS.linux? && Hardware::CPU.arm?
- if Hardware::CPU.is_64_bit?
- url "$_urlBase/dev/release/${revisions['dev']}/${_x64Files['linux-arm']}"
- sha256 "${hashes['dev'][_x64Files['linux-arm']]}"
- else
- url "$_urlBase/dev/release/${revisions['dev']}/${_ia32Files['linux-arm']}"
- sha256 "${hashes['dev'][_ia32Files['linux-arm']]}"
- end
- end
- end
-
- def install
- libexec.install Dir["*"]
- bin.install_symlink "#{libexec}/bin/dart"
- bin.write_exec_script Dir["#{libexec}/bin/{pub,dart?*}"]
- end
-
- def shim_script(target)
- <<~EOS
- #!/usr/bin/env bash
- exec "#{prefix}/#{target}" "\$@"
- EOS
- end
-
- def caveats
- <<~EOS
- Please note the path to the Dart SDK:
- #{opt_libexec}
- EOS
- end
-
- test do
- (testpath/"sample.dart").write <<~EOS
- void main() {
- print(r"test message");
- }
- EOS
-
- assert_equal "test message\\n", shell_output("#{bin}/dart sample.dart")
- end
-end
-''';
+Future<Map<String, String>> _getHashes(String channel, String version) async {
+ return <String, String>{
+ for (var file in _files) file: await _getHash256(channel, version, file)
+ };
+}
diff --git a/tools/apps/update_homebrew/lib/update_homebrew.dart b/tools/apps/update_homebrew/lib/update_homebrew.dart
index c2018d7..e38e51f 100644
--- a/tools/apps/update_homebrew/lib/update_homebrew.dart
+++ b/tools/apps/update_homebrew/lib/update_homebrew.dart
@@ -11,27 +11,19 @@
const githubRepo = 'dart-lang/homebrew-dart';
-const dartRbFileName = 'dart.rb';
+const formulaByChannel = {
+ 'beta': 'dart-beta.rb',
+ 'dev': 'dart.rb',
+ 'stable': 'dart.rb'
+};
-Iterable<String> get supportedChannels => _files.keys;
+Iterable<String> get supportedChannels => formulaByChannel.keys;
Future<void> writeHomebrewInfo(
- String channel, String revision, String repository) async {
- var revisions = await _getCurrentRevisions(repository);
-
- if (revisions[channel] == revision) {
- print("Channel $channel is already at revision $revision in homebrew.");
- exit(0);
- }
- revisions[channel] = revision;
- var hashes = await _getHashes(revisions);
- var devVersion = await _getVersion('dev', revisions['dev']);
-
- var stableVersion = await _getVersion('stable', revisions['stable']);
-
- await File(p.join(repository, dartRbFileName)).writeAsString(
- _createDartFormula(revisions, hashes, devVersion, stableVersion),
- flush: true);
+ String channel, String version, String repository) async {
+ var formula = File(p.join(repository, formulaByChannel[channel]));
+ var hashes = await _getHashes(channel, version);
+ await _updateFormula(channel, formula, version, hashes);
}
Future<void> runGit(List<String> args, String repository,
diff --git a/tools/bots/add_fields.dart b/tools/bots/add_fields.dart
deleted file mode 100644
index 56b313a..0000000
--- a/tools/bots/add_fields.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-import 'dart:io';
-import 'dart:convert';
-
-/// This script reads the JSON object from the file at args[0] and
-/// adds data to it from the environment. Args[1] should be the timestamp
-/// (as epoch seconds) of the current Git commit being tested.
-/// Args[2] should be the hash of the current Git commit under test.
-void main(List<String> args) {
- Map<String, dynamic> map = jsonDecode(File(args[0]).readAsStringSync());
- final env = Platform.environment;
- map['commit_time'] = args[1];
- map['commit_hash'] = args[2];
- map['builder_name'] = env['SWARMING_BOT_ID'];
- map['bot_name'] = env['BUILDBOT_BUILDERNAME'];
- File(args[0]).writeAsStringSync(jsonEncode(map));
-}
diff --git a/tools/bots/post_results_to_pubsub.dart b/tools/bots/post_results_to_pubsub.dart
index 572e451..3c6a316 100644
--- a/tools/bots/post_results_to_pubsub.dart
+++ b/tools/bots/post_results_to_pubsub.dart
@@ -10,10 +10,6 @@
// so the cloud function only needs to process 100 records within its time
// limit of 60s. Because of this, we never approach the limit of 10 MB
// base64-encoded data bytes per message.
-//
-// The function also scans results.json to find the configurations tested
-// by this builder, and writes them and a results feed URL filtered to
-// those configuration groups to a json file, used later in the recipe.
import 'dart:convert';
import 'dart:io';
@@ -62,34 +58,6 @@
print('No results in input file');
return;
}
- // Record the configurations appearing in these results.
- final configurationRegexp = RegExp('"configuration":"([^"]*)"');
- final configurationsSet = {
- for (final result in lines) configurationRegexp.firstMatch(result)?.group(1)
- };
- if (configurationsSet.contains(null)) {
- print("Error: result without a configuration");
- configurationsSet.remove(null);
- }
- final configurations = configurationsSet.toList()..sort();
- final configurationGroups = {
- for (final configuration in configurations) configuration.split('-').first
- };
- // Construct a link to the results feed that includes a filter showing
- // unapproved failures for those configuration groups.
- String fragment = [
- 'showLatestFailures=true',
- 'showUnapprovedOnly=true',
- if (configurationGroups.isNotEmpty)
- 'configurationGroups=${configurationGroups.join(',')}'
- ].join('&');
- final resultsFeedUrl = 'https://dart-ci.firebaseapp.com/#$fragment';
- // Save them to a file.
- await File('builder_tested_configurations')
- .writeAsString(JsonEncoder.withIndent(' ').convert({
- 'configurations': configurations,
- 'results_feed_link': resultsFeedUrl,
- }));
final changedPattern = '"changed":true';
List<String> changedResults =
diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json
index 9bf31e1..1ab78cd 100644
--- a/tools/bots/test_matrix.json
+++ b/tools/bots/test_matrix.json
@@ -631,7 +631,8 @@
"non-nullable"
],
"dart2js-options": [
- "--no-null-safety"
+ "--no-null-safety",
+ "--libraries-spec=sdk_nnbd/lib/libraries.json"
],
"host-checked": true
}
@@ -848,12 +849,12 @@
"hot-reload-rollback": true
}
},
- "dartk-linux-(debug|product|release)-arm-qemu": {
+ "dartk-linux-(debug|product|release)-(arm|arm64)-qemu": {
"options": {
"use-qemu": true
}
},
- "dartkp-linux-(debug|product|release)-arm-qemu": {
+ "dartkp-linux-(debug|product|release)-(arm|arm64)-qemu": {
"options": {
"use-qemu": true
}
diff --git a/tools/dom/nnbd_src/dart2js_Conversions.dart b/tools/dom/nnbd_src/dart2js_Conversions.dart
index 75e944f..cb943b4 100644
--- a/tools/dom/nnbd_src/dart2js_Conversions.dart
+++ b/tools/dom/nnbd_src/dart2js_Conversions.dart
@@ -33,7 +33,7 @@
return e;
}
-EventTarget _convertDartToNative_EventTarget(e) {
+EventTarget? _convertDartToNative_EventTarget(e) {
if (e is _DOMWindowCrossFrame) {
return e._window;
} else {
diff --git a/tools/dom/nnbd_src/dart2js_Platform.dart b/tools/dom/nnbd_src/dart2js_Platform.dart
index 5988011..995f4f4 100644
--- a/tools/dom/nnbd_src/dart2js_Platform.dart
+++ b/tools/dom/nnbd_src/dart2js_Platform.dart
@@ -10,7 +10,7 @@
* browser. If false, using these types will generate a runtime
* error.
*/
- static final supportsTypedData = JS('bool', '!!(window.ArrayBuffer)');
+ static final bool supportsTypedData = JS('bool', '!!(window.ArrayBuffer)');
/**
* Returns true if SIMD types in dart:typed_data types are supported
diff --git a/tools/dom/templates/html/impl/impl_Element.darttemplate b/tools/dom/templates/html/impl/impl_Element.darttemplate
index 76ddcde..2a270b6 100644
--- a/tools/dom/templates/html/impl/impl_Element.darttemplate
+++ b/tools/dom/templates/html/impl/impl_Element.darttemplate
@@ -1156,7 +1156,7 @@
* from W3C.
*/
@SupportedBrowser(SupportedBrowser.CHROME, '25')
- ShadowRoot get shadowRoot =>
+ ShadowRoot$NULLABLE get shadowRoot =>
JS('ShadowRoot|Null', '#.shadowRoot || #.webkitShadowRoot', this, this);
/**
diff --git a/tools/dom/templates/html/impl/impl_Node.darttemplate b/tools/dom/templates/html/impl/impl_Node.darttemplate
index 2616515..23092f5 100644
--- a/tools/dom/templates/html/impl/impl_Node.darttemplate
+++ b/tools/dom/templates/html/impl/impl_Node.darttemplate
@@ -16,12 +16,12 @@
Node get first {
- Node result = JS('Node|Null', '#.firstChild', _this);
+ Node$NULLABLE result = JS('Node|Null', '#.firstChild', _this);
if (result == null) throw new StateError("No elements");
return result;
}
Node get last {
- Node result = JS('Node|Null', '#.lastChild', _this);
+ Node$NULLABLE result = JS('Node|Null', '#.lastChild', _this);
if (result == null) throw new StateError("No elements");
return result;
}
@@ -29,7 +29,7 @@
int l = this.length;
if (l == 0) throw new StateError("No elements");
if (l > 1) throw new StateError("More than one element");
- return JS('Node|Null', '#.firstChild', _this);
+ return JS('Node|Null', '#.firstChild', _this)$NULLASSERT;
}
void add(Node value) {
diff --git a/tools/dom/templates/html/impl/impl_Window.darttemplate b/tools/dom/templates/html/impl/impl_Window.darttemplate
index da850bf..bfd09a4 100644
--- a/tools/dom/templates/html/impl/impl_Window.darttemplate
+++ b/tools/dom/templates/html/impl/impl_Window.darttemplate
@@ -41,10 +41,10 @@
*/
Document get document => JS('Document', '#.document', this);
- WindowBase _open2(url, name) =>
+ WindowBase$NULLABLE _open2(url, name) =>
JS('Window|Null', '#.open(#,#)', this, url, name);
- WindowBase _open3(url, name, options) =>
+ WindowBase$NULLABLE _open3(url, name, options) =>
JS('Window|Null', '#.open(#,#,#)', this, url, name, options);
/**
@@ -163,7 +163,7 @@
@SupportedBrowser(SupportedBrowser.CHROME, '23.0')
@SupportedBrowser(SupportedBrowser.FIREFOX, '15.0')
@SupportedBrowser(SupportedBrowser.IE, '10.0')
- IdbFactory get indexedDB =>
+ IdbFactory$NULLABLE get indexedDB =>
JS('IdbFactory|Null', // If not supported, returns null.
'#.indexedDB || #.webkitIndexedDB || #.mozIndexedDB',
this, this, this);
diff --git a/tools/test.dart b/tools/test.dart
index aa8e9f6..dfcbf5d 100755
--- a/tools/test.dart
+++ b/tools/test.dart
@@ -112,7 +112,13 @@
}
foundBuilder = true;
for (final step in builder.steps.where((step) => step.isTestStep)) {
- final namedConfiguration = step.testedConfiguration.name;
+ final testedConfiguration = step.testedConfiguration;
+ if (testedConfiguration == null) {
+ // This test step does not use a configuration; for example,
+ // because it is a simple script that does not produce results.
+ continue;
+ }
+ final namedConfiguration = testedConfiguration.name;
if (requestedNamedConfigurations.isEmpty ||
requestedNamedConfigurations.contains(namedConfiguration)) {
testedConfigurations
