Skip to content

Fix for Inconsistencies in float/string vs int/string comparisons #105

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix for Inconsistencies in float/string vs int/string comparisons #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14c5a42
Moved tests for string/numeric comparisons
samarseneault Mar 9, 2022
68eedc6
Removed string-numeric comparisons
samarseneault Mar 9, 2022
80c5fbd
Merge branch 'bugfix'
samarseneault Mar 9, 2022
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
23 changes: 1 addition & 22 deletions src/buzz/buzztype.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,31 +173,10 @@ int buzzobj_cmp(const buzzobj_t a,
if(a->f.value > b->f.value) return 1;
return 0;
}
/* String and other types */
/* Strings */
if(a->o.type == BUZZTYPE_STRING && b->o.type == BUZZTYPE_STRING) {
return buzzobj_strcmp(a->s.value.str, b->s.value.str);
}
if(a->o.type == BUZZTYPE_STRING && b->o.type == BUZZTYPE_INT) {
char str[30];
sprintf(str, "%d", b->i.value);
return buzzobj_strcmp(a->s.value.str, str);
}
if(a->o.type == BUZZTYPE_STRING && b->o.type == BUZZTYPE_FLOAT) {
char str[30];
sprintf(str, "%f", b->f.value);
return buzzobj_strcmp(a->s.value.str, str);
}

if(a->o.type == BUZZTYPE_INT && b->o.type == BUZZTYPE_STRING) {
char str[30];
sprintf(str, "%d", a->i.value);
return buzzobj_strcmp(str, b->s.value.str);
}
if(a->o.type == BUZZTYPE_FLOAT && b->o.type == BUZZTYPE_STRING) {
char str[30];
sprintf(str, "%f", a->f.value);
return buzzobj_strcmp(str, b->s.value.str);
}
/* Tables */
if(a->o.type == BUZZTYPE_TABLE || b->o.type == BUZZTYPE_TABLE) {
/* Both operands are tables */
Expand Down
41 changes: 18 additions & 23 deletions src/testing/unittest/buzztype_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,39 +323,34 @@ TEST(BuzzObjCompare, String) {
EXPECT_EQ(buzzobj_cmp(buzzobj_new_string("A string"), buzzobj_new_string("A string")), 0);
EXPECT_EQ(buzzobj_cmp(buzzobj_new_string("A string"), buzzobj_new_string("Buzz")), -1);
EXPECT_EQ(buzzobj_cmp(buzzobj_new_string("Test"), buzzobj_new_string("Buzz")), 1);

// Tests for left string and right integer values
EXPECT_EQ(buzzobj_cmp(buzzobj_new_string("1"), buzzobj_new_int(1)), 0);
EXPECT_EQ(buzzobj_cmp(buzzobj_new_string("100"), buzzobj_new_int(42)), -1);
EXPECT_EQ(buzzobj_cmp(buzzobj_new_string("34abc"), buzzobj_new_int(12)), 1);

// Tests for left integer and right string values
EXPECT_EQ(buzzobj_cmp(buzzobj_new_int(-9), buzzobj_new_string("-9")), 0);
EXPECT_EQ(buzzobj_cmp(buzzobj_new_int(2), buzzobj_new_string("23")), -1);
EXPECT_EQ(buzzobj_cmp(buzzobj_new_int(99), buzzobj_new_string("8a")), 1);

// Tests for left string and right float values
EXPECT_EQ(buzzobj_cmp(buzzobj_new_string("1"), buzzobj_new_int(1)), 0);
EXPECT_EQ(buzzobj_cmp(buzzobj_new_string("100"), buzzobj_new_int(42)), -1);
EXPECT_EQ(buzzobj_cmp(buzzobj_new_string("34abc"), buzzobj_new_int(12)), 1);

// Tests for left float and right string values
EXPECT_EQ(buzzobj_cmp(buzzobj_new_float(-9.0f), buzzobj_new_string("-9.0")), 0);
EXPECT_EQ(buzzobj_cmp(buzzobj_new_float(2.5f), buzzobj_new_string("23")), -1);
EXPECT_EQ(buzzobj_cmp(buzzobj_new_float(99.9f), buzzobj_new_string("8a")), 1);
}

// Tests for `buzzobj_cmp` defined in <buzz/buzztype.h>
// Test cases for comparisons with incompatible/invalid types.
TEST(BuzzObjCompare, IncompatibleTypes) {
const char* errorRegex = "^(\\[TODO\\] )(.*)(: Error for comparison between Buzz objects of types [0-9]+ and [0-9]+\n)$";

// Tests for closures, should die with clear error message

/* Tests for strings and numeric types. Should die with clear error message */
// Tests for left string and right integer values
EXPECT_DEATH(buzzobj_cmp(buzzobj_new_string("1"), buzzobj_new_int(1)), errorRegex);
EXPECT_DEATH(buzzobj_cmp(buzzobj_new_string("100"), buzzobj_new_int(42)), errorRegex);
EXPECT_DEATH(buzzobj_cmp(buzzobj_new_string("34abc"), buzzobj_new_int(12)), errorRegex);
EXPECT_DEATH(buzzobj_cmp(buzzobj_new_int(-9), buzzobj_new_string("-9")), errorRegex);
EXPECT_DEATH(buzzobj_cmp(buzzobj_new_int(2), buzzobj_new_string("23")), errorRegex);
EXPECT_DEATH(buzzobj_cmp(buzzobj_new_int(99), buzzobj_new_string("8a")), errorRegex);
EXPECT_DEATH(buzzobj_cmp(buzzobj_new_string("1"), buzzobj_new_int(1)), errorRegex);
EXPECT_DEATH(buzzobj_cmp(buzzobj_new_string("100"), buzzobj_new_int(42)), errorRegex);
EXPECT_DEATH(buzzobj_cmp(buzzobj_new_string("34abc"), buzzobj_new_int(12)), errorRegex);
EXPECT_DEATH(buzzobj_cmp(buzzobj_new_float(-9.0f), buzzobj_new_string("-9.0")), errorRegex);
EXPECT_DEATH(buzzobj_cmp(buzzobj_new_float(2.5f), buzzobj_new_string("23")), errorRegex);
EXPECT_DEATH(buzzobj_cmp(buzzobj_new_float(99.9f), buzzobj_new_string("8a")), errorRegex);

/* Tests for closures, should die with clear error message */
EXPECT_DEATH(buzzobj_cmp(buzzobj_new(BUZZTYPE_CLOSURE), buzzobj_new(BUZZTYPE_CLOSURE)), errorRegex);
EXPECT_DEATH(buzzobj_cmp(buzzobj_new(BUZZTYPE_CLOSURE), buzzobj_new_int(1)), errorRegex);
EXPECT_DEATH(buzzobj_cmp(buzzobj_new_string("3abc0"), buzzobj_new(BUZZTYPE_CLOSURE)), errorRegex);

// Tests for comparison between userdata and any other type
/* Tests for comparison between userdata and any other type */
EXPECT_DEATH(buzzobj_cmp(buzzobj_new_string("This is a test string."), buzzobj_new(BUZZTYPE_USERDATA)), errorRegex);
EXPECT_DEATH(buzzobj_cmp(buzzobj_new_float(87.2f), buzzobj_new(BUZZTYPE_USERDATA)), errorRegex);
// This comparison might be invalid (userdata should only be compared between themselves)
Expand Down