Fixed #5340 (Preprocessor: not using errorLogger when reporting syntax errors)
This commit is contained in:
parent
4224f873fd
commit
86763b401c
|
@ -1635,7 +1635,7 @@ void Preprocessor::simplifyCondition(const std::map<std::string, std::string> &c
|
||||||
if (it != cfg.end()) {
|
if (it != cfg.end()) {
|
||||||
if (!it->second.empty()) {
|
if (!it->second.empty()) {
|
||||||
// Tokenize the value
|
// Tokenize the value
|
||||||
Tokenizer tokenizer2(&settings,NULL);
|
Tokenizer tokenizer2(&settings, _errorLogger);
|
||||||
tokenizer2.tokenizeCondition(it->second);
|
tokenizer2.tokenizeCondition(it->second);
|
||||||
|
|
||||||
// Copy the value tokens
|
// Copy the value tokens
|
||||||
|
@ -1774,7 +1774,7 @@ std::string Preprocessor::getcode(const std::string &filedata, const std::string
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if (line.find("=") != std::string::npos) {
|
if (line.find("=") != std::string::npos) {
|
||||||
Tokenizer tokenizer(_settings, NULL);
|
Tokenizer tokenizer(_settings, _errorLogger);
|
||||||
line.erase(0, sizeof("#pragma endasm"));
|
line.erase(0, sizeof("#pragma endasm"));
|
||||||
std::istringstream tempIstr(line);
|
std::istringstream tempIstr(line);
|
||||||
tokenizer.tokenize(tempIstr, "");
|
tokenizer.tokenize(tempIstr, "");
|
||||||
|
|
Loading…
Reference in New Issue