mirror of
https://git.tesses.org/tesses50/crosslang.git
synced 2026-09-30 16:54:14 +00:00
Remove THeapObjectHolder, std::nullptr_t from variant
This commit is contained in:
@@ -75,7 +75,7 @@ SyntaxNode Deserialize(std::string astData) {
|
||||
}
|
||||
#if defined(CROSSLANG_ENABLE_JSON)
|
||||
static json_t *Serialize2(SyntaxNode node) {
|
||||
if (std::holds_alternative<std::nullptr_t>(node))
|
||||
if (IsNull(node))
|
||||
return json_null();
|
||||
if (std::holds_alternative<int64_t>(node)) {
|
||||
return json_integer(std::get<int64_t>(node));
|
||||
|
||||
@@ -5,7 +5,7 @@ namespace Tesses::CrossLang {
|
||||
SyntaxNode TObject2SyntaxNode(TObject o) {
|
||||
if (std::holds_alternative<Undefined>(o))
|
||||
return Undefined();
|
||||
if (std::holds_alternative<std::nullptr_t>(o))
|
||||
if (IsNull(o))
|
||||
return nullptr;
|
||||
if (std::holds_alternative<std::string>(o))
|
||||
return std::get<std::string>(o);
|
||||
@@ -491,9 +491,8 @@ void Parser::ParseHtml(std::vector<SyntaxNode> &nodes, std::string var) {
|
||||
EnsureSymbol(">");
|
||||
|
||||
if (std::holds_alternative<std::nullptr_t>(item))
|
||||
item = AdvancedSyntaxNode::Create(
|
||||
DeclareExpression, true,
|
||||
{"item"});
|
||||
item = AdvancedSyntaxNode::Create(DeclareExpression, true,
|
||||
{"item"});
|
||||
|
||||
std::vector<SyntaxNode> _nodes;
|
||||
parseFn(_nodes, "each");
|
||||
@@ -1379,9 +1378,8 @@ SyntaxNode Parser::ParseNode(bool isRoot) {
|
||||
body = ParseNode();
|
||||
}
|
||||
if (std::holds_alternative<std::nullptr_t>(item))
|
||||
item = AdvancedSyntaxNode::Create(
|
||||
DeclareExpression, true,
|
||||
{"item"});
|
||||
item =
|
||||
AdvancedSyntaxNode::Create(DeclareExpression, true, {"item"});
|
||||
|
||||
return AdvancedSyntaxNode::Create(EachStatement, false,
|
||||
{item, list, body});
|
||||
|
||||
Reference in New Issue
Block a user