| Index: dart/frog/leg/resolver.dart
|
| diff --git a/dart/frog/leg/resolver.dart b/dart/frog/leg/resolver.dart
|
| index 2f564394d28a2b3aa8c0d88f868f494148560d7e..e10bc391cfc880ba6d98f11bd1f4d410de9484f6 100644
|
| --- a/dart/frog/leg/resolver.dart
|
| +++ b/dart/frog/leg/resolver.dart
|
| @@ -179,9 +179,9 @@ class ResolverTask extends CompilerTask {
|
| // If that fails, try looking up "MyClass.name".
|
| if (constructor.defaultImplementation === null) {
|
| SourceString name =
|
| - new SourceString(constructor.name.toString().replaceFirst(
|
| - intrface.name.toString(),
|
| - defaultClass.name.toString()));
|
| + new SourceString(constructor.name.slowToString().replaceFirst(
|
| + intrface.name.slowToString(),
|
| + defaultClass.name.slowToString()));
|
| constructor.defaultImplementation = defaultClass.lookupConstructor(name);
|
|
|
| if (constructor.defaultImplementation === null
|
| @@ -373,10 +373,10 @@ class InitializerResolver {
|
| result = resolver.lookupConstructor(lookupTarget, call);
|
| if (result === null) {
|
| SourceString constructorName = resolver.getConstructorName(call);
|
| - SourceString className = lookupTarget.name;
|
| + String className = lookupTarget.name.slowToString();
|
| String name = (constructorName === const SourceString(''))
|
| - ? className.stringValue
|
| - : "$className.$constructorName";
|
| + ? className
|
| + : "$className.${constructorName.slowToString()}";
|
| error(call, MessageKind.CANNOT_RESOLVE_CONSTRUCTOR, [name]);
|
| } else {
|
| final Compiler compiler = visitor.compiler;
|
| @@ -1023,7 +1023,7 @@ class ResolverVisitor extends CommonResolverVisitor<Element> {
|
| return;
|
| }
|
| } else {
|
| - String labelName = node.target.source.stringValue;
|
| + String labelName = node.target.source.slowToString();
|
| target = statementScope.lookupLabel(labelName);
|
| if (target === null) {
|
| error(node.target, MessageKind.UNBOUND_LABEL, [labelName]);
|
| @@ -1043,7 +1043,7 @@ class ResolverVisitor extends CommonResolverVisitor<Element> {
|
| return;
|
| }
|
| } else {
|
| - String labelName = node.target.source.stringValue;
|
| + String labelName = node.target.source.slowToString();
|
| target = statementScope.lookupLabel(labelName);
|
| if (target === null) {
|
| error(node.target, MessageKind.UNBOUND_LABEL, [labelName]);
|
| @@ -1076,7 +1076,7 @@ class ResolverVisitor extends CommonResolverVisitor<Element> {
|
| }
|
|
|
| visitLabelledStatement(LabelledStatement node) {
|
| - String labelName = node.label.source.stringValue;
|
| + String labelName = node.label.source.slowToString();
|
| StatementElement existingElement = statementScope.lookupLabel(labelName);
|
| if (existingElement !== null) {
|
| LabelledStatement declaration = existingElement.origin;
|
|
|