Skip to content
Snippets Groups Projects
Commit c68efbc2 authored by Zbynek Slajchrt's avatar Zbynek Slajchrt
Browse files

Misc. bugs fixed when enabling dplyr

parent d2afe6ff
No related branches found
No related tags found
No related merge requests found
......@@ -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;
......
......@@ -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; }
;
......
......@@ -42,6 +42,7 @@ public class TestBuiltin_tilde extends TestBase {
assertEval("... ~ 0 + x");
assertEval("y ~ ...");
assertEval("y ~ ... + 2");
assertEval("x * ~y");
}
@Test
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment