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

Unified Diff: frog/leg/compile_time_constants.dart

Issue 9642001: Make string juxtaposition combine properly with string interpolations. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Remove last bugs and clean up builder. 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 | frog/leg/resolver.dart » ('j') | frog/leg/resolver.dart » ('J')
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 cefe2f5f2a70f8d0f44862a181f09597555c33cf..238d5cc884c9d259765123935010d8b0fab3e1dd 100644
--- a/frog/leg/compile_time_constants.dart
+++ b/frog/leg/compile_time_constants.dart
@@ -333,9 +333,9 @@ class MapConstant extends ObjectConstant {
buffer.add("$isolatePrototype.$name");
} else {
value.writeJsCode(buffer, handler);
- }
+ }
}
- buffer.add("}");
+ buffer.add("}");
}
void badFieldCountError() {
@@ -768,6 +768,13 @@ class CompileTimeConstantEvaluator extends AbstractVisitor {
return new StringConstant(node.dartString);
}
+ Constant visitStringJuxtapostion(StringJuxtaposition node) {
+ if (node.dartString !== null) {
ngeoffray 2012/03/14 12:29:58 Replace with !node.isInterpolation?
Lasse Reichstein Nielsen 2012/03/14 13:04:49 True. I'm still not sure I like the isInterpolatio
+ return new StringConstant(node.dartString);
+ }
+ super.visitStringJuxtapostion(node);
+ }
+
// TODO(floitsch): provide better error-messages.
Constant visitSend(Send send) {
Element element = elements[send];
« no previous file with comments | « no previous file | frog/leg/resolver.dart » ('j') | frog/leg/resolver.dart » ('J')

Powered by Google App Engine
This is Rietveld 408576698