Remove GetOption.

git-svn-id: https://svn.r-project.org/R/trunk@89056 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: luke

src/include/Rinternals.h

@@ -541,7 +541,6 @@ SEXP Rf_getAttrib(SEXP, SEXP);
 SEXP Rf_GetArrayDimnames(SEXP);
 SEXP Rf_GetColNames(SEXP);
 void Rf_GetMatrixDimnames(SEXP, SEXP*, SEXP*, const char**, const char**);
-SEXP Rf_GetOption(SEXP, SEXP); /* pre-2.13.0 compatibility */
 SEXP Rf_GetOption1(SEXP);
 //int Rf_GetOptionDigits(void);
 int Rf_GetOptionWidth(void);
@@ -949,7 +948,6 @@ void R_orderVector1(int *indx, int n, SEXP x,       Rboolean nalast, Rboolean de
 #define GetOption1		Rf_GetOption1
 #define GetOptionDigits		Rf_GetOptionDigits
 #define GetOptionWidth		Rf_GetOptionWidth
-#define GetOption		Rf_GetOption
 #define GetRowNames		Rf_GetRowNames
 #define gsetVar			Rf_gsetVar
 #define inherits		Rf_inherits

src/library/tools/R/sotools.R

@@ -697,7 +697,7 @@ nonAPI <- c("chol_", "chol2inv_", "cg_", "ch_", "rg_",
             ## non-API entry points":
             "EXTPTR_PROT", "EXTPTR_TAG", "EXTPTR_PTR",
             "OBJECT", "IS_S4_OBJECT",
-            "Rf_GetOption", "R_lsInternal",
+            "R_lsInternal",
             "REAL0", "COMPLEX0",
             "STRING_PTR", "DATAPTR", "STDVEC_DATAPTR",
             "Rf_allocSExp",
@@ -722,7 +722,7 @@ nonAPI <- c("chol_", "chol2inv_", "cg_", "ch_", "rg_",
 warnNonAPI <-
     c("REAL0", "COMPLEX0", "ddfind", "DDVAL", "ENSURE_NAMEDMAX", "INTERNAL",
       "PRSEEN", "SET_PRSEEN", "SYMVALUE", "R_nchar", "VECTOR_PTR", "R_tryWrap",
-      "Rf_NonNullStringMatch", "Rf_isValidString", "Rf_GetOption", "SET_FRAME",
+      "Rf_NonNullStringMatch", "Rf_isValidString", "SET_FRAME",
       "SET_HASHTAB", "SET_ENCLOS", "STDVEC_DATAPTR", "SET_S4_OBJECT",
       "UNSET_S4_OBJECT", "SET_NAMED", "R_lsInternal", "Rf_lazy_duplicate",
       "EXTPTR_PROT", "EXTPTR_PTR", "EXTPTR_TAG", "NAMED", "FRAME", "HASHTAB",

src/main/options.c

@@ -93,7 +93,7 @@
  * "scrap"
 
  * R_NilValue is not a valid value for any option, but is used to signal a
- * missing option by FindTaggedItem/GetOption and higher-level functions.
+ * missing option by FindTaggedItem/GetOption1 and higher-level functions.
  */
 
 
@@ -125,12 +125,6 @@ static SEXP makeErrorCall(SEXP fun)
   return call;
 }
 
-SEXP GetOption(SEXP tag, SEXP rho)
-{
-    return GetOption1(tag);
-}
-
-
 SEXP GetOption1(SEXP tag)
 {
     SEXP opt = SYMVALUE(Options());
@@ -737,7 +731,7 @@ attribute_hidden SEXP do_options(SEXP call, SEXP op, SEXP args, SEXP rho)
 		    error(_("invalid value for '%s'"), CHAR(namei));
 		SET_VECTOR_ELT(value, i, SetOption(tag, argi));
 	    }
-/* handle this here to avoid GetOption during error handling */
+/* handle this here to avoid GetOption1 during error handling */
 	    else if ( streql(CHAR(namei), "show.error.messages") ) {
 		check_TRUE_FALSE(argi, CHAR(namei));
 		R_ShowErrorMessages = LOGICAL(argi)[0];