| Index: frog/leg/emitter.dart
|
| diff --git a/frog/leg/emitter.dart b/frog/leg/emitter.dart
|
| index e2ff510ff61feb5689089ac64c6b7fd74d7ed5ae..9e1fb6001e3330a75a4364d241344ffedb7e5f07 100644
|
| --- a/frog/leg/emitter.dart
|
| +++ b/frog/leg/emitter.dart
|
| @@ -71,7 +71,7 @@ function(child, parent) {
|
| assert(selector.namedArgumentCount == 0);
|
| return;
|
| }
|
| - CompileTimeConstantHandler constants = compiler.compileTimeConstantHandler;
|
| + ConstantHandler handler = compiler.constantHandler;
|
| List<SourceString> names = selector.getOrderedNamedArguments();
|
|
|
| String invocationName =
|
| @@ -133,7 +133,7 @@ function(child, parent) {
|
| argumentsBuffer[count] = jsName;
|
| parametersBuffer[selector.positionalArgumentCount + index] = jsName;
|
| } else {
|
| - Constant value = constants.initialVariableValues[element];
|
| + Constant value = handler.initialVariableValues[element];
|
| if (value == null) {
|
| argumentsBuffer[count] = '(void 0)';
|
| } else {
|
| @@ -141,7 +141,7 @@ function(child, parent) {
|
| // JS function.
|
| indexOfLastOptionalArgumentInParameters = count;
|
| argumentsBuffer[count] =
|
| - constants.writeJsCode(new StringBuffer(), value).toString();
|
| + handler.writeJsCode(new StringBuffer(), value).toString();
|
| }
|
| }
|
| }
|
| @@ -473,7 +473,7 @@ function(child, parent) {
|
| // this.staticNonFinal = Isolate.prototype.someVal;
|
| // ...
|
| // }
|
| - CompileTimeConstantHandler handler = compiler.compileTimeConstantHandler;
|
| + ConstantHandler handler = compiler.constantHandler;
|
| List<VariableElement> staticNonFinalFields =
|
| handler.getStaticNonFinalFieldsForEmission();
|
| if (!staticNonFinalFields.isEmpty()) buffer.add('\n');
|
| @@ -487,7 +487,7 @@ function(child, parent) {
|
| }
|
|
|
| void emitCompileTimeConstants(StringBuffer buffer) {
|
| - CompileTimeConstantHandler handler = compiler.compileTimeConstantHandler;
|
| + ConstantHandler handler = compiler.constantHandler;
|
| List<Constant> constants = handler.getConstantsForEmission();
|
| String prototype = "${namer.ISOLATE}.prototype";
|
| emitMakeConstantList(prototype, buffer);
|
| @@ -510,13 +510,13 @@ function(child, parent) {
|
| }
|
|
|
| void emitStaticFinalFieldInitializations(StringBuffer buffer) {
|
| - CompileTimeConstantHandler constants = compiler.compileTimeConstantHandler;
|
| + ConstantHandler handler = compiler.constantHandler;
|
| List<VariableElement> staticFinalFields =
|
| - constants.getStaticFinalFieldsForEmission();
|
| + handler.getStaticFinalFieldsForEmission();
|
| for (VariableElement element in staticFinalFields) {
|
| buffer.add('${namer.isolatePropertyAccess(element)} = ');
|
| compiler.withCurrentElement(element, () {
|
| - constants.writeJsCodeForVariable(buffer, element);
|
| + handler.writeJsCodeForVariable(buffer, element);
|
| });
|
| buffer.add(';\n');
|
| }
|
|
|