diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ops/BinaryArithmetic.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ops/BinaryArithmetic.java index b7883f38067abbca3ed847c407596f6df09b8ad6..d81c83297eed4a585e94eeb8bccebbec6cbc6413 100644 --- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ops/BinaryArithmetic.java +++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ops/BinaryArithmetic.java @@ -68,7 +68,7 @@ public abstract class BinaryArithmetic extends Operation { public static class MultiplyBuiltin { } - @RBuiltin(name = "^", kind = PRIMITIVE, parameterNames = {"", ""}, alwaysSplit = true, dispatch = OPS_GROUP_GENERIC, behavior = PURE_ARITHMETIC) + @RBuiltin(name = "^", aliases = "**", kind = PRIMITIVE, parameterNames = {"", ""}, alwaysSplit = true, dispatch = OPS_GROUP_GENERIC, behavior = PURE_ARITHMETIC) public static class PowBuiltin { } diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test index 7ef462cd656cd18132ad44000628f3c29506e0c3..68c0f9b81be958762a9e3d56baf9cc788e57433e 100644 --- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test +++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test @@ -85980,6 +85980,10 @@ Error in x + y : non-conformable arrays #{ x <- 1:2 ; dim(x) <- 1:2 ; y <- 2:3 ; dim(y) <- c(1,1,2) ; x + y } Error in x + y : non-conformable arrays +##com.oracle.truffle.r.test.library.base.TestSimpleArithmetic.testVectorsOperations# +#3 ** 4 +[1] 81 + ##com.oracle.truffle.r.test.library.base.TestSimpleArithmetic.testVectorsOperations# #{ -2:2 / 0:0 } [1] -Inf -Inf NaN Inf Inf diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleArithmetic.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleArithmetic.java index be6e824235926015ff454a9860433841958c6413..5f458da3dff54f52edbb86e3d888717eca5127c3 100644 --- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleArithmetic.java +++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleArithmetic.java @@ -288,6 +288,7 @@ public class TestSimpleArithmetic extends TestBase { assertEval("{ c(1,3) / c(2,4) }"); assertEval("{ 1:1 / 0:0 }"); assertEval("{ -2:2 / 0:0 }"); + assertEval("3 ** 4"); } @Test