diff options
| author | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2014-12-05 14:16:27 +0100 |
|---|---|---|
| committer | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2014-12-05 14:16:27 +0100 |
| commit | 30765a8bbf30aafad89a632afc39966c5b4029b8 (patch) | |
| tree | b9540230f7ac8ac68d66caf7d727e7413a56f631 /src/core/variant/Reader.cpp | |
| parent | fddd8a6fc3c9a7971111a345a83283a0a1662f9f (diff) | |
| parent | bf59bc2edbb1f3f4d12bfbd8ed2663fbbb1900c0 (diff) | |
Merge branch 'master' of somweyr.de:ousia
Diffstat (limited to 'src/core/variant/Reader.cpp')
| -rw-r--r-- | src/core/variant/Reader.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/core/variant/Reader.cpp b/src/core/variant/Reader.cpp index 6142ecf..e9a58a1 100644 --- a/src/core/variant/Reader.cpp +++ b/src/core/variant/Reader.cpp @@ -26,12 +26,17 @@ namespace ousia { namespace variant { +static const char *ERR_UNEXPECTED_CHARACTER = "Unexpected character"; +static const char *ERR_UNEXPECTED_END = "Unexpected end"; +static const char *ERR_UNTERMINATED = "Unterminated literal"; + static const int STATE_INIT = 0; static const int STATE_IN_STRING = 1; static const int STATE_ESCAPE = 2; static std::pair<Err, std::string> parseString( - BufferedCharReader &reader, const unordered_set<char> *delims = nullptr) + BufferedCharReader &reader, const unordered_set<char> *delims = nullptr, + Logger *logger = nullptr) { // Initialize the internal state Err errCode = Err::OK; @@ -51,9 +56,13 @@ static std::pair<Err, std::string> parseString( quote = c; state = STATE_IN_STRING; } else if (delims && delims.count(c)) { + Logger.log(ERR_UNTERMINATED, reader); return std::make_pair(Err::UNEXPECTED_END, res.str()); + } else if (Utils::isWhitespace(c)) { + reader.consumePeek(); + continue; } - reader.consumePeek(); + return std::make_pair(Err::UNEXPECTED_CHARACTER, res.str()); break; case STATE_IN_STRING: if (c == q) { @@ -171,7 +180,6 @@ static std::pair<Err, Variant> parseGeneric(BufferedCharReader &reader, } return std::make_pair(Err::UNEXPECTED_END, res.str()); } - } } |