Index: sdk/lib/_internal/compiler/implementation/js_backend/native_emitter.dart |
diff --git a/sdk/lib/_internal/compiler/implementation/js_backend/native_emitter.dart b/sdk/lib/_internal/compiler/implementation/js_backend/native_emitter.dart |
index 2c4a38f6da642f831fc2edcb8499fdef983edf3e..124d69adbe50caf37a3ac0d441ad30fca273af10 100644 |
--- a/sdk/lib/_internal/compiler/implementation/js_backend/native_emitter.dart |
+++ b/sdk/lib/_internal/compiler/implementation/js_backend/native_emitter.dart |
@@ -157,7 +157,7 @@ class NativeEmitter { |
// Define interceptor class for [classElement]. |
String className = backend.namer.getName(classElement); |
jsAst.Expression init = |
- js[emitter.classesCollector][className].assign( |
+ js(emitter.classesCollector)[className].assign( |
builder.toObjectInitializer()); |
mainBuffer.write(jsAst.prettyPrint(init, compiler)); |
mainBuffer.write('$N$n'); |
@@ -175,9 +175,9 @@ class NativeEmitter { |
if (nativeTag == 'HTMLElement') definer = defineNativeMethodsNonleafName; |
jsAst.Expression definition = |
- js[definer]( |
- [js.string(nativeTag), |
- js[backend.namer.isolateAccess(classElement)]]); |
+ js(definer)( |
+ [jsBuilder.string(nativeTag), |
+ js(backend.namer.isolateAccess(classElement))]); |
nativeBuffer.add(jsAst.prettyPrint(definition, compiler)); |
nativeBuffer.add('$N$n'); |
@@ -190,7 +190,7 @@ class NativeEmitter { |
// `Object.prototype` to avoid checking in `getInterceptor` and |
// specializations. |
- // jsAst.Expression call = js[defineNativeMethodsFinishName]([]); |
+ // jsAst.Expression call = js(defineNativeMethodsFinishName)([]); |
// nativeBuffer.add(jsAst.prettyPrint(call, compiler)); |
// nativeBuffer.add('$N$n'); |
} |
@@ -224,10 +224,10 @@ class NativeEmitter { |
statements.add( |
new jsAst.ExpressionStatement( |
- js.assign( |
- js[name], |
- js[closureConverter]( |
- [js[name], |
+ jsBuilder.assign( |
+ js(name), |
+ js(closureConverter)( |
+ [js(name), |
new jsAst.LiteralNumber('$arity')])))); |
break; |
} |
@@ -379,14 +379,14 @@ class NativeEmitter { |
if (!subtags.isEmpty) { |
subtags.sort(); |
- expressions.add(js.string(subtags.join('|'))); |
+ expressions.add(jsBuilder.string(subtags.join('|'))); |
} |
jsAst.Expression expression; |
if (expressions.length == 1) { |
expression = expressions[0]; |
} else { |
jsAst.Expression array = new jsAst.ArrayInitializer.from(expressions); |
- expression = array['join']([js.string('|')]); |
+ expression = array['join']([jsBuilder.string('|')]); |
} |
return expression; |
} |
@@ -421,7 +421,7 @@ class NativeEmitter { |
new jsAst.ArrayInitializer.from( |
preorderDispatchClasses.map((cls) => |
new jsAst.ArrayInitializer.from([ |
- js.string(toNativeTag(cls)), |
+ jsBuilder.string(toNativeTag(cls)), |
tagDefns[cls]]))); |
// $.dynamicSetMetadata(table); |
@@ -472,7 +472,7 @@ class NativeEmitter { |
List<jsAst.Property> objectProperties = <jsAst.Property>[]; |
void addProperty(String name, jsAst.Expression value) { |
- objectProperties.add(new jsAst.Property(js.string(name), value)); |
+ objectProperties.add(new jsAst.Property(jsBuilder.string(name), value)); |
} |
// Because of native classes, we have to generate some is checks |
@@ -488,10 +488,10 @@ class NativeEmitter { |
// Add function for the is-test. |
String name = backend.namer.operatorIs(element); |
addProperty(name, |
- js.fun([], js.return_(js['false']))); |
+ jsBuilder.fun([], jsBuilder.return_(js('false')))); |
// Add a function for the (trivial) substitution. |
addProperty(backend.namer.substitutionName(element), |
- js.fun([], js.return_(js['null']))); |
+ jsBuilder.fun([], jsBuilder.return_(js('null')))); |
} |
} |
emitIsChecks(); |
@@ -499,7 +499,7 @@ class NativeEmitter { |
jsAst.Expression makeCallOnThis(String functionName) { |
// Because we know the function is intercepted, we need an extra |
// parameter. |
- return js.fun(['_'], js.return_(js['$functionName(this)'])); |
+ return jsBuilder.fun(['_'], jsBuilder.return_(js('$functionName(this)'))); |
} |
if (!nativeClasses.isEmpty) { |
@@ -521,8 +521,8 @@ class NativeEmitter { |
const SourceString('=='), 1); |
// Because we know the function is intercepted, we need an extra |
// parameter. |
- addProperty(equalsName, js.fun(['_', 'a'], |
- js.return_(js['this === a']))); |
+ addProperty(equalsName, jsBuilder.fun(['_', 'a'], |
+ jsBuilder.return_(js('this === a')))); |
// If the native emitter has been asked to take care of the |
// noSuchMethod handlers, we do that now. |
@@ -535,15 +535,15 @@ class NativeEmitter { |
// through them and add them using defineProperty. |
if (!objectProperties.isEmpty) { |
jsAst.Expression init = |
- js.fun(['table'], |
+ jsBuilder.fun(['table'], |
new jsAst.ForIn( |
new jsAst.VariableDeclarationList( |
[new jsAst.VariableInitialization( |
new jsAst.VariableDeclaration('key'), |
null)]), |
- js['table'], |
+ js('table'), |
new jsAst.ExpressionStatement( |
- js['$defPropName(Object.prototype, key, table[key])'])))( |
+ js('$defPropName(Object.prototype, key, table[key])'))))( |
new jsAst.ObjectInitializer(objectProperties)); |
if (emitter.compiler.enableMinification) targetBuffer.add(';'); |