Added a prettyprinter test case with some exotic java constructs, and fixed a few bugs involving these. Also removed the old pretty printer.

2 files changed, 91 insertions, 0 deletions

diff --git a/test/pretty/resource/after/ExoticJava.java b/test/pretty/resource/after/ExoticJava.java
new file mode 100644
index 00000000..fb9a9131
--- /dev/null
+++ b/test/pretty/resource/after/ExoticJava.java
@@ -0,0 +1,46 @@
+import static java.lang.String.*;
+import java.io.*;
+class ExoticJava<V> {
+	public <T> ExoticJava(T genericsInConstructor, V genericsInType) {
+		System.out.println(new <String>ExoticJava<Integer>("Hello", 5));
+	}
+	public void test() {
+		int x = 5;
+		int[] y = {10};
+		;
+		class MethodLocal implements Serializable, java.util.RandomAccess {
+			@SuppressWarnings({"unchecked", "rawtypes"})
+			public final strictfp int foo() {
+				int x = super.hashCode();
+				x <<= 5;
+				do {
+					x <<= 5;
+				} while (Boolean.FALSE);
+				return x;
+			}
+		}
+		for (int i = 10, j[] = {20}; i < 5; i++, j[0]++) {
+			String z = "";
+			try (
+				PrintWriter pw = new PrintWriter(System.out);
+				PrintWriter p2 = new PrintWriter(System.out)) {
+				pw.println();
+			} finally {
+				synchronized (z) {
+					System.out.println(z);
+				}
+			}
+			if ((y == null)) {
+			}
+			if (((y == null))) ;
+			{
+				;
+			}
+			java.util.List<String> list = new java.util.ArrayList<>();
+			assert Boolean.TRUE : "That\'s weird";
+			double d = -1.8E12;
+			long loooong = 305441741;
+			int octal = 87;
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/pretty/resource/before/ExoticJava.java b/test/pretty/resource/before/ExoticJava.java
new file mode 100644
index 00000000..b70b1e12
--- /dev/null
+++ b/test/pretty/resource/before/ExoticJava.java
@@ -0,0 +1,45 @@
+import static java.lang.String.*;
+
+import java.io.*;
+
+class ExoticJava<V> {
+	public <T> ExoticJava(T genericsInConstructor, V genericsInType) {
+		System.out.println(new <String>ExoticJava<Integer>("Hello", 5));
+	}
+	;;;;
+	public void test() {
+		int x = 5, y[] = {10};
+		;
+		class MethodLocal implements Serializable, java.util.RandomAccess {
+			@SuppressWarnings({"unchecked", "rawtypes"})
+			strictfp public final int foo() {
+				int x = super.hashCode();
+				x <<= 5;
+				do {
+					x <<= 5;
+				} while (Boolean.FALSE);
+				return x;
+			}
+		}
+		
+		for (int i = 10, j[] = {20}; i < 5; i++, j[0]++) {
+			String z = "";
+			try (PrintWriter pw = new PrintWriter(System.out); PrintWriter p2 = new PrintWriter(System.out)) {
+				pw.println();
+			} finally {
+				synchronized (z) {
+					System.out.println(z);
+				}
+			}
+			
+			if ((y == null)) {}
+			if (((y == null))) ;
+			{;}
+			java.util.List<String> list = new java.util.ArrayList<>();
+			assert Boolean.TRUE : "That's weird";
+			double d = -1.8e12;
+			long loooong = 0x1234ABCD;
+			int octal = 0127;
+		}
+	}
+}
\ No newline at end of file