Compare commits
1
Commits
main
..
6fa4a6dcc8
| Author | SHA1 | Date | |
|---|---|---|---|
 weaselbot
|
6fa4a6dcc8 |
@@ -60,9 +60,8 @@ into the result, so it is non-movable.
|
|||||||
## Not supported (rejected at generation time, no fallback)
|
## Not supported (rejected at generation time, no fallback)
|
||||||
|
|
||||||
`oneOf` / `anyOf` / `allOf` / `not` / `if`-`then`-`else`,
|
`oneOf` / `anyOf` / `allOf` / `not` / `if`-`then`-`else`,
|
||||||
`patternProperties`, `additionalProperties` absent or set to `true`,
|
`patternProperties`, `additionalProperties` with a schema (typed map),
|
||||||
`additionalProperties` with a schema (typed map), `prefixItems` (tuples),
|
`additionalProperties: true`, `prefixItems` (tuples), `const`,
|
||||||
`const`,
|
|
||||||
`dependentSchemas`/`dependentRequired`, union `type` lists other than
|
`dependentSchemas`/`dependentRequired`, union `type` lists other than
|
||||||
`["T", "null"]`, non-string enums, and remote (`$ref` to other documents).
|
`["T", "null"]`, non-string enums, and remote (`$ref` to other documents).
|
||||||
|
|
||||||
|
|||||||
@@ -56,7 +56,6 @@
|
|||||||
"type": "array",
|
"type": "array",
|
||||||
"items": {
|
"items": {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"additionalProperties": false,
|
|
||||||
"required": [
|
"required": [
|
||||||
"name"
|
"name"
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -68,15 +68,6 @@ int main() {
|
|||||||
expectReject(json, "unknown key in strict root");
|
expectReject(json, "unknown key in strict root");
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---- invalid stack size is rejected without crashing ----
|
|
||||||
{
|
|
||||||
RootBuilder b(-1);
|
|
||||||
char buf[] = "null";
|
|
||||||
WeaselJsonStatus s = b.feed(buf, sizeof(buf) - 1);
|
|
||||||
CHECK(s == WeaselJson_REJECT);
|
|
||||||
printf("ok invalid stack size rejected, not crashed\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
{
|
||||||
std::string json = R"({
|
std::string json = R"({
|
||||||
"name": "Ada É",
|
"name": "Ada É",
|
||||||
@@ -193,10 +184,6 @@ int main() {
|
|||||||
expectReject(R"({"name":"x","age":1,"address":{"zip":5}})",
|
expectReject(R"({"name":"x","age":1,"address":{"zip":5}})",
|
||||||
"missing required nested 'city'");
|
"missing required nested 'city'");
|
||||||
expectReject(R"([1,2,3])", "array where object expected (root)");
|
expectReject(R"([1,2,3])", "array where object expected (root)");
|
||||||
expectReject("null", "null where object expected (root)");
|
|
||||||
expectReject("true", "boolean where object expected (root)");
|
|
||||||
expectReject("123", "number where object expected (root)");
|
|
||||||
expectReject(R"("hi")", "string where object expected (root)");
|
|
||||||
expectReject(R"({"name":"x","age":1,)", "truncated / invalid json");
|
expectReject(R"({"name":"x","age":1,)", "truncated / invalid json");
|
||||||
|
|
||||||
if (failures == 0) {
|
if (failures == 0) {
|
||||||
|
|||||||
@@ -61,18 +61,6 @@ static void expectReject(nullable_object::RootBuilder &b, std::string in,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void expectReject(nullable_array::RootBuilder &b, std::string in,
|
|
||||||
const char *what) {
|
|
||||||
WeaselJsonStatus s = parseStrided(b, in);
|
|
||||||
if (s == WeaselJson_REJECT) {
|
|
||||||
printf("ok reject: %s\n", what);
|
|
||||||
} else {
|
|
||||||
printf("FAIL expected reject (%s) got status %d for: %s\n", what, s,
|
|
||||||
in.c_str());
|
|
||||||
++failures;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
int main() {
|
int main() {
|
||||||
// ---- nullable root object: valid document ----
|
// ---- nullable root object: valid document ----
|
||||||
{
|
{
|
||||||
@@ -161,34 +149,6 @@ int main() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---- nullable root object: scalar values rejected ----
|
|
||||||
{
|
|
||||||
nullable_object::RootBuilder b;
|
|
||||||
expectReject(b, "true", "boolean where nullable object expected (root)");
|
|
||||||
}
|
|
||||||
{
|
|
||||||
nullable_object::RootBuilder b;
|
|
||||||
expectReject(b, "123", "number where nullable object expected (root)");
|
|
||||||
}
|
|
||||||
{
|
|
||||||
nullable_object::RootBuilder b;
|
|
||||||
expectReject(b, R"("hi")", "string where nullable object expected (root)");
|
|
||||||
}
|
|
||||||
|
|
||||||
// ---- nullable root array: scalar values rejected ----
|
|
||||||
{
|
|
||||||
nullable_array::RootBuilder b;
|
|
||||||
expectReject(b, "true", "boolean where nullable array expected (root)");
|
|
||||||
}
|
|
||||||
{
|
|
||||||
nullable_array::RootBuilder b;
|
|
||||||
expectReject(b, "123", "number where nullable array expected (root)");
|
|
||||||
}
|
|
||||||
{
|
|
||||||
nullable_array::RootBuilder b;
|
|
||||||
expectReject(b, R"("hi")", "string where nullable array expected (root)");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (failures == 0) {
|
if (failures == 0) {
|
||||||
printf("\nALL TESTS PASSED\n");
|
printf("\nALL TESTS PASSED\n");
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
@@ -32,7 +32,6 @@ class SchemagenEnumTest(unittest.TestCase):
|
|||||||
def test_colliding_enum_values_deduplicate(self):
|
def test_colliding_enum_values_deduplicate(self):
|
||||||
schema = {
|
schema = {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"additionalProperties": False,
|
|
||||||
"properties": {"role": {"enum": ["foo-bar", "foo_bar"]}},
|
"properties": {"role": {"enum": ["foo-bar", "foo_bar"]}},
|
||||||
}
|
}
|
||||||
rc, stdout, stderr = self.run_schemagen(schema)
|
rc, stdout, stderr = self.run_schemagen(schema)
|
||||||
@@ -46,7 +45,6 @@ class SchemagenEnumTest(unittest.TestCase):
|
|||||||
def test_distinct_enum_values_generate(self):
|
def test_distinct_enum_values_generate(self):
|
||||||
schema = {
|
schema = {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"additionalProperties": False,
|
|
||||||
"properties": {"role": {"enum": ["admin", "user", "guest"]}},
|
"properties": {"role": {"enum": ["admin", "user", "guest"]}},
|
||||||
}
|
}
|
||||||
rc, stdout, stderr = self.run_schemagen(schema)
|
rc, stdout, stderr = self.run_schemagen(schema)
|
||||||
@@ -82,7 +80,7 @@ class SchemagenKeywordTest(unittest.TestCase):
|
|||||||
"module",
|
"module",
|
||||||
"import",
|
"import",
|
||||||
]
|
]
|
||||||
schema = {"type": "object", "additionalProperties": False, "properties": {}}
|
schema = {"type": "object", "properties": {}}
|
||||||
for kw in keywords:
|
for kw in keywords:
|
||||||
schema["properties"][kw] = {"type": "string"}
|
schema["properties"][kw] = {"type": "string"}
|
||||||
rc, stdout, stderr = self.run_schemagen(schema)
|
rc, stdout, stderr = self.run_schemagen(schema)
|
||||||
@@ -166,18 +164,11 @@ class SchemagenCollisionTest(unittest.TestCase):
|
|||||||
def test_kind_enum_does_not_duplicate_arr0(self):
|
def test_kind_enum_does_not_duplicate_arr0(self):
|
||||||
schema = {
|
schema = {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"additionalProperties": False,
|
|
||||||
"properties": {
|
"properties": {
|
||||||
"arr": {"type": "array", "items": {"type": "string"}},
|
"arr": {"type": "array", "items": {"type": "string"}},
|
||||||
"obj": {"$ref": "#/$defs/Arr0"},
|
"obj": {"$ref": "#/$defs/Arr0"},
|
||||||
},
|
},
|
||||||
"$defs": {
|
"$defs": {"Arr0": {"type": "object", "properties": {}}},
|
||||||
"Arr0": {
|
|
||||||
"type": "object",
|
|
||||||
"additionalProperties": False,
|
|
||||||
"properties": {},
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
out = self.generate_and_compile(schema)
|
out = self.generate_and_compile(schema)
|
||||||
self.assertIn("struct Arr0", out)
|
self.assertIn("struct Arr0", out)
|
||||||
@@ -192,13 +183,7 @@ class SchemagenCollisionTest(unittest.TestCase):
|
|||||||
schema = {
|
schema = {
|
||||||
"type": "array",
|
"type": "array",
|
||||||
"items": {"$ref": "#/$defs/Skip"},
|
"items": {"$ref": "#/$defs/Skip"},
|
||||||
"$defs": {
|
"$defs": {"Skip": {"type": "object", "properties": {}}},
|
||||||
"Skip": {
|
|
||||||
"type": "object",
|
|
||||||
"additionalProperties": False,
|
|
||||||
"properties": {},
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
out = self.generate_and_compile(schema)
|
out = self.generate_and_compile(schema)
|
||||||
self.assertIn("struct Skip", out)
|
self.assertIn("struct Skip", out)
|
||||||
@@ -210,38 +195,6 @@ class SchemagenCollisionTest(unittest.TestCase):
|
|||||||
self.assertIn("Arr0", enumerators)
|
self.assertIn("Arr0", enumerators)
|
||||||
self.assertEqual(len(enumerators), len(set(enumerators)))
|
self.assertEqual(len(enumerators), len(set(enumerators)))
|
||||||
|
|
||||||
def test_non_object_defs_reused_across_refs(self):
|
|
||||||
"""Regression test for issue #17: enum and array $defs must be reused."""
|
|
||||||
schema = {
|
|
||||||
"type": "object",
|
|
||||||
"additionalProperties": False,
|
|
||||||
"properties": {
|
|
||||||
"role1": {"$ref": "#/$defs/Role"},
|
|
||||||
"role2": {"$ref": "#/$defs/Role"},
|
|
||||||
"roles1": {"$ref": "#/$defs/Roles"},
|
|
||||||
"roles2": {"$ref": "#/$defs/Roles"},
|
|
||||||
},
|
|
||||||
"$defs": {
|
|
||||||
"Role": {"enum": ["admin", "user"]},
|
|
||||||
"Roles": {"type": "array", "items": {"$ref": "#/$defs/Role"}},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
out = self.generate_and_compile(schema)
|
|
||||||
# Exactly one Role enum is generated.
|
|
||||||
self.assertIn("enum class Role : int { admin, user };", out)
|
|
||||||
self.assertNotIn("enum class Role1 : int", out)
|
|
||||||
self.assertNotIn("enum class Role2 : int", out)
|
|
||||||
# The array of enum is represented by a single kind.
|
|
||||||
m = re.search(r"enum class Kind : uint8_t \{([^}]+)\}", out)
|
|
||||||
self.assertIsNotNone(m)
|
|
||||||
enumerators = [e.strip() for e in m.group(1).split(",")]
|
|
||||||
self.assertEqual(enumerators.count("Arr0"), 1)
|
|
||||||
# All four fields use the same C++ types.
|
|
||||||
self.assertIn("std::optional<Role> role1;", out)
|
|
||||||
self.assertIn("std::optional<Role> role2;", out)
|
|
||||||
self.assertIn("std::optional<std::vector<Role>> roles1;", out)
|
|
||||||
self.assertIn("std::optional<std::vector<Role>> roles2;", out)
|
|
||||||
|
|
||||||
|
|
||||||
class SchemagenAdditionalPropertiesTest(unittest.TestCase):
|
class SchemagenAdditionalPropertiesTest(unittest.TestCase):
|
||||||
def run_schemagen(self, schema, args=None):
|
def run_schemagen(self, schema, args=None):
|
||||||
@@ -268,14 +221,17 @@ class SchemagenAdditionalPropertiesTest(unittest.TestCase):
|
|||||||
self.assertNotEqual(rc, 0)
|
self.assertNotEqual(rc, 0)
|
||||||
self.assertIn("additionalProperties: true is not supported", stderr)
|
self.assertIn("additionalProperties: true is not supported", stderr)
|
||||||
|
|
||||||
def test_additional_properties_absent_rejected(self):
|
def test_additional_properties_absent_defaults_to_strict(self):
|
||||||
schema = {
|
schema = {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {"name": {"type": "string"}},
|
"properties": {"name": {"type": "string"}},
|
||||||
}
|
}
|
||||||
rc, stdout, stderr = self.run_schemagen(schema)
|
rc, stdout, stderr = self.run_schemagen(schema)
|
||||||
self.assertNotEqual(rc, 0)
|
self.assertEqual(rc, 0, msg=stderr)
|
||||||
self.assertIn("additionalProperties is required for object schemas", stderr)
|
# The generated parser should reject unknown keys. Verify the key-matching
|
||||||
|
# helper returns -1 for an unknown key and cbKeyData rejects it.
|
||||||
|
self.assertIn("int matchKey(Kind k, std::string_view key) const {", stdout)
|
||||||
|
self.assertNotIn("bool isStrict(Kind k) const", stdout)
|
||||||
|
|
||||||
def test_additional_properties_false_accepted(self):
|
def test_additional_properties_false_accepted(self):
|
||||||
schema = {
|
schema = {
|
||||||
@@ -287,216 +243,6 @@ class SchemagenAdditionalPropertiesTest(unittest.TestCase):
|
|||||||
self.assertEqual(rc, 0, msg=stderr)
|
self.assertEqual(rc, 0, msg=stderr)
|
||||||
|
|
||||||
|
|
||||||
class SchemagenCyclicArrayTest(unittest.TestCase):
|
|
||||||
"""Regression tests for issue #33: cyclic array $ref targets."""
|
|
||||||
|
|
||||||
def run_schemagen(self, schema, args=None):
|
|
||||||
"""Run schemagen on a schema dict. Returns (returncode, stdout, stderr)."""
|
|
||||||
with tempfile.NamedTemporaryFile("w", suffix=".json", delete=False) as fp:
|
|
||||||
json.dump(schema, fp)
|
|
||||||
schema_path = fp.name
|
|
||||||
try:
|
|
||||||
cmd = [sys.executable, SCRIPT, schema_path]
|
|
||||||
if args:
|
|
||||||
cmd.extend(args)
|
|
||||||
result = subprocess.run(cmd, capture_output=True, text=True, check=False)
|
|
||||||
return result.returncode, result.stdout, result.stderr
|
|
||||||
finally:
|
|
||||||
os.unlink(schema_path)
|
|
||||||
|
|
||||||
def test_direct_self_referential_array_rejected(self):
|
|
||||||
schema = {
|
|
||||||
"type": "array",
|
|
||||||
"items": {"$ref": "#/$defs/Node"},
|
|
||||||
"$defs": {
|
|
||||||
"Node": {
|
|
||||||
"type": "array",
|
|
||||||
"items": {"$ref": "#/$defs/Node"},
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
|
||||||
rc, stdout, stderr = self.run_schemagen(schema)
|
|
||||||
self.assertNotEqual(rc, 0)
|
|
||||||
self.assertIn("recursive array type is not supported", stderr)
|
|
||||||
self.assertIn("Node", stderr)
|
|
||||||
|
|
||||||
def test_object_field_to_self_referential_array_rejected(self):
|
|
||||||
schema = {
|
|
||||||
"type": "object",
|
|
||||||
"additionalProperties": False,
|
|
||||||
"properties": {"items": {"$ref": "#/$defs/Items"}},
|
|
||||||
"$defs": {
|
|
||||||
"Items": {
|
|
||||||
"type": "array",
|
|
||||||
"items": {"$ref": "#/$defs/Items"},
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
|
||||||
rc, stdout, stderr = self.run_schemagen(schema)
|
|
||||||
self.assertNotEqual(rc, 0)
|
|
||||||
self.assertIn("recursive array type is not supported", stderr)
|
|
||||||
self.assertIn("Items", stderr)
|
|
||||||
|
|
||||||
def test_chain_of_array_refs_rejected(self):
|
|
||||||
schema = {
|
|
||||||
"type": "object",
|
|
||||||
"additionalProperties": False,
|
|
||||||
"properties": {"x": {"$ref": "#/$defs/A"}},
|
|
||||||
"$defs": {
|
|
||||||
"A": {"type": "array", "items": {"$ref": "#/$defs/B"}},
|
|
||||||
"B": {"type": "array", "items": {"$ref": "#/$defs/A"}},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
rc, stdout, stderr = self.run_schemagen(schema)
|
|
||||||
self.assertNotEqual(rc, 0)
|
|
||||||
self.assertIn("recursive array type is not supported", stderr)
|
|
||||||
|
|
||||||
def test_non_recursive_array_refs_still_allowed(self):
|
|
||||||
schema = {
|
|
||||||
"type": "object",
|
|
||||||
"additionalProperties": False,
|
|
||||||
"properties": {"roles": {"$ref": "#/$defs/Roles"}},
|
|
||||||
"$defs": {
|
|
||||||
"Role": {"enum": ["admin", "user"]},
|
|
||||||
"Roles": {
|
|
||||||
"type": "array",
|
|
||||||
"items": {"$ref": "#/$defs/Role"},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
rc, stdout, stderr = self.run_schemagen(schema)
|
|
||||||
self.assertEqual(rc, 0, msg=stderr)
|
|
||||||
self.assertIn("std::optional<std::vector<Role>> roles;", stdout)
|
|
||||||
|
|
||||||
|
|
||||||
class SchemagenCyclicNullableObjectTest(unittest.TestCase):
|
|
||||||
"""Regression tests for issue #14: nullable cyclic $ref targets."""
|
|
||||||
|
|
||||||
def setUp(self):
|
|
||||||
self.repo_root = os.path.dirname(
|
|
||||||
os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
||||||
)
|
|
||||||
self.include_dir = os.path.join(self.repo_root, "include")
|
|
||||||
self.lib_src = os.path.join(self.repo_root, "src", "lib.cpp")
|
|
||||||
self.compiler = shutil.which("c++")
|
|
||||||
|
|
||||||
def _compile_harness(self, tmpdir, schema, harness):
|
|
||||||
schema_path = os.path.join(tmpdir, "schema.json")
|
|
||||||
with open(schema_path, "w") as fp:
|
|
||||||
json.dump(schema, fp)
|
|
||||||
header_path = os.path.join(tmpdir, "gen.h")
|
|
||||||
result = subprocess.run(
|
|
||||||
[
|
|
||||||
sys.executable,
|
|
||||||
SCRIPT,
|
|
||||||
schema_path,
|
|
||||||
"-o",
|
|
||||||
header_path,
|
|
||||||
"--namespace",
|
|
||||||
"test_schema",
|
|
||||||
],
|
|
||||||
capture_output=True,
|
|
||||||
text=True,
|
|
||||||
check=False,
|
|
||||||
)
|
|
||||||
self.assertEqual(result.returncode, 0, msg=result.stderr)
|
|
||||||
|
|
||||||
lib_obj = os.path.join(tmpdir, "lib.o")
|
|
||||||
comp_lib = subprocess.run(
|
|
||||||
[
|
|
||||||
self.compiler,
|
|
||||||
"-std=c++20",
|
|
||||||
"-I",
|
|
||||||
self.include_dir,
|
|
||||||
"-I",
|
|
||||||
os.path.join(self.repo_root, "third_party", "include"),
|
|
||||||
"-I",
|
|
||||||
os.path.join(self.repo_root, "third_party", "valgrind"),
|
|
||||||
"-c",
|
|
||||||
self.lib_src,
|
|
||||||
"-o",
|
|
||||||
lib_obj,
|
|
||||||
],
|
|
||||||
capture_output=True,
|
|
||||||
text=True,
|
|
||||||
check=False,
|
|
||||||
)
|
|
||||||
self.assertEqual(comp_lib.returncode, 0, msg=comp_lib.stderr)
|
|
||||||
|
|
||||||
cpp_path = os.path.join(tmpdir, "test.cpp")
|
|
||||||
with open(cpp_path, "w") as fp:
|
|
||||||
fp.write(harness)
|
|
||||||
|
|
||||||
exe_path = os.path.join(tmpdir, "test")
|
|
||||||
comp = subprocess.run(
|
|
||||||
[
|
|
||||||
self.compiler,
|
|
||||||
"-std=c++20",
|
|
||||||
"-I",
|
|
||||||
self.include_dir,
|
|
||||||
"-I",
|
|
||||||
tmpdir,
|
|
||||||
lib_obj,
|
|
||||||
cpp_path,
|
|
||||||
"-o",
|
|
||||||
exe_path,
|
|
||||||
],
|
|
||||||
capture_output=True,
|
|
||||||
text=True,
|
|
||||||
check=False,
|
|
||||||
)
|
|
||||||
self.assertEqual(comp.returncode, 0, msg=comp.stderr)
|
|
||||||
run = subprocess.run([exe_path], capture_output=True, text=True, check=False)
|
|
||||||
self.assertEqual(run.returncode, 0, msg=run.stdout + run.stderr)
|
|
||||||
|
|
||||||
def test_self_referential_nullable_object_accepts_nested_null(self):
|
|
||||||
"""A nullable object $def must stay nullable on recursive $refs."""
|
|
||||||
if not self.compiler:
|
|
||||||
self.skipTest("C++ compiler not available")
|
|
||||||
schema = {
|
|
||||||
"type": "object",
|
|
||||||
"additionalProperties": False,
|
|
||||||
"properties": {"self": {"$ref": "#/$defs/Self"}},
|
|
||||||
"$defs": {
|
|
||||||
"Self": {
|
|
||||||
"type": ["object", "null"],
|
|
||||||
"additionalProperties": False,
|
|
||||||
"properties": {"self": {"$ref": "#/$defs/Self"}},
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
|
||||||
harness = textwrap.dedent(
|
|
||||||
"""
|
|
||||||
#include "gen.h"
|
|
||||||
#include <cstdio>
|
|
||||||
#include <cstring>
|
|
||||||
struct Case { const char *s; WeaselJsonStatus expected; };
|
|
||||||
int main() {
|
|
||||||
Case cases[] = {
|
|
||||||
{ R"({"self": null})", WeaselJson_OK },
|
|
||||||
{ R"({"self": {"self": null}})", WeaselJson_OK },
|
|
||||||
{ R"({"self": {"self": {}}})", WeaselJson_OK },
|
|
||||||
};
|
|
||||||
for (const auto &c : cases) {
|
|
||||||
test_schema::RootBuilder b;
|
|
||||||
char buf[256];
|
|
||||||
std::strncpy(buf, c.s, sizeof(buf) - 1);
|
|
||||||
buf[sizeof(buf) - 1] = '\\0';
|
|
||||||
WeaselJsonStatus st = b.feed(buf, std::strlen(buf));
|
|
||||||
st = b.finish();
|
|
||||||
if (st != c.expected) {
|
|
||||||
std::printf("case %s expected %d got %d\\n", c.s, c.expected, st);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
with tempfile.TemporaryDirectory() as tmpdir:
|
|
||||||
self._compile_harness(tmpdir, schema, harness)
|
|
||||||
|
|
||||||
|
|
||||||
class SchemagenIntegerBoundaryTest(unittest.TestCase):
|
class SchemagenIntegerBoundaryTest(unittest.TestCase):
|
||||||
"""Regression tests for issue #19: integer slot parsing near int64 boundaries."""
|
"""Regression tests for issue #19: integer slot parsing near int64 boundaries."""
|
||||||
|
|
||||||
@@ -578,9 +324,7 @@ class SchemagenIntegerBoundaryTest(unittest.TestCase):
|
|||||||
self.assertEqual(run.returncode, 0, msg=run.stdout + run.stderr)
|
self.assertEqual(run.returncode, 0, msg=run.stdout + run.stderr)
|
||||||
|
|
||||||
def _build_cases_array(self, name, entries):
|
def _build_cases_array(self, name, entries):
|
||||||
lines = [
|
lines = [f" struct {name}Case {{ const char *s; WeaselJsonStatus expected; long long v; }};"]
|
||||||
f" struct {name}Case {{ const char *s; WeaselJsonStatus expected; long long v; }};"
|
|
||||||
]
|
|
||||||
lines.append(f" {name}Case {name}_cases[] = {{")
|
lines.append(f" {name}Case {name}_cases[] = {{")
|
||||||
for s, exp, v in entries:
|
for s, exp, v in entries:
|
||||||
val = f"{v}LL" if isinstance(v, int) else v
|
val = f"{v}LL" if isinstance(v, int) else v
|
||||||
@@ -605,18 +349,9 @@ class SchemagenIntegerBoundaryTest(unittest.TestCase):
|
|||||||
("1e-3", "WeaselJson_REJECT", 0),
|
("1e-3", "WeaselJson_REJECT", 0),
|
||||||
("1000e-3", "WeaselJson_OK", 1),
|
("1000e-3", "WeaselJson_OK", 1),
|
||||||
("100.0e-2", "WeaselJson_OK", 1),
|
("100.0e-2", "WeaselJson_OK", 1),
|
||||||
("0.0001e4", "WeaselJson_OK", 1),
|
|
||||||
("0.001e3", "WeaselJson_OK", 1),
|
|
||||||
("123.0", "WeaselJson_OK", 123),
|
("123.0", "WeaselJson_OK", 123),
|
||||||
("9e18", "WeaselJson_OK", 9000000000000000000),
|
("9e18", "WeaselJson_OK", 9000000000000000000),
|
||||||
("10e18", "WeaselJson_REJECT", 0),
|
("10e18", "WeaselJson_REJECT", 0),
|
||||||
# Issue #56: zero written with a negative exponent must be accepted.
|
|
||||||
("0e-1", "WeaselJson_OK", 0),
|
|
||||||
("0e-2", "WeaselJson_OK", 0),
|
|
||||||
("0.0e-2", "WeaselJson_OK", 0),
|
|
||||||
("-0e-2", "WeaselJson_OK", 0),
|
|
||||||
("0e-20", "WeaselJson_OK", 0),
|
|
||||||
("0.000e-5", "WeaselJson_OK", 0),
|
|
||||||
]
|
]
|
||||||
cases_src = self._build_cases_array("root", cases)
|
cases_src = self._build_cases_array("root", cases)
|
||||||
harness = textwrap.dedent(
|
harness = textwrap.dedent(
|
||||||
@@ -657,16 +392,8 @@ class SchemagenIntegerBoundaryTest(unittest.TestCase):
|
|||||||
('{"age":-9223372036854775809}', "WeaselJson_REJECT", 0),
|
('{"age":-9223372036854775809}', "WeaselJson_REJECT", 0),
|
||||||
('{"age":1e3}', "WeaselJson_OK", 1000),
|
('{"age":1e3}', "WeaselJson_OK", 1000),
|
||||||
('{"age":2.0}', "WeaselJson_OK", 2),
|
('{"age":2.0}', "WeaselJson_OK", 2),
|
||||||
('{"age":0.0001e4}', "WeaselJson_OK", 1),
|
|
||||||
('{"age":0.001}', "WeaselJson_REJECT", 0),
|
('{"age":0.001}', "WeaselJson_REJECT", 0),
|
||||||
# Issue #56: zero written with a negative exponent must be accepted.
|
('{"age":-9223372036854775808.0}', "WeaselJson_OK", "-9223372036854775807LL - 1"),
|
||||||
('{"age":0e-2}', "WeaselJson_OK", 0),
|
|
||||||
('{"age":-0e-20}', "WeaselJson_OK", 0),
|
|
||||||
(
|
|
||||||
'{"age":-9223372036854775808.0}',
|
|
||||||
"WeaselJson_OK",
|
|
||||||
"-9223372036854775807LL - 1",
|
|
||||||
),
|
|
||||||
]
|
]
|
||||||
cases_src = self._build_cases_array("object", cases)
|
cases_src = self._build_cases_array("object", cases)
|
||||||
harness = textwrap.dedent(
|
harness = textwrap.dedent(
|
||||||
@@ -698,167 +425,12 @@ class SchemagenIntegerBoundaryTest(unittest.TestCase):
|
|||||||
)
|
)
|
||||||
schema = {
|
schema = {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"additionalProperties": False,
|
|
||||||
"properties": {"age": {"type": "integer"}},
|
"properties": {"age": {"type": "integer"}},
|
||||||
"required": ["age"],
|
"required": ["age"],
|
||||||
}
|
}
|
||||||
with tempfile.TemporaryDirectory() as tmpdir:
|
with tempfile.TemporaryDirectory() as tmpdir:
|
||||||
self._compile_harness(tmpdir, schema, harness)
|
self._compile_harness(tmpdir, schema, harness)
|
||||||
|
|
||||||
def test_integer_no_quadratic_leading_zero_loop(self):
|
|
||||||
"""Regression test for issue #34: leading-zero stripping must not be quadratic."""
|
|
||||||
with tempfile.TemporaryDirectory() as tmpdir:
|
|
||||||
schema_path = os.path.join(tmpdir, "schema.json")
|
|
||||||
with open(schema_path, "w") as fp:
|
|
||||||
json.dump({"type": "integer"}, fp)
|
|
||||||
result = subprocess.run(
|
|
||||||
[sys.executable, SCRIPT, schema_path],
|
|
||||||
capture_output=True,
|
|
||||||
text=True,
|
|
||||||
check=False,
|
|
||||||
)
|
|
||||||
self.assertEqual(result.returncode, 0, msg=result.stderr)
|
|
||||||
self.assertIn("parseJsonInt64", result.stdout)
|
|
||||||
self.assertNotIn("digits.erase(digits.begin())", result.stdout)
|
|
||||||
|
|
||||||
def test_integer_large_fractional_leading_zeros(self):
|
|
||||||
"""Numbers with many leading fractional zeros must parse correctly."""
|
|
||||||
if not self.compiler:
|
|
||||||
self.skipTest("C++ compiler not available")
|
|
||||||
harness = textwrap.dedent(
|
|
||||||
"""
|
|
||||||
#include "gen.h"
|
|
||||||
#include <cstdio>
|
|
||||||
#include <string>
|
|
||||||
int main() {
|
|
||||||
const int n = 100000;
|
|
||||||
std::string s = std::string("0.") + std::string(n - 1, '0') + "1e" + std::to_string(n);
|
|
||||||
test_schema::RootBuilder b;
|
|
||||||
WeaselJsonStatus st = b.feed(s.data(), static_cast<int>(s.size()));
|
|
||||||
st = b.finish();
|
|
||||||
if (st != WeaselJson_OK) {
|
|
||||||
std::printf("expected OK, got %d\\n", st);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
if (b.take() != 1) {
|
|
||||||
std::printf("expected value 1\\n");
|
|
||||||
return 2;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
with tempfile.TemporaryDirectory() as tmpdir:
|
|
||||||
self._compile_harness(tmpdir, {"type": "integer"}, harness)
|
|
||||||
|
|
||||||
|
|
||||||
class SchemagenStringEscapeTest(unittest.TestCase):
|
|
||||||
"""Regression tests for issue #35: control characters in string literals."""
|
|
||||||
|
|
||||||
def setUp(self):
|
|
||||||
self.repo_root = os.path.dirname(
|
|
||||||
os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
||||||
)
|
|
||||||
self.include_dir = os.path.join(self.repo_root, "include")
|
|
||||||
self.compiler = shutil.which("c++")
|
|
||||||
|
|
||||||
def generate_and_compile(self, schema):
|
|
||||||
"""Run schemagen on schema and syntax-check the resulting header."""
|
|
||||||
with tempfile.TemporaryDirectory() as tmpdir:
|
|
||||||
schema_path = os.path.join(tmpdir, "schema.json")
|
|
||||||
with open(schema_path, "w") as fp:
|
|
||||||
json.dump(schema, fp)
|
|
||||||
header_path = os.path.join(tmpdir, "gen.h")
|
|
||||||
cmd = [
|
|
||||||
sys.executable,
|
|
||||||
SCRIPT,
|
|
||||||
schema_path,
|
|
||||||
"-o",
|
|
||||||
header_path,
|
|
||||||
"--namespace",
|
|
||||||
"test_schema",
|
|
||||||
]
|
|
||||||
result = subprocess.run(cmd, capture_output=True, text=True, check=False)
|
|
||||||
self.assertEqual(result.returncode, 0, msg=result.stderr)
|
|
||||||
|
|
||||||
if self.compiler:
|
|
||||||
cpp_path = os.path.join(tmpdir, "test.cpp")
|
|
||||||
with open(cpp_path, "w") as fp:
|
|
||||||
fp.write(
|
|
||||||
'#include "gen.h"\n'
|
|
||||||
"int main() {\n"
|
|
||||||
" test_schema::RootBuilder b;\n"
|
|
||||||
" test_schema::Root r = b.take();\n"
|
|
||||||
" (void)r;\n"
|
|
||||||
"}\n"
|
|
||||||
)
|
|
||||||
comp = subprocess.run(
|
|
||||||
[
|
|
||||||
self.compiler,
|
|
||||||
"-std=c++20",
|
|
||||||
"-fsyntax-only",
|
|
||||||
"-I",
|
|
||||||
self.include_dir,
|
|
||||||
"-I",
|
|
||||||
tmpdir,
|
|
||||||
cpp_path,
|
|
||||||
],
|
|
||||||
capture_output=True,
|
|
||||||
text=True,
|
|
||||||
check=False,
|
|
||||||
)
|
|
||||||
self.assertEqual(comp.returncode, 0, msg=comp.stderr)
|
|
||||||
|
|
||||||
with open(header_path) as fp:
|
|
||||||
return fp.read()
|
|
||||||
|
|
||||||
def test_newline_in_property_key(self):
|
|
||||||
"""A JSON key containing a newline must become a valid C++ literal."""
|
|
||||||
schema = {
|
|
||||||
"type": "object",
|
|
||||||
"additionalProperties": False,
|
|
||||||
"properties": {"a\nb": {"type": "string"}},
|
|
||||||
}
|
|
||||||
out = self.generate_and_compile(schema)
|
|
||||||
self.assertIn('// "a\\nb"', out)
|
|
||||||
self.assertIn('if (key == "a\\nb") return 0;', out)
|
|
||||||
|
|
||||||
def test_newline_in_enum_value(self):
|
|
||||||
"""An enum value containing a newline must become a valid C++ literal."""
|
|
||||||
schema = {
|
|
||||||
"type": "object",
|
|
||||||
"additionalProperties": False,
|
|
||||||
"properties": {"x": {"enum": ["a\nb"]}},
|
|
||||||
}
|
|
||||||
out = self.generate_and_compile(schema)
|
|
||||||
self.assertIn('static constexpr const char *X_names[] = { "a\\nb" };', out)
|
|
||||||
|
|
||||||
def test_mixed_control_chars_in_enum_value(self):
|
|
||||||
"""Mixed control characters in an enum value must be escaped."""
|
|
||||||
schema = {
|
|
||||||
"type": "object",
|
|
||||||
"additionalProperties": False,
|
|
||||||
"properties": {
|
|
||||||
"x": {"enum": ["x\ny\rz\tw\vq\x00\x01"]},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
out = self.generate_and_compile(schema)
|
|
||||||
self.assertIn(
|
|
||||||
'static constexpr const char *X_names[] = { "x\\ny\\rz\\tw\\vq\\u0000\\u0001" };',
|
|
||||||
out,
|
|
||||||
)
|
|
||||||
|
|
||||||
def test_backslash_and_quote_still_escaped(self):
|
|
||||||
"""Existing escaping for backslash and double quote must remain correct."""
|
|
||||||
schema = {
|
|
||||||
"type": "object",
|
|
||||||
"additionalProperties": False,
|
|
||||||
"properties": {'a"b\\c': {"type": "string"}},
|
|
||||||
}
|
|
||||||
out = self.generate_and_compile(schema)
|
|
||||||
self.assertIn('// "a\\"b\\\\c"', out)
|
|
||||||
self.assertIn('if (key == "a\\"b\\\\c") return 0;', out)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
unittest.main()
|
unittest.main()
|
||||||
|
|||||||
@@ -18,43 +18,6 @@ import keyword
|
|||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
|
||||||
def _escape_cpp_string(s):
|
|
||||||
"""Return *s* escaped for use inside a C++ double-quoted string literal.
|
|
||||||
|
|
||||||
JSON strings may contain control characters; emitting them verbatim into
|
|
||||||
generated C++ source breaks tokenization. This helper escapes backslashes
|
|
||||||
and double quotes, maps common control characters to their short escape
|
|
||||||
sequences, and uses universal character names (\\u00XX) for any other
|
|
||||||
character below 0x20.
|
|
||||||
"""
|
|
||||||
out = []
|
|
||||||
for ch in s:
|
|
||||||
cp = ord(ch)
|
|
||||||
if cp == 0x09:
|
|
||||||
out.append("\\t")
|
|
||||||
elif cp == 0x0A:
|
|
||||||
out.append("\\n")
|
|
||||||
elif cp == 0x0B:
|
|
||||||
out.append("\\v")
|
|
||||||
elif cp == 0x0C:
|
|
||||||
out.append("\\f")
|
|
||||||
elif cp == 0x0D:
|
|
||||||
out.append("\\r")
|
|
||||||
elif cp == 0x08:
|
|
||||||
out.append("\\b")
|
|
||||||
elif cp == 0x07:
|
|
||||||
out.append("\\a")
|
|
||||||
elif cp < 0x20:
|
|
||||||
out.append(f"\\u{cp:04X}")
|
|
||||||
elif ch == "\\":
|
|
||||||
out.append("\\\\")
|
|
||||||
elif ch == '"':
|
|
||||||
out.append('\\"')
|
|
||||||
else:
|
|
||||||
out.append(ch)
|
|
||||||
return "".join(out)
|
|
||||||
|
|
||||||
|
|
||||||
class GenError(Exception):
|
class GenError(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@@ -272,24 +235,6 @@ class Builder:
|
|||||||
"""Names generated internally that must not collide with user types."""
|
"""Names generated internally that must not collide with user types."""
|
||||||
return name in ("Root", "RootScalar")
|
return name in ("Root", "RootScalar")
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def _array_reaches(target, ty):
|
|
||||||
"""Return True if `target` can be reached from `ty` by following
|
|
||||||
TArr element types. This detects self-referential array cycles that
|
|
||||||
cannot be expressed as C++ structs."""
|
|
||||||
seen = set()
|
|
||||||
stack = [ty]
|
|
||||||
while stack:
|
|
||||||
cur = stack.pop()
|
|
||||||
if cur is target:
|
|
||||||
return True
|
|
||||||
if id(cur) in seen:
|
|
||||||
continue
|
|
||||||
seen.add(id(cur))
|
|
||||||
if isinstance(cur, TArr):
|
|
||||||
stack.append(cur.elem)
|
|
||||||
return False
|
|
||||||
|
|
||||||
def ref_name(self, ref):
|
def ref_name(self, ref):
|
||||||
if not ref.startswith("#/"):
|
if not ref.startswith("#/"):
|
||||||
raise GenError(f"only local $ref supported, got: {ref}")
|
raise GenError(f"only local $ref supported, got: {ref}")
|
||||||
@@ -305,6 +250,7 @@ class Builder:
|
|||||||
if defname not in self.defs:
|
if defname not in self.defs:
|
||||||
raise GenError(f"$ref to unknown def: {defname}")
|
raise GenError(f"$ref to unknown def: {defname}")
|
||||||
node = self.defs[defname]
|
node = self.defs[defname]
|
||||||
|
# For objects we must register the name before recursing into fields.
|
||||||
return self.build_type(node, defname, defname=defname)
|
return self.build_type(node, defname, defname=defname)
|
||||||
|
|
||||||
def build_type(self, node, hint, defname=None):
|
def build_type(self, node, hint, defname=None):
|
||||||
@@ -333,10 +279,6 @@ class Builder:
|
|||||||
if "$ref" in node:
|
if "$ref" in node:
|
||||||
return self.build_def(self.ref_name(node["$ref"]))
|
return self.build_def(self.ref_name(node["$ref"]))
|
||||||
|
|
||||||
# Non-object $defs entries must reuse the same type for every $ref.
|
|
||||||
if defname is not None and defname in self._building:
|
|
||||||
return self._building[defname]
|
|
||||||
|
|
||||||
# nullability via type lists: ["string", "null"]
|
# nullability via type lists: ["string", "null"]
|
||||||
nullable = False
|
nullable = False
|
||||||
typ = node.get("type")
|
typ = node.get("type")
|
||||||
@@ -355,35 +297,18 @@ class Builder:
|
|||||||
raise GenError("only non-empty string enums are supported")
|
raise GenError("only non-empty string enums are supported")
|
||||||
name = defname and self.unique_name(defname) or self.unique_name(hint)
|
name = defname and self.unique_name(defname) or self.unique_name(hint)
|
||||||
self.enums[name] = EnumType(name, list(vals))
|
self.enums[name] = EnumType(name, list(vals))
|
||||||
result = (TEnum(name), nullable)
|
return (TEnum(name), nullable)
|
||||||
if defname is not None:
|
|
||||||
self._building[defname] = result
|
|
||||||
return result
|
|
||||||
|
|
||||||
if typ == "object" or (typ is None and "properties" in node):
|
if typ == "object" or (typ is None and "properties" in node):
|
||||||
return (self._build_object(node, hint, defname, nullable), nullable)
|
return (self._build_object(node, hint, defname), nullable)
|
||||||
|
|
||||||
if typ == "array":
|
if typ == "array":
|
||||||
if "items" not in node or not isinstance(node["items"], dict):
|
if "items" not in node or not isinstance(node["items"], dict):
|
||||||
raise GenError("arrays require a single 'items' schema")
|
raise GenError("arrays require a single 'items' schema")
|
||||||
# Register the array before building its items so $ref cycles back
|
|
||||||
# to this definition resolve to the same TArr instance.
|
|
||||||
t = TArr(None, False)
|
|
||||||
result = (t, nullable)
|
|
||||||
if defname is not None:
|
|
||||||
self._building[defname] = result
|
|
||||||
elem, elem_nullable = self._unpack(
|
elem, elem_nullable = self._unpack(
|
||||||
self.build_type(node["items"], hint + "Item")
|
self.build_type(node["items"], hint + "Item")
|
||||||
)
|
)
|
||||||
t.elem = elem
|
return (TArr(elem, elem_nullable), nullable)
|
||||||
t.elem_nullable = elem_nullable
|
|
||||||
# Self-referential array cycles (directly or through a chain of
|
|
||||||
# array definitions) cannot be represented as a C++ value type.
|
|
||||||
if self._array_reaches(t, elem):
|
|
||||||
raise GenError(
|
|
||||||
"recursive array type is not supported: " f"{defname or hint!r}"
|
|
||||||
)
|
|
||||||
return result
|
|
||||||
|
|
||||||
scalar = {
|
scalar = {
|
||||||
"string": "str",
|
"string": "str",
|
||||||
@@ -392,10 +317,7 @@ class Builder:
|
|||||||
"boolean": "bool",
|
"boolean": "bool",
|
||||||
}.get(typ)
|
}.get(typ)
|
||||||
if scalar:
|
if scalar:
|
||||||
result = (TScalar(scalar), nullable)
|
return (TScalar(scalar), nullable)
|
||||||
if defname is not None:
|
|
||||||
self._building[defname] = result
|
|
||||||
return result
|
|
||||||
if typ == "null":
|
if typ == "null":
|
||||||
raise GenError("'null'-only types are not supported")
|
raise GenError("'null'-only types are not supported")
|
||||||
|
|
||||||
@@ -409,21 +331,14 @@ class Builder:
|
|||||||
return result
|
return result
|
||||||
return (result, False)
|
return (result, False)
|
||||||
|
|
||||||
def _build_object(self, node, hint, defname, nullable=False):
|
def _build_object(self, node, hint, defname):
|
||||||
name = self.unique_name(defname or hint)
|
name = self.unique_name(defname or hint)
|
||||||
obj = ObjectType(name)
|
obj = ObjectType(name)
|
||||||
self.objects[name] = obj
|
self.objects[name] = obj
|
||||||
# register for $ref cycles before building fields
|
# register for $ref cycles before building fields
|
||||||
tobj = TObj(name)
|
|
||||||
if defname is not None:
|
if defname is not None:
|
||||||
self._building[defname] = (tobj, nullable)
|
self._building[defname] = TObj(name)
|
||||||
ap = node.get("additionalProperties", None)
|
ap = node.get("additionalProperties", False)
|
||||||
if ap is None:
|
|
||||||
raise GenError(
|
|
||||||
"additionalProperties is required for object schemas; set it "
|
|
||||||
"explicitly to false to reject unknown keys (absent "
|
|
||||||
"additionalProperties is not supported)"
|
|
||||||
)
|
|
||||||
if ap is True:
|
if ap is True:
|
||||||
raise GenError("additionalProperties: true is not supported")
|
raise GenError("additionalProperties: true is not supported")
|
||||||
if isinstance(ap, dict):
|
if isinstance(ap, dict):
|
||||||
@@ -443,7 +358,7 @@ class Builder:
|
|||||||
cpp = f"{base}{i}"
|
cpp = f"{base}{i}"
|
||||||
seen_cpp.add(cpp)
|
seen_cpp.add(cpp)
|
||||||
obj.fields.append(Field(key, cpp, ty, key in required, nullable))
|
obj.fields.append(Field(key, cpp, ty, key in required, nullable))
|
||||||
return tobj
|
return TObj(name)
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
@@ -685,8 +600,7 @@ namespace {ns} {{"""
|
|||||||
and f.ty.kind in ("int", "dbl", "bool")
|
and f.ty.kind in ("int", "dbl", "bool")
|
||||||
):
|
):
|
||||||
init = " = 0" if f.ty.kind != "bool" else " = false"
|
init = " = 0" if f.ty.kind != "bool" else " = false"
|
||||||
esc_key = _escape_cpp_string(f.key)
|
out.append(f' {store} {f.cpp}{init}; // "{f.key}"')
|
||||||
out.append(f' {store} {f.cpp}{init}; // "{esc_key}"')
|
|
||||||
out.append("};")
|
out.append("};")
|
||||||
out.append("")
|
out.append("")
|
||||||
return "\n".join(out)
|
return "\n".join(out)
|
||||||
@@ -814,7 +728,7 @@ namespace {ns} {{"""
|
|||||||
for name, obj in self.b.objects.items():
|
for name, obj in self.b.objects.items():
|
||||||
lines.append(f" case Kind::{name}:")
|
lines.append(f" case Kind::{name}:")
|
||||||
for i, fld in enumerate(obj.fields):
|
for i, fld in enumerate(obj.fields):
|
||||||
esc = _escape_cpp_string(fld.key)
|
esc = fld.key.replace("\\", "\\\\").replace('"', '\\"')
|
||||||
lines.append(f' if (key == "{esc}") return {i};')
|
lines.append(f' if (key == "{esc}") return {i};')
|
||||||
lines.append(" return -1;")
|
lines.append(" return -1;")
|
||||||
lines.append(" default: return -1;")
|
lines.append(" default: return -1;")
|
||||||
@@ -897,7 +811,10 @@ namespace {ns} {{"""
|
|||||||
def _enum_name_arrays(self):
|
def _enum_name_arrays(self):
|
||||||
out = []
|
out = []
|
||||||
for e in self.b.enums.values():
|
for e in self.b.enums.values():
|
||||||
lits = ", ".join('"' + _escape_cpp_string(v) + '"' for v in e.values)
|
lits = ", ".join(
|
||||||
|
'"' + v.replace("\\", "\\\\").replace('"', '\\"') + '"'
|
||||||
|
for v in e.values
|
||||||
|
)
|
||||||
out.append(
|
out.append(
|
||||||
f" static constexpr const char *{e.name}_names[] = {{ {lits} }};"
|
f" static constexpr const char *{e.name}_names[] = {{ {lits} }};"
|
||||||
)
|
)
|
||||||
@@ -957,10 +874,6 @@ public:
|
|||||||
explicit RootBuilder(int stackSize = 1024) {{
|
explicit RootBuilder(int stackSize = 1024) {{
|
||||||
cb_ = makeCallbacks();
|
cb_ = makeCallbacks();
|
||||||
parser_ = WeaselJsonParser_create(stackSize, &cb_, this, 0);
|
parser_ = WeaselJsonParser_create(stackSize, &cb_, this, 0);
|
||||||
if (!parser_) {{
|
|
||||||
error_ = true;
|
|
||||||
return;
|
|
||||||
}}
|
|
||||||
{self._ctor_body()}
|
{self._ctor_body()}
|
||||||
}}
|
}}
|
||||||
~RootBuilder() {{ if (parser_) WeaselJsonParser_destroy(parser_); }}
|
~RootBuilder() {{ if (parser_) WeaselJsonParser_destroy(parser_); }}
|
||||||
@@ -1064,11 +977,9 @@ private:
|
|||||||
++trim;
|
++trim;
|
||||||
}}
|
}}
|
||||||
int64_t finalExp = exp - fracDigits + trim;
|
int64_t finalExp = exp - fracDigits + trim;
|
||||||
size_t leadingZeros = 0;
|
|
||||||
while (leadingZeros < digits.size() && digits[leadingZeros] == '0') ++leadingZeros;
|
|
||||||
if (leadingZeros == digits.size()) {{ out = 0; return true; }}
|
|
||||||
if (finalExp < 0) return false;
|
if (finalExp < 0) return false;
|
||||||
if (leadingZeros > 0) digits.erase(0, leadingZeros);
|
while (!digits.empty() && digits.front() == '0') digits.erase(digits.begin());
|
||||||
|
if (digits.empty()) {{ out = 0; return true; }}
|
||||||
|
|
||||||
constexpr uint64_t kMaxNeg = 9223372036854775808ULL;
|
constexpr uint64_t kMaxNeg = 9223372036854775808ULL;
|
||||||
constexpr uint64_t kMaxPos = 9223372036854775807ULL;
|
constexpr uint64_t kMaxPos = 9223372036854775807ULL;
|
||||||
@@ -1090,15 +1001,9 @@ private:
|
|||||||
mag *= 10;
|
mag *= 10;
|
||||||
}}
|
}}
|
||||||
if (mag > limit) return false;
|
if (mag > limit) return false;
|
||||||
if (neg) {{
|
__int128 signedMag = static_cast<__int128>(mag);
|
||||||
if (mag == kMaxNeg) {{
|
if (neg) signedMag = -signedMag;
|
||||||
out = INT64_MIN;
|
out = static_cast<int64_t>(signedMag);
|
||||||
}} else {{
|
|
||||||
out = -static_cast<int64_t>(mag);
|
|
||||||
}}
|
|
||||||
}} else {{
|
|
||||||
out = static_cast<int64_t>(mag);
|
|
||||||
}}
|
|
||||||
return true;
|
return true;
|
||||||
}}
|
}}
|
||||||
|
|
||||||
@@ -1169,7 +1074,6 @@ private:
|
|||||||
|
|
||||||
void cbStringData(const char *buf, int len, int done) {{
|
void cbStringData(const char *buf, int len, int done) {{
|
||||||
if (error_) return;
|
if (error_) return;
|
||||||
if (stack_.empty()) {{ reject(); return; }}
|
|
||||||
Frame &f = stack_.back();
|
Frame &f = stack_.back();
|
||||||
SlotInfo si = slotInfoG(f);
|
SlotInfo si = slotInfoG(f);
|
||||||
if (si.cat == Cat::Str) {{
|
if (si.cat == Cat::Str) {{
|
||||||
@@ -1196,7 +1100,6 @@ private:
|
|||||||
|
|
||||||
void cbNumberData(const char *buf, int len, int done) {{
|
void cbNumberData(const char *buf, int len, int done) {{
|
||||||
if (error_) return;
|
if (error_) return;
|
||||||
if (stack_.empty()) {{ reject(); return; }}
|
|
||||||
Frame &f = stack_.back();
|
Frame &f = stack_.back();
|
||||||
SlotInfo si = slotInfoG(f);
|
SlotInfo si = slotInfoG(f);
|
||||||
if (si.cat != Cat::Int && si.cat != Cat::Dbl) {{ reject(); return; }}
|
if (si.cat != Cat::Int && si.cat != Cat::Dbl) {{ reject(); return; }}
|
||||||
@@ -1230,7 +1133,6 @@ private:
|
|||||||
|
|
||||||
void cbBool(bool value) {{
|
void cbBool(bool value) {{
|
||||||
if (error_) return;
|
if (error_) return;
|
||||||
if (stack_.empty()) {{ reject(); return; }}
|
|
||||||
Frame &f = stack_.back();
|
Frame &f = stack_.back();
|
||||||
SlotInfo si = slotInfoG(f);
|
SlotInfo si = slotInfoG(f);
|
||||||
if (si.cat != Cat::Bool) {{ reject(); return; }}
|
if (si.cat != Cat::Bool) {{ reject(); return; }}
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
"d\ud82d\udd9c8\ud8ed
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
[4,[5,[5,[4,[6,[5,[5,55,5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[3,[5,5,[5,[5,[[null,[415,[[5,[5,[415,4,5,[[5,5,[5,[5,[[null,5,[5,[5,[[5,[5,[415,[4,[5,[5,[3,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[413,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,[[[5,5,[5,[5,[[null,[415,[[5,[5,[415,4,5,[[5,5,[5,[5,[[null,5,[5,[5,[[5,[5,[415,[4,[5,[5,[3,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[413,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[[[[5,5,[5,[5,[[null,[461,[[5,[5,[415,4,5,[[5,5,[5,[5,[[null,5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8.8,[8,[[[{},{}, [[[{},{},[[false, [[false, [[[{},8, [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[
[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-41,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[[[[5,5,[5,[5,[[null,[415,[[5,[5,[415,4,5,[[5,[[[41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[8,[[[[[[-41.8,[8,[8,[[[[41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-.41.8,[8,[7,[[[[41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[5,[5,[[null,5,[1.0e+9, ""[[{},{}:0 -1.0e028 },[[false, [[false, [[[{},8,
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
[[[{ "min":-6.8, "in":-6.8, "in": -6, "Umin": -6.8, "m":-6.4, "max": 1, "mij": -6.8," ": -6.8, "UUaxax": 1, "mij": -6.8," ": -6.8, "UUax":-6.8, "Tin":-6.8, "mUUUax":-6.8, "maxn":-6.8, "in": -6, "Umin": -6.8, "m":-6.4, "max": 1, "mij": -6.8," ": -6.8, "UUax":-6.8, "Tin":-6.8, "mUUUax":-6.8, "max": -6.8, "min":-6.8, "mUax":-6.8, "man": -6, "mUmin": -6.8, "mi": -6, "Umx":-6.8, "Tin":-6.8, "mUUUax":-6.8, "maxn":-6.8, "in": -6, "Umin": -6.8, "m":-6.4, "max": 1, "mij": -6.8," ": -6.8, "UUax":-6.8, "Tin":-6.8, "mUUUax":-6.8, "max": -6.8, "min":-6.8, "mUax":-6.8, "man": -6, "mUmin": -6.8, "mi": -6, "Umin": -6.8, "m":-6.4, "max": 1, "mij": -6.8," ": -6.8, "UUaxin": -6, "Umin": -6.8, "m":-6.4, 1,334en":-5e556.8, "n": -6
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
["\uDA9D\uDDDDux\uDA9D\uDDDdDux\uDA9D\uDDDduxux\uDA9D\uDDDdDDDux\uDA9D\uDDDeu|\uDA9D\uDDDDDDux\uDA9D\uDDDdDDADDDux\uDA9D\uDDDduxux\uDA9D\uDDDdD\uDA9D\uDDDduuDDA9D\uDA9D\uDDDDD-ux\uDA9D\uDDDdDDAuDDDDDDDux\uDA9D\uDDDduxux\uDA9D\uDDDdDux\uDA0D\uDDDdu|DDux\uDA9D\uDDDddDDDDDux\uDA9D\uDDDduxux\uDA9D\uDDDdDux\uDA9D\uDDDdu|DDux\uDA9D\uDDDddDDux\uDA9D\uDDDdu|\uDA4D\uDDA9D\u³D\uDA9D\uDDDDDDDDD\uDA9D\uDDDduxu\uDA9D\uDDDd:DEux\uDA9D\uDDDdDux\uDA9DDDDux\uDA9D\uDDDdu|\uDA8D\uDDDDDDDDux\uDA9D\uDDDddDDDx\uDA9D\uDDDd\uDA4D\uDDA0DDDux\uDA9D\uDDDdDDA0
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
[15,4,5,[[5,5,[4,[5,[[null,5,[5,[5,[[5,[5,[415,[4,[5,[5,[3,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[413,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,[[[5,5,[5,[5,[[null,[415,[[5,[5,[415,4,5,[[5,5,[5,[5,[[null,5,[5,[5,[[5,[5,[415,[4,[5,[5,[3,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,4,[5,[5,[4,[6,[5,[54,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[413,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8.8,[8,[[[{},{}, [[[{},{},[[false, [[false, [[[{},8, [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,-418,[8,[[[
|
|
||||||
[[-41.8,
[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,28,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,[[[5,2,[5,[5,[[null,[413,[[5,[5,[415,4,5,[[5,5,[5,[5,[[null,5,[5,[5,[[5,[5,[415,[4,[5,[5,[3,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,[5,[5,5,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[413,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,[[[5,5,[5,[5,[[null,[415,[[5,[5,[415,4,5,[[5,5,[5,[5,[[null,5,[5,[5,[[5,[5,[415,[4,[5,[5,[3,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[413,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[ "\
|
|
||||||
@@ -1,56 +0,0 @@
|
|||||||
[[[{},{}, [[[{},{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},3,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[7,[[[[41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8.8,[8,[[[{},{}, [[[{},{},[[false, [[false, [[[{},8, [[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8.8,[8,[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8.8,[8,[[[{},{}, [[[{},{},[[false, [[false, [[[{},8, [[[
|
|
||||||
[[-41,{},[[[[{},{}, 8.8,[8,[[[{},{}, [[[{},{},[[false, [[false, [[[{},8, [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8.8,[8,[[[{},{}, [[[{},{},[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[7,[[[[41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[ [-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-20,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-417.777E-8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ { "$i": 9, "max": 8, "x": 2.0e+28,[[false, [[false, "8[[-418,[8,[4,[5,[5,[4,[6 8, "man": -3.8, "max": 8, "max": 8, "man": ,[ššššššššššš5,5, 5,[5,max
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[
|
|
||||||
|
|
||||||
[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[
|
|
||||||
|
|
||||||
[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[
|
|
||||||
|
|
||||||
[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[{},{}, [[[{},{},[[[[{},{}, [[[{},{},[5,[[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,5,4,[5,[5,[4,[6,[5,[5,55,5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[3,[5,5,[5,[5,[[null,[415,[[5,[5,[415,4,5,[[5,5,[4,[5,[[null,5,[5,[5,[[5,[5,[415,[4,[5,[5,[3,[{"x":[{"id": "xx"}],"x":[{"d":"x"}],""J:"xx"}],,[5,[[5,[4,5[[,5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[462,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,4,[5,[5,[5,ž,[5,[5,[[5,[5,[415,[4,[5,[5,[[5,(((((((((((((((((((((((((((((((((((((((((((((((((((((([[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,[4,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,[[[55,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[3,[5,5,[5,[5,[[null,[415,[[5,[5,[415,4,5,[[5,5,[4,[5,[[null,5,[5,[5,[[5,[5,[415,[4,
|
|
||||||
[[[[[false, [[f[
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
4
|
|
||||||
"p{ },,[5[
|
|
||||||
[
|
|
||||||
[{ },[[[6[
|
|
||||||
|
|
||||||
]ue,true,[ true,[[-41,[-,[5[[[[[[true,t[,[5rue,[ true,true, true,[[[[[[[[[[ true,true,[[ true,true,[41,,[ true,pr]]]
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[
|
|
||||||
|
|
||||||
[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[
|
|
||||||
|
|
||||||
[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[
|
|
||||||
|
|
||||||
[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[5,[4,[5,[[5,5,[5,[5,[[null,[413,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,4,[5,[5,[4,[6,[5,[5,55,5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[3,[5,5,[5,[5,[[null,[415,[[5,[5,[415,4,5,[[5,5,[4,[5,[[null,5,[5,[5,[[5,[5,[415,[4,[5,[5,[3,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[413,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[413,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,4,[5,[5,[4,[6,[5,[5,55,5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[3,[5,5,[5,[5,[[null,[415,[[5,[5,[415,4,5,[[5,5,[4,[5,[[null,5,[5,[5,[[5,[5,[415,[4,[5,[5,[3,[{"x":[{"id": {";;" : -8,"8[-5,[-5,5,[-5,5,[-" : 8,"" : -8,"" : -8,"8" : -8,"8;" : -8,"8" : 8,"" : -8,"8[-5,[-5,5,[-5,5,[-" : 8,"" : -8,"" : -8,"8" : -8,"8;" : -8,"8" : 8,"" : -8,"8" :-8,"8" : 8,"" : -8,"" : "" :",5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,4,[5,[5,[5,ž,[5,[5,[[5,[5,[415,[4,[5,[5,[[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,[[[5,5,[5,[5,[[null,[415,[[5,[5,[415,4,5,[[5,5,[5,[5,[[null,5,[5,[5,[[5,[5,[415,[4,[5,[5,[3,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,4,[5,[5,[4,[6,[5,[5,55,5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[3,[5,5,[5,[5,[[null,[415,[[5,[5,[415,4,5,[[5,5,[4,[5,[[null,5,[5,[5,[[5,[5,[415,[4,
|
|
||||||
[[[[[false, [[f[
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
4
|
|
||||||
"p{ },,[5[
|
|
||||||
[
|
|
||||||
[{ },[[[6[
|
|
||||||
|
|
||||||
][-41,[-,[5[,[5,[41,
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
"\uDBFF\zFEFF
|
|
||||||
File diff suppressed because one or more lines are too long
Binary file not shown.
@@ -1,55 +0,0 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[
|
|
||||||
|
|
||||||
[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[
|
|
||||||
|
|
||||||
[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[
|
|
||||||
|
|
||||||
[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[{},{}, [[[{},{},[[[[{},{}, [[[{},{},[5,[[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[[null,5,[5,[5,[[5,[5,[415,[4,[5,[5,[3,[{"x":[{"id": "xx"}],"x":[{"d":"x"}],"":"xx"}],,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[413,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,4,[5,[5,[5,ž,[5,[5,[[5,[5,[415,[4,[5,[5,[[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5[[[[[[[[[[[
|
|
||||||
[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,[[[5,5,[5,[5,[[null,[415,[[5,[5,[415,4,5,[[5,5,[5,[5,[[null,5,[5,[5,[[5,[5,[415,[4,[5,[5,[3,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,4,[5,[5,[4,[6,[5,[5,55,5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[3,[5,5,[5,[5,[[null,[415,[[5,[5,[415,4,5,[[5,5,[4,[5,[[null,5,[5,[5,[[5,[5,[415,[4,
|
|
||||||
[[[[[false, [[f[
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
4
|
|
||||||
"p{ },,[5[
|
|
||||||
[
|
|
||||||
[{ },[[[6[
|
|
||||||
|
|
||||||
][-41,[-,[5[,[5,[41,
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
{"title":"\u041e\ud41d41d\ud82d\udd29\4d9cu0430 \u;a 4 \u03
|
|
||||||
@@ -1,71 +0,0 @@
|
|||||||
[[[{},{}, [[[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,8,[[1.8,[3,[8,[[[[ [[[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[41.8,[8,[8,[[[[ [[[ 8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-417,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8.8,[8,[[[{},{}, [[[{},{},[[false, [[false, [[[{},8, [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[0.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8.8,[8,[[[{},{}, [[[{},{},[[false, [[false, [[[{},8, [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8, [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[["\uDA9D\uDDDDux\uDA9D^uDDDdux\uDA9D\uDDA9D\uDA9D\DDDD[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8.8,[8,[[[{},{}, [[[{},{},[[false, [[false, [[[{},8, [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,[[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1Dux9D\uDA9D\uDDDDDD*x¤Ý¤Ò-ËŠ\u18,DA9D\uDDdDDA0
|
|
||||||
@@ -1,160 +0,0 @@
|
|||||||
[[[{},{}, [[[{},{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222241.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[7,[[[[41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[0,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,8,[8,[8,[[[[[-41.8,[7E-5,7E-5,3E8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8.8,[8,[[[{},{}, [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[0,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,8,[8,[8,[[[[[-41.8,[7E-5,7E-5,3E8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8.8,[8,[[[{},{}, [[[{},{},[[false, [[false, [[[{},8, [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222241.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[7,[[[[41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[0,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,8,[8,[8,[[[[[-41.8,[7E-5,7E-5,3E8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8.8,[8,[[[{},{}, [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[0,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,8,[8,[8,[[[[[-41.8,[7E-5,7E-5,3E8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8.8,[8,[[[{},{}, [[[{},{},[[false, [[false, [[[{},8, [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[41.8,[8,[8,[[[[ [[[ [[-20.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[ [[[ [[-41.8,[3,[8,[[,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222241.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[7,[[[[41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{
|
|
||||||
|
|
||||||
}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[41.8,[8,[8,[[[[ [[[ [[-20.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418[[[{},8, [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false,"\@d83d\u34e55,335223334e55,33e5,334e55,3e5,39990.099999de55,e3339\ud
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[
|
|
||||||
|
|
||||||
[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[
|
|
||||||
|
|
||||||
[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[
|
|
||||||
|
|
||||||
[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[{},{}, [[[{},{},[[[[{},{}, [[[{},{},[5,[[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[95,[5,[4,5,[5,5,[[[5,5,[5,[5,[[null,[415,[[5,[5,[415,4,5,[[5,5,[5,[5,[[null,5,[5,[5,[[5,[5,[415,[4,[5,[5,[3,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[[[[[[[[[[[[[[[[[[[[[[[[[[{"a0.000000+0000000000000000000000000sd":"s1f", "dfg0000000000000d":"s1f", "d0g00000000000000sd":"s1f", "dff[[[[[[[[[[[[[[[[[0sd":"s1f", "dff[[[[[000000000000000sd":"G1f", "dfg00000000040000sd":"s1f", "d]]]null,[415,[4,[5,[5,[4,5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[413,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,4,[5,[5,[4,[6,[5,[5,55,5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[3,[5,5,[5,[5,[[null,[415,[[5,[5,[415,4,5,[[5,5,[4,[5,[[null,5,[5,[5,[[5,[5,[415,[4,[5,[5,[3,[5,[5,[5]]]]]]]]]]]]]]]]]]]]]]]](]]]]]]]]]]]]]]]]]]]]0]]]]]]000sd":"s1f", "dfg00000000000000sd":,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[413,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5"sÌ™,[[5,[4,[5,[[5,5,[5,[5,[[null,[413,[5,[5,[5,5,[[5415,[4,[5,[[5,[4,[5,[5,4,[5,[5,[4,[6,[5,[5,55,5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[ÝÓ5,[3,[5,5,[5,[5,[[n "0ÿ"fg"]]ull,[415,[[5,[5,[415,4,5,[[5,5,[4,[5,[[null,5,[5,[5,[[5,[5,[415,[4,
|
|
||||||
[[[[[false, [[f[
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
4
|
|
||||||
"p{ },,[5[
|
|
||||||
[
|
|
||||||
[{ },[[[6[
|
|
||||||
|
|
||||||
][-41,[-,[5[,[5,[41",:]
|
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
{";N" :[[[{},{}, [[[{},{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8.8,[8,[[[{},{}, [[[{},{},[[false, [[false, [[[{},8, [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[3,[8,[[[ 8, [ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8.8,[8,[[[{},{}, [[[{},{},[[false, [[false, [[[{},8, [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8.8,[8,[[[{},{}, [[[{},{},[[false, [[false, [[[{},8, [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[faf
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
"\uDA8D\tD]{DDD
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
[4,[5,[5,[4,[6,[5,[5,55,5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[3,[5,5,[5,[5,[[null,[415,[[5,[5,[415,4,5,[[5,5,[5,[5,[[null,5,[5,[5,[[5,[5,[415,[4,[5,[5,[3,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[413,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,[[[5,5,[5,[5,[[null,[415,[[5,[5,[415,4,5,[[5,5,[5,[5,[[null,5,[5,[5,[[5,[5,[415,[4,[5,[5,[3,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[413,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[[5,[4,[5,[5,[5,5,[5,[5,[[5,[5,[415,[4,[5,[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[[[[5,5,[5,[5,[[null,[415,[[5,[5,[415,4,5,[[5,5,[5,[5,[[null,5,[5,[5,5,[5,[5,[[5,[5,[3415,[4,[5,[5,[4,[5,[5,[5,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[5,5,[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8.8,[8,[[[{},{}, [[[{},{},[[false, [[false, [[[{},8, [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[
[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-41,5,[[5,[4,[5,[[5,5,[5,[5,[[null,[415,[4,[5,[5,[4,5,[[[[5,5,[5,[5,[[null,[415,[[5,[5,[415,4,5,[[5,[[[41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[8,[[[[[[-41.8,[8,[8,[[[[41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[4,[5,[5,[4,5,[[[[5,5,[5,[5,[[null,[415,[[5,[5,[415,4,5,[[5,[[[41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[8,[[[[[[-41.8,[8,[8,[[[[41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [{ "min":1.0e+9, ""[[{},{}:0 -1.0e020 },[[false, [[false, [[[{},8,
|
|
||||||
File diff suppressed because one or more lines are too long
@@ -1,71 +0,0 @@
|
|||||||
[[[{},{}, [[[{},{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,8,[[1.8,[3,[8,[[[[ [[[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[41.8,[8,[8,[[[[ [[[ 8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8.8,[8,[[[{},{},[[[{},8,[[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8.8,[8,[[[{},{}, [[[{},{},[[false, [[false, [[[{},8, [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8, [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8.8,[8,[[[{},{}, [[[{},{},[[false, [[false, [[[{},8, [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
9777E-1,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[83,6663,66666666,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[[[[[[-41.8,[83,666377777777777, 777728273720, 1, "1", 77777777, 1, "1", 77, 677777777777777777777777777777777777, 1, "1", 7738888888888, 1, "1", 67731, "1-", 7777777777777, 1,7777777777777777777, 1, "1", 7777777, "1", 77, 677777777777777777777777777777777777, 1, 77777777777, 1, "1", 7738888888888, 1, "1",7777777, 7777777777, 777728273720, 1, "1", 777777777777777, ,66666666,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,[[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
["[-Ò418,
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
{"":"_________..............................._____________@@@@ffa\udafa\udffa2fa[-401.
|
|
||||||
@@ -1,101 +0,0 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[
|
|
||||||
|
|
||||||
[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[
|
|
||||||
|
|
||||||
[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[
|
|
||||||
|
|
||||||
[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[
|
|
||||||
|
|
||||||
[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[[[
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
{"":
|
|
||||||
|
|
||||||
|
|
||||||
5
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
[[[[[false, [[f[
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
4
|
|
||||||
"p{ },[
|
|
||||||
[
|
|
||||||
[{ },[[[6[
|
|
||||||
|
|
||||||
][-41,[-[
|
|
||||||
File diff suppressed because one or more lines are too long
@@ -1 +0,0 @@
|
|||||||
"de39\ud83dLudœ8
|
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
[[[{},{}, [[[{},{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[7,[[[[41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
|
|
||||||
|
|
||||||
-41,{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8.8,[8,[[[{},{}, [[[{},{},[[false, [[false, [[[{},8, [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
9777E-1,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},2,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[8,[8,[[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[7,[[[[41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,[[[[[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-20.8,[8,[8,[[1.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41,{},[[false, [[false, [[[{},8,[-41.8,[8,[8,[[[[[-41.8,[8,[8,[[[[ [[[ [[-41.8,[3,[8,[[[[ [[[
|
|
||||||
[[-418,[8,[[[
|
|
||||||
[[-41.8,[8,[8,
|
|
||||||
[[-41.8,[-41.8,[8,[8,1.8,[-41.8,[8,[
|
|
||||||
[[-418,[8,[[[[[[-41.8,[8,[8,[[[[ [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, [[[{},8,[-41.8,[8,[8.8,[8,[[[{},{}, [[[{},{},[[false, [[false, [[[{},8, [[[
|
|
||||||
[[-41,{},[[[[{},{}, [[[{},{},[[false, [[false, "ffa2ffa\udafa\udffad@faa\udff41.8,[8,[8,[[[
|
|
||||||
[8{},[-[
|
|
||||||
@@ -38,8 +38,6 @@ enum WeaselJsonStatus {
|
|||||||
WeaselJson_REJECT,
|
WeaselJson_REJECT,
|
||||||
/** json is too deeply nested */
|
/** json is too deeply nested */
|
||||||
WeaselJson_OVERFLOW,
|
WeaselJson_OVERFLOW,
|
||||||
/** Tried to call parse on a null parser */
|
|
||||||
WeaselJson_NULL,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef struct WeaselJsonParser WeaselJsonParser;
|
typedef struct WeaselJsonParser WeaselJsonParser;
|
||||||
@@ -67,7 +65,7 @@ void WeaselJsonParser_destroy(WeaselJsonParser *parser);
|
|||||||
/** Incrementally parse `len` more bytes starting at `buf`. `buf` may be
|
/** Incrementally parse `len` more bytes starting at `buf`. `buf` may be
|
||||||
* modified. Call with `len` 0 to indicate end of data. `buf` may be null if
|
* modified. Call with `len` 0 to indicate end of data. `buf` may be null if
|
||||||
* `len` is 0. `len` must not be negative; a negative length is treated as a
|
* `len` is 0. `len` must not be negative; a negative length is treated as a
|
||||||
* rejected input. Returns WeaselJson_NULL if parser is null */
|
* rejected input. */
|
||||||
WeaselJsonStatus WeaselJsonParser_parse(WeaselJsonParser *parser, char *buf,
|
WeaselJsonStatus WeaselJsonParser_parse(WeaselJsonParser *parser, char *buf,
|
||||||
int len);
|
int len);
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <cstdint>
|
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <optional>
|
#include <optional>
|
||||||
|
|||||||
@@ -29,26 +29,17 @@ WeaselJsonParser_create(int stackSize, const WeaselJsonCallbacks *callbacks,
|
|||||||
|
|
||||||
__attribute__((visibility("default"))) void
|
__attribute__((visibility("default"))) void
|
||||||
WeaselJsonParser_reset(WeaselJsonParser *parser) {
|
WeaselJsonParser_reset(WeaselJsonParser *parser) {
|
||||||
if (parser == nullptr) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
((Parser3 *)parser)->reset();
|
((Parser3 *)parser)->reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
__attribute__((visibility("default"))) void
|
__attribute__((visibility("default"))) void
|
||||||
WeaselJsonParser_destroy(WeaselJsonParser *parser) {
|
WeaselJsonParser_destroy(WeaselJsonParser *parser) {
|
||||||
if (parser == nullptr) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
((Parser3 *)parser)->~Parser3();
|
((Parser3 *)parser)->~Parser3();
|
||||||
free(parser);
|
free(parser);
|
||||||
}
|
}
|
||||||
|
|
||||||
__attribute__((visibility("default"))) WeaselJsonStatus
|
__attribute__((visibility("default"))) WeaselJsonStatus
|
||||||
WeaselJsonParser_parse(WeaselJsonParser *parser, char *buf, int len) {
|
WeaselJsonParser_parse(WeaselJsonParser *parser, char *buf, int len) {
|
||||||
if (parser == nullptr) [[unlikely]] {
|
|
||||||
return WeaselJson_NULL;
|
|
||||||
}
|
|
||||||
return ((Parser3 *)parser)->parse(buf, len);
|
return ((Parser3 *)parser)->parse(buf, len);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-17
@@ -139,7 +139,7 @@ struct Parser3 {
|
|||||||
stackPtr = stack();
|
stackPtr = stack();
|
||||||
std::ignore = push({N_VALUE, N_WHITESPACE, T_EOF});
|
std::ignore = push({N_VALUE, N_WHITESPACE, T_EOF});
|
||||||
inKey = false;
|
inKey = false;
|
||||||
terminalStatus = WeaselJson_OK;
|
rejected = false;
|
||||||
utf8Codepoint = 0;
|
utf8Codepoint = 0;
|
||||||
utf16Surrogate = 0;
|
utf16Surrogate = 0;
|
||||||
minCodepoint = 0;
|
minCodepoint = 0;
|
||||||
@@ -162,7 +162,7 @@ struct Parser3 {
|
|||||||
NumDfa numDfa;
|
NumDfa numDfa;
|
||||||
Utf8Dfa strDfa;
|
Utf8Dfa strDfa;
|
||||||
bool inKey = false;
|
bool inKey = false;
|
||||||
WeaselJsonStatus terminalStatus = WeaselJson_OK;
|
bool rejected = false;
|
||||||
|
|
||||||
#ifndef HAS_MUSTTAIL
|
#ifndef HAS_MUSTTAIL
|
||||||
char *stashBufForTrampoline;
|
char *stashBufForTrampoline;
|
||||||
@@ -625,7 +625,7 @@ inline PRESERVE_NONE ContinuationStatus n_string2(Parser3 *self, char *buf,
|
|||||||
return WeaselJson_REJECT;
|
return WeaselJson_REJECT;
|
||||||
}
|
}
|
||||||
buf += 4;
|
buf += 4;
|
||||||
if (0xd800 <= codepoint && codepoint <= 0xdbff) {
|
if (0xd800 <= codepoint && codepoint <= 0xdfff) {
|
||||||
// utf-16 surrogate
|
// utf-16 surrogate
|
||||||
int32_t codepoint2 = read4_hex(buf + 2);
|
int32_t codepoint2 = read4_hex(buf + 2);
|
||||||
if (!(buf[0] == '\\' && buf[1] == 'u' && 0xdc00 <= codepoint2 &&
|
if (!(buf[0] == '\\' && buf[1] == 'u' && 0xdc00 <= codepoint2 &&
|
||||||
@@ -650,8 +650,6 @@ inline PRESERVE_NONE ContinuationStatus n_string2(Parser3 *self, char *buf,
|
|||||||
self->writeBuf[0] = (0b00000111 & codepoint) | 0b11110000;
|
self->writeBuf[0] = (0b00000111 & codepoint) | 0b11110000;
|
||||||
self->writeBuf += 4;
|
self->writeBuf += 4;
|
||||||
}
|
}
|
||||||
} else if (0xdc00 <= codepoint && codepoint <= 0xdfff) [[unlikely]] {
|
|
||||||
return WeaselJson_REJECT;
|
|
||||||
} else {
|
} else {
|
||||||
if (!(self->flags & WeaselJsonRaw)) {
|
if (!(self->flags & WeaselJsonRaw)) {
|
||||||
if (codepoint < 0x80) {
|
if (codepoint < 0x80) {
|
||||||
@@ -795,7 +793,7 @@ inline PRESERVE_NONE ContinuationStatus t_hex2(Parser3 *self, char *buf,
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
assert(self->utf8Codepoint < 0x10000);
|
assert(self->utf8Codepoint < 0x10000);
|
||||||
if (0xd800 <= self->utf8Codepoint && self->utf8Codepoint <= 0xdbff) {
|
if (0xd800 <= self->utf8Codepoint && self->utf8Codepoint <= 0xdfff) {
|
||||||
// utf-16 surrogate
|
// utf-16 surrogate
|
||||||
self->utf16Surrogate = self->utf8Codepoint;
|
self->utf16Surrogate = self->utf8Codepoint;
|
||||||
self->utf8Codepoint = 0;
|
self->utf8Codepoint = 0;
|
||||||
@@ -810,10 +808,6 @@ inline PRESERVE_NONE ContinuationStatus t_hex2(Parser3 *self, char *buf,
|
|||||||
}
|
}
|
||||||
MUSTTAIL return Parser3::keepGoing(self, buf, bufEnd);
|
MUSTTAIL return Parser3::keepGoing(self, buf, bufEnd);
|
||||||
}
|
}
|
||||||
if (0xdc00 <= self->utf8Codepoint && self->utf8Codepoint <= 0xdfff)
|
|
||||||
[[unlikely]] {
|
|
||||||
return WeaselJson_REJECT;
|
|
||||||
}
|
|
||||||
if (!(self->flags & WeaselJsonRaw)) {
|
if (!(self->flags & WeaselJsonRaw)) {
|
||||||
bool useTmp = buf - self->writeBuf < 3;
|
bool useTmp = buf - self->writeBuf < 3;
|
||||||
char *p = tmp;
|
char *p = tmp;
|
||||||
@@ -1070,12 +1064,12 @@ constexpr inline struct ContinuationTable {
|
|||||||
inline WeaselJsonStatus Parser3::parse(char *buf, int len) {
|
inline WeaselJsonStatus Parser3::parse(char *buf, int len) {
|
||||||
this->dataBegin = this->writeBuf = buf;
|
this->dataBegin = this->writeBuf = buf;
|
||||||
|
|
||||||
if (this->terminalStatus != WeaselJson_OK) [[unlikely]] {
|
if (this->rejected) [[unlikely]] {
|
||||||
return this->terminalStatus;
|
return WeaselJson_REJECT;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (len < 0) [[unlikely]] {
|
if (len < 0) [[unlikely]] {
|
||||||
this->terminalStatus = WeaselJson_REJECT;
|
this->rejected = true;
|
||||||
return WeaselJson_REJECT;
|
return WeaselJson_REJECT;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1085,8 +1079,8 @@ inline WeaselJsonStatus Parser3::parse(char *buf, int len) {
|
|||||||
// range.
|
// range.
|
||||||
ContinuationStatus status =
|
ContinuationStatus status =
|
||||||
symbolTables.continuations[top()](this, buf, buf + len);
|
symbolTables.continuations[top()](this, buf, buf + len);
|
||||||
if (status > WeaselJson_AGAIN) {
|
if (status == WeaselJson_REJECT) {
|
||||||
this->terminalStatus = WeaselJsonStatus(status);
|
this->rejected = true;
|
||||||
}
|
}
|
||||||
return WeaselJsonStatus(status);
|
return WeaselJsonStatus(status);
|
||||||
#else
|
#else
|
||||||
@@ -1095,8 +1089,8 @@ inline WeaselJsonStatus Parser3::parse(char *buf, int len) {
|
|||||||
while ((result = symbolTables.continuations[top()](
|
while ((result = symbolTables.continuations[top()](
|
||||||
this, stashBufForTrampoline, buf + len)) == kBounce)
|
this, stashBufForTrampoline, buf + len)) == kBounce)
|
||||||
;
|
;
|
||||||
if (result > WeaselJson_AGAIN) {
|
if (result == WeaselJson_REJECT) {
|
||||||
this->terminalStatus = WeaselJsonStatus(result);
|
this->rejected = true;
|
||||||
}
|
}
|
||||||
return WeaselJsonStatus(result);
|
return WeaselJsonStatus(result);
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -202,62 +202,6 @@ TEST_CASE("parser3") {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_CASE("overflow state is sticky") {
|
|
||||||
auto c = noopCallbacks();
|
|
||||||
// stackSize 3 is exactly big enough to hold reset()'s bootstrap, but too
|
|
||||||
// small for nested arrays. Overflows must be terminal like rejects: a later
|
|
||||||
// end-of-data call must never report OK for an incomplete document.
|
|
||||||
auto *parser = WeaselJsonParser_create(3, &c, nullptr, 0);
|
|
||||||
REQUIRE(parser != nullptr);
|
|
||||||
|
|
||||||
std::string doc = "[[";
|
|
||||||
REQUIRE(WeaselJsonParser_parse(parser, doc.data(), doc.size()) ==
|
|
||||||
WeaselJson_OVERFLOW);
|
|
||||||
|
|
||||||
// After overflow, the end-of-data call must not return OK.
|
|
||||||
REQUIRE(WeaselJsonParser_parse(parser, nullptr, 0) != WeaselJson_OK);
|
|
||||||
// It should keep reporting a terminal failure.
|
|
||||||
REQUIRE(WeaselJsonParser_parse(parser, nullptr, 0) != WeaselJson_OK);
|
|
||||||
|
|
||||||
// Further data chunks must also stay terminal.
|
|
||||||
std::string more = "]]";
|
|
||||||
REQUIRE(WeaselJsonParser_parse(parser, more.data(), more.size()) !=
|
|
||||||
WeaselJson_OK);
|
|
||||||
|
|
||||||
WeaselJsonParser_destroy(parser);
|
|
||||||
}
|
|
||||||
|
|
||||||
TEST_CASE("overflow is sticky for nested objects") {
|
|
||||||
auto c = noopCallbacks();
|
|
||||||
auto *parser = WeaselJsonParser_create(4, &c, nullptr, 0);
|
|
||||||
REQUIRE(parser != nullptr);
|
|
||||||
|
|
||||||
std::string doc = "{\"a\":{ \"a\":";
|
|
||||||
REQUIRE(WeaselJsonParser_parse(parser, doc.data(), doc.size()) ==
|
|
||||||
WeaselJson_OVERFLOW);
|
|
||||||
REQUIRE(WeaselJsonParser_parse(parser, nullptr, 0) != WeaselJson_OK);
|
|
||||||
|
|
||||||
WeaselJsonParser_destroy(parser);
|
|
||||||
}
|
|
||||||
|
|
||||||
TEST_CASE("reset clears overflow state") {
|
|
||||||
auto c = noopCallbacks();
|
|
||||||
auto *parser = WeaselJsonParser_create(3, &c, nullptr, 0);
|
|
||||||
REQUIRE(parser != nullptr);
|
|
||||||
|
|
||||||
std::string doc = "[[";
|
|
||||||
REQUIRE(WeaselJsonParser_parse(parser, doc.data(), doc.size()) ==
|
|
||||||
WeaselJson_OVERFLOW);
|
|
||||||
// After reset the parser should accept a minimal document again.
|
|
||||||
WeaselJsonParser_reset(parser);
|
|
||||||
std::string copy = "1";
|
|
||||||
REQUIRE(WeaselJsonParser_parse(parser, copy.data(), copy.size()) ==
|
|
||||||
WeaselJson_AGAIN);
|
|
||||||
REQUIRE(WeaselJsonParser_parse(parser, nullptr, 0) == WeaselJson_OK);
|
|
||||||
|
|
||||||
WeaselJsonParser_destroy(parser);
|
|
||||||
}
|
|
||||||
|
|
||||||
TEST_CASE("rejected state is sticky") {
|
TEST_CASE("rejected state is sticky") {
|
||||||
auto c = noopCallbacks();
|
auto c = noopCallbacks();
|
||||||
auto *parser = WeaselJsonParser_create(1024, &c, nullptr, 0);
|
auto *parser = WeaselJsonParser_create(1024, &c, nullptr, 0);
|
||||||
@@ -302,20 +246,6 @@ TEST_CASE("create rejects too-small stack") {
|
|||||||
WeaselJsonParser_destroy(parser);
|
WeaselJsonParser_destroy(parser);
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_CASE("reset and destroy accept null parser") {
|
|
||||||
// Creation can legitimately fail and return null. The cleanup functions must
|
|
||||||
// tolerate a null pointer the same way free(nullptr) is a no-op.
|
|
||||||
auto c = noopCallbacks();
|
|
||||||
WeaselJsonParser *parser = WeaselJsonParser_create(-1, &c, nullptr, 0);
|
|
||||||
REQUIRE(parser == nullptr);
|
|
||||||
WeaselJsonParser_reset(parser); // must not crash
|
|
||||||
WeaselJsonParser_destroy(parser); // must not crash
|
|
||||||
|
|
||||||
// Calling reset/destroy on literal nullptr directly must also be safe.
|
|
||||||
WeaselJsonParser_reset(nullptr);
|
|
||||||
WeaselJsonParser_destroy(nullptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
TEST_CASE("parse rejects negative length") {
|
TEST_CASE("parse rejects negative length") {
|
||||||
auto c = noopCallbacks();
|
auto c = noopCallbacks();
|
||||||
auto *parser = WeaselJsonParser_create(1024, &c, nullptr, 0);
|
auto *parser = WeaselJsonParser_create(1024, &c, nullptr, 0);
|
||||||
@@ -330,10 +260,6 @@ TEST_CASE("parse rejects negative length") {
|
|||||||
WeaselJsonParser_destroy(parser);
|
WeaselJsonParser_destroy(parser);
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_CASE("Calling parse with nullptr doesn't crash") {
|
|
||||||
REQUIRE(WeaselJsonParser_parse(nullptr, nullptr, 0) == WeaselJson_NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
TEST_CASE("streaming") { testStreaming(json); }
|
TEST_CASE("streaming") { testStreaming(json); }
|
||||||
|
|
||||||
TEST_CASE("reset clears inKey and transient state") {
|
TEST_CASE("reset clears inKey and transient state") {
|
||||||
|
|||||||
@@ -33,9 +33,6 @@ int main(int argc, char **argv) {
|
|||||||
case WeaselJson_REJECT:
|
case WeaselJson_REJECT:
|
||||||
case WeaselJson_OVERFLOW:
|
case WeaselJson_OVERFLOW:
|
||||||
return 1;
|
return 1;
|
||||||
case WeaselJson_NULL:
|
|
||||||
fprintf(stderr, "parse called with a null parser\n");
|
|
||||||
return 1;
|
|
||||||
}
|
}
|
||||||
if (l == 0) {
|
if (l == 0) {
|
||||||
return 1;
|
return 1;
|
||||||
|
|||||||
@@ -95,20 +95,8 @@ def test_create_rejects_too_small_stack():
|
|||||||
raise AssertionError(f"expected ValueError for stackSize={stack_size}")
|
raise AssertionError(f"expected ValueError for stackSize={stack_size}")
|
||||||
|
|
||||||
|
|
||||||
def test_missing_library_raises_oserror():
|
|
||||||
try:
|
|
||||||
weaseljson.WeaselJsonParser(
|
|
||||||
weaseljson.WeaselJsonCallbacksBase(),
|
|
||||||
build_dir="/nonexistent",
|
|
||||||
)
|
|
||||||
except OSError:
|
|
||||||
return
|
|
||||||
raise AssertionError("expected OSError when the shared library is missing")
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
test_object_keys_routed_correctly()
|
test_object_keys_routed_correctly()
|
||||||
test_mixed_values()
|
test_mixed_values()
|
||||||
test_create_rejects_too_small_stack()
|
test_create_rejects_too_small_stack()
|
||||||
test_missing_library_raises_oserror()
|
|
||||||
print("python bindings ok")
|
print("python bindings ok")
|
||||||
|
|||||||
+7
-2
@@ -30,7 +30,6 @@ class WeaselJsonStatus(enum.Enum):
|
|||||||
AGAIN = 1
|
AGAIN = 1
|
||||||
REJECT = 2
|
REJECT = 2
|
||||||
OVERFLOW = 3
|
OVERFLOW = 3
|
||||||
NULL = 4
|
|
||||||
|
|
||||||
|
|
||||||
class WeaselJsonCallbacksBase:
|
class WeaselJsonCallbacksBase:
|
||||||
@@ -85,7 +84,13 @@ class WeaselJsonParser:
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
if self._lib is None:
|
if self._lib is None:
|
||||||
raise OSError(f"Could not load libweaseljson from {build_dir}")
|
import sys
|
||||||
|
|
||||||
|
print(
|
||||||
|
"Could not find libweaseljson implementation",
|
||||||
|
file=sys.stderr,
|
||||||
|
)
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
self._lib.WeaselJsonParser_create.argtypes = (
|
self._lib.WeaselJsonParser_create.argtypes = (
|
||||||
ctypes.c_int,
|
ctypes.c_int,
|
||||||
|
|||||||
Reference in New Issue
Block a user