diff options
Diffstat (limited to 'source/core/slang-token-reader.cpp')
| -rw-r--r-- | source/core/slang-token-reader.cpp | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/source/core/slang-token-reader.cpp b/source/core/slang-token-reader.cpp index be2461796..f6f29def3 100644 --- a/source/core/slang-token-reader.cpp +++ b/source/core/slang-token-reader.cpp @@ -336,7 +336,7 @@ namespace Misc { auto InsertToken = [&](TokenType type) { derivative = LexDerivative::None; - tokenList.add(Token(type, tokenBuilder.ToString(), tokenLine, tokenCol, int(pos), file, tokenFlags)); + tokenList.add(Token(type, tokenBuilder.toString(), tokenLine, tokenCol, int(pos), file, tokenFlags)); tokenFlags = 0; tokenBuilder.clear(); }; @@ -347,22 +347,22 @@ namespace Misc { case '\\': case '\"': case '\'': - tokenBuilder.Append(nextChar); + tokenBuilder.append(nextChar); break; case 't': - tokenBuilder.Append('\t'); + tokenBuilder.append('\t'); break; case 's': - tokenBuilder.Append(' '); + tokenBuilder.append(' '); break; case 'n': - tokenBuilder.Append('\n'); + tokenBuilder.append('\n'); break; case 'r': - tokenBuilder.Append('\r'); + tokenBuilder.append('\r'); break; case 'b': - tokenBuilder.Append('\b'); + tokenBuilder.append('\b'); break; } }; @@ -433,7 +433,7 @@ namespace Misc { } else if (curChar == '.' && IsDigit(nextChar)) { - tokenBuilder.Append("0."); + tokenBuilder.append("0."); state = State::Fixed; pos++; } @@ -451,12 +451,12 @@ namespace Misc { case State::Identifier: if (IsLetter(curChar) || IsDigit(curChar)) { - tokenBuilder.Append(curChar); + tokenBuilder.append(curChar); pos++; } else { - auto tokenStr = tokenBuilder.ToString(); + auto tokenStr = tokenBuilder.toString(); #if 0 if (tokenStr == "#line_reset#") { @@ -485,13 +485,13 @@ namespace Misc { case State::Operator: if (IsPunctuation(curChar) && !((curChar == '/' && nextChar == '/') || (curChar == '/' && nextChar == '*'))) { - tokenBuilder.Append(curChar); + tokenBuilder.append(curChar); pos++; } else { //do token analyze - ParseOperators(tokenBuilder.ToString(), tokenList, tokenFlags, tokenLine, tokenCol, (int)(pos - tokenBuilder.getLength()), file); + ParseOperators(tokenBuilder.toString(), tokenList, tokenFlags, tokenLine, tokenCol, (int)(pos - tokenBuilder.getLength()), file); tokenBuilder.clear(); state = State::Start; } @@ -499,22 +499,22 @@ namespace Misc { case State::Int: if (IsDigit(curChar)) { - tokenBuilder.Append(curChar); + tokenBuilder.append(curChar); pos++; } else if (curChar == '.') { state = State::Fixed; - tokenBuilder.Append(curChar); + tokenBuilder.append(curChar); pos++; } else if (curChar == 'e' || curChar == 'E') { state = State::Double; - tokenBuilder.Append(curChar); + tokenBuilder.append(curChar); if (nextChar == '-' || nextChar == '+') { - tokenBuilder.Append(nextChar); + tokenBuilder.append(nextChar); pos++; } pos++; @@ -522,13 +522,13 @@ namespace Misc { else if (curChar == 'x') { state = State::Hex; - tokenBuilder.Append(curChar); + tokenBuilder.append(curChar); pos++; } else if (curChar == 'u') { pos++; - tokenBuilder.Append(curChar); + tokenBuilder.append(curChar); InsertToken(TokenType::IntLiteral); state = State::Start; } @@ -537,7 +537,7 @@ namespace Misc { if (derivative == LexDerivative::Line) { derivative = LexDerivative::None; - line = StringToInt(tokenBuilder.ToString()) - 1; + line = stringToInt(tokenBuilder.toString()) - 1; col = 0; tokenBuilder.clear(); } @@ -551,7 +551,7 @@ namespace Misc { case State::Hex: if (IsDigit(curChar) || (curChar >= 'a' && curChar <= 'f') || (curChar >= 'A' && curChar <= 'F')) { - tokenBuilder.Append(curChar); + tokenBuilder.append(curChar); pos++; } else @@ -563,16 +563,16 @@ namespace Misc { case State::Fixed: if (IsDigit(curChar)) { - tokenBuilder.Append(curChar); + tokenBuilder.append(curChar); pos++; } else if (curChar == 'e' || curChar == 'E') { state = State::Double; - tokenBuilder.Append(curChar); + tokenBuilder.append(curChar); if (nextChar == '-' || nextChar == '+') { - tokenBuilder.Append(nextChar); + tokenBuilder.append(nextChar); pos++; } pos++; @@ -588,7 +588,7 @@ namespace Misc { case State::Double: if (IsDigit(curChar)) { - tokenBuilder.Append(curChar); + tokenBuilder.append(curChar); pos++; } else @@ -608,14 +608,14 @@ namespace Misc { pos++; } else - tokenBuilder.Append(curChar); + tokenBuilder.append(curChar); } else { if (derivative == LexDerivative::File) { derivative = LexDerivative::None; - file = tokenBuilder.ToString(); + file = tokenBuilder.toString(); tokenBuilder.clear(); } else @@ -635,7 +635,7 @@ namespace Misc { pos++; } else - tokenBuilder.Append(curChar); + tokenBuilder.append(curChar); } else { |