Version bump to 1.4.0-SNAPSHOT.

Rewrite build system to use gradle.
Clean up source for the new generation.

8 files changed, 0 insertions, 447 deletions

diff --git a/src/tests/org/anarres/cpp/BaseTestCase.java b/src/tests/org/anarres/cpp/BaseTestCase.java
deleted file mode 100644
index ad6ae6a..0000000
--- a/src/tests/org/anarres/cpp/BaseTestCase.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.anarres.cpp;
-
-import junit.framework.TestCase;
-
-public abstract class BaseTestCase extends TestCase {
-}
diff --git a/src/tests/org/anarres/cpp/CppReaderTestCase.java b/src/tests/org/anarres/cpp/CppReaderTestCase.java
deleted file mode 100644
index df3aeb5..0000000
--- a/src/tests/org/anarres/cpp/CppReaderTestCase.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.anarres.cpp;
-
-import java.util.Collections;
-
-import java.io.StringReader;
-import java.io.BufferedReader;
-
-import junit.framework.Test;
-
-public class CppReaderTestCase extends BaseTestCase implements Test {
-
-	private void testCppReader(String in, String out)
-						throws Exception {
-		System.out.println("Testing " + in + " => " + out);
-		StringReader	r = new StringReader(in);
-		CppReader		p = new CppReader(r);
-		p.getPreprocessor().setSystemIncludePath(
-				Collections.singletonList("src/input")
-					);
-		p.getPreprocessor().getFeatures().add(Feature.LINEMARKERS);
-		BufferedReader	b = new BufferedReader(p);
-
-		String	line;
-		while ((line = b.readLine()) != null) {
-			System.out.println(" >> " + line);
-		}
-	}
-
-	public void testCppReader()
-						throws Exception {
-		testCppReader("#include <test0.h>\n", "ab");
-	}
-
-}
diff --git a/src/tests/org/anarres/cpp/ErrorTestCase.java b/src/tests/org/anarres/cpp/ErrorTestCase.java
deleted file mode 100644
index cec1dc7..0000000
--- a/src/tests/org/anarres/cpp/ErrorTestCase.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.anarres.cpp;
-
-import java.io.*;
-
-import junit.framework.Test;
-
-import static org.anarres.cpp.Token.*;
-
-public class ErrorTestCase extends BaseTestCase {
-
-	private boolean testError(Preprocessor p)
-						throws LexerException,
-								IOException {
-		for (;;) {
-			Token	tok = p.token();
-			if (tok.getType() == EOF)
-				break;
-			if (tok.getType() == INVALID)
-				return true;
-		}
-		return false;
-	}
-
-	private void testError(String input) throws Exception {
-		StringLexerSource		sl;
-		PreprocessorListener	pl;
-		Preprocessor			p;
-
-		/* Without a PreprocessorListener, throws an exception. */
-		sl = new StringLexerSource(input, true);
-		p = new Preprocessor();
-		p.addFeature(Feature.CSYNTAX);
-		p.addInput(sl);
-		try {
-			assertTrue(testError(p));
-			fail("Lexing unexpectedly succeeded without listener.");
-		}
-		catch (LexerException e) {
-			/* required */
-		}
-
-		/* With a PreprocessorListener, records the error. */
-		sl = new StringLexerSource(input, true);
-		p = new Preprocessor();
-		p.addFeature(Feature.CSYNTAX);
-		p.addInput(sl);
-		pl = new PreprocessorListener();
-		p.setListener(pl);
-		assertNotNull("CPP has listener", p.getListener());
-		assertTrue(testError(p));
-		assertTrue("Listener has errors", pl.getErrors() > 0);
-
-		/* Without CSYNTAX, works happily. */
-		sl = new StringLexerSource(input, true);
-		p = new Preprocessor();
-		p.addInput(sl);
-		assertTrue(testError(p));
-	}
-
-	public void testErrors() throws Exception {
-		testError("\"");
-		testError("'");
-		// testError("''");
-	}
-
-}
diff --git a/src/tests/org/anarres/cpp/JavaFileSystemTestCase.java b/src/tests/org/anarres/cpp/JavaFileSystemTestCase.java
deleted file mode 100644
index 4f68d68..0000000
--- a/src/tests/org/anarres/cpp/JavaFileSystemTestCase.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.anarres.cpp;
-
-import java.io.*;
-
-import junit.framework.Test;
-
-import static org.anarres.cpp.Token.*;
-
-public class JavaFileSystemTestCase extends BaseTestCase {
-
-	public void testJavaFileSystem() throws Exception {
-		JavaFileSystem	fs = new JavaFileSystem();
-		VirtualFile		f;
-
-		/* Anyone who has this file on their Unix box is messed up. */
-		f = fs.getFile("/foo/bar baz");
-		try {
-			f.getSource();	/* drop on floor */
-			assertTrue("Got a source for a non-file", f.isFile());
-		}
-		catch (FileNotFoundException e) {
-			assertFalse("Got no source for a file", f.isFile());
-		}
-
-		/* We hope we have this. */
-		f = fs.getFile("/usr/include/stdio.h");
-		try {
-			f.getSource();	/* drop on floor */
-			System.out.println("Opened stdio.h");
-			assertTrue("Got a source for a non-file", f.isFile());
-		}
-		catch (FileNotFoundException e) {
-			System.out.println("Failed to open stdio.h");
-			assertFalse("Got no source for a file", f.isFile());
-		}
-
-	}
-
-}
diff --git a/src/tests/org/anarres/cpp/JoinReaderTestCase.java b/src/tests/org/anarres/cpp/JoinReaderTestCase.java
deleted file mode 100644
index 6c11449..0000000
--- a/src/tests/org/anarres/cpp/JoinReaderTestCase.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.anarres.cpp;
-
-import java.io.StringReader;
-
-import junit.framework.Test;
-
-public class JoinReaderTestCase extends BaseTestCase implements Test {
-
-	private void testJoinReader(String in, String out, boolean tg)
-						throws Exception {
-		System.out.println("Testing " + in + " => " + out);
-		StringReader	r = new StringReader(in);
-		JoinReader		j = new JoinReader(r, tg);
-
-		for (int i = 0; i < out.length(); i++) {
-			int	c = j.read();
-			System.out.println("At offset " + i + ": " + (char)c);
-			assertEquals((char)out.charAt(i), c);
-		}
-		assertEquals(-1, j.read());
-		assertEquals(-1, j.read());
-	}
-
-	private void testJoinReader(String in, String out)
-						throws Exception {
-		testJoinReader(in, out, true);
-		testJoinReader(in, out, false);
-	}
-
-	public void testJoinReader()
-						throws Exception {
-		testJoinReader("ab", "ab");
-		testJoinReader("a\\b", "a\\b");
-		testJoinReader("a\nb", "a\nb");
-		testJoinReader("a\\\nb", "ab\n");
-		testJoinReader("foo??(bar", "foo[bar", true);
-		testJoinReader("foo??/\nbar", "foobar\n", true);
-	}
-
-}
diff --git a/src/tests/org/anarres/cpp/LexerSourceTestCase.java b/src/tests/org/anarres/cpp/LexerSourceTestCase.java
deleted file mode 100644
index d554814..0000000
--- a/src/tests/org/anarres/cpp/LexerSourceTestCase.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.anarres.cpp;
-
-import java.io.StringReader;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.Test;
-
-import static org.anarres.cpp.Token.*;
-
-public class LexerSourceTestCase extends BaseTestCase implements Test {
-
-	private void testLexerSource(String in, int... out)
-						throws Exception {
-		System.out.println("Testing '" + in + "' => " +
-						Arrays.toString(out));
-		StringLexerSource	s = new StringLexerSource(in);
-
-		int col = 0;
-		for (int i = 0; i < out.length; i++) {
-			Token	tok = s.token();
-			System.out.println("Token is " + tok);
-			assertEquals(out[i], tok.getType());
-			assertEquals(col, tok.getColumn());
-			col += tok.getText().length();
-		}
-		assertEquals(EOF, s.token().getType());
-	}
-
-	public void testLexerSource()
-						throws Exception {
-
-		testLexerSource("int a = 5;",
-			IDENTIFIER, WHITESPACE, IDENTIFIER, WHITESPACE,
-			'=', WHITESPACE, NUMBER, ';', EOF
-		);
-
-		// \n is WHITESPACE because ppvalid = false
-		testLexerSource("# #   \r\n\n\r \rfoo",
-			HASH, WHITESPACE, '#', WHITESPACE, IDENTIFIER
-		);
-
-		testLexerSource("%:%:", PASTE);
-		testLexerSource("%:?", '#', '?');
-		testLexerSource("%:%=", '#', MOD_EQ);
-		testLexerSource("0x1234ffdUL 0765I",
-				NUMBER, WHITESPACE, NUMBER);
-
-		testLexerSource("+= -= *= /= %= <= >= >>= <<= &= |= ^= x",
-			PLUS_EQ, WHITESPACE,
-			SUB_EQ, WHITESPACE,
-			MULT_EQ, WHITESPACE,
-			DIV_EQ, WHITESPACE,
-			MOD_EQ, WHITESPACE,
-			LE, WHITESPACE,
-			GE, WHITESPACE,
-			RSH_EQ, WHITESPACE,
-			LSH_EQ, WHITESPACE,
-			AND_EQ, WHITESPACE,
-			OR_EQ, WHITESPACE,
-			XOR_EQ, WHITESPACE,
-			IDENTIFIER);
-
-		testLexerSource("/**/", CCOMMENT);
-		testLexerSource("/* /**/ */", CCOMMENT, WHITESPACE, '*', '/');
-		testLexerSource("/** ** **/", CCOMMENT);
-		testLexerSource("//* ** **/", CPPCOMMENT);
-		testLexerSource("'\\r' '\\xf' '\\xff' 'x' 'aa' ''",
-			CHARACTER, WHITESPACE,
-			CHARACTER, WHITESPACE,
-			CHARACTER, WHITESPACE,
-			CHARACTER, WHITESPACE,
-			SQSTRING, WHITESPACE,
-			SQSTRING);
-
-		testLexerSource("1i1I1l1L1ui1ul", 
-			NUMBER, NUMBER,
-			NUMBER, NUMBER,
-			NUMBER, NUMBER);
-
-		testLexerSource("'' 'x' 'xx'",
-			SQSTRING, WHITESPACE, CHARACTER, WHITESPACE, SQSTRING);
-	}
-
-}
diff --git a/src/tests/org/anarres/cpp/MainTestCase.java b/src/tests/org/anarres/cpp/MainTestCase.java
deleted file mode 100644
index 313a463..0000000
--- a/src/tests/org/anarres/cpp/MainTestCase.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.anarres.cpp;
-
-import java.io.*;
-
-import junit.framework.Test;
-
-import static org.anarres.cpp.Token.*;
-
-public class MainTestCase extends BaseTestCase {
-
-	public void testMain() throws Exception {
-		Main.main(new String[] { "--version" });
-	}
-
-}
diff --git a/src/tests/org/anarres/cpp/PreprocessorTestCase.java b/src/tests/org/anarres/cpp/PreprocessorTestCase.java
deleted file mode 100644
index 217659a..0000000
--- a/src/tests/org/anarres/cpp/PreprocessorTestCase.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package org.anarres.cpp;
-
-import java.io.*;
-
-import junit.framework.Test;
-
-import static org.anarres.cpp.Token.*;
-
-public class PreprocessorTestCase extends BaseTestCase {
-	private OutputStreamWriter	writer;
-	private Preprocessor		p;
-
-	public void setUp() throws Exception {
-		final PipedOutputStream	po = new PipedOutputStream();
-		writer = new OutputStreamWriter(po);
-
-		p = new Preprocessor();
-		p.addInput(
-			new LexerSource(
-				new InputStreamReader(
-					new PipedInputStream(po)
-				),
-				true
-			)
-		);
-	}
-
-	private static class I {
-		private String	t;
-		public I(String t) {
-			this.t = t;
-		}
-		public String getText() {
-			return t;
-		}
-		public String toString() {
-			return getText();
-		}
-	}
-
-	private static I I(String t) {
-		return new I(t);
-	}
-
-/*
- * When writing tests in this file, remember the preprocessor
- * stashes NLs, so you won't see an immediate NL at the end of any
- * input line. You will see it right before the next nonblank on
- * the following input line.
- */
-
-	public void testPreprocessor() throws Exception {
-		/* Magic macros */
-		testInput("line = __LINE__\n",
-			I("line"), WHITESPACE, '=', WHITESPACE, NUMBER
-			/*, NL - all nls deferred so as not to block the reader */
-		);
-		testInput("file = __FILE__\n", NL,	/* from before, etc */
-			I("file"), WHITESPACE, '=', WHITESPACE, STRING
-		);
-
-		/* Simple definitions */
-		testInput("#define A a /* a defined */\n", NL);
-		testInput("#define B b /* b defined */\n", NL);
-		testInput("#define C c /* c defined */\n", NL);
-
-		/* Expansion of arguments */
-		testInput("#define EXPAND(x) x\n", NL);
-		testInput("EXPAND(a)\n", NL, I("a"));
-		testInput("EXPAND(A)\n", NL, I("a"));
-
-		/* Stringification */
-		testInput("#define _STRINGIFY(x) #x\n", NL);
-		testInput("_STRINGIFY(A)\n", NL, "A");
-		testInput("#define STRINGIFY(x) _STRINGIFY(x)\n", NL);
-		testInput("STRINGIFY(b)\n", NL, "b");
-		testInput("STRINGIFY(A)\n", NL, "a");
-
-		/* Concatenation */
-		testInput("#define _CONCAT(x, y) x ## y\n", NL);
-		testInput("_CONCAT(A, B)\n", NL, I("AB"));
-		testInput("#define A_CONCAT done_a_concat\n", NL);
-		testInput("_CONCAT(A, _CONCAT(B, C))\n", NL,
-			I("done_a_concat"), '(', I("b"), ',', WHITESPACE, I("c"), ')'
-		);
-		testInput("#define CONCAT(x, y) _CONCAT(x, y)\n", NL);
-		testInput("CONCAT(A, CONCAT(B, C))\n", NL, I("abc"));
-		testInput("#define _CONCAT3(x, y, z) x ## y ## z\n", NL);
-		testInput("_CONCAT3(a, b, c)\n", NL, I("abc"));
-		testInput("_CONCAT3(A, B, C)\n", NL, I("ABC"));
-
-/* Redefinitions, undefinitions. */
-testInput("#define two three\n", NL);
-testInput("one /* one */\n", NL, I("one"), WHITESPACE, CCOMMENT);
-testInput("#define one two\n", NL);
-testInput("one /* three */\n", NL, I("three"), WHITESPACE, CCOMMENT);
-testInput("#undef two\n", NL);
-testInput("#define two five\n", NL);
-testInput("one /* five */\n", NL, I("five"), WHITESPACE, CCOMMENT);
-testInput("#undef two\n", NL);
-testInput("one /* two */\n", NL, I("two"), WHITESPACE, CCOMMENT);
-testInput("#undef one\n", NL);
-testInput("#define one four\n", NL);
-testInput("one /* four */\n", NL, I("four"), WHITESPACE, CCOMMENT);
-testInput("#undef one\n", NL);
-testInput("#define one one\n", NL);
-testInput("one /* one */\n", NL, I("one"), WHITESPACE, CCOMMENT);
-
-		/* Variadic macros. */
-		testInput("#define var(x...) a x b\n", NL);
-		testInput("var(e, f, g)\n", NL,
-			I("a"), WHITESPACE,
-			I("e"), ',', WHITESPACE,
-			I("f"), ',', WHITESPACE,
-			I("g"), WHITESPACE,
-			I("b")
-		);
-
-		testInput("#define _Widen(x) L ## x\n", NL);
-		testInput("#define Widen(x) _Widen(x)\n", NL);
-		testInput("#define LStr(x) _Widen(#x)\n", NL);
-		testInput("LStr(x);\n", NL, I("L"), "x");
-
-		writer.close();
-
-		Token	t;
-		do {
-			t = p.token();
-			System.out.println("Remaining token " + t);
-		} while(t.getType() != EOF);
-	}
-
-	private void testInput(String in, Object... out)
-						throws Exception {
-		System.out.print("Input: " + in);
-		writer.write(in);
-		writer.flush();
-		for (int i = 0; i < out.length; i++) {
-			Token	t = p.token();
-			System.out.println(t);
-			Object	v = out[i];
-			if (v instanceof String) {
-				if (t.getType() != STRING)
-					fail("Expected STRING, but got " + t);
-				assertEquals((String)v, (String)t.getValue());
-			}
-			else if (v instanceof I) {
-				if (t.getType() != IDENTIFIER)
-					fail("Expected IDENTIFIER " + v + ", but got " + t);
-				assertEquals( ((I)v).getText(), (String)t.getText());
-			}
-			else if (v instanceof Character)
-				assertEquals( (int)((Character)v).charValue(), t.getType());
-			else if (v instanceof Integer)
-				assertEquals( ((Integer)v).intValue(), t.getType());
-			else
-				fail("Bad object " + v.getClass());
-		}
-	}
-}