# HG changeset patch # User Michael Van De Vanter # Date 1443052491 25200 # Node ID 3c73d029b65134dd33101d015d92b6fbb42b8d72 # Parent 548bd7bdd9059d0c60b92baa9ce873841a73e5b3 Truffle/Insntrumentation: remove deprecated methods in Accessor and TruffleLanguage diff -r 548bd7bdd905 -r 3c73d029b651 truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TestingLanguage.java --- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TestingLanguage.java Wed Sep 23 15:26:39 2015 -0700 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TestingLanguage.java Wed Sep 23 16:54:51 2015 -0700 @@ -26,14 +26,12 @@ import com.oracle.truffle.api.CallTarget; import com.oracle.truffle.api.TruffleLanguage; -import com.oracle.truffle.api.debug.DebugSupportProvider; import com.oracle.truffle.api.frame.MaterializedFrame; import com.oracle.truffle.api.instrument.ASTProber; import com.oracle.truffle.api.instrument.AdvancedInstrumentResultListener; import com.oracle.truffle.api.instrument.AdvancedInstrumentRootFactory; +import com.oracle.truffle.api.instrument.Visualizer; import com.oracle.truffle.api.instrument.WrapperNode; -import com.oracle.truffle.api.instrument.ToolSupportProvider; -import com.oracle.truffle.api.instrument.Visualizer; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.source.Source; @@ -84,12 +82,6 @@ return null; } - @SuppressWarnings("deprecation") - @Override - protected void enableASTProbing(ASTProber astProber) { - throw new UnsupportedOperationException(); - } - @Override protected Object evalInContext(Source source, Node node, MaterializedFrame mFrame) throws IOException { return null; @@ -100,18 +92,6 @@ return null; } - @SuppressWarnings("deprecation") - @Override - protected ToolSupportProvider getToolSupport() { - throw new UnsupportedOperationException(); - } - - @SuppressWarnings("deprecation") - @Override - protected DebugSupportProvider getDebugSupport() { - throw new UnsupportedOperationException(); - } - @Override protected Object createContext(Env env) { return null; diff -r 548bd7bdd905 -r 3c73d029b651 truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/processor/LanguageRegistrationTest.java --- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/processor/LanguageRegistrationTest.java Wed Sep 23 15:26:39 2015 -0700 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/processor/LanguageRegistrationTest.java Wed Sep 23 16:54:51 2015 -0700 @@ -26,15 +26,13 @@ import com.oracle.truffle.api.CallTarget; import com.oracle.truffle.api.TruffleLanguage; -import com.oracle.truffle.api.debug.DebugSupportProvider; import com.oracle.truffle.api.dsl.test.ExpectError; import com.oracle.truffle.api.frame.MaterializedFrame; import com.oracle.truffle.api.instrument.ASTProber; import com.oracle.truffle.api.instrument.AdvancedInstrumentResultListener; import com.oracle.truffle.api.instrument.AdvancedInstrumentRootFactory; +import com.oracle.truffle.api.instrument.Visualizer; import com.oracle.truffle.api.instrument.WrapperNode; -import com.oracle.truffle.api.instrument.ToolSupportProvider; -import com.oracle.truffle.api.instrument.Visualizer; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.source.Source; @@ -112,24 +110,6 @@ return null; } - @SuppressWarnings("deprecation") - @Override - protected ToolSupportProvider getToolSupport() { - throw new UnsupportedOperationException(); - } - - @SuppressWarnings("deprecation") - @Override - protected DebugSupportProvider getDebugSupport() { - throw new UnsupportedOperationException(); - } - - @SuppressWarnings("deprecation") - @Override - protected void enableASTProbing(ASTProber astProber) { - throw new UnsupportedOperationException(); - } - @Override protected Object createContext(Env env) { throw new UnsupportedOperationException(); @@ -194,24 +174,6 @@ return null; } - @SuppressWarnings("deprecation") - @Override - protected ToolSupportProvider getToolSupport() { - throw new UnsupportedOperationException(); - } - - @SuppressWarnings("deprecation") - @Override - protected DebugSupportProvider getDebugSupport() { - throw new UnsupportedOperationException(); - } - - @SuppressWarnings("deprecation") - @Override - protected void enableASTProbing(ASTProber astProber) { - throw new UnsupportedOperationException(); - } - @Override protected Object createContext(Env env) { throw new UnsupportedOperationException(); @@ -272,24 +234,6 @@ return null; } - @SuppressWarnings("deprecation") - @Override - protected ToolSupportProvider getToolSupport() { - throw new UnsupportedOperationException(); - } - - @SuppressWarnings("deprecation") - @Override - protected DebugSupportProvider getDebugSupport() { - throw new UnsupportedOperationException(); - } - - @SuppressWarnings("deprecation") - @Override - protected void enableASTProbing(ASTProber astProber) { - throw new UnsupportedOperationException(); - } - @Override protected CallTarget parse(Source code, Node context, String... argumentNames) throws IOException { throw new IOException(); diff -r 548bd7bdd905 -r 3c73d029b651 truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TestingLanguage.java --- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TestingLanguage.java Wed Sep 23 15:26:39 2015 -0700 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TestingLanguage.java Wed Sep 23 16:54:51 2015 -0700 @@ -26,14 +26,12 @@ import com.oracle.truffle.api.CallTarget; import com.oracle.truffle.api.TruffleLanguage; -import com.oracle.truffle.api.debug.DebugSupportProvider; import com.oracle.truffle.api.frame.MaterializedFrame; import com.oracle.truffle.api.instrument.ASTProber; import com.oracle.truffle.api.instrument.AdvancedInstrumentResultListener; import com.oracle.truffle.api.instrument.AdvancedInstrumentRootFactory; +import com.oracle.truffle.api.instrument.Visualizer; import com.oracle.truffle.api.instrument.WrapperNode; -import com.oracle.truffle.api.instrument.ToolSupportProvider; -import com.oracle.truffle.api.instrument.Visualizer; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.source.Source; @@ -83,12 +81,6 @@ return null; } - @SuppressWarnings("deprecation") - @Override - protected void enableASTProbing(ASTProber astProber) { - throw new UnsupportedOperationException(); - } - @Override protected Object evalInContext(Source source, Node node, MaterializedFrame mFrame) throws IOException { return null; @@ -99,18 +91,6 @@ return null; } - @SuppressWarnings("deprecation") - @Override - protected ToolSupportProvider getToolSupport() { - throw new UnsupportedOperationException(); - } - - @SuppressWarnings("deprecation") - @Override - protected DebugSupportProvider getDebugSupport() { - throw new UnsupportedOperationException(); - } - @Override protected Object createContext(Env env) { return null; diff -r 548bd7bdd905 -r 3c73d029b651 truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/instrument/InstrumentationTestingLanguage.java --- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/instrument/InstrumentationTestingLanguage.java Wed Sep 23 15:26:39 2015 -0700 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/instrument/InstrumentationTestingLanguage.java Wed Sep 23 16:54:51 2015 -0700 @@ -28,16 +28,14 @@ import com.oracle.truffle.api.Truffle; import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.TruffleRuntime; -import com.oracle.truffle.api.debug.DebugSupportProvider; import com.oracle.truffle.api.frame.MaterializedFrame; import com.oracle.truffle.api.instrument.ASTProber; import com.oracle.truffle.api.instrument.AdvancedInstrumentResultListener; import com.oracle.truffle.api.instrument.AdvancedInstrumentRootFactory; import com.oracle.truffle.api.instrument.Instrumenter; +import com.oracle.truffle.api.instrument.SyntaxTag; +import com.oracle.truffle.api.instrument.Visualizer; import com.oracle.truffle.api.instrument.WrapperNode; -import com.oracle.truffle.api.instrument.SyntaxTag; -import com.oracle.truffle.api.instrument.ToolSupportProvider; -import com.oracle.truffle.api.instrument.Visualizer; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeVisitor; import com.oracle.truffle.api.source.Source; @@ -129,12 +127,6 @@ return null; } - @SuppressWarnings("deprecation") - @Override - protected void enableASTProbing(ASTProber astProber) { - throw new UnsupportedOperationException(); - } - @Override protected Object evalInContext(Source source, Node node, MaterializedFrame mFrame) throws IOException { return null; @@ -145,18 +137,6 @@ return null; } - @SuppressWarnings("deprecation") - @Override - protected ToolSupportProvider getToolSupport() { - throw new UnsupportedOperationException(); - } - - @SuppressWarnings("deprecation") - @Override - protected DebugSupportProvider getDebugSupport() { - throw new UnsupportedOperationException(); - } - @Override protected Object createContext(Env env) { return null; diff -r 548bd7bdd905 -r 3c73d029b651 truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/vm/ImplicitExplicitExportTest.java --- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/vm/ImplicitExplicitExportTest.java Wed Sep 23 15:26:39 2015 -0700 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/vm/ImplicitExplicitExportTest.java Wed Sep 23 16:54:51 2015 -0700 @@ -42,14 +42,12 @@ import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.TruffleLanguage.Env; -import com.oracle.truffle.api.debug.DebugSupportProvider; import com.oracle.truffle.api.frame.MaterializedFrame; import com.oracle.truffle.api.instrument.ASTProber; import com.oracle.truffle.api.instrument.AdvancedInstrumentResultListener; import com.oracle.truffle.api.instrument.AdvancedInstrumentRootFactory; +import com.oracle.truffle.api.instrument.Visualizer; import com.oracle.truffle.api.instrument.WrapperNode; -import com.oracle.truffle.api.instrument.ToolSupportProvider; -import com.oracle.truffle.api.instrument.Visualizer; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.RootNode; import com.oracle.truffle.api.source.Source; @@ -210,24 +208,6 @@ return null; } - @SuppressWarnings("deprecation") - @Override - protected ToolSupportProvider getToolSupport() { - throw new UnsupportedOperationException(); - } - - @SuppressWarnings("deprecation") - @Override - protected DebugSupportProvider getDebugSupport() { - throw new UnsupportedOperationException(); - } - - @SuppressWarnings("deprecation") - @Override - protected void enableASTProbing(ASTProber astProber) { - throw new UnsupportedOperationException(); - } - private Object importExport(Source code) { assertNotEquals("Should run asynchronously", Thread.currentThread(), mainThread); final Node node = createFindContextNode(); diff -r 548bd7bdd905 -r 3c73d029b651 truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/vm/InitializationTest.java --- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/vm/InitializationTest.java Wed Sep 23 15:26:39 2015 -0700 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/vm/InitializationTest.java Wed Sep 23 16:54:51 2015 -0700 @@ -36,7 +36,6 @@ import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.TruffleLanguage.Env; import com.oracle.truffle.api.debug.Breakpoint; -import com.oracle.truffle.api.debug.DebugSupportProvider; import com.oracle.truffle.api.debug.Debugger; import com.oracle.truffle.api.debug.ExecutionEvent; import com.oracle.truffle.api.frame.MaterializedFrame; @@ -48,7 +47,6 @@ import com.oracle.truffle.api.instrument.Instrumenter; import com.oracle.truffle.api.instrument.Probe; import com.oracle.truffle.api.instrument.StandardSyntaxTag; -import com.oracle.truffle.api.instrument.ToolSupportProvider; import com.oracle.truffle.api.instrument.Visualizer; import com.oracle.truffle.api.instrument.WrapperNode; import com.oracle.truffle.api.nodes.Node; @@ -211,18 +209,6 @@ throw new UnsupportedOperationException(); } - @SuppressWarnings("deprecation") - @Override - protected ToolSupportProvider getToolSupport() { - throw new UnsupportedOperationException(); - } - - @SuppressWarnings("deprecation") - @Override - protected DebugSupportProvider getDebugSupport() { - throw new UnsupportedOperationException(); - } - @Override public Object evalInContext(Source source, Node node, MaterializedFrame mFrame) { throw new UnsupportedOperationException(); @@ -252,12 +238,6 @@ protected ASTProber getDefaultASTProber() { return prober; } - - @SuppressWarnings("deprecation") - @Override - public void enableASTProbing(ASTProber astProber) { - throw new UnsupportedOperationException(); - } } private static final class InstrumentOKException extends RuntimeException { diff -r 548bd7bdd905 -r 3c73d029b651 truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleLanguage.java --- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleLanguage.java Wed Sep 23 15:26:39 2015 -0700 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleLanguage.java Wed Sep 23 16:54:51 2015 -0700 @@ -39,7 +39,6 @@ import java.util.Map; import java.util.WeakHashMap; -import com.oracle.truffle.api.debug.DebugSupportProvider; import com.oracle.truffle.api.frame.MaterializedFrame; import com.oracle.truffle.api.impl.Accessor; import com.oracle.truffle.api.impl.FindContextNode; @@ -48,7 +47,6 @@ import com.oracle.truffle.api.instrument.AdvancedInstrumentRoot; import com.oracle.truffle.api.instrument.AdvancedInstrumentRootFactory; import com.oracle.truffle.api.instrument.Instrumenter; -import com.oracle.truffle.api.instrument.ToolSupportProvider; import com.oracle.truffle.api.instrument.Visualizer; import com.oracle.truffle.api.instrument.WrapperNode; import com.oracle.truffle.api.nodes.Node; @@ -192,27 +190,12 @@ */ protected abstract boolean isObjectOfLanguage(Object object); - @Deprecated - protected abstract ToolSupportProvider getToolSupport(); - - @Deprecated - protected abstract DebugSupportProvider getDebugSupport(); - /** * Gets visualization services for language-specific information. */ protected abstract Visualizer getVisualizer(); /** - * Enables AST probing on all subsequently created ASTs (sources parsed). - * - * @param astProber optional AST prober to enable; the default for the language used if - * {@code null} - */ - @Deprecated - protected abstract void enableASTProbing(ASTProber astProber); - - /** * Returns {@code true} for a node can be "instrumented" by * {@linkplain Instrumenter#probe(Node) probing}. *

