Formatting

ppisl · ppisl · commit 00993c223ec2 · 2019-03-05T12:27:28.000+01:00
diff --git a/graalpython/com.oracle.graal.python.shell/.checkstyle b/graalpython/com.oracle.graal.python.shell/.checkstyle
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fileset-config file-format-version="1.2.0" simple-config="false">
+  <local-check-config description="" location="/com.oracle.graal.python/.checkstyle_checks.xml" name="Checks" type="project">
+    <additional-data name="protect-config-file" value="false"/>
+  </local-check-config>
+  <fileset check-config-name="Checks" enabled="true" local="true" name="all">
+    <file-match-pattern include-pattern="true" match-pattern=".*\.java$"/>
+    <file-match-pattern include-pattern="false" match-pattern="src_gen/.*"/>
+    <file-match-pattern include-pattern="false" match-pattern="/package-info.java$"/>
+  </fileset>
+</fileset-config>
diff --git a/graalpython/com.oracle.graal.python.tck/.checkstyle b/graalpython/com.oracle.graal.python.tck/.checkstyle
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fileset-config file-format-version="1.2.0" simple-config="false">
+  <local-check-config description="" location="/com.oracle.graal.python/.checkstyle_checks.xml" name="Checks" type="project">
+    <additional-data name="protect-config-file" value="false"/>
+  </local-check-config>
+  <fileset check-config-name="Checks" enabled="true" local="true" name="all">
+    <file-match-pattern include-pattern="true" match-pattern=".*\.java$"/>
+    <file-match-pattern include-pattern="false" match-pattern="src_gen/.*"/>
+    <file-match-pattern include-pattern="false" match-pattern="/package-info.java$"/>
+  </fileset>
+</fileset-config>
diff --git a/graalpython/com.oracle.graal.python.test/.checkstyle b/graalpython/com.oracle.graal.python.test/.checkstyle
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fileset-config file-format-version="1.2.0" simple-config="false">
+  <local-check-config description="" location="/com.oracle.graal.python/.checkstyle_checks.xml" name="Checks" type="project">
+    <additional-data name="protect-config-file" value="false"/>
+  </local-check-config>
+  <fileset check-config-name="Checks" enabled="true" local="true" name="all">
+    <file-match-pattern include-pattern="true" match-pattern=".*\.java$"/>
+    <file-match-pattern include-pattern="false" match-pattern="src_gen/.*"/>
+    <file-match-pattern include-pattern="false" match-pattern="/package-info.java$"/>
+  </fileset>
+</fileset-config>
diff --git a/graalpython/com.oracle.graal.python/.checkstyle b/graalpython/com.oracle.graal.python/.checkstyle
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fileset-config file-format-version="1.2.0" simple-config="false">
+  <local-check-config description="" location="/com.oracle.graal.python/.checkstyle_checks.xml" name="Checks" type="project">
+    <additional-data name="protect-config-file" value="false"/>
+  </local-check-config>
+  <fileset check-config-name="Checks" enabled="true" local="true" name="all">
+    <file-match-pattern include-pattern="true" match-pattern=".*\.java$"/>
+    <file-match-pattern include-pattern="false" match-pattern="src_gen/.*"/>
+    <file-match-pattern include-pattern="false" match-pattern="/package-info.java$"/>
+  </fileset>
+</fileset-config>
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java
@@ -1290,9 +1290,8 @@ abstract static class SystemNode extends PythonBuiltinNode {
         static {
             String osProperty = System.getProperty("os.name");
             shell = osProperty != null && osProperty.toLowerCase(Locale.ENGLISH).startsWith("windows") ? new String[]{"cmd.exe", "/c"}
-                        : new String[]{(System.getenv().getOrDefault("SHELL", "sh")), "-c"};
+                            : new String[]{(System.getenv().getOrDefault("SHELL", "sh")), "-c"};
         }
-            
 
         static class PipePump extends Thread {
             private static final int MAX_READ = 8192;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/PByteArray.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/PByteArray.java
@@ -81,11 +81,10 @@ public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        PByteArray other = (PByteArray)obj;
+        PByteArray other = (PByteArray) obj;
         return Arrays.equals(store.getInternalArray(), other.store.getInternalArray());
     }
 
-    
     @Override
     public final int hashCode() {
         return Arrays.hashCode(store.getInternalArray());
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/EconomicMapStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/EconomicMapStorage.java
@@ -59,15 +59,15 @@
  *
  * When the hash table needs to be constructed, the field {@link #hashArray} becomes a new hash
  * array where an entry of 0 means no hit and otherwise denotes the entry number in the
- * {@link #entriesArr} array. The hash array is interpreted as an actual byte array if the indices fit
- * within 8 bit, or as an array of short values if the indices fit within 16 bit, or as an array of
- * integer values in other cases.
+ * {@link #entriesArr} array. The hash array is interpreted as an actual byte array if the indices
+ * fit within 8 bit, or as an array of short values if the indices fit within 16 bit, or as an array
+ * of integer values in other cases.
  *
  * Hash collisions are handled by chaining a linked list of {@link CollisionLink} objects that take
  * the place of the values in the {@link #entriesArr} array.
  *
- * Removing entries will put {@code null} into the {@link #entriesArr} array. If the occupation of the
- * map falls below a specific threshold, the map will be compressed via the
+ * Removing entries will put {@code null} into the {@link #entriesArr} array. If the occupation of
+ * the map falls below a specific threshold, the map will be compressed via the
  * {@link #maybeCompress(int, Equivalence)} method.
  */
 public class EconomicMapStorage extends HashingStorage implements Iterable<Object> {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/floats/FloatBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/floats/FloatBuiltins.java
@@ -620,7 +620,7 @@ public abstract static class HexNode extends PythonBuiltinNode {
 
         @TruffleBoundary
         private static String makeHexNumber(double value) {
-            
+
             if (Double.isNaN(value)) {
                 return "nan";
             } else if (Double.POSITIVE_INFINITY == value) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/slice/PSlice.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/slice/PSlice.java
@@ -95,15 +95,15 @@ public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        PSlice other = (PSlice)obj;
+        PSlice other = (PSlice) obj;
         return (this.start == other.start && this.stop == other.stop && this.step == other.step);
     }
 
     @Override
     public int hashCode() {
         return Objects.hash(this.start, this.stop, this.step);
     }
-    
+
     @ValueType
     public static final class SliceInfo {
         public final int start;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/zipimporter/PZipImporter.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/zipimporter/PZipImporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -200,7 +200,7 @@ protected String makePackagePath(String fullname) {
      */
     @CompilerDirectives.TruffleBoundary
     private String getCode(String filenameAndSuffix) {
-        ZipFile zip = null; 
+        ZipFile zip = null;
         try {
             zip = new ZipFile(archive);
             ZipEntry entry = zip.getEntry(filenameAndSuffix);
@@ -223,10 +223,10 @@ private String getCode(String filenameAndSuffix) {
                 try {
                     zip.close();
                 } catch (IOException e) {
-                    // just ignore it. 
+                    // just ignore it.
                 }
             }
-        } 
+        }
     }
 
     /**
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/zipimporter/ZipImporterBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/zipimporter/ZipImporterBuiltins.java
@@ -347,10 +347,10 @@ public PBytes doit(PZipImporter self, String pathname) {
                     try {
                         zip.close();
                     } catch (IOException e) {
-                        // just ignore it. 
+                        // just ignore it.
                     }
                 }
-            }   
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -81,11 +81,10 @@ public boolean equals(Object obj) {`
`81`	`81`	`if (this == obj) {`
`82`	`82`	`return true;`
`83`	`83`	`}`
`84`		`- PByteArray other = (PByteArray)obj;`
	`84`	`+ PByteArray other = (PByteArray) obj;`
`85`	`85`	`return Arrays.equals(store.getInternalArray(), other.store.getInternalArray());`
`86`	`86`	`}`
`87`	`87`
`88`		`-`
`89`	`88`	`@Override`
`90`	`89`	`public final int hashCode() {`
`91`	`90`	`return Arrays.hashCode(store.getInternalArray());`
Original file line number	Diff line number	Diff line change
`@@ -95,15 +95,15 @@ public boolean equals(Object obj) {`
`95`	`95`	`if (this == obj) {`
`96`	`96`	`return true;`
`97`	`97`	`}`
`98`		`- PSlice other = (PSlice)obj;`
	`98`	`+ PSlice other = (PSlice) obj;`
`99`	`99`	`return (this.start == other.start && this.stop == other.stop && this.step == other.step);`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`@Override`
`103`	`103`	`public int hashCode() {`
`104`	`104`	`return Objects.hash(this.start, this.stop, this.step);`
`105`	`105`	`}`
`106`		`-`
	`106`	`+`
`107`	`107`	`@ValueType`
`108`	`108`	`public static final class SliceInfo {`
`109`	`109`	`public final int start;`