Fixed Javadoc error and Eclipse warnings.

com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/MatchedArguments.java

@@ -22,11 +22,9 @@
  */
 package com.oracle.truffle.r.nodes.function;
 
-import com.oracle.truffle.api.*;
 import com.oracle.truffle.api.frame.*;
 import com.oracle.truffle.api.nodes.*;
 import com.oracle.truffle.r.nodes.*;
-import com.oracle.truffle.r.nodes.expressions.*;
 import com.oracle.truffle.r.runtime.*;
 
 /**
@@ -36,8 +34,8 @@ import com.oracle.truffle.r.runtime.*;
  * supplied argument, the default argument or <code>null</code>, if neither is provided.
  * </p>
  * <p>
- * The {@link #doExecuteArray(VirtualFrame,ExpressionExecutorNode)} method executes the argument
- * nodes and converts them into a form that can be passed into functions.
+ * The {@link #doExecuteArray(VirtualFrame)} method executes the argument nodes and converts them
+ * into a form that can be passed into functions.
  * </p>
  */
 public final class MatchedArguments extends Arguments<RNode> {

com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/RCallNode.java

@@ -33,7 +33,6 @@ import com.oracle.truffle.r.nodes.access.*;
 import com.oracle.truffle.r.nodes.access.ReadVariableNode.BuiltinFunctionVariableNode;
 import com.oracle.truffle.r.nodes.access.ReadVariableNodeFactory.BuiltinFunctionVariableNodeFactory;
 import com.oracle.truffle.r.nodes.builtin.*;
-import com.oracle.truffle.r.nodes.expressions.*;
 import com.oracle.truffle.r.nodes.function.MatchedArguments.MatchedArgumentsNode;
 import com.oracle.truffle.r.runtime.*;
 import com.oracle.truffle.r.runtime.data.*;
@@ -75,13 +74,13 @@ import com.oracle.truffle.r.runtime.data.*;
  *  U = {@link UninitializedCallNode}: Forms the uninitialized end of the function PIC
  *  D = {@link DispatchedCallNode}: Function fixed, no varargs
  *  G = {@link GenericCallNode}: Function arbitrary, no varargs (generic case)
- * 
+ *
  *  UV = {@link UninitializedCallNode} with varargs,
  *  UVC = {@link UninitializedVarArgsCacheCallNode} with varargs, for varargs cache
  *  DV = {@link DispatchedVarArgsCallNode}: Function fixed, with cached varargs
  *  DGV = {@link DispatchedGenericVarArgsCallNode}: Function fixed, with arbitrary varargs (generic case)
  *  GV = {@link GenericVarArgsCallNode}: Function arbitrary, with arbitrary varargs (generic case)
- * 
+ *
  * (RB = {@link RBuiltinNode}: individual functions that are builtins are represented by this node
  * which is not aware of caching). Due to {@link CachedCallNode} (see below) this is transparent to
  * the cache and just behaves like a D/DGV)
@@ -94,11 +93,11 @@ import com.oracle.truffle.r.runtime.data.*;
  * non varargs, max depth:
  * |
  * D-D-D-U
- * 
+ *
  * no varargs, generic (if max depth is exceeded):
  * |
  * D-D-D-D-G
- * 
+ *
  * varargs:
  * |
  * DV-DV-UV         <- function identity level cache
@@ -106,7 +105,7 @@ import com.oracle.truffle.r.runtime.data.*;
  *    DV
  *    |
  *    UVC           <- varargs signature level cache
- * 
+ *
  * varargs, max varargs depth exceeded:
  * |
  * DV-DV-UV
@@ -118,7 +117,7 @@ import com.oracle.truffle.r.runtime.data.*;
  *    DV
  *    |
  *    DGV
- * 
+ *
  * varargs, max function depth exceeded:
  * |
  * DV-DV-DV-DV-GV

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/REnvVars.java

@@ -83,23 +83,23 @@ public class REnvVars {
         }
     }
 
-    private static String rHome;
+    private static String rHomePath;
 
     public static String rHome() {
         // This can be called before initialize, "R RHOME"
-        if (rHome == null) {
-            rHome = getEnvVars().get("R_HOME");
-            if (rHome == null) {
+        if (rHomePath == null) {
+            rHomePath = getEnvVars().get("R_HOME");
+            if (rHomePath == null) {
                 // Should only happen in a unit test run, but can differ whether
                 // run from within IDE or from command line.
                 File file = new File(System.getProperty("user.dir"));
                 if (file.getName().endsWith("r.test")) {
                     file = file.getParentFile();
                 }
-                rHome = file.getAbsolutePath();
+                rHomePath = file.getAbsolutePath();
             }
         }
-        return rHome;
+        return rHomePath;
     }
 
     public static String put(String key, String value) {