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

Tuple support removed from the JS back-end

Browse Source 
#KT-2358 In progress
This commit is contained in:
Andrey Breslav
2012-09-18 20:51:12 +04:00
parent b8ef69e044
commit 49933b8087
3 changed files with 0 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java
-11
View File
@@ -353,17 +353,6 @@ public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
return TryTranslator.translate(expression, context);
}
@Override
@NotNull
public JsNode visitTupleExpression(@NotNull JetTupleExpression expression,
@NotNull TranslationContext context) {
JsArrayLiteral result = new JsArrayLiteral();
for (JetExpression entry : expression.getEntries()) {
result.getExpressions().add(translateAsExpression(entry, context));
}
return result;
}
@Override
@NotNull
public JsNode visitThrowExpression(@NotNull JetThrowExpression expression,
js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/FunctionIntrinsics.java
-1
View File
@@ -45,7 +45,6 @@ public final class FunctionIntrinsics {
private void registerFactories() {
register(PrimitiveUnaryOperationFIF.INSTANCE);
register(PrimitiveBinaryOperationFIF.INSTANCE);
register(TupleGetterFIF.INSTANCE);
register(StringOperationFIF.INSTANCE);
register(ArrayFIF.INSTANCE);
register(TopLevelFIF.INSTANCE);
js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/TupleGetterFIF.java
-85
View File
@@ -1,85 +0,0 @@
/*
* Copyright 2010-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.k2js.translate.intrinsic.functions.factories;
import com.google.common.base.Predicate;
import com.google.common.collect.Lists;
import com.google.dart.compiler.backend.js.ast.JsArrayAccess;
import com.google.dart.compiler.backend.js.ast.JsExpression;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
import org.jetbrains.jet.lang.types.lang.JetStandardClasses;
import org.jetbrains.k2js.translate.context.TranslationContext;
import org.jetbrains.k2js.translate.intrinsic.functions.basic.FunctionIntrinsic;
import org.jetbrains.k2js.translate.intrinsic.functions.patterns.NamePredicate;
import org.jetbrains.k2js.translate.intrinsic.functions.patterns.PatternBuilder;
import java.util.List;
/**
* @author Pavel Talanov
*/
public enum TupleGetterFIF implements FunctionIntrinsicFactory {
INSTANCE;
@NotNull
private static final NamePredicate TUPLES;
static {
List<String> tupleNames = Lists.newArrayList();
for (int tupleSize = 0; tupleSize <= JetStandardClasses.MAX_TUPLE_ORDER; ++tupleSize) {
tupleNames.add("Tuple" + tupleSize);
}
TUPLES = new NamePredicate(tupleNames);
}
@NotNull
private static final NamePredicate TUPLE_UNDERSCORE_ACCESSORS;
static {
List<String> accessorNames = Lists.newArrayList();
for (int tupleSize = 0; tupleSize <= JetStandardClasses.MAX_TUPLE_ORDER; ++tupleSize) {
accessorNames.add("<get-_" + (tupleSize + 1) + ">");
}
TUPLE_UNDERSCORE_ACCESSORS = new NamePredicate(accessorNames);
}
@NotNull
@Override
public Predicate<FunctionDescriptor> getPredicate() {
return PatternBuilder.pattern(TUPLES, TUPLE_UNDERSCORE_ACCESSORS);
}
@NotNull
@Override
public FunctionIntrinsic getIntrinsic(@NotNull FunctionDescriptor descriptor) {
String nameString = descriptor.getName().getName();
String elementIndexSubString = nameString.substring(6, nameString.length() - 1);
final int elementIndex = Integer.parseInt(elementIndexSubString) - 1;
return new FunctionIntrinsic() {
@NotNull
@Override
public JsExpression apply(@Nullable JsExpression receiver,
@NotNull List<JsExpression> arguments,
@NotNull TranslationContext context) {
assert arguments.isEmpty() : "Tuple access expression should not have any arguments.";
return new JsArrayAccess(receiver, context.program().getNumberLiteral(elementIndex));
}
};
}
}