languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-20 05:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename $dart_unsafe_eval to $dart_unsafe_incremental_support.

Browse source 
R=kasperl@google.com

Review URL: https://codereview.chromium.org//856333003

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@43061 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
ahe@google.com 2015-01-22 09:50:07 +00:00
parent 67badc8d74
commit 34512168d9
5 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/compiler/lib/src/js_backend/namer.dart
View file

@ -993,7 +993,7 @@ class Namer implements ClosureNamer {
}
}
String get incrementalHelperName => r'$dart_unsafe_eval';
String get incrementalHelperName => r'$dart_unsafe_incremental_support';
jsAst.Expression get accessIncrementalHelper {
assert(compiler.hasIncrementalSupport);

2
pkg/compiler/lib/src/js_emitter/old_emitter/reflection_data_parser.dart
View file

@ -423,7 +423,7 @@ jsAst.Expression getReflectionDataParser(OldEmitter oldEmitter,
if (compiler.hasIncrementalSupport) {
incrementalSupport.add(
js.statement(
r'self.$dart_unsafe_eval.addStubs = addStubs;'));
'#.addStubs = addStubs;', [namer.accessIncrementalHelper]));
}
return js('''

7
pkg/dart2js_incremental/lib/dart2js_incremental.dart
View file

@ -146,12 +146,13 @@ class IncrementalCompiler {
String allUpdates() {
jsAst.Node updates = jsAst.js.escapedString(_updates.join(""));
JavaScriptBackend backend = _compiler.backend;
jsAst.FunctionDeclaration mainRunner = jsAst.js.statement(r"""
function dartMainRunner(main, args) {
$dart_unsafe_eval.patch(#);
#helper.patch(#updates);
return main(args);
}""", updates);
}""", {'updates': updates, 'helper': backend.namer.accessIncrementalHelper});
jsAst.Printer printer = new jsAst.Printer(_compiler, null);
printer.blockOutWithoutBraces(mainRunner);

26
pkg/dart2js_incremental/lib/library_updater.dart
View file

@ -845,7 +845,7 @@ class LibraryUpdater extends JsFeatures {
jsAst.Node superAccess = emitter.constructorAccess(superclass);
inherits.add(
js.statement(
r'#.inheritFrom(#, #)', [helper, classAccess, superAccess]));
r'this.inheritFrom(#, #)', [classAccess, superAccess]));
}
}
@ -862,9 +862,8 @@ class LibraryUpdater extends JsFeatures {
jsAst.Node classAccess = emitter.constructorAccess(cls);
updates.add(
js.statement(
r'# = #.schemaChange(#, #, #)',
[classAccess, helper,
invokeDefineClass(cls), classAccess, superAccess]));
r'# = this.schemaChange(#, #, #)',
[classAccess, invokeDefineClass(cls), classAccess, superAccess]));
}
for (RemovalUpdate update in removals) {
@ -899,11 +898,11 @@ class LibraryUpdater extends JsFeatures {
}
updates.add(js.statement(r'''
if (#helper.pendingStubs) {
#helper.pendingStubs.map(function(e) { return e(); });
#helper.pendingStubs = void 0;
if (this.pendingStubs) {
this.pendingStubs.map(function(e) { return e(); });
this.pendingStubs = void 0;
}
''', {'helper': helper}));
'''));
if (updates.length == 1) {
return prettyPrintJs(updates.single);
@ -919,10 +918,9 @@ if (#helper.pendingStubs) {
r'''
(new Function(
"$collectedClasses", "$desc",
#helper.defineClass(#name, #computeFields) +"\n;return " + #name))(
this.defineClass(#name, #computeFields) +"\n;return " + #name))(
{#name: #descriptor})''',
{'helper': helper,
'name': js.string(name),
{'name': js.string(name),
'computeFields': js.stringArray(computeFields(cls)),
'descriptor': descriptor});
}
@ -955,8 +953,8 @@ if (#helper.pendingStubs) {
emitter.generateEmbeddedGlobalAccess(embeddedNames.GLOBAL_FUNCTIONS);
return js.statement(
r'#.addMethod(#, #, #, #, #)',
[helper, partialDescriptor, js.string(name), holder,
r'this.addMethod(#, #, #, #, #)',
[partialDescriptor, js.string(name), holder,
new jsAst.LiteralBool(isStatic), globalFunctionsAccess]);
}
@ -1461,8 +1459,6 @@ abstract class JsFeatures {
ContainerBuilder get containerBuilder => emitter.oldEmitter.containerBuilder;
EnqueueTask get enqueuer => compiler.enqueuer;
jsAst.Expression get helper => namer.accessIncrementalHelper;
}
class EmitterHelper extends JsFeatures {

2
tests/try/web/incremental_compilation_update.html
View file

@ -40,7 +40,7 @@
script.type = 'application/javascript';
document.body.appendChild(script);
} else if (e.data[0] === 'apply-update') {
self.$dart_unsafe_eval.patch(e.data[1]);
self.$dart_unsafe_incremental_support.patch(e.data[1]);
dartMainClosure();