azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing tests

Browse Source
This commit is contained in:
Pavel Talanov
2012-02-15 16:03:18 +04:00
parent 2002aa00a8
commit f86367dba7
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java
+1 -1
View File
@@ -120,7 +120,7 @@ public final class Intrinsics {
private void declareStringIntrinsics() { private void declareStringIntrinsics() {
PropertyDescriptor lengthProperty = PropertyDescriptor lengthProperty =
getPropertyByName(library.getString().getDefaultType().getMemberScope(), "length"); getPropertyByName(library.getCharSequence().getDefaultType().getMemberScope(), "length");
functionIntrinsics.put(lengthProperty.getGetter(), LengthIntrinsic.INSTANCE); functionIntrinsics.put(lengthProperty.getGetter(), LengthIntrinsic.INSTANCE);
FunctionDescriptor getFunction = FunctionDescriptor getFunction =
getFunctionByName(library.getCharSequence().getDefaultType().getMemberScope(), "get"); getFunctionByName(library.getCharSequence().getDefaultType().getMemberScope(), "get");
translator/src/org/jetbrains/k2js/translate/reference/CallExpressionTranslator.java
+1 -3
View File
@@ -14,7 +14,6 @@ import org.jetbrains.k2js.translate.general.Translation;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
import static org.jetbrains.k2js.translate.utils.BindingUtils.getDefaultArgument; import static org.jetbrains.k2js.translate.utils.BindingUtils.getDefaultArgument;
import static org.jetbrains.k2js.translate.utils.BindingUtils.getResolvedCallForCallExpression; import static org.jetbrains.k2js.translate.utils.BindingUtils.getResolvedCallForCallExpression;
@@ -67,9 +66,8 @@ public final class CallExpressionTranslator extends AbstractTranslator {
private List<JsExpression> translateArguments() { private List<JsExpression> translateArguments() {
List<JsExpression> result = new ArrayList<JsExpression>(); List<JsExpression> result = new ArrayList<JsExpression>();
ResolvedCall<?> resolvedCall = getResolvedCallForCallExpression(context().bindingContext(), expression); ResolvedCall<?> resolvedCall = getResolvedCallForCallExpression(context().bindingContext(), expression);
Map<ValueParameterDescriptor, ResolvedValueArgument> formalToActualArguments = resolvedCall.getValueArguments();
for (ValueParameterDescriptor parameterDescriptor : resolvedCall.getResultingDescriptor().getValueParameters()) { for (ValueParameterDescriptor parameterDescriptor : resolvedCall.getResultingDescriptor().getValueParameters()) {
ResolvedValueArgument actualArgument = formalToActualArguments.get(parameterDescriptor); ResolvedValueArgument actualArgument = resolvedCall.getValueArgumentsByIndex().get(parameterDescriptor.getIndex());
result.add(translateSingleArgument(actualArgument, parameterDescriptor)); result.add(translateSingleArgument(actualArgument, parameterDescriptor));
} }
return result; return result;