diff --git a/scanner.h b/scanner.h index 48ba219..63a911b 100644 --- a/scanner.h +++ b/scanner.h @@ -45,7 +45,6 @@ namespace YAML void Invalidate(); int pos, line, column, flowLevel; - bool required; Token *pMapStart, *pKey; }; diff --git a/simplekey.cpp b/simplekey.cpp index 040c398..a5e6bc3 100644 --- a/simplekey.cpp +++ b/simplekey.cpp @@ -6,7 +6,7 @@ namespace YAML { Scanner::SimpleKey::SimpleKey(int pos_, int line_, int column_, int flowLevel_) - : pos(pos_), line(line_), column(column_), flowLevel(flowLevel_), required(false), pMapStart(0), pKey(0) + : pos(pos_), line(line_), column(column_), flowLevel(flowLevel_), pMapStart(0), pKey(0) { } @@ -20,9 +20,6 @@ namespace YAML void Scanner::SimpleKey::Invalidate() { - if(required) - throw ParserException(line, column, "required simple key not found"); - if(pMapStart) pMapStart->status = TS_INVALID; if(pKey) @@ -40,8 +37,6 @@ namespace YAML key.pMapStart = PushIndentTo(INPUT.column, false); if(key.pMapStart) key.pMapStart->status = TS_UNVERIFIED; -// else -// key.required = true; // TODO: is this correct? // then add the (now unverified) key key.pKey = new Token(TT_KEY, INPUT.line, INPUT.column); diff --git a/yaml-reader.vcproj b/yaml-reader.vcproj index 5239b09..b708279 100644 --- a/yaml-reader.vcproj +++ b/yaml-reader.vcproj @@ -329,6 +329,22 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > + + + + + + + +