Chromium Code Reviews| Index: pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart |
| diff --git a/pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart b/pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart |
| index 1ad8c6382e785678ae8fd44d0fc99e78a38d705e..6fd5bfdd0df26e4ba1e74d2bb57e4fa30c0e1920 100644 |
| --- a/pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart |
| +++ b/pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart |
| @@ -157,6 +157,8 @@ class OldEmitter implements Emitter { |
| String get lazyInitializerName |
| => '${namer.isolateName}.${lazyInitializerProperty}'; |
| String get initName => 'init'; |
| + // TODO(zarah): Rename this when renaming reflection_data_parser.dart. |
| + String get parseReflectionDataName => 'parseReflectionData'; |
| String get makeConstListProperty |
| => namer.getMappedInstanceName('makeConstantList'); |
| @@ -1500,7 +1502,9 @@ class OldEmitter implements Emitter { |
| mainBuffer |
| .write('${globalsHolder}.${namer.isolateName}$_=$_' |
| '${namer.isolateName}$N' |
| - '${globalsHolder}.$initName$_=${_}$initName$N'); |
| + '${globalsHolder}.$initName$_=${_}$initName$N' |
| + '${globalsHolder}.$parseReflectionDataName$_=$_' |
| + '$parseReflectionDataName$N'); |
|
floitsch
2015/01/05 13:46:19
indent that line.
zarah
2015/01/05 14:00:26
OK, then I'm also indenting the one two lines abov
floitsch
2015/01/05 14:41:07
or even better:
mainBuffer.write(
'${globalsH
zarah
2015/01/06 11:45:07
Done.
|
| } |
| mainBuffer.write('init()$N$n'); |
| mainBuffer.write('$isolateProperties$_=$_$isolatePropertiesName$N'); |
| @@ -1535,15 +1539,15 @@ class OldEmitter implements Emitter { |
| } |
| mainBuffer |
| - ..write('(') |
| ..write( |
| jsAst.prettyPrint( |
| getReflectionDataParser(this, backend), |
| compiler)) |
| - ..write(')') |
| - ..write('([$n') |
| - ..write(libraryBuffer) |
| - ..write('])$N'); |
| + ..write(n); |
| + |
| + mainBuffer..write('$parseReflectionDataName([$n') |
| + ..write(libraryBuffer) |
| + ..write('])$N'); |
| } |
| interceptorEmitter.emitGetInterceptorMethods(mainBuffer); |
| @@ -1975,6 +1979,8 @@ function(originalDescriptor, name, holder, isStatic, globalFunctionsAccess) { |
| } |
| outputBuffer |
| ..write('var init$_=$_${globalsHolder}.init$N') |
| + ..write('var $parseReflectionDataName$_=$_' |
| + '$globalsHolder.$parseReflectionDataName$N') |
| ..write('var ${namer.isolateName}$_=$_' |
| '${globalsHolder}.${namer.isolateName}$N'); |
| if (libraryDescriptorBuffer != null) { |
| @@ -1983,14 +1989,8 @@ function(originalDescriptor, name, holder, isStatic, globalFunctionsAccess) { |
| // slow object in V8, so instead we should do something similar |
| // to Isolate.$finishIsolateConstructor. |
| outputBuffer |
| - ..write('var ${namer.currentIsolate}$_=$_$isolatePropertiesName;$n') |
| - ..write('(') |
| - ..write( |
| - jsAst.prettyPrint( |
| - getReflectionDataParser(this, backend), |
| - compiler, monitor: compiler.dumpInfoTask)) |
| - ..write(')') |
| - ..write('([$n') |
| + ..write('var ${namer.currentIsolate}$_=$_$isolatePropertiesName$N') |
| + ..write('$parseReflectionDataName([$n') |
| ..addBuffer(libraryDescriptorBuffer) |
| ..write('])$N'); |