diff --git a/maldoca/astgen/BUILD b/maldoca/astgen/BUILD index ff3c273..6974f4a 100644 --- a/maldoca/astgen/BUILD +++ b/maldoca/astgen/BUILD @@ -52,7 +52,6 @@ cc_library( ":ast_def_cc_proto", ":symbol", ":type_cc_proto", - "//maldoca/base:status", "@abseil-cpp//absl/algorithm:container", "@abseil-cpp//absl/base:nullability", "@abseil-cpp//absl/container:btree", @@ -63,6 +62,7 @@ cc_library( "@abseil-cpp//absl/log:check", "@abseil-cpp//absl/memory", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/types:span", @@ -247,9 +247,9 @@ cc_library( name = "ast_from_json_utils", hdrs = ["ast_from_json_utils.h"], deps = [ - "//maldoca/base:status", "@abseil-cpp//absl/functional:any_invocable", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", "@nlohmann_json//:json", @@ -260,8 +260,8 @@ cc_library( name = "ir_to_ast_util", hdrs = ["ir_to_ast_util.h"], deps = [ - "//maldoca/base:status", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings:string_view", "@llvm-project//llvm:Support", @@ -284,8 +284,9 @@ cc_binary( ":ir_to_ast_source_printer", "//maldoca/base:filesystem", "//maldoca/base:path", - "//maldoca/base:status", "@abseil-cpp//absl/flags:flag", + "@abseil-cpp//absl/status:status_macros", + "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", ], ) diff --git a/maldoca/astgen/ast_def.cc b/maldoca/astgen/ast_def.cc index 8ef44a8..6debce8 100644 --- a/maldoca/astgen/ast_def.cc +++ b/maldoca/astgen/ast_def.cc @@ -29,6 +29,7 @@ #include "absl/log/log.h" #include "absl/memory/memory.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" @@ -36,7 +37,6 @@ #include "maldoca/astgen/ast_def.pb.h" #include "maldoca/astgen/symbol.h" #include "maldoca/astgen/type.h" -#include "maldoca/base/status_macros.h" namespace maldoca { namespace { @@ -175,8 +175,8 @@ absl::StatusOr EnumDef::FromEnumDefPb(const EnumDefPb& enum_pb) { std::vector members; for (const EnumMemberDefPb& member_pb : enum_pb.members()) { - MALDOCA_ASSIGN_OR_RETURN(auto member, - EnumMemberDef::FromEnumMemberDefPb(member_pb)); + ABSL_ASSIGN_OR_RETURN(auto member, + EnumMemberDef::FromEnumMemberDefPb(member_pb)); members.push_back(std::move(member)); } @@ -194,7 +194,7 @@ absl::StatusOr FieldDef::FromFieldDefPb(const FieldDefPb& field_pb, absl::StrCat("Field '", field_pb.name(), "' is not in camelCase.")); } - MALDOCA_ASSIGN_OR_RETURN(field.type_, FromTypePb(field_pb.type(), lang_name)); + ABSL_ASSIGN_OR_RETURN(field.type_, FromTypePb(field_pb.type(), lang_name)); if (field_pb.optionalness() == OPTIONALNESS_UNSPECIFIED) { return absl::InvalidArgumentError( @@ -284,8 +284,8 @@ std::optional NodeDef::ir_op_mnemonic(FieldKind kind) const { absl::StatusOr AstDef::FromProto(const AstDefPb& pb) { std::vector enum_defs; for (const EnumDefPb& enum_def_pb : pb.enums()) { - MALDOCA_ASSIGN_OR_RETURN(EnumDef enum_def, - EnumDef::FromEnumDefPb(enum_def_pb)); + ABSL_ASSIGN_OR_RETURN(EnumDef enum_def, + EnumDef::FromEnumDefPb(enum_def_pb)); enum_defs.push_back(std::move(enum_def)); } @@ -307,8 +307,8 @@ absl::StatusOr AstDef::FromProto(const AstDefPb& pb) { } for (const FieldDefPb& field_pb : node_pb.fields()) { - MALDOCA_ASSIGN_OR_RETURN( - FieldDef field, FieldDef::FromFieldDefPb(field_pb, pb.lang_name())); + ABSL_ASSIGN_OR_RETURN(FieldDef field, + FieldDef::FromFieldDefPb(field_pb, pb.lang_name())); node->fields_.push_back(std::move(field)); } diff --git a/maldoca/astgen/ast_from_json_printer.cc b/maldoca/astgen/ast_from_json_printer.cc index db38422..ee5a0a8 100644 --- a/maldoca/astgen/ast_from_json_printer.cc +++ b/maldoca/astgen/ast_from_json_printer.cc @@ -112,11 +112,11 @@ void AstFromJsonPrinter::PrintAst(const AstDef& ast, "absl/container/flat_hash_set.h", "absl/memory/memory.h", "absl/status/status.h", + "absl/status/status_macros.h", "absl/status/statusor.h", "absl/strings/str_cat.h", "absl/strings/string_view.h", "maldoca/astgen/ast_from_json_utils.h", - "maldoca/base/status_macros.h", "nlohmann/json.hpp", }); Println(); @@ -465,8 +465,7 @@ void AstFromJsonPrinter::PrintFromJsonFunction(const NodeDef& node, // function. Println( - "MALDOCA_ASSIGN_OR_RETURN" - "(std::string type, GetType($json_variable$));"); + "ABSL_ASSIGN_OR_RETURN(std::string type, GetType($json_variable$));"); Println(); IfStmtPrinter if_stmt_printer(this); @@ -514,7 +513,7 @@ void AstFromJsonPrinter::PrintFromJsonFunction(const NodeDef& node, {"FieldName", node_field_pair.field_name.ToPascalCase()}, }); Println( - "MALDOCA_ASSIGN_OR_RETURN(auto $field_name$, " + "ABSL_ASSIGN_OR_RETURN(auto $field_name$, " "$NodeType$::Get$FieldName$($json_variable$));"); } diff --git a/maldoca/astgen/ast_from_json_utils.h b/maldoca/astgen/ast_from_json_utils.h index a17cf4f..b8e5e08 100644 --- a/maldoca/astgen/ast_from_json_utils.h +++ b/maldoca/astgen/ast_from_json_utils.h @@ -24,11 +24,11 @@ #include #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "nlohmann/json.hpp" -#include "maldoca/base/status_macros.h" namespace maldoca { @@ -169,7 +169,7 @@ Converter> List(Converter elem_converter) { } std::vector result; for (const nlohmann::json& element : json) { - MALDOCA_ASSIGN_OR_RETURN(T value, elem_converter(element)); + ABSL_ASSIGN_OR_RETURN(T value, elem_converter(element)); result.push_back(std::move(value)); } return result; @@ -202,7 +202,7 @@ absl::StatusOr JsonToVariantRecursive(const nlohmann::json& json, VariantOption option, VariantOption... rest) { if (option.predicate(json)) { - MALDOCA_ASSIGN_OR_RETURN(T value, option.converter(json)); + ABSL_ASSIGN_OR_RETURN(T value, option.converter(json)); return Variant(std::move(value)); } return JsonToVariantRecursive(json, std::move(rest)...); diff --git a/maldoca/astgen/ast_gen_main.cc b/maldoca/astgen/ast_gen_main.cc index 44a5ff7..2b2a159 100644 --- a/maldoca/astgen/ast_gen_main.cc +++ b/maldoca/astgen/ast_gen_main.cc @@ -37,7 +37,8 @@ #include "maldoca/astgen/ir_to_ast_source_printer.h" #include "maldoca/base/filesystem.h" #include "maldoca/base/path.h" -#include "maldoca/base/status_macros.h" +#include "absl/status/status_macros.h" +#include "absl/status/statusor.h" ABSL_FLAG(std::string, ast_def_path, "", "The path to the ast_def.textproto file."); @@ -60,39 +61,36 @@ absl::Status AstGenMain() { auto ir_path = absl::GetFlag(FLAGS_ir_path); AstDefPb ast_def_pb; - MALDOCA_RETURN_IF_ERROR(ParseTextProtoFile(ast_def_path, &ast_def_pb)); - MALDOCA_ASSIGN_OR_RETURN(AstDef ast_def, AstDef::FromProto(ast_def_pb)); + ABSL_RETURN_IF_ERROR(ParseTextProtoFile(ast_def_path, &ast_def_pb)); + ABSL_ASSIGN_OR_RETURN(AstDef ast_def, AstDef::FromProto(ast_def_pb)); std::string ast_hdr = PrintAstHeader(ast_def, cc_namespace, ast_path); auto ast_hdr_path = JoinPath(ast_path, "ast.generated.h"); std::cout << "Writing ast_hdr to " << ast_hdr_path << "\n"; - MALDOCA_RETURN_IF_ERROR(SetFileContents(ast_hdr_path, ast_hdr)); + ABSL_RETURN_IF_ERROR(SetFileContents(ast_hdr_path, ast_hdr)); std::string ast_src = PrintAstSource(ast_def, cc_namespace, ast_path); auto ast_src_path = JoinPath(ast_path, "ast.generated.cc"); std::cout << "Writing ast_src to " << ast_src_path << "\n"; - MALDOCA_RETURN_IF_ERROR(SetFileContents(ast_src_path, ast_src)); + ABSL_RETURN_IF_ERROR(SetFileContents(ast_src_path, ast_src)); std::string ast_to_json = PrintAstToJson(ast_def, cc_namespace, ast_path); auto ast_to_json_path = JoinPath(ast_path, "ast_to_json.generated.cc"); std::cout << "Writing ast_to_json to " << ast_to_json_path << "\n"; - MALDOCA_RETURN_IF_ERROR( - SetFileContents(ast_to_json_path, ast_to_json)); + ABSL_RETURN_IF_ERROR(SetFileContents(ast_to_json_path, ast_to_json)); std::string ast_from_json = PrintAstFromJson(ast_def, cc_namespace, ast_path); auto ast_from_json_path = JoinPath(ast_path, "ast_from_json.generated.cc"); std::cout << "Writing ast_from_json to " << ast_from_json_path << "\n"; - MALDOCA_RETURN_IF_ERROR( - SetFileContents(ast_from_json_path, ast_from_json)); + ABSL_RETURN_IF_ERROR(SetFileContents(ast_from_json_path, ast_from_json)); if (!ir_path.empty()) { std::string ir_tablegen = PrintIrTableGen(ast_def, ir_path); auto ir_tablegen_path = JoinPath( ir_path, absl::StrCat(ast_def.lang_name(), "ir_ops.generated.td")); std::cout << "Writing ir_tablegen to " << ir_tablegen_path << "\n"; - MALDOCA_RETURN_IF_ERROR( - SetFileContents(ir_tablegen_path, ir_tablegen)); + ABSL_RETURN_IF_ERROR(SetFileContents(ir_tablegen_path, ir_tablegen)); std::string ast_to_ir = PrintAstToIrSource(ast_def, cc_namespace, ast_path, ir_path); @@ -100,8 +98,7 @@ absl::Status AstGenMain() { ir_path, "conversion", absl::StrCat("ast_to_", ast_def.lang_name(), "ir.generated.cc")); std::cout << "Writing ast_to_ir to " << ast_to_ir_path << "\n"; - MALDOCA_RETURN_IF_ERROR( - SetFileContents(ast_to_ir_path, ast_to_ir)); + ABSL_RETURN_IF_ERROR(SetFileContents(ast_to_ir_path, ast_to_ir)); std::string ir_to_ast = PrintIrToAstSource(ast_def, cc_namespace, ast_path, ir_path); @@ -109,8 +106,7 @@ absl::Status AstGenMain() { ir_path, "conversion", absl::StrCat(ast_def.lang_name(), "ir_to_ast.generated.cc")); std::cout << "Writing ir_to_ast to " << ir_to_ast_path << "\n"; - MALDOCA_RETURN_IF_ERROR( - SetFileContents(ir_to_ast_path, ir_to_ast)); + ABSL_RETURN_IF_ERROR(SetFileContents(ir_to_ast_path, ir_to_ast)); } return absl::OkStatus(); diff --git a/maldoca/astgen/ast_serialize_printer.cc b/maldoca/astgen/ast_serialize_printer.cc index 7d8bdc4..6eb4798 100644 --- a/maldoca/astgen/ast_serialize_printer.cc +++ b/maldoca/astgen/ast_serialize_printer.cc @@ -64,7 +64,6 @@ void AstSerializePrinter::PrintAst(const AstDef& ast, "absl/status/status.h", "absl/strings/string_view.h", "nlohmann/json.hpp", - "maldoca/base/status_macros.h", }); Println(); diff --git a/maldoca/astgen/ast_source_printer.cc b/maldoca/astgen/ast_source_printer.cc index 6eedf5f..8b2dc54 100644 --- a/maldoca/astgen/ast_source_printer.cc +++ b/maldoca/astgen/ast_source_printer.cc @@ -66,7 +66,6 @@ void AstSourcePrinter::PrintAst(const AstDef& ast, PrintIncludeHeader("absl/strings/str_cat.h"); PrintIncludeHeader("absl/strings/string_view.h"); PrintIncludeHeader("nlohmann/json.hpp"); - PrintIncludeHeader("maldoca/base/status_macros.h"); Println(); PrintEnterNamespace(cc_namespace); diff --git a/maldoca/astgen/ir_to_ast_source_printer.cc b/maldoca/astgen/ir_to_ast_source_printer.cc index 72f8457..28e5221 100644 --- a/maldoca/astgen/ir_to_ast_source_printer.cc +++ b/maldoca/astgen/ir_to_ast_source_printer.cc @@ -102,12 +102,12 @@ void IrToAstSourcePrinter::PrintAst(const AstDef& ast, "absl/log/check.h", "absl/log/log.h", "absl/status/status.h", + "absl/status/status_macros.h", "absl/status/statusor.h", "absl/strings/str_cat.h", "absl/types/optional.h", "absl/types/variant.h", "maldoca/astgen/ir_to_ast_util.h", - "maldoca/base/status_macros.h", std::string(ast_header_path), absl::StrCat(ir_path, "/ir.h"), }); @@ -285,7 +285,7 @@ void IrToAstSourcePrinter::PrintField(const AstDef& ast, const NodeDef& node, {"rhs", rhs}, }); - Println("MALDOCA_ASSIGN_OR_RETURN("); + Println("ABSL_ASSIGN_OR_RETURN("); { auto indent = WithIndent(4); Println("auto $lhs$,"); @@ -340,7 +340,7 @@ void IrToAstSourcePrinter::PrintRegion(const AstDef& ast, const NodeDef& node, {"mlirGetter", field.name().ToMlirGetter()}, }); - Println("MALDOCA_ASSIGN_OR_RETURN("); + Println("ABSL_ASSIGN_OR_RETURN("); { auto indent = WithIndent(4); Println("auto $lhs$,"); diff --git a/maldoca/astgen/ir_to_ast_util.h b/maldoca/astgen/ir_to_ast_util.h index 056302e..5f59624 100644 --- a/maldoca/astgen/ir_to_ast_util.h +++ b/maldoca/astgen/ir_to_ast_util.h @@ -34,9 +34,9 @@ #include "mlir/IR/Value.h" #include "mlir/IR/ValueRange.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" -#include "maldoca/base/status_macros.h" namespace maldoca { @@ -397,7 +397,7 @@ inline absl::StatusOr GetStmtsRegionBlock(mlir::Region& region) { template ToRegionConverter ExprRegion(ToOpConverter converter) { return ToRegionConverter([=](mlir::Region& region) -> absl::StatusOr { - MALDOCA_ASSIGN_OR_RETURN(auto val, GetExprRegionValue(region)); + ABSL_ASSIGN_OR_RETURN(auto val, GetExprRegionValue(region)); return Convert(val, converter); }); } @@ -406,8 +406,7 @@ template ToRegionConverter> ExprsRegion(ToOpsConverter converter) { return ToRegionConverter>( [=](mlir::Region& region) -> absl::StatusOr> { - MALDOCA_ASSIGN_OR_RETURN(auto vals, - GetExprsRegionValues(region)); + ABSL_ASSIGN_OR_RETURN(auto vals, GetExprsRegionValues(region)); return Convert(vals, converter); }); } @@ -415,7 +414,7 @@ ToRegionConverter> ExprsRegion(ToOpsConverter converter) { template ToRegionConverter StmtRegion(ToOpConverter converter) { return ToRegionConverter([=](mlir::Region& region) -> absl::StatusOr { - MALDOCA_ASSIGN_OR_RETURN(auto op, GetStmtRegionOperation(region)); + ABSL_ASSIGN_OR_RETURN(auto op, GetStmtRegionOperation(region)); return Convert(op, converter); }); } @@ -424,7 +423,7 @@ template ToRegionConverter> StmtsRegion(ToOpsConverter converter) { return ToRegionConverter>( [=](mlir::Region& region) -> absl::StatusOr> { - MALDOCA_ASSIGN_OR_RETURN(auto block, GetStmtsRegionBlock(region)); + ABSL_ASSIGN_OR_RETURN(auto block, GetStmtsRegionBlock(region)); return Convert(block, converter); }); } @@ -475,7 +474,7 @@ ToAttrConverter> List( std::vector result; result.reserve(attr.size()); for (mlir::Attribute element : attr.getValue()) { - MALDOCA_ASSIGN_OR_RETURN(T value, elem_converter(element)); + ABSL_ASSIGN_OR_RETURN(T value, elem_converter(element)); result.push_back(std::move(value)); } return result; @@ -490,7 +489,7 @@ ToOpsConverter List(ToOpConverter elem_converter) { std::vector result; result.reserve(values.size()); for (mlir::Value element : values) { - MALDOCA_ASSIGN_OR_RETURN(T value, elem_converter(element)); + ABSL_ASSIGN_OR_RETURN(T value, elem_converter(element)); result.push_back(std::move(value)); } return result; @@ -512,7 +511,7 @@ ToOpsConverter List(ToOpConverter elem_converter) { if (!casted) { continue; } - MALDOCA_ASSIGN_OR_RETURN(T value, elem_converter(casted)); + ABSL_ASSIGN_OR_RETURN(T value, elem_converter(casted)); result.push_back(std::move(value)); } return result; diff --git a/maldoca/astgen/test/BUILD b/maldoca/astgen/test/BUILD index e160f8c..82dbb19 100644 --- a/maldoca/astgen/test/BUILD +++ b/maldoca/astgen/test/BUILD @@ -41,10 +41,10 @@ cc_library( "//maldoca/astgen:ts_interface_printer", "//maldoca/base:filesystem", "//maldoca/base:get_runfiles_dir", - "//maldoca/base:status", "//maldoca/base/testing:status_matchers", "@abseil-cpp//absl/log", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/types:optional", diff --git a/maldoca/astgen/test/assign/BUILD b/maldoca/astgen/test/assign/BUILD index 42ba62f..6ee1ccc 100644 --- a/maldoca/astgen/test/assign/BUILD +++ b/maldoca/astgen/test/assign/BUILD @@ -55,12 +55,12 @@ cc_library( hdrs = ["ast.generated.h"], deps = [ "//maldoca/astgen:ast_from_json_utils", - "//maldoca/base:status", "@abseil-cpp//absl/container:flat_hash_map", "@abseil-cpp//absl/container:flat_hash_set", "@abseil-cpp//absl/log", "@abseil-cpp//absl/memory", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", "@nlohmann_json//:json", diff --git a/maldoca/astgen/test/assign/ast.generated.cc b/maldoca/astgen/test/assign/ast.generated.cc index 81163d9..ab310ac 100644 --- a/maldoca/astgen/test/assign/ast.generated.cc +++ b/maldoca/astgen/test/assign/ast.generated.cc @@ -38,7 +38,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "nlohmann/json.hpp" -#include "maldoca/base/status_macros.h" namespace maldoca { diff --git a/maldoca/astgen/test/assign/ast_from_json.generated.cc b/maldoca/astgen/test/assign/ast_from_json.generated.cc index be9a769..d34c902 100644 --- a/maldoca/astgen/test/assign/ast_from_json.generated.cc +++ b/maldoca/astgen/test/assign/ast_from_json.generated.cc @@ -32,11 +32,11 @@ #include "absl/container/flat_hash_set.h" #include "absl/memory/memory.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "maldoca/astgen/ast_from_json_utils.h" -#include "maldoca/base/status_macros.h" #include "nlohmann/json.hpp" namespace maldoca { @@ -51,7 +51,7 @@ AExpression::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(std::string type, GetType(json)); + ABSL_ASSIGN_OR_RETURN(std::string type, GetType(json)); if (type == "Identifier") { return AIdentifier::FromJson(json); @@ -80,7 +80,7 @@ AIdentifier::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto name, AIdentifier::GetName(json)); + ABSL_ASSIGN_OR_RETURN(auto name, AIdentifier::GetName(json)); return absl::make_unique( std::move(name)); @@ -114,8 +114,8 @@ AAssignment::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto lhs, AAssignment::GetLhs(json)); - MALDOCA_ASSIGN_OR_RETURN(auto rhs, AAssignment::GetRhs(json)); + ABSL_ASSIGN_OR_RETURN(auto lhs, AAssignment::GetLhs(json)); + ABSL_ASSIGN_OR_RETURN(auto rhs, AAssignment::GetRhs(json)); return absl::make_unique( std::move(lhs), diff --git a/maldoca/astgen/test/assign/ast_to_json.generated.cc b/maldoca/astgen/test/assign/ast_to_json.generated.cc index fe0cf91..77a9991 100644 --- a/maldoca/astgen/test/assign/ast_to_json.generated.cc +++ b/maldoca/astgen/test/assign/ast_to_json.generated.cc @@ -32,7 +32,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "nlohmann/json.hpp" -#include "maldoca/base/status_macros.h" namespace maldoca { diff --git a/maldoca/astgen/test/assign/conversion/BUILD b/maldoca/astgen/test/assign/conversion/BUILD index 1f61067..2ec0dc4 100644 --- a/maldoca/astgen/test/assign/conversion/BUILD +++ b/maldoca/astgen/test/assign/conversion/BUILD @@ -49,11 +49,11 @@ cc_library( "//maldoca/astgen:ir_to_ast_util", "//maldoca/astgen/test/assign:ast", "//maldoca/astgen/test/assign:ir", - "//maldoca/base:status", "@abseil-cpp//absl/cleanup", "@abseil-cpp//absl/log", "@abseil-cpp//absl/log:check", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/types:optional", diff --git a/maldoca/astgen/test/assign/conversion/air_to_ast.generated.cc b/maldoca/astgen/test/assign/conversion/air_to_ast.generated.cc index 77653f5..1ea49af 100644 --- a/maldoca/astgen/test/assign/conversion/air_to_ast.generated.cc +++ b/maldoca/astgen/test/assign/conversion/air_to_ast.generated.cc @@ -44,12 +44,12 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/types/optional.h" #include "absl/types/variant.h" #include "maldoca/astgen/ir_to_ast_util.h" -#include "maldoca/base/status_macros.h" #include "maldoca/astgen/test/assign/ast.generated.h" #include "maldoca/astgen/test/assign/ir.h" @@ -72,7 +72,7 @@ AirToAst::VisitExpression(AirExpressionOpInterface op) { absl::StatusOr> AirToAst::VisitIdentifier(AirIdentifierOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto name, Convert( op.getNameAttr(), @@ -86,7 +86,7 @@ AirToAst::VisitIdentifier(AirIdentifierOp op) { absl::StatusOr> AirToAst::VisitIdentifierRef(AirIdentifierRefOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto name, Convert( op.getNameAttr(), @@ -100,14 +100,14 @@ AirToAst::VisitIdentifierRef(AirIdentifierRefOp op) { absl::StatusOr> AirToAst::VisitAssignment(AirAssignmentOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto lhs, Convert( op.getLhs(), ToOpConverter(VisitIdentifierRef) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto rhs, Convert( op.getRhs(), diff --git a/maldoca/astgen/test/ast_gen_test_util.cc b/maldoca/astgen/test/ast_gen_test_util.cc index 52f7b2c..36e373e 100644 --- a/maldoca/astgen/test/ast_gen_test_util.cc +++ b/maldoca/astgen/test/ast_gen_test_util.cc @@ -19,6 +19,7 @@ #include "gtest/gtest.h" #include "absl/log/log.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/ascii.h" #include "maldoca/astgen/ast_def.h" @@ -33,7 +34,6 @@ #include "maldoca/astgen/ts_interface_printer.h" #include "maldoca/base/filesystem.h" #include "maldoca/base/get_runfiles_dir.h" -#include "maldoca/base/status_macros.h" #include "maldoca/base/testing/status_matchers.h" namespace maldoca { @@ -42,8 +42,8 @@ absl::StatusOr AstGenTest::LoadAstDef() const { auto ast_def_path = GetDataDependencyFilepath(GetParam().ast_def_path); AstDefPb ast_def_pb; - MALDOCA_RETURN_IF_ERROR(ParseTextProtoFile(ast_def_path, &ast_def_pb)); - MALDOCA_ASSIGN_OR_RETURN(AstDef ast_def, AstDef::FromProto(ast_def_pb)); + ABSL_RETURN_IF_ERROR(ParseTextProtoFile(ast_def_path, &ast_def_pb)); + ABSL_ASSIGN_OR_RETURN(AstDef ast_def, AstDef::FromProto(ast_def_pb)); return ast_def; } diff --git a/maldoca/astgen/test/enum/BUILD b/maldoca/astgen/test/enum/BUILD index 15e93a9..885feea 100644 --- a/maldoca/astgen/test/enum/BUILD +++ b/maldoca/astgen/test/enum/BUILD @@ -57,12 +57,12 @@ cc_library( ], deps = [ "//maldoca/astgen:ast_from_json_utils", - "//maldoca/base:status", "@abseil-cpp//absl/container:flat_hash_map", "@abseil-cpp//absl/container:flat_hash_set", "@abseil-cpp//absl/log", "@abseil-cpp//absl/memory", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", "@nlohmann_json//:json", diff --git a/maldoca/astgen/test/enum/ast.generated.cc b/maldoca/astgen/test/enum/ast.generated.cc index 24eba66..146ae48 100644 --- a/maldoca/astgen/test/enum/ast.generated.cc +++ b/maldoca/astgen/test/enum/ast.generated.cc @@ -38,7 +38,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "nlohmann/json.hpp" -#include "maldoca/base/status_macros.h" namespace maldoca { diff --git a/maldoca/astgen/test/enum/ast_from_json.generated.cc b/maldoca/astgen/test/enum/ast_from_json.generated.cc index 50d4add..67689a9 100644 --- a/maldoca/astgen/test/enum/ast_from_json.generated.cc +++ b/maldoca/astgen/test/enum/ast_from_json.generated.cc @@ -32,11 +32,11 @@ #include "absl/container/flat_hash_set.h" #include "absl/memory/memory.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "maldoca/astgen/ast_from_json_utils.h" -#include "maldoca/base/status_macros.h" #include "nlohmann/json.hpp" namespace maldoca { @@ -69,8 +69,8 @@ ENode::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto unary_operator, ENode::GetUnaryOperator(json)); - MALDOCA_ASSIGN_OR_RETURN(auto escaped_char, ENode::GetEscapedChar(json)); + ABSL_ASSIGN_OR_RETURN(auto unary_operator, ENode::GetUnaryOperator(json)); + ABSL_ASSIGN_OR_RETURN(auto escaped_char, ENode::GetEscapedChar(json)); return absl::make_unique( std::move(unary_operator), diff --git a/maldoca/astgen/test/enum/ast_to_json.generated.cc b/maldoca/astgen/test/enum/ast_to_json.generated.cc index a3dc087..8c84f0c 100644 --- a/maldoca/astgen/test/enum/ast_to_json.generated.cc +++ b/maldoca/astgen/test/enum/ast_to_json.generated.cc @@ -32,7 +32,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "nlohmann/json.hpp" -#include "maldoca/base/status_macros.h" namespace maldoca { diff --git a/maldoca/astgen/test/enum/conversion/BUILD b/maldoca/astgen/test/enum/conversion/BUILD index 311110d..e5ccef2 100644 --- a/maldoca/astgen/test/enum/conversion/BUILD +++ b/maldoca/astgen/test/enum/conversion/BUILD @@ -49,11 +49,11 @@ cc_library( "//maldoca/astgen:ir_to_ast_util", "//maldoca/astgen/test/enum:ast", "//maldoca/astgen/test/enum:ir", - "//maldoca/base:status", "@abseil-cpp//absl/cleanup", "@abseil-cpp//absl/log", "@abseil-cpp//absl/log:check", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/types:optional", diff --git a/maldoca/astgen/test/enum/conversion/eir_to_ast.generated.cc b/maldoca/astgen/test/enum/conversion/eir_to_ast.generated.cc index 31e18ee..0dac808 100644 --- a/maldoca/astgen/test/enum/conversion/eir_to_ast.generated.cc +++ b/maldoca/astgen/test/enum/conversion/eir_to_ast.generated.cc @@ -44,12 +44,12 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/types/optional.h" #include "absl/types/variant.h" #include "maldoca/astgen/ir_to_ast_util.h" -#include "maldoca/base/status_macros.h" #include "maldoca/astgen/test/enum/ast.generated.h" #include "maldoca/astgen/test/enum/ir.h" @@ -57,14 +57,14 @@ namespace maldoca { absl::StatusOr> EirToAst::VisitNode(EirNodeOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto unary_operator, Convert( op.getUnaryOperatorAttr(), Enum(StringToEUnaryOperator) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto escaped_char, Convert( op.getEscapedCharAttr(), diff --git a/maldoca/astgen/test/lambda/BUILD b/maldoca/astgen/test/lambda/BUILD index 8f12d17..d9ed953 100644 --- a/maldoca/astgen/test/lambda/BUILD +++ b/maldoca/astgen/test/lambda/BUILD @@ -54,12 +54,12 @@ cc_library( hdrs = ["ast.generated.h"], deps = [ "//maldoca/astgen:ast_from_json_utils", - "//maldoca/base:status", "@abseil-cpp//absl/container:flat_hash_map", "@abseil-cpp//absl/container:flat_hash_set", "@abseil-cpp//absl/log", "@abseil-cpp//absl/memory", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", "@nlohmann_json//:json", diff --git a/maldoca/astgen/test/lambda/ast.generated.cc b/maldoca/astgen/test/lambda/ast.generated.cc index 221ab1e..65decf7 100644 --- a/maldoca/astgen/test/lambda/ast.generated.cc +++ b/maldoca/astgen/test/lambda/ast.generated.cc @@ -38,7 +38,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "nlohmann/json.hpp" -#include "maldoca/base/status_macros.h" namespace maldoca { diff --git a/maldoca/astgen/test/lambda/ast_from_json.generated.cc b/maldoca/astgen/test/lambda/ast_from_json.generated.cc index d5e3c96..9d53e02 100644 --- a/maldoca/astgen/test/lambda/ast_from_json.generated.cc +++ b/maldoca/astgen/test/lambda/ast_from_json.generated.cc @@ -32,11 +32,11 @@ #include "absl/container/flat_hash_set.h" #include "absl/memory/memory.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "maldoca/astgen/ast_from_json_utils.h" -#include "maldoca/base/status_macros.h" #include "nlohmann/json.hpp" namespace maldoca { @@ -51,7 +51,7 @@ LaExpression::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(std::string type, GetType(json)); + ABSL_ASSIGN_OR_RETURN(std::string type, GetType(json)); if (type == "Variable") { return LaVariable::FromJson(json); @@ -82,7 +82,7 @@ LaVariable::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto identifier, LaVariable::GetIdentifier(json)); + ABSL_ASSIGN_OR_RETURN(auto identifier, LaVariable::GetIdentifier(json)); return absl::make_unique( std::move(identifier)); @@ -116,8 +116,8 @@ LaFunctionDefinition::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto parameter, LaFunctionDefinition::GetParameter(json)); - MALDOCA_ASSIGN_OR_RETURN(auto body, LaFunctionDefinition::GetBody(json)); + ABSL_ASSIGN_OR_RETURN(auto parameter, LaFunctionDefinition::GetParameter(json)); + ABSL_ASSIGN_OR_RETURN(auto body, LaFunctionDefinition::GetBody(json)); return absl::make_unique( std::move(parameter), @@ -152,8 +152,8 @@ LaFunctionCall::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto function, LaFunctionCall::GetFunction(json)); - MALDOCA_ASSIGN_OR_RETURN(auto argument, LaFunctionCall::GetArgument(json)); + ABSL_ASSIGN_OR_RETURN(auto function, LaFunctionCall::GetFunction(json)); + ABSL_ASSIGN_OR_RETURN(auto argument, LaFunctionCall::GetArgument(json)); return absl::make_unique( std::move(function), diff --git a/maldoca/astgen/test/lambda/ast_to_json.generated.cc b/maldoca/astgen/test/lambda/ast_to_json.generated.cc index 1e5faf2..4df56df 100644 --- a/maldoca/astgen/test/lambda/ast_to_json.generated.cc +++ b/maldoca/astgen/test/lambda/ast_to_json.generated.cc @@ -32,7 +32,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "nlohmann/json.hpp" -#include "maldoca/base/status_macros.h" namespace maldoca { diff --git a/maldoca/astgen/test/list/BUILD b/maldoca/astgen/test/list/BUILD index 0148443..3a330cc 100644 --- a/maldoca/astgen/test/list/BUILD +++ b/maldoca/astgen/test/list/BUILD @@ -55,12 +55,12 @@ cc_library( hdrs = ["ast.generated.h"], deps = [ "//maldoca/astgen:ast_from_json_utils", - "//maldoca/base:status", "@abseil-cpp//absl/container:flat_hash_map", "@abseil-cpp//absl/container:flat_hash_set", "@abseil-cpp//absl/log", "@abseil-cpp//absl/memory", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", "@nlohmann_json//:json", diff --git a/maldoca/astgen/test/list/ast.generated.cc b/maldoca/astgen/test/list/ast.generated.cc index c674a3a..e39c37f 100644 --- a/maldoca/astgen/test/list/ast.generated.cc +++ b/maldoca/astgen/test/list/ast.generated.cc @@ -38,7 +38,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "nlohmann/json.hpp" -#include "maldoca/base/status_macros.h" namespace maldoca { diff --git a/maldoca/astgen/test/list/ast_from_json.generated.cc b/maldoca/astgen/test/list/ast_from_json.generated.cc index f3414b1..6c0cbc0 100644 --- a/maldoca/astgen/test/list/ast_from_json.generated.cc +++ b/maldoca/astgen/test/list/ast_from_json.generated.cc @@ -32,11 +32,11 @@ #include "absl/container/flat_hash_set.h" #include "absl/memory/memory.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "maldoca/astgen/ast_from_json_utils.h" -#include "maldoca/base/status_macros.h" #include "nlohmann/json.hpp" namespace maldoca { @@ -117,8 +117,8 @@ LiSimpleList::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto strings, LiSimpleList::GetStrings(json)); - MALDOCA_ASSIGN_OR_RETURN(auto operations, LiSimpleList::GetOperations(json)); + ABSL_ASSIGN_OR_RETURN(auto strings, LiSimpleList::GetStrings(json)); + ABSL_ASSIGN_OR_RETURN(auto operations, LiSimpleList::GetOperations(json)); return absl::make_unique( std::move(strings), @@ -146,7 +146,7 @@ LiOptionalList::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto strings, LiOptionalList::GetStrings(json)); + ABSL_ASSIGN_OR_RETURN(auto strings, LiOptionalList::GetStrings(json)); return absl::make_unique( std::move(strings)); @@ -188,8 +188,8 @@ LiListOfOptional::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto strings, LiListOfOptional::GetStrings(json)); - MALDOCA_ASSIGN_OR_RETURN(auto operations, LiListOfOptional::GetOperations(json)); + ABSL_ASSIGN_OR_RETURN(auto strings, LiListOfOptional::GetStrings(json)); + ABSL_ASSIGN_OR_RETURN(auto operations, LiListOfOptional::GetOperations(json)); return absl::make_unique( std::move(strings), @@ -244,8 +244,8 @@ LiListOfVariant::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto variants, LiListOfVariant::GetVariants(json)); - MALDOCA_ASSIGN_OR_RETURN(auto operations, LiListOfVariant::GetOperations(json)); + ABSL_ASSIGN_OR_RETURN(auto variants, LiListOfVariant::GetVariants(json)); + ABSL_ASSIGN_OR_RETURN(auto operations, LiListOfVariant::GetOperations(json)); return absl::make_unique( std::move(variants), @@ -275,7 +275,7 @@ LiOptionalListOfOptional::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto variants, LiOptionalListOfOptional::GetVariants(json)); + ABSL_ASSIGN_OR_RETURN(auto variants, LiOptionalListOfOptional::GetVariants(json)); return absl::make_unique( std::move(variants)); @@ -310,7 +310,7 @@ LiOptionalListOfVariant::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto variants, LiOptionalListOfVariant::GetVariants(json)); + ABSL_ASSIGN_OR_RETURN(auto variants, LiOptionalListOfVariant::GetVariants(json)); return absl::make_unique( std::move(variants)); @@ -368,8 +368,8 @@ LiListOfOptionalVariant::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto variants, LiListOfOptionalVariant::GetVariants(json)); - MALDOCA_ASSIGN_OR_RETURN(auto operations, LiListOfOptionalVariant::GetOperations(json)); + ABSL_ASSIGN_OR_RETURN(auto variants, LiListOfOptionalVariant::GetVariants(json)); + ABSL_ASSIGN_OR_RETURN(auto operations, LiListOfOptionalVariant::GetOperations(json)); return absl::make_unique( std::move(variants), @@ -407,7 +407,7 @@ LiOptionalListOfOptionalVariant::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto variants, LiOptionalListOfOptionalVariant::GetVariants(json)); + ABSL_ASSIGN_OR_RETURN(auto variants, LiOptionalListOfOptionalVariant::GetVariants(json)); return absl::make_unique( std::move(variants)); diff --git a/maldoca/astgen/test/list/ast_to_json.generated.cc b/maldoca/astgen/test/list/ast_to_json.generated.cc index 3a6eef9..399ae90 100644 --- a/maldoca/astgen/test/list/ast_to_json.generated.cc +++ b/maldoca/astgen/test/list/ast_to_json.generated.cc @@ -32,7 +32,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "nlohmann/json.hpp" -#include "maldoca/base/status_macros.h" namespace maldoca { diff --git a/maldoca/astgen/test/list/conversion/BUILD b/maldoca/astgen/test/list/conversion/BUILD index 065b692..5bf9236 100644 --- a/maldoca/astgen/test/list/conversion/BUILD +++ b/maldoca/astgen/test/list/conversion/BUILD @@ -49,11 +49,11 @@ cc_library( "//maldoca/astgen:ir_to_ast_util", "//maldoca/astgen/test/list:ast", "//maldoca/astgen/test/list:ir", - "//maldoca/base:status", "@abseil-cpp//absl/cleanup", "@abseil-cpp//absl/log", "@abseil-cpp//absl/log:check", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/types:optional", diff --git a/maldoca/astgen/test/list/conversion/liir_to_ast.generated.cc b/maldoca/astgen/test/list/conversion/liir_to_ast.generated.cc index e79bfe4..4542c47 100644 --- a/maldoca/astgen/test/list/conversion/liir_to_ast.generated.cc +++ b/maldoca/astgen/test/list/conversion/liir_to_ast.generated.cc @@ -44,12 +44,12 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/types/optional.h" #include "absl/types/variant.h" #include "maldoca/astgen/ir_to_ast_util.h" -#include "maldoca/base/status_macros.h" #include "maldoca/astgen/test/list/ast.generated.h" #include "maldoca/astgen/test/list/ir.h" @@ -69,7 +69,7 @@ LiirToAst::VisitClass2(LiirClass2Op op) { absl::StatusOr> LiirToAst::VisitSimpleList(LiirSimpleListOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto strings, Convert( op.getStringsAttr(), @@ -78,7 +78,7 @@ LiirToAst::VisitSimpleList(LiirSimpleListOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto operations, Convert( op.getOperations(), @@ -95,7 +95,7 @@ LiirToAst::VisitSimpleList(LiirSimpleListOp op) { absl::StatusOr> LiirToAst::VisitOptionalList(LiirOptionalListOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto strings, Convert( op.getStringsAttr(), @@ -113,7 +113,7 @@ LiirToAst::VisitOptionalList(LiirOptionalListOp op) { absl::StatusOr> LiirToAst::VisitListOfOptional(LiirListOfOptionalOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto strings, Convert( op.getStringsAttr(), @@ -124,7 +124,7 @@ LiirToAst::VisitListOfOptional(LiirListOfOptionalOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto operations, Convert( op.getOperations(), @@ -143,7 +143,7 @@ LiirToAst::VisitListOfOptional(LiirListOfOptionalOp op) { absl::StatusOr> LiirToAst::VisitListOfVariant(LiirListOfVariantOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto variants, Convert( op.getVariantsAttr(), @@ -155,7 +155,7 @@ LiirToAst::VisitListOfVariant(LiirListOfVariantOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto operations, Convert( op.getOperations(), @@ -175,7 +175,7 @@ LiirToAst::VisitListOfVariant(LiirListOfVariantOp op) { absl::StatusOr> LiirToAst::VisitOptionalListOfOptional(LiirOptionalListOfOptionalOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto variants, Convert( op.getVariantsAttr(), @@ -195,7 +195,7 @@ LiirToAst::VisitOptionalListOfOptional(LiirOptionalListOfOptionalOp op) { absl::StatusOr> LiirToAst::VisitOptionalListOfVariant(LiirOptionalListOfVariantOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto variants, Convert( op.getVariantsAttr(), @@ -216,7 +216,7 @@ LiirToAst::VisitOptionalListOfVariant(LiirOptionalListOfVariantOp op) { absl::StatusOr> LiirToAst::VisitListOfOptionalVariant(LiirListOfOptionalVariantOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto variants, Convert( op.getVariantsAttr(), @@ -230,7 +230,7 @@ LiirToAst::VisitListOfOptionalVariant(LiirListOfOptionalVariantOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto operations, Convert( op.getOperations(), @@ -252,7 +252,7 @@ LiirToAst::VisitListOfOptionalVariant(LiirListOfOptionalVariantOp op) { absl::StatusOr> LiirToAst::VisitOptionalListOfOptionalVariant(LiirOptionalListOfOptionalVariantOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto variants, Convert( op.getVariantsAttr(), diff --git a/maldoca/astgen/test/multiple_inheritance/BUILD b/maldoca/astgen/test/multiple_inheritance/BUILD index 94e2c6f..b21d10b 100644 --- a/maldoca/astgen/test/multiple_inheritance/BUILD +++ b/maldoca/astgen/test/multiple_inheritance/BUILD @@ -46,12 +46,12 @@ cc_library( hdrs = ["ast.generated.h"], deps = [ "//maldoca/astgen:ast_from_json_utils", - "//maldoca/base:status", "@abseil-cpp//absl/container:flat_hash_map", "@abseil-cpp//absl/container:flat_hash_set", "@abseil-cpp//absl/log", "@abseil-cpp//absl/memory", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", "@nlohmann_json//:json", diff --git a/maldoca/astgen/test/multiple_inheritance/ast.generated.cc b/maldoca/astgen/test/multiple_inheritance/ast.generated.cc index 2bbabc0..9fa87ab 100644 --- a/maldoca/astgen/test/multiple_inheritance/ast.generated.cc +++ b/maldoca/astgen/test/multiple_inheritance/ast.generated.cc @@ -38,7 +38,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "nlohmann/json.hpp" -#include "maldoca/base/status_macros.h" namespace maldoca { diff --git a/maldoca/astgen/test/multiple_inheritance/ast_from_json.generated.cc b/maldoca/astgen/test/multiple_inheritance/ast_from_json.generated.cc index bb860b8..0409cb8 100644 --- a/maldoca/astgen/test/multiple_inheritance/ast_from_json.generated.cc +++ b/maldoca/astgen/test/multiple_inheritance/ast_from_json.generated.cc @@ -32,11 +32,11 @@ #include "absl/container/flat_hash_set.h" #include "absl/memory/memory.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "maldoca/astgen/ast_from_json_utils.h" -#include "maldoca/base/status_macros.h" #include "nlohmann/json.hpp" namespace maldoca { @@ -69,8 +69,8 @@ MSourceLocation::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto start, MSourceLocation::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, MSourceLocation::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto start, MSourceLocation::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, MSourceLocation::GetEnd(json)); return absl::make_unique( std::move(start), @@ -96,7 +96,7 @@ MNode::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(std::string type, GetType(json)); + ABSL_ASSIGN_OR_RETURN(std::string type, GetType(json)); if (type == "ObjectMethod") { return MObjectMethod::FromJson(json); @@ -127,7 +127,7 @@ MFunction::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(std::string type, GetType(json)); + ABSL_ASSIGN_OR_RETURN(std::string type, GetType(json)); if (type == "ObjectMethod") { return MObjectMethod::FromJson(json); @@ -154,7 +154,7 @@ MObjectMember::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(std::string type, GetType(json)); + ABSL_ASSIGN_OR_RETURN(std::string type, GetType(json)); if (type == "ObjectMethod") { return MObjectMethod::FromJson(json); @@ -172,9 +172,9 @@ MObjectMethod::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, MNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto computed, MObjectMember::GetComputed(json)); - MALDOCA_ASSIGN_OR_RETURN(auto id, MFunction::GetId(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, MNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto computed, MObjectMember::GetComputed(json)); + ABSL_ASSIGN_OR_RETURN(auto id, MFunction::GetId(json)); return absl::make_unique( std::move(loc), diff --git a/maldoca/astgen/test/multiple_inheritance/ast_to_json.generated.cc b/maldoca/astgen/test/multiple_inheritance/ast_to_json.generated.cc index 7b473af..d6ebefb 100644 --- a/maldoca/astgen/test/multiple_inheritance/ast_to_json.generated.cc +++ b/maldoca/astgen/test/multiple_inheritance/ast_to_json.generated.cc @@ -32,7 +32,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "nlohmann/json.hpp" -#include "maldoca/base/status_macros.h" namespace maldoca { diff --git a/maldoca/astgen/test/region/BUILD b/maldoca/astgen/test/region/BUILD index 7b74956..266673e 100644 --- a/maldoca/astgen/test/region/BUILD +++ b/maldoca/astgen/test/region/BUILD @@ -55,12 +55,12 @@ cc_library( hdrs = ["ast.generated.h"], deps = [ "//maldoca/astgen:ast_from_json_utils", - "//maldoca/base:status", "@abseil-cpp//absl/container:flat_hash_map", "@abseil-cpp//absl/container:flat_hash_set", "@abseil-cpp//absl/log", "@abseil-cpp//absl/memory", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", "@nlohmann_json//:json", diff --git a/maldoca/astgen/test/region/ast.generated.cc b/maldoca/astgen/test/region/ast.generated.cc index 5b17d52..3d8486b 100644 --- a/maldoca/astgen/test/region/ast.generated.cc +++ b/maldoca/astgen/test/region/ast.generated.cc @@ -38,7 +38,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "nlohmann/json.hpp" -#include "maldoca/base/status_macros.h" namespace maldoca { diff --git a/maldoca/astgen/test/region/ast_from_json.generated.cc b/maldoca/astgen/test/region/ast_from_json.generated.cc index 69105fd..ffbd2a0 100644 --- a/maldoca/astgen/test/region/ast_from_json.generated.cc +++ b/maldoca/astgen/test/region/ast_from_json.generated.cc @@ -32,11 +32,11 @@ #include "absl/container/flat_hash_set.h" #include "absl/memory/memory.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "maldoca/astgen/ast_from_json_utils.h" -#include "maldoca/base/status_macros.h" #include "nlohmann/json.hpp" namespace maldoca { @@ -75,7 +75,7 @@ RStmt::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto expr, RStmt::GetExpr(json)); + ABSL_ASSIGN_OR_RETURN(auto expr, RStmt::GetExpr(json)); return absl::make_unique( std::move(expr)); @@ -149,12 +149,12 @@ RNode::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto expr, RNode::GetExpr(json)); - MALDOCA_ASSIGN_OR_RETURN(auto optional_expr, RNode::GetOptionalExpr(json)); - MALDOCA_ASSIGN_OR_RETURN(auto exprs, RNode::GetExprs(json)); - MALDOCA_ASSIGN_OR_RETURN(auto stmt, RNode::GetStmt(json)); - MALDOCA_ASSIGN_OR_RETURN(auto optional_stmt, RNode::GetOptionalStmt(json)); - MALDOCA_ASSIGN_OR_RETURN(auto stmts, RNode::GetStmts(json)); + ABSL_ASSIGN_OR_RETURN(auto expr, RNode::GetExpr(json)); + ABSL_ASSIGN_OR_RETURN(auto optional_expr, RNode::GetOptionalExpr(json)); + ABSL_ASSIGN_OR_RETURN(auto exprs, RNode::GetExprs(json)); + ABSL_ASSIGN_OR_RETURN(auto stmt, RNode::GetStmt(json)); + ABSL_ASSIGN_OR_RETURN(auto optional_stmt, RNode::GetOptionalStmt(json)); + ABSL_ASSIGN_OR_RETURN(auto stmts, RNode::GetStmts(json)); return absl::make_unique( std::move(expr), diff --git a/maldoca/astgen/test/region/ast_to_json.generated.cc b/maldoca/astgen/test/region/ast_to_json.generated.cc index bf661f9..fd5e27b 100644 --- a/maldoca/astgen/test/region/ast_to_json.generated.cc +++ b/maldoca/astgen/test/region/ast_to_json.generated.cc @@ -32,7 +32,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "nlohmann/json.hpp" -#include "maldoca/base/status_macros.h" namespace maldoca { diff --git a/maldoca/astgen/test/region/conversion/BUILD b/maldoca/astgen/test/region/conversion/BUILD index 81d71ca..bbd408b 100644 --- a/maldoca/astgen/test/region/conversion/BUILD +++ b/maldoca/astgen/test/region/conversion/BUILD @@ -49,11 +49,11 @@ cc_library( "//maldoca/astgen:ir_to_ast_util", "//maldoca/astgen/test/region:ast", "//maldoca/astgen/test/region:ir", - "//maldoca/base:status", "@abseil-cpp//absl/cleanup", "@abseil-cpp//absl/log", "@abseil-cpp//absl/log:check", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/types:optional", diff --git a/maldoca/astgen/test/region/conversion/rir_to_ast.generated.cc b/maldoca/astgen/test/region/conversion/rir_to_ast.generated.cc index ee3d6cb..4237b15 100644 --- a/maldoca/astgen/test/region/conversion/rir_to_ast.generated.cc +++ b/maldoca/astgen/test/region/conversion/rir_to_ast.generated.cc @@ -44,12 +44,12 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/types/optional.h" #include "absl/types/variant.h" #include "maldoca/astgen/ir_to_ast_util.h" -#include "maldoca/base/status_macros.h" #include "maldoca/astgen/test/region/ast.generated.h" #include "maldoca/astgen/test/region/ir.h" @@ -63,7 +63,7 @@ RirToAst::VisitExpr(RirExprOp op) { absl::StatusOr> RirToAst::VisitStmt(RirStmtOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto expr, Convert( op.getExpr(), @@ -77,7 +77,7 @@ RirToAst::VisitStmt(RirStmtOp op) { absl::StatusOr> RirToAst::VisitNode(RirNodeOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto expr, Convert( op.getExpr(), @@ -86,7 +86,7 @@ RirToAst::VisitNode(RirNodeOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto optional_expr, Convert( op.getOptionalExpr(), @@ -97,7 +97,7 @@ RirToAst::VisitNode(RirNodeOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto exprs, Convert( op.getExprs(), @@ -108,7 +108,7 @@ RirToAst::VisitNode(RirNodeOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto stmt, Convert( op.getStmt(), @@ -117,7 +117,7 @@ RirToAst::VisitNode(RirNodeOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto optional_stmt, Convert( op.getOptionalStmt(), @@ -128,7 +128,7 @@ RirToAst::VisitNode(RirNodeOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto stmts, Convert( op.getStmts(), diff --git a/maldoca/astgen/test/typed_lambda/BUILD b/maldoca/astgen/test/typed_lambda/BUILD index 9c29b3d..8e58fa2 100644 --- a/maldoca/astgen/test/typed_lambda/BUILD +++ b/maldoca/astgen/test/typed_lambda/BUILD @@ -46,12 +46,12 @@ cc_library( hdrs = ["ast.generated.h"], deps = [ "//maldoca/astgen:ast_from_json_utils", - "//maldoca/base:status", "@abseil-cpp//absl/container:flat_hash_map", "@abseil-cpp//absl/container:flat_hash_set", "@abseil-cpp//absl/log", "@abseil-cpp//absl/memory", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", "@nlohmann_json//:json", diff --git a/maldoca/astgen/test/typed_lambda/ast.generated.cc b/maldoca/astgen/test/typed_lambda/ast.generated.cc index 837b40d..6c00f76 100644 --- a/maldoca/astgen/test/typed_lambda/ast.generated.cc +++ b/maldoca/astgen/test/typed_lambda/ast.generated.cc @@ -38,7 +38,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "nlohmann/json.hpp" -#include "maldoca/base/status_macros.h" namespace maldoca { diff --git a/maldoca/astgen/test/typed_lambda/ast_from_json.generated.cc b/maldoca/astgen/test/typed_lambda/ast_from_json.generated.cc index 3b34515..5c9697d 100644 --- a/maldoca/astgen/test/typed_lambda/ast_from_json.generated.cc +++ b/maldoca/astgen/test/typed_lambda/ast_from_json.generated.cc @@ -32,11 +32,11 @@ #include "absl/container/flat_hash_set.h" #include "absl/memory/memory.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "maldoca/astgen/ast_from_json_utils.h" -#include "maldoca/base/status_macros.h" #include "nlohmann/json.hpp" namespace maldoca { @@ -51,7 +51,7 @@ TlNode::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(std::string type, GetType(json)); + ABSL_ASSIGN_OR_RETURN(std::string type, GetType(json)); if (type == "Literal") { return TlLiteral::FromJson(json); @@ -83,7 +83,7 @@ TlExpression::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(std::string type, GetType(json)); + ABSL_ASSIGN_OR_RETURN(std::string type, GetType(json)); if (type == "Literal") { return TlLiteral::FromJson(json); @@ -107,7 +107,7 @@ TlType::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(std::string type, GetType(json)); + ABSL_ASSIGN_OR_RETURN(std::string type, GetType(json)); if (type == "LiteralType") { return TlLiteralType::FromJson(json); @@ -152,7 +152,7 @@ TlLiteral::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto value, TlLiteral::GetValue(json)); + ABSL_ASSIGN_OR_RETURN(auto value, TlLiteral::GetValue(json)); return absl::make_unique( std::move(value)); @@ -177,7 +177,7 @@ TlVariable::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto identifier, TlVariable::GetIdentifier(json)); + ABSL_ASSIGN_OR_RETURN(auto identifier, TlVariable::GetIdentifier(json)); return absl::make_unique( std::move(identifier)); @@ -220,9 +220,9 @@ TlFunctionDefinition::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto parameter, TlFunctionDefinition::GetParameter(json)); - MALDOCA_ASSIGN_OR_RETURN(auto parameter_type, TlFunctionDefinition::GetParameterType(json)); - MALDOCA_ASSIGN_OR_RETURN(auto body, TlFunctionDefinition::GetBody(json)); + ABSL_ASSIGN_OR_RETURN(auto parameter, TlFunctionDefinition::GetParameter(json)); + ABSL_ASSIGN_OR_RETURN(auto parameter_type, TlFunctionDefinition::GetParameterType(json)); + ABSL_ASSIGN_OR_RETURN(auto body, TlFunctionDefinition::GetBody(json)); return absl::make_unique( std::move(parameter), @@ -258,8 +258,8 @@ TlFunctionCall::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto caller, TlFunctionCall::GetCaller(json)); - MALDOCA_ASSIGN_OR_RETURN(auto callee, TlFunctionCall::GetCallee(json)); + ABSL_ASSIGN_OR_RETURN(auto caller, TlFunctionCall::GetCaller(json)); + ABSL_ASSIGN_OR_RETURN(auto callee, TlFunctionCall::GetCallee(json)); return absl::make_unique( std::move(caller), @@ -309,8 +309,8 @@ TlFunctionType::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto parameter_type, TlFunctionType::GetParameterType(json)); - MALDOCA_ASSIGN_OR_RETURN(auto body_type, TlFunctionType::GetBodyType(json)); + ABSL_ASSIGN_OR_RETURN(auto parameter_type, TlFunctionType::GetParameterType(json)); + ABSL_ASSIGN_OR_RETURN(auto body_type, TlFunctionType::GetBodyType(json)); return absl::make_unique( std::move(parameter_type), diff --git a/maldoca/astgen/test/typed_lambda/ast_to_json.generated.cc b/maldoca/astgen/test/typed_lambda/ast_to_json.generated.cc index 784e758..afe80fa 100644 --- a/maldoca/astgen/test/typed_lambda/ast_to_json.generated.cc +++ b/maldoca/astgen/test/typed_lambda/ast_to_json.generated.cc @@ -32,7 +32,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "nlohmann/json.hpp" -#include "maldoca/base/status_macros.h" namespace maldoca { diff --git a/maldoca/astgen/test/union/BUILD b/maldoca/astgen/test/union/BUILD index 1c3d51d..01aff9d 100644 --- a/maldoca/astgen/test/union/BUILD +++ b/maldoca/astgen/test/union/BUILD @@ -48,12 +48,12 @@ cc_library( ], deps = [ "//maldoca/astgen:ast_from_json_utils", - "//maldoca/base:status", "@abseil-cpp//absl/container:flat_hash_map", "@abseil-cpp//absl/container:flat_hash_set", "@abseil-cpp//absl/log", "@abseil-cpp//absl/memory", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", "@nlohmann_json//:json", diff --git a/maldoca/astgen/test/union/ast.generated.cc b/maldoca/astgen/test/union/ast.generated.cc index e3eb1fd..4921a2d 100644 --- a/maldoca/astgen/test/union/ast.generated.cc +++ b/maldoca/astgen/test/union/ast.generated.cc @@ -38,7 +38,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "nlohmann/json.hpp" -#include "maldoca/base/status_macros.h" namespace maldoca { diff --git a/maldoca/astgen/test/union/ast_from_json.generated.cc b/maldoca/astgen/test/union/ast_from_json.generated.cc index f532eef..5a45421 100644 --- a/maldoca/astgen/test/union/ast_from_json.generated.cc +++ b/maldoca/astgen/test/union/ast_from_json.generated.cc @@ -32,11 +32,11 @@ #include "absl/container/flat_hash_set.h" #include "absl/memory/memory.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "maldoca/astgen/ast_from_json_utils.h" -#include "maldoca/base/status_macros.h" #include "nlohmann/json.hpp" namespace maldoca { @@ -51,7 +51,7 @@ EUnionType::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(std::string type, GetType(json)); + ABSL_ASSIGN_OR_RETURN(std::string type, GetType(json)); if (type == "SubNodeA") { return ESubNodeA::FromJson(json); @@ -89,8 +89,8 @@ ENode::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto name, ENode::GetName(json)); - MALDOCA_ASSIGN_OR_RETURN(auto content, ENode::GetContent(json)); + ABSL_ASSIGN_OR_RETURN(auto name, ENode::GetName(json)); + ABSL_ASSIGN_OR_RETURN(auto content, ENode::GetContent(json)); return absl::make_unique( std::move(name), @@ -116,7 +116,7 @@ ESubNodeA::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto value_a, ESubNodeA::GetValueA(json)); + ABSL_ASSIGN_OR_RETURN(auto value_a, ESubNodeA::GetValueA(json)); return absl::make_unique( std::move(value_a)); @@ -141,7 +141,7 @@ ESubNodeB::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto value_b, ESubNodeB::GetValueB(json)); + ABSL_ASSIGN_OR_RETURN(auto value_b, ESubNodeB::GetValueB(json)); return absl::make_unique( std::move(value_b)); diff --git a/maldoca/astgen/test/union/ast_to_json.generated.cc b/maldoca/astgen/test/union/ast_to_json.generated.cc index 28f8437..616b9dd 100644 --- a/maldoca/astgen/test/union/ast_to_json.generated.cc +++ b/maldoca/astgen/test/union/ast_to_json.generated.cc @@ -32,7 +32,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "nlohmann/json.hpp" -#include "maldoca/base/status_macros.h" namespace maldoca { diff --git a/maldoca/astgen/test/variant/BUILD b/maldoca/astgen/test/variant/BUILD index 74b9314..c5e4451 100644 --- a/maldoca/astgen/test/variant/BUILD +++ b/maldoca/astgen/test/variant/BUILD @@ -55,12 +55,12 @@ cc_library( hdrs = ["ast.generated.h"], deps = [ "//maldoca/astgen:ast_from_json_utils", - "//maldoca/base:status", "@abseil-cpp//absl/container:flat_hash_map", "@abseil-cpp//absl/container:flat_hash_set", "@abseil-cpp//absl/log", "@abseil-cpp//absl/memory", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", "@nlohmann_json//:json", diff --git a/maldoca/astgen/test/variant/ast.generated.cc b/maldoca/astgen/test/variant/ast.generated.cc index f6e69f4..c572584 100644 --- a/maldoca/astgen/test/variant/ast.generated.cc +++ b/maldoca/astgen/test/variant/ast.generated.cc @@ -38,7 +38,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "nlohmann/json.hpp" -#include "maldoca/base/status_macros.h" namespace maldoca { diff --git a/maldoca/astgen/test/variant/ast_from_json.generated.cc b/maldoca/astgen/test/variant/ast_from_json.generated.cc index c8dbf45..d741723 100644 --- a/maldoca/astgen/test/variant/ast_from_json.generated.cc +++ b/maldoca/astgen/test/variant/ast_from_json.generated.cc @@ -32,11 +32,11 @@ #include "absl/container/flat_hash_set.h" #include "absl/memory/memory.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "maldoca/astgen/ast_from_json_utils.h" -#include "maldoca/base/status_macros.h" #include "nlohmann/json.hpp" namespace maldoca { @@ -51,7 +51,7 @@ VBaseClass::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(std::string type, GetType(json)); + ABSL_ASSIGN_OR_RETURN(std::string type, GetType(json)); if (type == "DerivedClass1") { return VDerivedClass1::FromJson(json); @@ -235,12 +235,12 @@ VNode::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto simple_variant_builtin, VNode::GetSimpleVariantBuiltin(json)); - MALDOCA_ASSIGN_OR_RETURN(auto nullable_variant_builtin, VNode::GetNullableVariantBuiltin(json)); - MALDOCA_ASSIGN_OR_RETURN(auto optional_variant_builtin, VNode::GetOptionalVariantBuiltin(json)); - MALDOCA_ASSIGN_OR_RETURN(auto simple_variant_class, VNode::GetSimpleVariantClass(json)); - MALDOCA_ASSIGN_OR_RETURN(auto nullable_variant_class, VNode::GetNullableVariantClass(json)); - MALDOCA_ASSIGN_OR_RETURN(auto optional_variant_class, VNode::GetOptionalVariantClass(json)); + ABSL_ASSIGN_OR_RETURN(auto simple_variant_builtin, VNode::GetSimpleVariantBuiltin(json)); + ABSL_ASSIGN_OR_RETURN(auto nullable_variant_builtin, VNode::GetNullableVariantBuiltin(json)); + ABSL_ASSIGN_OR_RETURN(auto optional_variant_builtin, VNode::GetOptionalVariantBuiltin(json)); + ABSL_ASSIGN_OR_RETURN(auto simple_variant_class, VNode::GetSimpleVariantClass(json)); + ABSL_ASSIGN_OR_RETURN(auto nullable_variant_class, VNode::GetNullableVariantClass(json)); + ABSL_ASSIGN_OR_RETURN(auto optional_variant_class, VNode::GetOptionalVariantClass(json)); return absl::make_unique( std::move(simple_variant_builtin), diff --git a/maldoca/astgen/test/variant/ast_to_json.generated.cc b/maldoca/astgen/test/variant/ast_to_json.generated.cc index 7702a1b..a904a46 100644 --- a/maldoca/astgen/test/variant/ast_to_json.generated.cc +++ b/maldoca/astgen/test/variant/ast_to_json.generated.cc @@ -32,7 +32,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "nlohmann/json.hpp" -#include "maldoca/base/status_macros.h" namespace maldoca { diff --git a/maldoca/astgen/test/variant/conversion/BUILD b/maldoca/astgen/test/variant/conversion/BUILD index be9032c..78816c7 100644 --- a/maldoca/astgen/test/variant/conversion/BUILD +++ b/maldoca/astgen/test/variant/conversion/BUILD @@ -49,11 +49,11 @@ cc_library( "//maldoca/astgen:ir_to_ast_util", "//maldoca/astgen/test/variant:ast", "//maldoca/astgen/test/variant:ir", - "//maldoca/base:status", "@abseil-cpp//absl/cleanup", "@abseil-cpp//absl/log", "@abseil-cpp//absl/log:check", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/types:optional", diff --git a/maldoca/astgen/test/variant/conversion/vir_to_ast.generated.cc b/maldoca/astgen/test/variant/conversion/vir_to_ast.generated.cc index 3c06ec4..f2fe63f 100644 --- a/maldoca/astgen/test/variant/conversion/vir_to_ast.generated.cc +++ b/maldoca/astgen/test/variant/conversion/vir_to_ast.generated.cc @@ -44,12 +44,12 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/types/optional.h" #include "absl/types/variant.h" #include "maldoca/astgen/ir_to_ast_util.h" -#include "maldoca/base/status_macros.h" #include "maldoca/astgen/test/variant/ast.generated.h" #include "maldoca/astgen/test/variant/ir.h" @@ -84,7 +84,7 @@ VirToAst::VisitDerivedClass2(VirDerivedClass2Op op) { absl::StatusOr> VirToAst::VisitNode(VirNodeOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto simple_variant_builtin, Convert( op.getSimpleVariantBuiltinAttr(), @@ -94,7 +94,7 @@ VirToAst::VisitNode(VirNodeOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto nullable_variant_builtin, Convert( op.getNullableVariantBuiltinAttr(), @@ -106,7 +106,7 @@ VirToAst::VisitNode(VirNodeOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto optional_variant_builtin, Convert( op.getOptionalVariantBuiltinAttr(), @@ -118,7 +118,7 @@ VirToAst::VisitNode(VirNodeOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto simple_variant_class, Convert( op.getSimpleVariantClass(), @@ -128,7 +128,7 @@ VirToAst::VisitNode(VirNodeOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto nullable_variant_class, Convert( op.getNullableVariantClass(), @@ -140,7 +140,7 @@ VirToAst::VisitNode(VirNodeOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto optional_variant_class, Convert( op.getOptionalVariantClass(), diff --git a/maldoca/astgen/type.cc b/maldoca/astgen/type.cc index 5156810..5a8c498 100644 --- a/maldoca/astgen/type.cc +++ b/maldoca/astgen/type.cc @@ -27,6 +27,7 @@ #include "absl/log/log.h" #include "absl/memory/memory.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" @@ -35,7 +36,6 @@ #include "maldoca/astgen/ast_def.pb.h" #include "maldoca/astgen/symbol.h" #include "maldoca/astgen/type.pb.h" -#include "maldoca/base/status_macros.h" namespace maldoca { namespace { @@ -145,7 +145,7 @@ absl::StatusOr> FromListTypePb( break; case NonListTypePb::kVariant: { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( element_type, FromVariantTypePb(pb.element_type().variant(), lang_name)); break; diff --git a/maldoca/base/BUILD b/maldoca/base/BUILD index ecd3353..d10fa59 100644 --- a/maldoca/base/BUILD +++ b/maldoca/base/BUILD @@ -29,8 +29,8 @@ cc_library( srcs = ["error_code_to_status.cc"], hdrs = ["error_code_to_status.h"], deps = [ - ":status", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_builder", ], ) @@ -61,9 +61,10 @@ cc_library( hdrs = ["filesystem.h"], deps = [ ":error_code_to_status", - ":status", "@abseil-cpp//absl/log:check", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_builder", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/strings:string_view", @@ -84,68 +85,17 @@ cc_library( ], ) -cc_library( - name = "source_location", - hdrs = ["source_location.h"], - deps = [ - ], -) - cc_library( name = "ret_check", srcs = ["ret_check.cc"], hdrs = ["ret_check.h"], deps = [ - ":source_location", - ":status", "@abseil-cpp//absl/base:core_headers", "@abseil-cpp//absl/base:log_severity", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_builder", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", - ], -) - -cc_library( - name = "symbolized_stacktrace", - srcs = ["symbolized_stacktrace.cc"], - hdrs = ["symbolized_stacktrace.h"], - deps = [ - "@abseil-cpp//absl/debugging:stacktrace", - "@abseil-cpp//absl/debugging:symbolize", - "@abseil-cpp//absl/strings:str_format", - ], -) - -cc_test( - name = "symbolized_stacktrace_test", - srcs = ["symbolized_stacktrace_test.cc"], - deps = [ - ":symbolized_stacktrace", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "status", - srcs = ["status_builder.cc"], - hdrs = [ - "status_builder.h", - "status_macros.h", - ], - deps = [ - ":source_location", - ":symbolized_stacktrace", - "@abseil-cpp//absl/base:core_headers", - "@abseil-cpp//absl/base:log_severity", - "@abseil-cpp//absl/container:flat_hash_map", - "@abseil-cpp//absl/log", - "@abseil-cpp//absl/log:log_entry", - "@abseil-cpp//absl/log:log_sink", - "@abseil-cpp//absl/status", - "@abseil-cpp//absl/strings", - "@abseil-cpp//absl/strings:cord", - "@abseil-cpp//absl/synchronization", - "@abseil-cpp//absl/time", - "@abseil-cpp//absl/types:span", + "@abseil-cpp//absl/types:source_location", ], ) diff --git a/maldoca/base/error_code_to_status.cc b/maldoca/base/error_code_to_status.cc index c12c314..7fa8dfb 100644 --- a/maldoca/base/error_code_to_status.cc +++ b/maldoca/base/error_code_to_status.cc @@ -17,7 +17,7 @@ #include // NOLINT(build/c++11): open source #include "absl/status/status.h" -#include "maldoca/base/status_builder.h" +#include "absl/status/status_builder.h" namespace maldoca { @@ -197,12 +197,13 @@ absl::StatusCode ErrorCodeToStatusCode(const std::error_code& ec) { } } -StatusBuilder ErrorCodeToStatus(const std::error_code& ec) { - return StatusBuilder(absl::Status(ErrorCodeToStatusCode(ec), ec.message())); +absl::StatusBuilder ErrorCodeToStatus(const std::error_code& ec) { + return absl::StatusBuilder( + absl::Status(ErrorCodeToStatusCode(ec), ec.message())); } -StatusBuilder ErrnoToStatus(int errno_value) { - return StatusBuilder( +absl::StatusBuilder ErrnoToStatus(int errno_value) { + return absl::StatusBuilder( ErrorCodeToStatus(std::error_code(errno_value, std::generic_category()))); } diff --git a/maldoca/base/error_code_to_status.h b/maldoca/base/error_code_to_status.h index 0b77ff3..58c79fd 100644 --- a/maldoca/base/error_code_to_status.h +++ b/maldoca/base/error_code_to_status.h @@ -18,16 +18,16 @@ #include // NOLINT(build/c++11): open source #include "absl/status/status.h" -#include "maldoca/base/status_builder.h" +#include "absl/status/status_builder.h" namespace maldoca { absl::StatusCode ErrorCodeToStatusCode(const std::error_code& ec); -StatusBuilder ErrorCodeToStatus(const std::error_code& ec); +absl::StatusBuilder ErrorCodeToStatus(const std::error_code& ec); // Converts an `errno` value into an absl::Status. -StatusBuilder ErrnoToStatus(int errno_value); +absl::StatusBuilder ErrnoToStatus(int errno_value); } // namespace maldoca diff --git a/maldoca/base/filesystem.cc b/maldoca/base/filesystem.cc index d733a46..e4dc1cd 100644 --- a/maldoca/base/filesystem.cc +++ b/maldoca/base/filesystem.cc @@ -23,12 +23,12 @@ #include "absl/log/check.h" #include "absl/status/status.h" +#include "absl/status/status_builder.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "maldoca/base/error_code_to_status.h" -#include "maldoca/base/status_builder.h" -#include "maldoca/base/status_macros.h" #include "google/protobuf/io/tokenizer.h" #include "google/protobuf/message.h" #include "google/protobuf/text_format.h" @@ -40,7 +40,7 @@ namespace { // the filename. absl::Status ErrNoToStatusWithFilename(int errno_value, const std::filesystem::path& file_name) { - StatusBuilder builder = ErrnoToStatus(errno); + absl::StatusBuilder builder = ErrnoToStatus(errno); builder << file_name.string(); return std::move(builder); } @@ -166,7 +166,7 @@ absl::Status ParseTextProto(absl::string_view contents, absl::Status ParseTextProtoFile(const std::filesystem::path& file_name, google::protobuf::Message* proto) { - MALDOCA_ASSIGN_OR_RETURN(std::string text_proto, GetFileContents(file_name)); + ABSL_ASSIGN_OR_RETURN(std::string text_proto, GetFileContents(file_name)); return ParseTextProto(text_proto, file_name, proto); } diff --git a/maldoca/base/ret_check.cc b/maldoca/base/ret_check.cc index 4bc6102..cee0898 100644 --- a/maldoca/base/ret_check.cc +++ b/maldoca/base/ret_check.cc @@ -22,34 +22,34 @@ #include "absl/base/log_severity.h" #include "absl/status/status.h" -#include "maldoca/base/source_location.h" -#include "maldoca/base/status_builder.h" +#include "absl/status/status_builder.h" +#include "absl/types/source_location.h" namespace maldoca { namespace internal_status_macros_ret_check { -StatusBuilder RetCheckFailSlowPath(SourceLocation location) { - return InternalErrorBuilder(location) +absl::StatusBuilder RetCheckFailSlowPath(absl::SourceLocation location) { + return absl::StatusBuilder(absl::StatusCode::kInternal, location) .Log(absl::LogSeverity::kError) .EmitStackTrace() << "MALDOCA_RET_CHECK failure (" << location.file_name() << ":" << location.line() << ") "; } -StatusBuilder RetCheckFailSlowPath(SourceLocation location, - std::string* condition) { +absl::StatusBuilder RetCheckFailSlowPath(absl::SourceLocation location, + std::string* condition) { std::unique_ptr cleanup(condition); return RetCheckFailSlowPath(location) << *condition << " "; } -StatusBuilder RetCheckFailSlowPath(SourceLocation location, - const char* condition) { +absl::StatusBuilder RetCheckFailSlowPath(absl::SourceLocation location, + const char* condition) { return RetCheckFailSlowPath(location) << condition << " "; } -StatusBuilder RetCheckFailSlowPath(SourceLocation location, - const char* condition, - const absl::Status& status) { +absl::StatusBuilder RetCheckFailSlowPath(absl::SourceLocation location, + const char* condition, + const absl::Status& status) { return RetCheckFailSlowPath(location) << condition << " returned " << status.ToString() << " "; } diff --git a/maldoca/base/ret_check.h b/maldoca/base/ret_check.h index cf2ef75..0908b26 100644 --- a/maldoca/base/ret_check.h +++ b/maldoca/base/ret_check.h @@ -46,33 +46,33 @@ #include "absl/base/attributes.h" #include "absl/base/optimization.h" #include "absl/status/status.h" +#include "absl/status/status_builder.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" -#include "maldoca/base/source_location.h" -#include "maldoca/base/status_builder.h" -#include "maldoca/base/status_macros.h" +#include "absl/types/source_location.h" namespace maldoca { namespace internal_status_macros_ret_check { // Returns a StatusBuilder that corresponds to a `MALDOCA_RET_CHECK` failure. -StatusBuilder RetCheckFailSlowPath(SourceLocation location); -StatusBuilder RetCheckFailSlowPath(SourceLocation location, - const char* condition); -StatusBuilder RetCheckFailSlowPath(SourceLocation location, - const char* condition, - const absl::Status& s); +absl::StatusBuilder RetCheckFailSlowPath(absl::SourceLocation location); +absl::StatusBuilder RetCheckFailSlowPath(absl::SourceLocation location, + const char* condition); +absl::StatusBuilder RetCheckFailSlowPath(absl::SourceLocation location, + const char* condition, + const absl::Status& s); // Takes ownership of `condition`. This API is a little quirky because it is // designed to make use of the `::Check_*Impl` methods that implement `CHECK_*` // and `DCHECK_*`. -StatusBuilder RetCheckFailSlowPath(SourceLocation location, - std::string* condition); +absl::StatusBuilder RetCheckFailSlowPath(absl::SourceLocation location, + std::string* condition); -inline StatusBuilder RetCheckImpl(const absl::Status& status, - const char* condition, - SourceLocation location) { +inline absl::StatusBuilder RetCheckImpl(const absl::Status& status, + const char* condition, + absl::SourceLocation location) { if (ABSL_PREDICT_TRUE(status.ok())) { - return StatusBuilder(absl::OkStatus(), location); + return absl::StatusBuilder(absl::OkStatus(), location); } return RetCheckFailSlowPath(location, condition, status); } @@ -214,11 +214,11 @@ inline unsigned long long GetReferenceableValue( // NOLINT: runtime/int #define MALDOCA_RET_CHECK(cond) \ while (ABSL_PREDICT_FALSE(!(cond))) \ return ::maldoca::internal_status_macros_ret_check::RetCheckFailSlowPath( \ - MALDOCA_LOC, #cond) + absl::SourceLocation::current(), #cond) #define MALDOCA_RET_CHECK_FAIL() \ return ::maldoca::internal_status_macros_ret_check::RetCheckFailSlowPath( \ - MALDOCA_LOC) + absl::SourceLocation::current()) // Takes an expression returning absl::Status and asserts that the status is // `ok()`. If not, it returns an internal error. @@ -232,10 +232,10 @@ inline unsigned long long GetReferenceableValue( // NOLINT: runtime/int // `absl::Status` cannot fail, particularly when the error code itself should // not be surfaced. #define MALDOCA_RET_CHECK_OK(status) \ - MALDOCA_RETURN_IF_ERROR( \ + ABSL_RETURN_IF_ERROR( \ ::maldoca::internal_status_macros_ret_check::RetCheckImpl( \ ::maldoca::internal_status_macros_ret_check::AsStatus(status), \ - #status, MALDOCA_LOC)) + #status, absl::SourceLocation::current())) #if defined(STATIC_ANALYSIS) || defined(PORTABLE_STATUS) #define MALDOCA_COMMON_MACROS_INTERNAL_RET_CHECK_OP(name, op, lhs, rhs) \ @@ -250,7 +250,7 @@ inline unsigned long long GetReferenceableValue( // NOLINT: runtime/int GetReferenceableValue(rhs), \ #lhs " " #op " " #rhs)) \ return ::maldoca::internal_status_macros_ret_check::RetCheckFailSlowPath( \ - MALDOCA_LOC, _result) + absl::SourceLocation::current(), _result) #endif #define MALDOCA_RET_CHECK_EQ(lhs, rhs) \ diff --git a/maldoca/base/source_location.h b/maldoca/base/source_location.h deleted file mode 100644 index d3105d7..0000000 --- a/maldoca/base/source_location.h +++ /dev/null @@ -1,148 +0,0 @@ -// Copyright 2025 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef MALDOCA_BASE_SOURCE_LOCATION_H_ -#define MALDOCA_BASE_SOURCE_LOCATION_H_ - -#ifdef MALDOCA_USE_ABSL_SOURCE_LOCATION - -#include "absl/types/source_location.h" - -// Use absl::SourceLocation -namespace maldoca { - -using SourceLocation = absl::SourceLocation; -#define MALDOCA_LOC ABSL_LOC -#define MALDOCA_LOC_CURRENT_DEFAULT_ARG ABSL_LOC_CURRENT_DEFAULT_ARG - -} // namespace maldoca - -#else - -#include - -#define MALDOCA_HAVE_SOURCE_LOCATION_CURRENT 1 - -namespace maldoca { - -// Class representing a specific location in the source code of a program. -// `maldoca::SourceLocation` is copyable. -class SourceLocation { - struct PrivateTag { - private: - explicit PrivateTag() = default; - friend class SourceLocation; - }; - - public: - // Avoid this constructor; it populates the object with dummy values. - constexpr SourceLocation() : line_(0), file_name_(nullptr) {} - - // Wrapper to invoke the private constructor below. This should only be used - // by the `MALDOCA_LOC` macro, hence the name. - static constexpr SourceLocation DoNotInvokeDirectly(std::uint_least32_t line, - const char* file_name) { - return SourceLocation(line, file_name); - } - -#ifdef MALDOCA_HAVE_SOURCE_LOCATION_CURRENT - // SourceLocation::current - // - // Creates a `SourceLocation` based on the current line and file. APIs that - // accept a `SourceLocation` as a default parameter can use this to capture - // their caller's locations. - // - // Example: - // - // void TracedAdd(int i, SourceLocation loc = SourceLocation::current()) { - // std::cout << loc.file_name() << ":" << loc.line() << " added " << i; - // ... - // } - // - // void UserCode() { - // TracedAdd(1); - // TracedAdd(2); - // } - static constexpr SourceLocation current( - PrivateTag = PrivateTag{}, std::uint_least32_t line = __builtin_LINE(), - const char* file_name = __builtin_FILE()) { - return SourceLocation(line, file_name); - } -#else - // Creates a dummy `SourceLocation` of "" at line number 1, - // if no `SourceLocation::current()` implementation is available. - static constexpr SourceLocation current() { - return SourceLocation(1, ""); - } -#endif - // The line number of the captured source location. - constexpr std::uint_least32_t line() const { return line_; } - - // The file name of the captured source location. - constexpr const char* file_name() const { return file_name_; } - - // `column()` and `function_name()` are omitted because we don't have a way to - // support them. - - private: - // Do not invoke this constructor directly. Instead, use the `MALDOCA_LOC` - // macro below. - // - // `file_name` must outlive all copies of the `maldoca::SourceLocation` - // object, so in practice it should be a string literal. - constexpr SourceLocation(std::uint_least32_t line, const char* file_name) - : line_(line), file_name_(file_name) {} - - friend constexpr int UseUnused() { - static_assert(SourceLocation(0, nullptr).unused_column_ == 0, - "Use the otherwise-unused member."); - return 0; - } - - // "unused" members are present to minimize future changes in the size of this - // type. - std::uint_least32_t line_; - std::uint_least32_t unused_column_ = 0; - const char* file_name_; -}; - -} // namespace maldoca - -// If a function takes an `maldoca::SourceLocation` parameter, pass this as the -// argument. -#define MALDOCA_LOC \ - ::maldoca::SourceLocation::DoNotInvokeDirectly(__LINE__, __FILE__) - -// ABSL_LOC_CURRENT_DEFAULT_ARG -// -// Specifies that a function should use `maldoca::SourceLocation::current()` on -// platforms where it will return useful information, but require explicitly -// passing `MALDOCA_LOC` on platforms where it would return dummy information. -// -// Usage: -// -// void MyLog(std::string_view msg, -// maldoca::SourceLocation loc MALDOCA_LOC_CURRENT_DEFAULT_ARG) { -// std::cout << loc.file_name() << "@" << loc.line() << ": " << msg; -// } -// -#if MALDOCA_HAVE_SOURCE_LOCATION_CURRENT -#define MALDOCA_LOC_CURRENT_DEFAULT_ARG = ::maldoca::SourceLocation::current() -#else -#define MALDOCA_LOC_CURRENT_DEFAULT_ARG -#endif - -#endif // MALDOCA_USE_ABSL_SOURCE_LOCATION - -#endif // MALDOCA_BASE_SOURCE_LOCATION_H_ diff --git a/maldoca/base/status_builder.cc b/maldoca/base/status_builder.cc deleted file mode 100644 index 836ce96..0000000 --- a/maldoca/base/status_builder.cc +++ /dev/null @@ -1,329 +0,0 @@ -// Copyright 2025 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "maldoca/base/status_builder.h" - -#include -#include -#include -#include -#include -#include - -#include "absl/base/log_severity.h" -#include "absl/base/thread_annotations.h" -#include "absl/container/flat_hash_map.h" -#include "absl/log/log.h" -#include "absl/log/log_entry.h" -#include "absl/log/log_sink.h" -#include "absl/status/status.h" -#include "absl/strings/cord.h" -#include "absl/strings/str_cat.h" -#include "absl/strings/string_view.h" -#include "absl/synchronization/mutex.h" -#include "absl/time/clock.h" -#include "absl/time/time.h" -#include "absl/types/span.h" -#include "maldoca/base/source_location.h" -#include "maldoca/base/symbolized_stacktrace.h" - -namespace maldoca { - -StatusBuilder::Rep::Rep(const Rep& r) - : logging_mode(r.logging_mode), - log_severity(r.log_severity), - verbose_level(r.verbose_level), - n(r.n), - period(r.period), - stream(r.stream.str()), - should_log_stack_trace(r.should_log_stack_trace), - message_join_style(r.message_join_style), - sink(r.sink) {} - -absl::Status StatusBuilder::JoinMessageToStatus(absl::Status s, - absl::string_view msg, - MessageJoinStyle style) { - if (msg.empty()) { - return s; - } - if (style == MessageJoinStyle::kAnnotate) { - return AnnotateStatus(s, msg); - } - std::string new_msg = style == MessageJoinStyle::kPrepend - ? absl::StrCat(msg, s.message()) - : absl::StrCat(s.message(), msg); - absl::Status result = WithMessage(s, new_msg); - SetStatusCode(s.code(), &result); - return result; -} - -void StatusBuilder::ConditionallyLog(const absl::Status& status) const { - if (rep_->logging_mode == Rep::LoggingMode::kDisabled) { - return; - } - - absl::LogSeverity severity = rep_->log_severity; - switch (rep_->logging_mode) { - case Rep::LoggingMode::kDisabled: - case Rep::LoggingMode::kLog: - break; - case Rep::LoggingMode::kVLog: { - // Combine these into a single struct so that we only have one atomic - // access on each pass through the function (instead of one for the map - // and one for the mutex). - struct LogSites { - absl::Mutex mutex; - // NOLINTNEXTLINE(abseil-no-internal-dependencies) - std::unordered_map - sites_by_file ABSL_GUARDED_BY(mutex); - }; - static auto* vlog_sites = new LogSites(); - - vlog_sites->mutex.lock(); - // This assumes that loc_.file_name() is a compile time constant in order - // to satisfy the lifetime constraints imposed by VLogSite. The - // constructors of SourceLocation guarantee that for us. - auto [iter, unused] = vlog_sites->sites_by_file.try_emplace( - loc_.file_name(), loc_.file_name()); - auto& site = iter->second; - vlog_sites->mutex.unlock(); - - if (!site.IsEnabled(rep_->verbose_level)) { - return; - } - - severity = absl::LogSeverity::kInfo; - break; - } - case Rep::LoggingMode::kLogEveryN: { - struct LogSites { - absl::Mutex mutex; - absl::flat_hash_map, uint> - counts_by_file_and_line ABSL_GUARDED_BY(mutex); - }; - static auto* log_every_n_sites = new LogSites(); - - log_every_n_sites->mutex.lock(); - const uint count = - log_every_n_sites - ->counts_by_file_and_line[{loc_.file_name(), loc_.line()}]++; - log_every_n_sites->mutex.unlock(); - - if (count % rep_->n != 0) { - return; - } - break; - } - case Rep::LoggingMode::kLogEveryPeriod: { - struct LogSites { - absl::Mutex mutex; - absl::flat_hash_map, absl::Time> - next_log_by_file_and_line ABSL_GUARDED_BY(mutex); - }; - static auto* log_every_sites = new LogSites(); - - const auto now = absl::Now(); - absl::MutexLock lock(log_every_sites->mutex); - absl::Time& next_log = - log_every_sites - ->next_log_by_file_and_line[{loc_.file_name(), loc_.line()}]; - if (now < next_log) { - return; - } - next_log = now + rep_->period; - break; - } - } - - absl::LogSink* const sink = rep_->sink; - const std::string maybe_stack_trace = - rep_->should_log_stack_trace - ? absl::StrCat("\n", GetSymbolizedStackTraceAsString( - /*max_depth=*/50, /*skip_count=*/1)) - : ""; - const int verbose_level = rep_->logging_mode == Rep::LoggingMode::kVLog - ? rep_->verbose_level - : absl::LogEntry::kNoVerboseLevel; - if (sink) { - LOG(LEVEL(severity)) - .AtLocation(loc_.file_name(), loc_.line()) - .ToSinkAlso(sink) - .WithVerbosity(verbose_level) - << status << maybe_stack_trace; - } else { - // sink == nullptr indicates not to call ToSinkAlso(), which dies if sink is - // nullptr. Unfortunately, this means we reproduce the above macro call. - LOG(LEVEL(severity)) - .AtLocation(loc_.file_name(), loc_.line()) - .WithVerbosity(verbose_level) - << status << maybe_stack_trace; - } -} - -void StatusBuilder::SetStatusCode(absl::StatusCode canonical_code, - absl::Status* status) { - if (status->code() == canonical_code) { - return; - } - absl::Status new_status(canonical_code, status->message()); - CopyPayloads(*status, &new_status); - using std::swap; - swap(*status, new_status); -} - -void StatusBuilder::CopyPayloads(const absl::Status& src, absl::Status* dst) { - src.ForEachPayload([&](absl::string_view type_url, absl::Cord payload) { - dst->SetPayload(type_url, payload); - }); -} - -absl::Status StatusBuilder::WithMessage(const absl::Status& status, - absl::string_view msg) { - // Unfortunately since we can't easily strip the source-location off of this - // new status the backtrace can end up with a lot of copies of this line at - // the beginning. We manually try to trim them out but we can't actually - // remove the first one. - auto ret = absl::Status(status.code(), msg); - std::optional first = - StatusBuilder::GetSourceLocations(ret).empty() - ? std::nullopt - : std::make_optional( - StatusBuilder::GetSourceLocations(ret).front()); - bool first_non_duplicate = false; - for (const SourceLocation& sl : StatusBuilder::GetSourceLocations(status)) { - if (!first_non_duplicate && first && first->line() == sl.line() && - absl::string_view(first->file_name()) == - absl::string_view(sl.file_name())) { - continue; - } - first_non_duplicate = true; - StatusBuilder::AddSourceLocation(ret, sl); - } - CopyPayloads(status, &ret); - return ret; -} - -absl::Status StatusBuilder::AnnotateStatus(const absl::Status& s, - absl::string_view msg) { - if (s.ok() || msg.empty()) { - return s; - } - - absl::string_view new_msg = msg; - std::string annotated; - if (!s.message().empty()) { - absl::StrAppend(&annotated, s.message(), "; ", msg); - new_msg = annotated; - } - absl::Status result = WithMessage(s, new_msg); - SetStatusCode(s.code(), &result); - return result; -} - -absl::Status StatusBuilder::CreateStatusAndConditionallyLog() && { - absl::Status result = JoinMessageToStatus( - std::move(status_), rep_->stream.str(), rep_->message_join_style); - ConditionallyLog(result); - StatusBuilder::AddSourceLocation(result, loc_); - - // We consumed the status above, we set it to some error just to prevent - // people relying on it become OK or something. - status_ = absl::UnknownError(""); - rep_ = nullptr; - return result; -} - -/* static */ void StatusBuilder::AddSourceLocation(absl::Status& status, - SourceLocation loc) { -} - -/* static */ absl::Span StatusBuilder::GetSourceLocations( - const absl::Status& status) { - absl::Span result; - return result; -} - -std::ostream& operator<<(std::ostream& os, const StatusBuilder& builder) { - return os << static_cast(builder); -} - -std::ostream& operator<<(std::ostream& os, StatusBuilder&& builder) { - return os << static_cast(std::move(builder)); -} - -StatusBuilder AbortedErrorBuilder(SourceLocation location) { - return StatusBuilder(absl::StatusCode::kAborted, location); -} - -StatusBuilder AlreadyExistsErrorBuilder(SourceLocation location) { - return StatusBuilder(absl::StatusCode::kAlreadyExists, location); -} - -StatusBuilder CancelledErrorBuilder(SourceLocation location) { - return StatusBuilder(absl::StatusCode::kCancelled, location); -} - -StatusBuilder DataLossErrorBuilder(SourceLocation location) { - return StatusBuilder(absl::StatusCode::kDataLoss, location); -} - -StatusBuilder DeadlineExceededErrorBuilder(SourceLocation location) { - return StatusBuilder(absl::StatusCode::kDeadlineExceeded, location); -} - -StatusBuilder FailedPreconditionErrorBuilder(SourceLocation location) { - return StatusBuilder(absl::StatusCode::kFailedPrecondition, location); -} - -StatusBuilder InternalErrorBuilder(SourceLocation location) { - return StatusBuilder(absl::StatusCode::kInternal, location); -} - -StatusBuilder InvalidArgumentErrorBuilder(SourceLocation location) { - return StatusBuilder(absl::StatusCode::kInvalidArgument, location); -} - -StatusBuilder NotFoundErrorBuilder(SourceLocation location) { - return StatusBuilder(absl::StatusCode::kNotFound, location); -} - -StatusBuilder OutOfRangeErrorBuilder(SourceLocation location) { - return StatusBuilder(absl::StatusCode::kOutOfRange, location); -} - -StatusBuilder PermissionDeniedErrorBuilder(SourceLocation location) { - return StatusBuilder(absl::StatusCode::kPermissionDenied, location); -} - -StatusBuilder UnauthenticatedErrorBuilder(SourceLocation location) { - return StatusBuilder(absl::StatusCode::kUnauthenticated, location); -} - -StatusBuilder ResourceExhaustedErrorBuilder(SourceLocation location) { - return StatusBuilder(absl::StatusCode::kResourceExhausted, location); -} - -StatusBuilder UnavailableErrorBuilder(SourceLocation location) { - return StatusBuilder(absl::StatusCode::kUnavailable, location); -} - -StatusBuilder UnimplementedErrorBuilder(SourceLocation location) { - return StatusBuilder(absl::StatusCode::kUnimplemented, location); -} - -StatusBuilder UnknownErrorBuilder(SourceLocation location) { - return StatusBuilder(absl::StatusCode::kUnknown, location); -} - -} // namespace maldoca diff --git a/maldoca/base/status_builder.h b/maldoca/base/status_builder.h deleted file mode 100644 index 6358999..0000000 --- a/maldoca/base/status_builder.h +++ /dev/null @@ -1,684 +0,0 @@ -// Copyright 2025 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef MALDOCA_BASE_STATUS_BUILDER_H_ -#define MALDOCA_BASE_STATUS_BUILDER_H_ - -#include -#include -#include -#include -#include - -#include "absl/base/attributes.h" -#include "absl/base/log_severity.h" -#include "absl/log/log_sink.h" -#include "absl/status/status.h" -#include "absl/strings/string_view.h" -#include "absl/time/time.h" -#include "absl/types/span.h" -#include "maldoca/base/source_location.h" - -namespace maldoca { - -// Creates a status based on an original_status, but enriched with additional -// information. The builder implicitly converts to Status and StatusOr -// allowing for it to be returned directly. -// -// StatusBuilder builder(original); -// builder << "info about error"; -// return builder; -// -// It provides method chaining to simplify typical usage: -// -// return StatusBuilder(original) -// .Log(absl::LogSeverity::kWarning) << "oh no!"; -// -// In more detail: -// - When the original status is OK, all methods become no-ops and nothing will -// be logged. -// - Messages streamed into the status builder are collected into a single -// additional message string. -// - The original Status's message and the additional message are joined -// together when the result status is built. -// - By default, the messages will be joined including a convenience separator -// between the original message and the additional one. This behavior can be -// changed with the `SetAppend()` and `SetPrepend()` methods of the builder. -// - By default, the result status is not logged. The `Log` and -// `EmitStackTrace` methods will cause the builder to log the result status -// when it is built. -// - All side effects (like logging or constructing a stack trace) happen when -// the builder is converted to a status. -class ABSL_MUST_USE_RESULT StatusBuilder { - public: - // Creates a `StatusBuilder` based on an original status. If logging is - // enabled, it will use `location` as the location from which the log message - // occurs. A typical user will not specify `location`, allowing it to default - // to the current location. - explicit StatusBuilder(const absl::Status& original_status, - SourceLocation location = SourceLocation::current()); - explicit StatusBuilder(absl::Status&& original_status, - SourceLocation location = SourceLocation::current()); - - // Creates a `StatusBuilder` from a status code. If logging is enabled, it - // will use `location` as the location from which the log message occurs. A - // typical user will not specify `location`, allowing it to default to the - // current location. - explicit StatusBuilder(absl::StatusCode code, - SourceLocation location = SourceLocation::current()); - - StatusBuilder(const StatusBuilder& sb); - StatusBuilder& operator=(const StatusBuilder& sb); - StatusBuilder(StatusBuilder&&) = default; - StatusBuilder& operator=(StatusBuilder&&) = default; - - // Mutates the builder so that the final additional message is prepended to - // the original error message in the status. A convenience separator is not - // placed between the messages. - // - // NOTE: Multiple calls to `SetPrepend` and `SetAppend` just adjust the - // behavior of the final join of the original status with the extra message. - // - // Returns `*this` to allow method chaining. - StatusBuilder& SetPrepend() &; - StatusBuilder&& SetPrepend() &&; - - // Mutates the builder so that the final additional message is appended to the - // original error message in the status. A convenience separator is not - // placed between the messages. - // - // NOTE: Multiple calls to `SetPrepend` and `SetAppend` just adjust the - // behavior of the final join of the original status with the extra message. - // - // Returns `*this` to allow method chaining. - StatusBuilder& SetAppend() &; - StatusBuilder&& SetAppend() &&; - - // Mutates the builder to disable any logging that was set using any of the - // logging functions below. Returns `*this` to allow method chaining. - StatusBuilder& SetNoLogging() &; - StatusBuilder&& SetNoLogging() &&; - - // Mutates the builder so that the result status will be logged (without a - // stack trace) when this builder is converted to a Status. This overrides - // the logging settings from earlier calls to any of the logging mutator - // functions. Returns `*this` to allow method chaining. - StatusBuilder& Log(absl::LogSeverity level) &; - StatusBuilder&& Log(absl::LogSeverity level) &&; - StatusBuilder& LogError() & { return Log(absl::LogSeverity::kError); } - StatusBuilder&& LogError() && { return std::move(LogError()); } - StatusBuilder& LogWarning() & { return Log(absl::LogSeverity::kWarning); } - StatusBuilder&& LogWarning() && { return std::move(LogWarning()); } - StatusBuilder& LogInfo() & { return Log(absl::LogSeverity::kInfo); } - StatusBuilder&& LogInfo() && { return std::move(LogInfo()); } - - // Mutates the builder so that the result status will be logged every N - // invocations (without a stack trace) when this builder is converted to a - // Status. This overrides the logging settings from earlier calls to any of - // the logging mutator functions. Returns `*this` to allow method chaining. - StatusBuilder& LogEveryN(absl::LogSeverity level, int n) &; - StatusBuilder&& LogEveryN(absl::LogSeverity level, int n) &&; - - // Mutates the builder so that the result status will be logged once per - // period (without a stack trace) when this builder is converted to a Status. - // This overrides the logging settings from earlier calls to any of the - // logging mutator functions. Returns `*this` to allow method chaining. - // If period is absl::ZeroDuration() or less, then this is equivalent to - // calling the Log() method. - StatusBuilder& LogEvery(absl::LogSeverity level, absl::Duration period) &; - StatusBuilder&& LogEvery(absl::LogSeverity level, absl::Duration period) &&; - - // Mutates the builder so that the result status will be VLOGged (without a - // stack trace) when this builder is converted to a Status. `verbose_level` - // indicates the verbosity level that would be passed to VLOG(). This - // overrides the logging settings from earlier calls to any of the logging - // mutator functions. Returns `*this` to allow method chaining. - StatusBuilder& VLog(int verbose_level) &; - StatusBuilder&& VLog(int verbose_level) &&; - - // Mutates the builder so that a stack trace will be logged if the status is - // logged. One of the logging setters above should be called as well. If - // logging is not yet enabled this behaves as if LogInfo().EmitStackTrace() - // was called. Returns `*this` to allow method chaining. - StatusBuilder& EmitStackTrace() &; - StatusBuilder&& EmitStackTrace() &&; - - // Mutates the builder so that the result status will also be logged to the - // provided `sink` when this builder is converted to a status. Overwrites any - // sink set prior. The provided `sink` must point to a valid object by the - // time this builder is converted to a status. Has no effect if this builder - // is not configured to log by calling any of the LogXXX methods. Returns - // `*this` to allow method chaining. - StatusBuilder& AlsoOutputToSink(absl::LogSink* sink) &; - StatusBuilder&& AlsoOutputToSink(absl::LogSink* sink) &&; - - // Appends to the extra message that will be added to the original status. By - // default, the extra message is added to the original message and includes a - // convenience separator between the original message and the enriched one. - template - StatusBuilder& operator<<(const T& value) &; - template - StatusBuilder&& operator<<(const T& value) &&; - - // Sets the status code for the status that will be returned by this - // StatusBuilder. Returns `*this` to allow method chaining. - StatusBuilder& SetCode(absl::StatusCode code) &; - StatusBuilder&& SetCode(absl::StatusCode code) &&; - - ///////////////////////////////// Adaptors ///////////////////////////////// - // - // A StatusBuilder `adaptor` is a functor which can be included in a builder - // method chain. There are two common variants: - // - // 1. `Pure policy` adaptors modify the StatusBuilder and return the modified - // object, which can then be chained with further adaptors or mutations. - // - // 2. `Terminal` adaptors consume the builder's Status and return some - // other type of object. Alternatively, the consumed Status may be used - // for side effects, e.g. by passing it to a side channel. A terminal - // adaptor cannot be chained. - // - // Careful: The conversion of StatusBuilder to Status has side effects! - // Adaptors must ensure that this conversion happens at most once in the - // builder chain. The easiest way to do this is to determine the adaptor type - // and follow the corresponding guidelines: - // - // Pure policy adaptors should: - // (a) Take a StatusBuilder as input parameter. - // (b) NEVER convert the StatusBuilder to Status: - // - Never assign the builder to a Status variable. - // - Never pass the builder to a function whose parameter type is Status, - // including by reference (e.g. const Status&). - // - Never pass the builder to any function which might convert the - // builder to Status (i.e. this restriction is viral). - // (c) Return a StatusBuilder (usually the input parameter). - // - // Terminal adaptors should: - // (a) Take a Status as input parameter (not a StatusBuilder!). - // (b) Return a type matching the enclosing function. (This can be `void`.) - // - // Adaptors do not necessarily fit into one of these categories. However, any - // which satisfies the conversion rule can always be decomposed into a pure - // adaptor chained into a terminal adaptor. (This is recommended.) - // - // Examples - // - // Pure adaptors allow teams to configure team-specific error handling - // policies. For example: - // - // StatusBuilder TeamPolicy(StatusBuilder builder) { - // return std::move(builder).Log(absl::LogSeverity::kWarning); - // } - // - // MALDOCA_RETURN_IF_ERROR(foo()).With(TeamPolicy); - // - // Because pure policy adaptors return the modified StatusBuilder, they - // can be chained with further adaptors, e.g.: - // - // MALDOCA_RETURN_IF_ERROR(foo()).With(TeamPolicy).With(OtherTeamPolicy); - // - // Terminal adaptors are often used for type conversion. This allows - // MALDOCA_RETURN_IF_ERROR to be used in functions which do not return Status. - // For example, a function might want to return some default value on error: - // - // int GetSysCounter() { - // int value; - // MALDOCA_RETURN_IF_ERROR(ReadCounterFile(filename, &value)) - // .LogInfo() - // .With([](const absl::Status& unused) { return 0; }); - // return value; - // } - // - // For the simple case of returning a constant (e.g. zero, false, nullptr) on - // error, consider `status_macros::Return` or `status_macros::ReturnVoid`: - // - // bool DoMyThing() { - // MALDOCA_RETURN_IF_ERROR(foo()) - // .LogWarning().With(status_macros::Return(false)); - // ... - // } - // - // A terminal adaptor may instead (or additionally) be used to create side - // effects that are not supported natively by `StatusBuilder`, such as - // returning the Status through a side channel. - - // Calls `adaptor` on this status builder to apply policies, type conversions, - // and/or side effects on the StatusBuilder. Returns the value returned by - // `adaptor`, which may be any type including `void`. See comments above. - // - // Style guide exception for Ref qualified methods and rvalue refs. This - // allows us to avoid a copy in the common case. - template - auto With( - Adaptor&& adaptor) & -> decltype(std::forward(adaptor)(*this)) { - return std::forward(adaptor)(*this); - } - template - auto With(Adaptor&& adaptor) && -> decltype(std::forward(adaptor)( - std::move(*this))) { - return std::forward(adaptor)(std::move(*this)); - } - - // Returns true if the Status created by this builder will be ok(). - bool ok() const; - - // Returns the (canonical) error code for the Status created by this builder. - absl::StatusCode code() const; - - // Implicit conversion to Status. - // - // Careful: this operator has side effects, so it should be called at - // most once. In particular, do NOT use this conversion operator to inspect - // the status from an adapter object passed into With(). - // - // Style guide exception for using Ref qualified methods and for implicit - // conversions. This override allows us to implement MALDOCA_RETURN_IF_ERROR - // with 2 move operations in the common case. - operator absl::Status() const&; // NOLINT: Builder converts implicitly. - operator absl::Status() &&; // NOLINT: Builder converts implicitly. - - // Returns the source location used to create this builder. - SourceLocation source_location() const; - - private: - // Specifies how to join the error message in the original status and any - // additional message that has been streamed into the builder. - enum class MessageJoinStyle { - kAnnotate, - kAppend, - kPrepend, - }; - - // Creates a new status based on an old one by joining the message from the - // original to an additional message. - static absl::Status JoinMessageToStatus(absl::Status s, absl::string_view msg, - MessageJoinStyle style); - - // Creates a Status from this builder and logs it if the builder has been - // configured to log itself. - absl::Status CreateStatusAndConditionallyLog() &&; - - // Conditionally logs if the builder has been configured to log. This method - // is split from the above to isolate the portability issues around logging - // into a single place. - void ConditionallyLog(const absl::Status& status) const; - - // Sets the code of the provided Status (there is no setter for it on - // absl::Status). - static void SetStatusCode(absl::StatusCode canonical_code, - absl::Status* status); - // Copies all payloads of a Status to another Status (there is no helper for - // this in absl::Status). - static void CopyPayloads(const absl::Status& src, absl::Status* dst); - // Returns a Status that is the same as the provided `status` but with the - // message set to `msg`. - static absl::Status WithMessage(const absl::Status& status, - absl::string_view msg); - // Returns a Status that is identical to `s` except that the error_message() - // has been augmented by adding `msg` to the end of the original error - // message. - // - // Annotate should be used to add higher-level information to a Status. E.g., - // - // absl::Status s = GetFileContents(...); - // if (!s.ok()) { - // return Annotate(s, "loading summary statistics data"); - // } - // - // Annotate() adds the appropriate separators, so callers should not include a - // separator in `msg`. The exact formatting is subject to change, so you - // should not depend on it in your tests. - // - // OK status values have no error message and therefore if `s` is OK, the - // result is unchanged. - static absl::Status AnnotateStatus(const absl::Status& s, - absl::string_view msg); - - // Infrequently set builder options, instantiated lazily. This reduces - // average construction/destruction time (e.g. the `stream` is fairly - // expensive). Stacks can also be blown if StatusBuilder grows too large. - // This is primarily an issue for debug builds, which do not necessarily - // re-use stack space within a function across the sub-scopes used by - // status macros. - struct Rep { - explicit Rep() = default; - Rep(const Rep& r); - - enum class LoggingMode { - kDisabled, - kLog, - kVLog, - kLogEveryN, - kLogEveryPeriod - }; - LoggingMode logging_mode = LoggingMode::kDisabled; - - // Corresponds to the levels in `absl::LogSeverity`. - // `logging_mode == LoggingMode::kVLog` always logs at severity INFO. - absl::LogSeverity log_severity; - - // The level at which the Status should be VLOGged. - // Only used when `logging_mode == LoggingMode::kVLog`. - int verbose_level; - - // Only log every N invocations. - // Only used when `logging_mode == LoggingMode::kLogEveryN`. - int n; - - // Only log once per period. - // Only used when `logging_mode == LoggingMode::kLogEveryPeriod`. - absl::Duration period; - - // Gathers additional messages added with `<<` for use in the final status. - std::ostringstream stream; - - // Whether to log stack trace. Only used when `logging_mode != - // LoggingMode::kDisabled`. - bool should_log_stack_trace = false; - - // Specifies how to join the message in `status_` and `stream`. - MessageJoinStyle message_join_style = MessageJoinStyle::kAnnotate; - - // If not nullptr, specifies the log sink where log output should be also - // sent to. Only used when `logging_mode != LoggingMode::kDisabled`. - absl::LogSink* sink = nullptr; - }; - - // The status that the result will be based on. - absl::Status status_; - - // The location to record if this status is logged. - SourceLocation loc_; - - // nullptr if the result status will be OK. Extra fields moved to the heap to - // minimize stack space. - std::unique_ptr rep_; - - private: - // Update this status to include the given source location (if supported by - // Status implementation). - // - // This is only for internal use by the StatusBuilder. - static void AddSourceLocation(absl::Status& status, SourceLocation loc); - // Get the current source-location set for the given status. - // - // This is only for internal use by the StatusBuilder. - static absl::Span GetSourceLocations( - const absl::Status& status); -}; - -// Implicitly converts `builder` to `Status` and write it to `os`. -std::ostream& operator<<(std::ostream& os, const StatusBuilder& builder); -std::ostream& operator<<(std::ostream& os, StatusBuilder&& builder); - -// Each of the functions below creates StatusBuilder with a canonical error. -// The error code of the StatusBuilder matches the name of the function. -StatusBuilder AbortedErrorBuilder( - SourceLocation location = SourceLocation::current()); -StatusBuilder AlreadyExistsErrorBuilder( - SourceLocation location = SourceLocation::current()); -StatusBuilder CancelledErrorBuilder( - SourceLocation location = SourceLocation::current()); -StatusBuilder DataLossErrorBuilder( - SourceLocation location = SourceLocation::current()); -StatusBuilder DeadlineExceededErrorBuilder( - SourceLocation location = SourceLocation::current()); -StatusBuilder FailedPreconditionErrorBuilder( - SourceLocation location = SourceLocation::current()); -StatusBuilder InternalErrorBuilder( - SourceLocation location = SourceLocation::current()); -StatusBuilder InvalidArgumentErrorBuilder( - SourceLocation location = SourceLocation::current()); -StatusBuilder NotFoundErrorBuilder( - SourceLocation location = SourceLocation::current()); -StatusBuilder OutOfRangeErrorBuilder( - SourceLocation location = SourceLocation::current()); -StatusBuilder PermissionDeniedErrorBuilder( - SourceLocation location = SourceLocation::current()); -StatusBuilder UnauthenticatedErrorBuilder( - SourceLocation location = SourceLocation::current()); -StatusBuilder ResourceExhaustedErrorBuilder( - SourceLocation location = SourceLocation::current()); -StatusBuilder UnavailableErrorBuilder( - SourceLocation location = SourceLocation::current()); -StatusBuilder UnimplementedErrorBuilder( - SourceLocation location = SourceLocation::current()); -StatusBuilder UnknownErrorBuilder( - SourceLocation location = SourceLocation::current()); - -// Implementation details follow; clients should ignore. - -inline StatusBuilder::StatusBuilder(const absl::Status& original_status, - SourceLocation location) - : status_(original_status), loc_(location) {} - -inline StatusBuilder::StatusBuilder(absl::Status&& original_status, - SourceLocation location) - : status_(std::move(original_status)), loc_(location) {} - -inline StatusBuilder::StatusBuilder(absl::StatusCode code, - SourceLocation location) - : status_(code, ""), loc_(location) {} - -inline StatusBuilder::StatusBuilder(const StatusBuilder& sb) - : status_(sb.status_), loc_(sb.loc_) { - if (sb.rep_ != nullptr) { - rep_ = std::make_unique(*sb.rep_); - } -} - -inline StatusBuilder& StatusBuilder::operator=(const StatusBuilder& sb) { - status_ = sb.status_; - loc_ = sb.loc_; - if (sb.rep_ != nullptr) { - rep_ = std::make_unique(*sb.rep_); - } else { - rep_ = nullptr; - } - return *this; -} - -inline StatusBuilder& StatusBuilder::SetPrepend() & { - if (status_.ok()) { - return *this; - } - if (rep_ == nullptr) { - rep_ = std::make_unique(); - } - - rep_->message_join_style = MessageJoinStyle::kPrepend; - return *this; -} -inline StatusBuilder&& StatusBuilder::SetPrepend() && { - return std::move(SetPrepend()); -} - -inline StatusBuilder& StatusBuilder::SetAppend() & { - if (status_.ok()) { - return *this; - } - if (rep_ == nullptr) { - rep_ = std::make_unique(); - } - rep_->message_join_style = MessageJoinStyle::kAppend; - return *this; -} -inline StatusBuilder&& StatusBuilder::SetAppend() && { - return std::move(SetAppend()); -} - -inline StatusBuilder& StatusBuilder::SetNoLogging() & { - if (rep_ != nullptr) { - rep_->logging_mode = Rep::LoggingMode::kDisabled; - rep_->should_log_stack_trace = false; - } - return *this; -} -inline StatusBuilder&& StatusBuilder::SetNoLogging() && { - return std::move(SetNoLogging()); -} - -inline StatusBuilder& StatusBuilder::Log(absl::LogSeverity level) & { - if (status_.ok()) { - return *this; - } - if (rep_ == nullptr) { - rep_ = std::make_unique(); - } - rep_->logging_mode = Rep::LoggingMode::kLog; - rep_->log_severity = level; - return *this; -} -inline StatusBuilder&& StatusBuilder::Log(absl::LogSeverity level) && { - return std::move(Log(level)); -} - -inline StatusBuilder& StatusBuilder::LogEveryN(absl::LogSeverity level, - int n) & { - if (status_.ok()) { - return *this; - } - if (n < 1) { - return Log(level); - } - if (rep_ == nullptr) { - rep_ = std::make_unique(); - } - rep_->logging_mode = Rep::LoggingMode::kLogEveryN; - rep_->log_severity = level; - rep_->n = n; - return *this; -} -inline StatusBuilder&& StatusBuilder::LogEveryN(absl::LogSeverity level, - int n) && { - return std::move(LogEveryN(level, n)); -} - -inline StatusBuilder& StatusBuilder::LogEvery(absl::LogSeverity level, - absl::Duration period) & { - if (status_.ok()) { - return *this; - } - if (period <= absl::ZeroDuration()) { - return Log(level); - } - if (rep_ == nullptr) { - rep_ = std::make_unique(); - } - rep_->logging_mode = Rep::LoggingMode::kLogEveryPeriod; - rep_->log_severity = level; - rep_->period = period; - return *this; -} -inline StatusBuilder&& StatusBuilder::LogEvery(absl::LogSeverity level, - absl::Duration period) && { - return std::move(LogEvery(level, period)); -} - -inline StatusBuilder& StatusBuilder::VLog(int verbose_level) & { - if (status_.ok()) { - return *this; - } - if (rep_ == nullptr) { - rep_ = std::make_unique(); - } - rep_->logging_mode = Rep::LoggingMode::kVLog; - rep_->verbose_level = verbose_level; - return *this; -} -inline StatusBuilder&& StatusBuilder::VLog(int verbose_level) && { - return std::move(VLog(verbose_level)); -} - -inline StatusBuilder& StatusBuilder::EmitStackTrace() & { - if (status_.ok()) { - return *this; - } - if (rep_ == nullptr) { - rep_ = std::make_unique(); - // Default to INFO logging, otherwise nothing would be emitted. - rep_->logging_mode = Rep::LoggingMode::kLog; - rep_->log_severity = absl::LogSeverity::kInfo; - } - rep_->should_log_stack_trace = true; - return *this; -} -inline StatusBuilder&& StatusBuilder::EmitStackTrace() && { - return std::move(EmitStackTrace()); -} - -inline StatusBuilder& StatusBuilder::AlsoOutputToSink(absl::LogSink* sink) & { - if (status_.ok()) { - return *this; - } - if (rep_ == nullptr) { - rep_ = std::make_unique(); - } - rep_->sink = sink; - return *this; -} -inline StatusBuilder&& StatusBuilder::AlsoOutputToSink(absl::LogSink* sink) && { - return std::move(AlsoOutputToSink(sink)); -} - -template -StatusBuilder& StatusBuilder::operator<<(const T& value) & { - if (status_.ok()) { - return *this; - } - if (rep_ == nullptr) { - rep_ = std::make_unique(); - } - rep_->stream << value; - return *this; -} -template -StatusBuilder&& StatusBuilder::operator<<(const T& value) && { - return std::move(operator<<(value)); -} - -inline StatusBuilder& StatusBuilder::SetCode(absl::StatusCode code) & { - SetStatusCode(code, &status_); - return *this; -} -inline StatusBuilder&& StatusBuilder::SetCode(absl::StatusCode code) && { - return std::move(SetCode(code)); -} - -inline bool StatusBuilder::ok() const { return status_.ok(); } - -inline absl::StatusCode StatusBuilder::code() const { return status_.code(); } - -inline StatusBuilder::operator absl::Status() const& { - if (rep_ == nullptr) { - absl::Status result = status_; - StatusBuilder::AddSourceLocation(result, loc_); - return result; - } - return StatusBuilder(*this).CreateStatusAndConditionallyLog(); -} -inline StatusBuilder::operator absl::Status() && { - if (rep_ == nullptr) { - absl::Status result = std::move(status_); - StatusBuilder::AddSourceLocation(result, loc_); - return result; - } - return std::move(*this).CreateStatusAndConditionallyLog(); -} - -inline SourceLocation StatusBuilder::source_location() const { return loc_; } - -} // namespace maldoca - -#endif // MALDOCA_BASE_STATUS_BUILDER_H_ diff --git a/maldoca/base/status_macros.h b/maldoca/base/status_macros.h deleted file mode 100644 index cfa91b7..0000000 --- a/maldoca/base/status_macros.h +++ /dev/null @@ -1,262 +0,0 @@ -// Copyright 2025 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef MALDOCA_BASE_STATUS_MACROS_H_ -#define MALDOCA_BASE_STATUS_MACROS_H_ - -#include - -#include "absl/base/optimization.h" -#include "absl/status/status.h" -#include "maldoca/base/source_location.h" -#include "maldoca/base/status_builder.h" // IWYU pragma: export - -// Evaluates an expression that produces a `absl::Status`. If the status is not -// ok, returns it from the current function. -// -// For example: -// absl::Status MultiStepFunction() { -// MALDOCA_RETURN_IF_ERROR(Function(args...)); -// MALDOCA_RETURN_IF_ERROR(foo.Method(args...)); -// return absl::OkStatus(); -// } -// -// The macro ends with a `StatusBuilder` which allows the returned status -// to be extended with more details. Any chained expressions after the macro -// will not be evaluated unless there is an error. -// -// For example: -// absl::Status MultiStepFunction() { -// MALDOCA_RETURN_IF_ERROR(Function(args...)) << "in MultiStepFunction"; -// MALDOCA_RETURN_IF_ERROR(foo.Method(args...)) -// << "while processing query: " << query.DebugString(); -// return absl::OkStatus(); -// } -// -// If using this macro inside a lambda, you need to annotate the return type -// to avoid confusion between a `StatusBuilder` and an `absl::Status` type. -// E.g. -// -// []() -> absl::Status { -// MALDOCA_RETURN_IF_ERROR(Function(args...)); -// MALDOCA_RETURN_IF_ERROR(foo.Method(args...)); -// return absl::OkStatus(); -// } -#define MALDOCA_RETURN_IF_ERROR(expr) \ - MALDOCA_STATUS_MACROS_IMPL_ELSE_BLOCKER_ \ - if (::maldoca::status_macro_internal::StatusAdaptorForMacros \ - status_macro_internal_adaptor = {(expr), MALDOCA_LOC}) { \ - } else /* NOLINT */ \ - return status_macro_internal_adaptor.Consume() - -// Executes an expression `rexpr` that returns a `StatusOr`. On OK, moves its -// value into the variable defined by `lhs`, otherwise returns from the current -// function. By default the error status is returned unchanged, but it may be -// modified by an `error_expression`. If there is an error, `lhs` is not -// evaluated; thus any side effects that `lhs` may have only occur in the -// success case. -// -// Interface: -// -// MALDOCA_ASSIGN_OR_RETURN(lhs, rexpr) -// MALDOCA_ASSIGN_OR_RETURN(lhs, rexpr, error_expression); -// -// WARNING: if lhs is parenthesized, the parentheses are removed. See examples -// for more details. -// -// WARNING: expands into multiple statements; it cannot be used in a single -// statement (e.g. as the body of an if statement without {})! -// -// Example: Declaring and initializing a new variable (ValueType can be anything -// that can be initialized with assignment, including references): -// MALDOCA_ASSIGN_OR_RETURN(ValueType value, MaybeGetValue(arg)); -// -// Example: Assigning to an existing variable: -// ValueType value; -// MALDOCA_ASSIGN_OR_RETURN(value, MaybeGetValue(arg)); -// -// Example: Assigning to an expression with side effects: -// MyProto data; -// MALDOCA_ASSIGN_OR_RETURN(*data.mutable_str(), MaybeGetValue(arg)); -// // No field "str" is added on error. -// -// Example: Assigning to a std::unique_ptr. -// MALDOCA_ASSIGN_OR_RETURN(std::unique_ptr ptr, MaybeGetPtr(arg)); -// -// Example: Assigning to a map. Because of C preprocessor -// limitation, the type used in MALDOCA_ASSIGN_OR_RETURN cannot contain comma, -// so wrap lhs in parentheses: -// MALDOCA_ASSIGN_OR_RETURN((absl::flat_hash_map my_map), GetMap()); -// Or use auto if the type is obvious enough: -// MALDOCA_ASSIGN_OR_RETURN(const auto& my_map, GetMapRef()); -// -// Example: Assigning to structured bindings. The same situation with comma as -// in map, so wrap the statement in parentheses. -// MALDOCA_ASSIGN_OR_RETURN((const auto& [first, second]), GetPair()); -// -// If passed, the `error_expression` is evaluated to produce the return -// value. The expression may reference any variable visible in scope, as -// well as a `StatusBuilder` object populated with the error and named by a -// single underscore `_`. The expression typically uses the builder to modify -// the status and is returned directly in manner similar to -// MALDOCA_RETURN_IF_ERROR. The expression may, however, evaluate to any type -// returnable by the function, including (void). For example: -// -// Example: Adjusting the error message. -// MALDOCA_ASSIGN_OR_RETURN(ValueType value, MaybeGetValue(query), -// _ << "while processing " << query.DebugString()); -// -// Example: Logging the error on failure. -// MALDOCA_ASSIGN_OR_RETURN(ValueType value, MaybeGetValue(query), -// _.LogError()); -// -#define MALDOCA_ASSIGN_OR_RETURN(...) \ - MALDOCA_STATUS_MACROS_IMPL_GET_VARIADIC_( \ - (__VA_ARGS__, MALDOCA_STATUS_MACROS_IMPL_ASSIGN_OR_RETURN_3_, \ - MALDOCA_STATUS_MACROS_IMPL_ASSIGN_OR_RETURN_2_)) \ - (__VA_ARGS__) - -// ================================================================= -// == Implementation details, do not rely on anything below here. == -// ================================================================= - -// MSVC incorrectly expands variadic macros, splice together a macro call to -// work around the bug. -#define MALDOCA_STATUS_MACROS_IMPL_GET_VARIADIC_HELPER_(_1, _2, _3, NAME, ...) \ - NAME -#define MALDOCA_STATUS_MACROS_IMPL_GET_VARIADIC_(args) \ - MALDOCA_STATUS_MACROS_IMPL_GET_VARIADIC_HELPER_ args - -#define MALDOCA_STATUS_MACROS_IMPL_ASSIGN_OR_RETURN_2_(lhs, rexpr) \ - MALDOCA_STATUS_MACROS_IMPL_ASSIGN_OR_RETURN_3_(lhs, rexpr, std::move(_)) -#define MALDOCA_STATUS_MACROS_IMPL_ASSIGN_OR_RETURN_3_(lhs, rexpr, \ - error_expression) \ - MALDOCA_STATUS_MACROS_IMPL_ASSIGN_OR_RETURN_( \ - MALDOCA_STATUS_MACROS_IMPL_CONCAT_(_status_or_value, __LINE__), lhs, \ - rexpr, error_expression) -#define MALDOCA_STATUS_MACROS_IMPL_ASSIGN_OR_RETURN_(statusor, lhs, rexpr, \ - error_expression) \ - auto statusor = (rexpr); \ - if (ABSL_PREDICT_FALSE(!statusor.ok())) { \ - ::maldoca::StatusBuilder _(std::move(statusor).status(), MALDOCA_LOC); \ - (void)_; /* error_expression is allowed to not use this variable */ \ - return (error_expression); \ - } \ - { \ - static_assert( \ - #lhs[0] != '(' || #lhs[sizeof(#lhs) - 2] != ')' || \ - !::maldoca::status_macro_internal:: \ - HasPotentialConditionalOperator(#lhs, sizeof(#lhs) - 2), \ - "Identified potential conditional operator, consider not " \ - "using MALDOCA_ASSIGN_OR_RETURN"); \ - } \ - MALDOCA_STATUS_MACROS_IMPL_UNPARENTHESIZE_IF_PARENTHESIZED(lhs) = \ - std::move(statusor).value() - -// Internal helpers for macro expansion. -#define MALDOCA_STATUS_MACROS_IMPL_EAT(...) -#define MALDOCA_STATUS_MACROS_IMPL_REM(...) __VA_ARGS__ -#define MALDOCA_STATUS_MACROS_IMPL_EMPTY() - -// __VA_OPT__ expands to nothing if __VA_ARGS__ are empty, and otherwise expands -// to its argument. We use __VA_OPT__ here to expand to true if __VA_ARGS__ is -// empty and false otherwise- the `EMPTY_I` helper macro expands to the first -// argument. -#define MALDOCA_STATUS_MACROS_IMPL_IS_EMPTY(...) \ - MALDOCA_STATUS_MACROS_IMPL_IS_EMPTY_I(__VA_OPT__(0, ) 1) -#define MALDOCA_STATUS_MACROS_IMPL_IS_EMPTY_I(is_empty, ...) is_empty - -// Internal helpers for if statement. -#define MALDOCA_STATUS_MACROS_IMPL_IF_1(_Then, _Else) _Then -#define MALDOCA_STATUS_MACROS_IMPL_IF_0(_Then, _Else) _Else -#define MALDOCA_STATUS_MACROS_IMPL_IF(_Cond, _Then, _Else) \ - MALDOCA_STATUS_MACROS_IMPL_CONCAT_(MALDOCA_STATUS_MACROS_IMPL_IF_, _Cond) \ - (_Then, _Else) - -// Expands to 1 if the input is parenthesized. Otherwise expands to 0. -#define MALDOCA_STATUS_MACROS_IMPL_IS_PARENTHESIZED(...) \ - MALDOCA_STATUS_MACROS_IMPL_IS_EMPTY( \ - MALDOCA_STATUS_MACROS_IMPL_EAT __VA_ARGS__) - -// If the input is parenthesized, removes the parentheses. Otherwise expands to -// the input unchanged. -#define MALDOCA_STATUS_MACROS_IMPL_UNPARENTHESIZE_IF_PARENTHESIZED(...) \ - MALDOCA_STATUS_MACROS_IMPL_IF( \ - MALDOCA_STATUS_MACROS_IMPL_IS_PARENTHESIZED(__VA_ARGS__), \ - MALDOCA_STATUS_MACROS_IMPL_REM, MALDOCA_STATUS_MACROS_IMPL_EMPTY()) \ - __VA_ARGS__ - -// Internal helper for concatenating macro values. -#define MALDOCA_STATUS_MACROS_IMPL_CONCAT_INNER_(x, y) x##y -#define MALDOCA_STATUS_MACROS_IMPL_CONCAT_(x, y) \ - MALDOCA_STATUS_MACROS_IMPL_CONCAT_INNER_(x, y) - -// The GNU compiler emits a warning for code like: -// -// if (foo) -// if (bar) { } else baz; -// -// because it thinks you might want the else to bind to the first if. This -// leads to problems with code like: -// -// if (do_expr) MALDOCA_RETURN_IF_ERROR(expr) << "Some message"; -// -// The "switch (0) case 0:" idiom is used to suppress this. -#define MALDOCA_STATUS_MACROS_IMPL_ELSE_BLOCKER_ \ - switch (0) \ - case 0: \ - default: // NOLINT - -namespace maldoca { -namespace status_macro_internal { - -// Some builds do not support C++14 fully yet, using C++11 constexpr technique. -constexpr bool HasPotentialConditionalOperator(const char* lhs, int index) { - return (index == -1 ? false - : (lhs[index] == '?' ? true - : HasPotentialConditionalOperator( - lhs, index - 1))); -} - -// Provides a conversion to bool so that it can be used inside an if statement -// that declares a variable. -class StatusAdaptorForMacros { - public: - StatusAdaptorForMacros(const absl::Status& status, SourceLocation loc) - : builder_(status, loc) {} - - StatusAdaptorForMacros(absl::Status&& status, SourceLocation loc) - : builder_(std::move(status), loc) {} - - StatusAdaptorForMacros(const StatusBuilder& builder, SourceLocation loc) - : builder_(builder) {} - - StatusAdaptorForMacros(StatusBuilder&& builder, SourceLocation loc) - : builder_(std::move(builder)) {} - - StatusAdaptorForMacros(const StatusAdaptorForMacros&) = delete; - StatusAdaptorForMacros& operator=(const StatusAdaptorForMacros&) = delete; - - explicit operator bool() const { return ABSL_PREDICT_TRUE(builder_.ok()); } - - StatusBuilder&& Consume() { return std::move(builder_); } - - private: - StatusBuilder builder_; -}; - -} // namespace status_macro_internal -} // namespace maldoca - -#endif // MALDOCA_BASE_STATUS_MACROS_H_ diff --git a/maldoca/base/symbolized_stacktrace.cc b/maldoca/base/symbolized_stacktrace.cc deleted file mode 100644 index d6090a7..0000000 --- a/maldoca/base/symbolized_stacktrace.cc +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright 2025 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "maldoca/base/symbolized_stacktrace.h" - -#include -#include -#include - -#include "absl/debugging/stacktrace.h" -#include "absl/debugging/symbolize.h" -#include "absl/strings/str_format.h" - -namespace maldoca { - -std::string GetSymbolizedStackTraceAsString(int max_depth, int skip_count, - bool demangle) { - std::string result; - int skip_count_including_self = skip_count + 1; - std::vector stack_trace; - stack_trace.resize(max_depth); - stack_trace.resize(absl::GetStackTrace(stack_trace.data(), max_depth, - skip_count_including_self)); - std::array symbol_name_buffer; - for (void* pc : stack_trace) { - if (absl::Symbolize(pc, symbol_name_buffer.data(), - symbol_name_buffer.size())) { - result += absl::StrFormat("%08p: %s\n", pc, symbol_name_buffer.data()); - } else { - result += absl::StrFormat("%08p: [unknown]\n", pc); - } - } - return result; -} - -} // namespace maldoca diff --git a/maldoca/base/symbolized_stacktrace.h b/maldoca/base/symbolized_stacktrace.h deleted file mode 100644 index aeeaae9..0000000 --- a/maldoca/base/symbolized_stacktrace.h +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2025 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef MALDOCA_BASE_SYMBOLIZED_STACKTRACE_H_ -#define MALDOCA_BASE_SYMBOLIZED_STACKTRACE_H_ - -#include - -namespace maldoca { - -// Get the symbolized stack trace at most "max_depth" frames, skipping -// innermost "skip_count" frames, as a string. All symbol names will be -// simply connected with "\n". Useful for simple debug output. -// -// Example: -// LOG(INFO) << "@@stacktrace\n" << GetSymbolizedStackTraceAsString(10); -// -std::string GetSymbolizedStackTraceAsString(int max_depth = 50, - int skip_count = 0, - bool demangle = true); - -} // namespace maldoca - -#endif // MALDOCA_BASE_SYMBOLIZED_STACKTRACE_H_ diff --git a/maldoca/base/symbolized_stacktrace_test.cc b/maldoca/base/symbolized_stacktrace_test.cc deleted file mode 100644 index b93b400..0000000 --- a/maldoca/base/symbolized_stacktrace_test.cc +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright 2025 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "maldoca/base/symbolized_stacktrace.h" - -#include - -#include "gmock/gmock.h" -#include "gtest/gtest.h" - -namespace maldoca { -namespace { - -using ::testing::HasSubstr; - -#ifndef NDEBUG // Symbols are not available in optimized builds. -TEST(SymbolizedStacktraceTest, StacktraceContainsTestMethodName) { - std::string trace = GetSymbolizedStackTraceAsString(); - - EXPECT_THAT(trace, HasSubstr("StacktraceContainsTestMethodName")); -} - -TEST(SymbolizedStacktraceTest, StacktraceDoesNotContainHelperMethodName) { - std::string trace = GetSymbolizedStackTraceAsString(); - - EXPECT_THAT(trace, Not(HasSubstr("GetSymbolizedStackTraceAsString"))); -} -#endif - -} // namespace -} // namespace maldoca diff --git a/maldoca/base/testing/BUILD b/maldoca/base/testing/BUILD index e7ddaea..14b3c15 100644 --- a/maldoca/base/testing/BUILD +++ b/maldoca/base/testing/BUILD @@ -47,9 +47,10 @@ cc_library( srcs = ["status_matchers.cc"], hdrs = ["status_matchers.h"], deps = [ - "//maldoca/base:status", "@abseil-cpp//absl/status", - "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/status:status_builder", + "@abseil-cpp//absl/status:status_macros", + "@abseil-cpp//absl/status:status_matchers", "@abseil-cpp//absl/strings", "@googletest//:gtest", ], diff --git a/maldoca/base/testing/status_matchers.cc b/maldoca/base/testing/status_matchers.cc index 3308f36..e41f8f3 100644 --- a/maldoca/base/testing/status_matchers.cc +++ b/maldoca/base/testing/status_matchers.cc @@ -14,93 +14,19 @@ #include "maldoca/base/testing/status_matchers.h" -#include -#include #include -#include "gmock/gmock.h" #include "gtest/gtest.h" #include "absl/status/status.h" +#include "absl/status/status_builder.h" #include "absl/strings/str_cat.h" -#include "maldoca/base/status_builder.h" namespace maldoca { namespace testing { namespace internal_status { -void StatusIsMatcherCommonImpl::DescribeTo(std::ostream* os) const { - *os << "has a status code that "; - code_matcher_.DescribeTo(os); - *os << ", and has an error message that "; - message_matcher_.DescribeTo(os); -} - -void StatusIsMatcherCommonImpl::DescribeNegationTo(std::ostream* os) const { - *os << "has a status code that "; - code_matcher_.DescribeNegationTo(os); - *os << ", or has an error message that "; - message_matcher_.DescribeNegationTo(os); -} - -bool StatusIsMatcherCommonImpl::MatchAndExplain( - const absl::Status& status, - ::testing::MatchResultListener* result_listener) const { - ::testing::StringMatchResultListener inner_listener; - inner_listener.Clear(); - if (!code_matcher_.MatchAndExplain(status.code(), &inner_listener)) { - *result_listener << (inner_listener.str().empty() - ? "whose status code is wrong" - : "which has a status code " + - inner_listener.str()); - return false; - } - - if (!message_matcher_.Matches(std::string(status.message()))) { - *result_listener << "whose error message is wrong"; - return false; - } - - return true; -} - -void CanonicalStatusIsMatcherCommonImpl::DescribeTo(std::ostream* os) const { - *os << "has a canonical status code that "; - code_matcher_.DescribeTo(os); - *os << " and has an error message that "; - message_matcher_.DescribeTo(os); -} - -void CanonicalStatusIsMatcherCommonImpl::DescribeNegationTo( - std::ostream* os) const { - *os << "has a canonical status code that "; - code_matcher_.DescribeNegationTo(os); - *os << " or has an error message that "; - message_matcher_.DescribeNegationTo(os); -} - -bool CanonicalStatusIsMatcherCommonImpl::MatchAndExplain( - const absl::Status& status, - ::testing::MatchResultListener* result_listener) const { - ::testing::StringMatchResultListener inner_listener; - if (!code_matcher_.MatchAndExplain( - static_cast(status.code()), &inner_listener)) { - *result_listener << (inner_listener.str().empty() - ? "whose canonical status code is wrong" - : "which has a canonical status code " + - inner_listener.str()); - return false; - } - - if (!message_matcher_.Matches(std::string(status.message()))) { - *result_listener << "whose error message is wrong"; - return false; - } - - return true; -} - void AddFatalFailure(std::string_view expression, - const maldoca::StatusBuilder& builder) { + const absl::StatusBuilder& builder) { GTEST_MESSAGE_AT_( builder.source_location().file_name(), builder.source_location().line(), ::absl::StrCat(expression, diff --git a/maldoca/base/testing/status_matchers.h b/maldoca/base/testing/status_matchers.h index 07f7aa9..886219c 100644 --- a/maldoca/base/testing/status_matchers.h +++ b/maldoca/base/testing/status_matchers.h @@ -93,31 +93,6 @@ // In other words, it's like the two-argument StatusIs(), except that it // ignores error message. // -// ========================================= -// CanonicalStatusIs(canonical_code_matcher, -// error_message_matcher) -// ========================================= -// -// This gMock matcher matches a Status or StatusOr value if -// both of the following are true: -// -// - the status' error_code() matches canonical_code_matcher and -// - the status' error_message() matches error_message_matcher. -// -// This differs from the StatusIs() matchers in that it will match a status -// with any error_space(), as long as that error space maps the error_code() -// to the expected canonical code. -// -// ========================================= -// CanonicalStatusIs(canonical_code_matcher) -// ========================================= -// -// This is a shorthand for -// CanonicalStatusIs(canonical_code_matcher, -// testing::_) -// In other words, it's like the 2-argument CanonicalStatusIs() except that -// it ignores the error message. -// // =============== // IsOk() // =============== @@ -136,414 +111,31 @@ #ifndef MALDOCA_BASE_TESTING_STATUS_MATCHERS_H_ #define MALDOCA_BASE_TESTING_STATUS_MATCHERS_H_ -#include // NOLINT -#include #include -#include -#include #include "gmock/gmock.h" -#include "gtest/gtest.h" -#include "absl/status/status.h" -#include "absl/status/statusor.h" -#include "maldoca/base/status_builder.h" -#include "maldoca/base/status_macros.h" +#include "absl/status/status_builder.h" +#include "absl/status/status_macros.h" +#include "absl/status/status_matchers.h" namespace maldoca { namespace testing { namespace internal_status { -inline const absl::Status& GetStatus(const absl::Status& status) { - return status; -} - -template -inline const absl::Status& GetStatus(const absl::StatusOr& status) { - return status.status(); -} - -//////////////////////////////////////////////////////////// -// Implementation of IsOkAndHolds(). - -// Monomorphic implementation of matcher IsOkAndHolds(m). StatusOrType is a -// reference to StatusOr. -template -class IsOkAndHoldsMatcherImpl - : public ::testing::MatcherInterface { - public: - using value_type = - typename std::remove_reference::type::value_type; - - template - explicit IsOkAndHoldsMatcherImpl(InnerMatcher&& inner_matcher) - : inner_matcher_(::testing::SafeMatcherCast( - std::forward(inner_matcher))) {} - - void DescribeTo(std::ostream* os) const override { - *os << "is OK and has a value that "; - inner_matcher_.DescribeTo(os); - } - - void DescribeNegationTo(std::ostream* os) const override { - *os << "isn't OK or has a value that "; - inner_matcher_.DescribeNegationTo(os); - } - - bool MatchAndExplain( - StatusOrType actual_value, - ::testing::MatchResultListener* result_listener) const override { - if (!actual_value.ok()) { - *result_listener << "which has status " << actual_value.status(); - return false; - } - - ::testing::StringMatchResultListener inner_listener; - const bool matches = - inner_matcher_.MatchAndExplain(actual_value.value(), &inner_listener); - const std::string inner_explanation = inner_listener.str(); - if (!inner_explanation.empty()) { - *result_listener << "which contains value " - << ::testing::PrintToString(actual_value.value()) << ", " - << inner_explanation; - } - return matches; - } - - private: - const ::testing::Matcher inner_matcher_; -}; - -// Implements IsOkAndHolds(m) as a polymorphic matcher. -template -class IsOkAndHoldsMatcher { - public: - explicit IsOkAndHoldsMatcher(InnerMatcher inner_matcher) - : inner_matcher_(std::move(inner_matcher)) {} - - // Converts this polymorphic matcher to a monomorphic matcher of the - // given type. StatusOrType can be either StatusOr or a - // reference to StatusOr. - template - operator ::testing::Matcher() const { // NOLINT - return ::testing::Matcher( - new IsOkAndHoldsMatcherImpl(inner_matcher_)); - } - - private: - const InnerMatcher inner_matcher_; -}; - -//////////////////////////////////////////////////////////// -// Implementation of StatusIs(). - -// `StatusCode` is implicitly convertible from `int`, `absl::StatusCode`, and -// any enum that is associated with an error space, and explicitly convertible -// to these types as well. -// -// We need this class because absl::StatusCode (as a scoped enum) is not -// implicitly convertible to int. In order to handle use cases like -// StatusIs(Anyof(absl::StatusCode::kUnknown, absl::StatusCode::kCancelled)) -// which uses polymorphic matchers, we need to unify the interfaces into -// Matcher. -class StatusCode { - public: - StatusCode(int code) : code_(code) {} // NOLINT - StatusCode(absl::StatusCode code) // NOLINT - : code_(static_cast(code)) {} - explicit operator int() const { return code_; } - explicit operator absl::StatusCode() const { - return static_cast(code_); - } - - friend inline void PrintTo(const StatusCode& code, std::ostream* os) { - *os << code.code_; - } - - private: - int code_; -}; - -// Relational operators to handle matchers like Eq, Lt, etc.. -inline bool operator==(const StatusCode& lhs, const StatusCode& rhs) { - return static_cast(lhs) == static_cast(rhs); -} -inline bool operator!=(const StatusCode& lhs, const StatusCode& rhs) { - return static_cast(lhs) != static_cast(rhs); -} -inline bool operator<(const StatusCode& lhs, const StatusCode& rhs) { - return static_cast(lhs) < static_cast(rhs); -} -inline bool operator<=(const StatusCode& lhs, const StatusCode& rhs) { - return static_cast(lhs) <= static_cast(rhs); -} -inline bool operator>(const StatusCode& lhs, const StatusCode& rhs) { - return static_cast(lhs) > static_cast(rhs); -} -inline bool operator>=(const StatusCode& lhs, const StatusCode& rhs) { - return static_cast(lhs) >= static_cast(rhs); -} - -// StatusIs() is a polymorphic matcher. This class is the common -// implementation of it shared by all types T where StatusIs() can be -// used as a Matcher. -class StatusIsMatcherCommonImpl { - public: - StatusIsMatcherCommonImpl( - ::testing::Matcher code_matcher, - ::testing::Matcher message_matcher) - : code_matcher_(std::move(code_matcher)), - message_matcher_(std::move(message_matcher)) {} - - void DescribeTo(std::ostream* os) const; - - void DescribeNegationTo(std::ostream* os) const; - - bool MatchAndExplain(const absl::Status& status, - ::testing::MatchResultListener* result_listener) const; - - private: - const ::testing::Matcher code_matcher_; - const ::testing::Matcher message_matcher_; -}; - -// Monomorphic implementation of matcher StatusIs() for a given type -// T. T can be Status, StatusOr<>, or a reference to either of them. -template -class MonoStatusIsMatcherImpl : public ::testing::MatcherInterface { - public: - explicit MonoStatusIsMatcherImpl(StatusIsMatcherCommonImpl common_impl) - : common_impl_(std::move(common_impl)) {} - - void DescribeTo(std::ostream* os) const override { - common_impl_.DescribeTo(os); - } - - void DescribeNegationTo(std::ostream* os) const override { - common_impl_.DescribeNegationTo(os); - } - - bool MatchAndExplain( - T actual_value, - ::testing::MatchResultListener* result_listener) const override { - return common_impl_.MatchAndExplain( - ::maldoca::testing::internal_status::GetStatus(actual_value), - result_listener); - } - - private: - StatusIsMatcherCommonImpl common_impl_; -}; - -// Implements StatusIs() as a polymorphic matcher. -class StatusIsMatcher { - public: - template - StatusIsMatcher(StatusCodeMatcher&& code_matcher, - StatusMessageMatcher&& message_matcher) - : common_impl_(::testing::MatcherCast( - std::forward(code_matcher)), - ::testing::MatcherCast( - std::forward(message_matcher))) { - } - - // Converts this polymorphic matcher to a monomorphic matcher of the - // given type. T can be StatusOr<>, Status, or a reference to - // either of them. - template - operator ::testing::Matcher() const { // NOLINT - return ::testing::Matcher(new MonoStatusIsMatcherImpl(common_impl_)); - } - - private: - const StatusIsMatcherCommonImpl common_impl_; -}; - -// CanonicalStatusIs() is a polymorphic matcher. This class is the common -// implementation of it shared by all types T where CanonicalStatusIs() can be -// used as a Matcher. -class CanonicalStatusIsMatcherCommonImpl { - public: - CanonicalStatusIsMatcherCommonImpl( - ::testing::Matcher code_matcher, - ::testing::Matcher message_matcher) - : code_matcher_(std::move(code_matcher)), - message_matcher_(std::move(message_matcher)) {} - - void DescribeTo(std::ostream* os) const; - - void DescribeNegationTo(std::ostream* os) const; - - bool MatchAndExplain(const absl::Status& status, - ::testing::MatchResultListener* result_listener) const; - - private: - const ::testing::Matcher code_matcher_; - const ::testing::Matcher message_matcher_; -}; - -// Monomorphic implementation of matcher CanonicalStatusIs() for a given type -// T. T can be Status, StatusOr<>, or a reference to either of them. -template -class MonoCanonicalStatusIsMatcherImpl : public ::testing::MatcherInterface { - public: - explicit MonoCanonicalStatusIsMatcherImpl( - CanonicalStatusIsMatcherCommonImpl common_impl) - : common_impl_(std::move(common_impl)) {} - - void DescribeTo(std::ostream* os) const override { - common_impl_.DescribeTo(os); - } - - void DescribeNegationTo(std::ostream* os) const override { - common_impl_.DescribeNegationTo(os); - } - - bool MatchAndExplain( - T actual_value, - ::testing::MatchResultListener* result_listener) const override { - return common_impl_.MatchAndExplain( - maldoca::testing::internal_status::GetStatus(actual_value), - result_listener); - } - - private: - CanonicalStatusIsMatcherCommonImpl common_impl_; -}; - -// Implements CanonicalStatusIs() as a polymorphic matcher. -class CanonicalStatusIsMatcher { - public: - template - CanonicalStatusIsMatcher(StatusCodeMatcher&& code_matcher, - StatusMessageMatcher&& message_matcher) - : common_impl_(::testing::MatcherCast( - std::forward(code_matcher)), - ::testing::MatcherCast( - std::forward(message_matcher))) { - } - - // Converts this polymorphic matcher to a monomorphic matcher of the given - // type. T can be StatusOr<>, Status, or a reference to either of them. - template - operator ::testing::Matcher() const { // NOLINT - return ::testing::Matcher( - new MonoCanonicalStatusIsMatcherImpl(common_impl_)); - } - - private: - const CanonicalStatusIsMatcherCommonImpl common_impl_; -}; - -// Monomorphic implementation of matcher IsOk() for a given type T. -// T can be Status, StatusOr<>, or a reference to either of them. -template -class MonoIsOkMatcherImpl : public ::testing::MatcherInterface { - public: - void DescribeTo(std::ostream* os) const override { *os << "is OK"; } - void DescribeNegationTo(std::ostream* os) const override { - *os << "is not OK"; - } - bool MatchAndExplain(T actual_value, - ::testing::MatchResultListener*) const override { - return ::maldoca::testing::internal_status::GetStatus(actual_value).ok(); - } -}; - -// Implements IsOk() as a polymorphic matcher. -class IsOkMatcher { - public: - template - operator ::testing::Matcher() const { // NOLINT - return ::testing::Matcher(new MonoIsOkMatcherImpl()); - } -}; - void AddFatalFailure(std::string_view expression, - const maldoca::StatusBuilder& builder); + const absl::StatusBuilder& builder); } // namespace internal_status -// Implements StatusIs() as a polymorphic matcher. -class StatusIsMatcher { - public: - template - StatusIsMatcher(StatusCodeMatcher&& code_matcher, - StatusMessageMatcher&& message_matcher) - : common_impl_(::testing::MatcherCast( - std::forward(code_matcher)), - ::testing::MatcherCast( - std::forward(message_matcher))) { - } - - // Converts this polymorphic matcher to a monomorphic matcher of the - // given type. T can be StatusOr<>, Status, or a reference to - // either of them. - template - operator ::testing::Matcher() const { // NOLINT - return ::testing::Matcher( - new internal_status::MonoStatusIsMatcherImpl(common_impl_)); - } - - private: - const internal_status::StatusIsMatcherCommonImpl common_impl_; -}; - -// The one and two-arg StatusIs methods may infer the expected ErrorSpace from -// the StatusCodeMatcher argument. If you call StatusIs(e) or StatusIs(e, msg) -// and the argument `e` is: -// - an enum type, -// - which is associated with a custom ErrorSpace `S`, -// - and is not "OK" (i.e. 0), -// then the matcher will match a Status or StatusOr<> whose error space is `S`. -// -// Otherwise, the expected error space is the canonical error space. - -// Returns a gMock matcher that matches a Status or StatusOr<> whose error space -// is the inferred error space (see above), whose status code matches -// code_matcher, and whose error message matches message_matcher. -template -internal_status::StatusIsMatcher StatusIs( - StatusCodeMatcher&& code_matcher, StatusMessageMatcher&& message_matcher) { - return internal_status::StatusIsMatcher( - std::forward(code_matcher), - std::forward(message_matcher)); -} - -// Returns a gMock matcher that matches a Status or StatusOr<> whose error space -// is the inferred error space (see above), and whose status code matches -// code_matcher. -template -internal_status::StatusIsMatcher StatusIs(StatusCodeMatcher&& code_matcher) { - return StatusIs(std::forward(code_matcher), ::testing::_); -} - -// Returns a gMock matcher that matches a Status or StatusOr<> which is OK. -inline internal_status::IsOkMatcher IsOk() { - return internal_status::IsOkMatcher(); -} - -// Simple helper that returns whether "status" has code "code" -- exists -// primarily for compatibility with Google-internal APIs. -inline bool HasErrorCode(const absl::Status& status, absl::StatusCode code) { - return status.code() == code; -} +using ::absl_testing::IsOk; +using ::absl_testing::IsOkAndHolds; +using ::absl_testing::StatusIs; -// Returns a gMock matcher that matches a StatusOr<> whose status is -// OK and whose value matches the inner matcher. -template -internal_status::IsOkAndHoldsMatcher::type> -IsOkAndHolds(InnerMatcher&& inner_matcher) { - return internal_status::IsOkAndHoldsMatcher< - typename std::decay::type>( - std::forward(inner_matcher)); -} // Macros for testing the results of functions that return absl::Status or // absl::StatusOr (for any type T). -#define MALDOCA_EXPECT_OK(expression) \ - EXPECT_THAT(expression, maldoca::testing::IsOk()) -#define MALDOCA_ASSERT_OK(expression) \ - ASSERT_THAT(expression, maldoca::testing::IsOk()) +#define MALDOCA_EXPECT_OK(expression) ABSL_EXPECT_OK(expression) +#define MALDOCA_ASSERT_OK(expression) ABSL_ASSERT_OK(expression) // Executes an expression that returns a absl::StatusOr, and assigns the // contained variable to lhs if the error code is OK. @@ -562,20 +154,20 @@ IsOkAndHolds(InnerMatcher&& inner_matcher) { // MALDOCA_ASSERT_OK(status_or_value.status()); // value = std::move(status_or_value).value(); // -// WARNING: Like MALDOCA_ASSIGN_OR_RETURN, MALDOCA_ASSERT_OK_AND_ASSIGN expands +// WARNING: Like ABSL_ASSIGN_OR_RETURN, MALDOCA_ASSERT_OK_AND_ASSIGN expands // into multiple statements; it cannot be used in a single statement (e.g. as // the body of an if statement without {})! -#define MALDOCA_ASSERT_OK_AND_ASSIGN(lhs, rexpr) \ - MALDOCA_ASSIGN_OR_RETURN(/* NOLINT(clang-diagnostic-shadow) */ \ - lhs, rexpr, \ - ::maldoca::testing::internal_status:: \ - AddFatalFailure(#rexpr, _)) +#define MALDOCA_ASSERT_OK_AND_ASSIGN(lhs, rexpr) \ + ABSL_ASSIGN_OR_RETURN(/* NOLINT(clang-diagnostic-shadow) */ \ + lhs, rexpr, \ + ::maldoca::testing::internal_status::AddFatalFailure( \ + #rexpr, _)) // Executes an expression that returns a absl::StatusOr, and compares the // contained variable to rexpr if the error code is OK. // If the Status is non-OK it generates a nonfatal test failure #define MALDOCA_EXPECT_OK_AND_EQ(lhs, rexpr) \ - EXPECT_THAT(lhs, ::maldoca::testing::IsOkAndHolds(rexpr)); + EXPECT_THAT(lhs, ::absl_testing::IsOkAndHolds(rexpr)); } // namespace testing } // namespace maldoca diff --git a/maldoca/js/ast/BUILD b/maldoca/js/ast/BUILD index 67dd098..5863f5e 100644 --- a/maldoca/js/ast/BUILD +++ b/maldoca/js/ast/BUILD @@ -34,12 +34,12 @@ cc_library( hdrs = ["ast.generated.h"], deps = [ "//maldoca/astgen:ast_from_json_utils", - "//maldoca/base:status", "@abseil-cpp//absl/container:flat_hash_map", "@abseil-cpp//absl/container:flat_hash_set", "@abseil-cpp//absl/log", "@abseil-cpp//absl/memory", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", "@nlohmann_json//:json", @@ -78,10 +78,10 @@ cc_library( ":ast", ":ast_visitor", ":ast_walker", - "//maldoca/base:status", "//maldoca/js/babel", "//maldoca/js/babel:babel_cc_proto", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/strings:str_format", diff --git a/maldoca/js/ast/ast.generated.cc b/maldoca/js/ast/ast.generated.cc index 1d6fb4c..9eedd33 100644 --- a/maldoca/js/ast/ast.generated.cc +++ b/maldoca/js/ast/ast.generated.cc @@ -38,7 +38,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "nlohmann/json.hpp" -#include "maldoca/base/status_macros.h" namespace maldoca { diff --git a/maldoca/js/ast/ast_from_json.generated.cc b/maldoca/js/ast/ast_from_json.generated.cc index 3e47fb2..ae61cb5 100644 --- a/maldoca/js/ast/ast_from_json.generated.cc +++ b/maldoca/js/ast/ast_from_json.generated.cc @@ -32,11 +32,11 @@ #include "absl/container/flat_hash_set.h" #include "absl/memory/memory.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "maldoca/astgen/ast_from_json_utils.h" -#include "maldoca/base/status_macros.h" #include "nlohmann/json.hpp" namespace maldoca { @@ -69,8 +69,8 @@ JsPosition::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto line, JsPosition::GetLine(json)); - MALDOCA_ASSIGN_OR_RETURN(auto column, JsPosition::GetColumn(json)); + ABSL_ASSIGN_OR_RETURN(auto line, JsPosition::GetLine(json)); + ABSL_ASSIGN_OR_RETURN(auto column, JsPosition::GetColumn(json)); return absl::make_unique( std::move(line), @@ -114,9 +114,9 @@ JsSourceLocation::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto start, JsSourceLocation::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsSourceLocation::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto identifier_name, JsSourceLocation::GetIdentifierName(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsSourceLocation::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsSourceLocation::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto identifier_name, JsSourceLocation::GetIdentifierName(json)); return absl::make_unique( std::move(start), @@ -170,7 +170,7 @@ JsComment::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(std::string type, GetType(json)); + ABSL_ASSIGN_OR_RETURN(std::string type, GetType(json)); if (type == "CommentBlock") { return JsCommentBlock::FromJson(json); @@ -190,10 +190,10 @@ JsCommentBlock::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsComment::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto value, JsComment::GetValue(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsComment::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsComment::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsComment::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto value, JsComment::GetValue(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsComment::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsComment::GetEnd(json)); return absl::make_unique( std::move(loc), @@ -212,10 +212,10 @@ JsCommentLine::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsComment::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto value, JsComment::GetValue(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsComment::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsComment::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsComment::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto value, JsComment::GetValue(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsComment::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsComment::GetEnd(json)); return absl::make_unique( std::move(loc), @@ -252,8 +252,8 @@ JsSymbolId::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto name, JsSymbolId::GetName(json)); - MALDOCA_ASSIGN_OR_RETURN(auto def_scope_uid, JsSymbolId::GetDefScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto name, JsSymbolId::GetName(json)); + ABSL_ASSIGN_OR_RETURN(auto def_scope_uid, JsSymbolId::GetDefScopeUid(json)); return absl::make_unique( std::move(name), @@ -359,7 +359,7 @@ JsNode::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(std::string type, GetType(json)); + ABSL_ASSIGN_OR_RETURN(std::string type, GetType(json)); if (type == "File") { return JsFile::FromJson(json); @@ -580,16 +580,16 @@ JsInterpreterDirective::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto value, JsInterpreterDirective::GetValue(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto value, JsInterpreterDirective::GetValue(json)); return absl::make_unique( std::move(loc), @@ -614,7 +614,7 @@ JsProgramBodyElement::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(std::string type, GetType(json)); + ABSL_ASSIGN_OR_RETURN(std::string type, GetType(json)); if (type == "ExpressionStatement") { return JsExpressionStatement::FromJson(json); @@ -704,8 +704,8 @@ JsDirectiveLiteralExtra::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto raw, JsDirectiveLiteralExtra::GetRaw(json)); - MALDOCA_ASSIGN_OR_RETURN(auto raw_value, JsDirectiveLiteralExtra::GetRawValue(json)); + ABSL_ASSIGN_OR_RETURN(auto raw, JsDirectiveLiteralExtra::GetRaw(json)); + ABSL_ASSIGN_OR_RETURN(auto raw_value, JsDirectiveLiteralExtra::GetRawValue(json)); return absl::make_unique( std::move(raw), @@ -740,17 +740,17 @@ JsDirectiveLiteral::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto value, JsDirectiveLiteral::GetValue(json)); - MALDOCA_ASSIGN_OR_RETURN(auto extra, JsDirectiveLiteral::GetExtra(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto value, JsDirectiveLiteral::GetValue(json)); + ABSL_ASSIGN_OR_RETURN(auto extra, JsDirectiveLiteral::GetExtra(json)); return absl::make_unique( std::move(loc), @@ -785,16 +785,16 @@ JsDirective::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto value, JsDirective::GetValue(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto value, JsDirective::GetValue(json)); return absl::make_unique( std::move(loc), @@ -859,19 +859,19 @@ JsProgram::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto interpreter, JsProgram::GetInterpreter(json)); - MALDOCA_ASSIGN_OR_RETURN(auto source_type, JsProgram::GetSourceType(json)); - MALDOCA_ASSIGN_OR_RETURN(auto body, JsProgram::GetBody(json)); - MALDOCA_ASSIGN_OR_RETURN(auto directives, JsProgram::GetDirectives(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto interpreter, JsProgram::GetInterpreter(json)); + ABSL_ASSIGN_OR_RETURN(auto source_type, JsProgram::GetSourceType(json)); + ABSL_ASSIGN_OR_RETURN(auto body, JsProgram::GetBody(json)); + ABSL_ASSIGN_OR_RETURN(auto directives, JsProgram::GetDirectives(json)); return absl::make_unique( std::move(loc), @@ -919,17 +919,17 @@ JsFile::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto program, JsFile::GetProgram(json)); - MALDOCA_ASSIGN_OR_RETURN(auto comments, JsFile::GetComments(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto program, JsFile::GetProgram(json)); + ABSL_ASSIGN_OR_RETURN(auto comments, JsFile::GetComments(json)); return absl::make_unique( std::move(loc), @@ -1005,7 +1005,7 @@ JsExpression::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(std::string type, GetType(json)); + ABSL_ASSIGN_OR_RETURN(std::string type, GetType(json)); if (type == "Identifier") { return JsIdentifier::FromJson(json); @@ -1111,7 +1111,7 @@ JsPattern::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(std::string type, GetType(json)); + ABSL_ASSIGN_OR_RETURN(std::string type, GetType(json)); if (type == "Identifier") { return JsIdentifier::FromJson(json); @@ -1167,7 +1167,7 @@ JsLVal::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(std::string type, GetType(json)); + ABSL_ASSIGN_OR_RETURN(std::string type, GetType(json)); if (type == "Identifier") { return JsIdentifier::FromJson(json); @@ -1222,16 +1222,16 @@ JsIdentifier::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto name, JsIdentifier::GetName(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto name, JsIdentifier::GetName(json)); return absl::make_unique( std::move(loc), @@ -1281,16 +1281,16 @@ JsPrivateName::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto id, JsPrivateName::GetId(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto id, JsPrivateName::GetId(json)); return absl::make_unique( std::move(loc), @@ -1315,7 +1315,7 @@ JsLiteral::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(std::string type, GetType(json)); + ABSL_ASSIGN_OR_RETURN(std::string type, GetType(json)); if (type == "RegExpLiteral") { return JsRegExpLiteral::FromJson(json); @@ -1352,7 +1352,7 @@ JsRegExpLiteralExtra::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto raw, JsRegExpLiteralExtra::GetRaw(json)); + ABSL_ASSIGN_OR_RETURN(auto raw, JsRegExpLiteralExtra::GetRaw(json)); return absl::make_unique( std::move(raw)); @@ -1395,18 +1395,18 @@ JsRegExpLiteral::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto pattern, JsRegExpLiteral::GetPattern(json)); - MALDOCA_ASSIGN_OR_RETURN(auto flags, JsRegExpLiteral::GetFlags(json)); - MALDOCA_ASSIGN_OR_RETURN(auto extra, JsRegExpLiteral::GetExtra(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto pattern, JsRegExpLiteral::GetPattern(json)); + ABSL_ASSIGN_OR_RETURN(auto flags, JsRegExpLiteral::GetFlags(json)); + ABSL_ASSIGN_OR_RETURN(auto extra, JsRegExpLiteral::GetExtra(json)); return absl::make_unique( std::move(loc), @@ -1433,15 +1433,15 @@ JsNullLiteral::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); return absl::make_unique( std::move(loc), @@ -1483,8 +1483,8 @@ JsStringLiteralExtra::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto raw, JsStringLiteralExtra::GetRaw(json)); - MALDOCA_ASSIGN_OR_RETURN(auto raw_value, JsStringLiteralExtra::GetRawValue(json)); + ABSL_ASSIGN_OR_RETURN(auto raw, JsStringLiteralExtra::GetRaw(json)); + ABSL_ASSIGN_OR_RETURN(auto raw_value, JsStringLiteralExtra::GetRawValue(json)); return absl::make_unique( std::move(raw), @@ -1535,17 +1535,17 @@ JsStringLiteral::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto value, JsStringLiteral::GetValue(json)); - MALDOCA_ASSIGN_OR_RETURN(auto extra, JsStringLiteral::GetExtra(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto value, JsStringLiteral::GetValue(json)); + ABSL_ASSIGN_OR_RETURN(auto extra, JsStringLiteral::GetExtra(json)); return absl::make_unique( std::move(loc), @@ -1580,16 +1580,16 @@ JsBooleanLiteral::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto value, JsBooleanLiteral::GetValue(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto value, JsBooleanLiteral::GetValue(json)); return absl::make_unique( std::move(loc), @@ -1632,8 +1632,8 @@ JsNumericLiteralExtra::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto raw, JsNumericLiteralExtra::GetRaw(json)); - MALDOCA_ASSIGN_OR_RETURN(auto raw_value, JsNumericLiteralExtra::GetRawValue(json)); + ABSL_ASSIGN_OR_RETURN(auto raw, JsNumericLiteralExtra::GetRaw(json)); + ABSL_ASSIGN_OR_RETURN(auto raw_value, JsNumericLiteralExtra::GetRawValue(json)); return absl::make_unique( std::move(raw), @@ -1668,17 +1668,17 @@ JsNumericLiteral::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto value, JsNumericLiteral::GetValue(json)); - MALDOCA_ASSIGN_OR_RETURN(auto extra, JsNumericLiteral::GetExtra(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto value, JsNumericLiteral::GetValue(json)); + ABSL_ASSIGN_OR_RETURN(auto extra, JsNumericLiteral::GetExtra(json)); return absl::make_unique( std::move(loc), @@ -1722,8 +1722,8 @@ JsBigIntLiteralExtra::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto raw, JsBigIntLiteralExtra::GetRaw(json)); - MALDOCA_ASSIGN_OR_RETURN(auto raw_value, JsBigIntLiteralExtra::GetRawValue(json)); + ABSL_ASSIGN_OR_RETURN(auto raw, JsBigIntLiteralExtra::GetRaw(json)); + ABSL_ASSIGN_OR_RETURN(auto raw_value, JsBigIntLiteralExtra::GetRawValue(json)); return absl::make_unique( std::move(raw), @@ -1758,17 +1758,17 @@ JsBigIntLiteral::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto value, JsBigIntLiteral::GetValue(json)); - MALDOCA_ASSIGN_OR_RETURN(auto extra, JsBigIntLiteral::GetExtra(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto value, JsBigIntLiteral::GetValue(json)); + ABSL_ASSIGN_OR_RETURN(auto extra, JsBigIntLiteral::GetExtra(json)); return absl::make_unique( std::move(loc), @@ -1832,7 +1832,7 @@ JsFunction::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(std::string type, GetType(json)); + ABSL_ASSIGN_OR_RETURN(std::string type, GetType(json)); if (type == "FunctionDeclaration") { return JsFunctionDeclaration::FromJson(json); @@ -1862,7 +1862,7 @@ JsStatement::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(std::string type, GetType(json)); + ABSL_ASSIGN_OR_RETURN(std::string type, GetType(json)); if (type == "ExpressionStatement") { return JsExpressionStatement::FromJson(json); @@ -1960,17 +1960,17 @@ JsBlockStatement::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto body, JsBlockStatement::GetBody(json)); - MALDOCA_ASSIGN_OR_RETURN(auto directives, JsBlockStatement::GetDirectives(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto body, JsBlockStatement::GetBody(json)); + ABSL_ASSIGN_OR_RETURN(auto directives, JsBlockStatement::GetDirectives(json)); return absl::make_unique( std::move(loc), @@ -2005,7 +2005,7 @@ JsBlockStatementFunction::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(std::string type, GetType(json)); + ABSL_ASSIGN_OR_RETURN(std::string type, GetType(json)); if (type == "FunctionDeclaration") { return JsFunctionDeclaration::FromJson(json); @@ -2040,16 +2040,16 @@ JsExpressionStatement::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto expression, JsExpressionStatement::GetExpression(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto expression, JsExpressionStatement::GetExpression(json)); return absl::make_unique( std::move(loc), @@ -2074,15 +2074,15 @@ JsEmptyStatement::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); return absl::make_unique( std::move(loc), @@ -2106,15 +2106,15 @@ JsDebuggerStatement::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); return absl::make_unique( std::move(loc), @@ -2156,17 +2156,17 @@ JsWithStatement::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto object, JsWithStatement::GetObject(json)); - MALDOCA_ASSIGN_OR_RETURN(auto body, JsWithStatement::GetBody(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto object, JsWithStatement::GetObject(json)); + ABSL_ASSIGN_OR_RETURN(auto body, JsWithStatement::GetBody(json)); return absl::make_unique( std::move(loc), @@ -2201,16 +2201,16 @@ JsReturnStatement::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto argument, JsReturnStatement::GetArgument(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto argument, JsReturnStatement::GetArgument(json)); return absl::make_unique( std::move(loc), @@ -2253,17 +2253,17 @@ JsLabeledStatement::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto label, JsLabeledStatement::GetLabel(json)); - MALDOCA_ASSIGN_OR_RETURN(auto body, JsLabeledStatement::GetBody(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto label, JsLabeledStatement::GetLabel(json)); + ABSL_ASSIGN_OR_RETURN(auto body, JsLabeledStatement::GetBody(json)); return absl::make_unique( std::move(loc), @@ -2298,16 +2298,16 @@ JsBreakStatement::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto label, JsBreakStatement::GetLabel(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto label, JsBreakStatement::GetLabel(json)); return absl::make_unique( std::move(loc), @@ -2341,16 +2341,16 @@ JsContinueStatement::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto label, JsContinueStatement::GetLabel(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto label, JsContinueStatement::GetLabel(json)); return absl::make_unique( std::move(loc), @@ -2402,18 +2402,18 @@ JsIfStatement::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto test, JsIfStatement::GetTest(json)); - MALDOCA_ASSIGN_OR_RETURN(auto consequent, JsIfStatement::GetConsequent(json)); - MALDOCA_ASSIGN_OR_RETURN(auto alternate, JsIfStatement::GetAlternate(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto test, JsIfStatement::GetTest(json)); + ABSL_ASSIGN_OR_RETURN(auto consequent, JsIfStatement::GetConsequent(json)); + ABSL_ASSIGN_OR_RETURN(auto alternate, JsIfStatement::GetAlternate(json)); return absl::make_unique( std::move(loc), @@ -2460,17 +2460,17 @@ JsSwitchCase::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto test, JsSwitchCase::GetTest(json)); - MALDOCA_ASSIGN_OR_RETURN(auto consequent, JsSwitchCase::GetConsequent(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto test, JsSwitchCase::GetTest(json)); + ABSL_ASSIGN_OR_RETURN(auto consequent, JsSwitchCase::GetConsequent(json)); return absl::make_unique( std::move(loc), @@ -2516,17 +2516,17 @@ JsSwitchStatement::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto discriminant, JsSwitchStatement::GetDiscriminant(json)); - MALDOCA_ASSIGN_OR_RETURN(auto cases, JsSwitchStatement::GetCases(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto discriminant, JsSwitchStatement::GetDiscriminant(json)); + ABSL_ASSIGN_OR_RETURN(auto cases, JsSwitchStatement::GetCases(json)); return absl::make_unique( std::move(loc), @@ -2561,16 +2561,16 @@ JsThrowStatement::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto argument, JsThrowStatement::GetArgument(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto argument, JsThrowStatement::GetArgument(json)); return absl::make_unique( std::move(loc), @@ -2613,17 +2613,17 @@ JsCatchClause::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto param, JsCatchClause::GetParam(json)); - MALDOCA_ASSIGN_OR_RETURN(auto body, JsCatchClause::GetBody(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto param, JsCatchClause::GetParam(json)); + ABSL_ASSIGN_OR_RETURN(auto body, JsCatchClause::GetBody(json)); return absl::make_unique( std::move(loc), @@ -2676,18 +2676,18 @@ JsTryStatement::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto block, JsTryStatement::GetBlock(json)); - MALDOCA_ASSIGN_OR_RETURN(auto handler, JsTryStatement::GetHandler(json)); - MALDOCA_ASSIGN_OR_RETURN(auto finalizer, JsTryStatement::GetFinalizer(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto block, JsTryStatement::GetBlock(json)); + ABSL_ASSIGN_OR_RETURN(auto handler, JsTryStatement::GetHandler(json)); + ABSL_ASSIGN_OR_RETURN(auto finalizer, JsTryStatement::GetFinalizer(json)); return absl::make_unique( std::move(loc), @@ -2732,17 +2732,17 @@ JsWhileStatement::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto test, JsWhileStatement::GetTest(json)); - MALDOCA_ASSIGN_OR_RETURN(auto body, JsWhileStatement::GetBody(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto test, JsWhileStatement::GetTest(json)); + ABSL_ASSIGN_OR_RETURN(auto body, JsWhileStatement::GetBody(json)); return absl::make_unique( std::move(loc), @@ -2786,17 +2786,17 @@ JsDoWhileStatement::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto body, JsDoWhileStatement::GetBody(json)); - MALDOCA_ASSIGN_OR_RETURN(auto test, JsDoWhileStatement::GetTest(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto body, JsDoWhileStatement::GetBody(json)); + ABSL_ASSIGN_OR_RETURN(auto test, JsDoWhileStatement::GetTest(json)); return absl::make_unique( std::move(loc), @@ -2822,7 +2822,7 @@ JsDeclaration::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(std::string type, GetType(json)); + ABSL_ASSIGN_OR_RETURN(std::string type, GetType(json)); if (type == "FunctionDeclaration") { return JsFunctionDeclaration::FromJson(json); @@ -2862,17 +2862,17 @@ JsVariableDeclarator::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto id, JsVariableDeclarator::GetId(json)); - MALDOCA_ASSIGN_OR_RETURN(auto init, JsVariableDeclarator::GetInit(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto id, JsVariableDeclarator::GetId(json)); + ABSL_ASSIGN_OR_RETURN(auto init, JsVariableDeclarator::GetInit(json)); return absl::make_unique( std::move(loc), @@ -2934,17 +2934,17 @@ JsVariableDeclaration::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto declarations, JsVariableDeclaration::GetDeclarations(json)); - MALDOCA_ASSIGN_OR_RETURN(auto kind, JsVariableDeclaration::GetKind(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto declarations, JsVariableDeclaration::GetDeclarations(json)); + ABSL_ASSIGN_OR_RETURN(auto kind, JsVariableDeclaration::GetKind(json)); return absl::make_unique( std::move(loc), @@ -3014,19 +3014,19 @@ JsForStatement::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto init, JsForStatement::GetInit(json)); - MALDOCA_ASSIGN_OR_RETURN(auto test, JsForStatement::GetTest(json)); - MALDOCA_ASSIGN_OR_RETURN(auto update, JsForStatement::GetUpdate(json)); - MALDOCA_ASSIGN_OR_RETURN(auto body, JsForStatement::GetBody(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto init, JsForStatement::GetInit(json)); + ABSL_ASSIGN_OR_RETURN(auto test, JsForStatement::GetTest(json)); + ABSL_ASSIGN_OR_RETURN(auto update, JsForStatement::GetUpdate(json)); + ABSL_ASSIGN_OR_RETURN(auto body, JsForStatement::GetBody(json)); return absl::make_unique( std::move(loc), @@ -3089,18 +3089,18 @@ JsForInStatement::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto left, JsForInStatement::GetLeft(json)); - MALDOCA_ASSIGN_OR_RETURN(auto right, JsForInStatement::GetRight(json)); - MALDOCA_ASSIGN_OR_RETURN(auto body, JsForInStatement::GetBody(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto left, JsForInStatement::GetLeft(json)); + ABSL_ASSIGN_OR_RETURN(auto right, JsForInStatement::GetRight(json)); + ABSL_ASSIGN_OR_RETURN(auto body, JsForInStatement::GetBody(json)); return absl::make_unique( std::move(loc), @@ -3171,19 +3171,19 @@ JsForOfStatement::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto left, JsForOfStatement::GetLeft(json)); - MALDOCA_ASSIGN_OR_RETURN(auto right, JsForOfStatement::GetRight(json)); - MALDOCA_ASSIGN_OR_RETURN(auto body, JsForOfStatement::GetBody(json)); - MALDOCA_ASSIGN_OR_RETURN(auto await, JsForOfStatement::GetAwait(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto left, JsForOfStatement::GetLeft(json)); + ABSL_ASSIGN_OR_RETURN(auto right, JsForOfStatement::GetRight(json)); + ABSL_ASSIGN_OR_RETURN(auto body, JsForOfStatement::GetBody(json)); + ABSL_ASSIGN_OR_RETURN(auto await, JsForOfStatement::GetAwait(json)); return absl::make_unique( std::move(loc), @@ -3227,20 +3227,20 @@ JsFunctionDeclaration::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto id, JsFunction::GetId(json)); - MALDOCA_ASSIGN_OR_RETURN(auto params, JsFunction::GetParams(json)); - MALDOCA_ASSIGN_OR_RETURN(auto generator, JsFunction::GetGenerator(json)); - MALDOCA_ASSIGN_OR_RETURN(auto async, JsFunction::GetAsync(json)); - MALDOCA_ASSIGN_OR_RETURN(auto body, JsBlockStatementFunction::GetBody(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto id, JsFunction::GetId(json)); + ABSL_ASSIGN_OR_RETURN(auto params, JsFunction::GetParams(json)); + ABSL_ASSIGN_OR_RETURN(auto generator, JsFunction::GetGenerator(json)); + ABSL_ASSIGN_OR_RETURN(auto async, JsFunction::GetAsync(json)); + ABSL_ASSIGN_OR_RETURN(auto body, JsBlockStatementFunction::GetBody(json)); return absl::make_unique( std::move(loc), @@ -3285,15 +3285,15 @@ JsSuper::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); return absl::make_unique( std::move(loc), @@ -3333,15 +3333,15 @@ JsImport::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); return absl::make_unique( std::move(loc), @@ -3365,15 +3365,15 @@ JsThisExpression::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); return absl::make_unique( std::move(loc), @@ -3414,20 +3414,20 @@ JsArrowFunctionExpression::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto id, JsFunction::GetId(json)); - MALDOCA_ASSIGN_OR_RETURN(auto params, JsFunction::GetParams(json)); - MALDOCA_ASSIGN_OR_RETURN(auto generator, JsFunction::GetGenerator(json)); - MALDOCA_ASSIGN_OR_RETURN(auto async, JsFunction::GetAsync(json)); - MALDOCA_ASSIGN_OR_RETURN(auto body, JsArrowFunctionExpression::GetBody(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto id, JsFunction::GetId(json)); + ABSL_ASSIGN_OR_RETURN(auto params, JsFunction::GetParams(json)); + ABSL_ASSIGN_OR_RETURN(auto generator, JsFunction::GetGenerator(json)); + ABSL_ASSIGN_OR_RETURN(auto async, JsFunction::GetAsync(json)); + ABSL_ASSIGN_OR_RETURN(auto body, JsArrowFunctionExpression::GetBody(json)); return absl::make_unique( std::move(loc), @@ -3474,17 +3474,17 @@ JsYieldExpression::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto argument, JsYieldExpression::GetArgument(json)); - MALDOCA_ASSIGN_OR_RETURN(auto delegate, JsYieldExpression::GetDelegate(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto argument, JsYieldExpression::GetArgument(json)); + ABSL_ASSIGN_OR_RETURN(auto delegate, JsYieldExpression::GetDelegate(json)); return absl::make_unique( std::move(loc), @@ -3519,16 +3519,16 @@ JsAwaitExpression::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto argument, JsAwaitExpression::GetArgument(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto argument, JsAwaitExpression::GetArgument(json)); return absl::make_unique( std::move(loc), @@ -3578,16 +3578,16 @@ JsSpreadElement::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto argument, JsSpreadElement::GetArgument(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto argument, JsSpreadElement::GetArgument(json)); return absl::make_unique( std::move(loc), @@ -3633,16 +3633,16 @@ JsArrayExpression::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto elements, JsArrayExpression::GetElements(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto elements, JsArrayExpression::GetElements(json)); return absl::make_unique( std::move(loc), @@ -3685,7 +3685,7 @@ JsObjectMember::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(std::string type, GetType(json)); + ABSL_ASSIGN_OR_RETURN(std::string type, GetType(json)); if (type == "ObjectProperty") { return JsObjectProperty::FromJson(json); @@ -3747,19 +3747,19 @@ JsObjectProperty::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto key, JsObjectMember::GetKey(json)); - MALDOCA_ASSIGN_OR_RETURN(auto computed, JsObjectMember::GetComputed(json)); - MALDOCA_ASSIGN_OR_RETURN(auto shorthand, JsObjectProperty::GetShorthand(json)); - MALDOCA_ASSIGN_OR_RETURN(auto value, JsObjectProperty::GetValue(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto key, JsObjectMember::GetKey(json)); + ABSL_ASSIGN_OR_RETURN(auto computed, JsObjectMember::GetComputed(json)); + ABSL_ASSIGN_OR_RETURN(auto shorthand, JsObjectProperty::GetShorthand(json)); + ABSL_ASSIGN_OR_RETURN(auto value, JsObjectProperty::GetValue(json)); return absl::make_unique( std::move(loc), @@ -3812,23 +3812,23 @@ JsObjectMethod::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto key, JsObjectMember::GetKey(json)); - MALDOCA_ASSIGN_OR_RETURN(auto computed, JsObjectMember::GetComputed(json)); - MALDOCA_ASSIGN_OR_RETURN(auto id, JsFunction::GetId(json)); - MALDOCA_ASSIGN_OR_RETURN(auto params, JsFunction::GetParams(json)); - MALDOCA_ASSIGN_OR_RETURN(auto generator, JsFunction::GetGenerator(json)); - MALDOCA_ASSIGN_OR_RETURN(auto async, JsFunction::GetAsync(json)); - MALDOCA_ASSIGN_OR_RETURN(auto body, JsBlockStatementFunction::GetBody(json)); - MALDOCA_ASSIGN_OR_RETURN(auto kind, JsObjectMethod::GetKind(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto key, JsObjectMember::GetKey(json)); + ABSL_ASSIGN_OR_RETURN(auto computed, JsObjectMember::GetComputed(json)); + ABSL_ASSIGN_OR_RETURN(auto id, JsFunction::GetId(json)); + ABSL_ASSIGN_OR_RETURN(auto params, JsFunction::GetParams(json)); + ABSL_ASSIGN_OR_RETURN(auto generator, JsFunction::GetGenerator(json)); + ABSL_ASSIGN_OR_RETURN(auto async, JsFunction::GetAsync(json)); + ABSL_ASSIGN_OR_RETURN(auto body, JsBlockStatementFunction::GetBody(json)); + ABSL_ASSIGN_OR_RETURN(auto kind, JsObjectMethod::GetKind(json)); return absl::make_unique( std::move(loc), @@ -3883,16 +3883,16 @@ JsObjectExpression::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto properties_, JsObjectExpression::GetProperties(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto properties_, JsObjectExpression::GetProperties(json)); return absl::make_unique( std::move(loc), @@ -3917,20 +3917,20 @@ JsFunctionExpression::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto id, JsFunction::GetId(json)); - MALDOCA_ASSIGN_OR_RETURN(auto params, JsFunction::GetParams(json)); - MALDOCA_ASSIGN_OR_RETURN(auto generator, JsFunction::GetGenerator(json)); - MALDOCA_ASSIGN_OR_RETURN(auto async, JsFunction::GetAsync(json)); - MALDOCA_ASSIGN_OR_RETURN(auto body, JsBlockStatementFunction::GetBody(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto id, JsFunction::GetId(json)); + ABSL_ASSIGN_OR_RETURN(auto params, JsFunction::GetParams(json)); + ABSL_ASSIGN_OR_RETURN(auto generator, JsFunction::GetGenerator(json)); + ABSL_ASSIGN_OR_RETURN(auto async, JsFunction::GetAsync(json)); + ABSL_ASSIGN_OR_RETURN(auto body, JsBlockStatementFunction::GetBody(json)); return absl::make_unique( std::move(loc), @@ -3986,18 +3986,18 @@ JsUnaryExpression::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto operator_, JsUnaryExpression::GetOperator(json)); - MALDOCA_ASSIGN_OR_RETURN(auto prefix, JsUnaryExpression::GetPrefix(json)); - MALDOCA_ASSIGN_OR_RETURN(auto argument, JsUnaryExpression::GetArgument(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto operator_, JsUnaryExpression::GetOperator(json)); + ABSL_ASSIGN_OR_RETURN(auto prefix, JsUnaryExpression::GetPrefix(json)); + ABSL_ASSIGN_OR_RETURN(auto argument, JsUnaryExpression::GetArgument(json)); return absl::make_unique( std::move(loc), @@ -4051,18 +4051,18 @@ JsUpdateExpression::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto operator_, JsUpdateExpression::GetOperator(json)); - MALDOCA_ASSIGN_OR_RETURN(auto argument, JsUpdateExpression::GetArgument(json)); - MALDOCA_ASSIGN_OR_RETURN(auto prefix, JsUpdateExpression::GetPrefix(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto operator_, JsUpdateExpression::GetOperator(json)); + ABSL_ASSIGN_OR_RETURN(auto argument, JsUpdateExpression::GetArgument(json)); + ABSL_ASSIGN_OR_RETURN(auto prefix, JsUpdateExpression::GetPrefix(json)); return absl::make_unique( std::move(loc), @@ -4124,18 +4124,18 @@ JsBinaryExpression::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto operator_, JsBinaryExpression::GetOperator(json)); - MALDOCA_ASSIGN_OR_RETURN(auto left, JsBinaryExpression::GetLeft(json)); - MALDOCA_ASSIGN_OR_RETURN(auto right, JsBinaryExpression::GetRight(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto operator_, JsBinaryExpression::GetOperator(json)); + ABSL_ASSIGN_OR_RETURN(auto left, JsBinaryExpression::GetLeft(json)); + ABSL_ASSIGN_OR_RETURN(auto right, JsBinaryExpression::GetRight(json)); return absl::make_unique( std::move(loc), @@ -4189,18 +4189,18 @@ JsAssignmentExpression::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto operator_, JsAssignmentExpression::GetOperator(json)); - MALDOCA_ASSIGN_OR_RETURN(auto left, JsAssignmentExpression::GetLeft(json)); - MALDOCA_ASSIGN_OR_RETURN(auto right, JsAssignmentExpression::GetRight(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto operator_, JsAssignmentExpression::GetOperator(json)); + ABSL_ASSIGN_OR_RETURN(auto left, JsAssignmentExpression::GetLeft(json)); + ABSL_ASSIGN_OR_RETURN(auto right, JsAssignmentExpression::GetRight(json)); return absl::make_unique( std::move(loc), @@ -4254,18 +4254,18 @@ JsLogicalExpression::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto operator_, JsLogicalExpression::GetOperator(json)); - MALDOCA_ASSIGN_OR_RETURN(auto left, JsLogicalExpression::GetLeft(json)); - MALDOCA_ASSIGN_OR_RETURN(auto right, JsLogicalExpression::GetRight(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto operator_, JsLogicalExpression::GetOperator(json)); + ABSL_ASSIGN_OR_RETURN(auto left, JsLogicalExpression::GetLeft(json)); + ABSL_ASSIGN_OR_RETURN(auto right, JsLogicalExpression::GetRight(json)); return absl::make_unique( std::move(loc), @@ -4335,18 +4335,18 @@ JsMemberExpression::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto object, JsMemberExpression::GetObject(json)); - MALDOCA_ASSIGN_OR_RETURN(auto property, JsMemberExpression::GetProperty(json)); - MALDOCA_ASSIGN_OR_RETURN(auto computed, JsMemberExpression::GetComputed(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto object, JsMemberExpression::GetObject(json)); + ABSL_ASSIGN_OR_RETURN(auto property, JsMemberExpression::GetProperty(json)); + ABSL_ASSIGN_OR_RETURN(auto computed, JsMemberExpression::GetComputed(json)); return absl::make_unique( std::move(loc), @@ -4417,19 +4417,19 @@ JsOptionalMemberExpression::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto object, JsOptionalMemberExpression::GetObject(json)); - MALDOCA_ASSIGN_OR_RETURN(auto property, JsOptionalMemberExpression::GetProperty(json)); - MALDOCA_ASSIGN_OR_RETURN(auto computed, JsOptionalMemberExpression::GetComputed(json)); - MALDOCA_ASSIGN_OR_RETURN(auto optional, JsOptionalMemberExpression::GetOptional(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto object, JsOptionalMemberExpression::GetObject(json)); + ABSL_ASSIGN_OR_RETURN(auto property, JsOptionalMemberExpression::GetProperty(json)); + ABSL_ASSIGN_OR_RETURN(auto computed, JsOptionalMemberExpression::GetComputed(json)); + ABSL_ASSIGN_OR_RETURN(auto optional, JsOptionalMemberExpression::GetOptional(json)); return absl::make_unique( std::move(loc), @@ -4484,18 +4484,18 @@ JsConditionalExpression::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto test, JsConditionalExpression::GetTest(json)); - MALDOCA_ASSIGN_OR_RETURN(auto alternate, JsConditionalExpression::GetAlternate(json)); - MALDOCA_ASSIGN_OR_RETURN(auto consequent, JsConditionalExpression::GetConsequent(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto test, JsConditionalExpression::GetTest(json)); + ABSL_ASSIGN_OR_RETURN(auto alternate, JsConditionalExpression::GetAlternate(json)); + ABSL_ASSIGN_OR_RETURN(auto consequent, JsConditionalExpression::GetConsequent(json)); return absl::make_unique( std::move(loc), @@ -4562,17 +4562,17 @@ JsCallExpression::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto callee, JsCallExpression::GetCallee(json)); - MALDOCA_ASSIGN_OR_RETURN(auto arguments, JsCallExpression::GetArguments(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto callee, JsCallExpression::GetCallee(json)); + ABSL_ASSIGN_OR_RETURN(auto arguments, JsCallExpression::GetArguments(json)); return absl::make_unique( std::move(loc), @@ -4635,18 +4635,18 @@ JsOptionalCallExpression::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto callee, JsOptionalCallExpression::GetCallee(json)); - MALDOCA_ASSIGN_OR_RETURN(auto arguments, JsOptionalCallExpression::GetArguments(json)); - MALDOCA_ASSIGN_OR_RETURN(auto optional, JsOptionalCallExpression::GetOptional(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto callee, JsOptionalCallExpression::GetCallee(json)); + ABSL_ASSIGN_OR_RETURN(auto arguments, JsOptionalCallExpression::GetArguments(json)); + ABSL_ASSIGN_OR_RETURN(auto optional, JsOptionalCallExpression::GetOptional(json)); return absl::make_unique( std::move(loc), @@ -4713,17 +4713,17 @@ JsNewExpression::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto callee, JsNewExpression::GetCallee(json)); - MALDOCA_ASSIGN_OR_RETURN(auto arguments, JsNewExpression::GetArguments(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto callee, JsNewExpression::GetCallee(json)); + ABSL_ASSIGN_OR_RETURN(auto arguments, JsNewExpression::GetArguments(json)); return absl::make_unique( std::move(loc), @@ -4760,16 +4760,16 @@ JsSequenceExpression::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto expressions, JsSequenceExpression::GetExpressions(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto expressions, JsSequenceExpression::GetExpressions(json)); return absl::make_unique( std::move(loc), @@ -4803,16 +4803,16 @@ JsParenthesizedExpression::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto expression, JsParenthesizedExpression::GetExpression(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto expression, JsParenthesizedExpression::GetExpression(json)); return absl::make_unique( std::move(loc), @@ -4855,8 +4855,8 @@ JsTemplateElementValue::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto cooked, JsTemplateElementValue::GetCooked(json)); - MALDOCA_ASSIGN_OR_RETURN(auto raw, JsTemplateElementValue::GetRaw(json)); + ABSL_ASSIGN_OR_RETURN(auto cooked, JsTemplateElementValue::GetCooked(json)); + ABSL_ASSIGN_OR_RETURN(auto raw, JsTemplateElementValue::GetRaw(json)); return absl::make_unique( std::move(cooked), @@ -4891,17 +4891,17 @@ JsTemplateElement::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto tail, JsTemplateElement::GetTail(json)); - MALDOCA_ASSIGN_OR_RETURN(auto value, JsTemplateElement::GetValue(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto tail, JsTemplateElement::GetTail(json)); + ABSL_ASSIGN_OR_RETURN(auto value, JsTemplateElement::GetValue(json)); return absl::make_unique( std::move(loc), @@ -4949,17 +4949,17 @@ JsTemplateLiteral::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto quasis, JsTemplateLiteral::GetQuasis(json)); - MALDOCA_ASSIGN_OR_RETURN(auto expressions, JsTemplateLiteral::GetExpressions(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto quasis, JsTemplateLiteral::GetQuasis(json)); + ABSL_ASSIGN_OR_RETURN(auto expressions, JsTemplateLiteral::GetExpressions(json)); return absl::make_unique( std::move(loc), @@ -5003,17 +5003,17 @@ JsTaggedTemplateExpression::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto tag, JsTaggedTemplateExpression::GetTag(json)); - MALDOCA_ASSIGN_OR_RETURN(auto quasi, JsTaggedTemplateExpression::GetQuasi(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto tag, JsTaggedTemplateExpression::GetTag(json)); + ABSL_ASSIGN_OR_RETURN(auto quasi, JsTaggedTemplateExpression::GetQuasi(json)); return absl::make_unique( std::move(loc), @@ -5064,16 +5064,16 @@ JsRestElement::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto argument, JsRestElement::GetArgument(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto argument, JsRestElement::GetArgument(json)); return absl::make_unique( std::move(loc), @@ -5117,16 +5117,16 @@ JsObjectPattern::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto properties_, JsObjectPattern::GetProperties(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto properties_, JsObjectPattern::GetProperties(json)); return absl::make_unique( std::move(loc), @@ -5164,16 +5164,16 @@ JsArrayPattern::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto elements, JsArrayPattern::GetElements(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto elements, JsArrayPattern::GetElements(json)); return absl::make_unique( std::move(loc), @@ -5216,17 +5216,17 @@ JsAssignmentPattern::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto left, JsAssignmentPattern::GetLeft(json)); - MALDOCA_ASSIGN_OR_RETURN(auto right, JsAssignmentPattern::GetRight(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto left, JsAssignmentPattern::GetLeft(json)); + ABSL_ASSIGN_OR_RETURN(auto right, JsAssignmentPattern::GetRight(json)); return absl::make_unique( std::move(loc), @@ -5304,24 +5304,24 @@ JsClassMethod::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto id, JsFunction::GetId(json)); - MALDOCA_ASSIGN_OR_RETURN(auto params, JsFunction::GetParams(json)); - MALDOCA_ASSIGN_OR_RETURN(auto generator, JsFunction::GetGenerator(json)); - MALDOCA_ASSIGN_OR_RETURN(auto async, JsFunction::GetAsync(json)); - MALDOCA_ASSIGN_OR_RETURN(auto body, JsBlockStatementFunction::GetBody(json)); - MALDOCA_ASSIGN_OR_RETURN(auto key, JsClassMethod::GetKey(json)); - MALDOCA_ASSIGN_OR_RETURN(auto kind, JsClassMethod::GetKind(json)); - MALDOCA_ASSIGN_OR_RETURN(auto computed, JsClassMethod::GetComputed(json)); - MALDOCA_ASSIGN_OR_RETURN(auto static_, JsClassMethod::GetStatic(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto id, JsFunction::GetId(json)); + ABSL_ASSIGN_OR_RETURN(auto params, JsFunction::GetParams(json)); + ABSL_ASSIGN_OR_RETURN(auto generator, JsFunction::GetGenerator(json)); + ABSL_ASSIGN_OR_RETURN(auto async, JsFunction::GetAsync(json)); + ABSL_ASSIGN_OR_RETURN(auto body, JsBlockStatementFunction::GetBody(json)); + ABSL_ASSIGN_OR_RETURN(auto key, JsClassMethod::GetKey(json)); + ABSL_ASSIGN_OR_RETURN(auto kind, JsClassMethod::GetKind(json)); + ABSL_ASSIGN_OR_RETURN(auto computed, JsClassMethod::GetComputed(json)); + ABSL_ASSIGN_OR_RETURN(auto static_, JsClassMethod::GetStatic(json)); return absl::make_unique( std::move(loc), @@ -5406,24 +5406,24 @@ JsClassPrivateMethod::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto id, JsFunction::GetId(json)); - MALDOCA_ASSIGN_OR_RETURN(auto params, JsFunction::GetParams(json)); - MALDOCA_ASSIGN_OR_RETURN(auto generator, JsFunction::GetGenerator(json)); - MALDOCA_ASSIGN_OR_RETURN(auto async, JsFunction::GetAsync(json)); - MALDOCA_ASSIGN_OR_RETURN(auto body, JsBlockStatementFunction::GetBody(json)); - MALDOCA_ASSIGN_OR_RETURN(auto key, JsClassPrivateMethod::GetKey(json)); - MALDOCA_ASSIGN_OR_RETURN(auto kind, JsClassPrivateMethod::GetKind(json)); - MALDOCA_ASSIGN_OR_RETURN(auto static_, JsClassPrivateMethod::GetStatic(json)); - MALDOCA_ASSIGN_OR_RETURN(auto computed, JsClassPrivateMethod::GetComputed(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto id, JsFunction::GetId(json)); + ABSL_ASSIGN_OR_RETURN(auto params, JsFunction::GetParams(json)); + ABSL_ASSIGN_OR_RETURN(auto generator, JsFunction::GetGenerator(json)); + ABSL_ASSIGN_OR_RETURN(auto async, JsFunction::GetAsync(json)); + ABSL_ASSIGN_OR_RETURN(auto body, JsBlockStatementFunction::GetBody(json)); + ABSL_ASSIGN_OR_RETURN(auto key, JsClassPrivateMethod::GetKey(json)); + ABSL_ASSIGN_OR_RETURN(auto kind, JsClassPrivateMethod::GetKind(json)); + ABSL_ASSIGN_OR_RETURN(auto static_, JsClassPrivateMethod::GetStatic(json)); + ABSL_ASSIGN_OR_RETURN(auto computed, JsClassPrivateMethod::GetComputed(json)); return absl::make_unique( std::move(loc), @@ -5508,19 +5508,19 @@ JsClassProperty::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto key, JsClassProperty::GetKey(json)); - MALDOCA_ASSIGN_OR_RETURN(auto value, JsClassProperty::GetValue(json)); - MALDOCA_ASSIGN_OR_RETURN(auto static_, JsClassProperty::GetStatic(json)); - MALDOCA_ASSIGN_OR_RETURN(auto computed, JsClassProperty::GetComputed(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto key, JsClassProperty::GetKey(json)); + ABSL_ASSIGN_OR_RETURN(auto value, JsClassProperty::GetValue(json)); + ABSL_ASSIGN_OR_RETURN(auto static_, JsClassProperty::GetStatic(json)); + ABSL_ASSIGN_OR_RETURN(auto computed, JsClassProperty::GetComputed(json)); return absl::make_unique( std::move(loc), @@ -5591,18 +5591,18 @@ JsClassPrivateProperty::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto key, JsClassPrivateProperty::GetKey(json)); - MALDOCA_ASSIGN_OR_RETURN(auto value, JsClassPrivateProperty::GetValue(json)); - MALDOCA_ASSIGN_OR_RETURN(auto static_, JsClassPrivateProperty::GetStatic(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto key, JsClassPrivateProperty::GetKey(json)); + ABSL_ASSIGN_OR_RETURN(auto value, JsClassPrivateProperty::GetValue(json)); + ABSL_ASSIGN_OR_RETURN(auto static_, JsClassPrivateProperty::GetStatic(json)); return absl::make_unique( std::move(loc), @@ -5656,16 +5656,16 @@ JsClassBody::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto body, JsClassBody::GetBody(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto body, JsClassBody::GetBody(json)); return absl::make_unique( std::move(loc), @@ -5708,7 +5708,7 @@ JsClass::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(std::string type, GetType(json)); + ABSL_ASSIGN_OR_RETURN(std::string type, GetType(json)); if (type == "ClassDeclaration") { return JsClassDeclaration::FromJson(json); @@ -5753,18 +5753,18 @@ JsClassDeclaration::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto super_class, JsClass::GetSuperClass(json)); - MALDOCA_ASSIGN_OR_RETURN(auto body, JsClass::GetBody(json)); - MALDOCA_ASSIGN_OR_RETURN(auto id, JsClassDeclaration::GetId(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto super_class, JsClass::GetSuperClass(json)); + ABSL_ASSIGN_OR_RETURN(auto body, JsClass::GetBody(json)); + ABSL_ASSIGN_OR_RETURN(auto id, JsClassDeclaration::GetId(json)); return absl::make_unique( std::move(loc), @@ -5800,18 +5800,18 @@ JsClassExpression::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto super_class, JsClass::GetSuperClass(json)); - MALDOCA_ASSIGN_OR_RETURN(auto body, JsClass::GetBody(json)); - MALDOCA_ASSIGN_OR_RETURN(auto id, JsClassExpression::GetId(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto super_class, JsClass::GetSuperClass(json)); + ABSL_ASSIGN_OR_RETURN(auto body, JsClass::GetBody(json)); + ABSL_ASSIGN_OR_RETURN(auto id, JsClassExpression::GetId(json)); return absl::make_unique( std::move(loc), @@ -5856,17 +5856,17 @@ JsMetaProperty::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto meta, JsMetaProperty::GetMeta(json)); - MALDOCA_ASSIGN_OR_RETURN(auto property, JsMetaProperty::GetProperty(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto meta, JsMetaProperty::GetMeta(json)); + ABSL_ASSIGN_OR_RETURN(auto property, JsMetaProperty::GetProperty(json)); return absl::make_unique( std::move(loc), @@ -5892,7 +5892,7 @@ JsModuleDeclaration::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(std::string type, GetType(json)); + ABSL_ASSIGN_OR_RETURN(std::string type, GetType(json)); if (type == "ImportDeclaration") { return JsImportDeclaration::FromJson(json); @@ -5916,7 +5916,7 @@ JsModuleSpecifier::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(std::string type, GetType(json)); + ABSL_ASSIGN_OR_RETURN(std::string type, GetType(json)); if (type == "ImportSpecifier") { return JsImportSpecifier::FromJson(json); @@ -5982,17 +5982,17 @@ JsImportSpecifier::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto imported, JsImportSpecifier::GetImported(json)); - MALDOCA_ASSIGN_OR_RETURN(auto local, JsImportSpecifier::GetLocal(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto imported, JsImportSpecifier::GetImported(json)); + ABSL_ASSIGN_OR_RETURN(auto local, JsImportSpecifier::GetLocal(json)); return absl::make_unique( std::move(loc), @@ -6043,16 +6043,16 @@ JsImportDefaultSpecifier::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto local, JsImportDefaultSpecifier::GetLocal(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto local, JsImportDefaultSpecifier::GetLocal(json)); return absl::make_unique( std::move(loc), @@ -6102,16 +6102,16 @@ JsImportNamespaceSpecifier::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto local, JsImportNamespaceSpecifier::GetLocal(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto local, JsImportNamespaceSpecifier::GetLocal(json)); return absl::make_unique( std::move(loc), @@ -6154,17 +6154,17 @@ JsImportAttribute::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto key, JsImportAttribute::GetKey(json)); - MALDOCA_ASSIGN_OR_RETURN(auto value, JsImportAttribute::GetValue(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto key, JsImportAttribute::GetKey(json)); + ABSL_ASSIGN_OR_RETURN(auto value, JsImportAttribute::GetValue(json)); return absl::make_unique( std::move(loc), @@ -6231,18 +6231,18 @@ JsImportDeclaration::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto specifiers, JsImportDeclaration::GetSpecifiers(json)); - MALDOCA_ASSIGN_OR_RETURN(auto source, JsImportDeclaration::GetSource(json)); - MALDOCA_ASSIGN_OR_RETURN(auto assertions, JsImportDeclaration::GetAssertions(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto specifiers, JsImportDeclaration::GetSpecifiers(json)); + ABSL_ASSIGN_OR_RETURN(auto source, JsImportDeclaration::GetSource(json)); + ABSL_ASSIGN_OR_RETURN(auto assertions, JsImportDeclaration::GetAssertions(json)); return absl::make_unique( std::move(loc), @@ -6303,17 +6303,17 @@ JsExportSpecifier::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto exported, JsExportSpecifier::GetExported(json)); - MALDOCA_ASSIGN_OR_RETURN(auto local, JsExportSpecifier::GetLocal(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto exported, JsExportSpecifier::GetExported(json)); + ABSL_ASSIGN_OR_RETURN(auto local, JsExportSpecifier::GetLocal(json)); return absl::make_unique( std::move(loc), @@ -6379,19 +6379,19 @@ JsExportNamedDeclaration::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto declaration, JsExportNamedDeclaration::GetDeclaration(json)); - MALDOCA_ASSIGN_OR_RETURN(auto specifiers, JsExportNamedDeclaration::GetSpecifiers(json)); - MALDOCA_ASSIGN_OR_RETURN(auto source, JsExportNamedDeclaration::GetSource(json)); - MALDOCA_ASSIGN_OR_RETURN(auto assertions, JsExportNamedDeclaration::GetAssertions(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto declaration, JsExportNamedDeclaration::GetDeclaration(json)); + ABSL_ASSIGN_OR_RETURN(auto specifiers, JsExportNamedDeclaration::GetSpecifiers(json)); + ABSL_ASSIGN_OR_RETURN(auto source, JsExportNamedDeclaration::GetSource(json)); + ABSL_ASSIGN_OR_RETURN(auto assertions, JsExportNamedDeclaration::GetAssertions(json)); return absl::make_unique( std::move(loc), @@ -6440,16 +6440,16 @@ JsExportDefaultDeclaration::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto declaration, JsExportDefaultDeclaration::GetDeclaration(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto declaration, JsExportDefaultDeclaration::GetDeclaration(json)); return absl::make_unique( std::move(loc), @@ -6494,17 +6494,17 @@ JsExportAllDeclaration::FromJson(const nlohmann::json& json) { return absl::InvalidArgumentError("JSON is not an object."); } - MALDOCA_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); - MALDOCA_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); - MALDOCA_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); - MALDOCA_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); - MALDOCA_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); - MALDOCA_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); - MALDOCA_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); - MALDOCA_ASSIGN_OR_RETURN(auto source, JsExportAllDeclaration::GetSource(json)); - MALDOCA_ASSIGN_OR_RETURN(auto assertions, JsExportAllDeclaration::GetAssertions(json)); + ABSL_ASSIGN_OR_RETURN(auto loc, JsNode::GetLoc(json)); + ABSL_ASSIGN_OR_RETURN(auto start, JsNode::GetStart(json)); + ABSL_ASSIGN_OR_RETURN(auto end, JsNode::GetEnd(json)); + ABSL_ASSIGN_OR_RETURN(auto leading_comment_uids, JsNode::GetLeadingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto trailing_comment_uids, JsNode::GetTrailingCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto inner_comment_uids, JsNode::GetInnerCommentUids(json)); + ABSL_ASSIGN_OR_RETURN(auto scope_uid, JsNode::GetScopeUid(json)); + ABSL_ASSIGN_OR_RETURN(auto referenced_symbol, JsNode::GetReferencedSymbol(json)); + ABSL_ASSIGN_OR_RETURN(auto defined_symbols, JsNode::GetDefinedSymbols(json)); + ABSL_ASSIGN_OR_RETURN(auto source, JsExportAllDeclaration::GetSource(json)); + ABSL_ASSIGN_OR_RETURN(auto assertions, JsExportAllDeclaration::GetAssertions(json)); return absl::make_unique( std::move(loc), diff --git a/maldoca/js/ast/ast_to_json.generated.cc b/maldoca/js/ast/ast_to_json.generated.cc index b23fc32..67a2a24 100644 --- a/maldoca/js/ast/ast_to_json.generated.cc +++ b/maldoca/js/ast/ast_to_json.generated.cc @@ -32,7 +32,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "nlohmann/json.hpp" -#include "maldoca/base/status_macros.h" namespace maldoca { diff --git a/maldoca/js/ast/ast_util.cc b/maldoca/js/ast/ast_util.cc index 71c2827..96d95af 100644 --- a/maldoca/js/ast/ast_util.cc +++ b/maldoca/js/ast/ast_util.cc @@ -24,13 +24,13 @@ #include #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/escaping.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" #include "absl/strings/string_view.h" #include "absl/time/time.h" -#include "maldoca/base/status_macros.h" #include "maldoca/js/ast/ast.generated.h" #include "maldoca/js/ast/ast_visitor.h" #include "maldoca/js/ast/ast_walker.h" @@ -42,8 +42,8 @@ namespace maldoca { absl::StatusOr GetAstStringFromSource( Babel& babel, std::string_view source, const BabelParseRequest& request, absl::Duration timeout) { - MALDOCA_ASSIGN_OR_RETURN(auto babel_parse_result, - babel.Parse(source, request, timeout)); + ABSL_ASSIGN_OR_RETURN(auto babel_parse_result, + babel.Parse(source, request, timeout)); if (!babel_parse_result.errors.errors().empty()) { std::vector error_strings; error_strings.reserve(babel_parse_result.errors.errors().size()); @@ -59,10 +59,10 @@ absl::StatusOr, BabelScopes>> GetFileAstFromSource(Babel& babel, std::string_view source, const BabelParseRequest& request, absl::Duration timeout, std::optional recursion_depth_limit_op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( BabelAstString babel_ast_string, GetAstStringFromSource(babel, source, request, timeout)); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto file_ast, GetFileAstFromAstString(babel_ast_string, recursion_depth_limit_op)); return std::tuple{std::move(file_ast), babel_ast_string.scopes()}; @@ -79,7 +79,7 @@ GetFileAstFromSource(Babel& babel, std::string_view source, absl::StatusOr> GetFileAstFromAstString( const BabelAstString& babel_ast_string, std::optional recursion_depth_limit_op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto json_ast, GetAstJsonFromAstString(babel_ast_string, recursion_depth_limit_op)); return JsFile::FromJson(json_ast); @@ -130,7 +130,7 @@ BabelAstString GetAstStringFromFileAst(const JsFile& file) { absl::StatusOr PrettyPrintSourceFromAstString( Babel& babel, const BabelAstString& babel_ast_string, absl::Duration timeout) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto result, babel.Generate(babel_ast_string, BabelGenerateOptions{}, timeout)); return result.source_code; @@ -145,7 +145,7 @@ absl::StatusOr PrettyPrintSourceFromFileAst( absl::StatusOr PrettyPrintSourceFromSourceString( Babel& babel, std::string_view source_string, const BabelParseRequest& request, absl::Duration timeout) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( BabelAstString babel_ast_string, GetAstStringFromSource(babel, source_string, request, timeout)); return PrettyPrintSourceFromAstString(babel, babel_ast_string, timeout); diff --git a/maldoca/js/ast/transforms/extract_prelude/BUILD b/maldoca/js/ast/transforms/extract_prelude/BUILD index 9ea4a65..e0f396f 100644 --- a/maldoca/js/ast/transforms/extract_prelude/BUILD +++ b/maldoca/js/ast/transforms/extract_prelude/BUILD @@ -29,7 +29,6 @@ cc_library( srcs = ["pass.cc"], hdrs = ["pass.h"], deps = [ - "//maldoca/base:status", "//maldoca/js/ast", "//maldoca/js/babel:babel_cc_proto", "//maldoca/js/driver:driver_cc_proto", @@ -39,6 +38,8 @@ cc_library( "@abseil-cpp//absl/log", "@abseil-cpp//absl/log:check", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", + "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/strings:string_view", "@abseil-cpp//absl/types:span", diff --git a/maldoca/js/ast/transforms/extract_prelude/pass.cc b/maldoca/js/ast/transforms/extract_prelude/pass.cc index 75733fe..cd23b8a 100644 --- a/maldoca/js/ast/transforms/extract_prelude/pass.cc +++ b/maldoca/js/ast/transforms/extract_prelude/pass.cc @@ -27,11 +27,11 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/strings/ascii.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "absl/types/variant.h" -#include "maldoca/base/status_macros.h" #include "maldoca/js/ast/ast.generated.h" namespace maldoca { @@ -40,10 +40,10 @@ absl::Status ForEachTopLevelNode( const JsFile& ast, absl::FunctionRef callback) { for (const auto& directive : *ast.program()->directives()) { - MALDOCA_RETURN_IF_ERROR(callback(*directive)); + ABSL_RETURN_IF_ERROR(callback(*directive)); } for (const auto& body : *ast.program()->body()) { - MALDOCA_RETURN_IF_ERROR(callback(*body)); + ABSL_RETURN_IF_ERROR(callback(*body)); } return absl::OkStatus(); } diff --git a/maldoca/js/driver/BUILD b/maldoca/js/driver/BUILD index 75175fe..e196a2f 100644 --- a/maldoca/js/driver/BUILD +++ b/maldoca/js/driver/BUILD @@ -48,7 +48,6 @@ cc_library( deps = [ ":driver_cc_proto", "//maldoca/base:ret_check", - "//maldoca/base:status", "//maldoca/js/ast", "//maldoca/js/ast:ast_util", "//maldoca/js/ast/transforms:transform", @@ -62,6 +61,7 @@ cc_library( "@abseil-cpp//absl/log", "@abseil-cpp//absl/log:check", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/strings:cord", @@ -83,13 +83,13 @@ cc_library( hdrs = ["conversion.h"], deps = [ ":driver", - "//maldoca/base:status", "//maldoca/js/ast", "//maldoca/js/ast:ast_util", "//maldoca/js/babel", "//maldoca/js/babel:babel_cc_proto", "//maldoca/js/ir", "//maldoca/js/ir/conversion:utils", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings:string_view", "@abseil-cpp//absl/time", @@ -113,13 +113,13 @@ cc_test( "//maldoca/base:filesystem", "//maldoca/base:get_runfiles_dir", "//maldoca/base:path", - "//maldoca/base:status", "//maldoca/base/testing:protocol-buffer-matchers", "//maldoca/base/testing:status_matchers", "//maldoca/js/ast", "//maldoca/js/babel:babel_cc_proto", "//maldoca/js/ir/conversion:utils", "//maldoca/js/quickjs_babel", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings:string_view", "@abseil-cpp//absl/time", diff --git a/maldoca/js/driver/conversion.cc b/maldoca/js/driver/conversion.cc index 66dbab1..26ebcd4 100644 --- a/maldoca/js/driver/conversion.cc +++ b/maldoca/js/driver/conversion.cc @@ -20,10 +20,10 @@ #include "mlir/IR/MLIRContext.h" #include "mlir/IR/OwningOpRef.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/time/time.h" -#include "maldoca/base/status_macros.h" #include "maldoca/js/ast/ast.generated.h" #include "maldoca/js/ast/ast_util.h" #include "maldoca/js/babel/babel.h" @@ -44,7 +44,7 @@ namespace maldoca { absl::StatusOr ToJsAstStringRepr::FromJsSourceRepr( const JsSourceRepr &source_repr, BabelParseRequest parse_request, absl::Duration timeout, Babel &babel) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( BabelParseResult parse_result, babel.Parse(source_repr.source, parse_request, timeout)); return JsAstStringRepr{std::move(parse_result.ast_string), @@ -58,9 +58,9 @@ absl::StatusOr ToJsAstStringRepr::FromJsSourceRepr( absl::StatusOr ToJsAstRepr::FromJsAstStringRepr( const JsAstStringRepr &ast_string_repr, std::optional recursion_depth_limit) { - MALDOCA_ASSIGN_OR_RETURN(std::unique_ptr ast, - GetFileAstFromAstString(ast_string_repr.ast_string, - recursion_depth_limit)); + ABSL_ASSIGN_OR_RETURN(std::unique_ptr ast, + GetFileAstFromAstString(ast_string_repr.ast_string, + recursion_depth_limit)); return JsAstRepr{std::move(ast), ast_string_repr.ast_string.scopes(), ast_string_repr.source_map}; } @@ -72,8 +72,8 @@ absl::StatusOr ToJsAstRepr::FromJsAstStringRepr( absl::StatusOr ToJsHirRepr::FromJsAstRepr( const JsAstRepr &ast_repr, mlir::MLIRContext &mlir_context) { - MALDOCA_ASSIGN_OR_RETURN(mlir::OwningOpRef op, - AstToJshirFile(*ast_repr.ast, mlir_context)); + ABSL_ASSIGN_OR_RETURN(mlir::OwningOpRef op, + AstToJshirFile(*ast_repr.ast, mlir_context)); return JsHirRepr{std::move(op), ast_repr.scopes, ast_repr.source_map}; } @@ -85,7 +85,7 @@ absl::StatusOr ToJsAstRepr::FromJsSourceRepr( const JsSourceRepr &source_repr, BabelParseRequest parse_request, absl::Duration timeout, std::optional recursion_depth_limit, Babel &babel) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( JsAstStringRepr ast_string, ToJsAstStringRepr::FromJsSourceRepr(source_repr, parse_request, timeout, babel)); @@ -100,7 +100,7 @@ absl::StatusOr ToJsHirRepr::FromJsSourceRepr( const JsSourceRepr &source_repr, BabelParseRequest parse_request, absl::Duration timeout, std::optional recursion_depth_limit, Babel &babel, mlir::MLIRContext &mlir_context) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( JsAstRepr ast, ToJsAstRepr::FromJsSourceRepr(source_repr, parse_request, timeout, recursion_depth_limit, babel)); @@ -115,7 +115,7 @@ absl::StatusOr ToJsHirRepr::FromJsAstStringRepr( const JsAstStringRepr &ast_string_repr, std::optional recursion_depth_limit, mlir::MLIRContext &mlir_context) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( JsAstRepr ast, ToJsAstRepr::FromJsAstStringRepr(ast_string_repr, recursion_depth_limit)); return ToJsHirRepr::FromJsAstRepr(ast, mlir_context); @@ -131,8 +131,8 @@ absl::StatusOr ToJsHirRepr::FromJsAstStringRepr( absl::StatusOr ToJsAstRepr::FromJsHirRepr( const JsHirRepr &hir_repr) { - MALDOCA_ASSIGN_OR_RETURN(std::unique_ptr ast, - JshirFileToAst(hir_repr.op.get())); + ABSL_ASSIGN_OR_RETURN(std::unique_ptr ast, + JshirFileToAst(hir_repr.op.get())); return JsAstRepr{std::move(ast), hir_repr.scopes, hir_repr.source_map}; } @@ -155,7 +155,7 @@ absl::StatusOr ToJsSourceRepr::FromJsAstStringRepr( const JsAstStringRepr &ast_string_repr, BabelGenerateOptions generate_options, absl::Duration timeout, Babel &babel) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( BabelGenerateResult generate_result, babel.Generate(ast_string_repr.ast_string, generate_options, timeout)); return JsSourceRepr{std::move(generate_result.source_code), @@ -168,7 +168,7 @@ absl::StatusOr ToJsSourceRepr::FromJsAstStringRepr( absl::StatusOr ToJsAstStringRepr::FromJsHirRepr( const JsHirRepr &hir_repr) { - MALDOCA_ASSIGN_OR_RETURN(JsAstRepr ast, ToJsAstRepr::FromJsHirRepr(hir_repr)); + ABSL_ASSIGN_OR_RETURN(JsAstRepr ast, ToJsAstRepr::FromJsHirRepr(hir_repr)); return ToJsAstStringRepr::FromJsAstRepr(ast); } @@ -179,8 +179,8 @@ absl::StatusOr ToJsAstStringRepr::FromJsHirRepr( absl::StatusOr ToJsSourceRepr::FromJsHirRepr( const JsHirRepr &hir_repr, BabelGenerateOptions generate_options, absl::Duration timeout, Babel &babel) { - MALDOCA_ASSIGN_OR_RETURN(JsAstStringRepr ast_string, - ToJsAstStringRepr::FromJsHirRepr(hir_repr)); + ABSL_ASSIGN_OR_RETURN(JsAstStringRepr ast_string, + ToJsAstStringRepr::FromJsHirRepr(hir_repr)); return ToJsSourceRepr::FromJsAstStringRepr(ast_string, generate_options, timeout, babel); } @@ -192,8 +192,8 @@ absl::StatusOr ToJsSourceRepr::FromJsHirRepr( absl::StatusOr ToJsSourceRepr::FromJsAstRepr( const JsAstRepr &ast_repr, BabelGenerateOptions generate_options, absl::Duration timeout, Babel &babel) { - MALDOCA_ASSIGN_OR_RETURN(JsAstStringRepr ast_string, - ToJsAstStringRepr::FromJsAstRepr(ast_repr)); + ABSL_ASSIGN_OR_RETURN(JsAstStringRepr ast_string, + ToJsAstStringRepr::FromJsAstRepr(ast_repr)); return ToJsSourceRepr::FromJsAstStringRepr(ast_string, generate_options, timeout, babel); } diff --git a/maldoca/js/driver/conversion_test.cc b/maldoca/js/driver/conversion_test.cc index b18584b..ff303a7 100644 --- a/maldoca/js/driver/conversion_test.cc +++ b/maldoca/js/driver/conversion_test.cc @@ -25,6 +25,7 @@ #include "mlir/Support/DebugStringHelper.h" #include "gmock/gmock.h" #include "gtest/gtest.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/time/time.h" @@ -32,7 +33,6 @@ #include "maldoca/base/filesystem.h" #include "maldoca/base/get_runfiles_dir.h" #include "maldoca/base/path.h" -#include "maldoca/base/status_macros.h" #include "maldoca/base/testing/status_matchers.h" #include "maldoca/js/ast/ast.generated.h" #include "maldoca/js/babel/babel.pb.h" @@ -92,15 +92,15 @@ absl::StatusOr GetTestCase() { return GetFileContents(JoinPath(dir, file_name)); }; - MALDOCA_ASSIGN_OR_RETURN(std::string source, - load_content("test_source.js.test")); + ABSL_ASSIGN_OR_RETURN(std::string source, + load_content("test_source.js.test")); - MALDOCA_ASSIGN_OR_RETURN(std::string parsed_ast_json_str, - load_content("test_parsed_ast.json")); + ABSL_ASSIGN_OR_RETURN(std::string parsed_ast_json_str, + load_content("test_parsed_ast.json")); auto parsed_ast_json = nlohmann::ordered_json::parse(parsed_ast_json_str); BabelScopes scopes; - MALDOCA_RETURN_IF_ERROR(ParseTextProtoFile( + ABSL_RETURN_IF_ERROR(ParseTextProtoFile( GetDataDependencyFilepath("maldoca/js/driver/test_babel_scopes.txtpb"), &scopes)); @@ -109,21 +109,20 @@ absl::StatusOr GetTestCase() { babel_ast_string.set_string_literals_base64_encoded(false); *babel_ast_string.mutable_scopes() = scopes; - MALDOCA_ASSIGN_OR_RETURN(std::string serialized_ast_json_str, - load_content("test_serialized_ast.json")); + ABSL_ASSIGN_OR_RETURN(std::string serialized_ast_json_str, + load_content("test_serialized_ast.json")); auto serialized_ast_json = nlohmann::ordered_json::parse(serialized_ast_json_str); - MALDOCA_ASSIGN_OR_RETURN(auto ast, JsFile::FromJson(serialized_ast_json)); + ABSL_ASSIGN_OR_RETURN(auto ast, JsFile::FromJson(serialized_ast_json)); JsAstRepr ast_repr{std::move(ast), scopes, std::nullopt}; auto mlir_context = std::make_unique(); LoadNecessaryDialects(*mlir_context); - MALDOCA_ASSIGN_OR_RETURN( - JsHirRepr hir_repr, - ToJsHirRepr::FromJsAstRepr(ast_repr, *mlir_context)); - MALDOCA_ASSIGN_OR_RETURN(auto hir_str, load_content("test_hir.mlir.test")); + ABSL_ASSIGN_OR_RETURN(JsHirRepr hir_repr, + ToJsHirRepr::FromJsAstRepr(ast_repr, *mlir_context)); + ABSL_ASSIGN_OR_RETURN(auto hir_str, load_content("test_hir.mlir.test")); BabelAstString lifted_babel_ast_string; lifted_babel_ast_string.set_value(CompactJsonString(serialized_ast_json_str)); diff --git a/maldoca/js/driver/driver.cc b/maldoca/js/driver/driver.cc index c310017..42e92cf 100644 --- a/maldoca/js/driver/driver.cc +++ b/maldoca/js/driver/driver.cc @@ -30,7 +30,8 @@ #include "absl/strings/string_view.h" #include "absl/time/time.h" #include "absl/types/span.h" -#include "maldoca/base/status_macros.h" +#include "absl/status/status_macros.h" +#include "absl/status/statusor.h" #include "maldoca/js/babel/babel.h" #include "maldoca/js/driver/internal/conversions.h" #include "maldoca/js/ir/conversion/utils.h" @@ -159,8 +160,8 @@ absl::Status RunPasses(const JsPassConfigs &pass_configs, std::vector> passes; for (const JsPassConfig &pass_config : pass_configs.passes()) { - MALDOCA_ASSIGN_OR_RETURN(std::unique_ptr pass, - JsPass::Create(pass_config, babel, mlir_context)); + ABSL_ASSIGN_OR_RETURN(std::unique_ptr pass, + JsPass::Create(pass_config, babel, mlir_context)); passes.push_back(std::move(pass)); } @@ -189,8 +190,8 @@ absl::StatusOr UnsandboxedJsPassRunner::Run( DLOG(ERROR) << "In UnsandboxedJsPassRunner, timeout must be infinite. The " "provided timeout is ignored."; } - MALDOCA_ASSIGN_OR_RETURN(std::unique_ptr input_repr, - JsRepr::FromProto(input_repr_pb)); + ABSL_ASSIGN_OR_RETURN(std::unique_ptr input_repr, + JsRepr::FromProto(input_repr_pb)); JsPassContext context{ .original_source = std::string(original_source), @@ -202,9 +203,9 @@ absl::StatusOr UnsandboxedJsPassRunner::Run( mlir::MLIRContext mlir_context; LoadNecessaryDialects(mlir_context); - MALDOCA_RETURN_IF_ERROR(RunPasses(passes, context, babel_, &mlir_context)); + ABSL_RETURN_IF_ERROR(RunPasses(passes, context, babel_, &mlir_context)); - MALDOCA_ASSIGN_OR_RETURN(JsReprPb output_repr_pb, context.repr->ToProto()); + ABSL_ASSIGN_OR_RETURN(JsReprPb output_repr_pb, context.repr->ToProto()); return JsPassRunner::Result{ .output_repr_pb = std::move(output_repr_pb), diff --git a/maldoca/js/driver/driver.h b/maldoca/js/driver/driver.h index dcb5ea5..c405a1c 100644 --- a/maldoca/js/driver/driver.h +++ b/maldoca/js/driver/driver.h @@ -31,6 +31,7 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" @@ -39,7 +40,6 @@ #include "absl/types/span.h" #include "nlohmann/json.hpp" #include "maldoca/base/ret_check.h" -#include "maldoca/base/status_macros.h" #include "maldoca/js/ast/ast.generated.h" #include "maldoca/js/ast/transforms/transform.h" #include "maldoca/js/babel/babel.h" @@ -316,8 +316,7 @@ class JsAnalysisTmpl : public JsAnalysis { absl::Status Analyze(std::optional original_source, const JsRepr& repr, JsAnalysisOutputs& outputs) override { - MALDOCA_ASSIGN_OR_RETURN(const ReprT* repr_cast, - JsRepr::Cast(&repr)); + ABSL_ASSIGN_OR_RETURN(const ReprT* repr_cast, JsRepr::Cast(&repr)); return Analyze(original_source, *repr_cast, outputs); } }; @@ -338,9 +337,9 @@ class JsirAnalysis : public JsAnalysisTmpl { if (original_source_u8.has_value()) { original_source_u16 = Utf8ToUtf16(*original_source_u8); } - MALDOCA_ASSIGN_OR_RETURN(JsirAnalysisResult result, - RunJsirAnalysis(*repr.op, original_source_u16, - repr.scopes, config_, babel_)); + ABSL_ASSIGN_OR_RETURN(JsirAnalysisResult result, + RunJsirAnalysis(*repr.op, original_source_u16, + repr.scopes, config_, babel_)); *outputs.add_outputs()->mutable_jsir_analysis() = std::move(result); return absl::OkStatus(); } @@ -379,7 +378,7 @@ class JsTransformTmpl : public JsTransform { protected: absl::Status Transform(std::optional original_source, JsRepr& repr, JsAnalysisOutputs& outputs) override { - MALDOCA_ASSIGN_OR_RETURN(ReprT * repr_cast, JsRepr::Cast(&repr)); + ABSL_ASSIGN_OR_RETURN(ReprT * repr_cast, JsRepr::Cast(&repr)); return Transform(original_source, *repr_cast, outputs); } }; @@ -396,9 +395,8 @@ class JsAstTransform : public JsTransformTmpl { absl::Status Transform(std::optional original_source, JsAstRepr& repr, JsAnalysisOutputs& outputs) override { std::optional optional_analysis_result; - MALDOCA_RETURN_IF_ERROR(TransformJsAst(original_source, repr.scopes, - config_, *repr.ast, - optional_analysis_result)); + ABSL_RETURN_IF_ERROR(TransformJsAst(original_source, repr.scopes, config_, + *repr.ast, optional_analysis_result)); if (optional_analysis_result.has_value()) { *outputs.add_outputs()->mutable_ast_analysis() = std::move(*optional_analysis_result); diff --git a/maldoca/js/driver/internal/conversions.cc b/maldoca/js/driver/internal/conversions.cc index dd18bb5..e40b0dd 100644 --- a/maldoca/js/driver/internal/conversions.cc +++ b/maldoca/js/driver/internal/conversions.cc @@ -23,10 +23,10 @@ #include "mlir/IR/OwningOpRef.h" #include "absl/base/nullability.h" #include "absl/log/log.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/time/time.h" #include "maldoca/base/ret_check.h" -#include "maldoca/base/status_macros.h" #include "maldoca/js/ast/ast_util.h" #include "maldoca/js/babel/babel.h" #include "maldoca/js/driver/driver.h" @@ -89,8 +89,8 @@ absl::StatusOr> JsConversion::Create( absl::StatusOr> JsSourceToAstString::Convert( const JsSourceRepr &from) { - MALDOCA_ASSIGN_OR_RETURN(auto parse_result, - babel_.Parse(from.source, request_, timeout_)); + ABSL_ASSIGN_OR_RETURN(auto parse_result, + babel_.Parse(from.source, request_, timeout_)); return std::make_unique(std::move(parse_result.ast_string), from.source_map); } @@ -112,7 +112,7 @@ JsSourceToAstString::Create(const JsSourceToAstStringConfig &config, absl::StatusOr> JsAstStringToSource::Convert( const JsAstStringRepr &from) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto generate_result, babel_.Generate(from.ast_string, options_, timeout_)); return std::make_unique( @@ -137,7 +137,7 @@ JsAstStringToSource::Create(const JsAstStringToSourceConfig &config, absl::StatusOr> JsAstStringToAst::Convert( const JsAstStringRepr &from) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto ast, GetFileAstFromAstString(from.ast_string, recursion_depth_limit_)); return std::make_unique(std::move(ast), from.ast_string.scopes(), @@ -170,7 +170,7 @@ absl::StatusOr> JsAstToAstString::Convert( absl::StatusOr> JsAstToHir::Convert( const JsAstRepr &from) { - MALDOCA_ASSIGN_OR_RETURN(auto op, AstToJshirFile(*from.ast, mlir_context_)); + ABSL_ASSIGN_OR_RETURN(auto op, AstToJshirFile(*from.ast, mlir_context_)); return std::make_unique(std::move(op), from.scopes, from.source_map); } @@ -181,7 +181,7 @@ absl::StatusOr> JsAstToHir::Convert( absl::StatusOr> JsHirToAst::Convert( const JsHirRepr &from) { - MALDOCA_ASSIGN_OR_RETURN(auto ast, JshirFileToAst(*from.op)); + ABSL_ASSIGN_OR_RETURN(auto ast, JshirFileToAst(*from.op)); return std::make_unique(std::move(ast), from.scopes, from.source_map); } diff --git a/maldoca/js/driver/internal/conversions.h b/maldoca/js/driver/internal/conversions.h index 08da29a..bfb0420 100644 --- a/maldoca/js/driver/internal/conversions.h +++ b/maldoca/js/driver/internal/conversions.h @@ -25,9 +25,9 @@ #include "absl/base/nullability.h" #include "absl/log/check.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/time/time.h" -#include "maldoca/base/status_macros.h" #include "maldoca/js/babel/babel.h" #include "maldoca/js/driver/driver.h" #include "maldoca/js/driver/driver.pb.h" @@ -61,8 +61,8 @@ class JsConversionTmpl : public JsConversion { protected: absl::Status Convert(std::unique_ptr &repr) override { - MALDOCA_ASSIGN_OR_RETURN(auto *from, JsRepr::Cast(repr.get())); - MALDOCA_ASSIGN_OR_RETURN(repr, Convert(*from)); + ABSL_ASSIGN_OR_RETURN(auto *from, JsRepr::Cast(repr.get())); + ABSL_ASSIGN_OR_RETURN(repr, Convert(*from)); return absl::OkStatus(); } }; diff --git a/maldoca/js/ir/BUILD b/maldoca/js/ir/BUILD index 3f466fd..7bb1195 100644 --- a/maldoca/js/ir/BUILD +++ b/maldoca/js/ir/BUILD @@ -316,9 +316,9 @@ cc_library( deps = [ ":cast", ":ir", - "//maldoca/base:status", "@abseil-cpp//absl/log", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@llvm-project//llvm:Support", "@llvm-project//mlir:IR", diff --git a/maldoca/js/ir/analyses/BUILD b/maldoca/js/ir/analyses/BUILD index f783fa9..55583e3 100644 --- a/maldoca/js/ir/analyses/BUILD +++ b/maldoca/js/ir/analyses/BUILD @@ -31,7 +31,6 @@ cc_library( deps = [ ":dataflow_analysis", "//maldoca/base:ret_check", - "//maldoca/base:status", "//maldoca/js/ast", "//maldoca/js/babel", "//maldoca/js/babel:babel_cc_proto", @@ -42,6 +41,7 @@ cc_library( "@abseil-cpp//absl/base:nullability", "@abseil-cpp//absl/container:flat_hash_map", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings:string_view", "@llvm-project//llvm:Support", diff --git a/maldoca/js/ir/analyses/analysis.cc b/maldoca/js/ir/analyses/analysis.cc index d823ebe..0f8bd24 100644 --- a/maldoca/js/ir/analyses/analysis.cc +++ b/maldoca/js/ir/analyses/analysis.cc @@ -29,10 +29,10 @@ #include "absl/base/nullability.h" #include "absl/container/flat_hash_map.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "maldoca/base/ret_check.h" -#include "maldoca/base/status_macros.h" #include "maldoca/js/ast/ast.generated.h" #include "maldoca/js/babel/babel.h" #include "maldoca/js/babel/babel.pb.h" @@ -71,7 +71,7 @@ absl::StatusOr RunJsirAnalysis( } case JsirAnalysisConfig::kConstantPropagation: { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( JsirAnalysisResult::DataFlow detailed_result, RunJsirDataFlowAnalysis(op, &scopes)); diff --git a/maldoca/js/ir/analyses/dynamic_constant_propagation/BUILD b/maldoca/js/ir/analyses/dynamic_constant_propagation/BUILD index 19c8f6f..63b89f9 100644 --- a/maldoca/js/ir/analyses/dynamic_constant_propagation/BUILD +++ b/maldoca/js/ir/analyses/dynamic_constant_propagation/BUILD @@ -104,7 +104,6 @@ cc_library( srcs = ["dynamic_prelude.cc"], hdrs = ["dynamic_prelude.h"], deps = [ - "//maldoca/base:status", "//maldoca/js/ast", "//maldoca/js/babel", "//maldoca/js/driver:driver_cc_proto", @@ -112,6 +111,7 @@ cc_library( "@abseil-cpp//absl/cleanup", "@abseil-cpp//absl/container:flat_hash_set", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings:string_view", "@abseil-cpp//absl/time", diff --git a/maldoca/js/ir/analyses/dynamic_constant_propagation/dynamic_prelude.cc b/maldoca/js/ir/analyses/dynamic_constant_propagation/dynamic_prelude.cc index b5de0cb..a6b776a 100644 --- a/maldoca/js/ir/analyses/dynamic_constant_propagation/dynamic_prelude.cc +++ b/maldoca/js/ir/analyses/dynamic_constant_propagation/dynamic_prelude.cc @@ -23,10 +23,10 @@ #include "absl/cleanup/cleanup.h" #include "absl/container/flat_hash_set.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/time/time.h" -#include "maldoca/base/status_macros.h" #include "maldoca/js/ast/ast.generated.h" #include "maldoca/js/babel/babel.h" #include "maldoca/js/quickjs/quickjs.h" @@ -42,14 +42,14 @@ absl::StatusOr DynamicPrelude::Create( std::unique_ptr qjs_context{ JS_NewContext(qjs_runtime.get())}; - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( BabelParseResult parse_result, babel.Parse(config.prelude_source(), BabelParseRequest{}, absl::InfiniteDuration())); BabelGenerateOptions generate_options; generate_options.set_compact(true); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( BabelGenerateResult generate_result, babel.Generate(parse_result.ast_string, generate_options, absl::InfiniteDuration())); diff --git a/maldoca/js/ir/conversion/BUILD b/maldoca/js/ir/conversion/BUILD index a8cce85..2916c03 100644 --- a/maldoca/js/ir/conversion/BUILD +++ b/maldoca/js/ir/conversion/BUILD @@ -62,7 +62,6 @@ cc_library( ], deps = [ "//maldoca/astgen:ir_to_ast_util", - "//maldoca/base:status", "//maldoca/js/ast", "//maldoca/js/ir", "//maldoca/js/ir:cast", @@ -72,6 +71,7 @@ cc_library( "@abseil-cpp//absl/log:check", "@abseil-cpp//absl/memory", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/types:optional", diff --git a/maldoca/js/ir/conversion/jsir_to_ast.generated.cc b/maldoca/js/ir/conversion/jsir_to_ast.generated.cc index 4e826c6..f59b2ce 100644 --- a/maldoca/js/ir/conversion/jsir_to_ast.generated.cc +++ b/maldoca/js/ir/conversion/jsir_to_ast.generated.cc @@ -44,12 +44,12 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/types/optional.h" #include "absl/types/variant.h" #include "maldoca/astgen/ir_to_ast_util.h" -#include "maldoca/base/status_macros.h" #include "maldoca/js/ast/ast.generated.h" #include "maldoca/js/ir/ir.h" @@ -141,14 +141,14 @@ JsirToAst::VisitProgramBodyElement(JsirProgramBodyElementOpInterface op) { absl::StatusOr> JsirToAst::VisitDirectiveLiteral(JsirDirectiveLiteralOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto value, Convert( op.getValueAttr(), ToString() ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto extra, Convert( op.getExtraAttr(), @@ -165,7 +165,7 @@ JsirToAst::VisitDirectiveLiteral(JsirDirectiveLiteralOp op) { absl::StatusOr> JsirToAst::VisitDirective(JsirDirectiveOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto value, Convert( op.getValue(), @@ -179,7 +179,7 @@ JsirToAst::VisitDirective(JsirDirectiveOp op) { absl::StatusOr> JsirToAst::VisitProgram(JsirProgramOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto interpreter, Convert( op.getInterpreterAttr(), @@ -188,14 +188,14 @@ JsirToAst::VisitProgram(JsirProgramOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto source_type, Convert( op.getSourceTypeAttr(), ToString() ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto body, Convert( op.getBody(), @@ -206,7 +206,7 @@ JsirToAst::VisitProgram(JsirProgramOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto directives, Convert( op.getDirectives(), @@ -227,7 +227,7 @@ JsirToAst::VisitProgram(JsirProgramOp op) { absl::StatusOr> JsirToAst::VisitFile(JsirFileOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto program, Convert( op.getProgram(), @@ -236,7 +236,7 @@ JsirToAst::VisitFile(JsirFileOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto comments, Convert( op.getCommentsAttr(), @@ -417,7 +417,7 @@ JsirToAst::VisitLValRef(JsirLValRefOpInterface op) { absl::StatusOr> JsirToAst::VisitIdentifier(JsirIdentifierOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto name, Convert( op.getNameAttr(), @@ -431,7 +431,7 @@ JsirToAst::VisitIdentifier(JsirIdentifierOp op) { absl::StatusOr> JsirToAst::VisitIdentifierRef(JsirIdentifierRefOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto name, Convert( op.getNameAttr(), @@ -445,7 +445,7 @@ JsirToAst::VisitIdentifierRef(JsirIdentifierRefOp op) { absl::StatusOr> JsirToAst::VisitPrivateName(JsirPrivateNameOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto id, Convert( op.getIdAttr(), @@ -486,21 +486,21 @@ JsirToAst::VisitLiteral(JsirLiteralOpInterface op) { absl::StatusOr> JsirToAst::VisitRegExpLiteral(JsirRegExpLiteralOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto pattern, Convert( op.getPatternAttr(), ToString() ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto flags, Convert( op.getFlagsAttr(), ToString() ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto extra, Convert( op.getExtraAttr(), @@ -524,14 +524,14 @@ JsirToAst::VisitNullLiteral(JsirNullLiteralOp op) { absl::StatusOr> JsirToAst::VisitStringLiteral(JsirStringLiteralOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto value, Convert( op.getValueAttr(), ToString() ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto extra, Convert( op.getExtraAttr(), @@ -548,7 +548,7 @@ JsirToAst::VisitStringLiteral(JsirStringLiteralOp op) { absl::StatusOr> JsirToAst::VisitBooleanLiteral(JsirBooleanLiteralOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto value, Convert( op.getValueAttr(), @@ -562,14 +562,14 @@ JsirToAst::VisitBooleanLiteral(JsirBooleanLiteralOp op) { absl::StatusOr> JsirToAst::VisitNumericLiteral(JsirNumericLiteralOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto value, Convert( op.getValueAttr(), ToDouble() ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto extra, Convert( op.getExtraAttr(), @@ -586,14 +586,14 @@ JsirToAst::VisitNumericLiteral(JsirNumericLiteralOp op) { absl::StatusOr> JsirToAst::VisitBigIntLiteral(JsirBigIntLiteralOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto value, Convert( op.getValueAttr(), ToString() ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto extra, Convert( op.getExtraAttr(), @@ -682,7 +682,7 @@ JsirToAst::VisitStatement(JsirStatementOpInterface op) { absl::StatusOr> JsirToAst::VisitBlockStatement(JshirBlockStatementOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto body, Convert( op.getBody(), @@ -693,7 +693,7 @@ JsirToAst::VisitBlockStatement(JshirBlockStatementOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto directives, Convert( op.getDirectives(), @@ -712,7 +712,7 @@ JsirToAst::VisitBlockStatement(JshirBlockStatementOp op) { absl::StatusOr> JsirToAst::VisitExpressionStatement(JsirExpressionStatementOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto expression, Convert( op.getExpression(), @@ -738,14 +738,14 @@ JsirToAst::VisitDebuggerStatement(JsirDebuggerStatementOp op) { absl::StatusOr> JsirToAst::VisitWithStatement(JshirWithStatementOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto object, Convert( op.getObject(), ToOpConverter(VisitExpression) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto body, Convert( op.getBody(), @@ -762,7 +762,7 @@ JsirToAst::VisitWithStatement(JshirWithStatementOp op) { absl::StatusOr> JsirToAst::VisitReturnStatement(JsirReturnStatementOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto argument, Convert( op.getArgument(), @@ -778,14 +778,14 @@ JsirToAst::VisitReturnStatement(JsirReturnStatementOp op) { absl::StatusOr> JsirToAst::VisitLabeledStatement(JshirLabeledStatementOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto label, Convert( op.getLabelAttr(), ToAttrConverter(VisitIdentifierAttr) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto body, Convert( op.getBody(), @@ -802,14 +802,14 @@ JsirToAst::VisitLabeledStatement(JshirLabeledStatementOp op) { absl::StatusOr> JsirToAst::VisitIfStatement(JshirIfStatementOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto test, Convert( op.getTest(), ToOpConverter(VisitExpression) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto consequent, Convert( op.getConsequent(), @@ -818,7 +818,7 @@ JsirToAst::VisitIfStatement(JshirIfStatementOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto alternate, Convert( op.getAlternate(), @@ -838,7 +838,7 @@ JsirToAst::VisitIfStatement(JshirIfStatementOp op) { absl::StatusOr> JsirToAst::VisitSwitchCase(JshirSwitchCaseOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto test, Convert( op.getTest(), @@ -849,7 +849,7 @@ JsirToAst::VisitSwitchCase(JshirSwitchCaseOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto consequent, Convert( op.getConsequent(), @@ -868,14 +868,14 @@ JsirToAst::VisitSwitchCase(JshirSwitchCaseOp op) { absl::StatusOr> JsirToAst::VisitSwitchStatement(JshirSwitchStatementOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto discriminant, Convert( op.getDiscriminant(), ToOpConverter(VisitExpression) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto cases, Convert( op.getCases(), @@ -894,7 +894,7 @@ JsirToAst::VisitSwitchStatement(JshirSwitchStatementOp op) { absl::StatusOr> JsirToAst::VisitThrowStatement(JsirThrowStatementOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto argument, Convert( op.getArgument(), @@ -908,7 +908,7 @@ JsirToAst::VisitThrowStatement(JsirThrowStatementOp op) { absl::StatusOr> JsirToAst::VisitCatchClause(JshirCatchClauseOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto param, Convert( op.getParam(), @@ -917,7 +917,7 @@ JsirToAst::VisitCatchClause(JshirCatchClauseOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto body, Convert( op.getBody(), @@ -934,7 +934,7 @@ JsirToAst::VisitCatchClause(JshirCatchClauseOp op) { absl::StatusOr> JsirToAst::VisitTryStatement(JshirTryStatementOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto block, Convert( op.getBlock(), @@ -943,7 +943,7 @@ JsirToAst::VisitTryStatement(JshirTryStatementOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto handler, Convert( op.getHandler(), @@ -954,7 +954,7 @@ JsirToAst::VisitTryStatement(JshirTryStatementOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto finalizer, Convert( op.getFinalizer(), @@ -974,7 +974,7 @@ JsirToAst::VisitTryStatement(JshirTryStatementOp op) { absl::StatusOr> JsirToAst::VisitWhileStatement(JshirWhileStatementOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto test, Convert( op.getTest(), @@ -983,7 +983,7 @@ JsirToAst::VisitWhileStatement(JshirWhileStatementOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto body, Convert( op.getBody(), @@ -1000,7 +1000,7 @@ JsirToAst::VisitWhileStatement(JshirWhileStatementOp op) { absl::StatusOr> JsirToAst::VisitDoWhileStatement(JshirDoWhileStatementOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto body, Convert( op.getBody(), @@ -1009,7 +1009,7 @@ JsirToAst::VisitDoWhileStatement(JshirDoWhileStatementOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto test, Convert( op.getTest(), @@ -1044,14 +1044,14 @@ JsirToAst::VisitDeclaration(JsirDeclarationOpInterface op) { absl::StatusOr> JsirToAst::VisitVariableDeclarator(JsirVariableDeclaratorOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto id, Convert( op.getId(), ToOpConverter(VisitLValRef) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto init, Convert( op.getInit(), @@ -1068,7 +1068,7 @@ JsirToAst::VisitVariableDeclarator(JsirVariableDeclaratorOp op) { absl::StatusOr> JsirToAst::VisitVariableDeclaration(JsirVariableDeclarationOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto declarations, Convert( op.getDeclarations(), @@ -1079,7 +1079,7 @@ JsirToAst::VisitVariableDeclaration(JsirVariableDeclarationOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto kind, Convert( op.getKindAttr(), @@ -1094,7 +1094,7 @@ JsirToAst::VisitVariableDeclaration(JsirVariableDeclarationOp op) { absl::StatusOr> JsirToAst::VisitFunctionDeclaration(JsirFunctionDeclarationOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto id, Convert( op.getIdAttr(), @@ -1103,7 +1103,7 @@ JsirToAst::VisitFunctionDeclaration(JsirFunctionDeclarationOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto params, Convert( op.getParams(), @@ -1114,21 +1114,21 @@ JsirToAst::VisitFunctionDeclaration(JsirFunctionDeclarationOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto generator, Convert( op.getGeneratorAttr(), ToBool() ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto async, Convert( op.getAsyncAttr(), ToBool() ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto body, Convert( op.getBody(), @@ -1166,7 +1166,7 @@ JsirToAst::VisitThisExpression(JsirThisExpressionOp op) { absl::StatusOr> JsirToAst::VisitYieldExpression(JsirYieldExpressionOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto argument, Convert( op.getArgument(), @@ -1175,7 +1175,7 @@ JsirToAst::VisitYieldExpression(JsirYieldExpressionOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto delegate, Convert( op.getDelegateAttr(), @@ -1190,7 +1190,7 @@ JsirToAst::VisitYieldExpression(JsirYieldExpressionOp op) { absl::StatusOr> JsirToAst::VisitAwaitExpression(JsirAwaitExpressionOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto argument, Convert( op.getArgument(), @@ -1206,7 +1206,7 @@ JsirToAst::VisitAwaitExpression(JsirAwaitExpressionOp op) { absl::StatusOr> JsirToAst::VisitSpreadElement(JsirSpreadElementOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto argument, Convert( op.getArgument(), @@ -1220,7 +1220,7 @@ JsirToAst::VisitSpreadElement(JsirSpreadElementOp op) { absl::StatusOr> JsirToAst::VisitArrayExpression(JsirArrayExpressionOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto elements, Convert( op.getElements(), @@ -1241,7 +1241,7 @@ JsirToAst::VisitArrayExpression(JsirArrayExpressionOp op) { absl::StatusOr> JsirToAst::VisitFunctionExpression(JsirFunctionExpressionOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto id, Convert( op.getIdAttr(), @@ -1250,7 +1250,7 @@ JsirToAst::VisitFunctionExpression(JsirFunctionExpressionOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto params, Convert( op.getParams(), @@ -1261,21 +1261,21 @@ JsirToAst::VisitFunctionExpression(JsirFunctionExpressionOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto generator, Convert( op.getGeneratorAttr(), ToBool() ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto async, Convert( op.getAsyncAttr(), ToBool() ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto body, Convert( op.getBody(), @@ -1295,21 +1295,21 @@ JsirToAst::VisitFunctionExpression(JsirFunctionExpressionOp op) { absl::StatusOr> JsirToAst::VisitUnaryExpression(JsirUnaryExpressionOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto operator_, Convert( op.getOperator_Attr(), Enum(StringToJsUnaryOperator) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto prefix, Convert( op.getPrefixAttr(), ToBool() ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto argument, Convert( op.getArgument(), @@ -1325,21 +1325,21 @@ JsirToAst::VisitUnaryExpression(JsirUnaryExpressionOp op) { absl::StatusOr> JsirToAst::VisitUpdateExpression(JsirUpdateExpressionOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto operator_, Convert( op.getOperator_Attr(), Enum(StringToJsUpdateOperator) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto argument, Convert( op.getArgument(), ToOpConverter(VisitLValRef) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto prefix, Convert( op.getPrefixAttr(), @@ -1355,14 +1355,14 @@ JsirToAst::VisitUpdateExpression(JsirUpdateExpressionOp op) { absl::StatusOr> JsirToAst::VisitBinaryExpression(JsirBinaryExpressionOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto operator_, Convert( op.getOperator_Attr(), Enum(StringToJsBinaryOperator) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto left, Convert( op.getLeft(), @@ -1372,7 +1372,7 @@ JsirToAst::VisitBinaryExpression(JsirBinaryExpressionOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto right, Convert( op.getRight(), @@ -1388,21 +1388,21 @@ JsirToAst::VisitBinaryExpression(JsirBinaryExpressionOp op) { absl::StatusOr> JsirToAst::VisitAssignmentExpression(JsirAssignmentExpressionOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto operator_, Convert( op.getOperator_Attr(), Enum(StringToJsAssignmentOperator) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto left, Convert( op.getLeft(), ToOpConverter(VisitLValRef) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto right, Convert( op.getRight(), @@ -1418,21 +1418,21 @@ JsirToAst::VisitAssignmentExpression(JsirAssignmentExpressionOp op) { absl::StatusOr> JsirToAst::VisitLogicalExpression(JshirLogicalExpressionOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto operator_, Convert( op.getOperator_Attr(), Enum(StringToJsLogicalOperator) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto left, Convert( op.getLeft(), ToOpConverter(VisitExpression) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto right, Convert( op.getRight(), @@ -1450,14 +1450,14 @@ JsirToAst::VisitLogicalExpression(JshirLogicalExpressionOp op) { absl::StatusOr> JsirToAst::VisitConditionalExpression(JshirConditionalExpressionOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto test, Convert( op.getTest(), ToOpConverter(VisitExpression) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto alternate, Convert( op.getAlternate(), @@ -1466,7 +1466,7 @@ JsirToAst::VisitConditionalExpression(JshirConditionalExpressionOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto consequent, Convert( op.getConsequent(), @@ -1484,7 +1484,7 @@ JsirToAst::VisitConditionalExpression(JshirConditionalExpressionOp op) { absl::StatusOr> JsirToAst::VisitCallExpression(JsirCallExpressionOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto callee, Convert( op.getCallee(), @@ -1495,7 +1495,7 @@ JsirToAst::VisitCallExpression(JsirCallExpressionOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto arguments, Convert( op.getArguments(), @@ -1515,14 +1515,14 @@ JsirToAst::VisitCallExpression(JsirCallExpressionOp op) { absl::StatusOr> JsirToAst::VisitOptionalCallExpression(JsirOptionalCallExpressionOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto callee, Convert( op.getCallee(), ToOpConverter(VisitExpression) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto arguments, Convert( op.getArguments(), @@ -1534,7 +1534,7 @@ JsirToAst::VisitOptionalCallExpression(JsirOptionalCallExpressionOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto optional, Convert( op.getOptionalAttr(), @@ -1550,7 +1550,7 @@ JsirToAst::VisitOptionalCallExpression(JsirOptionalCallExpressionOp op) { absl::StatusOr> JsirToAst::VisitNewExpression(JsirNewExpressionOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto callee, Convert( op.getCallee(), @@ -1561,7 +1561,7 @@ JsirToAst::VisitNewExpression(JsirNewExpressionOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto arguments, Convert( op.getArguments(), @@ -1581,7 +1581,7 @@ JsirToAst::VisitNewExpression(JsirNewExpressionOp op) { absl::StatusOr> JsirToAst::VisitSequenceExpression(JsirSequenceExpressionOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto expressions, Convert( op.getExpressions(), @@ -1597,7 +1597,7 @@ JsirToAst::VisitSequenceExpression(JsirSequenceExpressionOp op) { absl::StatusOr> JsirToAst::VisitTemplateElementValue(JsirTemplateElementValueOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto cooked, Convert( op.getCookedAttr(), @@ -1606,7 +1606,7 @@ JsirToAst::VisitTemplateElementValue(JsirTemplateElementValueOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto raw, Convert( op.getRawAttr(), @@ -1621,14 +1621,14 @@ JsirToAst::VisitTemplateElementValue(JsirTemplateElementValueOp op) { absl::StatusOr> JsirToAst::VisitTemplateElement(JsirTemplateElementOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto tail, Convert( op.getTailAttr(), ToBool() ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto value, Convert( op.getValue(), @@ -1643,7 +1643,7 @@ JsirToAst::VisitTemplateElement(JsirTemplateElementOp op) { absl::StatusOr> JsirToAst::VisitTemplateLiteral(JsirTemplateLiteralOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto quasis, Convert( op.getQuasis(), @@ -1652,7 +1652,7 @@ JsirToAst::VisitTemplateLiteral(JsirTemplateLiteralOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto expressions, Convert( op.getExpressions(), @@ -1669,14 +1669,14 @@ JsirToAst::VisitTemplateLiteral(JsirTemplateLiteralOp op) { absl::StatusOr> JsirToAst::VisitTaggedTemplateExpression(JsirTaggedTemplateExpressionOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto tag, Convert( op.getTag(), ToOpConverter(VisitExpression) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto quasi, Convert( op.getQuasi(), @@ -1691,7 +1691,7 @@ JsirToAst::VisitTaggedTemplateExpression(JsirTaggedTemplateExpressionOp op) { absl::StatusOr> JsirToAst::VisitRestElementRef(JsirRestElementRefOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto argument, Convert( op.getArgument(), @@ -1705,7 +1705,7 @@ JsirToAst::VisitRestElementRef(JsirRestElementRefOp op) { absl::StatusOr> JsirToAst::VisitObjectPatternRef(JsirObjectPatternRefOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto properties_, Convert( op.getProperties_(), @@ -1726,7 +1726,7 @@ JsirToAst::VisitObjectPatternRef(JsirObjectPatternRefOp op) { absl::StatusOr> JsirToAst::VisitArrayPatternRef(JsirArrayPatternRefOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto elements, Convert( op.getElements(), @@ -1744,14 +1744,14 @@ JsirToAst::VisitArrayPatternRef(JsirArrayPatternRefOp op) { absl::StatusOr> JsirToAst::VisitAssignmentPatternRef(JsirAssignmentPatternRefOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto left, Convert( op.getLeft(), ToOpConverter(VisitPatternRef) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto right, Convert( op.getRight(), @@ -1766,14 +1766,14 @@ JsirToAst::VisitAssignmentPatternRef(JsirAssignmentPatternRefOp op) { absl::StatusOr> JsirToAst::VisitClassPrivateProperty(JsirClassPrivatePropertyOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto key, Convert( op.getKeyAttr(), ToAttrConverter(VisitPrivateNameAttr) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto value, Convert( op.getValue(), @@ -1784,7 +1784,7 @@ JsirToAst::VisitClassPrivateProperty(JsirClassPrivatePropertyOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto static_, Convert( op.getStatic_Attr(), @@ -1800,7 +1800,7 @@ JsirToAst::VisitClassPrivateProperty(JsirClassPrivatePropertyOp op) { absl::StatusOr> JsirToAst::VisitClassBody(JsirClassBodyOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto body, Convert( op.getBody(), @@ -1823,7 +1823,7 @@ JsirToAst::VisitClassBody(JsirClassBodyOp op) { absl::StatusOr> JsirToAst::VisitClassDeclaration(JsirClassDeclarationOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto super_class, Convert( op.getSuperClass(), @@ -1832,7 +1832,7 @@ JsirToAst::VisitClassDeclaration(JsirClassDeclarationOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto body, Convert( op.getBody(), @@ -1841,7 +1841,7 @@ JsirToAst::VisitClassDeclaration(JsirClassDeclarationOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto id, Convert( op.getIdAttr(), @@ -1859,7 +1859,7 @@ JsirToAst::VisitClassDeclaration(JsirClassDeclarationOp op) { absl::StatusOr> JsirToAst::VisitClassExpression(JsirClassExpressionOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto super_class, Convert( op.getSuperClass(), @@ -1868,7 +1868,7 @@ JsirToAst::VisitClassExpression(JsirClassExpressionOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto body, Convert( op.getBody(), @@ -1877,7 +1877,7 @@ JsirToAst::VisitClassExpression(JsirClassExpressionOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto id, Convert( op.getIdAttr(), @@ -1895,14 +1895,14 @@ JsirToAst::VisitClassExpression(JsirClassExpressionOp op) { absl::StatusOr> JsirToAst::VisitMetaProperty(JsirMetaPropertyOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto meta, Convert( op.getMetaAttr(), ToAttrConverter(VisitIdentifierAttr) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto property, Convert( op.getPropertyAttr(), @@ -1959,7 +1959,7 @@ JsirToAst::VisitModuleSpecifierAttr(JsirModuleSpecifierAttrInterface attr) { absl::StatusOr> JsirToAst::VisitImportDeclaration(JsirImportDeclarationOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto specifiers, Convert( op.getSpecifiersAttr(), @@ -1972,14 +1972,14 @@ JsirToAst::VisitImportDeclaration(JsirImportDeclarationOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto source, Convert( op.getSourceAttr(), ToAttrConverter(VisitStringLiteralAttr) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto assertions, Convert( op.getAssertionsAttr(), @@ -1997,7 +1997,7 @@ JsirToAst::VisitImportDeclaration(JsirImportDeclarationOp op) { absl::StatusOr> JsirToAst::VisitExportNamedDeclaration(JsirExportNamedDeclarationOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto declaration, Convert( op.getDeclaration(), @@ -2008,7 +2008,7 @@ JsirToAst::VisitExportNamedDeclaration(JsirExportNamedDeclarationOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto specifiers, Convert( op.getSpecifiersAttr(), @@ -2017,7 +2017,7 @@ JsirToAst::VisitExportNamedDeclaration(JsirExportNamedDeclarationOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto source, Convert( op.getSourceAttr(), @@ -2026,7 +2026,7 @@ JsirToAst::VisitExportNamedDeclaration(JsirExportNamedDeclarationOp op) { ) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto assertions, Convert( op.getAssertionsAttr(), @@ -2047,14 +2047,14 @@ JsirToAst::VisitExportNamedDeclaration(JsirExportNamedDeclarationOp op) { absl::StatusOr> JsirToAst::VisitExportAllDeclaration(JsirExportAllDeclarationOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto source, Convert( op.getSourceAttr(), ToAttrConverter(VisitStringLiteralAttr) ) ); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto assertions, Convert( op.getAssertionsAttr(), diff --git a/maldoca/js/ir/conversion/jsir_to_ast.h b/maldoca/js/ir/conversion/jsir_to_ast.h index d064536..710b66e 100644 --- a/maldoca/js/ir/conversion/jsir_to_ast.h +++ b/maldoca/js/ir/conversion/jsir_to_ast.h @@ -34,10 +34,10 @@ #include "absl/log/log.h" #include "absl/memory/memory.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/types/optional.h" -#include "maldoca/base/status_macros.h" #include "maldoca/js/ast/ast.generated.h" #include "maldoca/js/ir/ir.h" #include "maldoca/js/ir/trivia.h" @@ -165,7 +165,7 @@ class JsirToAst { continue; } auto statement_op = llvm::cast(op); - MALDOCA_ASSIGN_OR_RETURN(auto statement, VisitStatement(statement_op)); + ABSL_ASSIGN_OR_RETURN(auto statement, VisitStatement(statement_op)); statements.push_back(std::move(statement)); } @@ -204,8 +204,7 @@ class JsirToAst { template static absl::StatusOr> VisitExprRegion( mlir::Region& region, VisitFunc visit) { - MALDOCA_ASSIGN_OR_RETURN(mlir::Value mlir_value, - GetExprRegionValue(region)); + ABSL_ASSIGN_OR_RETURN(mlir::Value mlir_value, GetExprRegionValue(region)); auto mlir_op = llvm::dyn_cast(mlir_value.getDefiningOp()); if (mlir_op == nullptr) { return absl::InvalidArgumentError( @@ -265,8 +264,8 @@ class JsirToAst { template static absl::StatusOr> VisitStmtRegion( mlir::Region& region, VisitFunc visit) { - MALDOCA_ASSIGN_OR_RETURN(mlir::Operation * mlir_operation, - GetStmtRegionOperation(region)); + ABSL_ASSIGN_OR_RETURN(mlir::Operation * mlir_operation, + GetStmtRegionOperation(region)); auto mlir_op = llvm::dyn_cast(mlir_operation); if (mlir_op == nullptr) { return absl::InvalidArgumentError( @@ -291,7 +290,7 @@ class JsirToAst { VisitStmtOrExprRegion(mlir::Region& region, VisitFunc visit_stmt, VisitFunc visit_expr) { - MALDOCA_ASSIGN_OR_RETURN(auto mlir_end, GetStmtRegionOperation(region)); + ABSL_ASSIGN_OR_RETURN(auto mlir_end, GetStmtRegionOperation(region)); if (auto mlir_stmt_op = llvm::dyn_cast(mlir_end)) { return visit_stmt(mlir_stmt_op); } else if (auto mlir_end_op = diff --git a/maldoca/js/ir/conversion/jsir_to_ast.handwritten.cc b/maldoca/js/ir/conversion/jsir_to_ast.handwritten.cc index 64ded03..977bf50 100644 --- a/maldoca/js/ir/conversion/jsir_to_ast.handwritten.cc +++ b/maldoca/js/ir/conversion/jsir_to_ast.handwritten.cc @@ -32,9 +32,9 @@ #include "absl/log/log.h" #include "absl/memory/memory.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/types/optional.h" -#include "maldoca/base/status_macros.h" #include "maldoca/js/ast/ast.generated.h" #include "maldoca/js/ir/cast.h" #include "maldoca/js/ir/ir.h" @@ -60,7 +60,7 @@ absl::StatusOr> JsirToAst::VisitIdentifierAttr( absl::StatusOr> JsirToAst::VisitPrivateNameAttr( JsirPrivateNameAttr attr) { - MALDOCA_ASSIGN_OR_RETURN(auto id, VisitIdentifierAttr(attr.getId())); + ABSL_ASSIGN_OR_RETURN(auto id, VisitIdentifierAttr(attr.getId())); return Create(attr, std::move(id)); } @@ -77,8 +77,8 @@ JsirToAst::VisitStringLiteralExtraAttr(JsirStringLiteralExtraAttr attr) { absl::StatusOr> JsirToAst::VisitStringLiteralAttr(JsirStringLiteralAttr attr) { - MALDOCA_ASSIGN_OR_RETURN(auto extra, - VisitStringLiteralExtraAttr(attr.getExtra())); + ABSL_ASSIGN_OR_RETURN(auto extra, + VisitStringLiteralExtraAttr(attr.getExtra())); return Create(attr, attr.getValue().str(), std::move(extra)); } @@ -90,8 +90,8 @@ JsirToAst::VisitNumericLiteralExtraAttr(JsirNumericLiteralExtraAttr attr) { absl::StatusOr> JsirToAst::VisitNumericLiteralAttr(JsirNumericLiteralAttr attr) { - MALDOCA_ASSIGN_OR_RETURN(auto extra, - VisitNumericLiteralExtraAttr(attr.getExtra())); + ABSL_ASSIGN_OR_RETURN(auto extra, + VisitNumericLiteralExtraAttr(attr.getExtra())); return Create(attr, attr.getValue().getValueAsDouble(), std::move(extra)); } @@ -104,8 +104,8 @@ JsirToAst::VisitBigIntLiteralExtraAttr(JsirBigIntLiteralExtraAttr attr) { absl::StatusOr> JsirToAst::VisitBigIntLiteralAttr(JsirBigIntLiteralAttr attr) { - MALDOCA_ASSIGN_OR_RETURN(auto extra, - VisitBigIntLiteralExtraAttr(attr.getExtra())); + ABSL_ASSIGN_OR_RETURN(auto extra, + VisitBigIntLiteralExtraAttr(attr.getExtra())); return Create(attr, attr.getValue().str(), std::move(extra)); } @@ -113,7 +113,7 @@ absl::StatusOr> JsirToAst::VisitBreakStatement(JshirBreakStatementOp op) { std::optional> label; if (op.getLabel().has_value()) { - MALDOCA_ASSIGN_OR_RETURN(label, VisitIdentifierAttr(op.getLabel().value())); + ABSL_ASSIGN_OR_RETURN(label, VisitIdentifierAttr(op.getLabel().value())); } return Create(op, std::move(label)); } @@ -122,7 +122,7 @@ absl::StatusOr> JsirToAst::VisitContinueStatement(JshirContinueStatementOp op) { std::optional> label; if (op.getLabel().has_value()) { - MALDOCA_ASSIGN_OR_RETURN(label, VisitIdentifierAttr(op.getLabel().value())); + ABSL_ASSIGN_OR_RETURN(label, VisitIdentifierAttr(op.getLabel().value())); } return Create(op, std::move(label)); } @@ -133,22 +133,22 @@ absl::StatusOr> JsirToAst::VisitForStatement( std::unique_ptr>> init; if (!op.getInit().empty()) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( init, VisitStmtOrExprRegion(op.getInit(), &JsirToAst::VisitVariableDeclaration, &JsirToAst::VisitExpression)); } std::optional> test; if (!op.getTest().empty()) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( test, VisitExprRegion(op.getTest(), &JsirToAst::VisitExpression)); } std::optional> update; if (!op.getUpdate().empty()) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( update, VisitExprRegion(op.getUpdate(), &JsirToAst::VisitExpression)); } - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto body, VisitStmtRegion(op.getBody(), &JsirToAst::VisitStatement)); return Create(op, std::move(init), std::move(test), std::move(update), std::move(body)); @@ -159,9 +159,9 @@ JsirToAst::VisitForInOfStatement( std::optional left_declaration, mlir::Value left_lval_value, mlir::Value right_value, mlir::Region &body_region) { - MALDOCA_ASSIGN_OR_RETURN(auto left_lval_op, - Cast(left_lval_value)); - MALDOCA_ASSIGN_OR_RETURN(auto left_lval, VisitLValRef(left_lval_op)); + ABSL_ASSIGN_OR_RETURN(auto left_lval_op, + Cast(left_lval_value)); + ABSL_ASSIGN_OR_RETURN(auto left_lval, VisitLValRef(left_lval_op)); std::variant, std::unique_ptr> left; @@ -181,11 +181,11 @@ JsirToAst::VisitForInOfStatement( left_declaration->getKind().str()); } - MALDOCA_ASSIGN_OR_RETURN(auto right_op, - Cast(right_value)); - MALDOCA_ASSIGN_OR_RETURN(auto right, VisitExpression(right_op)); + ABSL_ASSIGN_OR_RETURN(auto right_op, + Cast(right_value)); + ABSL_ASSIGN_OR_RETURN(auto right, VisitExpression(right_op)); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto body, VisitStmtRegion(body_region, &JsirToAst::VisitStatement)); return JsForInOfStatementFields{std::move(left), std::move(right), @@ -194,7 +194,7 @@ JsirToAst::VisitForInOfStatement( absl::StatusOr> JsirToAst::VisitForInStatement(JshirForInStatementOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto fields, VisitForInOfStatement(op.getLeftDeclaration(), op.getLeftLval(), op.getRight(), op.getBody())); @@ -205,7 +205,7 @@ JsirToAst::VisitForInStatement(JshirForInStatementOp op) { absl::StatusOr> JsirToAst::VisitForOfStatement(JshirForOfStatementOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto fields, VisitForInOfStatement(op.getLeftDeclaration(), op.getLeftLval(), op.getRight(), op.getBody())); @@ -218,20 +218,19 @@ absl::StatusOr> JsirToAst::VisitArrowFunctionExpression(JsirArrowFunctionExpressionOp op) { std::optional> id; if (op.getId() != nullptr) { - MALDOCA_ASSIGN_OR_RETURN(auto mlir_id, - Cast(op.getId())); - MALDOCA_ASSIGN_OR_RETURN(auto id, VisitIdentifierRef(mlir_id)); + ABSL_ASSIGN_OR_RETURN(auto mlir_id, Cast(op.getId())); + ABSL_ASSIGN_OR_RETURN(auto id, VisitIdentifierRef(mlir_id)); } std::vector> params; for (mlir::Value mlir_param_value : op.getParams()) { - MALDOCA_ASSIGN_OR_RETURN(auto mlir_param, - Cast(mlir_param_value)); - MALDOCA_ASSIGN_OR_RETURN(auto param, VisitPatternRef(mlir_param)); + ABSL_ASSIGN_OR_RETURN(auto mlir_param, + Cast(mlir_param_value)); + ABSL_ASSIGN_OR_RETURN(auto param, VisitPatternRef(mlir_param)); params.push_back(std::move(param)); } bool generator = op.getGenerator(); bool async = op.getAsync(); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto body, VisitStmtOrExprRegion(op.getBody(), &JsirToAst::VisitBlockStatement, &JsirToAst::VisitExpression)); @@ -242,25 +241,25 @@ JsirToAst::VisitArrowFunctionExpression(JsirArrowFunctionExpressionOp op) { absl::StatusOr JsirToAst::GetObjectPropertyKey( mlir::Value computed_key, std::optional literal_key) { if (computed_key != nullptr) { - MALDOCA_ASSIGN_OR_RETURN(auto mlir_computed_key, - Cast(computed_key)); - MALDOCA_ASSIGN_OR_RETURN(auto key, VisitExpression(mlir_computed_key)); + ABSL_ASSIGN_OR_RETURN(auto mlir_computed_key, + Cast(computed_key)); + ABSL_ASSIGN_OR_RETURN(auto key, VisitExpression(mlir_computed_key)); return ObjectPropertyKey{.key = std::move(key), .computed = true}; } else if (literal_key.has_value()) { mlir::Attribute mlir_literal_key_attr = literal_key.value(); std::unique_ptr key; if (auto mlir_literal_key = mlir::dyn_cast(mlir_literal_key_attr)) { - MALDOCA_ASSIGN_OR_RETURN(key, VisitIdentifierAttr(mlir_literal_key)); + ABSL_ASSIGN_OR_RETURN(key, VisitIdentifierAttr(mlir_literal_key)); } else if (auto mlir_literal_key = mlir::dyn_cast( mlir_literal_key_attr)) { - MALDOCA_ASSIGN_OR_RETURN(key, VisitStringLiteralAttr(mlir_literal_key)); + ABSL_ASSIGN_OR_RETURN(key, VisitStringLiteralAttr(mlir_literal_key)); } else if (auto mlir_literal_key = mlir::dyn_cast( mlir_literal_key_attr)) { - MALDOCA_ASSIGN_OR_RETURN(key, VisitNumericLiteralAttr(mlir_literal_key)); + ABSL_ASSIGN_OR_RETURN(key, VisitNumericLiteralAttr(mlir_literal_key)); } else if (auto mlir_literal_key = mlir::dyn_cast( mlir_literal_key_attr)) { - MALDOCA_ASSIGN_OR_RETURN(key, VisitBigIntLiteralAttr(mlir_literal_key)); + ABSL_ASSIGN_OR_RETURN(key, VisitBigIntLiteralAttr(mlir_literal_key)); } else { return absl::InvalidArgumentError( "literal_key must be Identifier or StringLiteral or " @@ -275,15 +274,15 @@ absl::StatusOr JsirToAst::GetObjectPropertyKey( absl::StatusOr> JsirToAst::VisitObjectProperty(JsirObjectPropertyOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto object_property_key, GetObjectPropertyKey(op.getComputedKey(), op.getLiteralKey())); bool shorthand = op.getShorthand(); - MALDOCA_ASSIGN_OR_RETURN(auto mlir_value, - Cast(op.getValue())); - MALDOCA_ASSIGN_OR_RETURN(auto value, VisitExpression(mlir_value)); + ABSL_ASSIGN_OR_RETURN(auto mlir_value, + Cast(op.getValue())); + ABSL_ASSIGN_OR_RETURN(auto value, VisitExpression(mlir_value)); return Create(op, std::move(object_property_key.key), object_property_key.computed, shorthand, @@ -292,19 +291,19 @@ JsirToAst::VisitObjectProperty(JsirObjectPropertyOp op) { absl::StatusOr> JsirToAst::VisitObjectPropertyRef(JsirObjectPropertyRefOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto object_property_key, GetObjectPropertyKey(op.getComputedKey(), op.getLiteralKey())); bool shorthand = op.getShorthand(); - MALDOCA_ASSIGN_OR_RETURN(auto mlir_value, - Cast(op.getValue())); - MALDOCA_ASSIGN_OR_RETURN(auto value_pattern, VisitPatternRef(mlir_value)); + ABSL_ASSIGN_OR_RETURN(auto mlir_value, + Cast(op.getValue())); + ABSL_ASSIGN_OR_RETURN(auto value_pattern, VisitPatternRef(mlir_value)); std::variant, std::unique_ptr> value; - if (dynamic_cast(value_pattern.get()) != nullptr) { + if (dynamic_cast(value_pattern.get()) != nullptr) { value = - absl::WrapUnique(dynamic_cast(value_pattern.release())); + absl::WrapUnique(dynamic_cast(value_pattern.release())); } else { value = std::move(value_pattern); } @@ -316,27 +315,27 @@ JsirToAst::VisitObjectPropertyRef(JsirObjectPropertyRefOp op) { absl::StatusOr> JsirToAst::VisitObjectMethod( JsirObjectMethodOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto object_property_key, GetObjectPropertyKey(op.getComputedKey(), op.getLiteralKey())); std::optional> id; if (op.getId().has_value()) { - MALDOCA_ASSIGN_OR_RETURN(id, VisitIdentifierAttr(*op.getId())); + ABSL_ASSIGN_OR_RETURN(id, VisitIdentifierAttr(*op.getId())); } std::vector> params; for (mlir::Value mlir_param_value : op.getParams()) { - MALDOCA_ASSIGN_OR_RETURN(auto mlir_param, - Cast(mlir_param_value)); - MALDOCA_ASSIGN_OR_RETURN(auto param, VisitPatternRef(mlir_param)); + ABSL_ASSIGN_OR_RETURN(auto mlir_param, + Cast(mlir_param_value)); + ABSL_ASSIGN_OR_RETURN(auto param, VisitPatternRef(mlir_param)); params.push_back(std::move(param)); } bool generator = op.getGenerator(); bool async = op.getAsync(); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto body, VisitStmtRegion(op.getBody(), &JsirToAst::VisitBlockStatement)); @@ -350,8 +349,8 @@ absl::StatusOr> JsirToAst::VisitObjectMethod( absl::StatusOr> JsirToAst::VisitObjectExpression(JsirObjectExpressionOp op) { - MALDOCA_ASSIGN_OR_RETURN(auto mlir_properties_values, - GetExprsRegionValues(op.getRegion())); + ABSL_ASSIGN_OR_RETURN(auto mlir_properties_values, + GetExprsRegionValues(op.getRegion())); std::vector, std::unique_ptr, std::unique_ptr>> @@ -363,13 +362,13 @@ JsirToAst::VisitObjectExpression(JsirObjectExpressionOp op) { property; if (auto mlir_property = llvm::dyn_cast( mlir_property_value.getDefiningOp())) { - MALDOCA_ASSIGN_OR_RETURN(property, VisitObjectProperty(mlir_property)); + ABSL_ASSIGN_OR_RETURN(property, VisitObjectProperty(mlir_property)); } else if (auto mlir_property = llvm::dyn_cast( mlir_property_value.getDefiningOp())) { - MALDOCA_ASSIGN_OR_RETURN(property, VisitObjectMethod(mlir_property)); + ABSL_ASSIGN_OR_RETURN(property, VisitObjectMethod(mlir_property)); } else if (auto mlir_property = llvm::dyn_cast( mlir_property_value.getDefiningOp())) { - MALDOCA_ASSIGN_OR_RETURN(property, VisitSpreadElement(mlir_property)); + ABSL_ASSIGN_OR_RETURN(property, VisitSpreadElement(mlir_property)); } else { return absl::InvalidArgumentError( "properties must be ObjectProperty or ObjectMethod or " @@ -385,9 +384,9 @@ JsirToAst::GetMemberExpressionProperty( mlir::Value computed_property, std::optional literal_property) { if (computed_property != nullptr) { - MALDOCA_ASSIGN_OR_RETURN( - auto mlir_property, Cast(computed_property)); - MALDOCA_ASSIGN_OR_RETURN(auto property, VisitExpression(mlir_property)); + ABSL_ASSIGN_OR_RETURN(auto mlir_property, + Cast(computed_property)); + ABSL_ASSIGN_OR_RETURN(auto property, VisitExpression(mlir_property)); return MemberExpressionProperty{ .property = std::move(property), .computed = true, @@ -397,12 +396,12 @@ JsirToAst::GetMemberExpressionProperty( property; if (auto mlir_literal_property = mlir::dyn_cast(literal_property.value())) { - MALDOCA_ASSIGN_OR_RETURN(property, - VisitIdentifierAttr(mlir_literal_property)); + ABSL_ASSIGN_OR_RETURN(property, + VisitIdentifierAttr(mlir_literal_property)); } else if (auto mlir_literal_property = mlir::dyn_cast( literal_property.value())) { - MALDOCA_ASSIGN_OR_RETURN(property, - VisitPrivateNameAttr(mlir_literal_property)); + ABSL_ASSIGN_OR_RETURN(property, + VisitPrivateNameAttr(mlir_literal_property)); } else { return absl::InvalidArgumentError( "literal_property must be Identifier or PrivateName."); @@ -433,12 +432,10 @@ JsirToAst::GetMemberExpressionObject(mlir::Value object) { absl::StatusOr> JsirToAst::VisitMemberExpression(JsirMemberExpressionOp op) { - MALDOCA_ASSIGN_OR_RETURN(auto object, - GetMemberExpressionObject(op.getObject())); - MALDOCA_ASSIGN_OR_RETURN( - auto member_expression_property, - GetMemberExpressionProperty(op.getComputedProperty(), - op.getLiteralProperty())); + ABSL_ASSIGN_OR_RETURN(auto object, GetMemberExpressionObject(op.getObject())); + ABSL_ASSIGN_OR_RETURN(auto member_expression_property, + GetMemberExpressionProperty(op.getComputedProperty(), + op.getLiteralProperty())); return Create( op, std::move(object), std::move(member_expression_property.property), member_expression_property.computed); @@ -446,12 +443,10 @@ JsirToAst::VisitMemberExpression(JsirMemberExpressionOp op) { absl::StatusOr> JsirToAst::VisitMemberExpressionRef(JsirMemberExpressionRefOp op) { - MALDOCA_ASSIGN_OR_RETURN(auto object, - GetMemberExpressionObject(op.getObject())); - MALDOCA_ASSIGN_OR_RETURN( - auto member_expression_property, - GetMemberExpressionProperty(op.getComputedProperty(), - op.getLiteralProperty())); + ABSL_ASSIGN_OR_RETURN(auto object, GetMemberExpressionObject(op.getObject())); + ABSL_ASSIGN_OR_RETURN(auto member_expression_property, + GetMemberExpressionProperty(op.getComputedProperty(), + op.getLiteralProperty())); return Create( op, std::move(object), std::move(member_expression_property.property), member_expression_property.computed); @@ -459,14 +454,13 @@ JsirToAst::VisitMemberExpressionRef(JsirMemberExpressionRefOp op) { absl::StatusOr> JsirToAst::VisitOptionalMemberExpression(JsirOptionalMemberExpressionOp op) { - MALDOCA_ASSIGN_OR_RETURN(auto mlir_object, - Cast(op.getObject())); - MALDOCA_ASSIGN_OR_RETURN(auto object, VisitExpression(mlir_object)); - - MALDOCA_ASSIGN_OR_RETURN( - auto member_expression_property, - GetMemberExpressionProperty(op.getComputedProperty(), - op.getLiteralProperty())); + ABSL_ASSIGN_OR_RETURN(auto mlir_object, + Cast(op.getObject())); + ABSL_ASSIGN_OR_RETURN(auto object, VisitExpression(mlir_object)); + + ABSL_ASSIGN_OR_RETURN(auto member_expression_property, + GetMemberExpressionProperty(op.getComputedProperty(), + op.getLiteralProperty())); bool optional = op.getOptional(); return Create( op, std::move(object), std::move(member_expression_property.property), @@ -475,35 +469,34 @@ JsirToAst::VisitOptionalMemberExpression(JsirOptionalMemberExpressionOp op) { absl::StatusOr> JsirToAst::VisitParenthesizedExpression(JsirParenthesizedExpressionOp op) { - MALDOCA_ASSIGN_OR_RETURN(auto expression_op, - Cast(op.getExpression())); - MALDOCA_ASSIGN_OR_RETURN(std::unique_ptr expression, - VisitExpression(expression_op)); + ABSL_ASSIGN_OR_RETURN(auto expression_op, + Cast(op.getExpression())); + ABSL_ASSIGN_OR_RETURN(std::unique_ptr expression, + VisitExpression(expression_op)); return Create(op, std::move(expression)); } absl::StatusOr> JsirToAst::VisitParenthesizedExpressionRef( JsirParenthesizedExpressionRefOp op) { - mlir::Operation *expression_op = op.getExpression().getDefiningOp(); + mlir::Operation* expression_op = op.getExpression().getDefiningOp(); std::unique_ptr expression; if (auto lval_op = llvm::dyn_cast(expression_op)) { - MALDOCA_ASSIGN_OR_RETURN(std::unique_ptr lval, - VisitLValRef(lval_op)); + ABSL_ASSIGN_OR_RETURN(std::unique_ptr lval, VisitLValRef(lval_op)); // Convert JsLVal to JsExpression - if (dynamic_cast(lval.get())) { + if (dynamic_cast(lval.get())) { expression = - absl::WrapUnique(dynamic_cast(lval.release())); + absl::WrapUnique(dynamic_cast(lval.release())); } else { return absl::InvalidArgumentError("cannot convert LVal to Expression"); } } else { - MALDOCA_ASSIGN_OR_RETURN(auto rval_op, - Cast(expression_op)); + ABSL_ASSIGN_OR_RETURN(auto rval_op, + Cast(expression_op)); - MALDOCA_ASSIGN_OR_RETURN(expression, VisitExpression(rval_op)); + ABSL_ASSIGN_OR_RETURN(expression, VisitExpression(rval_op)); } return Create(op, std::move(expression)); @@ -513,25 +506,25 @@ absl::StatusOr> JsirToAst::VisitClassMethod( JsirClassMethodOp op) { std::optional> id; if (op.getId().has_value()) { - MALDOCA_ASSIGN_OR_RETURN(id, VisitIdentifierAttr(*op.getId())); + ABSL_ASSIGN_OR_RETURN(id, VisitIdentifierAttr(*op.getId())); } std::vector> params; for (mlir::Value mlir_param_value : op.getParams()) { - MALDOCA_ASSIGN_OR_RETURN(auto mlir_param, - Cast(mlir_param_value)); - MALDOCA_ASSIGN_OR_RETURN(auto param, VisitPatternRef(mlir_param)); + ABSL_ASSIGN_OR_RETURN(auto mlir_param, + Cast(mlir_param_value)); + ABSL_ASSIGN_OR_RETURN(auto param, VisitPatternRef(mlir_param)); params.push_back(std::move(param)); } bool generator = op.getGenerator(); bool async = op.getAsync(); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto body, VisitStmtRegion(op.getBody(), &JsirToAst::VisitBlockStatement)); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto object_property_key, GetObjectPropertyKey(op.getComputedKey(), op.getLiteralKey())); @@ -548,25 +541,25 @@ absl::StatusOr> JsirToAst::VisitClassPrivateMethod(JsirClassPrivateMethodOp op) { std::optional> id; if (op.getId().has_value()) { - MALDOCA_ASSIGN_OR_RETURN(id, VisitIdentifierAttr(*op.getId())); + ABSL_ASSIGN_OR_RETURN(id, VisitIdentifierAttr(*op.getId())); } std::vector> params; for (mlir::Value mlir_param_value : op.getParams()) { - MALDOCA_ASSIGN_OR_RETURN(auto mlir_param, - Cast(mlir_param_value)); - MALDOCA_ASSIGN_OR_RETURN(auto param, VisitPatternRef(mlir_param)); + ABSL_ASSIGN_OR_RETURN(auto mlir_param, + Cast(mlir_param_value)); + ABSL_ASSIGN_OR_RETURN(auto param, VisitPatternRef(mlir_param)); params.push_back(std::move(param)); } bool generator = op.getGenerator(); bool async = op.getAsync(); - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto body, VisitStmtRegion(op.getBody(), &JsirToAst::VisitBlockStatement)); - MALDOCA_ASSIGN_OR_RETURN(auto key, VisitPrivateNameAttr(op.getKey())); + ABSL_ASSIGN_OR_RETURN(auto key, VisitPrivateNameAttr(op.getKey())); std::string kind = op.getKind().str(); bool static_ = op.getStatic_(); @@ -578,13 +571,13 @@ JsirToAst::VisitClassPrivateMethod(JsirClassPrivateMethodOp op) { absl::StatusOr> JsirToAst::VisitClassProperty( JsirClassPropertyOp op) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( auto object_property_key, GetObjectPropertyKey(op.getComputedKey(), op.getLiteralKey())); bool static_ = op.getStatic_(); std::optional> value; if (!op.getValue().empty()) { - MALDOCA_ASSIGN_OR_RETURN( + ABSL_ASSIGN_OR_RETURN( value, VisitExprRegion(op.getValue(), &JsirToAst::VisitExpression)); } return Create(op, std::move(object_property_key.key), @@ -607,63 +600,63 @@ JsirToAst::GetIdentifierOrStringLiteral(mlir::Attribute attr) { absl::StatusOr> JsirToAst::VisitImportSpecifierAttr(JsirImportSpecifierAttr attr) { - MALDOCA_ASSIGN_OR_RETURN(auto imported, - GetIdentifierOrStringLiteral(attr.getImported())); - MALDOCA_ASSIGN_OR_RETURN(auto local, VisitIdentifierAttr(attr.getLocal())); + ABSL_ASSIGN_OR_RETURN(auto imported, + GetIdentifierOrStringLiteral(attr.getImported())); + ABSL_ASSIGN_OR_RETURN(auto local, VisitIdentifierAttr(attr.getLocal())); return Create(attr, std::move(imported), std::move(local)); } absl::StatusOr> JsirToAst::VisitImportDefaultSpecifierAttr( JsirImportDefaultSpecifierAttr attr) { - MALDOCA_ASSIGN_OR_RETURN(auto local, VisitIdentifierAttr(attr.getLocal())); + ABSL_ASSIGN_OR_RETURN(auto local, VisitIdentifierAttr(attr.getLocal())); return Create(attr, std::move(local)); } absl::StatusOr> JsirToAst::VisitImportNamespaceSpecifierAttr( JsirImportNamespaceSpecifierAttr attr) { - MALDOCA_ASSIGN_OR_RETURN(auto local, VisitIdentifierAttr(attr.getLocal())); + ABSL_ASSIGN_OR_RETURN(auto local, VisitIdentifierAttr(attr.getLocal())); return Create(attr, std::move(local)); } absl::StatusOr> JsirToAst::VisitImportAttributeAttr(JsirImportAttributeAttr attr) { - MALDOCA_ASSIGN_OR_RETURN(auto key, VisitIdentifierAttr(attr.getKey())); - MALDOCA_ASSIGN_OR_RETURN(auto value, VisitStringLiteralAttr(attr.getValue())); + ABSL_ASSIGN_OR_RETURN(auto key, VisitIdentifierAttr(attr.getKey())); + ABSL_ASSIGN_OR_RETURN(auto value, VisitStringLiteralAttr(attr.getValue())); return Create(attr, std::move(key), std::move(value)); } absl::StatusOr> JsirToAst::VisitExportSpecifierAttr(JsirExportSpecifierAttr attr) { - MALDOCA_ASSIGN_OR_RETURN(auto exported, - GetIdentifierOrStringLiteral(attr.getExported())); - MALDOCA_ASSIGN_OR_RETURN(auto local, - GetIdentifierOrStringLiteral(attr.getLocal())); + ABSL_ASSIGN_OR_RETURN(auto exported, + GetIdentifierOrStringLiteral(attr.getExported())); + ABSL_ASSIGN_OR_RETURN(auto local, + GetIdentifierOrStringLiteral(attr.getLocal())); return Create(attr, std::move(exported), std::move(local)); } absl::StatusOr> JsirToAst::VisitExportDefaultDeclaration(JsirExportDefaultDeclarationOp op) { - MALDOCA_ASSIGN_OR_RETURN(mlir::Operation * mlir_declaration, - GetStmtRegionOperation(op.getDeclaration())); + ABSL_ASSIGN_OR_RETURN(mlir::Operation * mlir_declaration, + GetStmtRegionOperation(op.getDeclaration())); std::variant, std::unique_ptr, std::unique_ptr> declaration; if (auto mlir_declaration_op = llvm::dyn_cast(mlir_declaration)) { - MALDOCA_ASSIGN_OR_RETURN(declaration, - VisitFunctionDeclaration(mlir_declaration_op)); + ABSL_ASSIGN_OR_RETURN(declaration, + VisitFunctionDeclaration(mlir_declaration_op)); } else if (auto mlir_declaration_op = llvm::dyn_cast(mlir_declaration)) { - MALDOCA_ASSIGN_OR_RETURN(declaration, - VisitClassDeclaration(mlir_declaration_op)); + ABSL_ASSIGN_OR_RETURN(declaration, + VisitClassDeclaration(mlir_declaration_op)); } else if (auto mlir_declaration_region_end_op = llvm::dyn_cast(mlir_declaration)) { auto mlir_declaration_op = llvm::dyn_cast( mlir_declaration_region_end_op.getArgument().getDefiningOp()); - MALDOCA_ASSIGN_OR_RETURN(declaration, VisitExpression(mlir_declaration_op)); + ABSL_ASSIGN_OR_RETURN(declaration, VisitExpression(mlir_declaration_op)); } else { return absl::InvalidArgumentError( "Invalid JsirExportDefaultDeclarationOp::declaration()"); diff --git a/maldoca/js/ir/jsir_utils.cc b/maldoca/js/ir/jsir_utils.cc index 7824974..9b0d8d9 100644 --- a/maldoca/js/ir/jsir_utils.cc +++ b/maldoca/js/ir/jsir_utils.cc @@ -26,8 +26,8 @@ #include "mlir/IR/Value.h" #include "mlir/IR/ValueRange.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" -#include "maldoca/base/status_macros.h" #include "maldoca/js/ir/ir.h" namespace maldoca { @@ -84,8 +84,8 @@ absl::StatusOr GetExprsRegionEndOp(mlir::Region ®ion) { } absl::StatusOr GetExprsRegionValues(mlir::Region ®ion) { - MALDOCA_ASSIGN_OR_RETURN(JsirExprsRegionEndOp exprs_region_end, - GetExprsRegionEndOp(region)); + ABSL_ASSIGN_OR_RETURN(JsirExprsRegionEndOp exprs_region_end, + GetExprsRegionEndOp(region)); return exprs_region_end.getArguments(); } diff --git a/maldoca/js/ir/jsir_utils.h b/maldoca/js/ir/jsir_utils.h index 541c80e..7d5fdeb 100644 --- a/maldoca/js/ir/jsir_utils.h +++ b/maldoca/js/ir/jsir_utils.h @@ -22,8 +22,8 @@ #include "mlir/IR/Value.h" #include "mlir/IR/ValueRange.h" #include "absl/log/log.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" -#include "maldoca/base/status_macros.h" #include "maldoca/js/ir/cast.h" #include "maldoca/js/ir/ir.h" @@ -58,14 +58,13 @@ absl::StatusOr GetExprsRegionValues(mlir::Region ®ion); template absl::StatusOr GetStmtRegionOp(mlir::Region ®ion) { - MALDOCA_ASSIGN_OR_RETURN(mlir::Operation * op, - GetStmtRegionOperation(region)); + ABSL_ASSIGN_OR_RETURN(mlir::Operation * op, GetStmtRegionOperation(region)); return Cast(op); } template absl::StatusOr GetExprRegionOp(mlir::Region ®ion) { - MALDOCA_ASSIGN_OR_RETURN(mlir::Value value, GetExprRegionValue(region)); + ABSL_ASSIGN_OR_RETURN(mlir::Value value, GetExprRegionValue(region)); return Cast(value.getDefiningOp()); } diff --git a/maldoca/js/ir/transforms/BUILD b/maldoca/js/ir/transforms/BUILD index ca37ffd..1b9f43c 100644 --- a/maldoca/js/ir/transforms/BUILD +++ b/maldoca/js/ir/transforms/BUILD @@ -26,7 +26,6 @@ cc_library( hdrs = ["transform.h"], deps = [ "//maldoca/base:ret_check", - "//maldoca/base:status", "//maldoca/js/ast", "//maldoca/js/babel", "//maldoca/js/babel:babel_cc_proto", @@ -45,6 +44,7 @@ cc_library( "@abseil-cpp//absl/base:nullability", "@abseil-cpp//absl/log", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@llvm-project//mlir:IR", "@llvm-project//mlir:Pass", diff --git a/maldoca/js/ir/transforms/split_declaration_statements/BUILD b/maldoca/js/ir/transforms/split_declaration_statements/BUILD index d868ac9..b36f146 100644 --- a/maldoca/js/ir/transforms/split_declaration_statements/BUILD +++ b/maldoca/js/ir/transforms/split_declaration_statements/BUILD @@ -28,10 +28,11 @@ cc_library( srcs = ["pass.cc"], hdrs = ["pass.h"], deps = [ - "//maldoca/base:status", "//maldoca/js/ir", "//maldoca/js/ir:jsir_utils", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", + "@abseil-cpp//absl/status:statusor", "@llvm-project//llvm:Support", "@llvm-project//mlir:IR", "@llvm-project//mlir:Pass", diff --git a/maldoca/js/ir/transforms/split_declaration_statements/pass.cc b/maldoca/js/ir/transforms/split_declaration_statements/pass.cc index 6b744f6..c0f6e48 100644 --- a/maldoca/js/ir/transforms/split_declaration_statements/pass.cc +++ b/maldoca/js/ir/transforms/split_declaration_statements/pass.cc @@ -22,7 +22,7 @@ #include "mlir/IR/Value.h" #include "mlir/IR/ValueRange.h" #include "absl/status/status.h" -#include "maldoca/base/status_macros.h" +#include "absl/status/status_macros.h" #include "maldoca/js/ir/ir.h" #include "maldoca/js/ir/jsir_utils.h" @@ -72,10 +72,9 @@ void SplitDeclarationStatements(mlir::Operation *root) { return; } - MALDOCA_ASSIGN_OR_RETURN( - JsirExprsRegionEndOp declarators_op, - GetExprsRegionEndOp(declaration_op.getDeclarations()), - _.With([](const absl::Status &) { return; })); + ABSL_ASSIGN_OR_RETURN(JsirExprsRegionEndOp declarators_op, + GetExprsRegionEndOp(declaration_op.getDeclarations()), + _.With([](const absl::Status&) { return; })); if (declarators_op.getArguments().size() <= 1) { return; diff --git a/maldoca/js/ir/transforms/transform.cc b/maldoca/js/ir/transforms/transform.cc index 4233ca4..2f36aeb 100644 --- a/maldoca/js/ir/transforms/transform.cc +++ b/maldoca/js/ir/transforms/transform.cc @@ -25,9 +25,9 @@ #include "absl/base/nullability.h" #include "absl/log/log.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "maldoca/base/ret_check.h" -#include "maldoca/base/status_macros.h" #include "maldoca/js/ast/ast.generated.h" #include "maldoca/js/babel/babel.h" #include "maldoca/js/driver/driver.pb.h" @@ -133,9 +133,9 @@ absl::Status TransformJsir(JsirFileOp jsir_file, const BabelScopes &scopes, pass_manager.enableVerifier(false); for (auto &&config : configs) { - MALDOCA_ASSIGN_OR_RETURN(std::unique_ptr pass, - CreateJsirTransformPass(&scopes, std::move(config), - babel, analysis_outputs)); + ABSL_ASSIGN_OR_RETURN(std::unique_ptr pass, + CreateJsirTransformPass(&scopes, std::move(config), + babel, analysis_outputs)); pass_manager.addPass(std::move(pass)); } @@ -151,11 +151,11 @@ absl::StatusOr> TransformJsAst( mlir::MLIRContext mlir_context; LoadNecessaryDialects(mlir_context); - MALDOCA_ASSIGN_OR_RETURN(auto jshir_file, AstToJshirFile(ast, mlir_context)); + ABSL_ASSIGN_OR_RETURN(auto jshir_file, AstToJshirFile(ast, mlir_context)); JsAnalysisOutputs analysis_outputs; - MALDOCA_RETURN_IF_ERROR(TransformJsir(*jshir_file, scopes, std::move(configs), - babel, &analysis_outputs)); + ABSL_RETURN_IF_ERROR(TransformJsir(*jshir_file, scopes, std::move(configs), + babel, &analysis_outputs)); return JshirFileToAst(*jshir_file); } diff --git a/maldoca/js/quickjs_babel/BUILD b/maldoca/js/quickjs_babel/BUILD index 34fc660..bb97d56 100644 --- a/maldoca/js/quickjs_babel/BUILD +++ b/maldoca/js/quickjs_babel/BUILD @@ -65,7 +65,6 @@ cc_library( deps = [ ":babel_standalone_cc_embed_data", ":native_cc_embed_data", - "//maldoca/base:status", "//maldoca/js/babel", "//maldoca/js/babel:babel_cc_proto", "//maldoca/js/babel:babel_internal", @@ -73,6 +72,7 @@ cc_library( "//maldoca/js/quickjs", "@abseil-cpp//absl/log:check", "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_macros", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings:string_view", "@abseil-cpp//absl/time", diff --git a/maldoca/js/quickjs_babel/quickjs_babel.cc b/maldoca/js/quickjs_babel/quickjs_babel.cc index 280de90..b54a532 100644 --- a/maldoca/js/quickjs_babel/quickjs_babel.cc +++ b/maldoca/js/quickjs_babel/quickjs_babel.cc @@ -22,11 +22,11 @@ #include "absl/log/check.h" #include "absl/status/status.h" +#include "absl/status/status_macros.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/time/time.h" #include "nlohmann/json.hpp" -#include "maldoca/base/status_macros.h" #include "maldoca/js/babel/babel.h" #include "maldoca/js/babel/babel_internal.h" #include "maldoca/js/babel/babel_internal.pb.h" @@ -149,7 +149,7 @@ absl::StatusOr QuickJsBabel::Parse( } BabelParseResponse response; - MALDOCA_RETURN_IF_ERROR( + ABSL_RETURN_IF_ERROR( google::protobuf::json::JsonStringToMessage(*response_string, &response)); BabelAstString ast_string; @@ -225,7 +225,7 @@ absl::StatusOr QuickJsBabel::Generate( } BabelGenerateResponse response; - MALDOCA_RETURN_IF_ERROR( + ABSL_RETURN_IF_ERROR( google::protobuf::json::JsonStringToMessage(*response_string, &response)); std::optional error;