@@ -489,17 +472,6 @@ return language.getDefaultASTProber(); } - @SuppressWarnings("deprecation") - @Override - protected ToolSupportProvider getToolSupport(TruffleLanguage l) { - return l.getToolSupport(); - } - - @SuppressWarnings("deprecation") - @Override - protected DebugSupportProvider getDebugSupport(TruffleLanguage l) { - return l.getDebugSupport(); - } } } diff -r 548bd7bdd905 -r 3c73d029b651 truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/Accessor.java --- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/Accessor.java Wed Sep 23 15:26:39 2015 -0700 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/Accessor.java Wed Sep 23 16:54:51 2015 -0700 @@ -80,18 +80,6 @@ return false; } - @SuppressWarnings("deprecation") - @Override - protected ToolSupportProvider getToolSupport() { - throw new UnsupportedOperationException(); - } - - @SuppressWarnings("deprecation") - @Override - protected DebugSupportProvider getDebugSupport() { - return null; - } - @Override protected CallTarget parse(Source code, Node context, String... argumentNames) throws IOException { throw new IOException(); @@ -122,12 +110,6 @@ return null; } - @SuppressWarnings("deprecation") - @Override - protected void enableASTProbing(ASTProber astProber) { - throw new UnsupportedOperationException(); - } - @Override protected Object evalInContext(Source source, Node node, MaterializedFrame mFrame) throws IOException { return null; diff -r 548bd7bdd905 -r 3c73d029b651 truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/script/TruffleScriptEngineFactory.java --- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/script/TruffleScriptEngineFactory.java Wed Sep 23 15:26:39 2015 -0700 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/script/TruffleScriptEngineFactory.java Wed Sep 23 16:54:51 2015 -0700 @@ -27,11 +27,12 @@ import javax.script.ScriptEngine; import javax.script.ScriptEngineFactory; -@Deprecated /** * Tool access to the creation of Truffle execution engines. + * * @deprecated no longer needed and will be removed */ +@Deprecated public abstract class TruffleScriptEngineFactory implements ScriptEngineFactory { // TODO (mlvdv) first step, based on a suggestion from NetBeans diff -r 548bd7bdd905 -r 3c73d029b651 truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLLanguage.java --- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLLanguage.java Wed Sep 23 15:26:39 2015 -0700 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLLanguage.java Wed Sep 23 16:54:51 2015 -0700 @@ -53,16 +53,14 @@ import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.Truffle; import com.oracle.truffle.api.TruffleLanguage; -import com.oracle.truffle.api.debug.DebugSupportProvider; import com.oracle.truffle.api.dsl.NodeFactory; import com.oracle.truffle.api.dsl.UnsupportedSpecializationException; import com.oracle.truffle.api.frame.MaterializedFrame; import com.oracle.truffle.api.instrument.ASTProber; import com.oracle.truffle.api.instrument.AdvancedInstrumentResultListener; import com.oracle.truffle.api.instrument.AdvancedInstrumentRootFactory; +import com.oracle.truffle.api.instrument.Visualizer; import com.oracle.truffle.api.instrument.WrapperNode; -import com.oracle.truffle.api.instrument.ToolSupportProvider; -import com.oracle.truffle.api.instrument.Visualizer; import com.oracle.truffle.api.nodes.GraphPrintVisitor; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; @@ -190,7 +188,7 @@ */ /* - * + * *

Tools:
The use of some of Truffle's support for developer tools (based on the * Truffle Instrumentation Framework) are demonstrated in this file, for example: