Adds a json::Expr type to represent intermediate JSON expressions.
Summary:
This form can be created with a nice clang-format-friendly literal syntax,
and gets escaping right. It knows how to call unparse() on our Protocol types.
All the places where we pass around JSON internally now use this type.
Object properties are sorted (stored as std::map) and so serialization is
canonicalized, with optional prettyprinting (triggered by a -pretty flag).
This makes the lit tests much nicer to read and somewhat nicer to debug.
(Unfortunately the completion tests use CHECK-DAG, which only has
line-granularity, so pretty-printing is disabled there. In future we
could make completion ordering deterministic, or switch to unittests).
Compared to the current approach, it has some efficiencies like avoiding copies
of string literals used as object keys, but is probably slower overall.
I think the code/test quality benefits are worth it.
This patch doesn't attempt to do anything about JSON *parsing*.
It takes direction from the proposal in this doc[1], but is limited in scope
and visibility, for now.
I am of half a mind just to use Expr as the target of a parser, and maybe do a
little string deduplication, but not bother with clever memory allocation.
That would be simple, and fast enough for clangd...
[1] https://docs.google.com/document/d/1OEF9IauWwNuSigZzvvbjc1cVS1uGHRyGTXaoy3DjqM4/edit
+cc d0k so he can tell me not to use std::map.
Reviewers: ioeric, malaperle
Subscribers: bkramer, ilya-biryukov, mgorny, klimek
Differential Revision: https://reviews.llvm.org/D39435
llvm-svn: 317486
2017-11-06 23:40:30 +08:00
|
|
|
//===-- JSONExprTests.cpp - JSON expression unit tests ----------*- C++ -*-===//
|
|
|
|
//
|
|
|
|
// The LLVM Compiler Infrastructure
|
|
|
|
//
|
|
|
|
// This file is distributed under the University of Illinois Open Source
|
|
|
|
// License. See LICENSE.TXT for details.
|
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
|
|
|
#include "JSONExpr.h"
|
|
|
|
|
|
|
|
#include "gmock/gmock.h"
|
|
|
|
#include "gtest/gtest.h"
|
|
|
|
|
|
|
|
namespace clang {
|
|
|
|
namespace clangd {
|
|
|
|
namespace json {
|
|
|
|
namespace {
|
|
|
|
|
|
|
|
std::string s(const Expr &E) { return llvm::formatv("{0}", E).str(); }
|
|
|
|
std::string sp(const Expr &E) { return llvm::formatv("{0:2}", E).str(); }
|
|
|
|
|
|
|
|
TEST(JSONExprTests, Types) {
|
|
|
|
EXPECT_EQ("true", s(true));
|
|
|
|
EXPECT_EQ("null", s(nullptr));
|
|
|
|
EXPECT_EQ("2.5", s(2.5));
|
|
|
|
EXPECT_EQ(R"("foo")", s("foo"));
|
|
|
|
EXPECT_EQ("[1,2,3]", s({1, 2, 3}));
|
|
|
|
EXPECT_EQ(R"({"x":10,"y":20})", s(obj{{"x", 10}, {"y", 20}}));
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(JSONExprTests, Constructors) {
|
|
|
|
// Lots of edge cases around empty and singleton init lists.
|
|
|
|
EXPECT_EQ("[[[3]]]", s({{{3}}}));
|
|
|
|
EXPECT_EQ("[[[]]]", s({{{}}}));
|
|
|
|
EXPECT_EQ("[[{}]]", s({{obj{}}}));
|
|
|
|
EXPECT_EQ(R"({"A":{"B":{}}})", s(obj{{"A", obj{{"B", obj{}}}}}));
|
|
|
|
EXPECT_EQ(R"({"A":{"B":{"X":"Y"}}})",
|
|
|
|
s(obj{{"A", obj{{"B", obj{{"X", "Y"}}}}}}));
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(JSONExprTests, StringOwnership) {
|
|
|
|
char X[] = "Hello";
|
|
|
|
Expr Alias = static_cast<const char *>(X);
|
|
|
|
X[1] = 'a';
|
|
|
|
EXPECT_EQ(R"("Hallo")", s(Alias));
|
|
|
|
|
|
|
|
std::string Y = "Hello";
|
|
|
|
Expr Copy = Y;
|
|
|
|
Y[1] = 'a';
|
|
|
|
EXPECT_EQ(R"("Hello")", s(Copy));
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(JSONExprTests, CanonicalOutput) {
|
|
|
|
// Objects are sorted (but arrays aren't)!
|
|
|
|
EXPECT_EQ(R"({"a":1,"b":2,"c":3})", s(obj{{"a", 1}, {"c", 3}, {"b", 2}}));
|
|
|
|
EXPECT_EQ(R"(["a","c","b"])", s({"a", "c", "b"}));
|
|
|
|
EXPECT_EQ("3", s(3.0));
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(JSONExprTests, Escaping) {
|
|
|
|
std::string test = {
|
|
|
|
0, // Strings may contain nulls.
|
|
|
|
'\b', '\f', // Have mnemonics, but we escape numerically.
|
|
|
|
'\r', '\n', '\t', // Escaped with mnemonics.
|
|
|
|
'S', '\"', '\\', // Printable ASCII characters.
|
|
|
|
'\x7f', // Delete is not escaped.
|
|
|
|
'\xce', '\x94', // Non-ASCII UTF-8 is not escaped.
|
|
|
|
};
|
|
|
|
EXPECT_EQ(R"("\u0000\u0008\u000c\r\n\tS\"\\)"
|
|
|
|
u8"\x7fΔ\"",
|
|
|
|
s(test));
|
|
|
|
|
|
|
|
EXPECT_EQ(R"({"object keys are\nescaped":true})",
|
|
|
|
s(obj{{"object keys are\nescaped", true}}));
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(JSONExprTests, PrettyPrinting) {
|
2017-11-07 10:18:24 +08:00
|
|
|
const char str[] = R"({
|
Adds a json::Expr type to represent intermediate JSON expressions.
Summary:
This form can be created with a nice clang-format-friendly literal syntax,
and gets escaping right. It knows how to call unparse() on our Protocol types.
All the places where we pass around JSON internally now use this type.
Object properties are sorted (stored as std::map) and so serialization is
canonicalized, with optional prettyprinting (triggered by a -pretty flag).
This makes the lit tests much nicer to read and somewhat nicer to debug.
(Unfortunately the completion tests use CHECK-DAG, which only has
line-granularity, so pretty-printing is disabled there. In future we
could make completion ordering deterministic, or switch to unittests).
Compared to the current approach, it has some efficiencies like avoiding copies
of string literals used as object keys, but is probably slower overall.
I think the code/test quality benefits are worth it.
This patch doesn't attempt to do anything about JSON *parsing*.
It takes direction from the proposal in this doc[1], but is limited in scope
and visibility, for now.
I am of half a mind just to use Expr as the target of a parser, and maybe do a
little string deduplication, but not bother with clever memory allocation.
That would be simple, and fast enough for clangd...
[1] https://docs.google.com/document/d/1OEF9IauWwNuSigZzvvbjc1cVS1uGHRyGTXaoy3DjqM4/edit
+cc d0k so he can tell me not to use std::map.
Reviewers: ioeric, malaperle
Subscribers: bkramer, ilya-biryukov, mgorny, klimek
Differential Revision: https://reviews.llvm.org/D39435
llvm-svn: 317486
2017-11-06 23:40:30 +08:00
|
|
|
"empty_array": [],
|
|
|
|
"empty_object": {},
|
|
|
|
"full_array": [
|
|
|
|
1,
|
|
|
|
null
|
|
|
|
],
|
|
|
|
"full_object": {
|
|
|
|
"nested_array": [
|
|
|
|
{
|
|
|
|
"property": "value"
|
|
|
|
}
|
|
|
|
]
|
|
|
|
}
|
2017-11-07 10:18:24 +08:00
|
|
|
})";
|
|
|
|
|
|
|
|
EXPECT_EQ(
|
|
|
|
str,
|
Adds a json::Expr type to represent intermediate JSON expressions.
Summary:
This form can be created with a nice clang-format-friendly literal syntax,
and gets escaping right. It knows how to call unparse() on our Protocol types.
All the places where we pass around JSON internally now use this type.
Object properties are sorted (stored as std::map) and so serialization is
canonicalized, with optional prettyprinting (triggered by a -pretty flag).
This makes the lit tests much nicer to read and somewhat nicer to debug.
(Unfortunately the completion tests use CHECK-DAG, which only has
line-granularity, so pretty-printing is disabled there. In future we
could make completion ordering deterministic, or switch to unittests).
Compared to the current approach, it has some efficiencies like avoiding copies
of string literals used as object keys, but is probably slower overall.
I think the code/test quality benefits are worth it.
This patch doesn't attempt to do anything about JSON *parsing*.
It takes direction from the proposal in this doc[1], but is limited in scope
and visibility, for now.
I am of half a mind just to use Expr as the target of a parser, and maybe do a
little string deduplication, but not bother with clever memory allocation.
That would be simple, and fast enough for clangd...
[1] https://docs.google.com/document/d/1OEF9IauWwNuSigZzvvbjc1cVS1uGHRyGTXaoy3DjqM4/edit
+cc d0k so he can tell me not to use std::map.
Reviewers: ioeric, malaperle
Subscribers: bkramer, ilya-biryukov, mgorny, klimek
Differential Revision: https://reviews.llvm.org/D39435
llvm-svn: 317486
2017-11-06 23:40:30 +08:00
|
|
|
sp(obj{
|
|
|
|
{"empty_object", obj{}},
|
|
|
|
{"empty_array", {}},
|
|
|
|
{"full_array", {1, nullptr}},
|
|
|
|
{"full_object",
|
|
|
|
obj{
|
|
|
|
{"nested_array",
|
|
|
|
{obj{
|
|
|
|
{"property", "value"},
|
|
|
|
}}},
|
|
|
|
}},
|
|
|
|
}));
|
|
|
|
}
|
|
|
|
|
|
|
|
} // namespace
|
|
|
|
} // namespace json
|
|
|
|
} // namespace clangd
|
|
|
|
} // namespace clang
|