new gcc version

[blank.git] / src / io / token.cpp

diff --git a/src/io/token.cpp b/src/io/token.cpp
index 07a5e981cd889d01d5920797ee0a4d63dd0ff604..99b25b6690a168c727c63e623fcff426c62a59ca 100644 (file)
--- a/src/io/token.cpp
+++ b/src/io/token.cpp
@@ -163,7 +163,7 @@ void Tokenizer::ReadString() {
                                        current.value += '\n';
                                        break;
                                case 'r':
-                                       current.value += '\t';
+                                       current.value += '\r';
                                        break;
                                case 't':
                                        current.value += '\t';
@@ -286,7 +286,7 @@ const Token &TokenStreamReader::Peek() {
 }
 
 
-void TokenStreamReader::Assert(Token::Type t) {
+void TokenStreamReader::Assert(Token::Type t) const {
        if (GetType() != t) {
                stringstream s;
                s << "unexpected token in input stream: expected " << t << ", but got " << in.Current();
@@ -336,6 +336,10 @@ void TokenStreamReader::ReadString(string &out) {
        out = GetValue();
 }
 
+void TokenStreamReader::ReadRelaxedString(string &out) {
+       out = GetString();
+}
+
 
 void TokenStreamReader::ReadVec(glm::vec2 &v) {
        Skip(Token::BRACKET_OPEN);
@@ -412,9 +416,13 @@ void TokenStreamReader::ReadQuat(glm::quat &q) {
 
 bool TokenStreamReader::GetBool() {
        Next();
+       return AsBool();
+}
+
+bool TokenStreamReader::AsBool() const {
        switch (GetType()) {
                case Token::NUMBER:
-                       return GetInt() != 0;
+                       return AsInt() != 0;
                case Token::IDENTIFIER:
                case Token::STRING:
                        if (GetValue() == "true" || GetValue() == "yes" || GetValue() == "on") {
@@ -435,20 +443,41 @@ bool TokenStreamReader::GetBool() {
 
 float TokenStreamReader::GetFloat() {
        Next();
+       return AsFloat();
+}
+
+float TokenStreamReader::AsFloat() const {
        Assert(Token::NUMBER);
        return stof(GetValue());
 }
 
 int TokenStreamReader::GetInt() {
        Next();
+       return AsInt();
+}
+
+int TokenStreamReader::AsInt() const {
        Assert(Token::NUMBER);
        return stoi(GetValue());
 }
 
 unsigned long TokenStreamReader::GetULong() {
        Next();
+       return AsULong();
+}
+
+unsigned long TokenStreamReader::AsULong() const {
        Assert(Token::NUMBER);
        return stoul(GetValue());
 }
 
+const string &TokenStreamReader::GetString() {
+       Next();
+       return AsString();
+}
+
+const string &TokenStreamReader::AsString() const {
+       return GetValue();
+}
+
 }