dart2js: Use an abstract Name class for names in the generated JavaScript ast.

pkg/compiler/lib/src/js_emitter/old_emitter/interceptor_emitter.dart

Index: pkg/compiler/lib/src/js_emitter/old_emitter/interceptor_emitter.dart
diff --git a/pkg/compiler/lib/src/js_emitter/old_emitter/interceptor_emitter.dart b/pkg/compiler/lib/src/js_emitter/old_emitter/interceptor_emitter.dart
index aa43580b9735ba42b9710e4dc28bd6f1dec531d4..dd400fdffd8bfdfbfd7c9359c45c56d8923ef29e 100644
--- a/pkg/compiler/lib/src/js_emitter/old_emitter/interceptor_emitter.dart
+++ b/pkg/compiler/lib/src/js_emitter/old_emitter/interceptor_emitter.dart
@@ -5,15 +5,17 @@
 part of dart2js.js_emitter;
 
 class InterceptorEmitter extends CodeEmitterHelper {
-  final Set<String> interceptorInvocationNames = new Set<String>();
+  final Set<jsAst.Name> interceptorInvocationNames =
+      new Set<jsAst.Name>();
 
-  void recordMangledNameOfMemberMethod(FunctionElement member, String name) {
+  void recordMangledNameOfMemberMethod(FunctionElement member,
+                                       jsAst.Name name) {
     if (backend.isInterceptedMethod(member)) {
       interceptorInvocationNames.add(name);
     }
   }
 
-  jsAst.Expression buildGetInterceptorMethod(String key,
+  jsAst.Expression buildGetInterceptorMethod(jsAst.Name key,
                                              Set<ClassElement> classes) {
     InterceptorStubGenerator stubGenerator =
         new InterceptorStubGenerator(compiler, namer, backend);
@@ -31,9 +33,10 @@ class InterceptorEmitter extends CodeEmitterHelper {
 
     parts.add(js.comment('getInterceptor methods'));
 
-    Map<String, Set<ClassElement>> specializedGetInterceptors =
+    Map<jsAst.Name, Set<ClassElement>> specializedGetInterceptors =
         backend.specializedGetInterceptors;
-    for (String name in specializedGetInterceptors.keys.toList()..sort()) {
+    List<jsAst.Name> names = specializedGetInterceptors.keys.toList()..sort();

[floitsch, 2015/06/22 17:43:44]

I would prefer moving the sort into a separate line.

[herhut, 2015/06/23 13:26:31]

Done.

+    for (jsAst.Name name in names) {
       Set<ClassElement> classes = specializedGetInterceptors[name];
       parts.add(
           js.statement('#.# = #',
@@ -47,13 +50,13 @@ class InterceptorEmitter extends CodeEmitterHelper {
 
   jsAst.Statement buildOneShotInterceptors() {
     List<jsAst.Statement> parts = <jsAst.Statement>[];
-    List<String> names = backend.oneShotInterceptors.keys.toList();
-    names.sort();
+    Iterable<jsAst.Name> names
+        = backend.oneShotInterceptors.keys.toList()..sort();

[floitsch, 2015/06/22 17:43:44]

I would prefer keeping the sort in a separate line.

[herhut, 2015/06/23 13:26:31]

Done.

 
     InterceptorStubGenerator stubGenerator =
         new InterceptorStubGenerator(compiler, namer, backend);
     String globalObject = namer.globalObjectFor(backend.interceptorsLibrary);
-    for (String name in names) {
+    for (jsAst.Name name in names) {
       jsAst.Expression function =
           stubGenerator.generateOneShotInterceptor(name);
       parts.add(js.statement('${globalObject}.# = #', [name, function]));
@@ -75,13 +78,11 @@ class InterceptorEmitter extends CodeEmitterHelper {
     // (which can easily be identified).
     if (!compiler.enabledInvokeOn) return null;
 
-    List<String> invocationNames = interceptorInvocationNames.toList()..sort();
-    List<jsAst.Property> properties =
-        new List<jsAst.Property>(invocationNames.length);
-    for (int i = 0; i < invocationNames.length; i++) {
-      String name = invocationNames[i];
-      properties[i] = new jsAst.Property(js.string(name), js.number(1));
-    }
+    Iterable<jsAst.Name> invocationNames =
+        interceptorInvocationNames.toList()..sort();;

[floitsch, 2015/06/22 17:43:44]

ditto.

[herhut, 2015/06/23 13:26:31]

Done.

+    List<jsAst.Property> properties = invocationNames.map((jsAst.Name name) {
+      return new jsAst.Property(js.quoteName(name), js.number(1));
+    }).toList();
     return new jsAst.ObjectInitializer(properties, isOneLiner: true);
   }