forgetest1
/
antlr
forked from jasder/antlr
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Merge pull request #31 from nburles/simpler-hash-calls 

There is no need to call ->hashCode() explicitly
This commit is contained in:
Mike Lischke 2016-08-01 18:01:28 +02:00 committed by GitHub
parent 8bbdbe0371 64f1a654bd
commit 63b5e61c15
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/Cpp/runtime/src/atn/LexerATNConfig.cpp
View File

@ -82,7 +82,7 @@ size_t LexerATNConfig::hashCode() const {
hashCode = misc::MurmurHash::update(hashCode, context); hashCode = misc::MurmurHash::update(hashCode, context);
hashCode = misc::MurmurHash::update(hashCode, semanticContext); hashCode = misc::MurmurHash::update(hashCode, semanticContext);
hashCode = misc::MurmurHash::update(hashCode, _passedThroughNonGreedyDecision ? 1 : 0); hashCode = misc::MurmurHash::update(hashCode, _passedThroughNonGreedyDecision ? 1 : 0);
hashCode = misc::MurmurHash::update(hashCode, _lexerActionExecutor ? _lexerActionExecutor->hashCode() : 0); hashCode = misc::MurmurHash::update(hashCode, _lexerActionExecutor);
hashCode = misc::MurmurHash::finish(hashCode, 6); hashCode = misc::MurmurHash::finish(hashCode, 6);
return hashCode; return hashCode;
} }

2
runtime/Cpp/runtime/src/atn/LexerActionExecutor.cpp
View File

@ -118,7 +118,7 @@ bool LexerActionExecutor::operator == (const LexerActionExecutor &obj) const {
size_t LexerActionExecutor::generateHashCode() const { size_t LexerActionExecutor::generateHashCode() const {
size_t hash = MurmurHash::initialize(); size_t hash = MurmurHash::initialize();
for (auto lexerAction : _lexerActions) { for (auto lexerAction : _lexerActions) {
hash = MurmurHash::update(hash, (size_t)lexerAction->hashCode()); hash = MurmurHash::update(hash, lexerAction);
} }
MurmurHash::finish(hash, _lexerActions.size()); MurmurHash::finish(hash, _lexerActions.size());

2
runtime/Cpp/runtime/src/atn/LexerIndexedCustomAction.cpp
View File

@ -67,7 +67,7 @@ void LexerIndexedCustomAction::execute(Lexer *lexer) {
size_t LexerIndexedCustomAction::hashCode() const { size_t LexerIndexedCustomAction::hashCode() const {
size_t hash = MurmurHash::initialize(); size_t hash = MurmurHash::initialize();
hash = MurmurHash::update(hash, _offset); hash = MurmurHash::update(hash, _offset);
hash = MurmurHash::update(hash, _action->hashCode()); hash = MurmurHash::update(hash, _action);
return MurmurHash::finish(hash, 2); return MurmurHash::finish(hash, 2);
} }