Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Side by Side Diff: pkg/dart2js_incremental/lib/library_updater.dart

Issue 875803003: Fix wrong type annotation in incremental compiler. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 library dart2js_incremental.library_updater; 5 library dart2js_incremental.library_updater;
6 6
7 import 'dart:async' show 7 import 'dart:async' show
8 Future; 8 Future;
9 9
10 import 'dart:convert' show 10 import 'dart:convert' show
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 import 'package:compiler/src/js_emitter/js_emitter.dart' show 61 import 'package:compiler/src/js_emitter/js_emitter.dart' show
62 ClassBuilder, 62 ClassBuilder,
63 ClassEmitter, 63 ClassEmitter,
64 CodeEmitterTask, 64 CodeEmitterTask,
65 ContainerBuilder, 65 ContainerBuilder,
66 MemberInfo, 66 MemberInfo,
67 computeMixinClass; 67 computeMixinClass;
68 68
69 import 'package:compiler/src/js_emitter/model.dart' show 69 import 'package:compiler/src/js_emitter/model.dart' show
70 Class, 70 Class,
71 Member; 71 Method;
72 72
73 import 'package:compiler/src/js_emitter/program_builder.dart' show 73 import 'package:compiler/src/js_emitter/program_builder.dart' show
74 ProgramBuilder; 74 ProgramBuilder;
75 75
76 import 'package:_internal/compiler/js_lib/shared/embedded_names.dart' 76 import 'package:_internal/compiler/js_lib/shared/embedded_names.dart'
77 as embeddedNames; 77 as embeddedNames;
78 78
79 import 'package:compiler/src/js_backend/js_backend.dart' show 79 import 'package:compiler/src/js_backend/js_backend.dart' show
80 JavaScriptBackend, 80 JavaScriptBackend,
81 Namer; 81 Namer;
(...skipping 844 matching lines...) Expand 10 before | Expand all | Expand 10 after
926 (new Function( 926 (new Function(
927 "$collectedClasses", "$desc", 927 "$collectedClasses", "$desc",
928 this.defineClass(#name, #computeFields) +"\n;return " + #name))( 928 this.defineClass(#name, #computeFields) +"\n;return " + #name))(
929 {#name: #descriptor})''', 929 {#name: #descriptor})''',
930 {'name': js.string(name), 930 {'name': js.string(name),
931 'computeFields': js.stringArray(computeFields(cls)), 931 'computeFields': js.stringArray(computeFields(cls)),
932 'descriptor': descriptor}); 932 'descriptor': descriptor});
933 } 933 }
934 934
935 jsAst.Node computeMethodUpdateJs(Element element) { 935 jsAst.Node computeMethodUpdateJs(Element element) {
936 Member member = new ProgramBuilder(compiler, namer, emitter) 936 Method member = new ProgramBuilder(compiler, namer, emitter)
937 .buildMethodHackForIncrementalCompilation(element); 937 .buildMethodHackForIncrementalCompilation(element);
938 if (member == null) { 938 if (member == null) {
939 compiler.internalError(element, '${element.runtimeType}'); 939 compiler.internalError(element, '${element.runtimeType}');
940 } 940 }
941 ClassBuilder builder = new ClassBuilder(element, namer); 941 ClassBuilder builder = new ClassBuilder(element, namer);
942 containerBuilder.addMemberMethod(member, builder); 942 containerBuilder.addMemberMethod(member, builder);
943 jsAst.Node partialDescriptor = 943 jsAst.Node partialDescriptor =
944 builder.toObjectInitializer(emitClassDescriptor: false); 944 builder.toObjectInitializer(emitClassDescriptor: false);
945 945
946 String name = member.name; 946 String name = member.name;
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
1481 .buildClassWithFieldsForIncrementalCompilation(classElement); 1481 .buildClassWithFieldsForIncrementalCompilation(classElement);
1482 // TODO(ahe): Rewrite for new emitter. 1482 // TODO(ahe): Rewrite for new emitter.
1483 ClassBuilder builder = new ClassBuilder(classElement, namer); 1483 ClassBuilder builder = new ClassBuilder(classElement, namer);
1484 classEmitter.emitFields(cls, builder); 1484 classEmitter.emitFields(cls, builder);
1485 return builder.fields; 1485 return builder.fields;
1486 } 1486 }
1487 } 1487 }
1488 1488
1489 // TODO(ahe): Remove this method. 1489 // TODO(ahe): Remove this method.
1490 NO_WARN(x) => x; 1490 NO_WARN(x) => x;
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698