jruby · Oct 19, 2016 · Oct 19, 2016
diff --git a/mx.jruby/mx_jruby.py b/mx.jruby/mx_jruby.py
@@ -65,66 +65,6 @@ class LicensesProject(ArchiveProject):
     def getResults(self):
         return [join(_suite.dir, f) for f in self.license_files]
 
-class AntlrProject(mx.Project):
-    def __init__(self, suite, name, deps, workingSets, theLicense, **args):
-        mx.Project.__init__(self, suite, name, "", [], deps, workingSets, _suite.dir, theLicense)
-        assert 'outputDir' in args
-        assert 'sourceDir' in args
-        assert 'grammars' in args
-        self.doNotArchive = True
-
-    def getBuildTask(self, args):
-        return AntlrBuildTask(self, args)
-
-class AntlrBuildTask(mx.BuildTask):
-    def __init__(self, project, args):
-        mx.BuildTask.__init__(self, project, args, 1)
-
-    def __str__(self):
-        return 'Generate Antlr grammar for {}'.format(self.subject)
-
-    def needsBuild(self, newestInput):
-        sup = mx.BuildTask.needsBuild(self, newestInput)
-        if sup[0]:
-            return sup
-        newestOutput = self.newestOutput()
-        if not newestOutput:
-            return (True, "no java files yet")
-
-        src = join(_suite.dir, self.subject.sourceDir)
-        for grammar in self.subject.grammars:
-            if newestOutput.isOlderThan(join(src, grammar)):
-                return (True, "%s needs to be regenerated" % (grammar))
-
-        return (False, 'all files are up to date')
-
-    def newestOutput(self):
-        out = join(_suite.dir, self.subject.outputDir)
-        newest = None
-        for grammar in self.subject.grammars:
-            parser = join(out, os.path.splitext(grammar)[0] + "Parser.java")
-            parser = TimeStampFile(parser)
-            if not newest or parser.isNewerThan(newest):
-                    newest = parser
-        return newest
-
-    def build(self):
-        antlr4 = None
-        for lib in _suite.libs:
-            if lib.name == "ANTLR4_MAIN":
-                antlr4 = lib
-        assert antlr4
-
-        antlr4jar = antlr4.classpath_repr()
-        out = join(_suite.dir, self.subject.outputDir)
-        src = join(_suite.dir, self.subject.sourceDir)
-        for grammar in self.subject.grammars:
-            pkg = os.path.dirname(grammar).replace('/', '.')
-            mx.run_java(['-jar', antlr4jar, '-o', out, '-package', pkg, grammar], cwd=src)
-
-    def clean(self, forBuild=False):
-        pass
-
 def mavenSetup():
     buildPack = join(_suite.dir, 'jruby-build-pack/maven')
     mavenDir = buildPack if isdir(buildPack) else join(_suite.dir, 'mxbuild/mvn')

diff --git a/mx.jruby/suite.py b/mx.jruby/suite.py
@@ -55,11 +55,6 @@ def mavenLib(mavenDep, sha1, sourceSha1):
 
         # ------------- Libraries -------------
 
-        "ANTLR4_MAIN": mavenLib(
-            "org.antlr:antlr4:4.5.1-1",
-            "a8867c83a73791cf30e30de4cf5d0c9a5f0dfdab",
-            "0c0dcb94d272b012b33e215d4a61bdf93a48b872"),
-
         "ANTLR4_RUNTIME": mavenLib(
             "org.antlr:antlr4-runtime:4.5.1-1",
             "66144204f9d6d7d3f3f775622c2dd7e9bd511d97",
@@ -82,20 +77,11 @@ def mavenLib(mavenDep, sha1, sourceSha1):
             "jar": "lib/jruby.jar",
         },
 
