Bug 560698: [R-Source] Adapt precedence of '?' operator in accordance
with changes in R language 4.0
Change-Id: I20355d7c44c1e1dd8389d09d7cde3244d7830a7f
diff --git a/r/org.eclipse.statet.r.core-tests/src/org/eclipse/statet/r/core/rsource/ast/RScannerBasicTest.java b/r/org.eclipse.statet.r.core-tests/src/org/eclipse/statet/r/core/rsource/ast/RScannerBasicTest.java
index caebac5..02210dd 100644
--- a/r/org.eclipse.statet.r.core-tests/src/org/eclipse/statet/r/core/rsource/ast/RScannerBasicTest.java
+++ b/r/org.eclipse.statet.r.core-tests/src/org/eclipse/statet/r/core/rsource/ast/RScannerBasicTest.java
@@ -74,6 +74,13 @@
static final NodeDescr ASSIGN_RIGHT_D= new NodeDescr(NodeType.A_RIGHT, RTerminal.ARROW_RIGHT_D);
static final NodeDescr ASSIGN_EQUALS= new NodeDescr(NodeType.A_EQUALS, RTerminal.EQUAL);
+ static List<NodeDescr> assignOps() {
+ return ImCollections.newList(
+ ASSIGN_LEFT_S, ASSIGN_LEFT_D,
+ ASSIGN_RIGHT_S, ASSIGN_RIGHT_S,
+ ASSIGN_EQUALS );
+ }
+
private final RScanner scanner= new RScanner(IModelManager.MODEL_FILE);
@@ -148,6 +155,18 @@
@ParameterizedTest
@MethodSource("commonOps")
+ public void HELP_commonOps(final NodeDescr opDescr) {
+ assertTwoOps_differentPrio(HELP_QUESTIONMARK, opDescr);
+ }
+
+ @ParameterizedTest
+ @MethodSource("assignOps")
+ public void HELP_assignOps(final NodeDescr opDescr) {
+ assertTwoOps_differentPrio(HELP_QUESTIONMARK, opDescr);
+ }
+
+ @ParameterizedTest
+ @MethodSource("commonOps")
public void ASSIGN_commonOps(final NodeDescr opDescr) {
assertTwoOps_differentPrio(ASSIGN_LEFT_S, opDescr);
assertTwoOps_differentPrio(ASSIGN_LEFT_D, opDescr);
diff --git a/r/org.eclipse.statet.r.core/src/org/eclipse/statet/r/core/rsource/ast/NodeType.java b/r/org.eclipse.statet.r.core/src/org/eclipse/statet/r/core/rsource/ast/NodeType.java
index 18240df..a28cc94 100644
--- a/r/org.eclipse.statet.r.core/src/org/eclipse/statet/r/core/rsource/ast/NodeType.java
+++ b/r/org.eclipse.statet.r.core/src/org/eclipse/statet/r/core/rsource/ast/NodeType.java
@@ -85,7 +85,7 @@
F_CALL_ARGS ("○", 12, Assoc.CONTAINER), //$NON-NLS-1$
F_CALL_ARG ("•", 12, Assoc.CONTAINER), //$NON-NLS-1$
- HELP ("?", 999, Assoc.LEFTSTD), //$NON-NLS-1$
+ HELP ("?", 10101, Assoc.LEFTSTD), //$NON-NLS-1$
;
