[GR-11291] Enabling dplyr tests.

zslajchrt · zslajchrt · commit 2a80638893c2 · 2018-08-27T02:53:15.000-07:00
PullRequest: fastr/1657
diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/RRuntimeASTAccessImpl.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/RRuntimeASTAccessImpl.java
@@ -146,8 +146,12 @@ public RPairList getSyntaxCaller(RCaller rl) {
         while (call.isPromise()) {
             call = call.getParent();
         }
-        RSyntaxElement syntaxNode = call.getSyntaxNode();
-        return RDataFactory.createLanguage(getOrCreateLanguageClosure(((RSyntaxNode) syntaxNode).asRNode()));
+        if (call.isValidCaller()) {
+            RSyntaxElement syntaxNode = call.getSyntaxNode();
+            return RDataFactory.createLanguage(getOrCreateLanguageClosure(((RSyntaxNode) syntaxNode).asRNode()));
+        } else {
+            return null;
+        }
     }
 
     private static RBaseNode checkBuiltin(RBaseNode bn) {
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/common/JavaUpCallsRFFIImpl.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/common/JavaUpCallsRFFIImpl.java
@@ -2385,8 +2385,8 @@ public Object octsize(Object size) {
 
     @Override
     public Object FASTR_DATAPTR(Object x) {
-        if (x instanceof RStringVector) {
-            return VectorRFFIWrapper.get((RStringVector) x);
+        if ((x instanceof RStringVector) || (x instanceof RList)) {
+            return VectorRFFIWrapper.get((TruffleObject) x);
         }
         CompilerDirectives.transferToInterpreter();
         throw RError.error(RError.NO_CALLER, Message.GENERIC, "DATAPTR not implemented for type " + Utils.getTypeName(x));
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/CoerceNodes.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/CoerceNodes.java
@@ -45,6 +45,7 @@
 import com.oracle.truffle.r.runtime.RError.Message;
 import com.oracle.truffle.r.runtime.RInternalError;
 import com.oracle.truffle.r.runtime.RRuntime;
+import com.oracle.truffle.r.runtime.Utils;
 import com.oracle.truffle.r.runtime.data.RDataFactory;
 import com.oracle.truffle.r.runtime.data.RList;
 import com.oracle.truffle.r.runtime.data.RNull;
@@ -93,7 +94,7 @@ protected Object convert(RAbstractVector v) {
             for (int i = v.getLength() - 1; i >= 0; i--) {
                 Object element = v.getDataAtAsObject(i);
                 adjustSharing(v, element);
-                current = RDataFactory.createPairList(element, current, names != null ? RDataFactory.createSymbol(names.getDataAt(i)) : RNull.instance, gnurType);
+                current = RDataFactory.createPairList(element, current, names != null ? RDataFactory.createSymbol(Utils.intern(names.getDataAt(i))) : RNull.instance, gnurType);
             }
             if (current != RNull.instance) {
                 // also copy regular attributes
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/RfEvalNode.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/RfEvalNode.java
@@ -50,6 +50,7 @@
 import com.oracle.truffle.r.runtime.data.RPromise;
 import com.oracle.truffle.r.runtime.data.RSymbol;
 import com.oracle.truffle.r.runtime.env.REnvironment;
+import com.oracle.truffle.r.runtime.env.frame.ActiveBinding;
 
 public abstract class RfEvalNode extends FFIUpCallNode.Arg2 {
 
@@ -104,6 +105,9 @@ Object handleSymbol(RSymbol expr, Object envArg,
         if (result == null) {
             throw RError.error(RError.NO_CALLER, UNKNOWN_OBJECT, expr.getName());
         }
+        if (result instanceof ActiveBinding) {
+            result = ((ActiveBinding) result).readValue();
+        }
         return result;
     }
 
diff --git a/com.oracle.truffle.r.native/fficall/src/common/Makefile b/com.oracle.truffle.r.native/fficall/src/common/Makefile
@@ -37,7 +37,7 @@ GNUR_APPL_SRC = $(GNUR_HOME)/src/appl
 GNUR_APPL_F_FILES := $(notdir $(wildcard $(GNUR_APPL_SRC)/d*.f))
 GNUR_APPL_C_FILES := $(notdir $(wildcard $(GNUR_APPL_SRC)/*.c))
 
-GNUR_MAIN_C_FILES = errors.c colors.c devices.c engine.c format.c graphics.c plot.c plot3d.c plotmath.c rlocale.c sort.c
+GNUR_MAIN_C_FILES = errors.c colors.c devices.c engine.c format.c graphics.c plot.c plot3d.c plotmath.c rlocale.c sort.c duplicate.c
 GNUR_MAIN_SRC = $(GNUR_HOME)/src/main
 
 GNUR_UNIX_C_FILES = sys-std.c
diff --git a/com.oracle.truffle.r.native/fficall/src/truffle_common/Rinternals_truffle_common.h b/com.oracle.truffle.r.native/fficall/src/truffle_common/Rinternals_truffle_common.h
@@ -668,7 +668,7 @@ SEXP Rf_lengthgets(SEXP x, R_len_t y) {
 
 SEXP Rf_xlengthgets(SEXP x, R_xlen_t y) {
     TRACE1(x);
-    return unimplemented("Rf_xlengthgets");
+    return Rf_lengthgets(x, y);
 }
 
 SEXP R_lsInternal(SEXP env, Rboolean all) {
@@ -1139,8 +1139,7 @@ SEXP SET_VECTOR_ELT(SEXP x, R_xlen_t i, SEXP v) {
 
 SEXP *STRING_PTR(SEXP x) {
     TRACE0();
-    unimplemented("STRING_PTR");
-    return NULL;
+    return FASTR_DATAPTR(x);
 }
 
 SEXP * NORET VECTOR_PTR(SEXP x) {
diff --git a/com.oracle.truffle.r.native/gnur/patch/src/main/duplicate.c b/com.oracle.truffle.r.native/gnur/patch/src/main/duplicate.c
@@ -0,0 +1,66 @@
+/*
+ *  R : A Computer Language for Statistical Data Analysis
+ *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
+ *            (C) 2004  The R Foundation
+ *  Copyright (C) 1998--2015 The R Core Team.
+ *  Copyright (c) 2013, 2018, Oracle and/or its affiliates
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, a copy is available at
+ *  https://www.R-project.org/Licenses/
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "Defn.h"
+
+#include <R_ext/RS.h> /* S4 bit */
+
+#include "duplicate.h"
+
+SEXP lazy_duplicate(SEXP s) {
+    switch (TYPEOF(s)) {
+    case NILSXP:
+    case SYMSXP:
+    case ENVSXP:
+    case SPECIALSXP:
+    case BUILTINSXP:
+    case EXTPTRSXP:
+    case BCODESXP:
+    case WEAKREFSXP:
+    case CHARSXP:
+    case PROMSXP:
+	break;
+    case CLOSXP:
+    case LISTSXP:
+    case LANGSXP:
+    case DOTSXP:
+    case EXPRSXP:
+    case VECSXP:
+    case LGLSXP:
+    case INTSXP:
+    case REALSXP:
+    case CPLXSXP:
+    case RAWSXP:
+    case STRSXP:
+    case S4SXP:
+	SET_NAMED(s, 2);
+	break;
+    default:
+	UNIMPLEMENTED_TYPE("lazy_duplicate", s);
+    }
+    return s;
+}
diff --git a/com.oracle.truffle.r.native/gnur/patch/src/main/duplicate.h b/com.oracle.truffle.r.native/gnur/patch/src/main/duplicate.h
@@ -0,0 +1,24 @@
+/*
+ *  R : A Computer Language for Statistical Data Analysis
+ *  Copyright (C) 1995--2017  The R Core Team.
+ *  Copyright (c) 2013, 2018, Oracle and/or its affiliates
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, a copy is available at
+ *  https://www.R-project.org/Licenses/
+ */
+
+#ifndef R_DUPLICATE_H
+#define R_DUPLICATE_H
+
+#endif /* R_DUPLICATE_H */
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/GrepFunctions.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/GrepFunctions.java
@@ -494,6 +494,7 @@ protected RAbstractStringVector doSub(String patternArg, String replacementArg,
                     if (fixed) {
                         if (gsub) {
                             replacement = replacement.replace("$", "\\$");
+                            replacement = convertGroups(replacement, 0);
                             value = Pattern.compile(pattern, Pattern.LITERAL).matcher(input).replaceAll(replacement);
                         } else {
                             int ix = input.indexOf(pattern);
@@ -560,9 +561,9 @@ protected RAbstractStringVector doSub(String patternArg, String replacementArg,
                             value = sb.toString();
                         }
                     } else {
-                        replacement = convertGroups(replacement);
-
                         Matcher matcher = Pattern.compile(pattern, Pattern.DOTALL).matcher(input);
+                        replacement = convertGroups(replacement, matcher.groupCount());
+
                         if (gsub) {
                             value = matcher.replaceAll(replacement);
                         } else {
@@ -712,7 +713,7 @@ private static void pcreStringAdj(StringBuilder sb, String input, String repl, i
         }
 
         @TruffleBoundary
-        private static String convertGroups(String value) {
+        private static String convertGroups(String value, int groupCount) {
             StringBuilder result = new StringBuilder();
             int i = 0;
             while (i < value.length()) {
@@ -723,12 +724,14 @@ private static String convertGroups(String value) {
                         result.append('\\');
                     } else {
                         c = value.charAt(i);
-                        if (c >= '0' && c <= '9') {
-                            result.append('$');
+                        if (c >= '1' && c <= '9') {
+                            int gi = c - '0';
+                            if (gi <= groupCount) {
+                                result.append('$').append(c);
+                            }
                         } else {
-                            result.append('\\');
+                            result.append('\\').append(c);
                         }
-                        result.append(c);
                     }
                 } else {
                     result.append(c);
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RRuntimeASTAccess.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RRuntimeASTAccess.java
@@ -46,7 +46,8 @@ public interface RRuntimeASTAccess {
 
     /**
      * Returns the real caller associated with {@code rl}, by locating the {@code RSyntaxNode}
-     * associated with the node stored with {@code rl}.
+     * associated with the node stored with {@code rl}. It may return {@code null} if there is no
+     * valid caller.
      */
     RPairList getSyntaxCaller(RCaller rl);
 
@@ -76,7 +77,8 @@ public interface RRuntimeASTAccess {
      * Convenience method for {@code getCallerSource(getSyntaxCaller(caller))}.
      */
     default String getCallerSource(RCaller caller) {
-        return getCallerSource(getSyntaxCaller(caller));
+        final RPairList syntaxCaller = getSyntaxCaller(caller);
+        return syntaxCaller == null ? "<invalid call>" : getCallerSource(syntaxCaller);
     }
 
     /**
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/NativeDataAccess.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/NativeDataAccess.java
@@ -118,9 +118,9 @@ private static final class NativeMirror {
         /**
          * The truly allocated length of the native data array. Expected to be either kept at zero
          * if not used, or to be a value &gt;= length.<br>
-         * 
+         *
          * Expected usage in native code:
-         * 
+         *
          * <pre>
          * SEXP vector = allocVector(STRSXP, 1024);
          * SETLENGTH(newnames, 10);
@@ -188,6 +188,18 @@ void allocateNative(CharSXPWrapper[] wrappers) {
             }
         }
 
+        @TruffleBoundary
+        void allocateNative(Object[] elements) {
+            long addr = dataAddress = allocateNativeMemory(elements.length * Long.BYTES);
+            for (int i = 0; i < elements.length; i++) {
+                Object element = elements[i];
+                if (element instanceof RSequence) {
+                    element = ((RSequence) element).createVector();
+                }
+                UnsafeAdapter.UNSAFE.putLong(addr + i * Long.BYTES, asPointer(element));
+            }
+        }
+
         // TODO: turn this into reference queues
         @Override
         protected void finalize() throws Throwable {
@@ -858,6 +870,17 @@ static long allocateNativeContents(CharSXPWrapper vector, byte[] data) {
         return mirror.dataAddress;
     }
 
+    static long allocateNativeContents(RList list, Object[] elements) {
+        NativeMirror mirror = (NativeMirror) list.getNativeMirror();
+        assert mirror != null;
+        if (mirror.dataAddress == 0) {
+            // Note: shall the list become writeable and not only read-only, we should
+            // crate assumption like for other vector types
+            mirror.allocateNative(elements);
+        }
+        return mirror.dataAddress;
+    }
+
     @TruffleBoundary
     public static long allocateNativeStringArray(String[] data) {
         // We allocate contiguous memory that we'll use to store both the array of pointers (char**)
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RComplexVector.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RComplexVector.java
@@ -241,12 +241,12 @@ protected RComplex getComplexImpl(AccessIterator accessIter, int index) {
 
         @Override
         protected double getComplexRImpl(AccessIterator accessIter, int index) {
-            return hasStore ? ((double[]) accessIter.getStore())[index * 2] : NativeDataAccess.getDoubleNativeMirrorData(accessIter.getStore(), index * 2);
+            return hasStore ? ((double[]) accessIter.getStore())[index * 2] : NativeDataAccess.getComplexNativeMirrorDataR(accessIter.getStore(), index);
         }
 
         @Override
         protected double getComplexIImpl(AccessIterator accessIter, int index) {
-            return hasStore ? ((double[]) accessIter.getStore())[index * 2 + 1] : NativeDataAccess.getDoubleNativeMirrorData(accessIter.getStore(), index * 2 + 1);
+            return hasStore ? ((double[]) accessIter.getStore())[index * 2 + 1] : NativeDataAccess.getComplexNativeMirrorDataI(accessIter.getStore(), index);
         }
 
         @Override
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RList.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RList.java
@@ -93,6 +93,10 @@ protected RList internalCopyResized(int size, boolean fillNA, int[] dimensions)
         return RDataFactory.createList(copyResizedData(size, fillNA), dimensions);
     }
 
+    public long allocateNativeContents() {
+        return NativeDataAccess.allocateNativeContents(this, data);
+    }
+
     private static final class FastPathAccess extends FastPathFromListAccess {
 
         FastPathAccess(RAbstractContainer value) {
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/VectorRFFIWrapper.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/VectorRFFIWrapper.java
@@ -48,6 +48,7 @@
 import com.oracle.truffle.r.runtime.data.RComplexVector;
 import com.oracle.truffle.r.runtime.data.RDoubleVector;
 import com.oracle.truffle.r.runtime.data.RIntVector;
+import com.oracle.truffle.r.runtime.data.RList;
 import com.oracle.truffle.r.runtime.data.RLogicalVector;
 import com.oracle.truffle.r.runtime.data.RNull;
 import com.oracle.truffle.r.runtime.data.RObject;
@@ -122,6 +123,12 @@ public abstract static class DispatchAllocate extends Node {
 
             public abstract long execute(Object vector);
 
+            @Specialization
+            @TruffleBoundary
+            protected static long get(RList list) {
+                return list.allocateNativeContents();
+            }
+
             @Specialization
             @TruffleBoundary
             protected static long get(RIntVector vector) {
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_gsub.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_gsub.java
@@ -231,5 +231,11 @@ public void testGsub() {
 
         // Test the dollar in the replacement is not treated as a group reference
         assertEval("{ gsub('x', '$', 'x') }");
+
+        // Test group reference handling
+        assertEval("gsub('_[bB]','\\\\0_m','b_b')");
+        assertEval("gsub('_[bB]','\\\\1_m','b_b')");
+        assertEval("gsub('(_[bB])','\\\\1_m','b_b')");
+        assertEval("gsub('b','\\\\1m','Abb')");
     }
 }
diff --git a/mx.fastr/copyrights/gnu_r.language.oracle.star.regex b/mx.fastr/copyrights/gnu_r.language.oracle.star.regex
@@ -1 +1 @@
-\/\*\n \*  R : A Computer Language for Statistical Data Analysis\n (\*  Copyright \(C\) (?:[1-2][09][0-9][0-9], ?)?(:?[1-2][09])?[0-9]?[0-9] [ ]?Robert Gentleman and Ross Ihaka\n )?\*  Copyright \(C\) (?:[1-2][09][0-9][0-9]--?)?(:?[1-2][09])?[0-9]?[0-9] [ ]?The [ ]?R Core Team\.?\n \*  Copyright \(c\) (?:(20[0-9][0-9]), )?(20[0-9][0-9]), Oracle and/or its affiliates\n \*\n \*  This program is free software; you can redistribute it and\/or modify\n \*  it under the terms of the GNU General Public License as published by\n \*  the Free Software Foundation; either version 2 of the License, or\n \*  \(at your option\) any later version\.\n \*\n \*  This program is distributed in the hope that it will be useful,\n \*  but WITHOUT ANY WARRANTY; without even the implied warranty of\n \*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE\.  See the\n \*  GNU General Public License for more details.\n \*\n \*  You should have received a copy of the GNU General Public License\n \*  along with this program; if not, a copy is available at\n \*  https:\/\/www\.R-project\.org\/Licenses.*
+\/\*\n \*  R : A Computer Language for Statistical Data Analysis\n (\*  Copyright \(C\) (?:[1-2][09][0-9][0-9], ?)?(:?[1-2][09])?[0-9]?[0-9] [ ]?Robert Gentleman and Ross Ihaka\n )?(\*            \(C\) [1-2][09][0-9][0-9]  The R Foundation\n )?\*  Copyright \(C\) (?:[1-2][09][0-9][0-9]--?)?(:?[1-2][09])?[0-9]?[0-9] [ ]?The [ ]?R Core Team\.?\n \*  Copyright \(c\) (?:(20[0-9][0-9]), )?(20[0-9][0-9]), Oracle and/or its affiliates\n \*\n \*  This program is free software; you can redistribute it and\/or modify\n \*  it under the terms of the GNU General Public License as published by\n \*  the Free Software Foundation; either version 2 of the License, or\n \*  \(at your option\) any later version\.\n \*\n \*  This program is distributed in the hope that it will be useful,\n \*  but WITHOUT ANY WARRANTY; without even the implied warranty of\n \*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE\.  See the\n \*  GNU General Public License for more details.\n \*\n \*  You should have received a copy of the GNU General Public License\n \*  along with this program; if not, a copy is available at\n \*  https:\/\/www\.R-project\.org\/Licenses.*
diff --git a/mx.fastr/copyrights/overrides b/mx.fastr/copyrights/overrides
@@ -976,3 +976,5 @@ com.oracle.truffle.r.pkgs/rJava/src/java/RectangularArraySummary.java,no.copyrig
 com.oracle.truffle.r.native/fficall/src/truffle_common/Applic.c,gnu_r.language.oracle
 com.oracle.truffle.r.native/gnur/patch/src/main/errors.c,gnu_r.language.oracle
 com.oracle.truffle.r.native/gnur/patch/src/unix/sys-std.c,gnu_r.language.oracle
+com.oracle.truffle.r.native/gnur/patch/src/main/duplicate.c,gnu_r.language.oracle
+com.oracle.truffle.r.native/gnur/patch/src/main/duplicate.h,gnu_r.language.oracle

Original file line number	Diff line number	Diff line change
`@@ -146,8 +146,12 @@ public RPairList getSyntaxCaller(RCaller rl) {`
`146`	`146`	`while (call.isPromise()) {`
`147`	`147`	`call = call.getParent();`
`148`	`148`	`}`
`149`		`- RSyntaxElement syntaxNode = call.getSyntaxNode();`
`150`		`- return RDataFactory.createLanguage(getOrCreateLanguageClosure(((RSyntaxNode) syntaxNode).asRNode()));`
	`149`	`+ if (call.isValidCaller()) {`
	`150`	`+ RSyntaxElement syntaxNode = call.getSyntaxNode();`
	`151`	`+ return RDataFactory.createLanguage(getOrCreateLanguageClosure(((RSyntaxNode) syntaxNode).asRNode()));`
	`152`	`+ } else {`
	`153`	`+ return null;`
	`154`	`+ }`
`151`	`155`	`}`
`152`	`156`
`153`	`157`	`private static RBaseNode checkBuiltin(RBaseNode bn) {`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@`
`50`	`50`	`import com.oracle.truffle.r.runtime.data.RPromise;`
`51`	`51`	`import com.oracle.truffle.r.runtime.data.RSymbol;`
`52`	`52`	`import com.oracle.truffle.r.runtime.env.REnvironment;`
	`53`	`+import com.oracle.truffle.r.runtime.env.frame.ActiveBinding;`
`53`	`54`
`54`	`55`	`public abstract class RfEvalNode extends FFIUpCallNode.Arg2 {`
`55`	`56`
`@@ -104,6 +105,9 @@ Object handleSymbol(RSymbol expr, Object envArg,`
`104`	`105`	`if (result == null) {`
`105`	`106`	`throw RError.error(RError.NO_CALLER, UNKNOWN_OBJECT, expr.getName());`
`106`	`107`	`}`
	`108`	`+ if (result instanceof ActiveBinding) {`
	`109`	`+ result = ((ActiveBinding) result).readValue();`
	`110`	`+ }`
`107`	`111`	`return result;`
`108`	`112`	`}`
`109`	`113`
Original file line number	Diff line number	Diff line change
`@@ -668,7 +668,7 @@ SEXP Rf_lengthgets(SEXP x, R_len_t y) {`
`668`	`668`
`669`	`669`	`SEXP Rf_xlengthgets(SEXP x, R_xlen_t y) {`
`670`	`670`	`TRACE1(x);`
`671`		`- return unimplemented("Rf_xlengthgets");`
	`671`	`+ return Rf_lengthgets(x, y);`
`672`	`672`	`}`
`673`	`673`
`674`	`674`	`SEXP R_lsInternal(SEXP env, Rboolean all) {`
`@@ -1139,8 +1139,7 @@ SEXP SET_VECTOR_ELT(SEXP x, R_xlen_t i, SEXP v) {`
`1139`	`1139`
`1140`	`1140`	`SEXP *STRING_PTR(SEXP x) {`
`1141`	`1141`	`TRACE0();`
`1142`		`- unimplemented("STRING_PTR");`
`1143`		`- return NULL;`
	`1142`	`+ return FASTR_DATAPTR(x);`
`1144`	`1143`	`}`
`1145`	`1144`
`1146`	`1145`	`SEXP * NORET VECTOR_PTR(SEXP x) {`