-        "jruby-antlr": {
-            "class": "AntlrProject",
-            "sourceDir": "truffle/src/main/antlr4",
-            "outputDir": "truffle/src/main/antlr4",
-            "grammars": [ "org/jruby/truffle/core/format/pack/Pack.g4" ],
-            "dependencies": [ "ANTLR4_RUNTIME" ],
-        },
-
         "jruby-truffle": {
             "dir": "truffle/src/main",
-            "sourceDirs": ["java", "antlr4"],
+            "sourceDirs": [ "java" ],
             "dependencies": [
                 "jruby-core",
-                "jruby-antlr",
                 "truffle:TRUFFLE_API",
                 "truffle:TRUFFLE_DEBUG",
                 "ANTLR4_RUNTIME",

diff --git a/truffle/pom.rb b/truffle/pom.rb
@@ -29,10 +29,6 @@
 
   jar 'junit:junit', :scope => 'test'
 
-  plugin 'org.antlr:antlr4-maven-plugin', '4.5.1-1' do
-    execute_goal :antlr4
-  end
-
   plugin( :compiler,
           'encoding' => 'utf-8',
           'debug' => 'true',

diff --git a/truffle/pom.xml b/truffle/pom.xml
@@ -96,18 +96,6 @@ DO NOT MODIFIY - GENERATED CODE
       </resource>
     </resources>
     <plugins>
-      <plugin>
-        <groupId>org.antlr</groupId>
-        <artifactId>antlr4-maven-plugin</artifactId>
-        <version>4.5.1-1</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>antlr4</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <executions>

diff --git a/truffle/src/main/antlr4/org/jruby/truffle/core/format/pack/Pack.g4 b/truffle/src/main/antlr4/org/jruby/truffle/core/format/pack/Pack.g4
diff --git a/truffle/src/main/java/org/jruby/truffle/Main.java b/truffle/src/main/java/org/jruby/truffle/Main.java
@@ -11,13 +11,8 @@
 
 import org.jruby.Ruby;
 import org.jruby.RubyInstanceConfig;
-import org.jruby.internal.runtime.GlobalVariable;
-import org.jruby.internal.runtime.ValueAccessor;
-import org.jruby.runtime.IAccessor;
-import org.jruby.runtime.builtin.IRubyObject;
 
 import java.io.InputStream;
-import java.util.Map;
 
 public class Main {
 

diff --git a/truffle/src/main/java/org/jruby/truffle/cext/CExtNodes.java b/truffle/src/main/java/org/jruby/truffle/cext/CExtNodes.java
@@ -19,7 +19,6 @@
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.FrameInstance;
 import com.oracle.truffle.api.frame.FrameInstance.FrameAccess;
-import com.oracle.truffle.api.frame.FrameInstanceVisitor;
 import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/VMPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/core/VMPrimitiveNodes.java
@@ -60,7 +60,6 @@
 import org.jruby.truffle.core.kernel.KernelNodesFactory;
 import org.jruby.truffle.core.proc.ProcSignalHandler;
 import org.jruby.truffle.core.string.StringOperations;
-import org.jruby.truffle.core.thread.ThreadManager;
 import org.jruby.truffle.language.RubyGuards;
 import org.jruby.truffle.language.control.ExitException;
 import org.jruby.truffle.language.control.RaiseException;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayNodes.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayNodes.java
@@ -73,7 +73,6 @@
 import org.jruby.truffle.language.yield.YieldNode;
 
 import java.util.Arrays;
-import java.util.Comparator;
 
 import static org.jruby.truffle.core.array.ArrayHelpers.getSize;
 import static org.jruby.truffle.core.array.ArrayHelpers.getStore;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/basicobject/BasicObjectNodes.java b/truffle/src/main/java/org/jruby/truffle/core/basicobject/BasicObjectNodes.java
@@ -17,7 +17,6 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.FrameInstance;
-import com.oracle.truffle.api.frame.FrameInstanceVisitor;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.IndirectCallNode;
 import com.oracle.truffle.api.nodes.Node;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/binding/TruffleBindingNodes.java b/truffle/src/main/java/org/jruby/truffle/core/binding/TruffleBindingNodes.java
@@ -13,7 +13,6 @@
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.FrameInstance;
-import com.oracle.truffle.api.frame.FrameInstanceVisitor;
 import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.object.DynamicObject;
 import org.jruby.truffle.builtins.CoreClass;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/cast/ToFNode.java b/truffle/src/main/java/org/jruby/truffle/core/cast/ToFNode.java
@@ -17,9 +17,7 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.profiles.BranchProfile;
-import com.oracle.truffle.api.source.SourceSection;
 import org.jruby.truffle.Layouts;
-import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.language.RubyNode;
 import org.jruby.truffle.language.control.RaiseException;
 import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/fiber/FiberNodes.java b/truffle/src/main/java/org/jruby/truffle/core/fiber/FiberNodes.java
@@ -36,7 +36,6 @@
 import org.jruby.truffle.language.control.RaiseException;
 import org.jruby.truffle.language.control.ReturnException;
 import org.jruby.truffle.language.methods.UnsupportedOperationBehavior;
-import org.jruby.truffle.parser.BodyTranslator;
 import org.jruby.truffle.platform.UnsafeGroup;
 
 import java.util.concurrent.CountDownLatch;