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

Adapt JS translator to able work with deprecated 'mod' operator

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2016-12-07 13:31:08 +03:00
parent bc4a492f4d
commit d8330c3f14
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/PrimitiveBinaryOperationFIF.java
+8 -5
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2015 JetBrains s.r.o. * Copyright 2010-2016 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -90,7 +90,7 @@ public enum PrimitiveBinaryOperationFIF implements FunctionIntrinsicFactory {
}; };
@NotNull @NotNull
private static final NamePredicate BINARY_OPERATIONS = new NamePredicate(OperatorConventions.BINARY_OPERATION_NAMES.values()); private static final NamePredicate BINARY_OPERATIONS = new NamePredicate(OperatorNameConventions.BINARY_OPERATION_NAMES);
private static final DescriptorPredicate PRIMITIVE_NUMBERS_BINARY_OPERATIONS = private static final DescriptorPredicate PRIMITIVE_NUMBERS_BINARY_OPERATIONS =
pattern(NamePredicate.PRIMITIVE_NUMBERS_MAPPED_TO_PRIMITIVE_JS, BINARY_OPERATIONS); pattern(NamePredicate.PRIMITIVE_NUMBERS_MAPPED_TO_PRIMITIVE_JS, BINARY_OPERATIONS);
@@ -166,12 +166,15 @@ public enum PrimitiveBinaryOperationFIF implements FunctionIntrinsicFactory {
@NotNull @NotNull
private static JsBinaryOperator getOperator(@NotNull FunctionDescriptor descriptor) { private static JsBinaryOperator getOperator(@NotNull FunctionDescriptor descriptor) {
KtToken token = OperatorConventions.BINARY_OPERATION_NAMES.inverse().get(descriptor.getName()); // Temporary hack to get '%' for deprecated 'mod' operator
Name descriptorName = descriptor.getName().equals(OperatorNameConventions.MOD) ? OperatorNameConventions.REM : descriptor.getName();
KtToken token = OperatorConventions.BINARY_OPERATION_NAMES.inverse().get(descriptorName);
if (token == null) { if (token == null) {
token = OperatorConventions.BOOLEAN_OPERATIONS.inverse().get(descriptor.getName()); token = OperatorConventions.BOOLEAN_OPERATIONS.inverse().get(descriptorName);
} }
if (token == null) { if (token == null) {
assert descriptor.getName().asString().equals("xor"); assert descriptorName.asString().equals("xor");
return JsBinaryOperator.BIT_XOR; return JsBinaryOperator.BIT_XOR;
} }
return OperatorTable.getBinaryOperator(token); return OperatorTable.getBinaryOperator(token);