Skip to content

Commit

Permalink
fix regression after last commit
Browse files Browse the repository at this point in the history
(cherry-picked from 78b73c4)
  • Loading branch information
developwebsite authored and Pavel V. Talanov committed Dec 18, 2012
1 parent 45ed4b2 commit 8862659
Showing 1 changed file with 6 additions and 5 deletions.
Expand Up @@ -98,8 +98,8 @@ public JsExpression translateFunction(@NotNull JetDeclarationWithBody declaratio
TranslationContext funContext = outerContext.newFunctionBody(fun, aliasingContext,
new UsageTracker(descriptor, outerContext.usageTracker(), outerClass));
FunctionTranslator.translateBodyAndAdd(fun, descriptor, declaration, funContext);
JsExpression result;
if (asInner) {
addRegularParameters(descriptor, fun.getParameters(), funContext, receiverName);
if (outerClass != null) {
UsageTracker usageTracker = funContext.usageTracker();
assert usageTracker != null;
Expand All @@ -110,13 +110,14 @@ public JsExpression translateFunction(@NotNull JetDeclarationWithBody declaratio
fun.setName(null);
}
}
result = fun;

return fun;
}
else {
result = new InnerFunctionTranslator(descriptor, funContext, fun).translate(createReference(fun), outerContext);
JsExpression result = new InnerFunctionTranslator(descriptor, funContext, fun).translate(createReference(fun), outerContext);
addRegularParameters(descriptor, fun.getParameters(), funContext, receiverName);
return result;
}
addRegularParameters(descriptor, fun.getParameters(), funContext, receiverName);
return result;
}

private JsNameRef createReference(JsFunction fun) {
Expand Down

0 comments on commit 8862659

Please sign in to comment.