Mercurial > hg > truffle
changeset 22157:dc83cc1f94f2
Using fully qualified imports
line wrap: on
line diff
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ArrayTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ArrayTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,13 +22,22 @@ */ package com.oracle.truffle.api.dsl.test; -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.dsl.ImplicitCast; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.dsl.TypeCast; +import com.oracle.truffle.api.dsl.TypeCheck; +import com.oracle.truffle.api.dsl.TypeSystem; +import com.oracle.truffle.api.dsl.TypeSystemReference; import com.oracle.truffle.api.dsl.test.ArrayTestFactory.TestNode1NodeGen; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.RootNode; +import com.oracle.truffle.api.nodes.UnexpectedResultException; +import org.junit.Assert; +import org.junit.Test; public class ArrayTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/AssumptionsTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/AssumptionsTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,22 +22,28 @@ */ package com.oracle.truffle.api.dsl.test; -import static com.oracle.truffle.api.dsl.test.TestHelper.*; -import static org.junit.Assert.*; - -import java.util.*; - -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.Assumption; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.dsl.Cached; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.NodeField; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.dsl.UnsupportedSpecializationException; import com.oracle.truffle.api.dsl.test.AssumptionsTestFactory.AssumptionArrayTestFactory; import com.oracle.truffle.api.dsl.test.AssumptionsTestFactory.CacheAssumptionTestFactory; import com.oracle.truffle.api.dsl.test.AssumptionsTestFactory.FieldTestFactory; import com.oracle.truffle.api.dsl.test.AssumptionsTestFactory.MethodTestFactory; import com.oracle.truffle.api.dsl.test.AssumptionsTestFactory.NodeFieldTest2Factory; import com.oracle.truffle.api.dsl.test.AssumptionsTestFactory.StaticFieldTestFactory; +import static com.oracle.truffle.api.dsl.test.TestHelper.createCallTarget; +import static com.oracle.truffle.api.dsl.test.TestHelper.getNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; +import java.util.HashMap; +import java.util.Map; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; +import org.junit.Test; public class AssumptionsTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/BadLongOverflowSpecializationTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/BadLongOverflowSpecializationTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,15 +22,15 @@ */ package com.oracle.truffle.api.dsl.test; -import static com.oracle.truffle.api.dsl.test.TestHelper.*; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.BadLongOverflowSpecializationTestFactory.ImplicitCastExclusionFactory; +import static com.oracle.truffle.api.dsl.test.TestHelper.createRoot; +import static com.oracle.truffle.api.dsl.test.TestHelper.executeWith; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; +import static org.junit.Assert.assertEquals; +import org.junit.Test; public class BadLongOverflowSpecializationTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/BinaryNodeTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/BinaryNodeTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,15 +22,17 @@ */ package com.oracle.truffle.api.dsl.test; -import static com.oracle.truffle.api.dsl.test.TestHelper.*; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.Fallback; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.NodeChildren; +import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.BinaryNodeTestFactory.AddNodeFactory; +import static com.oracle.truffle.api.dsl.test.TestHelper.createRoot; +import static com.oracle.truffle.api.dsl.test.TestHelper.executeWith; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; +import static org.junit.Assert.assertEquals; +import org.junit.Test; public class BinaryNodeTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/CachedTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/CachedTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,13 +22,13 @@ */ package com.oracle.truffle.api.dsl.test; -import static com.oracle.truffle.api.dsl.test.TestHelper.*; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.dsl.Cached; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.NodeChildren; +import com.oracle.truffle.api.dsl.NodeField; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.dsl.UnsupportedSpecializationException; import com.oracle.truffle.api.dsl.test.CachedTestFactory.BoundCacheFactory; import com.oracle.truffle.api.dsl.test.CachedTestFactory.BoundCacheOverflowFactory; import com.oracle.truffle.api.dsl.test.CachedTestFactory.TestBoundCacheOverflowContainsFactory; @@ -39,7 +39,12 @@ import com.oracle.truffle.api.dsl.test.CachedTestFactory.TestGuardWithJustCachedParameterFactory; import com.oracle.truffle.api.dsl.test.CachedTestFactory.TestMultipleCachesFactory; import com.oracle.truffle.api.dsl.test.CachedTestFactory.UnboundCacheFactory; +import static com.oracle.truffle.api.dsl.test.TestHelper.assertionsEnabled; +import static com.oracle.truffle.api.dsl.test.TestHelper.createCallTarget; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; +import org.junit.Test; @SuppressWarnings("unused") public class CachedTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/CodeFormatTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/CodeFormatTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.truffle.api.dsl.test; -import org.junit.*; - -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.CodeFormatTestFactory.LineWrappingTestFactory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; +import org.junit.Assert; +import org.junit.Test; /** * Tests the generated code compiles without warnings for unusual large guard names.
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/CompilerErrorTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/CompilerErrorTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.truffle.api.dsl.test; -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; public class CompilerErrorTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ContainsTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ContainsTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,23 +22,28 @@ */ package com.oracle.truffle.api.dsl.test; -import static com.oracle.truffle.api.dsl.test.TestHelper.*; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.dsl.internal.*; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.NodeChildren; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.dsl.internal.DSLNode; +import com.oracle.truffle.api.dsl.internal.SpecializedNode; import com.oracle.truffle.api.dsl.test.ContainsTestFactory.Contains1Factory; import com.oracle.truffle.api.dsl.test.ContainsTestFactory.Contains2Factory; import com.oracle.truffle.api.dsl.test.ContainsTestFactory.Contains3Factory; import com.oracle.truffle.api.dsl.test.ContainsTestFactory.Contains4Factory; import com.oracle.truffle.api.dsl.test.ContainsTestFactory.PolymorphicToMonomorphic0Factory; import com.oracle.truffle.api.dsl.test.TestHelper.ExecutionListener; +import static com.oracle.truffle.api.dsl.test.TestHelper.array; +import static com.oracle.truffle.api.dsl.test.TestHelper.assertRuns; +import static com.oracle.truffle.api.dsl.test.TestHelper.createRoot; +import static com.oracle.truffle.api.dsl.test.TestHelper.executeWith; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.NodeCost; +import static org.hamcrest.CoreMatchers.is; +import org.junit.Assert; +import static org.junit.Assert.assertThat; +import org.junit.Test; @SuppressWarnings("unused") public class ContainsTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/CreateCastTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/CreateCastTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,16 +22,19 @@ */ package com.oracle.truffle.api.dsl.test; -import org.junit.*; - -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.CreateCast; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.NodeChildren; +import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.CreateCastTestFactory.CreateCastNode1Factory; import com.oracle.truffle.api.dsl.test.CreateCastTestFactory.CreateCastNode2Factory; import com.oracle.truffle.api.dsl.test.CreateCastTestFactory.CreateCastNode3Factory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ChildrenNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; +import org.junit.Assert; +import org.junit.Test; @SuppressWarnings("unused") public class CreateCastTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ExecuteEvaluatedTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ExecuteEvaluatedTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,10 +22,11 @@ */ package com.oracle.truffle.api.dsl.test; -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.NodeChildren; +import com.oracle.truffle.api.dsl.ShortCircuit; +import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.ExecuteEvaluatedTestFactory.DoubleEvaluatedNodeFactory; import com.oracle.truffle.api.dsl.test.ExecuteEvaluatedTestFactory.EvaluatedNodeFactory; import com.oracle.truffle.api.dsl.test.ExecuteEvaluatedTestFactory.TestEvaluatedGenerationFactory; @@ -42,8 +43,11 @@ import com.oracle.truffle.api.dsl.test.TypeSystemTest.ChildrenNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.UnexpectedResultException; +import org.junit.Assert; +import org.junit.Test; public class ExecuteEvaluatedTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ExecuteGroupingTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ExecuteGroupingTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,15 +22,18 @@ */ package com.oracle.truffle.api.dsl.test; -import static org.junit.Assert.*; - -import org.junit.experimental.theories.*; -import org.junit.runner.*; - -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.NodeChildren; +import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.ExecuteGroupingTestFactory.ExecuteGrouping1NodeGen; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.UnexpectedResultException; +import static org.junit.Assert.assertEquals; +import org.junit.experimental.theories.DataPoints; +import org.junit.experimental.theories.Theories; +import org.junit.experimental.theories.Theory; +import org.junit.runner.RunWith; /* * This test aims to test the reuse of execute methods with evaluated parameters as much as possible.
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ExecuteMethodTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ExecuteMethodTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,10 +22,16 @@ */ package com.oracle.truffle.api.dsl.test; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.dsl.internal.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.dsl.TypeSystem; +import com.oracle.truffle.api.dsl.TypeSystemReference; +import com.oracle.truffle.api.dsl.internal.DSLOptions; +import com.oracle.truffle.api.frame.Frame; +import com.oracle.truffle.api.frame.MaterializedFrame; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.UnexpectedResultException; public class ExecuteMethodTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ExpectError.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ExpectError.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,7 +22,8 @@ */ package com.oracle.truffle.api.dsl.test; -import java.lang.annotation.*; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; /** * This annotation is internally known by the dsl processor and used to expect errors for testing
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/FallbackTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/FallbackTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,19 +22,25 @@ */ package com.oracle.truffle.api.dsl.test; -import static com.oracle.truffle.api.dsl.test.TestHelper.*; - -import org.junit.*; - -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.Fallback; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.dsl.UnsupportedSpecializationException; import com.oracle.truffle.api.dsl.test.FallbackTestFactory.Fallback1Factory; import com.oracle.truffle.api.dsl.test.FallbackTestFactory.Fallback2Factory; import com.oracle.truffle.api.dsl.test.FallbackTestFactory.Fallback3Factory; import com.oracle.truffle.api.dsl.test.FallbackTestFactory.Fallback4Factory; +import static com.oracle.truffle.api.dsl.test.TestHelper.array; +import static com.oracle.truffle.api.dsl.test.TestHelper.assertRuns; +import static com.oracle.truffle.api.dsl.test.TestHelper.createRoot; +import static com.oracle.truffle.api.dsl.test.TestHelper.executeWith; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeUtil; +import org.junit.Assert; +import org.junit.Test; public class FallbackTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ImplicitCastTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ImplicitCastTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,15 +22,20 @@ */ package com.oracle.truffle.api.dsl.test; -import org.junit.*; - -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.ImplicitCast; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.NodeChildren; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.dsl.TypeSystem; +import com.oracle.truffle.api.dsl.TypeSystemReference; import com.oracle.truffle.api.dsl.test.ImplicitCastTestFactory.ImplicitCast0NodeFactory; import com.oracle.truffle.api.dsl.test.ImplicitCastTestFactory.ImplicitCast1NodeFactory; import com.oracle.truffle.api.dsl.test.ImplicitCastTestFactory.ImplicitCast2NodeFactory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import org.junit.Assert; +import org.junit.Test; public class ImplicitCastTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ImportGuardsTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ImportGuardsTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,13 +22,14 @@ */ package com.oracle.truffle.api.dsl.test; -import static com.oracle.truffle.api.dsl.test.TestHelper.*; - -import org.junit.*; - -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.ImportStatic; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.ImportGuardsTestFactory.ImportGuards6Factory; +import static com.oracle.truffle.api.dsl.test.TestHelper.array; +import static com.oracle.truffle.api.dsl.test.TestHelper.assertRuns; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; +import org.junit.Test; public class ImportGuardsTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/InsertBeforeTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/InsertBeforeTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,7 +22,8 @@ */ package com.oracle.truffle.api.dsl.test; -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; public class InsertBeforeTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/IntegerLiteralGuardsTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/IntegerLiteralGuardsTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,18 +22,17 @@ */ package com.oracle.truffle.api.dsl.test; -import static com.oracle.truffle.api.dsl.test.TestHelper.*; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.IntegerLiteralGuardsTestFactory.BinaryLiteralTestFactory; import com.oracle.truffle.api.dsl.test.IntegerLiteralGuardsTestFactory.DecimalLiteralTestFactory; import com.oracle.truffle.api.dsl.test.IntegerLiteralGuardsTestFactory.HexLiteralTestFactory; import com.oracle.truffle.api.dsl.test.IntegerLiteralGuardsTestFactory.OctalLiteralTestFactory; +import static com.oracle.truffle.api.dsl.test.TestHelper.createCallTarget; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; +import static org.junit.Assert.assertEquals; +import org.junit.Test; @SuppressWarnings("unused") public class IntegerLiteralGuardsTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/LazyClassLoadingTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/LazyClassLoadingTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,14 +22,16 @@ */ package com.oracle.truffle.api.dsl.test; -import java.lang.reflect.*; - -import org.junit.*; - -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.NodeFactory; +import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.LazyClassLoadingTestFactory.TestNodeFactory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import org.junit.Assert; +import org.junit.Test; public class LazyClassLoadingTest { @Test
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/LimitTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/LimitTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,18 +22,20 @@ */ package com.oracle.truffle.api.dsl.test; -import static com.oracle.truffle.api.dsl.test.TestHelper.*; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.dsl.Cached; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.dsl.UnsupportedSpecializationException; import com.oracle.truffle.api.dsl.test.LimitTestFactory.ConstantLimitTestFactory; import com.oracle.truffle.api.dsl.test.LimitTestFactory.DefaultLimit3TestFactory; import com.oracle.truffle.api.dsl.test.LimitTestFactory.LocalLimitTestFactory; import com.oracle.truffle.api.dsl.test.LimitTestFactory.MethodLimitTestFactory; +import static com.oracle.truffle.api.dsl.test.TestHelper.createCallTarget; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; +import org.junit.Test; @SuppressWarnings("unused") public class LimitTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/MergeSpecializationsTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/MergeSpecializationsTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,21 +22,24 @@ */ package com.oracle.truffle.api.dsl.test; -import static com.oracle.truffle.api.dsl.test.TestHelper.*; -import static org.junit.Assert.*; - -import java.util.*; -import java.util.concurrent.*; - -import org.junit.*; - -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.dsl.internal.*; +import com.oracle.truffle.api.dsl.Cached; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.NodeFactory; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.dsl.internal.SpecializationNode; +import com.oracle.truffle.api.dsl.internal.SpecializedNode; import com.oracle.truffle.api.dsl.test.MergeSpecializationsTestFactory.TestCachedNodeFactory; import com.oracle.truffle.api.dsl.test.MergeSpecializationsTestFactory.TestNodeFactory; +import static com.oracle.truffle.api.dsl.test.TestHelper.createRoot; +import static com.oracle.truffle.api.dsl.test.TestHelper.executeWith; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; +import java.util.Arrays; +import java.util.concurrent.CountDownLatch; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; +import org.junit.Test; public class MergeSpecializationsTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/MethodGuardsTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/MethodGuardsTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,13 +22,9 @@ */ package com.oracle.truffle.api.dsl.test; -import static com.oracle.truffle.api.dsl.test.TestHelper.*; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.MethodGuardsTestFactory.GuardCompareWithFieldTestFactory; import com.oracle.truffle.api.dsl.test.MethodGuardsTestFactory.GuardComplexTestFactory; import com.oracle.truffle.api.dsl.test.MethodGuardsTestFactory.GuardEqualByteIntTestFactory; @@ -49,7 +45,12 @@ import com.oracle.truffle.api.dsl.test.MethodGuardsTestFactory.GuardStaticFieldTestFactory; import com.oracle.truffle.api.dsl.test.MethodGuardsTestFactory.GuardStaticFinalFieldCompareTestFactory; import com.oracle.truffle.api.dsl.test.MethodGuardsTestFactory.GuardUnboundMethodTestFactory; +import static com.oracle.truffle.api.dsl.test.TestHelper.createCallTarget; +import static com.oracle.truffle.api.dsl.test.TestHelper.getNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; +import org.junit.Test; @SuppressWarnings("unused") public class MethodGuardsTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/MethodGuardsWithArgumentsTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/MethodGuardsWithArgumentsTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,11 +22,9 @@ */ package com.oracle.truffle.api.dsl.test; -import static com.oracle.truffle.api.dsl.test.TestHelper.*; - -import org.junit.*; - -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.NodeChildren; +import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.MethodGuardsWithArgumentsTestFactory.MArguments0Factory; import com.oracle.truffle.api.dsl.test.MethodGuardsWithArgumentsTestFactory.MArguments1Factory; import com.oracle.truffle.api.dsl.test.MethodGuardsWithArgumentsTestFactory.MArgumentsDouble0Factory; @@ -34,8 +32,12 @@ import com.oracle.truffle.api.dsl.test.MethodGuardsWithArgumentsTestFactory.MArgumentsDouble2Factory; import com.oracle.truffle.api.dsl.test.MethodGuardsWithArgumentsTestFactory.MArgumentsDouble3Factory; import com.oracle.truffle.api.dsl.test.MethodGuardsWithArgumentsTestFactory.MArgumentsSingle2Factory; +import static com.oracle.truffle.api.dsl.test.TestHelper.createRoot; +import static com.oracle.truffle.api.dsl.test.TestHelper.executeWith; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; +import org.junit.Assert; +import org.junit.Test; public class MethodGuardsWithArgumentsTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NameDuplicationTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NameDuplicationTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,7 +22,8 @@ */ package com.oracle.truffle.api.dsl.test; -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; public class NameDuplicationTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NegatedGuardsTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NegatedGuardsTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,14 +22,14 @@ */ package com.oracle.truffle.api.dsl.test; -import static com.oracle.truffle.api.dsl.test.TestHelper.*; - -import org.junit.*; - -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.NegatedGuardsTestFactory.NegatedGuardNodeFactory; +import static com.oracle.truffle.api.dsl.test.TestHelper.createRoot; +import static com.oracle.truffle.api.dsl.test.TestHelper.executeWith; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; +import org.junit.Assert; +import org.junit.Test; public class NegatedGuardsTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NoTypeSystemTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NoTypeSystemTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,9 +22,8 @@ */ package com.oracle.truffle.api.dsl.test; -import org.junit.*; - -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.NoTypeSystemTestFactory.JustFrameTestNodeGen; import com.oracle.truffle.api.dsl.test.NoTypeSystemTestFactory.NoParameterTestNodeGen; import com.oracle.truffle.api.dsl.test.NoTypeSystemTestFactory.ObjectInterfaceNodeGen; @@ -32,8 +31,11 @@ import com.oracle.truffle.api.dsl.test.NoTypeSystemTestFactory.ObjectStringTestNodeGen; import com.oracle.truffle.api.dsl.test.NoTypeSystemTestFactory.PrimitiveTestNodeGen; import com.oracle.truffle.api.dsl.test.NoTypeSystemTestFactory.TypesNotInTypeSystemTestNodeGen; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.UnexpectedResultException; +import org.junit.Assert; +import org.junit.Test; public class NoTypeSystemTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NodeChildNoNameTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NodeChildNoNameTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,14 +22,16 @@ */ package com.oracle.truffle.api.dsl.test; -import org.junit.*; - -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.NodeChildren; +import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.NodeChildNoNameTestFactory.OneArgNoNameFactory; import com.oracle.truffle.api.dsl.test.NodeChildNoNameTestFactory.ThreeArgsNoNameFactory; import com.oracle.truffle.api.dsl.test.NodeChildNoNameTestFactory.TwoArgsNoNameFactory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import org.junit.Assert; +import org.junit.Test; public class NodeChildNoNameTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NodeChildTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NodeChildTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,14 +22,14 @@ */ package com.oracle.truffle.api.dsl.test; -import static com.oracle.truffle.api.dsl.test.TestHelper.*; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.NodeChildren; +import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.NodeFieldTestFactory.IntFieldTestNodeFactory; +import static com.oracle.truffle.api.dsl.test.TestHelper.createCallTarget; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; +import static org.junit.Assert.assertEquals; +import org.junit.Test; public class NodeChildTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NodeFieldTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NodeFieldTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,12 +22,9 @@ */ package com.oracle.truffle.api.dsl.test; -import static com.oracle.truffle.api.dsl.test.TestHelper.*; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.NodeField; +import com.oracle.truffle.api.dsl.NodeFields; +import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.NodeFieldTestFactory.IntFieldNoGetterTestNodeFactory; import com.oracle.truffle.api.dsl.test.NodeFieldTestFactory.IntFieldTestNodeFactory; import com.oracle.truffle.api.dsl.test.NodeFieldTestFactory.MultipleFieldsTestNodeFactory; @@ -35,7 +32,10 @@ import com.oracle.truffle.api.dsl.test.NodeFieldTestFactory.RewriteTestNodeFactory; import com.oracle.truffle.api.dsl.test.NodeFieldTestFactory.StringFieldTestNodeFactory; import com.oracle.truffle.api.dsl.test.NodeFieldTestFactory.TestContainerFactory; +import static com.oracle.truffle.api.dsl.test.TestHelper.createCallTarget; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; +import static org.junit.Assert.assertEquals; +import org.junit.Test; public class NodeFieldTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NullLiteralGuardsTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NullLiteralGuardsTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,17 +22,15 @@ */ package com.oracle.truffle.api.dsl.test; -import static com.oracle.truffle.api.dsl.test.TestHelper.*; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.NullLiteralGuardsTestFactory.CompareNotNullNodeFactory; import com.oracle.truffle.api.dsl.test.NullLiteralGuardsTestFactory.CompareObjectsNullNodeFactory; import com.oracle.truffle.api.dsl.test.NullLiteralGuardsTestFactory.CompareStringNullNodeFactory; +import static com.oracle.truffle.api.dsl.test.TestHelper.createCallTarget; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ChildrenNode; +import static org.junit.Assert.assertEquals; +import org.junit.Test; @SuppressWarnings("unused") public class NullLiteralGuardsTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NullTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NullTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,15 +22,16 @@ */ package com.oracle.truffle.api.dsl.test; -import static com.oracle.truffle.api.dsl.test.TestHelper.*; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.Fallback; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.NullTestFactory.NullTest1Factory; +import static com.oracle.truffle.api.dsl.test.TestHelper.createRoot; +import static com.oracle.truffle.api.dsl.test.TestHelper.executeWith; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; +import static org.junit.Assert.assertEquals; +import org.junit.Test; public class NullTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/PolymorphicTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/PolymorphicTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,21 +22,26 @@ */ package com.oracle.truffle.api.dsl.test; -import static com.oracle.truffle.api.dsl.test.TestHelper.*; -import static org.junit.Assert.*; - -import java.util.*; - -import org.junit.*; - -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.Fallback; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.PolymorphicTestFactory.Polymorphic1Factory; import com.oracle.truffle.api.dsl.test.PolymorphicTestFactory.Polymorphic2Factory; import com.oracle.truffle.api.dsl.test.PolymorphicTestFactory.Polymorphic3Factory; import com.oracle.truffle.api.dsl.test.TestHelper.ExecutionListener; +import static com.oracle.truffle.api.dsl.test.TestHelper.array; +import static com.oracle.truffle.api.dsl.test.TestHelper.assertRuns; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeCost; +import com.oracle.truffle.api.nodes.NodeUtil; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; +import org.junit.Assert; +import static org.junit.Assert.assertEquals; +import org.junit.Test; public class PolymorphicTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/PolymorphicTest2.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/PolymorphicTest2.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,16 +22,14 @@ */ package com.oracle.truffle.api.dsl.test; -import static com.oracle.truffle.api.dsl.test.TestHelper.*; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.BinaryNodeTest.BinaryNode; import com.oracle.truffle.api.dsl.test.PolymorphicTest2Factory.Polymorphic1Factory; +import static com.oracle.truffle.api.dsl.test.TestHelper.executeWith; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.NodeCost; +import static org.junit.Assert.assertEquals; +import org.junit.Test; public class PolymorphicTest2 {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ReachabilityTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ReachabilityTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,12 +22,13 @@ */ package com.oracle.truffle.api.dsl.test; -import java.math.*; - -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.NodeChildren; +import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.TypeSystemTest.Abstract; import com.oracle.truffle.api.dsl.test.TypeSystemTest.BExtendsAbstract; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; +import java.math.BigInteger; public class ReachabilityTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ShortCircuitTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ShortCircuitTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,18 +22,22 @@ */ package com.oracle.truffle.api.dsl.test; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.dsl.ImplicitCast; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.NodeChildren; +import com.oracle.truffle.api.dsl.ShortCircuit; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.dsl.TypeSystem; +import com.oracle.truffle.api.dsl.TypeSystemReference; import com.oracle.truffle.api.dsl.test.ShortCircuitTestFactory.DoubleChildNodeFactory; import com.oracle.truffle.api.dsl.test.ShortCircuitTestFactory.ShortCircuitWithImplicitCastNodeFactory; import com.oracle.truffle.api.dsl.test.ShortCircuitTestFactory.SingleChildNodeFactory; import com.oracle.truffle.api.dsl.test.ShortCircuitTestFactory.VarArgsNodeFactory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ArgumentNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; +import static org.junit.Assert.assertEquals; +import org.junit.Test; public class ShortCircuitTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/SourceSectionTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/SourceSectionTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,23 +22,30 @@ */ package com.oracle.truffle.api.dsl.test; -import static com.oracle.truffle.api.dsl.test.TestHelper.*; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; - -import org.junit.*; -import org.junit.experimental.theories.*; -import org.junit.runner.*; - -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.dsl.internal.*; +import com.oracle.truffle.api.dsl.CreateCast; +import com.oracle.truffle.api.dsl.Fallback; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.dsl.internal.SpecializationNode; import com.oracle.truffle.api.dsl.test.SourceSectionTestFactory.SourceSection0Factory; import com.oracle.truffle.api.dsl.test.SourceSectionTestFactory.SourceSection1Factory; +import static com.oracle.truffle.api.dsl.test.TestHelper.createRoot; +import static com.oracle.truffle.api.dsl.test.TestHelper.createRootPrefix; +import static com.oracle.truffle.api.dsl.test.TestHelper.executeWith; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ArgumentNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.source.SourceSection; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.sameInstance; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThat; +import org.junit.Test; +import org.junit.experimental.theories.DataPoints; +import org.junit.experimental.theories.Theories; +import org.junit.experimental.theories.Theory; +import org.junit.runner.RunWith; @RunWith(Theories.class) public class SourceSectionTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/SpecializationFallthroughTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/SpecializationFallthroughTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,11 +22,10 @@ */ package com.oracle.truffle.api.dsl.test; -import static com.oracle.truffle.api.dsl.test.TestHelper.*; - -import org.junit.*; - -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.Fallback; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.NodeChildren; +import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.SpecializationFallthroughTestFactory.FallthroughTest0Factory; import com.oracle.truffle.api.dsl.test.SpecializationFallthroughTestFactory.FallthroughTest1Factory; import com.oracle.truffle.api.dsl.test.SpecializationFallthroughTestFactory.FallthroughTest2Factory; @@ -34,8 +33,12 @@ import com.oracle.truffle.api.dsl.test.SpecializationFallthroughTestFactory.FallthroughTest4Factory; import com.oracle.truffle.api.dsl.test.SpecializationFallthroughTestFactory.FallthroughTest5Factory; import com.oracle.truffle.api.dsl.test.TestHelper.ExecutionListener; +import static com.oracle.truffle.api.dsl.test.TestHelper.array; +import static com.oracle.truffle.api.dsl.test.TestHelper.assertRuns; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; +import org.junit.Assert; +import org.junit.Test; public class SpecializationFallthroughTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/SpecializationGroupingTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/SpecializationGroupingTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,15 +22,16 @@ */ package com.oracle.truffle.api.dsl.test; -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.SpecializationGroupingTestFactory.TestElseConnectionBug1Factory; import com.oracle.truffle.api.dsl.test.SpecializationGroupingTestFactory.TestElseConnectionBug2Factory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.SlowPathException; +import org.junit.Assert; +import org.junit.Test; /** * Tests execution counts of guards. While we do not make guarantees for guard invocation except for
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TestHelper.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TestHelper.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,18 +22,22 @@ */ package com.oracle.truffle.api.dsl.test; -import static org.junit.Assert.*; - -import java.util.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.RootCallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.dsl.NodeFactory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ArgumentNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ChildrenNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.RootNode; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; /** * Utility class to provide some test helper functions.
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TestSerialization.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TestSerialization.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,16 +22,16 @@ */ package com.oracle.truffle.api.dsl.test; -import static com.oracle.truffle.api.dsl.test.TestHelper.*; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.Specialization; +import static com.oracle.truffle.api.dsl.test.TestHelper.executeWith; import com.oracle.truffle.api.dsl.test.TestSerializationFactory.SerializedNodeFactory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.NodeCost; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import org.junit.Test; public class TestSerialization {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TypeSystemErrorsTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TypeSystemErrorsTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,7 +22,11 @@ */ package com.oracle.truffle.api.dsl.test; -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.TypeCast; +import com.oracle.truffle.api.dsl.TypeCheck; +import com.oracle.truffle.api.dsl.TypeSystem; +import com.oracle.truffle.api.dsl.TypeSystemReference; import com.oracle.truffle.api.dsl.test.TypeSystemErrorsTest.Types1.Type1; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode;
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TypeSystemTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TypeSystemTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,14 +22,21 @@ */ package com.oracle.truffle.api.dsl.test; -import java.math.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.dsl.internal.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.dsl.GenerateNodeFactory; +import com.oracle.truffle.api.dsl.ImplicitCast; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.TypeCast; +import com.oracle.truffle.api.dsl.TypeCheck; +import com.oracle.truffle.api.dsl.TypeSystem; +import com.oracle.truffle.api.dsl.TypeSystemReference; +import com.oracle.truffle.api.dsl.internal.DSLOptions; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.RootNode; +import com.oracle.truffle.api.nodes.UnexpectedResultException; +import com.oracle.truffle.api.source.SourceSection; +import java.math.BigInteger; public class TypeSystemTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/UnsupportedSpecializationTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/UnsupportedSpecializationTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,16 +22,20 @@ */ package com.oracle.truffle.api.dsl.test; -import java.util.*; - -import org.junit.*; - -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.NodeChildren; +import com.oracle.truffle.api.dsl.ShortCircuit; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.dsl.UnsupportedSpecializationException; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; import com.oracle.truffle.api.dsl.test.UnsupportedSpecializationTestFactory.Unsupported1Factory; import com.oracle.truffle.api.dsl.test.UnsupportedSpecializationTestFactory.Unsupported2Factory; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeUtil; +import java.util.List; +import org.junit.Assert; +import org.junit.Test; public class UnsupportedSpecializationTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/ExampleNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/ExampleNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,12 +22,16 @@ */ package com.oracle.truffle.api.dsl.test.examples; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.dsl.internal.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.RootCallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.TypeSystemReference; +import com.oracle.truffle.api.dsl.internal.SpecializedNode; import com.oracle.truffle.api.dsl.test.TestingLanguage; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.RootNode; @TypeSystemReference(ExampleTypes.class) @NodeChild(value = "args", type = ExampleNode[].class)
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/ExampleTypes.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/ExampleTypes.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,7 +22,8 @@ */ package com.oracle.truffle.api.dsl.test.examples; -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.ImplicitCast; +import com.oracle.truffle.api.dsl.TypeSystem; import com.oracle.truffle.api.dsl.test.examples.FunctionCall.Function; import com.oracle.truffle.api.dsl.test.examples.Interop.TruffleObject; import com.oracle.truffle.api.dsl.test.examples.RubyCall.InternalMethod;
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/FunctionCall.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/FunctionCall.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,16 +22,19 @@ */ package com.oracle.truffle.api.dsl.test.examples; -import static com.oracle.truffle.api.dsl.test.examples.ExampleNode.*; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.CompilerAsserts; +import com.oracle.truffle.api.dsl.Cached; +import com.oracle.truffle.api.dsl.Specialization; +import static com.oracle.truffle.api.dsl.test.examples.ExampleNode.createArguments; +import static com.oracle.truffle.api.dsl.test.examples.ExampleNode.createDummyTarget; +import static com.oracle.truffle.api.dsl.test.examples.ExampleNode.createTarget; import com.oracle.truffle.api.dsl.test.examples.FunctionCallFactory.FunctionCallNodeGen; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.DirectCallNode; +import com.oracle.truffle.api.nodes.IndirectCallNode; +import static org.junit.Assert.assertEquals; +import org.junit.Test; /** * This example illustrates how {@link Cached} can be used to implement function calls that use
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/Interop.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/Interop.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,17 +22,17 @@ */ package com.oracle.truffle.api.dsl.test.examples; -import static com.oracle.truffle.api.dsl.test.examples.ExampleNode.*; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CallTarget; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.Cached; +import com.oracle.truffle.api.dsl.Specialization; +import static com.oracle.truffle.api.dsl.test.examples.ExampleNode.createArguments; +import static com.oracle.truffle.api.dsl.test.examples.ExampleNode.createTarget; import com.oracle.truffle.api.dsl.test.examples.InteropFactory.UseInteropNodeGen; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; +import static org.junit.Assert.assertEquals; +import org.junit.Test; /** * This example aims to illustrate how the {@link Cached} annotation can be used to implement a
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/MathPow.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/MathPow.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,15 +22,15 @@ */ package com.oracle.truffle.api.dsl.test.examples; -import static com.oracle.truffle.api.dsl.test.examples.ExampleNode.*; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.dsl.Cached; +import com.oracle.truffle.api.dsl.Specialization; +import static com.oracle.truffle.api.dsl.test.examples.ExampleNode.createArguments; +import static com.oracle.truffle.api.dsl.test.examples.ExampleNode.createTarget; import com.oracle.truffle.api.dsl.test.examples.MathPowFactory.MathPowNodeGen; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; +import static org.junit.Assert.assertEquals; +import org.junit.Test; /** * This example shows possible specializations for a simplified math pow node. It demonstrates how
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/RubyCall.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/RubyCall.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,23 +22,28 @@ */ package com.oracle.truffle.api.dsl.test.examples; -import static com.oracle.truffle.api.dsl.test.examples.ExampleNode.*; -import static org.junit.Assert.*; - -import java.util.*; - -import org.junit.*; - -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.Assumption; +import com.oracle.truffle.api.CallTarget; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.dsl.internal.*; +import com.oracle.truffle.api.dsl.Cached; +import com.oracle.truffle.api.dsl.ImportStatic; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.dsl.internal.SpecializedNode; +import static com.oracle.truffle.api.dsl.test.examples.ExampleNode.createArguments; +import static com.oracle.truffle.api.dsl.test.examples.ExampleNode.createTarget; import com.oracle.truffle.api.dsl.test.examples.RubyCallFactory.RubyDispatchNodeGen; import com.oracle.truffle.api.dsl.test.examples.RubyCallFactory.RubyHeadNodeGen; import com.oracle.truffle.api.dsl.test.examples.RubyCallFactory.RubyLookupNodeGen; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.utilities.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.DirectCallNode; +import com.oracle.truffle.api.nodes.IndirectCallNode; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.Node.Child; +import com.oracle.truffle.api.utilities.CyclicAssumption; +import java.util.HashMap; +import java.util.Map; +import static org.junit.Assert.assertEquals; +import org.junit.Test; /** * This example illustrates a simplified version of a Ruby function call semantics (RubyHeadNode).
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/StableDispatch.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/StableDispatch.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,11 +22,16 @@ */ package com.oracle.truffle.api.dsl.test.examples; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.utilities.*; +import com.oracle.truffle.api.Assumption; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.dsl.Cached; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.NodeChildren; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.DirectCallNode; +import com.oracle.truffle.api.nodes.IndirectCallNode; +import com.oracle.truffle.api.utilities.CyclicAssumption; /** * This example is based on the SLDispatchNode of SimpleLanguage. It shows how to implement a simple
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/processor/Compile.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/processor/Compile.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,14 +22,30 @@ */ package com.oracle.truffle.api.dsl.test.processor; -import static org.junit.Assert.*; - -import java.io.*; -import java.net.*; -import java.util.*; - -import javax.tools.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import javax.tools.Diagnostic; +import javax.tools.DiagnosticListener; +import javax.tools.FileObject; +import javax.tools.ForwardingJavaFileManager; +import javax.tools.JavaFileManager; +import javax.tools.JavaFileObject; import javax.tools.JavaFileObject.Kind; +import javax.tools.SimpleJavaFileObject; +import javax.tools.StandardJavaFileManager; +import javax.tools.ToolProvider; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; final class Compile implements DiagnosticListener<JavaFileObject> { private final List<Diagnostic<? extends JavaFileObject>> errors = new ArrayList<>();
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/processor/LanguageRegistrationTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/processor/LanguageRegistrationTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,14 +22,14 @@ */ package com.oracle.truffle.api.dsl.test.processor; -import java.io.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.debug.*; -import com.oracle.truffle.api.dsl.test.*; -import com.oracle.truffle.api.instrument.*; +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.instrument.ToolSupportProvider; import com.oracle.truffle.api.nodes.Node; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.source.Source; +import java.io.IOException; public class LanguageRegistrationTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/processor/TruffleProcessorTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/processor/TruffleProcessorTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,18 +22,17 @@ */ package com.oracle.truffle.api.dsl.test.processor; -import static org.junit.Assert.*; - -import java.util.*; - -import javax.annotation.processing.*; -import javax.tools.*; - -import org.junit.*; - -import com.oracle.truffle.api.dsl.test.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.dsl.processor.verify.*; +import com.oracle.truffle.api.dsl.test.ExpectError; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.dsl.processor.verify.VerifyTruffleProcessor; +import java.util.Locale; +import java.util.ServiceLoader; +import javax.annotation.processing.Processor; +import javax.tools.Diagnostic; +import javax.tools.JavaFileObject; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; +import org.junit.Test; /** * Verify errors emitted by the processor.
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/Cached.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/Cached.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,11 +24,13 @@ */ package com.oracle.truffle.api.dsl; -import java.lang.annotation.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.utilities.*; +import com.oracle.truffle.api.CompilerAsserts; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.utilities.BranchProfile; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * <p>
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/CreateCast.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/CreateCast.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,9 +24,11 @@ */ package com.oracle.truffle.api.dsl; -import java.lang.annotation.*; - -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Specifies a factory method that creates a {@link Node} which is used to cast this child.
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/Fallback.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/Fallback.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,9 +24,11 @@ */ package com.oracle.truffle.api.dsl; -import java.lang.annotation.*; - -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * <p>
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/GenerateNodeFactory.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/GenerateNodeFactory.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,10 @@ */ package com.oracle.truffle.api.dsl; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Annotate nodes or base classes of nodes to generate factory handlers implementing the
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/GeneratedBy.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/GeneratedBy.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,10 @@ */ package com.oracle.truffle.api.dsl; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Marks a type as being generated based on another class or method of a class.
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/ImplicitCast.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/ImplicitCast.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,10 @@ */ package com.oracle.truffle.api.dsl; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; @Retention(RetentionPolicy.CLASS) @Target({ElementType.METHOD})
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/Implies.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/Implies.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,10 @@ */ package com.oracle.truffle.api.dsl; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Experimental API.
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/ImportStatic.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/ImportStatic.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,10 @@ */ package com.oracle.truffle.api.dsl; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Imports all <code>public</code> and <code>static</code> methods and fields of the provided
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/NodeAssumptions.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/NodeAssumptions.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,9 +24,11 @@ */ package com.oracle.truffle.api.dsl; -import java.lang.annotation.*; - -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.Assumption; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * @deprecated use {@link NodeField} with type {@link Assumption} instead.
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/NodeChild.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/NodeChild.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,9 +24,11 @@ */ package com.oracle.truffle.api.dsl; -import java.lang.annotation.*; - -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * A {@link NodeChild} element defines an executable child for the enclosing {@link Node}. A
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/NodeChildren.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/NodeChildren.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,10 @@ */ package com.oracle.truffle.api.dsl; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; @Retention(RetentionPolicy.CLASS) @Target({ElementType.TYPE})
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/NodeFactory.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/NodeFactory.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,9 +24,8 @@ */ package com.oracle.truffle.api.dsl; -import java.util.*; - -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; +import java.util.List; /** * Enables the dynamic creation of generated nodes. It provides an convenient way to instantiate
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/NodeField.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/NodeField.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,9 +24,11 @@ */ package com.oracle.truffle.api.dsl; -import java.lang.annotation.*; - -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * A {@link NodeField} element defines a field for the generated {@link Node}. A {@link Node}
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/NodeFields.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/NodeFields.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,9 +24,11 @@ */ package com.oracle.truffle.api.dsl; -import java.lang.annotation.*; - -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * A {@link NodeFields} element defines a field for the generated {@link Node}. A {@link Node}
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/ShortCircuit.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/ShortCircuit.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,10 @@ */ package com.oracle.truffle.api.dsl; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; @Retention(RetentionPolicy.CLASS) @Target({ElementType.METHOD})
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/Specialization.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/Specialization.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,11 +24,16 @@ */ package com.oracle.truffle.api.dsl; -import java.lang.annotation.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.Assumption; +import com.oracle.truffle.api.ExactMath; +import com.oracle.truffle.api.frame.Frame; +import com.oracle.truffle.api.frame.MaterializedFrame; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * <p>
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/TypeCast.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/TypeCast.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,10 @@ */ package com.oracle.truffle.api.dsl; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Overrides the standard way of casting a certain type in a {@link TypeSystem}. This is useful for
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/TypeCheck.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/TypeCheck.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,10 @@ */ package com.oracle.truffle.api.dsl; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Overrides the standard way of checking for a certain type in a {@link TypeSystem}. This is useful
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/TypeSystem.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/TypeSystem.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,9 +24,11 @@ */ package com.oracle.truffle.api.dsl; -import java.lang.annotation.*; - -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * <p>
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/TypeSystemReference.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/TypeSystemReference.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,9 +24,11 @@ */ package com.oracle.truffle.api.dsl; -import java.lang.annotation.*; - -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * References a {@link TypeSystem} on a node. Must be applied on a {@link Node} class. At least one
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/UnsupportedSpecializationException.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/UnsupportedSpecializationException.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,10 +24,10 @@ */ package com.oracle.truffle.api.dsl; -import java.util.*; - import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; +import java.util.Arrays; +import java.util.Objects; /** * Thrown by the generated code of Truffle-DSL if no compatible Specialization could be found for
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/DSLNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/DSLNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api.dsl.internal; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; /** * This is NOT public API. Do not use directly. This code may change without notice.
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/DSLOptions.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/DSLOptions.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,10 @@ */ package com.oracle.truffle.api.dsl.internal; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Internal DSL options to tune the generated code. These are expert options and not intended to be
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/DSLShare.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/DSLShare.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.truffle.api.dsl.internal; -import java.util.*; -import java.util.concurrent.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CompilerAsserts; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeCost; +import java.util.Arrays; +import java.util.concurrent.Callable; /** Contains utility classes shared across generated DSLNode implementations. */ public class DSLShare {
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/NodeFactoryBase.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/NodeFactoryBase.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,10 +24,11 @@ */ package com.oracle.truffle.api.dsl.internal; -import java.util.*; - -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.dsl.NodeFactory; +import com.oracle.truffle.api.nodes.Node; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; /** * This is NOT public API. Do not use directly. This code may change without notice.
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/SlowPathEvent.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/SlowPathEvent.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,8 +24,8 @@ */ package com.oracle.truffle.api.dsl.internal; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.Frame; +import com.oracle.truffle.api.nodes.Node; /** * Lazy rewrite event that implements {@link CharSequence} to be provided as message in
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/SpecializationNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/SpecializationNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,12 +24,10 @@ */ package com.oracle.truffle.api.dsl.internal; -import java.lang.reflect.*; -import java.util.*; -import java.util.concurrent.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.Assumption; +import com.oracle.truffle.api.CompilerAsserts; +import com.oracle.truffle.api.CompilerDirectives; +import com.oracle.truffle.api.dsl.UnsupportedSpecializationException; import com.oracle.truffle.api.dsl.internal.SlowPathEvent.SlowPathEvent0; import com.oracle.truffle.api.dsl.internal.SlowPathEvent.SlowPathEvent1; import com.oracle.truffle.api.dsl.internal.SlowPathEvent.SlowPathEvent2; @@ -37,8 +35,19 @@ import com.oracle.truffle.api.dsl.internal.SlowPathEvent.SlowPathEvent4; import com.oracle.truffle.api.dsl.internal.SlowPathEvent.SlowPathEvent5; import com.oracle.truffle.api.dsl.internal.SlowPathEvent.SlowPathEventN; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.Frame; +import com.oracle.truffle.api.nodes.ExplodeLoop; +import com.oracle.truffle.api.nodes.InvalidAssumptionException; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeClass; +import com.oracle.truffle.api.nodes.NodeCost; +import com.oracle.truffle.api.nodes.NodeFieldAccessor; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.nodes.NodeUtil; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.concurrent.Callable; /** * Internal implementation dependent base class for generated specialized nodes.
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/SpecializedNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/SpecializedNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api.dsl.internal; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.NodeInterface; /** * Implemented by DSL generated operation classes. This is internal implementation dependent API.
--- a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/SuppressFBWarnings.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/SuppressFBWarnings.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,8 @@ */ package com.oracle.truffle.api.dsl.internal; -import java.lang.annotation.*; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; /** * Used to suppress <a href="http://findbugs.sourceforge.net">FindBugs</a> warnings.
--- a/truffle/com.oracle.truffle.api.interop.java.test/src/com/oracle/truffle/api/interop/java/test/JavaInteropSpeedTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.interop.java.test/src/com/oracle/truffle/api/interop/java/test/JavaInteropSpeedTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -28,10 +28,10 @@ import com.oracle.truffle.api.interop.java.JavaInterop; import java.util.Random; import org.junit.AfterClass; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; public class JavaInteropSpeedTest { private static final int REPEAT = 10000;
--- a/truffle/com.oracle.truffle.api.interop.java.test/src/com/oracle/truffle/api/interop/java/test/MethodMessageTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.interop.java.test/src/com/oracle/truffle/api/interop/java/test/MethodMessageTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -27,7 +27,9 @@ import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.interop.java.JavaInterop; import com.oracle.truffle.api.interop.java.MethodMessage; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import org.junit.Test; public class MethodMessageTest {
--- a/truffle/com.oracle.truffle.api.interop.java.test/src/com/oracle/truffle/api/interop/java/test/PrimitiveArrayInteropTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.interop.java.test/src/com/oracle/truffle/api/interop/java/test/PrimitiveArrayInteropTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -27,9 +27,10 @@ import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.interop.java.JavaInterop; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; public class PrimitiveArrayInteropTest { public Object[] stringArr;
--- a/truffle/com.oracle.truffle.api.interop.java.test/src/com/oracle/truffle/api/interop/java/test/PrimitiveRawArrayInteropTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.interop.java.test/src/com/oracle/truffle/api/interop/java/test/PrimitiveRawArrayInteropTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -27,9 +27,10 @@ import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.interop.java.JavaInterop; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; public class PrimitiveRawArrayInteropTest { private Object[] objArr;
--- a/truffle/com.oracle.truffle.api.interop/src/com/oracle/truffle/api/interop/ForeignObjectAccessHeadNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.interop/src/com/oracle/truffle/api/interop/ForeignObjectAccessHeadNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -25,7 +25,7 @@ package com.oracle.truffle.api.interop; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.Node; final class ForeignObjectAccessHeadNode extends Node {
--- a/truffle/com.oracle.truffle.api.interop/src/com/oracle/truffle/api/interop/Message.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.interop/src/com/oracle/truffle/api/interop/Message.java Wed Sep 16 11:33:22 2015 +0200 @@ -26,8 +26,8 @@ import com.oracle.truffle.api.TruffleLanguage.Env; import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.interop.ForeignAccess.Factory; import com.oracle.truffle.api.nodes.Node; -import com.oracle.truffle.api.interop.ForeignAccess.Factory; /** * Inter-operability is based on sending messages. Standard messages are defined as as constants
--- a/truffle/com.oracle.truffle.api.interop/src/com/oracle/truffle/api/interop/ObjectAccessNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.interop/src/com/oracle/truffle/api/interop/ObjectAccessNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,8 +24,8 @@ */ package com.oracle.truffle.api.interop; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; abstract class ObjectAccessNode extends Node {
--- a/truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/DynamicObject.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/DynamicObject.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,8 +24,8 @@ */ package com.oracle.truffle.api.object; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.interop.*; +import com.oracle.truffle.api.TypedObject; +import com.oracle.truffle.api.interop.TruffleObject; /** * Represents an object members of which can be dynamically added and removed at run time.
--- a/truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/FinalLocationException.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/FinalLocationException.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api.object; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.SlowPathException; /** * This exception is thrown on an attempt to assign a value to a final location.
--- a/truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/IncompatibleLocationException.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/IncompatibleLocationException.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api.object; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.SlowPathException; /** * This exception is thrown on an attempt to assign an incompatible value to a location.
--- a/truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/Layout.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/Layout.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,12 +24,11 @@ */ package com.oracle.truffle.api.object; +import com.oracle.truffle.api.nodes.NodeUtil.FieldOffsetProvider; +import com.oracle.truffle.api.object.Shape.Allocator; import java.util.EnumSet; import java.util.ServiceLoader; -import com.oracle.truffle.api.nodes.NodeUtil.FieldOffsetProvider; -import com.oracle.truffle.api.object.Shape.Allocator; - /** * Describes layout and behavior of a {@link DynamicObject} subclass and is used to create shapes. *
--- a/truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/Location.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/Location.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api.object; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CompilerDirectives; /** * Property location.
--- a/truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/ObjectType.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/ObjectType.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,10 +24,11 @@ */ package com.oracle.truffle.api.object; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; +import com.oracle.truffle.api.interop.ForeignAccess; import com.oracle.truffle.api.interop.Message; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.interop.*; +import com.oracle.truffle.api.interop.TruffleObject; public class ObjectType { /**
--- a/truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/Shape.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/Shape.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.truffle.api.object; -import java.util.*; - -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.Assumption; +import java.util.EnumSet; +import java.util.List; /** * Shape objects create a mapping of Property objects to Locations. Shapes are immutable; adding or
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ArgumentsTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ArgumentsTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,11 +22,14 @@ */ package com.oracle.truffle.api.test; -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.TruffleRuntime; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.RootNode; +import org.junit.Assert; +import org.junit.Test; /** * <h3>Passing Arguments</h3>
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/CallTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/CallTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,11 +22,13 @@ */ package com.oracle.truffle.api.test; -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.TruffleRuntime; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.RootNode; +import org.junit.Assert; +import org.junit.Test; /** * <h3>Calling Another Tree</h3>
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ChildNodeTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ChildNodeTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,14 +22,16 @@ */ package com.oracle.truffle.api.test; -import java.util.*; - -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.TruffleRuntime; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.Node.Child; +import com.oracle.truffle.api.nodes.RootNode; +import java.util.Iterator; +import org.junit.Assert; +import org.junit.Test; /** * <h3>Creating a Child Node</h3>
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ChildrenNodesTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ChildrenNodesTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,13 +22,15 @@ */ package com.oracle.truffle.api.test; -import java.util.*; - -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.TruffleRuntime; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.RootNode; +import java.util.Iterator; +import org.junit.Assert; +import org.junit.Test; /** * <h3>Creating an Array of Children Nodes</h3>
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/FinalFieldTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/FinalFieldTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,11 +22,14 @@ */ package com.oracle.truffle.api.test; -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.TruffleRuntime; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.RootNode; +import org.junit.Assert; +import org.junit.Test; /** * <h3>Using Final Fields in Node Classes</h3>
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/FrameSlotTypeSpecializationTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/FrameSlotTypeSpecializationTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,11 +22,18 @@ */ package com.oracle.truffle.api.test; -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.TruffleRuntime; +import com.oracle.truffle.api.frame.FrameDescriptor; +import com.oracle.truffle.api.frame.FrameSlot; +import com.oracle.truffle.api.frame.FrameSlotKind; +import com.oracle.truffle.api.frame.FrameSlotTypeException; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.RootNode; +import org.junit.Assert; +import org.junit.Test; /** * <h3>Specializing Frame Slot Types</h3>
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/FrameTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/FrameTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,11 +22,19 @@ */ package com.oracle.truffle.api.test; -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.TruffleRuntime; +import com.oracle.truffle.api.frame.Frame; +import com.oracle.truffle.api.frame.FrameDescriptor; +import com.oracle.truffle.api.frame.FrameSlot; +import com.oracle.truffle.api.frame.FrameSlotKind; +import com.oracle.truffle.api.frame.FrameSlotTypeException; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.RootNode; +import org.junit.Assert; +import org.junit.Test; /** * <h3>Storing Values in Frame Slots</h3>
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/InterfaceChildFieldTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/InterfaceChildFieldTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,13 +22,17 @@ */ package com.oracle.truffle.api.test; -import java.util.*; - -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.TruffleRuntime; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeInterface; +import com.oracle.truffle.api.nodes.NodeUtil; +import com.oracle.truffle.api.nodes.RootNode; +import java.util.Iterator; +import org.junit.Assert; +import org.junit.Test; /** * Test child fields declared with interface types instead of {@link Node} subclasses.
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ReplaceTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ReplaceTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,15 +22,16 @@ */ package com.oracle.truffle.api.test; -import static org.junit.Assert.*; - -import java.util.*; - -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.TruffleRuntime; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.RootNode; +import java.util.Iterator; +import org.junit.Assert; +import static org.junit.Assert.assertEquals; +import org.junit.Test; /** * <h3>Replacing Nodes at Run Time</h3>
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ReturnTypeSpecializationTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ReturnTypeSpecializationTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,11 +22,19 @@ */ package com.oracle.truffle.api.test; -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.TruffleRuntime; +import com.oracle.truffle.api.frame.FrameDescriptor; +import com.oracle.truffle.api.frame.FrameSlot; +import com.oracle.truffle.api.frame.FrameSlotKind; +import com.oracle.truffle.api.frame.FrameSlotTypeException; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.RootNode; +import com.oracle.truffle.api.nodes.UnexpectedResultException; +import org.junit.Assert; +import org.junit.Test; /** * <h3>Specializing Return Types</h3>
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/RootNodeTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/RootNodeTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,11 +22,13 @@ */ package com.oracle.truffle.api.test; -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.TruffleRuntime; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.RootNode; +import org.junit.Assert; +import org.junit.Test; /** * <h3>Creating a Root Node</h3>
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ThreadSafetyTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ThreadSafetyTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,17 +22,23 @@ */ package com.oracle.truffle.api.test; -import static org.junit.Assert.*; - -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.*; - -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.TruffleRuntime; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.DirectCallNode; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeUtil; +import com.oracle.truffle.api.nodes.RootNode; +import java.util.Random; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import org.junit.Ignore; +import org.junit.Test; /** * Test node rewriting in a tree shared across multiple threads (run with -ea).
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleRuntimeTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleRuntimeTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,16 +22,25 @@ */ package com.oracle.truffle.api.test; -import static org.junit.Assert.*; - -import java.util.*; - -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.RootCallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.TruffleRuntime; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.NodeUtil; +import com.oracle.truffle.api.nodes.RootNode; +import com.oracle.truffle.api.source.Source; +import com.oracle.truffle.api.source.SourceSection; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import org.junit.Before; +import org.junit.Test; /** * <h3>Accessing the Truffle Runtime</h3>
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/instrument/AdvancedInstrumentTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/instrument/AdvancedInstrumentTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,17 +22,20 @@ */ package com.oracle.truffle.api.test.instrument; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.instrument.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.TruffleRuntime; +import com.oracle.truffle.api.instrument.AdvancedInstrumentRoot; +import com.oracle.truffle.api.instrument.AdvancedInstrumentRootFactory; +import com.oracle.truffle.api.instrument.Instrument; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.test.instrument.InstrumentationTestNodes.TestAdditionNode; import com.oracle.truffle.api.test.instrument.InstrumentationTestNodes.TestAdvancedInstrumentCounterRoot; import com.oracle.truffle.api.test.instrument.InstrumentationTestNodes.TestRootNode; import com.oracle.truffle.api.test.instrument.InstrumentationTestNodes.TestValueNode; +import static org.junit.Assert.assertEquals; +import org.junit.Test; /** * Tests the kind of instrumentation where a client can provide an AST fragment to be
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/instrument/InstrumentationTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/instrument/InstrumentationTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,24 +22,37 @@ */ package com.oracle.truffle.api.test.instrument; -import static org.junit.Assert.*; - -import java.util.*; - -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.instrument.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.TruffleRuntime; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.instrument.ASTProber; +import com.oracle.truffle.api.instrument.Instrument; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.instrument.ProbeException; import com.oracle.truffle.api.instrument.ProbeFailure.Reason; +import com.oracle.truffle.api.instrument.ProbeNode; import com.oracle.truffle.api.instrument.ProbeNode.WrapperNode; -import com.oracle.truffle.api.instrument.impl.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.instrument.SimpleInstrumentListener; +import com.oracle.truffle.api.instrument.StandardInstrumentListener; +import com.oracle.truffle.api.instrument.SyntaxTag; +import com.oracle.truffle.api.instrument.impl.DefaultProbeListener; +import com.oracle.truffle.api.instrument.impl.DefaultSimpleInstrumentListener; +import com.oracle.truffle.api.instrument.impl.DefaultStandardInstrumentListener; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeVisitor; +import com.oracle.truffle.api.nodes.RootNode; import com.oracle.truffle.api.test.instrument.InstrumentationTestNodes.TestAdditionNode; import com.oracle.truffle.api.test.instrument.InstrumentationTestNodes.TestLanguageNode; import com.oracle.truffle.api.test.instrument.InstrumentationTestNodes.TestLanguageWrapperNode; import com.oracle.truffle.api.test.instrument.InstrumentationTestNodes.TestRootNode; import com.oracle.truffle.api.test.instrument.InstrumentationTestNodes.TestValueNode; +import java.util.Iterator; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import org.junit.Test; /** * <h3>AST Instrumentation</h3>
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/instrument/InstrumentationTestNodes.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/instrument/InstrumentationTestNodes.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,11 +22,17 @@ */ package com.oracle.truffle.api.test.instrument; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.instrument.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.instrument.AdvancedInstrumentRoot; +import com.oracle.truffle.api.instrument.KillException; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.instrument.ProbeNode; import com.oracle.truffle.api.instrument.ProbeNode.WrapperNode; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeCost; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.nodes.RootNode; import com.oracle.truffle.api.test.TestingLanguage; /**
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/interop/ForeignAccessSingleThreadedTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/interop/ForeignAccessSingleThreadedTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -27,11 +27,11 @@ import com.oracle.truffle.api.interop.Message; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.nodes.Node; - -import org.junit.*; - +import org.junit.After; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; +import org.junit.Before; +import org.junit.Test; public class ForeignAccessSingleThreadedTest implements ForeignAccess.Factory, TruffleObject { ForeignAccess fa;
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/interop/MessageStringTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/interop/MessageStringTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -27,7 +27,9 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.Locale; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; import org.junit.Test; public class MessageStringTest {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/nodes/NodeUtilTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/nodes/NodeUtilTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,16 +22,15 @@ */ package com.oracle.truffle.api.test.nodes; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; - -import java.util.*; - -import org.junit.*; - -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeUtil; +import com.oracle.truffle.api.nodes.RootNode; import com.oracle.truffle.api.test.TestingLanguage; +import java.util.Iterator; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; +import org.junit.Test; public class NodeUtilTest {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/nodes/SafeReplaceTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/nodes/SafeReplaceTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,13 +22,14 @@ */ package com.oracle.truffle.api.test.nodes; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.RootNode; import com.oracle.truffle.api.test.TestingLanguage; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import org.junit.Test; /** * Tests optional method for ensuring that a node replacement is type safe. Ordinary node
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/nodes/serial/PostOrderDeserializerTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/nodes/serial/PostOrderDeserializerTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,13 +22,9 @@ */ package com.oracle.truffle.api.test.nodes.serial; -import java.nio.*; -import java.util.*; - -import org.junit.*; - -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.nodes.serial.*; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.serial.PostOrderDeserializer; +import com.oracle.truffle.api.nodes.serial.VariableLengthIntBuffer; import com.oracle.truffle.api.test.nodes.serial.TestNodes.EmptyNode; import com.oracle.truffle.api.test.nodes.serial.TestNodes.NodeWithArray; import com.oracle.truffle.api.test.nodes.serial.TestNodes.NodeWithFields; @@ -37,6 +33,12 @@ import com.oracle.truffle.api.test.nodes.serial.TestNodes.NodeWithTwoArray; import com.oracle.truffle.api.test.nodes.serial.TestNodes.NodeWithTwoChilds; import com.oracle.truffle.api.test.nodes.serial.TestNodes.StringNode; +import java.nio.ByteBuffer; +import java.util.Iterator; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; public class PostOrderDeserializerTest {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/nodes/serial/PostOrderSerializerTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/nodes/serial/PostOrderSerializerTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,16 +22,19 @@ */ package com.oracle.truffle.api.test.nodes.serial; -import org.junit.*; - -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.nodes.serial.*; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.serial.PostOrderSerializer; +import com.oracle.truffle.api.nodes.serial.VariableLengthIntBuffer; import com.oracle.truffle.api.test.nodes.serial.TestNodes.EmptyNode; import com.oracle.truffle.api.test.nodes.serial.TestNodes.NodeWithArray; import com.oracle.truffle.api.test.nodes.serial.TestNodes.NodeWithFields; import com.oracle.truffle.api.test.nodes.serial.TestNodes.NodeWithThreeChilds; import com.oracle.truffle.api.test.nodes.serial.TestNodes.NodeWithTwoArray; import com.oracle.truffle.api.test.nodes.serial.TestNodes.StringNode; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; public class PostOrderSerializerTest {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/nodes/serial/TestNodes.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/nodes/serial/TestNodes.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,9 +22,8 @@ */ package com.oracle.truffle.api.test.nodes.serial; -import java.util.*; - -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; +import java.util.Objects; final class TestNodes {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/nodes/serial/TestSerializerConstantPool.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/nodes/serial/TestSerializerConstantPool.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.truffle.api.test.nodes.serial; -import java.util.*; - -import com.oracle.truffle.api.nodes.serial.*; +import com.oracle.truffle.api.nodes.serial.SerializerConstantPool; +import com.oracle.truffle.api.nodes.serial.UnsupportedConstantPoolTypeException; +import java.util.HashMap; +import java.util.Map; class TestSerializerConstantPool implements SerializerConstantPool {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/nodes/serial/VariableLengthIntBufferTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/nodes/serial/VariableLengthIntBufferTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.truffle.api.test.nodes.serial; -import java.nio.*; - -import org.junit.*; - -import com.oracle.truffle.api.nodes.serial.*; +import com.oracle.truffle.api.nodes.serial.VariableLengthIntBuffer; +import java.nio.ByteBuffer; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; public class VariableLengthIntBufferTest {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/source/BytesSourceSectionTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/source/BytesSourceSectionTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,13 +22,10 @@ */ package com.oracle.truffle.api.test.source; -import static org.junit.Assert.*; - -import java.nio.charset.*; - -import org.junit.*; - -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.source.Source; +import java.nio.charset.StandardCharsets; +import static org.junit.Assert.assertEquals; +import org.junit.Test; public class BytesSourceSectionTest {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/source/SourceSectionTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/source/SourceSectionTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.truffle.api.test.source; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.source.Source; +import com.oracle.truffle.api.source.SourceSection; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import org.junit.Ignore; +import org.junit.Test; public class SourceSectionTest {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/source/SourceTextTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/source/SourceTextTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,11 +22,9 @@ */ package com.oracle.truffle.api.test.source; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.source.Source; +import static org.junit.Assert.assertEquals; +import org.junit.Test; public class SourceTextTest {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/AlwaysValidAssumptionTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/AlwaysValidAssumptionTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,12 +22,10 @@ */ package com.oracle.truffle.api.test.utilities; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.utilities.*; +import com.oracle.truffle.api.nodes.InvalidAssumptionException; +import com.oracle.truffle.api.utilities.AlwaysValidAssumption; +import static org.junit.Assert.assertTrue; +import org.junit.Test; public class AlwaysValidAssumptionTest {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/AssumedValueTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/AssumedValueTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,11 +22,9 @@ */ package com.oracle.truffle.api.test.utilities; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.utilities.*; +import com.oracle.truffle.api.utilities.AssumedValue; +import static org.junit.Assert.assertEquals; +import org.junit.Test; public class AssumedValueTest {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/BinaryConditionProfileTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/BinaryConditionProfileTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,14 +22,16 @@ */ package com.oracle.truffle.api.test.utilities; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; - -import org.junit.*; -import org.junit.experimental.theories.*; -import org.junit.runner.*; - -import com.oracle.truffle.api.utilities.*; +import com.oracle.truffle.api.utilities.BinaryConditionProfile; +import com.oracle.truffle.api.utilities.ConditionProfile; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.theories.DataPoints; +import org.junit.experimental.theories.Theories; +import org.junit.experimental.theories.Theory; +import org.junit.runner.RunWith; @RunWith(Theories.class) public class BinaryConditionProfileTest {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/BranchProfileTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/BranchProfileTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,11 +22,9 @@ */ package com.oracle.truffle.api.test.utilities; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.utilities.*; +import com.oracle.truffle.api.utilities.BranchProfile; +import static org.junit.Assert.assertTrue; +import org.junit.Test; public class BranchProfileTest {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/CountingConditionProfileTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/CountingConditionProfileTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,14 +22,16 @@ */ package com.oracle.truffle.api.test.utilities; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; - -import org.junit.*; -import org.junit.experimental.theories.*; -import org.junit.runner.*; - -import com.oracle.truffle.api.utilities.*; +import com.oracle.truffle.api.utilities.ConditionProfile; +import com.oracle.truffle.api.utilities.CountingConditionProfile; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.theories.DataPoints; +import org.junit.experimental.theories.Theories; +import org.junit.experimental.theories.Theory; +import org.junit.runner.RunWith; @RunWith(Theories.class) public class CountingConditionProfileTest {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/CyclicAssumptionTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/CyclicAssumptionTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,12 +22,12 @@ */ package com.oracle.truffle.api.test.utilities; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.utilities.*; +import com.oracle.truffle.api.Assumption; +import com.oracle.truffle.api.utilities.CyclicAssumption; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import org.junit.Test; public class CyclicAssumptionTest {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/ExactClassValueProfileTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/ExactClassValueProfileTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,15 +22,18 @@ */ package com.oracle.truffle.api.test.utilities; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; - -import org.junit.*; -import org.junit.experimental.theories.*; -import org.junit.runner.*; - -import com.oracle.truffle.api.utilities.*; +import com.oracle.truffle.api.utilities.ValueProfile; import java.lang.reflect.Method; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThat; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.theories.DataPoint; +import org.junit.experimental.theories.Theories; +import org.junit.experimental.theories.Theory; +import org.junit.runner.RunWith; @RunWith(Theories.class) public class ExactClassValueProfileTest {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/IdentityValueProfileTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/IdentityValueProfileTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,15 +22,17 @@ */ package com.oracle.truffle.api.test.utilities; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; - -import org.junit.*; -import org.junit.experimental.theories.*; -import org.junit.runner.*; - -import com.oracle.truffle.api.utilities.*; +import com.oracle.truffle.api.utilities.ValueProfile; import java.lang.reflect.Method; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.theories.DataPoint; +import org.junit.experimental.theories.Theories; +import org.junit.experimental.theories.Theory; +import org.junit.runner.RunWith; @RunWith(Theories.class) public class IdentityValueProfileTest {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/NeverValidAssumptionTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/NeverValidAssumptionTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,12 +22,11 @@ */ package com.oracle.truffle.api.test.utilities; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.utilities.*; +import com.oracle.truffle.api.nodes.InvalidAssumptionException; +import com.oracle.truffle.api.utilities.NeverValidAssumption; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.fail; +import org.junit.Test; public class NeverValidAssumptionTest {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/PrimitiveValueProfileTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/PrimitiveValueProfileTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,14 +22,20 @@ */ package com.oracle.truffle.api.test.utilities; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; - -import org.junit.*; -import org.junit.experimental.theories.*; -import org.junit.runner.*; - -import com.oracle.truffle.api.utilities.*; +import com.oracle.truffle.api.utilities.PrimitiveValueProfile; +import com.oracle.truffle.api.utilities.ValueProfile; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.theories.DataPoint; +import org.junit.experimental.theories.Theories; +import org.junit.experimental.theories.Theory; +import org.junit.runner.RunWith; @RunWith(Theories.class) public class PrimitiveValueProfileTest {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/UnionAssumptionTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/UnionAssumptionTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,13 +22,13 @@ */ package com.oracle.truffle.api.test.utilities; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.utilities.*; +import com.oracle.truffle.api.Assumption; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.nodes.InvalidAssumptionException; +import com.oracle.truffle.api.utilities.UnionAssumption; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import org.junit.Test; public class UnionAssumptionTest {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/vm/AccessorTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/vm/AccessorTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -32,7 +32,9 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.concurrent.Executors; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import org.junit.BeforeClass; import org.junit.Test;
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/vm/ExceptionDuringParsingTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/vm/ExceptionDuringParsingTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -27,7 +27,9 @@ import static com.oracle.truffle.api.test.vm.ImplicitExplicitExportTest.L1; import com.oracle.truffle.api.vm.TruffleVM; import java.io.IOException; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; import org.junit.Test; public class ExceptionDuringParsingTest {
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/vm/GlobalSymbolTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/vm/GlobalSymbolTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,11 +24,12 @@ import com.oracle.truffle.api.source.Source; import static com.oracle.truffle.api.test.vm.ImplicitExplicitExportTest.L3; -import com.oracle.truffle.api.vm.*; -import java.io.*; +import com.oracle.truffle.api.vm.TruffleVM; +import java.io.IOException; import java.util.concurrent.Executors; -import org.junit.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import org.junit.Test; public class GlobalSymbolTest { @Test
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/vm/ImplicitExplicitExportTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/vm/ImplicitExplicitExportTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,19 +22,29 @@ */ package com.oracle.truffle.api.test.vm; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CallTarget; +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.*; -import com.oracle.truffle.api.instrument.*; +import com.oracle.truffle.api.debug.DebugSupportProvider; +import com.oracle.truffle.api.instrument.ToolSupportProvider; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.RootNode; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.api.vm.*; -import java.io.*; -import java.util.*; +import com.oracle.truffle.api.source.Source; +import com.oracle.truffle.api.vm.TruffleVM; +import java.io.IOException; +import java.io.Reader; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; import java.util.concurrent.Executors; -import org.junit.*; -import static org.junit.Assert.*; +import org.junit.After; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertTrue; +import org.junit.Before; +import org.junit.Test; public class ImplicitExplicitExportTest { private static Thread mainThread;
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/vm/InitializationTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/vm/InitializationTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,25 +22,37 @@ */ package com.oracle.truffle.api.test.vm; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.Truffle; +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.DebugSupportException; 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.*; -import com.oracle.truffle.api.instrument.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.MaterializedFrame; +import com.oracle.truffle.api.frame.VirtualFrame; +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.Probe; +import com.oracle.truffle.api.instrument.ProbeNode; +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.nodes.Node; +import com.oracle.truffle.api.nodes.RootNode; import com.oracle.truffle.api.source.Source; import com.oracle.truffle.api.source.SourceSection; import com.oracle.truffle.api.vm.EventConsumer; import com.oracle.truffle.api.vm.TruffleVM; import java.io.IOException; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import org.junit.Test; /** * Bug report validating test.
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/vm/TruffleVMSingleThreadedTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/vm/TruffleVMSingleThreadedTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -23,12 +23,13 @@ package com.oracle.truffle.api.test.vm; import com.oracle.truffle.api.source.Source; -import java.io.*; -import java.net.*; - -import org.junit.*; - -import com.oracle.truffle.api.vm.*; +import com.oracle.truffle.api.vm.TruffleVM; +import java.io.IOException; +import java.io.StringReader; +import java.net.URI; +import java.net.URISyntaxException; +import org.junit.Before; +import org.junit.Test; public class TruffleVMSingleThreadedTest { TruffleVM tvm;
--- a/truffle/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/SymbolInvokerImpl.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/SymbolInvokerImpl.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,10 +24,15 @@ */ package com.oracle.truffle.api.vm; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.interop.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.TruffleLanguage; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.interop.ForeignAccess; +import com.oracle.truffle.api.interop.Message; +import com.oracle.truffle.api.interop.TruffleObject; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.RootNode; final class SymbolInvokerImpl { @SuppressWarnings({"unchecked", "rawtypes"})
--- a/truffle/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/TruffleVM.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/TruffleVM.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,24 +24,46 @@ */ package com.oracle.truffle.api.vm; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.TruffleLanguage.Env; import com.oracle.truffle.api.TruffleLanguage.Registration; -import com.oracle.truffle.api.debug.*; -import com.oracle.truffle.api.impl.*; -import com.oracle.truffle.api.instrument.*; +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.debug.SuspendedEvent; +import com.oracle.truffle.api.impl.Accessor; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.instrument.ToolSupportProvider; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.interop.java.JavaInterop; -import com.oracle.truffle.api.source.*; -import java.io.*; +import com.oracle.truffle.api.source.Source; +import java.io.Closeable; +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.InterruptedIOException; +import java.io.OutputStreamWriter; +import java.io.Reader; +import java.io.Writer; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; -import java.net.*; -import java.nio.file.*; -import java.util.*; +import java.net.URI; +import java.net.URL; +import java.net.URLConnection; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executor; -import java.util.logging.*; +import java.util.logging.Level; +import java.util.logging.Logger; /** * <em>Virtual machine</em> for Truffle based languages. Term virtual machine is a bit overloaded,
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/Assumption.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/Assumption.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,8 @@ */ package com.oracle.truffle.api; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.InvalidAssumptionException; +import com.oracle.truffle.api.nodes.Node; /** * An assumption is a global boolean flag that starts with the value true (i.e., the assumption is
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/CompilerDirectives.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/CompilerDirectives.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,10 +24,12 @@ */ package com.oracle.truffle.api; -import java.lang.annotation.*; -import java.util.concurrent.*; - -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.ControlFlowException; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.util.concurrent.Callable; /** * Directives that influence the optimizations of the Truffle compiler. All of the operations have
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/CompilerOptions.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/CompilerOptions.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.RootNode; /** * Allows options to be set to control the compilation of a specific {@link RootNode}, without
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/ExecutionContext.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/ExecutionContext.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api; -import com.oracle.truffle.api.impl.*; +import com.oracle.truffle.api.impl.DefaultCompilerOptions; /** * Access to information and basic services in the runtime context for a Truffle-implemented guest
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/ReplaceObserver.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/ReplaceObserver.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; /** * An observer that is notified whenever a child node is replaced.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/RootCallTarget.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/RootCallTarget.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.RootNode; /** * Represents the target of a call to a {@link RootNode}, i.e., to another tree of nodes. Instances
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/Truffle.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/Truffle.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,10 +24,10 @@ */ package com.oracle.truffle.api; -import java.lang.reflect.*; -import java.security.*; - -import com.oracle.truffle.api.impl.*; +import com.oracle.truffle.api.impl.DefaultTruffleRuntime; +import java.lang.reflect.Method; +import java.security.AccessController; +import java.security.PrivilegedAction; /** * Class for obtaining the Truffle runtime singleton object of this virtual machine.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleLanguage.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleLanguage.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,13 +24,19 @@ */ package com.oracle.truffle.api; -import com.oracle.truffle.api.debug.*; -import com.oracle.truffle.api.impl.*; -import com.oracle.truffle.api.instrument.*; +import com.oracle.truffle.api.debug.DebugSupportProvider; +import com.oracle.truffle.api.impl.Accessor; +import com.oracle.truffle.api.impl.FindContextNode; +import com.oracle.truffle.api.instrument.ToolSupportProvider; import com.oracle.truffle.api.nodes.Node; -import com.oracle.truffle.api.source.*; -import java.io.*; -import java.lang.annotation.*; +import com.oracle.truffle.api.source.Source; +import java.io.IOException; +import java.io.Reader; +import java.io.Writer; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import java.util.Collections; import java.util.Map; import java.util.WeakHashMap;
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleOptions.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleOptions.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,9 +24,10 @@ */ package com.oracle.truffle.api; -import java.security.*; - -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.NodeCost; +import com.oracle.truffle.api.nodes.NodeInfo; +import java.security.AccessController; +import java.security.PrivilegedAction; /** * Class containing general Truffle options.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleRuntime.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleRuntime.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,10 +24,18 @@ */ package com.oracle.truffle.api; -import java.util.*; - -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.Frame; +import com.oracle.truffle.api.frame.FrameDescriptor; +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.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.DirectCallNode; +import com.oracle.truffle.api.nodes.IndirectCallNode; +import com.oracle.truffle.api.nodes.LoopNode; +import com.oracle.truffle.api.nodes.RepeatingNode; +import com.oracle.truffle.api.nodes.RootNode; +import java.util.Collection; /** * Interface representing a Truffle runtime object. The runtime is responsible for creating call
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/Breakpoint.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/Breakpoint.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,8 +24,9 @@ */ package com.oracle.truffle.api.debug; -import com.oracle.truffle.api.instrument.*; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.instrument.Instrument; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.source.Source; import java.io.IOException; /**
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/DebugSupportProvider.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/DebugSupportProvider.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,10 +24,14 @@ */ package com.oracle.truffle.api.debug; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.instrument.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.frame.MaterializedFrame; +import com.oracle.truffle.api.instrument.AdvancedInstrumentResultListener; +import com.oracle.truffle.api.instrument.AdvancedInstrumentRoot; +import com.oracle.truffle.api.instrument.AdvancedInstrumentRootFactory; +import com.oracle.truffle.api.instrument.Instrument; +import com.oracle.truffle.api.instrument.ToolSupportProvider; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.source.Source; /** * Access to language-specific information and execution services to enable debugging.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/Debugger.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/Debugger.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,16 +24,31 @@ */ package com.oracle.truffle.api.debug; -import java.io.*; -import java.util.*; - import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.TruffleLanguage; +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.impl.Accessor; -import com.oracle.truffle.api.instrument.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.instrument.AdvancedInstrumentResultListener; +import com.oracle.truffle.api.instrument.AdvancedInstrumentRoot; +import com.oracle.truffle.api.instrument.AdvancedInstrumentRootFactory; +import com.oracle.truffle.api.instrument.Instrument; +import com.oracle.truffle.api.instrument.KillException; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.instrument.StandardSyntaxTag; +import com.oracle.truffle.api.instrument.SyntaxTag; +import com.oracle.truffle.api.instrument.SyntaxTagTrap; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.source.LineLocation; +import com.oracle.truffle.api.source.Source; +import java.io.Closeable; +import java.io.IOException; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; /** * Represents debugging related state of a {@link com.oracle.truffle.api.vm.TruffleVM}. Instance of
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/LineBreakpoint.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/LineBreakpoint.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api.debug; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.source.LineLocation; // TODO (mlvdv) generic? /**
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/LineBreakpointFactory.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/LineBreakpointFactory.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,23 +24,39 @@ */ package com.oracle.truffle.api.debug; -import static com.oracle.truffle.api.debug.Breakpoint.State.*; - -import java.io.*; -import java.util.*; -import java.util.Map.Entry; - -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.Assumption; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; +import com.oracle.truffle.api.Truffle; +import static com.oracle.truffle.api.debug.Breakpoint.State.DISABLED; +import static com.oracle.truffle.api.debug.Breakpoint.State.DISABLED_UNRESOLVED; +import static com.oracle.truffle.api.debug.Breakpoint.State.DISPOSED; +import static com.oracle.truffle.api.debug.Breakpoint.State.ENABLED; +import static com.oracle.truffle.api.debug.Breakpoint.State.ENABLED_UNRESOLVED; import com.oracle.truffle.api.debug.Debugger.BreakpointCallback; import com.oracle.truffle.api.debug.Debugger.WarningLog; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.instrument.*; -import com.oracle.truffle.api.instrument.impl.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.api.utilities.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.instrument.AdvancedInstrumentResultListener; +import com.oracle.truffle.api.instrument.Instrument; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.instrument.StandardSyntaxTag; +import com.oracle.truffle.api.instrument.SyntaxTag; +import com.oracle.truffle.api.instrument.impl.DefaultProbeListener; +import com.oracle.truffle.api.instrument.impl.DefaultStandardInstrumentListener; +import com.oracle.truffle.api.nodes.InvalidAssumptionException; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.source.LineLocation; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.api.utilities.CyclicAssumption; +import java.io.IOException; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; //TODO (mlvdv) some common functionality could be factored out of this and TagBreakpointSupport
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/LineToProbesMap.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/LineToProbesMap.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,12 +24,19 @@ */ package com.oracle.truffle.api.debug; -import java.io.*; -import java.util.*; - -import com.oracle.truffle.api.instrument.*; +import com.oracle.truffle.api.instrument.InstrumentationTool; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.instrument.ProbeListener; import com.oracle.truffle.api.instrument.impl.DefaultProbeListener; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.source.LineLocation; +import com.oracle.truffle.api.source.Source; +import com.oracle.truffle.api.source.SourceSection; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; /** * An {@link InstrumentationTool} that builds a map of every {@link Probe} attached to some AST,
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/SuspendedEvent.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/SuspendedEvent.java Wed Sep 16 11:33:22 2015 +0200 @@ -29,9 +29,8 @@ 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.instrument.*; +import com.oracle.truffle.api.instrument.StandardSyntaxTag; import com.oracle.truffle.api.nodes.Node; - import java.util.ArrayList; import java.util.Collections; import java.util.List;
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/TagBreakpoint.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/TagBreakpoint.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api.debug; -import com.oracle.truffle.api.instrument.*; +import com.oracle.truffle.api.instrument.SyntaxTag; // TODO (mlvdv) generic? /**
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/TagBreakpointFactory.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/TagBreakpointFactory.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,22 +24,37 @@ */ package com.oracle.truffle.api.debug; -import static com.oracle.truffle.api.debug.Breakpoint.State.*; - -import java.io.*; -import java.util.*; -import java.util.Map.Entry; - -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.Assumption; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; +import com.oracle.truffle.api.Truffle; +import static com.oracle.truffle.api.debug.Breakpoint.State.DISABLED; +import static com.oracle.truffle.api.debug.Breakpoint.State.DISABLED_UNRESOLVED; +import static com.oracle.truffle.api.debug.Breakpoint.State.DISPOSED; +import static com.oracle.truffle.api.debug.Breakpoint.State.ENABLED; +import static com.oracle.truffle.api.debug.Breakpoint.State.ENABLED_UNRESOLVED; import com.oracle.truffle.api.debug.Debugger.BreakpointCallback; import com.oracle.truffle.api.debug.Debugger.WarningLog; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.instrument.*; -import com.oracle.truffle.api.instrument.impl.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.utilities.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.instrument.AdvancedInstrumentResultListener; +import com.oracle.truffle.api.instrument.Instrument; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.instrument.SyntaxTag; +import com.oracle.truffle.api.instrument.SyntaxTagTrap; +import com.oracle.truffle.api.instrument.impl.DefaultProbeListener; +import com.oracle.truffle.api.instrument.impl.DefaultStandardInstrumentListener; +import com.oracle.truffle.api.nodes.InvalidAssumptionException; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.utilities.CyclicAssumption; +import java.io.IOException; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; // TODO (mlvdv) some common functionality could be factored out of this and LineBreakpointSupport
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/FrameDescriptor.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/FrameDescriptor.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,9 +24,14 @@ */ package com.oracle.truffle.api.frame; -import java.util.*; - -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.Assumption; +import com.oracle.truffle.api.CompilerAsserts; +import com.oracle.truffle.api.Truffle; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Set; /** * Descriptor of the slots of frame objects. Multiple frame instances are associated with one such
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/FrameInstance.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/FrameInstance.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,8 +24,8 @@ */ package com.oracle.truffle.api.frame; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.nodes.Node; public interface FrameInstance {
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/FrameInstanceVisitor.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/FrameInstanceVisitor.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api.frame; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.TruffleRuntime; /** * Callback interface for {@link TruffleRuntime#iterateFrames}. Implementations of
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/FrameSlot.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/FrameSlot.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api.frame; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; /**
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/FrameSlotTypeException.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/FrameSlotTypeException.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api.frame; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.SlowPathException; /** * Exception thrown if the frame slot type does not match the access type.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/AbstractAssumption.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/AbstractAssumption.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api.impl; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.Assumption; public abstract class AbstractAssumption implements Assumption {
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/Accessor.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/Accessor.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,14 +24,22 @@ */ package com.oracle.truffle.api.impl; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.Assumption; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.TruffleLanguage.Env; -import com.oracle.truffle.api.debug.*; -import com.oracle.truffle.api.instrument.*; +import com.oracle.truffle.api.debug.DebugSupportProvider; +import com.oracle.truffle.api.debug.Debugger; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.instrument.ToolSupportProvider; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.RootNode; -import com.oracle.truffle.api.source.*; -import java.io.*; +import com.oracle.truffle.api.source.Source; +import java.io.Closeable; +import java.io.IOException; +import java.io.Reader; +import java.io.Writer; import java.lang.ref.Reference; import java.lang.ref.WeakReference;
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultAssumption.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultAssumption.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,8 +24,9 @@ */ package com.oracle.truffle.api.impl; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.Assumption; +import com.oracle.truffle.api.TruffleRuntime; +import com.oracle.truffle.api.nodes.InvalidAssumptionException; /** * This is an implementation-specific class. Do not use or instantiate it. Instead, use
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultCallTarget.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultCallTarget.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,9 +24,15 @@ */ package com.oracle.truffle.api.impl; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.RootCallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.TruffleRuntime; +import com.oracle.truffle.api.frame.Frame; +import com.oracle.truffle.api.frame.FrameInstance; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.RootNode; /** * This is an implementation-specific class. Do not use or instantiate it. Instead, use
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultCompilerOptions.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultCompilerOptions.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api.impl; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CompilerOptions; public class DefaultCompilerOptions implements CompilerOptions {
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultDirectCallNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultDirectCallNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,9 +24,13 @@ */ package com.oracle.truffle.api.impl; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.frame.Frame; +import com.oracle.truffle.api.frame.FrameInstance; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.DirectCallNode; +import com.oracle.truffle.api.nodes.Node; /** * This is runtime specific API. Do not use in a guest language.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultIndirectCallNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultIndirectCallNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,9 +24,13 @@ */ package com.oracle.truffle.api.impl; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.frame.Frame; +import com.oracle.truffle.api.frame.FrameInstance; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.IndirectCallNode; +import com.oracle.truffle.api.nodes.Node; /** * This is runtime specific API. Do not use in a guest language.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultLoopNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultLoopNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,8 +24,9 @@ */ package com.oracle.truffle.api.impl; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.LoopNode; +import com.oracle.truffle.api.nodes.RepeatingNode; public final class DefaultLoopNode extends LoopNode {
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultMaterializedFrame.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultMaterializedFrame.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,8 +24,12 @@ */ package com.oracle.truffle.api.impl; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.TruffleRuntime; +import com.oracle.truffle.api.frame.Frame; +import com.oracle.truffle.api.frame.FrameDescriptor; +import com.oracle.truffle.api.frame.FrameSlot; +import com.oracle.truffle.api.frame.FrameSlotTypeException; +import com.oracle.truffle.api.frame.MaterializedFrame; /** * This is an implementation-specific class. Do not use or instantiate it. Instead, use
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultTruffleRuntime.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultTruffleRuntime.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,11 +24,28 @@ */ package com.oracle.truffle.api.impl; -import java.util.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.Assumption; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.CompilerOptions; +import com.oracle.truffle.api.RootCallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.TruffleRuntime; +import com.oracle.truffle.api.frame.FrameDescriptor; +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.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.DirectCallNode; +import com.oracle.truffle.api.nodes.IndirectCallNode; +import com.oracle.truffle.api.nodes.LoopNode; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.RepeatingNode; +import com.oracle.truffle.api.nodes.RootNode; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; +import java.util.Map; +import java.util.WeakHashMap; /** * Default implementation of the Truffle runtime if the virtual machine does not provide a better
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultVirtualFrame.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultVirtualFrame.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,10 +24,14 @@ */ package com.oracle.truffle.api.impl; -import java.util.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.TruffleRuntime; +import com.oracle.truffle.api.frame.FrameDescriptor; +import com.oracle.truffle.api.frame.FrameSlot; +import com.oracle.truffle.api.frame.FrameSlotKind; +import com.oracle.truffle.api.frame.FrameSlotTypeException; +import com.oracle.truffle.api.frame.MaterializedFrame; +import com.oracle.truffle.api.frame.VirtualFrame; +import java.util.Arrays; /** * This is an implementation-specific class. Do not use or instantiate it. Instead, use
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/ASTPrinter.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/ASTPrinter.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,9 +24,8 @@ */ package com.oracle.truffle.api.instrument; -import java.io.*; - -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; +import java.io.PrintWriter; /** * Access to AST-based debugging support, which is could be language implementation specific in the
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/ASTProber.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/ASTProber.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api.instrument; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; /** * Enables instrumentation by attaching {@linkplain Probe Probes} to some nodes in a (newly created,
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/AdvancedInstrumentResultListener.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/AdvancedInstrumentResultListener.java Wed Sep 16 11:33:22 2015 +0200 @@ -25,8 +25,8 @@ package com.oracle.truffle.api.instrument; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; /** * Listener for receiving the result a client-provided {@linkplain AdvancedInstrumentRoot AST
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/AdvancedInstrumentRoot.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/AdvancedInstrumentRoot.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,8 +24,8 @@ */ package com.oracle.truffle.api.instrument; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; /** * Root of a client-provided AST fragment that can be executed efficiently, subject to full Truffle
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/AdvancedInstrumentRootFactory.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/AdvancedInstrumentRootFactory.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api.instrument; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; /** * Creator of {@linkplain AdvancedInstrumentRoot AST fragments} suitable for efficient execution,
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/Instrument.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/Instrument.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,12 +24,14 @@ */ package com.oracle.truffle.api.instrument; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.instrument.InstrumentationNode.TruffleEvents; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeCost; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; // TODO (mlvdv) these statics should not be global. Move them to some kind of context. // TODO (mlvdv) migrate factory (together with Probe)? break out nested classes?
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/InstrumentationNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/InstrumentationNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,8 +24,8 @@ */ package com.oracle.truffle.api.instrument; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; /** * A marker interface for Truffle {@linkplain Node nodes} that internally implement the
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/KillException.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/KillException.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api.instrument; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.ControlFlowException; /** * Controls breaking out of an execution context, such as a shell or eval.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/Probe.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/Probe.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,17 +24,24 @@ */ package com.oracle.truffle.api.instrument; -import java.io.*; -import java.lang.ref.*; -import java.util.*; - -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.Assumption; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; +import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.impl.Accessor; import com.oracle.truffle.api.instrument.InstrumentationNode.TruffleEvents; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.api.utilities.*; +import com.oracle.truffle.api.nodes.InvalidAssumptionException; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeVisitor; +import com.oracle.truffle.api.nodes.RootNode; +import com.oracle.truffle.api.source.Source; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.api.utilities.CyclicAssumption; +import java.io.PrintStream; +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; //TODO (mlvdv) these statics should not be global. Move them to some kind of context.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/ProbeException.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/ProbeException.java Wed Sep 16 11:33:22 2015 +0200 @@ -25,7 +25,7 @@ package com.oracle.truffle.api.instrument; import com.oracle.truffle.api.instrument.ProbeFailure.Reason; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; /** * An exception thrown when {@link Node#probe()} fails because of an implementation failure.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/ProbeFailure.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/ProbeFailure.java Wed Sep 16 11:33:22 2015 +0200 @@ -25,7 +25,9 @@ package com.oracle.truffle.api.instrument; import com.oracle.truffle.api.instrument.ProbeNode.WrapperNode; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeFieldAccessor; +import com.oracle.truffle.api.nodes.NodeUtil; /** * Description of a failed attempt to instrument an AST node.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/ProbeListener.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/ProbeListener.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,8 +24,8 @@ */ package com.oracle.truffle.api.instrument; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.source.Source; /** * An observer of events related to {@link Probe}s: creating and tagging.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/ProbeNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/ProbeNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -27,11 +27,13 @@ import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.TruffleLanguage; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.instrument.Instrument.AbstractInstrumentNode; import com.oracle.truffle.api.instrument.InstrumentationNode.TruffleEvents; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeCost; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; /** * Implementation class & interface for enabling the attachment of {@linkplain Probe Probes} to
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/QuitException.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/QuitException.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api.instrument; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.ControlFlowException; /** * Controls breaking out of all executions and ending Truffle execution.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/SimpleInstrumentListener.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/SimpleInstrumentListener.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api.instrument; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.source.SourceSection; /** * A receiver of Truffle execution events that can act on behalf of an external client.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/StandardInstrumentListener.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/StandardInstrumentListener.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.truffle.api.instrument; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.source.SourceSection; /** * A receiver of Truffle execution events that can act on behalf of an external client.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/SyntaxTagTrap.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/SyntaxTagTrap.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,8 +24,8 @@ */ package com.oracle.truffle.api.instrument; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.MaterializedFrame; +import com.oracle.truffle.api.nodes.Node; /** * A trap that can be set to interrupt execution at probed nodes carrying a specific tag.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/Visualizer.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/Visualizer.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.truffle.api.instrument; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.frame.FrameSlot; +import com.oracle.truffle.api.nodes.Node; /** * Visualization services for the benefit of instrumentation-based tools, possibly specialized for
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/DefaultASTPrinter.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/DefaultASTPrinter.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,14 +24,18 @@ */ package com.oracle.truffle.api.instrument.impl; -import java.io.*; -import java.util.*; - -import com.oracle.truffle.api.instrument.*; +import com.oracle.truffle.api.instrument.ASTPrinter; +import com.oracle.truffle.api.instrument.InstrumentationNode; import com.oracle.truffle.api.instrument.ProbeNode.WrapperNode; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeClass; +import com.oracle.truffle.api.nodes.NodeFieldAccessor; import com.oracle.truffle.api.nodes.NodeFieldAccessor.NodeFieldKind; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.nodes.NodeUtil; +import com.oracle.truffle.api.source.SourceSection; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.ArrayList; /** * A language-agnostic for printing out various pieces of a Truffle AST.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/DefaultProbeListener.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/DefaultProbeListener.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,8 +24,10 @@ */ package com.oracle.truffle.api.instrument.impl; -import com.oracle.truffle.api.instrument.*; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.instrument.ProbeListener; +import com.oracle.truffle.api.instrument.SyntaxTag; +import com.oracle.truffle.api.source.Source; public abstract class DefaultProbeListener implements ProbeListener {
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/DefaultSimpleInstrumentListener.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/DefaultSimpleInstrumentListener.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,8 @@ */ package com.oracle.truffle.api.instrument.impl; -import com.oracle.truffle.api.instrument.*; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.instrument.SimpleInstrumentListener; /** * A listener for Truffle execution events that provides a no-op implementation of every event.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/DefaultStandardInstrumentListener.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/DefaultStandardInstrumentListener.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,9 +24,10 @@ */ package com.oracle.truffle.api.instrument.impl; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.instrument.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.instrument.StandardInstrumentListener; +import com.oracle.truffle.api.nodes.Node; /** * A listener for AST {@linkplain StandardInstrumentListener execution events} that provides a no-op
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/DefaultVisualizer.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/DefaultVisualizer.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,11 +24,13 @@ */ package com.oracle.truffle.api.instrument.impl; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.instrument.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.frame.FrameSlot; +import com.oracle.truffle.api.instrument.ASTPrinter; +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.SourceSection; public class DefaultVisualizer implements Visualizer {
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/DirectCallNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/DirectCallNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,8 +24,11 @@ */ package com.oracle.truffle.api.nodes; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.RootCallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.TruffleRuntime; +import com.oracle.truffle.api.frame.VirtualFrame; /** * Represents a direct call to a {@link CallTarget}. Direct calls are calls for which the
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/ExplodeLoop.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/ExplodeLoop.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,10 @@ */ package com.oracle.truffle.api.nodes; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Specifies for a method that the loops with constant number of invocations should be fully
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/GraphPrintVisitor.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/GraphPrintVisitor.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,19 +24,35 @@ */ package com.oracle.truffle.api.nodes; -import java.io.*; -import java.lang.annotation.*; -import java.net.*; -import java.util.*; - -import javax.xml.parsers.*; -import javax.xml.transform.*; -import javax.xml.transform.dom.*; -import javax.xml.transform.stream.*; - -import org.w3c.dom.*; - import com.oracle.truffle.api.nodes.NodeFieldAccessor.NodeFieldKind; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.StringWriter; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.net.Socket; +import java.util.ArrayList; +import java.util.IdentityHashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.OutputKeys; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; /** * Utility class for creating output for the ideal graph visualizer.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/IndirectCallNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/IndirectCallNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,8 +24,9 @@ */ package com.oracle.truffle.api.nodes; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.frame.VirtualFrame; /** * Represents an indirect call to a {@link CallTarget}. Indirect calls are calls for which the
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/LoopNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/LoopNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api.nodes; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.frame.VirtualFrame; /** * Experimental API: may change significantly without notice.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/Node.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/Node.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,17 +24,30 @@ */ package com.oracle.truffle.api.nodes; -import java.lang.annotation.*; -import java.util.*; -import java.util.concurrent.*; - -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.CompilerAsserts; +import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; +import com.oracle.truffle.api.ReplaceObserver; +import com.oracle.truffle.api.TruffleLanguage; +import com.oracle.truffle.api.TruffleOptions; import com.oracle.truffle.api.impl.Accessor; -import com.oracle.truffle.api.instrument.*; +import com.oracle.truffle.api.instrument.Instrument; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.instrument.ProbeException; +import com.oracle.truffle.api.instrument.ProbeFailure; +import com.oracle.truffle.api.instrument.ProbeNode; import com.oracle.truffle.api.instrument.ProbeNode.WrapperNode; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.api.utilities.*; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.api.utilities.JSONHelper; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.concurrent.Callable; /** * Abstract base class for all Truffle nodes.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeClass.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeClass.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,13 +24,16 @@ */ package com.oracle.truffle.api.nodes; -import java.lang.reflect.*; -import java.security.*; -import java.util.*; - import com.oracle.truffle.api.nodes.Node.Child; import com.oracle.truffle.api.nodes.Node.Children; import com.oracle.truffle.api.nodes.NodeFieldAccessor.NodeFieldKind; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; /** * Information about a {@link Node} class. A single instance of this class is allocated for every
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeCost.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeCost.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api.nodes; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CompilerDirectives; /** * Represents a rough estimate for the cost of a {@link Node}. This estimate can be used by runtime
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeFieldAccessor.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeFieldAccessor.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,13 +24,11 @@ */ package com.oracle.truffle.api.nodes; -import java.lang.reflect.*; - -import sun.misc.*; - import com.oracle.truffle.api.nodes.Node.Child; import com.oracle.truffle.api.nodes.Node.Children; import com.oracle.truffle.api.nodes.NodeUtil.FieldOffsetProvider; +import java.lang.reflect.Field; +import sun.misc.Unsafe; /** * Information about a field in a {@link Node} class.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeInfo.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeInfo.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,10 @@ */ package com.oracle.truffle.api.nodes; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Annotation for providing additional information on nodes.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeUtil.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeUtil.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,18 +24,29 @@ */ package com.oracle.truffle.api.nodes; -import java.io.*; -import java.lang.annotation.*; -import java.lang.reflect.*; -import java.util.*; - -import sun.misc.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.instrument.*; +import com.oracle.truffle.api.CompilerAsserts; +import com.oracle.truffle.api.TruffleOptions; +import com.oracle.truffle.api.instrument.Probe; import com.oracle.truffle.api.instrument.ProbeNode.WrapperNode; +import com.oracle.truffle.api.instrument.StandardSyntaxTag; +import com.oracle.truffle.api.instrument.SyntaxTag; import com.oracle.truffle.api.nodes.NodeFieldAccessor.NodeFieldKind; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.source.SourceSection; +import java.io.OutputStream; +import java.io.PrintStream; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.lang.annotation.Annotation; +import java.lang.reflect.Array; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.NoSuchElementException; +import java.util.Objects; +import sun.misc.Unsafe; /** * Utility class that manages the special access methods for node instances.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/RepeatingNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/RepeatingNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api.nodes; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.frame.VirtualFrame; /** * Experimental API: may change significantly without notice.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/RootNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/RootNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -25,11 +25,19 @@ package com.oracle.truffle.api.nodes; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.impl.*; -import com.oracle.truffle.api.instrument.*; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.CompilerOptions; +import com.oracle.truffle.api.ExecutionContext; +import com.oracle.truffle.api.LoopCountReceiver; +import com.oracle.truffle.api.RootCallTarget; +import com.oracle.truffle.api.TruffleLanguage; +import com.oracle.truffle.api.TruffleRuntime; +import com.oracle.truffle.api.frame.FrameDescriptor; +import com.oracle.truffle.api.frame.FrameInstance; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.impl.DefaultCompilerOptions; +import com.oracle.truffle.api.instrument.ASTProber; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.source.SourceSection; /** * A root node is a node with a method to execute it given only a frame as a parameter. Therefore, a
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/SlowPathException.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/SlowPathException.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api.nodes; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CompilerDirectives; /** * An exception thrown to enter a slow path. The Truffle optimizer has special knowledge of this
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/UnexpectedResultException.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/UnexpectedResultException.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api.nodes; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CompilerDirectives; /** * An exception that should be thrown if the return value cannot be represented as a value of the
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/serial/PostOrderDeserializer.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/serial/PostOrderDeserializer.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,14 +24,16 @@ */ package com.oracle.truffle.api.nodes.serial; -import java.lang.reflect.*; -import java.util.*; - -import sun.misc.*; - -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeClass; +import com.oracle.truffle.api.nodes.NodeFieldAccessor; import com.oracle.truffle.api.nodes.NodeFieldAccessor.NodeFieldKind; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.source.SourceSection; +import java.lang.reflect.Array; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; +import sun.misc.Unsafe; /** * Experimental API. May change without notice.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/serial/PostOrderSerializer.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/serial/PostOrderSerializer.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,16 +24,15 @@ */ package com.oracle.truffle.api.nodes.serial; -import static com.oracle.truffle.api.nodes.serial.PostOrderDeserializer.*; - -import java.lang.reflect.*; -import java.nio.*; - -import sun.misc.*; - -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeClass; +import com.oracle.truffle.api.nodes.NodeFieldAccessor; import com.oracle.truffle.api.nodes.NodeFieldAccessor.NodeFieldKind; -import com.oracle.truffle.api.source.*; +import static com.oracle.truffle.api.nodes.serial.PostOrderDeserializer.getFieldOffset; +import com.oracle.truffle.api.source.SourceSection; +import java.lang.reflect.Field; +import java.nio.ByteBuffer; +import sun.misc.Unsafe; /** * Experimental API. May change without notice.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/serial/VariableLengthIntBuffer.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/serial/VariableLengthIntBuffer.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api.nodes.serial; -import java.nio.*; +import java.nio.ByteBuffer; /** * Experimental API. May change without notice. Simple variable length unsigned int buffer backed by
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/script/TruffleScriptEngineFactory.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/script/TruffleScriptEngineFactory.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,8 @@ */ package com.oracle.truffle.api.script; -import javax.script.*; +import javax.script.ScriptEngine; +import javax.script.ScriptEngineFactory; @Deprecated /**
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/source/Source.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/source/Source.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,17 +24,33 @@ */ package com.oracle.truffle.api.source; -import java.io.*; -import java.lang.ref.*; -import java.net.*; -import java.nio.*; -import java.nio.charset.*; -import java.util.*; - -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CompilerAsserts; import com.oracle.truffle.api.TruffleLanguage.Registration; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.io.StringReader; +import java.io.UnsupportedEncodingException; +import java.lang.ref.WeakReference; +import java.net.URL; +import java.net.URLConnection; +import java.nio.ByteBuffer; +import java.nio.CharBuffer; +import java.nio.charset.CharacterCodingException; +import java.nio.charset.Charset; +import java.nio.charset.CharsetDecoder; import java.nio.file.Files; import java.nio.file.spi.FileTypeDetector; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger;
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/AlwaysValidAssumption.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/AlwaysValidAssumption.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,8 +24,8 @@ */ package com.oracle.truffle.api.utilities; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.Assumption; +import com.oracle.truffle.api.nodes.InvalidAssumptionException; /** * An assumption that is always valid. Used as a placeholder where an assumption is needed but never
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/AssumedValue.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/AssumedValue.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,9 +24,11 @@ */ package com.oracle.truffle.api.utilities; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.Assumption; +import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.nodes.InvalidAssumptionException; /** * A value that the compiler can assume is constant, but can be changed by invalidation.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/BinaryConditionProfile.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/BinaryConditionProfile.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api.utilities; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; /**
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/BranchProfile.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/BranchProfile.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.truffle.api.utilities; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.NodeCloneable; /** * Utility class to speculate on branches to be never visited. If the {@link #enter()} method is
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/ConditionProfile.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/ConditionProfile.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,8 +24,8 @@ */ package com.oracle.truffle.api.utilities; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CompilerDirectives; +import com.oracle.truffle.api.nodes.NodeCloneable; /** * Abstract utility class to speculate on conditions. Condition profiles are intended to be used as
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/CountingConditionProfile.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/CountingConditionProfile.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api.utilities; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; /**
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/CyclicAssumption.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/CyclicAssumption.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,10 +24,10 @@ */ package com.oracle.truffle.api.utilities; -import java.util.concurrent.atomic.*; - -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.Assumption; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; +import com.oracle.truffle.api.Truffle; +import java.util.concurrent.atomic.AtomicReference; /** * Holds an {@link Assumption}, and knows how to recreate it with the same properties on
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/ExactClassValueProfile.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/ExactClassValueProfile.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api.utilities; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; /**
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/IdentityValueProfile.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/IdentityValueProfile.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,10 +24,9 @@ */ package com.oracle.truffle.api.utilities; -import java.util.*; - -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; +import java.util.Objects; /** * Represents a {@link ValueProfile} that speculates on the object identity of a value.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/JSONHelper.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/JSONHelper.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,10 +24,12 @@ */ package com.oracle.truffle.api.utilities; -import java.util.*; - -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.source.SourceSection; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; /** * Helper function that allows to dump the AST during creation to a JSON format.
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/NeverValidAssumption.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/NeverValidAssumption.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,8 +24,8 @@ */ package com.oracle.truffle.api.utilities; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.Assumption; +import com.oracle.truffle.api.nodes.InvalidAssumptionException; /** * An assumption that is never valid. Used as a placeholder where an assumption is needed that
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/PrimitiveValueProfile.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/PrimitiveValueProfile.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,10 +24,9 @@ */ package com.oracle.truffle.api.utilities; -import java.util.*; - -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; +import java.util.Objects; /** * Represents a {@link ValueProfile} that speculates on the primitive equality or object identity of
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/UnionAssumption.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/UnionAssumption.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,8 +24,8 @@ */ package com.oracle.truffle.api.utilities; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.Assumption; +import com.oracle.truffle.api.nodes.InvalidAssumptionException; /** * An assumption that combines two other assumptions. A check on this assumption checks both of the
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/ValueProfile.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/ValueProfile.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.api.utilities; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.NodeCloneable; /** * Utility class to speculate on certain properties of values.
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/AnnotationProcessor.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/AnnotationProcessor.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,17 +22,18 @@ */ package com.oracle.truffle.dsl.processor; -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; - -import com.oracle.truffle.dsl.processor.generator.*; -import com.oracle.truffle.dsl.processor.java.*; -import com.oracle.truffle.dsl.processor.java.model.*; -import com.oracle.truffle.dsl.processor.java.transform.*; -import com.oracle.truffle.dsl.processor.model.*; -import com.oracle.truffle.dsl.processor.parser.*; +import com.oracle.truffle.dsl.processor.generator.CodeTypeElementFactory; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import com.oracle.truffle.dsl.processor.java.model.CodeTypeElement; +import com.oracle.truffle.dsl.processor.java.transform.FixWarningsVisitor; +import com.oracle.truffle.dsl.processor.java.transform.GenerateOverrideVisitor; +import com.oracle.truffle.dsl.processor.model.Template; +import com.oracle.truffle.dsl.processor.parser.AbstractParser; +import java.util.HashSet; +import java.util.Set; +import javax.lang.model.element.Element; +import javax.lang.model.element.TypeElement; +import javax.lang.model.type.DeclaredType; /** * THIS IS NOT PUBLIC API.
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/CodeWriter.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/CodeWriter.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,15 +22,15 @@ */ package com.oracle.truffle.dsl.processor; -import java.io.*; - -import javax.annotation.processing.*; -import javax.lang.model.element.*; -import javax.tools.*; - -import com.oracle.truffle.dsl.processor.java.compiler.*; -import com.oracle.truffle.dsl.processor.java.model.*; -import com.oracle.truffle.dsl.processor.java.transform.*; +import com.oracle.truffle.dsl.processor.java.compiler.CompilerFactory; +import com.oracle.truffle.dsl.processor.java.model.CodeTypeElement; +import com.oracle.truffle.dsl.processor.java.transform.AbstractCodeWriter; +import java.io.BufferedWriter; +import java.io.IOException; +import java.io.Writer; +import javax.annotation.processing.ProcessingEnvironment; +import javax.lang.model.element.Element; +import javax.tools.JavaFileObject; public final class CodeWriter extends AbstractCodeWriter {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/ExpectError.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/ExpectError.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,11 +22,15 @@ */ package com.oracle.truffle.dsl.processor; -import java.util.*; - -import javax.annotation.processing.*; -import javax.lang.model.element.*; -import javax.tools.Diagnostic.*; +import java.util.List; +import java.util.Map; +import javax.annotation.processing.ProcessingEnvironment; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; +import javax.lang.model.element.Element; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.TypeElement; +import javax.tools.Diagnostic.Kind; public class ExpectError {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/LanguageRegistrationProcessor.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/LanguageRegistrationProcessor.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,18 +22,26 @@ */ package com.oracle.truffle.dsl.processor; -import java.io.*; -import java.util.*; - -import javax.annotation.processing.*; -import javax.lang.model.*; -import javax.lang.model.element.*; -import javax.lang.model.type.*; +import com.oracle.truffle.api.TruffleLanguage; +import com.oracle.truffle.api.TruffleLanguage.Registration; +import java.io.IOException; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; +import java.util.Set; +import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.RoundEnvironment; +import javax.annotation.processing.SupportedAnnotationTypes; +import javax.lang.model.SourceVersion; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.TypeElement; +import javax.lang.model.type.TypeMirror; import javax.tools.Diagnostic.Kind; -import javax.tools.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.TruffleLanguage.Registration; +import javax.tools.FileObject; +import javax.tools.StandardLocation; @SupportedAnnotationTypes("com.oracle.truffle.api.TruffleLanguage.Registration") public final class LanguageRegistrationProcessor extends AbstractProcessor {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/Log.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/Log.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,12 +22,13 @@ */ package com.oracle.truffle.dsl.processor; -import javax.annotation.processing.*; -import javax.lang.model.element.*; +import com.oracle.truffle.dsl.processor.java.model.GeneratedElement; +import javax.annotation.processing.ProcessingEnvironment; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; +import javax.lang.model.element.Element; import javax.tools.Diagnostic.Kind; -import com.oracle.truffle.dsl.processor.java.model.*; - /** * THIS IS NOT PUBLIC API. */
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/ProcessorContext.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/ProcessorContext.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,17 +22,23 @@ */ package com.oracle.truffle.dsl.processor; -import java.util.*; - -import javax.annotation.processing.*; -import javax.lang.model.element.*; -import javax.lang.model.type.*; -import javax.lang.model.util.*; - -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.dsl.processor.java.*; -import com.oracle.truffle.dsl.processor.java.model.*; -import com.oracle.truffle.dsl.processor.model.*; +import com.oracle.truffle.api.frame.Frame; +import com.oracle.truffle.api.frame.MaterializedFrame; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import com.oracle.truffle.dsl.processor.java.model.CodeTypeMirror; +import com.oracle.truffle.dsl.processor.model.Template; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.processing.ProcessingEnvironment; +import javax.lang.model.element.TypeElement; +import javax.lang.model.type.ArrayType; +import javax.lang.model.type.DeclaredType; +import javax.lang.model.type.TypeMirror; +import javax.lang.model.type.WildcardType; +import javax.lang.model.util.Types; /** * THIS IS NOT PUBLIC API.
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/TruffleProcessor.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/TruffleProcessor.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,19 +22,26 @@ */ package com.oracle.truffle.dsl.processor; -import java.lang.annotation.*; -import java.util.*; - -import javax.annotation.processing.*; -import javax.lang.model.*; -import javax.lang.model.element.*; +import com.oracle.truffle.dsl.processor.ProcessorContext.ProcessCallback; +import com.oracle.truffle.dsl.processor.generator.NodeCodeGenerator; +import com.oracle.truffle.dsl.processor.generator.TypeSystemCodeGenerator; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import com.oracle.truffle.dsl.processor.parser.AbstractParser; +import com.oracle.truffle.dsl.processor.parser.NodeParser; +import com.oracle.truffle.dsl.processor.parser.TypeSystemParser; +import java.lang.annotation.Annotation; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.ProcessingEnvironment; +import javax.annotation.processing.RoundEnvironment; +import javax.lang.model.SourceVersion; +import javax.lang.model.element.Element; +import javax.lang.model.element.TypeElement; import javax.tools.Diagnostic.Kind; -import com.oracle.truffle.dsl.processor.ProcessorContext.ProcessCallback; -import com.oracle.truffle.dsl.processor.generator.*; -import com.oracle.truffle.dsl.processor.java.*; -import com.oracle.truffle.dsl.processor.parser.*; - /** * THIS IS NOT PUBLIC API. */
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/TruffleTypes.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/TruffleTypes.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,22 +22,37 @@ */ package com.oracle.truffle.dsl.processor; -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; -import javax.tools.Diagnostic.Kind; - -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.Assumption; +import com.oracle.truffle.api.CompilerAsserts; +import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.dsl.internal.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.TruffleOptions; +import com.oracle.truffle.api.dsl.GenerateNodeFactory; +import com.oracle.truffle.api.dsl.NodeFactory; +import com.oracle.truffle.api.dsl.internal.DSLMetadata; +import com.oracle.truffle.api.dsl.internal.DSLNode; +import com.oracle.truffle.api.dsl.internal.DSLShare; +import com.oracle.truffle.api.dsl.internal.NodeFactoryBase; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.InvalidAssumptionException; +import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.Node.Child; import com.oracle.truffle.api.nodes.Node.Children; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.nodes.NodeCost; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.nodes.NodeUtil; +import com.oracle.truffle.api.nodes.UnexpectedResultException; +import com.oracle.truffle.api.source.SourceSection; +import java.util.ArrayList; +import java.util.List; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.Element; +import javax.lang.model.element.TypeElement; +import javax.lang.model.type.ArrayType; +import javax.lang.model.type.DeclaredType; +import javax.lang.model.type.TypeMirror; +import javax.tools.Diagnostic.Kind; /** * THIS IS NOT PUBLIC API.
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/expression/DSLExpression.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/expression/DSLExpression.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,11 +22,15 @@ */ package com.oracle.truffle.dsl.processor.expression; -import java.util.*; -import java.util.concurrent.atomic.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.concurrent.atomic.AtomicBoolean; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.TypeMirror; public abstract class DSLExpression {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/expression/DSLExpressionResolver.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/expression/DSLExpressionResolver.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,21 +22,30 @@ */ package com.oracle.truffle.dsl.processor.expression; -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; -import javax.lang.model.util.*; - -import com.oracle.truffle.dsl.processor.*; +import com.oracle.truffle.dsl.processor.ProcessorContext; import com.oracle.truffle.dsl.processor.expression.DSLExpression.Binary; import com.oracle.truffle.dsl.processor.expression.DSLExpression.Call; import com.oracle.truffle.dsl.processor.expression.DSLExpression.DSLExpressionVisitor; import com.oracle.truffle.dsl.processor.expression.DSLExpression.IntLiteral; import com.oracle.truffle.dsl.processor.expression.DSLExpression.Negate; import com.oracle.truffle.dsl.processor.expression.DSLExpression.Variable; -import com.oracle.truffle.dsl.processor.java.*; -import com.oracle.truffle.dsl.processor.java.model.*; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import com.oracle.truffle.dsl.processor.java.model.CodeTypeMirror; +import com.oracle.truffle.dsl.processor.java.model.CodeVariableElement; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.TypeElement; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.DeclaredType; +import javax.lang.model.type.TypeKind; +import javax.lang.model.type.TypeMirror; +import javax.lang.model.util.ElementFilter; public class DSLExpressionResolver implements DSLExpressionVisitor {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/expression/Parser.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/expression/Parser.java Wed Sep 16 11:33:22 2015 +0200 @@ -25,15 +25,16 @@ package com.oracle.truffle.dsl.processor.expression; -import java.io.*; -import java.nio.charset.*; -import java.util.*; - import com.oracle.truffle.dsl.processor.expression.DSLExpression.Binary; import com.oracle.truffle.dsl.processor.expression.DSLExpression.Call; import com.oracle.truffle.dsl.processor.expression.DSLExpression.IntLiteral; import com.oracle.truffle.dsl.processor.expression.DSLExpression.Negate; import com.oracle.truffle.dsl.processor.expression.DSLExpression.Variable; +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.List; // Checkstyle: stop // @formatter:off
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/expression/Scanner.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/expression/Scanner.java Wed Sep 16 11:33:22 2015 +0200 @@ -25,8 +25,11 @@ package com.oracle.truffle.dsl.processor.expression; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.RandomAccessFile; +import java.util.HashMap; +import java.util.Map; // Checkstyle: stop // @formatter:off
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/CodeTypeElementFactory.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/CodeTypeElementFactory.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.truffle.dsl.processor.generator; -import com.oracle.truffle.dsl.processor.*; -import com.oracle.truffle.dsl.processor.java.model.*; +import com.oracle.truffle.dsl.processor.ProcessorContext; +import com.oracle.truffle.dsl.processor.java.model.CodeTypeElement; public abstract class CodeTypeElementFactory<M> {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/DSLExpressionGenerator.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/DSLExpressionGenerator.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,19 +22,24 @@ */ package com.oracle.truffle.dsl.processor.generator; -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; - -import com.oracle.truffle.dsl.processor.expression.*; +import com.oracle.truffle.dsl.processor.expression.DSLExpression; import com.oracle.truffle.dsl.processor.expression.DSLExpression.Binary; import com.oracle.truffle.dsl.processor.expression.DSLExpression.Call; import com.oracle.truffle.dsl.processor.expression.DSLExpression.DSLExpressionVisitor; import com.oracle.truffle.dsl.processor.expression.DSLExpression.IntLiteral; import com.oracle.truffle.dsl.processor.expression.DSLExpression.Negate; import com.oracle.truffle.dsl.processor.expression.DSLExpression.Variable; -import com.oracle.truffle.dsl.processor.java.model.*; +import com.oracle.truffle.dsl.processor.java.model.CodeTree; +import com.oracle.truffle.dsl.processor.java.model.CodeTreeBuilder; +import java.util.ArrayDeque; +import java.util.Deque; +import java.util.Map; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.TypeKind; public class DSLExpressionGenerator implements DSLExpressionVisitor {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/GeneratorUtils.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/GeneratorUtils.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,22 +22,36 @@ */ package com.oracle.truffle.dsl.processor.generator; -import static com.oracle.truffle.dsl.processor.java.ElementUtils.*; -import static javax.lang.model.element.Modifier.*; - -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; -import javax.lang.model.util.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.CompilerDirectives; +import com.oracle.truffle.api.dsl.GeneratedBy; import com.oracle.truffle.api.dsl.internal.DSLOptions.TypeBoxingOptimization; -import com.oracle.truffle.dsl.processor.*; -import com.oracle.truffle.dsl.processor.java.*; -import com.oracle.truffle.dsl.processor.java.model.*; -import com.oracle.truffle.dsl.processor.model.*; +import com.oracle.truffle.dsl.processor.ProcessorContext; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.fromTypeMirror; +import com.oracle.truffle.dsl.processor.java.model.CodeAnnotationMirror; +import com.oracle.truffle.dsl.processor.java.model.CodeAnnotationValue; +import com.oracle.truffle.dsl.processor.java.model.CodeExecutableElement; +import com.oracle.truffle.dsl.processor.java.model.CodeNames; +import com.oracle.truffle.dsl.processor.java.model.CodeTree; +import com.oracle.truffle.dsl.processor.java.model.CodeTreeBuilder; +import com.oracle.truffle.dsl.processor.java.model.CodeTypeElement; +import com.oracle.truffle.dsl.processor.java.model.CodeVariableElement; +import com.oracle.truffle.dsl.processor.model.Template; +import com.oracle.truffle.dsl.processor.model.TemplateMethod; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import static javax.lang.model.element.Modifier.PRIVATE; +import static javax.lang.model.element.Modifier.STATIC; +import javax.lang.model.element.PackageElement; +import javax.lang.model.element.TypeElement; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.DeclaredType; +import javax.lang.model.type.TypeMirror; +import javax.lang.model.util.ElementFilter; public class GeneratorUtils {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/ImplicitCastNodeFactory.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/ImplicitCastNodeFactory.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,23 +22,31 @@ */ package com.oracle.truffle.dsl.processor.generator; -import static com.oracle.truffle.dsl.processor.generator.GeneratorUtils.*; -import static com.oracle.truffle.dsl.processor.java.ElementUtils.*; -import static javax.lang.model.element.Modifier.*; - -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; - -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; -import com.oracle.truffle.api.dsl.internal.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.dsl.processor.*; -import com.oracle.truffle.dsl.processor.java.*; -import com.oracle.truffle.dsl.processor.java.model.*; -import com.oracle.truffle.dsl.processor.model.*; +import com.oracle.truffle.api.dsl.internal.DSLOptions; +import com.oracle.truffle.api.nodes.UnexpectedResultException; +import com.oracle.truffle.dsl.processor.ProcessorContext; +import static com.oracle.truffle.dsl.processor.generator.GeneratorUtils.isTypeBoxingOptimized; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.getTypeId; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.modifiers; +import com.oracle.truffle.dsl.processor.java.model.CodeAnnotationMirror; +import com.oracle.truffle.dsl.processor.java.model.CodeExecutableElement; +import com.oracle.truffle.dsl.processor.java.model.CodeTree; +import com.oracle.truffle.dsl.processor.java.model.CodeTreeBuilder; +import com.oracle.truffle.dsl.processor.java.model.CodeTypeElement; +import com.oracle.truffle.dsl.processor.java.model.CodeVariableElement; +import com.oracle.truffle.dsl.processor.java.model.GeneratedTypeMirror; +import com.oracle.truffle.dsl.processor.model.ImplicitCastData; +import com.oracle.truffle.dsl.processor.model.TypeSystemData; +import java.util.List; +import javax.lang.model.element.Element; +import static javax.lang.model.element.Modifier.FINAL; +import static javax.lang.model.element.Modifier.PRIVATE; +import static javax.lang.model.element.Modifier.PUBLIC; +import static javax.lang.model.element.Modifier.STATIC; +import javax.lang.model.type.TypeMirror; public class ImplicitCastNodeFactory {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeCodeGenerator.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeCodeGenerator.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,20 +22,25 @@ */ package com.oracle.truffle.dsl.processor.generator; -import static com.oracle.truffle.dsl.processor.java.ElementUtils.*; -import static javax.lang.model.element.Modifier.*; - -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; -import javax.lang.model.util.*; - -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.dsl.processor.*; -import com.oracle.truffle.dsl.processor.java.*; -import com.oracle.truffle.dsl.processor.java.model.*; -import com.oracle.truffle.dsl.processor.model.*; +import com.oracle.truffle.api.dsl.NodeFactory; +import com.oracle.truffle.dsl.processor.ProcessorContext; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.modifiers; +import com.oracle.truffle.dsl.processor.java.model.CodeExecutableElement; +import com.oracle.truffle.dsl.processor.java.model.CodeTreeBuilder; +import com.oracle.truffle.dsl.processor.java.model.CodeTypeElement; +import com.oracle.truffle.dsl.processor.model.NodeData; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import static javax.lang.model.element.Modifier.PUBLIC; +import static javax.lang.model.element.Modifier.STATIC; +import javax.lang.model.type.TypeMirror; +import javax.lang.model.util.Types; public class NodeCodeGenerator extends CodeTypeElementFactory<NodeData> {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeFactoryFactory.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeFactoryFactory.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,20 +22,27 @@ */ package com.oracle.truffle.dsl.processor.generator; -import static com.oracle.truffle.dsl.processor.java.ElementUtils.*; -import static javax.lang.model.element.Modifier.*; - -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; - -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.dsl.processor.*; -import com.oracle.truffle.dsl.processor.java.*; -import com.oracle.truffle.dsl.processor.java.model.*; +import com.oracle.truffle.api.dsl.NodeFactory; +import com.oracle.truffle.dsl.processor.ProcessorContext; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.modifiers; +import com.oracle.truffle.dsl.processor.java.model.CodeExecutableElement; +import com.oracle.truffle.dsl.processor.java.model.CodeNames; +import com.oracle.truffle.dsl.processor.java.model.CodeTreeBuilder; +import com.oracle.truffle.dsl.processor.java.model.CodeTypeElement; import com.oracle.truffle.dsl.processor.java.model.CodeTypeMirror.ArrayCodeTypeMirror; -import com.oracle.truffle.dsl.processor.model.*; +import com.oracle.truffle.dsl.processor.java.model.CodeVariableElement; +import com.oracle.truffle.dsl.processor.model.NodeData; +import com.oracle.truffle.dsl.processor.model.NodeExecutionData; +import java.util.List; +import javax.lang.model.element.Element; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import static javax.lang.model.element.Modifier.PRIVATE; +import static javax.lang.model.element.Modifier.PUBLIC; +import javax.lang.model.element.TypeElement; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.TypeMirror; class NodeFactoryFactory {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeGenFactory.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeGenFactory.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,36 +22,96 @@ */ package com.oracle.truffle.dsl.processor.generator; -import static com.oracle.truffle.dsl.processor.generator.GeneratorUtils.*; -import static com.oracle.truffle.dsl.processor.java.ElementUtils.*; -import static javax.lang.model.element.Modifier.*; - -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; -import javax.lang.model.util.*; - -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.dsl.internal.*; +import com.oracle.truffle.api.dsl.Cached; +import com.oracle.truffle.api.dsl.UnsupportedSpecializationException; +import com.oracle.truffle.api.dsl.internal.DSLOptions; import com.oracle.truffle.api.dsl.internal.DSLOptions.ImplicitCastOptimization; import com.oracle.truffle.api.dsl.internal.DSLOptions.TypeBoxingOptimization; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.dsl.internal.SpecializationNode; +import com.oracle.truffle.api.dsl.internal.SpecializedNode; +import com.oracle.truffle.api.dsl.internal.SuppressFBWarnings; +import com.oracle.truffle.api.frame.Frame; +import com.oracle.truffle.api.nodes.InvalidAssumptionException; +import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.Node.Child; import com.oracle.truffle.api.nodes.Node.Children; -import com.oracle.truffle.dsl.processor.*; -import com.oracle.truffle.dsl.processor.expression.*; +import com.oracle.truffle.api.nodes.NodeCost; +import com.oracle.truffle.api.nodes.UnexpectedResultException; +import com.oracle.truffle.dsl.processor.ProcessorContext; +import com.oracle.truffle.dsl.processor.expression.DSLExpression; import com.oracle.truffle.dsl.processor.expression.DSLExpression.Variable; -import com.oracle.truffle.dsl.processor.java.*; -import com.oracle.truffle.dsl.processor.java.model.*; +import static com.oracle.truffle.dsl.processor.generator.GeneratorUtils.createClass; +import static com.oracle.truffle.dsl.processor.generator.GeneratorUtils.createTransferToInterpreterAndInvalidate; +import static com.oracle.truffle.dsl.processor.generator.GeneratorUtils.isTypeBoxingOptimized; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.compareType; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.fromTypeMirror; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.getTypeId; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.isObject; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.isSubtypeBoxed; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.isVoid; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.modifiers; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.needsCastTo; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.setVisibility; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.typeEquals; +import com.oracle.truffle.dsl.processor.java.model.CodeAnnotationMirror; +import com.oracle.truffle.dsl.processor.java.model.CodeAnnotationValue; +import com.oracle.truffle.dsl.processor.java.model.CodeExecutableElement; +import com.oracle.truffle.dsl.processor.java.model.CodeNames; +import com.oracle.truffle.dsl.processor.java.model.CodeTree; +import com.oracle.truffle.dsl.processor.java.model.CodeTreeBuilder; +import com.oracle.truffle.dsl.processor.java.model.CodeTypeElement; import com.oracle.truffle.dsl.processor.java.model.CodeTypeMirror.ArrayCodeTypeMirror; -import com.oracle.truffle.dsl.processor.model.*; -import com.oracle.truffle.dsl.processor.parser.*; +import com.oracle.truffle.dsl.processor.java.model.CodeVariableElement; +import com.oracle.truffle.dsl.processor.java.model.GeneratedTypeMirror; +import com.oracle.truffle.dsl.processor.model.AssumptionExpression; +import com.oracle.truffle.dsl.processor.model.CacheExpression; +import com.oracle.truffle.dsl.processor.model.CreateCastData; +import com.oracle.truffle.dsl.processor.model.ExecutableTypeData; +import com.oracle.truffle.dsl.processor.model.GuardExpression; +import com.oracle.truffle.dsl.processor.model.ImplicitCastData; +import com.oracle.truffle.dsl.processor.model.NodeChildData; +import com.oracle.truffle.dsl.processor.model.NodeData; +import com.oracle.truffle.dsl.processor.model.NodeExecutionData; +import com.oracle.truffle.dsl.processor.model.NodeFieldData; +import com.oracle.truffle.dsl.processor.model.Parameter; +import com.oracle.truffle.dsl.processor.model.ShortCircuitData; +import com.oracle.truffle.dsl.processor.model.SpecializationData; +import com.oracle.truffle.dsl.processor.model.TemplateMethod; +import com.oracle.truffle.dsl.processor.model.TypeSystemData; +import com.oracle.truffle.dsl.processor.parser.SpecializationGroup; import com.oracle.truffle.dsl.processor.parser.SpecializationGroup.TypeGuard; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import javax.lang.model.element.Element; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import static javax.lang.model.element.Modifier.ABSTRACT; +import static javax.lang.model.element.Modifier.FINAL; +import static javax.lang.model.element.Modifier.PRIVATE; +import static javax.lang.model.element.Modifier.PROTECTED; +import static javax.lang.model.element.Modifier.PUBLIC; +import static javax.lang.model.element.Modifier.STATIC; +import javax.lang.model.element.TypeElement; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.ArrayType; +import javax.lang.model.type.DeclaredType; +import javax.lang.model.type.TypeMirror; +import javax.lang.model.util.ElementFilter; public class NodeGenFactory {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/TypeSystemCodeGenerator.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/TypeSystemCodeGenerator.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,20 +22,33 @@ */ package com.oracle.truffle.dsl.processor.generator; -import static com.oracle.truffle.dsl.processor.generator.GeneratorUtils.*; -import static com.oracle.truffle.dsl.processor.java.ElementUtils.*; -import static javax.lang.model.element.Modifier.*; - -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; - -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.dsl.processor.*; -import com.oracle.truffle.dsl.processor.java.*; -import com.oracle.truffle.dsl.processor.java.model.*; -import com.oracle.truffle.dsl.processor.model.*; +import com.oracle.truffle.api.nodes.UnexpectedResultException; +import com.oracle.truffle.dsl.processor.ProcessorContext; +import static com.oracle.truffle.dsl.processor.generator.GeneratorUtils.createTransferToInterpreterAndInvalidate; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.createConstantName; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.getSimpleName; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.modifiers; +import com.oracle.truffle.dsl.processor.java.model.CodeAnnotationMirror; +import com.oracle.truffle.dsl.processor.java.model.CodeExecutableElement; +import com.oracle.truffle.dsl.processor.java.model.CodeTree; +import com.oracle.truffle.dsl.processor.java.model.CodeTreeBuilder; +import com.oracle.truffle.dsl.processor.java.model.CodeTypeElement; +import com.oracle.truffle.dsl.processor.java.model.CodeTypeMirror; +import com.oracle.truffle.dsl.processor.java.model.CodeVariableElement; +import com.oracle.truffle.dsl.processor.java.model.GeneratedTypeMirror; +import com.oracle.truffle.dsl.processor.model.ImplicitCastData; +import com.oracle.truffle.dsl.processor.model.TypeCastData; +import com.oracle.truffle.dsl.processor.model.TypeCheckData; +import com.oracle.truffle.dsl.processor.model.TypeSystemData; +import java.util.List; +import javax.lang.model.element.Modifier; +import static javax.lang.model.element.Modifier.FINAL; +import static javax.lang.model.element.Modifier.PROTECTED; +import static javax.lang.model.element.Modifier.PUBLIC; +import static javax.lang.model.element.Modifier.STATIC; +import javax.lang.model.type.DeclaredType; +import javax.lang.model.type.TypeMirror; public class TypeSystemCodeGenerator extends CodeTypeElementFactory<TypeSystemData> {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/ElementUtils.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/ElementUtils.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,18 +22,44 @@ */ package com.oracle.truffle.dsl.processor.java; -import java.io.*; -import java.lang.annotation.*; -import java.util.*; - -import javax.annotation.processing.*; -import javax.lang.model.element.*; -import javax.lang.model.type.*; -import javax.lang.model.util.*; - -import com.oracle.truffle.dsl.processor.*; -import com.oracle.truffle.dsl.processor.java.model.*; +import com.oracle.truffle.dsl.processor.CompileErrorException; +import com.oracle.truffle.dsl.processor.ProcessorContext; +import com.oracle.truffle.dsl.processor.java.model.CodeTypeMirror; import com.oracle.truffle.dsl.processor.java.model.CodeTypeMirror.DeclaredCodeTypeMirror; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.lang.annotation.Annotation; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import javax.annotation.processing.ProcessingEnvironment; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.PackageElement; +import javax.lang.model.element.TypeElement; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.ArrayType; +import javax.lang.model.type.DeclaredType; +import javax.lang.model.type.ExecutableType; +import javax.lang.model.type.PrimitiveType; +import javax.lang.model.type.TypeKind; +import javax.lang.model.type.TypeMirror; +import javax.lang.model.type.WildcardType; +import javax.lang.model.util.AbstractAnnotationValueVisitor7; +import javax.lang.model.util.ElementFilter; /** * THIS IS NOT PUBLIC API.
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/compiler/AbstractCompiler.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/compiler/AbstractCompiler.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,7 +22,8 @@ */ package com.oracle.truffle.dsl.processor.java.compiler; -import java.lang.reflect.*; +import java.lang.reflect.Field; +import java.lang.reflect.Method; public abstract class AbstractCompiler implements Compiler {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/compiler/Compiler.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/compiler/Compiler.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,10 +22,11 @@ */ package com.oracle.truffle.dsl.processor.java.compiler; -import java.util.*; - -import javax.annotation.processing.*; -import javax.lang.model.element.*; +import java.util.List; +import javax.annotation.processing.ProcessingEnvironment; +import javax.lang.model.element.Element; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.TypeElement; public interface Compiler {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/compiler/CompilerFactory.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/compiler/CompilerFactory.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.truffle.dsl.processor.java.compiler; -import javax.lang.model.element.*; +import javax.lang.model.element.Element; public class CompilerFactory {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/compiler/JDTCompiler.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/compiler/JDTCompiler.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,12 +22,19 @@ */ package com.oracle.truffle.dsl.processor.java.compiler; -import java.util.*; - -import javax.annotation.processing.*; -import javax.lang.model.element.*; - -import com.oracle.truffle.dsl.processor.java.*; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import javax.annotation.processing.ProcessingEnvironment; +import javax.lang.model.element.Element; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.TypeElement; public class JDTCompiler extends AbstractCompiler {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/compiler/JavaCCompiler.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/compiler/JavaCCompiler.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,12 +22,14 @@ */ package com.oracle.truffle.dsl.processor.java.compiler; -import java.util.*; - -import javax.annotation.processing.*; -import javax.lang.model.element.*; - -import com.oracle.truffle.dsl.processor.java.*; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import java.util.List; +import javax.annotation.processing.ProcessingEnvironment; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; +import javax.lang.model.element.Element; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.TypeElement; public class JavaCCompiler extends AbstractCompiler {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/CodeAnnotationMirror.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/CodeAnnotationMirror.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,12 +22,13 @@ */ package com.oracle.truffle.dsl.processor.java.model; -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; - -import com.oracle.truffle.dsl.processor.java.*; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import java.util.LinkedHashMap; +import java.util.Map; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.type.DeclaredType; public class CodeAnnotationMirror implements AnnotationMirror {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/CodeAnnotationValue.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/CodeAnnotationValue.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,10 +22,13 @@ */ package com.oracle.truffle.dsl.processor.java.model; -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; +import java.util.List; +import java.util.Objects; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; +import javax.lang.model.element.AnnotationValueVisitor; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.TypeMirror; public class CodeAnnotationValue implements AnnotationValue {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/CodeCompilationUnit.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/CodeCompilationUnit.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,10 +22,14 @@ */ package com.oracle.truffle.dsl.processor.java.model; -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; +import java.util.Collections; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.ElementVisitor; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.Name; +import javax.lang.model.element.TypeElement; +import javax.lang.model.type.TypeMirror; public class CodeCompilationUnit extends CodeElement<TypeElement> {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/CodeElement.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/CodeElement.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,13 +22,22 @@ */ package com.oracle.truffle.dsl.processor.java.model; -import java.io.*; -import java.lang.annotation.*; -import java.util.*; - -import javax.lang.model.element.*; - -import com.oracle.truffle.dsl.processor.java.transform.*; +import com.oracle.truffle.dsl.processor.java.transform.AbstractCodeWriter; +import java.io.CharArrayWriter; +import java.io.IOException; +import java.io.Writer; +import java.lang.annotation.Annotation; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.ListIterator; +import java.util.Set; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.Modifier; public abstract class CodeElement<E extends Element> implements Element, GeneratedElement {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/CodeElementScanner.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/CodeElementScanner.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,10 +22,14 @@ */ package com.oracle.truffle.dsl.processor.java.model; -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.util.*; +import java.util.List; +import javax.lang.model.element.Element; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.PackageElement; +import javax.lang.model.element.TypeElement; +import javax.lang.model.element.TypeParameterElement; +import javax.lang.model.element.VariableElement; +import javax.lang.model.util.ElementScanner7; public abstract class CodeElementScanner<R, P> extends ElementScanner7<R, P> {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/CodeExecutableElement.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/CodeExecutableElement.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,13 +22,23 @@ */ package com.oracle.truffle.dsl.processor.java.model; -import java.util.*; - -import javax.annotation.processing.*; -import javax.lang.model.element.*; -import javax.lang.model.type.*; - -import com.oracle.truffle.dsl.processor.java.*; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import javax.annotation.processing.ProcessingEnvironment; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.ElementVisitor; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.Name; +import javax.lang.model.element.TypeParameterElement; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.TypeMirror; public class CodeExecutableElement extends CodeElement<Element> implements ExecutableElement {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/CodeImport.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/CodeImport.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.truffle.dsl.processor.java.model; -import java.util.*; +import java.util.Objects; public class CodeImport implements Comparable<CodeImport> {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/CodeNames.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/CodeNames.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.truffle.dsl.processor.java.model; -import java.util.*; - -import javax.lang.model.element.*; +import java.util.HashMap; +import java.util.Map; +import javax.lang.model.element.Name; public abstract class CodeNames {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/CodeTree.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/CodeTree.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.truffle.dsl.processor.java.model; -import java.util.*; - -import javax.lang.model.type.*; +import java.util.ArrayList; +import java.util.List; +import javax.lang.model.type.TypeMirror; public class CodeTree {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/CodeTreeBuilder.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/CodeTreeBuilder.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,14 +22,21 @@ */ package com.oracle.truffle.dsl.processor.java.model; -import static com.oracle.truffle.dsl.processor.java.model.CodeTreeKind.*; - -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; - -import com.oracle.truffle.dsl.processor.java.*; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import static com.oracle.truffle.dsl.processor.java.model.CodeTreeKind.COMMA_GROUP; +import static com.oracle.truffle.dsl.processor.java.model.CodeTreeKind.GROUP; +import static com.oracle.truffle.dsl.processor.java.model.CodeTreeKind.INDENT; +import static com.oracle.truffle.dsl.processor.java.model.CodeTreeKind.NEW_LINE; +import static com.oracle.truffle.dsl.processor.java.model.CodeTreeKind.REMOVE_LAST; +import static com.oracle.truffle.dsl.processor.java.model.CodeTreeKind.STRING; +import static com.oracle.truffle.dsl.processor.java.model.CodeTreeKind.TYPE; +import java.util.List; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.type.ArrayType; +import javax.lang.model.type.TypeKind; +import javax.lang.model.type.TypeMirror; public class CodeTreeBuilder {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/CodeTypeElement.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/CodeTypeElement.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,13 +22,24 @@ */ package com.oracle.truffle.dsl.processor.java.model; -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; -import javax.lang.model.util.*; - import com.oracle.truffle.dsl.processor.java.model.CodeTypeMirror.DeclaredCodeTypeMirror; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.ElementVisitor; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.Name; +import javax.lang.model.element.NestingKind; +import javax.lang.model.element.PackageElement; +import javax.lang.model.element.TypeElement; +import javax.lang.model.element.TypeParameterElement; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.TypeMirror; +import javax.lang.model.util.ElementFilter; public class CodeTypeElement extends CodeElement<Element> implements TypeElement {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/CodeTypeMirror.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/CodeTypeMirror.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,11 +22,18 @@ */ package com.oracle.truffle.dsl.processor.java.model; -import java.lang.annotation.*; -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; +import java.lang.annotation.Annotation; +import java.util.Collections; +import java.util.List; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.Element; +import javax.lang.model.element.TypeElement; +import javax.lang.model.type.ArrayType; +import javax.lang.model.type.DeclaredType; +import javax.lang.model.type.TypeKind; +import javax.lang.model.type.TypeMirror; +import javax.lang.model.type.TypeVisitor; +import javax.lang.model.type.WildcardType; public class CodeTypeMirror implements TypeMirror {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/CodeVariableElement.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/CodeVariableElement.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,12 +22,18 @@ */ package com.oracle.truffle.dsl.processor.java.model; -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; - -import com.oracle.truffle.dsl.processor.java.*; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import java.util.Set; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.ElementVisitor; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.Name; +import javax.lang.model.element.TypeElement; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.TypeMirror; public final class CodeVariableElement extends CodeElement<Element> implements VariableElement {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/GeneratedElement.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/GeneratedElement.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,7 +22,8 @@ */ package com.oracle.truffle.dsl.processor.java.model; -import javax.lang.model.element.*; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.Element; public interface GeneratedElement {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/GeneratedPackageElement.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/GeneratedPackageElement.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,10 +22,14 @@ */ package com.oracle.truffle.dsl.processor.java.model; -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; +import java.util.Collections; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.ElementVisitor; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.Name; +import javax.lang.model.element.PackageElement; +import javax.lang.model.type.TypeMirror; public final class GeneratedPackageElement extends CodeElement<Element> implements PackageElement {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/GeneratedTypeElement.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/GeneratedTypeElement.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.truffle.dsl.processor.java.model; -import java.util.*; - -import javax.lang.model.element.*; +import java.util.Set; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.PackageElement; public final class GeneratedTypeElement extends CodeTypeElement {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/GeneratedTypeMirror.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/GeneratedTypeMirror.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,11 +22,10 @@ */ package com.oracle.truffle.dsl.processor.java.model; -import java.util.*; - -import javax.lang.model.element.*; - import com.oracle.truffle.dsl.processor.java.model.CodeTypeMirror.DeclaredCodeTypeMirror; +import java.util.Collections; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.Modifier; public final class GeneratedTypeMirror extends DeclaredCodeTypeMirror {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/transform/AbstractCodeWriter.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/transform/AbstractCodeWriter.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,17 +22,39 @@ */ package com.oracle.truffle.dsl.processor.java.transform; -import static com.oracle.truffle.dsl.processor.java.ElementUtils.*; - -import java.io.*; -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; -import javax.lang.model.util.*; - -import com.oracle.truffle.dsl.processor.java.*; -import com.oracle.truffle.dsl.processor.java.model.*; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.getQualifiedName; +import com.oracle.truffle.dsl.processor.java.model.CodeElementScanner; +import com.oracle.truffle.dsl.processor.java.model.CodeExecutableElement; +import com.oracle.truffle.dsl.processor.java.model.CodeImport; +import com.oracle.truffle.dsl.processor.java.model.CodeTree; +import com.oracle.truffle.dsl.processor.java.model.CodeTreeKind; +import com.oracle.truffle.dsl.processor.java.model.CodeTypeElement; +import com.oracle.truffle.dsl.processor.java.model.CodeVariableElement; +import java.io.IOException; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.Name; +import javax.lang.model.element.TypeElement; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.ArrayType; +import javax.lang.model.type.DeclaredType; +import javax.lang.model.type.TypeKind; +import javax.lang.model.type.TypeMirror; +import javax.lang.model.util.AbstractAnnotationValueVisitor7; +import javax.lang.model.util.ElementFilter; public abstract class AbstractCodeWriter extends CodeElementScanner<Void, Void> {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/transform/FixWarningsVisitor.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/transform/FixWarningsVisitor.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,18 +22,30 @@ */ package com.oracle.truffle.dsl.processor.java.transform; -import static com.oracle.truffle.dsl.processor.java.ElementUtils.*; -import static javax.lang.model.element.Modifier.*; - -import java.io.*; -import java.util.*; - -import javax.annotation.processing.*; -import javax.lang.model.element.*; -import javax.lang.model.type.*; - -import com.oracle.truffle.dsl.processor.java.*; -import com.oracle.truffle.dsl.processor.java.model.*; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.modifiers; +import com.oracle.truffle.dsl.processor.java.model.CodeAnnotationMirror; +import com.oracle.truffle.dsl.processor.java.model.CodeAnnotationValue; +import com.oracle.truffle.dsl.processor.java.model.CodeElementScanner; +import com.oracle.truffle.dsl.processor.java.model.CodeExecutableElement; +import com.oracle.truffle.dsl.processor.java.model.CodeTree; +import com.oracle.truffle.dsl.processor.java.model.CodeTypeElement; +import com.oracle.truffle.dsl.processor.java.model.CodeVariableElement; +import java.io.Serializable; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.StringTokenizer; +import javax.annotation.processing.ProcessingEnvironment; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.Element; +import javax.lang.model.element.Modifier; +import static javax.lang.model.element.Modifier.FINAL; +import static javax.lang.model.element.Modifier.PRIVATE; +import static javax.lang.model.element.Modifier.STATIC; +import javax.lang.model.element.TypeElement; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.DeclaredType; public class FixWarningsVisitor extends CodeElementScanner<Void, Void> {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/transform/GenerateOverrideVisitor.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/transform/GenerateOverrideVisitor.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,13 +22,15 @@ */ package com.oracle.truffle.dsl.processor.java.transform; -import static com.oracle.truffle.dsl.processor.java.ElementUtils.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; - -import com.oracle.truffle.dsl.processor.java.*; -import com.oracle.truffle.dsl.processor.java.model.*; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.isDeclaredMethodInSuperType; +import com.oracle.truffle.dsl.processor.java.model.CodeAnnotationMirror; +import com.oracle.truffle.dsl.processor.java.model.CodeElementScanner; +import com.oracle.truffle.dsl.processor.java.model.CodeExecutableElement; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.Modifier; +import javax.lang.model.type.DeclaredType; +import javax.lang.model.type.TypeMirror; public class GenerateOverrideVisitor extends CodeElementScanner<Void, Void> {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/transform/OrganizedImports.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/transform/OrganizedImports.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,16 +22,37 @@ */ package com.oracle.truffle.dsl.processor.java.transform; -import static com.oracle.truffle.dsl.processor.java.ElementUtils.*; - -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; -import javax.lang.model.util.*; - -import com.oracle.truffle.dsl.processor.java.*; -import com.oracle.truffle.dsl.processor.java.model.*; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.findNearestEnclosingType; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.getDeclaredTypes; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.getPackageName; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.getQualifiedName; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.getSuperTypes; +import com.oracle.truffle.dsl.processor.java.model.CodeElementScanner; +import com.oracle.truffle.dsl.processor.java.model.CodeExecutableElement; +import com.oracle.truffle.dsl.processor.java.model.CodeImport; +import com.oracle.truffle.dsl.processor.java.model.CodeTree; +import com.oracle.truffle.dsl.processor.java.model.CodeTreeKind; +import com.oracle.truffle.dsl.processor.java.model.CodeTypeElement; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; +import javax.lang.model.element.Element; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.TypeElement; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.ArrayType; +import javax.lang.model.type.DeclaredType; +import javax.lang.model.type.TypeMirror; +import javax.lang.model.type.WildcardType; +import javax.lang.model.util.AbstractAnnotationValueVisitor7; +import javax.lang.model.util.ElementFilter; public final class OrganizedImports {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/AnnotatedParameterSpec.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/AnnotatedParameterSpec.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,12 +22,11 @@ */ package com.oracle.truffle.dsl.processor.model; -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; - -import com.oracle.truffle.dsl.processor.java.*; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import java.util.Collections; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.DeclaredType; +import javax.lang.model.type.TypeMirror; public final class AnnotatedParameterSpec extends ParameterSpec {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/AssumptionExpression.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/AssumptionExpression.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,10 +22,11 @@ */ package com.oracle.truffle.dsl.processor.model; -import javax.lang.model.element.*; - -import com.oracle.truffle.dsl.processor.expression.*; -import com.oracle.truffle.dsl.processor.java.*; +import com.oracle.truffle.dsl.processor.expression.DSLExpression; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; +import javax.lang.model.element.Element; public final class AssumptionExpression extends MessageContainer {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/CacheExpression.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/CacheExpression.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,10 +22,11 @@ */ package com.oracle.truffle.dsl.processor.model; -import javax.lang.model.element.*; - -import com.oracle.truffle.dsl.processor.expression.*; -import com.oracle.truffle.dsl.processor.java.*; +import com.oracle.truffle.dsl.processor.expression.DSLExpression; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; +import javax.lang.model.element.Element; public final class CacheExpression extends MessageContainer {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/CreateCastData.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/CreateCastData.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.truffle.dsl.processor.model; -import java.util.*; +import java.util.List; public class CreateCastData extends TemplateMethod {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/ExecutableTypeData.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/ExecutableTypeData.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,16 +22,20 @@ */ package com.oracle.truffle.dsl.processor.model; -import static com.oracle.truffle.dsl.processor.java.ElementUtils.*; - -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; - -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.dsl.processor.*; -import com.oracle.truffle.dsl.processor.java.*; +import com.oracle.truffle.api.nodes.UnexpectedResultException; +import com.oracle.truffle.dsl.processor.ProcessorContext; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.isSubtypeBoxed; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.isVoid; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.typeEquals; +import java.util.ArrayList; +import java.util.List; +import javax.lang.model.element.Element; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.ArrayType; +import javax.lang.model.type.TypeMirror; public class ExecutableTypeData extends MessageContainer implements Comparable<ExecutableTypeData> {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/GuardExpression.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/GuardExpression.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,13 +22,13 @@ */ package com.oracle.truffle.dsl.processor.model; -import java.util.*; - -import javax.lang.model.element.*; - -import com.oracle.truffle.dsl.processor.expression.*; +import com.oracle.truffle.dsl.processor.expression.DSLExpression; import com.oracle.truffle.dsl.processor.expression.DSLExpression.Negate; -import com.oracle.truffle.dsl.processor.java.*; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import java.util.Objects; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; +import javax.lang.model.element.Element; public final class GuardExpression extends MessageContainer {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/ImplicitCastData.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/ImplicitCastData.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.truffle.dsl.processor.model; -import javax.lang.model.type.*; +import javax.lang.model.type.TypeMirror; public class ImplicitCastData extends TemplateMethod {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/MessageContainer.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/MessageContainer.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,14 +22,21 @@ */ package com.oracle.truffle.dsl.processor.model; -import java.util.*; - -import javax.lang.model.element.*; +import com.oracle.truffle.dsl.processor.Log; +import com.oracle.truffle.dsl.processor.ProcessorContext; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; +import javax.lang.model.element.Element; +import javax.lang.model.element.TypeElement; import javax.tools.Diagnostic.Kind; -import com.oracle.truffle.dsl.processor.*; -import com.oracle.truffle.dsl.processor.java.*; - public abstract class MessageContainer implements Iterable<MessageContainer> { private final List<Message> messages = new ArrayList<>();
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/MethodSpec.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/MethodSpec.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.truffle.dsl.processor.model; -import java.util.*; - -import javax.lang.model.type.*; - -import com.oracle.truffle.dsl.processor.java.*; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import javax.lang.model.type.TypeMirror; public class MethodSpec {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/NodeChildData.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/NodeChildData.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,12 +22,12 @@ */ package com.oracle.truffle.dsl.processor.model; -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; - -import com.oracle.truffle.dsl.processor.*; +import com.oracle.truffle.dsl.processor.ProcessorContext; +import java.util.Collections; +import java.util.List; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.Element; +import javax.lang.model.type.TypeMirror; public class NodeChildData extends MessageContainer {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/NodeData.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/NodeData.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,14 +22,18 @@ */ package com.oracle.truffle.dsl.processor.model; -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; - -import com.oracle.truffle.dsl.processor.*; -import com.oracle.truffle.dsl.processor.java.*; +import com.oracle.truffle.dsl.processor.ProcessorContext; +import com.oracle.truffle.dsl.processor.java.ElementUtils; import com.oracle.truffle.dsl.processor.model.NodeChildData.Cardinality; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.TypeElement; +import javax.lang.model.type.TypeMirror; public class NodeData extends Template implements Comparable<NodeData> {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/NodeExecutionData.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/NodeExecutionData.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.truffle.dsl.processor.model; -import java.util.*; - -import javax.lang.model.type.*; - import com.oracle.truffle.dsl.processor.model.NodeChildData.Cardinality; +import java.util.ArrayList; +import java.util.List; +import javax.lang.model.type.ArrayType; +import javax.lang.model.type.TypeKind; +import javax.lang.model.type.TypeMirror; public class NodeExecutionData {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/NodeFieldData.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/NodeFieldData.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,8 +22,11 @@ */ package com.oracle.truffle.dsl.processor.model; -import javax.lang.model.element.*; -import javax.lang.model.type.*; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.Element; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.TypeMirror; public class NodeFieldData extends MessageContainer {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/Parameter.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/Parameter.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.truffle.dsl.processor.model; -import javax.lang.model.element.*; -import javax.lang.model.type.*; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.TypeMirror; public final class Parameter {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/ParameterSpec.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/ParameterSpec.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,14 +22,13 @@ */ package com.oracle.truffle.dsl.processor.model; -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; - -import com.oracle.truffle.dsl.processor.*; -import com.oracle.truffle.dsl.processor.java.*; +import com.oracle.truffle.dsl.processor.ProcessorContext; +import com.oracle.truffle.dsl.processor.java.ElementUtils; import com.oracle.truffle.dsl.processor.model.MethodSpec.TypeDef; +import java.util.Arrays; +import java.util.Collection; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.TypeMirror; public class ParameterSpec {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/ShortCircuitData.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/ShortCircuitData.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.truffle.dsl.processor.model; -import com.oracle.truffle.dsl.processor.java.*; +import com.oracle.truffle.dsl.processor.java.ElementUtils; public class ShortCircuitData extends TemplateMethod {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/SpecializationData.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/SpecializationData.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,14 +22,17 @@ */ package com.oracle.truffle.dsl.processor.model; -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; - -import com.oracle.truffle.dsl.processor.*; -import com.oracle.truffle.dsl.processor.expression.*; -import com.oracle.truffle.dsl.processor.java.*; +import com.oracle.truffle.dsl.processor.ProcessorContext; +import com.oracle.truffle.dsl.processor.expression.DSLExpression; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.TreeSet; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.TypeMirror; public final class SpecializationData extends TemplateMethod {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/SpecializationThrowsData.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/SpecializationThrowsData.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,8 +22,10 @@ */ package com.oracle.truffle.dsl.processor.model; -import javax.lang.model.element.*; -import javax.lang.model.type.*; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; +import javax.lang.model.element.Element; +import javax.lang.model.type.TypeMirror; public class SpecializationThrowsData extends MessageContainer {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/Template.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/Template.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,12 +22,13 @@ */ package com.oracle.truffle.dsl.processor.model; -import java.util.*; - -import javax.lang.model.element.*; - -import com.oracle.truffle.dsl.processor.*; -import com.oracle.truffle.dsl.processor.java.*; +import com.oracle.truffle.dsl.processor.ProcessorContext; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import java.util.Collections; +import java.util.List; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.Element; +import javax.lang.model.element.TypeElement; public abstract class Template extends MessageContainer {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/TemplateMethod.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/TemplateMethod.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,13 +22,20 @@ */ package com.oracle.truffle.dsl.processor.model; -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; - -import com.oracle.truffle.dsl.processor.java.*; -import com.oracle.truffle.dsl.processor.util.*; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import com.oracle.truffle.dsl.processor.util.FilteredIterable; +import com.oracle.truffle.dsl.processor.util.Predicate; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.Element; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.TypeElement; +import javax.lang.model.type.TypeMirror; /** * Note: this class has a natural ordering that is inconsistent with equals.
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/TypeCastData.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/TypeCastData.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.truffle.dsl.processor.model; -import javax.lang.model.type.*; +import javax.lang.model.type.TypeMirror; public class TypeCastData extends TemplateMethod {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/TypeCheckData.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/TypeCheckData.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.truffle.dsl.processor.model; -import javax.lang.model.type.*; +import javax.lang.model.type.TypeMirror; public class TypeCheckData extends TemplateMethod {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/TypeSystemData.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/TypeSystemData.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,14 +22,17 @@ */ package com.oracle.truffle.dsl.processor.model; -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; - -import com.oracle.truffle.api.dsl.internal.*; -import com.oracle.truffle.dsl.processor.*; -import com.oracle.truffle.dsl.processor.java.*; +import com.oracle.truffle.api.dsl.internal.DSLOptions; +import com.oracle.truffle.dsl.processor.ProcessorContext; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.TypeElement; +import javax.lang.model.type.TypeMirror; public class TypeSystemData extends Template {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/AbstractParser.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/AbstractParser.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,18 +22,25 @@ */ package com.oracle.truffle.dsl.processor.parser; -import java.lang.annotation.*; -import java.util.*; - -import javax.annotation.processing.*; -import javax.lang.model.element.*; +import com.oracle.truffle.dsl.processor.CompileErrorException; +import com.oracle.truffle.dsl.processor.Log; +import com.oracle.truffle.dsl.processor.ProcessorContext; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import com.oracle.truffle.dsl.processor.model.MessageContainer; +import com.oracle.truffle.dsl.processor.model.MessageContainer.Message; +import java.lang.annotation.Annotation; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import javax.annotation.processing.ProcessingEnvironment; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.ExecutableElement; import javax.tools.Diagnostic.Kind; -import com.oracle.truffle.dsl.processor.*; -import com.oracle.truffle.dsl.processor.java.*; -import com.oracle.truffle.dsl.processor.model.*; -import com.oracle.truffle.dsl.processor.model.MessageContainer.Message; - /** * THIS IS NOT PUBLIC API. */
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/CreateCastParser.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/CreateCastParser.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,16 +22,21 @@ */ package com.oracle.truffle.dsl.processor.parser; -import java.lang.annotation.*; -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; - -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.dsl.processor.*; -import com.oracle.truffle.dsl.processor.java.*; -import com.oracle.truffle.dsl.processor.model.*; +import com.oracle.truffle.api.dsl.CreateCast; +import com.oracle.truffle.dsl.processor.ProcessorContext; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import com.oracle.truffle.dsl.processor.model.CreateCastData; +import com.oracle.truffle.dsl.processor.model.MethodSpec; +import com.oracle.truffle.dsl.processor.model.NodeChildData; +import com.oracle.truffle.dsl.processor.model.NodeData; +import com.oracle.truffle.dsl.processor.model.ParameterSpec; +import com.oracle.truffle.dsl.processor.model.TemplateMethod; +import java.lang.annotation.Annotation; +import java.util.List; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.type.TypeMirror; public class CreateCastParser extends NodeMethodParser<CreateCastData> {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/FallbackParser.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/FallbackParser.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,14 +22,18 @@ */ package com.oracle.truffle.dsl.processor.parser; -import java.lang.annotation.*; - -import javax.lang.model.element.*; - -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.dsl.processor.*; -import com.oracle.truffle.dsl.processor.model.*; +import com.oracle.truffle.api.dsl.Fallback; +import com.oracle.truffle.dsl.processor.ProcessorContext; +import com.oracle.truffle.dsl.processor.model.MethodSpec; +import com.oracle.truffle.dsl.processor.model.NodeData; +import com.oracle.truffle.dsl.processor.model.NodeExecutionData; +import com.oracle.truffle.dsl.processor.model.ParameterSpec; +import com.oracle.truffle.dsl.processor.model.SpecializationData; import com.oracle.truffle.dsl.processor.model.SpecializationData.SpecializationKind; +import com.oracle.truffle.dsl.processor.model.TemplateMethod; +import java.lang.annotation.Annotation; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.ExecutableElement; public class FallbackParser extends NodeMethodParser<SpecializationData> {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/ImplicitCastParser.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/ImplicitCastParser.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,15 +22,20 @@ */ package com.oracle.truffle.dsl.processor.parser; -import java.lang.annotation.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; - -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.dsl.processor.*; -import com.oracle.truffle.dsl.processor.java.*; -import com.oracle.truffle.dsl.processor.model.*; +import com.oracle.truffle.api.dsl.ImplicitCast; +import com.oracle.truffle.dsl.processor.ProcessorContext; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import com.oracle.truffle.dsl.processor.model.ImplicitCastData; +import com.oracle.truffle.dsl.processor.model.MethodSpec; +import com.oracle.truffle.dsl.processor.model.Parameter; +import com.oracle.truffle.dsl.processor.model.ParameterSpec; +import com.oracle.truffle.dsl.processor.model.TemplateMethod; +import com.oracle.truffle.dsl.processor.model.TypeSystemData; +import java.lang.annotation.Annotation; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import javax.lang.model.type.TypeMirror; public class ImplicitCastParser extends TypeSystemMethodParser<ImplicitCastData> {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/MethodSpecParser.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/MethodSpecParser.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,16 +22,23 @@ */ package com.oracle.truffle.dsl.processor.parser; -import static com.oracle.truffle.dsl.processor.java.ElementUtils.*; - -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; - -import com.oracle.truffle.dsl.processor.java.*; -import com.oracle.truffle.dsl.processor.java.model.*; -import com.oracle.truffle.dsl.processor.model.*; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.hasError; +import com.oracle.truffle.dsl.processor.java.model.CodeVariableElement; +import com.oracle.truffle.dsl.processor.model.MethodSpec; +import com.oracle.truffle.dsl.processor.model.Parameter; +import com.oracle.truffle.dsl.processor.model.ParameterSpec; +import com.oracle.truffle.dsl.processor.model.Template; +import com.oracle.truffle.dsl.processor.model.TemplateMethod; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.ArrayType; +import javax.lang.model.type.TypeKind; +import javax.lang.model.type.TypeMirror; public final class MethodSpecParser {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/NodeMethodParser.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/NodeMethodParser.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,14 +22,19 @@ */ package com.oracle.truffle.dsl.processor.parser; -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; - -import com.oracle.truffle.dsl.processor.*; -import com.oracle.truffle.dsl.processor.java.*; -import com.oracle.truffle.dsl.processor.model.*; +import com.oracle.truffle.dsl.processor.ProcessorContext; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import com.oracle.truffle.dsl.processor.model.MethodSpec; +import com.oracle.truffle.dsl.processor.model.NodeData; +import com.oracle.truffle.dsl.processor.model.NodeExecutionData; +import com.oracle.truffle.dsl.processor.model.NodeFieldData; +import com.oracle.truffle.dsl.processor.model.ParameterSpec; +import com.oracle.truffle.dsl.processor.model.TemplateMethod; +import java.util.Arrays; +import java.util.Collection; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.type.TypeMirror; public abstract class NodeMethodParser<E extends TemplateMethod> extends TemplateMethodParser<NodeData, E> {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/NodeParser.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/NodeParser.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,29 +22,77 @@ */ package com.oracle.truffle.dsl.processor.parser; -import java.lang.annotation.*; -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; -import javax.lang.model.util.*; +import com.oracle.truffle.api.Assumption; +import com.oracle.truffle.api.dsl.Cached; +import com.oracle.truffle.api.dsl.CreateCast; +import com.oracle.truffle.api.dsl.Fallback; +import com.oracle.truffle.api.dsl.GenerateNodeFactory; +import com.oracle.truffle.api.dsl.GeneratedBy; +import com.oracle.truffle.api.dsl.ImportStatic; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.NodeChildren; +import com.oracle.truffle.api.dsl.NodeField; +import com.oracle.truffle.api.dsl.NodeFields; +import com.oracle.truffle.api.dsl.ShortCircuit; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.dsl.TypeSystemReference; +import com.oracle.truffle.api.dsl.internal.DSLOptions; +import com.oracle.truffle.api.frame.Frame; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.dsl.processor.CompileErrorException; +import com.oracle.truffle.dsl.processor.Log; +import com.oracle.truffle.dsl.processor.expression.DSLExpression; +import com.oracle.truffle.dsl.processor.expression.DSLExpressionResolver; +import com.oracle.truffle.dsl.processor.expression.InvalidExpressionException; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import com.oracle.truffle.dsl.processor.java.compiler.CompilerFactory; +import com.oracle.truffle.dsl.processor.java.model.CodeTypeMirror.ArrayCodeTypeMirror; +import com.oracle.truffle.dsl.processor.java.model.CodeVariableElement; +import com.oracle.truffle.dsl.processor.model.AssumptionExpression; +import com.oracle.truffle.dsl.processor.model.CacheExpression; +import com.oracle.truffle.dsl.processor.model.ExecutableTypeData; +import com.oracle.truffle.dsl.processor.model.GuardExpression; +import com.oracle.truffle.dsl.processor.model.MethodSpec; +import com.oracle.truffle.dsl.processor.model.NodeChildData; +import com.oracle.truffle.dsl.processor.model.NodeChildData.Cardinality; +import com.oracle.truffle.dsl.processor.model.NodeData; +import com.oracle.truffle.dsl.processor.model.NodeExecutionData; +import com.oracle.truffle.dsl.processor.model.NodeFieldData; +import com.oracle.truffle.dsl.processor.model.Parameter; +import com.oracle.truffle.dsl.processor.model.ParameterSpec; +import com.oracle.truffle.dsl.processor.model.ShortCircuitData; +import com.oracle.truffle.dsl.processor.model.SpecializationData; +import com.oracle.truffle.dsl.processor.model.SpecializationData.SpecializationKind; +import com.oracle.truffle.dsl.processor.model.SpecializationThrowsData; +import com.oracle.truffle.dsl.processor.model.TemplateMethod; +import com.oracle.truffle.dsl.processor.model.TypeSystemData; +import java.lang.annotation.Annotation; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.TypeElement; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.DeclaredType; +import javax.lang.model.type.TypeKind; +import javax.lang.model.type.TypeMirror; +import javax.lang.model.util.ElementFilter; import javax.tools.Diagnostic.Kind; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.dsl.internal.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.dsl.processor.*; -import com.oracle.truffle.dsl.processor.expression.*; -import com.oracle.truffle.dsl.processor.java.*; -import com.oracle.truffle.dsl.processor.java.compiler.*; -import com.oracle.truffle.dsl.processor.java.model.CodeTypeMirror.ArrayCodeTypeMirror; -import com.oracle.truffle.dsl.processor.java.model.*; -import com.oracle.truffle.dsl.processor.model.*; -import com.oracle.truffle.dsl.processor.model.NodeChildData.Cardinality; -import com.oracle.truffle.dsl.processor.model.SpecializationData.SpecializationKind; - @DSLOptions public class NodeParser extends AbstractParser<NodeData> {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/ShortCircuitParser.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/ShortCircuitParser.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,15 +22,20 @@ */ package com.oracle.truffle.dsl.processor.parser; -import java.lang.annotation.*; -import java.util.*; - -import javax.lang.model.element.*; - -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.dsl.processor.*; -import com.oracle.truffle.dsl.processor.java.*; -import com.oracle.truffle.dsl.processor.model.*; +import com.oracle.truffle.api.dsl.ShortCircuit; +import com.oracle.truffle.dsl.processor.ProcessorContext; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import com.oracle.truffle.dsl.processor.model.MethodSpec; +import com.oracle.truffle.dsl.processor.model.NodeData; +import com.oracle.truffle.dsl.processor.model.NodeExecutionData; +import com.oracle.truffle.dsl.processor.model.ParameterSpec; +import com.oracle.truffle.dsl.processor.model.ShortCircuitData; +import com.oracle.truffle.dsl.processor.model.TemplateMethod; +import java.lang.annotation.Annotation; +import java.util.HashSet; +import java.util.Set; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.ExecutableElement; public class ShortCircuitParser extends NodeMethodParser<ShortCircuitData> {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/SpecializationGroup.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/SpecializationGroup.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,12 +22,15 @@ */ package com.oracle.truffle.dsl.processor.parser; -import java.util.*; - -import javax.lang.model.type.*; - -import com.oracle.truffle.dsl.processor.model.*; +import com.oracle.truffle.dsl.processor.model.GuardExpression; +import com.oracle.truffle.dsl.processor.model.NodeData; +import com.oracle.truffle.dsl.processor.model.SpecializationData; import com.oracle.truffle.dsl.processor.model.TemplateMethod.TypeSignature; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import javax.lang.model.type.TypeMirror; /** * Class creates groups of specializations to optimize the layout of generated executeAndSpecialize
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/SpecializationMethodParser.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/SpecializationMethodParser.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,17 +22,27 @@ */ package com.oracle.truffle.dsl.processor.parser; -import java.lang.annotation.*; -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; - -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.dsl.processor.*; -import com.oracle.truffle.dsl.processor.java.*; -import com.oracle.truffle.dsl.processor.model.*; +import com.oracle.truffle.api.dsl.Cached; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.dsl.processor.ProcessorContext; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import com.oracle.truffle.dsl.processor.model.AnnotatedParameterSpec; +import com.oracle.truffle.dsl.processor.model.MethodSpec; +import com.oracle.truffle.dsl.processor.model.NodeData; +import com.oracle.truffle.dsl.processor.model.SpecializationData; import com.oracle.truffle.dsl.processor.model.SpecializationData.SpecializationKind; +import com.oracle.truffle.dsl.processor.model.SpecializationThrowsData; +import com.oracle.truffle.dsl.processor.model.TemplateMethod; +import java.lang.annotation.Annotation; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.Set; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.type.TypeMirror; public class SpecializationMethodParser extends NodeMethodParser<SpecializationData> {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/TemplateMethodParser.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/TemplateMethodParser.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,16 +22,23 @@ */ package com.oracle.truffle.dsl.processor.parser; -import java.lang.annotation.*; -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; -import javax.lang.model.util.*; - -import com.oracle.truffle.dsl.processor.*; -import com.oracle.truffle.dsl.processor.java.*; -import com.oracle.truffle.dsl.processor.model.*; +import com.oracle.truffle.dsl.processor.ProcessorContext; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import com.oracle.truffle.dsl.processor.model.MethodSpec; +import com.oracle.truffle.dsl.processor.model.Template; +import com.oracle.truffle.dsl.processor.model.TemplateMethod; +import com.oracle.truffle.dsl.processor.model.TypeSystemData; +import java.lang.annotation.Annotation; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.Element; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.TypeMirror; +import javax.lang.model.util.ElementFilter; public abstract class TemplateMethodParser<T extends Template, E extends TemplateMethod> {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/TypeCastParser.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/TypeCastParser.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,15 +22,18 @@ */ package com.oracle.truffle.dsl.processor.parser; -import java.lang.annotation.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; - -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.dsl.processor.*; -import com.oracle.truffle.dsl.processor.java.*; -import com.oracle.truffle.dsl.processor.model.*; +import com.oracle.truffle.api.dsl.TypeCast; +import com.oracle.truffle.dsl.processor.ProcessorContext; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import com.oracle.truffle.dsl.processor.model.MethodSpec; +import com.oracle.truffle.dsl.processor.model.ParameterSpec; +import com.oracle.truffle.dsl.processor.model.TemplateMethod; +import com.oracle.truffle.dsl.processor.model.TypeCastData; +import com.oracle.truffle.dsl.processor.model.TypeSystemData; +import java.lang.annotation.Annotation; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.type.TypeMirror; class TypeCastParser extends TypeSystemMethodParser<TypeCastData> {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/TypeCheckParser.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/TypeCheckParser.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,14 +22,17 @@ */ package com.oracle.truffle.dsl.processor.parser; -import java.lang.annotation.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; - -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.dsl.processor.*; -import com.oracle.truffle.dsl.processor.model.*; +import com.oracle.truffle.api.dsl.TypeCheck; +import com.oracle.truffle.dsl.processor.ProcessorContext; +import com.oracle.truffle.dsl.processor.model.MethodSpec; +import com.oracle.truffle.dsl.processor.model.ParameterSpec; +import com.oracle.truffle.dsl.processor.model.TemplateMethod; +import com.oracle.truffle.dsl.processor.model.TypeCheckData; +import com.oracle.truffle.dsl.processor.model.TypeSystemData; +import java.lang.annotation.Annotation; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.type.TypeMirror; class TypeCheckParser extends TypeSystemMethodParser<TypeCheckData> {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/TypeSystemMethodParser.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/TypeSystemMethodParser.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,12 +22,13 @@ */ package com.oracle.truffle.dsl.processor.parser; -import javax.lang.model.element.*; -import javax.lang.model.type.*; - -import com.oracle.truffle.dsl.processor.*; -import com.oracle.truffle.dsl.processor.java.*; -import com.oracle.truffle.dsl.processor.model.*; +import com.oracle.truffle.dsl.processor.ProcessorContext; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import com.oracle.truffle.dsl.processor.model.TemplateMethod; +import com.oracle.truffle.dsl.processor.model.TypeSystemData; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import javax.lang.model.type.TypeMirror; abstract class TypeSystemMethodParser<E extends TemplateMethod> extends TemplateMethodParser<TypeSystemData, E> {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/TypeSystemParser.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/TypeSystemParser.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,17 +22,33 @@ */ package com.oracle.truffle.dsl.processor.parser; -import java.lang.annotation.*; -import java.util.*; - -import javax.lang.model.element.*; -import javax.lang.model.type.*; -import javax.lang.model.util.*; - -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.dsl.internal.*; -import com.oracle.truffle.dsl.processor.java.*; -import com.oracle.truffle.dsl.processor.model.*; +import com.oracle.truffle.api.dsl.TypeCast; +import com.oracle.truffle.api.dsl.TypeCheck; +import com.oracle.truffle.api.dsl.TypeSystem; +import com.oracle.truffle.api.dsl.internal.DSLOptions; +import com.oracle.truffle.dsl.processor.java.ElementUtils; +import com.oracle.truffle.dsl.processor.model.ImplicitCastData; +import com.oracle.truffle.dsl.processor.model.Template; +import com.oracle.truffle.dsl.processor.model.TypeCastData; +import com.oracle.truffle.dsl.processor.model.TypeCheckData; +import com.oracle.truffle.dsl.processor.model.TypeSystemData; +import java.lang.annotation.Annotation; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.Element; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.TypeElement; +import javax.lang.model.type.TypeKind; +import javax.lang.model.type.TypeMirror; +import javax.lang.model.util.ElementFilter; +import javax.lang.model.util.Types; @DSLOptions public class TypeSystemParser extends AbstractParser<TypeSystemData> {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/util/Filterator.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/util/Filterator.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,7 +22,8 @@ */ package com.oracle.truffle.dsl.processor.util; -import java.util.*; +import java.util.Iterator; +import java.util.NoSuchElementException; public class Filterator<T> implements Iterator<T> {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/util/FilteredIterable.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/util/FilteredIterable.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.truffle.dsl.processor.util; -import java.util.*; +import java.util.Iterator; public class FilteredIterable<E> implements Iterable<E> {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/verify/VerifyTruffleProcessor.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/verify/VerifyTruffleProcessor.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,20 +22,27 @@ */ package com.oracle.truffle.dsl.processor.verify; -import static com.oracle.truffle.dsl.processor.java.ElementUtils.*; -import static java.util.Collections.*; - -import java.io.*; -import java.util.*; - -import javax.annotation.processing.*; -import javax.lang.model.*; -import javax.lang.model.element.*; -import javax.tools.Diagnostic.Kind; - import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.nodes.Node.Child; -import com.oracle.truffle.dsl.processor.*; +import com.oracle.truffle.dsl.processor.ExpectError; +import static com.oracle.truffle.dsl.processor.java.ElementUtils.getElementHierarchy; +import java.io.PrintWriter; +import java.io.StringWriter; +import static java.util.Collections.reverse; +import java.util.List; +import java.util.Set; +import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.FilerException; +import javax.annotation.processing.RoundEnvironment; +import javax.annotation.processing.SupportedAnnotationTypes; +import javax.lang.model.SourceVersion; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.TypeElement; +import javax.lang.model.element.VariableElement; +import javax.tools.Diagnostic.Kind; @SupportedAnnotationTypes({"com.oracle.truffle.api.CompilerDirectives.TruffleBoundary", "com.oracle.truffle.api.nodes.Node.Child"}) public class VerifyTruffleProcessor extends AbstractProcessor {
--- a/truffle/com.oracle.truffle.object.basic/src/com/oracle/truffle/object/basic/BasicAllocator.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.object.basic/src/com/oracle/truffle/object/basic/BasicAllocator.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,20 +22,27 @@ */ package com.oracle.truffle.object.basic; -import static com.oracle.truffle.object.basic.BasicLocations.*; - -import com.oracle.truffle.api.object.*; -import com.oracle.truffle.object.*; +import com.oracle.truffle.api.object.BooleanLocation; +import com.oracle.truffle.api.object.DoubleLocation; +import com.oracle.truffle.api.object.IntLocation; +import com.oracle.truffle.api.object.Location; +import com.oracle.truffle.api.object.LongLocation; +import com.oracle.truffle.api.object.ObjectLocation; +import com.oracle.truffle.object.LayoutImpl; import com.oracle.truffle.object.LocationImpl.InternalLongLocation; import com.oracle.truffle.object.Locations.ConstantLocation; import com.oracle.truffle.object.Locations.DeclaredDualLocation; import com.oracle.truffle.object.Locations.DualLocation; import com.oracle.truffle.object.Locations.ValueLocation; +import com.oracle.truffle.object.ObjectStorageOptions; +import com.oracle.truffle.object.ShapeImpl; import com.oracle.truffle.object.basic.BasicLocations.BooleanLocationDecorator; import com.oracle.truffle.object.basic.BasicLocations.DoubleLocationDecorator; import com.oracle.truffle.object.basic.BasicLocations.IntLocationDecorator; +import static com.oracle.truffle.object.basic.BasicLocations.LONG_SIZE; import com.oracle.truffle.object.basic.BasicLocations.LongArrayLocation; import com.oracle.truffle.object.basic.BasicLocations.LongFieldLocation; +import static com.oracle.truffle.object.basic.BasicLocations.OBJECT_SIZE; import com.oracle.truffle.object.basic.BasicLocations.ObjectArrayLocation; public abstract class BasicAllocator extends ShapeImpl.BaseAllocator {
--- a/truffle/com.oracle.truffle.object.basic/src/com/oracle/truffle/object/basic/BasicLayout.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.object.basic/src/com/oracle/truffle/object/basic/BasicLayout.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,15 +22,19 @@ */ package com.oracle.truffle.object.basic; -import java.util.*; - -import com.oracle.truffle.api.object.*; +import com.oracle.truffle.api.object.DynamicObject; +import com.oracle.truffle.api.object.Location; +import com.oracle.truffle.api.object.ObjectLocation; +import com.oracle.truffle.api.object.ObjectType; +import com.oracle.truffle.api.object.Shape; import com.oracle.truffle.api.object.Shape.Allocator; -import com.oracle.truffle.object.*; +import com.oracle.truffle.object.LayoutImpl; +import com.oracle.truffle.object.LayoutStrategy; import com.oracle.truffle.object.LocationImpl.InternalLongLocation; import com.oracle.truffle.object.Locations.DualLocation; import com.oracle.truffle.object.basic.BasicLocations.ObjectFieldLocation; import com.oracle.truffle.object.basic.BasicLocations.SimpleObjectFieldLocation; +import java.util.EnumSet; public class BasicLayout extends LayoutImpl { private final ObjectLocation[] objectFields;
--- a/truffle/com.oracle.truffle.object.basic/src/com/oracle/truffle/object/basic/BasicLocations.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.object.basic/src/com/oracle/truffle/object/basic/BasicLocations.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,12 +22,21 @@ */ package com.oracle.truffle.object.basic; -import java.lang.invoke.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.object.*; -import com.oracle.truffle.object.*; +import com.oracle.truffle.api.CompilerDirectives; +import com.oracle.truffle.api.object.BooleanLocation; +import com.oracle.truffle.api.object.DoubleLocation; +import com.oracle.truffle.api.object.DynamicObject; +import com.oracle.truffle.api.object.FinalLocationException; +import com.oracle.truffle.api.object.IncompatibleLocationException; +import com.oracle.truffle.api.object.IntLocation; +import com.oracle.truffle.api.object.Location; +import com.oracle.truffle.api.object.LongLocation; +import com.oracle.truffle.api.object.ObjectLocation; +import com.oracle.truffle.api.object.Property; +import com.oracle.truffle.api.object.Shape; +import com.oracle.truffle.object.LocationImpl; import com.oracle.truffle.object.LocationImpl.InternalLongLocation; +import java.lang.invoke.MethodHandle; /** * Property location.
--- a/truffle/com.oracle.truffle.object.basic/src/com/oracle/truffle/object/basic/DefaultLayoutFactory.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.object.basic/src/com/oracle/truffle/object/basic/DefaultLayoutFactory.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,8 +22,11 @@ */ package com.oracle.truffle.object.basic; -import com.oracle.truffle.api.object.*; -import com.oracle.truffle.object.*; +import com.oracle.truffle.api.object.Layout; +import com.oracle.truffle.api.object.LayoutFactory; +import com.oracle.truffle.api.object.Location; +import com.oracle.truffle.api.object.Property; +import com.oracle.truffle.object.PropertyImpl; public class DefaultLayoutFactory implements LayoutFactory { public Layout createLayout(Layout.Builder layoutBuilder) {
--- a/truffle/com.oracle.truffle.object.basic/src/com/oracle/truffle/object/basic/DefaultStrategy.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.object.basic/src/com/oracle/truffle/object/basic/DefaultStrategy.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,11 +22,17 @@ */ package com.oracle.truffle.object.basic; -import java.util.*; - -import com.oracle.truffle.api.object.*; -import com.oracle.truffle.object.*; +import com.oracle.truffle.api.object.DynamicObject; +import com.oracle.truffle.api.object.Layout; +import com.oracle.truffle.api.object.Location; +import com.oracle.truffle.api.object.Property; +import com.oracle.truffle.api.object.Shape; +import com.oracle.truffle.object.LayoutImpl; +import com.oracle.truffle.object.LayoutStrategy; +import com.oracle.truffle.object.LocationImpl; +import com.oracle.truffle.object.ShapeImpl; import com.oracle.truffle.object.ShapeImpl.BaseAllocator; +import java.util.Objects; class DefaultStrategy implements LayoutStrategy { public boolean updateShape(DynamicObject object) {
--- a/truffle/com.oracle.truffle.object.basic/src/com/oracle/truffle/object/basic/DynamicObjectBasic.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.object.basic/src/com/oracle/truffle/object/basic/DynamicObjectBasic.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,12 +22,15 @@ */ package com.oracle.truffle.object.basic; -import java.lang.annotation.*; - -import com.oracle.truffle.api.object.*; -import com.oracle.truffle.object.*; +import com.oracle.truffle.api.object.DynamicObject; +import com.oracle.truffle.api.object.Shape; +import com.oracle.truffle.object.DynamicObjectImpl; +import com.oracle.truffle.object.ObjectStorageOptions; +import com.oracle.truffle.object.ShapeImpl; import com.oracle.truffle.object.basic.BasicLocations.SimpleLongFieldLocation; import com.oracle.truffle.object.basic.BasicLocations.SimpleObjectFieldLocation; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; public class DynamicObjectBasic extends DynamicObjectImpl { @Retention(RetentionPolicy.RUNTIME)
--- a/truffle/com.oracle.truffle.object.basic/src/com/oracle/truffle/object/basic/ShapeBasic.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.object.basic/src/com/oracle/truffle/object/basic/ShapeBasic.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,8 +22,12 @@ */ package com.oracle.truffle.object.basic; -import com.oracle.truffle.api.object.*; -import com.oracle.truffle.object.*; +import com.oracle.truffle.api.object.Layout; +import com.oracle.truffle.api.object.ObjectType; +import com.oracle.truffle.api.object.Property; +import com.oracle.truffle.object.PropertyMap; +import com.oracle.truffle.object.ShapeImpl; +import com.oracle.truffle.object.Transition; public final class ShapeBasic extends ShapeImpl { public ShapeBasic(Layout layout, Object sharedData, ObjectType operations, int id) {
--- a/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/ConsListPropertyMap.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/ConsListPropertyMap.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,9 +22,17 @@ */ package com.oracle.truffle.object; -import java.util.*; - -import com.oracle.truffle.api.object.*; +import com.oracle.truffle.api.object.Property; +import java.util.AbstractSet; +import java.util.ArrayDeque; +import java.util.Arrays; +import java.util.Collection; +import java.util.Deque; +import java.util.Iterator; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Objects; +import java.util.Set; /** * Implementation of {@link PropertyMap} as a reverse-order cons (snoc) list.
--- a/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/Debug.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/Debug.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.truffle.object; -import java.io.*; -import java.util.*; -import java.util.concurrent.*; - -import com.oracle.truffle.object.debug.*; +import com.oracle.truffle.object.debug.JSONShapeVisitor; +import java.io.FileNotFoundException; +import java.io.PrintWriter; +import java.io.UnsupportedEncodingException; +import java.util.Collection; +import java.util.concurrent.ConcurrentLinkedQueue; class Debug { private static Collection<ShapeImpl> allShapes;
--- a/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/DebugCounter.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/DebugCounter.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.truffle.object; -import java.io.*; -import java.util.*; -import java.util.concurrent.atomic.*; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.concurrent.atomic.AtomicLong; public final class DebugCounter { private static final ArrayList<DebugCounter> allCounters = new ArrayList<>();
--- a/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/DebugShapeVisitor.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/DebugShapeVisitor.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.truffle.object; -import java.util.*; - -import com.oracle.truffle.api.object.*; +import com.oracle.truffle.api.object.Shape; +import java.util.Collections; +import java.util.Map; public abstract class DebugShapeVisitor<R> implements ShapeVisitor<R> { public R visitShape(Shape shape) {
--- a/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectImpl.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectImpl.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,13 +22,15 @@ */ package com.oracle.truffle.object; -import java.util.*; - import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.interop.*; -import com.oracle.truffle.api.object.*; +import com.oracle.truffle.api.interop.ForeignAccess; +import com.oracle.truffle.api.object.DynamicObject; +import com.oracle.truffle.api.object.LocationFactory; +import com.oracle.truffle.api.object.Property; +import com.oracle.truffle.api.object.Shape; import com.oracle.truffle.object.Locations.ValueLocation; -import com.oracle.truffle.object.debug.*; +import com.oracle.truffle.object.debug.ShapeProfiler; +import java.util.List; public abstract class DynamicObjectImpl extends DynamicObject implements Cloneable { private ShapeImpl shape;
--- a/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/ImmutableMap.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/ImmutableMap.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.truffle.object; -import java.util.*; +import java.util.Map; /** * An immutable {@link Map}. Does not permit null keys or values.
--- a/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/LayoutImpl.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/LayoutImpl.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,9 +22,18 @@ */ package com.oracle.truffle.object; -import java.util.*; - -import com.oracle.truffle.api.object.*; +import com.oracle.truffle.api.object.BooleanLocation; +import com.oracle.truffle.api.object.DoubleLocation; +import com.oracle.truffle.api.object.DynamicObject; +import com.oracle.truffle.api.object.IntLocation; +import com.oracle.truffle.api.object.Layout; +import com.oracle.truffle.api.object.Location; +import com.oracle.truffle.api.object.LocationModifier; +import com.oracle.truffle.api.object.LongLocation; +import com.oracle.truffle.api.object.ObjectLocation; +import com.oracle.truffle.api.object.ObjectType; +import com.oracle.truffle.api.object.Property; +import com.oracle.truffle.api.object.Shape; import com.oracle.truffle.api.object.Shape.Allocator; import com.oracle.truffle.object.LocationImpl.EffectivelyFinalLocation; import com.oracle.truffle.object.LocationImpl.TypedObjectLocation; @@ -33,6 +42,7 @@ import com.oracle.truffle.object.Locations.DualLocation; import com.oracle.truffle.object.Locations.ValueLocation; import com.oracle.truffle.object.ShapeImpl.BaseAllocator; +import java.util.EnumSet; public abstract class LayoutImpl extends Layout { private static final int INT_TO_DOUBLE_FLAG = 1;
--- a/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/LayoutStrategy.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/LayoutStrategy.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,7 +22,11 @@ */ package com.oracle.truffle.object; -import com.oracle.truffle.api.object.*; +import com.oracle.truffle.api.object.DynamicObject; +import com.oracle.truffle.api.object.Layout; +import com.oracle.truffle.api.object.Location; +import com.oracle.truffle.api.object.Property; +import com.oracle.truffle.api.object.Shape; import com.oracle.truffle.object.ShapeImpl.BaseAllocator; public interface LayoutStrategy {
--- a/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/LocationImpl.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/LocationImpl.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,7 +22,17 @@ */ package com.oracle.truffle.object; -import com.oracle.truffle.api.object.*; +import com.oracle.truffle.api.object.BooleanLocation; +import com.oracle.truffle.api.object.DoubleLocation; +import com.oracle.truffle.api.object.DynamicObject; +import com.oracle.truffle.api.object.FinalLocationException; +import com.oracle.truffle.api.object.IncompatibleLocationException; +import com.oracle.truffle.api.object.IntLocation; +import com.oracle.truffle.api.object.Location; +import com.oracle.truffle.api.object.LongLocation; +import com.oracle.truffle.api.object.ObjectLocation; +import com.oracle.truffle.api.object.Shape; +import com.oracle.truffle.api.object.TypedLocation; public abstract class LocationImpl extends Location {
--- a/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/Locations.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/Locations.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,10 +22,16 @@ */ package com.oracle.truffle.object; -import java.util.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.object.*; +import com.oracle.truffle.api.CompilerDirectives; +import com.oracle.truffle.api.object.DynamicObject; +import com.oracle.truffle.api.object.FinalLocationException; +import com.oracle.truffle.api.object.IncompatibleLocationException; +import com.oracle.truffle.api.object.Location; +import com.oracle.truffle.api.object.ObjectLocation; +import com.oracle.truffle.api.object.Property; +import com.oracle.truffle.api.object.Shape; +import com.oracle.truffle.api.object.TypedLocation; +import java.util.Objects; /** * Property location.
--- a/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/ObjectStorageOptions.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/ObjectStorageOptions.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.truffle.object; -import static com.oracle.truffle.api.object.Layout.*; +import static com.oracle.truffle.api.object.Layout.OPTION_PREFIX; public class ObjectStorageOptions { // Shape configuration
--- a/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/PropertyImpl.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/PropertyImpl.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,10 +22,17 @@ */ package com.oracle.truffle.object; -import java.util.*; - -import com.oracle.truffle.api.object.*; +import com.oracle.truffle.api.object.DynamicObject; +import com.oracle.truffle.api.object.FinalLocationException; +import com.oracle.truffle.api.object.HiddenKey; +import com.oracle.truffle.api.object.IncompatibleLocationException; +import com.oracle.truffle.api.object.Location; +import com.oracle.truffle.api.object.LocationModifier; +import com.oracle.truffle.api.object.Property; +import com.oracle.truffle.api.object.Shape; import com.oracle.truffle.object.Locations.DeclaredLocation; +import java.util.EnumSet; +import java.util.Objects; /** * Property objects represent the mapping between property identifiers (keys) and storage locations.
--- a/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/PropertyMap.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/PropertyMap.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.truffle.object; -import java.util.*; - -import com.oracle.truffle.api.object.*; +import com.oracle.truffle.api.object.Property; +import java.util.Iterator; +import java.util.Map; /** * Immutable property map.
--- a/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/ShapeImpl.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/ShapeImpl.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,16 +22,24 @@ */ package com.oracle.truffle.object; -import java.util.*; -import java.util.concurrent.*; - -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.Assumption; +import com.oracle.truffle.api.CompilerAsserts; +import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.interop.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.object.*; -import com.oracle.truffle.api.utilities.*; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.interop.ForeignAccess; +import com.oracle.truffle.api.nodes.ExplodeLoop; +import com.oracle.truffle.api.object.DynamicObject; +import com.oracle.truffle.api.object.DynamicObjectFactory; +import com.oracle.truffle.api.object.Layout; +import com.oracle.truffle.api.object.Location; +import com.oracle.truffle.api.object.ObjectLocation; +import com.oracle.truffle.api.object.ObjectType; +import com.oracle.truffle.api.object.Property; +import com.oracle.truffle.api.object.Shape; +import com.oracle.truffle.api.object.ShapeListener; +import com.oracle.truffle.api.utilities.NeverValidAssumption; import com.oracle.truffle.object.LocationImpl.InternalLongLocation; import com.oracle.truffle.object.LocationImpl.LocationVisitor; import com.oracle.truffle.object.Locations.ConstantLocation; @@ -45,6 +53,15 @@ import com.oracle.truffle.object.Transition.PropertyTransition; import com.oracle.truffle.object.Transition.RemovePropertyTransition; import com.oracle.truffle.object.Transition.ReservePrimitiveArrayTransition; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; /** * Shape objects create a mapping of Property objects to indexes. The mapping of those indexes to an
--- a/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/ShapeVisitor.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/ShapeVisitor.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.truffle.object; -import com.oracle.truffle.api.object.*; +import com.oracle.truffle.api.object.Shape; public interface ShapeVisitor<R> { R visitShape(Shape shape);
--- a/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/Transition.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/Transition.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.truffle.object; -import java.util.*; - -import com.oracle.truffle.api.object.*; +import com.oracle.truffle.api.object.ObjectType; +import com.oracle.truffle.api.object.Property; +import java.util.Objects; public abstract class Transition { @Override
--- a/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/debug/GraphvizShapeVisitor.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/debug/GraphvizShapeVisitor.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,11 +22,14 @@ */ package com.oracle.truffle.object.debug; -import java.util.*; +import com.oracle.truffle.api.object.Shape; +import com.oracle.truffle.object.DebugShapeVisitor; +import com.oracle.truffle.object.ShapeImpl; +import com.oracle.truffle.object.Transition; +import java.util.HashSet; +import java.util.Map; import java.util.Map.Entry; - -import com.oracle.truffle.api.object.*; -import com.oracle.truffle.object.*; +import java.util.Set; public class GraphvizShapeVisitor extends DebugShapeVisitor<GraphvizShapeVisitor> { private final Set<Shape> drawn;
--- a/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/debug/JSONShapeVisitor.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/debug/JSONShapeVisitor.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,15 +22,19 @@ */ package com.oracle.truffle.object.debug; -import java.util.*; -import java.util.Map.Entry; - -import com.oracle.truffle.api.object.*; -import com.oracle.truffle.api.utilities.*; +import com.oracle.truffle.api.object.Location; +import com.oracle.truffle.api.object.Property; +import com.oracle.truffle.api.object.Shape; +import com.oracle.truffle.api.object.TypedLocation; +import com.oracle.truffle.api.utilities.JSONHelper; import com.oracle.truffle.api.utilities.JSONHelper.JSONArrayBuilder; import com.oracle.truffle.api.utilities.JSONHelper.JSONObjectBuilder; -import com.oracle.truffle.object.*; +import com.oracle.truffle.object.DebugShapeVisitor; +import com.oracle.truffle.object.Locations; +import com.oracle.truffle.object.Transition; import com.oracle.truffle.object.Transition.PropertyTransition; +import java.util.Map; +import java.util.Map.Entry; public class JSONShapeVisitor extends DebugShapeVisitor<JSONObjectBuilder> { @Override
--- a/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/debug/ShapeProfiler.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/debug/ShapeProfiler.java Wed Sep 16 11:33:22 2015 +0200 @@ -22,13 +22,18 @@ */ package com.oracle.truffle.object.debug; -import java.io.*; -import java.text.*; -import java.util.*; -import java.util.concurrent.*; - -import com.oracle.truffle.api.object.*; -import com.oracle.truffle.object.*; +import com.oracle.truffle.api.object.DynamicObject; +import com.oracle.truffle.api.object.Shape; +import com.oracle.truffle.object.ObjectStorageOptions; +import com.oracle.truffle.object.ShapeImpl; +import java.io.PrintWriter; +import java.text.DecimalFormat; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.IdentityHashMap; +import java.util.List; +import java.util.concurrent.ConcurrentLinkedQueue; public class ShapeProfiler { private static final String LINE_SEPARATOR = "***********************************************";
--- a/truffle/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/SLSimpleTestSuite.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/SLSimpleTestSuite.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,8 +40,8 @@ */ package com.oracle.truffle.sl.test; -import org.junit.*; -import org.junit.runner.*; +import org.junit.Test; +import org.junit.runner.RunWith; @RunWith(SLTestRunner.class) @SLTestSuite({"truffle/com.oracle.truffle.sl.test/tests", "tests"})
--- a/truffle/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/SLTckTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/SLTckTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -41,9 +41,9 @@ package com.oracle.truffle.sl.test; import com.oracle.truffle.api.source.Source; +import com.oracle.truffle.api.vm.TruffleVM; import com.oracle.truffle.tck.TruffleTCK; -import com.oracle.truffle.api.vm.TruffleVM; -import static org.junit.Assert.*; +import static org.junit.Assert.assertTrue; import org.junit.Test; /**
--- a/truffle/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/SLTestRunner.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/SLTestRunner.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,26 +40,39 @@ */ package com.oracle.truffle.sl.test; -import java.io.*; -import java.net.*; -import java.nio.charset.*; -import java.nio.file.*; -import java.nio.file.attribute.*; -import java.util.*; - -import org.junit.*; -import org.junit.internal.*; -import org.junit.runner.*; -import org.junit.runner.manipulation.*; -import org.junit.runner.notification.*; -import org.junit.runners.*; -import org.junit.runners.model.*; - -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.vm.*; -import com.oracle.truffle.sl.*; -import com.oracle.truffle.sl.builtins.*; +import com.oracle.truffle.api.dsl.NodeFactory; +import com.oracle.truffle.api.vm.TruffleVM; +import com.oracle.truffle.sl.SLLanguage; +import com.oracle.truffle.sl.builtins.SLBuiltinNode; import com.oracle.truffle.sl.test.SLTestRunner.TestCase; +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringReader; +import java.net.URL; +import java.nio.charset.Charset; +import java.nio.file.FileSystems; +import java.nio.file.FileVisitResult; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.SimpleFileVisitor; +import java.nio.file.attribute.BasicFileAttributes; +import java.util.ArrayList; +import java.util.List; +import org.junit.Assert; +import org.junit.internal.TextListener; +import org.junit.runner.Description; +import org.junit.runner.JUnitCore; +import org.junit.runner.Result; +import org.junit.runner.manipulation.Filter; +import org.junit.runner.manipulation.NoTestsRemainException; +import org.junit.runner.notification.Failure; +import org.junit.runner.notification.RunNotifier; +import org.junit.runners.ParentRunner; +import org.junit.runners.model.InitializationError; public final class SLTestRunner extends ParentRunner<TestCase> {
--- a/truffle/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/SLTestSuite.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/SLTestSuite.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,7 +40,10 @@ */ package com.oracle.truffle.sl.test; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE)
--- a/truffle/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/instrument/SLInstrumentTestRunner.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/instrument/SLInstrumentTestRunner.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,28 +40,43 @@ */ package com.oracle.truffle.sl.test.instrument; -import java.io.*; -import java.nio.charset.*; -import java.nio.file.*; -import java.nio.file.attribute.*; -import java.util.*; - -import org.junit.*; -import org.junit.internal.*; -import org.junit.runner.*; -import org.junit.runner.manipulation.*; -import org.junit.runner.notification.*; -import org.junit.runners.*; -import org.junit.runners.model.*; - -import com.oracle.truffle.api.instrument.*; -import com.oracle.truffle.api.instrument.impl.*; +import com.oracle.truffle.api.instrument.ASTProber; +import com.oracle.truffle.api.instrument.Instrument; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.instrument.StandardSyntaxTag; +import com.oracle.truffle.api.instrument.impl.DefaultSimpleInstrumentListener; import com.oracle.truffle.api.source.Source; -import com.oracle.truffle.api.vm.*; -import com.oracle.truffle.sl.nodes.instrument.*; -import com.oracle.truffle.sl.nodes.local.*; -import com.oracle.truffle.sl.test.*; +import com.oracle.truffle.api.vm.TruffleVM; +import com.oracle.truffle.sl.nodes.instrument.SLStandardASTProber; +import com.oracle.truffle.sl.nodes.local.SLWriteLocalVariableNode; +import com.oracle.truffle.sl.test.SLTestRunner; import com.oracle.truffle.sl.test.instrument.SLInstrumentTestRunner.InstrumentTestCase; +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringReader; +import java.nio.charset.Charset; +import java.nio.file.FileSystems; +import java.nio.file.FileVisitResult; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.SimpleFileVisitor; +import java.nio.file.attribute.BasicFileAttributes; +import java.util.ArrayList; +import java.util.List; +import org.junit.Assert; +import org.junit.internal.TextListener; +import org.junit.runner.Description; +import org.junit.runner.JUnitCore; +import org.junit.runner.Result; +import org.junit.runner.manipulation.Filter; +import org.junit.runner.manipulation.NoTestsRemainException; +import org.junit.runner.notification.Failure; +import org.junit.runner.notification.RunNotifier; +import org.junit.runners.ParentRunner; +import org.junit.runners.model.InitializationError; /** * This class builds and executes the tests for instrumenting SL. Although much of this class is
--- a/truffle/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/instrument/SLInstrumentTestSuite.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/instrument/SLInstrumentTestSuite.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,7 +40,10 @@ */ package com.oracle.truffle.sl.test.instrument; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE)
--- a/truffle/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/instrument/SLSimpleInstrumentTestSuite.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/instrument/SLSimpleInstrumentTestSuite.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,8 +40,8 @@ */ package com.oracle.truffle.sl.test.instrument; -import org.junit.*; -import org.junit.runner.*; +import org.junit.Test; +import org.junit.runner.RunWith; @RunWith(SLInstrumentTestRunner.class) @SLInstrumentTestSuite({"truffle/com.oracle.truffle.sl.test/tests_instrumentation", "tests_instrumentation"})
--- a/truffle/com.oracle.truffle.sl.tools/src/com/oracle/truffle/sl/tools/debug/SLREPLHandler.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl.tools/src/com/oracle/truffle/sl/tools/debug/SLREPLHandler.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,15 +40,16 @@ */ package com.oracle.truffle.sl.tools.debug; -import java.io.*; -import java.util.*; - -import com.oracle.truffle.api.instrument.*; +import com.oracle.truffle.api.instrument.KillException; +import com.oracle.truffle.api.instrument.QuitException; import com.oracle.truffle.api.source.Source; -import com.oracle.truffle.api.vm.*; -import com.oracle.truffle.tools.debug.shell.*; -import com.oracle.truffle.tools.debug.shell.client.*; -import com.oracle.truffle.tools.debug.shell.server.*; +import com.oracle.truffle.api.vm.TruffleVM; +import com.oracle.truffle.tools.debug.shell.REPLMessage; +import com.oracle.truffle.tools.debug.shell.client.SimpleREPLClient; +import com.oracle.truffle.tools.debug.shell.server.REPLHandler; +import com.oracle.truffle.tools.debug.shell.server.REPLServerContext; +import java.io.File; +import java.util.ArrayList; /** * Instantiation of the "server handler" part of the "REPL*" debugger for the simple language.
--- a/truffle/com.oracle.truffle.sl.tools/src/com/oracle/truffle/sl/tools/debug/SLREPLServer.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl.tools/src/com/oracle/truffle/sl/tools/debug/SLREPLServer.java Wed Sep 16 11:33:22 2015 +0200 @@ -44,18 +44,23 @@ import com.oracle.truffle.api.debug.Debugger; import com.oracle.truffle.api.debug.ExecutionEvent; import com.oracle.truffle.api.debug.SuspendedEvent; - -import java.util.*; - -import com.oracle.truffle.api.instrument.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.api.vm.*; +import com.oracle.truffle.api.instrument.QuitException; +import com.oracle.truffle.api.instrument.Visualizer; +import com.oracle.truffle.api.source.Source; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.api.vm.EventConsumer; +import com.oracle.truffle.api.vm.TruffleVM; import com.oracle.truffle.api.vm.TruffleVM.Language; -import com.oracle.truffle.sl.*; +import com.oracle.truffle.sl.SLLanguage; import com.oracle.truffle.sl.nodes.instrument.SLDefaultVisualizer; -import com.oracle.truffle.tools.debug.shell.*; -import com.oracle.truffle.tools.debug.shell.client.*; -import com.oracle.truffle.tools.debug.shell.server.*; +import com.oracle.truffle.tools.debug.shell.REPLMessage; +import com.oracle.truffle.tools.debug.shell.REPLServer; +import com.oracle.truffle.tools.debug.shell.client.SimpleREPLClient; +import com.oracle.truffle.tools.debug.shell.server.REPLHandler; +import com.oracle.truffle.tools.debug.shell.server.REPLServerContext; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * Instantiation of the "server" side of the "REPL*" debugger for the Simple language.
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLException.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLException.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,13 +40,16 @@ */ package com.oracle.truffle.sl; -import java.util.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.nodes.*; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.frame.FrameInstance; +import com.oracle.truffle.api.frame.FrameInstanceVisitor; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.RootNode; +import com.oracle.truffle.api.source.Source; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.nodes.SLRootNode; +import java.util.ArrayList; +import java.util.List; /** * SL does not need a sophisticated error checking and reporting mechanism, so all unexpected
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLLanguage.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLLanguage.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,24 +40,68 @@ */ package com.oracle.truffle.sl; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.debug.*; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.instrument.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.api.vm.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.RootCallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.TruffleLanguage; +import com.oracle.truffle.api.debug.DebugSupportException; +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.Probe; +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; +import com.oracle.truffle.api.nodes.NodeUtil; +import com.oracle.truffle.api.source.Source; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.api.vm.TruffleVM; import com.oracle.truffle.api.vm.TruffleVM.Symbol; -import com.oracle.truffle.sl.builtins.*; -import com.oracle.truffle.sl.nodes.*; -import com.oracle.truffle.sl.nodes.call.*; -import com.oracle.truffle.sl.nodes.controlflow.*; -import com.oracle.truffle.sl.nodes.expression.*; -import com.oracle.truffle.sl.nodes.instrument.*; -import com.oracle.truffle.sl.nodes.local.*; -import com.oracle.truffle.sl.parser.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.sl.builtins.SLBuiltinNode; +import com.oracle.truffle.sl.builtins.SLDefineFunctionBuiltin; +import com.oracle.truffle.sl.builtins.SLNanoTimeBuiltin; +import com.oracle.truffle.sl.builtins.SLPrintlnBuiltin; +import com.oracle.truffle.sl.builtins.SLReadlnBuiltin; +import com.oracle.truffle.sl.nodes.SLRootNode; +import com.oracle.truffle.sl.nodes.SLTypes; +import com.oracle.truffle.sl.nodes.call.SLDispatchNode; +import com.oracle.truffle.sl.nodes.call.SLInvokeNode; +import com.oracle.truffle.sl.nodes.call.SLUndefinedFunctionException; +import com.oracle.truffle.sl.nodes.controlflow.SLBlockNode; +import com.oracle.truffle.sl.nodes.controlflow.SLBreakNode; +import com.oracle.truffle.sl.nodes.controlflow.SLContinueNode; +import com.oracle.truffle.sl.nodes.controlflow.SLIfNode; +import com.oracle.truffle.sl.nodes.controlflow.SLReturnNode; +import com.oracle.truffle.sl.nodes.controlflow.SLWhileNode; +import com.oracle.truffle.sl.nodes.expression.SLAddNode; +import com.oracle.truffle.sl.nodes.expression.SLBigIntegerLiteralNode; +import com.oracle.truffle.sl.nodes.expression.SLDivNode; +import com.oracle.truffle.sl.nodes.expression.SLEqualNode; +import com.oracle.truffle.sl.nodes.expression.SLFunctionLiteralNode; +import com.oracle.truffle.sl.nodes.expression.SLLessOrEqualNode; +import com.oracle.truffle.sl.nodes.expression.SLLessThanNode; +import com.oracle.truffle.sl.nodes.expression.SLLogicalAndNode; +import com.oracle.truffle.sl.nodes.expression.SLLogicalOrNode; +import com.oracle.truffle.sl.nodes.expression.SLMulNode; +import com.oracle.truffle.sl.nodes.expression.SLStringLiteralNode; +import com.oracle.truffle.sl.nodes.expression.SLSubNode; +import com.oracle.truffle.sl.nodes.instrument.SLDefaultVisualizer; +import com.oracle.truffle.sl.nodes.instrument.SLStandardASTProber; +import com.oracle.truffle.sl.nodes.local.SLReadLocalVariableNode; +import com.oracle.truffle.sl.nodes.local.SLWriteLocalVariableNode; +import com.oracle.truffle.sl.parser.Parser; +import com.oracle.truffle.sl.parser.SLNodeFactory; +import com.oracle.truffle.sl.parser.Scanner; +import com.oracle.truffle.sl.runtime.SLContext; +import com.oracle.truffle.sl.runtime.SLFunction; +import com.oracle.truffle.sl.runtime.SLFunctionRegistry; +import com.oracle.truffle.sl.runtime.SLNull; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader;
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLAssertFalseBuiltin.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLAssertFalseBuiltin.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,12 +40,12 @@ */ package com.oracle.truffle.sl.builtins; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.CompilerDirectives; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.SLAssertionError; +import com.oracle.truffle.sl.runtime.SLNull; /** * Asserts a given value to be <code>false</code> and throws an {@link AssertionError} if the value
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLAssertTrueBuiltin.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLAssertTrueBuiltin.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,12 +40,12 @@ */ package com.oracle.truffle.sl.builtins; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.CompilerDirectives; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.SLAssertionError; +import com.oracle.truffle.sl.runtime.SLNull; /** * Asserts a given value to be <code>true</code> and throws an {@link AssertionError} if the value
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLBuiltinNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLBuiltinNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,10 +40,13 @@ */ package com.oracle.truffle.sl.builtins; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.nodes.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.dsl.GenerateNodeFactory; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.NodeField; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.nodes.SLExpressionNode; +import com.oracle.truffle.sl.runtime.SLContext; +import com.oracle.truffle.sl.runtime.SLFunctionRegistry; /** * Base class for all builtin functions. It contains the Truffle DSL annotation {@link NodeChild}
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLDefineFunctionBuiltin.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLDefineFunctionBuiltin.java Wed Sep 16 11:33:22 2015 +0200 @@ -41,11 +41,12 @@ package com.oracle.truffle.sl.builtins; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.parser.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.Source; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.parser.Parser; +import com.oracle.truffle.sl.runtime.SLContext; /** * Builtin function to define (or redefine) functions. The provided source code is parsed the same
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLHelloEqualsWorldBuiltin.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLHelloEqualsWorldBuiltin.java Wed Sep 16 11:33:22 2015 +0200 @@ -41,12 +41,14 @@ package com.oracle.truffle.sl.builtins; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.Truffle; +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.FrameInstance.FrameAccess; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.frame.FrameSlot; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; /** * This builtin sets the variable named "hello" in the caller frame to the string "world".
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLNanoTimeBuiltin.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLNanoTimeBuiltin.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,9 +40,9 @@ */ package com.oracle.truffle.sl.builtins; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; /** * Builtin function that returns the value of a high-resolution time, in nanoseconds.
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLNewObjectBuiltin.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLNewObjectBuiltin.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,9 +40,9 @@ */ package com.oracle.truffle.sl.builtins; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; /** * Built-in function to create a new object. Objects in SL are simply made up of name/value pairs.
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLPrintlnBuiltin.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLPrintlnBuiltin.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,13 +40,12 @@ */ package com.oracle.truffle.sl.builtins; -import java.io.*; - import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.runtime.SLContext; +import java.io.PrintWriter; /** * Builtin function to write a value to the {@link SLContext#getOutput() standard output}. The
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLReadlnBuiltin.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLReadlnBuiltin.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,14 +40,14 @@ */ package com.oracle.truffle.sl.builtins; -import java.io.*; - import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.SLException; +import com.oracle.truffle.sl.runtime.SLContext; +import java.io.BufferedReader; +import java.io.IOException; /** * Builtin function that reads a String from the {@link SLContext#getInput() standard input}.
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLStackTraceBuiltin.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLStackTraceBuiltin.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,13 +40,20 @@ */ package com.oracle.truffle.sl.builtins; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CallTarget; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.RootCallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.frame.Frame; +import com.oracle.truffle.api.frame.FrameDescriptor; +import com.oracle.truffle.api.frame.FrameInstance; import com.oracle.truffle.api.frame.FrameInstance.FrameAccess; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.frame.FrameInstanceVisitor; +import com.oracle.truffle.api.frame.FrameSlot; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.nodes.RootNode; +import com.oracle.truffle.api.source.SourceSection; /** * Returns a string representation of the current stack. This includes the {@link CallTarget}s and
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLBinaryNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLBinaryNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,8 +40,9 @@ */ package com.oracle.truffle.sl.nodes; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.NodeChildren; +import com.oracle.truffle.api.source.SourceSection; /** * Utility base class for operations that take two arguments (per convention called "left" and
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLExpressionNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLExpressionNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,13 +40,14 @@ */ package com.oracle.truffle.sl.nodes; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.dsl.TypeSystemReference; +import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.instrument.ProbeNode.WrapperNode; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.nodes.instrument.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.nodes.UnexpectedResultException; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.nodes.instrument.SLExpressionWrapperNode; +import com.oracle.truffle.sl.runtime.SLFunction; /** * Base class for all SL nodes that produce a value and therefore benefit from type specialization.
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLRootNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLRootNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -41,13 +41,15 @@ package com.oracle.truffle.sl.nodes; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.instrument.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.FrameDescriptor; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.nodes.RootNode; import com.oracle.truffle.sl.SLLanguage; -import com.oracle.truffle.sl.builtins.*; -import com.oracle.truffle.sl.nodes.controlflow.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.sl.builtins.SLBuiltinNode; +import com.oracle.truffle.sl.nodes.controlflow.SLFunctionBodyNode; +import com.oracle.truffle.sl.runtime.SLContext; /** * The root of all SL execution trees. It is a Truffle requirement that the tree root extends the
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLStatementNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLStatementNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,13 +40,13 @@ */ package com.oracle.truffle.sl.nodes; -import java.io.*; - -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.instrument.ProbeNode.WrapperNode; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.nodes.instrument.*; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.nodes.instrument.SLStatementWrapperNode; +import java.io.File; /** * The base class of all Truffle nodes for SL. All nodes (even expressions) can be used as
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLTypes.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLTypes.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,13 +40,16 @@ */ package com.oracle.truffle.sl.nodes; -import java.math.*; - import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.dsl.internal.*; -import com.oracle.truffle.sl.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.dsl.ImplicitCast; +import com.oracle.truffle.api.dsl.TypeCast; +import com.oracle.truffle.api.dsl.TypeCheck; +import com.oracle.truffle.api.dsl.TypeSystem; +import com.oracle.truffle.api.dsl.internal.DSLOptions; +import com.oracle.truffle.sl.SLLanguage; +import com.oracle.truffle.sl.runtime.SLFunction; +import com.oracle.truffle.sl.runtime.SLNull; +import java.math.BigInteger; /** * The type system of SL, as explained in {@link SLLanguage}. Based on the {@link TypeSystem}
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/access/SLReadPropertyCacheNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/access/SLReadPropertyCacheNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -41,10 +41,15 @@ package com.oracle.truffle.sl.nodes.access; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.object.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.dsl.Cached; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.UnexpectedResultException; +import com.oracle.truffle.api.object.DynamicObject; +import com.oracle.truffle.api.object.LongLocation; +import com.oracle.truffle.api.object.Property; +import com.oracle.truffle.api.object.Shape; +import com.oracle.truffle.sl.runtime.SLNull; public abstract class SLReadPropertyCacheNode extends Node {
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/access/SLReadPropertyNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/access/SLReadPropertyNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,14 +40,14 @@ */ package com.oracle.truffle.sl.nodes.access; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.api.utilities.*; -import com.oracle.truffle.sl.*; -import com.oracle.truffle.sl.nodes.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.CompilerDirectives; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.api.utilities.ConditionProfile; +import com.oracle.truffle.sl.SLException; +import com.oracle.truffle.sl.nodes.SLExpressionNode; +import com.oracle.truffle.sl.runtime.SLContext; /** * The node for accessing a property of an object. When executed, this node first evaluates the
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/access/SLWritePropertyCacheNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/access/SLWritePropertyCacheNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,11 +40,18 @@ */ package com.oracle.truffle.sl.nodes.access; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.Assumption; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.object.*; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.dsl.Cached; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.object.DynamicObject; +import com.oracle.truffle.api.object.FinalLocationException; +import com.oracle.truffle.api.object.IncompatibleLocationException; +import com.oracle.truffle.api.object.Location; +import com.oracle.truffle.api.object.Property; +import com.oracle.truffle.api.object.Shape; public abstract class SLWritePropertyCacheNode extends Node {
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/access/SLWritePropertyNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/access/SLWritePropertyNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,14 +40,14 @@ */ package com.oracle.truffle.sl.nodes.access; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.api.utilities.*; -import com.oracle.truffle.sl.*; -import com.oracle.truffle.sl.nodes.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.CompilerDirectives; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.api.utilities.ConditionProfile; +import com.oracle.truffle.sl.SLException; +import com.oracle.truffle.sl.nodes.SLExpressionNode; +import com.oracle.truffle.sl.runtime.SLContext; /** * The node for setting a property of an object. When executed, this node first evaluates the value
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/call/SLDispatchNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/call/SLDispatchNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,11 +40,14 @@ */ package com.oracle.truffle.sl.nodes.call; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.dsl.Cached; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.DirectCallNode; +import com.oracle.truffle.api.nodes.IndirectCallNode; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.sl.runtime.SLFunction; public abstract class SLDispatchNode extends Node {
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/call/SLInvokeNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/call/SLInvokeNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,18 +40,21 @@ */ package com.oracle.truffle.sl.nodes.call; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CompilerAsserts; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.NodeChildren; import com.oracle.truffle.api.dsl.Specialization; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.interop.ForeignAccess; import com.oracle.truffle.api.interop.Message; import com.oracle.truffle.api.interop.TruffleObject; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.nodes.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.nodes.ExplodeLoop; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.nodes.SLExpressionNode; +import com.oracle.truffle.sl.runtime.SLContext; +import com.oracle.truffle.sl.runtime.SLFunction; /** * The node for function invocation in SL. Since SL has first class functions, the
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/controlflow/SLBlockNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/controlflow/SLBlockNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,11 +40,12 @@ */ package com.oracle.truffle.sl.nodes.controlflow; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.nodes.*; +import com.oracle.truffle.api.CompilerAsserts; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.ExplodeLoop; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.nodes.SLStatementNode; /** * A statement node that just executes a list of other statements.
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/controlflow/SLBreakException.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/controlflow/SLBreakException.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,7 +40,7 @@ */ package com.oracle.truffle.sl.nodes.controlflow; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.ControlFlowException; /** * Exception thrown by the {@link SLBreakNode break statement} and caught by the {@link SLWhileNode
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/controlflow/SLBreakNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/controlflow/SLBreakNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,10 +40,10 @@ */ package com.oracle.truffle.sl.nodes.controlflow; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.nodes.SLStatementNode; /** * Implementation of the SL break statement. We need to unwind an unknown number of interpreter
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/controlflow/SLContinueException.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/controlflow/SLContinueException.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,7 +40,7 @@ */ package com.oracle.truffle.sl.nodes.controlflow; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.ControlFlowException; /** * Exception thrown by the {@link SLContinueNode continue statement} and caught by the
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/controlflow/SLContinueNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/controlflow/SLContinueNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,10 +40,10 @@ */ package com.oracle.truffle.sl.nodes.controlflow; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.nodes.SLStatementNode; /** * Implementation of the SL continue statement. We need to unwind an unknown number of interpreter
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/controlflow/SLFunctionBodyNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/controlflow/SLFunctionBodyNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,12 +40,14 @@ */ package com.oracle.truffle.sl.nodes.controlflow; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.api.utilities.*; -import com.oracle.truffle.sl.nodes.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.api.utilities.BranchProfile; +import com.oracle.truffle.sl.nodes.SLExpressionNode; +import com.oracle.truffle.sl.nodes.SLRootNode; +import com.oracle.truffle.sl.nodes.SLStatementNode; +import com.oracle.truffle.sl.runtime.SLNull; /** * The body of a user-defined SL function. This is the node referenced by a {@link SLRootNode} for
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/controlflow/SLIfNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/controlflow/SLIfNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,12 +40,17 @@ */ package com.oracle.truffle.sl.nodes.controlflow; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.api.utilities.*; -import com.oracle.truffle.sl.nodes.*; +import com.oracle.truffle.api.dsl.UnsupportedSpecializationException; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.nodes.UnexpectedResultException; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.api.utilities.BinaryConditionProfile; +import com.oracle.truffle.api.utilities.ConditionProfile; +import com.oracle.truffle.api.utilities.CountingConditionProfile; +import com.oracle.truffle.sl.nodes.SLExpressionNode; +import com.oracle.truffle.sl.nodes.SLStatementNode; @NodeInfo(shortName = "if", description = "The node implementing a condional statement") public final class SLIfNode extends SLStatementNode {
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/controlflow/SLRepeatingNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/controlflow/SLRepeatingNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,12 +40,15 @@ */ package com.oracle.truffle.sl.nodes.controlflow; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.api.utilities.*; -import com.oracle.truffle.sl.nodes.*; +import com.oracle.truffle.api.dsl.UnsupportedSpecializationException; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.RepeatingNode; +import com.oracle.truffle.api.nodes.UnexpectedResultException; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.api.utilities.BranchProfile; +import com.oracle.truffle.sl.nodes.SLExpressionNode; +import com.oracle.truffle.sl.nodes.SLStatementNode; public final class SLRepeatingNode extends Node implements RepeatingNode {
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/controlflow/SLReturnException.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/controlflow/SLReturnException.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,7 +40,7 @@ */ package com.oracle.truffle.sl.nodes.controlflow; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.ControlFlowException; /** * Exception thrown by the {@link SLReturnNode return statement} and caught by the
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/controlflow/SLReturnNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/controlflow/SLReturnNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,11 +40,12 @@ */ package com.oracle.truffle.sl.nodes.controlflow; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.nodes.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.nodes.SLExpressionNode; +import com.oracle.truffle.sl.nodes.SLStatementNode; +import com.oracle.truffle.sl.runtime.SLNull; /** * Implementation of the SL return statement. We need to unwind an unknown number of interpreter
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/controlflow/SLWhileNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/controlflow/SLWhileNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,11 +40,13 @@ */ package com.oracle.truffle.sl.nodes.controlflow; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.nodes.*; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.LoopNode; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.nodes.SLExpressionNode; +import com.oracle.truffle.sl.nodes.SLStatementNode; @NodeInfo(shortName = "while", description = "The node implementing a while loop") public final class SLWhileNode extends SLStatementNode {
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLAddNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLAddNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,14 +40,15 @@ */ package com.oracle.truffle.sl.nodes.expression; -import java.math.*; - import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.nodes.*; +import com.oracle.truffle.api.ExactMath; +import com.oracle.truffle.api.dsl.ImplicitCast; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.nodes.SLBinaryNode; +import com.oracle.truffle.sl.nodes.SLTypes; +import java.math.BigInteger; /** * SL node that performs the "+" operation, which performs addition on arbitrary precision numbers,
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLBigIntegerLiteralNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLBigIntegerLiteralNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,12 +40,11 @@ */ package com.oracle.truffle.sl.nodes.expression; -import java.math.*; - -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.nodes.SLExpressionNode; +import java.math.BigInteger; /** * Constant literal for a arbitrary-precision number that exceeds the range of
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLDivNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLDivNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,13 +40,12 @@ */ package com.oracle.truffle.sl.nodes.expression; -import java.math.*; - -import com.oracle.truffle.api.CompilerDirectives.*; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.nodes.*; +import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.nodes.SLBinaryNode; +import java.math.BigInteger; /** * This class is similar to the extensively documented {@link SLAddNode}. Divisions by 0 throw the
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLEqualNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLEqualNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,15 +40,16 @@ */ package com.oracle.truffle.sl.nodes.expression; -import java.math.*; - -import com.oracle.truffle.api.CompilerDirectives.*; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.nodes.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; +import com.oracle.truffle.api.dsl.Fallback; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.nodes.SLBinaryNode; +import com.oracle.truffle.sl.runtime.SLFunction; +import com.oracle.truffle.sl.runtime.SLNull; +import java.math.BigInteger; /** * The {@code ==} operator of SL is defined on all types. Therefore, we need a
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLFunctionLiteralNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLFunctionLiteralNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,14 +40,18 @@ */ package com.oracle.truffle.sl.nodes.expression; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; import com.oracle.truffle.sl.SLLanguage; -import com.oracle.truffle.sl.nodes.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.sl.nodes.SLExpressionNode; +import com.oracle.truffle.sl.runtime.SLContext; +import com.oracle.truffle.sl.runtime.SLFunction; +import com.oracle.truffle.sl.runtime.SLFunctionRegistry; /** * Constant literal for a {@link SLFunction function} value, created when a function name occurs as
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLLessOrEqualNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLLessOrEqualNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,14 +40,13 @@ */ package com.oracle.truffle.sl.nodes.expression; -import java.math.*; - -import com.oracle.truffle.api.CompilerDirectives.*; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.nodes.*; +import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.nodes.SLBinaryNode; +import java.math.BigInteger; /** * This class is similar to the {@link SLLessThanNode}.
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLLessThanNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLLessThanNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,14 +40,13 @@ */ package com.oracle.truffle.sl.nodes.expression; -import java.math.*; - -import com.oracle.truffle.api.CompilerDirectives.*; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.nodes.*; +import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.nodes.SLBinaryNode; +import java.math.BigInteger; /** * This class is similar to the extensively documented {@link SLAddNode}. The only difference: the
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLLogicalAndNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLLogicalAndNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,11 +40,12 @@ */ package com.oracle.truffle.sl.nodes.expression; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.nodes.*; +import com.oracle.truffle.api.dsl.ShortCircuit; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.nodes.SLBinaryNode; /** * This class declares specializations similar to the extensively documented {@link SLAddNode}. It
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLLogicalNotNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLLogicalNotNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,11 +40,12 @@ */ package com.oracle.truffle.sl.nodes.expression; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.nodes.*; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.nodes.SLExpressionNode; /** * Example of a simple unary node that uses type specialization. See {@link SLAddNode} for
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLLogicalOrNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLLogicalOrNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,11 +40,12 @@ */ package com.oracle.truffle.sl.nodes.expression; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.nodes.*; +import com.oracle.truffle.api.dsl.ShortCircuit; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.nodes.SLBinaryNode; /** * This class is similar to the {@link SLLogicalAndNode}.
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLLongLiteralNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLLongLiteralNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,10 +40,11 @@ */ package com.oracle.truffle.sl.nodes.expression; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.nodes.UnexpectedResultException; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.nodes.SLExpressionNode; /** * Constant literal for a primitive {@code long} value. The unboxed value can be returned when the
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLMulNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLMulNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,14 +40,13 @@ */ package com.oracle.truffle.sl.nodes.expression; -import java.math.*; - import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.nodes.*; +import com.oracle.truffle.api.ExactMath; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.nodes.SLBinaryNode; +import java.math.BigInteger; /** * This class is similar to the extensively documented {@link SLAddNode}.
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLParenExpressionNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLParenExpressionNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,10 +40,11 @@ */ package com.oracle.truffle.sl.nodes.expression; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.nodes.UnexpectedResultException; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.nodes.SLExpressionNode; /** * A {@link SLExpressionNode} that represents a parenthesized expression; it simply returns the
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLStringLiteralNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLStringLiteralNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,10 +40,10 @@ */ package com.oracle.truffle.sl.nodes.expression; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.nodes.SLExpressionNode; /** * Constant literal for a String value.
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLSubNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLSubNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,14 +40,13 @@ */ package com.oracle.truffle.sl.nodes.expression; -import java.math.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.CompilerDirectives.*; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.nodes.*; +import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; +import com.oracle.truffle.api.ExactMath; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.nodes.SLBinaryNode; +import java.math.BigInteger; /** * This class is similar to the extensively documented {@link SLAddNode}.
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/demo/SLAddWithoutSpecializationNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/demo/SLAddWithoutSpecializationNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,14 +40,13 @@ */ package com.oracle.truffle.sl.nodes.expression.demo; -import java.math.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.sl.nodes.*; -import com.oracle.truffle.sl.nodes.expression.*; +import com.oracle.truffle.api.ExactMath; +import com.oracle.truffle.api.dsl.UnsupportedSpecializationException; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.sl.nodes.SLExpressionNode; +import com.oracle.truffle.sl.nodes.expression.SLAddNode; +import java.math.BigInteger; /** * This is an example how the add operation would be implemented without specializations and without
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLASTPrinter.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLASTPrinter.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,13 +40,15 @@ */ package com.oracle.truffle.sl.nodes.instrument; -import java.io.*; -import java.util.*; - -import com.oracle.truffle.api.instrument.*; -import com.oracle.truffle.api.instrument.impl.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.instrument.InstrumentationNode; +import com.oracle.truffle.api.instrument.impl.DefaultASTPrinter; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeClass; +import com.oracle.truffle.api.nodes.NodeFieldAccessor; import com.oracle.truffle.api.nodes.NodeFieldAccessor.NodeFieldKind; +import com.oracle.truffle.api.nodes.NodeUtil; +import java.io.PrintWriter; +import java.util.ArrayList; /** * SLASTPrinter is used to print for SL's internal Truffle AST. This is used by
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLDefaultVisualizer.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLDefaultVisualizer.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,13 +40,15 @@ */ package com.oracle.truffle.sl.nodes.instrument; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.instrument.*; -import com.oracle.truffle.api.instrument.impl.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.sl.nodes.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.RootCallTarget; +import com.oracle.truffle.api.frame.FrameSlot; +import com.oracle.truffle.api.instrument.ASTPrinter; +import com.oracle.truffle.api.instrument.impl.DefaultVisualizer; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.RootNode; +import com.oracle.truffle.sl.nodes.SLRootNode; +import com.oracle.truffle.sl.runtime.SLNull; /** * SLDefaultVisualizer provides methods to get the names of SL's internal Truffle AST nodes.
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLExpressionWrapperNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLExpressionWrapperNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,12 +40,19 @@ */ package com.oracle.truffle.sl.nodes.instrument; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.instrument.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.instrument.Instrument; +import com.oracle.truffle.api.instrument.KillException; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.instrument.ProbeNode; import com.oracle.truffle.api.instrument.ProbeNode.WrapperNode; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.sl.nodes.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeCost; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.nodes.UnexpectedResultException; +import com.oracle.truffle.sl.nodes.SLExpressionNode; +import com.oracle.truffle.sl.nodes.SLTypesGen; +import com.oracle.truffle.sl.runtime.SLFunction; /** * A Truffle node that can be inserted into a Simple AST (assumed not to have executed yet) to
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLStandardASTProber.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLStandardASTProber.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,13 +40,18 @@ */ package com.oracle.truffle.sl.nodes.instrument; -import static com.oracle.truffle.api.instrument.StandardSyntaxTag.*; - -import com.oracle.truffle.api.instrument.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.sl.nodes.*; -import com.oracle.truffle.sl.nodes.controlflow.*; -import com.oracle.truffle.sl.nodes.local.*; +import com.oracle.truffle.api.instrument.ASTProber; +import com.oracle.truffle.api.instrument.InstrumentationNode; +import com.oracle.truffle.api.instrument.Probe; +import static com.oracle.truffle.api.instrument.StandardSyntaxTag.ASSIGNMENT; +import static com.oracle.truffle.api.instrument.StandardSyntaxTag.START_LOOP; +import static com.oracle.truffle.api.instrument.StandardSyntaxTag.STATEMENT; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeVisitor; +import com.oracle.truffle.sl.nodes.SLExpressionNode; +import com.oracle.truffle.sl.nodes.SLStatementNode; +import com.oracle.truffle.sl.nodes.controlflow.SLWhileNode; +import com.oracle.truffle.sl.nodes.local.SLWriteLocalVariableNode; /** * A visitor which traverses a completely parsed Simple AST (presumed not yet executed) and enables
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLStatementWrapperNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLStatementWrapperNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,11 +40,16 @@ */ package com.oracle.truffle.sl.nodes.instrument; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.instrument.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.instrument.Instrument; +import com.oracle.truffle.api.instrument.KillException; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.instrument.ProbeNode; import com.oracle.truffle.api.instrument.ProbeNode.WrapperNode; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.sl.nodes.*; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeCost; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.sl.nodes.SLStatementNode; /** * A Truffle node that can be inserted into a Simple AST (assumed not to have executed yet) to
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/local/SLReadArgumentNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/local/SLReadArgumentNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,12 +40,12 @@ */ package com.oracle.truffle.sl.nodes.local; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.api.utilities.*; -import com.oracle.truffle.sl.nodes.*; -import com.oracle.truffle.sl.parser.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.api.utilities.BranchProfile; +import com.oracle.truffle.sl.nodes.SLExpressionNode; +import com.oracle.truffle.sl.parser.SLNodeFactory; +import com.oracle.truffle.sl.runtime.SLNull; /** * Reads a function argument. Arguments are passed in as an object array.
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/local/SLReadLocalVariableNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/local/SLReadLocalVariableNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,10 +40,13 @@ */ package com.oracle.truffle.sl.nodes.local; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.nodes.*; +import com.oracle.truffle.api.dsl.NodeField; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.frame.FrameSlot; +import com.oracle.truffle.api.frame.FrameSlotTypeException; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.nodes.SLExpressionNode; /** * Node to read a local variable from a function's {@link VirtualFrame frame}. The Truffle frame API
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/local/SLWriteLocalVariableNode.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/local/SLWriteLocalVariableNode.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,11 +40,16 @@ */ package com.oracle.truffle.sl.nodes.local; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.nodes.*; +import com.oracle.truffle.api.CompilerDirectives; +import com.oracle.truffle.api.dsl.Fallback; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.NodeField; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.frame.FrameSlot; +import com.oracle.truffle.api.frame.FrameSlotKind; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.nodes.SLExpressionNode; /** * Node to write a local variable to a function's {@link VirtualFrame frame}. The Truffle frame API
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/Parser.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/Parser.java Wed Sep 16 11:33:22 2015 +0200 @@ -43,12 +43,13 @@ package com.oracle.truffle.sl.parser; -import java.util.*; - -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.*; -import com.oracle.truffle.sl.nodes.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.source.Source; +import com.oracle.truffle.sl.SLException; +import com.oracle.truffle.sl.nodes.SLExpressionNode; +import com.oracle.truffle.sl.nodes.SLStatementNode; +import com.oracle.truffle.sl.runtime.SLContext; +import java.util.ArrayList; +import java.util.List; // Checkstyle: stop // @formatter:off
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/SLNodeFactory.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/SLNodeFactory.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,19 +40,51 @@ */ package com.oracle.truffle.sl.parser; -import java.math.*; -import java.util.*; - -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.nodes.*; -import com.oracle.truffle.sl.nodes.access.*; -import com.oracle.truffle.sl.nodes.call.*; -import com.oracle.truffle.sl.nodes.controlflow.*; -import com.oracle.truffle.sl.nodes.expression.*; -import com.oracle.truffle.sl.nodes.local.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.frame.FrameDescriptor; +import com.oracle.truffle.api.frame.FrameSlot; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.source.Source; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.nodes.SLExpressionNode; +import com.oracle.truffle.sl.nodes.SLRootNode; +import com.oracle.truffle.sl.nodes.SLStatementNode; +import com.oracle.truffle.sl.nodes.access.SLReadPropertyNode; +import com.oracle.truffle.sl.nodes.access.SLWritePropertyNode; +import com.oracle.truffle.sl.nodes.call.SLInvokeNode; +import com.oracle.truffle.sl.nodes.call.SLInvokeNodeGen; +import com.oracle.truffle.sl.nodes.controlflow.SLBlockNode; +import com.oracle.truffle.sl.nodes.controlflow.SLBreakNode; +import com.oracle.truffle.sl.nodes.controlflow.SLContinueNode; +import com.oracle.truffle.sl.nodes.controlflow.SLFunctionBodyNode; +import com.oracle.truffle.sl.nodes.controlflow.SLIfNode; +import com.oracle.truffle.sl.nodes.controlflow.SLReturnNode; +import com.oracle.truffle.sl.nodes.controlflow.SLWhileNode; +import com.oracle.truffle.sl.nodes.expression.SLAddNodeGen; +import com.oracle.truffle.sl.nodes.expression.SLBigIntegerLiteralNode; +import com.oracle.truffle.sl.nodes.expression.SLDivNodeGen; +import com.oracle.truffle.sl.nodes.expression.SLEqualNodeGen; +import com.oracle.truffle.sl.nodes.expression.SLFunctionLiteralNode; +import com.oracle.truffle.sl.nodes.expression.SLLessOrEqualNodeGen; +import com.oracle.truffle.sl.nodes.expression.SLLessThanNodeGen; +import com.oracle.truffle.sl.nodes.expression.SLLogicalAndNodeGen; +import com.oracle.truffle.sl.nodes.expression.SLLogicalNotNodeGen; +import com.oracle.truffle.sl.nodes.expression.SLLogicalOrNodeGen; +import com.oracle.truffle.sl.nodes.expression.SLLongLiteralNode; +import com.oracle.truffle.sl.nodes.expression.SLMulNodeGen; +import com.oracle.truffle.sl.nodes.expression.SLParenExpressionNode; +import com.oracle.truffle.sl.nodes.expression.SLStringLiteralNode; +import com.oracle.truffle.sl.nodes.expression.SLSubNodeGen; +import com.oracle.truffle.sl.nodes.local.SLReadArgumentNode; +import com.oracle.truffle.sl.nodes.local.SLReadLocalVariableNode; +import com.oracle.truffle.sl.nodes.local.SLReadLocalVariableNodeGen; +import com.oracle.truffle.sl.nodes.local.SLWriteLocalVariableNode; +import com.oracle.truffle.sl.nodes.local.SLWriteLocalVariableNodeGen; +import com.oracle.truffle.sl.runtime.SLContext; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * Helper class used by the SL {@link Parser} to create nodes. The code is factored out of the
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/Scanner.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/Scanner.java Wed Sep 16 11:33:22 2015 +0200 @@ -43,8 +43,11 @@ package com.oracle.truffle.sl.parser; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.RandomAccessFile; +import java.util.HashMap; +import java.util.Map; // Checkstyle: stop // @formatter:off
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/runtime/SLContext.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/runtime/SLContext.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,19 +40,34 @@ */ package com.oracle.truffle.sl.runtime; -import java.io.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.object.*; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.ExecutionContext; +import com.oracle.truffle.api.dsl.NodeFactory; +import com.oracle.truffle.api.frame.FrameDescriptor; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.object.DynamicObject; +import com.oracle.truffle.api.object.Layout; +import com.oracle.truffle.api.object.Shape; +import com.oracle.truffle.api.source.Source; import com.oracle.truffle.sl.SLLanguage; -import com.oracle.truffle.sl.builtins.*; -import com.oracle.truffle.sl.nodes.*; -import com.oracle.truffle.sl.nodes.local.*; -import com.oracle.truffle.sl.parser.*; +import com.oracle.truffle.sl.builtins.SLAssertFalseBuiltinFactory; +import com.oracle.truffle.sl.builtins.SLAssertTrueBuiltinFactory; +import com.oracle.truffle.sl.builtins.SLBuiltinNode; +import com.oracle.truffle.sl.builtins.SLDefineFunctionBuiltinFactory; +import com.oracle.truffle.sl.builtins.SLHelloEqualsWorldBuiltinFactory; +import com.oracle.truffle.sl.builtins.SLNanoTimeBuiltinFactory; +import com.oracle.truffle.sl.builtins.SLNewObjectBuiltinFactory; +import com.oracle.truffle.sl.builtins.SLPrintlnBuiltin; +import com.oracle.truffle.sl.builtins.SLPrintlnBuiltinFactory; +import com.oracle.truffle.sl.builtins.SLReadlnBuiltin; +import com.oracle.truffle.sl.builtins.SLReadlnBuiltinFactory; +import com.oracle.truffle.sl.builtins.SLStackTraceBuiltinFactory; +import com.oracle.truffle.sl.nodes.SLExpressionNode; +import com.oracle.truffle.sl.nodes.SLRootNode; +import com.oracle.truffle.sl.nodes.local.SLReadArgumentNode; +import com.oracle.truffle.sl.parser.Parser; +import com.oracle.truffle.sl.parser.SLNodeFactory; +import java.io.BufferedReader; +import java.io.PrintWriter; import java.math.BigInteger; /**
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/runtime/SLFunction.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/runtime/SLFunction.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,9 +40,11 @@ */ package com.oracle.truffle.sl.runtime; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.interop.*; -import com.oracle.truffle.api.utilities.*; +import com.oracle.truffle.api.Assumption; +import com.oracle.truffle.api.RootCallTarget; +import com.oracle.truffle.api.interop.ForeignAccess; +import com.oracle.truffle.api.interop.TruffleObject; +import com.oracle.truffle.api.utilities.CyclicAssumption; /** * Represents a SL function. On the Truffle level, a callable element is represented by a
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/runtime/SLFunctionForeignAccess.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/runtime/SLFunctionForeignAccess.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,7 +40,8 @@ */ package com.oracle.truffle.sl.runtime; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.Truffle; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.interop.ForeignAccess; import com.oracle.truffle.api.interop.Message;
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/runtime/SLFunctionRegistry.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/runtime/SLFunctionRegistry.java Wed Sep 16 11:33:22 2015 +0200 @@ -40,10 +40,15 @@ */ package com.oracle.truffle.sl.runtime; -import java.util.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.sl.nodes.*; +import com.oracle.truffle.api.RootCallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.sl.nodes.SLRootNode; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * Manages the mapping from function names to {@link SLFunction function objects}.
--- a/truffle/com.oracle.truffle.tck/src/com/oracle/truffle/tck/EagerStackTraceDecorator.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.tck/src/com/oracle/truffle/tck/EagerStackTraceDecorator.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.tck; -import org.junit.runner.notification.*; +import org.junit.runner.notification.Failure; class EagerStackTraceDecorator extends TruffleJUnitRunListenerDecorator {
--- a/truffle/com.oracle.truffle.tck/src/com/oracle/truffle/tck/GCAfterTestDecorator.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.tck/src/com/oracle/truffle/tck/GCAfterTestDecorator.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.tck; -import org.junit.runner.*; +import org.junit.runner.Description; final class GCAfterTestDecorator extends TruffleJUnitRunListenerDecorator {
--- a/truffle/com.oracle.truffle.tck/src/com/oracle/truffle/tck/TimingDecorator.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.tck/src/com/oracle/truffle/tck/TimingDecorator.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,7 +24,7 @@ */ package com.oracle.truffle.tck; -import org.junit.runner.*; +import org.junit.runner.Description; /** * Timing support for JUnit test runs.
--- a/truffle/com.oracle.truffle.tck/src/com/oracle/truffle/tck/TruffleJUnitCore.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.tck/src/com/oracle/truffle/tck/TruffleJUnitCore.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,19 +24,26 @@ */ package com.oracle.truffle.tck; -import java.io.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; import java.lang.reflect.Modifier; import java.nio.charset.Charset; -import java.nio.file.*; -import java.util.*; - -import junit.runner.*; - -import org.junit.internal.*; -import org.junit.runner.*; -import org.junit.runner.notification.*; -import org.junit.runners.*; -import org.junit.runners.model.*; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.List; +import junit.runner.Version; +import org.junit.internal.JUnitSystem; +import org.junit.internal.RealSystem; +import org.junit.runner.Description; +import org.junit.runner.JUnitCore; +import org.junit.runner.Request; +import org.junit.runner.Result; +import org.junit.runner.Runner; +import org.junit.runner.notification.Failure; +import org.junit.runners.ParentRunner; +import org.junit.runners.model.RunnerScheduler; final class TruffleJUnitCore {
--- a/truffle/com.oracle.truffle.tck/src/com/oracle/truffle/tck/TruffleJUnitRunListener.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.tck/src/com/oracle/truffle/tck/TruffleJUnitRunListener.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.truffle.tck; -import java.io.*; - -import org.junit.internal.*; -import org.junit.runner.*; -import org.junit.runner.notification.*; +import java.io.PrintStream; +import org.junit.internal.AssumptionViolatedException; +import org.junit.runner.Description; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; interface TruffleJUnitRunListener {
--- a/truffle/com.oracle.truffle.tck/src/com/oracle/truffle/tck/TruffleJUnitRunListenerDecorator.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.tck/src/com/oracle/truffle/tck/TruffleJUnitRunListenerDecorator.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,10 +24,10 @@ */ package com.oracle.truffle.tck; -import java.io.*; - -import org.junit.runner.*; -import org.junit.runner.notification.*; +import java.io.PrintStream; +import org.junit.runner.Description; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; class TruffleJUnitRunListenerDecorator implements TruffleJUnitRunListener {
--- a/truffle/com.oracle.truffle.tck/src/com/oracle/truffle/tck/TruffleTCK.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.tck/src/com/oracle/truffle/tck/TruffleTCK.java Wed Sep 16 11:33:22 2015 +0200 @@ -30,7 +30,12 @@ import com.oracle.truffle.api.vm.TruffleVM; import java.io.IOException; import java.util.Random; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.fail; import org.junit.Test; /**
--- a/truffle/com.oracle.truffle.tck/src/com/oracle/truffle/tck/TruffleTextListener.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.tck/src/com/oracle/truffle/tck/TruffleTextListener.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,11 +24,13 @@ */ package com.oracle.truffle.tck; -import java.io.*; - -import org.junit.internal.*; -import org.junit.runner.*; -import org.junit.runner.notification.*; +import java.io.PrintStream; +import org.junit.internal.JUnitSystem; +import org.junit.internal.TextListener; +import org.junit.runner.Description; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; +import org.junit.runner.notification.RunListener; class TruffleTextListener implements TruffleJUnitRunListener {
--- a/truffle/com.oracle.truffle.tck/src/com/oracle/truffle/tck/TruffleVerboseTextListener.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.tck/src/com/oracle/truffle/tck/TruffleVerboseTextListener.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,11 +24,10 @@ */ package com.oracle.truffle.tck; -import java.io.*; - -import org.junit.internal.*; -import org.junit.runner.*; -import org.junit.runner.notification.*; +import java.io.PrintStream; +import org.junit.internal.JUnitSystem; +import org.junit.runner.Description; +import org.junit.runner.notification.Failure; class TruffleVerboseTextListener extends TruffleTextListener {
--- a/truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/REPLMessage.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/REPLMessage.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,9 +24,11 @@ */ package com.oracle.truffle.tools.debug.shell; -import java.io.*; -import java.util.*; +import java.io.PrintStream; +import java.util.Map; import java.util.Map.Entry; +import java.util.Set; +import java.util.TreeMap; /** * A message for communication between a Read-Eval-Print-Loop server associated with a language
--- a/truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/REPLServer.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/REPLServer.java Wed Sep 16 11:33:22 2015 +0200 @@ -25,7 +25,8 @@ package com.oracle.truffle.tools.debug.shell; import com.oracle.truffle.api.debug.Breakpoint; -import java.util.*; +import java.util.Map; +import java.util.WeakHashMap; /** * The server side of a simple message-based protocol for a possibly remote language
--- a/truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/client/REPLClientContext.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/client/REPLClientContext.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,10 +24,9 @@ */ package com.oracle.truffle.tools.debug.shell.client; -import java.util.*; - -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.tools.debug.shell.*; +import com.oracle.truffle.api.source.Source; +import com.oracle.truffle.tools.debug.shell.REPLServer; +import java.util.List; /** * Client context for interaction with a program halted by the {@link REPLServer}.
--- a/truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/client/REPLRemoteCommand.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/client/REPLRemoteCommand.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.truffle.tools.debug.shell.client; -import java.io.*; -import java.util.*; - -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.tools.debug.shell.*; +import com.oracle.truffle.api.source.Source; +import com.oracle.truffle.tools.debug.shell.REPLMessage; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; // TODO (mlvdv) write a real command line parser public abstract class REPLRemoteCommand extends REPLCommand {
--- a/truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/client/REPLineLocation.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/client/REPLineLocation.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,10 +24,9 @@ */ package com.oracle.truffle.tools.debug.shell.client; -import java.io.*; - -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.tools.debug.shell.*; +import com.oracle.truffle.api.source.Source; +import com.oracle.truffle.tools.debug.shell.REPLMessage; +import java.io.IOException; final class REPLineLocation {
--- a/truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/client/SimpleREPLClient.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/client/SimpleREPLClient.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,13 +24,22 @@ */ package com.oracle.truffle.tools.debug.shell.client; -import java.io.*; -import java.util.*; - -import jline.console.*; - -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.tools.debug.shell.*; +import com.oracle.truffle.api.source.Source; +import com.oracle.truffle.tools.debug.shell.REPLClient; +import com.oracle.truffle.tools.debug.shell.REPLMessage; +import com.oracle.truffle.tools.debug.shell.REPLServer; +import java.io.IOException; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TreeSet; +import jline.console.ConsoleReader; /** * A very simple line-oriented, language-agnostic debugging client shell: the first step toward a
--- a/truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/server/FrameDebugDescription.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/server/FrameDebugDescription.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,8 +24,9 @@ */ package com.oracle.truffle.tools.debug.shell.server; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.Frame; +import com.oracle.truffle.api.frame.FrameInstance; +import com.oracle.truffle.api.nodes.Node; public final class FrameDebugDescription { private final int index;
--- a/truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/server/REPLHandler.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/server/REPLHandler.java Wed Sep 16 11:33:22 2015 +0200 @@ -25,14 +25,22 @@ package com.oracle.truffle.tools.debug.shell.server; import com.oracle.truffle.api.debug.Breakpoint; -import java.io.*; -import java.util.*; - -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.instrument.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.tools.debug.shell.*; +import com.oracle.truffle.api.frame.Frame; +import com.oracle.truffle.api.frame.FrameDescriptor; +import com.oracle.truffle.api.frame.FrameInstance; +import com.oracle.truffle.api.frame.FrameSlot; +import com.oracle.truffle.api.instrument.ASTPrinter; +import com.oracle.truffle.api.instrument.KillException; +import com.oracle.truffle.api.instrument.QuitException; +import com.oracle.truffle.api.instrument.StandardSyntaxTag; +import com.oracle.truffle.api.instrument.Visualizer; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.source.Source; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.tools.debug.shell.REPLMessage; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; /** * Server-side REPL implementation of an {@linkplain REPLMessage "op"}.
--- a/truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/server/REPLServerContext.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/server/REPLServerContext.java Wed Sep 16 11:33:22 2015 +0200 @@ -27,13 +27,14 @@ import com.oracle.truffle.api.debug.Breakpoint; import com.oracle.truffle.api.debug.Debugger; import com.oracle.truffle.api.debug.SuspendedEvent; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.frame.FrameInstance; +import com.oracle.truffle.api.frame.MaterializedFrame; import com.oracle.truffle.api.instrument.Visualizer; import com.oracle.truffle.api.instrument.impl.DefaultVisualizer; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.vm.*; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.vm.TruffleVM; import com.oracle.truffle.api.vm.TruffleVM.Language; -import com.oracle.truffle.tools.debug.shell.*; +import com.oracle.truffle.tools.debug.shell.REPLMessage; import java.util.ArrayList; import java.util.Collections; import java.util.List;
--- a/truffle/com.oracle.truffle.tools.test/src/com/oracle/truffle/tools/test/CoverageTrackerTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.tools.test/src/com/oracle/truffle/tools/test/CoverageTrackerTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,14 +24,17 @@ */ package com.oracle.truffle.tools.test; -import static com.oracle.truffle.tools.test.TestNodes.*; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.instrument.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.tools.*; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.instrument.StandardSyntaxTag; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.RootNode; +import com.oracle.truffle.tools.CoverageTracker; +import static com.oracle.truffle.tools.test.TestNodes.createExpr13TestRootNode; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import org.junit.Test; public class CoverageTrackerTest {
--- a/truffle/com.oracle.truffle.tools.test/src/com/oracle/truffle/tools/test/LineToProbesMapTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.tools.test/src/com/oracle/truffle/tools/test/LineToProbesMapTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,15 +24,17 @@ */ package com.oracle.truffle.tools.test; -import static com.oracle.truffle.tools.test.TestNodes.*; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.instrument.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.tools.*; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.RootNode; +import com.oracle.truffle.api.source.LineLocation; +import com.oracle.truffle.tools.LineToProbesMap; +import static com.oracle.truffle.tools.test.TestNodes.createExpr13TestRootNode; +import static com.oracle.truffle.tools.test.TestNodes.expr13Line1; +import static com.oracle.truffle.tools.test.TestNodes.expr13Line2; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import org.junit.Test; public class LineToProbesMapTest {
--- a/truffle/com.oracle.truffle.tools.test/src/com/oracle/truffle/tools/test/NodeExecCounterTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.tools.test/src/com/oracle/truffle/tools/test/NodeExecCounterTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,18 +24,21 @@ */ package com.oracle.truffle.tools.test; -import static com.oracle.truffle.tools.test.TestNodes.*; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.instrument.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.tools.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.instrument.StandardSyntaxTag; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.RootNode; +import com.oracle.truffle.tools.NodeExecCounter; import com.oracle.truffle.tools.NodeExecCounter.NodeExecutionCount; import com.oracle.truffle.tools.test.TestNodes.TestAddNode; import com.oracle.truffle.tools.test.TestNodes.TestValueNode; +import static com.oracle.truffle.tools.test.TestNodes.createExpr13TestCallTarget; +import static com.oracle.truffle.tools.test.TestNodes.createExpr13TestRootNode; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; +import org.junit.Test; public class NodeExecCounterTest {
--- a/truffle/com.oracle.truffle.tools.test/src/com/oracle/truffle/tools/test/TestNodes.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.tools.test/src/com/oracle/truffle/tools/test/TestNodes.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,12 +24,21 @@ */ package com.oracle.truffle.tools.test; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.instrument.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.TruffleLanguage; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.instrument.KillException; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.instrument.ProbeNode; import com.oracle.truffle.api.instrument.ProbeNode.WrapperNode; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeCost; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.nodes.RootNode; +import com.oracle.truffle.api.source.LineLocation; +import com.oracle.truffle.api.source.Source; +import com.oracle.truffle.api.source.SourceSection; /** * Nodes and an {@linkplain CallTarget executable ASTs} for testing.
--- a/truffle/com.oracle.truffle.tools.test/src/com/oracle/truffle/tools/test/TruffleToolTest.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.tools.test/src/com/oracle/truffle/tools/test/TruffleToolTest.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,11 +24,10 @@ */ package com.oracle.truffle.tools.test; -import static org.junit.Assert.*; - -import org.junit.*; - -import com.oracle.truffle.api.instrument.*; +import com.oracle.truffle.api.instrument.InstrumentationTool; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import org.junit.Test; /** * Test the basic life cycle properties shared by all instances of {@link InstrumentationTool}.
--- a/truffle/com.oracle.truffle.tools/src/com/oracle/truffle/tools/CoverageTracker.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.tools/src/com/oracle/truffle/tools/CoverageTracker.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,14 +24,27 @@ */ package com.oracle.truffle.tools; -import java.io.*; -import java.util.*; +import com.oracle.truffle.api.instrument.Instrument; +import com.oracle.truffle.api.instrument.InstrumentationTool; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.instrument.ProbeListener; +import com.oracle.truffle.api.instrument.SimpleInstrumentListener; +import com.oracle.truffle.api.instrument.StandardSyntaxTag; +import com.oracle.truffle.api.instrument.SyntaxTag; +import com.oracle.truffle.api.instrument.impl.DefaultProbeListener; +import com.oracle.truffle.api.instrument.impl.DefaultSimpleInstrumentListener; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.source.LineLocation; +import com.oracle.truffle.api.source.Source; +import com.oracle.truffle.api.source.SourceSection; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; - -import com.oracle.truffle.api.instrument.*; -import com.oracle.truffle.api.instrument.impl.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; +import java.util.TreeSet; /** * An {@link InstrumentationTool} that counts interpreter <em>execution calls</em> to AST nodes that
--- a/truffle/com.oracle.truffle.tools/src/com/oracle/truffle/tools/LineToProbesMap.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.tools/src/com/oracle/truffle/tools/LineToProbesMap.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,12 +24,19 @@ */ package com.oracle.truffle.tools; -import java.io.*; -import java.util.*; - -import com.oracle.truffle.api.instrument.*; -import com.oracle.truffle.api.instrument.impl.*; -import com.oracle.truffle.api.source.*; +import com.oracle.truffle.api.instrument.InstrumentationTool; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.instrument.ProbeListener; +import com.oracle.truffle.api.instrument.impl.DefaultProbeListener; +import com.oracle.truffle.api.source.LineLocation; +import com.oracle.truffle.api.source.Source; +import com.oracle.truffle.api.source.SourceSection; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; /** * An {@link InstrumentationTool} that builds a map of every {@link Probe} attached to some AST,
--- a/truffle/com.oracle.truffle.tools/src/com/oracle/truffle/tools/NodeExecCounter.java Tue Sep 15 10:36:04 2015 +0200 +++ b/truffle/com.oracle.truffle.tools/src/com/oracle/truffle/tools/NodeExecCounter.java Wed Sep 16 11:33:22 2015 +0200 @@ -24,16 +24,31 @@ */ package com.oracle.truffle.tools; -import java.io.*; -import java.util.*; -import java.util.concurrent.atomic.*; - import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.instrument.*; -import com.oracle.truffle.api.instrument.impl.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.instrument.ASTProber; +import com.oracle.truffle.api.instrument.Instrument; +import com.oracle.truffle.api.instrument.InstrumentationTool; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.instrument.ProbeException; +import com.oracle.truffle.api.instrument.ProbeFailure; +import com.oracle.truffle.api.instrument.ProbeListener; +import com.oracle.truffle.api.instrument.StandardInstrumentListener; +import com.oracle.truffle.api.instrument.SyntaxTag; +import com.oracle.truffle.api.instrument.impl.DefaultProbeListener; +import com.oracle.truffle.api.instrument.impl.DefaultStandardInstrumentListener; +import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.Node.Child; +import com.oracle.truffle.api.nodes.NodeVisitor; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicLong; /** * An {@link InstrumentationTool} that counts interpreter <em>execution calls</em> to AST nodes,