From 088ff23ff9e789860686b2a20ef7154e17739bca Mon Sep 17 00:00:00 2001
From: Adam Welc <adam.welc@oracle.com>
Date: Tue, 16 Aug 2016 14:55:12 -0700
Subject: [PATCH] Removed redundant conditionals plus renamed ambiguously named
variable.
---
.../r/nodes/builtin/helpers/BrowserInteractNode.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/helpers/BrowserInteractNode.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/helpers/BrowserInteractNode.java
index e642d31c00..408009cdde 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/helpers/BrowserInteractNode.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/helpers/BrowserInteractNode.java
@@ -71,9 +71,9 @@ public abstract class BrowserInteractNode extends RNode {
BrowserState browserState = RContext.getInstance().stateInstrumentation.getBrowserState();
String savedPrompt = ch.getPrompt();
ch.setPrompt(browserPrompt(RArguments.getDepth(frame)));
- RFunction caller = RArguments.getFunction(frame);
+ RFunction callerFunction = RArguments.getFunction(frame);
// we may be at top level where there is not caller
- boolean callerIsDebugged = caller == null ? false : DebugHandling.isDebugged(caller);
+ boolean callerIsDebugged = callerFunction == null ? false : DebugHandling.isDebugged(callerFunction);
int exitMode = NEXT;
try {
browserState.setInBrowser(true);
@@ -96,16 +96,16 @@ public abstract class BrowserInteractNode extends RNode {
case "n":
exitMode = NEXT;
// don't enable debugging if at top level
- if (!callerIsDebugged && caller != null) {
- DebugHandling.enableDebug(caller, "", "", true, true);
+ if (!callerIsDebugged) {
+ DebugHandling.enableDebug(callerFunction, "", "", true, true);
}
browserState.setLastEmptyLineCommand("n");
break LW;
case "s":
exitMode = STEP;
// don't enable debugging if at top level
- if (!callerIsDebugged & caller != null) {
- DebugHandling.enableDebug(caller, "", "", true, true);
+ if (!callerIsDebugged) {
+ DebugHandling.enableDebug(callerFunction, "", "", true, true);
}
browserState.setLastEmptyLineCommand("s");
break LW;
--
GitLab