Skip to content

.equals should not ignore Variant and Attribute order, fixes #111 #112

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

Merged
merged 1 commit into from
Mar 25, 2019
Merged

.equals should not ignore Variant and Attribute order, fixes #111 #112

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
17 changes: 0 additions & 17 deletions fluent.syntax/fluent/syntax/ast.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,13 +183,6 @@ def equals(self, other, ignored_fields=['span']):
if len(field1) != len(field2):
return False

# Sort elements of order-agnostic fields to ensure the
# comparison is order-agnostic as well. Annotations should be
# here too but they don't have sorting keys.
if key in ('attributes', 'variants'):
field1 = sorted(field1, key=lambda elem: elem.sorting_key)
field2 = sorted(field2, key=lambda elem: elem.sorting_key)

for elem1, elem2 in zip(field1, field2):
if not scalars_equal(elem1, elem2, ignored_fields):
return False
Expand Down Expand Up @@ -358,10 +351,6 @@ def __init__(self, id, value, **kwargs):
self.id = id
self.value = value

@property
def sorting_key(self):
return self.id.name


class Variant(SyntaxNode):
def __init__(self, key, value, default=False, **kwargs):
Expand All @@ -370,12 +359,6 @@ def __init__(self, key, value, default=False, **kwargs):
self.value = value
self.default = default

@property
def sorting_key(self):
if isinstance(self.key, NumberLiteral):
return self.key.value
return self.key.name


class NamedArgument(SyntaxNode):
def __init__(self, name, value, **kwargs):
Expand Down
11 changes: 4 additions & 7 deletions fluent.syntax/tests/syntax/test_equals.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def test_same_junk(self):
self.assertTrue(message1.equals(message1.clone()))


class TestOrderEquals(unittest.TestCase):
class TestNonEquals(unittest.TestCase):
def setUp(self):
self.parser = FluentParser()

Expand All @@ -103,8 +103,7 @@ def test_attributes(self):
.attr1 = Attr1
""")

self.assertTrue(message1.equals(message2))
self.assertTrue(message2.equals(message1))
self.assertFalse(message1.equals(message2))

def test_variants(self):
message1 = self.parse_ftl_entry("""\
Expand All @@ -122,8 +121,7 @@ def test_variants(self):
}
""")

self.assertTrue(message1.equals(message2))
self.assertTrue(message2.equals(message1))
self.assertFalse(message1.equals(message2))

def test_variants_with_numbers(self):
message1 = self.parse_ftl_entry("""\
Expand All @@ -141,8 +139,7 @@ def test_variants_with_numbers(self):
}
""")

self.assertTrue(message1.equals(message2))
self.assertTrue(message2.equals(message1))
self.assertFalse(message1.equals(message2))


class TestEqualWithSpans(unittest.TestCase):
Expand Down