Mercurial > hg > truffle
changeset 16910:c9437b07c26a
Truffle: changed return types of condition profile factory methods.
author | Christian Humer <christian.humer@gmail.com> |
---|---|
date | Sat, 23 Aug 2014 19:31:22 +0200 |
parents | 62cfffca9be2 |
children | ee4fde70df19 |
files | graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/BinaryConditionProfileTest.java graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/CountingConditionProfileTest.java graal/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/ConditionProfile.java |
diffstat | 3 files changed, 18 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/BinaryConditionProfileTest.java Sat Aug 23 19:31:18 2014 +0200 +++ b/graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/BinaryConditionProfileTest.java Sat Aug 23 19:31:22 2014 +0200 @@ -36,16 +36,21 @@ @DataPoints public static boolean[] data = new boolean[]{true, false}; + private BinaryConditionProfile profile; + + @Before + public void create() { + profile = (BinaryConditionProfile) ConditionProfile.createBinaryProfile(); + } + @Test public void testInitial() { - BinaryConditionProfile profile = ConditionProfile.createBinaryProfile(); assertThat(profile.wasTrue(), is(false)); assertThat(profile.wasFalse(), is(false)); } @Theory public void testProfileOne(boolean value) { - BinaryConditionProfile profile = ConditionProfile.createBinaryProfile(); boolean result = profile.profile(value); assertThat(result, is(value)); @@ -55,7 +60,6 @@ @Theory public void testProfileTwo(boolean value0, boolean value1) { - BinaryConditionProfile profile = ConditionProfile.createBinaryProfile(); boolean result0 = profile.profile(value0); boolean result1 = profile.profile(value1); @@ -67,7 +71,6 @@ @Theory public void testProfileThree(boolean value0, boolean value1, boolean value2) { - BinaryConditionProfile profile = ConditionProfile.createBinaryProfile(); boolean result0 = profile.profile(value0); boolean result1 = profile.profile(value1); boolean result2 = profile.profile(value2);
--- a/graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/CountingConditionProfileTest.java Sat Aug 23 19:31:18 2014 +0200 +++ b/graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/utilities/CountingConditionProfileTest.java Sat Aug 23 19:31:22 2014 +0200 @@ -36,16 +36,21 @@ @DataPoints public static boolean[] data = new boolean[]{true, false}; + private CountingConditionProfile profile; + + @Before + public void create() { + profile = (CountingConditionProfile) ConditionProfile.createCountingProfile(); + } + @Test public void testInitial() { - CountingConditionProfile profile = ConditionProfile.createCountingProfile(); assertThat(profile.getTrueCount(), is(0)); assertThat(profile.getFalseCount(), is(0)); } @Theory public void testProfileOne(boolean value) { - CountingConditionProfile profile = ConditionProfile.createCountingProfile(); boolean result = profile.profile(value); assertThat(result, is(value)); @@ -55,7 +60,6 @@ @Theory public void testProfileTwo(boolean value0, boolean value1) { - CountingConditionProfile profile = ConditionProfile.createCountingProfile(); boolean result0 = profile.profile(value0); boolean result1 = profile.profile(value1); @@ -67,7 +71,6 @@ @Theory public void testProfileThree(boolean value0, boolean value1, boolean value2) { - CountingConditionProfile profile = ConditionProfile.createCountingProfile(); boolean result0 = profile.profile(value0); boolean result1 = profile.profile(value1); boolean result2 = profile.profile(value2);
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/ConditionProfile.java Sat Aug 23 19:31:18 2014 +0200 +++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/ConditionProfile.java Sat Aug 23 19:31:22 2014 +0200 @@ -65,18 +65,18 @@ * @see ConditionProfile * @see #createBinaryProfile() */ - public static CountingConditionProfile createCountingProfile() { + public static ConditionProfile createCountingProfile() { return new CountingConditionProfile(); } /** - * REturns a {@link ConditionProfile} that speculates on conditions to be never true or to be + * Returns a {@link ConditionProfile} that speculates on conditions to be never true or to be * never false. Condition profiles are intended to be used as part of if conditions. * * @see ConditionProfile - * @see ConditionProfile#createBinaryProfile() + * @see ConditionProfile#createCountingProfile() */ - public static BinaryConditionProfile createBinaryProfile() { + public static ConditionProfile createBinaryProfile() { return new BinaryConditionProfile(); }