Merge branch 'master' of github.com:antlr/grammars-v4

Author: parrt

.gitignore

@@ -65,3 +65,9 @@
 /support/antlr4test-maven-plugin/target/
 
 /bnf/target/
+
+/support/antlr4test-maven-plugin/.settings/
+/support/antlr4test-maven-plugin/.project
+/support/antlr4test-maven-plugin/.classpath
+
+/swift/target/

support/antlr4test-maven-plugin/src/main/java/org/antlr/mojo/antlr4test/GrammarTestMojo.java

@@ -198,7 +198,10 @@ public void setVerbose(boolean verbose) {
       this.verbose = verbose;
    }
 
-   private void testGrammars() throws Exception {
+   /**
+    * test a single grammar
+    */
+   private void testGrammar(File grammarFile) throws Exception {
       /*
        * figure out class names
        */
@@ -226,35 +229,54 @@ private void testGrammars() throws Exception {
        */
       final Constructor<?> lexerConstructor = lexerClass.getConstructor(CharStream.class);
       final Constructor<?> parserConstructor = parserClass.getConstructor(TokenStream.class);
+      System.out.println("Parsing :" + grammarFile.getAbsolutePath());
+      ANTLRFileStream antlrFileStream = new ANTLRFileStream(grammarFile.getAbsolutePath(), "UTF-8");
+      Lexer lexer = (Lexer) lexerConstructor.newInstance(antlrFileStream);
+      final CommonTokenStream tokens = new CommonTokenStream(lexer);
+      if (verbose) {
+         tokens.fill();
+         for (final Object tok : tokens.getTokens()) {
+            System.out.println(tok);
+         }
+      }
+      /*
+       * get parser
+       */
+      Parser parser = (Parser) parserConstructor.newInstance(tokens);
+      parser.setErrorHandler(new BailErrorStrategy());
+      final Method method = parserClass.getMethod(entryPoint);
+      ParserRuleContext parserRuleContext = (ParserRuleContext) method.invoke(parser);
+      /*
+       * show the tree
+       */
+      if (showTree) {
+         final String lispTree = Trees.toStringTree(parserRuleContext, parser);
+         System.out.println(lispTree);
+      }
+      /*
+       * yup
+       */
+      parser = null;
+      lexer = null;
+      parserRuleContext = null;
+      antlrFileStream = null;
+   }
+
+   private void testGrammars() throws Exception {
       /*
        * iterate examples
        */
       final List<File> exampleFiles = FileUtil.getAllFiles(baseDir + "/" + this.exampleFiles);
       if (null != exampleFiles) {
          for (final File file : exampleFiles) {
-            System.out.println("Parsing :" + file.getAbsolutePath());
-            final Lexer lexer = (Lexer) lexerConstructor.newInstance(new ANTLRFileStream(file.getAbsolutePath(), "UTF-8"));
-            final CommonTokenStream tokens = new CommonTokenStream(lexer);
-            if (verbose) {
-               tokens.fill();
-               for (final Object tok : tokens.getTokens()) {
-                  System.out.println(tok);
-               }
-            }
             /*
-             * get parser
+             * test grammar
              */
-            final Parser parser = (Parser) parserConstructor.newInstance(tokens);
-            parser.setErrorHandler(new BailErrorStrategy());
-            final Method method = parserClass.getMethod(entryPoint);
-            final ParserRuleContext parserRuleContext = (ParserRuleContext) method.invoke(parser);
+            testGrammar(file);
             /*
-             * show the tree
+             * gc
              */
-            if (showTree) {
-               final String lispTree = Trees.toStringTree(parserRuleContext);
-               System.out.println(lispTree);
-            }
+            System.gc();
          }
       }
    }

swift/pom.xml

@@ -0,0 +1,52 @@
+<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/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>swift</artifactId>
+	<packaging>jar</packaging>
+	<name>ANTLR Swift grammar</name>
+	<parent>
+		<groupId>com.antlr.grammarsv4</groupId>
+		<artifactId>grammarsv4</artifactId>
+		<version>1.0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.antlr</groupId>
+				<artifactId>antlr4-maven-plugin</artifactId>
+				<version>${antlr.version}</version>
+				<configuration>
+					<sourceDirectory>${basedir}</sourceDirectory>
+					<grammars>tnt.g4</grammars>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>antlr4</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.antlr</groupId>
+				<artifactId>antlr4test-maven-plugin</artifactId>
+				<configuration>
+					<verbose>false</verbose>
+					<showTree>true</showTree>
+					<entryPoint>statement</entryPoint>
+					<grammarName>Swift</grammarName>
+					<packageName></packageName>
+					<exampleFiles>examples/</exampleFiles>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>test</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>