From 699831e44caf5a23fa7c1b19d6e78a022f1c72d9 Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Thu, 21 Jul 2016 18:25:20 -0700
Subject: [PATCH] checkstyle/copyright fixes
---
.../src/com/oracle/truffle/r/engine/shell/REmbedded.java | 2 ++
.../src/com/oracle/truffle/r/library/utils/ObjectSize.java | 2 +-
com.oracle.truffle.r.native/fficall/src/jni/Parse.c | 2 +-
com.oracle.truffle.r.native/run/Rclasspath.sh | 2 +-
com.oracle.truffle.r.native/run/Rscript.sh | 2 +-
.../com/oracle/truffle/r/runtime/ffi/jnr/CallRFFIHelper.java | 2 ++
.../src/com/oracle/truffle/r/runtime/RErrorHandling.java | 2 +-
.../src/com/oracle/truffle/r/runtime/ROptions.java | 2 +-
.../src/com/oracle/truffle/r/runtime/RStartParams.java | 2 +-
.../src/com/oracle/truffle/r/runtime/ffi/DLL.java | 2 +-
mx.fastr/copyrights/overrides | 2 ++
11 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/REmbedded.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/REmbedded.java
index 7f43430349..ef6a876f10 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/REmbedded.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/REmbedded.java
@@ -113,6 +113,8 @@ public class REmbedded {
runRmainloop(vm);
}
+ // Checkstyle: stop method name check
+
/**
* Upcalled from embedded mode to commit suicide.
*/
diff --git a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/utils/ObjectSize.java b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/utils/ObjectSize.java
index 54aa2160fa..5b4d80c96f 100644
--- a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/utils/ObjectSize.java
+++ b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/utils/ObjectSize.java
@@ -206,7 +206,7 @@ public abstract class ObjectSize extends RExternalBuiltinNode.Arg1 {
return size;
}
- protected static abstract class RecursiveObjectSize extends TruffleBoundaryNode {
+ protected abstract static class RecursiveObjectSize extends TruffleBoundaryNode {
protected abstract int executeInt(Object o);
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/Parse.c b/com.oracle.truffle.r.native/fficall/src/jni/Parse.c
index 921d6836dc..4727c2cba0 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/Parse.c
+++ b/com.oracle.truffle.r.native/fficall/src/jni/Parse.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
diff --git a/com.oracle.truffle.r.native/run/Rclasspath.sh b/com.oracle.truffle.r.native/run/Rclasspath.sh
index 01ca8dd60d..1c01496f42 100644
--- a/com.oracle.truffle.r.native/run/Rclasspath.sh
+++ b/com.oracle.truffle.r.native/run/Rclasspath.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 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
diff --git a/com.oracle.truffle.r.native/run/Rscript.sh b/com.oracle.truffle.r.native/run/Rscript.sh
index 527369554d..863b98abf2 100755
--- a/com.oracle.truffle.r.native/run/Rscript.sh
+++ b/com.oracle.truffle.r.native/run/Rscript.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, 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
diff --git a/com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/jnr/CallRFFIHelper.java b/com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/jnr/CallRFFIHelper.java
index eb85de68ba..de33418f4c 100644
--- a/com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/jnr/CallRFFIHelper.java
+++ b/com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/jnr/CallRFFIHelper.java
@@ -1264,6 +1264,8 @@ public class CallRFFIHelper {
return RRNG.unifRand();
}
+ // Checkstyle: stop method name check
+
public static Object R_getGlobalFunctionContext() {
if (RFFIUtils.traceEnabled()) {
RFFIUtils.traceUpCall("getGlobalFunctionContext");
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RErrorHandling.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RErrorHandling.java
index 1721878f20..911a09d829 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RErrorHandling.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RErrorHandling.java
@@ -163,7 +163,7 @@ public class RErrorHandling {
}
}
- public static class HandlerStacks {
+ public static final class HandlerStacks {
public final Object handlerStack;
public final Object restartStack;
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ROptions.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ROptions.java
index 750ce81392..012d2a4f2a 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ROptions.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ROptions.java
@@ -132,7 +132,7 @@ public class ROptions {
}
/**
- * S compatibility - pair list of the options
+ * S compatibility - pair list of the options.
*/
private static final String DOT_OPTIONS = ".Options";
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RStartParams.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RStartParams.java
index 1770a5527f..282508c41e 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RStartParams.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RStartParams.java
@@ -44,7 +44,7 @@ public class RStartParams {
private String userName;
- private SA_TYPE(String userName) {
+ SA_TYPE(String userName) {
this.userName = userName;
}
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/DLL.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/DLL.java
index c4f62ef285..28b50af8c8 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/DLL.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/DLL.java
@@ -110,7 +110,7 @@ public class DLL {
}
- public static class DLLInfo {
+ public static final class DLLInfo {
private static final RStringVector NAMES = RDataFactory.createStringVector(new String[]{"name", "path", "dynamicLookup", "handle", "info"}, RDataFactory.COMPLETE_VECTOR);
public static final String DLL_INFO_REFERENCE = "DLLInfoReference";
private static final RStringVector INFO_REFERENCE_CLASS = RDataFactory.createStringVectorFromScalar(DLL_INFO_REFERENCE);
diff --git a/mx.fastr/copyrights/overrides b/mx.fastr/copyrights/overrides
index b604630604..573f4ba770 100644
--- a/mx.fastr/copyrights/overrides
+++ b/mx.fastr/copyrights/overrides
@@ -56,6 +56,7 @@ com.oracle.truffle.r.native/fficall/src/common/arithmetic_fastr.c,gnu_r_gentlema
com.oracle.truffle.r.native/fficall/src/common/coerce_fastr.c,gnu_r_gentleman_ihaka.copyright
com.oracle.truffle.r.native/fficall/src/common/errors_fastr.c,gnu_r.core.copyright
com.oracle.truffle.r.native/fficall/src/common/inlined_fastr.c,gnu_r_gentleman_ihaka.copyright
+com.oracle.truffle.r.native/fficall/src/common/localecharset_fastr.c,gnu_r.copyright
com.oracle.truffle.r.native/fficall/src/common/print_fastr.c,gnu_r_gentleman_ihaka.copyright
com.oracle.truffle.r.native/fficall/src/common/printutils_fastr.c,gnu_r_gentleman_ihaka.copyright
com.oracle.truffle.r.native/fficall/src/common/sys_fastr.c,gnu_r.copyright
@@ -106,6 +107,7 @@ com.oracle.truffle.r.native/library/tools/src/gramRd.c,no.copyright
com.oracle.truffle.r.native/library/tools/src/tools_dummy.c,no.copyright
com.oracle.truffle.r.native/library/utils/src/utils_dummy.c,no.copyright
com.oracle.truffle.r.native/run/R.sh,oracle_bash.copyright
+com.oracle.truffle.r.native/run/Rclasspath.sh,oracle_bash.copyright
com.oracle.truffle.r.native/run/Rscript_exec.sh,oracle_bash.copyright
com.oracle.truffle.r.native/run/Rscript.sh,oracle_bash.copyright
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastrDqrls.java,gnu_r.copyright
--
GitLab