Skip to content

Fix for escaped characters #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
warvair wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix for escaped characters #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c8739f6
Fix and test for escaped characters.
warvair May 30, 2015
bbdf8de
Revert "Fix and test for escaped characters."
warvair May 30, 2015
819d435
Fix and test for escaped characters
warvair May 30, 2015
54eee25
Merge branch 'master' of https://github.com/Zguy/Jzon.git
warvair Mar 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions Jzon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,14 +186,7 @@ namespace Jzon
{
detach();
data->type = type;
if (type == T_STRING)
{
data->valueStr = unescapeString(value);
}
else
{
data->valueStr = value;
}
data->valueStr = value;
}
}
void Node::set(const std::string &value)
Expand All @@ -202,7 +195,7 @@ namespace Jzon
{
detach();
data->type = T_STRING;
data->valueStr = unescapeString(value);
data->valueStr = value;
}
}
void Node::set(const char *value)
Expand All @@ -211,7 +204,7 @@ namespace Jzon
{
detach();
data->type = T_STRING;
data->valueStr = unescapeString(std::string(value));
data->valueStr = std::string(value);
}
}
#define SET_NUMBER \
Expand Down Expand Up @@ -514,6 +507,7 @@ namespace Jzon
void Writer::writeStream(const Node &node, std::ostream &stream) const
{
writeNode(node, 0, stream);
stream << newline;
}
void Writer::writeString(const Node &node, std::string &json) const
{
Expand Down Expand Up @@ -918,7 +912,7 @@ namespace Jzon
c1 = c2;
}

data.push(std::make_pair(Node::T_STRING, str));
data.push(std::make_pair(Node::T_STRING, unescapeString(str)));
}
bool Parser::interpretValue(const std::string &value, DataQueue &data)
{
Expand Down
18 changes: 18 additions & 0 deletions test/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,18 @@ int main(int argc, char **argv)
}

std::string filename(argv[1]);

if (filename == "escaped_chars.json")
{
Jzon::Node node = Jzon::object();
node.add("test_string", "bs:\\ fs:/ dq:\" nl:\n1 tb:\t2 bs:\b3 ff:\f4 cr:\r5");

// NOTE: if compiled as a Windows console app, \f is displayed as the Venus Symbol character
std::cout << node.get("test_string").toString() << std::endl;

Jzon::Writer writer(Jzon::NoFormat);
writer.writeFile(node, filename);
}

Jzon::Parser parser;

Expand All @@ -21,5 +33,11 @@ int main(int argc, char **argv)
return 1;
}

if (filename == "escaped_chars.json")
{
std::cout << node.get("test_string").toString() << std::endl;
system("pause");
}

return 0;
}