Fix style

(cherry picked from commit c513606)

Author: Pavel Marek

com.oracle.truffle.r.native/fficall/src/truffle_nfi/rffiutils.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@ void *unimplemented(const char *f) {
 }
 
 void fatalError(const char *msg) {
-	printf("faatal error %s\n", msg);
+	printf("fatal error %s\n", msg);
     exit(1);
 }
 

com.oracle.truffle.r.nodes.test/src/com/oracle/truffle/r/nodes/test/PCRE2Tests.java

@@ -162,11 +162,16 @@ void insertChildren(Node[] children) {
 
         @Override
         public Object execute(VirtualFrame frame) {
-            return null;
+            throw new AssertionError("should not reach here");
         }
     }
 
+    /**
+     * Expected data roughly corresponds to the output of some regular expression tester, like
+     * <a href="https://regex101.com/">regex101</a>.
+     */
     // @formatter:off
+    // Checkstyle: stop
     @DataPoints
     public static TestData[] testData = {
             TestData.builder().pattern("X").subject("aaa").expectedMatchIndexes(new int[]{}).build(),
@@ -255,6 +260,7 @@ public Object execute(VirtualFrame frame) {
                     .build(),
     };
     // @formatter:on
+    // Checkstyle: resume
 
     @Before
     public void init() {
@@ -265,6 +271,8 @@ public void init() {
             captureNamesNode = RFFIFactory.getPCRE2RFFI().createGetCaptureNamesNode();
             captureCountNode = RFFIFactory.getPCRE2RFFI().createGetCaptureCountNode();
             interop = InteropLibrary.getUncached();
+            // Some of the nodes that we initialize in this method have to be adopted. Therefore,
+            // we adopt them into this artificial root node.
             testRootNode = new TestRootNode();
             testRootNode.insertChildren(new Node[]{compileNode, matchNode, memoryReleaseNode, captureNamesNode, captureCountNode});
             return null;

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/PCRE2RFFI.java

@@ -26,7 +26,6 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.TruffleLogger;
-import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.TruffleObject;
@@ -419,10 +418,10 @@ public CompileResult execute(String pattern, int options) {
             int[] errorCode = new int[]{0};
             int[] errorOffSet = new int[]{-1};
             // We want to enable UTF-based matching by default.
-            options |= Option.UTF.value;
+            int optionsWithUTF = options | Option.UTF.value;
             byte[] patternBytes = pattern.getBytes(StandardCharsets.UTF_8);
             NativeCharArray patternCharArray = new NativeCharArray(patternBytes);
-            Object pcreCode = call(NativeFunction.compile, patternCharArray, patternBytes.length, options, errorCode, errorOffSet);
+            Object pcreCode = call(NativeFunction.compile, patternCharArray, patternBytes.length, optionsWithUTF, errorCode, errorOffSet);
             String errorMessage = null;
             if (interop.isNull(pcreCode)) {
                 assert errorOffSet[0] >= 0;

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/interop/NativeCharArray.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,14 +34,13 @@
  * A {@link TruffleObject} that represents an array of {@code unsigned char} values, that is
  * {@code NULL} terminated in the C domain.
  *
- * Note that {@link #getArrayLength()} returns effective length, which means that the length
- * also includes the terminating null.
+ * Note that {@link #getArrayLength()} returns effective length, which means that the length also
+ * includes the terminating null.
  *
- * Beware of using {@code strlen} on instances of this
- * class, as it will return different results on LLVM and on NFI (on LLVM, the return value
- * will include the terminating null). If you plan to use an instance of this class as string
- * in native code, pass along the length of the string to the native, do not compute it in
- * the native code via {@code strlen}.
+ * Beware of using {@code strlen} on instances of this class, as it will return different results on
+ * LLVM and on NFI (on LLVM, the return value will include the terminating null). If you plan to use
+ * an instance of this class as string in native code, pass along the length of the string to the
+ * native, do not compute it in the native code via {@code strlen}.
  */
 @ExportLibrary(InteropLibrary.class)
 public final class NativeCharArray extends NativeUInt8Array {

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/interop/NativeUInt8Array.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

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

@@ -35618,7 +35618,7 @@ In gsub("a", "aa", "prAgue alley", fixed = TRUE, ignore.case = TRUE) :
 [1] "R Line 2"
 
 
-##com.oracle.truffle.r.test.builtins.TestBuiltin_gsub.testGsubPCRE#Ignored.ImplementationError#
+##com.oracle.truffle.r.test.builtins.TestBuiltin_gsub.testGsubPCRE#
 #{ gsub('([⚽])', '\\1', '─', perl=TRUE)} 
 [1] "─"
 
@@ -35658,7 +35658,7 @@ In gsub("a", "aa", "prAgue alley", fixed = TRUE, ignore.case = TRUE) :
 #{ gsub(pattern = 'a*', replacement = 'x', x = 'ÄaÄ', perl = TRUE) }
 [1] "xÄxÄx"
 
-##com.oracle.truffle.r.test.builtins.TestBuiltin_gsub.testGsubPCRE#Ignored.ImplementationError#
+##com.oracle.truffle.r.test.builtins.TestBuiltin_gsub.testGsubPCRE#
 #{ gsub(pattern = 'Ä*', replacement = 'x', x = 'aÄÄÄÄÄb', perl = TRUE) }
 [1] "xaxbx"
 
@@ -84952,7 +84952,7 @@ Error: invalid 'pattern' argument
 #{ sub(pattern = 'a*', replacement = 'x', x = 'ÄaÄ', perl = TRUE) }
 [1] "xÄaÄ"
 
-##com.oracle.truffle.r.test.builtins.TestBuiltin_sub.testSub#Ignored.ImplementationError#
+##com.oracle.truffle.r.test.builtins.TestBuiltin_sub.testSub#
 #{ sub(pattern = 'Ä*', replacement = 'x', x = 'aÄÄÄÄÄb', perl = TRUE) }
 [1] "xaÄÄÄÄÄb"
 

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_sub.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, 2021, Oracle and/or its affiliates
  *
  * All rights reserved.
  */