diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-08-17 22:47:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-17 22:47:17 +0200 |
commit | b61662345db1cbf9a46b0a0aabac963d905c3041 (patch) | |
tree | 8b8de2fc1739222933b95e1f67879b152fd232a7 /linguistics/src/main/java/com/yahoo/language/simple/SimpleToken.java | |
parent | 06c7ed329cd824312f59e25348d59523f1e3b610 (diff) | |
parent | b24fcd4853b21971f404851147b51bf069864345 (diff) |
Merge pull request #23684 from vespa-engine/bratseth/token-typesv8.37.26
Determine token types considering all characters
Diffstat (limited to 'linguistics/src/main/java/com/yahoo/language/simple/SimpleToken.java')
-rw-r--r-- | linguistics/src/main/java/com/yahoo/language/simple/SimpleToken.java | 49 |
1 files changed, 16 insertions, 33 deletions
diff --git a/linguistics/src/main/java/com/yahoo/language/simple/SimpleToken.java b/linguistics/src/main/java/com/yahoo/language/simple/SimpleToken.java index 7479e326b45..b6ca219afc8 100644 --- a/linguistics/src/main/java/com/yahoo/language/simple/SimpleToken.java +++ b/linguistics/src/main/java/com/yahoo/language/simple/SimpleToken.java @@ -111,45 +111,28 @@ public class SimpleToken implements Token { } @Override - public int hashCode() { - return orig.hashCode(); - } - - @Override - public boolean equals(Object obj) { - if (!(obj instanceof Token)) { - return false; - } - Token rhs = (Token)obj; - if (!getType().equals(rhs.getType())) { - return false; - } - if (!equalsOpt(getOrig(), rhs.getOrig())) { - return false; - } - if (getOffset() != rhs.getOffset()) { - return false; - } - if (!equalsOpt(getScript(), rhs.getScript())) { - return false; - } - if (!equalsOpt(getTokenString(), rhs.getTokenString())) { - return false; - } - if (isSpecialToken() != rhs.isSpecialToken()) { - return false; - } - if (getNumComponents() != rhs.getNumComponents()) { - return false; - } + public boolean equals(Object o) { + if (!(o instanceof Token other)) return false; + + if (getType() != other.getType()) return false; + if (!equalsOpt(getOrig(), other.getOrig())) return false; + if (getOffset() != other.getOffset()) return false; + if (!equalsOpt(getScript(), other.getScript())) return false; + if (!equalsOpt(getTokenString(), other.getTokenString())) return false; + if (isSpecialToken() != other.isSpecialToken()) return false; + if (getNumComponents() != other.getNumComponents()) return false; for (int i = 0, len = getNumComponents(); i < len; ++i) { - if (!equalsOpt(getComponent(i), rhs.getComponent(i))) { + if (!equalsOpt(getComponent(i), other.getComponent(i))) return false; - } } return true; } + @Override + public int hashCode() { + return orig.hashCode(); + } + private static boolean equalsOpt(Object lhs, Object rhs) { if (lhs == null || rhs == null) { return lhs == rhs; |