summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2019-12-20 13:03:42 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2019-12-20 13:03:42 +0000
commite2bd23ff10d7b0678178f002d78e17f29fa7a166 (patch)
tree170e014a7bf1df8013e3f87c00a4feb8bfd6e4bf
parentForward, not move (diff)
downloadlibjsonpp-e2bd23ff10d7b0678178f002d78e17f29fa7a166.tar.bz2
libjsonpp-e2bd23ff10d7b0678178f002d78e17f29fa7a166.tar.xz
libjsonpp-e2bd23ff10d7b0678178f002d78e17f29fa7a166.zip
Rename PushObject and PushArray to End...
-rw-r--r--libjsonpp/json.ll6
-rw-r--r--libjsonpp/jsonFlexLexer.cpp4
-rw-r--r--libjsonpp/jsonFlexLexer.h5
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;