[cleanup] remove PropertyName from js_ast

lib/src/codegen/js_codegen.dart

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library dev_compiler.src.codegen.js_codegen;
 
 import 'dart:collection' show HashSet, HashMap;
 import 'dart:io' show Directory, File;
 
 import 'package:analyzer/analyzer.dart' hide ConstantEvaluator;
@@ skipping 320 matching lines @@
           genericDef,
           _EXPORTS,
           js.string(name, "'"),
           genericName
         ]);
       }
 
       return js.statement(
           'dart.defineLazyClass(#, { get #() { #; return #; } });', [
         _EXPORTS,
-        name,
+        js.string(name, "'"),

[vsm, 2015/03/25 19:44:27]

Did you mean to use _propertyName here?

[Jennifer Messerly, 2015/03/25 20:28:51]

Done.

         body,
         name
       ]);
     }
 
     if (isPublic(name)) _exports.add(name);
 
     if (genericDef != null) {
       body = js.statement('{ #; let # = #; }', [genericDef, name, genericInst]);
       if (isPublic(name)) _exports.add(genericName);
@@ skipping 218 matching lines @@
   /// `C() : super() {}`.
   JS.Method _emitImplicitConstructor(
       ClassDeclaration node, String name, List<FieldDeclaration> fields) {
     // If we don't have a method body, skip this.
     if (fields.isEmpty) return null;
 
     dynamic body = _initializeFields(fields);
     var superCall = _superConstructorCall(node);
     if (superCall != null) body = [[body, superCall]];
     return new JS.Method(
-        new JS.PropertyName(name), js.call('function() { #; }', body));
+        _propertyName(name), js.call('function() { #; }', body));
   }
 
   JS.Method _emitConstructor(ConstructorDeclaration node, String className,
       List<FieldDeclaration> fields, bool isObject) {
     if (_externalOrNative(node)) return null;
 
     var name = _constructorName(className, node.name);
 
     // Code generation for Object's constructor.
     JS.Block body;
@@ skipping 21 matching lines @@
         return result === void 0 ? this : result;
       }''');
     } else {
       body = _emitConstructorBody(node, fields);
     }
 
     // We generate constructors as initializer methods in the class;
     // this allows use of `super` for instance methods/properties.
     // It also avoids V8 restrictions on `super` in default constructors.
     return new JS.Method(
-        new JS.PropertyName(name), new JS.Fun(_visit(node.parameters), body))
+        _propertyName(name), new JS.Fun(_visit(node.parameters), body))
       ..sourceInformation = node;
   }
 
   String _constructorName(String className, SimpleIdentifier name) {
     if (name == null) return className;
     return '$className\$${name.name}';
   }
 
   JS.Block _emitConstructorBody(
       ConstructorDeclaration node, List<FieldDeclaration> fields) {
@@ skipping 230 matching lines @@
     body.add(new JS.FunctionDeclaration(
         new JS.VariableDeclaration(name), _visit(node.functionExpression)));
 
     if (isPublic(name)) _exports.add(name);
     return _statement(body);
   }
 
   JS.Method _emitTopLevelProperty(FunctionDeclaration node) {
     var name = node.name.name;
     return new JS.Method(
-        new JS.PropertyName(name), _visit(node.functionExpression),
+        _propertyName(name), _visit(node.functionExpression),
         isGetter: node.isGetter, isSetter: node.isSetter);
   }
 
   @override
   JS.Expression visitFunctionExpression(FunctionExpression node) {
     var params = _visit(node.parameters);
     if (params == null) params = [];
 
     if (node.parent is FunctionDeclaration) {
       return new JS.Fun(params, _visit(node.body));
@@ skipping 264 matching lines @@
     if (named.isNotEmpty) {
       args.add(new JS.ObjectInitializer(named));
     }
     return args;
   }
 
   @override
   JS.Property visitNamedExpression(NamedExpression node) {
     assert(node.parent is ArgumentList);
     return new JS.Property(
-        new JS.PropertyName(node.name.label.name), _visit(node.expression));
+        _propertyName(node.name.label.name), _visit(node.expression));
   }
 
   @override
   List<JS.Parameter> visitFormalParameterList(FormalParameterList node) {
     var result = <JS.Parameter>[];
     for (FormalParameter param in node.parameters) {
       if (param.kind == ParameterKind.NAMED) {
         result.add(new JS.Parameter(r'opt$'));
         break;
       }
@@ skipping 105 matching lines @@
     _lazyFields.clear();
   }
 
   JS.Statement _emitLazyFields(
       String objExpr, List<VariableDeclaration> fields) {
     if (fields.isEmpty) return null;
 
     var methods = [];
     for (var node in fields) {
       var name = node.name.name;
-      methods.add(new JS.Method(new JS.PropertyName(name),
+      methods.add(new JS.Method(_propertyName(name),
           js.call('function() { return #; }', _visit(node.initializer)),
           isGetter: true));
 
       // TODO(jmesserly): use a dummy setter to indicate writable.
       if (!node.isFinal) {
         methods.add(new JS.Method(
-            new JS.PropertyName(name), js.call('function(_) {}'),
+            _propertyName(name), js.call('function(_) {}'),
             isSetter: true));
       }
     }
 
     return js.statement(
         'dart.defineLazyProperties(#, { # });', [objExpr, methods]);
   }
 
   void _flushLibraryProperties(List<JS.Statement> body) {
     if (_properties.isEmpty) return;
@@ skipping 776 matching lines @@
       if (_privateNames.add(name)) _pendingPrivateNames.add(name);
       return new JS.VariableUse(name);
     }
     if (name == '[]') {
       name = 'get';
     } else if (name == '[]=') {
       name = 'set';
     } else if (unary && name == '-') {
       name = 'unary-';
     }
-    return new JS.PropertyName(name);
+    return _propertyName(name);
   }
 
   bool _externalOrNative(node) =>
       node.externalKeyword != null || _functionBody(node) is NativeFunctionBody;
 
   FunctionBody _functionBody(node) =>
       node is FunctionDeclaration ? node.functionExpression.body : node.body;
 
   /// Choose a canonical name from the library element.
   /// This never uses the library's name (the identifier in the `library`
@@ skipping 133 matching lines @@
   var context = new JS.SimpleJavaScriptPrintingContext();
   _writeNode(context, node);
   return context.getText();
 }
 
 /// Choose a canonical name from the library element.
 /// This never uses the library's name (the identifier in the `library`
 /// declaration) as it doesn't have any meaningful rules enforced.
 String jsLibraryName(LibraryElement library) => canonicalLibraryName(library);
 
+/// Shorthand for identifier-like property names.
+/// For now, we emit them as strings and the printer restores them to
+/// identifiers if it can.
+// TODO(jmesserly): avoid the round tripping through quoted form.
+JS.LiteralString _propertyName(String name) => js.string(name, "'");
+
 /// Path to file that will be generated for [info]. In case it's url is a
 /// `file:` url, we use [root] to determine the relative path from the entry
 /// point file.
 String jsOutputPath(LibraryInfo info, Uri root) {
   var uri = info.library.source.uri;
   var filepath = '${path.withoutExtension(uri.path)}.js';
   if (uri.scheme == 'dart') {
     filepath = 'dart/$filepath';
   } else if (uri.scheme == 'file') {
     filepath = path.relative(filepath, from: path.dirname(root.path));
@@ skipping 56 matching lines @@
 
     // TODO(jmesserly): in many cases marking the end will be unncessary.
     printer.mark(_location(node.end));
   }
 
   String _getIdentifier(AstNode node) {
     if (node is SimpleIdentifier) return node.name;
     return null;
   }
 }