Merge commit 'a4071034f6ad640ef91057fa3f45098c4933f444' as 'src/univalue'
This commit is contained in:
32
src/univalue/.gitignore
vendored
Normal file
32
src/univalue/.gitignore
vendored
Normal file
@@ -0,0 +1,32 @@
|
||||
.deps/
|
||||
INSTALL
|
||||
Makefile
|
||||
Makefile.in
|
||||
aclocal.m4
|
||||
autom4te.cache/
|
||||
compile
|
||||
config.log
|
||||
config.status
|
||||
config.guess
|
||||
config.sub
|
||||
configure
|
||||
depcomp
|
||||
install-sh
|
||||
missing
|
||||
stamp-h1
|
||||
univalue-config.h*
|
||||
test-driver
|
||||
libtool
|
||||
ltmain.sh
|
||||
test-suite.log
|
||||
|
||||
*.a
|
||||
*.la
|
||||
*.lo
|
||||
*.logs
|
||||
*.o
|
||||
*.pc
|
||||
*.trs
|
||||
|
||||
.dirstamp
|
||||
.libs
|
||||
52
src/univalue/.travis.yml
Normal file
52
src/univalue/.travis.yml
Normal file
@@ -0,0 +1,52 @@
|
||||
language: cpp
|
||||
|
||||
compiler:
|
||||
- clang
|
||||
- gcc
|
||||
|
||||
os:
|
||||
- linux
|
||||
- osx
|
||||
|
||||
sudo: false
|
||||
|
||||
env:
|
||||
global:
|
||||
- MAKEJOBS=-j3
|
||||
- RUN_TESTS=true
|
||||
- BASE_OUTDIR=$TRAVIS_BUILD_DIR/out
|
||||
|
||||
cache:
|
||||
apt: true
|
||||
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- pkg-config
|
||||
|
||||
before_script:
|
||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew uninstall libtool; brew install libtool; fi
|
||||
- if [ -n "$USE_SHELL" ]; then export CONFIG_SHELL="$USE_SHELL"; fi
|
||||
- test -n "$USE_SHELL" && eval '"$USE_SHELL" -c "./autogen.sh"' || ./autogen.sh
|
||||
|
||||
script:
|
||||
- if [ -n "$UNIVALUE_CONFIG" ]; then unset CC; unset CXX; fi
|
||||
- OUTDIR=$BASE_OUTDIR/$TRAVIS_PULL_REQUEST/$TRAVIS_JOB_NUMBER-$HOST
|
||||
- UNIVALUE_CONFIG_ALL="--prefix=$TRAVIS_BUILD_DIR/depends/$HOST --bindir=$OUTDIR/bin --libdir=$OUTDIR/lib"
|
||||
- ./configure --cache-file=config.cache $UNIVALUE_CONFIG_ALL $UNIVALUE_CONFIG || ( cat config.log && false)
|
||||
- make -s $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && make $GOAL ; false )
|
||||
- export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib
|
||||
- if [ "$RUN_TESTS" = "true" ]; then make $MAKEJOBS distcheck; fi
|
||||
|
||||
matrix:
|
||||
fast_finish: true
|
||||
include:
|
||||
- os: linux
|
||||
compiler: gcc
|
||||
env: UNIVALUE_CONFIG=--host=x86_64-w64-mingw32 RUN_TESTS=false
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- g++-mingw-w64-x86-64
|
||||
- gcc-mingw-w64-x86-64
|
||||
- binutils-mingw-w64-x86-64
|
||||
19
src/univalue/COPYING
Normal file
19
src/univalue/COPYING
Normal file
@@ -0,0 +1,19 @@
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
|
||||
109
src/univalue/Makefile.am
Normal file
109
src/univalue/Makefile.am
Normal file
@@ -0,0 +1,109 @@
|
||||
ACLOCAL_AMFLAGS = -I build-aux/m4
|
||||
.PHONY: gen
|
||||
.INTERMEDIATE: $(GENBIN)
|
||||
|
||||
include_HEADERS = include/univalue.h
|
||||
noinst_HEADERS = lib/univalue_escapes.h lib/univalue_utffilter.h
|
||||
|
||||
lib_LTLIBRARIES = libunivalue.la
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = pc/libunivalue.pc
|
||||
|
||||
libunivalue_la_SOURCES = \
|
||||
lib/univalue.cpp \
|
||||
lib/univalue_read.cpp \
|
||||
lib/univalue_write.cpp
|
||||
|
||||
libunivalue_la_LDFLAGS = \
|
||||
-version-info $(LIBUNIVALUE_CURRENT):$(LIBUNIVALUE_REVISION):$(LIBUNIVALUE_AGE) \
|
||||
-no-undefined
|
||||
libunivalue_la_CXXFLAGS = -I$(top_srcdir)/include
|
||||
|
||||
TESTS = test/unitester test/no_nul
|
||||
|
||||
GENBIN = gen/gen$(BUILD_EXEEXT)
|
||||
GEN_SRCS = gen/gen.cpp
|
||||
|
||||
$(GENBIN): $(GEN_SRCS)
|
||||
@echo Building $@
|
||||
$(AM_V_at)c++ -I$(top_srcdir)/include -o $@ $<
|
||||
|
||||
gen: lib/univalue_escapes.h $(GENBIN)
|
||||
@echo Updating $<
|
||||
$(AM_V_at)$(GENBIN) > lib/univalue_escapes.h
|
||||
|
||||
noinst_PROGRAMS = $(TESTS) test/test_json
|
||||
|
||||
TEST_DATA_DIR=test
|
||||
|
||||
test_unitester_SOURCES = test/unitester.cpp
|
||||
test_unitester_LDADD = libunivalue.la
|
||||
test_unitester_CXXFLAGS = -I$(top_srcdir)/include -DJSON_TEST_SRC=\"$(srcdir)/$(TEST_DATA_DIR)\"
|
||||
test_unitester_LDFLAGS = -static $(LIBTOOL_APP_LDFLAGS)
|
||||
|
||||
test_test_json_SOURCES = test/test_json.cpp
|
||||
test_test_json_LDADD = libunivalue.la
|
||||
test_test_json_CXXFLAGS = -I$(top_srcdir)/include
|
||||
test_test_json_LDFLAGS = -static $(LIBTOOL_APP_LDFLAGS)
|
||||
|
||||
test_no_nul_SOURCES = test/no_nul.cpp
|
||||
test_no_nul_LDADD = libunivalue.la
|
||||
test_no_nul_CXXFLAGS = -I$(top_srcdir)/include
|
||||
test_no_nul_LDFLAGS = -static $(LIBTOOL_APP_LDFLAGS)
|
||||
|
||||
TEST_FILES = \
|
||||
$(TEST_DATA_DIR)/fail10.json \
|
||||
$(TEST_DATA_DIR)/fail11.json \
|
||||
$(TEST_DATA_DIR)/fail12.json \
|
||||
$(TEST_DATA_DIR)/fail13.json \
|
||||
$(TEST_DATA_DIR)/fail14.json \
|
||||
$(TEST_DATA_DIR)/fail15.json \
|
||||
$(TEST_DATA_DIR)/fail16.json \
|
||||
$(TEST_DATA_DIR)/fail17.json \
|
||||
$(TEST_DATA_DIR)/fail18.json \
|
||||
$(TEST_DATA_DIR)/fail19.json \
|
||||
$(TEST_DATA_DIR)/fail1.json \
|
||||
$(TEST_DATA_DIR)/fail20.json \
|
||||
$(TEST_DATA_DIR)/fail21.json \
|
||||
$(TEST_DATA_DIR)/fail22.json \
|
||||
$(TEST_DATA_DIR)/fail23.json \
|
||||
$(TEST_DATA_DIR)/fail24.json \
|
||||
$(TEST_DATA_DIR)/fail25.json \
|
||||
$(TEST_DATA_DIR)/fail26.json \
|
||||
$(TEST_DATA_DIR)/fail27.json \
|
||||
$(TEST_DATA_DIR)/fail28.json \
|
||||
$(TEST_DATA_DIR)/fail29.json \
|
||||
$(TEST_DATA_DIR)/fail2.json \
|
||||
$(TEST_DATA_DIR)/fail30.json \
|
||||
$(TEST_DATA_DIR)/fail31.json \
|
||||
$(TEST_DATA_DIR)/fail32.json \
|
||||
$(TEST_DATA_DIR)/fail33.json \
|
||||
$(TEST_DATA_DIR)/fail34.json \
|
||||
$(TEST_DATA_DIR)/fail35.json \
|
||||
$(TEST_DATA_DIR)/fail36.json \
|
||||
$(TEST_DATA_DIR)/fail37.json \
|
||||
$(TEST_DATA_DIR)/fail38.json \
|
||||
$(TEST_DATA_DIR)/fail39.json \
|
||||
$(TEST_DATA_DIR)/fail40.json \
|
||||
$(TEST_DATA_DIR)/fail41.json \
|
||||
$(TEST_DATA_DIR)/fail42.json \
|
||||
$(TEST_DATA_DIR)/fail3.json \
|
||||
$(TEST_DATA_DIR)/fail4.json \
|
||||
$(TEST_DATA_DIR)/fail5.json \
|
||||
$(TEST_DATA_DIR)/fail6.json \
|
||||
$(TEST_DATA_DIR)/fail7.json \
|
||||
$(TEST_DATA_DIR)/fail8.json \
|
||||
$(TEST_DATA_DIR)/fail9.json \
|
||||
$(TEST_DATA_DIR)/pass1.json \
|
||||
$(TEST_DATA_DIR)/pass2.json \
|
||||
$(TEST_DATA_DIR)/pass3.json \
|
||||
$(TEST_DATA_DIR)/round1.json \
|
||||
$(TEST_DATA_DIR)/round2.json \
|
||||
$(TEST_DATA_DIR)/round3.json \
|
||||
$(TEST_DATA_DIR)/round4.json \
|
||||
$(TEST_DATA_DIR)/round5.json \
|
||||
$(TEST_DATA_DIR)/round6.json \
|
||||
$(TEST_DATA_DIR)/round7.json
|
||||
|
||||
EXTRA_DIST=$(TEST_FILES) $(GEN_SRCS)
|
||||
7
src/univalue/README
Normal file
7
src/univalue/README
Normal file
@@ -0,0 +1,7 @@
|
||||
|
||||
UniValue
|
||||
|
||||
A universal value object, with JSON encoding (output) and decoding (input).
|
||||
|
||||
Built as a single dynamic RAII C++ object class, and no templates.
|
||||
|
||||
10
src/univalue/TODO
Normal file
10
src/univalue/TODO
Normal file
@@ -0,0 +1,10 @@
|
||||
|
||||
Rearrange tree for easier 'git subtree' style use
|
||||
|
||||
Move towards C++11 etc.
|
||||
|
||||
Namespace support - must come up with useful shorthand, avoiding
|
||||
long Univalue::Univalue::Univalue usages forced upon library users.
|
||||
|
||||
Improve test suite
|
||||
|
||||
9
src/univalue/autogen.sh
Executable file
9
src/univalue/autogen.sh
Executable file
@@ -0,0 +1,9 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
srcdir="$(dirname $0)"
|
||||
cd "$srcdir"
|
||||
if [ -z ${LIBTOOLIZE} ] && GLIBTOOLIZE="`which glibtoolize 2>/dev/null`"; then
|
||||
LIBTOOLIZE="${GLIBTOOLIZE}"
|
||||
export LIBTOOLIZE
|
||||
fi
|
||||
autoreconf --install --force
|
||||
1
src/univalue/build-aux/m4/.gitignore
vendored
Normal file
1
src/univalue/build-aux/m4/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
||||
/*.m4
|
||||
69
src/univalue/configure.ac
Normal file
69
src/univalue/configure.ac
Normal file
@@ -0,0 +1,69 @@
|
||||
m4_define([libunivalue_major_version], [1])
|
||||
m4_define([libunivalue_minor_version], [1])
|
||||
m4_define([libunivalue_micro_version], [3])
|
||||
m4_define([libunivalue_interface_age], [3])
|
||||
# If you need a modifier for the version number.
|
||||
# Normally empty, but can be used to make "fixup" releases.
|
||||
m4_define([libunivalue_extraversion], [])
|
||||
|
||||
dnl libtool versioning from libunivalue
|
||||
m4_define([libunivalue_current], [m4_eval(100 * libunivalue_minor_version + libunivalue_micro_version - libunivalue_interface_age)])
|
||||
m4_define([libunivalue_binary_age], [m4_eval(100 * libunivalue_minor_version + libunivalue_micro_version)])
|
||||
m4_define([libunivalue_revision], [libunivalue_interface_age])
|
||||
m4_define([libunivalue_age], [m4_eval(libunivalue_binary_age - libunivalue_interface_age)])
|
||||
m4_define([libunivalue_version], [libunivalue_major_version().libunivalue_minor_version().libunivalue_micro_version()libunivalue_extraversion()])
|
||||
|
||||
|
||||
AC_INIT([univalue], [1.0.3],
|
||||
[http://github.com/jgarzik/univalue/])
|
||||
|
||||
dnl make the compilation flags quiet unless V=1 is used
|
||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
||||
|
||||
AC_PREREQ(2.60)
|
||||
AC_CONFIG_SRCDIR([lib/univalue.cpp])
|
||||
AC_CONFIG_AUX_DIR([build-aux])
|
||||
AC_CONFIG_MACRO_DIR([build-aux/m4])
|
||||
AC_CONFIG_HEADERS([univalue-config.h])
|
||||
AM_INIT_AUTOMAKE([subdir-objects foreign])
|
||||
|
||||
LIBUNIVALUE_MAJOR_VERSION=libunivalue_major_version
|
||||
LIBUNIVALUE_MINOR_VERSION=libunivalue_minor_version
|
||||
LIBUNIVALUE_MICRO_VERSION=libunivalue_micro_version
|
||||
LIBUNIVALUE_INTERFACE_AGE=libunivalue_interface_age
|
||||
|
||||
# ABI version
|
||||
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
|
||||
LIBUNIVALUE_CURRENT=libunivalue_current
|
||||
LIBUNIVALUE_REVISION=libunivalue_revision
|
||||
LIBUNIVALUE_AGE=libunivalue_age
|
||||
|
||||
AC_SUBST(LIBUNIVALUE_CURRENT)
|
||||
AC_SUBST(LIBUNIVALUE_REVISION)
|
||||
AC_SUBST(LIBUNIVALUE_AGE)
|
||||
|
||||
LT_INIT
|
||||
LT_LANG([C++])
|
||||
|
||||
case $host in
|
||||
*mingw*)
|
||||
LIBTOOL_APP_LDFLAGS="$LIBTOOL_APP_LDFLAGS -all-static"
|
||||
;;
|
||||
esac
|
||||
|
||||
BUILD_EXEEXT=
|
||||
case $build in
|
||||
*mingw*)
|
||||
BUILD_EXEEXT=".exe"
|
||||
;;
|
||||
esac
|
||||
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
pc/libunivalue.pc
|
||||
pc/libunivalue-uninstalled.pc])
|
||||
|
||||
AC_SUBST(LIBTOOL_APP_LDFLAGS)
|
||||
AC_SUBST(BUILD_EXEEXT)
|
||||
AC_OUTPUT
|
||||
|
||||
84
src/univalue/gen/gen.cpp
Normal file
84
src/univalue/gen/gen.cpp
Normal file
@@ -0,0 +1,84 @@
|
||||
// Copyright 2014 BitPay Inc.
|
||||
// Distributed under the MIT software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
//
|
||||
// To re-create univalue_escapes.h:
|
||||
// $ g++ -o gen gen.cpp
|
||||
// $ ./gen > univalue_escapes.h
|
||||
//
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include "univalue.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
static bool initEscapes;
|
||||
static std::string escapes[256];
|
||||
|
||||
static void initJsonEscape()
|
||||
{
|
||||
// Escape all lower control characters (some get overridden with smaller sequences below)
|
||||
for (int ch=0x00; ch<0x20; ++ch) {
|
||||
char tmpbuf[20];
|
||||
snprintf(tmpbuf, sizeof(tmpbuf), "\\u%04x", ch);
|
||||
escapes[ch] = std::string(tmpbuf);
|
||||
}
|
||||
|
||||
escapes[(int)'"'] = "\\\"";
|
||||
escapes[(int)'\\'] = "\\\\";
|
||||
escapes[(int)'\b'] = "\\b";
|
||||
escapes[(int)'\f'] = "\\f";
|
||||
escapes[(int)'\n'] = "\\n";
|
||||
escapes[(int)'\r'] = "\\r";
|
||||
escapes[(int)'\t'] = "\\t";
|
||||
escapes[(int)'\x7f'] = "\\u007f"; // U+007F DELETE
|
||||
|
||||
initEscapes = true;
|
||||
}
|
||||
|
||||
static void outputEscape()
|
||||
{
|
||||
printf( "// Automatically generated file. Do not modify.\n"
|
||||
"#ifndef BITCOIN_UNIVALUE_UNIVALUE_ESCAPES_H\n"
|
||||
"#define BITCOIN_UNIVALUE_UNIVALUE_ESCAPES_H\n"
|
||||
"static const char *escapes[256] = {\n");
|
||||
|
||||
for (unsigned int i = 0; i < 256; i++) {
|
||||
if (escapes[i].empty()) {
|
||||
printf("\tNULL,\n");
|
||||
} else {
|
||||
printf("\t\"");
|
||||
|
||||
unsigned int si;
|
||||
for (si = 0; si < escapes[i].size(); si++) {
|
||||
char ch = escapes[i][si];
|
||||
switch (ch) {
|
||||
case '"':
|
||||
printf("\\\"");
|
||||
break;
|
||||
case '\\':
|
||||
printf("\\\\");
|
||||
break;
|
||||
default:
|
||||
printf("%c", escapes[i][si]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
printf("\",\n");
|
||||
}
|
||||
}
|
||||
|
||||
printf( "};\n"
|
||||
"#endif // BITCOIN_UNIVALUE_UNIVALUE_ESCAPES_H\n");
|
||||
}
|
||||
|
||||
int main (int argc, char *argv[])
|
||||
{
|
||||
initJsonEscape();
|
||||
outputEscape();
|
||||
return 0;
|
||||
}
|
||||
|
||||
296
src/univalue/include/univalue.h
Normal file
296
src/univalue/include/univalue.h
Normal file
@@ -0,0 +1,296 @@
|
||||
// Copyright 2014 BitPay Inc.
|
||||
// Copyright 2015 Bitcoin Core Developers
|
||||
// Distributed under the MIT software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#ifndef __UNIVALUE_H__
|
||||
#define __UNIVALUE_H__
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <map>
|
||||
#include <cassert>
|
||||
|
||||
#include <sstream> // .get_int64()
|
||||
#include <utility> // std::pair
|
||||
|
||||
class UniValue {
|
||||
public:
|
||||
enum VType { VNULL, VOBJ, VARR, VSTR, VNUM, VBOOL, };
|
||||
|
||||
UniValue() { typ = VNULL; }
|
||||
UniValue(UniValue::VType initialType, const std::string& initialStr = "") {
|
||||
typ = initialType;
|
||||
val = initialStr;
|
||||
}
|
||||
UniValue(uint64_t val_) {
|
||||
setInt(val_);
|
||||
}
|
||||
UniValue(int64_t val_) {
|
||||
setInt(val_);
|
||||
}
|
||||
UniValue(bool val_) {
|
||||
setBool(val_);
|
||||
}
|
||||
UniValue(int val_) {
|
||||
setInt(val_);
|
||||
}
|
||||
UniValue(double val_) {
|
||||
setFloat(val_);
|
||||
}
|
||||
UniValue(const std::string& val_) {
|
||||
setStr(val_);
|
||||
}
|
||||
UniValue(const char *val_) {
|
||||
std::string s(val_);
|
||||
setStr(s);
|
||||
}
|
||||
~UniValue() {}
|
||||
|
||||
void clear();
|
||||
|
||||
bool setNull();
|
||||
bool setBool(bool val);
|
||||
bool setNumStr(const std::string& val);
|
||||
bool setInt(uint64_t val);
|
||||
bool setInt(int64_t val);
|
||||
bool setInt(int val_) { return setInt((int64_t)val_); }
|
||||
bool setFloat(double val);
|
||||
bool setStr(const std::string& val);
|
||||
bool setArray();
|
||||
bool setObject();
|
||||
|
||||
enum VType getType() const { return typ; }
|
||||
const std::string& getValStr() const { return val; }
|
||||
bool empty() const { return (values.size() == 0); }
|
||||
|
||||
size_t size() const { return values.size(); }
|
||||
|
||||
bool getBool() const { return isTrue(); }
|
||||
bool checkObject(const std::map<std::string,UniValue::VType>& memberTypes);
|
||||
const UniValue& operator[](const std::string& key) const;
|
||||
const UniValue& operator[](size_t index) const;
|
||||
bool exists(const std::string& key) const { size_t i; return findKey(key, i); }
|
||||
|
||||
bool isNull() const { return (typ == VNULL); }
|
||||
bool isTrue() const { return (typ == VBOOL) && (val == "1"); }
|
||||
bool isFalse() const { return (typ == VBOOL) && (val != "1"); }
|
||||
bool isBool() const { return (typ == VBOOL); }
|
||||
bool isStr() const { return (typ == VSTR); }
|
||||
bool isNum() const { return (typ == VNUM); }
|
||||
bool isArray() const { return (typ == VARR); }
|
||||
bool isObject() const { return (typ == VOBJ); }
|
||||
|
||||
bool push_back(const UniValue& val);
|
||||
bool push_back(const std::string& val_) {
|
||||
UniValue tmpVal(VSTR, val_);
|
||||
return push_back(tmpVal);
|
||||
}
|
||||
bool push_back(const char *val_) {
|
||||
std::string s(val_);
|
||||
return push_back(s);
|
||||
}
|
||||
bool push_back(uint64_t val_) {
|
||||
UniValue tmpVal(val_);
|
||||
return push_back(tmpVal);
|
||||
}
|
||||
bool push_back(int64_t val_) {
|
||||
UniValue tmpVal(val_);
|
||||
return push_back(tmpVal);
|
||||
}
|
||||
bool push_back(int val_) {
|
||||
UniValue tmpVal(val_);
|
||||
return push_back(tmpVal);
|
||||
}
|
||||
bool push_backV(const std::vector<UniValue>& vec);
|
||||
|
||||
bool pushKV(const std::string& key, const UniValue& val);
|
||||
bool pushKV(const std::string& key, const std::string& val_) {
|
||||
UniValue tmpVal(VSTR, val_);
|
||||
return pushKV(key, tmpVal);
|
||||
}
|
||||
bool pushKV(const std::string& key, const char *val_) {
|
||||
std::string _val(val_);
|
||||
return pushKV(key, _val);
|
||||
}
|
||||
bool pushKV(const std::string& key, int64_t val_) {
|
||||
UniValue tmpVal(val_);
|
||||
return pushKV(key, tmpVal);
|
||||
}
|
||||
bool pushKV(const std::string& key, uint64_t val_) {
|
||||
UniValue tmpVal(val_);
|
||||
return pushKV(key, tmpVal);
|
||||
}
|
||||
bool pushKV(const std::string& key, int val_) {
|
||||
UniValue tmpVal((int64_t)val_);
|
||||
return pushKV(key, tmpVal);
|
||||
}
|
||||
bool pushKV(const std::string& key, double val_) {
|
||||
UniValue tmpVal(val_);
|
||||
return pushKV(key, tmpVal);
|
||||
}
|
||||
bool pushKVs(const UniValue& obj);
|
||||
|
||||
std::string write(unsigned int prettyIndent = 0,
|
||||
unsigned int indentLevel = 0) const;
|
||||
|
||||
bool read(const char *raw, size_t len);
|
||||
bool read(const char *raw);
|
||||
bool read(const std::string& rawStr) {
|
||||
return read(rawStr.data(), rawStr.size());
|
||||
}
|
||||
|
||||
private:
|
||||
UniValue::VType typ;
|
||||
std::string val; // numbers are stored as C++ strings
|
||||
std::vector<std::string> keys;
|
||||
std::vector<UniValue> values;
|
||||
|
||||
bool findKey(const std::string& key, size_t& ret) const;
|
||||
void writeArray(unsigned int prettyIndent, unsigned int indentLevel, std::string& s) const;
|
||||
void writeObject(unsigned int prettyIndent, unsigned int indentLevel, std::string& s) const;
|
||||
|
||||
public:
|
||||
// Strict type-specific getters, these throw std::runtime_error if the
|
||||
// value is of unexpected type
|
||||
const std::vector<std::string>& getKeys() const;
|
||||
const std::vector<UniValue>& getValues() const;
|
||||
bool get_bool() const;
|
||||
const std::string& get_str() const;
|
||||
int get_int() const;
|
||||
int64_t get_int64() const;
|
||||
double get_real() const;
|
||||
const UniValue& get_obj() const;
|
||||
const UniValue& get_array() const;
|
||||
|
||||
enum VType type() const { return getType(); }
|
||||
bool push_back(std::pair<std::string,UniValue> pear) {
|
||||
return pushKV(pear.first, pear.second);
|
||||
}
|
||||
friend const UniValue& find_value( const UniValue& obj, const std::string& name);
|
||||
};
|
||||
|
||||
//
|
||||
// The following were added for compatibility with json_spirit.
|
||||
// Most duplicate other methods, and should be removed.
|
||||
//
|
||||
static inline std::pair<std::string,UniValue> Pair(const char *cKey, const char *cVal)
|
||||
{
|
||||
std::string key(cKey);
|
||||
UniValue uVal(cVal);
|
||||
return std::make_pair(key, uVal);
|
||||
}
|
||||
|
||||
static inline std::pair<std::string,UniValue> Pair(const char *cKey, std::string strVal)
|
||||
{
|
||||
std::string key(cKey);
|
||||
UniValue uVal(strVal);
|
||||
return std::make_pair(key, uVal);
|
||||
}
|
||||
|
||||
static inline std::pair<std::string,UniValue> Pair(const char *cKey, uint64_t u64Val)
|
||||
{
|
||||
std::string key(cKey);
|
||||
UniValue uVal(u64Val);
|
||||
return std::make_pair(key, uVal);
|
||||
}
|
||||
|
||||
static inline std::pair<std::string,UniValue> Pair(const char *cKey, int64_t i64Val)
|
||||
{
|
||||
std::string key(cKey);
|
||||
UniValue uVal(i64Val);
|
||||
return std::make_pair(key, uVal);
|
||||
}
|
||||
|
||||
static inline std::pair<std::string,UniValue> Pair(const char *cKey, bool iVal)
|
||||
{
|
||||
std::string key(cKey);
|
||||
UniValue uVal(iVal);
|
||||
return std::make_pair(key, uVal);
|
||||
}
|
||||
|
||||
static inline std::pair<std::string,UniValue> Pair(const char *cKey, int iVal)
|
||||
{
|
||||
std::string key(cKey);
|
||||
UniValue uVal(iVal);
|
||||
return std::make_pair(key, uVal);
|
||||
}
|
||||
|
||||
static inline std::pair<std::string,UniValue> Pair(const char *cKey, double dVal)
|
||||
{
|
||||
std::string key(cKey);
|
||||
UniValue uVal(dVal);
|
||||
return std::make_pair(key, uVal);
|
||||
}
|
||||
|
||||
static inline std::pair<std::string,UniValue> Pair(const char *cKey, const UniValue& uVal)
|
||||
{
|
||||
std::string key(cKey);
|
||||
return std::make_pair(key, uVal);
|
||||
}
|
||||
|
||||
static inline std::pair<std::string,UniValue> Pair(std::string key, const UniValue& uVal)
|
||||
{
|
||||
return std::make_pair(key, uVal);
|
||||
}
|
||||
|
||||
enum jtokentype {
|
||||
JTOK_ERR = -1,
|
||||
JTOK_NONE = 0, // eof
|
||||
JTOK_OBJ_OPEN,
|
||||
JTOK_OBJ_CLOSE,
|
||||
JTOK_ARR_OPEN,
|
||||
JTOK_ARR_CLOSE,
|
||||
JTOK_COLON,
|
||||
JTOK_COMMA,
|
||||
JTOK_KW_NULL,
|
||||
JTOK_KW_TRUE,
|
||||
JTOK_KW_FALSE,
|
||||
JTOK_NUMBER,
|
||||
JTOK_STRING,
|
||||
};
|
||||
|
||||
extern enum jtokentype getJsonToken(std::string& tokenVal,
|
||||
unsigned int& consumed, const char *raw, const char *end);
|
||||
extern const char *uvTypeName(UniValue::VType t);
|
||||
|
||||
static inline bool jsonTokenIsValue(enum jtokentype jtt)
|
||||
{
|
||||
switch (jtt) {
|
||||
case JTOK_KW_NULL:
|
||||
case JTOK_KW_TRUE:
|
||||
case JTOK_KW_FALSE:
|
||||
case JTOK_NUMBER:
|
||||
case JTOK_STRING:
|
||||
return true;
|
||||
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
|
||||
// not reached
|
||||
}
|
||||
|
||||
static inline bool json_isspace(int ch)
|
||||
{
|
||||
switch (ch) {
|
||||
case 0x20:
|
||||
case 0x09:
|
||||
case 0x0a:
|
||||
case 0x0d:
|
||||
return true;
|
||||
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
|
||||
// not reached
|
||||
}
|
||||
|
||||
extern const UniValue NullUniValue;
|
||||
|
||||
const UniValue& find_value( const UniValue& obj, const std::string& name);
|
||||
|
||||
#endif // __UNIVALUE_H__
|
||||
2
src/univalue/lib/.gitignore
vendored
Normal file
2
src/univalue/lib/.gitignore
vendored
Normal file
@@ -0,0 +1,2 @@
|
||||
gen
|
||||
.libs
|
||||
359
src/univalue/lib/univalue.cpp
Normal file
359
src/univalue/lib/univalue.cpp
Normal file
@@ -0,0 +1,359 @@
|
||||
// Copyright 2014 BitPay Inc.
|
||||
// Copyright 2015 Bitcoin Core Developers
|
||||
// Distributed under the MIT software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#include <stdint.h>
|
||||
#include <errno.h>
|
||||
#include <iomanip>
|
||||
#include <limits>
|
||||
#include <sstream>
|
||||
#include <stdexcept>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "univalue.h"
|
||||
|
||||
namespace
|
||||
{
|
||||
static bool ParsePrechecks(const std::string& str)
|
||||
{
|
||||
if (str.empty()) // No empty string allowed
|
||||
return false;
|
||||
if (str.size() >= 1 && (json_isspace(str[0]) || json_isspace(str[str.size()-1]))) // No padding allowed
|
||||
return false;
|
||||
if (str.size() != strlen(str.c_str())) // No embedded NUL characters allowed
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ParseInt32(const std::string& str, int32_t *out)
|
||||
{
|
||||
if (!ParsePrechecks(str))
|
||||
return false;
|
||||
char *endp = NULL;
|
||||
errno = 0; // strtol will not set errno if valid
|
||||
long int n = strtol(str.c_str(), &endp, 10);
|
||||
if(out) *out = (int32_t)n;
|
||||
// Note that strtol returns a *long int*, so even if strtol doesn't report a over/underflow
|
||||
// we still have to check that the returned value is within the range of an *int32_t*. On 64-bit
|
||||
// platforms the size of these types may be different.
|
||||
return endp && *endp == 0 && !errno &&
|
||||
n >= std::numeric_limits<int32_t>::min() &&
|
||||
n <= std::numeric_limits<int32_t>::max();
|
||||
}
|
||||
|
||||
bool ParseInt64(const std::string& str, int64_t *out)
|
||||
{
|
||||
if (!ParsePrechecks(str))
|
||||
return false;
|
||||
char *endp = NULL;
|
||||
errno = 0; // strtoll will not set errno if valid
|
||||
long long int n = strtoll(str.c_str(), &endp, 10);
|
||||
if(out) *out = (int64_t)n;
|
||||
// Note that strtoll returns a *long long int*, so even if strtol doesn't report a over/underflow
|
||||
// we still have to check that the returned value is within the range of an *int64_t*.
|
||||
return endp && *endp == 0 && !errno &&
|
||||
n >= std::numeric_limits<int64_t>::min() &&
|
||||
n <= std::numeric_limits<int64_t>::max();
|
||||
}
|
||||
|
||||
bool ParseDouble(const std::string& str, double *out)
|
||||
{
|
||||
if (!ParsePrechecks(str))
|
||||
return false;
|
||||
if (str.size() >= 2 && str[0] == '0' && str[1] == 'x') // No hexadecimal floats allowed
|
||||
return false;
|
||||
std::istringstream text(str);
|
||||
text.imbue(std::locale::classic());
|
||||
double result;
|
||||
text >> result;
|
||||
if(out) *out = result;
|
||||
return text.eof() && !text.fail();
|
||||
}
|
||||
}
|
||||
|
||||
using namespace std;
|
||||
|
||||
const UniValue NullUniValue;
|
||||
|
||||
void UniValue::clear()
|
||||
{
|
||||
typ = VNULL;
|
||||
val.clear();
|
||||
keys.clear();
|
||||
values.clear();
|
||||
}
|
||||
|
||||
bool UniValue::setNull()
|
||||
{
|
||||
clear();
|
||||
return true;
|
||||
}
|
||||
|
||||
bool UniValue::setBool(bool val_)
|
||||
{
|
||||
clear();
|
||||
typ = VBOOL;
|
||||
if (val_)
|
||||
val = "1";
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool validNumStr(const string& s)
|
||||
{
|
||||
string tokenVal;
|
||||
unsigned int consumed;
|
||||
enum jtokentype tt = getJsonToken(tokenVal, consumed, s.data(), s.data() + s.size());
|
||||
return (tt == JTOK_NUMBER);
|
||||
}
|
||||
|
||||
bool UniValue::setNumStr(const string& val_)
|
||||
{
|
||||
if (!validNumStr(val_))
|
||||
return false;
|
||||
|
||||
clear();
|
||||
typ = VNUM;
|
||||
val = val_;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool UniValue::setInt(uint64_t val_)
|
||||
{
|
||||
ostringstream oss;
|
||||
|
||||
oss << val_;
|
||||
|
||||
return setNumStr(oss.str());
|
||||
}
|
||||
|
||||
bool UniValue::setInt(int64_t val_)
|
||||
{
|
||||
ostringstream oss;
|
||||
|
||||
oss << val_;
|
||||
|
||||
return setNumStr(oss.str());
|
||||
}
|
||||
|
||||
bool UniValue::setFloat(double val_)
|
||||
{
|
||||
ostringstream oss;
|
||||
|
||||
oss << std::setprecision(16) << val_;
|
||||
|
||||
bool ret = setNumStr(oss.str());
|
||||
typ = VNUM;
|
||||
return ret;
|
||||
}
|
||||
|
||||
bool UniValue::setStr(const string& val_)
|
||||
{
|
||||
clear();
|
||||
typ = VSTR;
|
||||
val = val_;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool UniValue::setArray()
|
||||
{
|
||||
clear();
|
||||
typ = VARR;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool UniValue::setObject()
|
||||
{
|
||||
clear();
|
||||
typ = VOBJ;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool UniValue::push_back(const UniValue& val_)
|
||||
{
|
||||
if (typ != VARR)
|
||||
return false;
|
||||
|
||||
values.push_back(val_);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool UniValue::push_backV(const std::vector<UniValue>& vec)
|
||||
{
|
||||
if (typ != VARR)
|
||||
return false;
|
||||
|
||||
values.insert(values.end(), vec.begin(), vec.end());
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool UniValue::pushKV(const std::string& key, const UniValue& val_)
|
||||
{
|
||||
if (typ != VOBJ)
|
||||
return false;
|
||||
|
||||
keys.push_back(key);
|
||||
values.push_back(val_);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool UniValue::pushKVs(const UniValue& obj)
|
||||
{
|
||||
if (typ != VOBJ || obj.typ != VOBJ)
|
||||
return false;
|
||||
|
||||
for (unsigned int i = 0; i < obj.keys.size(); i++) {
|
||||
keys.push_back(obj.keys[i]);
|
||||
values.push_back(obj.values.at(i));
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool UniValue::findKey(const std::string& key, size_t& ret) const
|
||||
{
|
||||
for (size_t i = 0; i < keys.size(); i++) {
|
||||
if (keys[i] == key) {
|
||||
ret = i;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
bool UniValue::checkObject(const std::map<std::string,UniValue::VType>& t)
|
||||
{
|
||||
for (std::map<std::string,UniValue::VType>::const_iterator it = t.begin();
|
||||
it != t.end(); ++it) {
|
||||
size_t idx;
|
||||
if (!findKey(it->first, idx))
|
||||
return false;
|
||||
|
||||
if (values.at(idx).getType() != it->second)
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
const UniValue& UniValue::operator[](const std::string& key) const
|
||||
{
|
||||
if (typ != VOBJ)
|
||||
return NullUniValue;
|
||||
|
||||
size_t index;
|
||||
if (!findKey(key, index))
|
||||
return NullUniValue;
|
||||
|
||||
return values.at(index);
|
||||
}
|
||||
|
||||
const UniValue& UniValue::operator[](size_t index) const
|
||||
{
|
||||
if (typ != VOBJ && typ != VARR)
|
||||
return NullUniValue;
|
||||
if (index >= values.size())
|
||||
return NullUniValue;
|
||||
|
||||
return values.at(index);
|
||||
}
|
||||
|
||||
const char *uvTypeName(UniValue::VType t)
|
||||
{
|
||||
switch (t) {
|
||||
case UniValue::VNULL: return "null";
|
||||
case UniValue::VBOOL: return "bool";
|
||||
case UniValue::VOBJ: return "object";
|
||||
case UniValue::VARR: return "array";
|
||||
case UniValue::VSTR: return "string";
|
||||
case UniValue::VNUM: return "number";
|
||||
}
|
||||
|
||||
// not reached
|
||||
return NULL;
|
||||
}
|
||||
|
||||
const UniValue& find_value(const UniValue& obj, const std::string& name)
|
||||
{
|
||||
for (unsigned int i = 0; i < obj.keys.size(); i++)
|
||||
if (obj.keys[i] == name)
|
||||
return obj.values.at(i);
|
||||
|
||||
return NullUniValue;
|
||||
}
|
||||
|
||||
const std::vector<std::string>& UniValue::getKeys() const
|
||||
{
|
||||
if (typ != VOBJ)
|
||||
throw std::runtime_error("JSON value is not an object as expected");
|
||||
return keys;
|
||||
}
|
||||
|
||||
const std::vector<UniValue>& UniValue::getValues() const
|
||||
{
|
||||
if (typ != VOBJ && typ != VARR)
|
||||
throw std::runtime_error("JSON value is not an object or array as expected");
|
||||
return values;
|
||||
}
|
||||
|
||||
bool UniValue::get_bool() const
|
||||
{
|
||||
if (typ != VBOOL)
|
||||
throw std::runtime_error("JSON value is not a boolean as expected");
|
||||
return getBool();
|
||||
}
|
||||
|
||||
const std::string& UniValue::get_str() const
|
||||
{
|
||||
if (typ != VSTR)
|
||||
throw std::runtime_error("JSON value is not a string as expected");
|
||||
return getValStr();
|
||||
}
|
||||
|
||||
int UniValue::get_int() const
|
||||
{
|
||||
if (typ != VNUM)
|
||||
throw std::runtime_error("JSON value is not an integer as expected");
|
||||
int32_t retval;
|
||||
if (!ParseInt32(getValStr(), &retval))
|
||||
throw std::runtime_error("JSON integer out of range");
|
||||
return retval;
|
||||
}
|
||||
|
||||
int64_t UniValue::get_int64() const
|
||||
{
|
||||
if (typ != VNUM)
|
||||
throw std::runtime_error("JSON value is not an integer as expected");
|
||||
int64_t retval;
|
||||
if (!ParseInt64(getValStr(), &retval))
|
||||
throw std::runtime_error("JSON integer out of range");
|
||||
return retval;
|
||||
}
|
||||
|
||||
double UniValue::get_real() const
|
||||
{
|
||||
if (typ != VNUM)
|
||||
throw std::runtime_error("JSON value is not a number as expected");
|
||||
double retval;
|
||||
if (!ParseDouble(getValStr(), &retval))
|
||||
throw std::runtime_error("JSON double out of range");
|
||||
return retval;
|
||||
}
|
||||
|
||||
const UniValue& UniValue::get_obj() const
|
||||
{
|
||||
if (typ != VOBJ)
|
||||
throw std::runtime_error("JSON value is not an object as expected");
|
||||
return *this;
|
||||
}
|
||||
|
||||
const UniValue& UniValue::get_array() const
|
||||
{
|
||||
if (typ != VARR)
|
||||
throw std::runtime_error("JSON value is not an array as expected");
|
||||
return *this;
|
||||
}
|
||||
|
||||
262
src/univalue/lib/univalue_escapes.h
Normal file
262
src/univalue/lib/univalue_escapes.h
Normal file
@@ -0,0 +1,262 @@
|
||||
// Automatically generated file. Do not modify.
|
||||
#ifndef BITCOIN_UNIVALUE_UNIVALUE_ESCAPES_H
|
||||
#define BITCOIN_UNIVALUE_UNIVALUE_ESCAPES_H
|
||||
static const char *escapes[256] = {
|
||||
"\\u0000",
|
||||
"\\u0001",
|
||||
"\\u0002",
|
||||
"\\u0003",
|
||||
"\\u0004",
|
||||
"\\u0005",
|
||||
"\\u0006",
|
||||
"\\u0007",
|
||||
"\\b",
|
||||
"\\t",
|
||||
"\\n",
|
||||
"\\u000b",
|
||||
"\\f",
|
||||
"\\r",
|
||||
"\\u000e",
|
||||
"\\u000f",
|
||||
"\\u0010",
|
||||
"\\u0011",
|
||||
"\\u0012",
|
||||
"\\u0013",
|
||||
"\\u0014",
|
||||
"\\u0015",
|
||||
"\\u0016",
|
||||
"\\u0017",
|
||||
"\\u0018",
|
||||
"\\u0019",
|
||||
"\\u001a",
|
||||
"\\u001b",
|
||||
"\\u001c",
|
||||
"\\u001d",
|
||||
"\\u001e",
|
||||
"\\u001f",
|
||||
NULL,
|
||||
NULL,
|
||||
"\\\"",
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
"\\\\",
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
"\\u007f",
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
};
|
||||
#endif // BITCOIN_UNIVALUE_UNIVALUE_ESCAPES_H
|
||||
454
src/univalue/lib/univalue_read.cpp
Normal file
454
src/univalue/lib/univalue_read.cpp
Normal file
@@ -0,0 +1,454 @@
|
||||
// Copyright 2014 BitPay Inc.
|
||||
// Distributed under the MIT software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#include <string.h>
|
||||
#include <vector>
|
||||
#include <stdio.h>
|
||||
#include "univalue.h"
|
||||
#include "univalue_utffilter.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
static bool json_isdigit(int ch)
|
||||
{
|
||||
return ((ch >= '0') && (ch <= '9'));
|
||||
}
|
||||
|
||||
// convert hexadecimal string to unsigned integer
|
||||
static const char *hatoui(const char *first, const char *last,
|
||||
unsigned int& out)
|
||||
{
|
||||
unsigned int result = 0;
|
||||
for (; first != last; ++first)
|
||||
{
|
||||
int digit;
|
||||
if (json_isdigit(*first))
|
||||
digit = *first - '0';
|
||||
|
||||
else if (*first >= 'a' && *first <= 'f')
|
||||
digit = *first - 'a' + 10;
|
||||
|
||||
else if (*first >= 'A' && *first <= 'F')
|
||||
digit = *first - 'A' + 10;
|
||||
|
||||
else
|
||||
break;
|
||||
|
||||
result = 16 * result + digit;
|
||||
}
|
||||
out = result;
|
||||
|
||||
return first;
|
||||
}
|
||||
|
||||
enum jtokentype getJsonToken(string& tokenVal, unsigned int& consumed,
|
||||
const char *raw, const char *end)
|
||||
{
|
||||
tokenVal.clear();
|
||||
consumed = 0;
|
||||
|
||||
const char *rawStart = raw;
|
||||
|
||||
while (raw < end && (json_isspace(*raw))) // skip whitespace
|
||||
raw++;
|
||||
|
||||
if (raw >= end)
|
||||
return JTOK_NONE;
|
||||
|
||||
switch (*raw) {
|
||||
|
||||
case '{':
|
||||
raw++;
|
||||
consumed = (raw - rawStart);
|
||||
return JTOK_OBJ_OPEN;
|
||||
case '}':
|
||||
raw++;
|
||||
consumed = (raw - rawStart);
|
||||
return JTOK_OBJ_CLOSE;
|
||||
case '[':
|
||||
raw++;
|
||||
consumed = (raw - rawStart);
|
||||
return JTOK_ARR_OPEN;
|
||||
case ']':
|
||||
raw++;
|
||||
consumed = (raw - rawStart);
|
||||
return JTOK_ARR_CLOSE;
|
||||
|
||||
case ':':
|
||||
raw++;
|
||||
consumed = (raw - rawStart);
|
||||
return JTOK_COLON;
|
||||
case ',':
|
||||
raw++;
|
||||
consumed = (raw - rawStart);
|
||||
return JTOK_COMMA;
|
||||
|
||||
case 'n':
|
||||
case 't':
|
||||
case 'f':
|
||||
if (!strncmp(raw, "null", 4)) {
|
||||
raw += 4;
|
||||
consumed = (raw - rawStart);
|
||||
return JTOK_KW_NULL;
|
||||
} else if (!strncmp(raw, "true", 4)) {
|
||||
raw += 4;
|
||||
consumed = (raw - rawStart);
|
||||
return JTOK_KW_TRUE;
|
||||
} else if (!strncmp(raw, "false", 5)) {
|
||||
raw += 5;
|
||||
consumed = (raw - rawStart);
|
||||
return JTOK_KW_FALSE;
|
||||
} else
|
||||
return JTOK_ERR;
|
||||
|
||||
case '-':
|
||||
case '0':
|
||||
case '1':
|
||||
case '2':
|
||||
case '3':
|
||||
case '4':
|
||||
case '5':
|
||||
case '6':
|
||||
case '7':
|
||||
case '8':
|
||||
case '9': {
|
||||
// part 1: int
|
||||
string numStr;
|
||||
|
||||
const char *first = raw;
|
||||
|
||||
const char *firstDigit = first;
|
||||
if (!json_isdigit(*firstDigit))
|
||||
firstDigit++;
|
||||
if ((*firstDigit == '0') && json_isdigit(firstDigit[1]))
|
||||
return JTOK_ERR;
|
||||
|
||||
numStr += *raw; // copy first char
|
||||
raw++;
|
||||
|
||||
if ((*first == '-') && (raw < end) && (!json_isdigit(*raw)))
|
||||
return JTOK_ERR;
|
||||
|
||||
while (raw < end && json_isdigit(*raw)) { // copy digits
|
||||
numStr += *raw;
|
||||
raw++;
|
||||
}
|
||||
|
||||
// part 2: frac
|
||||
if (raw < end && *raw == '.') {
|
||||
numStr += *raw; // copy .
|
||||
raw++;
|
||||
|
||||
if (raw >= end || !json_isdigit(*raw))
|
||||
return JTOK_ERR;
|
||||
while (raw < end && json_isdigit(*raw)) { // copy digits
|
||||
numStr += *raw;
|
||||
raw++;
|
||||
}
|
||||
}
|
||||
|
||||
// part 3: exp
|
||||
if (raw < end && (*raw == 'e' || *raw == 'E')) {
|
||||
numStr += *raw; // copy E
|
||||
raw++;
|
||||
|
||||
if (raw < end && (*raw == '-' || *raw == '+')) { // copy +/-
|
||||
numStr += *raw;
|
||||
raw++;
|
||||
}
|
||||
|
||||
if (raw >= end || !json_isdigit(*raw))
|
||||
return JTOK_ERR;
|
||||
while (raw < end && json_isdigit(*raw)) { // copy digits
|
||||
numStr += *raw;
|
||||
raw++;
|
||||
}
|
||||
}
|
||||
|
||||
tokenVal = numStr;
|
||||
consumed = (raw - rawStart);
|
||||
return JTOK_NUMBER;
|
||||
}
|
||||
|
||||
case '"': {
|
||||
raw++; // skip "
|
||||
|
||||
string valStr;
|
||||
JSONUTF8StringFilter writer(valStr);
|
||||
|
||||
while (raw < end) {
|
||||
if ((unsigned char)*raw < 0x20)
|
||||
return JTOK_ERR;
|
||||
|
||||
else if (*raw == '\\') {
|
||||
raw++; // skip backslash
|
||||
|
||||
if (raw >= end)
|
||||
return JTOK_ERR;
|
||||
|
||||
switch (*raw) {
|
||||
case '"': writer.push_back('\"'); break;
|
||||
case '\\': writer.push_back('\\'); break;
|
||||
case '/': writer.push_back('/'); break;
|
||||
case 'b': writer.push_back('\b'); break;
|
||||
case 'f': writer.push_back('\f'); break;
|
||||
case 'n': writer.push_back('\n'); break;
|
||||
case 'r': writer.push_back('\r'); break;
|
||||
case 't': writer.push_back('\t'); break;
|
||||
|
||||
case 'u': {
|
||||
unsigned int codepoint;
|
||||
if (raw + 1 + 4 >= end ||
|
||||
hatoui(raw + 1, raw + 1 + 4, codepoint) !=
|
||||
raw + 1 + 4)
|
||||
return JTOK_ERR;
|
||||
writer.push_back_u(codepoint);
|
||||
raw += 4;
|
||||
break;
|
||||
}
|
||||
default:
|
||||
return JTOK_ERR;
|
||||
|
||||
}
|
||||
|
||||
raw++; // skip esc'd char
|
||||
}
|
||||
|
||||
else if (*raw == '"') {
|
||||
raw++; // skip "
|
||||
break; // stop scanning
|
||||
}
|
||||
|
||||
else {
|
||||
writer.push_back(*raw);
|
||||
raw++;
|
||||
}
|
||||
}
|
||||
|
||||
if (!writer.finalize())
|
||||
return JTOK_ERR;
|
||||
tokenVal = valStr;
|
||||
consumed = (raw - rawStart);
|
||||
return JTOK_STRING;
|
||||
}
|
||||
|
||||
default:
|
||||
return JTOK_ERR;
|
||||
}
|
||||
}
|
||||
|
||||
enum expect_bits {
|
||||
EXP_OBJ_NAME = (1U << 0),
|
||||
EXP_COLON = (1U << 1),
|
||||
EXP_ARR_VALUE = (1U << 2),
|
||||
EXP_VALUE = (1U << 3),
|
||||
EXP_NOT_VALUE = (1U << 4),
|
||||
};
|
||||
|
||||
#define expect(bit) (expectMask & (EXP_##bit))
|
||||
#define setExpect(bit) (expectMask |= EXP_##bit)
|
||||
#define clearExpect(bit) (expectMask &= ~EXP_##bit)
|
||||
|
||||
bool UniValue::read(const char *raw, size_t size)
|
||||
{
|
||||
clear();
|
||||
|
||||
uint32_t expectMask = 0;
|
||||
vector<UniValue*> stack;
|
||||
|
||||
string tokenVal;
|
||||
unsigned int consumed;
|
||||
enum jtokentype tok = JTOK_NONE;
|
||||
enum jtokentype last_tok = JTOK_NONE;
|
||||
const char* end = raw + size;
|
||||
do {
|
||||
last_tok = tok;
|
||||
|
||||
tok = getJsonToken(tokenVal, consumed, raw, end);
|
||||
if (tok == JTOK_NONE || tok == JTOK_ERR)
|
||||
return false;
|
||||
raw += consumed;
|
||||
|
||||
bool isValueOpen = jsonTokenIsValue(tok) ||
|
||||
tok == JTOK_OBJ_OPEN || tok == JTOK_ARR_OPEN;
|
||||
|
||||
if (expect(VALUE)) {
|
||||
if (!isValueOpen)
|
||||
return false;
|
||||
clearExpect(VALUE);
|
||||
|
||||
} else if (expect(ARR_VALUE)) {
|
||||
bool isArrValue = isValueOpen || (tok == JTOK_ARR_CLOSE);
|
||||
if (!isArrValue)
|
||||
return false;
|
||||
|
||||
clearExpect(ARR_VALUE);
|
||||
|
||||
} else if (expect(OBJ_NAME)) {
|
||||
bool isObjName = (tok == JTOK_OBJ_CLOSE || tok == JTOK_STRING);
|
||||
if (!isObjName)
|
||||
return false;
|
||||
|
||||
} else if (expect(COLON)) {
|
||||
if (tok != JTOK_COLON)
|
||||
return false;
|
||||
clearExpect(COLON);
|
||||
|
||||
} else if (!expect(COLON) && (tok == JTOK_COLON)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (expect(NOT_VALUE)) {
|
||||
if (isValueOpen)
|
||||
return false;
|
||||
clearExpect(NOT_VALUE);
|
||||
}
|
||||
|
||||
switch (tok) {
|
||||
|
||||
case JTOK_OBJ_OPEN:
|
||||
case JTOK_ARR_OPEN: {
|
||||
VType utyp = (tok == JTOK_OBJ_OPEN ? VOBJ : VARR);
|
||||
if (!stack.size()) {
|
||||
if (utyp == VOBJ)
|
||||
setObject();
|
||||
else
|
||||
setArray();
|
||||
stack.push_back(this);
|
||||
} else {
|
||||
UniValue tmpVal(utyp);
|
||||
UniValue *top = stack.back();
|
||||
top->values.push_back(tmpVal);
|
||||
|
||||
UniValue *newTop = &(top->values.back());
|
||||
stack.push_back(newTop);
|
||||
}
|
||||
|
||||
if (utyp == VOBJ)
|
||||
setExpect(OBJ_NAME);
|
||||
else
|
||||
setExpect(ARR_VALUE);
|
||||
break;
|
||||
}
|
||||
|
||||
case JTOK_OBJ_CLOSE:
|
||||
case JTOK_ARR_CLOSE: {
|
||||
if (!stack.size() || (last_tok == JTOK_COMMA))
|
||||
return false;
|
||||
|
||||
VType utyp = (tok == JTOK_OBJ_CLOSE ? VOBJ : VARR);
|
||||
UniValue *top = stack.back();
|
||||
if (utyp != top->getType())
|
||||
return false;
|
||||
|
||||
stack.pop_back();
|
||||
clearExpect(OBJ_NAME);
|
||||
setExpect(NOT_VALUE);
|
||||
break;
|
||||
}
|
||||
|
||||
case JTOK_COLON: {
|
||||
if (!stack.size())
|
||||
return false;
|
||||
|
||||
UniValue *top = stack.back();
|
||||
if (top->getType() != VOBJ)
|
||||
return false;
|
||||
|
||||
setExpect(VALUE);
|
||||
break;
|
||||
}
|
||||
|
||||
case JTOK_COMMA: {
|
||||
if (!stack.size() ||
|
||||
(last_tok == JTOK_COMMA) || (last_tok == JTOK_ARR_OPEN))
|
||||
return false;
|
||||
|
||||
UniValue *top = stack.back();
|
||||
if (top->getType() == VOBJ)
|
||||
setExpect(OBJ_NAME);
|
||||
else
|
||||
setExpect(ARR_VALUE);
|
||||
break;
|
||||
}
|
||||
|
||||
case JTOK_KW_NULL:
|
||||
case JTOK_KW_TRUE:
|
||||
case JTOK_KW_FALSE: {
|
||||
UniValue tmpVal;
|
||||
switch (tok) {
|
||||
case JTOK_KW_NULL:
|
||||
// do nothing more
|
||||
break;
|
||||
case JTOK_KW_TRUE:
|
||||
tmpVal.setBool(true);
|
||||
break;
|
||||
case JTOK_KW_FALSE:
|
||||
tmpVal.setBool(false);
|
||||
break;
|
||||
default: /* impossible */ break;
|
||||
}
|
||||
|
||||
if (!stack.size()) {
|
||||
*this = tmpVal;
|
||||
break;
|
||||
}
|
||||
|
||||
UniValue *top = stack.back();
|
||||
top->values.push_back(tmpVal);
|
||||
|
||||
setExpect(NOT_VALUE);
|
||||
break;
|
||||
}
|
||||
|
||||
case JTOK_NUMBER: {
|
||||
UniValue tmpVal(VNUM, tokenVal);
|
||||
if (!stack.size()) {
|
||||
*this = tmpVal;
|
||||
break;
|
||||
}
|
||||
|
||||
UniValue *top = stack.back();
|
||||
top->values.push_back(tmpVal);
|
||||
|
||||
setExpect(NOT_VALUE);
|
||||
break;
|
||||
}
|
||||
|
||||
case JTOK_STRING: {
|
||||
if (expect(OBJ_NAME)) {
|
||||
UniValue *top = stack.back();
|
||||
top->keys.push_back(tokenVal);
|
||||
clearExpect(OBJ_NAME);
|
||||
setExpect(COLON);
|
||||
} else {
|
||||
UniValue tmpVal(VSTR, tokenVal);
|
||||
if (!stack.size()) {
|
||||
*this = tmpVal;
|
||||
break;
|
||||
}
|
||||
UniValue *top = stack.back();
|
||||
top->values.push_back(tmpVal);
|
||||
}
|
||||
|
||||
setExpect(NOT_VALUE);
|
||||
break;
|
||||
}
|
||||
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
} while (!stack.empty ());
|
||||
|
||||
/* Check that nothing follows the initial construct (parsed above). */
|
||||
tok = getJsonToken(tokenVal, consumed, raw, end);
|
||||
if (tok != JTOK_NONE)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool UniValue::read(const char *raw) {
|
||||
return read(raw, strlen(raw));
|
||||
}
|
||||
119
src/univalue/lib/univalue_utffilter.h
Normal file
119
src/univalue/lib/univalue_utffilter.h
Normal file
@@ -0,0 +1,119 @@
|
||||
// Copyright 2016 Wladimir J. van der Laan
|
||||
// Distributed under the MIT software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
#ifndef UNIVALUE_UTFFILTER_H
|
||||
#define UNIVALUE_UTFFILTER_H
|
||||
|
||||
#include <string>
|
||||
|
||||
/**
|
||||
* Filter that generates and validates UTF-8, as well as collates UTF-16
|
||||
* surrogate pairs as specified in RFC4627.
|
||||
*/
|
||||
class JSONUTF8StringFilter
|
||||
{
|
||||
public:
|
||||
JSONUTF8StringFilter(std::string &s):
|
||||
str(s), is_valid(true), codepoint(0), state(0), surpair(0)
|
||||
{
|
||||
}
|
||||
// Write single 8-bit char (may be part of UTF-8 sequence)
|
||||
void push_back(unsigned char ch)
|
||||
{
|
||||
if (state == 0) {
|
||||
if (ch < 0x80) // 7-bit ASCII, fast direct pass-through
|
||||
str.push_back(ch);
|
||||
else if (ch < 0xc0) // Mid-sequence character, invalid in this state
|
||||
is_valid = false;
|
||||
else if (ch < 0xe0) { // Start of 2-byte sequence
|
||||
codepoint = (ch & 0x1f) << 6;
|
||||
state = 6;
|
||||
} else if (ch < 0xf0) { // Start of 3-byte sequence
|
||||
codepoint = (ch & 0x0f) << 12;
|
||||
state = 12;
|
||||
} else if (ch < 0xf8) { // Start of 4-byte sequence
|
||||
codepoint = (ch & 0x07) << 18;
|
||||
state = 18;
|
||||
} else // Reserved, invalid
|
||||
is_valid = false;
|
||||
} else {
|
||||
if ((ch & 0xc0) != 0x80) // Not a continuation, invalid
|
||||
is_valid = false;
|
||||
state -= 6;
|
||||
codepoint |= (ch & 0x3f) << state;
|
||||
if (state == 0)
|
||||
push_back_u(codepoint);
|
||||
}
|
||||
}
|
||||
// Write codepoint directly, possibly collating surrogate pairs
|
||||
void push_back_u(unsigned int codepoint_)
|
||||
{
|
||||
if (state) // Only accept full codepoints in open state
|
||||
is_valid = false;
|
||||
if (codepoint_ >= 0xD800 && codepoint_ < 0xDC00) { // First half of surrogate pair
|
||||
if (surpair) // Two subsequent surrogate pair openers - fail
|
||||
is_valid = false;
|
||||
else
|
||||
surpair = codepoint_;
|
||||
} else if (codepoint_ >= 0xDC00 && codepoint_ < 0xE000) { // Second half of surrogate pair
|
||||
if (surpair) { // Open surrogate pair, expect second half
|
||||
// Compute code point from UTF-16 surrogate pair
|
||||
append_codepoint(0x10000 | ((surpair - 0xD800)<<10) | (codepoint_ - 0xDC00));
|
||||
surpair = 0;
|
||||
} else // Second half doesn't follow a first half - fail
|
||||
is_valid = false;
|
||||
} else {
|
||||
if (surpair) // First half of surrogate pair not followed by second - fail
|
||||
is_valid = false;
|
||||
else
|
||||
append_codepoint(codepoint_);
|
||||
}
|
||||
}
|
||||
// Check that we're in a state where the string can be ended
|
||||
// No open sequences, no open surrogate pairs, etc
|
||||
bool finalize()
|
||||
{
|
||||
if (state || surpair)
|
||||
is_valid = false;
|
||||
return is_valid;
|
||||
}
|
||||
private:
|
||||
std::string &str;
|
||||
bool is_valid;
|
||||
// Current UTF-8 decoding state
|
||||
unsigned int codepoint;
|
||||
int state; // Top bit to be filled in for next UTF-8 byte, or 0
|
||||
|
||||
// Keep track of the following state to handle the following section of
|
||||
// RFC4627:
|
||||
//
|
||||
// To escape an extended character that is not in the Basic Multilingual
|
||||
// Plane, the character is represented as a twelve-character sequence,
|
||||
// encoding the UTF-16 surrogate pair. So, for example, a string
|
||||
// containing only the G clef character (U+1D11E) may be represented as
|
||||
// "\uD834\uDD1E".
|
||||
//
|
||||
// Two subsequent \u.... may have to be replaced with one actual codepoint.
|
||||
unsigned int surpair; // First half of open UTF-16 surrogate pair, or 0
|
||||
|
||||
void append_codepoint(unsigned int codepoint_)
|
||||
{
|
||||
if (codepoint_ <= 0x7f)
|
||||
str.push_back((char)codepoint_);
|
||||
else if (codepoint_ <= 0x7FF) {
|
||||
str.push_back((char)(0xC0 | (codepoint_ >> 6)));
|
||||
str.push_back((char)(0x80 | (codepoint_ & 0x3F)));
|
||||
} else if (codepoint_ <= 0xFFFF) {
|
||||
str.push_back((char)(0xE0 | (codepoint_ >> 12)));
|
||||
str.push_back((char)(0x80 | ((codepoint_ >> 6) & 0x3F)));
|
||||
str.push_back((char)(0x80 | (codepoint_ & 0x3F)));
|
||||
} else if (codepoint_ <= 0x1FFFFF) {
|
||||
str.push_back((char)(0xF0 | (codepoint_ >> 18)));
|
||||
str.push_back((char)(0x80 | ((codepoint_ >> 12) & 0x3F)));
|
||||
str.push_back((char)(0x80 | ((codepoint_ >> 6) & 0x3F)));
|
||||
str.push_back((char)(0x80 | (codepoint_ & 0x3F)));
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
#endif
|
||||
115
src/univalue/lib/univalue_write.cpp
Normal file
115
src/univalue/lib/univalue_write.cpp
Normal file
@@ -0,0 +1,115 @@
|
||||
// Copyright 2014 BitPay Inc.
|
||||
// Distributed under the MIT software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#include <iomanip>
|
||||
#include <sstream>
|
||||
#include <stdio.h>
|
||||
#include "univalue.h"
|
||||
#include "univalue_escapes.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
static string json_escape(const string& inS)
|
||||
{
|
||||
string outS;
|
||||
outS.reserve(inS.size() * 2);
|
||||
|
||||
for (unsigned int i = 0; i < inS.size(); i++) {
|
||||
unsigned char ch = inS[i];
|
||||
const char *escStr = escapes[ch];
|
||||
|
||||
if (escStr)
|
||||
outS += escStr;
|
||||
else
|
||||
outS += ch;
|
||||
}
|
||||
|
||||
return outS;
|
||||
}
|
||||
|
||||
string UniValue::write(unsigned int prettyIndent,
|
||||
unsigned int indentLevel) const
|
||||
{
|
||||
string s;
|
||||
s.reserve(1024);
|
||||
|
||||
unsigned int modIndent = indentLevel;
|
||||
if (modIndent == 0)
|
||||
modIndent = 1;
|
||||
|
||||
switch (typ) {
|
||||
case VNULL:
|
||||
s += "null";
|
||||
break;
|
||||
case VOBJ:
|
||||
writeObject(prettyIndent, modIndent, s);
|
||||
break;
|
||||
case VARR:
|
||||
writeArray(prettyIndent, modIndent, s);
|
||||
break;
|
||||
case VSTR:
|
||||
s += "\"" + json_escape(val) + "\"";
|
||||
break;
|
||||
case VNUM:
|
||||
s += val;
|
||||
break;
|
||||
case VBOOL:
|
||||
s += (val == "1" ? "true" : "false");
|
||||
break;
|
||||
}
|
||||
|
||||
return s;
|
||||
}
|
||||
|
||||
static void indentStr(unsigned int prettyIndent, unsigned int indentLevel, string& s)
|
||||
{
|
||||
s.append(prettyIndent * indentLevel, ' ');
|
||||
}
|
||||
|
||||
void UniValue::writeArray(unsigned int prettyIndent, unsigned int indentLevel, string& s) const
|
||||
{
|
||||
s += "[";
|
||||
if (prettyIndent)
|
||||
s += "\n";
|
||||
|
||||
for (unsigned int i = 0; i < values.size(); i++) {
|
||||
if (prettyIndent)
|
||||
indentStr(prettyIndent, indentLevel, s);
|
||||
s += values[i].write(prettyIndent, indentLevel + 1);
|
||||
if (i != (values.size() - 1)) {
|
||||
s += ",";
|
||||
}
|
||||
if (prettyIndent)
|
||||
s += "\n";
|
||||
}
|
||||
|
||||
if (prettyIndent)
|
||||
indentStr(prettyIndent, indentLevel - 1, s);
|
||||
s += "]";
|
||||
}
|
||||
|
||||
void UniValue::writeObject(unsigned int prettyIndent, unsigned int indentLevel, string& s) const
|
||||
{
|
||||
s += "{";
|
||||
if (prettyIndent)
|
||||
s += "\n";
|
||||
|
||||
for (unsigned int i = 0; i < keys.size(); i++) {
|
||||
if (prettyIndent)
|
||||
indentStr(prettyIndent, indentLevel, s);
|
||||
s += "\"" + json_escape(keys[i]) + "\":";
|
||||
if (prettyIndent)
|
||||
s += " ";
|
||||
s += values.at(i).write(prettyIndent, indentLevel + 1);
|
||||
if (i != (values.size() - 1))
|
||||
s += ",";
|
||||
if (prettyIndent)
|
||||
s += "\n";
|
||||
}
|
||||
|
||||
if (prettyIndent)
|
||||
indentStr(prettyIndent, indentLevel - 1, s);
|
||||
s += "}";
|
||||
}
|
||||
|
||||
9
src/univalue/pc/libunivalue-uninstalled.pc.in
Normal file
9
src/univalue/pc/libunivalue-uninstalled.pc.in
Normal file
@@ -0,0 +1,9 @@
|
||||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
libdir=@libdir@
|
||||
includedir=@includedir@
|
||||
|
||||
Name: libunivalue
|
||||
Description: libunivalue, C++ universal value object and JSON library
|
||||
Version: @VERSION@
|
||||
Libs: ${pc_top_builddir}/${pcfiledir}/libunivalue.la
|
||||
10
src/univalue/pc/libunivalue.pc.in
Normal file
10
src/univalue/pc/libunivalue.pc.in
Normal file
@@ -0,0 +1,10 @@
|
||||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
libdir=@libdir@
|
||||
includedir=@includedir@
|
||||
|
||||
Name: libunivalue
|
||||
Description: libunivalue, C++ universal value object and JSON library
|
||||
Version: @VERSION@
|
||||
Libs: -L${libdir} -lunivalue
|
||||
Cflags: -I${includedir}
|
||||
6
src/univalue/test/.gitignore
vendored
Normal file
6
src/univalue/test/.gitignore
vendored
Normal file
@@ -0,0 +1,6 @@
|
||||
unitester
|
||||
test_json
|
||||
no_nul
|
||||
|
||||
*.trs
|
||||
*.log
|
||||
1
src/univalue/test/fail1.json
Normal file
1
src/univalue/test/fail1.json
Normal file
@@ -0,0 +1 @@
|
||||
"This is a string that never ends, yes it goes on and on, my friends.
|
||||
1
src/univalue/test/fail10.json
Normal file
1
src/univalue/test/fail10.json
Normal file
@@ -0,0 +1 @@
|
||||
{"Extra value after close": true} "misplaced quoted value"
|
||||
1
src/univalue/test/fail11.json
Normal file
1
src/univalue/test/fail11.json
Normal file
@@ -0,0 +1 @@
|
||||
{"Illegal expression": 1 + 2}
|
||||
1
src/univalue/test/fail12.json
Normal file
1
src/univalue/test/fail12.json
Normal file
@@ -0,0 +1 @@
|
||||
{"Illegal invocation": alert()}
|
||||
1
src/univalue/test/fail13.json
Normal file
1
src/univalue/test/fail13.json
Normal file
@@ -0,0 +1 @@
|
||||
{"Numbers cannot have leading zeroes": 013}
|
||||
1
src/univalue/test/fail14.json
Normal file
1
src/univalue/test/fail14.json
Normal file
@@ -0,0 +1 @@
|
||||
{"Numbers cannot be hex": 0x14}
|
||||
1
src/univalue/test/fail15.json
Normal file
1
src/univalue/test/fail15.json
Normal file
@@ -0,0 +1 @@
|
||||
["Illegal backslash escape: \x15"]
|
||||
1
src/univalue/test/fail16.json
Normal file
1
src/univalue/test/fail16.json
Normal file
@@ -0,0 +1 @@
|
||||
[\naked]
|
||||
1
src/univalue/test/fail17.json
Normal file
1
src/univalue/test/fail17.json
Normal file
@@ -0,0 +1 @@
|
||||
["Illegal backslash escape: \017"]
|
||||
1
src/univalue/test/fail18.json
Normal file
1
src/univalue/test/fail18.json
Normal file
@@ -0,0 +1 @@
|
||||
[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]
|
||||
1
src/univalue/test/fail19.json
Normal file
1
src/univalue/test/fail19.json
Normal file
@@ -0,0 +1 @@
|
||||
{"Missing colon" null}
|
||||
1
src/univalue/test/fail2.json
Normal file
1
src/univalue/test/fail2.json
Normal file
@@ -0,0 +1 @@
|
||||
["Unclosed array"
|
||||
1
src/univalue/test/fail20.json
Normal file
1
src/univalue/test/fail20.json
Normal file
@@ -0,0 +1 @@
|
||||
{"Double colon":: null}
|
||||
1
src/univalue/test/fail21.json
Normal file
1
src/univalue/test/fail21.json
Normal file
@@ -0,0 +1 @@
|
||||
{"Comma instead of colon", null}
|
||||
1
src/univalue/test/fail22.json
Normal file
1
src/univalue/test/fail22.json
Normal file
@@ -0,0 +1 @@
|
||||
["Colon instead of comma": false]
|
||||
1
src/univalue/test/fail23.json
Normal file
1
src/univalue/test/fail23.json
Normal file
@@ -0,0 +1 @@
|
||||
["Bad value", truth]
|
||||
1
src/univalue/test/fail24.json
Normal file
1
src/univalue/test/fail24.json
Normal file
@@ -0,0 +1 @@
|
||||
['single quote']
|
||||
1
src/univalue/test/fail25.json
Normal file
1
src/univalue/test/fail25.json
Normal file
@@ -0,0 +1 @@
|
||||
[" tab character in string "]
|
||||
1
src/univalue/test/fail26.json
Normal file
1
src/univalue/test/fail26.json
Normal file
@@ -0,0 +1 @@
|
||||
["tab\ character\ in\ string\ "]
|
||||
2
src/univalue/test/fail27.json
Normal file
2
src/univalue/test/fail27.json
Normal file
@@ -0,0 +1,2 @@
|
||||
["line
|
||||
break"]
|
||||
2
src/univalue/test/fail28.json
Normal file
2
src/univalue/test/fail28.json
Normal file
@@ -0,0 +1,2 @@
|
||||
["line\
|
||||
break"]
|
||||
1
src/univalue/test/fail29.json
Normal file
1
src/univalue/test/fail29.json
Normal file
@@ -0,0 +1 @@
|
||||
[0e]
|
||||
1
src/univalue/test/fail3.json
Normal file
1
src/univalue/test/fail3.json
Normal file
@@ -0,0 +1 @@
|
||||
{unquoted_key: "keys must be quoted"}
|
||||
1
src/univalue/test/fail30.json
Normal file
1
src/univalue/test/fail30.json
Normal file
@@ -0,0 +1 @@
|
||||
[0e+]
|
||||
1
src/univalue/test/fail31.json
Normal file
1
src/univalue/test/fail31.json
Normal file
@@ -0,0 +1 @@
|
||||
[0e+-1]
|
||||
1
src/univalue/test/fail32.json
Normal file
1
src/univalue/test/fail32.json
Normal file
@@ -0,0 +1 @@
|
||||
{"Comma instead if closing brace": true,
|
||||
1
src/univalue/test/fail33.json
Normal file
1
src/univalue/test/fail33.json
Normal file
@@ -0,0 +1 @@
|
||||
["mismatch"}
|
||||
1
src/univalue/test/fail34.json
Normal file
1
src/univalue/test/fail34.json
Normal file
@@ -0,0 +1 @@
|
||||
{} garbage
|
||||
1
src/univalue/test/fail35.json
Normal file
1
src/univalue/test/fail35.json
Normal file
@@ -0,0 +1 @@
|
||||
[ true true true [] [] [] ]
|
||||
1
src/univalue/test/fail36.json
Normal file
1
src/univalue/test/fail36.json
Normal file
@@ -0,0 +1 @@
|
||||
{"a":}
|
||||
1
src/univalue/test/fail37.json
Normal file
1
src/univalue/test/fail37.json
Normal file
@@ -0,0 +1 @@
|
||||
{"a":1 "b":2}
|
||||
1
src/univalue/test/fail38.json
Normal file
1
src/univalue/test/fail38.json
Normal file
@@ -0,0 +1 @@
|
||||
["\ud834"]
|
||||
1
src/univalue/test/fail39.json
Normal file
1
src/univalue/test/fail39.json
Normal file
@@ -0,0 +1 @@
|
||||
["\udd61"]
|
||||
1
src/univalue/test/fail4.json
Normal file
1
src/univalue/test/fail4.json
Normal file
@@ -0,0 +1 @@
|
||||
["extra comma",]
|
||||
1
src/univalue/test/fail40.json
Normal file
1
src/univalue/test/fail40.json
Normal file
@@ -0,0 +1 @@
|
||||
["揣。"]
|
||||
1
src/univalue/test/fail41.json
Normal file
1
src/univalue/test/fail41.json
Normal file
@@ -0,0 +1 @@
|
||||
["<22><><EFBFBD>"]
|
||||
BIN
src/univalue/test/fail42.json
Normal file
BIN
src/univalue/test/fail42.json
Normal file
Binary file not shown.
1
src/univalue/test/fail5.json
Normal file
1
src/univalue/test/fail5.json
Normal file
@@ -0,0 +1 @@
|
||||
["double extra comma",,]
|
||||
1
src/univalue/test/fail6.json
Normal file
1
src/univalue/test/fail6.json
Normal file
@@ -0,0 +1 @@
|
||||
[ , "<-- missing value"]
|
||||
1
src/univalue/test/fail7.json
Normal file
1
src/univalue/test/fail7.json
Normal file
@@ -0,0 +1 @@
|
||||
["Comma after the close"],
|
||||
1
src/univalue/test/fail8.json
Normal file
1
src/univalue/test/fail8.json
Normal file
@@ -0,0 +1 @@
|
||||
["Extra close"]]
|
||||
1
src/univalue/test/fail9.json
Normal file
1
src/univalue/test/fail9.json
Normal file
@@ -0,0 +1 @@
|
||||
{"Extra comma": true,}
|
||||
8
src/univalue/test/no_nul.cpp
Normal file
8
src/univalue/test/no_nul.cpp
Normal file
@@ -0,0 +1,8 @@
|
||||
#include "univalue.h"
|
||||
|
||||
int main (int argc, char *argv[])
|
||||
{
|
||||
char buf[] = "___[1,2,3]___";
|
||||
UniValue val;
|
||||
return val.read(buf + 3, 7) ? 0 : 1;
|
||||
}
|
||||
58
src/univalue/test/pass1.json
Normal file
58
src/univalue/test/pass1.json
Normal file
@@ -0,0 +1,58 @@
|
||||
[
|
||||
"JSON Test Pattern pass1",
|
||||
{"object with 1 member":["array with 1 element"]},
|
||||
{},
|
||||
[],
|
||||
-42,
|
||||
true,
|
||||
false,
|
||||
null,
|
||||
{
|
||||
"integer": 1234567890,
|
||||
"real": -9876.543210,
|
||||
"e": 0.123456789e-12,
|
||||
"E": 1.234567890E+34,
|
||||
"": 23456789012E66,
|
||||
"zero": 0,
|
||||
"one": 1,
|
||||
"space": " ",
|
||||
"quote": "\"",
|
||||
"backslash": "\\",
|
||||
"controls": "\b\f\n\r\t",
|
||||
"slash": "/ & \/",
|
||||
"alpha": "abcdefghijklmnopqrstuvwyz",
|
||||
"ALPHA": "ABCDEFGHIJKLMNOPQRSTUVWYZ",
|
||||
"digit": "0123456789",
|
||||
"0123456789": "digit",
|
||||
"special": "`1~!@#$%^&*()_+-={':[,]}|;.</>?",
|
||||
"hex": "\u0123\u4567\u89AB\uCDEF\uabcd\uef4A",
|
||||
"true": true,
|
||||
"false": false,
|
||||
"null": null,
|
||||
"array":[ ],
|
||||
"object":{ },
|
||||
"address": "50 St. James Street",
|
||||
"url": "http://www.JSON.org/",
|
||||
"comment": "// /* <!-- --",
|
||||
"# -- --> */": " ",
|
||||
" s p a c e d " :[1,2 , 3
|
||||
|
||||
,
|
||||
|
||||
4 , 5 , 6 ,7 ],"compact":[1,2,3,4,5,6,7],
|
||||
"jsontext": "{\"object with 1 member\":[\"array with 1 element\"]}",
|
||||
"quotes": "" \u0022 %22 0x22 034 "",
|
||||
"\/\\\"\uCAFE\uBABE\uAB98\uFCDE\ubcda\uef4A\b\f\n\r\t`1~!@#$%^&*()_+-=[]{}|;:',./<>?"
|
||||
: "A key can be any string"
|
||||
},
|
||||
0.5 ,98.6
|
||||
,
|
||||
99.44
|
||||
,
|
||||
|
||||
1066,
|
||||
1e1,
|
||||
0.1e1,
|
||||
1e-1,
|
||||
1e00,2e+00,2e-00
|
||||
,"rosebud"]
|
||||
1
src/univalue/test/pass2.json
Normal file
1
src/univalue/test/pass2.json
Normal file
@@ -0,0 +1 @@
|
||||
[[[[[[[[[[[[[[[[[[["Not too deep"]]]]]]]]]]]]]]]]]]]
|
||||
6
src/univalue/test/pass3.json
Normal file
6
src/univalue/test/pass3.json
Normal file
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"JSON Test Pattern pass3": {
|
||||
"The outermost value": "must be an object or array.",
|
||||
"In this test": "It is an object."
|
||||
}
|
||||
}
|
||||
1
src/univalue/test/round1.json
Normal file
1
src/univalue/test/round1.json
Normal file
@@ -0,0 +1 @@
|
||||
["\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u007f"]
|
||||
1
src/univalue/test/round2.json
Normal file
1
src/univalue/test/round2.json
Normal file
@@ -0,0 +1 @@
|
||||
["a§■𐎒𝅘𝅥𝅯"]
|
||||
1
src/univalue/test/round3.json
Normal file
1
src/univalue/test/round3.json
Normal file
@@ -0,0 +1 @@
|
||||
"abcdefghijklmnopqrstuvwxyz"
|
||||
1
src/univalue/test/round4.json
Normal file
1
src/univalue/test/round4.json
Normal file
@@ -0,0 +1 @@
|
||||
7
|
||||
1
src/univalue/test/round5.json
Normal file
1
src/univalue/test/round5.json
Normal file
@@ -0,0 +1 @@
|
||||
true
|
||||
1
src/univalue/test/round6.json
Normal file
1
src/univalue/test/round6.json
Normal file
@@ -0,0 +1 @@
|
||||
false
|
||||
1
src/univalue/test/round7.json
Normal file
1
src/univalue/test/round7.json
Normal file
@@ -0,0 +1 @@
|
||||
null
|
||||
24
src/univalue/test/test_json.cpp
Normal file
24
src/univalue/test/test_json.cpp
Normal file
@@ -0,0 +1,24 @@
|
||||
// Test program that can be called by the JSON test suite at
|
||||
// https://github.com/nst/JSONTestSuite.
|
||||
//
|
||||
// It reads JSON input from stdin and exits with code 0 if it can be parsed
|
||||
// successfully. It also pretty prints the parsed JSON value to stdout.
|
||||
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
#include "univalue.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
int main (int argc, char *argv[])
|
||||
{
|
||||
UniValue val;
|
||||
if (val.read(string(istreambuf_iterator<char>(cin),
|
||||
istreambuf_iterator<char>()))) {
|
||||
cout << val.write(1 /* prettyIndent */, 4 /* indentLevel */) << endl;
|
||||
return 0;
|
||||
} else {
|
||||
cerr << "JSON Parse Error." << endl;
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
169
src/univalue/test/unitester.cpp
Normal file
169
src/univalue/test/unitester.cpp
Normal file
@@ -0,0 +1,169 @@
|
||||
// Copyright 2014 BitPay Inc.
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <cassert>
|
||||
#include <string>
|
||||
#include "univalue.h"
|
||||
|
||||
#ifndef JSON_TEST_SRC
|
||||
#error JSON_TEST_SRC must point to test source directory
|
||||
#endif
|
||||
|
||||
#ifndef ARRAY_SIZE
|
||||
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
|
||||
#endif
|
||||
|
||||
using namespace std;
|
||||
string srcdir(JSON_TEST_SRC);
|
||||
static bool test_failed = false;
|
||||
|
||||
#define d_assert(expr) { if (!(expr)) { test_failed = true; fprintf(stderr, "%s failed\n", filename.c_str()); } }
|
||||
#define f_assert(expr) { if (!(expr)) { test_failed = true; fprintf(stderr, "%s failed\n", __func__); } }
|
||||
|
||||
static std::string rtrim(std::string s)
|
||||
{
|
||||
s.erase(s.find_last_not_of(" \n\r\t")+1);
|
||||
return s;
|
||||
}
|
||||
|
||||
static void runtest(string filename, const string& jdata)
|
||||
{
|
||||
string prefix = filename.substr(0, 4);
|
||||
|
||||
bool wantPass = (prefix == "pass") || (prefix == "roun");
|
||||
bool wantFail = (prefix == "fail");
|
||||
bool wantRoundTrip = (prefix == "roun");
|
||||
assert(wantPass || wantFail);
|
||||
|
||||
UniValue val;
|
||||
bool testResult = val.read(jdata);
|
||||
|
||||
if (wantPass) {
|
||||
d_assert(testResult == true);
|
||||
} else {
|
||||
d_assert(testResult == false);
|
||||
}
|
||||
|
||||
if (wantRoundTrip) {
|
||||
std::string odata = val.write(0, 0);
|
||||
assert(odata == rtrim(jdata));
|
||||
}
|
||||
}
|
||||
|
||||
static void runtest_file(const char *filename_)
|
||||
{
|
||||
string basename(filename_);
|
||||
string filename = srcdir + "/" + basename;
|
||||
FILE *f = fopen(filename.c_str(), "r");
|
||||
assert(f != NULL);
|
||||
|
||||
string jdata;
|
||||
|
||||
char buf[4096];
|
||||
while (!feof(f)) {
|
||||
int bread = fread(buf, 1, sizeof(buf), f);
|
||||
assert(!ferror(f));
|
||||
|
||||
string s(buf, bread);
|
||||
jdata += s;
|
||||
}
|
||||
|
||||
assert(!ferror(f));
|
||||
fclose(f);
|
||||
|
||||
runtest(basename, jdata);
|
||||
}
|
||||
|
||||
static const char *filenames[] = {
|
||||
"fail10.json",
|
||||
"fail11.json",
|
||||
"fail12.json",
|
||||
"fail13.json",
|
||||
"fail14.json",
|
||||
"fail15.json",
|
||||
"fail16.json",
|
||||
"fail17.json",
|
||||
//"fail18.json", // investigate
|
||||
"fail19.json",
|
||||
"fail1.json",
|
||||
"fail20.json",
|
||||
"fail21.json",
|
||||
"fail22.json",
|
||||
"fail23.json",
|
||||
"fail24.json",
|
||||
"fail25.json",
|
||||
"fail26.json",
|
||||
"fail27.json",
|
||||
"fail28.json",
|
||||
"fail29.json",
|
||||
"fail2.json",
|
||||
"fail30.json",
|
||||
"fail31.json",
|
||||
"fail32.json",
|
||||
"fail33.json",
|
||||
"fail34.json",
|
||||
"fail35.json",
|
||||
"fail36.json",
|
||||
"fail37.json",
|
||||
"fail38.json", // invalid unicode: only first half of surrogate pair
|
||||
"fail39.json", // invalid unicode: only second half of surrogate pair
|
||||
"fail40.json", // invalid unicode: broken UTF-8
|
||||
"fail41.json", // invalid unicode: unfinished UTF-8
|
||||
"fail42.json", // valid json with garbage following a nul byte
|
||||
"fail3.json",
|
||||
"fail4.json", // extra comma
|
||||
"fail5.json",
|
||||
"fail6.json",
|
||||
"fail7.json",
|
||||
"fail8.json",
|
||||
"fail9.json", // extra comma
|
||||
"pass1.json",
|
||||
"pass2.json",
|
||||
"pass3.json",
|
||||
"round1.json", // round-trip test
|
||||
"round2.json", // unicode
|
||||
"round3.json", // bare string
|
||||
"round4.json", // bare number
|
||||
"round5.json", // bare true
|
||||
"round6.json", // bare false
|
||||
"round7.json", // bare null
|
||||
};
|
||||
|
||||
// Test \u handling
|
||||
void unescape_unicode_test()
|
||||
{
|
||||
UniValue val;
|
||||
bool testResult;
|
||||
// Escaped ASCII (quote)
|
||||
testResult = val.read("[\"\\u0022\"]");
|
||||
f_assert(testResult);
|
||||
f_assert(val[0].get_str() == "\"");
|
||||
// Escaped Basic Plane character, two-byte UTF-8
|
||||
testResult = val.read("[\"\\u0191\"]");
|
||||
f_assert(testResult);
|
||||
f_assert(val[0].get_str() == "\xc6\x91");
|
||||
// Escaped Basic Plane character, three-byte UTF-8
|
||||
testResult = val.read("[\"\\u2191\"]");
|
||||
f_assert(testResult);
|
||||
f_assert(val[0].get_str() == "\xe2\x86\x91");
|
||||
// Escaped Supplementary Plane character U+1d161
|
||||
testResult = val.read("[\"\\ud834\\udd61\"]");
|
||||
f_assert(testResult);
|
||||
f_assert(val[0].get_str() == "\xf0\x9d\x85\xa1");
|
||||
}
|
||||
|
||||
int main (int argc, char *argv[])
|
||||
{
|
||||
for (unsigned int fidx = 0; fidx < ARRAY_SIZE(filenames); fidx++) {
|
||||
runtest_file(filenames[fidx]);
|
||||
}
|
||||
|
||||
unescape_unicode_test();
|
||||
|
||||
return test_failed ? 1 : 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user