Skip to content

Speed up equivalence comparisons #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
viluon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Speed up equivalence comparisons #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/squiddev/cobalt/LuaBoolean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public final class LuaBoolean extends LuaValue {
*/
public final boolean v;

LuaBoolean(boolean b) {
private LuaBoolean(boolean b) {
super(TBOOLEAN);
this.v = b;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/squiddev/cobalt/LuaValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ public boolean toBoolean() {
* @see Constants#TNUMBER
*/
public double toDouble() {
return Double.NaN;
return 0.0;
}

/**
Expand Down
18 changes: 13 additions & 5 deletions src/main/java/org/squiddev/cobalt/OperationHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.squiddev.cobalt.function.LuaFunction;

import static org.squiddev.cobalt.Constants.*;
import static org.squiddev.cobalt.LuaDouble.NAN;
import static org.squiddev.cobalt.LuaDouble.valueOf;
import static org.squiddev.cobalt.LuaInteger.valueOf;
import static org.squiddev.cobalt.debug.DebugFrame.FLAG_LEQ;
Expand Down Expand Up @@ -260,6 +261,9 @@ public static boolean lt(LuaState state, LuaValue left, LuaValue right) throws L
if (tLeft != right.type()) {
throw ErrorFactory.compareError(left, right);
}

if (left == right && (tLeft == TNUMBER || tLeft == TSTRING)) return false;

switch (tLeft) {
case TNUMBER:
return left.toDouble() < right.toDouble();
Expand All @@ -280,6 +284,9 @@ public static boolean le(LuaState state, LuaValue left, LuaValue right) throws L
if (tLeft != right.type()) {
throw ErrorFactory.compareError(left, right);
}

if (left == right && (tLeft == TNUMBER || tLeft == TSTRING)) return (tLeft != TNUMBER) || !Double.isNaN(left.toDouble());

switch (tLeft) {
case TNUMBER:
return left.toDouble() <= right.toDouble();
Expand Down Expand Up @@ -308,6 +315,8 @@ public static boolean le(LuaState state, LuaValue left, LuaValue right) throws L

public static boolean eq(LuaState state, LuaValue left, LuaValue right) throws LuaError, UnwindThrowable {
int tLeft = left.type();
if (left == right) return (tLeft != TNUMBER) || !Double.isNaN(left.toDouble());

if (tLeft != right.type()) return false;

switch (tLeft) {
Expand All @@ -317,11 +326,9 @@ public static boolean eq(LuaState state, LuaValue left, LuaValue right) throws L
return left.toDouble() == right.toDouble();
case TBOOLEAN:
return left.toBoolean() == right.toBoolean();
case TSTRING:
return left == right || left.raweq(right);
case TUSERDATA:
case TTABLE: {
if (left == right || left.raweq(right)) return true;
if (left.raweq(right)) return true;

LuaTable leftMeta = left.getMetatable(state);
if (leftMeta == null) return false;
Expand All @@ -332,8 +339,9 @@ public static boolean eq(LuaState state, LuaValue left, LuaValue right) throws L
LuaValue h = leftMeta.rawget(CachedMetamethod.EQ);
return !(h.isNil() || h != rightMeta.rawget(CachedMetamethod.EQ)) && OperationHelper.call(state, h, left, right).toBoolean();
}
case TSTRING:
default:
return left == right || left.raweq(right);
return left.raweq(right);
}
}
//endregion
Expand Down Expand Up @@ -411,7 +419,7 @@ public static LuaValue neg(LuaState state, LuaValue value, int stack) throws Lua
}

private static boolean checkNumber(LuaValue lua, double value) {
return lua.type() == TNUMBER || !Double.isNaN(value);
return lua.type() == TNUMBER || (lua.type() == TSTRING && !Double.isNaN(value));
}
//endregion

Expand Down
18 changes: 9 additions & 9 deletions src/test/java/org/squiddev/cobalt/vm/TypeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,9 +383,9 @@ public void testToBoolean() {

@Test
public void testToDouble() {
assertDoubleEquals(Double.NaN, somenil.toDouble());
assertDoubleEquals(Double.NaN, somefalse.toDouble());
assertDoubleEquals(Double.NaN, sometrue.toDouble());
assertDoubleEquals(0.0, somenil.toDouble());
assertDoubleEquals(0.0, somefalse.toDouble());
assertDoubleEquals(0.0, sometrue.toDouble());
assertDoubleEquals(0, zero.toDouble());
assertDoubleEquals(sampleint, intint.toDouble());
assertDoubleEquals((double) samplelong, longdouble.toDouble());
Expand All @@ -394,12 +394,12 @@ public void testToDouble() {
assertDoubleEquals(sampleint, stringint.toDouble());
assertDoubleEquals((double) samplelong, stringlong.toDouble());
assertDoubleEquals(sampledouble, stringdouble.toDouble());
assertDoubleEquals(Double.NaN, thread.toDouble());
assertDoubleEquals(Double.NaN, table.toDouble());
assertDoubleEquals(Double.NaN, userdataobj.toDouble());
assertDoubleEquals(Double.NaN, userdatacls.toDouble());
assertDoubleEquals(Double.NaN, somefunc.toDouble());
assertDoubleEquals(Double.NaN, someclosure.toDouble());
assertDoubleEquals(0.0, thread.toDouble());
assertDoubleEquals(0.0, table.toDouble());
assertDoubleEquals(0.0, userdataobj.toDouble());
assertDoubleEquals(0.0, userdatacls.toDouble());
assertDoubleEquals(0.0, somefunc.toDouble());
assertDoubleEquals(0.0, someclosure.toDouble());
}

@Test
Expand Down