[GR-11291] Miscellaneous dplyr related bugs fixed.

PullRequest: fastr/1655

com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/RForceAndCallNode.java

@@ -110,7 +110,7 @@ public abstract class RForceAndCallNode extends RBaseNode {
         System.arraycopy(dotArgs.getArguments(), 0, argValuesEx, argValues.size() - 1, dotArgs.getLength());
         final String[] argNames = dotArgs.getSignature().getNames();
         if (argNames != null) {
-            System.arraycopy(argNames, 0, argNamesEx, argValues.size(), dotArgs.getLength());
+            System.arraycopy(argNames, 0, argNamesEx, argValues.size() - 1, dotArgs.getLength());
         }
         argsAndNames = new RArgsValuesAndNames(argValuesEx, ArgumentsSignature.get(argNamesEx));
         return argsAndNames;

com.oracle.truffle.r.parser/src/com/oracle/truffle/r/parser/R.g

@@ -461,6 +461,7 @@ colon_expr returns [T v]
 
 unary_expression returns [T v]
     : op=(PLUS | MINUS | NOT | QM) n_ l=unary_expression { $v = builder.call(src($op, last()), operator($op), $l.v); }
+	| op=(TILDE) n_ l=utilde_expr { $v = builder.call(src($op, last()), operator($op), $l.v); }
     | b=power_expr                                  { $v = $b.v; }
     ;
 

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_tilde.java

@@ -42,6 +42,7 @@ public class TestBuiltin_tilde extends TestBase {
         assertEval("... ~ 0 + x");
         assertEval("y ~ ...");
         assertEval("y ~ ... + 2");
+        assertEval("x * ~y");
     }
 
     @Test