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

Unified Diff: sdk/lib/_internal/compiler/implementation/js_emitter/code_emitter_task.dart

Issue 614993002: Rename Constant to ConstantValue and ConstExp to ConstantExpression. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Updated cf. comments. Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: sdk/lib/_internal/compiler/implementation/js_emitter/code_emitter_task.dart
diff --git a/sdk/lib/_internal/compiler/implementation/js_emitter/code_emitter_task.dart b/sdk/lib/_internal/compiler/implementation/js_emitter/code_emitter_task.dart
index 42950af4dd0121efe9f83445f38f20acfab8f12a..a3eba9d4070a728aa0cbd8d710c22910c818a7a8 100644
--- a/sdk/lib/_internal/compiler/implementation/js_emitter/code_emitter_task.dart
+++ b/sdk/lib/_internal/compiler/implementation/js_emitter/code_emitter_task.dart
@@ -23,8 +23,8 @@ class CodeEmitterTask extends CompilerTask {
final Set<ClassElement> neededClasses = new Set<ClassElement>();
final Map<OutputUnit, List<ClassElement>> outputClassLists =
new Map<OutputUnit, List<ClassElement>>();
- final Map<OutputUnit, List<Constant>> outputConstantLists =
- new Map<OutputUnit, List<Constant>>();
+ final Map<OutputUnit, List<ConstantValue>> outputConstantLists =
+ new Map<OutputUnit, List<ConstantValue>>();
final List<ClassElement> nativeClasses = <ClassElement>[];
/// Records if a type variable is read dynamically for type tests.
@@ -56,17 +56,17 @@ class CodeEmitterTask extends CompilerTask {
return emitter.generateEmbeddedGlobalAccess(global);
}
- jsAst.Expression constantReference(Constant value) {
+ jsAst.Expression constantReference(ConstantValue value) {
return emitter.constantReference(value);
}
Set<ClassElement> interceptorsReferencedFromConstants() {
Set<ClassElement> classes = new Set<ClassElement>();
JavaScriptConstantCompiler handler = backend.constants;
- List<Constant> constants = handler.getConstantsForEmission();
- for (Constant constant in constants) {
- if (constant is InterceptorConstant) {
- InterceptorConstant interceptorConstant = constant;
+ List<ConstantValue> constants = handler.getConstantsForEmission();
+ for (ConstantValue constant in constants) {
+ if (constant is InterceptorConstantValue) {
+ InterceptorConstantValue interceptorConstant = constant;
classes.add(interceptorConstant.dispatchedType.element);
}
}
@@ -121,9 +121,9 @@ class CodeEmitterTask extends CompilerTask {
*/
void computeNeededConstants() {
JavaScriptConstantCompiler handler = backend.constants;
- List<Constant> constants = handler.getConstantsForEmission(
+ List<ConstantValue> constants = handler.getConstantsForEmission(
compiler.hasIncrementalSupport ? null : emitter.compareConstants);
- for (Constant constant in constants) {
+ for (ConstantValue constant in constants) {
if (emitter.isConstantInlinedOrAlreadyEmitted(constant)) continue;
OutputUnit constantUnit =
compiler.deferredLoadTask.outputUnitForConstant(constant);
@@ -133,7 +133,7 @@ class CodeEmitterTask extends CompilerTask {
// TODO(sigurdm): We should track those constants.
constantUnit = compiler.deferredLoadTask.mainOutputUnit;
}
- outputConstantLists.putIfAbsent(constantUnit, () => new List<Constant>())
+ outputConstantLists.putIfAbsent(constantUnit, () => new List<ConstantValue>())
.add(constant);
}
}
@@ -276,10 +276,10 @@ abstract class Emitter {
void emitProgram();
jsAst.Expression generateEmbeddedGlobalAccess(String global);
- jsAst.Expression constantReference(Constant value);
+ jsAst.Expression constantReference(ConstantValue value);
- int compareConstants(Constant a, Constant b);
- bool isConstantInlinedOrAlreadyEmitted(Constant constant);
+ int compareConstants(ConstantValue a, ConstantValue b);
+ bool isConstantInlinedOrAlreadyEmitted(ConstantValue constant);
void invalidateCaches();
}

Powered by Google App Engine
This is Rietveld 408576698