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

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: Fix typo 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 32487beee10d13b3f08a33b29e2c7bc80905a1a3..2058c0e78f3e9aa81d169bee516f8e918ae81d64 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() {
@@ -769,6 +769,13 @@ class CompileTimeConstantEvaluator extends AbstractVisitor {
return new StringConstant(node.dartString);
}
+ Constant visitStringJuxtaposition(StringJuxtaposition node) {
+ if (!node.isInterpolation) {
+ return new StringConstant(node.dartString);
+ }
+ return super.visitStringJuxtaposition(node);
ahe 2012/03/19 15:53:06 Cancel directly to produce better error message? A
Lasse Reichstein Nielsen 2012/03/20 09:34:33 This is just a temporary stopgap. I have another C
+ }
+
// TODO(floitsch): provide better error-messages.
Constant visitSend(Send send) {
Element element = elements[send];
@@ -1010,7 +1017,7 @@ class CompileTimeConstantEvaluator extends AbstractVisitor {
compiler.registerInstantiatedClass(classElement);
// TODO(floitsch): take generic types into account.
- Type type = classElement.computeType(compiler);
+ Type type = classElement.computeType(compiler);
Constant constant = new ConstructedConstant(type, jsNewArguments);
constantHandler.registerCompileTimeConstant(constant);
return constant;
« 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