Mercurial > hg > truffle
changeset 22178:f8f790fc01da
More compatibility for users of REPL infrastructure: Keep the TruffleVM return type for now. Offer engine() replacement for those who want to migrate to non-deprecated API.
| author | Jaroslav Tulach <jaroslav.tulach@oracle.com> |
|---|---|
| date | Tue, 22 Sep 2015 13:33:44 +0200 |
| parents | 396c1d17a11a |
| children | ee9ae440f1eb |
| files | truffle/com.oracle.truffle.sl.tools/src/com/oracle/truffle/sl/tools/debug/SLREPLHandler.java truffle/com.oracle.truffle.sl.tools/src/com/oracle/truffle/sl/tools/debug/SLREPLServer.java truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/server/REPLServerContext.java |
| diffstat | 3 files changed, 14 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/truffle/com.oracle.truffle.sl.tools/src/com/oracle/truffle/sl/tools/debug/SLREPLHandler.java Tue Sep 22 13:06:21 2015 +0200 +++ b/truffle/com.oracle.truffle.sl.tools/src/com/oracle/truffle/sl/tools/debug/SLREPLHandler.java Tue Sep 22 13:33:44 2015 +0200 @@ -128,7 +128,7 @@ if (!file.canRead()) { return finishReplyFailed(reply, "can't find file \"" + fileName + "\""); } - final PolyglotEngine vm = serverContext.vm(); + final PolyglotEngine vm = serverContext.engine(); vm.eval(Source.fromFileName(file.getPath())); PolyglotEngine.Value main = vm.findGlobalSymbol("main"); if (main != null) {
--- a/truffle/com.oracle.truffle.sl.tools/src/com/oracle/truffle/sl/tools/debug/SLREPLServer.java Tue Sep 22 13:06:21 2015 +0200 +++ b/truffle/com.oracle.truffle.sl.tools/src/com/oracle/truffle/sl/tools/debug/SLREPLServer.java Tue Sep 22 13:33:44 2015 +0200 @@ -215,8 +215,9 @@ } @Override - public PolyglotEngine vm() { - return vm; + @SuppressWarnings("deprecation") + public com.oracle.truffle.api.vm.TruffleVM vm() { + return (com.oracle.truffle.api.vm.TruffleVM) vm; } @Override
--- a/truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/server/REPLServerContext.java Tue Sep 22 13:06:21 2015 +0200 +++ b/truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/server/REPLServerContext.java Tue Sep 22 13:33:44 2015 +0200 @@ -76,7 +76,16 @@ return new DefaultVisualizer(); } - public abstract PolyglotEngine vm(); + public PolyglotEngine engine() { + return vm(); + } + + /** + * @deprecated use {@link #engine()}. + */ + @SuppressWarnings("deprecation") + @Deprecated + public abstract com.oracle.truffle.api.vm.TruffleVM vm(); protected abstract Debugger db();