diff options
| -rw-r--r-- | libjsonpp/json.ll | 6 | ||||
| -rw-r--r-- | libjsonpp/jsonFlexLexer.cpp | 4 | ||||
| -rw-r--r-- | libjsonpp/jsonFlexLexer.h | 5 |
3 files changed, 8 insertions, 7 deletions
diff --git a/libjsonpp/json.ll b/libjsonpp/json.ll index cae25e5..cef3576 100644 --- a/libjsonpp/json.ll +++ b/libjsonpp/json.ll @@ -94,18 +94,18 @@ text [^\\\"]* } <OBJECT_NEXT>{endobj} { - PushObject(); + EndObject(); yy_pop_state(); } <ARRAY_ITEM>{endarray} { - PushArray(); + EndArray(); yy_pop_state(); yy_pop_state(); } <ARRAY_NEXT>{endarray} { - PushArray(); + EndArray(); yy_pop_state(); } diff --git a/libjsonpp/jsonFlexLexer.cpp b/libjsonpp/jsonFlexLexer.cpp index 7c022c5..0964c1c 100644 --- a/libjsonpp/jsonFlexLexer.cpp +++ b/libjsonpp/jsonFlexLexer.cpp @@ -67,13 +67,13 @@ namespace json { } void - jsonFlexLexer::PushArray() + jsonFlexLexer::EndArray() { acceptValues.pop(); } void - jsonFlexLexer::PushObject() + jsonFlexLexer::EndObject() { acceptValues.pop(); } diff --git a/libjsonpp/jsonFlexLexer.h b/libjsonpp/jsonFlexLexer.h index eeefaba..43770d5 100644 --- a/libjsonpp/jsonFlexLexer.h +++ b/libjsonpp/jsonFlexLexer.h @@ -24,8 +24,9 @@ namespace json { void PushNumber(double); void PushNull(); void PushText(std::string &&); - void PushArray(); - void PushObject(); + + void EndArray(); + void EndObject(); private: std::string encodeBuf() const; |