Refactore into various Maven packages. Got rid of Ant

.gitignore

@@ -1,9 +1,4 @@
-.DS_Store
-.classpath
-.project
-.settings/
 .idea/
-build/
-bin/
-lib/
 target/
+.DS_Store
+*.iml

petitparser-core/pom.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.petitparser</groupId>
+        <artifactId>petitparser</artifactId>
+        <version>2.0.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>petitparser-core</artifactId>
+    <name>PetitParser Core</name>
+
+</project>

src/org/petitparser/Chars.java → petitparser-core/src/main/java/org/petitparser/Chars.java

@@ -126,13 +126,7 @@ private static CharMatcher patternPredicate(String pattern) {
     return PATTERN.parse(new Context(pattern)).get();
   }
 
-  private static final Parser PATTERN_SIMPLE = any().map(
-      new Function<Character, CharMatcher>() {
-        @Override
-        public CharMatcher apply(Character character) {
-          return CharMatcher.is(character);
-        }
-      });
+  private static final Parser PATTERN_SIMPLE = any().map(CharMatcher::is);
 
   private static final Parser PATTERN_RANGE = any().seq(character('-')).seq(any())
       .map(new Function<List<Character>, CharMatcher>() {

src/org/petitparser/Parsers.java → petitparser-core/src/main/java/org/petitparser/Parsers.java

@@ -46,12 +46,7 @@ public static Parser string(final String string, String message) {
     if (string.length() == 1) {
       return character(string.charAt(0), message);
     } else {
-      return new StringPredicateParser(string.length(), new StringPredicate() {
-        @Override
-        public boolean apply(String argument) {
-          return string.equals(argument);
-        }
-      }, message);
+      return new StringPredicateParser(string.length(), string::equals, message);
     }
   }
 
@@ -65,12 +60,7 @@ public static Parser stringIgnoreCase(String string) {
   }
 
   public static Parser stringIgnoreCase(final String string, String message) {
-    return new StringPredicateParser(string.length(), new StringPredicate() {
-      @Override
-      public boolean apply(String argument) {
-        return string.equalsIgnoreCase(argument);
-      }
-    }, message);
+    return new StringPredicateParser(string.length(), string::equalsIgnoreCase, message);
   }
 
 }

src/org/petitparser/parser/Parser.java → petitparser-core/src/main/java/org/petitparser/parser/Parser.java

@@ -184,9 +184,7 @@ public Parser separatedBy(Parser separator) {
           public List<Object> apply(List<List<List<Object>>> input) {
             List<Object> result = Lists.newArrayList();
             result.add(input.get(0));
-            for (List<Object> list : input.get(1)) {
-              result.addAll(list);
-            }
+            input.get(1).forEach(result::addAll);
             return result;
           }
         });

src/org/petitparser/utils/Queries.java → petitparser-core/src/main/java/org/petitparser/utils/Queries.java

@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.petitparser.parser.Parser;
 
@@ -51,11 +52,9 @@ public Parser next() {
         }
         Parser parser = todo.remove(todo.size() - 1);
         seen.add(parser);
-        for (Parser child : parser.getChildren()) {
-          if (!seen.contains(child)) {
-            todo.add(child);
-          }
-        }
+        todo.addAll(parser.getChildren().stream()
+            .filter(child -> !seen.contains(child))
+            .collect(Collectors.toList()));
         return parser;
       }
 

test/org/petitparser/ExpressionTest.java → petitparser-core/src/test/java/org/petitparser/ExpressionTest.java

@@ -32,12 +32,7 @@ private static Parser createParser() {
           .pick(1))
       .primitive(digit().plus()
           .seq(character('.').seq(digit().plus()).optional())
-          .flatten().trim().map(new Function<String, Double>() {
-            @Override
-            public Double apply(String value) {
-              return Double.parseDouble(value);
-            }
-          }));
+          .flatten().trim().map(Double::parseDouble));
     builder.group()
       .prefix(character('-').trim(), new Function<List<Double>, Double>() {
         @Override

petitparser-json/pom.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.petitparser</groupId>
+        <artifactId>petitparser</artifactId>
+        <version>2.0.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>petitparser-json</artifactId>
+    <name>PetitParser JSON</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.petitparser</groupId>
+            <artifactId>petitparser-core</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+    </dependencies>
+</project>

petitparser-smalltalk/pom.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.petitparser</groupId>
+        <artifactId>petitparser</artifactId>
+        <version>2.0.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>petitparser-smalltalk</artifactId>
+    <name>PetitParser Smalltalk</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.petitparser</groupId>
+            <artifactId>petitparser-core</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+    </dependencies>
+</project>

petitparser-xml/pom.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.petitparser</groupId>
+        <artifactId>petitparser</artifactId>
+        <version>2.0.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>petitparser-xml</artifactId>
+    <name>PetitParser XML</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.petitparser</groupId>
+            <artifactId>petitparser-core</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+    </dependencies>
+</project>

grammar/org/petitparser/grammar/xml/XmlParser.java → petitparser-xml/src/main/java/org/petitparser/grammar/xml/XmlParser.java

@@ -34,18 +34,8 @@ public XmlAttribute apply(List<?> argument) {
             (String) argument.get(1));
       }
     });
-    action("comment", new Function<String, XmlComment>() {
-      @Override
-      public XmlComment apply(String string) {
-        return new XmlComment(string);
-      }
-    });
-    action("doctype", new Function<String, XmlDoctype>() {
-      @Override
-      public XmlDoctype apply(String string) {
-        return new XmlDoctype(string);
-      }
-    });
+    action("comment", XmlComment::new);
+    action("doctype", XmlDoctype::new);
     action("document", new Function<List<XmlNode>, XmlDocument>() {
       @Override
       public XmlDocument apply(List<XmlNode> nodes) {
@@ -67,18 +57,8 @@ public XmlProcessing apply(List<String> list) {
         return new XmlProcessing(list.get(0), list.get(1));
       }
     });
-    action("qualified", new Function<String, XmlName>() {
-      @Override
-      public XmlName apply(String name) {
-        return new XmlName(name);
-      }
-    });
-    action("characterData", new Function<String, XmlText>() {
-      @Override
-      public XmlText apply(String data) {
-        return new XmlText(data);
-      }
-    });
+    action("qualified", XmlName::new);
+    action("characterData", XmlText::new);
   }
 
 }

test/org/petitparser/grammar/xml/XmlBenchmark.java → petitparser-xml/src/test/java/org/petitparser/grammar/xml/XmlBenchmark.java

@@ -1,7 +1,6 @@
 package org.petitparser.grammar.xml;
 
 import org.petitparser.context.Context;
-import org.petitparser.grammar.xml.XmlParser;
 import org.petitparser.parser.Parser;
 
 /**