nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

Json now parses from slurped strings, not mmap

Browse Source 
mmap was a debatable choice in the first place, and is annoying under Windows,
so we may as well remove it.
This commit is contained in:
Danny Robson 2011-07-04 16:24:48 +10:00 committed by U-steve\danny
parent fb6f74487b
commit 7cba9b8496
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
json.cpp.rl
View File

@ -29,7 +29,6 @@
#include <algorithm> #include <algorithm>
#include <sstream> #include <sstream>
#include <sys/mman.h>
#include <string.h> #include <string.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -236,13 +235,14 @@ struct parse_context {
namespace json { namespace json {
json::node * json::node *
parse (const boost::filesystem::path &path) { parse (const boost::filesystem::path &path)
mapped_file file(path); { return parse ((const char *)slurp (path)); }
return parse ((const char *)file.data (),
(const char *)file.data () + file.size ());
}
json::node *
parse (const std::string &path)
{ return parse (path.c_str (), path.c_str () + path.size ()); }
node * node *
parse (const char *start, parse (const char *start,
const char *stop) { const char *stop) {

1
json.hpp
View File

@ -40,6 +40,7 @@ namespace json {
extern node* parse (const boost::filesystem::path &path); extern node* parse (const boost::filesystem::path &path);
extern node* parse (const char *start, const char *stop); extern node* parse (const char *start, const char *stop);
extern node* parse (const char *start); extern node* parse (const char *start);
extern node* parse (const std::string&);
/// Abstract base for all JSON values /// Abstract base for all JSON values
class node { class node {