Add helpers library to dart2js.

sdk/lib/_internal/compiler/implementation/helpers/trace.dart

Index: sdk/lib/_internal/compiler/implementation/helpers/trace.dart
diff --git a/sdk/lib/_internal/compiler/implementation/util/util.dart b/sdk/lib/_internal/compiler/implementation/helpers/trace.dart
similarity index 57%
copy from sdk/lib/_internal/compiler/implementation/util/util.dart
copy to sdk/lib/_internal/compiler/implementation/helpers/trace.dart
index b24cc1f0d7a5627eb0916212b2dc9084731e3603..8fcb63b247b93a884da0441f90c2c3036fd9f71b 100644
--- a/sdk/lib/_internal/compiler/implementation/util/util.dart
+++ b/sdk/lib/_internal/compiler/implementation/helpers/trace.dart
@@ -1,54 +1,8 @@
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2014, 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 dart2js.util;
-
-import "dart:collection";
-import 'util_implementation.dart';
-import 'characters.dart';
-
-export 'setlet.dart';
-
-part 'link.dart';
-part 'expensive_map.dart';
-part 'expensive_set.dart';
-
-/**
- * Tagging interface for classes from which source spans can be generated.
- */
-// TODO(johnniwinther): Find a better name.
-// TODO(ahe): How about "Bolt"?
-abstract class Spannable {}
-
-class _SpannableSentinel implements Spannable {
-  final String name;
-
-  const _SpannableSentinel(this.name);
-
-  String toString() => name;
-}
-
-/// Sentinel spannable used to mark that diagnostics should point to the
-/// current element. Note that the diagnostic reporting will fail if the current
-/// element is `null`.
-const Spannable CURRENT_ELEMENT_SPANNABLE =
-    const _SpannableSentinel("Current element");
-
-/// Sentinel spannable used to mark that there might be no location for the
-/// diagnostic. Use this only when it is not an error not to have a current
-/// element.
-const Spannable NO_LOCATION_SPANNABLE =
-    const _SpannableSentinel("No location");
-
-class SpannableAssertionFailure {
-  final Spannable node;
-  final String message;
-  SpannableAssertionFailure(this.node, this.message);
-
-  String toString() => 'Assertion failure'
-                       '${message != null ? ': $message' : ''}';
-}
+part of dart2js.helpers;
 
 /**
  * Helper method for printing stack traces for debugging.
@@ -73,11 +27,17 @@ void trace(String message, [bool condition(String stackTrace)]) {
   }
 }
 
-/**
- * File name prefix used to shorten the file name in stack traces printed by
- * [trace].
- */
-String stackTraceFilePrefix = null;
+void traceAndReport(Compiler compiler, Spannable node,
+                    String message, [bool condition(String stackTrace)]) {
+
+  trace(message, (String stackTrace) {
+    bool result = condition != null ? condition(stackTrace) : true;
+    if (result) {
+      reportHere(compiler, node, message);
+    }
+    return result;
+  });
+}
 
 /// Helper class for the processing of stack traces in [prettifyStackTrace].
 class _StackTraceLine {
@@ -225,84 +185,3 @@ String pad(String text, int intendedLength,
   }
   return sb.toString();
 }
-
-/// Writes the characters of [string] on [buffer].  The characters

[karlklose, 2014/03/25 14:22:18]

This was unused?

[Johnni Winther, 2014/03/26 07:35:05]

No. Git/svn saw this file as a copy of util.dart from which these have been
removed. They are still in util.dart.

-/// are escaped as suitable for JavaScript and JSON.  [buffer] is
-/// anything which supports [:write:] and [:writeCharCode:], for example,
-/// [StringBuffer].  Note that JS supports \xnn and \unnnn whereas JSON only
-/// supports the \unnnn notation.  Therefore we use the \unnnn notation.
-void writeJsonEscapedCharsOn(String string, buffer) {
-  void addCodeUnitEscaped(var buffer, int code) {
-    assert(code < 0x10000);
-    buffer.write(r'\u');
-    if (code < 0x1000) {
-      buffer.write('0');
-      if (code < 0x100) {
-        buffer.write('0');
-        if (code < 0x10) {
-          buffer.write('0');
-        }
-      }
-    }
-    buffer.write(code.toRadixString(16));
-  }
-
-  void writeEscapedOn(String string, var buffer) {
-    for (int i = 0; i < string.length; i++) {
-      int code = string.codeUnitAt(i);
-      if (code == $DQ) {
-        buffer.write(r'\"');
-      } else if (code == $TAB) {
-        buffer.write(r'\t');
-      } else if (code == $LF) {
-        buffer.write(r'\n');
-      } else if (code == $CR) {
-        buffer.write(r'\r');
-      } else if (code == $DEL) {
-        addCodeUnitEscaped(buffer, $DEL);
-      } else if (code == $LS) {
-        // This Unicode line terminator and $PS are invalid in JS string
-        // literals.
-        addCodeUnitEscaped(buffer, $LS);  // 0x2028.
-      } else if (code == $PS) {
-        addCodeUnitEscaped(buffer, $PS);  // 0x2029.
-      } else if (code == $BACKSLASH) {
-        buffer.write(r'\\');
-      } else {
-        if (code < 0x20) {
-          addCodeUnitEscaped(buffer, code);
-          // We emit DEL (ASCII 0x7f) as an escape because it would be confusing
-          // to have it unescaped in a string literal.  We also escape
-          // everything above 0x7f because that means we don't have to worry
-          // about whether the web server serves it up as Latin1 or UTF-8.
-        } else if (code < 0x7f) {
-          buffer.writeCharCode(code);
-        } else {
-          // This will output surrogate pairs in the form \udxxx\udyyy, rather
-          // than the more logical \u{zzzzzz}.  This should work in JavaScript
-          // (especially old UCS-2 based implementations) and is the only
-          // format that is allowed in JSON.
-          addCodeUnitEscaped(buffer, code);
-        }
-      }
-    }
-  }
-
-  for (int i = 0; i < string.length; i++) {
-    int code = string.codeUnitAt(i);
-    if (code < 0x20 || code == $DEL || code == $DQ || code == $LS ||
-        code == $PS || code == $BACKSLASH || code >= 0x80) {
-      writeEscapedOn(string, buffer);
-      return;
-    }
-  }
-  buffer.write(string);
-}
-
-int computeHashCode(part1, [part2, part3, part4, part5]) {
-  return (part1.hashCode
-          ^ part2.hashCode
-          ^ part3.hashCode
-          ^ part4.hashCode
-          ^ part5.hashCode) & 0x3fffffff;
-}