run clang-format to order includes, fix include ordering errors

targets/java/include/java/Arrays.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <vector>
 #include <cassert>
 #include <cstdint>
+#include <vector>
 
 class Biome;
 

targets/java/include/java/Exceptions.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <string>
 #include <exception>
+#include <string>
 
 class EOFException : public std::exception {};
 

targets/java/include/java/File.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <string>
 #include <cstdint>
+#include <string>
 #include <vector>
 
 // 4J Stu - Represents java standard library class

targets/java/include/java/InputOutputStream/BufferedOutputStream.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <stdint.h>
-#include <vector>
+
 #include <cstdint>
 #include <vector>
 

targets/java/include/java/InputOutputStream/BufferedReader.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "Reader.h"
-
 #include <string>
 
+#include "Reader.h"
+
 class BufferedReader : public Reader {
 private:
     Reader* reader;

targets/java/include/java/InputOutputStream/ByteArrayInputStream.h

@@ -1,8 +1,8 @@
 #pragma once
 // 4J Stu - Represents Java standard library class
 
-#include <vector>
 #include <cstdint>
+#include <vector>
 
 #include "InputStream.h"
 

targets/java/include/java/InputOutputStream/ByteArrayOutputStream.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "OutputStream.h"
-
-#include <vector>
 #include <cstdint>
+#include <vector>
+
+#include "OutputStream.h"
 
 class ByteArrayOutputStream : public OutputStream {
     // Note - when actually implementing, std::vector<uint8_t> will need to grow

targets/java/include/java/InputOutputStream/DataInput.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <vector>
-#include <string>
 #include <cstdint>
+#include <string>
+#include <vector>
 
 class DataInput {
 public:

targets/java/include/java/InputOutputStream/DataInputStream.h

@@ -2,11 +2,11 @@
 // 4J Stu - Represents Java standard library class (although we miss out an
 // intermediate inheritance class that we don't care about)
 
-#include <string>
 #include <cstdint>
+#include <string>
 
-#include "InputStream.h"
 #include "DataInput.h"
+#include "InputStream.h"
 
 class DataInputStream : public InputStream, public DataInput {
 private:

targets/java/include/java/InputOutputStream/DataOutput.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <vector>
-#include <string>
 #include <cstdint>
+#include <string>
+#include <vector>
 
 class DataOutput {
 public:

targets/java/include/java/InputOutputStream/DataOutputStream.h

@@ -4,8 +4,8 @@
 
 #include <string>
 
-#include "OutputStream.h"
 #include "DataOutput.h"
+#include "OutputStream.h"
 
 class DataOutputStream : public OutputStream, public DataOutput {
 private:

targets/java/include/java/InputOutputStream/FileInputStream.h

@@ -1,8 +1,8 @@
 #pragma once
 // 4J Stu - Represents Java standard library class
 
-#include <cstdio>
 #include <cstdint>
+#include <cstdio>
 
 #include "InputStream.h"
 

targets/java/include/java/InputOutputStream/InputOutputStream.h

@@ -1,20 +1,18 @@
 #pragma once
 
-#include "InputStream.h"
+#include "BufferedOutputStream.h"
+#include "BufferedReader.h"
 #include "ByteArrayInputStream.h"
+#include "ByteArrayOutputStream.h"
 #include "DataInput.h"
 #include "DataInputStream.h"
-#include "FileInputStream.h"
-#include "GZIPInputStream.h"
-
-#include "OutputStream.h"
-#include "ByteArrayOutputStream.h"
 #include "DataOutput.h"
-#include "BufferedOutputStream.h"
 #include "DataOutputStream.h"
+#include "FileInputStream.h"
 #include "FileOutputStream.h"
+#include "GZIPInputStream.h"
 #include "GZIPOutputStream.h"
-
-#include "Reader.h"
-#include "BufferedReader.h"
-#include "InputStreamReader.h"
+#include "InputStream.h"
+#include "InputStreamReader.h"
+#include "OutputStream.h"
+#include "Reader.h"

targets/java/include/java/InputOutputStream/InputStream.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <vector>
 #include <cstdint>
 #include <string>
+#include <vector>
 
 // 4J Stu - Represents Java standard lib abstract
 

targets/java/include/java/InputOutputStream/InputStreamReader.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Reader.h"
 #include "DataInputStream.h"
+#include "Reader.h"
 
 class InputStream;
 

targets/java/include/java/InputOutputStream/OutputStream.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <vector>
 #include <cstdint>
+#include <vector>
 
 // 4J Stu - Represents Java standard lib abstract
 

targets/java/include/java/JavaIntHash.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "java/Class.h"
-
 #include <cstdint>
 
+#include "java/Class.h"
+
 // Java doesn't have a default hash value for ints, however, the hashmap itself
 // does some "supplemental" hashing, so our ints actually get hashed by code as
 // implemented below. std templates *do* have a standard hash for ints, but it

targets/java/include/java/System.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <cstdint>
-#include <vector>
 #include <algorithm>
-#include <cstring>
 #include <cassert>
+#include <cstdint>
+#include <cstring>
+#include <vector>
 
 class Biome;
 class Node;

targets/java/src/Buffer.cpp

@@ -1,4 +1,5 @@
 #include "java/Buffer.h"
+
 #include <cassert>
 
 Buffer::Buffer(unsigned int capacity)

targets/java/src/ByteBuffer.cpp

@@ -1,14 +1,16 @@
 
+#include "java/ByteBuffer.h"
+
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>
+
 #include <algorithm>
 #include <vector>
 
-#include "java/IntBuffer.h"
-#include "java/FloatBuffer.h"
-#include "java/ByteBuffer.h"
 #include "java/Buffer.h"
+#include "java/FloatBuffer.h"
+#include "java/IntBuffer.h"
 
 ByteBuffer::ByteBuffer(unsigned int capacity) : Buffer(capacity) {
     hasBackingArray = false;

targets/java/src/Color.cpp

@@ -1,8 +1,8 @@
+#include "java/Color.h"
+
 #include <cassert>
 #include <cmath>
 
-#include "java/Color.h"
-
 // Creates an opaque sRGB color with the specified red, green, and blue values
 // in the range (0.0 - 1.0). Alpha is defaulted to 1.0. The actual color used in
 // rendering depends on finding the best match given the color space available

targets/java/src/File.cpp

@@ -1,16 +1,18 @@
+#include "java/File.h"
+
 #include <stdint.h>
 #include <stdio.h>
 #include <unistd.h>
+
 #include <chrono>
 #include <filesystem>
 #include <string>
 #include <system_error>
 #include <vector>
 
-#include "java/FileFilter.h"
-#include "java/File.h"
 #include "console_helpers/PathHelper.h"     // 4jcraft TODO
 #include "console_helpers/StringHelpers.h"  // 4jcraft TODO
+#include "java/FileFilter.h"
 
 const wchar_t File::pathSeparator = L'/';
 

targets/java/src/InputOutputStream/BufferedReader.cpp

@@ -1,7 +1,7 @@
 #include "java/InputOutputStream/BufferedReader.h"
 
-#include <cstring>
 #include <cassert>
+#include <cstring>
 
 // Creates a buffering character-input stream that uses a default-sized input
 // buffer. Parameters: in - A Reader

targets/java/src/InputOutputStream/ByteArrayInputStream.cpp

@@ -5,13 +5,14 @@
 // mark is set to the specified offset. Parameters: buf - the input buffer.
 // offset - the offset in the buffer of the first byte to read.
 // length - the maximum number of bytes to read from the buffer.
+#include "java/InputOutputStream/ByteArrayInputStream.h"
+
 #include <stdint.h>
+
 #include <algorithm>
 #include <cstring>
 #include <vector>
 
-#include "java/InputOutputStream/ByteArrayInputStream.h"
-
 ByteArrayInputStream::ByteArrayInputStream(std::vector<uint8_t>& buf,
                                            unsigned int offset,
                                            unsigned int length)

targets/java/src/InputOutputStream/ByteArrayOutputStream.cpp

@@ -1,6 +1,7 @@
 #include "java/InputOutputStream/ByteArrayOutputStream.h"
 
 #include <assert.h>
+
 #include <algorithm>
 #include <cstring>
 

targets/java/src/InputOutputStream/DataInputStream.cpp

@@ -1,10 +1,12 @@
+#include "java/InputOutputStream/DataInputStream.h"
+
 #include <stdio.h>
+
 #include <bit>
 #include <cstdint>
 #include <string>
 #include <vector>
 
-#include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/InputStream.h"
 
 // Creates a DataInputStream that uses the specified underlying InputStream.

targets/java/src/InputOutputStream/DataOutputStream.cpp

@@ -1,10 +1,12 @@
+#include "java/InputOutputStream/DataOutputStream.h"
+
 #include <stdio.h>
+
 #include <bit>
 #include <cstdint>
 #include <string>
 #include <vector>
 
-#include "java/InputOutputStream/DataOutputStream.h"
 #include "java/InputOutputStream/OutputStream.h"
 
 // Creates a new data output stream to write data to the specified underlying

targets/java/src/InputOutputStream/FileInputStream.cpp

@@ -1,15 +1,17 @@
 
+#include "java/InputOutputStream/FileInputStream.h"
+
 #include <assert.h>
 #include <sys/types.h>
+
 #include <algorithm>
 #include <cstdint>
 #include <cstdio>
 #include <string>
 #include <vector>
 
-#include "java/File.h"
-#include "java/InputOutputStream/FileInputStream.h"
 #include "console_helpers/StringHelpers.h"
+#include "java/File.h"
 
 namespace {
 int64_t FileTell(std::FILE* file) {

targets/java/src/InputOutputStream/FileOutputStream.cpp

@@ -1,11 +1,11 @@
+#include "java/InputOutputStream/FileOutputStream.h"
+
 #include <cassert>
 #include <cstdint>
 #include <vector>
 
-#include "java/File.h"
-#include "java/InputOutputStream/FileOutputStream.h"
-
 #include "console_helpers/StringHelpers.h"  // 4jcraft TODO
+#include "java/File.h"
 
 // Creates a file output stream to write to the file represented by the
 // specified File object. A new FileDescriptor object is created to represent

targets/java/src/InputOutputStream/InputStream.cpp

@@ -1,7 +1,8 @@
+#include "java/InputOutputStream/InputStream.h"
+
 #include <string>
 
 #include "java/File.h"
-#include "java/InputOutputStream/InputStream.h"
 #include "java/InputOutputStream/FileInputStream.h"
 
 InputStream* InputStream::getResourceAsStream(const std::wstring& fileName) {

targets/java/src/InputOutputStream/InputStreamReader.cpp

@@ -1,6 +1,7 @@
-#include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/InputStreamReader.h"
 
+#include "java/InputOutputStream/DataInputStream.h"
+
 class InputStream;
 
 // Creates an InputStreamReader that uses the default charset.

targets/java/src/IntBuffer.cpp

@@ -2,6 +2,7 @@
 
 #include <assert.h>
 #include <string.h>
+
 #include <algorithm>
 
 #include "java/Buffer.h"

targets/java/src/Random.cpp

@@ -1,10 +1,10 @@
-#include <cassert>
-#include <cmath>
-#include <chrono>
-#include <cstdint>  // for int64_t
-
 #include "java/Random.h"
 
+#include <cassert>
+#include <chrono>
+#include <cmath>
+#include <cstdint>  // for int64_t
+
 Random::Random() {
     // 4J - jave now uses the system nanosecond counter added to a
     // "seedUniquifier" to get an initial seed. Our nanosecond timer is actually

targets/java/src/system.cpp

@@ -1,12 +1,12 @@
-#include <chrono>
+#include "java/System.h"
 
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>
-#include <algorithm>
-#include <vector>
 
-#include "java/System.h"
+#include <algorithm>
+#include <chrono>
+#include <vector>
 
 class Biome;
 class Node;