Fixes in codegen and test script

lib/src/utils.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.
 
 /// Holds a couple utility functions used at various places in the system.
 library dev_compiler.src.utils;
 
 import 'dart:io';
 
 import 'package:path/path.dart' as path;
 import 'package:analyzer/src/generated/ast.dart'
     show
         ImportDirective,
         ExportDirective,
         PartDirective,
         CompilationUnit,
         Identifier,
         AnnotatedNode,
         AstNode;
 import 'package:analyzer/src/generated/engine.dart'
     show ParseDartTask, AnalysisContext;
 import 'package:analyzer/src/generated/source.dart' show Source;
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/analyzer.dart' show parseDirectives;
 import 'package:crypto/crypto.dart' show CryptoUtils, MD5;
 import 'package:source_span/source_span.dart';
 
+import 'js/keywords.dart';
+
 bool isDartPrivateLibrary(LibraryElement library) {
   var uri = library.source.uri;
   if (uri.scheme != "dart") return false;
   return Identifier.isPrivateName(uri.path);
 }
 
 /// Choose a canonical name from the library element. This is safe to use as a
 /// namespace in JS and Dart code generation.  This never uses the library's
 /// name (the identifier in the `library` declaration) as it doesn't have any
 /// meaningful rules enforced.
 String canonicalLibraryName(LibraryElement library) {
   var uri = library.source.uri;
-  return path.basenameWithoutExtension(uri.pathSegments.last);
+  var name = path.basenameWithoutExtension(uri.pathSegments.last);
+  return _toIdentifier(name);
 }
 
+/// Escape [name] to make it into a valid identifier.
+String _toIdentifier(String name) {
+  if (name.length == 0) return r'$';
+
+  // Escape any invalid characters
+  StringBuffer buffer = null;
+  for (int i = 0; i < name.length; i++) {
+    var ch = name[i];
+    var needsEscape = ch == r'$' || _invalidCharInIdentifier.hasMatch(ch);
+    if (needsEscape && buffer == null) {
+      buffer = new StringBuffer(name.substring(0, i));
+    }
+    if (buffer != null) {
+      buffer.write(needsEscape ? '\$${ch.codeUnits.join("")}' : ch);
+    }
+  }
+
+  var result = buffer != null ? '$buffer' : name;
+  // Ensure the idenifier first character is not numeric and that the whole
+  // identifier is not a keyword.
+  if (result.startsWith(new RegExp('[0-9]')) || isJsKeyword(result)) {
+    return '\$$result';
+  }
+  return result;
+}
+
+// Invalid characters for identifiers, which would need to be escaped.
+final _invalidCharInIdentifier = new RegExp(r'[^A-Za-z_$0-9]');
+
 /// Returns all libraries transitively imported or exported from [start].
 Iterable<LibraryElement> reachableLibraries(LibraryElement start) {
   var results = <LibraryElement>[];
   var seen = new Set();
   void find(LibraryElement lib) {
     if (seen.contains(lib)) return;
     seen.add(lib);
     results.add(lib);
     lib.importedLibraries.forEach(find);
     lib.exportedLibraries.forEach(find);
@@ skipping 207 matching lines @@
       locationForOffset(unit, uri, end), '$text');
 }
 
 /// Computes a hash for the given contents.
 String computeHash(String contents) {
   if (contents == null || contents == '') return null;
   return CryptoUtils.bytesToHex((new MD5()..add(contents.codeUnits)).close());
 }
 
 String resourceOutputPath(Uri resourceUri) => resourceUri.path;