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

Unified Diff: pkg/smoke/lib/codegen/generator.dart

Issue 208743006: Fix smoke codegen for []. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 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 | pkg/smoke/test/codegen/generator_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/smoke/lib/codegen/generator.dart
diff --git a/pkg/smoke/lib/codegen/generator.dart b/pkg/smoke/lib/codegen/generator.dart
index 42c5455763b5e45ebe5532ecae0b434a1392214d..920462d2d15b55921e51984d30e032b2212dc5e6 100644
--- a/pkg/smoke/lib/codegen/generator.dart
+++ b/pkg/smoke/lib/codegen/generator.dart
@@ -182,10 +182,11 @@ class SmokeCodeGenerator {
var args = {};
if (_getters.isNotEmpty) {
- args['getters'] = _getters.map((n) => '#$n: (o) => o.$n');
+ args['getters'] = _getters.map((n) => '${_symbol(n)}: (o) => o.$n');
}
if (_setters.isNotEmpty) {
- args['setters'] = _setters.map((n) => '#$n: (o, v) { o.$n = v; }');
+ args['setters'] = _setters.map(
+ (n) => '${_symbol(n)}: (o, v) { o.$n = v; }');
}
if (_parents.isNotEmpty) {
@@ -210,7 +211,7 @@ class SmokeCodeGenerator {
sb.write('{\n');
members.forEach((name, decl) {
var decl = members[name].asCode(_libraryPrefix);
- sb.write('$spaces #$name: $decl,\n');
+ sb.write('$spaces ${_symbol(name)}: $decl,\n');
});
sb.write('$spaces }');
}
@@ -231,7 +232,7 @@ class SmokeCodeGenerator {
} else {
sb.write('{\n');
for (var name in members) {
- sb.write('$spaces #$name: $className.$name,\n');
+ sb.write('$spaces ${_symbol(name)}: $className.$name,\n');
}
sb.write('$spaces }');
}
@@ -241,7 +242,7 @@ class SmokeCodeGenerator {
}
if (_names.isNotEmpty) {
- args['names'] = _names.map((n) => "#$n: r'$n'");
+ args['names'] = _names.map((n) => "${_symbol(n)}: r'$n'");
}
buffer..write(spaces)
@@ -285,7 +286,8 @@ class _DeclarationCode extends ConstExpression {
String asCode(Map<String, String> libraryPrefixes) {
var sb = new StringBuffer();
- sb.write("const Declaration(#$name, ${type.asCode(libraryPrefixes)}");
+ sb.write('const Declaration(${_symbol(name)}, '
+ '${type.asCode(libraryPrefixes)}');
if (kind != 'FIELD') sb.write(', kind: $kind');
if (isFinal) sb.write(', isFinal: true');
if (isStatic) sb.write(', isStatic: true');
@@ -455,3 +457,6 @@ const DEFAULT_IMPORTS = const [
"import 'package:smoke/static.dart' show "
"useGeneratedCode, StaticConfiguration;",
];
+
+_symbol(String name) =>
+ name.contains('[') ? "const Symbol('$name')" : '#$name';
« no previous file with comments | « no previous file | pkg/smoke/test/codegen/generator_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698