Revert "Retry "Emit more stuff via ASTs""

sdk/lib/_internal/compiler/implementation/js/printer.dart

 // Copyright (c) 2012, 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.
 
 part of js;
 
 class Printer implements NodeVisitor {
   final bool shouldCompressOutput;
   leg.Compiler compiler;
   leg.CodeBuffer outBuffer;
@@ skipping 13 matching lines @@
         danglingElseVisitor = new DanglingElseVisitor(compiler),
         localNamer = determineRenamer(compiler.enableMinification,
                                       allowVariableMinification);
 
   static LocalNamer determineRenamer(bool shouldCompressOutput,
                                      bool allowVariableMinification) {
     return (shouldCompressOutput && allowVariableMinification)
         ? new MinifyRenamer() : new IdentityNamer();
   }
 
-  /// Always emit a newline, even under `enableMinification`.
-  void forceLine() {
-    out("\n");
-  }
-  /// Emits a newline for readability.
-  void lineOut() {
-    if (!shouldCompressOutput) forceLine();
-  }
   void spaceOut() {
     if (!shouldCompressOutput) out(" ");
   }
+  void lineOut() {
+    if (!shouldCompressOutput) out("\n");
+  }
 
   String lastAddedString = null;
   int get lastCharCode {
     if (lastAddedString == null) return 0;
     assert(lastAddedString.length != "");
     return lastAddedString.charCodeAt(lastAddedString.length - 1);
   }
 
   void out(String str) {
     if (str != "") {
@@ skipping 13 matching lines @@
 
   void outLn(String str) {
     out(str);
     lineOut();
   }
 
   void outSemicolonLn() {
     if (shouldCompressOutput) {
       pendingSemicolon = true;
     } else {
-      out(";");
-      forceLine();
+      out(";\n");
     }
   }
 
   void outIndent(String str) { indent(); out(str); }
   void outIndentLn(String str) { indent(); outLn(str); }
   void indent() {
     if (!shouldCompressOutput) {
       for (int i = 0; i < indentLevel; i++) out("  ");
     }
   }
@@ skipping 581 matching lines @@
       // TODO(floitsch): allow more characters.
       int charCode = field.charCodeAt(i);
       if (!(charCodes.$a <= charCode && charCode <= charCodes.$z ||
             charCodes.$A <= charCode && charCode <= charCodes.$Z ||
             charCode == charCodes.$$ ||
             charCode == charCodes.$_ ||
             i != 1 && isDigit(charCode))) {
         return false;
       }
     }
-    // TODO(floitsch): normally we should also check that the field is not a
-    // reserved word.  We don't generate fields with reserved word names except
-    // for 'super'.
-    if (field == '"super"') return false;
+    // TODO(floitsch): normally we should also check that the field is not
+    // a reserved word.
     return true;
   }
 
   visitAccess(PropertyAccess access) {
     visitNestedExpression(access.receiver, CALL,
                           newInForInit: inForInit,
                           newAtStatementBegin: atStatementBegin);
     Node selector = access.selector;
     if (selector is LiteralString) {
       LiteralString selectorString = selector;
@@ skipping 64 matching lines @@
       }
     }
     out("]");
   }
 
   visitArrayElement(ArrayElement node) {
     throw "Unreachable";
   }
 
   visitObjectInitializer(ObjectInitializer node) {
-    // Print all the properties on one line until we see a function-valued
-    // property.  Ideally, we would use a proper pretty-printer to make the
-    // decision based on layout.
-    bool onePerLine = false;
+    out("{");
     List<Property> properties = node.properties;
-    out("{");
-    ++indentLevel;
     for (int i = 0; i < properties.length; i++) {
-      Expression value = properties[i].value;
-      if (value is Fun || value is NamedFunction) onePerLine = true;
       if (i != 0) {
         out(",");
-        if (!onePerLine) spaceOut();
-      }
-      if (onePerLine) {
-        forceLine();
-        indent();
+        spaceOut();
       }
       visitProperty(properties[i]);
     }
-    --indentLevel;
-    if (onePerLine) lineOut();
     out("}");
   }
 
   visitProperty(Property node) {
     if (node.name is LiteralString) {
       LiteralString nameString = node.name;
       String name = nameString.value;
       if (isValidJavaScriptId(name)) {
         out(name.substring(1, name.length - 1));
       } else {
@@ skipping 285 matching lines @@
         codes.add(nthLetter((n ~/ nameSpaceSize) % LETTERS));
       }
       codes.add(charCodes.$0 + digit);
       newName = new String.fromCharCodes(codes);
     }
     assert(new RegExp(r'[a-zA-Z][a-zA-Z0-9]*').hasMatch(newName));
     maps.last[oldName] = newName;
     return newName;
   }
 }