# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@oracle.com>
# Date 1438272822 -7200
# Node ID 6dd4ab4d76d357fe7df9ea55e0d17d9056e8600d
# Parent  8519aaa39caff569e9bb55ab53a8a66c4ca13fd0
ecj lints

diff -r 8519aaa39caf -r 6dd4ab4d76d3 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	Thu Jul 30 18:06:10 2015 +0200
+++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TestingLanguage.java	Thu Jul 30 18:13:42 2015 +0200
@@ -23,7 +23,6 @@
 package com.oracle.truffle.api.dsl.test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.debug.DebugSupportProvider;
 import com.oracle.truffle.api.instrument.ToolSupportProvider;
diff -r 8519aaa39caf -r 6dd4ab4d76d3 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	Thu Jul 30 18:06:10 2015 +0200
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TestingLanguage.java	Thu Jul 30 18:13:42 2015 +0200
@@ -23,7 +23,6 @@
 package com.oracle.truffle.api.test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.debug.DebugSupportProvider;
 import com.oracle.truffle.api.instrument.ToolSupportProvider;
diff -r 8519aaa39caf -r 6dd4ab4d76d3 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	Thu Jul 30 18:06:10 2015 +0200
+++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleLanguage.java	Thu Jul 30 18:13:42 2015 +0200
@@ -173,12 +173,12 @@
     /**
      * Finds the currently executing context for current thread.
      *
-     * @param <Language> type of language making the query
+     * @param <Lang> type of language making the query
      * @param language the language class
      * @return the context associated with current execution
      * @throws IllegalStateException if no context is associated with the execution
      */
-    protected static <Language extends TruffleLanguage> Language findContext(Class<Language> language) {
+    protected static <Lang extends TruffleLanguage> Lang findContext(Class<Lang> language) {
         return language.cast(API.findLanguage(null, language));
     }
 
diff -r 8519aaa39caf -r 6dd4ab4d76d3 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	Thu Jul 30 18:06:10 2015 +0200
+++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/Accessor.java	Thu Jul 30 18:13:42 2015 +0200
@@ -162,12 +162,15 @@
         return INSTRUMENT.findLanguage(probe);
     }
 
-    protected TruffleLanguage findLanguage(TruffleVM vm, Class<? extends TruffleLanguage> languageClass) {
-        if (vm == null) {
+    protected TruffleLanguage findLanguage(TruffleVM known, Class<? extends TruffleLanguage> languageClass) {
+        TruffleVM vm;
+        if (known == null) {
             vm = CURRENT_VM.get();
             if (vm == null) {
                 throw new IllegalStateException();
             }
+        } else {
+            vm = known;
         }
         return SPI.findLanguage(vm, languageClass);
     }
diff -r 8519aaa39caf -r 6dd4ab4d76d3 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	Thu Jul 30 18:06:10 2015 +0200
+++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLLanguage.java	Thu Jul 30 18:13:42 2015 +0200
@@ -383,7 +383,7 @@
     }
 
     @Override
-    protected CallTarget parse(Source code, Node context, String... argumentNames) throws IOException {
+    protected CallTarget parse(Source code, Node node, String... argumentNames) throws IOException {
         final SLContext c = new SLContext(this);
         final Exception[] failed = {null};
         try {
diff -r 8519aaa39caf -r 6dd4ab4d76d3 truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLRootNode.java
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLRootNode.java	Thu Jul 30 18:06:10 2015 +0200
+++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLRootNode.java	Thu Jul 30 18:13:42 2015 +0200
@@ -41,7 +41,6 @@
 package com.oracle.truffle.sl.nodes;
 
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
-import com.oracle.truffle.api.*;
 import com.oracle.truffle.api.frame.*;
 import com.oracle.truffle.api.instrument.*;
 import com.oracle.truffle.api.nodes.*;
@@ -67,7 +66,8 @@
 
     @CompilationFinal private boolean isCloningAllowed;
 
-    public SLRootNode(SLContext context, FrameDescriptor frameDescriptor, SLExpressionNode bodyNode, String name) {
+    @SuppressWarnings("unused")
+    public SLRootNode(SLContext ignore, FrameDescriptor frameDescriptor, SLExpressionNode bodyNode, String name) {
         super(SLLanguage.class, null, frameDescriptor);
         this.bodyNode = bodyNode;
         this.name = name;