Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(528)

Unified Diff: frog/leg/compile_time_constants.dart

Issue 9706018: Make string interpolations be compile-time-constants. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Updated to tip of tree. Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tests/co19/co19-leg.status » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: frog/leg/compile_time_constants.dart
diff --git a/frog/leg/compile_time_constants.dart b/frog/leg/compile_time_constants.dart
index c6126b90661b0b55c715714bccb5e9f49dc16391..8b5c6b22e2fc0d6a5d9f4ba02fc043ae16727332 100644
--- a/frog/leg/compile_time_constants.dart
+++ b/frog/leg/compile_time_constants.dart
@@ -770,10 +770,30 @@ class CompileTimeConstantEvaluator extends AbstractVisitor {
}
Constant visitStringJuxtaposition(StringJuxtaposition node) {
- if (!node.isInterpolation) {
- return new StringConstant(node.dartString);
- }
- return super.visitStringJuxtaposition(node);
+ StringConstant left = evaluate(node.first);
+ StringConstant right = evaluate(node.second);
+ return new StringConstant(new DartString.concat(left.value, right.value));
+ }
+
+ Constant visitStringInterpolation(StringInterpolation node) {
+ StringConstant initialString = evaluate(node.string);
+ DartString accumulator = initialString.value;
+ for (StringInterpolationPart part in node.parts) {
+ Constant expression = evaluate(part.expression);
+ DartString expressionString;
+ if (expression.isNum() || expression.isBool()) {
+ Object value = expression.value;
+ expressionString = new DartString.literal(value.toString());
+ } else if (expression.isString()) {
+ expressionString = expression.value;
+ } else {
+ error(part.expression);
+ }
+ accumulator = new DartString.concat(accumulator, expressionString);
+ StringConstant partString = evaluate(part.string);
+ accumulator = new DartString.concat(accumulator, partString.value);
+ };
+ return new StringConstant(accumulator);
}
// TODO(floitsch): provide better error-messages.
« no previous file with comments | « no previous file | tests/co19/co19-leg.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698