Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 10 additions & 14 deletions src/main/java/grammar_objects/DynamicToken.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/grammar_objects/EOF.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,10 @@ public EOF() {
public String toString() {
return "$";
}

@Override
public boolean equals(Object obj) {
return obj instanceof EOF;
}

}
7 changes: 3 additions & 4 deletions src/main/java/grammar_objects/LexicalElement.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/grammar_objects/NonTerminal.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

}
21 changes: 21 additions & 0 deletions src/test/java/grammar_objects/DynamicTokenTests.java
Original file line number Diff line number Diff line change
@@ -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);
}

}
10 changes: 10 additions & 0 deletions src/test/java/grammar_objects/NonTerminalTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

}
26 changes: 26 additions & 0 deletions src/test/java/grammar_objects/TokenTests.java
Original file line number Diff line number Diff line change
@@ -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);
}

}
Loading