diff --git a/src/main/java/grammar_objects/DynamicToken.java b/src/main/java/grammar_objects/DynamicToken.java index fcc38de..c2e9b9d 100644 --- a/src/main/java/grammar_objects/DynamicToken.java +++ b/src/main/java/grammar_objects/DynamicToken.java @@ -35,36 +35,32 @@ public String getValue() { } /** - * Grammatical equality, based on grammatical qualities, not identfier name and type + * Grammatical equality, based on grammatical qualities, not DynamicToken value */ @Override public boolean equals(Object obj) { - return grammaticallyEquals(obj); + return super.equals(obj); } /** - * Grammatical equality, based on grammatical qualities, not value + * Grammatical equality, based on grammatical qualities, not DynamicToken value */ - public boolean grammaticallyEquals(Object other) { + public boolean grammaticallyEquals(LexicalElement other) { return super.equals(other); } /** * Exact equality, including DynamicToken value, useful for semantic evaluation */ - public boolean exactlyEquals(Object other) { - if(!(other instanceof DynamicToken)) { return false; } + public boolean exactlyEquals(LexicalElement other) { + if(!grammaticallyEquals(other)) return false; + if(!(other instanceof DynamicToken)) return false; DynamicToken otherToken = (DynamicToken)other; - if(!grammaticallyEquals(otherToken)) { return false; } - - if(value == null) { - return otherToken.getValue() == null; - } - else { - return value.equals(otherToken.getValue()); - } + if(value == null) return otherToken.getValue() == null; + + return value.equals(otherToken.getValue()); } @Override diff --git a/src/main/java/grammar_objects/EOF.java b/src/main/java/grammar_objects/EOF.java index 27e8553..b64c347 100644 --- a/src/main/java/grammar_objects/EOF.java +++ b/src/main/java/grammar_objects/EOF.java @@ -10,4 +10,10 @@ public EOF() { public String toString() { return "$"; } + + @Override + public boolean equals(Object obj) { + return obj instanceof EOF; + } + } diff --git a/src/main/java/grammar_objects/LexicalElement.java b/src/main/java/grammar_objects/LexicalElement.java index 547231d..d966dac 100644 --- a/src/main/java/grammar_objects/LexicalElement.java +++ b/src/main/java/grammar_objects/LexicalElement.java @@ -13,13 +13,12 @@ public String getName() { @Override public boolean equals(Object obj) { - if (!(obj instanceof LexicalElement)) { return false; } + if (!(obj instanceof LexicalElement)) return false; LexicalElement otherElement = (LexicalElement) obj; - if (name == null) { return otherElement.getName() == null; } - - return getName().equals(otherElement.getName()); + if (name == null) return otherElement.getName() == null; + return name.equals(otherElement.getName()); } @Override diff --git a/src/main/java/grammar_objects/NonTerminal.java b/src/main/java/grammar_objects/NonTerminal.java index a5e0f56..2c3a40e 100644 --- a/src/main/java/grammar_objects/NonTerminal.java +++ b/src/main/java/grammar_objects/NonTerminal.java @@ -13,7 +13,8 @@ public String toString() { @Override public boolean equals(Object obj) { - if (!(obj instanceof NonTerminal)) { return false; } + if (!(obj instanceof NonTerminal)) return false; return super.equals(obj); } + } diff --git a/src/test/java/grammar_objects/DynamicTokenTests.java b/src/test/java/grammar_objects/DynamicTokenTests.java new file mode 100644 index 0000000..75717d9 --- /dev/null +++ b/src/test/java/grammar_objects/DynamicTokenTests.java @@ -0,0 +1,21 @@ +package grammar_objects; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; + +public class DynamicTokenTests { + + @Test + public void equality() { + DynamicToken dynamicToken1 = new DynamicToken("A"); + DynamicToken dynamicToken2 = new DynamicToken("A"); + Token token = new Token("A"); + + assertEquals(dynamicToken1, dynamicToken2); + assertEquals(dynamicToken2, dynamicToken1); + assertEquals(dynamicToken1, token); + assertEquals(token, dynamicToken1); + } + +} diff --git a/src/test/java/grammar_objects/NonTerminalTests.java b/src/test/java/grammar_objects/NonTerminalTests.java index f41272e..0699cec 100644 --- a/src/test/java/grammar_objects/NonTerminalTests.java +++ b/src/test/java/grammar_objects/NonTerminalTests.java @@ -32,4 +32,14 @@ public void setContains() { assertTrue(set.contains(nt2)); } + + @Test + public void nonEqualityWithTokens() { + NonTerminal nonTerminal = new NonTerminal("A"); + Token token = new Token("A"); + + assertNotEquals(nonTerminal, token); + assertNotEquals(token, nonTerminal); + } + } diff --git a/src/test/java/grammar_objects/TokenTests.java b/src/test/java/grammar_objects/TokenTests.java new file mode 100644 index 0000000..b3d79c0 --- /dev/null +++ b/src/test/java/grammar_objects/TokenTests.java @@ -0,0 +1,26 @@ +package grammar_objects; + +import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.Test; + +public class TokenTests { + + @Test + public void equality() { + Token token1 = new Token("A"); + Token token2 = new Token("A"); + + assertEquals(token1, token2); + assertEquals(token2, token1); + } + + @Test + public void nonEqualityWithNonTerminals() { + Token token = new Token("A"); + NonTerminal nonTerminal = new NonTerminal("A"); + + assertNotEquals(token, nonTerminal); + assertNotEquals(nonTerminal, token); + } + +}