[GR-14033] Fixed RcppParallel installation.

PullRequest: fastr/1923

Author: Miloslav Metelka

CHANGELOG.md

@@ -8,6 +8,7 @@ New features:
 Bug fixes:
 
 * when using GNU-R graphics (-UseInternalGridGraphics) FastR would still override the graphics package R functions
+* cannot install RcppParallel #52
 
 # 1.0 RC 12
 

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/GrepFunctions.java

@@ -482,6 +482,7 @@ protected RAbstractStringVector doSub(String patternArg, String replacementArg,
                 } else {
                     pattern = RegExp.checkPreDefinedClasses(pattern);
                 }
+                String preparedReplacement = null;
                 String[] result = new String[len];
                 for (int i = 0; i < len; i++) {
                     String input = vector.getDataAt(i);
@@ -493,13 +494,17 @@ protected RAbstractStringVector doSub(String patternArg, String replacementArg,
                     String value;
                     if (fixed) {
                         if (gsub) {
-                            replacement = replacement.replace("$", "\\$");
-                            replacement = convertGroups(replacement, 0);
-                            value = Pattern.compile(pattern, Pattern.LITERAL).matcher(input).replaceAll(replacement);
+                            if (preparedReplacement == null) {
+                                preparedReplacement = replacement.replace("$", "\\$");
+                                preparedReplacement = convertGroups(preparedReplacement, 0);
+                            }
+                            value = Pattern.compile(pattern, Pattern.LITERAL).matcher(input).replaceAll(preparedReplacement);
                         } else {
                             int ix = input.indexOf(pattern);
-                            replacement = replacement.replace("\\\\", "\\");
-                            value = ix < 0 ? input : input.substring(0, ix) + replacement + input.substring(ix + pattern.length());
+                            if (preparedReplacement == null) {
+                                preparedReplacement = replacement.replace("\\\\", "\\");
+                            }
+                            value = ix < 0 ? input : input.substring(0, ix) + preparedReplacement + input.substring(ix + pattern.length());
                         }
                     } else if (perl) {
                         int lastEndOffset = 0;
@@ -562,12 +567,15 @@ protected RAbstractStringVector doSub(String patternArg, String replacementArg,
                         }
                     } else {
                         Matcher matcher = Pattern.compile(pattern, Pattern.DOTALL).matcher(input);
-                        replacement = convertGroups(replacement, matcher.groupCount());
-
+                        if (preparedReplacement == null) {
+                            preparedReplacement = replacement.replace("$", "\\$");
+                            // matcher.groupCount() only depends on the pattern (not on the input)
+                            preparedReplacement = convertGroups(preparedReplacement, matcher.groupCount());
+                        }
                         if (gsub) {
-                            value = matcher.replaceAll(replacement);
+                            value = matcher.replaceAll(preparedReplacement);
                         } else {
-                            value = matcher.replaceFirst(replacement);
+                            value = matcher.replaceFirst(preparedReplacement);
                         }
                     }
                     result[i] = value;

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test

@@ -33795,6 +33795,10 @@ NULL
 #gsub('(_[bB])','\\1_m','b_b')
 [1] "b_b_m"
 
+##com.oracle.truffle.r.test.builtins.TestBuiltin_gsub.testGsub#
+#gsub('@CXX11@', '$(CXX11)', '    CPLUS="@CXX11@"                           \'', fixed=FALSE)
+[1] "    CPLUS=\"$(CXX11)\"                           '"
+
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_gsub.testGsub#
 #gsub('_[bB]','\\0_m','b_b')
 [1] "b0_m"

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_gsub.java

@@ -14,7 +14,7 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * Copyright (c) 2012-2014, Purdue University
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates
  *
  * All rights reserved.
  */
@@ -237,5 +237,6 @@ public void testGsub() {
         assertEval("gsub('_[bB]','\\\\1_m','b_b')");
         assertEval("gsub('(_[bB])','\\\\1_m','b_b')");
         assertEval("gsub('b','\\\\1m','Abb')");
+        assertEval("gsub('@CXX11@', '$(CXX11)', '    CPLUS=\"@CXX11@\"                           \\'', fixed=FALSE)");
     }
 }