From 89bd43fe83df206928ccae2b97e472d85acf2c50 Mon Sep 17 00:00:00 2001
From: stepan <stepan.sindelar@oracle.com>
Date: Tue, 23 Jan 2018 14:22:04 +0100
Subject: [PATCH] Support ignoreCase in list.files function
---
.../r/nodes/builtin/base/FileFunctions.java | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/FileFunctions.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/FileFunctions.java
index 051060c567..8dacc87f84 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/FileFunctions.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/FileFunctions.java
@@ -5,7 +5,7 @@
*
* Copyright (c) 1995-2012, The R Core Team
* Copyright (c) 2003, The R Foundation
- * Copyright (c) 2013, 2017, Oracle and/or its affiliates
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates
*
* All rights reserved.
*/
@@ -634,11 +634,10 @@ public class FileFunctions {
}
private RStringVector doListFilesBody(RAbstractStringVector vec, String patternString, boolean allFiles, boolean fullNames, boolean recursive,
- boolean ignoreCaseIn, boolean includeDirsIn, boolean noDotDot) {
+ boolean ignoreCase, boolean includeDirsIn, boolean noDotDot) {
boolean includeDirs = !recursive || includeDirsIn;
- @SuppressWarnings("unused")
- boolean ignoreCase = check(ignoreCaseIn, "ignoreCase");
- Pattern pattern = patternString == null ? null : Pattern.compile(patternString);
+ int flags = ignoreCase ? Pattern.CASE_INSENSITIVE : 0;
+ Pattern pattern = patternString == null ? null : Pattern.compile(patternString, flags);
// Curiously the result is not a vector of same length as the input,
// as typical for R, but a single vector, which means duplicates may occur
ArrayList<String> files = new ArrayList<>();
@@ -693,13 +692,6 @@ public class FileFunctions {
}
}
- private boolean check(boolean value, String argName) {
- if (value) {
- warning(RError.Message.GENERIC, "'" + argName + "'" + " is not implemented");
- }
- return value;
- }
-
private static class FileMatcher implements BiPredicate<Path, BasicFileAttributes> {
final Pattern pattern;
final boolean includeDirs;
--
GitLab