|
5 | 5 | import 'package:meta/meta.dart'; |
6 | 6 |
|
7 | 7 | import 'helper.dart'; |
| 8 | +import 'serialization_context.dart'; |
8 | 9 | import 'syntax.g.dart'; |
9 | 10 |
|
10 | 11 | /// A value recorded during compilation. |
@@ -55,33 +56,33 @@ abstract class Constant extends MaybeConstant { |
55 | 56 | const Constant(); |
56 | 57 |
|
57 | 58 | /// Converts this [Constant] object to a syntax representation. |
58 | | - ConstantSyntax _toSyntax(Map<Constant, int> constants); |
| 59 | + ConstantSyntax _toSyntax(SerializationContext context); |
59 | 60 |
|
60 | 61 | /// Creates a [Constant] object from its syntax representation. |
61 | 62 | static Constant _fromSyntax( |
62 | 63 | ConstantSyntax syntax, |
63 | | - List<Constant> constants, |
| 64 | + DeserializationContext context, |
64 | 65 | ) => switch (syntax) { |
65 | 66 | NullConstantSyntax() => const NullConstant(), |
66 | 67 | BoolConstantSyntax(:final value) => BoolConstant(value), |
67 | 68 | IntConstantSyntax(:final value) => IntConstant(value), |
68 | 69 | StringConstantSyntax(:final value) => StringConstant(value), |
69 | 70 | ListConstantSyntax(:final value) => ListConstant( |
70 | | - value!.cast<int>().map((i) => constants[i]).toList(), |
| 71 | + value!.cast<int>().map((i) => context.constants[i]).toList(), |
71 | 72 | ), |
72 | 73 | MapConstantSyntax(:final value) => MapConstant( |
73 | 74 | value |
74 | 75 | .map( |
75 | 76 | (e) => MapEntry( |
76 | | - constants[e.key], |
77 | | - constants[e.value], |
| 77 | + context.constants[e.key], |
| 78 | + context.constants[e.value], |
78 | 79 | ), |
79 | 80 | ) |
80 | 81 | .toList(), |
81 | 82 | ), |
82 | 83 | InstanceConstantSyntax(value: final value) => InstanceConstant( |
83 | 84 | fields: (value?.json ?? {}).map( |
84 | | - (key, value) => MapEntry(key, constants[value as int]), |
| 85 | + (key, value) => MapEntry(key, context.constants[value as int]), |
85 | 86 | ), |
86 | 87 | ), |
87 | 88 | UnsupportedConstantSyntax(:final message) => UnsupportedConstant(message), |
@@ -115,7 +116,7 @@ final class NullConstant extends Constant { |
115 | 116 | const NullConstant() : super(); |
116 | 117 |
|
117 | 118 | @override |
118 | | - NullConstantSyntax _toSyntax(Map<Constant, int> constants) => |
| 119 | + NullConstantSyntax _toSyntax(SerializationContext context) => |
119 | 120 | NullConstantSyntax(); |
120 | 121 |
|
121 | 122 | @override |
@@ -143,7 +144,7 @@ final class UnsupportedConstant extends Constant { |
143 | 144 | const UnsupportedConstant(this.message); |
144 | 145 |
|
145 | 146 | @override |
146 | | - UnsupportedConstantSyntax _toSyntax(Map<Constant, int> constants) => |
| 147 | + UnsupportedConstantSyntax _toSyntax(SerializationContext context) => |
147 | 148 | UnsupportedConstantSyntax(message: message); |
148 | 149 |
|
149 | 150 | @override |
@@ -173,7 +174,7 @@ final class BoolConstant extends Constant { |
173 | 174 | const BoolConstant(this.value); |
174 | 175 |
|
175 | 176 | @override |
176 | | - BoolConstantSyntax _toSyntax(Map<Constant, int> constants) => |
| 177 | + BoolConstantSyntax _toSyntax(SerializationContext context) => |
177 | 178 | BoolConstantSyntax(value: value); |
178 | 179 |
|
179 | 180 | @override |
@@ -202,7 +203,7 @@ final class IntConstant extends Constant { |
202 | 203 | const IntConstant(this.value); |
203 | 204 |
|
204 | 205 | @override |
205 | | - IntConstantSyntax _toSyntax(Map<Constant, int> constants) => |
| 206 | + IntConstantSyntax _toSyntax(SerializationContext context) => |
206 | 207 | IntConstantSyntax(value: value); |
207 | 208 |
|
208 | 209 | @override |
@@ -231,7 +232,7 @@ final class StringConstant extends Constant { |
231 | 232 | const StringConstant(this.value); |
232 | 233 |
|
233 | 234 | @override |
234 | | - StringConstantSyntax _toSyntax(Map<Constant, int> constants) => |
| 235 | + StringConstantSyntax _toSyntax(SerializationContext context) => |
235 | 236 | StringConstantSyntax(value: value); |
236 | 237 |
|
237 | 238 | @override |
@@ -270,9 +271,9 @@ final class ListConstant extends Constant { |
270 | 271 | } |
271 | 272 |
|
272 | 273 | @override |
273 | | - ListConstantSyntax _toSyntax(Map<Constant, int> constants) => |
| 274 | + ListConstantSyntax _toSyntax(SerializationContext context) => |
274 | 275 | ListConstantSyntax( |
275 | | - value: value.map((constant) => constants[constant]).toList(), |
| 276 | + value: value.map((constant) => context.constants[constant]!).toList(), |
276 | 277 | ); |
277 | 278 |
|
278 | 279 | @override |
@@ -326,13 +327,13 @@ final class MapConstant extends Constant { |
326 | 327 | } |
327 | 328 |
|
328 | 329 | @override |
329 | | - MapConstantSyntax _toSyntax(Map<Constant, int> constants) => |
| 330 | + MapConstantSyntax _toSyntax(SerializationContext context) => |
330 | 331 | MapConstantSyntax( |
331 | 332 | value: entries |
332 | 333 | .map( |
333 | 334 | (entry) => MapEntrySyntax( |
334 | | - key: constants[entry.key]!, |
335 | | - value: constants[entry.value]!, |
| 335 | + key: context.constants[entry.key]!, |
| 336 | + value: context.constants[entry.value]!, |
336 | 337 | ), |
337 | 338 | ) |
338 | 339 | .toList(), |
@@ -377,12 +378,13 @@ final class InstanceConstant extends Constant { |
377 | 378 | const InstanceConstant({required this.fields}); |
378 | 379 |
|
379 | 380 | @override |
380 | | - InstanceConstantSyntax _toSyntax(Map<Constant, int> constants) => |
| 381 | + InstanceConstantSyntax _toSyntax(SerializationContext context) => |
381 | 382 | InstanceConstantSyntax( |
382 | 383 | value: fields.isNotEmpty |
383 | 384 | ? JsonObjectSyntax.fromJson( |
384 | 385 | fields.map( |
385 | | - (name, constant) => MapEntry(name, constants[constant]!), |
| 386 | + (name, constant) => |
| 387 | + MapEntry(name, context.constants[constant]!), |
386 | 388 | ), |
387 | 389 | ) |
388 | 390 | : null, |
@@ -429,8 +431,10 @@ final class InstanceConstant extends Constant { |
429 | 431 | /// This avoids bloating the public API and public API docs and prevents |
430 | 432 | /// internal types from leaking from the API. |
431 | 433 | extension ConstantProtected on Constant { |
432 | | - ConstantSyntax toSyntax(Map<Constant, int> constants) => _toSyntax(constants); |
| 434 | + ConstantSyntax toSyntax(SerializationContext context) => _toSyntax(context); |
433 | 435 |
|
434 | | - static Constant fromSyntax(ConstantSyntax syntax, List<Constant> constants) => |
435 | | - Constant._fromSyntax(syntax, constants); |
| 436 | + static Constant fromSyntax( |
| 437 | + ConstantSyntax syntax, |
| 438 | + DeserializationContext context, |
| 439 | + ) => Constant._fromSyntax(syntax, context); |
436 | 440 | } |
0 commit comments