FOSS/AyuGramDesktop
1
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2026-07-29 00:39:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Parsing of color and sprite values started in codegen_style.

Browse Source
This commit is contained in:
John Preston
2016-04-17 16:22:00 +03:00
parent 45bd2dc5fa
commit e0160f7d4c
10 changed files with 544 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Telegram/SourceFiles/codegen/common/basic_tokenized_file.cpp
+5 -9
View File
@@ -45,7 +45,7 @@ bool isNameChar(char ch) {
}
bool isWhitespaceChar(char ch) {
return (ch == '\n' || ch == ' ' || ch == '\t');
return (ch == '\n' || ch == '\r' || ch == ' ' || ch == '\t');
}
Token invalidToken() {
@@ -224,7 +224,7 @@ Type BasicTokenizedFile::readString() {
Type BasicTokenizedFile::readSingleLetter() {
auto type = singleLetterTokens_.value(reader_.currentChar(), Type::Invalid);
if (type == Type::Invalid) {
reader_.logError(kErrorIncorrectToken, lineNumber_) << "incorrect token '" << reader_.currentChar() << "'.";
reader_.logError(kErrorIncorrectToken, lineNumber_) << "incorrect token '" << reader_.currentChar() << "'";
return Type::Invalid;
}
@@ -253,16 +253,12 @@ LogStream BasicTokenizedFile::logError(int code) const {
return reader_.logError(code, lineNumber_);
}
LogStream BasicTokenizedFile::logErrorUnexpectedToken(const std::string &expected) const {
std::string expectedTail;
if (!expected.empty()) {
expectedTail = ", expected " + expected;
}
LogStream BasicTokenizedFile::logErrorUnexpectedToken() const {
if (currentToken_ < tokens_.size()) {
auto token = tokens_.at(currentToken_).original.toStdString();
return logError(kErrorUnexpectedToken) << "unexpected token '" << token << '\'' << expectedTail << '.';
return logError(kErrorUnexpectedToken) << "unexpected token '" << token << "', expected ";
}
return logError(kErrorUnexpectedToken) << "unexpected token" << expectedTail << '.';
return logError(kErrorUnexpectedToken) << "unexpected token, expected ";
}
BasicTokenizedFile::~BasicTokenizedFile() = default;