From 4f62954cad52c2d62c31414b377c506c040c3292 Mon Sep 17 00:00:00 2001
From: Lukas Stadler <lukas.stadler@oracle.com>
Date: Fri, 23 Mar 2018 13:10:13 +0100
Subject: [PATCH] :: and ::: should not set argument names
---
.../src/com/oracle/truffle/r/parser/ParserGeneration.java | 3 ++-
.../src/com/oracle/truffle/r/parser/R.g | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/com.oracle.truffle.r.parser/src/com/oracle/truffle/r/parser/ParserGeneration.java b/com.oracle.truffle.r.parser/src/com/oracle/truffle/r/parser/ParserGeneration.java
index 2d17f16cb4..c54448034f 100644
--- a/com.oracle.truffle.r.parser/src/com/oracle/truffle/r/parser/ParserGeneration.java
+++ b/com.oracle.truffle.r.parser/src/com/oracle/truffle/r/parser/ParserGeneration.java
@@ -97,6 +97,7 @@ public class ParserGeneration {
"allow greek characters in identifiers",
"allow everything but newlines in %<ident>% operators",
"allow strings in :: and :::",
- "use file for interactive single-line source"
+ "use file for interactive single-line source",
+ ":: and ::: do not set argument names"
};
}
diff --git a/com.oracle.truffle.r.parser/src/com/oracle/truffle/r/parser/R.g b/com.oracle.truffle.r.parser/src/com/oracle/truffle/r/parser/R.g
index a86d1728d7..daab0541ae 100644
--- a/com.oracle.truffle.r.parser/src/com/oracle/truffle/r/parser/R.g
+++ b/com.oracle.truffle.r.parser/src/com/oracle/truffle/r/parser/R.g
@@ -578,17 +578,17 @@ simple_expr returns [T v]
| cstr=conststring { $v = $cstr.v; }
| pkg=id op=(NS_GET|NS_GET_INT) n_ {
SourceSection pkgSource = src($pkg.v);
- args.add(RCodeBuilder.argument(pkgSource, "pkg", builder.lookup(pkgSource, $pkg.text, false)));
+ args.add(RCodeBuilder.argument(pkgSource, (String) null, builder.lookup(pkgSource, $pkg.text, false)));
}
( compId=id {
SourceSection compSource = src($compId.v);
compToken = $compId.v;
- args.add(RCodeBuilder.argument(compSource, "name", builder.lookup(compSource, $compId.text, false)));
+ args.add(RCodeBuilder.argument(compSource, (String) null, builder.lookup(compSource, $compId.text, false)));
}
| compString=STRING {
SourceSection compSource = src($compString);
compToken = $compString;
- args.add(RCodeBuilder.argument(compSource, "name", builder.constant(compSource, $compString.text)));
+ args.add(RCodeBuilder.argument(compSource, (String) null, builder.constant(compSource, $compString.text)));
}
) { $v = builder.call(src($pkg.v, compToken), operator($op), args); }
| op=LPAR n_ ea=expr_or_assign n_ y=RPAR { $v = builder.call(src($op, $y), operator($op), $ea.v); }
--
GitLab