From 11b4e6b3cd604c113820845aa2f13df4fb6cd5b7 Mon Sep 17 00:00:00 2001 From: Sergey Khil Date: Fri, 12 Jul 2024 17:30:25 +0300 Subject: [PATCH] Add optional mark for property dump and fix print of properties Signed-off-by: Sergey Khil --- ets2panda/ir/base/classProperty.cpp | 5 +++++ ets2panda/ir/ets/etsParameterExpression.cpp | 7 ++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ets2panda/ir/base/classProperty.cpp b/ets2panda/ir/base/classProperty.cpp index 7a07160d7b..a2217e79f9 100644 --- a/ets2panda/ir/base/classProperty.cpp +++ b/ets2panda/ir/base/classProperty.cpp @@ -110,6 +110,10 @@ void ClassProperty::Dump(ir::SrcDumper *dumper) const key_->Dump(dumper); } + if (IsOptionalDeclaration()) { + dumper->Add("?"); + } + if (typeAnnotation_ != nullptr) { dumper->Add(": "); typeAnnotation_->Dump(dumper); @@ -121,6 +125,7 @@ void ClassProperty::Dump(ir::SrcDumper *dumper) const } dumper->Add(";"); + dumper->Endl(); } void ClassProperty::Compile(compiler::PandaGen *pg) const diff --git a/ets2panda/ir/ets/etsParameterExpression.cpp b/ets2panda/ir/ets/etsParameterExpression.cpp index 4b15f70473..df9262725b 100644 --- a/ets2panda/ir/ets/etsParameterExpression.cpp +++ b/ets2panda/ir/ets/etsParameterExpression.cpp @@ -168,11 +168,8 @@ void ETSParameterExpression::Dump(ir::SrcDumper *const dumper) const } } if (initializer_ != nullptr) { - ASSERT(initializer_->IsNumberLiteral()); - if (initializer_->AsNumberLiteral()->Str().Length() > 0) { - dumper->Add(" = "); - initializer_->Dump(dumper); - } + dumper->Add(" = "); + initializer_->Dump(dumper); } } } -- Gitee